Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Yeet custom config in favor of NHLib #53

Merged
merged 16 commits into from
Dec 29, 2024
Prev Previous commit
Next Next commit
Move ExtraTrees to NHLib config
ah-OOG-ah committed Sep 26, 2024
commit 162ac5a46c9a426263bbe6d6bd65cfcf7b9f1839
17 changes: 5 additions & 12 deletions src/main/java/binnie/extratrees/ExtraTrees.java
Original file line number Diff line number Diff line change
@@ -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.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.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 IBinnieGUID[] getGUIDs() {
return ExtraTreesGUID.values();
}

@Override
public Class<?>[] getConfigs() {
return new Class[] { ConfigurationMain.class };
}

@Override
public String getChannel() {
return "ET";
13 changes: 13 additions & 0 deletions src/main/java/binnie/extratrees/ExtraTreesConfig.java
Original file line number Diff line number Diff line change
@@ -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;
}
15 changes: 0 additions & 15 deletions src/main/java/binnie/extratrees/config/ConfigurationMain.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -16,8 +16,8 @@
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 static void init() {
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();