From 0df4e267363f00447abd97308a74a265798d3d95 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 26 Jun 2020 15:59:54 -0400 Subject: [PATCH] Cleanup --- .../revisions/BlockUnitUnitEntity/0.json | 1 - .../0.json | 1 - .../revisions/BuilderMechUnitEntity/0.json | 1 - .../BuilderMinerPayloadUnitEntity/0.json | 1 - .../revisions/BuilderMinerUnitEntity/0.json | 1 - .../revisions/BuilderUnitEntity/0.json | 1 - .../resources/revisions/BuildingEntity/0.json | 1 - .../main/resources/revisions/Bullet/1.json | 1 - .../main/resources/revisions/Bullet/2.json | 1 - .../resources/revisions/BulletEntity/0.json | 1 - .../CommanderUnitWaterMoveEntity/0.json | 1 - .../resources/revisions/DecalEntity/0.json | 1 - .../main/resources/revisions/Effect/0.json | 1 - .../resources/revisions/EffectEntity/0.json | 1 - .../resources/revisions/EffectInstance/0.json | 1 - .../resources/revisions/EffectState/1.json | 1 - .../resources/revisions/EffectState/2.json | 1 - .../resources/revisions/FireEntity/0.json | 1 - .../revisions/LaunchCoreEntity/0.json | 1 - .../revisions/LaunchPayloadEntity/0.json | 1 - .../resources/revisions/LegsUnitEntity/0.json | 1 - .../resources/revisions/MechUnitEntity/0.json | 1 - .../revisions/MinerUnitEntity/0.json | 1 - .../main/resources/revisions/Player/0.json | 2 +- .../main/resources/revisions/Player/1.json | 1 - .../main/resources/revisions/Player/2.json | 1 - .../main/resources/revisions/Player/3.json | 1 - .../main/resources/revisions/Player/4.json | 1 - .../resources/revisions/PlayerEntity/0.json | 1 - .../resources/revisions/PuddleEntity/0.json | 1 - .../resources/revisions/TileEntity/0.json | 1 - .../src/main/resources/revisions/Unit/0.json | 1 - .../main/resources/revisions/Weather/0.json | 1 - .../resources/revisions/WeatherEntity/0.json | 1 - core/src/mindustry/ai/WaveSpawner.java | 2 +- core/src/mindustry/core/Control.java | 2 +- core/src/mindustry/core/NetClient.java | 12 +- core/src/mindustry/core/NetServer.java | 112 +++++++++--------- .../src/mindustry/editor/MapEditorDialog.java | 2 +- .../mindustry/entities/comp/PlayerComp.java | 2 +- .../mindustry/graphics/OverlayRenderer.java | 6 +- core/src/mindustry/input/InputHandler.java | 16 +-- core/src/mindustry/maps/Map.java | 2 +- core/src/mindustry/net/Administration.java | 4 +- core/src/mindustry/net/NetworkIO.java | 2 +- core/src/mindustry/ui/dialogs/JoinDialog.java | 4 +- .../src/mindustry/ui/dialogs/TraceDialog.java | 2 +- .../mindustry/ui/fragments/HudFragment.java | 4 +- .../ui/fragments/PlayerListFragment.java | 26 ++-- .../mindustry/desktop/DesktopLauncher.java | 2 +- desktop/src/mindustry/desktop/steam/SNet.java | 2 +- .../src/mindustry/server/ServerControl.java | 6 +- 52 files changed, 110 insertions(+), 133 deletions(-) delete mode 100644 annotations/src/main/resources/revisions/BlockUnitUnitEntity/0.json delete mode 100644 annotations/src/main/resources/revisions/BuilderCommanderMechMinerUnitEntity/0.json delete mode 100644 annotations/src/main/resources/revisions/BuilderMechUnitEntity/0.json delete mode 100644 annotations/src/main/resources/revisions/BuilderMinerPayloadUnitEntity/0.json delete mode 100644 annotations/src/main/resources/revisions/BuilderMinerUnitEntity/0.json delete mode 100644 annotations/src/main/resources/revisions/BuilderUnitEntity/0.json delete mode 100644 annotations/src/main/resources/revisions/BuildingEntity/0.json delete mode 100644 annotations/src/main/resources/revisions/Bullet/1.json delete mode 100644 annotations/src/main/resources/revisions/Bullet/2.json delete mode 100644 annotations/src/main/resources/revisions/BulletEntity/0.json delete mode 100644 annotations/src/main/resources/revisions/CommanderUnitWaterMoveEntity/0.json delete mode 100644 annotations/src/main/resources/revisions/DecalEntity/0.json delete mode 100644 annotations/src/main/resources/revisions/Effect/0.json delete mode 100644 annotations/src/main/resources/revisions/EffectEntity/0.json delete mode 100644 annotations/src/main/resources/revisions/EffectInstance/0.json delete mode 100644 annotations/src/main/resources/revisions/EffectState/1.json delete mode 100644 annotations/src/main/resources/revisions/EffectState/2.json delete mode 100644 annotations/src/main/resources/revisions/FireEntity/0.json delete mode 100644 annotations/src/main/resources/revisions/LaunchCoreEntity/0.json delete mode 100644 annotations/src/main/resources/revisions/LaunchPayloadEntity/0.json delete mode 100644 annotations/src/main/resources/revisions/LegsUnitEntity/0.json delete mode 100644 annotations/src/main/resources/revisions/MechUnitEntity/0.json delete mode 100644 annotations/src/main/resources/revisions/MinerUnitEntity/0.json delete mode 100644 annotations/src/main/resources/revisions/Player/1.json delete mode 100644 annotations/src/main/resources/revisions/Player/2.json delete mode 100644 annotations/src/main/resources/revisions/Player/3.json delete mode 100644 annotations/src/main/resources/revisions/Player/4.json delete mode 100644 annotations/src/main/resources/revisions/PlayerEntity/0.json delete mode 100644 annotations/src/main/resources/revisions/PuddleEntity/0.json delete mode 100644 annotations/src/main/resources/revisions/TileEntity/0.json delete mode 100644 annotations/src/main/resources/revisions/Unit/0.json delete mode 100644 annotations/src/main/resources/revisions/Weather/0.json delete mode 100644 annotations/src/main/resources/revisions/WeatherEntity/0.json diff --git a/annotations/src/main/resources/revisions/BlockUnitUnitEntity/0.json b/annotations/src/main/resources/revisions/BlockUnitUnitEntity/0.json deleted file mode 100644 index 2160b1858b..0000000000 --- a/annotations/src/main/resources/revisions/BlockUnitUnitEntity/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:ammo,type:int,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/BuilderCommanderMechMinerUnitEntity/0.json b/annotations/src/main/resources/revisions/BuilderCommanderMechMinerUnitEntity/0.json deleted file mode 100644 index d5684055f5..0000000000 --- a/annotations/src/main/resources/revisions/BuilderCommanderMechMinerUnitEntity/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:ammo,type:int,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: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/BuilderMechUnitEntity/0.json b/annotations/src/main/resources/revisions/BuilderMechUnitEntity/0.json deleted file mode 100644 index b0bacdb1c1..0000000000 --- a/annotations/src/main/resources/revisions/BuilderMechUnitEntity/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:ammo,type:int,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: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/BuilderMinerPayloadUnitEntity/0.json b/annotations/src/main/resources/revisions/BuilderMinerPayloadUnitEntity/0.json deleted file mode 100644 index 26faae9a77..0000000000 --- a/annotations/src/main/resources/revisions/BuilderMinerPayloadUnitEntity/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:ammo,type:int,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:mineTile,type:mindustry.world.Tile,size:-1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:payloads,type:arc.struct.Seq,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/BuilderMinerUnitEntity/0.json b/annotations/src/main/resources/revisions/BuilderMinerUnitEntity/0.json deleted file mode 100644 index 94f48a7b63..0000000000 --- a/annotations/src/main/resources/revisions/BuilderMinerUnitEntity/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:ammo,type:int,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: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/BuilderUnitEntity/0.json b/annotations/src/main/resources/revisions/BuilderUnitEntity/0.json deleted file mode 100644 index 719d06eac9..0000000000 --- a/annotations/src/main/resources/revisions/BuilderUnitEntity/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:ammo,type:int,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: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/BuildingEntity/0.json b/annotations/src/main/resources/revisions/BuildingEntity/0.json deleted file mode 100644 index c3a6d143c5..0000000000 --- a/annotations/src/main/resources/revisions/BuildingEntity/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:cons,type:mindustry.world.modules.ConsumeModule,size:-1},{name:health,type:float,size:4},{name:items,type:mindustry.world.modules.ItemModule,size:-1},{name:liquids,type:mindustry.world.modules.LiquidModule,size:-1},{name:power,type:mindustry.world.modules.PowerModule,size:-1},{name:team,type:mindustry.game.Team,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/Bullet/1.json b/annotations/src/main/resources/revisions/Bullet/1.json deleted file mode 100644 index c2d8c52eb2..0000000000 --- a/annotations/src/main/resources/revisions/Bullet/1.json +++ /dev/null @@ -1 +0,0 @@ -{version:1,fields:[{name:collided,type:arc.struct.IntSeq,size:-1},{name:damage,type:float,size:4},{name:data,type:java.lang.Object,size:-1},{name:lifetime,type:float,size:4},{name:owner,type:mindustry.gen.Entityc,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:time,type:float,size:4},{name:type,type:mindustry.entities.bullet.BulletType,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/Bullet/2.json b/annotations/src/main/resources/revisions/Bullet/2.json deleted file mode 100644 index 04b1c437de..0000000000 --- a/annotations/src/main/resources/revisions/Bullet/2.json +++ /dev/null @@ -1 +0,0 @@ -{version:2,fields:[{name:collided,type:arc.struct.IntSeq,size:-1},{name:damage,type:float,size:4},{name:data,type:java.lang.Object,size:-1},{name:lifetime,type:float,size:4},{name:owner,type:Entityc,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:time,type:float,size:4},{name:type,type:mindustry.entities.bullet.BulletType,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/BulletEntity/0.json b/annotations/src/main/resources/revisions/BulletEntity/0.json deleted file mode 100644 index 4904375b03..0000000000 --- a/annotations/src/main/resources/revisions/BulletEntity/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:collided,type:arc.struct.IntSeq,size:-1},{name:damage,type:float,size:4},{name:data,type:java.lang.Object,size:-1},{name:lifetime,type:float,size:4},{name:owner,type:Entityc,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:time,type:float,size:4},{name:type,type:mindustry.entities.bullet.BulletType,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/CommanderUnitWaterMoveEntity/0.json b/annotations/src/main/resources/revisions/CommanderUnitWaterMoveEntity/0.json deleted file mode 100644 index 2160b1858b..0000000000 --- a/annotations/src/main/resources/revisions/CommanderUnitWaterMoveEntity/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:ammo,type:int,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/DecalEntity/0.json b/annotations/src/main/resources/revisions/DecalEntity/0.json deleted file mode 100644 index df78246160..0000000000 --- a/annotations/src/main/resources/revisions/DecalEntity/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:color,type:arc.graphics.Color,size:-1},{name:lifetime,type:float,size:4},{name:region,type:arc.graphics.g2d.TextureRegion,size:-1},{name:rotation,type:float,size:4},{name:time,type:float,size:4},{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/Effect/0.json b/annotations/src/main/resources/revisions/Effect/0.json deleted file mode 100644 index 5ce16bf09c..0000000000 --- a/annotations/src/main/resources/revisions/Effect/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:color,type:arc.graphics.Color,size:-1},{name:data,type:java.lang.Object,size:-1},{name:effect,type:mindustry.entities.Effect,size:-1},{name:lifetime,type:float,size:4},{name:offsetX,type:float,size:4},{name:offsetY,type:float,size:4},{name:parent,type:Posc,size:-1},{name:rotation,type:float,size:4},{name:time,type:float,size:4},{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/EffectEntity/0.json b/annotations/src/main/resources/revisions/EffectEntity/0.json deleted file mode 100644 index 5ce16bf09c..0000000000 --- a/annotations/src/main/resources/revisions/EffectEntity/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:color,type:arc.graphics.Color,size:-1},{name:data,type:java.lang.Object,size:-1},{name:effect,type:mindustry.entities.Effect,size:-1},{name:lifetime,type:float,size:4},{name:offsetX,type:float,size:4},{name:offsetY,type:float,size:4},{name:parent,type:Posc,size:-1},{name:rotation,type:float,size:4},{name:time,type:float,size:4},{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/EffectInstance/0.json b/annotations/src/main/resources/revisions/EffectInstance/0.json deleted file mode 100644 index 5ce16bf09c..0000000000 --- a/annotations/src/main/resources/revisions/EffectInstance/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:color,type:arc.graphics.Color,size:-1},{name:data,type:java.lang.Object,size:-1},{name:effect,type:mindustry.entities.Effect,size:-1},{name:lifetime,type:float,size:4},{name:offsetX,type:float,size:4},{name:offsetY,type:float,size:4},{name:parent,type:Posc,size:-1},{name:rotation,type:float,size:4},{name:time,type:float,size:4},{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/EffectState/1.json b/annotations/src/main/resources/revisions/EffectState/1.json deleted file mode 100644 index 0ccd683257..0000000000 --- a/annotations/src/main/resources/revisions/EffectState/1.json +++ /dev/null @@ -1 +0,0 @@ -{version:1,fields:[{name:color,type:arc.graphics.Color,size:-1},{name:data,type:java.lang.Object,size:-1},{name:effect,type:mindustry.entities.Effect,size:-1},{name:lifetime,type:float,size:4},{name:offsetX,type:float,size:4},{name:offsetY,type:float,size:4},{name:parent,type:mindustry.gen.Posc,size:-1},{name:rotation,type:float,size:4},{name:time,type:float,size:4},{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/EffectState/2.json b/annotations/src/main/resources/revisions/EffectState/2.json deleted file mode 100644 index fb05e5f923..0000000000 --- a/annotations/src/main/resources/revisions/EffectState/2.json +++ /dev/null @@ -1 +0,0 @@ -{version:2,fields:[{name:color,type:arc.graphics.Color,size:-1},{name:data,type:java.lang.Object,size:-1},{name:effect,type:mindustry.entities.Effect,size:-1},{name:lifetime,type:float,size:4},{name:offsetX,type:float,size:4},{name:offsetY,type:float,size:4},{name:parent,type:Posc,size:-1},{name:rotation,type:float,size:4},{name:time,type:float,size:4},{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/FireEntity/0.json b/annotations/src/main/resources/revisions/FireEntity/0.json deleted file mode 100644 index a5423a835b..0000000000 --- a/annotations/src/main/resources/revisions/FireEntity/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:baseFlammability,type:float,size:4},{name:block,type:mindustry.world.Block,size:-1},{name:lifetime,type:float,size:4},{name:puddleFlammability,type:float,size:4},{name:tile,type:mindustry.world.Tile,size:-1},{name:time,type:float,size:4},{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/LaunchCoreEntity/0.json b/annotations/src/main/resources/revisions/LaunchCoreEntity/0.json deleted file mode 100644 index 86b499e433..0000000000 --- a/annotations/src/main/resources/revisions/LaunchCoreEntity/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:block,type:mindustry.world.Block,size:-1},{name:lifetime,type:float,size:4},{name:time,type:float,size:4},{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/LaunchPayloadEntity/0.json b/annotations/src/main/resources/revisions/LaunchPayloadEntity/0.json deleted file mode 100644 index feba28804f..0000000000 --- a/annotations/src/main/resources/revisions/LaunchPayloadEntity/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:lifetime,type:float,size:4},{name:stacks,type:arc.struct.Seq,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:time,type:float,size:4},{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/LegsUnitEntity/0.json b/annotations/src/main/resources/revisions/LegsUnitEntity/0.json deleted file mode 100644 index 2160b1858b..0000000000 --- a/annotations/src/main/resources/revisions/LegsUnitEntity/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:ammo,type:int,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/MechUnitEntity/0.json b/annotations/src/main/resources/revisions/MechUnitEntity/0.json deleted file mode 100644 index 32f895e075..0000000000 --- a/annotations/src/main/resources/revisions/MechUnitEntity/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:ammo,type:int,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/MinerUnitEntity/0.json b/annotations/src/main/resources/revisions/MinerUnitEntity/0.json deleted file mode 100644 index 5df97253d8..0000000000 --- a/annotations/src/main/resources/revisions/MinerUnitEntity/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:ammo,type:int,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:mineTile,type:mindustry.world.Tile,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/Player/0.json b/annotations/src/main/resources/revisions/Player/0.json index de2ce4432f..f6443b400c 100644 --- a/annotations/src/main/resources/revisions/Player/0.json +++ b/annotations/src/main/resources/revisions/Player/0.json @@ -1 +1 @@ -{fields:[{name:admin,type:boolean,size:1},{name:boosting,type:boolean,size:1},{name:color,type:arc.graphics.Color,size:-1},{name:mouseX,type:float,size:4},{name:mouseY,type:float,size:4},{name:name,type:java.lang.String,size:-1},{name:shooting,type:boolean,size:1},{name:team,type:mindustry.game.Team,size:-1},{name:typing,type:boolean,size:1},{name:unit,type:Unitc,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file +{fields:[{name:admin,type:boolean,size:1},{name:boosting,type:boolean,size:1},{name:color,type:arc.graphics.Color,size:-1},{name:mouseX,type:float,size:4},{name:mouseY,type:float,size:4},{name:name,type:java.lang.String,size:-1},{name:shooting,type:boolean,size:1},{name:team,type:mindustry.game.Team,size:-1},{name:typing,type:boolean,size:1},{name:unit,type:Unit,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/Player/1.json b/annotations/src/main/resources/revisions/Player/1.json deleted file mode 100644 index b1d245c264..0000000000 --- a/annotations/src/main/resources/revisions/Player/1.json +++ /dev/null @@ -1 +0,0 @@ -{version:1,fields:[{name:admin,type:boolean,size:1},{name:boosting,type:boolean,size:1},{name:color,type:arc.graphics.Color,size:-1},{name:mouseX,type:float,size:4},{name:mouseY,type:float,size:4},{name:name,type:java.lang.String,size:-1},{name:shooting,type:boolean,size:1},{name:team,type:mindustry.game.Team,size:-1},{name:typing,type:boolean,size:1},{name:unit,type:Unit,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/Player/2.json b/annotations/src/main/resources/revisions/Player/2.json deleted file mode 100644 index b98ef7435e..0000000000 --- a/annotations/src/main/resources/revisions/Player/2.json +++ /dev/null @@ -1 +0,0 @@ -{version:2,fields:[{name:admin,type:boolean,size:1},{name:boosting,type:boolean,size:1},{name:color,type:arc.graphics.Color,size:-1},{name:mouseX,type:float,size:4},{name:mouseY,type:float,size:4},{name:name,type:java.lang.String,size:-1},{name:shooting,type:boolean,size:1},{name:team,type:mindustry.game.Team,size:-1},{name:typing,type:boolean,size:1},{name:unit,type:mindustry.gen.Unit,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/Player/3.json b/annotations/src/main/resources/revisions/Player/3.json deleted file mode 100644 index 3c0245dab3..0000000000 --- a/annotations/src/main/resources/revisions/Player/3.json +++ /dev/null @@ -1 +0,0 @@ -{version:3,fields:[{name:admin,type:boolean,size:1},{name:boosting,type:boolean,size:1},{name:color,type:arc.graphics.Color,size:-1},{name:mouseX,type:float,size:4},{name:mouseY,type:float,size:4},{name:name,type:java.lang.String,size:-1},{name:shooting,type:boolean,size:1},{name:team,type:mindustry.game.Team,size:-1},{name:typing,type:boolean,size:1},{name:unit,type:Unit,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/Player/4.json b/annotations/src/main/resources/revisions/Player/4.json deleted file mode 100644 index 5becfa43a0..0000000000 --- a/annotations/src/main/resources/revisions/Player/4.json +++ /dev/null @@ -1 +0,0 @@ -{version:4,fields:[{name:admin,type:boolean,size:1},{name:boosting,type:boolean,size:1},{name:color,type:arc.graphics.Color,size:-1},{name:mouseX,type:float,size:4},{name:mouseY,type:float,size:4},{name:name,type:java.lang.String,size:-1},{name:shooting,type:boolean,size:1},{name:team,type:mindustry.game.Team,size:-1},{name:typing,type:boolean,size:1},{name:unit,type:Unit,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/PlayerEntity/0.json b/annotations/src/main/resources/revisions/PlayerEntity/0.json deleted file mode 100644 index de2ce4432f..0000000000 --- a/annotations/src/main/resources/revisions/PlayerEntity/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:admin,type:boolean,size:1},{name:boosting,type:boolean,size:1},{name:color,type:arc.graphics.Color,size:-1},{name:mouseX,type:float,size:4},{name:mouseY,type:float,size:4},{name:name,type:java.lang.String,size:-1},{name:shooting,type:boolean,size:1},{name:team,type:mindustry.game.Team,size:-1},{name:typing,type:boolean,size:1},{name:unit,type:Unitc,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/PuddleEntity/0.json b/annotations/src/main/resources/revisions/PuddleEntity/0.json deleted file mode 100644 index 3c4c644549..0000000000 --- a/annotations/src/main/resources/revisions/PuddleEntity/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:amount,type:float,size:4},{name:generation,type:int,size:4},{name:liquid,type:mindustry.type.Liquid,size:-1},{name:tile,type:mindustry.world.Tile,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/TileEntity/0.json b/annotations/src/main/resources/revisions/TileEntity/0.json deleted file mode 100644 index c3a6d143c5..0000000000 --- a/annotations/src/main/resources/revisions/TileEntity/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:cons,type:mindustry.world.modules.ConsumeModule,size:-1},{name:health,type:float,size:4},{name:items,type:mindustry.world.modules.ItemModule,size:-1},{name:liquids,type:mindustry.world.modules.LiquidModule,size:-1},{name:power,type:mindustry.world.modules.PowerModule,size:-1},{name:team,type:mindustry.game.Team,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/Unit/0.json b/annotations/src/main/resources/revisions/Unit/0.json deleted file mode 100644 index 2160b1858b..0000000000 --- a/annotations/src/main/resources/revisions/Unit/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:ammo,type:int,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/Weather/0.json b/annotations/src/main/resources/revisions/Weather/0.json deleted file mode 100644 index 84ba06dbcd..0000000000 --- a/annotations/src/main/resources/revisions/Weather/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:intensity,type:float,size:4},{name:life,type:float,size:4},{name:opacity,type:float,size:4},{name:weather,type:mindustry.type.Weather,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/WeatherEntity/0.json b/annotations/src/main/resources/revisions/WeatherEntity/0.json deleted file mode 100644 index 84ba06dbcd..0000000000 --- a/annotations/src/main/resources/revisions/WeatherEntity/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:intensity,type:float,size:4},{name:life,type:float,size:4},{name:opacity,type:float,size:4},{name:weather,type:mindustry.type.Weather,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/core/src/mindustry/ai/WaveSpawner.java b/core/src/mindustry/ai/WaveSpawner.java index b6b66178a0..5ce4921baf 100644 --- a/core/src/mindustry/ai/WaveSpawner.java +++ b/core/src/mindustry/ai/WaveSpawner.java @@ -34,7 +34,7 @@ public class WaveSpawner{ /** @return true if the player is near a ground spawn point. */ public boolean playerNear(){ - return !player.dead() && spawns.contains(g -> Mathf.dst(g.x * tilesize, g.y * tilesize, player.x(), player.y()) < state.rules.dropZoneRadius && player.team() != state.rules.waveTeam); + return !player.dead() && spawns.contains(g -> Mathf.dst(g.x * tilesize, g.y * tilesize, player.x, player.y) < state.rules.dropZoneRadius && player.team() != state.rules.waveTeam); } public void spawnEnemies(){ diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index 99833d4347..71e7a86210 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -73,7 +73,7 @@ public class Control implements ApplicationListener, Loadable{ }); Events.on(WorldLoadEvent.class, event -> { - if(Mathf.zero(player.x()) && Mathf.zero(player.y())){ + if(Mathf.zero(player.x) && Mathf.zero(player.y)){ Building core = state.teams.closestCore(0, 0, player.team()); if(core != null){ player.set(core); diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java index 3b551b4b66..1cb5511203 100644 --- a/core/src/mindustry/core/NetClient.java +++ b/core/src/mindustry/core/NetClient.java @@ -73,7 +73,7 @@ public class NetClient implements ApplicationListener{ }); ConnectPacket c = new ConnectPacket(); - c.name = player.name(); + c.name = player.name; c.mods = mods.getModStrings(); c.mobile = mobile; c.versionType = Version.type; @@ -192,18 +192,18 @@ public class NetClient implements ApplicationListener{ //special case; graphical server needs to see its message if(!headless){ - sendMessage(message, colorizeName(player.id(), player.name()), player); + sendMessage(message, colorizeName(player.id(), player.name), player); } //server console logging - Log.info("&y@: &lb@", player.name(), message); + Log.info("&y@: &lb@", player.name, message); //invoke event for all clients but also locally //this is required so other clients get the correct name even if they don't know who's sending it yet - Call.sendMessage(message, colorizeName(player.id(), player.name()), player); + Call.sendMessage(message, colorizeName(player.id(), player.name), player); }else{ //log command to console but with brackets - Log.info("<&y@: &lm@&lg>", player.name(), message); + Log.info("<&y@: &lm@&lg>", player.name, message); //a command was sent, now get the output if(response.type != ResponseType.valid){ @@ -239,7 +239,7 @@ public class NetClient implements ApplicationListener{ @Remote(targets = Loc.client) public static void onPing(Player player, long time){ - Call.onPingResponse(player.con(), time); + Call.onPingResponse(player.con, time); } @Remote(variants = Variant.one) diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index 256b659c89..06149f36e3 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -176,7 +176,7 @@ public class NetServer implements ApplicationListener{ boolean preventDuplicates = headless && netServer.admins.getStrict(); if(preventDuplicates){ - if(Groups.player.contains(p -> p.name().trim().equalsIgnoreCase(packet.name.trim()))){ + if(Groups.player.contains(p -> p.name.trim().equalsIgnoreCase(packet.name.trim()))){ con.kick(KickReason.nameInUse); return; } @@ -208,16 +208,16 @@ public class NetServer implements ApplicationListener{ } Player player = Player.create(); - player.admin(admins.isAdmin(uuid, packet.usid)); - player.con(con); - player.con().usid = packet.usid; - player.con().uuid = uuid; - player.con().mobile = packet.mobile; - player.name(packet.name); - player.color().set(packet.color).a(1f); + player.admin = admins.isAdmin(uuid, packet.usid); + player.con = con; + player.con.usid = packet.usid; + player.con.uuid = uuid; + player.con.mobile = packet.mobile; + player.name = packet.name; + player.color.set(packet.color).a(1f); //save admin ID but don't overwrite it - if(!player.admin() && !info.admin){ + if(!player.admin && !info.admin){ info.adminUsid = packet.usid; } @@ -296,7 +296,7 @@ public class NetServer implements ApplicationListener{ clientCommands.register("t", "", "Send a message only to your teammates.", (args, player) -> { String message = admins.filterMessage(player, args[0]); if(message != null){ - Groups.player.each(p -> p.team() == player.team(), o -> o.sendMessage(message, player, "[#" + player.team().color.toString() + "]" + NetClient.colorizeName(player.id(), player.name()))); + Groups.player.each(p -> p.team() == player.team(), o -> o.sendMessage(message, player, "[#" + player.team().color.toString() + "]" + NetClient.colorizeName(player.id(), player.name))); } }); @@ -319,7 +319,7 @@ public class NetServer implements ApplicationListener{ this.map = map; this.task = Timer.schedule(() -> { if(!checkPass()){ - Call.sendMessage(Strings.format("[lightgray]Vote failed. Not enough votes to kick[orange] @[lightgray].", target.name())); + Call.sendMessage(Strings.format("[lightgray]Vote failed. Not enough votes to kick[orange] @[lightgray].", target.name)); map[0] = null; task.cancel(); } @@ -329,14 +329,14 @@ public class NetServer implements ApplicationListener{ void vote(Player player, int d){ votes += d; voted.addAll(player.uuid(), admins.getInfo(player.uuid()).lastIP); - + Call.sendMessage(Strings.format("[orange]@[lightgray] has voted on kicking[orange] @[].[accent] (@/@)\n[lightgray]Type[orange] /vote [] to agree.", - player.name(), target.name(), votes, votesRequired())); + player.name, target.name, votes, votesRequired())); } boolean checkPass(){ if(votes >= votesRequired()){ - Call.sendMessage(Strings.format("[orange]Vote passed.[scarlet] @[orange] will be banned from the server for @ minutes.", target.name(), (kickDuration/60))); + Call.sendMessage(Strings.format("[orange]Vote passed.[scarlet] @[orange] will be banned from the server for @ minutes.", target.name, (kickDuration/60))); target.getInfo().lastKicked = Time.millis() + kickDuration*1000; Groups.player.each(p -> p.uuid().equals(target.uuid()), p -> p.kick(KickReason.vote)); map[0] = null; @@ -372,8 +372,8 @@ public class NetServer implements ApplicationListener{ StringBuilder builder = new StringBuilder(); builder.append("[orange]Players to kick: \n"); - Groups.player.each(p -> !p.admin() && p.con() != null && p != player, p -> { - builder.append("[lightgray] ").append(p.name()).append("[accent] (#").append(p.id()).append(")\n"); + Groups.player.each(p -> !p.admin && p.con != null && p != player, p -> { + builder.append("[lightgray] ").append(p.name).append("[accent] (#").append(p.id()).append(")\n"); }); player.sendMessage(builder.toString()); }else{ @@ -382,11 +382,13 @@ public class NetServer implements ApplicationListener{ int id = Strings.parseInt(args[0].substring(1)); found = Groups.player.find(p -> p.id() == id); }else{ - found = Groups.player.find(p -> p.name().equalsIgnoreCase(args[0])); + found = Groups.player.find(p -> { + return p.name.equalsIgnoreCase(args[0]); + }); } if(found != null){ - if(found.admin()){ + if(found.admin){ player.sendMessage("[scarlet]Did you really expect to be able to kick an admin?"); }else if(found.isLocal()){ player.sendMessage("[scarlet]Local players cannot be kicked."); @@ -451,7 +453,7 @@ public class NetServer implements ApplicationListener{ } player.getInfo().lastSyncTime = Time.millis(); - Call.onWorldDataBegin(player.con()); + Call.onWorldDataBegin(player.con); netServer.sendWorldData(player); } }); @@ -475,7 +477,7 @@ public class NetServer implements ApplicationListener{ NetworkIO.writeWorld(player, def); WorldStream data = new WorldStream(); data.stream = new ByteArrayInputStream(stream.toByteArray()); - player.con().sendStream(data); + player.con.sendStream(data); Log.debug("Packed @ compressed bytes of world data.", stream.size()); } @@ -490,23 +492,23 @@ public class NetServer implements ApplicationListener{ public static void onDisconnect(Player player, String reason){ //singleplayer multiplayer wierdness - if(player.con() == null){ + if(player.con == null){ player.remove(); return; } - if(!player.con().hasDisconnected){ - if(player.con().hasConnected){ + if(!player.con.hasDisconnected){ + if(player.con.hasConnected){ Events.fire(new PlayerLeave(player)); - if(Config.showConnectMessages.bool()) Call.sendMessage("[accent]" + player.name() + "[accent] has disconnected."); + if(Config.showConnectMessages.bool()) Call.sendMessage("[accent]" + player.name + "[accent] has disconnected."); Call.onPlayerDisconnect(player.id()); } - if(Config.showConnectMessages.bool()) Log.info("&lm[@] &lc@ has disconnected. &lg&fi(@)", player.uuid(), player.name(), reason); + if(Config.showConnectMessages.bool()) Log.info("&lm[@] &lc@ has disconnected. &lg&fi(@)", player.uuid(), player.name, reason); } player.remove(); - player.con().hasDisconnected = true; + player.con.hasDisconnected = true; } @Remote(targets = Loc.client) @@ -536,7 +538,7 @@ public class NetServer implements ApplicationListener{ @Nullable BuildPlan[] requests, float viewX, float viewY, float viewWidth, float viewHeight ){ - NetConnection connection = player.con(); + NetConnection connection = player.con; if(connection == null || snapshotID < connection.lastRecievedClientSnapshot) return; boolean verifyPosition = !player.dead() && netServer.admins.getStrict() && headless; @@ -553,11 +555,11 @@ public class NetServer implements ApplicationListener{ shooting = false; } - player.mouseX(pointerX); - player.mouseY(pointerY); - player.typing(chatting); - player.shooting(shooting); - player.boosting(boosting); + player.mouseX = pointerX; + player.mouseY = pointerY; + player.typing = chatting; + player.shooting = shooting; + player.boosting = boosting; player.unit().controlWeapons(shooting, shooting); player.unit().aim(pointerX, pointerY); @@ -588,7 +590,7 @@ public class NetServer implements ApplicationListener{ action.config = req.config; })){ //force the player to remove this request if that's not the case - Call.removeQueueBlock(player.con(), req.x, req.y, req.breaking); + Call.removeQueueBlock(player.con, req.x, req.y, req.breaking); connection.rejectedRequests.add(req); continue; } @@ -631,7 +633,7 @@ public class NetServer implements ApplicationListener{ newx = x; newy = y; }else if(!Mathf.within(x, y, newx, newy, correctDist)){ - Call.onPositionSet(player.con(), newx, newy); //teleport and correct position when necessary + Call.onPositionSet(player.con, newx, newy); //teleport and correct position when necessary } //reset player to previous synced position so it gets interpolated @@ -666,14 +668,14 @@ public class NetServer implements ApplicationListener{ @Remote(targets = Loc.client, called = Loc.server) public static void onAdminRequest(Player player, Player other, AdminAction action){ - if(!player.admin()){ + if(!player.admin){ Log.warn("ACCESS DENIED: Player @ / @ attempted to perform admin action without proper security access.", - player.name(), player.con().address); + player.name, player.con.address); return; } - if(other == null || ((other.admin() && !player.isLocal()) && other != player)){ - Log.warn("@ attempted to perform admin action on nonexistant or admin player.", player.name()); + if(other == null || ((other.admin && !player.isLocal()) && other != player)){ + Log.warn("@ attempted to perform admin action on nonexistant or admin player.", player.name); return; } @@ -682,32 +684,32 @@ public class NetServer implements ApplicationListener{ //not a real issue, because server owners may want to do just that state.wavetime = 0f; }else if(action == AdminAction.ban){ - netServer.admins.banPlayerIP(other.con().address); + netServer.admins.banPlayerIP(other.con.address); other.kick(KickReason.banned); - Log.info("&lc@ has banned @.", player.name(), other.name()); + Log.info("&lc@ has banned @.", player.name, other.name); }else if(action == AdminAction.kick){ other.kick(KickReason.kick); - Log.info("&lc@ has kicked @.", player.name(), other.name()); + Log.info("&lc@ has kicked @.", player.name, other.name); }else if(action == AdminAction.trace){ - TraceInfo info = new TraceInfo(other.con().address, other.uuid(), other.con().modclient, other.con().mobile); - if(player.con() != null){ - Call.onTraceInfo(player.con(), other, info); + TraceInfo info = new TraceInfo(other.con.address, other.uuid(), other.con.modclient, other.con.mobile); + if(player.con != null){ + Call.onTraceInfo(player.con, other, info); }else{ NetClient.onTraceInfo(other, info); } - Log.info("&lc@ has requested trace info of @.", player.name(), other.name()); + Log.info("&lc@ has requested trace info of @.", player.name, other.name); } } @Remote(targets = Loc.client) public static void connectConfirm(Player player){ - if(player.con() == null || player.con().hasConnected) return; + if(player.con == null || player.con.hasConnected) return; player.add(); - player.con().hasConnected = true; + player.con.hasConnected = true; if(Config.showConnectMessages.bool()){ - Call.sendMessage("[accent]" + player.name() + "[accent] has connected."); - Log.info("&lm[@] &y@ has connected. ", player.uuid(), player.name()); + Call.sendMessage("[accent]" + player.name + "[accent] has connected."); + Log.info("&lm[@] &y@ has connected. ", player.uuid(), player.name); } if(!Config.motd.string().equalsIgnoreCase("off")){ @@ -811,9 +813,9 @@ public class NetServer implements ApplicationListener{ byte[] stateBytes = syncStream.toByteArray(); //write basic state data. - Call.onStateSnapshot(player.con(), state.wavetime, state.wave, state.enemies, state.serverPaused, (short)stateBytes.length, net.compressSnapshot(stateBytes)); + Call.onStateSnapshot(player.con, state.wavetime, state.wave, state.enemies, state.serverPaused, (short)stateBytes.length, net.compressSnapshot(stateBytes)); - viewport.setSize(player.con().viewWidth, player.con().viewHeight).setCenter(player.con().viewX, player.con().viewY); + viewport.setSize(player.con.viewWidth, player.con.viewHeight).setCenter(player.con.viewX, player.con.viewY); syncStream.reset(); @@ -830,7 +832,7 @@ public class NetServer implements ApplicationListener{ if(syncStream.size() > maxSnapshotSize){ dataStream.close(); byte[] syncBytes = syncStream.toByteArray(); - Call.onEntitySnapshot(player.con(), (short)sent, (short)syncBytes.length, net.compressSnapshot(syncBytes)); + Call.onEntitySnapshot(player.con, (short)sent, (short)syncBytes.length, net.compressSnapshot(syncBytes)); sent = 0; syncStream.reset(); } @@ -840,7 +842,7 @@ public class NetServer implements ApplicationListener{ dataStream.close(); byte[] syncBytes = syncStream.toByteArray(); - Call.onEntitySnapshot(player.con(), (short)sent, (short)syncBytes.length, net.compressSnapshot(syncBytes)); + Call.onEntitySnapshot(player.con, (short)sent, (short)syncBytes.length, net.compressSnapshot(syncBytes)); } } @@ -899,12 +901,12 @@ public class NetServer implements ApplicationListener{ try{ Groups.player.each(p -> !p.isLocal(), player -> { - if(player.con() == null || !player.con().isConnected()){ + if(player.con == null || !player.con.isConnected()){ onDisconnect(player, "disappeared"); return; } - NetConnection connection = player.con(); + NetConnection connection = player.con; if(!player.timer(0, serverSyncTime) || !connection.hasConnected) return; diff --git a/core/src/mindustry/editor/MapEditorDialog.java b/core/src/mindustry/editor/MapEditorDialog.java index 7c5dd8d321..562ddf3db4 100644 --- a/core/src/mindustry/editor/MapEditorDialog.java +++ b/core/src/mindustry/editor/MapEditorDialog.java @@ -156,7 +156,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ } platform.publish(map); - }).padTop(-3).size(swidth * 2f + 10, 60f).update(b -> b.setText(editor.getTags().containsKey("steamid") ? editor.getTags().get("author").equals(player.name()) ? "$workshop.listing" : "$view.workshop" : "$editor.publish.workshop")); + }).padTop(-3).size(swidth * 2f + 10, 60f).update(b -> b.setText(editor.getTags().containsKey("steamid") ? editor.getTags().get("author").equals(player.name) ? "$workshop.listing" : "$view.workshop" : "$editor.publish.workshop")); menu.cont.row(); } diff --git a/core/src/mindustry/entities/comp/PlayerComp.java b/core/src/mindustry/entities/comp/PlayerComp.java index ae7b22fb6d..4c11266019 100644 --- a/core/src/mindustry/entities/comp/PlayerComp.java +++ b/core/src/mindustry/entities/comp/PlayerComp.java @@ -250,7 +250,7 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra } void sendMessage(String text, Player from){ - sendMessage(text, from, NetClient.colorizeName(from.id(), from.name())); + sendMessage(text, from, NetClient.colorizeName(from.id(), from.name)); } void sendMessage(String text, Player from, String fromName){ diff --git a/core/src/mindustry/graphics/OverlayRenderer.java b/core/src/mindustry/graphics/OverlayRenderer.java index c89fd6aa84..7196f42538 100644 --- a/core/src/mindustry/graphics/OverlayRenderer.java +++ b/core/src/mindustry/graphics/OverlayRenderer.java @@ -39,9 +39,9 @@ public class OverlayRenderer{ for(Player player : Groups.player){ if(Vars.player != player && Vars.player.team() == player.team()){ if(!rect.setSize(Core.camera.width * 0.9f, Core.camera.height * 0.9f) - .setCenter(Core.camera.position.x, Core.camera.position.y).contains(player.x(), player.y())){ + .setCenter(Core.camera.position.x, Core.camera.position.y).contains(player.x, player.y)){ - Tmp.v1.set(player.x(), player.y()).sub(Core.camera.position.x, Core.camera.position.y).setLength(indicatorLength); + Tmp.v1.set(player.x, player.y).sub(Core.camera.position.x, Core.camera.position.y).setLength(indicatorLength); Lines.stroke(2f, player.team().color); Lines.lineAngle(Core.camera.position.x + Tmp.v1.x, Core.camera.position.y + Tmp.v1.y, Tmp.v1.angle(), 4f); @@ -118,7 +118,7 @@ public class OverlayRenderer{ Draw.color(Color.gray, Color.lightGray, Mathf.absin(Time.time(), 8f, 1f)); for(Tile tile : spawner.getSpawns()){ - if(tile.within(player.x(), player.y(), state.rules.dropZoneRadius + spawnerMargin)){ + if(tile.within(player.x, player.y, state.rules.dropZoneRadius + spawnerMargin)){ Draw.alpha(Mathf.clamp(1f - (player.dst(tile) - state.rules.dropZoneRadius) / spawnerMargin)); Lines.dashCircle(tile.worldx(), tile.worldy(), state.rules.dropZoneRadius); } diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index 57adfee577..3cc323373f 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -110,7 +110,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ throw new ValidateException(player, "Player cannot drop an item."); } - Fx.dropItem.at(player.x(), player.y(), angle, Color.white, player.unit().item()); + Fx.dropItem.at(player.x, player.y, angle, Color.white, player.unit().item()); player.unit().clearItem(); } @@ -149,7 +149,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ createItemTransfer( item, amount, - player.x() + Angles.trnsx(player.unit().rotation + 180f, backTrns), player.y() + Angles.trnsy(player.unit().rotation + 180f, backTrns), + player.x + Angles.trnsx(player.unit().rotation + 180f, backTrns), player.y + Angles.trnsy(player.unit().rotation + 180f, backTrns), new Vec2(tile.x() + stackTrns.x, tile.y() + stackTrns.y), () -> tile.handleStack(item, accepted, player.unit()) ); @@ -187,7 +187,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ player.unit(unit); Time.run(Fx.unitSpirit.lifetime, () -> Fx.unitControl.at(unit.x, unit.y, 0f, unit)); if(!player.dead()){ - Fx.unitSpirit.at(player.x(), player.y(), 0f, unit); + Fx.unitSpirit.at(player.x, player.y, 0f, unit); } } } @@ -212,13 +212,13 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ commander.clearCommand(); }else{ FormationPattern pattern = new SquareFormation(); - Formation formation = new Formation(new Vec3(player.x(), player.y(), player.unit().rotation), pattern); + Formation formation = new Formation(new Vec3(player.x, player.y, player.unit().rotation), pattern); formation.slotAssignmentStrategy = new DistanceAssignmentStrategy(pattern); units.clear(); Fx.commandSend.at(player); - Units.nearby(player.team(), player.x(), player.y(), 200f, u -> { + Units.nearby(player.team(), player.x, player.y, 200f, u -> { if(u.isAI()){ units.add(u); } @@ -260,7 +260,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ } if(controlledType != null && player.dead()){ - Unit unit = Units.closest(player.team(), player.x(), player.y(), u -> !u.isPlayer() && u.type() == controlledType); + Unit unit = Units.closest(player.team(), player.x, player.y, u -> !u.isPlayer() && u.type() == controlledType); if(unit != null){ Call.onUnitControl(player, unit); @@ -270,9 +270,9 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ public void checkUnit(){ if(controlledType != null){ - Unit unit = Units.closest(player.team(), player.x(), player.y(), u -> !u.isPlayer() && u.type() == controlledType); + Unit unit = Units.closest(player.team(), player.x, player.y, u -> !u.isPlayer() && u.type() == controlledType); if(unit == null && controlledType == UnitTypes.block){ - unit = world.entWorld(player.x(), player.y()) instanceof ControlBlock ? ((ControlBlock)world.entWorld(player.x(), player.y())).unit() : null; + unit = world.entWorld(player.x, player.y) instanceof ControlBlock ? ((ControlBlock)world.entWorld(player.x, player.y)).unit() : null; } if(unit != null){ diff --git a/core/src/mindustry/maps/Map.java b/core/src/mindustry/maps/Map.java index a7af96e78c..e47e369140 100644 --- a/core/src/mindustry/maps/Map.java +++ b/core/src/mindustry/maps/Map.java @@ -202,7 +202,7 @@ public class Map implements Comparable, Publishable{ @Override public boolean prePublish(){ - tags.put("author", player.name()); + tags.put("author", player.name); ui.editor.editor.getTags().put("author", tags.get("author")); ui.editor.save(); diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java index 8dd8274c37..a24610fe3f 100644 --- a/core/src/mindustry/net/Administration.java +++ b/core/src/mindustry/net/Administration.java @@ -43,7 +43,7 @@ public class Administration{ //anti-spam addChatFilter((player, message) -> { long resetTime = Config.messageRateLimit.num() * 1000; - if(Config.antiSpam.bool() && !player.isLocal() && !player.admin()){ + if(Config.antiSpam.bool() && !player.isLocal() && !player.admin){ //prevent people from spamming messages quickly if(resetTime > 0 && Time.timeSinceMillis(player.getInfo().lastMessageTime) < resetTime){ //supress message @@ -51,7 +51,7 @@ public class Administration{ player.getInfo().messageInfractions ++; //kick player for spamming and prevent connection if they've done this several times if(player.getInfo().messageInfractions >= Config.messageSpamKick.num() && Config.messageSpamKick.num() != 0){ - player.con().kick("You have been kicked for spamming.", 1000 * 60 * 2); + player.con.kick("You have been kicked for spamming.", 1000 * 60 * 2); } return null; }else{ diff --git a/core/src/mindustry/net/NetworkIO.java b/core/src/mindustry/net/NetworkIO.java index c8f5d5de15..257fc35b07 100644 --- a/core/src/mindustry/net/NetworkIO.java +++ b/core/src/mindustry/net/NetworkIO.java @@ -64,7 +64,7 @@ public class NetworkIO{ } public static ByteBuffer writeServerData(){ - String name = (headless ? Config.name.string() : player.name()); + String name = (headless ? Config.name.string() : player.name); String description = headless && !Config.desc.string().equals("off") ? Config.desc.string() : ""; String map = state.map.name(); diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java index fcd62af0b8..60d0926e2e 100644 --- a/core/src/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/mindustry/ui/dialogs/JoinDialog.java @@ -263,7 +263,7 @@ public class JoinDialog extends BaseDialog{ Core.settings.put("name", text); }).grow().pad(8).get().setMaxLength(maxNameLength); }else{ - t.add(player.name()).update(l -> l.setColor(player.color())).grow().pad(8); + t.add(player.name).update(l -> l.setColor(player.color())).grow().pad(8); } ImageButton button = t.button(Tex.whiteui, Styles.clearFulli, 40, () -> { @@ -379,7 +379,7 @@ public class JoinDialog extends BaseDialog{ } public void connect(String ip, int port){ - if(player.name().trim().isEmpty()){ + if(player.name.trim().isEmpty()){ ui.showInfo("$noname"); return; } diff --git a/core/src/mindustry/ui/dialogs/TraceDialog.java b/core/src/mindustry/ui/dialogs/TraceDialog.java index d01d5376d3..f6d1a6a5f6 100644 --- a/core/src/mindustry/ui/dialogs/TraceDialog.java +++ b/core/src/mindustry/ui/dialogs/TraceDialog.java @@ -22,7 +22,7 @@ public class TraceDialog extends BaseDialog{ table.defaults().pad(1); table.defaults().left(); - table.add(Core.bundle.format("trace.playername", player.name())); + table.add(Core.bundle.format("trace.playername", player.name)); table.row(); table.add(Core.bundle.format("trace.ip", info.ip)); table.row(); diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java index 2c6877e7fb..6d6693be17 100644 --- a/core/src/mindustry/ui/fragments/HudFragment.java +++ b/core/src/mindustry/ui/fragments/HudFragment.java @@ -672,12 +672,12 @@ public class HudFragment extends Fragment{ } private boolean canSkipWave(){ - return state.rules.waves && ((net.server() || player.admin()) || !net.active()) && state.enemies == 0 && !spawner.isSpawning() && !state.rules.tutorial; + return state.rules.waves && ((net.server() || player.admin) || !net.active()) && state.enemies == 0 && !spawner.isSpawning() && !state.rules.tutorial; } private void addPlayButton(Table table){ table.right().button(Icon.play, Styles.righti, 30f, () -> { - if(net.client() && player.admin()){ + if(net.client() && player.admin){ Call.onAdminRequest(player, AdminAction.wave); }else if(inLaunchWave()){ ui.showConfirm("$confirm", "$launch.skip.confirm", () -> !canSkipWave(), () -> state.wavetime = 0f); diff --git a/core/src/mindustry/ui/fragments/PlayerListFragment.java b/core/src/mindustry/ui/fragments/PlayerListFragment.java index fca3153bf4..c7f4621e62 100644 --- a/core/src/mindustry/ui/fragments/PlayerListFragment.java +++ b/core/src/mindustry/ui/fragments/PlayerListFragment.java @@ -77,7 +77,7 @@ public class PlayerListFragment extends Fragment{ Groups.player.sort(Structs.comparing(Player::team)); Groups.player.each(user -> { found = true; - NetConnection connection = user.con(); + NetConnection connection = user.con; if(connection == null && net.server() && !user.isLocal()) return; if(sField.getText().length() > 0 && !user.name().toLowerCase().contains(sField.getText().toLowerCase()) && !Strings.stripColors(user.name().toLowerCase()).contains(sField.getText().toLowerCase())) return; @@ -104,9 +104,9 @@ public class PlayerListFragment extends Fragment{ button.labelWrap("[#" + user.color().toString().toUpperCase() + "]" + user.name()).width(170f).pad(10); button.add().grow(); - button.image(Icon.admin).visible(() -> user.admin() && !(!user.isLocal() && net.server())).padRight(5).get().updateVisibility(); + button.image(Icon.admin).visible(() -> user.admin && !(!user.isLocal() && net.server())).padRight(5).get().updateVisibility(); - if((net.server() || player.admin()) && !user.isLocal() && (!user.admin() || net.server())){ + if((net.server() || player.admin) && !user.isLocal() && (!user.admin || net.server())){ button.add().growY(); float bs = (h) / 2f; @@ -115,9 +115,13 @@ public class PlayerListFragment extends Fragment{ t.defaults().size(bs); t.button(Icon.hammer, Styles.clearPartiali, - () -> ui.showConfirm("$confirm", Core.bundle.format("confirmban", user.name()), () -> Call.onAdminRequest(user, AdminAction.ban))); + () -> { + ui.showConfirm("$confirm", Core.bundle.format("confirmban", user.name()), () -> Call.onAdminRequest(user, AdminAction.ban)); + }); t.button(Icon.cancel, Styles.clearPartiali, - () -> ui.showConfirm("$confirm", Core.bundle.format("confirmkick", user.name()), () -> Call.onAdminRequest(user, AdminAction.kick))); + () -> { + ui.showConfirm("$confirm", Core.bundle.format("confirmkick", user.name()), () -> Call.onAdminRequest(user, AdminAction.kick)); + }); t.row(); @@ -131,19 +135,23 @@ public class PlayerListFragment extends Fragment{ }else{ ui.showConfirm("$confirm", Core.bundle.format("confirmadmin", user.name()), () -> netServer.admins.adminPlayer(id, user.usid())); } - }).update(b -> b.setChecked(user.admin())) + }).update(b -> b.setChecked(user.admin)) .disabled(b -> net.client()) .touchable(() -> net.client() ? Touchable.disabled : Touchable.enabled) - .checked(user.admin()); + .checked(user.admin); t.button(Icon.zoom, Styles.clearPartiali, () -> Call.onAdminRequest(user, AdminAction.trace)); }).padRight(12).size(bs + 10f, bs); - }else if(!user.isLocal() && !user.admin() && net.client() && Groups.player.size() >= 3 && player.team() == user.team()){ //votekick + }else if(!user.isLocal() && !user.admin && net.client() && Groups.player.size() >= 3 && player.team() == user.team()){ //votekick button.add().growY(); button.button(Icon.hammer, Styles.clearPartiali, - () -> ui.showConfirm("$confirm", Core.bundle.format("confirmvotekick", user.name()), () -> Call.sendChatMessage("/votekick " + user.name()))).size(h); + () -> { + ui.showConfirm("$confirm", Core.bundle.format("confirmvotekick", user.name()), () -> { + Call.sendChatMessage("/votekick " + user.name()); + }); + }).size(h); } content.add(button).padBottom(-6).width(350f).maxHeight(h + 14); diff --git a/desktop/src/mindustry/desktop/DesktopLauncher.java b/desktop/src/mindustry/desktop/DesktopLauncher.java index ce8c3fb2bf..cb0a3a9b84 100644 --- a/desktop/src/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/mindustry/desktop/DesktopLauncher.java @@ -129,7 +129,7 @@ public class DesktopLauncher extends ClientLauncher{ Events.on(ClientLoadEvent.class, event -> { player.name(SVars.net.friends.getPersonaName()); Core.settings.defaults("name", SVars.net.friends.getPersonaName()); - Core.settings.put("name", player.name()); + Core.settings.put("name", player.name); //update callbacks Core.app.addListener(new ApplicationListener(){ @Override diff --git a/desktop/src/mindustry/desktop/steam/SNet.java b/desktop/src/mindustry/desktop/steam/SNet.java index e264932666..b18272e652 100644 --- a/desktop/src/mindustry/desktop/steam/SNet.java +++ b/desktop/src/mindustry/desktop/steam/SNet.java @@ -345,7 +345,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback, if(result == SteamResult.OK){ currentLobby = steamID; - smat.setLobbyData(steamID, "name", player.name()); + smat.setLobbyData(steamID, "name", player.name); smat.setLobbyData(steamID, "mapname", state.map.name()); smat.setLobbyData(steamID, "version", Version.build + ""); smat.setLobbyData(steamID, "versionType", Version.type); diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index aaa61df39d..7848e7f757 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -609,8 +609,8 @@ public class ServerControl implements ApplicationListener{ for(Player player : Groups.player){ if(netServer.admins.isIDBanned(player.uuid())){ - Call.sendMessage("[scarlet] " + player.name() + " has been banned."); - player.con().kick(KickReason.banned); + Call.sendMessage("[scarlet] " + player.name + " has been banned."); + player.con.kick(KickReason.banned); } } }); @@ -893,7 +893,7 @@ public class ServerControl implements ApplicationListener{ logic.play(); for(Player p : players){ - if(p.con() == null) continue; + if(p.con == null) continue; p.reset(); if(state.rules.pvp){