From bb50a6731e22f6d33763c0d4c012439c896c11c1 Mon Sep 17 00:00:00 2001 From: Mike Ammerlaan Date: Mon, 25 Nov 2024 11:12:18 -0800 Subject: [PATCH] Chill Dreams Improvements (#60) * 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 --- .../mamm_cdsbp/entities/dream_turkey.json | 1 + .../{journal_pen.json => journal_pencil.json} | 4 +- .../mamm_cdsbp/recipes/dream_journal.json | 2 +- ...nal_pen.json => dream_journal_pencil.json} | 9 +- .../chill_dreams/complete/gulpfile.js | 7 +- .../animations/dream_turkey.animation.json | 39 ++++ .../mamm_cdsrp/attachables/journal.json | 4 - .../mamm_cdsrp/attachables/journal_pen.json | 25 --- .../attachables/journal_pencil.json | 21 ++ .../entity/dream_turkey.entity.json | 6 +- .../mamm_cdsrp/entity/memory_jar.entity.json | 8 +- .../resource_packs/mamm_cdsrp/manifest.json | 2 +- .../models/entity/dream_turkey.geo.json | 202 +++++++++--------- .../mamm_cdsrp/models/entity/journal.geo.json | 108 ++++++---- .../models/entity/journal_pen.geo.json | 29 --- .../models/entity/journal_pencil.geo.json | 29 +++ .../mamm_cdsrp/texts/en_US.lang | 2 +- .../mamm_cdsrp/textures/item_texture.json | 4 +- .../mamm/cds/cooked_dream_turkey_ico.png | Bin 272 -> 283 bytes .../textures/mamm/cds/dream_turkey.png | Bin 966 -> 1054 bytes .../textures/mamm/cds/dream_turkey_ico.png | Bin 269 -> 280 bytes .../textures/mamm/cds/journal_pen.png | Bin 252 -> 0 bytes .../textures/mamm/cds/journal_pen_ico.png | Bin 229 -> 0 bytes .../textures/mamm/cds/journal_pencil.png | Bin 0 -> 298 bytes .../textures/mamm/cds/journal_pencil_ico.png | Bin 0 -> 229 bytes .../chill_dreams/complete/scripts/Dream.ts | 4 +- .../chill_dreams/complete/scripts/main.ts | 51 +++-- 27 files changed, 312 insertions(+), 245 deletions(-) rename casual_creator/chill_dreams/complete/behavior_packs/mamm_cdsbp/items/{journal_pen.json => journal_pencil.json} (79%) rename casual_creator/chill_dreams/complete/behavior_packs/mamm_cdsbp/recipes/{dream_journal_pen.json => dream_journal_pencil.json} (70%) create mode 100644 casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/animations/dream_turkey.animation.json delete mode 100644 casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/attachables/journal_pen.json create mode 100644 casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/attachables/journal_pencil.json delete mode 100644 casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/models/entity/journal_pen.geo.json create mode 100644 casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/models/entity/journal_pencil.geo.json delete mode 100644 casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/textures/mamm/cds/journal_pen.png delete mode 100644 casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/textures/mamm/cds/journal_pen_ico.png create mode 100644 casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/textures/mamm/cds/journal_pencil.png create mode 100644 casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/textures/mamm/cds/journal_pencil_ico.png diff --git a/casual_creator/chill_dreams/complete/behavior_packs/mamm_cdsbp/entities/dream_turkey.json b/casual_creator/chill_dreams/complete/behavior_packs/mamm_cdsbp/entities/dream_turkey.json index 2a9d933..fdde665 100644 --- a/casual_creator/chill_dreams/complete/behavior_packs/mamm_cdsbp/entities/dream_turkey.json +++ b/casual_creator/chill_dreams/complete/behavior_packs/mamm_cdsbp/entities/dream_turkey.json @@ -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 diff --git a/casual_creator/chill_dreams/complete/behavior_packs/mamm_cdsbp/items/journal_pen.json b/casual_creator/chill_dreams/complete/behavior_packs/mamm_cdsbp/items/journal_pencil.json similarity index 79% rename from casual_creator/chill_dreams/complete/behavior_packs/mamm_cdsbp/items/journal_pen.json rename to casual_creator/chill_dreams/complete/behavior_packs/mamm_cdsbp/items/journal_pencil.json index 133b9c3..1a4fa4c 100644 --- a/casual_creator/chill_dreams/complete/behavior_packs/mamm_cdsbp/items/journal_pen.json +++ b/casual_creator/chill_dreams/complete/behavior_packs/mamm_cdsbp/items/journal_pencil.json @@ -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" } @@ -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, diff --git a/casual_creator/chill_dreams/complete/behavior_packs/mamm_cdsbp/recipes/dream_journal.json b/casual_creator/chill_dreams/complete/behavior_packs/mamm_cdsbp/recipes/dream_journal.json index 0a914f1..16efffc 100644 --- a/casual_creator/chill_dreams/complete/behavior_packs/mamm_cdsbp/recipes/dream_journal.json +++ b/casual_creator/chill_dreams/complete/behavior_packs/mamm_cdsbp/recipes/dream_journal.json @@ -1,5 +1,5 @@ { - "format_version": "1.20.10", + "format_version": "1.21.20", "minecraft:recipe_shapeless": { "description": { "identifier": "mamm_cds:journal" diff --git a/casual_creator/chill_dreams/complete/behavior_packs/mamm_cdsbp/recipes/dream_journal_pen.json b/casual_creator/chill_dreams/complete/behavior_packs/mamm_cdsbp/recipes/dream_journal_pencil.json similarity index 70% rename from casual_creator/chill_dreams/complete/behavior_packs/mamm_cdsbp/recipes/dream_journal_pen.json rename to casual_creator/chill_dreams/complete/behavior_packs/mamm_cdsbp/recipes/dream_journal_pencil.json index f3d8f11..82b3f12 100644 --- a/casual_creator/chill_dreams/complete/behavior_packs/mamm_cdsbp/recipes/dream_journal_pen.json +++ b/casual_creator/chill_dreams/complete/behavior_packs/mamm_cdsbp/recipes/dream_journal_pencil.json @@ -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" @@ -24,7 +23,7 @@ } ], "result": { - "item": "mamm_cds:journal_pen" + "item": "mamm_cds:journal_pencil" } } } diff --git a/casual_creator/chill_dreams/complete/gulpfile.js b/casual_creator/chill_dreams/complete/gulpfile.js index 859277a..411a278 100644 --- a/casual_creator/chill_dreams/complete/gulpfile.js +++ b/casual_creator/chill_dreams/complete/gulpfile.js @@ -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, diff --git a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/animations/dream_turkey.animation.json b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/animations/dream_turkey.animation.json new file mode 100644 index 0000000..e8d19e6 --- /dev/null +++ b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/animations/dream_turkey.animation.json @@ -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] + } + } + } + } +} diff --git a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/attachables/journal.json b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/attachables/journal.json index f480066..72634e2 100644 --- a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/attachables/journal.json +++ b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/attachables/journal.json @@ -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"] } } diff --git a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/attachables/journal_pen.json b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/attachables/journal_pen.json deleted file mode 100644 index 0be7fb0..0000000 --- a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/attachables/journal_pen.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "format_version": "1.20.30", - "minecraft:attachable": { - "description": { - "identifier": "mamm_cds:journal_pen", - "item": { "mamm_cds:journal_pen": "query.is_owner_identifier_any('minecraft:player')" }, - "materials": { - "default": "entity", - "enchanted": "entity_alphatest_glint" - }, - "textures": { - "default": "textures/mamm/cds/journal_pen", - "enchanted": "textures/misc/enchanted_item_glint" - }, - "geometry": { - "default": "geometry.mamm_cds.journal_pen" - }, - "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"] - } - } -} diff --git a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/attachables/journal_pencil.json b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/attachables/journal_pencil.json new file mode 100644 index 0000000..42c8b54 --- /dev/null +++ b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/attachables/journal_pencil.json @@ -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"] + } + } +} diff --git a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/entity/dream_turkey.entity.json b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/entity/dream_turkey.entity.json index 45c5e42..9b4d058 100644 --- a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/entity/dream_turkey.entity.json +++ b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/entity/dream_turkey.entity.json @@ -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": [ diff --git a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/entity/memory_jar.entity.json b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/entity/memory_jar.entity.json index ded96da..66979dd 100644 --- a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/entity/memory_jar.entity.json +++ b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/entity/memory_jar.entity.json @@ -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" } } } diff --git a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/manifest.json b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/manifest.json index 9e9cc15..a3008c4 100644 --- a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/manifest.json +++ b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/manifest.json @@ -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] diff --git a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/models/entity/dream_turkey.geo.json b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/models/entity/dream_turkey.geo.json index b2fa254..9a80e93 100644 --- a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/models/entity/dream_turkey.geo.json +++ b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/models/entity/dream_turkey.geo.json @@ -1,107 +1,97 @@ { - "format_version": "1.12.0", - "minecraft:geometry": [ - { - "description": { - "identifier": "geometry.mamm_cds.dream_turkey", - "texture_width": 64, - "texture_height": 32, - "visible_bounds_width": 3, - "visible_bounds_height": 2.25, - "visible_bounds_offset": [0, 0.875, 0] - }, - "bones": [ - { - "name": "body", - "pivot": [0, 8, 0], - "cubes": [ - { "origin": [-4, 12, -5], "size": [8, 2, 7], "pivot": [0, 8, 0], "rotation": [90, 0, 0], "uv": [-1, 8] }, - { "origin": [-4, 3, -6], "size": [8, 9, 9], "pivot": [0, 8, 0], "rotation": [90, 0, 0], "uv": [0, 9] } - ] - }, - { - "name": "head", - "pivot": [0, 9, -4], - "cubes": [ - { "origin": [-2, 14, -6], "size": [4, 3, 2], "uv": [1, 1] }, - { "origin": [-1, 17, -5], "size": [2, 1, 3], "uv": [18, 16] } - ], - "locators": { - "lead": [0, 9, -4] - } - }, - { - "name": "comb", - "parent": "head", - "pivot": [0, 9, -4], - "cubes": [ - { "origin": [-2, 10, -5], "size": [4, 2, 1], "uv": [54, 5] }, - { "origin": [-2, 11, -4], "size": [4, 6, 3], "uv": [50, 0] } - ] - }, - { - "name": "beak", - "parent": "head", - "pivot": [0, 9, -4], - "cubes": [{ "origin": [-1, 14, -8], "size": [2, 2, 2], "uv": [14, 0] }] - }, - { - "name": "leg0", - "pivot": [-2, 5, 1], - "cubes": [{ "origin": [-3, 0, -4], "size": [3, 2, 3], "uv": [26, 0] }] - }, - { - "name": "leg1", - "pivot": [1, 5, 1], - "cubes": [{ "origin": [0, 0, -4], "size": [3, 2, 3], "uv": [26, 0] }] - }, - { - "name": "wing0", - "pivot": [-5, 11, 0], - "rotation": [0, 0, 42.5], - "cubes": [{ "origin": [-5, 6, -3], "size": [1, 6, 7], "uv": [23, 12] }] - }, - { - "name": "wing1", - "pivot": [3, 11, 0], - "cubes": [ - { "origin": [10, 0, -3], "size": [1, 6, 7], "pivot": [0, 0, 0], "rotation": [0, 0, -40], "uv": [23, 12] } - ] - }, - { - "name": "tail", - "pivot": [0, 15, 11], - "cubes": [ - { "origin": [-1, 20, 6], "size": [2, 1, 7], "pivot": [0, 15, 11], "rotation": [90, 0, 0], "uv": [45, 24] }, - { "origin": [1, 20, 6], "size": [1, 1, 6], "pivot": [0, 15, 11], "rotation": [90, 0, 0], "uv": [32, 25] }, - { "origin": [2, 20, 6], "size": [1, 1, 5], "pivot": [0, 15, 11], "rotation": [90, 0, 0], "uv": [52, 15] }, - { "origin": [3, 20, 6], "size": [1, 1, 4], "pivot": [0, 15, 11], "rotation": [90, 0, 0], "uv": [38, 16] }, - { "origin": [4, 20, 6], "size": [1, 1, 3], "pivot": [0, 15, 11], "rotation": [90, 0, 0], "uv": [39, 10] }, - { - "origin": [-1.9, 20, 6], - "size": [1, 1, 6], - "pivot": [0, 15, 11], - "rotation": [90, 0, 0], - "uv": [32, 25] - }, - { - "origin": [-2.9, 20, 6], - "size": [1, 1, 5], - "pivot": [0, 15, 11], - "rotation": [90, 0, 0], - "uv": [52, 15] - }, - { - "origin": [-3.9, 20, 6], - "size": [1, 1, 4], - "pivot": [0, 15, 11], - "rotation": [90, 0, 0], - "uv": [38, 16] - }, - { "origin": [-4.9, 20, 6], "size": [1, 1, 3], "pivot": [0, 15, 11], "rotation": [90, 0, 0], "uv": [39, 10] } - ] - } - ] - } - ] -} + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.mamm_cds.dream_turkey", + "texture_width": 64, + "texture_height": 32, + "visible_bounds_width": 3, + "visible_bounds_height": 2.25, + "visible_bounds_offset": [0, 0.875, 0] + }, + "bones": [ + { + "name": "body", + "pivot": [0, 8, 0], + "cubes": [ + {"origin": [-4, 12, -5], "size": [8, 2, 7], "pivot": [0, 8, 0], "rotation": [90, 0, 0], "uv": [-1, 8]}, + {"origin": [-4, 3, -6], "size": [8, 9, 9], "pivot": [0, 8, 0], "rotation": [90, 0, 0], "uv": [0, 9]} + ] + }, + { + "name": "head", + "pivot": [0, 9, -4], + "cubes": [ + {"origin": [-2, 14, -6], "size": [4, 3, 2], "uv": [1, 1]}, + {"origin": [-1, 17, -5], "size": [2, 1, 3], "uv": [18, 16]} + ], + "locators": { + "lead": [0, 9, -4] + } + }, + { + "name": "comb", + "parent": "head", + "pivot": [0, 9, -4], + "cubes": [ + {"origin": [-2, 10, -5], "size": [4, 2, 1], "uv": [54, 5]}, + {"origin": [-2, 11, -4], "size": [4, 6, 3], "uv": [50, 0]} + ] + }, + { + "name": "beak", + "parent": "head", + "pivot": [0, 9, -4], + "cubes": [ + {"origin": [-1, 14, -8], "size": [2, 2, 2], "uv": [14, 0]} + ] + }, + { + "name": "leg0", + "pivot": [-2, 5, 1], + "cubes": [ + {"origin": [-3, 0, -4], "size": [3, 2, 3], "uv": [26, 0]} + ] + }, + { + "name": "leg1", + "pivot": [1, 5, 1], + "cubes": [ + {"origin": [0, 0, -4], "size": [3, 2, 3], "uv": [26, 0]} + ] + }, + { + "name": "wing0", + "pivot": [-4, 11, 0], + "rotation": [0, 0, 42.5], + "cubes": [ + {"origin": [-5, 5, -3], "size": [1, 6, 7], "uv": [22, 12]} + ] + }, + { + "name": "wing1", + "pivot": [4, 11, 0], + "cubes": [ + {"origin": [4, 5, -3], "size": [1, 6, 7], "uv": [22, 12]} + ] + }, + { + "name": "tail", + "pivot": [0, 15, 11], + "cubes": [ + {"origin": [-1, 20, 6], "size": [2, 1, 7], "pivot": [0, 15, 11], "rotation": [90, 0, 0], "uv": [45, 24]}, + {"origin": [1, 20, 6], "size": [1, 1, 6], "pivot": [0, 15, 11], "rotation": [90, 0, 0], "uv": [32, 25]}, + {"origin": [2, 20, 6], "size": [1, 1, 5], "pivot": [0, 15, 11], "rotation": [90, 0, 0], "uv": [52, 15]}, + {"origin": [3, 20, 6], "size": [1, 1, 4], "pivot": [0, 15, 11], "rotation": [90, 0, 0], "uv": [38, 16]}, + {"origin": [4, 20, 6], "size": [1, 1, 3], "pivot": [0, 15, 11], "rotation": [90, 0, 0], "uv": [39, 10]}, + {"origin": [-1.9, 20, 6], "size": [1, 1, 6], "pivot": [0, 15, 11], "rotation": [90, 0, 0], "uv": [32, 25]}, + {"origin": [-2.9, 20, 6], "size": [1, 1, 5], "pivot": [0, 15, 11], "rotation": [90, 0, 0], "uv": [52, 15]}, + {"origin": [-3.9, 20, 6], "size": [1, 1, 4], "pivot": [0, 15, 11], "rotation": [90, 0, 0], "uv": [38, 16]}, + {"origin": [-4.9, 20, 6], "size": [1, 1, 3], "pivot": [0, 15, 11], "rotation": [90, 0, 0], "uv": [39, 10]} + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/models/entity/journal.geo.json b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/models/entity/journal.geo.json index d0dbe8e..cce6bba 100644 --- a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/models/entity/journal.geo.json +++ b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/models/entity/journal.geo.json @@ -1,45 +1,65 @@ { - "format_version": "1.16.0", - "minecraft:geometry": [ - { - "description": { - "identifier": "geometry.mamm_cds.journal", - "texture_width": 32, - "texture_height": 32, - "visible_bounds_width": 2, - "visible_bounds_height": 5, - "visible_bounds_offset": [0, 0.5, 0] - }, - "bones": [ - { - "name": "journalbase", - "pivot": [0, 0, 0], - "binding": "q.item_slot_to_bone_name(context.item_slot)", - "cubes": [ - {"origin": [-4, 11, -4.4], "size": [7, 11, 1], "pivot": [-1, 11, -1.4], "rotation": [0, 135, 0], "uv": [0, 0]}, - {"origin": [-1.4, 11, 1.6], "size": [8, 11, 1], "pivot": [0, -20, 0], "rotation": [0, 30, 0], "uv": [14, 0]} - ] - }, - { - "name": "journalprongs", - "pivot": [0, 0, 0], - "binding": "q.item_slot_to_bone_name(context.item_slot)" - }, - { - "name": "journalextraprongs", - "pivot": [0, 0, 0], - "binding": "q.item_slot_to_bone_name(context.item_slot)" - }, - { - "name": "journaljewels", - "pivot": [0, 0, 0], - "binding": "q.item_slot_to_bone_name(context.item_slot)", - "cubes": [ - {"origin": [-5.35, 11.9, 1.2], "size": [6, 9.5, 0.5], "pivot": [0, -20, 0], "rotation": [0, -45, 0], "uv": [0, 23]}, - {"origin": [-0.5, 11.9, 1.2], "size": [6, 9.5, 0.5], "pivot": [0, -20, 0], "rotation": [0, 30, 0], "uv": [22, 23]} - ] - } - ] - } - ] -} \ No newline at end of file + "format_version": "1.16.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.mamm_cds.journal", + "texture_width": 32, + "texture_height": 32, + "visible_bounds_width": 2, + "visible_bounds_height": 5, + "visible_bounds_offset": [0, 0.5, 0] + }, + "bones": [ + { + "name": "journal", + "pivot": [0, 2, 0], + "rotation": [0, 0, 7.5], + "binding": "q.item_slot_to_bone_name(context.item_slot)" + }, + { + "name": "cover", + "parent": "journal", + "pivot": [0, 2, 0], + "cubes": [ + { + "origin": [-4, 13, -4.4], + "size": [7, 11, 1], + "pivot": [-1, 13, -1.4], + "rotation": [0, 135, 0], + "uv": [0, 0] + }, + { + "origin": [-1.4, 13, 1.6], + "size": [8, 11, 1], + "pivot": [0, -18, 0], + "rotation": [0, 30, 0], + "uv": [14, 0] + } + ] + }, + { + "name": "pagepaper", + "parent": "journal", + "pivot": [0, 2, 0], + "cubes": [ + { + "origin": [-5.35, 13.9, 1.2], + "size": [6, 9.5, 0.5], + "pivot": [0, -18, 0], + "rotation": [0, -45, 0], + "uv": [0, 23] + }, + { + "origin": [-0.5, 13.9, 1.2], + "size": [6, 9.5, 0.5], + "pivot": [0, -18, 0], + "rotation": [0, 30, 0], + "uv": [22, 23] + } + ] + } + ] + } + ] +} diff --git a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/models/entity/journal_pen.geo.json b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/models/entity/journal_pen.geo.json deleted file mode 100644 index 5bd35a4..0000000 --- a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/models/entity/journal_pen.geo.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "format_version": "1.16.0", - "minecraft:geometry": [ - { - "description": { - "identifier": "geometry.mamm_cds.journal_pen", - "texture_width": 32, - "texture_height": 32, - "visible_bounds_width": 3, - "visible_bounds_height": 4, - "visible_bounds_offset": [0, 1, 0] - }, - "bones": [ - { - "name": "bb_main", - "pivot": [0.1, 19, -6], - "rotation": [125, 0, 0], - "binding": "q.item_slot_to_bone_name(context.item_slot)", - "cubes": [ - {"origin": [-0.9, 9, -8], "size": [2, 16, 3], "uv": [0, 13]}, - {"origin": [-0.9, 25, -8], "size": [2, 1, 3], "uv": [13, 5]}, - {"origin": [-0.9, 26, -7.4], "size": [2, 1, 2], "uv": [0, 6]}, - {"origin": [-0.9, 27, -6.8], "size": [2, 1, 1], "uv": [16, 17]} - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/models/entity/journal_pencil.geo.json b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/models/entity/journal_pencil.geo.json new file mode 100644 index 0000000..f5a0fc0 --- /dev/null +++ b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/models/entity/journal_pencil.geo.json @@ -0,0 +1,29 @@ +{ + "format_version": "1.16.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.mamm_cds.journal_pencil", + "texture_width": 32, + "texture_height": 32, + "visible_bounds_width": 3, + "visible_bounds_height": 4, + "visible_bounds_offset": [0, 1, 0] + }, + "bones": [ + { + "name": "pen", + "pivot": [0.1, 19, -6], + "rotation": [125, 0, 0], + "binding": "q.item_slot_to_bone_name(context.item_slot)", + "cubes": [ + { "origin": [-0.9, 9, -8], "size": [2, 16, 3], "uv": [0, 13] }, + { "origin": [-0.9, 25, -8], "size": [2, 1, 3], "uv": [0, 12] }, + { "origin": [-0.9, 26, -7.4], "size": [2, 1, 2], "uv": [0, 9] }, + { "origin": [-0.9, 27, -6.8], "size": [2, 1, 1], "uv": [0, 7] } + ] + } + ] + } + ] +} diff --git a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/texts/en_US.lang b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/texts/en_US.lang index 7e2fbb2..68634fd 100644 --- a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/texts/en_US.lang +++ b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/texts/en_US.lang @@ -3,7 +3,7 @@ item.spawn_egg.entity.mamm_cds:dream_turkey.name=Spawn Dream Turkey entity.mamm_cds:memory_jar.name=Memory item.spawn_egg.entity.mamm_cds:memory_jar.name=Spawn Memory item.mamm_cds:journal=Dream Journal -item.mamm_cds:journal_pen=Dream Journal Pencil +item.mamm_cds:journal_pencil=Dream Journal Pencil item.mamm_cds:dream_turkey=Raw Dream Turkey item.mamm_cds:dream_essence=Dream Essence item.mamm_cds:cooked_dream_turkey=Cooked Dream Turkey diff --git a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/textures/item_texture.json b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/textures/item_texture.json index 8174bb5..0f83a75 100644 --- a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/textures/item_texture.json +++ b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/textures/item_texture.json @@ -5,8 +5,8 @@ "mamm_cds:journal": { "textures": "textures/mamm/cds/journal_ico" }, - "mamm_cds:journal_pen": { - "textures": "textures/mamm/cds/journal_pen_ico" + "mamm_cds:journal_pencil": { + "textures": "textures/mamm/cds/journal_pencil_ico" }, "mamm_cds:dream_turkey": { "textures": "textures/mamm/cds/dream_turkey_ico" diff --git a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/textures/mamm/cds/cooked_dream_turkey_ico.png b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/textures/mamm/cds/cooked_dream_turkey_ico.png index 8e9cd78cc5f534dd5a2fb8286718792bdbfbea69..9bcfabac4da05d2350dd2d066f2f2e0664e344fd 100644 GIT binary patch delta 251 zcmbQhG@EIHq$o231A~Sxe=v|@EDmyaVpw-h=H*01;d;3MpAgp$h3>Onr|wkWyOeZ( zwc(m)OP)jtMBZz@@ovovpaykUg(X0Wt0c%T_&*FVY&xTJ9w^FL;1OBOz`%DHgc*m!-PQ>1-VhQA|}A9tmCUIq~zG sU#SWA_7$hNm#@hweBP|QFXS)7uR7N4vN>D@K+73CUHx3vIVCg!00zuwJpcdz delta 255 zcmVYW9)_k_s>;JvE)&DQ`C4t!_8MG$W5Ud%b5yS>z7@MFW zAO$d6VH!b(J=?bgj6rfyIs*TRG5|y)YX)JM%WxV3^DDZ|FnG<#;eufZ%yy6>SU6zQ zOwa%j2C-oV!CZx`86=L=0OV+cxdKGPyoNIjU}s06c@UUJ2SSezgTX{;?3 zZ0xLpTKNMkMG&;J5MpVYRuSArxMEjZ;r5Q8!oe^W351M=_m<^~AjStX*qk z{O!<_TC)gdo`3H)3IgahuODBp^&_9H007DRyRvuZUG42aZomBdH>OKVg}O-`25k=_B!R-r1b-*>#9*v*n&wzoSip~VyHK{d zxmhYBw1`laWjT2O*x%oWT1QXLxv`^v1ty|4@&FL}5P#yFqtof+Z1l_ya7Nj)LB zc)n*r3o}CWjJjP!-EN^weYzCke?+bVobv)X+dF-qcCXv8zV+rz`nAFOv(ac|l?IYY zHD0jU5V9;ox7+n5cYABS(YU~dQXoVyoeg@Kk4;lJ7%t;rxZHTZ)(Ie(Nb4(KW%Dnq zM=27tL4Q9Z>e%Sz6nOd9}jA*l7L8l-7j z2&l-$qz+B00C|mR0&A&&kBzIHI$`v#%cTwHs(%9Ht}Zer8=q(~ilW>zsk1QKTTv59myOL@hm=x|MkARdiA<8D z(Fu95cfnd0y24qNjLltrFGutrl|1Db^s|9;UfS;_8HC|rGo2HQ{VDD}yJQ?!s9$wm zIDbhrr}i&|$df9j#A_5qNYfNT2;+(EBZD>@TX|R&)DXtwaixt4(`}M5mdogPJkA3q z%vPSrpC`h>ELTPYQ-c^?s$4dz0x-r(F@Ty<+t}DZJj>XcBE*3ue|Hurq6hS(iHmIP^At&SLen46n_AaB)jBV#RNwH0000&a6}KQd98xEivUcpy zg{>26`#Y*iNbN)ihK^lXi;&1ti6JR#rE^Y*4wbC1oCLT7ICUJ`ao{d@ebVU?``Phl zfA;tMd62+4=af=}VF&<7(^RfTuh;XS;Ba@72ahkoe)|A`pMSqtss7D}AC)#LE{8kZ zU;0?fbH#bL%jNecqmi-ij#?0gAtxtg-T@E*_~!|q-mY`N>YxE(PtpEVYw^zLP@@wPmAl&}Z#RdM%&zI_kag3#YU)#=? z4LdnG!NS4<0AO)(5x(z(QVPy_;Td9k2!l9Kni=nAQtu2xg8MYb+}s?_yWLXR+S*#B zOrRqSqLdcK1HjqY8RR4ZlV}A&OpfH{>R#|xgQGQoX@E*2% z7IXlV3=5+OVHB0h z3&sgB4S$#rQhPtpaR?zLPLd=X&|k3Hgw+G`JO?49w1T2cJlApLzGMW!{S@E0;K>&O zd9SJiluv#WM?kKZqd}UcB|#-Py67;IQNV>`YbQ^bcviz@+t5yca95i#I*yB448ySS zjJCGH-qscNwyv~wr3o;tsLn_m$HY}vd)liH+<#60rL+>;)m3!ixVBRbPm+Xl&iP<4 z;7O8j5h2Ef?Slu#I^QN|Wn)b4>Kfn0cVy#5jzK*eCLx+klh9Fbdp6uOimH{Z= zA<{H0lw%l%t&1kVPSgm9!Mj3tnx$9u-{#81z+@4lhAJCJ zj(-4zkctM7Q);WLtB7wiwyIzPfW9GrHwl#T0V+h9Fr-P`XN;95KzHKXyreB?4?$JR zx^P694Bf#ep6k4%EjV3 S>~kjo0000r% zzwi97aBX|B_tU-RyYJS#25Q(L+MWuexJrWjg8#z+!=^Jj=YgV}1s;*b3=DjSL74G) z{)!Z!V6LZ&V~9p@>{&)W7DW!`13?F3|NVcs`oys(9wucjj(@K*uJ~oZpq#s+JYxCI z+4E2Dozg3KhC4=ZqtB&=$>OR^6Z8W1H9XC_9L_9tQX%JG!@-4;e5N@SQ*^IPGyZnA qu3uJq)u)3y!%X-5JlYr?YX7B%b(wPR^!Y%W89ZJ6T-G@yGywo3Eo+?s delta 252 zcmVk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0(2Ka=yZn^R>N?Gj9kG~!!@@moo4fXSZGUb}>lYkU^NswRge=uN>@@94e z3UL;AL>4nJ@ErzW#^d=bQhNS%G}f0G|-o|B5;e4h~I;RxU;|^>w*GVIcUkW_~%4VlN5u3;quV3{u|AZa^W< z0*}aI1_r)EAj~ML;ne^Xbn|p^4ABUVJ$q3IXuZot-!K2?>!_@)eK=2&`CBgoLnDWC zw$|6q?Y|}p%q{rsRCeGs^HTFGaSm@UtmM5b{@u36QTG0`Giv)~SREBR^FTH;c)I$z JtaD0e0sxUYM@|3$ diff --git a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/textures/mamm/cds/journal_pencil.png b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/textures/mamm/cds/journal_pencil.png new file mode 100644 index 0000000000000000000000000000000000000000..5d78d20980b3bd59f18977cd348394a797c0ebdd GIT binary patch literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=A3a?hLn`LHy?L7Rkb_9;L+d2{ zX$j0`3Qg6k3o_RnX>C%t(a0OoWF{Qm#O9;KWk31n{?HT5eCc^|6F594sdxreUOHX& z_vp@M!$r&&g8HZC?>4LUb0|LkwkmUO$H@}2j;Zxpbxb-9d=B2R-)pAdna}BWU^(;B zJ-l7>8MqfPUjWJc{%O5HbNhDZkHQA`&i5C3J&(B7-O;iA?XrE(pDy{qxq-oo;Vjb& z1{0Y2%>)I!ucm#!Uf+DR?CJi4b9&ylo6cnn{lgN$AlvYb!9HE}(@~FE{y@(&c)I$z JtaD0e0s!1AcP{_{ literal 0 HcmV?d00001 diff --git a/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/textures/mamm/cds/journal_pencil_ico.png b/casual_creator/chill_dreams/complete/resource_packs/mamm_cdsrp/textures/mamm/cds/journal_pencil_ico.png new file mode 100644 index 0000000000000000000000000000000000000000..0ae489796d95a5935840dac9711c66020a1690b9 GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}f0G|-ot&0C092}ag@?B&s>vM~N!a$I_FJH!o2QFoh(>Vi*^5Fz>s>DTe)&INM`dm8!+Da--+CDs8abS^ zwZ3+4|20uyZozM-vIDP~mzrORb9j4UCGTDF@3uXTviF~zQQI%W>ZsV6R}M6h!PC{x JWt~$(696NGNW=gD literal 0 HcmV?d00001 diff --git a/casual_creator/chill_dreams/complete/scripts/Dream.ts b/casual_creator/chill_dreams/complete/scripts/Dream.ts index f8def24..a250946 100644 --- a/casual_creator/chill_dreams/complete/scripts/Dream.ts +++ b/casual_creator/chill_dreams/complete/scripts/Dream.ts @@ -148,9 +148,9 @@ export default class Dream { "Around" + (refPoint.title ? " " + refPoint.title : "") + " at " + - refPoint.location.x + + Math.round(refPoint.location.x) + ", " + - refPoint.location.z, + Math.round(refPoint.location.z), }); } } diff --git a/casual_creator/chill_dreams/complete/scripts/main.ts b/casual_creator/chill_dreams/complete/scripts/main.ts index fe52074..e1daf19 100644 --- a/casual_creator/chill_dreams/complete/scripts/main.ts +++ b/casual_creator/chill_dreams/complete/scripts/main.ts @@ -11,7 +11,7 @@ import { EntityDieAfterEvent, } from "@minecraft/server"; import MemorySet from "./MemorySet"; -import { ActionFormData, ModalFormData, ModalFormResponse } from "@minecraft/server-ui"; +import { ActionFormData, MessageFormData, ModalFormData, ModalFormResponse } from "@minecraft/server-ui"; import Utilities from "./Utilities"; import IPlayerSettings from "./IPlayerSettings"; import Dream from "./Dream"; @@ -170,9 +170,6 @@ async function startDream(player: Player) { spawnDimensionId = "overworld"; } - dream.addPoint(player.location, player.dimension.id, "Napping Point"); - dream.addPoint(spawnLoc, spawnDimensionId, "Bed"); - dream.setupDreamFromMemories(memorySet); dream.activate(); @@ -182,6 +179,7 @@ async function startDream(player: Player) { const modalForm = new ModalFormData() .title("Dream Preferences") .title("Dream") + .toggle("...at your nap spot and bed", true) .toggle("...around your memories") .toggle("...about random places") .toggle("...nightmares"); @@ -192,15 +190,19 @@ async function startDream(player: Player) { } catch (e) {} if (response && response.formValues && response.formValues.length > 1) { - if (response.formValues[0]) { - dream.generateAdditionalNearReferencePoints(); + if (response.formValues[0] === true || memorySet.getMemories().length) { + dream.addPoint(player.location, player.dimension.id, "Napping Point"); + dream.addPoint(spawnLoc, spawnDimensionId, "Bed"); } - if (response.formValues[2]) { - dream.generateAdditionalNetherPoints(); + if (response.formValues[1] === true) { + dream.generateAdditionalNearReferencePoints(); } - if (response.formValues[1]) { + if (response.formValues[2] === true) { dream.generateAdditionalRandomPoints(); } + if (response.formValues[3] === true) { + dream.generateAdditionalNetherPoints(); + } } } @@ -211,7 +213,7 @@ function afterItemUse(event: ItemUseAfterEvent) { if (event.itemStack.typeId === "mamm_cds:journal") { useJournalBook(event.source as Player); - } else if (event.itemStack.typeId === "mamm_cds:journal_pen") { + } else if (event.itemStack.typeId === "mamm_cds:journal_pencil") { useJournalPen(event.source as Player); } } @@ -233,14 +235,18 @@ function entityDie(event: EntityDieAfterEvent) { } async function useJournalBook(player: Player) { - const afd = new ActionFormData().title("Re-visit your memories"); + const afd = new ActionFormData().title("Memories"); + + let bodyStr = "Dream Journal Pen Recipe: Brown Concrete, Dream Essence (from Dream Turkeys), Stick"; const memoryList = memorySet.getMemories(); + if (memoryList.length === 0) { - world.sendMessage("No memories are available."); - return; + afd.button("No memories are available."); } + afd.body(bodyStr); + for (let i = 0; i < memoryList.length; i++) { afd.button(memoryList[i].getEffectiveTitle()); } @@ -251,6 +257,18 @@ async function useJournalBook(player: Player) { } catch (e) {} if (response && !response.canceled && response.selection !== undefined) { + if (memoryList.length === 0 && response.selection === 0) { + const instructionD = new MessageFormData().body( + "Memories influence your dreams. You can also use your dream journal to revisit your memories.\r\n\r\nCapture memories with a dream journal pen (brown hardened clay, dream essence, and sticks). Get dream essence from dream turkeys." + ); + + instructionD.button1("Cancel"); + instructionD.button2("Got it!"); + + await instructionD.show(player); + return; + } + const memory = memoryList[response.selection]; if (memory && memory.location && memory.dimensionId) { @@ -267,6 +285,13 @@ async function useJournalBook(player: Player) { const memLoc = memory.location; const memDim = memory.dimensionId; + player.onScreenDisplay.setTitle(" ", { + subtitle: "§oI remember " + memory.getEffectiveTitle() + "...§r", + fadeInDuration: 8, + fadeOutDuration: 8, + stayDuration: 40, + }); + system.runTimeout(async () => { const uiPlayer = Utilities.getPlayerById(playerId);