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 index 874a9bc9f1..476ba149ec 100644 --- 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 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 index 3524074b3a..b450cda737 100644 --- 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 deleted file mode 100644 index 41dc2551a2..0000000000 --- a/src/main/java/com/gregtechceu/gtceu/core/mixins/ForgeGuiMixin.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.gregtechceu.gtceu.core.mixins; - -import com.gregtechceu.gtceu.api.item.armor.ArmorComponentItem; -import com.llamalad7.mixinextras.injector.ModifyExpressionValue; -import net.minecraft.client.Minecraft; -import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.item.ItemStack; -import net.minecraftforge.client.gui.overlay.ForgeGui; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; - -@Mixin(value = ForgeGui.class, remap = false) -public abstract class ForgeGuiMixin { - - @Shadow - public abstract Minecraft getMinecraft(); - - @ModifyExpressionValue(method = "renderArmor", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;getArmorValue()I", remap = true)) - private int gtceu$modifyArmorAmount(int level) { - var armorInv = getMinecraft().player.getInventory().armor; - for (int i = 0; i < armorInv.size(); ++i) { - ItemStack armor = armorInv.get(i); - if (armor.getItem() instanceof ArmorComponentItem armorItem) { - EquipmentSlot slot = EquipmentSlot.byTypeAndIndex(EquipmentSlot.Type.ARMOR, i); - level += armorItem.getArmorDisplay(getMinecraft().player, armor, slot); - } - } - return level; - } -} 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 index 192c1d0004..cad482b7b0 100644 --- 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 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 index d5a865a124..ab70810532 100644 --- 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",