diff --git a/src/main/java/com/glodblock/github/loader/KeybindLoader.java b/src/main/java/com/glodblock/github/loader/KeybindLoader.java index 585f215b..66e09397 100644 --- a/src/main/java/com/glodblock/github/loader/KeybindLoader.java +++ b/src/main/java/com/glodblock/github/loader/KeybindLoader.java @@ -4,7 +4,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.settings.KeyBinding; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.MovingObjectPosition; import org.apache.commons.lang3.tuple.ImmutablePair; @@ -100,19 +99,6 @@ public class KeybindLoader implements Runnable { EntityClientPlayerMP player = minecraft.thePlayer; if (player == null) return; - // Ensure the player has the wireless terminal - ImmutablePair terminalAndInventorySlot = Util.getWirelessTerminal(player); - if (terminalAndInventorySlot == null) { - player.addChatMessage(new ChatComponentText("Could not find wireless terminal.")); - return; - } - - ItemStack terminal = terminalAndInventorySlot.getRight(); - if (terminal == null) { - player.addChatMessage(new ChatComponentText("Could not find wireless terminal.")); - return; - } - // Get the block the player is currently looking at MovingObjectPosition movingObject = minecraft.objectMouseOver; if (movingObject == null || movingObject.typeOfHit != MovingObjectPosition.MovingObjectType.BLOCK) { diff --git a/src/main/java/com/glodblock/github/network/CPacketPickBlockWithdraw.java b/src/main/java/com/glodblock/github/network/CPacketPickBlockWithdraw.java index 1f757476..fbff6d12 100644 --- a/src/main/java/com/glodblock/github/network/CPacketPickBlockWithdraw.java +++ b/src/main/java/com/glodblock/github/network/CPacketPickBlockWithdraw.java @@ -8,7 +8,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.network.play.server.S09PacketHeldItemChange; +import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerWirelessCraftingTerminal; import net.p455w0rd.wirelesscraftingterminal.common.utils.RandomUtils; @@ -90,6 +90,7 @@ public class CPacketPickBlockWithdraw implements IMessage { // Ensure the player has a wireless terminal IMEInventoryHandler terminalInventory = getWirelessInventory(player); if (terminalInventory == null) { + player.addChatMessage(new ChatComponentText("Could not access AE2 network.")); return null; }