backport fix for #68 (#78)

Fabricators-of-Create · Jan 22, 2024 · 6579e46 · 6579e46
1 parent 3796468
commit 6579e46
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -7,8 +7,8 @@ mod_version = 1.2.<patch>-beta
 
 # https://fabricmc.net/develop
 minecraft_version = 1.18.2
-loader_version = 0.14.19
-fabric_version = 0.56.0+1.18.2
+loader_version = 0.15.6
+fabric_version = 0.77.0+1.18.2
 serialization_hooks_version = 0.3.23
 
 forge_tags_version = 2.1

diff --git a/...in/java/io/github/fabricators_of_create/porting_lib/mixin/client/ShaderInstanceMixin.java b/...in/java/io/github/fabricators_of_create/porting_lib/mixin/client/ShaderInstanceMixin.java
@@ -31,12 +31,5 @@ private String fixId(String path) {
 		return split.getNamespace() + ":shaders/core/" + split.getPath() + ".json";
 	}
 
-	@ModifyVariable(method = "getOrCreate", at = @At("STORE"), ordinal = 1)
-	private static String fixPath(String path, ResourceProvider resourceProvider, Program.Type programType, String name) {
-		if (!name.contains(":")) {
-			return path;
-		}
-		ResourceLocation split = new ResourceLocation(name);
-		return split.getNamespace() + ":shaders/core/" + split.getPath() + programType.getExtension();
-	}
+	// note: do not need to modify getOrCreate as FAPI does it
 }