studiorailgun/Renderer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

warnings->debugs on client inv state
Some checks reported errors
studiorailgun/Renderer/pipeline/head Something is wrong with the build of this commit
Details

Browse Source
This commit is contained in:
austin 2025-05-14 12:46:49 -04:00
parent a3ab967b1c
commit ce10e81ca5
1 changed files with 9 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/main/java/electrosphere/entity/state/inventory/ClientInventoryState.java
View File

@ -65,10 +65,10 @@ public class ClientInventoryState implements BehaviorTree {
Entity clientSideContainer = Globals.clientSceneWrapper.getEntityFromServerId(message.gettargetEntId()); Entity clientSideContainer = Globals.clientSceneWrapper.getEntityFromServerId(message.gettargetEntId());
Entity clientSideItem = null; Entity clientSideItem = null;
if(Globals.clientSceneWrapper.containsServerId(message.getitemEntId())){ 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()); clientSideItem = Globals.clientSceneWrapper.getEntityFromServerId(message.getitemEntId());
} else { } else {
LoggerInterface.loggerNetworking.WARNING("Client create item " + message.getitemEntId()); LoggerInterface.loggerNetworking.DEBUG("Client create item " + message.getitemEntId());
clientSideItem = ClientInventoryState.clientConstructInInventoryItem(clientSideContainer,message.getitemTemplate()); clientSideItem = ClientInventoryState.clientConstructInInventoryItem(clientSideContainer,message.getitemTemplate());
Globals.clientSceneWrapper.mapIdToId(clientSideItem.getId(), message.getitemEntId()); Globals.clientSceneWrapper.mapIdToId(clientSideItem.getId(), message.getitemEntId());
} }
@ -89,7 +89,7 @@ public class ClientInventoryState implements BehaviorTree {
WindowUtils.attemptRedrawInventoryWindows(); WindowUtils.attemptRedrawInventoryWindows();
} break; } break;
case REMOVEITEMFROMINVENTORY: { 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()); Entity item = Globals.clientSceneWrapper.getEntityFromServerId(message.getentityId());
if(item != null){ if(item != null){
ClientInventoryState.clientRemoveItemFromInventories(item); ClientInventoryState.clientRemoveItemFromInventories(item);
@ -98,76 +98,15 @@ public class ClientInventoryState implements BehaviorTree {
} }
} break; } break;
case SERVERCOMMANDMOVEITEMCONTAINER: { 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) //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()); Entity itemEnt = Globals.clientSceneWrapper.getEntityFromServerId(message.getentityId());
switch(message.getcontainerType()){ ClientInventoryState.moveItem(this.parent, itemEnt, message.getcontainerType(), message.getequipPointId());
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);
}
}
}
//once we've switched the items around, redraw the inventory to reflect the updated contents //once we've switched the items around, redraw the inventory to reflect the updated contents
WindowUtils.attemptRedrawInventoryWindows(); WindowUtils.attemptRedrawInventoryWindows();
} break; } break;
case SERVERCOMMANDUNEQUIPITEM: { case SERVERCOMMANDUNEQUIPITEM: {
LoggerInterface.loggerNetworking.WARNING("Client unequip item " + message.getequipPointId()); LoggerInterface.loggerNetworking.DEBUG("Client unequip item " + message.getequipPointId());
switch(message.getcontainerType()){ switch(message.getcontainerType()){
case InventoryProtocol.INVENTORY_TYPE_NATURAL: { case InventoryProtocol.INVENTORY_TYPE_NATURAL: {
throw new UnsupportedOperationException("unsupported!"); throw new UnsupportedOperationException("unsupported!");
@ -191,7 +130,7 @@ public class ClientInventoryState implements BehaviorTree {
} }
} break; } break;
case SERVERCOMMANDEQUIPITEM: { case SERVERCOMMANDEQUIPITEM: {
LoggerInterface.loggerNetworking.WARNING("Client equip item " + message.getentityId()); LoggerInterface.loggerNetworking.DEBUG("Client equip item " + message.getentityId());
//translate equipper id //translate equipper id
Entity equipper = Globals.clientSceneWrapper.getEntityFromServerId(message.getequipperId()); Entity equipper = Globals.clientSceneWrapper.getEntityFromServerId(message.getequipperId());
//spawn in world id //spawn in world id
@ -225,7 +164,7 @@ public class ClientInventoryState implements BehaviorTree {
} }
} break; } break;
case SERVERUPDATEITEMCHARGES: { 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()); Entity clientInventoryItem = Globals.clientSceneWrapper.getEntityFromServerId(message.getentityId());
ClientChargeState clientChargeState = ClientChargeState.getClientChargeState(clientInventoryItem); ClientChargeState clientChargeState = ClientChargeState.getClientChargeState(clientInventoryItem);
clientChargeState.setCharges(message.getcharges()); clientChargeState.setCharges(message.getcharges());