Fix Packets for Effects + Syncing

This commit is contained in:
Kam committed 2025-02-10 16:38:50 -05:00
1 parent 070e032907
commit d2c7e634ec
18 files changed
+502 -41

No files matched your search

@@ -7,6 +7,7 @@ import kamkeel.npcs.network.packets.data.gui.GuiClosePacket;
import kamkeel.npcs.network.packets.data.gui.GuiErrorPacket;
import kamkeel.npcs.network.packets.data.gui.GuiOpenPacket;
import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
import kamkeel.npcs.network.packets.data.large.ScrollDataPacket;
import kamkeel.npcs.network.packets.data.large.ScrollListPacket;
import kamkeel.npcs.network.packets.data.npc.DialogPacket;
import kamkeel.npcs.network.packets.data.ParticlePacket;
@@ -655,6 +656,14 @@ public class NoppesUtilServer {
sendScrollGroup(player, map);
}
public static void sendCustomEffectDataAll(EntityPlayerMP player) {
Map<String, Integer> map = new HashMap<String, Integer>();
for (CustomEffect effect : StatusEffectController.getInstance().customEffects.values()) {
map.put(effect.name, effect.id);
}
ScrollDataPacket.sendScrollData(player, map);
}
public static void sendTransportCategoryData(EntityPlayerMP player) {
HashMap<String,Integer> map = new HashMap<String,Integer>();
for(TransportCategory category : TransportController.getInstance().categories.values()){
@@ -289,6 +289,9 @@ public class ClientProxy extends CommonProxy {
else if (gui == EnumGuiType.ManageBanks)
return new GuiNPCManageBanks(npc, (ContainerManageBanks) container);
else if (gui == EnumGuiType.ManageEffects)
return new GuiNPCManageEffects(npc);
else if (gui == EnumGuiType.MainMenuGlobal)
return new GuiNPCGlobalMainMenu(npc);
@@ -1,5 +1,7 @@
package noppes.npcs.client.gui;
import kamkeel.npcs.network.PacketClient;
import kamkeel.npcs.network.packets.request.effects.EffectSavePacket;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.util.ResourceLocation;
@@ -193,8 +195,7 @@ public class SubGuiEffectGeneral extends SubGuiInterface implements ITextfieldLi
return;
}
if (id == -2) {
// TODO: FIX PACKET
// DBCPacketHandler.Instance.sendToServer(new DBCSaveEffect(effect.writeToNBT(false), originalName));
PacketClient.sendClient(new EffectSavePacket(effect.writeToNBT(false), originalName));
GuiScriptEffect scriptGUI = new GuiScriptEffect(parent, effect);
scriptGUI.setWorldAndResolution(mc, width, height);
scriptGUI.initGui();
@@ -249,7 +250,6 @@ public class SubGuiEffectGeneral extends SubGuiInterface implements ITextfieldLi
@Override
public void close() {
super.close();
// TODO: FIX Packet
// DBCPacketHandler.Instance.sendToServer(new DBCSaveEffect(effect.writeToNBT(false), originalName));
PacketClient.sendClient(new EffectSavePacket(effect.writeToNBT(false), originalName));
}
}
@@ -1,5 +1,10 @@
package noppes.npcs.client.gui.global;
import kamkeel.npcs.network.PacketClient;
import kamkeel.npcs.network.packets.request.effects.EffectGetPacket;
import kamkeel.npcs.network.packets.request.effects.EffectRemovePacket;
import kamkeel.npcs.network.packets.request.effects.EffectSavePacket;
import kamkeel.npcs.network.packets.request.effects.EffectsGetPacket;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiYesNo;
import net.minecraft.client.gui.GuiYesNoCallback;
@@ -35,8 +40,7 @@ public class GuiNPCManageEffects extends GuiNPCInterface2 implements ICustomScro
public GuiNPCManageEffects(EntityNPCInterface npc) {
super(npc);
// TODO: Fix Packet
// DBCPacketHandler.Instance.sendToServer(new DBCRequestEffect(-1));
PacketClient.sendClient(new EffectsGetPacket(-1));
}
public void initGui() {
@@ -77,9 +81,7 @@ public class GuiNPCManageEffects extends GuiNPCInterface2 implements ICustomScro
while (data.containsKey(name))
name += "_";
CustomEffect effect = new CustomEffect(-1, name);
// TODO: Fix Packet
// DBCPacketHandler.Instance.sendToServer(new DBCSaveEffect(effect.writeToNBT(false), ""));
PacketClient.sendClient(new EffectSavePacket(effect.writeToNBT(false), ""));
} else if (button.id == 1) {
if (data.containsKey(scrollEffects.getSelected())) {
GuiYesNo guiyesno = new GuiYesNo(this, scrollEffects.getSelected(), StatCollector.translateToLocal("gui.delete"), 1);
@@ -89,8 +91,7 @@ public class GuiNPCManageEffects extends GuiNPCInterface2 implements ICustomScro
CustomEffect effect = this.effect.cloneEffect();
while (data.containsKey(effect.name))
effect.name += "_";
// TODO: Fix Packet
// DBCPacketHandler.Instance.sendToServer(new DBCSaveEffect(effect.writeToNBT(false), ""));
PacketClient.sendClient(new EffectSavePacket(effect.writeToNBT(false), ""));
}
if (effect == null)
@@ -110,13 +111,9 @@ public class GuiNPCManageEffects extends GuiNPCInterface2 implements ICustomScro
this.effect = new CustomEffect();
effect.readFromNBT(compound);
setSelected(effect.name);
if (effect.id != -1) {
StatusEffectController.getInstance().customEffects.replace(effect.id, effect);
}
initGui();
}
@@ -248,8 +245,7 @@ public class GuiNPCManageEffects extends GuiNPCInterface2 implements ICustomScro
selected = scrollEffects.getSelected();
originalName = scrollEffects.getSelected();
if (selected != null && !selected.isEmpty()) {
// TODO: Fix Packet
// DBCPacketHandler.Instance.sendToServer(new DBCGetEffect(data.get(selected)));
PacketClient.sendClient(new EffectGetPacket(data.get(selected)));
}
}
}
@@ -262,9 +258,7 @@ public class GuiNPCManageEffects extends GuiNPCInterface2 implements ICustomScro
@Override
public void save() {
if (this.selected != null && this.data.containsKey(this.selected) && this.effect != null) {
// TODO: Fix Packet
// DBCPacketHandler.Instance.sendToServer(new DBCSaveEffect(effect.writeToNBT(false), originalName));
PacketClient.sendClient(new EffectSavePacket(effect.writeToNBT(false), originalName));
}
}
@@ -281,9 +275,7 @@ public class GuiNPCManageEffects extends GuiNPCInterface2 implements ICustomScro
return;
if (id == 1) {
if (data.containsKey(scrollEffects.getSelected())) {
// TODO: Fix Packet
// DBCPacketHandler.Instance.sendToServer(new DBCRemoveEffect(data.get(scrollEffects.getSelected())));
PacketClient.sendClient(new EffectRemovePacket(data.get(scrollEffects.getSelected())));
scrollEffects.clear();
effect = new CustomEffect();
initGui();
@@ -36,6 +36,7 @@ public class GuiNPCGlobalMainMenu extends GuiNPCInterface2 {
private GuiNpcSquareButton linkedButton;
private GuiNpcSquareButton animationButton;
private GuiNpcSquareButton tagButton;
private GuiNpcSquareButton effectsButton;
public GuiNPCGlobalMainMenu(EntityNPCInterface npc) {
super(npc, 5);
@@ -86,6 +87,9 @@ public class GuiNPCGlobalMainMenu extends GuiNPCInterface2 {
registerButton(tagButton = new GuiNpcSquareButton(17, 0, 0, 20, "menu.tags", 0xFF333333));
tagButton.setIconPos(24, 24, 192, 32).setIconTexture(specialIcons);
registerButton(effectsButton = new GuiNpcSquareButton(19, 0, 0, 20, "global.customeffects", 0xFF333333));
effectsButton.setIconPos(24, 24, 192, 32).setIconTexture(specialIcons);
// Layout composite buttons optimally.
layoutButtons();
// Add all composite buttons to the GUI.
@@ -221,6 +225,9 @@ public class GuiNPCGlobalMainMenu extends GuiNPCInterface2 {
if (id == 16) {
NoppesUtil.requestOpenGUI(EnumGuiType.ManageLinked);
}
if (id == 19) {
NoppesUtil.requestOpenGUI(EnumGuiType.ManageEffects);
}
}
@Override
@@ -1,5 +1,8 @@
package noppes.npcs.client.gui.script;
import kamkeel.npcs.network.PacketClient;
import kamkeel.npcs.network.packets.request.effects.EffectScriptGetPacket;
import kamkeel.npcs.network.packets.request.script.EffectScriptPacket;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiConfirmOpenLink;
import net.minecraft.client.gui.GuiYesNo;
@@ -46,8 +49,7 @@ public class GuiScriptEffect extends GuiNPCInterface implements GuiYesNoCallback
this.hookList.add(type.function);
}
// TODO: FIX PACKET
// DBCPacketClient.sendClient(new DBCRequestEffectScript(effect.id));
EffectScriptPacket.Get(effect.id);
}
public void initGui() {
@@ -365,16 +367,14 @@ public class GuiScriptEffect extends GuiNPCInterface implements GuiYesNoCallback
List<ScriptContainer> containers = this.scriptHandler.getScripts();
for (int i = 0; i < containers.size(); i++) {
ScriptContainer container = containers.get(i);
// TODO: FIX PACKET
// DBCSaveEffectScript.Save(effect.id, i, containers.size(), container.writeToNBT(new NBTTagCompound()));
EffectScriptPacket.Save(effect.id, i, containers.size(), container.writeToNBT(new NBTTagCompound()));
}
NBTTagCompound scriptData = new NBTTagCompound();
scriptData.setString("ScriptLanguage", this.scriptHandler.getLanguage());
scriptData.setBoolean("ScriptEnabled", this.scriptHandler.getEnabled());
scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.scriptHandler.getConsoleText()));
// TODO: FIX PACKET
// DBCSaveEffectScript.Save(effect.id, -1, containers.size(), scriptData);
EffectScriptPacket.Save(effect.id, -1, containers.size(), scriptData);
}
public void textUpdate(String text) {
@@ -37,6 +37,7 @@ public enum EnumGuiType {
PlayerAnvil,
QuestReward,
ManageRecipes,
ManageEffects,
QuestItem,
NpcRemote,
GlobalRemote,
@@ -1,5 +1,8 @@
package noppes.npcs.controllers;
import kamkeel.npcs.controllers.SyncController;
import kamkeel.npcs.network.PacketClient;
import kamkeel.npcs.network.enums.EnumSyncType;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.CompressedStreamTools;
@@ -132,8 +135,7 @@ public class StatusEffectController implements IStatusEffectHandler {
if (file.getName().equals(foundEffect.name + ".json")) {
file.delete();
// TODO: Fix Packets
// DBCPacketHandler.Instance.sendToAll(new DBCInfoSyncPacket(DBCSyncType.CUSTOM_EFFECT, EnumSyncAction.REMOVE, foundEffect.getID(), new NBTTagCompound()));
SyncController.syncRemove(EnumSyncType.CUSTOM_EFFECTS, foundEffect.getID());
break;
}
}
@@ -154,9 +156,7 @@ public class StatusEffectController implements IStatusEffectHandler {
continue;
if (file.getName().equals(foundEffect.name + ".json")) {
file.delete();
// TODO: Fix Packets
// DBCPacketHandler.Instance.sendToAll(new DBCInfoSyncPacket(DBCSyncType.CUSTOM_EFFECT, EnumSyncAction.REMOVE, foundEffect.getID(), new NBTTagCompound()));
SyncController.syncRemove(EnumSyncType.CUSTOM_EFFECTS, foundEffect.getID());
break;
}
}
@@ -338,8 +338,7 @@ public class StatusEffectController implements IStatusEffectHandler {
file2.delete();
file.renameTo(file2);
nbtTagCompound.removeTag("ScriptData");
// TODO: Add Packets
// DBCPacketHandler.Instance.sendToAll(new DBCInfoSyncPacket(DBCSyncType.CUSTOM_EFFECT, EnumSyncAction.UPDATE, -1, nbtTagCompound));
SyncController.syncUpdate(EnumSyncType.CUSTOM_EFFECTS, -1, nbtTagCompound);
} catch (Exception e) {
LogWriter.except(e);
}