diff --git a/dependencies.gradle b/dependencies.gradle index 3afffc3b..72834181 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -34,23 +34,21 @@ * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph */ dependencies { - api('com.github.GTNewHorizons:NotEnoughItems:2.7.60-GTNH:dev') - //api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-656-GTNH:dev') + api('com.github.GTNewHorizons:NotEnoughItems:2.7.69-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-671-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') - api('com.github.GTNewHorizons:waila:1.8.10:dev') - api("com.github.GTNewHorizons:GTNHLib:0.6.34:dev") + api('com.github.GTNewHorizons:waila:1.8.12:dev') + api("com.github.GTNewHorizons:GTNHLib:0.6.38:dev") - implementation(files("C:\\Users\\colpa\\IdeaProjects\\GTNH-Mods\\Applied-Energistics-2-Unofficial\\build\\libs\\appliedenergistics2-rv3-beta-669-GTNH-AEFC-remove-reflection+e68b9aad07-dirty-dev.jar")) - - implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.12.6:dev") { + implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.12.7:dev") { exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' } compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.1.9-GTNH:dev') compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false } - compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.13:dev') - compileOnly('com.github.GTNewHorizons:EnderIO:2.9.18:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.368:dev') { + compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.16:dev') + compileOnly('com.github.GTNewHorizons:EnderIO:2.9.22:dev') + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.420:dev') { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' } @@ -58,8 +56,8 @@ dependencies { compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') compileOnly('com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.16-GTNH:dev') { transitive = false } - compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.8-GTNH:dev') { transitive = false } - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.86:dev") { transitive = false } + compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.11-GTNH:dev') { transitive = false } + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.96:dev") { transitive = false } runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.4:dev") } diff --git a/gradle.properties b/gradle.properties index 71e62947..0f96f766 100644 --- a/gradle.properties +++ b/gradle.properties @@ -151,7 +151,7 @@ modrinthProjectId = # type can be one of [project, version], # and the name is the Modrinth project or version slug/id of the other mod. # Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech -# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true +# Note: UniMixins is automatically set as a required dependency if usesMixins = true. modrinthRelations = # Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens. diff --git a/settings.gradle b/settings.gradle index ff436f2c..7622cde1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.41' } diff --git a/src/main/java/com/glodblock/github/common/tile/TileFluidAutoFiller.java b/src/main/java/com/glodblock/github/common/tile/TileFluidAutoFiller.java index 4e4e97e3..66b50404 100644 --- a/src/main/java/com/glodblock/github/common/tile/TileFluidAutoFiller.java +++ b/src/main/java/com/glodblock/github/common/tile/TileFluidAutoFiller.java @@ -272,11 +272,19 @@ public class TileFluidAutoFiller extends AENetworkInvTile @Override public TickingRequest getTickingRequest(IGridNode node) { - return new TickingRequest(1, 5, this.returnStack == null, true); + return new TickingRequest(1, 5, false, true); } + boolean initialized = false; + @Override public TickRateModulation tickingRequest(IGridNode node, int TicksSinceLastCall) { + if (!initialized) { // run postEvent on AE network is ready + initialized = true; + postEvent(); + if (this.returnStack == null) return TickRateModulation.SLEEP; + } + if (this.getStorageGrid() == null) { return TickRateModulation.SLOWER; } diff --git a/src/main/java/com/glodblock/github/util/ModAndClassUtil.java b/src/main/java/com/glodblock/github/util/ModAndClassUtil.java index 8e4d3e74..65b62cac 100644 --- a/src/main/java/com/glodblock/github/util/ModAndClassUtil.java +++ b/src/main/java/com/glodblock/github/util/ModAndClassUtil.java @@ -9,7 +9,6 @@ import appeng.core.AEConfig; import appeng.core.localization.ButtonToolTips; import appeng.core.localization.GuiText; import cpw.mods.fml.common.Loader; -import gregtech.api.enums.Mods; public final class ModAndClassUtil { @@ -150,6 +149,6 @@ public final class ModAndClassUtil { if (Loader.isModLoaded("Waila")) WAILA = true; if (Loader.isModLoaded("Avaritia")) AVARITIA = true; if (Loader.isModLoaded("hodgepodge")) HODGEPODGE = true; - if (Loader.isModLoaded(Mods.Names.NEW_HORIZONS_CORE_MOD)) NEW_HORIZONS_CORE_MOD = true; + if (Loader.isModLoaded("dreamcraft")) NEW_HORIZONS_CORE_MOD = true; } }