Fix OptiFine's Connected Textures in 1.19.3+

Author: XXMA16

build.gradle

@@ -39,6 +39,8 @@ dependencies {
 
 	modImplementation "com.github.Chocohead:Fabric-ASM:${project.fabric_asm_version}"
 	include "com.github.Chocohead:Fabric-ASM:${project.fabric_asm_version}"
+
+	include(modImplementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:0.2.0-rc.2")))
 }
 
 sourceSets {

src/main/java/me/modmuss50/optifabric/mixin/DefaultResourcePackMixin.java

@@ -0,0 +1,29 @@
+package me.modmuss50.optifabric.mixin;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import me.modmuss50.optifabric.mod.OptifineResources;
+import net.minecraft.resource.DefaultResourcePack;
+import org.spongepowered.asm.mixin.Dynamic;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+@Mixin(value = DefaultResourcePack.class, priority = 400)
+abstract class DefaultResourcePackMixin {
+	@Dynamic
+	@WrapOperation(method = {"findInputStream", "getResourceOF"}, at = @At(value = "INVOKE", target = "Lnet/optifine/reflect/ReflectorForge;getOptiFineResourceStream(Ljava/lang/String;)Ljava/io/InputStream;"), require = 1, allow = 1)
+	private InputStream doFindResource(String pathStr, Operation<InputStream> original) {
+		try {
+			InputStream stream = OptifineResources.INSTANCE.getResource(pathStr);
+			if (stream != null) return stream;
+		} catch (IOException e) {
+			//Optifine does this if it goes wrong so we will too
+			//It doesn't in later versions (should revisit this sometime in the future)
+			e.printStackTrace();
+		}
+		return original.call(pathStr);
+	}
+}

src/main/java/me/modmuss50/optifabric/mixin/MixinDefaultResourcePack.java renamed to src/main/java/me/modmuss50/optifabric/mixin/DefaultResourcePackOldMixin.java

@@ -1,8 +1,5 @@
 package me.modmuss50.optifabric.mixin;
 
-import java.io.IOException;
-import java.io.InputStream;
-
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -16,23 +13,10 @@
 import me.modmuss50.optifabric.mod.OptifineResources;
 
 @Mixin(value = DefaultResourcePack.class, priority = 400)
-abstract class MixinDefaultResourcePack {
+abstract class DefaultResourcePackOldMixin {
 	@Shadow
 	private static native String getPath(ResourceType type, Identifier id);
 
-	@Inject(method = "findInputStream", at = @At("HEAD"), cancellable = true)
-	protected void onFindInputStream(ResourceType type, Identifier id, CallbackInfoReturnable<InputStream> callback) {
-		String path = getPath(type, id);
-
-		try {
-			InputStream stream = OptifineResources.INSTANCE.getResource(path);
-			if (stream != null) callback.setReturnValue(stream);
-		} catch (IOException e) {
-			//Optifine does this if it goes wrong so we will too
-			e.printStackTrace();
-		}
-	}
-
 	@Inject(method = "contains", at = @At("HEAD"), cancellable = true)
 	public void doesContain(ResourceType type, Identifier id, CallbackInfoReturnable<Boolean> callback) {
 		String path = getPath(type, id);

src/main/resources/optifabric.optifine.mixins.json

@@ -4,6 +4,7 @@
 	"mixins": [
 		"MixinReflectorClass",
 		"MixinOptifineConfig",
+		"DefaultResourcePackMixin",
 		"CustomColoursMixin",
 		"ShadersMixin",
 		"VideoOptionsScreenMixin",

src/main/resources/optifabric.optifine.old-mixins.json

@@ -2,6 +2,6 @@
 	"parent": "optifabric.optifine.mixins.json",
 	"package": "me.modmuss50.optifabric.mixin",
 	"mixins": [
-		"MixinDefaultResourcePack"
+		"DefaultResourcePackOldMixin"
 	]
 }