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/tile/storage/ChestTileEntity.java
+15 -15
View File
@@ -43,7 +43,6 @@ import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi;
import appeng.api.config.AccessRestriction;
import appeng.api.config.Actionable;
import appeng.api.config.PowerMultiplier;
@@ -90,6 +89,7 @@ import appeng.api.util.AEColor;
import appeng.api.util.IConfigManager;
import appeng.capabilities.Capabilities;
import appeng.container.implementations.MEMonitorableContainer;
import appeng.core.Api;
import appeng.fluids.container.FluidTerminalContainer;
import appeng.fluids.util.AEFluidStack;
import appeng.helpers.IPriorityHost;
@@ -209,11 +209,11 @@ public class ChestTileEntity extends AENetworkPowerTileEntity
final ItemStack is = this.getCell();
if (!is.isEmpty()) {
this.isCached = true;
ICellHandler cellHandler = AEApi.instance().registries().cell().getHandler(is);
ICellHandler cellHandler = Api.instance().registries().cell().getHandler(is);
if (cellHandler != null) {
double power = 1.0;
for (IStorageChannel channel : AEApi.instance().storage().storageChannels()) {
for (IStorageChannel channel : Api.instance().storage().storageChannels()) {
final ICellInventoryHandler<IAEItemStack> newCell = cellHandler.getCellInventory(is, this,
channel);
if (newCell != null) {
@@ -226,7 +226,7 @@ public class ChestTileEntity extends AENetworkPowerTileEntity
this.getProxy().setIdlePowerUsage(power);
this.accessor = new Accessor();
if (this.cellHandler != null && this.cellHandler.getChannel() == AEApi.instance().storage()
if (this.cellHandler != null && this.cellHandler.getChannel() == Api.instance().storage()
.getStorageChannel(IFluidStorageChannel.class)) {
this.fluidHandler = new FluidHandler();
}
@@ -258,7 +258,7 @@ public class ChestTileEntity extends AENetworkPowerTileEntity
this.updateHandler();
final ItemStack cell = this.getCell();
final ICellHandler ch = AEApi.instance().registries().cell().getHandler(cell);
final ICellHandler ch = Api.instance().registries().cell().getHandler(cell);
if (this.cellHandler != null && ch != null) {
return ch.getStatusForCell(cell, this.cellHandler.getInternalHandler());
@@ -465,7 +465,7 @@ public class ChestTileEntity extends AENetworkPowerTileEntity
if (!ItemHandlerUtil.isEmpty(this.inputInventory)) {
this.updateHandler();
if (this.cellHandler != null && this.cellHandler.getChannel() == AEApi.instance().storage()
if (this.cellHandler != null && this.cellHandler.getChannel() == Api.instance().storage()
.getStorageChannel(IItemStorageChannel.class)) {
final IAEItemStack returns = Platform.poweredInsert(this, this.cellHandler,
AEItemStack.fromItemStack(this.inputInventory.getStackInSlot(0)), this.mySrc);
@@ -535,10 +535,10 @@ public class ChestTileEntity extends AENetworkPowerTileEntity
public boolean openGui(final PlayerEntity p) {
this.updateHandler();
if (this.cellHandler != null) {
final ICellHandler ch = AEApi.instance().registries().cell().getHandler(this.getCell());
final ICellHandler ch = Api.instance().registries().cell().getHandler(this.getCell());
if (ch != null) {
final ICellGuiHandler chg = AEApi.instance().registries().cell()
final ICellGuiHandler chg = Api.instance().registries().cell()
.getGuiHandler(this.cellHandler.getChannel(), this.getCell());
if (chg != null) {
chg.openChestGui(p, this, ch, this.cellHandler, this.getCell(), this.cellHandler.getChannel());
@@ -704,7 +704,7 @@ public class ChestTileEntity extends AENetworkPowerTileEntity
private class FluidHandler implements IFluidHandler, IFluidTank {
private boolean canAcceptLiquids() {
return ChestTileEntity.this.cellHandler != null && ChestTileEntity.this.cellHandler.getChannel() == AEApi
return ChestTileEntity.this.cellHandler != null && ChestTileEntity.this.cellHandler.getChannel() == Api
.instance().storage().getStorageChannel(IFluidStorageChannel.class);
}
@@ -790,8 +790,8 @@ public class ChestTileEntity extends AENetworkPowerTileEntity
public boolean allowInsert(IItemHandler inv, int slot, ItemStack stack) {
if (ChestTileEntity.this.isPowered()) {
ChestTileEntity.this.updateHandler();
return ChestTileEntity.this.cellHandler != null && ChestTileEntity.this.cellHandler
.getChannel() == AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class);
return ChestTileEntity.this.cellHandler != null && ChestTileEntity.this.cellHandler.getChannel() == Api
.instance().storage().getStorageChannel(IItemStorageChannel.class);
}
return false;
}
@@ -806,25 +806,25 @@ public class ChestTileEntity extends AENetworkPowerTileEntity
@Override
public boolean allowInsert(IItemHandler inv, int slot, ItemStack stack) {
return AEApi.instance().registries().cell().getHandler(stack) != null;
return Api.instance().registries().cell().getHandler(stack) != null;
}
}
@Override
public ItemStack getItemStackRepresentation() {
return AEApi.instance().definitions().blocks().chest().maybeStack(1).orElse(ItemStack.EMPTY);
return Api.instance().definitions().blocks().chest().maybeStack(1).orElse(ItemStack.EMPTY);
}
@Override
public ContainerType<?> getContainerType() {
this.updateHandler();
if (this.cellHandler != null) {
if (this.cellHandler.getChannel() == AEApi.instance().storage()
if (this.cellHandler.getChannel() == Api.instance().storage()
.getStorageChannel(IItemStorageChannel.class)) {
return MEMonitorableContainer.TYPE;
}
if (this.cellHandler.getChannel() == AEApi.instance().storage()
if (this.cellHandler.getChannel() == Api.instance().storage()
.getStorageChannel(IFluidStorageChannel.class)) {
return FluidTerminalContainer.TYPE;
}
src/main/java/appeng/tile/storage/DriveTileEntity.java
+5 -5
View File
@@ -42,7 +42,6 @@ import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.registries.ForgeRegistries;
import appeng.api.AEApi;
import appeng.api.implementations.tiles.IChestOrDrive;
import appeng.api.networking.GridFlags;
import appeng.api.networking.events.MENetworkCellArrayUpdate;
@@ -65,6 +64,7 @@ import appeng.api.util.DimensionalCoord;
import appeng.block.storage.DriveSlotsState;
import appeng.client.render.model.DriveModelData;
import appeng.container.implementations.DriveContainer;
import appeng.core.Api;
import appeng.helpers.IPriorityHost;
import appeng.me.GridAccessException;
import appeng.me.helpers.MachineSource;
@@ -347,7 +347,7 @@ public class DriveTileEntity extends AENetworkInvTileEntity implements IChestOrD
private void updateState() {
if (!this.isCached) {
final Collection<IStorageChannel<? extends IAEStack<?>>> storageChannels = AEApi.instance().storage()
final Collection<IStorageChannel<? extends IAEStack<?>>> storageChannels = Api.instance().storage()
.storageChannels();
storageChannels.forEach(channel -> this.inventoryHandlers.put(channel, new ArrayList<>(10)));
@@ -359,7 +359,7 @@ public class DriveTileEntity extends AENetworkInvTileEntity implements IChestOrD
this.handlersBySlot[x] = null;
if (!is.isEmpty()) {
this.handlersBySlot[x] = AEApi.instance().registries().cell().getHandler(is);
this.handlersBySlot[x] = Api.instance().registries().cell().getHandler(is);
if (this.handlersBySlot[x] != null) {
for (IStorageChannel<? extends IAEStack<?>> channel : storageChannels) {
@@ -444,14 +444,14 @@ public class DriveTileEntity extends AENetworkInvTileEntity implements IChestOrD
@Override
public boolean allowInsert(IItemHandler inv, int slot, ItemStack stack) {
return !stack.isEmpty() && AEApi.instance().registries().cell().isCellHandled(stack);
return !stack.isEmpty() && Api.instance().registries().cell().isCellHandled(stack);
}
}
@Override
public ItemStack getItemStackRepresentation() {
return AEApi.instance().definitions().blocks().drive().maybeStack(1).orElse(ItemStack.EMPTY);
return Api.instance().definitions().blocks().drive().maybeStack(1).orElse(ItemStack.EMPTY);
}
@Nonnull
src/main/java/appeng/tile/storage/IOPortTileEntity.java
+5 -5
View File
@@ -31,7 +31,6 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.config.FullnessMode;
import appeng.api.config.OperationMode;
@@ -56,6 +55,7 @@ import appeng.api.util.AECableType;
import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.api.util.IConfigManager;
import appeng.core.Api;
import appeng.core.settings.TickRates;
import appeng.me.GridAccessException;
import appeng.me.helpers.MachineSource;
@@ -106,7 +106,7 @@ public class IOPortTileEntity extends AENetworkInvTileEntity
this.mySrc = new MachineSource(this);
this.lastRedstoneState = YesNo.UNDECIDED;
final Block ioPortBlock = AEApi.instance().definitions().blocks().iOPort().maybeBlock().get();
final Block ioPortBlock = Api.instance().definitions().blocks().iOPort().maybeBlock().get();
this.upgrades = new BlockUpgradeInventory(ioPortBlock, this, NUMBER_OF_UPGRADE_SLOTS);
}
@@ -265,7 +265,7 @@ public class IOPortTileEntity extends AENetworkInvTileEntity
if (!is.isEmpty()) {
boolean shouldMove = true;
for (IStorageChannel<? extends IAEStack<?>> c : AEApi.instance().storage().storageChannels()) {
for (IStorageChannel<? extends IAEStack<?>> c : Api.instance().storage().storageChannels()) {
if (itemsToMove > 0) {
final IMEMonitor<? extends IAEStack<?>> network = this.getProxy().getStorage()
.getInventory(c);
@@ -316,8 +316,8 @@ public class IOPortTileEntity extends AENetworkInvTileEntity
this.currentCell = is;
this.cachedInventories = new IdentityHashMap<>();
for (IStorageChannel<? extends IAEStack<?>> c : AEApi.instance().storage().storageChannels()) {
this.cachedInventories.put(c, AEApi.instance().registries().cell().getCellInventory(is, null, c));
for (IStorageChannel<? extends IAEStack<?>> c : Api.instance().storage().storageChannels()) {
this.cachedInventories.put(c, Api.instance().registries().cell().getCellInventory(is, null, c));
}
}