From 0669f5eb9d5029a8b94ec552171b0837605f7747 Mon Sep 17 00:00:00 2001 From: draknyte1 Date: Fri, 4 Nov 2016 15:23:26 +1000 Subject: $ Cleaned up the entire project. > Much neat, very nices. --- .../registration/gregtech/Gregtech4Content.java | 46 +- .../registration/gregtech/GregtechConduits.java | 564 ++++++++++++--------- .../registration/gregtech/GregtechDehydrator.java | 123 ++--- .../gregtech/GregtechEnergyBuffer.java | 199 +++++--- .../GregtechGeothermalThermalGenerator.java | 76 +-- .../gregtech/GregtechIndustrialBlastSmelter.java | 19 +- .../gregtech/GregtechIndustrialCentrifuge.java | 22 +- .../gregtech/GregtechIndustrialCokeOven.java | 22 +- .../gregtech/GregtechIndustrialElectrolyzer.java | 22 +- .../gregtech/GregtechIndustrialMacerator.java | 22 +- .../gregtech/GregtechIndustrialMassFabricator.java | 22 +- .../gregtech/GregtechIndustrialMultiTank.java | 26 +- .../gregtech/GregtechIndustrialPlatePress.java | 22 +- .../gregtech/GregtechIndustrialWiremill.java | 22 +- .../gregtech/GregtechIronBlastFurnace.java | 18 +- .../registration/gregtech/GregtechLFTR.java | 23 +- .../gregtech/GregtechPowerSubStation.java | 22 +- .../gregtech/GregtechRocketFuelGenerator.java | 76 +-- .../registration/gregtech/GregtechSafeBlock.java | 149 ++++-- .../gregtech/GregtechSolarGenerators.java | 52 +- .../gregtech/GregtechSteamCondenser.java | 22 +- .../gregtech/GregtechSuperConductionPoint.java | 22 +- .../gregtech/GregtechTieredFluidTanks.java | 54 +- 23 files changed, 923 insertions(+), 722 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/registration') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java index 0b71b612f4..332eca6a4f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java @@ -6,30 +6,36 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator; import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal; -public class Gregtech4Content -{ +public class Gregtech4Content { - //ID Range 828, 829, 833 - 850 - - public static void run() - { - if (LoadedMods.Gregtech){ - workbenches(); - tesseracts(); + // ID Range 828, 829, 833 - 850 + + public static void run() { + if (LoadedMods.Gregtech) { + Gregtech4Content.workbenches(); + Gregtech4Content.tesseracts(); } } - private static void workbenches(){ - //Gregtech 4 Workbenches - Utils.LOG_INFO("Gregtech 4 Content | Registering Workbenches."); - //Free //GregtechItemList.GT4_Workbench_Bronze.set(new GT_MetaTileEntity_BronzeCraftingTable(828, "workbench.bronze", "Bronze Workbench", 0).getStackForm(1L)); - //Free //GregtechItemList.GT4_Workbench_Advanced.set(new GT_MetaTileEntity_AdvancedCraftingTable(829, "workbench.advanced", "Advanced Workbench", 1).getStackForm(1L)); - } - - private static void tesseracts(){ - //Gregtech 4 Workbenches + private static void tesseracts() { + // Gregtech 4 Workbenches Utils.LOG_INFO("Gregtech 4 Content | Registering Tesseracts."); - GregtechItemList.GT4_Tesseract_Generator.set(new GT_MetaTileEntity_TesseractGenerator(833, "tesseract.generator", "Tesseract Generator", 4).getStackForm(1L)); - GregtechItemList.GT4_Tesseract_Terminal.set(new GT_MetaTileEntity_TesseractTerminal(834, "tesseract.terminal", "Tesseract Terminal", 4).getStackForm(1L)); + GregtechItemList.GT4_Tesseract_Generator + .set(new GT_MetaTileEntity_TesseractGenerator(833, "tesseract.generator", "Tesseract Generator", 4) + .getStackForm(1L)); + GregtechItemList.GT4_Tesseract_Terminal + .set(new GT_MetaTileEntity_TesseractTerminal(834, "tesseract.terminal", "Tesseract Terminal", 4) + .getStackForm(1L)); + } + + private static void workbenches() { + // Gregtech 4 Workbenches + Utils.LOG_INFO("Gregtech 4 Content | Registering Workbenches."); + // Free //GregtechItemList.GT4_Workbench_Bronze.set(new + // GT_MetaTileEntity_BronzeCraftingTable(828, "workbench.bronze", + // "Bronze Workbench", 0).getStackForm(1L)); + // Free //GregtechItemList.GT4_Workbench_Advanced.set(new + // GT_MetaTileEntity_AdvancedCraftingTable(829, "workbench.advanced", + // "Advanced Workbench", 1).getStackForm(1L)); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java index 8d2d15c1ee..8ce163f4d3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java @@ -1,7 +1,5 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.core.lib.LoadedMods.Gregtech; - import java.util.ArrayList; import gregtech.api.enums.*; @@ -21,308 +19,384 @@ import net.minecraftforge.oredict.OreDictionary; public class GregtechConduits { /** - * - * The Voltage Tiers. Use this Array instead of the old named Voltage Variables - * public static final long[] V = new long[] {0=8, 1=32, 2=128, 3=512, 4=2048, 5=8192, 6=32768, 7=131072, 8=524288, 9=Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE}; - * + * + * The Voltage Tiers. Use this Array instead of the old named Voltage + * Variables public static final long[] V = new long[] {0=8, 1=32, 2=128, + * 3=512, 4=2048, 5=8192, 6=32768, 7=131072, 8=524288, 9=Integer.MAX_VALUE, + * Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, + * Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE}; + * */ - private static int BasePipeID = 30700; + private static void generateGTFluidPipes(final Materials material, final int startID, final int transferRatePerSec, + final int heatResistance, final boolean isGasProof) { + final int transferRatePerTick = transferRatePerSec / 20; + final long mass = material.getMass(); + final long voltage = material.mMeltingPoint >= 2800 ? 64 : 16; + GT_OreDictUnificator.registerOre(OrePrefixes.pipeTiny.get(material), + new GT_MetaPipeEntity_Fluid(startID, "GT_Pipe_" + material.mDefaultLocalName + "_Tiny", + "Tiny " + material.mDefaultLocalName + " Fluid Pipe", 0.25F, material, transferRatePerTick * 2, + heatResistance, isGasProof).getStackForm(1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.pipeSmall.get(material), + new GT_MetaPipeEntity_Fluid(startID + 1, "GT_Pipe_" + material.mDefaultLocalName + "_Small", + "Small " + material.mDefaultLocalName + " Fluid Pipe", 0.375F, material, + transferRatePerTick * 4, heatResistance, isGasProof).getStackForm(1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.pipeMedium.get(material), + new GT_MetaPipeEntity_Fluid(startID + 2, "GT_Pipe_" + material.mDefaultLocalName + "", + "" + material.mDefaultLocalName + " Fluid Pipe", 0.5F, material, transferRatePerTick * 6, + heatResistance, isGasProof).getStackForm(1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.pipeLarge.get(material), + new GT_MetaPipeEntity_Fluid(startID + 3, "GT_Pipe_" + material.mDefaultLocalName + "_Large", + "Large " + material.mDefaultLocalName + " Fluid Pipe", 0.75F, material, transferRatePerTick * 8, + heatResistance, isGasProof).getStackForm(1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.pipeHuge.get(material), + new GT_MetaPipeEntity_Fluid(startID + 4, "GT_Pipe_" + material.mDefaultLocalName + "_Huge", + "Huge " + material.mDefaultLocalName + " Fluid Pipe", 1.0F, material, transferRatePerTick * 10, + heatResistance, isGasProof).getStackForm(1L)); + GregtechConduits.generatePipeRecipes(material.mDefaultLocalName, mass, voltage); + } + + private static void generateNonGTFluidPipes(final GT_Materials material, final Material myMaterial, + final int startID, final int transferRatePerSec, final int heatResistance, final boolean isGasProof) { + final int transferRatePerTick = transferRatePerSec / 20; + long mass; + long voltage; + if (myMaterial != null) { + mass = myMaterial.getMass(); + voltage = myMaterial.vVoltageMultiplier; + if (myMaterial.getLocalizedName().equals(ALLOY.POTIN.getLocalizedName())) { + voltage = 4; + } + } + else { + mass = ELEMENT.getInstance().IRON.getMass(); + voltage = 8; + } + + GT_OreDictUnificator.registerOre(OrePrefixes.pipeTiny.get(material), + new GregtechMetaPipeEntityFluid(startID, "GT_Pipe_" + material.mDefaultLocalName + "_Tiny", + "Tiny " + material.mDefaultLocalName + " Fluid Pipe", 0.25F, material, transferRatePerTick * 2, + heatResistance, isGasProof).getStackForm(1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.pipeSmall.get(material), + new GregtechMetaPipeEntityFluid(startID + 1, "GT_Pipe_" + material.mDefaultLocalName + "_Small", + "Small " + material.mDefaultLocalName + " Fluid Pipe", 0.375F, material, + transferRatePerTick * 4, heatResistance, isGasProof).getStackForm(1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.pipeMedium.get(material), + new GregtechMetaPipeEntityFluid(startID + 2, "GT_Pipe_" + material.mDefaultLocalName + "", + "" + material.mDefaultLocalName + " Fluid Pipe", 0.5F, material, transferRatePerTick * 6, + heatResistance, isGasProof).getStackForm(1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.pipeLarge.get(material), + new GregtechMetaPipeEntityFluid(startID + 3, "GT_Pipe_" + material.mDefaultLocalName + "_Large", + "Large " + material.mDefaultLocalName + " Fluid Pipe", 0.75F, material, transferRatePerTick * 8, + heatResistance, isGasProof).getStackForm(1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.pipeHuge.get(material), + new GregtechMetaPipeEntityFluid(startID + 4, "GT_Pipe_" + material.mDefaultLocalName + "_Huge", + "Huge " + material.mDefaultLocalName + " Fluid Pipe", 1.0F, material, transferRatePerTick * 10, + heatResistance, isGasProof).getStackForm(1L)); + GregtechConduits.generatePipeRecipes(material.mDefaultLocalName, mass, voltage); + + } + + private static void generatePipeRecipes(final String materialName, final long Mass, final long vMulti) { - public static void run() - { - if (Gregtech){ + String output = materialName.substring(0, 1).toUpperCase() + materialName.substring(1); + output = output.replace("-", "").replace("_", "").replace(" ", ""); + + if (output.equals("VoidMetal")) { + output = "Void"; + } + + Utils.LOG_INFO("Generating " + output + " pipes & respective recipes."); + + final ItemStack pipeIngot = ItemUtils.getItemStackOfAmountFromOreDict("ingot" + output, 1).copy(); + final ItemStack pipePlate = ItemUtils.getItemStackOfAmountFromOreDict("plate" + output, 1).copy(); + + // Check all pipes are not null + Utils.LOG_INFO("Generated pipeTiny from " + materialName + "? " + + (ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Tiny" + output, 1) != null ? true : false)); + Utils.LOG_INFO("Generated pipeSmall from " + materialName + "? " + + (ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Small" + output, 1) != null ? true : false)); + Utils.LOG_INFO("Generated pipeNormal from " + materialName + "? " + + (ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Medium" + output, 1) != null ? true : false)); + Utils.LOG_INFO("Generated pipeLarge from " + materialName + "? " + + (ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Large" + output, 1) != null ? true : false)); + Utils.LOG_INFO("Generated pipeHuge from " + materialName + "? " + + (ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Huge" + output, 1) != null ? true : false)); + + int eut = 128; + int time = 0; + final int bonusMulti = 5 * 20; + + time = (int) Math.max(Mass * 8L, 1); + eut = (int) (10 * vMulti); + + // Add the Three Shaped Recipes First + RecipeUtils.recipeBuilder(pipePlate, "craftingToolWrench", pipePlate, pipePlate, null, pipePlate, pipePlate, + "craftingToolHardHammer", pipePlate, + ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Small" + output, 6)); + + RecipeUtils.recipeBuilder(pipePlate, pipePlate, pipePlate, "craftingToolWrench", null, "craftingToolHardHammer", + pipePlate, pipePlate, pipePlate, + ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Medium" + output, 2)); + + RecipeUtils.recipeBuilder(pipePlate, "craftingToolHardHammer", pipePlate, pipePlate, null, pipePlate, pipePlate, + "craftingToolWrench", pipePlate, + ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Large" + output, 1)); + + GT_Values.RA.addExtruderRecipe(ItemUtils.getSimpleStack(pipeIngot, 1), ItemList.Shape_Extruder_Pipe_Tiny.get(0), + ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Tiny" + output, 2), time, eut); + + GT_Values.RA.addExtruderRecipe(ItemUtils.getSimpleStack(pipeIngot, 1), + ItemList.Shape_Extruder_Pipe_Small.get(0), + ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Small" + output, 1), time += bonusMulti, eut); + + GT_Values.RA.addExtruderRecipe(ItemUtils.getSimpleStack(pipeIngot, 3), + ItemList.Shape_Extruder_Pipe_Medium.get(0), + ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Medium" + output, 1), time += bonusMulti, eut); + + GT_Values.RA.addExtruderRecipe(ItemUtils.getSimpleStack(pipeIngot, 6), + ItemList.Shape_Extruder_Pipe_Large.get(0), + ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Large" + output, 1), time += bonusMulti, eut); + + GT_Values.RA.addExtruderRecipe(ItemUtils.getSimpleStack(pipeIngot, 12), + ItemList.Shape_Extruder_Pipe_Huge.get(0), + ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Huge" + output, 1), time += bonusMulti, eut); + + if (eut < 512 && !output.equals("Void")) { + final ItemStack pipePlateDouble = ItemUtils.getItemStackOfAmountFromOreDict("plateDouble" + output, 1) + .copy(); + if (pipePlateDouble != null) { + RecipeUtils.recipeBuilder(pipePlateDouble, "craftingToolHardHammer", pipePlateDouble, pipePlateDouble, + null, pipePlateDouble, pipePlateDouble, "craftingToolWrench", pipePlateDouble, + ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Huge" + output, 1)); + } + else { + Utils.LOG_INFO("Failed to add a recipe for " + materialName + + " Huge pipes. Double plates probably do not exist."); + } + } + + } + + private static ItemStack getOredictStack(final String oredictName, final int amount) { + final ArrayList oreDictList = OreDictionary.getOres(oredictName); + if (!oreDictList.isEmpty()) { + final ItemStack returnValue = oreDictList.get(0).copy(); + returnValue.stackSize = amount; + return returnValue; + } + return ItemUtils.getSimpleStack(ModItems.AAA_Broken, amount); + } + + private static void makeSuperConductors(final GT_Materials aMaterial, final int aStartID, final long aLossInsulated, + final long aLoss, final long aAmperage, final long aVoltage, final boolean aInsulatable, + final boolean aAutoInsulated) { + Utils.LOG_WARNING("Gregtech5u Content | Registered " + aMaterial.name() + " as a new Super Conductor."); + GregtechConduits.registerOre(GregtechOrePrefixes.type2, aMaterial, + new GregtechMetaPipeEntity_SuperConductor(aStartID + 5, + "wire." + aMaterial.name().toLowerCase() + ".16", + "16x " + aMaterial.mDefaultLocalName + " Wire", 1.0F, aMaterial, aLoss, 16L * aAmperage, + aVoltage, false, !aAutoInsulated).getStackForm(1L)); + + } + + private static void makeWires(final Materials aMaterial, final int aStartID, final long aLossInsulated, + final long aLoss, final long aAmperage, final long aVoltage, final boolean aInsulatable, + final boolean aAutoInsulated) { + Utils.LOG_WARNING( + "Gregtech5u Content | Registered " + aMaterial.name() + " as a new material for Wire & Cable."); + GT_OreDictUnificator.registerOre(OrePrefixes.wireGt01, aMaterial, + new GregtechMetaPipeEntity_Cable(aStartID + 0, "wire." + aMaterial.name().toLowerCase() + ".01", + "1x " + aMaterial.mDefaultLocalName + " Wire", 0.125F, aMaterial, aLoss, 1L * aAmperage, + aVoltage, false, !aAutoInsulated).getStackForm(1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.wireGt02, aMaterial, + new GregtechMetaPipeEntity_Cable(aStartID + 1, "wire." + aMaterial.name().toLowerCase() + ".02", + "2x " + aMaterial.mDefaultLocalName + " Wire", 0.25F, aMaterial, aLoss, 2L * aAmperage, + aVoltage, false, !aAutoInsulated).getStackForm(1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.wireGt04, aMaterial, + new GregtechMetaPipeEntity_Cable(aStartID + 2, "wire." + aMaterial.name().toLowerCase() + ".04", + "4x " + aMaterial.mDefaultLocalName + " Wire", 0.375F, aMaterial, aLoss, 4L * aAmperage, + aVoltage, false, !aAutoInsulated).getStackForm(1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.wireGt08, aMaterial, + new GregtechMetaPipeEntity_Cable(aStartID + 3, "wire." + aMaterial.name().toLowerCase() + ".08", + "8x " + aMaterial.mDefaultLocalName + " Wire", 0.5F, aMaterial, aLoss, 8L * aAmperage, aVoltage, + false, !aAutoInsulated).getStackForm(1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.wireGt12, aMaterial, + new GregtechMetaPipeEntity_Cable(aStartID + 4, "wire." + aMaterial.name().toLowerCase() + ".12", + "12x " + aMaterial.mDefaultLocalName + " Wire", 0.75F, aMaterial, aLoss, 12L * aAmperage, + aVoltage, false, !aAutoInsulated).getStackForm(1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.wireGt16, aMaterial, + new GregtechMetaPipeEntity_Cable(aStartID + 5, "wire." + aMaterial.name().toLowerCase() + ".16", + "16x " + aMaterial.mDefaultLocalName + " Wire", 1.0F, aMaterial, aLoss, 16L * aAmperage, + aVoltage, false, !aAutoInsulated).getStackForm(1L)); + if (aInsulatable) { + GT_OreDictUnificator.registerOre(OrePrefixes.cableGt01, aMaterial, + new GregtechMetaPipeEntity_Cable(aStartID + 6, "cable." + aMaterial.name().toLowerCase() + ".01", + "1x " + aMaterial.mDefaultLocalName + " Cable", 0.25F, aMaterial, aLossInsulated, + 1L * aAmperage, aVoltage, true, false).getStackForm(1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.cableGt02, aMaterial, + new GregtechMetaPipeEntity_Cable(aStartID + 7, "cable." + aMaterial.name().toLowerCase() + ".02", + "2x " + aMaterial.mDefaultLocalName + " Cable", 0.375F, aMaterial, aLossInsulated, + 2L * aAmperage, aVoltage, true, false).getStackForm(1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.cableGt04, aMaterial, + new GregtechMetaPipeEntity_Cable(aStartID + 8, "cable." + aMaterial.name().toLowerCase() + ".04", + "4x " + aMaterial.mDefaultLocalName + " Cable", 0.5F, aMaterial, aLossInsulated, + 4L * aAmperage, aVoltage, true, false).getStackForm(1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.cableGt08, aMaterial, + new GregtechMetaPipeEntity_Cable(aStartID + 9, "cable." + aMaterial.name().toLowerCase() + ".08", + "8x " + aMaterial.mDefaultLocalName + " Cable", 0.75F, aMaterial, aLossInsulated, + 8L * aAmperage, aVoltage, true, false).getStackForm(1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.cableGt12, aMaterial, + new GregtechMetaPipeEntity_Cable(aStartID + 10, "cable." + aMaterial.name().toLowerCase() + ".12", + "12x " + aMaterial.mDefaultLocalName + " Cable", 1.0F, aMaterial, aLossInsulated, + 12L * aAmperage, aVoltage, true, false).getStackForm(1L)); + } + } + + private static boolean registerOre(final GregtechOrePrefixes aPrefix, final Object aMaterial, + final ItemStack aStack) { + return GT_OreDictUnificator.registerOre(aPrefix.get(aMaterial), aStack); + } + + public static void run() { + if (LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Custom Cables/Wires/Pipes."); - run1(); + GregtechConduits.run1(); } } - private static void run1(){ - if (LoadedMods.Big_Reactors){ - wireFactory("Blutonium", 8196, 30600, 8, 32, 2); - wireFactory("Cyanite", 512, 30615, 2, 16, 4); - wireFactory("Yellorium", 2048, 30630, 4, 16, 2); - } - if (LoadedMods.EnderIO){ - wireFactory("RedstoneAlloy", 32, 30645, 1, 4, 1); - } - - superConductorFactory(GT_Materials.Superconductor, 524288, 30660, 0, 0, 8); - if (LoadedMods.Thaumcraft){ - superConductorFactory(GT_Materials.Void, 512, 30661, 0, 0, 8);} - - generateNonGTFluidPipes(GT_Materials.Staballoy, ALLOY.STABALLOY, BasePipeID, 6250, 7500, true); - generateNonGTFluidPipes(GT_Materials.Tantalloy60, ALLOY.TANTALLOY_60, BasePipeID+5, 5000, 4250, true); - generateNonGTFluidPipes(GT_Materials.Tantalloy61, ALLOY.TANTALLOY_61, BasePipeID+10, 6000, 5800, true); - if (LoadedMods.Thaumcraft){ - generateNonGTFluidPipes(GT_Materials.Void, null, BasePipeID+15, 250, 25000, true);} - generateGTFluidPipes(Materials.Europium, BasePipeID+20, 12000, 7500, true); - generateNonGTFluidPipes(GT_Materials.Potin, ALLOY.POTIN, BasePipeID+25, 375, 2000, true); - generateNonGTFluidPipes(GT_Materials.MaragingSteel300, ALLOY.MARAGING300, BasePipeID+30, 7000, 2500, true); - generateNonGTFluidPipes(GT_Materials.MaragingSteel350, ALLOY.MARAGING350, BasePipeID+35, 8000, 2500, true); - generateNonGTFluidPipes(GT_Materials.Inconel690, ALLOY.INCONEL_690, BasePipeID+40, 7500, 4800, true); - generateNonGTFluidPipes(GT_Materials.Inconel792, ALLOY.INCONEL_792, BasePipeID+45, 8000, 5500, true); - generateNonGTFluidPipes(GT_Materials.HastelloyX, ALLOY.HASTELLOY_X, BasePipeID+50, 10000, 4200, true); - - } - - private static void wireFactory(String Material, int Voltage, int ID, long insulatedLoss, long uninsulatedLoss, long Amps){ - Materials T = Materials.valueOf(Material); + private static void run1() { + if (LoadedMods.Big_Reactors) { + GregtechConduits.wireFactory("Blutonium", 8196, 30600, 8, 32, 2); + GregtechConduits.wireFactory("Cyanite", 512, 30615, 2, 16, 4); + GregtechConduits.wireFactory("Yellorium", 2048, 30630, 4, 16, 2); + } + if (LoadedMods.EnderIO) { + GregtechConduits.wireFactory("RedstoneAlloy", 32, 30645, 1, 4, 1); + } + + GregtechConduits.superConductorFactory(GT_Materials.Superconductor, 524288, 30660, 0, 0, 8); + if (LoadedMods.Thaumcraft) { + GregtechConduits.superConductorFactory(GT_Materials.Void, 512, 30661, 0, 0, 8); + } + + GregtechConduits.generateNonGTFluidPipes(GT_Materials.Staballoy, ALLOY.STABALLOY, GregtechConduits.BasePipeID, + 6250, 7500, true); + GregtechConduits.generateNonGTFluidPipes(GT_Materials.Tantalloy60, ALLOY.TANTALLOY_60, + GregtechConduits.BasePipeID + 5, 5000, 4250, true); + GregtechConduits.generateNonGTFluidPipes(GT_Materials.Tantalloy61, ALLOY.TANTALLOY_61, + GregtechConduits.BasePipeID + 10, 6000, 5800, true); + if (LoadedMods.Thaumcraft) { + GregtechConduits.generateNonGTFluidPipes(GT_Materials.Void, null, GregtechConduits.BasePipeID + 15, 250, + 25000, true); + } + GregtechConduits.generateGTFluidPipes(Materials.Europium, GregtechConduits.BasePipeID + 20, 12000, 7500, true); + GregtechConduits.generateNonGTFluidPipes(GT_Materials.Potin, ALLOY.POTIN, GregtechConduits.BasePipeID + 25, 375, + 2000, true); + GregtechConduits.generateNonGTFluidPipes(GT_Materials.MaragingSteel300, ALLOY.MARAGING300, + GregtechConduits.BasePipeID + 30, 7000, 2500, true); + GregtechConduits.generateNonGTFluidPipes(GT_Materials.MaragingSteel350, ALLOY.MARAGING350, + GregtechConduits.BasePipeID + 35, 8000, 2500, true); + GregtechConduits.generateNonGTFluidPipes(GT_Materials.Inconel690, ALLOY.INCONEL_690, + GregtechConduits.BasePipeID + 40, 7500, 4800, true); + GregtechConduits.generateNonGTFluidPipes(GT_Materials.Inconel792, ALLOY.INCONEL_792, + GregtechConduits.BasePipeID + 45, 8000, 5500, true); + GregtechConduits.generateNonGTFluidPipes(GT_Materials.HastelloyX, ALLOY.HASTELLOY_X, + GregtechConduits.BasePipeID + 50, 10000, 4200, true); + + } + + private static void superConductorFactory(final GT_Materials Material, final int Voltage, final int ID, + final long insulatedLoss, final long uninsulatedLoss, final long Amps) { + final GT_Materials T = Material; int V = 0; - if (Voltage == 8){ + if (Voltage == 8) { V = 0; } - else if (Voltage == 32){ + else if (Voltage == 32) { V = 1; } - else if (Voltage == 128){ + else if (Voltage == 128) { V = 2; } - else if (Voltage == 512){ + else if (Voltage == 512) { V = 3; } - else if (Voltage == 2048){ + else if (Voltage == 2048) { V = 4; } - else if (Voltage == 8196){ + else if (Voltage == 8196) { V = 5; } - else if (Voltage == 32768){ + else if (Voltage == 32768) { V = 6; } - else if (Voltage == 131072){ + else if (Voltage == 131072) { V = 7; } - else if (Voltage == 524288){ + else if (Voltage == 524288) { V = 8; } - else if (Voltage == Integer.MAX_VALUE){ + else if (Voltage == Integer.MAX_VALUE) { V = 9; } else { - Utils.LOG_ERROR("Failed to set voltage on "+Material+". Invalid voltage of "+Voltage+"V set."); - Utils.LOG_ERROR(Material+" has defaulted to 8v."); + Utils.LOG_ERROR( + "Failed to set voltage on " + Material.name() + ". Invalid voltage of " + Voltage + "V set."); + Utils.LOG_ERROR(Material.name() + " has defaulted to 8v."); V = 0; } - //makeWires(T, ID, 2L, 4L, 2L, GT_Values.V[V], true, false); - makeWires(T, ID, insulatedLoss, uninsulatedLoss, Amps, GT_Values.V[V], true, false); - //makeWires(T, ID, bEC ? 2L : 2L, bEC ? 4L : 4L, 2L, gregtech.api.enums.GT_Values.V[V], true, false); - } - - private static void makeWires(Materials aMaterial, int aStartID, long aLossInsulated, long aLoss, long aAmperage, long aVoltage, boolean aInsulatable, boolean aAutoInsulated) - { - Utils.LOG_WARNING("Gregtech5u Content | Registered "+aMaterial.name() +" as a new material for Wire & Cable."); - GT_OreDictUnificator.registerOre(OrePrefixes.wireGt01, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 0, "wire." + aMaterial.name().toLowerCase() + ".01", "1x " + aMaterial.mDefaultLocalName + " Wire", 0.125F, aMaterial, aLoss, 1L * aAmperage, aVoltage, false, !aAutoInsulated).getStackForm(1L)); - GT_OreDictUnificator.registerOre(OrePrefixes.wireGt02, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 1, "wire." + aMaterial.name().toLowerCase() + ".02", "2x " + aMaterial.mDefaultLocalName + " Wire", 0.25F, aMaterial, aLoss, 2L * aAmperage, aVoltage, false, !aAutoInsulated).getStackForm(1L)); - GT_OreDictUnificator.registerOre(OrePrefixes.wireGt04, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 2, "wire." + aMaterial.name().toLowerCase() + ".04", "4x " + aMaterial.mDefaultLocalName + " Wire", 0.375F, aMaterial, aLoss, 4L * aAmperage, aVoltage, false, !aAutoInsulated).getStackForm(1L)); - GT_OreDictUnificator.registerOre(OrePrefixes.wireGt08, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 3, "wire." + aMaterial.name().toLowerCase() + ".08", "8x " + aMaterial.mDefaultLocalName + " Wire", 0.5F, aMaterial, aLoss, 8L * aAmperage, aVoltage, false, !aAutoInsulated).getStackForm(1L)); - GT_OreDictUnificator.registerOre(OrePrefixes.wireGt12, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 4, "wire." + aMaterial.name().toLowerCase() + ".12", "12x " + aMaterial.mDefaultLocalName + " Wire", 0.75F, aMaterial, aLoss, 12L * aAmperage, aVoltage, false, !aAutoInsulated).getStackForm(1L)); - GT_OreDictUnificator.registerOre(OrePrefixes.wireGt16, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 5, "wire." + aMaterial.name().toLowerCase() + ".16", "16x " + aMaterial.mDefaultLocalName + " Wire", 1.0F, aMaterial, aLoss, 16L * aAmperage, aVoltage, false, !aAutoInsulated).getStackForm(1L)); - if (aInsulatable) - { - GT_OreDictUnificator.registerOre(OrePrefixes.cableGt01, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 6, "cable." + aMaterial.name().toLowerCase() + ".01", "1x " + aMaterial.mDefaultLocalName + " Cable", 0.25F, aMaterial, aLossInsulated, 1L * aAmperage, aVoltage, true, false).getStackForm(1L)); - GT_OreDictUnificator.registerOre(OrePrefixes.cableGt02, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 7, "cable." + aMaterial.name().toLowerCase() + ".02", "2x " + aMaterial.mDefaultLocalName + " Cable", 0.375F, aMaterial, aLossInsulated, 2L * aAmperage, aVoltage, true, false).getStackForm(1L)); - GT_OreDictUnificator.registerOre(OrePrefixes.cableGt04, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 8, "cable." + aMaterial.name().toLowerCase() + ".04", "4x " + aMaterial.mDefaultLocalName + " Cable", 0.5F, aMaterial, aLossInsulated, 4L * aAmperage, aVoltage, true, false).getStackForm(1L)); - GT_OreDictUnificator.registerOre(OrePrefixes.cableGt08, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 9, "cable." + aMaterial.name().toLowerCase() + ".08", "8x " + aMaterial.mDefaultLocalName + " Cable", 0.75F, aMaterial, aLossInsulated, 8L * aAmperage, aVoltage, true, false).getStackForm(1L)); - GT_OreDictUnificator.registerOre(OrePrefixes.cableGt12, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 10, "cable." + aMaterial.name().toLowerCase() + ".12", "12x " + aMaterial.mDefaultLocalName + " Cable", 1.0F, aMaterial, aLossInsulated, 12L * aAmperage, aVoltage, true, false).getStackForm(1L)); - } + // makeWires(T, ID, 2L, 4L, 2L, GT_Values.V[V], true, false); + GregtechConduits.makeSuperConductors(T, ID, insulatedLoss, uninsulatedLoss, Amps, GT_Values.V[V], true, false); + // makeWires(T, ID, bEC ? 2L : 2L, bEC ? 4L : 4L, 2L, + // gregtech.api.enums.GT_Values.V[V], true, false); } - private static void superConductorFactory(GT_Materials Material, int Voltage, int ID, long insulatedLoss, long uninsulatedLoss, long Amps){ - GT_Materials T = Material; + private static void wireFactory(final String Material, final int Voltage, final int ID, final long insulatedLoss, + final long uninsulatedLoss, final long Amps) { + final Materials T = Materials.valueOf(Material); int V = 0; - if (Voltage == 8){ + if (Voltage == 8) { V = 0; } - else if (Voltage == 32){ + else if (Voltage == 32) { V = 1; } - else if (Voltage == 128){ + else if (Voltage == 128) { V = 2; } - else if (Voltage == 512){ + else if (Voltage == 512) { V = 3; } - else if (Voltage == 2048){ + else if (Voltage == 2048) { V = 4; } - else if (Voltage == 8196){ + else if (Voltage == 8196) { V = 5; } - else if (Voltage == 32768){ + else if (Voltage == 32768) { V = 6; } - else if (Voltage == 131072){ + else if (Voltage == 131072) { V = 7; } - else if (Voltage == 524288){ + else if (Voltage == 524288) { V = 8; } - else if (Voltage == Integer.MAX_VALUE){ + else if (Voltage == Integer.MAX_VALUE) { V = 9; } else { - Utils.LOG_ERROR("Failed to set voltage on "+Material.name()+". Invalid voltage of "+Voltage+"V set."); - Utils.LOG_ERROR(Material.name()+" has defaulted to 8v."); + Utils.LOG_ERROR("Failed to set voltage on " + Material + ". Invalid voltage of " + Voltage + "V set."); + Utils.LOG_ERROR(Material + " has defaulted to 8v."); V = 0; } - //makeWires(T, ID, 2L, 4L, 2L, GT_Values.V[V], true, false); - makeSuperConductors(T, ID, insulatedLoss, uninsulatedLoss, Amps, GT_Values.V[V], true, false); - //makeWires(T, ID, bEC ? 2L : 2L, bEC ? 4L : 4L, 2L, gregtech.api.enums.GT_Values.V[V], true, false); - } - - private static void makeSuperConductors(GT_Materials aMaterial, int aStartID, long aLossInsulated, long aLoss, long aAmperage, long aVoltage, boolean aInsulatable, boolean aAutoInsulated) - { - Utils.LOG_WARNING("Gregtech5u Content | Registered "+aMaterial.name() +" as a new Super Conductor."); - registerOre(GregtechOrePrefixes.type2, aMaterial, new GregtechMetaPipeEntity_SuperConductor(aStartID + 5, "wire." + aMaterial.name().toLowerCase() + ".16", "16x " + aMaterial.mDefaultLocalName + " Wire", 1.0F, aMaterial, aLoss, 16L * aAmperage, aVoltage, false, !aAutoInsulated).getStackForm(1L)); - - } - - private static boolean registerOre(GregtechOrePrefixes aPrefix, Object aMaterial, ItemStack aStack) { - return GT_OreDictUnificator.registerOre(aPrefix.get(aMaterial), aStack); - } - - - private static void generateGTFluidPipes(Materials material, int startID, int transferRatePerSec, int heatResistance, boolean isGasProof){ - int transferRatePerTick = transferRatePerSec/20; - long mass = material.getMass(); - long voltage = material.mMeltingPoint >= 2800 ? 64 : 16; - GT_OreDictUnificator.registerOre(OrePrefixes.pipeTiny.get(material), new GT_MetaPipeEntity_Fluid(startID, "GT_Pipe_"+material.mDefaultLocalName+"_Tiny", "Tiny "+material.mDefaultLocalName+" Fluid Pipe", 0.25F, material, transferRatePerTick*2, heatResistance, isGasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre(OrePrefixes.pipeSmall.get(material), new GT_MetaPipeEntity_Fluid(startID+1, "GT_Pipe_"+material.mDefaultLocalName+"_Small", "Small "+material.mDefaultLocalName+" Fluid Pipe", 0.375F, material, transferRatePerTick*4, heatResistance, isGasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre(OrePrefixes.pipeMedium.get(material), new GT_MetaPipeEntity_Fluid(startID+2, "GT_Pipe_"+material.mDefaultLocalName+"", ""+material.mDefaultLocalName+" Fluid Pipe", 0.5F, material, transferRatePerTick*6, heatResistance, isGasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre(OrePrefixes.pipeLarge.get(material), new GT_MetaPipeEntity_Fluid(startID+3, "GT_Pipe_"+material.mDefaultLocalName+"_Large", "Large "+material.mDefaultLocalName+" Fluid Pipe", 0.75F, material, transferRatePerTick*8, heatResistance, isGasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre(OrePrefixes.pipeHuge.get(material), new GT_MetaPipeEntity_Fluid(startID+4, "GT_Pipe_"+material.mDefaultLocalName+"_Huge", "Huge "+material.mDefaultLocalName+" Fluid Pipe", 1.0F, material, transferRatePerTick*10, heatResistance, isGasProof).getStackForm(1L)); - generatePipeRecipes(material.mDefaultLocalName, mass, voltage); - } - - private static void generateNonGTFluidPipes(GT_Materials material, Material myMaterial, int startID, int transferRatePerSec, int heatResistance, boolean isGasProof){ - int transferRatePerTick = transferRatePerSec/20; - long mass; - long voltage; - if (myMaterial != null){ - mass = myMaterial.getMass(); - voltage = myMaterial.vVoltageMultiplier; - if (myMaterial.getLocalizedName().equals(ALLOY.POTIN.getLocalizedName())){ - voltage = 4; - } - } - else { - mass = ELEMENT.getInstance().IRON.getMass(); - voltage = 8; - } - - GT_OreDictUnificator.registerOre(OrePrefixes.pipeTiny.get(material), new GregtechMetaPipeEntityFluid(startID, "GT_Pipe_"+material.mDefaultLocalName+"_Tiny", "Tiny "+material.mDefaultLocalName+" Fluid Pipe", 0.25F, material, transferRatePerTick*2, heatResistance, isGasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre(OrePrefixes.pipeSmall.get(material), new GregtechMetaPipeEntityFluid(startID+1, "GT_Pipe_"+material.mDefaultLocalName+"_Small", "Small "+material.mDefaultLocalName+" Fluid Pipe", 0.375F, material, transferRatePerTick*4, heatResistance, isGasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre(OrePrefixes.pipeMedium.get(material), new GregtechMetaPipeEntityFluid(startID+2, "GT_Pipe_"+material.mDefaultLocalName+"", ""+material.mDefaultLocalName+" Fluid Pipe", 0.5F, material, transferRatePerTick*6, heatResistance, isGasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre(OrePrefixes.pipeLarge.get(material), new GregtechMetaPipeEntityFluid(startID+3, "GT_Pipe_"+material.mDefaultLocalName+"_Large", "Large "+material.mDefaultLocalName+" Fluid Pipe", 0.75F, material, transferRatePerTick*8, heatResistance, isGasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre(OrePrefixes.pipeHuge.get(material), new GregtechMetaPipeEntityFluid(startID+4, "GT_Pipe_"+material.mDefaultLocalName+"_Huge", "Huge "+material.mDefaultLocalName+" Fluid Pipe", 1.0F, material, transferRatePerTick*10, heatResistance, isGasProof).getStackForm(1L)); - generatePipeRecipes(material.mDefaultLocalName, mass, voltage); - - } - - private static void generatePipeRecipes(String materialName, long Mass, long vMulti){ - - String output = materialName.substring(0, 1).toUpperCase() + materialName.substring(1); - output = output.replace("-", "").replace("_", "").replace(" ", ""); - - if (output.equals("VoidMetal")){ - output = "Void"; - } - - Utils.LOG_INFO("Generating "+output+" pipes & respective recipes."); - - ItemStack pipeIngot = ItemUtils.getItemStackOfAmountFromOreDict("ingot"+output, 1).copy(); - ItemStack pipePlate = ItemUtils.getItemStackOfAmountFromOreDict("plate"+output, 1).copy(); - - //Check all pipes are not null - Utils.LOG_INFO("Generated pipeTiny from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Tiny"+output, 1) != null) ? true : false)); - Utils.LOG_INFO("Generated pipeSmall from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 1) != null) ? true : false)); - Utils.LOG_INFO("Generated pipeNormal from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 1) != null) ? true : false)); - Utils.LOG_INFO("Generated pipeLarge from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1) != null) ? true : false)); - Utils.LOG_INFO("Generated pipeHuge from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1) != null) ? true : false)); - - int eut = 128; - int time = 0; - int bonusMulti = 5*20; - - time = (int) Math.max(Mass * 8L, 1); - eut = (int) (10 * vMulti); - - - //Add the Three Shaped Recipes First - RecipeUtils.recipeBuilder( - pipePlate, "craftingToolWrench", pipePlate, - pipePlate, null, pipePlate, - pipePlate, "craftingToolHardHammer", pipePlate, - ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 6)); - - RecipeUtils.recipeBuilder( - pipePlate, pipePlate, pipePlate, - "craftingToolWrench", null, "craftingToolHardHammer", - pipePlate, pipePlate, pipePlate, - ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 2)); - - RecipeUtils.recipeBuilder( - pipePlate, "craftingToolHardHammer", pipePlate, - pipePlate, null, pipePlate, - pipePlate, "craftingToolWrench", pipePlate, - ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1)); - - GT_Values.RA.addExtruderRecipe( - ItemUtils.getSimpleStack(pipeIngot, 1), - ItemList.Shape_Extruder_Pipe_Tiny.get(0), - ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Tiny"+output, 2), - time, eut); - - GT_Values.RA.addExtruderRecipe( - ItemUtils.getSimpleStack(pipeIngot, 1), - ItemList.Shape_Extruder_Pipe_Small.get(0), - ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 1), - time+=bonusMulti, eut); - - GT_Values.RA.addExtruderRecipe( - ItemUtils.getSimpleStack(pipeIngot, 3), - ItemList.Shape_Extruder_Pipe_Medium.get(0), - ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 1), - time+=bonusMulti, eut); - - GT_Values.RA.addExtruderRecipe( - ItemUtils.getSimpleStack(pipeIngot, 6), - ItemList.Shape_Extruder_Pipe_Large.get(0), - ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1), - time+=bonusMulti, eut); - - GT_Values.RA.addExtruderRecipe( - ItemUtils.getSimpleStack(pipeIngot, 12), - ItemList.Shape_Extruder_Pipe_Huge.get(0), - ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1), - time+=bonusMulti, eut); - - if (eut < 512 && !output.equals("Void")){ - ItemStack pipePlateDouble = ItemUtils.getItemStackOfAmountFromOreDict("plateDouble"+output, 1).copy(); - if (pipePlateDouble != null) - RecipeUtils.recipeBuilder( - pipePlateDouble, "craftingToolHardHammer", pipePlateDouble, - pipePlateDouble, null, pipePlateDouble, - pipePlateDouble, "craftingToolWrench", pipePlateDouble, - ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1)); - else - Utils.LOG_INFO("Failed to add a recipe for "+materialName+" Huge pipes. Double plates probably do not exist."); - } - - - } - - private static ItemStack getOredictStack(String oredictName, int amount){ - ArrayList oreDictList = OreDictionary.getOres(oredictName); - if (!oreDictList.isEmpty()){ - ItemStack returnValue = oreDictList.get(0).copy(); - returnValue.stackSize = amount; - return returnValue; - } - return ItemUtils.getSimpleStack(ModItems.AAA_Broken, amount); + // makeWires(T, ID, 2L, 4L, 2L, GT_Values.V[V], true, false); + GregtechConduits.makeWires(T, ID, insulatedLoss, uninsulatedLoss, Amps, GT_Values.V[V], true, false); + // makeWires(T, ID, bEC ? 2L : 2L, bEC ? 4L : 4L, 2L, + // gregtech.api.enums.GT_Values.V[V], true, false); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java index 33dfb60e3f..28602499e3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java @@ -7,93 +7,62 @@ import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -public class GregtechDehydrator -{ - public static void run() - { - if (LoadedMods.Gregtech){ +public class GregtechDehydrator { + public static void run() { + if (LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Chemical Dehydrators."); - run1(); + GregtechDehydrator.run1(); } } - private static void run1() - { + private static void run1() { /* - - public GT_MetaTileEntity_BasicMachine_GT_Recipe( - int aID, String aName, String aNameRegional, int aTier, - String aDescription, - GT_Recipe_Map aRecipes, - int aInputSlots, int aOutputSlots, - int aTankCapacity, - int aGUIParameterA, int aGUIParameterB, - String aGUIName, String aSound, - boolean aSharedTank, boolean aRequiresFluidForFiltering, - int aSpecialEffect, - String aOverlays, - Object[] aRecipe) { - + * + * public GT_MetaTileEntity_BasicMachine_GT_Recipe( int aID, String + * aName, String aNameRegional, int aTier, String aDescription, + * GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int + * aTankCapacity, int aGUIParameterA, int aGUIParameterB, String + * aGUIName, String aSound, boolean aSharedTank, boolean + * aRequiresFluidForFiltering, int aSpecialEffect, String aOverlays, + * Object[] aRecipe) { + * */ - GregtechItemList.GT_Dehydrator_EV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( - 813, "advancedmachine.dehydrator.tier.01", "Chemical Dehydrator I", 4, - "This dehydrates your Grapes into Raisins. "+CORE.GT_Tooltip, - Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, - 2, 9, - 10000, - 2, 5, - "Dehydrator.png", "", - false, false, - 0, - "UNBOXINATOR", - null).getStackForm(1L)); - GregtechItemList.GT_Dehydrator_IV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( - 814, "advancedmachine.dehydrator.tier.02", "Chemical Dehydrator II", 5, - "A hangover is the way your body reacts to dehydration. "+CORE.GT_Tooltip, - Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, - 2, 9, - 10000, - 2, 5, - "Dehydrator.png", "", - false, false, - 0, - "UNBOXINATOR", - null).getStackForm(1L)); - GregtechItemList.GT_Dehydrator_LuV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( - 815, "advancedmachine.dehydrator.tier.03", "Chemical Dehydrator III", 6, - "You could probably make space icecream with this.. "+CORE.GT_Tooltip, - Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, - 2, 9, - 10000, - 2, 5, - "Dehydrator.png", "", - false, false, - 0, - "UNBOXINATOR", - null).getStackForm(1L)); - GregtechItemList.GT_Dehydrator_ZPM.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( - 816, "advancedmachine.dehydrator.tier.04", "Chemical Dehydrator IV", 7, - "You can definitely make space icecream with this.. "+CORE.GT_Tooltip, - Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, - 2, 9, - 10000, - 2, 5, - "Dehydrator.png", "", - false, false, - 0, - "UNBOXINATOR", - null).getStackForm(1L)); - - //GregtechItemList.GT_Dehydrator_EV.set(new GregtechMetaTileEntitySolarGenerator(813, "dehydrator.tier.01", "Extreme Voltage Chemical Dehydrator", 4).getStackForm(1L)); - //GregtechItemList..set(new GregtechMetaTileEntitySolarGenerator(814, "dehydrator.tier.02", "Insane Voltage Chemical Dehydrator", 5).getStackForm(1L)); - //GregtechItemList..set(new GregtechMetaTileEntitySolarGenerator(815, "dehydrator.tier.03", "Ludicrous Voltage Chemical Dehydrator", 6).getStackForm(1L)); - //GregtechItemList..set(new GregtechMetaTileEntitySolarGenerator(816, "dehydrator.tier.04", "ZPM Voltage Chemical Dehydrator", 7).getStackForm(1L)); - - + GregtechItemList.GT_Dehydrator_EV + .set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(813, "advancedmachine.dehydrator.tier.01", + "Chemical Dehydrator I", 4, "This dehydrates your Grapes into Raisins. " + CORE.GT_Tooltip, + Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 10000, 2, 5, "Dehydrator.png", + "", false, false, 0, "UNBOXINATOR", null).getStackForm(1L)); + GregtechItemList.GT_Dehydrator_IV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(814, + "advancedmachine.dehydrator.tier.02", "Chemical Dehydrator II", 5, + "A hangover is the way your body reacts to dehydration. " + CORE.GT_Tooltip, + Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 10000, 2, 5, "Dehydrator.png", "", + false, false, 0, "UNBOXINATOR", null).getStackForm(1L)); + GregtechItemList.GT_Dehydrator_LuV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(815, + "advancedmachine.dehydrator.tier.03", "Chemical Dehydrator III", 6, + "You could probably make space icecream with this.. " + CORE.GT_Tooltip, + Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 10000, 2, 5, "Dehydrator.png", "", + false, false, 0, "UNBOXINATOR", null).getStackForm(1L)); + GregtechItemList.GT_Dehydrator_ZPM.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(816, + "advancedmachine.dehydrator.tier.04", "Chemical Dehydrator IV", 7, + "You can definitely make space icecream with this.. " + CORE.GT_Tooltip, + Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 10000, 2, 5, "Dehydrator.png", "", + false, false, 0, "UNBOXINATOR", null).getStackForm(1L)); + // GregtechItemList.GT_Dehydrator_EV.set(new + // GregtechMetaTileEntitySolarGenerator(813, "dehydrator.tier.01", + // "Extreme Voltage Chemical Dehydrator", 4).getStackForm(1L)); + // GregtechItemList..set(new GregtechMetaTileEntitySolarGenerator(814, + // "dehydrator.tier.02", "Insane Voltage Chemical Dehydrator", + // 5).getStackForm(1L)); + // GregtechItemList..set(new GregtechMetaTileEntitySolarGenerator(815, + // "dehydrator.tier.03", "Ludicrous Voltage Chemical Dehydrator", + // 6).getStackForm(1L)); + // GregtechItemList..set(new GregtechMetaTileEntitySolarGenerator(816, + // "dehydrator.tier.04", "ZPM Voltage Chemical Dehydrator", + // 7).getStackForm(1L)); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java index dc4317845f..47b445b42d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java @@ -8,73 +8,154 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOreDictNames; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaEnergyBuffer; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.creative.GregtechMetaCreativeEnergyBuffer; -public class GregtechEnergyBuffer -{ - - //Misc Items - //public static Item itemBufferCore; - - public static void run() - { - if (gtPlusPlus.core.lib.LoadedMods.Gregtech){ +public class GregtechEnergyBuffer { + + // Misc Items + // public static Item itemBufferCore; + + public static void run() { + if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Energy Buffer Blocks."); - run1(); + GregtechEnergyBuffer.run1(); } - + } - private static void run1() - { - - //itemBufferCore = new Item().setUnlocalizedName("itemBufferCore").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemBufferCore"); + private static void run1() { - //Registry - //GameRegistry.registerItem(itemBufferCore, "itemBufferCore"); - //LanguageRegistry.addName(itemBufferCore, "Buffer Core"); - //OreDictionary.registerOre("itemBufferCore", itemBufferCore); - + // itemBufferCore = new + // Item().setUnlocalizedName("itemBufferCore").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + // + ":itemBufferCore"); - //Energy Buffers - GregtechItemList.Energy_Buffer_1by1_ULV.set(new GregtechMetaEnergyBuffer(770, "energybuffer.01.tier.00", "Ultra Low Voltage Energy Buffer", 0, "", 1).getStackForm(1L)); - GregtechItemList.Energy_Buffer_1by1_LV.set(new GregtechMetaEnergyBuffer(771, "energybuffer.01.tier.01", "Low Voltage Energy Buffer", 1, "", 1).getStackForm(1L)); - GregtechItemList.Energy_Buffer_1by1_MV.set(new GregtechMetaEnergyBuffer(772, "energybuffer.01.tier.02", "Medium Voltage Energy Buffer", 2, "", 1).getStackForm(1L)); - GregtechItemList.Energy_Buffer_1by1_HV.set(new GregtechMetaEnergyBuffer(773, "energybuffer.01.tier.03", "High Voltage Energy Buffer", 3, "", 1).getStackForm(1L)); - GregtechItemList.Energy_Buffer_1by1_EV.set(new GregtechMetaEnergyBuffer(774, "energybuffer.01.tier.04", "Extreme Voltage Energy Buffer", 4, "", 1).getStackForm(1L)); - GregtechItemList.Energy_Buffer_1by1_IV.set(new GregtechMetaEnergyBuffer(775, "energybuffer.01.tier.05", "Insane Voltage Energy Buffer", 5, "", 1).getStackForm(1L)); - GregtechItemList.Energy_Buffer_1by1_LuV.set(new GregtechMetaEnergyBuffer(776, "energybuffer.01.tier.06", "Ludicrous Voltage Energy Buffer", 6, "", 1).getStackForm(1L)); - GregtechItemList.Energy_Buffer_1by1_ZPM.set(new GregtechMetaEnergyBuffer(777, "energybuffer.01.tier.07", "ZPM Voltage Energy Buffer", 7, "", 1).getStackForm(1L)); - GregtechItemList.Energy_Buffer_1by1_UV.set(new GregtechMetaEnergyBuffer(778, "energybuffer.01.tier.08", "Ultimate Voltage Energy Buffer", 8, "", 1).getStackForm(1L)); - GregtechItemList.Energy_Buffer_1by1_MAX.set(new GregtechMetaEnergyBuffer(779, "energybuffer.01.tier.09", "MAX Voltage Energy Buffer", 9, "", 1).getStackForm(1L)); - // Creative Buffer Has Special ID - GregtechItemList.Energy_Buffer_CREATIVE - .set(new GregtechMetaCreativeEnergyBuffer(750, - "energybuffer.01.tier.xx", - "512V Creative Energy Buffer", 3, "", 0) + // Registry + // GameRegistry.registerItem(itemBufferCore, "itemBufferCore"); + // LanguageRegistry.addName(itemBufferCore, "Buffer Core"); + // OreDictionary.registerOre("itemBufferCore", itemBufferCore); + + // Energy Buffers + GregtechItemList.Energy_Buffer_1by1_ULV.set(new GregtechMetaEnergyBuffer(770, "energybuffer.01.tier.00", + "Ultra Low Voltage Energy Buffer", 0, "", 1).getStackForm(1L)); + GregtechItemList.Energy_Buffer_1by1_LV + .set(new GregtechMetaEnergyBuffer(771, "energybuffer.01.tier.01", "Low Voltage Energy Buffer", 1, "", 1) + .getStackForm(1L)); + GregtechItemList.Energy_Buffer_1by1_MV.set( + new GregtechMetaEnergyBuffer(772, "energybuffer.01.tier.02", "Medium Voltage Energy Buffer", 2, "", 1) + .getStackForm(1L)); + GregtechItemList.Energy_Buffer_1by1_HV.set( + new GregtechMetaEnergyBuffer(773, "energybuffer.01.tier.03", "High Voltage Energy Buffer", 3, "", 1) .getStackForm(1L)); + GregtechItemList.Energy_Buffer_1by1_EV.set( + new GregtechMetaEnergyBuffer(774, "energybuffer.01.tier.04", "Extreme Voltage Energy Buffer", 4, "", 1) + .getStackForm(1L)); + GregtechItemList.Energy_Buffer_1by1_IV.set( + new GregtechMetaEnergyBuffer(775, "energybuffer.01.tier.05", "Insane Voltage Energy Buffer", 5, "", 1) + .getStackForm(1L)); + GregtechItemList.Energy_Buffer_1by1_LuV.set(new GregtechMetaEnergyBuffer(776, "energybuffer.01.tier.06", + "Ludicrous Voltage Energy Buffer", 6, "", 1).getStackForm(1L)); + GregtechItemList.Energy_Buffer_1by1_ZPM + .set(new GregtechMetaEnergyBuffer(777, "energybuffer.01.tier.07", "ZPM Voltage Energy Buffer", 7, "", 1) + .getStackForm(1L)); + GregtechItemList.Energy_Buffer_1by1_UV.set( + new GregtechMetaEnergyBuffer(778, "energybuffer.01.tier.08", "Ultimate Voltage Energy Buffer", 8, "", 1) + .getStackForm(1L)); + GregtechItemList.Energy_Buffer_1by1_MAX + .set(new GregtechMetaEnergyBuffer(779, "energybuffer.01.tier.09", "MAX Voltage Energy Buffer", 9, "", 1) + .getStackForm(1L)); + // Creative Buffer Has Special ID + GregtechItemList.Energy_Buffer_CREATIVE.set(new GregtechMetaCreativeEnergyBuffer(750, "energybuffer.01.tier.xx", + "512V Creative Energy Buffer", 3, "", 0).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_ULV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_ULV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Lead), Character.valueOf('T'), GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_LV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Tin), Character.valueOf('T'), GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_MV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.AnyCopper), Character.valueOf('T'), GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_HV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Gold), Character.valueOf('T'), GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_EV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Aluminium), Character.valueOf('T'), GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_IV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Tungsten), Character.valueOf('T'), GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_LuV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_ZPM.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_ZPM, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_UV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_UV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Superconductor), Character.valueOf('T'), GregtechOreDictNames.buffer_core }); - /*GT_ModHandler.addCraftingRecipe( - GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { - "WTW", "WMW", Character.valueOf('M'), - ItemList.Hull_MAX, Character.valueOf('W'), - OrePrefixes.wireGt08.get(Materials.Superconductor), - Character.valueOf('T'), GregtechOreDictNames.buffer_core });*/ - - - + GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_ULV.get(1L, new Object[0]), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE + | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { + "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_ULV, Character.valueOf('W'), + OrePrefixes.wireGt08.get(Materials.Lead), Character.valueOf('T'), + GregtechOreDictNames.buffer_core + }); + GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_LV.get(1L, new Object[0]), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE + | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { + "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('W'), + OrePrefixes.wireGt08.get(Materials.Tin), Character.valueOf('T'), + GregtechOreDictNames.buffer_core + }); + GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_MV.get(1L, new Object[0]), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE + | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { + "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('W'), + OrePrefixes.wireGt08.get(Materials.AnyCopper), Character.valueOf('T'), + GregtechOreDictNames.buffer_core + }); + GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_HV.get(1L, new Object[0]), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE + | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { + "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('W'), + OrePrefixes.wireGt08.get(Materials.Gold), Character.valueOf('T'), + GregtechOreDictNames.buffer_core + }); + GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_EV.get(1L, new Object[0]), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE + | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { + "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('W'), + OrePrefixes.wireGt08.get(Materials.Aluminium), Character.valueOf('T'), + GregtechOreDictNames.buffer_core + }); + GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_IV.get(1L, new Object[0]), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE + | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { + "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('W'), + OrePrefixes.wireGt08.get(Materials.Tungsten), Character.valueOf('T'), + GregtechOreDictNames.buffer_core + }); + GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_LuV.get(1L, new Object[0]), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE + | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { + "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('W'), + OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), + GregtechOreDictNames.buffer_core + }); + GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_ZPM.get(1L, new Object[0]), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE + | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { + "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_ZPM, Character.valueOf('W'), + OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), + GregtechOreDictNames.buffer_core + }); + GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_UV.get(1L, new Object[0]), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE + | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { + "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_UV, Character.valueOf('W'), + OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), + GregtechOreDictNames.buffer_core + }); + GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE + | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { + "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('W'), + OrePrefixes.wireGt08.get(Materials.Superconductor), Character.valueOf('T'), + GregtechOreDictNames.buffer_core + }); + /* + * GT_ModHandler.addCraftingRecipe( + * GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]), + * GT_ModHandler.RecipeBits.DISMANTLEABLE | + * GT_ModHandler.RecipeBits.NOT_REMOVABLE | + * GT_ModHandler.RecipeBits.REVERSIBLE | + * GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", + * Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('W'), + * OrePrefixes.wireGt08.get(Materials.Superconductor), + * Character.valueOf('T'), GregtechOreDictNames.buffer_core }); + */ } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java index b7715b93cc..9f0d7419b0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java @@ -14,52 +14,56 @@ import net.minecraft.item.ItemStack; public class GregtechGeothermalThermalGenerator { - public static void run() - { - if (LoadedMods.Gregtech){ + public static void run() { + if (LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Regist