diff --git a/src/main/java/techreborn/client/RegisterItemJsons.java b/src/main/java/techreborn/client/RegisterItemJsons.java index 4c0fccb0a..2c5294bc0 100644 --- a/src/main/java/techreborn/client/RegisterItemJsons.java +++ b/src/main/java/techreborn/client/RegisterItemJsons.java @@ -55,6 +55,44 @@ public class RegisterItemJsons { register(ModItems.lapotronpack, "tool/lapotronic_orbpack"); register(ModItems.lithiumBatpack, "tool/lithium_batpack"); + registerBlockstateMultiItem(ModItems.rubyHelmet, "ruby_helmet", "items/tool/armour"); + registerBlockstateMultiItem(ModItems.rubyChestplate, "ruby_chestplate", "items/tool/armour"); + registerBlockstateMultiItem(ModItems.rubyLeggings, "ruby_leggings", "items/tool/armour"); + registerBlockstateMultiItem(ModItems.rubyBoots, "ruby_boots", "items/tool/armour"); + registerBlockstateMultiItem(ModItems.sapphireHelmet, "sapphire_helmet", "items/tool/armour"); + registerBlockstateMultiItem(ModItems.sapphireChestplate, "sapphire_chestplate", "items/tool/armour"); + registerBlockstateMultiItem(ModItems.sapphireLeggings, "sapphire_leggings", "items/tool/armour"); + registerBlockstateMultiItem(ModItems.sapphireBoots, "sapphire_boots", "items/tool/armour"); + registerBlockstateMultiItem(ModItems.peridotHelmet, "peridot_helmet", "items/tool/armour"); + registerBlockstateMultiItem(ModItems.peridotChestplate, "peridot_chestplate", "items/tool/armour"); + registerBlockstateMultiItem(ModItems.peridotLeggings, "peridot_leggings", "items/tool/armour"); + registerBlockstateMultiItem(ModItems.peridotBoots, "peridot_boots", "items/tool/armour"); + registerBlockstateMultiItem(ModItems.bronzeHelmet, "bronze_helmet", "items/tool/armour"); + registerBlockstateMultiItem(ModItems.bronzeChestplate, "bronze_chestplate", "items/tool/armour"); + registerBlockstateMultiItem(ModItems.bronzeLeggings, "bronze_leggings", "items/tool/armour"); + registerBlockstateMultiItem(ModItems.bronzeBoots, "bronze_boots", "items/tool/armour"); + + registerBlockstateMultiItem(ModItems.rubyPickaxe, "ruby_pickaxe", "items/tool/tool"); + registerBlockstateMultiItem(ModItems.rubySword, "ruby_sword", "items/tool/tool"); + registerBlockstateMultiItem(ModItems.rubyAxe, "ruby_axe", "items/tool/tool"); + registerBlockstateMultiItem(ModItems.rubySpade, "ruby_spade", "items/tool/tool"); + registerBlockstateMultiItem(ModItems.rubyHoe, "ruby_hoe", "items/tool/tool"); + registerBlockstateMultiItem(ModItems.sapphirePickaxe, "sapphire_pickaxe", "items/tool/tool"); + registerBlockstateMultiItem(ModItems.sapphireSword, "sapphire_sword", "items/tool/tool"); + registerBlockstateMultiItem(ModItems.sapphireAxe, "sapphire_axe", "items/tool/tool"); + registerBlockstateMultiItem(ModItems.sapphireSpade, "sapphire_spade", "items/tool/tool"); + registerBlockstateMultiItem(ModItems.sapphireHoe, "sapphire_hoe", "items/tool/tool"); + registerBlockstateMultiItem(ModItems.peridotPickaxe, "peridot_pickaxe", "items/tool/tool"); + registerBlockstateMultiItem(ModItems.peridotSword, "peridot_sword", "items/tool/tool"); + registerBlockstateMultiItem(ModItems.peridotAxe, "peridot_axe", "items/tool/tool"); + registerBlockstateMultiItem(ModItems.peridotSpade, "peridot_spade", "items/tool/tool"); + registerBlockstateMultiItem(ModItems.peridotHoe, "peridot_hoe", "items/tool/tool"); + registerBlockstateMultiItem(ModItems.bronzePickaxe, "bronze_pickaxe", "items/tool/tool"); + registerBlockstateMultiItem(ModItems.bronzeSword, "bronze_sword", "items/tool/tool"); + registerBlockstateMultiItem(ModItems.bronzeAxe, "bronze_axe", "items/tool/tool"); + registerBlockstateMultiItem(ModItems.bronzeSpade, "bronze_spade", "items/tool/tool"); + registerBlockstateMultiItem(ModItems.bronzeHoe, "bronze_hoe", "items/tool/tool"); + for (int i = 0; i < ItemIngots.types.length; ++i) { String[] name = ItemIngots.types.clone(); registerBlockstate(ModItems.ingots, i, name[i], "items/materials/"); @@ -85,6 +123,11 @@ public class RegisterItemJsons { registerBlockstate(ModItems.smallDusts, i, name[i], "items/materials/"); } + for (int i = 0; i < ItemParts.types.length; ++i) { + String[] name = ItemParts.types.clone(); + registerBlockstate(ModItems.parts, i, name[i], "items/materials/"); + } + for (int i = 0; i < ItemUpgrades.types.length; ++i) { String[] name = ItemUpgrades.types.clone(); registerBlockstate(ModItems.upgrades, i, name[i], "items/misc/"); @@ -154,4 +197,9 @@ public class RegisterItemJsons { private static void registerBlockstate(Block i, int meta, String variant, String dir) { registerBlockstate(Item.getItemFromBlock(i), meta, variant, dir); } + + private static void registerBlockstateMultiItem(Item item, String variantName, String path) { + ResourceLocation loc = new ResourceLocation("techreborn", path); + ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(loc, "type=" + variantName)); + } } diff --git a/src/main/java/techreborn/items/ItemParts.java b/src/main/java/techreborn/items/ItemParts.java index a50464f43..e5c6a734c 100644 --- a/src/main/java/techreborn/items/ItemParts.java +++ b/src/main/java/techreborn/items/ItemParts.java @@ -1,5 +1,6 @@ package techreborn.items; +import com.google.common.base.CaseFormat; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -10,19 +11,18 @@ import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.init.ModItems; -import techreborn.lib.ModInfo; import java.security.InvalidParameterException; -public class ItemParts extends ItemTextureBase { - public static final String[] types = new String[] { "energyFlowCircuit", "dataControlCircuit", "dataStorageCircuit", - "dataOrb", "diamondGrindingHead", "diamondSawBlade", "tungstenGrindingHead", "heliumCoolantSimple", - "heliumCoolantTriple", "heliumCoolantSix", "NaKCoolantSimple", "NaKCoolantTriple", "NaKCoolantSix", - "cupronickelHeatingCoil", "nichromeHeatingCoil", "kanthalHeatingCoil", ModItems.META_PLACEHOLDER, "superConductor", - "thoriumCell", "doubleThoriumCell", "quadThoriumCell", "plutoniumCell", "doublePlutoniumCell", - "quadPlutoniumCell", "computerMonitor", "machineParts", "neutronReflector", "iridiumNeutronReflector", - "thickNeutronReflector", "electronicCircuit", "advancedCircuit", "rubberSap", "rubber", "scrap", - "carbonmesh", "carbonfiber", "coolantSimple", "coolantTriple", "coolantSix" }; +public class ItemParts extends ItemTRNoDestroy { + public static final String[] types = new String[] { "energy_flow_circuit", "data_control_circuit", "data_storage_circuit", + "data_orb", "diamond_grinding_head", "diamond_saw_blade", "tungsten_grinding_head", "helium_coolant_simple", + "helium_coolant_triple", "helium_coolant_six", "nak_coolant_simple", "nak_coolant_triple", "nak_coolant_six", + "cupronickel_heating_coil", "nichrome_heating_coil", "kanthal_heating_coil", ModItems.META_PLACEHOLDER, "super_conductor", + "thorium_cell", "double_thorium_cell", "quad_thorium_cell", "plutonium_cell", "double_plutonium_cell", + "quad_plutonium_cell", "computer_monitor", "machine_parts", "neutron_reflector", "iridium_neutron_reflector", + "thick_neutron_reflector", "electronic_circuit", "advanced_circuit", "sap", "rubber", "scrap", + "carbon_mesh", "carbon_fiber", "coolant_simple", "coolant_triple", "coolant_six" }; public ItemParts() { setCreativeTab(TechRebornCreativeTab.instance); @@ -31,6 +31,22 @@ public class ItemParts extends ItemTextureBase { } public static ItemStack getPartByName(String name, int count) { + //TODO: Change all recipes n' shit to use proper snake_case names so I don't have to do this bullshit + if (name.equals("NaKCoolantSimple")) + name = "nak_coolant_simple"; + if (name.equals("NaKCoolantTriple")) + name = "nak_coolant_triple"; + if (name.equals("NaKCoolantSix")) + name = "nak_coolant_six"; + if (name.equals("superconductor")) + name = "super_conductor"; + if (name.equals("carbonfiber")) + name = "carbon_fiber"; + if (name.equals("carbonmesh")) + name = "carbon_mesh"; + if (name.equals("rubberSap")) + name = "sap"; + name = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name); for (int i = 0; i < types.length; i++) { if (types[i].equalsIgnoreCase(name)) { return new ItemStack(ModItems.parts, count, i); @@ -72,14 +88,4 @@ public class ItemParts extends ItemTextureBase { } return itemStack; } - - @Override - public String getTextureName(int damage) { - return ModInfo.MOD_ID + ":items/part/" + types[damage].toLowerCase(); - } - - @Override - public int getMaxMeta() { - return types.length; - } } diff --git a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java index 6171cbcde..6a88e877f 100644 --- a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java +++ b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java @@ -30,7 +30,6 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo { setMaxStackSize(1); setUnlocalizedName("techreborn.lithiumbatpack"); setCreativeTab(TechRebornCreativeTab.instance); - RebornCore.jsonDestroyer.registerObject(this); } @Override diff --git a/src/main/java/techreborn/items/armor/ItemTRArmour.java b/src/main/java/techreborn/items/armor/ItemTRArmour.java index a90675823..58de46c00 100644 --- a/src/main/java/techreborn/items/armor/ItemTRArmour.java +++ b/src/main/java/techreborn/items/armor/ItemTRArmour.java @@ -1,21 +1,13 @@ package techreborn.items.armor; -import me.modmuss50.jsonDestroyer.api.ITexturedItem; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.RebornCore; import techreborn.client.TechRebornCreativeTabMisc; -import techreborn.lib.ModInfo; /** * Created by modmuss50 on 26/02/2016. */ -public class ItemTRArmour extends ItemArmor implements ITexturedItem { +public class ItemTRArmour extends ItemArmor { private ArmorMaterial material = ArmorMaterial.LEATHER; private EntityEquipmentSlot slot = EntityEquipmentSlot.HEAD; @@ -31,37 +23,7 @@ public class ItemTRArmour extends ItemArmor implements ITexturedItem { if (slot == EntityEquipmentSlot.FEET) setUnlocalizedName(material.name().toLowerCase() + "Boots"); setCreativeTab(TechRebornCreativeTabMisc.instance); - RebornCore.jsonDestroyer.registerObject(this); this.material = material; this.slot = slot; } - - @Override - public String getTextureName(int damage) { - if (slot == EntityEquipmentSlot.HEAD) - return "techreborn:items/tool/" + material.name().toLowerCase() + "_helmet"; - if (slot == EntityEquipmentSlot.CHEST) - return "techreborn:items/tool/" + material.name().toLowerCase() + "_chestplate"; - if (slot == EntityEquipmentSlot.LEGS) - return "techreborn:items/tool/" + material.name().toLowerCase() + "_leggings"; - if (slot == EntityEquipmentSlot.FEET) - return "techreborn:items/tool/" + material.name().toLowerCase() + "_boots"; - return "techreborn:items/tool/" + material.name().toLowerCase() + "_error"; - } - - @Override - public int getMaxMeta() { - return 1; - } - - @Override - @SideOnly(Side.CLIENT) - public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) { - return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory"); - } - - @SideOnly(Side.CLIENT) - public boolean isFull3D() { - return true; - } } diff --git a/src/main/java/techreborn/items/tools/ItemTRAxe.java b/src/main/java/techreborn/items/tools/ItemTRAxe.java index a3712b786..ef61c0562 100644 --- a/src/main/java/techreborn/items/tools/ItemTRAxe.java +++ b/src/main/java/techreborn/items/tools/ItemTRAxe.java @@ -1,30 +1,22 @@ package techreborn.items.tools; import com.google.common.collect.Sets; -import me.modmuss50.jsonDestroyer.api.IHandHeld; -import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTool; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.RebornCore; import techreborn.client.TechRebornCreativeTabMisc; -import techreborn.lib.ModInfo; import java.util.Set; -public class ItemTRAxe extends ItemTool implements ITexturedItem, IHandHeld { - private ToolMaterial material = ToolMaterial.WOOD; - +public class ItemTRAxe extends ItemTool { private static final Set EFFECTIVE_ON = Sets.newHashSet(new Block[] { Blocks.PLANKS, Blocks.BOOKSHELF, Blocks.LOG, Blocks.LOG2, Blocks.CHEST, Blocks.PUMPKIN, Blocks.LIT_PUMPKIN, Blocks.MELON_BLOCK, Blocks.LADDER, Blocks.WOODEN_BUTTON, Blocks.WOODEN_PRESSURE_PLATE }); + private ToolMaterial material = ToolMaterial.WOOD; public ItemTRAxe(ToolMaterial material) { super(material, EFFECTIVE_ON); @@ -32,7 +24,6 @@ public class ItemTRAxe extends ItemTool implements ITexturedItem, IHandHeld { this.attackSpeed = (material.getDamageVsEntity() + 6.75F) * -0.344444F; setUnlocalizedName(material.name().toLowerCase() + "Axe"); setCreativeTab(TechRebornCreativeTabMisc.instance); - RebornCore.jsonDestroyer.registerObject(this); this.material = material; } @@ -41,25 +32,4 @@ public class ItemTRAxe extends ItemTool implements ITexturedItem, IHandHeld { return material != Material.WOOD && material != Material.PLANTS && material != Material.VINE ? super.getStrVsBlock(stack, state) : this.efficiencyOnProperMaterial; } - - @Override - public String getTextureName(int damage) { - return "techreborn:items/tool/" + material.name().toLowerCase() + "_axe"; - } - - @Override - public int getMaxMeta() { - return 1; - } - - @Override - @SideOnly(Side.CLIENT) - public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) { - return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory"); - } - - @SideOnly(Side.CLIENT) - public boolean isFull3D() { - return true; - } } diff --git a/src/main/java/techreborn/items/tools/ItemTRHoe.java b/src/main/java/techreborn/items/tools/ItemTRHoe.java index 8dccc3bc8..87d978ea7 100644 --- a/src/main/java/techreborn/items/tools/ItemTRHoe.java +++ b/src/main/java/techreborn/items/tools/ItemTRHoe.java @@ -1,44 +1,21 @@ package techreborn.items.tools; -import me.modmuss50.jsonDestroyer.api.IHandHeld; -import me.modmuss50.jsonDestroyer.api.ITexturedItem; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemHoe; -import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.RebornCore; import techreborn.client.TechRebornCreativeTabMisc; -import techreborn.lib.ModInfo; -public class ItemTRHoe extends ItemHoe implements ITexturedItem, IHandHeld { +public class ItemTRHoe extends ItemHoe { private ToolMaterial material = ToolMaterial.WOOD; public ItemTRHoe(ToolMaterial material) { super(material); setUnlocalizedName(material.name().toLowerCase() + "Hoe"); setCreativeTab(TechRebornCreativeTabMisc.instance); - RebornCore.jsonDestroyer.registerObject(this); this.material = material; } - @Override - public String getTextureName(int damage) { - return "techreborn:items/tool/" + material.name().toLowerCase() + "_hoe"; - } - - @Override - public int getMaxMeta() { - return 1; - } - - @Override - @SideOnly(Side.CLIENT) - public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) { - return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory"); - } - @SideOnly(Side.CLIENT) public boolean isFull3D() { return true; diff --git a/src/main/java/techreborn/items/tools/ItemTRPickaxe.java b/src/main/java/techreborn/items/tools/ItemTRPickaxe.java index cc261bcf8..788d3e11e 100644 --- a/src/main/java/techreborn/items/tools/ItemTRPickaxe.java +++ b/src/main/java/techreborn/items/tools/ItemTRPickaxe.java @@ -1,46 +1,16 @@ package techreborn.items.tools; -import me.modmuss50.jsonDestroyer.api.IHandHeld; -import me.modmuss50.jsonDestroyer.api.ITexturedItem; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemPickaxe; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.RebornCore; import techreborn.client.TechRebornCreativeTabMisc; -import techreborn.lib.ModInfo; -public class ItemTRPickaxe extends ItemPickaxe implements ITexturedItem, IHandHeld { +public class ItemTRPickaxe extends ItemPickaxe { private ToolMaterial material = ToolMaterial.WOOD; public ItemTRPickaxe(ToolMaterial material) { super(material); setUnlocalizedName(material.name().toLowerCase() + "Pickaxe"); setCreativeTab(TechRebornCreativeTabMisc.instance); - RebornCore.jsonDestroyer.registerObject(this); this.material = material; } - - @Override - public String getTextureName(int damage) { - return "techreborn:items/tool/" + material.name().toLowerCase() + "_pickaxe"; - } - - @Override - public int getMaxMeta() { - return 1; - } - - @Override - @SideOnly(Side.CLIENT) - public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) { - return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory"); - } - - @SideOnly(Side.CLIENT) - public boolean isFull3D() { - return true; - } } diff --git a/src/main/java/techreborn/items/tools/ItemTRSpade.java b/src/main/java/techreborn/items/tools/ItemTRSpade.java index 355e9a79a..e7560a286 100644 --- a/src/main/java/techreborn/items/tools/ItemTRSpade.java +++ b/src/main/java/techreborn/items/tools/ItemTRSpade.java @@ -1,46 +1,16 @@ package techreborn.items.tools; -import me.modmuss50.jsonDestroyer.api.IHandHeld; -import me.modmuss50.jsonDestroyer.api.ITexturedItem; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemSpade; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.RebornCore; import techreborn.client.TechRebornCreativeTabMisc; -import techreborn.lib.ModInfo; -public class ItemTRSpade extends ItemSpade implements ITexturedItem, IHandHeld { +public class ItemTRSpade extends ItemSpade { private ToolMaterial material = ToolMaterial.WOOD; public ItemTRSpade(ToolMaterial material) { super(material); setUnlocalizedName(material.name().toLowerCase() + "Spade"); setCreativeTab(TechRebornCreativeTabMisc.instance); - RebornCore.jsonDestroyer.registerObject(this); this.material = material; } - - @Override - public String getTextureName(int damage) { - return "techreborn:items/tool/" + material.name().toLowerCase() + "_shovel"; - } - - @Override - public int getMaxMeta() { - return 1; - } - - @Override - @SideOnly(Side.CLIENT) - public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) { - return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory"); - } - - @SideOnly(Side.CLIENT) - public boolean isFull3D() { - return true; - } } diff --git a/src/main/java/techreborn/items/tools/ItemTRSword.java b/src/main/java/techreborn/items/tools/ItemTRSword.java index b58d6fe38..e38548fc4 100644 --- a/src/main/java/techreborn/items/tools/ItemTRSword.java +++ b/src/main/java/techreborn/items/tools/ItemTRSword.java @@ -1,46 +1,16 @@ package techreborn.items.tools; -import me.modmuss50.jsonDestroyer.api.IHandHeld; -import me.modmuss50.jsonDestroyer.api.ITexturedItem; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.RebornCore; import techreborn.client.TechRebornCreativeTabMisc; -import techreborn.lib.ModInfo; -public class ItemTRSword extends ItemSword implements ITexturedItem, IHandHeld { +public class ItemTRSword extends ItemSword { private ToolMaterial material = ToolMaterial.WOOD; public ItemTRSword(ToolMaterial material) { super(material); setUnlocalizedName(material.name().toLowerCase() + "Sword"); setCreativeTab(TechRebornCreativeTabMisc.instance); - RebornCore.jsonDestroyer.registerObject(this); this.material = material; } - - @Override - public String getTextureName(int damage) { - return "techreborn:items/tool/" + material.name().toLowerCase() + "_sword"; - } - - @Override - public int getMaxMeta() { - return 1; - } - - @Override - @SideOnly(Side.CLIENT) - public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) { - return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory"); - } - - @SideOnly(Side.CLIENT) - public boolean isFull3D() { - return true; - } } diff --git a/src/main/resources/assets/techreborn/blockstates/items/materials/part.json b/src/main/resources/assets/techreborn/blockstates/items/materials/part.json new file mode 100644 index 000000000..21e23df6a --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/items/materials/part.json @@ -0,0 +1,201 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "energy_flow_circuit": { + "textures": { + "layer0": "techreborn:items/part/energy_flow_circuit" + } + }, + "data_control_circuit": { + "textures": { + "layer0": "techreborn:items/part/data_control_circuit" + } + }, + "data_storage_circuit": { + "textures": { + "layer0": "techreborn:items/part/data_storage_circuit" + } + }, + "data_orb": { + "textures": { + "layer0": "techreborn:items/part/data_orb" + } + }, + "diamond_grinding_head": { + "textures": { + "layer0": "techreborn:items/part/diamond_grinding_head" + } + }, + "diamond_saw_blade": { + "textures": { + "layer0": "techreborn:items/part/diamond_saw_blade" + } + }, + "tungsten_grinding_head": { + "textures": { + "layer0": "techreborn:items/part/tungsten_grinding_head" + } + }, + "helium_coolant_simple": { + "textures": { + "layer0": "techreborn:items/part/helium_coolant_simple" + } + }, + "helium_coolant_triple": { + "textures": { + "layer0": "techreborn:items/part/helium_coolant_triple" + } + }, + "helium_coolant_six": { + "textures": { + "layer0": "techreborn:items/part/helium_coolant_six" + } + }, + "nak_coolant_simple": { + "textures": { + "layer0": "techreborn:items/part/nak_coolant_simple" + } + }, + "nak_coolant_triple": { + "textures": { + "layer0": "techreborn:items/part/nak_coolant_triple" + } + }, + "nak_coolant_six": { + "textures": { + "layer0": "techreborn:items/part/nak_coolant_six" + } + }, + "cupronickel_heating_coil": { + "textures": { + "layer0": "techreborn:items/part/cupronickel_heating_coil" + } + }, + "nichrome_heating_coil": { + "textures": { + "layer0": "techreborn:items/part/nichrome_heating_coil" + } + }, + "kanthal_heating_coil": { + "textures": { + "layer0": "techreborn:items/part/kanthal_heating_coil" + } + }, + "super_conductor": { + "textures": { + "layer0": "techreborn:items/part/super_conductor" + } + }, + "thorium_cell": { + "textures": { + "layer0": "techreborn:items/part/thorium_cell" + } + }, + "double_thorium_cell": { + "textures": { + "layer0": "techreborn:items/part/double_thorium_cell" + } + }, + "quad_thorium_cell": { + "textures": { + "layer0": "techreborn:items/part/quad_thorium_cell" + } + }, + "plutonium_cell": { + "textures": { + "layer0": "techreborn:items/part/plutonium_cell" + } + }, + "double_plutonium_cell": { + "textures": { + "layer0": "techreborn:items/part/double_plutonium_cell" + } + }, + "quad_plutonium_cell": { + "textures": { + "layer0": "techreborn:items/part/quad_plutonium_cell" + } + }, + "computer_monitor": { + "textures": { + "layer0": "techreborn:items/part/computer_monitor" + } + }, + "machine_parts": { + "textures": { + "layer0": "techreborn:items/part/machine_parts" + } + }, + "neutron_reflector": { + "textures": { + "layer0": "techreborn:items/part/neutron_reflector" + } + }, + "iridium_neutron_reflector": { + "textures": { + "layer0": "techreborn:items/part/iridium_neutron_reflector" + } + }, + "thick_neutron_reflector": { + "textures": { + "layer0": "techreborn:items/part/thick_neutron_reflector" + } + }, + "electronic_circuit": { + "textures": { + "layer0": "techreborn:items/part/electronic_circuit" + } + }, + "advanced_circuit": { + "textures": { + "layer0": "techreborn:items/part/advanced_circuit" + } + }, + "sap": { + "textures": { + "layer0": "techreborn:items/part/sap" + } + }, + "rubber": { + "textures": { + "layer0": "techreborn:items/part/rubber" + } + }, + "scrap": { + "textures": { + "layer0": "techreborn:items/part/scrap" + } + }, + "carbon_mesh": { + "textures": { + "layer0": "techreborn:items/part/carbon_mesh" + } + }, + "carbon_fiber": { + "textures": { + "layer0": "techreborn:items/part/carbon_fiber" + } + }, + "coolant_simple": { + "textures": { + "layer0": "techreborn:items/part/coolant_simple" + } + }, + "coolant_triple": { + "textures": { + "layer0": "techreborn:items/part/coolant_triple" + } + }, + "coolant_six": { + "textures": { + "layer0": "techreborn:items/part/coolant_six" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/items/tool/armour.json b/src/main/resources/assets/techreborn/blockstates/items/tool/armour.json new file mode 100644 index 000000000..9dab8c2fa --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/items/tool/armour.json @@ -0,0 +1,91 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "ruby_helmet": { + "textures": { + "layer0": "techreborn:items/tool/ruby_helmet" + } + }, + "ruby_chestplate": { + "textures": { + "layer0": "techreborn:items/tool/ruby_chestplate" + } + }, + "ruby_leggings": { + "textures": { + "layer0": "techreborn:items/tool/ruby_leggings" + } + }, + "ruby_boots": { + "textures": { + "layer0": "techreborn:items/tool/ruby_boots" + } + }, + "sapphire_helmet": { + "textures": { + "layer0": "techreborn:items/tool/sapphire_helmet" + } + }, + "sapphire_chestplate": { + "textures": { + "layer0": "techreborn:items/tool/sapphire_chestplate" + } + }, + "sapphire_leggings": { + "textures": { + "layer0": "techreborn:items/tool/sapphire_leggings" + } + }, + "sapphire_boots": { + "textures": { + "layer0": "techreborn:items/tool/sapphire_boots" + } + }, + "peridot_helmet": { + "textures": { + "layer0": "techreborn:items/tool/peridot_helmet" + } + }, + "peridot_chestplate": { + "textures": { + "layer0": "techreborn:items/tool/peridot_chestplate" + } + }, + "peridot_leggings": { + "textures": { + "layer0": "techreborn:items/tool/peridot_leggings" + } + }, + "peridot_boots": { + "textures": { + "layer0": "techreborn:items/tool/peridot_boots" + } + }, + "bronze_helmet": { + "textures": { + "layer0": "techreborn:items/tool/bronze_helmet" + } + }, + "bronze_chestplate": { + "textures": { + "layer0": "techreborn:items/tool/bronze_chestplate" + } + }, + "bronze_leggings": { + "textures": { + "layer0": "techreborn:items/tool/bronze_leggings" + } + }, + "bronze_boots": { + "textures": { + "layer0": "techreborn:items/tool/bronze_boots" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/items/tool/tool.json b/src/main/resources/assets/techreborn/blockstates/items/tool/tool.json new file mode 100644 index 000000000..573089464 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/items/tool/tool.json @@ -0,0 +1,111 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "ruby_pickaxe": { + "textures": { + "layer0": "techreborn:items/tool/ruby_pickaxe" + } + }, + "ruby_sword": { + "textures": { + "layer0": "techreborn:items/tool/ruby_sword" + } + }, + "ruby_axe": { + "textures": { + "layer0": "techreborn:items/tool/ruby_axe" + } + }, + "ruby_spade": { + "textures": { + "layer0": "techreborn:items/tool/ruby_spade" + } + }, + "ruby_hoe": { + "textures": { + "layer0": "techreborn:items/tool/ruby_hoe" + } + }, + "sapphire_pickaxe": { + "textures": { + "layer0": "techreborn:items/tool/sapphire_pickaxe" + } + }, + "sapphire_sword": { + "textures": { + "layer0": "techreborn:items/tool/sapphire_sword" + } + }, + "sapphire_axe": { + "textures": { + "layer0": "techreborn:items/tool/sapphire_axe" + } + }, + "sapphire_spade": { + "textures": { + "layer0": "techreborn:items/tool/sapphire_spade" + } + }, + "sapphire_hoe": { + "textures": { + "layer0": "techreborn:items/tool/sapphire_hoe" + } + }, + "peridot_pickaxe": { + "textures": { + "layer0": "techreborn:items/tool/peridot_pickaxe" + } + }, + "peridot_sword": { + "textures": { + "layer0": "techreborn:items/tool/peridot_sword" + } + }, + "peridot_axe": { + "textures": { + "layer0": "techreborn:items/tool/peridot_axe" + } + }, + "peridot_spade": { + "textures": { + "layer0": "techreborn:items/tool/peridot_spade" + } + }, + "peridot_hoe": { + "textures": { + "layer0": "techreborn:items/tool/peridot_hoe" + } + }, + "bronze_pickaxe": { + "textures": { + "layer0": "techreborn:items/tool/bronze_pickaxe" + } + }, + "bronze_sword": { + "textures": { + "layer0": "techreborn:items/tool/bronze_sword" + } + }, + "bronze_axe": { + "textures": { + "layer0": "techreborn:items/tool/bronze_axe" + } + }, + "bronze_spade": { + "textures": { + "layer0": "techreborn:items/tool/bronze_spade" + } + }, + "bronze_hoe": { + "textures": { + "layer0": "techreborn:items/tool/bronze_hoe" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/items/part/advancedcircuit.png b/src/main/resources/assets/techreborn/textures/items/part/advanced_circuit.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/advancedcircuit.png rename to src/main/resources/assets/techreborn/textures/items/part/advanced_circuit.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/carbonfiber.png b/src/main/resources/assets/techreborn/textures/items/part/carbon_fiber.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/carbonfiber.png rename to src/main/resources/assets/techreborn/textures/items/part/carbon_fiber.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/carbonmesh.png b/src/main/resources/assets/techreborn/textures/items/part/carbon_mesh.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/carbonmesh.png rename to src/main/resources/assets/techreborn/textures/items/part/carbon_mesh.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/computermonitor.png b/src/main/resources/assets/techreborn/textures/items/part/computer_monitor.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/computermonitor.png rename to src/main/resources/assets/techreborn/textures/items/part/computer_monitor.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/coolantsimple.png b/src/main/resources/assets/techreborn/textures/items/part/coolant_simple.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/coolantsimple.png rename to src/main/resources/assets/techreborn/textures/items/part/coolant_simple.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/coolantsix.png b/src/main/resources/assets/techreborn/textures/items/part/coolant_six.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/coolantsix.png rename to src/main/resources/assets/techreborn/textures/items/part/coolant_six.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/coolanttriple.png b/src/main/resources/assets/techreborn/textures/items/part/coolant_triple.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/coolanttriple.png rename to src/main/resources/assets/techreborn/textures/items/part/coolant_triple.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/cupronickelheatingcoil.png b/src/main/resources/assets/techreborn/textures/items/part/cupronickel_heating_coil.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/cupronickelheatingcoil.png rename to src/main/resources/assets/techreborn/textures/items/part/cupronickel_heating_coil.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/datacontrolcircuit.png b/src/main/resources/assets/techreborn/textures/items/part/data_control_circuit.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/datacontrolcircuit.png rename to src/main/resources/assets/techreborn/textures/items/part/data_control_circuit.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/dataorb.png b/src/main/resources/assets/techreborn/textures/items/part/data_orb.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/dataorb.png rename to src/main/resources/assets/techreborn/textures/items/part/data_orb.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/datastoragecircuit.png b/src/main/resources/assets/techreborn/textures/items/part/data_storage_circuit.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/datastoragecircuit.png rename to src/main/resources/assets/techreborn/textures/items/part/data_storage_circuit.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/depletedcell.png b/src/main/resources/assets/techreborn/textures/items/part/depleted_cell.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/depletedcell.png rename to src/main/resources/assets/techreborn/textures/items/part/depleted_cell.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/diamondgrindinghead.png b/src/main/resources/assets/techreborn/textures/items/part/diamond_grinding_head.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/diamondgrindinghead.png rename to src/main/resources/assets/techreborn/textures/items/part/diamond_grinding_head.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/diamondsawblade.png b/src/main/resources/assets/techreborn/textures/items/part/diamond_saw_blade.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/diamondsawblade.png rename to src/main/resources/assets/techreborn/textures/items/part/diamond_saw_blade.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/doubledepletedcell.png b/src/main/resources/assets/techreborn/textures/items/part/double_depleted_cell.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/doubledepletedcell.png rename to src/main/resources/assets/techreborn/textures/items/part/double_depleted_cell.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/doubleplutoniumcell.png b/src/main/resources/assets/techreborn/textures/items/part/double_plutonium_cell.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/doubleplutoniumcell.png rename to src/main/resources/assets/techreborn/textures/items/part/double_plutonium_cell.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/doublethoriumcell.png b/src/main/resources/assets/techreborn/textures/items/part/double_thorium_cell.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/doublethoriumcell.png rename to src/main/resources/assets/techreborn/textures/items/part/double_thorium_cell.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/doubleuraniumcell.png b/src/main/resources/assets/techreborn/textures/items/part/double_uranium_cell.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/doubleuraniumcell.png rename to src/main/resources/assets/techreborn/textures/items/part/double_uranium_cell.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/electroniccircuit.png b/src/main/resources/assets/techreborn/textures/items/part/electronic_circuit.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/electroniccircuit.png rename to src/main/resources/assets/techreborn/textures/items/part/electronic_circuit.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/energyflowcircuit.png b/src/main/resources/assets/techreborn/textures/items/part/energy_flow_circuit.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/energyflowcircuit.png rename to src/main/resources/assets/techreborn/textures/items/part/energy_flow_circuit.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/heliumcoolantsimple.png b/src/main/resources/assets/techreborn/textures/items/part/helium_coolant_simple.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/heliumcoolantsimple.png rename to src/main/resources/assets/techreborn/textures/items/part/helium_coolant_simple.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/heliumcoolantsix.png b/src/main/resources/assets/techreborn/textures/items/part/helium_coolant_six.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/heliumcoolantsix.png rename to src/main/resources/assets/techreborn/textures/items/part/helium_coolant_six.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/heliumcoolanttriple.png b/src/main/resources/assets/techreborn/textures/items/part/helium_coolant_triple.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/heliumcoolanttriple.png rename to src/main/resources/assets/techreborn/textures/items/part/helium_coolant_triple.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/iridiumneutronreflector.png b/src/main/resources/assets/techreborn/textures/items/part/iridium_neutron_reflector.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/iridiumneutronreflector.png rename to src/main/resources/assets/techreborn/textures/items/part/iridium_neutron_reflector.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/kanthalheatingcoil.png b/src/main/resources/assets/techreborn/textures/items/part/kanthal_heating_coil.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/kanthalheatingcoil.png rename to src/main/resources/assets/techreborn/textures/items/part/kanthal_heating_coil.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/machineparts.png b/src/main/resources/assets/techreborn/textures/items/part/machine_parts.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/machineparts.png rename to src/main/resources/assets/techreborn/textures/items/part/machine_parts.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/nakcoolantsimple.png b/src/main/resources/assets/techreborn/textures/items/part/nak_coolant_simple.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/nakcoolantsimple.png rename to src/main/resources/assets/techreborn/textures/items/part/nak_coolant_simple.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/nakcoolantsix.png b/src/main/resources/assets/techreborn/textures/items/part/nak_coolant_six.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/nakcoolantsix.png rename to src/main/resources/assets/techreborn/textures/items/part/nak_coolant_six.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/nakcoolanttriple.png b/src/main/resources/assets/techreborn/textures/items/part/nak_coolant_triple.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/nakcoolanttriple.png rename to src/main/resources/assets/techreborn/textures/items/part/nak_coolant_triple.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/neutronreflector.png b/src/main/resources/assets/techreborn/textures/items/part/neutron_reflector.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/neutronreflector.png rename to src/main/resources/assets/techreborn/textures/items/part/neutron_reflector.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/nichromeheatingcoil.png b/src/main/resources/assets/techreborn/textures/items/part/nichrome_heating_coil.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/nichromeheatingcoil.png rename to src/main/resources/assets/techreborn/textures/items/part/nichrome_heating_coil.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/plutoniumcell.png b/src/main/resources/assets/techreborn/textures/items/part/plutonium_cell.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/plutoniumcell.png rename to src/main/resources/assets/techreborn/textures/items/part/plutonium_cell.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/quaddepletedcell.png b/src/main/resources/assets/techreborn/textures/items/part/quad_depleted_cell.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/quaddepletedcell.png rename to src/main/resources/assets/techreborn/textures/items/part/quad_depleted_cell.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/quadplutoniumcell.png b/src/main/resources/assets/techreborn/textures/items/part/quad_plutonium_cell.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/quadplutoniumcell.png rename to src/main/resources/assets/techreborn/textures/items/part/quad_plutonium_cell.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/quadthoriumcell.png b/src/main/resources/assets/techreborn/textures/items/part/quad_thorium_cell.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/quadthoriumcell.png rename to src/main/resources/assets/techreborn/textures/items/part/quad_thorium_cell.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/quaduraniumcell.png b/src/main/resources/assets/techreborn/textures/items/part/quad_uranium_cell.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/quaduraniumcell.png rename to src/main/resources/assets/techreborn/textures/items/part/quad_uranium_cell.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/rubbersap.png b/src/main/resources/assets/techreborn/textures/items/part/sap.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/rubbersap.png rename to src/main/resources/assets/techreborn/textures/items/part/sap.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/superconductor.png b/src/main/resources/assets/techreborn/textures/items/part/super_conductor.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/superconductor.png rename to src/main/resources/assets/techreborn/textures/items/part/super_conductor.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/thickneutronreflector.png b/src/main/resources/assets/techreborn/textures/items/part/thick_neutron_reflector.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/thickneutronreflector.png rename to src/main/resources/assets/techreborn/textures/items/part/thick_neutron_reflector.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/thoriumcell.png b/src/main/resources/assets/techreborn/textures/items/part/thorium_cell.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/thoriumcell.png rename to src/main/resources/assets/techreborn/textures/items/part/thorium_cell.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/tungstengrindinghead.png b/src/main/resources/assets/techreborn/textures/items/part/tungsten_grinding_head.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/tungstengrindinghead.png rename to src/main/resources/assets/techreborn/textures/items/part/tungsten_grinding_head.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/uraniumcell.png b/src/main/resources/assets/techreborn/textures/items/part/uranium_cell.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/uraniumcell.png rename to src/main/resources/assets/techreborn/textures/items/part/uranium_cell.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/bronze_shovel.png b/src/main/resources/assets/techreborn/textures/items/tool/bronze_spade.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/bronze_shovel.png rename to src/main/resources/assets/techreborn/textures/items/tool/bronze_spade.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/peridot_shovel.png b/src/main/resources/assets/techreborn/textures/items/tool/peridot_spade.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/peridot_shovel.png rename to src/main/resources/assets/techreborn/textures/items/tool/peridot_spade.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/ruby_shovel.png b/src/main/resources/assets/techreborn/textures/items/tool/ruby_spade.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/ruby_shovel.png rename to src/main/resources/assets/techreborn/textures/items/tool/ruby_spade.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/sapphire_shovel.png b/src/main/resources/assets/techreborn/textures/items/tool/sapphire_spade.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/sapphire_shovel.png rename to src/main/resources/assets/techreborn/textures/items/tool/sapphire_spade.png