refactor: adjust for restructured Health v2.0.0-SNAPSHOT

- bump version for Health to 2.0.0-SNAPSHOT - adjust imports (auto-refactoring done by IntelliJ) Depends on Terasology/Health#78
Terasology · Apr 17, 2021 · 0da9abb · 0da9abb
1 parent 6afbc53
commit 0da9abb
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 37 deletions.
diff --git a/module.txt b/module.txt
@@ -1,37 +1,37 @@
 {
-  "id": "Equipment",
-  "version": "1.3.0-SNAPSHOT",
-  "author": "XTariq, Aditya Singh, ElBatanony, Gautam Naik, iojw (Isaac), Mandar Juvekar, gkaretka, Patrick Wang, smsunarto, Arpit Kamboj(digitalripperynr), Tim Verhaegen (xTimPugz), kallentu, Minege, NicholasBatesNZ,SufurElite, He Who Shall Not Be Named (VaibhavBajaj), meganyyu, PokeyOne, Marvel0usx",
-  "displayName": "Equipment",
-  "description": "A basic system allowing for characters to have equipment.\n\nAlso, lots of equipment assets.",
-  "dependencies": [
-    {
-      "id": "AlterationEffects",
-      "minVersion": "1.1.0"
-    },
-    {
-      "id": "ClimateConditions",
-      "minVersion": "1.0.0"
-    },
-    {
-      "id": "Health",
-      "minVersion": "1.0.0"
-    },
-    {
-      "id": "Inventory",
-      "minVersion": "1.1.0"
-    },
-    {
-      "id": "ManualLabor",
-      "minVersion": "1.3.0",
-      "optional": true
-    },
-    {
-      "id": "PhysicalStats",
-      "minVersion": "1.0.0"
-    }
-  ],
-  "serverSideOnly": false,
-  "isLibrary": true,
-  "isAsset": true
+    "id": "Equipment",
+    "version": "1.3.0-SNAPSHOT",
+    "author": "XTariq, Aditya Singh, ElBatanony, Gautam Naik, iojw (Isaac), Mandar Juvekar, gkaretka, Patrick Wang, smsunarto, Arpit Kamboj(digitalripperynr), Tim Verhaegen (xTimPugz), kallentu, Minege, NicholasBatesNZ,SufurElite, He Who Shall Not Be Named (VaibhavBajaj), meganyyu, PokeyOne, Marvel0usx",
+    "displayName": "Equipment",
+    "description": "A basic system allowing for characters to have equipment.\n\nAlso, lots of equipment assets.",
+    "dependencies": [
+        {
+            "id": "AlterationEffects",
+            "minVersion": "1.1.0"
+        },
+        {
+            "id": "ClimateConditions",
+            "minVersion": "1.0.0"
+        },
+        {
+            "id": "Health",
+            "minVersion": "2.0.0-SNAPSHOT"
+        },
+        {
+            "id": "Inventory",
+            "minVersion": "1.1.0"
+        },
+        {
+            "id": "ManualLabor",
+            "minVersion": "1.3.0",
+            "optional": true
+        },
+        {
+            "id": "PhysicalStats",
+            "minVersion": "1.0.0"
+        }
+    ],
+    "serverSideOnly": false,
+    "isLibrary": true,
+    "isAsset": true
 }
diff --git a/src/main/java/org/terasology/equipment/system/EquipmentEffectsSystem.java b/src/main/java/org/terasology/equipment/system/EquipmentEffectsSystem.java
@@ -41,7 +41,7 @@
 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.event.BeforeDamagedEvent;
+import org.terasology.module.health.events.BeforeDamagedEvent;
 import org.terasology.engine.registry.In;
 import org.terasology.equipment.component.EquipmentComponent;
 import org.terasology.equipment.component.EquipmentEffectComponent;

diff --git a/src/main/java/org/terasology/equipment/system/EquipmentSystem.java b/src/main/java/org/terasology/equipment/system/EquipmentSystem.java
@@ -12,7 +12,7 @@
 import org.terasology.engine.logic.characters.CharacterComponent;
 import org.terasology.engine.logic.common.DisplayNameComponent;
 import org.terasology.engine.logic.health.DoDestroyEvent;
-import org.terasology.logic.health.event.BeforeDamagedEvent;
+import org.terasology.module.health.events.BeforeDamagedEvent;
 import org.terasology.module.inventory.components.InventoryComponent;
 import org.terasology.module.inventory.systems.InventoryManager;
 import org.terasology.module.inventory.systems.InventoryUtils;