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 | |
| 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>
| -rw-r--r-- | dependencies.gradle | 6 | ||||
| -rw-r--r-- | settings.gradle | 2 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index fa1d0a28a9..51e33d12f7 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 37468c7ad1..b11efb014f 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' } 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) { |