Singularity item hatches

src/main/java/github/alecsio/mmceaddons/CommonProxy.java

@@ -1,18 +1,29 @@
 package github.alecsio.mmceaddons;
 
+import github.alecsio.mmceaddons.common.gui.ContainerSingularityItemBus;
 import github.alecsio.mmceaddons.common.lib.ModularMachineryAddonsBlocks;
 import github.alecsio.mmceaddons.common.registry.internal.EventHandler;
+import github.alecsio.mmceaddons.common.tile.TileSingularityItemBus;
+import hellfirepvp.modularmachinery.common.tiles.base.TileItemBus;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import net.minecraftforge.fml.common.network.IGuiHandler;
+import net.minecraftforge.fml.common.network.NetworkRegistry;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * CommonProxy handles shared mod-side logic for the server and client.
  */
-public class CommonProxy {
+public class CommonProxy implements IGuiHandler {
     public static CreativeTabs creativeTabModularMachineryAddons;
 
     private static boolean preInitCalled = false;
@@ -34,6 +45,9 @@ public ItemStack createIcon() {
 
         MinecraftForge.EVENT_BUS.register(new EventHandler());
 
+        NetworkRegistry.INSTANCE.registerGuiHandler(ModularMachineryAddons.MODID, this);
+
+
         ModularMachineryAddonsBlocks.initialise();
     }
 
@@ -43,4 +57,44 @@ public void init() {}
     public void registerItemModel(net.minecraft.item.Item item) {}
 
     public void registerBlockModel(net.minecraft.block.Block block) {}
+
+    @Nullable
+    @Override
+    public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
+        GuiType type = CommonProxy.GuiType.values()[MathHelper.clamp(ID, 0, CommonProxy.GuiType.values().length - 1)];
+        Class<? extends TileEntity> required = type.requiredTileEntity;
+        TileEntity present = null;
+        if (required != null) {
+            TileEntity te = world.getTileEntity(new BlockPos(x, y, z));
+            if (te == null || !required.isAssignableFrom(te.getClass())) {
+                return null;
+            }
+
+            present = te;
+        }
+
+        switch (type) {
+            case VACUUM_INVENTORY:
+                return new ContainerSingularityItemBus((TileItemBus) present, player);
+        }
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
+        return null;
+    }
+
+
+    public enum GuiType {
+
+        VACUUM_INVENTORY(TileSingularityItemBus.class);
+
+        public final Class<? extends TileEntity> requiredTileEntity;
+
+        GuiType(@Nullable Class<? extends TileEntity> requiredTileEntity) {
+            this.requiredTileEntity = requiredTileEntity;
+        }
+    }
 }

src/main/java/github/alecsio/mmceaddons/client/ClientProxy.java

@@ -5,15 +5,25 @@
 import github.alecsio.mmceaddons.client.render.entity.MeteorRenderFactory;
 import github.alecsio.mmceaddons.common.base.Mods;
 import github.alecsio.mmceaddons.common.entity.EntityImprovedMeteor;
+import github.alecsio.mmceaddons.common.gui.GuiContainerSingularityItemBus;
 import hellfirepvp.modularmachinery.common.block.BlockDynamicColor;
+import hellfirepvp.modularmachinery.common.block.BlockVariants;
 import hellfirepvp.modularmachinery.common.item.ItemDynamicColor;
+import hellfirepvp.modularmachinery.common.tiles.base.TileItemBus;
 import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.block.model.ModelBakery;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.client.renderer.color.BlockColors;
 import net.minecraft.client.renderer.color.ItemColors;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.world.World;
 import net.minecraftforge.client.event.ModelRegistryEvent;
 import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.common.MinecraftForge;
