mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-13 17:27:35 +07:00
Code Issues Packages Projects Releases Wiki Activity

Removed redundant revision code

Browse Source
This commit is contained in:
Anuken
2020-09-22 21:42:49 -04:00
parent 7a6f69fc88
commit 36fc6959f4
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
annotations/src/main/java/mindustry/annotations/entity/EntityIO.java
View File

@ -38,6 +38,8 @@ public class EntityIO{
this.serializer = serializer; this.serializer = serializer;
this.name = name; this.name = name;
json.setIgnoreUnknownFields(true);
directory.mkdirs(); directory.mkdirs();
//load old revisions //load old revisions
@ -66,8 +68,7 @@ public class EntityIO{
//add new revision if it doesn't match or there are no revisions //add new revision if it doesn't match or there are no revisions
if(revisions.isEmpty() || !revisions.peek().equal(fields)){ if(revisions.isEmpty() || !revisions.peek().equal(fields)){
revisions.add(new Revision(nextRevision, revisions.add(new Revision(nextRevision,
fields.map(f -> new RevisionField(f.name, f.type.toString(), fields.map(f -> new RevisionField(f.name, f.type.toString()))));
f.type.isPrimitive() ? BaseProcessor.typeSize(f.type.toString()) : -1))));
Log.warn("Adding new revision @ for @.\nPrevious = @\nNew = @\n", nextRevision, name, previous == null ? null : previous.fields.toString(", ", f -> f.name), fields.toString(", ", f -> f.name)); Log.warn("Adding new revision @ for @.\nPrevious = @\nNew = @\n", nextRevision, name, previous == null ? null : previous.fields.toString(", ", f -> f.name), fields.toString(", ", f -> f.name));
//write revision //write revision
directory.child(nextRevision + ".json").writeString(json.toJson(revisions.peek())); directory.child(nextRevision + ".json").writeString(json.toJson(revisions.peek()));
@ -325,8 +326,7 @@ public class EntityIO{
for(int i = 0; i < fields.size; i++){ for(int i = 0; i < fields.size; i++){
RevisionField field = fields.get(i); RevisionField field = fields.get(i);
FieldSpec spec = specs.get(i); FieldSpec spec = specs.get(i);
//TODO when making fields, their primitive size may be overwritten by an annotation; check for that if(!field.type.equals(spec.type.toString())){
if(!(field.type.equals(spec.type.toString()) && (!spec.type.isPrimitive() || BaseProcessor.typeSize(spec.type.toString()) == field.size))){
return false; return false;
} }
} }
@ -336,11 +336,9 @@ public class EntityIO{
public static class RevisionField{ public static class RevisionField{
String name, type; String name, type;
int size; //in bytes
RevisionField(String name, String type, int size){ RevisionField(String name, String type){
this.name = name; this.name = name;
this.size = size;
this.type = type; this.type = type;
} }