diff --git a/src/main/resources/assets/botania/blockstates/enchanter.json b/src/main/resources/assets/botania/blockstates/enchanter.json index fb206fdd8..71a389c10 100644 --- a/src/main/resources/assets/botania/blockstates/enchanter.json +++ b/src/main/resources/assets/botania/blockstates/enchanter.json @@ -8,8 +8,10 @@ "transform": "forge:default-block" }, "variants": { - "facing=x": [{}], - "facing=z": [{}], + "facing": { + "x": {}, + "z": {} + }, "inventory": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/enderEyeBlock.json b/src/main/resources/assets/botania/blockstates/enderEyeBlock.json index 1d55d3423..d49d0e4dc 100644 --- a/src/main/resources/assets/botania/blockstates/enderEyeBlock.json +++ b/src/main/resources/assets/botania/blockstates/enderEyeBlock.json @@ -8,11 +8,10 @@ "transform": "forge:default-block" }, "variants": { - "powered=true": [{ - "textures": { - "all": "botania:blocks/enderEyeBlock1" - } - }], + "powered": { + "true": { "textures": { "all": "botania:blocks/enderEyeBlock1" } }, + "false": {} + }, "powered=false": [{}], "inventory": [{}] } diff --git a/src/main/resources/assets/botania/blockstates/flower.json b/src/main/resources/assets/botania/blockstates/flower.json index 9ccfc702c..9472ebe07 100644 --- a/src/main/resources/assets/botania/blockstates/flower.json +++ b/src/main/resources/assets/botania/blockstates/flower.json @@ -4,22 +4,24 @@ "model": "minecraft:cross" }, "variants": { - "color=white": [{ "textures": { "cross": "botania:blocks/flower0" } }], - "color=orange": [{ "textures": { "cross": "botania:blocks/flower1" } }], - "color=magenta": [{ "textures": { "cross": "botania:blocks/flower2" } }], - "color=light_blue": [{ "textures": { "cross": "botania:blocks/flower3" } }], - "color=yellow": [{ "textures": { "cross": "botania:blocks/flower4" } }], - "color=lime": [{ "textures": { "cross": "botania:blocks/flower5" } }], - "color=pink": [{ "textures": { "cross": "botania:blocks/flower6" } }], - "color=gray": [{ "textures": { "cross": "botania:blocks/flower7" } }], - "color=silver": [{ "textures": { "cross": "botania:blocks/flower8" } }], - "color=cyan": [{ "textures": { "cross": "botania:blocks/flower9" } }], - "color=purple": [{ "textures": { "cross": "botania:blocks/flower10" } }], - "color=blue": [{ "textures": { "cross": "botania:blocks/flower11" } }], - "color=brown": [{ "textures": { "cross": "botania:blocks/flower12" } }], - "color=green": [{ "textures": { "cross": "botania:blocks/flower13" } }], - "color=red": [{ "textures": { "cross": "botania:blocks/flower14" } }], - "color=black": [{ "textures": { "cross": "botania:blocks/flower15" } }], + "color": { + "white": { "textures": { "cross": "botania:blocks/flower0" } }, + "orange": { "textures": { "cross": "botania:blocks/flower1" } }, + "magenta": { "textures": { "cross": "botania:blocks/flower2" } }, + "light_blue": { "textures": { "cross": "botania:blocks/flower3" } }, + "yellow": { "textures": { "cross": "botania:blocks/flower4" } }, + "lime": { "textures": { "cross": "botania:blocks/flower5" } }, + "pink": { "textures": { "cross": "botania:blocks/flower6" } }, + "gray": { "textures": { "cross": "botania:blocks/flower7" } }, + "silver": { "textures": { "cross": "botania:blocks/flower8" } }, + "cyan": { "textures": { "cross": "botania:blocks/flower9" } }, + "purple": { "textures": { "cross": "botania:blocks/flower10" } }, + "blue": { "textures": { "cross": "botania:blocks/flower11" } }, + "brown": { "textures": { "cross": "botania:blocks/flower12" } }, + "green": { "textures": { "cross": "botania:blocks/flower13" } }, + "red": { "textures": { "cross": "botania:blocks/flower14" } }, + "black": { "textures": { "cross": "botania:blocks/flower15" } } + }, "inventory_white": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower0" } }], "inventory_orange": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower1" } }], diff --git a/src/main/resources/assets/botania/blockstates/forestDrum.json b/src/main/resources/assets/botania/blockstates/forestDrum.json index a20f0ed41..41c22e65e 100644 --- a/src/main/resources/assets/botania/blockstates/forestDrum.json +++ b/src/main/resources/assets/botania/blockstates/forestDrum.json @@ -5,8 +5,10 @@ "transform": "forge:default-block" }, "variants": { - "variant=wild": [{ "textures": { "top": "botania:blocks/forestDrum0", "side": "botania:blocks/forestDrum1" } }], - "variant=gathering": [{ "textures": { "top": "botania:blocks/forestDrum2", "side": "botania:blocks/forestDrum3" } }], - "variant=canopy": [{ "textures": { "top": "botania:blocks/forestDrum4", "side": "botania:blocks/forestDrum5" } }] + "variant": { + "wild": { "textures": { "top": "botania:blocks/forestDrum0", "side": "botania:blocks/forestDrum1" } }, + "gathering": { "textures": { "top": "botania:blocks/forestDrum2", "side": "botania:blocks/forestDrum3" } }, + "canopy": { "textures": { "top": "botania:blocks/forestDrum4", "side": "botania:blocks/forestDrum5" } } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/ghostRail.json b/src/main/resources/assets/botania/blockstates/ghostRail.json index 96631fbfc..891a54fbd 100644 --- a/src/main/resources/assets/botania/blockstates/ghostRail.json +++ b/src/main/resources/assets/botania/blockstates/ghostRail.json @@ -7,12 +7,14 @@ "transform": "forge:default-item" }, "variants": { - "shape=north_south": { "model": "minecraft:rail_flat" }, - "shape=east_west": { "model": "minecraft:rail_flat", "y": 90 }, - "shape=ascending_east": { "model": "minecraft:rail_raised_ne", "y": 90 }, - "shape=ascending_west": { "model": "minecraft:rail_raised_sw", "y": 90 }, - "shape=ascending_north": { "model": "minecraft:rail_raised_ne" }, - "shape=ascending_south": { "model": "minecraft:rail_raised_sw" }, + "shape": { + "north_south": { "model": "minecraft:rail_flat" }, + "east_west": { "model": "minecraft:rail_flat", "y": 90 }, + "ascending_east": { "model": "minecraft:rail_raised_ne", "y": 90 }, + "ascending_west": { "model": "minecraft:rail_raised_sw", "y": 90 }, + "ascending_north": { "model": "minecraft:rail_raised_ne" }, + "ascending_south": { "model": "minecraft:rail_raised_sw" } + }, "inventory": [{ "model": "builtin/generated", "textures": { diff --git a/src/main/resources/assets/botania/blockstates/livingrock.json b/src/main/resources/assets/botania/blockstates/livingrock.json index 4893484b9..2202ab749 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock.json +++ b/src/main/resources/assets/botania/blockstates/livingrock.json @@ -5,10 +5,12 @@ "transform": "forge:default-block" }, "variants": { - "variant=default": [{ "textures": { "all": "botania:blocks/livingrock0" } }], - "variant=brick": [{ "textures": { "all": "botania:blocks/livingrock1" } }], - "variant=mossy_brick": [{ "textures": { "all": "botania:blocks/livingrock2" } }], - "variant=cracked_brick": [{ "textures": { "all": "botania:blocks/livingrock3" } }], - "variant=chiseled_brick": [{ "textures": { "all": "botania:blocks/livingrock4" } }] + "variant": { + "default": { "textures": { "all": "botania:blocks/livingrock0" } }, + "brick": { "textures": { "all": "botania:blocks/livingrock1" } }, + "mossy_brick": { "textures": { "all": "botania:blocks/livingrock2" } }, + "cracked_brick": { "textures": { "all": "botania:blocks/livingrock3" } }, + "chiseled_brick": { "textures": { "all": "botania:blocks/livingrock4" } } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood.json b/src/main/resources/assets/botania/blockstates/livingwood.json index 3f6c42938..5090da065 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood.json +++ b/src/main/resources/assets/botania/blockstates/livingwood.json @@ -5,11 +5,13 @@ "transform": "forge:default-block" }, "variants": { - "variant=default": [{ "textures": { "all": "botania:blocks/livingwood0" } }], - "variant=planks": [{ "textures": { "all": "botania:blocks/livingwood1" } }], - "variant=mossy_planks": [{ "textures": { "all": "botania:blocks/livingwood2" } }], - "variant=framed": [{ "textures": { "all": "botania:blocks/livingwood3" } }], - "variant=pattern_framed": [{ "textures": { "all": "botania:blocks/livingwood4" } }], - "variant=glimmering": [{ "textures": { "all": "botania:blocks/livingwood5" } }] + "variant": { + "default": { "textures": { "all": "botania:blocks/livingwood0" } }, + "planks": { "textures": { "all": "botania:blocks/livingwood1" } }, + "mossy_planks": { "textures": { "all": "botania:blocks/livingwood2" } }, + "framed": { "textures": { "all": "botania:blocks/livingwood3" } }, + "pattern_framed": { "textures": { "all": "botania:blocks/livingwood4" } }, + "glimmering": { "textures": { "all": "botania:blocks/livingwood5" } } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/mushroom.json b/src/main/resources/assets/botania/blockstates/mushroom.json index cafdbfede..b5e1da5ae 100644 --- a/src/main/resources/assets/botania/blockstates/mushroom.json +++ b/src/main/resources/assets/botania/blockstates/mushroom.json @@ -4,22 +4,24 @@ "model": "minecraft:cross" }, "variants": { - "color=white": [{ "textures": { "cross": "botania:blocks/mushroom0" } }], - "color=orange": [{ "textures": { "cross": "botania:blocks/mushroom1" } }], - "color=magenta": [{ "textures": { "cross": "botania:blocks/mushroom2" } }], - "color=light_blue": [{ "textures": { "cross": "botania:blocks/mushroom3" } }], - "color=yellow": [{ "textures": { "cross": "botania:blocks/mushroom4" } }], - "color=lime": [{ "textures": { "cross": "botania:blocks/mushroom5" } }], - "color=pink": [{ "textures": { "cross": "botania:blocks/mushroom6" } }], - "color=gray": [{ "textures": { "cross": "botania:blocks/mushroom7" } }], - "color=silver": [{ "textures": { "cross": "botania:blocks/mushroom8" } }], - "color=cyan": [{ "textures": { "cross": "botania:blocks/mushroom9" } }], - "color=purple": [{ "textures": { "cross": "botania:blocks/mushroom10" } }], - "color=blue": [{ "textures": { "cross": "botania:blocks/mushroom11" } }], - "color=brown": [{ "textures": { "cross": "botania:blocks/mushroom12" } }], - "color=green": [{ "textures": { "cross": "botania:blocks/mushroom13" } }], - "color=red": [{ "textures": { "cross": "botania:blocks/mushroom14" } }], - "color=black": [{ "textures": { "cross": "botania:blocks/mushroom15" } }], + "color": { + "white": { "textures": { "cross": "botania:blocks/mushroom0" } }, + "orange": { "textures": { "cross": "botania:blocks/mushroom1" } }, + "magenta": { "textures": { "cross": "botania:blocks/mushroom2" } }, + "light_blue": { "textures": { "cross": "botania:blocks/mushroom3" } }, + "yellow": { "textures": { "cross": "botania:blocks/mushroom4" } }, + "lime": { "textures": { "cross": "botania:blocks/mushroom5" } }, + "pink": { "textures": { "cross": "botania:blocks/mushroom6" } }, + "gray": { "textures": { "cross": "botania:blocks/mushroom7" } }, + "silver": { "textures": { "cross": "botania:blocks/mushroom8" } }, + "cyan": { "textures": { "cross": "botania:blocks/mushroom9" } }, + "purple": { "textures": { "cross": "botania:blocks/mushroom10" } }, + "blue": { "textures": { "cross": "botania:blocks/mushroom11" } }, + "brown": { "textures": { "cross": "botania:blocks/mushroom12" } }, + "green": { "textures": { "cross": "botania:blocks/mushroom13" } }, + "red": { "textures": { "cross": "botania:blocks/mushroom14" } }, + "black": { "textures": { "cross": "botania:blocks/mushroom15" } } + }, "inventory_white": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom0" } }], "inventory_orange": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom1" } }], diff --git a/src/main/resources/assets/botania/blockstates/pavement.json b/src/main/resources/assets/botania/blockstates/pavement.json index baa9db28b..ed2c481c1 100644 --- a/src/main/resources/assets/botania/blockstates/pavement.json +++ b/src/main/resources/assets/botania/blockstates/pavement.json @@ -5,11 +5,13 @@ "transform": "forge:default-block" }, "variants": { - "color=white": [{ "textures": { "all": "botania:blocks/pavement0" } }], - "color=black": [{ "textures": { "all": "botania:blocks/pavement1" } }], - "color=blue": [{ "textures": { "all": "botania:blocks/pavement2" } }], - "color=red": [{ "textures": { "all": "botania:blocks/pavement3"} }], - "color=yellow": [{ "textures": { "all": "botania:blocks/pavement4"} }], - "color=green": [{ "textures": { "all": "botania:blocks/pavement5" } }] + "color": { + "white": { "textures": { "all": "botania:blocks/pavement0" } }, + "black": { "textures": { "all": "botania:blocks/pavement1" } }, + "blue": { "textures": { "all": "botania:blocks/pavement2" } }, + "red": { "textures": { "all": "botania:blocks/pavement3"} }, + "yellow": { "textures": { "all": "botania:blocks/pavement4"} }, + "green": { "textures": { "all": "botania:blocks/pavement5" } } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shinyFlower.json b/src/main/resources/assets/botania/blockstates/shinyFlower.json index c08f56345..a8b2f6868 100644 --- a/src/main/resources/assets/botania/blockstates/shinyFlower.json +++ b/src/main/resources/assets/botania/blockstates/shinyFlower.json @@ -4,22 +4,24 @@ "model": "minecraft:cross" }, "variants": { - "color=white": [{ "textures": { "cross": "botania:blocks/flowerGlimmering0" } }], - "color=orange": [{ "textures": { "cross": "botania:blocks/flowerGlimmering1" } }], - "color=magenta": [{ "textures": { "cross": "botania:blocks/flowerGlimmering2" } }], - "color=light_blue": [{ "textures": { "cross": "botania:blocks/flowerGlimmering3" } }], - "color=yellow": [{ "textures": { "cross": "botania:blocks/flowerGlimmering4" } }], - "color=lime": [{ "textures": { "cross": "botania:blocks/flowerGlimmering5" } }], - "color=pink": [{ "textures": { "cross": "botania:blocks/flowerGlimmering6" } }], - "color=gray": [{ "textures": { "cross": "botania:blocks/flowerGlimmering7" } }], - "color=silver": [{ "textures": { "cross": "botania:blocks/flowerGlimmering8" } }], - "color=cyan": [{ "textures": { "cross": "botania:blocks/flowerGlimmering9" } }], - "color=purple": [{ "textures": { "cross": "botania:blocks/flowerGlimmering10" } }], - "color=blue": [{ "textures": { "cross": "botania:blocks/flowerGlimmering11" } }], - "color=brown": [{ "textures": { "cross": "botania:blocks/flowerGlimmering12" } }], - "color=green": [{ "textures": { "cross": "botania:blocks/flowerGlimmering13" } }], - "color=red": [{ "textures": { "cross": "botania:blocks/flowerGlimmering14" } }], - "color=black": [{ "textures": { "cross": "botania:blocks/flowerGlimmering15" } }], + "color": { + "white": { "textures": { "cross": "botania:blocks/flowerGlimmering0" } }, + "orange": { "textures": { "cross": "botania:blocks/flowerGlimmering1" } }, + "magenta": { "textures": { "cross": "botania:blocks/flowerGlimmering2" } }, + "light_blue": { "textures": { "cross": "botania:blocks/flowerGlimmering3" } }, + "yellow": { "textures": { "cross": "botania:blocks/flowerGlimmering4" } }, + "lime": { "textures": { "cross": "botania:blocks/flowerGlimmering5" } }, + "pink": { "textures": { "cross": "botania:blocks/flowerGlimmering6" } }, + "gray": { "textures": { "cross": "botania:blocks/flowerGlimmering7" } }, + "silver": { "textures": { "cross": "botania:blocks/flowerGlimmering8" } }, + "cyan": { "textures": { "cross": "botania:blocks/flowerGlimmering9" } }, + "purple": { "textures": { "cross": "botania:blocks/flowerGlimmering10" } }, + "blue": { "textures": { "cross": "botania:blocks/flowerGlimmering11" } }, + "brown": { "textures": { "cross": "botania:blocks/flowerGlimmering12" } }, + "green": { "textures": { "cross": "botania:blocks/flowerGlimmering13" } }, + "red": { "textures": { "cross": "botania:blocks/flowerGlimmering14" } }, + "black": { "textures": { "cross": "botania:blocks/flowerGlimmering15" } } + }, "inventory_white": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering0" } }], "inventory_orange": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering1" } }], diff --git a/src/main/resources/assets/botania/blockstates/stone.json b/src/main/resources/assets/botania/blockstates/stone.json index 249d618ba..f62868e48 100644 --- a/src/main/resources/assets/botania/blockstates/stone.json +++ b/src/main/resources/assets/botania/blockstates/stone.json @@ -5,21 +5,23 @@ "transform": "forge:default-block" }, "variants": { - "variant=andesite": [{ "textures": { "all": "botania:blocks/stone0" } }], - "variant=basalt": [{ "textures": { "all": "botania:blocks/stone1" } }], - "variant=diorite": [{ "textures": { "all": "botania:blocks/stone2" } }], - "variant=granite": [{ "textures": { "all": "botania:blocks/stone3" } }], - "variant=polished_andesite": [{ "textures": { "all": "botania:blocks/stone4" } }], - "variant=polished_basalt": [{ "textures": { "all": "botania:blocks/stone5" } }], - "variant=polished_diorite": [{ "textures": { "all": "botania:blocks/stone6" } }], - "variant=polished_granite": [{ "textures": { "all": "botania:blocks/stone7" } }], - "variant=andesite_brick": [{ "textures": { "all": "botania:blocks/stone8" } }], - "variant=basalt_brick": [{ "textures": { "all": "botania:blocks/stone9" } }], - "variant=diorite_brick": [{ "textures": { "all": "botania:blocks/stone10" } }], - "variant=granite_brick": [{ "textures": { "all": "botania:blocks/stone11" } }], - "variant=chiseled_andesite": [{ "textures": { "all": "botania:blocks/stone12" } }], - "variant=chiseled_basalt": [{ "textures": { "all": "botania:blocks/stone13" } }], - "variant=chiseled_diorite": [{ "textures": { "all": "botania:blocks/stone14" } }], - "variant=chiseled_granite": [{ "textures": { "all": "botania:blocks/stone15" } }] + "variant": { + "andesite": { "textures": { "all": "botania:blocks/stone0" } }, + "basalt": { "textures": { "all": "botania:blocks/stone1" } }, + "diorite": { "textures": { "all": "botania:blocks/stone2" } }, + "granite": { "textures": { "all": "botania:blocks/stone3" } }, + "polished_andesite": { "textures": { "all": "botania:blocks/stone4" } }, + "polished_basalt": { "textures": { "all": "botania:blocks/stone5" } }, + "polished_diorite": { "textures": { "all": "botania:blocks/stone6" } }, + "polished_granite": { "textures": { "all": "botania:blocks/stone7" } }, + "andesite_brick": { "textures": { "all": "botania:blocks/stone8" } }, + "basalt_brick": { "textures": { "all": "botania:blocks/stone9" } }, + "diorite_brick": { "textures": { "all": "botania:blocks/stone10" } }, + "granite_brick": { "textures": { "all": "botania:blocks/stone11" } }, + "chiseled_andesite": { "textures": { "all": "botania:blocks/stone12" } }, + "chiseled_basalt": { "textures": { "all": "botania:blocks/stone13" } }, + "chiseled_diorite": { "textures": { "all": "botania:blocks/stone14" } }, + "chiseled_granite": { "textures": { "all": "botania:blocks/stone15" } } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/storage.json b/src/main/resources/assets/botania/blockstates/storage.json index 0b3e7899a..101c43d96 100644 --- a/src/main/resources/assets/botania/blockstates/storage.json +++ b/src/main/resources/assets/botania/blockstates/storage.json @@ -5,10 +5,12 @@ "transform": "forge:default-block" }, "variants": { - "variant=manasteel": [{ "textures": { "all": "botania:blocks/storage0" } }], - "variant=terrasteel": [{ "textures": { "all": "botania:blocks/storage1" } }], - "variant=elementium": [{ "textures": { "all": "botania:blocks/storage2" } }], - "variant=mana_diamond": [{ "textures": { "all": "botania:blocks/storage3" } }], - "variant=dragonstone": [{ "textures": { "all": "botania:blocks/storage4" } }] + "variant": { + "manasteel": { "textures": { "all": "botania:blocks/storage0" } }, + "terrasteel": { "textures": { "all": "botania:blocks/storage1" } }, + "elementium": { "textures": { "all": "botania:blocks/storage2" } }, + "mana_diamond": { "textures": { "all": "botania:blocks/storage3" } }, + "dragonstone": { "textures": { "all": "botania:blocks/storage4" } } + } } } \ No newline at end of file