diff --git a/src/main/java/techreborn/client/RegisterItemJsons.java b/src/main/java/techreborn/client/RegisterItemJsons.java index ec2b5b95d..e6c39eef3 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.ModGems; +import techreborn.init.ModIngots; import techreborn.init.ModItems; import techreborn.init.ModNuggets; import techreborn.init.ModPlates; @@ -125,16 +126,12 @@ public class RegisterItemJsons { registerBlockstateMultiItem(ModItems.BRONZE_HOE, "bronze_hoe", "items/tool/tool"); } - String[] name = ItemIngots.types.clone(); - for (int i = 0; i < ItemIngots.types.length; ++i) { - registerBlockstate(ModItems.INGOTS, i, name[i], "items/materials/"); - } - + ModIngots.registerModel(); ModGems.registerModel(); ModPlates.registerModel(); ModNuggets.registerModel(); - name = ItemDusts.types.clone(); + String[] name = ItemDusts.types.clone(); for (int i = 0; i < ItemDusts.types.length; ++i) { registerBlockstate(ModItems.DUSTS, i, name[i], "items/materials/"); } diff --git a/src/main/java/techreborn/init/ModIngots.java b/src/main/java/techreborn/init/ModIngots.java new file mode 100644 index 000000000..71c08ef4f --- /dev/null +++ b/src/main/java/techreborn/init/ModIngots.java @@ -0,0 +1,84 @@ +/* + * This file is part of TechReborn, licensed under the MIT License (MIT). + * + * Copyright (c) 2018 TechReborn + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +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.ItemIngots; +import techreborn.lib.ModInfo; + +/** + * @author drcrazy + * + */ +public enum ModIngots implements IStringSerializable { + ADVANCED_ALLOY, ALUMINUM, BRASS, BRONZE, CHROME, COPPER, ELECTRUM, HOT_TUNGSTENSTEEL, INVAR, IRIDIUM_ALLOY, IRIDIUM, + LEAD, MIXED_METAL, NICKEL, PLATINUM, REFINED_IRON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, ZINC; + + public final String name; + public final Item item; + + private ModIngots() { + name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "INGOT_" + this.toString()); + item = new ItemIngots(); + item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name)); + item.setTranslationKey(ModInfo.MOD_ID + "." + name); + } + + public ItemStack getStack() { + return new ItemStack(item); + } + + public ItemStack getStack(int amount) { + return new ItemStack(item, amount); + } + + public static void register() { + Arrays.stream(ModIngots.values()).forEach(ingot -> RebornRegistry.registerItem(ingot.item)); + } + + @SideOnly(Side.CLIENT) + public static void registerModel() { + ResourceLocation blockstateJson = new ResourceLocation(ModInfo.MOD_ID, "items/materials/ingots"); + Arrays.stream(ModIngots.values()).forEach(ingot -> ModelLoader.setCustomModelResourceLocation(ingot.item, 0, + new ModelResourceLocation(blockstateJson, "type=" + ingot.name))); + } + + @Override + public String getName() { + return name; + } + +} diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index e9404e394..7b91ffdc8 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -45,8 +45,6 @@ import javax.annotation.Nullable; public class ModItems { - public static Item INGOTS; - public static Item DUSTS; public static Item SMALL_DUSTS; public static Item PARTS; @@ -155,13 +153,13 @@ public class ModItems { public static DynamicCell CELL; public static void init() { - INGOTS = new ItemIngots(); - registerItem(INGOTS, "ingot"); + DUSTS = new ItemDusts(); registerItem(DUSTS, "dust"); SMALL_DUSTS = new ItemDustsSmall(); registerItem(SMALL_DUSTS, "smallDust"); + ModIngots.register(); ModGems.register(); ModPlates.register(); ModNuggets.register(); diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index e863b49bc..075d280d3 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -184,54 +184,54 @@ public class ModRecipes { new ItemStack(Items.FLINT), 200, 20)); - RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe( - new ItemStack(Items.COAL), - ItemDusts.getDustByName("coal"), - 230, 27)); +// RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe( +// new ItemStack(Items.COAL), +// ItemDusts.getDustByName("coal"), +// 230, 27)); - RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe( - new ItemStack(Items.COAL, 1, 1), - ItemDusts.getDustByName("charcoal"), - 230, 27)); - - RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe( - new ItemStack(net.minecraft.init.Items.CLAY_BALL), - ItemDusts.getDustByName("clay"), - 200, 18)); - - RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe( - new ItemStack(Blocks.GLOWSTONE), - ItemDusts.getDustByName("glowstone", 4), 220, 21)); - - RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe( - new ItemStack(Blocks.NETHERRACK), - ItemDusts.getDustByName("netherrack"), - 300, 27)); +// RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe( +// new ItemStack(Items.COAL, 1, 1), +// ItemDusts.getDustByName("charcoal"), +// 230, 27)); +// +// RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe( +// new ItemStack(net.minecraft.init.Items.CLAY_BALL), +// ItemDusts.getDustByName("clay"), +// 200, 18)); +// +// RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe( +// new ItemStack(Blocks.GLOWSTONE), +// ItemDusts.getDustByName("glowstone", 4), 220, 21)); +// +// RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe( +// new ItemStack(Blocks.NETHERRACK), +// ItemDusts.getDustByName("netherrack"), +// 300, 27)); +// +// RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe( +// new ItemStack(Blocks.END_STONE), +// ItemDusts.getDustByName("endstone"), +// 300, 16)); - RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe( - new ItemStack(Blocks.END_STONE), - ItemDusts.getDustByName("endstone"), - 300, 16)); +// RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe( +// new ItemStack(Items.ENDER_EYE), +// ItemDusts.getDustByName("ender_eye", 2), +// 200, 22)); - RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe( - new ItemStack(Items.ENDER_EYE), - ItemDusts.getDustByName("ender_eye", 2), - 200, 22)); - - RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe( - new ItemStack(Items.ENDER_PEARL), - ItemDusts.getDustByName("ender_pearl", 2), - 200, 22)); +// RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe( +// new ItemStack(Items.ENDER_PEARL), +// ItemDusts.getDustByName("ender_pearl", 2), +// 200, 22)); RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe( new ItemStack(Blocks.LAPIS_ORE), new ItemStack(Items.DYE, 10, 4), 170, 19)); - RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe( - new ItemStack(Blocks.OBSIDIAN), - ItemDusts.getDustByName("obsidian", 4), - 170, 19)); +// RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe( +// new ItemStack(Blocks.OBSIDIAN), +// ItemDusts.getDustByName("obsidian", 4), +// 170, 19)); RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe( new ItemStack(Items.BLAZE_ROD), @@ -239,18 +239,18 @@ public class ModRecipes { 170, 19)); if (OreUtil.doesOreExistAndValid("stoneMarble")) { - ItemStack marbleStack = getOre("stoneMarble"); - marbleStack.setCount(1); - RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe( - marbleStack, ItemDusts.getDustByName("marble"), - 120, 10)); +// ItemStack marbleStack = getOre("stoneMarble"); +// marbleStack.setCount(1); +// RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe( +// marbleStack, ItemDusts.getDustByName("marble"), +// 120, 10)); } if (OreUtil.doesOreExistAndValid("stoneBasalt")) { - ItemStack marbleStack = getOre("stoneBasalt"); - marbleStack.setCount(1); - RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe( - marbleStack, ItemDusts.getDustByName("basalt"), - 120, 10)); +// ItemStack marbleStack = getOre("stoneBasalt"); +// marbleStack.setCount(1); +// RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe( +// marbleStack, ItemDusts.getDustByName("basalt"), +// 120, 10)); } //See comments bellow, this allows the ore to go to the product when it sometimes goes straight to dust. @@ -319,9 +319,9 @@ public class ModRecipes { static void addVacuumFreezerRecipes() { RecipeHandler.addRecipe(Reference.VACUUM_FREEZER_RECIPE, new VacuumFreezerRecipe(new ItemStack(Blocks.ICE, 2), new ItemStack(Blocks.PACKED_ICE), 60, 64)); - - RecipeHandler.addRecipe(Reference.VACUUM_FREEZER_RECIPE, new VacuumFreezerRecipe( - ItemIngots.getIngotByName("hot_tungstensteel"), ItemIngots.getIngotByName("tungstensteel"), 440, 64)); +// TODO: Fix recipe +// RecipeHandler.addRecipe(Reference.VACUUM_FREEZER_RECIPE, new VacuumFreezerRecipe( +// ItemIngots.getIngotByName("hot_tungstensteel"), ItemIngots.getIngotByName("tungstensteel"), 440, 64)); RecipeHandler.addRecipe(Reference.VACUUM_FREEZER_RECIPE, new VacuumFreezerRecipe( ItemCells.getCellByName("heliumplasma"), ItemCells.getCellByName("helium"), 440, 64)); @@ -332,50 +332,50 @@ public class ModRecipes { } static void addBlastFurnaceRecipes() { - RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, - new BlastFurnaceRecipe(ItemDusts.getDustByName("titanium"), null, ItemIngots.getIngotByName("titanium"), - null, 3600, 120, 1500)); - RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, - new BlastFurnaceRecipe(ItemDustsSmall.getSmallDustByName("titanium", 4), null, - ItemIngots.getIngotByName("titanium"), null, 3600, 120, 1500)); - RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, - new BlastFurnaceRecipe(ItemDusts.getDustByName("aluminum"), null, ItemIngots.getIngotByName("aluminum"), - null, 2200, 120, 1700)); - RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, - new BlastFurnaceRecipe(ItemDustsSmall.getSmallDustByName("aluminum", 4), null, - ItemIngots.getIngotByName("aluminum"), null, 2200, 120, 1700)); - RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, - new BlastFurnaceRecipe(ItemDusts.getDustByName("tungsten"), null, ItemIngots.getIngotByName("tungsten"), - null, 1800, 120, 2500)); - RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, - new BlastFurnaceRecipe(ItemDustsSmall.getSmallDustByName("tungsten", 4), null, - ItemIngots.getIngotByName("tungsten"), null, 1800, 120, 2500)); - RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, new BlastFurnaceRecipe( - ItemDusts.getDustByName("chrome"), null, ItemIngots.getIngotByName("chrome"), null, 4420, 120, 1700)); - RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, - new BlastFurnaceRecipe(ItemDustsSmall.getSmallDustByName("chrome", 4), null, - ItemIngots.getIngotByName("chrome"), null, 4420, 120, 1700)); - RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, new BlastFurnaceRecipe(ItemDusts.getDustByName("steel"), - null, ItemIngots.getIngotByName("steel"), null, 2800, 120, 1000)); - RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, - new BlastFurnaceRecipe(ItemDustsSmall.getSmallDustByName("steel", 4), null, - ItemIngots.getIngotByName("steel"), null, 2800, 120, 1000)); - RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, - new BlastFurnaceRecipe(ItemDusts.getDustByName("galena", 2), null, ItemIngots.getIngotByName("silver"), - ItemIngots.getIngotByName("lead"), 80, 120, 1500)); - RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, - new BlastFurnaceRecipe(new ItemStack(Items.IRON_INGOT), ItemDusts.getDustByName("coal", 2), - ItemIngots.getIngotByName("steel"), ItemDusts.getDustByName("dark_ashes", 2), 500, 120, 1000)); - RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, - new BlastFurnaceRecipe(ItemIngots.getIngotByName("tungsten"), ItemIngots.getIngotByName("steel"), - ItemIngots.getIngotByName("hot_tungstensteel"), ItemDusts.getDustByName("dark_ashes", 4), 500, - 128, 3000)); - RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, - new BlastFurnaceRecipe(new ItemStack(Blocks.IRON_ORE), ItemDusts.getDustByName("calcite"), - new ItemStack(Items.IRON_INGOT, 3), ItemDusts.getDustByName("dark_ashes"), 140, 120, 1000)); - RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, - new BlastFurnaceRecipe(BlockOre.getOreByName("Pyrite"), ItemDusts.getDustByName("calcite"), - new ItemStack(Items.IRON_INGOT, 2), ItemDusts.getDustByName("dark_ashes"), 140, 120, 1000)); +// RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, +// new BlastFurnaceRecipe(ItemDusts.getDustByName("titanium"), null, ItemIngots.getIngotByName("titanium"), +// null, 3600, 120, 1500)); +// RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, +// new BlastFurnaceRecipe(ItemDustsSmall.getSmallDustByName("titanium", 4), null, +// ItemIngots.getIngotByName("titanium"), null, 3600, 120, 1500)); +// RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, +// new BlastFurnaceRecipe(ItemDusts.getDustByName("aluminum"), null, ItemIngots.getIngotByName("aluminum"), +// null, 2200, 120, 1700)); +// RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, +// new BlastFurnaceRecipe(ItemDustsSmall.getSmallDustByName("aluminum", 4), null, +// ItemIngots.getIngotByName("aluminum"), null, 2200, 120, 1700)); +// RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, +// new BlastFurnaceRecipe(ItemDusts.getDustByName("tungsten"), null, ItemIngots.getIngotByName("tungsten"), +// null, 1800, 120, 2500)); +// RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, +// new BlastFurnaceRecipe(ItemDustsSmall.getSmallDustByName("tungsten", 4), null, +// ItemIngots.getIngotByName("tungsten"), null, 1800, 120, 2500)); +// RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, new BlastFurnaceRecipe( +// ItemDusts.getDustByName("chrome"), null, ItemIngots.getIngotByName("chrome"), null, 4420, 120, 1700)); +// RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, +// new BlastFurnaceRecipe(ItemDustsSmall.getSmallDustByName("chrome", 4), null, +// ItemIngots.getIngotByName("chrome"), null, 4420, 120, 1700)); +// RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, new BlastFurnaceRecipe(ItemDusts.getDustByName("steel"), +// null, ItemIngots.getIngotByName("steel"), null, 2800, 120, 1000)); +// RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, +// new BlastFurnaceRecipe(ItemDustsSmall.getSmallDustByName("steel", 4), null, +// ItemIngots.getIngotByName("steel"), null, 2800, 120, 1000)); +// RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, +// new BlastFurnaceRecipe(ItemDusts.getDustByName("galena", 2), null, ItemIngots.getIngotByName("silver"), +// ItemIngots.getIngotByName("lead"), 80, 120, 1500)); +// RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, +// new BlastFurnaceRecipe(new ItemStack(Items.IRON_INGOT), ItemDusts.getDustByName("coal", 2), +// ItemIngots.getIngotByName("steel"), ItemDusts.getDustByName("dark_ashes", 2), 500, 120, 1000)); +// RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, +// new BlastFurnaceRecipe(ItemIngots.getIngotByName("tungsten"), ItemIngots.getIngotByName("steel"), +// ItemIngots.getIngotByName("hot_tungstensteel"), ItemDusts.getDustByName("dark_ashes", 4), 500, +// 128, 3000)); +// RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, +// new BlastFurnaceRecipe(new ItemStack(Blocks.IRON_ORE), ItemDusts.getDustByName("calcite"), +// new ItemStack(Items.IRON_INGOT, 3), ItemDusts.getDustByName("dark_ashes"), 140, 120, 1000)); +// RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE, +// new BlastFurnaceRecipe(BlockOre.getOreByName("Pyrite"), ItemDusts.getDustByName("calcite"), +// new ItemStack(Items.IRON_INGOT, 2), ItemDusts.getDustByName("dark_ashes"), 140, 120, 1000)); } diff --git a/src/main/java/techreborn/init/OreDict.java b/src/main/java/techreborn/init/OreDict.java index 02b1c9a3a..b7a83ff24 100644 --- a/src/main/java/techreborn/init/OreDict.java +++ b/src/main/java/techreborn/init/OreDict.java @@ -95,28 +95,28 @@ public class OreDict { // ItemPlates.registerType(type); // } - for (String type : ItemIngots.types) { - OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "ingot_" + type), ItemIngots.getIngotByName(type)); - boolean ignoreIt = false; - for (String ignore : plateGenIgnores) - if (type.startsWith(ignore)) - ignoreIt = true; - // if (!ignoreIt) - // ItemPlates.registerType(type); - } -// TODO: fix recipe +// for (String type : ItemIngots.types) { +// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "ingot_" + type), ItemIngots.getIngotByName(type)); +// boolean ignoreIt = false; +// for (String ignore : plateGenIgnores) +// if (type.startsWith(ignore)) +// ignoreIt = true; +// if (!ignoreIt) +// ItemPlates.registerType(type); +// } + // for (String type : ItemPlates.types) { // OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "plate_" + type), ItemPlates.getPlateByName(type)); // } - for (String type : ItemDusts.types) { - OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_" + type), ItemDusts.getDustByName(type)); - } +// for (String type : ItemDusts.types) { +// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_" + type), ItemDusts.getDustByName(type)); +// } +// +// for (String type : ItemDustsSmall.types) { +// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_small_" + type), ItemDustsSmall.getSmallDustByName(type)); +// } - for (String type : ItemDustsSmall.types) { - OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_small_" + type), ItemDustsSmall.getSmallDustByName(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 58c4d5037..8523f1c56 100644 --- a/src/main/java/techreborn/init/SubItemRetriever.java +++ b/src/main/java/techreborn/init/SubItemRetriever.java @@ -80,12 +80,14 @@ public class SubItemRetriever implements ISubItemRetriever { @Override public ItemStack getIngotByName(String name) { - return ItemIngots.getIngotByName(name); + //return ItemIngots.getIngotByName(name); + return null; } @Override public ItemStack getIngotByName(String name, int count) { - return ItemIngots.getIngotByName(name, count); + //return ItemIngots.getIngotByName(name, count); + return null; } diff --git a/src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java b/src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java index 9309ea552..28b49b8a1 100644 --- a/src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java +++ b/src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java @@ -42,72 +42,73 @@ public class AlloySmelterRecipes extends RecipeMethods { public static void init() { // Bronze - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(ItemIngots.getIngotByName("copper", 3), ItemIngots.getIngotByName("tin", 1), - ItemIngots.getIngotByName("bronze", 4), 200, 16)); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(ItemIngots.getIngotByName("copper", 3), ItemDusts.getDustByName("tin", 1), - ItemIngots.getIngotByName("bronze", 4), 200, 16)); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(ItemDusts.getDustByName("copper", 3), ItemIngots.getIngotByName("tin", 1), - ItemIngots.getIngotByName("bronze", 4), 200, 16)); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(ItemDusts.getDustByName("copper", 3), ItemDusts.getDustByName("tin", 1), - ItemIngots.getIngotByName("bronze", 4), 200, 16)); +// TODO: Fix Recipe +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, +// new AlloySmelterRecipe(ItemIngots.getIngotByName("copper", 3), ItemIngots.getIngotByName("tin", 1), +// ItemIngots.getIngotByName("bronze", 4), 200, 16)); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, +// new AlloySmelterRecipe(ItemIngots.getIngotByName("copper", 3), ItemDusts.getDustByName("tin", 1), +// ItemIngots.getIngotByName("bronze", 4), 200, 16)); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, +// new AlloySmelterRecipe(ItemDusts.getDustByName("copper", 3), ItemIngots.getIngotByName("tin", 1), +// ItemIngots.getIngotByName("bronze", 4), 200, 16)); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, +// new AlloySmelterRecipe(ItemDusts.getDustByName("copper", 3), ItemDusts.getDustByName("tin", 1), +// ItemIngots.getIngotByName("bronze", 4), 200, 16)); // Electrum - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(new ItemStack(Items.GOLD_INGOT, 1), ItemIngots.getIngotByName("silver", 1), - ItemIngots.getIngotByName("electrum", 2), 200, 16)); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(new ItemStack(Items.GOLD_INGOT, 1), ItemDusts.getDustByName("silver", 1), - ItemIngots.getIngotByName("electrum", 2), 200, 16)); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(ItemDusts.getDustByName("gold", 1), ItemIngots.getIngotByName("silver", 1), - ItemIngots.getIngotByName("electrum", 2), 200, 16)); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(ItemDusts.getDustByName("gold", 1), ItemDusts.getDustByName("silver", 1), - ItemIngots.getIngotByName("electrum", 2), 200, 16)); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, +// new AlloySmelterRecipe(new ItemStack(Items.GOLD_INGOT, 1), ItemIngots.getIngotByName("silver", 1), +// ItemIngots.getIngotByName("electrum", 2), 200, 16)); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, +// new AlloySmelterRecipe(new ItemStack(Items.GOLD_INGOT, 1), ItemDusts.getDustByName("silver", 1), +// ItemIngots.getIngotByName("electrum", 2), 200, 16)); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, +// new AlloySmelterRecipe(ItemDusts.getDustByName("gold", 1), ItemIngots.getIngotByName("silver", 1), +// ItemIngots.getIngotByName("electrum", 2), 200, 16)); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, +// new AlloySmelterRecipe(ItemDusts.getDustByName("gold", 1), ItemDusts.getDustByName("silver", 1), +// ItemIngots.getIngotByName("electrum", 2), 200, 16)); // Invar - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(new ItemStack(Items.IRON_INGOT, 2), ItemIngots.getIngotByName("nickel", 1), - ItemIngots.getIngotByName("invar", 3), 200, 16)); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(new ItemStack(Items.IRON_INGOT, 2), ItemDusts.getDustByName("nickel", 1), - ItemIngots.getIngotByName("invar", 3), 200, 16)); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(ItemDusts.getDustByName("iron", 2), ItemIngots.getIngotByName("nickel", 1), - ItemIngots.getIngotByName("invar", 3), 200, 16)); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(ItemDusts.getDustByName("iron", 2), ItemDusts.getDustByName("nickel", 1), - ItemIngots.getIngotByName("invar", 3), 200, 16)); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, +// new AlloySmelterRecipe(new ItemStack(Items.IRON_INGOT, 2), ItemIngots.getIngotByName("nickel", 1), +// ItemIngots.getIngotByName("invar", 3), 200, 16)); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, +// new AlloySmelterRecipe(new ItemStack(Items.IRON_INGOT, 2), ItemDusts.getDustByName("nickel", 1), +// ItemIngots.getIngotByName("invar", 3), 200, 16)); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, +// new AlloySmelterRecipe(ItemDusts.getDustByName("iron", 2), ItemIngots.getIngotByName("nickel", 1), +// ItemIngots.getIngotByName("invar", 3), 200, 16)); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, +// new AlloySmelterRecipe(ItemDusts.getDustByName("iron", 2), ItemDusts.getDustByName("nickel", 1), +// ItemIngots.getIngotByName("invar", 3), 200, 16)); // Brass - if (OreUtil.doesOreExistAndValid("ingotBrass")) { - ItemStack brassStack = getOre("ingotBrass"); - brassStack.setCount(4); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(ItemIngots.getIngotByName("copper", 3), ItemIngots.getIngotByName("zinc", 1), - brassStack, 200, 16)); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(ItemIngots.getIngotByName("copper", 3), ItemDusts.getDustByName("zinc", 1), - brassStack, 200, 16)); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(ItemDusts.getDustByName("copper", 3), ItemIngots.getIngotByName("zinc", 1), - brassStack, 200, 16)); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(ItemDusts.getDustByName("copper", 3), ItemDusts.getDustByName("zinc", 1), - brassStack, 200, 16)); - } +// if (OreUtil.doesOreExistAndValid("ingotBrass")) { +// ItemStack brassStack = getOre("ingotBrass"); +// brassStack.setCount(4); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, +// new AlloySmelterRecipe(ItemIngots.getIngotByName("copper", 3), ItemIngots.getIngotByName("zinc", 1), +// brassStack, 200, 16)); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, +// new AlloySmelterRecipe(ItemIngots.getIngotByName("copper", 3), ItemDusts.getDustByName("zinc", 1), +// brassStack, 200, 16)); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, +// new AlloySmelterRecipe(ItemDusts.getDustByName("copper", 3), ItemIngots.getIngotByName("zinc", 1), +// brassStack, 200, 16)); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, +// new AlloySmelterRecipe(ItemDusts.getDustByName("copper", 3), ItemDusts.getDustByName("zinc", 1), +// brassStack, 200, 16)); +// } // Red Alloy if (OreUtil.doesOreExistAndValid("ingotRedAlloy")) { ItemStack redAlloyStack = getOre("ingotRedAlloy"); redAlloyStack.setCount(1); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(new ItemStack(Items.REDSTONE, 4), ItemIngots.getIngotByName("copper", 1), - redAlloyStack, 200, 16)); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, +// new AlloySmelterRecipe(new ItemStack(Items.REDSTONE, 4), ItemIngots.getIngotByName("copper", 1), +// redAlloyStack, 200, 16)); RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, new AlloySmelterRecipe(new ItemStack(Items.REDSTONE, 4), new ItemStack(Items.IRON_INGOT, 1), redAlloyStack, 200, 16)); @@ -115,38 +116,38 @@ public class AlloySmelterRecipes extends RecipeMethods { // Blue Alloy if (oresExist("ingotBlueAlloy", "dustTeslatite")) { - ItemStack blueAlloyStack = getOre("ingotBlueAlloy"); - blueAlloyStack.setCount(1); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, new AlloySmelterRecipe(getOre("dustTeslatite", 4), - ItemIngots.getIngotByName("silver", 1), blueAlloyStack, 200, 16)); +// ItemStack blueAlloyStack = getOre("ingotBlueAlloy"); +// blueAlloyStack.setCount(1); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, new AlloySmelterRecipe(getOre("dustTeslatite", 4), +// ItemIngots.getIngotByName("silver", 1), blueAlloyStack, 200, 16)); } // Blue Alloy if (OreUtil.doesOreExistAndValid("ingotPurpleAlloy") && OreUtil.doesOreExistAndValid("dustInfusedTeslatite")) { - ItemStack purpleAlloyStack = getOre("ingotPurpleAlloy"); - purpleAlloyStack.setCount(1); - ItemStack infusedTeslatiteStack = getOre("ingotPurpleAlloy"); - infusedTeslatiteStack.setCount(8); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, new AlloySmelterRecipe(ItemIngots.getIngotByName("redAlloy", 1), - ItemIngots.getIngotByName("blueAlloy", 1), purpleAlloyStack, 200, 16)); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(new ItemStack(Items.GOLD_INGOT, 1), infusedTeslatiteStack, purpleAlloyStack, - 200, 16)); +// ItemStack purpleAlloyStack = getOre("ingotPurpleAlloy"); +// purpleAlloyStack.setCount(1); +// ItemStack infusedTeslatiteStack = getOre("ingotPurpleAlloy"); +// infusedTeslatiteStack.setCount(8); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, new AlloySmelterRecipe(ItemIngots.getIngotByName("redAlloy", 1), +// ItemIngots.getIngotByName("blueAlloy", 1), purpleAlloyStack, 200, 16)); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, +// new AlloySmelterRecipe(new ItemStack(Items.GOLD_INGOT, 1), infusedTeslatiteStack, purpleAlloyStack, +// 200, 16)); } // Aluminum Brass if (OreUtil.doesOreExistAndValid("ingotAluminumBrass")) { - ItemStack aluminumBrassStack = getOre("ingotAluminumBrass"); - aluminumBrassStack.setCount(4); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, new AlloySmelterRecipe(ItemIngots.getIngotByName("copper", 3), - ItemIngots.getIngotByName("aluminum", 1), aluminumBrassStack, 200, 16)); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, new AlloySmelterRecipe(ItemIngots.getIngotByName("copper", 3), - ItemDusts.getDustByName("aluminum", 1), aluminumBrassStack, 200, 16)); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, new AlloySmelterRecipe(ItemDusts.getDustByName("copper", 3), - ItemIngots.getIngotByName("aluminum", 1), aluminumBrassStack, 200, 16)); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(ItemDusts.getDustByName("copper", 3), ItemDusts.getDustByName("aluminum", 1), - aluminumBrassStack, 200, 16)); +// ItemStack aluminumBrassStack = getOre("ingotAluminumBrass"); +// aluminumBrassStack.setCount(4); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, new AlloySmelterRecipe(ItemIngots.getIngotByName("copper", 3), +// ItemIngots.getIngotByName("aluminum", 1), aluminumBrassStack, 200, 16)); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, new AlloySmelterRecipe(ItemIngots.getIngotByName("copper", 3), +// ItemDusts.getDustByName("aluminum", 1), aluminumBrassStack, 200, 16)); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, new AlloySmelterRecipe(ItemDusts.getDustByName("copper", 3), +// ItemIngots.getIngotByName("aluminum", 1), aluminumBrassStack, 200, 16)); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, +// new AlloySmelterRecipe(ItemDusts.getDustByName("copper", 3), ItemDusts.getDustByName("aluminum", 1), +// aluminumBrassStack, 200, 16)); } // Manyullyn @@ -188,9 +189,9 @@ public class AlloySmelterRecipes extends RecipeMethods { RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, new AlloySmelterRecipe(new ItemStack(Items.IRON_INGOT, 1), new ItemStack(Items.ENDER_PEARL, 1), pulsatingIronStack, 200, 16)); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(new ItemStack(Items.IRON_INGOT, 1), ItemDusts.getDustByName("ender_pearl", 1), - pulsatingIronStack, 200, 16)); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, +// new AlloySmelterRecipe(new ItemStack(Items.IRON_INGOT, 1), ItemDusts.getDustByName("ender_pearl", 1), +// pulsatingIronStack, 200, 16)); } // Vibrant Alloy @@ -202,9 +203,9 @@ public class AlloySmelterRecipes extends RecipeMethods { RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, new AlloySmelterRecipe(energeticAlloyStack, new ItemStack(Items.ENDER_PEARL, 1), vibrantAlloyStack, 200, 16)); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(energeticAlloyStack, ItemDusts.getDustByName("ender_pearl", 1), - vibrantAlloyStack, 200, 16)); +// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, +// new AlloySmelterRecipe(energeticAlloyStack, ItemDusts.getDustByName("ender_pearl", 1), +// vibrantAlloyStack, 200, 16)); } // Soularium diff --git a/src/main/java/techreborn/init/recipes/FusionReactorRecipes.java b/src/main/java/techreborn/init/recipes/FusionReactorRecipes.java index 788a9499e..29d1d623d 100644 --- a/src/main/java/techreborn/init/recipes/FusionReactorRecipes.java +++ b/src/main/java/techreborn/init/recipes/FusionReactorRecipes.java @@ -42,9 +42,10 @@ public class FusionReactorRecipes extends RecipeMethods { FusionReactorRecipeHelper.registerRecipe( new FusionReactorRecipe(ItemCells.getCellByName("tritium"), ItemCells.getCellByName("deuterium"), ItemCells.getCellByName("helium3"), 60000000, 16384, 2048)); - FusionReactorRecipeHelper.registerRecipe( - new FusionReactorRecipe(ItemCells.getCellByName("wolframium"), ItemCells.getCellByName("Berylium"), - ItemDusts.getDustByName("platinum"), 80000000, -2048, 1024)); +// TODO: Fix Recipe +// FusionReactorRecipeHelper.registerRecipe( +// new FusionReactorRecipe(ItemCells.getCellByName("wolframium"), ItemCells.getCellByName("Berylium"), +// ItemDusts.getDustByName("platinum"), 80000000, -2048, 1024)); FusionReactorRecipeHelper.registerRecipe( new FusionReactorRecipe(ItemCells.getCellByName("wolframium"), ItemCells.getCellByName("lithium"), BlockOre.getOreByName("iridium"), 90000000, -2048, 1024)); diff --git a/src/main/java/techreborn/init/recipes/ImplosionCompressorRecipes.java b/src/main/java/techreborn/init/recipes/ImplosionCompressorRecipes.java index 2c7b47f61..97a5ee9ad 100644 --- a/src/main/java/techreborn/init/recipes/ImplosionCompressorRecipes.java +++ b/src/main/java/techreborn/init/recipes/ImplosionCompressorRecipes.java @@ -38,10 +38,10 @@ import java.security.InvalidParameterException; */ public class ImplosionCompressorRecipes extends RecipeMethods { public static void init() { - register(getOre("dustDiamond", 4), getStack(Items.DIAMOND, 3), 16); - register(getOre("dustEmerald", 4), getStack(Items.EMERALD, 3), 12); - // TODO: fix recipe - // register(getOre("ingotIridiumAlloy"), getMaterial("iridium_alloy", Type.PLATE), 4); +// TODO: fix recipe +// register(getOre("dustDiamond", 4), getStack(Items.DIAMOND, 3), 16); +// register(getOre("dustEmerald", 4), getStack(Items.EMERALD, 3), 12); +// register(getOre("ingotIridiumAlloy"), getMaterial("iridium_alloy", Type.PLATE), 4); // register(getOre("dustRuby", 4), getMaterial("ruby", 3, Type.GEM), 12); // register(getOre("dustSapphire", 4), getMaterial("sapphire", 3, Type.GEM), 12); // register(getOre("dustPeridot", 4), getMaterial("peridot", 3, Type.GEM), 12); @@ -70,7 +70,7 @@ public class ImplosionCompressorRecipes extends RecipeMethods { register(getOre("dustMalachite", 4), getOre("gemMalachite", 3), 12); } - register(getOre("blockRedstone", 9), getOre("dustRedGarnet", 4), 4); +// register(getOre("blockRedstone", 9), getOre("dustRedGarnet", 4), 4); } static void register(ItemStack input, ItemStack output, int darkAshes) { diff --git a/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java b/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java index 3a9d3bb1c..17f96ffef 100644 --- a/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java +++ b/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java @@ -81,39 +81,37 @@ public class IndustrialCentrifugeRecipes extends RecipeMethods { register(getStack(Items.NETHER_WART, 32), 5000, getMaterial("methane", Type.CELL)); register(getMaterial("sap", 4, Type.PART), 1300, getMaterial("rubber", 14, Type.PART)); register(getStack(ModBlocks.RUBBER_LOG, 16), 5000, false, getMaterial("sap", 8, Type.PART), getMaterial("methane", Type.CELL), getMaterial("carbon", 4, Type.CELL)); - register(getStack(Blocks.SOUL_SAND, 16), 2500, getStack(Blocks.SAND, 10), getMaterial("saltpeter", 4, Type.DUST), getMaterial("coal", Type.DUST), getMaterial("oil", Type.CELL)); - register(getOre("dustBronze"), 1500, getMaterial("copper", 6, Type.SMALL_DUST), getMaterial("tin", 2, Type.SMALL_DUST)); - register(getOre("dustIron", 2), 1500, getMaterial("tin", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); - register(getOre("dustSilver", 2), 2400, getMaterial("lead", Type.SMALL_DUST)); - register(getOre("dustLead", 2), 2400, getMaterial("silver", Type.SMALL_DUST)); - register(getOre("dustTin", 2), 210, getMaterial("zinc", Type.SMALL_DUST), getMaterial("iron", Type.SMALL_DUST)); - 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)); -// TODO: Fix recipe +// register(getStack(Blocks.SOUL_SAND, 16), 2500, getStack(Blocks.SAND, 10), getMaterial("saltpeter", 4, Type.DUST), getMaterial("coal", Type.DUST), getMaterial("oil", Type.CELL)); +// register(getOre("dustBronze"), 1500, getMaterial("copper", 6, Type.SMALL_DUST), getMaterial("tin", 2, Type.SMALL_DUST)); +// register(getOre("dustIron", 2), 1500, getMaterial("tin", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); +// register(getOre("dustSilver", 2), 2400, getMaterial("lead", Type.SMALL_DUST)); +// register(getOre("dustLead", 2), 2400, getMaterial("silver", Type.SMALL_DUST)); +// register(getOre("dustTin", 2), 210, getMaterial("zinc", Type.SMALL_DUST), getMaterial("iron", Type.SMALL_DUST)); +// 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)); - 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)); - register(getOre("dustRedstone", 32), 2200, getMaterial("silicon", 3, Type.CELL), getMaterial("pyrite", 16, Type.DUST), getMaterial("ruby", 3, Type.DUST), getMaterial("mercury", 10, Type.CELL)); - 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)); -// TODO: Fix recipe +// 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)); +// register(getOre("dustRedstone", 32), 2200, getMaterial("silicon", 3, Type.CELL), getMaterial("pyrite", 16, Type.DUST), getMaterial("ruby", 3, Type.DUST), getMaterial("mercury", 10, Type.CELL)); +// 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)); - 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)); - register(getOre("dustDarkAshes", 2), 240, getMaterial("ashes", 1, Type.DUST)); - register(getOre("dustAshes", 2), 240, getMaterial("carbon", Type.CELL)); - register(getOre("dustMarble"), 1040, getMaterial("magnesium", Type.DUST), getMaterial("calcite", 7, Type.DUST)); - register(getOre("dustBasalt", 16), 2040, getMaterial("peridot", Type.DUST), getMaterial("calcite", 3, Type.DUST), getMaterial("flint", 8, Type.DUST), getMaterial("dark_ashes", 4, Type.DUST)); - register(getMaterial("lava", 16, Type.CELL), 1500, getMaterial("tin", 6, Type.INGOT), getMaterial("copper", 4, Type.INGOT), getMaterial("electrum", Type.INGOT), getMaterial("tungsten", Type.SMALL_DUST)); +// 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)); +// register(getOre("dustDarkAshes", 2), 240, getMaterial("ashes", 1, Type.DUST)); +// register(getOre("dustAshes", 2), 240, getMaterial("carbon", Type.CELL)); +// register(getOre("dustMarble"), 1040, getMaterial("magnesium", Type.DUST), getMaterial("calcite", 7, Type.DUST)); +// register(getOre("dustBasalt", 16), 2040, getMaterial("peridot", Type.DUST), getMaterial("calcite", 3, Type.DUST), getMaterial("flint", 8, Type.DUST), getMaterial("dark_ashes", 4, Type.DUST)); +// register(getMaterial("lava", 16, Type.CELL), 1500, getMaterial("tin", 6, Type.INGOT), getMaterial("copper", 4, Type.INGOT), getMaterial("electrum", Type.INGOT), getMaterial("tungsten", Type.SMALL_DUST)); register(getMaterial("hydrogen", 4, Type.CELL), 3000, getMaterial("deuterium", Type.CELL)); register(getMaterial("deuterium", 4, Type.CELL), 3000, getMaterial("tritium", Type.CELL)); register(getMaterial("helium", 16, Type.CELL), 5000, getMaterial("helium3", Type.CELL)); - register(getMaterial("calciumcarbonate", Type.CELL), 40, getMaterial("calcite", Type.DUST)); - register(getMaterial("sulfur", Type.CELL), 40, getMaterial("sulfur", Type.DUST)); +// register(getMaterial("calciumcarbonate", Type.CELL), 40, getMaterial("calcite", Type.DUST)); +// register(getMaterial("sulfur", Type.CELL), 40, getMaterial("sulfur", Type.DUST)); } static void register(Object input, int ticks, boolean oreDict, ItemStack... outputs) { diff --git a/src/main/java/techreborn/init/recipes/IndustrialElectrolyzerRecipes.java b/src/main/java/techreborn/init/recipes/IndustrialElectrolyzerRecipes.java index 3677f1d0f..9405f9ea3 100644 --- a/src/main/java/techreborn/init/recipes/IndustrialElectrolyzerRecipes.java +++ b/src/main/java/techreborn/init/recipes/IndustrialElectrolyzerRecipes.java @@ -44,35 +44,36 @@ public class IndustrialElectrolyzerRecipes extends RecipeMethods { register(getMaterial("water", Type.CELL), 20, 50, getMaterial("electrolyzedwater", Type.CELL)); register(getStack(Items.DYE, 3, 15), 20, 106, false, getMaterial("calcium", Type.CELL)); register(getStack(Items.SUGAR, 32), 200, 32, getMaterial("carbon", 2, Type.CELL), getMaterial("water", 5, Type.CELL)); - register(getStack(Items.BLAZE_POWDER, 4), 300, 25, getMaterial("dark_ashes", Type.DUST), getMaterial("sulfur", Type.DUST)); +// TODO: Fix recipe +// register(getStack(Items.BLAZE_POWDER, 4), 300, 25, getMaterial("dark_ashes", Type.DUST), getMaterial("sulfur", Type.DUST)); register(getStack(Blocks.SAND, 16), 1000, 25, getMaterial("silicon", Type.CELL), getMaterial("compressedair", Type.CELL)); - register(getOre("dustClay", 8), 200, 50, getMaterial("lithium", Type.CELL), getMaterial("silicon", 2, Type.CELL), getMaterial("aluminum", 2, Type.DUST), getMaterial("sodium", 2, Type.CELL)); - register(getOre("dustCoal"), 40, 50, getMaterial("carbon", 2, Type.CELL)); - register(getOre("dustCharcoal"), 20, 50, getMaterial("carbon", Type.CELL)); - register(getOre("dustEnderPearl", 16), 1300, 50, getMaterial("nitrogen", 5, Type.CELL), getMaterial("berylium", 1, Type.CELL), getMaterial("potassium", 4, Type.CELL), getMaterial("chlorite", 6, Type.CELL)); - register(getOre("dustLazurite", 29), 1460, 100, getMaterial("aluminum", 3, Type.DUST), getMaterial("silicon", 3, Type.CELL), getMaterial("calcium", 3, Type.CELL), getMaterial("sodium", 4, Type.CELL)); - register(getOre("dustPyrite", 3), 120, 128, getMaterial("iron", Type.DUST), getMaterial("sulfur", 2, Type.DUST)); - register(getOre("dustCalcite", 10), 700, 80, getMaterial("calcium", 2, Type.CELL), getMaterial("carbon", 2, Type.CELL), getMaterial("compressedair", 3, Type.CELL)); - register(getOre("dustSodalite", 23), 1340, 90, getMaterial("sodium", 4, Type.CELL), getMaterial("aluminum", 3, Type.DUST), getMaterial("silicon", 3, Type.CELL), getMaterial("chlorite", Type.CELL)); - register(getOre("dustFlint", 8), 1000, 5, getMaterial("silicon", Type.CELL), getMaterial("compressedair", Type.CELL)); - register(getOre("dustSaltpeter", 10), 40, 110, getMaterial("potassium", 2, Type.CELL), getMaterial("nitrogen", 2, Type.CELL), getMaterial("compressedair", 3, Type.CELL)); - register(getOre("dustCinnabar", 2), 100, 128, getMaterial("mercury", Type.CELL), getMaterial("sulfur", Type.DUST)); - register(getOre("dustSphalerite", 2), 140, 100, getMaterial("zinc", Type.DUST), getMaterial("sulfur", Type.DUST)); - register(getOre("dustBauxite", 12), 2000, 128, getMaterial("aluminum", 8, Type.DUST), getMaterial("titanium", 2, Type.SMALL_DUST), getMaterial("hydrogen", 5, Type.CELL), getMaterial("compressedair", 3, Type.CELL)); - register(getOre("dustTungsten"), 20, 50, getMaterial("wolframium", Type.CELL)); - register(getOre("dustRuby", 9), 500, 50, getMaterial("aluminum", 2, Type.DUST), getMaterial("chrome", Type.DUST), getMaterial("compressedair", 3, Type.CELL)); - register(getOre("dustSapphire", 8), 400, 50, getMaterial("aluminum", 2, Type.DUST), getMaterial("compressedair", 3, Type.CELL)); - register(getOre("dustEmerald", 29), 600, 50, getMaterial("aluminum", 2, Type.DUST), getMaterial("berylium", 3, Type.CELL), getMaterial("silicon", 6, Type.CELL), getMaterial("compressedair", 9, Type.CELL)); - register(getOre("dustPeridot", 9), 600, 60, getMaterial("magnesium", 2, Type.DUST), getMaterial("iron", 2, Type.DUST), getMaterial("silicon", Type.CELL), getMaterial("compressedair", 2, Type.CELL)); - register(getOre("dustGalena", 2), 1000, 120, getMaterial("silver", 3, Type.SMALL_DUST), getMaterial("lead", 3, Type.SMALL_DUST), getMaterial("sulfur", 2, Type.SMALL_DUST)); - register(getOre("dustObsidian", 4), 500, 5, getMaterial("magnesium", 2, Type.SMALL_DUST), getMaterial("iron", 2, Type.SMALL_DUST), getMaterial("silicon", Type.CELL), getMaterial("compressedair", 2, Type.CELL)); - register(getOre("dustPyrope", 20), 1780, 50, getMaterial("magnesium", 3, Type.DUST), getMaterial("aluminum", 2, Type.DUST), getMaterial("silicon", 3, Type.CELL), getMaterial("compressedair", 6, Type.CELL)); - register(getOre("dustAlmandine", 20), 1640, 50, getMaterial("iron", 3, Type.DUST), getMaterial("aluminum", 2, Type.DUST), getMaterial("silicon", 3, Type.CELL), getMaterial("compressedair", 6, Type.CELL)); - register(getOre("dustSpessartine", 20), 1800, 50, getMaterial("aluminum", 2, Type.DUST), getMaterial("manganese", 3, Type.DUST), getMaterial("silicon", 3, Type.CELL), getMaterial("compressedair", 6, Type.CELL)); - register(getOre("dustAndradite", 20), 1280, 50, getMaterial("calcium", 3, Type.CELL), getMaterial("iron", 2, Type.DUST), getMaterial("silicon", 3, Type.CELL), getMaterial("compressedair", 6, Type.CELL)); - register(getOre("dustGrossular", 20), 204, 50, getMaterial("calcium", 3, Type.CELL), getMaterial("aluminum", 2, Type.DUST), getMaterial("silicon", 3, Type.CELL), getMaterial("compressedair", 6, Type.CELL)); - register(getOre("dustUvarovite", 20), 2200, 50, getMaterial("calcium", 3, Type.CELL), getMaterial("chrome", 2, Type.DUST), getMaterial("silicon", 3, Type.CELL), getMaterial("compressedair", 6, Type.CELL)); - register(getOre("dustAshes", 2), 20, 50, getMaterial("carbonfiber", Type.CELL)); +// register(getOre("dustClay", 8), 200, 50, getMaterial("lithium", Type.CELL), getMaterial("silicon", 2, Type.CELL), getMaterial("aluminum", 2, Type.DUST), getMaterial("sodium", 2, Type.CELL)); +// register(getOre("dustCoal"), 40, 50, getMaterial("carbon", 2, Type.CELL)); +// register(getOre("dustCharcoal"), 20, 50, getMaterial("carbon", Type.CELL)); +// register(getOre("dustEnderPearl", 16), 1300, 50, getMaterial("nitrogen", 5, Type.CELL), getMaterial("berylium", 1, Type.CELL), getMaterial("potassium", 4, Type.CELL), getMaterial("chlorite", 6, Type.CELL)); +// register(getOre("dustLazurite", 29), 1460, 100, getMaterial("aluminum", 3, Type.DUST), getMaterial("silicon", 3, Type.CELL), getMaterial("calcium", 3, Type.CELL), getMaterial("sodium", 4, Type.CELL)); +// register(getOre("dustPyrite", 3), 120, 128, getMaterial("iron", Type.DUST), getMaterial("sulfur", 2, Type.DUST)); +// register(getOre("dustCalcite", 10), 700, 80, getMaterial("calcium", 2, Type.CELL), getMaterial("carbon", 2, Type.CELL), getMaterial("compressedair", 3, Type.CELL)); +// register(getOre("dustSodalite", 23), 1340, 90, getMaterial("sodium", 4, Type.CELL), getMaterial("aluminum", 3, Type.DUST), getMaterial("silicon", 3, Type.CELL), getMaterial("chlorite", Type.CELL)); +// register(getOre("dustFlint", 8), 1000, 5, getMaterial("silicon", Type.CELL), getMaterial("compressedair", Type.CELL)); +// register(getOre("dustSaltpeter", 10), 40, 110, getMaterial("potassium", 2, Type.CELL), getMaterial("nitrogen", 2, Type.CELL), getMaterial("compressedair", 3, Type.CELL)); +// register(getOre("dustCinnabar", 2), 100, 128, getMaterial("mercury", Type.CELL), getMaterial("sulfur", Type.DUST)); +// register(getOre("dustSphalerite", 2), 140, 100, getMaterial("zinc", Type.DUST), getMaterial("sulfur", Type.DUST)); +// register(getOre("dustBauxite", 12), 2000, 128, getMaterial("aluminum", 8, Type.DUST), getMaterial("titanium", 2, Type.SMALL_DUST), getMaterial("hydrogen", 5, Type.CELL), getMaterial("compressedair", 3, Type.CELL)); +// register(getOre("dustTungsten"), 20, 50, getMaterial("wolframium", Type.CELL)); +// register(getOre("dustRuby", 9), 500, 50, getMaterial("aluminum", 2, Type.DUST), getMaterial("chrome", Type.DUST), getMaterial("compressedair", 3, Type.CELL)); +// register(getOre("dustSapphire", 8), 400, 50, getMaterial("aluminum", 2, Type.DUST), getMaterial("compressedair", 3, Type.CELL)); +// register(getOre("dustEmerald", 29), 600, 50, getMaterial("aluminum", 2, Type.DUST), getMaterial("berylium", 3, Type.CELL), getMaterial("silicon", 6, Type.CELL), getMaterial("compressedair", 9, Type.CELL)); +// register(getOre("dustPeridot", 9), 600, 60, getMaterial("magnesium", 2, Type.DUST), getMaterial("iron", 2, Type.DUST), getMaterial("silicon", Type.CELL), getMaterial("compressedair", 2, Type.CELL)); +// register(getOre("dustGalena", 2), 1000, 120, getMaterial("silver", 3, Type.SMALL_DUST), getMaterial("lead", 3, Type.SMALL_DUST), getMaterial("sulfur", 2, Type.SMALL_DUST)); +// register(getOre("dustObsidian", 4), 500, 5, getMaterial("magnesium", 2, Type.SMALL_DUST), getMaterial("iron", 2, Type.SMALL_DUST), getMaterial("silicon", Type.CELL), getMaterial("compressedair", 2, Type.CELL)); +// register(getOre("dustPyrope", 20), 1780, 50, getMaterial("magnesium", 3, Type.DUST), getMaterial("aluminum", 2, Type.DUST), getMaterial("silicon", 3, Type.CELL), getMaterial("compressedair", 6, Type.CELL)); +// register(getOre("dustAlmandine", 20), 1640, 50, getMaterial("iron", 3, Type.DUST), getMaterial("aluminum", 2, Type.DUST), getMaterial("silicon", 3, Type.CELL), getMaterial("compressedair", 6, Type.CELL)); +// register(getOre("dustSpessartine", 20), 1800, 50, getMaterial("aluminum", 2, Type.DUST), getMaterial("manganese", 3, Type.DUST), getMaterial("silicon", 3, Type.CELL), getMaterial("compressedair", 6, Type.CELL)); +// register(getOre("dustAndradite", 20), 1280, 50, getMaterial("calcium", 3, Type.CELL), getMaterial("iron", 2, Type.DUST), getMaterial("silicon", 3, Type.CELL), getMaterial("compressedair", 6, Type.CELL)); +// register(getOre("dustGrossular", 20), 204, 50, getMaterial("calcium", 3, Type.CELL), getMaterial("aluminum", 2, Type.DUST), getMaterial("silicon", 3, Type.CELL), getMaterial("compressedair", 6, Type.CELL)); +// register(getOre("dustUvarovite", 20), 2200, 50, getMaterial("calcium", 3, Type.CELL), getMaterial("chrome", 2, Type.DUST), getMaterial("silicon", 3, Type.CELL), getMaterial("compressedair", 6, Type.CELL)); +// register(getOre("dustAshes", 2), 20, 50, getMaterial("carbonfiber", Type.CELL)); register(ItemCells.getCellByName("methane", 5), 140, 50, getMaterial("hydrogen", 4, Type.CELL), getMaterial("carbon", Type.CELL)); register(ItemCells.getCellByName("sulfuricacid", 7), 40, 100, getMaterial("hydrogen", 2, Type.CELL), getMaterial("sulfur", Type.CELL), getMaterial("compressedair", 2, Type.CELL)); } diff --git a/src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java b/src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java index d680f5a4f..ad1763363 100644 --- a/src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java +++ b/src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java @@ -54,39 +54,40 @@ public class IndustrialGrinderRecipes extends RecipeMethods { register(getOre("oreCoal"), WATER, 100, 64, getStack(Items.COAL, 2)); } - register(getOre("oreIron"), WATER, 100, 64, getMaterial("iron", 2, Type.DUST), getMaterial("tin", Type.SMALL_DUST), getMaterial("nickel", 1, Type.DUST)); +// TODO: Fix recipe +// register(getOre("oreIron"), WATER, 100, 64, getMaterial("iron", 2, Type.DUST), getMaterial("tin", Type.SMALL_DUST), getMaterial("nickel", 1, Type.DUST)); - register(getOre("oreGold"), WATER, 100, 64, getMaterial("gold", 2, Type.DUST), getMaterial("copper", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); - register(getOre("oreGold"), MERCURY, 100, 64, getMaterial("gold", 3, Type.DUST), getMaterial("copper", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); - register(getOre("oreGold"), SODIUM_PERSULFATE, 100, 64, getMaterial("gold", 2, Type.DUST), getMaterial("copper", Type.DUST), getMaterial("nickel", Type.SMALL_DUST)); +// register(getOre("oreGold"), WATER, 100, 64, getMaterial("gold", 2, Type.DUST), getMaterial("copper", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); +// register(getOre("oreGold"), MERCURY, 100, 64, getMaterial("gold", 3, Type.DUST), getMaterial("copper", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); +// register(getOre("oreGold"), SODIUM_PERSULFATE, 100, 64, getMaterial("gold", 2, Type.DUST), getMaterial("copper", Type.DUST), getMaterial("nickel", Type.SMALL_DUST)); - register(getOre("oreLapis"), WATER, 100, 64, getStack(Items.DYE, 12, 4), getMaterial("lazurite", 3, Type.DUST)); +// register(getOre("oreLapis"), WATER, 100, 64, getStack(Items.DYE, 12, 4), getMaterial("lazurite", 3, Type.DUST)); - register(getOre("oreRedstone"), WATER, 100, 64, getStack(Items.REDSTONE, 10), getMaterial("glowstone", 2, Type.SMALL_DUST)); +// register(getOre("oreRedstone"), WATER, 100, 64, getStack(Items.REDSTONE, 10), getMaterial("glowstone", 2, Type.SMALL_DUST)); - register(getOre("oreDiamond"), WATER, 100, 64, getStack(Items.DIAMOND), getMaterial("diamond", 6, Type.SMALL_DUST), getMaterial("coal", Type.DUST)); +// register(getOre("oreDiamond"), WATER, 100, 64, getStack(Items.DIAMOND), getMaterial("diamond", 6, Type.SMALL_DUST), getMaterial("coal", Type.DUST)); - register(getOre("oreEmerald"), WATER, 100, 64, getStack(Items.EMERALD), getMaterial("emerald", 6, Type.SMALL_DUST)); +// register(getOre("oreEmerald"), WATER, 100, 64, getStack(Items.EMERALD), getMaterial("emerald", 6, Type.SMALL_DUST)); //TR ores - register(getOre("oreCopper"), WATER, 100, 64, getMaterial("copper", 2, Type.DUST), getMaterial("gold", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); - register(getOre("oreCopper"), SODIUM_PERSULFATE, 100, 64, getMaterial("copper", 3, Type.DUST), getMaterial("gold", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); - register(getOre("oreCopper"), MERCURY, 100, 64, getMaterial("copper", 3, Type.DUST), getMaterial("gold", Type.DUST)); +// register(getOre("oreCopper"), WATER, 100, 64, getMaterial("copper", 2, Type.DUST), getMaterial("gold", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); +// register(getOre("oreCopper"), SODIUM_PERSULFATE, 100, 64, getMaterial("copper", 3, Type.DUST), getMaterial("gold", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); +// register(getOre("oreCopper"), MERCURY, 100, 64, getMaterial("copper", 3, Type.DUST), getMaterial("gold", Type.DUST)); - register(getOre("oreTin"), WATER, 100, 64, getMaterial("tin", 2, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("zinc", Type.SMALL_DUST)); - register(getOre("oreTin"), SODIUM_PERSULFATE, 100, 64, getMaterial("tin", 2, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("zinc", Type.DUST)); +// register(getOre("oreTin"), WATER, 100, 64, getMaterial("tin", 2, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("zinc", Type.SMALL_DUST)); +// register(getOre("oreTin"), SODIUM_PERSULFATE, 100, 64, getMaterial("tin", 2, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("zinc", Type.DUST)); - register(getOre("oreLead"), WATER, 100, 64, getMaterial("lead", 2, Type.DUST), getMaterial("galena", 2, Type.SMALL_DUST)); +// register(getOre("oreLead"), WATER, 100, 64, getMaterial("lead", 2, Type.DUST), getMaterial("galena", 2, Type.SMALL_DUST)); - register(getOre("oreSilver"), WATER, 100, 64, getMaterial("silver", 2, Type.DUST), getMaterial("galena", 2, Type.SMALL_DUST)); +// register(getOre("oreSilver"), WATER, 100, 64, getMaterial("silver", 2, Type.DUST), getMaterial("galena", 2, Type.SMALL_DUST)); - register(getOre("oreGalena"), WATER, 100, 64, getMaterial("galena", 2, Type.DUST), getMaterial("sulfur", Type.DUST)); - register(getOre("oreGalena"), MERCURY, 100, 64, getMaterial("galena", 2, Type.DUST), getMaterial("sulfur", Type.DUST), getMaterial("silver", Type.DUST)); +// register(getOre("oreGalena"), WATER, 100, 64, getMaterial("galena", 2, Type.DUST), getMaterial("sulfur", Type.DUST)); +// register(getOre("oreGalena"), MERCURY, 100, 64, getMaterial("galena", 2, Type.DUST), getMaterial("sulfur", Type.DUST), getMaterial("silver", Type.DUST)); - register(BlockOre.getOreByName("bauxite"), WATER, 100, 64, getMaterial("bauxite", 4, Type.DUST), getMaterial("aluminum", Type.DUST)); +// register(BlockOre.getOreByName("bauxite"), WATER, 100, 64, getMaterial("bauxite", 4, Type.DUST), getMaterial("aluminum", Type.DUST)); - register(getOre("oreIridium"), WATER, 100, 64, getMaterial("iridium", Type.INGOT), getMaterial("platinum", 2, Type.SMALL_DUST)); - register(getOre("oreIridium"), MERCURY, 100, 64, getMaterial("iridium", Type.INGOT), getMaterial("platinum", Type.DUST)); +// register(getOre("oreIridium"), WATER, 100, 64, getMaterial("iridium", Type.INGOT), getMaterial("platinum", 2, Type.SMALL_DUST)); +// register(getOre("oreIridium"), MERCURY, 100, 64, getMaterial("iridium", Type.INGOT), getMaterial("platinum", Type.DUST)); if (oresExist("oreUranium", "dustUranium", "smallDustPlutonium")) { register(getOre("oreUranium"), WATER, 100, 64, getOre("dustUranium", 2), getOre("smallDustPlutonium")); @@ -102,25 +103,25 @@ public class IndustrialGrinderRecipes extends RecipeMethods { - register(getOre("oreQuartz"), WATER, 100, 64, getStack(Items.QUARTZ, 2), getMaterial("sulfur", 2, Type.SMALL_DUST)); +// register(getOre("oreQuartz"), WATER, 100, 64, getStack(Items.QUARTZ, 2), getMaterial("sulfur", 2, Type.SMALL_DUST)); - register(getOre("orePyrite"), WATER, 100, 64, getMaterial("pyrite", 5, Type.DUST), getMaterial("sulfur", 2, Type.DUST)); +// register(getOre("orePyrite"), WATER, 100, 64, getMaterial("pyrite", 5, Type.DUST), getMaterial("sulfur", 2, Type.DUST)); - register(getOre("oreCinnabar"), WATER, 100, 64, getMaterial("cinnabar", 5, Type.DUST), getMaterial("redstone", 2, Type.SMALL_DUST), getMaterial("glowstone", Type.SMALL_DUST)); +// register(getOre("oreCinnabar"), WATER, 100, 64, getMaterial("cinnabar", 5, Type.DUST), getMaterial("redstone", 2, Type.SMALL_DUST), getMaterial("glowstone", Type.SMALL_DUST)); - register(getOre("oreSphalerite"), WATER, 100, 64, getMaterial("sphalerite", 5, Type.DUST), getMaterial("zinc", Type.DUST), getMaterial("yellow_garnet", Type.SMALL_DUST)); - register(getOre("oreSphalerite"), SODIUM_PERSULFATE, 100, 64, getMaterial("sphalerite", 5, Type.DUST), getMaterial("zinc", 3, Type.DUST), getMaterial("yellow_garnet", Type.SMALL_DUST)); +// register(getOre("oreSphalerite"), WATER, 100, 64, getMaterial("sphalerite", 5, Type.DUST), getMaterial("zinc", Type.DUST), getMaterial("yellow_garnet", Type.SMALL_DUST)); +// register(getOre("oreSphalerite"), SODIUM_PERSULFATE, 100, 64, getMaterial("sphalerite", 5, Type.DUST), getMaterial("zinc", 3, Type.DUST), getMaterial("yellow_garnet", Type.SMALL_DUST)); + +// 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("oreTungsten"), WATER, 100, 64, getMaterial("tungsten", 2, Type.DUST), getMaterial("iron", 3, Type.SMALL_DUST), getMaterial("manganese", 3, Type.SMALL_DUST)); -// 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)); // register(getOre("oreRuby"), WATER, 100, 64, getMaterial("ruby", Type.GEM), getMaterial("ruby", 6, Type.SMALL_DUST), getMaterial("red_garnet", 2, Type.SMALL_DUST)); // register(getOre("oreSapphire"), WATER, 100, 64, getMaterial("sapphire", Type.GEM), getMaterial("sapphire", 6, Type.SMALL_DUST), getMaterial("peridot", 2, Type.SMALL_DUST)); - register(getOre("oreSodalite"), WATER, 100, 64, getMaterial("sodalite", 12, Type.DUST), getMaterial("aluminum", 3, Type.DUST)); +// register(getOre("oreSodalite"), WATER, 100, 64, getMaterial("sodalite", 12, Type.DUST), getMaterial("aluminum", 3, Type.DUST)); if (oresExist("oreApatite", "gemApatite")) { register(getOre("oreApatite"), WATER, 100, 64, getOre("gemApatite", 8), getMaterial("phosphorous", 2, Type.SMALL_DUST)); @@ -135,14 +136,14 @@ public class IndustrialGrinderRecipes extends RecipeMethods { } if (oresExist("oreNickel")) { - register(getOre("oreNickel"), WATER, 100, 64, getMaterial("nickel", 2, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("platinum", Type.SMALL_DUST)); - register(getOre("oreNickel"), MERCURY, 100, 64, getMaterial("nickel", 3, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("platinum", Type.DUST)); - register(getOre("oreNickel"), SODIUM_PERSULFATE, 100, 64, getMaterial("nickel", 3, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("platinum", Type.SMALL_DUST)); +// register(getOre("oreNickel"), WATER, 100, 64, getMaterial("nickel", 2, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("platinum", Type.SMALL_DUST)); +// register(getOre("oreNickel"), MERCURY, 100, 64, getMaterial("nickel", 3, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("platinum", Type.DUST)); +// register(getOre("oreNickel"), SODIUM_PERSULFATE, 100, 64, getMaterial("nickel", 3, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("platinum", Type.SMALL_DUST)); } if (oresExist("oreZinc")) { - register(getOre("oreZinc"), WATER, 100, 64, getMaterial("zinc", 2, Type.DUST), getMaterial("iron", 2, Type.SMALL_DUST), getMaterial("tin", Type.SMALL_DUST)); - register(getOre("oreZinc"), SODIUM_PERSULFATE, 100, 64, getMaterial("zinc", 2, Type.DUST), getMaterial("iron", Type.DUST), getMaterial("tin", Type.SMALL_DUST)); +// register(getOre("oreZinc"), WATER, 100, 64, getMaterial("zinc", 2, Type.DUST), getMaterial("iron", 2, Type.SMALL_DUST), getMaterial("tin", Type.SMALL_DUST)); +// register(getOre("oreZinc"), SODIUM_PERSULFATE, 100, 64, getMaterial("zinc", 2, Type.DUST), getMaterial("iron", Type.DUST), getMaterial("tin", Type.SMALL_DUST)); } if (oresExist("oreAmethyst", "gemAmethyst")) { @@ -162,7 +163,7 @@ public class IndustrialGrinderRecipes extends RecipeMethods { } if (oresExist("oreAluminum")) { - register(getOre("oreAluminum"), WATER, 100, 64, getMaterial("aluminum", 2, Type.DUST), getMaterial("bauxite", 2, Type.SMALL_DUST)); +// register(getOre("oreAluminum"), WATER, 100, 64, getMaterial("aluminum", 2, Type.DUST), getMaterial("bauxite", 2, Type.SMALL_DUST)); } if (oresExist("oreArdite", "dustArdite")) { @@ -182,18 +183,18 @@ public class IndustrialGrinderRecipes extends RecipeMethods { } if (oresExist("oreSulfur")) { - register(getOre("oreSulfur"), WATER, 100, 64, getMaterial("sulfur", 2, Type.DUST), getMaterial("sulfur", Type.SMALL_DUST)); +// register(getOre("oreSulfur"), WATER, 100, 64, getMaterial("sulfur", 2, Type.DUST), getMaterial("sulfur", Type.SMALL_DUST)); } if (oresExist("oreSaltpeter")) { - register(getOre("oreSaltpeter"), WATER, 100, 64, getMaterial("saltpeter", 2, Type.DUST), getMaterial("saltpeter", Type.SMALL_DUST)); +// register(getOre("oreSaltpeter"), WATER, 100, 64, getMaterial("saltpeter", 2, Type.DUST), getMaterial("saltpeter", Type.SMALL_DUST)); } - register(getStack(Blocks.NETHERRACK, 16), WATER, 1600, 64, getMaterial("netherrack", 16, Type.DUST), getStack(Items.GOLD_NUGGET)); - register(getStack(Blocks.NETHERRACK, 8), MERCURY, 800, 64, getMaterial("netherrack", 8, Type.DUST), getStack(Items.GOLD_NUGGET)); +// register(getStack(Blocks.NETHERRACK, 16), WATER, 1600, 64, getMaterial("netherrack", 16, Type.DUST), getStack(Items.GOLD_NUGGET)); +// register(getStack(Blocks.NETHERRACK, 8), MERCURY, 800, 64, getMaterial("netherrack", 8, Type.DUST), getStack(Items.GOLD_NUGGET)); - register(new ItemStack(Blocks.END_STONE), WATER, 100, 64, getMaterial("endstone", 2, Type.DUST)); - register(new ItemStack(Blocks.END_BRICKS), WATER, 100, 64, getMaterial("endstone", 4, Type.DUST)); +// register(new ItemStack(Blocks.END_STONE), WATER, 100, 64, getMaterial("endstone", 2, Type.DUST)); +// register(new ItemStack(Blocks.END_BRICKS), WATER, 100, 64, getMaterial("endstone", 4, Type.DUST)); } diff --git a/src/main/java/techreborn/init/recipes/RecipeMethods.java b/src/main/java/techreborn/init/recipes/RecipeMethods.java index 8e23d0ca9..123e8ed77 100644 --- a/src/main/java/techreborn/init/recipes/RecipeMethods.java +++ b/src/main/java/techreborn/init/recipes/RecipeMethods.java @@ -42,12 +42,12 @@ import techreborn.items.*; */ public abstract class RecipeMethods { public static ItemStack getMaterial(String name, int count, Type type) { - if (type == Type.DUST) { - return ItemDusts.getDustByName(name, count); - } else if (type == Type.SMALL_DUST) { - return ItemDustsSmall.getSmallDustByName(name, count); - } else if (type == Type.INGOT) { - return ItemIngots.getIngotByName(name, count); +// if (type == Type.DUST) { +// return ItemDusts.getDustByName(name, count); +// } else if (type == Type.SMALL_DUST) { +// return ItemDustsSmall.getSmallDustByName(name, count); +// } else if (type == Type.INGOT) { +// return ItemIngots.getIngotByName(name, count); // } else if (type == Type.GEM) { // return ItemGems.getGemByName(name, count); // TODO: fix recipe @@ -55,7 +55,8 @@ public abstract class RecipeMethods { // return ItemPlates.getPlateByName(name, count); // } else if (type == Type.NUGGET) { // return ItemNuggets.getNuggetByName(name, count); - } else if (type == Type.CELL) { +// } else + if (type == Type.CELL) { return ItemCells.getCellByName(name, count); } else if (type == Type.PART) { return ItemParts.getPartByName(name, count); diff --git a/src/main/java/techreborn/init/recipes/ScrapboxRecipes.java b/src/main/java/techreborn/init/recipes/ScrapboxRecipes.java index c6c35a906..7d22c73e4 100644 --- a/src/main/java/techreborn/init/recipes/ScrapboxRecipes.java +++ b/src/main/java/techreborn/init/recipes/ScrapboxRecipes.java @@ -188,9 +188,9 @@ public class ScrapboxRecipes extends RecipeMethods { register(getStack(ModBlocks.RUBBER_SAPLING)); - for (String i : ItemDusts.types) { - register(ItemDusts.getDustByName(i)); - } +// for (String i : ItemDusts.types) { +// register(ItemDusts.getDustByName(i)); +// } // TODO: fix recipe // for (String i : ItemNuggets.types) { // register(ItemNuggets.getNuggetByName(i)); diff --git a/src/main/java/techreborn/init/recipes/SmeltingRecipes.java b/src/main/java/techreborn/init/recipes/SmeltingRecipes.java index 1f51a7805..99291562f 100644 --- a/src/main/java/techreborn/init/recipes/SmeltingRecipes.java +++ b/src/main/java/techreborn/init/recipes/SmeltingRecipes.java @@ -38,29 +38,29 @@ public class SmeltingRecipes extends RecipeMethods { public static void init() { register(getMaterial("sap", Type.PART), getMaterial("rubber", Type.PART)); - register(getStack(Items.IRON_INGOT), getMaterial("refined_iron", Type.INGOT)); - - register(BlockOre2.getOreByName("copper"), getMaterial("copper", Type.INGOT)); - register(BlockOre2.getOreByName("tin"), getMaterial("tin", Type.INGOT)); - register(BlockOre.getOreByName("silver"), getMaterial("silver", Type.INGOT)); - register(BlockOre.getOreByName("lead"), getMaterial("lead", Type.INGOT)); - register(BlockOre.getOreByName("sheldonite"), getMaterial("platinum", Type.INGOT)); - register(ItemIngots.getIngotByName("mixed_metal"), getMaterial("advanced_alloy", Type.INGOT)); +// TODO: Fix recipe +// register(getStack(Items.IRON_INGOT), getMaterial("refined_iron", Type.INGOT)); +// register(BlockOre2.getOreByName("copper"), getMaterial("copper", Type.INGOT)); +// register(BlockOre2.getOreByName("tin"), getMaterial("tin", Type.INGOT)); +// register(BlockOre.getOreByName("silver"), getMaterial("silver", Type.INGOT)); +// register(BlockOre.getOreByName("lead"), getMaterial("lead", Type.INGOT)); +// register(BlockOre.getOreByName("sheldonite"), getMaterial("platinum", Type.INGOT)); +// register(ItemIngots.getIngotByName("mixed_metal"), getMaterial("advanced_alloy", Type.INGOT)); // Dust smelting - register(getMaterial("iron", Type.DUST), getStack(Items.IRON_INGOT)); - register(getMaterial("gold", Type.DUST), getStack(Items.GOLD_INGOT)); - register(getMaterial("copper", Type.DUST), getMaterial("copper", Type.INGOT)); - register(getMaterial("tin", Type.DUST), getMaterial("tin", Type.INGOT)); - register(getMaterial("bronze", Type.DUST), getMaterial("bronze", Type.INGOT)); - register(getMaterial("lead", Type.DUST), getMaterial("lead", Type.INGOT)); - register(getMaterial("silver", Type.DUST), getMaterial("silver", Type.INGOT)); - register(getMaterial("nickel", Type.DUST), getMaterial("nickel", Type.INGOT)); - register(getMaterial("platinum", Type.DUST), getMaterial("platinum", Type.INGOT)); - register(getMaterial("zinc", Type.DUST), getMaterial("zinc", Type.INGOT)); - register(getMaterial("brass", Type.DUST), getMaterial("brass", Type.INGOT)); - register(getMaterial("electrum", Type.DUST), getMaterial("electrum", Type.INGOT)); - register(getMaterial("invar", Type.DUST), getMaterial("invar", Type.INGOT)); +// register(getMaterial("iron", Type.DUST), getStack(Items.IRON_INGOT)); +// register(getMaterial("gold", Type.DUST), getStack(Items.GOLD_INGOT)); +// register(getMaterial("copper", Type.DUST), getMaterial("copper", Type.INGOT)); +// register(getMaterial("tin", Type.DUST), getMaterial("tin", Type.INGOT)); +// register(getMaterial("bronze", Type.DUST), getMaterial("bronze", Type.INGOT)); +// register(getMaterial("lead", Type.DUST), getMaterial("lead", Type.INGOT)); +// register(getMaterial("silver", Type.DUST), getMaterial("silver", Type.INGOT)); +// register(getMaterial("nickel", Type.DUST), getMaterial("nickel", Type.INGOT)); +// register(getMaterial("platinum", Type.DUST), getMaterial("platinum", Type.INGOT)); +// register(getMaterial("zinc", Type.DUST), getMaterial("zinc", Type.INGOT)); +// register(getMaterial("brass", Type.DUST), getMaterial("brass", Type.INGOT)); +// register(getMaterial("electrum", Type.DUST), getMaterial("electrum", Type.INGOT)); +// register(getMaterial("invar", Type.DUST), getMaterial("invar", Type.INGOT)); diff --git a/src/main/java/techreborn/items/ItemIngots.java b/src/main/java/techreborn/items/ItemIngots.java index aaa898c4d..e7fda61de 100644 --- a/src/main/java/techreborn/items/ItemIngots.java +++ b/src/main/java/techreborn/items/ItemIngots.java @@ -24,69 +24,32 @@ package techreborn.items; -import com.google.common.base.CaseFormat; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Items; -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 ItemIngots 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", "advanced_alloy", "mixed_metal", - "iridium_alloy" }; public ItemIngots() { - setCreativeTab(TechRebornCreativeTab.instance); - setHasSubtypes(true); - setTranslationKey("techreborn.ingot"); TRRecipeHandler.hideEntry(this); } - public static ItemStack getIngotByName(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.INGOTS, count, i); - } - } - if (name.equalsIgnoreCase("iron")) { - return new ItemStack(Items.IRON_INGOT); - } - if (name.equalsIgnoreCase("gold")) { - return new ItemStack(Items.GOLD_INGOT); - } - throw new InvalidParameterException("The ingot " + name + " could not be found."); - } +// public static ItemStack getIngotByName(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.INGOTS, count, i); +// } +// } +// if (name.equalsIgnoreCase("iron")) { +// return new ItemStack(Items.IRON_INGOT); +// } +// if (name.equalsIgnoreCase("gold")) { +// return new ItemStack(Items.GOLD_INGOT); +// } +// throw new InvalidParameterException("The ingot " + name + " could not be found."); +// } +// +// public static ItemStack getIngotByName(String name) { +// return getIngotByName(name, 1); +// } - public static ItemStack getIngotByName(String name) { - return getIngotByName(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)); - } - } } diff --git a/src/main/resources/assets/techreborn/blockstates/items/materials/ingot.json b/src/main/resources/assets/techreborn/blockstates/items/materials/ingots.json similarity index 80% rename from src/main/resources/assets/techreborn/blockstates/items/materials/ingot.json rename to src/main/resources/assets/techreborn/blockstates/items/materials/ingots.json index 9452376a8..074ce2e52 100644 --- a/src/main/resources/assets/techreborn/blockstates/items/materials/ingot.json +++ b/src/main/resources/assets/techreborn/blockstates/items/materials/ingots.json @@ -6,119 +6,119 @@ }, "variants": { "type": { - "aluminum": { + "ingotadvancedalloy": { + "textures": { + "layer0": "techreborn:items/ingot/advanced_alloy_ingot" + } + }, + "ingotaluminum": { "textures": { "layer0": "techreborn:items/ingot/aluminum_ingot" } }, - "brass": { + "ingotbrass": { "textures": { "layer0": "techreborn:items/ingot/brass_ingot" } }, - "bronze": { + "ingotbronze": { "textures": { "layer0": "techreborn:items/ingot/bronze_ingot" } }, - "chrome": { + "ingotchrome": { "textures": { "layer0": "techreborn:items/ingot/chrome_ingot" } }, - "copper": { + "ingotcopper": { "textures": { "layer0": "techreborn:items/ingot/copper_ingot" } }, - "electrum": { + "ingotelectrum": { "textures": { "layer0": "techreborn:items/ingot/electrum_ingot" } }, - "invar": { + "ingothottungstensteel": { + "textures": { + "layer0": "techreborn:items/ingot/hot_tungstensteel_ingot" + } + }, + "ingotinvar": { "textures": { "layer0": "techreborn:items/ingot/invar_ingot" } }, - "iridium": { + "ingotiridiumalloy": { + "textures": { + "layer0": "techreborn:items/ingot/iridium_alloy_ingot" + } + }, + "ingotiridium": { "textures": { "layer0": "techreborn:items/ingot/iridium_ingot" } }, - "lead": { + "ingotlead": { "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": { + "ingotmixedmetal": { "textures": { "layer0": "techreborn:items/ingot/mixed_metal_ingot" } }, - "iridium_alloy": { + "ingotnickel": { "textures": { - "layer0": "techreborn:items/ingot/iridium_alloy_ingot" + "layer0": "techreborn:items/ingot/nickel_ingot" + } + }, + "ingotplatinum": { + "textures": { + "layer0": "techreborn:items/ingot/platinum_ingot" + } + }, + "ingotrefinediron": { + "textures": { + "layer0": "techreborn:items/ingot/refined_iron_ingot" + } + }, + "ingotsilver": { + "textures": { + "layer0": "techreborn:items/ingot/silver_ingot" + } + }, + "ingotsteel": { + "textures": { + "layer0": "techreborn:items/ingot/steel_ingot" + } + }, + "ingottin": { + "textures": { + "layer0": "techreborn:items/ingot/tin_ingot" + } + }, + "ingottitanium": { + "textures": { + "layer0": "techreborn:items/ingot/titanium_ingot" + } + }, + "ingottungsten": { + "textures": { + "layer0": "techreborn:items/ingot/tungsten_ingot" + } + }, + "ingottungstensteel": { + "textures": { + "layer0": "techreborn:items/ingot/tungstensteel_ingot" + } + }, + "ingotzinc": { + "textures": { + "layer0": "techreborn:items/ingot/zinc_ingot" } } } diff --git a/src/main/resources/assets/techreborn/lang/en_us.lang b/src/main/resources/assets/techreborn/lang/en_us.lang index 8954f8056..dc4ad63e8 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.lang +++ b/src/main/resources/assets/techreborn/lang/en_us.lang @@ -371,29 +371,29 @@ item.techreborn.gemSapphire.name=Sapphire item.techreborn.gemYellowGarnet.name=Yellow Garnet #Ingots -item.techreborn.ingot.aluminum.name=Aluminium Ingot -item.techreborn.ingot.brass.name=Brass Ingot -item.techreborn.ingot.bronze.name=Bronze Ingot -item.techreborn.ingot.chrome.name=Chrome Ingot -item.techreborn.ingot.copper.name=Copper Ingot -item.techreborn.ingot.electrum.name=Electrum Ingot -item.techreborn.ingot.invar.name=Invar Ingot -item.techreborn.ingot.iridium.name=Iridium Ingot -item.techreborn.ingot.lead.name=Lead Ingot -item.techreborn.ingot.nickel.name=Nickel Ingot -item.techreborn.ingot.platinum.name=Platinum Ingot -item.techreborn.ingot.silver.name=Silver Ingot -item.techreborn.ingot.steel.name=Steel 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.hot_tungstensteel.name=Hot Tungstensteel Ingot -item.techreborn.ingot.tungstensteel.name=Tungstensteel Ingot -item.techreborn.ingot.zinc.name=Zinc 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 +item.techreborn.ingotAdvancedAlloy.name=Advanced Alloy Ingot +item.techreborn.ingotAluminum.name=Aluminium Ingot +item.techreborn.ingotBrass.name=Brass Ingot +item.techreborn.ingotBronze.name=Bronze Ingot +item.techreborn.ingotChrome.name=Chrome Ingot +item.techreborn.ingotCopper.name=Copper Ingot +item.techreborn.ingotElectrum.name=Electrum Ingot +item.techreborn.ingotHotTungstensteel.name=Hot Tungstensteel Ingot +item.techreborn.ingotInvar.name=Invar Ingot +item.techreborn.ingotIridiumAlloy.name=Iridium Alloy Ingot +item.techreborn.ingotIridium.name=Iridium Ingot +item.techreborn.ingotLead.name=Lead Ingot +item.techreborn.ingotMixedMetal.name=Mixed Metal Ingot +item.techreborn.ingotNickel.name=Nickel Ingot +item.techreborn.ingotPlatinum.name=Platinum Ingot +item.techreborn.ingotRefinedIron.name=Refined Iron Ingot +item.techreborn.ingotSilver.name=Silver Ingot +item.techreborn.ingotSteel.name=Steel Ingot +item.techreborn.ingotTin.name=Tin Ingot +item.techreborn.ingotTitanium.name=Titanium Ingot +item.techreborn.ingotTungsten.name=Tungsten Ingot +item.techreborn.ingotTungstensteel.name=Tungstensteel Ingot +item.techreborn.ingotZinc.name=Zinc Ingot #Nuggets item.techreborn.nuggetAluminum.name=Aluminium Nugget