Lots of new fish items

Made poisonous fish items poisonous
hybridlabs · Oct 30, 2024 · 278fce2 · 278fce2
1 parent 12f152b
commit 278fce2
Show file tree

Hide file tree

Showing 74 changed files with 714 additions and 401 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
@@ -240,6 +240,7 @@
   "item.hybrid-aquatic.glowing_hook": "Glowing Hook",
   "item.hybrid-aquatic.glowing_hook.description": "Increases fishing speed at night",
   "item.hybrid-aquatic.glowing_sucker_octopus_spawn_egg": "Glowing Sucker Octopus Spawn Egg",
+  "item.hybrid-aquatic.goldfish": "Goldfish",
   "item.hybrid-aquatic.goldfish_spawn_egg": "Goldfish Spawn Egg",
   "item.hybrid-aquatic.gourami": "Gourami",
   "item.hybrid-aquatic.gourami_spawn_egg": "Gourami Spawn Egg",
@@ -250,6 +251,7 @@
   "item.hybrid-aquatic.horseshoe_crab_spawn_egg": "Horseshoe Crab Spawn Egg",
   "item.hybrid-aquatic.karkinos_claw": "Karkinos Claw",
   "item.hybrid-aquatic.karkinos_spawn_egg": "Karkinos Spawn Egg",
+  "item.hybrid-aquatic.koi": "Koi",
   "item.hybrid-aquatic.lightfoot_crab_claw": "Lightfoot Crab Claw",
   "item.hybrid-aquatic.lightfoot_crab_spawn_egg": "Lightfoot Crab Spawn Egg",
   "item.hybrid-aquatic.lionfish": "Lionfish",
@@ -285,6 +287,7 @@
   "item.hybrid-aquatic.opah_spawn_egg": "Opah Spawn Egg",
   "item.hybrid-aquatic.oscar": "Oscar",
   "item.hybrid-aquatic.oscar_spawn_egg": "Oscar Spawn Egg",
+  "item.hybrid-aquatic.parrotfish": "Parrotfish",
   "item.hybrid-aquatic.parrotfish_spawn_egg": "Parrotfish Spawn Egg",
   "item.hybrid-aquatic.pearl": "Pearl",
   "item.hybrid-aquatic.piranha": "Piranha",
@@ -308,6 +311,7 @@
   "item.hybrid-aquatic.sea_nettle_spawn_egg": "Sea Nettle Spawn Egg",
   "item.hybrid-aquatic.sea_urchin_spawn_egg": "Sea Urchin Spawn Egg",
   "item.hybrid-aquatic.sea_urchin_spine": "Sea Urchin Spine",
+  "item.hybrid-aquatic.seahorse": "Seahorse",
   "item.hybrid-aquatic.seahorse_spawn_egg": "Seahorse Spawn Egg",
   "item.hybrid-aquatic.seashell_axe": "Seashell Axe",
   "item.hybrid-aquatic.seashell_hoe": "Seashell Hoe",
@@ -319,9 +323,12 @@
   "item.hybrid-aquatic.spider_crab_claw": "Spider Crab Claw",
   "item.hybrid-aquatic.spider_crab_spawn_egg": "Spider Crab Spawn Egg",
   "item.hybrid-aquatic.sponge_chunk": "Sponge Chunk",
+  "item.hybrid-aquatic.spotted_eagle_ray": "Spotted Eagle Ray",
   "item.hybrid-aquatic.starfish_spawn_egg": "Starfish Spawn Egg",
   "item.hybrid-aquatic.stingray_spawn_egg": "Stingray Spawn Egg",
+  "item.hybrid-aquatic.stonefish": "Stonefish",
   "item.hybrid-aquatic.stonefish_spawn_egg": "Stonefish Spawn Egg",
+  "item.hybrid-aquatic.sunfish": "Sunfish",
   "item.hybrid-aquatic.sunfish_spawn_egg": "Sunfish Spawn Egg",
   "item.hybrid-aquatic.surgeonfish_orangeshoulder": "Orangeshoulder Surgeonfish",
   "item.hybrid-aquatic.surgeonfish_sohal": "Sohal Surgeonfish",
@@ -331,6 +338,7 @@
   "item.hybrid-aquatic.tiger_barb": "Tiger Barb",
   "item.hybrid-aquatic.tiger_barb_spawn_egg": "Tiger Barb Spawn Egg",
   "item.hybrid-aquatic.tiger_shark_spawn_egg": "Tiger Shark Spawn Egg",
+  "item.hybrid-aquatic.toadfish": "Toadfish",
   "item.hybrid-aquatic.toadfish_spawn_egg": "Toadfish Spawn Egg",
   "item.hybrid-aquatic.triggerfish": "Triggerfish",
   "item.hybrid-aquatic.triggerfish_spawn_egg": "Triggerfish Spawn Egg",

