Port BW config to GTNHLib (#3169)

Co-authored-by: Martin Robertz <dream-master@gmx.net>

3 files changed, 7 insertions, 14 deletions

diff --git a/src/main/java/bartworks/common/loaders/ItemRegistry.java b/src/main/java/bartworks/common/loaders/ItemRegistry.java
index 4cf95866a1..8d028a7d2e 100644
--- a/src/main/java/bartworks/common/loaders/ItemRegistry.java
+++ b/src/main/java/bartworks/common/loaders/ItemRegistry.java
@@ -187,7 +187,6 @@ import bartworks.common.blocks.BWBlocksGlass;
 import bartworks.common.blocks.BWBlocksGlass2;
 import bartworks.common.blocks.BWMachineBlockContainer;
 import bartworks.common.blocks.BWTileEntityContainer;
-import bartworks.common.configs.ConfigHandler;
 import bartworks.common.items.BWItemBlocks;
 import bartworks.common.items.ItemCircuitProgrammer;
 import bartworks.common.items.ItemRockCutter;
@@ -410,8 +409,7 @@ public class ItemRegistry {
         // GT2 stuff
         GameRegistry.registerBlock(ItemRegistry.BW_BLOCKS[0], BWItemBlocks.class, "BW_ItemBlocks");
         GameRegistry.registerBlock(ItemRegistry.BW_BLOCKS[1], BWItemBlocks.class, "GT_LESU_CASING");
-        if (ConfigHandler.teslastaff)
-            GameRegistry.registerItem(ItemRegistry.TESLASTAFF, ItemRegistry.TESLASTAFF.getUnlocalizedName());
+        GameRegistry.registerItem(ItemRegistry.TESLASTAFF, ItemRegistry.TESLASTAFF.getUnlocalizedName());
 
         GameRegistry.registerItem(ItemRegistry.ROCKCUTTER_LV, ItemRegistry.ROCKCUTTER_LV.getUnlocalizedName());
         GameRegistry.registerItem(ItemRegistry.ROCKCUTTER_MV, ItemRegistry.ROCKCUTTER_MV.getUnlocalizedName());
diff --git a/src/main/java/bartworks/common/loaders/RegisterServerCommands.java b/src/main/java/bartworks/common/loaders/RegisterServerCommands.java
index f0bc69491a..7161eed1d3 100644
--- a/src/main/java/bartworks/common/loaders/RegisterServerCommands.java
+++ b/src/main/java/bartworks/common/loaders/RegisterServerCommands.java
@@ -13,7 +13,6 @@
 
 package bartworks.common.loaders;
 
-import bartworks.common.commands.ChangeConfig;
 import bartworks.common.commands.ClearCraftingCache;
 import bartworks.common.commands.GetWorkingDirectory;
 import bartworks.common.commands.PrintRecipeListToFile;
@@ -25,7 +24,6 @@ public class RegisterServerCommands {
 
     public static void registerAll(FMLServerStartingEvent event) {
         event.registerServerCommand(new SummonRuin());
-        event.registerServerCommand(new ChangeConfig());
         event.registerServerCommand(new PrintRecipeListToFile());
         event.registerServerCommand(new ClearCraftingCache());
         event.registerServerCommand(new GetWorkingDirectory());
diff --git a/src/main/java/bartworks/common/loaders/recipes/CraftingRecipes.java b/src/main/java/bartworks/common/loaders/recipes/CraftingRecipes.java
index 2cb768ec70..5473872dda 100644
--- a/src/main/java/bartworks/common/loaders/recipes/CraftingRecipes.java
+++ b/src/main/java/bartworks/common/loaders/recipes/CraftingRecipes.java
@@ -36,7 +36,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.StatCollector;
 import net.minecraftforge.oredict.OreDictionary;
 
-import bartworks.common.configs.ConfigHandler;
 import bartworks.common.loaders.BioItemList;
 import bartworks.common.loaders.ItemRegistry;
 import bartworks.common.loaders.RecipeLoader;
@@ -125,14 +124,12 @@ public class CraftingRecipes implements Runnable {
                 GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L), 'C', "circuitAdvanced", 'B',
                 ItemList.IC2_EnergyCrystal.get(1L) });
 
-        if (ConfigHandler.teslastaff) {
-            GTModHandler.addCraftingRecipe(
-                new ItemStack(ItemRegistry.TESLASTAFF),
-                RecipeLoader.BITSD,
-                new Object[] { "BO ", "OP ", "  P", 'O',
-                    GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 1L), 'B',
-                    ItemList.Energy_LapotronicOrb.get(1L), 'P', "plateAlloyIridium", });
-        }
+        GTModHandler.addCraftingRecipe(
+            new ItemStack(ItemRegistry.TESLASTAFF),
+            RecipeLoader.BITSD,
+            new Object[] { "BO ", "OP ", "  P", 'O',
+                GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 1L), 'B',
+                ItemList.Energy_LapotronicOrb.get(1L), 'P', "plateAlloyIridium", });
 
         GTModHandler.addCraftingRecipe(
             new ItemStack(ItemRegistry.PUMPPARTS, 1, 0), // tube