mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-19 09:39:05 +00:00
Complete Large Packet Sending
This commit is contained in:
1 parent
36c8b70eb4
commit
f573259fd1
11 files changed
+219
-152
No files matched your search
@@ -16,6 +16,7 @@ import kamkeel.npcs.command.profile.CommandProfile;
|
||||
import kamkeel.npcs.controllers.ProfileController;
|
||||
import kamkeel.npcs.controllers.data.CNPCData;
|
||||
import kamkeel.npcs.developer.Developer;
|
||||
import kamkeel.npcs.network.PacketHandler;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockIce;
|
||||
import net.minecraft.block.BlockLeavesBase;
|
||||
@@ -249,6 +250,13 @@ public class CustomNpcs {
|
||||
ServerTagMapController.Instance = new ServerTagMapController();
|
||||
}
|
||||
|
||||
//Loading items in the about to start event was corrupting items with a damage value
|
||||
@EventHandler
|
||||
public void postInit(FMLPostInitializationEvent event) {
|
||||
PacketHandler.Instance = new PacketHandler();
|
||||
}
|
||||
|
||||
|
||||
@EventHandler
|
||||
public void stopped(FMLServerStoppedEvent event){
|
||||
ServerCloneController.Instance = null;
|
||||
|
||||
@@ -49,6 +49,8 @@ import java.text.DecimalFormat;
|
||||
import java.util.*;
|
||||
import java.util.zip.GZIPOutputStream;
|
||||
|
||||
import static kamkeel.npcs.network.KamUtilServer.sendScrollData;
|
||||
|
||||
public class NoppesUtilServer {
|
||||
private static HashMap<String,Quest> editingQuests = new HashMap<String,Quest>();
|
||||
|
||||
@@ -505,7 +507,7 @@ public class NoppesUtilServer {
|
||||
}
|
||||
}
|
||||
|
||||
NoppesUtilServer.sendScrollData(player, map);
|
||||
sendScrollData(player, map);
|
||||
}
|
||||
|
||||
public static void removePlayerData(ByteBuf buffer, EntityPlayerMP player) throws IOException {
|
||||
@@ -593,17 +595,17 @@ public class NoppesUtilServer {
|
||||
}
|
||||
sendScrollData(player, map);
|
||||
}
|
||||
public static void sendScrollData(EntityPlayerMP player, Map<String,Integer> map){
|
||||
Map<String, Integer> send = new HashMap<String, Integer>();
|
||||
for(String key : map.keySet()){
|
||||
send.put(key, map.get(key));
|
||||
if(send.size() == 100){
|
||||
Server.sendData(player, EnumPacketClient.SCROLL_DATA_PART, send);
|
||||
send = new HashMap<String, Integer>();
|
||||
}
|
||||
}
|
||||
Server.sendData(player, EnumPacketClient.SCROLL_DATA, send);
|
||||
}
|
||||
// public static void sendScrollData(EntityPlayerMP player, Map<String,Integer> map){
|
||||
// Map<String, Integer> send = new HashMap<String, Integer>();
|
||||
// for(String key : map.keySet()){
|
||||
// send.put(key, map.get(key));
|
||||
// if(send.size() == 100){
|
||||
// Server.sendData(player, EnumPacketClient.SCROLL_DATA_PART, send);
|
||||
// send = new HashMap<String, Integer>();
|
||||
// }
|
||||
// }
|
||||
// Server.sendData(player, EnumPacketClient.SCROLL_DATA, send);
|
||||
// }
|
||||
|
||||
public static void sendScrollGroup(EntityPlayerMP player, Map<String,Integer> map){
|
||||
Map<String, Integer> send = new HashMap<String, Integer>();
|
||||
|
||||
@@ -6,6 +6,7 @@ import cpw.mods.fml.common.network.FMLNetworkEvent.ServerCustomPacketEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import foxz.utils.Market;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import kamkeel.npcs.network.KamUtilServer;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityList;
|
||||
import net.minecraft.entity.passive.EntityVillager;
|
||||
@@ -102,7 +103,7 @@ public class PacketHandlerServer{
|
||||
WorldProvider provider = DimensionManager.createProviderFor(id);
|
||||
map.put(provider.getDimensionName(), id);
|
||||
}
|
||||
NoppesUtilServer.sendScrollData(player, map);
|
||||
KamUtilServer.sendScrollData(player, map);
|
||||
} else if(type == EnumPacketServer.TagsGet){
|
||||
NoppesUtilServer.sendTagDataAll(player);
|
||||
} else if (type == EnumPacketServer.NpcTagsGet) {
|
||||
@@ -584,7 +585,7 @@ public class PacketHandlerServer{
|
||||
Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
|
||||
}
|
||||
else if(type == EnumPacketServer.DialogCategoriesGet){
|
||||
NoppesUtilServer.sendScrollData(player, DialogController.Instance.getScroll());
|
||||
KamUtilServer.sendScrollData(player, DialogController.Instance.getScroll());
|
||||
}
|
||||
else if(type == EnumPacketServer.DialogsGetFromDialog){
|
||||
Dialog dialog = DialogController.Instance.dialogs.get(buffer.readInt());
|
||||
@@ -797,7 +798,7 @@ public class PacketHandlerServer{
|
||||
NoppesUtilServer.setRecipeGui(player,recipe);
|
||||
}
|
||||
else if(type == EnumPacketServer.NaturalSpawnGetAll){
|
||||
NoppesUtilServer.sendScrollData(player, SpawnController.Instance.getScroll());
|
||||
KamUtilServer.sendScrollData(player, SpawnController.Instance.getScroll());
|
||||
}
|
||||
else if(type == EnumPacketServer.NaturalSpawnGet){
|
||||
SpawnData spawn = SpawnController.Instance.getSpawnData(buffer.readInt());
|
||||
@@ -810,21 +811,21 @@ public class PacketHandlerServer{
|
||||
data.readNBT(Server.readNBT(buffer));
|
||||
SpawnController.Instance.saveSpawnData(data);
|
||||
|
||||
NoppesUtilServer.sendScrollData(player, SpawnController.Instance.getScroll());
|
||||
KamUtilServer.sendScrollData(player, SpawnController.Instance.getScroll());
|
||||
}
|
||||
else if(type == EnumPacketServer.NaturalSpawnRemove){
|
||||
SpawnController.Instance.removeSpawnData(buffer.readInt());
|
||||
NoppesUtilServer.sendScrollData(player, SpawnController.Instance.getScroll());
|
||||
KamUtilServer.sendScrollData(player, SpawnController.Instance.getScroll());
|
||||
}
|
||||
else if(type == EnumPacketServer.DialogCategorySave){
|
||||
DialogCategory category = new DialogCategory();
|
||||
category.readNBT(Server.readNBT(buffer));
|
||||
DialogController.Instance.saveCategory(category);
|
||||
NoppesUtilServer.sendScrollData(player, DialogController.Instance.getScroll());
|
||||
KamUtilServer.sendScrollData(player, DialogController.Instance.getScroll());
|
||||
}
|
||||
else if(type == EnumPacketServer.DialogCategoryRemove){
|
||||
DialogController.Instance.removeCategory(buffer.readInt());
|
||||
NoppesUtilServer.sendScrollData(player, DialogController.Instance.getScroll());
|
||||
KamUtilServer.sendScrollData(player, DialogController.Instance.getScroll());
|
||||
}
|
||||
else if(type == EnumPacketServer.DialogCategoryGet){
|
||||
DialogCategory category = DialogController.Instance.categories.get(buffer.readInt());
|
||||
|
||||
Reference in new issue
Block a user