Removed AEApi

Moved all internal access to the internal `Api` class using a new static
getter.

src/main/java/appeng/util/Platform.java

@@ -34,7 +34,6 @@ import com.google.common.collect.Iterables;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.Entity;
@@ -70,7 +69,6 @@ import net.minecraftforge.fml.common.thread.SidedThreadGroups;
 import net.minecraftforge.fml.loading.FMLEnvironment;
 import net.minecraftforge.registries.ForgeRegistries;
 
-import appeng.api.AEApi;
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
 import appeng.api.config.PowerMultiplier;
@@ -103,6 +101,7 @@ import appeng.api.util.AEPartLocation;
 import appeng.api.util.DimensionalCoord;
 import appeng.core.AEConfig;
 import appeng.core.AELog;
+import appeng.core.Api;
 import appeng.core.stats.AeStats;
 import appeng.fluids.util.AEFluidStack;
 import appeng.hooks.TickHandler;
@@ -873,11 +872,11 @@ public class Platform {
     @SuppressWarnings({ "rawtypes", "unchecked" })
     public static void postChanges(final IStorageGrid gs, final ItemStack removed, final ItemStack added,
             final IActionSource src) {
-        for (final IStorageChannel<?> chan : AEApi.instance().storage().storageChannels()) {
+        for (final IStorageChannel<?> chan : Api.instance().storage().storageChannels()) {
             final IItemList<?> myChanges = chan.createList();
 
             if (!removed.isEmpty()) {
-                final IMEInventory myInv = AEApi.instance().registries().cell().getCellInventory(removed, null, chan);
+                final IMEInventory myInv = Api.instance().registries().cell().getCellInventory(removed, null, chan);
                 if (myInv != null) {
                     myInv.getAvailableItems(myChanges);
                     for (final IAEStack is : myChanges) {
@@ -886,7 +885,7 @@ public class Platform {
                 }
             }
             if (!added.isEmpty()) {
-                final IMEInventory myInv = AEApi.instance().registries().cell().getCellInventory(added, null, chan);
+                final IMEInventory myInv = Api.instance().registries().cell().getCellInventory(added, null, chan);
                 if (myInv != null) {
                     myInv.getAvailableItems(myChanges);
                 }
@@ -1136,8 +1135,7 @@ public class Platform {
         }
 
         if (type == AEFeature.CERTUS_QUARTZ_TOOLS) {
-            final IItemDefinition certusQuartzCrystal = AEApi.instance().definitions().materials()
-                    .certusQuartzCrystal();
+            final IItemDefinition certusQuartzCrystal = Api.instance().definitions().materials().certusQuartzCrystal();
 
             return certusQuartzCrystal.isSameAs(b);
         }
@@ -1156,7 +1154,7 @@ public class Platform {
     }
 
     public static boolean isRecipePrioritized(final ItemStack what) {
-        final IMaterials materials = AEApi.instance().definitions().materials();
+        final IMaterials materials = Api.instance().definitions().materials();
 
         boolean isPurified = materials.purifiedCertusQuartzCrystal().isSameAs(what);
         isPurified |= materials.purifiedFluixCrystal().isSameAs(what);

src/main/java/appeng/util/inv/IMEAdaptor.java

@@ -24,7 +24,6 @@ import com.google.common.collect.ImmutableList;
 
 import net.minecraft.item.ItemStack;
 
-import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.config.FuzzyMode;
 import appeng.api.networking.security.IActionSource;
@@ -32,6 +31,7 @@ import appeng.api.storage.IMEInventory;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
+import appeng.core.Api;
 import appeng.util.InventoryAdaptor;
 import appeng.util.item.AEItemStack;
 
@@ -57,8 +57,8 @@ public class IMEAdaptor extends InventoryAdaptor {
     }
 
     private IItemList<IAEItemStack> getList() {
-        return this.target.getAvailableItems(
-                AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList());
+        return this.target
+                .getAvailableItems(Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList());
     }
 
     @Override

src/main/java/appeng/util/item/AEItemStack.java

@@ -33,11 +33,11 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.items.ItemHandlerHelper;
 
-import appeng.api.AEApi;
 import appeng.api.config.FuzzyMode;
 import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
+import appeng.core.Api;
 import appeng.util.Platform;
 
 public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemStack {
@@ -154,7 +154,7 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
 
     @Override
     public IStorageChannel<IAEItemStack> getChannel() {
-        return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class);
+        return Api.instance().storage().getStorageChannel(IItemStorageChannel.class);
     }
 
     @Override

src/main/java/appeng/util/item/AEItemStackRegistry.java

@@ -30,8 +30,6 @@ import javax.annotation.Nonnull;
 
 import net.minecraft.item.ItemStack;
 
-import appeng.util.Platform;
-
 public final class AEItemStackRegistry {
     private static final WeakHashMap<AESharedItemStack, WeakReference<AESharedItemStack>> REGISTRY = new WeakHashMap<>();
 

src/main/java/appeng/util/item/ItemModList.java

@@ -20,16 +20,16 @@ package appeng.util.item;
 
 import java.util.Collection;
 
-import appeng.api.AEApi;
 import appeng.api.config.FuzzyMode;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemContainer;
+import appeng.core.Api;
 
 public class ItemModList implements IItemContainer<IAEItemStack> {
 
     private final IItemContainer<IAEItemStack> backingStore;
-    private final IItemContainer<IAEItemStack> overrides = AEApi.instance().storage()
+    private final IItemContainer<IAEItemStack> overrides = Api.instance().storage()
             .getStorageChannel(IItemStorageChannel.class).createList();
 
     public ItemModList(final IItemContainer<IAEItemStack> backend) {