mirror of
https://github.com/GTNewHorizons/DummyCore.git
synced 2026-11-21 04:32:09 +00:00
Fix LoadingPlugin crashing on startup
This commit is contained in:
1 parent
159a948911
commit
d4546e8072
5 files changed
+20
-30
No files matched your search
@@ -1,20 +1,16 @@
|
||||
package DummyCore.ASM;
|
||||
|
||||
import static DummyCore.Core.CoreInitialiser.mcVersion;
|
||||
|
||||
import DummyCore.Core.Core;
|
||||
import cpw.mods.fml.relauncher.FMLInjectionData;
|
||||
import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
|
||||
import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion;
|
||||
import cpw.mods.fml.relauncher.IFMLLoadingPlugin.TransformerExclusions;
|
||||
import java.io.File;
|
||||
import java.util.Map;
|
||||
|
||||
@MCVersion(value = mcVersion)
|
||||
@MCVersion(value = "1.7.10")
|
||||
@TransformerExclusions("DummyCore.ASM.*")
|
||||
public class DCLoadingPlugin implements IFMLLoadingPlugin {
|
||||
|
||||
public DCLoadingPlugin() {
|
||||
Core.mcDir = (File) FMLInjectionData.data()[6];
|
||||
}
|
||||
public static File mcDir;
|
||||
|
||||
@Override
|
||||
public String[] getASMTransformerClass() {
|
||||
@@ -32,7 +28,9 @@ public class DCLoadingPlugin implements IFMLLoadingPlugin {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void injectData(Map<String, Object> data) {}
|
||||
public void injectData(Map<String, Object> data) {
|
||||
mcDir = (File) data.get("mcLocation");
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getAccessTransformerClass() {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package DummyCore.Client;
|
||||
|
||||
import DummyCore.Core.Core;
|
||||
import DummyCore.ASM.DCLoadingPlugin;
|
||||
import DummyCore.Utils.DummyConfig;
|
||||
import DummyCore.Utils.DummyData;
|
||||
import DummyCore.Utils.IMainMenu;
|
||||
@@ -491,7 +491,7 @@ public class MainMenuRegistry {
|
||||
|
||||
public static void initMenuConfigs() {
|
||||
try {
|
||||
File dir = new File(Core.mcDir, "config");
|
||||
File dir = new File(DCLoadingPlugin.mcDir, "config");
|
||||
dir.mkdirs();
|
||||
dir = new File(dir, "dcMainMenu");
|
||||
if (!dir.exists()) createHelpFile(dir);
|
||||
|
||||
@@ -14,7 +14,6 @@ import net.minecraftforge.common.config.Configuration;
|
||||
public class Core {
|
||||
|
||||
public static final ArrayList<DCMod> registeredMods = new ArrayList<DCMod>();
|
||||
public static File mcDir;
|
||||
|
||||
public static boolean isModRegistered(Class<?> mod) {
|
||||
for (DCMod dcm : registeredMods) if (dcm.modClass.equals(mod)) return true;
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
package DummyCore.Core;
|
||||
|
||||
import static DummyCore.Core.CoreInitialiser.mcVersion;
|
||||
import static DummyCore.Core.CoreInitialiser.modid;
|
||||
import static DummyCore.Core.CoreInitialiser.modname;
|
||||
import static DummyCore.Core.CoreInitialiser.version;
|
||||
|
||||
import DummyCore.Utils.CommandTransfer;
|
||||
import DummyCore.Utils.DummyConfig;
|
||||
import DummyCore.Utils.DummyDataUtils;
|
||||
@@ -15,7 +10,6 @@ import DummyCore.Utils.DummyPacketIMSG_Tile;
|
||||
import DummyCore.Utils.DummyTilePacketHandler;
|
||||
import DummyCore.Utils.LoadingUtils;
|
||||
import DummyCore.Utils.MiscUtils;
|
||||
import DummyCore.Utils.ModVersionChecker;
|
||||
import DummyCore.Utils.NetProxy_Server;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
@@ -39,12 +33,16 @@ import net.minecraftforge.common.MinecraftForge;
|
||||
* @author Modbder
|
||||
* @version From DummyCore 1.0
|
||||
*/
|
||||
@Mod(modid = modid, name = modname, version = version, useMetadata = false, acceptedMinecraftVersions = mcVersion)
|
||||
@Mod(
|
||||
modid = CoreInitialiser.modid,
|
||||
name = CoreInitialiser.modname,
|
||||
version = CoreInitialiser.version,
|
||||
useMetadata = false,
|
||||
acceptedMinecraftVersions = "[1.7.10]")
|
||||
public class CoreInitialiser {
|
||||
|
||||
public static final String modid = "DummyCore";
|
||||
public static final String modname = "DummyCore";
|
||||
public static final String mcVersion = "1.7.10";
|
||||
public static final String version = "GRADLETOKEN_VERSION";
|
||||
|
||||
public static CoreInitialiser instance;
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package DummyCore.Utils;
|
||||
|
||||
import DummyCore.Core.Core;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import DummyCore.ASM.DCLoadingPlugin;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
||||
import java.io.FileReader;
|
||||
@@ -15,7 +14,7 @@ public class CustomTXTConfig {
|
||||
|
||||
public static void createCFG() {
|
||||
try {
|
||||
File cfgDir = new File(Core.mcDir, "config");
|
||||
File cfgDir = new File(DCLoadingPlugin.mcDir, "config");
|
||||
if (!cfgDir.exists()) cfgDir.mkdirs();
|
||||
|
||||
File actualCfg = new File(cfgDir, "DummyCoreASMSettings.cfg");
|
||||
@@ -24,9 +23,7 @@ public class CustomTXTConfig {
|
||||
readCfg(actualCfg);
|
||||
init = true;
|
||||
} catch (Exception e) {
|
||||
FMLCommonHandler.instance()
|
||||
.raiseException(
|
||||
e, "[DummyCore]Something went wrong while trying to create ASM configuration!", true);
|
||||
throw new RuntimeException("[DummyCore] Something went wrong while trying to create ASM configuration!", e);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -45,9 +42,7 @@ public class CustomTXTConfig {
|
||||
pw.flush();
|
||||
pw.close();
|
||||
} catch (Exception e) {
|
||||
FMLCommonHandler.instance()
|
||||
.raiseException(
|
||||
e, "[DummyCore]Something went wrong while trying to create ASM configuration!", true);
|
||||
throw new RuntimeException("[DummyCore] Something went wrong while trying to create ASM configuration!", e);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -65,7 +60,7 @@ public class CustomTXTConfig {
|
||||
br.close();
|
||||
fr.close();
|
||||
} catch (Exception e) {
|
||||
LoadingUtils.makeACrash("[DummyCore]Failed to read ASM settings!", CustomTXTConfig.class, e, false);
|
||||
LoadingUtils.makeACrash("[DummyCore] Failed to read ASM settings!", CustomTXTConfig.class, e, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user