From 1a5724f6b583fd5633cd4b35af26a9d22052e7fb Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sun, 10 Mar 2024 21:47:30 +0100 Subject: [PATCH 1/3] update (cherry picked from commit 8991894b7892136585913aaab50f0e5f005f6756) --- dependencies.gradle | 6 +++--- settings.gradle | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index fa1d0a28a..51e33d12f 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,6 +1,6 @@ dependencies { - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.86:dev') - api("com.github.GTNewHorizons:bartworks:0.9.14:dev") + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.95:dev') + api("com.github.GTNewHorizons:bartworks:0.9.17:dev") implementation('curse.maven:cofh-core-69162:2388751') // https://www.curseforge.com/minecraft/mc-mods/advancedsolarpanels @@ -14,5 +14,5 @@ dependencies { compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:Chisel:2.14.1-GTNH:dev') {transitive=false} - runtimeOnly('com.github.GTNewHorizons:ForestryMC:4.8.5:dev') {transitive=false} + runtimeOnly('com.github.GTNewHorizons:ForestryMC:4.8.7:dev') {transitive=false} } diff --git a/settings.gradle b/settings.gradle index 37468c7ad..b11efb014 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.15' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.16' } From bd5d5a34ddc6417311b54700a22799778b098bb2 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sun, 10 Mar 2024 21:57:51 +0100 Subject: [PATCH 2/3] make it compatible with new GT version (cherry picked from commit 14dc7f0faec66426378e01ce591216fd1e1c5d46) --- .../gregtech/common/render/GTPP_Render_MachineBlock.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 9b4962fea..c6a38f73b 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,8 +228,8 @@ private static void renderNormalInventoryMetaTileEntity(Block aBlock, int aMeta, } } - public static boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, - RenderBlocks aRenderer) { + public boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, + RenderBlocks aRenderer) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); return tTileEntity instanceof ITexturedTileEntity @@ -249,7 +249,7 @@ public static boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, i : 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 static boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, i 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) { From a9eb52e06e022b91b50a21ceaef848411e495f36 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 10 Mar 2024 22:11:33 +0100 Subject: [PATCH 3/3] Spotless apply for branch dev for #846 (#847) spotlessApply Co-authored-by: GitHub GTNH Actions <> --- .../xmod/gregtech/common/render/GTPP_Render_MachineBlock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c6a38f73b..4c51b1ff0 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 @@ -229,7 +229,7 @@ private static void renderNormalInventoryMetaTileEntity(Block aBlock, int aMeta, } public boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, - RenderBlocks aRenderer) { + RenderBlocks aRenderer) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); return tTileEntity instanceof ITexturedTileEntity