diff --git a/src/main/java/com/myname/mymodid/mixinplugin/Mixin.java b/src/main/java/com/myname/mymodid/mixinplugin/Mixin.java index e4f5601..d519f83 100644 --- a/src/main/java/com/myname/mymodid/mixinplugin/Mixin.java +++ b/src/main/java/com/myname/mymodid/mixinplugin/Mixin.java @@ -14,18 +14,15 @@ public enum Mixin { // // Replace with your own mixins: - ItemEditableBookMixin("minecraft.ItemEditableBookMixin", false, VANILLA), + ItemEditableBookMixin("minecraft.ItemEditableBookMixin", VANILLA), // You may also require multiple mods to be loaded if your mixin requires both - GT_Block_Ores_AbstractMixin("gregtech.GT_Block_Ores_AbstractMixin", false, GREGTECH, VANILLA); + GT_Block_Ores_AbstractMixin("gregtech.GT_Block_Ores_AbstractMixin", GREGTECH, VANILLA); public final String mixinClass; public final List targetedMods; - // Injecting into @SideOnly(Side.Client) classes will crash the server. Flag them as clientSideOnly! - public final boolean clientSideOnly; - Mixin(String mixinClass, boolean clientSideOnly, TargetedMod... targetedMods) { + Mixin(String mixinClass, TargetedMod... targetedMods) { this.mixinClass = mixinClass; this.targetedMods = Arrays.asList(targetedMods); - this.clientSideOnly = clientSideOnly; } } diff --git a/src/main/java/com/myname/mymodid/mixinplugin/MixinPlugin.java b/src/main/java/com/myname/mymodid/mixinplugin/MixinPlugin.java index 862f185..bd5b3b2 100644 --- a/src/main/java/com/myname/mymodid/mixinplugin/MixinPlugin.java +++ b/src/main/java/com/myname/mymodid/mixinplugin/MixinPlugin.java @@ -1,7 +1,6 @@ package com.myname.mymodid.mixinplugin; import com.myname.mymodid.Tags; -import cpw.mods.fml.relauncher.FMLLaunchHandler; import net.minecraft.launchwrapper.Launch; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -47,7 +46,6 @@ public class MixinPlugin implements IMixinConfigPlugin { // This method return a List of mixins. Every mixins in this list will be loaded. @Override public List getMixins() { - final boolean loadClientSideOnlyClasses = FMLLaunchHandler.side().isClient(); final boolean isDevelopmentEnvironment = (boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); List loadedMods = Arrays.stream(TargetedMod.values()) @@ -66,8 +64,7 @@ public class MixinPlugin implements IMixinConfigPlugin { List mixins = new ArrayList<>(); for (Mixin mixin : Mixin.values()) { - if (loadedMods.containsAll(mixin.targetedMods) - && (mixin.clientSideOnly == false || loadClientSideOnlyClasses)) { + if (loadedMods.containsAll(mixin.targetedMods)) { mixins.add(mixin.mixinClass); LOG.debug("Loading mixin: " + mixin.mixinClass); }