From 86ba200e2152e19471a4f93fdbf8a88a7ff75544 Mon Sep 17 00:00:00 2001 From: TheEpicGamer274 <102255081+TheEpicGamer274@users.noreply.github.com> Date: Wed, 29 Jan 2025 01:44:53 -0500 Subject: [PATCH] Refactor --- .../multi/production/MTEElementalDuplicator.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java index 5a6392785c5..92459154083 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java @@ -81,7 +81,7 @@ protected MultiblockTooltipBuilder createTooltip() { .addPollutionAmount(getPollutionPerSecond(null)) .beginStructureBlock(9, 6, 9, true) .addController("Top Center") - .addCasingInfoMin("Elemental Confinement Shell", 138, false) + .addCasingInfoMin("Elemental Confinement Shell", 120, false) .addCasingInfoMin("Matter Fabricator Casing", 24, false) .addCasingInfoMin("Particle Containment Casing", 24, false) .addCasingInfoMin("Matter Generation Coil", 24, false) @@ -122,7 +122,7 @@ public IStructureDefinition getStructureDefinition() { .addShape( STRUCTURE_PIECE_MAIN, (new String[][] { - { " ccc ", " ccccc ", " ccccccc ", "ccchhhccc", "ccch~hccc", "ccchhhccc", " ccccccc ", + { " ccc ", " ccccc ", " ccccccc ", "ccccccccc", "cccc~cccc", "ccccccccc", " ccccccc ", " ccccc ", " ccc " }, { " cac ", " abfba ", " abfgfba ", "cbfgdgfbc", "afgdddgfa", "cbfgdgfbc", " abfgfba ", " abfba ", " cac " }, @@ -132,7 +132,7 @@ public IStructureDefinition getStructureDefinition() { " e e ", " cec " }, { " cac ", " abfba ", " abfgfba ", "cbfgdgfbc", "afgdddgfa", "cbfgdgfbc", " abfgfba ", " abfba ", " cac " }, - { " ccc ", " ccccc ", " ccccccc ", "ccchhhccc", "ccchhhccc", "ccchhhccc", " ccccccc ", + { " ccc ", " ccccc ", " ccccccc ", "ccccccccc", "ccccccccc", "ccccccccc", " ccccccc ", " ccccc ", " ccc " }, })) .addElement('a', ofBlock(getCasingBlock4(), getCasingMeta6())) .addElement('b', ofBlock(getCasingBlock4(), getCasingMeta7())) @@ -140,9 +140,8 @@ public IStructureDefinition getStructureDefinition() { .addElement('e', ofBlock(getCasingBlock2(), getCasingMeta3())) .addElement('f', ofBlock(getCasingBlock3(), getCasingMeta4())) .addElement('g', ofBlock(getCasingBlock3(), getCasingMeta5())) - .addElement('c', lazy(t -> onElementPass(x -> ++x.mCasing, ofBlock(getCasingBlock(), getCasingMeta())))) .addElement( - 'h', + 'c', lazy( t -> ofChain( buildHatchAdder(MTEElementalDuplicator.class) @@ -172,13 +171,11 @@ public void construct(ItemStack stackSize, boolean hintsOnly) { public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { mCasing = 0; boolean aDidBuild = checkPiece(STRUCTURE_PIECE_MAIN, 4, 4, 0); - if (this.mInputHatches.size() != 1 || (this.mOutputBusses.size() != 1 && !this.mOutputHatches.isEmpty()) - || this.mEnergyHatches.size() != 1 - || this.mReplicatorDataOrbHatches.size() != 1) { + if (this.mReplicatorDataOrbHatches.size() != 1) { return false; } log("Casings: " + mCasing); - return aDidBuild && mCasing >= 138 && checkHatch(); + return aDidBuild && mCasing >= 120 && checkHatch(); } @Override