Skip to content

Commit

Permalink
Chill Dreams Improvements (#60)
Browse files Browse the repository at this point in the history
* Improvements to Chill Dreams Add-on

- Rename pen to pencil
- Fix turkey animations
- Use a purple theme

* fix(cd): Small fixes to Chill Dreams

* fix(cd): Remove animations altogether
  • Loading branch information
mammerla authored Nov 25, 2024
1 parent fd42374 commit bb50a67
Show file tree
Hide file tree
Showing 27 changed files with 312 additions and 245 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"minecraft:entity": {
"description": {
"identifier": "mamm_cds:dream_turkey",
"runtime_identifier": "minecraft:chicken",
"is_spawnable": true,
"is_summonable": true,
"is_experimental": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"format_version": "1.20.50",
"minecraft:item": {
"description": {
"identifier": "mamm_cds:journal_pen",
"identifier": "mamm_cds:journal_pencil",
"menu_category": {
"category": "Items"
}
Expand All @@ -11,7 +11,7 @@
"components": {
"minecraft:max_stack_size": 16,
"minecraft:icon": {
"texture": "mamm_cds:journal_pen"
"texture": "mamm_cds:journal_pencil"
},
"minecraft:wearable": {
"dispensable": true,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "1.20.10",
"format_version": "1.21.20",
"minecraft:recipe_shapeless": {
"description": {
"identifier": "mamm_cds:journal"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
{
"format_version": "1.20.10",
"format_version": "1.21.20",
"minecraft:recipe_shaped": {
"description": {
"identifier": "mamm_cds:journal_pen"
"identifier": "mamm_cds:journal_pencil"
},

"tags": ["crafting_table"],
"pattern": [" # ", " # ", "C.C"],
"key": {
"C": {
"item": "minecraft:stained_hardened_clay:12"
"item": "minecraft:brown_concrete"
},
".": {
"item": "mamm_cds:dream_essence"
Expand All @@ -24,7 +23,7 @@
}
],
"result": {
"item": "mamm_cds:journal_pen"
"item": "mamm_cds:journal_pencil"
}
}
}
7 changes: 6 additions & 1 deletion casual_creator/chill_dreams/complete/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,12 @@ exports.default = gulp.series(build, deploy_localmc);
exports.clean = gulp.series(clean_build, clean_localmc);
exports.watch = gulp.series(build, deploy_localmc, watch);
exports.serve = gulp.series(build, deploy_localmc, startServer, serve);
exports.package = gulp.series(build, gulp.parallel(create_bp_mcpack, create_rp_mcpack), create_mcaddon, create_source_pack);
exports.package = gulp.series(
build,
gulp.parallel(create_bp_mcpack, create_rp_mcpack),
create_mcaddon,
create_source_pack
);
exports.updateworld = gulp.series(
clean_localmc_world_backup,
backup_localmc_world,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"format_version": "1.8.0",
"animations": {
"animation.dream_turkey.baby_transform": {
"loop": true,
"bones": {
"head": {
"scale": 2.0
}
}
},
"animation.dream_turkey.general": {
"loop": true,
"bones": {
"body": {
"rotation": ["-this", 0.0, 0.0]
},
"wing0": {
"rotation": [0.0, 0.0, "variable.wing_flap - this"]
},
"wing1": {
"rotation": [0.0, 0.0, "-variable.wing_flap - this"]
}
}
},
"animation.dream_turkey.move": {
"anim_time_update": "query.modified_distance_moved",
"loop": true,
"bones": {
"leg0": {
"rotation": ["math.cos(query.anim_time * 38.17) * 80.0", 0.0, 0.0]
},
"leg1": {
"rotation": ["math.cos(query.anim_time * 38.17) * -80.0", 0.0, 0.0]
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
"geometry": {
"default": "geometry.mamm_cds.journal"
},
"animations": {
"hold_first_person": "animation.steve_head.hold_first_person",
"hold_third_person": "animation.steve_head.hold_third_person"
},
"render_controllers": ["controller.render.item_default"]
}
}
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"format_version": "1.20.30",
"minecraft:attachable": {
"description": {
"identifier": "mamm_cds:journal_pencil",
"item": { "mamm_cds:journal_pencil": "query.is_owner_identifier_any('minecraft:player')" },
"materials": {
"default": "entity",
"enchanted": "entity_alphatest_glint"
},
"textures": {
"default": "textures/mamm/cds/journal_pencil",
"enchanted": "textures/misc/enchanted_item_glint"
},
"geometry": {
"default": "geometry.mamm_cds.journal_pencil"
},
"render_controllers": ["controller.render.item_default"]
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
"default": "geometry.mamm_cds.dream_turkey"
},
"animations": {
"move": "animation.chicken.move",
"general": "animation.chicken.general",
"move": "animation.dream_turkey.move",
"general": "animation.dream_turkey.general",
"look_at_target": "animation.common.look_at_target",
"baby_transform": "animation.chicken.baby_transform"
"baby_transform": "animation.dream_turkey.baby_transform"
},
"scripts": {
"animate": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,10 @@
"materials": {
"default": "ender_pearl"
},
"animations": {
"move": "animation.chicken.general",
"general": "animation.chicken.general"
},
"render_controllers": ["controller.render.mamm_cds.memory_jar"],
"spawn_egg": {
"base_color": "#ff0000d9",
"overlay_color": "#73670a"
"base_color": "#b0aea4",
"overlay_color": "#b700ff"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"modules": [
{
"description": "Add-on Pack Resources",
"description": "Chill Dreams Resources",
"type": "resources",
"uuid": "09899f17-ecdf-4fdd-b42f-e2742c64e8b0",
"version": [1, 0, 0]
Expand Down
Loading

0 comments on commit bb50a67

Please sign in to comment.