Merge pull request #1 from CodeMonkeysMods/fix/update-datagen-recipe-to-26.1

Fix/update datagen recipe to 26.1

Author: The-Code-Monkey

.github/workflows/build.yml

@@ -12,9 +12,9 @@ jobs:
       matrix:
         # Use these Java versions
         java: [
-          21,    # Current Java LTS
+          25,    # Current Java LTS
         ]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-slim
     steps:
       - name: checkout repository
         uses: actions/checkout@v4
@@ -30,7 +30,7 @@ jobs:
       - name: build
         run: ./gradlew build
       - name: capture build artifacts
-        if: ${{ matrix.java == '21' }} # Only upload artifacts built from latest java
+        if: ${{ matrix.java == '25' }} # Only upload artifacts built from latest java
         uses: actions/upload-artifact@v4
         with:
           name: Artifacts

build.gradle

@@ -11,10 +11,26 @@ base {
 }
 
 repositories {
+	mavenCentral()
+	maven {
+        name = "Fabric"
+        url = "https://maven.fabricmc.net/"
+    }
 	maven {
 		name = "TerraformersMC"
 		url = "https://maven.terraformersmc.com/"
 	}
+	exclusiveContent {
+        forRepository {
+            maven {
+                name = "Modrinth"
+                url = "https://api.modrinth.com/maven"
+            }
+        }
+        filter {
+            includeGroup "maven.modrinth"
+        }
+    }
 }
 
 fabricApi {
@@ -24,14 +40,10 @@ fabricApi {
 }
 
 dependencies {
-	// To change the versions see the gradle.properties file
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	//mappings loom.officialMojangMappings()
-	implementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-	// Fabric API. This is technically optional, but you probably want it anyway.
-	implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-	implementation("com.terraformersmc:modmenu:${project.modmenu_version}")
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    implementation "net.fabricmc:fabric-loader:${project.loader_version}"
+    implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+    implementation "maven.modrinth:modmenu:${project.modmenu_version}"
 }
 
 processResources {
@@ -43,17 +55,17 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.release = 25
+    it.options.encoding = "UTF-8"
+    it.options.release = 25
 }
 
 java {
-	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-	// if it is present.
-	// If you remove this line, sources will not be generated.
-	withSourcesJar()
+    withSourcesJar()
 
-	sourceCompatibility = JavaVersion.VERSION_25
-	targetCompatibility = JavaVersion.VERSION_25
+    // This ensures Gradle actually uses JDK 25 for everything
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(25)
+    }
 }
 
 jar {

gradlew

@@ -0,0 +1,21 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "houseki:bauxite_crushing"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "houseki:bauxite_crushing"
+    ]
+  }
+}

gradlew.bat

@@ -0,0 +1,21 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "houseki:cobblestone_crushing"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "houseki:cobblestone_crushing"
+    ]
+  }
+}

src/main/generated/data/houseki/advancement/recipes/bauxite_crushing.json

@@ -2,6 +2,13 @@
   "parent": "minecraft:recipes/root",
   "criteria": {
     "has_aluminum": {
+      "conditions": {
+        "items": [
+          {
+            "items": "houseki:aluminum"
+          }
+        ]
+      },
       "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {

src/main/generated/data/houseki/advancement/recipes/cobblestone_crushing.json

@@ -2,6 +2,13 @@
   "parent": "minecraft:recipes/root",
   "criteria": {
     "has_aluminum": {
+      "conditions": {
+        "items": [
+          {
+            "items": "houseki:aluminum"
+          }
+        ]
+      },
       "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {

src/main/generated/data/houseki/advancement/recipes/combat/aluminum_axe.json

@@ -2,6 +2,13 @@
   "parent": "minecraft:recipes/root",
   "criteria": {
     "has_aluminum": {
+      "conditions": {
+        "items": [
+          {
+            "items": "houseki:aluminum"
+          }
+        ]
+      },
       "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {

src/main/generated/data/houseki/advancement/recipes/combat/aluminum_boots.json

@@ -2,6 +2,13 @@
   "parent": "minecraft:recipes/root",
   "criteria": {
     "has_aluminum": {
+      "conditions": {
+        "items": [
+          {
+            "items": "houseki:aluminum"
+          }
+        ]
+      },
       "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {