From 9990eb6a06462c07d9a9626f389a40c32ab4172f Mon Sep 17 00:00:00 2001 From: KnightMiner Date: Mon, 11 Dec 2017 08:53:50 -0600 Subject: [PATCH] Fix crash on server when loading armor (#9) --- .../feature/items/ItemArmorBase.java | 18 ------------------ .../{manyullyn.png => manyullyn_layer_1.png} | Bin ...lyn_leggings.png => manyullyn_layer_2.png} | Bin 3 files changed, 18 deletions(-) rename src/main/resources/assets/tcomplement/textures/models/armor/{manyullyn.png => manyullyn_layer_1.png} (100%) rename src/main/resources/assets/tcomplement/textures/models/armor/{manyullyn_leggings.png => manyullyn_layer_2.png} (100%) diff --git a/src/main/java/knightminer/tcomplement/feature/items/ItemArmorBase.java b/src/main/java/knightminer/tcomplement/feature/items/ItemArmorBase.java index 4c28aa0..c110d6b 100644 --- a/src/main/java/knightminer/tcomplement/feature/items/ItemArmorBase.java +++ b/src/main/java/knightminer/tcomplement/feature/items/ItemArmorBase.java @@ -1,31 +1,13 @@ package knightminer.tcomplement.feature.items; import knightminer.tcomplement.library.TCompRegistry; -import net.minecraft.entity.Entity; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemArmorBase extends ItemArmor { - private ResourceLocation texture; public ItemArmorBase(ArmorMaterial material, EntityEquipmentSlot slot) { super(material, 0, slot); this.setCreativeTab(TCompRegistry.tabGeneral); - this.texture = new ResourceLocation(material.getName()); } - - @SideOnly(Side.CLIENT) - @Override - public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) { - if(slot == EntityEquipmentSlot.LEGS) { - return String.format("%s:textures/models/armor/%s_leggings.png", texture.getResourceDomain(), texture.getResourcePath()); - } - - return String.format("%s:textures/models/armor/%s.png", texture.getResourceDomain(), texture.getResourcePath()); - } - } diff --git a/src/main/resources/assets/tcomplement/textures/models/armor/manyullyn.png b/src/main/resources/assets/tcomplement/textures/models/armor/manyullyn_layer_1.png similarity index 100% rename from src/main/resources/assets/tcomplement/textures/models/armor/manyullyn.png rename to src/main/resources/assets/tcomplement/textures/models/armor/manyullyn_layer_1.png diff --git a/src/main/resources/assets/tcomplement/textures/models/armor/manyullyn_leggings.png b/src/main/resources/assets/tcomplement/textures/models/armor/manyullyn_layer_2.png similarity index 100% rename from src/main/resources/assets/tcomplement/textures/models/armor/manyullyn_leggings.png rename to src/main/resources/assets/tcomplement/textures/models/armor/manyullyn_layer_2.png