diff --git a/src/main/java/dan200/computercraft/ComputerCraft.java b/src/main/java/dan200/computercraft/ComputerCraft.java index 95c468b06..633f7abfd 100644 --- a/src/main/java/dan200/computercraft/ComputerCraft.java +++ b/src/main/java/dan200/computercraft/ComputerCraft.java @@ -53,9 +53,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; import net.minecraft.server.MinecraftServer; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; @@ -366,14 +367,14 @@ public static void openTurtleGUI( EntityPlayer player, TileTurtle turtle ) player.openGui( instance, ComputerCraft.turtleGUIID, player.getEntityWorld(), pos.getX(), pos.getY(), pos.getZ() ); } - public static void openPrintoutGUI( EntityPlayer player ) + public static void openPrintoutGUI( EntityPlayer player, EnumHand hand ) { - player.openGui( ComputerCraft.instance, ComputerCraft.printoutGUIID, player.getEntityWorld(), 0, 0, 0 ); + player.openGui( ComputerCraft.instance, ComputerCraft.printoutGUIID, player.getEntityWorld(), hand.ordinal(), 0, 0 ); } - public static void openPocketComputerGUI( EntityPlayer player ) + public static void openPocketComputerGUI( EntityPlayer player, EnumHand hand ) { - player.openGui( ComputerCraft.instance, ComputerCraft.pocketComputerGUIID, player.getEntityWorld(), 0, 0, 0 ); + player.openGui( ComputerCraft.instance, ComputerCraft.pocketComputerGUIID, player.getEntityWorld(), hand.ordinal(), 0, 0 ); } public static File getBaseDir() diff --git a/src/main/java/dan200/computercraft/client/proxy/ComputerCraftProxyClient.java b/src/main/java/dan200/computercraft/client/proxy/ComputerCraftProxyClient.java index 70e3ed6cb..58ce252e5 100644 --- a/src/main/java/dan200/computercraft/client/proxy/ComputerCraftProxyClient.java +++ b/src/main/java/dan200/computercraft/client/proxy/ComputerCraftProxyClient.java @@ -34,11 +34,11 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.server.MinecraftServer; +import net.minecraft.util.EnumHand; +import net.minecraft.util.IThreadListener; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.IThreadListener; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderHandEvent; @@ -176,7 +176,7 @@ public ModelResourceLocation getModelLocation( ItemStack stack ) "advanced_pocket_computer_off", "advanced_pocket_computer_on", "advanced_pocket_computer_blinking", "advanced_pocket_computer_on_modem_on", "advanced_pocket_computer_blinking_modem_on", } ); - // Setup item colours + // Setup mc.getItemColors().registerItemColorHandler(new DiskColorHandler(ComputerCraft.Items.disk), ComputerCraft.Items.disk); mc.getItemColors().registerItemColorHandler(new DiskColorHandler(ComputerCraft.Items.diskExpanded), ComputerCraft.Items.diskExpanded); @@ -312,9 +312,9 @@ public Object getTurtleGUI( InventoryPlayer inventory, TileTurtle turtle ) } @Override - public Object getPrintoutGUI( InventoryPlayer inventory ) + public Object getPrintoutGUI( EntityPlayer player, EnumHand hand ) { - ContainerHeldItem container = new ContainerHeldItem( inventory ); + ContainerHeldItem container = new ContainerHeldItem( player, hand ); if( container.getStack() != null && container.getStack().getItem() instanceof ItemPrintout ) { return new GuiPrintout( container ); @@ -323,9 +323,9 @@ public Object getPrintoutGUI( InventoryPlayer inventory ) } @Override - public Object getPocketComputerGUI( InventoryPlayer inventory ) + public Object getPocketComputerGUI( EntityPlayer player, EnumHand hand ) { - ContainerHeldItem container = new ContainerHeldItem( inventory ); + ContainerHeldItem container = new ContainerHeldItem( player, hand ); if( container.getStack() != null && container.getStack().getItem() instanceof ItemPocketComputer ) { return new GuiPocketComputer( container ); diff --git a/src/main/java/dan200/computercraft/server/proxy/ComputerCraftProxyServer.java b/src/main/java/dan200/computercraft/server/proxy/ComputerCraftProxyServer.java index 4655c4ac3..b7cc31e53 100644 --- a/src/main/java/dan200/computercraft/server/proxy/ComputerCraftProxyServer.java +++ b/src/main/java/dan200/computercraft/server/proxy/ComputerCraftProxyServer.java @@ -12,7 +12,9 @@ import dan200.computercraft.shared.peripheral.printer.TilePrinter; import dan200.computercraft.shared.proxy.ComputerCraftProxyCommon; import dan200.computercraft.shared.turtle.blocks.TileTurtle; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.EnumHand; import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -88,13 +90,13 @@ public Object getPrinterGUI( InventoryPlayer inventory, TilePrinter printer ) } @Override - public Object getPrintoutGUI( InventoryPlayer inventory ) + public Object getPrintoutGUI( EntityPlayer player, EnumHand hand ) { return null; } @Override - public Object getPocketComputerGUI( InventoryPlayer inventory ) + public Object getPocketComputerGUI( EntityPlayer player, EnumHand hand ) { return null; } diff --git a/src/main/java/dan200/computercraft/shared/media/inventory/ContainerHeldItem.java b/src/main/java/dan200/computercraft/shared/media/inventory/ContainerHeldItem.java index f31365429..d19b9b7c5 100644 --- a/src/main/java/dan200/computercraft/shared/media/inventory/ContainerHeldItem.java +++ b/src/main/java/dan200/computercraft/shared/media/inventory/ContainerHeldItem.java @@ -8,19 +8,19 @@ import dan200.computercraft.shared.util.InventoryUtil; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumHand; public class ContainerHeldItem extends Container { private final ItemStack m_stack; - private final int m_slot; + private final EnumHand m_hand; - public ContainerHeldItem( InventoryPlayer player ) + public ContainerHeldItem( EntityPlayer player, EnumHand hand ) { - m_slot = player.currentItem; - m_stack = InventoryUtil.copyItem( player.getStackInSlot( m_slot ) ); + m_hand = hand; + m_stack = InventoryUtil.copyItem( player.getHeldItem( hand ) ); } public ItemStack getStack() @@ -33,7 +33,7 @@ public boolean canInteractWith( EntityPlayer player ) { if( player != null && player.isEntityAlive() ) { - ItemStack stack = player.inventory.getStackInSlot( m_slot ); + ItemStack stack = player.getHeldItem( m_hand ); if( (stack == m_stack) || (stack != null && m_stack != null && stack.getItem() == m_stack.getItem()) ) { return true; diff --git a/src/main/java/dan200/computercraft/shared/media/items/ItemPrintout.java b/src/main/java/dan200/computercraft/shared/media/items/ItemPrintout.java index 6aed1d791..336a6edc0 100644 --- a/src/main/java/dan200/computercraft/shared/media/items/ItemPrintout.java +++ b/src/main/java/dan200/computercraft/shared/media/items/ItemPrintout.java @@ -20,11 +20,11 @@ import java.util.List; public class ItemPrintout extends Item -{ +{ public static final int LINES_PER_PAGE = 21; public static final int LINE_MAX_LENGTH = 25; public static final int MAX_PAGES = 16; - + public enum Type { Single, @@ -39,7 +39,7 @@ public ItemPrintout() setUnlocalizedName( "computercraft:page" ); setCreativeTab( ComputerCraft.mainCreativeTab ); } - + @Override public void getSubItems( Item itemID, CreativeTabs tabs, List list ) { @@ -47,7 +47,7 @@ public void getSubItems( Item itemID, CreativeTabs tabs, List list ) list.add( createMultipleFromTitleAndText( null, new String[ 2*LINES_PER_PAGE ], new String[ 2*LINES_PER_PAGE ] ) ); list.add( createBookFromTitleAndText( null, new String[ 2*LINES_PER_PAGE ], new String[ 2*LINES_PER_PAGE ] ) ); } - + @Override public void addInformation( ItemStack itemstack, EntityPlayer par2EntityPlayer, List list, boolean flag ) { @@ -57,7 +57,7 @@ public void addInformation( ItemStack itemstack, EntityPlayer par2EntityPlayer, list.add( title ); } } - + @Override public String getUnlocalizedName( ItemStack stack ) { @@ -79,18 +79,17 @@ public String getUnlocalizedName( ItemStack stack ) } } } - + @Override public ActionResult onItemRightClick( ItemStack stack, World world, EntityPlayer player, EnumHand hand ) { if( !world.isRemote ) { - ComputerCraft.openPrintoutGUI( player ); - return new ActionResult( EnumActionResult.SUCCESS, stack ); + ComputerCraft.openPrintoutGUI( player, hand ); } - return new ActionResult( EnumActionResult.PASS, stack ); + return new ActionResult( EnumActionResult.SUCCESS, stack ); } - + private static ItemStack createFromTitleAndText( Type type, String title, String[] text, String[] colours ) { // Calculate damage @@ -150,12 +149,12 @@ private static ItemStack createFromTitleAndText( Type type, String title, String // Return stack return stack; } - + public static ItemStack createSingleFromTitleAndText( String title, String[] text, String[] colours ) { return createFromTitleAndText( Type.Single, title, text, colours ); } - + public static ItemStack createMultipleFromTitleAndText( String title, String[] text, String[] colours ) { return createFromTitleAndText( Type.Multiple, title, text, colours ); @@ -196,7 +195,7 @@ public static String getTitle( ItemStack stack ) } return null; } - + public static int getPageCount( ItemStack stack ) { NBTTagCompound nbt = stack.getTagCompound(); @@ -206,7 +205,7 @@ public static int getPageCount( ItemStack stack ) } return 1; } - + public static String[] getText( ItemStack stack ) { NBTTagCompound nbt = stack.getTagCompound(); @@ -224,8 +223,8 @@ public static String[] getText( ItemStack stack ) } } return lines; - } - + } + public static String[] getColours( ItemStack stack ) { NBTTagCompound nbt = stack.getTagCompound(); diff --git a/src/main/java/dan200/computercraft/shared/pocket/items/ItemPocketComputer.java b/src/main/java/dan200/computercraft/shared/pocket/items/ItemPocketComputer.java index 35170df87..484c9ecdc 100644 --- a/src/main/java/dan200/computercraft/shared/pocket/items/ItemPocketComputer.java +++ b/src/main/java/dan200/computercraft/shared/pocket/items/ItemPocketComputer.java @@ -30,11 +30,13 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.SoundEvent; -import net.minecraft.util.text.translation.I18n;; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import java.util.List; +; + public class ItemPocketComputer extends Item implements IComputerItem, IMedia { public ItemPocketComputer() @@ -169,10 +171,9 @@ public ActionResult onItemRightClick( ItemStack stack, World world, E { computer.turnOn(); } - ComputerCraft.openPocketComputerGUI( player ); - return new ActionResult( EnumActionResult.SUCCESS, stack ); + ComputerCraft.openPocketComputerGUI( player, hand ); } - return new ActionResult( EnumActionResult.PASS, stack ); + return new ActionResult( EnumActionResult.SUCCESS, stack ); } @Override diff --git a/src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java b/src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java index ab288aa7e..4bafb6f5d 100644 --- a/src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java +++ b/src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java @@ -63,6 +63,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.Packet; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; import net.minecraft.util.IThreadListener; import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; @@ -86,7 +87,7 @@ public abstract class ComputerCraftProxyCommon implements IComputerCraftProxy public ComputerCraftProxyCommon() { } - + // IComputerCraftProxy implementation @Override @@ -94,17 +95,17 @@ public void preInit() { registerItems(); } - - @Override + + @Override public void init() { registerTileEntities(); registerForgeHandlers(); } - + @Override public abstract boolean isClient(); - + @Override public abstract boolean getGlobalCursorBlink(); @@ -118,12 +119,12 @@ public void deleteDisplayLists( int list, int range ) @Override public abstract Object getFixedWidthFontRenderer(); - + @Override public String getRecordInfo( ItemStack recordStack ) { Item item = recordStack.getItem(); - if( item instanceof ItemRecord ) + if (item instanceof ItemRecord) { ItemRecord record = (ItemRecord) item; String key = ObfuscationReflectionHelper.getPrivateValue( ItemRecord.class, record, "field_185077_c" ); @@ -131,13 +132,13 @@ public String getRecordInfo( ItemStack recordStack ) } return null; } - + @Override public abstract void playRecord( SoundEvent record, String recordInfo, World world, BlockPos pos ); - + @Override public abstract Object getDiskDriveGUI( InventoryPlayer inventory, TileDiskDrive drive ); - + @Override public abstract Object getComputerGUI( TileComputer computer ); @@ -148,24 +149,23 @@ public String getRecordInfo( ItemStack recordStack ) public abstract Object getTurtleGUI( InventoryPlayer inventory, TileTurtle turtle ); @Override - public abstract Object getPrintoutGUI( InventoryPlayer inventory ); + public abstract Object getPrintoutGUI( EntityPlayer player, EnumHand hand ); @Override - public abstract Object getPocketComputerGUI( InventoryPlayer inventory ); + public abstract Object getPocketComputerGUI( EntityPlayer player, EnumHand hand ); public abstract File getWorldDir( World world ); - - @Override + + @Override public void handlePacket( final ComputerCraftPacket packet, final EntityPlayer player ) { IThreadListener listener = player.getServer(); - if( listener != null ) + if (listener != null) { - if( listener.isCallingFromMinecraftThread() ) + if (listener.isCallingFromMinecraftThread()) { processPacket( packet, player ); - } - else + } else { listener.addScheduledTask( new Runnable() { @@ -181,7 +181,7 @@ public void run() private void processPacket( ComputerCraftPacket packet, EntityPlayer player ) { - switch( packet.m_packetType ) + switch (packet.m_packetType) { /////////////////////////////////// // Packets from Client to Server // @@ -195,7 +195,7 @@ private void processPacket( ComputerCraftPacket packet, EntityPlayer player ) { int instance = packet.m_dataInt[0]; ServerComputer computer = ComputerCraft.serverComputerRegistry.get( instance ); - if( computer != null ) + if (computer != null) { computer.handlePacket( packet, player ); } @@ -209,13 +209,13 @@ private void processPacket( ComputerCraftPacket packet, EntityPlayer player ) BlockPos pos = new BlockPos( x, y, z ); World world = player.getEntityWorld(); TileEntity tileEntity = world.getTileEntity( pos ); - if( tileEntity != null && tileEntity instanceof TileGeneric ) + if (tileEntity != null && tileEntity instanceof TileGeneric) { - TileGeneric generic = (TileGeneric)tileEntity; + TileGeneric generic = (TileGeneric) tileEntity; Packet description = generic.getUpdatePacket(); - if( description != null ) + if (description != null) { - ((EntityPlayerMP)player).connection.sendPacket( description ); + ((EntityPlayerMP) player).connection.sendPacket( description ); } } break; @@ -280,93 +280,93 @@ private void registerItems() // Computer ItemStack computer = ComputerItemFactory.create( -1, null, ComputerFamily.Normal ); GameRegistry.addRecipe( computer, - "XXX", "XYX", "XZX", - 'X', Blocks.STONE, - 'Y', Items.REDSTONE, - 'Z', Blocks.GLASS_PANE + "XXX", "XYX", "XZX", + 'X', Blocks.STONE, + 'Y', Items.REDSTONE, + 'Z', Blocks.GLASS_PANE ); // Advanced Computer ItemStack advancedComputer = ComputerItemFactory.create( -1, null, ComputerFamily.Advanced ); GameRegistry.addRecipe( advancedComputer, - "XXX", "XYX", "XZX", - 'X', Items.GOLD_INGOT, - 'Y', Items.REDSTONE, - 'Z', Blocks.GLASS_PANE + "XXX", "XYX", "XZX", + 'X', Items.GOLD_INGOT, + 'Y', Items.REDSTONE, + 'Z', Blocks.GLASS_PANE ); // Disk Drive ItemStack diskDrive = PeripheralItemFactory.create( PeripheralType.DiskDrive, null, 1 ); GameRegistry.addRecipe( diskDrive, - "XXX", "XYX", "XYX", - 'X', Blocks.STONE, - 'Y', Items.REDSTONE + "XXX", "XYX", "XYX", + 'X', Blocks.STONE, + 'Y', Items.REDSTONE ); - + // Wireless Modem ItemStack wirelessModem = PeripheralItemFactory.create( PeripheralType.WirelessModem, null, 1 ); GameRegistry.addRecipe( wirelessModem, - "XXX", "XYX", "XXX", - 'X', Blocks.STONE, - 'Y', Items.ENDER_PEARL + "XXX", "XYX", "XXX", + 'X', Blocks.STONE, + 'Y', Items.ENDER_PEARL ); - + // Monitor ItemStack monitor = PeripheralItemFactory.create( PeripheralType.Monitor, null, 1 ); GameRegistry.addRecipe( monitor, - "XXX", "XYX", "XXX", - 'X', Blocks.STONE, - 'Y', Blocks.GLASS_PANE + "XXX", "XYX", "XXX", + 'X', Blocks.STONE, + 'Y', Blocks.GLASS_PANE ); - + // PrinterEmpty ItemStack printer = PeripheralItemFactory.create( PeripheralType.Printer, null, 1 ); GameRegistry.addRecipe( printer, - "XXX", "XYX", "XZX", - 'X', Blocks.STONE, - 'Y', Items.REDSTONE, - 'Z', new ItemStack( Items.DYE, 1, 0 ) // 0 = Black + "XXX", "XYX", "XZX", + 'X', Blocks.STONE, + 'Y', Items.REDSTONE, + 'Z', new ItemStack( Items.DYE, 1, 0 ) // 0 = Black ); // Advanced Monitor ItemStack advancedMonitors = PeripheralItemFactory.create( PeripheralType.AdvancedMonitor, null, 4 ); GameRegistry.addRecipe( advancedMonitors, - "XXX", "XYX", "XXX", - 'X', Items.GOLD_INGOT, - 'Y', Blocks.GLASS_PANE + "XXX", "XYX", "XXX", + 'X', Items.GOLD_INGOT, + 'Y', Blocks.GLASS_PANE ); // Networking Cable ItemStack cable = PeripheralItemFactory.create( PeripheralType.Cable, null, 6 ); GameRegistry.addRecipe( cable, - " X ", "XYX", " X ", - 'X', Blocks.STONE, - 'Y', Items.REDSTONE + " X ", "XYX", " X ", + 'X', Blocks.STONE, + 'Y', Items.REDSTONE ); - + // Wired Modem ItemStack wiredModem = PeripheralItemFactory.create( PeripheralType.WiredModem, null, 1 ); GameRegistry.addRecipe( wiredModem, - "XXX", "XYX", "XXX", - 'X', Blocks.STONE, - 'Y', Items.REDSTONE + "XXX", "XYX", "XXX", + 'X', Blocks.STONE, + 'Y', Items.REDSTONE ); // Computer ItemStack commandComputer = ComputerItemFactory.create( -1, null, ComputerFamily.Command ); GameRegistry.addRecipe( commandComputer, - "XXX", "XYX", "XZX", - 'X', Blocks.STONE, - 'Y', Blocks.COMMAND_BLOCK, - 'Z', Blocks.GLASS_PANE + "XXX", "XYX", "XZX", + 'X', Blocks.STONE, + 'Y', Blocks.COMMAND_BLOCK, + 'Z', Blocks.GLASS_PANE ); // Advanced Modem ItemStack advancedModem = PeripheralItemFactory.create( PeripheralType.AdvancedModem, null, 1 ); GameRegistry.addRecipe( advancedModem, - "XXX", "XYX", "XXX", - 'X', Items.GOLD_INGOT, - 'Y', Items.ENDER_EYE + "XXX", "XYX", "XXX", + 'X', Items.GOLD_INGOT, + 'Y', Items.ENDER_EYE ); // Disk @@ -376,24 +376,24 @@ private void registerItems() ItemStack paper = new ItemStack( Items.PAPER, 1 ); ItemStack redstone = new ItemStack( Items.REDSTONE, 1 ); ItemStack basicDisk = ItemDiskLegacy.createFromIDAndColour( -1, null, Colour.Blue.getHex() ); - GameRegistry.addRecipe( new ImpostorShapelessRecipe( basicDisk, new Object[] { redstone, paper } ) ); + GameRegistry.addRecipe( new ImpostorShapelessRecipe( basicDisk, new Object[]{redstone, paper} ) ); - for( int colour=0; colour<16; ++colour ) + for (int colour = 0; colour < 16; ++colour) { - ItemStack disk = ItemDiskLegacy.createFromIDAndColour( -1, null, Colour.values()[ colour ].getHex() ); + ItemStack disk = ItemDiskLegacy.createFromIDAndColour( -1, null, Colour.values()[colour].getHex() ); ItemStack dye = new ItemStack( Items.DYE, 1, colour ); - for( int otherColour=0; otherColour<16; ++otherColour ) + for (int otherColour = 0; otherColour < 16; ++otherColour) { - if( colour != otherColour ) + if (colour != otherColour) { - ItemStack otherDisk = ItemDiskLegacy.createFromIDAndColour( -1, null, Colour.values()[ colour ].getHex() ); - GameRegistry.addRecipe( new ImpostorShapelessRecipe( disk, new Object[] { - otherDisk, dye + ItemStack otherDisk = ItemDiskLegacy.createFromIDAndColour( -1, null, Colour.values()[colour].getHex() ); + GameRegistry.addRecipe( new ImpostorShapelessRecipe( disk, new Object[]{ + otherDisk, dye } ) ); } } - GameRegistry.addRecipe( new ImpostorShapelessRecipe( disk, new Object[] { - redstone, paper, dye + GameRegistry.addRecipe( new ImpostorShapelessRecipe( disk, new Object[]{ + redstone, paper, dye } ) ); } @@ -406,27 +406,27 @@ private void registerItems() // Impostor Printout recipes (to fool NEI) ItemStack string = new ItemStack( Items.STRING, 1, 0 ); - GameRegistry.addRecipe( new ImpostorShapelessRecipe( multiplePrintout, new Object[] { singlePrintout, singlePrintout, string } ) ); + GameRegistry.addRecipe( new ImpostorShapelessRecipe( multiplePrintout, new Object[]{singlePrintout, singlePrintout, string} ) ); ItemStack leather = new ItemStack( Items.LEATHER, 1, 0 ); - GameRegistry.addRecipe( new ImpostorShapelessRecipe( bookPrintout, new Object[] { leather, singlePrintout, string } ) ); + GameRegistry.addRecipe( new ImpostorShapelessRecipe( bookPrintout, new Object[]{leather, singlePrintout, string} ) ); // Pocket Computer ItemStack pocketComputer = PocketComputerItemFactory.create( -1, null, ComputerFamily.Normal, false ); GameRegistry.addRecipe( pocketComputer, - "XXX", "XYX", "XZX", - 'X', Blocks.STONE, - 'Y', Items.GOLDEN_APPLE, - 'Z', Blocks.GLASS_PANE + "XXX", "XYX", "XZX", + 'X', Blocks.STONE, + 'Y', Items.GOLDEN_APPLE, + 'Z', Blocks.GLASS_PANE ); // Advanced Pocket Computer ItemStack advancedPocketComputer = PocketComputerItemFactory.create( -1, null, ComputerFamily.Advanced, false ); GameRegistry.addRecipe( advancedPocketComputer, - "XXX", "XYX", "XZX", - 'X', Items.GOLD_INGOT, - 'Y', Items.GOLDEN_APPLE, - 'Z', Blocks.GLASS_PANE + "XXX", "XYX", "XZX", + 'X', Items.GOLD_INGOT, + 'Y', Items.GOLDEN_APPLE, + 'Z', Blocks.GLASS_PANE ); // Wireless Pocket Computer @@ -437,8 +437,8 @@ private void registerItems() ItemStack advancedWirelessPocketComputer = PocketComputerItemFactory.create( -1, null, ComputerFamily.Advanced, true ); // Impostor Pocket Computer recipes (to fool NEI) - GameRegistry.addRecipe( new ImpostorRecipe( 1, 2, new ItemStack[] { wirelessModem, pocketComputer }, wirelessPocketComputer ) ); - GameRegistry.addRecipe( new ImpostorRecipe( 1, 2, new ItemStack[] { wirelessModem, advancedPocketComputer }, advancedWirelessPocketComputer ) ); + GameRegistry.addRecipe( new ImpostorRecipe( 1, 2, new ItemStack[]{wirelessModem, pocketComputer}, wirelessPocketComputer ) ); + GameRegistry.addRecipe( new ImpostorRecipe( 1, 2, new ItemStack[]{wirelessModem, advancedPocketComputer}, advancedWirelessPocketComputer ) ); // Skulls (Easter Egg) // Dan @@ -455,7 +455,7 @@ private void registerItems() cloudyHead.setTagCompound( tag ); GameRegistry.addShapelessRecipe( cloudyHead, monitor, new ItemStack( Items.SKULL, 1, 1 ) ); } - + private void registerTileEntities() { // Tile Entities @@ -470,7 +470,7 @@ private void registerTileEntities() // Register peripheral providers ComputerCraftAPI.registerPeripheralProvider( new DefaultPeripheralProvider() ); - if( ComputerCraft.enableCommandBlock ) + if (ComputerCraft.enableCommandBlock) { ComputerCraftAPI.registerPeripheralProvider( new CommandBlockPeripheralProvider() ); } @@ -481,35 +481,35 @@ private void registerTileEntities() // Register media providers ComputerCraftAPI.registerMediaProvider( new DefaultMediaProvider() ); } - + private void registerForgeHandlers() { ForgeHandlers handlers = new ForgeHandlers(); MinecraftForge.EVENT_BUS.register( handlers ); NetworkRegistry.INSTANCE.registerGuiHandler( ComputerCraft.instance, handlers ); } - + public class ForgeHandlers implements - IGuiHandler + IGuiHandler { private ForgeHandlers() { } // IGuiHandler implementation - + @Override public Object getServerGuiElement( int id, EntityPlayer player, World world, int x, int y, int z ) { BlockPos pos = new BlockPos( x, y, z ); - switch( id ) + switch (id) { case ComputerCraft.diskDriveGUIID: { TileEntity tile = world.getTileEntity( pos ); - if( tile != null && tile instanceof TileDiskDrive ) + if (tile != null && tile instanceof TileDiskDrive) { - TileDiskDrive drive = (TileDiskDrive)tile; + TileDiskDrive drive = (TileDiskDrive) tile; return new ContainerDiskDrive( player.inventory, drive ); } break; @@ -517,9 +517,9 @@ public Object getServerGuiElement( int id, EntityPlayer player, World world, int case ComputerCraft.computerGUIID: { TileEntity tile = world.getTileEntity( pos ); - if( tile != null && tile instanceof TileComputer ) + if (tile != null && tile instanceof TileComputer) { - TileComputer computer = (TileComputer)tile; + TileComputer computer = (TileComputer) tile; return new ContainerComputer( computer ); } break; @@ -527,9 +527,9 @@ public Object getServerGuiElement( int id, EntityPlayer player, World world, int case ComputerCraft.printerGUIID: { TileEntity tile = world.getTileEntity( pos ); - if( tile != null && tile instanceof TilePrinter ) + if (tile != null && tile instanceof TilePrinter) { - TilePrinter printer = (TilePrinter)tile; + TilePrinter printer = (TilePrinter) tile; return new ContainerPrinter( player.inventory, printer ); } break; @@ -537,20 +537,20 @@ public Object getServerGuiElement( int id, EntityPlayer player, World world, int case ComputerCraft.turtleGUIID: { TileEntity tile = world.getTileEntity( pos ); - if( tile != null && tile instanceof TileTurtle ) + if (tile != null && tile instanceof TileTurtle) { - TileTurtle turtle = (TileTurtle)tile; + TileTurtle turtle = (TileTurtle) tile; return new ContainerTurtle( player.inventory, turtle.getAccess() ); } break; } case ComputerCraft.printoutGUIID: { - return new ContainerHeldItem( player.inventory ); + return new ContainerHeldItem( player, x == 0 ? EnumHand.MAIN_HAND : EnumHand.MAIN_HAND ); } case ComputerCraft.pocketComputerGUIID: { - return new ContainerHeldItem( player.inventory ); + return new ContainerHeldItem( player, x == 0 ? EnumHand.MAIN_HAND : EnumHand.OFF_HAND ); } } return null; @@ -560,14 +560,14 @@ public Object getServerGuiElement( int id, EntityPlayer player, World world, int public Object getClientGuiElement( int id, EntityPlayer player, World world, int x, int y, int z ) { BlockPos pos = new BlockPos( x, y, z ); - switch( id ) + switch (id) { case ComputerCraft.diskDriveGUIID: { TileEntity tile = world.getTileEntity( pos ); - if( tile != null && tile instanceof TileDiskDrive ) + if (tile != null && tile instanceof TileDiskDrive) { - TileDiskDrive drive = (TileDiskDrive)tile; + TileDiskDrive drive = (TileDiskDrive) tile; return getDiskDriveGUI( player.inventory, drive ); } break; @@ -575,9 +575,9 @@ public Object getClientGuiElement( int id, EntityPlayer player, World world, int case ComputerCraft.computerGUIID: { TileEntity tile = world.getTileEntity( pos ); - if( tile != null && tile instanceof TileComputer ) + if (tile != null && tile instanceof TileComputer) { - TileComputer computer = (TileComputer)tile; + TileComputer computer = (TileComputer) tile; return getComputerGUI( computer ); } break; @@ -585,9 +585,9 @@ public Object getClientGuiElement( int id, EntityPlayer player, World world, int case ComputerCraft.printerGUIID: { TileEntity tile = world.getTileEntity( pos ); - if( tile != null && tile instanceof TilePrinter ) + if (tile != null && tile instanceof TilePrinter) { - TilePrinter printer = (TilePrinter)tile; + TilePrinter printer = (TilePrinter) tile; return getPrinterGUI( player.inventory, printer ); } break; @@ -595,20 +595,20 @@ public Object getClientGuiElement( int id, EntityPlayer player, World world, int case ComputerCraft.turtleGUIID: { TileEntity tile = world.getTileEntity( pos ); - if( tile != null && tile instanceof TileTurtle ) + if (tile != null && tile instanceof TileTurtle) { - TileTurtle turtle = (TileTurtle)tile; + TileTurtle turtle = (TileTurtle) tile; return getTurtleGUI( player.inventory, turtle ); } break; } case ComputerCraft.printoutGUIID: { - return getPrintoutGUI( player.inventory ); + return getPrintoutGUI( player, x == 0 ? EnumHand.MAIN_HAND : EnumHand.OFF_HAND ); } case ComputerCraft.pocketComputerGUIID: { - return getPocketComputerGUI( player.inventory ); + return getPocketComputerGUI( player, x == 0 ? EnumHand.MAIN_HAND : EnumHand.OFF_HAND ); } } return null; @@ -631,7 +631,7 @@ public void onConnectionClosed( FMLNetworkEvent.ClientDisconnectionFromServerEve @SubscribeEvent public void onClientTick( TickEvent.ClientTickEvent event ) { - if( event.phase == TickEvent.Phase.START ) + if (event.phase == TickEvent.Phase.START) { ComputerCraft.clientComputerRegistry.update(); } @@ -640,7 +640,7 @@ public void onClientTick( TickEvent.ClientTickEvent event ) @SubscribeEvent public void onServerTick( TickEvent.ServerTickEvent event ) { - if( event.phase == TickEvent.Phase.START ) + if (event.phase == TickEvent.Phase.START) { MainThread.executePendingTasks(); ComputerCraft.serverComputerRegistry.update(); diff --git a/src/main/java/dan200/computercraft/shared/proxy/IComputerCraftProxy.java b/src/main/java/dan200/computercraft/shared/proxy/IComputerCraftProxy.java index 82e2dc146..31101b609 100644 --- a/src/main/java/dan200/computercraft/shared/proxy/IComputerCraftProxy.java +++ b/src/main/java/dan200/computercraft/shared/proxy/IComputerCraftProxy.java @@ -14,6 +14,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumHand; import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -38,8 +39,8 @@ public interface IComputerCraftProxy public Object getComputerGUI( TileComputer computer ); public Object getPrinterGUI( InventoryPlayer inventory, TilePrinter printer ); public Object getTurtleGUI( InventoryPlayer inventory, TileTurtle turtle ); - public abstract Object getPrintoutGUI( InventoryPlayer inventory ); - public abstract Object getPocketComputerGUI( InventoryPlayer inventory ); + public abstract Object getPrintoutGUI( EntityPlayer player, EnumHand hand ); + public abstract Object getPocketComputerGUI( EntityPlayer player, EnumHand hand ); public File getWorldDir( World world ); public void handlePacket( ComputerCraftPacket packet, EntityPlayer player ); diff --git a/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java b/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java index fc8005e4a..522ecf52e 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java +++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java @@ -240,6 +240,10 @@ public void consumeDrop( Entity entity, ItemStack drop ) placed = true; turtlePlayer.loadInventory( stackCopy ); } + else if( hitEntity.processInitialInteract( turtlePlayer, stackCopy, EnumHand.MAIN_HAND ) ) + { + placed = true; + } else if( hitEntity instanceof EntityLivingBase ) { placed = item.itemInteractionForEntity( stackCopy, turtlePlayer, (EntityLivingBase)hitEntity, EnumHand.MAIN_HAND );