Move ExtraTrees to NHLib config

This commit is contained in:
ah-OOG-ah committed 2024-09-26 14:27:48 -04:00
1 parent 1077567cc3
commit 162ac5a46c
4 files changed
+20 -29

No files matched your search

@@ -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";
@@ -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;
}
@@ -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;
}
@@ -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();