From 0b8eddbf25b6019de018d7bd8be77551734427fa Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Wed, 25 Dec 2024 15:45:11 -0500
Subject: [PATCH] Replace RS integration with generic model registry emulation

Fixes patterns not rendering

Related: #499
---
 .../dynresources/ModelBakeEventHelper.java    |  1 +
 .../rs/ClientSetupMixin.java                  | 38 -------------------
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java

diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/dynresources/ModelBakeEventHelper.java b/forge/src/main/java/org/embeddedt/modernfix/forge/dynresources/ModelBakeEventHelper.java
index 3462c43e..fbfdab18 100644
--- a/forge/src/main/java/org/embeddedt/modernfix/forge/dynresources/ModelBakeEventHelper.java
+++ b/forge/src/main/java/org/embeddedt/modernfix/forge/dynresources/ModelBakeEventHelper.java
@@ -44,6 +44,7 @@ public class ModelBakeEventHelper {
             "vampirism",
             "elevatorid",
             "cfm",
+            "refinedstorage",
             "embers");
     private final Map<ResourceLocation, BakedModel> modelRegistry;
     private final Set<ResourceLocation> topLevelModelLocations;
diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java
deleted file mode 100644
index e7865e4a..00000000
--- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.embeddedt.modernfix.forge.mixin.perf.dynamic_resources.rs;
-
-import com.refinedmods.refinedstorage.render.BakedModelOverrideRegistry;
-import com.refinedmods.refinedstorage.setup.ClientSetup;
-import net.minecraft.client.resources.model.*;
-import net.minecraft.resources.ResourceLocation;
-import org.embeddedt.modernfix.ModernFixClient;
-import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
-import org.embeddedt.modernfix.annotation.RequiresMod;
-import org.embeddedt.modernfix.api.entrypoint.ModernFixClientIntegration;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-
-@Mixin(ClientSetup.class)
-@RequiresMod("refinedstorage")
-@ClientOnlyMixin
-public class ClientSetupMixin {
-    @Shadow(remap = false) @Final private static BakedModelOverrideRegistry BAKED_MODEL_OVERRIDE_REGISTRY;
-
-    @Inject(method = "registerBakedModelOverrides", at = @At("RETURN"), remap = false)
-    private static void addDynamicListener(CallbackInfo ci) {
-        ModernFixClient.CLIENT_INTEGRATIONS.add(new ModernFixClientIntegration() {
-            @Override
-            public BakedModel onBakedModelLoad(ResourceLocation location, UnbakedModel baseModel, BakedModel originalModel, ModelState state, ModelBakery bakery) {
-                BakedModelOverrideRegistry.BakedModelOverrideFactory factory = BAKED_MODEL_OVERRIDE_REGISTRY.get(location instanceof ModelResourceLocation ? new ResourceLocation(location.getNamespace(), location.getPath()) : location);
-                if(factory != null)
-                    return factory.create(originalModel, bakery.getBakedTopLevelModels());
-                else
-                    return originalModel;
-            }
-        });
-    }
-}