From dd6a06409e77600857d1dbf42b22cfe4f8addf12 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Sun, 17 Mar 2019 23:47:21 +0300 Subject: [PATCH] Bronze armor and tools --- .../techreborn/events/RegistryEventHandler.java | 9 +++++---- .../java/techreborn/init/TRArmorMaterial.java | 3 ++- .../java/techreborn/items/tool/ItemChainsaw.java | 3 ++- .../java/techreborn/items/tool/ItemDrill.java | 3 ++- .../techreborn/items/tool/ItemJackhammer.java | 3 ++- .../items/tool/advanced/ItemRockCutter.java | 3 ++- .../items/tool/basic/ItemElectricTreetap.java | 3 ++- .../items/tool/industrial/ItemNanosaber.java | 3 ++- .../techreborn/items/tool/vanilla/ItemTRAxe.java | 3 ++- .../techreborn/items/tool/vanilla/ItemTRHoe.java | 3 ++- .../items/tool/vanilla/ItemTRPickaxe.java | 3 ++- .../items/tool/vanilla/ItemTRSpade.java | 3 ++- .../items/tool/vanilla/ItemTRSword.java | 3 ++- .../techreborn/models/item/bronze_axe.json | 6 ++++++ .../techreborn/models/item/bronze_boots.json | 6 ++++++ .../models/item/bronze_chestplate.json | 6 ++++++ .../techreborn/models/item/bronze_helmet.json | 6 ++++++ .../techreborn/models/item/bronze_hoe.json | 6 ++++++ .../techreborn/models/item/bronze_leggings.json | 6 ++++++ .../techreborn/models/item/bronze_pickaxe.json | 6 ++++++ .../techreborn/models/item/bronze_spade.json | 6 ++++++ .../techreborn/models/item/bronze_sword.json | 6 ++++++ .../techreborn/models/item/techrebornitem.json | 3 --- .../textures/models/armor/bronze_layer_1.png | Bin 0 -> 2353 bytes .../textures/models/armor/bronze_layer_2.png | Bin 0 -> 1185 bytes 25 files changed, 83 insertions(+), 19 deletions(-) create mode 100644 src/main/resources/assets/techreborn/models/item/bronze_axe.json create mode 100644 src/main/resources/assets/techreborn/models/item/bronze_boots.json create mode 100644 src/main/resources/assets/techreborn/models/item/bronze_chestplate.json create mode 100644 src/main/resources/assets/techreborn/models/item/bronze_helmet.json create mode 100644 src/main/resources/assets/techreborn/models/item/bronze_hoe.json create mode 100644 src/main/resources/assets/techreborn/models/item/bronze_leggings.json create mode 100644 src/main/resources/assets/techreborn/models/item/bronze_pickaxe.json create mode 100644 src/main/resources/assets/techreborn/models/item/bronze_spade.json create mode 100644 src/main/resources/assets/techreborn/models/item/bronze_sword.json delete mode 100644 src/main/resources/assets/techreborn/models/item/techrebornitem.json create mode 100644 src/main/resources/assets/techreborn/textures/models/armor/bronze_layer_1.png create mode 100644 src/main/resources/assets/techreborn/textures/models/armor/bronze_layer_2.png diff --git a/src/main/java/techreborn/events/RegistryEventHandler.java b/src/main/java/techreborn/events/RegistryEventHandler.java index c05026ffe..5446825ed 100644 --- a/src/main/java/techreborn/events/RegistryEventHandler.java +++ b/src/main/java/techreborn/events/RegistryEventHandler.java @@ -71,6 +71,7 @@ import techreborn.items.tool.basic.ItemElectricTreetap; import techreborn.items.tool.industrial.*; import techreborn.items.tool.vanilla.ItemTRAxe; import techreborn.items.tool.vanilla.ItemTRHoe; +import techreborn.items.tool.vanilla.ItemTRPickaxe; import techreborn.items.tool.vanilla.ItemTRSpade; import techreborn.items.tool.vanilla.ItemTRSword; import techreborn.utils.InitUtils; @@ -129,7 +130,7 @@ public class RegistryEventHandler { if (ConfigTechReborn.enableGemArmorAndTools) { //Todo: repair with tags RebornRegistry.registerItem(TRContent.BRONZE_SWORD = InitUtils.setup(new ItemTRSword(TRToolTier.BRONZE, "ingotBronze"), "bronze_sword")); - RebornRegistry.registerItem(TRContent.BRONZE_PICKAXE = InitUtils.setup(new ItemTRSword(TRToolTier.BRONZE, "ingotBronze"), "bronze_pickaxe")); + RebornRegistry.registerItem(TRContent.BRONZE_PICKAXE = InitUtils.setup(new ItemTRPickaxe(TRToolTier.BRONZE, "ingotBronze"), "bronze_pickaxe")); RebornRegistry.registerItem(TRContent.BRONZE_SPADE = InitUtils.setup(new ItemTRSpade(TRToolTier.BRONZE, "ingotBronze"), "bronze_spade")); RebornRegistry.registerItem(TRContent.BRONZE_AXE = InitUtils.setup(new ItemTRAxe(TRToolTier.BRONZE, "ingotBronze"), "bronze_axe")); RebornRegistry.registerItem(TRContent.BRONZE_HOE = InitUtils.setup(new ItemTRHoe(TRToolTier.BRONZE, "ingotBronze"), "bronze_hoe")); @@ -140,7 +141,7 @@ public class RegistryEventHandler { RebornRegistry.registerItem(TRContent.BRONZE_BOOTS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.BRONZE, EntityEquipmentSlot.FEET, "ingotBronze"), "bronze_boots")); RebornRegistry.registerItem(TRContent.RUBY_SWORD = InitUtils.setup(new ItemTRSword(TRToolTier.RUBY, "gemRuby"), "ruby_sword")); - RebornRegistry.registerItem(TRContent.RUBY_PICKAXE = InitUtils.setup(new ItemTRSword(TRToolTier.RUBY, "gemRuby"), "ruby_pickaxe")); + RebornRegistry.registerItem(TRContent.RUBY_PICKAXE = InitUtils.setup(new ItemTRPickaxe(TRToolTier.RUBY, "gemRuby"), "ruby_pickaxe")); RebornRegistry.registerItem(TRContent.RUBY_SPADE = InitUtils.setup(new ItemTRSpade(TRToolTier.RUBY, "gemRuby"), "ruby_spade")); RebornRegistry.registerItem(TRContent.RUBY_AXE = InitUtils.setup(new ItemTRAxe(TRToolTier.RUBY, "gemRuby"), "ruby_axe")); RebornRegistry.registerItem(TRContent.RUBY_HOE = InitUtils.setup(new ItemTRHoe(TRToolTier.RUBY, "gemRuby"), "ruby_hoe")); @@ -151,7 +152,7 @@ public class RegistryEventHandler { RebornRegistry.registerItem(TRContent.RUBY_BOOTS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.RUBY, EntityEquipmentSlot.FEET, "gemRuby"), "ruby_boots")); RebornRegistry.registerItem(TRContent.SAPPHIRE_SWORD = InitUtils.setup(new ItemTRSword(TRToolTier.SAPPHIRE, "gemSapphire"), "sapphire_sword")); - RebornRegistry.registerItem(TRContent.SAPPHIRE_PICKAXE = InitUtils.setup(new ItemTRSword(TRToolTier.SAPPHIRE, "gemSapphire"), "sapphire_pickaxe")); + RebornRegistry.registerItem(TRContent.SAPPHIRE_PICKAXE = InitUtils.setup(new ItemTRPickaxe(TRToolTier.SAPPHIRE, "gemSapphire"), "sapphire_pickaxe")); RebornRegistry.registerItem(TRContent.SAPPHIRE_SPADE = InitUtils.setup(new ItemTRSpade(TRToolTier.SAPPHIRE, "gemSapphire"), "sapphire_spade")); RebornRegistry.registerItem(TRContent.SAPPHIRE_AXE = InitUtils.setup(new ItemTRAxe(TRToolTier.SAPPHIRE, "gemSapphire"), "sapphire_axe")); RebornRegistry.registerItem(TRContent.SAPPHIRE_HOE = InitUtils.setup(new ItemTRHoe(TRToolTier.SAPPHIRE, "gemSapphire"), "sapphire_hoe")); @@ -162,7 +163,7 @@ public class RegistryEventHandler { RebornRegistry.registerItem(TRContent.SAPPHIRE_BOOTS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.SAPPHIRE, EntityEquipmentSlot.FEET, "gemSapphire"), "sapphire_boots")); RebornRegistry.registerItem(TRContent.PERIDOT_SWORD = InitUtils.setup(new ItemTRSword(TRToolTier.PERIDOT, "gemPeridot"), "peridot_sword")); - RebornRegistry.registerItem(TRContent.PERIDOT_PICKAXE = InitUtils.setup(new ItemTRSword(TRToolTier.PERIDOT, "gemPeridot"), "peridot_pickaxe")); + RebornRegistry.registerItem(TRContent.PERIDOT_PICKAXE = InitUtils.setup(new ItemTRPickaxe(TRToolTier.PERIDOT, "gemPeridot"), "peridot_pickaxe")); RebornRegistry.registerItem(TRContent.PERIDOT_SPADE = InitUtils.setup(new ItemTRSpade(TRToolTier.PERIDOT, "gemPeridot"), "peridot_spade")); RebornRegistry.registerItem(TRContent.PERIDOT_AXE = InitUtils.setup(new ItemTRAxe(TRToolTier.PERIDOT, "gemPeridot"), "peridot_axe")); RebornRegistry.registerItem(TRContent.PERIDOT_HOE = InitUtils.setup(new ItemTRHoe(TRToolTier.PERIDOT, "gemPeridot"), "peridot_hoe")); diff --git a/src/main/java/techreborn/init/TRArmorMaterial.java b/src/main/java/techreborn/init/TRArmorMaterial.java index 56f247d30..77b2d1d96 100644 --- a/src/main/java/techreborn/init/TRArmorMaterial.java +++ b/src/main/java/techreborn/init/TRArmorMaterial.java @@ -32,6 +32,7 @@ import net.minecraft.item.IArmorMaterial; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.LazyLoadBase; import net.minecraft.util.SoundEvent; +import techreborn.TechReborn; public enum TRArmorMaterial implements IArmorMaterial { @@ -98,7 +99,7 @@ public enum TRArmorMaterial implements IArmorMaterial { @Override public String getName() { - return null; + return TechReborn.MOD_ID + ":" + this.toString().toLowerCase(); } @Override diff --git a/src/main/java/techreborn/items/tool/ItemChainsaw.java b/src/main/java/techreborn/items/tool/ItemChainsaw.java index 6b966e23f..2521e4394 100644 --- a/src/main/java/techreborn/items/tool/ItemChainsaw.java +++ b/src/main/java/techreborn/items/tool/ItemChainsaw.java @@ -44,6 +44,7 @@ import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemContainerProvider; import reborncore.common.powerSystem.forge.ForgePowerItemManager; import reborncore.common.util.ItemUtils; +import techreborn.TechReborn; import javax.annotation.Nullable; import java.util.Random; @@ -58,7 +59,7 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo { public boolean isBreaking = false; public ItemChainsaw(ItemTier material, int energyCapacity, float unpoweredSpeed) { - super(material, (int) material.getAttackDamage(), unpoweredSpeed, new Item.Properties().maxStackSize(1)); + super(material, (int) material.getAttackDamage(), unpoweredSpeed, new Item.Properties().group(TechReborn.ITEMGROUP).maxStackSize(1)); this.maxCharge = energyCapacity; this.efficiency = unpoweredSpeed; diff --git a/src/main/java/techreborn/items/tool/ItemDrill.java b/src/main/java/techreborn/items/tool/ItemDrill.java index 11c0aa5c1..a15dfb514 100644 --- a/src/main/java/techreborn/items/tool/ItemDrill.java +++ b/src/main/java/techreborn/items/tool/ItemDrill.java @@ -43,6 +43,7 @@ import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemContainerProvider; import reborncore.common.powerSystem.forge.ForgePowerItemManager; import reborncore.common.util.ItemUtils; +import techreborn.TechReborn; import javax.annotation.Nullable; import java.util.Random; @@ -55,7 +56,7 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo { public int transferLimit = 100; public ItemDrill(IItemTier material, int energyCapacity, float unpoweredSpeed, float efficiencyOnProperMaterial) { - super(material, (int) material.getAttackDamage(), unpoweredSpeed, new Item.Properties().maxStackSize(1)); + super(material, (int) material.getAttackDamage(), unpoweredSpeed, new Item.Properties().group(TechReborn.ITEMGROUP).maxStackSize(1)); this.efficiency = efficiencyOnProperMaterial; this.maxCharge = energyCapacity; this.unpoweredSpeed = unpoweredSpeed; diff --git a/src/main/java/techreborn/items/tool/ItemJackhammer.java b/src/main/java/techreborn/items/tool/ItemJackhammer.java index 70f541b23..528fd5965 100644 --- a/src/main/java/techreborn/items/tool/ItemJackhammer.java +++ b/src/main/java/techreborn/items/tool/ItemJackhammer.java @@ -44,6 +44,7 @@ import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemContainerProvider; import reborncore.common.powerSystem.forge.ForgePowerItemManager; import reborncore.common.util.ItemUtils; +import techreborn.TechReborn; import techreborn.utils.TagUtils; import javax.annotation.Nullable; @@ -56,7 +57,7 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo { public int transferLimit = 100; public ItemJackhammer(ItemTier material, int energyCapacity) { - super(material, (int) material.getAttackDamage(), 1f, new Item.Properties().maxStackSize(1)); + super(material, (int) material.getAttackDamage(), 1f, new Item.Properties().group(TechReborn.ITEMGROUP).maxStackSize(1)); efficiency = 20F; this.maxCharge = energyCapacity; } diff --git a/src/main/java/techreborn/items/tool/advanced/ItemRockCutter.java b/src/main/java/techreborn/items/tool/advanced/ItemRockCutter.java index 5b96ac6c6..b27513423 100644 --- a/src/main/java/techreborn/items/tool/advanced/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tool/advanced/ItemRockCutter.java @@ -45,6 +45,7 @@ import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemContainerProvider; import reborncore.common.powerSystem.forge.ForgePowerItemManager; import reborncore.common.util.ItemUtils; +import techreborn.TechReborn; import techreborn.config.ConfigTechReborn; import techreborn.init.TRContent; @@ -59,7 +60,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo { // 400k FE with 1k FE\t charge rate public ItemRockCutter() { - super(ItemTier.DIAMOND, 1, 1, new Item.Properties().maxStackSize(1)); + super(ItemTier.DIAMOND, 1, 1, new Item.Properties().group(TechReborn.ITEMGROUP).maxStackSize(1)); efficiency = 16F; } diff --git a/src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java b/src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java index 694c5db0f..ac470b1bf 100644 --- a/src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java +++ b/src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java @@ -40,6 +40,7 @@ import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemContainerProvider; import reborncore.common.powerSystem.forge.ForgePowerItemManager; import reborncore.common.util.ItemUtils; +import techreborn.TechReborn; import techreborn.api.TechRebornAPI; import techreborn.init.TRContent; @@ -54,7 +55,7 @@ public class ItemElectricTreetap extends Item implements IEnergyItemInfo { public int cost = 20; public ItemElectricTreetap() { - super(new Item.Properties().maxStackSize(1)); + super(new Item.Properties().group(TechReborn.ITEMGROUP).maxStackSize(1)); } // Item diff --git a/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java b/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java index 82f841aed..602c89f59 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java @@ -52,6 +52,7 @@ import reborncore.common.powerSystem.PoweredItemContainerProvider; import reborncore.common.powerSystem.forge.ForgePowerItemManager; import reborncore.common.util.ChatUtils; import reborncore.common.util.ItemUtils; +import techreborn.TechReborn; import techreborn.config.ConfigTechReborn; import techreborn.init.TRContent; import techreborn.utils.MessageIDs; @@ -66,7 +67,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { // 4M FE max charge with 1k charge rate public ItemNanosaber() { - super(ItemTier.DIAMOND, 1, 1, new Item.Properties().setNoRepair().maxStackSize(1)); + super(ItemTier.DIAMOND, 1, 1, new Item.Properties().group(TechReborn.ITEMGROUP).setNoRepair().maxStackSize(1)); this.addPropertyOverride(new ResourceLocation("techreborn:active"), new IItemPropertyGetter() { @Override @OnlyIn(Dist.CLIENT) diff --git a/src/main/java/techreborn/items/tool/vanilla/ItemTRAxe.java b/src/main/java/techreborn/items/tool/vanilla/ItemTRAxe.java index 2c9c55171..3d18881ef 100644 --- a/src/main/java/techreborn/items/tool/vanilla/ItemTRAxe.java +++ b/src/main/java/techreborn/items/tool/vanilla/ItemTRAxe.java @@ -29,6 +29,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; import reborncore.common.util.ItemUtils; +import techreborn.TechReborn; public class ItemTRAxe extends ItemAxe { @@ -39,7 +40,7 @@ public class ItemTRAxe extends ItemAxe { } public ItemTRAxe(IItemTier material, String repairOreDict) { - super(material, material.getAttackDamage() + 5.75F, (material.getAttackDamage() + 6.75F) * -0.344444F, new Item.Properties()); + super(material, material.getAttackDamage() + 5.75F, (material.getAttackDamage() + 6.75F) * -0.344444F, new Item.Properties().group(TechReborn.ITEMGROUP)); this.repairOreDict = repairOreDict; } diff --git a/src/main/java/techreborn/items/tool/vanilla/ItemTRHoe.java b/src/main/java/techreborn/items/tool/vanilla/ItemTRHoe.java index ac4e9fadd..96d3abd58 100644 --- a/src/main/java/techreborn/items/tool/vanilla/ItemTRHoe.java +++ b/src/main/java/techreborn/items/tool/vanilla/ItemTRHoe.java @@ -29,6 +29,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemHoe; import net.minecraft.item.ItemStack; import reborncore.common.util.ItemUtils; +import techreborn.TechReborn; public class ItemTRHoe extends ItemHoe { @@ -39,7 +40,7 @@ public class ItemTRHoe extends ItemHoe { } public ItemTRHoe(IItemTier material, String repairOreDict) { - super(material, 1F, new Item.Properties()); + super(material, 1F, new Item.Properties().group(TechReborn.ITEMGROUP)); this.repairOreDict = repairOreDict; } diff --git a/src/main/java/techreborn/items/tool/vanilla/ItemTRPickaxe.java b/src/main/java/techreborn/items/tool/vanilla/ItemTRPickaxe.java index dc1531d6a..db6eb6cb5 100644 --- a/src/main/java/techreborn/items/tool/vanilla/ItemTRPickaxe.java +++ b/src/main/java/techreborn/items/tool/vanilla/ItemTRPickaxe.java @@ -29,6 +29,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import reborncore.common.util.ItemUtils; +import techreborn.TechReborn; public class ItemTRPickaxe extends ItemPickaxe { @@ -39,7 +40,7 @@ public class ItemTRPickaxe extends ItemPickaxe { } public ItemTRPickaxe(IItemTier material, String repairOreDict) { - super(material, 1, (material.getAttackDamage() + 6.75F) * -0.344444F, new Item.Properties()); + super(material, 1, (material.getAttackDamage() + 6.75F) * -0.344444F, new Item.Properties().group(TechReborn.ITEMGROUP)); this.repairOreDict = repairOreDict; } diff --git a/src/main/java/techreborn/items/tool/vanilla/ItemTRSpade.java b/src/main/java/techreborn/items/tool/vanilla/ItemTRSpade.java index b424afb7d..19c3c88da 100644 --- a/src/main/java/techreborn/items/tool/vanilla/ItemTRSpade.java +++ b/src/main/java/techreborn/items/tool/vanilla/ItemTRSpade.java @@ -29,6 +29,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; import reborncore.common.util.ItemUtils; +import techreborn.TechReborn; public class ItemTRSpade extends ItemSpade { @@ -39,7 +40,7 @@ public class ItemTRSpade extends ItemSpade { } public ItemTRSpade(IItemTier material, String repairOreDict) { - super(material, material.getAttackDamage() + 5.75F, (material.getAttackDamage() + 6.75F) * -0.344444F, new Item.Properties()); + super(material, material.getAttackDamage() + 5.75F, (material.getAttackDamage() + 6.75F) * -0.344444F, new Item.Properties().group(TechReborn.ITEMGROUP)); this.repairOreDict = repairOreDict; } diff --git a/src/main/java/techreborn/items/tool/vanilla/ItemTRSword.java b/src/main/java/techreborn/items/tool/vanilla/ItemTRSword.java index c7289eecf..0eeadad1e 100644 --- a/src/main/java/techreborn/items/tool/vanilla/ItemTRSword.java +++ b/src/main/java/techreborn/items/tool/vanilla/ItemTRSword.java @@ -29,6 +29,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; import reborncore.common.util.ItemUtils; +import techreborn.TechReborn; public class ItemTRSword extends ItemSword { @@ -39,7 +40,7 @@ public class ItemTRSword extends ItemSword { } public ItemTRSword(IItemTier material, String repairOreDict) { - super(material, 1, (material.getAttackDamage() + 6.75F) * -0.344444F, new Item.Properties()); + super(material, 1, (material.getAttackDamage() + 6.75F) * -0.344444F, new Item.Properties().group(TechReborn.ITEMGROUP)); this.repairOreDict = repairOreDict; } diff --git a/src/main/resources/assets/techreborn/models/item/bronze_axe.json b/src/main/resources/assets/techreborn/models/item/bronze_axe.json new file mode 100644 index 000000000..89574a496 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/bronze_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "techreborn:item/tool/bronze_axe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/bronze_boots.json b/src/main/resources/assets/techreborn/models/item/bronze_boots.json new file mode 100644 index 000000000..2b81ae7a5 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/bronze_boots.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/armor/bronze_boots" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/bronze_chestplate.json b/src/main/resources/assets/techreborn/models/item/bronze_chestplate.json new file mode 100644 index 000000000..26230d1d7 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/bronze_chestplate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/armor/bronze_chestplate" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/bronze_helmet.json b/src/main/resources/assets/techreborn/models/item/bronze_helmet.json new file mode 100644 index 000000000..ab067a8fd --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/bronze_helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/armor/bronze_helmet" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/bronze_hoe.json b/src/main/resources/assets/techreborn/models/item/bronze_hoe.json new file mode 100644 index 000000000..613b5eb15 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/bronze_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "techreborn:item/tool/bronze_hoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/bronze_leggings.json b/src/main/resources/assets/techreborn/models/item/bronze_leggings.json new file mode 100644 index 000000000..9273ab7fc --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/bronze_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/armor/bronze_leggings" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/bronze_pickaxe.json b/src/main/resources/assets/techreborn/models/item/bronze_pickaxe.json new file mode 100644 index 000000000..6b0310fb3 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/bronze_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "techreborn:item/tool/bronze_pickaxe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/bronze_spade.json b/src/main/resources/assets/techreborn/models/item/bronze_spade.json new file mode 100644 index 000000000..32b225744 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/bronze_spade.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "techreborn:item/tool/bronze_spade" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/bronze_sword.json b/src/main/resources/assets/techreborn/models/item/bronze_sword.json new file mode 100644 index 000000000..196abd272 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/bronze_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "techreborn:item/tool/bronze_sword" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/techrebornitem.json b/src/main/resources/assets/techreborn/models/item/techrebornitem.json deleted file mode 100644 index d9b7e3f3b..000000000 --- a/src/main/resources/assets/techreborn/models/item/techrebornitem.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "item/generated" -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/models/armor/bronze_layer_1.png b/src/main/resources/assets/techreborn/textures/models/armor/bronze_layer_1.png new file mode 100644 index 0000000000000000000000000000000000000000..ab22ed8706c2ddb8cd003f9dfb6e46b035abadac GIT binary patch literal 2353 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 Xlhii?hN-e600000NkvXXu0mjf;bL&= literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/models/armor/bronze_layer_2.png b/src/main/resources/assets/techreborn/textures/models/armor/bronze_layer_2.png new file mode 100644 index 0000000000000000000000000000000000000000..43b307ccd852aba2fc4b643e28a5c9d7bb920cb1 GIT binary patch literal 1185 zcmV;S1YY}zP)N2bZe?^J zG%heMIczh2P5=M|A4x<(RA@uxS6NS6M;P@lsH)In!V-enY8Knzd%=KNLs$$X7%+Ij z*sdW463P+?Ti6Mqg`^>h8Wd8Js7aMdZTeKH5B+baXC?{~WnLnsk<5KKnwc|m$M>A? zo9~WI01OQ!X(T8~BSA?T2};sPP?AQ1k~9*Oq>-Q`jRYlWBq&KEK}i}3O43MBl174( zG!m4gk#L6C9B@G3p1&O1{SH#6=g%9?5E~TzZmA1@t$DEd&VCL_IzymY*_Ct#Y#^Jgb6!=GVFzQYz^44 z(De;XvExoh0hZVo>*qQO@m;fpd#E=~7MO(a<6HGO8mp5g>{IlgOP%;*!GkTI9lIeX z-p;n-m+5Bg_{*?(&5D;3O?W=mKm&5QhkD~=foZxm2hT>`I2@_Qs<)U~P=a^!9{fJn zCWVVk5bg2JhLa3wZ47%XQN)L_Arhj~vv-p(}R<;{A` zw&h{5(<-y$_0$#2w&zJa<@ot{9gn~{FkqtT5}rhL91Q75)TU#+Aq!83tMKYp6J}a0 zQshy>E$hTg>-+Jeh=!lX+?cw04h#^YAIB;vO2=qj1`WuR5#JAKGTK7$GaB$D?vnF~ z+6=jV+gA!jM1{_3P9Oq)15OrZMScYNuMZ~Mj z*r9k)J49cI{b5k&^E%@7+4z(`WtE@U$*UH43RC!w>KFf1Fhy%9qS}nH#!N(9sfbZjv@#VVjI@Y$+?|eCb()NR zSWAK5@g@3gUm(EfgtV^^uF7C`)JVfd8*`9ou;7^W;h3LE!QBryvEJvvDiN&WZ_t2; zv1;su^b-Sq