diff --git a/src/generated/resources/assets/hybrid-aquatic/models/item/goldfish.json b/src/generated/resources/assets/hybrid-aquatic/models/item/goldfish.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "hybrid-aquatic:item/goldfish"
+  }
+}
diff --git a/src/generated/resources/assets/hybrid-aquatic/models/item/koi.json b/src/generated/resources/assets/hybrid-aquatic/models/item/koi.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "hybrid-aquatic:item/koi"
+  }
+}
diff --git a/src/generated/resources/assets/hybrid-aquatic/models/item/parrotfish.json b/src/generated/resources/assets/hybrid-aquatic/models/item/parrotfish.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "hybrid-aquatic:item/parrotfish"
+  }
+}
diff --git a/src/generated/resources/assets/hybrid-aquatic/models/item/seahorse.json b/src/generated/resources/assets/hybrid-aquatic/models/item/seahorse.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "hybrid-aquatic:item/seahorse"
+  }
+}
diff --git a/src/generated/resources/assets/hybrid-aquatic/models/item/spotted_eagle_ray.json b/src/generated/resources/assets/hybrid-aquatic/models/item/spotted_eagle_ray.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "hybrid-aquatic:item/spotted_eagle_ray"
+  }
+}
diff --git a/src/generated/resources/assets/hybrid-aquatic/models/item/stonefish.json b/src/generated/resources/assets/hybrid-aquatic/models/item/stonefish.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "hybrid-aquatic:item/stonefish"
+  }
+}
diff --git a/src/generated/resources/assets/hybrid-aquatic/models/item/sunfish.json b/src/generated/resources/assets/hybrid-aquatic/models/item/sunfish.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "hybrid-aquatic:item/sunfish"
+  }
+}
diff --git a/src/generated/resources/assets/hybrid-aquatic/models/item/toadfish.json b/src/generated/resources/assets/hybrid-aquatic/models/item/toadfish.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "hybrid-aquatic:item/toadfish"
+  }
+}
diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/anglerfish.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/anglerfish.json
@@ -17,20 +17,6 @@
         {
           "type": "minecraft:item",
           "functions": [
-            {
-              "conditions": [
-                {
-                  "condition": "minecraft:entity_properties",
-                  "entity": "this",
-                  "predicate": {
-                    "flags": {
-                      "is_on_fire": true
-                    }
-                  }
-                }
-              ],
-              "function": "minecraft:furnace_smelt"
-            },
             {
               "count": {
                 "type": "minecraft:uniform",

diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/atolla_jellyfish.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/atolla_jellyfish.json
@@ -20,7 +20,7 @@
               "count": {
                 "type": "minecraft:uniform",
                 "max": 1.0,
-                "min": 0.0
+                "min": 1.0
               },
               "function": "minecraft:set_count"
             }
@@ -49,7 +49,7 @@
               "count": {
                 "type": "minecraft:uniform",
                 "max": 1.0,
-                "min": 0.0
+                "min": 1.0
               },
               "function": "minecraft:set_count"
             }

diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/barreleye.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/barreleye.json
@@ -6,6 +6,25 @@
       "entries": [
         {
           "type": "minecraft:item",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1.0,
+                "min": 0.0
+              },
+              "function": "minecraft:looting_enchant"
+            },
+            {
+              "add": false,
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1.0,
+                "min": 1.0
+              },
+              "function": "minecraft:set_count"
+            }
+          ],
           "name": "hybrid-aquatic:glow_slime"
         }
       ],
@@ -17,20 +36,6 @@
         {
           "type": "minecraft:item",
           "functions": [
-            {
-              "conditions": [
-                {
-                  "condition": "minecraft:entity_properties",
-                  "entity": "this",
-                  "predicate": {
-                    "flags": {
-                      "is_on_fire": true
-                    }
-                  }
-                }
-              ],
-              "function": "minecraft:furnace_smelt"
-            },
             {
               "count": {
                 "type": "minecraft:uniform",

diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/betta.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/betta.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"
-            },
             {
               "count": {
                 "type": "minecraft:uniform",

diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/carp.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/carp.json
@@ -0,0 +1,34 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1.0,
+                "min": 0.0
+              },
+              "function": "minecraft:looting_enchant"
+            },
+            {
+              "add": false,
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1.0,
+                "min": 1.0
+              },
+              "function": "minecraft:set_count"
+            }
+          ],
+          "name": "hybrid-aquatic:koi"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/cauliflower_jellyfish.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/cauliflower_jellyfish.json
@@ -20,7 +20,7 @@
               "count": {
                 "type": "minecraft:uniform",
                 "max": 1.0,
-                "min": 0.0
+                "min": 1.0
               },
               "function": "minecraft:set_count"
             }

diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/clownfish.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/clownfish.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"
-            },
             {
               "count": {
                 "type": "minecraft:uniform",

diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/cowfish.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/cowfish.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"
-            },
             {
               "count": {
                 "type": "minecraft:uniform",

diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/danio.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/danio.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"
-            },
             {
               "count": {
                 "type": "minecraft:uniform",

diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/discus.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/discus.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"
-            },
             {
               "count": {
                 "type": "minecraft:uniform",

diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/dragonfish.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/dragonfish.json
@@ -17,20 +17,6 @@
         {
           "type": "minecraft:item",
           "functions": [
-            {
-              "conditions": [
-                {
-                  "condition": "minecraft:entity_properties",
-                  "entity": "this",
-                  "predicate": {
-                    "flags": {
-                      "is_on_fire": true
-                    }
-                  }
-                }
-              ],
-              "function": "minecraft:furnace_smelt"
-            },
             {
               "count": {
                 "type": "minecraft:uniform",

diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/flashlight_fish.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/entities/flashlight_fish.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"
-            },
             {
               "count": {
                 "type": "minecraft:uniform",