From 162ac5a46c9a426263bbe6d6bd65cfcf7b9f1839 Mon Sep 17 00:00:00 2001 From: ah-OOG-ah <75745146+ah-OOG-ah@users.noreply.github.com> Date: Wed, 25 Sep 2024 01:17:41 -0400 Subject: [PATCH] Move ExtraTrees to NHLib config --- src/main/java/binnie/extratrees/ExtraTrees.java | 17 +++++------------ .../binnie/extratrees/ExtraTreesConfig.java | 13 +++++++++++++ .../extratrees/config/ConfigurationMain.java | 15 --------------- .../extratrees/genetics/ExtraTreeFruitGene.java | 4 ++-- 4 files changed, 20 insertions(+), 29 deletions(-) create mode 100644 src/main/java/binnie/extratrees/ExtraTreesConfig.java delete mode 100644 src/main/java/binnie/extratrees/config/ConfigurationMain.java diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index 9eb3dbdc..8229ff7a 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -1,5 +1,7 @@ package binnie.extratrees; +import static binnie.extratrees.ExtraTrees.MODID; + import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -16,7 +18,6 @@ import binnie.extratrees.block.decor.BlockMultiFence; import binnie.extratrees.carpentry.BlockCarpentry; import binnie.extratrees.carpentry.BlockStainedDesign; import binnie.extratrees.carpentry.ModuleCarpentry; -import binnie.extratrees.config.ConfigurationMain; import binnie.extratrees.core.ExtraTreesGUID; import binnie.extratrees.core.ModuleCore; import binnie.extratrees.genetics.ModuleGenetics; @@ -30,14 +31,11 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -@Mod( - modid = "ExtraTrees", - name = "Extra Trees", - version = Tags.VERSION, - useMetadata = true, - dependencies = "after:BinnieCore") +@Mod(modid = MODID, name = "Extra Trees", version = Tags.VERSION, useMetadata = true, dependencies = "after:BinnieCore") public class ExtraTrees extends AbstractMod { + public static final String MODID = "ExtraTrees"; + @Mod.Instance("ExtraTrees") public static ExtraTrees instance; @@ -101,11 +99,6 @@ public class ExtraTrees extends AbstractMod { return ExtraTreesGUID.values(); } - @Override - public Class[] getConfigs() { - return new Class[] { ConfigurationMain.class }; - } - @Override public String getChannel() { return "ET"; diff --git a/src/main/java/binnie/extratrees/ExtraTreesConfig.java b/src/main/java/binnie/extratrees/ExtraTreesConfig.java new file mode 100644 index 00000000..7bfe961f --- /dev/null +++ b/src/main/java/binnie/extratrees/ExtraTreesConfig.java @@ -0,0 +1,13 @@ +package binnie.extratrees; + +import static binnie.extratrees.ExtraTrees.MODID; + +import com.gtnewhorizon.gtnhlib.config.Config; + +@Config(modid = MODID) +public class ExtraTreesConfig { + + @Config.Comment("Uses reflection to convert the Forestry lemon tree to the Citrus family.") + @Config.DefaultBoolean(true) + public static boolean alterLemon; +} diff --git a/src/main/java/binnie/extratrees/config/ConfigurationMain.java b/src/main/java/binnie/extratrees/config/ConfigurationMain.java deleted file mode 100644 index 7bdbd1b7..00000000 --- a/src/main/java/binnie/extratrees/config/ConfigurationMain.java +++ /dev/null @@ -1,15 +0,0 @@ -package binnie.extratrees.config; - -import binnie.core.mod.config.ConfigFile; -import binnie.core.mod.config.ConfigProperty; -import binnie.core.mod.config.PropBoolean; - -@ConfigFile(filename = "/config/forestry/extratrees/main.conf") -public class ConfigurationMain { - - @ConfigProperty( - key = "lemon.citrus.family", - comment = { "Uses reflection to convert the Forestry lemon tree to the Citrus family." }) - @PropBoolean - public static boolean alterLemon = true; -} diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java index 384e507a..96a6a882 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java @@ -16,8 +16,8 @@ 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.block.FruitPod; -import binnie.extratrees.config.ConfigurationMain; import binnie.extratrees.item.Food; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -254,7 +254,7 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider { ExtraTreeFruitGene.Candlenut.addProduct(Food.Candlenut.get(1), 1.0f); ExtraTreeFruitGene.Candlenut.setFamily(familyJungle); - if (ConfigurationMain.alterLemon) { + if (ExtraTreesConfig.alterLemon) { try { IAlleleFruit lemon = (IAlleleFruit) AlleleManager.alleleRegistry.getAllele("forestry.fruitLemon"); FruitProviderNone prov = (FruitProviderNone) lemon.getProvider();