Skip to content
This repository has been archived by the owner on May 26, 2024. It is now read-only.

Commit

Permalink
Dev (#846)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
Dream-Master and github-actions[bot] authored Mar 10, 2024
1 parent d9425c8 commit a39fdcf
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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}
}
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pluginManagement {
}

plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.15'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.16'
}


Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ private static void renderNormalInventoryMetaTileEntity(Block aBlock, int aMeta,
}
}

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);

Expand All @@ -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);
Expand All @@ -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) {
Expand Down

0 comments on commit a39fdcf

Please sign in to comment.