diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/GoodGenerator/Common/Container/NeutronActivatorGUIContainer.java | 1 | ||||
| -rw-r--r-- | src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java | 31 |
2 files changed, 30 insertions, 2 deletions
diff --git a/src/main/java/GoodGenerator/Common/Container/NeutronActivatorGUIContainer.java b/src/main/java/GoodGenerator/Common/Container/NeutronActivatorGUIContainer.java index 793949e1ff..27e82fb48d 100644 --- a/src/main/java/GoodGenerator/Common/Container/NeutronActivatorGUIContainer.java +++ b/src/main/java/GoodGenerator/Common/Container/NeutronActivatorGUIContainer.java @@ -36,6 +36,7 @@ public class NeutronActivatorGUIContainer extends GT_Container_MultiMachineEM { } if(mTileEntity.isServerSide()) { NeutronActivator tile = (NeutronActivator) mTileEntity.getMetaTileEntity(); + if (tile == null) return; int currentKineticE = tile.getCurrentNeutronKineticEnergy(); boolean isUpdated = false; if (currentKineticE != KineticE) { diff --git a/src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java b/src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java index 1304955150..6065e184df 100644 --- a/src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java +++ b/src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java @@ -163,7 +163,7 @@ public class NaquadahReworkRecipeLoader { naquadahine.get(OrePrefixes.dust, 10), 10000, 1000, - 1920, + 120, false ); @@ -345,7 +345,7 @@ public class NaquadahReworkRecipeLoader { }, null, 500, - 30720 + 1920 ); GT_Values.RA.addUniversalDistillationRecipe( @@ -472,6 +472,33 @@ public class NaquadahReworkRecipeLoader { 7680, 5000 ); + + GT_Values.RA.addMultiblockChemicalRecipe( + new ItemStack[]{ + GT_Utility.getIntegratedCircuit(24) + }, + new FluidStack[]{ + Materials.Ethylene.getGas(1000), + FluidRegistry.getFluidStack("steam", 2000) + }, + new FluidStack[]{ + Materials.Ethanol.getFluid(1000) + }, + null, + 400, + 480 + ); + + GT_Values.RA.addChemicalRecipeForBasicMachineOnly( + Materials.Ethylene.getCells(1), + GT_Utility.getIntegratedCircuit(24), + FluidRegistry.getFluidStack("steam", 2000), + Materials.Ethanol.getFluid(1000), + Materials.Empty.getCells(1), + null, + 400, + 480 + ); } public static void SmallRecipeChange() { |