diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java index e01bf60cb..a1642b32e 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java @@ -12,6 +12,7 @@ package vazkii.botania.client.model.armor; import net.minecraft.client.renderer.entity.model.RendererModel; import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; import net.minecraft.inventory.EquipmentSlotType; import javax.annotation.Nonnull; @@ -218,7 +219,7 @@ public class ModelArmorElementium extends ModelArmor { } @Override - public void render(@Nonnull Entity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { + public void render(@Nonnull LivingEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { helmAnchor.showModel = slot == EquipmentSlotType.HEAD; bodyAnchor.showModel = slot == EquipmentSlotType.CHEST; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java index 099fe232e..cb03ad8f3 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java @@ -12,6 +12,7 @@ package vazkii.botania.client.model.armor; import net.minecraft.client.renderer.entity.model.RendererModel; import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; import net.minecraft.inventory.EquipmentSlotType; import javax.annotation.Nonnull; @@ -172,7 +173,7 @@ public class ModelArmorManasteel extends ModelArmor { } @Override - public void render(@Nonnull Entity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { + public void render(@Nonnull LivingEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { helmAnchor.showModel = slot == EquipmentSlotType.HEAD; bodyAnchor.showModel = slot == EquipmentSlotType.CHEST; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java index 4b92d5e42..55b7efdac 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java @@ -12,6 +12,7 @@ package vazkii.botania.client.model.armor; import net.minecraft.client.renderer.entity.model.RendererModel; import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; import net.minecraft.inventory.EquipmentSlotType; import javax.annotation.Nonnull; @@ -147,7 +148,7 @@ public class ModelArmorManaweave extends ModelArmor { } @Override - public void render(@Nonnull Entity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { + public void render(@Nonnull LivingEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { helmAnchor.showModel = slot == EquipmentSlotType.HEAD; bodyAnchor.showModel = slot == EquipmentSlotType.CHEST; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java index 3fb7f0100..70a02ac27 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java @@ -12,6 +12,7 @@ package vazkii.botania.client.model.armor; import net.minecraft.client.renderer.entity.model.RendererModel; import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; import net.minecraft.inventory.EquipmentSlotType; import javax.annotation.Nonnull; @@ -268,7 +269,7 @@ public class ModelArmorTerrasteel extends ModelArmor { } @Override - public void render(@Nonnull Entity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { + public void render(@Nonnull LivingEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { helmAnchor.showModel = slot == EquipmentSlotType.HEAD; bodyAnchor.showModel = slot == EquipmentSlotType.CHEST; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java index aa4a0c2a1..3e1c68802 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java @@ -4,6 +4,7 @@ import net.minecraft.client.renderer.entity.model.BipedModel; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; +import net.minecraft.util.LazyLoadBase; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.api.distmarker.Dist; @@ -26,9 +27,8 @@ public abstract class ItemElementiumArmor extends ItemManasteelArmor implements @Override @OnlyIn(Dist.CLIENT) - public BipedModel provideArmorModelForSlot(ItemStack stack, EquipmentSlotType slot) { - models.put(slot, new ModelArmorElementium(slot)); - return models.get(slot); + public BipedModel provideArmorModelForSlot(EquipmentSlotType slot) { + return new ModelArmorElementium(slot); } @Override @@ -36,41 +36,37 @@ public abstract class ItemElementiumArmor extends ItemManasteelArmor implements return ConfigHandler.CLIENT.enableArmorModels.get() ? LibResources.MODEL_ELEMENTIUM_NEW : slot == EquipmentSlotType.LEGS ? LibResources.MODEL_ELEMENTIUM_1 : LibResources.MODEL_ELEMENTIUM_0; } - static ItemStack[] armorset; + private static final LazyLoadBase armorSet = new LazyLoadBase<>(() -> new ItemStack[] { + new ItemStack(ModItems.elementiumHelm), + new ItemStack(ModItems.elementiumChest), + new ItemStack(ModItems.elementiumLegs), + new ItemStack(ModItems.elementiumBoots) + }); @Override public ItemStack[] getArmorSetStacks() { - if(armorset == null) - armorset = new ItemStack[] { - new ItemStack(ModItems.elementiumHelm), - new ItemStack(ModItems.elementiumChest), - new ItemStack(ModItems.elementiumLegs), - new ItemStack(ModItems.elementiumBoots) - }; - - return armorset; + return armorSet.getValue(); } @Override - public boolean hasArmorSetItem(PlayerEntity player, int i) { - if(player == null || player.inventory == null || player.inventory.armorInventory == null) + public boolean hasArmorSetItem(PlayerEntity player, EquipmentSlotType slot) { + if(player == null) return false; - ItemStack stack = player.inventory.armorInventory.get(3 - i); + ItemStack stack = player.getItemStackFromSlot(slot); if(stack.isEmpty()) return false; - switch(i) { - case 0: return stack.getItem() == ModItems.elementiumHelm || stack.getItem() == ModItems.elementiumHelmRevealing; - case 1: return stack.getItem() == ModItems.elementiumChest; - case 2: return stack.getItem() == ModItems.elementiumLegs; - case 3: return stack.getItem() == ModItems.elementiumBoots; + switch(slot) { + case HEAD: return stack.getItem() == ModItems.elementiumHelm || stack.getItem() == ModItems.elementiumHelmRevealing; + case CHEST: return stack.getItem() == ModItems.elementiumChest; + case LEGS: return stack.getItem() == ModItems.elementiumLegs; + case FEET: return stack.getItem() == ModItems.elementiumBoots; } return false; } - @OnlyIn(Dist.CLIENT) @Override public ITextComponent getArmorSetName() { return new TranslationTextComponent("botania.armorset.elementium.name"); diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 27a9d0fbc..f9616a76a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -21,6 +21,7 @@ import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ArmorItem; import net.minecraft.item.IArmorMaterial; import net.minecraft.item.ItemStack; +import net.minecraft.util.LazyLoadBase; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; @@ -28,6 +29,7 @@ import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.fml.DistExecutor; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.api.mana.IManaUsingItem; @@ -51,7 +53,7 @@ public class ItemManasteelArmor extends ArmorItem implements IManaUsingItem, IPh private static final String TAG_PHANTOM_INK = "phantomInk"; - protected Map models = null; + private final LazyLoadBase model; public final EquipmentSlotType type; public ItemManasteelArmor(EquipmentSlotType type, Properties props) { @@ -61,6 +63,8 @@ public class ItemManasteelArmor extends ArmorItem implements IManaUsingItem, IPh public ItemManasteelArmor(EquipmentSlotType type, IArmorMaterial mat, Properties props) { super(mat, type, props); this.type = type; + this.model = DistExecutor.runForDist(() -> () -> new LazyLoadBase<>(() -> this.provideArmorModelForSlot(type)), + () -> () -> null); } @Override @@ -94,31 +98,15 @@ public class ItemManasteelArmor extends ArmorItem implements IManaUsingItem, IPh @OnlyIn(Dist.CLIENT) public BipedModel getArmorModel(LivingEntity entityLiving, ItemStack itemStack, EquipmentSlotType armorSlot, BipedModel original) { if(ConfigHandler.CLIENT.enableArmorModels.get()) { - BipedModel model = getArmorModelForSlot(entityLiving, itemStack, armorSlot); - if(model == null) - model = provideArmorModelForSlot(itemStack, armorSlot); - - if(model != null) { - model.setModelAttributes(original); - return model; - } + return model.getValue(); } return super.getArmorModel(entityLiving, itemStack, armorSlot, original); } @OnlyIn(Dist.CLIENT) - public BipedModel getArmorModelForSlot(LivingEntity entity, ItemStack stack, EquipmentSlotType slot) { - if(models == null) - models = new EnumMap<>(EquipmentSlotType.class); - - return models.get(slot); - } - - @OnlyIn(Dist.CLIENT) - public BipedModel provideArmorModelForSlot(ItemStack stack, EquipmentSlotType slot) { - models.put(slot, new ModelArmorManasteel(slot)); - return models.get(slot); + public BipedModel provideArmorModelForSlot(EquipmentSlotType slot) { + return new ModelArmorManasteel(slot); } @Override @@ -140,9 +128,10 @@ public class ItemManasteelArmor extends ArmorItem implements IManaUsingItem, IPh list.add(getArmorSetTitle(player)); addArmorSetDescription(stack, list); ItemStack[] stacks = getArmorSetStacks(); - for(int i = 0; i < stacks.length; i++) { + for (ItemStack armor : stacks) { ITextComponent cmp = new StringTextComponent(" - ").appendSibling(stack.getDisplayName()); - if(hasArmorSetItem(player, i)) + EquipmentSlotType slot = ((ArmorItem) armor.getItem()).getEquipmentSlot(); + if (hasArmorSetItem(player, slot)) cmp.getStyle().setColor(TextFormatting.GREEN); list.add(cmp); } @@ -150,37 +139,34 @@ public class ItemManasteelArmor extends ArmorItem implements IManaUsingItem, IPh list.add(new TranslationTextComponent("botaniamisc.hasPhantomInk")); } - static ItemStack[] armorset; + private static final LazyLoadBase armorSet = new LazyLoadBase<>(() -> new ItemStack[] { + new ItemStack(ModItems.manasteelHelm), + new ItemStack(ModItems.manasteelChest), + new ItemStack(ModItems.manasteelLegs), + new ItemStack(ModItems.manasteelBoots) + }); public ItemStack[] getArmorSetStacks() { - if(armorset == null) - armorset = new ItemStack[] { - new ItemStack(ModItems.manasteelHelm), - new ItemStack(ModItems.manasteelChest), - new ItemStack(ModItems.manasteelLegs), - new ItemStack(ModItems.manasteelBoots) - }; - - return armorset; + return armorSet.getValue(); } public boolean hasArmorSet(PlayerEntity player) { - return hasArmorSetItem(player, 0) && hasArmorSetItem(player, 1) && hasArmorSetItem(player, 2) && hasArmorSetItem(player, 3); + return hasArmorSetItem(player, EquipmentSlotType.HEAD) && hasArmorSetItem(player, EquipmentSlotType.CHEST) && hasArmorSetItem(player, EquipmentSlotType.LEGS) && hasArmorSetItem(player, EquipmentSlotType.FEET); } - public boolean hasArmorSetItem(PlayerEntity player, int i) { + public boolean hasArmorSetItem(PlayerEntity player, EquipmentSlotType slot) { if(player == null || player.inventory == null || player.inventory.armorInventory == null) return false; - ItemStack stack = player.inventory.armorInventory.get(3 - i); + ItemStack stack = player.getItemStackFromSlot(slot); if(stack.isEmpty()) return false; - switch(i) { - case 0: return stack.getItem() == ModItems.manasteelHelm || stack.getItem() == ModItems.manasteelHelmRevealing; - case 1: return stack.getItem() == ModItems.manasteelChest; - case 2: return stack.getItem() == ModItems.manasteelLegs; - case 3: return stack.getItem() == ModItems.manasteelBoots; + switch(slot) { + case HEAD: return stack.getItem() == ModItems.manasteelHelm || stack.getItem() == ModItems.manasteelHelmRevealing; + case CHEST: return stack.getItem() == ModItems.manasteelChest; + case LEGS: return stack.getItem() == ModItems.manasteelLegs; + case FEET: return stack.getItem() == ModItems.manasteelBoots; } return false; @@ -188,19 +174,17 @@ public class ItemManasteelArmor extends ArmorItem implements IManaUsingItem, IPh private int getSetPiecesEquipped(PlayerEntity player) { int pieces = 0; - for(int i = 0; i < 4; i++) - if(hasArmorSetItem(player, i)) + for(EquipmentSlotType slot : EquipmentSlotType.values()) + if (slot.getSlotType() == EquipmentSlotType.Group.ARMOR && hasArmorSetItem(player, slot)) pieces++; return pieces; } - @OnlyIn(Dist.CLIENT) public ITextComponent getArmorSetName() { return new TranslationTextComponent("botania.armorset.manasteel.name"); } - @OnlyIn(Dist.CLIENT) private ITextComponent getArmorSetTitle(PlayerEntity player) { return new TranslationTextComponent("botaniamisc.armorset") .appendText(" ") diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index 95ea4a1cc..bbc03ae50 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -15,6 +15,7 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; +import net.minecraft.util.LazyLoadBase; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; @@ -42,9 +43,8 @@ public class ItemManaweaveArmor extends ItemManasteelArmor { @Override @OnlyIn(Dist.CLIENT) - public BipedModel provideArmorModelForSlot(ItemStack stack, EquipmentSlotType slot) { - models.put(slot, new ModelArmorManaweave(slot)); - return models.get(slot); + public BipedModel provideArmorModelForSlot(EquipmentSlotType slot) { + return new ModelArmorManaweave(slot); } @Override @@ -62,41 +62,37 @@ public class ItemManaweaveArmor extends ItemManasteelArmor { return name; } - private static ItemStack[] armorset; + private static final LazyLoadBase armorSet = new LazyLoadBase<>(() -> new ItemStack[] { + new ItemStack(ModItems.manaweaveHelm), + new ItemStack(ModItems.manaweaveChest), + new ItemStack(ModItems.manaweaveLegs), + new ItemStack(ModItems.manaweaveBoots) + }); @Override public ItemStack[] getArmorSetStacks() { - if(armorset == null) - armorset = new ItemStack[] { - new ItemStack(ModItems.manaweaveHelm), - new ItemStack(ModItems.manaweaveChest), - new ItemStack(ModItems.manaweaveLegs), - new ItemStack(ModItems.manaweaveBoots) - }; - - return armorset; + return armorSet.getValue(); } @Override - public boolean hasArmorSetItem(PlayerEntity player, int i) { - if(player == null || player.inventory == null || player.inventory.armorInventory == null) + public boolean hasArmorSetItem(PlayerEntity player, EquipmentSlotType slot) { + if(player == null) return false; - ItemStack stack = player.inventory.armorInventory.get(3 - i); + ItemStack stack = player.getItemStackFromSlot(slot); if(stack.isEmpty()) return false; - switch(i) { - case 0: return stack.getItem() == ModItems.manaweaveHelm; - case 1: return stack.getItem() == ModItems.manaweaveChest; - case 2: return stack.getItem() == ModItems.manaweaveLegs; - case 3: return stack.getItem() == ModItems.manaweaveBoots; + switch(slot) { + case HEAD: return stack.getItem() == ModItems.manaweaveHelm; + case CHEST: return stack.getItem() == ModItems.manaweaveChest; + case LEGS: return stack.getItem() == ModItems.manaweaveLegs; + case FEET: return stack.getItem() == ModItems.manaweaveBoots; } return false; } - @OnlyIn(Dist.CLIENT) @Override public ITextComponent getArmorSetName() { return new TranslationTextComponent("botania.armorset.manaweave.name"); diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index 45fed334c..14cfb93b3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -17,6 +17,7 @@ import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; +import net.minecraft.util.LazyLoadBase; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.api.distmarker.Dist; @@ -40,9 +41,8 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { @Override @OnlyIn(Dist.CLIENT) - public BipedModel provideArmorModelForSlot(ItemStack stack, EquipmentSlotType slot) { - models.put(slot, new ModelArmorTerrasteel(slot)); - return models.get(slot); + public BipedModel provideArmorModelForSlot(EquipmentSlotType slot) { + return new ModelArmorTerrasteel(slot); } @Override @@ -63,41 +63,37 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { return multimap; } - private static ItemStack[] armorset; + private static final LazyLoadBase armorSet = new LazyLoadBase<>(() -> new ItemStack[] { + new ItemStack(ModItems.terrasteelHelm), + new ItemStack(ModItems.terrasteelChest), + new ItemStack(ModItems.terrasteelLegs), + new ItemStack(ModItems.terrasteelBoots) + }); @Override public ItemStack[] getArmorSetStacks() { - if(armorset == null) - armorset = new ItemStack[] { - new ItemStack(ModItems.terrasteelHelm), - new ItemStack(ModItems.terrasteelChest), - new ItemStack(ModItems.terrasteelLegs), - new ItemStack(ModItems.terrasteelBoots) - }; - - return armorset; + return armorSet.getValue(); } @Override - public boolean hasArmorSetItem(PlayerEntity player, int i) { - if(player == null || player.inventory == null || player.inventory.armorInventory == null) + public boolean hasArmorSetItem(PlayerEntity player, EquipmentSlotType slot) { + if(player == null) return false; - ItemStack stack = player.inventory.armorInventory.get(3 - i); + ItemStack stack = player.getItemStackFromSlot(slot); if(stack.isEmpty()) return false; - switch(i) { - case 0: return stack.getItem() == ModItems.terrasteelHelm || stack.getItem() == ModItems.terrasteelHelmRevealing; - case 1: return stack.getItem() == ModItems.terrasteelChest; - case 2: return stack.getItem() == ModItems.terrasteelLegs; - case 3: return stack.getItem() == ModItems.terrasteelBoots; + switch(slot) { + case HEAD: return stack.getItem() == ModItems.terrasteelHelm || stack.getItem() == ModItems.terrasteelHelmRevealing; + case CHEST: return stack.getItem() == ModItems.terrasteelChest; + case LEGS: return stack.getItem() == ModItems.terrasteelLegs; + case FEET: return stack.getItem() == ModItems.terrasteelBoots; } return false; } - @OnlyIn(Dist.CLIENT) @Override public ITextComponent getArmorSetName() { return new TranslationTextComponent("botania.armorset.terrasteel.name");