aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/GoodGenerator/Blocks
diff options
context:
space:
mode:
authorGlodBlock <1356392126@qq.com>2021-08-22 19:51:57 +0800
committerGlodBlock <1356392126@qq.com>2021-08-22 19:51:57 +0800
commitc9cc419010a79608b2594e4c5cab80328c144efd (patch)
treee64e2fb73b640d0e0f1eed69186d088171dedfb3 /src/main/java/GoodGenerator/Blocks
parenta7aa820008ef07589fff391eea8cf643be5f6238 (diff)
downloadGT5-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/Blocks')
-rw-r--r--src/main/java/GoodGenerator/Blocks/TEs/MetaTE/NeutronAccelerator.java2
-rw-r--r--src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java2
-rw-r--r--src/main/java/GoodGenerator/Blocks/TEs/NeutronActivator.java17
3 files changed, 16 insertions, 5 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)};
+ }
}
}