diff --git a/src/main/java/noppes/npcs/EventHooks.java b/src/main/java/noppes/npcs/EventHooks.java index dcb421163..c5e54cfc9 100644 --- a/src/main/java/noppes/npcs/EventHooks.java +++ b/src/main/java/noppes/npcs/EventHooks.java @@ -262,9 +262,9 @@ public class EventHooks { WrapperNpcAPI.EVENT_BUS.post(event); } - public static void onPlayerKeyPressed(EntityPlayerMP player, int button, boolean isCtrlPressed, boolean isShiftPressed, boolean isAltPressed, boolean isMetaPressed, boolean buttonDown) { + public static void onPlayerKeyPressed(EntityPlayerMP player, int button, boolean isCtrlPressed, boolean isShiftPressed, boolean isAltPressed, boolean isMetaPressed, boolean buttonDown, int[] heldKeys) { PlayerDataScript handler = ScriptController.Instance.playerScripts; - KeyPressedEvent event = new KeyPressedEvent((ScriptPlayer)ScriptController.Instance.getScriptForEntity(player), button, isCtrlPressed, isAltPressed, isShiftPressed, isMetaPressed, buttonDown); + KeyPressedEvent event = new KeyPressedEvent((ScriptPlayer)ScriptController.Instance.getScriptForEntity(player), button, isCtrlPressed, isAltPressed, isShiftPressed, isMetaPressed, buttonDown, heldKeys); handler.callScript(EnumScriptType.KEY_PRESSED, event); WrapperNpcAPI.EVENT_BUS.post(event); } diff --git a/src/main/java/noppes/npcs/PacketHandlerPlayer.java b/src/main/java/noppes/npcs/PacketHandlerPlayer.java index 55f3faabb..71e101d49 100644 --- a/src/main/java/noppes/npcs/PacketHandlerPlayer.java +++ b/src/main/java/noppes/npcs/PacketHandlerPlayer.java @@ -3,6 +3,8 @@ package noppes.npcs; import io.netty.buffer.ByteBuf; import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; import java.util.Iterator; import net.minecraft.entity.player.EntityPlayerMP; @@ -66,7 +68,31 @@ public class PacketHandlerPlayer{ return; } - EventHooks.onPlayerKeyPressed(player, buffer.readInt(), buffer.readBoolean(), buffer.readBoolean(), buffer.readBoolean(), buffer.readBoolean(), buffer.readBoolean()); + int button = buffer.readInt(); + boolean isCtrlPressed = buffer.readBoolean(); + boolean isShiftPressed = buffer.readBoolean(); + boolean isAltPressed = buffer.readBoolean(); + boolean isMetaPressed = buffer.readBoolean(); + boolean buttonDown = buffer.readBoolean(); + + String ints = Server.readString(buffer); + String[] split = ints.split(","); + int[] keysDown; + + if(ints.length() > 0) { + keysDown = new int[split.length]; + try { + for (int i = 0; i < split.length; i++) { + keysDown[i] = Integer.parseInt(split[i]); + } + } + catch (NumberFormatException ignored){ + } + } else { + keysDown = new int[0]; + } + + EventHooks.onPlayerKeyPressed(player, button, isCtrlPressed, isShiftPressed, isAltPressed, isMetaPressed, buttonDown, keysDown); } else if(type == EnumPlayerPacket.MouseClicked) { if(ScriptController.Instance.languages.isEmpty()) { diff --git a/src/main/java/noppes/npcs/client/ClientTickHandler.java b/src/main/java/noppes/npcs/client/ClientTickHandler.java index 30ef21cae..43216ce45 100644 --- a/src/main/java/noppes/npcs/client/ClientTickHandler.java +++ b/src/main/java/noppes/npcs/client/ClientTickHandler.java @@ -78,7 +78,18 @@ public class ClientTickHandler{ boolean isAltPressed = Keyboard.isKeyDown(184) || Keyboard.isKeyDown(56); boolean isMetaPressed = Keyboard.isKeyDown(220) || Keyboard.isKeyDown(219); boolean keyDown = Keyboard.isKeyDown(key); - NoppesUtilPlayer.sendData(EnumPlayerPacket.KeyPressed, new Object[]{Integer.valueOf(key), Boolean.valueOf(isCtrlPressed), Boolean.valueOf(isShiftPressed), Boolean.valueOf(isAltPressed), Boolean.valueOf(isMetaPressed), Boolean.valueOf(keyDown)}); + + StringBuilder keysDownString = new StringBuilder(); + for(int i = 0; i < Keyboard.getKeyCount(); i++){//Creates a comma separated string of the integer IDs of held keys + if(Keyboard.isKeyDown(i)){ + keysDownString.append(Integer.valueOf(i)).append(","); + } + } + if(keysDownString.length() > 0){//Removes last comma for later parsing + keysDownString.deleteCharAt(keysDownString.length()-1); + } + + NoppesUtilPlayer.sendData(EnumPlayerPacket.KeyPressed, new Object[]{Integer.valueOf(key), Boolean.valueOf(isCtrlPressed), Boolean.valueOf(isShiftPressed), Boolean.valueOf(isAltPressed), Boolean.valueOf(isMetaPressed), Boolean.valueOf(keyDown), keysDownString.toString()}); } } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java index 05d577214..a88f57488 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java @@ -69,6 +69,22 @@ public class ScriptPlayer extends ScriptLivingBase NoppesUtilPlayer.teleportPlayer(player, x, y, z, dimensionId); } + public int getHunger(){ + return player.getFoodStats().getFoodLevel(); + } + + public void setHunger(int hunger){ + player.getFoodStats().setFoodLevel(hunger); + } + + public float getSaturation(){ + return player.getFoodStats().getSaturationLevel(); + } + + public void setSaturation(float saturation){ + player.getFoodStats().setFoodSaturationLevel(saturation); + } + public int getDimension(){ return player.dimension; } @@ -329,6 +345,10 @@ public class ScriptPlayer extends ScriptLivingBase } } + public void setRotation(float rotationYaw){ + NoppesUtilPlayer.teleportPlayer(player, player.posX, player.posY, player.posZ, rotationYaw, player.rotationPitch, player.dimension); + } + public void setRotation(float rotationYaw, float rotationPitch){ NoppesUtilPlayer.teleportPlayer(player, player.posX, player.posY, player.posZ, rotationYaw, rotationPitch, player.dimension); } diff --git a/src/main/java/noppes/npcs/scripted/event/PlayerEvent.java b/src/main/java/noppes/npcs/scripted/event/PlayerEvent.java index cc07fdb11..dcd59eeca 100644 --- a/src/main/java/noppes/npcs/scripted/event/PlayerEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/PlayerEvent.java @@ -42,8 +42,9 @@ public class PlayerEvent extends CustomNPCsEvent { public final boolean isShiftPressed; public final boolean isMetaPressed; public final boolean keyDown; + public final int[] keysDown; - public KeyPressedEvent(IPlayer player, int key, boolean isCtrlPressed, boolean isAltPressed, boolean isShiftPressed, boolean isMetaPressed, boolean keyDown) { + public KeyPressedEvent(IPlayer player, int key, boolean isCtrlPressed, boolean isAltPressed, boolean isShiftPressed, boolean isMetaPressed, boolean keyDown, int[] heldKeys) { super(player); this.key = key; this.isCtrlPressed = isCtrlPressed; @@ -51,6 +52,11 @@ public class PlayerEvent extends CustomNPCsEvent { this.isShiftPressed = isShiftPressed; this.isMetaPressed = isMetaPressed; this.keyDown = keyDown; + this.keysDown = heldKeys; + + for(int i : keysDown){ + System.out.println(i); + } } }