aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlodBlock <1356392126@qq.com>2021-08-27 19:36:29 +0800
committerGlodBlock <1356392126@qq.com>2021-08-27 19:36:29 +0800
commit32dc40e003833609d1238cd354849bfef2df635b (patch)
tree60ced0b111c1d9f11524b8cfe42c66f4a08d1dff
parentcbfc300034b5a1860bc68d20df2213c5f9b06e94 (diff)
downloadGT5-Unofficial-32dc40e003833609d1238cd354849bfef2df635b.tar.gz
GT5-Unofficial-32dc40e003833609d1238cd354849bfef2df635b.tar.bz2
GT5-Unofficial-32dc40e003833609d1238cd354849bfef2df635b.zip
ASUS@LAPTOP-D0C5GMDJ MINGW64 /d/Code Room/GoodGenerators/GoodGenerator (main)
$ git add . ASUS@LAPTOP-D0C5GMDJ MINGW64 /d/Code Room/GoodGenerators/GoodGenerator (main) $ git commit -m
-rw-r--r--src/main/java/GoodGenerator/Common/Container/NeutronActivatorGUIContainer.java1
-rw-r--r--src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java31
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() {