From 1b37c9da6674d5ff962d2d06b2a4dcf6ac81ad1d Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Tue, 29 Apr 2025 18:33:50 -0400 Subject: [PATCH] Remove obsolete OBJLoader patch --- .../model_optimizations/OBJLoaderMixin.java | 39 ------------------- 1 file changed, 39 deletions(-) delete mode 100644 forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/model_optimizations/OBJLoaderMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/model_optimizations/OBJLoaderMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/model_optimizations/OBJLoaderMixin.java deleted file mode 100644 index 623ddb6f..00000000 --- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/model_optimizations/OBJLoaderMixin.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.embeddedt.modernfix.forge.mixin.perf.model_optimizations; - -import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.client.model.obj.ObjLoader; -import net.minecraftforge.client.model.obj.ObjMaterialLibrary; -import net.minecraftforge.client.model.obj.ObjModel; -import org.embeddedt.modernfix.annotation.ClientOnlyMixin; -import org.objectweb.asm.Opcodes; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Mutable; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -@Mixin(ObjLoader.class) -@ClientOnlyMixin -public class OBJLoaderMixin { - @Final - @Mutable - @Shadow(remap = false) private Map materialCache; - - @Final - @Mutable - @Shadow(remap = false) private Map modelCache; - - @Redirect(method = "", at = @At(value = "FIELD", opcode = Opcodes.PUTFIELD, target = "Lnet/minecraftforge/client/model/obj/ObjLoader;materialCache:Ljava/util/Map;", remap = false)) - private void useConcMap1(ObjLoader instance, Map value) { - this.materialCache = new ConcurrentHashMap<>(); - } - - @Redirect(method = "", at = @At(value = "FIELD", opcode = Opcodes.PUTFIELD, target = "Lnet/minecraftforge/client/model/obj/ObjLoader;modelCache:Ljava/util/Map;", remap = false)) - private void useConcMap2(ObjLoader instance, Map value) { - this.modelCache = new ConcurrentHashMap<>(); - } -}