Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiblock Replicator Hatch Refactor #3868

Merged
merged 2 commits into from
Jan 29, 2025
Merged

Multiblock Replicator Hatch Refactor #3868

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86ba200
Refactor
TheEpicGamer274 Jan 29, 2025
5b0d640
Merge branch 'master' into replicator-hatch-refactor
serenibyss Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions ...s/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 " },
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down