From dc8511f1f09ed2b04b31ef3dffda4e1f075b12e9 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Wed, 14 Aug 2019 14:04:49 +0300 Subject: [PATCH] Fix armor textures --- src/main/java/techreborn/init/TRArmorMaterial.java | 5 ++++- .../items/armor/ItemLapotronicOrbpack.java | 3 ++- .../items/armor/ItemLithiumIonBatpack.java | 3 ++- .../{lapotronpack.png => lapotronpack_layer_1.png} | Bin ...ithiumbatpack.png => lithiumbatpack_layer_1.png} | Bin 5 files changed, 8 insertions(+), 3 deletions(-) rename src/main/resources/assets/minecraft/textures/models/armor/{lapotronpack.png => lapotronpack_layer_1.png} (100%) rename src/main/resources/assets/minecraft/textures/models/armor/{lithiumbatpack.png => lithiumbatpack_layer_1.png} (100%) diff --git a/src/main/java/techreborn/init/TRArmorMaterial.java b/src/main/java/techreborn/init/TRArmorMaterial.java index 84ef4fb1d..c8008d389 100644 --- a/src/main/java/techreborn/init/TRArmorMaterial.java +++ b/src/main/java/techreborn/init/TRArmorMaterial.java @@ -48,7 +48,10 @@ public enum TRArmorMaterial implements ArmorMaterial { PERIDOT(17, new int[] { 3, 8, 3, 2 }, 16, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 0.0F, () -> { return Ingredient.ofItems(TRContent.Gems.PERIDOT.asItem()); }), - CLOAKING(5, new int[] { 1, 2, 3, 1 }, 0, SoundEvents.ITEM_ARMOR_EQUIP_GOLD, 0.0F, null); + CLOAKING(5, new int[] { 1, 2, 3, 1 }, 0, SoundEvents.ITEM_ARMOR_EQUIP_GOLD, 0.0F, null), + LITHIUMBATPACK(25, new int[]{2, 5, 6, 2}, 10, SoundEvents.ITEM_ARMOR_EQUIP_TURTLE, 0.0F, null), + LAPOTRONPACK(33, new int[]{3, 6, 8, 3}, 10, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 2.0F, null); + private static final int[] MAX_DAMAGE_ARRAY = new int[]{13, 15, 16, 11}; private final int maxDamageFactor; diff --git a/src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java b/src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java index 682ddcf2d..a2142e7fd 100644 --- a/src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java +++ b/src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java @@ -36,6 +36,7 @@ import reborncore.common.util.ItemDurabilityExtensions; import reborncore.common.util.ItemUtils; import techreborn.TechReborn; import techreborn.config.TechRebornConfig; +import techreborn.init.TRArmorMaterial; import techreborn.init.TRContent; import techreborn.utils.InitUtils; @@ -46,7 +47,7 @@ public class ItemLapotronicOrbpack extends ArmorItem implements IEnergyItemInfo, public int transferLimit = 100_000; public ItemLapotronicOrbpack() { - super(ArmorMaterials.DIAMOND, EquipmentSlot.CHEST, new Item.Settings().group(TechReborn.ITEMGROUP).maxCount(1)); + super(TRArmorMaterial.LAPOTRONPACK, EquipmentSlot.CHEST, new Item.Settings().group(TechReborn.ITEMGROUP).maxCount(1)); } // Item diff --git a/src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java b/src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java index 2ae97a90c..802d99141 100644 --- a/src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java +++ b/src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java @@ -40,6 +40,7 @@ import reborncore.common.util.ItemDurabilityExtensions; import reborncore.common.util.ItemUtils; import techreborn.TechReborn; import techreborn.config.TechRebornConfig; +import techreborn.init.TRArmorMaterial; import techreborn.init.TRContent; import techreborn.utils.InitUtils; @@ -50,7 +51,7 @@ public class ItemLithiumIonBatpack extends ArmorItem implements IEnergyItemInfo, public int transferLimit = 2_000; public ItemLithiumIonBatpack() { - super(ArmorMaterials.DIAMOND, EquipmentSlot.CHEST, new Item.Settings().group(TechReborn.ITEMGROUP).maxCount(1)); + super(TRArmorMaterial.LITHIUMBATPACK, EquipmentSlot.CHEST, new Item.Settings().group(TechReborn.ITEMGROUP).maxCount(1)); } public static void distributePowerToInventory(World world, PlayerEntity player, ItemStack itemStack, int maxSend) { diff --git a/src/main/resources/assets/minecraft/textures/models/armor/lapotronpack.png b/src/main/resources/assets/minecraft/textures/models/armor/lapotronpack_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/lapotronpack.png rename to src/main/resources/assets/minecraft/textures/models/armor/lapotronpack_layer_1.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/lithiumbatpack.png b/src/main/resources/assets/minecraft/textures/models/armor/lithiumbatpack_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/lithiumbatpack.png rename to src/main/resources/assets/minecraft/textures/models/armor/lithiumbatpack_layer_1.png