Port to 1.21.4 NeoForge

build.gradle

@@ -70,7 +70,7 @@ runs {
 
 	server {
 		systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
-		programArgument '--nogui'
+		argument '--nogui'
 	}
 
 	// This run config launches GameTestServer and runs all registered gametests, then exits.
@@ -80,12 +80,12 @@ runs {
 		systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
 	}
 
-	data {
+	clientData  {
 		// example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it
 		// workingDirectory project.file('run-data')
 
 		// Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
-		programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
+		arguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
 	}
 }
 
@@ -102,16 +102,7 @@ configurations {
 
 configurations.all {
 	resolutionStrategy {
-		// Override vulnerable msal4j dependency until Minecraft updates to a
-		// newer version. v1.15.0, used by Minecraft 1.21.3, is vulnerable to
-		// CVE-2024-35255.
-		force "com.microsoft.azure:msal4j:1.17.2"
-		// Override vulnerable netty-common dependency until Minecraft updates
-		// to a newer version. v4.1.97.Final, used by Minecraft 1.21 - 1.21.3,
-		// is vulnerable to CVE-2024-47535.
-		force "io.netty:netty-common:4.1.115.Final"
-
-		// Fixes a weird issue in NeoForge 21.3 where it tries to load both
+		// Fixes a weird issue in NeoForge 21.3-21.4 where it tries to load both
 		// ASM 9.7 and ASM 9.5 at the same time.
 		force "org.ow2.asm:asm-analysis:9.7"
 		force "org.ow2.asm:asm:9.7"
@@ -233,7 +224,7 @@ spotless {
 	}
 	json {
 		target "src/**/*.json"
-		gson().indentWithSpaces(2).version("2.10.1")
+		gson().indentWithSpaces(2).version("2.11.0")
 	}
 }
 

gradle.properties

@@ -5,21 +5,21 @@ org.gradle.debug=false
 
 #read more on this at https://github.com/neoforged/ModDevGradle?tab=readme-ov-file#better-minecraft-parameter-names--javadoc-parchment
 # you can also find the latest versions at: https://parchmentmc.org/docs/getting-started
-parchment_minecraft_version=1.21.3
-parchment_mappings_version=2024.12.07
+parchment_minecraft_version=1.21.4
+parchment_mappings_version=2025.01.19
 # Environment Properties
 # You can find the latest versions here: https://projects.neoforged.net/neoforged/neoforge
 # The Minecraft version must agree with the Neo version to get a valid artifact
-minecraft_version=1.21.3
+minecraft_version=1.21.4
 # The Minecraft version range can use any release version of Minecraft as bounds.
 # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
 # as they do not follow standard versioning conventions.
-minecraft_version_range=[1.21.2, 1.21.4)
+minecraft_version_range=[1.21.4, 1.21.5)
 # The Neo version must agree with the Minecraft version to get a valid artifact
 # Check the latest version at: https://projects.neoforged.net/neoforged/neoforge
-neo_version=21.3.58
+neo_version=21.4.72-beta
 # The Neo version range can use any version of Neo as bounds
-neo_version_range=[21.2.0-beta,)
+neo_version_range=[21.4.0-beta,)
 # The loader version range can only use the major version of FML as bounds
 loader_version_range=[4,)
 
@@ -33,7 +33,7 @@ mod_name=Mo Glass
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=GPL-3.0-or-later
 # The mod version. See https://semver.org/
-mod_version=1.10.1-MC1.21.3-NeoForge
+mod_version=1.10.1-MC1.21.4-NeoForge
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html
@@ -44,4 +44,4 @@ mod_authors=Alexander01998
 mod_description=Adds glass stairs and glass slabs to Minecraft.
 
 # CurseForge
-cf_game_version=1.21.3
+cf_game_version=1.21.4

src/main/resources/assets/mo_glass/items/black_stained_glass_slab.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/black_stained_glass_slab"
+  }
+}

src/main/resources/assets/mo_glass/items/black_stained_glass_stairs.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/black_stained_glass_stairs"
+  }
+}

src/main/resources/assets/mo_glass/items/blue_stained_glass_slab.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/blue_stained_glass_slab"
+  }
+}

src/main/resources/assets/mo_glass/items/blue_stained_glass_stairs.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/blue_stained_glass_stairs"
+  }
+}

