aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/GoodGenerator/Blocks
diff options
context:
space:
mode:
authorGlodBlock <1356392126@qq.com>2021-06-04 11:47:19 +0800
committerGlodBlock <1356392126@qq.com>2021-06-04 11:47:19 +0800
commitac05aa15020a30f9934a9053da6f7358cb0c05ed (patch)
treee3dbd46a2a6945f1c09eaa2a569b8926dd27eb21 /src/main/java/GoodGenerator/Blocks
parent6eb272c5e7545ac703ace2d5c3095c402ea15fe9 (diff)
downloadGT5-Unofficial-ac05aa15020a30f9934a9053da6f7358cb0c05ed.tar.gz
GT5-Unofficial-ac05aa15020a30f9934a9053da6f7358cb0c05ed.tar.bz2
GT5-Unofficial-ac05aa15020a30f9934a9053da6f7358cb0c05ed.zip
change the des text and setup the new machine
Diffstat (limited to 'src/main/java/GoodGenerator/Blocks')
-rw-r--r--src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java3
-rw-r--r--src/main/java/GoodGenerator/Blocks/TEs/MegaPlasmaTurbine.java62
-rw-r--r--src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java2
3 files changed, 64 insertions, 3 deletions
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java b/src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java
index 4d0b8cbf6a..99b251635d 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java
+++ b/src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java
@@ -219,7 +219,6 @@ public class FuelRefineFactory extends GT_MetaTileEntity_MultiblockBase_EM imple
ArrayList<FluidStack> tFluids = getStoredFluids();
ArrayList<ItemStack> tItems = getStoredInputs();
Collection<GT_Recipe> tRecipes = MyRecipeAdder.instance.FRF.mRecipeList;
- long maxVoltage = getMaxInputVoltage();
for (int i = 0; i < tFluids.size() - 1; i++) {
for (int j = i + 1; j < tFluids.size(); j++) {
@@ -253,7 +252,7 @@ public class FuelRefineFactory extends GT_MetaTileEntity_MultiblockBase_EM imple
for (GT_Recipe recipe : tRecipes){
checkCoil();
if (recipe.mSpecialValue > Tier) continue;
- if (recipe.isRecipeInputEqual(true, inFluids, inItems) && recipe.mEUt <= maxVoltage){
+ if (recipe.isRecipeInputEqual(true, inFluids, inItems)){
mEUt = recipe.mEUt;
mMaxProgresstime = recipe.mDuration / (1 << (Tier - recipe.mSpecialValue));
this.mOutputFluids = recipe.mFluidOutputs;
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MegaPlasmaTurbine.java b/src/main/java/GoodGenerator/Blocks/TEs/MegaPlasmaTurbine.java
new file mode 100644
index 0000000000..4b16ee8332
--- /dev/null
+++ b/src/main/java/GoodGenerator/Blocks/TEs/MegaPlasmaTurbine.java
@@ -0,0 +1,62 @@
+package GoodGenerator.Blocks.TEs;
+
+
+import com.github.bartimaeusnek.crossmod.tectech.TecTechEnabledMulti;
+import com.github.technus.tectech.mechanics.constructable.IConstructable;
+import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti;
+import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyTunnel;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
+import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine_Plasma;
+import net.minecraft.item.ItemStack;
+
+import java.util.List;
+
+public class MegaPlasmaTurbine extends GT_MetaTileEntity_LargeTurbine_Plasma implements TecTechEnabledMulti, IConstructable {
+
+ public MegaPlasmaTurbine(String name){super(name);}
+
+ public MegaPlasmaTurbine(int id, String name, String nameRegional){
+ super(id,name,nameRegional);
+ }
+
+ @Override
+ public void construct(ItemStack itemStack, boolean b) {
+
+ }
+
+ @Override
+ public String[] getStructureDescription(ItemStack itemStack) {
+ return new String[0];
+ }
+
+ @Override
+ public List<GT_MetaTileEntity_Hatch_Energy> getVanillaEnergyHatches() {
+ return this.mEnergyHatches;
+ }
+
+ @Override
+ public List<GT_MetaTileEntity_Hatch_EnergyTunnel> getTecTechEnergyTunnels() {
+ return null;
+ }
+
+ @Override
+ public List<GT_MetaTileEntity_Hatch_EnergyMulti> getTecTechEnergyMultis() {
+ return null;
+ }
+
+ @Override
+ public long[] getCurrentInfoData() {
+ return new long[0];
+ }
+
+ @Override
+ public String[] getInfoDataArray(GT_MetaTileEntity_MultiBlockBase multiBlockBase) {
+ return new String[0];
+ }
+
+ @Override
+ public boolean isMachineBlockUpdateRecursive() {
+ return false;
+ }
+}
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
index 14b101faab..782d6e51e7 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
+++ b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
@@ -361,7 +361,7 @@ public class MultiNqGenerator extends GT_MetaTileEntity_MultiblockBase_EM implem
.addInfo("Controller block for the Naquadah Reactor")
.addInfo("Environmental Friendly!")
.addInfo("Generate power with the High-energy liquid.")
- .addInfo("Input liquid nuclear fuel and liquid naquadah fuel.")
+ .addInfo("Input liquid nuclear fuel or liquid naquadah fuel.")
.addInfo("The reactor will explode when there are more than ONE types of fuel in the hatch!")
.addInfo("Consume coolant 50mb/t to increase the efficiency:")
.addInfo("IC2 Coolant 105%, Super Coolant 150%, Cryotheum 275%")