Reverse fuck AssetLoaderMixin & Update the puzzle loader lib + the Ma…

…in FluxPuzzle class
CRModders · May 31, 2024 · 091d6c7 · 091d6c7
1 parent c43d9db
commit 091d6c7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/lib/PuzzleLoader-1.0.0-all.jar b/lib/PuzzleLoader-1.0.0-all.jar
diff --git a/src/main/java/dev/crmodders/flux/FluxPuzzle.java b/src/main/java/dev/crmodders/flux/FluxPuzzle.java
@@ -4,19 +4,19 @@
 import dev.crmodders.flux.logging.LoggingAgent;
 import dev.crmodders.flux.logging.impl.CustomizableLogger;
 import dev.crmodders.flux.logging.impl.SimpleColouredLogger;
-import dev.crmodders.puzzle.entrypoint.interfaces.PreInitModInitializer;
+import dev.crmodders.puzzle.core.entrypoint.interfaces.PreInitModInitializer;
 import org.greenrobot.eventbus.Subscribe;
 
 public class FluxPuzzle implements PreInitModInitializer {
 
-    public static final CustomizableLogger LOGGER = LoggingAgent.getLogger("FluxAPIAppel", CustomizableLogger.class);
+    public static final CustomizableLogger LOGGER = LoggingAgent.getLogger("FluxPuzzle", CustomizableLogger.class);
 
     @Override
     public void onPreInit() {
         LOGGER.setMessageColorizer((level, string) -> string);
         LoggingAgent.setDefaultLoggingClass(SimpleColouredLogger.class);
 
-        LOGGER.info("Flux Appel Edition Initialized");
+        LOGGER.info("Flux Puzzle Edition Initialized");
         FluxRegistries.EVENT_BUS.register(this);
     }
 

diff --git a/src/main/java/dev/crmodders/flux/mixins/assets/AssetLoaderMixin.java b/src/main/java/dev/crmodders/flux/mixins/assets/AssetLoaderMixin.java
@@ -28,7 +28,7 @@ public class AssetLoaderMixin {
      **/
     @Inject(method = "loadAsset(Ljava/lang/String;Z)Lcom/badlogic/gdx/files/FileHandle;", at = @At("HEAD"), cancellable = true)
     private static void loadAsset(String fileName, boolean forceReload, CallbackInfoReturnable<FileHandle> cir) {
-        dev.crmodders.puzzle.game.tags.Identifier location = dev.crmodders.puzzle.game.tags.Identifier.fromString(fileName);
+        Identifier location = Identifier.fromString(fileName);
         if (!forceReload && ALL_ASSETS.containsKey(location.toString())) {
             cir.setReturnValue(ALL_ASSETS.get(location.toString()));
             return;

diff --git a/src/main/java/dev/crmodders/flux/util/LoaderDetector.java b/src/main/java/dev/crmodders/flux/util/LoaderDetector.java
@@ -22,7 +22,7 @@ static boolean isOnQuiltBasedLoader() {
 
     static boolean isOnPuzzleLoader() {
         try {
-            LoaderDetector.class.getClassLoader().loadClass("dev.crmodders.puzzle.launch.Piece");
+            LoaderDetector.class.getClassLoader().loadClass("dev.crmodders.puzzle.core.launch.Piece");
         } catch (ClassNotFoundException e) {
             return false;
         }