mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-21 20:52:42 +00:00
Merge pull request #2125 from HenryLoenwind/magnetKey
KeyBinding for the Magnet
This commit is contained in:
commit
f3c8d213dd
4 files changed
+153
No files matched your search
@@ -55,6 +55,7 @@ public class KeyTracker {
|
||||
|
||||
private KeyBinding yetaWrenchMode;
|
||||
|
||||
private KeyBinding magnetKey;
|
||||
|
||||
public KeyTracker() {
|
||||
glideKey = new KeyBinding(Lang.localize("keybind.glidertoggle"), Keyboard.KEY_G, Lang.localize("category.darksteelarmor"));
|
||||
@@ -74,6 +75,9 @@ public class KeyTracker {
|
||||
|
||||
yetaWrenchMode = new KeyBinding(Lang.localize("keybind.yetawrenchmode"), Keyboard.KEY_Y, Lang.localize("category.tools"));
|
||||
ClientRegistry.registerKeyBinding(yetaWrenchMode);
|
||||
|
||||
magnetKey = new KeyBinding(Lang.localize("keybind.magnet"), Keyboard.CHAR_NONE, Lang.localize("category.tools"));
|
||||
ClientRegistry.registerKeyBinding(magnetKey);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
@@ -85,6 +89,13 @@ public class KeyTracker {
|
||||
handleGoggles();
|
||||
handleStepAssist();
|
||||
handleSpeed();
|
||||
handleMagnet();
|
||||
}
|
||||
|
||||
private void handleMagnet() {
|
||||
if(magnetKey.getIsKeyPressed()) {
|
||||
MagnetController.handleKeypress();
|
||||
}
|
||||
}
|
||||
|
||||
private void handleSpeed() {
|
||||
|
||||
@@ -1,21 +1,38 @@
|
||||
package crazypants.enderio.item;
|
||||
|
||||
import static crazypants.enderio.EnderIO.itemMagnet;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.entity.EntityClientPlayerMP;
|
||||
import net.minecraft.command.IEntitySelector;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.item.EntityXPOrb;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import crazypants.enderio.config.Config;
|
||||
import crazypants.enderio.item.PacketMagnetState.SlotType;
|
||||
import crazypants.enderio.item.darksteel.PacketDarkSteelPowerPacket;
|
||||
import crazypants.enderio.item.darksteel.PacketUpgradeState;
|
||||
import crazypants.enderio.network.PacketHandler;
|
||||
import crazypants.enderio.tool.BaublesTool;
|
||||
|
||||
public class MagnetController implements IEntitySelector {
|
||||
|
||||
public MagnetController() {
|
||||
PacketHandler.INSTANCE.registerMessage(PacketMagnetState.class, PacketMagnetState.class, PacketHandler.nextID(), Side.SERVER);
|
||||
}
|
||||
|
||||
|
||||
@SubscribeEvent
|
||||
public void onPlayerTick(TickEvent.PlayerTickEvent event) {
|
||||
|
||||
@@ -88,4 +105,77 @@ public class MagnetController implements IEntitySelector {
|
||||
}
|
||||
}
|
||||
|
||||
public static void setMagnetActive(EntityPlayerMP player, SlotType type, int slot, boolean isActive) {
|
||||
ItemStack stack = null;
|
||||
IInventory baubles = null;
|
||||
int dropOff = -1;
|
||||
switch (type) {
|
||||
case INVENTORY:
|
||||
stack = player.inventory.getStackInSlot(slot);
|
||||
break;
|
||||
case ARMOR:
|
||||
return;
|
||||
case BAUBLES:
|
||||
baubles = BaublesTool.getInstance().getBaubles(player);
|
||||
if (baubles != null) {
|
||||
stack = baubles.getStackInSlot(slot);
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (stack == null || stack.getItem() == null || stack.getItem() != itemMagnet || ItemMagnet.isActive(stack) == isActive) {
|
||||
return;
|
||||
}
|
||||
if (type == SlotType.BAUBLES) {
|
||||
ItemStack[] inv = player.inventory.mainInventory;
|
||||
for (int i = 0; i < inv.length && dropOff < 0; i++) {
|
||||
if (inv[i] == null) {
|
||||
dropOff = i;
|
||||
}
|
||||
}
|
||||
if (dropOff < 0) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
ItemMagnet.setActive(stack, isActive);
|
||||
switch (type) {
|
||||
case INVENTORY:
|
||||
player.inventory.setInventorySlotContents(slot, stack);
|
||||
player.inventory.markDirty();
|
||||
break;
|
||||
case ARMOR:
|
||||
return;
|
||||
case BAUBLES:
|
||||
baubles.setInventorySlotContents(slot, null);
|
||||
player.inventory.setInventorySlotContents(dropOff, stack);
|
||||
player.inventory.markDirty();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
public static void handleKeypress() {
|
||||
EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer;
|
||||
ItemStack[] inv = player.inventory.mainInventory;
|
||||
for (int i = 0; i < 9; i++) {
|
||||
if (inv[i] != null && inv[i].getItem() != null && inv[i].getItem() == itemMagnet) {
|
||||
boolean isActive = !ItemMagnet.isActive(inv[i]);
|
||||
ItemMagnet.setActive(inv[i], isActive);
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketMagnetState(SlotType.INVENTORY, i, isActive));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
IInventory baubles = BaublesTool.getInstance().getBaubles(player);
|
||||
if (baubles != null) {
|
||||
for (int i = 0; i < baubles.getSizeInventory(); i++) {
|
||||
ItemStack stack = baubles.getStackInSlot(i);
|
||||
if (stack != null && stack.getItem() != null && stack.getItem() == itemMagnet) {
|
||||
ItemMagnet.setActive(stack, false);
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketMagnetState(SlotType.BAUBLES, i, false));
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
package crazypants.enderio.item;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
|
||||
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
||||
|
||||
public class PacketMagnetState implements IMessage, IMessageHandler<PacketMagnetState, IMessage> {
|
||||
|
||||
public enum SlotType {
|
||||
INVENTORY,
|
||||
ARMOR,
|
||||
BAUBLES
|
||||
}
|
||||
|
||||
public PacketMagnetState() {
|
||||
}
|
||||
|
||||
private boolean isActive;
|
||||
private SlotType type;
|
||||
private int slot;
|
||||
|
||||
public PacketMagnetState(SlotType slottype, int slot, boolean isActive) {
|
||||
this.type = slottype;
|
||||
this.slot = slot;
|
||||
this.isActive = isActive;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void toBytes(ByteBuf buf) {
|
||||
buf.writeShort(type.ordinal());
|
||||
buf.writeInt(slot);
|
||||
buf.writeBoolean(isActive);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fromBytes(ByteBuf buf) {
|
||||
type = SlotType.values()[buf.readShort()];
|
||||
slot = buf.readInt();
|
||||
isActive = buf.readBoolean();
|
||||
}
|
||||
|
||||
@Override
|
||||
public IMessage onMessage(PacketMagnetState message, MessageContext ctx) {
|
||||
EntityPlayerMP player = ctx.getServerHandler().playerEntity;
|
||||
MagnetController.setMagnetActive(player, message.type, message.slot, message.isActive);
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user