Added bleeding potions

Added shark teeth to shark loot table
hybridlabs · Apr 16, 2024 · d0128c1 · d0128c1
1 parent f86d845
commit d0128c1
Show file tree

Hide file tree

Showing 10 changed files with 224 additions and 76 deletions.
diff --git a/src/generated/resources/assets/hybrid-aquatic/lang/en_us.json b/src/generated/resources/assets/hybrid-aquatic/lang/en_us.json
@@ -19,6 +19,7 @@
   "block.hybrid-aquatic.dead_thorn_coral_fan": "Dead Thorn Coral Fan",
   "block.hybrid-aquatic.driftwood_button": "Driftwood Button",
   "block.hybrid-aquatic.driftwood_crate": "Driftwood Crate",
+  "block.hybrid-aquatic.driftwood_crate.description": "Break with an axe to open",
   "block.hybrid-aquatic.driftwood_door": "Driftwood Door",
   "block.hybrid-aquatic.driftwood_fence": "Driftwood Fence",
   "block.hybrid-aquatic.driftwood_fence_gate": "Driftwood Fence Gate",
@@ -295,15 +296,19 @@
   "item.hybrid-aquatic.yeti_crab_claw": "Yeti Crab Claw",
   "item.hybrid-aquatic.yeti_crab_spawn_egg": "Yeti Crab Spawn Egg",
   "item.hybrid-aquatic.zebra_danio_spawn_egg": "Zebra Danio Spawn Egg",
+  "item.minecraft.lingering_potion.effect.bleeding": "Lingering Potion of Bleeding",
   "item.minecraft.lingering_potion.effect.clarity": "Lingering Potion of Clarity",
   "item.minecraft.lingering_potion.effect.glowing": "Lingering Potion of Glowing",
   "item.minecraft.lingering_potion.effect.thalassophobia": "Lingering Potion of Thalassophobia",
+  "item.minecraft.potion.effect.bleeding": "Potion of Bleeding",
   "item.minecraft.potion.effect.clarity": "Potion of Clarity",
   "item.minecraft.potion.effect.glowing": "Potion of Glowing",
   "item.minecraft.potion.effect.thalassophobia": "Potion of Thalassophobia",
+  "item.minecraft.splash_potion.effect.bleeding": "Splash Potion of Bleeding",
   "item.minecraft.splash_potion.effect.clarity": "Splash Potion of Clarity",
   "item.minecraft.splash_potion.effect.glowing": "Splash Potion of Glowing",
   "item.minecraft.splash_potion.effect.thalassophobia": "Splash Potion of Thalassophobia",
+  "item.minecraft.tipped_arrow.effect.bleeding": "Arrow of Bleeding",
   "item.minecraft.tipped_arrow.effect.clarity": "Arrow of Clarity",
   "item.minecraft.tipped_arrow.effect.glowing": "Arrow of Glowing",
   "item.minecraft.tipped_arrow.effect.thalassophobia": "Arrow of Thalassophobia",

diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/bull_shark.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/bull_shark.json
@@ -0,0 +1,26 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "add": false,
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 3.0,
+                "min": 1.0
+              },
+              "function": "minecraft:set_count"
+            }
+          ],
+          "name": "hybrid-aquatic:shark_tooth"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/frilled_shark.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/frilled_shark.json
@@ -0,0 +1,26 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "add": false,
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 3.0,
+                "min": 1.0
+              },
+              "function": "minecraft:set_count"
+            }
+          ],
+          "name": "hybrid-aquatic:shark_tooth"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/great_white_shark.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/great_white_shark.json
@@ -0,0 +1,26 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "add": false,
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 3.0,
+                "min": 1.0
+              },
+              "function": "minecraft:set_count"
+            }
+          ],
+          "name": "hybrid-aquatic:shark_tooth"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/hammerhead_shark.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/hammerhead_shark.json
@@ -0,0 +1,26 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "add": false,
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 3.0,
+                "min": 1.0
+              },
+              "function": "minecraft:set_count"
+            }
+          ],
+          "name": "hybrid-aquatic:shark_tooth"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/thresher_shark.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/thresher_shark.json
@@ -0,0 +1,26 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "add": false,
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 3.0,
+                "min": 1.0
+              },
+              "function": "minecraft:set_count"
+            }
+          ],
+          "name": "hybrid-aquatic:shark_tooth"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/tiger_shark.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/tiger_shark.json
@@ -7,20 +7,6 @@
         {
           "type": "minecraft:item",
           "functions": [
-            {
-              "conditions": [
-                {
-                  "condition": "minecraft:entity_properties",
-                  "entity": "this",
-                  "predicate": {
-                    "flags": {
-                      "is_on_fire": true
-                    }
-                  }
-                }
-              ],
-              "function": "minecraft:furnace_smelt"
-            },
             {
               "add": false,
               "count": {
@@ -42,20 +28,6 @@
         {
           "type": "minecraft:item",
           "functions": [
-            {
-              "conditions": [
-                {
-                  "condition": "minecraft:entity_properties",
-                  "entity": "this",
-                  "predicate": {
-                    "flags": {
-                      "is_on_fire": true
-                    }
-                  }
-                }
-              ],
-              "function": "minecraft:furnace_smelt"
-            },
             {
               "add": false,
               "count": {
@@ -77,20 +49,6 @@
         {
           "type": "minecraft:item",
           "functions": [
-            {
-              "conditions": [
-                {
-                  "condition": "minecraft:entity_properties",
-                  "entity": "this",
-                  "predicate": {
-                    "flags": {
-                      "is_on_fire": true
-                    }
-                  }
-                }
-              ],
-              "function": "minecraft:furnace_smelt"
-            },
             {
               "add": false,
               "count": {
@@ -112,20 +70,6 @@
         {
           "type": "minecraft:item",
           "functions": [
-            {
-              "conditions": [
-                {
-                  "condition": "minecraft:entity_properties",
-                  "entity": "this",
-                  "predicate": {
-                    "flags": {
-                      "is_on_fire": true
-                    }
-                  }
-                }
-              ],
-              "function": "minecraft:furnace_smelt"
-            },
             {
               "add": false,
               "count": {
@@ -147,20 +91,6 @@
         {
           "type": "minecraft:item",
           "functions": [
-            {
-              "conditions": [
-                {
-                  "condition": "minecraft:entity_properties",
-                  "entity": "this",
-                  "predicate": {
-                    "flags": {
-                      "is_on_fire": true
-                    }
-                  }
-                }
-              ],
-              "function": "minecraft:furnace_smelt"
-            },
             {
               "add": false,
               "count": {
@@ -175,6 +105,27 @@
         }
       ],
       "rolls": 1.0
+    },
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "add": false,
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 3.0,
+                "min": 1.0
+              },
+              "function": "minecraft:set_count"
+            }
+          ],
+          "name": "hybrid-aquatic:shark_tooth"
+        }
+      ],
+      "rolls": 1.0
     }
   ]
 }
diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/client/LanguageProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/client/LanguageProvider.kt
@@ -183,6 +183,7 @@ class LanguageProvider(output: FabricDataOutput) : FabricLanguageProvider(output
             HybridAquaticItems.MAGNETIC_HOOK.translationKey to "Increases treasure chance",
             HybridAquaticItems.OMINOUS_HOOK.translationKey to "Summons Karkinos",
             HybridAquaticBlocks.HYBRID_CRATE.translationKey to "Break with an axe to open",
+            HybridAquaticBlocks.DRIFTWOOD_CRATE.translationKey to "Break with an axe to open",
             HybridAquaticBlocks.OAK_CRATE.translationKey to "Break with an axe to open",
             HybridAquaticBlocks.SPRUCE_CRATE.translationKey to "Break with an axe to open",
             HybridAquaticBlocks.BIRCH_CRATE.translationKey to "Break with an axe to open",
@@ -207,7 +208,8 @@ class LanguageProvider(output: FabricDataOutput) : FabricLanguageProvider(output
         mapOf(
             "glowing" to "Glowing",
             "clarity" to "Clarity",
-            "thalassophobia" to "Thalassophobia"
+            "thalassophobia" to "Thalassophobia",
+            "bleeding" to "Bleeding"
         ).forEach { (potion, translation) ->
             builder.add("item.minecraft.potion.effect.$potion", "Potion of $translation")
             builder.add("item.minecraft.splash_potion.effect.$potion", "Splash Potion of $translation")