@@ -23,6 +33,7 @@
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.relauncher.Side;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -88,8 +99,22 @@ private void registerBlockModels() {
         BLOCK_MODELS_TO_REGISTER.forEach(block -> {
             ModularMachineryAddons.logger.info("Registering block model for " + block.getRegistryName());
             Item item = Item.getItemFromBlock(block);
-            ModelBakery.registerItemVariants(item, block.getRegistryName());
-            ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(block.getRegistryName(), "inventory"));
+            if (block instanceof BlockVariants variantsBlock) {
+                for (IBlockState state : variantsBlock.getValidStates()) {
+                    String unlocName = block.getRegistryName().getPath();
+                    String name = unlocName + "_" + variantsBlock.getBlockStateName(state);
+                    ModelBakery.registerItemVariants(item, new ResourceLocation(ModularMachineryAddons.MODID, name));
+                    ModelLoader.setCustomModelResourceLocation(item, block.getMetaFromState(state),
+                            new ModelResourceLocation(ModularMachineryAddons.MODID + ":" + name, "inventory"));
+                }
+            } else {
+                ModelBakery.registerItemVariants(item, block.getRegistryName());
+                ModelLoader.setCustomModelResourceLocation(
+                        item,
+                        0,
+                        new ModelResourceLocation(block.getRegistryName(), "inventory")
+                );
+            }
         });
     }
 
@@ -102,4 +127,25 @@ private void registerItemModels() {
     }
 
 
+    @Nullable
+    @Override
+    public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
+        GuiType type = CommonProxy.GuiType.values()[MathHelper.clamp(ID, 0, CommonProxy.GuiType.values().length - 1)];
+        Class<? extends TileEntity> required = type.requiredTileEntity;
+        TileEntity present = null;
+        if (required != null) {
+            TileEntity te = world.getTileEntity(new BlockPos(x, y, z));
+            if (te == null || !required.isAssignableFrom(te.getClass())) {
+                return null;
+            }
+
+            present = te;
+        }
+
+        switch (type) {
+            case VACUUM_INVENTORY:
+                return new GuiContainerSingularityItemBus((TileItemBus) present, player);
+        }
+        return null;
+    }
 }

src/main/java/github/alecsio/mmceaddons/common/block/BlockSingularityItemBus.java

@@ -0,0 +1,26 @@
+package github.alecsio.mmceaddons.common.block;
+
+import github.alecsio.mmceaddons.CommonProxy;
+import github.alecsio.mmceaddons.ModularMachineryAddons;
+import hellfirepvp.modularmachinery.common.block.BlockBus;
+import hellfirepvp.modularmachinery.common.tiles.base.TileItemBus;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+abstract public class BlockSingularityItemBus extends BlockBus {
+    public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
+        if (!worldIn.isRemote) {
+            TileEntity te = worldIn.getTileEntity(pos);
+            if (te instanceof TileItemBus) {
+                playerIn.openGui(ModularMachineryAddons.MODID, CommonProxy.GuiType.VACUUM_INVENTORY.ordinal(), worldIn, pos.getX(), pos.getY(), pos.getZ());
+            }
+        }
+
+        return true;
+    }
+}

src/main/java/github/alecsio/mmceaddons/common/block/BlockSingularityItemInputBus.java

@@ -0,0 +1,16 @@
+package github.alecsio.mmceaddons.common.block;
+
+import github.alecsio.mmceaddons.common.tile.TileSingularityItemInputBus;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
+import javax.annotation.Nullable;
+
+public class BlockSingularityItemInputBus extends BlockSingularityItemBus {
+    @Nullable
+    @Override
+    public TileEntity createTileEntity(World world, IBlockState iBlockState) {
+        return new TileSingularityItemInputBus(iBlockState.getValue(BUS_TYPE));
+    }
+}

src/main/java/github/alecsio/mmceaddons/common/block/BlockSingularityItemOutputBus.java

@@ -0,0 +1,16 @@
+package github.alecsio.mmceaddons.common.block;
+
+import github.alecsio.mmceaddons.common.tile.TileSingularityItemOutputBus;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
+import javax.annotation.Nullable;
+
+public class BlockSingularityItemOutputBus extends BlockSingularityItemBus {
+    @Nullable
+    @Override
+    public TileEntity createTileEntity(World world, IBlockState iBlockState) {
+        return new TileSingularityItemOutputBus(iBlockState.getValue(BUS_TYPE));
+    }
+}

src/main/java/github/alecsio/mmceaddons/common/gui/ContainerSingularityItemBus.java

