diff --git a/src/main/java/com/simibubi/create/AllItems.java b/src/main/java/com/simibubi/create/AllItems.java index 09f224a80..b746ce92a 100644 --- a/src/main/java/com/simibubi/create/AllItems.java +++ b/src/main/java/com/simibubi/create/AllItems.java @@ -269,7 +269,7 @@ public class AllItems { COPPER_DIVING_HELMET = REGISTRATE.item("copper_diving_helmet", p -> new DivingHelmetItem(AllArmorMaterials.COPPER, p, Create.asResource("copper_diving"))) .register(), - NETHERITE_DIVING_HELMET = REGISTRATE.item("netherite_diving_helmet", p -> new DivingHelmetItem.Layered(ArmorMaterials.NETHERITE, p, Create.asResource("netherite_diving"))) + NETHERITE_DIVING_HELMET = REGISTRATE.item("netherite_diving_helmet", p -> new DivingHelmetItem(ArmorMaterials.NETHERITE, p, Create.asResource("netherite_diving"))) .register(); public static final ItemEntry @@ -277,7 +277,7 @@ public class AllItems { COPPER_DIVING_BOOTS = REGISTRATE.item("copper_diving_boots", p -> new DivingBootsItem(AllArmorMaterials.COPPER, p, Create.asResource("copper_diving"))) .register(), - NETHERITE_DIVING_BOOTS = REGISTRATE.item("netherite_diving_boots", p -> new DivingBootsItem.Layered(ArmorMaterials.NETHERITE, p, Create.asResource("netherite_diving"))) + NETHERITE_DIVING_BOOTS = REGISTRATE.item("netherite_diving_boots", p -> new DivingBootsItem(ArmorMaterials.NETHERITE, p, Create.asResource("netherite_diving"))) .register(); public static final ItemEntry SAND_PAPER = REGISTRATE.item("sand_paper", SandPaperItem::new) diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/DivingBootsItem.java b/src/main/java/com/simibubi/create/content/curiosities/armor/DivingBootsItem.java index 190bcf257..9b0abbed3 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/armor/DivingBootsItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/armor/DivingBootsItem.java @@ -1,8 +1,5 @@ package com.simibubi.create.content.curiosities.armor; -import java.util.Locale; - -import com.simibubi.create.foundation.item.LayeredArmorItem; import com.simibubi.create.foundation.utility.NBTHelper; import net.minecraft.resources.ResourceLocation; @@ -12,7 +9,6 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.Pose; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ArmorMaterial; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.phys.Vec3; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -76,15 +72,4 @@ public class DivingBootsItem extends BaseArmorItem { } return true; } - - public static class Layered extends DivingBootsItem implements LayeredArmorItem { - public Layered(ArmorMaterial material, Properties properties, ResourceLocation textureLoc) { - super(material, properties, textureLoc); - } - - @Override - public String getArmorTextureLocation(LivingEntity entity, EquipmentSlot slot, ItemStack stack, int layer) { - return String.format(Locale.ROOT, "%s:textures/models/armor/%s_layer_%d.png", textureLoc.getNamespace(), textureLoc.getPath(), layer); - } - } } diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/DivingHelmetItem.java b/src/main/java/com/simibubi/create/content/curiosities/armor/DivingHelmetItem.java index a4485170f..6cce67ed9 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/armor/DivingHelmetItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/armor/DivingHelmetItem.java @@ -1,11 +1,8 @@ package com.simibubi.create.content.curiosities.armor; -import java.util.Locale; - import org.jetbrains.annotations.Nullable; import com.simibubi.create.foundation.advancement.AllAdvancements; -import com.simibubi.create.foundation.item.LayeredArmorItem; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; @@ -96,15 +93,4 @@ public class DivingHelmetItem extends BaseArmorItem { entity.addEffect(new MobEffectInstance(MobEffects.WATER_BREATHING, 30, 0, true, false, true)); BacktankUtil.consumeAir(entity, backtank, 1); } - - public static class Layered extends DivingHelmetItem implements LayeredArmorItem { - public Layered(ArmorMaterial material, Properties properties, ResourceLocation textureLoc) { - super(material, properties, textureLoc); - } - - @Override - public String getArmorTextureLocation(LivingEntity entity, EquipmentSlot slot, ItemStack stack, int layer) { - return String.format(Locale.ROOT, "%s:textures/models/armor/%s_layer_%d.png", textureLoc.getNamespace(), textureLoc.getPath(), layer); - } - } } diff --git a/src/main/resources/assets/create/textures/models/armor/netherite_diving_layer_1.png b/src/main/resources/assets/create/textures/models/armor/netherite_diving_layer_1.png index 850bcece6..3e6499d72 100644 Binary files a/src/main/resources/assets/create/textures/models/armor/netherite_diving_layer_1.png and b/src/main/resources/assets/create/textures/models/armor/netherite_diving_layer_1.png differ diff --git a/src/main/resources/assets/create/textures/models/armor/netherite_diving_layer_2.png b/src/main/resources/assets/create/textures/models/armor/netherite_diving_layer_2.png index 515a9a12d..a88e34cb3 100644 Binary files a/src/main/resources/assets/create/textures/models/armor/netherite_diving_layer_2.png and b/src/main/resources/assets/create/textures/models/armor/netherite_diving_layer_2.png differ