diff --git a/src/main/java/WayofTime/bloodmagic/api/Constants.java b/src/main/java/WayofTime/bloodmagic/api/Constants.java index f614aef6..909fe70a 100644 --- a/src/main/java/WayofTime/bloodmagic/api/Constants.java +++ b/src/main/java/WayofTime/bloodmagic/api/Constants.java @@ -300,6 +300,10 @@ public class Constants DEMON_PILLAR_CAP_1("BlockPillarCap1"), DEMON_PILLAR_CAP_2("BlockPillarCap2"), DEMON_PILLAR_CAP_3("BlockPillarCap3"), + DEMON_WALL_1("BlockWall1"), + DEMON_STAIRS_1("BlockStairs1"), + DEMON_STAIRS_2("BlockStairs2"), + DEMON_STAIRS_3("BlockStairs3"), DEMON_LIGHT("BlockDemonLight"); @Getter diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java new file mode 100644 index 00000000..e1d78380 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java @@ -0,0 +1,46 @@ +package WayofTime.bloodmagic.block; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; + +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; + +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.block.base.BlockStringStairs; +import WayofTime.bloodmagic.client.IVariantProvider; + +public class BlockDemonStairsBase extends BlockStringStairs implements IVariantProvider +{ + public final String[] names; + + public BlockDemonStairsBase(String baseName, Material materialIn, String[] names) + { + super(materialIn, names); + this.names = names; + + setUnlocalizedName(Constants.Mod.MODID + "." + baseName + "."); + setCreativeTab(BloodMagic.tabBloodMagic); + setHardness(2.0F); + setResistance(5.0F); + setSoundType(SoundType.STONE); + setHarvestLevel("pickaxe", 2); + } + + @Override + public List> getVariants() + { + List> ret = new ArrayList>(); + + for (int i = 0; i < names.length; i++) + { + ret.add(new ImmutablePair(i, "facing=south,half=bottom,shape=straight,type=" + names[i])); + } + + return ret; + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockStringStairs.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockStringStairs.java new file mode 100644 index 00000000..ff4ab8aa --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockStringStairs.java @@ -0,0 +1,394 @@ +package WayofTime.bloodmagic.block.base; + +import java.util.List; + +import javax.annotation.Nullable; + +import net.minecraft.block.BlockHorizontal; +import net.minecraft.block.BlockStairs; +import net.minecraft.block.BlockStairs.EnumHalf; +import net.minecraft.block.BlockStairs.EnumShape; +import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyDirection; +import net.minecraft.block.state.BlockStateContainer; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.Mirror; +import net.minecraft.util.Rotation; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.property.ExtendedBlockState; +import net.minecraftforge.common.property.IUnlistedProperty; + +import com.google.common.collect.Lists; + +public class BlockStringStairs extends BlockString +{ + public static final PropertyDirection FACING = BlockHorizontal.FACING; + + protected static final AxisAlignedBB AABB_SLAB_TOP = new AxisAlignedBB(0.0D, 0.5D, 0.0D, 1.0D, 1.0D, 1.0D); + protected static final AxisAlignedBB AABB_QTR_TOP_WEST = new AxisAlignedBB(0.0D, 0.5D, 0.0D, 0.5D, 1.0D, 1.0D); + protected static final AxisAlignedBB AABB_QTR_TOP_EAST = new AxisAlignedBB(0.5D, 0.5D, 0.0D, 1.0D, 1.0D, 1.0D); + protected static final AxisAlignedBB AABB_QTR_TOP_NORTH = new AxisAlignedBB(0.0D, 0.5D, 0.0D, 1.0D, 1.0D, 0.5D); + protected static final AxisAlignedBB AABB_QTR_TOP_SOUTH = new AxisAlignedBB(0.0D, 0.5D, 0.5D, 1.0D, 1.0D, 1.0D); + protected static final AxisAlignedBB AABB_OCT_TOP_NW = new AxisAlignedBB(0.0D, 0.5D, 0.0D, 0.5D, 1.0D, 0.5D); + protected static final AxisAlignedBB AABB_OCT_TOP_NE = new AxisAlignedBB(0.5D, 0.5D, 0.0D, 1.0D, 1.0D, 0.5D); + protected static final AxisAlignedBB AABB_OCT_TOP_SW = new AxisAlignedBB(0.0D, 0.5D, 0.5D, 0.5D, 1.0D, 1.0D); + protected static final AxisAlignedBB AABB_OCT_TOP_SE = new AxisAlignedBB(0.5D, 0.5D, 0.5D, 1.0D, 1.0D, 1.0D); + protected static final AxisAlignedBB AABB_SLAB_BOTTOM = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.5D, 1.0D); + protected static final AxisAlignedBB AABB_QTR_BOT_WEST = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.5D, 0.5D, 1.0D); + protected static final AxisAlignedBB AABB_QTR_BOT_EAST = new AxisAlignedBB(0.5D, 0.0D, 0.0D, 1.0D, 0.5D, 1.0D); + protected static final AxisAlignedBB AABB_QTR_BOT_NORTH = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.5D, 0.5D); + protected static final AxisAlignedBB AABB_QTR_BOT_SOUTH = new AxisAlignedBB(0.0D, 0.0D, 0.5D, 1.0D, 0.5D, 1.0D); + protected static final AxisAlignedBB AABB_OCT_BOT_NW = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.5D, 0.5D, 0.5D); + protected static final AxisAlignedBB AABB_OCT_BOT_NE = new AxisAlignedBB(0.5D, 0.0D, 0.0D, 1.0D, 0.5D, 0.5D); + protected static final AxisAlignedBB AABB_OCT_BOT_SW = new AxisAlignedBB(0.0D, 0.0D, 0.5D, 0.5D, 0.5D, 1.0D); + protected static final AxisAlignedBB AABB_OCT_BOT_SE = new AxisAlignedBB(0.5D, 0.0D, 0.5D, 1.0D, 0.5D, 1.0D); + + public BlockStringStairs(Material material, String[] values, String propName) + { + super(material, values, propName); + } + + public BlockStringStairs(Material material, String[] values) + { + this(material, values, "type"); + } + + @Override + public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn) + { + state = this.getActualState(state, worldIn, pos); + + for (AxisAlignedBB axisalignedbb : getCollisionBoxList(state)) + { + addCollisionBoxToList(pos, entityBox, collidingBoxes, axisalignedbb); + } + } + + private static List getCollisionBoxList(IBlockState bstate) + { + List list = Lists.newArrayList(); + boolean flag = bstate.getValue(BlockStairs.HALF) == BlockStairs.EnumHalf.TOP; + list.add(flag ? AABB_SLAB_TOP : AABB_SLAB_BOTTOM); + BlockStairs.EnumShape blockstairs$enumshape = (BlockStairs.EnumShape) bstate.getValue(BlockStairs.SHAPE); + + if (blockstairs$enumshape == BlockStairs.EnumShape.STRAIGHT || blockstairs$enumshape == BlockStairs.EnumShape.INNER_LEFT || blockstairs$enumshape == BlockStairs.EnumShape.INNER_RIGHT) + { + list.add(getCollQuarterBlock(bstate)); + } + + if (blockstairs$enumshape != BlockStairs.EnumShape.STRAIGHT) + { + list.add(getCollEighthBlock(bstate)); + } + + return list; + } + + private static AxisAlignedBB getCollQuarterBlock(IBlockState bstate) + { + boolean flag = bstate.getValue(BlockStairs.HALF) == BlockStairs.EnumHalf.TOP; + + switch ((EnumFacing) bstate.getValue(FACING)) + { + case NORTH: + default: + return flag ? AABB_QTR_BOT_NORTH : AABB_QTR_TOP_NORTH; + case SOUTH: + return flag ? AABB_QTR_BOT_SOUTH : AABB_QTR_TOP_SOUTH; + case WEST: + return flag ? AABB_QTR_BOT_WEST : AABB_QTR_TOP_WEST; + case EAST: + return flag ? AABB_QTR_BOT_EAST : AABB_QTR_TOP_EAST; + } + } + + private static AxisAlignedBB getCollEighthBlock(IBlockState bstate) + { + EnumFacing enumfacing = (EnumFacing) bstate.getValue(FACING); + EnumFacing enumfacing1; + + switch ((BlockStairs.EnumShape) bstate.getValue(BlockStairs.SHAPE)) + { + case OUTER_LEFT: + default: + enumfacing1 = enumfacing; + break; + case OUTER_RIGHT: + enumfacing1 = enumfacing.rotateY(); + break; + case INNER_RIGHT: + enumfacing1 = enumfacing.getOpposite(); + break; + case INNER_LEFT: + enumfacing1 = enumfacing.rotateYCCW(); + } + + boolean flag = bstate.getValue(BlockStairs.HALF) == BlockStairs.EnumHalf.TOP; + + switch (enumfacing1) + { + case NORTH: + default: + return flag ? AABB_OCT_BOT_NW : AABB_OCT_TOP_NW; + case SOUTH: + return flag ? AABB_OCT_BOT_SE : AABB_OCT_TOP_SE; + case WEST: + return flag ? AABB_OCT_BOT_SW : AABB_OCT_TOP_SW; + case EAST: + return flag ? AABB_OCT_BOT_NE : AABB_OCT_TOP_NE; + } + } + + @Override + public boolean isOpaqueCube(IBlockState state) + { + return false; + } + + @Override + public boolean isFullCube(IBlockState state) + { + return false; + } + + @Override + public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) + { + IBlockState iblockstate = super.onBlockPlaced(worldIn, pos, facing, hitX, hitY, hitZ, meta, placer); + iblockstate = iblockstate.withProperty(FACING, placer.getHorizontalFacing()).withProperty(BlockStairs.SHAPE, BlockStairs.EnumShape.STRAIGHT); + return facing != EnumFacing.DOWN && (facing == EnumFacing.UP || (double) hitY <= 0.5D) ? iblockstate.withProperty(BlockStairs.HALF, BlockStairs.EnumHalf.BOTTOM) : iblockstate.withProperty(BlockStairs.HALF, BlockStairs.EnumHalf.TOP); + } + + @Override + public RayTraceResult collisionRayTrace(IBlockState blockState, World worldIn, BlockPos pos, Vec3d start, Vec3d end) + { + List list = Lists.newArrayList(); + + for (AxisAlignedBB axisalignedbb : getCollisionBoxList(this.getActualState(blockState, worldIn, pos))) + { + list.add(this.rayTrace(pos, start, end, axisalignedbb)); + } + + RayTraceResult raytraceresult1 = null; + double d1 = 0.0D; + + for (RayTraceResult raytraceresult : list) + { + if (raytraceresult != null) + { + double d0 = raytraceresult.hitVec.squareDistanceTo(end); + + if (d0 > d1) + { + raytraceresult1 = raytraceresult; + d1 = d0; + } + } + } + + return raytraceresult1; + } + + // Meta looks like: {1|11|1} = {HALF|FACING|TYPE} + @Override + public IBlockState getStateFromMeta(int meta) + { + IBlockState iblockstate = getBlockState().getBaseState().withProperty(BlockStairs.HALF, (meta & 8) > 0 ? BlockStairs.EnumHalf.TOP : BlockStairs.EnumHalf.BOTTOM); + iblockstate = iblockstate.withProperty(FACING, EnumFacing.getFront(5 - (meta & 6) / 2)).withProperty(this.getStringProp(), this.getValues().get(meta % 2)); + return iblockstate; + } + + // Meta looks like: {1|11|1} = {HALF|FACING|TYPE} + @Override + public int getMetaFromState(IBlockState state) + { + int i = 0; + + if (state.getValue(BlockStairs.HALF) == BlockStairs.EnumHalf.TOP) + { + i |= 4; + } + + i = i | 5 - ((EnumFacing) state.getValue(FACING)).getIndex(); + return i * 2 + this.getValues().indexOf(state.getValue(this.getStringProp())); + } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) + { + return state.withProperty(BlockStairs.SHAPE, getStairsShape(state, worldIn, pos)); + } + + private static BlockStairs.EnumShape getStairsShape(IBlockState state, IBlockAccess world, BlockPos pos) + { + EnumFacing enumfacing = (EnumFacing) state.getValue(FACING); + IBlockState iblockstate = world.getBlockState(pos.offset(enumfacing)); + + if (isBlockStairs(iblockstate) && state.getValue(BlockStairs.HALF) == iblockstate.getValue(BlockStairs.HALF)) + { + EnumFacing enumfacing1 = (EnumFacing) iblockstate.getValue(FACING); + + if (enumfacing1.getAxis() != ((EnumFacing) state.getValue(FACING)).getAxis() && isDifferentStairs(state, world, pos, enumfacing1.getOpposite())) + { + if (enumfacing1 == enumfacing.rotateYCCW()) + { + return BlockStairs.EnumShape.OUTER_LEFT; + } + + return BlockStairs.EnumShape.OUTER_RIGHT; + } + } + + IBlockState iblockstate1 = world.getBlockState(pos.offset(enumfacing.getOpposite())); + + if (isBlockStairs(iblockstate1) && state.getValue(BlockStairs.HALF) == iblockstate1.getValue(BlockStairs.HALF)) + { + EnumFacing enumfacing2 = (EnumFacing) iblockstate1.getValue(FACING); + + if (enumfacing2.getAxis() != ((EnumFacing) state.getValue(FACING)).getAxis() && isDifferentStairs(state, world, pos, enumfacing2)) + { + if (enumfacing2 == enumfacing.rotateYCCW()) + { + return BlockStairs.EnumShape.INNER_LEFT; + } + + return BlockStairs.EnumShape.INNER_RIGHT; + } + } + + return BlockStairs.EnumShape.STRAIGHT; + } + + private static boolean isDifferentStairs(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing facing) + { + IBlockState iblockstate = world.getBlockState(pos.offset(facing)); + return !isBlockStairs(iblockstate) || iblockstate.getValue(FACING) != state.getValue(FACING) || iblockstate.getValue(BlockStairs.HALF) != state.getValue(BlockStairs.HALF); + } + + public static boolean isBlockStairs(IBlockState state) + { + return state.getBlock() instanceof BlockStairs || state.getBlock() instanceof BlockStringStairs; + } + + @Override + public IBlockState withRotation(IBlockState state, Rotation rot) + { + return state.withProperty(FACING, rot.rotate((EnumFacing) state.getValue(FACING))); + } + + @SuppressWarnings("incomplete-switch") + @Override + public IBlockState withMirror(IBlockState state, Mirror mirrorIn) + { + EnumFacing enumfacing = (EnumFacing) state.getValue(FACING); + BlockStairs.EnumShape blockstairs$enumshape = (BlockStairs.EnumShape) state.getValue(BlockStairs.SHAPE); + + switch (mirrorIn) + { + case LEFT_RIGHT: + + if (enumfacing.getAxis() == EnumFacing.Axis.Z) + { + switch (blockstairs$enumshape) + { + case OUTER_LEFT: + return state.withRotation(Rotation.CLOCKWISE_180).withProperty(BlockStairs.SHAPE, BlockStairs.EnumShape.OUTER_RIGHT); + case OUTER_RIGHT: + return state.withRotation(Rotation.CLOCKWISE_180).withProperty(BlockStairs.SHAPE, BlockStairs.EnumShape.OUTER_LEFT); + case INNER_RIGHT: + return state.withRotation(Rotation.CLOCKWISE_180).withProperty(BlockStairs.SHAPE, BlockStairs.EnumShape.INNER_LEFT); + case INNER_LEFT: + return state.withRotation(Rotation.CLOCKWISE_180).withProperty(BlockStairs.SHAPE, BlockStairs.EnumShape.INNER_RIGHT); + default: + return state.withRotation(Rotation.CLOCKWISE_180); + } + } + + break; + case FRONT_BACK: + + if (enumfacing.getAxis() == EnumFacing.Axis.X) + { + switch (blockstairs$enumshape) + { + case OUTER_LEFT: + return state.withRotation(Rotation.CLOCKWISE_180).withProperty(BlockStairs.SHAPE, BlockStairs.EnumShape.OUTER_RIGHT); + case OUTER_RIGHT: + return state.withRotation(Rotation.CLOCKWISE_180).withProperty(BlockStairs.SHAPE, BlockStairs.EnumShape.OUTER_LEFT); + case INNER_RIGHT: + return state.withRotation(Rotation.CLOCKWISE_180).withProperty(BlockStairs.SHAPE, BlockStairs.EnumShape.INNER_RIGHT); + case INNER_LEFT: + return state.withRotation(Rotation.CLOCKWISE_180).withProperty(BlockStairs.SHAPE, BlockStairs.EnumShape.INNER_LEFT); + case STRAIGHT: + return state.withRotation(Rotation.CLOCKWISE_180); + } + } + } + + return super.withMirror(state, mirrorIn); + } + + @Override + protected BlockStateContainer createRealBlockState() + { + return new ExtendedBlockState(this, new IProperty[] { BlockStairs.HALF, BlockStairs.SHAPE, FACING, this.getStringProp() }, new IUnlistedProperty[] { this.getUnlistedStringProp() }); + } + + @Override + protected ItemStack createStackedBlock(IBlockState state) + { + return new ItemStack(this, 1, damageDropped(state)); + } + + @Override + public int damageDropped(IBlockState state) + { + return this.getValues().indexOf(state.getValue(this.getStringProp())); + } + + @Override + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) + { + return new ItemStack(this, 1, damageDropped(state)); + } + + @Override + public boolean doesSideBlockRendering(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing face) + { + if (net.minecraftforge.common.ForgeModContainer.disableStairSlabCulling) + return super.doesSideBlockRendering(state, world, pos, face); + + if (state.isOpaqueCube()) + return true; + + state = this.getActualState(state, world, pos); + + EnumHalf half = state.getValue(BlockStairs.HALF); + EnumFacing side = state.getValue(FACING); + EnumShape shape = state.getValue(BlockStairs.SHAPE); + if (face == EnumFacing.UP) + return half == EnumHalf.TOP; + if (face == EnumFacing.DOWN) + return half == EnumHalf.BOTTOM; + if (shape == EnumShape.OUTER_LEFT || shape == EnumShape.OUTER_RIGHT) + return false; + if (face == side) + return true; + if (shape == EnumShape.INNER_LEFT && face.rotateY() == side) + return true; + if (shape == EnumShape.INNER_RIGHT && face.rotateYCCW() == side) + return true; + return false; + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockStringWall.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockStringWall.java index af061879..495b57db 100644 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockStringWall.java +++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockStringWall.java @@ -2,15 +2,12 @@ package WayofTime.bloodmagic.block.base; import net.minecraft.block.Block; import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.BlockRotatedPillar; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/WailaCallbackHandler.java b/src/main/java/WayofTime/bloodmagic/compat/waila/WailaCallbackHandler.java index 16db48f9..e2b6a98b 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/WailaCallbackHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/WailaCallbackHandler.java @@ -1,11 +1,21 @@ package WayofTime.bloodmagic.compat.waila; -import WayofTime.bloodmagic.block.*; -import WayofTime.bloodmagic.block.base.BlockStringPillar; -import WayofTime.bloodmagic.block.base.BlockStringPillarCap; -import WayofTime.bloodmagic.compat.waila.provider.*; import mcp.mobius.waila.api.IWailaRegistrar; import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.block.BlockAlchemyArray; +import WayofTime.bloodmagic.block.BlockAltar; +import WayofTime.bloodmagic.block.BlockMimic; +import WayofTime.bloodmagic.block.BlockRitualController; +import WayofTime.bloodmagic.block.BlockTeleposer; +import WayofTime.bloodmagic.block.base.BlockStringPillar; +import WayofTime.bloodmagic.block.base.BlockStringPillarCap; +import WayofTime.bloodmagic.block.base.BlockStringStairs; +import WayofTime.bloodmagic.compat.waila.provider.DataProviderAlchemyArray; +import WayofTime.bloodmagic.compat.waila.provider.DataProviderBloodAltar; +import WayofTime.bloodmagic.compat.waila.provider.DataProviderMimic; +import WayofTime.bloodmagic.compat.waila.provider.DataProviderPillar; +import WayofTime.bloodmagic.compat.waila.provider.DataProviderRitualController; +import WayofTime.bloodmagic.compat.waila.provider.DataProviderTeleposer; public class WailaCallbackHandler { @@ -19,6 +29,7 @@ public class WailaCallbackHandler registrar.registerStackProvider(new DataProviderMimic(), BlockMimic.class); registrar.registerStackProvider(DataProviderPillar.INSTANCE, BlockStringPillarCap.class); registrar.registerStackProvider(DataProviderPillar.INSTANCE, BlockStringPillar.class); + registrar.registerStackProvider(DataProviderPillar.INSTANCE, BlockStringStairs.class); registrar.addConfig(Constants.Mod.MODID, Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK, false); registrar.addConfig(Constants.Mod.MODID, Constants.Compat.WAILA_CONFIG_ALTAR, true); diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemDemonStairsBase.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemDemonStairsBase.java new file mode 100644 index 00000000..439be03b --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemDemonStairsBase.java @@ -0,0 +1,29 @@ +package WayofTime.bloodmagic.item.block; + +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import WayofTime.bloodmagic.block.BlockDemonStairsBase; + +public class ItemDemonStairsBase extends ItemBlock +{ + public final BlockDemonStairsBase demonBlock; + + public ItemDemonStairsBase(BlockDemonStairsBase block) + { + super(block); + setHasSubtypes(true); + demonBlock = block; + } + + @Override + public String getUnlocalizedName(ItemStack stack) + { + return super.getUnlocalizedName(stack) + demonBlock.names[stack.getItemDamage() % demonBlock.names.length]; + } + + @Override + public int getMetadata(int meta) + { + return meta % demonBlock.names.length; + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java b/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java index de68cd0c..6b8795ca 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java @@ -27,6 +27,7 @@ import WayofTime.bloodmagic.block.BlockDemonLight; import WayofTime.bloodmagic.block.BlockDemonPillarBase; import WayofTime.bloodmagic.block.BlockDemonPillarCapBase; import WayofTime.bloodmagic.block.BlockDemonPylon; +import WayofTime.bloodmagic.block.BlockDemonStairsBase; import WayofTime.bloodmagic.block.BlockDemonWallBase; import WayofTime.bloodmagic.block.BlockDimensionalPortal; import WayofTime.bloodmagic.block.BlockIncenseAltar; @@ -61,6 +62,7 @@ import WayofTime.bloodmagic.item.block.ItemBlockPedestal; import WayofTime.bloodmagic.item.block.ItemBlockRitualController; import WayofTime.bloodmagic.item.block.ItemBlockRitualStone; import WayofTime.bloodmagic.item.block.ItemBlockRoutingNode; +import WayofTime.bloodmagic.item.block.ItemDemonStairsBase; import WayofTime.bloodmagic.tile.TileAlchemyArray; import WayofTime.bloodmagic.tile.TileAlchemyTable; import WayofTime.bloodmagic.tile.TileAltar; @@ -138,6 +140,10 @@ public class ModBlocks public static Block demonWall1; + public static Block demonStairs1; + public static Block demonStairs2; + public static Block demonStairs3; + public static void init() { FluidRegistry.registerFluid(BlockLifeEssence.getLifeEssence()); @@ -188,7 +194,11 @@ public class ModBlocks demonLight = registerBlock(new ItemBlockDemonLight(new BlockDemonLight()), Constants.BloodMagicBlock.DEMON_LIGHT.getRegName()); - demonWall1 = registerBlock(new ItemBlockDemonWallBase(new BlockDemonWallBase("wall1", Material.ROCK, new String[] { "raw", "corrosive", "destructive", "vengeful", "steadfast" })), "BlockWall1"); + demonWall1 = registerBlock(new ItemBlockDemonWallBase(new BlockDemonWallBase("wall1", Material.ROCK, new String[] { "brick_raw", "brick_corrosive", "brick_destructive", "brick_vengeful", "brick_steadfast", "smallbrick_raw", "smallbrick_corrosive", "smallbrick_destructive", "smallbrick_vengeful", "smallbrick_steadfast", "large_raw", "large_corrosive", "large_destructive", "large_vengeful", "large_steadfast" })), Constants.BloodMagicBlock.DEMON_WALL_1.getRegName()); + + demonStairs1 = registerBlock(new ItemDemonStairsBase(new BlockDemonStairsBase("stairs1", Material.ROCK, new String[] { "raw", "corrosive" })), Constants.BloodMagicBlock.DEMON_STAIRS_1.getRegName()); + demonStairs2 = registerBlock(new ItemDemonStairsBase(new BlockDemonStairsBase("stairs2", Material.ROCK, new String[] { "destructive", "vengeful" })), Constants.BloodMagicBlock.DEMON_STAIRS_2.getRegName()); + demonStairs3 = registerBlock(new ItemDemonStairsBase(new BlockDemonStairsBase("stairs3", Material.ROCK, new String[] { "steadfast" })), Constants.BloodMagicBlock.DEMON_STAIRS_3.getRegName()); BloodMagicAPI.addToTeleposerBlacklist(inputRoutingNode); BloodMagicAPI.addToTranspositionBlacklist(inputRoutingNode); diff --git a/src/main/resources/assets/bloodmagic/blockstates/BlockStairs1.json b/src/main/resources/assets/bloodmagic/blockstates/BlockStairs1.json new file mode 100644 index 00000000..8bb70c0c --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/BlockStairs1.json @@ -0,0 +1,100 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture1": "bloodmagic:blocks/dungeon/dungeon_pillarheart", + "texture2": "bloodmagic:blocks/dungeon/dungeon_pillarheart_c", + "all": "#texture1", + "bottom": "#all", + "top": "#all", + "side": "#all", + "particle": "#all" + }, + "model": "minecraft:stairs", + "transform" : "forge:default-block" + }, + "variants": { + "facing=east,half=bottom,shape=straight,type=raw": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight,type=raw": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,type=raw": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,type=raw": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,type=raw": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right,type=raw": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,type=raw": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,type=raw": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,type=raw": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,type=raw": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,type=raw": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left,type=raw": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,type=raw": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right,type=raw": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,type=raw": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,type=raw": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,type=raw": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,type=raw": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,type=raw": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left,type=raw": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,type=raw": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,type=raw": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,type=raw": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,type=raw": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,type=raw": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right,type=raw": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right,type=raw": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right,type=raw": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left,type=raw": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left,type=raw": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left,type=raw": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left,type=raw": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right,type=raw": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right,type=raw": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right,type=raw": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right,type=raw": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left,type=raw": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left,type=raw": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left,type=raw": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left,type=raw": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + + "facing=east,half=bottom,shape=straight,type=corrosive": { "model": "minecraft:stairs", "textures": {"all": "#texture2"} }, + "facing=west,half=bottom,shape=straight,type=corrosive": { "model": "minecraft:stairs", "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=south,half=bottom,shape=straight,type=corrosive": { "model": "minecraft:stairs", "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=north,half=bottom,shape=straight,type=corrosive": { "model": "minecraft:stairs", "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=east,half=bottom,shape=outer_right,type=corrosive": { "model": "minecraft:outer_stairs", "textures": {"all": "#texture2"} }, + "facing=west,half=bottom,shape=outer_right,type=corrosive": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=south,half=bottom,shape=outer_right,type=corrosive": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=north,half=bottom,shape=outer_right,type=corrosive": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=east,half=bottom,shape=outer_left,type=corrosive": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=west,half=bottom,shape=outer_left,type=corrosive": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=south,half=bottom,shape=outer_left,type=corrosive": { "model": "minecraft:outer_stairs", "textures": {"all": "#texture2"} }, + "facing=north,half=bottom,shape=outer_left,type=corrosive": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=east,half=bottom,shape=inner_right,type=corrosive": { "model": "minecraft:inner_stairs", "textures": {"all": "#texture2"} }, + "facing=west,half=bottom,shape=inner_right,type=corrosive": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=south,half=bottom,shape=inner_right,type=corrosive": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=north,half=bottom,shape=inner_right,type=corrosive": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=east,half=bottom,shape=inner_left,type=corrosive": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=west,half=bottom,shape=inner_left,type=corrosive": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=south,half=bottom,shape=inner_left,type=corrosive": { "model": "minecraft:inner_stairs", "textures": {"all": "#texture2"} }, + "facing=north,half=bottom,shape=inner_left,type=corrosive": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=east,half=top,shape=straight,type=corrosive": { "model": "minecraft:stairs", "x": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=west,half=top,shape=straight,type=corrosive": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=south,half=top,shape=straight,type=corrosive": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=north,half=top,shape=straight,type=corrosive": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=east,half=top,shape=outer_right,type=corrosive": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=west,half=top,shape=outer_right,type=corrosive": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=south,half=top,shape=outer_right,type=corrosive": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=north,half=top,shape=outer_right,type=corrosive": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=east,half=top,shape=outer_left,type=corrosive": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=west,half=top,shape=outer_left,type=corrosive": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=south,half=top,shape=outer_left,type=corrosive": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=north,half=top,shape=outer_left,type=corrosive": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=east,half=top,shape=inner_right,type=corrosive": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=west,half=top,shape=inner_right,type=corrosive": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=south,half=top,shape=inner_right,type=corrosive": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=north,half=top,shape=inner_right,type=corrosive": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=east,half=top,shape=inner_left,type=corrosive": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=west,half=top,shape=inner_left,type=corrosive": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=south,half=top,shape=inner_left,type=corrosive": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=north,half=top,shape=inner_left,type=corrosive": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/BlockStairs2.json b/src/main/resources/assets/bloodmagic/blockstates/BlockStairs2.json new file mode 100644 index 00000000..e3376cc8 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/BlockStairs2.json @@ -0,0 +1,100 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture1": "bloodmagic:blocks/dungeon/dungeon_pillarheart_d", + "texture2": "bloodmagic:blocks/dungeon/dungeon_pillarheart_v", + "all": "#texture1", + "bottom": "#all", + "top": "#all", + "side": "#all", + "particle": "#all" + }, + "model": "minecraft:stairs", + "transform" : "forge:default-block" + }, + "variants": { + "facing=east,half=bottom,shape=straight,type=destructive": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight,type=destructive": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,type=destructive": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,type=destructive": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,type=destructive": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right,type=destructive": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,type=destructive": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,type=destructive": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,type=destructive": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,type=destructive": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,type=destructive": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left,type=destructive": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,type=destructive": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right,type=destructive": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,type=destructive": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,type=destructive": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,type=destructive": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,type=destructive": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,type=destructive": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left,type=destructive": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,type=destructive": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,type=destructive": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,type=destructive": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,type=destructive": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,type=destructive": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right,type=destructive": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right,type=destructive": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right,type=destructive": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left,type=destructive": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left,type=destructive": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left,type=destructive": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left,type=destructive": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right,type=destructive": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right,type=destructive": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right,type=destructive": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right,type=destructive": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left,type=destructive": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left,type=destructive": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left,type=destructive": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left,type=destructive": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + + "facing=east,half=bottom,shape=straight,type=vengeful": { "model": "minecraft:stairs", "textures": {"all": "#texture2"} }, + "facing=west,half=bottom,shape=straight,type=vengeful": { "model": "minecraft:stairs", "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=south,half=bottom,shape=straight,type=vengeful": { "model": "minecraft:stairs", "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=north,half=bottom,shape=straight,type=vengeful": { "model": "minecraft:stairs", "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=east,half=bottom,shape=outer_right,type=vengeful": { "model": "minecraft:outer_stairs", "textures": {"all": "#texture2"} }, + "facing=west,half=bottom,shape=outer_right,type=vengeful": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=south,half=bottom,shape=outer_right,type=vengeful": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=north,half=bottom,shape=outer_right,type=vengeful": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=east,half=bottom,shape=outer_left,type=vengeful": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=west,half=bottom,shape=outer_left,type=vengeful": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=south,half=bottom,shape=outer_left,type=vengeful": { "model": "minecraft:outer_stairs", "textures": {"all": "#texture2"} }, + "facing=north,half=bottom,shape=outer_left,type=vengeful": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=east,half=bottom,shape=inner_right,type=vengeful": { "model": "minecraft:inner_stairs", "textures": {"all": "#texture2"} }, + "facing=west,half=bottom,shape=inner_right,type=vengeful": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=south,half=bottom,shape=inner_right,type=vengeful": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=north,half=bottom,shape=inner_right,type=vengeful": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=east,half=bottom,shape=inner_left,type=vengeful": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=west,half=bottom,shape=inner_left,type=vengeful": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=south,half=bottom,shape=inner_left,type=vengeful": { "model": "minecraft:inner_stairs", "textures": {"all": "#texture2"} }, + "facing=north,half=bottom,shape=inner_left,type=vengeful": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=east,half=top,shape=straight,type=vengeful": { "model": "minecraft:stairs", "x": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=west,half=top,shape=straight,type=vengeful": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=south,half=top,shape=straight,type=vengeful": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=north,half=top,shape=straight,type=vengeful": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=east,half=top,shape=outer_right,type=vengeful": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=west,half=top,shape=outer_right,type=vengeful": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=south,half=top,shape=outer_right,type=vengeful": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=north,half=top,shape=outer_right,type=vengeful": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=east,half=top,shape=outer_left,type=vengeful": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=west,half=top,shape=outer_left,type=vengeful": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=south,half=top,shape=outer_left,type=vengeful": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=north,half=top,shape=outer_left,type=vengeful": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=east,half=top,shape=inner_right,type=vengeful": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=west,half=top,shape=inner_right,type=vengeful": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=south,half=top,shape=inner_right,type=vengeful": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=north,half=top,shape=inner_right,type=vengeful": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=east,half=top,shape=inner_left,type=vengeful": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=west,half=top,shape=inner_left,type=vengeful": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=south,half=top,shape=inner_left,type=vengeful": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, + "facing=north,half=top,shape=inner_left,type=vengeful": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/BlockStairs3.json b/src/main/resources/assets/bloodmagic/blockstates/BlockStairs3.json new file mode 100644 index 00000000..51640cbd --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/BlockStairs3.json @@ -0,0 +1,59 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture1": "bloodmagic:blocks/dungeon/dungeon_pillarheart_s", + "texture2": "bloodmagic:blocks/dungeon/dungeon_pillarheart_c", + "all": "#texture1", + "bottom": "#all", + "top": "#all", + "side": "#all", + "particle": "#all" + }, + "model": "minecraft:stairs", + "transform" : "forge:default-block" + }, + "variants": { + "facing=east,half=bottom,shape=straight,type=steadfast": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight,type=steadfast": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,type=steadfast": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,type=steadfast": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,type=steadfast": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right,type=steadfast": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,type=steadfast": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,type=steadfast": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,type=steadfast": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,type=steadfast": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,type=steadfast": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left,type=steadfast": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,type=steadfast": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right,type=steadfast": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,type=steadfast": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,type=steadfast": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,type=steadfast": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,type=steadfast": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,type=steadfast": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left,type=steadfast": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,type=steadfast": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,type=steadfast": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,type=steadfast": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,type=steadfast": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,type=steadfast": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right,type=steadfast": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right,type=steadfast": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right,type=steadfast": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left,type=steadfast": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left,type=steadfast": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left,type=steadfast": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left,type=steadfast": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right,type=steadfast": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right,type=steadfast": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right,type=steadfast": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right,type=steadfast": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left,type=steadfast": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left,type=steadfast": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left,type=steadfast": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left,type=steadfast": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/BlockWall1.json b/src/main/resources/assets/bloodmagic/blockstates/BlockWall1.json index 50820cc2..b7782a56 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/BlockWall1.json +++ b/src/main/resources/assets/bloodmagic/blockstates/BlockWall1.json @@ -30,25 +30,75 @@ "false": {} }, "type": { - "raw": { + "brick_raw": { + "textures": { + "wall": "bloodmagic:blocks/dungeon/dungeon_brick3" + } + }, + "brick_corrosive": { + "textures": { + "wall": "bloodmagic:blocks/dungeon/dungeon_brick3_c" + } + }, + "brick_destructive": { + "textures": { + "wall": "bloodmagic:blocks/dungeon/dungeon_brick3_d" + } + }, + "brick_vengeful": { + "textures": { + "wall": "bloodmagic:blocks/dungeon/dungeon_brick3_v" + } + }, + "brick_steadfast": { + "textures": { + "wall": "bloodmagic:blocks/dungeon/dungeon_brick3_s" + } + }, + "smallbrick_raw": { + "textures": { + "wall": "bloodmagic:blocks/dungeon/dungeon_smallbrick" + } + }, + "smallbrick_corrosive": { + "textures": { + "wall": "bloodmagic:blocks/dungeon/dungeon_smallbrick_c" + } + }, + "smallbrick_destructive": { + "textures": { + "wall": "bloodmagic:blocks/dungeon/dungeon_smallbrick_d" + } + }, + "smallbrick_vengeful": { + "textures": { + "wall": "bloodmagic:blocks/dungeon/dungeon_smallbrick_v" + } + }, + "smallbrick_steadfast": { + "textures": { + "wall": "bloodmagic:blocks/dungeon/dungeon_smallbrick_s" + } + }, + "large_raw": { }, - "corrosive": { + "large_corrosive": { "textures": { "wall": "bloodmagic:blocks/dungeon/dungeon_pillarheart_c" } }, - "destructive": { + "large_destructive": { "textures": { "wall": "bloodmagic:blocks/dungeon/dungeon_pillarheart_d" } }, - "vengeful": { + "large_vengeful": { "textures": { "wall": "bloodmagic:blocks/dungeon/dungeon_pillarheart_v" } }, - "steadfast": { + "large_steadfast": { "textures": { "wall": "bloodmagic:blocks/dungeon/dungeon_pillarheart_s" } diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index d47bf4f8..8aa4413f 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -330,6 +330,28 @@ tile.BloodMagic.pillarCap2.destructive.name=Destructive Stone Pillar Cap tile.BloodMagic.pillarCap2.vengeful.name=Vengeful Stone Pillar Cap tile.BloodMagic.pillarCap3.steadfast.name=Steadfast Stone Pillar Cap +tile.BloodMagic.wall1.brick_raw.name=Raw Stone Brick Wall +tile.BloodMagic.wall1.brick_corrosive.name=Corrosive Stone Brick Wall +tile.BloodMagic.wall1.brick_destructive.name=Destructive Stone Brick Wall +tile.BloodMagic.wall1.brick_vengeful.name=Vengeful Stone Brick Wall +tile.BloodMagic.wall1.brick_steadfast.name=Steadfast Stone Brick Wall +tile.BloodMagic.wall1.smallbrick_raw.name=Raw Small Stone Brick Wall +tile.BloodMagic.wall1.smallbrick_corrosive.name=Corrosive Small Stone Brick Wall +tile.BloodMagic.wall1.smallbrick_destructive.name=Destructive Small Stone Brick Wall +tile.BloodMagic.wall1.smallbrick_vengeful.name=Vengeful Small Stone Brick Wall +tile.BloodMagic.wall1.smallbrick_steadfast.name=Steadfast Small Stone Brick Wall +tile.BloodMagic.wall1.large_raw.name=Raw Stone Wall +tile.BloodMagic.wall1.large_corrosive.name=Corrosive Stone Wall +tile.BloodMagic.wall1.large_destructive.name=Destructive Stone Wall +tile.BloodMagic.wall1.large_vengeful.name=Vengeful Stone Wall +tile.BloodMagic.wall1.large_steadfast.name=Steadfast Stone Wall + +tile.BloodMagic.stairs1.raw.name=Raw Stone Stairs +tile.BloodMagic.stairs1.corrosive.name=Corrosive Stone Stairs +tile.BloodMagic.stairs2.destructive.name=Destructive Stone Stairs +tile.BloodMagic.stairs2.vengeful.name=Vengeful Stone Stairs +tile.BloodMagic.stairs3.steadfast.name=Steadfast Stone Stairs + # Fluids fluid.lifeEssence=Life Essence