diff --git a/gradle.properties b/gradle.properties index 1ff17bd7a..00562652b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ fabric_version=0.90.0+1.20.2 mod_menu_version=8.0.0 geckolib_version=1.20.2:4.2.3 -mixin_extras_version=0.1.1 +mixin_extras_version=0.2.0 debug_utils_version=1.20.1-1.0.3 carpet_version=1.4.119 diff --git a/src/generated/resources/data/hybrid-aquatic/tags/entity_types/medium_prey.json b/src/generated/resources/data/hybrid-aquatic/tags/entity_types/medium_prey.json index 35b274dae..50f06f33e 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/entity_types/medium_prey.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/entity_types/medium_prey.json @@ -7,7 +7,6 @@ "hybrid-aquatic:mahimahi", "hybrid-aquatic:triggerfish", "hybrid-aquatic:needlefish", - "hybrid-aquatic:glowing_sucker_octopus", "minecraft:squid", "minecraft:glow_squid", "minecraft:cow", diff --git a/src/generated/resources/data/hybrid-aquatic/tags/entity_types/small_prey.json b/src/generated/resources/data/hybrid-aquatic/tags/entity_types/small_prey.json index 88bf57f8b..6ff6268db 100644 --- a/src/generated/resources/data/hybrid-aquatic/tags/entity_types/small_prey.json +++ b/src/generated/resources/data/hybrid-aquatic/tags/entity_types/small_prey.json @@ -25,6 +25,15 @@ "hybrid-aquatic:fiddler_crab", "hybrid-aquatic:hermit_crab", "hybrid-aquatic:blue_spotted_stingray", + "hybrid-aquatic:vampire_squid", + "hybrid-aquatic:glowing_sucker_octopus", + "hybrid-aquatic:dragonfish", + "hybrid-aquatic:anglerfish", + "hybrid-aquatic:glowing_sucker_octopus", + "hybrid-aquatic:stonefish", + "hybrid-aquatic:toadfish", + "hybrid-aquatic:lionfish", + "hybrid-aquatic:sea_angel", "minecraft:salmon", "minecraft:cod", "minecraft:tropical_fish", 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 index 80e261560..334d6cb37 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/EntityTypeTagProvider.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/EntityTypeTagProvider.kt @@ -37,6 +37,15 @@ class EntityTypeTagProvider(output: FabricDataOutput, registriesFuture: Completa HybridAquaticEntityTypes.FIDDLER_CRAB, HybridAquaticEntityTypes.HERMIT_CRAB, HybridAquaticEntityTypes.BLUE_SPOTTED_STINGRAY, + HybridAquaticEntityTypes.VAMPIRE_SQUID, + HybridAquaticEntityTypes.GLOWING_SUCKER_OCTOPUS, + HybridAquaticEntityTypes.DRAGONFISH, + HybridAquaticEntityTypes.ANGLERFISH, + HybridAquaticEntityTypes.GLOWING_SUCKER_OCTOPUS, + HybridAquaticEntityTypes.STONEFISH, + HybridAquaticEntityTypes.TOADFISH, + HybridAquaticEntityTypes.LIONFISH, + HybridAquaticEntityTypes.SEA_ANGEL, EntityType.SALMON, EntityType.COD, EntityType.TROPICAL_FISH, @@ -51,7 +60,6 @@ class EntityTypeTagProvider(output: FabricDataOutput, registriesFuture: Completa HybridAquaticEntityTypes.MAHIMAHI, HybridAquaticEntityTypes.TRIGGERFISH, HybridAquaticEntityTypes.NEEDLEFISH, - HybridAquaticEntityTypes.GLOWING_SUCKER_OCTOPUS, EntityType.SQUID, EntityType.GLOW_SQUID, EntityType.COW,