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

Terasology-Archived · Apr 18, 2021 · a695572 · a695572
1 parent b3c212f
commit a695572
Show file tree

Hide file tree

Showing 5 changed files with 97 additions and 27 deletions.
diff --git a/module.txt b/module.txt
@@ -5,29 +5,99 @@
     "displayName": "Wood and Stone",
     "description": "Basic 'Stone Age' crafting",
     "dependencies": [
-        { "id": "AlterationEffects", "minVersion": "1.1.0" },
-        { "id": "AnotherWorld", "minVersion": "1.0.0" },
-        { "id": "AnotherWorldPlants", "minVersion": "1.0.0" },
-        { "id": "BiomesAPI", "minVersion": "4.0.0" },
-        { "id": "ClimateConditions", "minVersion": "1.0.0" },
-        { "id": "CombatSystem", "minVersion": "1.0.0" },
-        { "id": "CoreAssets", "minVersion": "2.0.1" },
-        { "id": "CoreWorlds", "minVersion": "1.1.0", "maxVersion": "3.0.0" },
-        { "id": "Drops", "minVersion": "1.0.1" },
-        { "id": "Fences", "minVersion": "1.0.0" },
-        { "id": "Fluid", "minVersion": "1.1.0" },
-        { "id": "Genome", "minVersion": "1.0.1-SNAPSHOT" },
-        { "id": "GrowingFlora", "minVersion": "1.0.0" },
-        { "id": "Health", "minVersion": "1.0.0" },
-        { "id": "Hunger", "minVersion": "1.1.0" },
-        { "id": "Inventory", "minVersion": "1.1.0" },
-        { "id": "Journal", "minVersion": "1.0.0" },
-        { "id": "MultiBlock", "minVersion": "1.1.0" },
-        { "id": "NameGenerator", "minVersion": "1.0.0" },
-        { "id": "PlantPack", "minVersion": "1.1.0" },
-        { "id": "Seasons", "minVersion": "1.0.0" },
-        { "id": "StructuralResources", "minVersion": "2.1.0" },
-        { "id": "Workstation", "minVersion": "1.1.0" }
+        {
+            "id": "AlterationEffects",
+            "minVersion": "1.1.0"
+        },
+        {
+            "id": "AnotherWorld",
+            "minVersion": "1.0.0"
+        },
+        {
+            "id": "AnotherWorldPlants",
+            "minVersion": "1.0.0"
+        },
+        {
+            "id": "BiomesAPI",
+            "minVersion": "4.0.0"
+        },
+        {
+            "id": "ClimateConditions",
+            "minVersion": "1.0.0"
+        },
+        {
+            "id": "CombatSystem",
+            "minVersion": "1.0.0"
+        },
+        {
+            "id": "CoreAssets",
+            "minVersion": "2.0.1"
+        },
+        {
+            "id": "CoreWorlds",
+            "minVersion": "1.1.0",
+            "maxVersion": "3.0.0"
+        },
+        {
+            "id": "Drops",
+            "minVersion": "1.0.1"
+        },
+        {
+            "id": "Fences",
+            "minVersion": "1.0.0"
+        },
+        {
+            "id": "Fluid",
+            "minVersion": "1.1.0"
+        },
+        {
+            "id": "Genome",
+            "minVersion": "1.0.1-SNAPSHOT"
+        },
+        {
+            "id": "GrowingFlora",
+            "minVersion": "1.0.0"
+        },
+        {
+            "id": "Health",
+            "minVersion": "2.0.0-SNAPSHOT"
+        },
+        {
+            "id": "Hunger",
+            "minVersion": "1.1.0"
+        },
+        {
+            "id": "Inventory",
+            "minVersion": "1.1.0"
+        },
+        {
+            "id": "Journal",
+            "minVersion": "1.0.0"
+        },
+        {
+            "id": "MultiBlock",
+            "minVersion": "1.1.0"
+        },
+        {
+            "id": "NameGenerator",
+            "minVersion": "1.0.0"
+        },
+        {
+            "id": "PlantPack",
+            "minVersion": "1.1.0"
+        },
+        {
+            "id": "Seasons",
+            "minVersion": "1.0.0"
+        },
+        {
+            "id": "StructuralResources",
+            "minVersion": "2.1.0"
+        },
+        {
+            "id": "Workstation",
+            "minVersion": "1.1.0"
+        }
     ],
     "isServerSideOnly": false,
     "isLibrary": true

diff --git a/src/main/java/org/terasology/herbalism/effect/HealEffect.java b/src/main/java/org/terasology/herbalism/effect/HealEffect.java
@@ -16,7 +16,7 @@
 package org.terasology.herbalism.effect;
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.logic.health.event.DoRestoreEvent;
+import org.terasology.module.health.events.DoRestoreEvent;
 import org.terasology.herbalism.HerbEffect;
 import org.terasology.math.TeraMath;
 

diff --git a/src/main/java/org/terasology/npcAI/system/AggroSystem.java b/src/main/java/org/terasology/npcAI/system/AggroSystem.java
@@ -23,7 +23,7 @@
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
-import org.terasology.logic.health.event.OnDamagedEvent;
+import org.terasology.module.health.events.OnDamagedEvent;
 import org.terasology.engine.monitoring.PerformanceMonitor;
 import org.terasology.engine.registry.In;
 import org.terasology.math.TeraMath;

diff --git a/src/main/java/org/terasology/rpgAttributes/system/RpgAttributesSystem.java b/src/main/java/org/terasology/rpgAttributes/system/RpgAttributesSystem.java
@@ -21,7 +21,7 @@
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.logic.characters.GetMaxSpeedEvent;
-import org.terasology.logic.health.event.BeforeDamagedEvent;
+import org.terasology.module.health.events.BeforeDamagedEvent;
 import org.terasology.engine.registry.In;
 import org.terasology.rpgAttributes.RPG;
 import org.terasology.rpgAttributes.component.AgilityComponent;

diff --git a/src/main/java/org/terasology/was/system/ModifyBlockDestruction.java b/src/main/java/org/terasology/was/system/ModifyBlockDestruction.java
@@ -9,7 +9,7 @@
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.logic.characters.CharacterComponent;
-import org.terasology.logic.health.event.BeforeDamagedEvent;
+import org.terasology.module.health.events.BeforeDamagedEvent;
 import org.terasology.engine.world.block.Block;
 import org.terasology.engine.world.block.BlockComponent;
 import org.terasology.engine.world.block.BlockUri;