diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 7bfd2bed8..e4b352b78 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -24,13 +24,13 @@ public class BotaniaStateProps { /** Common properties to all blocks to use **/ // The 16 Minecraft colors - public static final PropertyEnum COLOR = PropertyEnum.create("color", EnumDyeColor.class); + public static final PropertyEnum COLOR = PropertyEnum.create("color", EnumDyeColor.class); // The four cardinal directions - public static final PropertyEnum CARDINALS = PropertyEnum.create("facing", EnumFacing.class, EnumFacing.Plane.HORIZONTAL); + public static final PropertyEnum CARDINALS = PropertyEnum.create("facing", EnumFacing.class, EnumFacing.Plane.HORIZONTAL); // All 6 directions - public static final PropertyEnum FACING = PropertyEnum.create("facing", EnumFacing.class); + public static final PropertyEnum FACING = PropertyEnum.create("facing", EnumFacing.class); // Redstone power - boolean // Also for any other simple boolean "on/off" state @@ -42,18 +42,18 @@ public class BotaniaStateProps { /** Properties for certain kinds of blocks **/ // The axis directions (think quartz pillars and wood logs) - public static final PropertyEnum AXIS_FACING = BlockRotatedPillar.AXIS; + public static final PropertyEnum AXIS_FACING = BlockRotatedPillar.AXIS; // Extra Quartz Blocks - public static final PropertyEnum QUARTZ_VARIANT = PropertyEnum.create("variant", QuartzVariant.class); + public static final PropertyEnum QUARTZ_VARIANT = PropertyEnum.create("variant", QuartzVariant.class); /** Properties for individual blocks **/ // Block18Stone - public static final PropertyEnum FUTURESTONE_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class); + public static final PropertyEnum FUTURESTONE_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class); // Block18StoneWall - public static final PropertyEnum FUTURESTONEWALL_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class, new Predicate() { + public static final PropertyEnum FUTURESTONEWALL_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class, new Predicate() { @Override public boolean apply(FutureStoneVariant variant) { // Just the four kinds (no polished, chiseled, etc.) @@ -62,19 +62,19 @@ public class BotaniaStateProps { }); // BlockAlfPortal - public static final PropertyEnum ALFPORTAL_STATE = PropertyEnum.create("state", AlfPortalState.class); + public static final PropertyEnum ALFPORTAL_STATE = PropertyEnum.create("state", AlfPortalState.class); // BlockAltGrass - public static final PropertyEnum ALTGRASS_VARIANT = PropertyEnum.create("variant", AltGrassVariant.class); + public static final PropertyEnum ALTGRASS_VARIANT = PropertyEnum.create("variant", AltGrassVariant.class); // BlockBiomeStoneA - public static final PropertyEnum BIOMESTONE_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class); + public static final PropertyEnum BIOMESTONE_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class); // BlockBiomeStoneB - public static final PropertyEnum BIOMEBRICK_VARIANT = PropertyEnum.create("variant", BiomeBrickVariant.class); + public static final PropertyEnum BIOMEBRICK_VARIANT = PropertyEnum.create("variant", BiomeBrickVariant.class); // BlockBiomeStoneWall - public static final PropertyEnum BIOMESTONEWALL_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class, new Predicate() { + public static final PropertyEnum BIOMESTONEWALL_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class, new Predicate() { @Override public boolean apply(BiomeStoneVariant input) { return input.getName().contains("cobble"); @@ -82,28 +82,28 @@ public class BotaniaStateProps { }); // BlockCustomBrick - public static final PropertyEnum CUSTOMBRICK_VARIANT = PropertyEnum.create("variant", CustomBrickVariant.class); + public static final PropertyEnum CUSTOMBRICK_VARIANT = PropertyEnum.create("variant", CustomBrickVariant.class); // BlockDreamWood, BlockLivingWood - public static final PropertyEnum LIVINGWOOD_VARIANT = PropertyEnum.create("variant", LivingWoodVariant.class); + public static final PropertyEnum LIVINGWOOD_VARIANT = PropertyEnum.create("variant", LivingWoodVariant.class); // BlockEnchanter - public static final PropertyEnum ENCHANTER_DIRECTION = PropertyEnum.create("facing", EnumFacing.Axis.class, Predicates.not(Predicates.equalTo(EnumFacing.Axis.Y))); + public static final PropertyEnum ENCHANTER_DIRECTION = PropertyEnum.create("facing", EnumFacing.Axis.class, Predicates.not(Predicates.equalTo(EnumFacing.Axis.Y))); // BlockEndStoneBrick - public static final PropertyEnum ENDBRICK_VARIANT = PropertyEnum.create("variant", EndBrickVariant.class); + public static final PropertyEnum ENDBRICK_VARIANT = PropertyEnum.create("variant", EndBrickVariant.class); // BlockForestDrum - public static final PropertyEnum DRUM_VARIANT = PropertyEnum.create("variant", DrumVariant.class); + public static final PropertyEnum DRUM_VARIANT = PropertyEnum.create("variant", DrumVariant.class); // BlockLightRelay - public static final PropertyEnum LUMINIZER_VARIANT = PropertyEnum.create("variant", LuminizerVariant.class); + public static final PropertyEnum LUMINIZER_VARIANT = PropertyEnum.create("variant", LuminizerVariant.class); // BlockLivingRock - public static final PropertyEnum LIVINGROCK_VARIANT = PropertyEnum.create("variant", LivingRockVariant.class); + public static final PropertyEnum LIVINGROCK_VARIANT = PropertyEnum.create("variant", LivingRockVariant.class); // BlockModDoubleFlower - public static final PropertyEnum DOUBLEFLOWER_VARIANT_1 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { + public static final PropertyEnum DOUBLEFLOWER_VARIANT_1 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { @Override public boolean apply(EnumDyeColor input) { // White to gray @@ -111,7 +111,7 @@ public class BotaniaStateProps { } }); - public static final PropertyEnum DOUBLEFLOWER_VARIANT_2 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { + public static final PropertyEnum DOUBLEFLOWER_VARIANT_2 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { @Override public boolean apply(EnumDyeColor input) { // Silver to black @@ -120,10 +120,10 @@ public class BotaniaStateProps { }); // BlockOpenCrate - public static final PropertyEnum CRATE_VARIANT = PropertyEnum.create("variant", CrateVariant.class); + public static final PropertyEnum CRATE_VARIANT = PropertyEnum.create("variant", CrateVariant.class); // BlockPavement - public static final PropertyEnum PAVEMENT_COLOR = PropertyEnum.create("color", EnumDyeColor.class, new Predicate() { + public static final PropertyEnum PAVEMENT_COLOR = PropertyEnum.create("color", EnumDyeColor.class, new Predicate() { @Override public boolean apply(EnumDyeColor color) { return color == EnumDyeColor.WHITE || color == EnumDyeColor.BLACK @@ -133,25 +133,25 @@ public class BotaniaStateProps { }); // BlockPlatform - public static final PropertyEnum PLATFORM_VARIANT = PropertyEnum.create("variant", PlatformVariant.class); + public static final PropertyEnum PLATFORM_VARIANT = PropertyEnum.create("variant", PlatformVariant.class); // BlockPool - public static final PropertyEnum POOL_VARIANT = PropertyEnum.create("variant", PoolVariant.class); + public static final PropertyEnum POOL_VARIANT = PropertyEnum.create("variant", PoolVariant.class); // BlockPrism public static final PropertyBool HAS_LENS = PropertyBool.create("has_lens"); // BlockPrismarine - public static final PropertyEnum PRISMARINE_VARIANT = PropertyEnum.create("variant", PrismarineVariant.class); + public static final PropertyEnum PRISMARINE_VARIANT = PropertyEnum.create("variant", PrismarineVariant.class); // BlockPylon - public static final PropertyEnum PYLON_VARIANT = PropertyEnum.create("variant", PylonVariant.class); + public static final PropertyEnum PYLON_VARIANT = PropertyEnum.create("variant", PylonVariant.class); // BlockSpreader - public static final PropertyEnum SPREADER_VARIANT = PropertyEnum.create("variant", SpreaderVariant.class); + public static final PropertyEnum SPREADER_VARIANT = PropertyEnum.create("variant", SpreaderVariant.class); // BlockStorage - public static final PropertyEnum STORAGE_VARIANT = PropertyEnum.create("variant", StorageVariant.class); + public static final PropertyEnum STORAGE_VARIANT = PropertyEnum.create("variant", StorageVariant.class); private BotaniaStateProps() {} } 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 e5e390a24..f7d13208a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -1,8 +1,10 @@ package vazkii.botania.client.core.handler; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockRailPowered; import net.minecraft.block.BlockSlab; import net.minecraft.block.BlockWall; import net.minecraft.client.renderer.block.statemap.StateMap; @@ -18,8 +20,10 @@ import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.render.SpecialFlowerModel; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; +import vazkii.botania.api.state.enums.BiomeBrickVariant; import vazkii.botania.api.state.enums.BiomeStoneVariant; import vazkii.botania.api.state.enums.DrumVariant; +import vazkii.botania.api.state.enums.EndBrickVariant; import vazkii.botania.api.state.enums.FutureStoneVariant; import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.api.state.enums.LivingWoodVariant; @@ -99,9 +103,9 @@ public final class ModelHandler { registerStandardBlocks(); registerMushrooms(); registerFlowers(); + registerPavement(); registerStairs(); registerSlabs(); - registerFullSlabs(); registerWalls(); registerPanes(); registerUnstableBeaconPetal(); @@ -181,14 +185,21 @@ public final class ModelHandler { registerItemModel(ModBlocks.specialFlower); registerItemModel(ModBlocks.dirtPath); registerItemModel(ModBlocks.felPumpkin); + registerItemModel(ModBlocks.ghostRail); + registerItemModel(ModBlocks.shimmerrock); + registerItemModel(ModBlocks.shimmerwoodPlanks); // Blocks which share models with their item, and have only one variant to switch over - registerVariantsDefaulted(ModBlocks.altGrass, AltGrassVariant.class, "botania:altGrass", "variant"); - registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "botania:storage", "variant"); - registerVariantsDefaulted(ModBlocks.pylon, PylonVariant.class, "botania:pylon", "variant"); - registerVariantsDefaulted(ModBlocks.forestDrum, DrumVariant.class, "botania:forestDrum", "variant"); - registerVariantsDefaulted(ModBlocks.livingrock, LivingRockVariant.class, "botania:livingrock", "variant"); - registerVariantsDefaulted(ModBlocks.livingwood, LivingWoodVariant.class, "botania:livingwood", "variant"); + registerVariantsDefaulted(ModBlocks.altGrass, AltGrassVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.pylon, PylonVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.forestDrum, DrumVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.livingrock, LivingRockVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.livingwood, LivingWoodVariant.class, "variant"); + registerVariantsDefaulted(ModFluffBlocks.stone, FutureStoneVariant.class, "variant"); + registerVariantsDefaulted(ModFluffBlocks.biomeStoneA, BiomeStoneVariant.class, "variant"); + registerVariantsDefaulted(ModFluffBlocks.biomeStoneB, BiomeBrickVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.endStoneBrick, EndBrickVariant.class, "variant"); } private static void registerStandardItems() { @@ -282,11 +293,12 @@ public final class ModelHandler { } List otherSlabs = ImmutableList.copyOf(new Block[] { - ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, + ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingwoodPlankSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.prismarineSlab, ModFluffBlocks.prismarineBrickSlab, ModFluffBlocks.darkPrismarineSlab, ModFluffBlocks.reedSlab, ModFluffBlocks.thatchSlab, ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, ModFluffBlocks.tileSlab, ModFluffBlocks.darkQuartzSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab, - ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab + ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab, ModFluffBlocks.dirtPathSlab, + ModFluffBlocks.shimmerrockSlab, ModFluffBlocks.shimmerwoodPlankSlab, ModFluffBlocks.endStoneSlab, ModFluffBlocks.enderBrickSlab }); for (Block b : otherSlabs) { @@ -305,13 +317,14 @@ public final class ModelHandler { for (Block b : ModFluffBlocks.stoneFullSlabs) { ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); } - + List otherFullSlabs = ImmutableList.copyOf(new Block[] { - ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull, + ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingwoodPlankSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull, ModFluffBlocks.dreamwoodPlankSlabFull, ModFluffBlocks.prismarineSlabFull, ModFluffBlocks.prismarineBrickSlabFull, ModFluffBlocks.darkPrismarineSlabFull, ModFluffBlocks.reedSlabFull, ModFluffBlocks.thatchSlabFull, ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, ModFluffBlocks.blazeQuartzSlabFull, - ModFluffBlocks.lavenderQuartzSlabFull, ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, ModFluffBlocks.sunnyQuartzSlabFull + ModFluffBlocks.lavenderQuartzSlabFull, ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, ModFluffBlocks.sunnyQuartzSlabFull, ModFluffBlocks.dirtPathSlabFull, + ModFluffBlocks.shimmerrockSlabFull, ModFluffBlocks.shimmerwoodPlankSlabFull, ModFluffBlocks.endStoneSlabFull, ModFluffBlocks.enderBrickSlabFull }); for (Block b : otherFullSlabs) { @@ -344,6 +357,48 @@ public final class ModelHandler { } } + private static void registerPavement() { + Item item = Item.getItemFromBlock(ModFluffBlocks.pavement); + String name = GameData.getBlockRegistry().getNameForObject(ModFluffBlocks.pavement).toString(); + + for (EnumDyeColor e : BotaniaStateProps.PAVEMENT_COLOR.getAllowedValues()) { + String variant = "color=" + e.getName(); + switch (e) { + case BLACK: { + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); + ModelLoader.setCustomModelResourceLocation(item, 1, new ModelResourceLocation(name, variant)); + break; + } + case BLUE: { + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); + ModelLoader.setCustomModelResourceLocation(item, 2, new ModelResourceLocation(name, variant)); + break; + } + case RED: { + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); + ModelLoader.setCustomModelResourceLocation(item, 3, new ModelResourceLocation(name, variant)); + break; + } + case YELLOW: { + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); + ModelLoader.setCustomModelResourceLocation(item, 4, new ModelResourceLocation(name, variant)); + break; + } + case GREEN: { + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); + ModelLoader.setCustomModelResourceLocation(item, 5, new ModelResourceLocation(name, variant)); + break; + } + case WHITE: + default: { + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); + ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(name, variant)); + break; + } + } + } + } + private static void registerStairs() { for (Block b : ModFluffBlocks.stoneStairs) { registerItemModel(b); @@ -386,27 +441,70 @@ public final class ModelHandler { } private static void registerSlabs() { + for (Block b : ModFluffBlocks.biomeStoneSlabs) { + registerItemModel(b); + } - } + for (Block b : ModFluffBlocks.pavementSlabs) { + registerItemModel(b); + } - private static void registerFullSlabs() { + for (Block b : ModFluffBlocks.stoneSlabs) { + registerItemModel(b); + } + + registerItemModel(ModFluffBlocks.livingwoodSlab); + registerItemModel(ModFluffBlocks.livingwoodPlankSlab); + registerItemModel(ModFluffBlocks.livingrockSlab); + registerItemModel(ModFluffBlocks.livingrockBrickSlab); + + registerItemModel(ModFluffBlocks.blazeQuartzSlab); + registerItemModel(ModFluffBlocks.darkQuartzSlab); + registerItemModel(ModFluffBlocks.elfQuartzSlab); + registerItemModel(ModFluffBlocks.lavenderQuartzSlab); + registerItemModel(ModFluffBlocks.manaQuartzSlab); + registerItemModel(ModFluffBlocks.redQuartzSlab); + registerItemModel(ModFluffBlocks.sunnyQuartzSlab); + + registerItemModel(ModFluffBlocks.dreamwoodSlab); + registerItemModel(ModFluffBlocks.dreamwoodPlankSlab); + registerItemModel(ModFluffBlocks.prismarineSlab); + registerItemModel(ModFluffBlocks.prismarineBrickSlab); + registerItemModel(ModFluffBlocks.darkPrismarineSlab); + registerItemModel(ModFluffBlocks.dirtPathSlab); + registerItemModel(ModFluffBlocks.shimmerrockSlab); + registerItemModel(ModFluffBlocks.shimmerwoodPlankSlab); + registerItemModel(ModFluffBlocks.endStoneSlab); + registerItemModel(ModFluffBlocks.enderBrickSlab); + registerItemModel(ModFluffBlocks.netherBrickSlab); + registerItemModel(ModFluffBlocks.soulBrickSlab); + registerItemModel(ModFluffBlocks.snowBrickSlab); + registerItemModel(ModFluffBlocks.tileSlab); + registerItemModel(ModFluffBlocks.reedSlab); + registerItemModel(ModFluffBlocks.thatchSlab); } private static void registerWalls() { Item item = Item.getItemFromBlock(ModFluffBlocks.biomeStoneWall); - for (BiomeStoneVariant variant : ((Collection) BotaniaStateProps.BIOMESTONEWALL_VARIANT.getAllowedValues())) { + for (BiomeStoneVariant variant : BotaniaStateProps.BIOMESTONEWALL_VARIANT.getAllowedValues()) { String variantName = "inventory_" + variant.getName(); ModelLoader.registerItemVariants(item, new ModelResourceLocation("botania:biomeStoneA0Wall", variantName)); ModelLoader.setCustomModelResourceLocation(item, variant.ordinal() - 8, new ModelResourceLocation("botania:biomeStoneA0Wall", variantName)); } item = Item.getItemFromBlock(ModFluffBlocks.stoneWall); - for (FutureStoneVariant variant : ((Collection) BotaniaStateProps.FUTURESTONEWALL_VARIANT.getAllowedValues())) { + for (FutureStoneVariant variant : BotaniaStateProps.FUTURESTONEWALL_VARIANT.getAllowedValues()) { String variantName = "inventory_" + variant.getName(); ModelLoader.registerItemVariants(item, new ModelResourceLocation("botania:stone0Wall", variantName)); ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation("botania:stone0Wall", variantName)); } + + registerItemModel(ModFluffBlocks.livingrockWall); + registerItemModel(ModFluffBlocks.livingwoodWall); + registerItemModel(ModFluffBlocks.dreamwoodWall); + registerItemModel(ModFluffBlocks.prismarineWall); + registerItemModel(ModFluffBlocks.reedWall); } private static void registerPanes() { @@ -427,9 +525,10 @@ public final class ModelHandler { } } - private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String baseName, String variantHeader) { + private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String variantHeader) { Item item = Item.getItemFromBlock(b); for (T e : enumclazz.getEnumConstants()) { + String baseName = GameData.getBlockRegistry().getNameForObject(b).toString(); String variantName = variantHeader + "=" + e.getName(); ModelLoader.registerItemVariants(item, new ModelResourceLocation(baseName, variantName)); ModelLoader.setCustomModelResourceLocation(item, e.ordinal(), new ModelResourceLocation(baseName, variantName)); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index 75b43e950..85577ca7f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -16,8 +16,10 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -59,17 +61,9 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { GlStateManager.popMatrix(); ItemStack stack = flower.getDisplayStack(); -// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 -// IIcon icon = stack.getIconIndex(); -// -// Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); -// float f = icon.getMinU(); -// float f1 = icon.getMaxU(); -// float f2 = icon.getMinV(); -// float f3 = icon.getMaxV(); -// GlStateManager.translate(0.25F, 0.4F, 0.5F); -// GlStateManager.scale(0.5F, 0.5F, 0.5F); -// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); + GlStateManager.translate(0.5F, 0.65F, 0.5F); + GlStateManager.scale(0.5F, 0.5F, 0.5F); + Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.NONE); GlStateManager.color(1F, 1F, 1F); GlStateManager.popMatrix(); } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java index c5ced6659..cd37e895b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java @@ -56,11 +56,6 @@ public class Block18StoneWall extends BlockModWall { return getDefaultState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.values()[meta]); } - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - return super.getActualState(state, worldIn, pos).withProperty(VARIANT, EnumType.NORMAL); - } - @Override public void register(String name) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); @@ -77,9 +72,4 @@ public class Block18StoneWall extends BlockModWall { return LexiconData.stoneAlchemy; } - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } - } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index 6f795ed32..5e6fa5f6e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -56,11 +56,6 @@ public class BlockBiomeStoneWall extends BlockModWall { return getDefaultState().withProperty(BotaniaStateProps.BIOMESTONEWALL_VARIANT, BiomeStoneVariant.values()[meta + 8]); } - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - return super.getActualState(state, worldIn, pos).withProperty(VARIANT, EnumType.NORMAL); - } - @Override public void register(String name) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); @@ -77,9 +72,4 @@ public class BlockBiomeStoneWall extends BlockModWall { return LexiconData.marimorphosis; } - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } - } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index 0f8a53ee7..efc30fd78 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -47,6 +47,16 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable { ); } + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + return super.getActualState(state, world, pos).withProperty(VARIANT, EnumType.NORMAL); + } + + @Override + public int damageDropped(IBlockState state) { + return getMetaFromState(state); + } + @Override public BlockState createBlockState() { return new BlockState(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST); diff --git a/src/main/resources/assets/botania/blockstates/biomeStomeA11SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStomeA11SlabFull.json new file mode 100644 index 000000000..b8e1cc61d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStomeA11SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStome11" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA.json b/src/main/resources/assets/botania/blockstates/biomeStoneA.json new file mode 100644 index 000000000..2ec09cc6b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA.json @@ -0,0 +1,25 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "variant=forest": [{ "textures": { "all": "botania:blocks/biomeStone0" } }], + "variant=plains": [{ "textures": { "all": "botania:blocks/biomeStone1" } }], + "variant=mountain": [{ "textures": { "all": "botania:blocks/biomeStone2" } }], + "variant=fungal": [{ "textures": { "all": "botania:blocks/biomeStone3" } }], + "variant=swamp": [{ "textures": { "all": "botania:blocks/biomeStone4" } }], + "variant=desert": [{ "textures": { "all": "botania:blocks/biomeStone5" } }], + "variant=taiga": [{ "textures": { "all": "botania:blocks/biomeStone6" } }], + "variant=mesa": [{ "textures": { "all": "botania:blocks/biomeStone7" } }], + "variant=forest_cobble": [{ "textures": { "all": "botania:blocks/biomeStone8" } }], + "variant=plains_cobble": [{ "textures": { "all": "botania:blocks/biomeStone9" } }], + "variant=mountain_cobble": [{ "textures": { "all": "botania:blocks/biomeStone10" } }], + "variant=fungal_cobble": [{ "textures": { "all": "botania:blocks/biomeStone11" } }], + "variant=swamp_cobble": [{ "textures": { "all": "botania:blocks/biomeStone12" } }], + "variant=desert_cobble": [{ "textures": { "all": "botania:blocks/biomeStone13" } }], + "variant=taiga_cobble": [{ "textures": { "all": "botania:blocks/biomeStone14" } }], + "variant=mesa_cobble": [{ "textures": { "all": "botania:blocks/biomeStone15" } }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA0Slab.json new file mode 100644 index 000000000..26b01e0ad --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone0", + "top": "botania:blocks/biomeStone0", + "side": "botania:blocks/biomeStone0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA0SlabFull.json new file mode 100644 index 000000000..622220653 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA10Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA10Slab.json new file mode 100644 index 000000000..2e3c9ce2d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA10Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone10", + "top": "botania:blocks/biomeStone10", + "side": "botania:blocks/biomeStone10" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA10SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA10SlabFull.json new file mode 100644 index 000000000..a0c0c5ba3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA10SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone10" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA11Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA11Slab.json new file mode 100644 index 000000000..492cdefab --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA11Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone11", + "top": "botania:blocks/biomeStone11", + "side": "botania:blocks/biomeStone11" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA11SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA11SlabFull.json new file mode 100644 index 000000000..685aced75 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA11SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone11" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA12Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA12Slab.json new file mode 100644 index 000000000..a78647e5d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA12Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone12", + "top": "botania:blocks/biomeStone12", + "side": "botania:blocks/biomeStone12" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA12SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA12SlabFull.json new file mode 100644 index 000000000..35fdc8ea2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA12SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone12" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA13Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA13Slab.json new file mode 100644 index 000000000..3d9e905fd --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA13Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone13", + "top": "botania:blocks/biomeStone13", + "side": "botania:blocks/biomeStone13" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA13SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA13SlabFull.json new file mode 100644 index 000000000..f0da4d47e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA13SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone13" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA14Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA14Slab.json new file mode 100644 index 000000000..ff31c6527 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA14Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone14", + "top": "botania:blocks/biomeStone14", + "side": "botania:blocks/biomeStone14" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA14SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA14SlabFull.json new file mode 100644 index 000000000..5a6e9b1dc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA14SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone14" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA15Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA15Slab.json new file mode 100644 index 000000000..1c3854d5a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA15Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone15", + "top": "botania:blocks/biomeStone15", + "side": "botania:blocks/biomeStone15" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA15SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA15SlabFull.json new file mode 100644 index 000000000..985fb290f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA15SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone15" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA1Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA1Slab.json new file mode 100644 index 000000000..638726afe --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone1", + "top": "botania:blocks/biomeStone1", + "side": "botania:blocks/biomeStone1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA1SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA1SlabFull.json new file mode 100644 index 000000000..c052661cc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone1" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA2Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA2Slab.json new file mode 100644 index 000000000..e9dd7f308 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA2Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone2", + "top": "botania:blocks/biomeStone2", + "side": "botania:blocks/biomeStone2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA2SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA2SlabFull.json new file mode 100644 index 000000000..ad8967e4c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA2SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone2" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA3Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA3Slab.json new file mode 100644 index 000000000..1ff94cdb9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA3Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone3", + "top": "botania:blocks/biomeStone3", + "side": "botania:blocks/biomeStone3" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA3SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA3SlabFull.json new file mode 100644 index 000000000..ae53dde27 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA3SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone3" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA4Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA4Slab.json new file mode 100644 index 000000000..d77ac77b1 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA4Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone4", + "top": "botania:blocks/biomeStone4", + "side": "botania:blocks/biomeStone4" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA4SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA4SlabFull.json new file mode 100644 index 000000000..3a02ee0f9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA4SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone4" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA5Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA5Slab.json new file mode 100644 index 000000000..7c2a4ddde --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA5Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone5", + "top": "botania:blocks/biomeStone5", + "side": "botania:blocks/biomeStone5" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA5SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA5SlabFull.json new file mode 100644 index 000000000..74e8a7dae --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA5SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone5" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA6Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA6Slab.json new file mode 100644 index 000000000..1a2d2d869 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA6Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone6", + "top": "botania:blocks/biomeStone6", + "side": "botania:blocks/biomeStone6" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA6SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA6SlabFull.json new file mode 100644 index 000000000..95cdc2830 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA6SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone6" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA7Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA7Slab.json new file mode 100644 index 000000000..cd57da54c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA7Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone7", + "top": "botania:blocks/biomeStone7", + "side": "botania:blocks/biomeStone7" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA7SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA7SlabFull.json new file mode 100644 index 000000000..6b89dbc07 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA7SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone7" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA8Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA8Slab.json new file mode 100644 index 000000000..5cc3c87d6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA8Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone8", + "top": "botania:blocks/biomeStone8", + "side": "botania:blocks/biomeStone8" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA8SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA8SlabFull.json new file mode 100644 index 000000000..b708579a9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA8SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone8" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA9Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA9Slab.json new file mode 100644 index 000000000..188d82abf --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA9Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone9", + "top": "botania:blocks/biomeStone9", + "side": "botania:blocks/biomeStone9" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA9SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA9SlabFull.json new file mode 100644 index 000000000..c853b5705 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA9SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone9" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB.json b/src/main/resources/assets/botania/blockstates/biomeStoneB.json new file mode 100644 index 000000000..facaa9134 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB.json @@ -0,0 +1,25 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "variant=forest": [{ "textures": { "all": "botania:blocks/biomeStone16" } }], + "variant=plains": [{ "textures": { "all": "botania:blocks/biomeStone17" } }], + "variant=mountain": [{ "textures": { "all": "botania:blocks/biomeStone18" } }], + "variant=fungal": [{ "textures": { "all": "botania:blocks/biomeStone19" } }], + "variant=swamp": [{ "textures": { "all": "botania:blocks/biomeStone20" } }], + "variant=desert": [{ "textures": { "all": "botania:blocks/biomeStone21" } }], + "variant=taiga": [{ "textures": { "all": "botania:blocks/biomeStone22" } }], + "variant=mesa": [{ "textures": { "all": "botania:blocks/biomeStone23" } }], + "variant=chiseled_forest": [{ "textures": { "all": "botania:blocks/biomeStone24" } }], + "variant=chiseled_plains": [{ "textures": { "all": "botania:blocks/biomeStone25" } }], + "variant=chiseled_mountain": [{ "textures": { "all": "botania:blocks/biomeStone26" } }], + "variant=chiseled_fungal": [{ "textures": { "all": "botania:blocks/biomeStone27" } }], + "variant=chiseled_swamp": [{ "textures": { "all": "botania:blocks/biomeStone28" } }], + "variant=chiseled_desert": [{ "textures": { "all": "botania:blocks/biomeStone29" } }], + "variant=chiseled_taiga": [{ "textures": { "all": "botania:blocks/biomeStone30" } }], + "variant=chiseled_mesa": [{ "textures": { "all": "botania:blocks/biomeStone31" } }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB0Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB0Slab.json new file mode 100644 index 000000000..37969ece4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone16", + "top": "botania:blocks/biomeStone16", + "side": "botania:blocks/biomeStone16" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB0SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB0SlabFull.json new file mode 100644 index 000000000..a5236f6d8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone16" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB1Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB1Slab.json new file mode 100644 index 000000000..1daf216ef --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone17", + "top": "botania:blocks/biomeStone17", + "side": "botania:blocks/biomeStone17" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB1SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB1SlabFull.json new file mode 100644 index 000000000..7612fa942 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone17" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB2Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB2Slab.json new file mode 100644 index 000000000..8a077688c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB2Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone18", + "top": "botania:blocks/biomeStone18", + "side": "botania:blocks/biomeStone18" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB2SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB2SlabFull.json new file mode 100644 index 000000000..4902a6e0c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB2SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone18" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB3Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB3Slab.json new file mode 100644 index 000000000..ade89b09b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB3Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone19", + "top": "botania:blocks/biomeStone19", + "side": "botania:blocks/biomeStone19" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB3SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB3SlabFull.json new file mode 100644 index 000000000..ad81a7910 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB3SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone19" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB4Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB4Slab.json new file mode 100644 index 000000000..c0dfa9c93 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB4Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone20", + "top": "botania:blocks/biomeStone20", + "side": "botania:blocks/biomeStone20" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB4SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB4SlabFull.json new file mode 100644 index 000000000..12a9d00da --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB4SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone20" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB5Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB5Slab.json new file mode 100644 index 000000000..068ce5beb --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB5Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone21", + "top": "botania:blocks/biomeStone21", + "side": "botania:blocks/biomeStone21" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB5SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB5SlabFull.json new file mode 100644 index 000000000..00399c361 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB5SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone21" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB6Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB6Slab.json new file mode 100644 index 000000000..7da39aff8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB6Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone22", + "top": "botania:blocks/biomeStone22", + "side": "botania:blocks/biomeStone22" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB6SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB6SlabFull.json new file mode 100644 index 000000000..cd9d3f0e9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB6SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone22" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB7Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB7Slab.json new file mode 100644 index 000000000..dec2e4dbc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB7Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone23", + "top": "botania:blocks/biomeStone23", + "side": "botania:blocks/biomeStone23" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB7SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB7SlabFull.json new file mode 100644 index 000000000..9e7c19c2e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB7SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone23" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick0Slab.json b/src/main/resources/assets/botania/blockstates/customBrick0Slab.json new file mode 100644 index 000000000..8831d3fe6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/customBrick0", + "top": "botania:blocks/customBrick0", + "side": "botania:blocks/customBrick0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ 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 new file mode 100644 index 000000000..c7dd413b5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick0SlabFull.json @@ -0,0 +1,9 @@ +{ + "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/customBrick1Slab.json b/src/main/resources/assets/botania/blockstates/customBrick1Slab.json new file mode 100644 index 000000000..c4b1be5b2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/customBrick1", + "top": "botania:blocks/customBrick1", + "side": "botania:blocks/customBrick1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ 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 new file mode 100644 index 000000000..e299f14db --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick1SlabFull.json @@ -0,0 +1,9 @@ +{ + "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/customBrick2Slab.json b/src/main/resources/assets/botania/blockstates/customBrick2Slab.json new file mode 100644 index 000000000..a5f1e51f5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick2Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/customBrick2", + "top": "botania:blocks/customBrick2", + "side": "botania:blocks/customBrick2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ 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 new file mode 100644 index 000000000..dd5a23420 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick2SlabFull.json @@ -0,0 +1,9 @@ +{ + "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/customBrick3Slab.json b/src/main/resources/assets/botania/blockstates/customBrick3Slab.json new file mode 100644 index 000000000..f91ff8793 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick3Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/customBrick3", + "top": "botania:blocks/customBrick3", + "side": "botania:blocks/customBrick3" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ 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 new file mode 100644 index 000000000..cba4e7996 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick3SlabFull.json @@ -0,0 +1,9 @@ +{ + "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/dirtPath0Slab.json b/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json new file mode 100644 index 000000000..609f3c254 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/dirtPath", + "top": "botania:blocks/dirtPath", + "side": "botania:blocks/dirtPath" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ 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 new file mode 100644 index 000000000..c5205f908 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dirtPath0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/dirtPath" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0Slab.json b/src/main/resources/assets/botania/blockstates/dreamwood0Slab.json new file mode 100644 index 000000000..bbbe129ed --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreamwood0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/dreamwood0", + "top": "botania:blocks/dreamwood0", + "side": "botania:blocks/dreamwood0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0SlabFull.json b/src/main/resources/assets/botania/blockstates/dreamwood0SlabFull.json new file mode 100644 index 000000000..40e378188 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreamwood0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/dreamwood0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json b/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json new file mode 100644 index 000000000..31863d217 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json @@ -0,0 +1,37 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:wall_post", + "uvlock": true, + "transform": "forge:default-block", + "textures": { "wall": "botania:blocks/dreamwood0" } + }, + "variants": { + "east=false,north=true,south=true,up=false,west=false": { "model": null }, + "east=true,north=false,south=false,up=false,west=true": { "model": null }, + + "north": { + "true": { "submodel": "botania:wall_connect" }, + "false": {} + }, + "south": { + "true": { "submodel": "botania:wall_connect", "y": 180 }, + "false": {} + }, + "west": { + "true": { "submodel": "botania:wall_connect", "y": 270 }, + "false": {} + }, + "east": { + "true": { "submodel": "botania:wall_connect", "y": 90 }, + "false": {} + }, + "up": { + "true": {}, + "false": {} + }, + "inventory": [{ + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood1Slab.json b/src/main/resources/assets/botania/blockstates/dreamwood1Slab.json new file mode 100644 index 000000000..ff2fcf790 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreamwood1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/dreamwood1", + "top": "botania:blocks/dreamwood1", + "side": "botania:blocks/dreamwood1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood1SlabFull.json b/src/main/resources/assets/botania/blockstates/dreamwood1SlabFull.json new file mode 100644 index 000000000..47873fc21 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreamwood1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/dreamwood1" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick.json b/src/main/resources/assets/botania/blockstates/endStoneBrick.json new file mode 100644 index 000000000..890ba9ef8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/endStoneBrick.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "variant=end_stone_bricks": [{ "textures": { "all": "botania:blocks/endStoneBrick0" } }], + "variant=chiseled_end_stone_bricks": [{ "textures": { "all": "botania:blocks/endStoneBrick1" } }], + "variant=ender_bricks": [{ "textures": { "all": "botania:blocks/endStoneBrick2" } }], + "variant=pillar_ender_bricks": [{ "textures": { "all": "botania:blocks/endStoneBrick3" } }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick0Slab.json b/src/main/resources/assets/botania/blockstates/endStoneBrick0Slab.json new file mode 100644 index 000000000..deb5a96ac --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/endStoneBrick0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/endStoneBrick0", + "top": "botania:blocks/endStoneBrick0", + "side": "botania:blocks/endStoneBrick0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick0SlabFull.json b/src/main/resources/assets/botania/blockstates/endStoneBrick0SlabFull.json new file mode 100644 index 000000000..b53fb4fba --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/endStoneBrick0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/endStoneBrick0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick2Slab.json b/src/main/resources/assets/botania/blockstates/endStoneBrick2Slab.json new file mode 100644 index 000000000..26735e56f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/endStoneBrick2Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/endStoneBrick2", + "top": "botania:blocks/endStoneBrick2", + "side": "botania:blocks/endStoneBrick2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick2SlabFull.json b/src/main/resources/assets/botania/blockstates/endStoneBrick2SlabFull.json new file mode 100644 index 000000000..d3d956779 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/endStoneBrick2SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/endStoneBrick2" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/ghostRail.json b/src/main/resources/assets/botania/blockstates/ghostRail.json new file mode 100644 index 000000000..96631fbfc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/ghostRail.json @@ -0,0 +1,23 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "rail": "botania:blocks/ghostRail" + }, + "transform": "forge:default-item" + }, + "variants": { + "shape=north_south": { "model": "minecraft:rail_flat" }, + "shape=east_west": { "model": "minecraft:rail_flat", "y": 90 }, + "shape=ascending_east": { "model": "minecraft:rail_raised_ne", "y": 90 }, + "shape=ascending_west": { "model": "minecraft:rail_raised_sw", "y": 90 }, + "shape=ascending_north": { "model": "minecraft:rail_raised_ne" }, + "shape=ascending_south": { "model": "minecraft:rail_raised_sw" }, + "inventory": [{ + "model": "builtin/generated", + "textures": { + "layer0": "botania:blocks/ghostRail" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock0Slab.json b/src/main/resources/assets/botania/blockstates/livingrock0Slab.json new file mode 100644 index 000000000..190b2dc17 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingrock0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/livingrock0", + "top": "botania:blocks/livingrock0", + "side": "botania:blocks/livingrock0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock0SlabFull.json b/src/main/resources/assets/botania/blockstates/livingrock0SlabFull.json new file mode 100644 index 000000000..9bc4eca76 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingrock0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/livingrock0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock0Wall.json b/src/main/resources/assets/botania/blockstates/livingrock0Wall.json new file mode 100644 index 000000000..6da2b10a5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingrock0Wall.json @@ -0,0 +1,37 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:wall_post", + "uvlock": true, + "transform": "forge:default-block", + "textures": { "wall": "botania:blocks/livingrock0" } + }, + "variants": { + "east=false,north=true,south=true,up=false,west=false": { "model": null }, + "east=true,north=false,south=false,up=false,west=true": { "model": null }, + + "north": { + "true": { "submodel": "botania:wall_connect" }, + "false": {} + }, + "south": { + "true": { "submodel": "botania:wall_connect", "y": 180 }, + "false": {} + }, + "west": { + "true": { "submodel": "botania:wall_connect", "y": 270 }, + "false": {} + }, + "east": { + "true": { "submodel": "botania:wall_connect", "y": 90 }, + "false": {} + }, + "up": { + "true": {}, + "false": {} + }, + "inventory": [{ + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock1Slab.json b/src/main/resources/assets/botania/blockstates/livingrock1Slab.json new file mode 100644 index 000000000..66937cf5d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingrock1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/livingrock1", + "top": "botania:blocks/livingrock1", + "side": "botania:blocks/livingrock1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock1SlabFull.json b/src/main/resources/assets/botania/blockstates/livingrock1SlabFull.json new file mode 100644 index 000000000..edf8dd3ea --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingrock1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/livingrock1" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood0Slab.json b/src/main/resources/assets/botania/blockstates/livingwood0Slab.json new file mode 100644 index 000000000..4f185b5b8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingwood0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/livingwood0", + "top": "botania:blocks/livingwood0", + "side": "botania:blocks/livingwood0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood0SlabFull.json b/src/main/resources/assets/botania/blockstates/livingwood0SlabFull.json new file mode 100644 index 000000000..41e2ca5c6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingwood0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/livingwood0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood0Wall.json b/src/main/resources/assets/botania/blockstates/livingwood0Wall.json new file mode 100644 index 000000000..a7dc154f6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingwood0Wall.json @@ -0,0 +1,37 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:wall_post", + "uvlock": true, + "transform": "forge:default-block", + "textures": { "wall": "botania:blocks/livingwood0" } + }, + "variants": { + "east=false,north=true,south=true,up=false,west=false": { "model": null }, + "east=true,north=false,south=false,up=false,west=true": { "model": null }, + + "north": { + "true": { "submodel": "botania:wall_connect" }, + "false": {} + }, + "south": { + "true": { "submodel": "botania:wall_connect", "y": 180 }, + "false": {} + }, + "west": { + "true": { "submodel": "botania:wall_connect", "y": 270 }, + "false": {} + }, + "east": { + "true": { "submodel": "botania:wall_connect", "y": 90 }, + "false": {} + }, + "up": { + "true": {}, + "false": {} + }, + "inventory": [{ + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood1Slab.json b/src/main/resources/assets/botania/blockstates/livingwood1Slab.json new file mode 100644 index 000000000..9dd7a8390 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingwood1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/livingwood1", + "top": "botania:blocks/livingwood1", + "side": "botania:blocks/livingwood1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood1SlabFull.json b/src/main/resources/assets/botania/blockstates/livingwood1SlabFull.json new file mode 100644 index 000000000..a7063094e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingwood1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/livingwood1" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement.json b/src/main/resources/assets/botania/blockstates/pavement.json new file mode 100644 index 000000000..baa9db28b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "color=white": [{ "textures": { "all": "botania:blocks/pavement0" } }], + "color=black": [{ "textures": { "all": "botania:blocks/pavement1" } }], + "color=blue": [{ "textures": { "all": "botania:blocks/pavement2" } }], + "color=red": [{ "textures": { "all": "botania:blocks/pavement3"} }], + "color=yellow": [{ "textures": { "all": "botania:blocks/pavement4"} }], + "color=green": [{ "textures": { "all": "botania:blocks/pavement5" } }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement0Slab.json b/src/main/resources/assets/botania/blockstates/pavement0Slab.json new file mode 100644 index 000000000..14b6c0b05 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/pavement0", + "top": "botania:blocks/pavement0", + "side": "botania:blocks/pavement0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement0SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement0SlabFull.json new file mode 100644 index 000000000..dc17cad32 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/pavement0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement1Slab.json b/src/main/resources/assets/botania/blockstates/pavement1Slab.json new file mode 100644 index 000000000..3b757b046 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/pavement1", + "top": "botania:blocks/pavement1", + "side": "botania:blocks/pavement1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement1SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement1SlabFull.json new file mode 100644 index 000000000..a35d6bb36 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/pavement1" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement2Slab.json b/src/main/resources/assets/botania/blockstates/pavement2Slab.json new file mode 100644 index 000000000..2267776d9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement2Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/pavement2", + "top": "botania:blocks/pavement2", + "side": "botania:blocks/pavement2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement2SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement2SlabFull.json new file mode 100644 index 000000000..60422e335 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement2SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/pavement2" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement3Slab.json b/src/main/resources/assets/botania/blockstates/pavement3Slab.json new file mode 100644 index 000000000..fe1f093fd --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement3Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/pavement3", + "top": "botania:blocks/pavement3", + "side": "botania:blocks/pavement3" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement3SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement3SlabFull.json new file mode 100644 index 000000000..a8fb061e5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement3SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/pavement3" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement4Slab.json b/src/main/resources/assets/botania/blockstates/pavement4Slab.json new file mode 100644 index 000000000..77d541496 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement4Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/pavement4", + "top": "botania:blocks/pavement4", + "side": "botania:blocks/pavement4" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement4SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement4SlabFull.json new file mode 100644 index 000000000..b3796d2e9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement4SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/pavement4" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement5Slab.json b/src/main/resources/assets/botania/blockstates/pavement5Slab.json new file mode 100644 index 000000000..9e225f073 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement5Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/pavement5", + "top": "botania:blocks/pavement5", + "side": "botania:blocks/pavement5" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement5SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement5SlabFull.json new file mode 100644 index 000000000..bdbf59766 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement5SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/pavement5" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine0Slab.json b/src/main/resources/assets/botania/blockstates/prismarine0Slab.json new file mode 100644 index 000000000..298f5d686 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/prismarine0", + "top": "botania:blocks/prismarine0", + "side": "botania:blocks/prismarine0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine0SlabFull.json b/src/main/resources/assets/botania/blockstates/prismarine0SlabFull.json new file mode 100644 index 000000000..461c065a6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/prismarine0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine0Wall.json b/src/main/resources/assets/botania/blockstates/prismarine0Wall.json new file mode 100644 index 000000000..05ddceaee --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine0Wall.json @@ -0,0 +1,37 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:wall_post", + "uvlock": true, + "transform": "forge:default-block", + "textures": { "wall": "botania:blocks/prismarine0" } + }, + "variants": { + "east=false,north=true,south=true,up=false,west=false": { "model": null }, + "east=true,north=false,south=false,up=false,west=true": { "model": null }, + + "north": { + "true": { "submodel": "botania:wall_connect" }, + "false": {} + }, + "south": { + "true": { "submodel": "botania:wall_connect", "y": 180 }, + "false": {} + }, + "west": { + "true": { "submodel": "botania:wall_connect", "y": 270 }, + "false": {} + }, + "east": { + "true": { "submodel": "botania:wall_connect", "y": 90 }, + "false": {} + }, + "up": { + "true": {}, + "false": {} + }, + "inventory": [{ + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine1Slab.json b/src/main/resources/assets/botania/blockstates/prismarine1Slab.json new file mode 100644 index 000000000..e26fcac06 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/prismarine1", + "top": "botania:blocks/prismarine1", + "side": "botania:blocks/prismarine1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine1SlabFull.json b/src/main/resources/assets/botania/blockstates/prismarine1SlabFull.json new file mode 100644 index 000000000..6bf1e8c65 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/prismarine1" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine2Slab.json b/src/main/resources/assets/botania/blockstates/prismarine2Slab.json new file mode 100644 index 000000000..29219a2ca --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine2Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/prismarine2", + "top": "botania:blocks/prismarine2", + "side": "botania:blocks/prismarine2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine2SlabFull.json b/src/main/resources/assets/botania/blockstates/prismarine2SlabFull.json new file mode 100644 index 000000000..ed540022e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine2SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/prismarine2" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabBlazeFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabBlazeFull.json new file mode 100644 index 000000000..09b750c4e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabBlazeFull.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockBlazeQuartz0", + "top": "botania:blocks/blockBlazeQuartz1", + "side": "botania:blocks/blockBlazeQuartz2" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabBlazeHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabBlazeHalf.json new file mode 100644 index 000000000..7705bc87a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabBlazeHalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockBlazeQuartz0", + "top": "botania:blocks/blockBlazeQuartz1", + "side": "botania:blocks/blockBlazeQuartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabDarkFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabDarkFull.json new file mode 100644 index 000000000..1b1039a18 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabDarkFull.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockDarkQuartz0", + "top": "botania:blocks/blockDarkQuartz1", + "side": "botania:blocks/blockDarkQuartz2" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabDarkHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabDarkHalf.json new file mode 100644 index 000000000..8ca8be7bc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabDarkHalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockDarkQuartz0", + "top": "botania:blocks/blockDarkQuartz1", + "side": "botania:blocks/blockDarkQuartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabElfFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabElfFull.json new file mode 100644 index 000000000..a7172cc7b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabElfFull.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockElfQuartz0", + "top": "botania:blocks/blockElfQuartz1", + "side": "botania:blocks/blockElfQuartz2" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabElfHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabElfHalf.json new file mode 100644 index 000000000..d81a802f5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabElfHalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockElfQuartz0", + "top": "botania:blocks/blockElfQuartz1", + "side": "botania:blocks/blockElfQuartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabLavenderFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabLavenderFull.json new file mode 100644 index 000000000..b1a53a9e4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabLavenderFull.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockLavenderQuartz0", + "top": "botania:blocks/blockLavenderQuartz1", + "side": "botania:blocks/blockLavenderQuartz2" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabLavenderHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabLavenderHalf.json new file mode 100644 index 000000000..56f856ee3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabLavenderHalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockLavenderQuartz0", + "top": "botania:blocks/blockLavenderQuartz1", + "side": "botania:blocks/blockLavenderQuartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabManaFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabManaFull.json new file mode 100644 index 000000000..721c03133 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabManaFull.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockManaQuartz0", + "top": "botania:blocks/blockManaQuartz1", + "side": "botania:blocks/blockManaQuartz2" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabManaHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabManaHalf.json new file mode 100644 index 000000000..cceba9781 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabManaHalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockManaQuartz0", + "top": "botania:blocks/blockManaQuartz1", + "side": "botania:blocks/blockManaQuartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabRedFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabRedFull.json new file mode 100644 index 000000000..a360f41ff --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabRedFull.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockRedQuartz0", + "top": "botania:blocks/blockRedQuartz1", + "side": "botania:blocks/blockRedQuartz2" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabRedHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabRedHalf.json new file mode 100644 index 000000000..7f7e3954c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabRedHalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockRedQuartz0", + "top": "botania:blocks/blockRedQuartz1", + "side": "botania:blocks/blockRedQuartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabSunnyFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabSunnyFull.json new file mode 100644 index 000000000..30a9b079a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabSunnyFull.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockSunnyQuartz0", + "top": "botania:blocks/blockSunnyQuartz1", + "side": "botania:blocks/blockSunnyQuartz2" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabSunnyHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabSunnyHalf.json new file mode 100644 index 000000000..0a36b02be --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabSunnyHalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockSunnyQuartz0", + "top": "botania:blocks/blockSunnyQuartz1", + "side": "botania:blocks/blockSunnyQuartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/reedBlock0Slab.json b/src/main/resources/assets/botania/blockstates/reedBlock0Slab.json new file mode 100644 index 000000000..7eaf54181 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/reedBlock0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/reedBlock1", + "top": "botania:blocks/reedBlock1", + "side": "botania:blocks/reedBlock0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/reedBlock0SlabFull.json b/src/main/resources/assets/botania/blockstates/reedBlock0SlabFull.json new file mode 100644 index 000000000..3ddec2017 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/reedBlock0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_bottom_top", + "textures": { "bottom": "botania:blocks/reedBlock1", "top": "botania:blocks/reedBlock1", "side": "botania:blocks/reedBlock0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json b/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json index d86dfd521..b9d64984b 100644 --- a/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json @@ -2,8 +2,8 @@ "forge_marker": 1, "defaults": { "textures": { - "bottom": "botania:blocks/reedBlock0", - "top": "botania:blocks/reedBlock0", + "bottom": "botania:blocks/reedBlock1", + "top": "botania:blocks/reedBlock1", "side": "botania:blocks/reedBlock0" } }, diff --git a/src/main/resources/assets/botania/blockstates/reedBlock0Wall.json b/src/main/resources/assets/botania/blockstates/reedBlock0Wall.json new file mode 100644 index 000000000..c6c6dfa19 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/reedBlock0Wall.json @@ -0,0 +1,37 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:wall_post_bottom_top", + "uvlock": true, + "transform": "forge:default-block", + "textures": { "side": "botania:blocks/reedBlock0", "top": "botania:blocks/reedBlock1", "bottom": "botania:blocks/reedBlock1" } + }, + "variants": { + "east=false,north=true,south=true,up=false,west=false": { "model": null }, + "east=true,north=false,south=false,up=false,west=true": { "model": null }, + + "north": { + "true": { "submodel": "botania:wall_connect_bottom_top" }, + "false": {} + }, + "south": { + "true": { "submodel": "botania:wall_connect_bottom_top", "y": 180 }, + "false": {} + }, + "west": { + "true": { "submodel": "botania:wall_connect_bottom_top", "y": 270 }, + "false": {} + }, + "east": { + "true": { "submodel": "botania:wall_connect_bottom_top", "y": 90 }, + "false": {} + }, + "up": { + "true": {}, + "false": {} + }, + "inventory": [{ + "submodel": { "north": { "model": "botania:wall_connect_bottom_top" }, "south": { "model": "botania:wall_connect_bottom_top", "y": 180 }} + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerrock.json b/src/main/resources/assets/botania/blockstates/shimmerrock.json new file mode 100644 index 000000000..55193392b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/shimmerrock.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/shimmerrock" }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerrock0Slab.json b/src/main/resources/assets/botania/blockstates/shimmerrock0Slab.json new file mode 100644 index 000000000..77c9c3667 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/shimmerrock0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/shimmerrock", + "top": "botania:blocks/shimmerrock", + "side": "botania:blocks/shimmerrock" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerrock0SlabFull.json b/src/main/resources/assets/botania/blockstates/shimmerrock0SlabFull.json new file mode 100644 index 000000000..7846bb4cb --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/shimmerrock0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/shimmerrock" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks.json b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks.json new file mode 100644 index 000000000..c80cb83d3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/shimmerwoodPlanks" }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Slab.json b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Slab.json new file mode 100644 index 000000000..0b94b90be --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/shimmerwoodPlanks", + "top": "botania:blocks/shimmerwoodPlanks", + "side": "botania:blocks/shimmerwoodPlanks" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0SlabFull.json b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0SlabFull.json new file mode 100644 index 000000000..ee31766f3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/shimmerwoodPlanks" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone.json b/src/main/resources/assets/botania/blockstates/stone.json new file mode 100644 index 000000000..249d618ba --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone.json @@ -0,0 +1,25 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "variant=andesite": [{ "textures": { "all": "botania:blocks/stone0" } }], + "variant=basalt": [{ "textures": { "all": "botania:blocks/stone1" } }], + "variant=diorite": [{ "textures": { "all": "botania:blocks/stone2" } }], + "variant=granite": [{ "textures": { "all": "botania:blocks/stone3" } }], + "variant=polished_andesite": [{ "textures": { "all": "botania:blocks/stone4" } }], + "variant=polished_basalt": [{ "textures": { "all": "botania:blocks/stone5" } }], + "variant=polished_diorite": [{ "textures": { "all": "botania:blocks/stone6" } }], + "variant=polished_granite": [{ "textures": { "all": "botania:blocks/stone7" } }], + "variant=andesite_brick": [{ "textures": { "all": "botania:blocks/stone8" } }], + "variant=basalt_brick": [{ "textures": { "all": "botania:blocks/stone9" } }], + "variant=diorite_brick": [{ "textures": { "all": "botania:blocks/stone10" } }], + "variant=granite_brick": [{ "textures": { "all": "botania:blocks/stone11" } }], + "variant=chiseled_andesite": [{ "textures": { "all": "botania:blocks/stone12" } }], + "variant=chiseled_basalt": [{ "textures": { "all": "botania:blocks/stone13" } }], + "variant=chiseled_diorite": [{ "textures": { "all": "botania:blocks/stone14" } }], + "variant=chiseled_granite": [{ "textures": { "all": "botania:blocks/stone15" } }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone0Slab.json b/src/main/resources/assets/botania/blockstates/stone0Slab.json new file mode 100644 index 000000000..69bc192bc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/stone0", + "top": "botania:blocks/stone0", + "side": "botania:blocks/stone0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone0SlabFull.json b/src/main/resources/assets/botania/blockstates/stone0SlabFull.json new file mode 100644 index 000000000..abf015306 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/stone0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone10Slab.json b/src/main/resources/assets/botania/blockstates/stone10Slab.json new file mode 100644 index 000000000..e34591679 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone10Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/stone10", + "top": "botania:blocks/stone10", + "side": "botania:blocks/stone10" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone10SlabFull.json b/src/main/resources/assets/botania/blockstates/stone10SlabFull.json new file mode 100644 index 000000000..3c06d8495 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone10SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/stone10" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone11Slab.json b/src/main/resources/assets/botania/blockstates/stone11Slab.json new file mode 100644 index 000000000..d552b8011 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone11Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/stone11", + "top": "botania:blocks/stone11", + "side": "botania:blocks/stone11" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone11SlabFull.json b/src/main/resources/assets/botania/blockstates/stone11SlabFull.json new file mode 100644 index 000000000..c23b8fae1 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone11SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/stone11" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone1Slab.json b/src/main/resources/assets/botania/blockstates/stone1Slab.json new file mode 100644 index 000000000..4508c5ae4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/stone1", + "top": "botania:blocks/stone1", + "side": "botania:blocks/stone1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone1SlabFull.json b/src/main/resources/assets/botania/blockstates/stone1SlabFull.json new file mode 100644 index 000000000..f4aabbb94 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/stone1" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone2Slab.json b/src/main/resources/assets/botania/blockstates/stone2Slab.json new file mode 100644 index 000000000..fe8112611 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone2Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/stone2", + "top": "botania:blocks/stone2", + "side": "botania:blocks/stone2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone2SlabFull.json b/src/main/resources/assets/botania/blockstates/stone2SlabFull.json new file mode 100644 index 000000000..651f4de73 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone2SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/stone2" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone3Slab.json b/src/main/resources/assets/botania/blockstates/stone3Slab.json new file mode 100644 index 000000000..8cc0f549c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone3Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/stone3", + "top": "botania:blocks/stone3", + "side": "botania:blocks/stone3" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone3SlabFull.json b/src/main/resources/assets/botania/blockstates/stone3SlabFull.json new file mode 100644 index 000000000..f12af79cc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone3SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/stone3" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone8Slab.json b/src/main/resources/assets/botania/blockstates/stone8Slab.json new file mode 100644 index 000000000..1b98c7a73 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone8Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/stone8", + "top": "botania:blocks/stone8", + "side": "botania:blocks/stone8" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone8SlabFull.json b/src/main/resources/assets/botania/blockstates/stone8SlabFull.json new file mode 100644 index 000000000..b9418ced7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone8SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/stone8" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone9Slab.json b/src/main/resources/assets/botania/blockstates/stone9Slab.json new file mode 100644 index 000000000..3c15896c2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone9Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/stone9", + "top": "botania:blocks/stone9", + "side": "botania:blocks/stone9" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone9SlabFull.json b/src/main/resources/assets/botania/blockstates/stone9SlabFull.json new file mode 100644 index 000000000..17c878f1b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone9SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/stone9" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/thatch0Slab.json b/src/main/resources/assets/botania/blockstates/thatch0Slab.json new file mode 100644 index 000000000..d71cfd06a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/thatch0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/thatch", + "top": "botania:blocks/thatch", + "side": "botania:blocks/thatch" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/thatch0SlabFull.json b/src/main/resources/assets/botania/blockstates/thatch0SlabFull.json new file mode 100644 index 000000000..427822d3b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/thatch0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/thatch" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/wall_connect_bottom_top.json b/src/main/resources/assets/botania/models/block/wall_connect_bottom_top.json new file mode 100644 index 000000000..3252c7e70 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/wall_connect_bottom_top.json @@ -0,0 +1,20 @@ +{ + "__comment": "Stolen from the Forge example/debug code", + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [ 5, 0, 0 ], + "to": [ 11, 13, 8 ], + "faces": { + "down": { "uv": [ 5, 0, 11, 8 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 5, 0, 11, 8 ], "texture": "#top" }, + "north": { "uv": [ 5, 3, 11, 16 ], "texture": "#side", "cullface": "north" }, + "west": { "uv": [ 0, 3, 8, 16 ], "texture": "#side" }, + "east": { "uv": [ 0, 3, 8, 16 ], "texture": "#side" } + }, + "__comment": "North wall" + } + ] +} diff --git a/src/main/resources/assets/botania/models/block/wall_post_bottom_top.json b/src/main/resources/assets/botania/models/block/wall_post_bottom_top.json new file mode 100644 index 000000000..c060e1ff3 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/wall_post_bottom_top.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "#side" + }, + "elements": [ + { "from": [ 4, 0, 4 ], + "to": [ 12, 16, 12 ], + "faces": { + "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top", "cullface": "up" }, + "north": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, + "south": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, + "west": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, + "east": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" } + }, + "__comment": "Center post" + } + ] +}