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/crafting/CraftingMonitorTileEntity.java
+2 -2
View File
@@ -33,10 +33,10 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.client.model.data.IModelData;
import appeng.api.AEApi;
import appeng.api.implementations.tiles.IColorableTile;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.util.AEColor;
import appeng.core.Api;
import appeng.util.item.AEItemStack;
public class CraftingMonitorTileEntity extends CraftingTileEntity implements IColorableTile {
@@ -161,7 +161,7 @@ public class CraftingMonitorTileEntity extends CraftingTileEntity implements ICo
@Override
protected ItemStack getItemFromTile(final Object obj) {
final Optional<ItemStack> is = AEApi.instance().definitions().blocks().craftingMonitor().maybeStack(1);
final Optional<ItemStack> is = Api.instance().definitions().blocks().craftingMonitor().maybeStack(1);
return is.orElseGet(() -> super.getItemFromTile(obj));
}
src/main/java/appeng/tile/crafting/CraftingStorageTileEntity.java
+2 -2
View File
@@ -23,9 +23,9 @@ import java.util.Optional;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntityType;
import appeng.api.AEApi;
import appeng.api.definitions.IBlocks;
import appeng.block.crafting.AbstractCraftingUnitBlock;
import appeng.core.Api;
public class CraftingStorageTileEntity extends CraftingTileEntity {
private static final int KILO_SCALAR = 1024;
@@ -36,7 +36,7 @@ public class CraftingStorageTileEntity extends CraftingTileEntity {
@Override
protected ItemStack getItemFromTile(final Object obj) {
final IBlocks blocks = AEApi.instance().definitions().blocks();
final IBlocks blocks = Api.instance().definitions().blocks();
final int storage = ((CraftingTileEntity) obj).getStorageBytes() / KILO_SCALAR;
Optional<ItemStack> is;
src/main/java/appeng/tile/crafting/CraftingTileEntity.java
+4 -4
View File
@@ -37,7 +37,6 @@ import net.minecraft.world.IBlockReader;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.common.util.Constants;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.implementations.IPowerChannelState;
import appeng.api.networking.GridFlags;
@@ -52,6 +51,7 @@ import appeng.api.util.AEPartLocation;
import appeng.api.util.WorldCoord;
import appeng.block.crafting.AbstractCraftingUnitBlock;
import appeng.block.crafting.AbstractCraftingUnitBlock.CraftingUnitType;
import appeng.core.Api;
import appeng.me.cluster.IAECluster;
import appeng.me.cluster.IAEMultiBlock;
import appeng.me.cluster.implementations.CraftingCPUCalculator;
@@ -84,9 +84,9 @@ public class CraftingTileEntity extends AENetworkTileEntity implements IAEMultiB
Optional<ItemStack> is;
if (((CraftingTileEntity) obj).isAccelerator()) {
is = AEApi.instance().definitions().blocks().craftingAccelerator().maybeStack(1);
is = Api.instance().definitions().blocks().craftingAccelerator().maybeStack(1);
} else {
is = AEApi.instance().definitions().blocks().craftingUnit().maybeStack(1);
is = Api.instance().definitions().blocks().craftingUnit().maybeStack(1);
}
return is.orElseGet(() -> super.getItemFromTile(obj));
@@ -278,7 +278,7 @@ public class CraftingTileEntity extends AENetworkTileEntity implements IAEMultiB
}
for (IAEItemStack ais : inv.getAvailableItems(
AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList())) {
Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList())) {
ais = ais.copy();
ais.setStackSize(ais.getDefinition().getMaxStackSize());
while (true) {
src/main/java/appeng/tile/crafting/MolecularAssemblerTileEntity.java
+2 -2
View File
@@ -38,7 +38,6 @@ import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.fml.hooks.BasicEventHooks;
import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.config.PowerMultiplier;
import appeng.api.config.RedstoneMode;
@@ -61,6 +60,7 @@ import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.api.util.IConfigManager;
import appeng.container.ContainerNull;
import appeng.core.Api;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.network.TargetPoint;
import appeng.core.sync.packets.AssemblerAnimationPacket;
@@ -107,7 +107,7 @@ public class MolecularAssemblerTileEntity extends AENetworkInvTileEntity
public MolecularAssemblerTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
final ITileDefinition assembler = AEApi.instance().definitions().blocks().molecularAssembler();
final ITileDefinition assembler = Api.instance().definitions().blocks().molecularAssembler();
this.settings = new ConfigManager(this);
this.settings.registerSetting(Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE);
src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java
+3 -3
View File
@@ -27,10 +27,10 @@ import net.minecraft.nbt.CompoundNBT;
import net.minecraftforge.items.IItemHandlerModifiable;
import net.minecraftforge.items.ItemHandlerHelper;
import appeng.api.AEApi;
import appeng.api.storage.channels.IItemStorageChannel;
import appeng.api.storage.data.IAEItemStack;
import appeng.core.AELog;
import appeng.core.Api;
import appeng.util.Platform;
import appeng.util.inv.IAEAppEngInventory;
import appeng.util.inv.InvOperation;
@@ -145,7 +145,7 @@ public class AppEngInternalAEInventory implements IItemHandlerModifiable, Iterab
if (!simulate) {
if (existing.isEmpty()) {
this.inv[slot] = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)
this.inv[slot] = Api.instance().storage().getStorageChannel(IItemStorageChannel.class)
.createStack(reachedLimit ? ItemHandlerHelper.copyStackWithSize(stack, limit) : stack);
} else {
existing.grow(reachedLimit ? limit : stack.getCount());
@@ -182,7 +182,7 @@ public class AppEngInternalAEInventory implements IItemHandlerModifiable, Iterab
@Override
public void setStackInSlot(final int slot, final ItemStack newItemStack) {
ItemStack oldStack = this.getStackInSlot(slot).copy();
this.inv[slot] = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)
this.inv[slot] = Api.instance().storage().getStorageChannel(IItemStorageChannel.class)
.createStack(newItemStack);
if (this.te != null && Platform.isServer()) {
src/main/java/appeng/tile/misc/ChargerTileEntity.java
+7 -7
View File
@@ -30,7 +30,6 @@ import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction;
import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.config.PowerMultiplier;
import appeng.api.config.PowerUnits;
@@ -46,6 +45,7 @@ import appeng.api.storage.data.IAEItemStack;
import appeng.api.util.AECableType;
import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.core.Api;
import appeng.core.settings.TickRates;
import appeng.me.GridAccessException;
import appeng.tile.grid.AENetworkPowerTileEntity;
@@ -115,7 +115,7 @@ public class ChargerTileEntity extends AENetworkPowerTileEntity implements ICran
final ItemStack myItem = this.inv.getStackInSlot(0);
if (this.getInternalCurrentPower() > POWER_THRESHOLD) {
final IMaterials materials = AEApi.instance().definitions().materials();
final IMaterials materials = Api.instance().definitions().materials();
if (materials.certusQuartzCrystal().isSameAs(myItem)) {
this.extractAEPower(this.getInternalMaxPower(), Actionable.MODULATE, PowerMultiplier.CONFIG);
@@ -157,7 +157,7 @@ public class ChargerTileEntity extends AENetworkPowerTileEntity implements ICran
if (myItem.isEmpty()) {
ItemStack held = player.inventory.getCurrentItem();
if (AEApi.instance().definitions().materials().certusQuartzCrystal().isSameAs(held)
if (Api.instance().definitions().materials().certusQuartzCrystal().isSameAs(held)
|| Platform.isChargeable(held)) {
held = player.inventory.decrStackSize(player.inventory.currentItem, 1);
this.inv.setStackInSlot(0, held);
@@ -185,13 +185,13 @@ public class ChargerTileEntity extends AENetworkPowerTileEntity implements ICran
boolean changed = false;
if (!myItem.isEmpty()) {
final IMaterials materials = AEApi.instance().definitions().materials();
final IMaterials materials = Api.instance().definitions().materials();
if (Platform.isChargeable(myItem)) {
final IAEItemPowerStorage ps = (IAEItemPowerStorage) myItem.getItem();
if (ps.getAEMaxPower(myItem) > ps.getAECurrentPower(myItem)) {
final double chargeRate = AEApi.instance().registries().charger().getChargeRate(myItem.getItem());
final double chargeRate = Api.instance().registries().charger().getChargeRate(myItem.getItem());
double extractedAmount = this.extractAEPower(chargeRate, Actionable.MODULATE,
PowerMultiplier.CONFIG);
@@ -254,7 +254,7 @@ public class ChargerTileEntity extends AENetworkPowerTileEntity implements ICran
private class ChargerInvFilter implements IAEItemFilter {
@Override
public boolean allowInsert(IItemHandler inv, final int i, final ItemStack itemstack) {
final IItemDefinition cert = AEApi.instance().definitions().materials().certusQuartzCrystal();
final IItemDefinition cert = Api.instance().definitions().materials().certusQuartzCrystal();
return Platform.isChargeable(itemstack) || cert.isSameAs(itemstack);
}
@@ -270,7 +270,7 @@ public class ChargerTileEntity extends AENetworkPowerTileEntity implements ICran
}
}
return AEApi.instance().definitions().materials().certusQuartzCrystalCharged().isSameAs(extractedItem);
return Api.instance().definitions().materials().certusQuartzCrystalCharged().isSameAs(extractedItem);
}
}
}
src/main/java/appeng/tile/misc/CondenserItemInventory.java
+2 -2
View File
@@ -24,7 +24,6 @@ import java.util.Map.Entry;
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;
@@ -35,6 +34,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.me.helpers.BaseActionSource;
import appeng.me.storage.ITickingMonitor;
import appeng.util.item.AEItemStack;
@@ -92,7 +92,7 @@ class CondenserItemInventory implements IMEMonitor<IAEItemStack>, ITickingMonito
@Override
public IStorageChannel<IAEItemStack> getChannel() {
return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class);
return Api.instance().storage().getStorageChannel(IItemStorageChannel.class);
}
@Override
src/main/java/appeng/tile/misc/CondenserTileEntity.java
+4 -4
View File
@@ -35,7 +35,6 @@ import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi;
import appeng.api.config.CondenserOutput;
import appeng.api.config.Settings;
import appeng.api.definitions.IMaterials;
@@ -52,6 +51,7 @@ import appeng.api.storage.data.IAEStack;
import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigurableObject;
import appeng.capabilities.Capabilities;
import appeng.core.Api;
import appeng.tile.AEBaseInvTileEntity;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.ConfigManager;
@@ -147,7 +147,7 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM
}
private ItemStack getOutput() {
final IMaterials materials = AEApi.instance().definitions().materials();
final IMaterials materials = Api.instance().definitions().materials();
switch ((CondenserOutput) this.cm.getSetting(Settings.CONDENSER_OUTPUT)) {
case MATTER_BALLS:
@@ -281,7 +281,7 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM
@Override
public int fill(FluidStack resource, FluidAction action) {
if (action == FluidAction.EXECUTE) {
final IStorageChannel<IAEFluidStack> chan = AEApi.instance().storage()
final IStorageChannel<IAEFluidStack> chan = Api.instance().storage()
.getStorageChannel(IFluidStorageChannel.class);
CondenserTileEntity.this
.addPower((resource.isEmpty() ? 0.0 : (double) resource.getAmount()) / chan.transferFactor());
@@ -345,7 +345,7 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM
@Override
public <T extends IAEStack<T>> IMEMonitor<T> getInventory(IStorageChannel<T> channel) {
if (channel == AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)) {
if (channel == Api.instance().storage().getStorageChannel(IItemStorageChannel.class)) {
return (IMEMonitor<T>) this.itemInventory;
} else {
return new CondenserVoidInventory<>(CondenserTileEntity.this, channel);
src/main/java/appeng/tile/misc/InscriberRecipes.java
+2 -2
View File
@@ -15,9 +15,9 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.world.World;
import appeng.api.AEApi;
import appeng.api.definitions.IComparableDefinition;
import appeng.api.features.InscriberProcessType;
import appeng.core.Api;
import appeng.core.AppEng;
import appeng.items.materials.MaterialItem;
import appeng.recipes.handlers.InscriberRecipe;
@@ -47,7 +47,7 @@ public final class InscriberRecipes {
public static InscriberRecipe findRecipe(World world, ItemStack input, ItemStack plateA, ItemStack plateB,
boolean supportNamePress) {
if (supportNamePress) {
IComparableDefinition namePress = AEApi.instance().definitions().materials().namePress();
IComparableDefinition namePress = Api.instance().definitions().materials().namePress();
boolean isNameA = namePress.isSameAs(plateA);
boolean isNameB = namePress.isSameAs(plateB);
src/main/java/appeng/tile/misc/InscriberTileEntity.java
+3 -3
View File
@@ -35,7 +35,6 @@ import net.minecraft.world.World;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.IItemHandlerModifiable;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.config.PowerMultiplier;
import appeng.api.config.Settings;
@@ -52,6 +51,7 @@ import appeng.api.networking.ticking.TickingRequest;
import appeng.api.util.AECableType;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IConfigManager;
import appeng.core.Api;
import appeng.core.settings.TickRates;
import appeng.me.GridAccessException;
import appeng.parts.automation.DefinitionUpgradeInventory;
@@ -106,7 +106,7 @@ public class InscriberTileEntity extends AENetworkPowerTileEntity
this.getProxy().setIdlePowerUsage(0);
this.settings = new ConfigManager(this);
final ITileDefinition inscriberDefinition = AEApi.instance().definitions().blocks().inscriber();
final ITileDefinition inscriberDefinition = Api.instance().definitions().blocks().inscriber();
this.upgrades = new DefinitionUpgradeInventory(inscriberDefinition, this, this.getUpgradeSlots());
this.sideItemHandler.setMaxStackSize(1, 64);
@@ -431,7 +431,7 @@ public class InscriberTileEntity extends AENetworkPowerTileEntity
}
if (inv == InscriberTileEntity.this.topItemHandler || inv == InscriberTileEntity.this.bottomItemHandler) {
if (AEApi.instance().definitions().materials().namePress().isSameAs(stack)) {
if (Api.instance().definitions().materials().namePress().isSameAs(stack)) {
return true;
}
return InscriberRecipes.isValidOptionalIngredient(getWorld(), stack);
src/main/java/appeng/tile/misc/InterfaceTileEntity.java
+2 -2
View File
@@ -40,7 +40,6 @@ import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.config.Upgrades;
import appeng.api.networking.IGridNode;
@@ -59,6 +58,7 @@ import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.api.util.IConfigManager;
import appeng.container.implementations.InterfaceContainer;
import appeng.core.Api;
import appeng.helpers.DualityInterface;
import appeng.helpers.IInterfaceHost;
import appeng.helpers.IPriorityHost;
@@ -306,7 +306,7 @@ public class InterfaceTileEntity extends AENetworkInvTileEntity
@Override
public ItemStack getItemStackRepresentation() {
return AEApi.instance().definitions().blocks().iface().maybeStack(1).orElse(ItemStack.EMPTY);
return Api.instance().definitions().blocks().iface().maybeStack(1).orElse(ItemStack.EMPTY);
}
@Override
src/main/java/appeng/tile/misc/SecurityStationTileEntity.java
+3 -3
View File
@@ -36,7 +36,6 @@ import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi;
import appeng.api.config.SecurityPermissions;
import appeng.api.config.Settings;
import appeng.api.config.SortDir;
@@ -66,6 +65,7 @@ import appeng.api.util.AEColor;
import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.api.util.IConfigManager;
import appeng.core.Api;
import appeng.helpers.PlayerSecurityWrapper;
import appeng.me.GridAccessException;
import appeng.me.helpers.MEMonitorHandler;
@@ -253,7 +253,7 @@ public class SecurityStationTileEntity extends AENetworkTileEntity implements IT
@Override
public <T extends IAEStack<T>> IMEMonitor<T> getInventory(IStorageChannel<T> channel) {
if (channel == AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)) {
if (channel == Api.instance().storage().getStorageChannel(IItemStorageChannel.class)) {
return (IMEMonitor<T>) this.securityMonitor;
}
return null;
@@ -286,7 +286,7 @@ public class SecurityStationTileEntity extends AENetworkTileEntity implements IT
@Override
public void readPermissions(final Map<Integer, EnumSet<SecurityPermissions>> playerPerms) {
final IPlayerRegistry pr = AEApi.instance().registries().players();
final IPlayerRegistry pr = Api.instance().registries().players();
// read permissions
for (final IAEItemStack ais : this.inventory.getStoredItems()) {
src/main/java/appeng/tile/networking/WirelessTileEntity.java
+2 -2
View File
@@ -27,7 +27,6 @@ import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction;
import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi;
import appeng.api.implementations.IPowerChannelState;
import appeng.api.implementations.tiles.IWirelessAccessPoint;
import appeng.api.networking.GridFlags;
@@ -39,6 +38,7 @@ import appeng.api.util.AECableType;
import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.core.AEConfig;
import appeng.core.Api;
import appeng.me.GridAccessException;
import appeng.tile.grid.AENetworkInvTileEntity;
import appeng.tile.inventory.AppEngInternalInventory;
@@ -56,7 +56,7 @@ public class WirelessTileEntity extends AENetworkInvTileEntity implements IWirel
public WirelessTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.inv.setFilter(new AEItemDefinitionFilter(AEApi.instance().definitions().materials().wirelessBooster()));
this.inv.setFilter(new AEItemDefinitionFilter(Api.instance().definitions().materials().wirelessBooster()));
this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL);
this.getProxy().setValidSides(EnumSet.noneOf(Direction.class));
}
src/main/java/appeng/tile/qnb/QuantumBridgeTileEntity.java
+3 -3
View File
@@ -38,7 +38,6 @@ import net.minecraftforge.client.model.data.ModelProperty;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.wrapper.EmptyHandler;
import appeng.api.AEApi;
import appeng.api.definitions.IBlockDefinition;
import appeng.api.networking.GridFlags;
import appeng.api.networking.events.MENetworkEventSubscribe;
@@ -47,6 +46,7 @@ import appeng.api.util.AECableType;
import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.block.qnb.QnbFormedState;
import appeng.core.Api;
import appeng.me.GridAccessException;
import appeng.me.cluster.IAECluster;
import appeng.me.cluster.IAEMultiBlock;
@@ -134,7 +134,7 @@ public class QuantumBridgeTileEntity extends AENetworkInvTileEntity implements I
}
private boolean isCenter() {
return AEApi.instance().definitions().blocks().quantumLink().maybeBlock()
return Api.instance().definitions().blocks().quantumLink().maybeBlock()
.map(link -> this.getBlockState().getBlock() == link).orElse(false);
}
@@ -153,7 +153,7 @@ public class QuantumBridgeTileEntity extends AENetworkInvTileEntity implements I
public void onReady() {
super.onReady();
final IBlockDefinition quantumRing = AEApi.instance().definitions().blocks().quantumRing();
final IBlockDefinition quantumRing = Api.instance().definitions().blocks().quantumRing();
final Optional<Block> maybeLinkBlock = quantumRing.maybeBlock();
final Optional<ItemStack> maybeLinkStack = quantumRing.maybeStack(1);
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));
}
}