-
Notifications
You must be signed in to change notification settings - Fork 68
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #601 from Wall-ev/1.19.2
Sync 1.19.2
- Loading branch information
Showing
579 changed files
with
27,450 additions
and
4,500 deletions.
There are no files selected for viewing
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 |
|---|---|---|
|
|
@@ -24,6 +24,7 @@ test | |
|
|
||
| # Files from Forge MDK | ||
| forge*changelog.txt | ||
| /src/generated/resources/.cache/ | ||
|
|
||
| # vscode | ||
| .vscode | ||
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
37 changes: 37 additions & 0 deletions
37
src/generated/resources/data/touhou_little_maid/advancements/base/build_altar.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,37 @@ | ||
| { | ||
| "parent": "touhou_little_maid:base/craft_gohei", | ||
| "criteria": { | ||
| "maid_event": { | ||
| "conditions": { | ||
| "event": "build_altar" | ||
| }, | ||
| "trigger": "touhou_little_maid:maid/tamed_maid" | ||
| } | ||
| }, | ||
| "display": { | ||
| "announce_to_chat": true, | ||
| "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png", | ||
| "description": { | ||
| "translate": "advancements.touhou_little_maid.base.build_altar.description" | ||
| }, | ||
| "frame": "task", | ||
| "hidden": false, | ||
| "icon": { | ||
| "item": "minecraft:red_wool" | ||
| }, | ||
| "show_toast": true, | ||
| "title": { | ||
| "translate": "advancements.touhou_little_maid.base.build_altar.title" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "maid_event" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "loot": [ | ||
| "touhou_little_maid:advancement/power_point" | ||
| ] | ||
| } | ||
| } |
32 changes: 32 additions & 0 deletions
32
src/generated/resources/data/touhou_little_maid/advancements/base/change_chair_model.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,32 @@ | ||
| { | ||
| "parent": "touhou_little_maid:base/craft_chair", | ||
| "criteria": { | ||
| "maid_event": { | ||
| "conditions": { | ||
| "event": "change_chair_model" | ||
| }, | ||
| "trigger": "touhou_little_maid:maid/tamed_maid" | ||
| } | ||
| }, | ||
| "display": { | ||
| "announce_to_chat": true, | ||
| "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png", | ||
| "description": { | ||
| "translate": "advancements.touhou_little_maid.base.change_chair_model.description" | ||
| }, | ||
| "frame": "task", | ||
| "hidden": false, | ||
| "icon": { | ||
| "item": "touhou_little_maid:change_chair_model" | ||
| }, | ||
| "show_toast": true, | ||
| "title": { | ||
| "translate": "advancements.touhou_little_maid.base.change_chair_model.title" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "maid_event" | ||
| ] | ||
| ] | ||
| } |
32 changes: 32 additions & 0 deletions
32
src/generated/resources/data/touhou_little_maid/advancements/base/change_maid_model.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,32 @@ | ||
| { | ||
| "parent": "touhou_little_maid:base/spawn_maid", | ||
| "criteria": { | ||
| "maid_event": { | ||
| "conditions": { | ||
| "event": "change_maid_model" | ||
| }, | ||
| "trigger": "touhou_little_maid:maid/tamed_maid" | ||
| } | ||
| }, | ||
| "display": { | ||
| "announce_to_chat": true, | ||
| "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png", | ||
| "description": { | ||
| "translate": "advancements.touhou_little_maid.base.change_maid_model.description" | ||
| }, | ||
| "frame": "task", | ||
| "hidden": false, | ||
| "icon": { | ||
| "item": "touhou_little_maid:change_maid_model" | ||
| }, | ||
| "show_toast": true, | ||
| "title": { | ||
| "translate": "advancements.touhou_little_maid.base.change_maid_model.title" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "maid_event" | ||
| ] | ||
| ] | ||
| } |
32 changes: 32 additions & 0 deletions
32
src/generated/resources/data/touhou_little_maid/advancements/base/change_maid_sound.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,32 @@ | ||
| { | ||
| "parent": "touhou_little_maid:base/spawn_maid", | ||
| "criteria": { | ||
| "maid_event": { | ||
| "conditions": { | ||
| "event": "change_maid_sound" | ||
| }, | ||
| "trigger": "touhou_little_maid:maid/tamed_maid" | ||
| } | ||
| }, | ||
| "display": { | ||
| "announce_to_chat": true, | ||
| "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png", | ||
| "description": { | ||
| "translate": "advancements.touhou_little_maid.base.change_maid_sound.description" | ||
| }, | ||
| "frame": "task", | ||
| "hidden": false, | ||
| "icon": { | ||
| "item": "minecraft:jukebox" | ||
| }, | ||
| "show_toast": true, | ||
| "title": { | ||
| "translate": "advancements.touhou_little_maid.base.change_maid_sound.title" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "maid_event" | ||
| ] | ||
| ] | ||
| } |
32 changes: 32 additions & 0 deletions
32
src/generated/resources/data/touhou_little_maid/advancements/base/craft_chair.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,32 @@ | ||
| { | ||
| "parent": "touhou_little_maid:base/craft_gohei", | ||
| "criteria": { | ||
| "craft_chair": { | ||
| "conditions": { | ||
| "recipe": "touhou_little_maid:chair" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "display": { | ||
| "announce_to_chat": true, | ||
| "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png", | ||
| "description": { | ||
| "translate": "advancements.touhou_little_maid.base.craft_chair.description" | ||
| }, | ||
| "frame": "task", | ||
| "hidden": false, | ||
| "icon": { | ||
| "item": "touhou_little_maid:chair" | ||
| }, | ||
| "show_toast": true, | ||
| "title": { | ||
| "translate": "advancements.touhou_little_maid.base.craft_chair.title" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "craft_chair" | ||
| ] | ||
| ] | ||
| } |
42 changes: 42 additions & 0 deletions
42
src/generated/resources/data/touhou_little_maid/advancements/base/craft_gohei.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,42 @@ | ||
| { | ||
| "criteria": { | ||
| "craft_hakurei_gohei": { | ||
| "conditions": { | ||
| "recipe": "touhou_little_maid:hakurei_gohei" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| }, | ||
| "craft_sanae_gohei": { | ||
| "conditions": { | ||
| "recipe": "touhou_little_maid:sanae_gohei" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "display": { | ||
| "announce_to_chat": true, | ||
| "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png", | ||
| "description": { | ||
| "translate": "advancements.touhou_little_maid.base.craft_gohei.description" | ||
| }, | ||
| "frame": "task", | ||
| "hidden": false, | ||
| "icon": { | ||
| "item": "touhou_little_maid:hakurei_gohei", | ||
| "nbt": "{Damage:0}" | ||
| }, | ||
| "show_toast": true, | ||
| "title": { | ||
| "translate": "advancements.touhou_little_maid.base.craft_gohei.title" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "craft_hakurei_gohei", | ||
| "craft_sanae_gohei" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "experience": 50 | ||
| } | ||
| } |
40 changes: 40 additions & 0 deletions
40
src/generated/resources/data/touhou_little_maid/advancements/base/kill_maid_fairy.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,40 @@ | ||
| { | ||
| "parent": "touhou_little_maid:base/build_altar", | ||
| "criteria": { | ||
| "killed_entity": { | ||
| "conditions": { | ||
| "entity": [ | ||
| { | ||
| "condition": "minecraft:entity_properties", | ||
| "entity": "this", | ||
| "predicate": { | ||
| "type": "touhou_little_maid:fairy" | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:player_killed_entity" | ||
| } | ||
| }, | ||
| "display": { | ||
| "announce_to_chat": true, | ||
| "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png", | ||
| "description": { | ||
| "translate": "advancements.touhou_little_maid.base.kill_maid_fairy.description" | ||
| }, | ||
| "frame": "task", | ||
| "hidden": false, | ||
| "icon": { | ||
| "item": "touhou_little_maid:fairy_spawn_egg" | ||
| }, | ||
| "show_toast": true, | ||
| "title": { | ||
| "translate": "advancements.touhou_little_maid.base.kill_maid_fairy.title" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "killed_entity" | ||
| ] | ||
| ] | ||
| } |
32 changes: 32 additions & 0 deletions
32
src/generated/resources/data/touhou_little_maid/advancements/base/pickup_power_point.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,32 @@ | ||
| { | ||
| "parent": "touhou_little_maid:base/build_altar", | ||
| "criteria": { | ||
| "maid_event": { | ||
| "conditions": { | ||
| "event": "pickup_power_point" | ||
| }, | ||
| "trigger": "touhou_little_maid:maid/tamed_maid" | ||
| } | ||
| }, | ||
| "display": { | ||
| "announce_to_chat": true, | ||
| "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png", | ||
| "description": { | ||
| "translate": "advancements.touhou_little_maid.base.pickup_power_point.description" | ||
| }, | ||
| "frame": "task", | ||
| "hidden": false, | ||
| "icon": { | ||
| "item": "touhou_little_maid:power_point" | ||
| }, | ||
| "show_toast": true, | ||
| "title": { | ||
| "translate": "advancements.touhou_little_maid.base.pickup_power_point.title" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "maid_event" | ||
| ] | ||
| ] | ||
| } |
Oops, something went wrong.