From c87fb63458eec1ce944754c79c3a596894b207e3 Mon Sep 17 00:00:00 2001 From: ZombieHDGaming Date: Thu, 25 Apr 2019 18:38:06 -0400 Subject: [PATCH] Fixed classloading issue that caused the game to not find BiomeVoid (My fault. My bad.) --- src/main/java/org/dimdev/jeid/JEID.java | 3 --- .../java/org/dimdev/jeid/JEIDLoadingPlugin.java | 5 +++-- src/main/java/org/dimdev/jeid/Utils.java | 13 +++++++++++++ .../org/dimdev/jeid/mixin/init/MixinLoader.java | 2 -- .../twilightforest/TwilightMixinPlugin.java | 7 ++++--- 5 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 src/main/java/org/dimdev/jeid/Utils.java diff --git a/src/main/java/org/dimdev/jeid/JEID.java b/src/main/java/org/dimdev/jeid/JEID.java index 9569546..8f73556 100644 --- a/src/main/java/org/dimdev/jeid/JEID.java +++ b/src/main/java/org/dimdev/jeid/JEID.java @@ -19,8 +19,6 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.registries.IForgeRegistry; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.dimdev.jeid.network.MessageManager; import java.util.Random; @@ -37,7 +35,6 @@ public class JEID { public static final Biome errorBiome = new BiomeVoid(new Biome.BiomeProperties("A mod doesn't support extended biome IDs -- report to JEID")) .setRegistryName("jeid:error_biome"); - public static Logger LOGGER = LogManager.getLogger("JustEnoughIDs"); @Mod.EventHandler public void onPreInit(FMLPreInitializationEvent event) { diff --git a/src/main/java/org/dimdev/jeid/JEIDLoadingPlugin.java b/src/main/java/org/dimdev/jeid/JEIDLoadingPlugin.java index a3070d0..bcf91d3 100644 --- a/src/main/java/org/dimdev/jeid/JEIDLoadingPlugin.java +++ b/src/main/java/org/dimdev/jeid/JEIDLoadingPlugin.java @@ -10,14 +10,15 @@ @IFMLLoadingPlugin.MCVersion(ForgeVersion.mcVersion) @IFMLLoadingPlugin.SortingIndex(-7500) +@IFMLLoadingPlugin.Name("JustEnoughIDs Extension Plugin") //@IFMLLoadingPlugin.TransformerExclusions("org.dimdev.jeid.") public class JEIDLoadingPlugin implements IFMLLoadingPlugin { public JEIDLoadingPlugin() { MixinBootstrap.init(); - JEID.LOGGER.info("Initializing JustEnoughIDs core mixins"); + Utils.LOGGER.info("Initializing JustEnoughIDs core mixins"); Mixins.addConfiguration("mixins.jeid.core.json"); - JEID.LOGGER.info("Initializing JustEnoughIDs initialization mixins"); + Utils.LOGGER.info("Initializing JustEnoughIDs initialization mixins"); Mixins.addConfiguration("mixins.jeid.init.json"); } diff --git a/src/main/java/org/dimdev/jeid/Utils.java b/src/main/java/org/dimdev/jeid/Utils.java new file mode 100644 index 0000000..2d45e0a --- /dev/null +++ b/src/main/java/org/dimdev/jeid/Utils.java @@ -0,0 +1,13 @@ +package org.dimdev.jeid; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class Utils { + /** + * I Know this looks stupid and it's a single class for a logger, but deal with + * it you nerds. + * - Zombie + */ + public static Logger LOGGER = LogManager.getLogger("JustEnoughIDs"); +} diff --git a/src/main/java/org/dimdev/jeid/mixin/init/MixinLoader.java b/src/main/java/org/dimdev/jeid/mixin/init/MixinLoader.java index 27f094b..45e04f0 100644 --- a/src/main/java/org/dimdev/jeid/mixin/init/MixinLoader.java +++ b/src/main/java/org/dimdev/jeid/mixin/init/MixinLoader.java @@ -4,7 +4,6 @@ import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.ModClassLoader; import net.minecraftforge.fml.common.ModContainer; -import org.dimdev.jeid.JEID; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.Mixins; @@ -41,7 +40,6 @@ private void beforeConstructingMods(List injectedModContainers, Callback } // Add and reload mixin configs - JEID.LOGGER.info("Initializing JustEnoughIDs modsupport mixins"); Mixins.addConfiguration("mixins.jeid.modsupport.json"); Mixins.addConfiguration("mixins.jeid.twilightforest.json"); diff --git a/src/main/java/org/dimdev/jeid/mixin/modsupport/twilightforest/TwilightMixinPlugin.java b/src/main/java/org/dimdev/jeid/mixin/modsupport/twilightforest/TwilightMixinPlugin.java index 43efa04..2f39e2d 100644 --- a/src/main/java/org/dimdev/jeid/mixin/modsupport/twilightforest/TwilightMixinPlugin.java +++ b/src/main/java/org/dimdev/jeid/mixin/modsupport/twilightforest/TwilightMixinPlugin.java @@ -2,7 +2,7 @@ import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.ModContainer; -import org.dimdev.jeid.JEID; +import org.dimdev.jeid.Utils; import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinInfo; @@ -11,6 +11,7 @@ import java.util.Set; public class TwilightMixinPlugin implements IMixinConfigPlugin { + @Override public void onLoad(String s) {} @@ -23,14 +24,14 @@ public boolean shouldApplyMixin(String s, String s1) { if (mod.getModId().equals("twilightforest")) { if (s1.equals("org.dimdev.jeid.mixin.modsupport.twilightforest.MixinBlockTFMagicLogSpecial_Old")) { if (Integer.parseInt(mod.getVersion().split("[.]")[2]) < 689) { - JEID.LOGGER.info("Older TwilightForest version (<689). Using mixin: " + s1); + Utils.LOGGER.info("Older TwilightForest version (<689). Using mixin: " + s1); return true; } else { return false; } } else if (s1.equals("org.dimdev.jeid.mixin.modsupport.twilightforest.MixinBlockTFMagicLogSpecial")) { if (Integer.parseInt(mod.getVersion().split("[.]")[2]) > 689) { - JEID.LOGGER.info("Newer TwilightForest version (>689). Using mixin: " + s1); + Utils.LOGGER.info("Newer TwilightForest version (>689). Using mixin: " + s1); return true; } else { return false;