fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed AEApi

Browse Source 
Moved all internal access to the internal `Api` class using a new static
getter.
This commit is contained in:
yueh
2020-07-11 19:40:34 +02:00
parent d18eabe1fc
commit 0d43ca15be
168 changed files with 757 additions and 677 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/me/Grid.java
+2 -2
View File
@@ -25,7 +25,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import appeng.api.AEApi;
import appeng.api.networking.IGrid;
import appeng.api.networking.IGridCache;
import appeng.api.networking.IGridHost;
@@ -35,6 +34,7 @@ import appeng.api.networking.IMachineSet;
import appeng.api.networking.events.MENetworkEvent;
import appeng.api.networking.events.MENetworkPostCacheConstruction;
import appeng.api.util.IReadOnlyCollection;
import appeng.core.Api;
import appeng.core.worlddata.WorldData;
import appeng.hooks.TickHandler;
import appeng.util.ReadOnlyCollection;
@@ -50,7 +50,7 @@ public class Grid implements IGrid {
public Grid(final GridNode center) {
this.pivot = center;
final Map<Class<? extends IGridCache>, IGridCache> myCaches = AEApi.instance().registries().gridCache()
final Map<Class<? extends IGridCache>, IGridCache> myCaches = Api.instance().registries().gridCache()
.createCacheInstance(this);
this.caches = new HashMap<>(myCaches.size());
for (final Entry<Class<? extends IGridCache>, IGridCache> c : myCaches.entrySet()) {
src/main/java/appeng/me/cache/CraftingGridCache.java
Vendored
+5 -5
View File
@@ -43,7 +43,6 @@ import com.google.common.collect.Multimap;
import net.minecraft.world.World;
import appeng.api.AEApi;
import appeng.api.config.AccessRestriction;
import appeng.api.config.Actionable;
import appeng.api.networking.IGrid;
@@ -76,6 +75,7 @@ import appeng.api.storage.channels.IItemStorageChannel;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IAEStack;
import appeng.api.storage.data.IItemList;
import appeng.core.Api;
import appeng.crafting.CraftingJob;
import appeng.crafting.CraftingLink;
import appeng.crafting.CraftingLinkNexus;
@@ -224,7 +224,7 @@ public class CraftingGridCache
// update the stuff that was in the list...
this.storageGrid.postAlterationOfStoredItems(
AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class), oldItems.keySet(),
Api.instance().storage().getStorageChannel(IItemStorageChannel.class), oldItems.keySet(),
new BaseActionSource());
// re-create list..
@@ -257,7 +257,7 @@ public class CraftingGridCache
}
this.storageGrid.postAlterationOfStoredItems(
AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class), this.craftableItems.keySet(),
Api.instance().storage().getStorageChannel(IItemStorageChannel.class), this.craftableItems.keySet(),
new BaseActionSource());
}
@@ -322,7 +322,7 @@ public class CraftingGridCache
public List<IMEInventoryHandler> getCellArray(final IStorageChannel<?> channel) {
final List<IMEInventoryHandler> list = new ArrayList<>(1);
if (channel == AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)) {
if (channel == Api.instance().storage().getStorageChannel(IItemStorageChannel.class)) {
list.add(this);
}
@@ -395,7 +395,7 @@ public class CraftingGridCache
@Override
public IStorageChannel<IAEItemStack> getChannel() {
return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class);
return Api.instance().storage().getStorageChannel(IItemStorageChannel.class);
}
@Override
src/main/java/appeng/me/cache/GridStorageCache.java
Vendored
+2 -2
View File
@@ -28,7 +28,6 @@ import java.util.Map;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.SetMultimap;
import appeng.api.AEApi;
import appeng.api.networking.IGrid;
import appeng.api.networking.IGridHost;
import appeng.api.networking.IGridNode;
@@ -49,6 +48,7 @@ import appeng.api.storage.cells.ICellProvider;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IAEStack;
import appeng.api.storage.data.IItemList;
import appeng.core.Api;
import appeng.me.helpers.BaseActionSource;
import appeng.me.helpers.GenericInterestManager;
import appeng.me.helpers.MachineSource;
@@ -71,7 +71,7 @@ public class GridStorageCache implements IStorageGrid {
this.storageNetworks = new IdentityHashMap<>();
this.storageMonitors = new IdentityHashMap<>();
AEApi.instance().storage().storageChannels()
Api.instance().storage().storageChannels()
.forEach(channel -> this.storageMonitors.put(channel, new NetworkMonitor<>(this, channel)));
}
src/main/java/appeng/me/cache/PathGridCache.java
Vendored
+2 -2
View File
@@ -28,7 +28,6 @@ import java.util.Set;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.ServerPlayerEntity;
import appeng.api.AEApi;
import appeng.api.features.AEFeature;
import appeng.api.networking.GridFlags;
import appeng.api.networking.IGrid;
@@ -47,6 +46,7 @@ import appeng.api.networking.pathing.IPathingGrid;
import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.core.AEConfig;
import appeng.core.Api;
import appeng.core.AppEng;
import appeng.core.stats.IAdvancementTrigger;
import appeng.me.GridConnection;
@@ -287,7 +287,7 @@ public class PathGridCache implements IPathingGrid {
final IAdvancementTrigger lastBracket = this.getAchievementBracket(this.lastChannels);
if (currentBracket != lastBracket && currentBracket != null) {
for (final IGridNode n : this.requireChannels) {
PlayerEntity player = AEApi.instance().registries().players().findPlayer(n.getPlayerID());
PlayerEntity player = Api.instance().registries().players().findPlayer(n.getPlayerID());
if (player instanceof ServerPlayerEntity) {
currentBracket.trigger((ServerPlayerEntity) player);
}
src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
+8 -8
View File
@@ -37,7 +37,6 @@ import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.fml.hooks.BasicEventHooks;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.config.FuzzyMode;
import appeng.api.config.PowerMultiplier;
@@ -65,6 +64,7 @@ import appeng.api.storage.data.IItemList;
import appeng.api.util.WorldCoord;
import appeng.container.ContainerNull;
import appeng.core.AELog;
import appeng.core.Api;
import appeng.crafting.CraftBranchFailure;
import appeng.crafting.CraftingJob;
import appeng.crafting.CraftingLink;
@@ -100,7 +100,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
private MECraftingInventory inventory = new MECraftingInventory();
private IAEItemStack finalOutput;
private boolean waiting = false;
private IItemList<IAEItemStack> waitingFor = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)
private IItemList<IAEItemStack> waitingFor = Api.instance().storage().getStorageChannel(IItemStorageChannel.class)
.createList();
private long availableStorage = 0;
private MachineSource machineSrc = null;
@@ -466,7 +466,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
}
final IItemList<IAEItemStack> list;
this.getListOfItem(list = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList(),
this.getListOfItem(list = Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList(),
CraftingItemList.ALL);
for (final IAEItemStack is : list) {
this.postChange(is, this.machineSrc);
@@ -716,7 +716,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
final IStorageGrid sg = g.getCache(IStorageGrid.class);
final IMEInventory<IAEItemStack> ii = sg
.getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class));
.getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class));
for (IAEItemStack is : this.inventory.getItemList()) {
is = this.inventory.extractItems(is.copy(), Actionable.MODULATE, this.machineSrc);
@@ -754,7 +754,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
final IStorageGrid sg = g.getCache(IStorageGrid.class);
final IMEInventory<IAEItemStack> storage = sg
.getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class));
.getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class));
final MECraftingInventory ci = new MECraftingInventory(storage, true, false, false);
try {
@@ -784,7 +784,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
this.submitLink(this.myLastLink);
this.submitLink(whatLink);
final IItemList<IAEItemStack> list = AEApi.instance().storage()
final IItemList<IAEItemStack> list = Api.instance().storage()
.getStorageChannel(IItemStorageChannel.class).createList();
this.getListOfItem(list, CraftingItemList.ALL);
for (final IAEItemStack ge : list) {
@@ -1094,7 +1094,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
}
private IItemList<IAEItemStack> readList(final ListNBT tag) {
final IItemList<IAEItemStack> out = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)
final IItemList<IAEItemStack> out = Api.instance().storage().getStorageChannel(IItemStorageChannel.class)
.createList();
if (tag == null) {
@@ -1131,7 +1131,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
this.lastTime = System.nanoTime();
this.elapsedTime = 0;
final IItemList<IAEItemStack> list = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)
final IItemList<IAEItemStack> list = Api.instance().storage().getStorageChannel(IItemStorageChannel.class)
.createList();
this.getListOfItem(list, CraftingItemList.ACTIVE);
src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java
+2 -2
View File
@@ -23,10 +23,10 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import appeng.api.AEApi;
import appeng.api.definitions.IBlockDefinition;
import appeng.api.definitions.IBlocks;
import appeng.api.util.WorldCoord;
import appeng.core.Api;
import appeng.me.cluster.IAECluster;
import appeng.me.cluster.IAEMultiBlock;
import appeng.me.cluster.MBCalculator;
@@ -77,7 +77,7 @@ public class QuantumCalculator extends MBCalculator {
}
num++;
final IBlocks blocks = AEApi.instance().definitions().blocks();
final IBlocks blocks = Api.instance().definitions().blocks();
if (num == 5) {
if (!this.isBlockAtLocation(w, p, blocks.quantumLink())) {
return false;
src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
+4 -4
View File
@@ -28,7 +28,6 @@ import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.world.WorldEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import appeng.api.AEApi;
import appeng.api.events.LocatableEventAnnounce;
import appeng.api.events.LocatableEventAnnounce.LocatableEvent;
import appeng.api.exceptions.FailedConnectionException;
@@ -38,6 +37,7 @@ import appeng.api.networking.IGridNode;
import appeng.api.util.AEPartLocation;
import appeng.api.util.WorldCoord;
import appeng.core.AELog;
import appeng.core.Api;
import appeng.me.cache.helpers.ConnectionWrapper;
import appeng.me.cluster.IAECluster;
import appeng.tile.qnb.QuantumBridgeTileEntity;
@@ -99,7 +99,7 @@ public class QuantumCluster implements ILocatable, IAECluster {
}
final ILocatable myOtherSide = this.otherSide == 0 ? null
: AEApi.instance().registries().locatable().getLocatableBy(this.otherSide);
: Api.instance().registries().locatable().getLocatableBy(this.otherSide);
boolean shutdown = false;
@@ -134,7 +134,7 @@ public class QuantumCluster implements ILocatable, IAECluster {
}
sideA.connection = sideB.connection = new ConnectionWrapper(
AEApi.instance().grid().createGridConnection(sideA.getNode(), sideB.getNode()));
Api.instance().grid().createGridConnection(sideA.getNode(), sideB.getNode()));
} catch (final FailedConnectionException e) {
// :(
AELog.debug(e);
@@ -156,7 +156,7 @@ public class QuantumCluster implements ILocatable, IAECluster {
}
private boolean canUseNode(final long qe) {
final QuantumCluster qc = (QuantumCluster) AEApi.instance().registries().locatable().getLocatableBy(qe);
final QuantumCluster qc = (QuantumCluster) Api.instance().registries().locatable().getLocatableBy(qe);
if (qc != null) {
final World theWorld = qc.center.getWorld();
if (!qc.isDestroyed) {
src/main/java/appeng/me/helpers/AENetworkProxy.java
+2 -2
View File
@@ -28,7 +28,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.Direction;
import appeng.api.AEApi;
import appeng.api.networking.GridFlags;
import appeng.api.networking.GridNotification;
import appeng.api.networking.IGrid;
@@ -45,6 +44,7 @@ import appeng.api.networking.ticking.ITickManager;
import appeng.api.util.AEColor;
import appeng.api.util.DimensionalCoord;
import appeng.api.util.IOrientable;
import appeng.core.Api;
import appeng.core.worlddata.WorldData;
import appeng.hooks.TickHandler;
import appeng.me.GridAccessException;
@@ -129,7 +129,7 @@ public class AENetworkProxy implements IGridBlock {
public IGridNode getNode() {
if (this.node == null && Platform.isServer() && this.isReady) {
this.node = AEApi.instance().grid().createGridNode(this);
this.node = Api.instance().grid().createGridNode(this);
this.readFromNBT(this.data);
this.node.updateState();
}
src/main/java/appeng/me/storage/CreativeCellInventory.java
+4 -4
View File
@@ -20,7 +20,6 @@ package appeng.me.storage;
import net.minecraft.item.ItemStack;
import appeng.api.AEApi;
import appeng.api.config.AccessRestriction;
import appeng.api.config.Actionable;
import appeng.api.networking.security.IActionSource;
@@ -30,12 +29,13 @@ import appeng.api.storage.cells.ICellInventoryHandler;
import appeng.api.storage.channels.IItemStorageChannel;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList;
import appeng.core.Api;
import appeng.items.contents.CellConfig;
import appeng.util.item.AEItemStack;
public class CreativeCellInventory implements IMEInventoryHandler<IAEItemStack> {
private final IItemList<IAEItemStack> itemListCache = AEApi.instance().storage()
private final IItemList<IAEItemStack> itemListCache = Api.instance().storage()
.getStorageChannel(IItemStorageChannel.class).createList();
protected CreativeCellInventory(final ItemStack o) {
@@ -51,7 +51,7 @@ public class CreativeCellInventory implements IMEInventoryHandler<IAEItemStack>
public static ICellInventoryHandler getCell(final ItemStack o) {
return new BasicCellInventoryHandler(new CreativeCellInventory(o),
AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class));
Api.instance().storage().getStorageChannel(IItemStorageChannel.class));
}
@Override
@@ -84,7 +84,7 @@ public class CreativeCellInventory implements IMEInventoryHandler<IAEItemStack>
@Override
public IStorageChannel getChannel() {
return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class);
return Api.instance().storage().getStorageChannel(IItemStorageChannel.class);
}
@Override
src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java
+8 -7
View File
@@ -30,7 +30,6 @@ import net.minecraftforge.fluids.FluidAttributes;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.capability.IFluidHandler;
import appeng.api.AEApi;
import appeng.api.config.AccessRestriction;
import appeng.api.config.Actionable;
import appeng.api.config.StorageFilter;
@@ -42,11 +41,12 @@ import appeng.api.storage.IStorageChannel;
import appeng.api.storage.channels.IFluidStorageChannel;
import appeng.api.storage.data.IAEFluidStack;
import appeng.api.storage.data.IItemList;
import appeng.core.Api;
public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITickingMonitor {
private final IFluidHandler handler;
private final IItemList<IAEFluidStack> list = AEApi.instance().storage()
.getStorageChannel(IFluidStorageChannel.class).createList();
private final IItemList<IAEFluidStack> list = Api.instance().storage().getStorageChannel(IFluidStorageChannel.class)
.createList();
private final HashMap<IMEMonitorHandlerReceiver<IAEFluidStack>, Object> listeners = new HashMap<>();
private final NavigableMap<Integer, CachedFluidStack> memory;
private IActionSource mySource;
@@ -107,7 +107,7 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
@Override
public IStorageChannel getChannel() {
return AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class);
return Api.instance().storage().getStorageChannel(IFluidStorageChannel.class);
}
@Override
@@ -158,8 +158,9 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
IAEFluidStack stack = null;
if (!newIS.isEmpty()) {
stack = (old == null || old.aeStack == null ? AEApi.instance().storage()
.getStorageChannel(IFluidStorageChannel.class).createStack(newIS) : old.aeStack.copy());
stack = (old == null || old.aeStack == null
? Api.instance().storage().getStorageChannel(IFluidStorageChannel.class).createStack(newIS)
: old.aeStack.copy());
}
if (stack != null) {
stack.setStackSize(newSize);
@@ -297,7 +298,7 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
this.aeStack = null;
} else {
this.fluidStack = is.copy();
this.aeStack = AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class).createStack(is);
this.aeStack = Api.instance().storage().getStorageChannel(IFluidStorageChannel.class).createStack(is);
}
}
}
src/main/java/appeng/me/storage/MEMonitorIInventory.java
+5 -5
View File
@@ -28,7 +28,6 @@ import java.util.concurrent.ConcurrentSkipListMap;
import net.minecraft.item.ItemStack;
import appeng.api.AEApi;
import appeng.api.config.AccessRestriction;
import appeng.api.config.Actionable;
import appeng.api.config.StorageFilter;
@@ -40,6 +39,7 @@ import appeng.api.storage.IStorageChannel;
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.Platform;
import appeng.util.inv.ItemSlot;
@@ -47,7 +47,7 @@ import appeng.util.inv.ItemSlot;
public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMonitor {
private final InventoryAdaptor adaptor;
private final IItemList<IAEItemStack> list = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)
private final IItemList<IAEItemStack> list = Api.instance().storage().getStorageChannel(IItemStorageChannel.class)
.createList();
private final HashMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new HashMap<>();
private final NavigableMap<Integer, CachedItemStack> memory;
@@ -120,7 +120,7 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
@Override
public IStorageChannel getChannel() {
return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class);
return Api.instance().storage().getStorageChannel(IItemStorageChannel.class);
}
@Override
@@ -160,7 +160,7 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
final int diff = newSize - (oldIS.isEmpty() ? 0 : oldIS.getCount());
final IAEItemStack stack = (old == null || old.aeStack == null
? AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(newIS)
? Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(newIS)
: old.aeStack.copy());
if (stack != null) {
stack.setStackSize(newSize);
@@ -302,7 +302,7 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
this.aeStack = null;
} else {
this.itemStack = is.copy();
this.aeStack = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(is);
this.aeStack = Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(is);
}
}
}
src/main/java/appeng/me/storage/NullInventory.java
+2 -2
View File
@@ -18,7 +18,6 @@
package appeng.me.storage;
import appeng.api.AEApi;
import appeng.api.config.AccessRestriction;
import appeng.api.config.Actionable;
import appeng.api.networking.security.IActionSource;
@@ -27,6 +26,7 @@ import appeng.api.storage.IStorageChannel;
import appeng.api.storage.channels.IItemStorageChannel;
import appeng.api.storage.data.IAEStack;
import appeng.api.storage.data.IItemList;
import appeng.core.Api;
public class NullInventory<T extends IAEStack<T>> implements IMEInventoryHandler<T> {
@@ -47,7 +47,7 @@ public class NullInventory<T extends IAEStack<T>> implements IMEInventoryHandler
@Override
public IStorageChannel getChannel() {
return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class);
return Api.instance().storage().getStorageChannel(IItemStorageChannel.class);
}
@Override
src/main/java/appeng/me/storage/SecurityStationInventory.java
+5 -5
View File
@@ -20,7 +20,6 @@ package appeng.me.storage;
import com.mojang.authlib.GameProfile;
import appeng.api.AEApi;
import appeng.api.config.AccessRestriction;
import appeng.api.config.Actionable;
import appeng.api.config.SecurityPermissions;
@@ -31,12 +30,13 @@ import appeng.api.storage.IStorageChannel;
import appeng.api.storage.channels.IItemStorageChannel;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList;
import appeng.core.Api;
import appeng.me.GridAccessException;
import appeng.tile.misc.SecurityStationTileEntity;
public class SecurityStationInventory implements IMEInventoryHandler<IAEItemStack> {
private final IItemList<IAEItemStack> storedItems = AEApi.instance().storage()
private final IItemList<IAEItemStack> storedItems = Api.instance().storage()
.getStorageChannel(IItemStorageChannel.class).createList();
private final SecurityStationTileEntity securityTile;
@@ -47,7 +47,7 @@ public class SecurityStationInventory implements IMEInventoryHandler<IAEItemStac
@Override
public IAEItemStack injectItems(final IAEItemStack input, final Actionable type, final IActionSource src) {
if (this.hasPermission(src)) {
if (AEApi.instance().definitions().items().biometricCard().isSameAs(input.createItemStack())) {
if (Api.instance().definitions().items().biometricCard().isSameAs(input.createItemStack())) {
if (this.canAccept(input)) {
if (type == Actionable.SIMULATE) {
return null;
@@ -104,7 +104,7 @@ public class SecurityStationInventory implements IMEInventoryHandler<IAEItemStac
@Override
public IStorageChannel getChannel() {
return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class);
return Api.instance().storage().getStorageChannel(IItemStorageChannel.class);
}
@Override
@@ -123,7 +123,7 @@ public class SecurityStationInventory implements IMEInventoryHandler<IAEItemStac
final IBiometricCard tbc = (IBiometricCard) input.getItem();
final GameProfile newUser = tbc.getProfile(input.createItemStack());
final int PlayerID = AEApi.instance().registries().players().getID(newUser);
final int PlayerID = Api.instance().registries().players().getID(newUser);
if (this.securityTile.getOwner() == PlayerID) {
return false;
}