Recipe fix (#68)

* ordict stick wood in crop lense item recipe

* update bs wrapper sa etc

* fix core mod recipe

dependencies.gradle

@@ -4,28 +4,28 @@ dependencies {
     api("com.github.GTNewHorizons:CropLoadCore:0.2.0:dev")
     api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
 
-    devOnlyNonPublishable("com.github.GTNewHorizons:GT5-Unofficial:5.09.45.130:dev")
+    devOnlyNonPublishable("com.github.GTNewHorizons:GT5-Unofficial:5.09.48.40:dev")
     compileOnly(deobf("https://media.forgecdn.net/files/2499/612/BiomesOPlenty-1.7.10-2.1.0.2308-universal.jar"))
-    compileOnly("com.github.GTNewHorizons:twilightforest:2.5.19:dev") {
+    compileOnly("com.github.GTNewHorizons:twilightforest:2.6.12:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.11.13-GTNH:dev")
-    compileOnly("com.github.GTNewHorizons:Natura:2.6.1:dev") {
+    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.2-GTNH:dev")
+    compileOnly("com.github.GTNewHorizons:Natura:2.6.4:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.3.42:dev") {
+    compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.5.12:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:Galacticraft:3.1.3-GTNH:dev") {
+    compileOnly("com.github.GTNewHorizons:Galacticraft:3.1.5-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.5.19:dev")
-    //runtimeOnly("com.github.GTNewHorizons:TinkersConstruct:1.11.13-GTNH:dev")
-    //runtimeOnly("com.github.GTNewHorizons:Natura:2.6.1:dev")
-    //runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.3.42:dev")
-    //runtimeOnly("com.github.GTNewHorizons:Galacticraft:3.1.3-GTNH:dev")
+    //runtimeOnly("com.github.GTNewHorizons:twilightforest:2.6.12:dev")
+    //runtimeOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.2-GTNH:dev")
+    //runtimeOnly("com.github.GTNewHorizons:Natura:2.6.4:dev")
+    //runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.5.12:dev")
+    //runtimeOnly("com.github.GTNewHorizons:Galacticraft:3.1.5-GTNH:dev")
 }

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.

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.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.19'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.23'
 }
 
 

src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTCraftingRecipeLoader.java

@@ -226,7 +226,7 @@ public void run() {
                         | GT_ModHandler.RecipeBits.REVERSIBLE,
                 new Object[] { " fL", " Sr", "S  ", 'L',
                         GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Glass, 1L), 'S',
-                        new ItemStack(Items.stick) });
+                        GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L) });
         GT_ModHandler.addCraftingRecipe(
                 GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Glass, 1L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE,

src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTNHMachineRecipeLoader.java

@@ -565,11 +565,13 @@ public final void run() {
                     .itemOutputs(GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 16, 14))
                     .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(extractorRecipes);
 
-            GT_Values.RA.stdBuilder().itemInputs(new ItemStack(CppItems.Modifier, 16, 1))
-                    .itemOutputs(com.dreammaster.item.ItemList.PrimordialPearlFragment.getIS().splitStack(3))
-                    .fluidInputs(Materials.UUMatter.getFluid(52)).duration(20 * MINUTES).eut(384)
-                    .addTo(RecipeMaps.autoclaveRecipes);
+            if (Mods.NewHorizonsCoreMod.isModLoaded()) {
 
+                GT_Values.RA.stdBuilder().itemInputs(new ItemStack(CppItems.Modifier, 16, 1))
+                        .itemOutputs(com.dreammaster.item.ItemList.PrimordialPearlFragment.getIS().splitStack(3))
+                        .fluidInputs(Materials.UUMatter.getFluid(52)).duration(20 * MINUTES).eut(384)
+                        .addTo(RecipeMaps.autoclaveRecipes);
+            }
             GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 32, 14))
                     .itemOutputs(new ItemStack(CppItems.Modifier, 1, 1)).fluidInputs(Materials.UUMatter.getFluid(500))
                     .duration(2 * MINUTES).eut(TierEU.RECIPE_MV).addTo(RecipeMaps.autoclaveRecipes);