Port to 1.21.4

Author: Mrbysco

build.gradle

@@ -45,7 +45,7 @@ runs {
         programArgument '--nogui'
     }
 
-    data {
+    clientData {
         // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it
         // workingDirectory project.file('run-data')
 
@@ -83,8 +83,8 @@ dependencies {
 
     localRuntime "mezz.jei:jei-${mc_version}-neoforge:${jei_version}"
 
-    compileOnly "dev.emi:emi-neoforge:${emi_version}:api"
-    localRuntime "dev.emi:emi-neoforge:${emi_version}"
+//    compileOnly "dev.emi:emi-neoforge:${emi_version}:api"
+//    localRuntime "dev.emi:emi-neoforge:${emi_version}"
 }
 
 jar {

gradle.properties

@@ -5,10 +5,10 @@ org.gradle.daemon=false
 org.gradle.debug=false
 
 # Base info
-mc_version=1.21.1
-neo_version=21.1.170
-neogradle.subsystems.parchment.minecraftVersion=1.21.1
-neogradle.subsystems.parchment.mappingsVersion=2024.11.17
+mc_version=1.21.4
+neo_version=21.4.129
+neogradle.subsystems.parchment.minecraftVersion=1.21.4
+neogradle.subsystems.parchment.mappingsVersion=2025.03.23
 neogradle.subsystems.conventions.runs.create-default-run-per-type=false
 mod_group=com.mrbysco.constructionstick
 mod_id=constructionstick
@@ -23,5 +23,5 @@ modrinth_id=ooyjDLZt
 version=1.2.1
 
 # Dependencies
-jei_version=19.21.0.247
-emi_version=1.1.22+1.21.1
+jei_version=20.0.0.4
+#emi_version=1.1.22+1.21.1

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

gradlew

@@ -0,0 +1,26 @@
+{
+  "model": {
+    "type": "minecraft:select",
+    "cases": [
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "constructionstick:item/copper_stick_angel"
+        },
+        "when": "angel"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "constructionstick:item/copper_stick_destruction"
+        },
+        "when": "destruction"
+      }
+    ],
+    "fallback": {
+      "type": "minecraft:model",
+      "model": "constructionstick:item/copper_stick"
+    },
+    "property": "constructionstick:stick_upgrade"
+  }
+}

src/generated/resources/assets/constructionstick/items/copper_stick.json

@@ -0,0 +1,26 @@
+{
+  "model": {
+    "type": "minecraft:select",
+    "cases": [
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "constructionstick:item/diamond_stick_angel"
+        },
+        "when": "angel"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "constructionstick:item/diamond_stick_destruction"
+        },
+        "when": "destruction"
+      }
+    ],
+    "fallback": {
+      "type": "minecraft:model",
+      "model": "constructionstick:item/diamond_stick"
+    },
+    "property": "constructionstick:stick_upgrade"
+  }
+}

src/generated/resources/assets/constructionstick/items/diamond_stick.json

@@ -0,0 +1,26 @@
+{
+  "model": {
+    "type": "minecraft:select",
+    "cases": [
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "constructionstick:item/iron_stick_angel"
+        },
+        "when": "angel"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "constructionstick:item/iron_stick_destruction"
+        },
+        "when": "destruction"
+      }
+    ],
+    "fallback": {
+      "type": "minecraft:model",
+      "model": "constructionstick:item/iron_stick"
+    },
+    "property": "constructionstick:stick_upgrade"
+  }
+}

src/generated/resources/assets/constructionstick/items/iron_stick.json

@@ -0,0 +1,26 @@
+{
+  "model": {
+    "type": "minecraft:select",
+    "cases": [
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "constructionstick:item/netherite_stick_angel"
+        },
+        "when": "angel"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "constructionstick:item/netherite_stick_destruction"
+        },
+        "when": "destruction"
+      }
+    ],
+    "fallback": {
+      "type": "minecraft:model",
+      "model": "constructionstick:item/netherite_stick"
+    },
+    "property": "constructionstick:stick_upgrade"
+  }
+}

src/generated/resources/assets/constructionstick/items/netherite_stick.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "constructionstick:item/template_angel"
+  }
+}