Merge pull request #17 from GTModpackTeam/fix-ceu-cfg-false

Author: tier940

CHANGELOG.md

@@ -1,3 +1,8 @@
+# v1.2.2
+- Fixed behavior when hardWoodRecipes or harderRods cfg is false
+
+* * *
+
 # v1.2.1
 ## New Integration
 - Botania

src/main/java/com/github/gtexpert/gtwp/integration/gtfo/loaders/recipes/GTFOWoodRecipe.java

@@ -3,6 +3,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import gregtech.common.ConfigHolder;
 import gregtech.loaders.WoodTypeEntry;
 
 import com.github.gtexpert.gtwp.api.util.Mods;
@@ -63,6 +64,9 @@ private static List<WoodTypeEntry> getDefaultEntries() {
     public static void init() {
         for (WoodTypeEntry entry : getDefaultEntries()) {
             GTWPWoodRecipeLoader.removePlankRecipe(true, entry);
+            if (!ConfigHolder.recipes.hardWoodRecipes) {
+                GTWPWoodRecipeLoader.removePlankRecipe(false, entry, Mods.Names.GREGTECH);
+            }
 
             GTWPWoodRecipeLoader.registerWoodTypeRecipe(false, entry);
             GTWPWoodRecipeLoader.addSawmillRecipe(entry);

src/main/java/com/github/gtexpert/gtwp/loaders/recipe/GTWPWoodRecipe.java

@@ -74,10 +74,15 @@ private static void sticks() {
         int stick_saw = GTWPConfigHolder.ceuOverride.moreNerfStickCrafting ? 2 : 4;
         stick_saw = ConfigHolder.recipes.harderRods ? stick_saw : 6;
 
-        ModHandler.removeRecipeByName(Mods.GregTech.getResource("stick_normal"));
+        if (ConfigHolder.recipes.harderRods) {
+            ModHandler.removeRecipeByName(Mods.GregTech.getResource("stick_normal"));
+            ModHandler.removeRecipeByName(Mods.GregTech.getResource("stick_saw"));
+        } else {
+            ModHandler.removeRecipeByName(Mods.Vanilla.getResource("stick"));
+        }
+
         ModHandler.addMirroredShapedRecipe("stick_normal", new ItemStack(Items.STICK, stick_normal), "P", "P",
                 'P', new UnificationEntry(plank, Materials.Wood));
-        ModHandler.removeRecipeByName(Mods.GregTech.getResource("stick_saw"));
         ModHandler.addMirroredShapedRecipe("stick_saw", new ItemStack(Items.STICK, stick_saw), "s", "P", "P",
                 'P', new UnificationEntry(plank, Materials.Wood));
 
@@ -94,6 +99,9 @@ private static void sticks() {
     private static void planks() {
         for (WoodTypeEntry entry : getDefaultEntries()) {
             GTWPWoodRecipeLoader.removePlankRecipe(true, entry, Mods.Names.GREGTECH);
+            if (!ConfigHolder.recipes.hardWoodRecipes) {
+                GTWPWoodRecipeLoader.removePlankRecipe(false, entry, Mods.Names.VANILLA);
+            }
 
             GTWPWoodRecipeLoader.registerWoodTypeRecipe(false, entry);
             GTWPWoodRecipeLoader.addSawmillRecipe(entry);