From b548e77eac228d5ba617908fb90da026e1376d78 Mon Sep 17 00:00:00 2001 From: Jared Date: Sun, 28 Aug 2016 01:08:43 +0200 Subject: [PATCH] Version push --- build.properties | 2 +- src/main/java/modtweaker/ModProps.java | 9 ++--- src/main/java/modtweaker/ModTweaker.java | 7 ++-- .../modtweaker/mods/forestry/Forestry.java | 8 +---- .../java/modtweaker/utils/TweakerPlugin.java | 34 +++++++++++++------ 5 files changed, 33 insertions(+), 27 deletions(-) diff --git a/build.properties b/build.properties index 62edc93..3120a05 100644 --- a/build.properties +++ b/build.properties @@ -1,4 +1,4 @@ minecraft.version=1.10.2 forge.version=1.10.2-12.18.0.2005-1.10.0 -mod.version=2.0.0 \ No newline at end of file +mod.version=2.0.1 \ No newline at end of file diff --git a/src/main/java/modtweaker/ModProps.java b/src/main/java/modtweaker/ModProps.java index b125c0b..780043b 100644 --- a/src/main/java/modtweaker/ModProps.java +++ b/src/main/java/modtweaker/ModProps.java @@ -2,8 +2,9 @@ package modtweaker; public class ModProps { - public static final String NAME = "Mod Tweaker", name = NAME; - public static final String MODID = "modtweaker", modid = MODID; - public static final String VERSION = "@modVersion@", version = VERSION; - public static final String DEPENDENCIES = "required-after:MineTweaker3;", dependencies = DEPENDENCIES; + public static final String NAME = "Mod Tweaker", name = NAME; + public static final String MODID = "modtweaker", modid = MODID; + public static final String VERSION = "@modVersion@", version = VERSION; + public static final String DEPENDENCIES = "required-after:MineTweaker3;", dependencies = DEPENDENCIES; + } diff --git a/src/main/java/modtweaker/ModTweaker.java b/src/main/java/modtweaker/ModTweaker.java index 61e7b82..27f4e93 100644 --- a/src/main/java/modtweaker/ModTweaker.java +++ b/src/main/java/modtweaker/ModTweaker.java @@ -41,13 +41,12 @@ public class ModTweaker { logger.info("Starting PreInitialization for " + ModProps.modid); } - @EventHandler public void init(FMLInitializationEvent event) { logger.info("Starting Initialization for " + ModProps.modid); - TweakerPlugin.register("forestry", Forestry.class); - TweakerPlugin.register("tconstruct", TConstruct.class); - TweakerPlugin.register("randomthings", RandomThings.class); + TweakerPlugin.register("forestry", true, Forestry.class); + TweakerPlugin.register("tconstruct", true, TConstruct.class); + TweakerPlugin.register("randomthings", true, RandomThings.class); if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { MinecraftForge.EVENT_BUS.register(new ClientEvents()); diff --git a/src/main/java/modtweaker/mods/forestry/Forestry.java b/src/main/java/modtweaker/mods/forestry/Forestry.java index 02ac25c..880b7a9 100644 --- a/src/main/java/modtweaker/mods/forestry/Forestry.java +++ b/src/main/java/modtweaker/mods/forestry/Forestry.java @@ -1,13 +1,7 @@ package modtweaker.mods.forestry; import minetweaker.MineTweakerAPI; -import modtweaker.mods.forestry.handlers.Carpenter; -import modtweaker.mods.forestry.handlers.Centrifuge; -import modtweaker.mods.forestry.handlers.Fermenter; -import modtweaker.mods.forestry.handlers.Moistener; -import modtweaker.mods.forestry.handlers.Squeezer; -import modtweaker.mods.forestry.handlers.Still; -import modtweaker.mods.forestry.handlers.ThermionicFabricator; +import modtweaker.mods.forestry.handlers.*; public class Forestry { public Forestry() { diff --git a/src/main/java/modtweaker/utils/TweakerPlugin.java b/src/main/java/modtweaker/utils/TweakerPlugin.java index 61b9b3b..aeea73c 100644 --- a/src/main/java/modtweaker/utils/TweakerPlugin.java +++ b/src/main/java/modtweaker/utils/TweakerPlugin.java @@ -1,29 +1,41 @@ package modtweaker.utils; -import java.util.ArrayList; - import net.minecraftforge.fml.common.Loader; -public class TweakerPlugin { - private static ArrayList isLoaded = new ArrayList(); +import java.util.Map; +import java.util.TreeMap; - public static void register(String mod, Class clazz) { +public class TweakerPlugin { + private static Map mods = new TreeMap(); + + public static void register(String mod, Boolean enabled, Class clazz) { if (Loader.isModLoaded(mod)) { - load(mod, clazz); + load(mod, enabled, clazz); } } - public static void load(String mod, Class clazz) { + public static void load(String mod, boolean enabled, Class clazz) { try { clazz.newInstance(); - isLoaded.add(mod); + mods.put(mod, enabled); } catch (Exception e) { - isLoaded.remove(mod); + mods.remove(mod); } } public static boolean isLoaded(String string) { - return isLoaded.contains(string); + return mods.containsKey(string); + } + + public void setState(String mod, boolean state) { + mods.put(mod, state); + } + + public boolean getState(String mod) { + return mods.get(mod); + } + + public static Map getMods() { + return mods; } - }