db -> units

devs-immortal · Aug 14, 2022 · adf34c1 · adf34c1
1 parent 150b4b2
commit adf34c1
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 5 deletions.
diff --git a/src/main/resources/assets/primeval/lang/en_us.json b/src/main/resources/assets/primeval/lang/en_us.json
@@ -255,7 +255,7 @@
     "category.primeval.open_fire": "Open Fire Cooking",
 
 
-    "text.primeval.fluid.contains": "Contains %ddb of %s",
+    "text.primeval.fluid.contains": "Contains %d Units of %s",
     "text.primeval.size.small": "Small",
     "text.primeval.size.medium": "Medium",
     "text.primeval.size.large": "Large",

diff --git a/src/main/resources/data/primeval/loot_tables/blocks/spruce_trunk.json b/src/main/resources/data/primeval/loot_tables/blocks/spruce_trunk.json
@@ -2,8 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1.0,
-      "bonus_rolls": 0.0,
+      "rolls": 1,
+      "bonus_rolls": 0,
       "entries": [
         {
           "type": "minecraft:item",
@@ -12,9 +12,79 @@
       ],
       "conditions": [
         {
-          "condition": "minecraft:survives_explosion"
+          "condition": "minecraft:block_state_property",
+          "block": "primeval:spruce_trunk",
+          "properties": {
+            "size": "0"
+          }
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "primeval:spruce_log"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:block_state_property",
+          "block": "primeval:spruce_trunk",
+          "properties": {
+            "size": "1"
+          }
+        },
+        {
+          "condition": "minecraft:random_chance",
+          "chance": 0.8
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "primeval:spruce_log"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:block_state_property",
+          "block": "primeval:spruce_trunk",
+          "properties": {
+            "size": "2"
+          }
+        },
+        {
+          "condition": "minecraft:random_chance",
+          "chance": 0.65
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "primeval:spruce_log"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:block_state_property",
+          "block": "primeval:spruce_trunk",
+          "properties": {
+            "size": "3"
+          }
+        },
+        {
+          "condition": "minecraft:random_chance",
+          "chance": 0.5
         }
       ]
     }
   ]
-}
+}