Skip to content

Commit 5af6b5e

Browse files
authored
End Fishing - Change enderpuff to be nonplaceable (#1221)
* Change enderpuff to poisonous potato w/ player head model * Change predicates to not check ID - so existing enderpuffs still function * Bring back the id checks as a tag list
1 parent 2f7503f commit 5af6b5e

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

gm4_end_fishing/data/gm4_end_fishing/loot_table/items/enderpuff.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"entries": [
66
{
77
"type": "minecraft:item",
8-
"name": "minecraft:player_head",
8+
"name": "minecraft:poisonous_potato",
99
"functions": [
1010
{
1111
"function": "minecraft:set_name",
@@ -20,7 +20,9 @@
2020
"function": "minecraft:set_components",
2121
"components": {
2222
"minecraft:custom_model_data": "item/enderpuff",
23-
"minecraft:profile": "$enderpuff"
23+
"minecraft:profile": "$enderpuff",
24+
"minecraft:item_model": "minecraft:player_head",
25+
"!minecraft:consumable": {}
2426
}
2527
},
2628
{

gm4_end_fishing/data/gm4_end_fishing/predicate/carries_enderpuff.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"predicate": {
88
"slots": {
99
"container.*": {
10-
"items": "minecraft:player_head",
10+
"items": "#gm4_end_fishing:enderpuff",
1111
"predicates": {
1212
"minecraft:custom_data": "{gm4_end_fishing:{enderpuff:1b}}"
1313
}
@@ -21,7 +21,7 @@
2121
"predicate": {
2222
"slots": {
2323
"armor.*": {
24-
"items": "minecraft:player_head",
24+
"items": "#gm4_end_fishing:enderpuff",
2525
"predicates": {
2626
"minecraft:custom_data": "{gm4_end_fishing:{enderpuff:1b}}"
2727
}
@@ -35,7 +35,7 @@
3535
"predicate": {
3636
"slots": {
3737
"player.cursor": {
38-
"items": "minecraft:player_head",
38+
"items": "#gm4_end_fishing:enderpuff",
3939
"predicates": {
4040
"minecraft:custom_data": "{gm4_end_fishing:{enderpuff:1b}}"
4141
}
@@ -49,7 +49,7 @@
4949
"predicate": {
5050
"slots": {
5151
"player.crafting.*": {
52-
"items": "minecraft:player_head",
52+
"items": "#gm4_end_fishing:enderpuff",
5353
"predicates": {
5454
"minecraft:custom_data": "{gm4_end_fishing:{enderpuff:1b}}"
5555
}
@@ -63,7 +63,7 @@
6363
"predicate": {
6464
"slots": {
6565
"weapon.*": {
66-
"items": "minecraft:player_head",
66+
"items": "#gm4_end_fishing:enderpuff",
6767
"predicates": {
6868
"minecraft:custom_data": "{gm4_end_fishing:{enderpuff:1b}}"
6969
}

gm4_end_fishing/data/gm4_end_fishing/predicate/holding_enderpuff.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
"predicate": {
55
"slots": {
66
"weapon.*": {
7-
"items": [
8-
"minecraft:player_head"
9-
],
7+
"items": "#gm4_end_fishing:enderpuff",
108
"predicates": {
119
"minecraft:custom_data": "{gm4_end_fishing:{enderpuff:1b}}"
1210
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"values": [
3+
"minecraft:player_head",
4+
"minecraft:poisonous_potato"
5+
]
6+
}

0 commit comments

Comments
 (0)