diff --git a/src/main/java/appeng/block/AEBaseBlockItemChargeable.java b/src/main/java/appeng/block/AEBaseBlockItemChargeable.java index c91d28891..e1920e5ac 100644 --- a/src/main/java/appeng/block/AEBaseBlockItemChargeable.java +++ b/src/main/java/appeng/block/AEBaseBlockItemChargeable.java @@ -19,12 +19,12 @@ package appeng.block; +import appeng.api.AEApi; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; import appeng.api.config.PowerUnits; import appeng.api.definitions.IBlockDefinition; import appeng.api.implementations.items.IAEItemPowerStorage; -import appeng.core.Api; import appeng.core.localization.GuiText; import net.minecraft.block.Block; import net.minecraft.client.util.ITooltipFlag; @@ -134,7 +134,7 @@ public class AEBaseBlockItemChargeable extends AEBaseBlockItem implements IAEIte private double getMaxEnergyCapacity() { final Block blockID = Block.getBlockFromItem( this ); - final IBlockDefinition energyCell = Api.INSTANCE.definitions().blocks().energyCell(); + final IBlockDefinition energyCell = AEApi.instance().definitions().blocks().energyCell(); return energyCell.maybeBlock().map( block -> { diff --git a/src/main/java/appeng/block/crafting/ItemCraftingStorage.java b/src/main/java/appeng/block/crafting/ItemCraftingStorage.java index 747b24ac5..c8b6cd575 100644 --- a/src/main/java/appeng/block/crafting/ItemCraftingStorage.java +++ b/src/main/java/appeng/block/crafting/ItemCraftingStorage.java @@ -19,12 +19,12 @@ package appeng.block.crafting; -import appeng.core.Api; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import appeng.block.AEBaseBlockItem; import appeng.core.AEConfig; +import appeng.api.AEApi; import appeng.api.features.AEFeature; @@ -38,7 +38,7 @@ public class ItemCraftingStorage extends AEBaseBlockItem @Override public ItemStack getContainerItem( final ItemStack itemStack ) { - return Api.INSTANCE.definitions().blocks().craftingUnit().maybeStack( 1 ).orElse( ItemStack.EMPTY ); + return AEApi.instance().definitions().blocks().craftingUnit().maybeStack( 1 ).orElse( ItemStack.EMPTY ); } @Override diff --git a/src/main/java/appeng/block/misc/BlockCharger.java b/src/main/java/appeng/block/misc/BlockCharger.java index cab36ce57..5994297c5 100644 --- a/src/main/java/appeng/block/misc/BlockCharger.java +++ b/src/main/java/appeng/block/misc/BlockCharger.java @@ -24,7 +24,6 @@ import java.util.function.Function; import javax.annotation.Nullable; -import appeng.core.Api; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.ActionResultType; import net.minecraft.util.math.BlockRayTraceResult; @@ -50,6 +49,7 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import appeng.api.AEApi; import appeng.api.util.AEAxisAlignedBB; import appeng.block.AEBaseTileBlock; import appeng.client.render.renderable.ItemRenderable; @@ -115,7 +115,7 @@ public class BlockCharger extends AEBaseTileBlock { final TileCharger tc = (TileCharger) tile; - if( Api.INSTANCE.definitions().materials().certusQuartzCrystalCharged().isSameAs( tc.getInternalInventory().getStackInSlot( 0 ) ) ) + if( AEApi.instance().definitions().materials().certusQuartzCrystalCharged().isSameAs( tc.getInternalInventory().getStackInSlot( 0 ) ) ) { final double xOff = 0.0; final double yOff = 0.0; diff --git a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java index dce50f5be..ae5405a15 100644 --- a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java +++ b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java @@ -2,8 +2,8 @@ package appeng.block.qnb; +import appeng.api.AEApi; import appeng.client.render.cablebus.CubeBuilder; -import appeng.core.Api; import appeng.core.AppEng; import appeng.tile.qnb.TileQuantumBridge; import com.google.common.collect.ImmutableList; @@ -63,7 +63,7 @@ class QnbFormedBakedModel implements IDynamicBakedModel this.coveredCableTexture = bakedTextureGetter.apply( TEXTURE_COVERED_CABLE ); this.lightTexture = bakedTextureGetter.apply( TEXTURE_RING_LIGHT ); this.lightCornerTexture = bakedTextureGetter.apply( TEXTURE_RING_LIGHT_CORNER ); - this.linkBlock = Api.INSTANCE.definitions().blocks().quantumLink().maybeBlock().orElse( null ); + this.linkBlock = AEApi.instance().definitions().blocks().quantumLink().maybeBlock().orElse( null ); } @Override diff --git a/src/main/java/appeng/client/gui/implementations/AESubGui.java b/src/main/java/appeng/client/gui/implementations/AESubGui.java index 1f6994bce..abe3d28b2 100644 --- a/src/main/java/appeng/client/gui/implementations/AESubGui.java +++ b/src/main/java/appeng/client/gui/implementations/AESubGui.java @@ -1,5 +1,6 @@ package appeng.client.gui.implementations; +import appeng.api.AEApi; import appeng.api.definitions.IDefinitions; import appeng.api.definitions.IParts; import appeng.client.gui.AEBaseGui; @@ -8,7 +9,6 @@ import appeng.container.implementations.ContainerCraftingTerm; import appeng.container.implementations.ContainerMEMonitorable; import appeng.container.implementations.ContainerPatternTerm; import appeng.container.implementations.ContainerWirelessTerm; -import appeng.core.Api; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketSwitchGuis; import appeng.helpers.IPriorityHost; @@ -36,7 +36,7 @@ final class AESubGui { public AESubGui(AEBaseGui gui, Object containerTarget) { this.gui = gui; - final IDefinitions definitions = Api.INSTANCE.definitions(); + final IDefinitions definitions = AEApi.instance().definitions(); final IParts parts = definitions.parts(); if (containerTarget instanceof IPriorityHost) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java b/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java index 104c3bac0..1e8df5570 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java @@ -19,6 +19,7 @@ package appeng.client.gui.implementations; +import appeng.api.AEApi; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; @@ -26,7 +27,6 @@ import appeng.client.gui.AEBaseGui; import appeng.client.gui.widgets.GuiScrollbar; import appeng.container.implementations.ContainerCraftConfirm; import appeng.core.AELog; -import appeng.core.Api; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketValueConfig; @@ -54,9 +54,9 @@ public class GuiCraftConfirm extends AEBaseGui private final int rows = 5; - private final IItemList storage = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); - private final IItemList pending = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); - private final IItemList missing = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + private final IItemList storage = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); + private final IItemList pending = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); + private final IItemList missing = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); private final List visual = new ArrayList<>(); diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java index c7313782b..275e32b79 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java @@ -19,6 +19,7 @@ package appeng.client.gui.implementations; +import appeng.api.AEApi; import appeng.api.config.SortDir; import appeng.api.config.SortOrder; import appeng.api.config.ViewItems; @@ -32,7 +33,6 @@ import appeng.client.gui.widgets.ISortSource; import appeng.container.implementations.ContainerCraftingCPU; import appeng.core.AEConfig; import appeng.core.AELog; -import appeng.core.Api; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketValueConfig; @@ -81,9 +81,9 @@ public class GuiCraftingCPU extends AEBaseGui private static final int ITEMSTACK_LEFT_OFFSET = 9; private static final int ITEMSTACK_TOP_OFFSET = 22; - private IItemList storage = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); - private IItemList active = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); - private IItemList pending = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + private IItemList storage = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); + private IItemList active = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); + private IItemList pending = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); private List visual = new ArrayList<>(); private Button cancel; @@ -100,9 +100,9 @@ public class GuiCraftingCPU extends AEBaseGui public void clearItems() { - this.storage = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); - this.active = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); - this.pending = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + this.storage = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); + this.active = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); + this.pending = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); this.visual = new ArrayList<>(); } diff --git a/src/main/java/appeng/client/gui/implementations/GuiIOPort.java b/src/main/java/appeng/client/gui/implementations/GuiIOPort.java index 4c37650be..60299a2e2 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiIOPort.java +++ b/src/main/java/appeng/client/gui/implementations/GuiIOPort.java @@ -19,6 +19,7 @@ package appeng.client.gui.implementations; +import appeng.api.AEApi; import appeng.api.config.FullnessMode; import appeng.api.config.OperationMode; import appeng.api.config.RedstoneMode; @@ -26,7 +27,6 @@ import appeng.api.config.Settings; import appeng.api.definitions.IDefinitions; import appeng.client.gui.widgets.GuiImgButton; import appeng.container.implementations.ContainerIOPort; -import appeng.core.Api; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketConfigButton; @@ -84,7 +84,7 @@ public class GuiIOPort extends GuiUpgradeable { super.drawBG( offsetX, offsetY, mouseX, mouseY, partialTicks); - final IDefinitions definitions = Api.INSTANCE.definitions(); + final IDefinitions definitions = AEApi.instance().definitions(); definitions.items().cell1k().maybeStack( 1 ).ifPresent( cell1kStack -> this.drawItem( offsetX + 66 - 8, offsetY + 17, cell1kStack ) ); diff --git a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java index e16845788..c50008cb9 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java +++ b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java @@ -19,6 +19,7 @@ package appeng.client.gui.implementations; +import appeng.api.AEApi; import appeng.api.storage.channels.IItemStorageChannel; import appeng.client.gui.AEBaseGui; import appeng.client.gui.widgets.GuiScrollbar; @@ -26,7 +27,6 @@ import appeng.client.gui.widgets.MEGuiTextField; import appeng.client.me.ClientDCInternalInv; import appeng.client.me.SlotDisconnected; import appeng.container.implementations.ContainerInterfaceTerminal; -import appeng.core.Api; import appeng.core.localization.GuiText; import appeng.util.Platform; import com.google.common.collect.HashMultimap; @@ -331,7 +331,7 @@ public class GuiInterfaceTerminal extends AEBaseGui if( !parsedItemStack.isEmpty() ) { final String displayName = Platform - .getItemDisplayName( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createStack( parsedItemStack ) ) + .getItemDisplayName( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( parsedItemStack ) ) .getString() .toLowerCase(); if( displayName.contains( searchTerm ) ) diff --git a/src/main/java/appeng/client/me/FluidRepo.java b/src/main/java/appeng/client/me/FluidRepo.java index 543feece5..40bfdec15 100644 --- a/src/main/java/appeng/client/me/FluidRepo.java +++ b/src/main/java/appeng/client/me/FluidRepo.java @@ -37,7 +37,6 @@ import appeng.api.storage.data.IItemList; import appeng.client.gui.widgets.IScrollSource; import appeng.client.gui.widgets.ISortSource; import appeng.core.AEConfig; -import appeng.core.Api; import appeng.fluids.util.FluidSorters; import appeng.util.Platform; import appeng.util.prioritylist.IPartitionList; @@ -51,7 +50,7 @@ import net.minecraft.util.text.ITextComponent; */ public class FluidRepo { - private final IItemList list = Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ).createList(); + private final IItemList list = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList(); private final ArrayList view = new ArrayList<>(); private final IScrollSource src; private final ISortSource sortSrc; diff --git a/src/main/java/appeng/client/me/ItemRepo.java b/src/main/java/appeng/client/me/ItemRepo.java index 185473749..c848d0ed9 100644 --- a/src/main/java/appeng/client/me/ItemRepo.java +++ b/src/main/java/appeng/client/me/ItemRepo.java @@ -26,7 +26,6 @@ import java.util.regex.Pattern; import javax.annotation.Nonnull; -import appeng.core.Api; import net.minecraft.item.ItemStack; import appeng.api.AEApi; @@ -51,7 +50,7 @@ import net.minecraft.util.text.ITextComponent; public class ItemRepo { - private final IItemList list = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + private final IItemList list = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); private final ArrayList view = new ArrayList<>(); private final IScrollSource src; private final ISortSource sortSrc; diff --git a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java index 1efded313..403507565 100644 --- a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java @@ -53,7 +53,6 @@ import net.minecraftforge.client.model.data.IModelData; import appeng.api.AEApi; import appeng.api.util.AEAxisAlignedBB; -import appeng.core.Api; import appeng.parts.misc.PartCableAnchor; import appeng.thirdparty.codechicken.lib.model.CachedFormat; import appeng.thirdparty.codechicken.lib.model.Quad; @@ -116,7 +115,7 @@ public class FacadeBuilder { BakedPipeline pipeline = this.pipelines.get(); Quad collectorQuad = this.collectors.get(); - boolean transparent = Api.INSTANCE.partHelper().getCableRenderMode().transparentFacades; + boolean transparent = AEApi.instance().partHelper().getCableRenderMode().transparentFacades; Map facadeStates = renderState.getFacades(); List partBoxes = renderState.getBoundingBoxes(); Set sidesWithParts = renderState.getAttachments().keySet(); diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java index 508ea37e6..f1407c551 100644 --- a/src/main/java/appeng/container/AEBaseContainer.java +++ b/src/main/java/appeng/container/AEBaseContainer.java @@ -27,7 +27,6 @@ import java.util.HashSet; import java.util.List; import appeng.container.slot.*; -import appeng.core.Api; import appeng.core.sync.packets.PacketInventoryAction; import appeng.core.sync.packets.PacketValueConfig; import net.minecraft.entity.player.PlayerEntity; @@ -40,6 +39,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.PlayerInvWrapper; +import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.SecurityPermissions; import appeng.api.implementations.guiobjects.IGuiItemObject; @@ -799,7 +799,7 @@ public abstract class AEBaseContainer extends Container if( !isg.isEmpty() && releaseQty > 0 ) { - IAEItemStack ais = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createStack( isg ); + IAEItemStack ais = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( isg ); ais.setStackSize( 1 ); final IAEItemStack extracted = ais.copy(); @@ -889,7 +889,7 @@ public abstract class AEBaseContainer extends Container } else { - IAEItemStack ais = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createStack( player.inventory.getItemStack() ); + IAEItemStack ais = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( player.inventory.getItemStack() ); ais = Platform.poweredInsert( this.getPowerSource(), this.getCellInventory(), ais, this.getActionSource() ); if( ais != null ) { @@ -938,7 +938,7 @@ public abstract class AEBaseContainer extends Container } else { - IAEItemStack ais = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createStack( player.inventory.getItemStack() ); + IAEItemStack ais = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( player.inventory.getItemStack() ); ais.setStackSize( 1 ); ais = Platform.poweredInsert( this.getPowerSource(), this.getCellInventory(), ais, this.getActionSource() ); if( ais == null ) @@ -1030,7 +1030,7 @@ public abstract class AEBaseContainer extends Container return input; } final IAEItemStack ais = Platform.poweredInsert( this.getPowerSource(), this.getCellInventory(), - Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createStack( input ), + AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( input ), this.getActionSource() ); if( ais == null ) { diff --git a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java index 4c1e504eb..4b0abfb83 100644 --- a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java +++ b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java @@ -23,7 +23,6 @@ import java.util.Iterator; import appeng.container.ContainerLocator; import appeng.container.helper.TileContainerHelper; -import appeng.core.Api; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.entity.player.PlayerInventory; @@ -33,6 +32,7 @@ import net.minecraft.network.PacketBuffer; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.EmptyHandler; +import appeng.api.AEApi; import appeng.api.config.CopyMode; import appeng.api.config.FuzzyMode; import appeng.api.config.Settings; @@ -242,11 +242,11 @@ public class ContainerCellWorkbench extends ContainerUpgradeable final IItemHandler inv = this.getUpgradeable().getInventoryByName( "config" ); final ItemStack is = this.getUpgradeable().getInventoryByName( "cell" ).getStackInSlot( 0 ); - final IStorageChannel channel = is.getItem() instanceof IStorageCell ? ( (IStorageCell) is.getItem() ).getChannel() : Api.INSTANCE + final IStorageChannel channel = is.getItem() instanceof IStorageCell ? ( (IStorageCell) is.getItem() ).getChannel() : AEApi.instance() .storage() .getStorageChannel( IItemStorageChannel.class ); - final IMEInventory cellInv = Api.INSTANCE.registries().cell().getCellInventory( is, null, channel ); + final IMEInventory cellInv = AEApi.instance().registries().cell().getCellInventory( is, null, channel ); Iterator i = new NullIterator<>(); if( cellInv != null ) diff --git a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java index 8afb6c4bf..61a60ca3e 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java @@ -19,6 +19,7 @@ package appeng.container.implementations; +import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.SecurityPermissions; import appeng.api.networking.IGrid; @@ -41,7 +42,6 @@ import appeng.container.guisync.GuiSync; import appeng.container.helper.PartOrTileContainerHelper; import appeng.container.helper.TileContainerHelper; import appeng.core.AELog; -import appeng.core.Api; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketMEInventoryUpdate; import appeng.helpers.WirelessTerminalGuiObject; @@ -223,7 +223,7 @@ public class ContainerCraftConfirm extends AEBaseContainer final PacketMEInventoryUpdate b = new PacketMEInventoryUpdate( (byte) 1 ); final PacketMEInventoryUpdate c = this.result.isSimulation() ? new PacketMEInventoryUpdate( (byte) 2 ) : null; - final IItemList plan = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + final IItemList plan = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); this.result.populatePlan( plan ); this.setUsedBytes( this.result.getByteTotal() ); @@ -240,7 +240,7 @@ public class ContainerCraftConfirm extends AEBaseContainer p.setStackSize( out.getCountRequestable() ); final IStorageGrid sg = this.getGrid().getCache( IStorageGrid.class ); - final IMEInventory items = sg.getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ); + final IMEInventory items = sg.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); IAEItemStack m = null; if( c != null && this.result.isSimulation() ) diff --git a/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java b/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java index 36e632e80..4d13a05c9 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java @@ -21,10 +21,10 @@ package appeng.container.implementations; import java.io.IOException; +import appeng.api.AEApi; import appeng.api.config.SecurityPermissions; import appeng.container.ContainerLocator; import appeng.container.helper.TileContainerHelper; -import appeng.core.Api; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.entity.player.PlayerInventory; @@ -64,7 +64,7 @@ public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorH private static final TileContainerHelper helper = new TileContainerHelper<>(ContainerCraftingCPU::new, TileCraftingTile.class, SecurityPermissions.CRAFT); - private final IItemList list = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + private final IItemList list = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); private IGrid network; private CraftingCPUCluster monitor = null; private ITextComponent cpuName = null; diff --git a/src/main/java/appeng/container/implementations/ContainerInscriber.java b/src/main/java/appeng/container/implementations/ContainerInscriber.java index 0c5869a6d..0a517cbf3 100644 --- a/src/main/java/appeng/container/implementations/ContainerInscriber.java +++ b/src/main/java/appeng/container/implementations/ContainerInscriber.java @@ -19,6 +19,7 @@ package appeng.container.implementations; +import appeng.api.AEApi; import appeng.api.definitions.IItemDefinition; import appeng.api.features.IInscriberRecipe; import appeng.container.ContainerLocator; @@ -27,7 +28,6 @@ import appeng.container.helper.TileContainerHelper; import appeng.container.interfaces.IProgressProvider; import appeng.container.slot.SlotOutput; import appeng.container.slot.SlotRestrictedInput; -import appeng.core.Api; import appeng.tile.misc.TileInscriber; import appeng.util.Platform; import net.minecraft.entity.player.PlayerEntity; @@ -137,14 +137,14 @@ public class ContainerInscriber extends ContainerUpgradeable implements IProgres if( s == this.middle ) { - IItemDefinition press = Api.INSTANCE.definitions().materials().namePress(); + IItemDefinition press = AEApi.instance().definitions().materials().namePress(); if( press.isSameAs( top ) || press.isSameAs( bot ) ) { return !press.isSameAs( is ); } boolean matches = false; - for( final IInscriberRecipe recipe : Api.INSTANCE.registries().inscriber().getRecipes() ) + for( final IInscriberRecipe recipe : AEApi.instance().registries().inscriber().getRecipes() ) { final boolean matchA = !top .isEmpty() && ( Platform.itemComparisons().isSameItem( top, recipe.getTopOptional().orElse( ItemStack.EMPTY ) ) || Platform @@ -185,14 +185,14 @@ public class ContainerInscriber extends ContainerUpgradeable implements IProgres } // name presses - final IItemDefinition namePress = Api.INSTANCE.definitions().materials().namePress(); + final IItemDefinition namePress = AEApi.instance().definitions().materials().namePress(); if( namePress.isSameAs( otherSlot ) ) { return namePress.isSameAs( is ); } // everything else - for( final IInscriberRecipe recipe : Api.INSTANCE.registries().inscriber().getRecipes() ) + for( final IInscriberRecipe recipe : AEApi.instance().registries().inscriber().getRecipes() ) { boolean isValid = false; if( Platform.itemComparisons().isSameItem( otherSlot, recipe.getTopOptional().orElse( ItemStack.EMPTY ) ) ) diff --git a/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java b/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java index 3abc07023..6087b9bc6 100644 --- a/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java +++ b/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java @@ -26,7 +26,6 @@ import javax.annotation.Nonnull; import appeng.container.ContainerLocator; import appeng.container.helper.PartOrTileContainerHelper; -import appeng.core.Api; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.entity.player.PlayerInventory; @@ -36,6 +35,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; +import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; import appeng.api.config.SecurityPermissions; @@ -95,7 +95,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa private final SlotRestrictedInput[] cellView = new SlotRestrictedInput[5]; private final IMEMonitor monitor; - private final IItemList items = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + private final IItemList items = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); private final IConfigManager clientCM; private final ITerminalHost host; @GuiSync( 99 ) @@ -129,7 +129,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa { this.serverCM = monitorable.getConfigManager(); - this.monitor = monitorable.getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ); + this.monitor = monitorable.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); if( this.monitor != null ) { this.monitor.addListener( this, null ); @@ -209,7 +209,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa { if( Platform.isServer() ) { - if( this.monitor != this.host.getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ) ) + if( this.monitor != this.host.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) ) { this.setValidContainer( false ); } diff --git a/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java b/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java index 1c36e87e8..ba9c845bd 100644 --- a/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java +++ b/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java @@ -24,13 +24,13 @@ import java.io.IOException; import appeng.container.ContainerLocator; import appeng.container.helper.PartOrTileContainerHelper; import appeng.container.helper.TileContainerHelper; -import appeng.core.Api; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; +import appeng.api.AEApi; import appeng.api.implementations.guiobjects.INetworkTool; import appeng.api.networking.IGrid; import appeng.api.networking.IGridBlock; @@ -131,7 +131,7 @@ public class ContainerNetworkStatus extends AEBaseContainer for( final Class machineClass : this.network.getMachinesClasses() ) { - final IItemList list = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + final IItemList list = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); for( final IGridNode machine : this.network.getMachines( machineClass ) ) { final IGridBlock blk = machine.getGridBlock(); diff --git a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java index f9c196836..24c5a212c 100644 --- a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java +++ b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java @@ -19,6 +19,7 @@ package appeng.container.implementations; +import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.SecurityPermissions; import appeng.api.definitions.IDefinitions; @@ -33,7 +34,6 @@ import appeng.container.guisync.GuiSync; import appeng.container.helper.PartOrTileContainerHelper; import appeng.container.helper.TileContainerHelper; import appeng.container.slot.*; -import appeng.core.Api; import appeng.core.sync.packets.PacketPatternSlot; import appeng.helpers.IContainerCraftingPacket; import appeng.items.storage.ItemViewCell; @@ -250,7 +250,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA } // add a new encoded pattern. - Optional maybePattern = Api.INSTANCE.definitions().items().encodedPattern().maybeStack( 1 ); + Optional maybePattern = AEApi.instance().definitions().items().encodedPattern().maybeStack( 1 ); if( maybePattern.isPresent() ) { output = maybePattern.get(); @@ -347,7 +347,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA return false; } - final IDefinitions definitions = Api.INSTANCE.definitions(); + final IDefinitions definitions = AEApi.instance().definitions(); boolean isPattern = definitions.items().encodedPattern().isSameAs( output ); isPattern |= definitions.materials().blankPattern().isSameAs( output ); @@ -432,7 +432,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA } final IMEMonitor storage = this.getPatternTerminal() - .getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ); + .getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); final IItemList all = storage.getStorageList(); final ItemStack is = r.getCraftingResult( ic ); diff --git a/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java b/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java index 6e2e3ca72..c8b54e363 100644 --- a/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java +++ b/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java @@ -23,7 +23,6 @@ import javax.annotation.Nonnull; import appeng.container.ContainerLocator; import appeng.container.helper.PartOrTileContainerHelper; -import appeng.core.Api; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; @@ -34,6 +33,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; import net.minecraftforge.items.IItemHandler; +import appeng.api.AEApi; import appeng.container.AEBaseContainer; import appeng.container.slot.SlotOutput; import appeng.container.slot.SlotRestrictedInput; @@ -138,7 +138,7 @@ public static ContainerType TYPE; { if( ContainerQuartzKnife.this.myName.length() > 0 ) { - return Api.INSTANCE.definitions().materials().namePress().maybeStack( 1 ).map(namePressStack -> + return AEApi.instance().definitions().materials().namePress().maybeStack( 1 ).map(namePressStack -> { final CompoundNBT compound = namePressStack.getOrCreateTag(); compound.putString("InscribeName", ContainerQuartzKnife.this.myName); diff --git a/src/main/java/appeng/container/implementations/ContainerSecurityStation.java b/src/main/java/appeng/container/implementations/ContainerSecurityStation.java index 9f84634ee..b7bcfd80c 100644 --- a/src/main/java/appeng/container/implementations/ContainerSecurityStation.java +++ b/src/main/java/appeng/container/implementations/ContainerSecurityStation.java @@ -22,7 +22,6 @@ package appeng.container.implementations; import appeng.container.ContainerLocator; import appeng.container.helper.PartOrTileContainerHelper; import appeng.container.helper.TileContainerHelper; -import appeng.core.Api; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; @@ -31,6 +30,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; import net.minecraftforge.items.IItemHandler; +import appeng.api.AEApi; import appeng.api.config.SecurityPermissions; import appeng.api.features.INetworkEncodable; import appeng.api.features.IWirelessTermHandler; @@ -174,7 +174,7 @@ public static ContainerType TYPE; networkEncodable = (INetworkEncodable) term.getItem(); } - final IWirelessTermHandler wTermHandler = Api.INSTANCE.registries().wireless().getWirelessTerminalHandler( term ); + final IWirelessTermHandler wTermHandler = AEApi.instance().registries().wireless().getWirelessTerminalHandler( term ); if( wTermHandler != null ) { networkEncodable = wTermHandler; diff --git a/src/main/java/appeng/container/implementations/ContainerStorageBus.java b/src/main/java/appeng/container/implementations/ContainerStorageBus.java index 388aa1f0c..24052d8e5 100644 --- a/src/main/java/appeng/container/implementations/ContainerStorageBus.java +++ b/src/main/java/appeng/container/implementations/ContainerStorageBus.java @@ -24,7 +24,6 @@ import java.util.Iterator; import appeng.container.ContainerLocator; import appeng.container.helper.PartContainerHelper; import appeng.container.helper.TileContainerHelper; -import appeng.core.Api; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; @@ -32,6 +31,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; import net.minecraftforge.items.IItemHandler; +import appeng.api.AEApi; import appeng.api.config.AccessRestriction; import appeng.api.config.FuzzyMode; import appeng.api.config.SecurityPermissions; @@ -178,7 +178,7 @@ public class ContainerStorageBus extends ContainerUpgradeable if( cellInv != null ) { final IItemList list = cellInv - .getAvailableItems( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList() ); + .getAvailableItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() ); i = list.iterator(); } diff --git a/src/main/java/appeng/container/slot/SlotCraftingTerm.java b/src/main/java/appeng/container/slot/SlotCraftingTerm.java index 84f7313af..42f59de6e 100644 --- a/src/main/java/appeng/container/slot/SlotCraftingTerm.java +++ b/src/main/java/appeng/container/slot/SlotCraftingTerm.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import appeng.core.Api; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.Item; @@ -35,6 +34,7 @@ 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.networking.energy.IEnergySource; import appeng.api.networking.security.IActionSource; @@ -107,7 +107,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot return; } - final IMEMonitor inv = this.storage.getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ); + final IMEMonitor inv = this.storage.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); final int howManyPerCraft = this.getStack().getCount(); int maxTimesToCraft = 0; diff --git a/src/main/java/appeng/container/slot/SlotPatternTerm.java b/src/main/java/appeng/container/slot/SlotPatternTerm.java index eddb7e63d..b2940f7a0 100644 --- a/src/main/java/appeng/container/slot/SlotPatternTerm.java +++ b/src/main/java/appeng/container/slot/SlotPatternTerm.java @@ -21,7 +21,6 @@ package appeng.container.slot; import java.io.IOException; -import appeng.core.Api; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; @@ -53,7 +52,7 @@ public class SlotPatternTerm extends SlotCraftingTerm public AppEngPacket getRequest( final boolean shift ) { return new PacketPatternSlot( this - .getPattern(), Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createStack( this.getStack() ), shift ); + .getPattern(), AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( this.getStack() ), shift ); } @Override diff --git a/src/main/java/appeng/container/slot/SlotRestrictedInput.java b/src/main/java/appeng/container/slot/SlotRestrictedInput.java index 1eadc61fa..4dfb31f36 100644 --- a/src/main/java/appeng/container/slot/SlotRestrictedInput.java +++ b/src/main/java/appeng/container/slot/SlotRestrictedInput.java @@ -19,7 +19,6 @@ package appeng.container.slot; -import appeng.core.Api; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.Slot; @@ -29,6 +28,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.items.IItemHandler; +import appeng.api.AEApi; import appeng.api.definitions.IDefinitions; import appeng.api.definitions.IItems; import appeng.api.definitions.IMaterials; @@ -120,7 +120,7 @@ public class SlotRestrictedInput extends AppEngSlot return false; } - final IDefinitions definitions = Api.INSTANCE.definitions(); + final IDefinitions definitions = AEApi.instance().definitions(); final IMaterials materials = definitions.materials(); final IItems items = definitions.items(); @@ -168,7 +168,7 @@ public class SlotRestrictedInput extends AppEngSlot return true; } - for( final ItemStack optional : Api.INSTANCE.registries().inscriber().getOptionals() ) + for( final ItemStack optional : AEApi.instance().registries().inscriber().getOptionals() ) { if( Platform.itemComparisons().isSameItem( i, optional ) ) { @@ -192,7 +192,7 @@ public class SlotRestrictedInput extends AppEngSlot case VIEW_CELL: return items.viewCell().isSameAs( i ); case ORE: - return Api.INSTANCE.registries().grinder().getRecipeForInput( i ) != null; + return AEApi.instance().registries().grinder().getRecipeForInput( i ) != null; case FUEL: return ForgeHooks.getBurnTime( i ) > 0; case POWERED_TOOL: @@ -206,20 +206,20 @@ public class SlotRestrictedInput extends AppEngSlot case SPATIAL_STORAGE_CELLS: return i.getItem() instanceof ISpatialStorageCell && ( (ISpatialStorageCell) i.getItem() ).isSpatialStorage( i ); case STORAGE_CELLS: - return Api.INSTANCE.registries().cell().isCellHandled( i ); + return AEApi.instance().registries().cell().isCellHandled( i ); case WORKBENCH_CELL: return i.getItem() instanceof ICellWorkbenchItem && ( (ICellWorkbenchItem) i.getItem() ).isEditable( i ); case STORAGE_COMPONENT: return i.getItem() instanceof IStorageComponent && ( (IStorageComponent) i.getItem() ).isStorageComponent( i ); case TRASH: - if( Api.INSTANCE.registries().cell().isCellHandled( i ) ) + if( AEApi.instance().registries().cell().isCellHandled( i ) ) { return false; } return !( i.getItem() instanceof IStorageComponent && ( (IStorageComponent) i.getItem() ).isStorageComponent( i ) ); case ENCODABLE_ITEM: - return i.getItem() instanceof INetworkEncodable || Api.INSTANCE.registries().wireless().isWirelessTerminal( i ); + return i.getItem() instanceof INetworkEncodable || AEApi.instance().registries().wireless().isWirelessTerminal( i ); case BIOMETRIC_CARD: return i.getItem() instanceof IBiometricCard; case UPGRADES: diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index b137fa965..1db19aba0 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -23,6 +23,7 @@ import java.io.File; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; +import appeng.api.AEApi; import appeng.block.paint.PaintSplotchesModel; import appeng.block.qnb.QnbFormedModel; import appeng.bootstrap.components.IClientSetupComponent; @@ -178,6 +179,7 @@ public final class AppEng // FIXME RenderingRegistry.registerEntityRenderingHandler( EntityTinyTNTPrimed.class, manager -> new RenderTinyTNTPrimed( manager ) ); // FIXME RenderingRegistry.registerEntityRenderingHandler( EntityFloatingItem.class, manager -> new RenderFloatingItem( manager ) ); + // TODO: Do not use the internal API final ApiDefinitions definitions = Api.INSTANCE.definitions(); definitions.getRegistry().getBootstrapComponents( IClientSetupComponent.class ).forEachRemaining(IClientSetupComponent::setup); @@ -265,7 +267,7 @@ public final class AppEng // // // Instantiate all Plugins // List injectables = Lists.newArrayList( -// Api.INSTANCE ); +// AEApi.instance() ); // new PluginLoader().loadPlugins( injectables, event.getAsmData() ); // } diff --git a/src/main/java/appeng/core/CreativeTab.java b/src/main/java/appeng/core/CreativeTab.java index 30cb60e0a..46af35e9c 100644 --- a/src/main/java/appeng/core/CreativeTab.java +++ b/src/main/java/appeng/core/CreativeTab.java @@ -49,7 +49,7 @@ public final class CreativeTab private ItemStack getIconItemStack() { - final IDefinitions definitions = Api.INSTANCE.definitions(); + final IDefinitions definitions = AEApi.instance().definitions(); final IBlocks blocks = definitions.blocks(); final IItems items = definitions.items(); final IMaterials materials = definitions.materials(); diff --git a/src/main/java/appeng/core/CreativeTabFacade.java b/src/main/java/appeng/core/CreativeTabFacade.java index 92d1f49be..25d383695 100644 --- a/src/main/java/appeng/core/CreativeTabFacade.java +++ b/src/main/java/appeng/core/CreativeTabFacade.java @@ -41,7 +41,7 @@ public final class CreativeTabFacade public ItemStack createIcon() { - // FIXME final Optional maybeFacade = Api.INSTANCE.definitions().items().facade().maybeItem(); + // FIXME final Optional maybeFacade = AEApi.instance().definitions().items().facade().maybeItem(); // FIXME if( maybeFacade.isPresent() ) { // FIXME return ( (ItemFacade) maybeFacade.get() ).getCreativeTabIcon(); diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index b218a115a..cf0023b9e 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -19,8 +19,10 @@ package appeng.core; +import appeng.api.AEApi; import appeng.api.config.Upgrades; import appeng.api.definitions.IBlocks; +import appeng.api.definitions.IDefinitions; import appeng.api.definitions.IItems; import appeng.api.definitions.IParts; import appeng.api.features.IRegistryContainer; @@ -133,7 +135,7 @@ final class Registration // { // Capabilities.register(); // -// final Api api = Api.INSTANCE; +// final Api api = AEApi.instance(); // final IRecipeHandlerRegistry recipeRegistry = api.registries().recipes(); // this.registerCraftHandlers( recipeRegistry ); // @@ -203,6 +205,7 @@ final class Registration public static void setupInternalRegistries() { + // TODO: Do not use the internal API final Api api = Api.INSTANCE; final IRegistryContainer registries = api.registries(); @@ -248,6 +251,7 @@ final class Registration ModelLoader.addSpecialModel(dependency); } + // TODO: Do not use the internal API final ApiDefinitions definitions = Api.INSTANCE.definitions(); final IModelRegistry registry = new IModelRegistry() { @Override @@ -269,6 +273,7 @@ final class Registration public void registerBlocks( RegistryEvent.Register event ) { final IForgeRegistry registry = event.getRegistry(); + // TODO: Do not use the internal API final ApiDefinitions definitions = Api.INSTANCE.definitions(); final Dist dist = FMLEnvironment.dist; definitions.getRegistry().getBootstrapComponents( IBlockRegistrationComponent.class ).forEachRemaining( b -> b.blockRegistration( dist, registry ) ); @@ -277,6 +282,7 @@ final class Registration public void registerItems( RegistryEvent.Register event ) { final IForgeRegistry registry = event.getRegistry(); + // TODO: Do not use the internal API final ApiDefinitions definitions = Api.INSTANCE.definitions(); final Dist dist = FMLEnvironment.dist; definitions.getRegistry().getBootstrapComponents( IItemRegistrationComponent.class ).forEachRemaining( b -> b.itemRegistration( dist, registry ) ); @@ -285,6 +291,7 @@ final class Registration public void registerTileEntities( RegistryEvent.Register> event ) { final IForgeRegistry> registry = event.getRegistry(); + // TODO: Do not use the internal API final ApiDefinitions definitions = Api.INSTANCE.definitions(); definitions.getRegistry().getBootstrapComponents( ITileEntityRegistrationComponent.class ).forEachRemaining(b -> b.register( registry ) ); } @@ -586,6 +593,7 @@ final class Registration { IForgeRegistry> r = event.getRegistry(); + // TODO: Do not use the internal API final ApiDefinitions definitions = Api.INSTANCE.definitions(); r.registerAll( @@ -605,6 +613,7 @@ final class Registration public void registerEntities( RegistryEvent.Register> event ) { final IForgeRegistry> registry = event.getRegistry(); + // TODO: Do not use the internal API final ApiDefinitions definitions = Api.INSTANCE.definitions(); definitions.getRegistry().getBootstrapComponents( IEntityRegistrationComponent.class ).forEachRemaining(b -> b.entityRegistration( registry ) ); } @@ -642,7 +651,8 @@ final class Registration // FIXME LATER public static void postInit() { - final IRegistryContainer registries = Api.INSTANCE.registries(); + final IRegistryContainer registries = AEApi.instance().registries(); + // TODO: Do not use the internal API ApiDefinitions definitions = Api.INSTANCE.definitions(); final IParts parts = definitions.parts(); final IBlocks blocks = definitions.blocks(); @@ -882,12 +892,14 @@ final class Registration @OnlyIn(Dist.CLIENT) public void registerItemColors(ColorHandlerEvent.Item event) { + // TODO: Do not use the internal API final ApiDefinitions definitions = Api.INSTANCE.definitions(); definitions.getRegistry().getBootstrapComponents( IItemColorRegistrationComponent.class ).forEachRemaining(c -> c.register(event.getItemColors(), event.getBlockColors())); } @OnlyIn(Dist.CLIENT) public void handleModelBake(ModelBakeEvent event) { + // TODO: Do not use the internal API final ApiDefinitions definitions = Api.INSTANCE.definitions(); definitions.getRegistry().getBootstrapComponents( IModelBakeComponent.class ).forEachRemaining(c -> c.onModelBakeEvent(event)); } diff --git a/src/main/java/appeng/core/features/TileDefinition.java b/src/main/java/appeng/core/features/TileDefinition.java index 4922ed4eb..f717d33ad 100644 --- a/src/main/java/appeng/core/features/TileDefinition.java +++ b/src/main/java/appeng/core/features/TileDefinition.java @@ -46,6 +46,10 @@ public final class TileDefinition extends BlockDefinition implements ITileDefini @Override public Optional> maybeEntity() { - return this.block.map( AEBaseTileBlock::getTileEntityClass ); + if (this.block.isPresent()) { + + } + + return this.block.map( block -> block.getTileEntityClass() ); } } diff --git a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java index a41e058cb..39467935a 100644 --- a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java +++ b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java @@ -36,6 +36,7 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.registries.ForgeRegistries; +import appeng.api.AEApi; import appeng.api.config.TunnelType; import appeng.api.definitions.IBlocks; import appeng.api.definitions.IDefinitions; @@ -44,7 +45,6 @@ import appeng.api.definitions.IParts; import appeng.api.features.IP2PTunnelRegistry; import appeng.api.util.AEColor; import appeng.capabilities.Capabilities; -import appeng.core.Api; public final class P2PTunnelRegistry implements IP2PTunnelRegistry @@ -58,7 +58,7 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry public void configure() { - final IDefinitions definitions = Api.INSTANCE.definitions(); + final IDefinitions definitions = AEApi.instance().definitions(); final IBlocks blocks = definitions.blocks(); final IParts parts = definitions.parts(); diff --git a/src/main/java/appeng/core/features/registries/WirelessRegistry.java b/src/main/java/appeng/core/features/registries/WirelessRegistry.java index 33acb839d..8d862b140 100644 --- a/src/main/java/appeng/core/features/registries/WirelessRegistry.java +++ b/src/main/java/appeng/core/features/registries/WirelessRegistry.java @@ -35,7 +35,6 @@ import appeng.api.AEApi; import appeng.api.features.ILocatable; import appeng.api.features.IWirelessTermHandler; import appeng.api.features.IWirelessTermRegistry; -import appeng.core.Api; import appeng.core.localization.PlayerMessages; import appeng.util.Platform; @@ -108,7 +107,7 @@ public final class WirelessRegistry implements IWirelessTermRegistry } final long parsedKey = Long.parseLong( unparsedKey ); - final ILocatable securityStation = Api.INSTANCE.registries().locatable().getLocatableBy( parsedKey ); + final ILocatable securityStation = AEApi.instance().registries().locatable().getLocatableBy( parsedKey ); if( securityStation == null ) { player.sendMessage( PlayerMessages.StationCanNotBeLocated.get() ); diff --git a/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java b/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java index f76f8aee8..b88304f33 100644 --- a/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java +++ b/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java @@ -19,7 +19,6 @@ import appeng.api.storage.IStorageChannel; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEStack; import appeng.api.util.AEPartLocation; -import appeng.core.Api; import appeng.util.Platform; @@ -29,7 +28,7 @@ public class BasicItemCellGuiHandler implements ICellGuiHandler @Override public > boolean isHandlerFor( final IStorageChannel channel ) { - return channel == Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ); + return channel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ); } @Override diff --git a/src/main/java/appeng/core/features/registries/cell/CreativeCellHandler.java b/src/main/java/appeng/core/features/registries/cell/CreativeCellHandler.java index a37633f10..4a9f3e81c 100644 --- a/src/main/java/appeng/core/features/registries/cell/CreativeCellHandler.java +++ b/src/main/java/appeng/core/features/registries/cell/CreativeCellHandler.java @@ -27,7 +27,6 @@ import appeng.api.storage.ICellInventoryHandler; import appeng.api.storage.ISaveProvider; import appeng.api.storage.IStorageChannel; import appeng.api.storage.channels.IItemStorageChannel; -import appeng.core.Api; import appeng.items.storage.ItemCreativeStorageCell; import appeng.me.storage.CreativeCellInventory; @@ -44,7 +43,7 @@ public final class CreativeCellHandler implements ICellHandler @Override public ICellInventoryHandler getCellInventory( final ItemStack is, final ISaveProvider container, final IStorageChannel channel ) { - if( channel == Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) && !is.isEmpty() && is + if( channel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) && !is.isEmpty() && is .getItem() instanceof ItemCreativeStorageCell ) { return CreativeCellInventory.getCell( is ); diff --git a/src/main/java/appeng/core/sync/GuiBridge.java b/src/main/java/appeng/core/sync/GuiBridge.java index 8a3998889..07c57e126 100644 --- a/src/main/java/appeng/core/sync/GuiBridge.java +++ b/src/main/java/appeng/core/sync/GuiBridge.java @@ -28,6 +28,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import appeng.api.AEApi; import appeng.api.config.SecurityPermissions; import appeng.api.exceptions.AppEngException; import appeng.api.features.IWirelessTermHandler; @@ -82,7 +83,6 @@ import appeng.container.implementations.ContainerUpgradeable; import appeng.container.implementations.ContainerVibrationChamber; import appeng.container.implementations.ContainerWireless; import appeng.container.implementations.ContainerWirelessTerm; -import appeng.core.Api; import appeng.fluids.container.ContainerFluidFormationPlane; import appeng.fluids.container.ContainerFluidIO; import appeng.fluids.container.ContainerFluidInterface; @@ -314,7 +314,7 @@ public enum GuiBridge return ( (IGuiItem) it.getItem() ).getGuiObject( it, w, new BlockPos( x, y, z ) ); } - final IWirelessTermHandler wh = Api.INSTANCE.registries().wireless().getWirelessTerminalHandler( it ); + final IWirelessTermHandler wh = AEApi.instance().registries().wireless().getWirelessTerminalHandler( it ); if( wh != null ) { return new WirelessTerminalGuiObject( wh, it, player, w, x, y, z ); diff --git a/src/main/java/appeng/core/sync/packets/PacketClick.java b/src/main/java/appeng/core/sync/packets/PacketClick.java index a39a785c0..0587ae6b9 100644 --- a/src/main/java/appeng/core/sync/packets/PacketClick.java +++ b/src/main/java/appeng/core/sync/packets/PacketClick.java @@ -32,11 +32,11 @@ import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; +import appeng.api.AEApi; import appeng.api.definitions.IComparableDefinition; import appeng.api.definitions.IItems; import appeng.api.implementations.items.IMemoryCard; import appeng.api.implementations.items.MemoryCardMessages; -import appeng.core.Api; import appeng.core.sync.AppEngPacket; import appeng.core.sync.network.INetworkInfo; import net.minecraft.util.math.Vec3d; @@ -112,7 +112,7 @@ public class PacketClick extends AppEngPacket public void serverPacketData( final INetworkInfo manager, final PlayerEntity player ) { final ItemStack is = player.inventory.getCurrentItem(); - final IItems items = Api.INSTANCE.definitions().items(); + final IItems items = AEApi.instance().definitions().items(); final IComparableDefinition maybeMemoryCard = items.memoryCard(); final IComparableDefinition maybeColorApplicator = items.colorApplicator(); final BlockPos pos = new BlockPos( this.x, this.y, this.z ); diff --git a/src/main/java/appeng/core/sync/packets/PacketJEIRecipe.java b/src/main/java/appeng/core/sync/packets/PacketJEIRecipe.java index c65ac8adf..f376cba31 100644 --- a/src/main/java/appeng/core/sync/packets/PacketJEIRecipe.java +++ b/src/main/java/appeng/core/sync/packets/PacketJEIRecipe.java @@ -32,6 +32,7 @@ import net.minecraft.nbt.ListNBT; import net.minecraft.network.PacketBuffer; import net.minecraftforge.items.IItemHandler; +import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.SecurityPermissions; import appeng.api.networking.IGrid; @@ -43,7 +44,6 @@ import appeng.api.networking.storage.IStorageGrid; import appeng.api.storage.IMEMonitor; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; -import appeng.core.Api; import appeng.core.sync.AppEngPacket; import appeng.core.sync.network.INetworkInfo; import appeng.helpers.IContainerCraftingPacket; @@ -128,7 +128,7 @@ public class PacketJEIRecipe extends AppEngPacket if( inv != null && this.recipe != null && security != null ) { - final IMEMonitor storage = inv.getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ); + final IMEMonitor storage = inv.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); final IPartitionList filter = ItemViewCell.createFilter( cct.getViewCells() ); for( int x = 0; x < craftMatrix.getSlots(); x++ ) diff --git a/src/main/java/appeng/core/sync/packets/PacketPatternSlot.java b/src/main/java/appeng/core/sync/packets/PacketPatternSlot.java index 1f5ceeaf4..b9c42ee13 100644 --- a/src/main/java/appeng/core/sync/packets/PacketPatternSlot.java +++ b/src/main/java/appeng/core/sync/packets/PacketPatternSlot.java @@ -28,10 +28,10 @@ import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.network.PacketBuffer; import net.minecraftforge.items.IItemHandler; +import appeng.api.AEApi; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.container.implementations.ContainerPatternTerm; -import appeng.core.Api; import appeng.core.sync.AppEngPacket; import appeng.core.sync.network.INetworkInfo; import appeng.util.item.AEItemStack; @@ -87,7 +87,7 @@ public class PacketPatternSlot extends AppEngPacket this.writeItem( slotItem, data ); for( int x = 0; x < 9; x++ ) { - this.pattern[x] = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createStack( pat.getStackInSlot( x ) ); + this.pattern[x] = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( pat.getStackInSlot( x ) ); this.writeItem( this.pattern[x], data ); } diff --git a/src/main/java/appeng/crafting/CraftingJob.java b/src/main/java/appeng/crafting/CraftingJob.java index 1641d3060..abe751200 100644 --- a/src/main/java/appeng/crafting/CraftingJob.java +++ b/src/main/java/appeng/crafting/CraftingJob.java @@ -45,7 +45,6 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.api.util.DimensionalCoord; import appeng.core.AELog; -import appeng.core.Api; import appeng.hooks.TickHandler; @@ -56,8 +55,8 @@ public class CraftingJob implements Runnable, ICraftingJob private final MECraftingInventory original; private final World world; - private final IItemList crafting = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); - private final IItemList missing = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + private final IItemList crafting = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); + private final IItemList missing = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); private final HashMap opsAndMultiplier = new HashMap<>(); private final Object monitor = new Object(); private final Stopwatch watch = Stopwatch.createUnstarted(); @@ -88,7 +87,7 @@ public class CraftingJob implements Runnable, ICraftingJob final ICraftingGrid cc = grid.getCache( ICraftingGrid.class ); final IStorageGrid sg = grid.getCache( IStorageGrid.class ); this.original = new MECraftingInventory( sg - .getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ), actionSrc, false, false, false ); + .getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ), actionSrc, false, false, false ); this.setTree( this.getCraftingTree( cc, what ) ); this.availableCheck = null; diff --git a/src/main/java/appeng/crafting/CraftingTreeNode.java b/src/main/java/appeng/crafting/CraftingTreeNode.java index 3faabab92..f62391378 100644 --- a/src/main/java/appeng/crafting/CraftingTreeNode.java +++ b/src/main/java/appeng/crafting/CraftingTreeNode.java @@ -36,7 +36,6 @@ import appeng.api.networking.security.IActionSource; 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.cluster.implementations.CraftingCPUCluster; @@ -46,7 +45,7 @@ public class CraftingTreeNode // what slot! private final int slot; private final CraftingJob job; - private final IItemList used = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + private final IItemList used = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); // parent node. private final CraftingTreeProcess parent; private final World world; diff --git a/src/main/java/appeng/crafting/CraftingTreeProcess.java b/src/main/java/appeng/crafting/CraftingTreeProcess.java index 8bbbe6dc6..704f27e9f 100644 --- a/src/main/java/appeng/crafting/CraftingTreeProcess.java +++ b/src/main/java/appeng/crafting/CraftingTreeProcess.java @@ -38,7 +38,6 @@ import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.container.ContainerNull; -import appeng.core.Api; import appeng.me.cluster.implementations.CraftingCPUCluster; import appeng.util.Platform; @@ -209,7 +208,7 @@ public class CraftingTreeProcess ItemStack is = ic.getStackInSlot( x ); is = Platform.getContainerItem( is ); - final IAEItemStack o = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createStack( is ); + final IAEItemStack o = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( is ); if( o != null ) { this.bytes++; @@ -228,7 +227,7 @@ public class CraftingTreeProcess if( this.containerItems ) { final ItemStack is = Platform.getContainerItem( stack.createItemStack() ); - final IAEItemStack o = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createStack( is ); + final IAEItemStack o = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( is ); if( o != null ) { this.bytes++; diff --git a/src/main/java/appeng/crafting/MECraftingInventory.java b/src/main/java/appeng/crafting/MECraftingInventory.java index be3a4a6f1..06c83c038 100644 --- a/src/main/java/appeng/crafting/MECraftingInventory.java +++ b/src/main/java/appeng/crafting/MECraftingInventory.java @@ -28,7 +28,6 @@ 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.inv.ItemListIgnoreCrafting; @@ -51,7 +50,7 @@ public class MECraftingInventory implements IMEInventory public MECraftingInventory() { - this.localCache = new ItemListIgnoreCrafting<>( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList() ); + this.localCache = new ItemListIgnoreCrafting<>( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() ); this.extractedCache = null; this.injectedCache = null; this.missingCache = null; @@ -71,7 +70,7 @@ public class MECraftingInventory implements IMEInventory if( this.logMissing ) { - this.missingCache = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + this.missingCache = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); } else { @@ -80,7 +79,7 @@ public class MECraftingInventory implements IMEInventory if( this.logExtracted ) { - this.extractedCache = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + this.extractedCache = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); } else { @@ -89,7 +88,7 @@ public class MECraftingInventory implements IMEInventory if( this.logInjections ) { - this.injectedCache = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + this.injectedCache = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); } else { @@ -97,7 +96,7 @@ public class MECraftingInventory implements IMEInventory } this.localCache = this.target - .getAvailableItems( new ItemListIgnoreCrafting<>( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList() ) ); + .getAvailableItems( new ItemListIgnoreCrafting<>( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() ) ); this.par = parent; } @@ -111,7 +110,7 @@ public class MECraftingInventory implements IMEInventory if( logMissing ) { - this.missingCache = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + this.missingCache = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); } else { @@ -120,7 +119,7 @@ public class MECraftingInventory implements IMEInventory if( logExtracted ) { - this.extractedCache = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + this.extractedCache = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); } else { @@ -129,14 +128,14 @@ public class MECraftingInventory implements IMEInventory if( logInjections ) { - this.injectedCache = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + this.injectedCache = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); } else { this.injectedCache = null; } - this.localCache = new ItemListIgnoreCrafting<>( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList() ); + this.localCache = new ItemListIgnoreCrafting<>( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() ); for( final IAEItemStack is : target.getStorageList() ) { this.localCache.add( target.extractItems( is, Actionable.SIMULATE, src ) ); @@ -154,7 +153,7 @@ public class MECraftingInventory implements IMEInventory if( logMissing ) { - this.missingCache = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + this.missingCache = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); } else { @@ -163,7 +162,7 @@ public class MECraftingInventory implements IMEInventory if( logExtracted ) { - this.extractedCache = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + this.extractedCache = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); } else { @@ -172,14 +171,14 @@ public class MECraftingInventory implements IMEInventory if( logInjections ) { - this.injectedCache = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + this.injectedCache = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); } else { this.injectedCache = null; } - this.localCache = target.getAvailableItems( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList() ); + this.localCache = target.getAvailableItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() ); this.par = null; } @@ -260,7 +259,7 @@ public class MECraftingInventory implements IMEInventory @Override public IStorageChannel getChannel() { - return Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ); + return AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ); } public IItemList getItemList() @@ -270,8 +269,8 @@ public class MECraftingInventory implements IMEInventory public boolean commit( final IActionSource src ) { - final IItemList added = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); - final IItemList pulled = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + final IItemList added = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); + final IItemList pulled = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); boolean failed = false; if( this.logInjections ) diff --git a/src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java b/src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java index 5abd1c44d..5fada1490 100644 --- a/src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java +++ b/src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java @@ -42,7 +42,7 @@ public class BlockChargedQuartzOre extends BlockQuartzOre // @Override // public Item getItemDropped( final BlockState state, final Random rand, final int fortune ) // { -// return Api.INSTANCE +// return AEApi.instance() // .definitions() // .materials() // .certusQuartzCrystalCharged() @@ -53,7 +53,7 @@ public class BlockChargedQuartzOre extends BlockQuartzOre // @Override // public int damageDropped( final BlockState state ) // { -// return Api.INSTANCE +// return AEApi.instance() // .definitions() // .materials() // .certusQuartzCrystalCharged() @@ -65,7 +65,7 @@ public class BlockChargedQuartzOre extends BlockQuartzOre // @Override // public ItemStack getPickBlock( BlockState state, RayTraceResult target, World world, BlockPos pos, PlayerEntity player ) // { -// return Api.INSTANCE +// return AEApi.instance() // .definitions() // .blocks() // .quartzOreCharged() diff --git a/src/main/java/appeng/decorative/solid/BlockQuartzOre.java b/src/main/java/appeng/decorative/solid/BlockQuartzOre.java index b6a55c8e9..dd4e537b9 100644 --- a/src/main/java/appeng/decorative/solid/BlockQuartzOre.java +++ b/src/main/java/appeng/decorative/solid/BlockQuartzOre.java @@ -74,7 +74,7 @@ public class BlockQuartzOre extends AEBaseBlock // @Override // public Item getItemDropped( final BlockState state, final Random rand, final int fortune ) // { -// return Api.INSTANCE +// return AEApi.instance() // .definitions() // .materials() // .certusQuartzCrystal() @@ -86,7 +86,7 @@ public class BlockQuartzOre extends AEBaseBlock // @Override // public int damageDropped( final BlockState state ) // { -// return Api.INSTANCE +// return AEApi.instance() // .definitions() // .materials() // .certusQuartzCrystal() diff --git a/src/main/java/appeng/entity/EntityChargedQuartz.java b/src/main/java/appeng/entity/EntityChargedQuartz.java index bfc6404bf..788633101 100644 --- a/src/main/java/appeng/entity/EntityChargedQuartz.java +++ b/src/main/java/appeng/entity/EntityChargedQuartz.java @@ -33,10 +33,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import appeng.api.AEApi; import appeng.api.definitions.IMaterials; import appeng.client.EffectType; import appeng.core.AEConfig; -import appeng.core.Api; import appeng.core.AppEng; import appeng.api.features.AEFeature; import appeng.util.Platform; @@ -102,7 +102,7 @@ public final class EntityChargedQuartz extends AEBaseEntityItem private boolean transform() { final ItemStack item = this.getItem(); - final IMaterials materials = Api.INSTANCE.definitions().materials(); + final IMaterials materials = AEApi.instance().definitions().materials(); if( materials.certusQuartzCrystalCharged().isSameAs( item ) ) { diff --git a/src/main/java/appeng/entity/EntitySingularity.java b/src/main/java/appeng/entity/EntitySingularity.java index 2ce6e067e..2978afec8 100644 --- a/src/main/java/appeng/entity/EntitySingularity.java +++ b/src/main/java/appeng/entity/EntitySingularity.java @@ -31,9 +31,9 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; +import appeng.api.AEApi; import appeng.api.definitions.IMaterials; import appeng.core.AEConfig; -import appeng.core.Api; import appeng.api.features.AEFeature; import appeng.helpers.Reflected; import appeng.util.Platform; @@ -80,7 +80,7 @@ public final class EntitySingularity extends AEBaseEntityItem final ItemStack item = this.getItem(); - final IMaterials materials = Api.INSTANCE.definitions().materials(); + final IMaterials materials = AEApi.instance().definitions().materials(); if( materials.singularity().isSameAs( item ) ) { diff --git a/src/main/java/appeng/entity/EntityTinyTNTPrimed.java b/src/main/java/appeng/entity/EntityTinyTNTPrimed.java index 292a0d76a..f382c500c 100644 --- a/src/main/java/appeng/entity/EntityTinyTNTPrimed.java +++ b/src/main/java/appeng/entity/EntityTinyTNTPrimed.java @@ -43,8 +43,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; import appeng.core.AEConfig; -import appeng.core.Api; import appeng.core.AppEng; +import appeng.api.AEApi; import appeng.api.features.AEFeature; import appeng.core.sync.packets.PacketMockExplosion; import appeng.helpers.Reflected; @@ -87,7 +87,7 @@ public final class EntityTinyTNTPrimed extends TNTEntity implements IEntityAddit if( this.isInWater() && Platform.isServer() ) // put out the fuse. { - Api.INSTANCE.definitions().blocks().tinyTNT().maybeStack( 1 ).ifPresent( tntStack -> + AEApi.instance().definitions().blocks().tinyTNT().maybeStack( 1 ).ifPresent( tntStack -> { final ItemEntity item = new ItemEntity( this.world, this.getPosX(), this.getPosY(), this.getPosZ(), tntStack ); diff --git a/src/main/java/appeng/facade/FacadeContainer.java b/src/main/java/appeng/facade/FacadeContainer.java index 1e45ded54..234c306da 100644 --- a/src/main/java/appeng/facade/FacadeContainer.java +++ b/src/main/java/appeng/facade/FacadeContainer.java @@ -26,11 +26,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.PacketBuffer; +import appeng.api.AEApi; import appeng.api.parts.IFacadeContainer; import appeng.api.parts.IFacadePart; import appeng.api.parts.IPartHost; import appeng.api.util.AEPartLocation; -import appeng.core.Api; import appeng.items.parts.ItemFacade; import appeng.parts.CableBusStorage; @@ -128,7 +128,7 @@ public class FacadeContainer implements IFacadeContainer { final int id = Math.abs( out.readInt() ); - Optional maybeFacadeItem = Api.INSTANCE.definitions().items().facade().maybeItem(); + Optional maybeFacadeItem = AEApi.instance().definitions().items().facade().maybeItem(); if( maybeFacadeItem.isPresent() ) { final ItemFacade ifa = (ItemFacade) maybeFacadeItem.get(); diff --git a/src/main/java/appeng/facade/FacadePart.java b/src/main/java/appeng/facade/FacadePart.java index 643afd66e..fbce6decf 100644 --- a/src/main/java/appeng/facade/FacadePart.java +++ b/src/main/java/appeng/facade/FacadePart.java @@ -32,7 +32,6 @@ import appeng.api.parts.IBoxProvider; import appeng.api.parts.IFacadePart; import appeng.api.parts.IPartCollisionHelper; import appeng.api.util.AEPartLocation; -import appeng.core.Api; public class FacadePart implements IFacadePart, IBoxProvider @@ -104,7 +103,7 @@ public class FacadePart implements IFacadePart, IBoxProvider @Override public boolean isTransparent() { - if( Api.INSTANCE.partHelper().getCableRenderMode().transparentFacades ) + if( AEApi.instance().partHelper().getCableRenderMode().transparentFacades ) { return true; } diff --git a/src/main/java/appeng/fluids/container/ContainerFluidStorageBus.java b/src/main/java/appeng/fluids/container/ContainerFluidStorageBus.java index 89df4cbf5..7e2145c02 100644 --- a/src/main/java/appeng/fluids/container/ContainerFluidStorageBus.java +++ b/src/main/java/appeng/fluids/container/ContainerFluidStorageBus.java @@ -29,6 +29,7 @@ import net.minecraft.inventory.container.ContainerType; import net.minecraft.network.PacketBuffer; import net.minecraftforge.items.IItemHandler; +import appeng.api.AEApi; import appeng.api.config.AccessRestriction; import appeng.api.config.FuzzyMode; import appeng.api.config.SecurityPermissions; @@ -41,7 +42,6 @@ import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IItemList; import appeng.container.guisync.GuiSync; import appeng.container.slot.SlotRestrictedInput; -import appeng.core.Api; import appeng.fluids.parts.PartFluidStorageBus; import appeng.fluids.util.IAEFluidTank; import appeng.util.Platform; @@ -182,7 +182,7 @@ public class ContainerFluidStorageBus extends ContainerFluidConfigurable if( cellInv != null ) { final IItemList list = cellInv - .getAvailableItems( Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ).createList() ); + .getAvailableItems( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList() ); i = list.iterator(); } diff --git a/src/main/java/appeng/fluids/container/ContainerFluidTerminal.java b/src/main/java/appeng/fluids/container/ContainerFluidTerminal.java index 4de5ce564..e62747a89 100644 --- a/src/main/java/appeng/fluids/container/ContainerFluidTerminal.java +++ b/src/main/java/appeng/fluids/container/ContainerFluidTerminal.java @@ -23,6 +23,7 @@ import java.io.IOException; import java.nio.BufferOverflowException; import javax.annotation.Nonnull; +import appeng.api.AEApi; import appeng.api.config.*; import appeng.container.ContainerLocator; import appeng.container.helper.PartContainerHelper; @@ -61,7 +62,6 @@ import appeng.api.util.IConfigurableObject; import appeng.container.AEBaseContainer; import appeng.container.guisync.GuiSync; import appeng.core.AELog; -import appeng.core.Api; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketMEFluidInventoryUpdate; import appeng.core.sync.packets.PacketTargetFluidStack; @@ -97,7 +97,7 @@ public class ContainerFluidTerminal extends AEBaseContainer implements IConfigMa private final IConfigManager clientCM; private final IMEMonitor monitor; - private final IItemList fluids = Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ).createList(); + private final IItemList fluids = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList(); @GuiSync( 99 ) public boolean hasPower = false; private ITerminalHost terminal; @@ -118,7 +118,7 @@ public class ContainerFluidTerminal extends AEBaseContainer implements IConfigMa if( Platform.isServer() ) { this.serverCM = terminal.getConfigManager(); - this.monitor = terminal.getInventory( Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ) ); + this.monitor = terminal.getInventory( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) ); if( this.monitor != null ) { @@ -281,7 +281,7 @@ public class ContainerFluidTerminal extends AEBaseContainer implements IConfigMa { if( Platform.isServer() ) { - if( this.monitor != this.terminal.getInventory( Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ) ) ) + if( this.monitor != this.terminal.getInventory( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) ) ) { this.setValidContainer( false ); } diff --git a/src/main/java/appeng/fluids/helper/DualityFluidInterface.java b/src/main/java/appeng/fluids/helper/DualityFluidInterface.java index 006d98d6e..8d514c5d5 100644 --- a/src/main/java/appeng/fluids/helper/DualityFluidInterface.java +++ b/src/main/java/appeng/fluids/helper/DualityFluidInterface.java @@ -60,7 +60,6 @@ import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.api.util.IConfigManager; import appeng.capabilities.Capabilities; -import appeng.core.Api; import appeng.core.settings.TickRates; import appeng.fluids.util.AEFluidInventory; import appeng.fluids.util.IAEFluidInventory; @@ -94,10 +93,10 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable private int isWorking = -1; private int priority; - private final MEMonitorPassThrough items = new MEMonitorPassThrough<>( new NullInventory(), Api.INSTANCE + private final MEMonitorPassThrough items = new MEMonitorPassThrough<>( new NullInventory(), AEApi.instance() .storage() .getStorageChannel( IItemStorageChannel.class ) ); - private final MEMonitorPassThrough fluids = new MEMonitorPassThrough<>( new NullInventory(), Api.INSTANCE + private final MEMonitorPassThrough fluids = new MEMonitorPassThrough<>( new NullInventory(), AEApi.instance() .storage() .getStorageChannel( IFluidStorageChannel.class ) ); @@ -136,7 +135,7 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable @Override public > IMEMonitor getInventory( IStorageChannel channel ) { - if( channel == Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ) + if( channel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) { if( this.hasConfig() ) { @@ -145,7 +144,7 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable return (IMEMonitor) this.items; } - else if( channel == Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ) ) + else if( channel == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) ) { if( this.hasConfig() ) { @@ -211,8 +210,8 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable { try { - this.items.setInternal( this.gridProxy.getStorage().getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ) ); - this.fluids.setInternal( this.gridProxy.getStorage().getInventory( Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ) ) ); + this.items.setInternal( this.gridProxy.getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) ); + this.fluids.setInternal( this.gridProxy.getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) ) ); } catch( final GridAccessException gae ) { @@ -371,7 +370,7 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable try { final IMEInventory dest = this.gridProxy.getStorage() - .getInventory( Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ) ); + .getInventory( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) ); final IEnergySource src = this.gridProxy.getEnergy(); if( work.getStackSize() > 0 ) diff --git a/src/main/java/appeng/fluids/helper/FluidCellConfig.java b/src/main/java/appeng/fluids/helper/FluidCellConfig.java index e61c0cc27..220825af4 100644 --- a/src/main/java/appeng/fluids/helper/FluidCellConfig.java +++ b/src/main/java/appeng/fluids/helper/FluidCellConfig.java @@ -28,7 +28,7 @@ import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; -import appeng.core.Api; +import appeng.api.AEApi; import appeng.fluids.items.FluidDummyItem; import appeng.items.contents.CellConfig; @@ -54,14 +54,14 @@ public class FluidCellConfig extends CellConfig super.insertItem( slot, stack, simulate ); } LazyOptional fluidOpt = FluidUtil.getFluidContained( stack ); - if( !fluidOpt.isPresent() || !Api.INSTANCE.definitions().items().dummyFluidItem().maybeStack( 1 ).isPresent() ) + if( !fluidOpt.isPresent() || !AEApi.instance().definitions().items().dummyFluidItem().maybeStack( 1 ).isPresent() ) { return stack; } FluidStack fluid = fluidOpt.orElse( null ); fluid.setAmount( FluidAttributes.BUCKET_VOLUME ); - ItemStack is = Api.INSTANCE.definitions().items().dummyFluidItem().maybeStack( 1 ).get(); + ItemStack is = AEApi.instance().definitions().items().dummyFluidItem().maybeStack( 1 ).get(); FluidDummyItem item = (FluidDummyItem) is.getItem(); item.setFluidStack( is, fluid ); return super.insertItem( slot, is, simulate ); @@ -75,14 +75,14 @@ public class FluidCellConfig extends CellConfig super.setStackInSlot( slot, stack ); } LazyOptional fluidOpt = FluidUtil.getFluidContained( stack ); - if( !fluidOpt.isPresent() || !Api.INSTANCE.definitions().items().dummyFluidItem().maybeStack( 1 ).isPresent() ) + if( !fluidOpt.isPresent() || !AEApi.instance().definitions().items().dummyFluidItem().maybeStack( 1 ).isPresent() ) { return; } FluidStack fluid = fluidOpt.orElse( null ); fluid.setAmount( FluidAttributes.BUCKET_VOLUME ); - ItemStack is = Api.INSTANCE.definitions().items().dummyFluidItem().maybeStack( 1 ).get(); + ItemStack is = AEApi.instance().definitions().items().dummyFluidItem().maybeStack( 1 ).get(); FluidDummyItem item = (FluidDummyItem) is.getItem(); item.setFluidStack( is, fluid ); super.setStackInSlot( slot, is ); @@ -96,14 +96,14 @@ public class FluidCellConfig extends CellConfig super.isItemValid( slot, stack ); } LazyOptional fluidOpt = FluidUtil.getFluidContained( stack ); - if( !fluidOpt.isPresent() || !Api.INSTANCE.definitions().items().dummyFluidItem().maybeStack( 1 ).isPresent() ) + if( !fluidOpt.isPresent() || !AEApi.instance().definitions().items().dummyFluidItem().maybeStack( 1 ).isPresent() ) { return false; } FluidStack fluid = fluidOpt.orElse( null ); fluid.setAmount( FluidAttributes.BUCKET_VOLUME ); - ItemStack is = Api.INSTANCE.definitions().items().dummyFluidItem().maybeStack( 1 ).get(); + ItemStack is = AEApi.instance().definitions().items().dummyFluidItem().maybeStack( 1 ).get(); FluidDummyItem item = (FluidDummyItem) is.getItem(); item.setFluidStack( is, fluid ); return super.isItemValid( slot, is ); diff --git a/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java b/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java index 17a06f077..2575454cd 100644 --- a/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java +++ b/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java @@ -27,7 +27,6 @@ import appeng.api.AEApi; import appeng.api.storage.IStorageChannel; import appeng.api.storage.channels.IFluidStorageChannel; import appeng.api.storage.data.IAEFluidStack; -import appeng.core.Api; import appeng.fluids.helper.FluidCellConfig; import appeng.items.materials.MaterialType; import appeng.items.storage.AbstractStorageCell; @@ -88,7 +87,7 @@ public final class BasicFluidStorageCell extends AbstractStorageCell getChannel() { - return Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ); + return AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ); } @Override @@ -106,7 +105,7 @@ public final class BasicFluidStorageCell extends AbstractStorageCell + AEApi.instance().definitions().materials().emptyStorageCell().maybeStack( 1 ).ifPresent( is -> { final ItemStack extraA = ia.addItems( is ); if( !extraA.isEmpty() ) diff --git a/src/main/java/appeng/fluids/parts/FluidHandlerAdapter.java b/src/main/java/appeng/fluids/parts/FluidHandlerAdapter.java index faf40a5ad..ebe96c45d 100644 --- a/src/main/java/appeng/fluids/parts/FluidHandlerAdapter.java +++ b/src/main/java/appeng/fluids/parts/FluidHandlerAdapter.java @@ -29,6 +29,7 @@ import java.util.Map; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidHandler; +import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.networking.security.IActionSource; import appeng.api.networking.storage.IBaseMonitor; @@ -39,7 +40,6 @@ 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; import appeng.fluids.util.AEFluidStack; import appeng.me.GridAccessException; import appeng.me.helpers.IGridProxyable; @@ -150,7 +150,7 @@ public class FluidHandlerAdapter implements IMEInventory, IBaseMo @Override public IStorageChannel getChannel() { - return Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ); + return AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ); } @Override diff --git a/src/main/java/appeng/fluids/parts/PartFluidAnnihilationPlane.java b/src/main/java/appeng/fluids/parts/PartFluidAnnihilationPlane.java index 4e43a7472..2062722a6 100644 --- a/src/main/java/appeng/fluids/parts/PartFluidAnnihilationPlane.java +++ b/src/main/java/appeng/fluids/parts/PartFluidAnnihilationPlane.java @@ -4,7 +4,6 @@ package appeng.fluids.parts; import java.util.List; -import appeng.core.Api; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -306,7 +305,7 @@ public class PartFluidAnnihilationPlane extends PartBasicState implements IGridT try { final IStorageGrid storage = this.getProxy().getStorage(); - final IMEInventory inv = storage.getInventory( Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ) ); + final IMEInventory inv = storage.getInventory( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) ); if( modulate ) { diff --git a/src/main/java/appeng/fluids/parts/PartFluidFormationPlane.java b/src/main/java/appeng/fluids/parts/PartFluidFormationPlane.java index c81a572f5..bd2e64c7a 100644 --- a/src/main/java/appeng/fluids/parts/PartFluidFormationPlane.java +++ b/src/main/java/appeng/fluids/parts/PartFluidFormationPlane.java @@ -45,7 +45,6 @@ import appeng.api.storage.channels.IFluidStorageChannel; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IItemList; import appeng.api.util.AEPartLocation; -import appeng.core.Api; import appeng.fluids.util.AEFluidInventory; import appeng.fluids.util.IAEFluidInventory; @@ -69,7 +68,7 @@ public class PartFluidFormationPlane extends PartAbstractFormationPlane myHandler = new MEInventoryHandler<>( this, Api.INSTANCE + private final MEInventoryHandler myHandler = new MEInventoryHandler<>( this, AEApi.instance() .storage() .getStorageChannel( IFluidStorageChannel.class ) ); private final AEFluidInventory config = new AEFluidInventory( this, 63 ); @@ -87,7 +86,7 @@ public class PartFluidFormationPlane extends PartAbstractFormationPlane 0 ? IncludeExclude.BLACKLIST : IncludeExclude.WHITELIST ); this.myHandler.setPriority( this.getPriority() ); - final IItemList priorityList = Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ).createList(); + final IItemList priorityList = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList(); final int slotsToUse = 18 + this.getInstalledUpgrades( Upgrades.CAPACITY ) * 9; for( int x = 0; x < this.config.getSlots() && x < slotsToUse; x++ ) @@ -202,13 +201,13 @@ public class PartFluidFormationPlane extends PartAbstractFormationPlane getChannel() { - return Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ); + return AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ); } @Override public List getCellArray( final IStorageChannel channel ) { - if( this.getProxy().isActive() && channel == Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ) ) + if( this.getProxy().isActive() && channel == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) ) { final List handler = new ArrayList<>( 1 ); handler.add( this.myHandler ); @@ -231,7 +230,7 @@ public class PartFluidFormationPlane extends PartAbstractFormationPlane o, IAEStack fullStack, IAEStack diffStack, IActionSource src, IStorageChannel chan ) { - if( chan == Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ) && fullStack.equals( this.config.getFluidInSlot( 0 ) ) ) + if( chan == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) && fullStack.equals( this.config.getFluidInSlot( 0 ) ) ) { this.lastReportedValue = fullStack.getStackSize(); this.updateState(); @@ -183,7 +182,7 @@ public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatc { try { - final IStorageChannel channel = Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ); + final IStorageChannel channel = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ); final IMEMonitor inventory = this.getProxy().getStorage().getInventory( channel ); this.updateReportingValue( inventory ); @@ -209,7 +208,7 @@ public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatc private void configureWatchers() { - final IFluidStorageChannel channel = Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ); + final IFluidStorageChannel channel = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ); if( this.stackWatcher != null ) { diff --git a/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java b/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java index a177ce955..88c3d775d 100644 --- a/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java +++ b/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java @@ -41,6 +41,7 @@ import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; +import appeng.api.AEApi; import appeng.api.config.AccessRestriction; import appeng.api.config.FuzzyMode; import appeng.api.config.IncludeExclude; @@ -67,7 +68,6 @@ import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IItemList; import appeng.api.util.AEPartLocation; import appeng.capabilities.Capabilities; -import appeng.core.Api; import appeng.core.AppEng; import appeng.core.settings.TickRates; @@ -129,7 +129,7 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni IStorageMonitorable inventory = accessor.getInventory( this.source ); if( inventory != null ) { - return inventory.getInventory( Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ) ); + return inventory.getInventory( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) ); } // So this could / can be a design decision. If the tile does support our custom capability, @@ -172,7 +172,7 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni this.resetCacheLogic = 0; final IMEInventory in = this.getInternalHandler(); - IItemList before = Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ).createList(); + IItemList before = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList(); if( in != null ) { before = in.getAvailableItems( before ); @@ -188,7 +188,7 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni if( in != out ) { - IItemList after = Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ).createList(); + IItemList after = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList(); if( out != null ) { after = out.getAvailableItems( after ); @@ -270,7 +270,7 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni { if( this.getProxy().isActive() ) { - this.getProxy().getStorage().postAlterationOfStoredItems( Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ), change, this.source ); + this.getProxy().getStorage().postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ), change, this.source ); } } catch( final GridAccessException e ) @@ -314,13 +314,13 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni { this.checkInterfaceVsStorageBus( target, this.getSide().getOpposite() ); - this.handler = new MEInventoryHandler<>( inv, Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ) ); + this.handler = new MEInventoryHandler<>( inv, AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) ); this.handler.setBaseAccess( (AccessRestriction) this.getConfigManager().getSetting( Settings.ACCESS ) ); this.handler.setWhitelist( this.getInstalledUpgrades( Upgrades.INVERTER ) > 0 ? IncludeExclude.BLACKLIST : IncludeExclude.WHITELIST ); this.handler.setPriority( this.getPriority() ); - final IItemList priorityList = Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ).createList(); + final IItemList priorityList = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList(); final int slotsToUse = 18 + this.getInstalledUpgrades( Upgrades.CAPACITY ) * 9; for( int x = 0; x < this.config.getSlots() && x < slotsToUse; x++ ) @@ -462,7 +462,7 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni @Override public IStorageChannel getStorageChannel() { - return Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ); + return AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ); } public IAEFluidTank getConfig() @@ -491,7 +491,7 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni @Override public ItemStack getItemStackRepresentation() { - return Api.INSTANCE.definitions().parts().fluidStorageBus().maybeStack( 1 ).orElse( ItemStack.EMPTY ); + return AEApi.instance().definitions().parts().fluidStorageBus().maybeStack( 1 ).orElse( ItemStack.EMPTY ); } @Override diff --git a/src/main/java/appeng/fluids/parts/PartSharedFluidBus.java b/src/main/java/appeng/fluids/parts/PartSharedFluidBus.java index b30297d84..12254d820 100644 --- a/src/main/java/appeng/fluids/parts/PartSharedFluidBus.java +++ b/src/main/java/appeng/fluids/parts/PartSharedFluidBus.java @@ -35,6 +35,7 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; +import appeng.api.AEApi; import appeng.api.config.RedstoneMode; import appeng.api.config.Upgrades; import appeng.api.networking.ticking.IGridTickable; @@ -42,7 +43,6 @@ import appeng.api.networking.ticking.TickRateModulation; import appeng.api.parts.IPartCollisionHelper; import appeng.api.storage.channels.IFluidStorageChannel; import appeng.api.util.AECableType; -import appeng.core.Api; import appeng.fluids.util.AEFluidInventory; import appeng.fluids.util.IAEFluidTank; @@ -183,7 +183,7 @@ public abstract class PartSharedFluidBus extends PartUpgradeable implements IGri protected IFluidStorageChannel getChannel() { - return Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ); + return AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ); } @Override diff --git a/src/main/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java b/src/main/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java index 4290cb502..d24482e2b 100644 --- a/src/main/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java +++ b/src/main/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java @@ -27,6 +27,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import appeng.api.AEApi; import appeng.api.implementations.tiles.IChestOrDrive; import appeng.api.storage.ICellGuiHandler; import appeng.api.storage.ICellHandler; @@ -35,7 +36,6 @@ import appeng.api.storage.IStorageChannel; import appeng.api.storage.channels.IFluidStorageChannel; import appeng.api.storage.data.IAEStack; import appeng.api.util.AEPartLocation; -import appeng.core.Api; import appeng.util.Platform; @@ -46,7 +46,7 @@ public class BasicFluidCellGuiHandler implements ICellGuiHandler @Override public > boolean isHandlerFor( final IStorageChannel channel ) { - return channel == Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ); + return channel == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ); } @Override diff --git a/src/main/java/appeng/fluids/tile/TileFluidInterface.java b/src/main/java/appeng/fluids/tile/TileFluidInterface.java index 00db4b5e1..1ef1bd6bc 100644 --- a/src/main/java/appeng/fluids/tile/TileFluidInterface.java +++ b/src/main/java/appeng/fluids/tile/TileFluidInterface.java @@ -34,6 +34,7 @@ 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.Upgrades; import appeng.api.networking.IGridNode; import appeng.api.networking.events.MENetworkChannelsChanged; @@ -46,7 +47,6 @@ 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.fluids.helper.DualityFluidInterface; import appeng.fluids.helper.IFluidInterfaceHost; @@ -181,7 +181,7 @@ public class TileFluidInterface extends AENetworkTile implements IGridTickable, @Override public ItemStack getItemStackRepresentation() { - return Api.INSTANCE.definitions().blocks().fluidIface().maybeStack( 1 ).orElse( ItemStack.EMPTY ); + return AEApi.instance().definitions().blocks().fluidIface().maybeStack( 1 ).orElse( ItemStack.EMPTY ); } @Override diff --git a/src/main/java/appeng/fluids/util/AEFluidStack.java b/src/main/java/appeng/fluids/util/AEFluidStack.java index eec9c0c65..430e2c613 100644 --- a/src/main/java/appeng/fluids/util/AEFluidStack.java +++ b/src/main/java/appeng/fluids/util/AEFluidStack.java @@ -28,11 +28,11 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fluids.FluidStack; +import appeng.api.AEApi; import appeng.api.config.FuzzyMode; import appeng.api.storage.IStorageChannel; import appeng.api.storage.channels.IFluidStorageChannel; import appeng.api.storage.data.IAEFluidStack; -import appeng.core.Api; import appeng.fluids.items.FluidDummyItem; import appeng.util.Platform; import appeng.util.item.AEStack; @@ -176,7 +176,7 @@ public final class AEFluidStack extends AEStack implements IAEFlu @Override public IStorageChannel getChannel() { - return Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ); + return AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ); } @Override @@ -252,7 +252,7 @@ public final class AEFluidStack extends AEStack implements IAEFlu @Override public ItemStack asItemStackRepresentation() { - ItemStack is = Api.INSTANCE.definitions().items().dummyFluidItem().maybeStack( 1 ).orElse( ItemStack.EMPTY ); + ItemStack is = AEApi.instance().definitions().items().dummyFluidItem().maybeStack( 1 ).orElse( ItemStack.EMPTY ); if( !is.isEmpty() ) { FluidDummyItem item = (FluidDummyItem) is.getItem(); diff --git a/src/main/java/appeng/forge/data/providers/IAE2DataProvider.java b/src/main/java/appeng/forge/data/providers/IAE2DataProvider.java index 490df729b..6ba3e0350 100644 --- a/src/main/java/appeng/forge/data/providers/IAE2DataProvider.java +++ b/src/main/java/appeng/forge/data/providers/IAE2DataProvider.java @@ -1,10 +1,10 @@ package appeng.forge.data.providers; +import appeng.api.AEApi; import appeng.api.definitions.IBlocks; import appeng.api.definitions.IItems; import appeng.api.definitions.IMaterials; -import appeng.core.Api; import appeng.core.AppEng; import com.google.gson.JsonElement; import net.minecraft.data.IDataProvider; @@ -20,7 +20,7 @@ import java.nio.file.Path; public interface IAE2DataProvider extends IDataProvider { - IBlocks BLOCKS = Api.INSTANCE.definitions().blocks(); - IItems ITEMS = Api.INSTANCE.definitions().items(); - IMaterials MATERIALS = Api.INSTANCE.definitions().materials(); + IBlocks BLOCKS = AEApi.instance().definitions().blocks(); + IItems ITEMS = AEApi.instance().definitions().items(); + IMaterials MATERIALS = AEApi.instance().definitions().materials(); } diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index d30c22c07..78677d493 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -29,7 +29,6 @@ import java.util.Optional; import javax.annotation.Nullable; -import appeng.core.Api; import com.google.common.collect.ImmutableSet; import net.minecraft.block.Block; @@ -134,10 +133,10 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn private final AppEngInternalAEInventory config = new AppEngInternalAEInventory( this, NUMBER_OF_CONFIG_SLOTS ); private final AppEngInternalInventory storage = new AppEngInternalInventory( this, NUMBER_OF_STORAGE_SLOTS ); private final AppEngInternalInventory patterns = new AppEngInternalInventory( this, NUMBER_OF_PATTERN_SLOTS ); - private final MEMonitorPassThrough items = new MEMonitorPassThrough<>( new NullInventory(), Api.INSTANCE + private final MEMonitorPassThrough items = new MEMonitorPassThrough<>( new NullInventory(), AEApi.instance() .storage() .getStorageChannel( IItemStorageChannel.class ) ); - private final MEMonitorPassThrough fluids = new MEMonitorPassThrough<>( new NullInventory(), Api.INSTANCE + private final MEMonitorPassThrough fluids = new MEMonitorPassThrough<>( new NullInventory(), AEApi.instance() .storage() .getStorageChannel( IFluidStorageChannel.class ) ); private final UpgradeInventory upgrades; @@ -425,7 +424,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn if( req == null && !stored.isEmpty() ) { - final IAEItemStack work = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createStack( stored ); + final IAEItemStack work = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( stored ); this.requireWork[slot] = work.setStackSize( -work.getStackSize() ); return; } @@ -448,7 +447,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn else // Stored != null; dispose! { - final IAEItemStack work = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createStack( stored ); + final IAEItemStack work = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( stored ); this.requireWork[slot] = work.setStackSize( -work.getStackSize() ); return; } @@ -513,7 +512,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn @Override public boolean canInsert( final ItemStack stack ) { - final IAEItemStack out = this.destination.injectItems( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createStack( stack ), + final IAEItemStack out = this.destination.injectItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( stack ), Actionable.SIMULATE, null ); if( out == null ) { @@ -540,8 +539,8 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn { try { - this.items.setInternal( this.gridProxy.getStorage().getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ) ); - this.fluids.setInternal( this.gridProxy.getStorage().getInventory( Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ) ) ); + this.items.setInternal( this.gridProxy.getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) ); + this.fluids.setInternal( this.gridProxy.getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) ) ); } catch( final GridAccessException gae ) { @@ -669,7 +668,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn boolean changed = false; try { - this.destination = this.gridProxy.getStorage().getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ); + this.destination = this.gridProxy.getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); final IEnergySource src = this.gridProxy.getEnergy(); if( this.craftingTracker.isBusy( x ) ) @@ -796,7 +795,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn @Override public > IMEMonitor getInventory( IStorageChannel channel ) { - if( channel == Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ) + if( channel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) { if( this.hasConfig() ) { @@ -805,7 +804,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn return (IMEMonitor) this.items; } - else if( channel == Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ) ) + else if( channel == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) ) { if( this.hasConfig() ) { @@ -890,7 +889,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn @Override public > IMEMonitor getInventory( IStorageChannel channel ) { - if( channel == Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ) + if( channel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) { return (IMEMonitor) new InterfaceInventory( di ); } diff --git a/src/main/java/appeng/helpers/MultiCraftingTracker.java b/src/main/java/appeng/helpers/MultiCraftingTracker.java index 72f7a7cd1..9e8021a35 100644 --- a/src/main/java/appeng/helpers/MultiCraftingTracker.java +++ b/src/main/java/appeng/helpers/MultiCraftingTracker.java @@ -22,7 +22,6 @@ package appeng.helpers; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import appeng.core.Api; import com.google.common.collect.ImmutableSet; import net.minecraft.nbt.CompoundNBT; @@ -62,7 +61,7 @@ public class MultiCraftingTracker if( link != null && !link.isEmpty() ) { - this.setLink( x, Api.INSTANCE.storage().loadCraftingLink( link, this.owner ) ); + this.setLink( x, AEApi.instance().storage().loadCraftingLink( link, this.owner ) ); } } } diff --git a/src/main/java/appeng/helpers/PatternHelper.java b/src/main/java/appeng/helpers/PatternHelper.java index 07bb67ea3..e21bd7f51 100644 --- a/src/main/java/appeng/helpers/PatternHelper.java +++ b/src/main/java/appeng/helpers/PatternHelper.java @@ -27,7 +27,6 @@ import java.util.Map; import java.util.Set; import java.util.StringJoiner; -import appeng.core.Api; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -43,6 +42,7 @@ import appeng.api.storage.data.IAEItemStack; import appeng.container.ContainerNull; import appeng.core.AEConfig; import appeng.core.AELog; +import appeng.api.AEApi; import appeng.api.features.AEFeature; import appeng.util.Platform; import appeng.util.item.AEItemStack; @@ -104,7 +104,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable implement public PortableCellViewer( final ItemStack is, final int slot ) { - super( Api.INSTANCE.registries().cell().getCellInventory( is, null, Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ) ); + super( AEApi.instance().registries().cell().getCellInventory( is, null, AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) ); this.ips = (IAEItemPowerStorage) is.getItem(); this.target = is; this.inventorySlot = slot; @@ -85,7 +85,7 @@ public class PortableCellViewer extends MEMonitorHandler implement @Override public > IMEMonitor getInventory( IStorageChannel channel ) { - if( channel == Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ) + if( channel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) { return (IMEMonitor) this; } diff --git a/src/main/java/appeng/items/misc/ItemEncodedPattern.java b/src/main/java/appeng/items/misc/ItemEncodedPattern.java index c30cec375..674617a24 100644 --- a/src/main/java/appeng/items/misc/ItemEncodedPattern.java +++ b/src/main/java/appeng/items/misc/ItemEncodedPattern.java @@ -19,10 +19,10 @@ package appeng.items.misc; +import appeng.api.AEApi; import appeng.api.implementations.ICraftingPatternItem; import appeng.api.networking.crafting.ICraftingPatternDetails; import appeng.api.storage.data.IAEItemStack; -import appeng.core.Api; import appeng.core.AppEng; import appeng.core.localization.GuiText; import appeng.helpers.InvalidPatternHelper; @@ -85,7 +85,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt final PlayerInventory inv = player.inventory; - ItemStack is = Api.INSTANCE.definitions().materials().blankPattern().maybeStack( stack.getCount() ).orElse( ItemStack.EMPTY ); + ItemStack is = AEApi.instance().definitions().materials().blankPattern().maybeStack( stack.getCount() ).orElse( ItemStack.EMPTY ); if( !is.isEmpty() ) { for( int s = 0; s < player.inventory.getSizeInventory(); s++ ) diff --git a/src/main/java/appeng/items/parts/ItemFacade.java b/src/main/java/appeng/items/parts/ItemFacade.java index caefcf12f..d03a6a716 100644 --- a/src/main/java/appeng/items/parts/ItemFacade.java +++ b/src/main/java/appeng/items/parts/ItemFacade.java @@ -37,11 +37,11 @@ import net.minecraft.util.registry.Registry; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.registries.ForgeRegistries; +import appeng.api.AEApi; import appeng.api.exceptions.MissingDefinitionException; import appeng.api.parts.IAlphaPassItem; import appeng.api.util.AEPartLocation; import appeng.core.AELog; -import appeng.core.Api; import appeng.core.FacadeConfig; import appeng.facade.FacadePart; import appeng.facade.IFacadeItem; @@ -63,7 +63,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte @Override public ActionResultType onItemUseFirst( ItemStack stack, ItemUseContext context ) { - return Api.INSTANCE.partHelper().placeBus( stack, context.getPos(), context.getFace(), context.getPlayer(), context.getHand(), context.getWorld() ); + return AEApi.instance().partHelper().placeBus( stack, context.getPos(), context.getFace(), context.getPlayer(), context.getHand(), context.getWorld() ); } @Override @@ -286,7 +286,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte public ItemStack createFromID( final int id ) { - ItemStack facadeStack = Api.INSTANCE + ItemStack facadeStack = AEApi.instance() .definitions() .items() .facade() diff --git a/src/main/java/appeng/items/parts/ItemPart.java b/src/main/java/appeng/items/parts/ItemPart.java index 27c69275e..29e980868 100644 --- a/src/main/java/appeng/items/parts/ItemPart.java +++ b/src/main/java/appeng/items/parts/ItemPart.java @@ -19,11 +19,11 @@ package appeng.items.parts; +import appeng.api.AEApi; import appeng.api.implementations.items.IItemGroup; import appeng.api.parts.IPart; import appeng.api.parts.IPartItem; import appeng.api.util.AEColor; -import appeng.core.Api; import appeng.core.features.ActivityState; import appeng.core.features.ItemStackSrc; import appeng.core.localization.GuiText; @@ -151,7 +151,7 @@ public final class ItemPart extends AEBaseItem implements IPartItem, IItemGroup return ActionResultType.FAIL; } - return Api.INSTANCE.partHelper().placeBus( held, context.getPos(), context.getFace(), player, context.getHand(), context.getWorld() ); + return AEApi.instance().partHelper().placeBus( held, context.getPos(), context.getFace(), player, context.getHand(), context.getWorld() ); } @Override diff --git a/src/main/java/appeng/items/storage/AbstractStorageCell.java b/src/main/java/appeng/items/storage/AbstractStorageCell.java index 1a830c698..4bcf219c2 100644 --- a/src/main/java/appeng/items/storage/AbstractStorageCell.java +++ b/src/main/java/appeng/items/storage/AbstractStorageCell.java @@ -50,7 +50,6 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; import appeng.core.AEConfig; -import appeng.core.Api; import appeng.api.features.AEFeature; import appeng.core.localization.GuiText; import appeng.items.AEBaseItem; @@ -82,9 +81,9 @@ public abstract class AbstractStorageCell> extends AEBaseI @Override public void addInformation(final ItemStack stack, final World world, final List lines, final ITooltipFlag advancedTooltips ) { - Api.INSTANCE + AEApi.instance() .client() - .addCellInformation( Api.INSTANCE.registries().cell().getCellInventory( stack, null, this.getChannel() ), lines ); + .addCellInformation( AEApi.instance().registries().cell().getCellInventory( stack, null, this.getChannel() ), lines ); } @Override @@ -178,7 +177,7 @@ public abstract class AbstractStorageCell> extends AEBaseI } final PlayerInventory playerInventory = player.inventory; - final IMEInventoryHandler inv = Api.INSTANCE.registries().cell().getCellInventory( stack, null, this.getChannel() ); + final IMEInventoryHandler inv = AEApi.instance().registries().cell().getCellInventory( stack, null, this.getChannel() ); if( inv != null && playerInventory.getCurrentItem() == stack ) { final InventoryAdaptor ia = InventoryAdaptor.getAdaptor( player ); @@ -232,7 +231,7 @@ public abstract class AbstractStorageCell> extends AEBaseI @Override public ItemStack getContainerItem( final ItemStack itemStack ) { - return Api.INSTANCE + return AEApi.instance() .definitions() .materials() .emptyStorageCell() diff --git a/src/main/java/appeng/items/storage/BasicItemStorageCell.java b/src/main/java/appeng/items/storage/BasicItemStorageCell.java index 9d306e863..53e8a8088 100644 --- a/src/main/java/appeng/items/storage/BasicItemStorageCell.java +++ b/src/main/java/appeng/items/storage/BasicItemStorageCell.java @@ -26,7 +26,6 @@ import appeng.api.AEApi; import appeng.api.storage.IStorageChannel; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; -import appeng.core.Api; import appeng.items.materials.MaterialType; import appeng.util.InventoryAdaptor; @@ -80,13 +79,13 @@ public final class BasicItemStorageCell extends AbstractStorageCell getChannel() { - return Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ); + return AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ); } @Override protected void dropEmptyStorageCellCase( final InventoryAdaptor ia, final PlayerEntity player ) { - Api.INSTANCE.definitions().materials().emptyStorageCell().maybeStack( 1 ).ifPresent( is -> + AEApi.instance().definitions().materials().emptyStorageCell().maybeStack( 1 ).ifPresent( is -> { final ItemStack extraA = ia.addItems( is ); if( !extraA.isEmpty() ) diff --git a/src/main/java/appeng/items/storage/ItemCreativeStorageCell.java b/src/main/java/appeng/items/storage/ItemCreativeStorageCell.java index 0c140b6cf..6e7544d79 100644 --- a/src/main/java/appeng/items/storage/ItemCreativeStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemCreativeStorageCell.java @@ -35,7 +35,6 @@ import appeng.api.storage.ICellInventoryHandler; import appeng.api.storage.ICellWorkbenchItem; import appeng.api.storage.IMEInventoryHandler; import appeng.api.storage.channels.IItemStorageChannel; -import appeng.core.Api; import appeng.items.AEBaseItem; import appeng.items.contents.CellConfig; @@ -82,11 +81,11 @@ public class ItemCreativeStorageCell extends AEBaseItem implements ICellWorkbenc @Override public void addInformation(final ItemStack stack, final World world, final List lines, final ITooltipFlag advancedTooltips ) { - final IMEInventoryHandler inventory = Api.INSTANCE + final IMEInventoryHandler inventory = AEApi.instance() .registries() .cell() .getCellInventory( stack, null, - Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ); + AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); if( inventory instanceof ICellInventoryHandler ) { diff --git a/src/main/java/appeng/items/storage/ItemViewCell.java b/src/main/java/appeng/items/storage/ItemViewCell.java index 04d867bdd..5db194c0d 100644 --- a/src/main/java/appeng/items/storage/ItemViewCell.java +++ b/src/main/java/appeng/items/storage/ItemViewCell.java @@ -19,11 +19,11 @@ package appeng.items.storage; -import appeng.core.Api; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; +import appeng.api.AEApi; import appeng.api.config.FuzzyMode; import appeng.api.config.Upgrades; import appeng.api.implementations.items.IUpgradeModule; @@ -63,7 +63,7 @@ public class ItemViewCell extends AEBaseItem implements ICellWorkbenchItem if( ( currentViewCell.getItem() instanceof ItemViewCell ) ) { - final IItemList priorityList = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + final IItemList priorityList = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); final ICellWorkbenchItem vc = (ICellWorkbenchItem) currentViewCell.getItem(); final IItemHandler upgrades = vc.getUpgradesInventory( currentViewCell ); diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index 1e3bf0900..7a2469a4f 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -19,6 +19,7 @@ package appeng.items.tools.powered; +import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.FuzzyMode; import appeng.api.implementations.items.IItemGroup; @@ -35,7 +36,6 @@ import appeng.api.util.DimensionalCoord; import appeng.block.networking.BlockCableBus; import appeng.block.paint.BlockPaint; import appeng.core.AEConfig; -import appeng.core.Api; import appeng.core.AppEng; import appeng.core.localization.GuiText; import appeng.helpers.IMouseWheelItem; @@ -120,11 +120,11 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe ItemStack paintBall = this.getColor( is ); - final IMEInventory inv = Api.INSTANCE + final IMEInventory inv = AEApi.instance() .registries() .cell() .getCellInventory( is, null, - Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ); + AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); if( inv != null ) { final IAEItemStack option = inv.extractItems( AEItemStack.fromItemStack( paintBall ), Actionable.SIMULATE, new BaseActionSource() ); @@ -270,15 +270,15 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe { ItemStack newColor = ItemStack.EMPTY; - final IMEInventory inv = Api.INSTANCE + final IMEInventory inv = AEApi.instance() .registries() .cell() .getCellInventory( is, null, - Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ); + AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); if( inv != null ) { final IItemList itemList = inv - .getAvailableItems( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList() ); + .getAvailableItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() ); if( anchor.isEmpty() ) { final IAEItemStack firstItem = itemList.getFirstItem(); @@ -431,13 +431,13 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe { super.addInformation( stack, world, lines, advancedTooltips ); - final ICellInventoryHandler cdi = Api.INSTANCE + final ICellInventoryHandler cdi = AEApi.instance() .registries() .cell() .getCellInventory( stack, null, - Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ); + AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); - Api.INSTANCE.client().addCellInformation( cdi, lines ); + AEApi.instance().client().addCellInformation( cdi, lines ); } @Override @@ -504,7 +504,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe @Override public IStorageChannel getChannel() { - return Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ); + return AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ); } @Override diff --git a/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java b/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java index ed92ac988..5483a52a9 100644 --- a/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java +++ b/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java @@ -40,6 +40,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.IItemHandler; +import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.FuzzyMode; import appeng.api.config.Upgrades; @@ -53,7 +54,6 @@ import appeng.api.util.AEColor; import appeng.api.util.DimensionalCoord; import appeng.core.AEConfig; import appeng.core.AELog; -import appeng.core.Api; import appeng.core.AppEng; import appeng.api.features.AEFeature; import appeng.core.localization.PlayerMessages; @@ -85,9 +85,9 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell< { super.addInformation( stack, world, lines, advancedTooltips ); - final ICellInventoryHandler cdi = Api.INSTANCE.registries().cell().getCellInventory( stack, null, Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ); + final ICellInventoryHandler cdi = AEApi.instance().registries().cell().getCellInventory( stack, null, AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); - Api.INSTANCE.client().addCellInformation( cdi, lines ); + AEApi.instance().client().addCellInformation( cdi, lines ); } @Override @@ -103,10 +103,10 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell< shots += cu.getInstalledUpgrades( Upgrades.SPEED ); } - final ICellInventoryHandler inv = Api.INSTANCE.registries().cell().getCellInventory( p.getHeldItem( hand ), null, Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ); + final ICellInventoryHandler inv = AEApi.instance().registries().cell().getCellInventory( p.getHeldItem( hand ), null, AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); if( inv != null ) { - final IItemList itemList = inv.getAvailableItems( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList() ); + final IItemList itemList = inv.getAvailableItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() ); IAEItemStack req = itemList.getFirstItem(); if( req instanceof IAEItemStack ) { @@ -145,7 +145,7 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell< final double d1 = Vec3d.y; final double d2 = Vec3d.z; - final float penetration = Api.INSTANCE.registries().matterCannon().getPenetration( ammo ); // 196.96655f; + final float penetration = AEApi.instance().registries().matterCannon().getPenetration( ammo ); // 196.96655f; if( penetration <= 0 ) { final ItemStack type = aeAmmo.asItemStackRepresentation(); @@ -278,7 +278,7 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell< final BlockState whatsThere = w.getBlockState( hitPos ); if( whatsThere.getMaterial().isReplaceable() && w.isAirBlock( hitPos ) ) { - Api.INSTANCE.definitions().blocks().paint().maybeBlock().ifPresent( paintBlock -> { + AEApi.instance().definitions().blocks().paint().maybeBlock().ifPresent( paintBlock -> { w.setBlockState( hitPos, paintBlock.getDefaultState(), 3 ); } ); } @@ -484,7 +484,7 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell< @Override public boolean isBlackListed( final ItemStack cellItem, final IAEItemStack requestedAddition ) { - final float pen = Api.INSTANCE.registries().matterCannon().getPenetration( requestedAddition.createItemStack() ); + final float pen = AEApi.instance().registries().matterCannon().getPenetration( requestedAddition.createItemStack() ); if( pen > 0 ) { return false; @@ -519,6 +519,6 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell< @Override public IStorageChannel getChannel() { - return Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ); + return AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ); } } diff --git a/src/main/java/appeng/items/tools/powered/ToolPortableCell.java b/src/main/java/appeng/items/tools/powered/ToolPortableCell.java index 09fcec51a..085436161 100644 --- a/src/main/java/appeng/items/tools/powered/ToolPortableCell.java +++ b/src/main/java/appeng/items/tools/powered/ToolPortableCell.java @@ -52,7 +52,6 @@ import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.util.AEPartLocation; import appeng.core.AEConfig; -import appeng.core.Api; import appeng.core.localization.GuiText; import appeng.items.contents.CellConfig; @@ -82,13 +81,13 @@ public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell< { super.addInformation( stack, world, lines, advancedTooltips ); - final ICellInventoryHandler cdi = Api.INSTANCE + final ICellInventoryHandler cdi = AEApi.instance() .registries() .cell() .getCellInventory( stack, null, - Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ); + AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); - Api.INSTANCE.client().addCellInformation( cdi, lines ); + AEApi.instance().client().addCellInformation( cdi, lines ); } @Override @@ -136,7 +135,7 @@ public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell< @Override public IStorageChannel getChannel() { - return Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ); + return AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ); } @Override diff --git a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java index a4ebffc1d..35daefa3f 100644 --- a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java +++ b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java @@ -36,6 +36,7 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.Settings; import appeng.api.config.SortDir; @@ -44,7 +45,6 @@ import appeng.api.config.ViewItems; import appeng.api.features.IWirelessTermHandler; import appeng.api.util.IConfigManager; import appeng.core.AEConfig; -import appeng.core.Api; import appeng.core.localization.GuiText; import appeng.items.tools.powered.powersink.AEBasePoweredItem; import appeng.util.ConfigManager; @@ -61,7 +61,7 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless @Override public ActionResult onItemRightClick( final World w, final PlayerEntity player, final Hand hand ) { - Api.INSTANCE.registries().wireless().openWirelessTerminalGui( player.getHeldItem( hand ), w, player, hand ); + AEApi.instance().registries().wireless().openWirelessTerminalGui( player.getHeldItem( hand ), w, player, hand ); return new ActionResult<>( ActionResultType.SUCCESS, player.getHeldItem( hand ) ); } @@ -97,7 +97,7 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless @Override public boolean canHandle( final ItemStack is ) { - return Api.INSTANCE.definitions().items().wirelessTerminal().isSameAs( is ); + return AEApi.instance().definitions().items().wirelessTerminal().isSameAs( is ); } @Override diff --git a/src/main/java/appeng/me/Grid.java b/src/main/java/appeng/me/Grid.java index 65dbb22dc..daab0dbd5 100644 --- a/src/main/java/appeng/me/Grid.java +++ b/src/main/java/appeng/me/Grid.java @@ -26,6 +26,7 @@ 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,7 +36,6 @@ 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; @@ -54,7 +54,7 @@ public class Grid implements IGrid { this.pivot = center; - final Map, IGridCache> myCaches = Api.INSTANCE.registries().gridCache().createCacheInstance( this ); + final Map, IGridCache> myCaches = AEApi.instance().registries().gridCache().createCacheInstance( this ); for( final Entry, IGridCache> c : myCaches.entrySet() ) { final Class key = c.getKey(); diff --git a/src/main/java/appeng/me/cache/CraftingGridCache.java b/src/main/java/appeng/me/cache/CraftingGridCache.java index a3317bd3c..ccd3fc2bd 100644 --- a/src/main/java/appeng/me/cache/CraftingGridCache.java +++ b/src/main/java/appeng/me/cache/CraftingGridCache.java @@ -77,7 +77,6 @@ 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; @@ -251,7 +250,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper this.emitableItems.clear(); // update the stuff that was in the list... - this.storageGrid.postAlterationOfStoredItems( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ), oldItems.keySet(), + this.storageGrid.postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ), oldItems.keySet(), new BaseActionSource() ); // re-create list.. @@ -288,7 +287,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper this.craftableItems.put( e.getKey(), ImmutableList.copyOf( e.getValue() ) ); } - this.storageGrid.postAlterationOfStoredItems( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ), this.craftableItems.keySet(), + this.storageGrid.postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ), this.craftableItems.keySet(), new BaseActionSource() ); } @@ -368,7 +367,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper { final List list = new ArrayList<>( 1 ); - if( channel == Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ) + if( channel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) { list.add( this ); } @@ -457,7 +456,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper @Override public IStorageChannel getChannel() { - return Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ); + return AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ); } @Override diff --git a/src/main/java/appeng/me/cache/GridStorageCache.java b/src/main/java/appeng/me/cache/GridStorageCache.java index 39f15824f..6693b80b8 100644 --- a/src/main/java/appeng/me/cache/GridStorageCache.java +++ b/src/main/java/appeng/me/cache/GridStorageCache.java @@ -50,7 +50,6 @@ import appeng.api.storage.IStorageChannel; 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; @@ -76,7 +75,7 @@ public class GridStorageCache implements IStorageGrid this.storageNetworks = new IdentityHashMap<>(); this.storageMonitors = new IdentityHashMap<>(); - Api.INSTANCE.storage().storageChannels().forEach( channel -> this.storageMonitors.put( channel, new NetworkMonitor<>( this, channel ) ) ); + AEApi.instance().storage().storageChannels().forEach( channel -> this.storageMonitors.put( channel, new NetworkMonitor<>( this, channel ) ) ); } @Override diff --git a/src/main/java/appeng/me/cache/PathGridCache.java b/src/main/java/appeng/me/cache/PathGridCache.java index 10cbe8936..3961ddfd5 100644 --- a/src/main/java/appeng/me/cache/PathGridCache.java +++ b/src/main/java/appeng/me/cache/PathGridCache.java @@ -46,8 +46,8 @@ 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.api.AEApi; import appeng.api.features.AEFeature; import appeng.core.stats.IAdvancementTrigger; import appeng.me.GridConnection; @@ -351,7 +351,7 @@ public class PathGridCache implements IPathingGrid { for( final IGridNode n : this.requireChannels ) { - PlayerEntity player = Api.INSTANCE.registries().players().findPlayer( n.getPlayerID() ); + PlayerEntity player = AEApi.instance().registries().players().findPlayer( n.getPlayerID() ); if( player instanceof ServerPlayerEntity ) { currentBracket.trigger( (ServerPlayerEntity) player ); diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index 546231bb7..3dda882f4 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -38,6 +38,7 @@ 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,7 +66,6 @@ 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; @@ -103,7 +103,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU private MECraftingInventory inventory = new MECraftingInventory(); private IAEItemStack finalOutput; private boolean waiting = false; - private IItemList waitingFor = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + private IItemList waitingFor = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); private long availableStorage = 0; private MachineSource machineSrc = null; private int accelerator = 0; @@ -546,7 +546,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU } final IItemList list; - this.getListOfItem( list = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(), CraftingItemList.ALL ); + this.getListOfItem( list = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(), CraftingItemList.ALL ); for( final IAEItemStack is : list ) { this.postChange( is, this.machineSrc ); @@ -837,7 +837,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU } final IStorageGrid sg = g.getCache( IStorageGrid.class ); - final IMEInventory ii = sg.getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ); + final IMEInventory ii = sg.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); for( IAEItemStack is : this.inventory.getItemList() ) { @@ -881,7 +881,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU } final IStorageGrid sg = g.getCache( IStorageGrid.class ); - final IMEInventory storage = sg.getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ); + final IMEInventory storage = sg.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); final MECraftingInventory ci = new MECraftingInventory( storage, true, false, false ); try @@ -912,7 +912,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU this.submitLink( this.myLastLink ); this.submitLink( whatLink ); - final IItemList list = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + final IItemList list = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); this.getListOfItem( list, CraftingItemList.ALL ); for( final IAEItemStack ge : list ) { @@ -1279,7 +1279,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU private IItemList readList( final ListNBT tag ) { - final IItemList out = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + final IItemList out = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); if( tag == null ) { @@ -1323,7 +1323,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU this.lastTime = System.nanoTime(); this.elapsedTime = 0; - final IItemList list = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + final IItemList list = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); this.getListOfItem( list, CraftingItemList.ACTIVE ); this.getListOfItem( list, CraftingItemList.PENDING ); diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java b/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java index 961457882..e40e13b1e 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java @@ -28,7 +28,6 @@ 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; @@ -88,7 +87,7 @@ public class QuantumCalculator extends MBCalculator } num++; - final IBlocks blocks = Api.INSTANCE.definitions().blocks(); + final IBlocks blocks = AEApi.instance().definitions().blocks(); if( num == 5 ) { if( !this.isBlockAtLocation( w, p, blocks.quantumLink() ) ) diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java index 59ca48af0..0ba6b1c8d 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java @@ -29,6 +29,7 @@ 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,7 +39,6 @@ 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.TileQuantumBridge; @@ -113,7 +113,7 @@ public class QuantumCluster implements ILocatable, IAECluster } } - final ILocatable myOtherSide = this.otherSide == 0 ? null : Api.INSTANCE.registries().locatable().getLocatableBy( this.otherSide ); + final ILocatable myOtherSide = this.otherSide == 0 ? null : AEApi.instance().registries().locatable().getLocatableBy( this.otherSide ); boolean shutdown = false; @@ -156,7 +156,7 @@ public class QuantumCluster implements ILocatable, IAECluster } } - sideA.connection = sideB.connection = new ConnectionWrapper( Api.INSTANCE.grid().createGridConnection( sideA.getNode(), sideB.getNode() ) ); + sideA.connection = sideB.connection = new ConnectionWrapper( AEApi.instance().grid().createGridConnection( sideA.getNode(), sideB.getNode() ) ); } catch( final FailedConnectionException e ) { @@ -187,7 +187,7 @@ public class QuantumCluster implements ILocatable, IAECluster private boolean canUseNode( final long qe ) { - final QuantumCluster qc = (QuantumCluster) Api.INSTANCE.registries().locatable().getLocatableBy( qe ); + final QuantumCluster qc = (QuantumCluster) AEApi.instance().registries().locatable().getLocatableBy( qe ); if( qc != null ) { final World theWorld = qc.center.getWorld(); diff --git a/src/main/java/appeng/me/helpers/AENetworkProxy.java b/src/main/java/appeng/me/helpers/AENetworkProxy.java index 3df74dfc6..929e59702 100644 --- a/src/main/java/appeng/me/helpers/AENetworkProxy.java +++ b/src/main/java/appeng/me/helpers/AENetworkProxy.java @@ -22,7 +22,6 @@ package appeng.me.helpers; import java.util.Collections; import java.util.EnumSet; -import appeng.core.Api; import appeng.core.worlddata.WorldData; import appeng.hooks.TickHandler; import appeng.me.cache.P2PCache; @@ -34,6 +33,7 @@ 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; @@ -147,7 +147,7 @@ public class AENetworkProxy implements IGridBlock { if( this.node == null && Platform.isServer() && this.isReady ) { - this.node = Api.INSTANCE.grid().createGridNode( this ); + this.node = AEApi.instance().grid().createGridNode( this ); this.readFromNBT( this.data ); this.node.updateState(); } diff --git a/src/main/java/appeng/me/storage/CreativeCellInventory.java b/src/main/java/appeng/me/storage/CreativeCellInventory.java index a804f0dfd..53031553c 100644 --- a/src/main/java/appeng/me/storage/CreativeCellInventory.java +++ b/src/main/java/appeng/me/storage/CreativeCellInventory.java @@ -31,7 +31,6 @@ 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.items.contents.CellConfig; import appeng.util.item.AEItemStack; @@ -39,7 +38,7 @@ import appeng.util.item.AEItemStack; public class CreativeCellInventory implements IMEInventoryHandler { - private final IItemList itemListCache = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + private final IItemList itemListCache = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); protected CreativeCellInventory( final ItemStack o ) { @@ -57,7 +56,7 @@ public class CreativeCellInventory implements IMEInventoryHandler public static ICellInventoryHandler getCell( final ItemStack o ) { - return new BasicCellInventoryHandler( new CreativeCellInventory( o ), Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ); + return new BasicCellInventoryHandler( new CreativeCellInventory( o ), AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); } @Override @@ -97,7 +96,7 @@ public class CreativeCellInventory implements IMEInventoryHandler @Override public IStorageChannel getChannel() { - return Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ); + return AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ); } @Override diff --git a/src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java b/src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java index 9cd672cfe..cbc3f7cb9 100644 --- a/src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java +++ b/src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java @@ -31,6 +31,7 @@ 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,13 +43,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, ITickingMonitor { private final IFluidHandler handler; - private final IItemList list = Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ).createList(); + private final IItemList list = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList(); private final HashMap, Object> listeners = new HashMap<>(); private final NavigableMap memory; private IActionSource mySource; @@ -120,7 +120,7 @@ public class MEMonitorIFluidHandler implements IMEMonitor, ITicki @Override public IStorageChannel getChannel() { - return Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ); + return AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ); } @Override @@ -178,7 +178,7 @@ public class MEMonitorIFluidHandler implements IMEMonitor, ITicki if( !newIS.isEmpty() ) { - stack = ( old == null || old.aeStack == null ? Api.INSTANCE + stack = ( old == null || old.aeStack == null ? AEApi.instance() .storage() .getStorageChannel( IFluidStorageChannel.class ) .createStack( newIS ) : old.aeStack.copy() ); @@ -351,7 +351,7 @@ public class MEMonitorIFluidHandler implements IMEMonitor, ITicki else { this.fluidStack = is.copy(); - this.aeStack = Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ).createStack( is ); + this.aeStack = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createStack( is ); } } } diff --git a/src/main/java/appeng/me/storage/MEMonitorIInventory.java b/src/main/java/appeng/me/storage/MEMonitorIInventory.java index fb049e1ba..8b58eca4d 100644 --- a/src/main/java/appeng/me/storage/MEMonitorIInventory.java +++ b/src/main/java/appeng/me/storage/MEMonitorIInventory.java @@ -41,7 +41,6 @@ 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; @@ -51,7 +50,7 @@ public class MEMonitorIInventory implements IMEMonitor, ITickingMo { private final InventoryAdaptor adaptor; - private final IItemList list = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + private final IItemList list = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); private final HashMap, Object> listeners = new HashMap<>(); private final NavigableMap memory; private IActionSource mySource; @@ -139,7 +138,7 @@ public class MEMonitorIInventory implements IMEMonitor, ITickingMo @Override public IStorageChannel getChannel() { - return Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ); + return AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ); } @Override @@ -183,7 +182,7 @@ public class MEMonitorIInventory implements IMEMonitor, ITickingMo final int newSize = ( newIS.isEmpty() ? 0 : newIS.getCount() ); final int diff = newSize - ( oldIS.isEmpty() ? 0 : oldIS.getCount() ); - final IAEItemStack stack = ( old == null || old.aeStack == null ? Api.INSTANCE + final IAEItemStack stack = ( old == null || old.aeStack == null ? AEApi.instance() .storage() .getStorageChannel( IItemStorageChannel.class ) .createStack( newIS ) : old.aeStack.copy() ); @@ -358,7 +357,7 @@ public class MEMonitorIInventory implements IMEMonitor, ITickingMo else { this.itemStack = is.copy(); - this.aeStack = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createStack( is ); + this.aeStack = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( is ); } } } diff --git a/src/main/java/appeng/me/storage/NullInventory.java b/src/main/java/appeng/me/storage/NullInventory.java index 127db67c1..615a11f3f 100644 --- a/src/main/java/appeng/me/storage/NullInventory.java +++ b/src/main/java/appeng/me/storage/NullInventory.java @@ -28,7 +28,6 @@ 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> implements IMEInventoryHandler @@ -55,7 +54,7 @@ public class NullInventory> implements IMEInventoryHandler @Override public IStorageChannel getChannel() { - return Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ); + return AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ); } @Override diff --git a/src/main/java/appeng/me/storage/SecurityStationInventory.java b/src/main/java/appeng/me/storage/SecurityStationInventory.java index acca82f7d..b4b9fb23f 100644 --- a/src/main/java/appeng/me/storage/SecurityStationInventory.java +++ b/src/main/java/appeng/me/storage/SecurityStationInventory.java @@ -32,7 +32,6 @@ 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.TileSecurityStation; @@ -40,7 +39,7 @@ import appeng.tile.misc.TileSecurityStation; public class SecurityStationInventory implements IMEInventoryHandler { - private final IItemList storedItems = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + private final IItemList storedItems = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); private final TileSecurityStation securityTile; public SecurityStationInventory( final TileSecurityStation ts ) @@ -53,7 +52,7 @@ public class SecurityStationInventory implements IMEInventoryHandler iface = definitions.blocks().iface().maybeStack( 1 ); diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index b63c8e7ac..e66bea97e 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -44,6 +44,7 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; +import appeng.api.AEApi; import appeng.api.config.YesNo; import appeng.api.exceptions.FailedConnectionException; import appeng.api.implementations.parts.IPartCable; @@ -66,7 +67,6 @@ import appeng.client.render.cablebus.CableBusRenderState; import appeng.client.render.cablebus.CableCoreType; import appeng.client.render.cablebus.FacadeRenderState; import appeng.core.AELog; -import appeng.core.Api; import appeng.facade.FacadeContainer; import appeng.helpers.AEMultiTile; import appeng.me.GridConnection; @@ -425,7 +425,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I } } - if( Api.INSTANCE.partHelper().getCableRenderMode().opaqueFacades ) + if( AEApi.instance().partHelper().getCableRenderMode().opaqueFacades ) { final IFacadeContainer fc = this.getFacadeContainer(); for( final AEPartLocation side : AEPartLocation.SIDE_LOCATIONS ) @@ -630,7 +630,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I { try { - Api.INSTANCE.grid().createGridConnection( cn, sn ); + AEApi.instance().grid().createGridConnection( cn, sn ); } catch( final FailedConnectionException e ) { @@ -753,7 +753,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I } } - if( Api.INSTANCE.partHelper().getCableRenderMode().opaqueFacades || !visual ) + if( AEApi.instance().partHelper().getCableRenderMode().opaqueFacades || !visual ) { if( includeFacades && s != null && s != AEPartLocation.INTERNAL ) { diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java index db3227f4a..6ed8ae664 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/src/main/java/appeng/parts/PartPlacement.java @@ -19,12 +19,12 @@ package appeng.parts; +import appeng.api.AEApi; import appeng.api.definitions.IBlockDefinition; import appeng.api.definitions.IItems; import appeng.api.parts.*; import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; -import appeng.core.Api; import appeng.core.AppEng; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketClick; @@ -219,7 +219,7 @@ public class PartPlacement BlockPos te_pos = pos; - final IBlockDefinition multiPart = Api.INSTANCE.definitions().blocks().multiPart(); + final IBlockDefinition multiPart = AEApi.instance().definitions().blocks().multiPart(); if( host == null && pass == PlaceType.PLACE_ITEM ) { Direction offset = null; @@ -425,7 +425,7 @@ public class PartPlacement else { final ItemStack held = event.getPlayer().getHeldItem( event.getHand() ); - final IItems items = Api.INSTANCE.definitions().items(); + final IItems items = AEApi.instance().definitions().items(); boolean supportedItem = items.memoryCard().isSameAs( held ); supportedItem |= items.colorApplicator().isSameAs( held ); diff --git a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java index e92837f79..57d47a525 100644 --- a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java @@ -39,6 +39,7 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; +import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; import appeng.api.networking.IGridNode; @@ -59,7 +60,6 @@ import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; -import appeng.core.Api; import appeng.core.AppEng; import appeng.core.settings.TickRates; import appeng.core.sync.packets.PacketTransitionEffect; @@ -337,7 +337,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab { final IStorageGrid storage = this.getProxy().getStorage(); final IEnergyGrid energy = this.getProxy().getEnergy(); - final IAEItemStack overflow = Platform.poweredInsert( energy, storage.getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ), itemToStore, this.mySrc ); + final IAEItemStack overflow = Platform.poweredInsert( energy, storage.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ), itemToStore, this.mySrc ); this.isAccepting = overflow == null; @@ -541,7 +541,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab for( final ItemStack itemStack : itemStacks ) { final IAEItemStack itemToTest = AEItemStack.fromItemStack( itemStack ); - final IAEItemStack overflow = storage.getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ).injectItems( itemToTest, Actionable.SIMULATE, this.mySrc ); + final IAEItemStack overflow = storage.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ).injectItems( itemToTest, Actionable.SIMULATE, this.mySrc ); if( overflow == null || itemToTest.getStackSize() > overflow.getStackSize() ) { canStore = true; diff --git a/src/main/java/appeng/parts/automation/PartExportBus.java b/src/main/java/appeng/parts/automation/PartExportBus.java index 938e6c1e9..3987e9502 100644 --- a/src/main/java/appeng/parts/automation/PartExportBus.java +++ b/src/main/java/appeng/parts/automation/PartExportBus.java @@ -58,7 +58,6 @@ import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.util.AECableType; import appeng.core.AELog; -import appeng.core.Api; import appeng.core.AppEng; import appeng.core.settings.TickRates; @@ -138,7 +137,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest final IMEMonitor inv = this.getProxy() .getStorage() .getInventory( - Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ); + AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); final IEnergyGrid energy = this.getProxy().getEnergy(); final ICraftingGrid cg = this.getProxy().getCrafting(); final FuzzyMode fzMode = (FuzzyMode) this.getConfigManager().getSetting( Settings.FUZZY_MODE ); diff --git a/src/main/java/appeng/parts/automation/PartFormationPlane.java b/src/main/java/appeng/parts/automation/PartFormationPlane.java index 54756eba2..f0bea9d74 100644 --- a/src/main/java/appeng/parts/automation/PartFormationPlane.java +++ b/src/main/java/appeng/parts/automation/PartFormationPlane.java @@ -46,6 +46,7 @@ import net.minecraft.world.server.ServerWorld; import net.minecraftforge.common.IPlantable; import net.minecraftforge.items.IItemHandler; +import appeng.api.AEApi; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; import appeng.api.config.FuzzyMode; @@ -67,7 +68,6 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.api.util.AEPartLocation; import appeng.core.AEConfig; -import appeng.core.Api; import appeng.items.parts.PartModels; import appeng.me.GridAccessException; @@ -92,7 +92,7 @@ public class PartFormationPlane extends PartAbstractFormationPlane return MODELS.getModels(); } - private final MEInventoryHandler myHandler = new MEInventoryHandler<>( this, Api.INSTANCE + private final MEInventoryHandler myHandler = new MEInventoryHandler<>( this, AEApi.instance() .storage() .getStorageChannel( IItemStorageChannel.class ) ); private final AppEngInternalAEInventory Config = new AppEngInternalAEInventory( this, 63 ); @@ -113,7 +113,7 @@ public class PartFormationPlane extends PartAbstractFormationPlane this.myHandler.setWhitelist( this.getInstalledUpgrades( Upgrades.INVERTER ) > 0 ? IncludeExclude.BLACKLIST : IncludeExclude.WHITELIST ); this.myHandler.setPriority( this.getPriority() ); - final IItemList priorityList = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + final IItemList priorityList = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); final int slotsToUse = 18 + this.getInstalledUpgrades( Upgrades.CAPACITY ) * 9; for( int x = 0; x < this.Config.getSlots() && x < slotsToUse; x++ ) @@ -208,7 +208,7 @@ public class PartFormationPlane extends PartAbstractFormationPlane @Override public List getCellArray( final IStorageChannel channel ) { - if( this.getProxy().isActive() && channel == Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ) + if( this.getProxy().isActive() && channel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) { final List handler = new ArrayList<>( 1 ); handler.add( this.myHandler ); @@ -368,7 +368,7 @@ public class PartFormationPlane extends PartAbstractFormationPlane @Override public IStorageChannel getChannel() { - return Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ); + return AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ); } @Override @@ -380,7 +380,7 @@ public class PartFormationPlane extends PartAbstractFormationPlane @Override public ItemStack getItemStackRepresentation() { - return Api.INSTANCE.definitions().parts().formationPlane().maybeStack( 1 ).orElse( ItemStack.EMPTY ); + return AEApi.instance().definitions().parts().formationPlane().maybeStack( 1 ).orElse( ItemStack.EMPTY ); } @Override diff --git a/src/main/java/appeng/parts/automation/PartImportBus.java b/src/main/java/appeng/parts/automation/PartImportBus.java index 789f0e2bc..6bd3fae09 100644 --- a/src/main/java/appeng/parts/automation/PartImportBus.java +++ b/src/main/java/appeng/parts/automation/PartImportBus.java @@ -30,6 +30,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.Vec3d; +import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.FuzzyMode; import appeng.api.config.RedstoneMode; @@ -47,7 +48,6 @@ import appeng.api.storage.IMEMonitor; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.util.AECableType; -import appeng.core.Api; import appeng.core.AppEng; import appeng.core.settings.TickRates; import appeng.helpers.Reflected; @@ -99,9 +99,9 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin final IMEMonitor inv = this.getProxy() .getStorage() .getInventory( - Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ); + AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); - final IAEItemStack out = inv.injectItems( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createStack( stack ), + final IAEItemStack out = inv.injectItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( stack ), Actionable.SIMULATE, this.source ); if( out == null ) @@ -174,7 +174,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin final IMEMonitor inv = this.getProxy() .getStorage() .getInventory( - Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ); + AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); final IEnergyGrid energy = this.getProxy().getEnergy(); boolean Configured = false; @@ -234,7 +234,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin if( !newItems.isEmpty() ) { - final IAEItemStack aeStack = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createStack( newItems ); + final IAEItemStack aeStack = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( newItems ); final IAEItemStack failed = Platform.poweredInsert( energy, inv, aeStack, this.source ); if( failed != null ) diff --git a/src/main/java/appeng/parts/automation/PartLevelEmitter.java b/src/main/java/appeng/parts/automation/PartLevelEmitter.java index f3a4373e1..d2fcff0ec 100644 --- a/src/main/java/appeng/parts/automation/PartLevelEmitter.java +++ b/src/main/java/appeng/parts/automation/PartLevelEmitter.java @@ -38,6 +38,7 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; +import appeng.api.AEApi; import appeng.api.config.FuzzyMode; import appeng.api.config.LevelType; import appeng.api.config.RedstoneMode; @@ -73,7 +74,6 @@ import appeng.api.storage.data.IItemList; import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; import appeng.api.util.IConfigManager; -import appeng.core.Api; import appeng.core.AppEng; import appeng.helpers.Reflected; @@ -279,7 +279,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH this.updateState(); // no more item stuff.. - this.getProxy().getStorage().getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ).removeListener( this ); + this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ).removeListener( this ); } catch( final GridAccessException e ) { @@ -293,11 +293,11 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH { if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 || myStack == null ) { - this.getProxy().getStorage().getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ).addListener( this, this.getProxy().getGrid() ); + this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ).addListener( this, this.getProxy().getGrid() ); } else { - this.getProxy().getStorage().getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ).removeListener( this ); + this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ).removeListener( this ); if( this.myWatcher != null ) { @@ -305,7 +305,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH } } - this.updateReportingValue( this.getProxy().getStorage().getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ) ); + this.updateReportingValue( this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) ); } catch( final GridAccessException e ) { @@ -361,7 +361,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH @Override public void onStackChange( final IItemList o, final IAEStack fullStack, final IAEStack diffStack, final IActionSource src, final IStorageChannel chan ) { - if( chan == Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) && fullStack.equals( this.config.getAEStackInSlot( 0 ) ) && this.getInstalledUpgrades( Upgrades.FUZZY ) == 0 ) + if( chan == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) && fullStack.equals( this.config.getAEStackInSlot( 0 ) ) && this.getInstalledUpgrades( Upgrades.FUZZY ) == 0 ) { this.lastReportedValue = fullStack.getStackSize(); this.updateState(); @@ -406,7 +406,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH { try { - this.updateReportingValue( this.getProxy().getStorage().getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ) ); + this.updateReportingValue( this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) ); } catch( final GridAccessException e ) { diff --git a/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java b/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java index a9adb3b36..ebc840af9 100644 --- a/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java +++ b/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java @@ -40,7 +40,6 @@ import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.core.AELog; -import appeng.core.Api; import appeng.me.GridAccessException; import appeng.me.helpers.IGridProxyable; import appeng.me.storage.ITickingMonitor; @@ -219,7 +218,7 @@ class ItemHandlerAdapter implements IMEInventory, IBaseMonitor in = this.getInternalHandler(); - IItemList before = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + IItemList before = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); if( in != null ) { before = in.getAvailableItems( before ); @@ -370,7 +369,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC if( in != out ) { - IItemList after = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + IItemList after = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); if( out != null ) { after = out.getAvailableItems( after ); @@ -393,7 +392,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC IStorageMonitorable inventory = accessor.getInventory( this.mySrc ); if( inventory != null ) { - return inventory.getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ); + return inventory.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); } // So this could / can be a design decision. If the tile does support our custom capability, @@ -484,13 +483,13 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC { this.checkInterfaceVsStorageBus( target, this.getSide().getOpposite() ); - this.handler = new MEInventoryHandler( inv, Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ); + this.handler = new MEInventoryHandler( inv, AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); this.handler.setBaseAccess( (AccessRestriction) this.getConfigManager().getSetting( Settings.ACCESS ) ); this.handler.setWhitelist( this.getInstalledUpgrades( Upgrades.INVERTER ) > 0 ? IncludeExclude.BLACKLIST : IncludeExclude.WHITELIST ); this.handler.setPriority( this.priority ); - final IItemList priorityList = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + final IItemList priorityList = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); final int slotsToUse = 18 + this.getInstalledUpgrades( Upgrades.CAPACITY ) * 9; for( int x = 0; x < this.Config.getSlots() && x < slotsToUse; x++ ) @@ -583,7 +582,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC @Override public List getCellArray( final IStorageChannel channel ) { - if( channel == Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ) + if( channel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) { final IMEInventoryHandler out = this.getProxy().isActive() ? this.getInternalHandler() : null; if( out != null ) @@ -648,7 +647,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC @Override public ItemStack getItemStackRepresentation() { - return Api.INSTANCE.definitions().parts().storageBus().maybeStack( 1 ).orElse( ItemStack.EMPTY ); + return AEApi.instance().definitions().parts().storageBus().maybeStack( 1 ).orElse( ItemStack.EMPTY ); } @Override diff --git a/src/main/java/appeng/parts/misc/PartToggleBus.java b/src/main/java/appeng/parts/misc/PartToggleBus.java index e1e52c1a9..b7a8f2551 100644 --- a/src/main/java/appeng/parts/misc/PartToggleBus.java +++ b/src/main/java/appeng/parts/misc/PartToggleBus.java @@ -30,6 +30,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; +import appeng.api.AEApi; import appeng.api.exceptions.FailedConnectionException; import appeng.api.networking.IGridConnection; import appeng.api.networking.IGridNode; @@ -39,7 +40,6 @@ import appeng.api.parts.IPartModel; import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; import appeng.core.AELog; -import appeng.core.Api; import appeng.core.AppEng; import appeng.helpers.Reflected; import appeng.items.parts.PartModels; @@ -188,7 +188,7 @@ public class PartToggleBus extends PartBasicState { try { - this.connection = Api.INSTANCE.grid().createGridConnection( this.getProxy().getNode(), this.getOuterProxy().getNode() ); + this.connection = AEApi.instance().grid().createGridConnection( this.getProxy().getNode(), this.getOuterProxy().getNode() ); } catch( final FailedConnectionException e ) { diff --git a/src/main/java/appeng/parts/networking/PartCable.java b/src/main/java/appeng/parts/networking/PartCable.java index 335b1f710..8b7b3bae4 100644 --- a/src/main/java/appeng/parts/networking/PartCable.java +++ b/src/main/java/appeng/parts/networking/PartCable.java @@ -30,6 +30,7 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.PacketBuffer; import net.minecraft.util.Direction; +import appeng.api.AEApi; import appeng.api.config.SecurityPermissions; import appeng.api.definitions.IParts; import appeng.api.implementations.parts.IPartCable; @@ -45,7 +46,6 @@ import appeng.api.util.AECableType; import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; import appeng.api.util.IReadOnlyCollection; -import appeng.core.Api; import appeng.items.parts.ItemPart; import appeng.me.GridAccessException; import appeng.parts.AEBasePart; @@ -113,7 +113,7 @@ public class PartCable extends AEBasePart implements IPartCable { ItemStack newPart = null; - final IParts parts = Api.INSTANCE.definitions().parts(); + final IParts parts = AEApi.instance().definitions().parts(); if( this.getCableConnectionType() == AECableType.GLASS ) { diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java index b7cf5f8c5..c9139cbb3 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java @@ -31,6 +31,7 @@ import net.minecraft.network.PacketBuffer; import net.minecraft.util.Hand; import net.minecraft.util.math.Vec3d; +import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; import appeng.api.config.PowerUnits; @@ -46,7 +47,6 @@ import appeng.api.util.AECableType; import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; import appeng.core.AEConfig; -import appeng.core.Api; import appeng.me.GridAccessException; import appeng.me.cache.P2PCache; import appeng.me.cache.helpers.TunnelCollection; @@ -123,7 +123,7 @@ public abstract class PartP2PTunnel extends PartBasicSt return super.getItemStack( type ); } - final Optional maybeMEStack = Api.INSTANCE.definitions().parts().p2PTunnelME().maybeStack( 1 ); + final Optional maybeMEStack = AEApi.instance().definitions().parts().p2PTunnelME().maybeStack( 1 ); if( maybeMEStack.isPresent() ) { return maybeMEStack.get(); @@ -194,7 +194,7 @@ public abstract class PartP2PTunnel extends PartBasicSt // UniqueIdentifier id = GameRegistry.findUniqueIdentifierFor( is.getItem() ); // AELog.info( "ID:" + id.toString() + " : " + is.getItemDamage() ); - final TunnelType tt = Api.INSTANCE.registries().p2pTunnel().getTunnelTypeByItem( is ); + final TunnelType tt = AEApi.instance().registries().p2pTunnel().getTunnelTypeByItem( is ); if( !is.isEmpty() && is.getItem() instanceof IMemoryCard ) { final IMemoryCard mc = (IMemoryCard) is.getItem(); @@ -243,7 +243,7 @@ public abstract class PartP2PTunnel extends PartBasicSt { final ItemStack newType; - final IParts parts = Api.INSTANCE.definitions().parts(); + final IParts parts = AEApi.instance().definitions().parts(); switch( tt ) { diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java index ef6b83e7d..f352d36e1 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java @@ -30,6 +30,7 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Hand; +import appeng.api.AEApi; import appeng.api.exceptions.FailedConnectionException; import appeng.api.networking.GridFlags; import appeng.api.networking.IGridNode; @@ -41,7 +42,6 @@ import appeng.api.parts.IPartModel; import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; import appeng.core.AELog; -import appeng.core.Api; import appeng.core.settings.TickRates; import appeng.hooks.TickHandler; import appeng.items.parts.PartModels; @@ -241,7 +241,7 @@ public class PartP2PTunnelME extends PartP2PTunnel implements I { connections.getConnections() .put( me.getGridNode(), - new TunnelConnection( me, Api.INSTANCE + new TunnelConnection( me, AEApi.instance() .grid() .createGridConnection( this.outerProxy.getNode(), me.outerProxy.getNode() ) ) ); diff --git a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java index 1e1d7860d..41f237de9 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java @@ -34,6 +34,7 @@ import net.minecraft.util.math.Vec3d; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import appeng.api.AEApi; import appeng.api.implementations.parts.IPartStorageMonitor; import appeng.api.networking.security.IActionSource; import appeng.api.networking.storage.IStackWatcher; @@ -46,7 +47,6 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; import appeng.client.render.TesrRenderHelper; -import appeng.core.Api; import appeng.core.localization.PlayerMessages; import appeng.helpers.Reflected; import appeng.me.GridAccessException; @@ -225,7 +225,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements } this.updateReportingValue( - this.getProxy().getStorage().getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ) ); + this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) ); } } catch( final GridAccessException e ) diff --git a/src/main/java/appeng/parts/reporting/PartConversionMonitor.java b/src/main/java/appeng/parts/reporting/PartConversionMonitor.java index c365ff3d6..fc0757500 100644 --- a/src/main/java/appeng/parts/reporting/PartConversionMonitor.java +++ b/src/main/java/appeng/parts/reporting/PartConversionMonitor.java @@ -22,7 +22,6 @@ package appeng.parts.reporting; import java.util.Collections; import java.util.List; -import appeng.core.Api; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -180,7 +179,7 @@ public class PartConversionMonitor extends AbstractPartMonitor final IEnergySource energy = this.getProxy().getEnergy(); final IMEMonitor cell = this.getProxy() .getStorage() - .getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ); + .getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); if( allItems ) { @@ -236,7 +235,7 @@ public class PartConversionMonitor extends AbstractPartMonitor final IMEMonitor cell = this.getProxy() .getStorage() .getInventory( - Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ); + AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); input.setStackSize( count ); diff --git a/src/main/java/appeng/recipes/AEItemResolver.java b/src/main/java/appeng/recipes/AEItemResolver.java index 6d807c726..31206b796 100644 --- a/src/main/java/appeng/recipes/AEItemResolver.java +++ b/src/main/java/appeng/recipes/AEItemResolver.java @@ -19,6 +19,7 @@ package appeng.recipes; +import appeng.api.AEApi; import appeng.api.definitions.IDefinitions; import appeng.api.definitions.IItems; import appeng.api.definitions.IParts; @@ -27,7 +28,6 @@ import appeng.api.recipes.ResolverResult; import appeng.api.recipes.ResolverResultSet; import appeng.api.util.AEColor; import appeng.api.util.AEColoredItemDefinition; -import appeng.core.Api; import appeng.core.AppEng; import appeng.items.materials.ItemMaterial; import appeng.items.materials.MaterialType; @@ -45,7 +45,7 @@ public class AEItemResolver implements ISubItemResolver if( nameSpace.equals( AppEng.MOD_ID ) ) { - final IDefinitions definitions = Api.INSTANCE.definitions(); + final IDefinitions definitions = AEApi.instance().definitions(); final IItems items = definitions.items(); final IParts parts = definitions.parts(); diff --git a/src/main/java/appeng/recipes/game/DisassembleRecipe.java b/src/main/java/appeng/recipes/game/DisassembleRecipe.java index ee5e2db68..b2edcc2f7 100644 --- a/src/main/java/appeng/recipes/game/DisassembleRecipe.java +++ b/src/main/java/appeng/recipes/game/DisassembleRecipe.java @@ -19,12 +19,12 @@ package appeng.recipes.game; +import appeng.api.AEApi; import appeng.api.definitions.*; 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.core.AppEng; import net.minecraft.inventory.CraftingInventory; import net.minecraft.inventory.IInventory; @@ -59,7 +59,7 @@ public final class DisassembleRecipe extends SpecialRecipe { super( id ); - final IDefinitions definitions = Api.INSTANCE.definitions(); + final IDefinitions definitions = AEApi.instance().definitions(); final IBlocks blocks = definitions.blocks(); final IItems items = definitions.items(); final IMaterials mats = definitions.materials(); @@ -109,15 +109,15 @@ public final class DisassembleRecipe extends SpecialRecipe { ItemStack storageCellStack = maybeCellOutput.get(); // make sure the storage cell stackInSlot empty... - final IMEInventory cellInv = Api.INSTANCE + final IMEInventory cellInv = AEApi.instance() .registries() .cell() .getCellInventory( stackInSlot, null, - Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ); + AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); if( cellInv != null ) { final IItemList list = cellInv - .getAvailableItems( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList() ); + .getAvailableItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() ); if( !list.isEmpty() ) { return ItemStack.EMPTY; diff --git a/src/main/java/appeng/recipes/game/FacadeRecipe.java b/src/main/java/appeng/recipes/game/FacadeRecipe.java index ee2fd86d6..ee25fd147 100644 --- a/src/main/java/appeng/recipes/game/FacadeRecipe.java +++ b/src/main/java/appeng/recipes/game/FacadeRecipe.java @@ -19,9 +19,9 @@ package appeng.recipes.game; +import appeng.api.AEApi; import appeng.api.definitions.IComparableDefinition; import appeng.api.definitions.IDefinitions; -import appeng.core.Api; import appeng.core.AppEng; import appeng.items.parts.ItemFacade; import net.minecraft.inventory.CraftingInventory; @@ -47,7 +47,7 @@ public final class FacadeRecipe extends SpecialRecipe { super( id ); this.facade = facade; - final IDefinitions definitions = Api.INSTANCE.definitions(); + final IDefinitions definitions = AEApi.instance().definitions(); this.anchor = definitions.parts().cableAnchor(); } diff --git a/src/main/java/appeng/recipes/handlers/GrinderHandler.java b/src/main/java/appeng/recipes/handlers/GrinderHandler.java index d6f6c82f1..dc6f8f0d6 100644 --- a/src/main/java/appeng/recipes/handlers/GrinderHandler.java +++ b/src/main/java/appeng/recipes/handlers/GrinderHandler.java @@ -34,7 +34,7 @@ public class GrinderHandler implements IAERecipeFactory turns = JSONUtils.getInt( json, "turns" ); } - final IGrinderRegistry reg = Api.INSTANCE.registries().grinder(); + final IGrinderRegistry reg = AEApi.instance().registries().grinder(); for( int i = 0; i < input.length; ++i ) { final IGrinderRecipeBuilder builder = reg.builder(); diff --git a/src/main/java/appeng/recipes/handlers/InscriberHandler.java b/src/main/java/appeng/recipes/handlers/InscriberHandler.java index 1e851f2b8..89a048d62 100644 --- a/src/main/java/appeng/recipes/handlers/InscriberHandler.java +++ b/src/main/java/appeng/recipes/handlers/InscriberHandler.java @@ -44,7 +44,7 @@ public class InscriberHandler implements IAERecipeFactory bottom = CraftingHelper.getIngredient( JSONUtils.getJsonObject( ingredients, "bottom" ), ctx ).getMatchingStacks(); } - final IInscriberRegistry reg = Api.INSTANCE.registries().inscriber(); + final IInscriberRegistry reg = AEApi.instance().registries().inscriber(); for( int i = 0; i < top.length; ++i ) { for( int j = 0; j < bottom.length; ++j ) diff --git a/src/main/java/appeng/recipes/ingredients/PartIngredientSerializer.java b/src/main/java/appeng/recipes/ingredients/PartIngredientSerializer.java index 7ff5ffe69..64d9ae9ee 100644 --- a/src/main/java/appeng/recipes/ingredients/PartIngredientSerializer.java +++ b/src/main/java/appeng/recipes/ingredients/PartIngredientSerializer.java @@ -19,10 +19,10 @@ package appeng.recipes.ingredients; +import appeng.api.AEApi; import appeng.api.recipes.ResolverResult; import appeng.api.recipes.ResolverResultSet; import appeng.core.AELog; -import appeng.core.Api; import appeng.core.AppEng; import com.google.gson.JsonObject; import net.minecraft.item.Item; @@ -66,7 +66,7 @@ public class PartIngredientSerializer implements IIngredientSerializer maybeBlock = Api.INSTANCE.definitions().blocks().skyStoneBlock().maybeBlock(); + Optional maybeBlock = AEApi.instance().definitions().blocks().skyStoneBlock().maybeBlock(); if( maybeBlock.isPresent() ) { Block skyStoneBlock = maybeBlock.get(); diff --git a/src/main/java/appeng/spatial/CachedPlane.java b/src/main/java/appeng/spatial/CachedPlane.java index d348f3bc1..a95330489 100644 --- a/src/main/java/appeng/spatial/CachedPlane.java +++ b/src/main/java/appeng/spatial/CachedPlane.java @@ -59,7 +59,7 @@ public class CachedPlane private final List tiles = new ArrayList<>(); private final List ticks = new ArrayList<>(); private final World world; - private final IMovableRegistry reg = Api.INSTANCE.registries().movable(); + private final IMovableRegistry reg = AEApi.instance().registries().movable(); private final List updates = new ArrayList<>(); private int verticalBits; private final BlockState matrixBlockState; @@ -67,7 +67,7 @@ public class CachedPlane public CachedPlane( final World w, final int minX, final int minY, final int minZ, final int maxX, final int maxY, final int maxZ ) { - Block matrixFrameBlock = Api.INSTANCE.definitions().blocks().matrixFrame().maybeBlock().orElse( null ); + Block matrixFrameBlock = AEApi.instance().definitions().blocks().matrixFrame().maybeBlock().orElse( null ); if( matrixFrameBlock != null ) { this.matrixBlockState = matrixFrameBlock.getDefaultState(); @@ -115,7 +115,7 @@ public class CachedPlane } } - final IMovableRegistry mr = Api.INSTANCE.registries().movable(); + final IMovableRegistry mr = AEApi.instance().registries().movable(); for( int cx = 0; cx < this.cx_size; cx++ ) { @@ -203,13 +203,13 @@ public class CachedPlane private IMovableHandler getHandler( final TileEntity te ) { - final IMovableRegistry mr = Api.INSTANCE.registries().movable(); + final IMovableRegistry mr = AEApi.instance().registries().movable(); return mr.getHandler( te ); } void swap( final CachedPlane dst ) { - final IMovableRegistry mr = Api.INSTANCE.registries().movable(); + final IMovableRegistry mr = AEApi.instance().registries().movable(); if( dst.x_size == this.x_size && dst.y_size == this.y_size && dst.z_size == this.z_size ) { diff --git a/src/main/java/appeng/spatial/StorageChunkProvider.java b/src/main/java/appeng/spatial/StorageChunkProvider.java index 2e44f154e..a840a9352 100644 --- a/src/main/java/appeng/spatial/StorageChunkProvider.java +++ b/src/main/java/appeng/spatial/StorageChunkProvider.java @@ -59,7 +59,7 @@ public class StorageChunkProvider extends ChunkGeneratorOverworld biomes[k] = biomeId; } - Api.INSTANCE.definitions().blocks().matrixFrame().maybeBlock().ifPresent( block -> this.fillChunk( chunk, block.getDefaultState() ) ); + AEApi.instance().definitions().blocks().matrixFrame().maybeBlock().ifPresent( block -> this.fillChunk( chunk, block.getDefaultState() ) ); chunk.setModified( false ); diff --git a/src/main/java/appeng/spatial/StorageHelper.java b/src/main/java/appeng/spatial/StorageHelper.java index 6714c0aff..78a3ba2e0 100644 --- a/src/main/java/appeng/spatial/StorageHelper.java +++ b/src/main/java/appeng/spatial/StorageHelper.java @@ -22,7 +22,6 @@ package appeng.spatial; import java.util.ArrayList; import java.util.List; -import appeng.core.Api; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; @@ -163,7 +162,7 @@ public class StorageHelper public void swapRegions( final World srcWorld, final int srcX, final int srcY, final int srcZ, final World dstWorld, final int dstX, final int dstY, final int dstZ, final int scaleX, final int scaleY, final int scaleZ ) { - Api.INSTANCE + AEApi.instance() .definitions() .blocks() .matrixFrame() diff --git a/src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java b/src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java index 3b24de613..c7673f474 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java +++ b/src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.util.Optional; import appeng.block.AEBaseTileBlock; -import appeng.core.Api; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -33,6 +32,7 @@ import net.minecraft.util.Direction; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import appeng.api.AEApi; import appeng.api.implementations.tiles.IColorableTile; import appeng.api.storage.data.IAEItemStack; import appeng.api.util.AEColor; @@ -196,7 +196,7 @@ public class TileCraftingMonitorTile extends TileCraftingTile implements IColora @Override protected ItemStack getItemFromTile( final Object obj ) { - final Optional is = Api.INSTANCE.definitions().blocks().craftingMonitor().maybeStack( 1 ); + final Optional is = AEApi.instance().definitions().blocks().craftingMonitor().maybeStack( 1 ); return is.orElseGet( () -> super.getItemFromTile( obj ) ); } diff --git a/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java b/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java index 27a514700..707965ba3 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java +++ b/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java @@ -21,9 +21,9 @@ package appeng.tile.crafting; import java.util.Optional; -import appeng.core.Api; import net.minecraft.item.ItemStack; +import appeng.api.AEApi; import appeng.api.definitions.IBlocks; import appeng.block.crafting.AbstractCraftingUnitBlock; import net.minecraft.tileentity.TileEntityType; @@ -40,7 +40,7 @@ public class TileCraftingStorageTile extends TileCraftingTile @Override protected ItemStack getItemFromTile( final Object obj ) { - final IBlocks blocks = Api.INSTANCE.definitions().blocks(); + final IBlocks blocks = AEApi.instance().definitions().blocks(); final int storage = ( (TileCraftingTile) obj ).getStorageBytes() / KILO_SCALAR; Optional is; diff --git a/src/main/java/appeng/tile/crafting/TileCraftingTile.java b/src/main/java/appeng/tile/crafting/TileCraftingTile.java index c556cef0e..ed39048c7 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingTile.java +++ b/src/main/java/appeng/tile/crafting/TileCraftingTile.java @@ -26,7 +26,6 @@ import java.util.LinkedList; import java.util.Optional; import appeng.client.render.crafting.CraftingCubeState; -import appeng.core.Api; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -34,6 +33,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; +import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.implementations.IPowerChannelState; import appeng.api.networking.GridFlags; @@ -95,11 +95,11 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP if( ( (TileCraftingTile) obj ).isAccelerator() ) { - is = Api.INSTANCE.definitions().blocks().craftingAccelerator().maybeStack( 1 ); + is = AEApi.instance().definitions().blocks().craftingAccelerator().maybeStack( 1 ); } else { - is = Api.INSTANCE.definitions().blocks().craftingUnit().maybeStack( 1 ); + is = AEApi.instance().definitions().blocks().craftingUnit().maybeStack( 1 ); } return is.orElseGet( () -> super.getItemFromTile( obj ) ); @@ -331,7 +331,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP throw new IllegalStateException( this.cluster + " does not contain any kind of blocks, which were destroyed." ); } - for( IAEItemStack ais : inv.getAvailableItems( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList() ) ) + for( IAEItemStack ais : inv.getAvailableItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() ) ) { ais = ais.copy(); ais.setStackSize( ais.getDefinition().getMaxStackSize() ); diff --git a/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java b/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java index 3e46a01d2..e585cdc2a 100644 --- a/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java +++ b/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java @@ -22,7 +22,6 @@ package appeng.tile.crafting; import java.io.IOException; import java.util.List; -import appeng.core.Api; import appeng.core.sync.network.TargetPoint; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; @@ -37,6 +36,7 @@ import net.minecraft.world.server.ServerWorld; 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; @@ -99,7 +99,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade public TileMolecularAssembler(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); - final ITileDefinition assembler = Api.INSTANCE.definitions().blocks().molecularAssembler(); + final ITileDefinition assembler = AEApi.instance().definitions().blocks().molecularAssembler(); this.settings = new ConfigManager( this ); this.settings.registerSetting( Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE ); diff --git a/src/main/java/appeng/tile/grindstone/TileGrinder.java b/src/main/java/appeng/tile/grindstone/TileGrinder.java index 8f19e0b9c..11de2bf18 100644 --- a/src/main/java/appeng/tile/grindstone/TileGrinder.java +++ b/src/main/java/appeng/tile/grindstone/TileGrinder.java @@ -22,7 +22,6 @@ package appeng.tile.grindstone; import java.util.ArrayList; import java.util.List; -import appeng.core.Api; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityType; @@ -97,7 +96,7 @@ public class TileGrinder extends AEBaseInvTile implements ICrankable continue; } - final IGrinderRecipe r = Api.INSTANCE.registries().grinder().getRecipeForInput( item ); + final IGrinderRecipe r = AEApi.instance().registries().grinder().getRecipeForInput( item ); if( r != null ) { if( item.getCount() >= r.getInput().getCount() ) @@ -133,7 +132,7 @@ public class TileGrinder extends AEBaseInvTile implements ICrankable this.points++; final ItemStack processing = this.inv.getStackInSlot( 6 ); - final IGrinderRecipe r = Api.INSTANCE.registries().grinder().getRecipeForInput( processing ); + final IGrinderRecipe r = AEApi.instance().registries().grinder().getRecipeForInput( processing ); if( r != null ) { if( r.getRequiredTurns() > this.points ) @@ -204,7 +203,7 @@ public class TileGrinder extends AEBaseInvTile implements ICrankable @Override public boolean allowInsert( IItemHandler inv, int slotIndex, ItemStack stack ) { - if( Api.INSTANCE.registries().grinder().getRecipeForInput( stack ) == null ) + if( AEApi.instance().registries().grinder().getRecipeForInput( stack ) == null ) { return false; } diff --git a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java index 400fcba49..3481b9cd4 100644 --- a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java +++ b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java @@ -23,7 +23,6 @@ import java.util.Iterator; import javax.annotation.Nonnull; -import appeng.core.Api; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.items.IItemHandlerModifiable; @@ -178,7 +177,7 @@ public class AppEngInternalAEInventory implements IItemHandlerModifiable, Iterab { if( existing.isEmpty() ) { - this.inv[slot] = Api.INSTANCE + this.inv[slot] = AEApi.instance() .storage() .getStorageChannel( IItemStorageChannel.class ) .createStack( @@ -227,7 +226,7 @@ public class AppEngInternalAEInventory implements IItemHandlerModifiable, Iterab public void setStackInSlot( final int slot, final ItemStack newItemStack ) { ItemStack oldStack = this.getStackInSlot( slot ).copy(); - this.inv[slot] = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createStack( newItemStack ); + this.inv[slot] = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( newItemStack ); if( this.te != null && Platform.isServer() ) { diff --git a/src/main/java/appeng/tile/misc/CondenserItemInventory.java b/src/main/java/appeng/tile/misc/CondenserItemInventory.java index 6c39d8586..d9b121a3b 100644 --- a/src/main/java/appeng/tile/misc/CondenserItemInventory.java +++ b/src/main/java/appeng/tile/misc/CondenserItemInventory.java @@ -23,7 +23,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map.Entry; -import appeng.core.Api; import net.minecraft.item.ItemStack; import appeng.api.AEApi; @@ -105,7 +104,7 @@ class CondenserItemInventory implements IMEMonitor, ITickingMonito @Override public IStorageChannel getChannel() { - return Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ); + return AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ); } @Override diff --git a/src/main/java/appeng/tile/misc/TileCharger.java b/src/main/java/appeng/tile/misc/TileCharger.java index a4b07043a..508dd7e66 100644 --- a/src/main/java/appeng/tile/misc/TileCharger.java +++ b/src/main/java/appeng/tile/misc/TileCharger.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.EnumSet; import java.util.List; -import appeng.core.Api; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; @@ -32,6 +31,7 @@ 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; @@ -129,7 +129,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable, IGrid final ItemStack myItem = this.inv.getStackInSlot( 0 ); if( this.getInternalCurrentPower() > POWER_THRESHOLD ) { - final IMaterials materials = Api.INSTANCE.definitions().materials(); + final IMaterials materials = AEApi.instance().definitions().materials(); if( materials.certusQuartzCrystal().isSameAs( myItem ) ) { @@ -179,7 +179,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable, IGrid { ItemStack held = player.inventory.getCurrentItem(); - if( Api.INSTANCE.definitions().materials().certusQuartzCrystal().isSameAs( held ) || Platform.isChargeable( held ) ) + if( AEApi.instance().definitions().materials().certusQuartzCrystal().isSameAs( held ) || Platform.isChargeable( held ) ) { held = player.inventory.decrStackSize( player.inventory.currentItem, 1 ); this.inv.setStackInSlot( 0, held ); @@ -213,7 +213,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable, IGrid if( !myItem.isEmpty() ) { - final IMaterials materials = Api.INSTANCE.definitions().materials(); + final IMaterials materials = AEApi.instance().definitions().materials(); if( Platform.isChargeable( myItem ) ) { @@ -221,7 +221,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable, IGrid if( ps.getAEMaxPower( myItem ) > ps.getAECurrentPower( myItem ) ) { - final double chargeRate = Api.INSTANCE.registries().charger().getChargeRate( myItem.getItem() ); + final double chargeRate = AEApi.instance().registries().charger().getChargeRate( myItem.getItem() ); double extractedAmount = this.extractAEPower( chargeRate, Actionable.MODULATE, PowerMultiplier.CONFIG ); @@ -292,7 +292,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable, IGrid @Override public boolean allowInsert( IItemHandler inv, final int i, final ItemStack itemstack ) { - final IItemDefinition cert = Api.INSTANCE.definitions().materials().certusQuartzCrystal(); + final IItemDefinition cert = AEApi.instance().definitions().materials().certusQuartzCrystal(); return Platform.isChargeable( itemstack ) || cert.isSameAs( itemstack ); } @@ -311,7 +311,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable, IGrid } } - return Api.INSTANCE.definitions().materials().certusQuartzCrystalCharged().isSameAs( extractedItem ); + return AEApi.instance().definitions().materials().certusQuartzCrystalCharged().isSameAs( extractedItem ); } } } diff --git a/src/main/java/appeng/tile/misc/TileCondenser.java b/src/main/java/appeng/tile/misc/TileCondenser.java index 2fae42de4..1c1b8e475 100644 --- a/src/main/java/appeng/tile/misc/TileCondenser.java +++ b/src/main/java/appeng/tile/misc/TileCondenser.java @@ -22,7 +22,6 @@ package appeng.tile.misc; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import appeng.core.Api; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntityType; @@ -167,7 +166,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost, private ItemStack getOutput() { - final IMaterials materials = Api.INSTANCE.definitions().materials(); + final IMaterials materials = AEApi.instance().definitions().materials(); switch( (CondenserOutput) this.cm.getSetting( Settings.CONDENSER_OUTPUT ) ) { @@ -325,7 +324,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost, public int fill(FluidStack resource, FluidAction action) { if( action == FluidAction.EXECUTE ) { - final IStorageChannel chan = Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ); + final IStorageChannel chan = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ); TileCondenser.this.addPower( ( resource == null ? 0.0 : (double) resource.getAmount() ) / chan.transferFactor() ); } @@ -392,7 +391,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost, @Override public > IMEMonitor getInventory( IStorageChannel channel ) { - if( channel == Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ) + if( channel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) { return (IMEMonitor) this.itemInventory; } diff --git a/src/main/java/appeng/tile/misc/TileInscriber.java b/src/main/java/appeng/tile/misc/TileInscriber.java index 34898cfdb..dde8f10c9 100644 --- a/src/main/java/appeng/tile/misc/TileInscriber.java +++ b/src/main/java/appeng/tile/misc/TileInscriber.java @@ -26,7 +26,6 @@ import java.util.List; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import appeng.core.Api; import com.google.common.collect.Lists; import net.minecraft.item.ItemStack; @@ -39,6 +38,7 @@ 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.Upgrades; @@ -110,7 +110,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, this.getProxy().setIdlePowerUsage( 0 ); this.settings = new ConfigManager( this ); - final ITileDefinition inscriberDefinition = Api.INSTANCE.definitions().blocks().inscriber(); + final ITileDefinition inscriberDefinition = AEApi.instance().definitions().blocks().inscriber(); this.upgrades = new DefinitionUpgradeInventory( inscriberDefinition, this, this.getUpgradeSlots() ); this.sideItemHandler.setMaxStackSize( 1, 64 ); @@ -306,7 +306,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, return null; } - final IComparableDefinition namePress = Api.INSTANCE.definitions().materials().namePress(); + final IComparableDefinition namePress = AEApi.instance().definitions().materials().namePress(); final boolean isNameA = namePress.isSameAs( plateA ); final boolean isNameB = namePress.isSameAs( plateB ); @@ -319,7 +319,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, return this.makeNamePressRecipe( input, plateB, plateA ); } - for( final IInscriberRecipe recipe : Api.INSTANCE.registries().inscriber().getRecipes() ) + for( final IInscriberRecipe recipe : AEApi.instance().registries().inscriber().getRecipes() ) { final boolean matchA = ( plateA.isEmpty() && !recipe.getTopOptional().isPresent() ) || ( Platform.itemComparisons() @@ -559,7 +559,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, final List inputs = Lists.newArrayList( startingItem ); final InscriberProcessType type = InscriberProcessType.INSCRIBE; - final IInscriberRecipeBuilder builder = Api.INSTANCE.registries().inscriber().builder(); + final IInscriberRecipeBuilder builder = AEApi.instance().registries().inscriber().builder(); builder.withInputs( inputs ).withOutput( renamedItem ).withProcessType( type ); if( !plateA.isEmpty() ) @@ -609,11 +609,11 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, if( inv == TileInscriber.this.topItemHandler || inv == TileInscriber.this.bottomItemHandler ) { - if( Api.INSTANCE.definitions().materials().namePress().isSameAs( stack ) ) + if( AEApi.instance().definitions().materials().namePress().isSameAs( stack ) ) { return true; } - for( final ItemStack optionals : Api.INSTANCE.registries().inscriber().getOptionals() ) + for( final ItemStack optionals : AEApi.instance().registries().inscriber().getOptionals() ) { if( Platform.itemComparisons().isSameItem( stack, optionals ) ) { diff --git a/src/main/java/appeng/tile/misc/TileInterface.java b/src/main/java/appeng/tile/misc/TileInterface.java index c578cb07d..1da40b644 100644 --- a/src/main/java/appeng/tile/misc/TileInterface.java +++ b/src/main/java/appeng/tile/misc/TileInterface.java @@ -26,7 +26,6 @@ import java.util.List; import javax.annotation.Nullable; import appeng.container.implementations.ContainerInterface; -import appeng.core.Api; import com.google.common.collect.ImmutableSet; import net.minecraft.inventory.CraftingInventory; @@ -43,6 +42,7 @@ 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; @@ -359,7 +359,7 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II @Override public ItemStack getItemStackRepresentation() { - return Api.INSTANCE.definitions().blocks().iface().maybeStack( 1 ).orElse( ItemStack.EMPTY ); + return AEApi.instance().definitions().blocks().iface().maybeStack( 1 ).orElse( ItemStack.EMPTY ); } @Override diff --git a/src/main/java/appeng/tile/misc/TileSecurityStation.java b/src/main/java/appeng/tile/misc/TileSecurityStation.java index 9f781b4eb..08940275a 100644 --- a/src/main/java/appeng/tile/misc/TileSecurityStation.java +++ b/src/main/java/appeng/tile/misc/TileSecurityStation.java @@ -24,7 +24,6 @@ import java.util.EnumSet; import java.util.List; import java.util.Map; -import appeng.core.Api; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -38,6 +37,7 @@ 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; @@ -278,7 +278,7 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost, @Override public > IMEMonitor getInventory( IStorageChannel channel ) { - if( channel == Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ) + if( channel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) { return (IMEMonitor) this.securityMonitor; } @@ -318,7 +318,7 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost, @Override public void readPermissions( final Map> playerPerms ) { - final IPlayerRegistry pr = Api.INSTANCE.registries().players(); + final IPlayerRegistry pr = AEApi.instance().registries().players(); // read permissions for( final IAEItemStack ais : this.inventory.getStoredItems() ) diff --git a/src/main/java/appeng/tile/networking/TileWireless.java b/src/main/java/appeng/tile/networking/TileWireless.java index 88346e58f..2553aa895 100644 --- a/src/main/java/appeng/tile/networking/TileWireless.java +++ b/src/main/java/appeng/tile/networking/TileWireless.java @@ -22,13 +22,13 @@ package appeng.tile.networking; import java.io.IOException; import java.util.EnumSet; -import appeng.core.Api; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; 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; @@ -60,7 +60,7 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi public TileWireless(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); - this.inv.setFilter( new AEItemDefinitionFilter( Api.INSTANCE.definitions().materials().wirelessBooster() ) ); + this.inv.setFilter( new AEItemDefinitionFilter( AEApi.instance().definitions().materials().wirelessBooster() ) ); this.getProxy().setFlags( GridFlags.REQUIRE_CHANNEL ); this.getProxy().setValidSides( EnumSet.noneOf( Direction.class ) ); } diff --git a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java index 454aa98e4..07b7ac0bb 100644 --- a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java +++ b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java @@ -24,7 +24,6 @@ import java.util.EnumSet; import java.util.Optional; import appeng.block.qnb.QnbFormedState; -import appeng.core.Api; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -39,6 +38,7 @@ 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; @@ -150,7 +150,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock private boolean isCenter() { - return Api.INSTANCE + return AEApi.instance() .definitions() .blocks() .quantumLink() @@ -177,7 +177,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock { super.onReady(); - final IBlockDefinition quantumRing = Api.INSTANCE.definitions().blocks().quantumRing(); + final IBlockDefinition quantumRing = AEApi.instance().definitions().blocks().quantumRing(); final Optional maybeLinkBlock = quantumRing.maybeBlock(); final Optional maybeLinkStack = quantumRing.maybeStack( 1 ); diff --git a/src/main/java/appeng/tile/storage/TileChest.java b/src/main/java/appeng/tile/storage/TileChest.java index c6bb7745e..4d4fa1089 100644 --- a/src/main/java/appeng/tile/storage/TileChest.java +++ b/src/main/java/appeng/tile/storage/TileChest.java @@ -29,7 +29,6 @@ import javax.annotation.Nullable; import appeng.block.storage.BlockChest; import appeng.block.storage.DriveSlotState; import appeng.container.implementations.ContainerMEMonitorable; -import appeng.core.Api; import appeng.fluids.container.ContainerFluidTerminal; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; @@ -50,6 +49,7 @@ 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; @@ -228,12 +228,12 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal if( !is.isEmpty() ) { this.isCached = true; - ICellHandler cellHandler = Api.INSTANCE.registries().cell().getHandler( is ); + ICellHandler cellHandler = AEApi.instance().registries().cell().getHandler( is ); if( cellHandler != null ) { double power = 1.0; - for( IStorageChannel channel : Api.INSTANCE.storage().storageChannels() ) + for( IStorageChannel channel : AEApi.instance().storage().storageChannels() ) { final ICellInventoryHandler newCell = cellHandler.getCellInventory( is, this, channel ); if( newCell != null ) @@ -248,7 +248,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal this.accessor = new Accessor(); if( this.cellHandler != null && this.cellHandler - .getChannel() == Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ) ) + .getChannel() == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) ) { this.fluidHandler = new FluidHandler(); } @@ -284,7 +284,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal this.updateHandler(); final ItemStack cell = this.getCell(); - final ICellHandler ch = Api.INSTANCE.registries().cell().getHandler( cell ); + final ICellHandler ch = AEApi.instance().registries().cell().getHandler( cell ); if( this.cellHandler != null && ch != null ) { @@ -541,7 +541,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal { this.updateHandler(); - if( this.cellHandler != null && this.cellHandler.getChannel() == Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ) + if( this.cellHandler != null && this.cellHandler.getChannel() == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) { final IAEItemStack returns = Platform.poweredInsert( this, this.cellHandler, AEItemStack.fromItemStack( this.inputInventory.getStackInSlot( 0 ) ), this.mySrc ); @@ -628,11 +628,11 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal this.updateHandler(); if( this.cellHandler != null ) { - final ICellHandler ch = Api.INSTANCE.registries().cell().getHandler( this.getCell() ); + final ICellHandler ch = AEApi.instance().registries().cell().getHandler( this.getCell() ); if( ch != null ) { - final ICellGuiHandler chg = Api.INSTANCE.registries().cell().getGuiHandler( this.cellHandler.getChannel(), this.getCell() ); + final ICellGuiHandler chg = AEApi.instance().registries().cell().getGuiHandler( this.cellHandler.getChannel(), this.getCell() ); if( chg != null ) { chg.openChestGui( p, this, ch, this.cellHandler, this.getCell(), this.cellHandler.getChannel() ); @@ -831,7 +831,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal { private boolean canAcceptLiquids() { - return TileChest.this.cellHandler != null && TileChest.this.cellHandler.getChannel() == Api.INSTANCE.storage().getStorageChannel(IFluidStorageChannel.class); + return TileChest.this.cellHandler != null && TileChest.this.cellHandler.getChannel() == AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class); } @Nonnull @@ -921,7 +921,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal { TileChest.this.updateHandler(); return TileChest.this.cellHandler != null && TileChest.this.cellHandler - .getChannel() == Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ); + .getChannel() == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ); } return false; } @@ -939,7 +939,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal @Override public boolean allowInsert( IItemHandler inv, int slot, ItemStack stack ) { - return Api.INSTANCE.registries().cell().getHandler( stack ) != null; + return AEApi.instance().registries().cell().getHandler( stack ) != null; } } @@ -947,7 +947,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal @Override public ItemStack getItemStackRepresentation() { - return Api.INSTANCE.definitions().blocks().chest().maybeStack( 1 ).orElse( ItemStack.EMPTY ); + return AEApi.instance().definitions().blocks().chest().maybeStack( 1 ).orElse( ItemStack.EMPTY ); } @Override @@ -956,11 +956,11 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal this.updateHandler(); if( this.cellHandler != null ) { - if( this.cellHandler.getChannel() == Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ) + if( this.cellHandler.getChannel() == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) { return ContainerMEMonitorable.TYPE; } - if( this.cellHandler.getChannel() == Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ) ) + if( this.cellHandler.getChannel() == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) ) { return ContainerFluidTerminal.TYPE; } diff --git a/src/main/java/appeng/tile/storage/TileDrive.java b/src/main/java/appeng/tile/storage/TileDrive.java index b8bf81bd2..cf58702a2 100644 --- a/src/main/java/appeng/tile/storage/TileDrive.java +++ b/src/main/java/appeng/tile/storage/TileDrive.java @@ -30,7 +30,6 @@ import java.util.Map; import appeng.block.AEBaseTileBlock; import appeng.block.storage.DriveSlotsState; import appeng.container.implementations.ContainerDrive; -import appeng.core.Api; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -41,6 +40,7 @@ import net.minecraftforge.client.model.data.ModelDataMap; import net.minecraftforge.client.model.data.ModelProperty; import net.minecraftforge.items.IItemHandler; +import appeng.api.AEApi; import appeng.api.implementations.tiles.IChestOrDrive; import appeng.api.networking.GridFlags; import appeng.api.networking.events.MENetworkCellArrayUpdate; @@ -290,7 +290,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior { if( !this.isCached ) { - final Collection>> storageChannels = Api.INSTANCE.storage().storageChannels(); + final Collection>> storageChannels = AEApi.instance().storage().storageChannels(); storageChannels.forEach( channel -> this.inventoryHandlers.put( channel, new ArrayList<>( 10 ) ) ); double power = 2.0; @@ -303,7 +303,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior if( !is.isEmpty() ) { - this.handlersBySlot[x] = Api.INSTANCE.registries().cell().getHandler( is ); + this.handlersBySlot[x] = AEApi.instance().registries().cell().getHandler( is ); if( this.handlersBySlot[x] != null ) { @@ -405,7 +405,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior @Override public boolean allowInsert( IItemHandler inv, int slot, ItemStack stack ) { - return !stack.isEmpty() && Api.INSTANCE.registries().cell().isCellHandled( stack ); + return !stack.isEmpty() && AEApi.instance().registries().cell().isCellHandled( stack ); } } @@ -413,7 +413,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior @Override public ItemStack getItemStackRepresentation() { - return Api.INSTANCE.definitions().blocks().drive().maybeStack( 1 ).orElse( ItemStack.EMPTY ); + return AEApi.instance().definitions().blocks().drive().maybeStack( 1 ).orElse( ItemStack.EMPTY ); } @Nonnull diff --git a/src/main/java/appeng/tile/storage/TileIOPort.java b/src/main/java/appeng/tile/storage/TileIOPort.java index e49c58476..ca9386555 100644 --- a/src/main/java/appeng/tile/storage/TileIOPort.java +++ b/src/main/java/appeng/tile/storage/TileIOPort.java @@ -23,7 +23,6 @@ import java.util.IdentityHashMap; import java.util.List; import java.util.Map; -import appeng.core.Api; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -107,7 +106,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC this.mySrc = new MachineSource( this ); this.lastRedstoneState = YesNo.UNDECIDED; - final Block ioPortBlock = Api.INSTANCE.definitions().blocks().iOPort().maybeBlock().get(); + final Block ioPortBlock = AEApi.instance().definitions().blocks().iOPort().maybeBlock().get(); this.upgrades = new BlockUpgradeInventory( ioPortBlock, this, NUMBER_OF_UPGRADE_SLOTS ); } @@ -305,7 +304,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC { boolean shouldMove = true; - for( IStorageChannel> c : Api.INSTANCE.storage().storageChannels() ) + for( IStorageChannel> c : AEApi.instance().storage().storageChannels() ) { if( itemsToMove > 0 ) { @@ -372,9 +371,9 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC this.currentCell = is; this.cachedInventories = new IdentityHashMap<>(); - for( IStorageChannel> c : Api.INSTANCE.storage().storageChannels() ) + for( IStorageChannel> c : AEApi.instance().storage().storageChannels() ) { - this.cachedInventories.put( c, Api.INSTANCE.registries().cell().getCellInventory( is, null, c ) ); + this.cachedInventories.put( c, AEApi.instance().registries().cell().getCellInventory( is, null, c ) ); } } diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index e3cbc68c7..cd193337c 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -19,6 +19,7 @@ package appeng.util; +import appeng.api.AEApi; import appeng.api.config.*; import appeng.api.definitions.IItemDefinition; import appeng.api.features.AEFeature; @@ -44,7 +45,6 @@ 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; @@ -1180,13 +1180,13 @@ 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 : Api.INSTANCE.storage().storageChannels() ) + for( final IStorageChannel chan : AEApi.instance().storage().storageChannels() ) { final IItemList myChanges = chan.createList(); if( !removed.isEmpty() ) { - final IMEInventory myInv = Api.INSTANCE.registries().cell().getCellInventory( removed, null, chan ); + final IMEInventory myInv = AEApi.instance().registries().cell().getCellInventory( removed, null, chan ); if( myInv != null ) { myInv.getAvailableItems( myChanges ); @@ -1198,7 +1198,7 @@ public class Platform } if( !added.isEmpty() ) { - final IMEInventory myInv = Api.INSTANCE.registries().cell().getCellInventory( added, null, chan ); + final IMEInventory myInv = AEApi.instance().registries().cell().getCellInventory( added, null, chan ); if( myInv != null ) { myInv.getAvailableItems( myChanges ); @@ -1490,7 +1490,7 @@ public class Platform if( type == AEFeature.CERTUS_QUARTZ_TOOLS ) { - final IItemDefinition certusQuartzCrystal = Api.INSTANCE.definitions().materials().certusQuartzCrystal(); + final IItemDefinition certusQuartzCrystal = AEApi.instance().definitions().materials().certusQuartzCrystal(); return certusQuartzCrystal.isSameAs( b ); } @@ -1505,7 +1505,7 @@ public class Platform // public static List findPreferred( final ItemStack[] is ) // { -// final IParts parts = Api.INSTANCE.definitions().parts(); +// final IParts parts = AEApi.instance().definitions().parts(); // // for( final ItemStack stack : is ) // { @@ -1561,7 +1561,7 @@ public class Platform // // // public static void addStat( final int playerID, final Achievement achievement ) // // { -// // final EntityPlayer p = Api.INSTANCE.registries().players().findPlayer( playerID ); +// // final EntityPlayer p = AEApi.instance().registries().players().findPlayer( playerID ); // // if( p != null ) // // { // // p.addStat( achievement, 1 ); @@ -1570,7 +1570,7 @@ public class Platform // // public static boolean isRecipePrioritized( final ItemStack what ) // { -// final IMaterials materials = Api.INSTANCE.definitions().materials(); +// final IMaterials materials = AEApi.instance().definitions().materials(); // // boolean isPurified = materials.purifiedCertusQuartzCrystal().isSameAs( what ); // isPurified |= materials.purifiedFluixCrystal().isSameAs( what ); diff --git a/src/main/java/appeng/util/inv/IMEAdaptor.java b/src/main/java/appeng/util/inv/IMEAdaptor.java index f56d69c0d..e47875572 100644 --- a/src/main/java/appeng/util/inv/IMEAdaptor.java +++ b/src/main/java/appeng/util/inv/IMEAdaptor.java @@ -21,7 +21,6 @@ package appeng.util.inv; import java.util.Iterator; -import appeng.core.Api; import com.google.common.collect.ImmutableList; import net.minecraft.item.ItemStack; @@ -65,7 +64,7 @@ public class IMEAdaptor extends InventoryAdaptor private IItemList getList() { - return this.target.getAvailableItems( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList() ); + return this.target.getAvailableItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() ); } @Override diff --git a/src/main/java/appeng/util/item/AEItemStack.java b/src/main/java/appeng/util/item/AEItemStack.java index f9a13f10c..49224baa3 100644 --- a/src/main/java/appeng/util/item/AEItemStack.java +++ b/src/main/java/appeng/util/item/AEItemStack.java @@ -26,7 +26,6 @@ import java.util.Objects; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import appeng.core.Api; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -38,6 +37,7 @@ 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; @@ -189,7 +189,7 @@ public final class AEItemStack extends AEStack implements IAEItemS @Override public IStorageChannel getChannel() { - return Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ); + return AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ); } @Override diff --git a/src/main/java/appeng/util/item/ItemModList.java b/src/main/java/appeng/util/item/ItemModList.java index 3e09522c6..60268f679 100644 --- a/src/main/java/appeng/util/item/ItemModList.java +++ b/src/main/java/appeng/util/item/ItemModList.java @@ -21,18 +21,18 @@ 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 { private final IItemContainer backingStore; - private final IItemContainer overrides = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList(); + private final IItemContainer overrides = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); public ItemModList( final IItemContainer backend ) { diff --git a/src/main/java/appeng/worldgen/MeteoritePlacer.java b/src/main/java/appeng/worldgen/MeteoritePlacer.java index ca1b1e523..40e6ac655 100644 --- a/src/main/java/appeng/worldgen/MeteoritePlacer.java +++ b/src/main/java/appeng/worldgen/MeteoritePlacer.java @@ -24,7 +24,6 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; -import appeng.core.Api; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; @@ -37,6 +36,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import appeng.api.AEApi; import appeng.api.definitions.IBlockDefinition; import appeng.api.definitions.IBlocks; import appeng.api.definitions.IMaterials; @@ -71,7 +71,7 @@ public final class MeteoritePlacer public MeteoritePlacer() { - final IBlocks blocks = Api.INSTANCE.definitions().blocks(); + final IBlocks blocks = AEApi.instance().definitions().blocks(); this.skyChestDefinition = blocks.skyStoneChest(); this.skyStoneDefinition = blocks.skyStoneBlock(); @@ -246,7 +246,7 @@ public final class MeteoritePlacer } ItemStack toAdd = ItemStack.EMPTY; - final IMaterials materials = Api.INSTANCE.definitions().materials(); + final IMaterials materials = AEApi.instance().definitions().materials(); switch( r % 4 ) { diff --git a/src/main/java/appeng/worldgen/QuartzWorldGen.java b/src/main/java/appeng/worldgen/QuartzWorldGen.java index 268a172de..87ce83e4e 100644 --- a/src/main/java/appeng/worldgen/QuartzWorldGen.java +++ b/src/main/java/appeng/worldgen/QuartzWorldGen.java @@ -43,7 +43,7 @@ public final class QuartzWorldGen implements IWorldGenerator public QuartzWorldGen() { - final IBlocks blocks = Api.INSTANCE.definitions().blocks(); + final IBlocks blocks = AEApi.instance().definitions().blocks(); final IBlockDefinition oreDefinition = blocks.quartzOre(); final IBlockDefinition chargedDefinition = blocks.quartzOreCharged();