Remove floral powders in favor of the generic vanilla dyes

This commit is contained in:
Vincent Lee committed 2020-07-05 18:04:50 -05:00
1 parent 57f910f067
commit b631775c32
134 files changed
+162 -1156

No files matched your search

@@ -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"
]
]
}
@@ -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"
}
}
},
@@ -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"
]
]
@@ -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"
]
]
@@ -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"
]
]
@@ -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"
]
]
@@ -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"
]
]
@@ -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"
]
]
@@ -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"
]
]
@@ -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"
]
]
@@ -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"
]
]
@@ -11,7 +11,7 @@
"conditions": {
"items": [
{
"item": "botania:yellow_dye"
"item": "minecraft:yellow_dye"
}
]
}
@@ -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"
]
]
@@ -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"
]
]
@@ -11,7 +11,7 @@
"conditions": {
"items": [
{
"item": "botania:pink_dye"
"item": "minecraft:pink_dye"
}
]
}
@@ -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"
]
]
@@ -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"
]
]
@@ -11,7 +11,7 @@
"conditions": {
"items": [
{
"item": "botania:red_dye"
"item": "minecraft:red_dye"
}
]
}
@@ -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"
]
]
@@ -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"
]
]
@@ -11,7 +11,7 @@
"conditions": {
"items": [
{
"item": "botania:yellow_dye"
"item": "minecraft:yellow_dye"
}
]
}
@@ -8,7 +8,7 @@
],
"key": {
"P": {
"item": "botania:light_gray_dye"
"item": "minecraft:light_gray_dye"
},
"S": {
"item": "botania:mana_string"
@@ -8,7 +8,7 @@
],
"key": {
"P": {
"item": "botania:cyan_dye"
"item": "minecraft:cyan_dye"
},
"S": {
"item": "botania:mana_string"
@@ -8,7 +8,7 @@
],
"key": {
"P": {
"item": "botania:pink_dye"
"item": "minecraft:pink_dye"
},
"S": {
"item": "botania:mana_string"
@@ -8,7 +8,7 @@
],
"key": {
"P": {
"item": "botania:lime_dye"
"item": "minecraft:lime_dye"
},
"S": {
"item": "botania:mana_string"
@@ -8,7 +8,7 @@
],
"key": {
"P": {
"item": "botania:orange_dye"
"item": "minecraft:orange_dye"
},
"S": {
"item": "botania:mana_string"
@@ -8,7 +8,7 @@
],
"key": {
"P": {
"item": "botania:light_blue_dye"
"item": "minecraft:light_blue_dye"
},
"S": {
"item": "botania:mana_string"
@@ -8,7 +8,7 @@
],
"key": {
"P": {
"item": "botania:gray_dye"
"item": "minecraft:gray_dye"
},
"S": {
"item": "botania:mana_string"
@@ -8,7 +8,7 @@
],
"key": {
"P": {
"item": "botania:white_dye"
"item": "minecraft:white_dye"
},
"S": {
"item": "botania:mana_string"
@@ -8,7 +8,7 @@
],
"key": {
"P": {
"item": "botania:blue_dye"
"item": "minecraft:blue_dye"
},
"S": {
"item": "botania:mana_string"
@@ -8,7 +8,7 @@
],
"key": {
"P": {
"item": "botania:yellow_dye"
"item": "minecraft:yellow_dye"
},
"S": {
"item": "botania:mana_string"
@@ -8,7 +8,7 @@
],
"key": {
"P": {
"item": "botania:green_dye"
"item": "minecraft:green_dye"
},
"S": {
"item": "botania:mana_string"
@@ -8,7 +8,7 @@
],
"key": {
"P": {
"item": "botania:purple_dye"
"item": "minecraft:purple_dye"
},
"S": {
"item": "botania:mana_string"
@@ -8,7 +8,7 @@
],
"key": {
"P": {
"item": "botania:black_dye"
"item": "minecraft:black_dye"
},
"S": {
"item": "botania:mana_string"
@@ -8,7 +8,7 @@
],
"key": {
"P": {
"item": "botania:brown_dye"
"item": "minecraft:brown_dye"
},
"S": {
"item": "botania:mana_string"
@@ -8,7 +8,7 @@
],
"key": {
"P": {
"item": "botania:red_dye"
"item": "minecraft:red_dye"
},
"S": {
"item": "botania:mana_string"
@@ -8,7 +8,7 @@
],
"key": {
"P": {
"item": "botania:magenta_dye"
"item": "minecraft:magenta_dye"
},
"S": {
"item": "botania:mana_string"
@@ -10,6 +10,6 @@
}
],
"result": {
"item": "botania:black_dye"
"item": "minecraft:black_dye"
}
}
@@ -10,6 +10,6 @@
}
],
"result": {
"item": "botania:blue_dye"
"item": "minecraft:blue_dye"
}
}
@@ -10,6 +10,6 @@
}
],
"result": {
"item": "botania:brown_dye"
"item": "minecraft:brown_dye"
}
}
@@ -10,6 +10,6 @@
}
],
"result": {
"item": "botania:cyan_dye"
"item": "minecraft:cyan_dye"
}
}
@@ -10,6 +10,6 @@
}
],
"result": {
"item": "botania:gray_dye"
"item": "minecraft:gray_dye"
}
}
@@ -10,6 +10,6 @@
}
],
"result": {
"item": "botania:green_dye"
"item": "minecraft:green_dye"
}
}
@@ -15,6 +15,6 @@
}
],
"result": {
"item": "botania:light_blue_dye"
"item": "minecraft:light_blue_dye"
}
}
@@ -21,6 +21,6 @@
}
],
"result": {
"item": "botania:light_gray_dye"
"item": "minecraft:light_gray_dye"
}
}
@@ -10,6 +10,6 @@
}
],
"result": {
"item": "botania:lime_dye"
"item": "minecraft:lime_dye"
}
}
@@ -10,6 +10,6 @@
}
],
"result": {
"item": "botania:magenta_dye"
"item": "minecraft:magenta_dye"
}
}
@@ -10,7 +10,7 @@
}
],
"result": {
"item": "botania:magenta_dye",
"item": "minecraft:magenta_dye",
"count": 2
}
}
@@ -15,6 +15,6 @@
}
],
"result": {
"item": "botania:orange_dye"
"item": "minecraft:orange_dye"
}
}
@@ -15,6 +15,6 @@
}
],
"result": {
"item": "botania:pink_dye"
"item": "minecraft:pink_dye"
}
}
@@ -10,7 +10,7 @@
}
],
"result": {
"item": "botania:pink_dye",
"item": "minecraft:pink_dye",
"count": 2
}
}
@@ -10,6 +10,6 @@
}
],
"result": {
"item": "botania:purple_dye"
"item": "minecraft:purple_dye"
}
}
@@ -18,6 +18,6 @@
}
],
"result": {
"item": "botania:red_dye"
"item": "minecraft:red_dye"
}
}
@@ -10,7 +10,7 @@
}
],
"result": {
"item": "botania:red_dye",
"item": "minecraft:red_dye",
"count": 2
}
}
@@ -10,6 +10,6 @@
}
],
"result": {
"item": "botania:white_dye"
"item": "minecraft:white_dye"
}
}
@@ -15,6 +15,6 @@
}
],
"result": {
"item": "botania:yellow_dye"
"item": "minecraft:yellow_dye"
}
}
@@ -10,7 +10,7 @@
}
],
"result": {
"item": "botania:yellow_dye",
"item": "minecraft:yellow_dye",
"count": 2
}
}
@@ -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"
}
}
@@ -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": {
@@ -11,7 +11,7 @@
}
],
{
"item": "botania:white_dye"
"item": "minecraft:white_dye"
}
],
"result": {
@@ -11,7 +11,7 @@
}
],
{
"item": "botania:orange_dye"
"item": "minecraft:orange_dye"
}
],
"result": {
@@ -11,7 +11,7 @@
}
],
{
"item": "botania:purple_dye"
"item": "minecraft:purple_dye"
}
],
"result": {
@@ -11,7 +11,7 @@
}
],
{
"item": "botania:blue_dye"
"item": "minecraft:blue_dye"
}
],
"result": {
@@ -11,7 +11,7 @@
}
],
{
"item": "botania:brown_dye"
"item": "minecraft:brown_dye"
}
],
"result": {
@@ -11,7 +11,7 @@
}
],
{
"item": "botania:green_dye"
"item": "minecraft:green_dye"
}
],
"result": {
@@ -11,7 +11,7 @@
}
],
{
"item": "botania:red_dye"
"item": "minecraft:red_dye"
}
],
"result": {
@@ -11,7 +11,7 @@
}
],
{
"item": "botania:black_dye"
"item": "minecraft:black_dye"
}
],
"result": {
@@ -11,7 +11,7 @@
}
],
{
"item": "botania:magenta_dye"
"item": "minecraft:magenta_dye"
}
],
"result": {
@@ -11,7 +11,7 @@
}
],
{
"item": "botania:light_blue_dye"
"item": "minecraft:light_blue_dye"
}
],
"result": {
@@ -11,7 +11,7 @@
}
],
{
"item": "botania:yellow_dye"
"item": "minecraft:yellow_dye"
}
],
"result": {
@@ -11,7 +11,7 @@
}
],
{
"item": "botania:lime_dye"
"item": "minecraft:lime_dye"
}
],
"result": {
@@ -11,7 +11,7 @@
}
],
{
"item": "botania:pink_dye"
"item": "minecraft:pink_dye"
}
],
"result": {
@@ -11,7 +11,7 @@
}
],
{
"item": "botania:gray_dye"
"item": "minecraft:gray_dye"
}
],
"result": {
@@ -11,7 +11,7 @@
}
],
{
"item": "botania:light_gray_dye"
"item": "minecraft:light_gray_dye"
}
],
"result": {
@@ -11,7 +11,7 @@
}
],
{
"item": "botania:cyan_dye"
"item": "minecraft:cyan_dye"
}
],
"result": {
@@ -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"
]
}
@@ -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,
@@ -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);
@@ -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) {
@@ -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);
@@ -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);
@@ -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);
@@ -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);
@@ -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;
}
}
@@ -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;
}
}
}
@@ -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();
}
}
}
@@ -63,8 +63,6 @@ public class ModTags {
public static final ITag.INamedTag<Item> DISPOSABLE = tag("disposable");
public static final ITag.INamedTag<Item> SEMI_DISPOSABLE = tag("semi_disposable");
public static final ITag.INamedTag<Item> DYES = tag("dyes");
public static final ITag.INamedTag<Item> PETALS = tag("petals");
public static final ITag.INamedTag<Item> PETALS_BLACK = tag("petals/black");
public static final ITag.INamedTag<Item> PETALS_BLUE = tag("petals/blue");
@@ -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<Item> 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
@@ -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));
@@ -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);
}
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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": "マナスチールインゴット",
@@ -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": "마나합금 주괴",
@@ -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",
@@ -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",
@@ -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": "魔力钢锭",
@@ -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": "瑪那鋼錠",
Loaded 100 of 134 files, more files were not shown because too many files have changed in this diff. Show more