Merge pull request #2 from scellecs/morpeh-2023

SH42913 · web-flow · commit cec2fa99b401 · 2023-09-16T11:10:39.000+03:00
Up to Morpeh 2023
diff --git a/Assets/Plugins.meta b/Assets/Plugins.meta
diff --git a/Assets/Plugins/Sirenix.meta b/Assets/Plugins/Sirenix.meta
diff --git a/Assets/Tanks.Code/Bases/TeamBaseDestroySystem.cs b/Assets/Tanks.Code/Bases/TeamBaseDestroySystem.cs
@@ -12,7 +12,7 @@ public sealed class TeamBaseDestroySystem : UpdateSystem {
         private Filter destroyedBases;
 
         public override void OnAwake() {
-            destroyedBases = World.Filter.With<TeamBase>().With<InTeam>().With<IsDeadMarker>();
+            destroyedBases = World.Filter.With<TeamBase>().With<InTeam>().With<IsDeadMarker>().Build();
         }
 
         public override void OnUpdate(float deltaTime) {
diff --git a/Assets/Tanks.Code/Bases/TeamBaseInitSystem.cs b/Assets/Tanks.Code/Bases/TeamBaseInitSystem.cs
@@ -9,7 +9,7 @@ public sealed class TeamBaseInitSystem : UpdateSystem {
         private Filter filter;
 
         public override void OnAwake() {
-            filter = World.Filter.With<TeamBase>().With<InTeam>().Without<InitializedMarker>();
+            filter = World.Filter.With<TeamBase>().With<InTeam>().Without<InitializedMarker>().Build();
         }
 
         public override void OnUpdate(float deltaTime) {
diff --git a/Assets/Tanks.Code/Collisions/CollisionInitSystem.cs b/Assets/Tanks.Code/Collisions/CollisionInitSystem.cs
@@ -14,10 +14,10 @@ public sealed class CollisionInitSystem : FixedUpdateSystem {
         private Filter walls;
 
         public override void OnAwake() {
-            tanks = World.Filter.With<Tank>().Without<CanCollide>();
-            bullets = World.Filter.With<Bullet>().Without<CanCollide>();
-            walls = World.Filter.With<Wall>().Without<CanCollide>();
-            bases = World.Filter.With<TeamBase>().Without<CanCollide>();
+            tanks = World.Filter.With<Tank>().Without<CanCollide>().Build();
+            bullets = World.Filter.With<Bullet>().Without<CanCollide>().Build();
+            walls = World.Filter.With<Wall>().Without<CanCollide>().Build();
+            bases = World.Filter.With<TeamBase>().Without<CanCollide>().Build();
         }
 
         public override void OnUpdate(float deltaTime) {
diff --git a/Assets/Tanks.Code/GameInput/GameInputSystem.cs b/Assets/Tanks.Code/GameInput/GameInputSystem.cs
@@ -17,7 +17,7 @@ public sealed class GameInputSystem : UpdateSystem {
 
         public override void OnAwake() {
             World.GetStash<GameUser>().AsDisposable();
-            users = World.Filter.With<GameUser>();
+            users = World.Filter.With<GameUser>().Build();
             userCounter = 0;
 
             unpairedDeviceUsedDelegate = OnUnpairedDeviceUsed;
diff --git a/Assets/Tanks.Code/GameUserTankCreateSystem.cs b/Assets/Tanks.Code/GameUserTankCreateSystem.cs
@@ -12,7 +12,7 @@ public sealed class GameUserTankCreateSystem : UpdateSystem {
         private Filter filter;
 
         public override void OnAwake() {
-            filter = World.Filter.With<GameUser>().Without<UserWithTank>();
+            filter = World.Filter.With<GameUser>().Without<UserWithTank>().Build();
         }
 
         public override void OnUpdate(float deltaTime) {
diff --git a/Assets/Tanks.Code/Healthcare/DamageCleanSystem.cs b/Assets/Tanks.Code/Healthcare/DamageCleanSystem.cs
@@ -8,7 +8,7 @@ public sealed class DamageCleanSystem : LateUpdateSystem {
         private Filter filter;
 
         public override void OnAwake() {
-            filter = World.Filter.With<DamageEvent>();
+            filter = World.Filter.With<DamageEvent>().Build();
         }
 
         public override void OnUpdate(float deltaTime) {
diff --git a/Assets/Tanks.Code/Healthcare/DamageTextSystem.cs b/Assets/Tanks.Code/Healthcare/DamageTextSystem.cs
@@ -17,7 +17,7 @@ public sealed class DamageTextSystem : UpdateSystem {
         private Filter damageEvents;
 
         public override void OnAwake() {
-            damageEvents = World.Filter.With<DamageEvent>().With<Health>();
+            damageEvents = World.Filter.With<DamageEvent>().With<Health>().Build();
         }
 
         public override void OnUpdate(float deltaTime) {
diff --git a/Assets/Tanks.Code/Healthcare/TankDestroySystem.cs b/Assets/Tanks.Code/Healthcare/TankDestroySystem.cs
@@ -11,7 +11,7 @@ public sealed class TankDestroySystem : UpdateSystem {
         private Filter destroyedTanks;
 
         public override void OnAwake() {
-            destroyedTanks = World.Filter.With<Tank>().With<IsDeadMarker>();
+            destroyedTanks = World.Filter.With<Tank>().With<IsDeadMarker>().Build();
         }
 
         public override void OnUpdate(float deltaTime) {
diff --git a/Assets/Tanks.Code/Movement/TankMovementInitSystem.cs b/Assets/Tanks.Code/Movement/TankMovementInitSystem.cs
@@ -8,7 +8,7 @@ public sealed class TankMovementInitSystem : UpdateSystem {
         private Filter tanksNoMove;
 
         public override void OnAwake() {
-            tanksNoMove = World.Filter.With<Tank>().Without<MoveDirection>();
+            tanksNoMove = World.Filter.With<Tank>().Without<MoveDirection>().Build();
         }
 
         public override void OnUpdate(float deltaTime) {
diff --git a/Assets/Tanks.Code/Scores/ScoreSystem.cs b/Assets/Tanks.Code/Scores/ScoreSystem.cs
@@ -18,8 +18,8 @@ public sealed class ScoreSystem : LateUpdateSystem {
         private Filter killEvents;
 
         public override void OnAwake() {
-            usersToInit = World.Filter.With<GameUser>().Without<UserScores>();
-            killEvents = World.Filter.With<OneMoreKillEvent>().With<ControlledByUser>();
+            usersToInit = World.Filter.With<GameUser>().Without<UserScores>().Build();
+            killEvents = World.Filter.With<OneMoreKillEvent>().With<ControlledByUser>().Build();
         }
 
         public override void OnUpdate(float deltaTime) {
diff --git a/Assets/Tanks.Code/Tanks.asmdef b/Assets/Tanks.Code/Tanks.asmdef
@@ -1,17 +1,18 @@
 {
-  "name": "Tanks",
-  "references": [
-    "Scellecs.Morpeh",
-    "Morpeh.Helpers",
-    "Unity.InputSystem"
-  ],
-  "includePlatforms": [],
-  "excludePlatforms": [],
-  "allowUnsafeCode": false,
-  "overrideReferences": false,
-  "precompiledReferences": [],
-  "autoReferenced": true,
-  "defineConstraints": [],
-  "versionDefines": [],
-  "noEngineReferences": false
+    "name": "Tanks",
+    "rootNamespace": "",
+    "references": [
+        "Scellecs.Morpeh",
+        "Unity.InputSystem",
+        "TriInspector"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }
diff --git a/Assets/Tanks.Code/Teams/GameUserBalanceTeamSystem.cs b/Assets/Tanks.Code/Teams/GameUserBalanceTeamSystem.cs
@@ -10,8 +10,8 @@ public sealed class GameUserBalanceTeamSystem : UpdateSystem {
         private Filter teams;
 
         public override void OnAwake() {
-            teams = World.Filter.With<Team>();
-            nonTeamUsers = World.Filter.With<GameUser>().Without<InTeam>();
+            teams = World.Filter.With<Team>().Build();
+            nonTeamUsers = World.Filter.With<GameUser>().Without<InTeam>().Build();
         }
 
         public override void OnUpdate(float deltaTime) {
diff --git a/Assets/Tanks.Code/Teams/TeamUserIdSystem.cs b/Assets/Tanks.Code/Teams/TeamUserIdSystem.cs
@@ -16,7 +16,7 @@ public sealed class TeamUserIdSystem : LateUpdateSystem {
 
         public override void OnAwake() {
             World.GetStash<UserIdText>().AsDisposable();
-            tanksToDisplay = World.Filter.With<Tank>().With<ControlledByUser>().Without<UserIdText>();
+            tanksToDisplay = World.Filter.With<Tank>().With<ControlledByUser>().Without<UserIdText>().Build();
         }
 
         public override void OnUpdate(float deltaTime) {
diff --git a/Assets/Tanks.Code/Teams/WinDetectSystem.cs b/Assets/Tanks.Code/Teams/WinDetectSystem.cs
@@ -13,8 +13,8 @@ public sealed class WinDetectSystem : UpdateSystem {
         private Filter winMarkers;
 
         public override void OnAwake() {
-            nonLosingTeams = World.Filter.With<Team>().Without<LosingTeamMarker>();
-            winMarkers = World.Filter.With<WinMarker>();
+            nonLosingTeams = World.Filter.With<Team>().Without<LosingTeamMarker>().Build();
+            winMarkers = World.Filter.With<WinMarker>().Build();
         }
 
         public override void OnUpdate(float deltaTime) {
diff --git a/Assets/Tanks.Code/Tests/Collisions/CollisionsTests.cs b/Assets/Tanks.Code/Tests/Collisions/CollisionsTests.cs
@@ -46,7 +46,7 @@ public void ShouldSendCollisionEventWhenSecondIsNotEntity() {
 
             SimulatePhysics(Time.fixedDeltaTime);
 
-            Filter events = testWorld.Filter.With<CollisionEvent>();
+            Filter events = testWorld.Filter.With<CollisionEvent>().Build();
             Assert.That(events.GetLengthSlow(), Is.AtLeast(1));
 
             Entity evtEntity = events.GetEntity(0);
@@ -63,7 +63,7 @@ public void ShouldSendCollisionEventsWhenSecondIsEntity() {
 
             SimulatePhysics(Time.fixedDeltaTime);
 
-            Filter events = testWorld.Filter.With<CollisionEvent>();
+            Filter events = testWorld.Filter.With<CollisionEvent>().Build();
             Assert.That(events.GetLengthSlow(), Is.AtLeast(2));
 
             foreach (Entity evtEnt in events) {
@@ -80,7 +80,7 @@ public void ShouldCleanCollisionsInLateUpdate() {
 
             RunLateUpdateSystems(1f);
 
-            Filter events = testWorld.Filter.With<CollisionEvent>();
+            Filter events = testWorld.Filter.With<CollisionEvent>().Build();
             Assert.That(events.GetLengthSlow(), Is.EqualTo(0));
         }
 
diff --git a/Assets/Tanks.Code/Tests/Weapons/BulletWeaponsTests.cs b/Assets/Tanks.Code/Tests/Weapons/BulletWeaponsTests.cs
@@ -27,7 +27,7 @@ public void SetUp() {
         public void ShouldCreateBullet() {
             Shoot();
 
-            Filter bullets = testWorld.Filter.With<Bullet>();
+            Filter bullets = testWorld.Filter.With<Bullet>().Build();
             Assert.That(bullets.GetLengthSlow(), Is.EqualTo(1));
 
             Rigidbody2D body = bullets.GetEntity(0).GetComponent<Bullet>().body;
@@ -45,7 +45,7 @@ public void ShouldIgnoreSelfColliders() {
 
             PhysicsUpdateSystem.Simulate(Time.fixedDeltaTime);
 
-            Filter events = testWorld.Filter.With<CollisionEvent>();
+            Filter events = testWorld.Filter.With<CollisionEvent>().Build();
             Assert.That(events.GetLengthSlow(), Is.EqualTo(0));
         }
 
@@ -56,7 +56,7 @@ public void ShouldShootByDirection() {
 
             Shoot();
 
-            Rigidbody2D body = testWorld.Filter.With<Bullet>().GetEntity(0).GetComponent<Bullet>().body;
+            Rigidbody2D body = testWorld.Filter.With<Bullet>().Build().GetEntity(0).GetComponent<Bullet>().body;
             Assert.That(body.rotation, Is.EqualTo(-90f));
 
             float velocityAngle = Vector2.SignedAngle(Vector2.up, body.velocity);
@@ -70,7 +70,7 @@ public IEnumerator ShouldDestroyBulletAndCollisionEventOnHit() {
             });
 
             Shoot();
-            Filter bullets = testWorld.Filter.With<Bullet>();
+            Filter bullets = testWorld.Filter.With<Bullet>().Build();
             Assume.That(bullets.GetLengthSlow(), Is.AtLeast(1));
 
             Entity bulletEntity = bullets.GetEntity(0);
@@ -91,7 +91,7 @@ public IEnumerator ShouldDestroyBulletAndCollisionEventOnHit() {
         public void ShouldApplyDamageTargetOnHit() {
             Shoot();
             Entity targetEntity = testWorld.CreateEntity();
-            Filter bullets = testWorld.Filter.With<Bullet>();
+            Filter bullets = testWorld.Filter.With<Bullet>().Build();
             Assume.That(bullets.GetLengthSlow(), Is.AtLeast(1));
 
             Entity bulletEntity = bullets.GetEntity(0);
@@ -114,7 +114,7 @@ public void ShouldNotDamageSameTeamTarget() {
             PlaceInOneTeam(tankEntity, targetEntity);
 
             Shoot();
-            Filter bullets = testWorld.Filter.With<Bullet>();
+            Filter bullets = testWorld.Filter.With<Bullet>().Build();
             Assume.That(bullets.GetLengthSlow(), Is.AtLeast(1));
 
             Entity bulletEntity = bullets.GetEntity(0);
@@ -131,7 +131,7 @@ public void ShouldNotDamageSameTeamTarget() {
         [Test]
         public void ShouldNotShootWhenReloading() {
             Shoot();
-            Filter bullets = testWorld.Filter.With<Bullet>();
+            Filter bullets = testWorld.Filter.With<Bullet>().Build();
             Assume.That(bullets.GetLengthSlow(), Is.AtLeast(1));
 
             Shoot();
@@ -143,7 +143,7 @@ public void ShouldNotShootWhenReloading() {
         public IEnumerator ShouldShootAfterReloading() {
             weaponConfig.reloadTime = 2 * Time.fixedDeltaTime;
             Shoot();
-            Filter bullets = testWorld.Filter.With<Bullet>();
+            Filter bullets = testWorld.Filter.With<Bullet>().Build();
             Assume.That(bullets.GetLengthSlow(), Is.AtLeast(1));
 
             yield return new WaitForSeconds(weaponConfig.reloadTime + 0.01f);
diff --git a/Assets/Tanks.Code/UtilSystems/TextInWorldSystem.cs b/Assets/Tanks.Code/UtilSystems/TextInWorldSystem.cs
@@ -4,7 +4,7 @@
     using Scellecs.Morpeh;
     using Scellecs.Morpeh.Helpers;
     using Scellecs.Morpeh.Systems;
-    using Sirenix.OdinInspector;
+    using TriInspector;
     using Unity.IL2CPP.CompilerServices;
     using UnityEngine;
 
@@ -18,8 +18,8 @@ public sealed class TextInWorldSystem : LateUpdateSystem {
         private Filter texts;
 
         public override void OnAwake() {
-            texts = World.Filter.With<TextInWorld>();
-            requests = World.Filter.With<Request>();
+            texts = World.Filter.With<TextInWorld>().Build();
+            requests = World.Filter.With<Request>().Build();
         }
 
         public override void OnUpdate(float deltaTime) {
diff --git a/Assets/Tanks.Code/Walls/WallDestroySystem.cs b/Assets/Tanks.Code/Walls/WallDestroySystem.cs
@@ -9,7 +9,7 @@ public sealed class WallDestroySystem : UpdateSystem {
         private Filter destroyedWalls;
 
         public override void OnAwake() {
-            destroyedWalls = World.Filter.With<Wall>().With<IsDeadMarker>();
+            destroyedWalls = World.Filter.With<Wall>().With<IsDeadMarker>().Build();
         }
 
         public override void OnUpdate(float deltaTime) {
diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -1,12 +1,13 @@
 {
   "dependencies": {
+    "com.codewriter.triinspector": "https://github.com/codewriter-packages/Tri-Inspector.git",
     "com.farco.morpeh.helpers": "https://github.com/SH42913/morpeh.helpers.git?path=/Assets/Morpeh.Helpers#master",
-    "com.scellecs.morpeh": "https://github.com/scellecs/morpeh.git#master",
+    "com.scellecs.morpeh": "https://github.com/scellecs/morpeh.git#main",
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.2d.tilemap": "1.0.0",
-    "com.unity.ide.rider": "3.0.17",
-    "com.unity.ide.visualstudio": "2.0.17",
-    "com.unity.inputsystem": "1.4.4",
+    "com.unity.ide.rider": "3.0.24",
+    "com.unity.ide.visualstudio": "2.0.20",
+    "com.unity.inputsystem": "1.5.1",
     "com.unity.render-pipelines.universal": "10.10.1",
     "com.unity.test-framework": "1.1.33",
     "com.unity.textmeshpro": "3.0.6",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
diff --git a/README.md b/README.md

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public sealed class TeamBaseDestroySystem : UpdateSystem {`
`12`	`12`	`private Filter destroyedBases;`
`13`	`13`
`14`	`14`	`public override void OnAwake() {`
`15`		`- destroyedBases = World.Filter.With<TeamBase>().With<InTeam>().With<IsDeadMarker>();`
	`15`	`+ destroyedBases = World.Filter.With<TeamBase>().With<InTeam>().With<IsDeadMarker>().Build();`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public override void OnUpdate(float deltaTime) {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public sealed class TeamBaseInitSystem : UpdateSystem {`
`9`	`9`	`private Filter filter;`
`10`	`10`
`11`	`11`	`public override void OnAwake() {`
`12`		`- filter = World.Filter.With<TeamBase>().With<InTeam>().Without<InitializedMarker>();`
	`12`	`+ filter = World.Filter.With<TeamBase>().With<InTeam>().Without<InitializedMarker>().Build();`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`public override void OnUpdate(float deltaTime) {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public sealed class GameUserTankCreateSystem : UpdateSystem {`
`12`	`12`	`private Filter filter;`
`13`	`13`
`14`	`14`	`public override void OnAwake() {`
`15`		`- filter = World.Filter.With<GameUser>().Without<UserWithTank>();`
	`15`	`+ filter = World.Filter.With<GameUser>().Without<UserWithTank>().Build();`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public override void OnUpdate(float deltaTime) {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public sealed class DamageCleanSystem : LateUpdateSystem {`
`8`	`8`	`private Filter filter;`
`9`	`9`
`10`	`10`	`public override void OnAwake() {`
`11`		`- filter = World.Filter.With<DamageEvent>();`
	`11`	`+ filter = World.Filter.With<DamageEvent>().Build();`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`public override void OnUpdate(float deltaTime) {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public sealed class DamageTextSystem : UpdateSystem {`
`17`	`17`	`private Filter damageEvents;`
`18`	`18`
`19`	`19`	`public override void OnAwake() {`
`20`		`- damageEvents = World.Filter.With<DamageEvent>().With<Health>();`
	`20`	`+ damageEvents = World.Filter.With<DamageEvent>().With<Health>().Build();`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public override void OnUpdate(float deltaTime) {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public sealed class TankDestroySystem : UpdateSystem {`
`11`	`11`	`private Filter destroyedTanks;`
`12`	`12`
`13`	`13`	`public override void OnAwake() {`
`14`		`- destroyedTanks = World.Filter.With<Tank>().With<IsDeadMarker>();`
	`14`	`+ destroyedTanks = World.Filter.With<Tank>().With<IsDeadMarker>().Build();`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`public override void OnUpdate(float deltaTime) {`