diff --git a/dependencies.gradle b/dependencies.gradle index 01865e4..5d12fd3 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,32 +1,32 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:CropLoadCore:0.2.0:dev") + api("com.github.GTNewHorizons:CropLoadCore:0.3.0:dev") api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") - devOnlyNonPublishable("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.31:dev") + devOnlyNonPublishable("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.218:dev") compileOnly(deobf("https://mediafilez.forgecdn.net/files/2499/612/BiomesOPlenty-1.7.10-2.1.0.2308-universal.jar")) - compileOnly("com.github.GTNewHorizons:twilightforest:2.7.13:dev") { + compileOnly("com.github.GTNewHorizons:twilightforest:2.7.16:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.14.4-GTNH:dev") - compileOnly("com.github.GTNewHorizons:Natura:2.8.9:dev") { + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.14.20-GTNH:dev") + compileOnly("com.github.GTNewHorizons:Natura:2.8.12:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.8.17:dev") { + compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.8.108:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Galacticraft:3.4.2-GTNH:dev") { + compileOnly("com.github.GTNewHorizons:Galacticraft:3.4.15-GTNH:dev") { transitive = false } compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") // for testing //runtimeOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") - //runtimeOnly("com.github.GTNewHorizons:twilightforest:2.7.13:dev") - //runtimeOnly("com.github.GTNewHorizons:TinkersConstruct:1.14.4-GTNH:dev") - //runtimeOnly("com.github.GTNewHorizons:EnderIO:2.10.0:dev") - //runtimeOnly("com.github.GTNewHorizons:Natura:2.8.9:dev") - //runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.8.17:dev") - //runtimeOnly("com.github.GTNewHorizons:Galacticraft:3.4.2-GTNH:dev") + //runtimeOnly("com.github.GTNewHorizons:twilightforest:2.7.16:dev") + //runtimeOnly("com.github.GTNewHorizons:TinkersConstruct:1.14.20-GTNH:dev") + //runtimeOnly("com.github.GTNewHorizons:EnderIO:2.10.15:dev") + //runtimeOnly("com.github.GTNewHorizons:Natura:2.8.12:dev") + //runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.8.108:dev") + //runtimeOnly("com.github.GTNewHorizons:Galacticraft:3.4.15-GTNH:dev") } diff --git a/gradle.properties b/gradle.properties index 7d7c83c..04a1937 100644 --- a/gradle.properties +++ b/gradle.properties @@ -87,7 +87,9 @@ usesMixinDebug = false # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise. mixinPlugin = -# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail! +# Specify the package that contains all of your Mixins. The package must exist or +# the build will fail. If you have a package property defined in your mixins..json, +# it must match with this or the build will fail. mixinsPackage = # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin! @@ -163,6 +165,12 @@ curseForgeRelations = # projects. New projects should not use this parameter. customArchiveBaseName = CropsPP +# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory. +# runClientWorkingDirectory = run/client + +# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory. +# runServerWorkingDirectory = run/server + # Optional parameter to have the build automatically fail if an illegal version is used. # This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'. # The check is ONLY performed if the version is a git tag. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b..d4081da 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.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 9f80246..b4bf855 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.43' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.49' } diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTNHMachineRecipeLoader.java b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTNHMachineRecipeLoader.java index 32c90fa..b182c25 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTNHMachineRecipeLoader.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTNHMachineRecipeLoader.java @@ -557,7 +557,7 @@ public final void run() { if (Mods.NewHorizonsCoreMod.isModLoaded()) { GTValues.RA.stdBuilder().itemInputs(new ItemStack(CppItems.Modifier, 16, 1)) - .itemOutputs(NHItemList.PrimordialPearlFragment.getIS().splitStack(3)) + .itemOutputs(NHItemList.PrimordialPearlFragment.get().splitStack(3)) .fluidInputs(Materials.UUMatter.getFluid(52)).duration(20 * MINUTES).eut(384) .addTo(RecipeMaps.autoclaveRecipes); }