Removed conflicts with GTWP

dependencies.gradle

@@ -58,10 +58,16 @@ dependencies {
         devOnlyNonPublishable(rfg.deobf("curse.maven:ae2-extended-life-570458:5411078")) // AE2UEL 0.56.6
     }
 
+    // Debug GTWoodProcessing
+    compileOnly rfg.deobf("curse.maven:gtwoodprocessing-1093753:5731776") // GTWoodProcessing 1.2.2
+    if (project.debug_all.toBoolean() || project.debug_gtwp.toBoolean()) {
+        runtimeOnlyNonPublishable rfg.deobf("curse.maven:gtwoodprocessing-1093753:5731776")
+    }
+
     // Debug ImplosionNoBomb
-    compileOnly rfg.deobf("curse.maven:implosionnobomb-1094386:5680426") // ImplosionNoBomb 1.0.0
+    compileOnly rfg.deobf("curse.maven:implosionnobomb-1094386:5731331") // ImplosionNoBomb 1.1.0
     if (project.debug_all.toBoolean() || project.debug_inb.toBoolean()) {
-        runtimeOnlyNonPublishable rfg.deobf("curse.maven:implosionnobomb-1094386:5680426")
+        runtimeOnlyNonPublishable rfg.deobf("curse.maven:implosionnobomb-1094386:5731331")
     }
 
     // Debug AE Additions

gradle.properties

@@ -7,7 +7,7 @@ modGroup = gtexpert
 
 # Version of your mod.
 # This field can be left empty if you want your mod's version to be determined by the latest git tag instead.
-modVersion = 2.3.2-beta
+modVersion = 2.3.2-beta
 
 # Whether to use the old jar naming structure (modid-mcversion-version) instead of the new version (modid-version)
 includeMCVersionJar = true
@@ -27,6 +27,7 @@ useAE2uelExtended = false
 
 # Debug mod compatibility
 debug_all = false
+debug_gtwp = false
 debug_inb = false
 debug_aea = false
 debug_nae2 = false

src/main/java/gtexpert/GTExpertMod.java

@@ -35,8 +35,8 @@
      version = Tags.VERSION,
      updateJSON = "https://forge.curseupdate.com/851103/gtexpert",
      dependencies = GTInternalTags.DEP_VERSION_STRING + "required-after:" + Mods.Names.MIXINBOOTER + ";" +
-             "required-after:" + Mods.Names.GREGICALITY_MULTIBLOCKS + ";" + "after:" + Mods.Names.IMPLOSION_NO_BOMB +
-             ";" +
+             "required-after:" + Mods.Names.GREGICALITY_MULTIBLOCKS + ";" +
+             "after:" + Mods.Names.GREGTECH_WOOD_PROCESSING + ";" + "after:" + Mods.Names.IMPLOSION_NO_BOMB + ";" +
              "after:" + Mods.Names.GREGTECH_FOOD_OPTION + ";" + "after:" + Mods.Names.APPLIED_ENERGISTICS2 + ";" +
              "after:" + Mods.Names.AE_ADDITIONS + ";" + "after:" + Mods.Names.AE2_FLUID_CRAFTING + ";" +
              "after:" + Mods.Names.NEEVES_AE2 + ";" + "after:" + Mods.Names.EXTRA_CPUS + ";" +

src/main/java/gtexpert/api/recipes/GTERecipeMaps.java

