From e2ac5ecad1e27859f98425ffa58afcb8eb07a8d4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 26 Dec 2015 00:49:30 -0600 Subject: [PATCH] Fix double flowers fully, a couple more models --- .../botania/api/state/BotaniaStateProps.java | 5 + .../client/core/handler/ModelHandler.java | 29 +++++ .../botania/common/block/BlockGhostRail.java | 10 +- .../common/block/BlockModDoubleFlower.java | 113 +++--------------- .../common/block/BlockModDoubleFlower1.java | 11 +- .../common/block/BlockModDoubleFlower2.java | 11 +- .../common/block/decor/BlockReeds.java | 8 +- .../common/block/mana/BlockManaVoid.java | 5 + .../botania/blockstates/alchemyCatalyst.json | 17 +++ .../blockstates/conjurationCatalyst.json | 17 +++ .../botania/blockstates/doubleFlower1.json | 65 ++++++++++ .../botania/blockstates/doubleFlower2.json | 65 ++++++++++ .../assets/botania/blockstates/dreamwood.json | 15 +++ .../assets/botania/blockstates/manaVoid.json | 15 +++ .../assets/botania/blockstates/reedBlock.json | 19 +++ 15 files changed, 296 insertions(+), 109 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/alchemyCatalyst.json create mode 100644 src/main/resources/assets/botania/blockstates/conjurationCatalyst.json create mode 100644 src/main/resources/assets/botania/blockstates/doubleFlower1.json create mode 100644 src/main/resources/assets/botania/blockstates/doubleFlower2.json create mode 100644 src/main/resources/assets/botania/blockstates/dreamwood.json create mode 100644 src/main/resources/assets/botania/blockstates/manaVoid.json create mode 100644 src/main/resources/assets/botania/blockstates/reedBlock.json diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index e4b352b78..c8e9691fe 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -2,6 +2,8 @@ package vazkii.botania.api.state; import com.google.common.base.Predicate; import com.google.common.base.Predicates; +import net.minecraft.block.BlockRailBase; +import net.minecraft.block.BlockRailPowered; import net.minecraft.block.BlockRotatedPillar; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; @@ -96,6 +98,9 @@ public class BotaniaStateProps { // BlockForestDrum public static final PropertyEnum DRUM_VARIANT = PropertyEnum.create("variant", DrumVariant.class); + // BlockGhostRail + public static final PropertyEnum RAIL_DIRECTION = BlockRailPowered.SHAPE; + // BlockLightRelay public static final PropertyEnum LUMINIZER_VARIANT = PropertyEnum.create("variant", LuminizerVariant.class); 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 f7d13208a..e5fcda327 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -3,6 +3,7 @@ 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.BlockDoublePlant; import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockRailPowered; import net.minecraft.block.BlockSlab; @@ -188,6 +189,10 @@ public final class ModelHandler { registerItemModel(ModBlocks.ghostRail); registerItemModel(ModBlocks.shimmerrock); registerItemModel(ModBlocks.shimmerwoodPlanks); + registerItemModel(ModBlocks.manaVoid); + registerItemModel(ModBlocks.alchemyCatalyst); + registerItemModel(ModBlocks.conjurationCatalyst); + registerItemModel(ModBlocks.reedBlock); // Blocks which share models with their item, and have only one variant to switch over registerVariantsDefaulted(ModBlocks.altGrass, AltGrassVariant.class, "variant"); @@ -196,6 +201,7 @@ public final class ModelHandler { registerVariantsDefaulted(ModBlocks.forestDrum, DrumVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.livingrock, LivingRockVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.livingwood, LivingWoodVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.dreamwood, LivingWoodVariant.class, "variant"); registerVariantsDefaulted(ModFluffBlocks.stone, FutureStoneVariant.class, "variant"); registerVariantsDefaulted(ModFluffBlocks.biomeStoneA, BiomeStoneVariant.class, "variant"); registerVariantsDefaulted(ModFluffBlocks.biomeStoneB, BiomeBrickVariant.class, "variant"); @@ -257,6 +263,10 @@ public final class ModelHandler { } private static void registerStateMappers() { + // Ignore vanilla facing, variant in double flower + ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower1, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); + ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower2, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); + // Ignore redstone power state in some blocks ModelLoader.setCustomStateMapper(ModBlocks.starfield, (new StateMap.Builder()).ignore(BotaniaStateProps.POWERED).build()); @@ -270,6 +280,9 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(ModBlocks.shinyFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.shinyFlower).getTypeProperty()).build()); ModelLoader.setCustomStateMapper(ModBlocks.buriedPetals, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.buriedPetals).getTypeProperty()).build()); + // Ignore in special flower to suppress errors (handled in custom statemapper in BlockSpecialFlower + ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR, ((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build()); + // Ignore vanilla variant in walls ModelLoader.setCustomStateMapper(ModFluffBlocks.biomeStoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); @@ -355,6 +368,22 @@ public final class ModelHandler { ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory")); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); } + + item = Item.getItemFromBlock(ModBlocks.doubleFlower1); + for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1.getAllowedValues()) { + String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.doubleFlower1).toString(); + String variant = "inventory_" + color.getName(); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, variant)); + } + + item = Item.getItemFromBlock(ModBlocks.doubleFlower2); + for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_2.getAllowedValues()) { + String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.doubleFlower2).toString(); + String variant = "inventory_" + color.getName(); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata() - 8, new ModelResourceLocation(name, variant)); + } } private static void registerPavement() { diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index 52b7311e0..6bd622ad1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -26,6 +26,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.minecart.MinecartUpdateEvent; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; @@ -38,7 +39,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockGhostRail extends BlockRailBase implements ILexiconable { - public static final PropertyEnum SHAPE = BlockRailPowered.SHAPE; private static final String TAG_FLOAT_TICKS = "Botania_FloatTicks"; public BlockGhostRail() { @@ -46,22 +46,22 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { setCreativeTab(BotaniaCreativeTab.INSTANCE); MinecraftForge.EVENT_BUS.register(this); setUnlocalizedName(LibBlockNames.GHOST_RAIL); - setDefaultState(blockState.getBaseState().withProperty(SHAPE, EnumRailDirection.NORTH_SOUTH)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.RAIL_DIRECTION, EnumRailDirection.NORTH_SOUTH)); } @Override public BlockState createBlockState() { - return new BlockState(this, SHAPE); + return new BlockState(this, BotaniaStateProps.RAIL_DIRECTION); } @Override public int getMetaFromState(IBlockState state) { - return state.getValue(SHAPE).getMetadata(); + return state.getValue(BotaniaStateProps.RAIL_DIRECTION).getMetadata(); } @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(SHAPE, EnumRailDirection.byMetadata(meta)); + return getDefaultState().withProperty(BotaniaStateProps.RAIL_DIRECTION, EnumRailDirection.byMetadata(meta)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 7493e23bb..63d7e748a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -10,6 +10,8 @@ */ package vazkii.botania.common.block; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.BlockDoublePlant; @@ -30,6 +32,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; @@ -50,15 +53,13 @@ import java.util.List; import java.util.Random; // Lots of copy paste from BlockDoublePlant because we can no longer extend it in 1.8.x -public abstract class BlockModDoubleFlower extends BlockBush implements IGrowable, IShearable, ILexiconable { - public static final PropertyEnum HALF = BlockDoublePlant.HALF; +public abstract class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconable { private static final int COUNT = 8; final int offset; final boolean second; public BlockModDoubleFlower(boolean second) { - super(Material.vine); this.second = second; this.setHardness(0.0F); this.setStepSound(soundTypeGrass); @@ -93,7 +94,7 @@ public abstract class BlockModDoubleFlower extends BlockBush implements IGrowabl @Override public int damageDropped(IBlockState state) { - return getMetaFromState(state.withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER)); + return 0; } @Override @@ -106,11 +107,6 @@ public abstract class BlockModDoubleFlower extends BlockBush implements IGrowabl return true; } - @Override - public void grow(World world, Random rand, BlockPos pos, IBlockState state) { - // todo 1.8.8 drop - } - @Override public void harvestBlock(World p_149636_1_, EntityPlayer p_149636_2_, BlockPos pos, IBlockState state, TileEntity te) { if(p_149636_1_.isRemote || p_149636_2_.getCurrentEquippedItem() == null || p_149636_2_.getCurrentEquippedItem().getItem() != Items.shears || state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.LOWER) @@ -185,7 +181,10 @@ public abstract class BlockModDoubleFlower extends BlockBush implements IGrowabl @Override public List onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) { ArrayList ret = new ArrayList(); - ret.add(new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos).withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER)))); + if (world.getBlockState(pos.down()).getBlock() == this + && world.getBlockState(pos.down()).getValue(HALF) == EnumBlockHalf.LOWER) { + ret.add(new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos.down())))); + } return ret; } @@ -205,14 +204,9 @@ public abstract class BlockModDoubleFlower extends BlockBush implements IGrowabl p_149666_3_.add(new ItemStack(p_149666_1_, 1, i)); } - @Override - public int getRenderType() { - return LibRenderIDs.idDoubleFlower; - } - @Override public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { - int hex = ((EnumDyeColor) state.getValue(second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1)).getMapColor().colorValue; + int hex = state.getValue(second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = (hex & 0xFF); @@ -227,93 +221,18 @@ public abstract class BlockModDoubleFlower extends BlockBush implements IGrowabl return LexiconData.flowers; } - - - /** BEGIN COPY BlockDoublePlant **/ - @Override - public void setBlockBoundsBasedOnState(IBlockAccess worldIn, BlockPos pos) - { - this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); - } - - @Override - public boolean canPlaceBlockAt(World worldIn, BlockPos pos) - { - return super.canPlaceBlockAt(worldIn, pos) && worldIn.isAirBlock(pos.up()); - } - - @Override - protected void checkAndDropBlock(World worldIn, BlockPos pos, IBlockState state) - { - if (!this.canBlockStay(worldIn, pos, state)) - { - boolean flag = state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER; - BlockPos blockpos = flag ? pos : pos.up(); - BlockPos blockpos1 = flag ? pos.down() : pos; - Block block = (Block)(flag ? this : worldIn.getBlockState(blockpos).getBlock()); - Block block1 = (Block)(flag ? worldIn.getBlockState(blockpos1).getBlock() : this); - - if (!flag) this.dropBlockAsItem(worldIn, pos, state, 0); //Forge move above the setting to air. - - if (block == this) - { - worldIn.setBlockState(blockpos, Blocks.air.getDefaultState(), 2); - } - - if (block1 == this) - { - worldIn.setBlockState(blockpos1, Blocks.air.getDefaultState(), 3); - } - } - } - - @Override - public boolean canBlockStay(World worldIn, BlockPos pos, IBlockState state) - { - if (state.getBlock() != this) return super.canBlockStay(worldIn, pos, state); //Forge: This function is called during world gen and placement, before this block is set, so if we are not 'here' then assume it's the pre-check. - if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) - { - return worldIn.getBlockState(pos.down()).getBlock() == this; - } - else - { - IBlockState iblockstate = worldIn.getBlockState(pos.up()); - return iblockstate.getBlock() == this && super.canBlockStay(worldIn, pos, iblockstate); - } - } - - @Override - public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) - { - worldIn.setBlockState(pos.up(), this.getDefaultState().withProperty(HALF, BlockDoublePlant.EnumBlockHalf.UPPER), 2); - } - - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) - { - if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) - { + public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { IBlockState iblockstate = worldIn.getBlockState(pos.down()); - if (iblockstate.getBlock() == this) - { - state = state.withProperty(BotaniaStateProps.COLOR, iblockstate.getValue(BotaniaStateProps.COLOR)); + if (iblockstate.getBlock() == this) { + PropertyEnum prop = second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1; + state = state.withProperty(prop, iblockstate.getValue(prop)); } } - return state; + return state.withProperty(VARIANT, EnumPlantType.SUNFLOWER).withProperty(field_181084_N, EnumFacing.SOUTH); } - @Override - public boolean removedByPlayer(World world, BlockPos pos, EntityPlayer player, boolean willHarvest) - { - //Forge: Break both parts on the client to prevent the top part flickering as default type for a few frames. - IBlockState state = world.getBlockState(pos); - if (state.getBlock() == this && state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.LOWER && world.getBlockState(pos.up()).getBlock() == this) - world.setBlockToAir(pos.up()); - return world.setBlockToAir(pos); - } - - } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java index 634f644ae..8d8c1b8b9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java @@ -4,23 +4,28 @@ import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; // White to Gray public class BlockModDoubleFlower1 extends BlockModDoubleFlower { public BlockModDoubleFlower1() { super(false); - setDefaultState(blockState.getBaseState().withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.WHITE)); + setDefaultState(blockState.getBaseState() + .withProperty(field_181084_N, EnumFacing.SOUTH) + .withProperty(VARIANT, EnumPlantType.SUNFLOWER) + .withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER) + .withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.WHITE)); } @Override public BlockState createBlockState() { - return new BlockState(this, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_1); + return new BlockState(this, field_181084_N, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_1); } @Override public int getMetaFromState(IBlockState state) { - int meta = ((EnumDyeColor) state.getValue(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1)).getMetadata(); + int meta = state.getValue(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1).getMetadata(); if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { meta |= 8; } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java index 8604b2ddb..9f97b95eb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java @@ -4,6 +4,7 @@ import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; // Silver to black @@ -11,17 +12,21 @@ public class BlockModDoubleFlower2 extends BlockModDoubleFlower { public BlockModDoubleFlower2() { super(true); - setDefaultState(blockState.getBaseState().withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.SILVER)); + setDefaultState(blockState.getBaseState() + .withProperty(field_181084_N, EnumFacing.SOUTH) + .withProperty(VARIANT, EnumPlantType.SUNFLOWER) + .withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER) + .withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.SILVER)); } @Override public BlockState createBlockState() { - return new BlockState(this, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_2); + return new BlockState(this, field_181084_N, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_2); } @Override public int getMetaFromState(IBlockState state) { - int meta = ((EnumDyeColor) state.getValue(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2)).getMetadata() - 8; + int meta = state.getValue(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2).getMetadata() - 8; if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { meta |= 8; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java index c965be68e..1d33853d7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java @@ -15,6 +15,7 @@ import net.minecraft.block.BlockRotatedPillar; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; @@ -47,7 +48,7 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable { @Override public int getMetaFromState(IBlockState state) { - switch (((EnumFacing.Axis) state.getValue(BotaniaStateProps.AXIS_FACING))) { + switch (state.getValue(BotaniaStateProps.AXIS_FACING)) { case Z: return 8; case X: return 4; case Y: @@ -67,6 +68,11 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.AXIS_FACING, axis); } + @Override + public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { + return getStateFromMeta(meta).withProperty(BotaniaStateProps.AXIS_FACING, facing.getAxis()); + } + @Override public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java index cf0985358..cd73072a3 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -45,6 +45,11 @@ public class BlockManaVoid extends BlockModContainer implements ILexiconable, IP MinecraftForge.EVENT_BUS.register(this); } + @Override + public int getRenderType() { + return 3; + } + @SubscribeEvent @SideOnly(Side.CLIENT) public void onTextureStitch(TextureStitchEvent.Pre evt) { diff --git a/src/main/resources/assets/botania/blockstates/alchemyCatalyst.json b/src/main/resources/assets/botania/blockstates/alchemyCatalyst.json new file mode 100644 index 000000000..e054f42ab --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/alchemyCatalyst.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/alchemyCatalyst0", + "top": "botania:blocks/alchemyCatalyst1", + "side": "botania:blocks/alchemyCatalyst2" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } + +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/conjurationCatalyst.json b/src/main/resources/assets/botania/blockstates/conjurationCatalyst.json new file mode 100644 index 000000000..e3f933d06 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/conjurationCatalyst.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/conjurationCatalyst0", + "top": "botania:blocks/conjurationCatalyst1", + "side": "botania:blocks/conjurationCatalyst2" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } + +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/doubleFlower1.json b/src/main/resources/assets/botania/blockstates/doubleFlower1.json new file mode 100644 index 000000000..7d171908a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/doubleFlower1.json @@ -0,0 +1,65 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cross" + }, + "variants": { + "half=lower,variant=white": [{ "textures": { "cross": "botania:blocks/flower0Tall0" } }], + "half=upper,variant=white": [{ "textures": { "cross": "botania:blocks/flower0Tall1" } }], + "half=lower,variant=orange": [{ "textures": { "cross": "botania:blocks/flower1Tall0" } }], + "half=upper,variant=orange": [{ "textures": { "cross": "botania:blocks/flower1Tall1" } }], + "half=lower,variant=magenta": [{ "textures": { "cross": "botania:blocks/flower2Tall0" } }], + "half=upper,variant=magenta": [{ "textures": { "cross": "botania:blocks/flower2Tall1" } }], + "half=lower,variant=light_blue": [{ "textures": { "cross": "botania:blocks/flower3Tall0" } }], + "half=upper,variant=light_blue": [{ "textures": { "cross": "botania:blocks/flower3Tall1" } }], + "half=lower,variant=yellow": [{ "textures": { "cross": "botania:blocks/flower4Tall0" } }], + "half=upper,variant=yellow": [{ "textures": { "cross": "botania:blocks/flower4Tall1" } }], + "half=lower,variant=lime": [{ "textures": { "cross": "botania:blocks/flower5Tall0" } }], + "half=upper,variant=lime": [{ "textures": { "cross": "botania:blocks/flower5Tall1" } }], + "half=lower,variant=pink": [{ "textures": { "cross": "botania:blocks/flower6Tall0" } }], + "half=upper,variant=pink": [{ "textures": { "cross": "botania:blocks/flower6Tall1" } }], + "half=lower,variant=gray": [{ "textures": { "cross": "botania:blocks/flower7Tall0" } }], + "half=upper,variant=gray": [{ "textures": { "cross": "botania:blocks/flower7Tall1" } }], + + "inventory_white": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower0Tall1" }, + "transform": "forge:default-item" + }], + "inventory_orange": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower1Tall1" }, + "transform": "forge:default-item" + }], + "inventory_magenta": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower2Tall1" }, + "transform": "forge:default-item" + }], + "inventory_light_blue": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower3Tall1" }, + "transform": "forge:default-item" + }], + "inventory_yellow": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower4Tall1" }, + "transform": "forge:default-item" + }], + "inventory_lime": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower5Tall1" }, + "transform": "forge:default-item" + }], + "inventory_pink": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower6Tall1" }, + "transform": "forge:default-item" + }], + "inventory_gray": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower7Tall1" }, + "transform": "forge:default-item" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/doubleFlower2.json b/src/main/resources/assets/botania/blockstates/doubleFlower2.json new file mode 100644 index 000000000..4bd2b54f4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/doubleFlower2.json @@ -0,0 +1,65 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cross" + }, + "variants": { + "half=lower,variant=silver": [{ "textures": { "cross": "botania:blocks/flower8Tall0" } }], + "half=upper,variant=silver": [{ "textures": { "cross": "botania:blocks/flower8Tall1" } }], + "half=lower,variant=cyan": [{ "textures": { "cross": "botania:blocks/flower9Tall0" } }], + "half=upper,variant=cyan": [{ "textures": { "cross": "botania:blocks/flower9Tall1" } }], + "half=lower,variant=purple": [{ "textures": { "cross": "botania:blocks/flower10Tall0" } }], + "half=upper,variant=purple": [{ "textures": { "cross": "botania:blocks/flower10Tall1" } }], + "half=lower,variant=blue": [{ "textures": { "cross": "botania:blocks/flower11Tall0" } }], + "half=upper,variant=blue": [{ "textures": { "cross": "botania:blocks/flower11Tall1" } }], + "half=lower,variant=brown": [{ "textures": { "cross": "botania:blocks/flower12Tall0" } }], + "half=upper,variant=brown": [{ "textures": { "cross": "botania:blocks/flower12Tall1" } }], + "half=lower,variant=green": [{ "textures": { "cross": "botania:blocks/flower13Tall0" } }], + "half=upper,variant=green": [{ "textures": { "cross": "botania:blocks/flower13Tall1" } }], + "half=lower,variant=red": [{ "textures": { "cross": "botania:blocks/flower14Tall0" } }], + "half=upper,variant=red": [{ "textures": { "cross": "botania:blocks/flower14Tall1" } }], + "half=lower,variant=black": [{ "textures": { "cross": "botania:blocks/flower15Tall0" } }], + "half=upper,variant=black": [{ "textures": { "cross": "botania:blocks/flower15Tall1" } }], + + "inventory_silver": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower8Tall1" }, + "transform": "forge:default-item" + }], + "inventory_cyan": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower9Tall1" }, + "transform": "forge:default-item" + }], + "inventory_purple": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower10Tall1" }, + "transform": "forge:default-item" + }], + "inventory_blue": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower11Tall1" }, + "transform": "forge:default-item" + }], + "inventory_brown": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower12Tall1" }, + "transform": "forge:default-item" + }], + "inventory_green": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower13Tall1" }, + "transform": "forge:default-item" + }], + "inventory_red": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower14Tall1" }, + "transform": "forge:default-item" + }], + "inventory_black": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower15Tall1" }, + "transform": "forge:default-item" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood.json b/src/main/resources/assets/botania/blockstates/dreamwood.json new file mode 100644 index 000000000..fb6d48d06 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreamwood.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "variant=default": [{ "textures": { "all": "botania:blocks/dreamwood0" } }], + "variant=planks": [{ "textures": { "all": "botania:blocks/dreamwood1" } }], + "variant=mossy_planks": [{ "textures": { "all": "botania:blocks/dreamwood2" } }], + "variant=framed": [{ "textures": { "all": "botania:blocks/dreamwood3" } }], + "variant=pattern_framed": [{ "textures": { "all": "botania:blocks/dreamwood4" } }], + "variant=glimmering": [{ "textures": { "all": "botania:blocks/dreamwood5" } }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manaVoid.json b/src/main/resources/assets/botania/blockstates/manaVoid.json new file mode 100644 index 000000000..034836e67 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/manaVoid.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/manaVoid0" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } + +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/reedBlock.json b/src/main/resources/assets/botania/blockstates/reedBlock.json new file mode 100644 index 000000000..2eecb5a5d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/reedBlock.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/reedBlock1", + "top": "botania:blocks/reedBlock1", + "side": "botania:blocks/reedBlock0" + }, + "transform": "forge:default-block" + }, + "variants": { + "axis=x": [{ "x": 90, "y": 90 }], + "axis=y": [{}], + "axis=z": [{ "x": 90 }], + "inventory": [{}] + } + +} \ No newline at end of file