From f62b698df4c3497ca4bdbbb49a46dcdd0f64991a Mon Sep 17 00:00:00 2001 From: Sollace Date: Fri, 1 May 2020 23:44:53 +0200 Subject: [PATCH] Fix errors with data tags and add our own blocks and items to their appropriate tags --- .../resources/data/minecraft/tags/blocks/anvil.json | 6 ++++++ .../resources/data/minecraft/tags/blocks/doors.json | 7 +++++++ .../resources/data/minecraft/tags/blocks/leaves.json | 6 ++++++ .../resources/data/minecraft/tags/blocks/slabs.json | 8 ++++++++ .../resources/data/minecraft/tags/blocks/stairs.json | 6 ++++++ .../data/minecraft/tags/blocks/wooden_doors.json | 7 +++++++ .../resources/data/minecraft/tags/items/anvil.json | 6 ++++++ .../resources/data/minecraft/tags/items/doors.json | 7 +++++++ .../resources/data/minecraft/tags/items/fences.json | 6 ++++++ .../resources/data/minecraft/tags/items/leaves.json | 6 ++++++ .../data/minecraft/tags/items/music_discs.json | 9 +++++++++ .../resources/data/minecraft/tags/items/slabs.json | 8 ++++++++ .../resources/data/minecraft/tags/items/stairs.json | 6 ++++++ .../data/minecraft/tags/items/wooden_doors.json | 7 +++++++ .../data/unicopia/tags/items/apple_bloom_spirit.json | 2 +- .../data/unicopia/tags/items/dark_elementals.json | 4 ++-- .../data/unicopia/tags/items/death_elementals.json | 2 +- .../unicopia/tags/items/harmonic_elementals.json | 8 ++++---- .../data/unicopia/tags/items/life_elementals.json | 3 +-- .../resources/data/unicopia/tags/items/shells.json | 2 +- .../data/unicopia/tags/items/sight_elementals.json | 2 +- .../data/unicopia/tags/items/sound_elementals.json | 12 +----------- .../unicopia/tags/items/sweetie_belle_spirit.json | 2 +- 23 files changed, 108 insertions(+), 24 deletions(-) create mode 100644 src/main/resources/data/minecraft/tags/blocks/anvil.json create mode 100644 src/main/resources/data/minecraft/tags/blocks/doors.json create mode 100644 src/main/resources/data/minecraft/tags/blocks/leaves.json create mode 100644 src/main/resources/data/minecraft/tags/blocks/slabs.json create mode 100644 src/main/resources/data/minecraft/tags/blocks/stairs.json create mode 100644 src/main/resources/data/minecraft/tags/blocks/wooden_doors.json create mode 100644 src/main/resources/data/minecraft/tags/items/anvil.json create mode 100644 src/main/resources/data/minecraft/tags/items/doors.json create mode 100644 src/main/resources/data/minecraft/tags/items/fences.json create mode 100644 src/main/resources/data/minecraft/tags/items/leaves.json create mode 100644 src/main/resources/data/minecraft/tags/items/music_discs.json create mode 100644 src/main/resources/data/minecraft/tags/items/slabs.json create mode 100644 src/main/resources/data/minecraft/tags/items/stairs.json create mode 100644 src/main/resources/data/minecraft/tags/items/wooden_doors.json diff --git a/src/main/resources/data/minecraft/tags/blocks/anvil.json b/src/main/resources/data/minecraft/tags/blocks/anvil.json new file mode 100644 index 00000000..183449ca --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/anvil.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "unicopia:cloud_anvil" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/doors.json b/src/main/resources/data/minecraft/tags/blocks/doors.json new file mode 100644 index 00000000..b0535b1d --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/doors.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "unicopia:misted_glass_door", + "unicopia:diamond_door" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/leaves.json b/src/main/resources/data/minecraft/tags/blocks/leaves.json new file mode 100644 index 00000000..a21094ff --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/leaves.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "unicopia:apple_leaves" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/slabs.json b/src/main/resources/data/minecraft/tags/blocks/slabs.json new file mode 100644 index 00000000..8d5b81d5 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/slabs.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "unicopia:cloud_slab", + "unicopia:enchanted_cloud_slab", + "unicopia:dense_cloud_slab" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/stairs.json b/src/main/resources/data/minecraft/tags/blocks/stairs.json new file mode 100644 index 00000000..3dc81ad6 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/stairs.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "unicopia:cloud_stairs" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json b/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json new file mode 100644 index 00000000..90a21f09 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "unicopia:library_door", + "unicopia:bakery_door" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/anvil.json b/src/main/resources/data/minecraft/tags/items/anvil.json new file mode 100644 index 00000000..183449ca --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/anvil.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "unicopia:cloud_anvil" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/doors.json b/src/main/resources/data/minecraft/tags/items/doors.json new file mode 100644 index 00000000..b0535b1d --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/doors.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "unicopia:misted_glass_door", + "unicopia:diamond_door" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/fences.json b/src/main/resources/data/minecraft/tags/items/fences.json new file mode 100644 index 00000000..f3f91b31 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/fences.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "unicopia:cloud_fence" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/leaves.json b/src/main/resources/data/minecraft/tags/items/leaves.json new file mode 100644 index 00000000..a21094ff --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/leaves.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "unicopia:apple_leaves" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/music_discs.json b/src/main/resources/data/minecraft/tags/items/music_discs.json new file mode 100644 index 00000000..ee97b7c2 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/music_discs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "unicopia:music_disc_crusade", + "unicopia:music_disc_pet", + "unicopia:music_disc_popular", + "unicopia:music_disc_funk" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/slabs.json b/src/main/resources/data/minecraft/tags/items/slabs.json new file mode 100644 index 00000000..8d5b81d5 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/slabs.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "unicopia:cloud_slab", + "unicopia:enchanted_cloud_slab", + "unicopia:dense_cloud_slab" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/stairs.json b/src/main/resources/data/minecraft/tags/items/stairs.json new file mode 100644 index 00000000..3dc81ad6 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/stairs.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "unicopia:cloud_stairs" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/wooden_doors.json b/src/main/resources/data/minecraft/tags/items/wooden_doors.json new file mode 100644 index 00000000..90a21f09 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/wooden_doors.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "unicopia:library_door", + "unicopia:bakery_door" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/tags/items/apple_bloom_spirit.json b/src/main/resources/data/unicopia/tags/items/apple_bloom_spirit.json index 1f0a3e6f..8026b5ed 100644 --- a/src/main/resources/data/unicopia/tags/items/apple_bloom_spirit.json +++ b/src/main/resources/data/unicopia/tags/items/apple_bloom_spirit.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "#unicopia:regular_apples", + "#unicopia:fresh_apples", "unicopia:apple_cider", "unicopia:apple_seeds", "minecraft:red_dye" diff --git a/src/main/resources/data/unicopia/tags/items/dark_elementals.json b/src/main/resources/data/unicopia/tags/items/dark_elementals.json index 8c7df2ad..d70cca1a 100644 --- a/src/main/resources/data/unicopia/tags/items/dark_elementals.json +++ b/src/main/resources/data/unicopia/tags/items/dark_elementals.json @@ -1,9 +1,9 @@ { "replace": false, "values": [ - "minecraft:netherbrick", + "minecraft:nether_bricks", "minecraft:brick", - "minecraft:red_nether_brick", + "minecraft:red_nether_bricks", "minecraft:coal_block", "minecraft:coal", "unicopia:chitin_shell", diff --git a/src/main/resources/data/unicopia/tags/items/death_elementals.json b/src/main/resources/data/unicopia/tags/items/death_elementals.json index 27134cf4..daef44f5 100644 --- a/src/main/resources/data/unicopia/tags/items/death_elementals.json +++ b/src/main/resources/data/unicopia/tags/items/death_elementals.json @@ -7,6 +7,6 @@ "minecraft:redstone", "minecraft:emerald", "minecraft:ghast_tear", - "minecraft:red_nether_brick" + "minecraft:red_nether_bricks" ] } diff --git a/src/main/resources/data/unicopia/tags/items/harmonic_elementals.json b/src/main/resources/data/unicopia/tags/items/harmonic_elementals.json index b5d95dbc..c21bf046 100644 --- a/src/main/resources/data/unicopia/tags/items/harmonic_elementals.json +++ b/src/main/resources/data/unicopia/tags/items/harmonic_elementals.json @@ -1,10 +1,10 @@ { "replace": false, "values": [ - "#minecraft:red_flower", - "#minecraft:yellow_flower", - "minecraft:tallgrass", - "minecraft:sapling", + "#minecraft:small_flowers", + "minecraft:dandelion", + "minecraft:grass", + "#minecraft:saplings", "minecraft:stick" ] } diff --git a/src/main/resources/data/unicopia/tags/items/life_elementals.json b/src/main/resources/data/unicopia/tags/items/life_elementals.json index eaf5a1ce..9274c38e 100644 --- a/src/main/resources/data/unicopia/tags/items/life_elementals.json +++ b/src/main/resources/data/unicopia/tags/items/life_elementals.json @@ -6,8 +6,7 @@ "minecraft:golden_carrot", "minecraft:wheat", "minecraft:wheat_seeds", - "minecraft:grain", - "minecraft:alfalfa_leaves", + "#minecraft:leaves", "unicopia:moss" ] } diff --git a/src/main/resources/data/unicopia/tags/items/shells.json b/src/main/resources/data/unicopia/tags/items/shells.json index 840a1477..f0445519 100644 --- a/src/main/resources/data/unicopia/tags/items/shells.json +++ b/src/main/resources/data/unicopia/tags/items/shells.json @@ -2,7 +2,7 @@ "replace": false, "values": [ "minecraft:egg", - "minecraft:firework_charge", + "minecraft:firework_star", "minecraft:ender_eye", "minecraft:fire_charge" ] diff --git a/src/main/resources/data/unicopia/tags/items/sight_elementals.json b/src/main/resources/data/unicopia/tags/items/sight_elementals.json index 13674db5..760f4248 100644 --- a/src/main/resources/data/unicopia/tags/items/sight_elementals.json +++ b/src/main/resources/data/unicopia/tags/items/sight_elementals.json @@ -3,7 +3,7 @@ "values": [ "minecraft:ender_eye", "minecraft:spider_eye", - "minecraft:speckled_mellon", + "minecraft:glistering_melon_slice", "minecraft:ender_pearl" ] } diff --git a/src/main/resources/data/unicopia/tags/items/sound_elementals.json b/src/main/resources/data/unicopia/tags/items/sound_elementals.json index f349fcf6..48da25c7 100644 --- a/src/main/resources/data/unicopia/tags/items/sound_elementals.json +++ b/src/main/resources/data/unicopia/tags/items/sound_elementals.json @@ -1,16 +1,6 @@ { "replace": false, "values": [ - "minecraft:record_13", - "minecraft:record_cat", - "minecraft:record_blocks", - "minecraft:record_chirp", - "minecraft:record_far", - "minecraft:record_mall", - "minecraft:record_mellohi", - "minecraft:record_stal", - "minecraft:record_strad", - "minecraft:record_ward", - "minecraft:record_wait" + "#minecraft:music_discs" ] } diff --git a/src/main/resources/data/unicopia/tags/items/sweetie_belle_spirit.json b/src/main/resources/data/unicopia/tags/items/sweetie_belle_spirit.json index 986be8c3..f47be80f 100644 --- a/src/main/resources/data/unicopia/tags/items/sweetie_belle_spirit.json +++ b/src/main/resources/data/unicopia/tags/items/sweetie_belle_spirit.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "minecraft:noteblock", + "minecraft:note_block", "minecraft:jukebox", "minecraft:diamond" ]