diff --git a/src/main/java/techreborn/client/RegisterItemJsons.java b/src/main/java/techreborn/client/RegisterItemJsons.java index 3bbef1a12..6344788cb 100644 --- a/src/main/java/techreborn/client/RegisterItemJsons.java +++ b/src/main/java/techreborn/client/RegisterItemJsons.java @@ -38,6 +38,7 @@ import techreborn.blocks.cable.EnumCableType; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; import techreborn.init.ModItems; +import techreborn.init.ModNuggets; import techreborn.init.ModPlates; import techreborn.items.*; import techreborn.lib.ModInfo; @@ -134,11 +135,7 @@ public class RegisterItemJsons { } ModPlates.registerModel(); - - name = ItemNuggets.types.clone(); - for (int i = 0; i < ItemNuggets.types.length; ++i) { - registerBlockstate(ModItems.NUGGETS, i, name[i], "items/materials/"); - } + ModNuggets.registerModel(); name = ItemDusts.types.clone(); for (int i = 0; i < ItemDusts.types.length; ++i) { diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index 402f7e50b..06eff403f 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -47,7 +47,7 @@ public class ModItems { public static Item GEMS; public static Item INGOTS; - public static Item NUGGETS; + public static Item DUSTS; public static Item SMALL_DUSTS; public static Item PARTS; @@ -166,9 +166,9 @@ public class ModItems { registerItem(SMALL_DUSTS, "smallDust"); ModPlates.register(); + ModNuggets.register(); - NUGGETS = new ItemNuggets(); - registerItem(NUGGETS, "nuggets"); + // purifiedCrushedOre = new ItemPurifiedCrushedOre(); // registerItem(purifiedCrushedOre, "purifiedCrushedOre"); PARTS = new ItemParts(); diff --git a/src/main/java/techreborn/init/ModNuggets.java b/src/main/java/techreborn/init/ModNuggets.java new file mode 100644 index 000000000..827b5e1db --- /dev/null +++ b/src/main/java/techreborn/init/ModNuggets.java @@ -0,0 +1,60 @@ +/** + * + */ +package techreborn.init; + +import java.util.Arrays; + +import com.google.common.base.CaseFormat; + +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IStringSerializable; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import reborncore.RebornRegistry; +import techreborn.items.ItemNuggets; +import techreborn.lib.ModInfo; + +/** + * @author drcrazy + * + */ +public enum ModNuggets implements IStringSerializable { + ALUMINUM, BRASS, BRONZE, CHROME, COPPER, DIAMOND, ELECTRUM, HOT_TUNGSTENSTEEL, INVAR, IRIDIUM, LEAD, NICKEL, + PLATINUM, REFINED_IRON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, ZINC; + + public final String name; + public final Item item; + + private ModNuggets() { + name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "NUGGET_" + this.toString()); + item = new ItemNuggets(); + item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name)); + item.setTranslationKey(ModInfo.MOD_ID + "." + name); + } + + public ItemStack getStack() { + return new ItemStack(item); + } + + public static void register() { + Arrays.stream(ModNuggets.values()).forEach(nugget -> RebornRegistry.registerItem(nugget.item)); + } + + @SideOnly(Side.CLIENT) + public static void registerModel() { + ResourceLocation blockstateJson = new ResourceLocation(ModInfo.MOD_ID, "items/materials/nuggets"); + Arrays.stream(ModNuggets.values()).forEach(nugget -> ModelLoader.setCustomModelResourceLocation(nugget.item, 0, + new ModelResourceLocation(blockstateJson, "type=" + nugget.name))); + } + + @Override + public String getName() { + return name; + } + +} diff --git a/src/main/java/techreborn/init/ModPlates.java b/src/main/java/techreborn/init/ModPlates.java index ac4c0b401..bac50ff5f 100644 --- a/src/main/java/techreborn/init/ModPlates.java +++ b/src/main/java/techreborn/init/ModPlates.java @@ -66,7 +66,6 @@ public enum ModPlates implements IStringSerializable { public static void register() { Arrays.stream(ModPlates.values()).forEach(plate -> RebornRegistry.registerItem(plate.item)); - } @SideOnly(Side.CLIENT) diff --git a/src/main/java/techreborn/init/OreDict.java b/src/main/java/techreborn/init/OreDict.java index 816e40753..7c56aa8c4 100644 --- a/src/main/java/techreborn/init/OreDict.java +++ b/src/main/java/techreborn/init/OreDict.java @@ -103,9 +103,8 @@ public class OreDict { // if (!ignoreIt) // ItemPlates.registerType(type); } - +// TODO: fix recipe // for (String type : ItemPlates.types) { -// // TODO: fix recipe // OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "plate_" + type), ItemPlates.getPlateByName(type)); // } @@ -116,10 +115,10 @@ public class OreDict { for (String type : ItemDustsSmall.types) { OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_small_" + type), ItemDustsSmall.getSmallDustByName(type)); } - - for (String type : ItemNuggets.types) { - OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "nugget_" + type), ItemNuggets.getNuggetByName(type)); - } +// TODO: fix recipe +// for (String type : ItemNuggets.types) { +// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "nugget_" + type), ItemNuggets.getNuggetByName(type)); +// } } diff --git a/src/main/java/techreborn/init/SubItemRetriever.java b/src/main/java/techreborn/init/SubItemRetriever.java index 09e30b252..9f421667f 100644 --- a/src/main/java/techreborn/init/SubItemRetriever.java +++ b/src/main/java/techreborn/init/SubItemRetriever.java @@ -84,14 +84,19 @@ public class SubItemRetriever implements ISubItemRetriever { return ItemIngots.getIngotByName(name, count); } + @Override public ItemStack getNuggetByName(String name) { - return ItemNuggets.getNuggetByName(name); +// TODO: fix recipe +// return ItemNuggets.getNuggetByName(name); + return null; } @Override public ItemStack getNuggetByName(String name, int count) { - return ItemNuggets.getNuggetByName(name, count); +// TODO: fix recipe +// return ItemNuggets.getNuggetByName(name, count); + return null; } @Override @@ -104,15 +109,19 @@ public class SubItemRetriever implements ISubItemRetriever { return ItemParts.getPartByName(name, count); } -// @Override -// public ItemStack getPlateByName(String name) { + @Override + public ItemStack getPlateByName(String name) { +// TODO: fix recipe // return ItemPlates.getPlateByName(name); -// } + return null; + } -// @Override -// public ItemStack getPlateByName(String name, int count) { + @Override + public ItemStack getPlateByName(String name, int count) { +// TODO: fix recipe // return ItemPlates.getPlateByName(name, count); -// } + return null; + } @Override public ItemStack getUpgradeByName(String name) { @@ -143,16 +152,4 @@ public class SubItemRetriever implements ISubItemRetriever { public ItemStack getStorageBlockByName(String name, int count) { return BlockStorage.getStorageBlockByName(name, count); } - - @Override - public ItemStack getPlateByName(String name) { - // TODO Auto-generated method stub - return null; - } - - @Override - public ItemStack getPlateByName(String name, int count) { - // TODO Auto-generated method stub - return null; - } } diff --git a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java index 0df5508a1..9a07a4319 100644 --- a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java +++ b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java @@ -320,15 +320,16 @@ public class CraftingTableRecipes extends RecipeMethods { registerShapeless(getMaterial(name, Type.DUST), getMaterialObject(name, Type.SMALL_DUST), getMaterialObject(name, Type.SMALL_DUST), getMaterialObject(name, Type.SMALL_DUST), getMaterialObject(name, Type.SMALL_DUST)); } - for (String nuggets : ItemNuggets.types) { - if (nuggets.equalsIgnoreCase("diamond")) - continue; - registerShapeless(getMaterial(nuggets, 9, Type.NUGGET), CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "ingot_" + nuggets)); - registerShaped(getMaterial(nuggets, Type.INGOT), "NNN", "NNN", "NNN", 'N', CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "nugget_" + nuggets)); - } - - registerShapeless(getMaterial("diamond", 9, Type.NUGGET), "gemDiamond"); - registerShaped(getStack(Items.DIAMOND), "NNN", "NNN", "NNN", 'N', "nuggetDiamond"); +// TODO: fix recipe +// for (String nuggets : ItemNuggets.types) { +// if (nuggets.equalsIgnoreCase("diamond")) +// continue; +// registerShapeless(getMaterial(nuggets, 9, Type.NUGGET), CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "ingot_" + nuggets)); +// registerShaped(getMaterial(nuggets, Type.INGOT), "NNN", "NNN", "NNN", 'N', CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "nugget_" + nuggets)); +// } +// +// registerShapeless(getMaterial("diamond", 9, Type.NUGGET), "gemDiamond"); +// registerShaped(getStack(Items.DIAMOND), "NNN", "NNN", "NNN", 'N', "nuggetDiamond"); } static void registerMixedMetalIngotRecipes() { diff --git a/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java b/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java index 0aef8d075..3a9d3bb1c 100644 --- a/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java +++ b/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java @@ -46,8 +46,9 @@ public class IndustrialCentrifugeRecipes extends RecipeMethods { register(getStack(Blocks.MYCELIUM, 8), 1640, getStack(Blocks.SAND, 4), getStack(Items.CLAY_BALL), getStack(Blocks.BROWN_MUSHROOM, 2), getStack(Blocks.RED_MUSHROOM, 2)); register(getStack(Items.GOLDEN_APPLE), 5000, getStack(Items.GOLD_INGOT, 6), getMaterial("methane", Type.CELL)); register(getStack(Items.GOLDEN_APPLE, 1, 1), 5000, getStack(Items.GOLD_INGOT, 64), getMaterial("methane", Type.CELL)); - register(getStack(Items.GOLDEN_CARROT), 5000, getStack(Items.GOLD_NUGGET, 6), getMaterial("methane", Type.CELL)); - register(getStack(Items.SPECKLED_MELON, 8), 5000, getStack(Items.GOLD_NUGGET, 6), getMaterial("methane", Type.CELL)); +// TODO: Fix recipe +// register(getStack(Items.GOLDEN_CARROT), 5000, getStack(Items.GOLD_NUGGET, 6), getMaterial("methane", Type.CELL)); +// register(getStack(Items.SPECKLED_MELON, 8), 5000, getStack(Items.GOLD_NUGGET, 6), getMaterial("methane", Type.CELL)); register(getStack(Items.APPLE, 32), 5000, getMaterial("methane", Type.CELL)); register(getStack(Items.MUSHROOM_STEW, 16), 5000, getMaterial("methane", Type.CELL)); register(getStack(Items.BREAD, 64), 5000, getMaterial("methane", Type.CELL)); @@ -89,7 +90,8 @@ public class IndustrialCentrifugeRecipes extends RecipeMethods { register(getOre("dustElectrum"), 960, getMaterial("gold", 2, Type.SMALL_DUST), getMaterial("silver", 2, Type.SMALL_DUST)); register(getOre("dustZinc"), 1040, getMaterial("tin", Type.SMALL_DUST)); register(getOre("dustBrass"), 1500, getMaterial("copper", 3, Type.SMALL_DUST), getMaterial("zinc", Type.SMALL_DUST)); - register(getOre("dustPlatinum", 2), 3000, getMaterial("iridium", 2, Type.NUGGET), getMaterial("nickel", Type.SMALL_DUST)); +// TODO: Fix recipe +// register(getOre("dustPlatinum", 2), 3000, getMaterial("iridium", 2, Type.NUGGET), getMaterial("nickel", Type.SMALL_DUST)); register(getOre("dustNickel", 3), 3440, getMaterial("iron", Type.SMALL_DUST), getMaterial("gold", Type.SMALL_DUST), getMaterial("copper", Type.SMALL_DUST)); register(getOre("dustGold", 3), 2400, getMaterial("copper", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); register(getOre("dustCopper", 3), 2400, getMaterial("gold", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); @@ -97,7 +99,8 @@ public class IndustrialCentrifugeRecipes extends RecipeMethods { register(getOre("dustGlowstone", 16), 2500, getStack(Items.REDSTONE, 8), getMaterial("sulfur", Type.CELL), getMaterial("helium", Type.CELL)); register(getStack(Items.DYE, 4, 4), 1500, false, getMaterial("lazurite", 3, Type.DUST), getMaterial("pyrite", Type.SMALL_DUST), getMaterial("calcite", Type.SMALL_DUST), getMaterial("sodalite", 2, Type.SMALL_DUST)); register(getOre("dustEnderEye", 2), 1840, getMaterial("ender_pearl", 2, Type.DUST), getStack(Items.BLAZE_POWDER)); - register(getOre("dustNetherrack", 16), 2400, getStack(Items.REDSTONE), getMaterial("sulfur", Type.CELL), getMaterial("coal", Type.DUST), getStack(Items.GOLD_NUGGET)); +// TODO: Fix recipe +// register(getOre("dustNetherrack", 16), 2400, getStack(Items.REDSTONE), getMaterial("sulfur", Type.CELL), getMaterial("coal", Type.DUST), getStack(Items.GOLD_NUGGET)); register(getOre("dustEndstone", 16), 4800, getMaterial("helium3", Type.CELL), getMaterial("helium", Type.CELL), getMaterial("tungsten", Type.SMALL_DUST), getStack(Blocks.SAND, 12)); register(getOre("dustRedGarnet", 16), 3000, getMaterial("pyrope", 3, Type.DUST), getMaterial("almandine", 5, Type.DUST), getMaterial("spessartine", 8, Type.DUST)); register(getOre("dustYellowGarnet", 16), 3500, getMaterial("andradite", 5, Type.DUST), getMaterial("grossular", 8, Type.DUST), getMaterial("uvarovite", 3, Type.DUST)); diff --git a/src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java b/src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java index 441ef6e26..0569c39ba 100644 --- a/src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java +++ b/src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java @@ -115,8 +115,9 @@ public class IndustrialGrinderRecipes extends RecipeMethods { register(getOre("oreTungsten"), WATER, 100, 64, getMaterial("tungsten", 2, Type.DUST), getMaterial("iron", 3, Type.SMALL_DUST), getMaterial("manganese", 3, Type.SMALL_DUST)); - register(getOre("oreSheldonite"), WATER, 100, 64, getMaterial("platinum", 2, Type.DUST), getMaterial("nickel", Type.DUST), getMaterial("iridium", 2, Type.NUGGET)); - register(getOre("oreSheldonite"), MERCURY, 100, 64, getMaterial("platinum", 3, Type.DUST), getMaterial("nickel", Type.DUST), getMaterial("iridium", 2, Type.NUGGET)); +// TODO: Fix recipe +// register(getOre("oreSheldonite"), WATER, 100, 64, getMaterial("platinum", 2, Type.DUST), getMaterial("nickel", Type.DUST), getMaterial("iridium", 2, Type.NUGGET)); +// register(getOre("oreSheldonite"), MERCURY, 100, 64, getMaterial("platinum", 3, Type.DUST), getMaterial("nickel", Type.DUST), getMaterial("iridium", 2, Type.NUGGET)); register(getOre("orePeridot"), WATER, 100, 64, getMaterial("peridot", Type.GEM), getMaterial("peridot", 6, Type.SMALL_DUST), getMaterial("emerald", 2, Type.SMALL_DUST)); diff --git a/src/main/java/techreborn/init/recipes/RecipeMethods.java b/src/main/java/techreborn/init/recipes/RecipeMethods.java index 33a54c7a8..ae7201cbc 100644 --- a/src/main/java/techreborn/init/recipes/RecipeMethods.java +++ b/src/main/java/techreborn/init/recipes/RecipeMethods.java @@ -50,10 +50,11 @@ public abstract class RecipeMethods { return ItemIngots.getIngotByName(name, count); } else if (type == Type.GEM) { return ItemGems.getGemByName(name, count); +// TODO: fix recipe // } else if (type == Type.PLATE) { // return ItemPlates.getPlateByName(name, count); - } else if (type == Type.NUGGET) { - return ItemNuggets.getNuggetByName(name, count); +// } else if (type == Type.NUGGET) { +// return ItemNuggets.getNuggetByName(name, count); } else if (type == Type.CELL) { return ItemCells.getCellByName(name, count); } else if (type == Type.PART) { diff --git a/src/main/java/techreborn/init/recipes/ScrapboxRecipes.java b/src/main/java/techreborn/init/recipes/ScrapboxRecipes.java index bbefd043a..db5678972 100644 --- a/src/main/java/techreborn/init/recipes/ScrapboxRecipes.java +++ b/src/main/java/techreborn/init/recipes/ScrapboxRecipes.java @@ -36,7 +36,6 @@ import techreborn.init.ModBlocks; import techreborn.items.DynamicCell; import techreborn.items.ItemDusts; import techreborn.items.ItemGems; -import techreborn.items.ItemNuggets; import techreborn.utils.StackWIPHandler; /** @@ -193,10 +192,10 @@ public class ScrapboxRecipes extends RecipeMethods { for (String i : ItemDusts.types) { register(ItemDusts.getDustByName(i)); } - - for (String i : ItemNuggets.types) { - register(ItemNuggets.getNuggetByName(i)); - } +// TODO: fix recipe +// for (String i : ItemNuggets.types) { +// register(ItemNuggets.getNuggetByName(i)); +// } for (String i : ItemGems.types) { register(ItemGems.getGemByName(i)); diff --git a/src/main/java/techreborn/items/ItemNuggets.java b/src/main/java/techreborn/items/ItemNuggets.java index bafe24bd6..e5aa7fa42 100644 --- a/src/main/java/techreborn/items/ItemNuggets.java +++ b/src/main/java/techreborn/items/ItemNuggets.java @@ -24,63 +24,26 @@ package techreborn.items; -import com.google.common.base.CaseFormat; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import techreborn.events.TRRecipeHandler; -import techreborn.init.ModItems; -import techreborn.utils.TechRebornCreativeTab; - -import java.security.InvalidParameterException; public class ItemNuggets extends ItemTR { - public static final String[] types = new String[] { "aluminum", "brass", "bronze", "chrome", "copper", "electrum", - "invar", "iridium", "lead", "nickel", "platinum", "silver", "steel", "tin", "titanium", "tungsten", - "hot_tungstensteel", "tungstensteel", "zinc", "refined_iron", "iron", "diamond" }; - public ItemNuggets() { - setCreativeTab(TechRebornCreativeTab.instance); - //setHasSubtypes(true); - setTranslationKey("techreborn.nuggets"); TRRecipeHandler.hideEntry(this); } - public static ItemStack getNuggetByName(String name, int count) { - 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.NUGGETS, count, i); - } - } - throw new InvalidParameterException("The nugget " + name + " could not be found."); - } - - public static ItemStack getNuggetByName(String name) { - return getNuggetByName(name, 1); - } - -/* @Override - // gets Unlocalized Name depending on meta data - public String getTranslationKey(ItemStack itemStack) { - int meta = itemStack.getItemDamage(); - if (meta < 0 || meta >= types.length) { - meta = 0; - } - - return super.getTranslationKey() + "." + types[meta]; - }*/ - -/* // Adds Dusts SubItems To Creative Tab - @Override - public void getSubItems(CreativeTabs creativeTabs, NonNullList list) { - if (!isInCreativeTab(creativeTabs)) { - return; - } - for (int meta = 0; meta < types.length; ++meta) { - list.add(new ItemStack(this, 1, meta)); - } - }*/ +// public static ItemStack getNuggetByName(String name, int count) { +// 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.NUGGETS, count, i); +// } +// } +// throw new InvalidParameterException("The nugget " + name + " could not be found."); +// } +// +// public static ItemStack getNuggetByName(String name) { +// return getNuggetByName(name, 1); +// } } diff --git a/src/main/resources/assets/techreborn/blockstates/items/materials/nuggets.json b/src/main/resources/assets/techreborn/blockstates/items/materials/nuggets.json index 5f8d17b19..542fc7c98 100644 --- a/src/main/resources/assets/techreborn/blockstates/items/materials/nuggets.json +++ b/src/main/resources/assets/techreborn/blockstates/items/materials/nuggets.json @@ -6,115 +6,110 @@ }, "variants": { "type": { - "aluminum": { + "nuggetaluminum": { "textures": { "layer0": "techreborn:items/nugget/aluminum_nugget" } }, - "brass": { + "nuggetbrass": { "textures": { "layer0": "techreborn:items/nugget/brass_nugget" } }, - "bronze": { + "nuggetbronze": { "textures": { "layer0": "techreborn:items/nugget/bronze_nugget" } }, - "chrome": { + "nuggetchrome": { "textures": { "layer0": "techreborn:items/nugget/chrome_nugget" } }, - "copper": { + "nuggetcopper": { "textures": { "layer0": "techreborn:items/nugget/copper_nugget" } }, - "electrum": { + "nuggetdiamond": { + "textures": { + "layer0": "techreborn:items/nugget/diamond_nugget" + } + }, + "nuggetelectrum": { "textures": { "layer0": "techreborn:items/nugget/electrum_nugget" } }, - "invar": { + "nuggethottungstensteel": { + "textures": { + "layer0": "techreborn:items/nugget/hot_tungstensteel_nugget" + } + }, + "nuggetinvar": { "textures": { "layer0": "techreborn:items/nugget/invar_nugget" } }, - "iridium": { + "nuggetiridium": { "textures": { "layer0": "techreborn:items/nugget/iridium_nugget" } }, - "lead": { + "nuggetlead": { "textures": { "layer0": "techreborn:items/nugget/lead_nugget" } }, - "nickel": { + "nuggetnickel": { "textures": { "layer0": "techreborn:items/nugget/nickel_nugget" } }, - "platinum": { + "nuggetplatinum": { "textures": { "layer0": "techreborn:items/nugget/platinum_nugget" } }, - "silver": { + "nuggetrefinediron": { + "textures": { + "layer0": "techreborn:items/nugget/refined_iron_nugget" + } + }, + "nuggetsilver": { "textures": { "layer0": "techreborn:items/nugget/silver_nugget" } }, - "steel": { + "nuggetsteel": { "textures": { "layer0": "techreborn:items/nugget/steel_nugget" } }, - "tin": { + "nuggettin": { "textures": { "layer0": "techreborn:items/nugget/tin_nugget" } }, - "titanium": { + "nuggettitanium": { "textures": { "layer0": "techreborn:items/nugget/titanium_nugget" } }, - "tungsten": { + "nuggettungsten": { "textures": { "layer0": "techreborn:items/nugget/tungsten_nugget" } }, - "hot_tungstensteel": { - "textures": { - "layer0": "techreborn:items/nugget/hot_tungstensteel_nugget" - } - }, - "tungstensteel": { + "nuggettungstensteel": { "textures": { "layer0": "techreborn:items/nugget/tungstensteel_nugget" } }, - "zinc": { + "nuggetzinc": { "textures": { "layer0": "techreborn:items/nugget/zinc_nugget" } - }, - "refined_iron": { - "textures": { - "layer0": "techreborn:items/nugget/refined_iron_nugget" - } - }, - "iron": { - "textures": { - "layer0": "techreborn:items/nugget/iron_nugget" - } - }, - "diamond": { - "textures": { - "layer0": "techreborn:items/nugget/diamond_nugget" - } } } } diff --git a/src/main/resources/assets/techreborn/lang/en_us.lang b/src/main/resources/assets/techreborn/lang/en_us.lang index 6abd8de71..9188eecf7 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.lang +++ b/src/main/resources/assets/techreborn/lang/en_us.lang @@ -396,30 +396,29 @@ 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 -item.techreborn.nuggets.antimony.name=Antimony Nugget -item.techreborn.nuggets.brass.name=Brass Nugget -item.techreborn.nuggets.bronze.name=Bronze Nugget -item.techreborn.nuggets.chrome.name=Chrome Nugget -item.techreborn.nuggets.copper.name=Copper Nugget -item.techreborn.nuggets.electrum.name=Electrum Nugget -item.techreborn.nuggets.invar.name=Invar Nugget -item.techreborn.nuggets.iridium.name=Iridium Nugget -item.techreborn.nuggets.iron.name=Iron Nugget -item.techreborn.nuggets.lead.name=Lead Nugget -item.techreborn.nuggets.nickel.name=Nickel Nugget -item.techreborn.nuggets.osmium.name=Osmium Nugget -item.techreborn.nuggets.platinum.name=Platinum Nugget -item.techreborn.nuggets.silver.name=Silver Nugget -item.techreborn.nuggets.steel.name=Steel Nugget -item.techreborn.nuggets.tin.name=Tin Nugget -item.techreborn.nuggets.titanium.name=Titanium Nugget -item.techreborn.nuggets.tungsten.name=Tungsten Nugget -item.techreborn.nuggets.tungstensteel.name=Tungstensteel Nugget -item.techreborn.nuggets.hot_tungstensteel.name=Hot Tungstensteel Nugget -item.techreborn.nuggets.zinc.name=Zinc Nugget -item.techreborn.nuggets.refined_iron.name=Refined Iron Nugget -item.techreborn.nuggets.diamond.name=Diamond Nugget +item.techreborn.nuggetAluminum.name=Aluminium Nugget +item.techreborn.nuggetBrass.name=Brass Nugget +item.techreborn.nuggetBronze.name=Bronze Nugget +item.techreborn.nuggetChrome.name=Chrome Nugget +item.techreborn.nuggetCopper.name=Copper Nugget +item.techreborn.nuggetDiamond.name=Diamond Nugget +item.techreborn.nuggetElectrum.name=Electrum Nugget +item.techreborn.nuggetHotTungstensteel.name=Hot Tungstensteel Nugget +item.techreborn.nuggetInvar.name=Invar Nugget +item.techreborn.nuggetIridium.name=Iridium Nugget +item.techreborn.nuggetLead.name=Lead Nugget +item.techreborn.nuggetNickel.name=Nickel Nugget +item.techreborn.nuggetPlatinum.name=Platinum Nugget +item.techreborn.nuggetRefinedIron.name=Refined Iron Nugget +item.techreborn.nuggetSilver.name=Silver Nugget +item.techreborn.nuggetSteel.name=Steel Nugget +item.techreborn.nuggetTin.name=Tin Nugget +item.techreborn.nuggetTitanium.name=Titanium Nugget +item.techreborn.nuggetTungsten.name=Tungsten Nugget +item.techreborn.nuggetTungstensteel.name=Tungstensteel Nugget +item.techreborn.nuggetZinc.name=Zinc Nugget + + #Plates item.techreborn.plateAdvancedAlloy.name=Advanced Alloy Plate diff --git a/src/main/resources/assets/techreborn/textures/items/nugget/iron_nugget.png b/src/main/resources/assets/techreborn/textures/items/nugget/iron_nugget.png deleted file mode 100644 index e42bc857b..000000000 Binary files a/src/main/resources/assets/techreborn/textures/items/nugget/iron_nugget.png and /dev/null differ