From 2911e7f0ca49a8625f83ba3b32db365c366161ec Mon Sep 17 00:00:00 2001 From: ProfessorProspector Date: Sat, 10 Dec 2016 00:15:39 -0800 Subject: [PATCH] Move ingots, plates, and gems to jsons --- src/main/java/techreborn/Core.java | 16 +- .../techreborn/client/RegisterItemJsons.java | 24 ++ src/main/java/techreborn/init/ModRecipes.java | 110 +++++----- src/main/java/techreborn/init/OreDict.java | 13 +- src/main/java/techreborn/items/ItemGems.java | 15 +- .../java/techreborn/items/ItemIngots.java | 18 +- .../java/techreborn/items/ItemPlates.java | 44 ++-- .../assets/techreborn/blockstates/gem.json | 36 +++ .../assets/techreborn/blockstates/ingot.json | 126 +++++++++++ .../techreborn/blockstates/item/ingots.json | 0 .../assets/techreborn/blockstates/plates.json | 206 ++++++++++++++++++ .../assets/techreborn/lang/en_us.lang | 84 ++----- .../gem/{redgarnet.png => red_garnet.png} | Bin .../{yellowgarnet.png => yellow_garnet.png} | Bin ...lloyingot.png => advanced_alloy_ingot.png} | Bin .../{aluminumingot.png => aluminum_ingot.png} | Bin .../ingot/{brassingot.png => brass_ingot.png} | Bin .../{bronzeingot.png => bronze_ingot.png} | Bin .../{chromeingot.png => chrome_ingot.png} | Bin .../{copperingot.png => copper_ingot.png} | Bin .../{electrumingot.png => electrum_ingot.png} | Bin ...lingot.png => hot_tungstensteel_ingot.png} | Bin .../ingot/{invaringot.png => invar_ingot.png} | Bin ...alloyingot.png => iridium_alloy_ingot.png} | Bin .../{iridiumingot.png => iridium_ingot.png} | Bin .../ingot/{leadingot.png => lead_ingot.png} | Bin ...edmetalingot.png => mixed_metal_ingot.png} | Bin .../{nickelingot.png => nickel_ingot.png} | Bin .../{platinumingot.png => platinum_ingot.png} | Bin ...edironingot.png => refined_iron_ingot.png} | Bin .../{silveringot.png => silver_ingot.png} | Bin .../ingot/{steelingot.png => steel_ingot.png} | Bin .../ingot/{tiningot.png => tin_ingot.png} | Bin .../{titaniumingot.png => titanium_ingot.png} | Bin .../{tungsteningot.png => tungsten_ingot.png} | Bin ...steelingot.png => tungstensteel_ingot.png} | Bin .../ingot/{zincingot.png => zinc_ingot.png} | Bin ...lloyplate.png => advanced_alloy_plate.png} | Bin .../{aluminumplate.png => aluminum_plate.png} | Bin .../plate/{brassplate.png => brass_plate.png} | Bin .../{bronzeplate.png => bronze_plate.png} | Bin .../{carbonplate.png => carbon_plate.png} | Bin .../{chromeplate.png => chrome_plate.png} | Bin .../plate/{coalplate.png => coal_plate.png} | Bin .../{copperplate.png => copper_plate.png} | Bin .../{diamondplate.png => diamond_plate.png} | Bin .../{electrumplate.png => electrum_plate.png} | Bin .../{emeraldplate.png => emerald_plate.png} | Bin .../plate/{goldplate.png => gold_plate.png} | Bin .../plate/{invarplate.png => invar_plate.png} | Bin .../{iridiumplate.png => iridium_plate.png} | Bin .../plate/{ironplate.png => iron_plate.png} | Bin .../plate/{lapisplate.png => lapis_plate.png} | Bin .../{lazuriteplate.png => lazurite_plate.png} | Bin .../plate/{leadplate.png => lead_plate.png} | Bin ...magnaliumplate.png => magnalium_plate.png} | Bin .../{nickelplate.png => nickel_plate.png} | Bin .../{obsidianplate.png => obsidian_plate.png} | Bin .../{peridotplate.png => peridot_plate.png} | Bin .../{platinumplate.png => platinum_plate.png} | Bin ...edgarnetplate.png => red_garnet_plate.png} | Bin .../{redstoneplate.png => redstone_plate.png} | Bin ...edironplate.png => refined_iron_plate.png} | Bin .../plate/{rubyplate.png => ruby_plate.png} | Bin .../{sapphireplate.png => sapphire_plate.png} | Bin .../{siliconplate.png => silicon_plate.png} | Bin .../{silverplate.png => silver_plate.png} | Bin .../plate/{steelplate.png => steel_plate.png} | Bin .../plate/{tinplate.png => tin_plate.png} | Bin .../{titaniumplate.png => titanium_plate.png} | Bin .../{tungstenplate.png => tungsten_plate.png} | Bin ...steelplate.png => tungstensteel_plate.png} | Bin .../plate/{woodplate.png => wood_plate.png} | Bin ...arnetplate.png => yellow_garnet_plate.png} | Bin .../plate/{zincplate.png => zinc_plate.png} | Bin 75 files changed, 495 insertions(+), 197 deletions(-) create mode 100644 src/main/resources/assets/techreborn/blockstates/gem.json create mode 100644 src/main/resources/assets/techreborn/blockstates/ingot.json delete mode 100644 src/main/resources/assets/techreborn/blockstates/item/ingots.json create mode 100644 src/main/resources/assets/techreborn/blockstates/plates.json rename src/main/resources/assets/techreborn/textures/items/gem/{redgarnet.png => red_garnet.png} (100%) rename src/main/resources/assets/techreborn/textures/items/gem/{yellowgarnet.png => yellow_garnet.png} (100%) rename src/main/resources/assets/techreborn/textures/items/ingot/{advancedalloyingot.png => advanced_alloy_ingot.png} (100%) rename src/main/resources/assets/techreborn/textures/items/ingot/{aluminumingot.png => aluminum_ingot.png} (100%) rename src/main/resources/assets/techreborn/textures/items/ingot/{brassingot.png => brass_ingot.png} (100%) rename src/main/resources/assets/techreborn/textures/items/ingot/{bronzeingot.png => bronze_ingot.png} (100%) rename src/main/resources/assets/techreborn/textures/items/ingot/{chromeingot.png => chrome_ingot.png} (100%) rename src/main/resources/assets/techreborn/textures/items/ingot/{copperingot.png => copper_ingot.png} (100%) rename src/main/resources/assets/techreborn/textures/items/ingot/{electrumingot.png => electrum_ingot.png} (100%) rename src/main/resources/assets/techreborn/textures/items/ingot/{hottungstensteelingot.png => hot_tungstensteel_ingot.png} (100%) rename src/main/resources/assets/techreborn/textures/items/ingot/{invaringot.png => invar_ingot.png} (100%) rename src/main/resources/assets/techreborn/textures/items/ingot/{iridiumalloyingot.png => iridium_alloy_ingot.png} (100%) rename src/main/resources/assets/techreborn/textures/items/ingot/{iridiumingot.png => iridium_ingot.png} (100%) rename src/main/resources/assets/techreborn/textures/items/ingot/{leadingot.png => lead_ingot.png} (100%) rename src/main/resources/assets/techreborn/textures/items/ingot/{mixedmetalingot.png => mixed_metal_ingot.png} (100%) rename src/main/resources/assets/techreborn/textures/items/ingot/{nickelingot.png => nickel_ingot.png} (100%) rename src/main/resources/assets/techreborn/textures/items/ingot/{platinumingot.png => platinum_ingot.png} (100%) rename src/main/resources/assets/techreborn/textures/items/ingot/{refinedironingot.png => refined_iron_ingot.png} (100%) rename src/main/resources/assets/techreborn/textures/items/ingot/{silveringot.png => silver_ingot.png} (100%) rename src/main/resources/assets/techreborn/textures/items/ingot/{steelingot.png => steel_ingot.png} (100%) rename src/main/resources/assets/techreborn/textures/items/ingot/{tiningot.png => tin_ingot.png} (100%) rename src/main/resources/assets/techreborn/textures/items/ingot/{titaniumingot.png => titanium_ingot.png} (100%) rename src/main/resources/assets/techreborn/textures/items/ingot/{tungsteningot.png => tungsten_ingot.png} (100%) rename src/main/resources/assets/techreborn/textures/items/ingot/{tungstensteelingot.png => tungstensteel_ingot.png} (100%) rename src/main/resources/assets/techreborn/textures/items/ingot/{zincingot.png => zinc_ingot.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{advancedalloyplate.png => advanced_alloy_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{aluminumplate.png => aluminum_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{brassplate.png => brass_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{bronzeplate.png => bronze_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{carbonplate.png => carbon_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{chromeplate.png => chrome_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{coalplate.png => coal_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{copperplate.png => copper_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{diamondplate.png => diamond_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{electrumplate.png => electrum_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{emeraldplate.png => emerald_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{goldplate.png => gold_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{invarplate.png => invar_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{iridiumplate.png => iridium_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{ironplate.png => iron_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{lapisplate.png => lapis_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{lazuriteplate.png => lazurite_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{leadplate.png => lead_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{magnaliumplate.png => magnalium_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{nickelplate.png => nickel_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{obsidianplate.png => obsidian_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{peridotplate.png => peridot_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{platinumplate.png => platinum_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{redgarnetplate.png => red_garnet_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{redstoneplate.png => redstone_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{refinedironplate.png => refined_iron_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{rubyplate.png => ruby_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{sapphireplate.png => sapphire_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{siliconplate.png => silicon_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{silverplate.png => silver_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{steelplate.png => steel_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{tinplate.png => tin_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{titaniumplate.png => titanium_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{tungstenplate.png => tungsten_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{tungstensteelplate.png => tungstensteel_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{woodplate.png => wood_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{yellowgarnetplate.png => yellow_garnet_plate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/plate/{zincplate.png => zinc_plate.png} (100%) diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index b6c23d421..fe4ae0ee2 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -52,22 +52,19 @@ import java.io.File; @Mod(modid = ModInfo.MOD_ID, name = ModInfo.MOD_NAME, version = ModInfo.MOD_VERSION, dependencies = ModInfo.MOD_DEPENDENCIES, guiFactory = ModInfo.GUI_FACTORY_CLASS, acceptedMinecraftVersions = "[1.11]") public class Core { - public Core() { - //Forge says to call it here, so yeah - FluidRegistry.enableUniversalBucket(); - } - public static ConfigTechReborn config; - @SidedProxy(clientSide = ModInfo.CLIENT_PROXY_CLASS, serverSide = ModInfo.SERVER_PROXY_CLASS) public static CommonProxy proxy; - @Mod.Instance public static Core INSTANCE; public static LogHelper logHelper = new LogHelper(new ModInfo()); public static TechRebornWorldGen worldGen; public static File configDir; public VersionChecker versionChecker; + public Core() { + //Forge says to call it here, so yeah + FluidRegistry.enableUniversalBucket(); + } @Mod.EventHandler public void preinit(FMLPreInitializationEvent event) throws IllegalAccessException, InstantiationException { @@ -102,6 +99,8 @@ public class Core { // Entitys EntityRegistry.registerModEntity(new ResourceLocation("techreborn", "nuke"), EntityNukePrimed.class, "nuke", 0, INSTANCE, 160, 5, true); + //Ore Dictionary + OreDict.init(); proxy.preInit(event); RecipeConfigManager.load(event.getModConfigurationDirectory()); @@ -131,9 +130,6 @@ public class Core { MinecraftForge.EVENT_BUS.register(new StackWIPHandler()); MinecraftForge.EVENT_BUS.register(new BlockBreakHandler()); - //Ore Dictionary - OreDict.init(); - // Recipes StopWatch watch = new StopWatch(); watch.start(); diff --git a/src/main/java/techreborn/client/RegisterItemJsons.java b/src/main/java/techreborn/client/RegisterItemJsons.java index 48310bf7c..70475f868 100644 --- a/src/main/java/techreborn/client/RegisterItemJsons.java +++ b/src/main/java/techreborn/client/RegisterItemJsons.java @@ -3,9 +3,13 @@ package techreborn.client; import net.minecraft.block.Block; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import techreborn.init.ModBlocks; import techreborn.init.ModItems; +import techreborn.items.ItemGems; +import techreborn.items.ItemIngots; +import techreborn.items.ItemPlates; public class RegisterItemJsons { public static void registerModels() { @@ -34,6 +38,21 @@ public class RegisterItemJsons { register(ModItems.steelJackhammer, "tool/steel_jackhammer"); register(ModItems.diamondJackhammer, "tool/diamond_jackhammer"); register(ModItems.advancedJackhammer, "tool/advanced_jackhammer"); + + for (int i = 0; i < ItemIngots.types.length; ++i) { + String[] name = ItemIngots.types.clone(); + registerBlockstate(ModItems.ingots, i, name[i]); + } + + for (int i = 0; i < ItemGems.types.length; ++i) { + String[] name = ItemGems.types.clone(); + registerBlockstate(ModItems.gems, i, name[i]); + } + + for (int i = 0; i < ItemPlates.types.length; ++i) { + String[] name = ItemPlates.types.clone(); + registerBlockstate(ModItems.plate, i, name[i]); + } } private static void registerBlocks() { @@ -56,4 +75,9 @@ public class RegisterItemJsons { private static void register(Block block, String name) { register(Item.getItemFromBlock(block), 0, name); } + + private static void registerBlockstate(Item i, int meta, String variant) { + ResourceLocation loc = i.getRegistryName(); + ModelLoader.setCustomModelResourceLocation(i, meta, new ModelResourceLocation(loc, "type=" + variant)); + } } diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 911ec10c5..35a41c961 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -354,8 +354,8 @@ public class ModRecipes { } private static void addCompressorRecipes() { - RecipeHandler.addRecipe(new CompressorRecipe(ItemIngots.getIngotByName("advancedAlloy"), - ItemPlates.getPlateByName("advancedAlloy"), 400, 20)); + RecipeHandler.addRecipe(new CompressorRecipe(ItemIngots.getIngotByName("advanced_alloy"), + ItemPlates.getPlateByName("advanced_alloy"), 400, 20)); RecipeHandler.addRecipe( new CompressorRecipe(ItemParts.getPartByName("carbonmesh"), ItemPlates.getPlateByName("carbon"), 400, 2)); @@ -488,7 +488,7 @@ public class ModRecipes { .addShapedOreRecipe(ItemCells.getCellByName("empty", 16, false), " T ", "T T", " T ", 'T', "ingotTin"); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ironFence, 6), " ", "RRR", "RRR", 'R', - ItemIngots.getIngotByName("refinedIron")); + ItemIngots.getIngotByName("refined_iron")); if (ConfigTechReborn.enableGemArmorAndTools) { addGemToolRecipes(new ItemStack(ModItems.rubySword), new ItemStack(ModItems.rubyPickaxe), @@ -551,7 +551,7 @@ public class ModRecipes { "ingotAluminum", 'G', Blocks.GLASS_PANE); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.reinforcedglass, 7), "GAG", "GGG", "GAG", 'A', - ItemIngots.getIngotByName("advancedAlloy"), 'G', Blocks.GLASS); + ItemIngots.getIngotByName("advanced_alloy"), 'G', Blocks.GLASS); CraftingHelper .addShapedOreRecipe(new ItemStack(ModBlocks.windMill, 2), "IXI", "XGX", "IXI", 'I', "ingotIron", 'G', @@ -572,7 +572,7 @@ public class ModRecipes { "ingotCopper", 'W', ItemStandaloneCables.getCableByName("insulatedcopper")); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.machineCasing, 4, 0), "RRR", "CAC", "RRR", 'R', - ItemIngots.getIngotByName("refinedIron"), 'C', "circuitBasic", 'A', + ItemIngots.getIngotByName("refined_iron"), 'C', "circuitBasic", 'A', BlockMachineFrame.getFrameByName("machine", 1)); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.machineCasing, 4, 1), "RRR", "CAC", "RRR", 'R', @@ -605,123 +605,123 @@ public class ModRecipes { 'O', BlockMachineFrame.getFrameByName("advancedMachine", 1)); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.industrialElectrolyzer), "RER", "CEC", "RER", 'R', - ItemIngots.getIngotByName("refinediron"), 'E', new ItemStack(ModBlocks.extractor), 'C', + ItemIngots.getIngotByName("refined_iron"), 'E', new ItemStack(ModBlocks.extractor), 'C', "circuitAdvanced"); // Mixed Metal Ingot Recipes :P - CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 2), "RRR", "BBB", "TTT", 'R', + CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 2), "RRR", "BBB", "TTT", 'R', "ingotRefinedIron", 'B', "ingotBronze", 'T', "ingotTin"); - CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 2), "RRR", "BBB", "TTT", 'R', + CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 2), "RRR", "BBB", "TTT", 'R', "ingotRefinedIron", 'B', "ingotBronze", 'T', "ingotZinc"); - CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 2), "RRR", "BBB", "TTT", 'R', + CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 2), "RRR", "BBB", "TTT", 'R', "ingotRefinedIron", 'B', "ingotBrass", 'T', "ingotTin"); - CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 2), "RRR", "BBB", "TTT", 'R', + CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 2), "RRR", "BBB", "TTT", 'R', "ingotRefinedIron", 'B', "ingotBrass", 'T', "ingotZinc"); CraftingHelper - .addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel", + .addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel", 'B', "ingotBronze", 'T', "ingotTin"); CraftingHelper - .addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel", + .addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel", 'B', "ingotBronze", 'T', "ingotZinc"); CraftingHelper - .addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel", + .addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel", 'B', "ingotBrass", 'T', "ingotTin"); CraftingHelper - .addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel", + .addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel", 'B', "ingotBrass", 'T', "ingotZinc"); CraftingHelper - .addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 4), "RRR", "BBB", "TTT", 'R', "ingotNickel", + .addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotNickel", 'B', "ingotBronze", 'T', "ingotAluminum"); CraftingHelper - .addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 4), "RRR", "BBB", "TTT", 'R', "ingotNickel", + .addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotNickel", 'B', "ingotBrass", 'T', "ingotAluminum"); CraftingHelper - .addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar", + .addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar", 'B', "ingotBronze", 'T', "ingotTin"); CraftingHelper - .addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar", + .addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar", 'B', "ingotBronze", 'T', "ingotZinc"); CraftingHelper - .addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar", + .addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar", 'B', "ingotBrass", 'T', "ingotTin"); CraftingHelper - .addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar", + .addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar", 'B', "ingotBrass", 'T', "ingotZinc"); CraftingHelper - .addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R', "ingotInvar", + .addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R', "ingotInvar", 'B', "ingotBronze", 'T', "ingotAluminum"); CraftingHelper - .addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R', "ingotInvar", + .addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R', "ingotInvar", 'B', "ingotBrass", 'T', "ingotAluminum"); - CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R', + CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R', "ingotTitanium", 'B', "ingotBronze", 'T', "ingotTin"); - CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R', + CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R', "ingotTitanium", 'B', "ingotBronze", 'T', "ingotZinc"); - CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R', + CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R', "ingotTitanium", 'B', "ingotBrass", 'T', "ingotTin"); - CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R', + CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R', "ingotTitanium", 'B', "ingotBrass", 'T', "ingotZinc"); - CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 6), "RRR", "BBB", "TTT", 'R', + CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 6), "RRR", "BBB", "TTT", 'R', "ingotTitanium", 'B', "ingotBronze", 'T', "ingotAluminum"); - CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 6), "RRR", "BBB", "TTT", 'R', + CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 6), "RRR", "BBB", "TTT", 'R', "ingotTitanium", 'B', "ingotBrass", 'T', "ingotAluminum"); - CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R', + CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R', "ingotTungsten", 'B', "ingotBronze", 'T', "ingotTin"); - CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R', + CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R', "ingotTungsten", 'B', "ingotBronze", 'T', "ingotZinc"); - CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R', + CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R', "ingotTungsten", 'B', "ingotBrass", 'T', "ingotTin"); - CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R', + CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R', "ingotTungsten", 'B', "ingotBrass", 'T', "ingotZinc"); - CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 6), "RRR", "BBB", "TTT", 'R', + CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 6), "RRR", "BBB", "TTT", 'R', "ingotTungsten", 'B', "ingotBronze", 'T', "ingotAluminum"); - CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 6), "RRR", "BBB", "TTT", 'R', + CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 6), "RRR", "BBB", "TTT", 'R', "ingotTungsten", 'B', "ingotBrass", 'T', "ingotAluminum"); - CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 8), "RRR", "BBB", "TTT", 'R', + CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 8), "RRR", "BBB", "TTT", 'R', "ingotTungstensteel", 'B', "ingotBronze", 'T', "ingotTin"); - CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 8), "RRR", "BBB", "TTT", 'R', + CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 8), "RRR", "BBB", "TTT", 'R', "ingotTungstensteel", 'B', "ingotBronze", 'T', "ingotZinc"); - CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 8), "RRR", "BBB", "TTT", 'R', + CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 8), "RRR", "BBB", "TTT", 'R', "ingotTungstensteel", 'B', "ingotBrass", 'T', "ingotTin"); - CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 8), "RRR", "BBB", "TTT", 'R', + CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 8), "RRR", "BBB", "TTT", 'R', "ingotTungstensteel", 'B', "ingotBrass", 'T', "ingotZinc"); - CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 9), "RRR", "BBB", "TTT", 'R', + CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 9), "RRR", "BBB", "TTT", 'R', "ingotTungstensteel", 'B', "ingotBronze", 'T', "ingotAluminum"); - CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 9), "RRR", "BBB", "TTT", 'R', + CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 9), "RRR", "BBB", "TTT", 'R', "ingotTungstensteel", 'B', "ingotBrass", 'T', "ingotAluminum"); CraftingHelper @@ -770,11 +770,11 @@ public class ModRecipes { BlockMachineFrame.getFrameByName("machine", 1), Blocks.FURNACE); CraftingHelper.addShapedOreRecipe(BlockMachineFrame.getFrameByName("machine", 1), "AAA", "AXA", "AAA", 'A', - ItemIngots.getIngotByName("refinediron")); + ItemIngots.getIngotByName("refined_iron")); CraftingHelper .addShapedOreRecipe(BlockMachineFrame.getFrameByName("advancedMachine", 1), "XCX", "AMA", "XCX", 'A', - ItemIngots.getIngotByName("advancedAlloy"), 'C', ItemPlates.getPlateByName("carbon"), 'M', + ItemIngots.getIngotByName("advanced_alloy"), 'C', ItemPlates.getPlateByName("carbon"), 'M', BlockMachineFrame.getFrameByName("machine", 1)); CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("dataStorageCircuit", 8), "EEE", "ECE", "EEE", 'E', @@ -1011,7 +1011,7 @@ public class ModRecipes { .addRollingOreMachinceRecipe(ItemParts.getPartByName("cupronickelHeatingCoil", 3), "NCN", "C C", "NCN", 'N', "ingotNickel", 'C', "ingotCopper"); - RecipeHandler.addRecipe(new VacuumFreezerRecipe(ItemIngots.getIngotByName("hotTungstensteel"), + RecipeHandler.addRecipe(new VacuumFreezerRecipe(ItemIngots.getIngotByName("hot_tungstensteel"), ItemIngots.getIngotByName("tungstensteel"), 440, 128)); RecipeHandler.addRecipe(new VacuumFreezerRecipe(ItemCells.getCellByName("heliumplasma"), @@ -1030,7 +1030,7 @@ public class ModRecipes { )); RecipeHandler.addRecipe(new VacuumFreezerRecipe( - ItemIngots.getIngotByName("hotTungstensteel"), + ItemIngots.getIngotByName("hot_tungstensteel"), ItemIngots.getIngotByName("tungstensteel"), 440, 120)); @@ -1050,14 +1050,14 @@ public class ModRecipes { CraftingHelper.addSmelting(ItemDusts.getDustByName("iron", 1), new ItemStack(Items.IRON_INGOT), 1F); CraftingHelper.addSmelting(ItemDusts.getDustByName("gold", 1), new ItemStack(Items.GOLD_INGOT), 1F); CraftingHelper.addSmelting(ItemParts.getPartByName("rubberSap"), ItemParts.getPartByName("rubber"), 1F); - CraftingHelper.addSmelting(new ItemStack(Items.IRON_INGOT), ItemIngots.getIngotByName("refinediron"), 1F); + CraftingHelper.addSmelting(new ItemStack(Items.IRON_INGOT), ItemIngots.getIngotByName("refined_iron"), 1F); CraftingHelper.addSmelting(BlockOre2.getOreByName("copper"), ItemIngots.getIngotByName("copper"), 1F); CraftingHelper.addSmelting(BlockOre2.getOreByName("tin"), ItemIngots.getIngotByName("tin"), 1F); CraftingHelper.addSmelting(BlockOre.getOreByName("Silver"), ItemIngots.getIngotByName("silver"), 1F); CraftingHelper.addSmelting(BlockOre.getOreByName("Lead"), ItemIngots.getIngotByName("lead"), 1F); CraftingHelper.addSmelting(BlockOre.getOreByName("Sheldonite"), ItemIngots.getIngotByName("platinum"), 1F); CraftingHelper - .addSmelting(ItemIngots.getIngotByName("mixedMetal"), ItemIngots.getIngotByName("advancedAlloy"), 1F); + .addSmelting(ItemIngots.getIngotByName("mixed_metal"), ItemIngots.getIngotByName("advanced_alloy"), 1F); CraftingHelper.addSmelting(ItemDusts.getDustByName("nickel", 1), ItemIngots.getIngotByName("nickel"), 1F); CraftingHelper.addSmelting(ItemDusts.getDustByName("platinum", 1), ItemIngots.getIngotByName("platinum"), 1F); CraftingHelper.addSmelting(ItemDusts.getDustByName("zinc", 1), ItemIngots.getIngotByName("zinc"), 1F); @@ -1304,7 +1304,7 @@ public class ModRecipes { RecipeHandler.addRecipe( new BlastFurnaceRecipe(ItemIngots.getIngotByName("tungsten"), ItemIngots.getIngotByName("steel"), - ItemIngots.getIngotByName("hotTungstensteel"), ItemDusts.getDustByName("darkAshes", 4), 500, + ItemIngots.getIngotByName("hot_tungstensteel"), ItemDusts.getDustByName("darkAshes", 4), 500, 500, 3000)); RecipeHandler.addRecipe( @@ -1978,7 +1978,7 @@ public class ModRecipes { } static void addIc2Recipes() { - CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.manual), ItemIngots.getIngotByName("refinedIron"), + CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.manual), ItemIngots.getIngotByName("refined_iron"), Items.BOOK); CraftingHelper @@ -1997,7 +1997,7 @@ public class ModRecipes { "lapotronCrystal", 'P', "plateIridium"); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.industrialSawmill), "PAP", "SSS", "ACA", 'P', - ItemIngots.getIngotByName("refinedIron"), 'A', "circuitAdvanced", + ItemIngots.getIngotByName("refined_iron"), 'A', "circuitAdvanced", 'S', ItemParts.getPartByName("diamondSawBlade"), 'C', "machineBlockAdvanced"); @@ -2079,7 +2079,7 @@ public class ModRecipes { 'G', ModBlocks.grinder); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.implosionCompressor), "ABA", "CPC", "ABA", 'A', - ItemIngots.getIngotByName("advancedAlloy"), 'C', "circuitAdvanced", 'B', + ItemIngots.getIngotByName("advanced_alloy"), 'C', "circuitAdvanced", 'B', BlockMachineFrame.getFrameByName("advancedMachine", 1), 'P', ModBlocks.compressor); CraftingHelper @@ -2093,7 +2093,7 @@ public class ModRecipes { ModBlocks.extractor); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.alloyFurnace), "III", "F F", "III", 'I', - ItemIngots.getIngotByName("refinediron"), 'F', new ItemStack(ModBlocks.ironFurnace)); + ItemIngots.getIngotByName("refined_iron"), 'F', new ItemStack(ModBlocks.ironFurnace)); CraftingHelper .addShapedOreRecipe(new ItemStack(ModBlocks.chemicalReactor), "IMI", "CPC", "IEI", 'I', "ingotInvar", @@ -2850,7 +2850,7 @@ public class ModRecipes { // Implosion compressor - RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemIngots.getIngotByName("iridiumAlloy"), + RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemIngots.getIngotByName("iridium_alloy"), new ItemStack(Blocks.TNT, 8), OreDictionary.getOres("plateIridium").get(0).copy(), ItemDusts.getDustByName("darkAshes", 4), 20, 30)); RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("diamond", 4), @@ -2868,10 +2868,10 @@ public class ModRecipes { ItemGems.getGemByName("ruby", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("yellowGarnet", 4), new ItemStack(Blocks.TNT, 24), - ItemGems.getGemByName("yellowGarnet", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); + ItemGems.getGemByName("yellow_garnet", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("redGarnet", 4), new ItemStack(Blocks.TNT, 24), - ItemGems.getGemByName("redGarnet", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); + ItemGems.getGemByName("red_garnet", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("peridot", 4), new ItemStack(Blocks.TNT, 24), ItemGems.getGemByName("peridot", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); @@ -3173,7 +3173,7 @@ public class ModRecipes { "ic2Generator", 'C', "circuitBasic"); - CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("iridiumAlloy"), "IAI", "ADA", "IAI", 'I', + CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("iridium_alloy"), "IAI", "ADA", "IAI", 'I', "ingotIridium", 'D', ItemDusts.getDustByName("diamond"), 'A', "plateAdvancedAlloy"); diff --git a/src/main/java/techreborn/init/OreDict.java b/src/main/java/techreborn/init/OreDict.java index cc3909c97..de14b27c6 100644 --- a/src/main/java/techreborn/init/OreDict.java +++ b/src/main/java/techreborn/init/OreDict.java @@ -1,5 +1,6 @@ package techreborn.init; +import com.google.common.base.CaseFormat; import com.google.common.collect.ImmutableList; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -16,8 +17,8 @@ public class OreDict { private static final ImmutableList plateGenIgnores = ImmutableList.of( "hot", //Hot ingots - "mixedMetal", //Mixed metal has own version of plate - "iridiumAlloy", //Iridium alloy is plate itself + "mixed_metal", //Mixed metal has own version of plate + "iridium_alloy", //Iridium alloy is plate itself ModItems.META_PLACEHOLDER //... ); @@ -81,22 +82,20 @@ public class OreDict { for (String type : ItemGems.types) { if (type.equals(ModItems.META_PLACEHOLDER)) continue; //Aware of placeholders! - String upper = OreDictUtils.toFirstUpper(type); - OreDictionary.registerOre("gem" + upper, ItemGems.getGemByName(type)); + OreDictionary.registerOre("gem" + CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, type), ItemGems.getGemByName(type)); boolean ignoreIt = false; for (String ignore : plateGenIgnores) if (type.startsWith(ignore)) ignoreIt = true; if (!ignoreIt) - ItemPlates.registerType(upper); + ItemPlates.registerType(type); } //Ingots registration for (String type : ItemIngots.types) { if (type.equals(ModItems.META_PLACEHOLDER)) continue; //Aware of placeholders! - String upperName = OreDictUtils.toFirstUpper(type); - OreDictionary.registerOre("ingot" + upperName, ItemIngots.getIngotByName(type)); + OreDictionary.registerOre("ingot" + CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, type), ItemIngots.getIngotByName(type)); boolean ignoreIt = false; for (String ignore : plateGenIgnores) if (type.startsWith(ignore)) diff --git a/src/main/java/techreborn/items/ItemGems.java b/src/main/java/techreborn/items/ItemGems.java index 43ca5fda2..715dab621 100644 --- a/src/main/java/techreborn/items/ItemGems.java +++ b/src/main/java/techreborn/items/ItemGems.java @@ -6,13 +6,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; -import techreborn.lib.ModInfo; import java.security.InvalidParameterException; -public class ItemGems extends ItemTextureBase { +public class ItemGems extends ItemTRNoDestroy { - public static final String[] types = new String[] { "ruby", "sapphire", "peridot", "redGarnet", "yellowGarnet" }; + public static final String[] types = new String[] { "ruby", "sapphire", "peridot", "red_garnet", "yellow_garnet" }; public ItemGems() { setCreativeTab(TechRebornCreativeTabMisc.instance); @@ -51,14 +50,4 @@ public class ItemGems extends ItemTextureBase { } } - @Override - public String getTextureName(int damage) { - return ModInfo.MOD_ID + ":items/gem/" + types[damage]; - } - - @Override - public int getMaxMeta() { - return types.length; - } - } diff --git a/src/main/java/techreborn/items/ItemIngots.java b/src/main/java/techreborn/items/ItemIngots.java index 848cb6868..2af8048a9 100644 --- a/src/main/java/techreborn/items/ItemIngots.java +++ b/src/main/java/techreborn/items/ItemIngots.java @@ -6,15 +6,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; -import techreborn.lib.ModInfo; import java.security.InvalidParameterException; -public class ItemIngots extends ItemTextureBase { +public class ItemIngots extends ItemTRNoDestroy { public static final String[] types = new String[] { "aluminum", "brass", "bronze", "chrome", "copper", "electrum", "invar", "iridium", "lead", "nickel", "platinum", "silver", "steel", "tin", "titanium", "tungsten", - "hotTungstensteel", "tungstensteel", "zinc", "refinedIron", "advancedAlloy", "mixedMetal", - "iridiumAlloy"}; + "hot_tungstensteel", "tungstensteel", "zinc", "refined_iron", "advanced_alloy", "mixed_metal", + "iridium_alloy" }; public ItemIngots() { setCreativeTab(TechRebornCreativeTabMisc.instance); @@ -54,15 +53,4 @@ public class ItemIngots extends ItemTextureBase { } } } - - @Override - public String getTextureName(int damage) { - return ModInfo.MOD_ID + ":items/ingot/" + types[damage] + "Ingot"; - } - - @Override - public int getMaxMeta() { - return types.length; - } - } diff --git a/src/main/java/techreborn/items/ItemPlates.java b/src/main/java/techreborn/items/ItemPlates.java index 6bbaa3142..88f8603b2 100644 --- a/src/main/java/techreborn/items/ItemPlates.java +++ b/src/main/java/techreborn/items/ItemPlates.java @@ -1,5 +1,6 @@ package techreborn.items; +import com.google.common.base.CaseFormat; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -7,12 +8,10 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.oredict.OreDictionary; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; -import techreborn.lib.ModInfo; -import techreborn.utils.OreDictUtils; import java.security.InvalidParameterException; -public class ItemPlates extends ItemTextureBase { +public class ItemPlates extends ItemTRNoDestroy { //Vanilla plates or plates not from ingots or gems public static String[] types = new String[] { @@ -38,6 +37,20 @@ public class ItemPlates extends ItemTextureBase { return getPlateByName(name, 1); } + public static void registerType(String plateType) { + for (String type : types) { + if (type.equals(plateType)) + return; + } + int plateIndex = types.length; + String[] newTypes = new String[plateIndex + 1]; + System.arraycopy(types, 0, newTypes, 0, types.length); + types = newTypes; + newTypes[plateIndex] = plateType; + String oreName = "plate" + CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, plateType); + OreDictionary.registerOre(oreName, new ItemStack(ModItems.plate, 1, plateIndex)); + } + @Override // gets Unlocalized Name depending on meta data public String getUnlocalizedName(ItemStack itemStack) { @@ -55,29 +68,4 @@ public class ItemPlates extends ItemTextureBase { list.add(new ItemStack(item, 1, meta)); } } - - public static void registerType(String plateType) { - for (String type : types) { - if (type.equals(plateType)) - return; - } - int plateIndex = types.length; - String[] newTypes = new String[plateIndex + 1]; - System.arraycopy(types, 0, newTypes, 0, types.length); - types = newTypes; - newTypes[plateIndex] = plateType; - String oreName = "plate" + OreDictUtils.toFirstUpper(plateType); - OreDictionary.registerOre(oreName, new ItemStack(ModItems.plate, 1, plateIndex)); - } - - @Override - public String getTextureName(int damage) { - return ModInfo.MOD_ID + ":items/plate/" + types[damage] + "Plate"; - } - - @Override - public int getMaxMeta() { - return types.length; - } - } diff --git a/src/main/resources/assets/techreborn/blockstates/gem.json b/src/main/resources/assets/techreborn/blockstates/gem.json new file mode 100644 index 000000000..4321bc40a --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/gem.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "ruby": { + "textures": { + "layer0": "techreborn:items/gem/ruby" + } + }, + "sapphire": { + "textures": { + "layer0": "techreborn:items/gem/sapphire" + } + }, + "peridot": { + "textures": { + "layer0": "techreborn:items/gem/peridot" + } + }, + "red_garnet": { + "textures": { + "layer0": "techreborn:items/gem/red_garnet" + } + }, + "yellow_garnet": { + "textures": { + "layer0": "techreborn:items/gem/yellow_garnet" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/ingot.json b/src/main/resources/assets/techreborn/blockstates/ingot.json new file mode 100644 index 000000000..9452376a8 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/ingot.json @@ -0,0 +1,126 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "aluminum": { + "textures": { + "layer0": "techreborn:items/ingot/aluminum_ingot" + } + }, + "brass": { + "textures": { + "layer0": "techreborn:items/ingot/brass_ingot" + } + }, + "bronze": { + "textures": { + "layer0": "techreborn:items/ingot/bronze_ingot" + } + }, + "chrome": { + "textures": { + "layer0": "techreborn:items/ingot/chrome_ingot" + } + }, + "copper": { + "textures": { + "layer0": "techreborn:items/ingot/copper_ingot" + } + }, + "electrum": { + "textures": { + "layer0": "techreborn:items/ingot/electrum_ingot" + } + }, + "invar": { + "textures": { + "layer0": "techreborn:items/ingot/invar_ingot" + } + }, + "iridium": { + "textures": { + "layer0": "techreborn:items/ingot/iridium_ingot" + } + }, + "lead": { + "textures": { + "layer0": "techreborn:items/ingot/lead_ingot" + } + }, + "nickel": { + "textures": { + "layer0": "techreborn:items/ingot/nickel_ingot" + } + }, + "platinum": { + "textures": { + "layer0": "techreborn:items/ingot/platinum_ingot" + } + }, + "silver": { + "textures": { + "layer0": "techreborn:items/ingot/silver_ingot" + } + }, + "steel": { + "textures": { + "layer0": "techreborn:items/ingot/steel_ingot" + } + }, + "tin": { + "textures": { + "layer0": "techreborn:items/ingot/tin_ingot" + } + }, + "titanium": { + "textures": { + "layer0": "techreborn:items/ingot/titanium_ingot" + } + }, + "tungsten": { + "textures": { + "layer0": "techreborn:items/ingot/tungsten_ingot" + } + }, + "hot_tungstensteel": { + "textures": { + "layer0": "techreborn:items/ingot/hot_tungstensteel_ingot" + } + }, + "tungstensteel": { + "textures": { + "layer0": "techreborn:items/ingot/tungstensteel_ingot" + } + }, + "zinc": { + "textures": { + "layer0": "techreborn:items/ingot/zinc_ingot" + } + }, + "refined_iron": { + "textures": { + "layer0": "techreborn:items/ingot/refined_iron_ingot" + } + }, + "advanced_alloy": { + "textures": { + "layer0": "techreborn:items/ingot/advanced_alloy_ingot" + } + }, + "mixed_metal": { + "textures": { + "layer0": "techreborn:items/ingot/mixed_metal_ingot" + } + }, + "iridium_alloy": { + "textures": { + "layer0": "techreborn:items/ingot/iridium_alloy_ingot" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/item/ingots.json b/src/main/resources/assets/techreborn/blockstates/item/ingots.json deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/main/resources/assets/techreborn/blockstates/plates.json b/src/main/resources/assets/techreborn/blockstates/plates.json new file mode 100644 index 000000000..25df82a1f --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/plates.json @@ -0,0 +1,206 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "aluminum": { + "textures": { + "layer0": "techreborn:items/plate/aluminum_plate" + } + }, + "brass": { + "textures": { + "layer0": "techreborn:items/plate/brass_plate" + } + }, + "bronze": { + "textures": { + "layer0": "techreborn:items/plate/bronze_plate" + } + }, + "chrome": { + "textures": { + "layer0": "techreborn:items/plate/chrome_plate" + } + }, + "copper": { + "textures": { + "layer0": "techreborn:items/plate/copper_plate" + } + }, + "electrum": { + "textures": { + "layer0": "techreborn:items/plate/electrum_plate" + } + }, + "invar": { + "textures": { + "layer0": "techreborn:items/plate/invar_plate" + } + }, + "iridium": { + "textures": { + "layer0": "techreborn:items/plate/iridium_plate" + } + }, + "lead": { + "textures": { + "layer0": "techreborn:items/plate/lead_plate" + } + }, + "nickel": { + "textures": { + "layer0": "techreborn:items/plate/nickel_plate" + } + }, + "platinum": { + "textures": { + "layer0": "techreborn:items/plate/platinum_plate" + } + }, + "silver": { + "textures": { + "layer0": "techreborn:items/plate/silver_plate" + } + }, + "steel": { + "textures": { + "layer0": "techreborn:items/plate/steel_plate" + } + }, + "tin": { + "textures": { + "layer0": "techreborn:items/plate/tin_plate" + } + }, + "titanium": { + "textures": { + "layer0": "techreborn:items/plate/titanium_plate" + } + }, + "tungsten": { + "textures": { + "layer0": "techreborn:items/plate/tungsten_plate" + } + }, + "hot_tungstensteel": { + "textures": { + "layer0": "techreborn:items/plate/hot_tungstensteel_plate" + } + }, + "tungstensteel": { + "textures": { + "layer0": "techreborn:items/plate/tungstensteel_plate" + } + }, + "zinc": { + "textures": { + "layer0": "techreborn:items/plate/zinc_plate" + } + }, + "refined_iron": { + "textures": { + "layer0": "techreborn:items/plate/refined_iron_plate" + } + }, + "advanced_alloy": { + "textures": { + "layer0": "techreborn:items/plate/advanced_alloy_plate" + } + }, + "mixed_metal": { + "textures": { + "layer0": "techreborn:items/plate/mixed_metal_plate" + } + }, + "iridium_alloy": { + "textures": { + "layer0": "techreborn:items/plate/iridium_alloy_plate" + } + }, + "wood": { + "textures": { + "layer0": "techreborn:items/plate/wood_plate" + } + }, + "iron": { + "textures": { + "layer0": "techreborn:items/plate/iron_plate" + } + }, + "lapis": { + "textures": { + "layer0": "techreborn:items/plate/lapis_plate" + } + }, + "lazurite": { + "textures": { + "layer0": "techreborn:items/plate/lazurite_plate" + } + }, + "gold": { + "textures": { + "layer0": "techreborn:items/plate/gold_plate" + } + }, + "redstone": { + "textures": { + "layer0": "techreborn:items/plate/redstone_plate" + } + }, + "diamond": { + "textures": { + "layer0": "techreborn:items/plate/diamond_plate" + } + }, + "emerald": { + "textures": { + "layer0": "techreborn:items/plate/emerald_plate" + } + }, + "coal": { + "textures": { + "layer0": "techreborn:items/plate/coal_plate" + } + }, + "obsidian": { + "textures": { + "layer0": "techreborn:items/plate/obsidian_plate" + } + }, + "carbon": { + "textures": { + "layer0": "techreborn:items/plate/carbon_plate" + } + }, + "ruby": { + "textures": { + "layer0": "techreborn:items/plate/ruby_plate" + } + }, + "sapphire": { + "textures": { + "layer0": "techreborn:items/plate/sapphire_plate" + } + }, + "peridot": { + "textures": { + "layer0": "techreborn:items/plate/peridot_plate" + } + }, + "red_garnet": { + "textures": { + "layer0": "techreborn:items/plate/red_garnet_plate" + } + }, + "yellow_garnet": { + "textures": { + "layer0": "techreborn:items/plate/yellow_garnet_plate" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/lang/en_us.lang b/src/main/resources/assets/techreborn/lang/en_us.lang index 3894b811c..4e04864ea 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.lang +++ b/src/main/resources/assets/techreborn/lang/en_us.lang @@ -286,7 +286,6 @@ item.techreborn.dust.andesite.name=Andesite Dust item.techreborn.dust.diorite.name=Diorite Dust item.techreborn.dust.granite.name=Granite Dust -item.techreborn.ingot.refinedIron.name=Refined Iron Ingot item.techreborn.wrench.name=Wrench item.techreborn.cable.COPPER.name=Copper Cable item.techreborn.cable.TIN.name=Tin Cable @@ -383,46 +382,33 @@ item.techreborn.electric_treetap.name=Electric Treetap item.techreborn.gem.ruby.name=Ruby item.techreborn.gem.sapphire.name=Sapphire item.techreborn.gem.peridot.name=Peridot -item.techreborn.gem.redGarnet.name=Red Garnet -item.techreborn.gem.yellowGarnet.name=Yellow Garnet +item.techreborn.gem.red_garnet.name=Red Garnet +item.techreborn.gem.yellow_garnet.name=Yellow Garnet #Ingots item.techreborn.ingot.aluminum.name=Aluminium Ingot -item.techreborn.ingot.antimony.name=Antimony Ingot -item.techreborn.ingot.batteryAlloy.name=Battery Alloy Ingot -item.techreborn.ingot.redAlloy.name=Red Alloy Ingot -item.techreborn.ingot.blueAlloy.name=Blue Alloy Ingot item.techreborn.ingot.brass.name=Brass Ingot item.techreborn.ingot.bronze.name=Bronze Ingot -item.techreborn.ingot.cadmium.name=Cadmium Ingot item.techreborn.ingot.chrome.name=Chrome Ingot item.techreborn.ingot.copper.name=Copper Ingot -item.techreborn.ingot.cupronickel.name=Cupronickel Ingot item.techreborn.ingot.electrum.name=Electrum Ingot -item.techreborn.ingot.indium.name=Indium Ingot item.techreborn.ingot.invar.name=Invar Ingot item.techreborn.ingot.iridium.name=Iridium Ingot -item.techreborn.ingot.kanthal.name=Kanthal Ingot item.techreborn.ingot.lead.name=Lead Ingot -item.techreborn.ingot.lodestone.name=Lodestone Ingot -item.techreborn.ingot.magnalium.name=Magnalium Ingot -item.techreborn.ingot.nichrome.name=Nichrome Ingot item.techreborn.ingot.nickel.name=Nickel Ingot -item.techreborn.ingot.osmium.name=Osmium Ingot item.techreborn.ingot.platinum.name=Platinum Ingot -item.techreborn.ingot.silicon.name=Silicon Ingot item.techreborn.ingot.silver.name=Silver Ingot item.techreborn.ingot.steel.name=Steel Ingot -item.techreborn.ingot.tellurium.name=Tellurium Ingot item.techreborn.ingot.tin.name=Tin Ingot item.techreborn.ingot.titanium.name=Titanium Ingot item.techreborn.ingot.tungsten.name=Tungsten Ingot -item.techreborn.ingot.hotTungstensteel.name=Hot Tungstensteel Ingot +item.techreborn.ingot.hot_tungstensteel.name=Hot Tungstensteel Ingot item.techreborn.ingot.tungstensteel.name=Tungstensteel Ingot item.techreborn.ingot.zinc.name=Zinc Ingot -item.techreborn.ingot.advancedAlloy.name=Advanced Alloy Ingot -item.techreborn.ingot.mixedMetal.name=Mixed Metal Ingot -item.techreborn.ingot.iridiumAlloy.name=Iridium Alloy Ingot +item.techreborn.ingot.advanced_alloy.name=Advanced Alloy Ingot +item.techreborn.ingot.mixed_metal.name=Mixed Metal Ingot +item.techreborn.ingot.iridium_alloy.name=Iridium Alloy Ingot +item.techreborn.ingot.refined_iron.name=Refined Iron Ingot #Nuggets item.techreborn.nuggets.aluminum.name=Aluminium Nugget @@ -450,44 +436,6 @@ item.techreborn.nuggets.zinc.name=Zinc Nugget item.techreborn.nuggets.refinedIron.name=Refined Iron Nugget item.techreborn.nuggets.diamond.name=Diamond Nugget -#Crushed Ore -item.techreborn.crushedore.Aluminum.name=Crushed Aluminium Ore -item.techreborn.crushedore.Ardite.name=Crushed Ardite Ore -item.techreborn.crushedore.Bauxite.name=Crushed Bauxite Ore -item.techreborn.crushedore.Cadmium.name=Crushed Cadmium Ore -item.techreborn.crushedore.Cinnabar.name=Crushed Cinnabar Ore -item.techreborn.crushedore.Cobalt.name=Crushed Cobalt Ore -item.techreborn.crushedore.DarkIron.name=Crushed Dark Iron Ore -item.techreborn.crushedore.Indium.name=Crushed Indium Ore -item.techreborn.crushedore.Iridium.name=Crushed Iridium Ore -item.techreborn.crushedore.Nickel.name=Crushed Nickel Ore -item.techreborn.crushedore.Osmium.name=Crushed Osmium Ore -item.techreborn.crushedore.Platinum.name=Crushed Platinum Ore -item.techreborn.crushedore.Pyrite.name=Crushed Pyrite Ore -item.techreborn.crushedore.Sphalerite.name=Crushed Sphalerite Ore -item.techreborn.crushedore.Tetrahedrite.name=Crushed Tetrahedrite Ore -item.techreborn.crushedore.Tungsten.name=Purified Crushed Tungsten Ore -item.techreborn.crushedore.Galena.name=Crushed Galena Ore - -#Purified Crushed Ore -item.techreborn.purifiedcrushedore.Aluminum.name=Purified Crushed Aluminium Ore -item.techreborn.purifiedcrushedore.Ardite.name=Purified Crushed Ardite Ore -item.techreborn.purifiedcrushedore.Bauxite.name=Purified Crushed Bauxite Ore -item.techreborn.purifiedcrushedore.Cadmium.name=Purified Crushed Cadmium Ore -item.techreborn.purifiedcrushedore.Cinnabar.name=Purified Crushed Cinnabar Ore -item.techreborn.purifiedcrushedore.Cobalt.name=Purified Crushed Cobalt Ore -item.techreborn.purifiedcrushedore.DarkIron.name=Purified Crushed Dark Iron Ore -item.techreborn.purifiedcrushedore.Indium.name=Purified Crushed Indium Ore -item.techreborn.purifiedcrushedore.Iridium.name=Purified Crushed Iridium Ore -item.techreborn.purifiedcrushedore.Nickel.name=Purified Crushed Nickel Ore -item.techreborn.purifiedcrushedore.Osmium.name=Purified Crushed Osmium Ore -item.techreborn.purifiedcrushedore.Platinum.name=Purified Crushed Platinum Ore -item.techreborn.purifiedcrushedore.Pyrite.name=Purified Crushed Pyrite Ore -item.techreborn.purifiedcrushedore.Sphalerite.name=Purified Crushed Sphalerite Ore -item.techreborn.purifiedcrushedore.Tetrahedrite.name=Purified Crushed Tetrahedrite Ore -item.techreborn.purifiedcrushedore.Tungsten.name=Purified Crushed Tungsten Ore -item.techreborn.purifiedcrushedore.Galena.name=Purified Crushed Galena Ore - #Plates item.techreborn.plate.aluminum.name=Aluminium Plate item.techreborn.plate.brass.name=Brass Plate @@ -505,16 +453,14 @@ item.techreborn.plate.iridium.name=Iridium Plate item.techreborn.plate.iron.name=Iron Plate item.techreborn.plate.lapis.name=Lapis Lazuli Plate item.techreborn.plate.lead.name=Lead Plate -item.techreborn.plate.magnalium.name=Magnalium Plate item.techreborn.plate.nickel.name=Nickel Plate item.techreborn.plate.obsidian.name=Obsidian Plate -item.techreborn.plate.osmium.name=Osmium Plate -item.techreborn.plate.Peridot.name=Peridot Plate +item.techreborn.plate.peridot.name=Peridot Plate item.techreborn.plate.platinum.name=Platinum Plate -item.techreborn.plate.RedGarnet.name=Red Garnet Plate +item.techreborn.plate.red_garnet.name=Red Garnet Plate item.techreborn.plate.redstone.name=Redstone Plate -item.techreborn.plate.Ruby.name=Ruby Plate -item.techreborn.plate.Sapphire.name=Sapphire Plate +item.techreborn.plate.ruby.name=Ruby Plate +item.techreborn.plate.sapphire.name=Sapphire Plate item.techreborn.plate.silicon.name=Silicon Plate item.techreborn.plate.silver.name=Silver Plate item.techreborn.plate.steel.name=Steel Plate @@ -522,13 +468,13 @@ item.techreborn.plate.teslatite.name=Teslatite Plate item.techreborn.plate.tin.name=Tin Plate item.techreborn.plate.titanium.name=Titanium Plate item.techreborn.plate.tungsten.name=Tungsten Plate -item.techreborn.plate.hotTungstensteel.name=Hot Tungstensteel Plate +item.techreborn.plate.hot_tungstensteel.name=Hot Tungstensteel Plate item.techreborn.plate.tungstensteel.name=Tungstensteel Plate -item.techreborn.plate.YellowGarnet.name=Yellow Garnet Plate +item.techreborn.plate.yellow_garnet.name=Yellow Garnet Plate item.techreborn.plate.zinc.name=Zinc Plate -item.techreborn.plate.refinedIron.name=Refined Iron Plate +item.techreborn.plate.refined_iron.name=Refined Iron Plate item.techreborn.plate.wood.name=Wooden Plate -item.techreborn.plate.advancedAlloy.name=Advanced Alloy +item.techreborn.plate.advanced_alloy.name=Advanced Alloy item.techreborn.plate.lazurite.name=Lazurite Plate #Parts diff --git a/src/main/resources/assets/techreborn/textures/items/gem/redgarnet.png b/src/main/resources/assets/techreborn/textures/items/gem/red_garnet.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/gem/redgarnet.png rename to src/main/resources/assets/techreborn/textures/items/gem/red_garnet.png diff --git a/src/main/resources/assets/techreborn/textures/items/gem/yellowgarnet.png b/src/main/resources/assets/techreborn/textures/items/gem/yellow_garnet.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/gem/yellowgarnet.png rename to src/main/resources/assets/techreborn/textures/items/gem/yellow_garnet.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/advancedalloyingot.png b/src/main/resources/assets/techreborn/textures/items/ingot/advanced_alloy_ingot.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/ingot/advancedalloyingot.png rename to src/main/resources/assets/techreborn/textures/items/ingot/advanced_alloy_ingot.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/aluminumingot.png b/src/main/resources/assets/techreborn/textures/items/ingot/aluminum_ingot.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/ingot/aluminumingot.png rename to src/main/resources/assets/techreborn/textures/items/ingot/aluminum_ingot.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/brassingot.png b/src/main/resources/assets/techreborn/textures/items/ingot/brass_ingot.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/ingot/brassingot.png rename to src/main/resources/assets/techreborn/textures/items/ingot/brass_ingot.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/bronzeingot.png b/src/main/resources/assets/techreborn/textures/items/ingot/bronze_ingot.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/ingot/bronzeingot.png rename to src/main/resources/assets/techreborn/textures/items/ingot/bronze_ingot.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/chromeingot.png b/src/main/resources/assets/techreborn/textures/items/ingot/chrome_ingot.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/ingot/chromeingot.png rename to src/main/resources/assets/techreborn/textures/items/ingot/chrome_ingot.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/copperingot.png b/src/main/resources/assets/techreborn/textures/items/ingot/copper_ingot.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/ingot/copperingot.png rename to src/main/resources/assets/techreborn/textures/items/ingot/copper_ingot.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/electrumingot.png b/src/main/resources/assets/techreborn/textures/items/ingot/electrum_ingot.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/ingot/electrumingot.png rename to src/main/resources/assets/techreborn/textures/items/ingot/electrum_ingot.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/hottungstensteelingot.png b/src/main/resources/assets/techreborn/textures/items/ingot/hot_tungstensteel_ingot.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/ingot/hottungstensteelingot.png rename to src/main/resources/assets/techreborn/textures/items/ingot/hot_tungstensteel_ingot.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/invaringot.png b/src/main/resources/assets/techreborn/textures/items/ingot/invar_ingot.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/ingot/invaringot.png rename to src/main/resources/assets/techreborn/textures/items/ingot/invar_ingot.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/iridiumalloyingot.png b/src/main/resources/assets/techreborn/textures/items/ingot/iridium_alloy_ingot.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/ingot/iridiumalloyingot.png rename to src/main/resources/assets/techreborn/textures/items/ingot/iridium_alloy_ingot.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/iridiumingot.png b/src/main/resources/assets/techreborn/textures/items/ingot/iridium_ingot.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/ingot/iridiumingot.png rename to src/main/resources/assets/techreborn/textures/items/ingot/iridium_ingot.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/leadingot.png b/src/main/resources/assets/techreborn/textures/items/ingot/lead_ingot.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/ingot/leadingot.png rename to src/main/resources/assets/techreborn/textures/items/ingot/lead_ingot.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/mixedmetalingot.png b/src/main/resources/assets/techreborn/textures/items/ingot/mixed_metal_ingot.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/ingot/mixedmetalingot.png rename to src/main/resources/assets/techreborn/textures/items/ingot/mixed_metal_ingot.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/nickelingot.png b/src/main/resources/assets/techreborn/textures/items/ingot/nickel_ingot.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/ingot/nickelingot.png rename to src/main/resources/assets/techreborn/textures/items/ingot/nickel_ingot.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/platinumingot.png b/src/main/resources/assets/techreborn/textures/items/ingot/platinum_ingot.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/ingot/platinumingot.png rename to src/main/resources/assets/techreborn/textures/items/ingot/platinum_ingot.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/refinedironingot.png b/src/main/resources/assets/techreborn/textures/items/ingot/refined_iron_ingot.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/ingot/refinedironingot.png rename to src/main/resources/assets/techreborn/textures/items/ingot/refined_iron_ingot.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/silveringot.png b/src/main/resources/assets/techreborn/textures/items/ingot/silver_ingot.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/ingot/silveringot.png rename to src/main/resources/assets/techreborn/textures/items/ingot/silver_ingot.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/steelingot.png b/src/main/resources/assets/techreborn/textures/items/ingot/steel_ingot.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/ingot/steelingot.png rename to src/main/resources/assets/techreborn/textures/items/ingot/steel_ingot.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/tiningot.png b/src/main/resources/assets/techreborn/textures/items/ingot/tin_ingot.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/ingot/tiningot.png rename to src/main/resources/assets/techreborn/textures/items/ingot/tin_ingot.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/titaniumingot.png b/src/main/resources/assets/techreborn/textures/items/ingot/titanium_ingot.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/ingot/titaniumingot.png rename to src/main/resources/assets/techreborn/textures/items/ingot/titanium_ingot.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/tungsteningot.png b/src/main/resources/assets/techreborn/textures/items/ingot/tungsten_ingot.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/ingot/tungsteningot.png rename to src/main/resources/assets/techreborn/textures/items/ingot/tungsten_ingot.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/tungstensteelingot.png b/src/main/resources/assets/techreborn/textures/items/ingot/tungstensteel_ingot.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/ingot/tungstensteelingot.png rename to src/main/resources/assets/techreborn/textures/items/ingot/tungstensteel_ingot.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/zincingot.png b/src/main/resources/assets/techreborn/textures/items/ingot/zinc_ingot.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/ingot/zincingot.png rename to src/main/resources/assets/techreborn/textures/items/ingot/zinc_ingot.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/advancedalloyplate.png b/src/main/resources/assets/techreborn/textures/items/plate/advanced_alloy_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/advancedalloyplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/advanced_alloy_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/aluminumplate.png b/src/main/resources/assets/techreborn/textures/items/plate/aluminum_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/aluminumplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/aluminum_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/brassplate.png b/src/main/resources/assets/techreborn/textures/items/plate/brass_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/brassplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/brass_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/bronzeplate.png b/src/main/resources/assets/techreborn/textures/items/plate/bronze_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/bronzeplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/bronze_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/carbonplate.png b/src/main/resources/assets/techreborn/textures/items/plate/carbon_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/carbonplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/carbon_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/chromeplate.png b/src/main/resources/assets/techreborn/textures/items/plate/chrome_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/chromeplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/chrome_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/coalplate.png b/src/main/resources/assets/techreborn/textures/items/plate/coal_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/coalplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/coal_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/copperplate.png b/src/main/resources/assets/techreborn/textures/items/plate/copper_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/copperplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/copper_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/diamondplate.png b/src/main/resources/assets/techreborn/textures/items/plate/diamond_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/diamondplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/diamond_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/electrumplate.png b/src/main/resources/assets/techreborn/textures/items/plate/electrum_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/electrumplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/electrum_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/emeraldplate.png b/src/main/resources/assets/techreborn/textures/items/plate/emerald_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/emeraldplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/emerald_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/goldplate.png b/src/main/resources/assets/techreborn/textures/items/plate/gold_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/goldplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/gold_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/invarplate.png b/src/main/resources/assets/techreborn/textures/items/plate/invar_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/invarplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/invar_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/iridiumplate.png b/src/main/resources/assets/techreborn/textures/items/plate/iridium_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/iridiumplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/iridium_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/ironplate.png b/src/main/resources/assets/techreborn/textures/items/plate/iron_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/ironplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/iron_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/lapisplate.png b/src/main/resources/assets/techreborn/textures/items/plate/lapis_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/lapisplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/lapis_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/lazuriteplate.png b/src/main/resources/assets/techreborn/textures/items/plate/lazurite_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/lazuriteplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/lazurite_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/leadplate.png b/src/main/resources/assets/techreborn/textures/items/plate/lead_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/leadplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/lead_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/magnaliumplate.png b/src/main/resources/assets/techreborn/textures/items/plate/magnalium_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/magnaliumplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/magnalium_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/nickelplate.png b/src/main/resources/assets/techreborn/textures/items/plate/nickel_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/nickelplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/nickel_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/obsidianplate.png b/src/main/resources/assets/techreborn/textures/items/plate/obsidian_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/obsidianplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/obsidian_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/peridotplate.png b/src/main/resources/assets/techreborn/textures/items/plate/peridot_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/peridotplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/peridot_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/platinumplate.png b/src/main/resources/assets/techreborn/textures/items/plate/platinum_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/platinumplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/platinum_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/redgarnetplate.png b/src/main/resources/assets/techreborn/textures/items/plate/red_garnet_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/redgarnetplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/red_garnet_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/redstoneplate.png b/src/main/resources/assets/techreborn/textures/items/plate/redstone_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/redstoneplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/redstone_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/refinedironplate.png b/src/main/resources/assets/techreborn/textures/items/plate/refined_iron_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/refinedironplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/refined_iron_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/rubyplate.png b/src/main/resources/assets/techreborn/textures/items/plate/ruby_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/rubyplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/ruby_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/sapphireplate.png b/src/main/resources/assets/techreborn/textures/items/plate/sapphire_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/sapphireplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/sapphire_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/siliconplate.png b/src/main/resources/assets/techreborn/textures/items/plate/silicon_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/siliconplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/silicon_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/silverplate.png b/src/main/resources/assets/techreborn/textures/items/plate/silver_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/silverplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/silver_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/steelplate.png b/src/main/resources/assets/techreborn/textures/items/plate/steel_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/steelplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/steel_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/tinplate.png b/src/main/resources/assets/techreborn/textures/items/plate/tin_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/tinplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/tin_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/titaniumplate.png b/src/main/resources/assets/techreborn/textures/items/plate/titanium_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/titaniumplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/titanium_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/tungstenplate.png b/src/main/resources/assets/techreborn/textures/items/plate/tungsten_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/tungstenplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/tungsten_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/tungstensteelplate.png b/src/main/resources/assets/techreborn/textures/items/plate/tungstensteel_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/tungstensteelplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/tungstensteel_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/woodplate.png b/src/main/resources/assets/techreborn/textures/items/plate/wood_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/woodplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/wood_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/yellowgarnetplate.png b/src/main/resources/assets/techreborn/textures/items/plate/yellow_garnet_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/yellowgarnetplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/yellow_garnet_plate.png diff --git a/src/main/resources/assets/techreborn/textures/items/plate/zincplate.png b/src/main/resources/assets/techreborn/textures/items/plate/zinc_plate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/plate/zincplate.png rename to src/main/resources/assets/techreborn/textures/items/plate/zinc_plate.png