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

Make gt multiblocks able to better modify their preview #26

Merged
merged 4 commits into from
Jan 13, 2025
Merged

Make gt multiblocks able to better modify their preview #26

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b97f9c4
make gt multiblocks able to better modify their preview
Lyfts Jan 12, 2025
4df546b
Merge branch 'master' into modify-preview
Dream-Master Jan 12, 2025
75f3bf3
update
serenibyss Jan 13, 2025
96eafbc
check if gt is loaded
Lyfts Jan 13, 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
4 changes: 4 additions & 0 deletions src/main/java/blockrenderer6343/client/world/ObserverWorld.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import blockrenderer6343.BlockRenderer6343;
import blockrenderer6343.client.utils.BRUtil;
import gregtech.api.interfaces.INEIPreviewModifier;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.threads.RunnableMachineUpdate;
Expand Down Expand Up @@ -177,6 +178,9 @@ private int estimateTier(IConstructable multi) {
do {
holo.stackSize = tier + 1;
hasChanged = false;
if (multi instanceof INEIPreviewModifier modifier) {
modifier.onPreviewConstruct(holo);
}
multi.construct(holo, false);

} while (tier++ < MAX_TRIES && hasChanged);
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/blockrenderer6343/integration/gregtech/GTGuiMultiblockHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import blockrenderer6343.integration.nei.GuiMultiblockHandler;
import blockrenderer6343.integration.nei.StructureHacks;
import cpw.mods.fml.relauncher.ReflectionHelper;
import gregtech.api.interfaces.INEIPreviewModifier;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.interfaces.tileentity.ITurnable;
Expand Down Expand Up @@ -173,6 +174,10 @@ protected void placeMultiblock() {
((ITurnable) tTileEntity).setFrontFacing(ForgeDirection.SOUTH);
IMetaTileEntity mte = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity();

if (mte instanceof INEIPreviewModifier modifier) {
modifier.onPreviewConstruct(getBuildTriggerStack());
}

if (mte instanceof ISurvivalConstructable survivalConstructable) {
int iterations = 0;
do {
Expand All @@ -187,10 +192,15 @@ protected void placeMultiblock() {
} else if (tTileEntity instanceof IConstructable iConstructable) {
constructable = iConstructable;
}

if (constructable != null) {
constructable.construct(getBuildTriggerStack(), false);
}

if (mte instanceof INEIPreviewModifier modifier) {
modifier.onPreviewStructureComplete(getBuildTriggerStack());
}

if (!RunnableMachineUpdate.isCurrentThreadEnabled()) {
RunnableMachineUpdate.setCurrentThreadEnabled(true);
}
Expand Down
Loading