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

run latest netcode gen
All checks were successful
studiorailgun/Renderer/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
austin 2024-06-18 20:59:35 -04:00
parent 8c0a7697d0
commit fbbd93df8d
8 changed files with 49 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java
View File

@ -1,6 +1,7 @@
package electrosphere.entity.state.attack; package electrosphere.entity.state.attack;
import electrosphere.net.synchronization.FieldIdEnums;
import electrosphere.net.synchronization.BehaviorTreeIdEnums; import electrosphere.net.synchronization.BehaviorTreeIdEnums;
import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils; import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;
@ -472,7 +473,7 @@ public class ServerAttackTree implements BehaviorTree {
public void setState(AttackTreeState state){ public void setState(AttackTreeState state){
this.state = state; this.state = state;
int value = ClientAttackTree.getAttackTreeStateEnumAsShort(state); int value = ClientAttackTree.getAttackTreeStateEnumAsShort(state);
DataCellSearchUtils.getEntityDataCell(parent).broadcastNetworkMessage(SynchronizationMessage.constructUpdateClientStateMessage(parent.getId(), 1, 3, value)); DataCellSearchUtils.getEntityDataCell(parent).broadcastNetworkMessage(SynchronizationMessage.constructUpdateClientStateMessage(parent.getId(), BehaviorTreeIdEnums.BTREE_SERVERATTACKTREE_ID, FieldIdEnums.TREE_SERVERATTACKTREE_SYNCEDFIELD_STATE_ID, value));
} }
/** /**
* <p> Automatically generated </p> * <p> Automatically generated </p>
@ -493,7 +494,7 @@ public class ServerAttackTree implements BehaviorTree {
public void setDriftState(AttackTreeDriftState driftState){ public void setDriftState(AttackTreeDriftState driftState){
this.driftState = driftState; this.driftState = driftState;
int value = ClientAttackTree.getAttackTreeDriftStateEnumAsShort(driftState); int value = ClientAttackTree.getAttackTreeDriftStateEnumAsShort(driftState);
DataCellSearchUtils.getEntityDataCell(parent).broadcastNetworkMessage(SynchronizationMessage.constructUpdateClientStateMessage(parent.getId(), 1, 4, value)); DataCellSearchUtils.getEntityDataCell(parent).broadcastNetworkMessage(SynchronizationMessage.constructUpdateClientStateMessage(parent.getId(), BehaviorTreeIdEnums.BTREE_SERVERATTACKTREE_ID, FieldIdEnums.TREE_SERVERATTACKTREE_SYNCEDFIELD_DRIFTSTATE_ID, value));
} }
/** /**
* <p> (initially) Automatically generated </p> * <p> (initially) Automatically generated </p>
@ -555,6 +556,6 @@ public class ServerAttackTree implements BehaviorTree {
*/ */
public void setCurrentMoveId(String currentMoveId){ public void setCurrentMoveId(String currentMoveId){
this.currentMoveId = currentMoveId; this.currentMoveId = currentMoveId;
DataCellSearchUtils.getEntityDataCell(parent).broadcastNetworkMessage(SynchronizationMessage.constructUpdateClientStringStateMessage(parent.getId(), 1, 5, currentMoveId)); DataCellSearchUtils.getEntityDataCell(parent).broadcastNetworkMessage(SynchronizationMessage.constructUpdateClientStringStateMessage(parent.getId(), BehaviorTreeIdEnums.BTREE_SERVERATTACKTREE_ID, FieldIdEnums.TREE_SERVERATTACKTREE_SYNCEDFIELD_CURRENTMOVEID_ID, currentMoveId));
} }
} }

5
src/main/java/electrosphere/entity/state/block/ServerBlockTree.java
View File

