diff options
| author | Mary <33456283+FourIsTheNumber@users.noreply.github.com> | 2024-07-24 04:34:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-24 15:34:29 +0700 |
| commit | 371251fbc4e4a564d513d4c183536f2c02c4db08 (patch) | |
| tree | 565d9cc2af7abf41f682882614272e5b3af57411 /src/main/java | |
| parent | 96b03c46a14fb5366ac4ac37ae0746ad3abcc409 (diff) | |
| download | GT5-Unofficial-371251fbc4e4a564d513d4c183536f2c02c4db08.tar.gz GT5-Unofficial-371251fbc4e4a564d513d4c183536f2c02c4db08.tar.bz2 GT5-Unofficial-371251fbc4e4a564d513d4c183536f2c02c4db08.zip | |
Second batch of fixes for new multis (#2759)
* Fixed MFE appearing as header for its NEI recipe categories over singleblock machines, also fixed showing multiamp hatch in NEI preview
* Same fix to recipe categories for TurboCan
* Locked maghatch to a specific casing to prevent clever wallsharing setups that would allow you to duplicate magnet usage
* spotless
* Tooltip adjusted for new hatch placement
Diffstat (limited to 'src/main/java')
2 files changed, 21 insertions, 10 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialElectromagneticSeparator.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialElectromagneticSeparator.java index a644e3ece4..9aa92a8125 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialElectromagneticSeparator.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialElectromagneticSeparator.java @@ -126,7 +126,7 @@ public class GT_MetaTileEntity_IndustrialElectromagneticSeparator " D ", " C ", " " }, { " ", " AAA ", " A A ", " CDA D ADC ", " A A ", " AAA ", " D ", " C ", " " }, - { " ", " BBB ", " BBBBB ", " CDBBBBBDC ", " BBBBB ", " BBB ", + { " ", " BEB ", " BBBBB ", " CDBBBBBDC ", " BBBBB ", " BBB ", " D ", " C ", " " }, { " B~B ", " BBBBB ", " BBBBBBB ", "CDBBBBBBBDC", " BBBBBBB ", " BBBBB ", " BBB ", " D ", " C " } }))) @@ -135,14 +135,7 @@ public class GT_MetaTileEntity_IndustrialElectromagneticSeparator 'B', ofChain( buildHatchAdder(GT_MetaTileEntity_IndustrialElectromagneticSeparator.class) - .adder(GT_MetaTileEntity_IndustrialElectromagneticSeparator::addMagHatch) - .hatchClass(GT_MetaTileEntity_MagHatch.class) - .shouldReject(t -> !(t.mMagHatch == null)) - .casingIndex(((GT_Block_Casings10) GregTech_API.sBlockCasings10).getTextureIndex(0)) - .dot(1) - .build(), - buildHatchAdder(GT_MetaTileEntity_IndustrialElectromagneticSeparator.class) - .atLeast(InputBus, OutputBus, Maintenance, Energy, ExoticEnergy) + .atLeast(InputBus, OutputBus, Maintenance, Energy.or(ExoticEnergy)) .casingIndex(((GT_Block_Casings10) GregTech_API.sBlockCasings10).getTextureIndex(0)) .dot(1) .buildAndChain( @@ -151,6 +144,14 @@ public class GT_MetaTileEntity_IndustrialElectromagneticSeparator ofBlock(GregTech_API.sBlockCasings10, 0))))) .addElement('C', ofFrame(Materials.NeodymiumMagnetic)) .addElement('D', ofFrame(Materials.SamariumMagnetic)) + .addElement( + 'E', + buildHatchAdder(GT_MetaTileEntity_IndustrialElectromagneticSeparator.class) + .adder(GT_MetaTileEntity_IndustrialElectromagneticSeparator::addMagHatch) + .hatchClass(GT_MetaTileEntity_MagHatch.class) + .casingIndex(((GT_Block_Casings10) GregTech_API.sBlockCasings10).getTextureIndex(0)) + .dot(2) + .build()) .build(); public GT_MetaTileEntity_IndustrialElectromagneticSeparator(final int aID, final String aName, @@ -239,7 +240,7 @@ public class GT_MetaTileEntity_IndustrialElectromagneticSeparator .addOtherStructurePart("Any glass", "x12") .addOtherStructurePart("Magnetic Neodymium Frame Box", "x40") .addOtherStructurePart("Magnetic Samarium Frame Box", "x45") - .addOtherStructurePart("Electromagnet Housing", "x1 Only, Any Casing") + .addOtherStructurePart("Electromagnet Housing", "1 Block Above/Behind Controller", 2) .addInputBus("Any Casing", 1) .addOutputBus("Any Casing", 1) .addEnergyHatch("Any Casing", 1) @@ -326,6 +327,11 @@ public class GT_MetaTileEntity_IndustrialElectromagneticSeparator } @Override + public int getRecipeCatalystPriority() { + return -10; + } + + @Override public void loadNBTData(NBTTagCompound aNBT) { if (aNBT.hasKey("polarizerMode")) { machineMode = aNBT.getBoolean("polarizerMode") ? MACHINEMODE_POLARIZER : MACHINEMODE_SEPARATOR; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiCanner.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiCanner.java index 98ca2f869b..b28a7bdca7 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiCanner.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiCanner.java @@ -216,6 +216,11 @@ public class GT_MetaTileEntity_MultiCanner extends } @Override + public int getRecipeCatalystPriority() { + return -10; + } + + @Override public void loadNBTData(NBTTagCompound aNBT) { if (aNBT.hasKey("fluidMode")) { machineMode = aNBT.getBoolean("fluidMode") ? MACHINEMODE_FLUIDCANNER : MACHINEMODE_CANNER; |