diff --git a/src/main/java/forestry/core/gui/ContainerForestry.java b/src/main/java/forestry/core/gui/ContainerForestry.java index cd8b337e3..49d3d5194 100644 --- a/src/main/java/forestry/core/gui/ContainerForestry.java +++ b/src/main/java/forestry/core/gui/ContainerForestry.java @@ -65,7 +65,7 @@ public abstract class ContainerForestry extends Container { return null; } - if (clickTypeIn == ClickType.QUICK_MOVE && dragType_or_button >= 0 && dragType_or_button < 9) { + if (clickTypeIn == ClickType.SWAP && dragType_or_button >= 0 && dragType_or_button < 9) { // hotkey used to move item from slot to hotbar int hotbarSlotIndex = 27 + dragType_or_button; Slot hotbarSlot = getSlot(hotbarSlotIndex); diff --git a/src/main/java/forestry/core/gui/slots/SlotLocked.java b/src/main/java/forestry/core/gui/slots/SlotLocked.java index 118c8466f..73db9dd4f 100755 --- a/src/main/java/forestry/core/gui/slots/SlotLocked.java +++ b/src/main/java/forestry/core/gui/slots/SlotLocked.java @@ -32,11 +32,6 @@ public class SlotLocked extends SlotForestry { return false; } - @Override - public boolean getHasStack() { - return false; - } - @Override public ItemStack decrStackSize(int i) { return null; diff --git a/src/main/java/forestry/core/gui/widgets/ItemStackWidgetBase.java b/src/main/java/forestry/core/gui/widgets/ItemStackWidgetBase.java index 697702e55..7da24f2af 100644 --- a/src/main/java/forestry/core/gui/widgets/ItemStackWidgetBase.java +++ b/src/main/java/forestry/core/gui/widgets/ItemStackWidgetBase.java @@ -10,9 +10,13 @@ ******************************************************************************/ package forestry.core.gui.widgets; +import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.core.gui.GuiUtil; import forestry.core.gui.tooltips.ToolTip; import forestry.core.proxy.Proxies; @@ -32,13 +36,15 @@ public abstract class ItemStackWidgetBase extends Widget { } } + @SideOnly(Side.CLIENT) @Override public ToolTip getToolTip(int mouseX, int mouseY) { - EntityPlayer player = Proxies.common.getPlayer(); + Minecraft minecraft = Proxies.common.getClientInstance(); + EntityPlayer player = minecraft.thePlayer; ItemStack itemStack = getItemStack(); ToolTip tip = new ToolTip(); if (itemStack != null) { - tip.add(itemStack.getTooltip(player, false)); + tip.add(itemStack.getTooltip(player, minecraft.gameSettings.advancedItemTooltips)); } return tip; } diff --git a/src/main/java/forestry/core/gui/widgets/SocketWidget.java b/src/main/java/forestry/core/gui/widgets/SocketWidget.java index b82b1b5f3..93cc0cdd9 100755 --- a/src/main/java/forestry/core/gui/widgets/SocketWidget.java +++ b/src/main/java/forestry/core/gui/widgets/SocketWidget.java @@ -10,12 +10,16 @@ ******************************************************************************/ package forestry.core.gui.widgets; +import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.core.circuits.ISocketable; import forestry.core.circuits.ISolderingIron; import forestry.core.circuits.ItemCircuitBoard; @@ -43,6 +47,7 @@ public class SocketWidget extends Widget { } } + @SideOnly(Side.CLIENT) @Override public ToolTip getToolTip(int mouseX, int mouseY) { return toolTip; @@ -50,12 +55,14 @@ public class SocketWidget extends Widget { private final ToolTip toolTip = new ToolTip(250) { @Override + @SideOnly(Side.CLIENT) public void refresh() { toolTip.clear(); ItemStack stack = tile.getSocket(slot); if (stack != null) { - EntityPlayer player = Proxies.common.getClientInstance().thePlayer; - toolTip.add(stack.getTooltip(player, false)); + Minecraft minecraft = Proxies.common.getClientInstance(); + EntityPlayer player = minecraft.thePlayer; + toolTip.add(stack.getTooltip(player, minecraft.gameSettings.advancedItemTooltips)); toolTip.add(TextFormatting.ITALIC + Translator.translateToLocal("for.gui.socket.remove")); } else { toolTip.add(Translator.translateToLocal("for.gui.emptysocket")); diff --git a/src/main/java/forestry/greenhouse/gui/widgets/WidgetCamouflageSlot.java b/src/main/java/forestry/greenhouse/gui/widgets/WidgetCamouflageSlot.java index 5a72616cf..2a1e44c18 100644 --- a/src/main/java/forestry/greenhouse/gui/widgets/WidgetCamouflageSlot.java +++ b/src/main/java/forestry/greenhouse/gui/widgets/WidgetCamouflageSlot.java @@ -22,6 +22,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.core.EnumCamouflageType; import forestry.api.core.ICamouflageHandler; import forestry.api.greenhouse.GreenhouseManager; @@ -68,7 +71,9 @@ public class WidgetCamouflageSlot extends Widget { Block block = Block.getBlockFromItem(stack.getItem()); if (!GreenhouseManager.greenhouseAccess.isOnCamouflageBlockBlackList(type, stack)) { IBlockState stateFromMeta = block.getStateFromMeta(stack.getItemDamage()); - if (type == EnumCamouflageType.DEFAULT && block.isOpaqueCube(stateFromMeta) && !block.hasTileEntity(stateFromMeta) && block.isNormalCube(stateFromMeta, player.worldObj, camouflageHandler.getCoordinates()) || type == EnumCamouflageType.GLASS && GreenhouseManager.greenhouseAccess.isGreenhouseGlass(stack)) { + if (type == EnumCamouflageType.DEFAULT && block.isOpaqueCube(stateFromMeta) && !block.hasTileEntity(stateFromMeta) && block.isNormalCube(stateFromMeta, player.worldObj, camouflageHandler.getCoordinates())) { + camouflageHandler.setCamouflageBlock(type, stack); + } else if (type == EnumCamouflageType.GLASS && GreenhouseManager.greenhouseAccess.isGreenhouseGlass(stack)) { camouflageHandler.setCamouflageBlock(type, stack); } } @@ -87,6 +92,7 @@ public class WidgetCamouflageSlot extends Widget { protected final ToolTip toolTip = new ToolTip(250) { @Override + @SideOnly(Side.CLIENT) public void refresh() { toolTip.clear(); String typeName = type.name().toLowerCase(Locale.ENGLISH); @@ -100,7 +106,8 @@ public class WidgetCamouflageSlot extends Widget { if (camouflageHandler == null || camouflageBlock == null) { toolTip.add(TextFormatting.ITALIC.toString() + Translator.translateToLocal("for.gui.empty")); } else { - toolTip.add(TextFormatting.ITALIC.toString() + camouflageBlock.getTooltip(Proxies.common.getClientInstance().thePlayer, false)); + Minecraft minecraft = Proxies.common.getClientInstance(); + toolTip.add(TextFormatting.ITALIC.toString() + camouflageBlock.getTooltip(minecraft.thePlayer, minecraft.gameSettings.advancedItemTooltips)); } } };