From 6579e46b8876736fa94f3f8c6c2bb02bf58f3b20 Mon Sep 17 00:00:00 2001 From: IThundxr Date: Mon, 22 Jan 2024 17:07:24 -0500 Subject: [PATCH] backport fix for #68 (#78) --- gradle.properties | 4 ++-- .../porting_lib/mixin/client/ShaderInstanceMixin.java | 9 +-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index c08d805bc..38d1e0a41 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,8 +7,8 @@ mod_version = 1.2.-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/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ShaderInstanceMixin.java b/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ShaderInstanceMixin.java index eb9be9e9d..60c6b75d5 100644 --- a/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ShaderInstanceMixin.java +++ b/src/main/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 }