From ddc258a3ee2c515675aa7c55e9b4612164e17979 Mon Sep 17 00:00:00 2001
From: Rongmario <rongmario@protonmail.com>
Date: Tue, 26 Dec 2023 15:56:10 +0000
Subject: [PATCH] Fixes #84 + Fixes #110

---
 .../cleanroommc/groovyscript/core/GroovyScriptCore.java   | 4 ++++
 .../groovyscript/sandbox/ScriptModContainer.java          | 8 +++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/cleanroommc/groovyscript/core/GroovyScriptCore.java b/src/main/java/com/cleanroommc/groovyscript/core/GroovyScriptCore.java
index 997286445..593d07bf1 100644
--- a/src/main/java/com/cleanroommc/groovyscript/core/GroovyScriptCore.java
+++ b/src/main/java/com/cleanroommc/groovyscript/core/GroovyScriptCore.java
@@ -6,6 +6,7 @@
 import zone.rong.mixinbooter.IEarlyMixinLoader;
 
 import javax.annotation.Nullable;
+import java.io.File;
 import java.util.List;
 import java.util.Map;
 
@@ -13,6 +14,8 @@
 @IFMLLoadingPlugin.MCVersion(ForgeVersion.mcVersion)
 public class GroovyScriptCore implements IFMLLoadingPlugin, IEarlyMixinLoader {
 
+    public static File source;
+
     @Override
     public String[] getASMTransformerClass() {
         return new String[0];
@@ -31,6 +34,7 @@ public String getSetupClass() {
 
     @Override
     public void injectData(Map<String, Object> data) {
+        source = (File) data.getOrDefault("coremodLocation", null);
     }
 
     @Override
diff --git a/src/main/java/com/cleanroommc/groovyscript/sandbox/ScriptModContainer.java b/src/main/java/com/cleanroommc/groovyscript/sandbox/ScriptModContainer.java
index 2f05f5b53..301760584 100644
--- a/src/main/java/com/cleanroommc/groovyscript/sandbox/ScriptModContainer.java
+++ b/src/main/java/com/cleanroommc/groovyscript/sandbox/ScriptModContainer.java
@@ -1,6 +1,7 @@
 package com.cleanroommc.groovyscript.sandbox;
 
 import com.cleanroommc.groovyscript.GroovyScript;
+import com.cleanroommc.groovyscript.core.GroovyScriptCore;
 import com.google.common.eventbus.EventBus;
 import net.minecraftforge.fml.common.DummyModContainer;
 import net.minecraftforge.fml.common.LoadController;
@@ -10,17 +11,14 @@
 
 public class ScriptModContainer extends DummyModContainer {
 
-    private final File source;
-
     public ScriptModContainer() {
         super(RunConfig.modMetadata);
-        this.source = (File) FMLInjectionData.data()[6];
-        GroovyScript.initializeRunConfig(this.source);
+        GroovyScript.initializeRunConfig((File) FMLInjectionData.data()[6]);
     }
 
     @Override
     public File getSource() {
-        return source;
+        return GroovyScriptCore.source;
     }
 
     @Override