Merge remote-tracking branch 'origin/develop' into chore/gestalt-v7-m…

…igration
Terasology · Apr 20, 2021 · 067464a · 067464a
2 parents dd43a5c + d5d72a6
commit 067464a
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 60 deletions.
diff --git a/assets/prefabs/items/WoodenCup.prefab b/assets/prefabs/items/WoodenCup.prefab
@@ -8,7 +8,7 @@
     "name": "Wooden Cup"
   },
   "FluidContainerItem": {
-    "maxVolume": 300,
+    "maxVolume": 50,
     "emptyTexture": "ManualLabor:ManualLabor#WoodenCup",
     "textureWithHole": "ManualLabor:ManualLabor#WoodenCupFluid",
     "fluidMinPerc": [0.3125,0.375],
@@ -17,7 +17,7 @@
   "ConsumableFluidContainerItem": {},
   "ItemHelp": {
     "paragraphText": [
-      "The wooden cup can hold 300 mL of liquid to quench anyone's thirst."
+      "The wooden cup can hold 50 mL of liquid to quench anyone's thirst."
     ]
   }
 }
diff --git a/module.txt b/module.txt
@@ -1,59 +1,59 @@
 {
-  "id": "ManualLabor",
-  "version": "1.4.0-SNAPSHOT",
-  "author": "Josharias",
-  "displayName": "Manual Labor",
-  "description": "Adds tools to make manual tasks like digging and chopping easier.",
-  "dependencies": [
-    {
-      "id": "CoreAssets",
-      "minVersion": "2.0.1"
-    },
-    {
-      "id": "Drops",
-      "minVersion": "1.0.1"
-    },
-    {
-      "id": "Durability",
-      "minVersion": "1.1.0"
-    },
-    {
-      "id": "EdibleSubstance",
-      "minVersion": "1.0.0"
-    },
-    {
-      "id": "Health",
-      "minVersion": "1.0.0"
-    },
-    {
-      "id": "InGameHelp",
-      "minVersion": "1.1.0"
-    },
-    {
-      "id": "Inventory",
-      "minVersion": "1.1.0"
-    },
-    {
-      "id": "ItemRendering",
-      "minVersion": "1.1.0"
-    },
-    {
-      "id": "Machines",
-      "minVersion": "1.2.0"
-    },
-    {
-      "id": "SubstanceMatters",
-      "minVersion": "2.0.0"
-    },
-    {
-      "id": "WildAnimals",
-      "minVersion": "1.0.0"
-    },
-    {
-      "id": "Workstation",
-      "minVersion": "1.1.0"
-    }
-  ],
-  "isAsset": true,
-  "isLibrary": true
+    "id": "ManualLabor",
+    "version": "1.4.0-SNAPSHOT",
+    "author": "Josharias",
+    "displayName": "Manual Labor",
+    "description": "Adds tools to make manual tasks like digging and chopping easier.",
+    "dependencies": [
+        {
+            "id": "CoreAssets",
+            "minVersion": "2.0.1"
+        },
+        {
+            "id": "Drops",
+            "minVersion": "1.0.1"
+        },
+        {
+            "id": "Durability",
+            "minVersion": "1.1.0"
+        },
+        {
+            "id": "EdibleSubstance",
+            "minVersion": "1.0.0"
+        },
+        {
+            "id": "Health",
+            "minVersion": "2.0.0-SNAPSHOT"
+        },
+        {
+            "id": "InGameHelp",
+            "minVersion": "1.1.0"
+        },
+        {
+            "id": "Inventory",
+            "minVersion": "1.1.0"
+        },
+        {
+            "id": "ItemRendering",
+            "minVersion": "1.1.0"
+        },
+        {
+            "id": "Machines",
+            "minVersion": "1.2.0"
+        },
+        {
+            "id": "SubstanceMatters",
+            "minVersion": "2.0.0"
+        },
+        {
+            "id": "WildAnimals",
+            "minVersion": "1.0.0"
+        },
+        {
+            "id": "Workstation",
+            "minVersion": "1.1.0"
+        }
+    ],
+    "isAsset": true,
+    "isLibrary": true
 }
diff --git a/src/main/java/org/terasology/manualLabor/systems/BonusToolDamageSystem.java b/src/main/java/org/terasology/manualLabor/systems/BonusToolDamageSystem.java
@@ -7,7 +7,7 @@
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
-import org.terasology.logic.health.event.BeforeDamagedEvent;
+import org.terasology.module.health.events.BeforeDamagedEvent;
 import org.terasology.module.inventory.ui.GetItemTooltip;
 import org.terasology.engine.world.block.BlockComponent;
 import org.terasology.engine.world.block.entity.damage.BlockDamageModifierComponent;