@@ -24,15 +24,6 @@ public class GTERecipeMaps {
                     .setProgressBar(GuiTextures.PROGRESS_BAR_SIFT, ProgressWidget.MoveType.VERTICAL_INVERTED)
                     .setSound(SoundEvents.BLOCK_SAND_PLACE);
 
-    @ZenProperty
-    public static final RecipeMap<SimpleRecipeBuilder> SAWMILL_RECIPES = new RecipeMap<>(
-            "sawmill", 2, 2, 1, 0, new SimpleRecipeBuilder(), false)
-                    .setSlotOverlay(false, false, GuiTextures.SAWBLADE_OVERLAY)
-                    .setSlotOverlay(true, false, false, GuiTextures.CUTTER_OVERLAY)
-                    .setSlotOverlay(true, false, true, GuiTextures.DUST_OVERLAY)
-                    .setProgressBar(GuiTextures.PROGRESS_BAR_SLICE, ProgressWidget.MoveType.HORIZONTAL)
-                    .setSound(GTSoundEvents.CHAINSAW_TOOL);
-
     @ZenProperty
     public static final RecipeMap<SimpleRecipeBuilder> VOID_ORE_MINER_RECIPES = new RecipeMap<>(
             "void_ore_miner", 1, 1, 2, 0, new SimpleRecipeBuilder(), false)

src/main/java/gtexpert/api/util/Mods.java

@@ -75,6 +75,7 @@ public enum Mods {
     GregTech(Names.GREGTECH),
     GregTechFoodOption(Names.GREGTECH_FOOD_OPTION),
     GregTechExpertCore(GTEValues.MODID),
+    GregTechWoodProcessing(Names.GREGTECH_WOOD_PROCESSING),
     GroovyScript(Names.GROOVY_SCRIPT),
     HWYLA(Names.HWYLA),
     ImplosionNoBomb(Names.IMPLOSION_NO_BOMB),
@@ -170,6 +171,7 @@ public static class Names {
         public static final String GREGICALITY_MULTIBLOCKS = "gcym";
         public static final String GREGTECH = GTValues.MODID;
         public static final String GREGTECH_FOOD_OPTION = "gregtechfoodoption";
+        public static final String GREGTECH_WOOD_PROCESSING = "gtwp";
         public static final String GROOVY_SCRIPT = "groovyscript";
         public static final String HWYLA = "hwyla";
         public static final String IMPLOSION_NO_BOMB = "inb";

src/main/java/gtexpert/client/GTETextures.java

@@ -11,8 +11,6 @@
 public class GTETextures {
 
     // Core
-    public static SimpleOverlayRenderer SAWMILL_CASING;
-    public static OrientedOverlayRenderer SAWMILL_OVERLAY = new OrientedOverlayRenderer("machines/sawmill");
     public static SimpleOverlayRenderer VOID_ORE_MINER_CASING;
 
     // Ender IO
@@ -34,7 +32,6 @@ public class GTETextures {
 
     public static void preInit() {
         // Core
-        SAWMILL_CASING = new SimpleOverlayRenderer("casings/sawmill_casing");
         VOID_ORE_MINER_CASING = new SimpleOverlayRenderer("casings/void_ore_miner_casing");
 
         // Draconic Evolution

src/main/java/gtexpert/common/GTEConfigHolder.java

@@ -57,14 +57,6 @@ public static class ModpackFlag {
 
     public static class GregtechOverride {
 
-        @Config.Comment({ "Making Planks even more difficult.",
-                "CEu's hardWoodRecipes & nerfWoodCrafting to true to reflect.", "Default: false" })
-        public boolean moreNerfPlankCrafting = false;
-
-        @Config.Comment({ "Making Sticks even more difficult.",
-                "CEu's harderRods to true to reflect.", "Default: false" })
-        public boolean moreNerfStickCrafting = false;
-
         @Config.Comment({ "Change to a recipe using Assembly Line.",
                 "CEu's enableHighTierSolars to true to reflect.", "Default: false" })
         public boolean hardSolarPanel = false;

src/main/java/gtexpert/common/blocks/GTEBlockMetalCasing.java

@@ -21,7 +21,7 @@ public GTEBlockMetalCasing() {
         setResistance(10.0f);
         setSoundType(SoundType.METAL);
         setHarvestLevel(ToolClasses.WRENCH, 2);
-        setDefaultState(getState(MetalCasingType.SAWMill));
+        setDefaultState(getState(MetalCasingType.VOID_ORE_MINER));
     }
 
     @Override
@@ -32,7 +32,6 @@ public boolean canCreatureSpawn(@NotNull IBlockState state, @NotNull IBlockAcces
 
     public enum MetalCasingType implements IStringSerializable {
 
-        SAWMill("sawmill_casing"),
         VOID_ORE_MINER("void_ore_miner_casing"),
         DRACONIUM_CASING("draconium_casing"),
         AWAKENED_DRACONIUM_CASING("awakened_draconium_casing");

src/main/java/gtexpert/common/blocks/GTEMetaBlocks.java

@@ -14,21 +14,17 @@ public class GTEMetaBlocks {
 
     public static GTEBlockWireCoil GTE_WIRE_COIL;
     public static GTEBlockMetalCasing GTE_METAL_CASING;
-    public static BlockSawmillConveyor BLOCK_SAWMILL_CONVEYOR;
 
     public static void init() {
         GTE_METAL_CASING = new GTEBlockMetalCasing();
         GTE_METAL_CASING.setRegistryName("gte_metal_casing");
-        BLOCK_SAWMILL_CONVEYOR = new BlockSawmillConveyor();
-        BLOCK_SAWMILL_CONVEYOR.setRegistryName("sawmill_conveyor");
         GTE_WIRE_COIL = new GTEBlockWireCoil();
         GTE_WIRE_COIL.setRegistryName("gte_wire_coil");
     }
 
     @SideOnly(Side.CLIENT)
     public static void registerItemModels() {
         registerItemModel(GTE_METAL_CASING);
-        registerItemModel(BLOCK_SAWMILL_CONVEYOR);
         GTE_WIRE_COIL.onModelRegister();
     }
 

src/main/java/gtexpert/common/metatileentities/GTEMetaTileEntities.java

@@ -28,7 +28,6 @@ public class GTEMetaTileEntities {
     public static SteamCircuitAssembler STEAM_CIRCUIT_ASSEMBLER_STEEL;
 
     // Multi Machine
-    public static MetaTileEntitySawmill SAWMILL;
     public static MetaTileEntityLargeCrackingUnit LARGE_CRACKER;
     public static MetaTileEntityVoidOreMiner VOIDOREMINER;
     public static MetaTileEntityAdvancedChemicalPlant ADVANCED_CHEMICAL_PLANT;
@@ -53,8 +52,7 @@ public static void init() {
         }
 
         // Multi Machine
-        SAWMILL = registerMetaTileEntity(12001,
-                new MetaTileEntitySawmill(gteId("sawmill")));
+        //
         LARGE_CRACKER = registerMetaTileEntity(12002,
                 new MetaTileEntityLargeCrackingUnit(gteId("large_cracking_unit")));
         VOIDOREMINER = registerMetaTileEntity(12003,