MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

More integration work

Browse Source
This commit is contained in:
MagicBot
2024-04-14 14:48:59 -04:00
parent 5e5b9884ef
commit 9464500e95
13 changed files with 59 additions and 1803 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/msg/ItemProductionMsg.java
+24 -21
View File
@@ -10,6 +10,7 @@
package engine.net.client.msg;
import engine.gameManager.BuildingManager;
import engine.gameManager.ForgeManager;
import engine.gameManager.PowersManager;
import engine.mbEnums;
import engine.mbEnums.GameObjectType;
@@ -27,7 +28,7 @@ public class ItemProductionMsg extends ClientNetMsg {
public int size;
public int buildingUUID;
public int unknown01;
public int templateID;
public int itemUUID;
public int itemType;
public int total_to_produce;
public int unknown03;
@@ -50,7 +51,7 @@ public class ItemProductionMsg extends ClientNetMsg {
this.size = 0;
this.buildingUUID = 0;
this.unknown01 = 0;
this.templateID = 0;
this.itemUUID = 0;
this.total_to_produce = 0;
this.unknown03 = 0;
this.pToken = 0;
@@ -70,7 +71,7 @@ public class ItemProductionMsg extends ClientNetMsg {
this.buildingUUID = building.getObjectUUID();
this.npcUUID = vendor.getObjectUUID();
this.itemType = item.getObjectType().ordinal();
this.templateID = item.getObjectUUID();
this.itemUUID = item.getObjectUUID();
this.unknown01 = 0;
this.total_to_produce = 0;
this.unknown03 = 0;
@@ -128,7 +129,7 @@ public class ItemProductionMsg extends ClientNetMsg {
if (!add) {
writer.put((byte) 1);
Item item = Item.getFromCache(this.templateID);
Item item = Item.getFromCache(this.itemUUID);
if (item != null)
Item.serializeForClientMsgWithoutSlot(item, writer);
writer.putInt(building.getStrongboxValue());
@@ -142,12 +143,14 @@ public class ItemProductionMsg extends ClientNetMsg {
writer.putInt(0);
writer.put((byte) 1);
Item item;
if (this.itemType == GameObjectType.Item.ordinal())
item = Item.getFromCache(this.templateID);
if (this.itemUUID > 0)
item = Item.getFromCache(this.itemUUID);
else
item = MobLoot.getFromCache(this.templateID);
item = ForgeManager.inMemoryItemLookup.get(this.itemUUID);
if (item != null)
Item.serializeForClientMsgWithoutSlot(item, writer);
writer.putInt(building.getStrongboxValue());
writer.putInt(0);
writer.putInt(0);
@@ -155,7 +158,7 @@ public class ItemProductionMsg extends ClientNetMsg {
break;
case CONFIRM_TAKE:
writer.putInt(this.itemType);
writer.putInt(this.templateID);
writer.putInt(this.itemUUID);
writer.putInt(1);
writer.putInt(0);
writer.putInt(0);
@@ -167,7 +170,7 @@ public class ItemProductionMsg extends ClientNetMsg {
break;
case SETPRICE:
writer.putInt(this.itemType);
writer.putInt(this.templateID);
writer.putInt(this.itemUUID);
writer.putInt(1);
writer.putInt(0);
writer.putInt(0);
@@ -180,7 +183,7 @@ public class ItemProductionMsg extends ClientNetMsg {
break;
case CONFIRM_SETPRICE:
writer.putInt(this.itemType);
writer.putInt(this.templateID);
writer.putInt(this.itemUUID);
writer.putInt(1);
writer.putInt(0);
writer.putInt(0);
@@ -194,7 +197,7 @@ public class ItemProductionMsg extends ClientNetMsg {
break;
case DEPOSIT:
writer.putInt(this.itemType);
writer.putInt(this.templateID);
writer.putInt(this.itemUUID);
writer.putInt(1);
writer.putInt(0);
writer.putInt(0);
@@ -234,7 +237,7 @@ public class ItemProductionMsg extends ClientNetMsg {
writer.putInt(0);
writer.putInt(0);
writer.putInt(1);
MobLoot toRoll = MobLoot.getFromCache(this.templateID);
MobLoot toRoll = MobLoot.getFromCache(this.itemUUID);
writer.putInt(-1497023830);
if (toRoll != null && toRoll.getPrefix() != null && !toRoll.getPrefix().isEmpty()) {
@@ -262,7 +265,7 @@ public class ItemProductionMsg extends ClientNetMsg {
writer.putString(toRoll.name);
writer.putInt(GameObjectType.MobLoot.ordinal());
writer.putInt(this.templateID);
writer.putInt(this.itemUUID);
writer.putInt(0); //items left to produce?
writer.putInt(toRoll.templateID);
@@ -306,7 +309,7 @@ public class ItemProductionMsg extends ClientNetMsg {
break;
case COMPLETE:
writer.putInt(this.itemType);
writer.putInt(this.templateID);
writer.putInt(this.itemUUID);
writer.putInt(this.total_to_produce);
writer.putInt(this.unknown03);
writer.putInt(this.pToken);
@@ -318,7 +321,7 @@ public class ItemProductionMsg extends ClientNetMsg {
break;
case JUNK:
writer.putInt(this.itemType);
writer.putInt(this.templateID);
writer.putInt(this.itemUUID);
writer.putInt(this.total_to_produce);
writer.putInt(this.unknown03);
writer.putInt(this.pToken);
@@ -355,7 +358,7 @@ public class ItemProductionMsg extends ClientNetMsg {
switch (this.actionType) {
case SETPRICE:
this.itemType = reader.getInt();
this.templateID = reader.getInt();
this.itemUUID = reader.getInt();
reader.getInt();
reader.getInt();
reader.getInt();
@@ -380,15 +383,15 @@ public class ItemProductionMsg extends ClientNetMsg {
HashMap<Integer, Integer> tempIDs = new HashMap<>();
for (int i = 0; i < this.size; i++) {
int type = reader.getInt(); // Item type padding
this.templateID = reader.getInt();
tempIDs.put(this.templateID, type);
this.itemUUID = reader.getInt();
tempIDs.put(this.itemUUID, type);
}
reader.getInt();
this.items = tempIDs;
break;
case DEPOSIT:
this.itemType = reader.getInt();
this.templateID = reader.getInt();
this.itemUUID = reader.getInt();
reader.getInt();
reader.getInt();
reader.getInt();
@@ -400,7 +403,7 @@ public class ItemProductionMsg extends ClientNetMsg {
break;
case JUNK:
this.itemType = reader.getInt();
this.templateID = reader.getInt();
this.itemUUID = reader.getInt();
this.total_to_produce = reader.getInt();
this.unknown03 = reader.getInt();
this.pToken = reader.getInt();
@@ -412,7 +415,7 @@ public class ItemProductionMsg extends ClientNetMsg {
break;
default:
this.itemType = reader.getInt();
this.templateID = reader.getInt();
this.itemUUID = reader.getInt();
this.total_to_produce = reader.getInt();
this.unknown03 = reader.getInt();
this.pToken = reader.getInt();
src/engine/net/client/msg/ManageNPCMsg.java
+2 -1
View File
@@ -9,6 +9,7 @@
package engine.net.client.msg;
import engine.gameManager.ForgeManager;
import engine.gameManager.NPCManager;
import engine.gameManager.PowersManager;
import engine.mbEnums.GameObjectType;
@@ -435,7 +436,7 @@ public class ManageNPCMsg extends ClientNetMsg {
writer.put((byte) template.modTable);//EffectItemType
}
List<MobLoot> itemList = npc.getRolling();
List<Item> itemList = ForgeManager.vendorItemLookup.get(npc);
itemList = itemList.stream().limit(npc.getRank()).collect(Collectors.toList());
writer.putInt(itemList.size());