Merge pull request 'Remove the upgrade of opaque theme colors from before 0.1.3' (#14) from drop-color-upgrade into master

Reviewed-on: #14

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

@@ -81,29 +81,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

@@ -38,7 +38,14 @@ public class Cloaks {
         availableCloaks.add(0, "");
     }
 
+    /**
+     * The cloak's texture, or null for no cloak ("", the "None" choice) and for a cloak this version
+     * 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)) {
+            return null;
+        }
         if (Arrays.asList(ANIMATED_CLOAKS).contains(cloakName)) {
             return IdentifierRef.ofSaturn("textures/cloaks/" + cloakName + ".gif");
         } else {

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/Sidebar.java

@@ -22,9 +22,9 @@ public class Sidebar extends Element {
 
     // Values for the constructor's `active`
     public static final int MODS = 0;
-    public static final int COSMETICS = 1;
+    public static final int SETTINGS = 1;
-    public static final int HUD_EDITOR = 2;
+    public static final int COSMETICS = 2;
-    public static final int SETTINGS = 3;
+    public static final int HUD_EDITOR = 3;
 
     private static final int LOGO = 32;
     private static final int BUTTON = 44;
@@ -35,11 +35,12 @@ public class Sidebar extends Element {
     private record Item(IdentifierRef icon, Runnable onClick) {
     }
 
+    // In the order of the constants above
     private final Item[] items = {
             new Item(Textures.ICON_MODS, () -> Providers.saturn.getClient().setScreen(new ModMenu())),
+            new Item(Textures.ICON_SETTINGS, () -> Providers.saturn.getClient().setScreen(new ClientSettings())),
             new Item(Textures.ICON_COSMETICS, () -> Providers.saturn.getClient().setScreen(new CosmeticsMenu())),
             new Item(Textures.ICON_HUD_EDITOR, () -> Providers.saturn.getClient().setScreen(new HudEditor())),
-            new Item(Textures.ICON_SETTINGS, () -> Providers.saturn.getClient().setScreen(new ClientSettings())),
     };
 
     private final int active;

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/TitleMenu.java

@@ -26,8 +26,8 @@ import org.saturnclient.ui.resources.Textures;
 
 /**
  * Saturn's title screen: the logo over the game's menus in the middle, the
- * player and a quit button in the top corners, and along the bottom a dock of
+ * player and a quit button in the top corners, and along the bottom a dock
- * Saturn's screens, the shift menu and Minecraft's options, and the version.
+ * (Saturn's settings, its mods and cosmetics, then Minecraft's options) and the version.
  */
 public class TitleMenu extends SaturnScreen {
     // The logo and wordmark as the shift menu has them: the wordmark over the logo's foot
@@ -106,12 +106,12 @@ public class TitleMenu extends SaturnScreen {
                 .position(width - TOP_EDGE - QUIT_SIZE, TOP_EDGE)
                 .animation(step(new SlideFade(AnimationConfig.mainMenu, 8), STEP_QUIT)));
 
-        // Along the bottom: the dock of Saturn's screens, the shift menu and Minecraft's options, and the version
+        // Along the bottom: the dock, Saturn first (its settings) and Minecraft's options last, and the version
         Dock dock = new Dock(List.of(
+                new Dock.Item(Textures.LOGO, () -> Providers.saturn.getClient().setScreen(new ClientSettings())),
                 new Dock.Item(Textures.ICON_MODS, () -> Providers.saturn.getClient().setScreen(new ModMenu())),
                 new Dock.Item(Textures.ICON_COSMETICS,
                         () -> Providers.saturn.getClient().setScreen(new CosmeticsMenu())),
-                new Dock.Item(Textures.LOGO, () -> Providers.saturn.getClient().setScreen(new ShiftMenu())),
                 new Dock.Item(Textures.ICON_SETTINGS,
                         () -> Providers.saturn.getClient().setScreen(MinecraftScreen.Options))));
         draw(dock.position((width - dock.width) / 2, height - EDGE - Dock.HEIGHT)