Separate to GTBeesMatrix (#320)

Author: tier940

dependencies.gradle

@@ -96,27 +96,6 @@ dependencies {
         }
     }
 
-    // Debug Forestry
-    compileOnly rfg.deobf("curse.maven:forestry-59751:2684780") // Forestry 5.8.2.387
-    compileOnly rfg.deobf("curse.maven:binnies-mods-patched-899182:5492997") // Binnie's Mods Patched 2.5.1.212
-    if (project.debug_all.toBoolean() || project.debug_ffm.toBoolean()) {
-        runtimeOnlyNonPublishable rfg.deobf("curse.maven:forestry-59751:2684780") // Forestry 5.8.2.387
-        runtimeOnlyNonPublishable rfg.deobf("curse.maven:beebetteratbees-244516:2627215") // BeeBetterAtBees 2.0.3
-        runtimeOnlyNonPublishable rfg.deobf("curse.maven:jei-bees-248370:2490058") // JEIBees 0.9.0.5
-
-        // Debug Gendustry
-        if (project.debug_all.toBoolean() || project.debug_gendustry.toBoolean()) {
-            runtimeOnlyNonPublishable rfg.deobf("curse.maven:bdlib-70496:2518031") // BdLib 1.14.3.12
-            runtimeOnlyNonPublishable rfg.deobf("curse.maven:gendustry-70492:2516215") // Gendustry 1.6.5.8
-            runtimeOnlyNonPublishable rfg.deobf("curse.maven:gendustry-jei-addon-301364:2609434") // Gendustry JEI Addon 1.0.2
-        }
-
-        // Debug Binnies
-        if (project.debug_all.toBoolean() || project.debug_binnies.toBoolean()) {
-            runtimeOnlyNonPublishable rfg.deobf("curse.maven:binnies-mods-patched-899182:5492997") // Binnie's Mods Patched 2.5.1.212
-        }
-    }
-
     // Debug EnderIO
     compileOnly "info.loenwind.autoconfig:AutoConfig:1.12.2-1.0.2" // AutoConfig 1.0.2
     compileOnly "info.loenwind.autosave:AutoSave:1.12.2-1.0.11" // AutoSave 1.0.11
