From bf5cdbfbe65ff58fd49fb94e7252ec6974154608 Mon Sep 17 00:00:00 2001
From: Tobias Nett <skaldarnar@googlemail.com>
Date: Sat, 17 Apr 2021 20:53:41 +0200
Subject: [PATCH] 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 https://github.com/Terasology/Health/pull/78
---
 module.txt                                    | 31 +++++++++++++++----
 .../blocks/RailsBlockFamilyUpdateSystem.java  |  2 +-
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/module.txt b/module.txt
index 07b6731..6577417 100644
--- a/module.txt
+++ b/module.txt
@@ -6,12 +6,31 @@
     "description": "A module that adds rails and carts.",
     "serverSideOnly": false,
     "dependencies": [
-        { "id": "CoreAssets", "minVersion": "2.0.1" },
-        { "id": "Drops", "minVersion": "1.0.1" },
-        { "id": "Health", "minVersion": "1.0.0" },
-        { "id": "Inventory", "minVersion": "1.1.0" },
-        { "id": "ModuleTestingEnvironment", "minVersion": "0.2.0", "optional": true },
-        { "id": "SegmentedPaths", "minVersion": "1.0.0" }
+        {
+            "id": "CoreAssets",
+            "minVersion": "2.0.1"
+        },
+        {
+            "id": "Drops",
+            "minVersion": "1.0.1"
+        },
+        {
+            "id": "Health",
+            "minVersion": "2.0.0-SNAPSHOT"
+        },
+        {
+            "id": "Inventory",
+            "minVersion": "1.1.0"
+        },
+        {
+            "id": "ModuleTestingEnvironment",
+            "minVersion": "0.2.0",
+            "optional": true
+        },
+        {
+            "id": "SegmentedPaths",
+            "minVersion": "1.0.0"
+        }
     ],
     "isAsset": true,
     "isLibrary": true
diff --git a/src/main/java/org/terasology/minecarts/blocks/RailsBlockFamilyUpdateSystem.java b/src/main/java/org/terasology/minecarts/blocks/RailsBlockFamilyUpdateSystem.java
index 339bc38..a899d88 100644
--- a/src/main/java/org/terasology/minecarts/blocks/RailsBlockFamilyUpdateSystem.java
+++ b/src/main/java/org/terasology/minecarts/blocks/RailsBlockFamilyUpdateSystem.java
@@ -19,7 +19,7 @@
 import org.terasology.engine.logic.common.ActivateEvent;
 import org.terasology.engine.logic.health.DoDestroyEvent;
 import org.terasology.engine.logic.health.EngineDamageTypes;
-import org.terasology.logic.health.event.DoDamageEvent;
+import org.terasology.module.health.events.DoDamageEvent;
 import org.terasology.engine.logic.inventory.ItemComponent;
 import org.terasology.engine.math.Side;
 import org.terasology.engine.math.SideBitFlag;