aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorSerenibyss <10861407+serenibyss@users.noreply.github.com>2024-08-07 20:15:44 -0500
committerGitHub <noreply@github.com>2024-08-08 08:15:44 +0700
commit97be8a4e1eb8c7ac3f637ea4c89ff94ddc8e37c9 (patch)
tree9f64d231621398c95557010e0e8bbd757e4dfd6a /src/main/java
parentb4b88e9bacff3641ea77056841cadc3b9003036f (diff)
downloadGT5-Unofficial-97be8a4e1eb8c7ac3f637ea4c89ff94ddc8e37c9.tar.gz
GT5-Unofficial-97be8a4e1eb8c7ac3f637ea4c89ff94ddc8e37c9.tar.bz2
GT5-Unofficial-97be8a4e1eb8c7ac3f637ea4c89ff94ddc8e37c9.zip
Remove maintenance hatch requirement for late multis (#2844)
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java12
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_TranscendentPlasmaMixer.java10
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java23
3 files changed, 28 insertions, 17 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java
index b627f62b25..b3ee08f179 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java
@@ -647,8 +647,6 @@ public class GT_MetaTileEntity_PlasmaForge extends
+ EnumChatFormatting.GRAY
+ " TT energy hatch.")
.addStructureInfo(
- "Requires " + EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " maintenance hatch.")
- .addStructureInfo(
"Requires " + EnumChatFormatting.GOLD
+ min_input_hatch
+ EnumChatFormatting.GRAY
@@ -864,8 +862,9 @@ public class GT_MetaTileEntity_PlasmaForge extends
// If there are no energy hatches or TT energy hatches, structure will fail to form.
if ((mEnergyHatches.size() == 0) && (mExoticEnergyHatches.size() == 0)) return false;
- // One maintenance hatch only. Mandatory.
- if (mMaintenanceHatches.size() != 1) return false;
+ // Maintenance hatch not required but left for compatibility.
+ // Don't allow more than 1, no free casing spam!
+ if (mMaintenanceHatches.size() > 1) return false;
// Heat capacity of coils used on multi. No free heat from extra EU!
mHeatingCapacity = (int) getCoilLevel().getHeat();
@@ -1220,4 +1219,9 @@ public class GT_MetaTileEntity_PlasmaForge extends
public boolean supportsBatchMode() {
return true;
}
+
+ @Override
+ public boolean getDefaultHasMaintenanceChecks() {
+ return false;
+ }
}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_TranscendentPlasmaMixer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_TranscendentPlasmaMixer.java
index 2dba9e7c9d..5847eca006 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_TranscendentPlasmaMixer.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_TranscendentPlasmaMixer.java
@@ -123,7 +123,6 @@ public class GT_MetaTileEntity_TranscendentPlasmaMixer
.addStructureInfo(GOLD + "1+ " + GRAY + "Input Hatch")
.addStructureInfo(GOLD + "1+ " + GRAY + "Output Hatch")
.addStructureInfo(GOLD + "1+ " + GRAY + "Input Bus")
- .addStructureInfo(GOLD + "1 " + GRAY + "Maintenance Hatch")
.toolTipFinisher("Gregtech");
return tt;
}
@@ -254,7 +253,9 @@ public class GT_MetaTileEntity_TranscendentPlasmaMixer
return false;
}
- return (mMaintenanceHatches.size() == 1);
+ // Maintenance hatch not required but left for compatibility.
+ // Don't allow more than 1, no free casing spam!
+ return (mMaintenanceHatches.size() <= 1);
}
@Override
@@ -360,4 +361,9 @@ public class GT_MetaTileEntity_TranscendentPlasmaMixer
public boolean supportsVoidProtection() {
return true;
}
+
+ @Override
+ public boolean getDefaultHasMaintenanceChecks() {
+ return false;
+ }
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java
index bd5e579cd2..5532cd5691 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java
@@ -279,16 +279,6 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
.addOutputHatch(EnumChatFormatting.AQUA + "Top" + EnumChatFormatting.GRAY + " Layer", 5)
.addOutputBus(EnumChatFormatting.AQUA + "Top" + EnumChatFormatting.GRAY + " Layer", 5)
.addEnergyHatch(EnumChatFormatting.BLUE + "Bottom" + EnumChatFormatting.GRAY + " Layer", 4)
- .addMaintenanceHatch(
- EnumChatFormatting.BLUE + "Bottom"
- + EnumChatFormatting.GRAY
- + " or "
- + EnumChatFormatting.AQUA
- + "Top"
- + EnumChatFormatting.GRAY
- + " Layer",
- 4,
- 5)
.addStructureInfo(
EnumChatFormatting.WHITE + "Neptunium Plasma Hatch: "
+ EnumChatFormatting.GREEN
@@ -324,7 +314,13 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
return false;
}
- if (mMaintenanceHatches.size() != 1 || mOutputBusses.isEmpty() || mOutputHatches.isEmpty()) {
+ if (mOutputBusses.isEmpty() || mOutputHatches.isEmpty()) {
+ return false;
+ }
+
+ // Maintenance hatch not required but left for compatibility.
+ // Don't allow more than 1, no free casing spam!
+ if (mMaintenanceHatches.size() > 1) {
return false;
}
@@ -936,4 +932,9 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
public boolean supportsBatchMode() {
return true;
}
+
+ @Override
+ public boolean getDefaultHasMaintenanceChecks() {
+ return false;
+ }
}