@@ -0,0 +1,51 @@
+package github.alecsio.mmceaddons.common.gui;
+
+import github.alecsio.mmceaddons.util.SingularitySlotItemHandler;
+import hellfirepvp.modularmachinery.common.container.ContainerItemBus;
+import hellfirepvp.modularmachinery.common.tiles.base.TileItemBus;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.ClickType;
+import net.minecraft.item.ItemStack;
+
+import javax.annotation.Nonnull;
+
+public class ContainerSingularityItemBus extends ContainerItemBus {
+    public ContainerSingularityItemBus(
+            TileItemBus owner,
+            EntityPlayer opening
+    ) {
+        super(owner, opening);
+    }
+
+
+    @Nonnull
+    @Override
+    public ItemStack slotClick(int slotId, int dragType, @Nonnull ClickType clickTypeIn, EntityPlayer player) {
+        InventoryPlayer inventoryplayer = player.inventory;
+        if (slotId > 0 && this.inventorySlots.get(slotId) instanceof SingularitySlotItemHandler singularitySlot && clickTypeIn == ClickType.PICKUP && (dragType == 0 || dragType == 1)) {
+            ItemStack heldStack = inventoryplayer.getItemStack();
+            ItemStack inventoryStack = singularitySlot.getStack();
+
+
+            if (
+                    !heldStack.isEmpty() && !inventoryStack.isEmpty() &&
+                            heldStack.getItem() == inventoryStack.getItem() && heldStack.getMetadata() == inventoryStack.getMetadata() && ItemStack.areItemStackTagsEqual(
+                            heldStack,
+                            inventoryStack
+                    )) {
+                int amountToDrop = dragType == 0 ? heldStack.getCount() : 1;
+
+                if (amountToDrop > singularitySlot.getItemStackLimit(heldStack) - inventoryStack.getCount()) {
+                    amountToDrop = singularitySlot.getItemStackLimit(heldStack) - inventoryStack.getCount();
+                }
+
+                ItemStack toReturn = heldStack.copy();
+                heldStack.shrink(amountToDrop);
+                inventoryStack.grow(amountToDrop);
+                return toReturn;
+            }
+        }
+        return super.slotClick(slotId, dragType, clickTypeIn, player);
+    }
+}

src/main/java/github/alecsio/mmceaddons/common/gui/GuiContainerSingularityItemBus.java

@@ -0,0 +1,31 @@
+package github.alecsio.mmceaddons.common.gui;
+
+import hellfirepvp.modularmachinery.client.gui.GuiContainerBase;
+import hellfirepvp.modularmachinery.common.block.prop.ItemBusSize;
+import hellfirepvp.modularmachinery.common.container.ContainerItemBus;
+import hellfirepvp.modularmachinery.common.tiles.base.TileItemBus;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.ResourceLocation;
+
+public class GuiContainerSingularityItemBus extends GuiContainerBase<ContainerItemBus> {
+    public GuiContainerSingularityItemBus(TileItemBus itemBus, EntityPlayer opening) {
+        super(new ContainerSingularityItemBus(itemBus, opening));
+    }
+
+    private ResourceLocation getTextureInventory() {
+        ItemBusSize size = this.container.getOwner().getSize();
+        return new ResourceLocation("modularmachinery", "textures/gui/inventory_" + size.name().toLowerCase() + ".png");
+    }
+
+    protected void setWidthHeight() {
+    }
+
+    protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
+        GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+        this.mc.getTextureManager().bindTexture(this.getTextureInventory());
+        int i = (this.width - this.xSize) / 2;
+        int j = (this.height - this.ySize) / 2;
+        this.drawTexturedModalRect(i, j, 0, 0, this.xSize, this.ySize);
+    }
+}

src/main/java/github/alecsio/mmceaddons/common/lib/ModularMachineryAddonsBlocks.java

@@ -3,6 +3,8 @@
 
 import github.alecsio.mmceaddons.common.block.BlockBiomeProviderInput;
 import github.alecsio.mmceaddons.common.block.BlockDimensionProviderInput;
+import github.alecsio.mmceaddons.common.block.BlockSingularityItemInputBus;
+import github.alecsio.mmceaddons.common.block.BlockSingularityItemOutputBus;
 import github.alecsio.mmceaddons.common.block.ae2.BlockMEEssentiaInputBus;
 import github.alecsio.mmceaddons.common.block.ae2.BlockMEEssentiaOutputBus;
 import github.alecsio.mmceaddons.common.block.bloodmagic.BlockMeteorProviderOutput;