@ -1,6 +1,7 @@
package electrosphere.entity.state.block; package electrosphere.entity.state.block;
import electrosphere.net.synchronization.FieldIdEnums;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityDataStrings;
@ -129,7 +130,7 @@ public class ServerBlockTree implements BehaviorTree {
public void setState(BlockState state){ public void setState(BlockState state){
this.state = state; this.state = state;
int value = ClientBlockTree.getBlockStateEnumAsShort(state); int value = ClientBlockTree.getBlockStateEnumAsShort(state);
DataCellSearchUtils.getEntityDataCell(parent).broadcastNetworkMessage(SynchronizationMessage.constructUpdateClientStateMessage(parent.getId(), 3, 8, value)); DataCellSearchUtils.getEntityDataCell(parent).broadcastNetworkMessage(SynchronizationMessage.constructUpdateClientStateMessage(parent.getId(), BehaviorTreeIdEnums.BTREE_SERVERBLOCKTREE_ID, FieldIdEnums.TREE_SERVERBLOCKTREE_SYNCEDFIELD_STATE_ID, value));
} }
/** /**
* <p> (initially) Automatically generated </p> * <p> (initially) Automatically generated </p>
@ -192,6 +193,6 @@ public class ServerBlockTree implements BehaviorTree {
*/ */
public void setCurrentBlockVariant(String currentBlockVariant){ public void setCurrentBlockVariant(String currentBlockVariant){
this.currentBlockVariant = currentBlockVariant; this.currentBlockVariant = currentBlockVariant;
DataCellSearchUtils.getEntityDataCell(parent).broadcastNetworkMessage(SynchronizationMessage.constructUpdateClientStringStateMessage(parent.getId(), 3, 9, currentBlockVariant)); DataCellSearchUtils.getEntityDataCell(parent).broadcastNetworkMessage(SynchronizationMessage.constructUpdateClientStringStateMessage(parent.getId(), BehaviorTreeIdEnums.BTREE_SERVERBLOCKTREE_ID, FieldIdEnums.TREE_SERVERBLOCKTREE_SYNCEDFIELD_CURRENTBLOCKVARIANT_ID, currentBlockVariant));
} }
} }

1
src/main/java/electrosphere/entity/state/equip/ServerEquipState.java
View File

@ -1,6 +1,7 @@
package electrosphere.entity.state.equip; package electrosphere.entity.state.equip;
import electrosphere.net.synchronization.FieldIdEnums;
import electrosphere.net.synchronization.BehaviorTreeIdEnums; import electrosphere.net.synchronization.BehaviorTreeIdEnums;
import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils; import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;

3
src/main/java/electrosphere/entity/state/gravity/ServerGravityTree.java
View File

