diff --git a/readme.md b/readme.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/generated/resources/data/touhou_little_maid/advancements/base/build_altar.json b/src/generated/resources/data/touhou_little_maid/advancements/base/build_altar.json new file mode 100644 index 000000000..e5c8e0d78 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/base/build_altar.json @@ -0,0 +1,37 @@ +{ + "parent": "touhou_little_maid:base/craft_gohei", + "display": { + "icon": { + "item": "minecraft:red_wool" + }, + "title": { + "translate": "advancements.touhou_little_maid.base.build_altar.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.base.build_altar.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "rewards": { + "loot": [ + "touhou_little_maid:advancement/power_point" + ] + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "build_altar" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/base/change_chair_model.json b/src/generated/resources/data/touhou_little_maid/advancements/base/change_chair_model.json new file mode 100644 index 000000000..2ee3e4b74 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/base/change_chair_model.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:base/craft_chair", + "display": { + "icon": { + "item": "touhou_little_maid:change_chair_model" + }, + "title": { + "translate": "advancements.touhou_little_maid.base.change_chair_model.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.base.change_chair_model.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "change_chair_model" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/base/change_maid_model.json b/src/generated/resources/data/touhou_little_maid/advancements/base/change_maid_model.json new file mode 100644 index 000000000..4fa10f699 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/base/change_maid_model.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:base/spawn_maid", + "display": { + "icon": { + "item": "touhou_little_maid:change_maid_model" + }, + "title": { + "translate": "advancements.touhou_little_maid.base.change_maid_model.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.base.change_maid_model.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "change_maid_model" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/base/change_maid_sound.json b/src/generated/resources/data/touhou_little_maid/advancements/base/change_maid_sound.json new file mode 100644 index 000000000..823fb9052 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/base/change_maid_sound.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:base/spawn_maid", + "display": { + "icon": { + "item": "minecraft:jukebox" + }, + "title": { + "translate": "advancements.touhou_little_maid.base.change_maid_sound.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.base.change_maid_sound.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "change_maid_sound" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/base/craft_chair.json b/src/generated/resources/data/touhou_little_maid/advancements/base/craft_chair.json new file mode 100644 index 000000000..45e70f936 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/base/craft_chair.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:base/craft_gohei", + "display": { + "icon": { + "item": "touhou_little_maid:chair" + }, + "title": { + "translate": "advancements.touhou_little_maid.base.craft_chair.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.base.craft_chair.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "craft_chair": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "touhou_little_maid:chair" + } + } + }, + "requirements": [ + [ + "craft_chair" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/base/craft_gohei.json b/src/generated/resources/data/touhou_little_maid/advancements/base/craft_gohei.json new file mode 100644 index 000000000..a0c76588f --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/base/craft_gohei.json @@ -0,0 +1,42 @@ +{ + "display": { + "icon": { + "item": "touhou_little_maid:hakurei_gohei", + "nbt": "{Damage:0}" + }, + "title": { + "translate": "advancements.touhou_little_maid.base.craft_gohei.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.base.craft_gohei.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "rewards": { + "experience": 50 + }, + "criteria": { + "craft_hakurei_gohei": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "touhou_little_maid:hakurei_gohei" + } + }, + "craft_sanae_gohei": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "touhou_little_maid:sanae_gohei" + } + } + }, + "requirements": [ + [ + "craft_hakurei_gohei", + "craft_sanae_gohei" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/base/kill_maid_fairy.json b/src/generated/resources/data/touhou_little_maid/advancements/base/kill_maid_fairy.json new file mode 100644 index 000000000..7042422c8 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/base/kill_maid_fairy.json @@ -0,0 +1,40 @@ +{ + "parent": "touhou_little_maid:base/build_altar", + "display": { + "icon": { + "item": "touhou_little_maid:fairy_spawn_egg" + }, + "title": { + "translate": "advancements.touhou_little_maid.base.kill_maid_fairy.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.base.kill_maid_fairy.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "killed_entity": { + "trigger": "minecraft:player_killed_entity", + "conditions": { + "entity": [ + { + "condition": "minecraft:entity_properties", + "predicate": { + "type": "touhou_little_maid:fairy" + }, + "entity": "this" + } + ] + } + } + }, + "requirements": [ + [ + "killed_entity" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/base/pickup_power_point.json b/src/generated/resources/data/touhou_little_maid/advancements/base/pickup_power_point.json new file mode 100644 index 000000000..8b68f4586 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/base/pickup_power_point.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:base/build_altar", + "display": { + "icon": { + "item": "touhou_little_maid:power_point" + }, + "title": { + "translate": "advancements.touhou_little_maid.base.pickup_power_point.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.base.pickup_power_point.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "pickup_power_point" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/base/spawn_maid.json b/src/generated/resources/data/touhou_little_maid/advancements/base/spawn_maid.json new file mode 100644 index 000000000..8fe04eab0 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/base/spawn_maid.json @@ -0,0 +1,38 @@ +{ + "parent": "touhou_little_maid:base/craft_gohei", + "display": { + "icon": { + "item": "touhou_little_maid:entity_placeholder", + "nbt": "{RecipeId:\"touhou_little_maid:altar/spawn_box\"}" + }, + "title": { + "translate": "advancements.touhou_little_maid.base.spawn_maid.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.base.spawn_maid.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "rewards": { + "loot": [ + "touhou_little_maid:advancement/cake" + ] + }, + "criteria": { + "altar_craft": { + "trigger": "touhou_little_maid:altar/altar_craft", + "conditions": { + "recipe_id": "touhou_little_maid:altar/spawn_box" + } + } + }, + "requirements": [ + [ + "altar_craft" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/base/tamed_maid.json b/src/generated/resources/data/touhou_little_maid/advancements/base/tamed_maid.json new file mode 100644 index 000000000..da77e5608 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/base/tamed_maid.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:base/spawn_maid", + "display": { + "icon": { + "item": "minecraft:cake" + }, + "title": { + "translate": "advancements.touhou_little_maid.base.tamed_maid.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.base.tamed_maid.description" + }, + "frame": "goal", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "tamed_maid" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/challenge/all_netherite_equipment.json b/src/generated/resources/data/touhou_little_maid/advancements/challenge/all_netherite_equipment.json new file mode 100644 index 000000000..f844048fd --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/challenge/all_netherite_equipment.json @@ -0,0 +1,35 @@ +{ + "parent": "touhou_little_maid:challenge/eat_enchanted_golden_apple", + "display": { + "icon": { + "item": "touhou_little_maid:all_netherite_equipment" + }, + "title": { + "translate": "advancements.touhou_little_maid.challenge.all_netherite_equipment.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.challenge.all_netherite_equipment.description" + }, + "frame": "challenge", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "rewards": { + "experience": 50 + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "all_netherite_equipment" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/challenge/any_equipment.json b/src/generated/resources/data/touhou_little_maid/advancements/challenge/any_equipment.json new file mode 100644 index 000000000..17d813fde --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/challenge/any_equipment.json @@ -0,0 +1,32 @@ +{ + "display": { + "icon": { + "item": "minecraft:iron_helmet", + "nbt": "{Damage:0}" + }, + "title": { + "translate": "advancements.touhou_little_maid.challenge.any_equipment.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.challenge.any_equipment.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "any_equipment" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/challenge/eat_enchanted_golden_apple.json b/src/generated/resources/data/touhou_little_maid/advancements/challenge/eat_enchanted_golden_apple.json new file mode 100644 index 000000000..775cdd580 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/challenge/eat_enchanted_golden_apple.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:challenge/any_equipment", + "display": { + "icon": { + "item": "minecraft:enchanted_golden_apple" + }, + "title": { + "translate": "advancements.touhou_little_maid.challenge.eat_enchanted_golden_apple.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.challenge.eat_enchanted_golden_apple.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "eat_enchanted_golden_apple" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/challenge/kill_100.json b/src/generated/resources/data/touhou_little_maid/advancements/challenge/kill_100.json new file mode 100644 index 000000000..3a62365ce --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/challenge/kill_100.json @@ -0,0 +1,35 @@ +{ + "parent": "touhou_little_maid:challenge/any_equipment", + "display": { + "icon": { + "item": "touhou_little_maid:kill_100" + }, + "title": { + "translate": "advancements.touhou_little_maid.challenge.kill_100.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.challenge.kill_100.description" + }, + "frame": "goal", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "rewards": { + "experience": 50 + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "kill_100" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/challenge/kill_dragon.json b/src/generated/resources/data/touhou_little_maid/advancements/challenge/kill_dragon.json new file mode 100644 index 000000000..d8541ef95 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/challenge/kill_dragon.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:challenge/kill_wither", + "display": { + "icon": { + "item": "touhou_little_maid:kill_dragon" + }, + "title": { + "translate": "advancements.touhou_little_maid.challenge.kill_dragon.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.challenge.kill_dragon.description" + }, + "frame": "challenge", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "kill_dragon" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/challenge/kill_slime_300.json b/src/generated/resources/data/touhou_little_maid/advancements/challenge/kill_slime_300.json new file mode 100644 index 000000000..58e085e8e --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/challenge/kill_slime_300.json @@ -0,0 +1,35 @@ +{ + "parent": "touhou_little_maid:challenge/kill_100", + "display": { + "icon": { + "item": "touhou_little_maid:kill_slime_300" + }, + "title": { + "translate": "advancements.touhou_little_maid.challenge.kill_slime_300.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.challenge.kill_slime_300.description" + }, + "frame": "challenge", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "rewards": { + "experience": 50 + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "kill_slime_300" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/challenge/kill_wither.json b/src/generated/resources/data/touhou_little_maid/advancements/challenge/kill_wither.json new file mode 100644 index 000000000..38056fe4d --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/challenge/kill_wither.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:challenge/kill_100", + "display": { + "icon": { + "item": "touhou_little_maid:kill_wither" + }, + "title": { + "translate": "advancements.touhou_little_maid.challenge.kill_wither.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.challenge.kill_wither.description" + }, + "frame": "challenge", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "kill_wither" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/challenge/lightning_bolt.json b/src/generated/resources/data/touhou_little_maid/advancements/challenge/lightning_bolt.json new file mode 100644 index 000000000..8e7664124 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/challenge/lightning_bolt.json @@ -0,0 +1,33 @@ +{ + "parent": "touhou_little_maid:challenge/eat_enchanted_golden_apple", + "display": { + "icon": { + "item": "touhou_little_maid:entity_placeholder", + "nbt": "{RecipeId:\"touhou_little_maid:altar/spawn_lightning_bolt\"}" + }, + "title": { + "translate": "advancements.touhou_little_maid.challenge.lightning_bolt.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.challenge.lightning_bolt.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "lightning_bolt" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/challenge/maid_100_healthy.json b/src/generated/resources/data/touhou_little_maid/advancements/challenge/maid_100_healthy.json new file mode 100644 index 000000000..fa24e67ee --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/challenge/maid_100_healthy.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:challenge/lightning_bolt", + "display": { + "icon": { + "item": "touhou_little_maid:maid_100_healthy" + }, + "title": { + "translate": "advancements.touhou_little_maid.challenge.maid_100_healthy.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.challenge.maid_100_healthy.description" + }, + "frame": "goal", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "maid_100_healthy" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/favorability/favorability_increased.json b/src/generated/resources/data/touhou_little_maid/advancements/favorability/favorability_increased.json new file mode 100644 index 000000000..06e362f1e --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/favorability/favorability_increased.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:favorability/maid_sit_joy", + "display": { + "icon": { + "item": "touhou_little_maid:favorability_tool_add" + }, + "title": { + "translate": "advancements.touhou_little_maid.favorability.favorability_increased.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.favorability.favorability_increased.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "favorability_increased" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/favorability/favorability_increased_max.json b/src/generated/resources/data/touhou_little_maid/advancements/favorability/favorability_increased_max.json new file mode 100644 index 000000000..bad561d59 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/favorability/favorability_increased_max.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:favorability/favorability_increased", + "display": { + "icon": { + "item": "touhou_little_maid:favorability_tool_full" + }, + "title": { + "translate": "advancements.touhou_little_maid.favorability.favorability_increased_max.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.favorability.favorability_increased_max.description" + }, + "frame": "goal", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "favorability_increased_max" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/favorability/maid_picnic_eat.json b/src/generated/resources/data/touhou_little_maid/advancements/favorability/maid_picnic_eat.json new file mode 100644 index 000000000..2bcc9ca78 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/favorability/maid_picnic_eat.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:favorability/maid_sit_joy", + "display": { + "icon": { + "item": "touhou_little_maid:picnic_basket" + }, + "title": { + "translate": "advancements.touhou_little_maid.favorability.maid_picnic_eat.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.favorability.maid_picnic_eat.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "maid_picnic_eat" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/favorability/maid_sit_joy.json b/src/generated/resources/data/touhou_little_maid/advancements/favorability/maid_sit_joy.json new file mode 100644 index 000000000..03d05e0ef --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/favorability/maid_sit_joy.json @@ -0,0 +1,34 @@ +{ + "display": { + "icon": { + "item": "touhou_little_maid:bookshelf" + }, + "title": { + "translate": "advancements.touhou_little_maid.favorability.maid_sit_joy.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.favorability.maid_sit_joy.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "rewards": { + "experience": 50 + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "maid_sit_joy" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/favorability/maid_sleep.json b/src/generated/resources/data/touhou_little_maid/advancements/favorability/maid_sleep.json new file mode 100644 index 000000000..86e856c39 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/favorability/maid_sleep.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:favorability/maid_picnic_eat", + "display": { + "icon": { + "item": "touhou_little_maid:maid_bed" + }, + "title": { + "translate": "advancements.touhou_little_maid.favorability.maid_sleep.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.favorability.maid_sleep.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "maid_sleep" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/favorability/win_cchess.json b/src/generated/resources/data/touhou_little_maid/advancements/favorability/win_cchess.json new file mode 100644 index 000000000..515c9f0c1 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/favorability/win_cchess.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:favorability/win_gomoku", + "display": { + "icon": { + "item": "touhou_little_maid:cchess" + }, + "title": { + "translate": "advancements.touhou_little_maid.favorability.win_cchess.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.favorability.win_cchess.description" + }, + "frame": "goal", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "win_cchess" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/favorability/win_gomoku.json b/src/generated/resources/data/touhou_little_maid/advancements/favorability/win_gomoku.json new file mode 100644 index 000000000..bc7319ad3 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/favorability/win_gomoku.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:favorability/maid_picnic_eat", + "display": { + "icon": { + "item": "touhou_little_maid:gomoku" + }, + "title": { + "translate": "advancements.touhou_little_maid.favorability.win_gomoku.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.favorability.win_gomoku.description" + }, + "frame": "goal", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "win_gomoku" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/favorability/win_wchess.json b/src/generated/resources/data/touhou_little_maid/advancements/favorability/win_wchess.json new file mode 100644 index 000000000..c542e7373 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/favorability/win_wchess.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:favorability/win_cchess", + "display": { + "icon": { + "item": "touhou_little_maid:wchess" + }, + "title": { + "translate": "advancements.touhou_little_maid.favorability.win_wchess.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.favorability.win_wchess.description" + }, + "frame": "goal", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "win_wchess" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/chisel_statue.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/chisel_statue.json new file mode 100644 index 000000000..2d89c81c1 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/chisel_statue.json @@ -0,0 +1,33 @@ +{ + "parent": "touhou_little_maid:maid_base/photo_maid", + "display": { + "icon": { + "item": "touhou_little_maid:chisel", + "nbt": "{Damage:0}" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.chisel_statue.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.chisel_statue.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "chisel_statue" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/clear_maid_effects.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/clear_maid_effects.json new file mode 100644 index 000000000..da4590b09 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/clear_maid_effects.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:maid_base/pickup_maid", + "display": { + "icon": { + "item": "minecraft:milk_bucket" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.clear_maid_effects.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.clear_maid_effects.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "clear_maid_effects" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/maid_backpack.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/maid_backpack.json new file mode 100644 index 000000000..a789ae311 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/maid_backpack.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:maid_base/switch_schedule", + "display": { + "icon": { + "item": "touhou_little_maid:maid_backpack_big" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.maid_backpack.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.maid_backpack.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "maid_backpack" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/maid_farm.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/maid_farm.json new file mode 100644 index 000000000..a24aaf2f7 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/maid_farm.json @@ -0,0 +1,33 @@ +{ + "parent": "touhou_little_maid:maid_base/switch_schedule", + "display": { + "icon": { + "item": "minecraft:iron_hoe", + "nbt": "{Damage:0}" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.maid_farm.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.maid_farm.description" + }, + "frame": "goal", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "maid_farm" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/maid_feed_animal.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/maid_feed_animal.json new file mode 100644 index 000000000..2feb8a2ed --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/maid_feed_animal.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:maid_base/maid_farm", + "display": { + "icon": { + "item": "minecraft:wheat" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.maid_feed_animal.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.maid_feed_animal.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "maid_feed_animal" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/maid_feed_player.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/maid_feed_player.json new file mode 100644 index 000000000..39606c8c3 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/maid_feed_player.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:maid_base/maid_feed_animal", + "display": { + "icon": { + "item": "minecraft:cooked_beef" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.maid_feed_player.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.maid_feed_player.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "maid_feed_player" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/maid_fishing.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/maid_fishing.json new file mode 100644 index 000000000..0a3510bc7 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/maid_fishing.json @@ -0,0 +1,33 @@ +{ + "parent": "touhou_little_maid:maid_base/maid_backpack", + "display": { + "icon": { + "item": "minecraft:fishing_rod", + "nbt": "{Damage:0}" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.maid_fishing.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.maid_fishing.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "maid_fishing" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/maid_kill_mob.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/maid_kill_mob.json new file mode 100644 index 000000000..8d45570a8 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/maid_kill_mob.json @@ -0,0 +1,33 @@ +{ + "parent": "touhou_little_maid:maid_base/maid_backpack", + "display": { + "icon": { + "item": "minecraft:diamond_sword", + "nbt": "{Damage:0}" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.maid_kill_mob.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.maid_kill_mob.description" + }, + "frame": "goal", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "maid_kill_mob" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/photo_maid.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/photo_maid.json new file mode 100644 index 000000000..965b044bf --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/photo_maid.json @@ -0,0 +1,33 @@ +{ + "parent": "touhou_little_maid:maid_base/switch_task", + "display": { + "icon": { + "item": "touhou_little_maid:camera", + "nbt": "{Damage:0}" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.photo_maid.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.photo_maid.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "photo_maid" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/pickup_garage_kit.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/pickup_garage_kit.json new file mode 100644 index 000000000..eec2558da --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/pickup_garage_kit.json @@ -0,0 +1,36 @@ +{ + "parent": "touhou_little_maid:maid_base/chisel_statue", + "display": { + "icon": { + "item": "touhou_little_maid:garage_kit" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.pickup_garage_kit.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.pickup_garage_kit.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "pickup_item": { + "trigger": "minecraft:thrown_item_picked_up_by_entity", + "conditions": { + "item": { + "items": [ + "touhou_little_maid:garage_kit" + ] + } + } + } + }, + "requirements": [ + [ + "pickup_item" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/pickup_maid.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/pickup_maid.json new file mode 100644 index 000000000..28386bd00 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/pickup_maid.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:maid_base/switch_task", + "display": { + "icon": { + "item": "minecraft:saddle" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.pickup_maid.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.pickup_maid.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "pickup_maid" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/reborn_maid.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/reborn_maid.json new file mode 100644 index 000000000..e16e7e16e --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/reborn_maid.json @@ -0,0 +1,33 @@ +{ + "parent": "touhou_little_maid:maid_base/switch_task", + "display": { + "icon": { + "item": "touhou_little_maid:entity_placeholder", + "nbt": "{RecipeId:\"touhou_little_maid:altar/reborn_maid\"}" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.reborn_maid.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.reborn_maid.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "altar_craft": { + "trigger": "touhou_little_maid:altar/altar_craft", + "conditions": { + "recipe_id": "touhou_little_maid:altar/reborn_maid" + } + } + }, + "requirements": [ + [ + "altar_craft" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/shrine_reborn_maid.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/shrine_reborn_maid.json new file mode 100644 index 000000000..cc76869b6 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/shrine_reborn_maid.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:maid_base/reborn_maid", + "display": { + "icon": { + "item": "touhou_little_maid:shrine" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.shrine_reborn_maid.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.shrine_reborn_maid.description" + }, + "frame": "goal", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "shrine_reborn_maid" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/switch_schedule.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/switch_schedule.json new file mode 100644 index 000000000..73df7494c --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/switch_schedule.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:maid_base/switch_task", + "display": { + "icon": { + "item": "minecraft:clock" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.switch_schedule.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.switch_schedule.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "switch_schedule" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/switch_task.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/switch_task.json new file mode 100644 index 000000000..c78a822d1 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/switch_task.json @@ -0,0 +1,31 @@ +{ + "display": { + "icon": { + "item": "minecraft:feather" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.switch_task.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.switch_task.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "switch_task" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/take_maid_xp.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/take_maid_xp.json new file mode 100644 index 000000000..b9ca56250 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/take_maid_xp.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:maid_base/pickup_maid", + "display": { + "icon": { + "item": "minecraft:experience_bottle" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.take_maid_xp.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.take_maid_xp.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "take_maid_xp" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_item_magnet_bauble.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_item_magnet_bauble.json new file mode 100644 index 000000000..14c917929 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_item_magnet_bauble.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:maid_base/use_protect_bauble", + "display": { + "icon": { + "item": "touhou_little_maid:item_magnet_bauble" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.use_item_magnet_bauble.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.use_item_magnet_bauble.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "use_item_magnet_bauble" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_nimble_fabric.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_nimble_fabric.json new file mode 100644 index 000000000..9ba4c5820 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_nimble_fabric.json @@ -0,0 +1,33 @@ +{ + "parent": "touhou_little_maid:maid_base/use_protect_bauble", + "display": { + "icon": { + "item": "touhou_little_maid:nimble_fabric", + "nbt": "{Damage:0}" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.use_nimble_fabric.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.use_nimble_fabric.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "use_nimble_fabric" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_protect_bauble.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_protect_bauble.json new file mode 100644 index 000000000..6b77c1226 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_protect_bauble.json @@ -0,0 +1,33 @@ +{ + "parent": "touhou_little_maid:maid_base/switch_task", + "display": { + "icon": { + "item": "touhou_little_maid:fire_protect_bauble", + "nbt": "{Damage:0}" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.use_protect_bauble.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.use_protect_bauble.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "use_protect_bauble" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_red_fox_scroll.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_red_fox_scroll.json new file mode 100644 index 000000000..f3250098f --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_red_fox_scroll.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:maid_base/use_servant_bell", + "display": { + "icon": { + "item": "touhou_little_maid:red_fox_scroll" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.use_red_fox_scroll.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.use_red_fox_scroll.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "use_red_fox_scroll" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_servant_bell.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_servant_bell.json new file mode 100644 index 000000000..49d240a4b --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_servant_bell.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:maid_base/switch_task", + "display": { + "icon": { + "item": "touhou_little_maid:servant_bell" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.use_servant_bell.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.use_servant_bell.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "use_servant_bell" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_trumpet.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_trumpet.json new file mode 100644 index 000000000..1f3b0b1c7 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_trumpet.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:maid_base/use_servant_bell", + "display": { + "icon": { + "item": "touhou_little_maid:trumpet" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.use_trumpet.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.use_trumpet.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "use_trumpet" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_undead_bauble.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_undead_bauble.json new file mode 100644 index 000000000..910c337c4 --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_undead_bauble.json @@ -0,0 +1,33 @@ +{ + "parent": "touhou_little_maid:maid_base/use_nimble_fabric", + "display": { + "icon": { + "item": "touhou_little_maid:ultramarine_orb_elixir", + "nbt": "{Damage:0}" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.use_undead_bauble.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.use_undead_bauble.description" + }, + "frame": "goal", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "use_undead_bauble" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_white_fox_scroll.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_white_fox_scroll.json new file mode 100644 index 000000000..ff37a72af --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_white_fox_scroll.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:maid_base/use_red_fox_scroll", + "display": { + "icon": { + "item": "touhou_little_maid:white_fox_scroll" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.use_white_fox_scroll.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.use_white_fox_scroll.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "use_white_fox_scroll" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_wireless_io.json b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_wireless_io.json new file mode 100644 index 000000000..10686756b --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/advancements/maid_base/use_wireless_io.json @@ -0,0 +1,32 @@ +{ + "parent": "touhou_little_maid:maid_base/use_item_magnet_bauble", + "display": { + "icon": { + "item": "touhou_little_maid:wireless_io" + }, + "title": { + "translate": "advancements.touhou_little_maid.maid_base.use_wireless_io.title" + }, + "description": { + "translate": "advancements.touhou_little_maid.maid_base.use_wireless_io.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "touhou_little_maid:textures/advancements/backgrounds/stone.png" + }, + "criteria": { + "maid_event": { + "trigger": "touhou_little_maid:maid/tamed_maid", + "conditions": { + "event": "use_wireless_io" + } + } + }, + "requirements": [ + [ + "maid_event" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/loot_tables/advancement/cake.json b/src/generated/resources/data/touhou_little_maid/loot_tables/advancement/cake.json new file mode 100644 index 000000000..48793578b --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/loot_tables/advancement/cake.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:advancement_reward", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:cake" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/touhou_little_maid/loot_tables/advancement/power_point.json b/src/generated/resources/data/touhou_little_maid/loot_tables/advancement/power_point.json new file mode 100644 index 000000000..00ef69eba --- /dev/null +++ b/src/generated/resources/data/touhou_little_maid/loot_tables/advancement/power_point.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:advancement_reward", + "pools": [ + { + "rolls": 5.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "touhou_little_maid:power_point" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/block/BlockCChess.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/block/BlockCChess.java index c81a3e82a..9def79c5a 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/block/BlockCChess.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/block/BlockCChess.java @@ -60,8 +60,6 @@ public class BlockCChess extends BlockJoy implements IBoardGameBlock { public static final VoxelShape AABB = Block.box(0, 0, 0, 16, 2, 16); public BlockCChess() { - // todo - // .forceSolidOn().noOcclusion()); super(BlockBehaviour.Properties.of(Material.WOOD).sound(SoundType.WOOD).strength(2.0F, 3.0F).noOcclusion()); this.registerDefaultState(this.stateDefinition.any().setValue(PART, GomokuPart.CENTER).setValue(FACING, Direction.NORTH)); } diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/block/BlockGomoku.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/block/BlockGomoku.java index fdae91a0a..660f30a54 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/block/BlockGomoku.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/block/BlockGomoku.java @@ -73,8 +73,6 @@ public class BlockGomoku extends BlockJoy implements IBoardGameBlock { public static final VoxelShape RIGHT_DOWN_WITH_BOX = Shapes.or(RIGHT_DOWN, Block.box(0, 0, 9, 5, 4, 14)); public BlockGomoku() { - // todo - // .forceSolidOn().noOcclusion()); super(Properties.of(Material.WOOD).sound(SoundType.WOOD).strength(2.0F, 3.0F).noOcclusion()); this.registerDefaultState(this.stateDefinition.any().setValue(PART, GomokuPart.CENTER).setValue(FACING, Direction.NORTH)); } diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/block/BlockJoy.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/block/BlockJoy.java index 8eb6e171a..eff0cd461 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/block/BlockJoy.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/block/BlockJoy.java @@ -36,9 +36,6 @@ protected BlockJoy(Properties properties) { } public BlockJoy() { - // todo - // .forceSolidOn().noOcclusion()); - // this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH)); this(Properties.of(Material.WOOD).sound(SoundType.WOOD).strength(2.0F, 3.0F).noOcclusion()); this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH)); } @@ -106,9 +103,8 @@ public BlockState getStateForPlacement(BlockPlaceContext context) { return this.defaultBlockState().setValue(FACING, context.getHorizontalDirection().getOpposite()); } - // todo // 1.20.1 - true - // 1.19.2 - false + // 1.18.2 - false @Override public boolean isPathfindable(BlockState state, BlockGetter worldIn, BlockPos pos, PathComputationType type) { return false; diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/block/BlockPicnicMat.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/block/BlockPicnicMat.java index 2a8c18ada..04a0b9fba 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/block/BlockPicnicMat.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/block/BlockPicnicMat.java @@ -48,8 +48,6 @@ public class BlockPicnicMat extends Block implements EntityBlock { public static final VoxelShape AABB = Block.box(0, 0, 0, 16, 1, 16); public BlockPicnicMat() { - // todo - // .forceSolidOn().noOcclusion()); super(Properties.of(Material.WOOD).sound(SoundType.WOOD).strength(2.0F, 3.0F).noOcclusion()); this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH).setValue(PART, PicnicMatPart.CENTER)); } diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/gui/entity/maid/task/AttackTaskConfigGui.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/gui/entity/maid/task/AttackTaskConfigGui.java index bf89b6f70..24f5d4565 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/gui/entity/maid/task/AttackTaskConfigGui.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/gui/entity/maid/task/AttackTaskConfigGui.java @@ -110,9 +110,6 @@ protected void initAdditionWidgets() { return; } ResourceLocation id = attackGroupsKey.get(index); -// EntityType type = ForgeRegistries.ENTITY_TYPES.getValue(id); - //todo check - //不知写的不对 Optional> type = EntityType.byString(id.toString()); if (type.isEmpty()) { continue; @@ -132,14 +129,6 @@ private void addMonsterType() { return; } ResourceLocation id = ResourceLocation.tryParse(value); - -// if (ForgeRegistries.ENTITY_TYPES.containsKey(id)) { -// this.attackGroups.put(id, MonsterType.NEUTRAL); -// this.sortKey(); -// super.init(); -// return;} - //todo check - //不知写的对不对 Optional> entityType = EntityType.byString(value); if (entityType.isPresent() && ForgeRegistries.ENTITIES.containsValue(entityType.get())) { this.attackGroups.put(id, MonsterType.NEUTRAL); diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/gui/entity/maid/task/DefaultMaidTaskConfigGui.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/gui/entity/maid/task/DefaultMaidTaskConfigGui.java index efe65e214..e286c32b5 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/gui/entity/maid/task/DefaultMaidTaskConfigGui.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/gui/entity/maid/task/DefaultMaidTaskConfigGui.java @@ -2,17 +2,21 @@ import com.github.tartaricacid.touhoulittlemaid.TouhouLittleMaid; import com.github.tartaricacid.touhoulittlemaid.inventory.container.task.TaskConfigContainer; -import com.github.tartaricacid.touhoulittlemaid.util.version.TComponent; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.ChatFormatting; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.FormattedCharSequence; import net.minecraft.world.entity.player.Inventory; import org.anti_ad.mc.ipn.api.IPNButton; import org.anti_ad.mc.ipn.api.IPNGuiHint; import org.anti_ad.mc.ipn.api.IPNPlayerSideOnly; +import java.util.List; + @IPNPlayerSideOnly @IPNGuiHint(button = IPNButton.SORT, horizontalOffset = -36, bottom = -12) @IPNGuiHint(button = IPNButton.SORT_COLUMNS, horizontalOffset = -24, bottom = -24) @@ -36,6 +40,11 @@ protected void renderBg(PoseStack poseStack, float partialTicks, int x, int y) { @Override protected void renderAddition(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { - font.draw(poseStack, TComponent.translatable("gui.touhou_little_maid.default_task_config.title"), leftPos + 88, topPos + 38, 160); + List split = font.split(new TranslatableComponent("gui.touhou_little_maid.default_task_config.title"), 160); + int yOffset = topPos + 38; + for (FormattedCharSequence fs : split) { + font.draw(poseStack, fs, leftPos + 88, yOffset, ChatFormatting.DARK_GRAY.getColor()); + yOffset += font.lineHeight; + } } } \ No newline at end of file diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/model/CChessPiecesModel.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/model/CChessPiecesModel.java index f6445738a..afebe64ef 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/model/CChessPiecesModel.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/model/CChessPiecesModel.java @@ -27,14 +27,6 @@ public CChessPiecesModel(String name) { } public static CChessPiecesModel[] initModel() { -// Minecraft.getInstance().getResourceManager().getResource(MODEL).ifPresent(res -> { -// try (InputStream stream = res.open()) { -// BedrockModelPOJO pojo = CustomPackLoader.GSON.fromJson(new InputStreamReader(stream, StandardCharsets.UTF_8), BedrockModelPOJO.class); -// bedrockModel = new BedrockModel<>(pojo, BedrockVersion.NEW); -// } catch (IOException ignore) { -// } -// }); - // todo check ResourceManager manager = Minecraft.getInstance().getResourceManager(); try (InputStream stream = manager.getResource(MODEL).getInputStream()) { BedrockModelPOJO pojo = CustomPackLoader.GSON.fromJson(new InputStreamReader(stream, StandardCharsets.UTF_8), BedrockModelPOJO.class); diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/model/WChessPiecesModel.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/model/WChessPiecesModel.java index ae89da053..902b62adc 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/model/WChessPiecesModel.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/model/WChessPiecesModel.java @@ -27,14 +27,6 @@ public WChessPiecesModel(String name) { } public static WChessPiecesModel[] initModel() { -// Minecraft.getInstance().getResourceManager().getResource(MODEL).ifPresent(res -> { -// try (InputStream stream = res.open()) { -// BedrockModelPOJO pojo = CustomPackLoader.GSON.fromJson(new InputStreamReader(stream, StandardCharsets.UTF_8), BedrockModelPOJO.class); -// bedrockModel = new BedrockModel<>(pojo, BedrockVersion.NEW); -// } catch (IOException ignore) { -// } -// }); - // todo check ResourceManager manager = Minecraft.getInstance().getResourceManager(); try (InputStream stream = manager.getResource(MODEL).getInputStream()) { BedrockModelPOJO pojo = CustomPackLoader.GSON.fromJson(new InputStreamReader(stream, StandardCharsets.UTF_8), BedrockModelPOJO.class); diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/datagen/LootTableGenerator.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/datagen/LootTableGenerator.java index 2cacc7835..1ba871267 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/datagen/LootTableGenerator.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/datagen/LootTableGenerator.java @@ -5,17 +5,19 @@ import com.google.common.collect.ImmutableList; import com.mojang.datafixers.util.Pair; import net.minecraft.data.DataGenerator; -import net.minecraft.data.loot.*; +import net.minecraft.data.loot.LootTableProvider; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Items; import net.minecraft.world.level.storage.loot.LootPool; import net.minecraft.world.level.storage.loot.LootTable; +import net.minecraft.world.level.storage.loot.ValidationContext; import net.minecraft.world.level.storage.loot.entries.LootItem; import net.minecraft.world.level.storage.loot.parameters.LootContextParamSet; import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; import java.util.List; +import java.util.Map; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Supplier; @@ -29,6 +31,11 @@ public AdvancementLootTables(DataGenerator pGenerator) { super(pGenerator); } + @Override + protected void validate(Map map, ValidationContext context) { + // 这里留空，因为我们生成的不是原版的 LootTable，保留无法生成 + } + @Override protected List>>, LootContextParamSet>> getTables() { return ImmutableList.of(Pair.of(MaidAdvancementLoot::new, LootContextParamSets.ADVANCEMENT_REWARD)); diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/datagen/MaidDataGenerator.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/datagen/MaidDataGenerator.java index 2cd1aaf27..a104b751c 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/datagen/MaidDataGenerator.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/datagen/MaidDataGenerator.java @@ -19,7 +19,5 @@ public static void gatherData(GatherDataEvent event) { // Loot Tables generator.addProvider(new LootTableGenerator.AdvancementLootTables(generator)); - -// generator.addProvider(new LanguageGenerator(generator)); } } diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/ai/fishing/DefaultFishingType.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/ai/fishing/DefaultFishingType.java index f68358c01..5da32f271 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/ai/fishing/DefaultFishingType.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/ai/fishing/DefaultFishingType.java @@ -5,19 +5,14 @@ import com.github.tartaricacid.touhoulittlemaid.entity.projectile.MaidFishingHook; import net.minecraft.world.item.FishingRodItem; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; -import net.minecraftforge.common.ToolActions; public class DefaultFishingType implements IFishingType { @Override public boolean isFishingRod(ItemStack itemStack) { - // todo check - // Fishing Rod的子类更好？ return itemStack.getItem() instanceof FishingRodItem; -// return itemStack.canPerformAction(ToolActions.FISHING_ROD_CAST); } @Override diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/misc/MonsterType.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/misc/MonsterType.java index 03639490f..0d89fcba1 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/misc/MonsterType.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/misc/MonsterType.java @@ -12,11 +12,7 @@ public enum MonsterType implements StringRepresentable { NEUTRAL, HOSTILE; - //todo check - //不知写的对不对 - public static final Codec CODEC = StringRepresentable.fromEnum(MonsterType::values, (s) -> { - return MonsterType.valueOf(s.toUpperCase(Locale.ENGLISH)); - }); + public static final Codec CODEC = StringRepresentable.fromEnum(MonsterType::values, s -> MonsterType.valueOf(s.toUpperCase(Locale.ENGLISH))); private final MutableComponent component; diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/passive/EntityMaid.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/passive/EntityMaid.java index 820a6ad6b..e0863fa00 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/passive/EntityMaid.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/passive/EntityMaid.java @@ -1285,8 +1285,7 @@ public SpawnGroupData finalizeSpawn(ServerLevelAccessor worldIn, DifficultyInsta public void setItemSlot(EquipmentSlot slot, ItemStack stack) { super.setItemSlot(slot, stack); - // todo check - // 因为182版本没有onEquipItem方法，故放在这里，调查得知这个方法在MaidEquipEvent之前执行 + // 因为 1.18.2 版本没有 onEquipItem 方法，故放在这里，调查得知这个方法在 MaidEquipEvent 之前执行 this.onEquipItem(slot, stack); if (!this.level.isClientSide) { @@ -1775,10 +1774,7 @@ public void setInSittingPose(boolean inSittingPose) { setOrderedToSit(inSittingPose); } - public MaidGameRecordManager getGameRecordManager() { - return gameRecordManager; - } - + // 这个版本没有这个方法,所以将 1.20.1 的搬了过来 public void forceSyncData(EntityDataAccessor key, T value, boolean force) { SynchedEntityData.DataItem dataItem = this.entityData.getItem(key); if (force || ObjectUtils.notEqual(value, dataItem.getValue())) { @@ -1789,13 +1785,14 @@ public void forceSyncData(EntityDataAccessor key, T value, boolean force) } } + public MaidGameRecordManager getGameRecordManager() { + return gameRecordManager; + } + private CompoundTag getSyncTaskData() { return this.entityData.get(TASK_DATA_SYNC); } - //todo check - //版本同步 - //找不着这个方法 private void setSyncTaskData(CompoundTag compoundTag) { this.forceSyncData(TASK_DATA_SYNC, compoundTag, true); } diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/passive/MaidGameRecordManager.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/passive/MaidGameRecordManager.java index 2f1a722b2..698841dfd 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/passive/MaidGameRecordManager.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/passive/MaidGameRecordManager.java @@ -45,9 +45,6 @@ private CompoundTag getGameSkill() { } private void setGameSkill(CompoundTag gameSkill) { - //todo check - //这个版本没有这个方法,所以将1.20.1的移植了过来 -// maid.getEntityData().set(GAME_SKILL, gameSkill, true); maid.forceSyncData(GAME_SKILL, gameSkill, true); } diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/projectile/MaidFishingHook.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/projectile/MaidFishingHook.java index 4d53f90f7..2114334ae 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/projectile/MaidFishingHook.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/projectile/MaidFishingHook.java @@ -255,9 +255,7 @@ else if (this.timeUntilHooked > 0) { if (this.timeUntilHooked > 0) { // 随机给予运动角度 this.fishAngle += (float)(this.random.nextGaussian() * 4.0D); -// this.fishAngle += (float) this.random.triangle(0.0D, 9.188D); - //todo check - //来自原版 + // 来自原版 float fishAngleRad = this.fishAngle * ((float) Math.PI / 180F); float sin = Mth.sin(fishAngleRad); float cos = Mth.cos(fishAngleRad); @@ -510,11 +508,8 @@ public EntityMaid getMaidOwner() { private boolean shouldStopFishing(EntityMaid maid) { ItemStack mainHandItem = maid.getMainHandItem(); -// boolean hasFishingRod = mainHandItem.canPerformAction(ToolActions.FISHING_ROD_CAST); - //todo check - //来自FishingHook.shouldStopFishing - //要不要换成类型判断? -// boolean hasFishingRod = mainHandItem.is(Items.FISHING_ROD); + // 来自 FishingHook.shouldStopFishing + // 要不要换成类型判断? boolean hasFishingRod = mainHandItem.getItem() instanceof FishingRodItem; boolean isFishingTask = maid.getTask() instanceof TaskFishing; boolean hasVehicle = maid.getVehicle() != null; diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/task/TaskFishing.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/task/TaskFishing.java index 1e6c2c8b4..a88ee4412 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/task/TaskFishing.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/task/TaskFishing.java @@ -14,7 +14,6 @@ import net.minecraft.world.item.FishingRodItem; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; -import net.minecraftforge.common.ToolActions; import org.jetbrains.annotations.Nullable; import java.util.Collections; @@ -52,9 +51,6 @@ public List>> createRideBrainTasks(En @Override public List>> getConditionDescription(EntityMaid maid) { - //todo check - //来自FishingHook.shouldStopFishing - //要不要换成类型判断? return Collections.singletonList(Pair.of("has_fishing_rod", e -> e.getMainHandItem().getItem() instanceof FishingRodItem)); } } diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/geckolib3/core/AnimatableEntity.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/geckolib3/core/AnimatableEntity.java index 39ad1c54c..16a393288 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/geckolib3/core/AnimatableEntity.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/geckolib3/core/AnimatableEntity.java @@ -119,14 +119,10 @@ public AnimatedGeoModel getCurrentModel() { } public double getCurrentTick(AnimationEvent animationEvent) { - //todo check 访问变压器? - //getPartialTick()在Minecraft.runTick里头用到 -// Minecraft mc = Minecraft.getInstance(); -// this.pause ? this.pausePartialTick : this.timer.partialTick float partialTick = animationEvent.getPartialTick(); -// if (partialTick == 1.0f && partialTick != Minecraft.getInstance().getPartialTick()) { -// partialTick = Minecraft.getInstance().getPartialTick(); -// } + if (partialTick == 1.0f && partialTick != Minecraft.getInstance().getFrameTime()) { + partialTick = Minecraft.getInstance().getFrameTime(); + } return this.entity.tickCount + partialTick; } diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/item/ItemMonsterList.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/item/ItemMonsterList.java index 4b52e0e5d..f940ca37e 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/item/ItemMonsterList.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/item/ItemMonsterList.java @@ -11,12 +11,10 @@ import javax.annotation.Nullable; import java.util.List; -import static com.github.tartaricacid.touhoulittlemaid.item.MaidGroup.MAIN_TAB; - @Deprecated(since = "1.1.13") public class ItemMonsterList extends Item { public ItemMonsterList() { - super(new Item.Properties().tab(MAIN_TAB).stacksTo(1)); + super(new Item.Properties().stacksTo(1)); } @Override diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/mixin/client/ItemPropertiesMixin.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/mixin/client/ItemPropertiesMixin.java index f38463e0c..2c9da60f5 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/mixin/client/ItemPropertiesMixin.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/mixin/client/ItemPropertiesMixin.java @@ -15,13 +15,11 @@ @SuppressWarnings("all") @Mixin(ItemProperties.class) public class ItemPropertiesMixin { - //todo check - //找不着，不知是哪个 -// @Inject(method = "lambda$static$18(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/world/entity/LivingEntity;I)F", at = @At("HEAD"), cancellable = true) -// private static void onItemRender(ItemStack stack, @Nullable ClientLevel pLevel, @Nullable LivingEntity entity, int pSeed, CallbackInfoReturnable ci) { -// if (entity instanceof EntityMaid maid && maid.getMainHandItem() == stack) { -// float result = maid.hasFishingHook() ? 1.0F : 0.0F; -// ci.setReturnValue(result); -// } -// } + @Inject(method = "lambda$static$14(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/world/entity/LivingEntity;I)F", at = @At("HEAD"), cancellable = true) + private static void onItemRender(ItemStack stack, @Nullable ClientLevel pLevel, @Nullable LivingEntity entity, int pSeed, CallbackInfoReturnable ci) { + if (entity instanceof EntityMaid maid && maid.getMainHandItem() == stack) { + float result = maid.hasFishingHook() ? 1.0F : 0.0F; + ci.setReturnValue(result); + } + } }