src/main/resources/assets/mo_glass/items/brown_stained_glass_slab.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/brown_stained_glass_slab"
+  }
+}

src/main/resources/assets/mo_glass/items/brown_stained_glass_stairs.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/brown_stained_glass_stairs"
+  }
+}

src/main/resources/assets/mo_glass/items/cyan_stained_glass_slab.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/cyan_stained_glass_slab"
+  }
+}

src/main/resources/assets/mo_glass/items/cyan_stained_glass_stairs.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/cyan_stained_glass_stairs"
+  }
+}

src/main/resources/assets/mo_glass/items/glass_slab.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/glass_slab"
+  }
+}

src/main/resources/assets/mo_glass/items/glass_stairs.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/glass_stairs"
+  }
+}

src/main/resources/assets/mo_glass/items/gray_stained_glass_slab.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/gray_stained_glass_slab"
+  }
+}

src/main/resources/assets/mo_glass/items/gray_stained_glass_stairs.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/gray_stained_glass_stairs"
+  }
+}

src/main/resources/assets/mo_glass/items/green_stained_glass_slab.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/green_stained_glass_slab"
+  }
+}

src/main/resources/assets/mo_glass/items/green_stained_glass_stairs.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/green_stained_glass_stairs"
+  }
+}

src/main/resources/assets/mo_glass/items/light_blue_stained_glass_slab.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/light_blue_stained_glass_slab"
+  }
+}

src/main/resources/assets/mo_glass/items/light_blue_stained_glass_stairs.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/light_blue_stained_glass_stairs"
+  }
+}

src/main/resources/assets/mo_glass/items/light_gray_stained_glass_slab.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/light_gray_stained_glass_slab"
+  }
+}

src/main/resources/assets/mo_glass/items/light_gray_stained_glass_stairs.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/light_gray_stained_glass_stairs"
+  }
+}

src/main/resources/assets/mo_glass/items/lime_stained_glass_slab.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/lime_stained_glass_slab"
+  }
+}

src/main/resources/assets/mo_glass/items/lime_stained_glass_stairs.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/lime_stained_glass_stairs"
+  }
+}

src/main/resources/assets/mo_glass/items/magenta_stained_glass_slab.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/magenta_stained_glass_slab"
+  }
+}

src/main/resources/assets/mo_glass/items/magenta_stained_glass_stairs.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/magenta_stained_glass_stairs"
+  }
+}

src/main/resources/assets/mo_glass/items/orange_stained_glass_slab.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/orange_stained_glass_slab"
+  }
+}

src/main/resources/assets/mo_glass/items/orange_stained_glass_stairs.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/orange_stained_glass_stairs"
+  }
+}

src/main/resources/assets/mo_glass/items/pink_stained_glass_slab.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/pink_stained_glass_slab"
+  }
+}

src/main/resources/assets/mo_glass/items/pink_stained_glass_stairs.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/pink_stained_glass_stairs"
+  }
+}

src/main/resources/assets/mo_glass/items/purple_stained_glass_slab.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/purple_stained_glass_slab"
+  }
+}

src/main/resources/assets/mo_glass/items/purple_stained_glass_stairs.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/purple_stained_glass_stairs"
+  }
+}

src/main/resources/assets/mo_glass/items/red_stained_glass_slab.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/red_stained_glass_slab"
+  }
+}

src/main/resources/assets/mo_glass/items/red_stained_glass_stairs.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/red_stained_glass_stairs"
+  }
+}

src/main/resources/assets/mo_glass/items/tinted_glass_slab.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/tinted_glass_slab"
+  }
+}

src/main/resources/assets/mo_glass/items/tinted_glass_stairs.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/tinted_glass_stairs"
+  }
+}

src/main/resources/assets/mo_glass/items/white_stained_glass_slab.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/white_stained_glass_slab"
+  }
+}

src/main/resources/assets/mo_glass/items/white_stained_glass_stairs.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/white_stained_glass_stairs"
+  }
+}

src/main/resources/assets/mo_glass/items/yellow_stained_glass_slab.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/yellow_stained_glass_slab"
+  }
+}

src/main/resources/assets/mo_glass/items/yellow_stained_glass_stairs.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "mo_glass:block/yellow_stained_glass_stairs"
+  }
+}