From d2340905d6bb569254752a9ace70c948011f26bb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 22 Dec 2015 17:43:51 -0600 Subject: [PATCH] Livingwood, and livingrock and livingwood stairs --- .../client/core/handler/ModelHandler.java | 31 +++++++++++++ .../blockstates/livingrock0Stairs.json | 44 +++++++++++++++++++ .../blockstates/livingrock1Stairs.json | 44 +++++++++++++++++++ .../botania/blockstates/livingwood.json | 10 +++++ .../blockstates/livingwood0Stairs.json | 44 +++++++++++++++++++ .../blockstates/livingwood1Stairs.json | 44 +++++++++++++++++++ .../block/livingrock_brick_inner_stairs.json | 8 ++++ .../block/livingrock_brick_outer_stairs.json | 8 ++++ .../models/block/livingrock_brick_stairs.json | 8 ++++ .../models/block/livingrock_inner_stairs.json | 8 ++++ .../models/block/livingrock_outer_stairs.json | 8 ++++ .../models/block/livingrock_stairs.json | 8 ++++ .../models/block/livingwood_default.json | 6 +++ .../models/block/livingwood_framed.json | 6 +++ .../models/block/livingwood_glimmering.json | 6 +++ .../models/block/livingwood_inner_stairs.json | 8 ++++ .../models/block/livingwood_mossy_planks.json | 6 +++ .../models/block/livingwood_outer_stairs.json | 8 ++++ .../block/livingwood_pattern_framed.json | 6 +++ .../models/block/livingwood_planks.json | 6 +++ .../block/livingwood_planks_inner_stairs.json | 8 ++++ .../block/livingwood_planks_outer_stairs.json | 8 ++++ .../block/livingwood_planks_stairs.json | 8 ++++ .../models/block/livingwood_stairs.json | 8 ++++ .../models/item/livingrock0Stairs.json | 13 ++++++ .../models/item/livingrock1Stairs.json | 13 ++++++ .../models/item/livingwood0Stairs.json | 13 ++++++ .../models/item/livingwood1Stairs.json | 13 ++++++ .../models/item/livingwood_default.json | 10 +++++ .../models/item/livingwood_framed.json | 10 +++++ .../models/item/livingwood_glimmering.json | 10 +++++ .../models/item/livingwood_mossy_planks.json | 10 +++++ .../item/livingwood_pattern_framed.json | 10 +++++ .../models/item/livingwood_planks.json | 10 +++++ 34 files changed, 461 insertions(+) create mode 100644 src/main/resources/assets/botania/blockstates/livingrock0Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/livingrock1Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/livingwood.json create mode 100644 src/main/resources/assets/botania/blockstates/livingwood0Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/livingwood1Stairs.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_brick_inner_stairs.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_brick_outer_stairs.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_brick_stairs.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_inner_stairs.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_outer_stairs.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_stairs.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_default.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_framed.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_glimmering.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_inner_stairs.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_mossy_planks.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_outer_stairs.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_pattern_framed.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_planks.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_planks_inner_stairs.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_planks_outer_stairs.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_planks_stairs.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_stairs.json create mode 100644 src/main/resources/assets/botania/models/item/livingrock0Stairs.json create mode 100644 src/main/resources/assets/botania/models/item/livingrock1Stairs.json create mode 100644 src/main/resources/assets/botania/models/item/livingwood0Stairs.json create mode 100644 src/main/resources/assets/botania/models/item/livingwood1Stairs.json create mode 100644 src/main/resources/assets/botania/models/item/livingwood_default.json create mode 100644 src/main/resources/assets/botania/models/item/livingwood_framed.json create mode 100644 src/main/resources/assets/botania/models/item/livingwood_glimmering.json create mode 100644 src/main/resources/assets/botania/models/item/livingwood_mossy_planks.json create mode 100644 src/main/resources/assets/botania/models/item/livingwood_pattern_framed.json create mode 100644 src/main/resources/assets/botania/models/item/livingwood_planks.json diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index acc33f24c..6ca637560 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -15,6 +15,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.state.enums.LivingRockVariant; +import vazkii.botania.api.state.enums.LivingWoodVariant; import vazkii.botania.api.state.enums.StorageVariant; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; @@ -36,6 +37,9 @@ public final class ModelHandler { registerMushroomItemBlocks(); registerFlowerItemBlocks(); registerLivingRockWood(); + registerStairs(); + registerSlabs(); + registerFullSlabs(); /** Normal Items **/ /** Special Item Meshers **/ @@ -149,6 +153,33 @@ public final class ModelHandler { ModelLoader.addVariantName(item, name); ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); } + + item = Item.getItemFromBlock(ModBlocks.livingwood); + for (LivingWoodVariant variant : LivingWoodVariant.values()) { + String name = "botania:" + "livingwood_" + variant.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); + } + } + + private static void registerStairs() { + registerItemModel(ModFluffBlocks.livingwoodStairs); + registerItemModel(ModFluffBlocks.livingwoodPlankStairs); + registerItemModel(ModFluffBlocks.livingrockStairs); + registerItemModel(ModFluffBlocks.livingrockBrickStairs); + + } + + private static void registerSlabs() { + + } + + private static void registerFullSlabs() { + + } + + private static void registerItemModel(Block b) { + registerItemModel(Item.getItemFromBlock(b)); } private static void registerItemModel(Item i) { diff --git a/src/main/resources/assets/botania/blockstates/livingrock0Stairs.json b/src/main/resources/assets/botania/blockstates/livingrock0Stairs.json new file mode 100644 index 000000000..b80d9a790 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingrock0Stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "botania:livingrock_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "botania:livingrock_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "botania:livingrock_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "botania:livingrock_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "botania:livingrock_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "botania:livingrock_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "botania:livingrock_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "botania:livingrock_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "botania:livingrock_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "botania:livingrock_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "botania:livingrock_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "botania:livingrock_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "botania:livingrock_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "botania:livingrock_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "botania:livingrock_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "botania:livingrock_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "botania:livingrock_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "botania:livingrock_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "botania:livingrock_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "botania:livingrock_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "botania:livingrock_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "botania:livingrock_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "botania:livingrock_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "botania:livingrock_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "botania:livingrock_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "botania:livingrock_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "botania:livingrock_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "botania:livingrock_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "botania:livingrock_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "botania:livingrock_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "botania:livingrock_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "botania:livingrock_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "botania:livingrock_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "botania:livingrock_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "botania:livingrock_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "botania:livingrock_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "botania:livingrock_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "botania:livingrock_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "botania:livingrock_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "botania:livingrock_inner_stairs", "x": 180, "uvlock": true } + } +} diff --git a/src/main/resources/assets/botania/blockstates/livingrock1Stairs.json b/src/main/resources/assets/botania/blockstates/livingrock1Stairs.json new file mode 100644 index 000000000..0425096ce --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingrock1Stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "botania:livingrock_brick_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "botania:livingrock_brick_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "botania:livingrock_brick_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "botania:livingrock_brick_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "botania:livingrock_brick_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "botania:livingrock_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "botania:livingrock_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "botania:livingrock_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "botania:livingrock_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "botania:livingrock_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "botania:livingrock_brick_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "botania:livingrock_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "botania:livingrock_brick_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "botania:livingrock_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "botania:livingrock_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "botania:livingrock_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "botania:livingrock_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "botania:livingrock_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "botania:livingrock_brick_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "botania:livingrock_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "botania:livingrock_brick_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "botania:livingrock_brick_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "botania:livingrock_brick_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "botania:livingrock_brick_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "botania:livingrock_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "botania:livingrock_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "botania:livingrock_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "botania:livingrock_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "botania:livingrock_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "botania:livingrock_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "botania:livingrock_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "botania:livingrock_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "botania:livingrock_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "botania:livingrock_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "botania:livingrock_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "botania:livingrock_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "botania:livingrock_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "botania:livingrock_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "botania:livingrock_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "botania:livingrock_brick_inner_stairs", "x": 180, "uvlock": true } + } +} diff --git a/src/main/resources/assets/botania/blockstates/livingwood.json b/src/main/resources/assets/botania/blockstates/livingwood.json new file mode 100644 index 000000000..87074e2b3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingwood.json @@ -0,0 +1,10 @@ +{ + "variants": { + "variant=default": { "model": "botania:livingwood_default" }, + "variant=planks": { "model": "botania:livingwood_planks" }, + "variant=mossy_planks": { "model": "botania:livingwood_mossy_planks" }, + "variant=framed": { "model": "botania:livingwood_framed" }, + "variant=pattern_framed": { "model": "botania:livingwood_pattern_framed" }, + "variant=glimmering": { "model": "botania:livingwood_glimmering" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood0Stairs.json b/src/main/resources/assets/botania/blockstates/livingwood0Stairs.json new file mode 100644 index 000000000..0b5ca469c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingwood0Stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "botania:livingwood_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "botania:livingwood_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "botania:livingwood_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "botania:livingwood_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "botania:livingwood_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "botania:livingwood_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "botania:livingwood_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "botania:livingwood_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "botania:livingwood_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "botania:livingwood_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "botania:livingwood_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "botania:livingwood_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "botania:livingwood_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "botania:livingwood_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "botania:livingwood_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "botania:livingwood_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "botania:livingwood_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "botania:livingwood_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "botania:livingwood_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "botania:livingwood_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "botania:livingwood_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "botania:livingwood_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "botania:livingwood_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "botania:livingwood_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "botania:livingwood_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "botania:livingwood_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "botania:livingwood_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "botania:livingwood_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "botania:livingwood_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "botania:livingwood_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "botania:livingwood_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "botania:livingwood_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "botania:livingwood_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "botania:livingwood_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "botania:livingwood_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "botania:livingwood_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "botania:livingwood_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "botania:livingwood_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "botania:livingwood_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "botania:livingwood_inner_stairs", "x": 180, "uvlock": true } + } +} diff --git a/src/main/resources/assets/botania/blockstates/livingwood1Stairs.json b/src/main/resources/assets/botania/blockstates/livingwood1Stairs.json new file mode 100644 index 000000000..13a28ac98 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingwood1Stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "botania:livingwood_planks_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "botania:livingwood_planks_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "botania:livingwood_planks_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "botania:livingwood_planks_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "botania:livingwood_planks_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "botania:livingwood_planks_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "botania:livingwood_planks_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "botania:livingwood_planks_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "botania:livingwood_planks_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "botania:livingwood_planks_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "botania:livingwood_planks_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "botania:livingwood_planks_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "botania:livingwood_planks_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "botania:livingwood_planks_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "botania:livingwood_planks_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "botania:livingwood_planks_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "botania:livingwood_planks_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "botania:livingwood_planks_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "botania:livingwood_planks_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "botania:livingwood_planks_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "botania:livingwood_planks_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "botania:livingwood_planks_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "botania:livingwood_planks_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "botania:livingwood_planks_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "botania:livingwood_planks_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "botania:livingwood_planks_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "botania:livingwood_planks_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "botania:livingwood_planks_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "botania:livingwood_planks_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "botania:livingwood_planks_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "botania:livingwood_planks_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "botania:livingwood_planks_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "botania:livingwood_planks_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "botania:livingwood_planks_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "botania:livingwood_planks_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "botania:livingwood_planks_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "botania:livingwood_planks_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "botania:livingwood_planks_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "botania:livingwood_planks_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "botania:livingwood_planks_inner_stairs", "x": 180, "uvlock": true } + } +} diff --git a/src/main/resources/assets/botania/models/block/livingrock_brick_inner_stairs.json b/src/main/resources/assets/botania/models/block/livingrock_brick_inner_stairs.json new file mode 100644 index 000000000..fd830fe0b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_brick_inner_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "botania:blocks/livingrock1", + "top": "botania:blocks/livingrock1", + "side": "botania:blocks/livingrock1" + } +} diff --git a/src/main/resources/assets/botania/models/block/livingrock_brick_outer_stairs.json b/src/main/resources/assets/botania/models/block/livingrock_brick_outer_stairs.json new file mode 100644 index 000000000..64526c211 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_brick_outer_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "botania:blocks/livingrock1", + "top": "botania:blocks/livingrock1", + "side": "botania:blocks/livingrock1" + } +} diff --git a/src/main/resources/assets/botania/models/block/livingrock_brick_stairs.json b/src/main/resources/assets/botania/models/block/livingrock_brick_stairs.json new file mode 100644 index 000000000..5b7aabc77 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "botania:blocks/livingrock1", + "top": "botania:blocks/livingrock1", + "side": "botania:blocks/livingrock1" + } +} diff --git a/src/main/resources/assets/botania/models/block/livingrock_inner_stairs.json b/src/main/resources/assets/botania/models/block/livingrock_inner_stairs.json new file mode 100644 index 000000000..29bcf876b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_inner_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "botania:blocks/livingrock0", + "top": "botania:blocks/livingrock0", + "side": "botania:blocks/livingrock0" + } +} diff --git a/src/main/resources/assets/botania/models/block/livingrock_outer_stairs.json b/src/main/resources/assets/botania/models/block/livingrock_outer_stairs.json new file mode 100644 index 000000000..eaa8878fe --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_outer_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "botania:blocks/livingrock0", + "top": "botania:blocks/livingrock0", + "side": "botania:blocks/livingrock0" + } +} diff --git a/src/main/resources/assets/botania/models/block/livingrock_stairs.json b/src/main/resources/assets/botania/models/block/livingrock_stairs.json new file mode 100644 index 000000000..3a5e84dd8 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "botania:blocks/livingrock0", + "top": "botania:blocks/livingrock0", + "side": "botania:blocks/livingrock0" + } +} diff --git a/src/main/resources/assets/botania/models/block/livingwood_default.json b/src/main/resources/assets/botania/models/block/livingwood_default.json new file mode 100644 index 000000000..0a8062fd9 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_default.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingwood0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_framed.json b/src/main/resources/assets/botania/models/block/livingwood_framed.json new file mode 100644 index 000000000..67ad48c5f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_framed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingwood3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_glimmering.json b/src/main/resources/assets/botania/models/block/livingwood_glimmering.json new file mode 100644 index 000000000..3f76a6831 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_glimmering.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingwood5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_inner_stairs.json b/src/main/resources/assets/botania/models/block/livingwood_inner_stairs.json new file mode 100644 index 000000000..98ec94ac6 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_inner_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "botania:blocks/livingwood0", + "top": "botania:blocks/livingwood0", + "side": "botania:blocks/livingwood0" + } +} diff --git a/src/main/resources/assets/botania/models/block/livingwood_mossy_planks.json b/src/main/resources/assets/botania/models/block/livingwood_mossy_planks.json new file mode 100644 index 000000000..88b9f8d3e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_mossy_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingwood2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_outer_stairs.json b/src/main/resources/assets/botania/models/block/livingwood_outer_stairs.json new file mode 100644 index 000000000..c2aa14218 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_outer_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "botania:blocks/livingwood0", + "top": "botania:blocks/livingwood0", + "side": "botania:blocks/livingwood0" + } +} diff --git a/src/main/resources/assets/botania/models/block/livingwood_pattern_framed.json b/src/main/resources/assets/botania/models/block/livingwood_pattern_framed.json new file mode 100644 index 000000000..a3edcc34f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_pattern_framed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingwood4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_planks.json b/src/main/resources/assets/botania/models/block/livingwood_planks.json new file mode 100644 index 000000000..ff95b9ae9 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingwood1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_planks_inner_stairs.json b/src/main/resources/assets/botania/models/block/livingwood_planks_inner_stairs.json new file mode 100644 index 000000000..0bffa08dd --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_planks_inner_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "botania:blocks/livingwood1", + "top": "botania:blocks/livingwood1", + "side": "botania:blocks/livingwood1" + } +} diff --git a/src/main/resources/assets/botania/models/block/livingwood_planks_outer_stairs.json b/src/main/resources/assets/botania/models/block/livingwood_planks_outer_stairs.json new file mode 100644 index 000000000..e70bb4c98 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_planks_outer_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "botania:blocks/livingwood1", + "top": "botania:blocks/livingwood1", + "side": "botania:blocks/livingwood1" + } +} diff --git a/src/main/resources/assets/botania/models/block/livingwood_planks_stairs.json b/src/main/resources/assets/botania/models/block/livingwood_planks_stairs.json new file mode 100644 index 000000000..075da8cef --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_planks_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "botania:blocks/livingwood1", + "top": "botania:blocks/livingwood1", + "side": "botania:blocks/livingwood1" + } +} diff --git a/src/main/resources/assets/botania/models/block/livingwood_stairs.json b/src/main/resources/assets/botania/models/block/livingwood_stairs.json new file mode 100644 index 000000000..110841261 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "botania:blocks/livingwood0", + "top": "botania:blocks/livingwood0", + "side": "botania:blocks/livingwood0" + } +} diff --git a/src/main/resources/assets/botania/models/item/livingrock0Stairs.json b/src/main/resources/assets/botania/models/item/livingrock0Stairs.json new file mode 100644 index 000000000..58c94dff8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingrock0Stairs.json @@ -0,0 +1,13 @@ +{ + "parent": "botania:block/livingrock_stairs", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock1Stairs.json b/src/main/resources/assets/botania/models/item/livingrock1Stairs.json new file mode 100644 index 000000000..1d48de23e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingrock1Stairs.json @@ -0,0 +1,13 @@ +{ + "parent": "botania:block/livingrock_brick_stairs", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood0Stairs.json b/src/main/resources/assets/botania/models/item/livingwood0Stairs.json new file mode 100644 index 000000000..aeb312db2 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwood0Stairs.json @@ -0,0 +1,13 @@ +{ + "parent": "botania:block/livingwood_stairs", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood1Stairs.json b/src/main/resources/assets/botania/models/item/livingwood1Stairs.json new file mode 100644 index 000000000..1f229b9ee --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwood1Stairs.json @@ -0,0 +1,13 @@ +{ + "parent": "botania:block/livingwood_planks_stairs", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_default.json b/src/main/resources/assets/botania/models/item/livingwood_default.json new file mode 100644 index 000000000..26fa10fad --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwood_default.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/livingwood_default", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_framed.json b/src/main/resources/assets/botania/models/item/livingwood_framed.json new file mode 100644 index 000000000..e9cee1d0f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwood_framed.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/livingwood_framed", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_glimmering.json b/src/main/resources/assets/botania/models/item/livingwood_glimmering.json new file mode 100644 index 000000000..a5ce44ad5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwood_glimmering.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/livingwood_glimmering", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_mossy_planks.json b/src/main/resources/assets/botania/models/item/livingwood_mossy_planks.json new file mode 100644 index 000000000..949174e54 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwood_mossy_planks.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/livingwood_mossy_planks", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_pattern_framed.json b/src/main/resources/assets/botania/models/item/livingwood_pattern_framed.json new file mode 100644 index 000000000..6866a6652 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwood_pattern_framed.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/livingwood_pattern_framed", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_planks.json b/src/main/resources/assets/botania/models/item/livingwood_planks.json new file mode 100644 index 000000000..82cf0d370 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwood_planks.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/livingwood_planks", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file