diff --git a/dependencies.gradle b/dependencies.gradle index 9c7e25c..413ebe0 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -34,21 +34,19 @@ * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph */ dependencies { - runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.5.27-GTNH:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.6.19-GTNH:dev") - implementation("com.github.GTNewHorizons:GT5-Unofficial:5.09.45.168:dev") + implementation("com.github.GTNewHorizons:GT5-Unofficial:5.09.48.128:dev") implementation("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") - implementation("com.github.GTNewHorizons:Botania:1.10.12-GTNH:dev") - implementation("com.github.GTNewHorizons:GTNEIOrePlugin:1.3.0:dev") - compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.3.4:dev") + implementation("com.github.GTNewHorizons:Botania:1.11.3-GTNH:dev") + implementation("com.github.GTNewHorizons:GTNEIOrePlugin:1.3.2:dev") - compileOnly("com.github.GTNewHorizons:TecTech:5.3.45:dev") + implementation("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.6:dev") + implementation("com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.90-GTNH:dev") -// runtimeOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-352-GTNH:dev") -// runtimeOnly("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.2.28-gtnh:dev") +// runtimeOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-423-GTNH:dev") +// runtimeOnly("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.21-gtnh:dev") runtimeOnly("com.github.GTNewHorizons:Baubles:1.0.4:dev") - runtimeOnly("com.github.GTNewHorizons:waila:1.7.3:dev") - - + runtimeOnly("com.github.GTNewHorizons:waila:1.8.1:dev") } diff --git a/gradle.properties b/gradle.properties index 5ca01f7..731017e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -76,6 +76,11 @@ accessTransformersFile = # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled! usesMixins = true +# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main. +# This can speed up compile times thanks to not running the mixin annotation processor on all input sources. +# Mixin classes will have access to "main" classes, but not the other way around. +separateMixinSourceSet = + # Adds some debug arguments like verbose output and class export. usesMixinDebug = true @@ -108,9 +113,15 @@ minimizeShadowedDependencies = true # If disabled, won't rename the shadowed classes. relocateShadowedDependencies = true -# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories. +# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories. includeWellKnownRepositories = true +# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated +# list of strings, with the acceptable keys being(case does not matter): +# cursemaven +# modrinth +excludeWellKnownRepositories = + # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven. # Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables. # If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle. @@ -180,4 +191,3 @@ customArchiveBaseName = GTNH-WanNing # Whether IDEA should run spotless checks when pressing the Build button. # This is meant to be set in $HOME/.gradle/gradle.properties. # ideaCheckSpotlessOnBuild = true - diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49..e644113 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 b82aa23..09523c0 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.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index b9caa2a..43f3180 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,5 +17,5 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.22' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.26' } diff --git a/src/main/java/com/github/wohaopa/GTNHModify/strategies/OneTick.java b/src/main/java/com/github/wohaopa/GTNHModify/strategies/OneTick.java index ba0625c..b7b728d 100644 --- a/src/main/java/com/github/wohaopa/GTNHModify/strategies/OneTick.java +++ b/src/main/java/com/github/wohaopa/GTNHModify/strategies/OneTick.java @@ -10,7 +10,10 @@ public class OneTick extends Strategy { @Override public void handler_GT_Recipe(GT_Recipe gtRecipe) { - gtRecipe.mDuration = 1; + if (gtRecipe.getRecipeCategory().unlocalizedName.equals("gg.recipe.naquadah_reactor")) { + gtRecipe.mDuration *= 10; + } else gtRecipe.mDuration = 1; + } @Override