Merge branch '1.21.4'

build.gradle

@@ -27,16 +27,6 @@ repositories {
 	// for more information about repositories.
 }
 
-// Override vulnerable dependencies until Minecraft updates to newer versions
-configurations.all {
-	resolutionStrategy {
-		// v1.15.0, used by Minecraft 1.21.2 and 1.21.3, is vulnerable to CVE-2024-35255
-		force "com.microsoft.azure:msal4j:1.17.2"
-		// 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"
-	}
-}
-
 dependencies {
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
@@ -88,7 +78,7 @@ spotless {
 	}
 	json {
 		target "src/**/*.json"
-		gson().indentWithSpaces(2).version("2.10.1")
+		gson().indentWithSpaces(2).version("2.11.0")
 	}
 }
 

gradle.properties

@@ -1,23 +1,23 @@
-# Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
-org.gradle.parallel=true
-
-# Fabric Properties
-# check these at https://fabricmc.net/develop/ and
-# https://modrinth.com/mod/fabric-api/versions
-minecraft_version=1.21.3
-yarn_mappings=1.21.3+build.2
-loader_version=0.16.7
-
-# Fabric API
-fabric_version=0.106.1+1.21.3
-
-# Mod Properties
-mod_version = 1.10-MC1.21.3
-maven_group = net.wurstclient.glass
-archives_base_name = Mo-Glass
-
-# CurseForge
-cf_game_version=1.21.3
-
-# Dependencies
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx1G
+org.gradle.parallel=true
+
+# Fabric Properties
+# check these at https://fabricmc.net/develop/ and
+# https://modrinth.com/mod/fabric-api/versions
+minecraft_version=1.21.4
+yarn_mappings=1.21.4+build.1
+loader_version=0.16.9
+
+# Fabric API
+fabric_version=0.110.5+1.21.4
+
+# Mod Properties
+mod_version = 1.10-MC1.21.4
+maven_group = net.wurstclient.glass
+archives_base_name = Mo-Glass
+
+# CurseForge
+cf_game_version=1.21.4-Snapshot
+
+# Dependencies

src/main/java/net/wurstclient/glass/GlassSlabBlock.java

@@ -100,7 +100,7 @@ private boolean isInvisibleToGlassStairs(BlockState state,
 			return true;
 
 		// sides
-		if(direction.getHorizontal() != -1)
+		if(direction.getHorizontalQuarterTurns() != -1)
 		{
 			if(type == SlabType.BOTTOM && halfFrom == BlockHalf.BOTTOM)
 				return true;