refactor: adjust for restructured Health v2.0.0-SNAPSHOT (#79)

Terasology · Apr 18, 2021 · b0d6f76 · b0d6f76
1 parent 02bf8fd
commit b0d6f76
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 11 deletions.
diff --git a/module.txt b/module.txt
@@ -5,12 +5,31 @@
     "displayName": "CombatSystem",
     "description": "This module introduces combat system",
     "dependencies": [
-        { "id": "CoreAssets", "minVersion": "2.0.1" },
-        { "id": "CoreWorlds", "minVersion": "1.1.0", "maxVersion": "3.0.0" },
-        { "id": "Health", "minVersion": "1.0.0" },
-        { "id": "Inventory", "minVersion": "1.1.0" },
-        { "id": "Sensors", "minVersion": "1.0.0" },
-        { "id": "StructureTemplates", "minVersion": "1.0.0" }
+        {
+            "id": "CoreAssets",
+            "minVersion": "2.0.1"
+        },
+        {
+            "id": "CoreWorlds",
+            "minVersion": "1.1.0",
+            "maxVersion": "3.0.0"
+        },
+        {
+            "id": "Health",
+            "minVersion": "2.0.0-SNAPSHOT"
+        },
+        {
+            "id": "Inventory",
+            "minVersion": "1.1.0"
+        },
+        {
+            "id": "Sensors",
+            "minVersion": "1.0.0"
+        },
+        {
+            "id": "StructureTemplates",
+            "minVersion": "1.0.0"
+        }
     ],
     "serverSideOnly": false,
     "isAsset": true,

diff --git a/src/main/java/org/terasology/combatSystem/hurting/HurtingHandlingSystem.java b/src/main/java/org/terasology/combatSystem/hurting/HurtingHandlingSystem.java
@@ -9,8 +9,8 @@
 import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.health.HealthComponent;
-import org.terasology.logic.health.event.DoDamageEvent;
+import org.terasology.module.health.components.HealthComponent;
+import org.terasology.module.health.events.DoDamageEvent;
 import org.terasology.engine.logic.notifications.NotificationMessageEvent;
 
 import java.util.Random;

diff --git a/src/main/java/org/terasology/combatSystem/weaponFeatures/systems/LegacyShootSystem.java b/src/main/java/org/terasology/combatSystem/weaponFeatures/systems/LegacyShootSystem.java
@@ -28,7 +28,7 @@
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.logic.common.ActivateEvent;
-import org.terasology.logic.health.event.DoDamageEvent;
+import org.terasology.module.health.events.DoDamageEvent;
 import org.terasology.engine.logic.location.LocationComponent;
 import org.terasology.engine.physics.CollisionGroup;
 import org.terasology.engine.physics.HitResult;

diff --git a/...sology/combatSystem/weaponFeatures/systems/collisionHandling/ExplosionHandlingSystem.java b/...sology/combatSystem/weaponFeatures/systems/collisionHandling/ExplosionHandlingSystem.java
@@ -18,7 +18,7 @@
 import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
 import org.terasology.engine.logic.health.DestroyEvent;
 import org.terasology.engine.logic.health.EngineDamageTypes;
-import org.terasology.logic.health.HealthComponent;
+import org.terasology.module.health.components.HealthComponent;
 import org.terasology.engine.logic.location.LocationComponent;
 import org.terasology.engine.physics.Physics;
 import org.terasology.engine.registry.In;

diff --git a/...asology/combatSystem/weaponFeatures/systems/collisionHandling/StickingHandlingSystem.java b/...asology/combatSystem/weaponFeatures/systems/collisionHandling/StickingHandlingSystem.java
@@ -19,7 +19,7 @@
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
-import org.terasology.logic.health.BlockDamagedComponent;
+import org.terasology.module.health.components.BlockDamagedComponent;
 import org.terasology.engine.logic.health.DestroyEvent;
 import org.terasology.engine.logic.health.EngineDamageTypes;
 import org.terasology.engine.logic.location.Location;