diff options
Diffstat (limited to 'src/main/java/GoodGenerator')
14 files changed, 557 insertions, 122 deletions
diff --git a/src/main/java/GoodGenerator/Blocks/MyFluids/FluidsBuilder.java b/src/main/java/GoodGenerator/Blocks/MyFluids/FluidsBuilder.java index ec456aaba2..3df342a508 100644 --- a/src/main/java/GoodGenerator/Blocks/MyFluids/FluidsBuilder.java +++ b/src/main/java/GoodGenerator/Blocks/MyFluids/FluidsBuilder.java @@ -6,6 +6,9 @@ import net.minecraftforge.fluids.Fluid; public class FluidsBuilder { public FluidsBuilder(){ + } + + public static void Register() { crackedNaquadahGas_Lightly(); crackedNaquadahGas_Moderately(); crackedNaquadahGas_Heavily(); diff --git a/src/main/java/GoodGenerator/CrossMod/NEI/IMCForNEI.java b/src/main/java/GoodGenerator/CrossMod/NEI/IMCForNEI.java index c949bd43d2..81f0249a7e 100644 --- a/src/main/java/GoodGenerator/CrossMod/NEI/IMCForNEI.java +++ b/src/main/java/GoodGenerator/CrossMod/NEI/IMCForNEI.java @@ -1,20 +1,19 @@ package GoodGenerator.CrossMod.NEI; -import GoodGenerator.Main.GoodGenerator; import cpw.mods.fml.common.event.FMLInterModComms; import net.minecraft.nbt.NBTTagCompound; public class IMCForNEI { public static void IMCSender() { NBTTagCompound info = new NBTTagCompound(); - setNBTInfo(info, "gg.recipe.neutron_activator", "gregtech:gt.blockmachines:32013"); + setNBTInfo(info, "GoodGenerator.CrossMod.NEI.NeutronActivatorHandler", "gregtech:gt.blockmachines:32013"); FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", info); } private static void setNBTInfo(NBTTagCompound aNBT, String aName, String aBlock) { aNBT.setString("handler", aName); - aNBT.setString("modName", GoodGenerator.MOD_NAME); - aNBT.setString("modId", GoodGenerator.MOD_ID); + aNBT.setString("modName", "Good Generator"); + aNBT.setString("modId", "GoodGenerator"); aNBT.setBoolean("modRequired", true); aNBT.setString("itemName", aBlock); aNBT.setInteger("handlerHeight", 135); diff --git a/src/main/java/GoodGenerator/Items/FuelRod.java b/src/main/java/GoodGenerator/Items/FuelRod.java new file mode 100644 index 0000000000..5886cce095 --- /dev/null +++ b/src/main/java/GoodGenerator/Items/FuelRod.java @@ -0,0 +1,167 @@ +package GoodGenerator.Items; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import ic2.api.item.IBoxable; +import ic2.api.reactor.IReactor; +import ic2.api.reactor.IReactorComponent; +import ic2.core.util.StackUtil; +import ic2.core.util.Util; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import java.util.ArrayList; +import java.util.List; + +import static GoodGenerator.util.DescTextLocalization.addText; + +public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxable { + private final int numberOfCells; + private final int maxDmg; + private final float Power; + private final int Heat; + private final ItemStack result; + + public FuelRod(String aName, int aCells, int aEUt, int aHeat, int aRads, int aDuration, ItemStack aResult, CreativeTabs Tab) { + super(aName, Tab, aRads); + this.setMaxStackSize(64); + this.numberOfCells = aCells; + this.maxDmg = aDuration; + this.Power = (float)aEUt / 25.0F; + this.result = aResult; + this.Heat = aHeat; + } + + public void processChamber(IReactor reactor, ItemStack stack, int x, int y, boolean heatRun) { + if (reactor.produceEnergy()) { + for(int iteration = 0; iteration < this.numberOfCells; ++iteration) { + int pulses = 1 + this.numberOfCells / 2; + int heat; + if (!heatRun) { + for(heat = 0; heat < pulses; ++heat) { + this.acceptUraniumPulse(reactor, stack, stack, x, y, x, y, heatRun); + } + } else { + pulses += checkPulseable(reactor, x - 1, y, stack, x, y, heatRun) + checkPulseable(reactor, x + 1, y, stack, x, y, heatRun) + checkPulseable(reactor, x, y - 1, stack, x, y, heatRun) + checkPulseable(reactor, x, y + 1, stack, x, y, heatRun); + heat = sumUp(pulses) * this.Heat; + ArrayList<FuelRod.ItemStackCoord> heatAcceptors = new ArrayList<>(); + this.checkHeatAcceptor(reactor, x - 1, y, heatAcceptors); + this.checkHeatAcceptor(reactor, x + 1, y, heatAcceptors); + this.checkHeatAcceptor(reactor, x, y - 1, heatAcceptors); + this.checkHeatAcceptor(reactor, x, y + 1, heatAcceptors); + + while(heatAcceptors.size() > 0 && heat > 0) { + int dheat = heat / heatAcceptors.size(); + heat -= dheat; + dheat = ((IReactorComponent) heatAcceptors.get(0).stack.getItem()).alterHeat(reactor, heatAcceptors.get(0).stack, heatAcceptors.get(0).x, heatAcceptors.get(0).y, dheat); + heat += dheat; + heatAcceptors.remove(0); + } + + if (heat > 0) { + reactor.addHeat(heat); + } + } + } + if (this.getCustomDamage(stack) >= this.getMaxCustomDamage(stack) - 1) { + reactor.setItemAt(x, y, result); + } else if (heatRun) { + this.applyCustomDamage(stack, 1, null); + } + } + } + + private static int checkPulseable(IReactor reactor, int x, int y, ItemStack me, int mex, int mey, boolean heatrun) { + ItemStack other = reactor.getItemAt(x, y); + return other != null && other.getItem() instanceof IReactorComponent && ((IReactorComponent)other.getItem()).acceptUraniumPulse(reactor, other, me, x, y, mex, mey, heatrun) ? 1 : 0; + } + + private static int sumUp(int x) { + return (x * x + x) / 2; + } + + private void checkHeatAcceptor(IReactor reactor, int x, int y, ArrayList<FuelRod.ItemStackCoord> heatAcceptors) { + ItemStack thing = reactor.getItemAt(x, y); + if (thing != null && thing.getItem() instanceof IReactorComponent && ((IReactorComponent)thing.getItem()).canStoreHeat(reactor, thing, x, y)) { + heatAcceptors.add(new ItemStackCoord(thing, x, y)); + } + + } + + public boolean acceptUraniumPulse(IReactor reactor, ItemStack yourStack, ItemStack pulsingStack, int youX, int youY, int pulseX, int pulseY, boolean heatrun) { + if (!heatrun) { + reactor.addOutput(Power); + } + return true; + } + + public boolean canStoreHeat(IReactor reactor, ItemStack yourStack, int x, int y) { + return false; + } + + public int getMaxHeat(IReactor reactor, ItemStack yourStack, int x, int y) { + return 0; + } + + public int getCurrentHeat(IReactor reactor, ItemStack yourStack, int x, int y) { + return 0; + } + + public int alterHeat(IReactor reactor, ItemStack yourStack, int x, int y, int heat) { + return heat; + } + + public float influenceExplosion(IReactor reactor, ItemStack yourStack) { + return (float)(2 * this.numberOfCells); + } + + @Override + public boolean canBeStoredInToolbox(ItemStack itemStack) { + return true; + } + + private static class ItemStackCoord { + public ItemStack stack; + public int x; + public int y; + + public ItemStackCoord(ItemStack stack1, int x1, int y1) { + this.stack = stack1; + this.x = x1; + this.y = y1; + } + } + + public int getCustomDamage(ItemStack stack) { + NBTTagCompound nbt = StackUtil.getOrCreateNbtData(stack); + return nbt.getInteger("advDmg"); + } + + public int getMaxCustomDamage(ItemStack stack) { + return this.maxDmg; + } + + public void setCustomDamage(ItemStack stack, int damage) { + NBTTagCompound nbt = StackUtil.getOrCreateNbtData(stack); + nbt.setInteger("advDmg", damage); + int maxStackDamage = stack.getMaxDamage(); + if (maxStackDamage > 2) { + stack.setItemDamage(1 + (int) Util.map(damage, this.maxDmg, maxStackDamage - 2)); + } + } + + public boolean applyCustomDamage(ItemStack stack, int damage, EntityLivingBase src) { + this.setCustomDamage(stack, this.getCustomDamage(stack) + damage); + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void addInformation(ItemStack item, EntityPlayer player, List tooltip, boolean p_77624_4_) { + super.addInformation(item, player, tooltip, p_77624_4_); + tooltip.add(String.format(addText("fuelrod.tooltip", 1)[0], getMaxCustomDamage(item) - getCustomDamage(item), getMaxCustomDamage(item))); + } +} diff --git a/src/main/java/GoodGenerator/Items/MyMaterial.java b/src/main/java/GoodGenerator/Items/MyMaterial.java index 96a5dfcda7..e4ab266b7a 100644 --- a/src/main/java/GoodGenerator/Items/MyMaterial.java +++ b/src/main/java/GoodGenerator/Items/MyMaterial.java @@ -942,6 +942,38 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID ); + //material for reactor stuff + public static final Werkstoff zircaloy4 = new Werkstoff( + new short[]{0x8a,0x6e,0x68}, + "Zircaloy-4", + subscriptNumbers("Zr34Sn5Fe2Cr"), + new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(2800), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addSimpleMetalWorkingItems(), + OffsetID + 81, + TextureSet.SET_METALLIC, + new Pair<>(WerkstoffLoader.Zirconium, 34), + new Pair<>(Tin, 5), + new Pair<>(Iron, 2), + new Pair<>(Chrome, 1) + ); + + public static final Werkstoff zircaloy2 = new Werkstoff( + new short[]{0xa4,0x8f,0x8b}, + "Zircaloy-2", + subscriptNumbers("Zr34Sn4FeCrNi"), + new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(2800), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addSimpleMetalWorkingItems(), + OffsetID + 82, + TextureSet.SET_METALLIC, + new Pair<>(WerkstoffLoader.Zirconium, 34), + new Pair<>(Tin, 4), + new Pair<>(Iron, 1), + new Pair<>(Chrome, 1), + new Pair<>(Nickel, 1) + ); + @Override public void run() { } } diff --git a/src/main/java/GoodGenerator/Items/RadioactiveItem.java b/src/main/java/GoodGenerator/Items/RadioactiveItem.java index 408246ba67..8be42f94e8 100644 --- a/src/main/java/GoodGenerator/Items/RadioactiveItem.java +++ b/src/main/java/GoodGenerator/Items/RadioactiveItem.java @@ -12,13 +12,23 @@ import net.minecraft.world.World; public class RadioactiveItem extends MyItems{ - private final int mRadio; + protected final int mRadio; public RadioactiveItem(String name, CreativeTabs Tab, int Rad) { super(name, Tab); this.mRadio = Rad; } + public RadioactiveItem(String name, String[] tooltip, CreativeTabs Tab, int Rad) { + super(name, tooltip, Tab); + this.mRadio = Rad; + } + + public RadioactiveItem(String name, String tooltip, CreativeTabs Tab, int Rad) { + super(name, tooltip, Tab); + this.mRadio = Rad; + } + @Override public void onUpdate(ItemStack aStack, World aWorld, Entity aPlayer, int aTimer, boolean aIsInHand) { super.onUpdate(aStack, aWorld, aPlayer, aTimer, aIsInHand); diff --git a/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java b/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java index d270f410e1..959c5abd1a 100644 --- a/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java +++ b/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java @@ -1,6 +1,7 @@ package GoodGenerator.Loader; import GoodGenerator.Items.MyMaterial; +import GoodGenerator.util.ItemRefer; import GoodGenerator.util.MyRecipeAdder; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import gregtech.api.enums.Materials; @@ -46,8 +47,8 @@ public class FuelRecipeLoader { new ItemStack[]{ MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust,27), MyMaterial.orundum.get(OrePrefixes.dust,8), - new ItemStack(Loaders.highDensityUranium,16), - new ItemStack(Loaders.highDensityPlutonium,3) + ItemRefer.High_Density_Uranium.get(16), + ItemRefer.High_Density_Plutonium.get(3), }, MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(250), 56000000, diff --git a/src/main/java/GoodGenerator/Loader/FuelRodLoader.java b/src/main/java/GoodGenerator/Loader/FuelRodLoader.java new file mode 100644 index 0000000000..45aed4275d --- /dev/null +++ b/src/main/java/GoodGenerator/Loader/FuelRodLoader.java @@ -0,0 +1,38 @@ +package GoodGenerator.Loader; + +import GoodGenerator.Items.FuelRod; +import GoodGenerator.Items.RadioactiveItem; +import GoodGenerator.Main.GoodGenerator; +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import static GoodGenerator.util.DescTextLocalization.addText; + +public class FuelRodLoader { + + public static Item rodCompressedUraniumDepleted; + public static Item rodCompressedUraniumDepleted_2; + public static Item rodCompressedUraniumDepleted_4; + public static Item rodCompressedUranium; + public static Item rodCompressedUranium_2; + public static Item rodCompressedUranium_4; + + public static void RegisterRod() { + rodCompressedUraniumDepleted = new RadioactiveItem("rodCompressedUraniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 100); + rodCompressedUraniumDepleted_2 = new RadioactiveItem("rodCompressedUraniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 200); + rodCompressedUraniumDepleted_4 = new RadioactiveItem("rodCompressedUraniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 400); + + GameRegistry.registerItem(rodCompressedUraniumDepleted, "rodCompressedUraniumDepleted", GoodGenerator.MOD_ID); + GameRegistry.registerItem(rodCompressedUraniumDepleted_2, "rodCompressedUraniumDepleted2", GoodGenerator.MOD_ID); + GameRegistry.registerItem(rodCompressedUraniumDepleted_4, "rodCompressedUraniumDepleted4", GoodGenerator.MOD_ID); + + rodCompressedUranium = new FuelRod("rodCompressedUranium", 1, 100, 4, 800, 70000, new ItemStack(rodCompressedUraniumDepleted, 1), GoodGenerator.GG); + rodCompressedUranium_2 = new FuelRod("rodCompressedUranium2", 2, 100, 4, 800, 70000, new ItemStack(rodCompressedUraniumDepleted_2, 1), GoodGenerator.GG); + rodCompressedUranium_4 = new FuelRod("rodCompressedUranium4", 4, 100, 4, 800, 70000, new ItemStack(rodCompressedUraniumDepleted_4, 1), GoodGenerator.GG); + + GameRegistry.registerItem(rodCompressedUranium, "rodCompressedUranium", GoodGenerator.MOD_ID); + GameRegistry.registerItem(rodCompressedUranium_2, "rodCompressedUranium2", GoodGenerator.MOD_ID); + GameRegistry.registerItem(rodCompressedUranium_4, "rodCompressedUranium4", GoodGenerator.MOD_ID); + } +} diff --git a/src/main/java/GoodGenerator/Loader/Loaders.java b/src/main/java/GoodGenerator/Loader/Loaders.java index 0afdb884cc..87a5220fa2 100644 --- a/src/main/java/GoodGenerator/Loader/Loaders.java +++ b/src/main/java/GoodGenerator/Loader/Loaders.java @@ -1,5 +1,6 @@ package GoodGenerator.Loader; +import GoodGenerator.Blocks.MyFluids.FluidsBuilder; import GoodGenerator.Blocks.RegularBlock.Casing; import GoodGenerator.Blocks.RegularBlock.ComplexTextureCasing; import GoodGenerator.Blocks.RegularBlock.Frame; @@ -7,6 +8,7 @@ import GoodGenerator.Blocks.RegularBlock.TEBlock; import GoodGenerator.Blocks.TEs.*; import GoodGenerator.Blocks.TEs.MetaTE.NeutronAccelerator; import GoodGenerator.Blocks.TEs.MetaTE.NeutronSensor; +import GoodGenerator.CrossMod.NEI.IMCForNEI; import GoodGenerator.Items.MyItemBlocks; import GoodGenerator.Items.MyItems; import GoodGenerator.Items.RadioactiveItem; @@ -54,6 +56,7 @@ public class Loaders { public static final Item naquadahMass = new MyItems("naquadahMass", addText("naquadahMass.tooltip", 1), GoodGenerator.GG); public static final Item enrichedNaquadahMass = new MyItems("enrichedNaquadahMass", addText("enrichedNaquadahMass.tooltip", 1), GoodGenerator.GG); public static final Item naquadriaMass = new MyItems("naquadriaMass", addText("naquadriaMass.tooltip", 1), GoodGenerator.GG); + public static final Item advancedFuelRod = new MyItems("advancedFuelRod", GoodGenerator.GG); public static final Block MAR_Casing = new Casing("MAR_Casing", new String[]{GoodGenerator.MOD_ID+":MAR_Casing"}); public static final Block FRF_Casings = new Casing("FRF_Casing", new String[]{"gregtech:iconsets/MACHINE_CASING_MINING_BLACKPLUTONIUM"}); @@ -80,6 +83,17 @@ public class Loaders { public static ItemStack[] NeutronAccelerators = new ItemStack[9]; + public static void GTMetaTileRegister(){ + Loaders.MAR = new MultiNqGenerator(12732, "NaG", "Large Naquadah Reactor").getStackForm(1L); + Loaders.FRF = new FuelRefineFactory(16999, "FRF", "Naquadah Fuel Refinery").getStackForm(1L); + Loaders.UCFE = new UniversalChemicalFuelEngine(IDOffset, "UniversalChemicalFuelEngine", "Universal Chemical Fuel Engine").getStackForm(1L); + for (int i = 0; i < 9; i ++) { + Loaders.NeutronAccelerators[i] = new NeutronAccelerator(IDOffset + 2 + i, "Neutron Accelerator " + GT_Values.VN[i], "Neutron Accelerator " + GT_Values.VN[i], i).getStackForm(1L); + } + Loaders.NS = new NeutronSensor(IDOffset + 11, "Neutron Sensor", "Neutron Sensor", 5).getStackForm(1L); + Loaders.NA = new NeutronActivator(IDOffset + 12, "NeutronActivator", "Neutron Activator").getStackForm(1L); + } + public static void Register(){ GameRegistry.registerBlock(MAR_Casing, MyItemBlocks.class, "MAR_Casing"); GameRegistry.registerBlock(radiationProtectionSteelFrame, MyItemBlocks.class, "radiationProtectionSteelFrame"); @@ -116,26 +130,17 @@ public class Loaders { GameRegistry.registerItem(naquadahMass, "naquadahMass", GoodGenerator.MOD_ID); GameRegistry.registerItem(enrichedNaquadahMass, "enrichedNaquadahMass", GoodGenerator.MOD_ID); GameRegistry.registerItem(naquadriaMass, "naquadriaMass", GoodGenerator.MOD_ID); - Loaders.MAR = new MultiNqGenerator(12732, "NaG", "Large Naquadah Reactor").getStackForm(1L); - Loaders.FRF = new FuelRefineFactory(16999, "FRF", "Naquadah Fuel Refinery").getStackForm(1L); - Loaders.UCFE = new UniversalChemicalFuelEngine(IDOffset, "UniversalChemicalFuelEngine", "Universal Chemical Fuel Engine").getStackForm(1L); - if (Loader.isModLoaded("Thaumcraft")){ - GameRegistry.registerBlock(magicCasing, MyItemBlocks.class, "magicCasing"); - GameRegistry.registerBlock(essentiaCells[0], MyItemBlocks.class, "essentiaCell"); - GameRegistry.registerBlock(essentiaHatch, MyItemBlocks.class, "essentiaHatch"); - GameRegistry.registerTileEntity(EssentiaHatch.class, "EssentiaHatch"); - Loaders.LEG = new LargeEssentiaGenerator(IDOffset + 1, "LargeEssentiaGenerator", "Large Essentia Generator").getStackForm(1L); - } - for (int i = 0; i < 9; i ++) { - Loaders.NeutronAccelerators[i] = new NeutronAccelerator(IDOffset + 2 + i, "Neutron Accelerator " + GT_Values.VN[i], "Neutron Accelerator " + GT_Values.VN[i], i).getStackForm(1L); - } - Loaders.NS = new NeutronSensor(IDOffset + 11, "Neutron Sensor", "Neutron Sensor", 5).getStackForm(1L); - Loaders.NA = new NeutronActivator(IDOffset + 12, "NeutronActivator", "Neutron Activator").getStackForm(1L); + GameRegistry.registerItem(advancedFuelRod, "advancedFuelRod", GoodGenerator.MOD_ID); } public static void compactMod() { if (Loader.isModLoaded("Thaumcraft")) { + GameRegistry.registerTileEntity(EssentiaHatch.class, "EssentiaHatch"); + Loaders.LEG = new LargeEssentiaGenerator(IDOffset + 1, "LargeEssentiaGenerator", "Large Essentia Generator").getStackForm(1L); essentiaHatch = new TEBlock("essentiaHatch", new String[]{GoodGenerator.MOD_ID + ":essentiaHatch"}, 1); + GameRegistry.registerBlock(magicCasing, MyItemBlocks.class, "magicCasing"); + GameRegistry.registerBlock(essentiaCells[0], MyItemBlocks.class, "essentiaCell"); + GameRegistry.registerBlock(essentiaHatch, MyItemBlocks.class, "essentiaHatch"); } } @@ -151,4 +156,37 @@ public class Loaders { Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage][0] = TextureFactory.of(magicCasing); } } + + public static void preInitLoad(){ + Register(); + GTMetaTileRegister(); + addOreDic(); + addTexturePage(); + compactMod(); + FluidsBuilder.Register(); + FuelRodLoader.RegisterRod(); + } + + public static void initLoad(){ + IMCForNEI.IMCSender(); + initLoadRecipes(); + } + + public static void postInitLoad(){ + postInitLoadRecipes(); + } + + public static void initLoadRecipes(){ + RecipeLoader.InitLoadRecipe(); + RecipeLoader_02.InitLoadRecipe(); + FuelRecipeLoader.RegisterFuel(); + NaquadahReworkRecipeLoader.RecipeLoad(); + } + + public static void postInitLoadRecipes(){ + RecipeLoader.RecipeLoad(); + RecipeLoader.Fixer(); + RecipeLoader_02.RecipeLoad(); + NeutronActivatorLoader.NARecipeLoad(); + } } diff --git a/src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java b/src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java index 6065e184df..d3bfa95ea1 100644 --- a/src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java +++ b/src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java @@ -493,8 +493,8 @@ public class NaquadahReworkRecipeLoader { Materials.Ethylene.getCells(1), GT_Utility.getIntegratedCircuit(24), FluidRegistry.getFluidStack("steam", 2000), - Materials.Ethanol.getFluid(1000), - Materials.Empty.getCells(1), + null, + Materials.Ethanol.getCells(1), null, 400, 480 diff --git a/src/main/java/GoodGenerator/Loader/RecipeLoader.java b/src/main/java/GoodGenerator/Loader/RecipeLoader.java index 03c7f4ad27..6012c66cf3 100644 --- a/src/main/java/GoodGenerator/Loader/RecipeLoader.java +++ b/src/main/java/GoodGenerator/Loader/RecipeLoader.java @@ -25,7 +25,7 @@ public class RecipeLoader { GT_OreDictUnificator.get(OrePrefixes.foil,Materials.Neutronium,1L), GT_Utility.getIntegratedCircuit(1)}, Materials.Lead.getMolten(1152), - new ItemStack(Loaders.radiationProtectionPlate), + ItemRefer.Radiation_Protection_Plate.get(1), 400, 1920 ); @@ -36,7 +36,7 @@ public class RecipeLoader { 100000, new Object[]{ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Adamantium,8), - new ItemStack(Loaders.radiationProtectionPlate,16), + ItemRefer.Radiation_Protection_Plate.get(16), ItemList.Field_Generator_ZPM.get(2), ItemList.Electric_Pump_ZPM.get(8), new Object[]{OrePrefixes.circuit.get(Materials.Superconductor),4}, @@ -50,7 +50,7 @@ public class RecipeLoader { Materials.SolderingAlloy.getMolten(4608), Materials.Lubricant.getFluid(8000) }, - Loaders.MAR.copy(), + ItemRefer.Large_Naquadah_Reactor.get(1), 16200, 122880 ); @@ -58,13 +58,13 @@ public class RecipeLoader { //LNR Casing GT_Values.RA.addAssemblerRecipe( new ItemStack[]{ - new ItemStack(Loaders.radiationProtectionPlate,6), + ItemRefer.Radiation_Protection_Plate.get(6), GT_OreDictUnificator.get(OrePrefixes.frameGt,Materials.Europium,1), ItemList.Field_Generator_MV.get(1), GT_Utility.getIntegratedCircuit(1) }, null, - new ItemStack(Loaders.MAR_Casing), + ItemRefer.Field_Restriction_Casing.get(1), 400, 1920 ); @@ -77,7 +77,7 @@ public class RecipeLoader { GT_Utility.getIntegratedCircuit(24) }, null, - new ItemStack(Loaders.radiationProtectionSteelFrame), + ItemRefer.Radiation_Proof_Steel_Frame_Box.get(1), 320, 1920 ); @@ -90,27 +90,27 @@ public class RecipeLoader { GT_Utility.getIntegratedCircuit(1) }, null, - new ItemStack(Loaders.wrappedUraniumIngot), + ItemRefer.Wrapped_Uranium_Ingot.get(1), 1400, 480 ); GT_Values.RA.addImplosionRecipe( - new ItemStack(Loaders.wrappedUraniumIngot, 4), + ItemRefer.Wrapped_Uranium_Ingot.get(4), 8, - new ItemStack(Loaders.highDensityUraniumNugget), + ItemRefer.High_Density_Uranium_Nugget.get(1), GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.TungstenCarbide,8) ); GT_Values.RA.addCompressorRecipe( - new ItemStack(Loaders.highDensityUraniumNugget,9), - new ItemStack(Loaders.highDensityUranium), + ItemRefer.High_Density_Uranium_Nugget.get(9), + ItemRefer.High_Density_Uranium.get(1), 600, 480 ); GT_Values.RA.addMixerRecipe( - new ItemStack(Loaders.highDensityUranium), + ItemRefer.High_Density_Uranium.get(1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Rubidium,8), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quantium,4), GT_Utility.getIntegratedCircuit(1), @@ -138,27 +138,27 @@ public class RecipeLoader { GT_Utility.getIntegratedCircuit(1) }, null, - new ItemStack(Loaders.wrappedThoriumIngot), + ItemRefer.Wrapped_Thorium_Ingot.get(1), 1000, 480 ); GT_Values.RA.addImplosionRecipe( - new ItemStack(Loaders.wrappedThoriumIngot), + ItemRefer.Wrapped_Thorium_Ingot.get(1), 4, - new ItemStack(Loaders.highDensityThoriumNugget), + ItemRefer.High_Density_Thorium_Nugget.get(1), GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.TungstenSteel,3) ); GT_Values.RA.addCompressorRecipe( - new ItemStack(Loaders.highDensityThoriumNugget,9), - new ItemStack(Loaders.highDensityThorium), + ItemRefer.High_Density_Thorium_Nugget.get(9), + ItemRefer.High_Density_Thorium.get(1), 400, 120 ); GT_Values.RA.addMixerRecipe( - new ItemStack(Loaders.highDensityThorium), + ItemRefer.High_Density_Thorium.get(1), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Lithium,4), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Draconium,2), GT_Utility.getIntegratedCircuit(2), @@ -188,27 +188,27 @@ public class RecipeLoader { GT_Utility.getIntegratedCircuit(1) }, null, - new ItemStack(Loaders.wrappedPlutoniumIngot), + ItemRefer.Wrapped_Plutonium_Ingot.get(1), 1800, 2040 ); GT_Values.RA.addImplosionRecipe( - new ItemStack(Loaders.wrappedPlutoniumIngot,2), + ItemRefer.Wrapped_Plutonium_Ingot.get(2), 16, - new ItemStack(Loaders.highDensityPlutoniumNugget), + ItemRefer.High_Density_Plutonium_Nugget.get(1), GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.HSSS,8) ); GT_Values.RA.addCompressorRecipe( - new ItemStack(Loaders.highDensityPlutoniumNugget,9), - new ItemStack(Loaders.highDensityPlutonium), + ItemRefer.High_Density_Plutonium_Nugget.get(9), + ItemRefer.High_Density_Plutonium.get(1), 1200, 120 ); GT_Values.RA.addMixerRecipe( - new ItemStack(Loaders.highDensityPlutonium), + ItemRefer.High_Density_Plutonium.get(1), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Neutronium,8), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Caesium,16), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Americium,2), @@ -229,7 +229,7 @@ public class RecipeLoader { 220000000 ); - //Th-233 + //Th-232 GT_Values.RA.addMultiblockChemicalRecipe( new ItemStack[]{ GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sugar,16), @@ -328,7 +328,7 @@ public class RecipeLoader { MyMaterial.thorium232Tetrafluoride.getFluidOrGas(1000), WerkstoffLoader.CalciumChloride.getFluidOrGas(1000), MyMaterial.zincThoriumAlloy.get(OrePrefixes.ingot, 1), - WerkstoffLoader.Fluorspar.get(OrePrefixes.dust, 5), + WerkstoffLoader.Fluorspar.get(OrePrefixes.dust, 8), 300, 120, 3000 @@ -367,7 +367,7 @@ public class RecipeLoader { GT_Utility.getIntegratedCircuit(4),null, Materials.Naquadah.getMolten(288), null, - new ItemStack(Loaders.rawAtomicSeparationCatalyst,9), + ItemRefer.Raw_Atomic_Separation_Catalyst.get(9), 300, 480 ); @@ -380,7 +380,7 @@ public class RecipeLoader { GT_Utility.getIntegratedCircuit(4),null, Materials.Naquadah.getMolten(288), null, - new ItemStack(Loaders.rawAtomicSeparationCatalyst,9), + ItemRefer.Raw_Atomic_Separation_Catalyst.get(9), 300, 480 ); @@ -393,7 +393,7 @@ public class RecipeLoader { GT_Utility.getIntegratedCircuit(4),null, Materials.Naquadah.getMolten(288), null, - new ItemStack(Loaders.rawAtomicSeparationCatalyst,27), + ItemRefer.Raw_Atomic_Separation_Catalyst.get(27), 300, 480 ); @@ -406,7 +406,7 @@ public class RecipeLoader { GT_Utility.getIntegratedCircuit(4),null, Materials.Naquadah.getMolten(288), null, - new ItemStack(Loaders.rawAtomicSeparationCatalyst,27), + ItemRefer.Raw_Atomic_Separation_Catalyst.get(27), 300, 480 ); @@ -419,7 +419,7 @@ public class RecipeLoader { GT_Utility.getIntegratedCircuit(4),null, Materials.Naquadah.getMolten(288), null, - new ItemStack(Loaders.rawAtomicSeparationCatalyst,9), + ItemRefer.Raw_Atomic_Separation_Catalyst.get(9), 300, 480 ); @@ -432,7 +432,7 @@ public class RecipeLoader { GT_Utility.getIntegratedCircuit(4),null, Materials.Naquadah.getMolten(288), null, - new ItemStack(Loaders.rawAtomicSeparationCatalyst,9), + ItemRefer.Raw_Atomic_Separation_Catalyst.get(9), 300, 480 ); @@ -445,7 +445,7 @@ public class RecipeLoader { GT_Utility.getIntegratedCircuit(4),null, Materials.Naquadah.getMolten(288), null, - new ItemStack(Loaders.rawAtomicSeparationCatalyst,27), + ItemRefer.Raw_Atomic_Separation_Catalyst.get(27), 300, 480 ); @@ -458,7 +458,7 @@ public class RecipeLoader { GT_Utility.getIntegratedCircuit(4),null, Materials.Naquadah.getMolten(288), null, - new ItemStack(Loaders.rawAtomicSeparationCatalyst,27), + ItemRefer.Raw_Atomic_Separation_Catalyst.get(27), 300, 480 ); @@ -471,7 +471,7 @@ public class RecipeLoader { GT_Utility.getIntegratedCircuit(4),null, Materials.Naquadah.getMolten(288), null, - new ItemStack(Loaders.rawAtomicSeparationCatalyst,18), + ItemRefer.Raw_Atomic_Separation_Catalyst.get(18), 300, 480 ); @@ -484,7 +484,7 @@ public class RecipeLoader { GT_Utility.getIntegratedCircuit(4),null, Materials.Naquadah.getMolten(288), null, - new ItemStack(Loaders.rawAtomicSeparationCatalyst,18), + ItemRefer.Raw_Atomic_Separation_Catalyst.get(18), 300, 480 ); @@ -497,7 +497,7 @@ public class RecipeLoader { GT_Utility.getIntegratedCircuit(4),null, Materials.Naquadah.getMolten(288), null, - new ItemStack(Loaders.rawAtomicSeparationCatalyst,54), + ItemRefer.Raw_Atomic_Separation_Catalyst.get(54), 300, 480 ); @@ -510,7 +510,7 @@ public class RecipeLoader { GT_Utility.getIntegratedCircuit(4),null, Materials.Naquadah.getMolten(288), null, - new ItemStack(Loaders.rawAtomicSeparationCatalyst,54), + ItemRefer.Raw_Atomic_Separation_Catalyst.get(54), 300, 480 ); @@ -523,7 +523,7 @@ public class RecipeLoader { GT_Utility.getIntegratedCircuit(4),null, Materials.Naquadah.getMolten(288), null, - new ItemStack(Loaders.rawAtomicSeparationCatalyst,18), + ItemRefer.Raw_Atomic_Separation_Catalyst.get(18), 300, 480 ); @@ -536,7 +536,7 @@ public class RecipeLoader { GT_Utility.getIntegratedCircuit(4),null, Materials.Naquadah.getMolten(288), null, - new ItemStack(Loaders.rawAtomicSeparationCatalyst,18), + ItemRefer.Raw_Atomic_Separation_Catalyst.get(18), 300, 480 ); @@ -549,7 +549,7 @@ public class RecipeLoader { GT_Utility.getIntegratedCircuit(4),null, Materials.Naquadah.getMolten(288), null, - new ItemStack(Loaders.rawAtomicSeparationCatalyst,54), + ItemRefer.Raw_Atomic_Separation_Catalyst.get(54), 300, 480 ); @@ -562,7 +562,7 @@ public class RecipeLoader { GT_Utility.getIntegratedCircuit(4),null, Materials.Naquadah.getMolten(288), null, - new ItemStack(Loaders.rawAtomicSeparationCatalyst,54), + ItemRefer.Raw_Atomic_Separation_Catalyst.get(54), 300, 480 ); @@ -577,7 +577,7 @@ public class RecipeLoader { GT_Values.RA.addBlastRecipe( MyMaterial.orundum.get(OrePrefixes.plate,2), - new ItemStack(Loaders.rawAtomicSeparationCatalyst,4), + ItemRefer.Raw_Atomic_Separation_Catalyst.get(4), Materials.Plutonium.getMolten(144), null, MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.ingotHot,1), @@ -853,14 +853,14 @@ public class RecipeLoader { 500000, new Object[]{ GT_OreDictUnificator.get(OrePrefixes.frameGt,Materials.Osmiridium,8), - new ItemStack(Loaders.advancedRadiationProtectionPlate,64), + ItemRefer.Advanced_Radiation_Protection_Plate.get(64), ItemList.Field_Generator_UV.get(8), ItemList.Electric_Pump_UHV.get(2), - new Object[]{OrePrefixes.circuit.get(Materials.Bio),4}, + new Object[]{OrePrefixes.circuit.get(Materials.Bio), 4}, GT_OreDictUnificator.get(OrePrefixes.pipeHuge,Materials.MysteriousCrystal,8), ItemList.Circuit_Wafer_NPIC.get(16), ItemList.UHV_Coil.get(64), - new Object[]{"craftingLensYellow",16}, + new Object[]{"craftingLensYellow", 16}, GT_OreDictUnificator.get(OrePrefixes.screw,Materials.Thulium,64) }, new FluidStack[]{ @@ -869,14 +869,14 @@ public class RecipeLoader { MyMaterial.extremelyUnstableNaquadah.getMolten(1440), Materials.SolderingAlloy.getMolten(14400L) }, - Loaders.FRF.copy(), + ItemRefer.Naquadah_Fuel_Refinery.get(1), 36000, 1919810 ); GT_Values.RA.addAssemblerRecipe( new ItemStack[]{ - new ItemStack(Loaders.radiationProtectionPlate,2), + ItemRefer.Radiation_Protection_Plate.get(2), new ItemStack(Ic2Items.advancedAlloy.getItem(),8), GT_OreDictUnificator.get(OrePrefixes.plateDense,Materials.Palladium,2), GT_OreDictUnificator.get(OrePrefixes.plate,Materials.Osmiridium,4), @@ -885,17 +885,17 @@ public class RecipeLoader { GT_Utility.getIntegratedCircuit(2) }, Materials.NiobiumTitanium.getMolten(72), - new ItemStack(Loaders.advancedRadiationProtectionPlate), + ItemRefer.Advanced_Radiation_Protection_Plate.get(1), 1000, 2040 ); GT_Values.RA.addAssemblylineRecipe( - new ItemStack(Loaders.MAR_Casing), + ItemRefer.Field_Restriction_Casing.get(1), 250000, new Object[]{ GT_OreDictUnificator.get(OrePrefixes.frameGt,Materials.Thulium,1), - new ItemStack(Loaders.advancedRadiationProtectionPlate,6), + ItemRefer.Advanced_Radiation_Protection_Plate.get(6), ItemList.Field_Generator_IV.get(2), GT_OreDictUnificator.get(OrePrefixes.pipeTiny,Materials.Naquadah,16), GT_OreDictUnificator.get(OrePrefixes.wireFine,Materials.NaquadahAlloy,32), @@ -908,7 +908,7 @@ public class RecipeLoader { Materials.TungstenSteel.getMolten(1152), Materials.SolderingAlloy.getMolten(2304) }, - new ItemStack(Loaders.FRF_Casings), + ItemRefer.Naquadah_Fuel_Refinery_Casing.get(1), 500, 65536 ); @@ -939,13 +939,13 @@ public class RecipeLoader { Materials.SolderingAlloy.getMolten(9216), FluidRegistry.getFluidStack("ic2coolant",8000) }, - new ItemStack(Loaders.FRF_Coil_1), + ItemRefer.Field_Restriction_Coil_T1.get(1), 900, 114514 ); GT_Values.RA.addArcFurnaceRecipe( - new ItemStack(Loaders.FRF_Coil_1), + ItemRefer.Field_Restriction_Coil_T1.get(1), new ItemStack[]{ GT_OreDictUnificator.get(OrePrefixes.ingot,Materials.Osmiridium,64), GT_OreDictUnificator.get(OrePrefixes.ingot,Materials.CrystallineAlloy,64), @@ -958,7 +958,7 @@ public class RecipeLoader { ); GT_Values.RA.addAssemblylineRecipe( - new ItemStack(Loaders.FRF_Coil_1), + ItemRefer.Field_Restriction_Coil_T1.get(1), 350000, new Object[]{ GT_OreDictUnificator.get(OrePrefixes.frameGt,Materials.Molybdenum,1), @@ -983,13 +983,13 @@ public class RecipeLoader { Materials.SolderingAlloy.getMolten(9216), FluidRegistry.getFluidStack("ic2coolant",8000) }, - new ItemStack(Loaders.FRF_Coil_2), + ItemRefer.Field_Restriction_Coil_T2.get(1), 2700, 114514 ); GT_Values.RA.addArcFurnaceRecipe( - new ItemStack(Loaders.FRF_Coil_2), + ItemRefer.Field_Restriction_Coil_T2.get(1), new ItemStack[]{ GT_OreDictUnificator.get(OrePrefixes.ingot,Materials.CrystallineAlloy,64), WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.block,56), @@ -1002,7 +1002,7 @@ public class RecipeLoader { ); GT_Values.RA.addAssemblylineRecipe( - new ItemStack(Loaders.FRF_Coil_2), + ItemRefer.Field_Restriction_Coil_T2.get(1), 400000, new Object[]{ GT_OreDictUnificator.get(OrePrefixes.frameGt,Materials.CosmicNeutronium,1), @@ -1027,13 +1027,13 @@ public class RecipeLoader { Materials.SolderingAlloy.getMolten(9216), FluidRegistry.getFluidStack("ic2coolant",8000) }, - new ItemStack(Loaders.FRF_Coil_3), + ItemRefer.Field_Restriction_Coil_T3.get(1), 8100, 114514 ); GT_Values.RA.addArcFurnaceRecipe( - new ItemStack(Loaders.FRF_Coil_3), + ItemRefer.Field_Restriction_Coil_T3.get(1), new ItemStack[]{ GT_OreDictUnificator.get(OrePrefixes.ingot,Materials.CrystallineAlloy,64), GT_OreDictUnificator.get(OrePrefixes.ingot,Materials.BlackPlutonium,64), @@ -1054,7 +1054,7 @@ public class RecipeLoader { GT_Utility.getIntegratedCircuit(6) }, MyMaterial.naquadahAsphalt.getFluidOrGas(500), - new ItemStack(Loaders.fieldRestrictingGlass), + ItemRefer.Field_Restriction_Glass.get(1), 300, 120000 ); @@ -1070,7 +1070,7 @@ public class RecipeLoader { ); GT_Values.RA.addElectrolyzerRecipe( - new ItemStack(Loaders.aluminumNitride,2), + ItemRefer.Aluminum_Nitride_Dust.get(2), null, null, Materials.Nitrogen.getGas(1000L), @@ -1082,57 +1082,57 @@ public class RecipeLoader { ); GT_Values.RA.addMixerRecipe( - new ItemStack(Loaders.aluminumNitride,4), + ItemRefer.Aluminum_Nitride_Dust.get(4), WerkstoffLoader.YttriumOxide.get(OrePrefixes.dust,5), GT_Utility.getIntegratedCircuit(9), null, FluidRegistry.getFluidStack("refinedglue",1000), null, - new ItemStack(Loaders.specialCeramics,9), + ItemRefer.Special_Ceramics_Dust.get(9), 100, 1980 ); GT_Values.RA.addMixerRecipe( - new ItemStack(Loaders.aluminumNitride,4), + ItemRefer.Aluminum_Nitride_Dust.get(4), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Uraninite,5), GT_Utility.getIntegratedCircuit(9), null, FluidRegistry.getFluidStack("refinedglue",1000), null, - new ItemStack(Loaders.specialCeramics,9), + ItemRefer.Special_Ceramics_Dust.get(9), 100, 1980 ); GT_Values.RA.addExtruderRecipe( - new ItemStack(Loaders.specialCeramics,2), + ItemRefer.Special_Ceramics_Dust.get(2), ItemList.Shape_Extruder_Plate.get(0L), - new ItemStack(Loaders.specialCeramicsPlate,1), + ItemRefer.Special_Ceramics_Plate.get(1), 400, 480 ); GT_ModHandler.addCraftingRecipe( - new ItemStack(Loaders.rawCylinder,1), + ItemRefer.Raw_Cylinder.get(1), GT_ModHandler.RecipeBits.DISMANTLEABLE, new Object[]{ "PPP","PFP","PPP", - 'P', new ItemStack(Loaders.specialCeramicsPlate), + 'P', ItemRefer.Special_Ceramics_Plate.get(1), 'F', GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel,1) } ); GT_Values.RA.addAssemblerRecipe( new ItemStack[]{ - new ItemStack(Loaders.rawCylinder,1), + ItemRefer.Raw_Cylinder.get(1), GT_OreDictUnificator.get(OrePrefixes.gearGt,Materials.Titanium,1), GT_OreDictUnificator.get(OrePrefixes.stickLong,Materials.Titanium,4), GT_OreDictUnificator.get(OrePrefixes.plate,Materials.Titanium,6), GT_Utility.getIntegratedCircuit(4) }, null, - new ItemStack(Loaders.titaniumPlatedCylinder,1), + ItemRefer.Titanium_Plated_Cylinder.get(1), 300, 1920 ); @@ -1295,7 +1295,7 @@ public class RecipeLoader { } GT_ModHandler.addCraftingRecipe( - Loaders.UCFE.copy(), + ItemRefer.Universal_Chemical_Fuel_Engine.get(1), GT_ModHandler.RecipeBits.DISMANTLEABLE, new Object[]{ "TZT","ALB","WGW", @@ -1602,7 +1602,7 @@ public class RecipeLoader { GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Carbon,3), FluidRegistry.getFluidStack("liquidnitrogen",1000), null, - new ItemStack(Loaders.aluminumNitride,2), + ItemRefer.Aluminum_Nitride_Dust.get(2), null, 200, 1920, @@ -1614,7 +1614,7 @@ public class RecipeLoader { GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Carbon,3), FluidRegistry.getFluidStack("liquidnitrogen",1000), null, - new ItemStack(Loaders.aluminumNitride,2), + ItemRefer.Aluminum_Nitride_Dust.get(2), null, 200, 1920, diff --git a/src/main/java/GoodGenerator/Loader/RecipeLoader_02.java b/src/main/java/GoodGenerator/Loader/RecipeLoader_02.java index 9cb898810b..ef6fb341a7 100644 --- a/src/main/java/GoodGenerator/Loader/RecipeLoader_02.java +++ b/src/main/java/GoodGenerator/Loader/RecipeLoader_02.java @@ -1,10 +1,14 @@ package GoodGenerator.Loader; +import GoodGenerator.Items.MyMaterial; +import GoodGenerator.util.CrackRecipeAdder; import GoodGenerator.util.ItemRefer; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; import net.minecraft.item.ItemStack; public class RecipeLoader_02 { @@ -24,8 +28,142 @@ public class RecipeLoader_02 { 300, 1920 ); + + GT_Values.RA.addMixerRecipe( + WerkstoffLoader.Zirconium.get(OrePrefixes.dust, 34), + Materials.Tin.getDust(5), + Materials.Iron.getDust(2), + Materials.Chrome.getDust(1), + GT_Utility.getIntegratedCircuit(4), + null, null, null, + MyMaterial.zircaloy4.get(OrePrefixes.dust, 42), + 200, + 120 + ); + + GT_Values.RA.addMixerRecipe( + WerkstoffLoader.Zirconium.get(OrePrefixes.dust, 34), + Materials.Tin.getDust(4), + Materials.Iron.getDust(1), + Materials.Chrome.getDust(1), + Materials.Nickel.getDust(1), + GT_Utility.getIntegratedCircuit(2), + null, null, + MyMaterial.zircaloy2.get(OrePrefixes.dust, 41), + 200, + 120 + ); + + CrackRecipeAdder.reAddBlastRecipe(MyMaterial.zircaloy2, 500, 480, 2800, true); + CrackRecipeAdder.reAddBlastRecipe(MyMaterial.zircaloy2, 513, 480, 2800, false); + CrackRecipeAdder.reAddBlastRecipe(MyMaterial.zircaloy4, 500, 480, 2800, true); + CrackRecipeAdder.reAddBlastRecipe(MyMaterial.zircaloy4, 513, 480, 2800, false); + + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { + MyMaterial.zircaloy4.get(OrePrefixes.plate, 4), + MyMaterial.zircaloy2.get(OrePrefixes.ring, 2), + GT_Utility.getIntegratedCircuit(2) + }, + null, + ItemRefer.Advanced_Fuel_Rod.get(1), + 200, + 120 + ); + + GT_Values.RA.addCannerRecipe( + ItemRefer.Advanced_Fuel_Rod.get(1), + ItemRefer.High_Density_Uranium.get(1), + ItemRefer.Fuel_Rod_U_1.get(1), + null, + 400, + 120 + ); + + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { + ItemRefer.Fuel_Rod_U_1.get(2), + MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), + GT_Utility.getIntegratedCircuit(2) + }, + null, + ItemRefer.Fuel_Rod_U_2.get(1), + 200, + 1920 + ); + + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { + ItemRefer.Fuel_Rod_U_2.get(2), + MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), + GT_Utility.getIntegratedCircuit(5) + }, + null, + ItemRefer.Fuel_Rod_U_4.get(1), + 200, + 1920 + ); + + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { + ItemRefer.Fuel_Rod_U_1.get(4), + MyMaterial.zircaloy2.get(OrePrefixes.stickLong, 6), + GT_Utility.getIntegratedCircuit(4) + }, + null, + ItemRefer.Fuel_Rod_U_4.get(1), + 220, + 1920 + ); } public static void InitLoadRecipe() { + GT_Values.RA.addCentrifugeRecipe( + ItemRefer.Fuel_Rod_U_Depleted_1.get(1), + null, + null, + WerkstoffLoader.Neon.getFluidOrGas(32), + ItemRefer.Advanced_Fuel_Rod.get(1), + Materials.Uranium.getDust(8), + Materials.Plutonium.getDust(2), + Materials.Graphite.getDust(8), + Materials.Uranium235.getDust(1), + Materials.Plutonium241.getDust(1), + new int[]{10000, 10000, 10000, 9000, 5000, 3000}, + 200, + 1920 + ); + + GT_Values.RA.addCentrifugeRecipe( + ItemRefer.Fuel_Rod_U_Depleted_2.get(1), + null, + null, + WerkstoffLoader.Neon.getFluidOrGas(64), + ItemRefer.Advanced_Fuel_Rod.get(2), + Materials.Uranium.getDust(16), + Materials.Plutonium.getDust(4), + Materials.Graphite.getDust(16), + Materials.Uranium235.getDust(2), + Materials.Plutonium241.getDust(2), + new int[]{10000, 10000, 10000, 9000, 5000, 3000}, + 200, + 1920 + ); + + GT_Values.RA.addCentrifugeRecipe( + ItemRefer.Fuel_Rod_U_Depleted_4.get(1), + null, + null, + WerkstoffLoader.Neon.getFluidOrGas(128), + ItemRefer.Advanced_Fuel_Rod.get(4), + Materials.Uranium.getDust(32), + Materials.Plutonium.getDust(8), + Materials.Graphite.getDust(32), + Materials.Uranium235.getDust(4), + Materials.Plutonium241.getDust(4), + new int[]{10000, 10000, 10000, 9000, 5000, 3000}, + 200, + 1920 + ); } } diff --git a/src/main/java/GoodGenerator/Main/GoodGenerator.java b/src/main/java/GoodGenerator/Main/GoodGenerator.java index 7f60272051..69d5f6a9f2 100644 --- a/src/main/java/GoodGenerator/Main/GoodGenerator.java +++ b/src/main/java/GoodGenerator/Main/GoodGenerator.java @@ -1,14 +1,12 @@ package GoodGenerator.Main; import GoodGenerator.Common.CommonProxy; -import GoodGenerator.CrossMod.NEI.IMCForNEI; import GoodGenerator.CrossMod.Thaumcraft.Research; import GoodGenerator.Items.MyMaterial; import GoodGenerator.Loader.*; import GoodGenerator.Network.MessageOpenNeutronSensorGUI; import GoodGenerator.Network.MessageSetNeutronSensorData; import GoodGenerator.Tabs.MyTabs; -import GoodGenerator.Blocks.MyFluids.FluidsBuilder; import com.github.bartimaeusnek.bartworks.API.WerkstoffAdderRegistry; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.SidedProxy; @@ -19,9 +17,6 @@ import cpw.mods.fml.relauncher.Side; import net.minecraft.creativetab.CreativeTabs; import cpw.mods.fml.common.Mod; -import static GoodGenerator.Loader.Loaders.addOreDic; -import static GoodGenerator.Loader.Loaders.addTexturePage; - @SuppressWarnings("ALL") @Mod(modid = GoodGenerator.MOD_ID, version = GoodGenerator.VERSION, dependencies = "required-after:IC2; " @@ -50,32 +45,19 @@ public final class GoodGenerator { @Mod.EventHandler public static void preInit(FMLPreInitializationEvent event){ WerkstoffAdderRegistry.addWerkstoffAdder(new MyMaterial()); - Loaders.compactMod(); - new FluidsBuilder(); - Loaders.Register(); - IMCForNEI.IMCSender(); - addOreDic(); - addTexturePage(); + Loaders.preInitLoad(); proxy.preInit(event); } @Mod.EventHandler public static void init(FMLInitializationEvent event){ + Loaders.initLoad(); proxy.init(event); - RecipeLoader.InitLoadRecipe(); - RecipeLoader_02.InitLoadRecipe(); - FuelRecipeLoader.RegisterFuel(); - NaquadahReworkRecipeLoader.RecipeLoad(); } @Mod.EventHandler public static void postInit(FMLPostInitializationEvent event){ + Loaders.postInitLoad(); + crossMod(); proxy.postInit(event); - RecipeLoader.RecipeLoad(); - RecipeLoader.Fixer(); - RecipeLoader_02.RecipeLoad(); - NeutronActivatorLoader.NARecipeLoad(); - if (Loader.isModLoaded("Thaumcraft")){ - Research.addResearch(); - } } @Mod.EventHandler public void onLoadComplete(FMLLoadCompleteEvent event) { @@ -83,5 +65,9 @@ public final class GoodGenerator { NaquadahReworkRecipeLoader.Remover(); } - + public static void crossMod() { + if (Loader.isModLoaded("Thaumcraft")){ + Research.addResearch(); + } + } }
\ No newline at end of file diff --git a/src/main/java/GoodGenerator/util/CrackRecipeAdder.java b/src/main/java/GoodGenerator/util/CrackRecipeAdder.java index df843c98ae..f9245518f3 100644 --- a/src/main/java/GoodGenerator/util/CrackRecipeAdder.java +++ b/src/main/java/GoodGenerator/util/CrackRecipeAdder.java @@ -1,7 +1,10 @@ package GoodGenerator.util; +import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_Utility; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -57,4 +60,14 @@ public class CrackRecipeAdder { GT_Values.RA.addAssemblerRecipe(inputs, Materials.Tin.getMolten(solders * 2), output, duration, EUt, isClean); GT_Values.RA.addAssemblerRecipe(inputs, Materials.Lead.getMolten(solders * 4), output, duration, EUt, isClean); } + + public static void reAddBlastRecipe(Werkstoff material, int duration, int EUt, int level, boolean gas) { + ItemStack input = material.get(OrePrefixes.dust, 1); + ItemStack output = level > 1750 ? material.get(OrePrefixes.ingotHot, 1) : material.get(OrePrefixes.ingot, 1); + if (gas) { + GT_Values.RA.addBlastRecipe(input, GT_Utility.getIntegratedCircuit(11), Materials.Helium.getGas(1000), null, output, null, duration, EUt, level); + } else { + GT_Values.RA.addBlastRecipe(input, GT_Utility.getIntegratedCircuit(1), null, null, output, null, duration, EUt, level); + } + } } diff --git a/src/main/java/GoodGenerator/util/ItemRefer.java b/src/main/java/GoodGenerator/util/ItemRefer.java index fbfd87eb81..e3abaa44f8 100644 --- a/src/main/java/GoodGenerator/util/ItemRefer.java +++ b/src/main/java/GoodGenerator/util/ItemRefer.java @@ -1,10 +1,13 @@ package GoodGenerator.util; import gregtech.api.util.GT_Utility; +import ic2.api.reactor.IReactorComponent; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import static GoodGenerator.Loader.FuelRodLoader.*; import static GoodGenerator.Loader.Loaders.*; public final class ItemRefer { @@ -34,6 +37,13 @@ public final class ItemRefer { public static ItemRefer Naquadah_Mass = getItemStack(naquadahMass); public static ItemRefer Enriched_Naquadah_Mass = getItemStack(enrichedNaquadahMass); public static ItemRefer Naquadria_Mass = getItemStack(naquadriaMass); + public static ItemRefer Advanced_Fuel_Rod = getItemStack(advancedFuelRod); + public static ItemRefer Fuel_Rod_U_Depleted_1 = getItemStack(rodCompressedUraniumDepleted); + public static ItemRefer Fuel_Rod_U_Depleted_2 = getItemStack(rodCompressedUraniumDepleted_2); + public static ItemRefer Fuel_Rod_U_Depleted_4 = getItemStack(rodCompressedUraniumDepleted_4); + public static ItemRefer Fuel_Rod_U_1 = getItemStack(rodCompressedUranium); + public static ItemRefer Fuel_Rod_U_2 = getItemStack(rodCompressedUranium_2); + public static ItemRefer Fuel_Rod_U_4 = getItemStack(rodCompressedUranium_4); public static ItemRefer Field_Restriction_Casing = getItemStack(MAR_Casing); public static ItemRefer Naquadah_Fuel_Refinery_Casing = getItemStack(FRF_Casings); |