Skip to content

Commit

Permalink
v1.21.30.21-preview
Browse files Browse the repository at this point in the history
  • Loading branch information
@mammerla
mammerla committed Aug 1, 2024
1 parent d0a1fa5 commit 044b768
Show file tree
Hide file tree
Showing 264 changed files with 53,117 additions and 8,940 deletions.
7 changes: 6 additions & 1 deletion behavior_pack/entities/snow_golem.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,12 @@
"damage_per_tick": 4
},
{
"filters": { "test": "is_temperature_value", "operator": ">", "value": 1.0 },
"filters": {
"all_of": [
{ "test": "is_temperature_value", "operator": ">", "value": 1.0 },
{ "test": "has_component", "subject": "self", "operator": "!=", "value": "minecraft:effect.fire_resistance" }
]
},
"cause": "temperature",
"damage_per_tick": 1
},
Expand Down
4 changes: 2 additions & 2 deletions behavior_pack/loot_tables/chests/ancient_city.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,8 @@
"add": false
},
{
"function": "set_data",
"data": 30
"function": "set_potion",
"id": "strong_regeneration"
}
],
"name": "minecraft:potion"
Expand Down
8 changes: 4 additions & 4 deletions behavior_pack/loot_tables/chests/buriedtreasure.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@
"name": "minecraft:potion",
"functions": [
{
"function": "set_data",
"data": 19
"function": "set_potion",
"id": "water_breathing"
}
],
"weight": 15
Expand All @@ -160,8 +160,8 @@
"name": "minecraft:potion",
"functions": [
{
"function": "set_data",
"data": 28
"function": "set_potion",
"id": "regeneration"
}
],
"weight": 10
Expand Down
5 changes: 2 additions & 3 deletions behavior_pack/loot_tables/chests/trial_chambers/reward_common.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"type": "item",
"name": "minecraft:arrow",
"weight": 4,
"aux_val": 26,
"functions": [
{
"function": "set_count",
Expand All @@ -31,8 +30,8 @@
}
},
{
"function": "set_data",
"data": 26
"function": "set_potion",
"id": "poison"
}
]
},
Expand Down
5 changes: 2 additions & 3 deletions behavior_pack/loot_tables/chests/trial_chambers/reward_ominous_common.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"type": "item",
"name": "minecraft:arrow",
"weight": 3,
"aux_val": 43,
"functions": [
{
"function": "set_count",
Expand All @@ -45,8 +44,8 @@
}
},
{
"function": "set_data",
"data": 43
"function": "set_potion",
"id": "strong_slowness"
}
]
},
Expand Down
20 changes: 8 additions & 12 deletions behavior_pack/loot_tables/chests/trial_chambers/supply.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"type": "item",
"name": "minecraft:arrow",
"weight": 1,
"aux_val": 26,
"functions": [
{
"function": "set_count",
Expand All @@ -34,16 +33,15 @@
}
},
{
"function": "set_data",
"data": 26
"function": "set_potion",
"id": "poison"
}
]
},
{
"type": "item",
"name": "minecraft:arrow",
"weight": 1,
"aux_val": 18,
"functions": [
{
"function": "set_count",
Expand All @@ -53,8 +51,8 @@
}
},
{
"function": "set_data",
"data": 18
"function": "set_potion",
"id": "slowness"
}
]
},
Expand Down Expand Up @@ -160,31 +158,29 @@
"type": "item",
"name": "minecraft:potion",
"weight": 1,
"aux_val": 28,
"functions": [
{
"function": "set_count",
"count": 2.0
},
{
"function": "set_data",
"data": 28
"function": "set_potion",
"id": "regeneration"
}
]
},
{
"type": "item",
"name": "minecraft:potion",
"weight": 1,
"aux_val": 31,
"functions": [
{
"function": "set_count",
"count": 2.0
},
{
"function": "set_data",
"data": 31
"function": "set_potion",
"id": "strength"
}
]
},
Expand Down
35 changes: 14 additions & 21 deletions behavior_pack/loot_tables/dispensers/trial_chambers/chamber.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,10 @@
"type": "item",
"name": "minecraft:splash_potion",
"weight": 1,
"aux_val": 17,
"functions": [
{
"function": "set_data",
"data": 17
"function": "set_potion",
"id": "slowness"
},
{
"function": "set_count",
Expand All @@ -93,11 +92,10 @@
"type": "item",
"name": "minecraft:splash_potion",
"weight": 1,
"aux_val": 25,
"functions": [
{
"function": "set_data",
"data": 25
"function": "set_potion",
"id": "poison"
},
{
"function": "set_count",
Expand All @@ -112,11 +110,10 @@
"type": "item",
"name": "minecraft:splash_potion",
"weight": 1,
"aux_val": 34,
"functions": [
{
"function": "set_data",
"data": 34
"function": "set_potion",
"id": "weakness"
},
{
"function": "set_count",
Expand All @@ -131,11 +128,10 @@
"type": "item",
"name": "minecraft:lingering_potion",
"weight": 1,
"aux_val": 17,
"functions": [
{
"function": "set_data",
"data": 17
"function": "set_potion",
"id": "slowness"
},
{
"function": "set_count",
Expand All @@ -150,11 +146,10 @@
"type": "item",
"name": "minecraft:lingering_potion",
"weight": 1,
"aux_val": 25,
"functions": [
{
"function": "set_data",
"data": 25
"function": "set_potion",
"id": "poison"
},
{
"function": "set_count",
Expand All @@ -169,11 +164,10 @@
"type": "item",
"name": "minecraft:lingering_potion",
"weight": 1,
"aux_val": 34,
"functions": [
{
"function": "set_data",
"data": 34
"function": "set_potion",
"id": "weakness"
},
{
"function": "set_count",
Expand All @@ -188,11 +182,10 @@
"type": "item",
"name": "minecraft:lingering_potion",
"weight": 1,
"aux_val": 21,
"functions": [
{
"function": "set_data",
"data": 21
"function": "set_potion",
"id": "healing"
},
{
"function": "set_count",
Expand Down
5 changes: 2 additions & 3 deletions behavior_pack/loot_tables/entities/bogged.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
"type": "item",
"name": "minecraft:arrow",
"weight": 1,
"auxVal": 26,
"functions": [
{
"function": "set_count",
Expand All @@ -77,8 +76,8 @@
"limit": 1
},
{
"function": "minecraft:set_data",
"data": 26
"function": "minecraft:set_potion",
"id": "poison"
}
]
}
Expand Down
12 changes: 6 additions & 6 deletions behavior_pack/loot_tables/entities/piglin_barter.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
"weight": 8,
"functions": [
{
"function": "set_data",
"data": 12
"function": "set_potion",
"id": "fire_resistance"
}
]
},
Expand All @@ -52,8 +52,8 @@
"weight": 8,
"functions": [
{
"function": "set_data",
"data": 12
"function": "set_potion",
"id": "fire_resistance"
}
]
},
Expand All @@ -63,8 +63,8 @@
"weight": 10,
"functions": [
{
"function": "set_data",
"data": 0
"function": "set_potion",
"id": "water"
}
]
},
Expand Down
5 changes: 2 additions & 3 deletions behavior_pack/loot_tables/entities/stray.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
"type": "item",
"name": "minecraft:arrow",
"weight": 1,
"auxVal": 19,
"functions": [
{
"function": "set_count",
Expand All @@ -77,8 +76,8 @@
"limit": 1
},
{
"function": "minecraft:set_data",
"data": 19
"function": "minecraft:set_potion",
"id": "slowness"
}
]
}
Expand Down
10 changes: 4 additions & 6 deletions behavior_pack/loot_tables/spawners/ominous/trial_chamber/consumables.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,31 +49,29 @@
"type": "item",
"name": "minecraft:potion",
"weight": 1,
"aux_val": 28,
"functions": [
{
"function": "set_count",
"count": 1.0
},
{
"function": "set_data",
"data": 28
"function": "set_potion",
"id": "regeneration"
}
]
},
{
"type": "item",
"name": "minecraft:potion",
"weight": 1,
"aux_val": 31,
"functions": [
{
"function": "set_count",
"count": 1.0
},
{
"function": "set_data",
"data": 31
"function": "set_potion",
"id": "strength"
}
]
}
Expand Down
10 changes: 4 additions & 6 deletions behavior_pack/loot_tables/spawners/trial_chamber/consumables.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,31 +46,29 @@
"type": "item",
"name": "minecraft:potion",
"weight": 1,
"aux_val": 28,
"functions": [
{
"function": "set_count",
"count": 1.0
},
{
"function": "set_data",
"data": 28
"function": "set_potion",
"id": "regeneration"
}
]
},
{
"type": "item",
"name": "minecraft:potion",
"weight": 1,
"aux_val": 14,
"functions": [
{
"function": "set_count",
"count": 1.0
},
{
"function": "set_data",
"data": 14
"function": "set_potion",
"id": "swiftness"
}
]
}
Expand Down
Loading

0 comments on commit 044b768

Please sign in to comment.