missing deps, parsing bugfix, tree nullcheck
All checks were successful
studiorailgun/highlevel-netcode-gen/pipeline/head This commit looks good
All checks were successful
studiorailgun/highlevel-netcode-gen/pipeline/head This commit looks good
This commit is contained in:
parent
c719513510
commit
a68e8fc087
@ -59,8 +59,10 @@ public class UpdateEntityState implements VirtualMethod {
|
|||||||
updateCases = updateCases + " case FieldIdEnums." + fieldIdVariable + ":{\n";
|
updateCases = updateCases + " case FieldIdEnums." + fieldIdVariable + ":{\n";
|
||||||
updateCases = updateCases + " " + treeName + " tree = " + treeName + ".get" + treeName + "(entity);\n";
|
updateCases = updateCases + " " + treeName + " tree = " + treeName + ".get" + treeName + "(entity);\n";
|
||||||
updateCases = updateCases + " " + field.getTypeName() + " result = Utilities.deserialize(message.getstringValue(), " + field.getTypeName() + ".class);\n";
|
updateCases = updateCases + " " + field.getTypeName() + " result = Utilities.deserialize(message.getstringValue(), " + field.getTypeName() + ".class);\n";
|
||||||
updateCases = updateCases + " tree." + field.getPusherName() + "(tree." + field.getGetterName() + "(),result);\n";
|
updateCases = updateCases + " if(tree != null){\n";
|
||||||
updateCases = updateCases + " tree." + field.getSetterName() + "(result);\n";
|
updateCases = updateCases + " tree." + field.getPusherName() + "(tree." + field.getGetterName() + "(),result);\n";
|
||||||
|
updateCases = updateCases + " tree." + field.getSetterName() + "(result);\n";
|
||||||
|
updateCases = updateCases + " }\n";
|
||||||
updateCases = updateCases + " } break;\n";
|
updateCases = updateCases + " } break;\n";
|
||||||
return updateCases;
|
return updateCases;
|
||||||
}
|
}
|
||||||
@ -78,31 +80,41 @@ public class UpdateEntityState implements VirtualMethod {
|
|||||||
case "int": {
|
case "int": {
|
||||||
updateCases = updateCases + " case FieldIdEnums." + fieldIdVariable + ":{\n";
|
updateCases = updateCases + " case FieldIdEnums." + fieldIdVariable + ":{\n";
|
||||||
updateCases = updateCases + " " + treeName + " tree = " + treeName + ".get" + treeName + "(entity);\n";
|
updateCases = updateCases + " " + treeName + " tree = " + treeName + ".get" + treeName + "(entity);\n";
|
||||||
updateCases = updateCases + " tree." + field.getSetterName() + "(message.getintValue());\n";
|
updateCases = updateCases + " if(tree != null){\n";
|
||||||
|
updateCases = updateCases + " tree." + field.getSetterName() + "(message.getintValue());\n";
|
||||||
|
updateCases = updateCases + " }\n";
|
||||||
updateCases = updateCases + " } break;\n";
|
updateCases = updateCases + " } break;\n";
|
||||||
} break;
|
} break;
|
||||||
case "long": {
|
case "long": {
|
||||||
updateCases = updateCases + " case FieldIdEnums." + fieldIdVariable + ":{\n";
|
updateCases = updateCases + " case FieldIdEnums." + fieldIdVariable + ":{\n";
|
||||||
updateCases = updateCases + " " + treeName + " tree = " + treeName + ".get" + treeName + "(entity);\n";
|
updateCases = updateCases + " " + treeName + " tree = " + treeName + ".get" + treeName + "(entity);\n";
|
||||||
updateCases = updateCases + " tree." + field.getSetterName() + "(message.getlongValue());\n";
|
updateCases = updateCases + " if(tree != null){\n";
|
||||||
|
updateCases = updateCases + " tree." + field.getSetterName() + "(message.getlongValue());\n";
|
||||||
|
updateCases = updateCases + " }\n";
|
||||||
updateCases = updateCases + " } break;\n";
|
updateCases = updateCases + " } break;\n";
|
||||||
} break;
|
} break;
|
||||||
case "float": {
|
case "float": {
|
||||||
updateCases = updateCases + " case FieldIdEnums." + fieldIdVariable + ":{\n";
|
updateCases = updateCases + " case FieldIdEnums." + fieldIdVariable + ":{\n";
|
||||||
updateCases = updateCases + " " + treeName + " tree = " + treeName + ".get" + treeName + "(entity);\n";
|
updateCases = updateCases + " " + treeName + " tree = " + treeName + ".get" + treeName + "(entity);\n";
|
||||||
updateCases = updateCases + " tree." + field.getSetterName() + "(message.getfloatValue());\n";
|
updateCases = updateCases + " if(tree != null){\n";
|
||||||
|
updateCases = updateCases + " tree." + field.getSetterName() + "(message.getfloatValue());\n";
|
||||||
|
updateCases = updateCases + " }\n";
|
||||||
updateCases = updateCases + " } break;\n";
|
updateCases = updateCases + " } break;\n";
|
||||||
} break;
|
} break;
|
||||||
case "double": {
|
case "double": {
|
||||||
updateCases = updateCases + " case FieldIdEnums." + fieldIdVariable + ":{\n";
|
updateCases = updateCases + " case FieldIdEnums." + fieldIdVariable + ":{\n";
|
||||||
updateCases = updateCases + " " + treeName + " tree = " + treeName + ".get" + treeName + "(entity);\n";
|
updateCases = updateCases + " " + treeName + " tree = " + treeName + ".get" + treeName + "(entity);\n";
|
||||||
updateCases = updateCases + " tree." + field.getSetterName() + "(message.getdoubleValue());\n";
|
updateCases = updateCases + " if(tree != null){\n";
|
||||||
|
updateCases = updateCases + " tree." + field.getSetterName() + "(message.getdoubleValue());\n";
|
||||||
|
updateCases = updateCases + " }\n";
|
||||||
updateCases = updateCases + " } break;\n";
|
updateCases = updateCases + " } break;\n";
|
||||||
} break;
|
} break;
|
||||||
case "String": {
|
case "String": {
|
||||||
updateCases = updateCases + " case FieldIdEnums." + fieldIdVariable + ":{\n";
|
updateCases = updateCases + " case FieldIdEnums." + fieldIdVariable + ":{\n";
|
||||||
updateCases = updateCases + " " + treeName + " tree = " + treeName + ".get" + treeName + "(entity);\n";
|
updateCases = updateCases + " " + treeName + " tree = " + treeName + ".get" + treeName + "(entity);\n";
|
||||||
updateCases = updateCases + " tree." + field.getSetterName() + "(message.getstringValue());\n";
|
updateCases = updateCases + " if(tree != null){\n";
|
||||||
|
updateCases = updateCases + " tree." + field.getSetterName() + "(message.getstringValue());\n";
|
||||||
|
updateCases = updateCases + " }\n";
|
||||||
updateCases = updateCases + " } break;\n";
|
updateCases = updateCases + " } break;\n";
|
||||||
} break;
|
} break;
|
||||||
default: {
|
default: {
|
||||||
@ -110,7 +122,9 @@ public class UpdateEntityState implements VirtualMethod {
|
|||||||
String typeClass = type.getTargetFile().getSource().getName();
|
String typeClass = type.getTargetFile().getSource().getName();
|
||||||
updateCases = updateCases + " case FieldIdEnums." + fieldIdVariable + ":{\n";
|
updateCases = updateCases + " case FieldIdEnums." + fieldIdVariable + ":{\n";
|
||||||
updateCases = updateCases + " " + treeName + " tree = " + treeName + ".get" + treeName + "(entity);\n";
|
updateCases = updateCases + " " + treeName + " tree = " + treeName + ".get" + treeName + "(entity);\n";
|
||||||
updateCases = updateCases + " tree." + field.getSetterName() + "(" + typeClass + "." + type.getFromShortConversionMethodName() + "((short)message.getbTreeValue()));\n";
|
updateCases = updateCases + " if(tree != null){\n";
|
||||||
|
updateCases = updateCases + " tree." + field.getSetterName() + "(" + typeClass + "." + type.getFromShortConversionMethodName() + "((short)message.getbTreeValue()));\n";
|
||||||
|
updateCases = updateCases + " }\n";
|
||||||
updateCases = updateCases + " } break;\n";
|
updateCases = updateCases + " } break;\n";
|
||||||
} break;
|
} break;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -45,6 +45,7 @@ public class ClientAttach implements VirtualMethod {
|
|||||||
public List<String> getImports(ProjectStructure projectStructure) {
|
public List<String> getImports(ProjectStructure projectStructure) {
|
||||||
List<String> rVal = Arrays.asList(new String[]{
|
List<String> rVal = Arrays.asList(new String[]{
|
||||||
"electrosphere.net.synchronization.enums.BehaviorTreeIdEnums",
|
"electrosphere.net.synchronization.enums.BehaviorTreeIdEnums",
|
||||||
|
"electrosphere.entity.Entity",
|
||||||
});
|
});
|
||||||
return rVal;
|
return rVal;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -46,6 +46,7 @@ public class ServerAttach implements VirtualMethod {
|
|||||||
List<String> rVal = Arrays.asList(new String[]{
|
List<String> rVal = Arrays.asList(new String[]{
|
||||||
"electrosphere.server.datacell.utils.ServerBehaviorTreeUtils",
|
"electrosphere.server.datacell.utils.ServerBehaviorTreeUtils",
|
||||||
"electrosphere.net.synchronization.enums.BehaviorTreeIdEnums",
|
"electrosphere.net.synchronization.enums.BehaviorTreeIdEnums",
|
||||||
|
"electrosphere.entity.Entity",
|
||||||
});
|
});
|
||||||
return rVal;
|
return rVal;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -93,7 +93,7 @@ public class Utilities {
|
|||||||
int characterToInsertAt = characterPosition;
|
int characterToInsertAt = characterPosition;
|
||||||
//now move backwards to find the previous line with content on it
|
//now move backwards to find the previous line with content on it
|
||||||
characterPosition = characterPosition - 1;
|
characterPosition = characterPosition - 1;
|
||||||
while(true){
|
while(true && characterPosition > 0){
|
||||||
if(source.charAt(characterPosition)=='\n' && source.charAt(characterPosition + 1)!='\n'){
|
if(source.charAt(characterPosition)=='\n' && source.charAt(characterPosition + 1)!='\n'){
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user