Merge branch 'master' into correct-coal-recipe-order

GTNewHorizons · Jan 29, 2025 · 31da537 · 31da537
2 parents 9d8305a + c146581
commit 31da537
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/...s/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java b/...s/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<MTEElementalDuplicator> 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,17 +132,16 @@ public IStructureDefinition<MTEElementalDuplicator> 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()))
                 .addElement('d', ofBlock(getCasingBlock2(), getCasingMeta2()))
                 .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