- Bug fix: Fixed class loading destroying other mods ability to load

Author: Jeryn99

changelog.md

@@ -1,27 +1,7 @@
-# Version 2.1.4
+# Version 2.1.5 - HOTFIX
 
 ![TARDIS Refined](https://wiki.tardisrefined.net/TARDIS-Refined-Wiki/tardis_refined_v2_1.png)
 
-#### Interiors
-- Added Interior: Hartnell 
-- Added Interior: Pertwee 
-- Updated Interior: Copper 
-- Updated Interior: Mesh 
-- Updated Interior: Mechanical 
-- Updated Interior: Refurbished 
-
-#### Enhancements
-- Enhancement: Added tooltips to various screens to indicate which mod added content
-- Enhancement: Players can now sleep in the TARDIS (No spawnpoint setting)
-- Enhancement: Doors can now be placed at 2x2 rendering by shift right-clicking when placing 
-- Enhancement: Addon Mod Developers now get a more descriptive message when they have not registered models for Consoles/Shells
-
-#### Commands
-- Added Sub-Command: Summon
 
 #### Bug Fix
-- Bug fix: Export Desktop command no longer errors when a user uses upper case characters 
-- Bug fix: Fixed Console Configurator not rendering consoles when they have boot up animations
-- Bug fix: Fixed Console Configurator looking for null patterns when sourcing a model
-- Bug fix: Fixed Game crashing when removing mods that add consoles or shells, they will not default to Factory Console / Factory Shell when removed
-- Bug fix: Sodium compatibility on Fabric
+- Bug fix: Fixed class loading destroying other mods ability to load

common/src/main/java/whocraft/tardis_refined/TRMixinPlugin.java

@@ -3,31 +3,13 @@
 import org.objectweb.asm.tree.ClassNode;
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
 import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
-import org.spongepowered.asm.service.MixinService;
+import whocraft.tardis_refined.common.util.Platform;
 
-import java.io.IOException;
 import java.util.List;
 import java.util.Set;
 
 public class TRMixinPlugin implements IMixinConfigPlugin {
 
-    public static final boolean HAS_SODIUM;
-
-    static {
-        HAS_SODIUM = hasClass("net.caffeinemc.mods.sodium.client.render.immediate.model.EntityRenderer")
-                || hasClass("me.jellysquid.mods.sodium.client.render.immediate.model.EntityRenderer");
-    }
-
-    private static boolean hasClass(String name) {
-        try {
-            // This does *not* load the class!
-            MixinService.getService().getBytecodeProvider().getClassNode(name);
-            return true;
-        } catch (ClassNotFoundException | IOException e) {
-            return false;
-        }
-    }
-
     @Override
     public void onLoad(String mixinPackage) {
 
@@ -42,13 +24,14 @@ public String getRefMapperConfig() {
     public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
 
         if (mixinClassName.contains("whocraft.tardis_refined.mixin.render.SodiumFixMixin")) {
-            TardisRefined.LOGGER.info("Checking for Sodium, found: {}", HAS_SODIUM);
+            boolean isSodiumInstalled = Platform.isModLoaded("sodium");
+            TardisRefined.LOGGER.info("Checking for Sodium, found: {}", isSodiumInstalled);
 
-            if(HAS_SODIUM){
+            if(isSodiumInstalled){
                 TardisRefined.LOGGER.info("Sodium Detected, enabling {}", mixinClassName);
             }
 
-            return HAS_SODIUM;
+            return isSodiumInstalled;
         }
 
         return true;