Armor display mod

2026-03-06 23:10:58 +01:00
parent 6eb7fa4c8b
commit c93b0e049d
5 changed files with 250 additions and 124 deletions
@@ -0,0 +1,83 @@
+package org.saturnclient.impl.modules;
+
+import org.saturnclient.common.minecraft.bindings.SaturnItemStack;
+import org.saturnclient.modules.interfaces.ArmorDisplayInterface;
+
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.entity.EquipmentSlot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+
+public class ArmorDisplayFabric implements ArmorDisplayInterface {
+
+    private ItemStack get(EquipmentSlot slot) {
+        return MinecraftClient.getInstance().player.getEquippedStack(slot);
+    }
+
+    @Override
+    public SaturnItemStack getMainHand() {
+        return new SaturnItemStack(get(EquipmentSlot.MAINHAND));
+    }
+
+    @Override
+    public SaturnItemStack getHelmet() {
+        return new SaturnItemStack(get(EquipmentSlot.HEAD));
+    }
+
+    @Override
+    public SaturnItemStack getChestplate() {
+        return new SaturnItemStack(get(EquipmentSlot.CHEST));
+    }
+
+    @Override
+    public SaturnItemStack getLeggings() {
+        return new SaturnItemStack(get(EquipmentSlot.LEGS));
+    }
+
+    @Override
+    public SaturnItemStack getBoots() {
+        return new SaturnItemStack(get(EquipmentSlot.FEET));
+    }
+
+    @Override
+    public boolean isEmpty(SaturnItemStack stack) {
+        return ((ItemStack) stack.get()).isEmpty();
+    }
+
+    @Override
+    public int getMaxDamage(SaturnItemStack stack) {
+        return ((ItemStack) stack.get()).getMaxDamage();
+    }
+
+    @Override
+    public int getDamage(SaturnItemStack stack) {
+        return ((ItemStack) stack.get()).getDamage();
+    }
+
+    // Dummy items
+
+    @Override
+    public SaturnItemStack getDummyMainHand() {
+        return new SaturnItemStack(new ItemStack(Items.DIAMOND_SWORD));
+    }
+
+    @Override
+    public SaturnItemStack getDummyHelmet() {
+        return new SaturnItemStack(new ItemStack(Items.DIAMOND_HELMET));
+    }
+
+    @Override
+    public SaturnItemStack getDummyChestplate() {
+        return new SaturnItemStack(new ItemStack(Items.DIAMOND_CHESTPLATE));
+    }
+
+    @Override
+    public SaturnItemStack getDummyLeggings() {
+        return new SaturnItemStack(new ItemStack(Items.DIAMOND_LEGGINGS));
+    }
+
+    @Override
+    public SaturnItemStack getDummyBoots() {
+        return new SaturnItemStack(new ItemStack(Items.DIAMOND_BOOTS));
+    }
+}
@@ -1,103 +0,0 @@
-package org.saturnclient.modules.mods;
-
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.common.minecraft.bindings.SaturnItemStack;
-import org.saturnclient.config.manager.Property;
-import org.saturnclient.ui.RenderScope;
-
-import net.minecraft.entity.EquipmentSlot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
-
-public class ArmorDisplay extends Module implements HudMod {
-    private static Property<Boolean> enabled = Property.bool(false);
-    private static ModDimensions dimensions = new ModDimensions(40, 75);
-    private static Property<Boolean> useMainHand = Property.bool(false);
-
-    public ArmorDisplay() {
-        super(new ModuleDetails("Armor Display", "armor")
-                .description("Displays armor durability")
-                .version("v0.1.0")
-                .tags("Utility"),
-                enabled.named("Enabled"),
-                useMainHand.named("Use Main Hand"),
-                dimensions.prop());
-    }
-
-    public void renderArmor(RenderScope scope, ItemStack mainHand, ItemStack helmet, ItemStack chestplate,
-            ItemStack leggings, ItemStack boots) {
-        int row = 0;
-
-        if (useMainHand.value && !mainHand.isEmpty()) {
-            scope.drawItem(new SaturnItemStack(mainHand), 0, 15 * row);
-            renderHealth(scope, row, mainHand.getMaxDamage(), mainHand.getDamage());
-            row++;
-        }
-
-        if (!helmet.isEmpty()) {
-            scope.drawItem(new SaturnItemStack(helmet), 0, 15 * row);
-            renderHealth(scope, row, helmet.getMaxDamage(), helmet.getDamage());
-            row++;
-        }
-
-        if (!chestplate.isEmpty()) {
-            scope.drawItem(new SaturnItemStack(chestplate), 0, 15 * row);
-            renderHealth(scope, row, chestplate.getMaxDamage(), chestplate.getDamage());
-            row++;
-        }
-        if (!leggings.isEmpty()) {
-            scope.drawItem(new SaturnItemStack(leggings), 0, 15 * row);
-            renderHealth(scope, row, leggings.getMaxDamage(), leggings.getDamage());
-            row++;
-        }
-
-        if (!boots.isEmpty()) {
-            scope.drawItem(new SaturnItemStack(boots), 0, 15 * row);
-            renderHealth(scope, row, boots.getMaxDamage(), boots.getDamage());
-            row++;
-        }
-    }
-
-    public void renderHealth(RenderScope scope, int i, int max_damage, int damage) {
-        if (max_damage > 0) {
-            scope.drawText(0.5f, "" + (max_damage - damage), 17, (15 * i) + 3, dimensions.font.value,
-                    dimensions.fgColor.value);
-        }
-    }
-
-    @Override
-    public void renderHud(RenderScope scope) {
-        renderArmor(scope,
-                SaturnClient.client.player.getEquippedStack(EquipmentSlot.MAINHAND),
-                SaturnClient.client.player.getEquippedStack(EquipmentSlot.HEAD),
-                SaturnClient.client.player.getEquippedStack(EquipmentSlot.CHEST),
-                SaturnClient.client.player.getEquippedStack(EquipmentSlot.LEGS),
-                SaturnClient.client.player.getEquippedStack(EquipmentSlot.FEET));
-    }
-
-    @Override
-    public void renderDummy(RenderScope scope) {
-        renderArmor(scope, new ItemStack(Items.DIAMOND_SWORD), new ItemStack(Items.DIAMOND_HELMET),
-                new ItemStack(Items.DIAMOND_CHESTPLATE),
-                new ItemStack(Items.DIAMOND_LEGGINGS), new ItemStack(Items.DIAMOND_BOOTS));
-    }
-
-    @Override
-    public ModDimensions getDimensions() {
-        return dimensions;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return enabled.value;
-    }
-
-    @Override
-    public void onEnabled(boolean e) {
-        enabled.value = e;
-    }
-}