diff --git a/src/generated/resources/data/botania/advancements/recipes/botania/dye_black.json b/src/generated/resources/data/botania/advancements/recipes/botania/dye_black.json deleted file mode 100644 index 0a719989e..000000000 --- a/src/generated/resources/data/botania/advancements/recipes/botania/dye_black.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "botania:dye_black" - ] - }, - "criteria": { - "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:black_dye" - } - ] - } - }, - "has_alt_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:black_petal" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "botania:dye_black" - } - } - }, - "requirements": [ - [ - "has_item", - "has_alt_item", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/botania/advancements/recipes/botania/fertilizer_powder.json b/src/generated/resources/data/botania/advancements/recipes/misc/dye_black.json similarity index 79% rename from src/generated/resources/data/botania/advancements/recipes/botania/fertilizer_powder.json rename to src/generated/resources/data/botania/advancements/recipes/misc/dye_black.json index d6c4cbb93..ee5dced37 100644 --- a/src/generated/resources/data/botania/advancements/recipes/botania/fertilizer_powder.json +++ b/src/generated/resources/data/botania/advancements/recipes/misc/dye_black.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "botania:fertilizer_powder" + "botania:dye_black" ] }, "criteria": { @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "botania:dyes" + "item": "botania:black_petal" } ] } @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "botania:fertilizer_powder" + "recipe": "botania:dye_black" } } }, diff --git a/src/generated/resources/data/botania/advancements/recipes/botania/dye_blue.json b/src/generated/resources/data/botania/advancements/recipes/misc/dye_blue.json similarity index 71% rename from src/generated/resources/data/botania/advancements/recipes/botania/dye_blue.json rename to src/generated/resources/data/botania/advancements/recipes/misc/dye_blue.json index 9ea3c8544..f2285e688 100644 --- a/src/generated/resources/data/botania/advancements/recipes/botania/dye_blue.json +++ b/src/generated/resources/data/botania/advancements/recipes/misc/dye_blue.json @@ -7,16 +7,6 @@ }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:blue_dye" - } - ] - } - }, - "has_alt_item": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ @@ -36,7 +26,6 @@ "requirements": [ [ "has_item", - "has_alt_item", "has_the_recipe" ] ] diff --git a/src/generated/resources/data/botania/advancements/recipes/botania/dye_brown.json b/src/generated/resources/data/botania/advancements/recipes/misc/dye_brown.json similarity index 71% rename from src/generated/resources/data/botania/advancements/recipes/botania/dye_brown.json rename to src/generated/resources/data/botania/advancements/recipes/misc/dye_brown.json index c41360264..364f05321 100644 --- a/src/generated/resources/data/botania/advancements/recipes/botania/dye_brown.json +++ b/src/generated/resources/data/botania/advancements/recipes/misc/dye_brown.json @@ -7,16 +7,6 @@ }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:brown_dye" - } - ] - } - }, - "has_alt_item": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ @@ -36,7 +26,6 @@ "requirements": [ [ "has_item", - "has_alt_item", "has_the_recipe" ] ] diff --git a/src/generated/resources/data/botania/advancements/recipes/botania/dye_cyan.json b/src/generated/resources/data/botania/advancements/recipes/misc/dye_cyan.json similarity index 71% rename from src/generated/resources/data/botania/advancements/recipes/botania/dye_cyan.json rename to src/generated/resources/data/botania/advancements/recipes/misc/dye_cyan.json index 719bcc8a2..82f861e6c 100644 --- a/src/generated/resources/data/botania/advancements/recipes/botania/dye_cyan.json +++ b/src/generated/resources/data/botania/advancements/recipes/misc/dye_cyan.json @@ -7,16 +7,6 @@ }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:cyan_dye" - } - ] - } - }, - "has_alt_item": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ @@ -36,7 +26,6 @@ "requirements": [ [ "has_item", - "has_alt_item", "has_the_recipe" ] ] diff --git a/src/generated/resources/data/botania/advancements/recipes/botania/dye_gray.json b/src/generated/resources/data/botania/advancements/recipes/misc/dye_gray.json similarity index 71% rename from src/generated/resources/data/botania/advancements/recipes/botania/dye_gray.json rename to src/generated/resources/data/botania/advancements/recipes/misc/dye_gray.json index 3d80be11a..ff1a7e1aa 100644 --- a/src/generated/resources/data/botania/advancements/recipes/botania/dye_gray.json +++ b/src/generated/resources/data/botania/advancements/recipes/misc/dye_gray.json @@ -7,16 +7,6 @@ }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:gray_dye" - } - ] - } - }, - "has_alt_item": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ @@ -36,7 +26,6 @@ "requirements": [ [ "has_item", - "has_alt_item", "has_the_recipe" ] ] diff --git a/src/generated/resources/data/botania/advancements/recipes/botania/dye_green.json b/src/generated/resources/data/botania/advancements/recipes/misc/dye_green.json similarity index 71% rename from src/generated/resources/data/botania/advancements/recipes/botania/dye_green.json rename to src/generated/resources/data/botania/advancements/recipes/misc/dye_green.json index 7080a682a..1bbbf9712 100644 --- a/src/generated/resources/data/botania/advancements/recipes/botania/dye_green.json +++ b/src/generated/resources/data/botania/advancements/recipes/misc/dye_green.json @@ -7,16 +7,6 @@ }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:green_dye" - } - ] - } - }, - "has_alt_item": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ @@ -36,7 +26,6 @@ "requirements": [ [ "has_item", - "has_alt_item", "has_the_recipe" ] ] diff --git a/src/generated/resources/data/botania/advancements/recipes/botania/dye_light_blue.json b/src/generated/resources/data/botania/advancements/recipes/misc/dye_light_blue.json similarity index 71% rename from src/generated/resources/data/botania/advancements/recipes/botania/dye_light_blue.json rename to src/generated/resources/data/botania/advancements/recipes/misc/dye_light_blue.json index 9046e0b78..32638ba3e 100644 --- a/src/generated/resources/data/botania/advancements/recipes/botania/dye_light_blue.json +++ b/src/generated/resources/data/botania/advancements/recipes/misc/dye_light_blue.json @@ -7,16 +7,6 @@ }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:light_blue_dye" - } - ] - } - }, - "has_alt_item": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ @@ -36,7 +26,6 @@ "requirements": [ [ "has_item", - "has_alt_item", "has_the_recipe" ] ] diff --git a/src/generated/resources/data/botania/advancements/recipes/botania/dye_light_gray.json b/src/generated/resources/data/botania/advancements/recipes/misc/dye_light_gray.json similarity index 71% rename from src/generated/resources/data/botania/advancements/recipes/botania/dye_light_gray.json rename to src/generated/resources/data/botania/advancements/recipes/misc/dye_light_gray.json index e0db9416e..5b431730b 100644 --- a/src/generated/resources/data/botania/advancements/recipes/botania/dye_light_gray.json +++ b/src/generated/resources/data/botania/advancements/recipes/misc/dye_light_gray.json @@ -7,16 +7,6 @@ }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:light_gray_dye" - } - ] - } - }, - "has_alt_item": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ @@ -36,7 +26,6 @@ "requirements": [ [ "has_item", - "has_alt_item", "has_the_recipe" ] ] diff --git a/src/generated/resources/data/botania/advancements/recipes/botania/dye_lime.json b/src/generated/resources/data/botania/advancements/recipes/misc/dye_lime.json similarity index 71% rename from src/generated/resources/data/botania/advancements/recipes/botania/dye_lime.json rename to src/generated/resources/data/botania/advancements/recipes/misc/dye_lime.json index c25808e7e..9401c903a 100644 --- a/src/generated/resources/data/botania/advancements/recipes/botania/dye_lime.json +++ b/src/generated/resources/data/botania/advancements/recipes/misc/dye_lime.json @@ -7,16 +7,6 @@ }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:lime_dye" - } - ] - } - }, - "has_alt_item": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ @@ -36,7 +26,6 @@ "requirements": [ [ "has_item", - "has_alt_item", "has_the_recipe" ] ] diff --git a/src/generated/resources/data/botania/advancements/recipes/botania/dye_magenta.json b/src/generated/resources/data/botania/advancements/recipes/misc/dye_magenta.json similarity index 71% rename from src/generated/resources/data/botania/advancements/recipes/botania/dye_magenta.json rename to src/generated/resources/data/botania/advancements/recipes/misc/dye_magenta.json index 145f8731c..12e7c967d 100644 --- a/src/generated/resources/data/botania/advancements/recipes/botania/dye_magenta.json +++ b/src/generated/resources/data/botania/advancements/recipes/misc/dye_magenta.json @@ -7,16 +7,6 @@ }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:magenta_dye" - } - ] - } - }, - "has_alt_item": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ @@ -36,7 +26,6 @@ "requirements": [ [ "has_item", - "has_alt_item", "has_the_recipe" ] ] diff --git a/src/generated/resources/data/botania/advancements/recipes/botania/dye_magenta_double.json b/src/generated/resources/data/botania/advancements/recipes/misc/dye_magenta_double.json similarity index 94% rename from src/generated/resources/data/botania/advancements/recipes/botania/dye_magenta_double.json rename to src/generated/resources/data/botania/advancements/recipes/misc/dye_magenta_double.json index c846824ef..cc6e3ad1c 100644 --- a/src/generated/resources/data/botania/advancements/recipes/botania/dye_magenta_double.json +++ b/src/generated/resources/data/botania/advancements/recipes/misc/dye_magenta_double.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "item": "botania:yellow_dye" + "item": "minecraft:yellow_dye" } ] } diff --git a/src/generated/resources/data/botania/advancements/recipes/botania/dye_orange.json b/src/generated/resources/data/botania/advancements/recipes/misc/dye_orange.json similarity index 71% rename from src/generated/resources/data/botania/advancements/recipes/botania/dye_orange.json rename to src/generated/resources/data/botania/advancements/recipes/misc/dye_orange.json index 91bd2bb2d..22e653739 100644 --- a/src/generated/resources/data/botania/advancements/recipes/botania/dye_orange.json +++ b/src/generated/resources/data/botania/advancements/recipes/misc/dye_orange.json @@ -7,16 +7,6 @@ }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:orange_dye" - } - ] - } - }, - "has_alt_item": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ @@ -36,7 +26,6 @@ "requirements": [ [ "has_item", - "has_alt_item", "has_the_recipe" ] ] diff --git a/src/generated/resources/data/botania/advancements/recipes/botania/dye_pink.json b/src/generated/resources/data/botania/advancements/recipes/misc/dye_pink.json similarity index 71% rename from src/generated/resources/data/botania/advancements/recipes/botania/dye_pink.json rename to src/generated/resources/data/botania/advancements/recipes/misc/dye_pink.json index 5997e87c6..e1abeed21 100644 --- a/src/generated/resources/data/botania/advancements/recipes/botania/dye_pink.json +++ b/src/generated/resources/data/botania/advancements/recipes/misc/dye_pink.json @@ -7,16 +7,6 @@ }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:pink_dye" - } - ] - } - }, - "has_alt_item": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ @@ -36,7 +26,6 @@ "requirements": [ [ "has_item", - "has_alt_item", "has_the_recipe" ] ] diff --git a/src/generated/resources/data/botania/advancements/recipes/botania/dye_pink_double.json b/src/generated/resources/data/botania/advancements/recipes/misc/dye_pink_double.json similarity index 94% rename from src/generated/resources/data/botania/advancements/recipes/botania/dye_pink_double.json rename to src/generated/resources/data/botania/advancements/recipes/misc/dye_pink_double.json index 776b7caf1..7adebaf1e 100644 --- a/src/generated/resources/data/botania/advancements/recipes/botania/dye_pink_double.json +++ b/src/generated/resources/data/botania/advancements/recipes/misc/dye_pink_double.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "item": "botania:pink_dye" + "item": "minecraft:pink_dye" } ] } diff --git a/src/generated/resources/data/botania/advancements/recipes/botania/dye_purple.json b/src/generated/resources/data/botania/advancements/recipes/misc/dye_purple.json similarity index 71% rename from src/generated/resources/data/botania/advancements/recipes/botania/dye_purple.json rename to src/generated/resources/data/botania/advancements/recipes/misc/dye_purple.json index b3616829b..71ca0abb1 100644 --- a/src/generated/resources/data/botania/advancements/recipes/botania/dye_purple.json +++ b/src/generated/resources/data/botania/advancements/recipes/misc/dye_purple.json @@ -7,16 +7,6 @@ }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:purple_dye" - } - ] - } - }, - "has_alt_item": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ @@ -36,7 +26,6 @@ "requirements": [ [ "has_item", - "has_alt_item", "has_the_recipe" ] ] diff --git a/src/generated/resources/data/botania/advancements/recipes/botania/dye_red.json b/src/generated/resources/data/botania/advancements/recipes/misc/dye_red.json similarity index 71% rename from src/generated/resources/data/botania/advancements/recipes/botania/dye_red.json rename to src/generated/resources/data/botania/advancements/recipes/misc/dye_red.json index 7beae85a6..164885ad1 100644 --- a/src/generated/resources/data/botania/advancements/recipes/botania/dye_red.json +++ b/src/generated/resources/data/botania/advancements/recipes/misc/dye_red.json @@ -7,16 +7,6 @@ }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:red_dye" - } - ] - } - }, - "has_alt_item": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ @@ -36,7 +26,6 @@ "requirements": [ [ "has_item", - "has_alt_item", "has_the_recipe" ] ] diff --git a/src/generated/resources/data/botania/advancements/recipes/botania/dye_red_double.json b/src/generated/resources/data/botania/advancements/recipes/misc/dye_red_double.json similarity index 94% rename from src/generated/resources/data/botania/advancements/recipes/botania/dye_red_double.json rename to src/generated/resources/data/botania/advancements/recipes/misc/dye_red_double.json index 133a9c071..c0dec582e 100644 --- a/src/generated/resources/data/botania/advancements/recipes/botania/dye_red_double.json +++ b/src/generated/resources/data/botania/advancements/recipes/misc/dye_red_double.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "item": "botania:red_dye" + "item": "minecraft:red_dye" } ] } diff --git a/src/generated/resources/data/botania/advancements/recipes/botania/dye_white.json b/src/generated/resources/data/botania/advancements/recipes/misc/dye_white.json similarity index 71% rename from src/generated/resources/data/botania/advancements/recipes/botania/dye_white.json rename to src/generated/resources/data/botania/advancements/recipes/misc/dye_white.json index 8293277ad..fb120832e 100644 --- a/src/generated/resources/data/botania/advancements/recipes/botania/dye_white.json +++ b/src/generated/resources/data/botania/advancements/recipes/misc/dye_white.json @@ -7,16 +7,6 @@ }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:white_dye" - } - ] - } - }, - "has_alt_item": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ @@ -36,7 +26,6 @@ "requirements": [ [ "has_item", - "has_alt_item", "has_the_recipe" ] ] diff --git a/src/generated/resources/data/botania/advancements/recipes/botania/dye_yellow.json b/src/generated/resources/data/botania/advancements/recipes/misc/dye_yellow.json similarity index 71% rename from src/generated/resources/data/botania/advancements/recipes/botania/dye_yellow.json rename to src/generated/resources/data/botania/advancements/recipes/misc/dye_yellow.json index d7678f5e8..f1278f2d7 100644 --- a/src/generated/resources/data/botania/advancements/recipes/botania/dye_yellow.json +++ b/src/generated/resources/data/botania/advancements/recipes/misc/dye_yellow.json @@ -7,16 +7,6 @@ }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:yellow_dye" - } - ] - } - }, - "has_alt_item": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ @@ -36,7 +26,6 @@ "requirements": [ [ "has_item", - "has_alt_item", "has_the_recipe" ] ] diff --git a/src/generated/resources/data/botania/advancements/recipes/botania/dye_yellow_double.json b/src/generated/resources/data/botania/advancements/recipes/misc/dye_yellow_double.json similarity index 94% rename from src/generated/resources/data/botania/advancements/recipes/botania/dye_yellow_double.json rename to src/generated/resources/data/botania/advancements/recipes/misc/dye_yellow_double.json index 6d7d42fad..bf6a8e660 100644 --- a/src/generated/resources/data/botania/advancements/recipes/botania/dye_yellow_double.json +++ b/src/generated/resources/data/botania/advancements/recipes/misc/dye_yellow_double.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "item": "botania:yellow_dye" + "item": "minecraft:yellow_dye" } ] } diff --git a/src/generated/resources/data/botania/recipes/cosmetic_alien_antenna.json b/src/generated/resources/data/botania/recipes/cosmetic_alien_antenna.json index 1d8e58872..d594b8216 100644 --- a/src/generated/resources/data/botania/recipes/cosmetic_alien_antenna.json +++ b/src/generated/resources/data/botania/recipes/cosmetic_alien_antenna.json @@ -8,7 +8,7 @@ ], "key": { "P": { - "item": "botania:light_gray_dye" + "item": "minecraft:light_gray_dye" }, "S": { "item": "botania:mana_string" diff --git a/src/generated/resources/data/botania/recipes/cosmetic_anaglyph_glasses.json b/src/generated/resources/data/botania/recipes/cosmetic_anaglyph_glasses.json index 3cde8b703..5a53fd04f 100644 --- a/src/generated/resources/data/botania/recipes/cosmetic_anaglyph_glasses.json +++ b/src/generated/resources/data/botania/recipes/cosmetic_anaglyph_glasses.json @@ -8,7 +8,7 @@ ], "key": { "P": { - "item": "botania:cyan_dye" + "item": "minecraft:cyan_dye" }, "S": { "item": "botania:mana_string" diff --git a/src/generated/resources/data/botania/recipes/cosmetic_ancient_mask.json b/src/generated/resources/data/botania/recipes/cosmetic_ancient_mask.json index db17beee8..6b6e30f78 100644 --- a/src/generated/resources/data/botania/recipes/cosmetic_ancient_mask.json +++ b/src/generated/resources/data/botania/recipes/cosmetic_ancient_mask.json @@ -8,7 +8,7 @@ ], "key": { "P": { - "item": "botania:pink_dye" + "item": "minecraft:pink_dye" }, "S": { "item": "botania:mana_string" diff --git a/src/generated/resources/data/botania/recipes/cosmetic_botanist_emblem.json b/src/generated/resources/data/botania/recipes/cosmetic_botanist_emblem.json index b5448be8c..d131e8282 100644 --- a/src/generated/resources/data/botania/recipes/cosmetic_botanist_emblem.json +++ b/src/generated/resources/data/botania/recipes/cosmetic_botanist_emblem.json @@ -8,7 +8,7 @@ ], "key": { "P": { - "item": "botania:lime_dye" + "item": "minecraft:lime_dye" }, "S": { "item": "botania:mana_string" diff --git a/src/generated/resources/data/botania/recipes/cosmetic_clock_eye.json b/src/generated/resources/data/botania/recipes/cosmetic_clock_eye.json index 87dadf9ee..e37f0371f 100644 --- a/src/generated/resources/data/botania/recipes/cosmetic_clock_eye.json +++ b/src/generated/resources/data/botania/recipes/cosmetic_clock_eye.json @@ -8,7 +8,7 @@ ], "key": { "P": { - "item": "botania:orange_dye" + "item": "minecraft:orange_dye" }, "S": { "item": "botania:mana_string" diff --git a/src/generated/resources/data/botania/recipes/cosmetic_devil_horns.json b/src/generated/resources/data/botania/recipes/cosmetic_devil_horns.json index ac655a5a3..045c7348b 100644 --- a/src/generated/resources/data/botania/recipes/cosmetic_devil_horns.json +++ b/src/generated/resources/data/botania/recipes/cosmetic_devil_horns.json @@ -8,7 +8,7 @@ ], "key": { "P": { - "item": "botania:light_blue_dye" + "item": "minecraft:light_blue_dye" }, "S": { "item": "botania:mana_string" diff --git a/src/generated/resources/data/botania/recipes/cosmetic_eerie_mask.json b/src/generated/resources/data/botania/recipes/cosmetic_eerie_mask.json index fafb99530..0d4ad04bd 100644 --- a/src/generated/resources/data/botania/recipes/cosmetic_eerie_mask.json +++ b/src/generated/resources/data/botania/recipes/cosmetic_eerie_mask.json @@ -8,7 +8,7 @@ ], "key": { "P": { - "item": "botania:gray_dye" + "item": "minecraft:gray_dye" }, "S": { "item": "botania:mana_string" diff --git a/src/generated/resources/data/botania/recipes/cosmetic_four_leaf_clover.json b/src/generated/resources/data/botania/recipes/cosmetic_four_leaf_clover.json index 98ece417b..1361f847e 100644 --- a/src/generated/resources/data/botania/recipes/cosmetic_four_leaf_clover.json +++ b/src/generated/resources/data/botania/recipes/cosmetic_four_leaf_clover.json @@ -8,7 +8,7 @@ ], "key": { "P": { - "item": "botania:white_dye" + "item": "minecraft:white_dye" }, "S": { "item": "botania:mana_string" diff --git a/src/generated/resources/data/botania/recipes/cosmetic_groucho_glasses.json b/src/generated/resources/data/botania/recipes/cosmetic_groucho_glasses.json index 6ccfd71c0..017c5472b 100644 --- a/src/generated/resources/data/botania/recipes/cosmetic_groucho_glasses.json +++ b/src/generated/resources/data/botania/recipes/cosmetic_groucho_glasses.json @@ -8,7 +8,7 @@ ], "key": { "P": { - "item": "botania:blue_dye" + "item": "minecraft:blue_dye" }, "S": { "item": "botania:mana_string" diff --git a/src/generated/resources/data/botania/recipes/cosmetic_hyper_plus.json b/src/generated/resources/data/botania/recipes/cosmetic_hyper_plus.json index 7c3477476..36fbf66f9 100644 --- a/src/generated/resources/data/botania/recipes/cosmetic_hyper_plus.json +++ b/src/generated/resources/data/botania/recipes/cosmetic_hyper_plus.json @@ -8,7 +8,7 @@ ], "key": { "P": { - "item": "botania:yellow_dye" + "item": "minecraft:yellow_dye" }, "S": { "item": "botania:mana_string" diff --git a/src/generated/resources/data/botania/recipes/cosmetic_lusitanic_shield.json b/src/generated/resources/data/botania/recipes/cosmetic_lusitanic_shield.json index 733c3eeb5..7a67f2102 100644 --- a/src/generated/resources/data/botania/recipes/cosmetic_lusitanic_shield.json +++ b/src/generated/resources/data/botania/recipes/cosmetic_lusitanic_shield.json @@ -8,7 +8,7 @@ ], "key": { "P": { - "item": "botania:green_dye" + "item": "minecraft:green_dye" }, "S": { "item": "botania:mana_string" diff --git a/src/generated/resources/data/botania/recipes/cosmetic_orange_shades.json b/src/generated/resources/data/botania/recipes/cosmetic_orange_shades.json index a0264401b..ce9dba197 100644 --- a/src/generated/resources/data/botania/recipes/cosmetic_orange_shades.json +++ b/src/generated/resources/data/botania/recipes/cosmetic_orange_shades.json @@ -8,7 +8,7 @@ ], "key": { "P": { - "item": "botania:purple_dye" + "item": "minecraft:purple_dye" }, "S": { "item": "botania:mana_string" diff --git a/src/generated/resources/data/botania/recipes/cosmetic_questgiver_mark.json b/src/generated/resources/data/botania/recipes/cosmetic_questgiver_mark.json index 95de4b13b..cd60d93ce 100644 --- a/src/generated/resources/data/botania/recipes/cosmetic_questgiver_mark.json +++ b/src/generated/resources/data/botania/recipes/cosmetic_questgiver_mark.json @@ -8,7 +8,7 @@ ], "key": { "P": { - "item": "botania:black_dye" + "item": "minecraft:black_dye" }, "S": { "item": "botania:mana_string" diff --git a/src/generated/resources/data/botania/recipes/cosmetic_thick_eyebrows.json b/src/generated/resources/data/botania/recipes/cosmetic_thick_eyebrows.json index cea8e9650..95f26e476 100644 --- a/src/generated/resources/data/botania/recipes/cosmetic_thick_eyebrows.json +++ b/src/generated/resources/data/botania/recipes/cosmetic_thick_eyebrows.json @@ -8,7 +8,7 @@ ], "key": { "P": { - "item": "botania:brown_dye" + "item": "minecraft:brown_dye" }, "S": { "item": "botania:mana_string" diff --git a/src/generated/resources/data/botania/recipes/cosmetic_tiny_potato_mask.json b/src/generated/resources/data/botania/recipes/cosmetic_tiny_potato_mask.json index f422467df..d522d96f6 100644 --- a/src/generated/resources/data/botania/recipes/cosmetic_tiny_potato_mask.json +++ b/src/generated/resources/data/botania/recipes/cosmetic_tiny_potato_mask.json @@ -8,7 +8,7 @@ ], "key": { "P": { - "item": "botania:red_dye" + "item": "minecraft:red_dye" }, "S": { "item": "botania:mana_string" diff --git a/src/generated/resources/data/botania/recipes/cosmetic_unicorn_horn.json b/src/generated/resources/data/botania/recipes/cosmetic_unicorn_horn.json index f526600cf..493d091e3 100644 --- a/src/generated/resources/data/botania/recipes/cosmetic_unicorn_horn.json +++ b/src/generated/resources/data/botania/recipes/cosmetic_unicorn_horn.json @@ -8,7 +8,7 @@ ], "key": { "P": { - "item": "botania:magenta_dye" + "item": "minecraft:magenta_dye" }, "S": { "item": "botania:mana_string" diff --git a/src/generated/resources/data/botania/recipes/dye_black.json b/src/generated/resources/data/botania/recipes/dye_black.json index 36d366954..2e30567a7 100644 --- a/src/generated/resources/data/botania/recipes/dye_black.json +++ b/src/generated/resources/data/botania/recipes/dye_black.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "botania:black_dye" + "item": "minecraft:black_dye" } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/dye_blue.json b/src/generated/resources/data/botania/recipes/dye_blue.json index c99245065..0f088418d 100644 --- a/src/generated/resources/data/botania/recipes/dye_blue.json +++ b/src/generated/resources/data/botania/recipes/dye_blue.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "botania:blue_dye" + "item": "minecraft:blue_dye" } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/dye_brown.json b/src/generated/resources/data/botania/recipes/dye_brown.json index cebb6bee6..a0a472bc4 100644 --- a/src/generated/resources/data/botania/recipes/dye_brown.json +++ b/src/generated/resources/data/botania/recipes/dye_brown.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "botania:brown_dye" + "item": "minecraft:brown_dye" } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/dye_cyan.json b/src/generated/resources/data/botania/recipes/dye_cyan.json index 02f4558b4..699b370fc 100644 --- a/src/generated/resources/data/botania/recipes/dye_cyan.json +++ b/src/generated/resources/data/botania/recipes/dye_cyan.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "botania:cyan_dye" + "item": "minecraft:cyan_dye" } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/dye_gray.json b/src/generated/resources/data/botania/recipes/dye_gray.json index f14b09e61..cd26a1302 100644 --- a/src/generated/resources/data/botania/recipes/dye_gray.json +++ b/src/generated/resources/data/botania/recipes/dye_gray.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "botania:gray_dye" + "item": "minecraft:gray_dye" } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/dye_green.json b/src/generated/resources/data/botania/recipes/dye_green.json index 8f608f32f..43efcc9a6 100644 --- a/src/generated/resources/data/botania/recipes/dye_green.json +++ b/src/generated/resources/data/botania/recipes/dye_green.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "botania:green_dye" + "item": "minecraft:green_dye" } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/dye_light_blue.json b/src/generated/resources/data/botania/recipes/dye_light_blue.json index de0ae4d49..5d5927cba 100644 --- a/src/generated/resources/data/botania/recipes/dye_light_blue.json +++ b/src/generated/resources/data/botania/recipes/dye_light_blue.json @@ -15,6 +15,6 @@ } ], "result": { - "item": "botania:light_blue_dye" + "item": "minecraft:light_blue_dye" } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/dye_light_gray.json b/src/generated/resources/data/botania/recipes/dye_light_gray.json index 0024c804e..03a47b30d 100644 --- a/src/generated/resources/data/botania/recipes/dye_light_gray.json +++ b/src/generated/resources/data/botania/recipes/dye_light_gray.json @@ -21,6 +21,6 @@ } ], "result": { - "item": "botania:light_gray_dye" + "item": "minecraft:light_gray_dye" } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/dye_lime.json b/src/generated/resources/data/botania/recipes/dye_lime.json index 000246bf2..b7e23a93a 100644 --- a/src/generated/resources/data/botania/recipes/dye_lime.json +++ b/src/generated/resources/data/botania/recipes/dye_lime.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "botania:lime_dye" + "item": "minecraft:lime_dye" } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/dye_magenta.json b/src/generated/resources/data/botania/recipes/dye_magenta.json index e1ba51407..7dfdf95ed 100644 --- a/src/generated/resources/data/botania/recipes/dye_magenta.json +++ b/src/generated/resources/data/botania/recipes/dye_magenta.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "botania:magenta_dye" + "item": "minecraft:magenta_dye" } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/dye_magenta_double.json b/src/generated/resources/data/botania/recipes/dye_magenta_double.json index b4d4f046f..657fe01cd 100644 --- a/src/generated/resources/data/botania/recipes/dye_magenta_double.json +++ b/src/generated/resources/data/botania/recipes/dye_magenta_double.json @@ -10,7 +10,7 @@ } ], "result": { - "item": "botania:magenta_dye", + "item": "minecraft:magenta_dye", "count": 2 } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/dye_orange.json b/src/generated/resources/data/botania/recipes/dye_orange.json index 2c638e2f1..2106afce7 100644 --- a/src/generated/resources/data/botania/recipes/dye_orange.json +++ b/src/generated/resources/data/botania/recipes/dye_orange.json @@ -15,6 +15,6 @@ } ], "result": { - "item": "botania:orange_dye" + "item": "minecraft:orange_dye" } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/dye_pink.json b/src/generated/resources/data/botania/recipes/dye_pink.json index df2540890..5d27892c1 100644 --- a/src/generated/resources/data/botania/recipes/dye_pink.json +++ b/src/generated/resources/data/botania/recipes/dye_pink.json @@ -15,6 +15,6 @@ } ], "result": { - "item": "botania:pink_dye" + "item": "minecraft:pink_dye" } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/dye_pink_double.json b/src/generated/resources/data/botania/recipes/dye_pink_double.json index 64b728935..625146032 100644 --- a/src/generated/resources/data/botania/recipes/dye_pink_double.json +++ b/src/generated/resources/data/botania/recipes/dye_pink_double.json @@ -10,7 +10,7 @@ } ], "result": { - "item": "botania:pink_dye", + "item": "minecraft:pink_dye", "count": 2 } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/dye_purple.json b/src/generated/resources/data/botania/recipes/dye_purple.json index 4d3f765ea..a9178fe39 100644 --- a/src/generated/resources/data/botania/recipes/dye_purple.json +++ b/src/generated/resources/data/botania/recipes/dye_purple.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "botania:purple_dye" + "item": "minecraft:purple_dye" } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/dye_red.json b/src/generated/resources/data/botania/recipes/dye_red.json index 6aec50202..73d474f93 100644 --- a/src/generated/resources/data/botania/recipes/dye_red.json +++ b/src/generated/resources/data/botania/recipes/dye_red.json @@ -18,6 +18,6 @@ } ], "result": { - "item": "botania:red_dye" + "item": "minecraft:red_dye" } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/dye_red_double.json b/src/generated/resources/data/botania/recipes/dye_red_double.json index 94c4e8459..90805f5e7 100644 --- a/src/generated/resources/data/botania/recipes/dye_red_double.json +++ b/src/generated/resources/data/botania/recipes/dye_red_double.json @@ -10,7 +10,7 @@ } ], "result": { - "item": "botania:red_dye", + "item": "minecraft:red_dye", "count": 2 } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/dye_white.json b/src/generated/resources/data/botania/recipes/dye_white.json index efd53a539..d5bb9d688 100644 --- a/src/generated/resources/data/botania/recipes/dye_white.json +++ b/src/generated/resources/data/botania/recipes/dye_white.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "botania:white_dye" + "item": "minecraft:white_dye" } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/dye_yellow.json b/src/generated/resources/data/botania/recipes/dye_yellow.json index a8d01acd0..11f8b78c2 100644 --- a/src/generated/resources/data/botania/recipes/dye_yellow.json +++ b/src/generated/resources/data/botania/recipes/dye_yellow.json @@ -15,6 +15,6 @@ } ], "result": { - "item": "botania:yellow_dye" + "item": "minecraft:yellow_dye" } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/dye_yellow_double.json b/src/generated/resources/data/botania/recipes/dye_yellow_double.json index 995a1a339..89bf95cb3 100644 --- a/src/generated/resources/data/botania/recipes/dye_yellow_double.json +++ b/src/generated/resources/data/botania/recipes/dye_yellow_double.json @@ -10,7 +10,7 @@ } ], "result": { - "item": "botania:yellow_dye", + "item": "minecraft:yellow_dye", "count": 2 } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/fertilizer_powder.json b/src/generated/resources/data/botania/recipes/fertilizer_powder.json deleted file mode 100644 index 1e1dd6d2f..000000000 --- a/src/generated/resources/data/botania/recipes/fertilizer_powder.json +++ /dev/null @@ -1,211 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:bone_meal" - }, - [ - { - "item": "botania:white_dye" - }, - { - "item": "botania:orange_dye" - }, - { - "item": "botania:magenta_dye" - }, - { - "item": "botania:light_blue_dye" - }, - { - "item": "botania:yellow_dye" - }, - { - "item": "botania:lime_dye" - }, - { - "item": "botania:pink_dye" - }, - { - "item": "botania:gray_dye" - }, - { - "item": "botania:light_gray_dye" - }, - { - "item": "botania:cyan_dye" - }, - { - "item": "botania:purple_dye" - }, - { - "item": "botania:blue_dye" - }, - { - "item": "botania:brown_dye" - }, - { - "item": "botania:green_dye" - }, - { - "item": "botania:red_dye" - }, - { - "item": "botania:black_dye" - } - ], - [ - { - "item": "botania:white_dye" - }, - { - "item": "botania:orange_dye" - }, - { - "item": "botania:magenta_dye" - }, - { - "item": "botania:light_blue_dye" - }, - { - "item": "botania:yellow_dye" - }, - { - "item": "botania:lime_dye" - }, - { - "item": "botania:pink_dye" - }, - { - "item": "botania:gray_dye" - }, - { - "item": "botania:light_gray_dye" - }, - { - "item": "botania:cyan_dye" - }, - { - "item": "botania:purple_dye" - }, - { - "item": "botania:blue_dye" - }, - { - "item": "botania:brown_dye" - }, - { - "item": "botania:green_dye" - }, - { - "item": "botania:red_dye" - }, - { - "item": "botania:black_dye" - } - ], - [ - { - "item": "botania:white_dye" - }, - { - "item": "botania:orange_dye" - }, - { - "item": "botania:magenta_dye" - }, - { - "item": "botania:light_blue_dye" - }, - { - "item": "botania:yellow_dye" - }, - { - "item": "botania:lime_dye" - }, - { - "item": "botania:pink_dye" - }, - { - "item": "botania:gray_dye" - }, - { - "item": "botania:light_gray_dye" - }, - { - "item": "botania:cyan_dye" - }, - { - "item": "botania:purple_dye" - }, - { - "item": "botania:blue_dye" - }, - { - "item": "botania:brown_dye" - }, - { - "item": "botania:green_dye" - }, - { - "item": "botania:red_dye" - }, - { - "item": "botania:black_dye" - } - ], - [ - { - "item": "botania:white_dye" - }, - { - "item": "botania:orange_dye" - }, - { - "item": "botania:magenta_dye" - }, - { - "item": "botania:light_blue_dye" - }, - { - "item": "botania:yellow_dye" - }, - { - "item": "botania:lime_dye" - }, - { - "item": "botania:pink_dye" - }, - { - "item": "botania:gray_dye" - }, - { - "item": "botania:light_gray_dye" - }, - { - "item": "botania:cyan_dye" - }, - { - "item": "botania:purple_dye" - }, - { - "item": "botania:blue_dye" - }, - { - "item": "botania:brown_dye" - }, - { - "item": "botania:green_dye" - }, - { - "item": "botania:red_dye" - }, - { - "item": "botania:black_dye" - } - ] - ], - "result": { - "item": "botania:fertilizer" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/mana_powder_dye.json b/src/generated/resources/data/botania/recipes/mana_infusion/mana_powder_dye.json index 783711c99..acd22aebe 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/mana_powder_dye.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/mana_powder_dye.json @@ -2,52 +2,52 @@ "type": "botania:mana_infusion", "input": [ { - "item": "botania:white_dye" + "item": "minecraft:white_dye" }, { - "item": "botania:orange_dye" + "item": "minecraft:orange_dye" }, { - "item": "botania:magenta_dye" + "item": "minecraft:magenta_dye" }, { - "item": "botania:light_blue_dye" + "item": "minecraft:light_blue_dye" }, { - "item": "botania:yellow_dye" + "item": "minecraft:yellow_dye" }, { - "item": "botania:lime_dye" + "item": "minecraft:lime_dye" }, { - "item": "botania:pink_dye" + "item": "minecraft:pink_dye" }, { - "item": "botania:gray_dye" + "item": "minecraft:gray_dye" }, { - "item": "botania:light_gray_dye" + "item": "minecraft:light_gray_dye" }, { - "item": "botania:cyan_dye" + "item": "minecraft:cyan_dye" }, { - "item": "botania:purple_dye" + "item": "minecraft:purple_dye" }, { - "item": "botania:blue_dye" + "item": "minecraft:blue_dye" }, { - "item": "botania:brown_dye" + "item": "minecraft:brown_dye" }, { - "item": "botania:green_dye" + "item": "minecraft:green_dye" }, { - "item": "botania:red_dye" + "item": "minecraft:red_dye" }, { - "item": "botania:black_dye" + "item": "minecraft:black_dye" } ], "output": { diff --git a/src/generated/resources/data/botania/recipes/mushroom_0.json b/src/generated/resources/data/botania/recipes/mushroom_0.json index 374066d5e..9ecddbbfb 100644 --- a/src/generated/resources/data/botania/recipes/mushroom_0.json +++ b/src/generated/resources/data/botania/recipes/mushroom_0.json @@ -11,7 +11,7 @@ } ], { - "item": "botania:white_dye" + "item": "minecraft:white_dye" } ], "result": { diff --git a/src/generated/resources/data/botania/recipes/mushroom_1.json b/src/generated/resources/data/botania/recipes/mushroom_1.json index c4ccfcaf5..bccbfb4dd 100644 --- a/src/generated/resources/data/botania/recipes/mushroom_1.json +++ b/src/generated/resources/data/botania/recipes/mushroom_1.json @@ -11,7 +11,7 @@ } ], { - "item": "botania:orange_dye" + "item": "minecraft:orange_dye" } ], "result": { diff --git a/src/generated/resources/data/botania/recipes/mushroom_10.json b/src/generated/resources/data/botania/recipes/mushroom_10.json index 46598c4a2..92375609e 100644 --- a/src/generated/resources/data/botania/recipes/mushroom_10.json +++ b/src/generated/resources/data/botania/recipes/mushroom_10.json @@ -11,7 +11,7 @@ } ], { - "item": "botania:purple_dye" + "item": "minecraft:purple_dye" } ], "result": { diff --git a/src/generated/resources/data/botania/recipes/mushroom_11.json b/src/generated/resources/data/botania/recipes/mushroom_11.json index 5ffb575f6..e3437fa4c 100644 --- a/src/generated/resources/data/botania/recipes/mushroom_11.json +++ b/src/generated/resources/data/botania/recipes/mushroom_11.json @@ -11,7 +11,7 @@ } ], { - "item": "botania:blue_dye" + "item": "minecraft:blue_dye" } ], "result": { diff --git a/src/generated/resources/data/botania/recipes/mushroom_12.json b/src/generated/resources/data/botania/recipes/mushroom_12.json index 9c57e72c1..836b1ccfa 100644 --- a/src/generated/resources/data/botania/recipes/mushroom_12.json +++ b/src/generated/resources/data/botania/recipes/mushroom_12.json @@ -11,7 +11,7 @@ } ], { - "item": "botania:brown_dye" + "item": "minecraft:brown_dye" } ], "result": { diff --git a/src/generated/resources/data/botania/recipes/mushroom_13.json b/src/generated/resources/data/botania/recipes/mushroom_13.json index 96d95a664..2029afdc6 100644 --- a/src/generated/resources/data/botania/recipes/mushroom_13.json +++ b/src/generated/resources/data/botania/recipes/mushroom_13.json @@ -11,7 +11,7 @@ } ], { - "item": "botania:green_dye" + "item": "minecraft:green_dye" } ], "result": { diff --git a/src/generated/resources/data/botania/recipes/mushroom_14.json b/src/generated/resources/data/botania/recipes/mushroom_14.json index 74ede672d..7ba493078 100644 --- a/src/generated/resources/data/botania/recipes/mushroom_14.json +++ b/src/generated/resources/data/botania/recipes/mushroom_14.json @@ -11,7 +11,7 @@ } ], { - "item": "botania:red_dye" + "item": "minecraft:red_dye" } ], "result": { diff --git a/src/generated/resources/data/botania/recipes/mushroom_15.json b/src/generated/resources/data/botania/recipes/mushroom_15.json index a99abbd45..d1d0d4154 100644 --- a/src/generated/resources/data/botania/recipes/mushroom_15.json +++ b/src/generated/resources/data/botania/recipes/mushroom_15.json @@ -11,7 +11,7 @@ } ], { - "item": "botania:black_dye" + "item": "minecraft:black_dye" } ], "result": { diff --git a/src/generated/resources/data/botania/recipes/mushroom_2.json b/src/generated/resources/data/botania/recipes/mushroom_2.json index 901e6321f..bb720fece 100644 --- a/src/generated/resources/data/botania/recipes/mushroom_2.json +++ b/src/generated/resources/data/botania/recipes/mushroom_2.json @@ -11,7 +11,7 @@ } ], { - "item": "botania:magenta_dye" + "item": "minecraft:magenta_dye" } ], "result": { diff --git a/src/generated/resources/data/botania/recipes/mushroom_3.json b/src/generated/resources/data/botania/recipes/mushroom_3.json index 5f94ff0d3..145ec9107 100644 --- a/src/generated/resources/data/botania/recipes/mushroom_3.json +++ b/src/generated/resources/data/botania/recipes/mushroom_3.json @@ -11,7 +11,7 @@ } ], { - "item": "botania:light_blue_dye" + "item": "minecraft:light_blue_dye" } ], "result": { diff --git a/src/generated/resources/data/botania/recipes/mushroom_4.json b/src/generated/resources/data/botania/recipes/mushroom_4.json index 44c44b477..a6e1603c3 100644 --- a/src/generated/resources/data/botania/recipes/mushroom_4.json +++ b/src/generated/resources/data/botania/recipes/mushroom_4.json @@ -11,7 +11,7 @@ } ], { - "item": "botania:yellow_dye" + "item": "minecraft:yellow_dye" } ], "result": { diff --git a/src/generated/resources/data/botania/recipes/mushroom_5.json b/src/generated/resources/data/botania/recipes/mushroom_5.json index e45284ca9..4e52e72ae 100644 --- a/src/generated/resources/data/botania/recipes/mushroom_5.json +++ b/src/generated/resources/data/botania/recipes/mushroom_5.json @@ -11,7 +11,7 @@ } ], { - "item": "botania:lime_dye" + "item": "minecraft:lime_dye" } ], "result": { diff --git a/src/generated/resources/data/botania/recipes/mushroom_6.json b/src/generated/resources/data/botania/recipes/mushroom_6.json index 4a342333a..9c5fff3d4 100644 --- a/src/generated/resources/data/botania/recipes/mushroom_6.json +++ b/src/generated/resources/data/botania/recipes/mushroom_6.json @@ -11,7 +11,7 @@ } ], { - "item": "botania:pink_dye" + "item": "minecraft:pink_dye" } ], "result": { diff --git a/src/generated/resources/data/botania/recipes/mushroom_7.json b/src/generated/resources/data/botania/recipes/mushroom_7.json index 1de3e9f0a..4ff9e6c0b 100644 --- a/src/generated/resources/data/botania/recipes/mushroom_7.json +++ b/src/generated/resources/data/botania/recipes/mushroom_7.json @@ -11,7 +11,7 @@ } ], { - "item": "botania:gray_dye" + "item": "minecraft:gray_dye" } ], "result": { diff --git a/src/generated/resources/data/botania/recipes/mushroom_8.json b/src/generated/resources/data/botania/recipes/mushroom_8.json index dfd9c9dcf..673b0fbae 100644 --- a/src/generated/resources/data/botania/recipes/mushroom_8.json +++ b/src/generated/resources/data/botania/recipes/mushroom_8.json @@ -11,7 +11,7 @@ } ], { - "item": "botania:light_gray_dye" + "item": "minecraft:light_gray_dye" } ], "result": { diff --git a/src/generated/resources/data/botania/recipes/mushroom_9.json b/src/generated/resources/data/botania/recipes/mushroom_9.json index 40a499557..f91f32c2f 100644 --- a/src/generated/resources/data/botania/recipes/mushroom_9.json +++ b/src/generated/resources/data/botania/recipes/mushroom_9.json @@ -11,7 +11,7 @@ } ], { - "item": "botania:cyan_dye" + "item": "minecraft:cyan_dye" } ], "result": { diff --git a/src/generated/resources/data/botania/tags/items/dyes.json b/src/generated/resources/data/botania/tags/items/dyes.json deleted file mode 100644 index 88685bccb..000000000 --- a/src/generated/resources/data/botania/tags/items/dyes.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "replace": false, - "values": [ - "botania:black_dye", - "botania:blue_dye", - "botania:brown_dye", - "botania:cyan_dye", - "botania:gray_dye", - "botania:green_dye", - "botania:light_blue_dye", - "botania:light_gray_dye", - "botania:lime_dye", - "botania:magenta_dye", - "botania:orange_dye", - "botania:pink_dye", - "botania:purple_dye", - "botania:red_dye", - "botania:white_dye", - "botania:yellow_dye" - ] -} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java index 3ddeeaeab..15415016d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -120,10 +120,8 @@ public final class ColorHandler { ModItems.twigWand); IItemColor petalHandler = (s, t) -> t == 0 ? ((ItemPetal) s.getItem()).color.colorValue : -1; - IItemColor dyeHandler = (s, t) -> t == 0 ? ((Item16Colors) s.getItem()).color.colorValue : -1; for (DyeColor color : DyeColor.values()) { items.register(petalHandler, ModItems.getPetal(color)); - items.register(dyeHandler, ModItems.getDye(color)); } items.register((s, t) -> t == 0 ? Minecraft.getInstance().getBlockColors().getColor(((BlockItem) s.getItem()).getBlock().getDefaultState(), null, null, t) : -1, @@ -190,8 +188,8 @@ public final class ColorHandler { items.register((s, t) -> t == 1 && ItemTerraPick.isEnabled(s) ? MathHelper.hsvToRGB(0.375F, (float) Math.min(1F, Math.sin(Util.milliTime() / 200D) * 0.5 + 1F), 1F) : -1, ModItems.terraPick); - dyeHandler = (s, t) -> t == 0 ? ((ItemLens) s.getItem()).getLensColor(s) : -1; - items.register(dyeHandler, ModItems.lensNormal, ModItems.lensSpeed, ModItems.lensPower, ModItems.lensTime, ModItems.lensEfficiency, ModItems.lensBounce, + IItemColor lensHandler = (s, t) -> t == 0 ? ((ItemLens) s.getItem()).getLensColor(s) : -1; + items.register(lensHandler, ModItems.lensNormal, ModItems.lensSpeed, ModItems.lensPower, ModItems.lensTime, ModItems.lensEfficiency, ModItems.lensBounce, ModItems.lensGravity, ModItems.lensMine, ModItems.lensDamage, ModItems.lensPhantom, ModItems.lensMagnet, ModItems.lensExplosive, ModItems.lensWeight, ModItems.lensPaint, ModItems.lensFire, ModItems.lensPiston, ModItems.lensLight, ModItems.lensWarp, ModItems.lensRedirect, ModItems.lensFirework, ModItems.lensFlare, diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index 2390321a6..331263549 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -119,11 +119,11 @@ public final class RenderHelper { LINE_8_NO_DEPTH = RenderType.makeType(LibResources.PREFIX_MOD + "line_8_no_depth", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 64, glState); glState = RenderType.State.getBuilder() - .texture(mipmapBlockAtlasTexture) - .transparency(TRANSLUCENT_TRANSPARENCY) - .target(itemTarget) - .alpha(new RenderState.AlphaState(0.05F)) - .lightmap(enableLightmap).build(true); + .texture(mipmapBlockAtlasTexture) + .transparency(TRANSLUCENT_TRANSPARENCY) + .target(itemTarget) + .alpha(new RenderState.AlphaState(0.05F)) + .lightmap(enableLightmap).build(true); // todo 1.15: need normals? SPARK = RenderType.makeType(LibResources.PREFIX_MOD + "spark", DefaultVertexFormats.POSITION_COLOR_TEX_LIGHTMAP, GL11.GL_QUADS, 256, glState); RenderType lightRelay = RenderType.makeType(LibResources.PREFIX_MOD + "light_relay", DefaultVertexFormats.POSITION_COLOR_TEX_LIGHTMAP, GL11.GL_QUADS, 64, glState); @@ -145,10 +145,10 @@ public final class RenderHelper { RenderState.TextureState babylonTexture = new RenderState.TextureState(new ResourceLocation(LibResources.MISC_BABYLON), false, true); glState = RenderType.State.getBuilder().texture(babylonTexture) - .transparency(TRANSLUCENT_TRANSPARENCY) - .target(itemTarget) - .cull(disableCull) - .shadeModel(smoothShade).build(true); + .transparency(TRANSLUCENT_TRANSPARENCY) + .target(itemTarget) + .cull(disableCull) + .shadeModel(smoothShade).build(true); RenderType babylonIcon = RenderType.makeType(LibResources.PREFIX_MOD + "babylon", DefaultVertexFormats.POSITION_COLOR_TEX, GL11.GL_QUADS, 64, glState); BABYLON_ICON = useShaders ? new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.HALO, null, babylonIcon) : babylonIcon; @@ -196,12 +196,12 @@ public final class RenderHelper { private static RenderType getPylonGlow(String name, ResourceLocation texture, boolean direct) { RenderType.State.Builder glState = RenderType.State.getBuilder() - .texture(new RenderState.TextureState(texture, false, false)) - .transparency(TRANSLUCENT_TRANSPARENCY) - .diffuseLighting(new RenderState.DiffuseLightingState(true)) - .alpha(new RenderState.AlphaState(0)) - .cull(new RenderState.CullState(false)) - .lightmap(new RenderState.LightmapState(true)); + .texture(new RenderState.TextureState(texture, false, false)) + .transparency(TRANSLUCENT_TRANSPARENCY) + .diffuseLighting(new RenderState.DiffuseLightingState(true)) + .alpha(new RenderState.AlphaState(0)) + .cull(new RenderState.CullState(false)) + .lightmap(new RenderState.LightmapState(true)); if (!direct) { RenderState.TargetState itemTarget = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_241712_U_"); glState = glState.target(itemTarget); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index 2e4c2fe91..1346c400d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -17,12 +17,17 @@ import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.DyeColor; +import net.minecraft.item.DyeItem; import net.minecraft.item.ItemStack; import net.minecraft.loot.LootContext; import net.minecraft.loot.LootParameters; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; +import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.shapes.IBooleanFunction; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; @@ -77,6 +82,22 @@ public class BlockPool extends BlockModWaterloggable implements ITileEntityProvi } } + @Nonnull + @Override + public ActionResultType onBlockActivated(@Nonnull BlockState state, World world, @Nonnull BlockPos pos, PlayerEntity player, @Nonnull Hand hand, @Nonnull BlockRayTraceResult hit) { + TileEntity te = world.getTileEntity(pos); + ItemStack stack = player.getHeldItem(hand); + if (stack.getItem() instanceof DyeItem && te instanceof TilePool) { + DyeColor color = ((DyeItem) stack.getItem()).getDyeColor(); + if (color != ((TilePool) te).getColor()) { + ((TilePool) te).setColor(color); + stack.shrink(1); + return ActionResultType.SUCCESS; + } + } + return super.onBlockActivated(state, world, pos, player, hand, hit); + } + @Nonnull @Override public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 66750795a..6519059eb 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -65,9 +65,6 @@ public final class BotaniaCreativeTab extends ItemGroup { this.addItem(ModItems.getPetal(color)); } addItem(ModItems.pestleAndMortar); - for (DyeColor color : DyeColor.values()) { - this.addItem(ModItems.getDye(color)); - } addItem(ModItems.fertilizer); addItem(ModItems.flowerBag); addItem(ModItems.blackLotus); diff --git a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java index 6dd24c8b5..5e1b492b7 100644 --- a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java @@ -86,20 +86,20 @@ public final class PixieHandler { /* todo unimpl double chance = player.getAttribute(PIXIE_SPAWN_CHANCE).getValue(); ItemStack sword = PlayerHelper.getFirstHeldItem(player, s -> s.getItem() == ModItems.elementiumSword); - + if (Math.random() < chance) { EntityPixie pixie = new EntityPixie(player.world); pixie.setPosition(player.getPosX(), player.getPosY() + 2, player.getPosZ()); - + if (((ItemElementiumHelm) ModItems.elementiumHelm).hasArmorSet(player)) { pixie.setApplyPotionEffect(new EffectInstance(potions[event.getEntityLiving().world.rand.nextInt(potions.length)], 40, 0)); } - + float dmg = 4; if (!sword.isEmpty()) { dmg += 2; } - + pixie.setProps((LivingEntity) event.getSource().getTrueSource(), player, 0, dmg); pixie.onInitialSpawn(player.world, player.world.getDifficultyForLocation(pixie.func_233580_cy_()), SpawnReason.EVENT, null, null); diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 3cec33366..e1f242744 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -14,6 +14,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.DyeColor; +import net.minecraft.item.DyeItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.IPacket; @@ -34,7 +35,6 @@ import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.material.ItemDye; import javax.annotation.Nonnull; @@ -259,7 +259,7 @@ public class EntityCorporeaSpark extends EntitySparkBase implements ICorporeaSpa ItemStack stack = player.getHeldItem(hand); if (!removed && !stack.isEmpty()) { if (player.world.isRemote) { - boolean valid = stack.getItem() == ModItems.twigWand || stack.getItem() instanceof ItemDye || stack.getItem() == ModItems.phantomInk; + boolean valid = stack.getItem() == ModItems.twigWand || stack.getItem() instanceof DyeItem || stack.getItem() == ModItems.phantomInk; if (valid) { player.swingArm(hand); } @@ -276,8 +276,8 @@ public class EntityCorporeaSpark extends EntitySparkBase implements ICorporeaSpa displayRelatives(player, new ArrayList<>(), master); } return ActionResultType.SUCCESS; - } else if (stack.getItem() instanceof ItemDye) { - DyeColor color = ((ItemDye) stack.getItem()).color; + } else if (stack.getItem() instanceof DyeItem) { + DyeColor color = ((DyeItem) stack.getItem()).getDyeColor(); if (color != getNetwork()) { setNetwork(color); diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 0d9876ed8..5ba288a6e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -13,6 +13,7 @@ import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.DyeColor; +import net.minecraft.item.DyeItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.IPacket; @@ -38,7 +39,6 @@ import vazkii.botania.api.mana.spark.SparkHelper; import vazkii.botania.api.mana.spark.SparkUpgradeType; import vazkii.botania.common.item.ItemSparkUpgrade; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.material.ItemDye; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; @@ -241,7 +241,7 @@ public class EntitySpark extends EntitySparkBase implements ISparkEntity { if (isAlive() && !stack.isEmpty()) { if (world.isRemote) { boolean valid = stack.getItem() == ModItems.twigWand || stack.getItem() instanceof ItemSparkUpgrade - || stack.getItem() == ModItems.phantomInk || stack.getItem() instanceof ItemDye; + || stack.getItem() == ModItems.phantomInk || stack.getItem() instanceof DyeItem; if (valid) { player.swingArm(hand); } @@ -273,8 +273,8 @@ public class EntitySpark extends EntitySparkBase implements ISparkEntity { } else if (stack.getItem() == ModItems.phantomInk) { setInvisible(true); return ActionResultType.SUCCESS; - } else if (stack.getItem() instanceof ItemDye) { - DyeColor color = ((ItemDye) stack.getItem()).color; + } else if (stack.getItem() instanceof DyeItem) { + DyeColor color = ((DyeItem) stack.getItem()).getDyeColor(); if (color != getNetwork()) { setNetwork(color); stack.shrink(1); diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java deleted file mode 100644 index 12dcc88fc..000000000 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * This class is distributed as part of the Botania Mod. - * Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - */ -package vazkii.botania.common.item; - -import net.minecraft.item.DyeColor; -import net.minecraft.item.Item; - -public class Item16Colors extends Item { - public final DyeColor color; - - public Item16Colors(DyeColor color, Properties props) { - super(props); - this.color = color; - } -} diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 23e14664a..442c55a73 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -11,10 +11,7 @@ package vazkii.botania.common.item; import net.minecraft.client.gui.ScreenManager; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.item.DyeColor; -import net.minecraft.item.Food; -import net.minecraft.item.Item; -import net.minecraft.item.Rarity; +import net.minecraft.item.*; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; @@ -101,23 +98,6 @@ public final class ModItems { public static final Item redPetal = new ItemPetal(ModBlocks.getBuriedPetal(DyeColor.RED), DyeColor.RED, defaultBuilder()); public static final Item blackPetal = new ItemPetal(ModBlocks.getBuriedPetal(DyeColor.BLACK), DyeColor.BLACK, defaultBuilder()); - public static final Item whiteDye = new ItemDye(DyeColor.WHITE, defaultBuilder()); - public static final Item orangeDye = new ItemDye(DyeColor.ORANGE, defaultBuilder()); - public static final Item magentaDye = new ItemDye(DyeColor.MAGENTA, defaultBuilder()); - public static final Item lightBlueDye = new ItemDye(DyeColor.LIGHT_BLUE, defaultBuilder()); - public static final Item yellowDye = new ItemDye(DyeColor.YELLOW, defaultBuilder()); - public static final Item limeDye = new ItemDye(DyeColor.LIME, defaultBuilder()); - public static final Item pinkDye = new ItemDye(DyeColor.PINK, defaultBuilder()); - public static final Item grayDye = new ItemDye(DyeColor.GRAY, defaultBuilder()); - public static final Item lightGrayDye = new ItemDye(DyeColor.LIGHT_GRAY, defaultBuilder()); - public static final Item cyanDye = new ItemDye(DyeColor.CYAN, defaultBuilder()); - public static final Item purpleDye = new ItemDye(DyeColor.PURPLE, defaultBuilder()); - public static final Item blueDye = new ItemDye(DyeColor.BLUE, defaultBuilder()); - public static final Item brownDye = new ItemDye(DyeColor.BROWN, defaultBuilder()); - public static final Item greenDye = new ItemDye(DyeColor.GREEN, defaultBuilder()); - public static final Item redDye = new ItemDye(DyeColor.RED, defaultBuilder()); - public static final Item blackDye = new ItemDye(DyeColor.BLACK, defaultBuilder()); - public static final Item pestleAndMortar = new ItemSelfReturning(unstackable()); public static final Item twigWand = new ItemTwigWand(unstackable().rarity(Rarity.RARE)); @@ -434,22 +414,6 @@ public final class ModItems { register(r, "green" + LibItemNames.PETAL_SUFFIX, greenPetal); register(r, "red" + LibItemNames.PETAL_SUFFIX, redPetal); register(r, "black" + LibItemNames.PETAL_SUFFIX, blackPetal); - register(r, "white" + LibItemNames.DYE_SUFFIX, whiteDye); - register(r, "orange" + LibItemNames.DYE_SUFFIX, orangeDye); - register(r, "magenta" + LibItemNames.DYE_SUFFIX, magentaDye); - register(r, "light_blue" + LibItemNames.DYE_SUFFIX, lightBlueDye); - register(r, "yellow" + LibItemNames.DYE_SUFFIX, yellowDye); - register(r, "lime" + LibItemNames.DYE_SUFFIX, limeDye); - register(r, "pink" + LibItemNames.DYE_SUFFIX, pinkDye); - register(r, "gray" + LibItemNames.DYE_SUFFIX, grayDye); - register(r, "light_gray" + LibItemNames.DYE_SUFFIX, lightGrayDye); - register(r, "cyan" + LibItemNames.DYE_SUFFIX, cyanDye); - register(r, "purple" + LibItemNames.DYE_SUFFIX, purpleDye); - register(r, "blue" + LibItemNames.DYE_SUFFIX, blueDye); - register(r, "brown" + LibItemNames.DYE_SUFFIX, brownDye); - register(r, "green" + LibItemNames.DYE_SUFFIX, greenDye); - register(r, "red" + LibItemNames.DYE_SUFFIX, redDye); - register(r, "black" + LibItemNames.DYE_SUFFIX, blackDye); register(r, LibItemNames.PESTLE_AND_MORTAR, pestleAndMortar); register(r, LibItemNames.TWIG_WAND, twigWand); register(r, LibItemNames.MANASTEEL_INGOT, manaSteel); @@ -805,41 +769,4 @@ public final class ModItems { } } - public static Item getDye(DyeColor color) { - switch (color) { - default: - case WHITE: - return whiteDye; - case ORANGE: - return orangeDye; - case MAGENTA: - return magentaDye; - case LIGHT_BLUE: - return lightBlueDye; - case YELLOW: - return yellowDye; - case LIME: - return limeDye; - case PINK: - return pinkDye; - case GRAY: - return grayDye; - case LIGHT_GRAY: - return lightGrayDye; - case CYAN: - return cyanDye; - case PURPLE: - return purpleDye; - case BLUE: - return blueDye; - case BROWN: - return brownDye; - case GREEN: - return greenDye; - case RED: - return redDye; - case BLACK: - return blackDye; - } - } } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemDye.java b/src/main/java/vazkii/botania/common/item/material/ItemDye.java deleted file mode 100644 index 29be333fd..000000000 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * This class is distributed as part of the Botania Mod. - * Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - */ -package vazkii.botania.common.item.material; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.passive.SheepEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.DyeColor; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemUseContext; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import vazkii.botania.api.mana.IManaPool; -import vazkii.botania.common.core.helper.ColorHelper; -import vazkii.botania.common.item.Item16Colors; - -import javax.annotation.Nonnull; - -public class ItemDye extends Item16Colors { - - public ItemDye(DyeColor color, Properties props) { - super(color, props); - } - - @Nonnull - @Override - public ActionResultType onItemUse(ItemUseContext ctx) { - ItemStack stack = ctx.getItem(); - World world = ctx.getWorld(); - BlockPos pos = ctx.getPos(); - Block block = world.getBlockState(pos).getBlock(); - - if (shouldRecolor(block)) { - world.setBlockState(pos, recolor(block, color)); - stack.shrink(1); - return ActionResultType.SUCCESS; - } - - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof IManaPool) { - IManaPool pool = (IManaPool) tile; - if (color != pool.getColor()) { - pool.setColor(color); - stack.shrink(1); - return ActionResultType.SUCCESS; - } - } - - return ActionResultType.PASS; - } - - @Override - public ActionResultType itemInteractionForEntity(ItemStack stack, PlayerEntity player, LivingEntity target, Hand hand) { - if (target instanceof SheepEntity) { - SheepEntity entitysheep = (SheepEntity) target; - - if (!entitysheep.getSheared() && entitysheep.getFleeceColor() != color) { - entitysheep.setFleeceColor(color); - stack.shrink(1); - } - - return ActionResultType.SUCCESS; - } - return ActionResultType.PASS; - } - - private boolean shouldRecolor(Block block) { - DyeColor woolColor = ColorHelper.WOOL_MAP.inverse().get(block.delegate); - if (woolColor != null) { - return woolColor != this.color; - } - - DyeColor carpetColor = ColorHelper.CARPET_MAP.inverse().get(block.delegate); - if (carpetColor != null) { - return carpetColor != this.color; - } - - return false; - } - - private BlockState recolor(Block original, DyeColor color) { - if (ColorHelper.CARPET_MAP.containsValue(original.delegate)) { - return ColorHelper.CARPET_MAP.get(color).get().getDefaultState(); - } else { - return ColorHelper.WOOL_MAP.get(color).get().getDefaultState(); - } - } - -} diff --git a/src/main/java/vazkii/botania/common/lib/ModTags.java b/src/main/java/vazkii/botania/common/lib/ModTags.java index 79b3e9bcc..afa9e5533 100644 --- a/src/main/java/vazkii/botania/common/lib/ModTags.java +++ b/src/main/java/vazkii/botania/common/lib/ModTags.java @@ -63,8 +63,6 @@ public class ModTags { public static final ITag.INamedTag DISPOSABLE = tag("disposable"); public static final ITag.INamedTag SEMI_DISPOSABLE = tag("semi_disposable"); - public static final ITag.INamedTag DYES = tag("dyes"); - public static final ITag.INamedTag PETALS = tag("petals"); public static final ITag.INamedTag PETALS_BLACK = tag("petals/black"); public static final ITag.INamedTag PETALS_BLUE = tag("petals/blue"); diff --git a/src/main/java/vazkii/botania/data/ItemTagProvider.java b/src/main/java/vazkii/botania/data/ItemTagProvider.java index 42097fd57..c58058d94 100644 --- a/src/main/java/vazkii/botania/data/ItemTagProvider.java +++ b/src/main/java/vazkii/botania/data/ItemTagProvider.java @@ -54,9 +54,6 @@ public class ItemTagProvider extends ItemTagsProvider { this.func_240522_a_(ItemTags.TALL_FLOWERS).func_240531_a_(ModTags.Items.DOUBLE_MYSTICAL_FLOWERS); this.func_240522_a_(ItemTags.SMALL_FLOWERS).func_240531_a_(ModTags.Items.MYSTICAL_FLOWERS); this.func_240522_a_(ItemTags.FLOWERS).func_240531_a_(ModTags.Items.SPECIAL_FLOWERS); - - TagsProvider.Builder builder = func_240522_a_(ModTags.Items.DYES); - Arrays.stream(DyeColor.values()).map(ModItems::getDye).sorted(Comparator.comparing(Registry.ITEM::getKey)).forEach(builder::func_240532_a_); } @Nonnull diff --git a/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java b/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java index 38605a099..7f9790ed5 100644 --- a/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java @@ -15,10 +15,7 @@ import net.minecraft.block.Blocks; import net.minecraft.data.DataGenerator; import net.minecraft.data.IFinishedRecipe; import net.minecraft.data.RecipeProvider; -import net.minecraft.item.DyeColor; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; +import net.minecraft.item.*; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.Ingredient; import net.minecraft.state.Property; @@ -65,7 +62,7 @@ public class ManaInfusionProvider extends RecipeProvider { Ingredient dust = Ingredient.fromItems(Items.GUNPOWDER, Items.REDSTONE, Items.GLOWSTONE_DUST, Items.SUGAR); consumer.accept(new FinishedRecipe(id("mana_powder_dust"), new ItemStack(ModItems.manaPowder), dust, 500)); - Ingredient dyeIngredient = Ingredient.fromItems(Arrays.stream(DyeColor.values()).map(ModItems::getDye).toArray(Item[]::new)); + Ingredient dyeIngredient = Ingredient.fromItems(Arrays.stream(DyeColor.values()).map(DyeItem::getItem).toArray(Item[]::new)); consumer.accept(new FinishedRecipe(id("mana_powder_dye"), new ItemStack(ModItems.manaPowder), dyeIngredient, 400)); consumer.accept(new FinishedRecipe(id("piston_relay"), new ItemStack(ModBlocks.pistonRelay), ingr(Blocks.PISTON), 15000)); diff --git a/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java b/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java index 8f6755559..356a7228c 100644 --- a/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java @@ -15,13 +15,11 @@ import net.minecraft.advancements.AdvancementRewards; import net.minecraft.advancements.ICriterionInstance; import net.minecraft.advancements.IRequirementsStrategy; import net.minecraft.advancements.criterion.InventoryChangeTrigger; +import net.minecraft.advancements.criterion.ItemPredicate; import net.minecraft.advancements.criterion.RecipeUnlockedTrigger; import net.minecraft.block.Block; import net.minecraft.data.*; -import net.minecraft.item.DyeColor; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; +import net.minecraft.item.*; import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.SpecialRecipeSerializer; import net.minecraft.potion.PotionUtils; @@ -596,12 +594,6 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider { .addIngredient(dyes, 4) .addCriterion("has_item", hasItem(Tags.Items.DYES)) .build(consumer, "botania:fertilizer_dye"); - Ingredient floralDyes = Ingredient.fromItems(Arrays.stream(DyeColor.values()).map(ModItems::getDye).toArray(Item[]::new)); - ShapelessRecipeBuilder.shapelessRecipe(ModItems.fertilizer) - .addIngredient(Items.BONE_MEAL) - .addIngredient(floralDyes, 4) - .addCriterion("has_item", hasItem(ModTags.Items.DYES)) - .build(consumer, "botania:fertilizer_powder"); ShapelessRecipeBuilder.shapelessRecipe(ModItems.drySeeds) .addIngredient(ModItems.grassSeeds) .addIngredient(Items.DEAD_BUSH) @@ -907,7 +899,7 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider { .build(consumer); ShapelessRecipeBuilder.shapelessRecipe(ModBlocks.getMushroom(color)) .addIngredient(Ingredient.fromItems(Items.RED_MUSHROOM, Items.BROWN_MUSHROOM)) - .addIngredient(ModItems.getDye(color)) + .addIngredient(DyeItem.getItem(color)) .setGroup("botania:mushroom") .addCriterion("has_item", hasItem(Items.RED_MUSHROOM)) .addCriterion("has_alt_item", hasItem(Items.BROWN_MUSHROOM)) @@ -924,41 +916,40 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider { .addCriterion("has_item", hasItem(ModBlocks.getFlower(color))) .addCriterion("has_alt_item", hasItem(ModItems.getPetal(color))) .build(consumer, "botania:petal_" + color.func_176610_l()); - ShapelessRecipeBuilder.shapelessRecipe(ModItems.getDye(color)) + ShapelessRecipeBuilder.shapelessRecipe(DyeItem.getItem(color)) .addIngredient(colorOverrides.getOrDefault(color, Ingredient.fromTag(ModTags.Items.getFlowerTag(color)))) .addIngredient(ModItems.pestleAndMortar) .setGroup("botania:dye") - .addCriterion("has_item", hasItem(ModItems.getDye(color))) - .addCriterion("has_alt_item", hasItem(ModItems.getPetal(color))) + .addCriterion("has_item", hasItem(ModItems.getPetal(color))) .build(consumer, "botania:dye_" + color.func_176610_l()); } - ShapelessRecipeBuilder.shapelessRecipe(ModItems.magentaDye, 2) + ShapelessRecipeBuilder.shapelessRecipe(Items.MAGENTA_DYE, 2) .addIngredient(Items.LILAC) .addIngredient(ModItems.pestleAndMortar) .setGroup("botania:dye_double") - .addCriterion("has_item", hasItem(ModItems.yellowDye)) + .addCriterion("has_item", hasItem(Items.YELLOW_DYE)) .addCriterion("has_alt_item", hasItem(Items.LILAC)) .build(consumer, "botania:dye_magenta_double"); - ShapelessRecipeBuilder.shapelessRecipe(ModItems.pinkDye, 2) + ShapelessRecipeBuilder.shapelessRecipe(Items.PINK_DYE, 2) .addIngredient(Items.PEONY) .addIngredient(ModItems.pestleAndMortar) .setGroup("botania:dye_double") - .addCriterion("has_item", hasItem(ModItems.pinkDye)) + .addCriterion("has_item", hasItem(Items.PINK_DYE)) .addCriterion("has_alt_item", hasItem(Items.PEONY)) .build(consumer, "botania:dye_pink_double"); - ShapelessRecipeBuilder.shapelessRecipe(ModItems.redDye, 2) + ShapelessRecipeBuilder.shapelessRecipe(Items.RED_DYE, 2) .addIngredient(Items.ROSE_BUSH) .addIngredient(ModItems.pestleAndMortar) .setGroup("botania:dye_double") - .addCriterion("has_item", hasItem(ModItems.redDye)) + .addCriterion("has_item", hasItem(Items.RED_DYE)) .addCriterion("has_alt_item", hasItem(Items.ROSE_BUSH)) .build(consumer, "botania:dye_red_double"); - ShapelessRecipeBuilder.shapelessRecipe(ModItems.yellowDye, 2) + ShapelessRecipeBuilder.shapelessRecipe(Items.YELLOW_DYE, 2) .addIngredient(Items.SUNFLOWER) .addIngredient(ModItems.pestleAndMortar) .setGroup("botania:dye_double") - .addCriterion("has_item", hasItem(ModItems.yellowDye)) + .addCriterion("has_item", hasItem(Items.YELLOW_DYE)) .addCriterion("has_alt_item", hasItem(Items.SUNFLOWER)) .build(consumer, "botania:dye_yellow_double"); } @@ -2299,22 +2290,22 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider { cosmeticBauble(consumer, ModItems.devilTail, ModItems.greenPetal); cosmeticBauble(consumer, ModItems.kamuiEye, ModItems.redPetal); cosmeticBauble(consumer, ModItems.googlyEyes, ModItems.blackPetal); - cosmeticBauble(consumer, ModItems.fourLeafClover, ModItems.whiteDye); - cosmeticBauble(consumer, ModItems.clockEye, ModItems.orangeDye); - cosmeticBauble(consumer, ModItems.unicornHorn, ModItems.magentaDye); - cosmeticBauble(consumer, ModItems.devilHorns, ModItems.lightBlueDye); - cosmeticBauble(consumer, ModItems.hyperPlus, ModItems.yellowDye); - cosmeticBauble(consumer, ModItems.botanistEmblem, ModItems.limeDye); - cosmeticBauble(consumer, ModItems.ancientMask, ModItems.pinkDye); - cosmeticBauble(consumer, ModItems.eerieMask, ModItems.grayDye); - cosmeticBauble(consumer, ModItems.alienAntenna, ModItems.lightGrayDye); - cosmeticBauble(consumer, ModItems.anaglyphGlasses, ModItems.cyanDye); - cosmeticBauble(consumer, ModItems.orangeShades, ModItems.purpleDye); - cosmeticBauble(consumer, ModItems.grouchoGlasses, ModItems.blueDye); - cosmeticBauble(consumer, ModItems.thickEyebrows, ModItems.brownDye); - cosmeticBauble(consumer, ModItems.lusitanicShield, ModItems.greenDye); - cosmeticBauble(consumer, ModItems.tinyPotatoMask, ModItems.redDye); - cosmeticBauble(consumer, ModItems.questgiverMark, ModItems.blackDye); + cosmeticBauble(consumer, ModItems.fourLeafClover, Items.WHITE_DYE); + cosmeticBauble(consumer, ModItems.clockEye, Items.ORANGE_DYE); + cosmeticBauble(consumer, ModItems.unicornHorn, Items.MAGENTA_DYE); + cosmeticBauble(consumer, ModItems.devilHorns, Items.LIGHT_BLUE_DYE); + cosmeticBauble(consumer, ModItems.hyperPlus, Items.YELLOW_DYE); + cosmeticBauble(consumer, ModItems.botanistEmblem, Items.LIME_DYE); + cosmeticBauble(consumer, ModItems.ancientMask, Items.PINK_DYE); + cosmeticBauble(consumer, ModItems.eerieMask, Items.GRAY_DYE); + cosmeticBauble(consumer, ModItems.alienAntenna, Items.LIGHT_GRAY_DYE); + cosmeticBauble(consumer, ModItems.anaglyphGlasses, Items.CYAN_DYE); + cosmeticBauble(consumer, ModItems.orangeShades, Items.PURPLE_DYE); + cosmeticBauble(consumer, ModItems.grouchoGlasses, Items.BLUE_DYE); + cosmeticBauble(consumer, ModItems.thickEyebrows, Items.BROWN_DYE); + cosmeticBauble(consumer, ModItems.lusitanicShield, Items.GREEN_DYE); + cosmeticBauble(consumer, ModItems.tinyPotatoMask, Items.RED_DYE); + cosmeticBauble(consumer, ModItems.questgiverMark, Items.BLACK_DYE); cosmeticBauble(consumer, ModItems.thinkingHand, ModBlocks.tinyPotato); } diff --git a/src/main/resources/assets/botania/lang/de_de.json b/src/main/resources/assets/botania/lang/de_de.json index ea1beb3d7..f2531ef77 100644 --- a/src/main/resources/assets/botania/lang/de_de.json +++ b/src/main/resources/assets/botania/lang/de_de.json @@ -620,22 +620,6 @@ "item.botania.green_petal": "Mystisches Grünes Blütenblatt", "item.botania.red_petal": "Mystisches Red Blütenblatt", "item.botania.black_petal": "Mystisches Black Blütenblatt", - "item.botania.white_dye": "Weißes Blumenpulver", - "item.botania.orange_dye": "Oranges Blumenpulver", - "item.botania.magenta_dye": "Magentafarbenes Blumenpulver", - "item.botania.light_blue_dye": "Hellblaues Blumenpulver", - "item.botania.yellow_dye": "Gelbes Blumenpulver", - "item.botania.lime_dye": "Hellgrünes Blumenpulver", - "item.botania.pink_dye": "Pinkes Blumenpulver", - "item.botania.gray_dye": "Graues Blumenpulver", - "item.botania.light_gray_dye": "Hellgraues Blumenpulver", - "item.botania.cyan_dye": "Türkises Blumenpulver", - "item.botania.purple_dye": "Violettes Blumenpulver", - "item.botania.blue_dye": "Blaues Blumenpulver", - "item.botania.brown_dye": "Braunes Blumenpulver", - "item.botania.green_dye": "Grünes Blumenpulver", - "item.botania.red_dye": "Rotes Blumenpulver", - "item.botania.black_dye": "Schwarzes Blumenpulver", "item.botania.pestle_and_mortar": "Stößel und Mörser", "item.botania.twig_wand": "Stab des Waldes", "item.botania.manasteel_ingot": "Manastahlbarren", diff --git a/src/main/resources/assets/botania/lang/en_us.json b/src/main/resources/assets/botania/lang/en_us.json index a04f3a38a..96152f2d2 100644 --- a/src/main/resources/assets/botania/lang/en_us.json +++ b/src/main/resources/assets/botania/lang/en_us.json @@ -1046,22 +1046,6 @@ "item.botania.green_petal": "Mystical Green Petal", "item.botania.red_petal": "Mystical Red Petal", "item.botania.black_petal": "Mystical Black Petal", - "item.botania.white_dye": "Floral White Powder", - "item.botania.orange_dye": "Floral Orange Powder", - "item.botania.magenta_dye": "Floral Magenta Powder", - "item.botania.light_blue_dye": "Floral Light Blue Powder", - "item.botania.yellow_dye": "Floral Yellow Powder", - "item.botania.lime_dye": "Floral Lime Powder", - "item.botania.pink_dye": "Floral Pink Powder", - "item.botania.gray_dye": "Floral Gray Powder", - "item.botania.light_gray_dye": "Floral Light Gray Powder", - "item.botania.cyan_dye": "Floral Cyan Powder", - "item.botania.purple_dye": "Floral Purple Powder", - "item.botania.blue_dye": "Floral Blue Powder", - "item.botania.brown_dye": "Floral Brown Powder", - "item.botania.green_dye": "Floral Green Powder", - "item.botania.red_dye": "Floral Red Powder", - "item.botania.black_dye": "Floral Black Powder", "item.botania.pestle_and_mortar": "Pestle and Mortar", "item.botania.twig_wand": "Wand of the Forest", "item.botania.manasteel_ingot": "Manasteel Ingot", @@ -1708,14 +1692,13 @@ "botania.tagline.flowers": "The roots of your studies", "botania.page.flowers0": "Around the world, you may stumble upon a large variety of $(item)Mystical Flowers$(0). Spotting these flowers doesn't take much work, as they glow faintly and sparkle.$(p)They come in a total of $(thing)16$(0) different colors.$(p)These flowers can also be grown with $(item)Floral Fertilizer$(0) (read on).", "botania.page.flowers1": "Flowers as far as the eye can see...", - "botania.page.flowers2": "These flowers can be plucked for $(item)Mystical Petals$(0), which are used in the creation of magical instruments and plants.$(p)Right-clicking a petal upon the ground will $(thing)bury it$(0), making it emit particles.$(p)These petals can also be crushed into $(item)Floral Powders$(0), which function much like any mundane piece of dye.", + "botania.page.flowers2": "These flowers can be plucked for $(item)Mystical Petals$(0), which are used in the creation of magical instruments and plants.$(p)Right-clicking a petal upon the ground will $(thing)bury it$(0), making it emit particles.$(p)These petals can also be crushed into the corresponding $(item)Dyes$(0).", "botania.page.flowers3": "Plucking petals off flowers.", "botania.page.flowers4": "Crafting the $(item)Pestle and Mortar$(0).", - "botania.page.flowers5": "Grinding Petals into Powder.", - "botania.page.flowers5.5": "Grinding mundane flowers into Powder.", - "botania.page.flowers6": "Right-clicking the $(item)Floral Powder$(0) on a colorable block will change its color to the color of the powder.$(p)By mixing the $(item)Floral Powder$(0) with some $(item)Bone Meal$(0), you'll create a different type of fertilizer. This $(item)Floral Fertilizer$(0) will grow a few $(item)Mystical Flowers$(0) in the nearby vicinity, if you ever run low on those.", - "botania.page.flowers7": "Making fertilizer (any powder colors work)", - "botania.page.flowers8": "Using any combination of typical flower substances also works", + "botania.page.flowers5": "Grinding Petals into Dye.", + "botania.page.flowers5.5": "Grinding mundane flowers into Dye.", + "botania.page.flowers6": "By mixing $(item)Dye$(0) with some $(item)Bone Meal$(0), you'll create a different type of fertilizer. This $(item)Floral Fertilizer$(0) will grow a few $(item)Mystical Flowers$(0) in the nearby vicinity, if you ever run low on those.", + "botania.page.flowers8": "Using any combination of typical flower substances will work", "botania.page.flowers10": "There're also some taller variants of the typical $(item)Mystical Flowers$(0) around the world. These can only be gathered with $(item)Shears$(0), but can be plucked for twice the petals a normal flower would yield. They're a bit too big for dye, though.", "botania.page.flowers12": "Tall flower variants can be made manually by fertilizing a $(item)Mystical Flower$(0) or a $(item)Buried Petal$(0) with $(item)Bone Meal$(0).$(p)If you find yourself running low on a particular color, try burying a petal of that color and using $(item)Bone Meal$(0) on it.", "botania.page.flowers11": "Prepare for trouble", diff --git a/src/main/resources/assets/botania/lang/es_es.json b/src/main/resources/assets/botania/lang/es_es.json index 29cab4308..d413a87bf 100644 --- a/src/main/resources/assets/botania/lang/es_es.json +++ b/src/main/resources/assets/botania/lang/es_es.json @@ -885,22 +885,6 @@ "item.botania.green_petal": "Pétalo místico verde", "item.botania.red_petal": "Pétalo místico rojo", "item.botania.black_petal": "Pétalo místico negro", - "item.botania.white_dye": "Polvo floral blanco", - "item.botania.orange_dye": "Polvo floral naranja", - "item.botania.magenta_dye": "Polvo floral magenta", - "item.botania.light_blue_dye": "Polvo floral azul claro", - "item.botania.yellow_dye": "Polvo floral amarillo", - "item.botania.lime_dye": "Polvo floral lima", - "item.botania.pink_dye": "Polvo floral rosa", - "item.botania.gray_dye": "Polvo floral gris", - "item.botania.light_gray_dye": "Polvo floral gris claro", - "item.botania.cyan_dye": "Polvo floral cian", - "item.botania.purple_dye": "Polvo floral púrpura", - "item.botania.blue_dye": "Polvo floral azul", - "item.botania.brown_dye": "Polvo floral marrón", - "item.botania.green_dye": "Polvo floral verde", - "item.botania.red_dye": "Polvo floral rojo", - "item.botania.black_dye": "Polvo floral negro", "item.botania.pestle_and_mortar": "Mortero", "item.botania.twig_wand": "Varita del bosque", "item.botania.manasteel_ingot": "Lingote de manacero", diff --git a/src/main/resources/assets/botania/lang/fr_fr.json b/src/main/resources/assets/botania/lang/fr_fr.json index fe9953295..0b6bcc073 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.json +++ b/src/main/resources/assets/botania/lang/fr_fr.json @@ -752,22 +752,6 @@ "item.botania.green_petal": "Pétale de fleur mystique verte", "item.botania.red_petal": "Pétale de fleur mystique rouge", "item.botania.black_petal": "Pétale de fleur mystique noire", - "item.botania.white_dye": "Poudre florale bhanche", - "item.botania.orange_dye": "Poudre florale orange", - "item.botania.magenta_dye": "Poudre florale magenta", - "item.botania.light_blue_dye": "Poudre florale bleue", - "item.botania.yellow_dye": "Poudre florale jaune", - "item.botania.lime_dye": "Poudre florale citron", - "item.botania.pink_dye": "Poudre florale rose", - "item.botania.gray_dye": "Poudre florale grise", - "item.botania.light_gray_dye": "Poudre florale grise claire", - "item.botania.cyan_dye": "Poudre florale cyan", - "item.botania.purple_dye": "Poudre florale violette", - "item.botania.blue_dye": "Poudre florale bleue", - "item.botania.brown_dye": "Poudre florale marron", - "item.botania.green_dye": "Poudre florale verte", - "item.botania.red_dye": "Poudre florale rouge", - "item.botania.black_dye": "Poudre florale noire", "item.botania.pestle_and_mortar": "Pilon et mortier", "item.botania.twig_wand": "Baguette de la forêt", "item.botania.manasteel_ingot": "Lingot de manacier", diff --git a/src/main/resources/assets/botania/lang/ja_jp.json b/src/main/resources/assets/botania/lang/ja_jp.json index b9e59d92f..c810a59b0 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.json +++ b/src/main/resources/assets/botania/lang/ja_jp.json @@ -827,22 +827,6 @@ "item.botania.green_petal": "緑色の神秘的な花びら", "item.botania.red_petal": "赤色の神秘的な花びら", "item.botania.black_petal": "黒色の神秘的な花びら", - "item.botania.white_dye": "白色の花の粉末", - "item.botania.orange_dye": "橙色の花の粉末", - "item.botania.magenta_dye": "赤紫色の花の粉末", - "item.botania.light_blue_dye": "空色の花の粉末", - "item.botania.yellow_dye": "黄色の花の粉末", - "item.botania.lime_dye": "黄緑色の花の粉末", - "item.botania.pink_dye": "桃色の花の粉末", - "item.botania.gray_dye": "灰色の花の粉末", - "item.botania.light_gray_dye": "薄灰色の花の粉末", - "item.botania.cyan_dye": "水色の花の粉末", - "item.botania.purple_dye": "紫色の花の粉末", - "item.botania.blue_dye": "青色の花の粉末", - "item.botania.brown_dye": "茶色の花の粉末", - "item.botania.green_dye": "緑色の花の粉末", - "item.botania.red_dye": "赤色の花の粉末", - "item.botania.black_dye": "黒色の花の粉末", "item.botania.pestle_and_mortar": "乳棒とすり鉢", "item.botania.twig_wand": "森の杖", "item.botania.manasteel_ingot": "マナスチールインゴット", diff --git a/src/main/resources/assets/botania/lang/ko_kr.json b/src/main/resources/assets/botania/lang/ko_kr.json index 70ac7b04c..f8cf720ab 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.json +++ b/src/main/resources/assets/botania/lang/ko_kr.json @@ -844,22 +844,6 @@ "item.botania.green_petal": "신비로운 초록색 꽃잎", "item.botania.red_petal": "신비로운 빨강색 꽃잎", "item.botania.black_petal": "신비로운 검은색 꽃잎", - "item.botania.white_dye": "하얀색 꽃가루", - "item.botania.orange_dye": "주황색 꽃가루", - "item.botania.magenta_dye": "자홍색 꽃가루", - "item.botania.light_blue_dye": "하늘색 꽃가루", - "item.botania.yellow_dye": "노랑색 꽃가루", - "item.botania.lime_dye": "연두색 꽃가루", - "item.botania.pink_dye": "분홍색 꽃가루", - "item.botania.gray_dye": "회색 꽃가루", - "item.botania.light_gray_dye": "밝은 회색 꽃가루", - "item.botania.cyan_dye": "청록색 꽃가루", - "item.botania.purple_dye": "보라색 꽃가루", - "item.botania.blue_dye": "파랑색 꽃가루", - "item.botania.brown_dye": "갈색 꽃가루", - "item.botania.green_dye": "초록색 꽃가루", - "item.botania.red_dye": "빨강색 꽃가루", - "item.botania.black_dye": "검은색 꽃가루", "item.botania.pestle_and_mortar": "막자사발", "item.botania.twig_wand": "숲의 지팡이", "item.botania.manasteel_ingot": "마나합금 주괴", diff --git a/src/main/resources/assets/botania/lang/nl_nl.json b/src/main/resources/assets/botania/lang/nl_nl.json index 352f2af5d..dfbdd7408 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.json +++ b/src/main/resources/assets/botania/lang/nl_nl.json @@ -928,22 +928,6 @@ "item.botania.green_petal": "Mystiek Groen Bloemblad", "item.botania.red_petal": "Mystiek Rood Bloemblad", "item.botania.black_petal": "Mystiek Zwart Bloemblad", - "item.botania.white_dye": "Wit Bloempoeder", - "item.botania.orange_dye": "Oranje Bloempoeder", - "item.botania.magenta_dye": "Magenta Bloempoeder", - "item.botania.light_blue_dye": "Lichtblauw Bloempoeder", - "item.botania.yellow_dye": "Geel Bloempoeder", - "item.botania.lime_dye": "Lichtgroen Bloempoeder", - "item.botania.pink_dye": "Roze Bloempoeder", - "item.botania.gray_dye": "Grijs Bloempoeder", - "item.botania.light_gray_dye": "Lichtgrijs Bloempoeder", - "item.botania.cyan_dye": "Blauwgroen Bloempoeder", - "item.botania.purple_dye": "Paars Bloempoeder", - "item.botania.blue_dye": "Blauw Bloempoeder", - "item.botania.brown_dye": "Bruin Bloempoeder", - "item.botania.green_dye": "Groen Bloempoeder", - "item.botania.red_dye": "Rood Bloempoeder", - "item.botania.black_dye": "Zwart Bloempoeder", "item.botania.pestle_and_mortar": "Vijzel en Stamper", "item.botania.twig_wand": "Staf van het Woud", "item.botania.manasteel_ingot": "Staaf Manastaal", diff --git a/src/main/resources/assets/botania/lang/pt_br.json b/src/main/resources/assets/botania/lang/pt_br.json index ddc5d183d..3a985cc53 100644 --- a/src/main/resources/assets/botania/lang/pt_br.json +++ b/src/main/resources/assets/botania/lang/pt_br.json @@ -979,22 +979,6 @@ "item.botania.green_petal": "Pétala Mística Verde", "item.botania.red_petal": "Pétala Mística Vermelha", "item.botania.black_petal": "Pétala Mística Preta", - "item.botania.white_dye": "Pó Floral Branco", - "item.botania.orange_dye": "Pó Floral Laranja", - "item.botania.magenta_dye": "Pó Floral Magenta", - "item.botania.light_blue_dye": "Pó Floral Azul Claro", - "item.botania.yellow_dye": "Pó Floral Amarelo", - "item.botania.lime_dye": "Pó Floral Lima", - "item.botania.pink_dye": "Pó Floral Rosa", - "item.botania.gray_dye": "Pó Floral Cinza", - "item.botania.light_gray_dye": "Pó Floral Cinza Claro", - "item.botania.cyan_dye": "Pó Floral Ciano", - "item.botania.purple_dye": "Pó Floral Roxo", - "item.botania.blue_dye": "Pó Floral Azul", - "item.botania.brown_dye": "Pó Floral Marrom", - "item.botania.green_dye": "Pó Floral Verde", - "item.botania.red_dye": "Pó Floral Vermelho", - "item.botania.black_dye": "Pó Floral Preto", "item.botania.pestle_and_mortar": "Pilão", "item.botania.twig_wand": "Varinha da Floresta", "item.botania.manasteel_ingot": "Barra de Manasteel", diff --git a/src/main/resources/assets/botania/lang/zh_cn.json b/src/main/resources/assets/botania/lang/zh_cn.json index 11d9921b1..b68b8db0c 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.json +++ b/src/main/resources/assets/botania/lang/zh_cn.json @@ -1078,22 +1078,6 @@ "item.botania.green_petal": "绿色神秘花瓣", "item.botania.red_petal": "红色神秘花瓣", "item.botania.black_petal": "黑色神秘花瓣", - "item.botania.white_dye": "白色花粉", - "item.botania.orange_dye": "橙色花粉", - "item.botania.magenta_dye": "品红色花粉", - "item.botania.light_blue_dye": "淡蓝色花粉", - "item.botania.yellow_dye": "黄色花粉", - "item.botania.lime_dye": "黄绿色花粉", - "item.botania.pink_dye": "粉色花粉", - "item.botania.gray_dye": "灰色花粉", - "item.botania.light_gray_dye": "淡灰色花粉", - "item.botania.cyan_dye": "青色花粉", - "item.botania.purple_dye": "紫色花粉", - "item.botania.blue_dye": "蓝色花粉", - "item.botania.brown_dye": "棕色花粉", - "item.botania.green_dye": "绿色花粉", - "item.botania.red_dye": "红色花粉", - "item.botania.black_dye": "黑色花粉", "item.botania.pestle_and_mortar": "杵和臼", "item.botania.twig_wand": "森林法杖", "item.botania.manasteel_ingot": "魔力钢锭", diff --git a/src/main/resources/assets/botania/lang/zh_tw.json b/src/main/resources/assets/botania/lang/zh_tw.json index 3c0cdf4b0..130dd2708 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.json +++ b/src/main/resources/assets/botania/lang/zh_tw.json @@ -1019,22 +1019,6 @@ "item.botania.green_petal": "綠色神秘花瓣", "item.botania.red_petal": "紅色神秘花瓣", "item.botania.black_petal": "黑色神秘花瓣", - "item.botania.white_dye": "白色花粉", - "item.botania.orange_dye": "橘色花粉", - "item.botania.magenta_dye": "洋紅色花粉", - "item.botania.light_blue_dye": "淺藍色花粉", - "item.botania.yellow_dye": "黃色花粉", - "item.botania.lime_dye": "淺綠色花粉", - "item.botania.pink_dye": "粉色花粉", - "item.botania.gray_dye": "灰色花粉", - "item.botania.light_gray_dye": "淺灰色花粉", - "item.botania.cyan_dye": "青色花粉", - "item.botania.purple_dye": "紫色花粉", - "item.botania.blue_dye": "藍色花粉", - "item.botania.brown_dye": "棕色花粉", - "item.botania.green_dye": "綠色花粉", - "item.botania.red_dye": "紅色花粉", - "item.botania.black_dye": "黑色花粉", "item.botania.pestle_and_mortar": "杵和臼", "item.botania.twig_wand": "森林法杖", "item.botania.manasteel_ingot": "瑪那鋼錠", diff --git a/src/main/resources/assets/botania/models/item/black_dye.json b/src/main/resources/assets/botania/models/item/black_dye.json deleted file mode 100644 index 2f2df87c0..000000000 --- a/src/main/resources/assets/botania/models/item/black_dye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/dye" - } -} diff --git a/src/main/resources/assets/botania/models/item/blue_dye.json b/src/main/resources/assets/botania/models/item/blue_dye.json deleted file mode 100644 index 2f2df87c0..000000000 --- a/src/main/resources/assets/botania/models/item/blue_dye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/dye" - } -} diff --git a/src/main/resources/assets/botania/models/item/brown_dye.json b/src/main/resources/assets/botania/models/item/brown_dye.json deleted file mode 100644 index 2f2df87c0..000000000 --- a/src/main/resources/assets/botania/models/item/brown_dye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/dye" - } -} diff --git a/src/main/resources/assets/botania/models/item/cyan_dye.json b/src/main/resources/assets/botania/models/item/cyan_dye.json deleted file mode 100644 index 2f2df87c0..000000000 --- a/src/main/resources/assets/botania/models/item/cyan_dye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/dye" - } -} diff --git a/src/main/resources/assets/botania/models/item/gray_dye.json b/src/main/resources/assets/botania/models/item/gray_dye.json deleted file mode 100644 index 2f2df87c0..000000000 --- a/src/main/resources/assets/botania/models/item/gray_dye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/dye" - } -} diff --git a/src/main/resources/assets/botania/models/item/green_dye.json b/src/main/resources/assets/botania/models/item/green_dye.json deleted file mode 100644 index 2f2df87c0..000000000 --- a/src/main/resources/assets/botania/models/item/green_dye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/dye" - } -} diff --git a/src/main/resources/assets/botania/models/item/light_blue_dye.json b/src/main/resources/assets/botania/models/item/light_blue_dye.json deleted file mode 100644 index 2f2df87c0..000000000 --- a/src/main/resources/assets/botania/models/item/light_blue_dye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/dye" - } -} diff --git a/src/main/resources/assets/botania/models/item/light_gray_dye.json b/src/main/resources/assets/botania/models/item/light_gray_dye.json deleted file mode 100644 index 2f2df87c0..000000000 --- a/src/main/resources/assets/botania/models/item/light_gray_dye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/dye" - } -} diff --git a/src/main/resources/assets/botania/models/item/lime_dye.json b/src/main/resources/assets/botania/models/item/lime_dye.json deleted file mode 100644 index 2f2df87c0..000000000 --- a/src/main/resources/assets/botania/models/item/lime_dye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/dye" - } -} diff --git a/src/main/resources/assets/botania/models/item/magenta_dye.json b/src/main/resources/assets/botania/models/item/magenta_dye.json deleted file mode 100644 index 2f2df87c0..000000000 --- a/src/main/resources/assets/botania/models/item/magenta_dye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/dye" - } -} diff --git a/src/main/resources/assets/botania/models/item/orange_dye.json b/src/main/resources/assets/botania/models/item/orange_dye.json deleted file mode 100644 index 2f2df87c0..000000000 --- a/src/main/resources/assets/botania/models/item/orange_dye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/dye" - } -} diff --git a/src/main/resources/assets/botania/models/item/pink_dye.json b/src/main/resources/assets/botania/models/item/pink_dye.json deleted file mode 100644 index 2f2df87c0..000000000 --- a/src/main/resources/assets/botania/models/item/pink_dye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/dye" - } -} diff --git a/src/main/resources/assets/botania/models/item/purple_dye.json b/src/main/resources/assets/botania/models/item/purple_dye.json deleted file mode 100644 index 2f2df87c0..000000000 --- a/src/main/resources/assets/botania/models/item/purple_dye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/dye" - } -} diff --git a/src/main/resources/assets/botania/models/item/red_dye.json b/src/main/resources/assets/botania/models/item/red_dye.json deleted file mode 100644 index 2f2df87c0..000000000 --- a/src/main/resources/assets/botania/models/item/red_dye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/dye" - } -} diff --git a/src/main/resources/assets/botania/models/item/white_dye.json b/src/main/resources/assets/botania/models/item/white_dye.json deleted file mode 100644 index 2f2df87c0..000000000 --- a/src/main/resources/assets/botania/models/item/white_dye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/dye" - } -} diff --git a/src/main/resources/assets/botania/models/item/yellow_dye.json b/src/main/resources/assets/botania/models/item/yellow_dye.json deleted file mode 100644 index 2f2df87c0..000000000 --- a/src/main/resources/assets/botania/models/item/yellow_dye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/dye" - } -} diff --git a/src/main/resources/assets/botania/textures/item/dye.png b/src/main/resources/assets/botania/textures/item/dye.png deleted file mode 100644 index b70632bff..000000000 Binary files a/src/main/resources/assets/botania/textures/item/dye.png and /dev/null differ diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/flowers.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/flowers.json index 587b55aad..292e48733 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/flowers.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/flowers.json @@ -74,11 +74,6 @@ "type": "text", "text": "botania.page.flowers6" }, - { - "type": "crafting", - "text": "botania.page.flowers7", - "recipe": "botania:fertilizer_powder" - }, { "type": "crafting", "text": "botania.page.flowers8", diff --git a/src/main/resources/data/forge/tags/items/dyes/black.json b/src/main/resources/data/forge/tags/items/dyes/black.json deleted file mode 100644 index d7785062f..000000000 --- a/src/main/resources/data/forge/tags/items/dyes/black.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "botania:black_dye" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/blue.json b/src/main/resources/data/forge/tags/items/dyes/blue.json deleted file mode 100644 index 79553c111..000000000 --- a/src/main/resources/data/forge/tags/items/dyes/blue.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "botania:blue_dye" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/brown.json b/src/main/resources/data/forge/tags/items/dyes/brown.json deleted file mode 100644 index 98e35d0e6..000000000 --- a/src/main/resources/data/forge/tags/items/dyes/brown.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "botania:brown_dye" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/cyan.json b/src/main/resources/data/forge/tags/items/dyes/cyan.json deleted file mode 100644 index 8b40cd2a1..000000000 --- a/src/main/resources/data/forge/tags/items/dyes/cyan.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "botania:cyan_dye" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/gray.json b/src/main/resources/data/forge/tags/items/dyes/gray.json deleted file mode 100644 index 7f17d5e57..000000000 --- a/src/main/resources/data/forge/tags/items/dyes/gray.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "botania:gray_dye" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/green.json b/src/main/resources/data/forge/tags/items/dyes/green.json deleted file mode 100644 index 9007a4a79..000000000 --- a/src/main/resources/data/forge/tags/items/dyes/green.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "botania:green_dye" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/light_blue.json b/src/main/resources/data/forge/tags/items/dyes/light_blue.json deleted file mode 100644 index 934aa4c0a..000000000 --- a/src/main/resources/data/forge/tags/items/dyes/light_blue.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "botania:light_blue_dye" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/light_gray.json b/src/main/resources/data/forge/tags/items/dyes/light_gray.json deleted file mode 100644 index c47b5f7cb..000000000 --- a/src/main/resources/data/forge/tags/items/dyes/light_gray.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "botania:light_gray_dye" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/lime.json b/src/main/resources/data/forge/tags/items/dyes/lime.json deleted file mode 100644 index b2d06cf11..000000000 --- a/src/main/resources/data/forge/tags/items/dyes/lime.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "botania:lime_dye" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/magenta.json b/src/main/resources/data/forge/tags/items/dyes/magenta.json deleted file mode 100644 index cd330e7f9..000000000 --- a/src/main/resources/data/forge/tags/items/dyes/magenta.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "botania:magenta_dye" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/orange.json b/src/main/resources/data/forge/tags/items/dyes/orange.json deleted file mode 100644 index 00c7b4de1..000000000 --- a/src/main/resources/data/forge/tags/items/dyes/orange.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "botania:orange_dye" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/pink.json b/src/main/resources/data/forge/tags/items/dyes/pink.json deleted file mode 100644 index be80dd42e..000000000 --- a/src/main/resources/data/forge/tags/items/dyes/pink.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "botania:pink_dye" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/purple.json b/src/main/resources/data/forge/tags/items/dyes/purple.json deleted file mode 100644 index e64ce262f..000000000 --- a/src/main/resources/data/forge/tags/items/dyes/purple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "botania:purple_dye" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/red.json b/src/main/resources/data/forge/tags/items/dyes/red.json deleted file mode 100644 index eda5fefbd..000000000 --- a/src/main/resources/data/forge/tags/items/dyes/red.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "botania:red_dye" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/white.json b/src/main/resources/data/forge/tags/items/dyes/white.json deleted file mode 100644 index 61eba521c..000000000 --- a/src/main/resources/data/forge/tags/items/dyes/white.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "botania:white_dye" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/yellow.json b/src/main/resources/data/forge/tags/items/dyes/yellow.json deleted file mode 100644 index ad0cb4151..000000000 --- a/src/main/resources/data/forge/tags/items/dyes/yellow.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "botania:yellow_dye" - ] -} \ No newline at end of file