Move ingots, plates, and gems to jsons

This commit is contained in:
ProfessorProspector 2016-12-10 00:15:39 -08:00
parent 89ffb5d047
commit 2911e7f0ca
75 changed files with 495 additions and 197 deletions

View file

@ -52,22 +52,19 @@ import java.io.File;
@Mod(modid = ModInfo.MOD_ID, name = ModInfo.MOD_NAME, version = ModInfo.MOD_VERSION, dependencies = ModInfo.MOD_DEPENDENCIES, guiFactory = ModInfo.GUI_FACTORY_CLASS, acceptedMinecraftVersions = "[1.11]")
public class Core {
public Core() {
//Forge says to call it here, so yeah
FluidRegistry.enableUniversalBucket();
}
public static ConfigTechReborn config;
@SidedProxy(clientSide = ModInfo.CLIENT_PROXY_CLASS, serverSide = ModInfo.SERVER_PROXY_CLASS)
public static CommonProxy proxy;
@Mod.Instance
public static Core INSTANCE;
public static LogHelper logHelper = new LogHelper(new ModInfo());
public static TechRebornWorldGen worldGen;
public static File configDir;
public VersionChecker versionChecker;
public Core() {
//Forge says to call it here, so yeah
FluidRegistry.enableUniversalBucket();
}
@Mod.EventHandler
public void preinit(FMLPreInitializationEvent event) throws IllegalAccessException, InstantiationException {
@ -102,6 +99,8 @@ public class Core {
// Entitys
EntityRegistry.registerModEntity(new ResourceLocation("techreborn", "nuke"), EntityNukePrimed.class, "nuke", 0, INSTANCE, 160, 5, true);
//Ore Dictionary
OreDict.init();
proxy.preInit(event);
RecipeConfigManager.load(event.getModConfigurationDirectory());
@ -131,9 +130,6 @@ public class Core {
MinecraftForge.EVENT_BUS.register(new StackWIPHandler());
MinecraftForge.EVENT_BUS.register(new BlockBreakHandler());
//Ore Dictionary
OreDict.init();
// Recipes
StopWatch watch = new StopWatch();
watch.start();

View file

@ -3,9 +3,13 @@ package techreborn.client;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.item.Item;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.ModelLoader;
import techreborn.init.ModBlocks;
import techreborn.init.ModItems;
import techreborn.items.ItemGems;
import techreborn.items.ItemIngots;
import techreborn.items.ItemPlates;
public class RegisterItemJsons {
public static void registerModels() {
@ -34,6 +38,21 @@ public class RegisterItemJsons {
register(ModItems.steelJackhammer, "tool/steel_jackhammer");
register(ModItems.diamondJackhammer, "tool/diamond_jackhammer");
register(ModItems.advancedJackhammer, "tool/advanced_jackhammer");
for (int i = 0; i < ItemIngots.types.length; ++i) {
String[] name = ItemIngots.types.clone();
registerBlockstate(ModItems.ingots, i, name[i]);
}
for (int i = 0; i < ItemGems.types.length; ++i) {
String[] name = ItemGems.types.clone();
registerBlockstate(ModItems.gems, i, name[i]);
}
for (int i = 0; i < ItemPlates.types.length; ++i) {
String[] name = ItemPlates.types.clone();
registerBlockstate(ModItems.plate, i, name[i]);
}
}
private static void registerBlocks() {
@ -56,4 +75,9 @@ public class RegisterItemJsons {
private static void register(Block block, String name) {
register(Item.getItemFromBlock(block), 0, name);
}
private static void registerBlockstate(Item i, int meta, String variant) {
ResourceLocation loc = i.getRegistryName();
ModelLoader.setCustomModelResourceLocation(i, meta, new ModelResourceLocation(loc, "type=" + variant));
}
}

View file

@ -354,8 +354,8 @@ public class ModRecipes {
}
private static void addCompressorRecipes() {
RecipeHandler.addRecipe(new CompressorRecipe(ItemIngots.getIngotByName("advancedAlloy"),
ItemPlates.getPlateByName("advancedAlloy"), 400, 20));
RecipeHandler.addRecipe(new CompressorRecipe(ItemIngots.getIngotByName("advanced_alloy"),
ItemPlates.getPlateByName("advanced_alloy"), 400, 20));
RecipeHandler.addRecipe(
new CompressorRecipe(ItemParts.getPartByName("carbonmesh"), ItemPlates.getPlateByName("carbon"), 400,
2));
@ -488,7 +488,7 @@ public class ModRecipes {
.addShapedOreRecipe(ItemCells.getCellByName("empty", 16, false), " T ", "T T", " T ", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ironFence, 6), " ", "RRR", "RRR", 'R',
ItemIngots.getIngotByName("refinedIron"));
ItemIngots.getIngotByName("refined_iron"));
if (ConfigTechReborn.enableGemArmorAndTools) {
addGemToolRecipes(new ItemStack(ModItems.rubySword), new ItemStack(ModItems.rubyPickaxe),
@ -551,7 +551,7 @@ public class ModRecipes {
"ingotAluminum", 'G', Blocks.GLASS_PANE);
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.reinforcedglass, 7), "GAG", "GGG", "GAG", 'A',
ItemIngots.getIngotByName("advancedAlloy"), 'G', Blocks.GLASS);
ItemIngots.getIngotByName("advanced_alloy"), 'G', Blocks.GLASS);
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.windMill, 2), "IXI", "XGX", "IXI", 'I', "ingotIron", 'G',
@ -572,7 +572,7 @@ public class ModRecipes {
"ingotCopper", 'W', ItemStandaloneCables.getCableByName("insulatedcopper"));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.machineCasing, 4, 0), "RRR", "CAC", "RRR", 'R',
ItemIngots.getIngotByName("refinedIron"), 'C', "circuitBasic", 'A',
ItemIngots.getIngotByName("refined_iron"), 'C', "circuitBasic", 'A',
BlockMachineFrame.getFrameByName("machine", 1));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.machineCasing, 4, 1), "RRR", "CAC", "RRR", 'R',
@ -605,123 +605,123 @@ public class ModRecipes {
'O', BlockMachineFrame.getFrameByName("advancedMachine", 1));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.industrialElectrolyzer), "RER", "CEC", "RER", 'R',
ItemIngots.getIngotByName("refinediron"), 'E', new ItemStack(ModBlocks.extractor), 'C',
ItemIngots.getIngotByName("refined_iron"), 'E', new ItemStack(ModBlocks.extractor), 'C',
"circuitAdvanced");
// Mixed Metal Ingot Recipes :P
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 2), "RRR", "BBB", "TTT", 'R',
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 2), "RRR", "BBB", "TTT", 'R',
"ingotRefinedIron", 'B', "ingotBronze", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 2), "RRR", "BBB", "TTT", 'R',
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 2), "RRR", "BBB", "TTT", 'R',
"ingotRefinedIron", 'B', "ingotBronze", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 2), "RRR", "BBB", "TTT", 'R',
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 2), "RRR", "BBB", "TTT", 'R',
"ingotRefinedIron", 'B', "ingotBrass", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 2), "RRR", "BBB", "TTT", 'R',
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 2), "RRR", "BBB", "TTT", 'R',
"ingotRefinedIron", 'B', "ingotBrass", 'T', "ingotZinc");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel",
.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel",
'B', "ingotBronze", 'T', "ingotTin");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel",
.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel",
'B', "ingotBronze", 'T', "ingotZinc");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel",
.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel",
'B', "ingotBrass", 'T', "ingotTin");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel",
.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel",
'B', "ingotBrass", 'T', "ingotZinc");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 4), "RRR", "BBB", "TTT", 'R', "ingotNickel",
.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotNickel",
'B', "ingotBronze", 'T', "ingotAluminum");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 4), "RRR", "BBB", "TTT", 'R', "ingotNickel",
.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotNickel",
'B', "ingotBrass", 'T', "ingotAluminum");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar",
.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar",
'B', "ingotBronze", 'T', "ingotTin");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar",
.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar",
'B', "ingotBronze", 'T', "ingotZinc");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar",
.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar",
'B', "ingotBrass", 'T', "ingotTin");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar",
.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar",
'B', "ingotBrass", 'T', "ingotZinc");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R', "ingotInvar",
.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R', "ingotInvar",
'B', "ingotBronze", 'T', "ingotAluminum");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R', "ingotInvar",
.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R', "ingotInvar",
'B', "ingotBrass", 'T', "ingotAluminum");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R',
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTitanium", 'B', "ingotBronze", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R',
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTitanium", 'B', "ingotBronze", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R',
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTitanium", 'B', "ingotBrass", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R',
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTitanium", 'B', "ingotBrass", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 6), "RRR", "BBB", "TTT", 'R',
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 6), "RRR", "BBB", "TTT", 'R',
"ingotTitanium", 'B', "ingotBronze", 'T', "ingotAluminum");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 6), "RRR", "BBB", "TTT", 'R',
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 6), "RRR", "BBB", "TTT", 'R',
"ingotTitanium", 'B', "ingotBrass", 'T', "ingotAluminum");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R',
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTungsten", 'B', "ingotBronze", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R',
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTungsten", 'B', "ingotBronze", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R',
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTungsten", 'B', "ingotBrass", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R',
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTungsten", 'B', "ingotBrass", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 6), "RRR", "BBB", "TTT", 'R',
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 6), "RRR", "BBB", "TTT", 'R',
"ingotTungsten", 'B', "ingotBronze", 'T', "ingotAluminum");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 6), "RRR", "BBB", "TTT", 'R',
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 6), "RRR", "BBB", "TTT", 'R',
"ingotTungsten", 'B', "ingotBrass", 'T', "ingotAluminum");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 8), "RRR", "BBB", "TTT", 'R',
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 8), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBronze", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 8), "RRR", "BBB", "TTT", 'R',
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 8), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBronze", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 8), "RRR", "BBB", "TTT", 'R',
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 8), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBrass", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 8), "RRR", "BBB", "TTT", 'R',
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 8), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBrass", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 9), "RRR", "BBB", "TTT", 'R',
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 9), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBronze", 'T', "ingotAluminum");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 9), "RRR", "BBB", "TTT", 'R',
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 9), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBrass", 'T', "ingotAluminum");
CraftingHelper
@ -770,11 +770,11 @@ public class ModRecipes {
BlockMachineFrame.getFrameByName("machine", 1), Blocks.FURNACE);
CraftingHelper.addShapedOreRecipe(BlockMachineFrame.getFrameByName("machine", 1), "AAA", "AXA", "AAA", 'A',
ItemIngots.getIngotByName("refinediron"));
ItemIngots.getIngotByName("refined_iron"));
CraftingHelper
.addShapedOreRecipe(BlockMachineFrame.getFrameByName("advancedMachine", 1), "XCX", "AMA", "XCX", 'A',
ItemIngots.getIngotByName("advancedAlloy"), 'C', ItemPlates.getPlateByName("carbon"), 'M',
ItemIngots.getIngotByName("advanced_alloy"), 'C', ItemPlates.getPlateByName("carbon"), 'M',
BlockMachineFrame.getFrameByName("machine", 1));
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("dataStorageCircuit", 8), "EEE", "ECE", "EEE", 'E',
@ -1011,7 +1011,7 @@ public class ModRecipes {
.addRollingOreMachinceRecipe(ItemParts.getPartByName("cupronickelHeatingCoil", 3), "NCN", "C C", "NCN",
'N', "ingotNickel", 'C', "ingotCopper");
RecipeHandler.addRecipe(new VacuumFreezerRecipe(ItemIngots.getIngotByName("hotTungstensteel"),
RecipeHandler.addRecipe(new VacuumFreezerRecipe(ItemIngots.getIngotByName("hot_tungstensteel"),
ItemIngots.getIngotByName("tungstensteel"), 440, 128));
RecipeHandler.addRecipe(new VacuumFreezerRecipe(ItemCells.getCellByName("heliumplasma"),
@ -1030,7 +1030,7 @@ public class ModRecipes {
));
RecipeHandler.addRecipe(new VacuumFreezerRecipe(
ItemIngots.getIngotByName("hotTungstensteel"),
ItemIngots.getIngotByName("hot_tungstensteel"),
ItemIngots.getIngotByName("tungstensteel"),
440, 120));
@ -1050,14 +1050,14 @@ public class ModRecipes {
CraftingHelper.addSmelting(ItemDusts.getDustByName("iron", 1), new ItemStack(Items.IRON_INGOT), 1F);
CraftingHelper.addSmelting(ItemDusts.getDustByName("gold", 1), new ItemStack(Items.GOLD_INGOT), 1F);
CraftingHelper.addSmelting(ItemParts.getPartByName("rubberSap"), ItemParts.getPartByName("rubber"), 1F);
CraftingHelper.addSmelting(new ItemStack(Items.IRON_INGOT), ItemIngots.getIngotByName("refinediron"), 1F);
CraftingHelper.addSmelting(new ItemStack(Items.IRON_INGOT), ItemIngots.getIngotByName("refined_iron"), 1F);
CraftingHelper.addSmelting(BlockOre2.getOreByName("copper"), ItemIngots.getIngotByName("copper"), 1F);
CraftingHelper.addSmelting(BlockOre2.getOreByName("tin"), ItemIngots.getIngotByName("tin"), 1F);
CraftingHelper.addSmelting(BlockOre.getOreByName("Silver"), ItemIngots.getIngotByName("silver"), 1F);
CraftingHelper.addSmelting(BlockOre.getOreByName("Lead"), ItemIngots.getIngotByName("lead"), 1F);
CraftingHelper.addSmelting(BlockOre.getOreByName("Sheldonite"), ItemIngots.getIngotByName("platinum"), 1F);
CraftingHelper
.addSmelting(ItemIngots.getIngotByName("mixedMetal"), ItemIngots.getIngotByName("advancedAlloy"), 1F);
.addSmelting(ItemIngots.getIngotByName("mixed_metal"), ItemIngots.getIngotByName("advanced_alloy"), 1F);
CraftingHelper.addSmelting(ItemDusts.getDustByName("nickel", 1), ItemIngots.getIngotByName("nickel"), 1F);
CraftingHelper.addSmelting(ItemDusts.getDustByName("platinum", 1), ItemIngots.getIngotByName("platinum"), 1F);
CraftingHelper.addSmelting(ItemDusts.getDustByName("zinc", 1), ItemIngots.getIngotByName("zinc"), 1F);
@ -1304,7 +1304,7 @@ public class ModRecipes {
RecipeHandler.addRecipe(
new BlastFurnaceRecipe(ItemIngots.getIngotByName("tungsten"), ItemIngots.getIngotByName("steel"),
ItemIngots.getIngotByName("hotTungstensteel"), ItemDusts.getDustByName("darkAshes", 4), 500,
ItemIngots.getIngotByName("hot_tungstensteel"), ItemDusts.getDustByName("darkAshes", 4), 500,
500, 3000));
RecipeHandler.addRecipe(
@ -1978,7 +1978,7 @@ public class ModRecipes {
}
static void addIc2Recipes() {
CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.manual), ItemIngots.getIngotByName("refinedIron"),
CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.manual), ItemIngots.getIngotByName("refined_iron"),
Items.BOOK);
CraftingHelper
@ -1997,7 +1997,7 @@ public class ModRecipes {
"lapotronCrystal", 'P', "plateIridium");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.industrialSawmill), "PAP", "SSS", "ACA", 'P',
ItemIngots.getIngotByName("refinedIron"), 'A', "circuitAdvanced",
ItemIngots.getIngotByName("refined_iron"), 'A', "circuitAdvanced",
'S', ItemParts.getPartByName("diamondSawBlade"), 'C',
"machineBlockAdvanced");
@ -2079,7 +2079,7 @@ public class ModRecipes {
'G', ModBlocks.grinder);
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.implosionCompressor), "ABA", "CPC", "ABA", 'A',
ItemIngots.getIngotByName("advancedAlloy"), 'C', "circuitAdvanced", 'B',
ItemIngots.getIngotByName("advanced_alloy"), 'C', "circuitAdvanced", 'B',
BlockMachineFrame.getFrameByName("advancedMachine", 1), 'P', ModBlocks.compressor);
CraftingHelper
@ -2093,7 +2093,7 @@ public class ModRecipes {
ModBlocks.extractor);
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.alloyFurnace), "III", "F F", "III", 'I',
ItemIngots.getIngotByName("refinediron"), 'F', new ItemStack(ModBlocks.ironFurnace));
ItemIngots.getIngotByName("refined_iron"), 'F', new ItemStack(ModBlocks.ironFurnace));
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.chemicalReactor), "IMI", "CPC", "IEI", 'I', "ingotInvar",
@ -2850,7 +2850,7 @@ public class ModRecipes {
// Implosion compressor
RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemIngots.getIngotByName("iridiumAlloy"),
RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemIngots.getIngotByName("iridium_alloy"),
new ItemStack(Blocks.TNT, 8),
OreDictionary.getOres("plateIridium").get(0).copy(), ItemDusts.getDustByName("darkAshes", 4), 20, 30));
RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("diamond", 4),
@ -2868,10 +2868,10 @@ public class ModRecipes {
ItemGems.getGemByName("ruby", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30));
RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("yellowGarnet", 4),
new ItemStack(Blocks.TNT, 24),
ItemGems.getGemByName("yellowGarnet", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30));
ItemGems.getGemByName("yellow_garnet", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30));
RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("redGarnet", 4),
new ItemStack(Blocks.TNT, 24),
ItemGems.getGemByName("redGarnet", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30));
ItemGems.getGemByName("red_garnet", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30));
RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("peridot", 4),
new ItemStack(Blocks.TNT, 24),
ItemGems.getGemByName("peridot", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30));
@ -3173,7 +3173,7 @@ public class ModRecipes {
"ic2Generator", 'C',
"circuitBasic");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("iridiumAlloy"), "IAI", "ADA", "IAI", 'I',
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("iridium_alloy"), "IAI", "ADA", "IAI", 'I',
"ingotIridium", 'D', ItemDusts.getDustByName("diamond"), 'A',
"plateAdvancedAlloy");

