diff --git a/src/main/java/mekanism/api/IConfigurable.java b/src/main/java/mekanism/api/IConfigurable.java index 54c2d8de6..572a79dd3 100644 --- a/src/main/java/mekanism/api/IConfigurable.java +++ b/src/main/java/mekanism/api/IConfigurable.java @@ -1,6 +1,7 @@ package mekanism.api; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; /** @@ -14,15 +15,15 @@ public interface IConfigurable * Called when a player shift-right clicks this block with a Configurator. * @param player - the player who clicked the block * @param side - the side the block was clicked on - * @return whether or not an action was performed + * @return action that was performed */ - public boolean onSneakRightClick(EntityPlayer player, EnumFacing side); + public EnumActionResult onSneakRightClick(EntityPlayer player, EnumFacing side); /** * Called when a player right clicks this block with a Configurator. * @param player - the player who clicked the block * @param side - the side the block was clicked on - * @return whether or not an action was performed + * @return action that was performed */ - public boolean onRightClick(EntityPlayer player, EnumFacing side); + public EnumActionResult onRightClick(EntityPlayer player, EnumFacing side); } diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 2befa1f65..fcd2e0c59 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -213,6 +213,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -275,7 +276,7 @@ public class ClientProxy extends CommonProxy } @Override - public void openPersonalChest(EntityPlayer entityplayer, int id, int windowId, boolean isBlock, BlockPos pos) + public void openPersonalChest(EntityPlayer entityplayer, int id, int windowId, boolean isBlock, BlockPos pos, EnumHand hand) { TileEntityPersonalChest tileEntity = (TileEntityPersonalChest)entityplayer.worldObj.getTileEntity(pos); @@ -287,11 +288,11 @@ public class ClientProxy extends CommonProxy entityplayer.openContainer.windowId = windowId; } else { - ItemStack stack = entityplayer.getCurrentEquippedItem(); + ItemStack stack = entityplayer.getHeldItem(hand); if(MachineType.get(stack) == MachineType.PERSONAL_CHEST) { - InventoryPersonalChest inventory = new InventoryPersonalChest(entityplayer); + InventoryPersonalChest inventory = new InventoryPersonalChest(entityplayer, hand); FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiPersonalChest(entityplayer.inventory, inventory)); entityplayer.openContainer.windowId = windowId; } @@ -417,65 +418,7 @@ public class ClientProxy extends CommonProxy @Override public void registerBlockRenders() - { - Minecraft.getMinecraft().getBlockColors().registerBlockColorHandler(new IBlockColor() { - @Override - public int colorMultiplier(IBlockState state, IBlockAccess worldIn, BlockPos pos, int tintIndex) - { - BlockMachine machine = (BlockMachine)state.getBlock(); - - if(state.getValue(machine.getMachineBlock().getProperty()) == MachineType.FLUID_TANK) - { - EnumColor color = state.getValue(BlockStateMachine.tierProperty).getColor(); - - return (int)(color.getColor(0)*255) << 16 | (int)(color.getColor(1)*255) << 8 | (int)(color.getColor(2)*255); - } - - return -1; - } - }, MekanismBlocks.MachineBlock, MekanismBlocks.MachineBlock2, MekanismBlocks.MachineBlock3); - Minecraft.getMinecraft().getBlockColors().registerBlockColorHandler(new IBlockColor() { - @Override - public int colorMultiplier(IBlockState state, IBlockAccess worldIn, BlockPos pos, int tintIndex) - { - EnumDyeColor color = state.getValue(colorProperty); - EnumColor dye = EnumColor.DYES[color.getDyeDamage()]; - - return (int)(dye.getColor(0)*255) << 16 | (int)(dye.getColor(1)*255) << 8 | (int)(dye.getColor(2)*255); - } - }, MekanismBlocks.PlasticBlock, MekanismBlocks.GlowPlasticBlock, MekanismBlocks.RoadPlasticBlock, MekanismBlocks.ReinforcedPlasticBlock, - MekanismBlocks.SlickPlasticBlock, MekanismBlocks.PlasticFence); - Minecraft.getMinecraft().getItemColors().registerItemColorHandler(new IItemColor() { - @Override - public int getColorFromItemstack(ItemStack stack, int tintIndex) - { - if(MachineType.get(stack) == MachineType.FLUID_TANK) - { - EnumColor color = ((ItemBlockMachine)stack.getItem()).getBaseTier(stack).getColor(); - - return (int)(color.getColor(0)*255) << 16 | (int)(color.getColor(1)*255) << 8 | (int)(color.getColor(2)*255); - } - - return -1; - } - }, MekanismBlocks.MachineBlock, MekanismBlocks.MachineBlock2, MekanismBlocks.MachineBlock3); - Minecraft.getMinecraft().getItemColors().registerItemColorHandler(new IItemColor() { - @Override - public int getColorFromItemstack(ItemStack stack, int tintIndex) - { - if(stack.getItem() instanceof ItemBlockPlastic) - { - EnumDyeColor dyeColor = EnumDyeColor.byMetadata(stack.getItemDamage()&15); - EnumColor dye = EnumColor.DYES[dyeColor.getDyeDamage()]; - - return (int)(dye.getColor(0)*255) << 16 | (int)(dye.getColor(1)*255) << 8 | (int)(dye.getColor(2)*255); - } - - return -1; - } - }, MekanismBlocks.PlasticBlock, MekanismBlocks.GlowPlasticBlock, MekanismBlocks.RoadPlasticBlock, MekanismBlocks.ReinforcedPlasticBlock, - MekanismBlocks.SlickPlasticBlock, MekanismBlocks.PlasticFence); - + { ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.ObsidianTNT), 0, new ModelResourceLocation("mekanism:ObsidianTNT", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.SaltBlock), 0, new ModelResourceLocation("mekanism:SaltBlock", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.CardboardBox), 0, new ModelResourceLocation("mekanism:CardboardBox", "storage=false")); @@ -750,11 +693,11 @@ public class ClientProxy extends CommonProxy case 13: return new GuiTeleporter(player.inventory, (TileEntityTeleporter)tileEntity); case 14: - ItemStack itemStack = player.getCurrentEquippedItem(); + ItemStack itemStack = player.getHeldItem(EnumHand.values()[pos.getX()]); if(itemStack != null && itemStack.getItem() instanceof ItemPortableTeleporter) { - return new GuiTeleporter(player, itemStack); + return new GuiTeleporter(player, EnumHand.values()[pos.getX()], itemStack); } case 15: return new GuiPurificationChamber(player.inventory, (TileEntityAdvancedElectricMachine)tileEntity); @@ -809,7 +752,7 @@ public class ClientProxy extends CommonProxy case 37: return new GuiChemicalCrystallizer(player.inventory, (TileEntityChemicalCrystallizer)tileEntity); case 38: - ItemStack itemStack1 = player.getCurrentEquippedItem(); + ItemStack itemStack1 = player.getHeldItem(EnumHand.values()[pos.getX()]); if(itemStack1 != null && itemStack1.getItem() instanceof ItemSeismicReader) { @@ -906,9 +849,67 @@ public class ClientProxy extends CommonProxy } @Override - public void loadUtilities() + public void init() { - super.loadUtilities(); + super.init(); + + Minecraft.getMinecraft().getBlockColors().registerBlockColorHandler(new IBlockColor() { + @Override + public int colorMultiplier(IBlockState state, IBlockAccess worldIn, BlockPos pos, int tintIndex) + { + BlockMachine machine = (BlockMachine)state.getBlock(); + + if(state.getValue(machine.getMachineBlock().getProperty()) == MachineType.FLUID_TANK) + { + EnumColor color = state.getValue(BlockStateMachine.tierProperty).getColor(); + + return (int)(color.getColor(0)*255) << 16 | (int)(color.getColor(1)*255) << 8 | (int)(color.getColor(2)*255); + } + + return -1; + } + }, MekanismBlocks.MachineBlock, MekanismBlocks.MachineBlock2, MekanismBlocks.MachineBlock3); + Minecraft.getMinecraft().getBlockColors().registerBlockColorHandler(new IBlockColor() { + @Override + public int colorMultiplier(IBlockState state, IBlockAccess worldIn, BlockPos pos, int tintIndex) + { + EnumDyeColor color = state.getValue(colorProperty); + EnumColor dye = EnumColor.DYES[color.getDyeDamage()]; + + return (int)(dye.getColor(0)*255) << 16 | (int)(dye.getColor(1)*255) << 8 | (int)(dye.getColor(2)*255); + } + }, MekanismBlocks.PlasticBlock, MekanismBlocks.GlowPlasticBlock, MekanismBlocks.RoadPlasticBlock, MekanismBlocks.ReinforcedPlasticBlock, + MekanismBlocks.SlickPlasticBlock, MekanismBlocks.PlasticFence); + Minecraft.getMinecraft().getItemColors().registerItemColorHandler(new IItemColor() { + @Override + public int getColorFromItemstack(ItemStack stack, int tintIndex) + { + if(MachineType.get(stack) == MachineType.FLUID_TANK) + { + EnumColor color = ((ItemBlockMachine)stack.getItem()).getBaseTier(stack).getColor(); + + return (int)(color.getColor(0)*255) << 16 | (int)(color.getColor(1)*255) << 8 | (int)(color.getColor(2)*255); + } + + return -1; + } + }, MekanismBlocks.MachineBlock, MekanismBlocks.MachineBlock2, MekanismBlocks.MachineBlock3); + Minecraft.getMinecraft().getItemColors().registerItemColorHandler(new IItemColor() { + @Override + public int getColorFromItemstack(ItemStack stack, int tintIndex) + { + if(stack.getItem() instanceof ItemBlockPlastic) + { + EnumDyeColor dyeColor = EnumDyeColor.byMetadata(stack.getItemDamage()&15); + EnumColor dye = EnumColor.DYES[dyeColor.getDyeDamage()]; + + return (int)(dye.getColor(0)*255) << 16 | (int)(dye.getColor(1)*255) << 8 | (int)(dye.getColor(2)*255); + } + + return -1; + } + }, MekanismBlocks.PlasticBlock, MekanismBlocks.GlowPlasticBlock, MekanismBlocks.RoadPlasticBlock, MekanismBlocks.ReinforcedPlasticBlock, + MekanismBlocks.SlickPlasticBlock, MekanismBlocks.PlasticFence); MinecraftForge.EVENT_BUS.register(new ClientConnectionHandler()); MinecraftForge.EVENT_BUS.register(new ClientPlayerTracker()); diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index a139526f2..da45282e1 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -224,7 +224,7 @@ public class ClientTickHandler Mekanism.flamethrowerActive.remove(mc.thePlayer.getName()); } - Mekanism.packetHandler.sendToServer(new FlamethrowerDataMessage(PacketFlamethrowerData.FlamethrowerPacket.UPDATE, mc.thePlayer.getName(), isFlamethrowerOn(mc.thePlayer))); + Mekanism.packetHandler.sendToServer(new FlamethrowerDataMessage(PacketFlamethrowerData.FlamethrowerPacket.UPDATE, null, mc.thePlayer.getName(), isFlamethrowerOn(mc.thePlayer))); } if(Mekanism.jetpackOn.contains(mc.thePlayer.getName()) != isJetpackOn(mc.thePlayer)) @@ -309,11 +309,11 @@ public class ClientTickHandler if(isFlamethrowerOn(mc.thePlayer)) { - ItemFlamethrower flamethrower = (ItemFlamethrower)mc.thePlayer.getCurrentEquippedItem().getItem(); + ItemFlamethrower flamethrower = (ItemFlamethrower)mc.thePlayer.inventory.getCurrentItem().getItem(); if(!mc.thePlayer.capabilities.isCreativeMode) { - flamethrower.useGas(mc.thePlayer.getCurrentEquippedItem()); + flamethrower.useGas(mc.thePlayer.inventory.getCurrentItem()); } } @@ -508,11 +508,11 @@ public class ClientTickHandler public static boolean hasFlamethrower(EntityPlayer player) { - if(player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() instanceof ItemFlamethrower) + if(player.inventory.getCurrentItem() != null && player.inventory.getCurrentItem().getItem() instanceof ItemFlamethrower) { - ItemFlamethrower flamethrower = (ItemFlamethrower)player.getCurrentEquippedItem().getItem(); + ItemFlamethrower flamethrower = (ItemFlamethrower)player.inventory.getCurrentItem().getItem(); - if(flamethrower.getGas(player.getCurrentEquippedItem()) != null) + if(flamethrower.getGas(player.inventory.getCurrentItem()) != null) { return true; } diff --git a/src/main/java/mekanism/client/MekanismKeyHandler.java b/src/main/java/mekanism/client/MekanismKeyHandler.java index c473b169f..faa341269 100644 --- a/src/main/java/mekanism/client/MekanismKeyHandler.java +++ b/src/main/java/mekanism/client/MekanismKeyHandler.java @@ -31,6 +31,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumHand; import net.minecraft.util.text.TextComponentString; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.FMLClientHandler; @@ -75,7 +76,7 @@ public class MekanismKeyHandler extends MekKeyHandler if(kb == modeSwitchKey) { EntityPlayer player = FMLClientHandler.instance().getClient().thePlayer; - ItemStack toolStack = player.getCurrentEquippedItem(); + ItemStack toolStack = player.inventory.getCurrentItem(); Item item = StackUtils.getItem(toolStack); @@ -85,7 +86,7 @@ public class MekanismKeyHandler extends MekKeyHandler int toSet = configurator.getState(toolStack).ordinal() < ConfiguratorMode.values().length-1 ? configurator.getState(toolStack).ordinal() + 1 : 0; configurator.setState(toolStack, ConfiguratorMode.values()[toSet]); - Mekanism.packetHandler.sendToServer(new ConfiguratorStateMessage(configurator.getState(toolStack))); + Mekanism.packetHandler.sendToServer(new ConfiguratorStateMessage(EnumHand.MAIN_HAND, configurator.getState(toolStack))); player.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.configureState") + ": " + configurator.getColor(configurator.getState(toolStack)) + configurator.getStateDisplay(configurator.getState(toolStack)))); } else if(player.isSneaking() && item instanceof ItemElectricBow) @@ -93,7 +94,7 @@ public class MekanismKeyHandler extends MekKeyHandler ItemElectricBow bow = (ItemElectricBow)item; bow.setFireState(toolStack, !bow.getFireState(toolStack)); - Mekanism.packetHandler.sendToServer(new ElectricBowStateMessage(bow.getFireState(toolStack))); + Mekanism.packetHandler.sendToServer(new ElectricBowStateMessage(EnumHand.MAIN_HAND, bow.getFireState(toolStack))); player.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.fireMode") + ": " + (bow.getFireState(toolStack) ? EnumColor.DARK_GREEN : EnumColor.DARK_RED) + LangUtils.transOnOff(bow.getFireState(toolStack)))); } else if(player.isSneaking() && item instanceof ItemBlockMachine) @@ -103,7 +104,7 @@ public class MekanismKeyHandler extends MekKeyHandler if(BlockStateMachine.MachineType.get(toolStack) == BlockStateMachine.MachineType.FLUID_TANK) { machine.setBucketMode(toolStack, !machine.getBucketMode(toolStack)); - Mekanism.packetHandler.sendToServer(new PortableTankStateMessage(machine.getBucketMode(toolStack))); + Mekanism.packetHandler.sendToServer(new PortableTankStateMessage(EnumHand.MAIN_HAND, machine.getBucketMode(toolStack))); player.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.portableTank.bucketMode") + ": " + (machine.getBucketMode(toolStack) ? EnumColor.DARK_GREEN : EnumColor.DARK_RED) + LangUtils.transOnOff(machine.getBucketMode(toolStack)))); } } @@ -115,7 +116,7 @@ public class MekanismKeyHandler extends MekKeyHandler { int newChan = wt.getChannel(toolStack) < 9 ? wt.getChannel(toolStack) + 1 : 1; wt.setChannel(toolStack, newChan); - Mekanism.packetHandler.sendToServer(new WalkieTalkieStateMessage(newChan)); + Mekanism.packetHandler.sendToServer(new WalkieTalkieStateMessage(EnumHand.MAIN_HAND, newChan)); SoundHandler.playSound(MekanismSounds.DING); } } @@ -124,7 +125,7 @@ public class MekanismKeyHandler extends MekKeyHandler ItemFlamethrower flamethrower = (ItemFlamethrower)item; flamethrower.incrementMode(toolStack); - Mekanism.packetHandler.sendToServer(new PacketFlamethrowerData.FlamethrowerDataMessage(PacketFlamethrowerData.FlamethrowerPacket.MODE, null, false)); + Mekanism.packetHandler.sendToServer(new PacketFlamethrowerData.FlamethrowerDataMessage(PacketFlamethrowerData.FlamethrowerPacket.MODE, EnumHand.MAIN_HAND, null, false)); player.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.flamethrower.modeBump") + ": " + flamethrower.getMode(toolStack).getName())); } } diff --git a/src/main/java/mekanism/client/gui/GuiPersonalChest.java b/src/main/java/mekanism/client/gui/GuiPersonalChest.java index 5143ca1b1..9e13f9505 100644 --- a/src/main/java/mekanism/client/gui/GuiPersonalChest.java +++ b/src/main/java/mekanism/client/gui/GuiPersonalChest.java @@ -1,13 +1,13 @@ package mekanism.client.gui; import mekanism.client.gui.element.GuiSecurityTab; +import mekanism.common.inventory.InventoryPersonalChest; import mekanism.common.inventory.container.ContainerPersonalChest; import mekanism.common.tile.TileEntityPersonalChest; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -29,14 +29,14 @@ public class GuiPersonalChest extends GuiMekanism guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiPersonalChest.png"))); } - public GuiPersonalChest(InventoryPlayer inventory, IInventory inv) + public GuiPersonalChest(InventoryPlayer inventory, InventoryPersonalChest inv) { super(new ContainerPersonalChest(inventory, null, inv, false)); xSize+=26; ySize+=64; - guiElements.add(new GuiSecurityTab(this, MekanismUtils.getResource(ResourceType.GUI, "GuiPersonalChest.png"))); + guiElements.add(new GuiSecurityTab(this, MekanismUtils.getResource(ResourceType.GUI, "GuiPersonalChest.png"), inv.currentHand)); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java index 413375f25..a3515cad3 100644 --- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -13,8 +13,6 @@ import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.frequency.Frequency; import mekanism.common.inventory.container.ContainerQuantumEntangloporter; -import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage; -import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterPacketType; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.util.LangUtils; @@ -271,19 +269,12 @@ public class GuiQuantumEntangloporter extends GuiMekanism { Frequency freq = privateMode ? tileEntity.privateCache.get(selection) : tileEntity.publicCache.get(selection); - if(tileEntity != null) - { - ArrayList data = new ArrayList(); - data.add(1); - data.add(freq.name); - data.add(freq.publicFreq); - - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - } - else { - Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.DEL_FREQ, freq)); - Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.DATA_REQUEST, null)); - } + ArrayList data = new ArrayList(); + data.add(1); + data.add(freq.name); + data.add(freq.publicFreq); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); scrollList.selected = -1; } diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index e22eeee07..1f54e0e29 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -33,6 +33,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -45,6 +46,8 @@ public class GuiTeleporter extends GuiMekanism { public static int MAX_LENGTH = 16; + public EnumHand currentHand; + public ResourceLocation resource; public TileEntityTeleporter tileEntity; @@ -105,9 +108,10 @@ public class GuiTeleporter extends GuiMekanism ySize+=64; } - public GuiTeleporter(EntityPlayer player, ItemStack stack) + public GuiTeleporter(EntityPlayer player, EnumHand hand, ItemStack stack) { super(new ContainerNull()); + currentHand = hand; itemStack = stack; entityPlayer = player; resource = MekanismUtils.getResource(ResourceType.GUI, "GuiPortableTeleporter.png"); @@ -135,7 +139,7 @@ public class GuiTeleporter extends GuiMekanism setFrequency(item.getFrequency(stack)); } else { - Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.DATA_REQUEST, clientFreq)); + Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.DATA_REQUEST, currentHand, clientFreq)); } ySize = 175; @@ -179,7 +183,7 @@ public class GuiTeleporter extends GuiMekanism if(!isInit) { - Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.DATA_REQUEST, clientFreq)); + Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.DATA_REQUEST, currentHand, clientFreq)); } else { isInit = false; @@ -206,7 +210,7 @@ public class GuiTeleporter extends GuiMekanism else { Frequency newFreq = new Frequency(freq, null).setPublic(!privateMode); - Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.SET_FREQ, newFreq)); + Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.SET_FREQ, currentHand, newFreq)); } } @@ -386,8 +390,8 @@ public class GuiTeleporter extends GuiMekanism Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); } else { - Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.DEL_FREQ, freq)); - Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.DATA_REQUEST, null)); + Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.DEL_FREQ, currentHand, freq)); + Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.DATA_REQUEST, currentHand, null)); } scrollList.selected = -1; @@ -398,7 +402,7 @@ public class GuiTeleporter extends GuiMekanism if(clientFreq != null && clientStatus == 1) { mc.setIngameFocus(); - Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.TELEPORT, clientFreq)); + Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.TELEPORT, currentHand, clientFreq)); } } diff --git a/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java index 6738dc440..c5449323f 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java @@ -20,6 +20,7 @@ import mekanism.common.util.SecurityUtils; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -28,6 +29,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class GuiSecurityTab extends GuiElement { public boolean isItem; + public EnumHand currentHand; public TileEntity tileEntity; @@ -38,11 +40,12 @@ public class GuiSecurityTab extends GuiElement tileEntity = tile; } - public GuiSecurityTab(IGuiWrapper gui, ResourceLocation def) + public GuiSecurityTab(IGuiWrapper gui, ResourceLocation def, EnumHand hand) { super(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiSecurityTab.png"), gui, def); isItem = true; + currentHand = hand; } @Override @@ -163,7 +166,7 @@ public class GuiSecurityTab extends GuiElement private ItemStack getItem() { - return mc.thePlayer.getCurrentEquippedItem(); + return mc.thePlayer.getHeldItem(currentHand); } @Override @@ -185,7 +188,7 @@ public class GuiSecurityTab extends GuiElement if(isItem) { - Mekanism.packetHandler.sendToServer(new SecurityModeMessage(SecurityMode.values()[ordinalToSet])); + Mekanism.packetHandler.sendToServer(new SecurityModeMessage(currentHand, SecurityMode.values()[ordinalToSet])); } else { Mekanism.packetHandler.sendToServer(new SecurityModeMessage(Coord4D.get(tileEntity), SecurityMode.values()[ordinalToSet])); diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index e2ecf828b..4fe13b403 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -296,38 +296,34 @@ public class MekanismRenderer } } - public static BakedQuad iconTransform(BakedQuad quad, TextureAtlasSprite sprite) //TODO + public static BakedQuad iconTransform(BakedQuad quad, TextureAtlasSprite sprite) { int[] vertices = new int[28]; System.arraycopy(quad.getVertexData(), 0, vertices, 0, vertices.length); - vertices[4] = Float.floatToRawIntBits(sprite.getInterpolatedU(16)); - vertices[5] = Float.floatToRawIntBits(sprite.getInterpolatedV(16)); - - vertices[7+4] = Float.floatToRawIntBits(sprite.getInterpolatedU(16)); - vertices[7+5] = Float.floatToRawIntBits(sprite.getInterpolatedV(0)); - - vertices[14+4] = Float.floatToRawIntBits(sprite.getInterpolatedU(0)); - vertices[14+5] = Float.floatToRawIntBits(sprite.getInterpolatedV(0)); - - vertices[21+4] = Float.floatToRawIntBits(sprite.getInterpolatedU(0)); - vertices[21+5] = Float.floatToRawIntBits(sprite.getInterpolatedV(16)); - + for(int i = 0; i < 4; ++i) + { + int j = quad.getFormat().getIntegerSize() * i; + int uvIndex = quad.getFormat().getUvOffsetById(0) / 4; + vertices[j + uvIndex] = Float.floatToRawIntBits(sprite.getInterpolatedU(sprite.getUnInterpolatedU(Float.intBitsToFloat(vertices[j + uvIndex])))); + vertices[j + uvIndex + 1] = Float.floatToRawIntBits(sprite.getInterpolatedV(sprite.getUnInterpolatedV(Float.intBitsToFloat(vertices[j + uvIndex + 1])))); + } + return new BakedQuad(vertices, quad.getTintIndex(), quad.getFace(), sprite, quad.shouldApplyDiffuseLighting(), quad.getFormat()); } - public static BakedQuad rotate(BakedQuad quad, int amount) //TODO + public static BakedQuad rotate(BakedQuad quad, int amount) { int[] vertices = new int[28]; System.arraycopy(quad.getVertexData(), 0, vertices, 0, vertices.length); - int[][] uvs = new int[4][2]; - for(int i = 0; i < 4; i++) { int nextIndex = (i+amount)%4; - vertices[7*i + 4] = quad.getVertexData()[7*nextIndex + 4]; - vertices[7*i + 5] = quad.getVertexData()[7*nextIndex + 5]; + int j = quad.getFormat().getIntegerSize() * i; + int uvIndex = quad.getFormat().getUvOffsetById(0) / 4; + vertices[j + uvIndex] = quad.getVertexData()[7*nextIndex + uvIndex]; + vertices[j + uvIndex + 1] = quad.getVertexData()[7*nextIndex + uvIndex]; } return new BakedQuad(vertices, quad.getTintIndex(), quad.getFace(), quad.getSprite(), quad.shouldApplyDiffuseLighting(), quad.getFormat()); diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index 27035f103..b9eb419d9 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -179,9 +179,9 @@ public class RenderTickHandler { for(EntityPlayer p : world.playerEntities) { - if(!Mekanism.flamethrowerActive.contains(p.getName()) && !p.isSwingInProgress && p.getCurrentEquippedItem() != null && p.getCurrentEquippedItem().getItem() instanceof ItemFlamethrower) + if(!Mekanism.flamethrowerActive.contains(p.getName()) && !p.isSwingInProgress && p.inventory.getCurrentItem() != null && p.inventory.getCurrentItem().getItem() instanceof ItemFlamethrower) { - if(((ItemFlamethrower)p.getCurrentEquippedItem().getItem()).getGas(p.getCurrentEquippedItem()) != null) + if(((ItemFlamethrower)p.inventory.getCurrentItem().getItem()).getGas(p.inventory.getCurrentItem()) != null) { Pos3D playerPos = new Pos3D(p); Pos3D flameVec; diff --git a/src/main/java/mekanism/client/render/obj/GlowPanelModel.java b/src/main/java/mekanism/client/render/obj/GlowPanelModel.java index 7ae167210..52923df69 100644 --- a/src/main/java/mekanism/client/render/obj/GlowPanelModel.java +++ b/src/main/java/mekanism/client/render/obj/GlowPanelModel.java @@ -134,17 +134,22 @@ public class GlowPanelModel extends OBJBakedModelBase return ImmutableList.of(); } - int hash = PartGlowPanel.hash((IExtendedBlockState)state); - EnumColor color = ((IExtendedBlockState)state).getValue(ColorProperty.INSTANCE).color; - - if(!glowPanelCache.containsKey(hash)) - { - GlowPanelModel model = new GlowPanelModel(baseModel, getModel(), getState(), vertexFormat, textureMap, transformationMap); - model.tempState = state; - glowPanelCache.put(hash, model.getQuads(state, side, rand)); - } - - return glowPanelCache.get(hash); + if(state != null && tempState == null) + { + int hash = PartGlowPanel.hash((IExtendedBlockState)state); + EnumColor color = ((IExtendedBlockState)state).getValue(ColorProperty.INSTANCE).color; + + if(!glowPanelCache.containsKey(hash)) + { + GlowPanelModel model = new GlowPanelModel(baseModel, getModel(), getState(), vertexFormat, textureMap, transformationMap); + model.tempState = state; + glowPanelCache.put(hash, model.getQuads(state, side, rand)); + } + + return glowPanelCache.get(hash); + } + + return super.getQuads(state, side, rand); } @Override diff --git a/src/main/java/mekanism/client/render/obj/TransmitterModel.java b/src/main/java/mekanism/client/render/obj/TransmitterModel.java index 1f2f2d632..cfcff2b0d 100644 --- a/src/main/java/mekanism/client/render/obj/TransmitterModel.java +++ b/src/main/java/mekanism/client/render/obj/TransmitterModel.java @@ -102,38 +102,43 @@ public class TransmitterModel extends OBJBakedModelBase return ImmutableList.of(); } - IExtendedBlockState extended = (IExtendedBlockState)state; - BlockRenderLayer layer = MinecraftForgeClient.getRenderLayer(); - ColorProperty colorProp = extended.getValue(ColorProperty.INSTANCE); - int color = -1; - - if(colorProp != null && colorProp.color != null) - { - color = extended.getValue(ColorProperty.INSTANCE).color.ordinal(); - } - - OBJState obj = extended.getValue(OBJProperty.INSTANCE); - - if(layer != BlockRenderLayer.TRANSLUCENT) - { - color = -1; - } - - int hash = Objects.hash(layer.ordinal(), color, obj.hashCode()); - - if(obj.getVisibilityMap().containsKey(Group.ALL) || obj.getVisibilityMap().containsKey(Group.ALL_EXCEPT)) - { - updateStateVisibilityMap(obj); - } - - if(!modelCache.containsKey(hash)) - { - TransmitterModel model = new TransmitterModel(baseModel, getModel(), obj, vertexFormat, textureMap, transformationMap); - model.tempState = state; - modelCache.put(hash, model.getQuads(state, side, rand)); - } - - return modelCache.get(hash); + if(state != null && tempState == null) + { + IExtendedBlockState extended = (IExtendedBlockState)state; + BlockRenderLayer layer = MinecraftForgeClient.getRenderLayer(); + ColorProperty colorProp = extended.getValue(ColorProperty.INSTANCE); + int color = -1; + + if(colorProp != null && colorProp.color != null) + { + color = extended.getValue(ColorProperty.INSTANCE).color.ordinal(); + } + + OBJState obj = extended.getValue(OBJProperty.INSTANCE); + + if(layer != BlockRenderLayer.TRANSLUCENT) + { + color = -1; + } + + int hash = Objects.hash(layer.ordinal(), color, obj.hashCode()); + + if(obj.getVisibilityMap().containsKey(Group.ALL) || obj.getVisibilityMap().containsKey(Group.ALL_EXCEPT)) + { + updateStateVisibilityMap(obj); + } + + if(!modelCache.containsKey(hash)) + { + TransmitterModel model = new TransmitterModel(baseModel, getModel(), obj, vertexFormat, textureMap, transformationMap); + model.tempState = state; + modelCache.put(hash, model.getQuads(state, side, rand)); + } + + return modelCache.get(hash); + } + + return super.getQuads(state, side, rand); } @Override diff --git a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java index 951e2c812..9162bdf62 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java @@ -45,7 +45,7 @@ public class RenderConfigurableMachine onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer, EnumHand hand) { if(!world.isRemote) { @@ -90,7 +92,7 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem itemstack.stackSize--; } - return itemstack; + return new ActionResult(EnumActionResult.SUCCESS, itemstack); } @Override @@ -113,7 +115,7 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { if(player.isSneaking()) { @@ -123,7 +125,7 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem if(balloonsNear.size() > 0) { - return true; + return EnumActionResult.FAIL; } if(world.getBlockState(pos).getBlock().isReplaceable(world, pos)) @@ -133,7 +135,7 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem if(!world.isSideSolid(pos, EnumFacing.UP)) { - return true; + return EnumActionResult.FAIL; } if(canReplace(world, pos.up()) && canReplace(world, pos.up(2))) @@ -146,12 +148,14 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem world.spawnEntityInWorld(new EntityBalloon(world, new Coord4D(pos, world), getColor(stack))); stack.stackSize--; } + + return EnumActionResult.SUCCESS; } - return true; + return EnumActionResult.FAIL; } - return false; + return EnumActionResult.PASS; } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java index 0dcc3ba9d..08be495ff 100644 --- a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java +++ b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java @@ -18,7 +18,9 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -67,7 +69,7 @@ public class ItemBlockCardboardBox extends ItemBlock } @Override - public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) + public EnumActionResult onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) { if(!player.isSneaking() && !world.isAirBlock(pos) && stack.getItemDamage() == 0) { @@ -108,11 +110,11 @@ public class ItemBlockCardboardBox extends ItemBlock tileEntity.storedData = data; } - return true; + return EnumActionResult.SUCCESS; } } - return false; + return EnumActionResult.PASS; } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index f889fdc39..b6bc05a1e 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -54,7 +54,10 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; @@ -253,16 +256,16 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { MachineType type = MachineType.get(stack); if(type == MachineType.FLUID_TANK && getBucketMode(stack)) { - return false; + return EnumActionResult.PASS; } - return super.onItemUse(stack, player, world, pos, side, hitX, hitY, hitZ); + return super.onItemUse(stack, player, world, pos, hand, side, hitX, hitY, hitZ); } @Override @@ -464,7 +467,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } @Override - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) + public ActionResult onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer, EnumHand hand) { MachineType type = MachineType.get(itemstack); @@ -479,7 +482,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(SecurityUtils.canAccess(entityplayer, itemstack)) { - InventoryPersonalChest inventory = new InventoryPersonalChest(entityplayer); + InventoryPersonalChest inventory = new InventoryPersonalChest(entityplayer, hand); MekanismUtils.openPersonalChestGui((EntityPlayerMP)entityplayer, null, inventory, false); } else { @@ -495,75 +498,75 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(pos == null) { - return itemstack; + return new ActionResult(EnumActionResult.FAIL, itemstack); } - else { - if(pos.typeOfHit == RayTraceResult.Type.BLOCK) - { - Coord4D coord = new Coord4D(pos.getBlockPos(), world); + else { + if(pos.typeOfHit == RayTraceResult.Type.BLOCK) + { + Coord4D coord = new Coord4D(pos.getBlockPos(), world); + + if(!world.provider.canMineBlock(entityplayer, coord.getPos())) + { + return new ActionResult(EnumActionResult.FAIL, itemstack); + } + + if(!entityplayer.isSneaking()) + { + if(!entityplayer.canPlayerEdit(coord.getPos(), pos.sideHit, itemstack)) + { + return new ActionResult(EnumActionResult.FAIL, itemstack); + } + + FluidStack fluid = MekanismUtils.getFluid(world, coord, false); + + if(fluid != null && (getFluidStack(itemstack) == null || getFluidStack(itemstack).isFluidEqual(fluid))) + { + int needed = getCapacity(itemstack)-(getFluidStack(itemstack) != null ? getFluidStack(itemstack).amount : 0); + + if(fluid.amount > needed) + { + return new ActionResult(EnumActionResult.FAIL, itemstack); + } + + if(getFluidStack(itemstack) == null) + { + setFluidStack(fluid, itemstack); + } + else { + FluidStack newStack = getFluidStack(itemstack); + newStack.amount += fluid.amount; + setFluidStack(newStack, itemstack); + } + + world.setBlockToAir(coord.getPos()); + } + } + else { + FluidStack stored = getFluidStack(itemstack); + + if(stored == null || stored.amount < FluidContainerRegistry.BUCKET_VOLUME) + { + return new ActionResult(EnumActionResult.FAIL, itemstack); + } + + Coord4D trans = coord.offset(pos.sideHit); - if(!world.provider.canMineBlock(entityplayer, coord.getPos())) - { - return itemstack; - } + if(!entityplayer.canPlayerEdit(trans.getPos(), pos.sideHit, itemstack)) + { + return new ActionResult(EnumActionResult.FAIL, itemstack); + } - if(!entityplayer.isSneaking()) - { - if(!entityplayer.canPlayerEdit(coord.getPos(), pos.sideHit, itemstack)) - { - return itemstack; - } - - FluidStack fluid = MekanismUtils.getFluid(world, coord, false); - - if(fluid != null && (getFluidStack(itemstack) == null || getFluidStack(itemstack).isFluidEqual(fluid))) - { - int needed = getCapacity(itemstack)-(getFluidStack(itemstack) != null ? getFluidStack(itemstack).amount : 0); - - if(fluid.amount > needed) - { - return itemstack; - } - - if(getFluidStack(itemstack) == null) - { - setFluidStack(fluid, itemstack); - } - else { - FluidStack newStack = getFluidStack(itemstack); - newStack.amount += fluid.amount; - setFluidStack(newStack, itemstack); - } - - world.setBlockToAir(coord.getPos()); - } - } - else { - FluidStack stored = getFluidStack(itemstack); - - if(stored == null || stored.amount < FluidContainerRegistry.BUCKET_VOLUME) - { - return itemstack; - } - - Coord4D trans = coord.offset(pos.sideHit); - - if(!entityplayer.canPlayerEdit(trans.getPos(), pos.sideHit, itemstack)) - { - return itemstack; - } - - if(tryPlaceContainedLiquid(world, itemstack, trans.getPos()) && !entityplayer.capabilities.isCreativeMode) - { - FluidStack newStack = stored.copy(); - newStack.amount -= FluidContainerRegistry.BUCKET_VOLUME; - - setFluidStack(newStack.amount > 0 ? newStack : null, itemstack); - } - } - } - - return itemstack; + if(tryPlaceContainedLiquid(world, itemstack, trans.getPos()) && !entityplayer.capabilities.isCreativeMode) + { + FluidStack newStack = stored.copy(); + newStack.amount -= FluidContainerRegistry.BUCKET_VOLUME; + + setFluidStack(newStack.amount > 0 ? newStack : null, itemstack); + } + } + } + + return new ActionResult(EnumActionResult.SUCCESS, itemstack); } } else { @@ -571,7 +574,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } } - return itemstack; + return new ActionResult(EnumActionResult.PASS, itemstack); } @Override diff --git a/src/main/java/mekanism/common/item/ItemConfigurationCard.java b/src/main/java/mekanism/common/item/ItemConfigurationCard.java index 6f8922367..125689171 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurationCard.java +++ b/src/main/java/mekanism/common/item/ItemConfigurationCard.java @@ -15,7 +15,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; @@ -38,7 +40,7 @@ public class ItemConfigurationCard extends ItemMekanism } @Override - public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) + public EnumActionResult onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) { if(!world.isRemote) { @@ -62,7 +64,7 @@ public class ItemConfigurationCard extends ItemMekanism player.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.configurationCard.got").replaceAll("%s", EnumColor.INDIGO + LangUtils.localize(data.getString("dataType")) + EnumColor.GREY))); } - return true; + return EnumActionResult.SUCCESS; } else if(getData(stack) != null) { @@ -82,12 +84,12 @@ public class ItemConfigurationCard extends ItemMekanism player.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils.localize("tooltip.configurationCard.unequal") + ".")); } - return true; + return EnumActionResult.SUCCESS; } } } - return false; + return EnumActionResult.FAIL; } private NBTTagCompound getBaseData(TileEntity tile) diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 061f16c98..5a99efb58 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -32,7 +32,9 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentString; import net.minecraft.world.IBlockAccess; @@ -66,7 +68,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool } @Override - public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) + public EnumActionResult onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) { if(!world.isRemote) { @@ -109,7 +111,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool } } - return true; + return EnumActionResult.SUCCESS; } else if(MekanismUtils.hasCapability(tile, Capabilities.CONFIGURABLE_CAPABILITY, side)) { @@ -128,7 +130,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool else { SecurityUtils.displayNoAccess(player); - return true; + return EnumActionResult.SUCCESS; } } } @@ -184,11 +186,11 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool } } - return true; + return EnumActionResult.SUCCESS; } else { SecurityUtils.displayNoAccess(player); - return true; + return EnumActionResult.FAIL; } } } @@ -205,15 +207,15 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool block.rotateBlock(world, pos, side.getOpposite()); } - return true; + return EnumActionResult.SUCCESS; } else if(getState(stack) == ConfiguratorMode.WRENCH) //Wrench { - return false; + return EnumActionResult.PASS; } } - return false; + return EnumActionResult.PASS; } public String getViewModeText(TransmissionType type) diff --git a/src/main/java/mekanism/common/item/ItemCraftingFormula.java b/src/main/java/mekanism/common/item/ItemCraftingFormula.java index c57490cc7..de5b7b4ce 100644 --- a/src/main/java/mekanism/common/item/ItemCraftingFormula.java +++ b/src/main/java/mekanism/common/item/ItemCraftingFormula.java @@ -13,6 +13,9 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -75,19 +78,22 @@ public class ItemCraftingFormula extends ItemMekanism } @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { - if(player.isSneaking() && !world.isRemote) + if(player.isSneaking()) { - setInventory(stack, null); - setInvalid(stack, false); + if(!world.isRemote) + { + setInventory(stack, null); + setInvalid(stack, false); + + ((EntityPlayerMP)player).sendContainerToPlayer(player.openContainer); + } - ((EntityPlayerMP)player).sendContainerToPlayer(player.openContainer); - - return stack; + return new ActionResult(EnumActionResult.SUCCESS, stack); } - return stack; + return new ActionResult(EnumActionResult.PASS, stack); } @Override diff --git a/src/main/java/mekanism/common/item/ItemDictionary.java b/src/main/java/mekanism/common/item/ItemDictionary.java index 86f42feb0..88cf789c9 100644 --- a/src/main/java/mekanism/common/item/ItemDictionary.java +++ b/src/main/java/mekanism/common/item/ItemDictionary.java @@ -10,7 +10,10 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; @@ -24,7 +27,7 @@ public class ItemDictionary extends ItemMekanism } @Override - public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) + public EnumActionResult onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) { if(!player.isSneaking()) { @@ -52,21 +55,21 @@ public class ItemDictionary extends ItemMekanism } } - return true; + return EnumActionResult.SUCCESS; } } - return false; + return EnumActionResult.PASS; } @Override - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) + public ActionResult onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer, EnumHand hand) { if(entityplayer.isSneaking()) { entityplayer.openGui(Mekanism.instance, 0, world, 0, 0, 0); } - return itemstack; + return new ActionResult(EnumActionResult.SUCCESS, itemstack); } } diff --git a/src/main/java/mekanism/common/item/ItemElectricBow.java b/src/main/java/mekanism/common/item/ItemElectricBow.java index 1db002d2b..6bf569c06 100644 --- a/src/main/java/mekanism/common/item/ItemElectricBow.java +++ b/src/main/java/mekanism/common/item/ItemElectricBow.java @@ -2,17 +2,28 @@ package mekanism.common.item; import java.util.List; +import javax.annotation.Nullable; + import mekanism.api.EnumColor; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; -import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.init.Enchantments; import net.minecraft.init.Items; +import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumAction; +import net.minecraft.item.ItemArrow; import net.minecraft.item.ItemStack; +import net.minecraft.stats.StatList; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.world.World; +import net.minecraftforge.event.ForgeEventFactory; public class ItemElectricBow extends ItemEnergized { @@ -31,15 +42,25 @@ public class ItemElectricBow extends ItemEnergized } @Override - public void onPlayerStoppedUsing(ItemStack itemstack, World world, EntityPlayer player, int itemUseCount) + public void onPlayerStoppedUsing(ItemStack itemstack, World world, EntityLivingBase entityLiving, int itemUseCount) { - if(getEnergy(itemstack) > 0) + if(entityLiving instanceof EntityPlayer && getEnergy(itemstack) > 0) { - boolean flag = player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, itemstack) > 0; + EntityPlayer player = (EntityPlayer)entityLiving; + boolean flag = player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantments.INFINITY, itemstack) > 0; + ItemStack ammo = findAmmo(player); + + int maxItemUse = getMaxItemUseDuration(itemstack) - itemUseCount; + maxItemUse = ForgeEventFactory.onArrowLoose(itemstack, world, player, maxItemUse, itemstack != null || flag); + if(maxItemUse < 0) return; - if(flag || player.inventory.hasItem(Items.arrow)) + if(flag || ammo != null) { - int maxItemUse = getMaxItemUseDuration(itemstack) - itemUseCount; + if(ammo == null) + { + ammo = new ItemStack(Items.ARROW); + } + float f = maxItemUse / 20F; f = (f * f + f * 2.0F) / 3F; @@ -52,34 +73,48 @@ public class ItemElectricBow extends ItemEnergized { f = 1.0F; } - - EntityArrow entityarrow = new EntityArrow(world, player, f * 2.0F); - - if(f == 1.0F) - { - entityarrow.setIsCritical(true); - } - - if(!player.capabilities.isCreativeMode) - { - setEnergy(itemstack, getEnergy(itemstack) - (getFireState(itemstack) ? 1200 : 120)); - } - - world.playSoundAtEntity(player, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.5F); - - if(flag) - { - entityarrow.canBePickedUp = 2; - } - else { - player.inventory.consumeInventoryItem(Items.arrow); - } + + boolean noConsume = flag && itemstack.getItem() instanceof ItemArrow; if(!world.isRemote) { - world.spawnEntityInWorld(entityarrow); - entityarrow.setFire(getFireState(itemstack) ? 60 : 0); + ItemArrow itemarrow = (ItemArrow)(ammo.getItem() instanceof ItemArrow ? ammo.getItem() : Items.ARROW); + EntityArrow entityarrow = itemarrow.createArrow(world, itemstack, player); + entityarrow.setAim(player, player.rotationPitch, player.rotationYaw, 0.0F, f * 3.0F, 1.0F); + + if(f == 1.0F) + { + entityarrow.setIsCritical(true); + } + + if(!player.capabilities.isCreativeMode) + { + setEnergy(itemstack, getEnergy(itemstack) - (getFireState(itemstack) ? 1200 : 120)); + } + + if(noConsume) + { + entityarrow.pickupStatus = EntityArrow.PickupStatus.CREATIVE_ONLY; + } + + entityarrow.setFire(getFireState(itemstack) ? 100 : 0); + + world.spawnEntityInWorld(entityarrow); } + + world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.NEUTRAL, 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.5F); + + if(!noConsume) + { + itemstack.stackSize--; + + if(itemstack.stackSize == 0) + { + player.inventory.deleteStack(itemstack); + } + } + + player.addStat(StatList.getObjectUseStats(this)); } } } @@ -95,16 +130,53 @@ public class ItemElectricBow extends ItemEnergized { return EnumAction.BOW; } + + private ItemStack findAmmo(EntityPlayer player) + { + if(isArrow(player.getHeldItem(EnumHand.OFF_HAND))) + { + return player.getHeldItem(EnumHand.OFF_HAND); + } + else if(isArrow(player.getHeldItem(EnumHand.MAIN_HAND))) + { + return player.getHeldItem(EnumHand.MAIN_HAND); + } + else { + for(int i = 0; i < player.inventory.getSizeInventory(); ++i) + { + ItemStack itemstack = player.inventory.getStackInSlot(i); + + if(isArrow(itemstack)) + { + return itemstack; + } + } + + return null; + } + } + + protected boolean isArrow(@Nullable ItemStack stack) + { + return stack != null && stack.getItem() instanceof ItemArrow; + } @Override - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) + public ActionResult onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn, EnumHand hand) { - if(entityplayer.capabilities.isCreativeMode || entityplayer.inventory.hasItem(Items.arrow)) - { - entityplayer.setItemInUse(itemstack, getMaxItemUseDuration(itemstack)); - } + boolean flag = findAmmo(playerIn) != null; - return itemstack; + ActionResult ret = ForgeEventFactory.onArrowNock(itemStackIn, worldIn, playerIn, hand, flag); + if(ret != null) return ret; + + if(!playerIn.capabilities.isCreativeMode && !flag) + { + return !flag ? new ActionResult(EnumActionResult.FAIL, itemStackIn) : new ActionResult(EnumActionResult.PASS, itemStackIn); + } + else { + playerIn.setActiveHand(hand); + return new ActionResult(EnumActionResult.SUCCESS, itemStackIn); + } } public void setFireState(ItemStack itemstack, boolean state) diff --git a/src/main/java/mekanism/common/item/ItemFactoryInstaller.java b/src/main/java/mekanism/common/item/ItemFactoryInstaller.java index 1f4cd6b0e..977f0bf4a 100644 --- a/src/main/java/mekanism/common/item/ItemFactoryInstaller.java +++ b/src/main/java/mekanism/common/item/ItemFactoryInstaller.java @@ -18,7 +18,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -32,11 +34,11 @@ public class ItemFactoryInstaller extends ItemMekanism implements IMetaItem } @Override - public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) + public EnumActionResult onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) { if(world.isRemote) { - return false; + return EnumActionResult.PASS; } TileEntity tile = world.getTileEntity(pos); @@ -44,7 +46,7 @@ public class ItemFactoryInstaller extends ItemMekanism implements IMetaItem if(tile instanceof TileEntityBasicBlock && ((TileEntityBasicBlock)tile).playersUsing.size() > 0) { - return true; + return EnumActionResult.FAIL; } if(tile instanceof TileEntityFactory && tier != FactoryTier.BASIC) @@ -63,7 +65,7 @@ public class ItemFactoryInstaller extends ItemMekanism implements IMetaItem stack.stackSize = 0; } - return true; + return EnumActionResult.SUCCESS; } } else if(tile != null && tier == FactoryTier.BASIC) @@ -74,6 +76,7 @@ public class ItemFactoryInstaller extends ItemMekanism implements IMetaItem { ItemStack machineStack = iterType.getStack(); IBlockState state = world.getBlockState(pos); + if(Block.getBlockFromItem(machineStack.getItem()) == state.getBlock() && machineStack.getItemDamage() == state.getBlock().getMetaFromState(state)) { type = iterType; @@ -92,7 +95,7 @@ public class ItemFactoryInstaller extends ItemMekanism implements IMetaItem stack.stackSize = 0; } - return true; + return EnumActionResult.SUCCESS; } else if(tile instanceof TileEntityAdvancedElectricMachine) { @@ -103,7 +106,7 @@ public class ItemFactoryInstaller extends ItemMekanism implements IMetaItem stack.stackSize = 0; } - return true; + return EnumActionResult.SUCCESS; } else if(tile instanceof TileEntityMetallurgicInfuser) { @@ -114,12 +117,12 @@ public class ItemFactoryInstaller extends ItemMekanism implements IMetaItem stack.stackSize = 0; } - return true; + return EnumActionResult.SUCCESS; } } } - return false; + return EnumActionResult.PASS; } private int getOutputSlot(FactoryTier tier, int operation) diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java index 6e6761194..d87766444 100644 --- a/src/main/java/mekanism/common/item/ItemGaugeDropper.java +++ b/src/main/java/mekanism/common/item/ItemGaugeDropper.java @@ -14,6 +14,9 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; @@ -64,7 +67,7 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo } @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if(player.isSneaking() && !world.isRemote) { @@ -73,10 +76,10 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo ((EntityPlayerMP)player).sendContainerToPlayer(player.openContainer); - return stack; + return new ActionResult(EnumActionResult.SUCCESS, stack); } - return stack; + return new ActionResult(EnumActionResult.PASS, stack); } @Override diff --git a/src/main/java/mekanism/common/item/ItemNetworkReader.java b/src/main/java/mekanism/common/item/ItemNetworkReader.java index c6c68a87a..6ff41e4c7 100644 --- a/src/main/java/mekanism/common/item/ItemNetworkReader.java +++ b/src/main/java/mekanism/common/item/ItemNetworkReader.java @@ -15,7 +15,9 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; @@ -30,7 +32,7 @@ public class ItemNetworkReader extends ItemEnergized } @Override - public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) + public EnumActionResult onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) { if(!world.isRemote) { @@ -61,7 +63,7 @@ public class ItemNetworkReader extends ItemEnergized player.addChatMessage(new TextComponentString(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); - return true; + return EnumActionResult.SUCCESS; } else if(MekanismUtils.hasCapability(tileEntity, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite())) { @@ -72,7 +74,7 @@ public class ItemNetworkReader extends ItemEnergized player.addChatMessage(new TextComponentString(EnumColor.GREY + " *Temperature: " + EnumColor.DARK_GREY + transfer.getTemp() + "K above ambient")); player.addChatMessage(new TextComponentString(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); - return true; + return EnumActionResult.SUCCESS; } else { if(drain) setEnergy(stack, getEnergy(stack)-ENERGY_PER_USE); @@ -100,7 +102,7 @@ public class ItemNetworkReader extends ItemEnergized } } - return true; + return EnumActionResult.SUCCESS; } } @@ -118,7 +120,7 @@ public class ItemNetworkReader extends ItemEnergized } } - return false; + return EnumActionResult.PASS; } @Override diff --git a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java index 208ab92e4..6bddff5f2 100644 --- a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java +++ b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java @@ -15,6 +15,9 @@ import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; @@ -46,7 +49,7 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem } @Override - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) + public ActionResult onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer, EnumHand hand) { if(!world.isRemote) { @@ -58,7 +61,7 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem else { if(SecurityUtils.canAccess(entityplayer, itemstack)) { - entityplayer.openGui(Mekanism.instance, 14, world, 0, 0, 0); + entityplayer.openGui(Mekanism.instance, 14, world, hand.ordinal(), 0, 0); } else { SecurityUtils.displayNoAccess(entityplayer); @@ -66,7 +69,7 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem } } - return itemstack; + return new ActionResult(EnumActionResult.SUCCESS, itemstack); } public static double calculateEnergyCost(Entity entity, Coord4D coords) diff --git a/src/main/java/mekanism/common/item/ItemRobit.java b/src/main/java/mekanism/common/item/ItemRobit.java index a916e78b4..a6e4940c4 100644 --- a/src/main/java/mekanism/common/item/ItemRobit.java +++ b/src/main/java/mekanism/common/item/ItemRobit.java @@ -13,7 +13,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -37,13 +39,14 @@ public class ItemRobit extends ItemEnergized implements ISustainedInventory } @Override - public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, BlockPos pos, EnumFacing side, float posX, float posY, float posZ) + public EnumActionResult onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, BlockPos pos, EnumHand hand, EnumFacing side, float posX, float posY, float posZ) { TileEntity tileEntity = world.getTileEntity(pos); if(tileEntity instanceof TileEntityChargepad) { TileEntityChargepad chargepad = (TileEntityChargepad)tileEntity; + if(!chargepad.isActive) { if(!world.isRemote) @@ -59,13 +62,13 @@ public class ItemRobit extends ItemEnergized implements ISustainedInventory world.spawnEntityInWorld(robit); } - entityplayer.setCurrentItemOrArmor(0, null); + entityplayer.setHeldItem(hand, null); - return true; + return EnumActionResult.SUCCESS; } } - return false; + return EnumActionResult.PASS; } @Override diff --git a/src/main/java/mekanism/common/item/ItemSeismicReader.java b/src/main/java/mekanism/common/item/ItemSeismicReader.java index f6933e4c4..192d21d80 100644 --- a/src/main/java/mekanism/common/item/ItemSeismicReader.java +++ b/src/main/java/mekanism/common/item/ItemSeismicReader.java @@ -7,6 +7,9 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; @@ -26,7 +29,7 @@ public class ItemSeismicReader extends ItemEnergized } @Override - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) + public ActionResult onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer, EnumHand hand) { Chunk3D chunk = new Chunk3D(entityplayer); @@ -37,7 +40,7 @@ public class ItemSeismicReader extends ItemEnergized entityplayer.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils.localize("tooltip.seismicReader.needsEnergy"))); } - return itemstack; + return new ActionResult(EnumActionResult.SUCCESS, itemstack); } else if(!MekanismUtils.isChunkVibrated(chunk)) { @@ -46,7 +49,7 @@ public class ItemSeismicReader extends ItemEnergized entityplayer.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils.localize("tooltip.seismicReader.noVibrations"))); } - return itemstack; + return new ActionResult(EnumActionResult.SUCCESS, itemstack); } if(!entityplayer.capabilities.isCreativeMode) @@ -54,8 +57,8 @@ public class ItemSeismicReader extends ItemEnergized setEnergy(itemstack, getEnergy(itemstack)-ENERGY_USAGE); } - entityplayer.openGui(Mekanism.instance, 38, world, (int)entityplayer.posX, (int)entityplayer.posY, (int)entityplayer.posZ); + entityplayer.openGui(Mekanism.instance, 38, world, hand.ordinal(), 0, 0); - return itemstack; + return new ActionResult(EnumActionResult.PASS, itemstack); } } diff --git a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java index 3a0d5d2bc..0aae3ca9a 100644 --- a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java +++ b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java @@ -10,6 +10,9 @@ import mekanism.common.util.LangUtils; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.world.World; public class ItemWalkieTalkie extends ItemMekanism @@ -44,14 +47,16 @@ public class ItemWalkieTalkie extends ItemMekanism } @Override - public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) + public ActionResult onItemRightClick(ItemStack itemStack, World world, EntityPlayer player, EnumHand hand) { if(player.isSneaking()) { setOn(itemStack, !getOn(itemStack)); + + return new ActionResult(EnumActionResult.SUCCESS, itemStack); } - return itemStack; + return new ActionResult(EnumActionResult.PASS, itemStack); } @Override diff --git a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java index 3bdffad43..f814ed197 100644 --- a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java @@ -41,7 +41,7 @@ public class ItemPartTransmitter extends ItemMultiPart implements IMetaItem setHasSubtypes(true); setCreativeTab(Mekanism.tabMekanism); } - + @Override public IMultipart createPart(World world, BlockPos pos, EnumFacing dir, Vec3d hit, ItemStack stack, EntityPlayer player) { diff --git a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java index 0d606398b..1d6e11ee3 100644 --- a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java @@ -14,6 +14,7 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextComponentString; @@ -105,7 +106,7 @@ public class PartDiversionTransporter extends PartLogisticalTransporter } @Override - protected boolean onConfigure(EntityPlayer player, int part, EnumFacing side) + protected EnumActionResult onConfigure(EntityPlayer player, int part, EnumFacing side) { int newMode = (modes[side.ordinal()] + 1) % 3; String description = "ERROR"; @@ -132,7 +133,7 @@ public class PartDiversionTransporter extends PartLogisticalTransporter Coord4D coord = new Coord4D(getPos(), getWorld()); Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord, getNetworkedData(new ArrayList())), new Range4D(coord)); - return true; + return EnumActionResult.SUCCESS; } @Override diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java index 14c09d7ae..d9c198fa1 100644 --- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java @@ -33,6 +33,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextComponentString; @@ -333,7 +334,7 @@ public class PartLogisticalTransporter extends PartTransmitter