Rfg cleanup (#1726)

* Update buildscript, add all recently added gradle.properties entries

* Dependency version bumps and cleanup

* Bump eternal singularity version

* Update buildscript

* Make AE2 a required dependency

* Switch version to class generation from token replacement

4 files changed, 38 insertions, 45 deletions

diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
index 2ad9274c43..f5c4a6c707 100644
--- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
+++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
@@ -286,8 +286,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Hermitic"), LAPIS, 10);
-        if (Loader.isModLoaded("appliedenergistics2"))
-            tMutation.requireResource(GameRegistry.findBlock("appliedenergistics2", "tile.BlockQuartz"), 0);
+        tMutation.requireResource(GameRegistry.findBlock("appliedenergistics2", "tile.BlockQuartz"), 0);
     }),
     FLUIX(GT_BranchDefinition.GEM, "FluixDust", true, new Color(0xA375FF), new Color(0xB591FF), beeSpecies -> {
         beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f);
@@ -296,8 +295,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(REDSTONE, LAPIS, 7);
-        if (Loader.isModLoaded("appliedenergistics2"))
-            tMutation.requireResource(GameRegistry.findBlock("appliedenergistics2", "tile.BlockFluix"), 0);
+        tMutation.requireResource(GameRegistry.findBlock("appliedenergistics2", "tile.BlockFluix"), 0);
     }),
     DIAMOND(GT_BranchDefinition.GEM, "Diamond", false, new Color(0xCCFFFF), new Color(0xA3CCCC), beeSpecies -> {
         beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f);
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java
index 9b136ad29b..11333e2e2c 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java
@@ -8,7 +8,6 @@ import net.minecraft.item.ItemStack;
 
 import appeng.api.config.TunnelType;
 import appeng.core.Api;
-import cpw.mods.fml.common.Optional;
 import gregtech.GT_Mod;
 import gregtech.api.enums.*;
 import gregtech.api.util.GT_Log;
@@ -449,17 +448,14 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
         if (GT_Mod.gregtechproxy.mAE2Integration) setAE2Field();
     }
 
-    @Optional.Method(modid = "appliedenergistics2")
     private static void setAE2Field() {
         tt = TunnelType.ME;
     }
 
-    @Optional.Method(modid = "appliedenergistics2")
     private void AE2addNewAttunement(ItemStack aStack) {
         Api.INSTANCE.registries().p2pTunnel().addNewAttunement(aStack, (TunnelType) tt);
     }
 
-    @Optional.Method(modid = "appliedenergistics2")
     private void AE2AddNetAttunementCable(ItemStack aStack, OrePrefixes correspondingCable, Materials aMaterial) {
         Api.INSTANCE.registries().p2pTunnel().addNewAttunement(aStack, (TunnelType) tt);
         Api.INSTANCE.registries().p2pTunnel()
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index 3607df541c..ca518cd4a3 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -35,7 +35,9 @@ public class GT_MachineRecipeLoader implements Runnable {
     public static final Boolean isTinkersConstructLoaded = Loader.isModLoaded("TConstruct");
     public static final Boolean isHardcoreEnderExpansionLoaded = Loader.isModLoaded("HardcoreEnderExpansion");
     public static final Boolean isForestryLoaded = Loader.isModLoaded(MOD_ID_FR);
-    public static final Boolean isAE2Loaded = Loader.isModLoaded("appliedenergistics2");
+    /** @deprecated AE2 is a required dependency now */
+    @Deprecated
+    public static final Boolean isAE2Loaded = true;
 
     @Override
     public void run() {
diff --git a/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java
index 8af72a84e1..a7f3ec3202 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java
@@ -2,7 +2,6 @@ package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.enums.GT_Values.MOD_ID_TC;
 import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.loaders.postload.GT_MachineRecipeLoader.isAE2Loaded;
 import static gregtech.loaders.postload.GT_MachineRecipeLoader.isThaumcraftLoaded;
 
 import java.util.Arrays;
@@ -553,41 +552,39 @@ public class ThaumcraftRecipes implements Runnable {
                                                 new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L),
                                                 new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))) });
 
-                if (isAE2Loaded) {
-                    tKey = "GT_TRANSSKYSTONE";
-                    GT_LanguageManager.addStringLocalization(
-                            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                            "You have discovered a way to convert obsidian to skystone.<BR><BR>Not sure why you'd want to do this, unless skystone is somehow unavailable in your world.");
-                    GregTech_API.sThaumcraftCompat.addResearch(
-                            tKey,
-                            "Skystone Transmutation",
-                            "Transformation of obsidian into skystone",
-                            new String[] { "GT_ADVANCEDMETALLURGY" },
-                            "ALCHEMY",
-                            getModItem("appliedenergistics2", "tile.BlockSkyStone", 1),
-                            4,
-                            0,
-                            19,
-                            15,
-                            Arrays.asList(
-                                    new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L),
-                                    new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L),
-                                    new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 3L),
-                                    new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 3L),
-                                    new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 3L)),
-                            null,
-                            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                                    GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
-                                            tKey,
-                                            new ItemStack(Blocks.obsidian),
-                                            getModItem("appliedenergistics2", "tile.BlockSkyStone", 1),
-                                            Arrays.asList(
-                                                    new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 2L),
-                                                    new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 1L),
-                                                    new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1L),
-                                                    new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 2L),
-                                                    new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 1L))) });
-                }
+                tKey = "GT_TRANSSKYSTONE";
+                GT_LanguageManager.addStringLocalization(
+                        GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+                        "You have discovered a way to convert obsidian to skystone.<BR><BR>Not sure why you'd want to do this, unless skystone is somehow unavailable in your world.");
+                GregTech_API.sThaumcraftCompat.addResearch(
+                        tKey,
+                        "Skystone Transmutation",
+                        "Transformation of obsidian into skystone",
+                        new String[] { "GT_ADVANCEDMETALLURGY" },
+                        "ALCHEMY",
+                        getModItem("appliedenergistics2", "tile.BlockSkyStone", 1),
+                        4,
+                        0,
+                        19,
+                        15,
+                        Arrays.asList(
+                                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L),
+                                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L),
+                                new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 3L),
+                                new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 3L),
+                                new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 3L)),
+                        null,
+                        new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+                                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+                                        tKey,
+                                        new ItemStack(Blocks.obsidian),
+                                        getModItem("appliedenergistics2", "tile.BlockSkyStone", 1),
+                                        Arrays.asList(
+                                                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 2L),
+                                                new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 1L),
+                                                new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1L),
+                                                new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 2L),
+                                                new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 1L))) });
 
                 tKey = "GT_TRANSMINERAL";
                 GT_LanguageManager.addStringLocalization(