diff --git a/dependencies.gradle b/dependencies.gradle index 2961666..29a43e3 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,14 +1,14 @@ // Add your dependencies here dependencies { - compileOnly 'com.github.GTNewHorizons:GT5-Unofficial:5.09.51.40:dev' - api 'com.github.GTNewHorizons:Baubles:1.0.4:dev' - api 'com.github.GTNewHorizons:ModularUI:1.2.17:dev' - api ('com.github.GTNewHorizons:ThaumicBoots:1.4.2:dev'){ + api('com.github.GTNewHorizons:Baubles:1.0.4:dev') + api('com.github.GTNewHorizons:ModularUI:1.2.18:dev') + api('com.github.GTNewHorizons:ThaumicBoots:1.4.4:dev') { exclude group: 'com.github.GTNewHorizons', module: 'Electro-Magic-Tools' } + api('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') + api('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') - api 'net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev' - api 'thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev' + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.176:dev') } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b9..9bbc975 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2847c8..37f853b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6..faf9300 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -206,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. diff --git a/settings.gradle b/settings.gradle index 0147a99..40fb369 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.37' } diff --git a/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java b/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java index 50750ae..721f203 100644 --- a/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java +++ b/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java @@ -700,17 +700,17 @@ public class TileEntityBaseGenerator extends TileEntityEMT implements IInventory } @Override - public byte getMetaID(int aX, int aY, int aZ) { + public int getMetaID(int aX, int aY, int aZ) { return (byte) this.worldObj.getBlockMetadata(aX, aY, aZ); } @Override - public byte getMetaIDOffset(int aX, int aY, int aZ) { + public int getMetaIDOffset(int aX, int aY, int aZ) { return getMetaID(this.xCoord + aX, this.yCoord + aY, this.zCoord + aZ); } @Override - public byte getMetaIDAtSide(ForgeDirection side) { + public int getMetaIDAtSide(ForgeDirection side) { int tX = getOffsetX(side, 1); int tY = getOffsetY(side, 1); int tZ = getOffsetZ(side, 1); @@ -718,7 +718,7 @@ public class TileEntityBaseGenerator extends TileEntityEMT implements IInventory } @Override - public byte getMetaIDAtSideAndDistance(ForgeDirection side, int aDistance) { + public int getMetaIDAtSideAndDistance(ForgeDirection side, int aDistance) { if (aDistance == 1) { return getMetaIDAtSide(side); } diff --git a/src/main/java/emt/tile/solar/TileEntitySolarBase.java b/src/main/java/emt/tile/solar/TileEntitySolarBase.java index 727f428..aa2aec9 100644 --- a/src/main/java/emt/tile/solar/TileEntitySolarBase.java +++ b/src/main/java/emt/tile/solar/TileEntitySolarBase.java @@ -713,17 +713,17 @@ public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IW } @Override - public byte getMetaID(int aX, int aY, int aZ) { + public int getMetaID(int aX, int aY, int aZ) { return (byte) this.worldObj.getBlockMetadata(aX, aY, aZ); } @Override - public byte getMetaIDOffset(int aX, int aY, int aZ) { + public int getMetaIDOffset(int aX, int aY, int aZ) { return getMetaID(this.xCoord + aX, this.yCoord + aY, this.zCoord + aZ); } @Override - public byte getMetaIDAtSide(ForgeDirection side) { + public int getMetaIDAtSide(ForgeDirection side) { int tX = getOffsetX(side, 1); int tY = getOffsetY(side, 1); int tZ = getOffsetZ(side, 1); @@ -731,7 +731,7 @@ public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IW } @Override - public byte getMetaIDAtSideAndDistance(ForgeDirection side, int aDistance) { + public int getMetaIDAtSideAndDistance(ForgeDirection side, int aDistance) { if (aDistance == 1) { return getMetaIDAtSide(side); }