Merge pull request 'Relicense to all rights reserved and remove third-party content' (#16) from relicense-and-cleanup into master

Reviewed-on: #16

LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

src/main/java/org/saturnclient/common/ref/game/ItemStackRef.java

@@ -1,7 +1,11 @@
 package org.saturnclient.common.ref.game;
 
+/**
+ * An item stack. Its methods are implemented in ItemStackMixin, so their names must not match any of
+ * ItemStack's own methods.
+ */
 public interface ItemStackRef {
-    public boolean isEmpty();
+    public boolean isEmptyStack();
-    public int getMaxDamage();
+    public int getMaxItemDamage();
-    public int getDamage();
+    public int getItemDamage();
 }

src/main/java/org/saturnclient/common/ref/render/WindowRef.java

@@ -1,9 +1,15 @@
 package org.saturnclient.common.ref.render;
 
+/**
+ * The game window. Its methods are implemented in WindowMixin, so their names must not match any of
+ * Window's own methods.
+ */
 public interface WindowRef {
-    public int getWidth();
+    /** The window's width in screen coordinates */
+    public int getWindowWidth();
 
-    public int getHeight();
+    /** The window's height in screen coordinates */
+    public int getWindowHeight();
 
     public int getFramebufferWidth();
 

src/main/java/org/saturnclient/config/ConfigManager.java

@@ -163,14 +163,6 @@ public class ConfigManager {
         }
     }
 
-    /**
-     * Whether the config file has a value for {@code name} in this namespace,
-     * which tells which version last saved it.
-     */
-    public boolean isSaved(String name) {
-        return getSaved(name) != null;
-    }
-
     private JsonNode getSaved(String name) {
         JsonNode source = cachedJson != null ? cachedJson : loadAndCache();
         if (source == null || !source.isObject())

src/main/java/org/saturnclient/config/Theme.java

@@ -10,26 +10,27 @@ import org.saturnclient.config.property.SelectProperty;
 public class Theme {
     public static ConfigManager config;
 
-    // Main UI background (slightly warm dark to match Saturn tone), translucent over the world
+    // Main UI background (a near-neutral dark, so the warm world showing through
-    public static final ColorProperty BACKGROUND = Property.color(0xD112100D);
+    // doesn't muddy it), translucent over the world
+    public static final ColorProperty BACKGROUND = Property.color(0xD1131417);
 
     // Default text color
-    public static final ColorProperty FOREGROUND = Property.color(0xFFF2E6D2);
+    public static final ColorProperty FOREGROUND = Property.color(0xFFECEFF3);
 
     // Widget default background (normal state), translucent over the world
-    public static final ColorProperty PRIMARY = Property.color(0xB81C1915);
+    public static final ColorProperty PRIMARY = Property.color(0xB81E2025);
 
     // Widget text color
-    public static final ColorProperty PRIMARY_FG = Property.color(0xFFEAD9B8);
+    public static final ColorProperty PRIMARY_FG = Property.color(0xFFD5DAE1);
 
-    // Saturn brand color (hovered / enabled / selected)
+    // Saturn brand color, a pale frost (hovered / enabled / selected)
-    public static final ColorProperty ACCENT = Property.color(0xFFE2BF7D);
+    public static final ColorProperty ACCENT = Property.color(0xFFD3DCE6);
 
     // Text/icons shown on accent background
-    public static final ColorProperty ACCENT_FG = Property.color(0xFF1A140A);
+    public static final ColorProperty ACCENT_FG = Property.color(0xFF15181C);
 
-    // Misc colors
+    // Misc colors: the one warm touch, Saturn's butterscotch
-    public static final ColorProperty SCROLL = Property.color(0xFFE2BF7D);
+    public static final ColorProperty SCROLL = Property.color(0xFFD9B98A);
 
     // UI metrics
     public static final IntProperty BG_RADIUS = Property.integer(12).range(0, 24);
@@ -62,10 +63,11 @@ public class Theme {
     }
 
     public static final List<Preset> PRESETS = List.of(
-            new Preset("Saturn", 0xD112100D, 0xFFF2E6D2, 0xB81C1915, 0xFFEAD9B8, 0xFFE2BF7D, 0xFF1A140A, 0xFFE2BF7D),
+            new Preset("Saturn", 0xD1131417, 0xFFECEFF3, 0xB81E2025, 0xFFD5DAE1, 0xFFD3DCE6, 0xFF15181C, 0xFFD9B98A),
-            new Preset("Midnight", 0xD10E1117, 0xFFE4EAF5, 0xB8171C26, 0xFFC9D4E8, 0xFF8FB3FF, 0xFF0A1224, 0xFF8FB3FF),
+            new Preset("Saturn Gold", 0xD112100D, 0xFFF2E6D2, 0xB81C1915, 0xFFEAD9B8, 0xFFE2BF7D, 0xFF1A140A, 0xFFE2BF7D),
-            new Preset("Amethyst", 0xD1120F17, 0xFFEDE4F7, 0xB81C1724, 0xFFD8C9EB, 0xFFC79BFF, 0xFF1A0F2A, 0xFFC79BFF),
+            new Preset("Mono", 0xD1121212, 0xFFF0F0F0, 0xB81C1C1C, 0xFFDADADA, 0xFFF0F0F0, 0xFF121212, 0xFFF0F0F0),
-            new Preset("Emerald", 0xD10D1210, 0xFFE2F2EA, 0xB816201B, 0xFFC4E0D2, 0xFF7FD1A8, 0xFF0A1F15, 0xFF7FD1A8));
+            new Preset("Midnight", 0xD1121418, 0xFFE5E9F0, 0xB81C2027, 0xFFD8DEE9, 0xFF8FAFCF, 0xFF10151D, 0xFF8FAFCF),
+            new Preset("Amethyst", 0xD1141317, 0xFFECE8F1, 0xB81F1D24, 0xFFDAD3E3, 0xFFB49CCB, 0xFF19131F, 0xFFB49CCB));
 
     public static void init(ConfigManager parent) {
         config = new ConfigManager(parent, "UI Style");
@@ -81,29 +83,6 @@ public class Theme {
         config.property("Widget Radius", WIDGET_RADIUS, "Corner rounding of buttons and cards");
 
         config.property("Font", FONT, "Font of every Saturn screen");
-
-        if (!parent.isSaved(Config.MENU_BLUR)) {
-            upgradeOpaqueColors();
-        }
-    }
-
-    /**
-     * Before 0.1.3 panels and cards were made translucent in code, and the
-     * background and primary colors were saved fully opaque. Saved colors that
-     * are an old default or preset get the translucency the colors now carry
-     * themselves; colors the player picked are left as they are. Runs only on
-     * configs from older versions, so a preset color later set opaque on
-     * purpose stays opaque.
-     */
-    private static void upgradeOpaqueColors() {
-        for (Preset preset : PRESETS) {
-            if (BACKGROUND.value == (preset.background() | 0xFF000000)) {
-                BACKGROUND.value = preset.background();
-            }
-            if (PRIMARY.value == (preset.primary() | 0xFF000000)) {
-                PRIMARY.value = preset.primary();
-            }
-        }
     }
 
     /**

src/main/java/org/saturnclient/cosmetics/Cloaks.java

@@ -1,38 +1,35 @@
 package org.saturnclient.cosmetics;
 
+import java.util.*;
+import java.util.concurrent.CopyOnWriteArrayList;
 import org.saturnclient.client.ServiceClient;
 import org.saturnclient.client.player.SaturnPlayer;
 import org.saturnclient.common.ref.asset.IdentifierRef;
 
-import java.util.*;
-import java.util.concurrent.CopyOnWriteArrayList;
-
 public class Cloaks {
+
     public static final String[] ALL_CLOAKS = {
-            "glitch",
+        "glitch",
-            "mercedes_flow",
+        "crimson_mark",
-            "crimson_mark",
+        "black_hole_amethyst",
-            "bmw",
+        "black_hole_flame",
-            "amg",
+        "black_hole_white",
-            "amg_petronas",
+        "albania_mark",
-            "ferrari",
+        "end",
-            "redbull",
+        "spanish_empire",
-            "black_hole_amethyst",
+        "spain_flag",
-            "black_hole_flame",
+    };
-            "black_hole_white",
-            "albania_mark",
-            "end",
-            "spanish_empire",
-            "spain_flag" };
 
     private static final String[] ANIMATED_CLOAKS = {
-            "glitch",
+        "glitch",
-            "black_hole_amethyst",
+        "black_hole_amethyst",
-            "black_hole_flame",
+        "black_hole_flame",
-            "black_hole_white" };
+        "black_hole_white",
+    };
 
     // Written by network callbacks, read by the UI thread.
-    public static final List<String> availableCloaks = new CopyOnWriteArrayList<>();
+    public static final List<String> availableCloaks =
+        new CopyOnWriteArrayList<>();
 
     public static void initialize() {
         availableCloaks.add(0, "");
@@ -43,13 +40,19 @@ public class Cloaks {
      * has no texture for, which would otherwise draw as the missing texture.
      */
     public static IdentifierRef getCurrentCloakTexture(String cloakName) {
-        if (cloakName == null || !Arrays.asList(ALL_CLOAKS).contains(cloakName)) {
+        if (
+            cloakName == null || !Arrays.asList(ALL_CLOAKS).contains(cloakName)
+        ) {
             return null;
         }
         if (Arrays.asList(ANIMATED_CLOAKS).contains(cloakName)) {
-            return IdentifierRef.ofSaturn("textures/cloaks/" + cloakName + ".gif");
+            return IdentifierRef.ofSaturn(
+                "textures/cloaks/" + cloakName + ".gif"
+            );
         } else {
-            return IdentifierRef.ofSaturn("textures/cloaks/" + cloakName + ".png");
+            return IdentifierRef.ofSaturn(
+                "textures/cloaks/" + cloakName + ".png"
+            );
         }
     }
 
@@ -64,4 +67,4 @@ public class Cloaks {
             ServiceClient.setCloak(cloakName);
         }
     }
-}
+}

src/main/java/org/saturnclient/mod/mods/ArmorDisplayMod.java

@@ -75,16 +75,16 @@ public class ArmorDisplayMod extends Mod implements HudMod {
 
         int row = 0;
 
-        if (useMainHand.value && !mainHand.isEmpty()) {
+        if (useMainHand.value && !mainHand.isEmptyStack()) {
             row = renderSlot(scope, mainHand, row);
         }
-        if (!helmet.isEmpty())
+        if (!helmet.isEmptyStack())
             row = renderSlot(scope, helmet, row);
-        if (!chestplate.isEmpty())
+        if (!chestplate.isEmptyStack())
             row = renderSlot(scope, chestplate, row);
-        if (!leggings.isEmpty())
+        if (!leggings.isEmptyStack())
             row = renderSlot(scope, leggings, row);
-        if (!boots.isEmpty())
+        if (!boots.isEmptyStack())
             row = renderSlot(scope, boots, row);
     }
 
@@ -94,8 +94,8 @@ public class ArmorDisplayMod extends Mod implements HudMod {
     private int renderSlot(RenderScope scope, ItemStackRef item, int row) {
         scope.drawItem(item, 0, 15 * row);
 
-        if (item.getMaxDamage() > 0) {
+        if (item.getMaxItemDamage() > 0) {
-            int remaining = item.getMaxDamage() - item.getDamage();
+            int remaining = item.getMaxItemDamage() - item.getItemDamage();
             scope.drawText(0.5f, String.valueOf(remaining),
                     17, (15 * row) + 3,
                     layout.font.value, layout.fgColor.value);

src/main/java/org/saturnclient/ui/components/ThemePresetCard.java

@@ -12,6 +12,8 @@ import org.saturnclient.ui.resources.Fonts;
  */
 public class ThemePresetCard extends Element {
     public static final int HEIGHT = 92;
+    /** The narrowest card that still fits its preview's widgets */
+    public static final int MIN_WIDTH = 100;
 
     private static final int PADDING = 10;
     private static final int PREVIEW_HEIGHT = 44;

src/main/java/org/saturnclient/ui/elements/ImageTexture.java

@@ -20,9 +20,9 @@ public class ImageTexture extends Element {
         if (sprite.toString().endsWith(".svg")) {
             MinecraftClientRef client = Providers.saturn.getClient();
 
-            int renderWidth = (int) (width * client.getWindow().getFramebufferWidth() / client.getWindow().getWidth());
+            int renderWidth = (int) (width * client.getWindow().getFramebufferWidth() / client.getWindow().getWindowWidth());
             int renderHeight = (int) (height * client.getWindow().getFramebufferHeight()
-                    / client.getWindow().getHeight());
+                    / client.getWindow().getWindowHeight());
 
             IdentifierRef pngId = SvgTexture.getSvg(sprite, renderWidth * 2, renderHeight * 2);
 

src/main/java/org/saturnclient/ui/screens/ClientSettings.java

@@ -102,15 +102,20 @@ public class ClientSettings extends PanelScreen {
         Map<String, Property> properties = Theme.config.getProperties();
 
         int y = PropertyList.drawSection(scroll, "Presets", 0) + 10;
-        int cardWidth = (width - PRESET_GAP * (Theme.PRESETS.size() - 1)) / Theme.PRESETS.size();
+        // One row when the cards fit, otherwise as many rows as they need
+        int columns = Math.max(1, Math.min(Theme.PRESETS.size(),
+                (width + PRESET_GAP) / (ThemePresetCard.MIN_WIDTH + PRESET_GAP)));
+        int rows = (Theme.PRESETS.size() + columns - 1) / columns;
+        int cardWidth = (width - PRESET_GAP * (columns - 1)) / columns;
 
         for (int i = 0; i < Theme.PRESETS.size(); i++) {
             // Rebuild so the color inputs show the preset's colors
             scroll.draw(new ThemePresetCard(Theme.PRESETS.get(i), cardWidth, this::init)
-                    .position(i * (cardWidth + PRESET_GAP), y));
+                    .position(i % columns * (cardWidth + PRESET_GAP),
+                            y + i / columns * (ThemePresetCard.HEIGHT + PRESET_GAP)));
         }
 
-        y += ThemePresetCard.HEIGHT + SECTION_GAP;
+        y += rows * ThemePresetCard.HEIGHT + (rows - 1) * PRESET_GAP + SECTION_GAP;
         y = PropertyList.drawSection(scroll, "Colors", y) + 10;
         y = ColorGrid.draw(scroll, properties, width, y) + SECTION_GAP;
 

src/main/java/org/saturnclient/ui/screens/CosmeticsMenu.java

@@ -89,11 +89,7 @@ public class CosmeticsMenu extends PanelScreen {
 
     /** Names that aren't just the id with each word capitalized */
     private static final Map<String, String> NAMES = Map.of(
-            "", "None",
+            "", "None");
-            "amg", "AMG",
-            "amg_petronas", "AMG Petronas",
-            "bmw", "BMW",
-            "redbull", "Red Bull");
 
     private static final int STAGE_WIDTH = 300;
     private static final int STAGE_PADDING = 16;

src/main/resources/assets/saturnclient/player_animations/get_the_griddy.json

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "name": "Get the Griddy",
-  "description": "fortnite battlepass",
+  "description": "the griddy dance",
   "author": "SeroRonin",
   "emote": {
     "beginTick": 0,

src/main/resources/assets/saturnclient/textures/gui/title/background/README.md

@@ -0,0 +1,6 @@
+Current background: 03
+
+Shader: [Complimentary Reimagined (High)](https://modrinth.com/shader/complementary-reimagined)
+Map: [Mountain Village!!](https://www.planetminecraft.com/project/mountain-village-5031630/)
+Captured with [Panorama ScreenMake](https://modrinth.com/mod/panorama_screen)
+Device: MacBook Air M1 8GB (almost fried), on 1080p external monitor