diff --git a/src/api/java/appeng/api/AEApi.java b/src/api/java/appeng/api/AEApi.java deleted file mode 100644 index 1ee908340..000000000 --- a/src/api/java/appeng/api/AEApi.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api; - -import java.lang.reflect.Field; - -import appeng.api.exceptions.CoreInaccessibleException; - -/** - * Entry point for api. - */ -public enum AEApi { - ; - - private static final String CORE_API_FQN = "appeng.core.Api"; - private static final String CORE_API_FIELD = "INSTANCE"; - private static final IAppEngApi HELD_API; - - static { - try { - final Class apiClass = Class.forName(CORE_API_FQN); - final Field apiField = apiClass.getField(CORE_API_FIELD); - - HELD_API = (IAppEngApi) apiField.get(apiClass); - } catch (final ClassNotFoundException e) { - throw new CoreInaccessibleException( - "AE2 API tried to access the " + CORE_API_FQN + " class, without it being declared."); - } catch (final NoSuchFieldException e) { - throw new CoreInaccessibleException("AE2 API tried to access the " + CORE_API_FIELD + " field in " - + CORE_API_FQN + " without it being declared."); - } catch (final IllegalAccessException e) { - throw new CoreInaccessibleException("AE2 API tried to access the " + CORE_API_FIELD + " field in " - + CORE_API_FQN + " without enough access permissions."); - } - } - - /** - * API Entry Point. - * - * @return the {@link IAppEngApi} - */ - public static IAppEngApi instance() { - return HELD_API; - } - -} diff --git a/src/api/java/appeng/api/AEInjectable.java b/src/api/java/appeng/api/AEInjectable.java deleted file mode 100644 index 014ab148e..000000000 --- a/src/api/java/appeng/api/AEInjectable.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. - * - * Applied Energistics 2 is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Applied Energistics 2 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Applied Energistics 2. If not, see . - */ - -package appeng.api; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Marks interfaces that can be used as injectable constructor arguments for an - * {@link AEAddon}. - */ -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface AEInjectable { -} diff --git a/src/api/java/appeng/api/IAppEngApi.java b/src/api/java/appeng/api/IAppEngApi.java index e09400db3..357ac1204 100644 --- a/src/api/java/appeng/api/IAppEngApi.java +++ b/src/api/java/appeng/api/IAppEngApi.java @@ -31,7 +31,6 @@ import appeng.api.parts.IPartHelper; import appeng.api.storage.IStorageHelper; import appeng.api.util.IClientHelper; -@AEInjectable public interface IAppEngApi { /** * @return Registry Container for the numerous registries in AE2. diff --git a/src/api/java/appeng/api/features/IRegistryContainer.java b/src/api/java/appeng/api/features/IRegistryContainer.java index a64494a30..0819f8123 100644 --- a/src/api/java/appeng/api/features/IRegistryContainer.java +++ b/src/api/java/appeng/api/features/IRegistryContainer.java @@ -23,7 +23,6 @@ package appeng.api.features; -import appeng.api.AEInjectable; import appeng.api.movable.IMovableRegistry; import appeng.api.networking.IGridCacheRegistry; import appeng.api.parts.IPartModels; @@ -36,7 +35,6 @@ import appeng.api.storage.ICellRegistry; * @version 7 * @since rv0 */ -@AEInjectable public interface IRegistryContainer { /** diff --git a/src/api/java/appeng/api/parts/IPartModels.java b/src/api/java/appeng/api/parts/IPartModels.java index f7dffd397..acef8443a 100644 --- a/src/api/java/appeng/api/parts/IPartModels.java +++ b/src/api/java/appeng/api/parts/IPartModels.java @@ -23,13 +23,10 @@ import java.util.Collection; import net.minecraft.util.ResourceLocation; -import appeng.api.AEInjectable; - /** * Allows registration of part models that can then be used in * {@link IPart#getStaticModels()}. */ -@AEInjectable public interface IPartModels { /** diff --git a/src/main/java/appeng/block/AEBaseBlockItemChargeable.java b/src/main/java/appeng/block/AEBaseBlockItemChargeable.java index 010fca5cb..988f201c1 100644 --- a/src/main/java/appeng/block/AEBaseBlockItemChargeable.java +++ b/src/main/java/appeng/block/AEBaseBlockItemChargeable.java @@ -32,12 +32,12 @@ 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.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; public class AEBaseBlockItemChargeable extends AEBaseBlockItem implements IAEItemPowerStorage { @@ -123,7 +123,7 @@ public class AEBaseBlockItemChargeable extends AEBaseBlockItem implements IAEIte private double getMaxEnergyCapacity() { final Block blockID = Block.getBlockFromItem(this); - final IBlockDefinition energyCell = AEApi.instance().definitions().blocks().energyCell(); + final IBlockDefinition energyCell = Api.instance().definitions().blocks().energyCell(); return energyCell.maybeBlock().map(block -> { if (blockID == block) { diff --git a/src/main/java/appeng/block/crafting/CraftingStorageItem.java b/src/main/java/appeng/block/crafting/CraftingStorageItem.java index b16cb538a..a984a45f7 100644 --- a/src/main/java/appeng/block/crafting/CraftingStorageItem.java +++ b/src/main/java/appeng/block/crafting/CraftingStorageItem.java @@ -21,10 +21,10 @@ package appeng.block.crafting; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import appeng.api.AEApi; import appeng.api.features.AEFeature; import appeng.block.AEBaseBlockItem; import appeng.core.AEConfig; +import appeng.core.Api; public class CraftingStorageItem extends AEBaseBlockItem { @@ -34,7 +34,7 @@ public class CraftingStorageItem extends AEBaseBlockItem { @Override public ItemStack getContainerItem(final ItemStack itemStack) { - return AEApi.instance().definitions().blocks().craftingUnit().maybeStack(1).orElse(ItemStack.EMPTY); + return Api.instance().definitions().blocks().craftingUnit().maybeStack(1).orElse(ItemStack.EMPTY); } @Override diff --git a/src/main/java/appeng/block/misc/ChargerBlock.java b/src/main/java/appeng/block/misc/ChargerBlock.java index 1a1edcccc..913ea3b9f 100644 --- a/src/main/java/appeng/block/misc/ChargerBlock.java +++ b/src/main/java/appeng/block/misc/ChargerBlock.java @@ -49,13 +49,13 @@ 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.effects.ParticleTypes; import appeng.client.render.renderable.ItemRenderable; import appeng.client.render.tesr.ModularTESR; import appeng.core.AEConfig; +import appeng.core.Api; import appeng.core.AppEng; import appeng.tile.misc.ChargerTileEntity; import appeng.util.Platform; @@ -101,7 +101,7 @@ public class ChargerBlock extends AEBaseTileBlock { final ChargerTileEntity tile = this.getTileEntity(w, pos); if (tile != null) { - if (AEApi.instance().definitions().materials().certusQuartzCrystalCharged() + if (Api.instance().definitions().materials().certusQuartzCrystalCharged() .isSameAs(tile.getInternalInventory().getStackInSlot(0))) { final double xOff = 0.0; final double yOff = 0.0; diff --git a/src/main/java/appeng/block/networking/CableBusBlock.java b/src/main/java/appeng/block/networking/CableBusBlock.java index 5621d605d..edb101ef9 100644 --- a/src/main/java/appeng/block/networking/CableBusBlock.java +++ b/src/main/java/appeng/block/networking/CableBusBlock.java @@ -18,7 +18,6 @@ package appeng.block.networking; -import java.util.EnumSet; import java.util.List; import java.util.Random; @@ -44,8 +43,11 @@ import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.NonNullList; -import net.minecraft.util.math.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.RayTraceResult.Type; +import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.math.shapes.VoxelShapes; diff --git a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java index 36ac3479f..e594dd10e 100644 --- a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java +++ b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java @@ -25,8 +25,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.data.IDynamicBakedModel; import net.minecraftforge.client.model.data.IModelData; -import appeng.api.AEApi; import appeng.client.render.cablebus.CubeBuilder; +import appeng.core.Api; import appeng.core.AppEng; import appeng.tile.qnb.QuantumBridgeTileEntity; @@ -73,7 +73,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 = AEApi.instance().definitions().blocks().quantumLink().maybeBlock().orElse(null); + this.linkBlock = Api.instance().definitions().blocks().quantumLink().maybeBlock().orElse(null); } @Override diff --git a/src/main/java/appeng/client/ClientHelper.java b/src/main/java/appeng/client/ClientHelper.java index 5d7700ccb..94175608e 100644 --- a/src/main/java/appeng/client/ClientHelper.java +++ b/src/main/java/appeng/client/ClientHelper.java @@ -39,7 +39,10 @@ import net.minecraftforge.fml.client.registry.ClientRegistry; import appeng.api.parts.CableRenderMode; import appeng.block.AEBaseBlock; -import appeng.client.render.effects.*; +import appeng.client.render.effects.EnergyParticleData; +import appeng.client.render.effects.LightningArcFX; +import appeng.client.render.effects.LightningFX; +import appeng.client.render.effects.ParticleTypes; import appeng.core.AEConfig; import appeng.core.AppEng; import appeng.core.sync.network.NetworkHandler; diff --git a/src/main/java/appeng/client/gui/implementations/AESubScreen.java b/src/main/java/appeng/client/gui/implementations/AESubScreen.java index d14d1e9d9..f3fa77406 100644 --- a/src/main/java/appeng/client/gui/implementations/AESubScreen.java +++ b/src/main/java/appeng/client/gui/implementations/AESubScreen.java @@ -8,7 +8,6 @@ import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; -import appeng.api.AEApi; import appeng.api.definitions.IDefinitions; import appeng.api.definitions.IParts; import appeng.client.gui.AEBaseScreen; @@ -18,6 +17,7 @@ import appeng.container.implementations.CraftingTermContainer; import appeng.container.implementations.MEMonitorableContainer; import appeng.container.implementations.PatternTermContainer; import appeng.container.implementations.WirelessTermContainer; +import appeng.core.Api; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.SwitchGuisPacket; import appeng.helpers.IPriorityHost; @@ -44,7 +44,7 @@ final class AESubScreen { public AESubScreen(AEBaseScreen gui, Object containerTarget) { this.gui = gui; - final IDefinitions definitions = AEApi.instance().definitions(); + final IDefinitions definitions = Api.instance().definitions(); final IParts parts = definitions.parts(); if (containerTarget instanceof ChestTileEntity) { diff --git a/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java b/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java index 5c631e4e6..1057fd822 100644 --- a/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java @@ -33,13 +33,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.client.gui.GuiUtils; -import appeng.api.AEApi; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.client.gui.AEBaseScreen; import appeng.client.gui.widgets.Scrollbar; import appeng.container.implementations.CraftConfirmContainer; +import appeng.core.Api; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.ConfigValuePacket; @@ -51,11 +51,11 @@ public class CraftConfirmScreen extends AEBaseScreen { private final int rows = 5; - private final IItemList storage = AEApi.instance().storage() + private final IItemList storage = Api.instance().storage() .getStorageChannel(IItemStorageChannel.class).createList(); - private final IItemList pending = AEApi.instance().storage() + private final IItemList pending = Api.instance().storage() .getStorageChannel(IItemStorageChannel.class).createList(); - private final IItemList missing = AEApi.instance().storage() + private final IItemList missing = Api.instance().storage() .getStorageChannel(IItemStorageChannel.class).createList(); private final List visual = new ArrayList<>(); diff --git a/src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java b/src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java index 341c6cd25..111db1b03 100644 --- a/src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java @@ -34,7 +34,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.client.gui.GuiUtils; -import appeng.api.AEApi; import appeng.api.config.SortDir; import appeng.api.config.SortOrder; import appeng.api.config.ViewItems; @@ -47,6 +46,7 @@ import appeng.client.gui.widgets.ISortSource; import appeng.client.gui.widgets.Scrollbar; import appeng.container.implementations.CraftingCPUContainer; import appeng.core.AEConfig; +import appeng.core.Api; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.ConfigValuePacket; @@ -79,11 +79,11 @@ public class CraftingCPUScreen extends AEBaseScr private static final int ITEMSTACK_LEFT_OFFSET = 9; private static final int ITEMSTACK_TOP_OFFSET = 22; - private IItemList storage = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + private IItemList storage = Api.instance().storage().getStorageChannel(IItemStorageChannel.class) .createList(); - private IItemList active = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + private IItemList active = Api.instance().storage().getStorageChannel(IItemStorageChannel.class) .createList(); - private IItemList pending = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + private IItemList pending = Api.instance().storage().getStorageChannel(IItemStorageChannel.class) .createList(); private List visual = new ArrayList<>(); @@ -100,9 +100,9 @@ public class CraftingCPUScreen extends AEBaseScr } public void clearItems() { - 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.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.visual = new ArrayList<>(); } diff --git a/src/main/java/appeng/client/gui/implementations/IOPortScreen.java b/src/main/java/appeng/client/gui/implementations/IOPortScreen.java index 5760e4f52..5a51c0351 100644 --- a/src/main/java/appeng/client/gui/implementations/IOPortScreen.java +++ b/src/main/java/appeng/client/gui/implementations/IOPortScreen.java @@ -21,7 +21,6 @@ package appeng.client.gui.implementations; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; -import appeng.api.AEApi; import appeng.api.config.FullnessMode; import appeng.api.config.OperationMode; import appeng.api.config.RedstoneMode; @@ -30,6 +29,7 @@ import appeng.api.definitions.IDefinitions; import appeng.client.gui.widgets.ServerSettingToggleButton; import appeng.client.gui.widgets.SettingToggleButton; import appeng.container.implementations.IOPortContainer; +import appeng.core.Api; import appeng.core.localization.GuiText; public class IOPortScreen extends UpgradeableScreen { @@ -78,7 +78,7 @@ public class IOPortScreen extends UpgradeableScreen { public void drawBG(final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { super.drawBG(offsetX, offsetY, mouseX, mouseY, partialTicks); - final IDefinitions definitions = AEApi.instance().definitions(); + final IDefinitions definitions = Api.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/InterfaceTerminalScreen.java b/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java index b3112f7d3..4cd84c83b 100644 --- a/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java +++ b/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java @@ -40,7 +40,6 @@ import net.minecraft.nbt.ListNBT; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.client.gui.GuiUtils; -import appeng.api.AEApi; import appeng.api.storage.channels.IItemStorageChannel; import appeng.client.ActionKey; import appeng.client.gui.AEBaseScreen; @@ -49,6 +48,7 @@ import appeng.client.gui.widgets.Scrollbar; import appeng.client.me.ClientDCInternalInv; import appeng.client.me.SlotDisconnected; import appeng.container.implementations.InterfaceTerminalContainer; +import appeng.core.Api; import appeng.core.AppEng; import appeng.core.localization.GuiText; import appeng.util.Platform; @@ -321,7 +321,7 @@ public class InterfaceTerminalScreen extends AEBaseScreen list = AEApi.instance().storage() - .getStorageChannel(IFluidStorageChannel.class).createList(); + private final IItemList list = Api.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 964f45a48..e9fab811f 100644 --- a/src/main/java/appeng/client/me/ItemRepo.java +++ b/src/main/java/appeng/client/me/ItemRepo.java @@ -28,7 +28,6 @@ import javax.annotation.Nonnull; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; -import appeng.api.AEApi; import appeng.api.config.SearchBoxMode; import appeng.api.config.SortOrder; import appeng.api.config.ViewItems; @@ -39,6 +38,7 @@ 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.integration.abstraction.JEIFacade; import appeng.items.storage.ViewCellItem; import appeng.util.ItemSorters; @@ -47,7 +47,7 @@ import appeng.util.prioritylist.IPartitionList; public class ItemRepo { - private final IItemList list = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + private final IItemList list = Api.instance().storage().getStorageChannel(IItemStorageChannel.class) .createList(); private final ArrayList view = new ArrayList<>(); private final IScrollSource src; diff --git a/src/main/java/appeng/client/render/FacadeItemModel.java b/src/main/java/appeng/client/render/FacadeItemModel.java index 0102a3550..bad498a8e 100644 --- a/src/main/java/appeng/client/render/FacadeItemModel.java +++ b/src/main/java/appeng/client/render/FacadeItemModel.java @@ -24,7 +24,12 @@ import java.util.function.Function; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.*; +import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.renderer.model.IModelTransform; +import net.minecraft.client.renderer.model.IUnbakedModel; +import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.renderer.model.ModelBakery; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.IModelConfiguration; diff --git a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java index 34f21e827..c99dcb6d8 100644 --- a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java @@ -49,8 +49,8 @@ import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.model.data.EmptyModelData; import net.minecraftforge.client.model.data.IModelData; -import appeng.api.AEApi; import appeng.api.util.AEAxisAlignedBB; +import appeng.core.Api; import appeng.parts.misc.CableAnchorPart; import appeng.thirdparty.codechicken.lib.model.CachedFormat; import appeng.thirdparty.codechicken.lib.model.Quad; @@ -108,7 +108,7 @@ public class FacadeBuilder { Function modelLookup) { BakedPipeline pipeline = this.pipelines.get(); Quad collectorQuad = this.collectors.get(); - boolean transparent = AEApi.instance().partHelper().getCableRenderMode().transparentFacades; + boolean transparent = Api.instance().partHelper().getCableRenderMode().transparentFacades; Map facadeStates = renderState.getFacades(); List partBoxes = renderState.getBoundingBoxes(); Set sidesWithParts = renderState.getAttachments().keySet(); diff --git a/src/main/java/appeng/client/render/effects/ChargedOreFX.java b/src/main/java/appeng/client/render/effects/ChargedOreFX.java index ee8ca8008..106aba23d 100644 --- a/src/main/java/appeng/client/render/effects/ChargedOreFX.java +++ b/src/main/java/appeng/client/render/effects/ChargedOreFX.java @@ -28,8 +28,6 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import appeng.core.AppEng; - @OnlyIn(Dist.CLIENT) public class ChargedOreFX extends RedstoneParticle { diff --git a/src/main/java/appeng/client/render/effects/CraftingFx.java b/src/main/java/appeng/client/render/effects/CraftingFx.java index 569070ade..f514c2066 100644 --- a/src/main/java/appeng/client/render/effects/CraftingFx.java +++ b/src/main/java/appeng/client/render/effects/CraftingFx.java @@ -34,8 +34,6 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import appeng.core.AppEng; - @OnlyIn(Dist.CLIENT) public class CraftingFx extends SpriteTexturedParticle { diff --git a/src/main/java/appeng/client/render/effects/EnergyFx.java b/src/main/java/appeng/client/render/effects/EnergyFx.java index 7a9dd4e3d..d3e8dbd45 100644 --- a/src/main/java/appeng/client/render/effects/EnergyFx.java +++ b/src/main/java/appeng/client/render/effects/EnergyFx.java @@ -20,15 +20,17 @@ package appeng.client.render.effects; import com.mojang.blaze3d.vertex.IVertexBuilder; -import net.minecraft.client.particle.*; +import net.minecraft.client.particle.IAnimatedSprite; +import net.minecraft.client.particle.IParticleFactory; +import net.minecraft.client.particle.IParticleRenderType; +import net.minecraft.client.particle.Particle; +import net.minecraft.client.particle.SpriteTexturedParticle; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import appeng.core.AppEng; - @OnlyIn(Dist.CLIENT) public class EnergyFx extends SpriteTexturedParticle { diff --git a/src/main/java/appeng/client/render/effects/LightningArcFX.java b/src/main/java/appeng/client/render/effects/LightningArcFX.java index 969beb04b..115225a33 100644 --- a/src/main/java/appeng/client/render/effects/LightningArcFX.java +++ b/src/main/java/appeng/client/render/effects/LightningArcFX.java @@ -28,8 +28,6 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import appeng.core.AppEng; - @OnlyIn(Dist.CLIENT) public class LightningArcFX extends LightningFX { diff --git a/src/main/java/appeng/client/render/effects/LightningFX.java b/src/main/java/appeng/client/render/effects/LightningFX.java index 072e4def3..d7dc7748b 100644 --- a/src/main/java/appeng/client/render/effects/LightningFX.java +++ b/src/main/java/appeng/client/render/effects/LightningFX.java @@ -37,8 +37,6 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import appeng.core.AppEng; - @OnlyIn(Dist.CLIENT) public class LightningFX extends SpriteTexturedParticle { diff --git a/src/main/java/appeng/client/render/effects/MatterCannonFX.java b/src/main/java/appeng/client/render/effects/MatterCannonFX.java index aaef5fbb3..9c1160c1a 100644 --- a/src/main/java/appeng/client/render/effects/MatterCannonFX.java +++ b/src/main/java/appeng/client/render/effects/MatterCannonFX.java @@ -18,14 +18,17 @@ package appeng.client.render.effects; -import net.minecraft.client.particle.*; +import net.minecraft.client.particle.IAnimatedSprite; +import net.minecraft.client.particle.IParticleFactory; +import net.minecraft.client.particle.IParticleRenderType; +import net.minecraft.client.particle.Particle; +import net.minecraft.client.particle.SpriteTexturedParticle; import net.minecraft.particles.BasicParticleType; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import appeng.api.util.AEPartLocation; -import appeng.core.AppEng; public class MatterCannonFX extends SpriteTexturedParticle { diff --git a/src/main/java/appeng/client/render/effects/VibrantFX.java b/src/main/java/appeng/client/render/effects/VibrantFX.java index 39f34bcc0..4132d4b21 100644 --- a/src/main/java/appeng/client/render/effects/VibrantFX.java +++ b/src/main/java/appeng/client/render/effects/VibrantFX.java @@ -28,8 +28,6 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import appeng.core.AppEng; - @OnlyIn(Dist.CLIENT) public class VibrantFX extends SpriteTexturedParticle { diff --git a/src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java b/src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java index 8ad1e3f40..997e3b2b7 100644 --- a/src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java +++ b/src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java @@ -19,14 +19,12 @@ package appeng.client.render.spatial; import net.minecraft.client.renderer.RenderType; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import appeng.bootstrap.BlockRenderingCustomizer; import appeng.bootstrap.IBlockRendering; import appeng.bootstrap.IItemRendering; -import appeng.core.AppEng; public class SpatialPylonRendering extends BlockRenderingCustomizer { diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java index f1cef6287..b8c1f32cb 100644 --- a/src/main/java/appeng/container/AEBaseContainer.java +++ b/src/main/java/appeng/container/AEBaseContainer.java @@ -37,7 +37,6 @@ 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; @@ -64,6 +63,7 @@ import appeng.container.slot.InaccessibleSlot; import appeng.container.slot.PlayerHotBarSlot; import appeng.container.slot.PlayerInvSlot; import appeng.core.AELog; +import appeng.core.Api; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.ConfigValuePacket; import appeng.core.sync.packets.InventoryActionPacket; @@ -658,7 +658,7 @@ public abstract class AEBaseContainer extends Container { final ItemStack isg = player.inventory.getItemStack(); if (!isg.isEmpty() && releaseQty > 0) { - IAEItemStack ais = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + IAEItemStack ais = Api.instance().storage().getStorageChannel(IItemStorageChannel.class) .createStack(isg); ais.setStackSize(1); final IAEItemStack extracted = ais.copy(); @@ -737,7 +737,7 @@ public abstract class AEBaseContainer extends Container { this.updateHeld(player); } } else { - IAEItemStack ais = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + IAEItemStack ais = Api.instance().storage().getStorageChannel(IItemStorageChannel.class) .createStack(player.inventory.getItemStack()); ais = Platform.poweredInsert(this.getPowerSource(), this.getCellInventory(), ais, this.getActionSource()); @@ -777,7 +777,7 @@ public abstract class AEBaseContainer extends Container { this.updateHeld(player); } } else { - IAEItemStack ais = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + IAEItemStack ais = Api.instance().storage().getStorageChannel(IItemStorageChannel.class) .createStack(player.inventory.getItemStack()); ais.setStackSize(1); ais = Platform.poweredInsert(this.getPowerSource(), this.getCellInventory(), ais, @@ -855,7 +855,7 @@ public abstract class AEBaseContainer extends Container { return input; } final IAEItemStack ais = Platform.poweredInsert(this.getPowerSource(), this.getCellInventory(), - AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(input), + Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(input), this.getActionSource()); if (ais == null) { return ItemStack.EMPTY; diff --git a/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java b/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java index da81328ed..ce14510db 100644 --- a/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java +++ b/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java @@ -31,7 +31,6 @@ 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; @@ -47,6 +46,7 @@ import appeng.container.guisync.GuiSync; import appeng.container.slot.FakeTypeOnlySlot; import appeng.container.slot.OptionalRestrictedInputSlot; import appeng.container.slot.RestrictedInputSlot; +import appeng.core.Api; import appeng.tile.misc.CellWorkbenchTileEntity; import appeng.util.EnumCycler; import appeng.util.Platform; @@ -208,9 +208,9 @@ public class CellWorkbenchContainer extends UpgradeableContainer { final ItemStack is = this.getUpgradeable().getInventoryByName("cell").getStackInSlot(0); final IStorageChannel channel = is.getItem() instanceof IStorageCell ? ((IStorageCell) is.getItem()).getChannel() - : AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class); + : Api.instance().storage().getStorageChannel(IItemStorageChannel.class); - final IMEInventory cellInv = AEApi.instance().registries().cell().getCellInventory(is, null, channel); + final IMEInventory cellInv = Api.instance().registries().cell().getCellInventory(is, null, channel); Iterator i = new NullIterator<>(); if (cellInv != null) { diff --git a/src/main/java/appeng/container/implementations/ContainerHelper.java b/src/main/java/appeng/container/implementations/ContainerHelper.java index ba1f3f5a7..3afd4ec38 100644 --- a/src/main/java/appeng/container/implementations/ContainerHelper.java +++ b/src/main/java/appeng/container/implementations/ContainerHelper.java @@ -15,7 +15,6 @@ import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; -import appeng.api.AEApi; import appeng.api.config.SecurityPermissions; import appeng.api.features.IWirelessTermHandler; import appeng.api.implementations.guiobjects.IGuiItem; @@ -25,6 +24,7 @@ import appeng.api.parts.IPartHost; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.core.AELog; +import appeng.core.Api; import appeng.helpers.ICustomNameObject; import appeng.helpers.WirelessTerminalGuiObject; import appeng.util.Platform; @@ -182,7 +182,7 @@ public final class ContainerHelper { } if (interfaceClass.isAssignableFrom(WirelessTerminalGuiObject.class)) { - final IWirelessTermHandler wh = AEApi.instance().registries().wireless().getWirelessTerminalHandler(it); + final IWirelessTermHandler wh = Api.instance().registries().wireless().getWirelessTerminalHandler(it); if (wh != null) { return interfaceClass.cast(new WirelessTerminalGuiObject(wh, it, player, locator.getItemIndex())); } diff --git a/src/main/java/appeng/container/implementations/CraftConfirmContainer.java b/src/main/java/appeng/container/implementations/CraftConfirmContainer.java index 27ecceada..513b7da01 100644 --- a/src/main/java/appeng/container/implementations/CraftConfirmContainer.java +++ b/src/main/java/appeng/container/implementations/CraftConfirmContainer.java @@ -37,7 +37,6 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.World; -import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.SecurityPermissions; import appeng.api.networking.IGrid; @@ -58,6 +57,7 @@ import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.container.guisync.GuiSync; import appeng.core.AELog; +import appeng.core.Api; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.MEInventoryUpdatePacket; import appeng.helpers.WirelessTerminalGuiObject; @@ -197,7 +197,7 @@ public class CraftConfirmContainer extends AEBaseContainer { final MEInventoryUpdatePacket c = this.result.isSimulation() ? new MEInventoryUpdatePacket((byte) 2) : null; - final IItemList plan = AEApi.instance().storage() + final IItemList plan = Api.instance().storage() .getStorageChannel(IItemStorageChannel.class).createList(); this.result.populatePlan(plan); @@ -215,7 +215,7 @@ public class CraftConfirmContainer extends AEBaseContainer { final IStorageGrid sg = this.getGrid().getCache(IStorageGrid.class); final IMEInventory items = sg - .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); IAEItemStack m = null; if (c != null && this.result.isSimulation()) { diff --git a/src/main/java/appeng/container/implementations/CraftingCPUContainer.java b/src/main/java/appeng/container/implementations/CraftingCPUContainer.java index 026ee194c..4e481237f 100644 --- a/src/main/java/appeng/container/implementations/CraftingCPUContainer.java +++ b/src/main/java/appeng/container/implementations/CraftingCPUContainer.java @@ -28,7 +28,6 @@ import net.minecraft.inventory.container.IContainerListener; import net.minecraft.network.PacketBuffer; import net.minecraft.util.text.ITextComponent; -import appeng.api.AEApi; import appeng.api.config.SecurityPermissions; import appeng.api.networking.IGrid; import appeng.api.networking.crafting.CraftingItemList; @@ -43,6 +42,7 @@ import appeng.api.storage.data.IItemList; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; +import appeng.core.Api; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.ConfigValuePacket; import appeng.core.sync.packets.MEInventoryUpdatePacket; @@ -60,7 +60,7 @@ public class CraftingCPUContainer extends AEBaseContainer private static final ContainerHelper helper = new ContainerHelper<>( CraftingCPUContainer::new, CraftingTileEntity.class, SecurityPermissions.CRAFT); - private final IItemList list = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + private final IItemList list = Api.instance().storage().getStorageChannel(IItemStorageChannel.class) .createList(); private IGrid network; private CraftingCPUCluster monitor = null; diff --git a/src/main/java/appeng/container/implementations/InscriberContainer.java b/src/main/java/appeng/container/implementations/InscriberContainer.java index 9c238092b..a768ebca3 100644 --- a/src/main/java/appeng/container/implementations/InscriberContainer.java +++ b/src/main/java/appeng/container/implementations/InscriberContainer.java @@ -26,13 +26,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; import net.minecraftforge.items.IItemHandler; -import appeng.api.AEApi; import appeng.api.definitions.IItemDefinition; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; import appeng.container.interfaces.IProgressProvider; import appeng.container.slot.OutputSlot; import appeng.container.slot.RestrictedInputSlot; +import appeng.core.Api; import appeng.tile.misc.InscriberRecipes; import appeng.tile.misc.InscriberTileEntity; import appeng.util.Platform; @@ -131,7 +131,7 @@ public class InscriberContainer extends UpgradeableContainer implements IProgres final ItemStack bot = this.ti.getInternalInventory().getStackInSlot(1); if (s == this.middle) { - IItemDefinition press = AEApi.instance().definitions().materials().namePress(); + IItemDefinition press = Api.instance().definitions().materials().namePress(); if (press.isSameAs(top) || press.isSameAs(bot)) { return !press.isSameAs(is); } @@ -146,7 +146,7 @@ public class InscriberContainer extends UpgradeableContainer implements IProgres } // name presses - final IItemDefinition namePress = AEApi.instance().definitions().materials().namePress(); + final IItemDefinition namePress = Api.instance().definitions().materials().namePress(); if (namePress.isSameAs(otherSlot)) { return namePress.isSameAs(is); } diff --git a/src/main/java/appeng/container/implementations/MEMonitorableContainer.java b/src/main/java/appeng/container/implementations/MEMonitorableContainer.java index ed8438156..d9316db9b 100644 --- a/src/main/java/appeng/container/implementations/MEMonitorableContainer.java +++ b/src/main/java/appeng/container/implementations/MEMonitorableContainer.java @@ -32,7 +32,6 @@ 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; @@ -67,6 +66,7 @@ import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; import appeng.container.slot.RestrictedInputSlot; import appeng.core.AELog; +import appeng.core.Api; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.ConfigValuePacket; import appeng.core.sync.packets.MEInventoryUpdatePacket; @@ -93,8 +93,8 @@ public class MEMonitorableContainer extends AEBaseContainer private final RestrictedInputSlot[] cellView = new RestrictedInputSlot[5]; private final IMEMonitor monitor; - private final IItemList items = AEApi.instance().storage() - .getStorageChannel(IItemStorageChannel.class).createList(); + private final IItemList items = Api.instance().storage().getStorageChannel(IItemStorageChannel.class) + .createList(); private final IConfigManager clientCM; private final ITerminalHost host; @GuiSync(99) @@ -126,7 +126,7 @@ public class MEMonitorableContainer extends AEBaseContainer this.serverCM = monitorable.getConfigManager(); this.monitor = monitorable - .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); if (this.monitor != null) { this.monitor.addListener(this, null); @@ -185,7 +185,7 @@ public class MEMonitorableContainer extends AEBaseContainer public void detectAndSendChanges() { if (Platform.isServer()) { if (this.monitor != this.host - .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class))) { + .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class))) { this.setValidContainer(false); } diff --git a/src/main/java/appeng/container/implementations/NetworkStatusContainer.java b/src/main/java/appeng/container/implementations/NetworkStatusContainer.java index a1d6b778f..b34b169ff 100644 --- a/src/main/java/appeng/container/implementations/NetworkStatusContainer.java +++ b/src/main/java/appeng/container/implementations/NetworkStatusContainer.java @@ -27,7 +27,6 @@ import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; -import appeng.api.AEApi; import appeng.api.implementations.guiobjects.INetworkTool; import appeng.api.networking.IGrid; import appeng.api.networking.IGridBlock; @@ -41,6 +40,7 @@ import appeng.api.util.AEPartLocation; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; +import appeng.core.Api; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.MEInventoryUpdatePacket; import appeng.util.Platform; @@ -115,7 +115,7 @@ public class NetworkStatusContainer extends AEBaseContainer { final MEInventoryUpdatePacket piu = new MEInventoryUpdatePacket(); for (final Class machineClass : this.network.getMachinesClasses()) { - final IItemList list = AEApi.instance().storage() + final IItemList list = Api.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/PatternTermContainer.java b/src/main/java/appeng/container/implementations/PatternTermContainer.java index 2205c9243..7ca82cc5a 100644 --- a/src/main/java/appeng/container/implementations/PatternTermContainer.java +++ b/src/main/java/appeng/container/implementations/PatternTermContainer.java @@ -42,7 +42,6 @@ import net.minecraft.world.World; 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.definitions.IDefinitions; @@ -60,6 +59,7 @@ import appeng.container.slot.OptionalFakeSlot; import appeng.container.slot.PatternOutputsSlot; import appeng.container.slot.PatternTermSlot; import appeng.container.slot.RestrictedInputSlot; +import appeng.core.Api; import appeng.core.sync.packets.PatternSlotPacket; import appeng.helpers.IContainerCraftingPacket; import appeng.items.storage.ViewCellItem; @@ -227,7 +227,7 @@ public class PatternTermContainer extends MEMonitorableContainer } // add a new encoded pattern. - Optional maybePattern = AEApi.instance().definitions().items().encodedPattern().maybeStack(1); + Optional maybePattern = Api.instance().definitions().items().encodedPattern().maybeStack(1); if (maybePattern.isPresent()) { output = maybePattern.get(); this.patternSlotOUT.putStack(output); @@ -307,7 +307,7 @@ public class PatternTermContainer extends MEMonitorableContainer return false; } - final IDefinitions definitions = AEApi.instance().definitions(); + final IDefinitions definitions = Api.instance().definitions(); boolean isPattern = definitions.items().encodedPattern().isSameAs(output); isPattern |= definitions.materials().blankPattern().isSameAs(output); @@ -380,7 +380,7 @@ public class PatternTermContainer extends MEMonitorableContainer } final IMEMonitor storage = this.getPatternTerminal() - .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + .getInventory(Api.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/QuartzKnifeContainer.java b/src/main/java/appeng/container/implementations/QuartzKnifeContainer.java index 077205b5e..4c2518dda 100644 --- a/src/main/java/appeng/container/implementations/QuartzKnifeContainer.java +++ b/src/main/java/appeng/container/implementations/QuartzKnifeContainer.java @@ -30,11 +30,11 @@ 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.ContainerLocator; import appeng.container.slot.OutputSlot; import appeng.container.slot.RestrictedInputSlot; +import appeng.core.Api; import appeng.items.contents.QuartzKnifeObj; import appeng.items.materials.MaterialItem; import appeng.tile.inventory.AppEngInternalInventory; @@ -119,7 +119,7 @@ public class QuartzKnifeContainer extends AEBaseContainer { if (RestrictedInputSlot.isMetalIngot(input)) { if (QuartzKnifeContainer.this.myName.length() > 0) { - return AEApi.instance().definitions().materials().namePress().maybeStack(1).map(namePressStack -> { + return Api.instance().definitions().materials().namePress().maybeStack(1).map(namePressStack -> { final CompoundNBT compound = namePressStack.getOrCreateTag(); compound.putString(MaterialItem.TAG_INSCRIBE_NAME, QuartzKnifeContainer.this.myName); diff --git a/src/main/java/appeng/container/implementations/SecurityStationContainer.java b/src/main/java/appeng/container/implementations/SecurityStationContainer.java index bfdf27c06..b9fd17438 100644 --- a/src/main/java/appeng/container/implementations/SecurityStationContainer.java +++ b/src/main/java/appeng/container/implementations/SecurityStationContainer.java @@ -26,7 +26,6 @@ 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; @@ -36,6 +35,7 @@ import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; import appeng.container.slot.OutputSlot; import appeng.container.slot.RestrictedInputSlot; +import appeng.core.Api; import appeng.tile.inventory.AppEngInternalInventory; import appeng.tile.misc.SecurityStationTileEntity; import appeng.util.inv.IAEAppEngInventory; @@ -150,7 +150,7 @@ public class SecurityStationContainer extends MEMonitorableContainer implements networkEncodable = (INetworkEncodable) term.getItem(); } - final IWirelessTermHandler wTermHandler = AEApi.instance().registries().wireless() + final IWirelessTermHandler wTermHandler = Api.instance().registries().wireless() .getWirelessTerminalHandler(term); if (wTermHandler != null) { networkEncodable = wTermHandler; diff --git a/src/main/java/appeng/container/implementations/StorageBusContainer.java b/src/main/java/appeng/container/implementations/StorageBusContainer.java index b5e0fb3a9..2d5dd3ecc 100644 --- a/src/main/java/appeng/container/implementations/StorageBusContainer.java +++ b/src/main/java/appeng/container/implementations/StorageBusContainer.java @@ -27,7 +27,6 @@ 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; @@ -43,6 +42,7 @@ import appeng.container.guisync.GuiSync; import appeng.container.slot.FakeTypeOnlySlot; import appeng.container.slot.OptionalTypeOnlyFakeSlot; import appeng.container.slot.RestrictedInputSlot; +import appeng.core.Api; import appeng.parts.misc.StorageBusPart; import appeng.util.Platform; import appeng.util.helpers.ItemHandlerUtil; @@ -155,7 +155,7 @@ public class StorageBusContainer extends UpgradeableContainer { Iterator i = new NullIterator<>(); if (cellInv != null) { final IItemList list = cellInv.getAvailableItems( - AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList()); + Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList()); i = list.iterator(); } diff --git a/src/main/java/appeng/container/slot/CraftingTermSlot.java b/src/main/java/appeng/container/slot/CraftingTermSlot.java index 410c5cfa9..7623ac419 100644 --- a/src/main/java/appeng/container/slot/CraftingTermSlot.java +++ b/src/main/java/appeng/container/slot/CraftingTermSlot.java @@ -33,7 +33,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; -import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.networking.energy.IEnergySource; import appeng.api.networking.security.IActionSource; @@ -44,6 +43,7 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.container.ContainerNull; import appeng.container.implementations.CraftingTermContainer; +import appeng.core.Api; import appeng.helpers.IContainerCraftingPacket; import appeng.helpers.InventoryAction; import appeng.items.storage.ViewCellItem; @@ -100,7 +100,7 @@ public class CraftingTermSlot extends AppEngCraftingSlot { } final IMEMonitor inv = this.storage - .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); final int howManyPerCraft = this.getStack().getCount(); int maxTimesToCraft = 0; diff --git a/src/main/java/appeng/container/slot/PatternTermSlot.java b/src/main/java/appeng/container/slot/PatternTermSlot.java index 49c1cf72d..e77341f59 100644 --- a/src/main/java/appeng/container/slot/PatternTermSlot.java +++ b/src/main/java/appeng/container/slot/PatternTermSlot.java @@ -22,11 +22,11 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; -import appeng.api.AEApi; import appeng.api.networking.energy.IEnergySource; import appeng.api.networking.security.IActionSource; import appeng.api.storage.IStorageMonitorable; import appeng.api.storage.channels.IItemStorageChannel; +import appeng.core.Api; import appeng.core.sync.BasePacket; import appeng.core.sync.packets.PatternSlotPacket; import appeng.helpers.IContainerCraftingPacket; @@ -48,7 +48,7 @@ public class PatternTermSlot extends CraftingTermSlot { public BasePacket getRequest(final boolean shift) { return new PatternSlotPacket(this.getPattern(), - AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(this.getStack()), + Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(this.getStack()), shift); } diff --git a/src/main/java/appeng/container/slot/RestrictedInputSlot.java b/src/main/java/appeng/container/slot/RestrictedInputSlot.java index c76e30392..152c9eb92 100644 --- a/src/main/java/appeng/container/slot/RestrictedInputSlot.java +++ b/src/main/java/appeng/container/slot/RestrictedInputSlot.java @@ -33,7 +33,6 @@ 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; @@ -45,6 +44,7 @@ import appeng.api.implementations.items.IStorageComponent; import appeng.api.implementations.items.IUpgradeModule; import appeng.api.networking.crafting.ICraftingPatternDetails; import appeng.api.storage.cells.ICellWorkbenchItem; +import appeng.core.Api; import appeng.items.misc.EncodedPatternItem; import appeng.recipes.handlers.GrinderRecipes; import appeng.tile.misc.InscriberRecipes; @@ -123,7 +123,7 @@ public class RestrictedInputSlot extends AppEngSlot { return false; } - final IDefinitions definitions = AEApi.instance().definitions(); + final IDefinitions definitions = Api.instance().definitions(); final IMaterials materials = definitions.materials(); final IItems items = definitions.items(); @@ -195,14 +195,14 @@ public class RestrictedInputSlot extends AppEngSlot { return i.getItem() instanceof ISpatialStorageCell && ((ISpatialStorageCell) i.getItem()).isSpatialStorage(i); case STORAGE_CELLS: - return AEApi.instance().registries().cell().isCellHandled(i); + return Api.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 (AEApi.instance().registries().cell().isCellHandled(i)) { + if (Api.instance().registries().cell().isCellHandled(i)) { return false; } @@ -210,7 +210,7 @@ public class RestrictedInputSlot extends AppEngSlot { && ((IStorageComponent) i.getItem()).isStorageComponent(i)); case ENCODABLE_ITEM: return i.getItem() instanceof INetworkEncodable - || AEApi.instance().registries().wireless().isWirelessTerminal(i); + || Api.instance().registries().wireless().isWirelessTerminal(i); case BIOMETRIC_CARD: return i.getItem() instanceof IBiometricCard; case UPGRADES: diff --git a/src/main/java/appeng/core/AEItemGroup.java b/src/main/java/appeng/core/AEItemGroup.java index d76e2fdcc..b03991f04 100644 --- a/src/main/java/appeng/core/AEItemGroup.java +++ b/src/main/java/appeng/core/AEItemGroup.java @@ -7,7 +7,6 @@ import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -import appeng.api.AEApi; import appeng.api.definitions.IBlocks; import appeng.api.definitions.IDefinitions; import appeng.api.definitions.IItemDefinition; @@ -22,7 +21,7 @@ public class AEItemGroup extends ItemGroup { @Override public ItemStack createIcon() { - final IDefinitions definitions = AEApi.instance().definitions(); + final IDefinitions definitions = Api.instance().definitions(); final IBlocks blocks = definitions.blocks(); return blocks.controller().stack(1); } diff --git a/src/main/java/appeng/core/Api.java b/src/main/java/appeng/core/Api.java index fa4240502..b26d959af 100644 --- a/src/main/java/appeng/core/Api.java +++ b/src/main/java/appeng/core/Api.java @@ -18,6 +18,7 @@ package appeng.core; +import appeng.api.AEAddon; import appeng.api.IAppEngApi; import appeng.api.features.IRegistryContainer; import appeng.api.networking.IGridHelper; @@ -31,8 +32,26 @@ import appeng.core.features.registries.PartModels; import appeng.core.features.registries.RegistryContainer; public final class Api implements IAppEngApi { + + /** + * While permitting public access, directly using {@link Api#instance()} is not + * recommended except in very special cases. + */ public static final Api INSTANCE = new Api(); + /** + * Use primarily to access the API. + * + * Using {@link IAppEngApi} intentionally to avoid using functionality not + * exposed by accident. + * + * In some cases we might have to access the API before it is announced via + * {@link AEAddon}, otherwise we could just inject it into AE2 itself. + */ + public static IAppEngApi instance() { + return INSTANCE; + } + private final ApiPart partHelper; // private MovableTileRegistry MovableRegistry = new MovableTileRegistry(); diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index 3e3568085..80238ec6c 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -31,7 +31,6 @@ import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.particles.ParticleType; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; import net.minecraft.world.biome.Biome; import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.gen.GenerationStage; @@ -43,7 +42,11 @@ import net.minecraft.world.gen.placement.IPlacementConfig; import net.minecraft.world.gen.placement.Placement; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.client.event.*; +import net.minecraftforge.client.event.ColorHandlerEvent; +import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.client.event.ParticleFactoryRegisterEvent; +import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.ModDimension; import net.minecraftforge.common.extensions.IForgeContainerType; @@ -57,7 +60,6 @@ import net.minecraftforge.fml.network.IContainerFactory; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.IForgeRegistry; -import appeng.api.AEApi; import appeng.api.config.Upgrades; import appeng.api.definitions.IBlocks; import appeng.api.definitions.IItems; @@ -75,9 +77,53 @@ import appeng.api.networking.security.ISecurityGrid; import appeng.api.networking.spatial.ISpatialCache; import appeng.api.networking.storage.IStorageGrid; import appeng.api.networking.ticking.ITickManager; -import appeng.bootstrap.components.*; -import appeng.client.gui.implementations.*; -import appeng.client.render.effects.*; +import appeng.bootstrap.components.IBlockRegistrationComponent; +import appeng.bootstrap.components.IEntityRegistrationComponent; +import appeng.bootstrap.components.IItemColorRegistrationComponent; +import appeng.bootstrap.components.IItemRegistrationComponent; +import appeng.bootstrap.components.IModelBakeComponent; +import appeng.bootstrap.components.ITileEntityRegistrationComponent; +import appeng.client.gui.implementations.CellWorkbenchScreen; +import appeng.client.gui.implementations.ChestScreen; +import appeng.client.gui.implementations.CondenserScreen; +import appeng.client.gui.implementations.CraftAmountScreen; +import appeng.client.gui.implementations.CraftConfirmScreen; +import appeng.client.gui.implementations.CraftingCPUScreen; +import appeng.client.gui.implementations.CraftingStatusScreen; +import appeng.client.gui.implementations.CraftingTermScreen; +import appeng.client.gui.implementations.DriveScreen; +import appeng.client.gui.implementations.FormationPlaneScreen; +import appeng.client.gui.implementations.GrinderScreen; +import appeng.client.gui.implementations.IOPortScreen; +import appeng.client.gui.implementations.InscriberScreen; +import appeng.client.gui.implementations.InterfaceScreen; +import appeng.client.gui.implementations.InterfaceTerminalScreen; +import appeng.client.gui.implementations.LevelEmitterScreen; +import appeng.client.gui.implementations.MEMonitorableScreen; +import appeng.client.gui.implementations.MEPortableCellScreen; +import appeng.client.gui.implementations.MolecularAssemblerScreen; +import appeng.client.gui.implementations.NetworkStatusScreen; +import appeng.client.gui.implementations.NetworkToolScreen; +import appeng.client.gui.implementations.PatternTermScreen; +import appeng.client.gui.implementations.PriorityScreen; +import appeng.client.gui.implementations.QNBScreen; +import appeng.client.gui.implementations.QuartzKnifeScreen; +import appeng.client.gui.implementations.SecurityStationScreen; +import appeng.client.gui.implementations.SkyChestScreen; +import appeng.client.gui.implementations.SpatialIOPortScreen; +import appeng.client.gui.implementations.StorageBusScreen; +import appeng.client.gui.implementations.UpgradeableScreen; +import appeng.client.gui.implementations.VibrationChamberScreen; +import appeng.client.gui.implementations.WirelessScreen; +import appeng.client.gui.implementations.WirelessTermScreen; +import appeng.client.render.effects.ChargedOreFX; +import appeng.client.render.effects.CraftingFx; +import appeng.client.render.effects.EnergyFx; +import appeng.client.render.effects.LightningArcFX; +import appeng.client.render.effects.LightningFX; +import appeng.client.render.effects.MatterCannonFX; +import appeng.client.render.effects.ParticleTypes; +import appeng.client.render.effects.VibrantFX; import appeng.client.render.model.BiometricCardModel; import appeng.client.render.model.DriveModel; import appeng.client.render.model.MemoryCardModel; @@ -86,7 +132,39 @@ import appeng.client.render.tesr.InscriberTESR; import appeng.client.render.tesr.SkyChestTESR; import appeng.container.AEBaseContainer; import appeng.container.ContainerOpener; -import appeng.container.implementations.*; +import appeng.container.implementations.CellWorkbenchContainer; +import appeng.container.implementations.ChestContainer; +import appeng.container.implementations.CondenserContainer; +import appeng.container.implementations.CraftAmountContainer; +import appeng.container.implementations.CraftConfirmContainer; +import appeng.container.implementations.CraftingCPUContainer; +import appeng.container.implementations.CraftingStatusContainer; +import appeng.container.implementations.CraftingTermContainer; +import appeng.container.implementations.DriveContainer; +import appeng.container.implementations.FormationPlaneContainer; +import appeng.container.implementations.GrinderContainer; +import appeng.container.implementations.IOPortContainer; +import appeng.container.implementations.InscriberContainer; +import appeng.container.implementations.InterfaceContainer; +import appeng.container.implementations.InterfaceTerminalContainer; +import appeng.container.implementations.LevelEmitterContainer; +import appeng.container.implementations.MEMonitorableContainer; +import appeng.container.implementations.MEPortableCellContainer; +import appeng.container.implementations.MolecularAssemblerContainer; +import appeng.container.implementations.NetworkStatusContainer; +import appeng.container.implementations.NetworkToolContainer; +import appeng.container.implementations.PatternTermContainer; +import appeng.container.implementations.PriorityContainer; +import appeng.container.implementations.QNBContainer; +import appeng.container.implementations.QuartzKnifeContainer; +import appeng.container.implementations.SecurityStationContainer; +import appeng.container.implementations.SkyChestContainer; +import appeng.container.implementations.SpatialIOPortContainer; +import appeng.container.implementations.StorageBusContainer; +import appeng.container.implementations.UpgradeableContainer; +import appeng.container.implementations.VibrationChamberContainer; +import appeng.container.implementations.WirelessContainer; +import appeng.container.implementations.WirelessTermContainer; import appeng.core.features.registries.P2PTunnelRegistry; import appeng.core.features.registries.PartModels; import appeng.core.features.registries.cell.BasicCellHandler; @@ -95,11 +173,28 @@ import appeng.core.features.registries.cell.CreativeCellHandler; import appeng.core.localization.GuiText; import appeng.core.stats.AdvancementTriggers; import appeng.core.stats.AeStats; -import appeng.fluids.client.gui.*; -import appeng.fluids.container.*; +import appeng.fluids.client.gui.FluidFormationPlaneScreen; +import appeng.fluids.client.gui.FluidIOScreen; +import appeng.fluids.client.gui.FluidInterfaceScreen; +import appeng.fluids.client.gui.FluidLevelEmitterScreen; +import appeng.fluids.client.gui.FluidStorageBusScreen; +import appeng.fluids.client.gui.FluidTerminalScreen; +import appeng.fluids.container.FluidFormationPlaneContainer; +import appeng.fluids.container.FluidIOContainer; +import appeng.fluids.container.FluidInterfaceContainer; +import appeng.fluids.container.FluidLevelEmitterContainer; +import appeng.fluids.container.FluidStorageBusContainer; +import appeng.fluids.container.FluidTerminalContainer; import appeng.fluids.registries.BasicFluidCellGuiHandler; import appeng.items.parts.FacadeItem; -import appeng.me.cache.*; +import appeng.me.cache.CraftingGridCache; +import appeng.me.cache.EnergyGridCache; +import appeng.me.cache.GridStorageCache; +import appeng.me.cache.P2PCache; +import appeng.me.cache.PathGridCache; +import appeng.me.cache.SecurityCache; +import appeng.me.cache.SpatialPylonCache; +import appeng.me.cache.TickManagerCache; import appeng.recipes.game.DisassembleRecipe; import appeng.recipes.game.FacadeRecipe; import appeng.recipes.handlers.GrinderRecipe; @@ -374,7 +469,7 @@ final class Registration { // FIXME LATER public static void postInit() { - final IRegistryContainer registries = AEApi.instance().registries(); + final IRegistryContainer registries = Api.instance().registries(); // TODO: Do not use the internal API ApiDefinitions definitions = Api.INSTANCE.definitions(); final IParts parts = definitions.parts(); @@ -573,7 +668,7 @@ final class Registration { return; } - BlockState quartzOre = AEApi.instance().definitions().blocks().quartzOre().block().getDefaultState(); + BlockState quartzOre = Api.instance().definitions().blocks().quartzOre().block().getDefaultState(); b.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, Feature.ORE .withConfiguration(new OreFeatureConfig(OreFeatureConfig.FillerBlockType.NATURAL_STONE, @@ -583,7 +678,7 @@ final class Registration { if (AEConfig.instance().isFeatureEnabled(AEFeature.CHARGED_CERTUS_ORE)) { - BlockState chargedQuartzOre = AEApi.instance().definitions().blocks().quartzOreCharged().block() + BlockState chargedQuartzOre = Api.instance().definitions().blocks().quartzOreCharged().block() .getDefaultState(); b.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, ChargedQuartzOreFeature.INSTANCE diff --git a/src/main/java/appeng/core/api/definitions/ApiParts.java b/src/main/java/appeng/core/api/definitions/ApiParts.java index d09dabc84..f22e847ba 100644 --- a/src/main/java/appeng/core/api/definitions/ApiParts.java +++ b/src/main/java/appeng/core/api/definitions/ApiParts.java @@ -33,16 +33,50 @@ import appeng.core.features.ActivityState; import appeng.core.features.ColoredItemDefinition; import appeng.core.features.ItemStackSrc; import appeng.core.features.registries.PartModels; -import appeng.fluids.parts.*; +import appeng.fluids.parts.FluidAnnihilationPlanePart; +import appeng.fluids.parts.FluidExportBusPart; +import appeng.fluids.parts.FluidFormationPlanePart; +import appeng.fluids.parts.FluidImportBusPart; +import appeng.fluids.parts.FluidInterfacePart; +import appeng.fluids.parts.FluidLevelEmitterPart; +import appeng.fluids.parts.FluidStorageBusPart; +import appeng.fluids.parts.FluidTerminalPart; import appeng.items.parts.ColoredPartItem; import appeng.items.parts.PartItem; import appeng.items.parts.PartItemRendering; import appeng.items.parts.PartModelsHelper; -import appeng.parts.automation.*; -import appeng.parts.misc.*; -import appeng.parts.networking.*; -import appeng.parts.p2p.*; -import appeng.parts.reporting.*; +import appeng.parts.automation.AnnihilationPlanePart; +import appeng.parts.automation.ExportBusPart; +import appeng.parts.automation.FormationPlanePart; +import appeng.parts.automation.IdentityAnnihilationPlanePart; +import appeng.parts.automation.ImportBusPart; +import appeng.parts.automation.LevelEmitterPart; +import appeng.parts.misc.CableAnchorPart; +import appeng.parts.misc.InterfacePart; +import appeng.parts.misc.InvertedToggleBusPart; +import appeng.parts.misc.StorageBusPart; +import appeng.parts.misc.ToggleBusPart; +import appeng.parts.networking.CoveredCablePart; +import appeng.parts.networking.CoveredDenseCablePart; +import appeng.parts.networking.GlassCablePart; +import appeng.parts.networking.QuartzFiberPart; +import appeng.parts.networking.SmartCablePart; +import appeng.parts.networking.SmartDenseCablePart; +import appeng.parts.p2p.FEP2PTunnelPart; +import appeng.parts.p2p.FluidP2PTunnelPart; +import appeng.parts.p2p.ItemP2PTunnelPart; +import appeng.parts.p2p.LightP2PTunnelPart; +import appeng.parts.p2p.MEP2PTunnelPart; +import appeng.parts.p2p.RedstoneP2PTunnelPart; +import appeng.parts.reporting.ConversionMonitorPart; +import appeng.parts.reporting.CraftingTerminalPart; +import appeng.parts.reporting.DarkPanelPart; +import appeng.parts.reporting.InterfaceTerminalPart; +import appeng.parts.reporting.PanelPart; +import appeng.parts.reporting.PatternTerminalPart; +import appeng.parts.reporting.SemiDarkPanelPart; +import appeng.parts.reporting.StorageMonitorPart; +import appeng.parts.reporting.TerminalPart; /** * Internal implementation for the API parts diff --git a/src/main/java/appeng/core/features/registries/GridCacheRegistry.java b/src/main/java/appeng/core/features/registries/GridCacheRegistry.java index 520d06839..ead509589 100644 --- a/src/main/java/appeng/core/features/registries/GridCacheRegistry.java +++ b/src/main/java/appeng/core/features/registries/GridCacheRegistry.java @@ -29,7 +29,6 @@ import appeng.api.networking.IGrid; import appeng.api.networking.IGridCache; import appeng.api.networking.IGridCacheFactory; import appeng.api.networking.IGridCacheRegistry; -import appeng.core.AELog; public final class GridCacheRegistry implements IGridCacheRegistry { diff --git a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java index e97c429ac..e7a41de08 100644 --- a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java +++ b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java @@ -35,7 +35,6 @@ 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,6 +43,7 @@ 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 { private static final int INITIAL_CAPACITY = 40; @@ -54,7 +54,7 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry { public void configure() { - final IDefinitions definitions = AEApi.instance().definitions(); + final IDefinitions definitions = Api.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 c4725b487..7ca6f2692 100644 --- a/src/main/java/appeng/core/features/registries/WirelessRegistry.java +++ b/src/main/java/appeng/core/features/registries/WirelessRegistry.java @@ -26,13 +26,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Hand; import net.minecraft.world.IBlockReader; -import appeng.api.AEApi; import appeng.api.features.ILocatable; import appeng.api.features.IWirelessTermHandler; import appeng.api.features.IWirelessTermRegistry; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.container.implementations.WirelessTermContainer; +import appeng.core.Api; import appeng.core.localization.PlayerMessages; import appeng.util.Platform; @@ -89,7 +89,7 @@ public final class WirelessRegistry implements IWirelessTermRegistry { } final long parsedKey = Long.parseLong(unparsedKey); - final ILocatable securityStation = AEApi.instance().registries().locatable().getLocatableBy(parsedKey); + final ILocatable securityStation = Api.instance().registries().locatable().getLocatableBy(parsedKey); if (securityStation == null) { player.sendMessage(PlayerMessages.StationCanNotBeLocated.get()); return; diff --git a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java index 4b03b2c7b..dc6b70611 100644 --- a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java +++ b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java @@ -22,7 +22,6 @@ import java.util.HashSet; import net.minecraft.util.ResourceLocation; import net.minecraft.world.IWorld; -import net.minecraft.world.World; import net.minecraft.world.dimension.Dimension; import appeng.api.features.IWorldGen; 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 94210396a..ed60efa73 100644 --- a/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java +++ b/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java @@ -5,7 +5,6 @@ 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.IMEInventoryHandler; import appeng.api.storage.IStorageChannel; @@ -16,11 +15,12 @@ import appeng.api.storage.data.IAEStack; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.container.implementations.MEMonitorableContainer; +import appeng.core.Api; public class BasicItemCellGuiHandler implements ICellGuiHandler { @Override public > boolean isHandlerFor(final IStorageChannel channel) { - return channel == AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class); + return channel == Api.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 4afa69047..50cbbe15e 100644 --- a/src/main/java/appeng/core/features/registries/cell/CreativeCellHandler.java +++ b/src/main/java/appeng/core/features/registries/cell/CreativeCellHandler.java @@ -20,13 +20,13 @@ package appeng.core.features.registries.cell; import net.minecraft.item.ItemStack; -import appeng.api.AEApi; import appeng.api.storage.IStorageChannel; import appeng.api.storage.cells.CellState; import appeng.api.storage.cells.ICellHandler; import appeng.api.storage.cells.ICellInventoryHandler; import appeng.api.storage.cells.ISaveProvider; import appeng.api.storage.channels.IItemStorageChannel; +import appeng.core.Api; import appeng.items.storage.CreativeStorageCellItem; import appeng.me.storage.CreativeCellInventory; @@ -40,7 +40,7 @@ public final class CreativeCellHandler implements ICellHandler { @Override public ICellInventoryHandler getCellInventory(final ItemStack is, final ISaveProvider container, final IStorageChannel channel) { - if (channel == AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) && !is.isEmpty() + if (channel == Api.instance().storage().getStorageChannel(IItemStorageChannel.class) && !is.isEmpty() && is.getItem() instanceof CreativeStorageCellItem) { return CreativeCellInventory.getCell(is); } diff --git a/src/main/java/appeng/core/sync/BasePacketHandler.java b/src/main/java/appeng/core/sync/BasePacketHandler.java index fac85e3e5..82c39a3a0 100644 --- a/src/main/java/appeng/core/sync/BasePacketHandler.java +++ b/src/main/java/appeng/core/sync/BasePacketHandler.java @@ -24,7 +24,32 @@ import java.util.function.Function; import net.minecraft.network.PacketBuffer; -import appeng.core.sync.packets.*; +import appeng.core.sync.packets.AssemblerAnimationPacket; +import appeng.core.sync.packets.BlockTransitionEffectPacket; +import appeng.core.sync.packets.ClickPacket; +import appeng.core.sync.packets.CompassRequestPacket; +import appeng.core.sync.packets.CompassResponsePacket; +import appeng.core.sync.packets.CompressedNBTPacket; +import appeng.core.sync.packets.ConfigButtonPacket; +import appeng.core.sync.packets.ConfigValuePacket; +import appeng.core.sync.packets.CraftRequestPacket; +import appeng.core.sync.packets.FluidSlotPacket; +import appeng.core.sync.packets.InventoryActionPacket; +import appeng.core.sync.packets.ItemTransitionEffectPacket; +import appeng.core.sync.packets.JEIRecipePacket; +import appeng.core.sync.packets.LightningPacket; +import appeng.core.sync.packets.MEFluidInventoryUpdatePacket; +import appeng.core.sync.packets.MEInventoryUpdatePacket; +import appeng.core.sync.packets.MatterCannonPacket; +import appeng.core.sync.packets.MockExplosionPacket; +import appeng.core.sync.packets.PaintedEntityPacket; +import appeng.core.sync.packets.PartPlacementPacket; +import appeng.core.sync.packets.PatternSlotPacket; +import appeng.core.sync.packets.ProgressBarPacket; +import appeng.core.sync.packets.SwapSlotsPacket; +import appeng.core.sync.packets.SwitchGuisPacket; +import appeng.core.sync.packets.TargetFluidStackPacket; +import appeng.core.sync.packets.TargetItemStackPacket; public class BasePacketHandler { private static final Map, PacketTypes> REVERSE_LOOKUP = new HashMap<>(); diff --git a/src/main/java/appeng/core/sync/packets/ClickPacket.java b/src/main/java/appeng/core/sync/packets/ClickPacket.java index 1e3fa6d9f..0842a60c7 100644 --- a/src/main/java/appeng/core/sync/packets/ClickPacket.java +++ b/src/main/java/appeng/core/sync/packets/ClickPacket.java @@ -31,7 +31,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.Vec3d; -import appeng.api.AEApi; import appeng.api.definitions.IComparableDefinition; import appeng.api.definitions.IItems; import appeng.api.implementations.items.IMemoryCard; @@ -40,6 +39,7 @@ import appeng.block.networking.CableBusBlock; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.container.implementations.NetworkToolContainer; +import appeng.core.Api; import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; import appeng.items.tools.NetworkToolItem; @@ -123,7 +123,7 @@ public class ClickPacket extends BasePacket { final BlockPos pos = new BlockPos(this.x, this.y, this.z); final ItemStack is = player.getHeldItem(hand); - final IItems items = AEApi.instance().definitions().items(); + final IItems items = Api.instance().definitions().items(); final IComparableDefinition maybeMemoryCard = items.memoryCard(); final IComparableDefinition maybeColorApplicator = items.colorApplicator(); diff --git a/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java b/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java index f4fae638b..c98c64b21 100644 --- a/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java +++ b/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java @@ -29,7 +29,6 @@ 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; @@ -41,6 +40,7 @@ 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.BasePacket; import appeng.core.sync.network.INetworkInfo; import appeng.helpers.IContainerCraftingPacket; @@ -113,7 +113,7 @@ public class JEIRecipePacket extends BasePacket { if (inv != null && this.recipe != null && security != null) { final IMEMonitor storage = inv - .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); final IPartitionList filter = ViewCellItem.createFilter(cct.getViewCells()); for (int x = 0; x < craftMatrix.getSlots(); x++) { diff --git a/src/main/java/appeng/core/sync/packets/PatternSlotPacket.java b/src/main/java/appeng/core/sync/packets/PatternSlotPacket.java index 056b7f78f..d782db008 100644 --- a/src/main/java/appeng/core/sync/packets/PatternSlotPacket.java +++ b/src/main/java/appeng/core/sync/packets/PatternSlotPacket.java @@ -25,10 +25,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.PatternTermContainer; +import appeng.core.Api; import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; import appeng.util.item.AEItemStack; @@ -76,7 +76,7 @@ public class PatternSlotPacket extends BasePacket { this.writeItem(slotItem, data); for (int x = 0; x < 9; x++) { - this.pattern[x] = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + this.pattern[x] = Api.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 a7fcb7594..e6e8880cb 100644 --- a/src/main/java/appeng/crafting/CraftingJob.java +++ b/src/main/java/appeng/crafting/CraftingJob.java @@ -27,7 +27,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; -import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.networking.IGrid; import appeng.api.networking.IGridHost; @@ -44,6 +43,7 @@ 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; public class CraftingJob implements Runnable, ICraftingJob { @@ -52,9 +52,9 @@ public class CraftingJob implements Runnable, ICraftingJob { private final MECraftingInventory original; private final World world; - private final IItemList crafting = AEApi.instance().storage() + private final IItemList crafting = Api.instance().storage() .getStorageChannel(IItemStorageChannel.class).createList(); - private final IItemList missing = AEApi.instance().storage() + private final IItemList missing = Api.instance().storage() .getStorageChannel(IItemStorageChannel.class).createList(); private final HashMap opsAndMultiplier = new HashMap<>(); private final Object monitor = new Object(); @@ -85,7 +85,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(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)), actionSrc, + sg.getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class)), actionSrc, false, false, false); this.setTree(this.getCraftingTree(cc, what)); diff --git a/src/main/java/appeng/crafting/CraftingTreeNode.java b/src/main/java/appeng/crafting/CraftingTreeNode.java index 03c22dfa7..67b5382d1 100644 --- a/src/main/java/appeng/crafting/CraftingTreeNode.java +++ b/src/main/java/appeng/crafting/CraftingTreeNode.java @@ -26,7 +26,6 @@ import com.google.common.collect.Lists; import net.minecraft.world.World; -import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.FuzzyMode; import appeng.api.networking.crafting.ICraftingGrid; @@ -35,6 +34,7 @@ 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; public class CraftingTreeNode { @@ -42,7 +42,7 @@ public class CraftingTreeNode { // what slot! private final int slot; private final CraftingJob job; - private final IItemList used = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + private final IItemList used = Api.instance().storage().getStorageChannel(IItemStorageChannel.class) .createList(); // parent node. private final CraftingTreeProcess parent; diff --git a/src/main/java/appeng/crafting/CraftingTreeProcess.java b/src/main/java/appeng/crafting/CraftingTreeProcess.java index 4033f009c..31019c314 100644 --- a/src/main/java/appeng/crafting/CraftingTreeProcess.java +++ b/src/main/java/appeng/crafting/CraftingTreeProcess.java @@ -28,7 +28,6 @@ import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.fml.hooks.BasicEventHooks; -import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.networking.crafting.ICraftingGrid; import appeng.api.networking.crafting.ICraftingPatternDetails; @@ -37,6 +36,7 @@ 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; @@ -180,7 +180,7 @@ public class CraftingTreeProcess { ItemStack is = ic.getStackInSlot(x); is = Platform.getContainerItem(is); - final IAEItemStack o = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + final IAEItemStack o = Api.instance().storage().getStorageChannel(IItemStorageChannel.class) .createStack(is); if (o != null) { this.bytes++; @@ -195,7 +195,7 @@ public class CraftingTreeProcess { if (this.containerItems) { final ItemStack is = Platform.getContainerItem(stack.createItemStack()); - final IAEItemStack o = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + final IAEItemStack o = Api.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 87fe9db16..75ac570f0 100644 --- a/src/main/java/appeng/crafting/MECraftingInventory.java +++ b/src/main/java/appeng/crafting/MECraftingInventory.java @@ -18,7 +18,6 @@ package appeng.crafting; -import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.networking.security.IActionSource; import appeng.api.storage.IMEInventory; @@ -27,6 +26,7 @@ import appeng.api.storage.IStorageChannel; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; +import appeng.core.Api; import appeng.util.inv.ItemListIgnoreCrafting; public class MECraftingInventory implements IMEInventory { @@ -47,7 +47,7 @@ public class MECraftingInventory implements IMEInventory { public MECraftingInventory() { this.localCache = new ItemListIgnoreCrafting<>( - AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList()); + Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList()); this.extractedCache = null; this.injectedCache = null; this.missingCache = null; @@ -65,25 +65,25 @@ public class MECraftingInventory implements IMEInventory { this.logMissing = parent.logMissing; if (this.logMissing) { - this.missingCache = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList(); + this.missingCache = Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList(); } else { this.missingCache = null; } if (this.logExtracted) { - this.extractedCache = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList(); + this.extractedCache = Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList(); } else { this.extractedCache = null; } if (this.logInjections) { - this.injectedCache = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList(); + this.injectedCache = Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList(); } else { this.injectedCache = null; } this.localCache = this.target.getAvailableItems(new ItemListIgnoreCrafting<>( - AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList())); + Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList())); this.par = parent; } @@ -96,25 +96,25 @@ public class MECraftingInventory implements IMEInventory { this.logMissing = logMissing; if (logMissing) { - this.missingCache = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList(); + this.missingCache = Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList(); } else { this.missingCache = null; } if (logExtracted) { - this.extractedCache = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList(); + this.extractedCache = Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList(); } else { this.extractedCache = null; } if (logInjections) { - this.injectedCache = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList(); + this.injectedCache = Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList(); } else { this.injectedCache = null; } this.localCache = new ItemListIgnoreCrafting<>( - AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList()); + Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList()); for (final IAEItemStack is : target.getStorageList()) { this.localCache.add(target.extractItems(is, Actionable.SIMULATE, src)); } @@ -130,25 +130,25 @@ public class MECraftingInventory implements IMEInventory { this.logMissing = logMissing; if (logMissing) { - this.missingCache = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList(); + this.missingCache = Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList(); } else { this.missingCache = null; } if (logExtracted) { - this.extractedCache = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList(); + this.extractedCache = Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList(); } else { this.extractedCache = null; } if (logInjections) { - this.injectedCache = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList(); + this.injectedCache = Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList(); } else { this.injectedCache = null; } - this.localCache = target.getAvailableItems( - AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList()); + this.localCache = target + .getAvailableItems(Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList()); this.par = null; } @@ -214,7 +214,7 @@ public class MECraftingInventory implements IMEInventory { @Override public IStorageChannel getChannel() { - return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class); + return Api.instance().storage().getStorageChannel(IItemStorageChannel.class); } public IItemList getItemList() { @@ -222,9 +222,9 @@ public class MECraftingInventory implements IMEInventory { } public boolean commit(final IActionSource src) { - final IItemList added = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + final IItemList added = Api.instance().storage().getStorageChannel(IItemStorageChannel.class) .createList(); - final IItemList pulled = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + final IItemList pulled = Api.instance().storage().getStorageChannel(IItemStorageChannel.class) .createList(); boolean failed = false; diff --git a/src/main/java/appeng/entity/ChargedQuartzEntity.java b/src/main/java/appeng/entity/ChargedQuartzEntity.java index 0581023f9..75cccd1e5 100644 --- a/src/main/java/appeng/entity/ChargedQuartzEntity.java +++ b/src/main/java/appeng/entity/ChargedQuartzEntity.java @@ -32,11 +32,11 @@ 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.api.features.AEFeature; import appeng.client.EffectType; import appeng.core.AEConfig; +import appeng.core.Api; import appeng.core.AppEng; import appeng.util.Platform; @@ -92,7 +92,7 @@ public final class ChargedQuartzEntity extends AEBaseItemEntity { private boolean transform() { final ItemStack item = this.getItem(); - final IMaterials materials = AEApi.instance().definitions().materials(); + final IMaterials materials = Api.instance().definitions().materials(); if (materials.certusQuartzCrystalCharged().isSameAs(item)) { final AxisAlignedBB region = new AxisAlignedBB(this.getPosX() - 1, this.getPosY() - 1, this.getPosZ() - 1, diff --git a/src/main/java/appeng/entity/SingularityEntity.java b/src/main/java/appeng/entity/SingularityEntity.java index cbb4cbd80..0e11c14b5 100644 --- a/src/main/java/appeng/entity/SingularityEntity.java +++ b/src/main/java/appeng/entity/SingularityEntity.java @@ -30,10 +30,10 @@ 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.api.features.AEFeature; import appeng.core.AEConfig; +import appeng.core.Api; import appeng.util.Platform; public final class SingularityEntity extends AEBaseItemEntity { @@ -71,7 +71,7 @@ public final class SingularityEntity extends AEBaseItemEntity { final ItemStack item = this.getItem(); - final IMaterials materials = AEApi.instance().definitions().materials(); + final IMaterials materials = Api.instance().definitions().materials(); if (materials.singularity().isSameAs(item)) { final AxisAlignedBB region = new AxisAlignedBB(this.getPosX() - 4, this.getPosY() - 4, this.getPosZ() - 4, diff --git a/src/main/java/appeng/entity/TinyTNTPrimedEntity.java b/src/main/java/appeng/entity/TinyTNTPrimedEntity.java index 55ad38ed2..23fbe2c62 100644 --- a/src/main/java/appeng/entity/TinyTNTPrimedEntity.java +++ b/src/main/java/appeng/entity/TinyTNTPrimedEntity.java @@ -45,9 +45,9 @@ import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; import net.minecraftforge.fml.network.NetworkHooks; -import appeng.api.AEApi; import appeng.api.features.AEFeature; import appeng.core.AEConfig; +import appeng.core.Api; import appeng.core.AppEng; import appeng.core.sync.packets.MockExplosionPacket; import appeng.util.Platform; @@ -102,7 +102,7 @@ public final class TinyTNTPrimedEntity extends TNTEntity implements IEntityAddit if (this.isInWater() && Platform.isServer()) // put out the fuse. { - AEApi.instance().definitions().blocks().tinyTNT().maybeStack(1).ifPresent(tntStack -> { + Api.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 283ac5118..24e8051bc 100644 --- a/src/main/java/appeng/facade/FacadeContainer.java +++ b/src/main/java/appeng/facade/FacadeContainer.java @@ -25,11 +25,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.FacadeItem; import appeng.parts.CableBusStorage; @@ -109,7 +109,7 @@ public class FacadeContainer implements IFacadeContainer { if ((facadeSides & ix) == ix) { final int id = Math.abs(out.readInt()); - Optional maybeFacadeItem = AEApi.instance().definitions().items().facade() + Optional maybeFacadeItem = Api.instance().definitions().items().facade() .maybeItem(); if (maybeFacadeItem.isPresent()) { final FacadeItem ifa = (FacadeItem) maybeFacadeItem.get(); diff --git a/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java b/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java index 605b2704f..655d13633 100644 --- a/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java +++ b/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java @@ -26,7 +26,6 @@ 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,6 +40,7 @@ import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; import appeng.container.implementations.ContainerHelper; import appeng.container.slot.RestrictedInputSlot; +import appeng.core.Api; import appeng.fluids.parts.FluidStorageBusPart; import appeng.fluids.util.IAEFluidTank; import appeng.util.Platform; @@ -162,7 +162,7 @@ public class FluidStorageBusContainer extends FluidConfigurableContainer { Iterator i = new NullIterator<>(); if (cellInv != null) { final IItemList list = cellInv.getAvailableItems( - AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class).createList()); + Api.instance().storage().getStorageChannel(IFluidStorageChannel.class).createList()); i = list.iterator(); } diff --git a/src/main/java/appeng/fluids/container/FluidTerminalContainer.java b/src/main/java/appeng/fluids/container/FluidTerminalContainer.java index d4eebaed4..6cd449a40 100644 --- a/src/main/java/appeng/fluids/container/FluidTerminalContainer.java +++ b/src/main/java/appeng/fluids/container/FluidTerminalContainer.java @@ -36,7 +36,6 @@ import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction; import net.minecraftforge.fluids.capability.IFluidHandlerItem; -import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; import appeng.api.config.SecurityPermissions; @@ -66,6 +65,7 @@ import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; import appeng.container.implementations.ContainerHelper; import appeng.core.AELog; +import appeng.core.Api; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.ConfigValuePacket; import appeng.core.sync.packets.MEFluidInventoryUpdatePacket; @@ -100,7 +100,7 @@ public class FluidTerminalContainer extends AEBaseContainer private final IConfigManager clientCM; private final IMEMonitor monitor; - private final IItemList fluids = AEApi.instance().storage() + private final IItemList fluids = Api.instance().storage() .getStorageChannel(IFluidStorageChannel.class).createList(); @GuiSync(99) public boolean hasPower = false; @@ -122,7 +122,7 @@ public class FluidTerminalContainer extends AEBaseContainer if (Platform.isServer()) { this.serverCM = terminal.getConfigManager(); this.monitor = terminal - .getInventory(AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class)); + .getInventory(Api.instance().storage().getStorageChannel(IFluidStorageChannel.class)); if (this.monitor != null) { this.monitor.addListener(this, null); @@ -248,7 +248,7 @@ public class FluidTerminalContainer extends AEBaseContainer public void detectAndSendChanges() { if (Platform.isServer()) { if (this.monitor != this.terminal - .getInventory(AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class))) { + .getInventory(Api.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 2c4b5ad1e..ae8b30903 100644 --- a/src/main/java/appeng/fluids/helper/DualityFluidInterface.java +++ b/src/main/java/appeng/fluids/helper/DualityFluidInterface.java @@ -30,7 +30,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.items.IItemHandler; -import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.Settings; import appeng.api.config.Upgrades; @@ -58,6 +57,7 @@ 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; @@ -91,10 +91,9 @@ public class DualityFluidInterface private int priority; private final MEMonitorPassThrough items = new MEMonitorPassThrough<>( - new NullInventory(), AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + new NullInventory(), Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); private final MEMonitorPassThrough fluids = new MEMonitorPassThrough<>( - new NullInventory(), - AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class)); + new NullInventory(), Api.instance().storage().getStorageChannel(IFluidStorageChannel.class)); public DualityFluidInterface(final AENetworkProxy networkProxy, final IFluidInterfaceHost ih) { this.gridProxy = networkProxy; @@ -125,13 +124,13 @@ public class DualityFluidInterface @Override public > IMEMonitor getInventory(IStorageChannel channel) { - if (channel == AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)) { + if (channel == Api.instance().storage().getStorageChannel(IItemStorageChannel.class)) { if (this.hasConfig()) { return null; } return (IMEMonitor) this.items; - } else if (channel == AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class)) { + } else if (channel == Api.instance().storage().getStorageChannel(IFluidStorageChannel.class)) { if (this.hasConfig()) { return (IMEMonitor) new InterfaceInventory(this); } @@ -185,9 +184,9 @@ public class DualityFluidInterface public void gridChanged() { try { this.items.setInternal(this.gridProxy.getStorage() - .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class))); + .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class))); this.fluids.setInternal(this.gridProxy.getStorage() - .getInventory(AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class))); + .getInventory(Api.instance().storage().getStorageChannel(IFluidStorageChannel.class))); } catch (final GridAccessException gae) { this.items.setInternal(new NullInventory()); this.fluids.setInternal(new NullInventory()); @@ -311,7 +310,7 @@ public class DualityFluidInterface boolean changed = false; try { final IMEInventory dest = this.gridProxy.getStorage() - .getInventory(AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class)); + .getInventory(Api.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 3a6b97d94..392b29af3 100644 --- a/src/main/java/appeng/fluids/helper/FluidCellConfig.java +++ b/src/main/java/appeng/fluids/helper/FluidCellConfig.java @@ -26,7 +26,7 @@ import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; -import appeng.api.AEApi; +import appeng.core.Api; import appeng.fluids.items.FluidDummyItem; import appeng.items.contents.CellConfig; @@ -47,14 +47,13 @@ public class FluidCellConfig extends CellConfig { super.insertItem(slot, stack, simulate); } LazyOptional fluidOpt = FluidUtil.getFluidContained(stack); - if (!fluidOpt.isPresent() - || !AEApi.instance().definitions().items().dummyFluidItem().maybeStack(1).isPresent()) { + if (!fluidOpt.isPresent() || !Api.instance().definitions().items().dummyFluidItem().maybeStack(1).isPresent()) { return stack; } FluidStack fluid = fluidOpt.orElse(null); fluid.setAmount(FluidAttributes.BUCKET_VOLUME); - ItemStack is = AEApi.instance().definitions().items().dummyFluidItem().maybeStack(1).get(); + ItemStack is = Api.instance().definitions().items().dummyFluidItem().maybeStack(1).get(); FluidDummyItem item = (FluidDummyItem) is.getItem(); item.setFluidStack(is, fluid); return super.insertItem(slot, is, simulate); @@ -66,14 +65,13 @@ public class FluidCellConfig extends CellConfig { super.setStackInSlot(slot, stack); } LazyOptional fluidOpt = FluidUtil.getFluidContained(stack); - if (!fluidOpt.isPresent() - || !AEApi.instance().definitions().items().dummyFluidItem().maybeStack(1).isPresent()) { + if (!fluidOpt.isPresent() || !Api.instance().definitions().items().dummyFluidItem().maybeStack(1).isPresent()) { return; } FluidStack fluid = fluidOpt.orElse(null); fluid.setAmount(FluidAttributes.BUCKET_VOLUME); - ItemStack is = AEApi.instance().definitions().items().dummyFluidItem().maybeStack(1).get(); + ItemStack is = Api.instance().definitions().items().dummyFluidItem().maybeStack(1).get(); FluidDummyItem item = (FluidDummyItem) is.getItem(); item.setFluidStack(is, fluid); super.setStackInSlot(slot, is); @@ -85,14 +83,13 @@ public class FluidCellConfig extends CellConfig { super.isItemValid(slot, stack); } LazyOptional fluidOpt = FluidUtil.getFluidContained(stack); - if (!fluidOpt.isPresent() - || !AEApi.instance().definitions().items().dummyFluidItem().maybeStack(1).isPresent()) { + if (!fluidOpt.isPresent() || !Api.instance().definitions().items().dummyFluidItem().maybeStack(1).isPresent()) { return false; } FluidStack fluid = fluidOpt.orElse(null); fluid.setAmount(FluidAttributes.BUCKET_VOLUME); - ItemStack is = AEApi.instance().definitions().items().dummyFluidItem().maybeStack(1).get(); + ItemStack is = Api.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 52f4de6a8..fd0d4fd9a 100644 --- a/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java +++ b/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java @@ -22,10 +22,10 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; -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; @@ -79,7 +79,7 @@ public final class BasicFluidStorageCell extends AbstractStorageCell getChannel() { - return AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class); + return Api.instance().storage().getStorageChannel(IFluidStorageChannel.class); } @Override @@ -94,7 +94,7 @@ public final class BasicFluidStorageCell extends AbstractStorageCell { + Api.instance().definitions().materials().emptyStorageCell().maybeStack(1).ifPresent(is -> { final ItemStack extraA = ia.addItems(is); if (!extraA.isEmpty()) { player.dropItem(extraA, false); diff --git a/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java b/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java index b75099c4d..bce367828 100644 --- a/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java +++ b/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java @@ -23,7 +23,6 @@ import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fluids.FluidStack; -import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; import appeng.api.networking.IGridNode; @@ -45,6 +44,7 @@ import appeng.api.storage.channels.IFluidStorageChannel; import appeng.api.storage.data.IAEFluidStack; 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.BlockTransitionEffectPacket; @@ -280,7 +280,7 @@ public class FluidAnnihilationPlanePart extends BasicStatePart implements IGridT try { final IStorageGrid storage = this.getProxy().getStorage(); final IMEInventory inv = storage - .getInventory(AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class)); + .getInventory(Api.instance().storage().getStorageChannel(IFluidStorageChannel.class)); if (modulate) { final IEnergyGrid energy = this.getProxy().getEnergy(); diff --git a/src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java b/src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java index 427385657..fdc17efea 100644 --- a/src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java +++ b/src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java @@ -27,7 +27,6 @@ import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.templates.FluidTank; -import appeng.api.AEApi; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; import appeng.api.config.IncludeExclude; @@ -46,6 +45,7 @@ import appeng.api.storage.data.IItemList; import appeng.api.util.AEPartLocation; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; +import appeng.core.Api; import appeng.fluids.container.FluidFormationPlaneContainer; import appeng.fluids.util.AEFluidInventory; import appeng.fluids.util.IAEFluidInventory; @@ -69,7 +69,7 @@ public class FluidFormationPlanePart extends AbstractFormationPlanePart myHandler = new MEInventoryHandler<>(this, - AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class)); + Api.instance().storage().getStorageChannel(IFluidStorageChannel.class)); private final AEFluidInventory config = new AEFluidInventory(this, 63); public FluidFormationPlanePart(final ItemStack is) { @@ -84,7 +84,7 @@ public class FluidFormationPlanePart extends AbstractFormationPlanePart 0 ? IncludeExclude.BLACKLIST : IncludeExclude.WHITELIST); this.myHandler.setPriority(this.getPriority()); - final IItemList priorityList = AEApi.instance().storage() + final IItemList priorityList = Api.instance().storage() .getStorageChannel(IFluidStorageChannel.class).createList(); final int slotsToUse = 18 + this.getInstalledUpgrades(Upgrades.CAPACITY) * 9; @@ -183,13 +183,13 @@ public class FluidFormationPlanePart extends AbstractFormationPlanePart getChannel() { - return AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class); + return Api.instance().storage().getStorageChannel(IFluidStorageChannel.class); } @Override public List getCellArray(final IStorageChannel channel) { if (this.getProxy().isActive() - && channel == AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class)) { + && channel == Api.instance().storage().getStorageChannel(IFluidStorageChannel.class)) { final List handler = new ArrayList<>(1); handler.add(this.myHandler); return handler; @@ -214,7 +214,7 @@ public class FluidFormationPlanePart extends AbstractFormationPlanePart, IBaseMo @Override public IStorageChannel getChannel() { - return AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class); + return Api.instance().storage().getStorageChannel(IFluidStorageChannel.class); } @Override diff --git a/src/main/java/appeng/fluids/parts/FluidInterfacePart.java b/src/main/java/appeng/fluids/parts/FluidInterfacePart.java index 7889520f6..414a3e0a6 100644 --- a/src/main/java/appeng/fluids/parts/FluidInterfacePart.java +++ b/src/main/java/appeng/fluids/parts/FluidInterfacePart.java @@ -33,7 +33,6 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.IItemHandler; -import appeng.api.AEApi; import appeng.api.config.Upgrades; import appeng.api.networking.IGridNode; import appeng.api.networking.events.MENetworkChannelsChanged; @@ -52,6 +51,7 @@ import appeng.api.util.AECableType; import appeng.api.util.IConfigManager; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; +import appeng.core.Api; import appeng.core.AppEng; import appeng.fluids.container.FluidInterfaceContainer; import appeng.fluids.helper.DualityFluidInterface; @@ -206,7 +206,7 @@ public class FluidInterfacePart extends BasicStatePart @Override public ItemStack getItemStackRepresentation() { - return AEApi.instance().definitions().parts().fluidIface().maybeStack(1).orElse(ItemStack.EMPTY); + return Api.instance().definitions().parts().fluidIface().maybeStack(1).orElse(ItemStack.EMPTY); } @Override diff --git a/src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java b/src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java index 63b0a13b6..ea04aae42 100644 --- a/src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java +++ b/src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java @@ -14,7 +14,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import appeng.api.AEApi; import appeng.api.config.RedstoneMode; import appeng.api.config.Settings; import appeng.api.networking.events.MENetworkChannelsChanged; @@ -38,6 +37,7 @@ import appeng.api.util.AEPartLocation; import appeng.api.util.IConfigManager; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; +import appeng.core.Api; import appeng.core.AppEng; import appeng.fluids.container.FluidLevelEmitterContainer; import appeng.fluids.util.AEFluidInventory; @@ -112,7 +112,7 @@ public class FluidLevelEmitterPart extends UpgradeablePart @Override public void onStackChange(IItemList o, IAEStack fullStack, IAEStack diffStack, IActionSource src, IStorageChannel chan) { - if (chan == AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class) + if (chan == Api.instance().storage().getStorageChannel(IFluidStorageChannel.class) && fullStack.equals(this.config.getFluidInSlot(0))) { this.lastReportedValue = fullStack.getStackSize(); this.updateState(); @@ -167,7 +167,7 @@ public class FluidLevelEmitterPart extends UpgradeablePart @Override public void onListUpdate() { try { - final IStorageChannel channel = AEApi.instance().storage() + final IStorageChannel channel = Api.instance().storage() .getStorageChannel(IFluidStorageChannel.class); final IMEMonitor inventory = this.getProxy().getStorage().getInventory(channel); @@ -189,7 +189,7 @@ public class FluidLevelEmitterPart extends UpgradeablePart } private void configureWatchers() { - final IFluidStorageChannel channel = AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class); + final IFluidStorageChannel channel = Api.instance().storage().getStorageChannel(IFluidStorageChannel.class); if (this.stackWatcher != null) { this.stackWatcher.reset(); diff --git a/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java b/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java index 23a7841f9..dff3945c0 100644 --- a/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java +++ b/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java @@ -37,7 +37,6 @@ 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; @@ -66,6 +65,7 @@ import appeng.api.util.AEPartLocation; import appeng.capabilities.Capabilities; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; +import appeng.core.Api; import appeng.core.AppEng; import appeng.core.settings.TickRates; import appeng.fluids.container.FluidStorageBusContainer; @@ -127,7 +127,7 @@ public class FluidStorageBusPart extends SharedStorageBusPart if (accessor != null) { IStorageMonitorable inventory = accessor.getInventory(this.source); if (inventory != null) { - return inventory.getInventory(AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class)); + return inventory.getInventory(Api.instance().storage().getStorageChannel(IFluidStorageChannel.class)); } // So this could / can be a design decision. If the tile does support our custom @@ -169,7 +169,7 @@ public class FluidStorageBusPart extends SharedStorageBusPart this.resetCacheLogic = 0; final IMEInventory in = this.getInternalHandler(); - IItemList before = AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class) + IItemList before = Api.instance().storage().getStorageChannel(IFluidStorageChannel.class) .createList(); if (in != null) { before = in.getAvailableItems(before); @@ -183,7 +183,7 @@ public class FluidStorageBusPart extends SharedStorageBusPart final IMEInventory out = this.getInternalHandler(); if (in != out) { - IItemList after = AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class) + IItemList after = Api.instance().storage().getStorageChannel(IFluidStorageChannel.class) .createList(); if (out != null) { after = out.getAvailableItems(after); @@ -250,7 +250,7 @@ public class FluidStorageBusPart extends SharedStorageBusPart try { if (this.getProxy().isActive()) { this.getProxy().getStorage().postAlterationOfStoredItems( - AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class), change, this.source); + Api.instance().storage().getStorageChannel(IFluidStorageChannel.class), change, this.source); } } catch (final GridAccessException e) { // :( @@ -287,14 +287,14 @@ public class FluidStorageBusPart extends SharedStorageBusPart this.checkInterfaceVsStorageBus(target, this.getSide().getOpposite()); this.handler = new MEInventoryHandler<>(inv, - AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class)); + Api.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 = AEApi.instance().storage() + final IItemList priorityList = Api.instance().storage() .getStorageChannel(IFluidStorageChannel.class).createList(); final int slotsToUse = 18 + this.getInstalledUpgrades(Upgrades.CAPACITY) * 9; @@ -413,7 +413,7 @@ public class FluidStorageBusPart extends SharedStorageBusPart @Override public IStorageChannel getStorageChannel() { - return AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class); + return Api.instance().storage().getStorageChannel(IFluidStorageChannel.class); } public IAEFluidTank getConfig() { @@ -434,7 +434,7 @@ public class FluidStorageBusPart extends SharedStorageBusPart @Override public ItemStack getItemStackRepresentation() { - return AEApi.instance().definitions().parts().fluidStorageBus().maybeStack(1).orElse(ItemStack.EMPTY); + return Api.instance().definitions().parts().fluidStorageBus().maybeStack(1).orElse(ItemStack.EMPTY); } @Override diff --git a/src/main/java/appeng/fluids/parts/SharedFluidBusPart.java b/src/main/java/appeng/fluids/parts/SharedFluidBusPart.java index b88649d01..94b10776d 100644 --- a/src/main/java/appeng/fluids/parts/SharedFluidBusPart.java +++ b/src/main/java/appeng/fluids/parts/SharedFluidBusPart.java @@ -30,7 +30,6 @@ 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; @@ -40,6 +39,7 @@ import appeng.api.storage.channels.IFluidStorageChannel; import appeng.api.util.AECableType; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; +import appeng.core.Api; import appeng.fluids.container.FluidIOContainer; import appeng.fluids.util.AEFluidInventory; import appeng.fluids.util.IAEFluidTank; @@ -154,7 +154,7 @@ public abstract class SharedFluidBusPart extends UpgradeablePart implements IGri } protected IFluidStorageChannel getChannel() { - return AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class); + return Api.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 0e1a6b25b..ac8a69698 100644 --- a/src/main/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java +++ b/src/main/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java @@ -22,7 +22,6 @@ 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.IMEInventoryHandler; import appeng.api.storage.IStorageChannel; @@ -32,13 +31,14 @@ import appeng.api.storage.channels.IFluidStorageChannel; import appeng.api.storage.data.IAEStack; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; +import appeng.core.Api; import appeng.fluids.container.FluidTerminalContainer; public class BasicFluidCellGuiHandler implements ICellGuiHandler { @Override public > boolean isHandlerFor(final IStorageChannel channel) { - return channel == AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class); + return channel == Api.instance().storage().getStorageChannel(IFluidStorageChannel.class); } @Override diff --git a/src/main/java/appeng/fluids/tile/FluidInterfaceTileEntity.java b/src/main/java/appeng/fluids/tile/FluidInterfaceTileEntity.java index 9ff0640b7..95af9e7af 100644 --- a/src/main/java/appeng/fluids/tile/FluidInterfaceTileEntity.java +++ b/src/main/java/appeng/fluids/tile/FluidInterfaceTileEntity.java @@ -32,7 +32,6 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.IItemHandler; -import appeng.api.AEApi; import appeng.api.config.Upgrades; import appeng.api.networking.IGridNode; import appeng.api.networking.events.MENetworkChannelsChanged; @@ -45,6 +44,7 @@ import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.api.util.IConfigManager; +import appeng.core.Api; import appeng.fluids.container.FluidInterfaceContainer; import appeng.fluids.helper.DualityFluidInterface; import appeng.fluids.helper.IFluidInterfaceHost; @@ -158,7 +158,7 @@ public class FluidInterfaceTileEntity extends AENetworkTileEntity @Override public ItemStack getItemStackRepresentation() { - return AEApi.instance().definitions().blocks().fluidIface().maybeStack(1).orElse(ItemStack.EMPTY); + return Api.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 00433bd84..c07acd070 100644 --- a/src/main/java/appeng/fluids/util/AEFluidStack.java +++ b/src/main/java/appeng/fluids/util/AEFluidStack.java @@ -33,11 +33,11 @@ import net.minecraftforge.common.util.Constants; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.registries.ForgeRegistries; -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; @@ -154,7 +154,7 @@ public final class AEFluidStack extends AEStack implements IAEFlu @Override public IStorageChannel getChannel() { - return AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class); + return Api.instance().storage().getStorageChannel(IFluidStorageChannel.class); } @Override @@ -218,7 +218,7 @@ public final class AEFluidStack extends AEStack implements IAEFlu @Override public ItemStack asItemStackRepresentation() { - ItemStack is = AEApi.instance().definitions().items().dummyFluidItem().maybeStack(1).orElse(ItemStack.EMPTY); + ItemStack is = Api.instance().definitions().items().dummyFluidItem().maybeStack(1).orElse(ItemStack.EMPTY); if (!is.isEmpty()) { FluidDummyItem item = (FluidDummyItem) is.getItem(); item.setFluidStack(is, this.getFluidStack()); diff --git a/src/main/java/appeng/forge/data/providers/IAE2DataProvider.java b/src/main/java/appeng/forge/data/providers/IAE2DataProvider.java index 3548de4b6..e1b5ac5ae 100644 --- a/src/main/java/appeng/forge/data/providers/IAE2DataProvider.java +++ b/src/main/java/appeng/forge/data/providers/IAE2DataProvider.java @@ -2,13 +2,13 @@ package appeng.forge.data.providers; import net.minecraft.data.IDataProvider; -import appeng.api.AEApi; import appeng.api.definitions.IBlocks; import appeng.api.definitions.IItems; import appeng.api.definitions.IMaterials; +import appeng.core.Api; public interface IAE2DataProvider extends IDataProvider { - IBlocks BLOCKS = AEApi.instance().definitions().blocks(); - IItems ITEMS = AEApi.instance().definitions().items(); - IMaterials MATERIALS = AEApi.instance().definitions().materials(); + IBlocks BLOCKS = Api.instance().definitions().blocks(); + IItems ITEMS = Api.instance().definitions().items(); + IMaterials MATERIALS = Api.instance().definitions().materials(); } diff --git a/src/main/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java b/src/main/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java index 1077b6311..d2be6168d 100644 --- a/src/main/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java +++ b/src/main/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java @@ -12,7 +12,6 @@ import net.minecraft.data.ShapedRecipeBuilder; import net.minecraft.data.SingleItemRecipeBuilder; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.crafting.ConditionalRecipe; import appeng.api.definitions.IBlockDefinition; import appeng.core.AppEng; diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index bdfd3a176..97a7bb8a4 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -53,7 +53,6 @@ import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.RangedWrapper; -import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.Settings; import appeng.api.config.Upgrades; @@ -91,6 +90,7 @@ 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.me.GridAccessException; import appeng.me.helpers.AENetworkProxy; @@ -131,10 +131,9 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn 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(), AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + new NullInventory(), Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); private final MEMonitorPassThrough fluids = new MEMonitorPassThrough<>( - new NullInventory(), - AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class)); + new NullInventory(), Api.instance().storage().getStorageChannel(IFluidStorageChannel.class)); private final UpgradeInventory upgrades; private boolean hasConfig = false; private int priority; @@ -360,7 +359,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn final ItemStack stored = this.storage.getStackInSlot(slot); if (req == null && !stored.isEmpty()) { - final IAEItemStack work = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + final IAEItemStack work = Api.instance().storage().getStorageChannel(IItemStorageChannel.class) .createStack(stored); this.requireWork[slot] = work.setStackSize(-work.getStackSize()); return; @@ -379,7 +378,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn } else // Stored != null; dispose! { - final IAEItemStack work = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + final IAEItemStack work = Api.instance().storage().getStorageChannel(IItemStorageChannel.class) .createStack(stored); this.requireWork[slot] = work.setStackSize(-work.getStackSize()); return; @@ -433,7 +432,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn @Override public boolean canInsert(final ItemStack stack) { final IAEItemStack out = this.destination.injectItems( - AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(stack), + Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(stack), Actionable.SIMULATE, null); if (out == null) { return true; @@ -456,9 +455,9 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn public void gridChanged() { try { this.items.setInternal(this.gridProxy.getStorage() - .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class))); + .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class))); this.fluids.setInternal(this.gridProxy.getStorage() - .getInventory(AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class))); + .getInventory(Api.instance().storage().getStorageChannel(IFluidStorageChannel.class))); } catch (final GridAccessException gae) { this.items.setInternal(new NullInventory()); this.fluids.setInternal(new NullInventory()); @@ -563,7 +562,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn boolean changed = false; try { this.destination = this.gridProxy.getStorage() - .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); final IEnergySource src = this.gridProxy.getEnergy(); if (this.craftingTracker.isBusy(x)) { @@ -663,13 +662,13 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn @Override public > IMEMonitor getInventory(IStorageChannel channel) { - if (channel == AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)) { + if (channel == Api.instance().storage().getStorageChannel(IItemStorageChannel.class)) { if (this.hasConfig()) { return (IMEMonitor) new InterfaceInventory(this); } return (IMEMonitor) this.items; - } else if (channel == AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class)) { + } else if (channel == Api.instance().storage().getStorageChannel(IFluidStorageChannel.class)) { if (this.hasConfig()) { return null; } @@ -737,7 +736,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn @Override public > IMEMonitor getInventory(IStorageChannel channel) { - if (channel == AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)) { + if (channel == Api.instance().storage().getStorageChannel(IItemStorageChannel.class)) { return (IMEMonitor) new InterfaceInventory(di); } return null; diff --git a/src/main/java/appeng/helpers/MultiCraftingTracker.java b/src/main/java/appeng/helpers/MultiCraftingTracker.java index e8edf1ae9..b388cdef2 100644 --- a/src/main/java/appeng/helpers/MultiCraftingTracker.java +++ b/src/main/java/appeng/helpers/MultiCraftingTracker.java @@ -26,7 +26,6 @@ import com.google.common.collect.ImmutableSet; import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; -import appeng.api.AEApi; import appeng.api.networking.IGrid; import appeng.api.networking.crafting.ICraftingGrid; import appeng.api.networking.crafting.ICraftingJob; @@ -34,6 +33,7 @@ import appeng.api.networking.crafting.ICraftingLink; import appeng.api.networking.crafting.ICraftingRequester; import appeng.api.networking.security.IActionSource; import appeng.api.storage.data.IAEItemStack; +import appeng.core.Api; import appeng.util.InventoryAdaptor; public class MultiCraftingTracker { @@ -54,7 +54,7 @@ public class MultiCraftingTracker { final CompoundNBT link = extra.getCompound("links-" + x); if (link != null && !link.isEmpty()) { - this.setLink(x, AEApi.instance().storage().loadCraftingLink(link, this.owner)); + this.setLink(x, Api.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 383ba4355..0664ec83e 100644 --- a/src/main/java/appeng/helpers/PatternHelper.java +++ b/src/main/java/appeng/helpers/PatternHelper.java @@ -34,11 +34,11 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; import net.minecraft.world.World; -import appeng.api.AEApi; import appeng.api.networking.crafting.ICraftingPatternDetails; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.container.ContainerNull; +import appeng.core.Api; import appeng.util.Platform; import appeng.util.item.AEItemStack; @@ -92,7 +92,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable { } private List getViableStorageComponents(CondenserOutput condenserOutput) { - IMaterials materials = AEApi.instance().definitions().materials(); + IMaterials materials = Api.instance().definitions().materials(); List viableComponents = new ArrayList<>(); materials.cell1kPart().maybeStack(1) .ifPresent(itemStack -> this.addViableComponent(condenserOutput, viableComponents, itemStack)); diff --git a/src/main/java/appeng/integration/modules/jei/JEIPlugin.java b/src/main/java/appeng/integration/modules/jei/JEIPlugin.java index 71e6282cf..d7365ce86 100644 --- a/src/main/java/appeng/integration/modules/jei/JEIPlugin.java +++ b/src/main/java/appeng/integration/modules/jei/JEIPlugin.java @@ -42,7 +42,6 @@ import mezz.jei.api.registration.IRecipeTransferRegistration; import mezz.jei.api.registration.ISubtypeRegistration; import mezz.jei.api.runtime.IJeiRuntime; -import appeng.api.AEApi; import appeng.api.config.CondenserOutput; import appeng.api.definitions.IDefinitions; import appeng.api.definitions.IItemDefinition; @@ -70,7 +69,7 @@ public class JEIPlugin implements IModPlugin { @Override public void registerItemSubtypes(ISubtypeRegistration subtypeRegistry) { - final Optional maybeFacade = AEApi.instance().definitions().items().facade().maybeItem(); + final Optional maybeFacade = Api.instance().definitions().items().facade().maybeItem(); maybeFacade.ifPresent(subtypeRegistry::useNbtForSubtypes); } @@ -93,7 +92,7 @@ public class JEIPlugin implements IModPlugin { @Override public void registerRecipes(IRecipeRegistration registration) { - IDefinitions definitions = AEApi.instance().definitions(); + IDefinitions definitions = Api.instance().definitions(); RecipeManager recipeManager = Minecraft.getInstance().world.getRecipeManager(); registration.addRecipes(recipeManager.getRecipes(GrinderRecipe.TYPE).values(), GrinderRecipeCategory.UID); @@ -106,7 +105,7 @@ public class JEIPlugin implements IModPlugin { @Override public void registerRecipeCatalysts(IRecipeCatalystRegistration registration) { - IDefinitions definitions = AEApi.instance().definitions(); + IDefinitions definitions = Api.instance().definitions(); ItemStack grindstone = definitions.blocks().grindstone().stack(1); registration.addRecipeCatalyst(grindstone, GrinderRecipeCategory.UID); @@ -165,7 +164,7 @@ public class JEIPlugin implements IModPlugin { @Override public void registerAdvanced(IAdvancedRegistration registration) { - IDefinitions definitions = AEApi.instance().definitions(); + IDefinitions definitions = Api.instance().definitions(); if (AEConfig.instance().isFeatureEnabled(AEFeature.ENABLE_FACADE_CRAFTING)) { FacadeItem itemFacade = (FacadeItem) definitions.items().facade().item(); diff --git a/src/main/java/appeng/items/contents/PortableCellViewer.java b/src/main/java/appeng/items/contents/PortableCellViewer.java index 2d23feae6..59b88f306 100644 --- a/src/main/java/appeng/items/contents/PortableCellViewer.java +++ b/src/main/java/appeng/items/contents/PortableCellViewer.java @@ -21,7 +21,6 @@ package appeng.items.contents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; import appeng.api.config.Settings; @@ -37,6 +36,7 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEStack; import appeng.api.util.IConfigManager; import appeng.container.interfaces.IInventorySlotAware; +import appeng.core.Api; import appeng.me.helpers.MEMonitorHandler; import appeng.util.ConfigManager; @@ -47,8 +47,8 @@ public class PortableCellViewer extends MEMonitorHandler implement private final int inventorySlot; public PortableCellViewer(final ItemStack is, final int slot) { - super(AEApi.instance().registries().cell().getCellInventory(is, null, - AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class))); + super(Api.instance().registries().cell().getCellInventory(is, null, + Api.instance().storage().getStorageChannel(IItemStorageChannel.class))); this.ips = (IAEItemPowerStorage) is.getItem(); this.target = is; this.inventorySlot = slot; @@ -77,7 +77,7 @@ public class PortableCellViewer extends MEMonitorHandler implement @Override public > IMEMonitor getInventory(IStorageChannel channel) { - if (channel == AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)) { + if (channel == Api.instance().storage().getStorageChannel(IItemStorageChannel.class)) { return (IMEMonitor) this; } return null; diff --git a/src/main/java/appeng/items/misc/EncodedPatternItem.java b/src/main/java/appeng/items/misc/EncodedPatternItem.java index e1963d7e6..41dd4b3df 100644 --- a/src/main/java/appeng/items/misc/EncodedPatternItem.java +++ b/src/main/java/appeng/items/misc/EncodedPatternItem.java @@ -37,10 +37,10 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -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; @@ -76,7 +76,7 @@ public class EncodedPatternItem extends AEBaseItem implements ICraftingPatternIt final PlayerInventory inv = player.inventory; - ItemStack is = AEApi.instance().definitions().materials().blankPattern().maybeStack(stack.getCount()) + ItemStack is = Api.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/FacadeItem.java b/src/main/java/appeng/items/parts/FacadeItem.java index d696748e5..d69441ca5 100644 --- a/src/main/java/appeng/items/parts/FacadeItem.java +++ b/src/main/java/appeng/items/parts/FacadeItem.java @@ -24,7 +24,12 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderTypeLookup; -import net.minecraft.item.*; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUseContext; +import net.minecraft.item.Items; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tags.BlockTags; import net.minecraft.tags.Tag; @@ -37,12 +42,12 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.world.EmptyBlockReader; import net.minecraftforge.registries.ForgeRegistries; -import appeng.api.AEApi; import appeng.api.exceptions.MissingDefinitionException; import appeng.api.features.AEFeature; import appeng.api.parts.IAlphaPassItem; import appeng.api.util.AEPartLocation; import appeng.core.AEConfig; +import appeng.core.Api; import appeng.core.AppEng; import appeng.facade.FacadePart; import appeng.facade.IFacadeItem; @@ -63,7 +68,7 @@ public class FacadeItem extends AEBaseItem implements IFacadeItem, IAlphaPassIte @Override public ActionResultType onItemUseFirst(ItemStack stack, ItemUseContext context) { - return AEApi.instance().partHelper().placeBus(stack, context.getPos(), context.getFace(), context.getPlayer(), + return Api.instance().partHelper().placeBus(stack, context.getPos(), context.getFace(), context.getPlayer(), context.getHand(), context.getWorld()); } @@ -171,7 +176,7 @@ public class FacadeItem extends AEBaseItem implements IFacadeItem, IAlphaPassIte } public ItemStack createFromID(final int id) { - ItemStack facadeStack = AEApi.instance().definitions().items().facade().maybeStack(1).orElseThrow( + ItemStack facadeStack = Api.instance().definitions().items().facade().maybeStack(1).orElseThrow( () -> new MissingDefinitionException("Tried to create a facade, while facades are being deactivated.")); // Convert back to a registry name... diff --git a/src/main/java/appeng/items/parts/PartItem.java b/src/main/java/appeng/items/parts/PartItem.java index 0e33ebb7d..1ef762a40 100644 --- a/src/main/java/appeng/items/parts/PartItem.java +++ b/src/main/java/appeng/items/parts/PartItem.java @@ -25,9 +25,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.util.ActionResultType; -import appeng.api.AEApi; import appeng.api.parts.IPart; import appeng.api.parts.IPartItem; +import appeng.core.Api; import appeng.items.AEBaseItem; public class PartItem extends AEBaseItem implements IPartItem { @@ -47,7 +47,7 @@ public class PartItem extends AEBaseItem implements IPartItem> extends AEBaseI @Override public void addInformation(final ItemStack stack, final World world, final List lines, final ITooltipFlag advancedTooltips) { - AEApi.instance().client().addCellInformation( - AEApi.instance().registries().cell().getCellInventory(stack, null, this.getChannel()), lines); + Api.instance().client().addCellInformation( + Api.instance().registries().cell().getCellInventory(stack, null, this.getChannel()), lines); } @Override @@ -145,7 +143,7 @@ public abstract class AbstractStorageCell> extends AEBaseI } final PlayerInventory playerInventory = player.inventory; - final IMEInventoryHandler inv = AEApi.instance().registries().cell().getCellInventory(stack, null, + final IMEInventoryHandler inv = Api.instance().registries().cell().getCellInventory(stack, null, this.getChannel()); if (inv != null && playerInventory.getCurrentItem() == stack) { final InventoryAdaptor ia = InventoryAdaptor.getAdaptor(player); @@ -193,7 +191,7 @@ public abstract class AbstractStorageCell> extends AEBaseI @Override public ItemStack getContainerItem(final ItemStack itemStack) { - return AEApi.instance().definitions().materials().emptyStorageCell().maybeStack(1) + return Api.instance().definitions().materials().emptyStorageCell().maybeStack(1) .orElseThrow(() -> new MissingDefinitionException( "Tried to use empty storage cells while basic storage cells are defined.")); } diff --git a/src/main/java/appeng/items/storage/BasicStorageCellItem.java b/src/main/java/appeng/items/storage/BasicStorageCellItem.java index 1cae5a15f..92ce4662a 100644 --- a/src/main/java/appeng/items/storage/BasicStorageCellItem.java +++ b/src/main/java/appeng/items/storage/BasicStorageCellItem.java @@ -21,10 +21,10 @@ package appeng.items.storage; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -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; @@ -71,12 +71,12 @@ public final class BasicStorageCellItem extends AbstractStorageCell getChannel() { - return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class); + return Api.instance().storage().getStorageChannel(IItemStorageChannel.class); } @Override protected void dropEmptyStorageCellCase(final InventoryAdaptor ia, final PlayerEntity player) { - AEApi.instance().definitions().materials().emptyStorageCell().maybeStack(1).ifPresent(is -> { + Api.instance().definitions().materials().emptyStorageCell().maybeStack(1).ifPresent(is -> { final ItemStack extraA = ia.addItems(is); if (!extraA.isEmpty()) { player.dropItem(extraA, false); diff --git a/src/main/java/appeng/items/storage/CreativeStorageCellItem.java b/src/main/java/appeng/items/storage/CreativeStorageCellItem.java index c14d74bad..54e834f2e 100644 --- a/src/main/java/appeng/items/storage/CreativeStorageCellItem.java +++ b/src/main/java/appeng/items/storage/CreativeStorageCellItem.java @@ -28,12 +28,12 @@ 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.FuzzyMode; import appeng.api.storage.IMEInventoryHandler; import appeng.api.storage.cells.ICellInventoryHandler; import appeng.api.storage.cells.ICellWorkbenchItem; import appeng.api.storage.channels.IItemStorageChannel; +import appeng.core.Api; import appeng.items.AEBaseItem; import appeng.items.contents.CellConfig; @@ -72,8 +72,8 @@ public class CreativeStorageCellItem extends AEBaseItem implements ICellWorkbenc @Override public void addInformation(final ItemStack stack, final World world, final List lines, final ITooltipFlag advancedTooltips) { - final IMEInventoryHandler inventory = AEApi.instance().registries().cell().getCellInventory(stack, null, - AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + final IMEInventoryHandler inventory = Api.instance().registries().cell().getCellInventory(stack, null, + Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); if (inventory instanceof ICellInventoryHandler) { final CellConfig cc = new CellConfig(stack); diff --git a/src/main/java/appeng/items/storage/ViewCellItem.java b/src/main/java/appeng/items/storage/ViewCellItem.java index 2439b87ca..3f9e8a037 100644 --- a/src/main/java/appeng/items/storage/ViewCellItem.java +++ b/src/main/java/appeng/items/storage/ViewCellItem.java @@ -21,7 +21,6 @@ package appeng.items.storage; 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; @@ -29,6 +28,7 @@ import appeng.api.storage.cells.ICellWorkbenchItem; 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.AEBaseItem; import appeng.items.contents.CellConfig; import appeng.items.contents.CellUpgrades; @@ -55,7 +55,7 @@ public class ViewCellItem extends AEBaseItem implements ICellWorkbenchItem { } if ((currentViewCell.getItem() instanceof ViewCellItem)) { - final IItemList priorityList = AEApi.instance().storage() + final IItemList priorityList = Api.instance().storage() .getStorageChannel(IItemStorageChannel.class).createList(); final ICellWorkbenchItem vc = (ICellWorkbenchItem) currentViewCell.getItem(); diff --git a/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java b/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java index 7380ce220..3b26b952d 100644 --- a/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java +++ b/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java @@ -18,7 +18,10 @@ package appeng.items.tools.powered; -import java.util.*; +import java.util.Comparator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import javax.annotation.Nullable; @@ -49,7 +52,6 @@ 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.implementations.items.IStorageCell; @@ -65,6 +67,7 @@ import appeng.api.util.DimensionalCoord; import appeng.block.networking.CableBusBlock; import appeng.block.paint.PaintSplotchesBlock; import appeng.core.AEConfig; +import appeng.core.Api; import appeng.core.AppEng; import appeng.core.localization.GuiText; import appeng.helpers.IMouseWheelItem; @@ -128,8 +131,8 @@ public class ColorApplicatorItem extends AEBasePoweredItem ItemStack paintBall = this.getColor(is); - final IMEInventory inv = AEApi.instance().registries().cell().getCellInventory(is, null, - AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + final IMEInventory inv = Api.instance().registries().cell().getCellInventory(is, null, + Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); if (inv != null) { final IAEItemStack option = inv.extractItems(AEItemStack.fromItemStack(paintBall), Actionable.SIMULATE, new BaseActionSource()); @@ -249,11 +252,11 @@ public class ColorApplicatorItem extends AEBasePoweredItem private ItemStack findNextColor(final ItemStack is, final ItemStack anchor, final int scrollOffset) { ItemStack newColor = ItemStack.EMPTY; - final IMEInventory inv = AEApi.instance().registries().cell().getCellInventory(is, null, - AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + final IMEInventory inv = Api.instance().registries().cell().getCellInventory(is, null, + Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); if (inv != null) { final IItemList itemList = inv.getAvailableItems( - AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList()); + Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList()); if (anchor.isEmpty()) { final IAEItemStack firstItem = itemList.getFirstItem(); if (firstItem != null) { @@ -359,10 +362,10 @@ public class ColorApplicatorItem extends AEBasePoweredItem final ITooltipFlag advancedTooltips) { super.addInformation(stack, world, lines, advancedTooltips); - final ICellInventoryHandler cdi = AEApi.instance().registries().cell().getCellInventory(stack, - null, AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + final ICellInventoryHandler cdi = Api.instance().registries().cell().getCellInventory(stack, null, + Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); - AEApi.instance().client().addCellInformation(cdi, lines); + Api.instance().client().addCellInformation(cdi, lines); } @Override @@ -405,7 +408,7 @@ public class ColorApplicatorItem extends AEBasePoweredItem @Override public IStorageChannel getChannel() { - return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class); + return Api.instance().storage().getStorageChannel(IItemStorageChannel.class); } @Override diff --git a/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java b/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java index 2eb1c251e..7d5a7e3c2 100644 --- a/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java +++ b/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java @@ -18,7 +18,12 @@ package appeng.items.tools.powered; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -30,12 +35,21 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.Fluid; import net.minecraft.fluid.Fluids; import net.minecraft.inventory.CraftingInventory; -import net.minecraft.item.*; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUseContext; +import net.minecraft.item.Items; import net.minecraft.item.crafting.FurnaceRecipe; import net.minecraft.item.crafting.IRecipeType; import net.minecraft.particles.ParticleTypes; import net.minecraft.state.properties.BlockStateProperties; -import net.minecraft.util.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.SoundEvents; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.RayTraceContext; diff --git a/src/main/java/appeng/items/tools/powered/MatterCannonItem.java b/src/main/java/appeng/items/tools/powered/MatterCannonItem.java index 187cb4bb6..364d83fa4 100644 --- a/src/main/java/appeng/items/tools/powered/MatterCannonItem.java +++ b/src/main/java/appeng/items/tools/powered/MatterCannonItem.java @@ -51,7 +51,6 @@ 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; @@ -66,6 +65,7 @@ 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.core.localization.PlayerMessages; import appeng.core.sync.network.NetworkHandler; @@ -98,10 +98,10 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< final ITooltipFlag advancedTooltips) { super.addInformation(stack, world, lines, advancedTooltips); - final ICellInventoryHandler cdi = AEApi.instance().registries().cell().getCellInventory(stack, - null, AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + final ICellInventoryHandler cdi = Api.instance().registries().cell().getCellInventory(stack, null, + Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); - AEApi.instance().client().addCellInformation(cdi, lines); + Api.instance().client().addCellInformation(cdi, lines); } @Override @@ -114,11 +114,11 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< shots += cu.getInstalledUpgrades(Upgrades.SPEED); } - final ICellInventoryHandler inv = AEApi.instance().registries().cell().getCellInventory( - p.getHeldItem(hand), null, AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + final ICellInventoryHandler inv = Api.instance().registries().cell().getCellInventory( + p.getHeldItem(hand), null, Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); if (inv != null) { final IItemList itemList = inv.getAvailableItems( - AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList()); + Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList()); IAEItemStack req = itemList.getFirstItem(); if (req instanceof IAEItemStack) { shots = Math.min(shots, (int) req.getStackSize()); @@ -152,7 +152,7 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< final double d1 = rayFrom.y; final double d2 = rayFrom.z; - final float penetration = AEApi.instance().registries().matterCannon().getPenetration(ammo); // 196.96655f; + final float penetration = Api.instance().registries().matterCannon().getPenetration(ammo); // 196.96655f; if (penetration <= 0) { final ItemStack type = aeAmmo.asItemStackRepresentation(); if (type.getItem() instanceof PaintBallItem) { @@ -266,7 +266,7 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< final BlockState whatsThere = w.getBlockState(hitPos); if (whatsThere.getMaterial().isReplaceable() && w.isAirBlock(hitPos)) { - AEApi.instance().definitions().blocks().paint().maybeBlock().ifPresent(paintBlock -> { + Api.instance().definitions().blocks().paint().maybeBlock().ifPresent(paintBlock -> { w.setBlockState(hitPos, paintBlock.getDefaultState(), 3); }); } @@ -439,7 +439,7 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< @Override public boolean isBlackListed(final ItemStack cellItem, final IAEItemStack requestedAddition) { - final float pen = AEApi.instance().registries().matterCannon() + final float pen = Api.instance().registries().matterCannon() .getPenetration(requestedAddition.createItemStack()); if (pen > 0) { return false; @@ -469,6 +469,6 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< @Override public IStorageChannel getChannel() { - return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class); + return Api.instance().storage().getStorageChannel(IItemStorageChannel.class); } } diff --git a/src/main/java/appeng/items/tools/powered/PortableCellItem.java b/src/main/java/appeng/items/tools/powered/PortableCellItem.java index 3f0ce0360..6655822c0 100644 --- a/src/main/java/appeng/items/tools/powered/PortableCellItem.java +++ b/src/main/java/appeng/items/tools/powered/PortableCellItem.java @@ -19,7 +19,6 @@ package appeng.items.tools.powered; import java.util.List; -import java.util.Set; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; @@ -35,7 +34,6 @@ 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.FuzzyMode; import appeng.api.implementations.guiobjects.IGuiItem; import appeng.api.implementations.guiobjects.IGuiItemObject; @@ -48,7 +46,7 @@ import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.container.implementations.MEPortableCellContainer; import appeng.core.AEConfig; -import appeng.core.localization.GuiText; +import appeng.core.Api; import appeng.items.contents.CellConfig; import appeng.items.contents.CellUpgrades; import appeng.items.contents.PortableCellViewer; @@ -71,10 +69,10 @@ public class PortableCellItem extends AEBasePoweredItem implements IStorageCell< final ITooltipFlag advancedTooltips) { super.addInformation(stack, world, lines, advancedTooltips); - final ICellInventoryHandler cdi = AEApi.instance().registries().cell().getCellInventory(stack, - null, AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + final ICellInventoryHandler cdi = Api.instance().registries().cell().getCellInventory(stack, null, + Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); - AEApi.instance().client().addCellInformation(cdi, lines); + Api.instance().client().addCellInformation(cdi, lines); } @Override @@ -114,7 +112,7 @@ public class PortableCellItem extends AEBasePoweredItem implements IStorageCell< @Override public IStorageChannel getChannel() { - return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class); + return Api.instance().storage().getStorageChannel(IItemStorageChannel.class); } @Override diff --git a/src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java b/src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java index 2c78defd0..c3d748d2d 100644 --- a/src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java +++ b/src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java @@ -34,7 +34,6 @@ 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; @@ -43,6 +42,7 @@ 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; @@ -55,7 +55,7 @@ public class WirelessTerminalItem extends AEBasePoweredItem implements IWireless @Override public ActionResult onItemRightClick(final World w, final PlayerEntity player, final Hand hand) { - AEApi.instance().registries().wireless().openWirelessTerminalGui(player.getHeldItem(hand), w, player, hand); + Api.instance().registries().wireless().openWirelessTerminalGui(player.getHeldItem(hand), w, player, hand); return new ActionResult<>(ActionResultType.SUCCESS, player.getHeldItem(hand)); } @@ -83,7 +83,7 @@ public class WirelessTerminalItem extends AEBasePoweredItem implements IWireless @Override public boolean canHandle(final ItemStack is) { - return AEApi.instance().definitions().items().wirelessTerminal().isSameAs(is); + return Api.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 40caef967..04d73e12f 100644 --- a/src/main/java/appeng/me/Grid.java +++ b/src/main/java/appeng/me/Grid.java @@ -25,7 +25,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import appeng.api.AEApi; import appeng.api.networking.IGrid; import appeng.api.networking.IGridCache; import appeng.api.networking.IGridHost; @@ -35,6 +34,7 @@ import appeng.api.networking.IMachineSet; import appeng.api.networking.events.MENetworkEvent; import appeng.api.networking.events.MENetworkPostCacheConstruction; import appeng.api.util.IReadOnlyCollection; +import appeng.core.Api; import appeng.core.worlddata.WorldData; import appeng.hooks.TickHandler; import appeng.util.ReadOnlyCollection; @@ -50,7 +50,7 @@ public class Grid implements IGrid { public Grid(final GridNode center) { this.pivot = center; - final Map, IGridCache> myCaches = AEApi.instance().registries().gridCache() + final Map, IGridCache> myCaches = Api.instance().registries().gridCache() .createCacheInstance(this); this.caches = new HashMap<>(myCaches.size()); for (final Entry, IGridCache> c : myCaches.entrySet()) { diff --git a/src/main/java/appeng/me/cache/CraftingGridCache.java b/src/main/java/appeng/me/cache/CraftingGridCache.java index cd347b3bd..5452970ac 100644 --- a/src/main/java/appeng/me/cache/CraftingGridCache.java +++ b/src/main/java/appeng/me/cache/CraftingGridCache.java @@ -43,7 +43,6 @@ import com.google.common.collect.Multimap; import net.minecraft.world.World; -import appeng.api.AEApi; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; import appeng.api.networking.IGrid; @@ -76,6 +75,7 @@ import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; +import appeng.core.Api; import appeng.crafting.CraftingJob; import appeng.crafting.CraftingLink; import appeng.crafting.CraftingLinkNexus; @@ -224,7 +224,7 @@ public class CraftingGridCache // update the stuff that was in the list... this.storageGrid.postAlterationOfStoredItems( - AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class), oldItems.keySet(), + Api.instance().storage().getStorageChannel(IItemStorageChannel.class), oldItems.keySet(), new BaseActionSource()); // re-create list.. @@ -257,7 +257,7 @@ public class CraftingGridCache } this.storageGrid.postAlterationOfStoredItems( - AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class), this.craftableItems.keySet(), + Api.instance().storage().getStorageChannel(IItemStorageChannel.class), this.craftableItems.keySet(), new BaseActionSource()); } @@ -322,7 +322,7 @@ public class CraftingGridCache public List getCellArray(final IStorageChannel channel) { final List list = new ArrayList<>(1); - if (channel == AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)) { + if (channel == Api.instance().storage().getStorageChannel(IItemStorageChannel.class)) { list.add(this); } @@ -395,7 +395,7 @@ public class CraftingGridCache @Override public IStorageChannel getChannel() { - return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class); + return Api.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 e143a0248..c1996d738 100644 --- a/src/main/java/appeng/me/cache/GridStorageCache.java +++ b/src/main/java/appeng/me/cache/GridStorageCache.java @@ -28,7 +28,6 @@ import java.util.Map; import com.google.common.collect.HashMultimap; import com.google.common.collect.SetMultimap; -import appeng.api.AEApi; import appeng.api.networking.IGrid; import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; @@ -49,6 +48,7 @@ import appeng.api.storage.cells.ICellProvider; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; +import appeng.core.Api; import appeng.me.helpers.BaseActionSource; import appeng.me.helpers.GenericInterestManager; import appeng.me.helpers.MachineSource; @@ -71,7 +71,7 @@ public class GridStorageCache implements IStorageGrid { this.storageNetworks = new IdentityHashMap<>(); this.storageMonitors = new IdentityHashMap<>(); - AEApi.instance().storage().storageChannels() + Api.instance().storage().storageChannels() .forEach(channel -> this.storageMonitors.put(channel, new NetworkMonitor<>(this, channel))); } diff --git a/src/main/java/appeng/me/cache/PathGridCache.java b/src/main/java/appeng/me/cache/PathGridCache.java index 14183479b..99d12ca62 100644 --- a/src/main/java/appeng/me/cache/PathGridCache.java +++ b/src/main/java/appeng/me/cache/PathGridCache.java @@ -28,7 +28,6 @@ import java.util.Set; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; -import appeng.api.AEApi; import appeng.api.features.AEFeature; import appeng.api.networking.GridFlags; import appeng.api.networking.IGrid; @@ -47,6 +46,7 @@ import appeng.api.networking.pathing.IPathingGrid; import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.core.AEConfig; +import appeng.core.Api; import appeng.core.AppEng; import appeng.core.stats.IAdvancementTrigger; import appeng.me.GridConnection; @@ -287,7 +287,7 @@ public class PathGridCache implements IPathingGrid { final IAdvancementTrigger lastBracket = this.getAchievementBracket(this.lastChannels); if (currentBracket != lastBracket && currentBracket != null) { for (final IGridNode n : this.requireChannels) { - PlayerEntity player = AEApi.instance().registries().players().findPlayer(n.getPlayerID()); + PlayerEntity player = Api.instance().registries().players().findPlayer(n.getPlayerID()); if (player instanceof ServerPlayerEntity) { currentBracket.trigger((ServerPlayerEntity) player); } diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index fb67e777d..69fa1561c 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -37,7 +37,6 @@ import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.fml.hooks.BasicEventHooks; -import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.FuzzyMode; import appeng.api.config.PowerMultiplier; @@ -65,6 +64,7 @@ import appeng.api.storage.data.IItemList; import appeng.api.util.WorldCoord; import appeng.container.ContainerNull; import appeng.core.AELog; +import appeng.core.Api; import appeng.crafting.CraftBranchFailure; import appeng.crafting.CraftingJob; import appeng.crafting.CraftingLink; @@ -100,7 +100,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { private MECraftingInventory inventory = new MECraftingInventory(); private IAEItemStack finalOutput; private boolean waiting = false; - private IItemList waitingFor = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + private IItemList waitingFor = Api.instance().storage().getStorageChannel(IItemStorageChannel.class) .createList(); private long availableStorage = 0; private MachineSource machineSrc = null; @@ -466,7 +466,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { } final IItemList list; - this.getListOfItem(list = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList(), + this.getListOfItem(list = Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList(), CraftingItemList.ALL); for (final IAEItemStack is : list) { this.postChange(is, this.machineSrc); @@ -716,7 +716,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { final IStorageGrid sg = g.getCache(IStorageGrid.class); final IMEInventory ii = sg - .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); for (IAEItemStack is : this.inventory.getItemList()) { is = this.inventory.extractItems(is.copy(), Actionable.MODULATE, this.machineSrc); @@ -754,7 +754,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { final IStorageGrid sg = g.getCache(IStorageGrid.class); final IMEInventory storage = sg - .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); final MECraftingInventory ci = new MECraftingInventory(storage, true, false, false); try { @@ -784,7 +784,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { this.submitLink(this.myLastLink); this.submitLink(whatLink); - final IItemList list = AEApi.instance().storage() + final IItemList list = Api.instance().storage() .getStorageChannel(IItemStorageChannel.class).createList(); this.getListOfItem(list, CraftingItemList.ALL); for (final IAEItemStack ge : list) { @@ -1094,7 +1094,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { } private IItemList readList(final ListNBT tag) { - final IItemList out = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + final IItemList out = Api.instance().storage().getStorageChannel(IItemStorageChannel.class) .createList(); if (tag == null) { @@ -1131,7 +1131,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { this.lastTime = System.nanoTime(); this.elapsedTime = 0; - final IItemList list = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + final IItemList list = Api.instance().storage().getStorageChannel(IItemStorageChannel.class) .createList(); this.getListOfItem(list, CraftingItemList.ACTIVE); diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java b/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java index 66a34aa44..6a2b33c80 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java @@ -23,10 +23,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import appeng.api.AEApi; import appeng.api.definitions.IBlockDefinition; import appeng.api.definitions.IBlocks; import appeng.api.util.WorldCoord; +import appeng.core.Api; import appeng.me.cluster.IAECluster; import appeng.me.cluster.IAEMultiBlock; import appeng.me.cluster.MBCalculator; @@ -77,7 +77,7 @@ public class QuantumCalculator extends MBCalculator { } num++; - final IBlocks blocks = AEApi.instance().definitions().blocks(); + final IBlocks blocks = Api.instance().definitions().blocks(); if (num == 5) { if (!this.isBlockAtLocation(w, p, blocks.quantumLink())) { return false; diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java index 59ca9a572..47d7473dd 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java @@ -28,7 +28,6 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import appeng.api.AEApi; import appeng.api.events.LocatableEventAnnounce; import appeng.api.events.LocatableEventAnnounce.LocatableEvent; import appeng.api.exceptions.FailedConnectionException; @@ -38,6 +37,7 @@ import appeng.api.networking.IGridNode; import appeng.api.util.AEPartLocation; import appeng.api.util.WorldCoord; import appeng.core.AELog; +import appeng.core.Api; import appeng.me.cache.helpers.ConnectionWrapper; import appeng.me.cluster.IAECluster; import appeng.tile.qnb.QuantumBridgeTileEntity; @@ -99,7 +99,7 @@ public class QuantumCluster implements ILocatable, IAECluster { } final ILocatable myOtherSide = this.otherSide == 0 ? null - : AEApi.instance().registries().locatable().getLocatableBy(this.otherSide); + : Api.instance().registries().locatable().getLocatableBy(this.otherSide); boolean shutdown = false; @@ -134,7 +134,7 @@ public class QuantumCluster implements ILocatable, IAECluster { } sideA.connection = sideB.connection = new ConnectionWrapper( - AEApi.instance().grid().createGridConnection(sideA.getNode(), sideB.getNode())); + Api.instance().grid().createGridConnection(sideA.getNode(), sideB.getNode())); } catch (final FailedConnectionException e) { // :( AELog.debug(e); @@ -156,7 +156,7 @@ public class QuantumCluster implements ILocatable, IAECluster { } private boolean canUseNode(final long qe) { - final QuantumCluster qc = (QuantumCluster) AEApi.instance().registries().locatable().getLocatableBy(qe); + final QuantumCluster qc = (QuantumCluster) Api.instance().registries().locatable().getLocatableBy(qe); if (qc != null) { final World theWorld = qc.center.getWorld(); if (!qc.isDestroyed) { diff --git a/src/main/java/appeng/me/helpers/AENetworkProxy.java b/src/main/java/appeng/me/helpers/AENetworkProxy.java index 1545bb1f9..bc8dad360 100644 --- a/src/main/java/appeng/me/helpers/AENetworkProxy.java +++ b/src/main/java/appeng/me/helpers/AENetworkProxy.java @@ -28,7 +28,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.Direction; -import appeng.api.AEApi; import appeng.api.networking.GridFlags; import appeng.api.networking.GridNotification; import appeng.api.networking.IGrid; @@ -45,6 +44,7 @@ import appeng.api.networking.ticking.ITickManager; import appeng.api.util.AEColor; import appeng.api.util.DimensionalCoord; import appeng.api.util.IOrientable; +import appeng.core.Api; import appeng.core.worlddata.WorldData; import appeng.hooks.TickHandler; import appeng.me.GridAccessException; @@ -129,7 +129,7 @@ public class AENetworkProxy implements IGridBlock { public IGridNode getNode() { if (this.node == null && Platform.isServer() && this.isReady) { - this.node = AEApi.instance().grid().createGridNode(this); + this.node = Api.instance().grid().createGridNode(this); this.readFromNBT(this.data); this.node.updateState(); } diff --git a/src/main/java/appeng/me/storage/CreativeCellInventory.java b/src/main/java/appeng/me/storage/CreativeCellInventory.java index 741e24366..ac554d3f3 100644 --- a/src/main/java/appeng/me/storage/CreativeCellInventory.java +++ b/src/main/java/appeng/me/storage/CreativeCellInventory.java @@ -20,7 +20,6 @@ package appeng.me.storage; import net.minecraft.item.ItemStack; -import appeng.api.AEApi; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; import appeng.api.networking.security.IActionSource; @@ -30,12 +29,13 @@ import appeng.api.storage.cells.ICellInventoryHandler; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; +import appeng.core.Api; import appeng.items.contents.CellConfig; import appeng.util.item.AEItemStack; public class CreativeCellInventory implements IMEInventoryHandler { - private final IItemList itemListCache = AEApi.instance().storage() + private final IItemList itemListCache = Api.instance().storage() .getStorageChannel(IItemStorageChannel.class).createList(); protected CreativeCellInventory(final ItemStack o) { @@ -51,7 +51,7 @@ public class CreativeCellInventory implements IMEInventoryHandler public static ICellInventoryHandler getCell(final ItemStack o) { return new BasicCellInventoryHandler(new CreativeCellInventory(o), - AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); } @Override @@ -84,7 +84,7 @@ public class CreativeCellInventory implements IMEInventoryHandler @Override public IStorageChannel getChannel() { - return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class); + return Api.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 b578426da..04572c2ca 100644 --- a/src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java +++ b/src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java @@ -30,7 +30,6 @@ import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidHandler; -import appeng.api.AEApi; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; import appeng.api.config.StorageFilter; @@ -42,11 +41,12 @@ import appeng.api.storage.IStorageChannel; import appeng.api.storage.channels.IFluidStorageChannel; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IItemList; +import appeng.core.Api; public class MEMonitorIFluidHandler implements IMEMonitor, ITickingMonitor { private final IFluidHandler handler; - private final IItemList list = AEApi.instance().storage() - .getStorageChannel(IFluidStorageChannel.class).createList(); + private final IItemList list = Api.instance().storage().getStorageChannel(IFluidStorageChannel.class) + .createList(); private final HashMap, Object> listeners = new HashMap<>(); private final NavigableMap memory; private IActionSource mySource; @@ -107,7 +107,7 @@ public class MEMonitorIFluidHandler implements IMEMonitor, ITicki @Override public IStorageChannel getChannel() { - return AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class); + return Api.instance().storage().getStorageChannel(IFluidStorageChannel.class); } @Override @@ -158,8 +158,9 @@ public class MEMonitorIFluidHandler implements IMEMonitor, ITicki IAEFluidStack stack = null; if (!newIS.isEmpty()) { - stack = (old == null || old.aeStack == null ? AEApi.instance().storage() - .getStorageChannel(IFluidStorageChannel.class).createStack(newIS) : old.aeStack.copy()); + stack = (old == null || old.aeStack == null + ? Api.instance().storage().getStorageChannel(IFluidStorageChannel.class).createStack(newIS) + : old.aeStack.copy()); } if (stack != null) { stack.setStackSize(newSize); @@ -297,7 +298,7 @@ public class MEMonitorIFluidHandler implements IMEMonitor, ITicki this.aeStack = null; } else { this.fluidStack = is.copy(); - this.aeStack = AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class).createStack(is); + this.aeStack = Api.instance().storage().getStorageChannel(IFluidStorageChannel.class).createStack(is); } } } diff --git a/src/main/java/appeng/me/storage/MEMonitorIInventory.java b/src/main/java/appeng/me/storage/MEMonitorIInventory.java index e98f28a97..ed72ad647 100644 --- a/src/main/java/appeng/me/storage/MEMonitorIInventory.java +++ b/src/main/java/appeng/me/storage/MEMonitorIInventory.java @@ -28,7 +28,6 @@ import java.util.concurrent.ConcurrentSkipListMap; import net.minecraft.item.ItemStack; -import appeng.api.AEApi; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; import appeng.api.config.StorageFilter; @@ -40,6 +39,7 @@ import appeng.api.storage.IStorageChannel; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; +import appeng.core.Api; import appeng.util.InventoryAdaptor; import appeng.util.Platform; import appeng.util.inv.ItemSlot; @@ -47,7 +47,7 @@ import appeng.util.inv.ItemSlot; public class MEMonitorIInventory implements IMEMonitor, ITickingMonitor { private final InventoryAdaptor adaptor; - private final IItemList list = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + private final IItemList list = Api.instance().storage().getStorageChannel(IItemStorageChannel.class) .createList(); private final HashMap, Object> listeners = new HashMap<>(); private final NavigableMap memory; @@ -120,7 +120,7 @@ public class MEMonitorIInventory implements IMEMonitor, ITickingMo @Override public IStorageChannel getChannel() { - return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class); + return Api.instance().storage().getStorageChannel(IItemStorageChannel.class); } @Override @@ -160,7 +160,7 @@ public class MEMonitorIInventory implements IMEMonitor, ITickingMo final int diff = newSize - (oldIS.isEmpty() ? 0 : oldIS.getCount()); final IAEItemStack stack = (old == null || old.aeStack == null - ? AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(newIS) + ? Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(newIS) : old.aeStack.copy()); if (stack != null) { stack.setStackSize(newSize); @@ -302,7 +302,7 @@ public class MEMonitorIInventory implements IMEMonitor, ITickingMo this.aeStack = null; } else { this.itemStack = is.copy(); - this.aeStack = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(is); + this.aeStack = Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(is); } } } diff --git a/src/main/java/appeng/me/storage/NullInventory.java b/src/main/java/appeng/me/storage/NullInventory.java index 4010f04f1..121a5eedf 100644 --- a/src/main/java/appeng/me/storage/NullInventory.java +++ b/src/main/java/appeng/me/storage/NullInventory.java @@ -18,7 +18,6 @@ package appeng.me.storage; -import appeng.api.AEApi; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; import appeng.api.networking.security.IActionSource; @@ -27,6 +26,7 @@ import appeng.api.storage.IStorageChannel; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; +import appeng.core.Api; public class NullInventory> implements IMEInventoryHandler { @@ -47,7 +47,7 @@ public class NullInventory> implements IMEInventoryHandler @Override public IStorageChannel getChannel() { - return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class); + return Api.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 e5a46faee..a21188fba 100644 --- a/src/main/java/appeng/me/storage/SecurityStationInventory.java +++ b/src/main/java/appeng/me/storage/SecurityStationInventory.java @@ -20,7 +20,6 @@ package appeng.me.storage; import com.mojang.authlib.GameProfile; -import appeng.api.AEApi; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; import appeng.api.config.SecurityPermissions; @@ -31,12 +30,13 @@ import appeng.api.storage.IStorageChannel; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; +import appeng.core.Api; import appeng.me.GridAccessException; import appeng.tile.misc.SecurityStationTileEntity; public class SecurityStationInventory implements IMEInventoryHandler { - private final IItemList storedItems = AEApi.instance().storage() + private final IItemList storedItems = Api.instance().storage() .getStorageChannel(IItemStorageChannel.class).createList(); private final SecurityStationTileEntity securityTile; @@ -47,7 +47,7 @@ public class SecurityStationInventory implements IMEInventoryHandler iface = definitions.blocks().iface().maybeStack(1); if (iface.isPresent()) { diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index 31c231699..6713cd821 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -19,7 +19,11 @@ package appeng.parts; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; +import java.util.Random; +import java.util.Set; import javax.annotation.Nullable; @@ -43,13 +47,20 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; -import appeng.api.AEApi; import appeng.api.config.YesNo; import appeng.api.exceptions.FailedConnectionException; import appeng.api.implementations.parts.ICablePart; import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; -import appeng.api.parts.*; +import appeng.api.parts.IFacadeContainer; +import appeng.api.parts.IFacadePart; +import appeng.api.parts.IPart; +import appeng.api.parts.IPartCollisionHelper; +import appeng.api.parts.IPartHost; +import appeng.api.parts.IPartItem; +import appeng.api.parts.LayerFlags; +import appeng.api.parts.PartItemStack; +import appeng.api.parts.SelectedPart; import appeng.api.util.AECableType; import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; @@ -58,6 +69,7 @@ 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; @@ -359,7 +371,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I } } - if (AEApi.instance().partHelper().getCableRenderMode().opaqueFacades) { + if (Api.instance().partHelper().getCableRenderMode().opaqueFacades) { final IFacadeContainer fc = this.getFacadeContainer(); for (final AEPartLocation side : AEPartLocation.SIDE_LOCATIONS) { final IFacadePart p = fc.getFacade(side); @@ -524,7 +536,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I final IGridNode cn = center.getGridNode(); if (cn != null) { try { - AEApi.instance().grid().createGridConnection(cn, sn); + Api.instance().grid().createGridConnection(cn, sn); } catch (final FailedConnectionException e) { // ekk AELog.debug(e); @@ -1074,7 +1086,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I part.getBoxes(bch); } - if (AEApi.instance().partHelper().getCableRenderMode().opaqueFacades || forCollision) { + if (Api.instance().partHelper().getCableRenderMode().opaqueFacades || forCollision) { if (s != AEPartLocation.INTERNAL) { final IFacadePart fp = fc.getFacade(s); if (fp != null) { diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java index 5c0ea7edc..37ebd69ca 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/src/main/java/appeng/parts/PartPlacement.java @@ -20,7 +20,6 @@ package appeng.parts; import java.util.ArrayList; import java.util.List; -import java.util.Optional; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -49,7 +48,6 @@ import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import appeng.api.AEApi; import appeng.api.definitions.IBlockDefinition; import appeng.api.definitions.IItems; import appeng.api.parts.IFacadePart; @@ -59,6 +57,7 @@ import appeng.api.parts.PartItemStack; import appeng.api.parts.SelectedPart; 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.ClickPacket; @@ -204,7 +203,7 @@ public class PartPlacement { BlockPos te_pos = pos; - final IBlockDefinition multiPart = AEApi.instance().definitions().blocks().multiPart(); + final IBlockDefinition multiPart = Api.instance().definitions().blocks().multiPart(); if (host == null && pass == PlaceType.PLACE_ITEM) { Direction offset = null; @@ -378,7 +377,7 @@ public class PartPlacement { } } else { final ItemStack held = event.getPlayer().getHeldItem(event.getHand()); - final IItems items = AEApi.instance().definitions().items(); + final IItems items = Api.instance().definitions().items(); boolean supportedItem = items.memoryCard().isSameAs(held); supportedItem |= items.colorApplicator().isSameAs(held); diff --git a/src/main/java/appeng/parts/automation/AnnihilationPlanePart.java b/src/main/java/appeng/parts/automation/AnnihilationPlanePart.java index 6f43ed5d6..0923fe811 100644 --- a/src/main/java/appeng/parts/automation/AnnihilationPlanePart.java +++ b/src/main/java/appeng/parts/automation/AnnihilationPlanePart.java @@ -46,7 +46,6 @@ import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.common.ToolType; import net.minecraftforge.common.util.FakePlayerFactory; -import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; import appeng.api.networking.IGridNode; @@ -67,6 +66,7 @@ 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.BlockTransitionEffectPacket; @@ -324,7 +324,7 @@ public class AnnihilationPlanePart extends BasicStatePart implements IGridTickab final IStorageGrid storage = this.getProxy().getStorage(); final IEnergyGrid energy = this.getProxy().getEnergy(); final IAEItemStack overflow = Platform.poweredInsert(energy, - storage.getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)), + storage.getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class)), itemToStore, this.mySrc); this.isAccepting = overflow == null; @@ -540,7 +540,7 @@ public class AnnihilationPlanePart extends BasicStatePart implements IGridTickab for (final ItemStack itemStack : itemStacks) { final IAEItemStack itemToTest = AEItemStack.fromItemStack(itemStack); final IAEItemStack overflow = storage - .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)) + .getInventory(Api.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/BlockUpgradeInventory.java b/src/main/java/appeng/parts/automation/BlockUpgradeInventory.java index d7e662ad2..71e887d95 100644 --- a/src/main/java/appeng/parts/automation/BlockUpgradeInventory.java +++ b/src/main/java/appeng/parts/automation/BlockUpgradeInventory.java @@ -19,9 +19,6 @@ package appeng.parts.automation; import net.minecraft.block.Block; -import net.minecraft.item.BlockItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import appeng.api.config.Upgrades; import appeng.util.inv.IAEAppEngInventory; diff --git a/src/main/java/appeng/parts/automation/DefinitionUpgradeInventory.java b/src/main/java/appeng/parts/automation/DefinitionUpgradeInventory.java index 3b6ad729e..4ac3d2d75 100644 --- a/src/main/java/appeng/parts/automation/DefinitionUpgradeInventory.java +++ b/src/main/java/appeng/parts/automation/DefinitionUpgradeInventory.java @@ -18,8 +18,6 @@ package appeng.parts.automation; -import net.minecraft.item.ItemStack; - import appeng.api.config.Upgrades; import appeng.api.definitions.IItemDefinition; import appeng.util.inv.IAEAppEngInventory; diff --git a/src/main/java/appeng/parts/automation/ExportBusPart.java b/src/main/java/appeng/parts/automation/ExportBusPart.java index 22e17bee7..bb8af3630 100644 --- a/src/main/java/appeng/parts/automation/ExportBusPart.java +++ b/src/main/java/appeng/parts/automation/ExportBusPart.java @@ -28,7 +28,6 @@ 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.PowerMultiplier; @@ -56,6 +55,7 @@ import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.container.implementations.UpgradeableContainer; import appeng.core.AELog; +import appeng.core.Api; import appeng.core.AppEng; import appeng.core.settings.TickRates; import appeng.helpers.MultiCraftingTracker; @@ -127,7 +127,7 @@ public class ExportBusPart extends SharedItemBusPart implements ICraftingRequest try { final InventoryAdaptor destination = this.getHandler(); final IMEMonitor inv = this.getProxy().getStorage() - .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + .getInventory(Api.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/FormationPlanePart.java b/src/main/java/appeng/parts/automation/FormationPlanePart.java index e766c192a..fbdb3e294 100644 --- a/src/main/java/appeng/parts/automation/FormationPlanePart.java +++ b/src/main/java/appeng/parts/automation/FormationPlanePart.java @@ -52,7 +52,6 @@ import net.minecraftforge.client.model.data.IModelData; 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; @@ -77,6 +76,7 @@ import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.container.implementations.FormationPlaneContainer; import appeng.core.AEConfig; +import appeng.core.Api; import appeng.items.parts.PartModels; import appeng.me.GridAccessException; import appeng.me.storage.MEInventoryHandler; @@ -96,7 +96,7 @@ public class FormationPlanePart extends AbstractFormationPlanePart } private final MEInventoryHandler myHandler = new MEInventoryHandler<>(this, - AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); private final AppEngInternalAEInventory Config = new AppEngInternalAEInventory(this, 63); public FormationPlanePart(final ItemStack is) { @@ -114,7 +114,7 @@ public class FormationPlanePart extends AbstractFormationPlanePart this.getInstalledUpgrades(Upgrades.INVERTER) > 0 ? IncludeExclude.BLACKLIST : IncludeExclude.WHITELIST); this.myHandler.setPriority(this.getPriority()); - final IItemList priorityList = AEApi.instance().storage() + final IItemList priorityList = Api.instance().storage() .getStorageChannel(IItemStorageChannel.class).createList(); final int slotsToUse = 18 + this.getInstalledUpgrades(Upgrades.CAPACITY) * 9; @@ -193,7 +193,7 @@ public class FormationPlanePart extends AbstractFormationPlanePart @Override public List getCellArray(final IStorageChannel channel) { if (this.getProxy().isActive() - && channel == AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)) { + && channel == Api.instance().storage().getStorageChannel(IItemStorageChannel.class)) { final List handler = new ArrayList<>(1); handler.add(this.myHandler); return handler; @@ -333,7 +333,7 @@ public class FormationPlanePart extends AbstractFormationPlanePart @Override public IStorageChannel getChannel() { - return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class); + return Api.instance().storage().getStorageChannel(IItemStorageChannel.class); } @Override @@ -349,7 +349,7 @@ public class FormationPlanePart extends AbstractFormationPlanePart @Override public ItemStack getItemStackRepresentation() { - return AEApi.instance().definitions().parts().formationPlane().maybeStack(1).orElse(ItemStack.EMPTY); + return Api.instance().definitions().parts().formationPlane().maybeStack(1).orElse(ItemStack.EMPTY); } @Override diff --git a/src/main/java/appeng/parts/automation/ImportBusPart.java b/src/main/java/appeng/parts/automation/ImportBusPart.java index 680974dfc..3ba35cb2f 100644 --- a/src/main/java/appeng/parts/automation/ImportBusPart.java +++ b/src/main/java/appeng/parts/automation/ImportBusPart.java @@ -25,7 +25,6 @@ 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; @@ -46,6 +45,7 @@ import appeng.api.util.AECableType; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.container.implementations.UpgradeableContainer; +import appeng.core.Api; import appeng.core.AppEng; import appeng.core.settings.TickRates; import appeng.helpers.Reflected; @@ -92,10 +92,10 @@ public class ImportBusPart extends SharedItemBusPart implements IInventoryDestin try { final IMEMonitor inv = this.getProxy().getStorage() - .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); final IAEItemStack out = inv.injectItems( - AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(stack), + Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(stack), Actionable.SIMULATE, this.source); if (out == null) { return true; @@ -152,7 +152,7 @@ public class ImportBusPart extends SharedItemBusPart implements IInventoryDestin this.itemsToSend = this.calculateItemsToSend(); final IMEMonitor inv = this.getProxy().getStorage() - .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); final IEnergyGrid energy = this.getProxy().getEnergy(); boolean Configured = false; @@ -199,7 +199,7 @@ public class ImportBusPart extends SharedItemBusPart implements IInventoryDestin } if (!newItems.isEmpty()) { - final IAEItemStack aeStack = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + final IAEItemStack aeStack = Api.instance().storage().getStorageChannel(IItemStorageChannel.class) .createStack(newItems); final IAEItemStack failed = Platform.poweredInsert(energy, inv, aeStack, this.source); diff --git a/src/main/java/appeng/parts/automation/LevelEmitterPart.java b/src/main/java/appeng/parts/automation/LevelEmitterPart.java index be5262c64..146b69404 100644 --- a/src/main/java/appeng/parts/automation/LevelEmitterPart.java +++ b/src/main/java/appeng/parts/automation/LevelEmitterPart.java @@ -34,7 +34,6 @@ 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,6 +72,7 @@ import appeng.api.util.IConfigManager; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.container.implementations.LevelEmitterContainer; +import appeng.core.Api; import appeng.core.AppEng; import appeng.helpers.Reflected; import appeng.items.parts.PartModels; @@ -252,7 +252,7 @@ public class LevelEmitterPart extends UpgradeablePart implements IEnergyWatcherH // no more item stuff.. this.getProxy().getStorage() - .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)) + .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class)) .removeListener(this); } catch (final GridAccessException e) { // :P @@ -264,11 +264,11 @@ public class LevelEmitterPart extends UpgradeablePart implements IEnergyWatcherH try { if (this.getInstalledUpgrades(Upgrades.FUZZY) > 0 || myStack == null) { this.getProxy().getStorage() - .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)) + .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class)) .addListener(this, this.getProxy().getGrid()); } else { this.getProxy().getStorage() - .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)) + .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class)) .removeListener(this); if (this.myWatcher != null) { @@ -277,7 +277,7 @@ public class LevelEmitterPart extends UpgradeablePart implements IEnergyWatcherH } this.updateReportingValue(this.getProxy().getStorage() - .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class))); + .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class))); } catch (final GridAccessException e) { // >.> } @@ -319,7 +319,7 @@ public class LevelEmitterPart extends UpgradeablePart implements IEnergyWatcherH @Override public void onStackChange(final IItemList o, final IAEStack fullStack, final IAEStack diffStack, final IActionSource src, final IStorageChannel chan) { - if (chan == AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + if (chan == Api.instance().storage().getStorageChannel(IItemStorageChannel.class) && fullStack.equals(this.config.getAEStackInSlot(0)) && this.getInstalledUpgrades(Upgrades.FUZZY) == 0) { this.lastReportedValue = fullStack.getStackSize(); @@ -358,7 +358,7 @@ public class LevelEmitterPart extends UpgradeablePart implements IEnergyWatcherH public void onListUpdate() { try { this.updateReportingValue(this.getProxy().getStorage() - .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class))); + .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class))); } catch (final GridAccessException e) { // ;P } diff --git a/src/main/java/appeng/parts/misc/InterfacePart.java b/src/main/java/appeng/parts/misc/InterfacePart.java index 2d5dbaaef..f95c69e43 100644 --- a/src/main/java/appeng/parts/misc/InterfacePart.java +++ b/src/main/java/appeng/parts/misc/InterfacePart.java @@ -37,7 +37,6 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.IItemHandler; -import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.Upgrades; import appeng.api.networking.IGridNode; @@ -62,6 +61,7 @@ import appeng.api.util.IConfigManager; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.container.implementations.InterfaceContainer; +import appeng.core.Api; import appeng.core.AppEng; import appeng.helpers.DualityInterface; import appeng.helpers.IInterfaceHost; @@ -270,7 +270,7 @@ public class InterfacePart extends BasicStatePart implements IGridTickable, ISto @Override public ItemStack getItemStackRepresentation() { - return AEApi.instance().definitions().parts().iface().maybeStack(1).orElse(ItemStack.EMPTY); + return Api.instance().definitions().parts().iface().maybeStack(1).orElse(ItemStack.EMPTY); } @Override diff --git a/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java b/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java index ea53d52f5..fbc9f7abf 100644 --- a/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java +++ b/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java @@ -28,7 +28,6 @@ import java.util.Map; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; -import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.networking.security.IActionSource; import appeng.api.networking.storage.IBaseMonitor; @@ -39,6 +38,7 @@ 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; @@ -191,7 +191,7 @@ class ItemHandlerAdapter implements IMEInventory, IBaseMonitor in = this.getInternalHandler(); - IItemList before = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + IItemList before = Api.instance().storage().getStorageChannel(IItemStorageChannel.class) .createList(); if (in != null) { before = in.getAvailableItems(before); @@ -320,7 +320,7 @@ public class StorageBusPart extends UpgradeablePart final IMEInventory out = this.getInternalHandler(); if (in != out) { - IItemList after = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + IItemList after = Api.instance().storage().getStorageChannel(IItemStorageChannel.class) .createList(); if (out != null) { after = out.getAvailableItems(after); @@ -341,7 +341,7 @@ public class StorageBusPart extends UpgradeablePart IStorageMonitorableAccessor accessor = accessorOpt.orElse(null); IStorageMonitorable inventory = accessor.getInventory(this.mySrc); if (inventory != null) { - return inventory.getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + return inventory.getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); } // So this could / can be a design decision. If the tile does support our custom @@ -427,14 +427,14 @@ public class StorageBusPart extends UpgradeablePart this.checkInterfaceVsStorageBus(target, this.getSide().getOpposite()); this.handler = new MEInventoryHandler(inv, - AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + Api.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 = AEApi.instance().storage() + final IItemList priorityList = Api.instance().storage() .getStorageChannel(IItemStorageChannel.class).createList(); final int slotsToUse = 18 + this.getInstalledUpgrades(Upgrades.CAPACITY) * 9; @@ -507,7 +507,7 @@ public class StorageBusPart extends UpgradeablePart @Override public List getCellArray(final IStorageChannel channel) { - if (channel == AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)) { + if (channel == Api.instance().storage().getStorageChannel(IItemStorageChannel.class)) { final IMEInventoryHandler out = this.getProxy().isActive() ? this.getInternalHandler() : null; if (out != null) { return Collections.singletonList(out); @@ -559,7 +559,7 @@ public class StorageBusPart extends UpgradeablePart @Override public ItemStack getItemStackRepresentation() { - return AEApi.instance().definitions().parts().storageBus().maybeStack(1).orElse(ItemStack.EMPTY); + return Api.instance().definitions().parts().storageBus().maybeStack(1).orElse(ItemStack.EMPTY); } @Override diff --git a/src/main/java/appeng/parts/misc/ToggleBusPart.java b/src/main/java/appeng/parts/misc/ToggleBusPart.java index 5bb363b1a..435b5ed0e 100644 --- a/src/main/java/appeng/parts/misc/ToggleBusPart.java +++ b/src/main/java/appeng/parts/misc/ToggleBusPart.java @@ -29,7 +29,6 @@ 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,6 +38,7 @@ 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; @@ -168,7 +168,7 @@ public class ToggleBusPart extends BasicStatePart { if (this.getProxy().getNode() != null && this.getOuterProxy().getNode() != null) { if (intention) { try { - this.connection = AEApi.instance().grid().createGridConnection(this.getProxy().getNode(), + this.connection = Api.instance().grid().createGridConnection(this.getProxy().getNode(), this.getOuterProxy().getNode()); } catch (final FailedConnectionException e) { // :( diff --git a/src/main/java/appeng/parts/networking/CablePart.java b/src/main/java/appeng/parts/networking/CablePart.java index d977cddc4..87e662426 100644 --- a/src/main/java/appeng/parts/networking/CablePart.java +++ b/src/main/java/appeng/parts/networking/CablePart.java @@ -27,7 +27,6 @@ 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.ICablePart; @@ -43,6 +42,7 @@ 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.ColoredPartItem; import appeng.me.GridAccessException; import appeng.parts.AEBasePart; @@ -96,7 +96,7 @@ public class CablePart extends AEBasePart implements ICablePart { if (this.getCableColor() != newColor) { ItemStack newPart = null; - final IParts parts = AEApi.instance().definitions().parts(); + final IParts parts = Api.instance().definitions().parts(); if (this.getCableConnectionType() == AECableType.GLASS) { newPart = parts.cableGlass().stack(newColor, 1); diff --git a/src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java b/src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java index abe9d20d6..ca2c2f47b 100644 --- a/src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java @@ -29,7 +29,6 @@ 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,6 +40,7 @@ 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; @@ -193,7 +193,7 @@ public class MEP2PTunnelPart extends P2PTunnelPart implements I for (final MEP2PTunnelPart me : newSides) { try { - connections.getConnections().put(me.getGridNode(), new TunnelConnection(me, AEApi.instance() + connections.getConnections().put(me.getGridNode(), new TunnelConnection(me, Api.instance() .grid().createGridConnection(this.outerProxy.getNode(), me.outerProxy.getNode()))); } catch (final FailedConnectionException e) { final TileEntity start = this.getTile(); diff --git a/src/main/java/appeng/parts/p2p/P2PTunnelPart.java b/src/main/java/appeng/parts/p2p/P2PTunnelPart.java index a0ce7c22e..d403abe38 100644 --- a/src/main/java/appeng/parts/p2p/P2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/P2PTunnelPart.java @@ -31,7 +31,6 @@ import net.minecraft.util.Hand; import net.minecraft.util.math.Vec3d; import net.minecraftforge.client.model.data.IModelData; -import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; import appeng.api.config.PowerUnits; @@ -48,6 +47,7 @@ import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; import appeng.client.render.cablebus.P2PTunnelFrequencyModelData; import appeng.core.AEConfig; +import appeng.core.Api; import appeng.me.GridAccessException; import appeng.me.cache.P2PCache; import appeng.me.cache.helpers.TunnelCollection; @@ -110,7 +110,7 @@ public abstract class P2PTunnelPart extends BasicStateP return super.getItemStack(type); } - final Optional maybeMEStack = AEApi.instance().definitions().parts().p2PTunnelME().maybeStack(1); + final Optional maybeMEStack = Api.instance().definitions().parts().p2PTunnelME().maybeStack(1); if (maybeMEStack.isPresent()) { return maybeMEStack.get(); } @@ -168,7 +168,7 @@ public abstract class P2PTunnelPart extends BasicStateP final ItemStack is = player.getHeldItem(hand); - final TunnelType tt = AEApi.instance().registries().p2pTunnel().getTunnelTypeByItem(is); + final TunnelType tt = Api.instance().registries().p2pTunnel().getTunnelTypeByItem(is); if (!is.isEmpty() && is.getItem() instanceof IMemoryCard) { final IMemoryCard mc = (IMemoryCard) is.getItem(); final CompoundNBT data = mc.getData(is); @@ -208,7 +208,7 @@ public abstract class P2PTunnelPart extends BasicStateP { final ItemStack newType; - final IParts parts = AEApi.instance().definitions().parts(); + final IParts parts = Api.instance().definitions().parts(); switch (tt) { case LIGHT: diff --git a/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java b/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java index 2f38ee34b..a52d2fffe 100644 --- a/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java +++ b/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java @@ -34,7 +34,6 @@ 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.IStorageMonitorPart; import appeng.api.networking.security.IActionSource; import appeng.api.networking.storage.IStackWatcher; @@ -47,6 +46,7 @@ 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; @@ -199,7 +199,7 @@ public abstract class AbstractMonitorPart extends AbstractDisplayPart } this.updateReportingValue(this.getProxy().getStorage() - .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class))); + .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class))); } } catch (final GridAccessException e) { // >.> diff --git a/src/main/java/appeng/parts/reporting/ConversionMonitorPart.java b/src/main/java/appeng/parts/reporting/ConversionMonitorPart.java index 5c6c6ff1a..8dad73da9 100644 --- a/src/main/java/appeng/parts/reporting/ConversionMonitorPart.java +++ b/src/main/java/appeng/parts/reporting/ConversionMonitorPart.java @@ -30,12 +30,12 @@ import net.minecraft.util.math.Vec3d; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.PlayerMainInvWrapper; -import appeng.api.AEApi; import appeng.api.networking.energy.IEnergySource; import appeng.api.parts.IPartModel; import appeng.api.storage.IMEMonitor; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; +import appeng.core.Api; import appeng.core.AppEng; import appeng.helpers.Reflected; import appeng.items.parts.PartModels; @@ -152,7 +152,7 @@ public class ConversionMonitorPart extends AbstractMonitorPart { try { final IEnergySource energy = this.getProxy().getEnergy(); final IMEMonitor cell = this.getProxy().getStorage() - .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); if (allItems) { if (this.getDisplayed() != null) { @@ -194,7 +194,7 @@ public class ConversionMonitorPart extends AbstractMonitorPart { final IEnergySource energy = this.getProxy().getEnergy(); final IMEMonitor cell = this.getProxy().getStorage() - .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); input.setStackSize(count); diff --git a/src/main/java/appeng/recipes/game/DisassembleRecipe.java b/src/main/java/appeng/recipes/game/DisassembleRecipe.java index 34996f9e6..3fa64a730 100644 --- a/src/main/java/appeng/recipes/game/DisassembleRecipe.java +++ b/src/main/java/appeng/recipes/game/DisassembleRecipe.java @@ -33,7 +33,6 @@ import net.minecraft.item.crafting.SpecialRecipeSerializer; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import appeng.api.AEApi; import appeng.api.definitions.IBlocks; import appeng.api.definitions.IDefinitions; import appeng.api.definitions.IItemDefinition; @@ -43,6 +42,7 @@ 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; public final class DisassembleRecipe extends SpecialRecipe { @@ -61,7 +61,7 @@ public final class DisassembleRecipe extends SpecialRecipe { public DisassembleRecipe(ResourceLocation id) { super(id); - final IDefinitions definitions = AEApi.instance().definitions(); + final IDefinitions definitions = Api.instance().definitions(); final IBlocks blocks = definitions.blocks(); final IItems items = definitions.items(); final IMaterials mats = definitions.materials(); @@ -105,11 +105,11 @@ public final class DisassembleRecipe extends SpecialRecipe { if (maybeCellOutput.isPresent()) { ItemStack storageCellStack = maybeCellOutput.get(); // make sure the storage cell stackInSlot empty... - final IMEInventory cellInv = AEApi.instance().registries().cell().getCellInventory( - stackInSlot, null, AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); + final IMEInventory cellInv = Api.instance().registries().cell().getCellInventory( + stackInSlot, null, Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); if (cellInv != null) { final IItemList list = cellInv.getAvailableItems( - AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList()); + Api.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 f3bdef4b7..666e93912 100644 --- a/src/main/java/appeng/recipes/game/FacadeRecipe.java +++ b/src/main/java/appeng/recipes/game/FacadeRecipe.java @@ -29,9 +29,9 @@ import net.minecraft.item.crafting.SpecialRecipeSerializer; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -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.FacadeItem; @@ -44,7 +44,7 @@ public final class FacadeRecipe extends SpecialRecipe { public FacadeRecipe(ResourceLocation id, FacadeItem facade) { super(id); this.facade = facade; - final IDefinitions definitions = AEApi.instance().definitions(); + final IDefinitions definitions = Api.instance().definitions(); this.anchor = definitions.parts().cableAnchor(); } diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java index c246abf6b..80d772eaa 100644 --- a/src/main/java/appeng/services/CompassService.java +++ b/src/main/java/appeng/services/CompassService.java @@ -39,8 +39,8 @@ import net.minecraft.world.server.ServerWorld; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import appeng.api.AEApi; import appeng.api.util.DimensionalCoord; +import appeng.core.Api; import appeng.services.compass.CompassReader; import appeng.services.compass.ICompassCallback; import appeng.util.Platform; @@ -118,7 +118,7 @@ public final class CompassService { DimensionType dim = w.getDimension().getType(); - Block skyStoneBlock = AEApi.instance().definitions().blocks().skyStoneBlock().block(); + Block skyStoneBlock = Api.instance().definitions().blocks().skyStoneBlock().block(); BlockPos.Mutable pos = new BlockPos.Mutable(); for (int i = 0; i < CHUNK_SIZE; i++) { pos.setX(i); diff --git a/src/main/java/appeng/spatial/CachedPlane.java b/src/main/java/appeng/spatial/CachedPlane.java index 6d13e86c7..2d7478c6b 100644 --- a/src/main/java/appeng/spatial/CachedPlane.java +++ b/src/main/java/appeng/spatial/CachedPlane.java @@ -38,14 +38,13 @@ import net.minecraft.world.chunk.ChunkSection; import net.minecraft.world.server.ServerChunkProvider; import net.minecraft.world.server.ServerTickList; -import appeng.api.AEApi; import appeng.api.movable.IMovableHandler; import appeng.api.movable.IMovableRegistry; import appeng.api.util.AEPartLocation; import appeng.api.util.WorldCoord; import appeng.core.AELog; +import appeng.core.Api; import appeng.core.worlddata.WorldData; -import appeng.util.Platform; public class CachedPlane { private final int x_size; @@ -61,7 +60,7 @@ public class CachedPlane { private final List tiles = new ArrayList<>(); private final List> ticks = new ArrayList<>(); private final World world; - private final IMovableRegistry reg = AEApi.instance().registries().movable(); + private final IMovableRegistry reg = Api.instance().registries().movable(); private final List updates = new ArrayList<>(); private int verticalBits; private final BlockState matrixBlockState; @@ -69,7 +68,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 = AEApi.instance().definitions().blocks().matrixFrame().maybeBlock().orElse(null); + Block matrixFrameBlock = Api.instance().definitions().blocks().matrixFrame().maybeBlock().orElse(null); if (matrixFrameBlock != null) { this.matrixBlockState = matrixFrameBlock.getDefaultState(); } else { @@ -112,7 +111,7 @@ public class CachedPlane { } } - final IMovableRegistry mr = AEApi.instance().registries().movable(); + final IMovableRegistry mr = Api.instance().registries().movable(); for (int cx = 0; cx < this.cx_size; cx++) { for (int cz = 0; cz < this.cz_size; cz++) { @@ -180,12 +179,12 @@ public class CachedPlane { } private IMovableHandler getHandler(final TileEntity te) { - final IMovableRegistry mr = AEApi.instance().registries().movable(); + final IMovableRegistry mr = Api.instance().registries().movable(); return mr.getHandler(te); } void swap(final CachedPlane dst) { - final IMovableRegistry mr = AEApi.instance().registries().movable(); + final IMovableRegistry mr = Api.instance().registries().movable(); if (dst.x_size == this.x_size && dst.y_size == this.y_size && dst.z_size == this.z_size) { AELog.info("Block Copy Scale: " + this.x_size + ", " + this.y_size + ", " + this.z_size); diff --git a/src/main/java/appeng/spatial/StorageChunkGenerator.java b/src/main/java/appeng/spatial/StorageChunkGenerator.java index 44f324d0b..c46869337 100644 --- a/src/main/java/appeng/spatial/StorageChunkGenerator.java +++ b/src/main/java/appeng/spatial/StorageChunkGenerator.java @@ -31,7 +31,7 @@ import net.minecraft.world.gen.GenerationSettings; import net.minecraft.world.gen.Heightmap; import net.minecraft.world.gen.WorldGenRegion; -import appeng.api.AEApi; +import appeng.core.Api; public class StorageChunkGenerator extends ChunkGenerator { @@ -39,7 +39,7 @@ public class StorageChunkGenerator extends ChunkGenerator { public StorageChunkGenerator(final World world) { super(world, createBiomeProvider(), createSettings()); - this.defaultBlockState = AEApi.instance().definitions().blocks().matrixFrame().block().getDefaultState(); + this.defaultBlockState = Api.instance().definitions().blocks().matrixFrame().block().getDefaultState(); } private static BiomeProvider createBiomeProvider() { diff --git a/src/main/java/appeng/spatial/StorageHelper.java b/src/main/java/appeng/spatial/StorageHelper.java index 8cec8478a..329ae680b 100644 --- a/src/main/java/appeng/spatial/StorageHelper.java +++ b/src/main/java/appeng/spatial/StorageHelper.java @@ -35,10 +35,9 @@ import net.minecraft.world.chunk.ChunkStatus; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.common.util.ITeleporter; -import appeng.api.AEApi; import appeng.api.util.WorldCoord; +import appeng.core.Api; import appeng.core.AppEng; -import appeng.util.Platform; public class StorageHelper { @@ -139,7 +138,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) { - AEApi.instance().definitions().blocks().matrixFrame().maybeBlock() + Api.instance().definitions().blocks().matrixFrame().maybeBlock() .ifPresent(matrixFrameBlock -> this.transverseEdges(dstX - 1, dstY - 1, dstZ - 1, dstX + scaleX + 1, dstY + scaleY + 1, dstZ + scaleZ + 1, new WrapInMatrixFrame(matrixFrameBlock.getDefaultState(), dstWorld))); diff --git a/src/main/java/appeng/tile/crafting/CraftingMonitorTileEntity.java b/src/main/java/appeng/tile/crafting/CraftingMonitorTileEntity.java index 743a30ebe..c1619bd3e 100644 --- a/src/main/java/appeng/tile/crafting/CraftingMonitorTileEntity.java +++ b/src/main/java/appeng/tile/crafting/CraftingMonitorTileEntity.java @@ -33,10 +33,10 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.model.data.IModelData; -import appeng.api.AEApi; import appeng.api.implementations.tiles.IColorableTile; import appeng.api.storage.data.IAEItemStack; import appeng.api.util.AEColor; +import appeng.core.Api; import appeng.util.item.AEItemStack; public class CraftingMonitorTileEntity extends CraftingTileEntity implements IColorableTile { @@ -161,7 +161,7 @@ public class CraftingMonitorTileEntity extends CraftingTileEntity implements ICo @Override protected ItemStack getItemFromTile(final Object obj) { - final Optional is = AEApi.instance().definitions().blocks().craftingMonitor().maybeStack(1); + final Optional is = Api.instance().definitions().blocks().craftingMonitor().maybeStack(1); return is.orElseGet(() -> super.getItemFromTile(obj)); } diff --git a/src/main/java/appeng/tile/crafting/CraftingStorageTileEntity.java b/src/main/java/appeng/tile/crafting/CraftingStorageTileEntity.java index 937f822b9..92d20b2d5 100644 --- a/src/main/java/appeng/tile/crafting/CraftingStorageTileEntity.java +++ b/src/main/java/appeng/tile/crafting/CraftingStorageTileEntity.java @@ -23,9 +23,9 @@ import java.util.Optional; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityType; -import appeng.api.AEApi; import appeng.api.definitions.IBlocks; import appeng.block.crafting.AbstractCraftingUnitBlock; +import appeng.core.Api; public class CraftingStorageTileEntity extends CraftingTileEntity { private static final int KILO_SCALAR = 1024; @@ -36,7 +36,7 @@ public class CraftingStorageTileEntity extends CraftingTileEntity { @Override protected ItemStack getItemFromTile(final Object obj) { - final IBlocks blocks = AEApi.instance().definitions().blocks(); + final IBlocks blocks = Api.instance().definitions().blocks(); final int storage = ((CraftingTileEntity) obj).getStorageBytes() / KILO_SCALAR; Optional is; diff --git a/src/main/java/appeng/tile/crafting/CraftingTileEntity.java b/src/main/java/appeng/tile/crafting/CraftingTileEntity.java index 1b48cf870..47c153550 100644 --- a/src/main/java/appeng/tile/crafting/CraftingTileEntity.java +++ b/src/main/java/appeng/tile/crafting/CraftingTileEntity.java @@ -37,7 +37,6 @@ import net.minecraft.world.IBlockReader; import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.common.util.Constants; -import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.implementations.IPowerChannelState; import appeng.api.networking.GridFlags; @@ -52,6 +51,7 @@ import appeng.api.util.AEPartLocation; import appeng.api.util.WorldCoord; import appeng.block.crafting.AbstractCraftingUnitBlock; import appeng.block.crafting.AbstractCraftingUnitBlock.CraftingUnitType; +import appeng.core.Api; import appeng.me.cluster.IAECluster; import appeng.me.cluster.IAEMultiBlock; import appeng.me.cluster.implementations.CraftingCPUCalculator; @@ -84,9 +84,9 @@ public class CraftingTileEntity extends AENetworkTileEntity implements IAEMultiB Optional is; if (((CraftingTileEntity) obj).isAccelerator()) { - is = AEApi.instance().definitions().blocks().craftingAccelerator().maybeStack(1); + is = Api.instance().definitions().blocks().craftingAccelerator().maybeStack(1); } else { - is = AEApi.instance().definitions().blocks().craftingUnit().maybeStack(1); + is = Api.instance().definitions().blocks().craftingUnit().maybeStack(1); } return is.orElseGet(() -> super.getItemFromTile(obj)); @@ -278,7 +278,7 @@ public class CraftingTileEntity extends AENetworkTileEntity implements IAEMultiB } for (IAEItemStack ais : inv.getAvailableItems( - AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList())) { + Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList())) { ais = ais.copy(); ais.setStackSize(ais.getDefinition().getMaxStackSize()); while (true) { diff --git a/src/main/java/appeng/tile/crafting/MolecularAssemblerTileEntity.java b/src/main/java/appeng/tile/crafting/MolecularAssemblerTileEntity.java index b26c87db0..96bfd73f8 100644 --- a/src/main/java/appeng/tile/crafting/MolecularAssemblerTileEntity.java +++ b/src/main/java/appeng/tile/crafting/MolecularAssemblerTileEntity.java @@ -38,7 +38,6 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.hooks.BasicEventHooks; import net.minecraftforge.items.IItemHandler; -import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; import appeng.api.config.RedstoneMode; @@ -61,6 +60,7 @@ import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.api.util.IConfigManager; import appeng.container.ContainerNull; +import appeng.core.Api; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.network.TargetPoint; import appeng.core.sync.packets.AssemblerAnimationPacket; @@ -107,7 +107,7 @@ public class MolecularAssemblerTileEntity extends AENetworkInvTileEntity public MolecularAssemblerTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); - final ITileDefinition assembler = AEApi.instance().definitions().blocks().molecularAssembler(); + final ITileDefinition assembler = Api.instance().definitions().blocks().molecularAssembler(); this.settings = new ConfigManager(this); this.settings.registerSetting(Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE); diff --git a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java index e2529307a..41d4edf8c 100644 --- a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java +++ b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java @@ -27,10 +27,10 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemHandlerHelper; -import appeng.api.AEApi; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.core.AELog; +import appeng.core.Api; import appeng.util.Platform; import appeng.util.inv.IAEAppEngInventory; import appeng.util.inv.InvOperation; @@ -145,7 +145,7 @@ public class AppEngInternalAEInventory implements IItemHandlerModifiable, Iterab if (!simulate) { if (existing.isEmpty()) { - this.inv[slot] = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + this.inv[slot] = Api.instance().storage().getStorageChannel(IItemStorageChannel.class) .createStack(reachedLimit ? ItemHandlerHelper.copyStackWithSize(stack, limit) : stack); } else { existing.grow(reachedLimit ? limit : stack.getCount()); @@ -182,7 +182,7 @@ public class AppEngInternalAEInventory implements IItemHandlerModifiable, Iterab @Override public void setStackInSlot(final int slot, final ItemStack newItemStack) { ItemStack oldStack = this.getStackInSlot(slot).copy(); - this.inv[slot] = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + this.inv[slot] = Api.instance().storage().getStorageChannel(IItemStorageChannel.class) .createStack(newItemStack); if (this.te != null && Platform.isServer()) { diff --git a/src/main/java/appeng/tile/misc/ChargerTileEntity.java b/src/main/java/appeng/tile/misc/ChargerTileEntity.java index 257dccba0..f68301dbf 100644 --- a/src/main/java/appeng/tile/misc/ChargerTileEntity.java +++ b/src/main/java/appeng/tile/misc/ChargerTileEntity.java @@ -30,7 +30,6 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraftforge.items.IItemHandler; -import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; import appeng.api.config.PowerUnits; @@ -46,6 +45,7 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; +import appeng.core.Api; import appeng.core.settings.TickRates; import appeng.me.GridAccessException; import appeng.tile.grid.AENetworkPowerTileEntity; @@ -115,7 +115,7 @@ public class ChargerTileEntity extends AENetworkPowerTileEntity implements ICran final ItemStack myItem = this.inv.getStackInSlot(0); if (this.getInternalCurrentPower() > POWER_THRESHOLD) { - final IMaterials materials = AEApi.instance().definitions().materials(); + final IMaterials materials = Api.instance().definitions().materials(); if (materials.certusQuartzCrystal().isSameAs(myItem)) { this.extractAEPower(this.getInternalMaxPower(), Actionable.MODULATE, PowerMultiplier.CONFIG); @@ -157,7 +157,7 @@ public class ChargerTileEntity extends AENetworkPowerTileEntity implements ICran if (myItem.isEmpty()) { ItemStack held = player.inventory.getCurrentItem(); - if (AEApi.instance().definitions().materials().certusQuartzCrystal().isSameAs(held) + if (Api.instance().definitions().materials().certusQuartzCrystal().isSameAs(held) || Platform.isChargeable(held)) { held = player.inventory.decrStackSize(player.inventory.currentItem, 1); this.inv.setStackInSlot(0, held); @@ -185,13 +185,13 @@ public class ChargerTileEntity extends AENetworkPowerTileEntity implements ICran boolean changed = false; if (!myItem.isEmpty()) { - final IMaterials materials = AEApi.instance().definitions().materials(); + final IMaterials materials = Api.instance().definitions().materials(); if (Platform.isChargeable(myItem)) { final IAEItemPowerStorage ps = (IAEItemPowerStorage) myItem.getItem(); if (ps.getAEMaxPower(myItem) > ps.getAECurrentPower(myItem)) { - final double chargeRate = AEApi.instance().registries().charger().getChargeRate(myItem.getItem()); + final double chargeRate = Api.instance().registries().charger().getChargeRate(myItem.getItem()); double extractedAmount = this.extractAEPower(chargeRate, Actionable.MODULATE, PowerMultiplier.CONFIG); @@ -254,7 +254,7 @@ public class ChargerTileEntity extends AENetworkPowerTileEntity implements ICran private class ChargerInvFilter implements IAEItemFilter { @Override public boolean allowInsert(IItemHandler inv, final int i, final ItemStack itemstack) { - final IItemDefinition cert = AEApi.instance().definitions().materials().certusQuartzCrystal(); + final IItemDefinition cert = Api.instance().definitions().materials().certusQuartzCrystal(); return Platform.isChargeable(itemstack) || cert.isSameAs(itemstack); } @@ -270,7 +270,7 @@ public class ChargerTileEntity extends AENetworkPowerTileEntity implements ICran } } - return AEApi.instance().definitions().materials().certusQuartzCrystalCharged().isSameAs(extractedItem); + return Api.instance().definitions().materials().certusQuartzCrystalCharged().isSameAs(extractedItem); } } } diff --git a/src/main/java/appeng/tile/misc/CondenserItemInventory.java b/src/main/java/appeng/tile/misc/CondenserItemInventory.java index 82ec28c34..532422b44 100644 --- a/src/main/java/appeng/tile/misc/CondenserItemInventory.java +++ b/src/main/java/appeng/tile/misc/CondenserItemInventory.java @@ -24,7 +24,6 @@ import java.util.Map.Entry; import net.minecraft.item.ItemStack; -import appeng.api.AEApi; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; import appeng.api.networking.security.IActionSource; @@ -35,6 +34,7 @@ import appeng.api.storage.IStorageChannel; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; +import appeng.core.Api; import appeng.me.helpers.BaseActionSource; import appeng.me.storage.ITickingMonitor; import appeng.util.item.AEItemStack; @@ -92,7 +92,7 @@ class CondenserItemInventory implements IMEMonitor, ITickingMonito @Override public IStorageChannel getChannel() { - return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class); + return Api.instance().storage().getStorageChannel(IItemStorageChannel.class); } @Override diff --git a/src/main/java/appeng/tile/misc/CondenserTileEntity.java b/src/main/java/appeng/tile/misc/CondenserTileEntity.java index 054c52500..962c688ba 100644 --- a/src/main/java/appeng/tile/misc/CondenserTileEntity.java +++ b/src/main/java/appeng/tile/misc/CondenserTileEntity.java @@ -35,7 +35,6 @@ import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; -import appeng.api.AEApi; import appeng.api.config.CondenserOutput; import appeng.api.config.Settings; import appeng.api.definitions.IMaterials; @@ -52,6 +51,7 @@ import appeng.api.storage.data.IAEStack; import appeng.api.util.IConfigManager; import appeng.api.util.IConfigurableObject; import appeng.capabilities.Capabilities; +import appeng.core.Api; import appeng.tile.AEBaseInvTileEntity; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.ConfigManager; @@ -147,7 +147,7 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM } private ItemStack getOutput() { - final IMaterials materials = AEApi.instance().definitions().materials(); + final IMaterials materials = Api.instance().definitions().materials(); switch ((CondenserOutput) this.cm.getSetting(Settings.CONDENSER_OUTPUT)) { case MATTER_BALLS: @@ -281,7 +281,7 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM @Override public int fill(FluidStack resource, FluidAction action) { if (action == FluidAction.EXECUTE) { - final IStorageChannel chan = AEApi.instance().storage() + final IStorageChannel chan = Api.instance().storage() .getStorageChannel(IFluidStorageChannel.class); CondenserTileEntity.this .addPower((resource.isEmpty() ? 0.0 : (double) resource.getAmount()) / chan.transferFactor()); @@ -345,7 +345,7 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM @Override public > IMEMonitor getInventory(IStorageChannel channel) { - if (channel == AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)) { + if (channel == Api.instance().storage().getStorageChannel(IItemStorageChannel.class)) { return (IMEMonitor) this.itemInventory; } else { return new CondenserVoidInventory<>(CondenserTileEntity.this, channel); diff --git a/src/main/java/appeng/tile/misc/InscriberRecipes.java b/src/main/java/appeng/tile/misc/InscriberRecipes.java index a3a4cac3d..05fe005b8 100644 --- a/src/main/java/appeng/tile/misc/InscriberRecipes.java +++ b/src/main/java/appeng/tile/misc/InscriberRecipes.java @@ -15,9 +15,9 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.World; -import appeng.api.AEApi; import appeng.api.definitions.IComparableDefinition; import appeng.api.features.InscriberProcessType; +import appeng.core.Api; import appeng.core.AppEng; import appeng.items.materials.MaterialItem; import appeng.recipes.handlers.InscriberRecipe; @@ -47,7 +47,7 @@ public final class InscriberRecipes { public static InscriberRecipe findRecipe(World world, ItemStack input, ItemStack plateA, ItemStack plateB, boolean supportNamePress) { if (supportNamePress) { - IComparableDefinition namePress = AEApi.instance().definitions().materials().namePress(); + IComparableDefinition namePress = Api.instance().definitions().materials().namePress(); boolean isNameA = namePress.isSameAs(plateA); boolean isNameB = namePress.isSameAs(plateB); diff --git a/src/main/java/appeng/tile/misc/InscriberTileEntity.java b/src/main/java/appeng/tile/misc/InscriberTileEntity.java index 5d5ed177a..f3a50190f 100644 --- a/src/main/java/appeng/tile/misc/InscriberTileEntity.java +++ b/src/main/java/appeng/tile/misc/InscriberTileEntity.java @@ -35,7 +35,6 @@ import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; -import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; import appeng.api.config.Settings; @@ -52,6 +51,7 @@ import appeng.api.networking.ticking.TickingRequest; import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; import appeng.api.util.IConfigManager; +import appeng.core.Api; import appeng.core.settings.TickRates; import appeng.me.GridAccessException; import appeng.parts.automation.DefinitionUpgradeInventory; @@ -106,7 +106,7 @@ public class InscriberTileEntity extends AENetworkPowerTileEntity this.getProxy().setIdlePowerUsage(0); this.settings = new ConfigManager(this); - final ITileDefinition inscriberDefinition = AEApi.instance().definitions().blocks().inscriber(); + final ITileDefinition inscriberDefinition = Api.instance().definitions().blocks().inscriber(); this.upgrades = new DefinitionUpgradeInventory(inscriberDefinition, this, this.getUpgradeSlots()); this.sideItemHandler.setMaxStackSize(1, 64); @@ -431,7 +431,7 @@ public class InscriberTileEntity extends AENetworkPowerTileEntity } if (inv == InscriberTileEntity.this.topItemHandler || inv == InscriberTileEntity.this.bottomItemHandler) { - if (AEApi.instance().definitions().materials().namePress().isSameAs(stack)) { + if (Api.instance().definitions().materials().namePress().isSameAs(stack)) { return true; } return InscriberRecipes.isValidOptionalIngredient(getWorld(), stack); diff --git a/src/main/java/appeng/tile/misc/InterfaceTileEntity.java b/src/main/java/appeng/tile/misc/InterfaceTileEntity.java index a1d3761b5..a17d770c8 100644 --- a/src/main/java/appeng/tile/misc/InterfaceTileEntity.java +++ b/src/main/java/appeng/tile/misc/InterfaceTileEntity.java @@ -40,7 +40,6 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.IItemHandler; -import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.Upgrades; import appeng.api.networking.IGridNode; @@ -59,6 +58,7 @@ import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.api.util.IConfigManager; import appeng.container.implementations.InterfaceContainer; +import appeng.core.Api; import appeng.helpers.DualityInterface; import appeng.helpers.IInterfaceHost; import appeng.helpers.IPriorityHost; @@ -306,7 +306,7 @@ public class InterfaceTileEntity extends AENetworkInvTileEntity @Override public ItemStack getItemStackRepresentation() { - return AEApi.instance().definitions().blocks().iface().maybeStack(1).orElse(ItemStack.EMPTY); + return Api.instance().definitions().blocks().iface().maybeStack(1).orElse(ItemStack.EMPTY); } @Override diff --git a/src/main/java/appeng/tile/misc/SecurityStationTileEntity.java b/src/main/java/appeng/tile/misc/SecurityStationTileEntity.java index 83c756b9e..3de02b073 100644 --- a/src/main/java/appeng/tile/misc/SecurityStationTileEntity.java +++ b/src/main/java/appeng/tile/misc/SecurityStationTileEntity.java @@ -36,7 +36,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.items.IItemHandler; -import appeng.api.AEApi; import appeng.api.config.SecurityPermissions; import appeng.api.config.Settings; import appeng.api.config.SortDir; @@ -66,6 +65,7 @@ import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.api.util.IConfigManager; +import appeng.core.Api; import appeng.helpers.PlayerSecurityWrapper; import appeng.me.GridAccessException; import appeng.me.helpers.MEMonitorHandler; @@ -253,7 +253,7 @@ public class SecurityStationTileEntity extends AENetworkTileEntity implements IT @Override public > IMEMonitor getInventory(IStorageChannel channel) { - if (channel == AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)) { + if (channel == Api.instance().storage().getStorageChannel(IItemStorageChannel.class)) { return (IMEMonitor) this.securityMonitor; } return null; @@ -286,7 +286,7 @@ public class SecurityStationTileEntity extends AENetworkTileEntity implements IT @Override public void readPermissions(final Map> playerPerms) { - final IPlayerRegistry pr = AEApi.instance().registries().players(); + final IPlayerRegistry pr = Api.instance().registries().players(); // read permissions for (final IAEItemStack ais : this.inventory.getStoredItems()) { diff --git a/src/main/java/appeng/tile/networking/WirelessTileEntity.java b/src/main/java/appeng/tile/networking/WirelessTileEntity.java index 8253e732b..230eb0734 100644 --- a/src/main/java/appeng/tile/networking/WirelessTileEntity.java +++ b/src/main/java/appeng/tile/networking/WirelessTileEntity.java @@ -27,7 +27,6 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraftforge.items.IItemHandler; -import appeng.api.AEApi; import appeng.api.implementations.IPowerChannelState; import appeng.api.implementations.tiles.IWirelessAccessPoint; import appeng.api.networking.GridFlags; @@ -39,6 +38,7 @@ import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.core.AEConfig; +import appeng.core.Api; import appeng.me.GridAccessException; import appeng.tile.grid.AENetworkInvTileEntity; import appeng.tile.inventory.AppEngInternalInventory; @@ -56,7 +56,7 @@ public class WirelessTileEntity extends AENetworkInvTileEntity implements IWirel public WirelessTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); - this.inv.setFilter(new AEItemDefinitionFilter(AEApi.instance().definitions().materials().wirelessBooster())); + this.inv.setFilter(new AEItemDefinitionFilter(Api.instance().definitions().materials().wirelessBooster())); this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL); this.getProxy().setValidSides(EnumSet.noneOf(Direction.class)); } diff --git a/src/main/java/appeng/tile/qnb/QuantumBridgeTileEntity.java b/src/main/java/appeng/tile/qnb/QuantumBridgeTileEntity.java index 8d7e4bde0..f625a6bfd 100644 --- a/src/main/java/appeng/tile/qnb/QuantumBridgeTileEntity.java +++ b/src/main/java/appeng/tile/qnb/QuantumBridgeTileEntity.java @@ -38,7 +38,6 @@ import net.minecraftforge.client.model.data.ModelProperty; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.EmptyHandler; -import appeng.api.AEApi; import appeng.api.definitions.IBlockDefinition; import appeng.api.networking.GridFlags; import appeng.api.networking.events.MENetworkEventSubscribe; @@ -47,6 +46,7 @@ import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.block.qnb.QnbFormedState; +import appeng.core.Api; import appeng.me.GridAccessException; import appeng.me.cluster.IAECluster; import appeng.me.cluster.IAEMultiBlock; @@ -134,7 +134,7 @@ public class QuantumBridgeTileEntity extends AENetworkInvTileEntity implements I } private boolean isCenter() { - return AEApi.instance().definitions().blocks().quantumLink().maybeBlock() + return Api.instance().definitions().blocks().quantumLink().maybeBlock() .map(link -> this.getBlockState().getBlock() == link).orElse(false); } @@ -153,7 +153,7 @@ public class QuantumBridgeTileEntity extends AENetworkInvTileEntity implements I public void onReady() { super.onReady(); - final IBlockDefinition quantumRing = AEApi.instance().definitions().blocks().quantumRing(); + final IBlockDefinition quantumRing = Api.instance().definitions().blocks().quantumRing(); final Optional maybeLinkBlock = quantumRing.maybeBlock(); final Optional maybeLinkStack = quantumRing.maybeStack(1); diff --git a/src/main/java/appeng/tile/storage/ChestTileEntity.java b/src/main/java/appeng/tile/storage/ChestTileEntity.java index 7e521b998..5245d0ec8 100644 --- a/src/main/java/appeng/tile/storage/ChestTileEntity.java +++ b/src/main/java/appeng/tile/storage/ChestTileEntity.java @@ -43,7 +43,6 @@ import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.items.IItemHandler; -import appeng.api.AEApi; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; @@ -90,6 +89,7 @@ import appeng.api.util.AEColor; import appeng.api.util.IConfigManager; import appeng.capabilities.Capabilities; import appeng.container.implementations.MEMonitorableContainer; +import appeng.core.Api; import appeng.fluids.container.FluidTerminalContainer; import appeng.fluids.util.AEFluidStack; import appeng.helpers.IPriorityHost; @@ -209,11 +209,11 @@ public class ChestTileEntity extends AENetworkPowerTileEntity final ItemStack is = this.getCell(); if (!is.isEmpty()) { this.isCached = true; - ICellHandler cellHandler = AEApi.instance().registries().cell().getHandler(is); + ICellHandler cellHandler = Api.instance().registries().cell().getHandler(is); if (cellHandler != null) { double power = 1.0; - for (IStorageChannel channel : AEApi.instance().storage().storageChannels()) { + for (IStorageChannel channel : Api.instance().storage().storageChannels()) { final ICellInventoryHandler newCell = cellHandler.getCellInventory(is, this, channel); if (newCell != null) { @@ -226,7 +226,7 @@ public class ChestTileEntity extends AENetworkPowerTileEntity this.getProxy().setIdlePowerUsage(power); this.accessor = new Accessor(); - if (this.cellHandler != null && this.cellHandler.getChannel() == AEApi.instance().storage() + if (this.cellHandler != null && this.cellHandler.getChannel() == Api.instance().storage() .getStorageChannel(IFluidStorageChannel.class)) { this.fluidHandler = new FluidHandler(); } @@ -258,7 +258,7 @@ public class ChestTileEntity extends AENetworkPowerTileEntity this.updateHandler(); final ItemStack cell = this.getCell(); - final ICellHandler ch = AEApi.instance().registries().cell().getHandler(cell); + final ICellHandler ch = Api.instance().registries().cell().getHandler(cell); if (this.cellHandler != null && ch != null) { return ch.getStatusForCell(cell, this.cellHandler.getInternalHandler()); @@ -465,7 +465,7 @@ public class ChestTileEntity extends AENetworkPowerTileEntity if (!ItemHandlerUtil.isEmpty(this.inputInventory)) { this.updateHandler(); - if (this.cellHandler != null && this.cellHandler.getChannel() == AEApi.instance().storage() + if (this.cellHandler != null && this.cellHandler.getChannel() == Api.instance().storage() .getStorageChannel(IItemStorageChannel.class)) { final IAEItemStack returns = Platform.poweredInsert(this, this.cellHandler, AEItemStack.fromItemStack(this.inputInventory.getStackInSlot(0)), this.mySrc); @@ -535,10 +535,10 @@ public class ChestTileEntity extends AENetworkPowerTileEntity public boolean openGui(final PlayerEntity p) { this.updateHandler(); if (this.cellHandler != null) { - final ICellHandler ch = AEApi.instance().registries().cell().getHandler(this.getCell()); + final ICellHandler ch = Api.instance().registries().cell().getHandler(this.getCell()); if (ch != null) { - final ICellGuiHandler chg = AEApi.instance().registries().cell() + final ICellGuiHandler chg = Api.instance().registries().cell() .getGuiHandler(this.cellHandler.getChannel(), this.getCell()); if (chg != null) { chg.openChestGui(p, this, ch, this.cellHandler, this.getCell(), this.cellHandler.getChannel()); @@ -704,7 +704,7 @@ public class ChestTileEntity extends AENetworkPowerTileEntity private class FluidHandler implements IFluidHandler, IFluidTank { private boolean canAcceptLiquids() { - return ChestTileEntity.this.cellHandler != null && ChestTileEntity.this.cellHandler.getChannel() == AEApi + return ChestTileEntity.this.cellHandler != null && ChestTileEntity.this.cellHandler.getChannel() == Api .instance().storage().getStorageChannel(IFluidStorageChannel.class); } @@ -790,8 +790,8 @@ public class ChestTileEntity extends AENetworkPowerTileEntity public boolean allowInsert(IItemHandler inv, int slot, ItemStack stack) { if (ChestTileEntity.this.isPowered()) { ChestTileEntity.this.updateHandler(); - return ChestTileEntity.this.cellHandler != null && ChestTileEntity.this.cellHandler - .getChannel() == AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class); + return ChestTileEntity.this.cellHandler != null && ChestTileEntity.this.cellHandler.getChannel() == Api + .instance().storage().getStorageChannel(IItemStorageChannel.class); } return false; } @@ -806,25 +806,25 @@ public class ChestTileEntity extends AENetworkPowerTileEntity @Override public boolean allowInsert(IItemHandler inv, int slot, ItemStack stack) { - return AEApi.instance().registries().cell().getHandler(stack) != null; + return Api.instance().registries().cell().getHandler(stack) != null; } } @Override public ItemStack getItemStackRepresentation() { - return AEApi.instance().definitions().blocks().chest().maybeStack(1).orElse(ItemStack.EMPTY); + return Api.instance().definitions().blocks().chest().maybeStack(1).orElse(ItemStack.EMPTY); } @Override public ContainerType getContainerType() { this.updateHandler(); if (this.cellHandler != null) { - if (this.cellHandler.getChannel() == AEApi.instance().storage() + if (this.cellHandler.getChannel() == Api.instance().storage() .getStorageChannel(IItemStorageChannel.class)) { return MEMonitorableContainer.TYPE; } - if (this.cellHandler.getChannel() == AEApi.instance().storage() + if (this.cellHandler.getChannel() == Api.instance().storage() .getStorageChannel(IFluidStorageChannel.class)) { return FluidTerminalContainer.TYPE; } diff --git a/src/main/java/appeng/tile/storage/DriveTileEntity.java b/src/main/java/appeng/tile/storage/DriveTileEntity.java index bfb169725..ed89864a3 100644 --- a/src/main/java/appeng/tile/storage/DriveTileEntity.java +++ b/src/main/java/appeng/tile/storage/DriveTileEntity.java @@ -42,7 +42,6 @@ import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.registries.ForgeRegistries; -import appeng.api.AEApi; import appeng.api.implementations.tiles.IChestOrDrive; import appeng.api.networking.GridFlags; import appeng.api.networking.events.MENetworkCellArrayUpdate; @@ -65,6 +64,7 @@ import appeng.api.util.DimensionalCoord; import appeng.block.storage.DriveSlotsState; import appeng.client.render.model.DriveModelData; import appeng.container.implementations.DriveContainer; +import appeng.core.Api; import appeng.helpers.IPriorityHost; import appeng.me.GridAccessException; import appeng.me.helpers.MachineSource; @@ -347,7 +347,7 @@ public class DriveTileEntity extends AENetworkInvTileEntity implements IChestOrD private void updateState() { if (!this.isCached) { - final Collection>> storageChannels = AEApi.instance().storage() + final Collection>> storageChannels = Api.instance().storage() .storageChannels(); storageChannels.forEach(channel -> this.inventoryHandlers.put(channel, new ArrayList<>(10))); @@ -359,7 +359,7 @@ public class DriveTileEntity extends AENetworkInvTileEntity implements IChestOrD this.handlersBySlot[x] = null; if (!is.isEmpty()) { - this.handlersBySlot[x] = AEApi.instance().registries().cell().getHandler(is); + this.handlersBySlot[x] = Api.instance().registries().cell().getHandler(is); if (this.handlersBySlot[x] != null) { for (IStorageChannel> channel : storageChannels) { @@ -444,14 +444,14 @@ public class DriveTileEntity extends AENetworkInvTileEntity implements IChestOrD @Override public boolean allowInsert(IItemHandler inv, int slot, ItemStack stack) { - return !stack.isEmpty() && AEApi.instance().registries().cell().isCellHandled(stack); + return !stack.isEmpty() && Api.instance().registries().cell().isCellHandled(stack); } } @Override public ItemStack getItemStackRepresentation() { - return AEApi.instance().definitions().blocks().drive().maybeStack(1).orElse(ItemStack.EMPTY); + return Api.instance().definitions().blocks().drive().maybeStack(1).orElse(ItemStack.EMPTY); } @Nonnull diff --git a/src/main/java/appeng/tile/storage/IOPortTileEntity.java b/src/main/java/appeng/tile/storage/IOPortTileEntity.java index 339420d8f..70b30f1b4 100644 --- a/src/main/java/appeng/tile/storage/IOPortTileEntity.java +++ b/src/main/java/appeng/tile/storage/IOPortTileEntity.java @@ -31,7 +31,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; -import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.FullnessMode; import appeng.api.config.OperationMode; @@ -56,6 +55,7 @@ import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.api.util.IConfigManager; +import appeng.core.Api; import appeng.core.settings.TickRates; import appeng.me.GridAccessException; import appeng.me.helpers.MachineSource; @@ -106,7 +106,7 @@ public class IOPortTileEntity extends AENetworkInvTileEntity this.mySrc = new MachineSource(this); this.lastRedstoneState = YesNo.UNDECIDED; - final Block ioPortBlock = AEApi.instance().definitions().blocks().iOPort().maybeBlock().get(); + final Block ioPortBlock = Api.instance().definitions().blocks().iOPort().maybeBlock().get(); this.upgrades = new BlockUpgradeInventory(ioPortBlock, this, NUMBER_OF_UPGRADE_SLOTS); } @@ -265,7 +265,7 @@ public class IOPortTileEntity extends AENetworkInvTileEntity if (!is.isEmpty()) { boolean shouldMove = true; - for (IStorageChannel> c : AEApi.instance().storage().storageChannels()) { + for (IStorageChannel> c : Api.instance().storage().storageChannels()) { if (itemsToMove > 0) { final IMEMonitor> network = this.getProxy().getStorage() .getInventory(c); @@ -316,8 +316,8 @@ public class IOPortTileEntity extends AENetworkInvTileEntity this.currentCell = is; this.cachedInventories = new IdentityHashMap<>(); - for (IStorageChannel> c : AEApi.instance().storage().storageChannels()) { - this.cachedInventories.put(c, AEApi.instance().registries().cell().getCellInventory(is, null, c)); + for (IStorageChannel> c : Api.instance().storage().storageChannels()) { + this.cachedInventories.put(c, Api.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 4e4fffa71..578f5cf93 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -34,7 +34,6 @@ import com.google.common.collect.Iterables; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; @@ -70,7 +69,6 @@ import net.minecraftforge.fml.common.thread.SidedThreadGroups; import net.minecraftforge.fml.loading.FMLEnvironment; import net.minecraftforge.registries.ForgeRegistries; -import appeng.api.AEApi; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; @@ -103,6 +101,7 @@ 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; @@ -873,11 +872,11 @@ 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 : AEApi.instance().storage().storageChannels()) { + for (final IStorageChannel chan : Api.instance().storage().storageChannels()) { final IItemList myChanges = chan.createList(); if (!removed.isEmpty()) { - final IMEInventory myInv = AEApi.instance().registries().cell().getCellInventory(removed, null, chan); + final IMEInventory myInv = Api.instance().registries().cell().getCellInventory(removed, null, chan); if (myInv != null) { myInv.getAvailableItems(myChanges); for (final IAEStack is : myChanges) { @@ -886,7 +885,7 @@ public class Platform { } } if (!added.isEmpty()) { - final IMEInventory myInv = AEApi.instance().registries().cell().getCellInventory(added, null, chan); + final IMEInventory myInv = Api.instance().registries().cell().getCellInventory(added, null, chan); if (myInv != null) { myInv.getAvailableItems(myChanges); } @@ -1136,8 +1135,7 @@ public class Platform { } if (type == AEFeature.CERTUS_QUARTZ_TOOLS) { - final IItemDefinition certusQuartzCrystal = AEApi.instance().definitions().materials() - .certusQuartzCrystal(); + final IItemDefinition certusQuartzCrystal = Api.instance().definitions().materials().certusQuartzCrystal(); return certusQuartzCrystal.isSameAs(b); } @@ -1156,7 +1154,7 @@ public class Platform { } public static boolean isRecipePrioritized(final ItemStack what) { - final IMaterials materials = AEApi.instance().definitions().materials(); + final IMaterials materials = Api.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 e6e4163a2..806b967a0 100644 --- a/src/main/java/appeng/util/inv/IMEAdaptor.java +++ b/src/main/java/appeng/util/inv/IMEAdaptor.java @@ -24,7 +24,6 @@ import com.google.common.collect.ImmutableList; import net.minecraft.item.ItemStack; -import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.FuzzyMode; import appeng.api.networking.security.IActionSource; @@ -32,6 +31,7 @@ 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.util.InventoryAdaptor; import appeng.util.item.AEItemStack; @@ -57,8 +57,8 @@ public class IMEAdaptor extends InventoryAdaptor { } private IItemList getList() { - return this.target.getAvailableItems( - AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList()); + return this.target + .getAvailableItems(Api.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 369c66248..e427cac7b 100644 --- a/src/main/java/appeng/util/item/AEItemStack.java +++ b/src/main/java/appeng/util/item/AEItemStack.java @@ -33,11 +33,11 @@ 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; import appeng.api.storage.data.IAEItemStack; +import appeng.core.Api; import appeng.util.Platform; public final class AEItemStack extends AEStack implements IAEItemStack { @@ -154,7 +154,7 @@ public final class AEItemStack extends AEStack implements IAEItemS @Override public IStorageChannel getChannel() { - return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class); + return Api.instance().storage().getStorageChannel(IItemStorageChannel.class); } @Override diff --git a/src/main/java/appeng/util/item/AEItemStackRegistry.java b/src/main/java/appeng/util/item/AEItemStackRegistry.java index 929962da1..0fce27e36 100644 --- a/src/main/java/appeng/util/item/AEItemStackRegistry.java +++ b/src/main/java/appeng/util/item/AEItemStackRegistry.java @@ -30,8 +30,6 @@ import javax.annotation.Nonnull; import net.minecraft.item.ItemStack; -import appeng.util.Platform; - public final class AEItemStackRegistry { private static final WeakHashMap> REGISTRY = new WeakHashMap<>(); diff --git a/src/main/java/appeng/util/item/ItemModList.java b/src/main/java/appeng/util/item/ItemModList.java index 96d985e02..885cbd521 100644 --- a/src/main/java/appeng/util/item/ItemModList.java +++ b/src/main/java/appeng/util/item/ItemModList.java @@ -20,16 +20,16 @@ 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 = AEApi.instance().storage() + private final IItemContainer overrides = Api.instance().storage() .getStorageChannel(IItemStorageChannel.class).createList(); public ItemModList(final IItemContainer backend) { diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java b/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java index 78bd20d26..f2de57628 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java @@ -35,12 +35,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MutableBoundingBox; import net.minecraft.world.IWorld; -import appeng.api.AEApi; import appeng.api.definitions.IBlockDefinition; import appeng.api.definitions.IBlocks; import appeng.api.definitions.IMaterials; import appeng.api.features.AEFeature; import appeng.core.AEConfig; +import appeng.core.Api; import appeng.core.worlddata.WorldData; import appeng.util.InventoryAdaptor; import appeng.util.Platform; @@ -89,7 +89,7 @@ public final class MeteoritePlacer { this.squaredMeteoriteSize = this.meteoriteSize * this.meteoriteSize; this.crater = this.realCrater * this.realCrater; - final IBlocks blocks = AEApi.instance().definitions().blocks(); + final IBlocks blocks = Api.instance().definitions().blocks(); this.skyChestDefinition = blocks.skyStoneChest(); this.skyStone = blocks.skyStoneBlock().block().getDefaultState(); @@ -230,7 +230,7 @@ public final class MeteoritePlacer { } ItemStack toAdd = ItemStack.EMPTY; - final IMaterials materials = AEApi.instance().definitions().materials(); + final IMaterials materials = Api.instance().definitions().materials(); switch (r % 4) { case 0: diff --git a/src/main/java/team/chisel/ctm/api/IFacade.java b/src/main/java/team/chisel/ctm/api/IFacade.java index 6b31f30d1..710a3a250 100644 --- a/src/main/java/team/chisel/ctm/api/IFacade.java +++ b/src/main/java/team/chisel/ctm/api/IFacade.java @@ -1,14 +1,14 @@ package team.chisel.ctm.api; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + import net.minecraft.block.BlockState; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - /** * To be implemented on blocks that "hide" another block inside, so connected textures can still be accomplished. */