@@ -45,6 +47,9 @@ public class ModularMachineryAddonsBlocks {
     public static BlockVisProviderInput blockVisProviderInput;
     public static BlockVisProviderOutput blockVisProviderOutput;
 
+    public static BlockSingularityItemInputBus blockSingularityItemInput;
+    public static BlockSingularityItemOutputBus blockSingularityItemOutput;
+
     public static void initialise() {
     }
 }

src/main/java/github/alecsio/mmceaddons/common/mixin/ContainerMixin.java

@@ -0,0 +1,17 @@
+package github.alecsio.mmceaddons.common.mixin;
+
+import github.alecsio.mmceaddons.util.SingularitySlotItemHandler;
+import net.minecraftforge.items.IItemHandler;
+import net.minecraftforge.items.SlotItemHandler;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(value = hellfirepvp.modularmachinery.common.container.ContainerItemBus.class)
+public class ContainerMixin {
+
+    @Redirect(method = "addInventorySlots(Lnet/minecraftforge/items/IItemHandlerModifiable;Lhellfirepvp/modularmachinery/common/block/prop/ItemBusSize;)V", at = @At(value = "NEW", target = "(Lnet/minecraftforge/items/IItemHandler;III)Lnet/minecraftforge/items/SlotItemHandler;"), remap=false)
+    public SlotItemHandler replaceSlotItemHandlers(IItemHandler itemHandler, int index, int xPosition, int yPosition) {
+        return new SingularitySlotItemHandler(itemHandler, index, xPosition, yPosition);
+    }
+}

src/main/java/github/alecsio/mmceaddons/common/registry/RegistryBlocks.java

@@ -4,6 +4,8 @@
 import github.alecsio.mmceaddons.common.base.Mods;
 import github.alecsio.mmceaddons.common.block.BlockBiomeProviderInput;
 import github.alecsio.mmceaddons.common.block.BlockDimensionProviderInput;
+import github.alecsio.mmceaddons.common.block.BlockSingularityItemInputBus;
+import github.alecsio.mmceaddons.common.block.BlockSingularityItemOutputBus;
 import github.alecsio.mmceaddons.common.block.ae2.BlockMEEssentiaInputBus;
 import github.alecsio.mmceaddons.common.block.ae2.BlockMEEssentiaOutputBus;
 import github.alecsio.mmceaddons.common.block.bloodmagic.BlockMeteorProviderOutput;
@@ -19,6 +21,8 @@
 import github.alecsio.mmceaddons.common.lib.ModularMachineryAddonsBlocks;
 import github.alecsio.mmceaddons.common.tile.TileBiomeProvider;
 import github.alecsio.mmceaddons.common.tile.TileDimensionProvider;
+import github.alecsio.mmceaddons.common.tile.TileSingularityItemInputBus;
+import github.alecsio.mmceaddons.common.tile.TileSingularityItemOutputBus;
 import github.alecsio.mmceaddons.common.tile.bloodmagic.TileMeteorProvider;
 import github.alecsio.mmceaddons.common.tile.bloodmagic.TileWillMultiChunkProvider;
 import github.alecsio.mmceaddons.common.tile.nuclearcraft.TileRadiationProvider;
@@ -107,6 +111,13 @@ private static void registerBlocks() {
         // Always register
         prepareItemBlockRegister(ModularMachineryAddonsBlocks.blockBiomeProviderInput);
         prepareItemBlockRegister(ModularMachineryAddonsBlocks.blockDimensionProviderInput);
+
+        // Singularity Item Buses: always registered:
+        ModularMachineryAddonsBlocks.blockSingularityItemInput = prepareRegister(new BlockSingularityItemInputBus());
+        ModularMachineryAddonsBlocks.blockSingularityItemOutput = prepareRegister(new BlockSingularityItemOutputBus());
+        prepareItemBlockRegister(ModularMachineryAddonsBlocks.blockSingularityItemInput);
+        prepareItemBlockRegister(ModularMachineryAddonsBlocks.blockSingularityItemOutput);
+
     }
 
     private static void registerTileEntities() {
@@ -137,6 +148,8 @@ private static void registerTileEntities() {
         // Always present
         registerTileEntity(TileBiomeProvider.class);
         registerTileEntity(TileDimensionProvider.class);
+        registerTileEntity(TileSingularityItemInputBus.class);
+        registerTileEntity(TileSingularityItemOutputBus.class);
     }
 
     /**