Actually remove the last config

This commit is contained in:
ah-OOG-ah committed 2024-09-26 14:27:48 -04:00
1 parent 5db9be848f
commit 880f952d0f
8 files changed
+74 -59

No files matched your search

+2 -5
View File
@@ -1,21 +1,18 @@
package binnie;
import java.util.ArrayList;
import java.util.List;
import binnie.core.ManagerBase;
import binnie.core.genetics.ManagerGenetics;
import binnie.core.item.ManagerItem;
import binnie.core.liquid.ManagerLiquid;
import binnie.core.machines.ManagerMachine;
import binnie.core.mod.config.ManagerConfig;
import binnie.core.resource.ManagerResource;
import java.util.ArrayList;
import java.util.List;
public final class Binnie {
public static List<ManagerBase> Managers = new ArrayList<>();
public static ManagerGenetics Genetics = new ManagerGenetics();
public static ManagerConfig Configuration = new ManagerConfig();
public static ManagerLiquid Liquid = new ManagerLiquid();
public static ManagerMachine Machine = new ManagerMachine();
public static ManagerItem Item = new ManagerItem();
+6 -19
View File
@@ -1,14 +1,5 @@
package binnie.core;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import net.minecraftforge.common.MinecraftForge;
import binnie.Binnie;
import binnie.core.gui.IBinnieGUID;
import binnie.core.mod.parser.FieldParser;
import binnie.core.network.BinniePacketHandler;
@@ -19,6 +10,12 @@ import binnie.core.proxy.IProxyCore;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import cpw.mods.fml.relauncher.Side;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import net.minecraftforge.common.MinecraftForge;
public abstract class AbstractMod implements IPacketProvider, IInitializable {
@@ -47,10 +44,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
return new IBinnieGUID[0];
}
public Class<?>[] getConfigs() {
return new Class[0];
}
public abstract IProxyCore getProxy();
public abstract String getModID();
@@ -67,12 +60,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
return;
}
if (getConfigs() != null) {
for (Class<?> cls : getConfigs()) {
Binnie.Configuration.registerConfiguration(cls, this);
}
}
getProxy().preInit();
for (IInitializable module : modules) {
module.preInit();
+12 -9
View File
@@ -3,6 +3,7 @@ package binnie.core;
import binnie.Binnie;
import binnie.core.block.MultipassBlockRenderer;
import binnie.core.block.TileEntityMetadata;
import binnie.core.config.ModsConfig;
import binnie.core.craftgui.minecraft.ModuleCraftGUI;
import binnie.core.gui.BinnieCoreGUI;
import binnie.core.gui.BinnieGUIHandler;
@@ -13,7 +14,6 @@ import binnie.core.liquid.FluidContainer;
import binnie.core.liquid.ItemFluidContainer;
import binnie.core.machines.MachineGroup;
import binnie.core.machines.storage.ModuleStorage;
import binnie.core.mod.config.ConfigurationMods;
import binnie.core.mod.parser.FieldParser;
import binnie.core.mod.parser.ItemParser;
import binnie.core.network.BinnieCorePacketID;
@@ -46,13 +46,17 @@ import net.minecraft.server.MinecraftServer;
import net.minecraftforge.client.event.TextureStitchEvent;
@Mod(
modid = "BinnieCore",
name = "Binnie Core",
modid = BinnieCore.CORE_MODID,
name = BinnieCore.CORE_MOD_NAME,
version = Tags.VERSION,
useMetadata = true,
dependencies = "after:Forestry@[4.2,),required-after:gtnhlib@[0.0.10,)")
dependencies = "after:Forestry@[4.2,),required-after:gtnhlib@[0.0.10,)",
guiFactory = "binnie.core.config.ModsConfigGUIFactory")
public class BinnieCore extends AbstractMod {
public static final String CORE_MODID = "BinnieCore";
public static final String CORE_MOD_NAME = "Binnie Core";
@Mod.Instance("BinnieCore")
public static BinnieCore instance;
@@ -67,7 +71,6 @@ public class BinnieCore extends AbstractMod {
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event) {
Binnie.Configuration.registerConfiguration(ConfigurationMods.class, this);
for (ManagerBase baseManager : Binnie.Managers) {
addModule(baseManager);
}
@@ -132,19 +135,19 @@ public class BinnieCore extends AbstractMod {
}
public static boolean isBotanyActive() {
return ConfigurationMods.botany;
return ModsConfig.botany;
}
public static boolean isGeneticsActive() {
return ConfigurationMods.genetics;
return ModsConfig.genetics;
}
public static boolean isExtraBeesActive() {
return ConfigurationMods.extraBees && isApicultureActive();
return ModsConfig.extraBees && isApicultureActive();
}
public static boolean isExtraTreesActive() {
return ConfigurationMods.extraTrees && isArboricultureActive();
return ModsConfig.extraTrees && isArboricultureActive();
}
@Override
@@ -0,0 +1,29 @@
package binnie.core.config;
import static binnie.core.BinnieCore.CORE_MODID;
import com.gtnewhorizon.gtnhlib.config.Config;
@Config(modid = CORE_MODID)
public class ModsConfig {
@Config.Comment("Enables the Extra Bees Mod.")
@Config.DefaultBoolean(true)
@Config.RequiresMcRestart
public static boolean extraBees;
@Config.Comment("Enables the Extra Trees Mod.")
@Config.DefaultBoolean(true)
@Config.RequiresMcRestart
public static boolean extraTrees;
@Config.Comment("Enables the Botany Mod.")
@Config.DefaultBoolean(true)
@Config.RequiresMcRestart
public static boolean botany;
@Config.Comment("Enables the Genetics Mod.")
@Config.DefaultBoolean(true)
@Config.RequiresMcRestart
public static boolean genetics;
}
@@ -0,0 +1,14 @@
package binnie.core.config;
import static binnie.core.BinnieCore.CORE_MODID;
import static binnie.core.BinnieCore.CORE_MOD_NAME;
import com.gtnewhorizon.gtnhlib.config.ConfigException;
import com.gtnewhorizon.gtnhlib.config.SimpleGuiConfig;
import net.minecraft.client.gui.GuiScreen;
public class ModsConfigGUI extends SimpleGuiConfig {
public ModsConfigGUI(GuiScreen parent) throws ConfigException {
super(parent, ModsConfig.class, CORE_MODID, CORE_MOD_NAME);
}
}
@@ -0,0 +1,11 @@
package binnie.core.config;
import com.gtnewhorizon.gtnhlib.config.SimpleGuiFactory;
import net.minecraft.client.gui.GuiScreen;
public class ModsConfigGUIFactory implements SimpleGuiFactory {
@Override
public Class<? extends GuiScreen> mainConfigGuiClass() {
return ModsConfigGUI.class;
}
}
@@ -1,5 +0,0 @@
package binnie.core.mod.config;
@ConfigFile(filename = "/config/forestry/binniecore/main.conf")
public class ConfigurationMain {
}
@@ -1,21 +0,0 @@
package binnie.core.mod.config;
@ConfigFile(filename = "/config/forestry/binnie-mods.conf")
public class ConfigurationMods {
@ConfigProperty(key = "extraBees", comment = { "Enables the Extra Bees Mod." })
@PropBoolean
public static boolean extraBees = true;
@ConfigProperty(key = "extraTrees", comment = { "Enables the Extra Trees Mod." })
@PropBoolean
public static boolean extraTrees = true;
@ConfigProperty(key = "botany", comment = { "Enables the Botany Mod." })
@PropBoolean
public static boolean botany = true;
@ConfigProperty(key = "genetics", comment = { "Enables the Genetics Mod." })
@PropBoolean
public static boolean genetics = true;
}