diff options
author | Martin Robertz <dream-master@gmx.net> | 2024-03-10 23:13:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-10 16:13:33 -0600 |
commit | a39fdcfcc293a57866c03213fd96ebfcc14610c9 (patch) | |
tree | 49e96a04b25bfdb35525a0efe9959887af4c4fd5 /src | |
parent | d9425c8044f6775881ecb78e113920ddae960ce4 (diff) | |
download | GT5-Unofficial-a39fdcfcc293a57866c03213fd96ebfcc14610c9.tar.gz GT5-Unofficial-a39fdcfcc293a57866c03213fd96ebfcc14610c9.tar.bz2 GT5-Unofficial-a39fdcfcc293a57866c03213fd96ebfcc14610c9.zip |
Dev (#846)
* update
(cherry picked from commit 8991894b7892136585913aaab50f0e5f005f6756)
* make it compatible with new GT version
(cherry picked from commit 14dc7f0faec66426378e01ce591216fd1e1c5d46)
* Spotless apply for branch dev for #846 (#847)
spotlessApply
Co-authored-by: GitHub GTNH Actions <>
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java index 9b4962fea7..4c51b1ff09 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java @@ -228,7 +228,7 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block { } } - public static boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, + public boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, RenderBlocks aRenderer) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); @@ -249,7 +249,7 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block { : false; } - public static boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, + public boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, RenderBlocks aRenderer, ITexture[][] aTextures) { aBlock.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); aRenderer.setRenderBoundsFromBlock(aBlock); @@ -262,7 +262,7 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block { return true; } - public static boolean renderPipeBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, + public boolean renderPipeBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, IPipeRenderedTileEntity aTileEntity, RenderBlocks aRenderer) { final int aConnections = aTileEntity.getConnections(); if ((aConnections & HAS_FOAM) != 0) { |