diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/draconicevolution/DraconicEvolution.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/draconicevolution/DraconicEvolution.java index 779297cef..08be0bdc2 100644 --- a/src/main/java/com/cleanroommc/groovyscript/compat/mods/draconicevolution/DraconicEvolution.java +++ b/src/main/java/com/cleanroommc/groovyscript/compat/mods/draconicevolution/DraconicEvolution.java @@ -1,14 +1,9 @@ package com.cleanroommc.groovyscript.compat.mods.draconicevolution; -import com.cleanroommc.groovyscript.GroovyScriptConfig; import com.cleanroommc.groovyscript.compat.mods.ModPropertyContainer; public class DraconicEvolution extends ModPropertyContainer { public final Fusion fusion = new Fusion(); - public final EnergyCore energyCore; - - public DraconicEvolution() { - this.energyCore = GroovyScriptConfig.compat.draconicEvolutionEnergyCore ? new EnergyCore() : null; - } + public final EnergyCore energyCore = new EnergyCore(); } diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/draconicevolution/EnergyCore.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/draconicevolution/EnergyCore.java index 5afacc0a6..52b5472df 100644 --- a/src/main/java/com/cleanroommc/groovyscript/compat/mods/draconicevolution/EnergyCore.java +++ b/src/main/java/com/cleanroommc/groovyscript/compat/mods/draconicevolution/EnergyCore.java @@ -1,5 +1,6 @@ package com.cleanroommc.groovyscript.compat.mods.draconicevolution; +import com.cleanroommc.groovyscript.GroovyScriptConfig; import com.cleanroommc.groovyscript.api.GroovyBlacklist; import com.cleanroommc.groovyscript.api.GroovyLog; import com.cleanroommc.groovyscript.api.IScriptReloadable; @@ -40,6 +41,11 @@ private void init() { onReload(); // increases version to 1 } + @Override + public boolean isEnabled() { + return GroovyScriptConfig.compat.draconicEvolutionEnergyCore; + } + @Override public Collection getAliases() { return Alias.generateOfClass(EnergyCore.class); diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/vanilla/VanillaContainer.java b/src/main/java/com/cleanroommc/groovyscript/compat/vanilla/VanillaContainer.java deleted file mode 100644 index 050ab7cab..000000000 --- a/src/main/java/com/cleanroommc/groovyscript/compat/vanilla/VanillaContainer.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cleanroommc.groovyscript.compat.vanilla; - -import com.cleanroommc.groovyscript.compat.mods.GroovyContainer; -import org.jetbrains.annotations.NotNull; - -public class VanillaContainer extends GroovyContainer { - - public static final VanillaContainer INSTANCE = new VanillaContainer(); - - private VanillaContainer() { - super(); - } - - @Override - public @NotNull String getModId() { - return "minecraft"; - } - - @Override - public @NotNull String getContainerName() { - return "Vanilla"; - } - - @Override - public boolean isLoaded() { - return true; - } - - @Override - public void onCompatLoaded(GroovyContainer container) {} - - @Override - public VanillaModule get() { - return VanillaModule.INSTANCE; - } -}