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

13 files changed, 44 insertions, 132 deletions

diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index 14ff8b2c2d..33c02f37dd 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -111,7 +111,7 @@ import ic2.api.recipe.RecipeOutput;
                 + " after:PFAAGeologica;"
                 + " after:Thaumcraft;"
                 + " after:Railcraft;"
-                + " after:appliedenergistics2;"
+                + " required-after:appliedenergistics2;"
                 + " after:ThermalExpansion;"
                 + " after:TwilightForest;"
                 + " after:harvestcraft;"
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
index d8a512c954..8cf45d1984 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
@@ -49,7 +49,6 @@ import com.gtnewhorizon.structurelib.alignment.IAlignmentProvider;
 import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
 import com.gtnewhorizon.structurelib.alignment.constructable.IConstructableProvider;
 
-import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.relauncher.ReflectionHelper;
 import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
@@ -80,16 +79,6 @@ import ic2.api.Direction;
  * <p/>
  * This is the main TileEntity for EVERYTHING.
  */
-@Optional.InterfaceList(
-        value = {
-                @Optional.Interface(
-                        iface = "appeng.api.networking.security.IActionHost",
-                        modid = "appliedenergistics2",
-                        striprefs = true),
-                @Optional.Interface(
-                        iface = "appeng.me.helpers.IGridProxyable",
-                        modid = "appliedenergistics2",
-                        striprefs = true) })
 public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTechTileEntity, IActionHost,
         IGridProxyable, IAlignmentProvider, IConstructableProvider, IDebugableTileEntity, IGregtechWailaProvider {
 
@@ -2329,7 +2318,6 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec
     }
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public IGridNode getGridNode(ForgeDirection forgeDirection) {
         if (mFacing != forgeDirection.ordinal()) return null;
         final AENetworkProxy gp = getProxy();
@@ -2337,61 +2325,51 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec
     }
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public AECableType getCableConnectionType(ForgeDirection forgeDirection) {
         return mMetaTileEntity == null ? AECableType.NONE : mMetaTileEntity.getCableConnectionType(forgeDirection);
     }
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public void securityBreak() {}
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public IGridNode getActionableNode() {
         final AENetworkProxy gp = getProxy();
         return gp != null ? gp.getNode() : null;
     }
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public AENetworkProxy getProxy() {
         return mMetaTileEntity == null ? null : mMetaTileEntity.getProxy();
     }
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public DimensionalCoord getLocation() {
         return new DimensionalCoord(this);
     }
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public void gridChanged() {
         if (mMetaTileEntity != null) mMetaTileEntity.gridChanged();
     }
 
     @TileEvent(TileEventType.WORLD_NBT_READ)
-    @Optional.Method(modid = "appliedenergistics2")
     public void readFromNBT_AENetwork(final NBTTagCompound data) {
         final AENetworkProxy gp = getProxy();
         if (gp != null) getProxy().readFromNBT(data);
     }
 
     @TileEvent(TileEventType.WORLD_NBT_WRITE)
-    @Optional.Method(modid = "appliedenergistics2")
     public void writeToNBT_AENetwork(final NBTTagCompound data) {
         final AENetworkProxy gp = getProxy();
         if (gp != null) gp.writeToNBT(data);
     }
 
-    @Optional.Method(modid = "appliedenergistics2")
     void onChunkUnloadAE() {
         final AENetworkProxy gp = getProxy();
         if (gp != null) gp.onChunkUnload();
     }
 
