-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'unstable-1.17' into main-1.17
- Loading branch information
Showing
9 changed files
with
100 additions
and
96 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
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
5 changes: 0 additions & 5 deletions
5
src/main/java/dev/elexi/hugeblank/bagels_baking/compat/rei/Plugin.java
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
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
80 changes: 37 additions & 43 deletions
80
src/main/resources/data/bagels_baking/advancements/bagels_baking/tomato_town.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 |
|---|---|---|
| @@ -1,47 +1,41 @@ | ||
| { | ||
| "parent": "bagels_baking:bagels_baking/kids_meal", | ||
| "display": { | ||
| "icon": { | ||
| "item": "bagels_baking:tomato" | ||
| }, | ||
| "title": { | ||
| "translate": "advancements.bagels_baking.tomato_town.title" | ||
| }, | ||
| "description": { | ||
| "translate": "advancements.bagels_baking.tomato_town.description" | ||
| }, | ||
| "frame": "challenge", | ||
| "show_toast": true, | ||
| "announce_to_chat": true, | ||
| "hidden": true | ||
| "parent": "bagels_baking:bagels_baking/kids_meal", | ||
| "display": { | ||
| "icon": { | ||
| "item": "bagels_baking:tomato" | ||
| }, | ||
| "criteria": { | ||
| "tomato": { | ||
| "trigger": "minecraft:player_killed_entity", | ||
| "conditions": { | ||
| "player": [ | ||
| { | ||
| "condition": "minecraft:entity_properties", | ||
| "entity": "this", | ||
| "predicate": { | ||
| "player": { | ||
| "stats": [ | ||
| { | ||
| "type": "minecraft:custom", | ||
| "stat": "tomato_kills", | ||
| "value": 10 | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| "title": { | ||
| "translate": "advancements.bagels_baking.tomato_town.title" | ||
| }, | ||
| "description": { | ||
| "translate": "advancements.bagels_baking.tomato_town.description" | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "tomato" | ||
| ] | ||
| "frame": "challenge", | ||
| "show_toast": true, | ||
| "announce_to_chat": true, | ||
| "hidden": true | ||
| }, | ||
| "criteria": { | ||
| "tomato": { | ||
| "trigger": "minecraft:player_killed_entity", | ||
| "conditions": { | ||
| "player": { | ||
| "player": { | ||
| "stats": [ | ||
| { | ||
| "type": "minecraft:custom", | ||
| "stat": "tomato_kills", | ||
| "value": 10 | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "tomato" | ||
| ] | ||
| } | ||
| ] | ||
| } |
78 changes: 39 additions & 39 deletions
78
src/main/resources/data/bagels_baking/advancements/recipes/food/on_wheat.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 |
|---|---|---|
| @@ -1,41 +1,41 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "rewards": { | ||
| "recipes": [ | ||
| "bagels_baking:milling/flour", | ||
| "bagels_baking:misc/dough", | ||
| "bagels_baking:campfire/bread_from_dough", | ||
| "bagels_baking:furnace/bread_from_dough", | ||
| "bagels_baking:smoker/bread_from_dough", | ||
| "bagels_baking:misc/bagel", | ||
| "bagels_baking:misc/donut", | ||
| "bagels_baking:milling/wheat_cereal" | ||
| ] | ||
| }, | ||
| "criteria": { | ||
| "has_wheat": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "minecraft:wheat" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "has_the_recipe": { | ||
| "trigger": "minecraft:recipe_unlocked", | ||
| "conditions": { | ||
| "recipe": "bagels_baking:on_wheat" | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_wheat", | ||
| "has_the_recipe" | ||
| ] | ||
| ] | ||
| "parent": "minecraft:recipes/root", | ||
| "rewards": { | ||
| "recipes": [ | ||
| "bagels_baking:milling/flour", | ||
| "bagels_baking:misc/dough", | ||
| "bagels_baking:campfire/bread_from_dough", | ||
| "bagels_baking:furnace/bread_from_dough", | ||
| "bagels_baking:smoker/bread_from_dough", | ||
| "bagels_baking:misc/bagel", | ||
| "bagels_baking:misc/donut", | ||
| "bagels_baking:milling/wheat_cereal" | ||
| ] | ||
| }, | ||
| "criteria": { | ||
| "has_wheat": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "minecraft:wheat" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "has_the_recipe": { | ||
| "trigger": "minecraft:recipe_unlocked", | ||
| "conditions": { | ||
| "recipe": "bagels_baking:on_wheat" | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_wheat", | ||
| "has_the_recipe" | ||
| ] | ||
| ] | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/main/resources/data/minecraft/tags/blocks/mineable/hoe.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,6 @@ | ||
| { | ||
| "replace": false, | ||
| "values": [ | ||
| "bagels_baking:compressed_tea_block" | ||
| ] | ||
| } |
8 changes: 8 additions & 0 deletions
8
src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.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,8 @@ | ||
| { | ||
| "replace": false, | ||
| "values": [ | ||
| "bagels_baking:mill", | ||
| "bagels_baking:halite", | ||
| "bagels_baking:polished_halite" | ||
| ] | ||
| } |