From 0d807b36d9314b272f1bc5ec726578c70931d614 Mon Sep 17 00:00:00 2001 From: luisc Date: Tue, 16 Nov 2021 10:41:04 -0600 Subject: [PATCH] Added isGUIOpen() function, and setPosition function with a dimensionId parameter to ScriptPlayer. --- src/main/java/noppes/npcs/CommonProxy.java | 4 ++++ .../java/noppes/npcs/NoppesUtilPlayer.java | 4 +++- .../java/noppes/npcs/NoppesUtilServer.java | 15 ++++++++++++++- .../java/noppes/npcs/PacketHandlerServer.java | 17 +++++++++++++---- .../java/noppes/npcs/client/ClientProxy.java | 5 +++++ .../noppes/npcs/client/ClientTickHandler.java | 3 +-- .../java/noppes/npcs/client/NoppesUtil.java | 4 +++- .../npcs/client/PacketHandlerClient.java | 8 +++++--- .../npcs/constants/EnumPacketClient.java | 2 +- .../npcs/constants/EnumPacketServer.java | 2 +- .../noppes/npcs/controllers/PlayerData.java | 18 ++++++++++++++++-- .../npcs/scripted/entity/ScriptPlayer.java | 15 ++++++++++++++- .../npcs/scripted/interfaces/IPlayer.java | 4 ++++ 13 files changed, 84 insertions(+), 17 deletions(-) diff --git a/src/main/java/noppes/npcs/CommonProxy.java b/src/main/java/noppes/npcs/CommonProxy.java index 1964503da..b5075fec4 100644 --- a/src/main/java/noppes/npcs/CommonProxy.java +++ b/src/main/java/noppes/npcs/CommonProxy.java @@ -178,4 +178,8 @@ public class CommonProxy implements IGuiHandler { public String getAchievementDesc(Achievement achievement) { return ""; } + + public boolean isGUIOpen(){ + return false; + } } \ No newline at end of file diff --git a/src/main/java/noppes/npcs/NoppesUtilPlayer.java b/src/main/java/noppes/npcs/NoppesUtilPlayer.java index 42d2c00b8..30e07e2e4 100644 --- a/src/main/java/noppes/npcs/NoppesUtilPlayer.java +++ b/src/main/java/noppes/npcs/NoppesUtilPlayer.java @@ -397,5 +397,7 @@ public class NoppesUtilPlayer { } } } - + public static void isGUIOpen(EntityPlayerMP player){ + Server.sendData(player, EnumPacketClient.ISGUIOPEN); + } } diff --git a/src/main/java/noppes/npcs/NoppesUtilServer.java b/src/main/java/noppes/npcs/NoppesUtilServer.java index e2b7e0621..db38b3a9a 100644 --- a/src/main/java/noppes/npcs/NoppesUtilServer.java +++ b/src/main/java/noppes/npcs/NoppesUtilServer.java @@ -36,7 +36,6 @@ import net.minecraft.tileentity.TileEntityMobSpawner; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumPacketClient; @@ -706,4 +705,18 @@ public class NoppesUtilServer { return (Entity)entity; } + + public static void isGUIOpen(ByteBuf buffer, EntityPlayer player) throws IOException { + EntityPlayer pl = MinecraftServer.getServer().getConfigurationManager().func_152612_a(player.getDisplayName()); + PlayerData playerdata; + if(pl == null) + playerdata = PlayerDataController.instance.getDataFromUsername(player.getDisplayName()); + else + playerdata = PlayerDataController.instance.getPlayerData(pl); + + boolean isGUIOpen = buffer.readBoolean(); + playerdata.setGUIOpen(isGUIOpen); + + sendPlayerData(EnumPlayerData.Players, (EntityPlayerMP)player, player.getDisplayName()); + } } diff --git a/src/main/java/noppes/npcs/PacketHandlerServer.java b/src/main/java/noppes/npcs/PacketHandlerServer.java index 45ee43028..6e4f42fbb 100644 --- a/src/main/java/noppes/npcs/PacketHandlerServer.java +++ b/src/main/java/noppes/npcs/PacketHandlerServer.java @@ -9,7 +9,6 @@ import java.util.HashMap; import java.util.List; import java.util.Set; -import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.passive.EntityVillager; @@ -90,13 +89,19 @@ public class PacketHandlerServer{ ItemStack item = player.inventory.getCurrentItem(); EntityNPCInterface npc = NoppesUtilServer.getEditingNpc(player); + + if(type == EnumPacketServer.IsGuiOpen) { + isGuiOpenPacket(buffer, player); + return; + } + if(type.needsNpc && npc == null){ } else if(type.hasPermission() && !CustomNpcsPermissions.Instance.hasPermission(player, type.permission)){ - //player doesnt have permission todo this + //player doesnt have permission to do this } - else if(item == null ) + else if(item == null && (type == EnumPacketServer.ScriptPlayerGet || type == EnumPacketServer.ScriptPlayerSave || type == EnumPacketServer.ScriptForgeGet || type == EnumPacketServer.ScriptForgeSave)) warn(player, "tried to use custom npcs without a tool in hand, probably a hacker"); else if(item.getItem() == CustomItems.wand) wandPackets(type, buffer, player, npc); @@ -120,7 +125,11 @@ public class PacketHandlerServer{ LogWriter.error("Error with EnumPacketServer." + type, e); } } - + + private void isGuiOpenPacket(ByteBuf buffer, EntityPlayerMP player) throws IOException { + NoppesUtilServer.isGUIOpen(buffer, player); + } + private void scriptPackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player, EntityNPCInterface npc) throws Exception { if(type == EnumPacketServer.ScriptDataSave){ npc.script.readFromNBT(Server.readNBT(buffer)); diff --git a/src/main/java/noppes/npcs/client/ClientProxy.java b/src/main/java/noppes/npcs/client/ClientProxy.java index 58ab042df..b96e82b61 100644 --- a/src/main/java/noppes/npcs/client/ClientProxy.java +++ b/src/main/java/noppes/npcs/client/ClientProxy.java @@ -588,6 +588,11 @@ public class ClientProxy extends CommonProxy { return achievement.getDescription(); } + @Override + public boolean isGUIOpen(){ + return Minecraft.getMinecraft().currentScreen != null; + } + public static class FontContainer { private StringCache textFont = null; public boolean useCustomFont = true; diff --git a/src/main/java/noppes/npcs/client/ClientTickHandler.java b/src/main/java/noppes/npcs/client/ClientTickHandler.java index 255a92908..30ef21cae 100644 --- a/src/main/java/noppes/npcs/client/ClientTickHandler.java +++ b/src/main/java/noppes/npcs/client/ClientTickHandler.java @@ -47,7 +47,6 @@ public class ClientTickHandler{ @SubscribeEvent public void onMouse(InputEvent.MouseInputEvent event){ - Minecraft mc = Minecraft.getMinecraft(); if(Mouse.getEventButton() == -1 && Mouse.getDWheel() == 0) return; @@ -73,7 +72,7 @@ public class ClientTickHandler{ } } - if((Keyboard.getEventKeyState() && time-this.buttonTime == 0) || !Keyboard.getEventKeyState()) { + if(time-this.buttonTime == 0 || !Keyboard.getEventKeyState()) { boolean isCtrlPressed = Keyboard.isKeyDown(157) || Keyboard.isKeyDown(29); boolean isShiftPressed = Keyboard.isKeyDown(54) || Keyboard.isKeyDown(42); boolean isAltPressed = Keyboard.isKeyDown(184) || Keyboard.isKeyDown(56); diff --git a/src/main/java/noppes/npcs/client/NoppesUtil.java b/src/main/java/noppes/npcs/client/NoppesUtil.java index 7c1ae2c9b..d933ec479 100644 --- a/src/main/java/noppes/npcs/client/NoppesUtil.java +++ b/src/main/java/noppes/npcs/client/NoppesUtil.java @@ -21,7 +21,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.Util; import net.minecraft.world.World; import noppes.npcs.CustomNpcs; -import noppes.npcs.ModelPartData; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.Server; import noppes.npcs.client.fx.EntityCustomFX; @@ -289,4 +288,7 @@ public class NoppesUtil { CustomNpcs.proxy.openGui(x, y, z, EnumGuiType.Waypoint, player); } + public static void isGUIOpen(boolean isGUIOpen) { + Client.sendData(EnumPacketServer.IsGuiOpen, isGUIOpen); + } } diff --git a/src/main/java/noppes/npcs/client/PacketHandlerClient.java b/src/main/java/noppes/npcs/client/PacketHandlerClient.java index 2689b498b..138958ed4 100644 --- a/src/main/java/noppes/npcs/client/PacketHandlerClient.java +++ b/src/main/java/noppes/npcs/client/PacketHandlerClient.java @@ -254,8 +254,10 @@ public class PacketHandlerClient extends PacketHandlerServer{ player.addChatMessage(new ChatComponentTranslation("Current font is %s", ClientProxy.Font.getName())); } } + else if(type == EnumPacketClient.ISGUIOPEN){ + boolean isGUIOpen = Minecraft.getMinecraft().currentScreen != null; + + NoppesUtil.isGUIOpen(isGUIOpen); + } } - - - } diff --git a/src/main/java/noppes/npcs/constants/EnumPacketClient.java b/src/main/java/noppes/npcs/constants/EnumPacketClient.java index 8c53c6b57..c11a36d6e 100644 --- a/src/main/java/noppes/npcs/constants/EnumPacketClient.java +++ b/src/main/java/noppes/npcs/constants/EnumPacketClient.java @@ -1,6 +1,6 @@ package noppes.npcs.constants; public enum EnumPacketClient { - CHAT, MESSAGE, SYNCRECIPES_ADD, SYNCRECIPES_WORKBENCH, DIALOG, QUEST_COMPLETION, EDIT_NPC, PLAY_SOUND, PLAY_MUSIC, UPDATE_NPC, ROLE, GUI, SCRIPTED_PARTICLE, PARTICLE, DELETE_NPC, SCROLL_LIST, SCROLL_DATA, SCROLL_DATA_PART, SCROLL_SELECTED, GUI_REDSTONE, GUI_WAYPOINT, GUI_DATA, GUI_ERROR, GUI_CLOSE, VILLAGER_LIST, CHATBUBBLE, SYNCRECIPES_CARPENTRYBENCH, CLONE, OPEN_BOOK, DIALOG_DUMMY, CONFIG + CHAT, MESSAGE, SYNCRECIPES_ADD, SYNCRECIPES_WORKBENCH, DIALOG, QUEST_COMPLETION, EDIT_NPC, PLAY_SOUND, PLAY_MUSIC, UPDATE_NPC, ROLE, GUI, SCRIPTED_PARTICLE, PARTICLE, DELETE_NPC, SCROLL_LIST, SCROLL_DATA, SCROLL_DATA_PART, SCROLL_SELECTED, GUI_REDSTONE, GUI_WAYPOINT, GUI_DATA, GUI_ERROR, GUI_CLOSE, VILLAGER_LIST, CHATBUBBLE, SYNCRECIPES_CARPENTRYBENCH, CLONE, OPEN_BOOK, DIALOG_DUMMY, CONFIG, ISGUIOPEN } diff --git a/src/main/java/noppes/npcs/constants/EnumPacketServer.java b/src/main/java/noppes/npcs/constants/EnumPacketServer.java index 474094a0e..54b7bbcbf 100644 --- a/src/main/java/noppes/npcs/constants/EnumPacketServer.java +++ b/src/main/java/noppes/npcs/constants/EnumPacketServer.java @@ -76,7 +76,7 @@ public enum EnumPacketServer { RemoteTpToNpc,QuestGet, QuestCategoryGet, SaveTileEntity, NaturalSpawnGetAll, MailOpenSetup, - DimensionsGet, DimensionTeleport, GetTileEntity, Gui, ; + DimensionsGet, DimensionTeleport, GetTileEntity, Gui, IsGuiOpen; public CustomNpcsPermissions.Permission permission = null; public boolean needsNpc = false; diff --git a/src/main/java/noppes/npcs/controllers/PlayerData.java b/src/main/java/noppes/npcs/controllers/PlayerData.java index 3139a28c6..994dd25d2 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerData.java +++ b/src/main/java/noppes/npcs/controllers/PlayerData.java @@ -39,10 +39,12 @@ public class PlayerData implements IExtendedEntityProperties{ public String playername = ""; public String uuid = ""; - + private EntityNPCInterface activeCompanion = null; public int companionID = 0; + public boolean isGUIOpen = false; + @Override public void saveNBTData(NBTTagCompound compound) { PlayerDataController.instance.savePlayerData(this); @@ -86,6 +88,7 @@ public class PlayerData implements IExtendedEntityProperties{ player.worldObj.spawnEntityInWorld(npc); } } + isGUIOpen = data.getBoolean("isGUIOpen"); } public NBTTagCompound getNBT() { if(player != null){ @@ -105,6 +108,7 @@ public class PlayerData implements IExtendedEntityProperties{ compound.setString("PlayerName", playername); compound.setString("UUID", uuid); compound.setInteger("PlayerCompanionId", companionID); + compound.setBoolean("isGUIOpen",isGUIOpen); if(hasCompanion()){ NBTTagCompound nbt = new NBTTagCompound(); @@ -118,7 +122,17 @@ public class PlayerData implements IExtendedEntityProperties{ public void init(Entity entity, World world) { } - + + public void setGUIOpen(boolean bool) { + isGUIOpen = bool; + saveNBTData(null); + } + + public boolean getGUIOpen() { + loadNBTData(null); + return isGUIOpen; + } + public boolean hasCompanion(){ return activeCompanion != null && !activeCompanion.isDead; } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java index 9a5502357..55cfb4aed 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java @@ -24,6 +24,7 @@ import noppes.npcs.controllers.PlayerQuestData; import noppes.npcs.controllers.Quest; import noppes.npcs.controllers.QuestController; import noppes.npcs.controllers.QuestData; +import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.ScriptItemStack; import noppes.npcs.scripted.ScriptPixelmonPlayerData; import noppes.npcs.scripted.constants.EntityType; @@ -33,7 +34,6 @@ import noppes.npcs.util.ValueUtil; public class ScriptPlayer extends ScriptLivingBase implements IPlayer { public T player; - private PlayerData data; public ScriptPlayer(T player){ super(player); this.player = player; @@ -58,6 +58,13 @@ public class ScriptPlayer extends ScriptLivingBase NoppesUtilPlayer.teleportPlayer(player, x, y, z, player.dimension); } + public void setPosition(double x, double y, double z, int dimensionId){ + if (NpcAPI.Instance().getIWorld(dimensionId) == null) + return; + + NoppesUtilPlayer.teleportPlayer(player, x, y, z, dimensionId); + } + public int getDimension(){ return player.dimension; } @@ -370,4 +377,10 @@ public class ScriptPlayer extends ScriptLivingBase PlayerQuestData playerdata = PlayerDataController.instance.getPlayerData(player).questData; playerdata.checkQuestCompletion((EntityPlayer)this.entity, EnumQuestType.Item); } + + public boolean checkGUIOpen() { + NoppesUtilPlayer.isGUIOpen(player); + PlayerData data = PlayerDataController.instance.getPlayerData(player); + return data.getGUIOpen(); + } } diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IPlayer.java b/src/main/java/noppes/npcs/scripted/interfaces/IPlayer.java index 36d074625..c83d258a8 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/IPlayer.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/IPlayer.java @@ -17,6 +17,8 @@ public interface IPlayer extends IEntityLivingBase public void setPosition(double x, double y, double z); + public void setPosition(double x, double y, double z, int dimensionId); + public boolean hasFinishedQuest(int id); public boolean hasActiveQuest(int id); @@ -170,4 +172,6 @@ public interface IPlayer extends IEntityLivingBase public ITimers getTimers(); public void updatePlayerInventory(); + + public boolean checkGUIOpen(); }