View file

@ -1,5 +1,6 @@
package techreborn.init;
import com.google.common.base.CaseFormat;
import com.google.common.collect.ImmutableList;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@ -16,8 +17,8 @@ public class OreDict {
private static final ImmutableList<String> plateGenIgnores = ImmutableList.of(
"hot", //Hot ingots
"mixedMetal", //Mixed metal has own version of plate
"iridiumAlloy", //Iridium alloy is plate itself
"mixed_metal", //Mixed metal has own version of plate
"iridium_alloy", //Iridium alloy is plate itself
ModItems.META_PLACEHOLDER //...
);
@ -81,22 +82,20 @@ public class OreDict {
for (String type : ItemGems.types) {
if (type.equals(ModItems.META_PLACEHOLDER))
continue; //Aware of placeholders!
String upper = OreDictUtils.toFirstUpper(type);
OreDictionary.registerOre("gem" + upper, ItemGems.getGemByName(type));
OreDictionary.registerOre("gem" + CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, type), ItemGems.getGemByName(type));
boolean ignoreIt = false;
for (String ignore : plateGenIgnores)
if (type.startsWith(ignore))
ignoreIt = true;
if (!ignoreIt)
ItemPlates.registerType(upper);
ItemPlates.registerType(type);
}
//Ingots registration
for (String type : ItemIngots.types) {
if (type.equals(ModItems.META_PLACEHOLDER))
continue; //Aware of placeholders!
String upperName = OreDictUtils.toFirstUpper(type);
OreDictionary.registerOre("ingot" + upperName, ItemIngots.getIngotByName(type));
OreDictionary.registerOre("ingot" + CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, type), ItemIngots.getIngotByName(type));
boolean ignoreIt = false;
for (String ignore : plateGenIgnores)
if (type.startsWith(ignore))

View file

@ -6,13 +6,12 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
import java.security.InvalidParameterException;
public class ItemGems extends ItemTextureBase {
public class ItemGems extends ItemTRNoDestroy {
public static final String[] types = new String[] { "ruby", "sapphire", "peridot", "redGarnet", "yellowGarnet" };
public static final String[] types = new String[] { "ruby", "sapphire", "peridot", "red_garnet", "yellow_garnet" };
public ItemGems() {
setCreativeTab(TechRebornCreativeTabMisc.instance);
@ -51,14 +50,4 @@ public class ItemGems extends ItemTextureBase {
}
}
@Override
public String getTextureName(int damage) {
return ModInfo.MOD_ID + ":items/gem/" + types[damage];
}
@Override
public int getMaxMeta() {
return types.length;
}
}

View file

@ -6,15 +6,14 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
import java.security.InvalidParameterException;
public class ItemIngots extends ItemTextureBase {
public class ItemIngots extends ItemTRNoDestroy {
public static final String[] types = new String[] { "aluminum", "brass", "bronze", "chrome", "copper", "electrum",
"invar", "iridium", "lead", "nickel", "platinum", "silver", "steel", "tin", "titanium", "tungsten",
"hotTungstensteel", "tungstensteel", "zinc", "refinedIron", "advancedAlloy", "mixedMetal",
"iridiumAlloy"};
"hot_tungstensteel", "tungstensteel", "zinc", "refined_iron", "advanced_alloy", "mixed_metal",
"iridium_alloy" };
public ItemIngots() {
setCreativeTab(TechRebornCreativeTabMisc.instance);
@ -54,15 +53,4 @@ public class ItemIngots extends ItemTextureBase {
}
}
}
@Override
public String getTextureName(int damage) {
return ModInfo.MOD_ID + ":items/ingot/" + types[damage] + "Ingot";
}
@Override
public int getMaxMeta() {
return types.length;
}
}

View file

@ -1,5 +1,6 @@
package techreborn.items;
import com.google.common.base.CaseFormat;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@ -7,12 +8,10 @@ import net.minecraft.util.NonNullList;
import net.minecraftforge.oredict.OreDictionary;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
import techreborn.utils.OreDictUtils;
import java.security.InvalidParameterException;
public class ItemPlates extends ItemTextureBase {
public class ItemPlates extends ItemTRNoDestroy {
//Vanilla plates or plates not from ingots or gems
public static String[] types = new String[] {
@ -38,6 +37,20 @@ public class ItemPlates extends ItemTextureBase {
return getPlateByName(name, 1);
}
public static void registerType(String plateType) {
for (String type : types) {
if (type.equals(plateType))
return;
}
int plateIndex = types.length;
String[] newTypes = new String[plateIndex + 1];
System.arraycopy(types, 0, newTypes, 0, types.length);
types = newTypes;
newTypes[plateIndex] = plateType;
String oreName = "plate" + CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, plateType);
OreDictionary.registerOre(oreName, new ItemStack(ModItems.plate, 1, plateIndex));
}
@Override
// gets Unlocalized Name depending on meta data
public String getUnlocalizedName(ItemStack itemStack) {
@ -55,29 +68,4 @@ public class ItemPlates extends ItemTextureBase {
list.add(new ItemStack(item, 1, meta));
}
}
public static void registerType(String plateType) {
for (String type : types) {
if (type.equals(plateType))
return;
}
int plateIndex = types.length;
String[] newTypes = new String[plateIndex + 1];
System.arraycopy(types, 0, newTypes, 0, types.length);
types = newTypes;
newTypes[plateIndex] = plateType;
String oreName = "plate" + OreDictUtils.toFirstUpper(plateType);
OreDictionary.registerOre(oreName, new ItemStack(ModItems.plate, 1, plateIndex));
}
@Override
public String getTextureName(int damage) {
return ModInfo.MOD_ID + ":items/plate/" + types[damage] + "Plate";
}
@Override
public int getMaxMeta() {
return types.length;
}
}