From ce10e81ca5af46341cf25113f1dc9fc9a8428018 Mon Sep 17 00:00:00 2001 From: austin Date: Wed, 14 May 2025 12:46:49 -0400 Subject: [PATCH] warnings->debugs on client inv state --- .../state/inventory/ClientInventoryState.java | 79 +++---------------- 1 file changed, 9 insertions(+), 70 deletions(-) diff --git a/src/main/java/electrosphere/entity/state/inventory/ClientInventoryState.java b/src/main/java/electrosphere/entity/state/inventory/ClientInventoryState.java index a2e5f219..f6c25b0b 100644 --- a/src/main/java/electrosphere/entity/state/inventory/ClientInventoryState.java +++ b/src/main/java/electrosphere/entity/state/inventory/ClientInventoryState.java @@ -65,10 +65,10 @@ public class ClientInventoryState implements BehaviorTree { Entity clientSideContainer = Globals.clientSceneWrapper.getEntityFromServerId(message.gettargetEntId()); Entity clientSideItem = null; if(Globals.clientSceneWrapper.containsServerId(message.getitemEntId())){ - LoggerInterface.loggerNetworking.WARNING("Client move item " + message.getitemEntId()); + LoggerInterface.loggerNetworking.DEBUG("Client move item " + message.getitemEntId()); clientSideItem = Globals.clientSceneWrapper.getEntityFromServerId(message.getitemEntId()); } else { - LoggerInterface.loggerNetworking.WARNING("Client create item " + message.getitemEntId()); + LoggerInterface.loggerNetworking.DEBUG("Client create item " + message.getitemEntId()); clientSideItem = ClientInventoryState.clientConstructInInventoryItem(clientSideContainer,message.getitemTemplate()); Globals.clientSceneWrapper.mapIdToId(clientSideItem.getId(), message.getitemEntId()); } @@ -89,7 +89,7 @@ public class ClientInventoryState implements BehaviorTree { WindowUtils.attemptRedrawInventoryWindows(); } break; case REMOVEITEMFROMINVENTORY: { - LoggerInterface.loggerNetworking.WARNING("Client remove item from inventories " + message.getentityId()); + LoggerInterface.loggerNetworking.DEBUG("Client remove item from inventories " + message.getentityId()); Entity item = Globals.clientSceneWrapper.getEntityFromServerId(message.getentityId()); if(item != null){ ClientInventoryState.clientRemoveItemFromInventories(item); @@ -98,76 +98,15 @@ public class ClientInventoryState implements BehaviorTree { } } break; case SERVERCOMMANDMOVEITEMCONTAINER: { - LoggerInterface.loggerNetworking.WARNING("Client move item container " + message.getentityId()); + LoggerInterface.loggerNetworking.DEBUG("Client move item container " + message.getentityId()); //this is a command to switch an item from one inventory to another (ie equip->natural or vice-versa) - Entity target = Globals.clientSceneWrapper.getEntityFromServerId(message.getentityId()); - switch(message.getcontainerType()){ - case InventoryProtocol.INVENTORY_TYPE_EQUIP: { - String equipPointId = message.getequipPointId(); - if(InventoryUtils.hasNaturalInventory(parent)){ - UnrelationalInventoryState naturalInventory = InventoryUtils.getNaturalInventory(parent); - naturalInventory.removeItem(target); - } - if(InventoryUtils.hasEquipInventory(parent)){ - RelationalInventoryState equipInventory = InventoryUtils.getEquipInventory(parent); - equipInventory.tryRemoveItem(target); - equipInventory.addItem(equipPointId, target); - } - if(ClientEquipState.getClientEquipState(parent) != null){ - ClientEquipState clientEquipState = ClientEquipState.getClientEquipState(parent); - clientEquipState.attemptEquip(target, clientEquipState.getEquipPoint(equipPointId)); - } - if(InventoryUtils.hasToolbarInventory(parent)){ - RelationalInventoryState toolbarInventory = InventoryUtils.getToolbarInventory(parent); - toolbarInventory.tryRemoveItem(target); - } - } break; - case InventoryProtocol.INVENTORY_TYPE_NATURAL: { - if(InventoryUtils.hasNaturalInventory(parent)){ - UnrelationalInventoryState naturalInventory = InventoryUtils.getNaturalInventory(parent); - naturalInventory.removeItem(target); - naturalInventory.addItem(target); - } - if(InventoryUtils.hasEquipInventory(parent)){ - RelationalInventoryState equipInventory = InventoryUtils.getEquipInventory(parent); - if(ClientEquipState.getClientEquipState(parent) != null){ - ClientEquipState clientEquipState = ClientEquipState.getClientEquipState(parent); - clientEquipState.clientTransformUnequipPoint(equipInventory.getItemSlot(target)); - } - equipInventory.tryRemoveItem(target); - } - if(InventoryUtils.hasToolbarInventory(parent)){ - RelationalInventoryState toolbarInventory = InventoryUtils.getToolbarInventory(parent); - toolbarInventory.tryRemoveItem(target); - } - } break; - case InventoryProtocol.INVENTORY_TYPE_TOOLBAR: { - if(InventoryUtils.hasNaturalInventory(parent)){ - UnrelationalInventoryState naturalInventory = InventoryUtils.getNaturalInventory(parent); - naturalInventory.removeItem(target); - } - if(InventoryUtils.hasEquipInventory(parent)){ - RelationalInventoryState equipInventory = InventoryUtils.getEquipInventory(parent); - if(ClientEquipState.getClientEquipState(parent) != null){ - ClientEquipState clientEquipState = ClientEquipState.getClientEquipState(parent); - if(equipInventory.containsItem(target)){ - clientEquipState.clientTransformUnequipPoint(equipInventory.getItemSlot(target)); - } - } - equipInventory.tryRemoveItem(target); - } - if(InventoryUtils.hasToolbarInventory(parent)){ - RelationalInventoryState toolbarInventory = InventoryUtils.getToolbarInventory(parent); - toolbarInventory.tryRemoveItem(target); - toolbarInventory.addItem("" + message.getequipPointId(), target); - } - } - } + Entity itemEnt = Globals.clientSceneWrapper.getEntityFromServerId(message.getentityId()); + ClientInventoryState.moveItem(this.parent, itemEnt, message.getcontainerType(), message.getequipPointId()); //once we've switched the items around, redraw the inventory to reflect the updated contents WindowUtils.attemptRedrawInventoryWindows(); } break; case SERVERCOMMANDUNEQUIPITEM: { - LoggerInterface.loggerNetworking.WARNING("Client unequip item " + message.getequipPointId()); + LoggerInterface.loggerNetworking.DEBUG("Client unequip item " + message.getequipPointId()); switch(message.getcontainerType()){ case InventoryProtocol.INVENTORY_TYPE_NATURAL: { throw new UnsupportedOperationException("unsupported!"); @@ -191,7 +130,7 @@ public class ClientInventoryState implements BehaviorTree { } } break; case SERVERCOMMANDEQUIPITEM: { - LoggerInterface.loggerNetworking.WARNING("Client equip item " + message.getentityId()); + LoggerInterface.loggerNetworking.DEBUG("Client equip item " + message.getentityId()); //translate equipper id Entity equipper = Globals.clientSceneWrapper.getEntityFromServerId(message.getequipperId()); //spawn in world id @@ -225,7 +164,7 @@ public class ClientInventoryState implements BehaviorTree { } } break; case SERVERUPDATEITEMCHARGES: { - LoggerInterface.loggerNetworking.WARNING("Client set item charges " + message.getentityId()); + LoggerInterface.loggerNetworking.DEBUG("Client set item charges " + message.getentityId()); Entity clientInventoryItem = Globals.clientSceneWrapper.getEntityFromServerId(message.getentityId()); ClientChargeState clientChargeState = ClientChargeState.getClientChargeState(clientInventoryItem); clientChargeState.setCharges(message.getcharges());