@ -1,6 +1,7 @@
package electrosphere.entity.state.gravity; package electrosphere.entity.state.gravity;
import electrosphere.net.synchronization.FieldIdEnums;
import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityDataStrings;
import electrosphere.net.synchronization.BehaviorTreeIdEnums; import electrosphere.net.synchronization.BehaviorTreeIdEnums;
@ -215,7 +216,7 @@ public class ServerGravityTree implements BehaviorTree {
public void setState(GravityTreeState state){ public void setState(GravityTreeState state){
this.state = state; this.state = state;
int value = ClientGravityTree.getGravityTreeStateEnumAsShort(state); int value = ClientGravityTree.getGravityTreeStateEnumAsShort(state);
DataCellSearchUtils.getEntityDataCell(parent).broadcastNetworkMessage(SynchronizationMessage.constructUpdateClientStateMessage(parent.getId(), 7, 11, value)); DataCellSearchUtils.getEntityDataCell(parent).broadcastNetworkMessage(SynchronizationMessage.constructUpdateClientStateMessage(parent.getId(), BehaviorTreeIdEnums.BTREE_SERVERGRAVITY_ID, FieldIdEnums.TREE_SERVERGRAVITY_SYNCEDFIELD_STATE_ID, value));
} }
/** /**
* <p> (initially) Automatically generated </p> * <p> (initially) Automatically generated </p>

4
src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java
View File

@ -1,5 +1,7 @@
package electrosphere.entity.state.idle; package electrosphere.entity.state.idle;
import electrosphere.net.synchronization.FieldIdEnums;
import electrosphere.entity.state.attack.ClientAttackTree.AttackTreeState; import electrosphere.entity.state.attack.ClientAttackTree.AttackTreeState;
import electrosphere.entity.state.attack.ServerAttackTree; import electrosphere.entity.state.attack.ServerAttackTree;
import electrosphere.entity.state.idle.ClientIdleTree.IdleTreeState; import electrosphere.entity.state.idle.ClientIdleTree.IdleTreeState;
@ -190,7 +192,7 @@ public class ServerIdleTree implements BehaviorTree {
public void setState(IdleTreeState state){ public void setState(IdleTreeState state){
this.state = state; this.state = state;
int value = ClientIdleTree.getIdleTreeStateEnumAsShort(state); int value = ClientIdleTree.getIdleTreeStateEnumAsShort(state);
DataCellSearchUtils.getEntityDataCell(parent).broadcastNetworkMessage(SynchronizationMessage.constructUpdateClientStateMessage(parent.getId(), 9, 13, value)); DataCellSearchUtils.getEntityDataCell(parent).broadcastNetworkMessage(SynchronizationMessage.constructUpdateClientStateMessage(parent.getId(), BehaviorTreeIdEnums.BTREE_SERVERIDLE_ID, FieldIdEnums.TREE_SERVERIDLE_SYNCEDFIELD_STATE_ID, value));
} }
/** /**

3
src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java
View File

@ -1,6 +1,7 @@
package electrosphere.entity.state.movement.groundmove; package electrosphere.entity.state.movement.groundmove;
import electrosphere.net.synchronization.FieldIdEnums;
import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils; import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;
import electrosphere.net.parser.net.message.SynchronizationMessage; import electrosphere.net.parser.net.message.SynchronizationMessage;
@ -678,7 +679,7 @@ public class ServerGroundMovementTree implements BehaviorTree {
public void setFacing(MovementRelativeFacing facing){ public void setFacing(MovementRelativeFacing facing){
this.facing = facing; this.facing = facing;
int value = ClientGroundMovementTree.getMovementRelativeFacingEnumAsShort(facing); int value = ClientGroundMovementTree.getMovementRelativeFacingEnumAsShort(facing);
DataCellSearchUtils.getEntityDataCell(parent).broadcastNetworkMessage(SynchronizationMessage.constructUpdateClientStateMessage(parent.getId(), 11, 15, value)); DataCellSearchUtils.getEntityDataCell(parent).broadcastNetworkMessage(SynchronizationMessage.constructUpdateClientStateMessage(parent.getId(), BehaviorTreeIdEnums.BTREE_SERVERGROUNDMOVEMENTTREE_ID, FieldIdEnums.TREE_SERVERGROUNDMOVEMENTTREE_SYNCEDFIELD_FACING_ID, value));
} }
/** /**

17
src/main/java/electrosphere/net/synchronization/ClientSynchronizationManager.java
View File

@ -1,6 +1,7 @@
package electrosphere.net.synchronization; package electrosphere.net.synchronization;
import electrosphere.net.synchronization.FieldIdEnums;
import electrosphere.entity.state.block.ClientBlockTree; import electrosphere.entity.state.block.ClientBlockTree;
import electrosphere.entity.state.block.ServerBlockTree; import electrosphere.entity.state.block.ServerBlockTree;
@ -100,15 +101,15 @@ public class ClientSynchronizationManager {
switch(bTreeId){ switch(bTreeId){
case BehaviorTreeIdEnums.BTREE_SERVERATTACKTREE_ID: { case BehaviorTreeIdEnums.BTREE_SERVERATTACKTREE_ID: {
switch(message.getfieldId()){ switch(message.getfieldId()){
case 3:{ case FieldIdEnums.TREE_SERVERATTACKTREE_SYNCEDFIELD_STATE_ID:{
ClientAttackTree tree = ClientAttackTree.getClientAttackTree(entity); ClientAttackTree tree = ClientAttackTree.getClientAttackTree(entity);
tree.setState(ClientAttackTree.getAttackTreeStateShortAsEnum((short)message.getbTreeValue())); tree.setState(ClientAttackTree.getAttackTreeStateShortAsEnum((short)message.getbTreeValue()));
} break; } break;
case 4:{ case FieldIdEnums.TREE_SERVERATTACKTREE_SYNCEDFIELD_DRIFTSTATE_ID:{
ClientAttackTree tree = ClientAttackTree.getClientAttackTree(entity); ClientAttackTree tree = ClientAttackTree.getClientAttackTree(entity);
tree.setDriftState(ClientAttackTree.getAttackTreeDriftStateShortAsEnum((short)message.getbTreeValue())); tree.setDriftState(ClientAttackTree.getAttackTreeDriftStateShortAsEnum((short)message.getbTreeValue()));
} break; } break;
case 5:{ case FieldIdEnums.TREE_SERVERATTACKTREE_SYNCEDFIELD_CURRENTMOVEID_ID:{
ClientAttackTree tree = ClientAttackTree.getClientAttackTree(entity); ClientAttackTree tree = ClientAttackTree.getClientAttackTree(entity);
tree.setCurrentMoveId(message.getstringValue()); tree.setCurrentMoveId(message.getstringValue());
} break; } break;
@ -116,11 +117,11 @@ public class ClientSynchronizationManager {
} break; } break;
case BehaviorTreeIdEnums.BTREE_SERVERBLOCKTREE_ID: { case BehaviorTreeIdEnums.BTREE_SERVERBLOCKTREE_ID: {
switch(message.getfieldId()){ switch(message.getfieldId()){
case 8:{ case FieldIdEnums.TREE_SERVERBLOCKTREE_SYNCEDFIELD_STATE_ID:{
ClientBlockTree tree = ClientBlockTree.getClientBlockTree(entity); ClientBlockTree tree = ClientBlockTree.getClientBlockTree(entity);
tree.setState(ClientBlockTree.getBlockStateShortAsEnum((short)message.getbTreeValue())); tree.setState(ClientBlockTree.getBlockStateShortAsEnum((short)message.getbTreeValue()));
} break; } break;
case 9:{ case FieldIdEnums.TREE_SERVERBLOCKTREE_SYNCEDFIELD_CURRENTBLOCKVARIANT_ID:{
ClientBlockTree tree = ClientBlockTree.getClientBlockTree(entity); ClientBlockTree tree = ClientBlockTree.getClientBlockTree(entity);
tree.setCurrentBlockVariant(message.getstringValue()); tree.setCurrentBlockVariant(message.getstringValue());
} break; } break;
@ -132,7 +133,7 @@ public class ClientSynchronizationManager {
} break; } break;
case BehaviorTreeIdEnums.BTREE_SERVERGRAVITY_ID: { case BehaviorTreeIdEnums.BTREE_SERVERGRAVITY_ID: {
switch(message.getfieldId()){ switch(message.getfieldId()){
case 11:{ case FieldIdEnums.TREE_SERVERGRAVITY_SYNCEDFIELD_STATE_ID:{
ClientGravityTree tree = ClientGravityTree.getClientGravityTree(entity); ClientGravityTree tree = ClientGravityTree.getClientGravityTree(entity);
tree.setState(ClientGravityTree.getGravityTreeStateShortAsEnum((short)message.getbTreeValue())); tree.setState(ClientGravityTree.getGravityTreeStateShortAsEnum((short)message.getbTreeValue()));
} break; } break;
@ -140,7 +141,7 @@ public class ClientSynchronizationManager {
} break; } break;
case BehaviorTreeIdEnums.BTREE_SERVERIDLE_ID: { case BehaviorTreeIdEnums.BTREE_SERVERIDLE_ID: {
switch(message.getfieldId()){ switch(message.getfieldId()){
case 13:{ case FieldIdEnums.TREE_SERVERIDLE_SYNCEDFIELD_STATE_ID:{
ClientIdleTree tree = ClientIdleTree.getClientIdleTree(entity); ClientIdleTree tree = ClientIdleTree.getClientIdleTree(entity);
tree.setState(ClientIdleTree.getIdleTreeStateShortAsEnum((short)message.getbTreeValue())); tree.setState(ClientIdleTree.getIdleTreeStateShortAsEnum((short)message.getbTreeValue()));
} break; } break;
@ -148,7 +149,7 @@ public class ClientSynchronizationManager {
} break; } break;
case BehaviorTreeIdEnums.BTREE_SERVERGROUNDMOVEMENTTREE_ID: { case BehaviorTreeIdEnums.BTREE_SERVERGROUNDMOVEMENTTREE_ID: {
switch(message.getfieldId()){ switch(message.getfieldId()){
case 15:{ case FieldIdEnums.TREE_SERVERGROUNDMOVEMENTTREE_SYNCEDFIELD_FACING_ID:{
ClientGroundMovementTree tree = ClientGroundMovementTree.getClientGroundMovementTree(entity); ClientGroundMovementTree tree = ClientGroundMovementTree.getClientGroundMovementTree(entity);
tree.setFacing(ClientGroundMovementTree.getMovementRelativeFacingShortAsEnum((short)message.getbTreeValue())); tree.setFacing(ClientGroundMovementTree.getMovementRelativeFacingShortAsEnum((short)message.getbTreeValue()));
} break; } break;

25
src/main/java/electrosphere/net/synchronization/FieldIdEnums.java Normal file
View File

@ -0,0 +1,25 @@
package electrosphere.net.synchronization;
/**
* List of enums of all fields and their associated ids.
*/
public class FieldIdEnums {
public static final int TREE_CLIENTATTACKTREE_SYNCEDFIELD_STATE_ID = 0;
public static final int TREE_CLIENTATTACKTREE_SYNCEDFIELD_DRIFTSTATE_ID = 1;
public static final int TREE_CLIENTATTACKTREE_SYNCEDFIELD_CURRENTMOVEID_ID = 2;
public static final int TREE_SERVERATTACKTREE_SYNCEDFIELD_STATE_ID = 3;
public static final int TREE_SERVERATTACKTREE_SYNCEDFIELD_DRIFTSTATE_ID = 4;
public static final int TREE_SERVERATTACKTREE_SYNCEDFIELD_CURRENTMOVEID_ID = 5;
public static final int TREE_CLIENTBLOCKTREE_SYNCEDFIELD_STATE_ID = 6;
public static final int TREE_CLIENTBLOCKTREE_SYNCEDFIELD_CURRENTBLOCKVARIANT_ID = 7;
public static final int TREE_SERVERBLOCKTREE_SYNCEDFIELD_STATE_ID = 8;
public static final int TREE_SERVERBLOCKTREE_SYNCEDFIELD_CURRENTBLOCKVARIANT_ID = 9;
public static final int TREE_GRAVITY_SYNCEDFIELD_STATE_ID = 10;
public static final int TREE_SERVERGRAVITY_SYNCEDFIELD_STATE_ID = 11;
public static final int TREE_IDLE_SYNCEDFIELD_STATE_ID = 12;
public static final int TREE_SERVERIDLE_SYNCEDFIELD_STATE_ID = 13;
public static final int TREE_CLIENTGROUNDMOVEMENTTREE_SYNCEDFIELD_FACING_ID = 14;
public static final int TREE_SERVERGROUNDMOVEMENTTREE_SYNCEDFIELD_FACING_ID = 15;
}