fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fabric port in progress

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-27 23:25:38 +02:00
parent 80fbb58d4f
commit b79cd732b2
368 changed files with 2498 additions and 2698 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/container/implementations/CellWorkbenchContainer.java
+8 -8
View File
@@ -23,13 +23,13 @@ import java.util.Iterator;
import alexiil.mc.lib.attributes.item.ItemTransferable;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.inventory.container.IContainerListener;
import net.minecraft.inventory.container.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.network.PacketByteBuf;
import net.minecraftforge.items.wrapper.EmptyHandler;
import alexiil.mc.lib.attributes.item.impl.EmptyFixedItemInv;
import appeng.api.AEApi;
import appeng.api.config.CopyMode;
@@ -47,7 +47,7 @@ import appeng.container.guisync.GuiSync;
import appeng.container.slot.FakeTypeOnlySlot;
import appeng.container.slot.OptionalRestrictedInputSlot;
import appeng.container.slot.RestrictedInputSlot;
import appeng.tile.misc.CellWorkbenchTileEntity;
import appeng.tile.misc.CellWorkbenchBlockEntity;
import appeng.util.EnumCycler;
import appeng.util.Platform;
import appeng.util.helpers.ItemHandlerUtil;
@@ -58,16 +58,16 @@ public class CellWorkbenchContainer extends UpgradeableContainer {
public static ContainerType<CellWorkbenchContainer> TYPE;
private static final ContainerHelper<CellWorkbenchContainer, CellWorkbenchTileEntity> helper = new ContainerHelper<>(
CellWorkbenchContainer::new, CellWorkbenchTileEntity.class);
private static final ContainerHelper<CellWorkbenchContainer, CellWorkbenchBlockEntity> helper = new ContainerHelper<>(
CellWorkbenchContainer::new, CellWorkbenchBlockEntity.class);
private final CellWorkbenchTileEntity workBench;
private final CellWorkbenchBlockEntity workBench;
@GuiSync(2)
public CopyMode copyMode = CopyMode.CLEAR_ON_REMOVE;
private ItemStack prevStack = ItemStack.EMPTY;
private int lastUpgrades = 0;
public CellWorkbenchContainer(int id, final PlayerInventory ip, final CellWorkbenchTileEntity te) {
public CellWorkbenchContainer(int id, final PlayerInventory ip, final CellWorkbenchBlockEntity te) {
super(TYPE, id, ip, te);
this.workBench = te;
}
@@ -185,7 +185,7 @@ public class CellWorkbenchContainer extends UpgradeableContainer {
public ItemTransferable getCellUpgradeInventory() {
final ItemTransferable upgradeInventory = this.workBench.getCellUpgradeInventory();
return upgradeInventory == null ? EmptyHandler.INSTANCE : upgradeInventory;
return upgradeInventory == null ? EmptyFixedItemInv.INSTANCE : upgradeInventory;
}
@Override
src/main/java/appeng/container/implementations/ChestContainer.java
+4 -4
View File
@@ -27,16 +27,16 @@ import appeng.api.config.SecurityPermissions;
import appeng.container.AEBaseContainer;
import appeng.container.ContainerLocator;
import appeng.container.slot.RestrictedInputSlot;
import appeng.tile.storage.ChestTileEntity;
import appeng.tile.storage.ChestBlockEntity;
public class ChestContainer extends AEBaseContainer {
public static ContainerType<ChestContainer> TYPE;
private static final ContainerHelper<ChestContainer, ChestTileEntity> helper = new ContainerHelper<>(
ChestContainer::new, ChestTileEntity.class, SecurityPermissions.BUILD);
private static final ContainerHelper<ChestContainer, ChestBlockEntity> helper = new ContainerHelper<>(
ChestContainer::new, ChestBlockEntity.class, SecurityPermissions.BUILD);
public ChestContainer(int id, final PlayerInventory ip, final ChestTileEntity chest) {
public ChestContainer(int id, final PlayerInventory ip, final ChestBlockEntity chest) {
super(TYPE, id, ip, chest, null);
this.addSlot(new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.STORAGE_CELLS,
src/main/java/appeng/container/implementations/CondenserContainer.java
+5 -5
View File
@@ -32,17 +32,17 @@ import appeng.container.guisync.GuiSync;
import appeng.container.interfaces.IProgressProvider;
import appeng.container.slot.OutputSlot;
import appeng.container.slot.RestrictedInputSlot;
import appeng.tile.misc.CondenserTileEntity;
import appeng.tile.misc.CondenserBlockEntity;
import appeng.util.Platform;
public class CondenserContainer extends AEBaseContainer implements IProgressProvider {
public static ContainerType<CondenserContainer> TYPE;
private static final ContainerHelper<CondenserContainer, CondenserTileEntity> helper = new ContainerHelper<>(
CondenserContainer::new, CondenserTileEntity.class);
private static final ContainerHelper<CondenserContainer, CondenserBlockEntity> helper = new ContainerHelper<>(
CondenserContainer::new, CondenserBlockEntity.class);
private final CondenserTileEntity condenser;
private final CondenserBlockEntity condenser;
@GuiSync(0)
public long requiredEnergy = 0;
@GuiSync(1)
@@ -50,7 +50,7 @@ public class CondenserContainer extends AEBaseContainer implements IProgressProv
@GuiSync(2)
public CondenserOutput output = CondenserOutput.TRASH;
public CondenserContainer(int id, final PlayerInventory ip, final CondenserTileEntity condenser) {
public CondenserContainer(int id, final PlayerInventory ip, final CondenserBlockEntity condenser) {
super(TYPE, id, ip, condenser, null);
this.condenser = condenser;
src/main/java/appeng/container/implementations/ContainerHelper.java
+4 -4
View File
@@ -2,7 +2,7 @@ package appeng.container.implementations;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.inventory.container.INamedContainerProvider;
import net.minecraft.inventory.container.SimpleNamedContainerProvider;
import net.minecraft.item.ItemStack;
@@ -10,7 +10,7 @@ import net.minecraft.network.PacketByteBuf;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.text.Text;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.text.LiteralText;
import net.minecraft.text.TranslatableText;
import net.minecraft.world.World;
import net.minecraftforge.fml.network.NetworkHooks;
@@ -116,7 +116,7 @@ public final class ContainerHelper<C extends AEBaseContainer, I> {
world.getBlockState(locator.getBlockPos()).getBlock().getTranslationKey());
}
return new StringTextComponent("Unknown");
return new LiteralText("Unknown");
}
@@ -129,7 +129,7 @@ public final class ContainerHelper<C extends AEBaseContainer, I> {
return null; // No block was clicked
}
BlockEntity tileEntity = player.world.getTileEntity(locator.getBlockPos());
BlockEntity tileEntity = player.world.getBlockEntity(locator.getBlockPos());
// The tile entity itself can host a terminal (i.e. Chest!)
if (interfaceClass.isInstance(tileEntity)) {
src/main/java/appeng/container/implementations/CraftConfirmContainer.java
+3 -3
View File
@@ -29,12 +29,12 @@ import com.google.common.collect.ImmutableSet;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.inventory.container.IContainerListener;
import net.minecraft.network.PacketByteBuf;
import net.minecraft.text.Text;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.text.LiteralText;
import net.minecraft.world.World;
import appeng.api.AEApi;
@@ -256,7 +256,7 @@ public class CraftConfirmContainer extends AEBaseContainer {
// :P
}
} catch (final Throwable e) {
this.getPlayerInv().player.sendMessage(new StringTextComponent("Error: " + e.toString()));
this.getPlayerInv().player.sendMessage(new LiteralText("Error: " + e.toString()));
AELog.debug(e);
this.setValidContainer(false);
this.result = null;
src/main/java/appeng/container/implementations/CraftingCPUContainer.java
+6 -6
View File
@@ -22,7 +22,7 @@ import java.io.IOException;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.inventory.container.IContainerListener;
import net.minecraft.network.PacketByteBuf;
@@ -49,7 +49,7 @@ import appeng.core.sync.packets.MEInventoryUpdatePacket;
import appeng.helpers.ICustomNameObject;
import appeng.me.cluster.IAEMultiBlock;
import appeng.me.cluster.implementations.CraftingCPUCluster;
import appeng.tile.crafting.CraftingTileEntity;
import appeng.tile.crafting.CraftingBlockEntity;
import appeng.util.Platform;
public class CraftingCPUContainer extends AEBaseContainer
@@ -57,8 +57,8 @@ public class CraftingCPUContainer extends AEBaseContainer
public static ContainerType<CraftingCPUContainer> TYPE;
private static final ContainerHelper<CraftingCPUContainer, CraftingTileEntity> helper = new ContainerHelper<>(
CraftingCPUContainer::new, CraftingTileEntity.class, SecurityPermissions.CRAFT);
private static final ContainerHelper<CraftingCPUContainer, CraftingBlockEntity> helper = new ContainerHelper<>(
CraftingCPUContainer::new, CraftingBlockEntity.class, SecurityPermissions.CRAFT);
private final IItemList<IAEItemStack> list = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)
.createList();
@@ -69,7 +69,7 @@ public class CraftingCPUContainer extends AEBaseContainer
@GuiSync(0)
public long eta = -1;
private CraftingCPUContainer(int id, final PlayerInventory ip, final CraftingTileEntity te) {
private CraftingCPUContainer(int id, final PlayerInventory ip, final CraftingBlockEntity te) {
this(TYPE, id, ip, te);
}
@@ -81,7 +81,7 @@ public class CraftingCPUContainer extends AEBaseContainer
this.setNetwork(host.getActionableNode().getGrid());
}
if (te instanceof CraftingTileEntity) {
if (te instanceof CraftingBlockEntity) {
this.setCPU((ICraftingCPU) ((IAEMultiBlock) te).getCluster());
}
src/main/java/appeng/container/implementations/DriveContainer.java
+4 -4
View File
@@ -26,14 +26,14 @@ import net.minecraft.network.PacketByteBuf;
import appeng.container.AEBaseContainer;
import appeng.container.ContainerLocator;
import appeng.container.slot.RestrictedInputSlot;
import appeng.tile.storage.DriveTileEntity;
import appeng.tile.storage.DriveBlockEntity;
public class DriveContainer extends AEBaseContainer {
public static ContainerType<DriveContainer> TYPE;
private static final ContainerHelper<DriveContainer, DriveTileEntity> helper = new ContainerHelper<>(
DriveContainer::new, DriveTileEntity.class);
private static final ContainerHelper<DriveContainer, DriveBlockEntity> helper = new ContainerHelper<>(
DriveContainer::new, DriveBlockEntity.class);
public static DriveContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) {
return helper.fromNetwork(windowId, inv, buf);
@@ -43,7 +43,7 @@ public class DriveContainer extends AEBaseContainer {
return helper.open(player, locator);
}
public DriveContainer(int id, final PlayerInventory ip, final DriveTileEntity drive) {
public DriveContainer(int id, final PlayerInventory ip, final DriveBlockEntity drive) {
super(TYPE, id, ip, drive, null);
for (int y = 0; y < 5; y++) {
src/main/java/appeng/container/implementations/GrinderContainer.java
+4 -4
View File
@@ -29,14 +29,14 @@ import appeng.container.ContainerLocator;
import appeng.container.slot.InaccessibleSlot;
import appeng.container.slot.OutputSlot;
import appeng.container.slot.RestrictedInputSlot;
import appeng.tile.grindstone.GrinderTileEntity;
import appeng.tile.grindstone.GrinderBlockEntity;
public class GrinderContainer extends AEBaseContainer {
public static ContainerType<GrinderContainer> TYPE;
private static final ContainerHelper<GrinderContainer, GrinderTileEntity> helper = new ContainerHelper<>(
GrinderContainer::new, GrinderTileEntity.class);
private static final ContainerHelper<GrinderContainer, GrinderBlockEntity> helper = new ContainerHelper<>(
GrinderContainer::new, GrinderBlockEntity.class);
public static GrinderContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) {
return helper.fromNetwork(windowId, inv, buf);
@@ -46,7 +46,7 @@ public class GrinderContainer extends AEBaseContainer {
return helper.open(player, locator);
}
public GrinderContainer(int id, final PlayerInventory ip, final GrinderTileEntity grinder) {
public GrinderContainer(int id, final PlayerInventory ip, final GrinderBlockEntity grinder) {
super(TYPE, id, ip, grinder, null);
ItemTransferable inv = grinder.getInternalInventory();
src/main/java/appeng/container/implementations/IOPortContainer.java
+4 -4
View File
@@ -33,15 +33,15 @@ import appeng.container.ContainerLocator;
import appeng.container.guisync.GuiSync;
import appeng.container.slot.OutputSlot;
import appeng.container.slot.RestrictedInputSlot;
import appeng.tile.storage.IOPortTileEntity;
import appeng.tile.storage.IOPortBlockEntity;
import appeng.util.Platform;
public class IOPortContainer extends UpgradeableContainer {
public static ContainerType<IOPortContainer> TYPE;
private static final ContainerHelper<IOPortContainer, IOPortTileEntity> helper = new ContainerHelper<>(
IOPortContainer::new, IOPortTileEntity.class, SecurityPermissions.BUILD);
private static final ContainerHelper<IOPortContainer, IOPortBlockEntity> helper = new ContainerHelper<>(
IOPortContainer::new, IOPortBlockEntity.class, SecurityPermissions.BUILD);
public static IOPortContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) {
return helper.fromNetwork(windowId, inv, buf);
@@ -56,7 +56,7 @@ public class IOPortContainer extends UpgradeableContainer {
@GuiSync(3)
public OperationMode opMode = OperationMode.EMPTY;
public IOPortContainer(int id, final PlayerInventory ip, final IOPortTileEntity te) {
public IOPortContainer(int id, final PlayerInventory ip, final IOPortBlockEntity te) {
super(TYPE, id, ip, te);
}
src/main/java/appeng/container/implementations/InscriberContainer.java
+5 -5
View File
@@ -34,7 +34,7 @@ import appeng.container.interfaces.IProgressProvider;
import appeng.container.slot.OutputSlot;
import appeng.container.slot.RestrictedInputSlot;
import appeng.tile.misc.InscriberRecipes;
import appeng.tile.misc.InscriberTileEntity;
import appeng.tile.misc.InscriberBlockEntity;
import appeng.util.Platform;
/**
@@ -47,8 +47,8 @@ public class InscriberContainer extends UpgradeableContainer implements IProgres
public static ContainerType<InscriberContainer> TYPE;
private static final ContainerHelper<InscriberContainer, InscriberTileEntity> helper = new ContainerHelper<>(
InscriberContainer::new, InscriberTileEntity.class);
private static final ContainerHelper<InscriberContainer, InscriberBlockEntity> helper = new ContainerHelper<>(
InscriberContainer::new, InscriberBlockEntity.class);
public static InscriberContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) {
return helper.fromNetwork(windowId, inv, buf);
@@ -58,7 +58,7 @@ public class InscriberContainer extends UpgradeableContainer implements IProgres
return helper.open(player, locator);
}
private final InscriberTileEntity ti;
private final InscriberBlockEntity ti;
private final Slot top;
private final Slot middle;
@@ -70,7 +70,7 @@ public class InscriberContainer extends UpgradeableContainer implements IProgres
@GuiSync(3)
public int processingTime = -1;
public InscriberContainer(int id, final PlayerInventory ip, final InscriberTileEntity te) {
public InscriberContainer(int id, final PlayerInventory ip, final InscriberBlockEntity te) {
super(TYPE, id, ip, te);
this.ti = te;
src/main/java/appeng/container/implementations/InterfaceTerminalContainer.java
+4 -4
View File
@@ -25,7 +25,7 @@ import java.util.Map.Entry;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundTag;
@@ -50,7 +50,7 @@ import appeng.items.misc.EncodedPatternItem;
import appeng.parts.misc.InterfacePart;
import appeng.parts.reporting.InterfaceTerminalPart;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.tile.misc.InterfaceTileEntity;
import appeng.tile.misc.InterfaceBlockEntity;
import appeng.util.InventoryAdaptor;
import appeng.util.Platform;
import appeng.util.helpers.ItemHandlerUtil;
@@ -114,7 +114,7 @@ public final class InterfaceTerminalContainer extends AEBaseContainer {
if (host != null) {
final IGridNode agn = host.getActionableNode();
if (agn != null && agn.isActive()) {
for (final IGridNode gn : this.grid.getMachines(InterfaceTileEntity.class)) {
for (final IGridNode gn : this.grid.getMachines(InterfaceBlockEntity.class)) {
if (gn.isActive()) {
final IInterfaceHost ih = (IInterfaceHost) gn.getMachine();
if (ih.getInterfaceDuality().getConfigManager()
@@ -288,7 +288,7 @@ public final class InterfaceTerminalContainer extends AEBaseContainer {
if (host != null) {
final IGridNode agn = host.getActionableNode();
if (agn != null && agn.isActive()) {
for (final IGridNode gn : this.grid.getMachines(InterfaceTileEntity.class)) {
for (final IGridNode gn : this.grid.getMachines(InterfaceBlockEntity.class)) {
final IInterfaceHost ih = (IInterfaceHost) gn.getMachine();
final DualityInterface dual = ih.getInterfaceDuality();
if (gn.isActive() && dual.getConfigManager().getSetting(Settings.INTERFACE_TERMINAL) == YesNo.YES) {
src/main/java/appeng/container/implementations/MEMonitorableContainer.java
+1 -1
View File
@@ -25,7 +25,7 @@ import javax.annotation.Nonnull;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.inventory.container.IContainerListener;
import net.minecraft.item.ItemStack;
src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java
+8 -8
View File
@@ -39,15 +39,15 @@ import appeng.container.slot.MolecularAssemblerPatternSlot;
import appeng.container.slot.OutputSlot;
import appeng.container.slot.RestrictedInputSlot;
import appeng.items.misc.EncodedPatternItem;
import appeng.tile.crafting.MolecularAssemblerTileEntity;
import appeng.tile.crafting.MolecularAssemblerBlockEntity;
import appeng.util.Platform;
public class MolecularAssemblerContainer extends UpgradeableContainer implements IProgressProvider {
public static ContainerType<MolecularAssemblerContainer> TYPE;
private static final ContainerHelper<MolecularAssemblerContainer, MolecularAssemblerTileEntity> helper = new ContainerHelper<>(
MolecularAssemblerContainer::new, MolecularAssemblerTileEntity.class);
private static final ContainerHelper<MolecularAssemblerContainer, MolecularAssemblerBlockEntity> helper = new ContainerHelper<>(
MolecularAssemblerContainer::new, MolecularAssemblerBlockEntity.class);
public static MolecularAssemblerContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) {
return helper.fromNetwork(windowId, inv, buf);
@@ -58,19 +58,19 @@ public class MolecularAssemblerContainer extends UpgradeableContainer implements
}
private static final int MAX_CRAFT_PROGRESS = 100;
private final MolecularAssemblerTileEntity tma;
private final MolecularAssemblerBlockEntity tma;
@GuiSync(4)
public int craftProgress = 0;
private Slot encodedPatternSlot;
public MolecularAssemblerContainer(int id, final PlayerInventory ip, final MolecularAssemblerTileEntity te) {
public MolecularAssemblerContainer(int id, final PlayerInventory ip, final MolecularAssemblerBlockEntity te) {
super(TYPE, id, ip, te);
this.tma = te;
}
public boolean isValidItemForSlot(final int slotIndex, final ItemStack i) {
final ItemTransferable mac = this.getUpgradeable().getInventoryByName(MolecularAssemblerTileEntity.INVENTORY_MAIN);
final ItemTransferable mac = this.getUpgradeable().getInventoryByName(MolecularAssemblerBlockEntity.INVENTORY_MAIN);
final ItemStack is = mac.getStackInSlot(10);
if (is.isEmpty()) {
@@ -78,7 +78,7 @@ public class MolecularAssemblerContainer extends UpgradeableContainer implements
}
if (is.getItem() instanceof EncodedPatternItem) {
final World w = this.getTileEntity().getWorld();
final World w = this.getBlockEntity().getWorld();
final EncodedPatternItem iep = (EncodedPatternItem) is.getItem();
final ICraftingPatternDetails ph = iep.getPatternForItem(is, w);
if (ph.isCraftable()) {
@@ -99,7 +99,7 @@ public class MolecularAssemblerContainer extends UpgradeableContainer implements
int offX = 29;
int offY = 30;
final ItemTransferable mac = this.getUpgradeable().getInventoryByName(MolecularAssemblerTileEntity.INVENTORY_MAIN);
final ItemTransferable mac = this.getUpgradeable().getInventoryByName(MolecularAssemblerBlockEntity.INVENTORY_MAIN);
for (int y = 0; y < 3; y++) {
for (int x = 0; x < 3; x++) {
src/main/java/appeng/container/implementations/NetworkStatusContainer.java
+1 -1
View File
@@ -22,7 +22,7 @@ import java.io.IOException;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.item.ItemStack;
import net.minecraft.network.PacketByteBuf;
src/main/java/appeng/container/implementations/PatternTermContainer.java
+1 -1
View File
@@ -25,7 +25,7 @@ import java.util.Optional;
import alexiil.mc.lib.attributes.item.ItemTransferable;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.inventory.CraftResultInventory;
import net.minecraft.inventory.CraftingInventory;
import net.minecraft.inventory.container.ContainerType;
src/main/java/appeng/container/implementations/QNBContainer.java
+4 -4
View File
@@ -27,14 +27,14 @@ import appeng.api.config.SecurityPermissions;
import appeng.container.AEBaseContainer;
import appeng.container.ContainerLocator;
import appeng.container.slot.RestrictedInputSlot;
import appeng.tile.qnb.QuantumBridgeTileEntity;
import appeng.tile.qnb.QuantumBridgeBlockEntity;
public class QNBContainer extends AEBaseContainer {
public static ContainerType<QNBContainer> TYPE;
private static final ContainerHelper<QNBContainer, QuantumBridgeTileEntity> helper = new ContainerHelper<>(
QNBContainer::new, QuantumBridgeTileEntity.class, SecurityPermissions.BUILD);
private static final ContainerHelper<QNBContainer, QuantumBridgeBlockEntity> helper = new ContainerHelper<>(
QNBContainer::new, QuantumBridgeBlockEntity.class, SecurityPermissions.BUILD);
public static QNBContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) {
return helper.fromNetwork(windowId, inv, buf);
@@ -44,7 +44,7 @@ public class QNBContainer extends AEBaseContainer {
return helper.open(player, locator);
}
public QNBContainer(int id, final PlayerInventory ip, final QuantumBridgeTileEntity quantumBridge) {
public QNBContainer(int id, final PlayerInventory ip, final QuantumBridgeBlockEntity quantumBridge) {
super(TYPE, id, ip, quantumBridge, null);
this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.QE_SINGULARITY,
src/main/java/appeng/container/implementations/SecurityStationContainer.java
+3 -3
View File
@@ -37,7 +37,7 @@ import appeng.container.guisync.GuiSync;
import appeng.container.slot.OutputSlot;
import appeng.container.slot.RestrictedInputSlot;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.tile.misc.SecurityStationTileEntity;
import appeng.tile.misc.SecurityStationBlockEntity;
import appeng.util.inv.IAEAppEngInventory;
import appeng.util.inv.InvOperation;
@@ -55,14 +55,14 @@ public class SecurityStationContainer extends MEMonitorableContainer implements
private final RestrictedInputSlot wirelessIn;
private final OutputSlot wirelessOut;
private final SecurityStationTileEntity securityBox;
private final SecurityStationBlockEntity securityBox;
@GuiSync(0)
public int permissionMode = 0;
public SecurityStationContainer(int id, final PlayerInventory ip, final ITerminalHost monitorable) {
super(TYPE, id, ip, monitorable, false);
this.securityBox = (SecurityStationTileEntity) monitorable;
this.securityBox = (SecurityStationBlockEntity) monitorable;
this.addSlot(this.configSlot = new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.BIOMETRIC_CARD,
this.securityBox.getConfigSlot(), 0, 37, -33, ip));
src/main/java/appeng/container/implementations/SkyChestContainer.java
+5 -5
View File
@@ -26,18 +26,18 @@ import net.minecraft.network.PacketByteBuf;
import appeng.container.AEBaseContainer;
import appeng.container.ContainerLocator;
import appeng.container.slot.NormalSlot;
import appeng.tile.storage.SkyChestTileEntity;
import appeng.tile.storage.SkyChestBlockEntity;
public class SkyChestContainer extends AEBaseContainer {
public static ContainerType<SkyChestContainer> TYPE;
private static final ContainerHelper<SkyChestContainer, SkyChestTileEntity> helper = new ContainerHelper<>(
SkyChestContainer::new, SkyChestTileEntity.class);
private static final ContainerHelper<SkyChestContainer, SkyChestBlockEntity> helper = new ContainerHelper<>(
SkyChestContainer::new, SkyChestBlockEntity.class);
private final SkyChestTileEntity chest;
private final SkyChestBlockEntity chest;
public SkyChestContainer(int id, final PlayerInventory ip, final SkyChestTileEntity chest) {
public SkyChestContainer(int id, final PlayerInventory ip, final SkyChestBlockEntity chest) {
super(TYPE, id, ip, chest, null);
this.chest = chest;
src/main/java/appeng/container/implementations/SpatialIOPortContainer.java
+4 -4
View File
@@ -34,15 +34,15 @@ import appeng.container.ContainerLocator;
import appeng.container.guisync.GuiSync;
import appeng.container.slot.OutputSlot;
import appeng.container.slot.RestrictedInputSlot;
import appeng.tile.spatial.SpatialIOPortTileEntity;
import appeng.tile.spatial.SpatialIOPortBlockEntity;
import appeng.util.Platform;
public class SpatialIOPortContainer extends AEBaseContainer {
public static ContainerType<SpatialIOPortContainer> TYPE;
private static final ContainerHelper<SpatialIOPortContainer, SpatialIOPortTileEntity> helper = new ContainerHelper<>(
SpatialIOPortContainer::new, SpatialIOPortTileEntity.class, SecurityPermissions.BUILD);
private static final ContainerHelper<SpatialIOPortContainer, SpatialIOPortBlockEntity> helper = new ContainerHelper<>(
SpatialIOPortContainer::new, SpatialIOPortBlockEntity.class, SecurityPermissions.BUILD);
@GuiSync(0)
public long currentPower;
@@ -62,7 +62,7 @@ public class SpatialIOPortContainer extends AEBaseContainer {
@GuiSync(33)
public int zSize;
public SpatialIOPortContainer(int id, final PlayerInventory ip, final SpatialIOPortTileEntity spatialIOPort) {
public SpatialIOPortContainer(int id, final PlayerInventory ip, final SpatialIOPortBlockEntity spatialIOPort) {
super(TYPE, id, ip, spatialIOPort, null);
if (Platform.isServer()) {
src/main/java/appeng/container/implementations/VibrationChamberContainer.java
+6 -6
View File
@@ -28,15 +28,15 @@ import appeng.container.ContainerLocator;
import appeng.container.guisync.GuiSync;
import appeng.container.interfaces.IProgressProvider;
import appeng.container.slot.RestrictedInputSlot;
import appeng.tile.misc.VibrationChamberTileEntity;
import appeng.tile.misc.VibrationChamberBlockEntity;
import appeng.util.Platform;
public class VibrationChamberContainer extends AEBaseContainer implements IProgressProvider {
public static ContainerType<VibrationChamberContainer> TYPE;
private static final ContainerHelper<VibrationChamberContainer, VibrationChamberTileEntity> helper = new ContainerHelper<>(
VibrationChamberContainer::new, VibrationChamberTileEntity.class);
private static final ContainerHelper<VibrationChamberContainer, VibrationChamberBlockEntity> helper = new ContainerHelper<>(
VibrationChamberContainer::new, VibrationChamberBlockEntity.class);
public static VibrationChamberContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) {
return helper.fromNetwork(windowId, inv, buf);
@@ -46,14 +46,14 @@ public class VibrationChamberContainer extends AEBaseContainer implements IProgr
return helper.open(player, locator);
}
private final VibrationChamberTileEntity vibrationChamber;
private final VibrationChamberBlockEntity vibrationChamber;
@GuiSync(0)
public int burnSpeed = 0;
@GuiSync(1)
public int remainingBurnTime = 0;
public VibrationChamberContainer(int id, final PlayerInventory ip,
final VibrationChamberTileEntity vibrationChamber) {
final VibrationChamberBlockEntity vibrationChamber) {
super(TYPE, id, ip, vibrationChamber, null);
this.vibrationChamber = vibrationChamber;
@@ -85,6 +85,6 @@ public class VibrationChamberContainer extends AEBaseContainer implements IProgr
@Override
public int getMaxProgress() {
return VibrationChamberTileEntity.MAX_BURN_SPEED;
return VibrationChamberBlockEntity.MAX_BURN_SPEED;
}
}
src/main/java/appeng/container/implementations/WirelessContainer.java
+4 -4
View File
@@ -29,14 +29,14 @@ import appeng.container.ContainerLocator;
import appeng.container.guisync.GuiSync;
import appeng.container.slot.RestrictedInputSlot;
import appeng.core.AEConfig;
import appeng.tile.networking.WirelessTileEntity;
import appeng.tile.networking.WirelessBlockEntity;
public class WirelessContainer extends AEBaseContainer {
public static ContainerType<WirelessContainer> TYPE;
private static final ContainerHelper<WirelessContainer, WirelessTileEntity> helper = new ContainerHelper<>(
WirelessContainer::new, WirelessTileEntity.class, SecurityPermissions.BUILD);
private static final ContainerHelper<WirelessContainer, WirelessBlockEntity> helper = new ContainerHelper<>(
WirelessContainer::new, WirelessBlockEntity.class, SecurityPermissions.BUILD);
public static WirelessContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) {
return helper.fromNetwork(windowId, inv, buf);
@@ -52,7 +52,7 @@ public class WirelessContainer extends AEBaseContainer {
@GuiSync(2)
public long drain = 0;
public WirelessContainer(int id, final PlayerInventory ip, final WirelessTileEntity te) {
public WirelessContainer(int id, final PlayerInventory ip, final WirelessBlockEntity te) {
super(TYPE, id, ip, te, null);
this.addSlot(this.boosterSlot = new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.RANGE_BOOSTER,