-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
069db36
commit 39c224a
Showing
14 changed files
with
299 additions
and
1 deletion.
There are no files selected for viewing
6 changes: 6 additions & 0 deletions
6
src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/fish/JohnDoryEntityModel.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| package dev.hybridlabs.aquatic.client.model.entity.fish | ||
|
|
||
| import dev.hybridlabs.aquatic.entity.fish.HybridAquaticFishEntity | ||
|
|
||
| class JohnDoryEntityModel : HybridAquaticFishEntityModel<HybridAquaticFishEntity>("john_dory") | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
src/client/kotlin/dev/hybridlabs/aquatic/client/render/entity/fish/JohnDoryEntityRenderer.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package dev.hybridlabs.aquatic.client.render.entity.fish | ||
|
|
||
| import dev.hybridlabs.aquatic.client.model.entity.fish.JohnDoryEntityModel | ||
| import dev.hybridlabs.aquatic.entity.fish.HybridAquaticFishEntity | ||
| import net.minecraft.client.render.entity.EntityRendererFactory.Context | ||
|
|
||
| class JohnDoryEntityRenderer(context: Context) : HybridAquaticFishEntityRenderer<HybridAquaticFishEntity>(context, | ||
| JohnDoryEntityModel(), true, false) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/hybrid-aquatic/models/item/john_dory_spawn_egg.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minecraft:item/template_spawn_egg" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/JohnDoryEntity.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package dev.hybridlabs.aquatic.entity.fish | ||
|
|
||
| import dev.hybridlabs.aquatic.tag.HybridAquaticEntityTags | ||
| import net.minecraft.entity.EntityType | ||
| import net.minecraft.entity.attribute.DefaultAttributeContainer | ||
| import net.minecraft.entity.attribute.EntityAttributes | ||
| import net.minecraft.entity.mob.WaterCreatureEntity | ||
| import net.minecraft.world.World | ||
|
|
||
| class JohnDoryEntity(entityType: EntityType<out JohnDoryEntity>, world: World) : | ||
| HybridAquaticFishEntity(entityType, world, emptyMap(), | ||
| listOf( | ||
| HybridAquaticEntityTags.SMALL_PREY), | ||
| listOf( | ||
| HybridAquaticEntityTags.MEDIUM_PREY, | ||
| HybridAquaticEntityTags.LARGE_PREY, | ||
| HybridAquaticEntityTags.SHARK)) { | ||
|
|
||
| override fun getLimitPerChunk(): Int { | ||
| return 2 | ||
| } | ||
|
|
||
| companion object { | ||
| fun createMobAttributes(): DefaultAttributeContainer.Builder { | ||
| return WaterCreatureEntity.createMobAttributes() | ||
| .add(EntityAttributes.GENERIC_MAX_HEALTH, 4.0) | ||
| .add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.4) | ||
| .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 2.0) | ||
| .add(EntityAttributes.GENERIC_ATTACK_SPEED, 4.0) | ||
| .add(EntityAttributes.GENERIC_FOLLOW_RANGE, 32.0) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
156 changes: 156 additions & 0 deletions
156
src/main/resources/assets/hybrid-aquatic/animations/john_dory.animation.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,156 @@ | ||
| { | ||
| "format_version": "1.8.0", | ||
| "animations": { | ||
| "misc.idle": { | ||
| "loop": true, | ||
| "animation_length": 4, | ||
| "bones": { | ||
| "body": { | ||
| "rotation": { | ||
| "vector": ["Math.cos(query.anim_time * 90)*2.5", 0, 0] | ||
| }, | ||
| "position": { | ||
| "vector": [0, "Math.sin(query.anim_time * 90)*-0.25", 0] | ||
| } | ||
| }, | ||
| "pelvic_fin": { | ||
| "rotation": { | ||
| "vector": [0, 0, "Math.sin(query.anim_time * 90)*10"] | ||
| } | ||
| }, | ||
| "dorsal_fin": { | ||
| "rotation": { | ||
| "vector": [0, 0, "Math.sin(query.anim_time * 90)*10"] | ||
| } | ||
| }, | ||
| "tail": { | ||
| "rotation": { | ||
| "vector": [0, "Math.cos(query.anim_time * 90)*10", 0] | ||
| } | ||
| }, | ||
| "tail_fin": { | ||
| "rotation": { | ||
| "vector": [0, "Math.sin(query.anim_time * 90)*10", 0] | ||
| } | ||
| }, | ||
| "right_fin": { | ||
| "rotation": { | ||
| "vector": [0, 0, "Math.cos(query.anim_time * 90)*5"] | ||
| } | ||
| }, | ||
| "left_fin": { | ||
| "rotation": { | ||
| "vector": [0, 0, "Math.cos(query.anim_time * 90)*-5"] | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "move.swim": { | ||
| "loop": true, | ||
| "animation_length": 2, | ||
| "bones": { | ||
| "right_fin": { | ||
| "rotation": { | ||
| "vector": [0, "Math.sin(query.anim_time * 180)*-20", 0] | ||
| } | ||
| }, | ||
| "left_fin": { | ||
| "rotation": { | ||
| "vector": [0, "Math.sin(query.anim_time * 180)*-20", 0] | ||
| } | ||
| }, | ||
| "body": { | ||
| "rotation": { | ||
| "vector": [0, "Math.cos(query.anim_time * 180)*5", "Math.sin(query.anim_time * 180)*2.5"] | ||
| } | ||
| }, | ||
| "tail": { | ||
| "rotation": { | ||
| "vector": [0, "Math.cos(query.anim_time * 180)*20", 0] | ||
| } | ||
| }, | ||
| "tail_fin": { | ||
| "rotation": { | ||
| "vector": [0, "Math.sin(query.anim_time * 180)*25", 0] | ||
| } | ||
| }, | ||
| "pelvic_fin": { | ||
| "rotation": { | ||
| "vector": [0, 0, "Math.sin(query.anim_time * 180)*10"] | ||
| } | ||
| }, | ||
| "dorsal_fin": { | ||
| "rotation": { | ||
| "vector": [0, 0, "Math.sin(query.anim_time * 180)*-10"] | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "flop": { | ||
| "loop": true, | ||
| "animation_length": 0.5, | ||
| "bones": { | ||
| "body": { | ||
| "rotation": { | ||
| "0.0": { | ||
| "vector": [0, 0, -90] | ||
| }, | ||
| "0.1667": { | ||
| "vector": [0, 22.5, -90] | ||
| }, | ||
| "0.3333": { | ||
| "vector": [0, -22.5, -90] | ||
| }, | ||
| "0.5": { | ||
| "vector": [0, 0, -90] | ||
| } | ||
| }, | ||
| "position": { | ||
| "0.0": { | ||
| "vector": [0, -1, 0] | ||
| }, | ||
| "0.1667": { | ||
| "vector": [0, 0, 0] | ||
| }, | ||
| "0.5": { | ||
| "vector": [0, -1, 0] | ||
| } | ||
| } | ||
| }, | ||
| "left_fin": { | ||
| "rotation": { | ||
| "0.0": { | ||
| "vector": [0, 0, 0] | ||
| }, | ||
| "0.1667": { | ||
| "vector": [0, -45, 0] | ||
| }, | ||
| "0.3333": { | ||
| "vector": [0, 0, 0] | ||
| }, | ||
| "0.5": { | ||
| "vector": [0, 0, 0] | ||
| } | ||
| } | ||
| }, | ||
| "tail": { | ||
| "rotation": { | ||
| "0.0": { | ||
| "vector": [0, -22.5, 0] | ||
| }, | ||
| "0.1667": { | ||
| "vector": [0, 0, 0] | ||
| }, | ||
| "0.3333": { | ||
| "vector": [0, 22.5, 0] | ||
| }, | ||
| "0.5": { | ||
| "vector": [0, -22.5, 0] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "geckolib_format_version": 2 | ||
| } |
78 changes: 78 additions & 0 deletions
78
src/main/resources/assets/hybrid-aquatic/geo/fish/john_dory/john_dory.geo.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| { | ||
| "format_version": "1.12.0", | ||
| "minecraft:geometry": [ | ||
| { | ||
| "description": { | ||
| "identifier": "geometry.unknown", | ||
| "texture_width": 32, | ||
| "texture_height": 32, | ||
| "visible_bounds_width": 3, | ||
| "visible_bounds_height": 2.5, | ||
| "visible_bounds_offset": [0, 0.75, 0] | ||
| }, | ||
| "bones": [ | ||
| { | ||
| "name": "body", | ||
| "pivot": [0, 2.02672, -0.92649], | ||
| "cubes": [ | ||
| {"origin": [-0.5, 0, -3.5], "size": [1, 6, 6], "uv": [0, 0]}, | ||
| {"origin": [0.25, -5, -3], "size": [0, 5, 3], "pivot": [0.25, 0, -3], "rotation": [10, 0, -22.5], "uv": [14, 0]}, | ||
| {"origin": [-0.25, -5, -3], "size": [0, 5, 3], "pivot": [-0.25, 0, -3], "rotation": [10, 0, 22.5], "uv": [14, 0], "mirror": true}, | ||
| {"origin": [0, 0, 2], "size": [0, 6, 2], "uv": [20, 6]}, | ||
| {"origin": [-0.5, 0.5, -4.5], "size": [1, 4, 1], "uv": [20, 14]}, | ||
| {"origin": [0.51, 3, -4], "size": [0, 1, 1], "uv": [16, 21]}, | ||
| {"origin": [-0.51, 3, -4], "size": [0, 1, 1], "uv": [18, 21]} | ||
| ] | ||
| }, | ||
| { | ||
| "name": "left_fin", | ||
| "parent": "body", | ||
| "pivot": [0.5, 1.25, -3], | ||
| "cubes": [ | ||
| {"origin": [0.5, 0.25, -3], "size": [2, 2, 0], "pivot": [0.5, 1.25, -3], "rotation": [0, -67.5, 0], "uv": [20, 19]} | ||
| ] | ||
| }, | ||
| { | ||
| "name": "right_fin", | ||
| "parent": "body", | ||
| "pivot": [-0.5, 1.25, -3], | ||
| "cubes": [ | ||
| {"origin": [-2.5, 0.25, -3], "size": [2, 2, 0], "pivot": [-0.5, 1.25, -3], "rotation": [0, 67.5, 0], "uv": [12, 21]} | ||
| ] | ||
| }, | ||
| { | ||
| "name": "pelvic_fin", | ||
| "parent": "body", | ||
| "pivot": [0, 0, 0.5], | ||
| "cubes": [ | ||
| {"origin": [0, -3, 0.5], "size": [0, 3, 3], "uv": [20, 0]} | ||
| ] | ||
| }, | ||
| { | ||
| "name": "dorsal_fin", | ||
| "parent": "body", | ||
| "pivot": [0, 6, -2.75], | ||
| "cubes": [ | ||
| {"origin": [0, 5.82635, -3.73481], "size": [0, 6, 6], "pivot": [0, 6, -2.75], "rotation": [-10, 0, 0], "uv": [0, 12]} | ||
| ] | ||
| }, | ||
| { | ||
| "name": "tail", | ||
| "parent": "body", | ||
| "pivot": [0, 3, 2.5], | ||
| "cubes": [ | ||
| {"origin": [-0.5, 2, 2.5], "size": [1, 2, 2], "uv": [14, 8]} | ||
| ] | ||
| }, | ||
| { | ||
| "name": "tail_fin", | ||
| "parent": "tail", | ||
| "pivot": [0, 3, 4.5], | ||
| "cubes": [ | ||
| {"origin": [0, 0.5, 4.5], "size": [0, 5, 4], "uv": [12, 12]} | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
Binary file added
BIN
+657 Bytes
...in/resources/assets/hybrid-aquatic/textures/entity/fish/john_dory/john_dory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.