Fixed a bunch of old bugs and such, set version to 1.3.4

hybridlabs · Jun 26, 2024 · 239abe9 · 239abe9
1 parent a72a6b6
commit 239abe9
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -10,7 +10,7 @@ loader_version=0.15.7
 fabric_kotlin_version=1.10.10+kotlin.1.9.10
 
 # Mod Properties
-mod_version=1.3.3
+mod_version=1.3.4
 maven_group=dev.hybridlabs
 archives_base_name=hybrid-aquatic
 

diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/gameplay/fishing/fish.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/gameplay/fishing/fish.json
@@ -9,6 +9,36 @@
           "name": "hybrid-aquatic:lionfish",
           "weight": 5
         },
+        {
+          "type": "minecraft:item",
+          "name": "hybrid-aquatic:gourami",
+          "weight": 5
+        },
+        {
+          "type": "minecraft:item",
+          "name": "hybrid-aquatic:flashlight_fish",
+          "weight": 5
+        },
+        {
+          "type": "minecraft:item",
+          "name": "hybrid-aquatic:discus",
+          "weight": 5
+        },
+        {
+          "type": "minecraft:item",
+          "name": "hybrid-aquatic:betta",
+          "weight": 5
+        },
+        {
+          "type": "minecraft:item",
+          "name": "hybrid-aquatic:danio",
+          "weight": 5
+        },
+        {
+          "type": "minecraft:item",
+          "name": "hybrid-aquatic:tetra",
+          "weight": 5
+        },
         {
           "type": "minecraft:item",
           "name": "hybrid-aquatic:mahi_mahi",
@@ -92,6 +122,11 @@
           "type": "minecraft:item",
           "name": "hybrid-aquatic:oscar",
           "weight": 2
+        },
+        {
+          "type": "minecraft:item",
+          "name": "hybrid-aquatic:dragonfish",
+          "weight": 2
         }
       ],
       "rolls": 1.0

diff --git a/src/generated/resources/data/hybrid-aquatic/tags/entity_types/jellyfish.json b/src/generated/resources/data/hybrid-aquatic/tags/entity_types/jellyfish.json
@@ -5,10 +5,12 @@
     "hybrid-aquatic:cauliflower_jellyfish",
     "hybrid-aquatic:moon_jellyfish",
     "hybrid-aquatic:mauve_stinger",
-    "hybrid-aquatic:barreleye",
+    "hybrid-aquatic:barrel_jellyfish",
     "hybrid-aquatic:atolla_jellyfish",
-    "hybrid-aquatic:starfish",
+    "hybrid-aquatic:sea_nettle",
     "hybrid-aquatic:compass_jellyfish",
-    "hybrid-aquatic:blue_jellyfish"
+    "hybrid-aquatic:blue_jellyfish",
+    "hybrid-aquatic:nomura_jellyfish",
+    "hybrid-aquatic:lions_mane_jellyfish"
   ]
 }
diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/EntityTypeTagProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/EntityTypeTagProvider.kt
@@ -510,11 +510,13 @@ class EntityTypeTagProvider(output: FabricDataOutput, registriesFuture: Completa
                 HybridAquaticEntityTypes.CAULIFLOWER_JELLYFISH,
                 HybridAquaticEntityTypes.MOON_JELLYFISH,
                 HybridAquaticEntityTypes.MAUVE_STINGER,
-                HybridAquaticEntityTypes.BARRELEYE,
+                HybridAquaticEntityTypes.BARREL_JELLYFISH,
                 HybridAquaticEntityTypes.ATOLLA_JELLYFISH,
-                HybridAquaticEntityTypes.STARFISH,
+                HybridAquaticEntityTypes.SEA_NETTLE,
                 HybridAquaticEntityTypes.COMPASS_JELLYFISH,
                 HybridAquaticEntityTypes.BLUE_JELLYFISH,
+                HybridAquaticEntityTypes.NOMURA_JELLYFISH,
+                HybridAquaticEntityTypes.LIONS_MANE_JELLYFISH,
             )
     }
 }
diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/SpawnRestrictionRegistry.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/SpawnRestrictionRegistry.kt
@@ -1,8 +1,8 @@
 package dev.hybridlabs.aquatic.entity
 
 import dev.hybridlabs.aquatic.entity.cephalopod.HybridAquaticCephalopodEntity
-import dev.hybridlabs.aquatic.entity.crustacean.HybridAquaticCrustaceanEntity
 import dev.hybridlabs.aquatic.entity.critter.HybridAquaticCritterEntity
+import dev.hybridlabs.aquatic.entity.crustacean.HybridAquaticCrustaceanEntity
 import dev.hybridlabs.aquatic.entity.fish.HybridAquaticFishEntity
 import dev.hybridlabs.aquatic.entity.jellyfish.HybridAquaticJellyfishEntity
 import dev.hybridlabs.aquatic.entity.shark.HybridAquaticSharkEntity
@@ -84,6 +84,7 @@ object SpawnRestrictionRegistry {
             HybridAquaticEntityTypes.COMPASS_JELLYFISH,
             HybridAquaticEntityTypes.LIONS_MANE_JELLYFISH,
             HybridAquaticEntityTypes.NOMURA_JELLYFISH,
+            HybridAquaticEntityTypes.BARREL_JELLYFISH,
         ).forEach { registerJelly(it) }
 
         setOf(

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/crustacean/HybridAquaticCrustaceanEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/crustacean/HybridAquaticCrustaceanEntity.kt
@@ -238,7 +238,7 @@ open class HybridAquaticCrustaceanEntity(
         }
 
         override fun getSquaredMaxAttackDistance(entity: LivingEntity): Double {
-            return (0.25f + entity.width).toDouble()
+            return (1.0f + entity.width).toDouble()
         }
 
         override fun start() {