diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index a9aac8492..5aafacb2d 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -126,8 +126,8 @@ public final class LibResources { public static final String MODEL_AVATAR_DIRT = PREFIX_MODEL + "avatar_dirt.png"; public static final String MISC_PARTICLES = PREFIX_MISC + "particles.png"; - public static final String MISC_WISP_LARGE = PREFIX_MISC + "wispLarge.png"; - public static final String MISC_WISP_SMALL = PREFIX_MISC + "wispSmall.png"; + public static final String MISC_WISP_LARGE = PREFIX_MISC + "wisp_large.png"; + public static final String MISC_WISP_SMALL = PREFIX_MISC + "wisp_small.png"; public static final String MISC_HALO = PREFIX_MISC + "halo.png"; public static final String MISC_GLOW_GREEN = PREFIX_MISC + "glow0.png"; public static final String MISC_GLOW_CYAN = PREFIX_MISC + "glow1.png"; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java index f8096f544..7daab5606 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java @@ -66,7 +66,7 @@ public class ModelArmorTerrasteel extends ModelArmor { public ModelArmorTerrasteel(EntityEquipmentSlot slot) { super(slot); - textureWidth = 128; + textureWidth = 64; textureHeight = 128; float s = 0.01F; diff --git a/src/main/resources/assets/botania/blockstates/agricarnation.json b/src/main/resources/assets/botania/blockstates/agricarnation.json index 5e38ff9cd..1f4c77c31 100644 --- a/src/main/resources/assets/botania/blockstates/agricarnation.json +++ b/src/main/resources/assets/botania/blockstates/agricarnation.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/agricarnation" + "cross": "botania:blocks/flower_func_agricarnation" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/agricarnation" + "layer0": "botania:blocks/flower_func_agricarnation" } }] } diff --git a/src/main/resources/assets/botania/blockstates/agricarnationchibi.json b/src/main/resources/assets/botania/blockstates/agricarnationchibi.json index 4eb04b2b5..970f8a209 100644 --- a/src/main/resources/assets/botania/blockstates/agricarnationchibi.json +++ b/src/main/resources/assets/botania/blockstates/agricarnationchibi.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/agricarnationchibi" + "cross": "botania:blocks/flower_func_agricarnation_chibi" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/agricarnationchibi" + "layer0": "botania:blocks/flower_func_agricarnation_chibi" } }] } diff --git a/src/main/resources/assets/botania/blockstates/arcanerose.json b/src/main/resources/assets/botania/blockstates/arcanerose.json index 5ace26e7a..dcdc1d4b3 100644 --- a/src/main/resources/assets/botania/blockstates/arcanerose.json +++ b/src/main/resources/assets/botania/blockstates/arcanerose.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/arcanerose" + "cross": "botania:blocks/flower_gen_arcane_rose" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/arcanerose" + "layer0": "botania:blocks/flower_gen_arcane_rose" } }] } diff --git a/src/main/resources/assets/botania/blockstates/bellethorn.json b/src/main/resources/assets/botania/blockstates/bellethorn.json index cad8c4b97..cdaa73887 100644 --- a/src/main/resources/assets/botania/blockstates/bellethorn.json +++ b/src/main/resources/assets/botania/blockstates/bellethorn.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/bellethorn" + "cross": "botania:blocks/flower_func_bellethorne" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/bellethorn" + "layer0": "botania:blocks/flower_func_bellethorne" } }] } diff --git a/src/main/resources/assets/botania/blockstates/bellethornchibi.json b/src/main/resources/assets/botania/blockstates/bellethornchibi.json index 52980608a..85216a809 100644 --- a/src/main/resources/assets/botania/blockstates/bellethornchibi.json +++ b/src/main/resources/assets/botania/blockstates/bellethornchibi.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/bellethornchibi" + "cross": "botania:blocks/flower_func_bellethorne_chibi" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/bellethornchibi" + "layer0": "botania:blocks/flower_func_bellethorne_chibi" } }] } diff --git a/src/main/resources/assets/botania/blockstates/bergamute.json b/src/main/resources/assets/botania/blockstates/bergamute.json index 087add64d..e4063105a 100644 --- a/src/main/resources/assets/botania/blockstates/bergamute.json +++ b/src/main/resources/assets/botania/blockstates/bergamute.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/bergamute" + "cross": "botania:blocks/flower_func_bergamute" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/bergamute" + "layer0": "botania:blocks/flower_func_bergamute" } }] } diff --git a/src/main/resources/assets/botania/blockstates/bubbell.json b/src/main/resources/assets/botania/blockstates/bubbell.json index 694180568..2c8d955fd 100644 --- a/src/main/resources/assets/botania/blockstates/bubbell.json +++ b/src/main/resources/assets/botania/blockstates/bubbell.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/bubbell" + "cross": "botania:blocks/flower_func_bubbell" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/bubbell" + "layer0": "botania:blocks/flower_func_bubbell" } }] } diff --git a/src/main/resources/assets/botania/blockstates/bubbellchibi.json b/src/main/resources/assets/botania/blockstates/bubbellchibi.json index cf20e2126..0b9a148e9 100644 --- a/src/main/resources/assets/botania/blockstates/bubbellchibi.json +++ b/src/main/resources/assets/botania/blockstates/bubbellchibi.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/bubbellchibi" + "cross": "botania:blocks/flower_func_bubbell_chibi" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/bubbellchibi" + "layer0": "botania:blocks/flower_func_bubbell_chibi" } }] } diff --git a/src/main/resources/assets/botania/blockstates/clayconia.json b/src/main/resources/assets/botania/blockstates/clayconia.json index 327e6bee4..076b2e5f5 100644 --- a/src/main/resources/assets/botania/blockstates/clayconia.json +++ b/src/main/resources/assets/botania/blockstates/clayconia.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/clayconia" + "cross": "botania:blocks/flower_func_clayconia" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/clayconia" + "layer0": "botania:blocks/flower_func_clayconia" } }] } diff --git a/src/main/resources/assets/botania/blockstates/clayconiachibi.json b/src/main/resources/assets/botania/blockstates/clayconiachibi.json index e51b58b18..bf9a5f98c 100644 --- a/src/main/resources/assets/botania/blockstates/clayconiachibi.json +++ b/src/main/resources/assets/botania/blockstates/clayconiachibi.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/clayconiachibi" + "cross": "botania:blocks/flower_func_clayconia_chibi" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/clayconiachibi" + "layer0": "botania:blocks/flower_func_clayconia_chibi" } }] } diff --git a/src/main/resources/assets/botania/blockstates/custombrick0slab.json b/src/main/resources/assets/botania/blockstates/custombrick0slab.json deleted file mode 100644 index d7128f020..000000000 --- a/src/main/resources/assets/botania/blockstates/custombrick0slab.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/custombrick0", - "top": "botania:blocks/custombrick0", - "side": "botania:blocks/custombrick0" - } - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/custombrick0slabfull.json b/src/main/resources/assets/botania/blockstates/custombrick0slabfull.json deleted file mode 100644 index 5f7c92cf6..000000000 --- a/src/main/resources/assets/botania/blockstates/custombrick0slabfull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/custombrick0" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/custombrick0stairs.json b/src/main/resources/assets/botania/blockstates/custombrick0stairs.json deleted file mode 100644 index fb3b27af4..000000000 --- a/src/main/resources/assets/botania/blockstates/custombrick0stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/custombrick0", - "top": "botania:blocks/custombrick0", - "side": "botania:blocks/custombrick0" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/custombrick1slab.json b/src/main/resources/assets/botania/blockstates/custombrick1slab.json deleted file mode 100644 index b2427f91f..000000000 --- a/src/main/resources/assets/botania/blockstates/custombrick1slab.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/custombrick1", - "top": "botania:blocks/custombrick1", - "side": "botania:blocks/custombrick1" - } - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/custombrick1slabfull.json b/src/main/resources/assets/botania/blockstates/custombrick1slabfull.json deleted file mode 100644 index 695d6dcb9..000000000 --- a/src/main/resources/assets/botania/blockstates/custombrick1slabfull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/custombrick1" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/custombrick1stairs.json b/src/main/resources/assets/botania/blockstates/custombrick1stairs.json deleted file mode 100644 index a2dc401b3..000000000 --- a/src/main/resources/assets/botania/blockstates/custombrick1stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/custombrick1", - "top": "botania:blocks/custombrick1", - "side": "botania:blocks/custombrick1" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/custombrick2slab.json b/src/main/resources/assets/botania/blockstates/custombrick2slab.json deleted file mode 100644 index 49f5069bb..000000000 --- a/src/main/resources/assets/botania/blockstates/custombrick2slab.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/custombrick2", - "top": "botania:blocks/custombrick2", - "side": "botania:blocks/custombrick2" - } - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/custombrick2slabfull.json b/src/main/resources/assets/botania/blockstates/custombrick2slabfull.json deleted file mode 100644 index 1fb0db84e..000000000 --- a/src/main/resources/assets/botania/blockstates/custombrick2slabfull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/custombrick2" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/custombrick2stairs.json b/src/main/resources/assets/botania/blockstates/custombrick2stairs.json deleted file mode 100644 index 808aa0684..000000000 --- a/src/main/resources/assets/botania/blockstates/custombrick2stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/custombrick2", - "top": "botania:blocks/custombrick2", - "side": "botania:blocks/custombrick2" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/custombrick3slab.json b/src/main/resources/assets/botania/blockstates/custombrick3slab.json deleted file mode 100644 index 2fc064bea..000000000 --- a/src/main/resources/assets/botania/blockstates/custombrick3slab.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/custombrick3", - "top": "botania:blocks/custombrick3", - "side": "botania:blocks/custombrick3" - } - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/custombrick3slabfull.json b/src/main/resources/assets/botania/blockstates/custombrick3slabfull.json deleted file mode 100644 index ba3443a9b..000000000 --- a/src/main/resources/assets/botania/blockstates/custombrick3slabfull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/custombrick3" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/custombrick3stairs.json b/src/main/resources/assets/botania/blockstates/custombrick3stairs.json deleted file mode 100644 index de78d0055..000000000 --- a/src/main/resources/assets/botania/blockstates/custombrick3stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/custombrick3", - "top": "botania:blocks/custombrick3", - "side": "botania:blocks/custombrick3" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/daffomill.json b/src/main/resources/assets/botania/blockstates/daffomill.json index d8864e463..ff3596158 100644 --- a/src/main/resources/assets/botania/blockstates/daffomill.json +++ b/src/main/resources/assets/botania/blockstates/daffomill.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/daffomill" + "cross": "botania:blocks/flower_func_daffomill" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/daffomill" + "layer0": "botania:blocks/flower_func_daffomill" } }] } diff --git a/src/main/resources/assets/botania/blockstates/dandelifeon.json b/src/main/resources/assets/botania/blockstates/dandelifeon.json index afd8fd88b..9b5371a20 100644 --- a/src/main/resources/assets/botania/blockstates/dandelifeon.json +++ b/src/main/resources/assets/botania/blockstates/dandelifeon.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/dandelifeon" + "cross": "botania:blocks/flower_gen_dandelifeon" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/dandelifeon" + "layer0": "botania:blocks/flower_gen_dandelifeon" } }] } diff --git a/src/main/resources/assets/botania/blockstates/daybloom.json b/src/main/resources/assets/botania/blockstates/daybloom.json deleted file mode 100644 index 3039b1ff2..000000000 --- a/src/main/resources/assets/botania/blockstates/daybloom.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "botania:shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/daybloom" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/daybloom" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/daybloomdecor.json b/src/main/resources/assets/botania/blockstates/daybloomdecor.json deleted file mode 100644 index f015b1f18..000000000 --- a/src/main/resources/assets/botania/blockstates/daybloomdecor.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "botania:shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/daybloomdecor" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/daybloomdecor" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/daybloomprime.json b/src/main/resources/assets/botania/blockstates/daybloomprime.json deleted file mode 100644 index dc5887d1b..000000000 --- a/src/main/resources/assets/botania/blockstates/daybloomprime.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "botania:shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/daybloomprime" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/daybloomprime" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dirtpath.json b/src/main/resources/assets/botania/blockstates/dirtpath.json deleted file mode 100644 index dba05d34f..000000000 --- a/src/main/resources/assets/botania/blockstates/dirtpath.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "botania:trodden_dirt" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dirtpath0slab.json b/src/main/resources/assets/botania/blockstates/dirtpath0slab.json deleted file mode 100644 index a88ef1c64..000000000 --- a/src/main/resources/assets/botania/blockstates/dirtpath0slab.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "minecraft:blocks/grass_path_top", - "top": "minecraft:blocks/grass_path_top", - "side": "minecraft:blocks/grass_path_top" - } - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dirtpath0slabfull.json b/src/main/resources/assets/botania/blockstates/dirtpath0slabfull.json deleted file mode 100644 index 8c1f76359..000000000 --- a/src/main/resources/assets/botania/blockstates/dirtpath0slabfull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "minecraft:blocks/grass_path_top" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreadthorn.json b/src/main/resources/assets/botania/blockstates/dreadthorn.json index ea12ba1a0..f79652791 100644 --- a/src/main/resources/assets/botania/blockstates/dreadthorn.json +++ b/src/main/resources/assets/botania/blockstates/dreadthorn.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/dreadthorn" + "cross": "botania:blocks/flower_func_dreadthorne" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/dreadthorn" + "layer0": "botania:blocks/flower_func_dreadthorne" } }] } diff --git a/src/main/resources/assets/botania/blockstates/endoflame.json b/src/main/resources/assets/botania/blockstates/endoflame.json index 39e033093..45ea75dc7 100644 --- a/src/main/resources/assets/botania/blockstates/endoflame.json +++ b/src/main/resources/assets/botania/blockstates/endoflame.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/endoflame" + "cross": "botania:blocks/flower_gen_endoflame" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/endoflame" + "layer0": "botania:blocks/flower_gen_endoflame" } }] } diff --git a/src/main/resources/assets/botania/blockstates/entropinnyum.json b/src/main/resources/assets/botania/blockstates/entropinnyum.json index c34f0cae3..023b98914 100644 --- a/src/main/resources/assets/botania/blockstates/entropinnyum.json +++ b/src/main/resources/assets/botania/blockstates/entropinnyum.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/entropinnyum" + "cross": "botania:blocks/flower_gen_entropinnyum" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/entropinnyum" + "layer0": "botania:blocks/flower_gen_entropinnyum" } }] } diff --git a/src/main/resources/assets/botania/blockstates/exoflame.json b/src/main/resources/assets/botania/blockstates/exoflame.json index 81b76d343..3571ef029 100644 --- a/src/main/resources/assets/botania/blockstates/exoflame.json +++ b/src/main/resources/assets/botania/blockstates/exoflame.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/exoflame" + "cross": "botania:blocks/flower_func_exoflame" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/exoflame" + "layer0": "botania:blocks/flower_func_exoflame" } }] } diff --git a/src/main/resources/assets/botania/blockstates/fallenkanade.json b/src/main/resources/assets/botania/blockstates/fallenkanade.json index e2fe2f834..d6f7a1dab 100644 --- a/src/main/resources/assets/botania/blockstates/fallenkanade.json +++ b/src/main/resources/assets/botania/blockstates/fallenkanade.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/fallenkanade" + "cross": "botania:blocks/flower_func_fallen_kanade" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/fallenkanade" + "layer0": "botania:blocks/flower_func_fallen_kanade" } }] } diff --git a/src/main/resources/assets/botania/blockstates/ghostrail.json b/src/main/resources/assets/botania/blockstates/ghostrail.json index 1104d7d6e..7b7b561bf 100644 --- a/src/main/resources/assets/botania/blockstates/ghostrail.json +++ b/src/main/resources/assets/botania/blockstates/ghostrail.json @@ -2,7 +2,7 @@ "forge_marker": 1, "defaults": { "textures": { - "rail": "botania:blocks/ghostrail" + "rail": "botania:blocks/rail_ghost" } }, "variants": { diff --git a/src/main/resources/assets/botania/blockstates/gourmaryllis.json b/src/main/resources/assets/botania/blockstates/gourmaryllis.json index 2416e8497..316ab8a10 100644 --- a/src/main/resources/assets/botania/blockstates/gourmaryllis.json +++ b/src/main/resources/assets/botania/blockstates/gourmaryllis.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/gourmaryllis" + "cross": "botania:blocks/flower_gen_gourmaryllis" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/gourmaryllis" + "layer0": "botania:blocks/flower_gen_gourmaryllis" } }] } diff --git a/src/main/resources/assets/botania/blockstates/heiseidream.json b/src/main/resources/assets/botania/blockstates/heiseidream.json index bee395cfe..0d9c445e9 100644 --- a/src/main/resources/assets/botania/blockstates/heiseidream.json +++ b/src/main/resources/assets/botania/blockstates/heiseidream.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/heiseidream" + "cross": "botania:blocks/flower_func_heisei_dream" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/heiseidream" + "layer0": "botania:blocks/flower_func_heisei_dream" } }] } diff --git a/src/main/resources/assets/botania/blockstates/hopperhock.json b/src/main/resources/assets/botania/blockstates/hopperhock.json index befced811..4b691e54b 100644 --- a/src/main/resources/assets/botania/blockstates/hopperhock.json +++ b/src/main/resources/assets/botania/blockstates/hopperhock.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/hopperhock" + "cross": "botania:blocks/flower_func_hopperhock" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/hopperhock" + "layer0": "botania:blocks/flower_func_hopperhock" } }] } diff --git a/src/main/resources/assets/botania/blockstates/hopperhockchibi.json b/src/main/resources/assets/botania/blockstates/hopperhockchibi.json index e37d213f6..30884e5c9 100644 --- a/src/main/resources/assets/botania/blockstates/hopperhockchibi.json +++ b/src/main/resources/assets/botania/blockstates/hopperhockchibi.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/hopperhockchibi" + "cross": "botania:blocks/flower_func_hopperhock_chibi" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/hopperhockchibi" + "layer0": "botania:blocks/flower_func_hopperhock_chibi" } }] } diff --git a/src/main/resources/assets/botania/blockstates/hyacidus.json b/src/main/resources/assets/botania/blockstates/hyacidus.json index 02f2e0543..83923a690 100644 --- a/src/main/resources/assets/botania/blockstates/hyacidus.json +++ b/src/main/resources/assets/botania/blockstates/hyacidus.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/hyacidus" + "cross": "botania:blocks/flower_func_hyacidus" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/hyacidus" + "layer0": "botania:blocks/flower_func_hyacidus" } }] } diff --git a/src/main/resources/assets/botania/blockstates/hydroangeas.json b/src/main/resources/assets/botania/blockstates/hydroangeas.json index a1d968249..936fe9d2f 100644 --- a/src/main/resources/assets/botania/blockstates/hydroangeas.json +++ b/src/main/resources/assets/botania/blockstates/hydroangeas.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/hydroangeas" + "cross": "botania:blocks/flower_gen_hydroangeas" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/hydroangeas" + "layer0": "botania:blocks/flower_gen_hydroangeas" } }] } diff --git a/src/main/resources/assets/botania/blockstates/hydroangeasdecor.json b/src/main/resources/assets/botania/blockstates/hydroangeasdecor.json index 12f613004..baf80f426 100644 --- a/src/main/resources/assets/botania/blockstates/hydroangeasdecor.json +++ b/src/main/resources/assets/botania/blockstates/hydroangeasdecor.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/hydroangeasdecor" + "cross": "botania:blocks/flower_gen_hydroangeas_decor" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/hydroangeasdecor" + "layer0": "botania:blocks/flower_gen_hydroangeas_decor" } }] } diff --git a/src/main/resources/assets/botania/blockstates/jadedamaranthus.json b/src/main/resources/assets/botania/blockstates/jadedamaranthus.json index 472f8eb8d..b7a9e01c6 100644 --- a/src/main/resources/assets/botania/blockstates/jadedamaranthus.json +++ b/src/main/resources/assets/botania/blockstates/jadedamaranthus.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/jadedamaranthus" + "cross": "botania:blocks/flower_func_jaded_amaranthus" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/jadedamaranthus" + "layer0": "botania:blocks/flower_func_jaded_amaranthus" } }] } diff --git a/src/main/resources/assets/botania/blockstates/jiyuulia.json b/src/main/resources/assets/botania/blockstates/jiyuulia.json index 84286f930..bfd07bf3c 100644 --- a/src/main/resources/assets/botania/blockstates/jiyuulia.json +++ b/src/main/resources/assets/botania/blockstates/jiyuulia.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/jiyuulia" + "cross": "botania:blocks/flower_func_jiyuulia" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/jiyuulia" + "layer0": "botania:blocks/flower_func_jiyuulia" } }] } diff --git a/src/main/resources/assets/botania/blockstates/kekimurus.json b/src/main/resources/assets/botania/blockstates/kekimurus.json index 0946b31b4..3df5abe0a 100644 --- a/src/main/resources/assets/botania/blockstates/kekimurus.json +++ b/src/main/resources/assets/botania/blockstates/kekimurus.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/kekimurus" + "cross": "botania:blocks/flower_gen_kekimurus" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/kekimurus" + "layer0": "botania:blocks/flower_gen_kekimurus" } }] } diff --git a/src/main/resources/assets/botania/blockstates/loonium.json b/src/main/resources/assets/botania/blockstates/loonium.json index 7f1c475ca..50f2501e9 100644 --- a/src/main/resources/assets/botania/blockstates/loonium.json +++ b/src/main/resources/assets/botania/blockstates/loonium.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/loonium" + "cross": "botania:blocks/flower_func_loonium" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/loonium" + "layer0": "botania:blocks/flower_func_loonium" } }] } diff --git a/src/main/resources/assets/botania/blockstates/managlasspane.json b/src/main/resources/assets/botania/blockstates/managlasspane.json index caf8cb10c..4c9589a98 100644 --- a/src/main/resources/assets/botania/blockstates/managlasspane.json +++ b/src/main/resources/assets/botania/blockstates/managlasspane.json @@ -3,8 +3,8 @@ "defaults": { "model": "minecraft:pane_post", "textures": { - "edge": "botania:blocks/managlasspane", - "pane": "botania:blocks/managlass" + "edge": "botania:blocks/mana_glass_pane", + "pane": "botania:blocks/manag_lass" } }, "variants": { diff --git a/src/main/resources/assets/botania/blockstates/manastar.json b/src/main/resources/assets/botania/blockstates/manastar.json index 231686329..e0b544c09 100644 --- a/src/main/resources/assets/botania/blockstates/manastar.json +++ b/src/main/resources/assets/botania/blockstates/manastar.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/manastar" + "cross": "botania:blocks/flower_misc_manastar" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/manastar" + "layer0": "botania:blocks/flower_misc_manastar" } }] } diff --git a/src/main/resources/assets/botania/blockstates/marimorphosis.json b/src/main/resources/assets/botania/blockstates/marimorphosis.json index dd45b4746..39852e75b 100644 --- a/src/main/resources/assets/botania/blockstates/marimorphosis.json +++ b/src/main/resources/assets/botania/blockstates/marimorphosis.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/marimorphosis" + "cross": "botania:blocks/flower_func_marimorphosis" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/marimorphosis" + "layer0": "botania:blocks/flower_func_marimorphosis" } }] } diff --git a/src/main/resources/assets/botania/blockstates/marimorphosischibi.json b/src/main/resources/assets/botania/blockstates/marimorphosischibi.json index 0eec589e4..6b45f462d 100644 --- a/src/main/resources/assets/botania/blockstates/marimorphosischibi.json +++ b/src/main/resources/assets/botania/blockstates/marimorphosischibi.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/marimorphosischibi" + "cross": "botania:blocks/flower_func_marimorphosis_chibi" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/marimorphosischibi" + "layer0": "botania:blocks/flower_func_marimorphosis_chibi" } }] } diff --git a/src/main/resources/assets/botania/blockstates/medumone.json b/src/main/resources/assets/botania/blockstates/medumone.json index 1de43a6d4..c80139214 100644 --- a/src/main/resources/assets/botania/blockstates/medumone.json +++ b/src/main/resources/assets/botania/blockstates/medumone.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/medumone" + "cross": "botania:blocks/flower_func_medumone" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/medumone" + "layer0": "botania:blocks/flower_func_medumone" } }] } diff --git a/src/main/resources/assets/botania/blockstates/munchdew.json b/src/main/resources/assets/botania/blockstates/munchdew.json index a17b88c1e..107f6325f 100644 --- a/src/main/resources/assets/botania/blockstates/munchdew.json +++ b/src/main/resources/assets/botania/blockstates/munchdew.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/munchdew" + "cross": "botania:blocks/flower_gen_munchdew" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/munchdew" + "layer0": "botania:blocks/flower_gen_munchdew" } }] } diff --git a/src/main/resources/assets/botania/blockstates/narslimmus.json b/src/main/resources/assets/botania/blockstates/narslimmus.json index a3b0f9be9..e4e6e1ac0 100644 --- a/src/main/resources/assets/botania/blockstates/narslimmus.json +++ b/src/main/resources/assets/botania/blockstates/narslimmus.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/narslimmus" + "cross": "botania:blocks/flower_gen_narslimmus" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/narslimmus" + "layer0": "botania:blocks/flower_gen_narslimmus" } }] } diff --git a/src/main/resources/assets/botania/blockstates/nightshade.json b/src/main/resources/assets/botania/blockstates/nightshade.json deleted file mode 100644 index 0b2df4378..000000000 --- a/src/main/resources/assets/botania/blockstates/nightshade.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "botania:shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/nightshade" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/nightshade" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/nightshadedecor.json b/src/main/resources/assets/botania/blockstates/nightshadedecor.json deleted file mode 100644 index dd566a012..000000000 --- a/src/main/resources/assets/botania/blockstates/nightshadedecor.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "botania:shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/nightshadedecor" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/nightshadedecor" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/nightshadeprime.json b/src/main/resources/assets/botania/blockstates/nightshadeprime.json deleted file mode 100644 index e6fc1e356..000000000 --- a/src/main/resources/assets/botania/blockstates/nightshadeprime.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "botania:shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/nightshadeprime" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/nightshadeprime" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/orechid.json b/src/main/resources/assets/botania/blockstates/orechid.json index 2d545ab0b..95ff44410 100644 --- a/src/main/resources/assets/botania/blockstates/orechid.json +++ b/src/main/resources/assets/botania/blockstates/orechid.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/orechid" + "cross": "botania:blocks/flower_func_orechid" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/orechid" + "layer0": "botania:blocks/flower_func_orechid" } }] } diff --git a/src/main/resources/assets/botania/blockstates/orechidignem.json b/src/main/resources/assets/botania/blockstates/orechidignem.json index 3cec6df01..dea84e4d3 100644 --- a/src/main/resources/assets/botania/blockstates/orechidignem.json +++ b/src/main/resources/assets/botania/blockstates/orechidignem.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/orechidignem" + "cross": "botania:blocks/flower_func_orechid_ignem" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/orechidignem" + "layer0": "botania:blocks/flower_func_orechid_ignem" } }] } diff --git a/src/main/resources/assets/botania/blockstates/pollidisiac.json b/src/main/resources/assets/botania/blockstates/pollidisiac.json index 0330d0445..aed09b0f5 100644 --- a/src/main/resources/assets/botania/blockstates/pollidisiac.json +++ b/src/main/resources/assets/botania/blockstates/pollidisiac.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/pollidisiac" + "cross": "botania:blocks/flower_func_pollidisiac" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/pollidisiac" + "layer0": "botania:blocks/flower_func_pollidisiac" } }] } diff --git a/src/main/resources/assets/botania/blockstates/puredaisy.json b/src/main/resources/assets/botania/blockstates/puredaisy.json index f2ee23af9..070938e6e 100644 --- a/src/main/resources/assets/botania/blockstates/puredaisy.json +++ b/src/main/resources/assets/botania/blockstates/puredaisy.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/puredaisy" + "cross": "botania:blocks/flower_misc_pure_daisy" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/puredaisy" + "layer0": "botania:blocks/flower_misc_pure_daisy" } }] } diff --git a/src/main/resources/assets/botania/blockstates/rafflowsia.json b/src/main/resources/assets/botania/blockstates/rafflowsia.json index 601c180d5..d9801c005 100644 --- a/src/main/resources/assets/botania/blockstates/rafflowsia.json +++ b/src/main/resources/assets/botania/blockstates/rafflowsia.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/rafflowsia" + "cross": "botania:blocks/flower_gen_rafflowsia" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/rafflowsia" + "layer0": "botania:blocks/flower_gen_rafflowsia" } }] } diff --git a/src/main/resources/assets/botania/blockstates/rannuncarpus.json b/src/main/resources/assets/botania/blockstates/rannuncarpus.json index 02998a79d..11c9f13b6 100644 --- a/src/main/resources/assets/botania/blockstates/rannuncarpus.json +++ b/src/main/resources/assets/botania/blockstates/rannuncarpus.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/rannuncarpus" + "cross": "botania:blocks/flower_func_rannuncarpus" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/rannuncarpus" + "layer0": "botania:blocks/flower_func_rannuncarpus" } }] } diff --git a/src/main/resources/assets/botania/blockstates/rannuncarpuschibi.json b/src/main/resources/assets/botania/blockstates/rannuncarpuschibi.json index 9c8c0e3d2..87d8c659a 100644 --- a/src/main/resources/assets/botania/blockstates/rannuncarpuschibi.json +++ b/src/main/resources/assets/botania/blockstates/rannuncarpuschibi.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/rannuncarpuschibi" + "cross": "botania:blocks/flower_func_rannuncarpus_chibi" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/rannuncarpuschibi" + "layer0": "botania:blocks/flower_func_rannuncarpus_chibi" } }] } diff --git a/src/main/resources/assets/botania/blockstates/solegnolia.json b/src/main/resources/assets/botania/blockstates/solegnolia.json index 53dee6310..07415f4cd 100644 --- a/src/main/resources/assets/botania/blockstates/solegnolia.json +++ b/src/main/resources/assets/botania/blockstates/solegnolia.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/solegnolia" + "cross": "botania:blocks/flower_func_solegnolia" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/solegnolia" + "layer0": "botania:blocks/flower_func_solegnolia" } }] } diff --git a/src/main/resources/assets/botania/blockstates/solegnoliachibi.json b/src/main/resources/assets/botania/blockstates/solegnoliachibi.json index 4cf2f8c64..8304effd1 100644 --- a/src/main/resources/assets/botania/blockstates/solegnoliachibi.json +++ b/src/main/resources/assets/botania/blockstates/solegnoliachibi.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/solegnoliachibi" + "cross": "botania:blocks/flower_func_solegnolia_chibi" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/solegnoliachibi" + "layer0": "botania:blocks/flower_func_solegnolia_chibi" } }] } diff --git a/src/main/resources/assets/botania/blockstates/spectranthemum.json b/src/main/resources/assets/botania/blockstates/spectranthemum.json index 7d5752c71..81e40c93f 100644 --- a/src/main/resources/assets/botania/blockstates/spectranthemum.json +++ b/src/main/resources/assets/botania/blockstates/spectranthemum.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/spectranthemum" + "cross": "botania:blocks/flower_func_spectranthemum" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/spectranthemum" + "layer0": "botania:blocks/flower_func_spectranthemum" } }] } diff --git a/src/main/resources/assets/botania/blockstates/spectrolus.json b/src/main/resources/assets/botania/blockstates/spectrolus.json index 8cc462bb8..280e68d09 100644 --- a/src/main/resources/assets/botania/blockstates/spectrolus.json +++ b/src/main/resources/assets/botania/blockstates/spectrolus.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/spectrolus" + "cross": "botania:blocks/flower_gen_spectrolus" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/spectrolus" + "layer0": "botania:blocks/flower_gen_spectrolus" } }] } diff --git a/src/main/resources/assets/botania/blockstates/tangleberrie.json b/src/main/resources/assets/botania/blockstates/tangleberrie.json index 7c3368d28..385b7886a 100644 --- a/src/main/resources/assets/botania/blockstates/tangleberrie.json +++ b/src/main/resources/assets/botania/blockstates/tangleberrie.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/tangleberrie" + "cross": "botania:blocks/flower_func_tangleberrie" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/tangleberrie" + "layer0": "botania:blocks/flower_func_tangleberrie" } }] } diff --git a/src/main/resources/assets/botania/blockstates/thermalily.json b/src/main/resources/assets/botania/blockstates/thermalily.json index 2c1dcc3d0..7ef8be6b7 100644 --- a/src/main/resources/assets/botania/blockstates/thermalily.json +++ b/src/main/resources/assets/botania/blockstates/thermalily.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/thermalily" + "cross": "botania:blocks/flower_gen_thermalily" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/thermalily" + "layer0": "botania:blocks/flower_gen_thermalily" } }] } diff --git a/src/main/resources/assets/botania/blockstates/tigerseye.json b/src/main/resources/assets/botania/blockstates/tigerseye.json index c6994913c..ebea27b5e 100644 --- a/src/main/resources/assets/botania/blockstates/tigerseye.json +++ b/src/main/resources/assets/botania/blockstates/tigerseye.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/tigerseye" + "cross": "botania:blocks/flower_func_tigerseye" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/tigerseye" + "layer0": "botania:blocks/flower_func_tigerseye" } }] } diff --git a/src/main/resources/assets/botania/blockstates/vinculotus.json b/src/main/resources/assets/botania/blockstates/vinculotus.json index 39faf2bd5..7dad051d1 100644 --- a/src/main/resources/assets/botania/blockstates/vinculotus.json +++ b/src/main/resources/assets/botania/blockstates/vinculotus.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/vinculotus" + "cross": "botania:blocks/flower_func_vinculotus" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/vinculotus" + "layer0": "botania:blocks/flower_func_vinculotus" } }] } diff --git a/src/main/resources/assets/botania/models/block/alfheim_portal.json b/src/main/resources/assets/botania/models/block/alfheim_portal.json index 4978ba6b6..644fe2eed 100644 --- a/src/main/resources/assets/botania/models/block/alfheim_portal.json +++ b/src/main/resources/assets/botania/models/block/alfheim_portal.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/alfheimportal0" + "all": "botania:blocks/alfheim_portal" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/alfheim_portal_on.json b/src/main/resources/assets/botania/models/block/alfheim_portal_on.json index bd3c16443..4d07316ef 100644 --- a/src/main/resources/assets/botania/models/block/alfheim_portal_on.json +++ b/src/main/resources/assets/botania/models/block/alfheim_portal_on.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/alfheimportal1" + "all": "botania:blocks/alfheim_portal_activated" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_1.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_1.json index eb6363d25..129423d90 100644 --- a/src/main/resources/assets/botania/models/block/bricks/azulejo_1.json +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_1.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/custombrick4" + "all": "botania:blocks/azulejo_1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_10.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_10.json index 6da7b45cf..e3d75c8d5 100644 --- a/src/main/resources/assets/botania/models/block/bricks/azulejo_10.json +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_10.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/custombrick13" + "all": "botania:blocks/azulejo_10" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_11.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_11.json index 13b95d5d2..984543a67 100644 --- a/src/main/resources/assets/botania/models/block/bricks/azulejo_11.json +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_11.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/custombrick14" + "all": "botania:blocks/azulejo_11" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_12.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_12.json index 75237d056..e96c22d2c 100644 --- a/src/main/resources/assets/botania/models/block/bricks/azulejo_12.json +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_12.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/custombrick15" + "all": "botania:blocks/azulejo_12" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_2.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_2.json index e9472b5e1..44f175ca6 100644 --- a/src/main/resources/assets/botania/models/block/bricks/azulejo_2.json +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_2.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/custombrick5" + "all": "botania:blocks/azulejo_2" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_3.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_3.json index 039b64868..769e01fc3 100644 --- a/src/main/resources/assets/botania/models/block/bricks/azulejo_3.json +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_3.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/custombrick6" + "all": "botania:blocks/azulejo_3" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_4.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_4.json index 06acbaead..d16a9dbc0 100644 --- a/src/main/resources/assets/botania/models/block/bricks/azulejo_4.json +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_4.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/custombrick7" + "all": "botania:blocks/azulejo_4" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_5.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_5.json index 27b6dc439..c074b8f60 100644 --- a/src/main/resources/assets/botania/models/block/bricks/azulejo_5.json +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_5.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/custombrick8" + "all": "botania:blocks/azulejo_5" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_6.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_6.json index 512ed80fb..b1d6e252f 100644 --- a/src/main/resources/assets/botania/models/block/bricks/azulejo_6.json +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_6.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/custombrick9" + "all": "botania:blocks/azulejo_6" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_7.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_7.json index 1a34b8c8d..23dbcc855 100644 --- a/src/main/resources/assets/botania/models/block/bricks/azulejo_7.json +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_7.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/custombrick10" + "all": "botania:blocks/azulejo_7" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_8.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_8.json index c64221182..6e758527c 100644 --- a/src/main/resources/assets/botania/models/block/bricks/azulejo_8.json +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_8.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/custombrick11" + "all": "botania:blocks/azulejo_8" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_9.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_9.json index 6c7ca586d..eea899b4d 100644 --- a/src/main/resources/assets/botania/models/block/bricks/azulejo_9.json +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_9.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/custombrick12" + "all": "botania:blocks/azulejo_9" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fel_pumpkin.json b/src/main/resources/assets/botania/models/block/fel_pumpkin.json index 305cfafe7..3dc817fed 100644 --- a/src/main/resources/assets/botania/models/block/fel_pumpkin.json +++ b/src/main/resources/assets/botania/models/block/fel_pumpkin.json @@ -2,7 +2,7 @@ "parent": "minecraft:block/orientable", "textures": { "top": "minecraft:blocks/pumpkin_top", - "front": "botania:blocks/felpumpkin", + "front": "botania:blocks/pumpkin_fel", "side": "minecraft:blocks/pumpkin_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/luminizer_launcher.json b/src/main/resources/assets/botania/models/block/luminizer_launcher.json index 40a419282..ef6d78c2f 100644 --- a/src/main/resources/assets/botania/models/block/luminizer_launcher.json +++ b/src/main/resources/assets/botania/models/block/luminizer_launcher.json @@ -1,8 +1,8 @@ { "parent": "botania:block/shapes/four_high_bottom_top", "textures": { - "bottom": "botania:blocks/lightlauncher", - "top": "botania:blocks/lightlauncher", - "side": "botania:blocks/lightlauncher" + "bottom": "botania:blocks/luminizer_launcher_top_bottom", + "top": "botania:blocks/luminizer_launcher_top_bottom", + "side": "botania:blocks/luminizer_launcher_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_glass.json b/src/main/resources/assets/botania/models/block/mana_glass.json index fad7df3dd..7b2c5222c 100644 --- a/src/main/resources/assets/botania/models/block/mana_glass.json +++ b/src/main/resources/assets/botania/models/block/mana_glass.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/managlass" + "all": "botania:blocks/mana_glass" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/manastorm_charge.json b/src/main/resources/assets/botania/models/block/manastorm_charge.json index efebe11fe..edc96b784 100644 --- a/src/main/resources/assets/botania/models/block/manastorm_charge.json +++ b/src/main/resources/assets/botania/models/block/manastorm_charge.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/manabomb" + "all": "botania:blocks/mana_bomb" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/prism.json b/src/main/resources/assets/botania/models/block/prism.json index 02cfd6f5a..b02996fb2 100644 --- a/src/main/resources/assets/botania/models/block/prism.json +++ b/src/main/resources/assets/botania/models/block/prism.json @@ -1,10 +1,10 @@ { "parent": "minecraft:block/block", "textures": { - "bottom": "botania:blocks/prism0", - "top": "botania:blocks/prism0", - "side": "botania:blocks/prism1", - "particle": "botania:blocks/prism1" + "bottom": "botania:blocks/prism_top_bottom", + "top": "botania:blocks/prism_top_bottom", + "side": "botania:blocks/prism_side", + "particle": "botania:blocks/prism_side" }, "elements": [ { diff --git a/src/main/resources/assets/botania/models/block/pylon.mtl b/src/main/resources/assets/botania/models/block/pylon.mtl deleted file mode 100644 index ad5f776b4..000000000 --- a/src/main/resources/assets/botania/models/block/pylon.mtl +++ /dev/null @@ -1,2 +0,0 @@ -newmtl pylon -map_Kd botania:model/pylon \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pylon.obj b/src/main/resources/assets/botania/models/block/pylon.obj deleted file mode 100644 index 25402aca1..000000000 --- a/src/main/resources/assets/botania/models/block/pylon.obj +++ /dev/null @@ -1,795 +0,0 @@ -# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware -# File Created: 01.04.2014 21:53:07 - -# -# object Crystal -# -mtllib pylon.mtl -v 0.5000 2.0000 -0.5000 -v 0.9174 1.3116 -0.5000 -v 0.5000 1.3116 -0.9174 -v 0.0826 1.3116 -0.5000 -v 0.5000 1.3116 -0.0826 -v 0.5000 0.0000 -0.5000 -# 6 vertices - -vn 0.6499 0.3941 -0.6499 -vn -0.6499 0.3941 -0.6499 -vn -0.6499 0.3941 0.6499 -vn 0.6499 0.3941 0.6499 -vn 0.6899 -0.2196 -0.6899 -vn -0.6899 -0.2196 -0.6899 -vn -0.6899 -0.2196 0.6899 -vn 0.6899 -0.2196 0.6899 -# 8 vertex normals - -vt 0.4766 0.1563 0.5000 -vt 0.3828 -0.0000 0.7639 -vt 0.5703 -0.0000 0.5000 -vt 0.4766 0.3125 0.5000 -vt 0.3828 0.1563 0.7639 -vt 0.5703 0.1563 0.5000 -vt 0.3828 -0.0000 0.2361 -vt 0.3828 0.1563 0.2361 -vt 0.1875 0.3594 0.7639 -vt 0.2813 -0.0000 0.5000 -vt 0.3750 0.3594 0.5000 -vt 0.0000 0.3594 0.2361 -vt 0.0938 -0.0000 0.5000 -vt 0.1875 0.3594 0.5000 -# 14 texture coords - -g Crystal -usemtl pylon -f 1/1/1 2/2/1 3/3/1 -f 1/4/2 3/5/2 4/6/2 -f 1/1/3 4/7/3 5/3/3 -f 1/4/4 5/8/4 2/6/4 -f 2/9/5 6/10/5 3/11/5 -f 3/9/6 6/10/6 4/11/6 -f 4/12/7 6/13/7 5/14/7 -f 5/12/8 6/13/8 2/14/8 -# 8 faces - -# -# object Ring_Panel03 -# - -v 0.4323 0.6361 -0.9729 -v 0.4323 1.4274 -0.9729 -v 0.2129 1.4274 -0.8816 -v 0.2129 0.6361 -0.8816 -v 0.3998 0.6361 -1.0510 -v 0.1804 0.6361 -0.9597 -v 0.1804 1.4274 -0.9597 -v 0.3998 1.4274 -1.0510 -# 8 vertices - -vn 0.3840 0.0000 0.9233 -vn -0.3840 -0.0000 -0.9233 -vn 0.0000 -1.0000 0.0000 -vn -0.9233 -0.0000 0.3840 -vn -0.0000 1.0000 -0.0000 -vn 0.9233 0.0000 -0.3840 -# 6 vertex normals - -vt 0.1172 0.5703 0.1259 -vt 0.1172 0.7813 0.1259 -vt 0.0234 0.7813 0.1993 -vt 0.0234 0.5703 0.1993 -vt 0.0234 0.5703 0.0631 -vt 0.1172 0.5703 0.1365 -vt 0.1172 0.7813 0.1365 -vt 0.0234 0.7813 0.0631 -vt 0.0234 0.5703 0.0005 -vt 0.1172 0.5703 0.0005 -vt 0.1172 0.5313 0.0005 -vt 0.0234 0.5313 0.0005 -vt 0.0234 0.5703 0.7339 -vt 0.0234 0.7813 0.7339 -vt 0.0000 0.7813 0.7604 -vt 0.0000 0.5703 0.7604 -vt 0.1172 0.5703 0.9995 -vt 0.0234 0.5703 0.9995 -vt 0.0234 0.5313 0.9995 -vt 0.1172 0.5313 0.9995 -vt 0.0000 0.7813 0.5552 -vt 0.0000 0.5703 0.5552 -vt 0.0234 0.5703 0.5817 -vt 0.0234 0.7813 0.5817 -# 24 texture coords - -g Ring_Panel03 -f 7/15/9 8/16/9 9/17/9 -f 9/17/9 10/18/9 7/15/9 - -f 11/19/10 12/20/10 13/21/10 -f 13/21/10 14/22/10 11/19/10 - -f 7/23/11 10/24/11 12/25/11 -f 12/25/11 11/26/11 7/23/11 - -f 10/27/12 9/28/12 13/29/12 -f 13/29/12 12/30/12 10/27/12 - -f 9/31/13 8/32/13 14/33/13 -f 14/33/13 13/34/13 9/31/13 - -f 8/35/14 7/36/14 11/37/14 -f 11/37/14 14/38/14 8/35/14 -# 12 faces - -# -# object Ring_Gem03 -# - -v 0.4670 0.9827 -0.9895 -v 0.4670 1.3321 -0.9895 -v 0.1766 1.3321 -0.8687 -v 0.1766 0.9827 -0.8687 -v 0.4091 0.9827 -1.1288 -v 0.1187 0.9827 -1.0080 -v 0.1187 1.3321 -1.0080 -v 0.4091 1.3321 -1.1288 -# 8 vertices - -vn 0.3840 0.0000 0.9233 -vn -0.3840 -0.0000 -0.9233 -vn 0.0000 -1.0000 0.0000 -vn -0.9233 -0.0000 0.3840 -vn -0.0000 1.0000 -0.0000 -vn 0.9233 0.0000 -0.3840 -# 6 vertex normals - -vt 0.2813 0.4141 0.1126 -vt 0.2813 0.5234 0.1126 -vt 0.1719 0.5234 0.2097 -vt 0.1719 0.4141 0.2097 -vt 0.0625 0.4141 0.0005 -vt 0.1719 0.4141 0.0977 -vt 0.1719 0.5234 0.0977 -vt 0.0625 0.5234 0.0005 -vt 0.0625 0.4141 0.4381 -vt 0.1719 0.4141 0.4381 -vt 0.1719 0.3672 0.4381 -vt 0.0625 0.3672 0.4381 -vt 0.0000 0.4141 0.7635 -vt 0.0000 0.5234 0.7635 -vt 0.0625 0.5234 0.8107 -vt 0.0625 0.4141 0.8107 -vt 0.1719 0.4141 0.8792 -vt 0.0625 0.4141 0.8792 -vt 0.0625 0.3672 0.8792 -vt 0.1719 0.3672 0.8792 -vt 0.0000 0.5234 0.5269 -vt 0.0000 0.4141 0.5269 -vt 0.0625 0.4141 0.5741 -vt 0.0625 0.5234 0.5741 -# 24 texture coords - -g Ring_Gem03 - -f 15/39/15 16/40/15 17/41/15 -f 17/41/15 18/42/15 15/39/15 - -f 19/43/16 20/44/16 21/45/16 -f 21/45/16 22/46/16 19/43/16 - -f 15/47/17 18/48/17 20/49/17 -f 20/49/17 19/50/17 15/47/17 - -f 18/51/18 17/52/18 21/53/18 -f 21/53/18 20/54/18 18/51/18 - -f 17/55/19 16/56/19 22/57/19 -f 22/57/19 21/58/19 17/55/19 - -f 16/59/20 15/60/20 19/61/20 -f 19/61/20 22/62/20 16/59/20 -# 12 faces - -# -# object Ring_Gem01 -# - -v 0.5330 0.9827 -0.0105 -v 0.5330 1.3321 -0.0105 -v 0.8234 1.3321 -0.1313 -v 0.8234 0.9827 -0.1313 -v 0.5909 0.9827 0.1288 -v 0.8813 0.9827 0.0080 -v 0.8813 1.3321 0.0080 -v 0.5909 1.3321 0.1288 -# 8 vertices - -vn -0.3840 0.0000 -0.9233 -vn 0.3840 -0.0000 0.9233 -vn -0.0000 -1.0000 -0.0000 -vn 0.9233 -0.0000 -0.3840 -vn 0.0000 1.0000 0.0000 -vn -0.9233 0.0000 0.3840 -# 6 vertex normals - -vt 0.2813 0.4141 0.1126 -vt 0.2813 0.5234 0.1126 -vt 0.1719 0.5234 0.2097 -vt 0.1719 0.4141 0.2097 -vt 0.0625 0.4141 0.0005 -vt 0.1719 0.4141 0.0977 -vt 0.1719 0.5234 0.0977 -vt 0.0625 0.5234 0.0005 -vt 0.0625 0.4141 0.4381 -vt 0.1719 0.4141 0.4381 -vt 0.1719 0.3672 0.4381 -vt 0.0625 0.3672 0.4381 -vt 0.0000 0.4141 0.7635 -vt 0.0000 0.5234 0.7635 -vt 0.0625 0.5234 0.8107 -vt 0.0625 0.4141 0.8107 -vt 0.1719 0.4141 0.8792 -vt 0.0625 0.4141 0.8792 -vt 0.0625 0.3672 0.8792 -vt 0.1719 0.3672 0.8792 -vt 0.0000 0.5234 0.5269 -vt 0.0000 0.4141 0.5269 -vt 0.0625 0.4141 0.5741 -vt 0.0625 0.5234 0.5741 -# 24 texture coords - -g Ring_Gem01 - -f 23/63/21 24/64/21 25/65/21 -f 25/65/21 26/66/21 23/63/21 - -f 27/67/22 28/68/22 29/69/22 -f 29/69/22 30/70/22 27/67/22 - -f 23/71/23 26/72/23 28/73/23 -f 28/73/23 27/74/23 23/71/23 - -f 26/75/24 25/76/24 29/77/24 -f 29/77/24 28/78/24 26/75/24 - -f 25/79/25 24/80/25 30/81/25 -f 30/81/25 29/82/25 25/79/25 - -f 24/83/26 23/84/26 27/85/26 -f 27/85/26 30/86/26 24/83/26 -# 12 faces - -# -# object Ring_Gem02 -# - -v 0.9895 0.9827 -0.5330 -v 0.9895 1.3321 -0.5330 -v 0.8687 1.3321 -0.8234 -v 0.8687 0.9827 -0.8234 -v 1.1288 0.9827 -0.5909 -v 1.0080 0.9827 -0.8813 -v 1.0080 1.3321 -0.8813 -v 1.1288 1.3321 -0.5909 -# 8 vertices - -vn -0.9233 0.0000 0.3840 -vn 0.9233 -0.0000 -0.3840 -vn -0.0000 -1.0000 0.0000 -vn -0.3840 -0.0000 -0.9233 -vn 0.0000 1.0000 -0.0000 -vn 0.3840 0.0000 0.9233 -# 6 vertex normals - -vt 0.2813 0.4141 0.1126 -vt 0.2813 0.5234 0.1126 -vt 0.1719 0.5234 0.2097 -vt 0.1719 0.4141 0.2097 -vt 0.0625 0.4141 0.0005 -vt 0.1719 0.4141 0.0977 -vt 0.1719 0.5234 0.0977 -vt 0.0625 0.5234 0.0005 -vt 0.0625 0.4141 0.4381 -vt 0.1719 0.4141 0.4381 -vt 0.1719 0.3672 0.4381 -vt 0.0625 0.3672 0.4381 -vt 0.0000 0.4141 0.7635 -vt 0.0000 0.5234 0.7635 -vt 0.0625 0.5234 0.8107 -vt 0.0625 0.4141 0.8107 -vt 0.1719 0.4141 0.8792 -vt 0.0625 0.4141 0.8792 -vt 0.0625 0.3672 0.8792 -vt 0.1719 0.3672 0.8792 -vt 0.0000 0.5234 0.5269 -vt 0.0000 0.4141 0.5269 -vt 0.0625 0.4141 0.5741 -vt 0.0625 0.5234 0.5741 -# 24 texture coords - -g Ring_Gem02 - -f 31/87/27 32/88/27 33/89/27 -f 33/89/27 34/90/27 31/87/27 - -f 35/91/28 36/92/28 37/93/28 -f 37/93/28 38/94/28 35/91/28 - -f 31/95/29 34/96/29 36/97/29 -f 36/97/29 35/98/29 31/95/29 - -f 34/99/30 33/100/30 37/101/30 -f 37/101/30 36/102/30 34/99/30 - -f 33/103/31 32/104/31 38/105/31 -f 38/105/31 37/106/31 33/103/31 - -f 32/107/32 31/108/32 35/109/32 -f 35/109/32 38/110/32 32/107/32 -# 12 faces - -# -# object Ring_Panel02 -# - -v 0.9729 0.6361 -0.5677 -v 0.9729 1.4274 -0.5677 -v 0.8816 1.4274 -0.7871 -v 0.8816 0.6361 -0.7871 -v 1.0510 0.6361 -0.6002 -v 0.9597 0.6361 -0.8196 -v 0.9597 1.4274 -0.8196 -v 1.0510 1.4274 -0.6002 -# 8 vertices - -vn -0.9233 0.0000 0.3840 -vn 0.9233 -0.0000 -0.3840 -vn -0.0000 -1.0000 0.0000 -vn -0.3840 -0.0000 -0.9233 -vn 0.0000 1.0000 -0.0000 -vn 0.3840 0.0000 0.9233 -# 6 vertex normals - -vt 0.1172 0.5703 0.1259 -vt 0.1172 0.7813 0.1259 -vt 0.0234 0.7813 0.1993 -vt 0.0234 0.5703 0.1993 -vt 0.0234 0.5703 0.0631 -vt 0.1172 0.5703 0.1365 -vt 0.1172 0.7813 0.1365 -vt 0.0234 0.7813 0.0631 -vt 0.0234 0.5703 0.0005 -vt 0.1172 0.5703 0.0005 -vt 0.1172 0.5313 0.0005 -vt 0.0234 0.5313 0.0005 -vt 0.0234 0.5703 0.7339 -vt 0.0234 0.7813 0.7339 -vt 0.0000 0.7813 0.7604 -vt 0.0000 0.5703 0.7604 -vt 0.1172 0.5703 0.9995 -vt 0.0234 0.5703 0.9995 -vt 0.0234 0.5313 0.9995 -vt 0.1172 0.5313 0.9995 -vt 0.0000 0.7813 0.5552 -vt 0.0000 0.5703 0.5552 -vt 0.0234 0.5703 0.5817 -vt 0.0234 0.7813 0.5817 -# 24 texture coords - -g Ring_Panel02 - -f 39/111/33 40/112/33 41/113/33 -f 41/113/33 42/114/33 39/111/33 - -f 43/115/34 44/116/34 45/117/34 -f 45/117/34 46/118/34 43/115/34 - -f 39/119/35 42/120/35 44/121/35 -f 44/121/35 43/122/35 39/119/35 - -f 42/123/36 41/124/36 45/125/36 -f 45/125/36 44/126/36 42/123/36 - -f 41/127/37 40/128/37 46/129/37 -f 46/129/37 45/130/37 41/127/37 - -f 40/131/38 39/132/38 43/133/38 -f 43/133/38 46/134/38 40/131/38 -# 12 faces - -# -# object Ring_Panel01 -# - -v 0.5677 0.6361 -0.0271 -v 0.5677 1.4274 -0.0271 -v 0.7871 1.4274 -0.1184 -v 0.7871 0.6361 -0.1184 -v 0.6002 0.6361 0.0510 -v 0.8196 0.6361 -0.0403 -v 0.8196 1.4274 -0.0403 -v 0.6002 1.4274 0.0510 -# 8 vertices - -vn -0.3840 0.0000 -0.9233 -vn 0.3840 -0.0000 0.9233 -vn -0.0000 -1.0000 -0.0000 -vn 0.9233 -0.0000 -0.3840 -vn 0.0000 1.0000 0.0000 -vn -0.9233 0.0000 0.3840 -# 6 vertex normals - -vt 0.1172 0.5703 0.1259 -vt 0.1172 0.7813 0.1259 -vt 0.0234 0.7813 0.1993 -vt 0.0234 0.5703 0.1993 -vt 0.0234 0.5703 0.0631 -vt 0.1172 0.5703 0.1365 -vt 0.1172 0.7813 0.1365 -vt 0.0234 0.7813 0.0631 -vt 0.0234 0.5703 0.0005 -vt 0.1172 0.5703 0.0005 -vt 0.1172 0.5313 0.0005 -vt 0.0234 0.5313 0.0005 -vt 0.0234 0.5703 0.7339 -vt 0.0234 0.7813 0.7339 -vt 0.0000 0.7813 0.7604 -vt 0.0000 0.5703 0.7604 -vt 0.1172 0.5703 0.9995 -vt 0.0234 0.5703 0.9995 -vt 0.0234 0.5313 0.9995 -vt 0.1172 0.5313 0.9995 -vt 0.0000 0.7813 0.5552 -vt 0.0000 0.5703 0.5552 -vt 0.0234 0.5703 0.5817 -vt 0.0234 0.7813 0.5817 -# 24 texture coords - -g Ring_Panel01 - -f 47/135/39 48/136/39 49/137/39 -f 49/137/39 50/138/39 47/135/39 - -f 51/139/40 52/140/40 53/141/40 -f 53/141/40 54/142/40 51/139/40 - -f 47/143/41 50/144/41 52/145/41 -f 52/145/41 51/146/41 47/143/41 - -f 50/147/42 49/148/42 53/149/42 -f 53/149/42 52/150/42 50/147/42 - -f 49/151/43 48/152/43 54/153/43 -f 54/153/43 53/154/43 49/151/43 - -f 48/155/44 47/156/44 51/157/44 -f 51/157/44 54/158/44 48/155/44 -# 12 faces - -# -# object Crystal_Ring -# - -v 0.5000 1.2101 -1.1130 -v 0.5000 1.2101 -0.9631 -v 0.8274 1.2101 -0.8274 -v 0.9335 1.2101 -0.9335 -v 0.5000 1.0601 -0.9631 -v 0.8274 1.0601 -0.8274 -v 0.5000 1.0601 -1.1130 -v 0.9335 1.0601 -0.9335 -v 0.9631 1.2101 -0.5000 -v 1.1130 1.2101 -0.5000 -v 0.9631 1.0601 -0.5000 -v 1.1130 1.0601 -0.5000 -v 0.8274 1.2101 -0.1726 -v 0.9335 1.2101 -0.0665 -v 0.8274 1.0601 -0.1726 -v 0.9335 1.0601 -0.0665 -v 0.5000 1.2101 -0.0369 -v 0.5000 1.2101 0.1130 -v 0.5000 1.0601 -0.0369 -v 0.5000 1.0601 0.1130 -v 0.1726 1.2101 -0.1726 -v 0.0665 1.2101 -0.0665 -v 0.1726 1.0601 -0.1726 -v 0.0665 1.0601 -0.0665 -v 0.0369 1.2101 -0.5000 -v -0.1130 1.2101 -0.5000 -v 0.0369 1.0601 -0.5000 -v -0.1130 1.0601 -0.5000 -v 0.1726 1.2101 -0.8274 -v 0.0665 1.2101 -0.9335 -v 0.1726 1.0601 -0.8274 -v 0.0665 1.0601 -0.9335 -# 32 vertices - -vn 0.0000 1.0000 -0.0000 -vn -0.3827 0.0000 0.9239 -vn 0.0000 -1.0000 -0.0000 -vn 0.3827 0.0000 -0.9239 -vn -0.9239 0.0000 0.3827 -vn 0.9239 0.0000 -0.3827 -vn -0.9239 0.0000 -0.3827 -vn 0.0000 -1.0000 0.0000 -vn 0.9239 0.0000 0.3827 -vn -0.3827 0.0000 -0.9239 -vn 0.3827 0.0000 0.9239 -vn -0.0000 -1.0000 0.0000 -vn -0.0000 -1.0000 -0.0000 -# 13 vertex normals - -vt 0.2578 0.5313 0.7252 -vt 0.2422 0.5781 0.7252 -vt 0.1406 0.5781 0.7252 -vt 0.1250 0.5313 0.7252 -vt 0.1250 0.6250 0.8789 -vt 0.1250 0.5859 0.8789 -vt 0.2578 0.5859 0.7697 -vt 0.2578 0.6250 0.7697 -vt 0.1406 0.5781 0.5358 -vt 0.1250 0.5313 0.5358 -vt 0.2578 0.5313 0.5358 -vt 0.2422 0.5781 0.5358 -vt 0.2578 0.5859 0.9995 -vt 0.2578 0.6250 0.9995 -vt 0.1250 0.6250 0.8551 -vt 0.1250 0.5859 0.8551 -vt 0.1250 0.6250 0.7668 -vt 0.1250 0.5859 0.7668 -vt 0.2578 0.5859 0.8773 -vt 0.2578 0.6250 0.8773 -vt 0.2578 0.5859 0.8532 -vt 0.2578 0.6250 0.8532 -vt 0.1250 0.6250 0.9995 -vt 0.1250 0.5859 0.9995 -vt 0.1250 0.6250 0.8773 -vt 0.1250 0.5859 0.8773 -vt 0.2578 0.5859 0.7668 -vt 0.2578 0.6250 0.7668 -vt 0.1250 0.6250 0.8532 -vt 0.1250 0.5859 0.8532 -vt 0.1250 0.6250 0.2429 -vt 0.1250 0.5859 0.2429 -vt 0.2578 0.5859 0.1338 -vt 0.2578 0.6250 0.1338 -vt 0.2578 0.5859 0.1576 -vt 0.2578 0.6250 0.1576 -vt 0.1250 0.6250 0.0132 -vt 0.1250 0.5859 0.0132 -vt 0.1250 0.6250 0.1338 -vt 0.1250 0.5859 0.1338 -vt 0.2578 0.5859 0.2429 -vt 0.2578 0.6250 0.2429 -vt 0.2578 0.5859 0.0132 -vt 0.2578 0.6250 0.0132 -vt 0.1250 0.6250 0.1576 -vt 0.1250 0.5859 0.1576 -vt 0.1250 0.6250 0.2332 -vt 0.1250 0.5859 0.2332 -vt 0.2578 0.5859 0.1227 -vt 0.2578 0.6250 0.1227 -vt 0.2578 0.5859 0.1468 -vt 0.2578 0.6250 0.1468 -vt 0.1250 0.6250 0.0005 -vt 0.1250 0.5859 0.0005 -vt 0.1250 0.6250 0.1227 -vt 0.1250 0.5859 0.1227 -vt 0.2578 0.5859 0.2332 -vt 0.2578 0.6250 0.2332 -vt 0.2578 0.5859 0.0005 -vt 0.2578 0.6250 0.0005 -vt 0.1250 0.6250 0.1468 -vt 0.1250 0.5859 0.1468 -vt 0.1250 0.6250 0.7697 -vt 0.1250 0.5859 0.7697 -vt 0.2578 0.5859 0.8789 -vt 0.2578 0.6250 0.8789 -vt 0.2578 0.5859 0.8551 -vt 0.2578 0.6250 0.8551 -# 68 texture coords - -g Crystal_Ring - -f 55/159/45 56/160/45 57/161/45 -f 57/161/45 58/162/45 55/159/45 -f 56/163/46 59/164/46 60/165/46 -f 60/165/46 57/166/46 56/163/46 -f 59/167/47 61/168/47 62/169/47 -f 62/169/47 60/170/47 59/167/47 -f 61/171/48 55/172/48 58/173/48 -f 58/173/48 62/174/48 61/171/48 -f 58/159/45 57/160/45 63/161/45 -f 63/161/45 64/162/45 58/159/45 -f 57/175/49 60/176/49 65/177/49 -f 65/177/49 63/178/49 57/175/49 -f 60/167/47 62/168/47 66/169/47 -f 66/169/47 65/170/47 60/167/47 -f 62/179/50 58/180/50 64/181/50 -f 64/181/50 66/182/50 62/179/50 -f 64/159/45 63/160/45 67/161/45 -f 67/161/45 68/162/45 64/159/45 -f 63/183/51 65/184/51 69/185/51 -f 69/185/51 67/186/51 63/183/51 -f 65/167/52 66/168/52 70/169/52 -f 70/169/52 69/170/52 65/167/52 -f 66/171/53 64/172/53 68/187/53 -f 68/187/53 70/188/53 66/171/53 -f 68/159/45 67/160/45 71/161/45 -f 71/161/45 72/162/45 68/159/45 -f 67/189/54 69/190/54 73/191/54 -f 73/191/54 71/192/54 67/189/54 -f 69/167/52 70/168/52 74/169/52 -f 74/169/52 73/170/52 69/167/52 -f 70/193/55 68/194/55 72/195/55 -f 72/195/55 74/196/55 70/193/55 -f 72/159/45 71/160/45 75/161/45 -f 75/161/45 76/162/45 72/159/45 -f 71/197/48 73/198/48 77/199/48 -f 77/199/48 75/200/48 71/197/48 -f 73/167/56 74/168/56 78/169/56 -f 78/169/56 77/170/56 73/167/56 -f 74/201/46 72/202/46 76/203/46 -f 76/203/46 78/204/46 74/201/46 -f 76/159/45 75/160/45 79/161/45 -f 79/161/45 80/162/45 76/159/45 -f 75/205/50 77/206/50 81/207/50 -f 81/207/50 79/208/50 75/205/50 -f 77/167/56 78/168/56 82/169/56 -f 82/169/56 81/170/56 77/167/56 -f 78/209/49 76/210/49 80/211/49 -f 80/211/49 82/212/49 78/209/49 -f 80/159/45 79/160/45 83/161/45 -f 83/161/45 84/162/45 80/159/45 -f 79/213/53 81/214/53 85/215/53 -f 85/215/53 83/216/53 79/213/53 -f 81/167/57 82/168/57 86/169/57 -f 86/169/57 85/170/57 81/167/57 -f 82/217/51 80/218/51 84/219/51 -f 84/219/51 86/220/51 82/217/51 -f 84/159/45 83/160/45 56/161/45 -f 56/161/45 55/162/45 84/159/45 -f 83/221/55 85/222/55 59/223/55 -f 59/223/55 56/224/55 83/221/55 -f 85/167/57 86/168/57 61/169/57 -f 61/169/57 59/170/57 85/167/57 -f 86/225/54 84/226/54 55/181/54 -f 55/181/54 61/182/54 86/225/54 -# 64 faces - -# -# object Ring_Gem04 -# - -v 0.0105 0.9827 -0.4670 -v 0.0105 1.3321 -0.4670 -v 0.1313 1.3321 -0.1766 -v 0.1313 0.9827 -0.1766 -v -0.1288 0.9827 -0.4091 -v -0.0080 0.9827 -0.1187 -v -0.0080 1.3321 -0.1187 -v -0.1288 1.3321 -0.4091 -# 8 vertices - -vn 0.9233 0.0000 -0.3840 -vn -0.9233 -0.0000 0.3840 -vn 0.0000 -1.0000 -0.0000 -vn 0.3840 -0.0000 0.9233 -vn -0.0000 1.0000 0.0000 -vn -0.3840 0.0000 -0.9233 -# 6 vertex normals - -vt 0.2813 0.4141 0.1126 -vt 0.2813 0.5234 0.1126 -vt 0.1719 0.5234 0.2097 -vt 0.1719 0.4141 0.2097 -vt 0.0625 0.4141 0.0005 -vt 0.1719 0.4141 0.0977 -vt 0.1719 0.5234 0.0977 -vt 0.0625 0.5234 0.0005 -vt 0.0625 0.4141 0.4381 -vt 0.1719 0.4141 0.4381 -vt 0.1719 0.3672 0.4381 -vt 0.0625 0.3672 0.4381 -vt 0.0000 0.4141 0.7635 -vt 0.0000 0.5234 0.7635 -vt 0.0625 0.5234 0.8107 -vt 0.0625 0.4141 0.8107 -vt 0.1719 0.4141 0.8792 -vt 0.0625 0.4141 0.8792 -vt 0.0625 0.3672 0.8792 -vt 0.1719 0.3672 0.8792 -vt 0.0000 0.5234 0.5269 -vt 0.0000 0.4141 0.5269 -vt 0.0625 0.4141 0.5741 -vt 0.0625 0.5234 0.5741 -# 24 texture coords - -g Ring_Gem04 - -f 87/227/58 88/228/58 89/229/58 -f 89/229/58 90/230/58 87/227/58 - -f 91/231/59 92/232/59 93/233/59 -f 93/233/59 94/234/59 91/231/59 - -f 87/235/60 90/236/60 92/237/60 -f 92/237/60 91/238/60 87/235/60 - -f 90/239/61 89/240/61 93/241/61 -f 93/241/61 92/242/61 90/239/61 - -f 89/243/62 88/244/62 94/245/62 -f 94/245/62 93/246/62 89/243/62 - -f 88/247/63 87/248/63 91/249/63 -f 91/249/63 94/250/63 88/247/63 -# 12 faces - -# -# object Ring_Panel04 -# - -v 0.0271 0.6361 -0.4323 -v 0.0271 1.4274 -0.4323 -v 0.1184 1.4274 -0.2129 -v 0.1184 0.6361 -0.2129 -v -0.0510 0.6361 -0.3998 -v 0.0403 0.6361 -0.1804 -v 0.0403 1.4274 -0.1804 -v -0.0510 1.4274 -0.3998 -# 8 vertices - -vn 0.9233 0.0000 -0.3840 -vn -0.9233 -0.0000 0.3840 -vn 0.0000 -1.0000 -0.0000 -vn 0.3840 -0.0000 0.9233 -vn -0.0000 1.0000 0.0000 -vn -0.3840 0.0000 -0.9233 -# 6 vertex normals - -vt 0.1172 0.5703 0.1259 -vt 0.1172 0.7813 0.1259 -vt 0.0234 0.7813 0.1993 -vt 0.0234 0.5703 0.1993 -vt 0.0234 0.5703 0.0631 -vt 0.1172 0.5703 0.1365 -vt 0.1172 0.7813 0.1365 -vt 0.0234 0.7813 0.0631 -vt 0.0234 0.5703 0.0005 -vt 0.1172 0.5703 0.0005 -vt 0.1172 0.5313 0.0005 -vt 0.0234 0.5313 0.0005 -vt 0.0234 0.5703 0.7339 -vt 0.0234 0.7813 0.7339 -vt 0.0000 0.7813 0.7604 -vt 0.0000 0.5703 0.7604 -vt 0.1172 0.5703 0.9995 -vt 0.0234 0.5703 0.9995 -vt 0.0234 0.5313 0.9995 -vt 0.1172 0.5313 0.9995 -vt 0.0000 0.7813 0.5552 -vt 0.0000 0.5703 0.5552 -vt 0.0234 0.5703 0.5817 -vt 0.0234 0.7813 0.5817 -# 24 texture coords - -g Ring_Panel04 - -f 95/251/64 96/252/64 97/253/64 -f 97/253/64 98/254/64 95/251/64 - -f 99/255/65 100/256/65 101/257/65 -f 101/257/65 102/258/65 99/255/65 - -f 95/259/66 98/260/66 100/261/66 -f 100/261/66 99/262/66 95/259/66 - -f 98/263/67 97/264/67 101/265/67 -f 101/265/67 100/266/67 98/263/67 - -f 97/267/68 96/268/68 102/269/68 -f 102/269/68 101/270/68 97/267/68 - -f 96/271/69 95/272/69 99/273/69 -f 99/273/69 102/274/69 96/271/69 -# 12 faces - diff --git a/src/main/resources/assets/botania/models/block/runic_altar.json b/src/main/resources/assets/botania/models/block/runic_altar.json index 53f344137..65281e60c 100644 --- a/src/main/resources/assets/botania/models/block/runic_altar.json +++ b/src/main/resources/assets/botania/models/block/runic_altar.json @@ -2,9 +2,9 @@ "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", "parent": "minecraft:block/block", "textures": { - "bottom": "botania:blocks/runic_altar_0", - "up": "botania:blocks/runic_altar_1", - "side": "botania:blocks/runic_altar_2", + "bottom": "botania:blocks/runic_altar_bottom", + "up": "botania:blocks/runic_altar_top", + "side": "botania:blocks/runic_altar_side", "particle": "botania:blocks/livingrock0" }, "elements": [ diff --git a/src/main/resources/assets/botania/models/block/spark_tinkerer.json b/src/main/resources/assets/botania/models/block/spark_tinkerer.json index df0f1120a..c8ee38ef4 100644 --- a/src/main/resources/assets/botania/models/block/spark_tinkerer.json +++ b/src/main/resources/assets/botania/models/block/spark_tinkerer.json @@ -1,8 +1,8 @@ { "parent": "botania:block/shapes/three_high_bottom_top", "textures": { - "bottom": "botania:blocks/spark_tinkerer_0", - "up": "botania:blocks/spark_tinkerer_1", - "side": "botania:blocks/spark_tinkerer_2" + "bottom": "botania:blocks/spark_tinkerer_bottom", + "up": "botania:blocks/spark_tinkerer_top", + "side": "botania:blocks/spark_tinkerer_side" } } diff --git a/src/main/resources/assets/botania/models/block/starfield_creator.json b/src/main/resources/assets/botania/models/block/starfield_creator.json index f2e797e20..0d2276523 100644 --- a/src/main/resources/assets/botania/models/block/starfield_creator.json +++ b/src/main/resources/assets/botania/models/block/starfield_creator.json @@ -1,8 +1,8 @@ { "parent": "botania:block/shapes/four_high_bottom_top", "textures": { - "bottom": "botania:blocks/starfield0", - "top": "botania:blocks/starfield1", - "side": "botania:blocks/starfield2" + "bottom": "botania:blocks/starfield_bottom", + "top": "botania:blocks/starfield_top", + "side": "botania:blocks/starfield_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/craftpattern0.json b/src/main/resources/assets/botania/models/item/craftpattern0.json index 62902d994..d49147b17 100644 --- a/src/main/resources/assets/botania/models/item/craftpattern0.json +++ b/src/main/resources/assets/botania/models/item/craftpattern0.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/craftpattern0" + "layer0": "botania:items/crafting_pattern_0" } } diff --git a/src/main/resources/assets/botania/models/item/craftpattern1.json b/src/main/resources/assets/botania/models/item/craftpattern1.json index bb6d7ced5..16acd71be 100644 --- a/src/main/resources/assets/botania/models/item/craftpattern1.json +++ b/src/main/resources/assets/botania/models/item/craftpattern1.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/craftpattern1" + "layer0": "botania:items/crafting_pattern_1" } } diff --git a/src/main/resources/assets/botania/models/item/craftpattern2.json b/src/main/resources/assets/botania/models/item/craftpattern2.json index 381c60e29..179a3f683 100644 --- a/src/main/resources/assets/botania/models/item/craftpattern2.json +++ b/src/main/resources/assets/botania/models/item/craftpattern2.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/craftpattern2" + "layer0": "botania:items/crafting_pattern_2" } } diff --git a/src/main/resources/assets/botania/models/item/craftpattern3.json b/src/main/resources/assets/botania/models/item/craftpattern3.json index 761ec3d8d..a0c5fb6fe 100644 --- a/src/main/resources/assets/botania/models/item/craftpattern3.json +++ b/src/main/resources/assets/botania/models/item/craftpattern3.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/craftpattern3" + "layer0": "botania:items/crafting_pattern_3" } } diff --git a/src/main/resources/assets/botania/models/item/craftpattern4.json b/src/main/resources/assets/botania/models/item/craftpattern4.json index 1103f82e7..2680367ae 100644 --- a/src/main/resources/assets/botania/models/item/craftpattern4.json +++ b/src/main/resources/assets/botania/models/item/craftpattern4.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/craftpattern4" + "layer0": "botania:items/crafting_pattern_4" } } diff --git a/src/main/resources/assets/botania/models/item/craftpattern5.json b/src/main/resources/assets/botania/models/item/craftpattern5.json index 13a64f330..f525b3cdd 100644 --- a/src/main/resources/assets/botania/models/item/craftpattern5.json +++ b/src/main/resources/assets/botania/models/item/craftpattern5.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/craftpattern5" + "layer0": "botania:items/crafting_pattern_5" } } diff --git a/src/main/resources/assets/botania/models/item/craftpattern6.json b/src/main/resources/assets/botania/models/item/craftpattern6.json index 0a74f2cd9..57da0c670 100644 --- a/src/main/resources/assets/botania/models/item/craftpattern6.json +++ b/src/main/resources/assets/botania/models/item/craftpattern6.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/craftpattern6" + "layer0": "botania:items/crafting_pattern_6" } } diff --git a/src/main/resources/assets/botania/models/item/craftpattern7.json b/src/main/resources/assets/botania/models/item/craftpattern7.json index ccd13514d..8b70061ff 100644 --- a/src/main/resources/assets/botania/models/item/craftpattern7.json +++ b/src/main/resources/assets/botania/models/item/craftpattern7.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/craftpattern7" + "layer0": "botania:items/crafting_pattern_7" } } diff --git a/src/main/resources/assets/botania/models/item/craftpattern8.json b/src/main/resources/assets/botania/models/item/craftpattern8.json index caf7e4f80..f72d9b54d 100644 --- a/src/main/resources/assets/botania/models/item/craftpattern8.json +++ b/src/main/resources/assets/botania/models/item/craftpattern8.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/craftpattern8" + "layer0": "botania:items/crafting_pattern_8" } } diff --git a/src/main/resources/assets/botania/models/item/itemblock/ghost_rail.json b/src/main/resources/assets/botania/models/item/itemblock/ghost_rail.json index 12b64d196..cf9af4d48 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/ghost_rail.json +++ b/src/main/resources/assets/botania/models/item/itemblock/ghost_rail.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/ghostrail" + "layer0": "botania:blocks/rail_ghost" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/managlass_pane.json b/src/main/resources/assets/botania/models/item/itemblock/managlass_pane.json index 5b0e25376..1dd1e3c58 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/managlass_pane.json +++ b/src/main/resources/assets/botania/models/item/itemblock/managlass_pane.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/managlass" + "layer0": "botania:blocks/mana_glass" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensbounce.json b/src/main/resources/assets/botania/models/item/lensbounce.json index 2ef9ff119..57d89a4bc 100644 --- a/src/main/resources/assets/botania/models/item/lensbounce.json +++ b/src/main/resources/assets/botania/models/item/lensbounce.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lens_inside", + "layer0": "botania:items/lens", "layer1": "botania:items/lens_bounce" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensdamage.json b/src/main/resources/assets/botania/models/item/lensdamage.json index f13d73d06..5a698a8ac 100644 --- a/src/main/resources/assets/botania/models/item/lensdamage.json +++ b/src/main/resources/assets/botania/models/item/lensdamage.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lens_inside", + "layer0": "botania:items/lens", "layer1": "botania:items/lens_damage" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensefficiency.json b/src/main/resources/assets/botania/models/item/lensefficiency.json index 3b6d52180..efe4acc50 100644 --- a/src/main/resources/assets/botania/models/item/lensefficiency.json +++ b/src/main/resources/assets/botania/models/item/lensefficiency.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lens_inside", + "layer0": "botania:items/lens", "layer1": "botania:items/lens_efficiency" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensexplosive.json b/src/main/resources/assets/botania/models/item/lensexplosive.json index 8a4301d87..2543a3d0e 100644 --- a/src/main/resources/assets/botania/models/item/lensexplosive.json +++ b/src/main/resources/assets/botania/models/item/lensexplosive.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lens_inside", + "layer0": "botania:items/lens", "layer1": "botania:items/lens_explosive" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensfire.json b/src/main/resources/assets/botania/models/item/lensfire.json index f0d011226..42be3fc5a 100644 --- a/src/main/resources/assets/botania/models/item/lensfire.json +++ b/src/main/resources/assets/botania/models/item/lensfire.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lens_inside", + "layer0": "botania:items/lens", "layer1": "botania:items/lens_fire" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensfirework.json b/src/main/resources/assets/botania/models/item/lensfirework.json index 32cff0b16..3aac6b412 100644 --- a/src/main/resources/assets/botania/models/item/lensfirework.json +++ b/src/main/resources/assets/botania/models/item/lensfirework.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lens_inside", + "layer0": "botania:items/lens", "layer1": "botania:items/lens_firework" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensflare.json b/src/main/resources/assets/botania/models/item/lensflare.json index 5ef84c01e..7b988b6be 100644 --- a/src/main/resources/assets/botania/models/item/lensflare.json +++ b/src/main/resources/assets/botania/models/item/lensflare.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lens_inside", + "layer0": "botania:items/lens", "layer1": "botania:items/lens_flare" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensgravity.json b/src/main/resources/assets/botania/models/item/lensgravity.json index 3a2e039ac..f54d26af5 100644 --- a/src/main/resources/assets/botania/models/item/lensgravity.json +++ b/src/main/resources/assets/botania/models/item/lensgravity.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lens_inside", + "layer0": "botania:items/lens", "layer1": "botania:items/lens_gravity" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensinfluence.json b/src/main/resources/assets/botania/models/item/lensinfluence.json index 5e5565ae3..e37f3b510 100644 --- a/src/main/resources/assets/botania/models/item/lensinfluence.json +++ b/src/main/resources/assets/botania/models/item/lensinfluence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lens_inside", + "layer0": "botania:items/lens", "layer1": "botania:items/lens_influence" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lenslight.json b/src/main/resources/assets/botania/models/item/lenslight.json index 7fdf39f89..2e3a9a9c3 100644 --- a/src/main/resources/assets/botania/models/item/lenslight.json +++ b/src/main/resources/assets/botania/models/item/lenslight.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lens_inside", + "layer0": "botania:items/lens", "layer1": "botania:items/lens_light" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensmagnet.json b/src/main/resources/assets/botania/models/item/lensmagnet.json index 9e4c99c1a..d56d9c81a 100644 --- a/src/main/resources/assets/botania/models/item/lensmagnet.json +++ b/src/main/resources/assets/botania/models/item/lensmagnet.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lens_inside", + "layer0": "botania:items/lens", "layer1": "botania:items/lens_magnet" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensmessenger.json b/src/main/resources/assets/botania/models/item/lensmessenger.json index c68eb4125..fc6a14896 100644 --- a/src/main/resources/assets/botania/models/item/lensmessenger.json +++ b/src/main/resources/assets/botania/models/item/lensmessenger.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lens_inside", + "layer0": "botania:items/lens", "layer1": "botania:items/lens_messenger" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensmine.json b/src/main/resources/assets/botania/models/item/lensmine.json index aa1a12ef9..dc327b487 100644 --- a/src/main/resources/assets/botania/models/item/lensmine.json +++ b/src/main/resources/assets/botania/models/item/lensmine.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lens_inside", + "layer0": "botania:items/lens", "layer1": "botania:items/lens_mine" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensnormal.json b/src/main/resources/assets/botania/models/item/lensnormal.json index 2b551ce8b..f1f3682cc 100644 --- a/src/main/resources/assets/botania/models/item/lensnormal.json +++ b/src/main/resources/assets/botania/models/item/lensnormal.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lens_inside", + "layer0": "botania:items/lens", "layer1": "botania:items/lens_normal" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lenspaint.json b/src/main/resources/assets/botania/models/item/lenspaint.json index 990d5ffb3..8b87e32c8 100644 --- a/src/main/resources/assets/botania/models/item/lenspaint.json +++ b/src/main/resources/assets/botania/models/item/lenspaint.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lens_inside", + "layer0": "botania:items/lens", "layer1": "botania:items/lens_paint" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensphantom.json b/src/main/resources/assets/botania/models/item/lensphantom.json index 8693b81ae..19f11f931 100644 --- a/src/main/resources/assets/botania/models/item/lensphantom.json +++ b/src/main/resources/assets/botania/models/item/lensphantom.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lens_inside", + "layer0": "botania:items/lens", "layer1": "botania:items/lens_phantom" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lenspiston.json b/src/main/resources/assets/botania/models/item/lenspiston.json index eed9807c4..687745f98 100644 --- a/src/main/resources/assets/botania/models/item/lenspiston.json +++ b/src/main/resources/assets/botania/models/item/lenspiston.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lens_inside", + "layer0": "botania:items/lens", "layer1": "botania:items/lens_piston" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lenspower.json b/src/main/resources/assets/botania/models/item/lenspower.json index 320a9c022..a89aeee77 100644 --- a/src/main/resources/assets/botania/models/item/lenspower.json +++ b/src/main/resources/assets/botania/models/item/lenspower.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lens_inside", + "layer0": "botania:items/lens", "layer1": "botania:items/lens_power" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensredirect.json b/src/main/resources/assets/botania/models/item/lensredirect.json index 8dbae0d9b..8f37dd5d9 100644 --- a/src/main/resources/assets/botania/models/item/lensredirect.json +++ b/src/main/resources/assets/botania/models/item/lensredirect.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lens_inside", + "layer0": "botania:items/lens", "layer1": "botania:items/lens_redirect" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensspeed.json b/src/main/resources/assets/botania/models/item/lensspeed.json index 9d5315634..f4f1fb430 100644 --- a/src/main/resources/assets/botania/models/item/lensspeed.json +++ b/src/main/resources/assets/botania/models/item/lensspeed.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lens_inside", + "layer0": "botania:items/lens", "layer1": "botania:items/lens_speed" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lenstime.json b/src/main/resources/assets/botania/models/item/lenstime.json index 7a18dfe2e..0ef4c7b2d 100644 --- a/src/main/resources/assets/botania/models/item/lenstime.json +++ b/src/main/resources/assets/botania/models/item/lenstime.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lens_inside", + "layer0": "botania:items/lens", "layer1": "botania:items/lens_time" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lenstripwire.json b/src/main/resources/assets/botania/models/item/lenstripwire.json index fc550fc1d..e2d59caaf 100644 --- a/src/main/resources/assets/botania/models/item/lenstripwire.json +++ b/src/main/resources/assets/botania/models/item/lenstripwire.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lens_inside", + "layer0": "botania:items/lens", "layer1": "botania:items/lens_tripwire" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lenswarp.json b/src/main/resources/assets/botania/models/item/lenswarp.json index 0d493f828..53f2548d2 100644 --- a/src/main/resources/assets/botania/models/item/lenswarp.json +++ b/src/main/resources/assets/botania/models/item/lenswarp.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lens_inside", + "layer0": "botania:items/lens", "layer1": "botania:items/lens_warp" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensweight.json b/src/main/resources/assets/botania/models/item/lensweight.json index afea664db..ef2369e68 100644 --- a/src/main/resources/assets/botania/models/item/lensweight.json +++ b/src/main/resources/assets/botania/models/item/lensweight.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lens_inside", + "layer0": "botania:items/lens", "layer1": "botania:items/lens_weight" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/placeholder.json b/src/main/resources/assets/botania/models/item/placeholder.json index ae62a9935..008b787f1 100644 --- a/src/main/resources/assets/botania/models/item/placeholder.json +++ b/src/main/resources/assets/botania/models/item/placeholder.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/placeholder" + "layer0": "botania:items/crafting_place_holder" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/blocks/alfheimportal0.png b/src/main/resources/assets/botania/textures/blocks/alfheim_portal.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alfheimportal0.png rename to src/main/resources/assets/botania/textures/blocks/alfheim_portal.png diff --git a/src/main/resources/assets/botania/textures/blocks/alfheimportal1.png b/src/main/resources/assets/botania/textures/blocks/alfheim_portal_activated.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alfheimportal1.png rename to src/main/resources/assets/botania/textures/blocks/alfheim_portal_activated.png diff --git a/src/main/resources/assets/botania/textures/blocks/alfheimportal1.png.mcmeta b/src/main/resources/assets/botania/textures/blocks/alfheim_portal_activated.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alfheimportal1.png.mcmeta rename to src/main/resources/assets/botania/textures/blocks/alfheim_portal_activated.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/blocks/alfheimportalinside.png b/src/main/resources/assets/botania/textures/blocks/alfheim_portal_swirl.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alfheimportalinside.png rename to src/main/resources/assets/botania/textures/blocks/alfheim_portal_swirl.png diff --git a/src/main/resources/assets/botania/textures/blocks/alfheimportalinside.png.mcmeta b/src/main/resources/assets/botania/textures/blocks/alfheim_portal_swirl.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alfheimportalinside.png.mcmeta rename to src/main/resources/assets/botania/textures/blocks/alfheim_portal_swirl.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/blocks/azulejo_1.png b/src/main/resources/assets/botania/textures/blocks/azulejo_1.png new file mode 100644 index 000000000..05c219c42 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/azulejo_1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/azulejo_10.png b/src/main/resources/assets/botania/textures/blocks/azulejo_10.png new file mode 100644 index 000000000..20bc0f5db Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/azulejo_10.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/azulejo_11.png b/src/main/resources/assets/botania/textures/blocks/azulejo_11.png new file mode 100644 index 000000000..6a5bb8539 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/azulejo_11.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/azulejo_12.png b/src/main/resources/assets/botania/textures/blocks/azulejo_12.png new file mode 100644 index 000000000..dcd751826 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/azulejo_12.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/azulejo_2.png b/src/main/resources/assets/botania/textures/blocks/azulejo_2.png new file mode 100644 index 000000000..46ed2f610 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/azulejo_2.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/azulejo_3.png b/src/main/resources/assets/botania/textures/blocks/azulejo_3.png new file mode 100644 index 000000000..dec13efec Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/azulejo_3.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/azulejo_4.png b/src/main/resources/assets/botania/textures/blocks/azulejo_4.png new file mode 100644 index 000000000..db92d6880 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/azulejo_4.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/azulejo_5.png b/src/main/resources/assets/botania/textures/blocks/azulejo_5.png new file mode 100644 index 000000000..3b5315c7a Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/azulejo_5.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/azulejo_6.png b/src/main/resources/assets/botania/textures/blocks/azulejo_6.png new file mode 100644 index 000000000..b05aa4e59 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/azulejo_6.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/azulejo_7.png b/src/main/resources/assets/botania/textures/blocks/azulejo_7.png new file mode 100644 index 000000000..9f9c4639d Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/azulejo_7.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/azulejo_8.png b/src/main/resources/assets/botania/textures/blocks/azulejo_8.png new file mode 100644 index 000000000..71f97ab5e Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/azulejo_8.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/azulejo_9.png b/src/main/resources/assets/botania/textures/blocks/azulejo_9.png new file mode 100644 index 000000000..b7d458cbf Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/azulejo_9.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/cacophonium_block_top.png b/src/main/resources/assets/botania/textures/blocks/cacophonium_block_top.png index ea8cadc63..2f768f795 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/cacophonium_block_top.png and b/src/main/resources/assets/botania/textures/blocks/cacophonium_block_top.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/corporea_funnel_side.png b/src/main/resources/assets/botania/textures/blocks/corporea_funnel_side.png index 19a6304c8..55765ea4b 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/corporea_funnel_side.png and b/src/main/resources/assets/botania/textures/blocks/corporea_funnel_side.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/corporea_funnel_top_bottom.png b/src/main/resources/assets/botania/textures/blocks/corporea_funnel_top_bottom.png index 9d9fff395..ceb734318 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/corporea_funnel_top_bottom.png and b/src/main/resources/assets/botania/textures/blocks/corporea_funnel_top_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/corporea_interceptor_side.png b/src/main/resources/assets/botania/textures/blocks/corporea_interceptor_side.png index 6fdfb04b5..84d53a7b4 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/corporea_interceptor_side.png and b/src/main/resources/assets/botania/textures/blocks/corporea_interceptor_side.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/corporea_interceptor_top_bottom.png b/src/main/resources/assets/botania/textures/blocks/corporea_interceptor_top_bottom.png index 702671304..fb9e74392 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/corporea_interceptor_top_bottom.png and b/src/main/resources/assets/botania/textures/blocks/corporea_interceptor_top_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/corporea_retainer_side.png b/src/main/resources/assets/botania/textures/blocks/corporea_retainer_side.png index 76d5e5288..186482256 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/corporea_retainer_side.png and b/src/main/resources/assets/botania/textures/blocks/corporea_retainer_side.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/corporea_retainer_top_bottom.png b/src/main/resources/assets/botania/textures/blocks/corporea_retainer_top_bottom.png index 76d5e5288..f11cc61ce 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/corporea_retainer_top_bottom.png and b/src/main/resources/assets/botania/textures/blocks/corporea_retainer_top_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/custombrick10.png b/src/main/resources/assets/botania/textures/blocks/custombrick10.png deleted file mode 100644 index 26e7987cb..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/custombrick10.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/custombrick11.png b/src/main/resources/assets/botania/textures/blocks/custombrick11.png deleted file mode 100644 index 918cc941c..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/custombrick11.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/custombrick12.png b/src/main/resources/assets/botania/textures/blocks/custombrick12.png deleted file mode 100644 index 0ee577322..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/custombrick12.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/custombrick13.png b/src/main/resources/assets/botania/textures/blocks/custombrick13.png deleted file mode 100644 index e662e580c..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/custombrick13.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/custombrick14.png b/src/main/resources/assets/botania/textures/blocks/custombrick14.png deleted file mode 100644 index 54631f9c0..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/custombrick14.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/custombrick15.png b/src/main/resources/assets/botania/textures/blocks/custombrick15.png deleted file mode 100644 index 9aa4288e2..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/custombrick15.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/custombrick4.png b/src/main/resources/assets/botania/textures/blocks/custombrick4.png deleted file mode 100644 index fb7483f71..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/custombrick4.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/custombrick5.png b/src/main/resources/assets/botania/textures/blocks/custombrick5.png deleted file mode 100644 index a3b8d62b5..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/custombrick5.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/custombrick6.png b/src/main/resources/assets/botania/textures/blocks/custombrick6.png deleted file mode 100644 index e7ca49c88..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/custombrick6.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/custombrick7.png b/src/main/resources/assets/botania/textures/blocks/custombrick7.png deleted file mode 100644 index 5a386e554..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/custombrick7.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/custombrick8.png b/src/main/resources/assets/botania/textures/blocks/custombrick8.png deleted file mode 100644 index a5bb1776a..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/custombrick8.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/custombrick9.png b/src/main/resources/assets/botania/textures/blocks/custombrick9.png deleted file mode 100644 index de72fd607..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/custombrick9.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/dreamwood1.png b/src/main/resources/assets/botania/textures/blocks/dreamwood1.png index cc50e8f2e..4eab6b00e 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/dreamwood1.png and b/src/main/resources/assets/botania/textures/blocks/dreamwood1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/dreamwood2.png b/src/main/resources/assets/botania/textures/blocks/dreamwood2.png index baba7bd9c..91a9f4824 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/dreamwood2.png and b/src/main/resources/assets/botania/textures/blocks/dreamwood2.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/dreamwood3.png b/src/main/resources/assets/botania/textures/blocks/dreamwood3.png index bb52e4dcd..e7d5cbbea 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/dreamwood3.png and b/src/main/resources/assets/botania/textures/blocks/dreamwood3.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/dreamwood4.png b/src/main/resources/assets/botania/textures/blocks/dreamwood4.png index 61faa0363..d91a306c6 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/dreamwood4.png and b/src/main/resources/assets/botania/textures/blocks/dreamwood4.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/agricarnation.png b/src/main/resources/assets/botania/textures/blocks/flower_func_agricarnation.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/agricarnation.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_agricarnation.png diff --git a/src/main/resources/assets/botania/textures/blocks/agricarnationchibi.png b/src/main/resources/assets/botania/textures/blocks/flower_func_agricarnation_chibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/agricarnationchibi.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_agricarnation_chibi.png diff --git a/src/main/resources/assets/botania/textures/blocks/bellethorn.png b/src/main/resources/assets/botania/textures/blocks/flower_func_bellethorne.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/bellethorn.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_bellethorne.png diff --git a/src/main/resources/assets/botania/textures/blocks/bellethornchibi.png b/src/main/resources/assets/botania/textures/blocks/flower_func_bellethorne_chibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/bellethornchibi.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_bellethorne_chibi.png diff --git a/src/main/resources/assets/botania/textures/blocks/bergamute.png b/src/main/resources/assets/botania/textures/blocks/flower_func_bergamute.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/bergamute.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_bergamute.png diff --git a/src/main/resources/assets/botania/textures/blocks/bubbell.png b/src/main/resources/assets/botania/textures/blocks/flower_func_bubbell.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/bubbell.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_bubbell.png diff --git a/src/main/resources/assets/botania/textures/blocks/bubbellchibi.png b/src/main/resources/assets/botania/textures/blocks/flower_func_bubbell_chibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/bubbellchibi.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_bubbell_chibi.png diff --git a/src/main/resources/assets/botania/textures/blocks/clayconia.png b/src/main/resources/assets/botania/textures/blocks/flower_func_clayconia.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/clayconia.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_clayconia.png diff --git a/src/main/resources/assets/botania/textures/blocks/clayconiachibi.png b/src/main/resources/assets/botania/textures/blocks/flower_func_clayconia_chibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/clayconiachibi.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_clayconia_chibi.png diff --git a/src/main/resources/assets/botania/textures/blocks/daffomill.png b/src/main/resources/assets/botania/textures/blocks/flower_func_daffomill.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/daffomill.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_daffomill.png diff --git a/src/main/resources/assets/botania/textures/blocks/dreadthorn.png b/src/main/resources/assets/botania/textures/blocks/flower_func_dreadthorne.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/dreadthorn.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_dreadthorne.png diff --git a/src/main/resources/assets/botania/textures/blocks/exoflame.png b/src/main/resources/assets/botania/textures/blocks/flower_func_exoflame.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/exoflame.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_exoflame.png diff --git a/src/main/resources/assets/botania/textures/blocks/fallenkanade.png b/src/main/resources/assets/botania/textures/blocks/flower_func_fallen_kanade.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/fallenkanade.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_fallen_kanade.png diff --git a/src/main/resources/assets/botania/textures/blocks/heiseidream.png b/src/main/resources/assets/botania/textures/blocks/flower_func_heisei_dream.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/heiseidream.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_heisei_dream.png diff --git a/src/main/resources/assets/botania/textures/blocks/hopperhock.png b/src/main/resources/assets/botania/textures/blocks/flower_func_hopperhock.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/hopperhock.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_hopperhock.png diff --git a/src/main/resources/assets/botania/textures/blocks/hopperhockchibi.png b/src/main/resources/assets/botania/textures/blocks/flower_func_hopperhock_chibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/hopperhockchibi.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_hopperhock_chibi.png diff --git a/src/main/resources/assets/botania/textures/blocks/hyacidus.png b/src/main/resources/assets/botania/textures/blocks/flower_func_hyacidus.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/hyacidus.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_hyacidus.png diff --git a/src/main/resources/assets/botania/textures/blocks/jadedamaranthus.png b/src/main/resources/assets/botania/textures/blocks/flower_func_jaded_amaranthus.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/jadedamaranthus.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_jaded_amaranthus.png diff --git a/src/main/resources/assets/botania/textures/blocks/jiyuulia.png b/src/main/resources/assets/botania/textures/blocks/flower_func_jiyuulia.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/jiyuulia.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_jiyuulia.png diff --git a/src/main/resources/assets/botania/textures/blocks/loonium.png b/src/main/resources/assets/botania/textures/blocks/flower_func_loonium.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/loonium.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_loonium.png diff --git a/src/main/resources/assets/botania/textures/blocks/marimorphosis.png b/src/main/resources/assets/botania/textures/blocks/flower_func_marimorphosis.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/marimorphosis.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_marimorphosis.png diff --git a/src/main/resources/assets/botania/textures/blocks/marimorphosischibi.png b/src/main/resources/assets/botania/textures/blocks/flower_func_marimorphosis_chibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/marimorphosischibi.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_marimorphosis_chibi.png diff --git a/src/main/resources/assets/botania/textures/blocks/medumone.png b/src/main/resources/assets/botania/textures/blocks/flower_func_medumone.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/medumone.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_medumone.png diff --git a/src/main/resources/assets/botania/textures/blocks/orechid.png b/src/main/resources/assets/botania/textures/blocks/flower_func_orechid.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/orechid.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_orechid.png diff --git a/src/main/resources/assets/botania/textures/blocks/orechidignem.png b/src/main/resources/assets/botania/textures/blocks/flower_func_orechid_ignem.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/orechidignem.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_orechid_ignem.png diff --git a/src/main/resources/assets/botania/textures/blocks/pollidisiac.png b/src/main/resources/assets/botania/textures/blocks/flower_func_pollidisiac.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/pollidisiac.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_pollidisiac.png diff --git a/src/main/resources/assets/botania/textures/blocks/rannuncarpus.png b/src/main/resources/assets/botania/textures/blocks/flower_func_rannuncarpus.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/rannuncarpus.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_rannuncarpus.png diff --git a/src/main/resources/assets/botania/textures/blocks/rannuncarpuschibi.png b/src/main/resources/assets/botania/textures/blocks/flower_func_rannuncarpus_chibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/rannuncarpuschibi.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_rannuncarpus_chibi.png diff --git a/src/main/resources/assets/botania/textures/blocks/solegnolia.png b/src/main/resources/assets/botania/textures/blocks/flower_func_solegnolia.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/solegnolia.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_solegnolia.png diff --git a/src/main/resources/assets/botania/textures/blocks/solegnoliachibi.png b/src/main/resources/assets/botania/textures/blocks/flower_func_solegnolia_chibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/solegnoliachibi.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_solegnolia_chibi.png diff --git a/src/main/resources/assets/botania/textures/blocks/spectranthemum.png b/src/main/resources/assets/botania/textures/blocks/flower_func_spectranthemum.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/spectranthemum.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_spectranthemum.png diff --git a/src/main/resources/assets/botania/textures/blocks/tangleberrie.png b/src/main/resources/assets/botania/textures/blocks/flower_func_tangleberrie.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/tangleberrie.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_tangleberrie.png diff --git a/src/main/resources/assets/botania/textures/blocks/tigerseye.png b/src/main/resources/assets/botania/textures/blocks/flower_func_tigerseye.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/tigerseye.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_tigerseye.png diff --git a/src/main/resources/assets/botania/textures/blocks/vinculotus.png b/src/main/resources/assets/botania/textures/blocks/flower_func_vinculotus.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/vinculotus.png rename to src/main/resources/assets/botania/textures/blocks/flower_func_vinculotus.png diff --git a/src/main/resources/assets/botania/textures/blocks/arcanerose.png b/src/main/resources/assets/botania/textures/blocks/flower_gen_arcane_rose.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/arcanerose.png rename to src/main/resources/assets/botania/textures/blocks/flower_gen_arcane_rose.png diff --git a/src/main/resources/assets/botania/textures/blocks/dandelifeon.png b/src/main/resources/assets/botania/textures/blocks/flower_gen_dandelifeon.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/dandelifeon.png rename to src/main/resources/assets/botania/textures/blocks/flower_gen_dandelifeon.png diff --git a/src/main/resources/assets/botania/textures/blocks/dandelifeon.png.mcmeta b/src/main/resources/assets/botania/textures/blocks/flower_gen_dandelifeon.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/dandelifeon.png.mcmeta rename to src/main/resources/assets/botania/textures/blocks/flower_gen_dandelifeon.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/blocks/endoflame.png b/src/main/resources/assets/botania/textures/blocks/flower_gen_endoflame.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/endoflame.png rename to src/main/resources/assets/botania/textures/blocks/flower_gen_endoflame.png diff --git a/src/main/resources/assets/botania/textures/blocks/entropinnyum.png b/src/main/resources/assets/botania/textures/blocks/flower_gen_entropinnyum.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/entropinnyum.png rename to src/main/resources/assets/botania/textures/blocks/flower_gen_entropinnyum.png diff --git a/src/main/resources/assets/botania/textures/blocks/gourmaryllis.png b/src/main/resources/assets/botania/textures/blocks/flower_gen_gourmaryllis.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/gourmaryllis.png rename to src/main/resources/assets/botania/textures/blocks/flower_gen_gourmaryllis.png diff --git a/src/main/resources/assets/botania/textures/blocks/hydroangeas.png b/src/main/resources/assets/botania/textures/blocks/flower_gen_hydroangeas.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/hydroangeas.png rename to src/main/resources/assets/botania/textures/blocks/flower_gen_hydroangeas.png diff --git a/src/main/resources/assets/botania/textures/blocks/hydroangeasdecor.png b/src/main/resources/assets/botania/textures/blocks/flower_gen_hydroangeas_decor.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/hydroangeasdecor.png rename to src/main/resources/assets/botania/textures/blocks/flower_gen_hydroangeas_decor.png diff --git a/src/main/resources/assets/botania/textures/blocks/kekimurus.png b/src/main/resources/assets/botania/textures/blocks/flower_gen_kekimurus.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/kekimurus.png rename to src/main/resources/assets/botania/textures/blocks/flower_gen_kekimurus.png diff --git a/src/main/resources/assets/botania/textures/blocks/munchdew.png b/src/main/resources/assets/botania/textures/blocks/flower_gen_munchdew.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/munchdew.png rename to src/main/resources/assets/botania/textures/blocks/flower_gen_munchdew.png diff --git a/src/main/resources/assets/botania/textures/blocks/narslimmus.png b/src/main/resources/assets/botania/textures/blocks/flower_gen_narslimmus.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/narslimmus.png rename to src/main/resources/assets/botania/textures/blocks/flower_gen_narslimmus.png diff --git a/src/main/resources/assets/botania/textures/blocks/rafflowsia.png b/src/main/resources/assets/botania/textures/blocks/flower_gen_rafflowsia.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/rafflowsia.png rename to src/main/resources/assets/botania/textures/blocks/flower_gen_rafflowsia.png diff --git a/src/main/resources/assets/botania/textures/blocks/spectrolus.png b/src/main/resources/assets/botania/textures/blocks/flower_gen_spectrolus.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/spectrolus.png rename to src/main/resources/assets/botania/textures/blocks/flower_gen_spectrolus.png diff --git a/src/main/resources/assets/botania/textures/blocks/thermalily.png b/src/main/resources/assets/botania/textures/blocks/flower_gen_thermalily.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/thermalily.png rename to src/main/resources/assets/botania/textures/blocks/flower_gen_thermalily.png diff --git a/src/main/resources/assets/botania/textures/blocks/manastar.png b/src/main/resources/assets/botania/textures/blocks/flower_misc_manastar.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manastar.png rename to src/main/resources/assets/botania/textures/blocks/flower_misc_manastar.png diff --git a/src/main/resources/assets/botania/textures/blocks/puredaisy.png b/src/main/resources/assets/botania/textures/blocks/flower_misc_pure_daisy.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/puredaisy.png rename to src/main/resources/assets/botania/textures/blocks/flower_misc_pure_daisy.png diff --git a/src/main/resources/assets/botania/textures/blocks/lightlauncher.png b/src/main/resources/assets/botania/textures/blocks/lightlauncher.png deleted file mode 100644 index c2dcd04c8..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/lightlauncher.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/livingwood3.png b/src/main/resources/assets/botania/textures/blocks/livingwood3.png index be254d586..e9a144ffb 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/livingwood3.png and b/src/main/resources/assets/botania/textures/blocks/livingwood3.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/livingwood4.png b/src/main/resources/assets/botania/textures/blocks/livingwood4.png index 40bb4f1fe..52b4a68d6 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/livingwood4.png and b/src/main/resources/assets/botania/textures/blocks/livingwood4.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/luminizer_launcher_side.png b/src/main/resources/assets/botania/textures/blocks/luminizer_launcher_side.png new file mode 100644 index 000000000..bc426d5b3 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/luminizer_launcher_side.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/luminizer_launcher_top_bottom.png b/src/main/resources/assets/botania/textures/blocks/luminizer_launcher_top_bottom.png new file mode 100644 index 000000000..12b793edd Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/luminizer_launcher_top_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/manabomb.png b/src/main/resources/assets/botania/textures/blocks/mana_bomb.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manabomb.png rename to src/main/resources/assets/botania/textures/blocks/mana_bomb.png diff --git a/src/main/resources/assets/botania/textures/blocks/managlass.png b/src/main/resources/assets/botania/textures/blocks/mana_glass.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/managlass.png rename to src/main/resources/assets/botania/textures/blocks/mana_glass.png diff --git a/src/main/resources/assets/botania/textures/blocks/managlasspane.png b/src/main/resources/assets/botania/textures/blocks/mana_glass_pane.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/managlasspane.png rename to src/main/resources/assets/botania/textures/blocks/mana_glass_pane.png diff --git a/src/main/resources/assets/botania/textures/blocks/pistonrelay.png b/src/main/resources/assets/botania/textures/blocks/pistonrelay.png index 01763779c..075696fbf 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/pistonrelay.png and b/src/main/resources/assets/botania/textures/blocks/pistonrelay.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/platform0.png b/src/main/resources/assets/botania/textures/blocks/platform0.png index ddf81b965..3d117968e 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/platform0.png and b/src/main/resources/assets/botania/textures/blocks/platform0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/platform1.png b/src/main/resources/assets/botania/textures/blocks/platform1.png index 550c22be3..678fa5b7f 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/platform1.png and b/src/main/resources/assets/botania/textures/blocks/platform1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/platform2.png b/src/main/resources/assets/botania/textures/blocks/platform2.png index d809c9f96..bf7cf4ec3 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/platform2.png and b/src/main/resources/assets/botania/textures/blocks/platform2.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/prism1.png b/src/main/resources/assets/botania/textures/blocks/prism_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/prism1.png rename to src/main/resources/assets/botania/textures/blocks/prism_side.png diff --git a/src/main/resources/assets/botania/textures/blocks/prism0.png b/src/main/resources/assets/botania/textures/blocks/prism_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/prism0.png rename to src/main/resources/assets/botania/textures/blocks/prism_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/blocks/felpumpkin.png b/src/main/resources/assets/botania/textures/blocks/pumpkin_fel.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/felpumpkin.png rename to src/main/resources/assets/botania/textures/blocks/pumpkin_fel.png diff --git a/src/main/resources/assets/botania/textures/blocks/ghostrail.png b/src/main/resources/assets/botania/textures/blocks/rail_ghost.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/ghostrail.png rename to src/main/resources/assets/botania/textures/blocks/rail_ghost.png diff --git a/src/main/resources/assets/botania/textures/blocks/runic_altar_0.png b/src/main/resources/assets/botania/textures/blocks/runic_altar_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/runic_altar_0.png rename to src/main/resources/assets/botania/textures/blocks/runic_altar_bottom.png diff --git a/src/main/resources/assets/botania/textures/blocks/runic_altar_2.png b/src/main/resources/assets/botania/textures/blocks/runic_altar_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/runic_altar_2.png rename to src/main/resources/assets/botania/textures/blocks/runic_altar_side.png diff --git a/src/main/resources/assets/botania/textures/blocks/runic_altar_1.png b/src/main/resources/assets/botania/textures/blocks/runic_altar_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/runic_altar_1.png rename to src/main/resources/assets/botania/textures/blocks/runic_altar_top.png diff --git a/src/main/resources/assets/botania/textures/blocks/spark_tinkerer_0.png b/src/main/resources/assets/botania/textures/blocks/spark_tinkerer_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/spark_tinkerer_0.png rename to src/main/resources/assets/botania/textures/blocks/spark_tinkerer_bottom.png diff --git a/src/main/resources/assets/botania/textures/blocks/spark_tinkerer_2.png b/src/main/resources/assets/botania/textures/blocks/spark_tinkerer_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/spark_tinkerer_2.png rename to src/main/resources/assets/botania/textures/blocks/spark_tinkerer_side.png diff --git a/src/main/resources/assets/botania/textures/blocks/spark_tinkerer_1.png b/src/main/resources/assets/botania/textures/blocks/spark_tinkerer_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/spark_tinkerer_1.png rename to src/main/resources/assets/botania/textures/blocks/spark_tinkerer_top.png diff --git a/src/main/resources/assets/botania/textures/blocks/starfield0.png b/src/main/resources/assets/botania/textures/blocks/starfield_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/starfield0.png rename to src/main/resources/assets/botania/textures/blocks/starfield_bottom.png diff --git a/src/main/resources/assets/botania/textures/blocks/starfield2.png b/src/main/resources/assets/botania/textures/blocks/starfield_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/starfield2.png rename to src/main/resources/assets/botania/textures/blocks/starfield_side.png diff --git a/src/main/resources/assets/botania/textures/blocks/starfield1.png b/src/main/resources/assets/botania/textures/blocks/starfield_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/starfield1.png rename to src/main/resources/assets/botania/textures/blocks/starfield_top.png diff --git a/src/main/resources/assets/botania/textures/items/bucket_infinite.png b/src/main/resources/assets/botania/textures/items/bucket_infinite.png index f05b67f8f..2ab31fcba 100644 Binary files a/src/main/resources/assets/botania/textures/items/bucket_infinite.png and b/src/main/resources/assets/botania/textures/items/bucket_infinite.png differ diff --git a/src/main/resources/assets/botania/textures/items/craftpattern0.png b/src/main/resources/assets/botania/textures/items/crafting_pattern_0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/craftpattern0.png rename to src/main/resources/assets/botania/textures/items/crafting_pattern_0.png diff --git a/src/main/resources/assets/botania/textures/items/craftpattern1.png b/src/main/resources/assets/botania/textures/items/crafting_pattern_1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/craftpattern1.png rename to src/main/resources/assets/botania/textures/items/crafting_pattern_1.png diff --git a/src/main/resources/assets/botania/textures/items/craftpattern2.png b/src/main/resources/assets/botania/textures/items/crafting_pattern_2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/craftpattern2.png rename to src/main/resources/assets/botania/textures/items/crafting_pattern_2.png diff --git a/src/main/resources/assets/botania/textures/items/craftpattern3.png b/src/main/resources/assets/botania/textures/items/crafting_pattern_3.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/craftpattern3.png rename to src/main/resources/assets/botania/textures/items/crafting_pattern_3.png diff --git a/src/main/resources/assets/botania/textures/items/craftpattern4.png b/src/main/resources/assets/botania/textures/items/crafting_pattern_4.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/craftpattern4.png rename to src/main/resources/assets/botania/textures/items/crafting_pattern_4.png diff --git a/src/main/resources/assets/botania/textures/items/craftpattern5.png b/src/main/resources/assets/botania/textures/items/crafting_pattern_5.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/craftpattern5.png rename to src/main/resources/assets/botania/textures/items/crafting_pattern_5.png diff --git a/src/main/resources/assets/botania/textures/items/craftpattern6.png b/src/main/resources/assets/botania/textures/items/crafting_pattern_6.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/craftpattern6.png rename to src/main/resources/assets/botania/textures/items/crafting_pattern_6.png diff --git a/src/main/resources/assets/botania/textures/items/craftpattern7.png b/src/main/resources/assets/botania/textures/items/crafting_pattern_7.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/craftpattern7.png rename to src/main/resources/assets/botania/textures/items/crafting_pattern_7.png diff --git a/src/main/resources/assets/botania/textures/items/craftpattern8.png b/src/main/resources/assets/botania/textures/items/crafting_pattern_8.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/craftpattern8.png rename to src/main/resources/assets/botania/textures/items/crafting_pattern_8.png diff --git a/src/main/resources/assets/botania/textures/items/crafting_place_holder.png b/src/main/resources/assets/botania/textures/items/crafting_place_holder.png new file mode 100644 index 000000000..fd76123b0 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/crafting_place_holder.png differ diff --git a/src/main/resources/assets/botania/textures/items/dragonstone.png b/src/main/resources/assets/botania/textures/items/dragonstone.png index 92cbb4184..7873ceb9a 100644 Binary files a/src/main/resources/assets/botania/textures/items/dragonstone.png and b/src/main/resources/assets/botania/textures/items/dragonstone.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementium_axe.png b/src/main/resources/assets/botania/textures/items/elementium_axe.png index c43a335d9..21f5da24a 100644 Binary files a/src/main/resources/assets/botania/textures/items/elementium_axe.png and b/src/main/resources/assets/botania/textures/items/elementium_axe.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementium_boots.png b/src/main/resources/assets/botania/textures/items/elementium_boots.png index bd5b161e0..eca64eb09 100644 Binary files a/src/main/resources/assets/botania/textures/items/elementium_boots.png and b/src/main/resources/assets/botania/textures/items/elementium_boots.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementium_chestplate.png b/src/main/resources/assets/botania/textures/items/elementium_chestplate.png index 75528d786..24c0dcd4e 100644 Binary files a/src/main/resources/assets/botania/textures/items/elementium_chestplate.png and b/src/main/resources/assets/botania/textures/items/elementium_chestplate.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementium_helmet.png b/src/main/resources/assets/botania/textures/items/elementium_helmet.png index b900ee618..f20e55683 100644 Binary files a/src/main/resources/assets/botania/textures/items/elementium_helmet.png and b/src/main/resources/assets/botania/textures/items/elementium_helmet.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementium_helmet_reveal.png b/src/main/resources/assets/botania/textures/items/elementium_helmet_reveal.png index 57bcdfb7b..e25a3171c 100644 Binary files a/src/main/resources/assets/botania/textures/items/elementium_helmet_reveal.png and b/src/main/resources/assets/botania/textures/items/elementium_helmet_reveal.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementium_ingot.png b/src/main/resources/assets/botania/textures/items/elementium_ingot.png index dfa0fdeda..4f25eb4a0 100644 Binary files a/src/main/resources/assets/botania/textures/items/elementium_ingot.png and b/src/main/resources/assets/botania/textures/items/elementium_ingot.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementium_leggings.png b/src/main/resources/assets/botania/textures/items/elementium_leggings.png index c0fd63fee..ddb9866b0 100644 Binary files a/src/main/resources/assets/botania/textures/items/elementium_leggings.png and b/src/main/resources/assets/botania/textures/items/elementium_leggings.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementium_nugget.png b/src/main/resources/assets/botania/textures/items/elementium_nugget.png index 96ada1c04..09fff24b4 100644 Binary files a/src/main/resources/assets/botania/textures/items/elementium_nugget.png and b/src/main/resources/assets/botania/textures/items/elementium_nugget.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementium_pickaxe.png b/src/main/resources/assets/botania/textures/items/elementium_pickaxe.png index 471236905..90efd7c26 100644 Binary files a/src/main/resources/assets/botania/textures/items/elementium_pickaxe.png and b/src/main/resources/assets/botania/textures/items/elementium_pickaxe.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementium_shears.png b/src/main/resources/assets/botania/textures/items/elementium_shears.png index 307b623ad..5b0c3474b 100644 Binary files a/src/main/resources/assets/botania/textures/items/elementium_shears.png and b/src/main/resources/assets/botania/textures/items/elementium_shears.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementium_shovel.png b/src/main/resources/assets/botania/textures/items/elementium_shovel.png index e405d8a08..ccca2ee27 100644 Binary files a/src/main/resources/assets/botania/textures/items/elementium_shovel.png and b/src/main/resources/assets/botania/textures/items/elementium_shovel.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementium_sword.png b/src/main/resources/assets/botania/textures/items/elementium_sword.png index 449e435b3..b78ec4116 100644 Binary files a/src/main/resources/assets/botania/textures/items/elementium_sword.png and b/src/main/resources/assets/botania/textures/items/elementium_sword.png differ diff --git a/src/main/resources/assets/botania/textures/items/ender_dagger.png b/src/main/resources/assets/botania/textures/items/ender_dagger.png index 7a01cd8ad..05a6d51fb 100644 Binary files a/src/main/resources/assets/botania/textures/items/ender_dagger.png and b/src/main/resources/assets/botania/textures/items/ender_dagger.png differ diff --git a/src/main/resources/assets/botania/textures/items/ender_dagger_overlay.png b/src/main/resources/assets/botania/textures/items/ender_dagger_overlay.png index 353844ffd..0367c7990 100644 Binary files a/src/main/resources/assets/botania/textures/items/ender_dagger_overlay.png and b/src/main/resources/assets/botania/textures/items/ender_dagger_overlay.png differ diff --git a/src/main/resources/assets/botania/textures/items/halo_autocrafting.png b/src/main/resources/assets/botania/textures/items/halo_autocrafting.png index c91ba72e2..484b6c750 100644 Binary files a/src/main/resources/assets/botania/textures/items/halo_autocrafting.png and b/src/main/resources/assets/botania/textures/items/halo_autocrafting.png differ diff --git a/src/main/resources/assets/botania/textures/items/halo_crafting.png b/src/main/resources/assets/botania/textures/items/halo_crafting.png index 95a40f0c8..72d9762ae 100644 Binary files a/src/main/resources/assets/botania/textures/items/halo_crafting.png and b/src/main/resources/assets/botania/textures/items/halo_crafting.png differ diff --git a/src/main/resources/assets/botania/textures/items/headpiece_tiara_flight.png b/src/main/resources/assets/botania/textures/items/headpiece_tiara_flight.png index 35baeaff4..1bf346403 100644 Binary files a/src/main/resources/assets/botania/textures/items/headpiece_tiara_flight.png and b/src/main/resources/assets/botania/textures/items/headpiece_tiara_flight.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_inside.png b/src/main/resources/assets/botania/textures/items/lens.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lens_inside.png rename to src/main/resources/assets/botania/textures/items/lens.png diff --git a/src/main/resources/assets/botania/textures/items/manasteel_axe.png b/src/main/resources/assets/botania/textures/items/manasteel_axe.png index 996ae2b5f..eb3d37ac8 100644 Binary files a/src/main/resources/assets/botania/textures/items/manasteel_axe.png and b/src/main/resources/assets/botania/textures/items/manasteel_axe.png differ diff --git a/src/main/resources/assets/botania/textures/items/manasteel_boots.png b/src/main/resources/assets/botania/textures/items/manasteel_boots.png index 972fce90e..3150e8760 100644 Binary files a/src/main/resources/assets/botania/textures/items/manasteel_boots.png and b/src/main/resources/assets/botania/textures/items/manasteel_boots.png differ diff --git a/src/main/resources/assets/botania/textures/items/manasteel_chestplate.png b/src/main/resources/assets/botania/textures/items/manasteel_chestplate.png index d9f132f19..c08edc4b6 100644 Binary files a/src/main/resources/assets/botania/textures/items/manasteel_chestplate.png and b/src/main/resources/assets/botania/textures/items/manasteel_chestplate.png differ diff --git a/src/main/resources/assets/botania/textures/items/manasteel_helmet.png b/src/main/resources/assets/botania/textures/items/manasteel_helmet.png index ea3bf99f5..bd4c7e693 100644 Binary files a/src/main/resources/assets/botania/textures/items/manasteel_helmet.png and b/src/main/resources/assets/botania/textures/items/manasteel_helmet.png differ diff --git a/src/main/resources/assets/botania/textures/items/manasteel_helmet_reveal.png b/src/main/resources/assets/botania/textures/items/manasteel_helmet_reveal.png index 587741707..a3cc32871 100644 Binary files a/src/main/resources/assets/botania/textures/items/manasteel_helmet_reveal.png and b/src/main/resources/assets/botania/textures/items/manasteel_helmet_reveal.png differ diff --git a/src/main/resources/assets/botania/textures/items/manasteel_ingot.png b/src/main/resources/assets/botania/textures/items/manasteel_ingot.png index dca0d2e69..8b78f1f53 100644 Binary files a/src/main/resources/assets/botania/textures/items/manasteel_ingot.png and b/src/main/resources/assets/botania/textures/items/manasteel_ingot.png differ diff --git a/src/main/resources/assets/botania/textures/items/manasteel_leggings.png b/src/main/resources/assets/botania/textures/items/manasteel_leggings.png index 77b595c4f..1932efac2 100644 Binary files a/src/main/resources/assets/botania/textures/items/manasteel_leggings.png and b/src/main/resources/assets/botania/textures/items/manasteel_leggings.png differ diff --git a/src/main/resources/assets/botania/textures/items/manasteel_nugget.png b/src/main/resources/assets/botania/textures/items/manasteel_nugget.png index 5a44a8be4..068112218 100644 Binary files a/src/main/resources/assets/botania/textures/items/manasteel_nugget.png and b/src/main/resources/assets/botania/textures/items/manasteel_nugget.png differ diff --git a/src/main/resources/assets/botania/textures/items/manasteel_pickaxe.png b/src/main/resources/assets/botania/textures/items/manasteel_pickaxe.png index a022abfe1..1117ad29d 100644 Binary files a/src/main/resources/assets/botania/textures/items/manasteel_pickaxe.png and b/src/main/resources/assets/botania/textures/items/manasteel_pickaxe.png differ diff --git a/src/main/resources/assets/botania/textures/items/manasteel_shears.png b/src/main/resources/assets/botania/textures/items/manasteel_shears.png index 313d879bc..18bbfbab2 100644 Binary files a/src/main/resources/assets/botania/textures/items/manasteel_shears.png and b/src/main/resources/assets/botania/textures/items/manasteel_shears.png differ diff --git a/src/main/resources/assets/botania/textures/items/manasteel_shovel.png b/src/main/resources/assets/botania/textures/items/manasteel_shovel.png index 39080c2c3..2a3f54d06 100644 Binary files a/src/main/resources/assets/botania/textures/items/manasteel_shovel.png and b/src/main/resources/assets/botania/textures/items/manasteel_shovel.png differ diff --git a/src/main/resources/assets/botania/textures/items/manasteel_sword.png b/src/main/resources/assets/botania/textures/items/manasteel_sword.png index 60ebc2037..f2828d470 100644 Binary files a/src/main/resources/assets/botania/textures/items/manasteel_sword.png and b/src/main/resources/assets/botania/textures/items/manasteel_sword.png differ diff --git a/src/main/resources/assets/botania/textures/items/manaweave_boots.png b/src/main/resources/assets/botania/textures/items/manaweave_boots.png index fec7ebcbb..e57443ae3 100644 Binary files a/src/main/resources/assets/botania/textures/items/manaweave_boots.png and b/src/main/resources/assets/botania/textures/items/manaweave_boots.png differ diff --git a/src/main/resources/assets/botania/textures/items/manaweave_leggings.png b/src/main/resources/assets/botania/textures/items/manaweave_leggings.png index 5cbd9e032..70211c297 100644 Binary files a/src/main/resources/assets/botania/textures/items/manaweave_leggings.png and b/src/main/resources/assets/botania/textures/items/manaweave_leggings.png differ diff --git a/src/main/resources/assets/botania/textures/items/placeholder.png b/src/main/resources/assets/botania/textures/items/placeholder.png deleted file mode 100644 index ccbdcc648..000000000 Binary files a/src/main/resources/assets/botania/textures/items/placeholder.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/ring_aura_greater.png b/src/main/resources/assets/botania/textures/items/ring_aura_greater.png index fd100cdde..0cb815e3f 100644 Binary files a/src/main/resources/assets/botania/textures/items/ring_aura_greater.png and b/src/main/resources/assets/botania/textures/items/ring_aura_greater.png differ diff --git a/src/main/resources/assets/botania/textures/items/ring_magnet_greater.png b/src/main/resources/assets/botania/textures/items/ring_magnet_greater.png index e04b882ca..c988c8e6d 100644 Binary files a/src/main/resources/assets/botania/textures/items/ring_magnet_greater.png and b/src/main/resources/assets/botania/textures/items/ring_magnet_greater.png differ diff --git a/src/main/resources/assets/botania/textures/items/ring_magnet_greater_activated.png b/src/main/resources/assets/botania/textures/items/ring_magnet_greater_activated.png index 86df3afe5..97f1ab33e 100644 Binary files a/src/main/resources/assets/botania/textures/items/ring_magnet_greater_activated.png and b/src/main/resources/assets/botania/textures/items/ring_magnet_greater_activated.png differ diff --git a/src/main/resources/assets/botania/textures/items/ring_mana_greater.png b/src/main/resources/assets/botania/textures/items/ring_mana_greater.png index 82b1a746f..a2a883d60 100644 Binary files a/src/main/resources/assets/botania/textures/items/ring_mana_greater.png and b/src/main/resources/assets/botania/textures/items/ring_mana_greater.png differ diff --git a/src/main/resources/assets/botania/textures/items/ring_pixie.png b/src/main/resources/assets/botania/textures/items/ring_pixie.png index 168569a76..75c9520c1 100644 Binary files a/src/main/resources/assets/botania/textures/items/ring_pixie.png and b/src/main/resources/assets/botania/textures/items/ring_pixie.png differ diff --git a/src/main/resources/assets/botania/textures/items/ring_reach.png b/src/main/resources/assets/botania/textures/items/ring_reach.png index 8cbcc26d1..9df6f6d13 100644 Binary files a/src/main/resources/assets/botania/textures/items/ring_reach.png and b/src/main/resources/assets/botania/textures/items/ring_reach.png differ diff --git a/src/main/resources/assets/botania/textures/items/special_goldfish.png b/src/main/resources/assets/botania/textures/items/special_goldfish.png index 52d650134..e829bacd0 100644 Binary files a/src/main/resources/assets/botania/textures/items/special_goldfish.png and b/src/main/resources/assets/botania/textures/items/special_goldfish.png differ diff --git a/src/main/resources/assets/botania/textures/items/talisman_black_hole.png b/src/main/resources/assets/botania/textures/items/talisman_black_hole.png index f8e1ae2f9..57b708852 100644 Binary files a/src/main/resources/assets/botania/textures/items/talisman_black_hole.png and b/src/main/resources/assets/botania/textures/items/talisman_black_hole.png differ diff --git a/src/main/resources/assets/botania/textures/items/talisman_black_hole_activated.png b/src/main/resources/assets/botania/textures/items/talisman_black_hole_activated.png index e4f01b8f8..c2b51a104 100644 Binary files a/src/main/resources/assets/botania/textures/items/talisman_black_hole_activated.png and b/src/main/resources/assets/botania/textures/items/talisman_black_hole_activated.png differ diff --git a/src/main/resources/assets/botania/textures/items/terrasteel_axe.png b/src/main/resources/assets/botania/textures/items/terrasteel_axe.png index 513c87f39..bc319efa6 100644 Binary files a/src/main/resources/assets/botania/textures/items/terrasteel_axe.png and b/src/main/resources/assets/botania/textures/items/terrasteel_axe.png differ diff --git a/src/main/resources/assets/botania/textures/items/terrasteel_axe_activated.png b/src/main/resources/assets/botania/textures/items/terrasteel_axe_activated.png index 1da29b8c3..53c515eb7 100644 Binary files a/src/main/resources/assets/botania/textures/items/terrasteel_axe_activated.png and b/src/main/resources/assets/botania/textures/items/terrasteel_axe_activated.png differ diff --git a/src/main/resources/assets/botania/textures/items/terrasteel_boots.png b/src/main/resources/assets/botania/textures/items/terrasteel_boots.png index db01d0b6b..f468c942b 100644 Binary files a/src/main/resources/assets/botania/textures/items/terrasteel_boots.png and b/src/main/resources/assets/botania/textures/items/terrasteel_boots.png differ diff --git a/src/main/resources/assets/botania/textures/items/terrasteel_chestplate.png b/src/main/resources/assets/botania/textures/items/terrasteel_chestplate.png index c6d581ef8..ed2a5c296 100644 Binary files a/src/main/resources/assets/botania/textures/items/terrasteel_chestplate.png and b/src/main/resources/assets/botania/textures/items/terrasteel_chestplate.png differ diff --git a/src/main/resources/assets/botania/textures/items/terrasteel_helmet.png b/src/main/resources/assets/botania/textures/items/terrasteel_helmet.png index 1787f4b66..1adcce411 100644 Binary files a/src/main/resources/assets/botania/textures/items/terrasteel_helmet.png and b/src/main/resources/assets/botania/textures/items/terrasteel_helmet.png differ diff --git a/src/main/resources/assets/botania/textures/items/terrasteel_helmet_reveal.png b/src/main/resources/assets/botania/textures/items/terrasteel_helmet_reveal.png index 5f6b68f32..83fef485c 100644 Binary files a/src/main/resources/assets/botania/textures/items/terrasteel_helmet_reveal.png and b/src/main/resources/assets/botania/textures/items/terrasteel_helmet_reveal.png differ diff --git a/src/main/resources/assets/botania/textures/items/terrasteel_ingot.png b/src/main/resources/assets/botania/textures/items/terrasteel_ingot.png index 766630f81..5ce75c0b8 100644 Binary files a/src/main/resources/assets/botania/textures/items/terrasteel_ingot.png and b/src/main/resources/assets/botania/textures/items/terrasteel_ingot.png differ diff --git a/src/main/resources/assets/botania/textures/items/terrasteel_leggings.png b/src/main/resources/assets/botania/textures/items/terrasteel_leggings.png index be35301fe..06737d1ca 100644 Binary files a/src/main/resources/assets/botania/textures/items/terrasteel_leggings.png and b/src/main/resources/assets/botania/textures/items/terrasteel_leggings.png differ diff --git a/src/main/resources/assets/botania/textures/items/terrasteel_pickaxe.png b/src/main/resources/assets/botania/textures/items/terrasteel_pickaxe.png index d4fb1ec0b..f081d0b13 100644 Binary files a/src/main/resources/assets/botania/textures/items/terrasteel_pickaxe.png and b/src/main/resources/assets/botania/textures/items/terrasteel_pickaxe.png differ diff --git a/src/main/resources/assets/botania/textures/items/terrasteel_pickaxe_tipped.png b/src/main/resources/assets/botania/textures/items/terrasteel_pickaxe_tipped.png index a5981b8af..588c8a180 100644 Binary files a/src/main/resources/assets/botania/textures/items/terrasteel_pickaxe_tipped.png and b/src/main/resources/assets/botania/textures/items/terrasteel_pickaxe_tipped.png differ diff --git a/src/main/resources/assets/botania/textures/items/terrasteel_sword.png b/src/main/resources/assets/botania/textures/items/terrasteel_sword.png index 745eee5b9..5c4e2a12d 100644 Binary files a/src/main/resources/assets/botania/textures/items/terrasteel_sword.png and b/src/main/resources/assets/botania/textures/items/terrasteel_sword.png differ diff --git a/src/main/resources/assets/botania/textures/items/tool_astrolabe.png b/src/main/resources/assets/botania/textures/items/tool_astrolabe.png index 9175d373b..6dce6ae9e 100644 Binary files a/src/main/resources/assets/botania/textures/items/tool_astrolabe.png and b/src/main/resources/assets/botania/textures/items/tool_astrolabe.png differ diff --git a/src/main/resources/assets/botania/textures/items/tool_sextant.png b/src/main/resources/assets/botania/textures/items/tool_sextant.png index 75a5db826..3ab930e81 100644 Binary files a/src/main/resources/assets/botania/textures/items/tool_sextant.png and b/src/main/resources/assets/botania/textures/items/tool_sextant.png differ diff --git a/src/main/resources/assets/botania/textures/logo.png b/src/main/resources/assets/botania/textures/logo.png index d5500bd2a..36edaebbc 100644 Binary files a/src/main/resources/assets/botania/textures/logo.png and b/src/main/resources/assets/botania/textures/logo.png differ diff --git a/src/main/resources/assets/botania/textures/logo.psd b/src/main/resources/assets/botania/textures/logo.psd deleted file mode 100644 index 91959e48b..000000000 Binary files a/src/main/resources/assets/botania/textures/logo.psd and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/misc/glow0.png b/src/main/resources/assets/botania/textures/misc/glow0.png index 9dae5a06e..f65e07aad 100644 Binary files a/src/main/resources/assets/botania/textures/misc/glow0.png and b/src/main/resources/assets/botania/textures/misc/glow0.png differ diff --git a/src/main/resources/assets/botania/textures/misc/glow1.png b/src/main/resources/assets/botania/textures/misc/glow1.png index 5d57e5825..85889a3f9 100644 Binary files a/src/main/resources/assets/botania/textures/misc/glow1.png and b/src/main/resources/assets/botania/textures/misc/glow1.png differ diff --git a/src/main/resources/assets/botania/textures/misc/wisplarge.png b/src/main/resources/assets/botania/textures/misc/wisp_large.png similarity index 100% rename from src/main/resources/assets/botania/textures/misc/wisplarge.png rename to src/main/resources/assets/botania/textures/misc/wisp_large.png diff --git a/src/main/resources/assets/botania/textures/misc/wisplarge.png.mcmeta b/src/main/resources/assets/botania/textures/misc/wisp_large.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/misc/wisplarge.png.mcmeta rename to src/main/resources/assets/botania/textures/misc/wisp_large.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/misc/wispsmall.png b/src/main/resources/assets/botania/textures/misc/wisp_small.png similarity index 100% rename from src/main/resources/assets/botania/textures/misc/wispsmall.png rename to src/main/resources/assets/botania/textures/misc/wisp_small.png diff --git a/src/main/resources/assets/botania/textures/misc/wispsmall.png.mcmeta b/src/main/resources/assets/botania/textures/misc/wisp_small.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/misc/wispsmall.png.mcmeta rename to src/main/resources/assets/botania/textures/misc/wisp_small.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/model/armor_elementium.png b/src/main/resources/assets/botania/textures/model/armor_elementium.png index 5780cef40..2f82a5f2a 100644 Binary files a/src/main/resources/assets/botania/textures/model/armor_elementium.png and b/src/main/resources/assets/botania/textures/model/armor_elementium.png differ diff --git a/src/main/resources/assets/botania/textures/model/armor_manasteel.png b/src/main/resources/assets/botania/textures/model/armor_manasteel.png index 81d2ceddb..8afb34dde 100644 Binary files a/src/main/resources/assets/botania/textures/model/armor_manasteel.png and b/src/main/resources/assets/botania/textures/model/armor_manasteel.png differ diff --git a/src/main/resources/assets/botania/textures/model/armor_manaweave_holiday.png b/src/main/resources/assets/botania/textures/model/armor_manaweave_holiday.png index ee7586044..9bc4ae835 100644 Binary files a/src/main/resources/assets/botania/textures/model/armor_manaweave_holiday.png and b/src/main/resources/assets/botania/textures/model/armor_manaweave_holiday.png differ diff --git a/src/main/resources/assets/botania/textures/model/armor_terrasteel.png b/src/main/resources/assets/botania/textures/model/armor_terrasteel.png index 2c0701048..57bcfb099 100644 Binary files a/src/main/resources/assets/botania/textures/model/armor_terrasteel.png and b/src/main/resources/assets/botania/textures/model/armor_terrasteel.png differ diff --git a/src/main/resources/assets/botania/textures/model/pixie.png b/src/main/resources/assets/botania/textures/model/pixie.png index 03176fdb7..ad879e5a8 100644 Binary files a/src/main/resources/assets/botania/textures/model/pixie.png and b/src/main/resources/assets/botania/textures/model/pixie.png differ diff --git a/src/main/resources/assets/botania/textures/model/pixie_halloween.png b/src/main/resources/assets/botania/textures/model/pixie_halloween.png index 7db8d95dc..75421717e 100644 Binary files a/src/main/resources/assets/botania/textures/model/pixie_halloween.png and b/src/main/resources/assets/botania/textures/model/pixie_halloween.png differ