From fce58626e21f494e25fdfabe2a919db78b071047 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Tue, 3 Sep 2024 17:02:13 +0200 Subject: [PATCH] update gt, rename (#20) --- dependencies.gradle | 2 +- .../client/renderer/WorldSceneRenderer.java | 9 ++++----- .../integration/gregtech/GT_GUI_MultiblockHandler.java | 10 +++++----- .../integration/gregtech/GT_NEI_MultiblockHandler.java | 2 +- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index b3e9362..a5fdbbd 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { api('com.github.GTNewHorizons:StructureLib:1.3.1:dev') - implementation("com.github.GTNewHorizons:GT5-Unofficial:5.09.48.64:dev") + implementation("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.56:dev") compileOnly("com.github.GTNewHorizons:NotEnoughEnergistics:1.6.0:dev") runtimeOnlyNonPublishable("com.github.GTNewHorizons:StructureCompat:0.6.3:dev") diff --git a/src/main/java/blockrenderer6343/client/renderer/WorldSceneRenderer.java b/src/main/java/blockrenderer6343/client/renderer/WorldSceneRenderer.java index 919cc3b..ef5ebeb 100644 --- a/src/main/java/blockrenderer6343/client/renderer/WorldSceneRenderer.java +++ b/src/main/java/blockrenderer6343/client/renderer/WorldSceneRenderer.java @@ -54,8 +54,7 @@ import org.lwjgl.util.glu.GLU; import org.lwjgl.util.vector.Vector3f; -import com.github.bartimaeusnek.bartworks.common.blocks.BW_GlasBlocks; - +import bartworks.common.blocks.BWBlocksGlass; import blockrenderer6343.BlockRenderer6343; import blockrenderer6343.api.utils.BlockPosition; import blockrenderer6343.api.utils.Position; @@ -64,7 +63,7 @@ import blockrenderer6343.client.utils.ProjectionUtils; import blockrenderer6343.client.world.TrackedDummyWorld; import codechicken.lib.vec.Vector3; -import gregtech.common.render.GT_Renderer_Block; +import gregtech.common.render.GTRendererBlock; /** * Created with IntelliJ IDEA. @@ -286,7 +285,7 @@ protected void drawWorld() { bufferBuilder.blockAccess = world; bufferBuilder.setRenderBounds(0, 0, 0, 1, 1, 1); bufferBuilder.renderAllFaces = renderAllFaces; - if (BlockRenderer6343.isBartworksLoaded && block instanceof BW_GlasBlocks bwGlass) { + if (BlockRenderer6343.isBartworksLoaded && block instanceof BWBlocksGlass bwGlass) { // this mod cannot render renderpass = 1 blocks for now bufferBuilder.renderStandardBlockWithColorMultiplier( block, @@ -297,7 +296,7 @@ protected void drawWorld() { bwGlass.getColor(world.getBlockMetadata(pos.x, pos.y, pos.z))[1] / 255f, bwGlass.getColor(world.getBlockMetadata(pos.x, pos.y, pos.z))[2] / 255f); } else if (BlockRenderer6343.isGTLoaded) { - if (!GT_Renderer_Block.INSTANCE.renderWorldBlock( + if (!GTRendererBlock.INSTANCE.renderWorldBlock( world, pos.x, pos.y, diff --git a/src/main/java/blockrenderer6343/integration/gregtech/GT_GUI_MultiblockHandler.java b/src/main/java/blockrenderer6343/integration/gregtech/GT_GUI_MultiblockHandler.java index 427ee96..589e808 100644 --- a/src/main/java/blockrenderer6343/integration/gregtech/GT_GUI_MultiblockHandler.java +++ b/src/main/java/blockrenderer6343/integration/gregtech/GT_GUI_MultiblockHandler.java @@ -16,7 +16,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.ITurnable; -import gregtech.api.threads.GT_Runnable_MachineBlockUpdate; +import gregtech.api.threads.RunnableMachineUpdate; public class GT_GUI_MultiblockHandler extends GUI_MultiblockHandler { @@ -26,8 +26,8 @@ public GT_GUI_MultiblockHandler() { @Override protected void placeMultiblock() { - if (GT_Runnable_MachineBlockUpdate.isCurrentThreadEnabled()) { - GT_Runnable_MachineBlockUpdate.setCurrentThreadEnabled(false); + if (RunnableMachineUpdate.isCurrentThreadEnabled()) { + RunnableMachineUpdate.setCurrentThreadEnabled(false); } IConstructable constructable = null; @@ -75,8 +75,8 @@ protected void placeMultiblock() { StructureLibAPI.disableInstrument(); } - if (!GT_Runnable_MachineBlockUpdate.isCurrentThreadEnabled()) { - GT_Runnable_MachineBlockUpdate.setCurrentThreadEnabled(true); + if (!RunnableMachineUpdate.isCurrentThreadEnabled()) { + RunnableMachineUpdate.setCurrentThreadEnabled(true); } } } diff --git a/src/main/java/blockrenderer6343/integration/gregtech/GT_NEI_MultiblockHandler.java b/src/main/java/blockrenderer6343/integration/gregtech/GT_NEI_MultiblockHandler.java index 35b8288..cc1910d 100644 --- a/src/main/java/blockrenderer6343/integration/gregtech/GT_NEI_MultiblockHandler.java +++ b/src/main/java/blockrenderer6343/integration/gregtech/GT_NEI_MultiblockHandler.java @@ -1,7 +1,7 @@ package blockrenderer6343.integration.gregtech; import static blockrenderer6343.integration.nei.IMCForNEI.GT_NEI_MB_HANDLER_NAME; -import static gregtech.api.GregTech_API.METATILEENTITIES; +import static gregtech.api.GregTechAPI.METATILEENTITIES; import java.util.ArrayList; import java.util.List;