fix GT armors being able to take durability damage

GregTechCEu · May 13, 2024 · ce1697b · ce1697b
1 parent 227bd87
commit ce1697b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 37 deletions.
diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/armor/ArmorComponentItem.java b/src/main/java/com/gregtechceu/gtceu/api/item/armor/ArmorComponentItem.java
@@ -40,7 +40,7 @@ public class ArmorComponentItem extends ArmorItem implements IComponentItem {
     protected List<IItemComponent> components;
 
     public ArmorComponentItem(ArmorMaterial material, ArmorItem.Type type, Properties properties) {
-        super(material, type, properties);
+        super(material, type, properties.durability(0));
         components = new ArrayList<>();
     }
 
@@ -83,6 +83,11 @@ public void onArmorTick(ItemStack stack, Level level, Player player) {
         this.armorLogic.onArmorTick(level, player, stack);
     }
 
+    @Override
+    public int getMaxDamage(ItemStack stack) {
+        return super.getMaxDamage(stack);
+    }
+
     @Override
     public boolean isValidRepairItem(ItemStack stack, ItemStack repairCandidate) {
         return false;

diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/armor/GTArmorMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/item/armor/GTArmorMaterials.java
@@ -16,19 +16,19 @@
 
 @AllArgsConstructor
 public enum GTArmorMaterials implements ArmorMaterial, StringRepresentable {
-    GOGGLES("goggles", 7, Util.make(new EnumMap<>(ArmorItem.Type.class), map -> {
+    GOGGLES("goggles", 0, Util.make(new EnumMap<>(ArmorItem.Type.class), map -> {
         map.put(ArmorItem.Type.BOOTS, 0);
         map.put(ArmorItem.Type.LEGGINGS, 0);
         map.put(ArmorItem.Type.CHESTPLATE, 0);
         map.put(ArmorItem.Type.HELMET, 0);
     }), 50, SoundEvents.ARMOR_EQUIP_GENERIC, 0.0F, 0.0F, () -> Ingredient.EMPTY),
-    JETPACK("jetpack", 15, Util.make(new EnumMap<>(ArmorItem.Type.class), map -> {
+    JETPACK("jetpack", 0, Util.make(new EnumMap<>(ArmorItem.Type.class), map -> {
         map.put(ArmorItem.Type.BOOTS, 0);
         map.put(ArmorItem.Type.LEGGINGS, 0);
         map.put(ArmorItem.Type.CHESTPLATE, 0);
         map.put(ArmorItem.Type.HELMET, 0);
     }), 50, SoundEvents.ARMOR_EQUIP_GENERIC, 0.0F, 0.0F, () -> Ingredient.EMPTY),
-    ARMOR("armor", 40, Util.make(new EnumMap<>(ArmorItem.Type.class), map -> {
+    ARMOR("armor", 0, Util.make(new EnumMap<>(ArmorItem.Type.class), map -> {
         map.put(ArmorItem.Type.BOOTS, 0);
         map.put(ArmorItem.Type.LEGGINGS, 0);
         map.put(ArmorItem.Type.CHESTPLATE, 0);

diff --git a/src/main/java/com/gregtechceu/gtceu/core/mixins/ForgeGuiMixin.java b/src/main/java/com/gregtechceu/gtceu/core/mixins/ForgeGuiMixin.java
diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java
@@ -1016,7 +1016,7 @@ private static void miscRecipes(Consumer<FinishedRecipe> provider) {
                 .outputItems(new ItemStack(Items.BLAZE_ROD))
                 .save(provider);
 
-        FLUID_HEATER_RECIPES.recipeBuilder("mud_to_clay")
+        COMPRESSOR_RECIPES.recipeBuilder("mud_to_clay")
                 .inputItems(Items.MUD)
                 .outputItems(Items.CLAY)
                 .duration(40).EUt(VA[LV]).save(provider);

diff --git a/src/main/resources/gtceu.mixins.json b/src/main/resources/gtceu.mixins.json
@@ -6,7 +6,6 @@
   "plugin": "com.gregtechceu.gtceu.core.mixins.GregTechMixinPlugin",
   "client": [
     "BlockModelMixin",
-    "ForgeGuiMixin",
     "GuiGraphicsAccessor",
     "GuiGraphicsMixin",
     "LevelRendererMixin",