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);