Huge Commit and Refactoring

This commit is contained in:
Kam committed 2025-02-02 16:07:16 -05:00
1 parent 0124154380
commit 47e30ac8b4
26 files changed
+257 -139

No files matched your search

@@ -10,12 +10,11 @@ import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.enums.EnumChannelType;
import kamkeel.npcs.network.packets.data.*;
import kamkeel.npcs.network.packets.data.gui.*;
import kamkeel.npcs.network.packets.data.gui.IsGuiOpenPacket;
import kamkeel.npcs.network.packets.data.large.*;
import kamkeel.npcs.network.packets.data.npc.*;
import kamkeel.npcs.network.packets.data.script.*;
import kamkeel.npcs.network.packets.request.AnimationCachePacket;
import kamkeel.npcs.network.packets.request.DimensionsGetPacket;
import kamkeel.npcs.network.packets.request.GuiRequestPacket;
import kamkeel.npcs.network.packets.request.*;
import kamkeel.npcs.network.packets.request.bank.BankGetPacket;
import kamkeel.npcs.network.packets.request.bank.BankRemovePacket;
import kamkeel.npcs.network.packets.request.bank.BankSavePacket;
@@ -50,9 +49,15 @@ import kamkeel.npcs.network.packets.request.recipe.RecipeGetPacket;
import kamkeel.npcs.network.packets.request.recipe.RecipeRemovePacket;
import kamkeel.npcs.network.packets.request.recipe.RecipeSavePacket;
import kamkeel.npcs.network.packets.request.recipe.RecipesGetPacket;
import kamkeel.npcs.network.packets.request.role.RoleCompanionUpdatePacket;
import kamkeel.npcs.network.packets.request.role.RoleGetPacket;
import kamkeel.npcs.network.packets.request.role.RoleSavePacket;
import kamkeel.npcs.network.packets.request.tags.TagRemovePacket;
import kamkeel.npcs.network.packets.request.tags.TagSavePacket;
import kamkeel.npcs.network.packets.request.tags.TagSetPacket;
import kamkeel.npcs.network.packets.request.transform.TransformGetPacket;
import kamkeel.npcs.network.packets.request.transform.TransformLoadPacket;
import kamkeel.npcs.network.packets.request.transform.TransformSavePacket;
import kamkeel.npcs.network.packets.request.transport.*;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@@ -96,6 +101,11 @@ public class PacketHandler {
}
public void registerRequestPackets(){
// NPC Packets
REQUEST_PACKET.registerPacket(new NpcClosePacket());
REQUEST_PACKET.registerPacket(new NpcDeletePacket());
// Linked Packets
REQUEST_PACKET.registerPacket(new LinkedGetAllPacket());
REQUEST_PACKET.registerPacket(new LinkedRemovePacket());
@@ -185,7 +195,7 @@ public class PacketHandler {
REQUEST_PACKET.registerPacket(new TransportSavePacket());
REQUEST_PACKET.registerPacket(new TransportGetLocationPacket());
// Remote Packets
// Remote Packets Packets
REQUEST_PACKET.registerPacket(new RemoteMainMenuPacket());
REQUEST_PACKET.registerPacket(new RemoteGlobalMenuPacket());
REQUEST_PACKET.registerPacket(new RemoteDeletePacket());
@@ -195,22 +205,35 @@ public class PacketHandler {
REQUEST_PACKET.registerPacket(new RemoteResetPacket());
REQUEST_PACKET.registerPacket(new RemoteTpToNpcPacket());
// CustomGUI
// CustomGUI Packets
REQUEST_PACKET.registerPacket(new CustomGuiButtonPacket());
REQUEST_PACKET.registerPacket(new CustomGuiClosePacket());
REQUEST_PACKET.registerPacket(new CustomGuiUnfocusedPacket());
REQUEST_PACKET.registerPacket(new CustomScrollClickPacket());
// Job
// Job Packets
REQUEST_PACKET.registerPacket(new JobGetPacket());
REQUEST_PACKET.registerPacket(new JobSavePacket());
REQUEST_PACKET.registerPacket(new JobSpawnerAddPacket());
REQUEST_PACKET.registerPacket(new JobSpawnerRemovePacket());
// Other
// Role Packets
REQUEST_PACKET.registerPacket(new RoleCompanionUpdatePacket());
REQUEST_PACKET.registerPacket(new RoleSavePacket());
REQUEST_PACKET.registerPacket(new RoleGetPacket());
// Transform Packets
REQUEST_PACKET.registerPacket(new TransformSavePacket());
REQUEST_PACKET.registerPacket(new TransformGetPacket());
REQUEST_PACKET.registerPacket(new TransformLoadPacket());
// Other Packets
REQUEST_PACKET.registerPacket(new GuiRequestPacket());
REQUEST_PACKET.registerPacket(new DimensionsGetPacket());
REQUEST_PACKET.registerPacket(new AnimationCachePacket());
REQUEST_PACKET.registerPacket(new MerchantUpdatePacket());
REQUEST_PACKET.registerPacket(new ModelDataSavePacket());
REQUEST_PACKET.registerPacket(new MailOpenSetupPacket());
}
public void registerDataPackets(){
@@ -121,5 +121,38 @@ public enum EnumRequestPacket {
PartySetLeader,
PartySetQuest,
LinkedRemove, LinkedAdd, LinkedGetAll, LinkedSet, BankGet, BanksGet, BankSave, BankRemove, QuestCategoryGet, PlayerDataGet, PlayerDataRemove, PlayerDataMapRegen, JobSave, JobGet, JobSpawnerAdd, RoleCompanionUpdate, JobSpawnerRemove, RoleSave, RoleGet, MailOpenSetup, TransformSave, TransformGet, TransformLoad, TraderMarketSave, ServerUpdateSkinOverlays
LinkedRemove,
LinkedAdd,
LinkedGetAll,
LinkedSet,
BankGet,
BanksGet,
BankSave,
BankRemove,
QuestCategoryGet,
PlayerDataGet,
PlayerDataRemove,
PlayerDataMapRegen,
JobSave,
JobGet,
JobSpawnerAdd,
JobSpawnerRemove,
RoleCompanionUpdate,
RoleSave,
RoleGet,
MailOpenSetup,
TransformSave,
TransformGet,
TransformLoad,
TraderMarketSave,
ServerUpdateSkinOverlays
}
@@ -45,8 +45,6 @@ public final class GuiRequestPacket extends AbstractPacket {
return true;
}
// No permission override
@SideOnly(Side.CLIENT)
@Override
public void sendData(ByteBuf out) throws IOException {
@@ -12,6 +12,7 @@ import kamkeel.npcs.network.enums.EnumRequestPacket;
import kamkeel.npcs.util.ByteBufUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcs;
import noppes.npcs.constants.EnumGuiType;
import noppes.npcs.containers.ContainerMail;
@@ -22,8 +23,14 @@ import java.io.IOException;
public final class MailOpenSetupPacket extends AbstractPacket {
public static String packetName = "Request|MailOpenSetup";
private NBTTagCompound compound;
public MailOpenSetupPacket() { }
public MailOpenSetupPacket(NBTTagCompound compound) {
this.compound = compound;
}
@Override
public Enum getType() {
return EnumRequestPacket.MailOpenSetup;
@@ -36,12 +43,18 @@ public final class MailOpenSetupPacket extends AbstractPacket {
@SideOnly(Side.CLIENT)
@Override
public void sendData(ByteBuf out) throws IOException { }
public void sendData(ByteBuf out) throws IOException {
ByteBufUtils.writeNBT(out, this.compound);
}
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if (!(player instanceof EntityPlayerMP)) return;
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return;
if (!(player instanceof EntityPlayerMP))
return;
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
return;
PlayerMail mail = new PlayerMail();
mail.readNBT(ByteBufUtils.readNBT(in));
ContainerMail.staticmail = mail;
@@ -9,6 +9,7 @@ import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.PacketUtil;
import kamkeel.npcs.network.enums.EnumItemPacketType;
import kamkeel.npcs.network.enums.EnumRequestPacket;
import kamkeel.npcs.util.ByteBufUtils;
import net.minecraft.entity.Entity;
import net.minecraft.entity.passive.EntityVillager;
import net.minecraft.entity.player.EntityPlayer;
@@ -22,8 +23,16 @@ import java.io.IOException;
public final class MerchantUpdatePacket extends AbstractPacket {
public static String packetName = "Request|MerchantUpdate";
private int entityID;
private MerchantRecipeList list;
public MerchantUpdatePacket() { }
public MerchantUpdatePacket(int entityID, MerchantRecipeList list) {
this.entityID = entityID;
this.list = list;
}
@Override
public Enum getType() {
return EnumRequestPacket.MerchantUpdate;
@@ -41,7 +50,9 @@ public final class MerchantUpdatePacket extends AbstractPacket {
@SideOnly(Side.CLIENT)
@Override
public void sendData(ByteBuf out) throws IOException { }
public void sendData(ByteBuf out) throws IOException {
ByteBufUtils.fillBuffer(out, this.entityID, this.list);
}
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
@@ -12,6 +12,7 @@ import kamkeel.npcs.network.enums.EnumRequestPacket;
import kamkeel.npcs.util.ByteBufUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcsPermissions;
import noppes.npcs.entity.EntityCustomNpc;
@@ -20,8 +21,14 @@ import java.io.IOException;
public final class ModelDataSavePacket extends AbstractPacket {
public static String packetName = "Request|ModelDataSave";
private NBTTagCompound save;
public ModelDataSavePacket() { }
public ModelDataSavePacket(NBTTagCompound save) {
this.save = save;
}
@Override
public Enum getType() {
return EnumRequestPacket.ModelDataSave;
@@ -45,13 +52,17 @@ public final class ModelDataSavePacket extends AbstractPacket {
@SideOnly(Side.CLIENT)
@Override
public void sendData(ByteBuf out) throws IOException {
ByteBufUtils.writeNBT(out, this.save);
}
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if (!(player instanceof EntityPlayerMP)) return;
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return;
if (!(player instanceof EntityPlayerMP))
return;
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
return;
if(npc instanceof EntityCustomNpc)
((EntityCustomNpc)npc).modelData.readFromNBT(ByteBufUtils.readNBT(in));
}
@@ -21,8 +21,7 @@ import java.io.IOException;
public final class NpcDeletePacket extends AbstractPacket {
public static final String packetName = "Request|NPCDelete";
public NpcDeletePacket() {
}
public NpcDeletePacket() {}
@Override
@@ -13,6 +13,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import noppes.npcs.CustomNpcsPermissions;
import noppes.npcs.constants.EnumCompanionStage;
import noppes.npcs.constants.EnumRoleType;
import noppes.npcs.roles.RoleCompanion;
import java.io.IOException;
@@ -20,8 +21,14 @@ import java.io.IOException;
public final class RoleCompanionUpdatePacket extends AbstractPacket {
public static String packetName = "Request|RoleCompanionUpdate";
private EnumCompanionStage companionStage;
public RoleCompanionUpdatePacket() { }
public RoleCompanionUpdatePacket(EnumCompanionStage companionStage) {
this.companionStage = companionStage;
}
@Override
public Enum getType() {
return EnumRequestPacket.RoleCompanionUpdate;
@@ -44,12 +51,21 @@ public final class RoleCompanionUpdatePacket extends AbstractPacket {
@SideOnly(Side.CLIENT)
@Override
public void sendData(ByteBuf out) throws IOException { }
public void sendData(ByteBuf out) throws IOException {
out.writeInt(this.companionStage.ordinal());
}
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if (!(player instanceof EntityPlayerMP)) return;
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return;
if (!(player instanceof EntityPlayerMP))
return;
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
return;
if(npc.advanced.role != EnumRoleType.Companion)
return;
((RoleCompanion)npc.roleInterface).matureTo(EnumCompanionStage.values()[in.readInt()]);
npc.updateClient = true;
}
@@ -32,11 +32,6 @@ public final class RoleGetPacket extends AbstractPacket {
return PacketHandler.REQUEST_PACKET;
}
@Override
public CustomNpcsPermissions.Permission getPermission() {
return CustomNpcsPermissions.NPC_ADVANCED;
}
@Override
public boolean needsNPC() {
return true;
@@ -48,9 +43,15 @@ public final class RoleGetPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if (!(player instanceof EntityPlayerMP)) return;
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return;
if(npc.roleInterface == null) return;
if (!(player instanceof EntityPlayerMP))
return;
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
return;
if(npc.roleInterface == null)
return;
NBTTagCompound compound = new NBTTagCompound();
compound.setBoolean("RoleData", true);
GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.roleInterface.writeToNBT(compound));
@@ -12,6 +12,7 @@ import kamkeel.npcs.network.enums.EnumRequestPacket;
import kamkeel.npcs.util.ByteBufUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcsPermissions;
import java.io.IOException;
@@ -19,8 +20,14 @@ import java.io.IOException;
public final class RoleSavePacket extends AbstractPacket {
public static String packetName = "Request|RoleSave";
private NBTTagCompound compound;
public RoleSavePacket() { }
public RoleSavePacket(NBTTagCompound compound) {
this.compound = compound;
}
@Override
public Enum getType() {
return EnumRequestPacket.RoleSave;
@@ -43,12 +50,18 @@ public final class RoleSavePacket extends AbstractPacket {
@SideOnly(Side.CLIENT)
@Override
public void sendData(ByteBuf out) throws IOException { }
public void sendData(ByteBuf out) throws IOException {
ByteBufUtils.writeNBT(out, this.compound);
}
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if (!(player instanceof EntityPlayerMP)) return;
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return;
if (!(player instanceof EntityPlayerMP))
return;
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
return;
npc.roleInterface.readFromNBT(ByteBufUtils.readNBT(in));
npc.updateClient = true;
}
@@ -48,8 +48,12 @@ public final class TransformGetPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if (!(player instanceof EntityPlayerMP)) return;
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return;
if (!(player instanceof EntityPlayerMP))
return;
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
return;
GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.transform.writeOptions(new NBTTagCompound()));
}
}
@@ -18,8 +18,14 @@ import java.io.IOException;
public final class TransformLoadPacket extends AbstractPacket {
public static String packetName = "Request|TransformLoad";
private boolean transform;
public TransformLoadPacket() { }
public TransformLoadPacket(boolean transform) {
this.transform = transform;
}
@Override
public Enum getType() {
return EnumRequestPacket.TransformLoad;
@@ -46,8 +52,12 @@ public final class TransformLoadPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if (!(player instanceof EntityPlayerMP)) return;
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return;
if (!(player instanceof EntityPlayerMP))
return;
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
return;
if(npc.transform.isValid())
npc.transform.transform(in.readBoolean());
}
@@ -12,6 +12,7 @@ import kamkeel.npcs.network.enums.EnumRequestPacket;
import kamkeel.npcs.util.ByteBufUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcsPermissions;
import java.io.IOException;
@@ -19,8 +20,14 @@ import java.io.IOException;
public final class TransformSavePacket extends AbstractPacket {
public static String packetName = "Request|TransformSave";
private NBTTagCompound compound;
public TransformSavePacket() { }
public TransformSavePacket(NBTTagCompound compound) {
this.compound = compound;
}
@Override
public Enum getType() {
return EnumRequestPacket.TransformSave;
@@ -43,12 +50,18 @@ public final class TransformSavePacket extends AbstractPacket {
@SideOnly(Side.CLIENT)
@Override
public void sendData(ByteBuf out) throws IOException { }
public void sendData(ByteBuf out) throws IOException {
ByteBufUtils.writeNBT(out, this.compound);
}
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if (!(player instanceof EntityPlayerMP)) return;
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return;
if (!(player instanceof EntityPlayerMP))
return;
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
return;
boolean isValid = npc.transform.isValid();
npc.transform.readOptions(ByteBufUtils.readNBT(in));
if (isValid != npc.transform.isValid())