Actually plug in the config class

Although I'm not sure that child mods are handled correctly.
This commit is contained in:
ah-OOG-ah committed 2024-09-26 14:27:48 -04:00
1 parent 162ac5a46c
commit df042779de
5 files changed
+47 -5

No files matched your search

@@ -1,7 +1,11 @@
package binnie.extratrees;
import static binnie.extratrees.ExtraTrees.MODID;
import static binnie.extratrees.ExtraTrees.MOD_NAME;
import binnie.extratrees.config.ETConfig;
import com.gtnewhorizon.gtnhlib.config.ConfigException;
import com.gtnewhorizon.gtnhlib.config.ConfigurationManager;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
@@ -31,10 +35,12 @@ import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
@Mod(modid = MODID, name = "Extra Trees", version = Tags.VERSION, useMetadata = true, dependencies = "after:BinnieCore")
@Mod(modid = MODID, name = MOD_NAME, version = Tags.VERSION, useMetadata = true, dependencies = "after:BinnieCore",
guiFactory = "binnie.extratrees.config.ETConfigGUIFactory")
public class ExtraTrees extends AbstractMod {
public static final String MODID = "ExtraTrees";
public static final String MOD_NAME = "Extra Trees";
@Mod.Instance("ExtraTrees")
public static ExtraTrees instance;
@@ -42,6 +48,14 @@ public class ExtraTrees extends AbstractMod {
@SidedProxy(clientSide = "binnie.extratrees.proxy.ProxyClient", serverSide = "binnie.extratrees.proxy.ProxyServer")
public static Proxy proxy;
static {
try {
ConfigurationManager.registerConfig(ETConfig.class);
} catch (ConfigException e) {
throw new RuntimeException(e);
}
}
public static Item itemDictionary;
public static Item itemDictionaryLepi;
public static Item itemMisc;
@@ -109,6 +123,7 @@ public class ExtraTrees extends AbstractMod {
return ExtraTrees.proxy;
}
// Concerningly, this isn't the same as the MODID
@Override
public String getModID() {
return "extratrees";
@@ -1,13 +1,14 @@
package binnie.extratrees;
package binnie.extratrees.config;
import static binnie.extratrees.ExtraTrees.MODID;
import com.gtnewhorizon.gtnhlib.config.Config;
@Config(modid = MODID)
public class ExtraTreesConfig {
public class ETConfig {
@Config.Comment("Uses reflection to convert the Forestry lemon tree to the Citrus family.")
@Config.DefaultBoolean(true)
@Config.RequiresMcRestart
public static boolean alterLemon;
}
@@ -0,0 +1,14 @@
package binnie.extratrees.config;
import static binnie.extratrees.ExtraTrees.MODID;
import static binnie.extratrees.ExtraTrees.MOD_NAME;
import com.gtnewhorizon.gtnhlib.config.ConfigException;
import com.gtnewhorizon.gtnhlib.config.SimpleGuiConfig;
import net.minecraft.client.gui.GuiScreen;
public class ETConfigGUI extends SimpleGuiConfig {
public ETConfigGUI(GuiScreen parent) throws ConfigException {
super(parent, ETConfig.class, MODID, MOD_NAME);
}
}
@@ -0,0 +1,12 @@
package binnie.extratrees.config;
import com.gtnewhorizon.gtnhlib.config.SimpleGuiFactory;
import net.minecraft.client.gui.GuiScreen;
public class ETConfigGUIFactory implements SimpleGuiFactory {
@Override
public Class<? extends GuiScreen> mainConfigGuiClass() {
return ETConfigGUI.class;
}
}
@@ -16,7 +16,7 @@ import com.gtnewhorizon.gtnhlib.reflect.Fields;
import binnie.Binnie;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.ExtraTreesConfig;
import binnie.extratrees.config.ETConfig;
import binnie.extratrees.block.FruitPod;
import binnie.extratrees.item.Food;
import cpw.mods.fml.relauncher.Side;
@@ -254,7 +254,7 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider {
ExtraTreeFruitGene.Candlenut.addProduct(Food.Candlenut.get(1), 1.0f);
ExtraTreeFruitGene.Candlenut.setFamily(familyJungle);
if (ExtraTreesConfig.alterLemon) {
if (ETConfig.alterLemon) {
try {
IAlleleFruit lemon = (IAlleleFruit) AlleleManager.alleleRegistry.getAllele("forestry.fruitLemon");
FruitProviderNone prov = (FruitProviderNone) lemon.getProvider();