Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Faboslav/friends-and-foes
Browse files Browse the repository at this point in the history 
# Conflicts:
#	common/src/main/resources/assets/friendsandfoes/lang/uk_ua.json
  • Loading branch information
@Faboslav
Faboslav committed Aug 18, 2023
2 parents cc99088 + 259e707 commit 3f7c7b3
Show file tree
Hide file tree
Showing 3 changed files with 99 additions and 90 deletions.
14 changes: 7 additions & 7 deletions .github/versions.json
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"1.20.1": "1.9.4",
"1.20": "1.9.4",
"1.19.4": "1.8.6",
"1.19.3": "1.8.6",
"1.19.2": "1.8.6",
"1.19.1": "1.8.6",
"1.19": "1.8.6",
"1.20.1": "1.9.3",
"1.20": "1.9.3",
"1.19.4": "1.8.5",
"1.19.3": "1.8.5",
"1.19.2": "1.8.5",
"1.19.1": "1.8.5",
"1.19": "1.8.5",
"1.18.2": "1.4.7",
"1.18.1": "1.2.5",
"1.18": "1.2.5"
Expand Down
89 changes: 45 additions & 44 deletions common/src/main/resources/data/minecraft/advancements/husbandry/wax_off.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,52 +17,53 @@
"announce_to_chat": true,
"hidden": false
},
"criteria": {
"wax_off": {
"trigger": "minecraft:item_used_on_block",
"conditions": {
"location": {
"block": {
"blocks": [
"minecraft:waxed_copper_block",
"minecraft:waxed_exposed_copper",
"minecraft:waxed_weathered_copper",
"minecraft:waxed_oxidized_copper",
"minecraft:waxed_cut_copper",
"minecraft:waxed_exposed_cut_copper",
"minecraft:waxed_weathered_cut_copper",
"minecraft:waxed_oxidized_cut_copper",
"minecraft:waxed_cut_copper_slab",
"minecraft:waxed_exposed_cut_copper_slab",
"minecraft:waxed_weathered_cut_copper_slab",
"minecraft:waxed_oxidized_cut_copper_slab",
"minecraft:waxed_cut_copper_stairs",
"minecraft:waxed_exposed_cut_copper_stairs",
"minecraft:waxed_weathered_cut_copper_stairs",
"minecraft:waxed_oxidized_cut_copper_stairs",
"friendsandfoes:waxed_copper_button",
"friendsandfoes:waxed_exposed_copper_button",
"friendsandfoes:waxed_oxidized_copper_button",
"friendsandfoes:waxed_weathered_copper_button"
]
}
},
"item": {
"items": [
"minecraft:wooden_axe",
"minecraft:golden_axe",
"minecraft:stone_axe",
"minecraft:iron_axe",
"minecraft:diamond_axe",
"minecraft:netherite_axe"
]
}
}
}
},
"criteria": {
"wax_off": {
"conditions": {
"location": [
{
"condition": "minecraft:location_check",
"predicate": {
"block": {
"blocks": [
"minecraft:waxed_copper_block",
"minecraft:waxed_exposed_copper",
"minecraft:waxed_weathered_copper",
"minecraft:waxed_oxidized_copper",
"minecraft:waxed_cut_copper",
"minecraft:waxed_exposed_cut_copper",
"minecraft:waxed_weathered_cut_copper",
"minecraft:waxed_oxidized_cut_copper",
"minecraft:waxed_cut_copper_slab",
"minecraft:waxed_exposed_cut_copper_slab",
"minecraft:waxed_weathered_cut_copper_slab",
"minecraft:waxed_oxidized_cut_copper_slab",
"minecraft:waxed_cut_copper_stairs",
"minecraft:waxed_exposed_cut_copper_stairs",
"minecraft:waxed_weathered_cut_copper_stairs",
"minecraft:waxed_oxidized_cut_copper_stairs",
"friendsandfoes:waxed_copper_button",
"friendsandfoes:waxed_exposed_copper_button",
"friendsandfoes:waxed_oxidized_copper_button",
"friendsandfoes:waxed_weathered_copper_button"
]
}
}
},
{
"condition": "minecraft:match_tool",
"predicate": {
"tag": "minecraft:axes"
}
}
]
},
"trigger": "minecraft:item_used_on_block"
}
},
"requirements": [
[
"wax_off"
]
]
}
}
86 changes: 47 additions & 39 deletions common/src/main/resources/data/minecraft/advancements/husbandry/wax_on.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,47 +16,55 @@
"announce_to_chat": true,
"hidden": false
},
"criteria": {
"wax_on": {
"trigger": "minecraft:item_used_on_block",
"conditions": {
"location": {
"block": {
"blocks": [
"minecraft:copper_block",
"minecraft:exposed_copper",
"minecraft:weathered_copper",
"minecraft:oxidized_copper",
"minecraft:cut_copper",
"minecraft:exposed_cut_copper",
"minecraft:weathered_cut_copper",
"minecraft:oxidized_cut_copper",
"minecraft:cut_copper_slab",
"minecraft:exposed_cut_copper_slab",
"minecraft:weathered_cut_copper_slab",
"minecraft:oxidized_cut_copper_slab",
"minecraft:cut_copper_stairs",
"minecraft:exposed_cut_copper_stairs",
"minecraft:weathered_cut_copper_stairs",
"minecraft:oxidized_cut_copper_stairs",
"friendsandfoes:copper_button",
"friendsandfoes:exposed_copper_button",
"friendsandfoes:oxidized_copper_button",
"friendsandfoes:weathered_copper_button"
]
}
},
"item": {
"items": [
"minecraft:honeycomb"
]
}
}
}
},
"criteria": {
"wax_on": {
"conditions": {
"location": [
{
"condition": "minecraft:location_check",
"predicate": {
"block": {
"blocks": [
"minecraft:copper_block",
"minecraft:exposed_copper",
"minecraft:weathered_copper",
"minecraft:oxidized_copper",
"minecraft:cut_copper",
"minecraft:exposed_cut_copper",
"minecraft:weathered_cut_copper",
"minecraft:oxidized_cut_copper",
"minecraft:cut_copper_slab",
"minecraft:exposed_cut_copper_slab",
"minecraft:weathered_cut_copper_slab",
"minecraft:oxidized_cut_copper_slab",
"minecraft:cut_copper_stairs",
"minecraft:exposed_cut_copper_stairs",
"minecraft:weathered_cut_copper_stairs",
"minecraft:oxidized_cut_copper_stairs",
"friendsandfoes:copper_button",
"friendsandfoes:exposed_copper_button",
"friendsandfoes:oxidized_copper_button",
"friendsandfoes:weathered_copper_button"
]
}
}
},
{
"condition": "minecraft:match_tool",
"predicate": {
"items": [
"minecraft:honeycomb"
]
}
}
]
},
"trigger": "minecraft:item_used_on_block"
}
},
"requirements": [
[
"wax_on"
]
]
}
}

0 comments on commit 3f7c7b3

Please sign in to comment.