Skip to content

Commit

Permalink
creteor
Browse files Browse the repository at this point in the history
  • Loading branch information
LeoLezury committed Dec 8, 2024
1 parent 04cf597 commit d6aa544
Show file tree
Hide file tree
Showing 55 changed files with 1,357 additions and 28 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-11-30T14:43:00.0255867 Loot Tables
// 1.21.1 2024-12-07T18:13:58.7388566 Loot Tables
2b18f4ee4964de853f965809175e41672c73f2a3 data/eternal_starlight/loot_table/blocks/abyssal_fire.json
188b8614ef4815c81bb45c3a918877795892cf25 data/eternal_starlight/loot_table/blocks/abyssal_geyser.json
77967e1af1e01fc2bbf8f97dd52c510df8648a4c data/eternal_starlight/loot_table/blocks/abyssal_kelp.json
Expand Down Expand Up @@ -586,6 +586,7 @@ a17c39e100a98bcc3ecff5dd8c27bed6ec49668c data/eternal_starlight/loot_table/chest
a461217c956af4bd0fb8803afa168aeb4b966da2 data/eternal_starlight/loot_table/entities/astral_golem.json
7f94abc7aae330ee290d6e0d4ee4b67e4bab1f18 data/eternal_starlight/loot_table/entities/aurora_deer.json
fa0d1dceaeb0277bfa61ee74b03cfbe13644ee9c data/eternal_starlight/loot_table/entities/boarwarf.json
00afab123f954ff548d0c8db1f3322e7d81b1125 data/eternal_starlight/loot_table/entities/creteor.json
691a8bff1f5eeba0b472628916c6f0f9338c0260 data/eternal_starlight/loot_table/entities/crystallized_moth.json
033f6a38e81118db10ee4cfd3e493dab70af077e data/eternal_starlight/loot_table/entities/ent.json
82c62a4f1841005f4c3c51c8078024d142da2c06 data/eternal_starlight/loot_table/entities/freeze.json
Expand All @@ -604,5 +605,6 @@ cdfda6f90f96ac9dd5c8997e86411f844ff69411 data/eternal_starlight/loot_table/entit
babe6abda538bda4948feaa3bb8d8965deff0d8b data/eternal_starlight/loot_table/entities/tangled_skull.json
b01bfc5a45f772ef5c880ced1d46e07c8a9613f6 data/eternal_starlight/loot_table/entities/the_gatekeeper.json
5d9a6a5389e54faca2c0597fa733a5a68ac14490 data/eternal_starlight/loot_table/entities/thirst_walker.json
8a2b1fc489213ee3656ebe2340512ccb70b4b991 data/eternal_starlight/loot_table/entities/tiny_creteor.json
9742c2717dc30701fa79d4ab3d735a2201afc8b9 data/eternal_starlight/loot_table/entities/twilight_gaze.json
2e639dab65828cba17fb69870b07c99a66201724 data/eternal_starlight/loot_table/entities/yeti.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21.1 2024-11-17T14:36:09.2472511 Sound Definitions
a1261f8ceb7c165ba55dde15a14a105ac86ea5b0 assets/eternal_starlight/sounds.json
// 1.21.1 2024-12-08T15:27:10.7369329 Sound Definitions
b96fd1377a2af53fad5e8542582bc0249e73c9f2 assets/eternal_starlight/sounds.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-09-22T12:17:42.3914069 Tags for minecraft:entity_type mod id eternal_starlight
// 1.21.1 2024-12-07T18:13:58.7713914 Tags for minecraft:entity_type mod id eternal_starlight
5466319e12aea1f42139ac09c8ffdd0620c716d0 data/c/tags/entity_type/boats.json
d44f14633b66cf9ee5f04c1bb297ee340a53e288 data/c/tags/entity_type/bosses.json
7c4a83216410b5cc42cab8c49f3ef1afb4bb9ebc data/eternal_starlight/tags/entity_type/abyssal_fire_immune.json
Expand All @@ -9,7 +9,7 @@ be4ff0376ac9ff8a51eab4ae581131fd7b545de1 data/eternal_starlight/tags/entity_type
7c4a83216410b5cc42cab8c49f3ef1afb4bb9ebc data/minecraft/tags/entity_type/aquatic.json
71a6499c4764a81cc18b7b21fea1d988e578a0b6 data/minecraft/tags/entity_type/arrows.json
3f853abb02779d1f23df9823ebb9d8707f24ddc9 data/minecraft/tags/entity_type/arthropod.json
5459e6dcff656af9ac3c0cbea22ffdabcbea8451 data/minecraft/tags/entity_type/fall_damage_immune.json
d8ee7cf341d31cccb0314d84c97e3e6567b95b60 data/minecraft/tags/entity_type/fall_damage_immune.json
f6eb1b878dcda83e8e0f0c5388c37999f2e0ec47 data/minecraft/tags/entity_type/freeze_immune_entity_types.json
f627b828af90e448f9c5322878730dddd94748ff data/minecraft/tags/entity_type/immune_to_infested.json
81a6c1860d98805184066dd01894829e9b9830ec data/minecraft/tags/entity_type/skeletons.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-11-30T14:43:00.0455465 Item Models: eternal_starlight
// 1.21.1 2024-12-07T18:13:58.7713914 Item Models: eternal_starlight
f36b77087c8c68017703cd72753faa9ec0bb05c9 assets/eternal_starlight/models/item/abyssal_fruit.json
566abbb0b7c88c3e62953e9a59a3c7a789481e57 assets/eternal_starlight/models/item/abyssal_geyser.json
22602a3404b600eeca3221ff2689c59995af1cfc assets/eternal_starlight/models/item/abyssal_magma_block.json
Expand Down Expand Up @@ -132,6 +132,7 @@ df345951415b24130c20856f2bf494de8d88b12d assets/eternal_starlight/models/item/co
6c070c5d2e1c3e3ba28da6d35951d30ed3002f72 assets/eternal_starlight/models/item/crescent_grass.json
fdeb72c584a345e6f78e9485ec853167b91fe994 assets/eternal_starlight/models/item/crescent_spear_inventory.json
11a7930fa3222c7e64695591eb194674ef73f689 assets/eternal_starlight/models/item/crest_pot.json
63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/eternal_starlight/models/item/creteor_spawn_egg.json
7ddb335c47119122e79dafb94614bce46cc11f57 assets/eternal_starlight/models/item/cryobyssal_geyser.json
eef40b64a1a8177cdce1c93254c22981bf00b872 assets/eternal_starlight/models/item/cryobyssal_magma_block.json
de3ad123be78b147a98def85368f2af88ed5998a assets/eternal_starlight/models/item/cryobysslate.json
Expand Down Expand Up @@ -741,6 +742,7 @@ b4174b32eb5673b2be7d048ce1e020dcd4312ba2 assets/eternal_starlight/models/item/th
b2f430a6538d191a2c7d44af4480699ba9af85d9 assets/eternal_starlight/models/item/thioquartz_cluster.json
bcac9ea3811d191e509e7a4d7c296cee003bee81 assets/eternal_starlight/models/item/thioquartz_shard.json
63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/eternal_starlight/models/item/thirst_walker_spawn_egg.json
63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/eternal_starlight/models/item/tiny_creteor_spawn_egg.json
8156bb59db943a8a00cc701a3ffde7a85278cf13 assets/eternal_starlight/models/item/tooth_of_hunger.json
9f984c8f3b39db9dbeed2eddb4d529c4715aadc6 assets/eternal_starlight/models/item/tooth_of_hunger_tiles.json
2002489b9dee5d09595beb4b9b6d28e3f31f7c0f assets/eternal_starlight/models/item/tooth_of_hunger_tile_slab.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-08-27T17:30:58.3550552 Particle Descriptions
// 1.21.1 2024-12-07T23:32:10.2615466 Particle Descriptions
2fa6b966de82cbc7de1510007ab8640a9d8092d4 assets/eternal_starlight/particles/advanced_glow.json
70487e0406f4fbc40c6a147fb14954dbd60cd7e1 assets/eternal_starlight/particles/aethersent_smoke.json
80f29c59edeb07d57852a74a160b7619e049c7a4 assets/eternal_starlight/particles/amaramber_flame.json
Expand All @@ -7,6 +7,7 @@ df3620b4fc75de9ed119c43b5b58474f5bc41607 assets/eternal_starlight/particles/blad
5e60548fdce546847dadbb84ecb3a63b05c8a406 assets/eternal_starlight/particles/crystallized_moth_sonar.json
641c77c49f4a8a1145185d4910cb1ef687c6e990 assets/eternal_starlight/particles/energy.json
9a22fb5355c86494e5b317774a2fc4f96dc39212 assets/eternal_starlight/particles/explosion.json
020dd7cd4a3a4ade5dbf5ba631b9db43cb42e25d assets/eternal_starlight/particles/explosion_shock.json
5a3c2a2d77325bc3956bce6114ce7e57252db781 assets/eternal_starlight/particles/firefly.json
2fa6b966de82cbc7de1510007ab8640a9d8092d4 assets/eternal_starlight/particles/glow.json
58aff6c09e81b4e3406646bfc889267a76b2d6a6 assets/eternal_starlight/particles/ring_explosion.json
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "minecraft:item/template_spawn_egg"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "minecraft:item/template_spawn_egg"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"textures": [
"eternal_starlight:explosion_shock"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,39 @@
],
"subtitle": "subtitles.entity.eternal_starlight.boarwarf.yes"
},
"entity.creteor.charge": {
"sounds": [
"eternal_starlight:mob/creteor/charge"
],
"subtitle": "subtitles.entity.eternal_starlight.creteor.charge"
},
"entity.creteor.death": {
"sounds": [
"eternal_starlight:mob/creteor/death"
],
"subtitle": "subtitles.entity.eternal_starlight.creteor.death"
},
"entity.creteor.explode": {
"sounds": [
"eternal_starlight:mob/creteor/explode"
],
"subtitle": "subtitles.entity.eternal_starlight.creteor.explode"
},
"entity.creteor.hurt": {
"sounds": [
"eternal_starlight:mob/creteor/hurt1",
"eternal_starlight:mob/creteor/hurt2",
"eternal_starlight:mob/creteor/hurt3",
"eternal_starlight:mob/creteor/hurt4"
],
"subtitle": "subtitles.entity.eternal_starlight.creteor.hurt"
},
"entity.creteor.roll": {
"sounds": [
"eternal_starlight:mob/creteor/roll"
],
"subtitle": "subtitles.entity.eternal_starlight.creteor.roll"
},
"entity.ent.hurt": {
"sounds": [
"eternal_starlight:mob/ent/hurt"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"type": "minecraft:entity",
"pools": [
{
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"add": false,
"count": {
"type": "minecraft:uniform",
"max": 5.0,
"min": 3.0
},
"function": "minecraft:set_count"
},
{
"count": {
"type": "minecraft:uniform",
"max": 1.0,
"min": 0.0
},
"enchantment": "minecraft:looting",
"function": "minecraft:enchanted_count_increase"
}
],
"name": "eternal_starlight:raw_aethersent"
}
],
"rolls": 1.0
}
],
"random_sequence": "eternal_starlight:entities/creteor"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"type": "minecraft:entity",
"pools": [
{
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"add": false,
"count": {
"type": "minecraft:uniform",
"max": 3.0,
"min": 1.0
},
"function": "minecraft:set_count"
},
{
"count": {
"type": "minecraft:uniform",
"max": 1.0,
"min": 0.0
},
"enchantment": "minecraft:looting",
"function": "minecraft:enchanted_count_increase"
}
],
"name": "eternal_starlight:raw_aethersent"
}
],
"rolls": 1.0
}
],
"random_sequence": "eternal_starlight:entities/tiny_creteor"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"values": [
"eternal_starlight:astral_golem",
"eternal_starlight:creteor",
"eternal_starlight:tiny_creteor",
"eternal_starlight:crystallized_moth",
"eternal_starlight:shimmer_lacewing",
"eternal_starlight:grimstone_golem"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,7 @@ public static void registerParticleProviders(ParticleProviderRegisterStrategy st
strategy.register(ESParticles.SMOKE_TRAIL.get(), SmokeTrailParticle.Provider::new);
strategy.register(ESParticles.AETHERSENT_EXPLOSION.get(), AethersentExplosionParticle.Provider::new);
strategy.register(ESParticles.ASHEN_SNOW.get(), AshenSnowParticle.Provider::new);
strategy.register(ESParticles.EXPLOSION_SHOCK.get(), ExplosionShockParticle.Provider::new);
strategy.register(ESParticles.ADVANCED_GLOW.get(), AdvancedParticle.Provider::new);
strategy.register(ESParticles.SHINE.get(), AdvancedParticle.Provider::new);
}
Expand Down Expand Up @@ -631,6 +632,8 @@ public static void registerEntityRenderers(EntityRendererRegisterStrategy strate
strategy.register(ESEntities.LONESTAR_SKELETON.get(), LonestarSkeletonRenderer::new);
strategy.register(ESEntities.NIGHTFALL_SPIDER.get(), NightfallSpiderRenderer::new);
strategy.register(ESEntities.THIRST_WALKER.get(), ThirstWalkerRenderer::new);
strategy.register(ESEntities.CRETEOR.get(), CreteorRenderer::new);
strategy.register(ESEntities.TINY_CRETEOR.get(), TinyCreteorRenderer::new);
strategy.register(ESEntities.ENT.get(), EntRenderer::new);
strategy.register(ESEntities.RATLIN.get(), RatlinRenderer::new);
strategy.register(ESEntities.YETI.get(), YetiRenderer::new);
Expand Down Expand Up @@ -700,6 +703,10 @@ public static void registerLayers(RendererLayerRegisterStrategy strategy) {
strategy.register(LonestarSkeletonRenderer.LONESTAR_OUTER_ARMOR, () -> LayerDefinition.create(HumanoidArmorModel.createBodyLayer(INNER_ARMOR_DEFORMATION), 64, 32));
strategy.register(NightfallSpiderModel.LAYER_LOCATION, NightfallSpiderModel::createBodyLayer);
strategy.register(ThirstWalkerModel.LAYER_LOCATION, ThirstWalkerModel::createBodyLayer);
strategy.register(CreteorModel.LAYER_LOCATION, () -> CreteorModel.createBodyLayer(CubeDeformation.NONE));
strategy.register(CreteorModel.ARMOR_LOCATION, () -> CreteorModel.createBodyLayer(new CubeDeformation(2.0f)));
strategy.register(TinyCreteorModel.LAYER_LOCATION, () -> TinyCreteorModel.createBodyLayer(CubeDeformation.NONE));
strategy.register(TinyCreteorModel.ARMOR_LOCATION, () -> TinyCreteorModel.createBodyLayer(new CubeDeformation(2.0f)));
strategy.register(EntModel.LAYER_LOCATION, EntModel::createBodyLayer);
strategy.register(RatlinModel.LAYER_LOCATION, RatlinModel::createBodyLayer);
strategy.register(YetiModel.LAYER_LOCATION, YetiModel::createBodyLayer);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package cn.leolezury.eternalstarlight.common.client.model.animation.definition;

import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.animation.AnimationChannel;
import net.minecraft.client.animation.AnimationDefinition;
import net.minecraft.client.animation.Keyframe;
import net.minecraft.client.animation.KeyframeAnimations;

@Environment(EnvType.CLIENT)
public class CreteorAnimation {
public static final AnimationDefinition IDLE = AnimationDefinition.Builder.withLength(10.0F).looping()
.addAnimation("root", new AnimationChannel(AnimationChannel.Targets.POSITION,
new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
new Keyframe(5.0F, KeyframeAnimations.posVec(0.0F, -0.5F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
new Keyframe(10.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM)
))
.addAnimation("right_leg", new AnimationChannel(AnimationChannel.Targets.ROTATION,
new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
new Keyframe(5.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 5.0F), AnimationChannel.Interpolations.CATMULLROM),
new Keyframe(10.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM)
))
.addAnimation("right_leg", new AnimationChannel(AnimationChannel.Targets.POSITION,
new Keyframe(10.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM)
))
.addAnimation("left_leg", new AnimationChannel(AnimationChannel.Targets.ROTATION,
new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
new Keyframe(5.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, -5.0F), AnimationChannel.Interpolations.CATMULLROM),
new Keyframe(10.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM)
))
.addAnimation("left_leg", new AnimationChannel(AnimationChannel.Targets.POSITION,
new Keyframe(10.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM)
))
.addAnimation("right_arm", new AnimationChannel(AnimationChannel.Targets.ROTATION,
new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
new Keyframe(5.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 5.0F), AnimationChannel.Interpolations.CATMULLROM),
new Keyframe(10.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM)
))
.addAnimation("left_arm", new AnimationChannel(AnimationChannel.Targets.ROTATION,
new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
new Keyframe(5.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, -5.0F), AnimationChannel.Interpolations.CATMULLROM),
new Keyframe(10.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM)
))
.build();
}
Loading

0 comments on commit d6aa544

Please sign in to comment.