fix: Generate data for mc 1.21.11

Author: twisti-dev

surf-api-core/surf-api-core-api/src/main/java/dev/slne/surf/surfapi/core/api/generated/BlockTypeKeys.java

@@ -4,6 +4,7 @@ import io.papermc.paperweight.util.Hash
 import io.papermc.paperweight.util.HashingAlgorithm
 import io.papermc.paperweight.util.fromJson
 import io.papermc.paperweight.util.gson
+import org.gradle.kotlin.dsl.support.serviceOf
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.StandardCopyOption
@@ -67,18 +68,16 @@ val downloadRegistriesTask by tasks.register("downloadRegistries") {
         outputDir.mkdirs()
 
         println("Launching Minecraft data generator...")
-        providers.exec {
-            commandLine = listOf(
-                "java",
-                "-cp",
-                classPath.joinToString(File.pathSeparator) { it.toAbsolutePath().toString() },
-                "net.minecraft.data.Main",
-                "--reports",
-                "--output",
-                outputDir.absolutePath,
-                "--all"
-            )
-        }.result.get().rethrowFailure()
+
+        val execOps = project.serviceOf<ExecOperations>()
+        execOps.javaexec {
+            mainClass.set("net.minecraft.data.Main")
+            classpath =  files(classPath.map { it.toFile() })
+            args("--reports", "--output", outputDir.absolutePath, "--all")
+
+            standardOutput = System.out
+            errorOutput = System.err
+        }
 
         println("Cleaning up...")
         val resourcesDir = file("src/main/resources/registries")

surf-api-core/surf-api-core-api/src/main/java/dev/slne/surf/surfapi/core/api/generated/ItemTypeKeys.java

@@ -14,6 +14,15 @@ import kotlin.io.path.*
 class Main
 
 fun main() {
+    try {
+        generate()
+    } catch (e: Exception) {
+        e.printStackTrace()
+        throw e
+    }
+}
+
+private fun generate() {
     val json = Json {
         ignoreUnknownKeys = true
     }

surf-api-core/surf-api-core-api/src/main/java/dev/slne/surf/surfapi/core/api/generated/SoundKeys.java

@@ -43,6 +43,20 @@
       },
       "trigger": "minecraft:player_killed_entity"
     },
+    "minecraft:camel_husk": {
+      "conditions": {
+        "entity": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "type": "minecraft:camel_husk"
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:player_killed_entity"
+    },
     "minecraft:cave_spider": {
       "conditions": {
         "entity": [
@@ -239,6 +253,20 @@
       },
       "trigger": "minecraft:player_killed_entity"
     },
+    "minecraft:parched": {
+      "conditions": {
+        "entity": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "type": "minecraft:parched"
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:player_killed_entity"
+    },
     "minecraft:phantom": {
       "conditions": {
         "entity": [
@@ -491,6 +519,34 @@
       },
       "trigger": "minecraft:player_killed_entity"
     },
+    "minecraft:zombie_horse": {
+      "conditions": {
+        "entity": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "type": "minecraft:zombie_horse"
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:player_killed_entity"
+    },
+    "minecraft:zombie_nautilus": {
+      "conditions": {
+        "entity": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "type": "minecraft:zombie_nautilus"
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:player_killed_entity"
+    },
     "minecraft:zombie_villager": {
       "conditions": {
         "entity": [
@@ -537,6 +593,7 @@
       "minecraft:blaze",
       "minecraft:bogged",
       "minecraft:breeze",
+      "minecraft:camel_husk",
       "minecraft:cave_spider",
       "minecraft:creaking",
       "minecraft:creeper",
@@ -551,6 +608,7 @@
       "minecraft:hoglin",
       "minecraft:husk",
       "minecraft:magma_cube",
+      "minecraft:parched",
       "minecraft:phantom",
       "minecraft:piglin",
       "minecraft:piglin_brute",
@@ -570,7 +628,9 @@
       "minecraft:zoglin",
       "minecraft:zombie_villager",
       "minecraft:zombie",
-      "minecraft:zombified_piglin"
+      "minecraft:zombie_horse",
+      "minecraft:zombified_piglin",
+      "minecraft:zombie_nautilus"
     ]
   ],
   "sends_telemetry_event": true

surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/generated/VanillaAdvancementKeys.kt

@@ -43,6 +43,20 @@
       },
       "trigger": "minecraft:player_killed_entity"
     },
+    "minecraft:camel_husk": {
+      "conditions": {
+        "entity": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "type": "minecraft:camel_husk"
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:player_killed_entity"
+    },
     "minecraft:cave_spider": {
       "conditions": {
         "entity": [
@@ -239,6 +253,20 @@
       },
       "trigger": "minecraft:player_killed_entity"
     },
+    "minecraft:parched": {
+      "conditions": {
+        "entity": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "type": "minecraft:parched"
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:player_killed_entity"
+    },
     "minecraft:phantom": {
       "conditions": {
         "entity": [
@@ -491,6 +519,34 @@
       },
       "trigger": "minecraft:player_killed_entity"
     },
+    "minecraft:zombie_horse": {
+      "conditions": {
+        "entity": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "type": "minecraft:zombie_horse"
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:player_killed_entity"
+    },
+    "minecraft:zombie_nautilus": {
+      "conditions": {
+        "entity": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "type": "minecraft:zombie_nautilus"
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:player_killed_entity"
+    },
     "minecraft:zombie_villager": {
       "conditions": {
         "entity": [
@@ -543,6 +599,9 @@
     [
       "minecraft:breeze"
     ],
+    [
+      "minecraft:camel_husk"
+    ],
     [
       "minecraft:cave_spider"
     ],
@@ -585,6 +644,9 @@
     [
       "minecraft:magma_cube"
     ],
+    [
+      "minecraft:parched"
+    ],
     [
       "minecraft:phantom"
     ],
@@ -642,8 +704,14 @@
     [
       "minecraft:zombie"
     ],
+    [
+      "minecraft:zombie_horse"
+    ],
     [
       "minecraft:zombified_piglin"
+    ],
+    [
+      "minecraft:zombie_nautilus"
     ]
   ],
   "rewards": {

surf-api-modern-generator/build.gradle.kts

@@ -29,6 +29,7 @@
                 "minecraft:wooden_axe",
                 "minecraft:golden_axe",
                 "minecraft:stone_axe",
+                "minecraft:copper_axe",
                 "minecraft:iron_axe",
                 "minecraft:diamond_axe",
                 "minecraft:netherite_axe"

surf-api-modern-generator/src/main/kotlin/dev/slne/surf/api/gen/Main.kt

@@ -0,0 +1,30 @@
+{
+  "parent": "minecraft:adventure/kill_a_mob",
+  "criteria": {
+    "spear_many_mobs": {
+      "conditions": {
+        "count": 5
+      },
+      "trigger": "minecraft:spear_mobs"
+    }
+  },
+  "display": {
+    "description": {
+      "translate": "advancements.adventure.spear_many_mobs.description"
+    },
+    "frame": "goal",
+    "icon": {
+      "count": 1,
+      "id": "minecraft:iron_spear"
+    },
+    "title": {
+      "translate": "advancements.adventure.spear_many_mobs.title"
+    }
+  },
+  "requirements": [
+    [
+      "spear_many_mobs"
+    ]
+  ],
+  "sends_telemetry_event": true
+}