@@ -153,7 +132,7 @@ dependencies {
 
     // Debug Avaritia
     if (project.debug_all.toBoolean() || project.debug_avaritia.toBoolean()) {
-        runtimeOnlyNonPublishable rfg.deobf("curse.maven:avaritia-1-1x-unofficial-1165010:6029951") // Avaritia 1.1x UEL
+        runtimeOnlyNonPublishable rfg.deobf("curse.maven:avaritia-1-1x-unofficial-1165010:6092956") // Avaritia UEL 3.3.0.41
     }
 
     // Debug Chisel

gradle.properties

@@ -34,9 +34,6 @@ debug_nae2 = false
 debug_extracpus = false
 debug_thaumcraft = false
 debug_thaumenergy = false
-debug_ffm = false
-debug_gendustry = false
-debug_binnies = false
 debug_eio = false
 debug_deda = false
 debug_avaritia = false

src/main/java/com/github/gtexpert/core/GTExpertMod.java

@@ -46,10 +46,7 @@
              "after:" + Mods.Names.ENDER_CONDUITS + ";" + "after:" + Mods.Names.ENDER_AE2_CONDUITS + ";" +
              "after:" + Mods.Names.DRACONIC_EVOLUTION + ";" + "after:" + Mods.Names.DRACONIC_ADDITIONS + ";" +
              "after:" + Mods.Names.CHISEL + ";" + "after:" + Mods.Names.AVARITIA + ";" +
-             "after:" + Mods.Names.THAUMCRAFT + ";" + "after:" + Mods.Names.THAUMIC_ENERGISTICS + ";" +
-             "after:" + Mods.Names.FORESTRY + ";" + "after:" + Mods.Names.GENDUSTRY + ";" +
-             "after:" + Mods.Names.GENETICS + ";" + "after:" + Mods.Names.BOTANY + ";" +
-             "after:" + Mods.Names.EXTRA_BEES + ";" + "after:" + Mods.Names.EXTRA_TREES + ";")
+             "after:" + Mods.Names.THAUMCRAFT + ";" + "after:" + Mods.Names.THAUMIC_ENERGISTICS + ";")
 @Mod.EventBusSubscriber(modid = GTEValues.MODID)
 public class GTExpertMod {
 

src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java

@@ -8,8 +8,6 @@
 import gregtech.api.unification.material.properties.*;
 import gregtech.api.unification.ore.OrePrefix;
 
-import com.github.gtexpert.core.api.util.Mods;
-
 public class GTEMaterialFlags {
 
     public static void init() {
@@ -65,22 +63,5 @@ public static void init() {
         // Iridium
         Materials.Iridium.setProperty(PropertyKey.ORE, new OreProperty());
         Materials.Iridium.getProperty(PropertyKey.ORE).setOreByProducts(Materials.Platinum, Materials.Osmium);
-
-        if (Mods.Forestry.isModLoaded()) {
-            // Copper
-            Materials.Copper.addFlags(GENERATE_GEAR);
-
-            // Tin
-            Materials.Tin.addFlags(GENERATE_GEAR);
-
-            // Iron
-            Materials.Iron.addFlags(GENERATE_FINE_WIRE, GENERATE_FOIL);
-
-            // Bronze
-            Materials.Bronze.addFlags(GENERATE_FINE_WIRE);
-
-            // Rose Gold
-            Materials.RoseGold.addFlags(GENERATE_FOIL);
-        }
     }
 }

src/main/java/com/github/gtexpert/core/api/util/Mods.java

@@ -31,7 +31,6 @@ public enum Mods {
     Avaritia(Names.AVARITIA),
     Avaritiaaddons(Names.AVARITIAADDONS),
     Baubles(Names.BAUBLES),
-    Botany(Names.BOTANY),
     Chisel(Names.CHISEL),
     CTM(Names.CONNECTED_TEXTURES_MOD),
     CraftTweaker(Names.CRAFT_TWEAKER),
@@ -43,34 +42,8 @@ public enum Mods {
     EnderIOMachines(Names.ENDER_MACHINES),
     EnderIOConduits(Names.ENDER_CONDUITS),
     EnderIOAE2Conduits(Names.ENDER_AE2_CONDUITS),
-    ExtraBees(Names.EXTRA_BEES),
     ExtraCPUs(Names.EXTRA_CPUS),
-    ExtraTrees(Names.EXTRA_TREES),
-    Forestry(Names.FORESTRY),
-    ForestryApiculture(Names.FORESTRY, forestryModule(Names.FORESTRY_APICULTURE)),
-    ForestryArboriculture(Names.FORESTRY, forestryModule(Names.FORESTRY_ARBORICULTURE)),
-    ForestryCharcoal(Names.FORESTRY, forestryModule(Names.FORESTRY_CHARCOAL)),
-    ForestryCore(Names.FORESTRY, forestryModule(Names.FORESTRY_CORE)),
-    ForestryEnergy(Names.FORESTRY, forestryModule(Names.FORESTRY_ENERGY)),
-    ForestryFactory(Names.FORESTRY, forestryModule(Names.FORESTRY_FACTORY)),
-    ForestryWorktable(Names.FORESTRY, forestryModule(Names.FORESTRY_WORKTABLE)),
-    ForestryFarming(Names.FORESTRY, forestryModule(Names.FORESTRY_FARMING)),
-    ForestryClimatology(Names.FORESTRY, forestryModule(Names.FORESTRY_CLIMATOLOGY)),
-    ForestryGreenhouse(Names.FORESTRY, forestryModule(Names.FORESTRY_GREENHOUSE)),
-    ForestryFluids(Names.FORESTRY, forestryModule(Names.FORESTRY_FLUIDS)),
-    ForestryFood(Names.FORESTRY, forestryModule(Names.FORESTRY_FOOD)),
-    ForestryLepidopterology(Names.FORESTRY, forestryModule(Names.FORESTRY_LEPIDOPTEROLOGY)),
-    ForestryMail(Names.FORESTRY, forestryModule(Names.FORESTRY_MAIL)),
-    ForestryCrate(Names.FORESTRY, forestryModule(Names.FORESTRY_CRATE)),
-    ForestryBackpacks(Names.FORESTRY, forestryModule(Names.FORESTRY_BACKPACKS)),
-    ForestryDatabase(Names.FORESTRY, forestryModule(Names.FORESTRY_DATABASE)),
-    ForestrySorting(Names.FORESTRY, forestryModule(Names.FORESTRY_SORTING)),
-    ForestryBook(Names.FORESTRY, forestryModule(Names.FORESTRY_BOOK)),
-    ForestryCultivation(Names.FORESTRY, forestryModule(Names.FORESTRY_CULTIVATION)),
-    ForestryResearch(Names.FORESTRY, forestryModule(Names.FORESTRY_RESEARCH)),
     GalacticraftCore(Names.GALACTICRAFT_CORE),
-    Genetics(Names.GENETICS),
-    Gendustry(Names.GENDUSTRY),
     GregicalityMultiblocks(Names.GREGICALITY_MULTIBLOCKS),
     GregTech(Names.GREGTECH),
     GregTechFoodOption(Names.GREGTECH_FOOD_OPTION),
@@ -82,7 +55,6 @@ public enum Mods {
     InventoryTweaks(Names.INVENTORY_TWEAKS),
     JourneyMap(Names.JOURNEY_MAP),
     JustEnoughItems(Names.JUST_ENOUGH_ITEMS),
-    MagicBees(Names.MAGIC_BEES),
     ModularUI(Names.MODULRAUI),
     MixinBooter(Names.MIXINBOOTER),
     NeevesAE2(Names.NEEVES_AE2),
@@ -143,28 +115,6 @@ public static class Names {
         public static final String EXTRA_BEES = "extrabees";
         public static final String EXTRA_CPUS = "extracpus";
         public static final String EXTRA_TREES = "extratrees";
-        public static final String FORESTRY = "forestry";
-        public static final String FORESTRY_APICULTURE = "apiculture";
-        public static final String FORESTRY_ARBORICULTURE = "arboriculture";
-        public static final String FORESTRY_CHARCOAL = "charcoal";
-        public static final String FORESTRY_CORE = "core";
-        public static final String FORESTRY_ENERGY = "energy";
-        public static final String FORESTRY_FACTORY = "factory";
-        public static final String FORESTRY_WORKTABLE = "worktable";
-        public static final String FORESTRY_FARMING = "farming";
-        public static final String FORESTRY_CLIMATOLOGY = "climatology";
-        public static final String FORESTRY_GREENHOUSE = "greenhouse";
-        public static final String FORESTRY_FLUIDS = "fluids";
-        public static final String FORESTRY_FOOD = "food";
-        public static final String FORESTRY_LEPIDOPTEROLOGY = "lepidopterology";
-        public static final String FORESTRY_MAIL = "mail";
-        public static final String FORESTRY_CRATE = "crates";
-        public static final String FORESTRY_BACKPACKS = "backpacks";
-        public static final String FORESTRY_DATABASE = "database";
-        public static final String FORESTRY_SORTING = "sorting";
-        public static final String FORESTRY_BOOK = "book";
-        public static final String FORESTRY_CULTIVATION = "cultivation";
-        public static final String FORESTRY_RESEARCH = "research";
         public static final String GALACTICRAFT_CORE = "galacticraftcore";
         public static final String GENETICS = "genetics";
         public static final String GENDUSTRY = "gendustry";
@@ -178,7 +128,6 @@ public static class Names {
         public static final String INVENTORY_TWEAKS = "inventorytweaks";
         public static final String JOURNEY_MAP = "journeymap";
         public static final String JUST_ENOUGH_ITEMS = "jei";
-        public static final String MAGIC_BEES = "magicbees";
         public static final String MODULRAUI = "modularui";
         public static final String MIXINBOOTER = "mixinbooter";
         public static final String NEEVES_AE2 = "nae2";
@@ -303,13 +252,4 @@ private static Function<Mods, Boolean> versionExcludes(String versionPart) {
             return !container.getVersion().contains(versionPart);
         };
     }
-
-    /** Test if a specific Forestry module is enabled. */
-    private static Function<Mods, Boolean> forestryModule(String moduleID) {
-        if (Forestry.isModLoaded()) {
-            return mod -> forestry.modules.ModuleHelper.isEnabled(moduleID);
-        } else {
-            return $ -> false;
-        }
-    }
 }