Merge branch 'dev' into janino-scripts

This commit is contained in:
bigguy345 committed 2026-01-10 00:19:14 +02:00
commit fb0332e5cf
53 files changed
+3017 -376

No files matched your search

@@ -60,6 +60,7 @@ import kamkeel.npcs.network.packets.player.MailActionPacket;
import kamkeel.npcs.network.packets.player.SaveBookPacket;
import kamkeel.npcs.network.packets.player.SaveSignPacket;
import kamkeel.npcs.network.packets.player.ScreenSizePacket;
import kamkeel.npcs.network.packets.player.SpecialKeyStatePacket;
import kamkeel.npcs.network.packets.player.TransportPacket;
import kamkeel.npcs.network.packets.player.customgui.CustomGuiButtonPacket;
import kamkeel.npcs.network.packets.player.customgui.CustomGuiClosePacket;
@@ -568,6 +569,7 @@ public class PacketHandler {
PLAYER_PACKET.registerPacket(new InputDevicePacket());
PLAYER_PACKET.registerPacket(new ScreenSizePacket());
PLAYER_PACKET.registerPacket(new SpecialKeyStatePacket());
PLAYER_PACKET.registerPacket(new SyncRevisionInfoPacket());
@@ -14,6 +14,7 @@ public enum EnumPlayerPacket {
CompanionAction,
GetRole,
InputDevice,
SpecialKeyState,
ScreenSize,
MagicCycles,
@@ -0,0 +1,60 @@
package kamkeel.npcs.network.packets.player;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
import kamkeel.npcs.network.PacketClient;
import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumPlayerPacket;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import noppes.npcs.controllers.PlayerDataController;
import noppes.npcs.controllers.data.PlayerData;
import java.io.IOException;
public final class SpecialKeyStatePacket extends AbstractPacket {
private boolean pressed;
public SpecialKeyStatePacket() {
}
private SpecialKeyStatePacket(boolean pressed) {
this.pressed = pressed;
}
public static void send(boolean pressed) {
PacketClient.sendClient(new SpecialKeyStatePacket(pressed));
}
@Override
public Enum getType() {
return EnumPlayerPacket.SpecialKeyState;
}
@Override
public PacketChannel getChannel() {
return PacketHandler.PLAYER_PACKET;
}
@Override
@SideOnly(Side.CLIENT)
public void sendData(ByteBuf out) throws IOException {
out.writeBoolean(pressed);
}
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
boolean keyDown = in.readBoolean();
if (!(player instanceof EntityPlayerMP)) {
return;
}
PlayerData data = PlayerDataController.Instance.getPlayerData((EntityPlayerMP) player);
if (data != null) {
data.setSpecialKeyDown(keyDown);
}
}
}
@@ -92,7 +92,7 @@ public final class LinkedItemScriptPacket extends AbstractPacket {
} else {
data.saveScript(in);
if (ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) {
LogWriter.script(String.format("[%s] (Player) %s SAVED EFFECT %s [%s]", "LINKED ITEM SCRIPTS", player.getCommandSenderName(), linkedItem.getName()));
LogWriter.script(String.format("[%s] (Player) %s SAVED LINKED ITEM [%s]", "LINKED ITEM SCRIPTS", player.getCommandSenderName(), linkedItem.getName()));
}
}
}