-
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
cf5033d
commit e3ae6d8
Showing
19 changed files
with
322 additions
and
13 deletions.
There are no files selected for viewing
5 changes: 5 additions & 0 deletions
5
src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/fish/MantaRayEntityModel.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,5 @@ | ||
| package dev.hybridlabs.aquatic.client.model.entity.fish | ||
|
|
||
| import dev.hybridlabs.aquatic.entity.fish.HybridAquaticFishEntity | ||
|
|
||
| class MantaRayEntityModel : HybridAquaticFishEntityModel<HybridAquaticFishEntity>("manta_ray") |
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
7 changes: 7 additions & 0 deletions
7
src/client/kotlin/dev/hybridlabs/aquatic/client/render/entity/fish/MantaRayEntityRenderer.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,7 @@ | ||
| package dev.hybridlabs.aquatic.client.render.entity.fish | ||
|
|
||
| import dev.hybridlabs.aquatic.client.model.entity.fish.MantaRayEntityModel | ||
| import dev.hybridlabs.aquatic.entity.fish.HybridAquaticFishEntity | ||
| import net.minecraft.client.render.entity.EntityRendererFactory.Context | ||
|
|
||
| class MantaRayEntityRenderer(context: Context) : HybridAquaticFishEntityRenderer<HybridAquaticFishEntity>(context, MantaRayEntityModel(), 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/manta_ray_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" | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/data/hybrid-aquatic/tags/worldgen/biome/manta_ray_spawn_biomes.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,7 @@ | ||
| { | ||
| "replace": false, | ||
| "values": [ | ||
| "minecraft:deep_lukewarm_ocean", | ||
| "minecraft:deep_ocean" | ||
| ] | ||
| } |
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
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
23 changes: 23 additions & 0 deletions
23
src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/ray/MantaRayEntity.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,23 @@ | ||
| package dev.hybridlabs.aquatic.entity.fish.ray | ||
|
|
||
| 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 MantaRayEntity(entityType: EntityType<out MantaRayEntity>, world: World) : | ||
| HybridAquaticRayEntity(entityType, world, emptyMap(), | ||
| HybridAquaticEntityTags.STINGRAY_PREY, HybridAquaticEntityTags.STINGRAY_PREDATOR) { | ||
|
|
||
| companion object { | ||
| fun createMobAttributes(): DefaultAttributeContainer.Builder { | ||
| return WaterCreatureEntity.createMobAttributes() | ||
| .add(EntityAttributes.GENERIC_MAX_HEALTH, 10.0) | ||
| .add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.7) | ||
| .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 2.0) | ||
| .add(EntityAttributes.GENERIC_FOLLOW_RANGE, 12.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
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
149 changes: 149 additions & 0 deletions
149
src/main/resources/assets/hybrid-aquatic/animations/manta_ray.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,149 @@ | ||
| { | ||
| "format_version": "1.8.0", | ||
| "animations": { | ||
| "swim": { | ||
| "loop": true, | ||
| "animation_length": 4, | ||
| "bones": { | ||
| "body": { | ||
| "rotation": { | ||
| "vector": ["Math.sin(query.anim_time * 90)*5", 0, 0] | ||
| } | ||
| }, | ||
| "tail_1": { | ||
| "rotation": { | ||
| "vector": ["Math.cos(query.anim_time * 90)*-7.5", 0, 0] | ||
| } | ||
| }, | ||
| "tail_2": { | ||
| "rotation": { | ||
| "vector": ["Math.sin(query.anim_time * 90)*-10", 0, 0] | ||
| } | ||
| }, | ||
| "undefined": { | ||
| "rotation": { | ||
| "vector": ["Math.sin(query.anim_time * 90)*5", 0, 0] | ||
| } | ||
| }, | ||
| "left_fin_1": { | ||
| "rotation": { | ||
| "vector": ["Math.cos(query.anim_time * 90)*7.5", 0, 0] | ||
| } | ||
| }, | ||
| "left_fin_tip": { | ||
| "rotation": { | ||
| "vector": [0, 0, "Math.sin(query.anim_time * 90)*15"] | ||
| } | ||
| }, | ||
| "left_fin_2": { | ||
| "rotation": { | ||
| "vector": ["Math.sin(query.anim_time * 90)*7.5", 0, 0] | ||
| } | ||
| }, | ||
| "right_fin_1": { | ||
| "rotation": { | ||
| "vector": ["Math.cos(query.anim_time * 90)*7.5", 0, 0] | ||
| } | ||
| }, | ||
| "right_fin_tip": { | ||
| "rotation": { | ||
| "vector": [0, 0, "Math.sin(query.anim_time * 90)*-15"] | ||
| } | ||
| }, | ||
| "right_fin_2": { | ||
| "rotation": { | ||
| "vector": ["Math.sin(query.anim_time * 90)*7.5", 0, 0] | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "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] | ||
| } | ||
| }, | ||
| "tail": { | ||
| "rotation": { | ||
| "vector": [0, "Math.cos(query.anim_time * 90)*10", 0] | ||
| } | ||
| }, | ||
| "leftfin": { | ||
| "rotation": { | ||
| "vector": [0, 0, "Math.cos(query.anim_time * 90)*-5"] | ||
| } | ||
| }, | ||
| "rightfin": { | ||
| "rotation": { | ||
| "vector": [0, 0, "Math.cos(query.anim_time * 90)*5"] | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "flop": { | ||
| "loop": true, | ||
| "animation_length": 2, | ||
| "bones": { | ||
| "body": { | ||
| "rotation": { | ||
| "0.0": { | ||
| "vector": [2.5, 0, 0] | ||
| }, | ||
| "1.0": { | ||
| "vector": [-2.5, 0, 0] | ||
| }, | ||
| "2.0": { | ||
| "vector": [2.5, 0, 0] | ||
| } | ||
| } | ||
| }, | ||
| "tail": { | ||
| "rotation": { | ||
| "0.0": { | ||
| "vector": [-5, 0, 0] | ||
| }, | ||
| "1.0": { | ||
| "vector": [0, 0, 0] | ||
| }, | ||
| "2.0": { | ||
| "vector": [-5, 0, 0] | ||
| } | ||
| } | ||
| }, | ||
| "leftfin": { | ||
| "rotation": { | ||
| "0.0": { | ||
| "vector": [2.5, 0, 0] | ||
| }, | ||
| "1.0": { | ||
| "vector": [-2.5, 0, 0] | ||
| }, | ||
| "2.0": { | ||
| "vector": [2.5, 0, 0] | ||
| } | ||
| } | ||
| }, | ||
| "rightfin": { | ||
| "rotation": { | ||
| "0.0": { | ||
| "vector": [2.5, 0, 0] | ||
| }, | ||
| "1.0": { | ||
| "vector": [-2.5, 0, 0] | ||
| }, | ||
| "2.0": { | ||
| "vector": [2.5, 0, 0] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "geckolib_format_version": 2 | ||
| } |
Oops, something went wrong.