diff options
8 files changed, 33 insertions, 15 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index 649209166e..8f14b40a98 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,18 +1,18 @@ // Add your dependencies here dependencies { - runtimeOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.5.24-GTNH:dev') - runtimeOnlyNonPublishable('com.github.GTNewHorizons:waila:1.7.1:dev') + runtimeOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.5.25-GTNH:dev') + runtimeOnlyNonPublishable('com.github.GTNewHorizons:waila:1.7.2:dev') - compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha34:api') { transitive = false } - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.95:dev') - api("com.github.GTNewHorizons:TecTech:5.3.34:dev") + compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha36a:api') { transitive = false } + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.144:dev') + api("com.github.GTNewHorizons:TecTech:5.3.45:dev") api("com.github.GTNewHorizons:GalacticGregGT5:1.1.0:dev") { exclude group:"com.github.GTNewHorizons", module:"bartworks" } api("com.github.GTNewHorizons:Avaritia:1.49:dev") - implementation("com.github.GTNewHorizons:TinkersConstruct:1.11.12-GTNH:dev") + implementation("com.github.GTNewHorizons:TinkersConstruct:1.11.14-GTNH:dev") compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.25:deobf") {transitive = false} - compileOnly("com.github.GTNewHorizons:OpenComputers:1.10.7-GTNH:api") {transitive = false} + compileOnly("com.github.GTNewHorizons:OpenComputers:1.10.9-GTNH:api") {transitive = false} } diff --git a/gradle.properties b/gradle.properties index 9a8fc78abc..fcd5f9f406 100644 --- a/gradle.properties +++ b/gradle.properties @@ -117,7 +117,7 @@ minimizeShadowedDependencies = true # If disabled, won't rename the shadowed classes. relocateShadowedDependencies = true -# Adds the GTNH maven, CurseMaven, IC2/Player maven, and some more well-known 1.7.10 repositories. +# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories. includeWellKnownRepositories = true # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22ce5c..b82aa23a4f 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.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index b11efb014f..378da58941 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.16' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.21' } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java index 3076455c70..764340af42 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java @@ -103,8 +103,8 @@ public class BorosilicateGlass { return representatives; } - private static byte checkWithinBound(byte val, byte lo, byte hi) { - return val > hi || val < lo ? -1 : val; + private static Byte checkWithinBound(byte val, byte lo, byte hi) { + return val > hi || val < lo ? null : val; } /** diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java index de5ef59f18..fc490d6109 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java @@ -365,7 +365,8 @@ public class GT_TileEntity_MegaBlastFurnace extends GT_TileEntity_MegaMultiBlock return false; if (this.glassTier < 8) { - for (GT_MetaTileEntity_Hatch hatch : this.mExoticEnergyHatches) { + for (int i = 0; i < this.mExoticEnergyHatches.size(); ++i) { + GT_MetaTileEntity_Hatch hatch = this.mExoticEnergyHatches.get(i); if (hatch.getConnectionType() == GT_MetaTileEntity_Hatch.ConnectionType.LASER) { return false; } @@ -373,6 +374,11 @@ public class GT_TileEntity_MegaBlastFurnace extends GT_TileEntity_MegaMultiBlock return false; } } + for (int i = 0; i < this.mEnergyHatches.size(); ++i) { + if (this.glassTier < this.mEnergyHatches.get(i).mTier) { + return false; + } + } } this.mHeatingCapacity = (int) this.getCoilLevel().getHeat() + 100 * (BW_Util.getTier(this.getMaxInputEu()) - 2); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaChemicalReactor.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaChemicalReactor.java index 2638f5de7c..3764812689 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaChemicalReactor.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaChemicalReactor.java @@ -162,7 +162,8 @@ public class GT_TileEntity_MegaChemicalReactor if (!this.checkPiece(STRUCTURE_PIECE_MAIN, 2, 2, 0) || this.mMaintenanceHatches.size() != 1) return false; if (this.glassTier < 8) { - for (GT_MetaTileEntity_Hatch hatch : this.mExoticEnergyHatches) { + for (int i = 0; i < this.mExoticEnergyHatches.size(); ++i) { + GT_MetaTileEntity_Hatch hatch = this.mExoticEnergyHatches.get(i); if (hatch.getConnectionType() == GT_MetaTileEntity_Hatch.ConnectionType.LASER) { return false; } @@ -170,6 +171,11 @@ public class GT_TileEntity_MegaChemicalReactor return false; } } + for (int i = 0; i < this.mEnergyHatches.size(); ++i) { + if (this.glassTier < this.mEnergyHatches.get(i).mTier) { + return false; + } + } } return true; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaOilCracker.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaOilCracker.java index 650e386202..8b498694bd 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaOilCracker.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaOilCracker.java @@ -238,7 +238,8 @@ public class GT_TileEntity_MegaOilCracker extends GT_TileEntity_MegaMultiBlockBa if (!this.checkPiece(STRUCTURE_PIECE_MAIN, 6, 6, 0) || this.mMaintenanceHatches.size() != 1) return false; if (this.glassTier < 8) { - for (GT_MetaTileEntity_Hatch hatch : this.mExoticEnergyHatches) { + for (int i = 0; i < this.mExoticEnergyHatches.size(); ++i) { + GT_MetaTileEntity_Hatch hatch = this.mExoticEnergyHatches.get(i); if (hatch.getConnectionType() == GT_MetaTileEntity_Hatch.ConnectionType.LASER) { return false; } @@ -246,6 +247,11 @@ public class GT_TileEntity_MegaOilCracker extends GT_TileEntity_MegaMultiBlockBa return false; } } + for (int i = 0; i < this.mEnergyHatches.size(); ++i) { + if (this.glassTier < this.mEnergyHatches.get(i).mTier) { + return false; + } + } } return true; |