-    @Optional.Method(modid = "appliedenergistics2")
     void invalidateAE() {
         final AENetworkProxy gp = getProxy();
         if (gp != null) gp.invalidate();
diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
index 64bc531947..26caeaa416 100644
--- a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
@@ -39,8 +39,6 @@ import appeng.me.helpers.AENetworkProxy;
 
 import com.gtnewhorizons.modularui.api.forge.ItemStackHandler;
 
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gnu.trove.list.TIntList;
@@ -151,7 +149,7 @@ public abstract class MetaTileEntity implements IMetaTileEntity, IMachineCallbac
 
     /**
      * This method will only be called on client side
-     * 
+     *
      * @return whether the secondary description should be display. default is false
      */
     @Deprecated
@@ -1164,17 +1162,14 @@ public abstract class MetaTileEntity implements IMetaTileEntity, IMachineCallbac
 
     // === AE2 compat ===
 
-    @Optional.Method(modid = "appliedenergistics2")
     public AECableType getCableConnectionType(ForgeDirection forgeDirection) {
         return AECableType.NONE;
     }
 
-    @Optional.Method(modid = "appliedenergistics2")
     public AENetworkProxy getProxy() {
         return null;
     }
 
-    @Optional.Method(modid = "appliedenergistics2")
     public void gridChanged() {}
 
     // === Waila compat ===
@@ -1187,7 +1182,7 @@ public abstract class MetaTileEntity implements IMetaTileEntity, IMachineCallbac
                         "Facing: %s",
                         ForgeDirection.getOrientation(mBaseMetaTileEntity.getFrontFacing()).name()));
 
