From 59766c69f7622309075efd577c9543a8ac24c3f9 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 29 Jun 2024 10:48:10 -0700 Subject: MultiTileEntityBlock work * Merge MultiTileEntityBlockRegistryInternal into MultiTileEntityBlock * Add a hard dep on NEID for meta extension * Use in world block meta for MuTE ID * Use one block per MuTE Registry * Add WeakTargetRef * Migrate `controller` reference for parts over to a non non cachable WeakTargetRef * Migrate controller WeakReference usage to WeakTargetRef --- src/main/java/gregtech/common/render/GT_MultiTile_Renderer.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/main/java/gregtech/common/render') diff --git a/src/main/java/gregtech/common/render/GT_MultiTile_Renderer.java b/src/main/java/gregtech/common/render/GT_MultiTile_Renderer.java index b34c577834..c8c1d832b0 100644 --- a/src/main/java/gregtech/common/render/GT_MultiTile_Renderer.java +++ b/src/main/java/gregtech/common/render/GT_MultiTile_Renderer.java @@ -16,7 +16,7 @@ import gregtech.GT_Mod; import gregtech.api.interfaces.ITexture; import gregtech.api.logic.ModelRenderLogic; import gregtech.api.logic.interfaces.ModelRenderLogicHost; -import gregtech.api.multitileentity.MultiTileEntityBlockRegistryInternal; +import gregtech.api.multitileentity.MultiTileEntityBlock; import gregtech.api.multitileentity.MultiTileEntityClassContainer; import gregtech.api.multitileentity.MultiTileEntityRegistry; import gregtech.api.multitileentity.interfaces.IMultiBlockController; @@ -35,7 +35,7 @@ public class GT_MultiTile_Renderer implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - if (!(block instanceof MultiTileEntityBlockRegistryInternal muteBlock)) { + if (!(block instanceof MultiTileEntityBlock muteBlock)) { return; } @@ -49,7 +49,8 @@ public class GT_MultiTile_Renderer implements ISimpleBlockRenderingHandler { renderer.setRenderBoundsFromBlock(muteBlock); for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { - ITexture texture = classContainer.referenceTileEntity.getTexture(side); + final ITexture texture = classContainer.getReferenceTileEntity() + .getTexture(side); if (texture == null) continue; switch (side) { case DOWN -> renderYNegative(null, renderer, 0, 0, 0, block, texture, side); -- cgit