diff options
| -rw-r--r-- | build.gradle | 18 | ||||
| -rw-r--r-- | dependencies.gradle | 4 | ||||
| -rw-r--r-- | src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java | 13 |
3 files changed, 18 insertions, 17 deletions
diff --git a/build.gradle b/build.gradle index 3fa171e0dd..3930990407 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1683705740 +//version: 1685785062 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -69,7 +69,7 @@ plugins { id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version id 'com.modrinth.minotaur' version '2.+' apply false id 'com.matthewprenger.cursegradle' version '1.4.0' apply false - id 'com.gtnewhorizons.retrofuturagradle' version '1.3.11' + id 'com.gtnewhorizons.retrofuturagradle' version '1.3.14' } print("You might want to check out './gradlew :faq' if your build fails.\n") @@ -730,7 +730,7 @@ dependencies { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.8') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.13') } java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false} @@ -1276,12 +1276,14 @@ tasks.register('faq') { description = 'Prints frequently asked questions about building a project' doLast { - print("If your build fails to fetch dependencies, they might have been deleted and replaced by newer " + - "versions.\nCheck if the versions you try to fetch are still on the distributing sites.\n" + - "The links can be found in repositories.gradle and build.gradle:repositories, " + - "not build.gradle:buildscript.repositories - this one is for gradle plugin metadata.\n\n" + + print("If your build fails to fetch dependencies, run './gradlew updateDependencies'. " + + "Or you can manually check if the versions are still on the distributing sites - " + + "the links can be found in repositories.gradle and build.gradle:repositories, " + + "but not build.gradle:buildscript.repositories - those ones are for gradle plugin metadata.\n\n" + "If your build fails to recognize the syntax of new Java versions, enable Jabel in your " + - "gradle.properties. See how it's done in GTNH ExampleMod/gradle.properties.") + "gradle.properties. See how it's done in GTNH ExampleMod/gradle.properties. " + + "However, keep in mind that Jabel enables only syntax features, but not APIs that were introduced in " + + "Java 9 or later.") } } diff --git a/dependencies.gradle b/dependencies.gradle index b2b3064df8..2e7338f819 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,8 +1,8 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.24:dev') - api('com.github.GTNewHorizons:bartworks:0.7.6:dev') + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.99:dev') + api('com.github.GTNewHorizons:bartworks:0.7.20:dev') api('com.github.GTNewHorizons:ThaumicTinkerer:2.7.0:dev') compileOnly('org.joml:joml:1.10.2') diff --git a/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java b/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java index 6fc0f988f0..846f783f49 100644 --- a/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java +++ b/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java @@ -687,7 +687,7 @@ public class GTMTE_LapotronicSuperCapacitor // Draw energy from GT hatches for (GT_MetaTileEntity_Hatch_Energy eHatch : super.mEnergyHatches) { - if (eHatch == null || eHatch.getBaseMetaTileEntity().isInvalidTileEntity()) { + if (eHatch == null || !eHatch.isValid()) { continue; } final long power = getPowerToDraw(eHatch.maxEUInput() * eHatch.maxAmperesIn()); @@ -700,7 +700,7 @@ public class GTMTE_LapotronicSuperCapacitor // Output energy to GT hatches for (GT_MetaTileEntity_Hatch_Dynamo eDynamo : super.mDynamoHatches) { - if (eDynamo == null || eDynamo.getBaseMetaTileEntity().isInvalidTileEntity()) { + if (eDynamo == null || !eDynamo.isValid()) { continue; } final long power = getPowerToPush(eDynamo.maxEUOutput() * eDynamo.maxAmperesOut()); @@ -713,7 +713,7 @@ public class GTMTE_LapotronicSuperCapacitor // Draw energy from TT hatches for (GT_MetaTileEntity_Hatch_EnergyMulti eHatch : mEnergyHatchesTT) { - if (eHatch == null || eHatch.getBaseMetaTileEntity().isInvalidTileEntity()) { + if (eHatch == null || !eHatch.isValid()) { continue; } final long power = getPowerToDraw(eHatch.maxEUInput() * eHatch.maxAmperesIn()); @@ -726,8 +726,7 @@ public class GTMTE_LapotronicSuperCapacitor // Output energy to TT hatches for (GT_MetaTileEntity_Hatch_DynamoMulti eDynamo : mDynamoHatchesTT) { - if (eDynamo == null || eDynamo.getBaseMetaTileEntity() == null - || eDynamo.getBaseMetaTileEntity().isInvalidTileEntity()) { + if (eDynamo == null || !eDynamo.isValid()) { continue; } final long power = getPowerToPush(eDynamo.maxEUOutput() * eDynamo.maxAmperesOut()); @@ -740,7 +739,7 @@ public class GTMTE_LapotronicSuperCapacitor // Draw energy from TT Laser hatches for (GT_MetaTileEntity_Hatch_EnergyTunnel eHatch : mEnergyTunnelsTT) { - if (eHatch == null || eHatch.getBaseMetaTileEntity().isInvalidTileEntity()) { + if (eHatch == null || !eHatch.isValid()) { continue; } final long ttLaserWattage = eHatch.maxEUInput() * eHatch.Amperes - (eHatch.Amperes / 20); @@ -754,7 +753,7 @@ public class GTMTE_LapotronicSuperCapacitor // Output energy to TT Laser hatches for (GT_MetaTileEntity_Hatch_DynamoTunnel eDynamo : mDynamoTunnelsTT) { - if (eDynamo == null || eDynamo.getBaseMetaTileEntity().isInvalidTileEntity()) { + if (eDynamo == null || !eDynamo.isValid()) { continue; } final long ttLaserWattage = eDynamo.maxEUOutput() * eDynamo.Amperes - (eDynamo.Amperes / 20); |