-        if (Loader.isModLoaded("appliedenergistics2") && this instanceof IPowerChannelState) {
+        if (this instanceof IPowerChannelState) {
             // adapted from PowerStateWailaDataProvider
             final IPowerChannelState state = (IPowerChannelState) this;
             NBTTagCompound tag = accessor.getNBTData();
@@ -1210,7 +1205,7 @@ public abstract class MetaTileEntity implements IMetaTileEntity, IMachineCallbac
     @Override
     public void getWailaNBTData(EntityPlayerMP player, TileEntity tile, NBTTagCompound tag, World world, int x, int y,
             int z) {
-        if (Loader.isModLoaded("appliedenergistics2") && this instanceof IPowerChannelState) {
+        if (this instanceof IPowerChannelState) {
             // adapted from PowerStateWailaDataProvider
             final IPowerChannelState state = (IPowerChannelState) this;
             final boolean isActive = state.isActive();
@@ -1222,7 +1217,6 @@ public abstract class MetaTileEntity implements IMetaTileEntity, IMachineCallbac
         }
     }
 
-    @Optional.Method(modid = "appliedenergistics2")
     protected String getAEDiagnostics() {
         try {
             if (getProxy() == null) return "(proxy)";
diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java
index 99dd459fb8..8eddd5980b 100644
--- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java
+++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java
@@ -41,6 +41,7 @@ import net.minecraftforge.event.ForgeEventFactory;
 
 import com.cricketcraft.chisel.api.IFacade;
 
+import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -74,6 +75,7 @@ import gregtech.common.render.IRenderedBlock;
 /*
  * MultiTileEntityBlock ported from GT6
  */
+@Optional.Interface(iface = "com.cricketcraft.chisel.api.IFacade", modid = "ChiselAPI")
 public class MultiTileEntityBlock extends Block
         implements IDebugableBlock, ITileEntityProvider, IRenderedBlock, IFacade {
 
diff --git a/src/main/java/gregtech/api/objects/AE2DigitalChestHandler.java b/src/main/java/gregtech/api/objects/AE2DigitalChestHandler.java
index 3294af2fd0..06ab3788b3 100644
--- a/src/main/java/gregtech/api/objects/AE2DigitalChestHandler.java
+++ b/src/main/java/gregtech/api/objects/AE2DigitalChestHandler.java
@@ -3,18 +3,12 @@ package gregtech.api.objects;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import cpw.mods.fml.common.Optional;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gregtech.common.tileentities.storage.GT_MetaTileEntity_DigitalChestBase;
 
-@Optional.Interface(
-        iface = "appeng.api.storage.IExternalStorageHandler",
-        modid = "appliedenergistics2",
-        striprefs = true)
 public class AE2DigitalChestHandler implements appeng.api.storage.IExternalStorageHandler {
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public boolean canHandle(final TileEntity te, final ForgeDirection d, final appeng.api.storage.StorageChannel chan,
             final appeng.api.networking.security.BaseActionSource mySrc) {
         return chan == appeng.api.storage.StorageChannel.ITEMS && te instanceof BaseMetaTileEntity
@@ -22,7 +16,6 @@ public class AE2DigitalChestHandler implements appeng.api.storage.IExternalStora
     }
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public appeng.api.storage.IMEInventory getInventory(final TileEntity te, final ForgeDirection d,
             final appeng.api.storage.StorageChannel chan, final appeng.api.networking.security.BaseActionSource src) {
         if (chan == appeng.api.storage.StorageChannel.ITEMS) {
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java
index cac1ef936e..bc2ad3f94f 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java
@@ -30,7 +30,6 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 import com.gtnewhorizons.modularui.common.widget.SlotGroup;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
-import cpw.mods.fml.common.Optional;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.ItemList;
 import gregtech.api.gui.modularui.GT_UITextures;
@@ -45,7 +44,6 @@ import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.gui.modularui.widget.AESlotWidget;
 
-@Optional.Interface(iface = "appeng.api.implementations.IPowerChannelState", modid = "appliedenergistics2")
 public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch_InputBus
         implements IConfigurationCircuitSupport, IAddGregtechLogo, IAddUIWidgets, IPowerChannelState {
 
@@ -96,13 +94,11 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
     }
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public AECableType getCableConnectionType(ForgeDirection forgeDirection) {
         return isOutputFacing((byte) forgeDirection.ordinal()) ? AECableType.SMART : AECableType.NONE;
     }
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public AENetworkProxy getProxy() {
         if (gridProxy == null) {
             if (getBaseMetaTileEntity() instanceof IGridProxyable) {
@@ -121,17 +117,14 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
     }
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public void gridChanged() {}
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public boolean isPowered() {
         return getProxy() != null && getProxy().isPowered();
     }
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public boolean isActive() {
         return getProxy() != null && getProxy().isActive();
     }
@@ -256,7 +249,6 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
         return mInventory[aIndex];
     }
 
-    @Optional.Method(modid = "appliedenergistics2")
     private BaseActionSource getRequestSource() {
         if (requestSource == null) requestSource = new MachineSource((IActionHost) getBaseMetaTileEntity());
         return requestSource;
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java
index 6099473660..3e802b6304 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java
@@ -31,7 +31,6 @@ import appeng.me.helpers.IGridProxyable;
 import appeng.util.IWideReadableNumberConverter;
 import appeng.util.Platform;
 import appeng.util.ReadableNumberConverter;
-import cpw.mods.fml.common.Optional;
 import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
@@ -43,7 +42,6 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Outpu
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_Utility;
 
-@Optional.Interface(iface = "appeng.api.implementations.IPowerChannelState", modid = "appliedenergistics2")
 public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatch_OutputBus
         implements IPowerChannelState {
 
@@ -104,21 +102,18 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc
      * @param stack input stack
      * @return amount of items left over
      */
-    @Optional.Method(modid = "appliedenergistics2")
     public int store(final ItemStack stack) {
         if (!infiniteCache && lastOutputFailed) return stack.stackSize;
         itemCache.add(AEApi.instance().storage().createItemStack(stack));
         return 0;
     }
 
-    @Optional.Method(modid = "appliedenergistics2")
     private BaseActionSource getRequest() {
         if (requestSource == null) requestSource = new MachineSource((IActionHost) getBaseMetaTileEntity());
         return requestSource;
     }
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public AECableType getCableConnectionType(ForgeDirection forgeDirection) {
         return isOutputFacing((byte) forgeDirection.ordinal()) ? AECableType.SMART : AECableType.NONE;
     }
@@ -137,7 +132,6 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc
     }
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public AENetworkProxy getProxy() {
         if (gridProxy == null) {
             if (getBaseMetaTileEntity() instanceof IGridProxyable) {
@@ -156,10 +150,8 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc
     }
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public void gridChanged() {}
 
-    @Optional.Method(modid = "appliedenergistics2")
     private void flushCachedStack() {
         lastOutputFailed = false;
         AENetworkProxy proxy = getProxy();
@@ -186,13 +178,11 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc
     }
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public boolean isPowered() {
         return getProxy() != null && getProxy().isPowered();
     }
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public boolean isActive() {
         return getProxy() != null && getProxy().isActive();
     }
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java
index e60dec5c51..8ae9b395c1 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java
@@ -36,7 +36,6 @@ import appeng.me.helpers.AENetworkProxy;
 import appeng.me.helpers.IGridProxyable;
 import appeng.util.IWideReadableNumberConverter;
 import appeng.util.ReadableNumberConverter;
-import cpw.mods.fml.common.Optional;
 import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
@@ -48,7 +47,6 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Outpu
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_Utility;
 
-@Optional.Interface(iface = "appeng.api.implementations.IPowerChannelState", modid = "appliedenergistics2")
 public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_Output implements IPowerChannelState {
 
     private BaseActionSource requestSource = null;
@@ -111,21 +109,18 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O
      * @param aFluid input fluid
      * @return amount of fluid filled
      */
-    @Optional.Method(modid = "appliedenergistics2")
     public int tryFillAE(final FluidStack aFluid) {
         if ((!infiniteCache && lastOutputFailed) || aFluid == null) return 0;
         fluidCache.add(AEApi.instance().storage().createFluidStack(aFluid));
         return aFluid.amount;
     }
 
-    @Optional.Method(modid = "appliedenergistics2")
     private BaseActionSource getRequest() {
         if (requestSource == null) requestSource = new MachineSource((IActionHost) getBaseMetaTileEntity());
         return requestSource;
     }
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public AECableType getCableConnectionType(ForgeDirection forgeDirection) {
         return isOutputFacing((byte) forgeDirection.ordinal()) ? AECableType.SMART : AECableType.NONE;
     }
@@ -159,7 +154,6 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O
     }
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public AENetworkProxy getProxy() {
         if (gridProxy == null) {
             if (getBaseMetaTileEntity() instanceof IGridProxyable) {
@@ -178,10 +172,8 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O
     }
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public void gridChanged() {}
 
-    @Optional.Method(modid = "appliedenergistics2")
     private void flushCachedStack() {
         lastOutputFailed = false;
         AENetworkProxy proxy = getProxy();
@@ -208,13 +200,11 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O
     }
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public boolean isPowered() {
         return getProxy() != null && getProxy().isPowered();
     }
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public boolean isActive() {
         return getProxy() != null && getProxy().isActive();
     }
@@ -307,7 +297,6 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O
         return ss.toArray(new String[fluidCache.size() + 2]);
     }
 
-    @Optional.Method(modid = "appliedenergistics2")
     public static IAEFluidStack fluidAEInsert(final IEnergySource energy, final IMEInventory<IAEFluidStack> cell,
             final IAEFluidStack input, final BaseActionSource src) {
         final IAEFluidStack possible = cell.injectItems(input.copy(), Actionable.SIMULATE, src);
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java
index c40e05090b..ce434bc371 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java
+++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java
@@ -27,7 +27,6 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import cpw.mods.fml.common.Optional;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.gui.modularui.GT_UIInfos;
@@ -40,7 +39,6 @@ import gregtech.api.objects.AE2DigitalChestHandler;
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_Utility;
 
-@Optional.Interface(iface = "appeng.api.storage.IMEMonitor", modid = "appliedenergistics2", striprefs = true)
 public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEntity_TieredMachineBlock
         implements appeng.api.storage.IMEMonitor<appeng.api.storage.data.IAEItemStack>, IAddUIWidgets {
 
@@ -96,13 +94,11 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
-    @Optional.Method(modid = "appliedenergistics2")
     public static void registerAEIntegration() {
         appeng.api.AEApi.instance().registries().externalStorage()
                 .addExternalStorageInterface(new AE2DigitalChestHandler());
     }
 
-    @Optional.Method(modid = "appliedenergistics2")
     @Override
     public void addListener(
             appeng.api.storage.IMEMonitorHandlerReceiver<appeng.api.storage.data.IAEItemStack> imeMonitorHandlerReceiver,
@@ -111,7 +107,6 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
         listeners.put(imeMonitorHandlerReceiver, o);
     }
 
-    @Optional.Method(modid = "appliedenergistics2")
     @Override
     public void removeListener(
             appeng.api.storage.IMEMonitorHandlerReceiver<appeng.api.storage.data.IAEItemStack> imeMonitorHandlerReceiver) {
@@ -119,13 +114,11 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
         listeners.remove(imeMonitorHandlerReceiver);
     }
 
-    @Optional.Method(modid = "appliedenergistics2")
     @Override
     public appeng.api.config.AccessRestriction getAccess() {
         return appeng.api.config.AccessRestriction.READ_WRITE;
     }
 
-    @Optional.Method(modid = "appliedenergistics2")
     @Override
     public boolean isPrioritized(appeng.api.storage.data.IAEItemStack iaeItemStack) {
         ItemStack s = getItemStack();
@@ -133,7 +126,6 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
         return iaeItemStack.isSameType(s);
     }
 
-    @Optional.Method(modid = "appliedenergistics2")
     @Override
     public boolean canAccept(appeng.api.storage.data.IAEItemStack iaeItemStack) {
         ItemStack s = getItemStack();
@@ -141,19 +133,16 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
         return iaeItemStack.isSameType(s);
     }
 
-    @Optional.Method(modid = "appliedenergistics2")
     @Override
     public int getPriority() {
         return 0;
     }
 
-    @Optional.Method(modid = "appliedenergistics2")
     @Override
     public int getSlot() {
         return 0;
     }
 
-    @Optional.Method(modid = "appliedenergistics2")
     @Override
     public boolean validForPass(int i) {
         return true;
@@ -164,7 +153,6 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
     protected abstract void setItemStack(ItemStack s);
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public appeng.api.storage.data.IItemList<appeng.api.storage.data.IAEItemStack> getAvailableItems(
             final appeng.api.storage.data.IItemList out) {
         ItemStack storedStack = getItemStack();
@@ -176,7 +164,6 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
         return out;
     }
 
-    @Optional.Method(modid = "appliedenergistics2")
     @Override
     public appeng.api.storage.data.IItemList<appeng.api.storage.data.IAEItemStack> getStorageList() {
         appeng.api.storage.data.IItemList<appeng.api.storage.data.IAEItemStack> res = new appeng.util.item.ItemList();
@@ -205,7 +192,6 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
     }
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public appeng.api.storage.data.IAEItemStack injectItems(final appeng.api.storage.data.IAEItemStack input,
             final appeng.api.config.Actionable mode, final appeng.api.networking.security.BaseActionSource src) {
         final ItemStack inputStack = input.getItemStack();
@@ -234,7 +220,6 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
         return null;
     }
 
-    @Optional.Method(modid = "appliedenergistics2")
     private appeng.api.storage.data.IAEItemStack createOverflowStack(long size, appeng.api.config.Actionable mode) {
         final appeng.api.storage.data.IAEItemStack overflow = appeng.util.item.AEItemStack.create(getItemStack());
         overflow.setStackSize(size - getMaxItemCount());
@@ -243,7 +228,6 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
     }
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public appeng.api.storage.data.IAEItemStack extractItems(final appeng.api.storage.data.IAEItemStack request,
             final appeng.api.config.Actionable mode, final appeng.api.networking.security.BaseActionSource src) {
         if (request.isSameType(getItemStack())) {
@@ -264,7 +248,6 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
     }
 
     @Override
-    @Optional.Method(modid = "appliedenergistics2")
     public appeng.api.storage.StorageChannel getChannel() {
         return appeng.api.storage.StorageChannel.ITEMS;
     }
@@ -416,7 +399,6 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
 
     protected abstract String chestName();
 
-    @Optional.Method(modid = "appliedenergistics2")
     private void notifyListeners(int count, ItemStack stack) {
         if (listeners == null) {
             listeners = new HashMap<>();
@@ -433,7 +415,6 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
         });
     }
 
-    @Optional.Method(modid = "appliedenergistics2")
     private boolean hasActiveMEConnection() {
         if (listeners == null || listeners.isEmpty()) return false;
         for (Map.Entry<appeng.api.storage.IMEMonitorHandlerReceiver<appeng.api.storage.data.IAEItemStack>, Object> e : listeners
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(