Organize Identifiers

- Rearranged Most Of The Button Identifiers - Make Default Panorama On Top Of The Other Identifiers - Renamed Ignore Button To Default Button
Fyoncle · Nov 8, 2024 · 31dfd9a · 31dfd9a
1 parent 8998dbc
commit 31dfd9a
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 33 deletions.
diff --git a/src/main/java/net/fyoncle/elysiumdaystweaks/custommenus/RamWarningMenu.java b/src/main/java/net/fyoncle/elysiumdaystweaks/custommenus/RamWarningMenu.java
@@ -56,7 +56,7 @@ private void addIgnoreButton() {
         this.addDrawableChild(new HoverableTextButton(this.width/2-200/2,
                 this.height/2-20, 200, 20, 0, 0, 0, 200, 20,
                 Constants.Other.Ram.WidgetsText.IGNORE_TEXT,
-                Textures.IGNORE_BUTTON_UNFOCUSED, Textures.IGNORE_BUTTON_FOCUSED, button -> this.close()));
+                Textures.DEFAULT_BUTTON_UNFOCUSED, Textures.DEFAULT_BUTTON_FOCUSED, button -> this.close()));
     }
 
     private void addGuideButton() {

diff --git a/src/main/java/net/fyoncle/elysiumdaystweaks/utility/constants/Textures.java b/src/main/java/net/fyoncle/elysiumdaystweaks/utility/constants/Textures.java
@@ -3,7 +3,7 @@
 import net.minecraft.util.Identifier;
 
 public class Textures {
- // Health Bar Textures
+ // - Health Bar Textures -
    // OFF
    public static Identifier UNFOCUSED_OFF_HEALTHBAR_TEXTURE = new Identifier(
             "elysium-days-tweaks",
@@ -20,32 +20,15 @@ public class Textures {
             "elysium-days-tweaks",
             "buttons/neat_enabled_button_focused.png");
 
-    // Discord Button Textures
+ // - Discord Button Textures -
     public static Identifier DISCORD_BUTTON_UNFOCUSED_TEXTURE = new Identifier(
             "elysium-days-tweaks",
             "buttons/discord_button_unfocused.png");
     public static Identifier DISCORD_BUTTON_FOCUSED_TEXTURE = new Identifier(
             "elysium-days-tweaks",
             "buttons/discord_button_focused.png");
 
-    // Green Button Texture
-    public static Identifier GREEN_BUTTON_UNFOCUSED_TEXTURE = new Identifier(
-            "elysium-days-tweaks",
-            "buttons/green_button_unfocused.png");
-    public static Identifier GREEN_BUTTON_FOCUSED_TEXTURE = new Identifier(
-            "elysium-days-tweaks",
-            "buttons/green_button_focused.png");
-
- // Ram Warning Screen Buttons Texture
-
-    // Ignore Button
-    public static Identifier IGNORE_BUTTON_UNFOCUSED = new Identifier(
-            "elysium-days-tweaks",
-            "buttons/default_button_unfocused.png");
-    public static Identifier IGNORE_BUTTON_FOCUSED = new Identifier(
-            "elysium-days-tweaks",
-            "buttons/default_button_focused.png");
-
+ // - Ram Warning Screen Textures -
     // Guide Button
     public static Identifier GUIDE_BUTTON_UNFOCUSED = new Identifier(
             "elysium-days-tweaks",
@@ -54,31 +37,50 @@ public class Textures {
             "elysium-days-tweaks",
             "buttons/guide_button_focused.png");
 
-    // Dont Show Button
-    public static Identifier RED_BUTTON_UNFOCUSED = new Identifier(
-            "elysium-days-tweaks",
-            "buttons/red_button_unfocused.png");
-    public static Identifier RED_BUTTON_FOCUSED = new Identifier(
-            "elysium-days-tweaks",
-            "buttons/red_button_focused.png");
-
-  // Menu Logos
+ // - Menu Logos -
+    // Default Logo
     public static final Identifier ED_DEFAULT_LOGO = new Identifier("elysium-days-tweaks",
             "logos/eddefaultlogo.png");
+    // Halloween Logo
     public static final Identifier ED_HALLOWEEN_LOGO = new Identifier("elysium-days-tweaks",
             "logos/edhalloweenlogo.png");
+    // Christmas Logo
     public static final Identifier ED_CHRISTMAS_LOGO = new Identifier("elysium-days-tweaks",
             "logos/edchristmaslogo.png");
 
 
-    // Menu Panoramas
+ // - Menu Panoramas -
+    public static final Identifier ED_DEFAULT_PANORAMA = new Identifier("elysium-days-tweaks",
+            "panoramas/default_panorama.png");
+
     public static final Identifier ED_HALLOWEEN_PANORAMA = new Identifier("elysium-days-tweaks",
             "panoramas/halloween_panorama.png");
 
     public static final Identifier ED_CHRISTMAS_PANORAMA = new Identifier("elysium-days-tweaks",
             "panoramas/christmas_panorama.png");
 
-    public static final Identifier ED_DEFAULT_PANORAMA = new Identifier("elysium-days-tweaks",
-            "panoramas/default_panorama.png");
+ // - Other -
+    // Default Button
+    public static Identifier DEFAULT_BUTTON_UNFOCUSED = new Identifier(
+            "elysium-days-tweaks",
+            "buttons/default_button_unfocused.png");
+    public static Identifier DEFAULT_BUTTON_FOCUSED = new Identifier(
+            "elysium-days-tweaks",
+            "buttons/default_button_focused.png");
+
+    // Red Button
+    public static Identifier RED_BUTTON_UNFOCUSED = new Identifier(
+            "elysium-days-tweaks",
+            "buttons/red_button_unfocused.png");
+    public static Identifier RED_BUTTON_FOCUSED = new Identifier(
+            "elysium-days-tweaks",
+            "buttons/red_button_focused.png");
 
+    // Green Button Texture
+    public static Identifier GREEN_BUTTON_UNFOCUSED_TEXTURE = new Identifier(
+            "elysium-days-tweaks",
+            "buttons/green_button_unfocused.png");
+    public static Identifier GREEN_BUTTON_FOCUSED_TEXTURE = new Identifier(
+            "elysium-days-tweaks",
+            "buttons/green_button_focused.png");
 }