Skip to content

Commit

Permalink
Tag, sound, and recipe updates (+ trimmable boots)
Browse files Browse the repository at this point in the history
- The portal disallow tag now includes 1.20 blocks
- The Portal 2 White Panels now use the Cherry Wood sounds
- Recipes with dyes in them now use the respective dye common tags
- Hammers and Crowbars are now tagged as tools, and hammers can break decorated pots
- Doors are now tagged as doors
- Long Fall Boots are now trimmable (wow that was way easier than I thought lol)
  • Loading branch information
Cart3r1234 committed Jun 30, 2023
1 parent cbd8ba7 commit a6ee1c5
Show file tree
Hide file tree
Showing 41 changed files with 370 additions and 54 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,68 @@
{
"parent": "item/generated",
"textures": { "layer0": "portalcubed:item/long_fall_boots" }
}
"parent": "minecraft:item/generated",
"overrides": [
{
"model": "portalcubed:item/long_fall_boots_quartz_trim",
"predicate": {
"trim_type": 0.1
}
},
{
"model": "portalcubed:item/long_fall_boots_iron_trim",
"predicate": {
"trim_type": 0.2
}
},
{
"model": "portalcubed:item/long_fall_boots_netherite_trim",
"predicate": {
"trim_type": 0.3
}
},
{
"model": "portalcubed:item/long_fall_boots_redstone_trim",
"predicate": {
"trim_type": 0.4
}
},
{
"model": "portalcubed:item/long_fall_boots_copper_trim",
"predicate": {
"trim_type": 0.5
}
},
{
"model": "portalcubed:item/long_fall_boots_gold_trim",
"predicate": {
"trim_type": 0.6
}
},
{
"model": "portalcubed:item/long_fall_boots_emerald_trim",
"predicate": {
"trim_type": 0.7
}
},
{
"model": "portalcubed:item/long_fall_boots_diamond_trim",
"predicate": {
"trim_type": 0.8
}
},
{
"model": "portalcubed:item/long_fall_boots_lapis_trim",
"predicate": {
"trim_type": 0.9
}
},
{
"model": "portalcubed:item/long_fall_boots_amethyst_trim",
"predicate": {
"trim_type": 1.0
}
}
],
"textures": {
"layer0": "portalcubed:item/long_fall_boots"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "portalcubed:item/long_fall_boots",
"layer1": "minecraft:trims/items/boots_trim_amethyst"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "portalcubed:item/long_fall_boots",
"layer1": "minecraft:trims/items/boots_trim_copper"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "portalcubed:item/long_fall_boots",
"layer1": "minecraft:trims/items/boots_trim_diamond"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "portalcubed:item/long_fall_boots",
"layer1": "minecraft:trims/items/boots_trim_emerald"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "portalcubed:item/long_fall_boots",
"layer1": "minecraft:trims/items/boots_trim_gold"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "portalcubed:item/long_fall_boots",
"layer1": "minecraft:trims/items/boots_trim_iron"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "portalcubed:item/long_fall_boots",
"layer1": "minecraft:trims/items/boots_trim_lapis"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "portalcubed:item/long_fall_boots",
"layer1": "minecraft:trims/items/boots_trim_netherite"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "portalcubed:item/long_fall_boots",
"layer1": "minecraft:trims/items/boots_trim_quartz"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "portalcubed:item/long_fall_boots",
"layer1": "minecraft:trims/items/boots_trim_redstone"
}
}
9 changes: 9 additions & 0 deletions src/main/resources/data/minecraft/tags/items/doors.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"replace": false,
"values": [
"portalcubed:portal_1_door",
"portalcubed:portal_2_door",
"portalcubed:old_ap_door",
"portalcubed:octopus_door"
]
}
7 changes: 7 additions & 0 deletions src/main/resources/data/minecraft/tags/items/tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"replace": false,
"values": [
"portalcubed:crowbar",
"portalcubed:hammer"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"portalcubed:long_fall_boots"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"item": "portalcubed:base_gel"
},
{
"item": "minecraft:purple_dye"
"tag": "c:purple_dyes"
},
{
"item": "minecraft:honey_bottle"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"item": "minecraft:map"
},
{
"item": "minecraft:lime_dye"
"tag": "c:lime_dyes"
}
],
"result": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"item": "minecraft:tnt"
},
{
"item": "minecraft:red_dye"
"tag": "c:red_dyes"
}
],
"result": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"item": "minecraft:redstone_lamp"
},
"Y": {
"item": "minecraft:pink_dye"
"tag": "c:pink_dyes"
}
},
"result": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"item": "minecraft:iron_nugget"
},
"Y": {
"item": "minecraft:orange_dye"
"tag": "c:orange_dyes"
}
},
"result": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"item": "portalcubed:base_gel"
},
{
"item": "minecraft:white_dye"
"tag": "c:white_dyes"
},
{
"item": "minecraft:end_stone"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"item": "minecraft:observer"
},
{
"item": "minecraft:orange_dye"
"tag": "c:orange_dyes"
}
],
"result": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
"item": "minecraft:dispenser"
},
"Z": {
"item": "minecraft:light_blue_dye"
"tag": "c:light_blue_dyes"
},
"A": {
"item": "minecraft:orange_dye"
"tag": "c:orange_dyes"
}
},
"result": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"item": "minecraft:writable_book"
},
{
"item": "minecraft:pink_dye"
"tag": "c:pink_dyes"
}
],
"result": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
],
"key": {
"X": {
"item": "minecraft:cyan_dye"
"tag": "c:cyan_dyes"
},
"Y": {
"item": "minecraft:glow_ink_sac"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"item": "minecraft:cake"
},
{
"item": "minecraft:blue_dye"
"tag": "c:blue_dyes"
}
],
"result": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"item": "portalcubed:core_frame"
},
{
"item": "minecraft:purple_dye"
"tag": "c:purple_dyes"
}
],
"result": {
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/data/portalcubed/recipes/mug_crafting.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
"item": "minecraft:flower_pot"
},
{
"item": "minecraft:blue_dye"
"tag": "c:blue_dyes"
},
{
"item": "minecraft:yellow_dye"
"tag": "c:yellow_dyes"
},
{
"item": "minecraft:white_dye"
"tag": "c:white_dyes"
},
{
"item": "minecraft:red_dye"
"tag": "c:red_dyes"
}
],
"result": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"tag": "minecraft:logs"
},
"Y": {
"item": "minecraft:lime_dye"
"tag": "c:lime_dyes"
},
"Z": {
"item": "minecraft:iron_nugget"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"item": "minecraft:iron_nugget"
},
"X": {
"item": "minecraft:pink_dye"
"tag": "c:pink_dyes"
}
},
"result": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"tag": "portalcubed:portal_1_metal_panels"
},
"Y": {
"item": "minecraft:light_blue_dye"
"tag": "c:light_blue_dyes"
},
"Z": {
"item": "minecraft:iron_nugget"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"item": "minecraft:iron_nugget"
},
"X": {
"item": "minecraft:gray_dye"
"tag": "c:gray_dyes"
}
},
"result": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"tag": "portalcubed:portal_2_clean_gray_panels"
},
"Y": {
"item": "minecraft:cyan_dye"
"tag": "c:cyan_dyes"
},
"Z": {
"item": "minecraft:iron_nugget"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"item": "portalcubed:base_gel"
},
{
"item": "minecraft:orange_dye"
"tag": "c:orange_dyes"
},
{
"item": "minecraft:packed_ice"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"item": "portalcubed:base_gel"
},
{
"item": "minecraft:gray_dye"
"tag": "c:gray_dyes"
},
{
"item": "minecraft:phantom_membrane"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"item": "portalcubed:base_gel"
},
{
"item": "minecraft:blue_dye"
"tag": "c:blue_dyes"
},
{
"item": "minecraft:slime_ball"
Expand Down
Loading

0 comments on commit a6ee1c5

Please sign in to comment.