fix: Accidental hard dependency on sodium in mixins

2 files changed, 97 insertions, 94 deletions

diff --git a/src/main/java/moe/nea/firmament/init/MixinPlugin.java b/src/main/java/moe/nea/firmament/init/MixinPlugin.java
index 61e8f14..513efef 100644
--- a/src/main/java/moe/nea/firmament/init/MixinPlugin.java
+++ b/src/main/java/moe/nea/firmament/init/MixinPlugin.java
@@ -15,11 +15,13 @@ import java.util.stream.Collectors;
 public class MixinPlugin implements IMixinConfigPlugin {
 
     AutoDiscoveryPlugin autoDiscoveryPlugin = new AutoDiscoveryPlugin();
-    public static String mixinPackage;
+	public static List<MixinPlugin> instances = new ArrayList<>();
+	public String mixinPackage;
     @Override
     public void onLoad(String mixinPackage) {
         MixinExtrasBootstrap.init();
-        MixinPlugin.mixinPackage = mixinPackage;
+		instances.add(this);
+        this.mixinPackage = mixinPackage;
         autoDiscoveryPlugin.setMixinPackage(mixinPackage);
     }
 
@@ -52,7 +54,7 @@ public class MixinPlugin implements IMixinConfigPlugin {
 
     }
 
-    public static List<String> appliedMixins = new ArrayList<>();
+    public List<String> appliedMixins = new ArrayList<>();
 
     @Override
     public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
diff --git a/src/main/java/moe/nea/firmament/init/SectionBuilderRiser.java b/src/main/java/moe/nea/firmament/init/SectionBuilderRiser.java
index 2c40b08..8b65946 100644
--- a/src/main/java/moe/nea/firmament/init/SectionBuilderRiser.java
+++ b/src/main/java/moe/nea/firmament/init/SectionBuilderRiser.java
@@ -5,6 +5,7 @@ import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.render.block.BlockRenderManager;
 import net.minecraft.client.render.chunk.SectionBuilder;
+import net.minecraft.client.render.model.BlockStateModel;
 import net.minecraft.util.math.BlockPos;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
@@ -18,100 +19,100 @@ import org.objectweb.asm.tree.VarInsnNode;
 
 public class SectionBuilderRiser extends RiserUtils {
 
-    @IntermediaryName(SectionBuilder.class)
-    String SectionBuilder;
-    @IntermediaryName(BlockPos.class)
-    String BlockPos;
-    @IntermediaryName(BlockRenderManager.class)
-    String BlockRenderManager;
-    @IntermediaryName(BlockState.class)
-    String BlockState;
-//    @IntermediaryName(BakedModel.class)
-//    String BakedModel;
-    String CustomBlockTextures = "moe.nea.firmament.features.texturepack.CustomBlockTextures";
+	@IntermediaryName(SectionBuilder.class)
+	String SectionBuilder;
+	@IntermediaryName(BlockPos.class)
+	String BlockPos;
+	@IntermediaryName(BlockRenderManager.class)
+	String BlockRenderManager;
+	@IntermediaryName(BlockState.class)
+	String BlockState;
+	@IntermediaryName(BlockStateModel.class)
+	String BlockStateModel;
+	String CustomBlockTextures = "moe.nea.firmament.features.texturepack.CustomBlockTextures";
 
-    Type getModelDesc = Type.getMethodType(
-        getTypeForClassName(BlockRenderManager),
-        getTypeForClassName(BlockState)
-    );
-    String getModel = remapper.mapMethodName(
-        "intermediary",
-        Intermediary.<BlockRenderManager>className(),
-        Intermediary.methodName(net.minecraft.client.render.block.BlockRenderManager::getModel),
-        Type.getMethodDescriptor(
-			// TODO: fix this riser
-//            getTypeForClassName(Intermediary.<BakedModel>className()),
-            getTypeForClassName(Intermediary.<BlockState>className())
-        )
-    );
+	Type getModelDesc = Type.getMethodType(
+		getTypeForClassName(BlockRenderManager),
+		getTypeForClassName(BlockState)
+	);
+	String getModel = remapper.mapMethodName(
+		"intermediary",
+		Intermediary.<BlockRenderManager>className(),
+		Intermediary.methodName(net.minecraft.client.render.block.BlockRenderManager::getModel),
+		Type.getMethodDescriptor(
+            getTypeForClassName(Intermediary.<BlockStateModel>className()),
+			getTypeForClassName(Intermediary.<BlockState>className())
+		)
+	);
 
-    @Override
-    public void addTinkerers() {
-        if (FabricLoader.getInstance().isModLoaded("fabric-renderer-indigo"))
-            ClassTinkerers.addTransformation(SectionBuilder, this::handle, true);
-    }
+	@Override
+	public void addTinkerers() {
+		if (FabricLoader.getInstance().isModLoaded("fabric-renderer-indigo"))
+			ClassTinkerers.addTransformation(SectionBuilder, this::handle, true);
+	}
 
-    private void handle(ClassNode classNode) {
-        for (MethodNode method : classNode.methods) {
-            if ((method.name.endsWith("$fabric-renderer-indigo$hookBuildRenderBlock")
-                || method.name.endsWith("$fabric-renderer-indigo$hookChunkBuildTessellate")) &&
-                method.name.startsWith("redirect$")) {
-                handleIndigo(method);
-                return;
-            }
-        }
-        System.err.println("Could not inject indigo rendering hook. Is a custom renderer installed (e.g. sodium)?");
-    }
+	private void handle(ClassNode classNode) {
+		System.out.println("AVAST! "+ getModel);
+		for (MethodNode method : classNode.methods) {
+			if ((method.name.endsWith("$fabric-renderer-indigo$hookBuildRenderBlock")
+			     || method.name.endsWith("$fabric-renderer-indigo$hookChunkBuildTessellate")) &&
+			    method.name.startsWith("redirect$")) {
+				handleIndigo(method);
+				return;
+			}
+		}
+		System.err.println("Could not inject indigo rendering hook. Is a custom renderer installed (e.g. sodium)?");
+	}
 
-    private void handleIndigo(MethodNode method) {
-        LocalVariableNode blockPosVar = null, blockStateVar = null;
-        for (LocalVariableNode localVariable : method.localVariables) {
-            if (Type.getType(localVariable.desc).equals(getTypeForClassName(BlockPos))) {
-                blockPosVar = localVariable;
-            }
-            if (Type.getType(localVariable.desc).equals(getTypeForClassName(BlockState))) {
-                blockStateVar = localVariable;
-            }
-        }
-        if (blockPosVar == null || blockStateVar == null) {
-            System.err.println("Firmament could inject into indigo: missing either block pos or blockstate");
-            return;
-        }
-        for (AbstractInsnNode instruction : method.instructions) {
-            if (instruction.getOpcode() != Opcodes.INVOKEVIRTUAL) continue;
-            var methodInsn = (MethodInsnNode) instruction;
-            if (!(methodInsn.name.equals(getModel) && Type.getObjectType(methodInsn.owner).equals(getTypeForClassName(BlockRenderManager))))
-                continue;
-            method.instructions.insertBefore(
-                methodInsn,
-                new MethodInsnNode(
-                    Opcodes.INVOKESTATIC,
-                    getTypeForClassName(CustomBlockTextures).getInternalName(),
-                    "enterFallbackCall",
-                    Type.getMethodDescriptor(Type.VOID_TYPE)
-                ));
+	private void handleIndigo(MethodNode method) {
+		LocalVariableNode blockPosVar = null, blockStateVar = null;
+		for (LocalVariableNode localVariable : method.localVariables) {
+			if (Type.getType(localVariable.desc).equals(getTypeForClassName(BlockPos))) {
+				blockPosVar = localVariable;
+			}
+			if (Type.getType(localVariable.desc).equals(getTypeForClassName(BlockState))) {
+				blockStateVar = localVariable;
+			}
+		}
+		if (blockPosVar == null || blockStateVar == null) {
+			System.err.println("Firmament could inject into indigo: missing either block pos or blockstate");
+			return;
+		}
+		for (AbstractInsnNode instruction : method.instructions) {
+			if (instruction.getOpcode() != Opcodes.INVOKEVIRTUAL) continue;
+			var methodInsn = (MethodInsnNode) instruction;
+			if (!(methodInsn.name.equals(getModel) && Type.getObjectType(methodInsn.owner).equals(getTypeForClassName(BlockRenderManager))))
+				continue;
+			method.instructions.insertBefore(
+				methodInsn,
+				new MethodInsnNode(
+					Opcodes.INVOKESTATIC,
+					getTypeForClassName(CustomBlockTextures).getInternalName(),
+					"enterFallbackCall",
+					Type.getMethodDescriptor(Type.VOID_TYPE)
+				));
 
-            var insnList = new InsnList();
-            insnList.add(new MethodInsnNode(
-                Opcodes.INVOKESTATIC,
-                getTypeForClassName(CustomBlockTextures).getInternalName(),
-                "exitFallbackCall",
-                Type.getMethodDescriptor(Type.VOID_TYPE)
-            ));
-            insnList.add(new VarInsnNode(Opcodes.ALOAD, blockPosVar.index));
-            insnList.add(new VarInsnNode(Opcodes.ALOAD, blockStateVar.index));
-            insnList.add(new MethodInsnNode(
-                Opcodes.INVOKESTATIC,
-                getTypeForClassName(CustomBlockTextures).getInternalName(),
-                "patchIndigo",
-                Type.getMethodDescriptor(
-//					getTypeForClassName(BakedModel),
-//                                         getTypeForClassName(BakedModel),
-                                         getTypeForClassName(BlockPos),
-                                         getTypeForClassName(BlockState)),
-                false
-            ));
-            method.instructions.insert(methodInsn, insnList);
-        }
-    }
+			var insnList = new InsnList();
+			insnList.add(new MethodInsnNode(
+				Opcodes.INVOKESTATIC,
+				getTypeForClassName(CustomBlockTextures).getInternalName(),
+				"exitFallbackCall",
+				Type.getMethodDescriptor(Type.VOID_TYPE)
+			));
+			insnList.add(new VarInsnNode(Opcodes.ALOAD, blockPosVar.index));
+			insnList.add(new VarInsnNode(Opcodes.ALOAD, blockStateVar.index));
+			insnList.add(new MethodInsnNode(
+				Opcodes.INVOKESTATIC,
+				getTypeForClassName(CustomBlockTextures).getInternalName(),
+				"patchIndigo",
+				Type.getMethodDescriptor(
+					getTypeForClassName(BlockStateModel),
+					getTypeForClassName(BlockStateModel),
+					getTypeForClassName(BlockPos),
+					getTypeForClassName(BlockState)),
+				false
+			));
+			method.instructions.insert(methodInsn, insnList);
+		}
+	}
 }