Skip to content

Commit

Permalink
v1.14.2
Browse files Browse the repository at this point in the history
  • Loading branch information
danlivingston authored May 27, 2023
1 parent d19c2f6 commit 2eff207
Show file tree
Hide file tree
Showing 12 changed files with 50 additions and 2 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,10 @@ Changed:

- Stone to cobblestone recipe now uses a stonecutter instead of a crafting table
- Deepslate to cobbled deepslate recipe now uses a stonecutter instead of a crafting table

## v1.14.2

Added:

- Convert deepslate to stone by dropping it in a filled cauldron
- Convert cobbled deepslate to cobblestone by dropping it in a filled cauldron
6 changes: 4 additions & 2 deletions TODO.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# TODO

- [ ] Add categories to all recipes
- [ ] Regroup recipes into theme folders
- [x] Regroup recipes into theme folders
- [ ] Possibly change hopper advancement to include barrels and trapped chests
- [ ] Gravel to flint (crafting table)
- [ ] Cobblestone to gravel (stonecutter)
- [ ] Cauldron recipe in RECIPES.md
- [ ] Craftble shroomlight
- [ ] Craftable crying obsidian
- [ ] Craftable froglights
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
schedule function cauldron_de-slated_cobble:check_for_items_in_filled_cauldrons 1s
execute as @e[type=minecraft:item] at @s if block ~ ~ ~ #minecraft:cauldrons unless block ~ ~ ~ minecraft:cauldron run function cauldron_de-slated_cobble:check_item
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
tag @s add cauDec.subject
data modify entity a093751a-2c77-4658-9d5f-62ab4494bdaf HandItems[0] set from entity @s Item
execute as a093751a-2c77-4658-9d5f-62ab4494bdaf if predicate cauldron_de-slated_cobble:deepslate as @e[type=minecraft:item,tag=cauDec.subject] run function cauldron_de-slated_cobble:harden
tag @s remove cauDec.subject
2 changes: 2 additions & 0 deletions data/cauldron_de-slated_cobble/functions/harden.mcfunction
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
data modify entity @s[nbt={Item: {id: "minecraft:cobbled_deepslate"}}] Item.id set value "minecraft:cobblestone"
data modify entity @s[nbt={Item: {id: "minecraft:deepslate"}}] Item.id set value "minecraft:stone"
1 change: 1 addition & 0 deletions data/cauldron_de-slated_cobble/functions/load.mcfunction
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
execute unless entity a093751a-2c77-4658-9d5f-62ab4494bdaf positioned 16562060 1000 -22242910 run function cauldron_de-slated_cobble:summon_marker
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
forceload add ~ ~
summon minecraft:armor_stand ~ ~ ~ {Marker: 1b, NoGravity: 1b, Invulnerable: 1b, Invisible: 1b, UUID: [I; -1600948966, 746014296, -1654693205, 1150598574]}
3 changes: 3 additions & 0 deletions data/cauldron_de-slated_cobble/functions/uninstall.mcfunction
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
schedule clear cauldron_de-slated_cobble:check_for_items_in_filled_cauldrons
kill a093751a-2c77-4658-9d5f-62ab4494bdaf
forceload remove 16562060 -22242910
11 changes: 11 additions & 0 deletions data/cauldron_de-slated_cobble/predicates/deepslate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"tag": "cauldron_de-slated_cobble:deepslate"
}
}
}
}
6 changes: 6 additions & 0 deletions data/cauldron_de-slated_cobble/tags/items/deepslate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"values": [
"minecraft:cobbled_deepslate",
"minecraft:deepslate"
]
}
1 change: 1 addition & 0 deletions data/loopsrecipes/tags/functions/uninstall.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"values": [
"loopsrecipes_craftables:remove",
"loopsrecipes_unpackables:remove",
"cauldron_de-slated_cobble:uninstall",
"loopsrecipes:messages/done"
]
}
7 changes: 7 additions & 0 deletions data/minecraft/tags/functions/load.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"replace": false,
"values": [
"cauldron_de-slated_cobble:load",
"cauldron_de-slated_cobble:check_for_items_in_filled_cauldrons"
]
}

0 comments on commit 2eff207

Please sign in to comment.