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, 0 insertions, 48 deletions

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