This commit is contained in:
Kam committed 2025-01-29 23:40:05 -05:00
1 parent 29f9774d1f
commit 1c97d84518
43 files changed
+270 -75

No files matched your search

@@ -1,11 +1,13 @@
package kamkeel.npcs.network.packets.client;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.ClientProxy;
import noppes.npcs.config.ConfigClient;
@@ -36,6 +38,9 @@ public final class ConfigCommandPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
int configType = in.readInt();
if (configType == 0) { // Font Configuration
String font = Server.readString(in);
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -10,6 +11,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.NoppesUtil;
import noppes.npcs.entity.EntityDialogNpc;
@@ -51,6 +53,9 @@ public final class DialogPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
int entityID = in.readInt();
String name = ByteBufUtils.readString(in);
NBTTagCompound tagCompound = ByteBufUtils.readNBT(in);
@@ -1,11 +1,13 @@
package kamkeel.npcs.network.packets.client;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.ClientEventHandler;
@@ -33,6 +35,9 @@ public final class DisableMouseInputPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
long duration = in.readLong();
String parsedButtons = Server.readString(in);
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -8,6 +9,7 @@ import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.controllers.data.MarkData;
import noppes.npcs.entity.EntityNPCInterface;
@@ -36,6 +38,9 @@ public final class MarkDataPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
Entity entity = player.worldObj.getEntityByID(in.readInt());
if (!(entity instanceof EntityNPCInterface)) return;
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -8,6 +9,7 @@ import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.gui.OverlayQuestTracking;
import noppes.npcs.client.ClientCacheHandler;
@@ -36,6 +38,9 @@ public final class OverlayQuestTrackingPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
try {
NBTTagCompound nbt = Server.readNBT(in);
ClientCacheHandler.questTrackingOverlay = new OverlayQuestTracking(Minecraft.getMinecraft());
@@ -1,15 +1,21 @@
package kamkeel.npcs.network.packets.client;
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.PacketHandler;
import kamkeel.npcs.network.enums.EnumClientPacket;
import kamkeel.npcs.util.ByteBufUtils;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.client.NoppesUtil;
import net.minecraft.world.World;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import java.io.IOException;
import java.util.Random;
public final class ParticlePacket extends AbstractPacket {
public static final String packetName = "Client|Particle";
@@ -61,6 +67,31 @@ public final class ParticlePacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
NoppesUtil.spawnParticle(in);
if(CustomNpcs.side() != Side.CLIENT)
return;
spawnParticle(in);
}
@SideOnly(Side.CLIENT)
public static void spawnParticle(ByteBuf buffer) throws IOException{
double posX = buffer.readDouble();
double posY = buffer.readDouble();
double posZ = buffer.readDouble();
float height = buffer.readFloat();
float width = buffer.readFloat();
float yOffset = buffer.readFloat();
String particle = Server.readString(buffer);
World worldObj = Minecraft.getMinecraft().theWorld;
Random rand = worldObj.rand;
if(particle.equals("heal")){
for (int k = 0; k < 6; k++)
{
worldObj.spawnParticle("instantSpell", posX + (rand.nextDouble() - 0.5D) * (double)width, (posY + rand.nextDouble() * (double)height) - (double)yOffset, posZ + (rand.nextDouble() - 0.5D) * (double)width, 0, 0, 0);
worldObj.spawnParticle("spell", posX + (rand.nextDouble() - 0.5D) * (double)width, (posY + rand.nextDouble() * (double)height) - (double)yOffset, posZ + (rand.nextDouble() - 0.5D) * (double)width, 0, 0, 0);
}
}
}
}
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -9,6 +10,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.gui.util.GuiContainerNPCInterface;
import noppes.npcs.client.gui.util.GuiNPCInterface;
@@ -38,6 +40,9 @@ public final class PartyDataPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
GuiScreen gui = Minecraft.getMinecraft().currentScreen;
if (gui instanceof GuiNPCInterface && ((GuiNPCInterface) gui).hasSubGui()) {
gui = (GuiScreen) ((GuiNPCInterface) gui).getSubGui();
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -8,6 +9,7 @@ import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.NoppesUtil;
@@ -35,6 +37,9 @@ public final class PlayerUpdateSkinOverlaysPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
String playerName = Server.readString(in);
NBTTagCompound nbt = Server.readNBT(in);
EntityPlayer sendingPlayer = Minecraft.getMinecraft().theWorld.getPlayerEntityByName(playerName);
@@ -1,11 +1,13 @@
package kamkeel.npcs.network.packets.client;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.NoppesUtil;
@@ -33,6 +35,9 @@ public final class QuestCompletionPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
NoppesUtil.guiQuestCompletion(player, Server.readNBT(in));
}
}
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -10,6 +11,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.NoppesUtil;
import noppes.npcs.entity.EntityNPCInterface;
@@ -44,6 +46,9 @@ public final class RolePacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
NBTTagCompound compound = ByteBufUtils.readNBT(in);
Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(compound.getInteger("EntityId"));
if (entity instanceof EntityNPCInterface) {
@@ -1,11 +1,13 @@
package kamkeel.npcs.network.packets.client;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.CustomNpcs;
import noppes.npcs.client.ClientCacheHandler;
import java.io.IOException;
@@ -32,6 +34,9 @@ public final class ScriptOverlayClosePacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
int overlayId = in.readInt();
ClientCacheHandler.customOverlays.remove(overlayId);
}
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -7,6 +8,7 @@ import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.gui.customoverlay.OverlayCustom;
import noppes.npcs.client.ClientCacheHandler;
@@ -35,6 +37,9 @@ public final class ScriptOverlayDataPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
OverlayCustom overlayCustom = new OverlayCustom(Minecraft.getMinecraft());
overlayCustom.setOverlayData(Server.readNBT(in));
ClientCacheHandler.customOverlays.put(overlayCustom.overlay.getID(), overlayCustom);
@@ -1,14 +1,22 @@
package kamkeel.npcs.network.packets.client;
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.PacketHandler;
import kamkeel.npcs.network.enums.EnumClientPacket;
import kamkeel.npcs.util.ByteBufUtils;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.client.NoppesUtil;
import net.minecraft.world.World;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.fx.CustomFX;
import noppes.npcs.scripted.ScriptParticle;
import java.io.IOException;
@@ -40,6 +48,42 @@ public final class ScriptedParticlePacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
NoppesUtil.spawnScriptedParticle(player, in);
if(CustomNpcs.side() != Side.CLIENT)
return;
spawnScriptedParticle(player, in);
}
@SideOnly(Side.CLIENT)
public static void spawnScriptedParticle(EntityPlayer player, ByteBuf buffer){
Minecraft minecraft = Minecraft.getMinecraft();
NBTTagCompound compound;
ScriptParticle particle;
try {
compound = Server.readNBT(buffer);
particle = ScriptParticle.fromNBT(compound);
} catch (IOException ignored) {
return;
}
World worldObj = player.worldObj;
if (worldObj == null) {
return;
}
Entity entity = null;
if (compound.hasKey("EntityID")) {
entity = worldObj.getEntityByID(compound.getInteger("EntityID"));
if (entity != null)
worldObj = entity.worldObj;
else return;
}
CustomFX fx = CustomFX.fromScriptedParticle(particle, worldObj, entity);
for(int i = 0; i < particle.amount; i++){
minecraft.effectRenderer.addEffect(fx);
}
}
}
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -8,6 +9,7 @@ import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.gui.util.IScrollData;
@@ -35,6 +37,9 @@ public final class ScrollSelectedPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
GuiScreen gui = Minecraft.getMinecraft().currentScreen;
if (gui instanceof IScrollData) {
String selected = Server.readString(in);
@@ -1,11 +1,13 @@
package kamkeel.npcs.network.packets.client;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.CustomNpcs;
import noppes.npcs.client.controllers.ScriptSoundController;
import java.io.IOException;
@@ -32,6 +34,9 @@ public final class StopSoundForPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
int soundId = in.readInt();
ScriptSoundController.Instance.stopSound(soundId);
}
@@ -1,11 +1,13 @@
package kamkeel.npcs.network.packets.client;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.CustomNpcs;
import noppes.npcs.client.controllers.ScriptSoundController;
import java.io.IOException;
@@ -32,6 +34,9 @@ public final class StopSoundsPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
ScriptSoundController.Instance.stopAllSounds();
}
}
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -7,6 +8,7 @@ import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.CustomNpcs;
import java.io.IOException;
@@ -32,6 +34,9 @@ public final class SwingPlayerArmPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
Minecraft.getMinecraft().thePlayer.swingItem();
}
}
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -9,6 +10,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.ClientCacheHandler;
import noppes.npcs.controllers.data.Animation;
@@ -39,6 +41,9 @@ public final class UpdateAnimationsPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
NBTTagCompound nbt = Server.readNBT(in);
AnimationData animationData = null;
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -7,6 +8,7 @@ import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.PacketBuffer;
import noppes.npcs.CustomNpcs;
import noppes.npcs.ServerEventsHandler;
import net.minecraft.village.MerchantRecipeList;
@@ -34,6 +36,9 @@ public final class VillagerListPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
MerchantRecipeList recipes = MerchantRecipeList.func_151390_b(new PacketBuffer(in));
ServerEventsHandler.Merchant.setRecipes(recipes);
}
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client.gui;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -10,6 +11,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.gui.util.IGuiClose;
@@ -46,6 +48,9 @@ public final class GuiClosePacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
GuiScreen gui = Minecraft.getMinecraft().currentScreen;
if (gui instanceof IGuiClose) {
int closeCode = in.readInt();
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client.gui;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -10,6 +11,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.gui.util.GuiContainerNPCInterface;
import noppes.npcs.client.gui.util.GuiNPCInterface;
@@ -45,6 +47,9 @@ public final class GuiDataPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
GuiScreen gui = Minecraft.getMinecraft().currentScreen;
if (gui instanceof GuiNPCInterface && ((GuiNPCInterface) gui).hasSubGui()) {
gui = (GuiScreen) ((GuiNPCInterface) gui).getSubGui();
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client.gui;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -10,6 +11,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.gui.util.IGuiError;
@@ -46,6 +48,9 @@ public final class GuiErrorPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
GuiScreen gui = Minecraft.getMinecraft().currentScreen;
if (gui instanceof IGuiError) {
int errorCode = in.readInt();
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client.gui;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -7,6 +8,7 @@ import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.NoppesUtil;
@@ -34,6 +36,9 @@ public final class GuiRedstonePacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
NBTTagCompound nbt = Server.readNBT(in);
NoppesUtil.saveRedstoneBlock(player, nbt);
}
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client.gui;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -32,6 +33,9 @@ public final class GuiTeleporterPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
CustomNpcs.proxy.openGui((EntityNPCInterface)null, EnumGuiType.NpcDimensions);
}
}
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client.gui;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -7,6 +8,7 @@ import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.NoppesUtil;
@@ -34,6 +36,9 @@ public final class GuiWaypointPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
NBTTagCompound nbt = Server.readNBT(in);
NoppesUtil.saveWayPointBlock(player, nbt);
}
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client.gui;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -7,6 +8,7 @@ import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.CustomNpcs;
import noppes.npcs.client.NoppesUtil;
import java.io.IOException;
@@ -33,6 +35,9 @@ public final class IsGuiOpenPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
boolean isGuiOpen = Minecraft.getMinecraft().currentScreen != null;
NoppesUtil.isGUIOpen(isGuiOpen);
}
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client.gui;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -8,6 +9,7 @@ import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.gui.player.GuiBook;
import noppes.npcs.client.NoppesUtil;
@@ -36,6 +38,9 @@ public final class OpenBookPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
int x = in.readInt();
int y = in.readInt();
int z = in.readInt();
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client.npc;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -8,6 +9,7 @@ import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.CustomNpcs;
import noppes.npcs.entity.EntityNPCInterface;
import java.io.IOException;
@@ -40,6 +42,9 @@ public final class DeleteNpcPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(in.readInt());
if (entity instanceof EntityNPCInterface) {
((EntityNPCInterface) entity).delete();
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client.npc;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -8,6 +9,7 @@ import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.CustomNpcs;
import noppes.npcs.client.NoppesUtil;
import noppes.npcs.entity.EntityNPCInterface;
@@ -40,6 +42,9 @@ public final class EditNpcPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(in.readInt());
if (!(entity instanceof EntityNPCInterface)) {
return;
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client.npc;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -9,6 +10,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.entity.EntityNPCInterface;
@@ -36,6 +38,9 @@ public final class UpdateNpcPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
NBTTagCompound compound = Server.readNBT(in);
Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(compound.getInteger("EntityId"));
if (entity instanceof EntityNPCInterface) {
@@ -1,11 +1,13 @@
package kamkeel.npcs.network.packets.client.sound;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.CustomNpcs;
import noppes.npcs.client.controllers.ScriptSoundController;
import java.io.IOException;
@@ -32,6 +34,9 @@ public final class ContinueSoundsPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
ScriptSoundController.Instance.continueAllSounds();
}
}
@@ -1,11 +1,13 @@
package kamkeel.npcs.network.packets.client.sound;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.CustomNpcs;
import noppes.npcs.client.controllers.ScriptSoundController;
import java.io.IOException;
@@ -32,6 +34,9 @@ public final class PauseSoundsPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
ScriptSoundController.Instance.pauseAllSounds();
}
}
@@ -1,11 +1,13 @@
package kamkeel.npcs.network.packets.client.sound;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.controllers.MusicController;
@@ -33,6 +35,9 @@ public final class PlayMusicPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
String musicName = Server.readString(in);
MusicController.Instance.playMusicBackground(musicName, player, Integer.MAX_VALUE);
}
@@ -1,11 +1,13 @@
package kamkeel.npcs.network.packets.client.sound;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.controllers.MusicController;
@@ -33,6 +35,9 @@ public final class PlaySoundPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
String soundName = Server.readString(in);
float x = in.readFloat();
float y = in.readFloat();
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client.sound;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -7,6 +8,7 @@ import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.controllers.ScriptClientSound;
import noppes.npcs.client.controllers.ScriptSoundController;
@@ -35,6 +37,9 @@ public final class PlaySoundToNoIdPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
NBTTagCompound nbt = Server.readNBT(in);
ScriptClientSound sound = ScriptClientSound.fromScriptSound(nbt, player.worldObj);
ScriptSoundController.Instance.playSound(sound);
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client.sound;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -7,6 +8,7 @@ import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.controllers.ScriptClientSound;
import noppes.npcs.client.controllers.ScriptSoundController;
@@ -35,6 +37,9 @@ public final class PlaySoundToPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
int soundId = in.readInt();
NBTTagCompound nbt = Server.readNBT(in);
ScriptClientSound sound = ScriptClientSound.fromScriptSound(nbt, player.worldObj);
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client.sync;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -7,6 +8,7 @@ import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.controllers.SyncController;
@@ -34,6 +36,9 @@ public final class SyncConfigPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
NBTTagCompound configNBT = Server.readNBT(in);
SyncController.receiveConfigs(configNBT);
}
@@ -1,11 +1,13 @@
package kamkeel.npcs.network.packets.client.sync;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.CustomNpcs;
import noppes.npcs.controllers.RecipeController;
import java.io.IOException;
@@ -32,6 +34,9 @@ public final class SyncRecipesCarpentryBenchPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
RecipeController.Instance.anvilRecipes = RecipeController.syncRecipes;
RecipeController.syncRecipes.clear();
}
@@ -1,11 +1,13 @@
package kamkeel.npcs.network.packets.client.sync;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumClientPacket;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.CustomNpcs;
import noppes.npcs.controllers.RecipeController;
import java.io.IOException;
@@ -32,6 +34,9 @@ public final class SyncRecipesWorkbenchPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
RecipeController.reloadGlobalRecipes(RecipeController.syncRecipes);
RecipeController.syncRecipes.clear();
}
@@ -1,5 +1,6 @@
package kamkeel.npcs.network.packets.client.sync;
import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
@@ -9,6 +10,7 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.entity.EntityNPCInterface;
@@ -36,6 +38,9 @@ public final class SyncWeaponPacket extends AbstractPacket {
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if(CustomNpcs.side() != Side.CLIENT)
return;
Entity entity = player.worldObj.getEntityByID(in.readInt());
if (!(entity instanceof EntityNPCInterface)) return;
@@ -4,19 +4,14 @@ import io.netty.buffer.ByteBuf;
import net.minecraft.client.Minecraft;
import net.minecraft.client.audio.PositionedSoundRecord;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.CompressedStreamTools;
import net.minecraft.nbt.NBTSizeTracker;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.Util;
import net.minecraft.world.World;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.fx.CustomFX;
import noppes.npcs.client.gui.player.GuiDialogInteract;
import noppes.npcs.client.gui.player.GuiQuestCompletion;
import noppes.npcs.client.gui.util.GuiContainerNPCInterface;
@@ -29,15 +24,12 @@ import noppes.npcs.controllers.data.Dialog;
import noppes.npcs.controllers.data.Quest;
import noppes.npcs.controllers.data.SkinOverlay;
import noppes.npcs.entity.EntityNPCInterface;
import noppes.npcs.scripted.ScriptParticle;
import org.lwjgl.Sys;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.util.HashMap;
import java.util.Random;
import java.util.Vector;
public class NoppesUtil {
@@ -50,28 +42,7 @@ public class NoppesUtil {
Client.sendData(EnumPacketServer.Gui, gui.ordinal(), i, j, k);
}
public static void spawnParticle(ByteBuf buffer) throws IOException{
double posX = buffer.readDouble();
double posY = buffer.readDouble();
double posZ = buffer.readDouble();
float height = buffer.readFloat();
float width = buffer.readFloat();
float yOffset = buffer.readFloat();
String particle = Server.readString(buffer);
World worldObj = Minecraft.getMinecraft().theWorld;
Random rand = worldObj.rand;
if(particle.equals("heal")){
for (int k = 0; k < 6; k++)
{
worldObj.spawnParticle("instantSpell", posX + (rand.nextDouble() - 0.5D) * (double)width, (posY + rand.nextDouble() * (double)height) - (double)yOffset, posZ + (rand.nextDouble() - 0.5D) * (double)width, 0, 0, 0);
worldObj.spawnParticle("spell", posX + (rand.nextDouble() - 0.5D) * (double)width, (posY + rand.nextDouble() * (double)height) - (double)yOffset, posZ + (rand.nextDouble() - 0.5D) * (double)width, 0, 0, 0);
}
}
}
public static void updateSkinOverlayData(EntityPlayer player, NBTTagCompound compound) {
public static void updateSkinOverlayData(EntityPlayer player, NBTTagCompound compound) {
HashMap<Integer, SkinOverlay> skinOverlays = new HashMap<>();
HashMap<Integer, SkinOverlay> oldOverlays = new HashMap<>();
NBTTagList skinOverlayList = compound.getTagList("SkinOverlayData",10);
@@ -90,39 +61,7 @@ public class NoppesUtil {
ClientCacheHandler.skinOverlays.put(player.getUniqueID(), skinOverlays);
}
public static void spawnScriptedParticle(EntityPlayer player, ByteBuf buffer){
Minecraft minecraft = Minecraft.getMinecraft();
NBTTagCompound compound;
ScriptParticle particle;
try {
compound = Server.readNBT(buffer);
particle = ScriptParticle.fromNBT(compound);
} catch (IOException ignored) {
return;
}
World worldObj = player.worldObj;
if (worldObj == null) {
return;
}
Entity entity = null;
if (compound.hasKey("EntityID")) {
entity = worldObj.getEntityByID(compound.getInteger("EntityID"));
if (entity != null)
worldObj = entity.worldObj;
else return;
}
CustomFX fx = CustomFX.fromScriptedParticle(particle, worldObj, entity);
for(int i = 0; i < particle.amount; i++){
minecraft.effectRenderer.addEffect(fx);
}
}
public static void clickSound() {
public static void clickSound() {
Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
}
@@ -124,12 +124,6 @@ public class PacketHandlerClient extends PacketHandlerServer{
EnumGuiType gui = EnumGuiType.values()[buffer.readInt()];
CustomNpcs.proxy.openGui(NoppesUtil.getLastNpc(), gui, buffer.readInt(), buffer.readInt(), buffer.readInt());
}
else if(type == EnumPacketClient.SCRIPTED_PARTICLE){
NoppesUtil.spawnScriptedParticle(player, buffer);
}
else if(type == EnumPacketClient.PARTICLE){
NoppesUtil.spawnParticle(buffer);
}
else if(type == EnumPacketClient.DELETE_NPC){
Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(buffer.readInt());
if(entity == null || !(entity instanceof EntityNPCInterface))
@@ -12,8 +12,6 @@ public enum EnumPacketClient {
UPDATE_NPC,
ROLE,
GUI,
SCRIPTED_PARTICLE,
PARTICLE,
DELETE_NPC,
SCROLL_SELECTED,
GUI_REDSTONE,