diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 4fb27eb7..511ae3c7 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -477,6 +477,11 @@ tile.blockBuffer.omni.name=Omni Buffer tile.blockBuffer.creative.name=Creative Buffer tile.blockInventoryPanel.name=Inventory Panel +tile.blockInventoryPanel.tooltip.basic.line1=Remote access and crafting +tile.blockInventoryPanel.tooltip.detailed.line1=Allows remote access to inventories via +tile.blockInventoryPanel.tooltip.detailed.line2=Remote Awareness Upgrades in item conduits. +tile.blockInventoryPanel.tooltip.detailed.line3=Uses Nutrient Distillation for power. +tile.blockInventoryPanel.tooltip.detailed.line4=Offers a persistent crafting grid. enderio.gui.inventorypanel.header.crafting=Crafting grid enderio.gui.inventorypanel.header.return=Return area enderio.gui.inventorypanel.info.filter= @@ -630,6 +635,7 @@ skullZombieElectrode.name=Zombie Electrode skullZombieController.name=Z-Logic Controller skullZombieFrankenstien.name=Frank'N'Zombie skullEnderResonator.name=Ender Resonator +skullSentientEnder.name=Sentient Ender item.itemSpawnEggEnderIO.name=Spawn diff --git a/resources/assets/enderio/textures/blocks/invPanelFrontOff.png b/resources/assets/enderio/textures/blocks/invPanelFrontOff.png new file mode 100755 index 00000000..778c03c9 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/invPanelFrontOff.png differ diff --git a/resources/assets/enderio/textures/blocks/invPanelFrontOn.png b/resources/assets/enderio/textures/blocks/invPanelFrontOn.png index 46de5d03..2bbc4e6b 100644 Binary files a/resources/assets/enderio/textures/blocks/invPanelFrontOn.png and b/resources/assets/enderio/textures/blocks/invPanelFrontOn.png differ diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index 3a11bd40..1631dcfd 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -9,6 +9,7 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; +import crazypants.enderio.conduit.item.FunctionUpgrade; import crazypants.enderio.config.Config; import crazypants.enderio.item.skull.BlockEndermanSkull; import crazypants.enderio.machine.buffer.BlockItemBuffer.Type; @@ -50,6 +51,7 @@ public class MachineRecipes { ItemStack zombieController = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ZOMBIE_CONTROLLER.ordinal()); ItemStack frankenZombie = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.FRANKEN_ZOMBIE.ordinal()); ItemStack enderRes = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ENDER_RESONATOR.ordinal()); + ItemStack sentientEnder = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.SENTIENT_ENDER.ordinal()); ItemStack obsidian = new ItemStack(Blocks.obsidian); //stirling gen @@ -265,6 +267,12 @@ public class MachineRecipes { GameRegistry.addShapelessRecipe(wirelessLamp, wirelessLampInv, Blocks.redstone_torch); GameRegistry.addShapelessRecipe(wirelessLampInv, poweredLampInv, enderRes); GameRegistry.addShapelessRecipe(wirelessLampInv, wirelessLamp, Blocks.redstone_torch); + + //inventory panel + ItemStack awareness = new ItemStack(EnderIO.itemFunctionUpgrade, 1, FunctionUpgrade.INVENTORY_PANEL.ordinal()); + GameRegistry.addRecipe(new ShapedOreRecipe(awareness, "bsb", "ses", "bib", 'b', conduitBinder, 's', silicon, 'e', Items.ender_eye, 'i', electricSteel)); + ItemStack invPanel = new ItemStack(EnderIO.blockInventoryPanel); + GameRegistry.addShapedRecipe(invPanel, "dad", "psp", "dtd", 'd', darkSteel, 'a', awareness, 'p', pulCry, 's', sentientEnder, 't', basicTank); } public static void addOreDictionaryRecipes() { diff --git a/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java index a7864d25..aa7d195b 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java @@ -10,11 +10,14 @@ import crazypants.enderio.network.PacketHandler; import java.util.Random; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; public class BlockInventoryPanel extends AbstractMachineBlock { + private static final float BLOCK_SIZE = 3.0f / 16.0f; + public static BlockInventoryPanel create() { PacketHandler.INSTANCE.registerMessage(PacketItemInfo.class, PacketItemInfo.class, PacketHandler.nextID(), Side.CLIENT); PacketHandler.INSTANCE.registerMessage(PacketItemList.class, PacketItemList.class, PacketHandler.nextID(), Side.CLIENT); @@ -32,6 +35,11 @@ public class BlockInventoryPanel extends AbstractMachineBlock