lang 17 rework

GreenSurvivors · Feb 8, 2024 · 72a3482 · 72a3482
1 parent 3863121
commit 72a3482
Show file tree

Hide file tree

Showing 123 changed files with 1,346 additions and 788 deletions.
diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/config/BlockDataFlag.java b/Minigames/src/main/java/au/com/mineauz/minigames/config/BlockDataFlag.java
@@ -44,7 +44,7 @@ public void loadValue(String path, FileConfiguration config) {
      * @param description ignored and replaced with a description of the data
      */
     @Override
-    public MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                 @Nullable List<@NotNull Component> description) {
         return new MenuItemBlockData(displayMat, name, new Callback<>() {
             @Override

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/config/BooleanFlag.java b/Minigames/src/main/java/au/com/mineauz/minigames/config/BooleanFlag.java
@@ -34,7 +34,7 @@ public void loadValue(String path, FileConfiguration config) {
     }
 
     @Override
-    public MenuItem getMenuItem(@NotNull LangKey langKey, @Nullable Material displayMaterial) {
+    public MenuItem getMenuItem(@Nullable Material displayMaterial, @NotNull LangKey langKey) {
         return new MenuItemBoolean(displayMaterial, langKey, new Callback<>() {
 
             @Override
@@ -50,7 +50,7 @@ public void setValue(Boolean value) {
     }
 
     @Override
-    public MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                 @Nullable List<@NotNull Component> description) {
         return new MenuItemBoolean(name, description, displayMat, new Callback<>() {
 

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/config/EnumFlag.java b/Minigames/src/main/java/au/com/mineauz/minigames/config/EnumFlag.java
@@ -36,7 +36,7 @@ public void loadValue(String path, FileConfiguration config) {
      * @param description will get ignored
      */
     @Override
-    public MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                 @Nullable List<@NotNull Component> description) {
         return new MenuItemEnum<>(displayMat, name, new Callback<>() {
 

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/config/Flag.java b/Minigames/src/main/java/au/com/mineauz/minigames/config/Flag.java
@@ -60,14 +60,14 @@ public void setValue(T value) {
 
     public abstract void loadValue(String path, FileConfiguration config);
 
-    public MenuItem getMenuItem(@NotNull LangKey langKey, @Nullable Material displayMaterial) {
-        return getMenuItem(MinigameMessageManager.getMgMessage(langKey), displayMaterial);
+    public MenuItem getMenuItem(@Nullable Material displayMaterial, @NotNull LangKey langKey) {
+        return getMenuItem(displayMaterial, MinigameMessageManager.getMgMessage(langKey));
     }
 
-    public MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMaterial) {
-        return getMenuItem(name, displayMaterial, null);
+    public MenuItem getMenuItem(@Nullable Material displayMaterial, @Nullable Component name) {
+        return getMenuItem(displayMaterial, name, null);
     }
 
-    public abstract MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public abstract MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                          @Nullable List<@NotNull Component> description);
 }
diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/config/FloatFlag.java b/Minigames/src/main/java/au/com/mineauz/minigames/config/FloatFlag.java
@@ -30,17 +30,17 @@ public void loadValue(String path, FileConfiguration config) {
     }
 
     @Override
-    public MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                 @Nullable List<@NotNull Component> description) {
-        return this.getMenuItem(name, displayMat, description, 1d, 1d, 0d, Double.POSITIVE_INFINITY);
+        return this.getMenuItem(displayMat, name, description, 1d, 1d, 0d, Double.POSITIVE_INFINITY);
     }
 
-    public MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                 double lowerinc, double upperinc, @Nullable Double min, @Nullable Double max) {
-        return this.getMenuItem(name, displayMat, null, lowerinc, upperinc, min, max);
+        return this.getMenuItem(displayMat, name, null, lowerinc, upperinc, min, max);
     }
 
-    public MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                 @Nullable List<@NotNull Component> description,
                                 double lowerinc, double upperinc, @Nullable Double min, @Nullable Double max) {
         return new MenuItemDecimal(displayMat, name, description, new Callback<>() {

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/config/IntegerFlag.java b/Minigames/src/main/java/au/com/mineauz/minigames/config/IntegerFlag.java
@@ -30,23 +30,23 @@ public void loadValue(String path, FileConfiguration config) {
 
     @Deprecated
     @Override
-    public MenuItemInteger getMenuItem(@Nullable Component name, @Nullable Material displayMat) {
-        return getMenuItem(name, displayMat, 0, null);
+    public MenuItemInteger getMenuItem(@Nullable Material displayMat, @Nullable Component name) {
+        return getMenuItem(displayMat, name, 0, null);
     }
 
-    public MenuItemInteger getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public MenuItemInteger getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                        @Nullable Integer min, @Nullable Integer max) {
-        return getMenuItem(name, displayMat, null, min, max);
+        return getMenuItem(displayMat, name, null, min, max);
     }
 
     @Deprecated
     @Override
-    public MenuItemInteger getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public MenuItemInteger getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                        @Nullable List<@NotNull Component> description) {
-        return getMenuItem(name, displayMat, description, 0, null);
+        return getMenuItem(displayMat, name, description, 0, null);
     }
 
-    public MenuItemInteger getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public MenuItemInteger getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                        @Nullable List<@NotNull Component> description, @Nullable Integer min, @Nullable Integer max) {
         return new MenuItemInteger(displayMat, name, description, new Callback<>() {
 

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/config/LoadoutFlag.java b/Minigames/src/main/java/au/com/mineauz/minigames/config/LoadoutFlag.java
@@ -30,13 +30,13 @@ public void loadValue(String path, FileConfiguration config) {
 
     @Deprecated
     @Override
-    public @Nullable MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat) {
-        return null; //TODO: Menu item easy access for loadouts.
+    public @Nullable MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name) {
+        return getMenuItem(displayMat, name, null); //TODO: Menu item easy access for loadouts.
     }
 
     @Deprecated
     @Override
-    public @Nullable MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public @Nullable MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                           @Nullable List<@NotNull Component> description) {
         return null;
     }

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/config/LoadoutSetFlag.java b/Minigames/src/main/java/au/com/mineauz/minigames/config/LoadoutSetFlag.java
@@ -43,13 +43,13 @@ public void loadValue(String path, FileConfiguration config) {
 
     @Deprecated
     @Override
-    public @Nullable MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat) {
-        return getMenuItem(name, displayMat, null);
+    public @Nullable MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name) {
+        return getMenuItem(displayMat, name, null);
     }
 
     @Deprecated
     @Override
-    public @Nullable MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public @Nullable MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                           @Nullable List<@NotNull Component> description) {
         return null; //todo
     }

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/config/LocationFlag.java b/Minigames/src/main/java/au/com/mineauz/minigames/config/LocationFlag.java
@@ -42,13 +42,13 @@ public void loadValue(String path, FileConfiguration config) {
 
     @Deprecated
     @Override
-    public @Nullable MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat) {
-        return getMenuItem(name, displayMat, null);
+    public @Nullable MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name) {
+        return getMenuItem(displayMat, name, null);
     }
 
     @Deprecated
     @Override
-    public @Nullable MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public @Nullable MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                           @Nullable List<@Nullable Component> description) {
         return null;
     }

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/config/LocationListFlag.java b/Minigames/src/main/java/au/com/mineauz/minigames/config/LocationListFlag.java
@@ -48,13 +48,13 @@ public void loadValue(String path, FileConfiguration config) {
 
     @Deprecated
     @Override
-    public @Nullable MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat) {
-        return getMenuItem(name, displayMat, null);
+    public @Nullable MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name) {
+        return getMenuItem(displayMat, name, null);
     }
 
     @Deprecated
     @Override
-    public @Nullable MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public @Nullable MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                           @Nullable List<@NotNull Component> description) {
         return null;
     }

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/config/MaterialFlag.java b/Minigames/src/main/java/au/com/mineauz/minigames/config/MaterialFlag.java
@@ -43,22 +43,22 @@ public void loadValue(String path, FileConfiguration config) {
     }
 
     public MenuItem getMenuItem(@Nullable Component name) {
-        return getMenuItem(name, getFlag(), null);
+        return getMenuItem(getFlag(), name, null);
     }
 
     public MenuItem getMenuItem(@Nullable Component name, @Nullable List<@NotNull Component> description) {
-        return getMenuItem(name, getFlag(), description);
+        return getMenuItem(getFlag(), name, description);
     }
 
     @Deprecated
     @Override
-    public MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat) {
-        return getMenuItem(name, displayMat, null);
+    public MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name) {
+        return getMenuItem(displayMat, name, null);
     }
 
     @Deprecated
     @Override
-    public MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                 @Nullable List<@NotNull Component> description) {
         return new MenuItemMaterial(displayMat, name, description, new Callback<>() {
             @Override

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/config/MaterialListFlag.java b/Minigames/src/main/java/au/com/mineauz/minigames/config/MaterialListFlag.java
@@ -52,7 +52,7 @@ public void loadValue(String path, FileConfiguration config) {
     }
 
     @Override
-    public MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                 @Nullable List<@NotNull Component> description) {
         return null;
     }

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/config/RegionFlag.java b/Minigames/src/main/java/au/com/mineauz/minigames/config/RegionFlag.java
@@ -74,13 +74,13 @@ public void loadValue(String path, FileConfiguration config) {
 
     @Deprecated
     @Override
-    public @Nullable MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat) {
+    public @Nullable MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name) {
         return null;
     }
 
     @Deprecated
     @Override
-    public @Nullable MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public @Nullable MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                           @Nullable List<@NotNull Component> description) {
         return null;
     }

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/config/RegionMapFlag.java b/Minigames/src/main/java/au/com/mineauz/minigames/config/RegionMapFlag.java
@@ -77,13 +77,13 @@ public void loadValue(String path, FileConfiguration config) {
 
     @Deprecated
     @Override
-    public @Nullable MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat) {
-        return null;
+    public @Nullable MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name) {
+        return getMenuItem(displayMat, name, null);
     }
 
     @Deprecated
     @Override
-    public @Nullable MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public @Nullable MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                           @Nullable List<@NotNull Component> description) {
         return null;
     }

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/config/RewardsFlag.java b/Minigames/src/main/java/au/com/mineauz/minigames/config/RewardsFlag.java
@@ -1,6 +1,5 @@
 package au.com.mineauz.minigames.config;
 
-import au.com.mineauz.minigames.menu.MenuItem;
 import au.com.mineauz.minigames.menu.MenuItemDisplayRewards;
 import au.com.mineauz.minigames.minigame.reward.Rewards;
 import net.kyori.adventure.text.Component;
@@ -32,14 +31,8 @@ public void loadValue(String path, FileConfiguration config) {
     }
 
     @Override
-    public MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat) {
-        return new MenuItemDisplayRewards(displayMat, name, getFlag());
-    }
-
-    @Override
-    public MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public MenuItemDisplayRewards getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                 @Nullable List<@NotNull Component> description) {
         return new MenuItemDisplayRewards(displayMat, name, description, getFlag());
     }
-
 }
diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/config/SimpleLocationFlag.java b/Minigames/src/main/java/au/com/mineauz/minigames/config/SimpleLocationFlag.java
@@ -39,13 +39,13 @@ public void loadValue(String path, FileConfiguration config) {
 
     @Deprecated
     @Override
-    public MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat) {
-        return null;
+    public MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name) {
+        return getMenuItem(displayMat, name, null);
     }
 
     @Deprecated
     @Override
-    public MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                 @Nullable List<@NotNull Component> description) {
         return null;
     }

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/config/StrListFlag.java b/Minigames/src/main/java/au/com/mineauz/minigames/config/StrListFlag.java
@@ -30,13 +30,13 @@ public void loadValue(String path, FileConfiguration config) {
 
     @Deprecated
     @Override
-    public MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat) {
-        return getMenuItem(name, displayMat, null);
+    public MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name) {
+        return getMenuItem(displayMat, name, null);
     }
 
     @Deprecated
     @Override
-    public MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                 @Nullable List<@NotNull Component> description) {
         return null; //todo
     }

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/config/StringFlag.java b/Minigames/src/main/java/au/com/mineauz/minigames/config/StringFlag.java
@@ -33,7 +33,7 @@ public void loadValue(String path, FileConfiguration config) {
     }
 
     @Override
-    public MenuItemString getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public MenuItemString getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                       @Nullable List<@NotNull Component> description) {
         return new MenuItemString(displayMat, name, description, new Callback<>() {
 

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/config/TeamFlag.java b/Minigames/src/main/java/au/com/mineauz/minigames/config/TeamFlag.java
@@ -65,13 +65,13 @@ public void loadValue(String path, FileConfiguration config) {
 
     @Deprecated
     @Override
-    public @Nullable MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat) {
+    public @Nullable MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name) {
         return null; //TODO: Menu Item
     }
 
     @Deprecated
     @Override
-    public @Nullable MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public @Nullable MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                           @Nullable List<@NotNull Component> description) {
         return null;
     }

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/config/TeamSetFlag.java b/Minigames/src/main/java/au/com/mineauz/minigames/config/TeamSetFlag.java
@@ -52,13 +52,13 @@ public void loadValue(String path, FileConfiguration config) {
 
     @Deprecated
     @Override
-    public @Nullable MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat) {
-        return getMenuItem(name, displayMat, null);
+    public @Nullable MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name) {
+        return getMenuItem(displayMat, name, null);
     }
 
     @Deprecated
     @Override
-    public @Nullable MenuItem getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public @Nullable MenuItem getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                           @Nullable List<@NotNull Component> description) {
         return null;
     }

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/config/TimeFlag.java b/Minigames/src/main/java/au/com/mineauz/minigames/config/TimeFlag.java
@@ -30,23 +30,23 @@ public void loadValue(String path, FileConfiguration config) {
 
     @Deprecated
     @Override
-    public MenuItemTime getMenuItem(@Nullable Component name, @Nullable Material displayMat) {
-        return getMenuItem(name, displayMat, null);
+    public MenuItemTime getMenuItem(@Nullable Material displayMat, @Nullable Component name) {
+        return getMenuItem(displayMat, name, null);
     }
 
-    public MenuItemTime getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public MenuItemTime getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                     @Nullable Long min, @Nullable Long max) {
-        return getMenuItem(name, displayMat, null, min, max);
+        return getMenuItem(displayMat, name, null, min, max);
     }
 
     @Deprecated
     @Override
-    public MenuItemTime getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public MenuItemTime getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                     @Nullable List<@NotNull Component> description) {
-        return getMenuItem(name, displayMat, description, 0L, null);
+        return getMenuItem(displayMat, name, description, 0L, null);
     }
 
-    public MenuItemTime getMenuItem(@Nullable Component name, @Nullable Material displayMat,
+    public MenuItemTime getMenuItem(@Nullable Material displayMat, @Nullable Component name,
                                     @Nullable List<@NotNull Component> description, @Nullable Long min, @Nullable Long max) {
         return new MenuItemTime(displayMat, name, description, new Callback<>() {