From 903b62be985ad48aa3dcc4ede797658b033f4407 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 7 Oct 2020 17:21:48 -0400 Subject: [PATCH] IO fixes --- .../annotations/entity/EntityProcess.java | 5 ++-- .../src/main/resources/classids.properties | 26 +++++++++---------- .../AmmoDistributeBuilderPayloadUnit/0.json | 1 - .../BuilderCommanderPayloadUnit/0.json | 1 - .../revisions/BuilderMechMinerUnit/0.json | 1 - .../revisions/BuilderMechUnit/0.json | 1 - .../revisions/BuilderMinerUnit/0.json | 1 - .../{Building => BuildingComp}/0.json | 0 .../revisions/{Bullet => BulletComp}/0.json | 0 .../revisions/{Decal => DecalComp}/0.json | 0 .../{EffectState => EffectStateComp}/0.json | 0 .../{EffectState => EffectStateComp}/1.json | 0 .../{EffectState => EffectStateComp}/2.json | 0 .../{EffectState => EffectStateComp}/3.json | 0 .../{EffectState => EffectStateComp}/4.json | 0 .../{EffectState => EffectStateComp}/5.json | 0 .../revisions/{Fire => FireComp}/0.json | 0 .../revisions/{Fire => FireComp}/1.json | 0 .../{ForceDraw => ForceDrawComp}/0.json | 0 .../{LaunchCore => LaunchCoreComp}/0.json | 0 .../0.json | 0 .../main/resources/revisions/MechUnit/0.json | 1 - .../main/resources/revisions/MechUnit/1.json | 1 - .../main/resources/revisions/MechUnit/2.json | 1 - .../revisions/{Player => PlayerComp}/0.json | 0 .../revisions/{PosTeam => PosTeamDef}/0.json | 0 .../revisions/{Puddle => PuddleComp}/0.json | 0 .../resources/revisions/UnitEntity/0.json | 1 - .../resources/revisions/UnitEntity/1.json | 1 - .../resources/revisions/UnitEntity/2.json | 1 - .../resources/revisions/UnitWaterMove/0.json | 1 - .../{WeatherState => WeatherStateComp}/0.json | 0 .../{WeatherState => WeatherStateComp}/1.json | 0 .../{WeatherState => WeatherStateComp}/2.json | 0 .../revisions/{BlockUnitUnit => block}/0.json | 0 .../revisions/{BlockUnitUnit => block}/1.json | 0 .../revisions/{BlockUnitUnit => block}/2.json | 0 .../{CommanderLegsUnit => corvus}/0.json | 0 .../{CommanderLegsUnit => corvus}/1.json | 0 .../{CommanderLegsUnit => corvus}/2.json | 0 .../{CommanderUnitWaterMove => flare}/0.json | 0 .../{CommanderUnitWaterMove => flare}/1.json | 0 .../{CommanderUnitWaterMove => flare}/2.json | 0 .../{CommanderMechUnit => mace}/0.json | 0 .../{CommanderMechUnit => mace}/1.json | 0 .../{CommanderMechUnit => mace}/2.json | 0 .../{BuilderMinerPayloadUnit => mega}/0.json | 0 .../{BuilderMinerPayloadUnit => mega}/1.json | 0 .../{BuilderMinerPayloadUnit => mega}/2.json | 0 .../revisions/{MinerUnit => mono}/0.json | 0 .../revisions/{MinerUnit => mono}/1.json | 0 .../revisions/{MinerUnit => mono}/2.json | 0 .../0.json | 0 .../1.json | 0 .../2.json | 0 .../0.json | 0 .../1.json | 0 .../{BuilderMinerTrailUnit => poly}/0.json | 0 .../{BuilderMinerUnit => poly}/1.json | 0 .../{BuilderMinerUnit => poly}/2.json | 0 .../{BuilderPayloadUnit => quad}/0.json | 0 .../{BuilderPayloadUnit => quad}/1.json | 0 .../{BuilderPayloadUnit => quad}/2.json | 0 .../revisions/{LegsUnit => risso}/0.json | 0 .../revisions/{LegsUnit => risso}/1.json | 0 .../revisions/{LegsUnit => risso}/2.json | 0 .../{BuilderLegsUnit => spiroct}/0.json | 0 .../{BuilderLegsUnit => spiroct}/1.json | 0 .../{BuilderLegsUnit => spiroct}/2.json | 0 69 files changed, 16 insertions(+), 27 deletions(-) delete mode 100644 annotations/src/main/resources/revisions/AmmoDistributeBuilderPayloadUnit/0.json delete mode 100644 annotations/src/main/resources/revisions/BuilderCommanderPayloadUnit/0.json delete mode 100644 annotations/src/main/resources/revisions/BuilderMechMinerUnit/0.json delete mode 100644 annotations/src/main/resources/revisions/BuilderMechUnit/0.json delete mode 100644 annotations/src/main/resources/revisions/BuilderMinerUnit/0.json rename annotations/src/main/resources/revisions/{Building => BuildingComp}/0.json (100%) rename annotations/src/main/resources/revisions/{Bullet => BulletComp}/0.json (100%) rename annotations/src/main/resources/revisions/{Decal => DecalComp}/0.json (100%) rename annotations/src/main/resources/revisions/{EffectState => EffectStateComp}/0.json (100%) rename annotations/src/main/resources/revisions/{EffectState => EffectStateComp}/1.json (100%) rename annotations/src/main/resources/revisions/{EffectState => EffectStateComp}/2.json (100%) rename annotations/src/main/resources/revisions/{EffectState => EffectStateComp}/3.json (100%) rename annotations/src/main/resources/revisions/{EffectState => EffectStateComp}/4.json (100%) rename annotations/src/main/resources/revisions/{EffectState => EffectStateComp}/5.json (100%) rename annotations/src/main/resources/revisions/{Fire => FireComp}/0.json (100%) rename annotations/src/main/resources/revisions/{Fire => FireComp}/1.json (100%) rename annotations/src/main/resources/revisions/{ForceDraw => ForceDrawComp}/0.json (100%) rename annotations/src/main/resources/revisions/{LaunchCore => LaunchCoreComp}/0.json (100%) rename annotations/src/main/resources/revisions/{LaunchPayload => LaunchPayloadComp}/0.json (100%) delete mode 100644 annotations/src/main/resources/revisions/MechUnit/0.json delete mode 100644 annotations/src/main/resources/revisions/MechUnit/1.json delete mode 100644 annotations/src/main/resources/revisions/MechUnit/2.json rename annotations/src/main/resources/revisions/{Player => PlayerComp}/0.json (100%) rename annotations/src/main/resources/revisions/{PosTeam => PosTeamDef}/0.json (100%) rename annotations/src/main/resources/revisions/{Puddle => PuddleComp}/0.json (100%) delete mode 100644 annotations/src/main/resources/revisions/UnitEntity/0.json delete mode 100644 annotations/src/main/resources/revisions/UnitEntity/1.json delete mode 100644 annotations/src/main/resources/revisions/UnitEntity/2.json delete mode 100644 annotations/src/main/resources/revisions/UnitWaterMove/0.json rename annotations/src/main/resources/revisions/{WeatherState => WeatherStateComp}/0.json (100%) rename annotations/src/main/resources/revisions/{WeatherState => WeatherStateComp}/1.json (100%) rename annotations/src/main/resources/revisions/{WeatherState => WeatherStateComp}/2.json (100%) rename annotations/src/main/resources/revisions/{BlockUnitUnit => block}/0.json (100%) rename annotations/src/main/resources/revisions/{BlockUnitUnit => block}/1.json (100%) rename annotations/src/main/resources/revisions/{BlockUnitUnit => block}/2.json (100%) rename annotations/src/main/resources/revisions/{CommanderLegsUnit => corvus}/0.json (100%) rename annotations/src/main/resources/revisions/{CommanderLegsUnit => corvus}/1.json (100%) rename annotations/src/main/resources/revisions/{CommanderLegsUnit => corvus}/2.json (100%) rename annotations/src/main/resources/revisions/{CommanderUnitWaterMove => flare}/0.json (100%) rename annotations/src/main/resources/revisions/{CommanderUnitWaterMove => flare}/1.json (100%) rename annotations/src/main/resources/revisions/{CommanderUnitWaterMove => flare}/2.json (100%) rename annotations/src/main/resources/revisions/{CommanderMechUnit => mace}/0.json (100%) rename annotations/src/main/resources/revisions/{CommanderMechUnit => mace}/1.json (100%) rename annotations/src/main/resources/revisions/{CommanderMechUnit => mace}/2.json (100%) rename annotations/src/main/resources/revisions/{BuilderMinerPayloadUnit => mega}/0.json (100%) rename annotations/src/main/resources/revisions/{BuilderMinerPayloadUnit => mega}/1.json (100%) rename annotations/src/main/resources/revisions/{BuilderMinerPayloadUnit => mega}/2.json (100%) rename annotations/src/main/resources/revisions/{MinerUnit => mono}/0.json (100%) rename annotations/src/main/resources/revisions/{MinerUnit => mono}/1.json (100%) rename annotations/src/main/resources/revisions/{MinerUnit => mono}/2.json (100%) rename annotations/src/main/resources/revisions/{BuilderCommanderMechMinerUnit => nova}/0.json (100%) rename annotations/src/main/resources/revisions/{BuilderCommanderMechMinerUnit => nova}/1.json (100%) rename annotations/src/main/resources/revisions/{BuilderCommanderMechMinerUnit => nova}/2.json (100%) rename annotations/src/main/resources/revisions/{AmmoDistributeBuilderCommanderPayloadUnit => oct}/0.json (100%) rename annotations/src/main/resources/revisions/{AmmoDistributeBuilderCommanderPayloadUnit => oct}/1.json (100%) rename annotations/src/main/resources/revisions/{BuilderMinerTrailUnit => poly}/0.json (100%) rename annotations/src/main/resources/revisions/{BuilderMinerUnit => poly}/1.json (100%) rename annotations/src/main/resources/revisions/{BuilderMinerUnit => poly}/2.json (100%) rename annotations/src/main/resources/revisions/{BuilderPayloadUnit => quad}/0.json (100%) rename annotations/src/main/resources/revisions/{BuilderPayloadUnit => quad}/1.json (100%) rename annotations/src/main/resources/revisions/{BuilderPayloadUnit => quad}/2.json (100%) rename annotations/src/main/resources/revisions/{LegsUnit => risso}/0.json (100%) rename annotations/src/main/resources/revisions/{LegsUnit => risso}/1.json (100%) rename annotations/src/main/resources/revisions/{LegsUnit => risso}/2.json (100%) rename annotations/src/main/resources/revisions/{BuilderLegsUnit => spiroct}/0.json (100%) rename annotations/src/main/resources/revisions/{BuilderLegsUnit => spiroct}/1.json (100%) rename annotations/src/main/resources/revisions/{BuilderLegsUnit => spiroct}/2.json (100%) diff --git a/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java b/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java index 93e6465639..5fcd21490d 100644 --- a/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java +++ b/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java @@ -378,7 +378,8 @@ public class EntityProcess extends BaseProcessor{ .addModifiers(Modifier.PUBLIC) .addStatement("return $S + $L", name + "#", "id").build()); - EntityIO io = new EntityIO(type.name(), builder, allFieldSpecs, serializer, rootDirectory.child("annotations/src/main/resources/revisions").child(name)); + Log.info("mv @ @", name, type.name()); + EntityIO io = new EntityIO(type.name(), builder, allFieldSpecs, serializer, rootDirectory.child("annotations/src/main/resources/revisions").child(type.name())); //entities with no sync comp and no serialization gen no code boolean hasIO = ann.genio() && (components.contains(s -> s.name().contains("Sync")) || ann.serialize()); @@ -643,7 +644,7 @@ public class EntityProcess extends BaseProcessor{ //assign IDs definitions.sort(Structs.comparing(t -> t.naming.toString())); for(EntityDefinition def : definitions){ - String name = def.name; + String name = def.naming.fullName(); if(map.containsKey(name)){ def.classID = map.getInt(name); }else{ diff --git a/annotations/src/main/resources/classids.properties b/annotations/src/main/resources/classids.properties index ff34009dc1..43a3517ff0 100644 --- a/annotations/src/main/resources/classids.properties +++ b/annotations/src/main/resources/classids.properties @@ -2,11 +2,11 @@ alpha=0 atrax=1 -mindustry.gen.BlockUnitUnit=2 -mindustry.gen.LegsUnit=24 -mindustry.gen.UnitEntity=3 -mindustry.gen.MechUnit=4 -mindustry.gen.BuilderMinerPayloadUnit=5 +block=2 +corvus=24 +flare=3 +mace=4 +mega=5 mindustry.entities.comp.BuildingComp=6 mindustry.entities.comp.BulletComp=7 mindustry.entities.comp.DecalComp=8 @@ -20,12 +20,12 @@ mindustry.entities.comp.PuddleComp=13 mindustry.type.Weather.WeatherStateComp=14 mindustry.world.blocks.campaign.LaunchPad.LaunchPayloadComp=15 mindustry.world.blocks.defense.ForceProjector.ForceDrawComp=22 -mindustry.gen.MinerUnit=16 -mindustry.gen.BuilderMechMinerUnit=17 -mindustry.gen.AmmoDistributeBuilderPayloadUnit=26 -mindustry.gen.BuilderMinerUnit=18 +mono=16 +nova=17 +oct=26 +poly=18 pulsar=19 -mindustry.gen.BuilderPayloadUnit=23 -mindustry.gen.UnitWaterMove=20 -mindustry.gen.BuilderLegsUnit=21 -vela=25 +quad=23 +risso=20 +spiroct=21 +vela=25 \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/AmmoDistributeBuilderPayloadUnit/0.json b/annotations/src/main/resources/revisions/AmmoDistributeBuilderPayloadUnit/0.json deleted file mode 100644 index 391c6ca535..0000000000 --- a/annotations/src/main/resources/revisions/AmmoDistributeBuilderPayloadUnit/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq},{name:plans,type:arc.struct.Queue},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/BuilderCommanderPayloadUnit/0.json b/annotations/src/main/resources/revisions/BuilderCommanderPayloadUnit/0.json deleted file mode 100644 index 826bd02faf..0000000000 --- a/annotations/src/main/resources/revisions/BuilderCommanderPayloadUnit/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:health,type:float},{name:isShooting,type:boolean},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq},{name:plans,type:arc.struct.Queue},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/BuilderMechMinerUnit/0.json b/annotations/src/main/resources/revisions/BuilderMechMinerUnit/0.json deleted file mode 100644 index b2a9e3161a..0000000000 --- a/annotations/src/main/resources/revisions/BuilderMechMinerUnit/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:ammo,type:float},{name:armor,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/BuilderMechUnit/0.json b/annotations/src/main/resources/revisions/BuilderMechUnit/0.json deleted file mode 100644 index 0588266557..0000000000 --- a/annotations/src/main/resources/revisions/BuilderMechUnit/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:baseRotation,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/BuilderMinerUnit/0.json b/annotations/src/main/resources/revisions/BuilderMinerUnit/0.json deleted file mode 100644 index a4e818fd35..0000000000 --- a/annotations/src/main/resources/revisions/BuilderMinerUnit/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/Building/0.json b/annotations/src/main/resources/revisions/BuildingComp/0.json similarity index 100% rename from annotations/src/main/resources/revisions/Building/0.json rename to annotations/src/main/resources/revisions/BuildingComp/0.json diff --git a/annotations/src/main/resources/revisions/Bullet/0.json b/annotations/src/main/resources/revisions/BulletComp/0.json similarity index 100% rename from annotations/src/main/resources/revisions/Bullet/0.json rename to annotations/src/main/resources/revisions/BulletComp/0.json diff --git a/annotations/src/main/resources/revisions/Decal/0.json b/annotations/src/main/resources/revisions/DecalComp/0.json similarity index 100% rename from annotations/src/main/resources/revisions/Decal/0.json rename to annotations/src/main/resources/revisions/DecalComp/0.json diff --git a/annotations/src/main/resources/revisions/EffectState/0.json b/annotations/src/main/resources/revisions/EffectStateComp/0.json similarity index 100% rename from annotations/src/main/resources/revisions/EffectState/0.json rename to annotations/src/main/resources/revisions/EffectStateComp/0.json diff --git a/annotations/src/main/resources/revisions/EffectState/1.json b/annotations/src/main/resources/revisions/EffectStateComp/1.json similarity index 100% rename from annotations/src/main/resources/revisions/EffectState/1.json rename to annotations/src/main/resources/revisions/EffectStateComp/1.json diff --git a/annotations/src/main/resources/revisions/EffectState/2.json b/annotations/src/main/resources/revisions/EffectStateComp/2.json similarity index 100% rename from annotations/src/main/resources/revisions/EffectState/2.json rename to annotations/src/main/resources/revisions/EffectStateComp/2.json diff --git a/annotations/src/main/resources/revisions/EffectState/3.json b/annotations/src/main/resources/revisions/EffectStateComp/3.json similarity index 100% rename from annotations/src/main/resources/revisions/EffectState/3.json rename to annotations/src/main/resources/revisions/EffectStateComp/3.json diff --git a/annotations/src/main/resources/revisions/EffectState/4.json b/annotations/src/main/resources/revisions/EffectStateComp/4.json similarity index 100% rename from annotations/src/main/resources/revisions/EffectState/4.json rename to annotations/src/main/resources/revisions/EffectStateComp/4.json diff --git a/annotations/src/main/resources/revisions/EffectState/5.json b/annotations/src/main/resources/revisions/EffectStateComp/5.json similarity index 100% rename from annotations/src/main/resources/revisions/EffectState/5.json rename to annotations/src/main/resources/revisions/EffectStateComp/5.json diff --git a/annotations/src/main/resources/revisions/Fire/0.json b/annotations/src/main/resources/revisions/FireComp/0.json similarity index 100% rename from annotations/src/main/resources/revisions/Fire/0.json rename to annotations/src/main/resources/revisions/FireComp/0.json diff --git a/annotations/src/main/resources/revisions/Fire/1.json b/annotations/src/main/resources/revisions/FireComp/1.json similarity index 100% rename from annotations/src/main/resources/revisions/Fire/1.json rename to annotations/src/main/resources/revisions/FireComp/1.json diff --git a/annotations/src/main/resources/revisions/ForceDraw/0.json b/annotations/src/main/resources/revisions/ForceDrawComp/0.json similarity index 100% rename from annotations/src/main/resources/revisions/ForceDraw/0.json rename to annotations/src/main/resources/revisions/ForceDrawComp/0.json diff --git a/annotations/src/main/resources/revisions/LaunchCore/0.json b/annotations/src/main/resources/revisions/LaunchCoreComp/0.json similarity index 100% rename from annotations/src/main/resources/revisions/LaunchCore/0.json rename to annotations/src/main/resources/revisions/LaunchCoreComp/0.json diff --git a/annotations/src/main/resources/revisions/LaunchPayload/0.json b/annotations/src/main/resources/revisions/LaunchPayloadComp/0.json similarity index 100% rename from annotations/src/main/resources/revisions/LaunchPayload/0.json rename to annotations/src/main/resources/revisions/LaunchPayloadComp/0.json diff --git a/annotations/src/main/resources/revisions/MechUnit/0.json b/annotations/src/main/resources/revisions/MechUnit/0.json deleted file mode 100644 index 1779e118de..0000000000 --- a/annotations/src/main/resources/revisions/MechUnit/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:baseRotation,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/MechUnit/1.json b/annotations/src/main/resources/revisions/MechUnit/1.json deleted file mode 100644 index 66897ee06f..0000000000 --- a/annotations/src/main/resources/revisions/MechUnit/1.json +++ /dev/null @@ -1 +0,0 @@ -{version:1,fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:baseRotation,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/MechUnit/2.json b/annotations/src/main/resources/revisions/MechUnit/2.json deleted file mode 100644 index 7b348dd022..0000000000 --- a/annotations/src/main/resources/revisions/MechUnit/2.json +++ /dev/null @@ -1 +0,0 @@ -{version:2,fields:[{name:ammo,type:float},{name:armor,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/Player/0.json b/annotations/src/main/resources/revisions/PlayerComp/0.json similarity index 100% rename from annotations/src/main/resources/revisions/Player/0.json rename to annotations/src/main/resources/revisions/PlayerComp/0.json diff --git a/annotations/src/main/resources/revisions/PosTeam/0.json b/annotations/src/main/resources/revisions/PosTeamDef/0.json similarity index 100% rename from annotations/src/main/resources/revisions/PosTeam/0.json rename to annotations/src/main/resources/revisions/PosTeamDef/0.json diff --git a/annotations/src/main/resources/revisions/Puddle/0.json b/annotations/src/main/resources/revisions/PuddleComp/0.json similarity index 100% rename from annotations/src/main/resources/revisions/Puddle/0.json rename to annotations/src/main/resources/revisions/PuddleComp/0.json diff --git a/annotations/src/main/resources/revisions/UnitEntity/0.json b/annotations/src/main/resources/revisions/UnitEntity/0.json deleted file mode 100644 index 5431957381..0000000000 --- a/annotations/src/main/resources/revisions/UnitEntity/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/UnitEntity/1.json b/annotations/src/main/resources/revisions/UnitEntity/1.json deleted file mode 100644 index dd8fdb2784..0000000000 --- a/annotations/src/main/resources/revisions/UnitEntity/1.json +++ /dev/null @@ -1 +0,0 @@ -{version:1,fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/UnitEntity/2.json b/annotations/src/main/resources/revisions/UnitEntity/2.json deleted file mode 100644 index b9ab081fe8..0000000000 --- a/annotations/src/main/resources/revisions/UnitEntity/2.json +++ /dev/null @@ -1 +0,0 @@ -{version:2,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/UnitWaterMove/0.json b/annotations/src/main/resources/revisions/UnitWaterMove/0.json deleted file mode 100644 index ddde244f79..0000000000 --- a/annotations/src/main/resources/revisions/UnitWaterMove/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/WeatherState/0.json b/annotations/src/main/resources/revisions/WeatherStateComp/0.json similarity index 100% rename from annotations/src/main/resources/revisions/WeatherState/0.json rename to annotations/src/main/resources/revisions/WeatherStateComp/0.json diff --git a/annotations/src/main/resources/revisions/WeatherState/1.json b/annotations/src/main/resources/revisions/WeatherStateComp/1.json similarity index 100% rename from annotations/src/main/resources/revisions/WeatherState/1.json rename to annotations/src/main/resources/revisions/WeatherStateComp/1.json diff --git a/annotations/src/main/resources/revisions/WeatherState/2.json b/annotations/src/main/resources/revisions/WeatherStateComp/2.json similarity index 100% rename from annotations/src/main/resources/revisions/WeatherState/2.json rename to annotations/src/main/resources/revisions/WeatherStateComp/2.json diff --git a/annotations/src/main/resources/revisions/BlockUnitUnit/0.json b/annotations/src/main/resources/revisions/block/0.json similarity index 100% rename from annotations/src/main/resources/revisions/BlockUnitUnit/0.json rename to annotations/src/main/resources/revisions/block/0.json diff --git a/annotations/src/main/resources/revisions/BlockUnitUnit/1.json b/annotations/src/main/resources/revisions/block/1.json similarity index 100% rename from annotations/src/main/resources/revisions/BlockUnitUnit/1.json rename to annotations/src/main/resources/revisions/block/1.json diff --git a/annotations/src/main/resources/revisions/BlockUnitUnit/2.json b/annotations/src/main/resources/revisions/block/2.json similarity index 100% rename from annotations/src/main/resources/revisions/BlockUnitUnit/2.json rename to annotations/src/main/resources/revisions/block/2.json diff --git a/annotations/src/main/resources/revisions/CommanderLegsUnit/0.json b/annotations/src/main/resources/revisions/corvus/0.json similarity index 100% rename from annotations/src/main/resources/revisions/CommanderLegsUnit/0.json rename to annotations/src/main/resources/revisions/corvus/0.json diff --git a/annotations/src/main/resources/revisions/CommanderLegsUnit/1.json b/annotations/src/main/resources/revisions/corvus/1.json similarity index 100% rename from annotations/src/main/resources/revisions/CommanderLegsUnit/1.json rename to annotations/src/main/resources/revisions/corvus/1.json diff --git a/annotations/src/main/resources/revisions/CommanderLegsUnit/2.json b/annotations/src/main/resources/revisions/corvus/2.json similarity index 100% rename from annotations/src/main/resources/revisions/CommanderLegsUnit/2.json rename to annotations/src/main/resources/revisions/corvus/2.json diff --git a/annotations/src/main/resources/revisions/CommanderUnitWaterMove/0.json b/annotations/src/main/resources/revisions/flare/0.json similarity index 100% rename from annotations/src/main/resources/revisions/CommanderUnitWaterMove/0.json rename to annotations/src/main/resources/revisions/flare/0.json diff --git a/annotations/src/main/resources/revisions/CommanderUnitWaterMove/1.json b/annotations/src/main/resources/revisions/flare/1.json similarity index 100% rename from annotations/src/main/resources/revisions/CommanderUnitWaterMove/1.json rename to annotations/src/main/resources/revisions/flare/1.json diff --git a/annotations/src/main/resources/revisions/CommanderUnitWaterMove/2.json b/annotations/src/main/resources/revisions/flare/2.json similarity index 100% rename from annotations/src/main/resources/revisions/CommanderUnitWaterMove/2.json rename to annotations/src/main/resources/revisions/flare/2.json diff --git a/annotations/src/main/resources/revisions/CommanderMechUnit/0.json b/annotations/src/main/resources/revisions/mace/0.json similarity index 100% rename from annotations/src/main/resources/revisions/CommanderMechUnit/0.json rename to annotations/src/main/resources/revisions/mace/0.json diff --git a/annotations/src/main/resources/revisions/CommanderMechUnit/1.json b/annotations/src/main/resources/revisions/mace/1.json similarity index 100% rename from annotations/src/main/resources/revisions/CommanderMechUnit/1.json rename to annotations/src/main/resources/revisions/mace/1.json diff --git a/annotations/src/main/resources/revisions/CommanderMechUnit/2.json b/annotations/src/main/resources/revisions/mace/2.json similarity index 100% rename from annotations/src/main/resources/revisions/CommanderMechUnit/2.json rename to annotations/src/main/resources/revisions/mace/2.json diff --git a/annotations/src/main/resources/revisions/BuilderMinerPayloadUnit/0.json b/annotations/src/main/resources/revisions/mega/0.json similarity index 100% rename from annotations/src/main/resources/revisions/BuilderMinerPayloadUnit/0.json rename to annotations/src/main/resources/revisions/mega/0.json diff --git a/annotations/src/main/resources/revisions/BuilderMinerPayloadUnit/1.json b/annotations/src/main/resources/revisions/mega/1.json similarity index 100% rename from annotations/src/main/resources/revisions/BuilderMinerPayloadUnit/1.json rename to annotations/src/main/resources/revisions/mega/1.json diff --git a/annotations/src/main/resources/revisions/BuilderMinerPayloadUnit/2.json b/annotations/src/main/resources/revisions/mega/2.json similarity index 100% rename from annotations/src/main/resources/revisions/BuilderMinerPayloadUnit/2.json rename to annotations/src/main/resources/revisions/mega/2.json diff --git a/annotations/src/main/resources/revisions/MinerUnit/0.json b/annotations/src/main/resources/revisions/mono/0.json similarity index 100% rename from annotations/src/main/resources/revisions/MinerUnit/0.json rename to annotations/src/main/resources/revisions/mono/0.json diff --git a/annotations/src/main/resources/revisions/MinerUnit/1.json b/annotations/src/main/resources/revisions/mono/1.json similarity index 100% rename from annotations/src/main/resources/revisions/MinerUnit/1.json rename to annotations/src/main/resources/revisions/mono/1.json diff --git a/annotations/src/main/resources/revisions/MinerUnit/2.json b/annotations/src/main/resources/revisions/mono/2.json similarity index 100% rename from annotations/src/main/resources/revisions/MinerUnit/2.json rename to annotations/src/main/resources/revisions/mono/2.json diff --git a/annotations/src/main/resources/revisions/BuilderCommanderMechMinerUnit/0.json b/annotations/src/main/resources/revisions/nova/0.json similarity index 100% rename from annotations/src/main/resources/revisions/BuilderCommanderMechMinerUnit/0.json rename to annotations/src/main/resources/revisions/nova/0.json diff --git a/annotations/src/main/resources/revisions/BuilderCommanderMechMinerUnit/1.json b/annotations/src/main/resources/revisions/nova/1.json similarity index 100% rename from annotations/src/main/resources/revisions/BuilderCommanderMechMinerUnit/1.json rename to annotations/src/main/resources/revisions/nova/1.json diff --git a/annotations/src/main/resources/revisions/BuilderCommanderMechMinerUnit/2.json b/annotations/src/main/resources/revisions/nova/2.json similarity index 100% rename from annotations/src/main/resources/revisions/BuilderCommanderMechMinerUnit/2.json rename to annotations/src/main/resources/revisions/nova/2.json diff --git a/annotations/src/main/resources/revisions/AmmoDistributeBuilderCommanderPayloadUnit/0.json b/annotations/src/main/resources/revisions/oct/0.json similarity index 100% rename from annotations/src/main/resources/revisions/AmmoDistributeBuilderCommanderPayloadUnit/0.json rename to annotations/src/main/resources/revisions/oct/0.json diff --git a/annotations/src/main/resources/revisions/AmmoDistributeBuilderCommanderPayloadUnit/1.json b/annotations/src/main/resources/revisions/oct/1.json similarity index 100% rename from annotations/src/main/resources/revisions/AmmoDistributeBuilderCommanderPayloadUnit/1.json rename to annotations/src/main/resources/revisions/oct/1.json diff --git a/annotations/src/main/resources/revisions/BuilderMinerTrailUnit/0.json b/annotations/src/main/resources/revisions/poly/0.json similarity index 100% rename from annotations/src/main/resources/revisions/BuilderMinerTrailUnit/0.json rename to annotations/src/main/resources/revisions/poly/0.json diff --git a/annotations/src/main/resources/revisions/BuilderMinerUnit/1.json b/annotations/src/main/resources/revisions/poly/1.json similarity index 100% rename from annotations/src/main/resources/revisions/BuilderMinerUnit/1.json rename to annotations/src/main/resources/revisions/poly/1.json diff --git a/annotations/src/main/resources/revisions/BuilderMinerUnit/2.json b/annotations/src/main/resources/revisions/poly/2.json similarity index 100% rename from annotations/src/main/resources/revisions/BuilderMinerUnit/2.json rename to annotations/src/main/resources/revisions/poly/2.json diff --git a/annotations/src/main/resources/revisions/BuilderPayloadUnit/0.json b/annotations/src/main/resources/revisions/quad/0.json similarity index 100% rename from annotations/src/main/resources/revisions/BuilderPayloadUnit/0.json rename to annotations/src/main/resources/revisions/quad/0.json diff --git a/annotations/src/main/resources/revisions/BuilderPayloadUnit/1.json b/annotations/src/main/resources/revisions/quad/1.json similarity index 100% rename from annotations/src/main/resources/revisions/BuilderPayloadUnit/1.json rename to annotations/src/main/resources/revisions/quad/1.json diff --git a/annotations/src/main/resources/revisions/BuilderPayloadUnit/2.json b/annotations/src/main/resources/revisions/quad/2.json similarity index 100% rename from annotations/src/main/resources/revisions/BuilderPayloadUnit/2.json rename to annotations/src/main/resources/revisions/quad/2.json diff --git a/annotations/src/main/resources/revisions/LegsUnit/0.json b/annotations/src/main/resources/revisions/risso/0.json similarity index 100% rename from annotations/src/main/resources/revisions/LegsUnit/0.json rename to annotations/src/main/resources/revisions/risso/0.json diff --git a/annotations/src/main/resources/revisions/LegsUnit/1.json b/annotations/src/main/resources/revisions/risso/1.json similarity index 100% rename from annotations/src/main/resources/revisions/LegsUnit/1.json rename to annotations/src/main/resources/revisions/risso/1.json diff --git a/annotations/src/main/resources/revisions/LegsUnit/2.json b/annotations/src/main/resources/revisions/risso/2.json similarity index 100% rename from annotations/src/main/resources/revisions/LegsUnit/2.json rename to annotations/src/main/resources/revisions/risso/2.json diff --git a/annotations/src/main/resources/revisions/BuilderLegsUnit/0.json b/annotations/src/main/resources/revisions/spiroct/0.json similarity index 100% rename from annotations/src/main/resources/revisions/BuilderLegsUnit/0.json rename to annotations/src/main/resources/revisions/spiroct/0.json diff --git a/annotations/src/main/resources/revisions/BuilderLegsUnit/1.json b/annotations/src/main/resources/revisions/spiroct/1.json similarity index 100% rename from annotations/src/main/resources/revisions/BuilderLegsUnit/1.json rename to annotations/src/main/resources/revisions/spiroct/1.json diff --git a/annotations/src/main/resources/revisions/BuilderLegsUnit/2.json b/annotations/src/main/resources/revisions/spiroct/2.json similarity index 100% rename from annotations/src/main/resources/revisions/BuilderLegsUnit/2.json rename to annotations/src/main/resources/revisions/spiroct/2.json