mirror of
https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git
synced 2026-11-16 01:54:59 +00:00
Remove client-side terminal checks
This commit is contained in:
1 parent
f8e40f842b
commit
75c62058d4
2 files changed
+2
-15
No files matched your search
@@ -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<Integer, ItemStack> 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) {
|
||||
|
||||
@@ -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<IAEItemStack> terminalInventory = getWirelessInventory(player);
|
||||
if (terminalInventory == null) {
|
||||
player.addChatMessage(new ChatComponentText("Could not access AE2 network."));
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user