v2.0.0

Author: dsnsgithub

gradle.properties

@@ -10,7 +10,7 @@ loader_version=0.17.3
 loom_version=1.11-SNAPSHOT
 
 # Mod Properties
-mod_version=1.1.1
+mod_version=2.0.0
 maven_group=dsns.betterhud
 archives_base_name=betterhud
 

src/main/java/dsns/betterhud/BetterHUDGUI.java

@@ -38,7 +38,9 @@ public void onStartTick(MinecraftClient client) {
         for (BaseMod mod : BetterHUD.mods) {
             ModSettings modSettings = mod.getModSettings();
             if (!modSettings.getSetting("Enabled").getBooleanValue()) continue;
-            System.out.println(modSettings.getSetting("Enabled").getBooleanValue());
+            System.out.println(
+                modSettings.getSetting("Enabled").getBooleanValue()
+            );
 
             CustomText modText = mod.onStartTick(client);
             System.out.println(modText);

src/main/java/dsns/betterhud/mods/Coordinates.java

@@ -4,16 +4,37 @@
 import dsns.betterhud.util.CustomText;
 import dsns.betterhud.util.ModSettings;
 import dsns.betterhud.util.Setting;
-import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.entity.player.PlayerEntity;
 
 class CoordinatesSettings extends ModSettings {
 
     public CoordinatesSettings(String position) {
         super(position);
-        HashMap<String, Setting> settings = super.getSettings();
-        settings.put("decimal", Setting.createBooleanSetting(false));
+        LinkedHashMap<String, Setting> settings = super.getSettings();
+
+        List<Map.Entry<String, Setting>> entries = new ArrayList<>(
+            settings.entrySet()
+        );
+        settings.clear();
+
+        int insertIndex = 2;
+
+        for (int i = 0; i < Math.min(insertIndex, entries.size()); i++) {
+            Map.Entry<String, Setting> entry = entries.get(i);
+            settings.put(entry.getKey(), entry.getValue());
+        }
+
+        settings.put("Decimal", Setting.createBooleanSetting(false));
+
+        for (int i = insertIndex; i < entries.size(); i++) {
+            Map.Entry<String, Setting> entry = entries.get(i);
+            settings.put(entry.getKey(), entry.getValue());
+        }
     }
 }
 
@@ -39,28 +60,21 @@ public CustomText onStartTick(MinecraftClient client) {
 
         if (player == null) return null;
 
-        
-        
-        if (SETTINGS.getSetting("decimal").getBooleanValue()) {
+        if (SETTINGS.getSetting("Decimal").getBooleanValue()) {
             String roundX = String.format("%.2f", player.getX());
             String roundY = String.format("%.2f", player.getY());
             String roundZ = String.format("%.2f", player.getZ());
-            
+
             return new CustomText(
                 roundX + ", " + roundY + ", " + roundZ,
                 getModSettings()
             );
         } else {
-            String roundX = String.format("%d", player.getX());
-            String roundY = String.format("%d", player.getY());
-            String roundZ = String.format("%d", player.getZ());
-            
-            return new CustomText(
-                roundX + ", " + roundY + ", " + roundZ,
-                getModSettings()
-            );
-        }
+            int x = (int) player.getX();
+            int y = (int) player.getY();
+            int z = (int) player.getZ();
 
-        
+            return new CustomText(x + ", " + y + ", " + z, getModSettings());
+        }
     }
 }

src/main/java/dsns/betterhud/util/Setting.java

@@ -36,12 +36,15 @@ public static Setting createIntegerSetting(int value, int min, int max) {
             new String[] { String.valueOf(min), String.valueOf(max) }
         );
     }
-    
+
     public static Setting createColorSetting(int value) {
         return new Setting(
             String.valueOf(value),
             "color",
-            new String[] { String.valueOf(0x00000000), String.valueOf(0xffffffff) }
+            new String[] {
+                String.valueOf(0x00000000),
+                String.valueOf(0xffffffff),
+            }
         );
     }
 
@@ -56,39 +59,39 @@ public static Setting createDoubleSetting(
             new String[] { String.valueOf(min), String.valueOf(max) }
         );
     }
-    
+
     public String getType() {
         return type;
     }
-    
+
     public String getStringValue() {
         return value;
     }
-    
+
     public int getIntValue() {
         return Integer.parseInt(value);
     }
-    
+
     public double getDoubleValue() {
         return Double.parseDouble(value);
     }
-    
+
     public int getColorValue() {
         return Integer.parseInt(value);
     }
-    
+
     public boolean getBooleanValue() {
         return Boolean.parseBoolean(value);
     }
-    
+
     public String[] getPossibleValues() {
         return possibleValues;
     }
-    
+
     public String getDefaultValue() {
         return defaultValue;
     }
-    
+
     public void setValue(String value) {
         this.value = value;
     }