All GUI compile errors fixed, switched to excludes over includes in gradle build and lots, LOTS of more fixes.

2020-06-06 21:16:05 +02:00
parent bb453b0d35
commit ff042a394b
209 changed files with 4527 additions and 4479 deletions
@@ -0,0 +1,110 @@
+package appeng.container.helper;
+
+import appeng.api.config.SecurityPermissions;
+import appeng.api.parts.IPart;
+import appeng.api.parts.IPartHost;
+import appeng.container.AEBaseContainer;
+import appeng.container.ContainerLocator;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.entity.player.ServerPlayerEntity;
+import net.minecraft.inventory.container.INamedContainerProvider;
+import net.minecraft.inventory.container.SimpleNamedContainerProvider;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraftforge.fml.network.NetworkHooks;
+
+/**
+ * Helper for containers that can be opened for {@link appeng.api.parts.IPart parts} that are attached
+ * to a {@link appeng.api.parts.IPartHost part host}.
+ *
+ * @param <C>
+ * @param <P> The type of part this container is for.
+ */
+public final class PartContainerHelper<C extends AEBaseContainer, P extends IPart> {
+
+    private final Class<P> partClass;
+
+    private final ContainerFactory<P, C> factory;
+
+    private final SecurityPermissions requiredPermission;
+
+    public PartContainerHelper(ContainerFactory<P, C> factory, Class<P> partClass) {
+        this(factory, partClass, null);
+    }
+
+    public PartContainerHelper(ContainerFactory<P, C> factory, Class<P> partClass, SecurityPermissions requiredPermission) {
+        this.partClass = partClass;
+        this.factory = factory;
+        this.requiredPermission = requiredPermission;
+    }
+
+    /**
+     * Opens a container that is based around a single tile entity.
+     * The tile entity's position is encoded in the packet buffer.
+     */
+    public C fromNetwork(int windowId, PlayerInventory inv, PacketBuffer packetBuf) {
+        BlockPos pos = packetBuf.readBlockPos();
+        TileEntity te = inv.player.world.getTileEntity(pos);
+        if (partClass.isInstance(te)) {
+            return factory.create(windowId, inv, partClass.cast(te));
+        }
+        return null;
+    }
+
+    public boolean open(PlayerEntity player, ContainerLocator locator) {
+        if (!(player instanceof ServerPlayerEntity)) {
+            // Cannot open containers on the client or for non-players
+            // FIXME logging?
+            return false;
+        }
+
+        if (!locator.hasBlockPos() || !locator.hasSide()) {
+            return false; // No block was clicked or the side is unknown
+            // FIXME: If no side is provided, should be try with INTERNAL???
+        }
+
+        TileEntity tileEntity = player.world.getTileEntity(locator.getBlockPos());
+        if (!(tileEntity instanceof IPartHost)) {
+            // FIXME logging?
+            return false; // Wrong tile entity at block position
+        }
+        IPartHost partHost = (IPartHost) tileEntity;
+        IPart part = partHost.getPart(locator.getSide());
+        if (!(partClass.isInstance(part))) {
+            // FIXME logging?
+            return false;
+        }
+        P actualPart = partClass.cast(tileEntity);
+
+        // Use block name at position
+        // FIXME: this is not right, we'd need to check the part's item stack, or custom naming interface impl
+        ITextComponent title = player.world.getBlockState(locator.getBlockPos()).getBlock().getNameTextComponent();
+
+        // FIXME: Check permissions...
+        if (requiredPermission != null) {
+            throw new IllegalStateException(); // NOT YET IMPLEMENTED
+        }
+
+        INamedContainerProvider container = new SimpleNamedContainerProvider(
+                (wnd, p, pl) -> {
+                    C c = factory.create(wnd, p, actualPart);
+                    // Set the original locator on the opened server-side container for it to more
+                    // easily remember how to re-open after being closed.
+                    c.setLocator(locator);
+                    return c;
+                }, title
+        );
+        NetworkHooks.openGui((ServerPlayerEntity) player, container, locator.getBlockPos());
+
+        return true;
+    }
+
+    @FunctionalInterface
+    public interface ContainerFactory<T, C> {
+        C create(int windowId, PlayerInventory playerInv, T part);
+    }
+
+}
@@ -0,0 +1,119 @@
+package appeng.container.helper;
+
+import appeng.api.config.SecurityPermissions;
+import appeng.api.parts.IPart;
+import appeng.api.parts.IPartHost;
+import appeng.container.AEBaseContainer;
+import appeng.container.ContainerLocator;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.entity.player.ServerPlayerEntity;
+import net.minecraft.inventory.container.INamedContainerProvider;
+import net.minecraft.inventory.container.SimpleNamedContainerProvider;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraftforge.fml.network.NetworkHooks;
+
+/**
+ * Helper for containers that can be opened for a part <em>or</em> tile given that either
+ * implements a given interface.
+ *
+ * @param <C>
+ */
+// FIXME: This is also used in contexts where access is via an item that implements I or exposes I via IGuiItemObject
+public final class PartOrTileContainerHelper<C extends AEBaseContainer, I> {
+
+    private final Class<I> interfaceClass;
+
+    private final ContainerFactory<C, I> factory;
+
+    private final SecurityPermissions requiredPermission;
+
+    public PartOrTileContainerHelper(ContainerFactory<C, I> factory, Class<I> interfaceClass) {
+        this(factory, interfaceClass, null);
+    }
+
+    public PartOrTileContainerHelper(ContainerFactory<C, I> factory, Class<I> interfaceClass, SecurityPermissions requiredPermission) {
+        this.interfaceClass = interfaceClass;
+        this.factory = factory;
+        this.requiredPermission = requiredPermission;
+    }
+
+    /**
+     * Opens a container that is based around a single tile entity.
+     * The tile entity's position is encoded in the packet buffer.
+     */
+    public C fromNetwork(int windowId, PlayerInventory inv, PacketBuffer packetBuf) {
+        I host = getHostFromLocator(inv.player, ContainerLocator.read(packetBuf));
+        if (host != null) {
+            return factory.create(windowId, inv, host);
+        }
+        return null;
+    }
+
+    public boolean open(PlayerEntity player, ContainerLocator locator) {
+        if (!(player instanceof ServerPlayerEntity)) {
+            // Cannot open containers on the client or for non-players
+            // FIXME logging?
+            return false;
+        }
+
+        I accessInterface = getHostFromLocator(player, locator);
+
+        // Use block name at position
+        // FIXME: this is not right, we'd need to check the part's item stack, or custom naming interface impl
+        // FIXME: Should move this up, because at this point, it's hard to know where the terminal host came from (part or tile)
+        ITextComponent title = player.world.getBlockState(locator.getBlockPos()).getBlock().getNameTextComponent();
+
+        // FIXME: Check permissions...
+        if (requiredPermission != null) {
+            throw new IllegalStateException(); // NOT YET IMPLEMENTED
+        }
+
+        INamedContainerProvider container = new SimpleNamedContainerProvider(
+                (wnd, p, pl) -> {
+                    C c = factory.create(wnd, p, accessInterface);
+                    // Set the original locator on the opened server-side container for it to more
+                    // easily remember how to re-open after being closed.
+                    c.setLocator(locator);
+                    return c;
+                }, title
+        );
+        NetworkHooks.openGui((ServerPlayerEntity) player, container, locator.getBlockPos());
+
+        return true;
+    }
+
+    private I getHostFromLocator(PlayerEntity player, ContainerLocator locator) {
+        if (!locator.hasBlockPos() || !locator.hasSide()) {
+            return null; // No block was clicked or the side is unknown
+            // FIXME: If no side is provided, should be try with INTERNAL???
+        }
+
+        TileEntity tileEntity = player.world.getTileEntity(locator.getBlockPos());
+        // The tile entity itself can host a terminal (i.e. Chest!)
+        if (interfaceClass.isInstance(tileEntity)) {
+            return interfaceClass.cast(tileEntity);
+        } else if (tileEntity instanceof IPartHost) {
+            // But it could also be a part attached to the tile entity
+            IPartHost partHost = (IPartHost) tileEntity;
+            IPart part = partHost.getPart(locator.getSide());
+            if (interfaceClass.isInstance(part)) {
+                return interfaceClass.cast(part);
+            } else {
+                // FIXME: Logging?
+                return null;
+            }
+        } else {
+            // FIXME: Logging? Dont know how to obtain the terminal host
+            return null;
+        }
+    }
+
+    @FunctionalInterface
+    public interface ContainerFactory<C, I> {
+        C create(int windowId, PlayerInventory playerInv, I accessObj);
+    }
+
+}
@@ -0,0 +1,91 @@
+package appeng.container.helper;
+
+import appeng.api.config.SecurityPermissions;
+import appeng.container.AEBaseContainer;
+import appeng.container.ContainerLocator;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.entity.player.ServerPlayerEntity;
+import net.minecraft.inventory.container.INamedContainerProvider;
+import net.minecraft.inventory.container.SimpleNamedContainerProvider;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraftforge.fml.network.NetworkHooks;
+
+public final class TileContainerHelper<C extends AEBaseContainer, T extends TileEntity> {
+
+    private final Class<T> tileEntityClass;
+
+    private final ContainerFactory<T, C> factory;
+
+    private final SecurityPermissions requiredPermission;
+
+    public TileContainerHelper(ContainerFactory<T, C> factory, Class<T> tileEntityClass) {
+        this(factory, tileEntityClass, null);
+    }
+
+    public TileContainerHelper(ContainerFactory<T, C> factory, Class<T> tileEntityClass, SecurityPermissions requiredPermission) {
+        this.tileEntityClass = tileEntityClass;
+        this.factory = factory;
+        this.requiredPermission = requiredPermission;
+    }
+
+    /**
+     * Opens a container that is based around a single tile entity.
+     * The tile entity's position is encoded in the packet buffer.
+     */
+    public C fromNetwork(int windowId, PlayerInventory inv, PacketBuffer packetBuf) {
+        BlockPos pos = packetBuf.readBlockPos();
+        TileEntity te = inv.player.world.getTileEntity(pos);
+        if (tileEntityClass.isInstance(te)) {
+            return factory.create(windowId, inv, tileEntityClass.cast(te));
+        }
+        return null;
+    }
+
+    public boolean open(PlayerEntity player, ContainerLocator locator) {
+        if (!(player instanceof ServerPlayerEntity)) {
+            // Cannot open containers on the client or for non-players
+            return false;
+        }
+
+        if (!locator.hasBlockPos()) {
+            return false; // No block was clicked
+        }
+
+        TileEntity tileEntity = player.world.getTileEntity(locator.getBlockPos());
+        if (!tileEntityClass.isInstance(tileEntity)) {
+            return false; // Wrong tile entity at block position
+        }
+        T te = tileEntityClass.cast(tileEntity);
+
+        // Use block name at position
+        ITextComponent title = player.world.getBlockState(locator.getBlockPos()).getBlock().getNameTextComponent();
+
+        // FIXME: Check permissions...
+        if (requiredPermission != null) {
+            throw new IllegalStateException(); // NOT YET IMPLEMENTED
+        }
+
+        INamedContainerProvider container = new SimpleNamedContainerProvider(
+                (wnd, p, pl) -> {
+                    C c = factory.create(wnd, p, te);
+                    // Set the original locator on the opened server-side container for it to more
+                    // easily remember how to re-open after being closed.
+                    c.setLocator(locator);
+                    return c;
+                }, title
+        );
+        NetworkHooks.openGui((ServerPlayerEntity) player, container, locator.getBlockPos());
+
+        return true;
+    }
+
+    @FunctionalInterface
+    public interface ContainerFactory<T, C> {
+        C create(int windowId, PlayerInventory playerInv, T tileEntity);
+    }
+
+}