diff options
author | GlodBlock <1356392126@qq.com> | 2021-08-22 19:51:57 +0800 |
---|---|---|
committer | GlodBlock <1356392126@qq.com> | 2021-08-22 19:51:57 +0800 |
commit | c9cc419010a79608b2594e4c5cab80328c144efd (patch) | |
tree | e64e2fb73b640d0e0f1eed69186d088171dedfb3 /src/main/java/GoodGenerator | |
parent | a7aa820008ef07589fff391eea8cf643be5f6238 (diff) | |
download | GT5-Unofficial-c9cc419010a79608b2594e4c5cab80328c144efd.tar.gz GT5-Unofficial-c9cc419010a79608b2594e4c5cab80328c144efd.tar.bz2 GT5-Unofficial-c9cc419010a79608b2594e4c5cab80328c144efd.zip |
add recipe for neutron activator parts
Diffstat (limited to 'src/main/java/GoodGenerator')
11 files changed, 407 insertions, 18 deletions
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MetaTE/NeutronAccelerator.java b/src/main/java/GoodGenerator/Blocks/TEs/MetaTE/NeutronAccelerator.java index d8853e4f02..b4145ae297 100644 --- a/src/main/java/GoodGenerator/Blocks/TEs/MetaTE/NeutronAccelerator.java +++ b/src/main/java/GoodGenerator/Blocks/TEs/MetaTE/NeutronAccelerator.java @@ -54,7 +54,7 @@ public class NeutronAccelerator extends GT_MetaTileEntity_Hatch_Energy { @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (this.getBaseMetaTileEntity().isServerSide()) { - if (aBaseMetaTileEntity.getStoredEU() >= getMaxEUConsume()) { + if (aBaseMetaTileEntity.getStoredEU() >= getMaxEUConsume() && aBaseMetaTileEntity.isAllowedToWork()) { setEUVar(aBaseMetaTileEntity.getStoredEU() - getMaxEUConsume()); isRunning = true; } else { diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java index 4fc44e9469..af244648c7 100644 --- a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java +++ b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java @@ -399,7 +399,7 @@ public class MultiNqGenerator extends GT_MetaTileEntity_MultiblockBase_EM implem .addSeparator() .beginStructureBlock(7, 8, 7, true) .addController("Front bottom") - .addEnergyHatch("Any bottom layer casing, only accept ONE!") + .addDynamoHatch("Any bottom layer casing, only accept ONE!") .addInputHatch("Any bottom layer casing") .addOutputHatch("Any bottom layer casing") .addMaintenanceHatch("Any bottom layer casing") diff --git a/src/main/java/GoodGenerator/Blocks/TEs/NeutronActivator.java b/src/main/java/GoodGenerator/Blocks/TEs/NeutronActivator.java index 9291310c13..29cc5c765e 100644 --- a/src/main/java/GoodGenerator/Blocks/TEs/NeutronActivator.java +++ b/src/main/java/GoodGenerator/Blocks/TEs/NeutronActivator.java @@ -48,7 +48,7 @@ public class NeutronActivator extends GT_MetaTileEntity_MultiblockBase_EM implem protected final ArrayList<NeutronAccelerator> mNeutronAccelerator = new ArrayList<>(); protected final ArrayList<NeutronSensor> mNeutronSensor = new ArrayList<>(); protected int casingAmount = 0; - protected int eV = 0; + protected int eV = 0, mCeil = 0, mFloor = 0; private static final IIconContainer textureFontOn = new Textures.BlockIcons.CustomIcon("icons/NeutronActivator_On"); private static final IIconContainer textureFontOn_Glow = new Textures.BlockIcons.CustomIcon("icons/NeutronActivator_On_GLOW"); @@ -104,6 +104,8 @@ public class NeutronActivator extends GT_MetaTileEntity_MultiblockBase_EM implem for (GT_Recipe recipe : tRecipes) { minNKE = (recipe.mSpecialValue % 10000) * 1000000; maxNKE = (recipe.mSpecialValue / 10000) * 1000000; + mFloor = minNKE; + mCeil = maxNKE; if (recipe.isRecipeInputEqual(true, inFluids, inItems)) { mMaxProgresstime = recipe.mDuration; if (eV <= maxNKE && eV >= minNKE) { @@ -143,12 +145,16 @@ public class NeutronActivator extends GT_MetaTileEntity_MultiblockBase_EM implem @Override public void loadNBTData(NBTTagCompound aNBT) { eV = aNBT.getInteger("mKeV"); + mCeil = aNBT.getInteger("mCeil"); + mFloor = aNBT.getInteger("mFloor"); super.loadNBTData(aNBT); } @Override public void saveNBTData(NBTTagCompound aNBT) { aNBT.setInteger("mKeV", eV); + aNBT.setInteger("mCeil", mCeil); + aNBT.setInteger("mFloor", mFloor); super.saveNBTData(aNBT); } @@ -162,7 +168,7 @@ public class NeutronActivator extends GT_MetaTileEntity_MultiblockBase_EM implem .addInfo("It will output correct products with Specific Neutron Kinetic Energy.") .addInfo("Otherwise it will output trash.") .addInfo("The Neutron Kinetic Energy will decrease 72KeV/s when no Neutron Accelerator is running.") - .addInfo("It will explode when the Neutron Kinetic Energy is over" + EnumChatFormatting.RED + " 300MeV" + EnumChatFormatting.GRAY + ".") + .addInfo("It will explode when the Neutron Kinetic Energy is over" + EnumChatFormatting.RED + " 1200MeV" + EnumChatFormatting.GRAY + ".") .addInfo("The structure is too complex!") .addInfo("Follow the" + EnumChatFormatting.DARK_BLUE + " Tec" + EnumChatFormatting.BLUE + "Tech" + EnumChatFormatting.GRAY + " blueprint to build the main structure.") .addSeparator() @@ -291,7 +297,7 @@ public class NeutronActivator extends GT_MetaTileEntity_MultiblockBase_EM implem } public int maxNeutronKineticEnergy() { - return 300000000; + return 1200000000; } public int getCurrentNeutronKineticEnergy() { @@ -332,6 +338,11 @@ public class NeutronActivator extends GT_MetaTileEntity_MultiblockBase_EM implem } else tHatch.stopOutputRedstoneSignal(); } } + + if (mProgresstime < mMaxProgresstime && (eV > mCeil || eV < mFloor)) { + this.mOutputFluids = null; + this.mOutputItems = new ItemStack[]{ItemRefer.Radioactive_Waste.get(4)}; + } } } diff --git a/src/main/java/GoodGenerator/Items/MyItems.java b/src/main/java/GoodGenerator/Items/MyItems.java index 21d998a4d2..e6c8568482 100644 --- a/src/main/java/GoodGenerator/Items/MyItems.java +++ b/src/main/java/GoodGenerator/Items/MyItems.java @@ -5,11 +5,18 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; public class MyItems extends Item { private final String tex; + private List<String> tooltips = new ArrayList<>(); public MyItems(String name, CreativeTabs Tab){ this.setUnlocalizedName(name); @@ -17,8 +24,29 @@ public class MyItems extends Item { this.tex = name; } + public MyItems(String name, String tooltip, CreativeTabs Tab) { + this.setUnlocalizedName(name); + this.setCreativeTab(Tab); + this.tex = name; + this.tooltips.add(tooltip); + } + + public MyItems(String name, String[] tooltip, CreativeTabs Tab) { + this.setUnlocalizedName(name); + this.setCreativeTab(Tab); + this.tex = name; + this.tooltips = Arrays.asList(tooltip); + } + @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { this.itemIcon = iconRegister.registerIcon(GoodGenerator.MOD_ID + ":" + this.tex); } + + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { + if (tooltips.size() > 0) { + p_77624_3_.addAll(tooltips); + } + } } diff --git a/src/main/java/GoodGenerator/Loader/Loaders.java b/src/main/java/GoodGenerator/Loader/Loaders.java index 6133ccbb25..99022d2832 100644 --- a/src/main/java/GoodGenerator/Loader/Loaders.java +++ b/src/main/java/GoodGenerator/Loader/Loaders.java @@ -22,6 +22,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import static GoodGenerator.util.DescTextLocalization.addText; + public class Loaders { public static final int IDOffset = 32001; @@ -39,11 +41,16 @@ public class Loaders { public static final Item highDensityPlutonium = new RadioactiveItem("highDensityPlutonium", GoodGenerator.GG, 4050); public static final Item rawAtomicSeparationCatalyst = new MyItems("rawAtomicSeparationCatalyst", GoodGenerator.GG); public static final Item advancedRadiationProtectionPlate = new MyItems("advancedRadiationProtectionPlate", GoodGenerator.GG); - public static final Item aluminumNitride = new MyItems("aluminumNitride", GoodGenerator.GG); + public static final Item aluminumNitride = new MyItems("aluminumNitride", "AlN", GoodGenerator.GG); public static final Item specialCeramics = new MyItems("specialCeramics", GoodGenerator.GG); public static final Item specialCeramicsPlate = new MyItems("specialCeramicsPlate", GoodGenerator.GG); public static final Item radioactiveWaste = new RadioactiveItem("radioactiveWaste", GoodGenerator.GG, 400); - //public static final Item plasticCase = new MyItems("plasticCase", GoodGenerator.GG); + public static final Item plasticCase = new MyItems("plasticCase", GoodGenerator.GG); + public static final Item quartzWafer = new MyItems("quartzWafer", GoodGenerator.GG); + public static final Item microHeater = new MyItems("microHeater", GoodGenerator.GG); + public static final Item quartzCrystalResonator = new MyItems("quartzCrystalResonator", GoodGenerator.GG); + public static final Item inverter = new MyItems("inverter", addText("inverter.tooltip", 1), GoodGenerator.GG); + public static final Item neutronSource = new MyItems("neutronSource", GoodGenerator.GG); public static final Block MAR_Casing = new Casing("MAR_Casing", new String[]{GoodGenerator.MOD_ID+":MAR_Casing"}); @@ -98,6 +105,12 @@ public class Loaders { GameRegistry.registerItem(specialCeramics, "specialCeramics", GoodGenerator.MOD_ID); GameRegistry.registerItem(specialCeramicsPlate, "specialCeramicsPlate", GoodGenerator.MOD_ID); GameRegistry.registerItem(radioactiveWaste, "radioactiveWaste", GoodGenerator.MOD_ID); + GameRegistry.registerItem(plasticCase, "plasticCase", GoodGenerator.MOD_ID); + GameRegistry.registerItem(quartzWafer, "quartzWafer", GoodGenerator.MOD_ID); + GameRegistry.registerItem(microHeater, "microHeater", GoodGenerator.MOD_ID); + GameRegistry.registerItem(quartzCrystalResonator, "quartzCrystalResonator", GoodGenerator.MOD_ID); + GameRegistry.registerItem(inverter, "inverter", GoodGenerator.MOD_ID); + GameRegistry.registerItem(neutronSource, "neutronSource", 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); diff --git a/src/main/java/GoodGenerator/Loader/RecipeLoader.java b/src/main/java/GoodGenerator/Loader/RecipeLoader.java index 94f52b8ec5..cbccde048e 100644 --- a/src/main/java/GoodGenerator/Loader/RecipeLoader.java +++ b/src/main/java/GoodGenerator/Loader/RecipeLoader.java @@ -2,6 +2,7 @@ package GoodGenerator.Loader; import GoodGenerator.Items.MyMaterial; import GoodGenerator.util.CrackRecipeAdder; +import GoodGenerator.util.ItemRefer; import GoodGenerator.util.MaterialFix; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import cpw.mods.fml.common.Loader; @@ -85,7 +86,7 @@ public class RecipeLoader { GT_Values.RA.addAssemblerRecipe( new ItemStack[]{ MyMaterial.graphiteUraniumMixture.get(OrePrefixes.dust,4), - GT_OreDictUnificator.get(OrePrefixes.foil,Materials.TungstenCarbide,16), + GT_OreDictUnificator.get(OrePrefixes.foil,Materials.TungstenCarbide,2), GT_Utility.getIntegratedCircuit(1) }, null, @@ -1114,6 +1115,7 @@ public class RecipeLoader { GT_ModHandler.addCraftingRecipe( new ItemStack(Loaders.rawCylinder,1), + GT_ModHandler.RecipeBits.DISMANTLEABLE, new Object[]{ "PPP","PFP","PPP", 'P', new ItemStack(Loaders.specialCeramicsPlate), @@ -1294,6 +1296,7 @@ public class RecipeLoader { GT_ModHandler.addCraftingRecipe( Loaders.UCFE.copy(), + GT_ModHandler.RecipeBits.DISMANTLEABLE, new Object[]{ "TZT","ALB","WGW", 'T', GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium,1), @@ -1305,9 +1308,295 @@ public class RecipeLoader { 'G', GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Osmium,1), } ); + + //neutron activator + GT_Values.RA.addAssemblerRecipe( + new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.PolyvinylChloride, 4), + GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Plastic, 4), + GT_Utility.getIntegratedCircuit(8) + }, + FluidRegistry.getFluidStack("dye.chemical.dyecyan", 144), + ItemRefer.Plastic_Case.get(1), + 100, + 28 + ); + + GT_Values.RA.addAssemblerRecipe( + new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.PolyvinylChloride, 4), + GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Plastic, 4), + GT_Utility.getIntegratedCircuit(8) + }, + FluidRegistry.getFluidStack("dye.watermixed.dyecyan", 144), + ItemRefer.Plastic_Case.get(1), + 100, + 28 + ); + + GT_ModHandler.addCraftingRecipe( + ItemRefer.Plastic_Case.get(1), + new Object[]{ + "PCP","CDC","PCP", + 'P', GT_OreDictUnificator.get(OrePrefixes.stick, Materials.PolyvinylChloride,1), + 'C', GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Plastic,1), + 'D', "dyeCyan" + } + ); + + GT_ModHandler.addCraftingRecipe( + ItemRefer.Micro_Heater.get(1), + GT_ModHandler.RecipeBits.DISMANTLEABLE, + new Object[]{ + "PIP","UBU","CTC", + 'P', "plateQuintuplePaper", + 'I', ItemList.Circuit_Chip_ULPIC, + 'U', "circuitPrimitive", + 'B', ItemList.Circuit_Board_Coated_Basic, + 'C', ItemList.ULV_Coil, + 'T', ItemList.Battery_RE_ULV_Tantalum + } + ); + + GT_Values.RA.addAutoclaveRecipe( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Quartzite,1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium,4), + Materials.Water.getFluid(1000), + ItemRefer.Quartz_Wafer.get(1), + 3333, + 6000, + 30, + true + ); + + GT_Values.RA.addAutoclaveRecipe( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Quartzite,1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium,4), + FluidRegistry.getFluidStack("ic2distilledwater", 1000), + ItemRefer.Quartz_Wafer.get(1), + 3333, + 1500, + 30, + true + ); + + CrackRecipeAdder.addUniversalCircuitAssemblerRecipe( + new ItemStack[]{ + ItemRefer.Quartz_Wafer.get(1), + ItemRefer.Special_Ceramics_Plate.get(2), + ItemRefer.Micro_Heater.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.EnergeticAlloy,4), + ItemList.Circuit_Chip_ILC.get(4), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Silver,2), + }, + ItemRefer.Quartz_Crystal_Resonator.get(1), + 36, + 100, + 120, + true + ); + + CrackRecipeAdder.addUniversalAssemblerRecipe( + new ItemStack[]{ + ItemRefer.Quartz_Crystal_Resonator.get(2), + ItemRefer.Plastic_Case.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good,1), + ItemList.Cover_Screen.get(1), + ItemList.Circuit_Parts_Diode.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium,8), + }, + ItemRefer.Inverter.get(1), + 144, + 240, + 120, + false + ); + + CrackRecipeAdder.addUniversalAssemblerRecipe( + new ItemStack[]{ + ItemRefer.Quartz_Crystal_Resonator.get(2), + ItemRefer.Plastic_Case.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good,1), + ItemList.Cover_Screen.get(1), + ItemList.Circuit_Parts_DiodeSMD.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium,8), + }, + ItemRefer.Inverter.get(1), + 144, + 240, + 120, + false + ); + + CrackRecipeAdder.addUniversalAssemblerRecipe( + new ItemStack[]{ + ItemRefer.Quartz_Crystal_Resonator.get(2), + ItemRefer.Plastic_Case.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good,1), + ItemList.Cover_Screen.get(1), + ItemList.Circuit_Parts_DiodeASMD.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium,8), + }, + ItemRefer.Inverter.get(1), + 144, + 240, + 120, + false + ); + + GT_ModHandler.addCraftingRecipe( + Loaders.NeutronAccelerators[0].copy(), + GT_ModHandler.RecipeBits.DISMANTLEABLE, + new Object[]{ + "WPM","CHI","WPM", + 'W', GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Lead,1), + 'P', GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lead,1), + 'M', GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Lead,1), + 'C', GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood,1), + 'H', ItemList.Hull_ULV, + 'I', ItemRefer.Inverter.get(1), + } + ); + + GT_ModHandler.addCraftingRecipe( + Loaders.NeutronAccelerators[1].copy(), + GT_ModHandler.RecipeBits.DISMANTLEABLE, + new Object[]{ + "WPM","CHI","WPM", + 'W', GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin,1), + 'P', GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Lead,1), + 'M', ItemList.Electric_Motor_LV, + 'C', "plateAnyRubber", + 'H', ItemList.Hull_LV, + 'I', ItemRefer.Inverter.get(1), + } + ); + + GT_Values.RA.addAssemblerRecipe( + new ItemStack[]{ + ItemRefer.Inverter.get(1), + ItemList.Hull_MV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.AnyCopper,2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Plastic,1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Beryllium,2), + ItemList.Electric_Motor_MV.get(2), + }, + null, + Loaders.NeutronAccelerators[2].copy(), + 300, + 120 + ); + + GT_Values.RA.addAssemblerRecipe( + new ItemStack[]{ + ItemRefer.Inverter.get(1), + ItemList.Hull_HV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold,2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.PolyvinylChloride,1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Beryllium,2), + ItemList.Electric_Motor_HV.get(2), + }, + null, + Loaders.NeutronAccelerators[3].copy(), + 300, + 480 + ); + + GT_Values.RA.addAssemblylineRecipe( + Loaders.NeutronAccelerators[5].copy(), + 20000, + new Object[] { + ItemRefer.Inverter.get(2), + ItemList.Hull_LuV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate,2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherStar,1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polybenzimidazole,4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NeodymiumMagnetic,4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NeodymiumMagnetic,4), + ItemList.Electric_Motor_LuV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorMV,4), + }, + new FluidStack[]{ + Materials.Argon.getGas(3000) + }, + Loaders.NeutronAccelerators[6].copy(), + 300, + 30720 + ); + + GT_Values.RA.addAssemblerRecipe( + new ItemStack[]{ + ItemList.Casing_IV.get(1L), + ItemList.Cover_ActivityDetector.get(1L), + ItemList.Cover_Screen.get(1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy,4), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data,1), + ItemList.Sensor_HV.get(2), + GT_Utility.getIntegratedCircuit(1) + }, + Materials.Helium.getGas(1000), + Loaders.NS.copy(), + 200, + 1920 + ); + + GT_ModHandler.addCraftingRecipe( + ItemRefer.Neutron_Source.get(1), + GT_ModHandler.RecipeBits.DISMANTLEABLE, + new Object[]{ + " P ","PUP"," P ", + 'P', GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Steel,1), + 'U', ItemRefer.High_Density_Uranium.get(1) + } + ); + + GT_ModHandler.addCraftingRecipe( + Loaders.NA.copy(), + GT_ModHandler.RecipeBits.DISMANTLEABLE, + new Object[]{ + "PCP","ESE","PCP", + 'C', "circuitMaster", + 'P', GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel,1), + 'E', ItemList.Emitter_EV.get(1), + 'S', ItemRefer.Neutron_Source.get(1), + } + ); } public static void InitLoadRecipe(){ + + GT_Values.RA.addAssemblerRecipe( + new ItemStack[]{ + ItemRefer.Inverter.get(1), + ItemList.Hull_EV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium,2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnySyntheticRubber,1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.IronMagnetic,4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenCarbide,2), + ItemList.Electric_Motor_EV.get(2), + }, + null, + Loaders.NeutronAccelerators[4].copy(), + 300, + 1920 + ); + + GT_Values.RA.addAssemblerRecipe( + new ItemStack[]{ + ItemRefer.Inverter.get(1), + ItemList.Hull_IV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten,2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicone,1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SteelMagnetic,4), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.TungstenCarbide,2), + ItemList.Electric_Motor_IV.get(2), + }, + null, + Loaders.NeutronAccelerators[5].copy(), + 300, + 7680 + ); + GT_Values.RA.addBlastRecipe( GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sapphire,1), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Carbon,3), diff --git a/src/main/java/GoodGenerator/Loader/RecipeLoader_02.java b/src/main/java/GoodGenerator/Loader/RecipeLoader_02.java new file mode 100644 index 0000000000..14f07cb571 --- /dev/null +++ b/src/main/java/GoodGenerator/Loader/RecipeLoader_02.java @@ -0,0 +1,31 @@ +package GoodGenerator.Loader; + +import GoodGenerator.util.ItemRefer; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +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 { + + public static void RecipeLoad(){ + + GT_Values.RA.addAssemblerRecipe( + new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel,1), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueAlloy,1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV,32), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Beryllium,32), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite,1) + }, + null, + ItemRefer.Speeding_Pipe.get(1), + 300, + 1920 + ); + + } +} diff --git a/src/main/java/GoodGenerator/Main/GoodGenerator.java b/src/main/java/GoodGenerator/Main/GoodGenerator.java index f53a1399bd..212381a31b 100644 --- a/src/main/java/GoodGenerator/Main/GoodGenerator.java +++ b/src/main/java/GoodGenerator/Main/GoodGenerator.java @@ -3,10 +3,7 @@ package GoodGenerator.Main; import GoodGenerator.Common.CommonProxy; import GoodGenerator.CrossMod.Thaumcraft.Research; import GoodGenerator.Items.MyMaterial; -import GoodGenerator.Loader.FuelRecipeLoader; -import GoodGenerator.Loader.Loaders; -import GoodGenerator.Loader.NeutronActivatorLoader; -import GoodGenerator.Loader.RecipeLoader; +import GoodGenerator.Loader.*; import GoodGenerator.Network.MessageOpenNeutronSensorGUI; import GoodGenerator.Network.MessageSetNeutronSensorData; import GoodGenerator.Tabs.MyTabs; @@ -71,6 +68,7 @@ public final class GoodGenerator { proxy.postInit(event); RecipeLoader.RecipeLoad(); RecipeLoader.Fixer(); + RecipeLoader_02.RecipeLoad(); NeutronActivatorLoader.NARecipeLoad(); if (Loader.isModLoaded("Thaumcraft")){ Research.addResearch(); diff --git a/src/main/java/GoodGenerator/util/CrackRecipeAdder.java b/src/main/java/GoodGenerator/util/CrackRecipeAdder.java index ced35fa9e6..df843c98ae 100644 --- a/src/main/java/GoodGenerator/util/CrackRecipeAdder.java +++ b/src/main/java/GoodGenerator/util/CrackRecipeAdder.java @@ -1,6 +1,7 @@ package GoodGenerator.util; import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -44,4 +45,16 @@ public class CrackRecipeAdder { GT_Values.RA.addUniversalDistillationRecipe(FluidRegistry.getFluidStack("heavilycracked"+name,1000),actOutput,outputItem,Duration / 2,EUt / 3); } + + public static void addUniversalCircuitAssemblerRecipe(ItemStack[] inputs, ItemStack output, int solders, int duration, int EUt, boolean isClean) { + GT_Values.RA.addCircuitAssemblerRecipe(inputs, Materials.SolderingAlloy.getMolten(solders), output, duration, EUt, isClean); + GT_Values.RA.addCircuitAssemblerRecipe(inputs, Materials.Tin.getMolten(solders * 2), output, duration, EUt, isClean); + GT_Values.RA.addCircuitAssemblerRecipe(inputs, Materials.Lead.getMolten(solders * 4), output, duration, EUt, isClean); + } + + public static void addUniversalAssemblerRecipe(ItemStack[] inputs, ItemStack output, int solders, int duration, int EUt, boolean isClean) { + GT_Values.RA.addAssemblerRecipe(inputs, Materials.SolderingAlloy.getMolten(solders), output, duration, EUt, isClean); + 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); + } } diff --git a/src/main/java/GoodGenerator/util/ItemRefer.java b/src/main/java/GoodGenerator/util/ItemRefer.java index 242e6b98e6..9f880a0726 100644 --- a/src/main/java/GoodGenerator/util/ItemRefer.java +++ b/src/main/java/GoodGenerator/util/ItemRefer.java @@ -25,7 +25,12 @@ public final class ItemRefer { public static ItemRefer Special_Ceramics_Dust = getItemStack(specialCeramics); public static ItemRefer Special_Ceramics_Plate = getItemStack(specialCeramicsPlate); public static ItemRefer Radioactive_Waste = getItemStack(radioactiveWaste); - + public static ItemRefer Plastic_Case = getItemStack(plasticCase); + public static ItemRefer Quartz_Wafer = getItemStack(quartzWafer); + public static ItemRefer Micro_Heater = getItemStack(microHeater); + public static ItemRefer Quartz_Crystal_Resonator = getItemStack(quartzCrystalResonator); + public static ItemRefer Inverter = getItemStack(inverter); + public static ItemRefer Neutron_Source = getItemStack(neutronSource); public static ItemRefer Field_Restriction_Casing = getItemStack(MAR_Casing); public static ItemRefer Naquadah_Fuel_Refinery_Casing = getItemStack(FRF_Casings); @@ -37,15 +42,16 @@ public final class ItemRefer { public static ItemRefer Raw_Cylinder = getItemStack(rawCylinder); public static ItemRefer Titanium_Plated_Cylinder = getItemStack(titaniumPlatedCylinder); public static ItemRefer Magic_Casing = getItemStack(magicCasing); + public static ItemRefer Speeding_Pipe = getItemStack(speedingPipe); public static ItemRefer Essentia_Cell_T1 = getItemStack(essentiaCell, 0); public static ItemRefer Essentia_Cell_T2 = getItemStack(essentiaCell, 1); public static ItemRefer Essentia_Cell_T3 = getItemStack(essentiaCell, 2); public static ItemRefer Essentia_Hatch = getItemStack(essentiaHatch); - public static ItemRefer Large_Naquadah_Reactor = getItemStack(MAR); - public static ItemRefer Naquadah_Fuel_Refinery = getItemStack(FRF); - public static ItemRefer Universal_Chemical_Fuel_Engine = getItemStack(UCFE); - public static ItemRefer Large_Essentia_Generator = getItemStack(LEG); + public static ItemRefer Large_Naquadah_Reactor = getItemStack(MAR.copy()); + public static ItemRefer Naquadah_Fuel_Refinery = getItemStack(FRF.copy()); + public static ItemRefer Universal_Chemical_Fuel_Engine = getItemStack(UCFE.copy()); + public static ItemRefer Large_Essentia_Generator = getItemStack(LEG.copy()); private Item mItem = null; private Block mBlock = null; diff --git a/src/main/java/GoodGenerator/util/MyRecipeAdder.java b/src/main/java/GoodGenerator/util/MyRecipeAdder.java index 0f773a2807..3907ba7f9b 100644 --- a/src/main/java/GoodGenerator/util/MyRecipeAdder.java +++ b/src/main/java/GoodGenerator/util/MyRecipeAdder.java @@ -95,7 +95,7 @@ public class MyRecipeAdder { public void addNeutronActivatorRecipe(FluidStack[] input1, ItemStack[] input2, FluidStack[] output1, ItemStack[] output2, int ticks, int maxNKE, int minNKE) { if (maxNKE <= 0) maxNKE = 1; - if (maxNKE >= 280) maxNKE = 280; + if (maxNKE >= 1100) maxNKE = 1100; if (minNKE < 0) minNKE = 0; if (minNKE >= maxNKE) minNKE = maxNKE - 1; NA.addNARecipe(input1, input2, output1, output2, ticks, maxNKE * 10000 + minNKE); |