diff --git a/changelog.txt b/changelog.txt index d17eb82..418e532 100644 --- a/changelog.txt +++ b/changelog.txt @@ -237,3 +237,17 @@ Added prismarine Crystal Block Crystals now generate in bunches in caves Added lava pockets in the deep underground + +1.4 (Update 2019): + Optimized and corrected some block models + Added another easter egg + Fixed several world generation bugs + Improved world generation + Removed smelting recipes for modded gold items (they're useless) + Made lots of backend optimizations + The bounding boxes of certain blocks are now changed to fit the block model + Fixed the jungle button model + Added glass pressure plate + Added sandstone pressure plate + Added red sandstone pressure plate + Added Blast Proof Glass Pane diff --git a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/RubyPlateCode.java b/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/RubyPlateCode.java deleted file mode 100644 index 5efbc4d..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/RubyPlateCode.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.NetherNoah.ParadiseMod.CustomBlockCode; - -import java.util.List; - -import net.minecraft.block.BlockBasePressurePlate; -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.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.SoundEvents; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class RubyPlateCode extends BlockBasePressurePlate -{ - public static final PropertyBool POWERED = PropertyBool.create("powered"); - private final RubyPlateCode.Sensitivity sensitivity; - protected RubyPlateCode(Material materialIn, RubyPlateCode.Sensitivity sensitivityIn) - { - super(materialIn); - setDefaultState(blockState.getBaseState().withProperty(POWERED, Boolean.valueOf(false))); - sensitivity = sensitivityIn; - } - @Override - protected int getRedstoneStrength(IBlockState state) - { - return state.getValue(POWERED).booleanValue() ? 15 : 0; - } - @Override - protected IBlockState setRedstoneStrength(IBlockState state, int strength) - { - return state.withProperty(POWERED, Boolean.valueOf(strength > 0)); - } - @Override - protected void playClickOnSound(World worldIn, BlockPos color) - { - if (blockMaterial == Material.WOOD) - worldIn.playSound((EntityPlayer)null, color, SoundEvents.BLOCK_WOOD_PRESSPLATE_CLICK_ON, SoundCategory.BLOCKS, 0.3F, 0.8F); - else - worldIn.playSound((EntityPlayer)null, color, SoundEvents.BLOCK_STONE_PRESSPLATE_CLICK_ON, SoundCategory.BLOCKS, 0.3F, 0.6F); - } - @Override - protected void playClickOffSound(World worldIn, BlockPos pos) - { - if (blockMaterial == Material.WOOD) - worldIn.playSound((EntityPlayer)null, pos, SoundEvents.BLOCK_WOOD_PRESSPLATE_CLICK_OFF, SoundCategory.BLOCKS, 0.3F, 0.7F); - else - worldIn.playSound((EntityPlayer)null, pos, SoundEvents.BLOCK_STONE_PRESSPLATE_CLICK_OFF, SoundCategory.BLOCKS, 0.3F, 0.5F); - } - @Override - protected int computeRedstoneStrength(World worldIn, BlockPos pos) - { - AxisAlignedBB axisalignedbb = PRESSURE_AABB.offset(pos); - List list; - switch (sensitivity) - { - case EVERYTHING: - list = worldIn.getEntitiesWithinAABBExcludingEntity((Entity)null, axisalignedbb); - break; - case MOBS: - list = worldIn.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb); - break; - default: - return 0; - } - if (!list.isEmpty()) - { - for (Entity entity : list) - { - if (!entity.doesEntityNotTriggerPressurePlate()) - return 1; - } - } - return 0; - } - @Override - public IBlockState getStateFromMeta(int meta) - { - return getDefaultState().withProperty(POWERED, Boolean.valueOf(meta == 1)); - } - @Override - public int getMetaFromState(IBlockState state) - { - return state.getValue(POWERED).booleanValue() ? 1 : 0; - } - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] {POWERED}); - } - public static enum Sensitivity - { - EVERYTHING, - MOBS; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/buttonTicks/DiamondButtonTicks.java b/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/buttonTicks/DiamondButtonTicks.java deleted file mode 100644 index 7c12c6a..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/buttonTicks/DiamondButtonTicks.java +++ /dev/null @@ -1,314 +0,0 @@ -package com.NetherNoah.ParadiseMod.CustomBlockCode.buttonTicks; - -import java.util.List; -import java.util.Random; - -import javax.annotation.Nullable; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockDirectional; -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.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -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.world.IBlockAccess; -import net.minecraft.world.World; - -public abstract class DiamondButtonTicks extends BlockDirectional -{ - public static final PropertyBool POWERED = PropertyBool.create("powered"); - protected static final AxisAlignedBB AABB_DOWN_OFF = new AxisAlignedBB(0.3125D, 0.875D, 0.375D, 0.6875D, 1.0D, 0.625D); - protected static final AxisAlignedBB AABB_UP_OFF = new AxisAlignedBB(0.3125D, 0.0D, 0.375D, 0.6875D, 0.125D, 0.625D); - protected static final AxisAlignedBB AABB_NORTH_OFF = new AxisAlignedBB(0.3125D, 0.375D, 0.875D, 0.6875D, 0.625D, 1.0D); - protected static final AxisAlignedBB AABB_SOUTH_OFF = new AxisAlignedBB(0.3125D, 0.375D, 0.0D, 0.6875D, 0.625D, 0.125D); - protected static final AxisAlignedBB AABB_WEST_OFF = new AxisAlignedBB(0.875D, 0.375D, 0.3125D, 1.0D, 0.625D, 0.6875D); - protected static final AxisAlignedBB AABB_EAST_OFF = new AxisAlignedBB(0.0D, 0.375D, 0.3125D, 0.125D, 0.625D, 0.6875D); - protected static final AxisAlignedBB AABB_DOWN_ON = new AxisAlignedBB(0.3125D, 0.9375D, 0.375D, 0.6875D, 1.0D, 0.625D); - protected static final AxisAlignedBB AABB_UP_ON = new AxisAlignedBB(0.3125D, 0.0D, 0.375D, 0.6875D, 0.0625D, 0.625D); - protected static final AxisAlignedBB AABB_NORTH_ON = new AxisAlignedBB(0.3125D, 0.375D, 0.9375D, 0.6875D, 0.625D, 1.0D); - protected static final AxisAlignedBB AABB_SOUTH_ON = new AxisAlignedBB(0.3125D, 0.375D, 0.0D, 0.6875D, 0.625D, 0.0625D); - protected static final AxisAlignedBB AABB_WEST_ON = new AxisAlignedBB(0.9375D, 0.375D, 0.3125D, 1.0D, 0.625D, 0.6875D); - protected static final AxisAlignedBB AABB_EAST_ON = new AxisAlignedBB(0.0D, 0.375D, 0.3125D, 0.0625D, 0.625D, 0.6875D); - private final boolean wooden; - - protected DiamondButtonTicks(boolean wooden) - { - super(Material.CIRCUITS); - setDefaultState(blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(POWERED, Boolean.valueOf(false))); - setTickRandomly(true); - setCreativeTab(CreativeTabs.REDSTONE); - this.wooden = wooden; - } - @Override - @Nullable - public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) - { - return NULL_AABB; - } - @Override - public int tickRate(World worldIn) - { - return wooden ? 14 : 20; - } - @Override - public boolean isOpaqueCube(IBlockState state) - { - return false; - } - @Override - public boolean isFullCube(IBlockState state) - { - return false; - } - @Override - public boolean canPlaceBlockOnSide(World worldIn, BlockPos pos, EnumFacing side) - { - return canPlaceBlock(worldIn, pos, side.getOpposite()); - } - @Override - public boolean canPlaceBlockAt(World worldIn, BlockPos pos) - { - for (EnumFacing enumfacing : EnumFacing.values()) - { - if (canPlaceBlock(worldIn, pos, enumfacing)) - return true; - } - return false; - } - protected static boolean canPlaceBlock(World worldIn, BlockPos pos, EnumFacing direction) - { - BlockPos blockpos = pos.offset(direction); - return worldIn.getBlockState(blockpos).isSideSolid(worldIn, blockpos, direction.getOpposite()); - } - @Override - public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) - { - return canPlaceBlock(worldIn, pos, facing.getOpposite()) ? getDefaultState().withProperty(FACING, facing).withProperty(POWERED, Boolean.valueOf(false)) : getDefaultState().withProperty(FACING, EnumFacing.DOWN).withProperty(POWERED, Boolean.valueOf(false)); - } - @Override - public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos) - { - if (checkForDrop(worldIn, pos, state) && !canPlaceBlock(worldIn, pos, state.getValue(FACING).getOpposite())) - { - dropBlockAsItem(worldIn, pos, state, 0); - worldIn.setBlockToAir(pos); - } - } - private boolean checkForDrop(World worldIn, BlockPos pos, IBlockState state) - { - if (canPlaceBlockAt(worldIn, pos)) - return true; - else - { - dropBlockAsItem(worldIn, pos, state, 0); - worldIn.setBlockToAir(pos); - return false; - } - } - @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) - { - EnumFacing enumfacing = state.getValue(FACING); - boolean flag = state.getValue(POWERED).booleanValue(); - switch (enumfacing) - { - case EAST: - return flag ? AABB_EAST_ON : AABB_EAST_OFF; - case WEST: - return flag ? AABB_WEST_ON : AABB_WEST_OFF; - case SOUTH: - return flag ? AABB_SOUTH_ON : AABB_SOUTH_OFF; - case NORTH: - default: - return flag ? AABB_NORTH_ON : AABB_NORTH_OFF; - case UP: - return flag ? AABB_UP_ON : AABB_UP_OFF; - case DOWN: - return flag ? AABB_DOWN_ON : AABB_DOWN_OFF; - } - } - @Override - public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) - { - if (state.getValue(POWERED).booleanValue()) - return true; - else - { - worldIn.setBlockState(pos, state.withProperty(POWERED, Boolean.valueOf(true)), 3); - worldIn.markBlockRangeForRenderUpdate(pos, pos); - playClickSound(playerIn, worldIn, pos); - notifyNeighbors(worldIn, pos, state.getValue(FACING)); - worldIn.scheduleUpdate(pos, this, tickRate(worldIn)); - return true; - } - } - protected abstract void playClickSound(@Nullable EntityPlayer player, World worldIn, BlockPos pos); - protected abstract void playReleaseSound(World worldIn, BlockPos pos); - @Override - public void breakBlock(World worldIn, BlockPos pos, IBlockState state) - { - if (state.getValue(POWERED).booleanValue()) - notifyNeighbors(worldIn, pos, state.getValue(FACING)); - super.breakBlock(worldIn, pos, state); - } - @Override - public int getWeakPower(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) - { - return blockState.getValue(POWERED).booleanValue() ? 15 : 0; - } - @Override - public int getStrongPower(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) - { - return !blockState.getValue(POWERED).booleanValue() ? 0 : (blockState.getValue(FACING) == side ? 15 : 0); - } - @Override - public boolean canProvidePower(IBlockState state) - { - return true; - } - @Override - public void randomTick(World worldIn, BlockPos pos, IBlockState state, Random random) - { - } - @Override - public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) - { - if (!worldIn.isRemote) - { - if (state.getValue(POWERED).booleanValue()) - { - if (wooden) - checkPressed(state, worldIn, pos); - else - { - worldIn.setBlockState(pos, state.withProperty(POWERED, Boolean.valueOf(false))); - notifyNeighbors(worldIn, pos, state.getValue(FACING)); - playReleaseSound(worldIn, pos); - worldIn.markBlockRangeForRenderUpdate(pos, pos); - } - } - } - } - @Override - public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn) - { - if (!worldIn.isRemote) - { - if (wooden) - { - if (!state.getValue(POWERED).booleanValue()) - checkPressed(state, worldIn, pos); - } - } - } - private void checkPressed(IBlockState p_185616_1_, World p_185616_2_, BlockPos p_185616_3_) - { - List list = p_185616_2_.getEntitiesWithinAABB(EntityArrow.class, p_185616_1_.getBoundingBox(p_185616_2_, p_185616_3_).offset(p_185616_3_)); - boolean flag = !list.isEmpty(); - boolean flag1 = p_185616_1_.getValue(POWERED).booleanValue(); - if (flag && !flag1) - { - p_185616_2_.setBlockState(p_185616_3_, p_185616_1_.withProperty(POWERED, Boolean.valueOf(true))); - notifyNeighbors(p_185616_2_, p_185616_3_, p_185616_1_.getValue(FACING)); - p_185616_2_.markBlockRangeForRenderUpdate(p_185616_3_, p_185616_3_); - playClickSound((EntityPlayer)null, p_185616_2_, p_185616_3_); - } - if (!flag && flag1) - { - p_185616_2_.setBlockState(p_185616_3_, p_185616_1_.withProperty(POWERED, Boolean.valueOf(false))); - notifyNeighbors(p_185616_2_, p_185616_3_, p_185616_1_.getValue(FACING)); - p_185616_2_.markBlockRangeForRenderUpdate(p_185616_3_, p_185616_3_); - playReleaseSound(p_185616_2_, p_185616_3_); - } - if (flag) - p_185616_2_.scheduleUpdate(new BlockPos(p_185616_3_), this, tickRate(p_185616_2_)); - } - private void notifyNeighbors(World worldIn, BlockPos pos, EnumFacing facing) - { - worldIn.notifyNeighborsOfStateChange(pos, this, false); - worldIn.notifyNeighborsOfStateChange(pos.offset(facing.getOpposite()), this, false); - } - @Override - public IBlockState getStateFromMeta(int meta) - { - EnumFacing enumfacing; - switch (meta & 7) - { - case 0: - enumfacing = EnumFacing.DOWN; - break; - case 1: - enumfacing = EnumFacing.EAST; - break; - case 2: - enumfacing = EnumFacing.WEST; - break; - case 3: - enumfacing = EnumFacing.SOUTH; - break; - case 4: - enumfacing = EnumFacing.NORTH; - break; - case 5: - default: - enumfacing = EnumFacing.UP; - } - return getDefaultState().withProperty(FACING, enumfacing).withProperty(POWERED, Boolean.valueOf((meta & 8) > 0)); - } - @Override - public int getMetaFromState(IBlockState state) - { - int i; - switch (state.getValue(FACING)) - { - case EAST: - i = 1; - break; - case WEST: - i = 2; - break; - case SOUTH: - i = 3; - break; - case NORTH: - i = 4; - break; - case UP: - default: - i = 5; - break; - case DOWN: - i = 0; - } - if (state.getValue(POWERED).booleanValue()) - i |= 8; - return i; - } - @Override - public IBlockState withRotation(IBlockState state, Rotation rot) - { - return state.withProperty(FACING, rot.rotate(state.getValue(FACING))); - } - @Override - public IBlockState withMirror(IBlockState state, Mirror mirrorIn) - { - return state.withRotation(mirrorIn.toRotation(state.getValue(FACING))); - } - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] {FACING, POWERED}); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/buttonTicks/EmeraldButtonTicks.java b/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/buttonTicks/EmeraldButtonTicks.java deleted file mode 100644 index 26b5698..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/buttonTicks/EmeraldButtonTicks.java +++ /dev/null @@ -1,316 +0,0 @@ -package com.NetherNoah.ParadiseMod.CustomBlockCode.buttonTicks; - -import java.util.List; -import java.util.Random; - -import javax.annotation.Nullable; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockDirectional; -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.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -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.world.IBlockAccess; -import net.minecraft.world.World; - -public abstract class EmeraldButtonTicks extends BlockDirectional -{ - public static final PropertyBool POWERED = PropertyBool.create("powered"); - protected static final AxisAlignedBB AABB_DOWN_OFF = new AxisAlignedBB(0.3125D, 0.875D, 0.375D, 0.6875D, 1.0D, 0.625D); - protected static final AxisAlignedBB AABB_UP_OFF = new AxisAlignedBB(0.3125D, 0.0D, 0.375D, 0.6875D, 0.125D, 0.625D); - protected static final AxisAlignedBB AABB_NORTH_OFF = new AxisAlignedBB(0.3125D, 0.375D, 0.875D, 0.6875D, 0.625D, 1.0D); - protected static final AxisAlignedBB AABB_SOUTH_OFF = new AxisAlignedBB(0.3125D, 0.375D, 0.0D, 0.6875D, 0.625D, 0.125D); - protected static final AxisAlignedBB AABB_WEST_OFF = new AxisAlignedBB(0.875D, 0.375D, 0.3125D, 1.0D, 0.625D, 0.6875D); - protected static final AxisAlignedBB AABB_EAST_OFF = new AxisAlignedBB(0.0D, 0.375D, 0.3125D, 0.125D, 0.625D, 0.6875D); - protected static final AxisAlignedBB AABB_DOWN_ON = new AxisAlignedBB(0.3125D, 0.9375D, 0.375D, 0.6875D, 1.0D, 0.625D); - protected static final AxisAlignedBB AABB_UP_ON = new AxisAlignedBB(0.3125D, 0.0D, 0.375D, 0.6875D, 0.0625D, 0.625D); - protected static final AxisAlignedBB AABB_NORTH_ON = new AxisAlignedBB(0.3125D, 0.375D, 0.9375D, 0.6875D, 0.625D, 1.0D); - protected static final AxisAlignedBB AABB_SOUTH_ON = new AxisAlignedBB(0.3125D, 0.375D, 0.0D, 0.6875D, 0.625D, 0.0625D); - protected static final AxisAlignedBB AABB_WEST_ON = new AxisAlignedBB(0.9375D, 0.375D, 0.3125D, 1.0D, 0.625D, 0.6875D); - protected static final AxisAlignedBB AABB_EAST_ON = new AxisAlignedBB(0.0D, 0.375D, 0.3125D, 0.0625D, 0.625D, 0.6875D); - private final boolean wooden; - - protected EmeraldButtonTicks(boolean wooden) - { - super(Material.CIRCUITS); - setDefaultState(blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(POWERED, Boolean.valueOf(false))); - setTickRandomly(true); - setCreativeTab(CreativeTabs.REDSTONE); - this.wooden = wooden; - } - - @Override - @Nullable - public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) - { - return NULL_AABB; - } - @Override - public int tickRate(World worldIn) - { - return wooden ? 10 : 20; - } - @Override - public boolean isOpaqueCube(IBlockState state) - { - return false; - } - @Override - public boolean isFullCube(IBlockState state) - { - return false; - } - @Override - public boolean canPlaceBlockOnSide(World worldIn, BlockPos pos, EnumFacing side) - { - return canPlaceBlock(worldIn, pos, side.getOpposite()); - } - @Override - public boolean canPlaceBlockAt(World worldIn, BlockPos pos) - { - for (EnumFacing enumfacing : EnumFacing.values()) - { - if (canPlaceBlock(worldIn, pos, enumfacing)) - return true; - } - return false; - } - protected static boolean canPlaceBlock(World worldIn, BlockPos pos, EnumFacing direction) - { - BlockPos blockpos = pos.offset(direction); - return worldIn.getBlockState(blockpos).isSideSolid(worldIn, blockpos, direction.getOpposite()); - } - @Override - public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) - { - return canPlaceBlock(worldIn, pos, facing.getOpposite()) ? getDefaultState().withProperty(FACING, facing).withProperty(POWERED, Boolean.valueOf(false)) : getDefaultState().withProperty(FACING, EnumFacing.DOWN).withProperty(POWERED, Boolean.valueOf(false)); - } - @Override - public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos) - { - if (checkForDrop(worldIn, pos, state) && !canPlaceBlock(worldIn, pos, state.getValue(FACING).getOpposite())) - { - dropBlockAsItem(worldIn, pos, state, 0); - worldIn.setBlockToAir(pos); - } - } - private boolean checkForDrop(World worldIn, BlockPos pos, IBlockState state) - { - if (canPlaceBlockAt(worldIn, pos)) - return true; - else - { - dropBlockAsItem(worldIn, pos, state, 0); - worldIn.setBlockToAir(pos); - return false; - } - } - @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) - { - EnumFacing enumfacing = state.getValue(FACING); - boolean flag = state.getValue(POWERED).booleanValue(); - switch (enumfacing) - { - case EAST: - return flag ? AABB_EAST_ON : AABB_EAST_OFF; - case WEST: - return flag ? AABB_WEST_ON : AABB_WEST_OFF; - case SOUTH: - return flag ? AABB_SOUTH_ON : AABB_SOUTH_OFF; - case NORTH: - default: - return flag ? AABB_NORTH_ON : AABB_NORTH_OFF; - case UP: - return flag ? AABB_UP_ON : AABB_UP_OFF; - case DOWN: - return flag ? AABB_DOWN_ON : AABB_DOWN_OFF; - } - } - @Override - public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) - { - if (state.getValue(POWERED).booleanValue()) - return true; - else - { - worldIn.setBlockState(pos, state.withProperty(POWERED, Boolean.valueOf(true)), 3); - worldIn.markBlockRangeForRenderUpdate(pos, pos); - playClickSound(playerIn, worldIn, pos); - notifyNeighbors(worldIn, pos, state.getValue(FACING)); - worldIn.scheduleUpdate(pos, this, tickRate(worldIn)); - return true; - } - } - protected abstract void playClickSound(@Nullable EntityPlayer player, World worldIn, BlockPos pos); - protected abstract void playReleaseSound(World worldIn, BlockPos pos); - @Override - public void breakBlock(World worldIn, BlockPos pos, IBlockState state) - { - if (state.getValue(POWERED).booleanValue()) - notifyNeighbors(worldIn, pos, state.getValue(FACING)); - super.breakBlock(worldIn, pos, state); - } - @Override - public int getWeakPower(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) - { - return blockState.getValue(POWERED).booleanValue() ? 15 : 0; - } - @Override - public int getStrongPower(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) - { - return !blockState.getValue(POWERED).booleanValue() ? 0 : (blockState.getValue(FACING) == side ? 15 : 0); - } - @Override - public boolean canProvidePower(IBlockState state) - { - return true; - } - @Override - public void randomTick(World worldIn, BlockPos pos, IBlockState state, Random random) - { - } - @Override - public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) - { - if (!worldIn.isRemote) - { - if (state.getValue(POWERED).booleanValue()) - { - if (wooden) - checkPressed(state, worldIn, pos); - else - { - worldIn.setBlockState(pos, state.withProperty(POWERED, Boolean.valueOf(false))); - notifyNeighbors(worldIn, pos, state.getValue(FACING)); - playReleaseSound(worldIn, pos); - worldIn.markBlockRangeForRenderUpdate(pos, pos); - } - } - } - } - @Override - public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn) - { - if (!worldIn.isRemote) - { - if (wooden) - { - if (!state.getValue(POWERED).booleanValue()) - checkPressed(state, worldIn, pos); - } - } - } - private void checkPressed(IBlockState p_185616_1_, World p_185616_2_, BlockPos p_185616_3_) - { - List list = p_185616_2_.getEntitiesWithinAABB(EntityArrow.class, p_185616_1_.getBoundingBox(p_185616_2_, p_185616_3_).offset(p_185616_3_)); - boolean flag = !list.isEmpty(); - boolean flag1 = p_185616_1_.getValue(POWERED).booleanValue(); - if (flag && !flag1) - { - p_185616_2_.setBlockState(p_185616_3_, p_185616_1_.withProperty(POWERED, Boolean.valueOf(true))); - notifyNeighbors(p_185616_2_, p_185616_3_, p_185616_1_.getValue(FACING)); - p_185616_2_.markBlockRangeForRenderUpdate(p_185616_3_, p_185616_3_); - playClickSound((EntityPlayer)null, p_185616_2_, p_185616_3_); - } - if (!flag && flag1) - { - p_185616_2_.setBlockState(p_185616_3_, p_185616_1_.withProperty(POWERED, Boolean.valueOf(false))); - notifyNeighbors(p_185616_2_, p_185616_3_, p_185616_1_.getValue(FACING)); - p_185616_2_.markBlockRangeForRenderUpdate(p_185616_3_, p_185616_3_); - this.playReleaseSound(p_185616_2_, p_185616_3_); - } - if (flag) - p_185616_2_.scheduleUpdate(new BlockPos(p_185616_3_), this, this.tickRate(p_185616_2_)); - } - private void notifyNeighbors(World worldIn, BlockPos pos, EnumFacing facing) - { - worldIn.notifyNeighborsOfStateChange(pos, this, false); - worldIn.notifyNeighborsOfStateChange(pos.offset(facing.getOpposite()), this, false); - } - @Override - public IBlockState getStateFromMeta(int meta) - { - EnumFacing enumfacing; - - switch (meta & 7) - { - case 0: - enumfacing = EnumFacing.DOWN; - break; - case 1: - enumfacing = EnumFacing.EAST; - break; - case 2: - enumfacing = EnumFacing.WEST; - break; - case 3: - enumfacing = EnumFacing.SOUTH; - break; - case 4: - enumfacing = EnumFacing.NORTH; - break; - case 5: - default: - enumfacing = EnumFacing.UP; - } - return this.getDefaultState().withProperty(FACING, enumfacing).withProperty(POWERED, Boolean.valueOf((meta & 8) > 0)); - } - @Override - public int getMetaFromState(IBlockState state) - { - int i; - switch (state.getValue(FACING)) - { - case EAST: - i = 1; - break; - case WEST: - i = 2; - break; - case SOUTH: - i = 3; - break; - case NORTH: - i = 4; - break; - case UP: - default: - i = 5; - break; - case DOWN: - i = 0; - } - if (state.getValue(POWERED).booleanValue()) - i |= 8; - return i; - } - @Override - public IBlockState withRotation(IBlockState state, Rotation rot) - { - return state.withProperty(FACING, rot.rotate(state.getValue(FACING))); - } - @Override - public IBlockState withMirror(IBlockState state, Mirror mirrorIn) - { - return state.withRotation(mirrorIn.toRotation(state.getValue(FACING))); - } - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] {FACING, POWERED}); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/buttonTicks/QuickButton.java b/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/buttonTicks/QuickButton.java deleted file mode 100644 index ac1c431..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/buttonTicks/QuickButton.java +++ /dev/null @@ -1,293 +0,0 @@ -package com.NetherNoah.ParadiseMod.CustomBlockCode.buttonTicks; - -import java.util.List; -import java.util.Random; - -import javax.annotation.Nullable; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockDirectional; -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.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -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.world.IBlockAccess; -import net.minecraft.world.World; - -public abstract class QuickButton extends BlockDirectional { - public static final PropertyBool POWERED = PropertyBool.create("powered"); - protected static final AxisAlignedBB AABB_DOWN_OFF = new AxisAlignedBB(0.3125D, 0.875D, 0.375D, 0.6875D, 1.0D, - 0.625D); - protected static final AxisAlignedBB AABB_UP_OFF = new AxisAlignedBB(0.3125D, 0.0D, 0.375D, 0.6875D, 0.125D, - 0.625D); - protected static final AxisAlignedBB AABB_NORTH_OFF = new AxisAlignedBB(0.3125D, 0.375D, 0.875D, 0.6875D, 0.625D, - 1.0D); - protected static final AxisAlignedBB AABB_SOUTH_OFF = new AxisAlignedBB(0.3125D, 0.375D, 0.0D, 0.6875D, 0.625D, - 0.125D); - protected static final AxisAlignedBB AABB_WEST_OFF = new AxisAlignedBB(0.875D, 0.375D, 0.3125D, 1.0D, 0.625D, - 0.6875D); - protected static final AxisAlignedBB AABB_EAST_OFF = new AxisAlignedBB(0.0D, 0.375D, 0.3125D, 0.125D, 0.625D, - 0.6875D); - protected static final AxisAlignedBB AABB_DOWN_ON = new AxisAlignedBB(0.3125D, 0.9375D, 0.375D, 0.6875D, 1.0D, - 0.625D); - protected static final AxisAlignedBB AABB_UP_ON = new AxisAlignedBB(0.3125D, 0.0D, 0.375D, 0.6875D, 0.0625D, - 0.625D); - protected static final AxisAlignedBB AABB_NORTH_ON = new AxisAlignedBB(0.3125D, 0.375D, 0.9375D, 0.6875D, 0.625D, - 1.0D); - protected static final AxisAlignedBB AABB_SOUTH_ON = new AxisAlignedBB(0.3125D, 0.375D, 0.0D, 0.6875D, 0.625D, - 0.0625D); - protected static final AxisAlignedBB AABB_WEST_ON = new AxisAlignedBB(0.9375D, 0.375D, 0.3125D, 1.0D, 0.625D, - 0.6875D); - protected static final AxisAlignedBB AABB_EAST_ON = new AxisAlignedBB(0.0D, 0.375D, 0.3125D, 0.0625D, 0.625D, - 0.6875D); - private final boolean wooden; - protected QuickButton(boolean wooden) { - super(Material.CIRCUITS); - setDefaultState(blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(POWERED, - Boolean.valueOf(false))); - setTickRandomly(true); - setCreativeTab(CreativeTabs.REDSTONE); - this.wooden = wooden; - } - @Override - @Nullable - public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) { - return NULL_AABB; - } - @Override - public int tickRate(World worldIn) { - return wooden ? 2 : 4; - } - @Override - public boolean isOpaqueCube(IBlockState state) { - return false; - } - @Override - public boolean isFullCube(IBlockState state) { - return false; - } - @Override - public boolean canPlaceBlockOnSide(World worldIn, BlockPos pos, EnumFacing side) { - return canPlaceBlock(worldIn, pos, side.getOpposite()); - } - @Override - public boolean canPlaceBlockAt(World worldIn, BlockPos pos) { - for (EnumFacing enumfacing : EnumFacing.values()) { - if (canPlaceBlock(worldIn, pos, enumfacing)) - return true; - } - return false; - } - protected static boolean canPlaceBlock(World worldIn, BlockPos pos, EnumFacing direction) { - BlockPos blockpos = pos.offset(direction); - return worldIn.getBlockState(blockpos).isSideSolid(worldIn, blockpos, direction.getOpposite()); - } - @Override - public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, - float hitZ, int meta, EntityLivingBase placer) { - return canPlaceBlock(worldIn, pos, facing.getOpposite()) - ? getDefaultState().withProperty(FACING, facing).withProperty(POWERED, Boolean.valueOf(false)) - : getDefaultState().withProperty(FACING, EnumFacing.DOWN).withProperty(POWERED, - Boolean.valueOf(false)); - } - @Override - public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos) { - if (checkForDrop(worldIn, pos, state) - && !canPlaceBlock(worldIn, pos, state.getValue(FACING).getOpposite())) { - dropBlockAsItem(worldIn, pos, state, 0); - worldIn.setBlockToAir(pos); - } - } - private boolean checkForDrop(World worldIn, BlockPos pos, IBlockState state) { - if (canPlaceBlockAt(worldIn, pos)) - return true; - else { - dropBlockAsItem(worldIn, pos, state, 0); - worldIn.setBlockToAir(pos); - return false; - } - } - @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { - EnumFacing enumfacing = state.getValue(FACING); - boolean flag = state.getValue(POWERED).booleanValue(); - switch (enumfacing) { - case EAST: - return flag ? AABB_EAST_ON : AABB_EAST_OFF; - case WEST: - return flag ? AABB_WEST_ON : AABB_WEST_OFF; - case SOUTH: - return flag ? AABB_SOUTH_ON : AABB_SOUTH_OFF; - case NORTH: - default: - return flag ? AABB_NORTH_ON : AABB_NORTH_OFF; - case UP: - return flag ? AABB_UP_ON : AABB_UP_OFF; - case DOWN: - return flag ? AABB_DOWN_ON : AABB_DOWN_OFF; - } - } - @Override - public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, - EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { - if (state.getValue(POWERED).booleanValue()) { - return true; - } else { - worldIn.setBlockState(pos, state.withProperty(POWERED, Boolean.valueOf(true)), 3); - worldIn.markBlockRangeForRenderUpdate(pos, pos); - playClickSound(playerIn, worldIn, pos); - notifyNeighbors(worldIn, pos, state.getValue(FACING)); - worldIn.scheduleUpdate(pos, this, tickRate(worldIn)); - return true; - } - } - protected abstract void playClickSound(@Nullable EntityPlayer player, World worldIn, BlockPos pos); - protected abstract void playReleaseSound(World worldIn, BlockPos pos); - @Override - public void breakBlock(World worldIn, BlockPos pos, IBlockState state) { - if (state.getValue(POWERED).booleanValue()) { - notifyNeighbors(worldIn, pos, state.getValue(FACING)); - } - super.breakBlock(worldIn, pos, state); - } - @Override - public int getWeakPower(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { - return blockState.getValue(POWERED).booleanValue() ? 15 : 0; - } - @Override - public int getStrongPower(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { - return !blockState.getValue(POWERED).booleanValue() ? 0 : (blockState.getValue(FACING) == side ? 15 : 0); - } - @Override - public boolean canProvidePower(IBlockState state) { - return true; - } - @Override - public void randomTick(World worldIn, BlockPos pos, IBlockState state, Random random) { - } - @Override - public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { - if (!worldIn.isRemote) { - if (state.getValue(POWERED).booleanValue()) { - if (wooden) - checkPressed(state, worldIn, pos); - else { - worldIn.setBlockState(pos, state.withProperty(POWERED, Boolean.valueOf(false))); - notifyNeighbors(worldIn, pos, state.getValue(FACING)); - playReleaseSound(worldIn, pos); - worldIn.markBlockRangeForRenderUpdate(pos, pos); - } - } - } - } - @Override - public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn) { - if (!worldIn.isRemote) { - if (wooden) { - if (!state.getValue(POWERED).booleanValue()) - checkPressed(state, worldIn, pos); - } - } - } - private void checkPressed(IBlockState p_185616_1_, World p_185616_2_, BlockPos p_185616_3_) { - List list = p_185616_2_.getEntitiesWithinAABB(EntityArrow.class, - p_185616_1_.getBoundingBox(p_185616_2_, p_185616_3_).offset(p_185616_3_)); - boolean flag = !list.isEmpty(); - boolean flag1 = p_185616_1_.getValue(POWERED).booleanValue(); - if (flag && !flag1) { - p_185616_2_.setBlockState(p_185616_3_, p_185616_1_.withProperty(POWERED, Boolean.valueOf(true))); - notifyNeighbors(p_185616_2_, p_185616_3_, p_185616_1_.getValue(FACING)); - p_185616_2_.markBlockRangeForRenderUpdate(p_185616_3_, p_185616_3_); - playClickSound((EntityPlayer) null, p_185616_2_, p_185616_3_); - } - if (!flag && flag1) { - p_185616_2_.setBlockState(p_185616_3_, p_185616_1_.withProperty(POWERED, Boolean.valueOf(false))); - notifyNeighbors(p_185616_2_, p_185616_3_, p_185616_1_.getValue(FACING)); - p_185616_2_.markBlockRangeForRenderUpdate(p_185616_3_, p_185616_3_); - playReleaseSound(p_185616_2_, p_185616_3_); - } - if (flag) - p_185616_2_.scheduleUpdate(new BlockPos(p_185616_3_), this, tickRate(p_185616_2_)); - } - private void notifyNeighbors(World worldIn, BlockPos pos, EnumFacing facing) { - worldIn.notifyNeighborsOfStateChange(pos, this, false); - worldIn.notifyNeighborsOfStateChange(pos.offset(facing.getOpposite()), this, false); - } - @Override - public IBlockState getStateFromMeta(int meta) { - EnumFacing enumfacing; - switch (meta & 7) { - case 0: - enumfacing = EnumFacing.DOWN; - break; - case 1: - enumfacing = EnumFacing.EAST; - break; - case 2: - enumfacing = EnumFacing.WEST; - break; - case 3: - enumfacing = EnumFacing.SOUTH; - break; - case 4: - enumfacing = EnumFacing.NORTH; - break; - case 5: - default: - enumfacing = EnumFacing.UP; - } - return getDefaultState().withProperty(FACING, enumfacing).withProperty(POWERED, - Boolean.valueOf((meta & 8) > 0)); - } - @Override - public int getMetaFromState(IBlockState state) { - int i; - switch (state.getValue(FACING)) { - case EAST: - i = 1; - break; - case WEST: - i = 2; - break; - case SOUTH: - i = 3; - break; - case NORTH: - i = 4; - break; - case UP: - default: - i = 5; - break; - case DOWN: - i = 0; - } - if (state.getValue(POWERED).booleanValue()) - i |= 8; - return i; - } - @Override - public IBlockState withRotation(IBlockState state, Rotation rot) { - return state.withProperty(FACING, rot.rotate(state.getValue(FACING))); - } - @Override - public IBlockState withMirror(IBlockState state, Mirror mirrorIn) { - return state.withRotation(mirrorIn.toRotation(state.getValue(FACING))); - } - @Override - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, new IProperty[] { FACING, POWERED }); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/planks.java b/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/planks.java deleted file mode 100644 index 4aa6a70..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/planks.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.NetherNoah.ParadiseMod.CustomBlockCode; - -import net.minecraft.block.Block; -import net.minecraft.block.material.MapColor; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.NonNullList; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public class planks extends Block -{ - public static final PropertyEnum VARIANT = PropertyEnum.create("variant", planks.EnumType.class); - - public planks() - { - super(Material.WOOD); - setDefaultState(blockState.getBaseState().withProperty(VARIANT, planks.EnumType.CHRISTMAS)); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - } - @Override - public int damageDropped(IBlockState state) - { - return state.getValue(VARIANT).getMetadata(); - } - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList list) - { - for (planks.EnumType blockplanks$enumtype : planks.EnumType.values()) - list.add(new ItemStack(itemIn, 1, blockplanks$enumtype.getMetadata())); - } - @Override - public IBlockState getStateFromMeta(int meta) - { - return getDefaultState().withProperty(VARIANT, planks.EnumType.byMetadata(meta)); - } - public MapColor getMapColor(IBlockState state) - { - return state.getValue(VARIANT).getMapColor(); - } - @Override - public int getMetaFromState(IBlockState state) - { - return state.getValue(VARIANT).getMetadata(); - } - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] {VARIANT}); - } - public static enum EnumType implements IStringSerializable - { - CHRISTMAS(0, "christmas", MapColor.WOOD); - private static final planks.EnumType[] META_LOOKUP = new planks.EnumType[values().length]; - private final int meta; - private final String name; - private final String unlocalizedName; - private final MapColor mapColor; - private EnumType(int metaIn, String nameIn, MapColor mapColorIn) - { - this(metaIn, nameIn, nameIn, mapColorIn); - } - private EnumType(int metaIn, String nameIn, String unlocalizedNameIn, MapColor mapColorIn) - { - meta = metaIn; - name = nameIn; - unlocalizedName = unlocalizedNameIn; - mapColor = mapColorIn; - } - public int getMetadata() - { - return meta; - } - public MapColor getMapColor() - { - return mapColor; - } - @Override - public String toString() - { - return name; - } - public static planks.EnumType byMetadata(int meta) - { - if (meta < 0 || meta >= META_LOOKUP.length) - meta = 0; - return META_LOOKUP[meta]; - } - @Override - public String getName() - { - return name; - } - public String getUnlocalizedName() - { - return unlocalizedName; - } - static - { - for (planks.EnumType blockplanks$enumtype : values()) - META_LOOKUP[blockplanks$enumtype.getMetadata()] = blockplanks$enumtype; - } - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/pressurePlates/BedrockPlateCode.java b/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/pressurePlates/BedrockPlateCode.java deleted file mode 100644 index d250702..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/pressurePlates/BedrockPlateCode.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.NetherNoah.ParadiseMod.CustomBlockCode.pressurePlates; - -import java.util.List; - -import net.minecraft.block.BlockBasePressurePlate; -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.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.SoundEvents; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class BedrockPlateCode extends BlockBasePressurePlate -{ - public static final PropertyBool POWERED = PropertyBool.create("powered"); - private final BedrockPlateCode.Sensitivity sensitivity; - protected BedrockPlateCode(Material materialIn, BedrockPlateCode.Sensitivity sensitivityIn) - { - super(materialIn); - setDefaultState(blockState.getBaseState().withProperty(POWERED, Boolean.valueOf(false))); - sensitivity = sensitivityIn; - } - @Override - protected int getRedstoneStrength(IBlockState state) - { - return state.getValue(POWERED).booleanValue() ? 15 : 0; - } - @Override - protected IBlockState setRedstoneStrength(IBlockState state, int strength) - { - return state.withProperty(POWERED, Boolean.valueOf(strength > 0)); - } - @Override - protected void playClickOnSound(World worldIn, BlockPos color) - { - if (blockMaterial == Material.WOOD) - worldIn.playSound((EntityPlayer)null, color, SoundEvents.BLOCK_WOOD_PRESSPLATE_CLICK_ON, SoundCategory.BLOCKS, 0.3F, 0.8F); - else - worldIn.playSound((EntityPlayer)null, color, SoundEvents.BLOCK_STONE_PRESSPLATE_CLICK_ON, SoundCategory.BLOCKS, 0.3F, 0.6F); - } - @Override - protected void playClickOffSound(World worldIn, BlockPos pos) - { - if (blockMaterial == Material.WOOD) - worldIn.playSound((EntityPlayer)null, pos, SoundEvents.BLOCK_WOOD_PRESSPLATE_CLICK_OFF, SoundCategory.BLOCKS, 0.3F, 0.7F); - else - worldIn.playSound((EntityPlayer)null, pos, SoundEvents.BLOCK_STONE_PRESSPLATE_CLICK_OFF, SoundCategory.BLOCKS, 0.3F, 0.5F); - } - @Override - protected int computeRedstoneStrength(World worldIn, BlockPos pos) - { - AxisAlignedBB axisalignedbb = PRESSURE_AABB.offset(pos); - List list; - switch (sensitivity) - { - case PLAYER: - list = worldIn.getEntitiesWithinAABB(EntityPlayer.class, axisalignedbb); - break; - case EVERYTHING: - list = worldIn.getEntitiesWithinAABBExcludingEntity((Entity)null, axisalignedbb); - break; - case MOBS: - list = worldIn.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb); - break; - default: - return 0; - } - if (!list.isEmpty()) - { - for (Entity entity : list) - { - if (!entity.doesEntityNotTriggerPressurePlate()) - return 15; - } - } - return 0; - } - @Override - public IBlockState getStateFromMeta(int meta) - { - return getDefaultState().withProperty(POWERED, Boolean.valueOf(meta == 1)); - } - @Override - public int getMetaFromState(IBlockState state) - { - return state.getValue(POWERED).booleanValue() ? 1 : 0; - } - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] {POWERED}); - } - public static enum Sensitivity - { - PLAYER, - EVERYTHING, - MOBS; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/pressurePlates/DiamondPlateCode.java b/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/pressurePlates/DiamondPlateCode.java deleted file mode 100644 index 1e73446..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/pressurePlates/DiamondPlateCode.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.NetherNoah.ParadiseMod.CustomBlockCode.pressurePlates; - -import java.util.List; - -import net.minecraft.block.BlockBasePressurePlate; -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.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.SoundEvents; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class DiamondPlateCode extends BlockBasePressurePlate -{ - public static final PropertyBool POWERED = PropertyBool.create("powered"); - private final DiamondPlateCode.Sensitivity sensitivity; - protected DiamondPlateCode(Material materialIn, DiamondPlateCode.Sensitivity sensitivityIn) - { - super(materialIn); - setDefaultState(blockState.getBaseState().withProperty(POWERED, Boolean.valueOf(false))); - sensitivity = sensitivityIn; - } - @Override - protected int getRedstoneStrength(IBlockState state) - { - return state.getValue(POWERED).booleanValue() ? 15 : 0; - } - @Override - protected IBlockState setRedstoneStrength(IBlockState state, int strength) - { - return state.withProperty(POWERED, Boolean.valueOf(strength > 0)); - } - @Override - protected void playClickOnSound(World worldIn, BlockPos color) - { - if (blockMaterial == Material.WOOD) - worldIn.playSound((EntityPlayer)null, color, SoundEvents.BLOCK_WOOD_PRESSPLATE_CLICK_ON, SoundCategory.BLOCKS, 0.3F, 0.8F); - else - worldIn.playSound((EntityPlayer)null, color, SoundEvents.BLOCK_STONE_PRESSPLATE_CLICK_ON, SoundCategory.BLOCKS, 0.3F, 0.6F); - } - @Override - protected void playClickOffSound(World worldIn, BlockPos pos) - { - if (blockMaterial == Material.WOOD) - worldIn.playSound((EntityPlayer)null, pos, SoundEvents.BLOCK_WOOD_PRESSPLATE_CLICK_OFF, SoundCategory.BLOCKS, 0.3F, 0.7F); - else - worldIn.playSound((EntityPlayer)null, pos, SoundEvents.BLOCK_STONE_PRESSPLATE_CLICK_OFF, SoundCategory.BLOCKS, 0.3F, 0.5F); - } - @Override - protected int computeRedstoneStrength(World worldIn, BlockPos pos) - { - AxisAlignedBB axisalignedbb = PRESSURE_AABB.offset(pos); - List list; - - switch (sensitivity) - { - case EVERYTHING: - list = worldIn.getEntitiesWithinAABBExcludingEntity((Entity)null, axisalignedbb); - break; - case MOBS: - list = worldIn.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb); - break; - default: - return 0; - } - if (!list.isEmpty()) - { - for (Entity entity : list) - { - if (!entity.doesEntityNotTriggerPressurePlate()) - return 7; - } - } - return 0; - } - @Override - public IBlockState getStateFromMeta(int meta) - { - return getDefaultState().withProperty(POWERED, Boolean.valueOf(meta == 1)); - } - @Override - public int getMetaFromState(IBlockState state) - { - return state.getValue(POWERED).booleanValue() ? 1 : 0; - } - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] {POWERED}); - } - public static enum Sensitivity - { - EVERYTHING, - MOBS; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/pressurePlates/EmeraldPlateCode.java b/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/pressurePlates/EmeraldPlateCode.java deleted file mode 100644 index 8ada4e3..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/pressurePlates/EmeraldPlateCode.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.NetherNoah.ParadiseMod.CustomBlockCode.pressurePlates; - -import java.util.List; - -import net.minecraft.block.BlockBasePressurePlate; -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.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.SoundEvents; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class EmeraldPlateCode extends BlockBasePressurePlate -{ - public static final PropertyBool POWERED = PropertyBool.create("powered"); - private final EmeraldPlateCode.Sensitivity sensitivity; - protected EmeraldPlateCode(Material materialIn, EmeraldPlateCode.Sensitivity sensitivityIn) - { - super(materialIn); - setDefaultState(blockState.getBaseState().withProperty(POWERED, Boolean.valueOf(false))); - sensitivity = sensitivityIn; - } - @Override - protected int getRedstoneStrength(IBlockState state) - { - return state.getValue(POWERED).booleanValue() ? 15 : 0; - } - @Override - protected IBlockState setRedstoneStrength(IBlockState state, int strength) - { - return state.withProperty(POWERED, Boolean.valueOf(strength > 0)); - } - @Override - protected void playClickOnSound(World worldIn, BlockPos color) - { - if (blockMaterial == Material.WOOD) - worldIn.playSound((EntityPlayer)null, color, SoundEvents.BLOCK_WOOD_PRESSPLATE_CLICK_ON, SoundCategory.BLOCKS, 0.3F, 0.8F); - else - worldIn.playSound((EntityPlayer)null, color, SoundEvents.BLOCK_STONE_PRESSPLATE_CLICK_ON, SoundCategory.BLOCKS, 0.3F, 0.6F); - } - @Override - protected void playClickOffSound(World worldIn, BlockPos pos) - { - if (blockMaterial == Material.WOOD) - worldIn.playSound((EntityPlayer)null, pos, SoundEvents.BLOCK_WOOD_PRESSPLATE_CLICK_OFF, SoundCategory.BLOCKS, 0.3F, 0.7F); - else - worldIn.playSound((EntityPlayer)null, pos, SoundEvents.BLOCK_STONE_PRESSPLATE_CLICK_OFF, SoundCategory.BLOCKS, 0.3F, 0.5F); - } - @Override - protected int computeRedstoneStrength(World worldIn, BlockPos pos) - { - AxisAlignedBB axisalignedbb = PRESSURE_AABB.offset(pos); - List list; - - switch (sensitivity) - { - case EVERYTHING: - list = worldIn.getEntitiesWithinAABBExcludingEntity((Entity)null, axisalignedbb); - break; - case MOBS: - list = worldIn.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb); - break; - default: - return 0; - } - if (!list.isEmpty()) - { - for (Entity entity : list) - { - if (!entity.doesEntityNotTriggerPressurePlate()) - return 5; - } - } - return 0; - } - @Override - public IBlockState getStateFromMeta(int meta) - { - return getDefaultState().withProperty(POWERED, Boolean.valueOf(meta == 1)); - } - @Override - public int getMetaFromState(IBlockState state) - { - return state.getValue(POWERED).booleanValue() ? 1 : 0; - } - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] {POWERED}); - } - public static enum Sensitivity - { - EVERYTHING, - MOBS; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/xmasTree.java b/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/xmasTree.java deleted file mode 100644 index 61bdbf4..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/xmasTree.java +++ /dev/null @@ -1,174 +0,0 @@ -package com.NetherNoah.ParadiseMod.CustomBlockCode; - -import java.util.Random; - -import com.NetherNoah.ParadiseMod.world.worldgen.misc.ChristmasTree; - -import net.minecraft.block.BlockBush; -import net.minecraft.block.IGrowable; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.properties.PropertyInteger; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.translation.I18n; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenBigTree; -import net.minecraft.world.gen.feature.WorldGenTrees; -import net.minecraft.world.gen.feature.WorldGenerator; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public class xmasTree extends BlockBush implements IGrowable -{ - public static final PropertyEnum TYPE = PropertyEnum.create("type", planks.EnumType.class); - public static final PropertyInteger STAGE = PropertyInteger.create("stage", 0, 1); - protected static final AxisAlignedBB SAPLING_AABB = new AxisAlignedBB(0.09999999403953552D, 0.0D, 0.09999999403953552D, 0.8999999761581421D, 0.800000011920929D, 0.8999999761581421D); - protected xmasTree() - { - setDefaultState(blockState.getBaseState().withProperty(TYPE, planks.EnumType.CHRISTMAS).withProperty(STAGE, Integer.valueOf(0))); - setCreativeTab(CreativeTabs.DECORATIONS); - } - @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) - { - return SAPLING_AABB; - } - @Override - public String getLocalizedName() - { - return I18n.translateToLocal(getUnlocalizedName() + "." + planks.EnumType.CHRISTMAS.getUnlocalizedName() + ".name"); - } - @Override - public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) - { - if (!worldIn.isRemote) - { - super.updateTick(worldIn, pos, state, rand); - if (worldIn.getLightFromNeighbors(pos.up()) >= 9 && rand.nextInt(7) == 0) - grow(worldIn, pos, state, rand); - } - } - public void grow(World worldIn, BlockPos pos, IBlockState state, Random rand) - { - if (state.getValue(STAGE).intValue() == 0) - worldIn.setBlockState(pos, state.cycleProperty(STAGE), 4); - else - generateTree(worldIn, pos, state, rand); - } - public void generateTree(World worldIn, BlockPos pos, IBlockState state, Random rand) - { - if (!net.minecraftforge.event.terraingen.TerrainGen.saplingGrowTree(worldIn, rand, pos)) return; - WorldGenerator worldgenerator = rand.nextInt(10) == 0 ? new WorldGenBigTree(true) : new WorldGenTrees(true); - int i = 0; - int j = 0; - boolean flag = false; - switch (state.getValue(TYPE)) - { - case CHRISTMAS: - label114: - for (i = 0; i >= -1; --i) - { - for (j = 0; j >= -1; --j) - { - if (isTwoByTwoOfType(worldIn, pos, i, j, planks.EnumType.CHRISTMAS)) - { - worldgenerator = new ChristmasTree(true); - flag = true; - break label114; - } - } - } - if (!flag) - { - i = 0; - j = 0; - worldgenerator = new ChristmasTree(true); - } - break; - } - IBlockState iblockstate2 = Blocks.AIR.getDefaultState(); - if (flag) - { - worldIn.setBlockState(pos.add(i, 0, j), iblockstate2, 4); - worldIn.setBlockState(pos.add(i + 1, 0, j), iblockstate2, 4); - worldIn.setBlockState(pos.add(i, 0, j + 1), iblockstate2, 4); - worldIn.setBlockState(pos.add(i + 1, 0, j + 1), iblockstate2, 4); - } - else - worldIn.setBlockState(pos, iblockstate2, 4); - if (!worldgenerator.generate(worldIn, rand, pos.add(i, 0, j))) - { - if (flag) - { - worldIn.setBlockState(pos.add(i, 0, j), state, 4); - worldIn.setBlockState(pos.add(i + 1, 0, j), state, 4); - worldIn.setBlockState(pos.add(i, 0, j + 1), state, 4); - worldIn.setBlockState(pos.add(i + 1, 0, j + 1), state, 4); - } - else - worldIn.setBlockState(pos, state, 4); - } - } - private boolean isTwoByTwoOfType(World worldIn, BlockPos pos, int p_181624_3_, int p_181624_4_, planks.EnumType type) - { - return isTypeAt(worldIn, pos.add(p_181624_3_, 0, p_181624_4_), type) && isTypeAt(worldIn, pos.add(p_181624_3_ + 1, 0, p_181624_4_), type) && isTypeAt(worldIn, pos.add(p_181624_3_, 0, p_181624_4_ + 1), type) && isTypeAt(worldIn, pos.add(p_181624_3_ + 1, 0, p_181624_4_ + 1), type); - } - public boolean isTypeAt(World worldIn, BlockPos pos, planks.EnumType type) - { - IBlockState iblockstate = worldIn.getBlockState(pos); - return iblockstate.getBlock() == this && iblockstate.getValue(TYPE) == type; - } - @Override - public int damageDropped(IBlockState state) - { - return state.getValue(TYPE).getMetadata(); - } - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList list) - { - for (planks.EnumType planks$enumtype : planks.EnumType.values()) - list.add(new ItemStack(itemIn, 1, planks$enumtype.getMetadata())); - } - @Override - public boolean canGrow(World worldIn, BlockPos pos, IBlockState state, boolean isClient) - { - return true; - } - @Override - public boolean canUseBonemeal(World worldIn, Random rand, BlockPos pos, IBlockState state) - { - return worldIn.rand.nextFloat() < 0.45D; - } - @Override - public void grow(World worldIn, Random rand, BlockPos pos, IBlockState state) - { - grow(worldIn, pos, state, rand); - } - @Override - public IBlockState getStateFromMeta(int meta) - { - return getDefaultState().withProperty(TYPE, planks.EnumType.byMetadata(meta & 7)).withProperty(STAGE, Integer.valueOf((meta & 8) >> 3)); - } - @Override - public int getMetaFromState(IBlockState state) - { - int i = 0; - i = i | state.getValue(TYPE).getMetadata(); - i = i | state.getValue(STAGE).intValue() << 3; - return i; - } - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] {TYPE, STAGE}); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/GUI/ContainerCustomCraftBench.java b/src/main/java/com/NetherNoah/ParadiseMod/GUI/ContainerCustomCraftBench.java index d06fbc1..af9797b 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/GUI/ContainerCustomCraftBench.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/GUI/ContainerCustomCraftBench.java @@ -1,4 +1,5 @@ package com.NetherNoah.ParadiseMod.GUI; + //this was derived from vanilla code import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/NetherNoah/ParadiseMod/ParadiseMod.java b/src/main/java/com/NetherNoah/ParadiseMod/ParadiseMod.java index 8763321..90c76fc 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/ParadiseMod.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/ParadiseMod.java @@ -62,6 +62,7 @@ import com.NetherNoah.ParadiseMod.world.worldgen.structures.TreasureChest; import com.NetherNoah.ParadiseMod.world.worldgen.structures.UndergroundVillage; import com.NetherNoah.ParadiseMod.world.worldgen.structures.WickerMan; +import com.NetherNoah.ParadiseMod.world.worldgen.structures.blackCross; import com.NetherNoah.ParadiseMod.world.worldgen.structures.AttieCat.JeffTank; import com.NetherNoah.ParadiseMod.world.worldgen.structures.AttieCat.Shrine; import com.NetherNoah.ParadiseMod.world.worldgen.structures.Dungeons.BrickPyramid; @@ -205,6 +206,9 @@ public void preInit(FMLPreInitializationEvent event) { new PlayerTemples(), new GiantGrassBlock(), + //I am NOT an apostolic christian, nor do I want to be one, Genesis! + new blackCross(), + //created by AttieCat new Shrine(), new JeffTank(), @@ -233,7 +237,7 @@ public void preInit(FMLPreInitializationEvent event) { for(int i=0;i maxValue && numbers[i]!=0){ + maxValue = numbers[i]; + } + } + return maxValue; + } + + /** + *Gets the minimum value of an integer array + */ + public static int getMinValue(int[] numbers){ + int minValue = numbers[0]; + for(int i=1;i HINGE = PropertyEnum.create("hinge", BlockDoor.EnumHingePosition.class); - public static final PropertyBool POWERED = PropertyBool.create("powered"); public static final PropertyEnum HALF = PropertyEnum.create("half", BlockDoor.EnumDoorHalf.class); - protected static final AxisAlignedBB SOUTH_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.1875D); - protected static final AxisAlignedBB NORTH_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.8125D, 1.0D, 1.0D, 1.0D); - protected static final AxisAlignedBB WEST_AABB = new AxisAlignedBB(0.8125D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D); - protected static final AxisAlignedBB EAST_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.1875D, 1.0D, 1.0D); + protected static final AxisAlignedBB SOUTH = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.1875D); + protected static final AxisAlignedBB NORTH = new AxisAlignedBB(0.0D, 0.0D, 0.8125D, 1.0D, 1.0D, 1.0D); + protected static final AxisAlignedBB WEST = new AxisAlignedBB(0.8125D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D); + protected static final AxisAlignedBB EAST = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.1875D, 1.0D, 1.0D); + + public RedstoneDoor() { + super(Material.ROCK); + setUnlocalizedName("RedstoneDoor"); + setRegistryName("redstone_door_block"); + setHardness(5F); + setResistance(10F); + setHarvestLevel("pickaxe", 2); + setSoundType(SoundType.METAL); + } + //the item is the door itself + @Override + public Item getItemDropped(IBlockState state, Random rand, int fortune) + { + return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.RedstoneDoor; + } + @Override + public boolean canConnectRedstone(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + return true; + } + //this door is a rs power block! + @Override + public int getWeakPower(IBlockState state, IBlockAccess worldIn, BlockPos pos, EnumFacing side){ + return 15; + } + @Override + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) + { + return new ItemStack(DoorItems.RedstoneDoor); + } @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { @@ -58,20 +85,15 @@ public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, Bloc { case EAST: default: - return flag ? EAST_AABB : (flag1 ? NORTH_AABB : SOUTH_AABB); + return flag ? EAST : (flag1 ? NORTH : SOUTH); case SOUTH: - return flag ? SOUTH_AABB : (flag1 ? EAST_AABB : WEST_AABB); + return flag ? SOUTH : (flag1 ? EAST : WEST); case WEST: - return flag ? WEST_AABB : (flag1 ? SOUTH_AABB : NORTH_AABB); + return flag ? WEST : (flag1 ? SOUTH : NORTH); case NORTH: - return flag ? NORTH_AABB : (flag1 ? WEST_AABB : EAST_AABB); + return flag ? NORTH : (flag1 ? WEST : EAST); } } - @Override - public String getLocalizedName() - { - return I18n.translateToLocal((getUnlocalizedName() + ".name").replaceAll("tile", "item")); - } @Override public boolean isOpaqueCube(IBlockState state) { @@ -87,38 +109,32 @@ public boolean isFullCube(IBlockState state) { return false; } - private int getCloseSound() + public int getCloseSound() { - return blockMaterial == Material.IRON ? 1011 : 1012; + return 1011; } private int getOpenSound() { - return blockMaterial == Material.IRON ? 1005 : 1006; + return 1005; } @Override public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { - if (blockMaterial == Material.IRON) - return false; + BlockPos blockpos = state.getValue(HALF) == BlockDoor.EnumDoorHalf.LOWER ? pos : pos.down(); + IBlockState iblockstate = pos.equals(blockpos) ? state : worldIn.getBlockState(blockpos); + + if (iblockstate.getBlock() != this) + return false; else { - BlockPos blockpos = state.getValue(HALF) == BlockDoor.EnumDoorHalf.LOWER ? pos : pos.down(); - IBlockState iblockstate = pos.equals(blockpos) ? state : worldIn.getBlockState(blockpos); - - if (iblockstate.getBlock() != this) - return false; - else - { - state = iblockstate.cycleProperty(OPEN); - worldIn.setBlockState(blockpos, state, 10); - worldIn.markBlockRangeForRenderUpdate(blockpos, pos); - worldIn.playEvent(playerIn, state.getValue(OPEN).booleanValue() ? getOpenSound() : getCloseSound(), pos, 0); - return true; - } + state = iblockstate.cycleProperty(OPEN); + worldIn.setBlockState(blockpos, state, 10); + worldIn.markBlockRangeForRenderUpdate(blockpos, pos); + worldIn.playEvent(playerIn, state.getValue(OPEN).booleanValue() ? getOpenSound() : getCloseSound(), pos, 0); + return true; } } - public void toggleDoor(World worldIn, BlockPos pos, boolean open) - { + public void toggleDoor(World worldIn, BlockPos pos, boolean open){ IBlockState iblockstate = worldIn.getBlockState(pos); if (iblockstate.getBlock() == this) @@ -135,13 +151,7 @@ public void toggleDoor(World worldIn, BlockPos pos, boolean open) } } @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) - { - return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR : getItem(); - } - @Override - public boolean canPlaceBlockAt(World worldIn, BlockPos pos) - { + public boolean canPlaceBlockAt(World worldIn, BlockPos pos){ return pos.getY() >= worldIn.getHeight() - 1 ? false : worldIn.getBlockState(pos.down()).isSideSolid(worldIn, pos.down(), EnumFacing.UP) && super.canPlaceBlockAt(worldIn, pos) && super.canPlaceBlockAt(worldIn, pos.up()); } @Override @@ -167,11 +177,7 @@ public static int combineMetadata(IBlockAccess worldIn, BlockPos pos) @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(getItem()); - } - private Item getItem() - { - return DoorItems.ItemRedstoneDoor; + return new ItemStack(DoorItems.RedstoneDoor); } @Override public void onBlockHarvested(World worldIn, BlockPos pos, IBlockState state, EntityPlayer player) @@ -201,7 +207,7 @@ public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, Block IBlockState iblockstate = worldIn.getBlockState(pos.up()); if (iblockstate.getBlock() == this) - state = state.withProperty(HINGE, iblockstate.getValue(HINGE)).withProperty(POWERED, iblockstate.getValue(POWERED)); + state = state.withProperty(HINGE, iblockstate.getValue(HINGE)); } else { @@ -226,7 +232,7 @@ public IBlockState withMirror(IBlockState state, Mirror mirrorIn) @Override public IBlockState getStateFromMeta(int meta) { - return (meta & 8) > 0 ? getDefaultState().withProperty(HALF, BlockDoor.EnumDoorHalf.UPPER).withProperty(HINGE, (meta & 1) > 0 ? BlockDoor.EnumHingePosition.RIGHT : BlockDoor.EnumHingePosition.LEFT).withProperty(POWERED, Boolean.valueOf((meta & 2) > 0)) : getDefaultState().withProperty(HALF, BlockDoor.EnumDoorHalf.LOWER).withProperty(FACING, EnumFacing.getHorizontal(meta & 3).rotateYCCW()).withProperty(OPEN, Boolean.valueOf((meta & 4) > 0)); + return (meta & 8) > 0 ? getDefaultState().withProperty(HALF, BlockDoor.EnumDoorHalf.UPPER).withProperty(HINGE, (meta & 1) > 0 ? BlockDoor.EnumHingePosition.RIGHT : BlockDoor.EnumHingePosition.LEFT): getDefaultState().withProperty(HALF, BlockDoor.EnumDoorHalf.LOWER).withProperty(FACING, EnumFacing.getHorizontal(meta & 3).rotateYCCW()).withProperty(OPEN, Boolean.valueOf((meta & 4) > 0)); } @Override public int getMetaFromState(IBlockState state) @@ -237,8 +243,6 @@ public int getMetaFromState(IBlockState state) i = i | 8; if (state.getValue(HINGE) == BlockDoor.EnumHingePosition.RIGHT) i |= 1; - if (state.getValue(POWERED).booleanValue()) - i |= 2; } else { @@ -275,37 +279,6 @@ protected static boolean isTop(int meta) @Override protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, new IProperty[] {HALF, FACING, OPEN, HINGE, POWERED}); - } - - public static enum EnumDoorHalf implements IStringSerializable - { - UPPER, - LOWER; - @Override - public String toString() - { - return getName(); - } - @Override - public String getName() - { - return this == UPPER ? "upper" : "lower"; - } - } - public static enum EnumHingePosition implements IStringSerializable - { - LEFT, - RIGHT; - @Override - public String toString() - { - return getName(); - } - @Override - public String getName() - { - return this == LEFT ? "left" : "right"; - } + return new BlockStateContainer(this, new IProperty[] {HALF,FACING,OPEN,HINGE,}); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/RedstoneFence.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/RedstoneFence.java similarity index 97% rename from src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/RedstoneFence.java rename to src/main/java/com/NetherNoah/ParadiseMod/blocks/RedstoneFence.java index 16bd9c6..15ea7af 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/RedstoneFence.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/RedstoneFence.java @@ -1,4 +1,4 @@ -package com.NetherNoah.ParadiseMod.blocks.fences; +package com.NetherNoah.ParadiseMod.blocks; import net.minecraft.block.Block; import net.minecraft.block.BlockFence; diff --git a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/RSFenceGate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/RedstoneFenceGate.java similarity index 58% rename from src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/RSFenceGate.java rename to src/main/java/com/NetherNoah/ParadiseMod/blocks/RedstoneFenceGate.java index 9d1c03c..9138d4d 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/RSFenceGate.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/RedstoneFenceGate.java @@ -1,16 +1,21 @@ -//this was derived from the vanilla code -package com.NetherNoah.ParadiseMod.CustomBlockCode; +package com.NetherNoah.ParadiseMod.blocks; import javax.annotation.Nullable; +import com.NetherNoah.ParadiseMod.blocks.base.CustomWall; + import net.minecraft.block.Block; import net.minecraft.block.BlockFence; +import net.minecraft.block.BlockFenceGate; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.BlockPlanks; import net.minecraft.block.BlockWall; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -25,36 +30,65 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -public class RSFenceGate extends BlockHorizontal +public class RedstoneFenceGate extends BlockHorizontal { public static final PropertyBool OPEN = PropertyBool.create("open"); - public static final PropertyBool POWERED = PropertyBool.create("powered"); public static final PropertyBool IN_WALL = PropertyBool.create("in_wall"); - protected static final AxisAlignedBB AABB_COLLIDE_ZAXIS = new AxisAlignedBB(0.0D, 0.0D, 0.375D, 1.0D, 1.0D, 0.625D); - protected static final AxisAlignedBB AABB_COLLIDE_XAXIS = new AxisAlignedBB(0.375D, 0.0D, 0.0D, 0.625D, 1.0D, 1.0D); - protected static final AxisAlignedBB AABB_COLLIDE_ZAXIS_INWALL = new AxisAlignedBB(0.0D, 0.0D, 0.375D, 1.0D, 0.8125D, 0.625D); - protected static final AxisAlignedBB AABB_COLLIDE_XAXIS_INWALL = new AxisAlignedBB(0.375D, 0.0D, 0.0D, 0.625D, 0.8125D, 1.0D); - protected static final AxisAlignedBB AABB_CLOSED_SELECTED_ZAXIS = new AxisAlignedBB(0.0D, 0.0D, 0.375D, 1.0D, 1.5D, 0.625D); - protected static final AxisAlignedBB AABB_CLOSED_SELECTED_XAXIS = new AxisAlignedBB(0.375D, 0.0D, 0.0D, 0.625D, 1.5D, 1.0D); - public RSFenceGate(BlockPlanks.EnumType p_i46394_1_) - { - super(Material.WOOD, p_i46394_1_.getMapColor()); - setDefaultState(blockState.getBaseState().withProperty(OPEN, Boolean.valueOf(false)).withProperty(POWERED, Boolean.valueOf(false)).withProperty(IN_WALL, Boolean.valueOf(false))); + protected static final AxisAlignedBB COLLIDE_ZAXIS = new AxisAlignedBB(0.0D, 0.0D, 0.375D, 1.0D, 1.0D, 0.625D); + protected static final AxisAlignedBB COLLIDE_XAXIS = new AxisAlignedBB(0.375D, 0.0D, 0.0D, 0.625D, 1.0D, 1.0D); + protected static final AxisAlignedBB COLLIDE_ZAXIS_INWALL = new AxisAlignedBB(0.0D, 0.0D, 0.375D, 1.0D, 0.8125D, 0.625D); + protected static final AxisAlignedBB COLLIDE_XAXIS_INWALL = new AxisAlignedBB(0.375D, 0.0D, 0.0D, 0.625D, 0.8125D, 1.0D); + protected static final AxisAlignedBB CLOSED_SELECTED_ZAXIS = new AxisAlignedBB(0.0D, 0.0D, 0.375D, 1.0D, 1.5D, 0.625D); + protected static final AxisAlignedBB CLOSED_SELECTED_XAXIS = new AxisAlignedBB(0.375D, 0.0D, 0.0D, 0.625D, 1.5D, 1.0D); + public RedstoneFenceGate() + { + super(Material.WOOD, MapColor.RED); + setDefaultState(blockState.getBaseState().withProperty(OPEN, Boolean.valueOf(false)).withProperty(IN_WALL, Boolean.valueOf(false))); setCreativeTab(CreativeTabs.REDSTONE); + setUnlocalizedName("RedstoneFenceGate"); + setRegistryName("redstone_fence_gate"); + setHardness(5F); + setResistance(10F); + setSoundType(SoundType.METAL); + setHarvestLevel("pickaxe", 2); } @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) + public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - state = getActualState(state, source, pos); - return state.getValue(IN_WALL).booleanValue() ? (state.getValue(FACING).getAxis() == EnumFacing.Axis.X ? AABB_COLLIDE_XAXIS_INWALL : AABB_COLLIDE_ZAXIS_INWALL) : (state.getValue(FACING).getAxis() == EnumFacing.Axis.X ? AABB_COLLIDE_XAXIS : AABB_COLLIDE_ZAXIS); + EnumFacing.Axis enumfacing$axis = ((EnumFacing)state.getValue(FACING)).getAxis(); + + if (enumfacing$axis == EnumFacing.Axis.Z && (worldIn.getBlockState(pos.west()).getBlock() instanceof BlockWall || worldIn.getBlockState(pos.east()).getBlock() instanceof BlockWall) || enumfacing$axis == EnumFacing.Axis.X && (worldIn.getBlockState(pos.north()).getBlock() instanceof BlockWall || worldIn.getBlockState(pos.south()).getBlock() instanceof BlockWall)) + state = state.withProperty(IN_WALL, Boolean.valueOf(true)); + else if (enumfacing$axis == EnumFacing.Axis.Z && (worldIn.getBlockState(pos.west()).getBlock() instanceof CustomWall || worldIn.getBlockState(pos.east()).getBlock() instanceof CustomWall) || enumfacing$axis == EnumFacing.Axis.X && (worldIn.getBlockState(pos.north()).getBlock() instanceof CustomWall || worldIn.getBlockState(pos.south()).getBlock() instanceof CustomWall)) + state = state.withProperty(IN_WALL, Boolean.valueOf(true)); + return state; } + // this fence post is a rs power block! + @Override + public int getWeakPower(IBlockState state, IBlockAccess worldIn, BlockPos pos, EnumFacing side) { + return 15; + } + @Override + public boolean canConnectRedstone(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + return true; + } @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) + public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing) { - EnumFacing.Axis enumfacing$axis = state.getValue(FACING).getAxis(); - if (enumfacing$axis == EnumFacing.Axis.Z && (canFenceGateConnectTo(worldIn, pos, EnumFacing.WEST) || canFenceGateConnectTo(worldIn, pos, EnumFacing.EAST)) || enumfacing$axis == EnumFacing.Axis.X && (canFenceGateConnectTo(worldIn, pos, EnumFacing.NORTH) || canFenceGateConnectTo(worldIn, pos, EnumFacing.SOUTH))) - state = state.withProperty(IN_WALL, Boolean.valueOf(true)); - return state; + IBlockState state = world.getBlockState(pos); + if (state.getBlock() instanceof BlockFenceGate && + state.getBlockFaceShape(world, pos, facing) == BlockFaceShape.MIDDLE_POLE) + { + Block connector = world.getBlockState(pos.offset(facing)).getBlock(); + return connector instanceof BlockFence || connector instanceof BlockWall || connector instanceof CustomWall; + } + return false; + } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) + { + state = getActualState(state, source, pos); + return state.getValue(IN_WALL).booleanValue() ? (state.getValue(FACING).getAxis() == EnumFacing.Axis.X ? COLLIDE_XAXIS_INWALL : COLLIDE_ZAXIS_INWALL) : (state.getValue(FACING).getAxis() == EnumFacing.Axis.X ? COLLIDE_XAXIS : COLLIDE_ZAXIS); } @Override public IBlockState withRotation(IBlockState state, Rotation rot) @@ -75,7 +109,7 @@ public boolean canPlaceBlockAt(World worldIn, BlockPos pos) @Nullable public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) { - return blockState.getValue(OPEN).booleanValue() ? NULL_AABB : (blockState.getValue(FACING).getAxis() == EnumFacing.Axis.Z ? AABB_CLOSED_SELECTED_ZAXIS : AABB_CLOSED_SELECTED_XAXIS); + return blockState.getValue(OPEN).booleanValue() ? NULL_AABB : (blockState.getValue(FACING).getAxis() == EnumFacing.Axis.Z ? CLOSED_SELECTED_ZAXIS : CLOSED_SELECTED_XAXIS); } @Override public boolean isOpaqueCube(IBlockState state) @@ -96,7 +130,7 @@ public boolean isPassable(IBlockAccess worldIn, BlockPos pos) public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { boolean flag = worldIn.isBlockPowered(pos); - return getDefaultState().withProperty(FACING, placer.getHorizontalFacing()).withProperty(OPEN, Boolean.valueOf(flag)).withProperty(POWERED, Boolean.valueOf(flag)).withProperty(IN_WALL, Boolean.valueOf(false)); + return getDefaultState().withProperty(FACING, placer.getHorizontalFacing()).withProperty(OPEN, Boolean.valueOf(flag)).withProperty(IN_WALL, Boolean.valueOf(false)); } @Override public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) @@ -120,15 +154,13 @@ public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(FACING, EnumFacing.getHorizontal(meta)).withProperty(OPEN, Boolean.valueOf((meta & 4) != 0)).withProperty(POWERED, Boolean.valueOf((meta & 8) != 0)); + return getDefaultState().withProperty(FACING, EnumFacing.getHorizontal(meta)).withProperty(OPEN, Boolean.valueOf((meta & 4) != 0)); } @Override public int getMetaFromState(IBlockState state) { int i = 0; i = i | state.getValue(FACING).getHorizontalIndex(); - if (state.getValue(POWERED).booleanValue()) - i |= 8; if (state.getValue(OPEN).booleanValue()) i |= 4; return i; @@ -136,13 +168,7 @@ public int getMetaFromState(IBlockState state) @Override protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, new IProperty[] {FACING, OPEN, POWERED, IN_WALL}); - } - @Override - public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing) - { - Block connector = world.getBlockState(pos.offset(facing)).getBlock(); - return connector instanceof BlockFence || connector instanceof BlockWall; + return new BlockStateContainer(this, new IProperty[] {FACING,OPEN,IN_WALL}); } private boolean canFenceGateConnectTo(IBlockAccess world, BlockPos pos, EnumFacing facing) { diff --git a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/RSTrapdoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/RedstoneTrapdoor.java similarity index 86% rename from src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/RSTrapdoor.java rename to src/main/java/com/NetherNoah/ParadiseMod/blocks/RedstoneTrapdoor.java index c4329d6..60e19d9 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/RSTrapdoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/RedstoneTrapdoor.java @@ -1,5 +1,4 @@ -//this was derived from the vanilla code -package com.NetherNoah.ParadiseMod.CustomBlockCode; +package com.NetherNoah.ParadiseMod.blocks; import javax.annotation.Nullable; @@ -7,6 +6,7 @@ import net.minecraft.block.BlockHorizontal; import net.minecraft.block.BlockLadder; import net.minecraft.block.BlockTrapDoor; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; @@ -17,10 +17,10 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraft.util.IStringSerializable; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; import net.minecraft.util.math.AxisAlignedBB; @@ -30,12 +30,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class RSTrapdoor extends Block{ - public RSTrapdoor(Material materialIn) { - super(materialIn); - setDefaultState(blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(OPEN, Boolean.valueOf(false)).withProperty(HALF, BlockTrapDoor.DoorHalf.BOTTOM)); - setCreativeTab(CreativeTabs.REDSTONE); - } +public class RedstoneTrapdoor extends Block{ public static final PropertyDirection FACING = BlockHorizontal.FACING; public static final PropertyBool OPEN = PropertyBool.create("open"); public static final PropertyEnum HALF = PropertyEnum.create("half", BlockTrapDoor.DoorHalf.class); @@ -45,6 +40,17 @@ public RSTrapdoor(Material materialIn) { protected static final AxisAlignedBB NORTH_OPEN_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.8125D, 1.0D, 1.0D, 1.0D); protected static final AxisAlignedBB BOTTOM_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.1875D, 1.0D); protected static final AxisAlignedBB TOP_AABB = new AxisAlignedBB(0.0D, 0.8125D, 0.0D, 1.0D, 1.0D, 1.0D); + public RedstoneTrapdoor() { + super(Material.ROCK); + setUnlocalizedName("RedstoneTrapdoor"); + setRegistryName("redstone_trapdoor"); + setHardness(5F); + setResistance(10F); + setSoundType(SoundType.METAL); + setCreativeTab(CreativeTabs.REDSTONE); + setHarvestLevel("pickaxe", 2); + setDefaultState(blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(OPEN, Boolean.valueOf(false)).withProperty(HALF, BlockTrapDoor.DoorHalf.BOTTOM)); + } @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { @@ -91,26 +97,21 @@ public boolean isPassable(IBlockAccess worldIn, BlockPos pos) @Override public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { - if (blockMaterial == Material.IRON) - return false; - else - { - state = state.cycleProperty(OPEN); - worldIn.setBlockState(pos, state, 2); - playSound(playerIn, worldIn, pos, state.getValue(OPEN).booleanValue()); - return true; - } + state = state.cycleProperty(OPEN); + worldIn.setBlockState(pos, state, 2); + playSound(playerIn, worldIn, pos, state.getValue(OPEN).booleanValue()); + return true; } - protected void playSound(@Nullable EntityPlayer player, World worldIn, BlockPos pos, boolean p_185731_4_) + protected void playSound(@Nullable EntityPlayer player, World worldIn, BlockPos pos, boolean isOpen) { - if (p_185731_4_) + if (isOpen) { - int i = blockMaterial == Material.IRON ? 1037 : 1007; + int i = this.blockMaterial == Material.ROCK ? 1037 : 1007; worldIn.playEvent(player, i, pos, 0); } else { - int j = blockMaterial == Material.IRON ? 1036 : 1013; + int j = this.blockMaterial == Material.ROCK ? 1036 : 1013; worldIn.playEvent(player, j, pos, 0); } } @@ -128,15 +129,22 @@ public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing iblockstate = iblockstate.withProperty(FACING, placer.getHorizontalFacing().getOpposite()).withProperty(OPEN, Boolean.valueOf(false)); iblockstate = iblockstate.withProperty(HALF, facing == EnumFacing.UP ? BlockTrapDoor.DoorHalf.BOTTOM : BlockTrapDoor.DoorHalf.TOP); } - if (worldIn.isBlockPowered(pos)) - iblockstate = iblockstate.withProperty(OPEN, Boolean.valueOf(true)); return iblockstate; } + @Override + public boolean canConnectRedstone(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + return true; + } @Override public boolean canPlaceBlockOnSide(World worldIn, BlockPos pos, EnumFacing side) { return true; } + // this door is a rs power block! + @Override + public int getWeakPower(IBlockState state, IBlockAccess worldIn, BlockPos pos, EnumFacing side) { + return 15; + } protected static EnumFacing getFacing(int meta) { switch (meta & 3) @@ -210,11 +218,13 @@ public boolean isLadder(IBlockState state, IBlockAccess world, BlockPos pos, Ent if (state.getValue(OPEN)) { IBlockState down = world.getBlockState(pos.down()); - if (down.getBlock() == net.minecraft.init.Blocks.LADDER) + if (down.getBlock() == Blocks.LADDER) return down.getValue(BlockLadder.FACING) == state.getValue(FACING); } return false; } + + /* public static enum DoorHalf implements IStringSerializable { TOP("top"), @@ -235,4 +245,5 @@ public String getName() return name; } } + */ } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/BasicBlock.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/BasicBlock.java new file mode 100644 index 0000000..a008833 --- /dev/null +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/BasicBlock.java @@ -0,0 +1,20 @@ +package com.NetherNoah.ParadiseMod.blocks.base; +import net.minecraft.block.Block; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +public class BasicBlock extends Block{ + private boolean beaconBase; + public BasicBlock(Material material, SoundType sound, boolean beaconBase) { + super(material); + setSoundType(sound); + beaconBase=this.beaconBase; + } + @Override + public boolean isBeaconBase(IBlockAccess worldObj, BlockPos pos, BlockPos beacon) + { + return beaconBase; + } +} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/formations/icicle.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CaveFormation.java similarity index 76% rename from src/main/java/com/NetherNoah/ParadiseMod/blocks/formations/icicle.java rename to src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CaveFormation.java index 30e3096..4590ec3 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/formations/icicle.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CaveFormation.java @@ -1,4 +1,4 @@ -package com.NetherNoah.ParadiseMod.blocks.formations; +package com.NetherNoah.ParadiseMod.blocks.base; import net.minecraft.block.BlockDirectional; import net.minecraft.block.SoundType; @@ -16,19 +16,17 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -public class icicle extends BlockDirectional { - protected static final AxisAlignedBB END_ROD_VERTICAL_AABB = new AxisAlignedBB(0.375D, 0.0D, 0.375D, 0.625D, 1.0D, 0.625D); - protected static final AxisAlignedBB END_ROD_NS_AABB = new AxisAlignedBB(0.375D, 0.375D, 0.0D, 0.625D, 0.625D, 1.0D); - protected static final AxisAlignedBB END_ROD_EW_AABB = new AxisAlignedBB(0.0D, 0.375D, 0.375D, 1.0D, 0.625D, 0.625D); +public class CaveFormation extends BlockDirectional { + protected static final AxisAlignedBB FORMATION_VERTICAL = new AxisAlignedBB(0.3125D, 0.0D, 0.3125D, 0.6875D, 1.0D, 0.6875D); + protected static final AxisAlignedBB FORMATION_NS = new AxisAlignedBB(0.3125D, 0.3125D, 0.0D, 0.6875D, 0.6875D, 1.0D); + protected static final AxisAlignedBB FORMATION_EW = new AxisAlignedBB(0.0D, 0.3125D, 0.3125D, 1.0D, 0.6875D, 0.6875D); - public icicle() + public CaveFormation(SoundType sound) { super(Material.CIRCUITS); setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.UP)); setCreativeTab(CreativeTabs.DECORATIONS); - setUnlocalizedName("Icicle"); - setRegistryName("icicle"); - setSoundType(SoundType.GLASS); + setSoundType(sound); } @Override @@ -48,11 +46,11 @@ public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, Bloc { case X: default: - return END_ROD_EW_AABB; + return FORMATION_EW; case Z: - return END_ROD_NS_AABB; + return FORMATION_NS; case Y: - return END_ROD_VERTICAL_AABB; + return FORMATION_VERTICAL; } } @Override @@ -80,14 +78,12 @@ public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing { IBlockState iblockstate = worldIn.getBlockState(pos.offset(facing.getOpposite())); - if (iblockstate.getBlock() == Blocks.END_ROD) + if (iblockstate.getBlock() instanceof CaveFormation) { EnumFacing enumfacing = (EnumFacing)iblockstate.getValue(FACING); if (enumfacing == facing) - { return this.getDefaultState().withProperty(FACING, facing.getOpposite()); - } } return this.getDefaultState().withProperty(FACING, facing); @@ -98,5 +94,4 @@ protected BlockStateContainer createBlockState() { return new BlockStateContainer(this, new IProperty[] {FACING}); } - -} +} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/crystals/emeraldCrystal.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/Crystal.java similarity index 83% rename from src/main/java/com/NetherNoah/ParadiseMod/blocks/crystals/emeraldCrystal.java rename to src/main/java/com/NetherNoah/ParadiseMod/blocks/base/Crystal.java index 5cf1c12..948d35a 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/crystals/emeraldCrystal.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/Crystal.java @@ -1,30 +1,30 @@ -package com.NetherNoah.ParadiseMod.blocks.crystals; +package com.NetherNoah.ParadiseMod.blocks.base; import java.util.Random; import com.NetherNoah.ParadiseMod.init.LiquidRedstone.BlockLiquidRedstone; -import com.NetherNoah.ParadiseMod.init.ModBlocks.Crystals; import net.minecraft.block.BlockBush; import net.minecraft.block.SoundType; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class emeraldCrystal extends BlockBush { - public emeraldCrystal() { - setUnlocalizedName("emeraldCrystal"); - setRegistryName("emerald_crystal"); +public class Crystal extends BlockBush { + public Item dropItem; + public Crystal(Item drop) { + dropItem=drop; setHardness(.5F); setResistance(1F); setLightLevel(1F); @@ -32,14 +32,19 @@ public emeraldCrystal() { setTickRandomly(false); } @Override - protected boolean canSustainBush(IBlockState state) + public boolean canSustainBush(IBlockState state) { return state.getBlock() != Blocks.AIR&&state.getBlock() != Blocks.WATER&&state.getBlock() != Blocks.FLOWING_WATER&&state.getBlock() != Blocks.LAVA&&state.getBlock() != Blocks.FLOWING_LAVA&&state.getBlock() !=BlockLiquidRedstone.instance; } @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(Crystals.emeraldCrystal); + return new ItemStack(this); + } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) + { + return FULL_BLOCK_AABB; } @Override @SideOnly(Side.CLIENT) @@ -47,20 +52,21 @@ public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.TRANSLUCENT; } + //get item to drop @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Items.EMERALD; + return dropItem; } + //get amount of items to drop @Override public int quantityDropped(Random random) { - Random rand = new Random(); - int giveItem = rand.nextInt(4) + 1; - return giveItem; + return random.nextInt(4) + 1; } + //is the pick enchanted with fortune? @Override public int quantityDroppedWithBonus(int fortune, Random random) @@ -104,6 +110,6 @@ public int getExpDrop(IBlockState state, net.minecraft.world.IBlockAccess world, @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Items.EMERALD); + return new ItemStack(dropItem); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/buttonTicks/IronButtonTicks.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomButton.java similarity index 64% rename from src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/buttonTicks/IronButtonTicks.java rename to src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomButton.java index 12c4a4c..71d0649 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/buttonTicks/IronButtonTicks.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomButton.java @@ -1,4 +1,4 @@ -package com.NetherNoah.ParadiseMod.CustomBlockCode.buttonTicks; +package com.NetherNoah.ParadiseMod.blocks.base; import java.util.List; import java.util.Random; @@ -7,6 +7,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockDirectional; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; @@ -17,39 +18,67 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.init.SoundEvents; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; -public abstract class IronButtonTicks extends BlockDirectional +public class CustomButton extends BlockDirectional { public static final PropertyBool POWERED = PropertyBool.create("powered"); - protected static final AxisAlignedBB AABB_DOWN_OFF = new AxisAlignedBB(0.3125D, 0.875D, 0.375D, 0.6875D, 1.0D, 0.625D); - protected static final AxisAlignedBB AABB_UP_OFF = new AxisAlignedBB(0.3125D, 0.0D, 0.375D, 0.6875D, 0.125D, 0.625D); - protected static final AxisAlignedBB AABB_NORTH_OFF = new AxisAlignedBB(0.3125D, 0.375D, 0.875D, 0.6875D, 0.625D, 1.0D); - protected static final AxisAlignedBB AABB_SOUTH_OFF = new AxisAlignedBB(0.3125D, 0.375D, 0.0D, 0.6875D, 0.625D, 0.125D); - protected static final AxisAlignedBB AABB_WEST_OFF = new AxisAlignedBB(0.875D, 0.375D, 0.3125D, 1.0D, 0.625D, 0.6875D); - protected static final AxisAlignedBB AABB_EAST_OFF = new AxisAlignedBB(0.0D, 0.375D, 0.3125D, 0.125D, 0.625D, 0.6875D); - protected static final AxisAlignedBB AABB_DOWN_ON = new AxisAlignedBB(0.3125D, 0.9375D, 0.375D, 0.6875D, 1.0D, 0.625D); - protected static final AxisAlignedBB AABB_UP_ON = new AxisAlignedBB(0.3125D, 0.0D, 0.375D, 0.6875D, 0.0625D, 0.625D); - protected static final AxisAlignedBB AABB_NORTH_ON = new AxisAlignedBB(0.3125D, 0.375D, 0.9375D, 0.6875D, 0.625D, 1.0D); - protected static final AxisAlignedBB AABB_SOUTH_ON = new AxisAlignedBB(0.3125D, 0.375D, 0.0D, 0.6875D, 0.625D, 0.0625D); - protected static final AxisAlignedBB AABB_WEST_ON = new AxisAlignedBB(0.9375D, 0.375D, 0.3125D, 1.0D, 0.625D, 0.6875D); - protected static final AxisAlignedBB AABB_EAST_ON = new AxisAlignedBB(0.0D, 0.375D, 0.3125D, 0.0625D, 0.625D, 0.6875D); - private final boolean wooden; - - protected IronButtonTicks(boolean wooden) + protected static final AxisAlignedBB DOWN_OFF = new AxisAlignedBB(0.3125D, 0.875D, 0.375D, 0.6875D, 1.0D, 0.625D); + protected static final AxisAlignedBB UP_OFF = new AxisAlignedBB(0.3125D, 0.0D, 0.375D, 0.6875D, 0.125D, 0.625D); + protected static final AxisAlignedBB NORTH_OFF = new AxisAlignedBB(0.3125D, 0.375D, 0.875D, 0.6875D, 0.625D, 1.0D); + protected static final AxisAlignedBB SOUTH_OFF = new AxisAlignedBB(0.3125D, 0.375D, 0.0D, 0.6875D, 0.625D, 0.125D); + protected static final AxisAlignedBB WEST_OFF = new AxisAlignedBB(0.875D, 0.375D, 0.3125D, 1.0D, 0.625D, 0.6875D); + protected static final AxisAlignedBB EAST_OFF = new AxisAlignedBB(0.0D, 0.375D, 0.3125D, 0.125D, 0.625D, 0.6875D); + protected static final AxisAlignedBB DOWN_ON = new AxisAlignedBB(0.3125D, 0.9375D, 0.375D, 0.6875D, 1.0D, 0.625D); + protected static final AxisAlignedBB UP_ON = new AxisAlignedBB(0.3125D, 0.0D, 0.375D, 0.6875D, 0.0625D, 0.625D); + protected static final AxisAlignedBB NORTH_ON = new AxisAlignedBB(0.3125D, 0.375D, 0.9375D, 0.6875D, 0.625D, 1.0D); + protected static final AxisAlignedBB SOUTH_ON = new AxisAlignedBB(0.3125D, 0.375D, 0.0D, 0.6875D, 0.625D, 0.0625D); + protected static final AxisAlignedBB WEST_ON = new AxisAlignedBB(0.9375D, 0.375D, 0.3125D, 1.0D, 0.625D, 0.6875D); + protected static final AxisAlignedBB EAST_ON = new AxisAlignedBB(0.0D, 0.375D, 0.3125D, 0.0625D, 0.625D, 0.6875D); + private boolean wooden; + private int tickRate; + private int sound; + private final SoundType[] sounds = { + blockSoundType.STONE, + blockSoundType.WOOD, + blockSoundType.METAL, + blockSoundType.PLANT, + blockSoundType.GROUND, + blockSoundType.GLASS + }; + /** + * @param soundType + * The type of sound made by the button + * 0: Stone + * 1: Wood + * 2: Metal + * 3: Plant + * 4: Dirt + * 5: Glass + * @param ticks + * The amount of time (in game ticks) before the button becomes unpowered + */ + public CustomButton(int ticks, int soundType) { super(Material.CIRCUITS); setDefaultState(blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(POWERED, Boolean.valueOf(false))); setTickRandomly(true); + sound=soundType; + tickRate=ticks; + this.setSoundType(sounds[soundType]); setCreativeTab(CreativeTabs.REDSTONE); - this.wooden = wooden; } @Override @Nullable @@ -60,7 +89,7 @@ public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAcces @Override public int tickRate(World worldIn) { - return wooden ? 6 : 20; + return tickRate; } @Override public boolean isOpaqueCube(IBlockState state) @@ -77,6 +106,13 @@ public boolean canPlaceBlockOnSide(World worldIn, BlockPos pos, EnumFacing side) { return canPlaceBlock(worldIn, pos, side.getOpposite()); } + @Override + @SideOnly(Side.CLIENT) + public BlockRenderLayer getBlockLayer() { + if (sound==5) + return BlockRenderLayer.TRANSLUCENT; + return BlockRenderLayer.SOLID; + } @Override public boolean canPlaceBlockAt(World worldIn, BlockPos pos) { @@ -122,22 +158,21 @@ public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, Bloc { EnumFacing enumfacing = state.getValue(FACING); boolean flag = state.getValue(POWERED).booleanValue(); - switch (enumfacing) { case EAST: - return flag ? AABB_EAST_ON : AABB_EAST_OFF; + return flag ? EAST_ON : EAST_OFF; case WEST: - return flag ? AABB_WEST_ON : AABB_WEST_OFF; + return flag ? WEST_ON : WEST_OFF; case SOUTH: - return flag ? AABB_SOUTH_ON : AABB_SOUTH_OFF; + return flag ? SOUTH_ON : SOUTH_OFF; case NORTH: default: - return flag ? AABB_NORTH_ON : AABB_NORTH_OFF; + return flag ? NORTH_ON : NORTH_OFF; case UP: - return flag ? AABB_UP_ON : AABB_UP_OFF; + return flag ? UP_ON : UP_OFF; case DOWN: - return flag ? AABB_DOWN_ON : AABB_DOWN_OFF; + return flag ? DOWN_ON : DOWN_OFF; } } @Override @@ -155,8 +190,23 @@ public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, return true; } } - protected abstract void playClickSound(@Nullable EntityPlayer player, World worldIn, BlockPos pos); - protected abstract void playReleaseSound(World worldIn, BlockPos pos); + protected void playClickSound(@Nullable EntityPlayer player, World worldIn, BlockPos pos) { + + if (sound==0||sound==3||sound==4) + worldIn.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.3F, 0.6F); + else if (sound==2) + worldIn.playSound(player, pos, SoundEvents.BLOCK_WOOD_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.3F, 0.6F); + else + worldIn.playSound(player, pos, SoundEvents.BLOCK_WOOD_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.3F, 0.6F); + } + protected void playReleaseSound(World worldIn, BlockPos pos) { + if (sound==0||sound==3||sound==4) + worldIn.playSound((EntityPlayer) null, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_OFF, SoundCategory.BLOCKS, 0.3F,0.5F); + else if(sound==2) + worldIn.playSound((EntityPlayer) null, pos, SoundEvents.BLOCK_WOOD_BUTTON_CLICK_OFF, SoundCategory.BLOCKS, 0.3F,0.5F); + else + worldIn.playSound((EntityPlayer) null, pos, SoundEvents.BLOCK_WOOD_BUTTON_CLICK_OFF, SoundCategory.BLOCKS, 0.3F,0.5F); + } @Override public void breakBlock(World worldIn, BlockPos pos, IBlockState state) { @@ -179,10 +229,7 @@ public boolean canProvidePower(IBlockState state) { return true; } - @Override - public void randomTick(World worldIn, BlockPos pos, IBlockState state, Random random) - { - } + @Override public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { @@ -214,27 +261,27 @@ public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState s } } } - private void checkPressed(IBlockState p_185616_1_, World p_185616_2_, BlockPos p_185616_3_) + private void checkPressed(IBlockState state, World world, BlockPos position) { - List list = p_185616_2_.getEntitiesWithinAABB(EntityArrow.class, p_185616_1_.getBoundingBox(p_185616_2_, p_185616_3_).offset(p_185616_3_)); + List list = world.getEntitiesWithinAABB(EntityArrow.class, state.getBoundingBox(world, position).offset(position)); boolean flag = !list.isEmpty(); - boolean flag1 = p_185616_1_.getValue(POWERED).booleanValue(); + boolean flag1 = state.getValue(POWERED).booleanValue(); if (flag && !flag1) { - p_185616_2_.setBlockState(p_185616_3_, p_185616_1_.withProperty(POWERED, Boolean.valueOf(true))); - notifyNeighbors(p_185616_2_, p_185616_3_, p_185616_1_.getValue(FACING)); - p_185616_2_.markBlockRangeForRenderUpdate(p_185616_3_, p_185616_3_); - playClickSound((EntityPlayer)null, p_185616_2_, p_185616_3_); + world.setBlockState(position, state.withProperty(POWERED, Boolean.valueOf(true))); + notifyNeighbors(world, position, state.getValue(FACING)); + world.markBlockRangeForRenderUpdate(position, position); + playClickSound((EntityPlayer)null, world, position); } if (!flag && flag1) { - p_185616_2_.setBlockState(p_185616_3_, p_185616_1_.withProperty(POWERED, Boolean.valueOf(false))); - notifyNeighbors(p_185616_2_, p_185616_3_, p_185616_1_.getValue(FACING)); - p_185616_2_.markBlockRangeForRenderUpdate(p_185616_3_, p_185616_3_); - playReleaseSound(p_185616_2_, p_185616_3_); + world.setBlockState(position, state.withProperty(POWERED, Boolean.valueOf(false))); + notifyNeighbors(world, position, state.getValue(FACING)); + world.markBlockRangeForRenderUpdate(position, position); + playReleaseSound(world, position); } if (flag) - p_185616_2_.scheduleUpdate(new BlockPos(p_185616_3_), this, tickRate(p_185616_2_)); + world.scheduleUpdate(new BlockPos(position), this, tickRate(world)); } private void notifyNeighbors(World worldIn, BlockPos pos, EnumFacing facing) { @@ -245,7 +292,6 @@ private void notifyNeighbors(World worldIn, BlockPos pos, EnumFacing facing) public IBlockState getStateFromMeta(int meta) { EnumFacing enumfacing; - switch (meta & 7) { case 0: @@ -273,7 +319,6 @@ public IBlockState getStateFromMeta(int meta) public int getMetaFromState(IBlockState state) { int i; - switch (state.getValue(FACING)) { case EAST: diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomDoor.java new file mode 100644 index 0000000..64bff3d --- /dev/null +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomDoor.java @@ -0,0 +1,45 @@ +package com.NetherNoah.ParadiseMod.blocks.base; + +import java.util.Random; +import com.NetherNoah.ParadiseMod.init.ModItems.DoorItems; +import net.minecraft.block.BlockDoor; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.world.World; + +public class CustomDoor extends BlockDoor { + private Item door; + public CustomDoor(Material material,Item doorItem, SoundType sound) { + super(material); + door=doorItem; + System.out.println(door); + setSoundType(sound); + } + + //the item is the door itself + @Override + public Item getItemDropped(IBlockState state, Random rand, int fortune) + { + //return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR : door; + return door; + } + + @Override + public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) + { + return new ItemStack(door); + } + + @Override + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) + { + return new ItemStack(door); + } +} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/CactusFence.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomFence.java similarity index 77% rename from src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/CactusFence.java rename to src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomFence.java index ee693b3..09b9d3c 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/CactusFence.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomFence.java @@ -1,4 +1,4 @@ -package com.NetherNoah.ParadiseMod.blocks.fences; +package com.NetherNoah.ParadiseMod.blocks.base; import net.minecraft.block.Block; import net.minecraft.block.BlockFence; @@ -13,15 +13,14 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; -public class CactusFence extends BlockFence { - public CactusFence() { - super(Material.WOOD, MapColor.GREEN); - setUnlocalizedName("CactusFence"); - setRegistryName("cactus_fence"); - setHardness(2F); - setResistance(5F); +public class CustomFence extends BlockFence { + public CustomFence(Material material, MapColor color) { + super(material, color); setCreativeTab(CreativeTabs.DECORATIONS); - setSoundType(SoundType.WOOD); + if (material==Material.WOOD) + this.setSoundType(SoundType.WOOD); + if (material==Material.IRON) + this.setSoundType(SoundType.METAL); } @Override diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/GoldFenceGate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomGate.java similarity index 51% rename from src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/GoldFenceGate.java rename to src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomGate.java index 8def8a9..7aed7b0 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/GoldFenceGate.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomGate.java @@ -1,6 +1,4 @@ -package com.NetherNoah.ParadiseMod.blocks.fenceGates; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.CustomWall; +package com.NetherNoah.ParadiseMod.blocks.base; import net.minecraft.block.Block; import net.minecraft.block.BlockFence; @@ -15,22 +13,18 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; -public class GoldFenceGate extends BlockFenceGate { - public GoldFenceGate() { +public class CustomGate extends BlockFenceGate { + public CustomGate(SoundType sound) { super(BlockPlanks.EnumType.DARK_OAK); - setUnlocalizedName("GoldFenceGate"); - setRegistryName("gold_fence_gate"); - setHardness(5F); - setResistance(10F); setCreativeTab(CreativeTabs.REDSTONE); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 2); + setSoundType(sound); } - @Override + + @Override public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing) { IBlockState state = world.getBlockState(pos); - if (state.getBlock() instanceof BlockFenceGate && + if (state.getBlock() instanceof CustomGate && state.getBlockFaceShape(world, pos, facing) == BlockFaceShape.MIDDLE_POLE) { Block connector = world.getBlockState(pos.offset(facing)).getBlock(); @@ -38,14 +32,17 @@ public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing fac } return false; } + @Override public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { EnumFacing.Axis enumfacing$axis = ((EnumFacing)state.getValue(FACING)).getAxis(); + Block northBlock = worldIn.getBlockState(pos.north()).getBlock(); + Block southBlock = worldIn.getBlockState(pos.south()).getBlock(); + Block eastBlock = worldIn.getBlockState(pos.east()).getBlock(); + Block westBlock = worldIn.getBlockState(pos.west()).getBlock(); - if (enumfacing$axis == EnumFacing.Axis.Z && (worldIn.getBlockState(pos.west()).getBlock() instanceof BlockWall || worldIn.getBlockState(pos.east()).getBlock() instanceof BlockWall) || enumfacing$axis == EnumFacing.Axis.X && (worldIn.getBlockState(pos.north()).getBlock() instanceof BlockWall || worldIn.getBlockState(pos.south()).getBlock() instanceof BlockWall)) - state = state.withProperty(IN_WALL, Boolean.valueOf(true)); - else if (enumfacing$axis == EnumFacing.Axis.Z && (worldIn.getBlockState(pos.west()).getBlock() instanceof CustomWall || worldIn.getBlockState(pos.east()).getBlock() instanceof CustomWall) || enumfacing$axis == EnumFacing.Axis.X && (worldIn.getBlockState(pos.north()).getBlock() instanceof CustomWall || worldIn.getBlockState(pos.south()).getBlock() instanceof CustomWall)) + if (enumfacing$axis == EnumFacing.Axis.Z && (westBlock instanceof BlockWall || eastBlock instanceof BlockWall || westBlock instanceof CustomWall || eastBlock instanceof CustomWall) || enumfacing$axis == EnumFacing.Axis.X && (northBlock instanceof BlockWall || southBlock instanceof BlockWall || northBlock instanceof CustomWall || southBlock instanceof CustomWall)) state = state.withProperty(IN_WALL, Boolean.valueOf(true)); return state; } diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/soulGlass.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomGlass.java similarity index 69% rename from src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/soulGlass.java rename to src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomGlass.java index b5a139e..6ac68a8 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/soulGlass.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomGlass.java @@ -1,4 +1,4 @@ -package com.NetherNoah.ParadiseMod.blocks.misc; +package com.NetherNoah.ParadiseMod.blocks.base; import com.NetherNoah.ParadiseMod.init.ModBlocks.Misc; @@ -15,16 +15,10 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class soulGlass extends BlockBreakable { - public soulGlass() { +public class CustomGlass extends BlockBreakable { + public CustomGlass() { super(Material.GLASS, true); - setUnlocalizedName("soulGlass"); - setRegistryName("soul_glass"); - setHardness(.5F); - setResistance(1F); - setLightLevel(1F); setSoundType(SoundType.GLASS); - setDefaultSlipperiness(1F); setCreativeTab(CreativeTabs.BUILDING_BLOCKS); } @Override @@ -32,18 +26,13 @@ public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAc IBlockState iblockstate = blockAccess.getBlockState(pos.offset(side)); Block block = iblockstate.getBlock(); - if (this == Misc.soulGlass) - { - if (blockState != iblockstate) - { - return true; - } - if (block == this) - { - return false; - } - } - return true; + if (blockState != iblockstate){ + return true; + } + if (block == this){ + return false; + } + return true; } @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/CoalOreVoid.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomOre.java similarity index 72% rename from src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/CoalOreVoid.java rename to src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomOre.java index 6ba4cd3..779c5a2 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/CoalOreVoid.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomOre.java @@ -1,4 +1,4 @@ -package com.NetherNoah.ParadiseMod.blocks.ores; +package com.NetherNoah.ParadiseMod.blocks.base; import java.util.Random; @@ -17,35 +17,49 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -public class CoalOreVoid extends Block { - private Item drop; - private int meta; - private int least_quantity; - private int most_quantity; - public CoalOreVoid() { +public class CustomOre extends Block { + private int max; + private Item itemDrop; + /** + * Custom ore class for ores that drop items other than their own block + * @param drop + * Item to drop upon mining the ore + * @param maxAmount + * Maximum amount of items to drop + * @param harvestLevel + * Harvest level of the pickaxe needed to mine the ore + * Vanilla harvest levels: + * 0: Wood and Gold + * 1: Stone + * 2: Iron + * 3: Diamond + */ + public CustomOre(Item drop,int maxAmount,int harvestLevel) { super(Material.ROCK); - setUnlocalizedName("VoidCoalOre"); - setRegistryName("void_coal_ore"); - setHardness(5F); - setResistance(10F); + itemDrop=drop; + max=maxAmount; setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setHarvestLevel("pickaxe", 0); + setHarvestLevel("pickaxe", harvestLevel); } - @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) - { - return new ItemStack(Ores.CoalOreVoid); - } + // get item to drop @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Items.COAL; + return itemDrop; } + + @Override + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) + { + return new ItemStack(this); + } + // get amount of items to drop @Override public int quantityDropped(Random random) { - return 1; + return 1+random.nextInt(max); } + // is the pick enchanted with fortune? @Override public int quantityDroppedWithBonus(int fortune, Random random) { @@ -61,11 +75,7 @@ public int quantityDroppedWithBonus(int fortune, Random random) { return this.quantityDropped(random); } } - // spawn the item in the world - @Override - public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune) { - super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune); - } + // spawn xp orbs @Override public int getExpDrop(IBlockState state, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune) { @@ -77,9 +87,10 @@ public int getExpDrop(IBlockState state, net.minecraft.world.IBlockAccess world, } return 0; } + // spawn the actual item @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Items.COAL); + return new ItemStack(itemDrop); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomPane.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomPane.java new file mode 100644 index 0000000..84436b7 --- /dev/null +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomPane.java @@ -0,0 +1,40 @@ +package com.NetherNoah.ParadiseMod.blocks.base; + +import java.util.Random; + +import net.minecraft.block.BlockPane; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.util.BlockRenderLayer; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public class CustomPane extends BlockPane { + private boolean metal; + public CustomPane(Material material, boolean isMetal,SoundType sound) { + super(material, isMetal); + metal=isMetal; + setSoundType(sound); + } + /* + //@Override + public Item getItemDropped(IBlockState state, Random rand, int fortune) + { + if (glass) + return Item.getItemFromBlock(this); + else + return null; + } + */ + @Override + @SideOnly(Side.CLIENT) + public BlockRenderLayer getBlockLayer() { + if (metal) + return BlockRenderLayer.SOLID; + else + return BlockRenderLayer.TRANSLUCENT; + } +} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/Rose.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomPlant.java similarity index 87% rename from src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/Rose.java rename to src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomPlant.java index 90d55c6..762104e 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/Rose.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomPlant.java @@ -1,4 +1,4 @@ -package com.NetherNoah.ParadiseMod.blocks.misc; +package com.NetherNoah.ParadiseMod.blocks.base; import java.util.Random; @@ -18,10 +18,8 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class Rose extends BlockBush implements IGrowable{ - public Rose() { - setUnlocalizedName("Rose"); - setRegistryName("rose"); +public class CustomPlant extends BlockBush implements IGrowable { + public CustomPlant() { setSoundType(SoundType.PLANT); } @Override @@ -32,24 +30,24 @@ protected boolean canSustainBush(IBlockState state) @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(Misc.Rose); - } - - @Override - @SideOnly(Side.CLIENT) - public BlockRenderLayer getBlockLayer() - { - return BlockRenderLayer.CUTOUT; + return new ItemStack(this); } @Override public boolean canUseBonemeal(World worldIn, Random rand, BlockPos pos, IBlockState state) { return true; } + @Override public void grow(World worldIn, Random rand, BlockPos pos, IBlockState state) { spawnAsEntity(worldIn, pos, new ItemStack(this)); + } + @Override + @SideOnly(Side.CLIENT) + public BlockRenderLayer getBlockLayer() + { + return BlockRenderLayer.CUTOUT; } @Override public boolean canGrow(World worldIn, BlockPos pos, IBlockState state, boolean isClient) { diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomPressurePlate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomPressurePlate.java new file mode 100644 index 0000000..2663681 --- /dev/null +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomPressurePlate.java @@ -0,0 +1,161 @@ +package com.NetherNoah.ParadiseMod.blocks.base; + +import java.util.List; + +import net.minecraft.block.BlockBasePressurePlate; +import net.minecraft.block.SoundType; +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.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public class CustomPressurePlate extends BlockBasePressurePlate +{ + public static final PropertyBool POWERED = PropertyBool.create("powered"); + + private int sensitivity; + private int tickRate; + private int sound; + public Material type; + + private final SoundType[] sounds = { + blockSoundType.STONE, + blockSoundType.WOOD, + blockSoundType.METAL, + blockSoundType.PLANT, + blockSoundType.GROUND, + blockSoundType.GLASS + }; + /** + * @param sensitivityIn + * The sensitivity of the pressure plate + * 0: All entities + * 1: Mobs and players only + * 2: Players only + * @param ticks + * The amount of time (in game ticks) before the pressure plate becomes unpowered + * @param soundType + * The type of sound made by the pressure plate + * 0: Stone + * 1: Wood + * 2: Metal + * 3: Plant + * 4: Dirt + * 5: Glass + */ + public CustomPressurePlate(int sensitivityIn, int ticks,int soundType, Material material) + { + super(material); + tickRate=ticks; + sensitivity=sensitivityIn; + sound=soundType; + type=material; + setSoundType(sounds[soundType]); + setDefaultState(blockState.getBaseState().withProperty(POWERED, Boolean.valueOf(false))); + } + + @Override + @SideOnly(Side.CLIENT) + public BlockRenderLayer getBlockLayer() { + if (type==Material.GLASS) + return BlockRenderLayer.TRANSLUCENT; + return BlockRenderLayer.SOLID; + } + + @Override + public int tickRate(World worldIn) + { + return tickRate; + } + + @Override + protected int getRedstoneStrength(IBlockState state) + { + return state.getValue(POWERED).booleanValue() ? 15 : 0; + } + + @Override + protected IBlockState setRedstoneStrength(IBlockState state, int strength) + { + return state.withProperty(POWERED, Boolean.valueOf(strength > 0)); + } + + protected void playClickOnSound(World worldIn, BlockPos pos) + { + if (sound==0||sound==3||sound==4) + worldIn.playSound((EntityPlayer)null, pos, SoundEvents.BLOCK_STONE_PRESSPLATE_CLICK_ON, SoundCategory.BLOCKS, 0.3F, 0.6F); + else if (sound==2) + worldIn.playSound((EntityPlayer)null, pos, SoundEvents.BLOCK_WOOD_PRESSPLATE_CLICK_ON, SoundCategory.BLOCKS, 0.3F, 0.8F); + else + worldIn.playSound((EntityPlayer)null, pos, SoundEvents.BLOCK_WOOD_PRESSPLATE_CLICK_ON, SoundCategory.BLOCKS, 0.3F, 0.8F); + } + + protected void playClickOffSound(World worldIn, BlockPos pos) + { + if (sound==0||sound==3||sound==4) + worldIn.playSound((EntityPlayer)null, pos, SoundEvents.BLOCK_STONE_PRESSPLATE_CLICK_OFF, SoundCategory.BLOCKS, 0.3F, 0.5F); + else if(sound==2) + worldIn.playSound((EntityPlayer)null, pos, SoundEvents.BLOCK_WOOD_PRESSPLATE_CLICK_OFF, SoundCategory.BLOCKS, 0.3F, 0.7F); + else + worldIn.playSound((EntityPlayer)null, pos, SoundEvents.BLOCK_WOOD_PRESSPLATE_CLICK_OFF, SoundCategory.BLOCKS, 0.3F, 0.7F); + } + @Override + protected int computeRedstoneStrength(World worldIn, BlockPos pos) + { + AxisAlignedBB axisalignedbb = PRESSURE_AABB.offset(pos); + List list; + + switch (sensitivity) { + case 1: + //mobs and players only + list = worldIn.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb); + break; + case 2: + //player only + list = worldIn.getEntitiesWithinAABB(EntityPlayer.class, axisalignedbb); + break; + default: + case 0: + //everything + list = worldIn.getEntitiesWithinAABBExcludingEntity((Entity)null, axisalignedbb); + break; + } + + if (!list.isEmpty()) + { + for (Entity entity : list) + { + if (!entity.doesEntityNotTriggerPressurePlate()) + return 15; + } + } + return 0; + } + @Override + public IBlockState getStateFromMeta(int meta) + { + return getDefaultState().withProperty(POWERED, Boolean.valueOf(meta == 1)); + } + @Override + public int getMetaFromState(IBlockState state) + { + return state.getValue(POWERED).booleanValue() ? 1 : 0; + } + @Override + protected BlockStateContainer createBlockState() + { + return new BlockStateContainer(this, new IProperty[] {POWERED}); + } +} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/BedrockSlab.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomSlab.java similarity index 74% rename from src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/BedrockSlab.java rename to src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomSlab.java index a82f414..c7b317b 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/BedrockSlab.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomSlab.java @@ -1,13 +1,13 @@ //this class is based off of CJMinecraft's example mod //https://github.com/CJMinecraft01/BitOfEverything -package com.NetherNoah.ParadiseMod.blocks.slabs; +package com.NetherNoah.ParadiseMod.blocks.base; import java.util.Random; import com.NetherNoah.ParadiseMod.DummyProperty; -import com.NetherNoah.ParadiseMod.Reference; import com.NetherNoah.ParadiseMod.init.ModBlocks.Slabs; +import net.minecraft.block.Block; import net.minecraft.block.BlockSlab; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -18,23 +18,23 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -public class BedrockSlab extends BlockSlab { +public class CustomSlab extends BlockSlab { public static final DummyProperty DUMMY_VARIANT = DummyProperty.create("dummy"); - - public BedrockSlab(String name) { - super(Material.BARRIER); - setUnlocalizedName(name); - setRegistryName(name); - setHardness(-1F); - setResistance(6000000F); + private Block itemBlock; + private boolean Double; + public Block pickBlock; + + public CustomSlab(Material material, boolean isDouble) { + super(material); + Double=isDouble; setCreativeTab(CreativeTabs.BUILDING_BLOCKS); + if (material==Material.WOOD) + setSoundType(SoundType.WOOD); IBlockState state = this.blockState.getBaseState(); if (!this.isDouble()) @@ -42,6 +42,16 @@ public BedrockSlab(String name) { setDefaultState(state); this.useNeighborBrightness = true; } + public Block setItem(Block block) { + pickBlock=block; + return block; + } + + @Override + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) + { + return new ItemStack(pickBlock); + } @Override public String getUnlocalizedName(int meta) { @@ -80,7 +90,7 @@ public int getMetaFromState(IBlockState state) { @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Slabs.end_slab); + return Item.getItemFromBlock(pickBlock); } @Override @@ -90,12 +100,6 @@ protected BlockStateContainer createBlockState() { @Override public boolean isDouble() { - return false; + return Double; } - - //@Override - //public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) - //{ - // return false; - //} } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomStairs.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomStairs.java new file mode 100644 index 0000000..4837267 --- /dev/null +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomStairs.java @@ -0,0 +1,14 @@ +package com.NetherNoah.ParadiseMod.blocks.base; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockStairs; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Blocks; + +public class CustomStairs extends BlockStairs { + public CustomStairs(Block stairType) { + super(stairType.getDefaultState()); + setCreativeTab(CreativeTabs.BUILDING_BLOCKS); + useNeighborBrightness = true; + } +} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomTrapDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomTrapDoor.java new file mode 100644 index 0000000..26d092d --- /dev/null +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomTrapDoor.java @@ -0,0 +1,43 @@ +package com.NetherNoah.ParadiseMod.blocks.base; + +import javax.annotation.Nullable; + +import net.minecraft.block.BlockTrapDoor; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class CustomTrapDoor extends BlockTrapDoor { + /** + * + * @param material The block's material + * @param sound The sound the block makes when placed or removed + * @param creakSound What sound should it make when it opens or closes? + * 0: Iron + * 1: Wood + */ + private final int[] openSounds = {1037,1007}; + private final int[] closeSounds = {1036,1013}; + private int creak; + public CustomTrapDoor(Material material, SoundType sound, int creakSound) { + super(material); + setCreativeTab(CreativeTabs.REDSTONE); + setSoundType(sound); + creak=creakSound; + } + @Override + protected void playSound(@Nullable EntityPlayer player, World worldIn, BlockPos pos, boolean isOpen) + { + if (isOpen) + { + worldIn.playEvent(player, openSounds[creak], pos, 0); + } + else + { + worldIn.playEvent(player, closeSounds[creak], pos, 0); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/CustomWall.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomWall.java similarity index 70% rename from src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/CustomWall.java rename to src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomWall.java index 0404161..188224e 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/CustomWall.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomWall.java @@ -1,9 +1,11 @@ -package com.NetherNoah.ParadiseMod.CustomBlockCode; +package com.NetherNoah.ParadiseMod.blocks.base; import java.util.List; import javax.annotation.Nullable; +import com.NetherNoah.ParadiseMod.blocks.RedstoneFenceGate; + import net.minecraft.block.Block; import net.minecraft.block.BlockFence; import net.minecraft.block.BlockFenceGate; @@ -13,6 +15,7 @@ import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.util.EnumFacing; @@ -24,37 +27,38 @@ import net.minecraftforge.fml.relauncher.SideOnly; //Thank you so much winnetrie! //I had that same problem too! -public abstract class CustomWall extends Block +public class CustomWall extends Block { public static final PropertyBool UP = PropertyBool.create("up"); public static final PropertyBool NORTH = PropertyBool.create("north"); public static final PropertyBool EAST = PropertyBool.create("east"); public static final PropertyBool SOUTH = PropertyBool.create("south"); public static final PropertyBool WEST = PropertyBool.create("west"); - protected static final AxisAlignedBB[] AABB_BY_INDEX = new AxisAlignedBB[] {new AxisAlignedBB(0.25D, 0.0D, 0.25D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.3125D, 0.0D, 0.0D, 0.6875D, 0.875D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.3125D, 1.0D, 0.875D, 0.6875D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D)}; - protected static final AxisAlignedBB[] CLIP_AABB_BY_INDEX = new AxisAlignedBB[] {AABB_BY_INDEX[0].setMaxY(1.5D), AABB_BY_INDEX[1].setMaxY(1.5D), AABB_BY_INDEX[2].setMaxY(1.5D), AABB_BY_INDEX[3].setMaxY(1.5D), AABB_BY_INDEX[4].setMaxY(1.5D), AABB_BY_INDEX[5].setMaxY(1.5D), AABB_BY_INDEX[6].setMaxY(1.5D), AABB_BY_INDEX[7].setMaxY(1.5D), AABB_BY_INDEX[8].setMaxY(1.5D), AABB_BY_INDEX[9].setMaxY(1.5D), AABB_BY_INDEX[10].setMaxY(1.5D), AABB_BY_INDEX[11].setMaxY(1.5D), AABB_BY_INDEX[12].setMaxY(1.5D), AABB_BY_INDEX[13].setMaxY(1.5D), AABB_BY_INDEX[14].setMaxY(1.5D), AABB_BY_INDEX[15].setMaxY(1.5D)}; + protected static final AxisAlignedBB[] BY_INDEX = new AxisAlignedBB[] {new AxisAlignedBB(0.25D, 0.0D, 0.25D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.3125D, 0.0D, 0.0D, 0.6875D, 0.875D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.3125D, 1.0D, 0.875D, 0.6875D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D)}; + protected static final AxisAlignedBB[] CLIP_BY_INDEX = new AxisAlignedBB[] {BY_INDEX[0].setMaxY(1.5D), BY_INDEX[1].setMaxY(1.5D), BY_INDEX[2].setMaxY(1.5D), BY_INDEX[3].setMaxY(1.5D), BY_INDEX[4].setMaxY(1.5D), BY_INDEX[5].setMaxY(1.5D), BY_INDEX[6].setMaxY(1.5D), BY_INDEX[7].setMaxY(1.5D), BY_INDEX[8].setMaxY(1.5D), BY_INDEX[9].setMaxY(1.5D), BY_INDEX[10].setMaxY(1.5D), BY_INDEX[11].setMaxY(1.5D), BY_INDEX[12].setMaxY(1.5D), BY_INDEX[13].setMaxY(1.5D), BY_INDEX[14].setMaxY(1.5D), BY_INDEX[15].setMaxY(1.5D)}; public CustomWall(Material material) { super(material); + setCreativeTab(CreativeTabs.DECORATIONS); } @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { state = this.getActualState(state, source, pos); - return AABB_BY_INDEX[getAABBIndex(state)]; + return BY_INDEX[getAABBIndex(state)]; } @Nullable public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, World worldIn, BlockPos pos) { blockState = this.getActualState(blockState, worldIn, pos); - return CLIP_AABB_BY_INDEX[getAABBIndex(blockState)]; + return CLIP_BY_INDEX[getAABBIndex(blockState)]; } @Override public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean p_185477_7_) { if (!p_185477_7_) state = this.getActualState(state, worldIn, pos); - addCollisionBoxToList(pos, entityBox, collidingBoxes, CLIP_AABB_BY_INDEX[getAABBIndex(state)]); + addCollisionBoxToList(pos, entityBox, collidingBoxes, CLIP_BY_INDEX[getAABBIndex(state)]); } private static int getAABBIndex(IBlockState state) { @@ -88,7 +92,7 @@ private boolean canConnectTo(IBlockAccess worldIn, BlockPos pos) { IBlockState iblockstate = worldIn.getBlockState(pos); Block block = iblockstate.getBlock(); - return block == Blocks.BARRIER || block == this || block instanceof BlockWall || block instanceof CustomWall || block instanceof BlockFenceGate || block instanceof BlockFence || block instanceof RSFenceGate||(block.isOpaqueCube(iblockstate) && iblockstate.isFullCube()); + return block == Blocks.BARRIER || block == this || block instanceof BlockWall || block instanceof CustomWall || block instanceof BlockFenceGate || block instanceof BlockFence || block instanceof RedstoneFenceGate||(block.isOpaqueCube(iblockstate) && iblockstate.isFullCube()); } @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/CustomWorkBench.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomWorkBench.java similarity index 88% rename from src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/CustomWorkBench.java rename to src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomWorkBench.java index 7c08aca..2cdb478 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/CustomWorkBench.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/CustomWorkBench.java @@ -1,11 +1,13 @@ -package com.NetherNoah.ParadiseMod.CustomBlockCode; +package com.NetherNoah.ParadiseMod.blocks.base; import com.NetherNoah.ParadiseMod.ParadiseMod; import com.NetherNoah.ParadiseMod.Reference; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Blocks; @@ -20,11 +22,15 @@ import net.minecraft.world.IInteractionObject; import net.minecraft.world.World; -public abstract class CustomWorkBench extends Block +public class CustomWorkBench extends Block { public CustomWorkBench() { super(Material.WOOD); + setHardness(2.5F); + setResistance(5F); + setCreativeTab(CreativeTabs.DECORATIONS); + setSoundType(SoundType.WOOD); } @Override public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) diff --git a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/MossyFurnaceCode.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/MossyFurnaceBase.java similarity index 95% rename from src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/MossyFurnaceCode.java rename to src/main/java/com/NetherNoah/ParadiseMod/blocks/base/MossyFurnaceBase.java index e732a1b..e7060c5 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/MossyFurnaceCode.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/MossyFurnaceBase.java @@ -1,5 +1,4 @@ -//this was derived from the vanilla code -package com.NetherNoah.ParadiseMod.CustomBlockCode; +package com.NetherNoah.ParadiseMod.blocks.base; import java.util.Random; @@ -34,16 +33,18 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class MossyFurnaceCode extends BlockContainer +public class MossyFurnaceBase extends BlockContainer { public static final PropertyDirection FACING = BlockHorizontal.FACING; private final boolean isBurning; private static boolean keepInventory; - protected MossyFurnaceCode(boolean isBurning) + public MossyFurnaceBase(boolean isBurning) { super(Material.ROCK); setDefaultState(blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); this.isBurning = isBurning; + setHarvestLevel("pickaxe", 0); + } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) @@ -134,12 +135,10 @@ public static void setState(boolean active, World worldIn, BlockPos pos) if (active) { worldIn.setBlockState(pos, Misc.MossyFurnaceLit.getDefaultState().withProperty(FACING, iblockstate.getValue(FACING)), 3); - worldIn.setBlockState(pos, Misc.MossyFurnaceLit.getDefaultState().withProperty(FACING, iblockstate.getValue(FACING)), 3); } else { worldIn.setBlockState(pos, Misc.MossyFurnace.getDefaultState().withProperty(FACING, iblockstate.getValue(FACING)), 3); - worldIn.setBlockState(pos, Misc.MossyFurnace.getDefaultState().withProperty(FACING, iblockstate.getValue(FACING)), 3); } keepInventory = false; if (tileentity != null) diff --git a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/VoidFurnaceCode.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/VoidFurnaceBase.java similarity index 95% rename from src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/VoidFurnaceCode.java rename to src/main/java/com/NetherNoah/ParadiseMod/blocks/base/VoidFurnaceBase.java index 6c50f25..d78cf79 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/VoidFurnaceCode.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/base/VoidFurnaceBase.java @@ -1,5 +1,4 @@ -//this was derived from the vanilla code -package com.NetherNoah.ParadiseMod.CustomBlockCode; +package com.NetherNoah.ParadiseMod.blocks.base; import java.util.Random; @@ -34,16 +33,17 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class VoidFurnaceCode extends BlockContainer +public class VoidFurnaceBase extends BlockContainer { public static final PropertyDirection FACING = BlockHorizontal.FACING; private final boolean isBurning; private static boolean keepInventory; - protected VoidFurnaceCode(boolean isBurning) + public VoidFurnaceBase(boolean isBurning) { super(Material.ROCK); setDefaultState(blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); this.isBurning = isBurning; + setHarvestLevel("pickaxe", 0); } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) @@ -134,12 +134,10 @@ public static void setState(boolean active, World worldIn, BlockPos pos) if (active) { worldIn.setBlockState(pos, Misc.VoidFurnaceLit.getDefaultState().withProperty(FACING, iblockstate.getValue(FACING)), 3); - worldIn.setBlockState(pos, Misc.VoidFurnaceLit.getDefaultState().withProperty(FACING, iblockstate.getValue(FACING)), 3); } else { worldIn.setBlockState(pos, Misc.VoidFurnace.getDefaultState().withProperty(FACING, iblockstate.getValue(FACING)), 3); - worldIn.setBlockState(pos, Misc.VoidFurnace.getDefaultState().withProperty(FACING, iblockstate.getValue(FACING)), 3); } keepInventory = false; if (tileentity != null) @@ -148,16 +146,19 @@ public static void setState(boolean active, World worldIn, BlockPos pos) worldIn.setTileEntity(pos, tileentity); } } + @Override public TileEntity createNewTileEntity(World worldIn, int meta) { return new TEVoidFurnace(); } + @Override public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { return getDefaultState().withProperty(FACING, placer.getHorizontalFacing().getOpposite()); } + @Override public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { @@ -169,6 +170,7 @@ public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, Enti ((TEVoidFurnace)tileentity).setCustomInventoryName(stack.getDisplayName()); } } + @Override public void breakBlock(World worldIn, BlockPos pos, IBlockState state) { diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/BedrockButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/BedrockButton.java deleted file mode 100644 index b63ee66..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/BedrockButton.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons; - -import net.minecraft.block.BlockButtonStone; - -public class BedrockButton extends BlockButtonStone { - public BedrockButton() { - setUnlocalizedName("BedrockButton"); - setRegistryName("bedrock_button"); - setHardness(-1F); - setResistance(18000000F); - setBlockUnbreakable(); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/CobblestoneButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/CobblestoneButton.java deleted file mode 100644 index 216cb5d..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/CobblestoneButton.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons; - -import net.minecraft.block.BlockButtonStone; - -public class CobblestoneButton extends BlockButtonStone { - public CobblestoneButton() { - setUnlocalizedName("CobblestoneButton"); - setRegistryName("cobblestone_button"); - setHardness(0.5F); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/DiamondButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/DiamondButton.java deleted file mode 100644 index bfc739d..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/DiamondButton.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons; - -import javax.annotation.Nullable; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.buttonTicks.DiamondButtonTicks; - -import net.minecraft.block.SoundType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.SoundEvents; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class DiamondButton extends DiamondButtonTicks { - public DiamondButton() { - super(true); - setUnlocalizedName("DiamondButton"); - setRegistryName("diamond_button"); - setHardness(0.5F); - setSoundType(SoundType.METAL); - } - @Override - protected void playClickSound(@Nullable EntityPlayer player, World worldIn, BlockPos pos) { - worldIn.playSound(player, pos, SoundEvents.BLOCK_WOOD_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.3F, 0.6F); - } - @Override - protected void playReleaseSound(World worldIn, BlockPos pos) { - worldIn.playSound((EntityPlayer) null, pos, SoundEvents.BLOCK_WOOD_BUTTON_CLICK_OFF, SoundCategory.BLOCKS, 0.3F, - 0.5F); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/DirtButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/DirtButton.java deleted file mode 100644 index 9b4fc6c..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/DirtButton.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons; - -import net.minecraft.block.BlockButtonStone; -import net.minecraft.block.SoundType; - -public class DirtButton extends BlockButtonStone { - public DirtButton() { - setUnlocalizedName("DirtButton"); - setRegistryName("dirt_button"); - setSoundType(SoundType.GROUND); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/EmeraldButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/EmeraldButton.java deleted file mode 100644 index 68b1c88..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/EmeraldButton.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons; - -import javax.annotation.Nullable; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.buttonTicks.EmeraldButtonTicks; - -import net.minecraft.block.SoundType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.SoundEvents; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class EmeraldButton extends EmeraldButtonTicks { - public EmeraldButton() { - super(true); - setUnlocalizedName("EmeraldButton"); - setRegistryName("emerald_button"); - setHardness(0.5F); - setSoundType(SoundType.METAL); - } - @Override - protected void playClickSound(@Nullable EntityPlayer player, World worldIn, BlockPos pos) { - worldIn.playSound(player, pos, SoundEvents.BLOCK_WOOD_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.3F, 0.6F); - } - @Override - protected void playReleaseSound(World worldIn, BlockPos pos) { - worldIn.playSound((EntityPlayer) null, pos, SoundEvents.BLOCK_WOOD_BUTTON_CLICK_OFF, SoundCategory.BLOCKS, 0.3F, - 0.5F); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/EndButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/EndButton.java deleted file mode 100644 index a9c69ca..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/EndButton.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons; - -import net.minecraft.block.BlockButtonStone; - -public class EndButton extends BlockButtonStone { - public EndButton() { - setUnlocalizedName("EndButton"); - setRegistryName("end_button"); - setHardness(0.5F); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/GlowingObsidianButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/GlowingObsidianButton.java deleted file mode 100644 index e99708f..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/GlowingObsidianButton.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons; - -import net.minecraft.block.BlockButtonStone; - -public class GlowingObsidianButton extends BlockButtonStone { - public GlowingObsidianButton() { - setUnlocalizedName("GlowingObsidianButton"); - setRegistryName("glowing_obsidian_button"); - setHardness(51F); - setResistance(2000F); - setLightLevel(.46666667F); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/GoldButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/GoldButton.java deleted file mode 100644 index b4faabf..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/GoldButton.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons; - -import javax.annotation.Nullable; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.buttonTicks.QuickButton; - -import net.minecraft.block.SoundType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.SoundEvents; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class GoldButton extends QuickButton { - - public GoldButton() { - super(true); - setUnlocalizedName("GoldButton"); - setRegistryName("gold_button"); - setHardness(0.5F); - setSoundType(SoundType.METAL); - } - @Override - protected void playClickSound(@Nullable EntityPlayer player, World worldIn, BlockPos pos) { - worldIn.playSound(player, pos, SoundEvents.BLOCK_WOOD_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.3F, 0.6F); - } - @Override - protected void playReleaseSound(World worldIn, BlockPos pos) { - worldIn.playSound((EntityPlayer) null, pos, SoundEvents.BLOCK_WOOD_BUTTON_CLICK_OFF, SoundCategory.BLOCKS, 0.3F, - 0.5F); - } - -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/GrassButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/GrassButton.java deleted file mode 100644 index 4b7311a..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/GrassButton.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons; - -import net.minecraft.block.BlockButtonStone; -import net.minecraft.block.SoundType; - -public class GrassButton extends BlockButtonStone { - public GrassButton() { - setUnlocalizedName("GrassButton"); - setRegistryName("grass_button"); - setSoundType(SoundType.PLANT); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/IronButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/IronButton.java deleted file mode 100644 index 18e326a..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/IronButton.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons; - -import javax.annotation.Nullable; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.buttonTicks.IronButtonTicks; - -import net.minecraft.block.SoundType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.SoundEvents; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class IronButton extends IronButtonTicks { - public IronButton() { - super(true); - setUnlocalizedName("IronButton"); - setRegistryName("iron_button"); - setHardness(0.5F); - setSoundType(SoundType.METAL); - } - @Override - protected void playClickSound(@Nullable EntityPlayer player, World worldIn, BlockPos pos) { - worldIn.playSound(player, pos, SoundEvents.BLOCK_WOOD_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.3F, 0.6F); - } - @Override - protected void playReleaseSound(World worldIn, BlockPos pos) { - worldIn.playSound((EntityPlayer) null, pos, SoundEvents.BLOCK_WOOD_BUTTON_CLICK_OFF, SoundCategory.BLOCKS, 0.3F,0.5F); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/MossyButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/MossyButton.java deleted file mode 100644 index 65e8941..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/MossyButton.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons; - -import net.minecraft.block.BlockButtonStone; - -public class MossyButton extends BlockButtonStone { - public MossyButton() { - setUnlocalizedName("MossyButton"); - setRegistryName("mossy_cobblestone_button"); - setHardness(0.5F); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/ObsidianButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/ObsidianButton.java deleted file mode 100644 index 349f4a4..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/ObsidianButton.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons; - -import net.minecraft.block.BlockButtonStone; - -public class ObsidianButton extends BlockButtonStone { - public ObsidianButton() { - setUnlocalizedName("ObsidianButton"); - setRegistryName("obsidian_button"); - setHardness(51F); - setResistance(6000F); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/RubyButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/RubyButton.java deleted file mode 100644 index 9fbf04f..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/RubyButton.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons; - -import javax.annotation.Nullable; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.buttonTicks.QuickButton; - -import net.minecraft.block.SoundType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.SoundEvents; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class RubyButton extends QuickButton { - public RubyButton() { - super(true); - setUnlocalizedName("RubyButton"); - setRegistryName("ruby_button"); - setHardness(0.5F); - setSoundType(SoundType.METAL); - } - @Override - protected void playClickSound(@Nullable EntityPlayer player, World worldIn, BlockPos pos) { - worldIn.playSound(player, pos, SoundEvents.BLOCK_WOOD_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.3F, 0.6F); - } - @Override - protected void playReleaseSound(World worldIn, BlockPos pos) { - worldIn.playSound((EntityPlayer) null, pos, SoundEvents.BLOCK_WOOD_BUTTON_CLICK_OFF, SoundCategory.BLOCKS, 0.3F, - 0.5F); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/RustyButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/RustyButton.java deleted file mode 100644 index 67f6b11..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/RustyButton.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons; - -import javax.annotation.Nullable; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.buttonTicks.IronButtonTicks; - -import net.minecraft.block.SoundType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.SoundEvents; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class RustyButton extends IronButtonTicks { - public RustyButton() { - super(true); - setUnlocalizedName("RustyButton"); - setRegistryName("rusty_button"); - setHardness(0.5F); - setSoundType(SoundType.METAL); - } - @Override - protected void playClickSound(@Nullable EntityPlayer player, World worldIn, BlockPos pos) { - worldIn.playSound(player, pos, SoundEvents.BLOCK_WOOD_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.3F, 0.6F); - } - @Override - protected void playReleaseSound(World worldIn, BlockPos pos) { - worldIn.playSound((EntityPlayer) null, pos, SoundEvents.BLOCK_WOOD_BUTTON_CLICK_OFF, SoundCategory.BLOCKS, 0.3F, - 0.5F); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/SilverButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/SilverButton.java deleted file mode 100644 index 5f99e87..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/SilverButton.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons; - -import javax.annotation.Nullable; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.buttonTicks.QuickButton; - -import net.minecraft.block.SoundType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.SoundEvents; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class SilverButton extends QuickButton{ - public SilverButton() { - super(false); - setUnlocalizedName("SilverButton"); - setRegistryName("silver_button"); - setHardness(0.5F); - setSoundType(SoundType.METAL); - } - @Override - protected void playClickSound(@Nullable EntityPlayer player, World worldIn, BlockPos pos) { - worldIn.playSound(player, pos, SoundEvents.BLOCK_WOOD_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.3F, 0.6F); - } - @Override - protected void playReleaseSound(World worldIn, BlockPos pos) { - worldIn.playSound((EntityPlayer) null, pos, SoundEvents.BLOCK_WOOD_BUTTON_CLICK_OFF, SoundCategory.BLOCKS, 0.3F, - 0.5F); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/VoidButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/VoidButton.java deleted file mode 100644 index 588b504..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/VoidButton.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons; - -import net.minecraft.block.BlockButtonStone; - -public class VoidButton extends BlockButtonStone { - public VoidButton() { - setUnlocalizedName("VoidButton"); - setRegistryName("void_button"); - setHardness(0.5F); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/stoneVariants/AndesiteButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/stoneVariants/AndesiteButton.java deleted file mode 100644 index cc1488e..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/stoneVariants/AndesiteButton.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons.stoneVariants; - -import net.minecraft.block.BlockButtonStone; - -public class AndesiteButton extends BlockButtonStone { - public AndesiteButton() { - setUnlocalizedName("AndesiteButton"); - setRegistryName("andesite_button"); - setHardness(0.5F); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/stoneVariants/DioriteButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/stoneVariants/DioriteButton.java deleted file mode 100644 index 767d095..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/stoneVariants/DioriteButton.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons.stoneVariants; - -import net.minecraft.block.BlockButtonStone; - -public class DioriteButton extends BlockButtonStone { - public DioriteButton() { - setUnlocalizedName("DioriteButton"); - setRegistryName("diorite_button"); - setHardness(0.5F); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/stoneVariants/GraniteButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/stoneVariants/GraniteButton.java deleted file mode 100644 index 3ac2c53..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/stoneVariants/GraniteButton.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons.stoneVariants; - -import net.minecraft.block.BlockButtonStone; - -public class GraniteButton extends BlockButtonStone { - public GraniteButton() { - setUnlocalizedName("GraniteButton"); - setRegistryName("granite_button"); - setHardness(0.5F); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/wood/AcaciaButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/wood/AcaciaButton.java deleted file mode 100644 index ddace45..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/wood/AcaciaButton.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons.wood; - -import net.minecraft.block.BlockButtonWood; -import net.minecraft.block.SoundType; - -public class AcaciaButton extends BlockButtonWood { - public AcaciaButton() { - setUnlocalizedName("AcaciaButton"); - setRegistryName("acacia_button"); - setHardness(0.5F); - setSoundType(SoundType.WOOD); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/wood/BirchButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/wood/BirchButton.java deleted file mode 100644 index e2428d2..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/wood/BirchButton.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons.wood; - -import net.minecraft.block.BlockButtonWood; -import net.minecraft.block.SoundType; - -public class BirchButton extends BlockButtonWood { - public BirchButton() { - setUnlocalizedName("BirchButton"); - setRegistryName("birch_button"); - setHardness(0.5F); - setSoundType(SoundType.WOOD); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/wood/CactusButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/wood/CactusButton.java deleted file mode 100644 index 019abfc..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/wood/CactusButton.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons.wood; - -import net.minecraft.block.BlockButtonWood; -import net.minecraft.block.SoundType; - -public class CactusButton extends BlockButtonWood { - public CactusButton() { - setUnlocalizedName("CactusButton"); - setRegistryName("cactus_button"); - setHardness(0.5F); - setSoundType(SoundType.WOOD); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/wood/DarkOakButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/wood/DarkOakButton.java deleted file mode 100644 index 2187146..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/wood/DarkOakButton.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons.wood; - -import net.minecraft.block.BlockButtonWood; -import net.minecraft.block.SoundType; - -public class DarkOakButton extends BlockButtonWood { - public DarkOakButton() { - setUnlocalizedName("DarkOakButton"); - setRegistryName("dark_oak_button"); - setHardness(0.5F); - setSoundType(SoundType.WOOD); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/wood/JungleButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/wood/JungleButton.java deleted file mode 100644 index 6b7f8bd..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/wood/JungleButton.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons.wood; - -import net.minecraft.block.BlockButtonWood; -import net.minecraft.block.SoundType; - -public class JungleButton extends BlockButtonWood { - public JungleButton() { - setUnlocalizedName("JungleButton"); - setRegistryName("jungle_button"); - setHardness(0.5F); - setSoundType(SoundType.WOOD); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/wood/SpruceButton.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/wood/SpruceButton.java deleted file mode 100644 index a0d1c8a..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/buttons/wood/SpruceButton.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.buttons.wood; - -import net.minecraft.block.BlockButtonWood; -import net.minecraft.block.SoundType; - -public class SpruceButton extends BlockButtonWood { - public SpruceButton() { - setUnlocalizedName("SpruceButton"); - setRegistryName("spruce_button"); - setHardness(0.5F); - setSoundType(SoundType.WOOD); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/crystals/diamondCrystal.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/crystals/diamondCrystal.java deleted file mode 100644 index 1264759..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/crystals/diamondCrystal.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.crystals; - -import java.util.Random; - -import com.NetherNoah.ParadiseMod.init.LiquidRedstone.BlockLiquidRedstone; -import com.NetherNoah.ParadiseMod.init.ModBlocks.Crystals; - -import net.minecraft.block.BlockBush; -import net.minecraft.block.SoundType; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public class diamondCrystal extends BlockBush { - public diamondCrystal() { - setUnlocalizedName("diamondCrystal"); - setRegistryName("diamond_crystal"); - setHardness(.5F); - setResistance(1F); - setLightLevel(1F); - setSoundType(SoundType.GLASS); - setTickRandomly(false); - } - @Override - protected boolean canSustainBush(IBlockState state) - { - return state.getBlock() != Blocks.AIR&&state.getBlock() != Blocks.WATER&&state.getBlock() != Blocks.FLOWING_WATER&&state.getBlock() != Blocks.LAVA&&state.getBlock() != Blocks.FLOWING_LAVA&&state.getBlock() !=BlockLiquidRedstone.instance; - } - @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) - { - return new ItemStack(Crystals.diamondCrystal); - } - @Override - @SideOnly(Side.CLIENT) - public BlockRenderLayer getBlockLayer() - { - return BlockRenderLayer.TRANSLUCENT; - } - //get item to drop - @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) - { - return Items.DIAMOND; - } - //get amount of items to drop - @Override - public int quantityDropped(Random random) - { - Random rand = new Random(); - int giveItem = rand.nextInt(4) + 1; - return giveItem; - } - //is the pick enchanted with fortune? - @Override - public int quantityDroppedWithBonus(int fortune, Random random) - { - if (fortune > 0 && Item.getItemFromBlock(this) != this.getItemDropped(this.getBlockState().getValidStates().iterator().next(), random, fortune)) - { - int i = random.nextInt(fortune + 2) - 1; - - if (i < 0) - { - i = 0; - } - - return this.quantityDropped(random) * (i + 1); - } - else - { - return this.quantityDropped(random); - } - } - //spawn the item in the world - @Override - public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune) - { - super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune); - } - //spawn xp orbs - @Override - public int getExpDrop(IBlockState state, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune) - { - Random rand = world instanceof World ? ((World)world).rand : new Random(); - if (this.getItemDropped(state, rand, fortune) != Item.getItemFromBlock(this)) - { - int i = 0; - i = MathHelper.getInt(rand, 0, 5); - return i; - } - return 0; - } - //spawn the actual item - @Override - public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) - { - return new ItemStack(Items.DIAMOND); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/crystals/quartzCrystal.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/crystals/quartzCrystal.java deleted file mode 100644 index 5a731d8..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/crystals/quartzCrystal.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.crystals; - -import java.util.Random; - -import com.NetherNoah.ParadiseMod.init.LiquidRedstone.BlockLiquidRedstone; -import com.NetherNoah.ParadiseMod.init.ModBlocks.Crystals; - -import net.minecraft.block.BlockBush; -import net.minecraft.block.SoundType; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public class quartzCrystal extends BlockBush { - public quartzCrystal() { - setUnlocalizedName("quartzCrystal"); - setRegistryName("quartz_crystal"); - setHardness(.5F); - setResistance(1F); - setLightLevel(1F); - setSoundType(SoundType.GLASS); - setTickRandomly(false); - } - @Override - protected boolean canSustainBush(IBlockState state) - { - return state.getBlock() != Blocks.AIR&&state.getBlock() != Blocks.WATER&&state.getBlock() != Blocks.FLOWING_WATER&&state.getBlock() != Blocks.LAVA&&state.getBlock() != Blocks.FLOWING_LAVA&&state.getBlock() !=BlockLiquidRedstone.instance; - } - @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) - { - return new ItemStack(Crystals.quartzCrystal); - } - @Override - @SideOnly(Side.CLIENT) - public BlockRenderLayer getBlockLayer() - { - return BlockRenderLayer.TRANSLUCENT; - } - //get item to drop - @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) - { - return Items.QUARTZ; - } - //get amount of items to drop - @Override - public int quantityDropped(Random random) - { - Random rand = new Random(); - int giveItem = rand.nextInt(4) + 1; - return giveItem; - } - //is the pick enchanted with fortune? - @Override - public int quantityDroppedWithBonus(int fortune, Random random) - { - if (fortune > 0 && Item.getItemFromBlock(this) != this.getItemDropped(this.getBlockState().getValidStates().iterator().next(), random, fortune)) - { - int i = random.nextInt(fortune + 2) - 1; - - if (i < 0) - { - i = 0; - } - - return this.quantityDropped(random) * (i + 1); - } - else - { - return this.quantityDropped(random); - } - } - //spawn the item in the world - @Override - public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune) - { - super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune); - } - //spawn xp orbs - @Override - public int getExpDrop(IBlockState state, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune) - { - Random rand = world instanceof World ? ((World)world).rand : new Random(); - if (this.getItemDropped(state, rand, fortune) != Item.getItemFromBlock(this)) - { - int i = 0; - i = MathHelper.getInt(rand, 0, 5); - return i; - } - return 0; - } - //spawn the actual item - @Override - public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) - { - return new ItemStack(Items.QUARTZ); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/crystals/redstoneCrystal.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/crystals/redstoneCrystal.java deleted file mode 100644 index bc7a5b5..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/crystals/redstoneCrystal.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.crystals; - -import java.util.Random; - -import com.NetherNoah.ParadiseMod.init.LiquidRedstone.BlockLiquidRedstone; -import com.NetherNoah.ParadiseMod.init.ModBlocks.Crystals; - -import net.minecraft.block.BlockBush; -import net.minecraft.block.SoundType; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public class redstoneCrystal extends BlockBush { - public redstoneCrystal() { - setUnlocalizedName("redstoneCrystal"); - setRegistryName("redstone_crystal"); - setHardness(.5F); - setResistance(1F); - setLightLevel(1F); - setSoundType(SoundType.GLASS); - setTickRandomly(false); - } - @Override - protected boolean canSustainBush(IBlockState state) - { - return state.getBlock() != Blocks.AIR&&state.getBlock() != Blocks.WATER&&state.getBlock() != Blocks.FLOWING_WATER&&state.getBlock() != Blocks.LAVA&&state.getBlock() != Blocks.FLOWING_LAVA&&state.getBlock() !=BlockLiquidRedstone.instance; - } - @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) - { - return new ItemStack(Crystals.redstoneCrystal); - } - @Override - @SideOnly(Side.CLIENT) - public BlockRenderLayer getBlockLayer() - { - return BlockRenderLayer.TRANSLUCENT; - } - //this is a rs power block! - @Override - public int getWeakPower(IBlockState state, IBlockAccess worldIn, BlockPos pos, EnumFacing side){ - return 15; - } - @Override - public boolean canConnectRedstone(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { - return true; - - } - //get item to drop - @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) - { - return Items.REDSTONE; - } - //get amount of items to drop - @Override - public int quantityDropped(Random random) - { - Random rand = new Random(); - int giveItem = rand.nextInt(4) + 1; - return giveItem; - } - //is the pick enchanted with fortune? - @Override - public int quantityDroppedWithBonus(int fortune, Random random) - { - if (fortune > 0 && Item.getItemFromBlock(this) != this.getItemDropped(this.getBlockState().getValidStates().iterator().next(), random, fortune)) - { - int i = random.nextInt(fortune + 2) - 1; - - if (i < 0) - { - i = 0; - } - - return this.quantityDropped(random) * (i + 1); - } - else - { - return this.quantityDropped(random); - } - } - //spawn the item in the world - @Override - public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune) - { - super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune); - } - //spawn xp orbs - @Override - public int getExpDrop(IBlockState state, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune) - { - Random rand = world instanceof World ? ((World)world).rand : new Random(); - if (this.getItemDropped(state, rand, fortune) != Item.getItemFromBlock(this)) - { - int i = 0; - i = MathHelper.getInt(rand, 0, 5); - return i; - } - return 0; - } - //spawn the actual item - @Override - public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) - { - return new ItemStack(Items.REDSTONE); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/crystals/rubyCrystal.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/crystals/rubyCrystal.java deleted file mode 100644 index 9c545fd..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/crystals/rubyCrystal.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.crystals; - -import java.util.Random; - -import com.NetherNoah.ParadiseMod.init.LiquidRedstone.BlockLiquidRedstone; -import com.NetherNoah.ParadiseMod.init.ModBlocks.Crystals; -import com.NetherNoah.ParadiseMod.init.ModItems.MiscItems; - -import net.minecraft.block.BlockBush; -import net.minecraft.block.SoundType; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public class rubyCrystal extends BlockBush { - public rubyCrystal() { - setUnlocalizedName("rubyCrystal"); - setRegistryName("ruby_crystal"); - setHardness(.5F); - setResistance(1F); - setLightLevel(1F); - setSoundType(SoundType.GLASS); - setTickRandomly(false); - } - @Override - protected boolean canSustainBush(IBlockState state) - { - return state.getBlock() != Blocks.AIR&&state.getBlock() != Blocks.WATER&&state.getBlock() != Blocks.FLOWING_WATER&&state.getBlock() != Blocks.LAVA&&state.getBlock() != Blocks.FLOWING_LAVA&&state.getBlock() !=BlockLiquidRedstone.instance; - } - @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) - { - return new ItemStack(Crystals.rubyCrystal); - } - @Override - @SideOnly(Side.CLIENT) - public BlockRenderLayer getBlockLayer() - { - return BlockRenderLayer.TRANSLUCENT; - } - //get item to drop - @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) - { - return MiscItems.Ruby; - } - //get amount of items to drop - @Override - public int quantityDropped(Random random) - { - Random rand = new Random(); - int giveItem = rand.nextInt(4) + 1; - return giveItem; - } - //is the pick enchanted with fortune? - @Override - public int quantityDroppedWithBonus(int fortune, Random random) - { - if (fortune > 0 && Item.getItemFromBlock(this) != this.getItemDropped(this.getBlockState().getValidStates().iterator().next(), random, fortune)) - { - int i = random.nextInt(fortune + 2) - 1; - - if (i < 0) - { - i = 0; - } - - return this.quantityDropped(random) * (i + 1); - } - else - { - return this.quantityDropped(random); - } - } - //spawn the item in the world - @Override - public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune) - { - super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune); - } - //spawn xp orbs - @Override - public int getExpDrop(IBlockState state, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune) - { - Random rand = world instanceof World ? ((World)world).rand : new Random(); - if (this.getItemDropped(state, rand, fortune) != Item.getItemFromBlock(this)) - { - int i = 0; - i = MathHelper.getInt(rand, 0, 5); - return i; - } - return 0; - } - //spawn the actual item - @Override - public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) - { - return new ItemStack(MiscItems.Ruby); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/AndesiteDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/AndesiteDoor.java index bcffd92..e53bf9b 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/AndesiteDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/AndesiteDoor.java @@ -29,12 +29,12 @@ public AndesiteDoor() { @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR : DoorItems.ItemAndesiteDoor; + return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR : DoorItems.AndesiteDoor; } @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(DoorItems.ItemAndesiteDoor); + return new ItemStack(DoorItems.AndesiteDoor); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/BedrockDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/BedrockDoor.java index 45502a9..ae58973 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/BedrockDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/BedrockDoor.java @@ -28,12 +28,12 @@ public BedrockDoor() { @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR : DoorItems.ItemBedrockDoor; + return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR : DoorItems.BedrockDoor; } @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(DoorItems.ItemBedrockDoor); + return new ItemStack(DoorItems.BedrockDoor); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/CactusDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/CactusDoor.java index f3bfc04..67f6979 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/CactusDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/CactusDoor.java @@ -29,12 +29,12 @@ public CactusDoor() { @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.ItemCactusDoor; + return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.CactusDoor; } @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(DoorItems.ItemCactusDoor); + return new ItemStack(DoorItems.CactusDoor); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/CobblestoneDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/CobblestoneDoor.java index 565c897..6fc669b 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/CobblestoneDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/CobblestoneDoor.java @@ -27,12 +27,12 @@ public CobblestoneDoor() { // the item is the door itself @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.ItemCobblestoneDoor; + return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.CobblestoneDoor; } @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(DoorItems.ItemCobblestoneDoor); + return new ItemStack(DoorItems.CobblestoneDoor); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/DiamondDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/DiamondDoor.java index 1cf4711..f58d7ed 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/DiamondDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/DiamondDoor.java @@ -29,12 +29,12 @@ public DiamondDoor() { // the item is the door itself @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.ItemDiamondDoor; + return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.DiamondDoor; } @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(DoorItems.ItemDiamondDoor); + return new ItemStack(DoorItems.DiamondDoor); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/DioriteDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/DioriteDoor.java index 3f6a7de..e442e01 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/DioriteDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/DioriteDoor.java @@ -28,12 +28,12 @@ public DioriteDoor() { @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.ItemDioriteDoor; + return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.DioriteDoor; } @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(DoorItems.ItemDioriteDoor); + return new ItemStack(DoorItems.DioriteDoor); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/EmeraldDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/EmeraldDoor.java index d0514cd..f91e72a 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/EmeraldDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/EmeraldDoor.java @@ -29,7 +29,7 @@ public EmeraldDoor() { @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(DoorItems.ItemEmeraldDoor); + return new ItemStack(DoorItems.EmeraldDoor); } private int getCloseSound() { @@ -42,6 +42,6 @@ private int getOpenSound() // the item is the door itself @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.ItemEmeraldDoor; + return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.EmeraldDoor; } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/EndDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/EndDoor.java index 8733cce..9065aa9 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/EndDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/EndDoor.java @@ -27,11 +27,11 @@ public EndDoor() { // the item is the door itself @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.ItemEndDoor; + return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.EndDoor; } @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(DoorItems.ItemEndDoor); + return new ItemStack(DoorItems.EndDoor); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/GlassDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/GlassDoor.java index 32b30e1..01449d3 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/GlassDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/GlassDoor.java @@ -28,12 +28,12 @@ public GlassDoor() { // the item is the door itself @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR : DoorItems.ItemGlassDoor; + return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR : DoorItems.GlassDoor; } @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(DoorItems.ItemGlassDoor); + return new ItemStack(DoorItems.GlassDoor); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/GlowingObsidianDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/GlowingObsidianDoor.java index 532caae..02cc17f 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/GlowingObsidianDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/GlowingObsidianDoor.java @@ -28,12 +28,12 @@ public GlowingObsidianDoor() { // the item is the door itself @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR : DoorItems.ItemGlowingObsidianDoor; + return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR : DoorItems.GlowingObsidianDoor; } @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(DoorItems.ItemGlowingObsidianDoor); + return new ItemStack(DoorItems.GlowingObsidianDoor); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/GoldDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/GoldDoor.java index d3c4fb3..dd63e34 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/GoldDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/GoldDoor.java @@ -30,12 +30,12 @@ public GoldDoor() { // the item is the door itself @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.ItemGoldDoor; + return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.GoldDoor; } @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(DoorItems.ItemGoldDoor); + return new ItemStack(DoorItems.GoldDoor); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/GraniteDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/GraniteDoor.java index 9b5dcd0..bcecabc 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/GraniteDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/GraniteDoor.java @@ -28,12 +28,12 @@ public GraniteDoor() { @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.ItemGraniteDoor; + return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.GraniteDoor; } @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(DoorItems.ItemGraniteDoor); + return new ItemStack(DoorItems.GraniteDoor); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/MossStoneDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/MossStoneDoor.java index f028d4d..0bfbfbc 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/MossStoneDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/MossStoneDoor.java @@ -28,12 +28,12 @@ public MossStoneDoor() { @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.ItemMossStoneDoor; + return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.MossStoneDoor; } @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(DoorItems.ItemMossStoneDoor); + return new ItemStack(DoorItems.MossStoneDoor); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/ObsidianDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/ObsidianDoor.java index 84969ab..148af86 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/ObsidianDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/ObsidianDoor.java @@ -16,7 +16,7 @@ import net.minecraft.world.World; public class ObsidianDoor extends BlockDoor { - private static Item item=DoorItems.ItemObsidianDoor; + private static Item item=DoorItems.ObsidianDoor; public ObsidianDoor() { super(Material.IRON); setUnlocalizedName("ObsidianDoor"); @@ -28,12 +28,12 @@ public ObsidianDoor() { // the item is the door itself @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.ItemObsidianDoor; + return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.ObsidianDoor; } @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(DoorItems.ItemObsidianDoor); + return new ItemStack(DoorItems.ObsidianDoor); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/RedstoneDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/RedstoneDoor.java deleted file mode 100644 index 41ce38b..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/RedstoneDoor.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.doors; - -import java.util.Random; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.RSDoor; -import com.NetherNoah.ParadiseMod.init.ModItems.DoorItems; - -import net.minecraft.block.BlockDoor; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -public class RedstoneDoor extends RSDoor { - private static Item item=DoorItems.ItemRedstoneDoor; - public RedstoneDoor() { - super(Material.WOOD); - setUnlocalizedName("RedstoneDoor"); - setRegistryName("redstone_door_block"); - setHardness(5F); - setResistance(10F); - setHarvestLevel("pickaxe", 2); - setSoundType(SoundType.METAL); - } - public int getCloseSound() - { - return this.blockMaterial == Material.WOOD ? 1011 : 1012; - } - private int getOpenSound() - { - return this.blockMaterial == Material.WOOD ? 1005 : 1006; - } - @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) - { - return new ItemStack(DoorItems.ItemRedstoneDoor); - } - //this door is a rs power block! - @Override - public int getWeakPower(IBlockState state, IBlockAccess worldIn, BlockPos pos, EnumFacing side){ - return 15; - } - @Override - public boolean canConnectRedstone(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { - return true; - } - //the item is the door itself - @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) - { - return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.ItemRedstoneDoor; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/RubyDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/RubyDoor.java index c1290b1..70cc3a6 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/RubyDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/RubyDoor.java @@ -17,7 +17,7 @@ import net.minecraft.world.World; public class RubyDoor extends BlockDoor { - private static Item item=DoorItems.ItemRubyDoor; + private static Item item=DoorItems.RubyDoor; public RubyDoor() { super(Material.WOOD); setUnlocalizedName("RubyDoor"); @@ -30,7 +30,7 @@ public RubyDoor() { @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(DoorItems.ItemRubyDoor); + return new ItemStack(DoorItems.RubyDoor); } private int getCloseSound() { @@ -43,6 +43,6 @@ private int getOpenSound() // the item is the door itself @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.ItemRubyDoor; + return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.RubyDoor; } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/RustyDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/RustyDoor.java index 63d1e1f..b1005c5 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/RustyDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/RustyDoor.java @@ -30,11 +30,11 @@ public RustyDoor() { @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(DoorItems.ItemRustyDoor); + return new ItemStack(DoorItems.RustyDoor); } // the item is the door itself @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.ItemRustyDoor; + return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.RustyDoor; } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/SilverDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/SilverDoor.java index 9d1c497..9f5eb2b 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/SilverDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/SilverDoor.java @@ -29,11 +29,11 @@ public SilverDoor() { @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(DoorItems.ItemSilverDoor); + return new ItemStack(DoorItems.SilverDoor); } // the item is the door itself @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.ItemSilverDoor; + return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.SilverDoor; } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/StoneDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/StoneDoor.java index a4d4330..0555650 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/StoneDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/doors/StoneDoor.java @@ -27,11 +27,11 @@ public StoneDoor() { @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(DoorItems.ItemStoneDoor); + return new ItemStack(DoorItems.StoneDoor); } // the item is the door itself @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.ItemStoneDoor; + return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.StoneDoor; } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/BrickFenceGate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/BrickFenceGate.java deleted file mode 100644 index 2a01e39..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/BrickFenceGate.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.fenceGates; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.CustomWall; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockFence; -import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockWall; -import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class BrickFenceGate extends BlockFenceGate { - public BrickFenceGate() { - super(BlockPlanks.EnumType.DARK_OAK); - setUnlocalizedName("BrickFenceGate"); - setRegistryName("brick_fence_gate"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.REDSTONE); - setHarvestLevel("pickaxe", 0); - } - @Override - public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing) - { - IBlockState state = world.getBlockState(pos); - if (state.getBlock() instanceof BlockFenceGate && - state.getBlockFaceShape(world, pos, facing) == BlockFaceShape.MIDDLE_POLE) - { - Block connector = world.getBlockState(pos.offset(facing)).getBlock(); - return connector instanceof BlockFence || connector instanceof BlockWall || connector instanceof CustomWall; - } - return false; - } - - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) - { - EnumFacing.Axis enumfacing$axis = ((EnumFacing)state.getValue(FACING)).getAxis(); - - if (enumfacing$axis == EnumFacing.Axis.Z && (worldIn.getBlockState(pos.west()).getBlock() instanceof BlockWall || worldIn.getBlockState(pos.east()).getBlock() instanceof BlockWall) || enumfacing$axis == EnumFacing.Axis.X && (worldIn.getBlockState(pos.north()).getBlock() instanceof BlockWall || worldIn.getBlockState(pos.south()).getBlock() instanceof BlockWall)) - state = state.withProperty(IN_WALL, Boolean.valueOf(true)); - else if (enumfacing$axis == EnumFacing.Axis.Z && (worldIn.getBlockState(pos.west()).getBlock() instanceof CustomWall || worldIn.getBlockState(pos.east()).getBlock() instanceof CustomWall) || enumfacing$axis == EnumFacing.Axis.X && (worldIn.getBlockState(pos.north()).getBlock() instanceof CustomWall || worldIn.getBlockState(pos.south()).getBlock() instanceof CustomWall)) - state = state.withProperty(IN_WALL, Boolean.valueOf(true)); - return state; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/CactusFenceGate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/CactusFenceGate.java deleted file mode 100644 index 9f610cb..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/CactusFenceGate.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.fenceGates; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.CustomWall; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockFence; -import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockWall; -import net.minecraft.block.SoundType; -import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class CactusFenceGate extends BlockFenceGate { - public CactusFenceGate() { - super(BlockPlanks.EnumType.JUNGLE); - setUnlocalizedName("CactusFenceGate"); - setRegistryName("cactus_fence_gate"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.REDSTONE); - setSoundType(SoundType.WOOD); - } - @Override - public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing) - { - IBlockState state = world.getBlockState(pos); - if (state.getBlock() instanceof BlockFenceGate && - state.getBlockFaceShape(world, pos, facing) == BlockFaceShape.MIDDLE_POLE) - { - Block connector = world.getBlockState(pos.offset(facing)).getBlock(); - return connector instanceof BlockFence || connector instanceof BlockWall || connector instanceof CustomWall; - } - return false; - } - - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) - { - EnumFacing.Axis enumfacing$axis = ((EnumFacing)state.getValue(FACING)).getAxis(); - - if (enumfacing$axis == EnumFacing.Axis.Z && (worldIn.getBlockState(pos.west()).getBlock() instanceof BlockWall || worldIn.getBlockState(pos.east()).getBlock() instanceof BlockWall) || enumfacing$axis == EnumFacing.Axis.X && (worldIn.getBlockState(pos.north()).getBlock() instanceof BlockWall || worldIn.getBlockState(pos.south()).getBlock() instanceof BlockWall)) - state = state.withProperty(IN_WALL, Boolean.valueOf(true)); - else if (enumfacing$axis == EnumFacing.Axis.Z && (worldIn.getBlockState(pos.west()).getBlock() instanceof CustomWall || worldIn.getBlockState(pos.east()).getBlock() instanceof CustomWall) || enumfacing$axis == EnumFacing.Axis.X && (worldIn.getBlockState(pos.north()).getBlock() instanceof CustomWall || worldIn.getBlockState(pos.south()).getBlock() instanceof CustomWall)) - state = state.withProperty(IN_WALL, Boolean.valueOf(true)); - return state; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/DiamondFenceGate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/DiamondFenceGate.java deleted file mode 100644 index e0bf306..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/DiamondFenceGate.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.fenceGates; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.CustomWall; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockFence; -import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockWall; -import net.minecraft.block.SoundType; -import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class DiamondFenceGate extends BlockFenceGate { - public DiamondFenceGate() { - super(BlockPlanks.EnumType.DARK_OAK); - setUnlocalizedName("DiamondFenceGate"); - setRegistryName("diamond_fence_gate"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.REDSTONE); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 2); - } - @Override - public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing) - { - IBlockState state = world.getBlockState(pos); - if (state.getBlock() instanceof BlockFenceGate && - state.getBlockFaceShape(world, pos, facing) == BlockFaceShape.MIDDLE_POLE) - { - Block connector = world.getBlockState(pos.offset(facing)).getBlock(); - return connector instanceof BlockFence || connector instanceof BlockWall || connector instanceof CustomWall; - } - return false; - } - - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) - { - EnumFacing.Axis enumfacing$axis = ((EnumFacing)state.getValue(FACING)).getAxis(); - - if (enumfacing$axis == EnumFacing.Axis.Z && (worldIn.getBlockState(pos.west()).getBlock() instanceof BlockWall || worldIn.getBlockState(pos.east()).getBlock() instanceof BlockWall) || enumfacing$axis == EnumFacing.Axis.X && (worldIn.getBlockState(pos.north()).getBlock() instanceof BlockWall || worldIn.getBlockState(pos.south()).getBlock() instanceof BlockWall)) - state = state.withProperty(IN_WALL, Boolean.valueOf(true)); - else if (enumfacing$axis == EnumFacing.Axis.Z && (worldIn.getBlockState(pos.west()).getBlock() instanceof CustomWall || worldIn.getBlockState(pos.east()).getBlock() instanceof CustomWall) || enumfacing$axis == EnumFacing.Axis.X && (worldIn.getBlockState(pos.north()).getBlock() instanceof CustomWall || worldIn.getBlockState(pos.south()).getBlock() instanceof CustomWall)) - state = state.withProperty(IN_WALL, Boolean.valueOf(true)); - return state; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/EmeraldFenceGate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/EmeraldFenceGate.java deleted file mode 100644 index 4cdda1a..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/EmeraldFenceGate.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.fenceGates; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.CustomWall; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockFence; -import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockWall; -import net.minecraft.block.SoundType; -import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class EmeraldFenceGate extends BlockFenceGate { - public EmeraldFenceGate() { - super(BlockPlanks.EnumType.DARK_OAK); - setUnlocalizedName("EmeraldFenceGate"); - setRegistryName("emerald_fence_gate"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.REDSTONE); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 2); - } - @Override - public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing) - { - IBlockState state = world.getBlockState(pos); - if (state.getBlock() instanceof BlockFenceGate && - state.getBlockFaceShape(world, pos, facing) == BlockFaceShape.MIDDLE_POLE) - { - Block connector = world.getBlockState(pos.offset(facing)).getBlock(); - return connector instanceof BlockFence || connector instanceof BlockWall || connector instanceof CustomWall; - } - return false; - } - - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) - { - EnumFacing.Axis enumfacing$axis = ((EnumFacing)state.getValue(FACING)).getAxis(); - - if (enumfacing$axis == EnumFacing.Axis.Z && (worldIn.getBlockState(pos.west()).getBlock() instanceof BlockWall || worldIn.getBlockState(pos.east()).getBlock() instanceof BlockWall) || enumfacing$axis == EnumFacing.Axis.X && (worldIn.getBlockState(pos.north()).getBlock() instanceof BlockWall || worldIn.getBlockState(pos.south()).getBlock() instanceof BlockWall)) - state = state.withProperty(IN_WALL, Boolean.valueOf(true)); - else if (enumfacing$axis == EnumFacing.Axis.Z && (worldIn.getBlockState(pos.west()).getBlock() instanceof CustomWall || worldIn.getBlockState(pos.east()).getBlock() instanceof CustomWall) || enumfacing$axis == EnumFacing.Axis.X && (worldIn.getBlockState(pos.north()).getBlock() instanceof CustomWall || worldIn.getBlockState(pos.south()).getBlock() instanceof CustomWall)) - state = state.withProperty(IN_WALL, Boolean.valueOf(true)); - return state; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/IronFenceGate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/IronFenceGate.java deleted file mode 100644 index 4b0bc7e..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/IronFenceGate.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.fenceGates; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.CustomWall; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockFence; -import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockWall; -import net.minecraft.block.SoundType; -import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class IronFenceGate extends BlockFenceGate { - public IronFenceGate() { - super(BlockPlanks.EnumType.DARK_OAK); - setUnlocalizedName("IronFenceGate"); - setRegistryName("iron_fence_gate"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.REDSTONE); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 1); - } - @Override - public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing) - { - IBlockState state = world.getBlockState(pos); - if (state.getBlock() instanceof BlockFenceGate && - state.getBlockFaceShape(world, pos, facing) == BlockFaceShape.MIDDLE_POLE) - { - Block connector = world.getBlockState(pos.offset(facing)).getBlock(); - return connector instanceof BlockFence || connector instanceof BlockWall || connector instanceof CustomWall; - } - return false; - } - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) - { - EnumFacing.Axis enumfacing$axis = ((EnumFacing)state.getValue(FACING)).getAxis(); - - if (enumfacing$axis == EnumFacing.Axis.Z && (worldIn.getBlockState(pos.west()).getBlock() instanceof BlockWall || worldIn.getBlockState(pos.east()).getBlock() instanceof BlockWall) || enumfacing$axis == EnumFacing.Axis.X && (worldIn.getBlockState(pos.north()).getBlock() instanceof BlockWall || worldIn.getBlockState(pos.south()).getBlock() instanceof BlockWall)) - state = state.withProperty(IN_WALL, Boolean.valueOf(true)); - else if (enumfacing$axis == EnumFacing.Axis.Z && (worldIn.getBlockState(pos.west()).getBlock() instanceof CustomWall || worldIn.getBlockState(pos.east()).getBlock() instanceof CustomWall) || enumfacing$axis == EnumFacing.Axis.X && (worldIn.getBlockState(pos.north()).getBlock() instanceof CustomWall || worldIn.getBlockState(pos.south()).getBlock() instanceof CustomWall)) - state = state.withProperty(IN_WALL, Boolean.valueOf(true)); - return state; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/RedstoneFenceGate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/RedstoneFenceGate.java deleted file mode 100644 index 2e840e8..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/RedstoneFenceGate.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.fenceGates; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.CustomWall; -import com.NetherNoah.ParadiseMod.CustomBlockCode.RSFenceGate; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockFence; -import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockWall; -import net.minecraft.block.SoundType; -import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class RedstoneFenceGate extends RSFenceGate { - public RedstoneFenceGate() { - super(BlockPlanks.EnumType.DARK_OAK); - setUnlocalizedName("RedstoneFenceGate"); - setRegistryName("redstone_fence_gate"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.REDSTONE); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 2); - } - // this fence post is a rs power block! - @Override - public int getWeakPower(IBlockState state, IBlockAccess worldIn, BlockPos pos, EnumFacing side) { - return 15; - } - @Override - public boolean canConnectRedstone(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { - return true; - } - @Override - public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing) - { - IBlockState state = world.getBlockState(pos); - if (state.getBlock() instanceof BlockFenceGate && - state.getBlockFaceShape(world, pos, facing) == BlockFaceShape.MIDDLE_POLE) - { - Block connector = world.getBlockState(pos.offset(facing)).getBlock(); - return connector instanceof BlockFence || connector instanceof BlockWall || connector instanceof CustomWall; - } - return false; - } - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) - { - EnumFacing.Axis enumfacing$axis = ((EnumFacing)state.getValue(FACING)).getAxis(); - - if (enumfacing$axis == EnumFacing.Axis.Z && (worldIn.getBlockState(pos.west()).getBlock() instanceof BlockWall || worldIn.getBlockState(pos.east()).getBlock() instanceof BlockWall) || enumfacing$axis == EnumFacing.Axis.X && (worldIn.getBlockState(pos.north()).getBlock() instanceof BlockWall || worldIn.getBlockState(pos.south()).getBlock() instanceof BlockWall)) - state = state.withProperty(IN_WALL, Boolean.valueOf(true)); - else if (enumfacing$axis == EnumFacing.Axis.Z && (worldIn.getBlockState(pos.west()).getBlock() instanceof CustomWall || worldIn.getBlockState(pos.east()).getBlock() instanceof CustomWall) || enumfacing$axis == EnumFacing.Axis.X && (worldIn.getBlockState(pos.north()).getBlock() instanceof CustomWall || worldIn.getBlockState(pos.south()).getBlock() instanceof CustomWall)) - state = state.withProperty(IN_WALL, Boolean.valueOf(true)); - return state; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/RubyFenceGate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/RubyFenceGate.java deleted file mode 100644 index 97400e5..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/RubyFenceGate.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.fenceGates; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.CustomWall; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockFence; -import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockWall; -import net.minecraft.block.SoundType; -import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class RubyFenceGate extends BlockFenceGate { - public RubyFenceGate() { - super(BlockPlanks.EnumType.DARK_OAK); - setUnlocalizedName("RubyFenceGate"); - setRegistryName("ruby_fence_gate"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.REDSTONE); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 2); - } - @Override - public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing) - { - IBlockState state = world.getBlockState(pos); - if (state.getBlock() instanceof BlockFenceGate && - state.getBlockFaceShape(world, pos, facing) == BlockFaceShape.MIDDLE_POLE) - { - Block connector = world.getBlockState(pos.offset(facing)).getBlock(); - return connector instanceof BlockFence || connector instanceof BlockWall || connector instanceof CustomWall; - } - return false; - } - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) - { - EnumFacing.Axis enumfacing$axis = ((EnumFacing)state.getValue(FACING)).getAxis(); - - if (enumfacing$axis == EnumFacing.Axis.Z && (worldIn.getBlockState(pos.west()).getBlock() instanceof BlockWall || worldIn.getBlockState(pos.east()).getBlock() instanceof BlockWall) || enumfacing$axis == EnumFacing.Axis.X && (worldIn.getBlockState(pos.north()).getBlock() instanceof BlockWall || worldIn.getBlockState(pos.south()).getBlock() instanceof BlockWall)) - state = state.withProperty(IN_WALL, Boolean.valueOf(true)); - else if (enumfacing$axis == EnumFacing.Axis.Z && (worldIn.getBlockState(pos.west()).getBlock() instanceof CustomWall || worldIn.getBlockState(pos.east()).getBlock() instanceof CustomWall) || enumfacing$axis == EnumFacing.Axis.X && (worldIn.getBlockState(pos.north()).getBlock() instanceof CustomWall || worldIn.getBlockState(pos.south()).getBlock() instanceof CustomWall)) - state = state.withProperty(IN_WALL, Boolean.valueOf(true)); - return state; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/RustyFenceGate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/RustyFenceGate.java deleted file mode 100644 index 59e59c2..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/RustyFenceGate.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.fenceGates; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.CustomWall; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockFence; -import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockWall; -import net.minecraft.block.SoundType; -import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class RustyFenceGate extends BlockFenceGate { - public RustyFenceGate() { - super(BlockPlanks.EnumType.DARK_OAK); - setUnlocalizedName("RustyFenceGate"); - setRegistryName("rusty_fence_gate"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.REDSTONE); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 1); - } - @Override - public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing) - { - IBlockState state = world.getBlockState(pos); - if (state.getBlock() instanceof BlockFenceGate && - state.getBlockFaceShape(world, pos, facing) == BlockFaceShape.MIDDLE_POLE) - { - Block connector = world.getBlockState(pos.offset(facing)).getBlock(); - return connector instanceof BlockFence || connector instanceof BlockWall || connector instanceof CustomWall; - } - return false; - } - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) - { - EnumFacing.Axis enumfacing$axis = ((EnumFacing)state.getValue(FACING)).getAxis(); - - if (enumfacing$axis == EnumFacing.Axis.Z && (worldIn.getBlockState(pos.west()).getBlock() instanceof BlockWall || worldIn.getBlockState(pos.east()).getBlock() instanceof BlockWall) || enumfacing$axis == EnumFacing.Axis.X && (worldIn.getBlockState(pos.north()).getBlock() instanceof BlockWall || worldIn.getBlockState(pos.south()).getBlock() instanceof BlockWall)) - state = state.withProperty(IN_WALL, Boolean.valueOf(true)); - else if (enumfacing$axis == EnumFacing.Axis.Z && (worldIn.getBlockState(pos.west()).getBlock() instanceof CustomWall || worldIn.getBlockState(pos.east()).getBlock() instanceof CustomWall) || enumfacing$axis == EnumFacing.Axis.X && (worldIn.getBlockState(pos.north()).getBlock() instanceof CustomWall || worldIn.getBlockState(pos.south()).getBlock() instanceof CustomWall)) - state = state.withProperty(IN_WALL, Boolean.valueOf(true)); - return state; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/SilverFenceGate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/SilverFenceGate.java deleted file mode 100644 index bc1bd52..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fenceGates/SilverFenceGate.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.fenceGates; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.CustomWall; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockFence; -import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockWall; -import net.minecraft.block.SoundType; -import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class SilverFenceGate extends BlockFenceGate { - public SilverFenceGate() { - super(BlockPlanks.EnumType.DARK_OAK); - setUnlocalizedName("SilverFenceGate"); - setRegistryName("silver_fence_gate"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.REDSTONE); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 2); - } - @Override - public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing) - { - IBlockState state = world.getBlockState(pos); - if (state.getBlock() instanceof BlockFenceGate && - state.getBlockFaceShape(world, pos, facing) == BlockFaceShape.MIDDLE_POLE) - { - Block connector = world.getBlockState(pos.offset(facing)).getBlock(); - return connector instanceof BlockFence || connector instanceof BlockWall || connector instanceof CustomWall; - } - return false; - } - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) - { - EnumFacing.Axis enumfacing$axis = ((EnumFacing)state.getValue(FACING)).getAxis(); - - if (enumfacing$axis == EnumFacing.Axis.Z && (worldIn.getBlockState(pos.west()).getBlock() instanceof BlockWall || worldIn.getBlockState(pos.east()).getBlock() instanceof BlockWall) || enumfacing$axis == EnumFacing.Axis.X && (worldIn.getBlockState(pos.north()).getBlock() instanceof BlockWall || worldIn.getBlockState(pos.south()).getBlock() instanceof BlockWall)) - state = state.withProperty(IN_WALL, Boolean.valueOf(true)); - else if (enumfacing$axis == EnumFacing.Axis.Z && (worldIn.getBlockState(pos.west()).getBlock() instanceof CustomWall || worldIn.getBlockState(pos.east()).getBlock() instanceof CustomWall) || enumfacing$axis == EnumFacing.Axis.X && (worldIn.getBlockState(pos.north()).getBlock() instanceof CustomWall || worldIn.getBlockState(pos.south()).getBlock() instanceof CustomWall)) - state = state.withProperty(IN_WALL, Boolean.valueOf(true)); - return state; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/BedrockWall.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/BedrockWall.java deleted file mode 100644 index bd3b50f..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/BedrockWall.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.fences; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.CustomWall; - -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class BedrockWall extends CustomWall { - public BedrockWall() { - super(Material.BARRIER); - setUnlocalizedName("BedrockWall"); - setRegistryName("bedrock_wall"); - setHardness(-1F); - setResistance(6000000F); - setCreativeTab(CreativeTabs.DECORATIONS); - setBlockUnbreakable(); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/BrickFence.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/BrickFence.java deleted file mode 100644 index 263d8a9..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/BrickFence.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.fences; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockFence; -import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.material.MapColor; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class BrickFence extends BlockFence { - public BrickFence() { - super(Material.ROCK, MapColor.ADOBE); - setUnlocalizedName("BrickFence"); - setRegistryName("brick_fence"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.DECORATIONS); - setHarvestLevel("pickaxe", 0); - } - - @Override - public boolean canConnectTo(IBlockAccess worldIn, BlockPos pos, EnumFacing facing) - { - IBlockState iblockstate = worldIn.getBlockState(pos); - BlockFaceShape blockfaceshape = iblockstate.getBlockFaceShape(worldIn, pos, facing); - Block block = iblockstate.getBlock(); - boolean flag = blockfaceshape == BlockFaceShape.MIDDLE_POLE && (block instanceof BlockFence || block instanceof BlockFenceGate); - return !isExcepBlockForAttachWithPiston(block) && blockfaceshape == BlockFaceShape.SOLID || flag; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/DiamondFence.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/DiamondFence.java deleted file mode 100644 index 20f06ea..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/DiamondFence.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.fences; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockFence; -import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.MapColor; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class DiamondFence extends BlockFence { - public DiamondFence() { - super(Material.ROCK, MapColor.DIAMOND); - setUnlocalizedName("DiamondFence"); - setRegistryName("diamond_fence"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.DECORATIONS); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 2); - } - - @Override - public boolean canConnectTo(IBlockAccess worldIn, BlockPos pos, EnumFacing facing) - { - IBlockState iblockstate = worldIn.getBlockState(pos); - BlockFaceShape blockfaceshape = iblockstate.getBlockFaceShape(worldIn, pos, facing); - Block block = iblockstate.getBlock(); - boolean flag = blockfaceshape == BlockFaceShape.MIDDLE_POLE && (block instanceof BlockFence || block instanceof BlockFenceGate); - return !isExcepBlockForAttachWithPiston(block) && blockfaceshape == BlockFaceShape.SOLID || flag; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/EmeraldFence.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/EmeraldFence.java deleted file mode 100644 index b68c026..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/EmeraldFence.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.fences; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockFence; -import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.MapColor; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class EmeraldFence extends BlockFence { - public EmeraldFence() { - super(Material.ROCK, MapColor.EMERALD); - setUnlocalizedName("EmeraldFence"); - setRegistryName("emerald_fence"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.DECORATIONS); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 2); - } - - @Override - public boolean canConnectTo(IBlockAccess worldIn, BlockPos pos, EnumFacing facing) - { - IBlockState iblockstate = worldIn.getBlockState(pos); - BlockFaceShape blockfaceshape = iblockstate.getBlockFaceShape(worldIn, pos, facing); - Block block = iblockstate.getBlock(); - boolean flag = blockfaceshape == BlockFaceShape.MIDDLE_POLE && (block instanceof BlockFence || block instanceof BlockFenceGate); - return !isExcepBlockForAttachWithPiston(block) && blockfaceshape == BlockFaceShape.SOLID || flag; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/EndWall.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/EndWall.java deleted file mode 100644 index a77256c..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/EndWall.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.fences; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.CustomWall; - -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class EndWall extends CustomWall { - public EndWall() { - super(Material.ROCK); - setRegistryName("end_wall"); - setUnlocalizedName("EndWall"); - setCreativeTab(CreativeTabs.DECORATIONS); - setHardness(5F); - setResistance(15F); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/GlowingObsidianWall.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/GlowingObsidianWall.java deleted file mode 100644 index 98c6f09..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/GlowingObsidianWall.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.fences; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.CustomWall; - -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class GlowingObsidianWall extends CustomWall { - public GlowingObsidianWall() { - super(Material.BARRIER); - setRegistryName("glowing_obsidian_wall"); - setUnlocalizedName("GlowingObsidianWall"); - setCreativeTab(CreativeTabs.DECORATIONS); - setHardness(51F); - setResistance(2000F); - setLightLevel(.46666667F); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/GoldFence.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/GoldFence.java deleted file mode 100644 index 210d7d7..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/GoldFence.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.fences; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockFence; -import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.MapColor; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class GoldFence extends BlockFence { - public GoldFence() { - super(Material.ROCK, MapColor.GOLD); - setUnlocalizedName("GoldFence"); - setRegistryName("gold_fence"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.DECORATIONS); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 2); - } - - @Override - public boolean canConnectTo(IBlockAccess worldIn, BlockPos pos, EnumFacing facing) - { - IBlockState iblockstate = worldIn.getBlockState(pos); - BlockFaceShape blockfaceshape = iblockstate.getBlockFaceShape(worldIn, pos, facing); - Block block = iblockstate.getBlock(); - boolean flag = blockfaceshape == BlockFaceShape.MIDDLE_POLE && (block instanceof BlockFence || block instanceof BlockFenceGate); - return !isExcepBlockForAttachWithPiston(block) && blockfaceshape == BlockFaceShape.SOLID || flag; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/IronFence.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/IronFence.java deleted file mode 100644 index 22cb458..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/IronFence.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.fences; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockFence; -import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.MapColor; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class IronFence extends BlockFence { - public IronFence() { - super(Material.IRON, MapColor.IRON); - setUnlocalizedName("IronFence"); - setRegistryName("iron_fence"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.DECORATIONS); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 1); - } - - @Override - public boolean canConnectTo(IBlockAccess worldIn, BlockPos pos, EnumFacing facing) - { - IBlockState iblockstate = worldIn.getBlockState(pos); - BlockFaceShape blockfaceshape = iblockstate.getBlockFaceShape(worldIn, pos, facing); - Block block = iblockstate.getBlock(); - boolean flag = blockfaceshape == BlockFaceShape.MIDDLE_POLE && (block instanceof BlockFence || block instanceof BlockFenceGate); - return !isExcepBlockForAttachWithPiston(block) && blockfaceshape == BlockFaceShape.SOLID || flag; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/ObsidianWall.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/ObsidianWall.java deleted file mode 100644 index 89a0ed8..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/ObsidianWall.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.fences; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.CustomWall; - -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class ObsidianWall extends CustomWall { - public ObsidianWall() { - super(Material.BARRIER); - setRegistryName("obsidian_wall"); - setUnlocalizedName("ObsidianWall"); - setCreativeTab(CreativeTabs.DECORATIONS); - setHardness(51F); - setResistance(2000F); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/RubyFence.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/RubyFence.java deleted file mode 100644 index ab64f2d..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/RubyFence.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.fences; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockFence; -import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.MapColor; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class RubyFence extends BlockFence { - public RubyFence() { - super(Material.IRON, MapColor.MAGENTA); - setUnlocalizedName("RubyFence"); - setRegistryName("ruby_fence"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.DECORATIONS); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 2); - } - - @Override - public boolean canConnectTo(IBlockAccess worldIn, BlockPos pos, EnumFacing facing) - { - IBlockState iblockstate = worldIn.getBlockState(pos); - BlockFaceShape blockfaceshape = iblockstate.getBlockFaceShape(worldIn, pos, facing); - Block block = iblockstate.getBlock(); - boolean flag = blockfaceshape == BlockFaceShape.MIDDLE_POLE && (block instanceof BlockFence || block instanceof BlockFenceGate); - return !isExcepBlockForAttachWithPiston(block) && blockfaceshape == BlockFaceShape.SOLID || flag; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/RustyFence.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/RustyFence.java deleted file mode 100644 index c43e81b..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/RustyFence.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.fences; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockFence; -import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.MapColor; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class RustyFence extends BlockFence { - public RustyFence() { - super(Material.IRON, MapColor.IRON); - setUnlocalizedName("RustyFence"); - setRegistryName("rusty_fence"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.DECORATIONS); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 1); - } - - @Override - public boolean canConnectTo(IBlockAccess worldIn, BlockPos pos, EnumFacing facing) - { - IBlockState iblockstate = worldIn.getBlockState(pos); - BlockFaceShape blockfaceshape = iblockstate.getBlockFaceShape(worldIn, pos, facing); - Block block = iblockstate.getBlock(); - boolean flag = blockfaceshape == BlockFaceShape.MIDDLE_POLE && (block instanceof BlockFence || block instanceof BlockFenceGate); - return !isExcepBlockForAttachWithPiston(block) && blockfaceshape == BlockFaceShape.SOLID || flag; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/SilverFence.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/SilverFence.java deleted file mode 100644 index d9a566b..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/SilverFence.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.fences; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockFence; -import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.MapColor; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class SilverFence extends BlockFence { - public SilverFence() { - super(Material.IRON, MapColor.SILVER); - setUnlocalizedName("SilverFence"); - setRegistryName("silver_fence"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.DECORATIONS); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 2); - } - - @Override - public boolean canConnectTo(IBlockAccess worldIn, BlockPos pos, EnumFacing facing) - { - IBlockState iblockstate = worldIn.getBlockState(pos); - BlockFaceShape blockfaceshape = iblockstate.getBlockFaceShape(worldIn, pos, facing); - Block block = iblockstate.getBlock(); - boolean flag = blockfaceshape == BlockFaceShape.MIDDLE_POLE && (block instanceof BlockFence || block instanceof BlockFenceGate); - return !isExcepBlockForAttachWithPiston(block) && blockfaceshape == BlockFaceShape.SOLID || flag; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/VoidWall.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/VoidWall.java deleted file mode 100644 index c80945e..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/fences/VoidWall.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.fences; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.CustomWall; - -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class VoidWall extends CustomWall { - public VoidWall() { - super(Material.ROCK); - setUnlocalizedName("VoidWall"); - setRegistryName("void_wall"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.DECORATIONS); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/formations/mossyStoneFormation.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/formations/mossyStoneFormation.java deleted file mode 100644 index f78d20f..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/formations/mossyStoneFormation.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.formations; - -import net.minecraft.block.BlockDirectional; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -public class mossyStoneFormation extends BlockDirectional { - protected static final AxisAlignedBB END_ROD_VERTICAL_AABB = new AxisAlignedBB(0.375D, 0.0D, 0.375D, 0.625D, 1.0D, 0.625D); - protected static final AxisAlignedBB END_ROD_NS_AABB = new AxisAlignedBB(0.375D, 0.375D, 0.0D, 0.625D, 0.625D, 1.0D); - protected static final AxisAlignedBB END_ROD_EW_AABB = new AxisAlignedBB(0.0D, 0.375D, 0.375D, 1.0D, 0.625D, 0.625D); - - public mossyStoneFormation() - { - super(Material.CIRCUITS); - setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.UP)); - setCreativeTab(CreativeTabs.DECORATIONS); - setUnlocalizedName("mossyStoneFormation"); - setRegistryName("mossy_stone_formation"); - } - - @Override - public boolean isOpaqueCube(IBlockState state) { - return false; - } - - @Override - public boolean isFullCube(IBlockState state) { - return false; - } - - @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) - { - switch (((EnumFacing)state.getValue(FACING)).getAxis()) - { - case X: - default: - return END_ROD_EW_AABB; - case Z: - return END_ROD_NS_AABB; - case Y: - return END_ROD_VERTICAL_AABB; - } - } - @Override - public BlockRenderLayer getBlockLayer() - { - return BlockRenderLayer.TRANSLUCENT; - } - - @Override - public IBlockState getStateFromMeta(int meta) - { - IBlockState iblockstate = this.getDefaultState(); - iblockstate = iblockstate.withProperty(FACING, EnumFacing.getFront(meta)); - return iblockstate; - } - - @Override - public int getMetaFromState(IBlockState state) - { - return ((EnumFacing)state.getValue(FACING)).getIndex(); - } - - @Override - public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) - { - IBlockState iblockstate = worldIn.getBlockState(pos.offset(facing.getOpposite())); - - if (iblockstate.getBlock() == Blocks.END_ROD) - { - EnumFacing enumfacing = (EnumFacing)iblockstate.getValue(FACING); - - if (enumfacing == facing) - { - return this.getDefaultState().withProperty(FACING, facing.getOpposite()); - } - } - - return this.getDefaultState().withProperty(FACING, facing); - } - - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] {FACING}); - } - -} diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/formations/netherrackFormation.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/formations/netherrackFormation.java deleted file mode 100644 index af18ff0..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/formations/netherrackFormation.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.formations; - -import net.minecraft.block.BlockDirectional; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -public class netherrackFormation extends BlockDirectional { - protected static final AxisAlignedBB END_ROD_VERTICAL_AABB = new AxisAlignedBB(0.375D, 0.0D, 0.375D, 0.625D, 1.0D, 0.625D); - protected static final AxisAlignedBB END_ROD_NS_AABB = new AxisAlignedBB(0.375D, 0.375D, 0.0D, 0.625D, 0.625D, 1.0D); - protected static final AxisAlignedBB END_ROD_EW_AABB = new AxisAlignedBB(0.0D, 0.375D, 0.375D, 1.0D, 0.625D, 0.625D); - - public netherrackFormation() - { - super(Material.CIRCUITS); - setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.UP)); - setCreativeTab(CreativeTabs.DECORATIONS); - setUnlocalizedName("netherrackFormation"); - setRegistryName("netherrack_formation"); - } - - @Override - public boolean isOpaqueCube(IBlockState state) { - return false; - } - - @Override - public boolean isFullCube(IBlockState state) { - return false; - } - - @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) - { - switch (((EnumFacing)state.getValue(FACING)).getAxis()) - { - case X: - default: - return END_ROD_EW_AABB; - case Z: - return END_ROD_NS_AABB; - case Y: - return END_ROD_VERTICAL_AABB; - } - } - @Override - public BlockRenderLayer getBlockLayer() - { - return BlockRenderLayer.TRANSLUCENT; - } - - @Override - public IBlockState getStateFromMeta(int meta) - { - IBlockState iblockstate = this.getDefaultState(); - iblockstate = iblockstate.withProperty(FACING, EnumFacing.getFront(meta)); - return iblockstate; - } - - @Override - public int getMetaFromState(IBlockState state) - { - return ((EnumFacing)state.getValue(FACING)).getIndex(); - } - - @Override - public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) - { - IBlockState iblockstate = worldIn.getBlockState(pos.offset(facing.getOpposite())); - - if (iblockstate.getBlock() == Blocks.END_ROD) - { - EnumFacing enumfacing = (EnumFacing)iblockstate.getValue(FACING); - - if (enumfacing == facing) - { - return this.getDefaultState().withProperty(FACING, facing.getOpposite()); - } - } - - return this.getDefaultState().withProperty(FACING, facing); - } - - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] {FACING}); - } - -} diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/formations/sandstoneFormation.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/formations/sandstoneFormation.java deleted file mode 100644 index ac068a7..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/formations/sandstoneFormation.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.formations; - -import net.minecraft.block.BlockDirectional; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -public class sandstoneFormation extends BlockDirectional { - protected static final AxisAlignedBB END_ROD_VERTICAL_AABB = new AxisAlignedBB(0.375D, 0.0D, 0.375D, 0.625D, 1.0D, 0.625D); - protected static final AxisAlignedBB END_ROD_NS_AABB = new AxisAlignedBB(0.375D, 0.375D, 0.0D, 0.625D, 0.625D, 1.0D); - protected static final AxisAlignedBB END_ROD_EW_AABB = new AxisAlignedBB(0.0D, 0.375D, 0.375D, 1.0D, 0.625D, 0.625D); - - public sandstoneFormation() - { - super(Material.CIRCUITS); - setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.UP)); - setCreativeTab(CreativeTabs.DECORATIONS); - setUnlocalizedName("sandstoneFormation"); - setRegistryName("sandstone_formation"); - } - - @Override - public boolean isOpaqueCube(IBlockState state) { - return false; - } - - @Override - public boolean isFullCube(IBlockState state) { - return false; - } - - @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) - { - switch (((EnumFacing)state.getValue(FACING)).getAxis()) - { - case X: - default: - return END_ROD_EW_AABB; - case Z: - return END_ROD_NS_AABB; - case Y: - return END_ROD_VERTICAL_AABB; - } - } - @Override - public BlockRenderLayer getBlockLayer() - { - return BlockRenderLayer.TRANSLUCENT; - } - - @Override - public IBlockState getStateFromMeta(int meta) - { - IBlockState iblockstate = this.getDefaultState(); - iblockstate = iblockstate.withProperty(FACING, EnumFacing.getFront(meta)); - return iblockstate; - } - - @Override - public int getMetaFromState(IBlockState state) - { - return ((EnumFacing)state.getValue(FACING)).getIndex(); - } - - @Override - public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) - { - IBlockState iblockstate = worldIn.getBlockState(pos.offset(facing.getOpposite())); - - if (iblockstate.getBlock() == Blocks.END_ROD) - { - EnumFacing enumfacing = (EnumFacing)iblockstate.getValue(FACING); - - if (enumfacing == facing) - { - return this.getDefaultState().withProperty(FACING, facing.getOpposite()); - } - } - - return this.getDefaultState().withProperty(FACING, facing); - } - - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] {FACING}); - } - -} diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/formations/stoneFormation.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/formations/stoneFormation.java deleted file mode 100644 index 36caebf..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/formations/stoneFormation.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.formations; - -import net.minecraft.block.BlockDirectional; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -public class stoneFormation extends BlockDirectional { - protected static final AxisAlignedBB END_ROD_VERTICAL_AABB = new AxisAlignedBB(0.375D, 0.0D, 0.375D, 0.625D, 1.0D, 0.625D); - protected static final AxisAlignedBB END_ROD_NS_AABB = new AxisAlignedBB(0.375D, 0.375D, 0.0D, 0.625D, 0.625D, 1.0D); - protected static final AxisAlignedBB END_ROD_EW_AABB = new AxisAlignedBB(0.0D, 0.375D, 0.375D, 1.0D, 0.625D, 0.625D); - - public stoneFormation() - { - super(Material.CIRCUITS); - setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.UP)); - setCreativeTab(CreativeTabs.DECORATIONS); - setUnlocalizedName("stoneFormation"); - setRegistryName("stone_formation"); - } - - @Override - public boolean isOpaqueCube(IBlockState state) { - return false; - } - - @Override - public boolean isFullCube(IBlockState state) { - return false; - } - - @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) - { - switch (((EnumFacing)state.getValue(FACING)).getAxis()) - { - case X: - default: - return END_ROD_EW_AABB; - case Z: - return END_ROD_NS_AABB; - case Y: - return END_ROD_VERTICAL_AABB; - } - } - @Override - public BlockRenderLayer getBlockLayer() - { - return BlockRenderLayer.TRANSLUCENT; - } - - @Override - public IBlockState getStateFromMeta(int meta) - { - IBlockState iblockstate = this.getDefaultState(); - iblockstate = iblockstate.withProperty(FACING, EnumFacing.getFront(meta)); - return iblockstate; - } - - @Override - public int getMetaFromState(IBlockState state) - { - return ((EnumFacing)state.getValue(FACING)).getIndex(); - } - - @Override - public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) - { - IBlockState iblockstate = worldIn.getBlockState(pos.offset(facing.getOpposite())); - - if (iblockstate.getBlock() == Blocks.END_ROD) - { - EnumFacing enumfacing = (EnumFacing)iblockstate.getValue(FACING); - - if (enumfacing == facing) - { - return this.getDefaultState().withProperty(FACING, facing.getOpposite()); - } - } - - return this.getDefaultState().withProperty(FACING, facing); - } - - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] {FACING}); - } - -} diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/BlueRose.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/BlueRose.java deleted file mode 100644 index 9d8a8e3..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/BlueRose.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.misc; - -import java.util.Random; - -import com.NetherNoah.ParadiseMod.init.ModBlocks.Misc; - -import net.minecraft.block.BlockBush; -import net.minecraft.block.IGrowable; -import net.minecraft.block.SoundType; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public class BlueRose extends BlockBush implements IGrowable { - public BlueRose() { - setUnlocalizedName("BlueRose"); - setRegistryName("blue_rose"); - setSoundType(SoundType.PLANT); - } - @Override - protected boolean canSustainBush(IBlockState state) - { - return state.getBlock()==Blocks.GRASS|state.getBlock()==Blocks.DIRT; - } - @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) - { - return new ItemStack(Misc.BlueRose); - } - @Override - public boolean canUseBonemeal(World worldIn, Random rand, BlockPos pos, IBlockState state) - { - return true; - } - - @Override - public void grow(World worldIn, Random rand, BlockPos pos, IBlockState state) - { - spawnAsEntity(worldIn, pos, new ItemStack(this)); - } - @Override - @SideOnly(Side.CLIENT) - public BlockRenderLayer getBlockLayer() - { - return BlockRenderLayer.CUTOUT; - } - @Override - public boolean canGrow(World worldIn, BlockPos pos, IBlockState state, boolean isClient) { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/CompressedCactus.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/CompressedCactus.java deleted file mode 100644 index 4c82b53..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/CompressedCactus.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.misc; -import net.minecraft.block.Block; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -public class CompressedCactus extends Block{ - public CompressedCactus() { - super(Material.WOOD); - setUnlocalizedName("CompressedCactus"); - setRegistryName("compressed_cactus"); - setHardness(2.5F); - setResistance(5F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setSoundType(SoundType.WOOD); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/DUPortal.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/DUPortal.java index afff69b..12fce4f 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/DUPortal.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/DUPortal.java @@ -117,6 +117,7 @@ public int getMetaFromState(IBlockState state) { public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(AXIS, (meta & 3) == 2 ? EnumFacing.Axis.Z : EnumFacing.Axis.X); } + public boolean trySpawnPortal(World worldIn, BlockPos pos) { DUPortal.Size blockportal$size = new DUPortal.Size(worldIn, pos, EnumFacing.Axis.X); if(blockportal$size.isValid() && blockportal$size.portalBlockCount == 0) { @@ -138,6 +139,7 @@ public boolean trySpawnPortal(World worldIn, BlockPos pos) { public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean p_185477_7_) { } + public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn) { EnumFacing.Axis enumfacing$axis = state.getValue(AXIS); if(enumfacing$axis == EnumFacing.Axis.X) { @@ -153,14 +155,17 @@ else if (enumfacing$axis == EnumFacing.Axis.Z) { } } } + @Override public int quantityDropped(Random random) { return 1; } + @Override public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn) { - if(!entityIn.isRiding() && !entityIn.isBeingRidden() && entityIn.isNonBoss() && entityIn instanceof EntityPlayerMP) { + if(!entityIn.isRiding() && !entityIn.isBeingRidden() && entityIn.isNonBoss()&& entityIn instanceof EntityPlayerMP) { EntityPlayerMP thePlayer = (EntityPlayerMP)entityIn; + if(thePlayer.timeUntilPortal > 0) { thePlayer.timeUntilPortal = 10; } @@ -177,11 +182,13 @@ else if (thePlayer.dimension != DimensionRegistry.DeepUnderground) { } } } + @SideOnly(Side.CLIENT) @Override public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.TRANSLUCENT; } + @SideOnly(Side.CLIENT) @Override public void randomDisplayTick(IBlockState stateIn, World worldIn, BlockPos pos, Random rand) { @@ -239,11 +246,11 @@ public static class Size private BlockPos bottomLeft; private int height; private int width; - public Size(World worldIn, BlockPos p_i45694_2_, EnumFacing.Axis p_i45694_3_) + public Size(World worldIn, BlockPos position, EnumFacing.Axis axisIn) { world = worldIn; - axis = p_i45694_3_; - if (p_i45694_3_ == EnumFacing.Axis.X) + axis = axisIn; + if (axisIn == EnumFacing.Axis.X) { leftDir = EnumFacing.EAST; rightDir = EnumFacing.WEST; @@ -253,14 +260,14 @@ public Size(World worldIn, BlockPos p_i45694_2_, EnumFacing.Axis p_i45694_3_) leftDir = EnumFacing.NORTH; rightDir = EnumFacing.SOUTH; } - for (BlockPos blockpos = p_i45694_2_; p_i45694_2_.getY() > blockpos.getY() - 21 && p_i45694_2_.getY() > 0 && isEmptyBlock(worldIn.getBlockState(p_i45694_2_.down()).getBlock()); p_i45694_2_ = p_i45694_2_.down()) + for (BlockPos blockpos = position; position.getY() > blockpos.getY() - 21 && position.getY() > 0 && isEmptyBlock(worldIn.getBlockState(position.down()).getBlock()); position = position.down()) { ; } - int i = getDistanceUntilEdge(p_i45694_2_, leftDir) - 1; + int i = getDistanceUntilEdge(position, leftDir) - 1; if (i >= 0) { - bottomLeft = p_i45694_2_.offset(leftDir, i); + bottomLeft = position.offset(leftDir, i); width = getDistanceUntilEdge(bottomLeft, rightDir); if (width < 2 || width > 21) { @@ -273,20 +280,20 @@ public Size(World worldIn, BlockPos p_i45694_2_, EnumFacing.Axis p_i45694_3_) height = calculatePortalHeight(); } } - protected int getDistanceUntilEdge(BlockPos p_180120_1_, EnumFacing p_180120_2_) + protected int getDistanceUntilEdge(BlockPos position, EnumFacing p_180120_2_) { int i; for (i = 0; i < 22; ++i) { - BlockPos blockpos = p_180120_1_.offset(p_180120_2_, i); + BlockPos blockpos = position.offset(p_180120_2_, i); if (!isEmptyBlock(world.getBlockState(blockpos).getBlock()) || world.getBlockState(blockpos.down()).getBlock() != Blocks.BOOKSHELF) { break; } } - Block block = world.getBlockState(p_180120_1_.offset(p_180120_2_, i)).getBlock(); + Block block = world.getBlockState(position.offset(p_180120_2_, i)).getBlock(); return block == Ores.blazeBlock ? i : 0; } public int getHeight() @@ -301,7 +308,7 @@ public int getWidth() protected int calculatePortalHeight() { label24: - for (height = 0; height < 21; ++height) + for (height = 0; height < 21; height++) { for (int i = 0; i < width; ++i) { @@ -311,9 +318,9 @@ protected int calculatePortalHeight() { break label24; } - if (block == Misc.DVPortal) + if (block == Misc.DUPortal) { - ++portalBlockCount; + portalBlockCount++; } if (i == 0) { @@ -363,12 +370,12 @@ public boolean isValid() } public void placePortalBlocks() { - for (int i = 0; i < width; ++i) + for (int i = 0; i < width; i++) { BlockPos blockpos = bottomLeft.offset(rightDir, i); - for (int j = 0; j < height; ++j) + for (int j = 0; j < height; j++) { - world.setBlockState(blockpos.up(j), Misc.DVPortal.getDefaultState().withProperty(BlockPortal.AXIS, axis), 2); + world.setBlockState(blockpos.up(j), Misc.DUPortal.getDefaultState().withProperty(BlockPortal.AXIS, axis), 2); } } } diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/DVPortal.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/DVPortal.java index 292fd97..8aa2876 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/DVPortal.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/DVPortal.java @@ -239,7 +239,7 @@ public static class Size private BlockPos bottomLeft; private int height; private int width; - public Size(World worldIn, BlockPos p_i45694_2_, EnumFacing.Axis p_i45694_3_) + public Size(World worldIn, BlockPos position, EnumFacing.Axis p_i45694_3_) { world = worldIn; axis = p_i45694_3_; @@ -253,14 +253,14 @@ public Size(World worldIn, BlockPos p_i45694_2_, EnumFacing.Axis p_i45694_3_) leftDir = EnumFacing.NORTH; rightDir = EnumFacing.SOUTH; } - for (BlockPos blockpos = p_i45694_2_; p_i45694_2_.getY() > blockpos.getY() - 21 && p_i45694_2_.getY() > 0 && isEmptyBlock(worldIn.getBlockState(p_i45694_2_.down()).getBlock()); p_i45694_2_ = p_i45694_2_.down()) + for (BlockPos blockpos = position; position.getY() > blockpos.getY() - 21 && position.getY() > 0 && isEmptyBlock(worldIn.getBlockState(position.down()).getBlock()); position = position.down()) { ; } - int i = getDistanceUntilEdge(p_i45694_2_, leftDir) - 1; + int i = getDistanceUntilEdge(position, leftDir) - 1; if (i >= 0) { - bottomLeft = p_i45694_2_.offset(leftDir, i); + bottomLeft = position.offset(leftDir, i); width = getDistanceUntilEdge(bottomLeft, rightDir); if (width < 2 || width > 21) { diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/GoldBars.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/GoldBars.java deleted file mode 100644 index dd9e2b7..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/GoldBars.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.misc; - -import net.minecraft.block.BlockPane; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class GoldBars extends BlockPane { - public GoldBars() { - super(Material.IRON, true); - setUnlocalizedName("GoldBars"); - setRegistryName("gold_bars"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.DECORATIONS); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 2); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/MossyFurnace.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/MossyFurnace.java deleted file mode 100644 index 456d67c..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/MossyFurnace.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.misc; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.MossyFurnaceCode; - -import net.minecraft.creativetab.CreativeTabs; - -public class MossyFurnace extends MossyFurnaceCode { - public MossyFurnace() { - super(false); - setUnlocalizedName("MossyFurnace"); - setRegistryName("mossy_furnace"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.DECORATIONS); - setHarvestLevel("pickaxe", 0); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/MossyFurnaceLit.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/MossyFurnaceLit.java deleted file mode 100644 index a99b9b5..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/MossyFurnaceLit.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.misc; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.MossyFurnaceCode; - -public class MossyFurnaceLit extends MossyFurnaceCode { - public MossyFurnaceLit() { - super(true); - setUnlocalizedName("MossyFurnaceLit"); - setRegistryName("lit_mossy_furnace"); - setHardness(5F); - setResistance(10F); - setHarvestLevel("pickaxe", 0); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/PolishedVoidStone.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/PolishedVoidStone.java deleted file mode 100644 index afa4b02..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/PolishedVoidStone.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.misc; -import net.minecraft.block.Block; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -public class PolishedVoidStone extends Block{ - public PolishedVoidStone() { - super(Material.ROCK); - setUnlocalizedName("PolishedVoidStone"); - setRegistryName("polished_void_stone"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setSoundType(SoundType.STONE); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/RustyIronBars.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/RustyIronBars.java deleted file mode 100644 index 9df802d..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/RustyIronBars.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.misc; - -import net.minecraft.block.BlockPane; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class RustyIronBars extends BlockPane { - public RustyIronBars() { - super(Material.IRON, true); - setUnlocalizedName("RustyIronBars"); - setRegistryName("rusty_iron_bars"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.DECORATIONS); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 1); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/SilverBars.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/SilverBars.java deleted file mode 100644 index 5b77573..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/SilverBars.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.misc; - -import net.minecraft.block.BlockPane; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class SilverBars extends BlockPane { - public SilverBars() { - super(Material.IRON, true); - setUnlocalizedName("SilverBars"); - setRegistryName("silver_bars"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.DECORATIONS); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 2); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/Stonecutter.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/Stonecutter.java deleted file mode 100644 index c7b4871..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/Stonecutter.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.misc; -import net.minecraft.block.Block; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -public class Stonecutter extends Block{ - public Stonecutter() { - super(Material.WOOD); - setUnlocalizedName("Stonecutter"); - setRegistryName("stonecutter"); - setHardness(5F); - setResistance(5.8333333333F); - setCreativeTab(CreativeTabs.DECORATIONS); - setSoundType(SoundType.STONE); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/VoidBricks.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/VoidBricks.java deleted file mode 100644 index ec51555..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/VoidBricks.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.misc; -import net.minecraft.block.Block; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -public class VoidBricks extends Block{ - public VoidBricks() { - super(Material.ROCK); - setUnlocalizedName("VoidBricks"); - setRegistryName("void_bricks"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setSoundType(SoundType.STONE); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/VoidFurnace.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/VoidFurnace.java deleted file mode 100644 index 28d5a5c..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/VoidFurnace.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.misc; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.VoidFurnaceCode; - -import net.minecraft.creativetab.CreativeTabs; - -public class VoidFurnace extends VoidFurnaceCode { - public VoidFurnace() { - super(false); - setUnlocalizedName("VoidFurnace"); - setRegistryName("void_furnace"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.DECORATIONS); - setHarvestLevel("pickaxe", 0); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/VoidFurnaceLit.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/VoidFurnaceLit.java deleted file mode 100644 index c5c1092..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/VoidFurnaceLit.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.misc; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.VoidFurnaceCode; - -public class VoidFurnaceLit extends VoidFurnaceCode { - public VoidFurnaceLit() { - super(true); - setUnlocalizedName("VoidFurnaceLit"); - setRegistryName("lit_void_furnace"); - setHardness(5F); - setResistance(10F); - setHarvestLevel("pickaxe", 0); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/VoidStone.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/VoidStone.java deleted file mode 100644 index f250da8..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/VoidStone.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.misc; -import net.minecraft.block.Block; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -public class VoidStone extends Block{ - public VoidStone() { - super(Material.ROCK); - setUnlocalizedName("VoidStone"); - setRegistryName("void_stone"); - setHardness(5F); - setResistance(15F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/bulletproofGlass.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/bulletproofGlass.java deleted file mode 100644 index 099fa15..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/bulletproofGlass.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.misc; - -import com.NetherNoah.ParadiseMod.init.ModBlocks.Misc; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockBreakable; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public class bulletproofGlass extends BlockBreakable { - public bulletproofGlass() { - super(Material.GLASS, true); - setUnlocalizedName("bulletProofGlass"); - setRegistryName("bulletproof_glass"); - setHardness(.5F); - setResistance(2000F); - setSoundType(SoundType.GLASS); - setDefaultSlipperiness(1F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - } - @Override - public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos,EnumFacing side) { - IBlockState iblockstate = blockAccess.getBlockState(pos.offset(side)); - Block block = iblockstate.getBlock(); - - if (this == Misc.bulletproofGlass) - { - if (blockState != iblockstate) - { - return true; - } - if (block == this) - { - return false; - } - } - return true; - } - @Override - @SideOnly(Side.CLIENT) - public BlockRenderLayer getBlockLayer() { - return BlockRenderLayer.TRANSLUCENT; - } - @Override - protected boolean canSilkHarvest() { - return true; - } - @Override - public boolean isFullCube(IBlockState state) { - return false; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/glowingIce.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/glowingIce.java deleted file mode 100644 index deee7fc..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/glowingIce.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.misc; - -import net.minecraft.block.Block; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class glowingIce extends Block { - public glowingIce() { - super(Material.ICE); - setUnlocalizedName("glowingIce"); - setRegistryName("glowing_ice"); - setHardness(.2F); - setResistance(2F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setHarvestLevel("pickaxe",0); - setLightLevel(.46666667F); - setSoundType(SoundType.GLASS); - setDefaultSlipperiness(1F); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/glowingObsidian.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/glowingObsidian.java deleted file mode 100644 index 9d58706..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/glowingObsidian.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.misc; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class glowingObsidian extends Block { - public glowingObsidian() { - super(Material.BARRIER); - setUnlocalizedName("glowingObsidian"); - setRegistryName("glowing_obsidian"); - setHardness(51F); - setResistance(2000F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setHarvestLevel("pickaxe",3); - setLightLevel(.46666667F); - } - @Override - public boolean isBeaconBase(IBlockAccess worldObj, BlockPos pos, BlockPos beacon) - { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/soulGlassPane.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/soulGlassPane.java deleted file mode 100644 index 06823cc..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/soulGlassPane.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.misc; - -import net.minecraft.block.BlockPane; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.util.BlockRenderLayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public class soulGlassPane extends BlockPane { - public soulGlassPane() { - super(Material.GLASS, false); - setUnlocalizedName("soulGlassPane"); - setRegistryName("soul_glass_pane"); - setHardness(.5F); - setResistance(1F); - setLightLevel(1F); - setSoundType(SoundType.GLASS); - setDefaultSlipperiness(1F); - } - @Override - @SideOnly(Side.CLIENT) - public BlockRenderLayer getBlockLayer() { - return BlockRenderLayer.TRANSLUCENT; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/EnderPearlOre.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/EnderPearlOre.java deleted file mode 100644 index c31b54b..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/EnderPearlOre.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.ores; - -import java.util.Random; - -import com.NetherNoah.ParadiseMod.init.ModBlocks.Ores; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; - -public class EnderPearlOre extends Block { - private Item drop; - private int meta; - private int least_quantity; - private int most_quantity; - public EnderPearlOre() { - super(Material.ROCK); - setUnlocalizedName("EndPearlOre"); - setRegistryName("ender_pearl_ore"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setHarvestLevel("pickaxe", 2); - } - @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) - { - return new ItemStack(Ores.EnderPearlOre); - } - // get item to drop - @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Items.ENDER_PEARL; - } - // get amount of items to drop - @Override - public int quantityDropped(Random random) { - return 1; - } - // is the pick enchanted with fortune? - @Override - public int quantityDroppedWithBonus(int fortune, Random random) { - if (fortune > 0 && Item.getItemFromBlock(this) != this - .getItemDropped(this.getBlockState().getValidStates().iterator().next(), random, fortune)) { - int i = random.nextInt(fortune + 2) - 1; - - if (i < 0) { - i = 0; - } - return this.quantityDropped(random) * (i + 1); - } else { - return this.quantityDropped(random); - } - } - // spawn the item in the world - @Override - public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune) { - super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune); - } - // spawn xp orbs - @Override - public int getExpDrop(IBlockState state, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune) { - Random rand = world instanceof World ? ((World) world).rand : new Random(); - if (this.getItemDropped(state, rand, fortune) != Item.getItemFromBlock(this)) { - int i = 0; - i = MathHelper.getInt(rand, 0, 5); - return i; - } - return 0; - } - // spawn the actual item - @Override - public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Items.ENDER_PEARL); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/GoldOreNether.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/GoldOreNether.java deleted file mode 100644 index f358146..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/GoldOreNether.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.ores; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class GoldOreNether extends Block { - public GoldOreNether() { - super(Material.ROCK); - setUnlocalizedName("NetherGoldOre"); - setRegistryName("nether_gold_ore"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setHarvestLevel("pickaxe", 2); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/GoldOreVoid.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/GoldOreVoid.java deleted file mode 100644 index cb8a005..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/GoldOreVoid.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.ores; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class GoldOreVoid extends Block { - public GoldOreVoid() { - super(Material.ROCK); - setUnlocalizedName("VoidGoldOre"); - setRegistryName("void_gold_ore"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setHarvestLevel("pickaxe", 2); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/IronOreVoid.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/IronOreVoid.java deleted file mode 100644 index d282a74..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/IronOreVoid.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.ores; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class IronOreVoid extends Block { - public IronOreVoid() { - super(Material.ROCK); - setUnlocalizedName("VoidIronOre"); - setRegistryName("void_iron_ore"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setHarvestLevel("pickaxe", 1); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/RubyOre.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/RubyOre.java deleted file mode 100644 index 55b0cb9..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/RubyOre.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.ores; - -import java.util.Random; - -import com.NetherNoah.ParadiseMod.init.ModBlocks.Ores; -import com.NetherNoah.ParadiseMod.init.ModItems.MiscItems; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; - -public class RubyOre extends Block { - private Item drop; - private int meta; - private int least_quantity; - private int most_quantity; - public RubyOre() { - super(Material.ROCK); - setUnlocalizedName("RubyOre"); - setRegistryName("ruby_ore"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setHarvestLevel("pickaxe", 2); - } - @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) - { - return new ItemStack(Ores.RubyOre); - } - // get item to drop - @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return MiscItems.Ruby; - } - // get amount of items to drop - @Override - public int quantityDropped(Random random) { - return 1; - } - // is the pick enchanted with fortune? - @Override - public int quantityDroppedWithBonus(int fortune, Random random) { - if (fortune > 0 && Item.getItemFromBlock(this) != this - .getItemDropped(this.getBlockState().getValidStates().iterator().next(), random, fortune)) { - int i = random.nextInt(fortune + 2) - 1; - - if (i < 0) { - i = 0; - } - return this.quantityDropped(random) * (i + 1); - } else { - return this.quantityDropped(random); - } - } - // spawn the item in the world - @Override - public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune) { - super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune); - } - // spawn xp orbs - @Override - public int getExpDrop(IBlockState state, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune) { - Random rand = world instanceof World ? ((World) world).rand : new Random(); - if (this.getItemDropped(state, rand, fortune) != Item.getItemFromBlock(this)) { - int i = 0; - i = MathHelper.getInt(rand, 0, 5); - return i; - } - return 0; - } - // spawn the actual item - @Override - public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(MiscItems.Ruby); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/RubyOreEnd.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/RubyOreEnd.java deleted file mode 100644 index 4132d20..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/RubyOreEnd.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.ores; - -import java.util.Random; - -import com.NetherNoah.ParadiseMod.init.ModBlocks.Ores; -import com.NetherNoah.ParadiseMod.init.ModItems.MiscItems; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; - -public class RubyOreEnd extends Block { - private Item drop; - private int meta; - private int least_quantity; - private int most_quantity; - public RubyOreEnd() { - super(Material.ROCK); - setUnlocalizedName("EndRubyOre"); - setRegistryName("ender_ruby_ore"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setHarvestLevel("pickaxe", 2); - } - @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) - { - return new ItemStack(Ores.EndRubyOre); - } - // get item to drop - @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return MiscItems.Ruby; - } - // get amount of items to drop - @Override - public int quantityDropped(Random random) { - return 1; - } - // is the pick enchanted with fortune? - @Override - public int quantityDroppedWithBonus(int fortune, Random random) { - if (fortune > 0 && Item.getItemFromBlock(this) != this - .getItemDropped(this.getBlockState().getValidStates().iterator().next(), random, fortune)) { - int i = random.nextInt(fortune + 2) - 1; - - if (i < 0) { - i = 0; - } - return this.quantityDropped(random) * (i + 1); - } else { - return this.quantityDropped(random); - } - } - // spawn the item in the world - @Override - public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune) { - super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune); - } - // spawn xp orbs - @Override - public int getExpDrop(IBlockState state, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune) { - Random rand = world instanceof World ? ((World) world).rand : new Random(); - if (this.getItemDropped(state, rand, fortune) != Item.getItemFromBlock(this)) { - int i = 0; - i = MathHelper.getInt(rand, 0, 5); - return i; - } - return 0; - } - // spawn the actual item - @Override - public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(MiscItems.Ruby); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/SaltOre.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/SaltOre.java deleted file mode 100644 index 7a77ae7..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/SaltOre.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.ores; - -import java.util.Random; - -import com.NetherNoah.ParadiseMod.init.ModBlocks.Ores; -import com.NetherNoah.ParadiseMod.init.ModItems.MiscItems; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; - -public class SaltOre extends Block { - private Item drop; - private int meta; - private int least_quantity; - private int most_quantity; - public SaltOre() { - super(Material.ROCK); - setUnlocalizedName("SaltOre"); - setRegistryName("salt_ore"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setHarvestLevel("pickaxe", 0); - } - @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) - { - return new ItemStack(Ores.SaltOre); - } - // get item to drop - @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return MiscItems.salt; - } - // get amount of items to drop - @Override - public int quantityDropped(Random random) { - return 4 + random.nextInt(2); - } - // is the pick enchanted with fortune? - @Override - public int quantityDroppedWithBonus(int fortune, Random random) { - return this.quantityDropped(random)+random.nextInt(fortune+1); - } - // spawn the item in the world - @Override - public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune) { - super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune); - } - // spawn xp orbs - @Override - public int getExpDrop(IBlockState state, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune) { - Random rand = world instanceof World ? ((World) world).rand : new Random(); - if (this.getItemDropped(state, rand, fortune) != Item.getItemFromBlock(this)) { - int i = 0; - i = MathHelper.getInt(rand, 0, 5); - return i; - } - return 0; - } - // spawn the actual item - @Override - public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(MiscItems.salt); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/SilverOre.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/SilverOre.java deleted file mode 100644 index 0190eec..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/SilverOre.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.ores; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class SilverOre extends Block { - public SilverOre() { - super(Material.ROCK); - setUnlocalizedName("SilverOre"); - setRegistryName("silver_ore"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setHarvestLevel("pickaxe", 2); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/SilverOreNether.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/SilverOreNether.java deleted file mode 100644 index 0416f80..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/SilverOreNether.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.ores; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class SilverOreNether extends Block { - public SilverOreNether() { - super(Material.ROCK); - setUnlocalizedName("NetherSilverOre"); - setRegistryName("nether_silver_ore"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setHarvestLevel("pickaxe", 2); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/SilverOreVoid.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/SilverOreVoid.java deleted file mode 100644 index d587d40..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/SilverOreVoid.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.ores; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class SilverOreVoid extends Block { - public SilverOreVoid() { - super(Material.ROCK); - setUnlocalizedName("VoidSilverOre"); - setRegistryName("void_silver_ore"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setHarvestLevel("pickaxe", 2); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/VoidPearlOre.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/VoidPearlOre.java deleted file mode 100644 index fc8460d..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/ores/VoidPearlOre.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.ores; - -import java.util.Random; - -import com.NetherNoah.ParadiseMod.init.ModBlocks.Ores; -import com.NetherNoah.ParadiseMod.init.ModItems.MiscItems; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; - -public class VoidPearlOre extends Block { - private Item drop; - private int meta; - private int least_quantity; - private int most_quantity; - public VoidPearlOre() { - super(Material.ROCK); - setUnlocalizedName("VoidPearlOre"); - setRegistryName("void_pearl_ore"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setHarvestLevel("pickaxe", 2); - } - @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) - { - return new ItemStack(Ores.VoidPearlOre); - } - // get item to drop - @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return MiscItems.VoidPearl; - } - // get amount of items to drop - @Override - public int quantityDropped(Random random) { - return 1; - } - // is the pick enchanted with fortune? - @Override - public int quantityDroppedWithBonus(int fortune, Random random) { - if (fortune > 0 && Item.getItemFromBlock(this) != this - .getItemDropped(this.getBlockState().getValidStates().iterator().next(), random, fortune)) { - int i = random.nextInt(fortune + 2) - 1; - - if (i < 0) { - i = 0; - } - return this.quantityDropped(random) * (i + 1); - } else { - return this.quantityDropped(random); - } - } - //spawn the item in the world - @Override - public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune) { - super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune); - } - //spawn xp orbs - @Override - public int getExpDrop(IBlockState state, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune) { - Random rand = world instanceof World ? ((World) world).rand : new Random(); - if (this.getItemDropped(state, rand, fortune) != Item.getItemFromBlock(this)) { - int i = 0; - i = MathHelper.getInt(rand, 0, 5); - return i; - } - return 0; - } - //spawn the actual item - @Override - public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(MiscItems.VoidPearl); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/BedrockPlate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/BedrockPlate.java deleted file mode 100644 index bb183c0..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/BedrockPlate.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.pressurePlates; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.pressurePlates.BedrockPlateCode; - -import net.minecraft.block.material.Material; - -public class BedrockPlate extends BedrockPlateCode { - public BedrockPlate() { - super(Material.ROCK, BedrockPlateCode.Sensitivity.PLAYER); - setUnlocalizedName("BedrockPlate"); - setRegistryName("bedrock_pressure_plate"); - setHardness(-1F); - setResistance(6000000F); - setBlockUnbreakable(); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/CobblestonePlate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/CobblestonePlate.java deleted file mode 100644 index 086ad93..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/CobblestonePlate.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.pressurePlates; - -import net.minecraft.block.BlockPressurePlate; -import net.minecraft.block.material.Material; - -public class CobblestonePlate extends BlockPressurePlate { - public CobblestonePlate() { - super(Material.ROCK, BlockPressurePlate.Sensitivity.MOBS); - setUnlocalizedName("CobblestonePlate"); - setRegistryName("cobblestone_pressure_plate"); - setHardness(0.5F); - setHarvestLevel("pickaxe", 0); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/DiamondPlate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/DiamondPlate.java deleted file mode 100644 index 36c3207..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/DiamondPlate.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.pressurePlates; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.pressurePlates.DiamondPlateCode; - -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; - -public class DiamondPlate extends DiamondPlateCode { - public DiamondPlate() { - super(Material.WOOD, DiamondPlateCode.Sensitivity.EVERYTHING); - setUnlocalizedName("DiamondPlate"); - setRegistryName("diamond_pressure_plate"); - setHardness(0.5F); - setSoundType(SoundType.METAL); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/DirtPlate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/DirtPlate.java deleted file mode 100644 index 461a9f3..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/DirtPlate.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.pressurePlates; - -import net.minecraft.block.BlockPressurePlate; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; - -public class DirtPlate extends BlockPressurePlate { - public DirtPlate() { - super(Material.GROUND, BlockPressurePlate.Sensitivity.EVERYTHING); - setUnlocalizedName("DirtPlate"); - setRegistryName("dirt_pressure_plate"); - setSoundType(SoundType.GROUND); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/EmeraldPlate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/EmeraldPlate.java deleted file mode 100644 index 5a4ec17..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/EmeraldPlate.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.pressurePlates; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.pressurePlates.EmeraldPlateCode; - -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; - -public class EmeraldPlate extends EmeraldPlateCode { - public EmeraldPlate() { - super(Material.WOOD, EmeraldPlateCode.Sensitivity.EVERYTHING); - setUnlocalizedName("EmeraldPlate"); - setRegistryName("emerald_pressure_plate"); - setHardness(0.5F); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 2); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/EndPlate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/EndPlate.java deleted file mode 100644 index 552f51e..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/EndPlate.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.pressurePlates; - -import net.minecraft.block.BlockPressurePlate; -import net.minecraft.block.material.Material; - -public class EndPlate extends BlockPressurePlate { - public EndPlate() { - super(Material.ROCK, BlockPressurePlate.Sensitivity.MOBS); - setUnlocalizedName("EndPlate"); - setRegistryName("end_pressure_plate"); - setHardness(0.5F); - setHarvestLevel("pickaxe", 0); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/GlowingObsidianPlate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/GlowingObsidianPlate.java deleted file mode 100644 index d6155d9..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/GlowingObsidianPlate.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.pressurePlates; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.pressurePlates.BedrockPlateCode; - -import net.minecraft.block.material.Material; - -public class GlowingObsidianPlate extends BedrockPlateCode { - public GlowingObsidianPlate() { - super(Material.ROCK, BedrockPlateCode.Sensitivity.PLAYER); - setUnlocalizedName("GlowingObsidianPlate"); - setRegistryName("glowing_obsidian_pressure_plate"); - setHardness(51F); - setResistance(2000F); - setLightLevel(.46666667F); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/GrassPlate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/GrassPlate.java deleted file mode 100644 index 5eef2fd..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/GrassPlate.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.pressurePlates; - -import net.minecraft.block.BlockPressurePlate; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; - -public class GrassPlate extends BlockPressurePlate { - public GrassPlate() { - super(Material.GRASS, BlockPressurePlate.Sensitivity.EVERYTHING); - setUnlocalizedName("GrassPlate"); - setRegistryName("grass_pressure_plate"); - setSoundType(SoundType.PLANT); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/MossyPlate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/MossyPlate.java deleted file mode 100644 index 1875843..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/MossyPlate.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.pressurePlates; - -import net.minecraft.block.BlockPressurePlate; -import net.minecraft.block.material.Material; - -public class MossyPlate extends BlockPressurePlate { - public MossyPlate() { - super(Material.ROCK, BlockPressurePlate.Sensitivity.MOBS); - setUnlocalizedName("MossyPlate"); - setRegistryName("mossy_cobblestone_pressure_plate"); - setHardness(0.5F); - setHarvestLevel("pickaxe", 0); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/RubyPlate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/RubyPlate.java deleted file mode 100644 index 61f1a80..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/RubyPlate.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.pressurePlates; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.RubyPlateCode; - -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; - -public class RubyPlate extends RubyPlateCode { - public RubyPlate() { - super(Material.WOOD, RubyPlateCode.Sensitivity.EVERYTHING); - setUnlocalizedName("RubyPlate"); - setRegistryName("ruby_pressure_plate"); - setHardness(0.5F); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 2); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/RustyPlate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/RustyPlate.java deleted file mode 100644 index e5e8c19..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/RustyPlate.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.pressurePlates; - -import net.minecraft.block.BlockPressurePlate; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; - -public class RustyPlate extends BlockPressurePlate { - public RustyPlate() { - super(Material.WOOD, BlockPressurePlate.Sensitivity.EVERYTHING); - setUnlocalizedName("RustyPlate"); - setRegistryName("rusty_pressure_plate"); - setHardness(0.5F); - setSoundType(SoundType.METAL); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/SilverPlate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/SilverPlate.java deleted file mode 100644 index 732fd79..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/SilverPlate.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.pressurePlates; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.RubyPlateCode; - -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; - -public class SilverPlate extends RubyPlateCode { - public SilverPlate() { - super(Material.WOOD, RubyPlateCode.Sensitivity.EVERYTHING); - setUnlocalizedName("SilverPlate"); - setRegistryName("silver_pressure_plate"); - setHardness(0.5F); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 2); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/VoidPlate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/VoidPlate.java deleted file mode 100644 index da83b94..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/VoidPlate.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.pressurePlates; - -import net.minecraft.block.BlockPressurePlate; -import net.minecraft.block.material.Material; - -public class VoidPlate extends BlockPressurePlate { - public VoidPlate() { - super(Material.ROCK, BlockPressurePlate.Sensitivity.MOBS); - setUnlocalizedName("VoidPlate"); - setRegistryName("void_pressure_plate"); - setHardness(0.5F); - setHarvestLevel("pickaxe", 0); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/stoneVariants/AndesitePlate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/stoneVariants/AndesitePlate.java deleted file mode 100644 index d512935..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/stoneVariants/AndesitePlate.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.pressurePlates.stoneVariants; - -import net.minecraft.block.BlockPressurePlate; -import net.minecraft.block.material.Material; - -public class AndesitePlate extends BlockPressurePlate { - public AndesitePlate() { - super(Material.ROCK, BlockPressurePlate.Sensitivity.MOBS); - setUnlocalizedName("AndesitePlate"); - setRegistryName("andesite_pressure_plate"); - setHardness(0.5F); - setHarvestLevel("pickaxe", 0); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/stoneVariants/DioritePlate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/stoneVariants/DioritePlate.java deleted file mode 100644 index 4eeabeb..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/stoneVariants/DioritePlate.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.pressurePlates.stoneVariants; - -import net.minecraft.block.BlockPressurePlate; -import net.minecraft.block.material.Material; - -public class DioritePlate extends BlockPressurePlate { - public DioritePlate() { - super(Material.ROCK, BlockPressurePlate.Sensitivity.MOBS); - setUnlocalizedName("DioritePlate"); - setRegistryName("diorite_pressure_plate"); - setHardness(0.5F); - setHarvestLevel("pickaxe", 0); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/stoneVariants/GranitePlate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/stoneVariants/GranitePlate.java deleted file mode 100644 index 7ff5675..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/stoneVariants/GranitePlate.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.pressurePlates.stoneVariants; - -import net.minecraft.block.BlockPressurePlate; -import net.minecraft.block.material.Material; - -public class GranitePlate extends BlockPressurePlate { - public GranitePlate() { - super(Material.ROCK, BlockPressurePlate.Sensitivity.MOBS); - setUnlocalizedName("GranitePlate"); - setRegistryName("granite_pressure_plate"); - setHardness(0.5F); - setHarvestLevel("pickaxe", 0); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/wood/AcaciaPlate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/wood/AcaciaPlate.java deleted file mode 100644 index a728dfa..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/wood/AcaciaPlate.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.pressurePlates.wood; - -import net.minecraft.block.BlockPressurePlate; -import net.minecraft.block.material.Material; - -public class AcaciaPlate extends BlockPressurePlate { - public AcaciaPlate() { - super(Material.WOOD, BlockPressurePlate.Sensitivity.EVERYTHING); - setUnlocalizedName("AcaciaPlate"); - setRegistryName("acacia_pressure_plate"); - setHardness(0.5F); - setSoundType(blockSoundType.WOOD); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/wood/BirchPlate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/wood/BirchPlate.java deleted file mode 100644 index 19ed24a..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/wood/BirchPlate.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.pressurePlates.wood; - -import net.minecraft.block.BlockPressurePlate; -import net.minecraft.block.material.Material; - -public class BirchPlate extends BlockPressurePlate { - public BirchPlate() { - super(Material.WOOD, BlockPressurePlate.Sensitivity.EVERYTHING); - setUnlocalizedName("BirchPlate"); - setRegistryName("birch_pressure_plate"); - setHardness(0.5F); - setSoundType(blockSoundType.WOOD); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/wood/CactusPlate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/wood/CactusPlate.java deleted file mode 100644 index 3a3b2e8..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/wood/CactusPlate.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.pressurePlates.wood; - -import net.minecraft.block.BlockPressurePlate; -import net.minecraft.block.material.Material; - -public class CactusPlate extends BlockPressurePlate { - public CactusPlate() { - super(Material.WOOD, BlockPressurePlate.Sensitivity.EVERYTHING); - setUnlocalizedName("CactusPlate"); - setRegistryName("cactus_pressure_plate"); - setHardness(0.5F); - setSoundType(blockSoundType.WOOD); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/wood/DarkOakPlate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/wood/DarkOakPlate.java deleted file mode 100644 index 95806e7..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/wood/DarkOakPlate.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.pressurePlates.wood; - -import net.minecraft.block.BlockPressurePlate; -import net.minecraft.block.material.Material; - -public class DarkOakPlate extends BlockPressurePlate { - public DarkOakPlate() { - super(Material.WOOD, BlockPressurePlate.Sensitivity.EVERYTHING); - setUnlocalizedName("DarkOakPlate"); - setRegistryName("dark_oak_pressure_plate"); - setHardness(0.5F); - setSoundType(blockSoundType.WOOD); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/wood/JunglePlate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/wood/JunglePlate.java deleted file mode 100644 index 48bc60e..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/wood/JunglePlate.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.pressurePlates.wood; - -import net.minecraft.block.BlockPressurePlate; -import net.minecraft.block.material.Material; - -public class JunglePlate extends BlockPressurePlate { - public JunglePlate() { - super(Material.WOOD, BlockPressurePlate.Sensitivity.EVERYTHING); - setUnlocalizedName("JunglePlate"); - setRegistryName("jungle_pressure_plate"); - setHardness(0.5F); - setSoundType(blockSoundType.WOOD); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/wood/SprucePlate.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/wood/SprucePlate.java deleted file mode 100644 index 9f951e8..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/pressurePlates/wood/SprucePlate.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.pressurePlates.wood; - -import net.minecraft.block.BlockPressurePlate; -import net.minecraft.block.material.Material; - -public class SprucePlate extends BlockPressurePlate { - public SprucePlate() { - super(Material.WOOD, BlockPressurePlate.Sensitivity.EVERYTHING); - setUnlocalizedName("SprucePlate"); - setRegistryName("spruce_pressure_plate"); - setHardness(0.5F); - setSoundType(blockSoundType.WOOD); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/BlackRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/BlackRSLamp.java index 1e40435..91d5ce9 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/BlackRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/BlackRSLamp.java @@ -28,7 +28,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitBlackRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitBlackLamp.getDefaultState(), 2); } } } @@ -39,18 +39,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitBlackRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitBlackLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.BlackRSLamp); + return Item.getItemFromBlock(Lamps.BlackLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.BlackRSLamp); + return new ItemStack(Lamps.BlackLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/BlueRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/BlueRSLamp.java index 3f1391a..d673b83 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/BlueRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/BlueRSLamp.java @@ -28,7 +28,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitBlueRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitBlueLamp.getDefaultState(), 2); } } } @@ -39,18 +39,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitBlueRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitBlueLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.BlueRSLamp); + return Item.getItemFromBlock(Lamps.BlueLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.BlueRSLamp); + return new ItemStack(Lamps.BlueLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/BrownRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/BrownRSLamp.java index 7a521e8..1666c3a 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/BrownRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/BrownRSLamp.java @@ -28,7 +28,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitBrownRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitBrownLamp.getDefaultState(), 2); } } } @@ -39,18 +39,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitBrownRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitBrownLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.BrownRSLamp); + return Item.getItemFromBlock(Lamps.BrownLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.BrownRSLamp); + return new ItemStack(Lamps.BrownLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/CyanRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/CyanRSLamp.java index 353d285..c0b031a 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/CyanRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/CyanRSLamp.java @@ -28,7 +28,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitCyanRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitCyanLamp.getDefaultState(), 2); } } } @@ -39,18 +39,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitCyanRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitCyanLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.CyanRSLamp); + return Item.getItemFromBlock(Lamps.CyanLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.CyanRSLamp); + return new ItemStack(Lamps.CyanLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/GrayRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/GrayRSLamp.java index ed981bb..aaeb351 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/GrayRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/GrayRSLamp.java @@ -28,7 +28,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitGrayRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitGrayLamp.getDefaultState(), 2); } } } @@ -39,18 +39,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitGrayRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitGrayLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.GrayRSLamp); + return Item.getItemFromBlock(Lamps.GrayLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.GrayRSLamp); + return new ItemStack(Lamps.GrayLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/GreenRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/GreenRSLamp.java index a4e4f37..33ac0ed 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/GreenRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/GreenRSLamp.java @@ -28,7 +28,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitGreenRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitGreenLamp.getDefaultState(), 2); } } } @@ -39,18 +39,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitGreenRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitGreenLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.GreenRSLamp); + return Item.getItemFromBlock(Lamps.GreenLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.GreenRSLamp); + return new ItemStack(Lamps.GreenLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/LightBlueRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/LightBlueRSLamp.java index 7a62253..1f6641f 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/LightBlueRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/LightBlueRSLamp.java @@ -28,7 +28,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitLightBlueRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitLightBlueLamp.getDefaultState(), 2); } } } @@ -39,18 +39,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitLightBlueRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitLightBlueLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.LightBlueRSLamp); + return Item.getItemFromBlock(Lamps.LightBlueLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.LightBlueRSLamp); + return new ItemStack(Lamps.LightBlueLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/LimeRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/LimeRSLamp.java index 8a752ef..8bd5a86 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/LimeRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/LimeRSLamp.java @@ -28,7 +28,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitLimeRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitLimeLamp.getDefaultState(), 2); } } } @@ -39,18 +39,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitLimeRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitLimeLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.LimeRSLamp); + return Item.getItemFromBlock(Lamps.LimeLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.LimeRSLamp); + return new ItemStack(Lamps.LimeLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/MagentaRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/MagentaRSLamp.java index c1cfbbf..f45497a 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/MagentaRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/MagentaRSLamp.java @@ -28,7 +28,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitMagentaRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitMagentaLamp.getDefaultState(), 2); } } } @@ -39,18 +39,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitMagentaRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitMagentaLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.MagentaRSLamp); + return Item.getItemFromBlock(Lamps.MagentaLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.MagentaRSLamp); + return new ItemStack(Lamps.MagentaLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/OrangeRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/OrangeRSLamp.java index 5b95bb8..f84637f 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/OrangeRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/OrangeRSLamp.java @@ -28,7 +28,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitOrangeRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitOrangeLamp.getDefaultState(), 2); } } } @@ -39,18 +39,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitOrangeRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitOrangeLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.OrangeRSLamp); + return Item.getItemFromBlock(Lamps.OrangeLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.OrangeRSLamp); + return new ItemStack(Lamps.OrangeLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/PinkRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/PinkRSLamp.java index 4b14a06..dddb8f4 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/PinkRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/PinkRSLamp.java @@ -28,7 +28,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitPinkRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitPinkLamp.getDefaultState(), 2); } } } @@ -39,18 +39,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitPinkRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitPinkLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.PinkRSLamp); + return Item.getItemFromBlock(Lamps.PinkLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.PinkRSLamp); + return new ItemStack(Lamps.PinkLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/PurpleRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/PurpleRSLamp.java index 36ad18e..df950c8 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/PurpleRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/PurpleRSLamp.java @@ -28,7 +28,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitPurpleRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitPurpleLamp.getDefaultState(), 2); } } } @@ -39,18 +39,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitPurpleRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitPurpleLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.PurpleRSLamp); + return Item.getItemFromBlock(Lamps.PurpleLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.PurpleRSLamp); + return new ItemStack(Lamps.PurpleLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/RedRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/RedRSLamp.java index 374ce41..78efa60 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/RedRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/RedRSLamp.java @@ -28,14 +28,14 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitRedRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitRedLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.RedRSLamp); + return Item.getItemFromBlock(Lamps.RedLamp); } @Override public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos) @@ -44,13 +44,13 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitRedRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitRedLamp.getDefaultState(), 2); } } } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.RedRSLamp); + return new ItemStack(Lamps.RedLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/SilverRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/SilverRSLamp.java index a508f97..2b9c0b9 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/SilverRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/SilverRSLamp.java @@ -28,14 +28,14 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitSilverRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitSilverLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.SilverRSLamp); + return Item.getItemFromBlock(Lamps.SilverLamp); } @Override public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos) @@ -44,13 +44,13 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitSilverRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitSilverLamp.getDefaultState(), 2); } } } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.SilverRSLamp); + return new ItemStack(Lamps.SilverLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/WhiteRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/WhiteRSLamp.java index 5c6cbc9..c6d5d49 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/WhiteRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/WhiteRSLamp.java @@ -28,7 +28,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitWhiteRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitWhiteLamp.getDefaultState(), 2); } } } @@ -39,18 +39,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitWhiteRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitWhiteLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.WhiteRSLamp); + return Item.getItemFromBlock(Lamps.WhiteLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.WhiteRSLamp); + return new ItemStack(Lamps.WhiteLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/YellowRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/YellowRSLamp.java index b705816..e4e74e0 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/YellowRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/YellowRSLamp.java @@ -28,7 +28,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitYellowRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitYellowLamp.getDefaultState(), 2); } } } @@ -39,18 +39,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LitYellowRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LitYellowLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.YellowRSLamp); + return Item.getItemFromBlock(Lamps.YellowLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.YellowRSLamp); + return new ItemStack(Lamps.YellowLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitBlackRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitBlackRSLamp.java index c981f36..97ab863 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitBlackRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitBlackRSLamp.java @@ -28,7 +28,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.BlackRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.BlackLamp.getDefaultState(), 2); } } } @@ -36,7 +36,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { if (!worldIn.isRemote) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.BlackRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.BlackLamp.getDefaultState(), 2); } } } @@ -44,18 +44,18 @@ public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random ra public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos) { if (!worldIn.isRemote) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.BlackRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.BlackLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.BlackRSLamp); + return Item.getItemFromBlock(Lamps.BlackLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.BlackRSLamp); + return new ItemStack(Lamps.BlackLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitBlueRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitBlueRSLamp.java index afdda81..1568960 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitBlueRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitBlueRSLamp.java @@ -27,7 +27,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.BlueRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.BlueLamp.getDefaultState(), 2); } } } @@ -35,7 +35,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { if (!worldIn.isRemote) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.BlueRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.BlueLamp.getDefaultState(), 2); } } } @@ -46,18 +46,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.BlueRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.BlueLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.BlueRSLamp); + return Item.getItemFromBlock(Lamps.BlueLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.BlueRSLamp); + return new ItemStack(Lamps.BlueLamp); } } diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitBrownRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitBrownRSLamp.java index 14c6b68..5efabf7 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitBrownRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitBrownRSLamp.java @@ -24,7 +24,7 @@ public LitBrownRSLamp() { public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { if (!worldIn.isRemote) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.BrownRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.BrownLamp.getDefaultState(), 2); } } } @@ -35,7 +35,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.BrownRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.BrownLamp.getDefaultState(), 2); } } } @@ -46,18 +46,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.BrownRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.BrownLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.BrownRSLamp); + return Item.getItemFromBlock(Lamps.BrownLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.BrownRSLamp); + return new ItemStack(Lamps.BrownLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitCyanRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitCyanRSLamp.java index 03028ff..8f149c4 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitCyanRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitCyanRSLamp.java @@ -24,7 +24,7 @@ public LitCyanRSLamp() { public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { if (!worldIn.isRemote) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.CyanRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.CyanLamp.getDefaultState(), 2); } } } @@ -35,7 +35,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.CyanRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.CyanLamp.getDefaultState(), 2); } } } @@ -46,18 +46,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.CyanRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.CyanLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.CyanRSLamp); + return Item.getItemFromBlock(Lamps.CyanLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.CyanRSLamp); + return new ItemStack(Lamps.CyanLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitGrayRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitGrayRSLamp.java index 52db1d1..a98ace5 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitGrayRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitGrayRSLamp.java @@ -24,7 +24,7 @@ public LitGrayRSLamp() { public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { if (!worldIn.isRemote) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.GrayRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.GrayLamp.getDefaultState(), 2); } } } @@ -35,7 +35,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.GrayRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.GrayLamp.getDefaultState(), 2); } } } @@ -46,18 +46,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.GrayRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.GrayLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.GrayRSLamp); + return Item.getItemFromBlock(Lamps.GrayLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.GrayRSLamp); + return new ItemStack(Lamps.GrayLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitGreenRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitGreenRSLamp.java index 26332e2..9bb8cd5 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitGreenRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitGreenRSLamp.java @@ -24,7 +24,7 @@ public LitGreenRSLamp() { public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { if (!worldIn.isRemote) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.GreenRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.GreenLamp.getDefaultState(), 2); } } } @@ -35,7 +35,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.GreenRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.GreenLamp.getDefaultState(), 2); } } } @@ -46,18 +46,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.GreenRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.GreenLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.WhiteRSLamp); + return Item.getItemFromBlock(Lamps.WhiteLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.GreenRSLamp); + return new ItemStack(Lamps.GreenLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitLightBlueRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitLightBlueRSLamp.java index f3075a7..7571512 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitLightBlueRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitLightBlueRSLamp.java @@ -23,7 +23,7 @@ public LitLightBlueRSLamp() { public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { if (!worldIn.isRemote) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LightBlueRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LightBlueLamp.getDefaultState(), 2); } } } @@ -34,7 +34,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LightBlueRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LightBlueLamp.getDefaultState(), 2); } } } @@ -45,13 +45,13 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LightBlueRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LightBlueLamp.getDefaultState(), 2); } } } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.LightBlueRSLamp); + return new ItemStack(Lamps.LightBlueLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitLimeRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitLimeRSLamp.java index 2c1260d..f39a957 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitLimeRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitLimeRSLamp.java @@ -24,7 +24,7 @@ public LitLimeRSLamp() { public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { if (!worldIn.isRemote) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LimeRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LimeLamp.getDefaultState(), 2); } } } @@ -35,7 +35,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LimeRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LimeLamp.getDefaultState(), 2); } } } @@ -47,18 +47,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.LimeRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.LimeLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.LightBlueRSLamp); + return Item.getItemFromBlock(Lamps.LightBlueLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.LimeRSLamp); + return new ItemStack(Lamps.LimeLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitMagentaRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitMagentaRSLamp.java index 4ba80f7..6f7268c 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitMagentaRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitMagentaRSLamp.java @@ -24,7 +24,7 @@ public LitMagentaRSLamp() { public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { if (!worldIn.isRemote) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.MagentaRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.MagentaLamp.getDefaultState(), 2); } } } @@ -35,7 +35,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.MagentaRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.MagentaLamp.getDefaultState(), 2); } } } @@ -47,18 +47,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.MagentaRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.MagentaLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.MagentaRSLamp); + return Item.getItemFromBlock(Lamps.MagentaLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.MagentaRSLamp); + return new ItemStack(Lamps.MagentaLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitOrangeRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitOrangeRSLamp.java index 3061e56..1f801ec 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitOrangeRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitOrangeRSLamp.java @@ -24,7 +24,7 @@ public LitOrangeRSLamp() { public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { if (!worldIn.isRemote) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.OrangeRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.OrangeLamp.getDefaultState(), 2); } } } @@ -36,7 +36,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.OrangeRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.OrangeLamp.getDefaultState(), 2); } } } @@ -48,18 +48,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.OrangeRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.OrangeLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.OrangeRSLamp); + return Item.getItemFromBlock(Lamps.OrangeLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.OrangeRSLamp); + return new ItemStack(Lamps.OrangeLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitPinkRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitPinkRSLamp.java index 74f56a6..db9230d 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitPinkRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitPinkRSLamp.java @@ -24,7 +24,7 @@ public LitPinkRSLamp() { public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { if (!worldIn.isRemote) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.PinkRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.PinkLamp.getDefaultState(), 2); } } } @@ -35,7 +35,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.PinkRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.PinkLamp.getDefaultState(), 2); } } } @@ -47,18 +47,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.PinkRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.PinkLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.PinkRSLamp); + return Item.getItemFromBlock(Lamps.PinkLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.PinkRSLamp); + return new ItemStack(Lamps.PinkLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitPurpleRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitPurpleRSLamp.java index 9237043..980e03d 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitPurpleRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitPurpleRSLamp.java @@ -24,7 +24,7 @@ public LitPurpleRSLamp() { public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { if (!worldIn.isRemote) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.PurpleRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.PurpleLamp.getDefaultState(), 2); } } } @@ -35,7 +35,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.PurpleRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.PurpleLamp.getDefaultState(), 2); } } } @@ -47,18 +47,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.PurpleRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.PurpleLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.PurpleRSLamp); + return Item.getItemFromBlock(Lamps.PurpleLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.PurpleRSLamp); + return new ItemStack(Lamps.PurpleLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitRedRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitRedRSLamp.java index b16673d..673c223 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitRedRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitRedRSLamp.java @@ -24,7 +24,7 @@ public LitRedRSLamp() { public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { if (!worldIn.isRemote) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.RedRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.RedLamp.getDefaultState(), 2); } } } @@ -35,7 +35,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.RedRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.RedLamp.getDefaultState(), 2); } } } @@ -46,18 +46,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.RedRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.RedLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.RedRSLamp); + return Item.getItemFromBlock(Lamps.RedLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.RedRSLamp); + return new ItemStack(Lamps.RedLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitSilverRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitSilverRSLamp.java index 756e225..aa100f7 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitSilverRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitSilverRSLamp.java @@ -24,7 +24,7 @@ public LitSilverRSLamp() { public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { if (!worldIn.isRemote) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.SilverRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.SilverLamp.getDefaultState(), 2); } } } @@ -35,7 +35,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.SilverRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.SilverLamp.getDefaultState(), 2); } } } @@ -46,18 +46,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.SilverRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.SilverLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.SilverRSLamp); + return Item.getItemFromBlock(Lamps.SilverLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.SilverRSLamp); + return new ItemStack(Lamps.SilverLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitWhiteRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitWhiteRSLamp.java index de72549..c4b704c 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitWhiteRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitWhiteRSLamp.java @@ -24,7 +24,7 @@ public LitWhiteRSLamp() { public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { if (!worldIn.isRemote) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.WhiteRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.WhiteLamp.getDefaultState(), 2); } } } @@ -35,7 +35,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.WhiteRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.WhiteLamp.getDefaultState(), 2); } } } @@ -47,18 +47,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.WhiteRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.WhiteLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.WhiteRSLamp); + return Item.getItemFromBlock(Lamps.WhiteLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.WhiteRSLamp); + return new ItemStack(Lamps.WhiteLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitYellowRSLamp.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitYellowRSLamp.java index 39bdc94..39fb8ef 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitYellowRSLamp.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/redstone/lamps/lit/LitYellowRSLamp.java @@ -24,7 +24,7 @@ public LitYellowRSLamp() { public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { if (!worldIn.isRemote) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.YellowRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.YellowLamp.getDefaultState(), 2); } } } @@ -35,7 +35,7 @@ public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.YellowRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.YellowLamp.getDefaultState(), 2); } } } @@ -46,18 +46,18 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc { if (!worldIn.isBlockPowered(pos)) { - worldIn.setBlockState(pos, Lamps.YellowRSLamp.getDefaultState(), 2); + worldIn.setBlockState(pos, Lamps.YellowLamp.getDefaultState(), 2); } } } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Lamps.YellowRSLamp); + return Item.getItemFromBlock(Lamps.YellowLamp); } @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(Lamps.YellowRSLamp); + return new ItemStack(Lamps.YellowLamp); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/resourceBlocks/BlockRuby.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/resourceBlocks/BlockRuby.java deleted file mode 100644 index 98e7e75..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/resourceBlocks/BlockRuby.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.resourceBlocks; - -import net.minecraft.block.Block; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class BlockRuby extends Block { - public BlockRuby() { - super(Material.IRON); - setUnlocalizedName("BlockRuby"); - setRegistryName("ruby_block"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 2); - } - @Override - public boolean isBeaconBase(IBlockAccess worldObj, BlockPos pos, BlockPos beacon) - { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/resourceBlocks/BlockRustyIron.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/resourceBlocks/BlockRustyIron.java deleted file mode 100644 index eeefe7d..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/resourceBlocks/BlockRustyIron.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.resourceBlocks; - -import net.minecraft.block.Block; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class BlockRustyIron extends Block { - public BlockRustyIron() { - super(Material.IRON); - setUnlocalizedName("BlockRustyIron"); - setRegistryName("rusty_iron_block"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 1); - } - @Override - public boolean isBeaconBase(IBlockAccess worldObj, BlockPos pos, BlockPos beacon) - { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/resourceBlocks/SaltBlock.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/resourceBlocks/SaltBlock.java deleted file mode 100644 index fb3a6b8..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/resourceBlocks/SaltBlock.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.resourceBlocks; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -public class SaltBlock extends Block{ - public SaltBlock() { - super(Material.IRON); - setUnlocalizedName("SaltBlock"); - setRegistryName("salt_block"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setHarvestLevel("pickaxe", 0); - } - @Override - public boolean isBeaconBase(IBlockAccess worldObj, BlockPos pos, BlockPos beacon) - { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/resourceBlocks/SilverBlock.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/resourceBlocks/SilverBlock.java deleted file mode 100644 index d7249bc..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/resourceBlocks/SilverBlock.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.resourceBlocks; - -import net.minecraft.block.Block; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class SilverBlock extends Block { - public SilverBlock() { - super(Material.IRON); - setUnlocalizedName("SilverBlock"); - setRegistryName("silver_block"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 2); - } - @Override - public boolean isBeaconBase(IBlockAccess worldObj, BlockPos pos, BlockPos beacon) - { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/resourceBlocks/blazeBlock.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/resourceBlocks/blazeBlock.java deleted file mode 100644 index c9a3e2f..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/resourceBlocks/blazeBlock.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.resourceBlocks; -import net.minecraft.block.Block; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -public class blazeBlock extends Block{ - public blazeBlock() { - super(Material.IRON); - setUnlocalizedName("blazeBlock"); - setRegistryName("blaze_block"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 0); - setLightLevel(1F); - } - @Override - public boolean isBeaconBase(IBlockAccess worldObj, BlockPos pos, BlockPos beacon) - { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/resourceBlocks/endPearlBlock.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/resourceBlocks/endPearlBlock.java deleted file mode 100644 index 33b09c4..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/resourceBlocks/endPearlBlock.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.resourceBlocks; -import net.minecraft.block.Block; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -public class endPearlBlock extends Block{ - public endPearlBlock() { - super(Material.IRON); - setUnlocalizedName("endPearlBlock"); - setRegistryName("ender_pearl_block"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 0); - } - @Override - public boolean isBeaconBase(IBlockAccess worldObj, BlockPos pos, BlockPos beacon) - { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/resourceBlocks/voidPearlBlock.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/resourceBlocks/voidPearlBlock.java deleted file mode 100644 index b3ee078..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/resourceBlocks/voidPearlBlock.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.resourceBlocks; -import net.minecraft.block.Block; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -public class voidPearlBlock extends Block{ - public voidPearlBlock() { - super(Material.IRON); - setUnlocalizedName("voidPearlBlock"); - setRegistryName("void_pearl_block"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe",0); - } - @Override - public boolean isBeaconBase(IBlockAccess worldObj, BlockPos pos, BlockPos beacon) - { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/CactusSlab.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/CactusSlab.java deleted file mode 100644 index ce3b32f..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/CactusSlab.java +++ /dev/null @@ -1,102 +0,0 @@ -//this class is based off of CJMinecraft's example mod -//https://github.com/CJMinecraft01/BitOfEverything -package com.NetherNoah.ParadiseMod.blocks.slabs; - -import java.util.Random; - -import com.NetherNoah.ParadiseMod.DummyProperty; -import com.NetherNoah.ParadiseMod.Reference; -import com.NetherNoah.ParadiseMod.init.ModBlocks.Slabs; - -import net.minecraft.block.BlockSlab; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class CactusSlab extends BlockSlab { - - public static final DummyProperty DUMMY_VARIANT = DummyProperty.create("dummy"); - - public CactusSlab(String name) { - super(Material.WOOD); - setUnlocalizedName(name); - setRegistryName(name); - setHardness(3); - setResistance(15); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setSoundType(SoundType.WOOD); - - IBlockState state = this.blockState.getBaseState(); - if (!this.isDouble()) - state = state.withProperty(HALF, EnumBlockHalf.BOTTOM); - setDefaultState(state); - this.useNeighborBrightness = true; // Makes it so that you don't get dark patches on the block - } - - @Override - public String getUnlocalizedName(int meta) { - return this.getUnlocalizedName(); - } - - @Override - public IProperty getVariantProperty() { - return DUMMY_VARIANT; - } - - @Override - public Comparable getTypeForItem(ItemStack stack) { - return false; - } - - @Override - public int damageDropped(IBlockState state) { - return 0; - } - - @Override - public IBlockState getStateFromMeta(int meta) { - if (!this.isDouble()) - return this.getDefaultState().withProperty(HALF, - EnumBlockHalf.values()[meta % EnumBlockHalf.values().length]); - return this.getDefaultState(); - } - - @Override - public int getMetaFromState(IBlockState state) { - if (this.isDouble()) - return 0; - return ((EnumBlockHalf) state.getValue(HALF)).ordinal() + 1; - } - - @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Slabs.end_slab); - } - - @Override - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, new IProperty[] { HALF, DUMMY_VARIANT }); - } - - @Override - public boolean isDouble() { - return false; - } - - //@Override - //public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) - //{ - // return false; - //} -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/EndSlab.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/EndSlab.java deleted file mode 100644 index b8c0b19..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/EndSlab.java +++ /dev/null @@ -1,99 +0,0 @@ -//this class is based off of CJMinecraft's example mod -//https://github.com/CJMinecraft01/BitOfEverything -package com.NetherNoah.ParadiseMod.blocks.slabs; - -import java.util.Random; - -import com.NetherNoah.ParadiseMod.DummyProperty; -import com.NetherNoah.ParadiseMod.Reference; -import com.NetherNoah.ParadiseMod.init.ModBlocks.Slabs; - -import net.minecraft.block.BlockSlab; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class EndSlab extends BlockSlab { - - public static final DummyProperty DUMMY_VARIANT = DummyProperty.create("dummy"); - - public EndSlab(String name) { - super(Material.ROCK); - setUnlocalizedName(name); - setRegistryName(name); - setHardness(3); - setResistance(15); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - IBlockState state = this.blockState.getBaseState(); - if (!this.isDouble()) - state = state.withProperty(HALF, EnumBlockHalf.BOTTOM); - setDefaultState(state); - this.useNeighborBrightness = true; // Makes it so that you don't get dark patches on the block - } - - @Override - public String getUnlocalizedName(int meta) { - return this.getUnlocalizedName(); - } - - @Override - public IProperty getVariantProperty() { - return DUMMY_VARIANT; - } - - @Override - public Comparable getTypeForItem(ItemStack stack) { - return false; - } - - @Override - public int damageDropped(IBlockState state) { - return 0; - } - - @Override - public IBlockState getStateFromMeta(int meta) { - if (!this.isDouble()) - return this.getDefaultState().withProperty(HALF, - EnumBlockHalf.values()[meta % EnumBlockHalf.values().length]); - return this.getDefaultState(); - } - - @Override - public int getMetaFromState(IBlockState state) { - if (this.isDouble()) - return 0; - return ((EnumBlockHalf) state.getValue(HALF)).ordinal() + 1; - } - - @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Slabs.end_slab); - } - - @Override - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, new IProperty[] { HALF, DUMMY_VARIANT }); - } - - @Override - public boolean isDouble() { - return false; - } - - //@Override - //public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) - //{ - // return false; - //} -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/GlowingObsidianSlab.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/GlowingObsidianSlab.java deleted file mode 100644 index 5fe1944..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/GlowingObsidianSlab.java +++ /dev/null @@ -1,101 +0,0 @@ -//this class is based off of CJMinecraft's example mod -//https://github.com/CJMinecraft01/BitOfEverything -package com.NetherNoah.ParadiseMod.blocks.slabs; - -import java.util.Random; - -import com.NetherNoah.ParadiseMod.DummyProperty; -import com.NetherNoah.ParadiseMod.Reference; -import com.NetherNoah.ParadiseMod.init.ModBlocks.Slabs; - -import net.minecraft.block.BlockSlab; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class GlowingObsidianSlab extends BlockSlab { - - public static final DummyProperty DUMMY_VARIANT = DummyProperty.create("dummy"); - - public GlowingObsidianSlab(String name) { - super(Material.BARRIER); - setUnlocalizedName(name); - setRegistryName(name); - setHardness(51); - setResistance(2000); - setLightLevel(.46666667F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - - IBlockState state = this.blockState.getBaseState(); - if (!this.isDouble()) - state = state.withProperty(HALF, EnumBlockHalf.BOTTOM); - setDefaultState(state); - this.useNeighborBrightness = true; - } - - @Override - public String getUnlocalizedName(int meta) { - return this.getUnlocalizedName(); - } - - @Override - public IProperty getVariantProperty() { - return DUMMY_VARIANT; - } - - @Override - public Comparable getTypeForItem(ItemStack stack) { - return false; - } - - @Override - public int damageDropped(IBlockState state) { - return 0; - } - - @Override - public IBlockState getStateFromMeta(int meta) { - if (!this.isDouble()) - return this.getDefaultState().withProperty(HALF, - EnumBlockHalf.values()[meta % EnumBlockHalf.values().length]); - return this.getDefaultState(); - } - - @Override - public int getMetaFromState(IBlockState state) { - if (this.isDouble()) - return 0; - return ((EnumBlockHalf) state.getValue(HALF)).ordinal() + 1; - } - - @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Slabs.end_slab); - } - - @Override - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, new IProperty[] { HALF, DUMMY_VARIANT }); - } - - @Override - public boolean isDouble() { - return false; - } - - //@Override - //public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) - //{ - // return false; - //} -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/ObsidianSlab.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/ObsidianSlab.java deleted file mode 100644 index b231b61..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/ObsidianSlab.java +++ /dev/null @@ -1,95 +0,0 @@ -//this class is based off of CJMinecraft's example mod -//https://github.com/CJMinecraft01/BitOfEverything -package com.NetherNoah.ParadiseMod.blocks.slabs; - -import java.util.Random; - -import com.NetherNoah.ParadiseMod.DummyProperty; -import com.NetherNoah.ParadiseMod.Reference; -import com.NetherNoah.ParadiseMod.init.ModBlocks.Slabs; - -import net.minecraft.block.BlockSlab; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class ObsidianSlab extends BlockSlab { - - public static final DummyProperty DUMMY_VARIANT = DummyProperty.create("dummy"); - - public ObsidianSlab(String name) { - super(Material.BARRIER); - setUnlocalizedName(name); - setRegistryName(name); - setHardness(51); - setResistance(2000); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - - IBlockState state = this.blockState.getBaseState(); - if (!this.isDouble()) - state = state.withProperty(HALF, EnumBlockHalf.BOTTOM); - setDefaultState(state); - this.useNeighborBrightness = true; - } - - @Override - public String getUnlocalizedName(int meta) { - return this.getUnlocalizedName(); - } - - @Override - public IProperty getVariantProperty() { - return DUMMY_VARIANT; - } - - @Override - public Comparable getTypeForItem(ItemStack stack) { - return false; - } - - @Override - public int damageDropped(IBlockState state) { - return 0; - } - - @Override - public IBlockState getStateFromMeta(int meta) { - if (!this.isDouble()) - return this.getDefaultState().withProperty(HALF, - EnumBlockHalf.values()[meta % EnumBlockHalf.values().length]); - return this.getDefaultState(); - } - - @Override - public int getMetaFromState(IBlockState state) { - if (this.isDouble()) - return 0; - return ((EnumBlockHalf) state.getValue(HALF)).ordinal() + 1; - } - - @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Slabs.end_slab); - } - - @Override - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, new IProperty[] { HALF, DUMMY_VARIANT }); - } - - @Override - public boolean isDouble() { - return false; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/VoidBrickSlab.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/VoidBrickSlab.java deleted file mode 100644 index 3ac0598..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/VoidBrickSlab.java +++ /dev/null @@ -1,93 +0,0 @@ -//this class is based off of CJMinecraft's example mod -//https://github.com/CJMinecraft01/BitOfEverything -package com.NetherNoah.ParadiseMod.blocks.slabs; - -import java.util.Random; - -import com.NetherNoah.ParadiseMod.DummyProperty; -import com.NetherNoah.ParadiseMod.Reference; -import com.NetherNoah.ParadiseMod.init.ModBlocks.Slabs; - -import net.minecraft.block.BlockSlab; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class VoidBrickSlab extends BlockSlab { - - public static final DummyProperty DUMMY_VARIANT = DummyProperty.create("dummy"); - - public VoidBrickSlab(String name) { - super(Material.ROCK); - setUnlocalizedName(name); - setRegistryName(name); - setHardness(3); - setResistance(15); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - IBlockState state = this.blockState.getBaseState(); - if (!this.isDouble()) - state = state.withProperty(HALF, EnumBlockHalf.BOTTOM); - setDefaultState(state); - this.useNeighborBrightness = true; - } - - @Override - public String getUnlocalizedName(int meta) { - return this.getUnlocalizedName(); - } - - @Override - public IProperty getVariantProperty() { - return DUMMY_VARIANT; - } - - @Override - public Comparable getTypeForItem(ItemStack stack) { - return false; - } - - @Override - public int damageDropped(IBlockState state) { - return 0; - } - - @Override - public IBlockState getStateFromMeta(int meta) { - if (!this.isDouble()) - return this.getDefaultState().withProperty(HALF, - EnumBlockHalf.values()[meta % EnumBlockHalf.values().length]); - return this.getDefaultState(); - } - - @Override - public int getMetaFromState(IBlockState state) { - if (this.isDouble()) - return 0; - return ((EnumBlockHalf) state.getValue(HALF)).ordinal() + 1; - } - - @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Slabs.end_slab); - } - - @Override - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, new IProperty[] { HALF, DUMMY_VARIANT }); - } - - @Override - public boolean isDouble() { - return false; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/VoidSlab.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/VoidSlab.java deleted file mode 100644 index 61f5605..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/VoidSlab.java +++ /dev/null @@ -1,99 +0,0 @@ -//this class is based off of CJMinecraft's example mod -//https://github.com/CJMinecraft01/BitOfEverything -package com.NetherNoah.ParadiseMod.blocks.slabs; - -import java.util.Random; - -import com.NetherNoah.ParadiseMod.DummyProperty; -import com.NetherNoah.ParadiseMod.Reference; -import com.NetherNoah.ParadiseMod.init.ModBlocks.Slabs; - -import net.minecraft.block.BlockSlab; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class VoidSlab extends BlockSlab { - - public static final DummyProperty DUMMY_VARIANT = DummyProperty.create("dummy"); - - public VoidSlab(String name) { - super(Material.ROCK); - setUnlocalizedName(name); - setRegistryName(name); - setHardness(3); - setResistance(15); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - IBlockState state = this.blockState.getBaseState(); - if (!this.isDouble()) - state = state.withProperty(HALF, EnumBlockHalf.BOTTOM); - setDefaultState(state); - this.useNeighborBrightness = true; - } - - @Override - public String getUnlocalizedName(int meta) { - return this.getUnlocalizedName(); - } - - @Override - public IProperty getVariantProperty() { - return DUMMY_VARIANT; - } - - @Override - public Comparable getTypeForItem(ItemStack stack) { - return false; - } - - @Override - public int damageDropped(IBlockState state) { - return 0; - } - - @Override - public IBlockState getStateFromMeta(int meta) { - if (!this.isDouble()) - return this.getDefaultState().withProperty(HALF, - EnumBlockHalf.values()[meta % EnumBlockHalf.values().length]); - return this.getDefaultState(); - } - - @Override - public int getMetaFromState(IBlockState state) { - if (this.isDouble()) - return 0; - return ((EnumBlockHalf) state.getValue(HALF)).ordinal() + 1; - } - - @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(Slabs.end_slab); - } - - @Override - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, new IProperty[] { HALF, DUMMY_VARIANT }); - } - - @Override - public boolean isDouble() { - return false; - } - - //@Override - //public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) - //{ - // return false; - //} -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/double_slabs/BedrockSlabDouble.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/double_slabs/BedrockSlabDouble.java deleted file mode 100644 index 23b2cd4..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/double_slabs/BedrockSlabDouble.java +++ /dev/null @@ -1,31 +0,0 @@ -//this class is based off of CJMinecraft's example mod -//https://github.com/CJMinecraft01/BitOfEverything -package com.NetherNoah.ParadiseMod.blocks.slabs.double_slabs; - -import com.NetherNoah.ParadiseMod.blocks.slabs.BedrockSlab; -import com.NetherNoah.ParadiseMod.init.ModBlocks.Slabs; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; - -public class BedrockSlabDouble extends BedrockSlab { - - public BedrockSlabDouble() { - super("double_bedrock_slab"); - } - - @Override - public boolean isDouble() { - return true; - } - @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) - { - return new ItemStack(Slabs.bedrock_slab); - } - -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/double_slabs/CactusSlabDouble.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/double_slabs/CactusSlabDouble.java deleted file mode 100644 index d24bd3c..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/double_slabs/CactusSlabDouble.java +++ /dev/null @@ -1,34 +0,0 @@ -//this class is based off of CJMinecraft's example mod -//https://github.com/CJMinecraft01/BitOfEverything -package com.NetherNoah.ParadiseMod.blocks.slabs.double_slabs; - -import com.NetherNoah.ParadiseMod.blocks.slabs.CactusSlab; -import com.NetherNoah.ParadiseMod.init.ModBlocks.Slabs; - -import net.minecraft.block.SoundType; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; - -public class CactusSlabDouble extends CactusSlab { - - public CactusSlabDouble() { - super("double_cactus_slab"); - setSoundType(SoundType.WOOD); - } - - @Override - public boolean isDouble() { - return true; - } - @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) - { - return new ItemStack(Slabs.cactus_slab); - } - -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/double_slabs/EndSlabDouble.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/double_slabs/EndSlabDouble.java deleted file mode 100644 index 6b5cc48..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/double_slabs/EndSlabDouble.java +++ /dev/null @@ -1,31 +0,0 @@ -//this class is based off of CJMinecraft's example mod -//https://github.com/CJMinecraft01/BitOfEverything -package com.NetherNoah.ParadiseMod.blocks.slabs.double_slabs; - -import com.NetherNoah.ParadiseMod.blocks.slabs.EndSlab; -import com.NetherNoah.ParadiseMod.init.ModBlocks.Slabs; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; - -public class EndSlabDouble extends EndSlab { - - public EndSlabDouble() { - super("double_end_slab"); - } - - @Override - public boolean isDouble() { - return true; - } - @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) - { - return new ItemStack(Slabs.end_slab); - } - -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/double_slabs/GlowingObsidianSlabDouble.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/double_slabs/GlowingObsidianSlabDouble.java deleted file mode 100644 index 7739d40..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/double_slabs/GlowingObsidianSlabDouble.java +++ /dev/null @@ -1,32 +0,0 @@ -//this class is based off of CJMinecraft's example mod -//https://github.com/CJMinecraft01/BitOfEverything -package com.NetherNoah.ParadiseMod.blocks.slabs.double_slabs; - -import com.NetherNoah.ParadiseMod.blocks.slabs.GlowingObsidianSlab; -import com.NetherNoah.ParadiseMod.init.ModBlocks.Slabs; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; - -public class GlowingObsidianSlabDouble extends GlowingObsidianSlab { - - public GlowingObsidianSlabDouble() { - super("glowing_obsidian_slab_double"); - setLightLevel(.46666667F); - } - - @Override - public boolean isDouble() { - return true; - } - @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) - { - return new ItemStack(Slabs.glowing_obsidian_slab); - } - -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/double_slabs/ObsidianSlabDouble.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/double_slabs/ObsidianSlabDouble.java deleted file mode 100644 index e40dcb2..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/double_slabs/ObsidianSlabDouble.java +++ /dev/null @@ -1,31 +0,0 @@ -//this class is based off of CJMinecraft's example mod -//https://github.com/CJMinecraft01/BitOfEverything -package com.NetherNoah.ParadiseMod.blocks.slabs.double_slabs; - -import com.NetherNoah.ParadiseMod.blocks.slabs.BedrockSlab; -import com.NetherNoah.ParadiseMod.init.ModBlocks.Slabs; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; - -public class ObsidianSlabDouble extends BedrockSlab { - - public ObsidianSlabDouble() { - super("double_obsidian_slab"); - } - - @Override - public boolean isDouble() { - return true; - } - @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) - { - return new ItemStack(Slabs.obsidian_slab); - } - -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/double_slabs/VoidBrickSlabDouble.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/double_slabs/VoidBrickSlabDouble.java deleted file mode 100644 index 510ba05..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/double_slabs/VoidBrickSlabDouble.java +++ /dev/null @@ -1,31 +0,0 @@ -//this class is based off of CJMinecraft's example mod -//https://github.com/CJMinecraft01/BitOfEverything -package com.NetherNoah.ParadiseMod.blocks.slabs.double_slabs; - -import com.NetherNoah.ParadiseMod.blocks.slabs.VoidSlab; -import com.NetherNoah.ParadiseMod.init.ModBlocks.Slabs; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; - -public class VoidBrickSlabDouble extends VoidSlab { - - public VoidBrickSlabDouble() { - super("double_void_bricks_slab"); - } - - @Override - public boolean isDouble() { - return true; - } - @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) - { - return new ItemStack(Slabs.void_slab); - } - -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/double_slabs/VoidSlabDouble.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/double_slabs/VoidSlabDouble.java deleted file mode 100644 index 480f50a..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/slabs/double_slabs/VoidSlabDouble.java +++ /dev/null @@ -1,31 +0,0 @@ -//this class is based off of CJMinecraft's example mod -//https://github.com/CJMinecraft01/BitOfEverything -package com.NetherNoah.ParadiseMod.blocks.slabs.double_slabs; - -import com.NetherNoah.ParadiseMod.blocks.slabs.VoidSlab; -import com.NetherNoah.ParadiseMod.init.ModBlocks.Slabs; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; - -public class VoidSlabDouble extends VoidSlab { - - public VoidSlabDouble() { - super("double_void_slab"); - } - - @Override - public boolean isDouble() { - return true; - } - @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) - { - return new ItemStack(Slabs.void_slab); - } - -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/stairs/BedrockStairs.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/stairs/BedrockStairs.java deleted file mode 100644 index 54b5697..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/stairs/BedrockStairs.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.stairs; - -import net.minecraft.block.BlockStairs; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; - -public class BedrockStairs extends BlockStairs { - public BedrockStairs() { - super(Blocks.BARRIER.getDefaultState()); - setUnlocalizedName("BedrockStairs"); - setRegistryName("bedrock_stairs"); - setHardness(-1F); - setResistance(6000000F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - useNeighborBrightness = true; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/stairs/CactusStairs.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/stairs/CactusStairs.java deleted file mode 100644 index b5fb065..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/stairs/CactusStairs.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.stairs; - -import net.minecraft.block.BlockStairs; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; - -public class CactusStairs extends BlockStairs { - public CactusStairs() { - super(Blocks.PLANKS.getDefaultState()); - setUnlocalizedName("CactusStairs"); - setRegistryName("cactus_stairs"); - setHardness(2F); - setResistance(5F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - useNeighborBrightness=true; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/stairs/EndStairs.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/stairs/EndStairs.java deleted file mode 100644 index 3ddc9f4..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/stairs/EndStairs.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.stairs; - -import net.minecraft.block.BlockStairs; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; - -public class EndStairs extends BlockStairs { - public EndStairs() { - super(Blocks.END_STONE.getDefaultState()); - setUnlocalizedName("EndStairs"); - setRegistryName("end_stairs"); - setHardness(5F); - setResistance(15F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setHarvestLevel("pickaxe", 0); - useNeighborBrightness=true; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/stairs/GlowingObsidianStairs.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/stairs/GlowingObsidianStairs.java deleted file mode 100644 index 419487f..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/stairs/GlowingObsidianStairs.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.stairs; - -import net.minecraft.block.BlockStairs; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; - -public class GlowingObsidianStairs extends BlockStairs { - public GlowingObsidianStairs() { - super(Blocks.BARRIER.getDefaultState()); - setUnlocalizedName("GlowingObsidianStairs"); - setRegistryName("glowing_obsidian_stairs"); - setHardness(51F); - setResistance(2000F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setHarvestLevel("pickaxe", 3); - useNeighborBrightness=true; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/stairs/ObsidianStairs.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/stairs/ObsidianStairs.java deleted file mode 100644 index 0a3070b..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/stairs/ObsidianStairs.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.stairs; - -import net.minecraft.block.BlockStairs; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; - -public class ObsidianStairs extends BlockStairs { - public ObsidianStairs() { - super(Blocks.BARRIER.getDefaultState()); - setUnlocalizedName("ObsidianStairs"); - setRegistryName("obsidian_stairs"); - setHardness(51F); - setResistance(2000F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setHarvestLevel("pickaxe", 3); - useNeighborBrightness=true; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/stairs/VoidBrickStairs.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/stairs/VoidBrickStairs.java deleted file mode 100644 index ff3a1d6..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/stairs/VoidBrickStairs.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.stairs; - -import net.minecraft.block.BlockStairs; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; - -public class VoidBrickStairs extends BlockStairs { - public VoidBrickStairs() { - super(Blocks.STONE.getDefaultState()); - setUnlocalizedName("VoidBrickStairs"); - setRegistryName("void_brick_stairs"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - useNeighborBrightness=true; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/stairs/VoidStairs.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/stairs/VoidStairs.java deleted file mode 100644 index 54b1c44..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/stairs/VoidStairs.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.stairs; - -import net.minecraft.block.BlockStairs; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; - -public class VoidStairs extends BlockStairs { - public VoidStairs() { - super(Blocks.STONE.getDefaultState()); - setUnlocalizedName("VoidStairs"); - setRegistryName("void_stairs"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - useNeighborBrightness=true; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/resourceBlocks/sugarBlock.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/sugarBlock.java similarity index 92% rename from src/main/java/com/NetherNoah/ParadiseMod/blocks/resourceBlocks/sugarBlock.java rename to src/main/java/com/NetherNoah/ParadiseMod/blocks/sugarBlock.java index 3f5425f..b7bd5f3 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/resourceBlocks/sugarBlock.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/sugarBlock.java @@ -1,4 +1,4 @@ -package com.NetherNoah.ParadiseMod.blocks.resourceBlocks; +package com.NetherNoah.ParadiseMod.blocks; import net.minecraft.block.BlockFalling; import net.minecraft.block.SoundType; diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/AndesiteTrapdoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/AndesiteTrapdoor.java deleted file mode 100644 index 1d4d6fa..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/AndesiteTrapdoor.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.trapdoors; - -import net.minecraft.block.BlockTrapDoor; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class AndesiteTrapdoor extends BlockTrapDoor { - public AndesiteTrapdoor() { - super(Material.IRON); - setUnlocalizedName("AndesiteTrapdoor"); - setRegistryName("andesite_trapdoor"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.REDSTONE); - setHarvestLevel("pickaxe", 0); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/BedrockTrapdoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/BedrockTrapdoor.java deleted file mode 100644 index e5ea15a..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/BedrockTrapdoor.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.trapdoors; - -import net.minecraft.block.BlockTrapDoor; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class BedrockTrapdoor extends BlockTrapDoor { - public BedrockTrapdoor() { - super(Material.IRON); - setUnlocalizedName("BedrockTrapdoor"); - setRegistryName("bedrock_trapdoor"); - setHardness(-1F); - setResistance(6000000F); - setCreativeTab(CreativeTabs.REDSTONE); - setBlockUnbreakable(); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/CactusTrapdoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/CactusTrapdoor.java deleted file mode 100644 index f362db8..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/CactusTrapdoor.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.trapdoors; - -import net.minecraft.block.BlockTrapDoor; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class CactusTrapdoor extends BlockTrapDoor { - public CactusTrapdoor() { - super(Material.WOOD); - setUnlocalizedName("CactusTrapdoor"); - setRegistryName("cactus_trapdoor"); - setHardness(2F); - setResistance(5F); - setCreativeTab(CreativeTabs.REDSTONE); - setSoundType(SoundType.WOOD); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/CobblestoneTrapdoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/CobblestoneTrapdoor.java deleted file mode 100644 index 2754599..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/CobblestoneTrapdoor.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.trapdoors; - -import net.minecraft.block.BlockTrapDoor; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class CobblestoneTrapdoor extends BlockTrapDoor { - public CobblestoneTrapdoor() { - super(Material.IRON); - setUnlocalizedName("CobblestoneTrapdoor"); - setRegistryName("cobblestone_trapdoor"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.REDSTONE); - setHarvestLevel("pickaxe", 0); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/DiamondTrapdoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/DiamondTrapdoor.java deleted file mode 100644 index d200393..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/DiamondTrapdoor.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.trapdoors; - -import net.minecraft.block.BlockTrapDoor; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class DiamondTrapdoor extends BlockTrapDoor { - public DiamondTrapdoor() { - super(Material.IRON); - setUnlocalizedName("DiamondTrapdoor"); - setRegistryName("diamond_trapdoor"); - setHardness(5F); - setResistance(10F); - setSoundType(SoundType.METAL); - setCreativeTab(CreativeTabs.REDSTONE); - setHarvestLevel("pickaxe", 2); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/DioriteTrapdoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/DioriteTrapdoor.java deleted file mode 100644 index c899a4a..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/DioriteTrapdoor.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.trapdoors; - -import net.minecraft.block.BlockTrapDoor; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class DioriteTrapdoor extends BlockTrapDoor { - public DioriteTrapdoor() { - super(Material.IRON); - setUnlocalizedName("DioriteTrapdoor"); - setRegistryName("diorite_trapdoor"); - setHardness(5F); - setResistance(10F); - setSoundType(SoundType.STONE); - setCreativeTab(CreativeTabs.REDSTONE); - setHarvestLevel("pickaxe", 0); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/EmeraldTrapdoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/EmeraldTrapdoor.java deleted file mode 100644 index 8e0d13b..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/EmeraldTrapdoor.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.trapdoors; - -import javax.annotation.Nullable; - -import net.minecraft.block.BlockTrapDoor; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class EmeraldTrapdoor extends BlockTrapDoor { - public EmeraldTrapdoor() { - super(Material.ROCK); - setUnlocalizedName("EmeraldTrapdoor"); - setRegistryName("emerald_trapdoor"); - setHardness(5F); - setResistance(10F); - setSoundType(SoundType.METAL); - setCreativeTab(CreativeTabs.REDSTONE); - setHarvestLevel("pickaxe", 2); - } - @Override - protected void playSound(@Nullable EntityPlayer player, World worldIn, BlockPos pos, boolean p_185731_4_) - { - if (p_185731_4_) - { - int i = this.blockMaterial == Material.ROCK ? 1037 : 1007; - worldIn.playEvent(player, i, pos, 0); - } - else - { - int j = this.blockMaterial == Material.ROCK ? 1036 : 1013; - worldIn.playEvent(player, j, pos, 0); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/EndTrapdoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/EndTrapdoor.java deleted file mode 100644 index 2c38fe5..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/EndTrapdoor.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.trapdoors; - -import net.minecraft.block.BlockTrapDoor; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class EndTrapdoor extends BlockTrapDoor { - public EndTrapdoor() { - super(Material.IRON); - setUnlocalizedName("EndTrapdoor"); - setRegistryName("end_trapdoor"); - setHardness(5F); - setResistance(15F); - setCreativeTab(CreativeTabs.REDSTONE); - setHarvestLevel("pickaxe", 0); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/GlassTrapdoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/GlassTrapdoor.java deleted file mode 100644 index 2042cc8..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/GlassTrapdoor.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.trapdoors; - -import net.minecraft.block.BlockTrapDoor; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class GlassTrapdoor extends BlockTrapDoor { - public GlassTrapdoor() { - super(Material.GLASS); - setUnlocalizedName("GlassTrapdoor"); - setRegistryName("glass_trapdoor"); - setHardness(.5F); - setResistance(1F); - setSoundType(SoundType.GLASS); - setCreativeTab(CreativeTabs.REDSTONE); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/GlowingObsidianTrapdoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/GlowingObsidianTrapdoor.java deleted file mode 100644 index 87d89f5..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/GlowingObsidianTrapdoor.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.trapdoors; - -import net.minecraft.block.BlockTrapDoor; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class GlowingObsidianTrapdoor extends BlockTrapDoor { - public GlowingObsidianTrapdoor() { - super(Material.IRON); - setUnlocalizedName("GlowingObsidianTrapdoor"); - setRegistryName("glowing_obsidian_trapdoor"); - setHardness(51F); - setResistance(2000F); - setCreativeTab(CreativeTabs.REDSTONE); - setHarvestLevel("pickaxe", 3); - setLightLevel(.46666667F); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/GoldTrapdoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/GoldTrapdoor.java deleted file mode 100644 index 0a638b1..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/GoldTrapdoor.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.trapdoors; - -import net.minecraft.block.BlockTrapDoor; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class GoldTrapdoor extends BlockTrapDoor { - public GoldTrapdoor() { - super(Material.IRON); - setUnlocalizedName("GoldTrapdoor"); - setRegistryName("gold_trapdoor"); - setHardness(5F); - setResistance(10F); - setSoundType(SoundType.METAL); - setCreativeTab(CreativeTabs.REDSTONE); - setHarvestLevel("pickaxe", 2); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/GraniteTrapdoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/GraniteTrapdoor.java deleted file mode 100644 index b616a7c..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/GraniteTrapdoor.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.trapdoors; - -import net.minecraft.block.BlockTrapDoor; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class GraniteTrapdoor extends BlockTrapDoor { - public GraniteTrapdoor() { - super(Material.IRON); - setUnlocalizedName("GraniteTrapdoor"); - setRegistryName("granite_trapdoor"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.REDSTONE); - setHarvestLevel("pickaxe", 0); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/MossStoneTrapdoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/MossStoneTrapdoor.java deleted file mode 100644 index e56af07..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/MossStoneTrapdoor.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.trapdoors; - -import net.minecraft.block.BlockTrapDoor; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class MossStoneTrapdoor extends BlockTrapDoor { - public MossStoneTrapdoor() { - super(Material.IRON); - setUnlocalizedName("MossStoneTrapdoor"); - setRegistryName("moss_stone_trapdoor"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.REDSTONE); - setHarvestLevel("pickaxe", 0); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/ObsidianTrapdoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/ObsidianTrapdoor.java deleted file mode 100644 index e27c994..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/ObsidianTrapdoor.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.trapdoors; - -import net.minecraft.block.BlockTrapDoor; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class ObsidianTrapdoor extends BlockTrapDoor { - public ObsidianTrapdoor() { - super(Material.IRON); - setUnlocalizedName("ObsidianTrapdoor"); - setRegistryName("obsidian_trapdoor"); - setHardness(51F); - setResistance(2000F); - setCreativeTab(CreativeTabs.REDSTONE); - setHarvestLevel("pickaxe", 3); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/RedstoneTrapdoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/RedstoneTrapdoor.java deleted file mode 100644 index ab2ceba..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/RedstoneTrapdoor.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.trapdoors; - -import javax.annotation.Nullable; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.RSTrapdoor; - -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -public class RedstoneTrapdoor extends RSTrapdoor { - public RedstoneTrapdoor() { - super(Material.ROCK); - setUnlocalizedName("RedstoneTrapdoor"); - setRegistryName("redstone_trapdoor"); - setHardness(5F); - setResistance(10F); - setSoundType(SoundType.METAL); - setCreativeTab(CreativeTabs.REDSTONE); - setHarvestLevel("pickaxe", 2); - } - @Override - protected void playSound(@Nullable EntityPlayer player, World worldIn, BlockPos pos, boolean p_185731_4_) - { - if (p_185731_4_) - { - int i = this.blockMaterial == Material.ROCK ? 1037 : 1007; - worldIn.playEvent(player, i, pos, 0); - } - else - { - int j = this.blockMaterial == Material.ROCK ? 1036 : 1013; - worldIn.playEvent(player, j, pos, 0); - } - } - // this door is a rs power block! - @Override - public int getWeakPower(IBlockState state, IBlockAccess worldIn, BlockPos pos, EnumFacing side) { - return 15; - } - @Override - public boolean canConnectRedstone(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/RubyTrapdoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/RubyTrapdoor.java deleted file mode 100644 index 0c81219..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/RubyTrapdoor.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.trapdoors; - -import javax.annotation.Nullable; - -import net.minecraft.block.BlockTrapDoor; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class RubyTrapdoor extends BlockTrapDoor { - public RubyTrapdoor() { - super(Material.ROCK); - setUnlocalizedName("RubyTrapdoor"); - setRegistryName("ruby_trapdoor"); - setHardness(5F); - setResistance(10F); - setSoundType(SoundType.METAL); - setCreativeTab(CreativeTabs.REDSTONE); - setHarvestLevel("pickaxe", 2); - } - @Override - protected void playSound(@Nullable EntityPlayer player, World worldIn, BlockPos pos, boolean p_185731_4_) - { - if (p_185731_4_) - { - int i = this.blockMaterial == Material.ROCK ? 1037 : 1007; - worldIn.playEvent(player, i, pos, 0); - } - else - { - int j = this.blockMaterial == Material.ROCK ? 1036 : 1013; - worldIn.playEvent(player, j, pos, 0); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/RustyTrapdoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/RustyTrapdoor.java deleted file mode 100644 index 029458e..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/RustyTrapdoor.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.trapdoors; - -import net.minecraft.block.BlockTrapDoor; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class RustyTrapdoor extends BlockTrapDoor { - public RustyTrapdoor() { - super(Material.IRON); - setUnlocalizedName("RustyTrapdoor"); - setRegistryName("rusty_trapdoor"); - setHardness(5F); - setResistance(10F); - setSoundType(SoundType.METAL); - setCreativeTab(CreativeTabs.REDSTONE); - setHarvestLevel("pickaxe",1); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/SilverTrapdoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/SilverTrapdoor.java deleted file mode 100644 index 4421aab..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/SilverTrapdoor.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.trapdoors; - -import net.minecraft.block.BlockTrapDoor; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class SilverTrapdoor extends BlockTrapDoor { - public SilverTrapdoor() { - super(Material.IRON); - setUnlocalizedName("SilverTrapdoor"); - setRegistryName("silver_trapdoor"); - setHardness(5F); - setResistance(10F); - setSoundType(SoundType.METAL); - setCreativeTab(CreativeTabs.REDSTONE); - setHarvestLevel("pickaxe", 2); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/StoneTrapdoor.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/StoneTrapdoor.java deleted file mode 100644 index c1174e2..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/trapdoors/StoneTrapdoor.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.trapdoors; - -import net.minecraft.block.BlockTrapDoor; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class StoneTrapdoor extends BlockTrapDoor { - public StoneTrapdoor() { - super(Material.IRON); - setUnlocalizedName("StoneTrapdoor"); - setRegistryName("stone_trapdoor"); - setHardness(5F); - setResistance(10F); - setCreativeTab(CreativeTabs.REDSTONE); - setHarvestLevel("pickaxe", 0); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/workbenches/CustomWorkbenchAcacia.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/workbenches/CustomWorkbenchAcacia.java deleted file mode 100644 index c397b84..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/workbenches/CustomWorkbenchAcacia.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.workbenches; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.CustomWorkBench; - -import net.minecraft.block.SoundType; -import net.minecraft.creativetab.CreativeTabs; - -public class CustomWorkbenchAcacia extends CustomWorkBench { - public CustomWorkbenchAcacia() { - setUnlocalizedName("CustomWorkbenchAcacia"); - setRegistryName("acacia_crafting_table"); - setHardness(2.5F); - setResistance(5F); - setCreativeTab(CreativeTabs.DECORATIONS); - setSoundType(SoundType.WOOD); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/workbenches/CustomWorkbenchBirch.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/workbenches/CustomWorkbenchBirch.java deleted file mode 100644 index 5810c9e..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/workbenches/CustomWorkbenchBirch.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.workbenches; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.CustomWorkBench; - -import net.minecraft.block.SoundType; -import net.minecraft.creativetab.CreativeTabs; - -public class CustomWorkbenchBirch extends CustomWorkBench { - public CustomWorkbenchBirch() { - setUnlocalizedName("CustomWorkbenchBirch"); - setRegistryName("birch_crafting_table"); - setHardness(2.5F); - setResistance(5F); - setCreativeTab(CreativeTabs.DECORATIONS); - setSoundType(SoundType.WOOD); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/workbenches/CustomWorkbenchCactus.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/workbenches/CustomWorkbenchCactus.java deleted file mode 100644 index b9a0dec..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/workbenches/CustomWorkbenchCactus.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.workbenches; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.CustomWorkBench; - -import net.minecraft.block.SoundType; -import net.minecraft.creativetab.CreativeTabs; - -public class CustomWorkbenchCactus extends CustomWorkBench { - public CustomWorkbenchCactus() { - setUnlocalizedName("CustomWorkbenchCactus"); - setRegistryName("cactus_crafting_table"); - setHardness(2.5F); - setResistance(5F); - setCreativeTab(CreativeTabs.DECORATIONS); - setSoundType(SoundType.WOOD); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/workbenches/CustomWorkbenchDarkOak.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/workbenches/CustomWorkbenchDarkOak.java deleted file mode 100644 index 960192c..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/workbenches/CustomWorkbenchDarkOak.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.workbenches; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.CustomWorkBench; - -import net.minecraft.block.SoundType; -import net.minecraft.creativetab.CreativeTabs; - -public class CustomWorkbenchDarkOak extends CustomWorkBench { - public CustomWorkbenchDarkOak() { - setUnlocalizedName("CustomWorkbenchDarkOak"); - setRegistryName("dark_oak_crafting_table"); - setHardness(2.5F); - setResistance(5F); - setCreativeTab(CreativeTabs.DECORATIONS); - setSoundType(SoundType.WOOD); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/workbenches/CustomWorkbenchJungle.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/workbenches/CustomWorkbenchJungle.java deleted file mode 100644 index 8a5447f..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/workbenches/CustomWorkbenchJungle.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.workbenches; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.CustomWorkBench; - -import net.minecraft.block.SoundType; -import net.minecraft.creativetab.CreativeTabs; - -public class CustomWorkbenchJungle extends CustomWorkBench { - public CustomWorkbenchJungle() { - setUnlocalizedName("CustomWorkbenchJungle"); - setRegistryName("jungle_crafting_table"); - setHardness(2.5F); - setResistance(5F); - setCreativeTab(CreativeTabs.DECORATIONS); - setSoundType(SoundType.WOOD); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/workbenches/CustomWorkbenchSpruce.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/workbenches/CustomWorkbenchSpruce.java deleted file mode 100644 index de98534..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/workbenches/CustomWorkbenchSpruce.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.NetherNoah.ParadiseMod.blocks.workbenches; - -import com.NetherNoah.ParadiseMod.CustomBlockCode.CustomWorkBench; - -import net.minecraft.block.SoundType; -import net.minecraft.creativetab.CreativeTabs; - -public class CustomWorkbenchSpruce extends CustomWorkBench { - public CustomWorkbenchSpruce() { - setUnlocalizedName("CustomWorkbenchSpruce"); - setRegistryName("spruce_crafting_table"); - setHardness(2.5F); - setResistance(5F); - setCreativeTab(CreativeTabs.DECORATIONS); - setSoundType(SoundType.WOOD); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/xmas/ChristmasSapling.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/xmas/ChristmasSapling.java index c750e25..ccea9f3 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/xmas/ChristmasSapling.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/xmas/ChristmasSapling.java @@ -3,40 +3,158 @@ import java.util.Random; import com.NetherNoah.ParadiseMod.ParadiseMod; -import com.NetherNoah.ParadiseMod.CustomBlockCode.xmasTree; import com.NetherNoah.ParadiseMod.config.ModConfig; +import com.NetherNoah.ParadiseMod.world.worldgen.misc.ChristmasTree; +import net.minecraft.block.BlockBush; +import net.minecraft.block.IGrowable; import net.minecraft.block.SoundType; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.properties.PropertyInteger; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.translation.I18n; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenBigTree; +import net.minecraft.world.gen.feature.WorldGenTrees; +import net.minecraft.world.gen.feature.WorldGenerator; +import net.minecraftforge.event.terraingen.TerrainGen; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; -public class ChristmasSapling extends xmasTree { - public ChristmasSapling() { +public class ChristmasSapling extends BlockBush implements IGrowable +{ + public static final PropertyInteger STAGE = PropertyInteger.create("stage", 0, 1); + protected static final AxisAlignedBB SAPLING_AABB = new AxisAlignedBB(0.09999999403953552D, 0.0D, 0.09999999403953552D, 0.8999999761581421D, 0.800000011920929D, 0.8999999761581421D); + public ChristmasSapling() + { + setDefaultState(blockState.getBaseState().withProperty(STAGE, Integer.valueOf(0))); + setCreativeTab(CreativeTabs.DECORATIONS); setUnlocalizedName("ChristmasSapling"); setRegistryName("christmas_sapling"); setLightLevel(1F); setSoundType(SoundType.PLANT); if (!ModConfig.HideXmasFeatures) setCreativeTab(ParadiseMod.xmas); - } - @Override - public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { - if (!worldIn.isRemote) { - super.updateTick(worldIn, pos, state, rand); - - if (worldIn.getLightFromNeighbors(pos.up()) >= 9 && rand.nextInt(7) == 0) { - this.grow(worldIn, pos, state, rand); - } - } - } - @Override - public void grow(World worldIn, BlockPos pos, IBlockState state, Random rand) { - if (state.getValue(STAGE).intValue() == 0) { - worldIn.setBlockState(pos, state.cycleProperty(STAGE), 4); - } - else { - this.generateTree(worldIn, pos, state, rand); - } - } + } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) + { + return SAPLING_AABB; + } + @Override + public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) + { + if (!worldIn.isRemote) + { + super.updateTick(worldIn, pos, state, rand); + if (worldIn.getLightFromNeighbors(pos.up()) >= 9 && rand.nextInt(7) == 0) + grow(worldIn, pos, state, rand); + } + } + public void grow(World worldIn, BlockPos pos, IBlockState state, Random rand) + { + if (state.getValue(STAGE).intValue() == 0) + worldIn.setBlockState(pos, state.cycleProperty(STAGE), 4); + else + generateTree(worldIn, pos, state, rand); + } + public void generateTree(World worldIn, BlockPos pos, IBlockState state, Random rand) + { + if (!TerrainGen.saplingGrowTree(worldIn, rand, pos)) return; + WorldGenerator worldgenerator = rand.nextInt(10) == 0 ? new WorldGenBigTree(true) : new WorldGenTrees(true); + int i = 0; + int j = 0; + boolean flag = false; + tree: + for (i = 0; i >= -1; --i){ + for (j = 0; j >= -1; --j){ + if (isTwoByTwoOfType(worldIn, pos, i, j)){ + worldgenerator = new ChristmasTree(true); + flag = true; + break tree; + } + } + } + if (!flag){ + i = 0; + j = 0; + worldgenerator = new ChristmasTree(true); + } + IBlockState iblockstate2 = Blocks.AIR.getDefaultState(); + if (flag) + { + worldIn.setBlockState(pos.add(i, 0, j), iblockstate2, 4); + worldIn.setBlockState(pos.add(i + 1, 0, j), iblockstate2, 4); + worldIn.setBlockState(pos.add(i, 0, j + 1), iblockstate2, 4); + worldIn.setBlockState(pos.add(i + 1, 0, j + 1), iblockstate2, 4); + } + else + worldIn.setBlockState(pos, iblockstate2, 4); + if (!worldgenerator.generate(worldIn, rand, pos.add(i, 0, j))) + { + if (flag) + { + worldIn.setBlockState(pos.add(i, 0, j), state, 4); + worldIn.setBlockState(pos.add(i + 1, 0, j), state, 4); + worldIn.setBlockState(pos.add(i, 0, j + 1), state, 4); + worldIn.setBlockState(pos.add(i + 1, 0, j + 1), state, 4); + } + else + worldIn.setBlockState(pos, state, 4); + } + } + private boolean isTwoByTwoOfType(World worldIn, BlockPos pos, int x, int z) + { + return isTypeAt(worldIn, pos.add(x, 0, z)) + && isTypeAt(worldIn, pos.add(x + 1, 0, z)) + && isTypeAt(worldIn, pos.add(x, 0, z + 1)) + && isTypeAt(worldIn, pos.add(x + 1, 0, z + 1)); + } + public boolean isTypeAt(World worldIn, BlockPos pos) + { + IBlockState iblockstate = worldIn.getBlockState(pos); + return iblockstate.getBlock() == this; + } + @Override + public boolean canGrow(World worldIn, BlockPos pos, IBlockState state, boolean isClient) + { + return true; + } + @Override + public boolean canUseBonemeal(World worldIn, Random rand, BlockPos pos, IBlockState state) + { + return worldIn.rand.nextFloat() < 0.45D; + } + @Override + public void grow(World worldIn, Random rand, BlockPos pos, IBlockState state) + { + grow(worldIn, pos, state, rand); + } + @Override + public IBlockState getStateFromMeta(int meta) + { + return getDefaultState().withProperty(STAGE, Integer.valueOf((meta & 8) >> 3)); + } + @Override + public int getMetaFromState(IBlockState state) + { + int i = 0; + i = i | state.getValue(STAGE).intValue() << 3; + return i; + } + @Override + protected BlockStateContainer createBlockState() + { + return new BlockStateContainer(this, new IProperty[] {STAGE}); + } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/config/ModConfig.java b/src/main/java/com/NetherNoah/ParadiseMod/config/ModConfig.java index 2612e2d..485d779 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/config/ModConfig.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/config/ModConfig.java @@ -22,6 +22,9 @@ public static class WorldGen{ @Config.LangKey("config.structures") public Structures structures=new Structures(); public class Structures{ + @Config.Comment("Generate the black cross") + @Config.LangKey("config.blackcross") + public Boolean blackCross=false; @Config.Comment("Generate Brick Pyramids") @Config.LangKey("config.brickpyramids") public Boolean BrickPyramids=true; diff --git a/src/main/java/com/NetherNoah/ParadiseMod/handlers/OreDictHandler.java b/src/main/java/com/NetherNoah/ParadiseMod/handlers/OreDictHandler.java index 1ae1f57..ba90c91 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/handlers/OreDictHandler.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/handlers/OreDictHandler.java @@ -29,9 +29,9 @@ public static void registerOreDict() { OreDictionary.registerOre("ingotRustyIron", MiscItems.RustyIngot); OreDictionary.registerOre("blockRustyIron", Ores.RustyIronBlock); OreDictionary.registerOre("nuggetRustyIron", MiscItems.RustyNugget); - OreDictionary.registerOre("dyeBlack", MiscItems.DyeBlack); - OreDictionary.registerOre("dyeBrown", MiscItems.DyeBrown); - OreDictionary.registerOre("dyeBlue", MiscItems.DyeBlue); + OreDictionary.registerOre("dyeBlack", MiscItems.BlackDye); + OreDictionary.registerOre("dyeBrown", MiscItems.BrownDye); + OreDictionary.registerOre("dyeBlue", MiscItems.BlueDye); OreDictionary.registerOre("cobblestone", Misc.VoidStone); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/init/LiquidRedstone.java b/src/main/java/com/NetherNoah/ParadiseMod/init/LiquidRedstone.java index 5a954a9..510c1e3 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/init/LiquidRedstone.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/init/LiquidRedstone.java @@ -27,14 +27,14 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.common.registry.ForgeRegistries; public class LiquidRedstone { - private static ModelResourceLocation lr_location = new ModelResourceLocation(Reference.MOD_ID + ":" + BlockLiquidRedstone.name, "fluid"); + //private static ModelResourceLocation lr_location = new ModelResourceLocation(Reference.MOD_ID + ":" + BlockLiquidRedstone.name, "fluid"); public static void register() { FluidRegistry.registerFluid(FluidLiquidRedstone.instance); ForgeRegistries.BLOCKS.register(BlockLiquidRedstone.instance); ModelLoader.setCustomStateMapper(BlockLiquidRedstone.instance, new StateMapperBase() { @Override protected ModelResourceLocation getModelResourceLocation(IBlockState state) { - return lr_location; + return new ModelResourceLocation(Reference.MOD_ID + ":" + BlockLiquidRedstone.name, "fluid"); } }); } diff --git a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Buttons.java b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Buttons.java index 3a26146..5961823 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Buttons.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Buttons.java @@ -1,121 +1,115 @@ package com.NetherNoah.ParadiseMod.init.ModBlocks; import com.NetherNoah.ParadiseMod.Utils; -import com.NetherNoah.ParadiseMod.CustomBlockCode.buttonTicks.DiamondButtonTicks; -import com.NetherNoah.ParadiseMod.CustomBlockCode.buttonTicks.EmeraldButtonTicks; -import com.NetherNoah.ParadiseMod.CustomBlockCode.buttonTicks.IronButtonTicks; -import com.NetherNoah.ParadiseMod.CustomBlockCode.buttonTicks.QuickButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.BedrockButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.CobblestoneButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.DiamondButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.DirtButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.EmeraldButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.EndButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.GlowingObsidianButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.GoldButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.GrassButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.IronButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.MossyButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.ObsidianButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.RubyButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.RustyButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.SilverButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.VoidButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.stoneVariants.AndesiteButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.stoneVariants.DioriteButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.stoneVariants.GraniteButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.wood.AcaciaButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.wood.BirchButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.wood.CactusButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.wood.DarkOakButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.wood.JungleButton; -import com.NetherNoah.ParadiseMod.blocks.buttons.wood.SpruceButton; -import net.minecraft.block.BlockButton; -import net.minecraft.block.BlockButtonStone; +import com.NetherNoah.ParadiseMod.blocks.base.CustomButton; -public class Buttons { - +public class Buttons { //buttons - public static BlockButtonStone VoidButton; - public static BlockButtonStone DirtButton; - public static BlockButtonStone GrassButton; - public static BlockButton GlowingObsidianButton; - public static BlockButton EndButton; - public static BlockButton CactusButton; - public static BlockButton BedrockButton; - public static BlockButton ObsidianButton; - public static BlockButton MossyButton; - public static BlockButton CobblestoneButton; - public static BlockButton AcaciaButton; - public static BlockButton BirchButton; - public static BlockButton DarkOakButton; - public static BlockButton JungleButton; - public static BlockButton SpruceButton; - public static BlockButton AndesiteButton; - public static BlockButton DioriteButton; - public static BlockButton GraniteButton; - public static DiamondButtonTicks DiamondButton; - public static EmeraldButtonTicks EmeraldButton; - public static QuickButton RubyButton; - public static QuickButton SilverButton; - public static QuickButton GoldButton; - public static IronButtonTicks IronButton; - public static IronButtonTicks RustyButton; + //dirt and grass + public static CustomButton DirtButton = new CustomButton(20,4); + public static CustomButton GrassButton = new CustomButton(20,3); + + //special buttons + public static CustomButton DiamondButton = new CustomButton(14,2); + public static CustomButton EmeraldButton = new CustomButton(10,2); + public static CustomButton GlassButton = new CustomButton(20,5); + public static CustomButton GoldButton = new CustomButton(2,2); + public static CustomButton IronButton = new CustomButton(6,2); + public static CustomButton RubyButton = new CustomButton(4,2); + public static CustomButton RustyButton = new CustomButton(20,2); + public static CustomButton SilverButton = new CustomButton(2,2); + + //stone variants + public static CustomButton AndesiteButton = new CustomButton(20,0); + public static CustomButton CobblestoneButton = new CustomButton(20,0); + public static CustomButton DioriteButton = new CustomButton(20,0); + public static CustomButton EndButton = new CustomButton(20,0); + public static CustomButton GraniteButton = new CustomButton(20,0); + public static CustomButton MossyButton = new CustomButton(20,0); + public static CustomButton RedSandstoneButton = new CustomButton(20,0); + public static CustomButton SandstoneButton = new CustomButton(20,0); + public static CustomButton VoidButton = new CustomButton(20,0); + + //unbreakable buttons + public static CustomButton GlowingObsidianButton = new CustomButton(20,2); + public static CustomButton BedrockButton = new CustomButton(20,2); + public static CustomButton ObsidianButton = new CustomButton(20,2); + + //wooden buttons + public static CustomButton AcaciaButton = new CustomButton(30,1); + public static CustomButton BirchButton = new CustomButton(30,1); + public static CustomButton DarkOakButton = new CustomButton(30,1); + public static CustomButton JungleButton = new CustomButton(30,1); + public static CustomButton SpruceButton = new CustomButton(30,1); + public static CustomButton CactusButton = new CustomButton(30,1); public static void initAndRegister() { - //buttons - Utils.regBlock(VoidButton=new VoidButton()); - Utils.regBlock(DirtButton=new DirtButton()); - Utils.regBlock(GrassButton=new GrassButton()); - Utils.regBlock(RustyButton=new RustyButton()); - Utils.regBlock(EndButton=new EndButton()); - Utils.regBlock(CactusButton=new CactusButton()); - Utils.regBlock(GlowingObsidianButton=new GlowingObsidianButton()); - Utils.regBlock(DiamondButton = new DiamondButton()); - Utils.regBlock(EmeraldButton = new EmeraldButton()); - Utils.regBlock(GoldButton = new GoldButton()); - Utils.regBlock(IronButton = new IronButton()); - Utils.regBlock(SilverButton = new SilverButton()); - Utils.regBlock(RubyButton = new RubyButton()); - Utils.regBlock(ObsidianButton = new ObsidianButton()); - Utils.regBlock(BedrockButton = new BedrockButton()); - Utils.regBlock(MossyButton = new MossyButton()); - Utils.regBlock(CobblestoneButton = new CobblestoneButton()); - Utils.regBlock(AndesiteButton = new AndesiteButton()); - Utils.regBlock(DioriteButton = new DioriteButton()); - Utils.regBlock(GraniteButton = new GraniteButton()); - Utils.regBlock(AcaciaButton = new AcaciaButton()); - Utils.regBlock(BirchButton = new BirchButton()); - Utils.regBlock(DarkOakButton = new DarkOakButton()); - Utils.regBlock(JungleButton = new JungleButton()); - Utils.regBlock(SpruceButton = new SpruceButton()); - + //dirt and grass + Utils.regBlock(DirtButton.setUnlocalizedName("DirtButton").setRegistryName("dirt_button")); + Utils.regBlock(GrassButton.setUnlocalizedName("GrassButton").setRegistryName("grass_button")); + + //special buttons + Utils.regBlock(DiamondButton.setUnlocalizedName("DiamondButton").setRegistryName("diamond_button").setHardness(0.5F)); + Utils.regBlock(EmeraldButton.setUnlocalizedName("EmeraldButton").setRegistryName("emerald_button").setHardness(0.5F)); + Utils.regBlock(GlassButton.setUnlocalizedName("GlassButton").setRegistryName("glass_button").setHardness(0.5F)); + Utils.regBlock(GoldButton.setUnlocalizedName("GoldButton").setRegistryName("gold_button").setHardness(0.5F)); + Utils.regBlock(IronButton.setUnlocalizedName("IronButton").setRegistryName("iron_button").setHardness(0.5F)); + Utils.regBlock(RubyButton.setUnlocalizedName("RubyButton").setRegistryName("ruby_button").setHardness(0.5F)); + Utils.regBlock(RustyButton.setUnlocalizedName("RustyButton").setRegistryName("rusty_button").setHardness(0.5F)); + Utils.regBlock(SilverButton.setUnlocalizedName("SilverButton").setRegistryName("silver_button").setHardness(0.5F)); + + //stone variant buttons + Utils.regBlock(AndesiteButton.setUnlocalizedName("AndesiteButton").setRegistryName("andesite_button").setHardness(0.5F)); + Utils.regBlock(CobblestoneButton.setUnlocalizedName("CobblestoneButton").setRegistryName("cobblestone_button").setHardness(0.5F)); + Utils.regBlock(DioriteButton.setUnlocalizedName("DioriteButton").setRegistryName("diorite_button").setHardness(0.5F)); + Utils.regBlock(EndButton.setUnlocalizedName("EndButton").setRegistryName("end_button").setHardness(0.5F)); + Utils.regBlock(GraniteButton.setUnlocalizedName("GraniteButton").setRegistryName("granite_button").setHardness(0.5F)); + Utils.regBlock(MossyButton.setUnlocalizedName("MossyButton").setRegistryName("mossy_cobblestone_button").setHardness(0.5F)); + Utils.regBlock(RedSandstoneButton.setUnlocalizedName("RedSandstoneButton").setRegistryName("red_sandstone_button").setHardness(0.5F)); + Utils.regBlock(SandstoneButton.setUnlocalizedName("SandstoneButton").setRegistryName("sandstone_button").setHardness(0.5F)); + Utils.regBlock(VoidButton.setUnlocalizedName("VoidButton").setRegistryName("void_button").setHardness(0.5F)); + + //unbreakable buttons + Utils.regBlock(BedrockButton.setUnlocalizedName("BedrockButton").setRegistryName("bedrock_button").setHardness(-1F).setResistance(18000000F).setBlockUnbreakable()); + Utils.regBlock(GlowingObsidianButton.setUnlocalizedName("GlowingObsidianButton").setRegistryName("glowing_obsidian_button").setHardness(51F).setResistance(2000F).setLightLevel(.46666667F)); + Utils.regBlock(ObsidianButton.setUnlocalizedName("ObsidianButton").setRegistryName("obsidian_button").setHardness(51F).setResistance(6000F)); + + //wooden buttons + Utils.regBlock(AcaciaButton.setUnlocalizedName("AcaciaButton").setRegistryName("acacia_button").setHardness(0.5F)); + Utils.regBlock(BirchButton.setUnlocalizedName("BirchButton").setRegistryName("birch_button").setHardness(0.5F)); + Utils.regBlock(CactusButton.setUnlocalizedName("CactusButton").setRegistryName("cactus_button").setHardness(0.5F)); + Utils.regBlock(DarkOakButton.setUnlocalizedName("DarkOakButton").setRegistryName("dark_oak_button").setHardness(0.5F)); + Utils.regBlock(JungleButton.setUnlocalizedName("JungleButton").setRegistryName("jungle_button").setHardness(0.5F)); + Utils.regBlock(SpruceButton.setUnlocalizedName("SpruceButton").setRegistryName("spruce_button").setHardness(0.5F)); } public static void regRenders() { - Utils.regRender(VoidButton); - Utils.regRender(DirtButton); - Utils.regRender(GrassButton); - Utils.regRender(RustyButton); + Utils.regRender(AcaciaButton); + Utils.regRender(AndesiteButton); + Utils.regRender(BedrockButton); + Utils.regRender(BirchButton); Utils.regRender(CactusButton); - Utils.regRender(GlowingObsidianButton); - Utils.regRender(EndButton); - Utils.regRender(SilverButton); + Utils.regRender(CobblestoneButton); + Utils.regRender(DarkOakButton); Utils.regRender(DiamondButton); + Utils.regRender(DioriteButton); + Utils.regRender(DirtButton); Utils.regRender(EmeraldButton); + Utils.regRender(EndButton); + Utils.regRender(GlassButton); Utils.regRender(GoldButton); - Utils.regRender(IronButton); - Utils.regRender(RubyButton); - Utils.regRender(BedrockButton); - Utils.regRender(ObsidianButton); - Utils.regRender(CobblestoneButton); - Utils.regRender(MossyButton); - Utils.regRender(AndesiteButton); - Utils.regRender(DioriteButton); + Utils.regRender(GlowingObsidianButton); Utils.regRender(GraniteButton); - Utils.regRender(AcaciaButton); - Utils.regRender(BirchButton); - Utils.regRender(DarkOakButton); + Utils.regRender(GrassButton); + Utils.regRender(IronButton); Utils.regRender(JungleButton); + Utils.regRender(MossyButton); + Utils.regRender(ObsidianButton); + Utils.regRender(RedSandstoneButton); + Utils.regRender(RubyButton); + Utils.regRender(RustyButton); + Utils.regRender(SandstoneButton); + Utils.regRender(SilverButton); Utils.regRender(SpruceButton); + Utils.regRender(VoidButton); } -} +} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Chests.java b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Chests.java index 32be0c2..0cffcf5 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Chests.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Chests.java @@ -15,19 +15,16 @@ public class Chests { public static Block CompressedCactusChestTrapped; public static void initAndRegister() { - //chests - Utils.regBlock(CompressedCactusChest=new CompressedCactusChest()); - Utils.regBlock(CompressedCactusChestTrapped=new CompressedCactusChestTrapped()); Utils.regBlock(CactusChest = new CactusChest()); Utils.regBlock(CactusChestTrapped = new CactusChestTrapped()); - + Utils.regBlock(CompressedCactusChest=new CompressedCactusChest()); + Utils.regBlock(CompressedCactusChestTrapped=new CompressedCactusChestTrapped()); } public static void regRenders() { - Utils.regRender(CompressedCactusChest); - Utils.regRender(CompressedCactusChestTrapped); Utils.regRender(CactusChest); Utils.regRender(CactusChestTrapped); - + Utils.regRender(CompressedCactusChest); + Utils.regRender(CompressedCactusChestTrapped); } } diff --git a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Crystals.java b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Crystals.java index e617784..d29dbbf 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Crystals.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Crystals.java @@ -1,29 +1,24 @@ package com.NetherNoah.ParadiseMod.init.ModBlocks; import com.NetherNoah.ParadiseMod.Utils; -import com.NetherNoah.ParadiseMod.blocks.crystals.diamondCrystal; -import com.NetherNoah.ParadiseMod.blocks.crystals.emeraldCrystal; -import com.NetherNoah.ParadiseMod.blocks.crystals.quartzCrystal; -import com.NetherNoah.ParadiseMod.blocks.crystals.redstoneCrystal; -import com.NetherNoah.ParadiseMod.blocks.crystals.rubyCrystal; -import net.minecraft.block.BlockBush; +import com.NetherNoah.ParadiseMod.blocks.base.Crystal; +import com.NetherNoah.ParadiseMod.init.ModItems.MiscItems; + +import net.minecraft.init.Items; public class Crystals { - //crystals - public static BlockBush diamondCrystal; - public static BlockBush emeraldCrystal; - public static BlockBush quartzCrystal; - public static BlockBush redstoneCrystal; - public static BlockBush rubyCrystal; + public static Crystal diamondCrystal = new Crystal(Items.DIAMOND); + public static Crystal emeraldCrystal = new Crystal(Items.EMERALD); + public static Crystal quartzCrystal = new Crystal(Items.QUARTZ); + public static Crystal redstoneCrystal = new Crystal(Items.REDSTONE); + public static Crystal rubyCrystal = new Crystal(MiscItems.Ruby); public static void initAndRegister() { - - //crystals - Utils.regBlock(diamondCrystal = new diamondCrystal()); - Utils.regBlock(emeraldCrystal = new emeraldCrystal()); - Utils.regBlock(quartzCrystal = new quartzCrystal()); - Utils.regBlock(redstoneCrystal = new redstoneCrystal()); - Utils.regBlock(rubyCrystal = new rubyCrystal()); + Utils.regBlock(diamondCrystal.setUnlocalizedName("diamondCrystal").setRegistryName("diamond_crystal")); + Utils.regBlock(emeraldCrystal.setUnlocalizedName("emeraldCrystal").setRegistryName("emerald_crystal")); + Utils.regBlock(quartzCrystal.setUnlocalizedName("quartzCrystal").setRegistryName("quartz_crystal")); + Utils.regBlock(redstoneCrystal.setUnlocalizedName("redstoneCrystal").setRegistryName("redstone_crystal")); + Utils.regBlock(rubyCrystal.setUnlocalizedName("rubyCrystal").setRegistryName("ruby_crystal")); } public static void regRenders() { diff --git a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Doors.java b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Doors.java index 3537fc6..6db44b7 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Doors.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Doors.java @@ -1,6 +1,6 @@ package com.NetherNoah.ParadiseMod.init.ModBlocks; -import com.NetherNoah.ParadiseMod.CustomBlockCode.RSDoor; +import com.NetherNoah.ParadiseMod.blocks.RedstoneDoor; import com.NetherNoah.ParadiseMod.blocks.doors.AndesiteDoor; import com.NetherNoah.ParadiseMod.blocks.doors.BedrockDoor; import com.NetherNoah.ParadiseMod.blocks.doors.CactusDoor; @@ -15,58 +15,59 @@ import com.NetherNoah.ParadiseMod.blocks.doors.GraniteDoor; import com.NetherNoah.ParadiseMod.blocks.doors.MossStoneDoor; import com.NetherNoah.ParadiseMod.blocks.doors.ObsidianDoor; -import com.NetherNoah.ParadiseMod.blocks.doors.RedstoneDoor; import com.NetherNoah.ParadiseMod.blocks.doors.RubyDoor; import com.NetherNoah.ParadiseMod.blocks.doors.RustyDoor; import com.NetherNoah.ParadiseMod.blocks.doors.SilverDoor; import com.NetherNoah.ParadiseMod.blocks.doors.StoneDoor; + +import net.minecraft.block.Block; import net.minecraft.block.BlockDoor; import net.minecraftforge.fml.common.registry.ForgeRegistries; public class Doors { //doors - public static BlockDoor BlockCactusDoor; - public static BlockDoor BlockEndDoor; - public static BlockDoor BlockSilverDoor; - public static BlockDoor BlockGlassDoor; - public static BlockDoor BlockGoldDoor; - public static BlockDoor BlockDiamondDoor; - public static BlockDoor BlockEmeraldDoor; - public static BlockDoor BlockAndesiteDoor; - public static BlockDoor BlockDioriteDoor; - public static BlockDoor BlockGraniteDoor; - public static BlockDoor BlockStoneDoor; - public static BlockDoor BlockCobblestoneDoor; - public static BlockDoor BlockMossStoneDoor; - public static BlockDoor BlockGlowingObsidianDoor; - public static BlockDoor BlockObsidianDoor; - public static BlockDoor BlockBedrockDoor; - public static BlockDoor BlockRubyDoor; - public static RSDoor BlockRedstoneDoor; - public static BlockDoor RustyDoor;; + public static BlockDoor CactusDoor; + public static BlockDoor EndDoor; + public static BlockDoor SilverDoor; + public static BlockDoor GlassDoor; + public static BlockDoor GoldDoor; + public static BlockDoor DiamondDoor; + public static BlockDoor EmeraldDoor; + public static BlockDoor AndesiteDoor; + public static BlockDoor DioriteDoor; + public static BlockDoor GraniteDoor; + public static BlockDoor StoneDoor; + public static BlockDoor CobblestoneDoor; + public static BlockDoor MossStoneDoor; + public static BlockDoor GlowingObsidianDoor; + public static BlockDoor ObsidianDoor; + public static BlockDoor BedrockDoor; + public static BlockDoor RubyDoor; + public static Block RedstoneDoor; + public static BlockDoor RustyDoor; public static void initAndRegister() { // door blocks // they don't need their own items ForgeRegistries.BLOCKS.register(RustyDoor=new RustyDoor()); - ForgeRegistries.BLOCKS.register(BlockCactusDoor=new CactusDoor()); - ForgeRegistries.BLOCKS.register(BlockGlowingObsidianDoor=new GlowingObsidianDoor()); - ForgeRegistries.BLOCKS.register(BlockEndDoor=new EndDoor()); - ForgeRegistries.BLOCKS.register(BlockSilverDoor=new SilverDoor()); - ForgeRegistries.BLOCKS.register(BlockGlassDoor = new GlassDoor()); - ForgeRegistries.BLOCKS.register(BlockGoldDoor = new GoldDoor()); - ForgeRegistries.BLOCKS.register(BlockDiamondDoor = new DiamondDoor()); - ForgeRegistries.BLOCKS.register(BlockEmeraldDoor = new EmeraldDoor()); - ForgeRegistries.BLOCKS.register(BlockAndesiteDoor = new AndesiteDoor()); - ForgeRegistries.BLOCKS.register(BlockDioriteDoor = new DioriteDoor()); - ForgeRegistries.BLOCKS.register(BlockGraniteDoor = new GraniteDoor()); - ForgeRegistries.BLOCKS.register(BlockStoneDoor = new StoneDoor()); - ForgeRegistries.BLOCKS.register(BlockCobblestoneDoor = new CobblestoneDoor()); - ForgeRegistries.BLOCKS.register(BlockMossStoneDoor = new MossStoneDoor()); - ForgeRegistries.BLOCKS.register(BlockObsidianDoor = new ObsidianDoor()); - ForgeRegistries.BLOCKS.register(BlockBedrockDoor = new BedrockDoor()); - ForgeRegistries.BLOCKS.register(BlockRubyDoor = new RubyDoor()); - ForgeRegistries.BLOCKS.register(BlockRedstoneDoor = new RedstoneDoor()); + ForgeRegistries.BLOCKS.register(CactusDoor=new CactusDoor()); + ForgeRegistries.BLOCKS.register(GlowingObsidianDoor=new GlowingObsidianDoor()); + ForgeRegistries.BLOCKS.register(EndDoor=new EndDoor()); + ForgeRegistries.BLOCKS.register(SilverDoor=new SilverDoor()); + ForgeRegistries.BLOCKS.register(GlassDoor = new GlassDoor()); + ForgeRegistries.BLOCKS.register(GoldDoor = new GoldDoor()); + ForgeRegistries.BLOCKS.register(DiamondDoor = new DiamondDoor()); + ForgeRegistries.BLOCKS.register(EmeraldDoor = new EmeraldDoor()); + ForgeRegistries.BLOCKS.register(AndesiteDoor = new AndesiteDoor()); + ForgeRegistries.BLOCKS.register(DioriteDoor = new DioriteDoor()); + ForgeRegistries.BLOCKS.register(GraniteDoor = new GraniteDoor()); + ForgeRegistries.BLOCKS.register(StoneDoor = new StoneDoor()); + ForgeRegistries.BLOCKS.register(CobblestoneDoor = new CobblestoneDoor()); + ForgeRegistries.BLOCKS.register(MossStoneDoor = new MossStoneDoor()); + ForgeRegistries.BLOCKS.register(ObsidianDoor = new ObsidianDoor()); + ForgeRegistries.BLOCKS.register(BedrockDoor = new BedrockDoor()); + ForgeRegistries.BLOCKS.register(RubyDoor = new RubyDoor()); + ForgeRegistries.BLOCKS.register(RedstoneDoor = new RedstoneDoor()); } } diff --git a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Fences.java b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Fences.java index b185bac..47e46c9 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Fences.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Fences.java @@ -1,58 +1,58 @@ package com.NetherNoah.ParadiseMod.init.ModBlocks; import com.NetherNoah.ParadiseMod.Utils; -import com.NetherNoah.ParadiseMod.blocks.fences.BrickFence; -import com.NetherNoah.ParadiseMod.blocks.fences.CactusFence; -import com.NetherNoah.ParadiseMod.blocks.fences.DiamondFence; -import com.NetherNoah.ParadiseMod.blocks.fences.EmeraldFence; -import com.NetherNoah.ParadiseMod.blocks.fences.GoldFence; -import com.NetherNoah.ParadiseMod.blocks.fences.IronFence; -import com.NetherNoah.ParadiseMod.blocks.fences.RedstoneFence; -import com.NetherNoah.ParadiseMod.blocks.fences.RubyFence; -import com.NetherNoah.ParadiseMod.blocks.fences.RustyFence; -import com.NetherNoah.ParadiseMod.blocks.fences.SilverFence; -import net.minecraft.block.BlockFence; +import com.NetherNoah.ParadiseMod.blocks.RedstoneFence; +import com.NetherNoah.ParadiseMod.blocks.base.CustomFence; + +import net.minecraft.block.material.MapColor; +import net.minecraft.block.material.Material; public class Fences { - //fences - public static BlockFence RustyFence; - public static BlockFence BlockCactusFence; - public static BlockFence BlockSilverFence; - public static BlockFence BlockBrickFence; - public static BlockFence BlockDiamondFence; - public static BlockFence BlockEmeraldFence; - public static BlockFence BlockGoldFence; - public static BlockFence BlockIronFence; - public static BlockFence BlockRubyFence; - public static BlockFence BlockRedstoneFence; + public static CustomFence BrickFence = new CustomFence(Material.ROCK, MapColor.ADOBE); + public static CustomFence CactusFence = new CustomFence(Material.WOOD, MapColor.GREEN); + public static CustomFence DiamondFence = new CustomFence(Material.IRON, MapColor.DIAMOND); + public static CustomFence EmeraldFence = new CustomFence(Material.IRON, MapColor.EMERALD); + public static CustomFence GoldFence = new CustomFence(Material.IRON, MapColor.GOLD); + public static CustomFence IronFence = new CustomFence(Material.IRON, MapColor.IRON); + public static RedstoneFence RedstoneFence = new RedstoneFence(); + public static CustomFence RubyFence = new CustomFence(Material.IRON, MapColor.MAGENTA); + public static CustomFence RustyFence = new CustomFence(Material.IRON, MapColor.IRON); + public static CustomFence SilverFence = new CustomFence(Material.IRON, MapColor.SILVER); public static void initAndRegister() { //fences - Utils.regBlock(RustyFence=new RustyFence()); - Utils.regBlock(BlockCactusFence=new CactusFence()); - Utils.regBlock(BlockSilverFence=new SilverFence()); - Utils.regBlock(BlockBrickFence = new BrickFence()); - Utils.regBlock(BlockDiamondFence = new DiamondFence()); - Utils.regBlock(BlockEmeraldFence = new EmeraldFence()); - Utils.regBlock(BlockGoldFence = new GoldFence()); - Utils.regBlock(BlockIronFence = new IronFence()); - Utils.regBlock(BlockRubyFence = new RubyFence()); - Utils.regBlock(BlockRedstoneFence = new RedstoneFence()); - + BrickFence.setHarvestLevel("pickaxe", 0); + DiamondFence.setHarvestLevel("pickaxe", 2); + EmeraldFence.setHarvestLevel("pickaxe", 2); + GoldFence.setHarvestLevel("pickaxe", 2); + IronFence.setHarvestLevel("pickaxe", 1); + RubyFence.setHarvestLevel("pickaxe", 2); + RustyFence.setHarvestLevel("pickaxe", 1); + SilverFence.setHarvestLevel("pickaxe", 2); + Utils.regBlock(BrickFence.setUnlocalizedName("BrickFence").setRegistryName("brick_fence").setHardness(5F).setResistance(10F)); + Utils.regBlock(CactusFence.setUnlocalizedName("CactusFence").setRegistryName("cactus_fence").setHardness(2F).setResistance(5F)); + Utils.regBlock(DiamondFence.setUnlocalizedName("DiamondFence").setRegistryName("diamond_fence").setHardness(5F).setResistance(10F)); + Utils.regBlock(EmeraldFence.setUnlocalizedName("EmeraldFence").setRegistryName("emerald_fence").setHardness(5F).setResistance(10F)); + Utils.regBlock(GoldFence.setUnlocalizedName("GoldFence").setRegistryName("gold_fence").setHardness(5F).setResistance(10F)); + Utils.regBlock(IronFence.setUnlocalizedName("IronFence").setRegistryName("iron_fence").setHardness(5F).setResistance(10F)); + Utils.regBlock(RedstoneFence); + Utils.regBlock(RubyFence.setUnlocalizedName("RubyFence").setRegistryName("ruby_fence").setHardness(5F).setResistance(10F)); + Utils.regBlock(RustyFence.setUnlocalizedName("RustyFence").setRegistryName("rusty_fence").setHardness(5F).setResistance(10F)); + Utils.regBlock(SilverFence.setUnlocalizedName("SilverFence").setRegistryName("silver_fence").setHardness(5F).setResistance(10F)); } + public static void regRenders() { + Utils.regRender(BrickFence); + Utils.regRender(CactusFence); + Utils.regRender(DiamondFence); + Utils.regRender(EmeraldFence); + Utils.regRender(GoldFence); + Utils.regRender(IronFence); + Utils.regRender(RedstoneFence); + Utils.regRender(RubyFence); Utils.regRender(RustyFence); - Utils.regRender(BlockCactusFence); - Utils.regRender(BlockSilverFence); - Utils.regRender(BlockBrickFence); - Utils.regRender(BlockDiamondFence); - Utils.regRender(BlockEmeraldFence); - Utils.regRender(BlockGoldFence); - Utils.regRender(BlockIronFence); - Utils.regRender(BlockRubyFence); - Utils.regRender(BlockRedstoneFence); - + Utils.regRender(SilverFence); } -} +} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Gates.java b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Gates.java index 503696c..4b20d3d 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Gates.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Gates.java @@ -1,60 +1,58 @@ package com.NetherNoah.ParadiseMod.init.ModBlocks; import com.NetherNoah.ParadiseMod.Utils; -import com.NetherNoah.ParadiseMod.CustomBlockCode.RSFenceGate; -import com.NetherNoah.ParadiseMod.blocks.fenceGates.BrickFenceGate; -import com.NetherNoah.ParadiseMod.blocks.fenceGates.CactusFenceGate; -import com.NetherNoah.ParadiseMod.blocks.fenceGates.DiamondFenceGate; -import com.NetherNoah.ParadiseMod.blocks.fenceGates.EmeraldFenceGate; -import com.NetherNoah.ParadiseMod.blocks.fenceGates.GoldFenceGate; -import com.NetherNoah.ParadiseMod.blocks.fenceGates.IronFenceGate; -import com.NetherNoah.ParadiseMod.blocks.fenceGates.RedstoneFenceGate; -import com.NetherNoah.ParadiseMod.blocks.fenceGates.RubyFenceGate; -import com.NetherNoah.ParadiseMod.blocks.fenceGates.RustyFenceGate; -import com.NetherNoah.ParadiseMod.blocks.fenceGates.SilverFenceGate; +import com.NetherNoah.ParadiseMod.blocks.RedstoneFenceGate; +import com.NetherNoah.ParadiseMod.blocks.base.CustomGate; -import net.minecraft.block.BlockFenceGate; +import net.minecraft.block.BlockHorizontal; +import net.minecraft.block.SoundType; public class Gates { - //fence gates - public static BlockFenceGate RustyFenceGate; - public static BlockFenceGate BlockCactusFenceGate; - public static BlockFenceGate BlockSilverFenceGate; - public static BlockFenceGate BlockBrickFenceGate; - public static BlockFenceGate BlockDiamondFenceGate; - public static BlockFenceGate BlockEmeraldFenceGate; - public static BlockFenceGate BlockGoldFenceGate; - public static BlockFenceGate BlockIronFenceGate; - public static BlockFenceGate BlockRubyFenceGate; - public static RSFenceGate BlockRedstoneFenceGate; + public static CustomGate RustyFenceGate = new CustomGate(SoundType.METAL); + public static CustomGate CactusFenceGate = new CustomGate(SoundType.WOOD); + public static CustomGate SilverFenceGate = new CustomGate(SoundType.METAL); + public static CustomGate BrickFenceGate = new CustomGate(SoundType.STONE); + public static CustomGate DiamondFenceGate = new CustomGate(SoundType.METAL); + public static CustomGate EmeraldFenceGate = new CustomGate(SoundType.METAL); + public static CustomGate GoldFenceGate = new CustomGate(SoundType.METAL); + public static CustomGate IronFenceGate = new CustomGate(SoundType.METAL); + public static CustomGate RubyFenceGate = new CustomGate(SoundType.METAL); + public static BlockHorizontal RedstoneFenceGate; public static void initAndRegister() { - //fence gates - Utils.regBlock(RustyFenceGate=new RustyFenceGate()); - Utils.regBlock(BlockCactusFenceGate=new CactusFenceGate()); - Utils.regBlock(BlockSilverFenceGate=new SilverFenceGate()); - Utils.regBlock(BlockBrickFenceGate = new BrickFenceGate()); - Utils.regBlock(BlockDiamondFenceGate = new DiamondFenceGate()); - Utils.regBlock(BlockEmeraldFenceGate = new EmeraldFenceGate()); - Utils.regBlock(BlockGoldFenceGate = new GoldFenceGate()); - Utils.regBlock(BlockIronFenceGate = new IronFenceGate()); - Utils.regBlock(BlockRubyFenceGate = new RubyFenceGate()); - Utils.regBlock(BlockRedstoneFenceGate = new RedstoneFenceGate()); + BrickFenceGate.setHarvestLevel("pickaxe", 0); + DiamondFenceGate.setHarvestLevel("pickaxe", 2); + EmeraldFenceGate.setHarvestLevel("pickaxe", 2); + GoldFenceGate.setHarvestLevel("pickaxe", 2); + IronFenceGate.setHarvestLevel("pickaxe", 1); + RubyFenceGate.setHarvestLevel("pickaxe", 2); + RustyFenceGate.setHarvestLevel("pickaxe", 1); + SilverFenceGate.setHarvestLevel("pickaxe", 2); + Utils.regBlock(BrickFenceGate.setUnlocalizedName("BrickFenceGate").setRegistryName("brick_fence_gate").setHardness(5F).setResistance(10F)); + Utils.regBlock(CactusFenceGate.setUnlocalizedName("CactusFenceGate").setRegistryName("cactus_fence_gate").setHardness(5F).setResistance(10F)); + Utils.regBlock(DiamondFenceGate.setUnlocalizedName("DiamondFenceGate").setRegistryName("diamond_fence_gate").setHardness(5F).setResistance(10F)); + Utils.regBlock(EmeraldFenceGate.setUnlocalizedName("EmeraldFenceGate").setRegistryName("emerald_fence_gate").setHardness(5F).setResistance(10F)); + Utils.regBlock(GoldFenceGate.setUnlocalizedName("GoldFenceGate").setRegistryName("gold_fence_gate").setHardness(5F).setResistance(10F)); + Utils.regBlock(IronFenceGate.setUnlocalizedName("IronFenceGate").setRegistryName("iron_fence_gate").setHardness(5F).setResistance(10F)); + Utils.regBlock(RedstoneFenceGate = new RedstoneFenceGate()); + Utils.regBlock(RubyFenceGate.setUnlocalizedName("RubyFenceGate").setRegistryName("ruby_fence_gate").setHardness(5F).setResistance(10F)); + Utils.regBlock(RustyFenceGate.setUnlocalizedName("RustyFenceGate").setRegistryName("rusty_fence_gate").setHardness(5F).setResistance(10F)); + Utils.regBlock(SilverFenceGate.setUnlocalizedName("SilverFenceGate").setRegistryName("silver_fence_gate").setHardness(5F).setResistance(10F)); } - public static void regRenders() { + + public static void regRenders() { + Utils.regRender(BrickFenceGate); + Utils.regRender(CactusFenceGate); + Utils.regRender(DiamondFenceGate); + Utils.regRender(EmeraldFenceGate); + Utils.regRender(GoldFenceGate); + Utils.regRender(IronFenceGate); + Utils.regRender(RedstoneFenceGate); + Utils.regRender(RubyFenceGate); Utils.regRender(RustyFenceGate); - Utils.regRender(BlockCactusFenceGate); - Utils.regRender(BlockBrickFenceGate); - Utils.regRender(BlockDiamondFenceGate); - Utils.regRender(BlockEmeraldFenceGate); - Utils.regRender(BlockSilverFenceGate); - Utils.regRender(BlockGoldFenceGate); - Utils.regRender(BlockIronFenceGate); - Utils.regRender(BlockRubyFenceGate); - Utils.regRender(BlockRedstoneFenceGate); - + Utils.regRender(SilverFenceGate); } -} +} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Lamps.java b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Lamps.java index 9d87952..3f02ed0 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Lamps.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Lamps.java @@ -44,100 +44,101 @@ public static SaltLamp getSaltLamp() return SaltLamp; } public static SaltLamp SaltLamp; - //unlit lamps - public static BlockRedstoneLight BlackRSLamp; - public static BlockRedstoneLight BlueRSLamp; - public static BlockRedstoneLight BrownRSLamp; - public static BlockRedstoneLight CyanRSLamp; - public static BlockRedstoneLight GrayRSLamp; - public static BlockRedstoneLight GreenRSLamp; - public static BlockRedstoneLight LightBlueRSLamp; - public static BlockRedstoneLight LimeRSLamp; - public static BlockRedstoneLight MagentaRSLamp; - public static BlockRedstoneLight OrangeRSLamp; - public static BlockRedstoneLight PinkRSLamp; - public static BlockRedstoneLight PurpleRSLamp; - public static BlockRedstoneLight RedRSLamp; - public static BlockRedstoneLight SilverRSLamp; - public static BlockRedstoneLight WhiteRSLamp; - public static BlockRedstoneLight YellowRSLamp; - + //lit lamps - public static BlockRedstoneLight LitBlackRSLamp; - public static BlockRedstoneLight LitBlueRSLamp; - public static BlockRedstoneLight LitBrownRSLamp; - public static BlockRedstoneLight LitCyanRSLamp; - public static BlockRedstoneLight LitGrayRSLamp; - public static BlockRedstoneLight LitGreenRSLamp; - public static BlockRedstoneLight LitLightBlueRSLamp; - public static BlockRedstoneLight LitLimeRSLamp; - public static BlockRedstoneLight LitMagentaRSLamp; - public static BlockRedstoneLight LitOrangeRSLamp; - public static BlockRedstoneLight LitPinkRSLamp; - public static BlockRedstoneLight LitPurpleRSLamp; - public static BlockRedstoneLight LitRedRSLamp; - public static BlockRedstoneLight LitSilverRSLamp; - public static BlockRedstoneLight LitWhiteRSLamp; - public static BlockRedstoneLight LitYellowRSLamp; + public static BlockRedstoneLight LitBlackLamp; + public static BlockRedstoneLight LitBlueLamp; + public static BlockRedstoneLight LitBrownLamp; + public static BlockRedstoneLight LitCyanLamp; + public static BlockRedstoneLight LitGrayLamp; + public static BlockRedstoneLight LitGreenLamp; + public static BlockRedstoneLight LitLightBlueLamp; + public static BlockRedstoneLight LitLimeLamp; + public static BlockRedstoneLight LitMagentaLamp; + public static BlockRedstoneLight LitOrangeLamp; + public static BlockRedstoneLight LitPinkLamp; + public static BlockRedstoneLight LitPurpleLamp; + public static BlockRedstoneLight LitRedLamp; + public static BlockRedstoneLight LitSilverLamp; + public static BlockRedstoneLight LitWhiteLamp; + public static BlockRedstoneLight LitYellowLamp; + + //unlit lamps + public static BlockRedstoneLight BlackLamp; + public static BlockRedstoneLight BlueLamp; + public static BlockRedstoneLight BrownLamp; + public static BlockRedstoneLight CyanLamp; + public static BlockRedstoneLight GrayLamp; + public static BlockRedstoneLight GreenLamp; + public static BlockRedstoneLight LightBlueLamp; + public static BlockRedstoneLight LimeLamp; + public static BlockRedstoneLight MagentaLamp; + public static BlockRedstoneLight OrangeLamp; + public static BlockRedstoneLight PinkLamp; + public static BlockRedstoneLight PurpleLamp; + public static BlockRedstoneLight RedLamp; + public static BlockRedstoneLight SilverLamp; + public static BlockRedstoneLight WhiteLamp; + public static BlockRedstoneLight YellowLamp; + public static void initAndRegister() { - Utils.regBlock(SaltLamp=new SaltLamp()); - //unlit lamps - Utils.regBlock(BlackRSLamp = new BlackRSLamp()); - Utils.regBlock(BlueRSLamp = new BlueRSLamp()); - Utils.regBlock(BrownRSLamp = new BrownRSLamp()); - Utils.regBlock(CyanRSLamp = new CyanRSLamp()); - Utils.regBlock(GrayRSLamp = new GrayRSLamp()); - Utils.regBlock(GreenRSLamp = new GreenRSLamp()); - Utils.regBlock(LightBlueRSLamp = new LightBlueRSLamp()); - Utils.regBlock(LimeRSLamp = new LimeRSLamp()); - Utils.regBlock(MagentaRSLamp = new MagentaRSLamp()); - Utils.regBlock(OrangeRSLamp = new OrangeRSLamp()); - Utils.regBlock(PinkRSLamp = new PinkRSLamp()); - Utils.regBlock(PurpleRSLamp = new PurpleRSLamp()); - Utils.regBlock(RedRSLamp = new RedRSLamp()); - Utils.regBlock(SilverRSLamp = new SilverRSLamp()); - Utils.regBlock(WhiteRSLamp = new WhiteRSLamp()); - Utils.regBlock(YellowRSLamp = new YellowRSLamp()); - + //lit lamps - ForgeRegistries.BLOCKS.register(LitBlackRSLamp = new LitBlackRSLamp()); - ForgeRegistries.BLOCKS.register(LitBlueRSLamp = new LitBlueRSLamp()); - ForgeRegistries.BLOCKS.register(LitBrownRSLamp = new LitBrownRSLamp()); - ForgeRegistries.BLOCKS.register(LitCyanRSLamp = new LitCyanRSLamp()); - ForgeRegistries.BLOCKS.register(LitGrayRSLamp = new LitGrayRSLamp()); - ForgeRegistries.BLOCKS.register(LitGreenRSLamp = new LitGreenRSLamp()); - ForgeRegistries.BLOCKS.register(LitLightBlueRSLamp = new LitLightBlueRSLamp()); - ForgeRegistries.BLOCKS.register(LitLimeRSLamp = new LitLimeRSLamp()); - ForgeRegistries.BLOCKS.register(LitMagentaRSLamp = new LitMagentaRSLamp()); - ForgeRegistries.BLOCKS.register(LitOrangeRSLamp = new LitOrangeRSLamp()); - ForgeRegistries.BLOCKS.register(LitPinkRSLamp = new LitPinkRSLamp()); - ForgeRegistries.BLOCKS.register(LitPurpleRSLamp = new LitPurpleRSLamp()); - ForgeRegistries.BLOCKS.register(LitRedRSLamp = new LitRedRSLamp()); - ForgeRegistries.BLOCKS.register(LitSilverRSLamp = new LitSilverRSLamp()); - ForgeRegistries.BLOCKS.register(LitWhiteRSLamp = new LitWhiteRSLamp()); - ForgeRegistries.BLOCKS.register(LitYellowRSLamp = new LitYellowRSLamp()); + ForgeRegistries.BLOCKS.register(LitBlackLamp = new LitBlackRSLamp()); + ForgeRegistries.BLOCKS.register(LitBlueLamp = new LitBlueRSLamp()); + ForgeRegistries.BLOCKS.register(LitBrownLamp = new LitBrownRSLamp()); + ForgeRegistries.BLOCKS.register(LitCyanLamp = new LitCyanRSLamp()); + ForgeRegistries.BLOCKS.register(LitGrayLamp = new LitGrayRSLamp()); + ForgeRegistries.BLOCKS.register(LitGreenLamp = new LitGreenRSLamp()); + ForgeRegistries.BLOCKS.register(LitLightBlueLamp = new LitLightBlueRSLamp()); + ForgeRegistries.BLOCKS.register(LitLimeLamp = new LitLimeRSLamp()); + ForgeRegistries.BLOCKS.register(LitMagentaLamp = new LitMagentaRSLamp()); + ForgeRegistries.BLOCKS.register(LitOrangeLamp = new LitOrangeRSLamp()); + ForgeRegistries.BLOCKS.register(LitPinkLamp = new LitPinkRSLamp()); + ForgeRegistries.BLOCKS.register(LitPurpleLamp = new LitPurpleRSLamp()); + ForgeRegistries.BLOCKS.register(LitRedLamp = new LitRedRSLamp()); + ForgeRegistries.BLOCKS.register(LitSilverLamp = new LitSilverRSLamp()); + ForgeRegistries.BLOCKS.register(LitWhiteLamp = new LitWhiteRSLamp()); + ForgeRegistries.BLOCKS.register(LitYellowLamp = new LitYellowRSLamp()); + //unlit lamps + Utils.regBlock(BlackLamp = new BlackRSLamp()); + Utils.regBlock(BlueLamp = new BlueRSLamp()); + Utils.regBlock(BrownLamp = new BrownRSLamp()); + Utils.regBlock(CyanLamp = new CyanRSLamp()); + Utils.regBlock(GrayLamp = new GrayRSLamp()); + Utils.regBlock(GreenLamp = new GreenRSLamp()); + Utils.regBlock(LightBlueLamp = new LightBlueRSLamp()); + Utils.regBlock(LimeLamp = new LimeRSLamp()); + Utils.regBlock(MagentaLamp = new MagentaRSLamp()); + Utils.regBlock(OrangeLamp = new OrangeRSLamp()); + Utils.regBlock(PinkLamp = new PinkRSLamp()); + Utils.regBlock(PurpleLamp = new PurpleRSLamp()); + Utils.regBlock(RedLamp = new RedRSLamp()); + Utils.regBlock(SilverLamp = new SilverRSLamp()); + Utils.regBlock(WhiteLamp = new WhiteRSLamp()); + Utils.regBlock(YellowLamp = new YellowRSLamp()); } - public static void regRenders() { + + public static void regRenders() { + Utils.regRender(BlackLamp); + Utils.regRender(BlueLamp); + Utils.regRender(BrownLamp); + Utils.regRender(CyanLamp); + Utils.regRender(GrayLamp); + Utils.regRender(GreenLamp); + Utils.regRender(LightBlueLamp); + Utils.regRender(LimeLamp); + Utils.regRender(MagentaLamp); + Utils.regRender(OrangeLamp); + Utils.regRender(PinkLamp); + Utils.regRender(PurpleLamp); + Utils.regRender(RedLamp); Utils.regRender(SaltLamp); - Utils.regRender(BlackRSLamp); - Utils.regRender(BlueRSLamp); - Utils.regRender(BrownRSLamp); - Utils.regRender(CyanRSLamp); - Utils.regRender(GrayRSLamp); - Utils.regRender(GreenRSLamp); - Utils.regRender(LightBlueRSLamp); - Utils.regRender(LimeRSLamp); - Utils.regRender(MagentaRSLamp); - Utils.regRender(OrangeRSLamp); - Utils.regRender(PinkRSLamp); - Utils.regRender(PurpleRSLamp); - Utils.regRender(RedRSLamp); - Utils.regRender(SilverRSLamp); - Utils.regRender(WhiteRSLamp); - Utils.regRender(YellowRSLamp); - + Utils.regRender(SilverLamp); + Utils.regRender(WhiteLamp); + Utils.regRender(YellowLamp); } -} +} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Misc.java b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Misc.java index 99e062f..0165c23 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Misc.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Misc.java @@ -1,39 +1,19 @@ package com.NetherNoah.ParadiseMod.init.ModBlocks; import com.NetherNoah.ParadiseMod.Utils; -import com.NetherNoah.ParadiseMod.CustomBlockCode.MossyFurnaceCode; -import com.NetherNoah.ParadiseMod.CustomBlockCode.VoidFurnaceCode; -import com.NetherNoah.ParadiseMod.CustomBlockCode.xmasTree; -import com.NetherNoah.ParadiseMod.blocks.formations.icicle; -import com.NetherNoah.ParadiseMod.blocks.formations.mossyStoneFormation; -import com.NetherNoah.ParadiseMod.blocks.formations.netherrackFormation; -import com.NetherNoah.ParadiseMod.blocks.formations.sandstoneFormation; -import com.NetherNoah.ParadiseMod.blocks.formations.stoneFormation; -import com.NetherNoah.ParadiseMod.blocks.misc.BlueRose; +import com.NetherNoah.ParadiseMod.blocks.base.BasicBlock; +import com.NetherNoah.ParadiseMod.blocks.base.CaveFormation; +import com.NetherNoah.ParadiseMod.blocks.base.CustomGlass; +import com.NetherNoah.ParadiseMod.blocks.base.CustomPane; +import com.NetherNoah.ParadiseMod.blocks.base.CustomPlant; +import com.NetherNoah.ParadiseMod.blocks.base.MossyFurnaceBase; +import com.NetherNoah.ParadiseMod.blocks.base.VoidFurnaceBase; import com.NetherNoah.ParadiseMod.blocks.misc.CactusBookshelf; -import com.NetherNoah.ParadiseMod.blocks.misc.CompressedCactus; import com.NetherNoah.ParadiseMod.blocks.misc.DUPortal; import com.NetherNoah.ParadiseMod.blocks.misc.DVPortal; -import com.NetherNoah.ParadiseMod.blocks.misc.GoldBars; -import com.NetherNoah.ParadiseMod.blocks.misc.MossyFurnace; -import com.NetherNoah.ParadiseMod.blocks.misc.MossyFurnaceLit; -import com.NetherNoah.ParadiseMod.blocks.misc.PolishedVoidStone; import com.NetherNoah.ParadiseMod.blocks.misc.RegenerationStone; -import com.NetherNoah.ParadiseMod.blocks.misc.Rose; -import com.NetherNoah.ParadiseMod.blocks.misc.RustyIronBars; -import com.NetherNoah.ParadiseMod.blocks.misc.SilverBars; -import com.NetherNoah.ParadiseMod.blocks.misc.Stonecutter; -import com.NetherNoah.ParadiseMod.blocks.misc.VoidBricks; -import com.NetherNoah.ParadiseMod.blocks.misc.VoidFurnace; -import com.NetherNoah.ParadiseMod.blocks.misc.VoidFurnaceLit; -import com.NetherNoah.ParadiseMod.blocks.misc.VoidStone; -import com.NetherNoah.ParadiseMod.blocks.misc.bulletproofGlass; import com.NetherNoah.ParadiseMod.blocks.misc.emeraldRail; -import com.NetherNoah.ParadiseMod.blocks.misc.glowingIce; -import com.NetherNoah.ParadiseMod.blocks.misc.glowingObsidian; import com.NetherNoah.ParadiseMod.blocks.misc.prismarineCrystalBlock; -import com.NetherNoah.ParadiseMod.blocks.misc.soulGlass; -import com.NetherNoah.ParadiseMod.blocks.misc.soulGlassPane; import com.NetherNoah.ParadiseMod.blocks.misc.undergroundAir; import com.NetherNoah.ParadiseMod.blocks.redstone.GoldHopper; import com.NetherNoah.ParadiseMod.blocks.redstone.SilverHopper; @@ -48,8 +28,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockAir; import net.minecraft.block.BlockBreakable; -import net.minecraft.block.BlockBush; -import net.minecraft.block.BlockDirectional; import net.minecraft.block.BlockHopper; import net.minecraft.block.BlockLever; import net.minecraft.block.BlockOldLeaf; @@ -57,135 +35,188 @@ import net.minecraft.block.BlockPumpkin; import net.minecraft.block.BlockRail; import net.minecraft.block.BlockRailPowered; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; import net.minecraftforge.fml.common.registry.ForgeRegistries; public class Misc { //cave formations - public static BlockDirectional icicle; - public static BlockDirectional stoneFormation; - public static BlockDirectional mossyStoneFormation; - public static BlockDirectional sandstoneFormation; - public static BlockDirectional netherrackFormation; + public static CaveFormation icicle = new CaveFormation(SoundType.GLASS); + public static CaveFormation mossyStoneFormation = new CaveFormation(SoundType.STONE); + public static CaveFormation netherrackFormation = new CaveFormation(SoundType.STONE); + public static CaveFormation sandstoneFormation = new CaveFormation(SoundType.STONE); + public static CaveFormation stoneFormation = new CaveFormation(SoundType.STONE); - public static BlockBreakable bulletproofGlass; - public static BlockBreakable prismarineCrystalBlock; - public static BlockAir undergroundAir; - public static Block VoidBricks; + //christmas stuff + public static ChristmasSapling ChristmasSapling; + public static BlockOldLeaf ChristmasLeaves; + public static Block ChristmasTopper; + public static Block Present; + public static BlockPumpkin SantaHat; + + //deep void blocks + public static Block PolishedVoidStone = new Block(Material.ROCK); public static Block RegenerationStone; - public static Block PolishedVoidStone; - public static Block VoidStone; - public static BlockBush BlueRose; - public static BlockBush Rose; - public static Block Stonecutter; - public static Block CompressedCactus; + public static Block VoidBricks = new Block(Material.ROCK); + public static Block VoidStone = new Block(Material.ROCK); + + //flowers + public static CustomPlant BlueRose = new CustomPlant(); + public static CustomPlant Rose = new CustomPlant(); + + //furnaces + public static MossyFurnaceBase MossyFurnace = new MossyFurnaceBase(false); + public static MossyFurnaceBase MossyFurnaceLit = new MossyFurnaceBase(true); + public static VoidFurnaceBase VoidFurnace = new VoidFurnaceBase(false); + public static VoidFurnaceBase VoidFurnaceLit = new VoidFurnaceBase(true); + + //glass + public static BlockBreakable bulletproofGlass = new CustomGlass(); + public static CustomPane bulletproofGlassPane = new CustomPane(Material.GLASS, false, SoundType.GLASS); + public static BlockBreakable soulGlass = new CustomGlass(); + public static CustomPane soulGlassPane = new CustomPane(Material.GLASS, false, SoundType.GLASS); + + //hoppers + public static BlockHopper GoldHopper; + public static BlockHopper SilverHopper; + + //metal bars + public static CustomPane GoldBars = new CustomPane(Material.IRON, true, SoundType.METAL); + public static CustomPane RustyIronBars = new CustomPane(Material.IRON, true, SoundType.METAL); + public static CustomPane SilverBars = new CustomPane(Material.IRON, true, SoundType.METAL); + + //others public static Block CactusBookshelf; - public static BlockRailPowered emeraldRailPowered; - public static BlockRail emeraldRail; + public static BasicBlock CompressedCactus = new BasicBlock(Material.WOOD, SoundType.WOOD, false); + public static BasicBlock glowingIce = new BasicBlock(Material.ICE, SoundType.GLASS,false); + public static BasicBlock glowingObsidian = new BasicBlock(Material.ROCK,SoundType.STONE,true); public static BlockLever mossyLever; + public static BlockBreakable prismarineCrystalBlock; + public static Block Stonecutter = new Block(Material.ROCK); + public static BlockAir undergroundAir; + + //portal blocks public static DUPortal DUPortal; public static DVPortal DVPortal; - public static Block glowingObsidian; - public static Block Present; - public static xmasTree ChristmasSapling; - public static BlockPane GoldBars; - public static BlockOldLeaf ChristmasLeaves; - public static Block ChristmasTopper; - public static BlockPumpkin SantaHat; - public static BlockBreakable soulGlass; - public static BlockPane soulGlassPane; - public static BlockPane SilverBars; - public static BlockPane RustyIronBars; - public static BlockHopper SilverHopper; - public static BlockHopper GoldHopper; - public static MossyFurnaceCode MossyFurnace; - public static MossyFurnaceCode MossyFurnaceLit; - public static VoidFurnaceCode VoidFurnace; - public static VoidFurnaceCode VoidFurnaceLit; - public static Block glowingIce; + + //rails + public static BlockRail emeraldRail; + public static BlockRailPowered emeraldRailPowered; public static void initAndRegister() { - Utils.regBlock(icicle=new icicle()); - Utils.regBlock(stoneFormation=new stoneFormation()); - Utils.regBlock(mossyStoneFormation=new mossyStoneFormation()); - Utils.regBlock(sandstoneFormation=new sandstoneFormation()); - Utils.regBlock(netherrackFormation=new netherrackFormation()); + //cave formations + Utils.regBlock(icicle.setUnlocalizedName("Icicle").setRegistryName("icicle")); + Utils.regBlock(mossyStoneFormation.setUnlocalizedName("mossyStoneFormation").setRegistryName("mossy_stone_formation")); + Utils.regBlock(netherrackFormation.setUnlocalizedName("netherrackFormation").setRegistryName("netherrack_formation")); + Utils.regBlock(sandstoneFormation.setUnlocalizedName("sandstoneFormation").setRegistryName("sandstone_formation")); + Utils.regBlock(stoneFormation.setUnlocalizedName("stoneFormation").setRegistryName("stone_formation")); + + //christmas stuff + Utils.regBlock(ChristmasLeaves = new ChristmasLeaves()); + Utils.regBlock(ChristmasSapling = new ChristmasSapling()); + Utils.regBlock(ChristmasTopper = new ChristmasTopper()); + Utils.regBlock(Present = new Present()); + Utils.regBlock(SantaHat = new SantaHat()); - Utils.regBlock(bulletproofGlass=new bulletproofGlass()); - Utils.regBlock(prismarineCrystalBlock=new prismarineCrystalBlock()); + //deep void blocks + Utils.regBlock(PolishedVoidStone.setUnlocalizedName("PolishedVoidStone").setRegistryName("polished_void_stone").setHardness(5F).setResistance(10F).setCreativeTab(CreativeTabs.BUILDING_BLOCKS)); Utils.regBlock(RegenerationStone=new RegenerationStone()); - Utils.regBlock(VoidBricks=new VoidBricks()); - Utils.regBlock(PolishedVoidStone=new PolishedVoidStone()); - Utils.regBlock(VoidStone=new VoidStone()); - Utils.regBlock(DVPortal=new DVPortal()); - Utils.regBlock(BlueRose=new BlueRose()); - Utils.regBlock(Rose=new Rose()); - Utils.regBlock(Stonecutter=new Stonecutter()); - Utils.regBlock(RustyIronBars=new RustyIronBars()); - Utils.regBlock(CompressedCactus=new CompressedCactus()); - Utils.regBlock(CactusBookshelf=new CactusBookshelf()); + Utils.regBlock(VoidBricks.setUnlocalizedName("VoidBricks").setRegistryName("void_bricks").setHardness(5F).setResistance(10F).setCreativeTab(CreativeTabs.BUILDING_BLOCKS)); + Utils.regBlock(VoidStone.setUnlocalizedName("VoidStone").setRegistryName("void_stone").setHardness(5F).setResistance(15F).setCreativeTab(CreativeTabs.BUILDING_BLOCKS)); + + //flowers + Utils.regBlock(BlueRose.setUnlocalizedName("BlueRose").setRegistryName("blue_rose")); + Utils.regBlock(Rose.setUnlocalizedName("Rose").setRegistryName("rose")); + + //furnaces + Utils.regBlock(MossyFurnace.setUnlocalizedName("MossyFurnace").setRegistryName("mossy_furnace").setHardness(5F).setResistance(10F).setCreativeTab(CreativeTabs.DECORATIONS)); + ForgeRegistries.BLOCKS.register(MossyFurnaceLit.setUnlocalizedName("MossyFurnaceLit").setRegistryName("lit_mossy_furnace").setHardness(5F).setResistance(10F)); + Utils.regBlock(VoidFurnace.setUnlocalizedName("VoidFurnace").setRegistryName("void_furnace").setHardness(5F).setResistance(10F).setCreativeTab(CreativeTabs.DECORATIONS)); + ForgeRegistries.BLOCKS.register(VoidFurnaceLit.setUnlocalizedName("VoidFurnaceLit").setRegistryName("lit_void_furnace").setHardness(5F).setResistance(10F)); + + //glass + soulGlassPane.setDefaultSlipperiness(1F); + soulGlass.setDefaultSlipperiness(1F); + + Utils.regBlock(bulletproofGlass.setUnlocalizedName("bulletProofGlass").setRegistryName("bulletproof_glass").setHardness(.5F).setResistance(2000F).setCreativeTab(CreativeTabs.BUILDING_BLOCKS)); + Utils.regBlock(bulletproofGlassPane.setUnlocalizedName("bulletproofGlassPane").setRegistryName("bulletproof_glass_pane").setHardness(.5F).setResistance(2000F).setCreativeTab(CreativeTabs.DECORATIONS)); + Utils.regBlock(soulGlassPane.setUnlocalizedName("soulGlassPane").setRegistryName("soul_glass_pane").setHardness(.5F).setResistance(1F).setLightLevel(1F)); + Utils.regBlock(soulGlass.setUnlocalizedName("soulGlass").setRegistryName("soul_glass").setHardness(.5F).setResistance(1F).setLightLevel(1F)); + + //hoppers Utils.regBlock(SilverHopper=new SilverHopper()); - Utils.regBlock(SilverBars=new SilverBars()); - Utils.regBlock(emeraldRailPowered=new emeraldRailPowered()); - Utils.regBlock(emeraldRail=new emeraldRail()); - Utils.regBlock(mossyLever=new mossyLever()); - Utils.regBlock(DUPortal=new DUPortal()); - Utils.regBlock(glowingObsidian = new glowingObsidian()); - Utils.regBlock(soulGlassPane = new soulGlassPane()); - Utils.regBlock(soulGlass = new soulGlass()); - Utils.regBlock(Present = new Present()); - Utils.regBlock(SantaHat = new SantaHat()); - Utils.regBlock(ChristmasSapling = new ChristmasSapling()); - Utils.regBlock(ChristmasTopper = new ChristmasTopper()); - Utils.regBlock(GoldBars = new GoldBars()); - Utils.regBlock(ChristmasLeaves = new ChristmasLeaves()); Utils.regBlock(GoldHopper = new GoldHopper()); - Utils.regBlock(MossyFurnace = new MossyFurnace()); - Utils.regBlock(VoidFurnace=new VoidFurnace()); - Utils.regBlock(glowingIce=new glowingIce()); + + //metal bars + GoldBars.setHarvestLevel("pickaxe", 2); + RustyIronBars.setHarvestLevel("pickaxe", 0); + SilverBars.setHarvestLevel("pickaxe", 2); + + Utils.regBlock(GoldBars.setUnlocalizedName("GoldBars").setRegistryName("gold_bars").setHardness(5F).setResistance(10F).setCreativeTab(CreativeTabs.DECORATIONS)); + Utils.regBlock(RustyIronBars.setUnlocalizedName("RustyIronBars").setRegistryName("rusty_iron_bars").setHardness(5F).setResistance(10F).setCreativeTab(CreativeTabs.DECORATIONS)); + Utils.regBlock(SilverBars.setUnlocalizedName("SilverBars").setRegistryName("silver_bars").setHardness(5F).setResistance(10F).setCreativeTab(CreativeTabs.DECORATIONS)); + + //others + glowingIce.setDefaultSlipperiness(1F); + glowingObsidian.setHarvestLevel("pickaxe",3); + + Utils.regBlock(CactusBookshelf=new CactusBookshelf()); + Utils.regBlock(CompressedCactus.setUnlocalizedName("CompressedCactus").setRegistryName("compressed_cactus").setHardness(2.5F).setResistance(5F).setCreativeTab(CreativeTabs.BUILDING_BLOCKS)); + Utils.regBlock(glowingIce.setUnlocalizedName("glowingIce").setRegistryName("glowing_ice").setHardness(.2F).setResistance(2F).setCreativeTab(CreativeTabs.BUILDING_BLOCKS).setLightLevel(.46666667F)); + Utils.regBlock(glowingObsidian.setUnlocalizedName("glowingObsidian").setRegistryName("glowing_obsidian").setHardness(51F).setResistance(2000F).setCreativeTab(CreativeTabs.BUILDING_BLOCKS).setLightLevel(.46666667F)); + Utils.regBlock(mossyLever=new mossyLever()); + Utils.regBlock(prismarineCrystalBlock=new prismarineCrystalBlock()); + Utils.regBlock(Stonecutter.setUnlocalizedName("Stonecutter").setRegistryName("stonecutter").setHardness(5F).setResistance(5.8333333333F).setCreativeTab(CreativeTabs.DECORATIONS)); ForgeRegistries.BLOCKS.register(undergroundAir=new undergroundAir()); - ForgeRegistries.BLOCKS.register(MossyFurnaceLit = new MossyFurnaceLit()); - ForgeRegistries.BLOCKS.register(VoidFurnaceLit=new VoidFurnaceLit()); - + + //portal blocks + Utils.regBlock(DUPortal=new DUPortal()); + Utils.regBlock(DVPortal=new DVPortal()); + + //rails + Utils.regBlock(emeraldRail=new emeraldRail()); + Utils.regBlock(emeraldRailPowered=new emeraldRailPowered()); } public static void regRenders() { + Utils.regRender(BlueRose); + Utils.regRender(bulletproofGlass); + Utils.regRender(bulletproofGlassPane); + Utils.regRender(CactusBookshelf); + Utils.regRender(ChristmasLeaves); + Utils.regRender(ChristmasTopper); + Utils.regRender(ChristmasSapling); + Utils.regRender(CompressedCactus); + Utils.regRender(DUPortal); + Utils.regRender(DVPortal); + Utils.regRender(emeraldRailPowered); + Utils.regRender(emeraldRail); + Utils.regRender(glowingIce); + Utils.regRender(glowingObsidian); + Utils.regRender(GoldBars); + Utils.regRender(GoldHopper); Utils.regRender(icicle); - Utils.regRender(stoneFormation); + Utils.regRender(MossyFurnace); + Utils.regRender(mossyLever); Utils.regRender(mossyStoneFormation); - Utils.regRender(sandstoneFormation); Utils.regRender(netherrackFormation); - - Utils.regRender(bulletproofGlass); + Utils.regRender(PolishedVoidStone); + Utils.regRender(Present); Utils.regRender(prismarineCrystalBlock); - Utils.regRender(glowingIce); Utils.regRender(RegenerationStone); - Utils.regRender(VoidBricks); - Utils.regRender(PolishedVoidStone); - Utils.regRender(VoidStone); - Utils.regRender(DVPortal); - Utils.regRender(BlueRose); Utils.regRender(Rose); - Utils.regRender(Stonecutter); Utils.regRender(RustyIronBars); - Utils.regRender(CompressedCactus); - Utils.regRender(CactusBookshelf); - Utils.regRender(SilverHopper); + Utils.regRender(sandstoneFormation); + Utils.regRender(SantaHat); Utils.regRender(SilverBars); - Utils.regRender(emeraldRailPowered); - Utils.regRender(emeraldRail); - Utils.regRender(mossyLever); - Utils.regRender(DUPortal); - Utils.regRender(glowingObsidian); - Utils.regRender(soulGlassPane); + Utils.regRender(SilverHopper); Utils.regRender(soulGlass); - Utils.regRender(Present); - Utils.regRender(SantaHat); - Utils.regRender(ChristmasSapling); - Utils.regRender(ChristmasTopper); - Utils.regRender(GoldBars); - Utils.regRender(ChristmasLeaves); - Utils.regRender(GoldHopper); - Utils.regRender(MossyFurnace); + Utils.regRender(soulGlassPane); + Utils.regRender(Stonecutter); + Utils.regRender(stoneFormation); + Utils.regRender(VoidBricks); Utils.regRender(VoidFurnace); + Utils.regRender(VoidStone); } -} +} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Ores.java b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Ores.java index 919c32a..b0a82a7 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Ores.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Ores.java @@ -1,102 +1,104 @@ package com.NetherNoah.ParadiseMod.init.ModBlocks; import com.NetherNoah.ParadiseMod.Utils; -import com.NetherNoah.ParadiseMod.blocks.ores.CoalOreVoid; -import com.NetherNoah.ParadiseMod.blocks.ores.EnderPearlOre; -import com.NetherNoah.ParadiseMod.blocks.ores.GoldOreNether; -import com.NetherNoah.ParadiseMod.blocks.ores.GoldOreVoid; -import com.NetherNoah.ParadiseMod.blocks.ores.IronOreVoid; -import com.NetherNoah.ParadiseMod.blocks.ores.RubyOre; -import com.NetherNoah.ParadiseMod.blocks.ores.RubyOreEnd; -import com.NetherNoah.ParadiseMod.blocks.ores.SaltOre; -import com.NetherNoah.ParadiseMod.blocks.ores.SilverOre; -import com.NetherNoah.ParadiseMod.blocks.ores.SilverOreNether; -import com.NetherNoah.ParadiseMod.blocks.ores.SilverOreVoid; -import com.NetherNoah.ParadiseMod.blocks.ores.VoidPearlOre; -import com.NetherNoah.ParadiseMod.blocks.resourceBlocks.BlockRuby; -import com.NetherNoah.ParadiseMod.blocks.resourceBlocks.BlockRustyIron; -import com.NetherNoah.ParadiseMod.blocks.resourceBlocks.SaltBlock; -import com.NetherNoah.ParadiseMod.blocks.resourceBlocks.SilverBlock; -import com.NetherNoah.ParadiseMod.blocks.resourceBlocks.blazeBlock; -import com.NetherNoah.ParadiseMod.blocks.resourceBlocks.endPearlBlock; -import com.NetherNoah.ParadiseMod.blocks.resourceBlocks.sugarBlock; -import com.NetherNoah.ParadiseMod.blocks.resourceBlocks.voidPearlBlock; +import com.NetherNoah.ParadiseMod.blocks.sugarBlock; +import com.NetherNoah.ParadiseMod.blocks.base.BasicBlock; +import com.NetherNoah.ParadiseMod.blocks.base.CustomOre; +import com.NetherNoah.ParadiseMod.init.ModItems.MiscItems; import net.minecraft.block.Block; import net.minecraft.block.BlockFalling; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Items; public class Ores { + //ores + public static CustomOre CoalOreVoid = new CustomOre(Items.COAL, 4, 0); + public static CustomOre EnderPearlOre = new CustomOre(Items.ENDER_PEARL, 1, 2); + public static CustomOre EndRubyOre = new CustomOre(MiscItems.Ruby, 1, 2); + public static Block GoldOreNether = new Block(Material.ROCK); + public static Block GoldOreVoid = new Block(Material.ROCK); + public static Block IronOreVoid = new Block(Material.ROCK); + public static CustomOre RubyOre = new CustomOre(MiscItems.Ruby, 1, 2); + public static CustomOre SaltOre = new CustomOre(MiscItems.salt, 6, 0); + public static Block SilverOre = new Block(Material.ROCK); + public static Block SilverOreNether = new Block(Material.ROCK); + public static Block SilverOreVoid = new Block(Material.ROCK); + public static CustomOre VoidPearlOre = new CustomOre(MiscItems.VoidPearl, 1, 2); + //resource blocks - public static Block RustyIronBlock; - public static Block blazeBlock; + public static BasicBlock blazeBlock = new BasicBlock(Material.IRON, SoundType.METAL, true); + public static BasicBlock endPearlBlock = new BasicBlock(Material.IRON, SoundType.METAL, true); + public static BasicBlock RubyBlock = new BasicBlock(Material.IRON, SoundType.METAL, true); + public static BasicBlock RustyIronBlock = new BasicBlock(Material.IRON, SoundType.METAL, true); + public static BasicBlock SaltBlock = new BasicBlock(Material.ROCK, SoundType.STONE, true); + public static BasicBlock SilverBlock = new BasicBlock(Material.IRON, SoundType.METAL, true); public static BlockFalling sugarBlock; - public static Block RubyBlock; - public static Block SilverBlock; - public static Block SaltBlock; - public static Block endPearlBlock; - public static Block voidPearlBlock; - - //ores - public static Block SilverOreVoid; - public static Block CoalOreVoid; - public static Block GoldOreVoid; - public static Block IronOreVoid; - public static Block EnderPearlOre; - public static Block SilverOreNether; - public static Block GoldOreNether; - public static Block RubyOre; - public static Block EndRubyOre; - public static Block SilverOre; - public static Block SaltOre; - public static Block VoidPearlOre; + public static BasicBlock voidPearlBlock = new BasicBlock(Material.IRON, SoundType.METAL, true); public static void initAndRegister() { - //ores - Utils.regBlock(VoidPearlOre=new VoidPearlOre()); - Utils.regBlock(CoalOreVoid=new CoalOreVoid()); - Utils.regBlock(GoldOreVoid=new GoldOreVoid()); - Utils.regBlock(IronOreVoid=new IronOreVoid()); - Utils.regBlock(SilverOreVoid=new SilverOreVoid()); - Utils.regBlock(EnderPearlOre=new EnderPearlOre()); - Utils.regBlock(EndRubyOre = new RubyOreEnd()); - Utils.regBlock(SilverOreNether=new SilverOreNether()); - Utils.regBlock(GoldOreNether=new GoldOreNether()); - Utils.regBlock(RubyOre = new RubyOre()); - Utils.regBlock(SilverOre=new SilverOre()); - Utils.regBlock(SaltOre=new SaltOre()); - + GoldOreNether.setHarvestLevel("pickaxe", 2); + GoldOreVoid.setHarvestLevel("pickaxe", 2); + IronOreVoid.setHarvestLevel("pickaxe", 1); + SilverOre.setHarvestLevel("pickaxe", 2); + SilverOreNether.setHarvestLevel("pickaxe", 2); + SilverOreVoid.setHarvestLevel("pickaxe", 2); + + Utils.regBlock(CoalOreVoid.setUnlocalizedName("VoidCoalOre").setRegistryName("void_coal_ore").setHardness(5F).setResistance(10F)); + Utils.regBlock(EnderPearlOre.setUnlocalizedName("EndPearlOre").setRegistryName("ender_pearl_ore").setHardness(5F).setResistance(10F)); + Utils.regBlock(EndRubyOre.setUnlocalizedName("EndRubyOre").setRegistryName("ender_ruby_ore").setHardness(5F).setResistance(10F)); + Utils.regBlock(GoldOreNether.setUnlocalizedName("NetherGoldOre").setRegistryName("nether_gold_ore").setHardness(5F).setResistance(10F).setCreativeTab(CreativeTabs.BUILDING_BLOCKS)); + Utils.regBlock(GoldOreVoid.setUnlocalizedName("VoidGoldOre").setRegistryName("void_gold_ore").setHardness(5F).setResistance(10F)); + Utils.regBlock(IronOreVoid.setUnlocalizedName("VoidIronOre").setRegistryName("void_iron_ore").setHardness(5F).setResistance(10F).setCreativeTab(CreativeTabs.BUILDING_BLOCKS)); + Utils.regBlock(RubyOre.setUnlocalizedName("RubyOre").setRegistryName("ruby_ore").setHardness(5F).setResistance(10F)); + Utils.regBlock(SaltOre.setUnlocalizedName("SaltOre").setRegistryName("salt_ore").setHardness(5F).setResistance(10F)); + Utils.regBlock(SilverOre.setUnlocalizedName("SilverOre").setRegistryName("silver_ore").setHardness(5F).setResistance(10F).setCreativeTab(CreativeTabs.BUILDING_BLOCKS)); + Utils.regBlock(SilverOreNether.setUnlocalizedName("NetherSilverOre").setRegistryName("nether_silver_ore").setHardness(5F).setResistance(10F).setCreativeTab(CreativeTabs.BUILDING_BLOCKS)); + Utils.regBlock(SilverOreVoid.setUnlocalizedName("VoidSilverOre").setRegistryName("void_silver_ore").setHardness(5F).setResistance(10F).setCreativeTab(CreativeTabs.BUILDING_BLOCKS)); + Utils.regBlock(VoidPearlOre.setUnlocalizedName("VoidPearlOre").setRegistryName("void_pearl_ore").setHardness(5F).setResistance(10F)); + //resource blocks - Utils.regBlock(voidPearlBlock=new voidPearlBlock()); - Utils.regBlock(blazeBlock=new blazeBlock()); + blazeBlock.setHarvestLevel("pickaxe", 0); + endPearlBlock.setHarvestLevel("pickaxe", 0); + RubyBlock.setHarvestLevel("pickaxe", 2); + RustyIronBlock.setHarvestLevel("pickaxe", 1); + SaltBlock.setHarvestLevel("pickaxe", 0); + SilverBlock.setHarvestLevel("pickaxe", 2); + voidPearlBlock.setHarvestLevel("pickaxe",0); + + Utils.regBlock(blazeBlock.setUnlocalizedName("blazeBlock").setRegistryName("blaze_block").setHardness(5F).setResistance(10F).setCreativeTab(CreativeTabs.BUILDING_BLOCKS).setLightLevel(1F)); + Utils.regBlock(endPearlBlock.setUnlocalizedName("endPearlBlock").setRegistryName("ender_pearl_block").setHardness(5F).setResistance(10F).setCreativeTab(CreativeTabs.BUILDING_BLOCKS)); + Utils.regBlock(RubyBlock.setUnlocalizedName("BlockRuby").setRegistryName("ruby_block").setHardness(5F).setResistance(10F).setCreativeTab(CreativeTabs.BUILDING_BLOCKS)); + Utils.regBlock(RustyIronBlock.setUnlocalizedName("BlockRustyIron").setRegistryName("rusty_iron_block").setHardness(5F).setResistance(10F).setCreativeTab(CreativeTabs.BUILDING_BLOCKS)); + Utils.regBlock(SaltBlock.setUnlocalizedName("SaltBlock").setRegistryName("salt_block").setHardness(5F).setResistance(10F).setCreativeTab(CreativeTabs.BUILDING_BLOCKS)); + Utils.regBlock(SilverBlock.setUnlocalizedName("SilverBlock").setRegistryName("silver_block").setHardness(5F).setResistance(10F).setCreativeTab(CreativeTabs.BUILDING_BLOCKS)); Utils.regBlock(sugarBlock=new sugarBlock()); - Utils.regBlock(RubyBlock = new BlockRuby()); - Utils.regBlock(SilverBlock=new SilverBlock()); - Utils.regBlock(SaltBlock=new SaltBlock()); - Utils.regBlock(endPearlBlock=new endPearlBlock()); - Utils.regBlock(RustyIronBlock=new BlockRustyIron()); + Utils.regBlock(voidPearlBlock.setUnlocalizedName("voidPearlBlock").setRegistryName("void_pearl_block").setHardness(5F).setResistance(10F).setCreativeTab(CreativeTabs.BUILDING_BLOCKS)); } + public static void regRenders() { - Utils.regRender(voidPearlBlock); - Utils.regRender(VoidPearlOre); - Utils.regRender(SilverOreVoid); + Utils.regRender(blazeBlock); Utils.regRender(CoalOreVoid); - Utils.regRender(GoldOreVoid); - Utils.regRender(IronOreVoid); + Utils.regRender(endPearlBlock); Utils.regRender(EnderPearlOre); Utils.regRender(EndRubyOre); - Utils.regRender(SilverOreNether); Utils.regRender(GoldOreNether); + Utils.regRender(GoldOreVoid); + Utils.regRender(IronOreVoid); + Utils.regRender(RubyBlock); + Utils.regRender(RubyOre); + Utils.regRender(RustyIronBlock); + Utils.regRender(SaltBlock); Utils.regRender(SaltOre); + Utils.regRender(SilverBlock); Utils.regRender(SilverOre); - Utils.regRender(RubyOre); + Utils.regRender(SilverOreNether); + Utils.regRender(SilverOreVoid); Utils.regRender(sugarBlock); - Utils.regRender(blazeBlock); - Utils.regRender(SilverBlock); - Utils.regRender(RubyBlock); - Utils.regRender(SaltBlock); - Utils.regRender(RustyIronBlock); - Utils.regRender(endPearlBlock); - + Utils.regRender(voidPearlBlock); + Utils.regRender(VoidPearlOre); } -} +} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Plates.java b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Plates.java index 52136d7..d6e6003 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Plates.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Plates.java @@ -1,90 +1,106 @@ package com.NetherNoah.ParadiseMod.init.ModBlocks; import com.NetherNoah.ParadiseMod.Utils; -import com.NetherNoah.ParadiseMod.CustomBlockCode.RubyPlateCode; -import com.NetherNoah.ParadiseMod.CustomBlockCode.pressurePlates.BedrockPlateCode; -import com.NetherNoah.ParadiseMod.CustomBlockCode.pressurePlates.DiamondPlateCode; -import com.NetherNoah.ParadiseMod.CustomBlockCode.pressurePlates.EmeraldPlateCode; -import com.NetherNoah.ParadiseMod.blocks.pressurePlates.BedrockPlate; -import com.NetherNoah.ParadiseMod.blocks.pressurePlates.CobblestonePlate; -import com.NetherNoah.ParadiseMod.blocks.pressurePlates.DiamondPlate; -import com.NetherNoah.ParadiseMod.blocks.pressurePlates.DirtPlate; -import com.NetherNoah.ParadiseMod.blocks.pressurePlates.EmeraldPlate; -import com.NetherNoah.ParadiseMod.blocks.pressurePlates.EndPlate; -import com.NetherNoah.ParadiseMod.blocks.pressurePlates.GlowingObsidianPlate; -import com.NetherNoah.ParadiseMod.blocks.pressurePlates.GrassPlate; -import com.NetherNoah.ParadiseMod.blocks.pressurePlates.MossyPlate; -import com.NetherNoah.ParadiseMod.blocks.pressurePlates.RubyPlate; -import com.NetherNoah.ParadiseMod.blocks.pressurePlates.RustyPlate; -import com.NetherNoah.ParadiseMod.blocks.pressurePlates.SilverPlate; -import com.NetherNoah.ParadiseMod.blocks.pressurePlates.VoidPlate; -import com.NetherNoah.ParadiseMod.blocks.pressurePlates.stoneVariants.AndesitePlate; -import com.NetherNoah.ParadiseMod.blocks.pressurePlates.stoneVariants.DioritePlate; -import com.NetherNoah.ParadiseMod.blocks.pressurePlates.stoneVariants.GranitePlate; -import com.NetherNoah.ParadiseMod.blocks.pressurePlates.wood.AcaciaPlate; -import com.NetherNoah.ParadiseMod.blocks.pressurePlates.wood.BirchPlate; -import com.NetherNoah.ParadiseMod.blocks.pressurePlates.wood.CactusPlate; -import com.NetherNoah.ParadiseMod.blocks.pressurePlates.wood.DarkOakPlate; -import com.NetherNoah.ParadiseMod.blocks.pressurePlates.wood.JunglePlate; -import com.NetherNoah.ParadiseMod.blocks.pressurePlates.wood.SprucePlate; -import net.minecraft.block.BlockPressurePlate; +import com.NetherNoah.ParadiseMod.blocks.base.CustomPressurePlate; + +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; public class Plates { - //pressure plates - public static BlockPressurePlate VoidPlate; - public static BlockPressurePlate DirtPlate; - public static BlockPressurePlate GrassPlate; - public static BedrockPlateCode GlowingObsidianPlate; - public static DiamondPlateCode DiamondPlate; - public static EmeraldPlateCode EmeraldPlate; - public static RubyPlateCode SilverPlate; - public static RubyPlateCode RubyPlate; - public static BedrockPlateCode BedrockPlate; - public static BlockPressurePlate CactusPlate; - public static BlockPressurePlate CobblestonePlate; - public static BlockPressurePlate MossyPlate; - public static BlockPressurePlate AcaciaPlate; - public static BlockPressurePlate BirchPlate; - public static BlockPressurePlate DarkOakPlate; - public static BlockPressurePlate JunglePlate; - public static BlockPressurePlate SprucePlate; - public static BlockPressurePlate AndesitePlate; - public static BlockPressurePlate DioritePlate; - public static BlockPressurePlate GranitePlate; - public static BlockPressurePlate EndPlate; - public static BlockPressurePlate RustyPlate; + //grass and dirt + public static CustomPressurePlate DirtPlate = new CustomPressurePlate(1,20,4, Material.GROUND); + public static CustomPressurePlate GrassPlate = new CustomPressurePlate(1,20,3, Material.GROUND); + + //others + public static CustomPressurePlate DiamondPlate = new CustomPressurePlate(0,14,2,Material.IRON); + public static CustomPressurePlate EmeraldPlate = new CustomPressurePlate(0,10,2,Material.IRON); + public static CustomPressurePlate glassPlate = new CustomPressurePlate(0,20,5, Material.GLASS); + public static CustomPressurePlate RubyPlate = new CustomPressurePlate(0,4,2,Material.IRON); + public static CustomPressurePlate RustyPlate = new CustomPressurePlate(0,20,2,Material.IRON); + public static CustomPressurePlate SilverPlate = new CustomPressurePlate(0,20,2,Material.IRON); + + //stone variants + public static CustomPressurePlate CobblestonePlate = new CustomPressurePlate(1,20,0, Material.ROCK); + public static CustomPressurePlate MossyPlate = new CustomPressurePlate(1,20,0, Material.ROCK); + public static CustomPressurePlate AndesitePlate = new CustomPressurePlate(1,20,0, Material.ROCK); + public static CustomPressurePlate DioritePlate = new CustomPressurePlate(1,20,0, Material.ROCK); + public static CustomPressurePlate GranitePlate = new CustomPressurePlate(1,20,0, Material.ROCK); + public static CustomPressurePlate EndPlate = new CustomPressurePlate(1,20,0, Material.ROCK); + public static CustomPressurePlate redSandstonePlate = new CustomPressurePlate(1,20,0, Material.ROCK); + public static CustomPressurePlate sandstonePlate = new CustomPressurePlate(1,20,0, Material.ROCK); + public static CustomPressurePlate VoidPlate = new CustomPressurePlate(1,20,0, Material.ROCK); + + //unbreakable + public static CustomPressurePlate GlowingObsidianPlate = new CustomPressurePlate(2,20,0,Material.ROCK); + public static CustomPressurePlate BedrockPlate = new CustomPressurePlate(2,20,0,Material.BARRIER); + + //wooden + public static CustomPressurePlate AcaciaPlate = new CustomPressurePlate(0, 30, 1, Material.WOOD); + public static CustomPressurePlate BirchPlate = new CustomPressurePlate(0, 30, 1, Material.WOOD); + public static CustomPressurePlate CactusPlate = new CustomPressurePlate(0, 30, 1, Material.WOOD); + public static CustomPressurePlate DarkOakPlate = new CustomPressurePlate(0, 30, 1, Material.WOOD); + public static CustomPressurePlate JunglePlate = new CustomPressurePlate(0, 30, 1, Material.WOOD); + public static CustomPressurePlate SprucePlate = new CustomPressurePlate(0, 30, 1,Material.WOOD); public static void initAndRegister() { - //pressure plates - Utils.regBlock(VoidPlate=new VoidPlate()); - Utils.regBlock(DirtPlate=new DirtPlate()); - Utils.regBlock(GrassPlate=new GrassPlate()); - Utils.regBlock(CactusPlate=new CactusPlate()); - Utils.regBlock(EndPlate=new EndPlate()); - Utils.regBlock(GlowingObsidianPlate=new GlowingObsidianPlate()); - Utils.regBlock(DiamondPlate = new DiamondPlate()); - Utils.regBlock(EmeraldPlate = new EmeraldPlate()); - Utils.regBlock(SilverPlate = new SilverPlate()); - Utils.regBlock(RubyPlate = new RubyPlate()); - Utils.regBlock(BedrockPlate = new BedrockPlate()); - Utils.regBlock(MossyPlate = new MossyPlate()); - Utils.regBlock(CobblestonePlate = new CobblestonePlate()); - Utils.regBlock(AndesitePlate = new AndesitePlate()); - Utils.regBlock(DioritePlate = new DioritePlate()); - Utils.regBlock(GranitePlate = new GranitePlate()); - Utils.regBlock(AcaciaPlate = new AcaciaPlate()); - Utils.regBlock(BirchPlate = new BirchPlate()); - Utils.regBlock(DarkOakPlate = new DarkOakPlate()); - Utils.regBlock(JunglePlate = new JunglePlate()); - Utils.regBlock(SprucePlate = new SprucePlate()); - Utils.regBlock(RustyPlate=new RustyPlate()); + //I have to set these motherf_ckers separately since java complains + //about them being set in the lines below! + AcaciaPlate.setHarvestLevel("axe", 0); + BirchPlate.setHarvestLevel("axe", 0); + CactusPlate.setHarvestLevel("axe", 0); + DarkOakPlate.setHarvestLevel("axe", 0); + DiamondPlate.setHarvestLevel("pickaxe", 2); + EmeraldPlate.setHarvestLevel("pickaxe", 2); + GlowingObsidianPlate.setHarvestLevel("pickaxe", 3); + JunglePlate.setHarvestLevel("axe", 0); + SilverPlate.setHarvestLevel("pickaxe", 2); + RubyPlate.setHarvestLevel("pickaxe", 2); + RustyPlate.setHarvestLevel("pickaxe", 1); + SprucePlate.setHarvestLevel("axe", 0); + //grass and dirt + Utils.regBlock(DirtPlate.setUnlocalizedName("DirtPlate").setRegistryName("dirt_pressure_plate")); + Utils.regBlock(GrassPlate.setUnlocalizedName("GrassPlate").setRegistryName("grass_pressure_plate")); + + //special + Utils.regBlock(DiamondPlate.setUnlocalizedName("DiamondPlate").setRegistryName("diamond_pressure_plate").setHardness(0.5F)); + Utils.regBlock(EmeraldPlate.setUnlocalizedName("EmeraldPlate").setRegistryName("emerald_pressure_plate").setHardness(0.5F)); + Utils.regBlock(glassPlate.setUnlocalizedName("GlassPlate").setRegistryName("glass_pressure_plate").setHardness(0.1F)); + Utils.regBlock(SilverPlate.setUnlocalizedName("SilverPlate").setRegistryName("silver_pressure_plate").setHardness(0.5F)); + Utils.regBlock(RubyPlate.setUnlocalizedName("RubyPlate").setRegistryName("ruby_pressure_plate").setHardness(0.5F)); + Utils.regBlock(RustyPlate.setUnlocalizedName("RustyPlate").setRegistryName("rusty_pressure_plate").setHardness(0.5F)); + + //stone variants + Utils.regBlock(MossyPlate.setUnlocalizedName("MossyPlate").setRegistryName("mossy_cobblestone_pressure_plate").setHardness(0.5F)); + Utils.regBlock(CobblestonePlate.setUnlocalizedName("CobblestonePlate").setRegistryName("cobblestone_pressure_plate").setHardness(0.5F)); + Utils.regBlock(AndesitePlate.setUnlocalizedName("AndesitePlate").setRegistryName("andesite_pressure_plate").setHardness(0.5F)); + Utils.regBlock(DioritePlate.setUnlocalizedName("DioritePlate").setRegistryName("diorite_pressure_plate").setHardness(0.5F)); + Utils.regBlock(GranitePlate.setUnlocalizedName("GranitePlate").setRegistryName("granite_pressure_plate").setHardness(0.5F)); + Utils.regBlock(EndPlate.setUnlocalizedName("EndPlate").setRegistryName("end_pressure_plate").setHardness(0.5F)); + Utils.regBlock(sandstonePlate.setUnlocalizedName("SandstonePlate").setRegistryName("sandstone_pressure_plate").setHardness(0.5F)); + Utils.regBlock(redSandstonePlate.setUnlocalizedName("RedSandstonePlate").setRegistryName("red_sandstone_pressure_plate").setHardness(0.5F)); + Utils.regBlock(VoidPlate.setUnlocalizedName("VoidPlate").setRegistryName("void_pressure_plate").setHardness(0.5F)); + + //unbreakable + Utils.regBlock(BedrockPlate.setUnlocalizedName("BedrockPlate").setRegistryName("bedrock_pressure_plate").setHardness(-1F).setResistance(6000000F).setBlockUnbreakable()); + Utils.regBlock(GlowingObsidianPlate.setUnlocalizedName("GlowingObsidianPlate").setRegistryName("glowing_obsidian_pressure_plate").setHardness(51F).setResistance(2000F).setLightLevel(.46666667F)); + + //wooden + Utils.regBlock(AcaciaPlate.setUnlocalizedName("AcaciaPlate").setRegistryName("acacia_pressure_plate").setHardness(0.5F)); + Utils.regBlock(BirchPlate.setUnlocalizedName("BirchPlate").setRegistryName("birch_pressure_plate").setHardness(0.5F)); + Utils.regBlock(CactusPlate.setUnlocalizedName("CactusPlate").setRegistryName("cactus_pressure_plate").setHardness(0.5F)); + Utils.regBlock(DarkOakPlate.setUnlocalizedName("DarkOakPlate").setRegistryName("dark_oak_pressure_plate").setHardness(0.5F)); + Utils.regBlock(JunglePlate.setUnlocalizedName("JunglePlate").setRegistryName("jungle_pressure_plate").setHardness(0.5F)); + Utils.regBlock(SprucePlate.setUnlocalizedName("SprucePlate").setRegistryName("spruce_pressure_plate").setHardness(0.5F)); } + + public static void regRenders() { Utils.regRender(VoidPlate); Utils.regRender(DirtPlate); + Utils.regRender(glassPlate); Utils.regRender(GrassPlate); Utils.regRender(RustyPlate); Utils.regRender(CactusPlate); @@ -93,6 +109,8 @@ public static void regRenders() { Utils.regRender(SilverPlate); Utils.regRender(DiamondPlate); Utils.regRender(EmeraldPlate); + Utils.regRender(sandstonePlate); + Utils.regRender(redSandstonePlate); Utils.regRender(RubyPlate); Utils.regRender(BedrockPlate); Utils.regRender(MossyPlate); @@ -106,4 +124,4 @@ public static void regRenders() { Utils.regRender(JunglePlate); Utils.regRender(SprucePlate); } -} +} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Slabs.java b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Slabs.java index 0f10fb2..d920855 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Slabs.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Slabs.java @@ -1,63 +1,85 @@ package com.NetherNoah.ParadiseMod.init.ModBlocks; import com.NetherNoah.ParadiseMod.Utils; -import com.NetherNoah.ParadiseMod.blocks.slabs.BedrockSlab; -import com.NetherNoah.ParadiseMod.blocks.slabs.CactusSlab; -import com.NetherNoah.ParadiseMod.blocks.slabs.EndSlab; -import com.NetherNoah.ParadiseMod.blocks.slabs.GlowingObsidianSlab; -import com.NetherNoah.ParadiseMod.blocks.slabs.ObsidianSlab; -import com.NetherNoah.ParadiseMod.blocks.slabs.VoidBrickSlab; -import com.NetherNoah.ParadiseMod.blocks.slabs.VoidSlab; -import com.NetherNoah.ParadiseMod.blocks.slabs.double_slabs.BedrockSlabDouble; -import com.NetherNoah.ParadiseMod.blocks.slabs.double_slabs.CactusSlabDouble; -import com.NetherNoah.ParadiseMod.blocks.slabs.double_slabs.EndSlabDouble; -import com.NetherNoah.ParadiseMod.blocks.slabs.double_slabs.GlowingObsidianSlabDouble; -import com.NetherNoah.ParadiseMod.blocks.slabs.double_slabs.ObsidianSlabDouble; -import com.NetherNoah.ParadiseMod.blocks.slabs.double_slabs.VoidBrickSlabDouble; -import com.NetherNoah.ParadiseMod.blocks.slabs.double_slabs.VoidSlabDouble; +import com.NetherNoah.ParadiseMod.blocks.base.CustomSlab; -import net.minecraft.block.BlockSlab; +import net.minecraft.block.material.Material; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemSlab; import net.minecraftforge.fml.common.registry.ForgeRegistries; -public class Slabs { - public static CactusSlab cactus_slab; - public static CactusSlabDouble cactus_slab_double; - - public static BedrockSlab bedrock_slab; - public static BedrockSlabDouble bedrock_slab_double; - - public static EndSlab end_slab; - public static EndSlabDouble end_slab_double; - - public static GlowingObsidianSlab glowing_obsidian_slab; - public static GlowingObsidianSlabDouble glowing_obsidian_slab_double; - - public static ObsidianSlab obsidian_slab; - public static ObsidianSlabDouble obsidian_slab_double; +public class Slabs { + public static CustomSlab bedrock_slab = new CustomSlab(Material.BARRIER, false); + public static CustomSlab bedrock_slab_double = new CustomSlab(Material.BARRIER, true); + + public static CustomSlab cactus_slab = new CustomSlab(Material.WOOD, false); + public static CustomSlab cactus_slab_double = new CustomSlab(Material.WOOD, true); + + public static CustomSlab end_slab = new CustomSlab(Material.ROCK, false); + public static CustomSlab end_slab_double = new CustomSlab(Material.ROCK, true); - public static VoidSlab void_slab; - public static VoidSlabDouble void_slab_double; + public static CustomSlab glowing_obsidian_slab = new CustomSlab(Material.BARRIER, false); + public static CustomSlab glowing_obsidian_slab_double = new CustomSlab(Material.BARRIER, true); - public static VoidBrickSlab void_bricks_slab; - public static VoidBrickSlabDouble void_bricks_slab_double; + public static CustomSlab obsidian_slab = new CustomSlab(Material.BARRIER, false); + public static CustomSlab obsidian_slab_double = new CustomSlab(Material.BARRIER, true); + public static CustomSlab void_bricks_slab = new CustomSlab(Material.ROCK, false); + public static CustomSlab void_bricks_slab_double = new CustomSlab(Material.ROCK, true); + + public static CustomSlab void_slab = new CustomSlab(Material.ROCK, false); + public static CustomSlab void_slab_double = new CustomSlab(Material.ROCK, true); + public static void initAndRegister() { - regSlab(bedrock_slab= new BedrockSlab("bedrock_slab"),bedrock_slab_double=new BedrockSlabDouble()); - regSlab(end_slab=new EndSlab("end_slab"), end_slab_double=new EndSlabDouble()); - regSlab(cactus_slab=new CactusSlab("cactus_slab"),cactus_slab_double=new CactusSlabDouble()); - regSlab(glowing_obsidian_slab=new GlowingObsidianSlab("glowing_obsidian_slab"),glowing_obsidian_slab_double=new GlowingObsidianSlabDouble()); - regSlab(obsidian_slab=new ObsidianSlab("obsidian_slab"),obsidian_slab_double=new ObsidianSlabDouble()); - regSlab(void_slab=new VoidSlab("void_slab"),void_slab_double=new VoidSlabDouble()); - regSlab(void_bricks_slab=new VoidBrickSlab("void_bricks_slab"),void_bricks_slab_double=new VoidBrickSlabDouble()); + bedrock_slab.setUnlocalizedName("bedrock_slab").setRegistryName("bedrock_slab").setHardness(-1F).setResistance(6000000F).setBlockUnbreakable(); + bedrock_slab_double.setRegistryName("double_bedrock_slab").setHardness(-1F).setResistance(6000000F).setBlockUnbreakable(); + bedrock_slab.setItem(bedrock_slab); + bedrock_slab_double.setItem(bedrock_slab); + + cactus_slab.setUnlocalizedName("cactus_slab").setRegistryName("cactus_slab").setHardness(2.5F).setResistance(5F); + cactus_slab_double.setRegistryName("double_cactus_slab").setHardness(2.5F).setResistance(5F); + cactus_slab.setItem(cactus_slab); + cactus_slab_double.setItem(cactus_slab); + + end_slab.setUnlocalizedName("end_slab").setRegistryName("end_slab").setHardness(7.5F).setResistance(15F); + end_slab_double.setRegistryName("double_end_slab").setHardness(7.5F).setResistance(15F); + end_slab.setItem(end_slab); + end_slab_double.setItem(end_slab); + + glowing_obsidian_slab.setUnlocalizedName("glowing_obsidian_slab").setRegistryName("glowing_obsidian_slab").setHardness(51F).setResistance(2000F).setLightLevel(.46666667F).setHarvestLevel("pickaxe", 3); + glowing_obsidian_slab_double.setRegistryName("glowing_obsidian_slab_double").setHardness(51F).setResistance(2000F).setLightLevel(.46666667F).setHarvestLevel("pickaxe", 3); + glowing_obsidian_slab.setItem(glowing_obsidian_slab); + glowing_obsidian_slab_double.setItem(glowing_obsidian_slab); + + obsidian_slab.setUnlocalizedName("obsidian_slab").setRegistryName("obsidian_slab").setHardness(51F).setResistance(2000F).setHarvestLevel("pickaxe", 3); + obsidian_slab_double.setRegistryName("double_obsidian_slab").setHardness(51F).setResistance(2000F).setHarvestLevel("pickaxe", 3); + obsidian_slab_double.setItem(obsidian_slab); + obsidian_slab.setItem(obsidian_slab); + + void_slab.setUnlocalizedName("void_slab").setRegistryName("void_slab").setHardness(5F).setResistance(10F); + void_slab_double.setRegistryName("double_void_slab").setHardness(5F).setResistance(10F); + void_slab.setItem(void_slab); + void_slab_double.setItem(void_slab); + + void_bricks_slab.setUnlocalizedName("void_bricks_slab").setRegistryName("void_bricks_slab").setHardness(5F).setResistance(10F); + void_bricks_slab_double.setRegistryName("double_void_bricks_slab").setHardness(5F).setResistance(10F); + void_bricks_slab.setItem(void_bricks_slab); + void_bricks_slab_double.setItem(void_bricks_slab); + + regSlab(bedrock_slab,bedrock_slab_double); + regSlab(end_slab,end_slab_double); + regSlab(cactus_slab,cactus_slab_double); + regSlab(glowing_obsidian_slab,glowing_obsidian_slab_double); + regSlab(obsidian_slab,obsidian_slab_double); + regSlab(void_slab,void_slab_double); + regSlab(void_bricks_slab,void_bricks_slab_double); } public static void regRenders() { - Utils.regRender(end_slab); + Utils.regRender(bedrock_slab); Utils.regRender(cactus_slab); + Utils.regRender(end_slab); Utils.regRender(glowing_obsidian_slab); - Utils.regRender(bedrock_slab); Utils.regRender(obsidian_slab); Utils.regRender(void_slab); Utils.regRender(void_bricks_slab); @@ -66,11 +88,10 @@ public static void regRenders() { /** *Registers a slab with its double and item */ - public static void regSlab(BlockSlab slab,BlockSlab doubleSlab) { + public static void regSlab(CustomSlab slab,CustomSlab doubleSlab) { ForgeRegistries.BLOCKS.register(doubleSlab); ForgeRegistries.BLOCKS.register(slab); ItemBlock item = new ItemSlab(slab, slab, doubleSlab); - item.setRegistryName(slab.getRegistryName()); - ForgeRegistries.ITEMS.register(item); + ForgeRegistries.ITEMS.register(item.setRegistryName(slab.getRegistryName())); } } diff --git a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Stairs.java b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Stairs.java index d9a2c5e..f78324a 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Stairs.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Stairs.java @@ -1,35 +1,33 @@ package com.NetherNoah.ParadiseMod.init.ModBlocks; import com.NetherNoah.ParadiseMod.Utils; -import com.NetherNoah.ParadiseMod.blocks.stairs.BedrockStairs; -import com.NetherNoah.ParadiseMod.blocks.stairs.CactusStairs; -import com.NetherNoah.ParadiseMod.blocks.stairs.EndStairs; -import com.NetherNoah.ParadiseMod.blocks.stairs.GlowingObsidianStairs; -import com.NetherNoah.ParadiseMod.blocks.stairs.ObsidianStairs; -import com.NetherNoah.ParadiseMod.blocks.stairs.VoidBrickStairs; -import com.NetherNoah.ParadiseMod.blocks.stairs.VoidStairs; +import com.NetherNoah.ParadiseMod.blocks.base.CustomStairs; -import net.minecraft.block.BlockStairs; +import net.minecraft.init.Blocks; public class Stairs { //stairs - public static BlockStairs BedrockStairs; - public static BlockStairs EndStairs; - public static BlockStairs ObsidianStairs; - public static BlockStairs GlowingObsidianStairs; - public static BlockStairs CactusStairs; - public static BlockStairs VoidStairs; - public static BlockStairs VoidBrickStairs; + public static CustomStairs BedrockStairs = new CustomStairs(Blocks.BARRIER); + public static CustomStairs CactusStairs = new CustomStairs(Blocks.PLANKS); + public static CustomStairs EndStairs = new CustomStairs(Blocks.END_STONE); + public static CustomStairs GlowingObsidianStairs = new CustomStairs(Blocks.BARRIER); + public static CustomStairs ObsidianStairs = new CustomStairs(Blocks.BARRIER); + public static CustomStairs VoidStairs = new CustomStairs(Blocks.STONE); + public static CustomStairs VoidBrickStairs = new CustomStairs(Blocks.STONE); public static void initAndRegister() { //stairs - Utils.regBlock(CactusStairs=new CactusStairs()); - Utils.regBlock(EndStairs=new EndStairs()); - Utils.regBlock(BedrockStairs=new BedrockStairs()); - Utils.regBlock(ObsidianStairs=new ObsidianStairs()); - Utils.regBlock(GlowingObsidianStairs=new GlowingObsidianStairs()); - Utils.regBlock(VoidStairs=new VoidStairs()); - Utils.regBlock(VoidBrickStairs=new VoidBrickStairs()); + EndStairs.setHarvestLevel("pickaxe", 0); + GlowingObsidianStairs.setHarvestLevel("pickaxe", 3); + ObsidianStairs.setHarvestLevel("pickaxe", 3); + + Utils.regBlock(BedrockStairs.setUnlocalizedName("BedrockStairs").setRegistryName("bedrock_stairs").setHardness(-1F).setResistance(6000000F)); + Utils.regBlock(CactusStairs.setUnlocalizedName("CactusStairs").setRegistryName("cactus_stairs").setHardness(2F).setResistance(5F)); + Utils.regBlock(EndStairs.setUnlocalizedName("EndStairs").setRegistryName("end_stairs").setHardness(5F).setResistance(15F)); + Utils.regBlock(GlowingObsidianStairs.setUnlocalizedName("GlowingObsidianStairs").setRegistryName("glowing_obsidian_stairs").setHardness(51F).setResistance(2000F)); + Utils.regBlock(ObsidianStairs.setUnlocalizedName("ObsidianStairs").setRegistryName("obsidian_stairs").setHardness(51F).setResistance(2000F)); + Utils.regBlock(VoidStairs.setUnlocalizedName("VoidStairs").setRegistryName("void_stairs").setHardness(5F).setResistance(10F)); + Utils.regBlock(VoidBrickStairs.setUnlocalizedName("VoidBrickStairs").setRegistryName("void_brick_stairs").setHardness(5F).setResistance(10F)); } public static void regRenders() { Utils.regRender(VoidStairs); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Tables.java b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Tables.java index 11f3335..ef34e7b 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Tables.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Tables.java @@ -1,40 +1,32 @@ package com.NetherNoah.ParadiseMod.init.ModBlocks; import com.NetherNoah.ParadiseMod.Utils; -import com.NetherNoah.ParadiseMod.CustomBlockCode.CustomWorkBench; -import com.NetherNoah.ParadiseMod.blocks.workbenches.CustomWorkbenchAcacia; -import com.NetherNoah.ParadiseMod.blocks.workbenches.CustomWorkbenchBirch; -import com.NetherNoah.ParadiseMod.blocks.workbenches.CustomWorkbenchCactus; -import com.NetherNoah.ParadiseMod.blocks.workbenches.CustomWorkbenchDarkOak; -import com.NetherNoah.ParadiseMod.blocks.workbenches.CustomWorkbenchJungle; -import com.NetherNoah.ParadiseMod.blocks.workbenches.CustomWorkbenchSpruce; +import com.NetherNoah.ParadiseMod.blocks.base.CustomWorkBench; public class Tables { //crafting tables - public static CustomWorkBench CustomWorkbenchCactus; - public static CustomWorkBench CustomWorkbenchAcacia; - public static CustomWorkBench CustomWorkbenchBirch; - public static CustomWorkBench CustomWorkbenchDarkOak; - public static CustomWorkBench CustomWorkbenchJungle; - public static CustomWorkBench CustomWorkbenchSpruce; + public static CustomWorkBench AcaciaWorkbench = new CustomWorkBench(); + public static CustomWorkBench BirchWorkbench = new CustomWorkBench(); + public static CustomWorkBench CactusWorkbench = new CustomWorkBench(); + public static CustomWorkBench DarkOakWorkbench = new CustomWorkBench(); + public static CustomWorkBench JungleWorkbench = new CustomWorkBench(); + public static CustomWorkBench SpruceWorkbench = new CustomWorkBench(); public static void initAndRegister() { - //crafting tables - Utils.regBlock(CustomWorkbenchCactus=new CustomWorkbenchCactus()); - Utils.regBlock(CustomWorkbenchAcacia = new CustomWorkbenchAcacia()); - Utils.regBlock(CustomWorkbenchBirch = new CustomWorkbenchBirch()); - Utils.regBlock(CustomWorkbenchDarkOak = new CustomWorkbenchDarkOak()); - Utils.regBlock(CustomWorkbenchJungle = new CustomWorkbenchJungle()); - Utils.regBlock(CustomWorkbenchSpruce = new CustomWorkbenchSpruce()); + Utils.regBlock(AcaciaWorkbench.setUnlocalizedName("CustomWorkbenchAcacia").setRegistryName("acacia_crafting_table")); + Utils.regBlock(BirchWorkbench.setUnlocalizedName("CustomWorkbenchBirch").setRegistryName("birch_crafting_table")); + Utils.regBlock(CactusWorkbench.setUnlocalizedName("CustomWorkbenchCactus").setRegistryName("cactus_crafting_table")); + Utils.regBlock(DarkOakWorkbench.setUnlocalizedName("CustomWorkbenchDarkOak").setRegistryName("dark_oak_crafting_table")); + Utils.regBlock(JungleWorkbench.setUnlocalizedName("CustomWorkbenchJungle").setRegistryName("jungle_crafting_table")); + Utils.regBlock(SpruceWorkbench.setUnlocalizedName("CustomWorkbenchSpruce").setRegistryName("spruce_crafting_table")); } public static void regRenders() { - Utils.regRender(CustomWorkbenchCactus); - Utils.regRender(CustomWorkbenchAcacia); - Utils.regRender(CustomWorkbenchBirch); - Utils.regRender(CustomWorkbenchDarkOak); - Utils.regRender(CustomWorkbenchJungle); - Utils.regRender(CustomWorkbenchSpruce); - Utils.regRender(CustomWorkbenchAcacia); + Utils.regRender(CactusWorkbench); + Utils.regRender(AcaciaWorkbench); + Utils.regRender(BirchWorkbench); + Utils.regRender(DarkOakWorkbench); + Utils.regRender(JungleWorkbench); + Utils.regRender(SpruceWorkbench); } } diff --git a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Trapdoors.java b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Trapdoors.java index ff9157c..f471f98 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Trapdoors.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Trapdoors.java @@ -1,93 +1,93 @@ package com.NetherNoah.ParadiseMod.init.ModBlocks; import com.NetherNoah.ParadiseMod.Utils; -import com.NetherNoah.ParadiseMod.CustomBlockCode.RSTrapdoor; -import com.NetherNoah.ParadiseMod.blocks.trapdoors.AndesiteTrapdoor; -import com.NetherNoah.ParadiseMod.blocks.trapdoors.BedrockTrapdoor; -import com.NetherNoah.ParadiseMod.blocks.trapdoors.CactusTrapdoor; -import com.NetherNoah.ParadiseMod.blocks.trapdoors.CobblestoneTrapdoor; -import com.NetherNoah.ParadiseMod.blocks.trapdoors.DiamondTrapdoor; -import com.NetherNoah.ParadiseMod.blocks.trapdoors.DioriteTrapdoor; -import com.NetherNoah.ParadiseMod.blocks.trapdoors.EmeraldTrapdoor; -import com.NetherNoah.ParadiseMod.blocks.trapdoors.EndTrapdoor; -import com.NetherNoah.ParadiseMod.blocks.trapdoors.GlassTrapdoor; -import com.NetherNoah.ParadiseMod.blocks.trapdoors.GlowingObsidianTrapdoor; -import com.NetherNoah.ParadiseMod.blocks.trapdoors.GoldTrapdoor; -import com.NetherNoah.ParadiseMod.blocks.trapdoors.GraniteTrapdoor; -import com.NetherNoah.ParadiseMod.blocks.trapdoors.MossStoneTrapdoor; -import com.NetherNoah.ParadiseMod.blocks.trapdoors.ObsidianTrapdoor; -import com.NetherNoah.ParadiseMod.blocks.trapdoors.RedstoneTrapdoor; -import com.NetherNoah.ParadiseMod.blocks.trapdoors.RubyTrapdoor; -import com.NetherNoah.ParadiseMod.blocks.trapdoors.RustyTrapdoor; -import com.NetherNoah.ParadiseMod.blocks.trapdoors.SilverTrapdoor; -import com.NetherNoah.ParadiseMod.blocks.trapdoors.StoneTrapdoor; +import com.NetherNoah.ParadiseMod.blocks.RedstoneTrapdoor; +import com.NetherNoah.ParadiseMod.blocks.base.CustomTrapDoor; -import net.minecraft.block.BlockTrapDoor; +import net.minecraft.block.Block; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; public class Trapdoors { //trapdoors - public static BlockTrapDoor BlockCactusTrapDoor; - public static BlockTrapDoor BlockEndTrapDoor; - public static BlockTrapDoor BlockSilverTrapDoor; - public static BlockTrapDoor BlockGlassTrapDoor; - public static BlockTrapDoor BlockGoldTrapdoor; - public static BlockTrapDoor BlockDiamondTrapdoor; - public static BlockTrapDoor BlockEmeraldTrapdoor; - public static BlockTrapDoor BlockAndesiteTrapDoor; - public static BlockTrapDoor BlockDioriteTrapdoor; - public static BlockTrapDoor BlockGraniteTrapdoor; - public static BlockTrapDoor BlockStoneTrapdoor; - public static BlockTrapDoor BlockCobblestoneTrapdoor; - public static BlockTrapDoor BlockMossStoneTrapdoor; - public static BlockTrapDoor BlockGlowingObsidianTrapdoor; - public static BlockTrapDoor BlockObsidianTrapdoor; - public static BlockTrapDoor BlockBedrockTrapdoor; - public static BlockTrapDoor BlockRubyTrapdoor; - public static RSTrapdoor BlockRedstoneTrapdoor; - public static BlockTrapDoor RustyTrapdoor; + public static CustomTrapDoor AndesiteTrapDoor = new CustomTrapDoor(Material.IRON, SoundType.STONE, 0); + public static CustomTrapDoor BedrockTrapdoor = new CustomTrapDoor(Material.IRON, SoundType.STONE, 0); + public static CustomTrapDoor CactusTrapDoor = new CustomTrapDoor(Material.WOOD, SoundType.WOOD, 1); + public static CustomTrapDoor CobblestoneTrapdoor = new CustomTrapDoor(Material.IRON, SoundType.STONE, 0); + public static CustomTrapDoor DiamondTrapdoor = new CustomTrapDoor(Material.IRON, SoundType.METAL, 0); + public static CustomTrapDoor DioriteTrapdoor = new CustomTrapDoor(Material.IRON, SoundType.STONE, 0); + public static CustomTrapDoor EmeraldTrapdoor = new CustomTrapDoor(Material.WOOD, SoundType.METAL, 0); + public static CustomTrapDoor EndTrapDoor = new CustomTrapDoor(Material.IRON, SoundType.STONE, 0); + public static CustomTrapDoor GlassTrapDoor = new CustomTrapDoor(Material.WOOD, SoundType.GLASS, 1); + public static CustomTrapDoor GlowingObsidianTrapdoor = new CustomTrapDoor(Material.IRON, SoundType.STONE, 0); + public static CustomTrapDoor GoldTrapdoor = new CustomTrapDoor(Material.IRON, SoundType.METAL, 0); + public static CustomTrapDoor GraniteTrapdoor = new CustomTrapDoor(Material.IRON, SoundType.STONE, 0); + public static CustomTrapDoor MossStoneTrapdoor = new CustomTrapDoor(Material.IRON, SoundType.STONE, 0); + public static CustomTrapDoor ObsidianTrapdoor = new CustomTrapDoor(Material.IRON, SoundType.STONE, 0); + public static Block RedstoneTrapdoor; + public static CustomTrapDoor RubyTrapdoor = new CustomTrapDoor(Material.WOOD, SoundType.METAL, 0); + public static CustomTrapDoor RustyTrapdoor = new CustomTrapDoor(Material.IRON, SoundType.METAL, 0); + public static CustomTrapDoor SilverTrapDoor = new CustomTrapDoor(Material.IRON, SoundType.METAL, 0); + public static CustomTrapDoor StoneTrapdoor = new CustomTrapDoor(Material.IRON, SoundType.STONE, 0); public static void initAndRegister() { - //trapdoors - Utils.regBlock(BlockCactusTrapDoor=new CactusTrapdoor()); - Utils.regBlock(BlockGlowingObsidianTrapdoor=new GlowingObsidianTrapdoor()); - Utils.regBlock(BlockEndTrapDoor=new EndTrapdoor()); - Utils.regBlock(BlockSilverTrapDoor = new SilverTrapdoor()); - Utils.regBlock(BlockGlassTrapDoor = new GlassTrapdoor()); - Utils.regBlock(BlockGoldTrapdoor = new GoldTrapdoor()); - Utils.regBlock(BlockDiamondTrapdoor = new DiamondTrapdoor()); - Utils.regBlock(BlockEmeraldTrapdoor = new EmeraldTrapdoor()); - Utils.regBlock(BlockAndesiteTrapDoor = new AndesiteTrapdoor()); - Utils.regBlock(BlockDioriteTrapdoor = new DioriteTrapdoor()); - Utils.regBlock(BlockGraniteTrapdoor = new GraniteTrapdoor()); - Utils.regBlock(BlockStoneTrapdoor = new StoneTrapdoor()); - Utils.regBlock(BlockCobblestoneTrapdoor = new CobblestoneTrapdoor()); - Utils.regBlock(BlockMossStoneTrapdoor = new MossStoneTrapdoor()); - Utils.regBlock(BlockObsidianTrapdoor = new ObsidianTrapdoor()); - Utils.regBlock(BlockBedrockTrapdoor = new BedrockTrapdoor()); - Utils.regBlock(BlockRubyTrapdoor = new RubyTrapdoor()); - Utils.regBlock(BlockRedstoneTrapdoor = new RedstoneTrapdoor()); - Utils.regBlock(RustyTrapdoor=new RustyTrapdoor()); + AndesiteTrapDoor.setHarvestLevel("pickaxe", 0); + CobblestoneTrapdoor.setHarvestLevel("pickaxe", 0); + DiamondTrapdoor.setHarvestLevel("pickaxe", 2); + DioriteTrapdoor.setHarvestLevel("pickaxe", 0); + EmeraldTrapdoor.setHarvestLevel("pickaxe", 2); + EndTrapDoor.setHarvestLevel("pickaxe", 0); + GlowingObsidianTrapdoor.setHarvestLevel("pickaxe", 3); + GoldTrapdoor.setHarvestLevel("pickaxe", 2); + GraniteTrapdoor.setHarvestLevel("pickaxe", 0); + MossStoneTrapdoor.setHarvestLevel("pickaxe", 0); + ObsidianTrapdoor.setHarvestLevel("pickaxe", 3); + RubyTrapdoor.setHarvestLevel("pickaxe", 2); + RustyTrapdoor.setHarvestLevel("pickaxe",1); + SilverTrapDoor.setHarvestLevel("pickaxe", 2); + StoneTrapdoor.setHarvestLevel("pickaxe", 0); + + Utils.regBlock(AndesiteTrapDoor.setUnlocalizedName("AndesiteTrapdoor").setRegistryName("andesite_trapdoor").setHardness(5F).setResistance(10F)); + Utils.regBlock(BedrockTrapdoor.setUnlocalizedName("BedrockTrapdoor").setRegistryName("bedrock_trapdoor").setHardness(-1F).setResistance(6000000F).setBlockUnbreakable()); + Utils.regBlock(CactusTrapDoor.setUnlocalizedName("CactusTrapdoor").setRegistryName("cactus_trapdoor").setHardness(2F).setResistance(5F)); + Utils.regBlock(CobblestoneTrapdoor.setUnlocalizedName("CobblestoneTrapdoor").setRegistryName("cobblestone_trapdoor").setHardness(5F).setResistance(10F)); + Utils.regBlock(DiamondTrapdoor.setUnlocalizedName("DiamondTrapdoor").setRegistryName("diamond_trapdoor").setHardness(5F).setResistance(10F)); + Utils.regBlock(DioriteTrapdoor.setUnlocalizedName("DioriteTrapdoor").setRegistryName("diorite_trapdoor").setHardness(5F).setResistance(10F)); + Utils.regBlock(EmeraldTrapdoor.setUnlocalizedName("EmeraldTrapdoor").setRegistryName("emerald_trapdoor").setHardness(5F).setResistance(10F)); + Utils.regBlock(EndTrapDoor.setUnlocalizedName("EndTrapdoor").setRegistryName("end_trapdoor").setHardness(5F).setResistance(15F)); + Utils.regBlock(GlassTrapDoor.setUnlocalizedName("GlassTrapdoor").setRegistryName("glass_trapdoor").setHardness(.5F).setResistance(1F)); + Utils.regBlock(GlowingObsidianTrapdoor.setUnlocalizedName("GlowingObsidianTrapdoor").setRegistryName("glowing_obsidian_trapdoor").setHardness(51F).setResistance(2000F).setLightLevel(.46666667F)); + Utils.regBlock(GoldTrapdoor.setUnlocalizedName("GoldTrapdoor").setRegistryName("gold_trapdoor").setHardness(5F).setResistance(10F)); + Utils.regBlock(GraniteTrapdoor.setUnlocalizedName("GraniteTrapdoor").setRegistryName("granite_trapdoor").setHardness(5F).setResistance(10F)); + Utils.regBlock(MossStoneTrapdoor.setUnlocalizedName("MossStoneTrapdoor").setRegistryName("moss_stone_trapdoor").setHardness(5F).setResistance(10F)); + Utils.regBlock(ObsidianTrapdoor.setUnlocalizedName("ObsidianTrapdoor").setRegistryName("obsidian_trapdoor").setHardness(51F).setResistance(2000F)); + Utils.regBlock(RedstoneTrapdoor = new RedstoneTrapdoor()); + Utils.regBlock(RubyTrapdoor.setUnlocalizedName("RubyTrapdoor").setRegistryName("ruby_trapdoor").setHardness(5F).setResistance(10F)); + Utils.regBlock(RustyTrapdoor.setUnlocalizedName("RustyTrapdoor").setRegistryName("rusty_trapdoor").setHardness(5F).setResistance(10F)); + Utils.regBlock(SilverTrapDoor.setUnlocalizedName("SilverTrapdoor").setRegistryName("silver_trapdoor").setHardness(5F).setResistance(10F)); + Utils.regBlock(StoneTrapdoor.setUnlocalizedName("StoneTrapdoor").setRegistryName("stone_trapdoor").setHardness(5F).setResistance(10F)); } + public static void regRenders() { Utils.regRender(RustyTrapdoor); - Utils.regRender(BlockCactusTrapDoor); - Utils.regRender(BlockGlowingObsidianTrapdoor); - Utils.regRender(BlockEndTrapDoor); - Utils.regRender(BlockSilverTrapDoor); - Utils.regRender(BlockGlassTrapDoor); - Utils.regRender(BlockGoldTrapdoor); - Utils.regRender(BlockDiamondTrapdoor); - Utils.regRender(BlockEmeraldTrapdoor); - Utils.regRender(BlockAndesiteTrapDoor); - Utils.regRender(BlockDioriteTrapdoor); - Utils.regRender(BlockGraniteTrapdoor); - Utils.regRender(BlockStoneTrapdoor); - Utils.regRender(BlockCobblestoneTrapdoor); - Utils.regRender(BlockMossStoneTrapdoor); - Utils.regRender(BlockObsidianTrapdoor); - Utils.regRender(BlockBedrockTrapdoor); - Utils.regRender(BlockRubyTrapdoor); - Utils.regRender(BlockRedstoneTrapdoor); + Utils.regRender(CactusTrapDoor); + Utils.regRender(GlowingObsidianTrapdoor); + Utils.regRender(EndTrapDoor); + Utils.regRender(SilverTrapDoor); + Utils.regRender(GlassTrapDoor); + Utils.regRender(GoldTrapdoor); + Utils.regRender(DiamondTrapdoor); + Utils.regRender(EmeraldTrapdoor); + Utils.regRender(AndesiteTrapDoor); + Utils.regRender(DioriteTrapdoor); + Utils.regRender(GraniteTrapdoor); + Utils.regRender(StoneTrapdoor); + Utils.regRender(CobblestoneTrapdoor); + Utils.regRender(MossStoneTrapdoor); + Utils.regRender(ObsidianTrapdoor); + Utils.regRender(BedrockTrapdoor); + Utils.regRender(RubyTrapdoor); + Utils.regRender(RedstoneTrapdoor); } -} +} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Walls.java b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Walls.java index d3774ca..4854c14 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Walls.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks/Walls.java @@ -1,29 +1,27 @@ package com.NetherNoah.ParadiseMod.init.ModBlocks; import com.NetherNoah.ParadiseMod.Utils; -import com.NetherNoah.ParadiseMod.CustomBlockCode.CustomWall; -import com.NetherNoah.ParadiseMod.blocks.fences.BedrockWall; -import com.NetherNoah.ParadiseMod.blocks.fences.EndWall; -import com.NetherNoah.ParadiseMod.blocks.fences.GlowingObsidianWall; -import com.NetherNoah.ParadiseMod.blocks.fences.ObsidianWall; -import com.NetherNoah.ParadiseMod.blocks.fences.VoidWall; +import com.NetherNoah.ParadiseMod.blocks.base.CustomWall; + +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; public class Walls { //walls - public static CustomWall BedrockWall; - public static CustomWall GlowingObsidianWall; - public static CustomWall ObsidianWall; - public static CustomWall EndWall; - public static CustomWall VoidWall; + public static CustomWall BedrockWall = new CustomWall(Material.BARRIER); + public static CustomWall GlowingObsidianWall = new CustomWall(Material.ROCK); + public static CustomWall ObsidianWall = new CustomWall(Material.ROCK); + public static CustomWall EndWall = new CustomWall(Material.ROCK); + public static CustomWall VoidWall = new CustomWall(Material.ROCK); public static void initAndRegister() { //walls - Utils.regBlock(VoidWall=new VoidWall()); - Utils.regBlock(GlowingObsidianWall=new GlowingObsidianWall()); - Utils.regBlock(BedrockWall = new BedrockWall()); - Utils.regBlock(ObsidianWall = new ObsidianWall()); - Utils.regBlock(EndWall=new EndWall()); + Utils.regBlock(BedrockWall.setUnlocalizedName("BedrockWall").setRegistryName("bedrock_wall").setHardness(-1F).setResistance(6000000F).setBlockUnbreakable()); + Utils.regBlock(EndWall.setRegistryName("end_wall").setUnlocalizedName("EndWall").setHardness(5F).setResistance(15F)); + Utils.regBlock(GlowingObsidianWall.setRegistryName("glowing_obsidian_wall").setUnlocalizedName("GlowingObsidianWall").setCreativeTab(CreativeTabs.DECORATIONS).setHardness(51F).setResistance(2000F).setLightLevel(.46666667F)); + Utils.regBlock(ObsidianWall.setRegistryName("obsidian_wall").setUnlocalizedName("ObsidianWall").setHardness(51F).setResistance(2000F)); + Utils.regBlock(VoidWall.setUnlocalizedName("VoidWall").setRegistryName("void_wall").setHardness(5F).setResistance(10F)); } public static void regRenders() { Utils.regRender(VoidWall); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/init/ModItems/Armor.java b/src/main/java/com/NetherNoah/ParadiseMod/init/ModItems/Armor.java index cdf8dad..ff7ff22 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/init/ModItems/Armor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/init/ModItems/Armor.java @@ -19,31 +19,37 @@ public class Armor { public static ItemArmor santaJacket; public static ItemArmor santaPants; public static ItemArmor santaBoots; + //silver public static ItemArmor silverHelmet; public static ItemArmor silverChestplate; public static ItemArmor silverLeggings; public static ItemArmor silverBoots; + //rusty iron public static ItemArmor rustyHelmet; public static ItemArmor rustyChestplate; public static ItemArmor rustyLeggings; public static ItemArmor rustyBoots; + // emerald public static ItemArmor emeraldHelmet; public static ItemArmor emeraldChestplate; public static ItemArmor emeraldLeggings; public static ItemArmor emeraldBoots; + // ruby public static ItemArmor rubyHelmet; public static ItemArmor rubyChestplate; public static ItemArmor rubyLeggings; public static ItemArmor rubyBoots; + // redstone public static ItemArmor redstoneHelmet; public static ItemArmor redstoneChestplate; public static ItemArmor redstoneLeggings; public static ItemArmor redstoneBoots; + // obsidian public static ItemArmor obsidianHelmet; public static ItemArmor obsidianChestplate; diff --git a/src/main/java/com/NetherNoah/ParadiseMod/init/ModItems/DoorItems.java b/src/main/java/com/NetherNoah/ParadiseMod/init/ModItems/DoorItems.java index e7d6aa7..60e866d 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/init/ModItems/DoorItems.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/init/ModItems/DoorItems.java @@ -20,71 +20,73 @@ import com.NetherNoah.ParadiseMod.items.doors.ItemRustyDoor; import com.NetherNoah.ParadiseMod.items.doors.ItemSilverDoor; import com.NetherNoah.ParadiseMod.items.doors.ItemStoneDoor; + +import net.minecraft.item.Item; import net.minecraft.item.ItemDoor; public class DoorItems { // doors - public static ItemDoor ItemCactusDoor; - public static ItemDoor ItemEndDoor; - public static ItemDoor ItemSilverDoor; - public static ItemDoor ItemGlassDoor; - public static ItemDoor ItemGoldDoor; - public static ItemDoor ItemDiamondDoor; - public static ItemDoor ItemEmeraldDoor; - public static ItemDoor ItemAndesiteDoor; - public static ItemDoor ItemDioriteDoor; - public static ItemDoor ItemGraniteDoor; - public static ItemDoor ItemStoneDoor; - public static ItemDoor ItemCobblestoneDoor; - public static ItemDoor ItemMossStoneDoor; - public static ItemDoor ItemGlowingObsidianDoor; - public static ItemDoor ItemObsidianDoor; - public static ItemDoor ItemBedrockDoor; - public static ItemDoor ItemRubyDoor; - public static ItemDoor ItemRedstoneDoor; - public static ItemDoor ItemRustyDoor; + public static ItemDoor AndesiteDoor; + public static ItemDoor BedrockDoor; + public static ItemDoor CactusDoor; + public static ItemDoor CobblestoneDoor; + public static ItemDoor DiamondDoor; + public static ItemDoor DioriteDoor; + public static ItemDoor EmeraldDoor; + public static ItemDoor EndDoor; + public static ItemDoor GlassDoor; + public static ItemDoor GlowingObsidianDoor; + public static ItemDoor GoldDoor; + public static ItemDoor GraniteDoor; + public static ItemDoor MossStoneDoor; + public static ItemDoor ObsidianDoor; + public static Item RedstoneDoor; + public static ItemDoor RubyDoor; + public static ItemDoor RustyDoor; + public static ItemDoor SilverDoor; + public static ItemDoor StoneDoor; public static void initAndRegister() { - Utils.regItem(ItemRustyDoor=new ItemRustyDoor()); - Utils.regItem(ItemCactusDoor=new ItemCactusDoor()); - Utils.regItem(ItemGlowingObsidianDoor=new ItemGlowingObsidianDoor()); - Utils.regItem(ItemEndDoor=new ItemEndDoor()); - Utils.regItem(ItemSilverDoor=new ItemSilverDoor()); - Utils.regItem(ItemGlassDoor = new ItemGlassDoor()); - Utils.regItem(ItemGoldDoor = new ItemGoldDoor()); - Utils.regItem(ItemDiamondDoor = new ItemDiamondDoor()); - Utils.regItem(ItemEmeraldDoor = new ItemEmeraldDoor()); - Utils.regItem(ItemAndesiteDoor = new ItemAndesiteDoor()); - Utils.regItem(ItemDioriteDoor = new ItemDioriteDoor()); - Utils.regItem(ItemGraniteDoor = new ItemGraniteDoor()); - Utils.regItem(ItemStoneDoor = new ItemStoneDoor()); - Utils.regItem(ItemCobblestoneDoor = new ItemCobblestoneDoor()); - Utils.regItem(ItemMossStoneDoor = new ItemMossStoneDoor()); - Utils.regItem(ItemObsidianDoor = new ItemObsidianDoor()); - Utils.regItem(ItemBedrockDoor = new ItemBedrockDoor()); - Utils.regItem(ItemRubyDoor = new ItemRubyDoor()); - Utils.regItem(ItemRedstoneDoor = new ItemRedstoneDoor()); + Utils.regItem(AndesiteDoor = new ItemAndesiteDoor()); + Utils.regItem(BedrockDoor = new ItemBedrockDoor()); + Utils.regItem(CactusDoor = new ItemCactusDoor()); + Utils.regItem(CobblestoneDoor = new ItemCobblestoneDoor()); + Utils.regItem(DiamondDoor = new ItemDiamondDoor()); + Utils.regItem(DioriteDoor = new ItemDioriteDoor()); + Utils.regItem(EmeraldDoor = new ItemEmeraldDoor()); + Utils.regItem(EndDoor = new ItemEndDoor()); + Utils.regItem(GlassDoor = new ItemGlassDoor()); + Utils.regItem(GlowingObsidianDoor = new ItemGlowingObsidianDoor()); + Utils.regItem(GoldDoor = new ItemGoldDoor()); + Utils.regItem(GraniteDoor = new ItemGraniteDoor()); + Utils.regItem(MossStoneDoor = new ItemMossStoneDoor()); + Utils.regItem(ObsidianDoor = new ItemObsidianDoor()); + Utils.regItem(RedstoneDoor = new ItemRedstoneDoor()); + Utils.regItem(RubyDoor = new ItemRubyDoor()); + Utils.regItem(RustyDoor = new ItemRustyDoor()); + Utils.regItem(SilverDoor = new ItemSilverDoor()); + Utils.regItem(StoneDoor = new ItemStoneDoor()); } public static void regRenders() { - Utils.regRender(ItemRustyDoor); - Utils.regRender(ItemGlowingObsidianDoor); - Utils.regRender(ItemEndDoor); - Utils.regRender(ItemCactusDoor); - Utils.regRender(ItemSilverDoor); - Utils.regRender(ItemGlassDoor); - Utils.regRender(ItemGoldDoor); - Utils.regRender(ItemDiamondDoor); - Utils.regRender(ItemEmeraldDoor); - Utils.regRender(ItemAndesiteDoor); - Utils.regRender(ItemDioriteDoor); - Utils.regRender(ItemGraniteDoor); - Utils.regRender(ItemStoneDoor); - Utils.regRender(ItemCobblestoneDoor); - Utils.regRender(ItemMossStoneDoor); - Utils.regRender(ItemObsidianDoor); - Utils.regRender(ItemBedrockDoor); - Utils.regRender(ItemRubyDoor); - Utils.regRender(ItemRedstoneDoor); + Utils.regRender(RustyDoor); + Utils.regRender(GlowingObsidianDoor); + Utils.regRender(EndDoor); + Utils.regRender(CactusDoor); + Utils.regRender(SilverDoor); + Utils.regRender(GlassDoor); + Utils.regRender(GoldDoor); + Utils.regRender(DiamondDoor); + Utils.regRender(EmeraldDoor); + Utils.regRender(AndesiteDoor); + Utils.regRender(DioriteDoor); + Utils.regRender(GraniteDoor); + Utils.regRender(StoneDoor); + Utils.regRender(CobblestoneDoor); + Utils.regRender(MossStoneDoor); + Utils.regRender(ObsidianDoor); + Utils.regRender(BedrockDoor); + Utils.regRender(RubyDoor); + Utils.regRender(RedstoneDoor); } } diff --git a/src/main/java/com/NetherNoah/ParadiseMod/init/ModItems/MiscItems.java b/src/main/java/com/NetherNoah/ParadiseMod/init/ModItems/MiscItems.java index 8fbd458..87dd48a 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/init/ModItems/MiscItems.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/init/ModItems/MiscItems.java @@ -1,65 +1,53 @@ package com.NetherNoah.ParadiseMod.init.ModItems; import com.NetherNoah.ParadiseMod.Utils; -import com.NetherNoah.ParadiseMod.items.CactusStick; -import com.NetherNoah.ParadiseMod.items.CookedEgg; -import com.NetherNoah.ParadiseMod.items.DyeBlack; -import com.NetherNoah.ParadiseMod.items.DyeBlue; -import com.NetherNoah.ParadiseMod.items.DyeBrown; -import com.NetherNoah.ParadiseMod.items.ItemRuby; -import com.NetherNoah.ParadiseMod.items.RustyIngot; -import com.NetherNoah.ParadiseMod.items.RustyNugget; -import com.NetherNoah.ParadiseMod.items.Salt; -import com.NetherNoah.ParadiseMod.items.SilverIngot; -import com.NetherNoah.ParadiseMod.items.SilverNugget; -import com.NetherNoah.ParadiseMod.items.VoidPearl; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemEnderPearl; import net.minecraft.item.ItemFood; public class MiscItems { - public static Item DyeBlue; - public static Item DyeBlack; - public static Item DyeBrown; - public static Item salt; - public static Item CactusStick; - public static ItemBlock ObsidianWall; - public static Item SilverNugget; - public static Item Ruby; - public static Item SilverIngot; - public static Item RustyIngot; - public static Item RustyNugget; - public static Item VoidPearl; - public static ItemFood CookedEgg; + public static Item BlackDye = new Item(); + public static Item BlueDye = new Item(); + public static Item BrownDye = new Item(); + public static Item CactusStick = new Item(); + public static ItemFood CookedEgg = new ItemFood(12, true); + public static Item Ruby = new Item(); + public static Item RustyIngot = new Item(); + public static Item RustyNugget = new Item(); + public static Item salt = new Item(); + public static Item SilverIngot = new Item(); + public static Item SilverNugget = new Item(); + public static Item VoidPearl=new ItemEnderPearl(); public static void initAndRegister() { - Utils.regItem(CookedEgg=new CookedEgg()); - Utils.regItem(VoidPearl=new VoidPearl()); - Utils.regItem(DyeBrown=new DyeBrown()); - Utils.regItem(DyeBlack=new DyeBlack()); - Utils.regItem(DyeBlue=new DyeBlue()); - Utils.regItem(RustyNugget=new RustyNugget()); - Utils.regItem(RustyIngot=new RustyIngot()); - Utils.regItem(salt=new Salt()); - Utils.regItem(CactusStick=new CactusStick()); - Utils.regItem(SilverNugget=new SilverNugget()); - Utils.regItem(Ruby = new ItemRuby()); - Utils.regItem(SilverIngot=new SilverIngot()); + Utils.regItem(BlackDye.setUnlocalizedName("DyeBlack").setRegistryName("black_dye").setCreativeTab(CreativeTabs.MISC)); + Utils.regItem(BlueDye.setUnlocalizedName("DyeBlue").setRegistryName("blue_dye").setCreativeTab(CreativeTabs.MISC)); + Utils.regItem(BrownDye.setUnlocalizedName("DyeBrown").setRegistryName("brown_dye").setCreativeTab(CreativeTabs.MISC)); + Utils.regItem(CactusStick.setUnlocalizedName("CactusStick").setRegistryName("cactus_stick").setCreativeTab(CreativeTabs.MISC)); + Utils.regItem(CookedEgg.setUnlocalizedName("EggCooked").setRegistryName("cooked_egg")); + Utils.regItem(Ruby.setUnlocalizedName("Ruby").setRegistryName("ruby").setCreativeTab(CreativeTabs.MISC)); + Utils.regItem(RustyIngot.setUnlocalizedName("RustyIngot").setRegistryName("rusty_ingot").setCreativeTab(CreativeTabs.MISC)); + Utils.regItem(RustyNugget.setUnlocalizedName("RustyNugget").setRegistryName("rusty_nugget").setCreativeTab(CreativeTabs.MISC)); + Utils.regItem(salt.setUnlocalizedName("salt").setRegistryName("salt").setCreativeTab(CreativeTabs.MISC)); + Utils.regItem(SilverIngot.setUnlocalizedName("SilverIngot").setRegistryName("silver_ingot").setCreativeTab(CreativeTabs.MISC)); + Utils.regItem(SilverNugget.setUnlocalizedName("SilverNugget").setRegistryName("silver_nugget").setCreativeTab(CreativeTabs.MISC)); + Utils.regItem(VoidPearl.setUnlocalizedName("VoidPearl").setRegistryName("void_pearl").setCreativeTab(CreativeTabs.MISC)); } public static void regRenders() { - Utils.regRender(CookedEgg); - Utils.regRender(VoidPearl); - Utils.regRender(DyeBrown); - Utils.regRender(DyeBlack); - Utils.regRender(DyeBlue); - Utils.regRender(salt); - Utils.regRender(RustyIngot); + Utils.regRender(BlackDye); + Utils.regRender(BlueDye); + Utils.regRender(BrownDye); Utils.regRender(CactusStick); - Utils.regRender(SilverNugget); + Utils.regRender(CookedEgg); Utils.regRender(Ruby); + Utils.regRender(RustyIngot); Utils.regRender(RustyNugget); + Utils.regRender(salt); Utils.regRender(SilverIngot); + Utils.regRender(SilverNugget); + Utils.regRender(VoidPearl); } -} +} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/init/ModSmelting.java b/src/main/java/com/NetherNoah/ParadiseMod/init/ModSmelting.java index 9953d24..dcb59be 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/init/ModSmelting.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/init/ModSmelting.java @@ -49,16 +49,6 @@ public static void register() { GameRegistry.addSmelting(Tools.silverSpade, new ItemStack(MiscItems.SilverNugget),5F); GameRegistry.addSmelting(Tools.silverPickaxe, new ItemStack(MiscItems.SilverNugget),5F); GameRegistry.addSmelting(Tools.silverHoe, new ItemStack(MiscItems.SilverNugget),5F); - GameRegistry.addSmelting(Tools.silverSword, new ItemStack(MiscItems.SilverNugget),5F); - - //golden hopper can be smelted for a gold nugget just like other gold items in vanilla minecraft - GameRegistry.addSmelting(Misc.GoldHopper, new ItemStack(Items.GOLD_NUGGET), .01F); - - //same with golden doors, trapdoors, and fences - GameRegistry.addSmelting(DoorItems.ItemGoldDoor, new ItemStack(Items.GOLD_NUGGET), .01F); - GameRegistry.addSmelting(Trapdoors.BlockGoldTrapdoor, new ItemStack(Items.GOLD_NUGGET), .01F); - GameRegistry.addSmelting(Fences.BlockGoldFence, new ItemStack(Items.GOLD_NUGGET), .01F); - GameRegistry.addSmelting(Gates.BlockGoldFenceGate, new ItemStack(Items.GOLD_NUGGET), .01F); //soul glass GameRegistry.addSmelting(Blocks.SOUL_SAND, new ItemStack(Misc.soulGlass), .01F); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/CactusStick.java b/src/main/java/com/NetherNoah/ParadiseMod/items/CactusStick.java deleted file mode 100644 index 0fb57d6..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/CactusStick.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.NetherNoah.ParadiseMod.items; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; - -public class CactusStick extends Item { - public CactusStick() { - setUnlocalizedName("CactusStick"); - setRegistryName("cactus_stick"); - setCreativeTab(CreativeTabs.MISC); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/CookedEgg.java b/src/main/java/com/NetherNoah/ParadiseMod/items/CookedEgg.java deleted file mode 100644 index 6f2d51a..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/CookedEgg.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.NetherNoah.ParadiseMod.items; - -import net.minecraft.item.ItemFood; - -public class CookedEgg extends ItemFood{ - - public CookedEgg() { - super(12, true); - setUnlocalizedName("EggCooked"); - setRegistryName("cooked_egg"); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/DyeBlack.java b/src/main/java/com/NetherNoah/ParadiseMod/items/DyeBlack.java deleted file mode 100644 index 243853a..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/DyeBlack.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.NetherNoah.ParadiseMod.items; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; - -public class DyeBlack extends Item { - public DyeBlack() { - setUnlocalizedName("DyeBlack"); - setRegistryName("black_dye"); - setCreativeTab(CreativeTabs.MISC); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/DyeBlue.java b/src/main/java/com/NetherNoah/ParadiseMod/items/DyeBlue.java deleted file mode 100644 index c27e359..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/DyeBlue.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.NetherNoah.ParadiseMod.items; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; - -public class DyeBlue extends Item { - public DyeBlue() { - setUnlocalizedName("DyeBlue"); - setRegistryName("blue_dye"); - setCreativeTab(CreativeTabs.MISC); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/DyeBrown.java b/src/main/java/com/NetherNoah/ParadiseMod/items/DyeBrown.java deleted file mode 100644 index e2999e0..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/DyeBrown.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.NetherNoah.ParadiseMod.items; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; - -public class DyeBrown extends Item { - public DyeBrown() { - setUnlocalizedName("DyeBrown"); - setRegistryName("brown_dye"); - setCreativeTab(CreativeTabs.MISC); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/ItemRuby.java b/src/main/java/com/NetherNoah/ParadiseMod/items/ItemRuby.java deleted file mode 100644 index 9b4f50c..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/ItemRuby.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.NetherNoah.ParadiseMod.items; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; - -public class ItemRuby extends Item { - public ItemRuby() { - setUnlocalizedName("Ruby"); - setRegistryName("ruby"); - setCreativeTab(CreativeTabs.MISC); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/RustyIngot.java b/src/main/java/com/NetherNoah/ParadiseMod/items/RustyIngot.java deleted file mode 100644 index 24ab779..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/RustyIngot.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.NetherNoah.ParadiseMod.items; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; - -public class RustyIngot extends Item { - public RustyIngot() { - setUnlocalizedName("RustyIngot"); - setRegistryName("rusty_ingot"); - setCreativeTab(CreativeTabs.MISC); - } -} diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/RustyNugget.java b/src/main/java/com/NetherNoah/ParadiseMod/items/RustyNugget.java deleted file mode 100644 index 4d021e8..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/RustyNugget.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.NetherNoah.ParadiseMod.items; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; - -public class RustyNugget extends Item { - public RustyNugget() { - setUnlocalizedName("RustyNugget"); - setRegistryName("rusty_nugget"); - setCreativeTab(CreativeTabs.MISC); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/Salt.java b/src/main/java/com/NetherNoah/ParadiseMod/items/Salt.java deleted file mode 100644 index 531f286..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/Salt.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.NetherNoah.ParadiseMod.items; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; - -public class Salt extends Item { - public Salt() { - setUnlocalizedName("salt"); - setRegistryName("salt"); - setCreativeTab(CreativeTabs.MISC); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/SilverIngot.java b/src/main/java/com/NetherNoah/ParadiseMod/items/SilverIngot.java deleted file mode 100644 index c89a434..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/SilverIngot.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.NetherNoah.ParadiseMod.items; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; - -public class SilverIngot extends Item { - public SilverIngot() { - setUnlocalizedName("SilverIngot"); - setRegistryName("silver_ingot"); - setCreativeTab(CreativeTabs.MISC); - } -} diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/SilverNugget.java b/src/main/java/com/NetherNoah/ParadiseMod/items/SilverNugget.java deleted file mode 100644 index b7c2c63..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/SilverNugget.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.NetherNoah.ParadiseMod.items; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; - -public class SilverNugget extends Item { - public SilverNugget() { - setUnlocalizedName("SilverNugget"); - setRegistryName("silver_nugget"); - setCreativeTab(CreativeTabs.MISC); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/VoidPearl.java b/src/main/java/com/NetherNoah/ParadiseMod/items/VoidPearl.java deleted file mode 100644 index 3a32537..0000000 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/VoidPearl.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.NetherNoah.ParadiseMod.items; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.ItemEnderPearl; - -public class VoidPearl extends ItemEnderPearl { - public VoidPearl() { - setUnlocalizedName("VoidPearl"); - setRegistryName("void_pearl"); - setCreativeTab(CreativeTabs.MISC); - } -} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemAndesiteDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemAndesiteDoor.java index fde9469..51978d0 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemAndesiteDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemAndesiteDoor.java @@ -2,12 +2,13 @@ import com.NetherNoah.ParadiseMod.init.ModBlocks.Doors; +import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemDoor; public class ItemAndesiteDoor extends ItemDoor { public ItemAndesiteDoor() { - super(Doors.BlockAndesiteDoor); + super(Doors.AndesiteDoor); setUnlocalizedName("ItemAndesiteDoor"); setRegistryName("andesite_door"); setCreativeTab(CreativeTabs.REDSTONE); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemBedrockDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemBedrockDoor.java index 43fdc14..fbfd784 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemBedrockDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemBedrockDoor.java @@ -7,7 +7,7 @@ public class ItemBedrockDoor extends ItemDoor { public ItemBedrockDoor() { - super(Doors.BlockBedrockDoor); + super(Doors.BedrockDoor); setUnlocalizedName("ItemBedrockDoor"); setRegistryName("bedrock_door"); setCreativeTab(CreativeTabs.REDSTONE); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemCactusDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemCactusDoor.java index 52feb4f..0b397eb 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemCactusDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemCactusDoor.java @@ -7,7 +7,7 @@ public class ItemCactusDoor extends ItemDoor { public ItemCactusDoor() { - super(Doors.BlockCactusDoor); + super(Doors.CactusDoor); setUnlocalizedName("ItemCactusDoor"); setRegistryName("cactus_door"); setCreativeTab(CreativeTabs.REDSTONE); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemCobblestoneDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemCobblestoneDoor.java index 5a2412f..f846f78 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemCobblestoneDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemCobblestoneDoor.java @@ -7,7 +7,7 @@ public class ItemCobblestoneDoor extends ItemDoor { public ItemCobblestoneDoor() { - super(Doors.BlockCobblestoneDoor); + super(Doors.CobblestoneDoor); setUnlocalizedName("ItemCobblestoneDoor"); setRegistryName("cobblestone_door"); setCreativeTab(CreativeTabs.REDSTONE); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemDiamondDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemDiamondDoor.java index 1320d64..49fec40 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemDiamondDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemDiamondDoor.java @@ -7,7 +7,7 @@ public class ItemDiamondDoor extends ItemDoor { public ItemDiamondDoor() { - super(Doors.BlockDiamondDoor); + super(Doors.DiamondDoor); setUnlocalizedName("ItemDiamondDoor"); setRegistryName("diamond_door"); setCreativeTab(CreativeTabs.REDSTONE); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemDioriteDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemDioriteDoor.java index 1eb7417..247101a 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemDioriteDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemDioriteDoor.java @@ -7,7 +7,7 @@ public class ItemDioriteDoor extends ItemDoor { public ItemDioriteDoor() { - super(Doors.BlockDioriteDoor); + super(Doors.DioriteDoor); setUnlocalizedName("ItemDioriteDoor"); setRegistryName("diorite_door"); setCreativeTab(CreativeTabs.REDSTONE); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemEmeraldDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemEmeraldDoor.java index f8f279e..afcd811 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemEmeraldDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemEmeraldDoor.java @@ -7,7 +7,7 @@ public class ItemEmeraldDoor extends ItemDoor { public ItemEmeraldDoor() { - super(Doors.BlockEmeraldDoor); + super(Doors.EmeraldDoor); setUnlocalizedName("ItemEmeraldDoor"); setRegistryName("emerald_door"); setCreativeTab(CreativeTabs.REDSTONE); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemEndDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemEndDoor.java index d74ecd2..6c55ab3 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemEndDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemEndDoor.java @@ -7,7 +7,7 @@ public class ItemEndDoor extends ItemDoor { public ItemEndDoor() { - super(Doors.BlockEndDoor); + super(Doors.EndDoor); setUnlocalizedName("ItemEndDoor"); setRegistryName("end_door"); setCreativeTab(CreativeTabs.REDSTONE); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemGlassDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemGlassDoor.java index c62f13c..8f952d4 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemGlassDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemGlassDoor.java @@ -7,7 +7,7 @@ public class ItemGlassDoor extends ItemDoor { public ItemGlassDoor() { - super(Doors.BlockGlassDoor); + super(Doors.GlassDoor); setUnlocalizedName("ItemGlassDoor"); setRegistryName("glass_door"); setCreativeTab(CreativeTabs.REDSTONE); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemGlowingObsidianDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemGlowingObsidianDoor.java index 0f012e4..d2cfc7b 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemGlowingObsidianDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemGlowingObsidianDoor.java @@ -7,7 +7,7 @@ public class ItemGlowingObsidianDoor extends ItemDoor { public ItemGlowingObsidianDoor() { - super(Doors.BlockGlowingObsidianDoor); + super(Doors.GlowingObsidianDoor); setUnlocalizedName("ItemGlowingObsidianDoor"); setRegistryName("glowing_obsidian_door"); setCreativeTab(CreativeTabs.REDSTONE); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemGoldDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemGoldDoor.java index 03494a2..be6da3e 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemGoldDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemGoldDoor.java @@ -7,7 +7,7 @@ public class ItemGoldDoor extends ItemDoor { public ItemGoldDoor() { - super(Doors.BlockGoldDoor); + super(Doors.GoldDoor); setUnlocalizedName("ItemGoldDoor"); setRegistryName("gold_door"); setCreativeTab(CreativeTabs.REDSTONE); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemGraniteDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemGraniteDoor.java index 7400c8a..050898b 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemGraniteDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemGraniteDoor.java @@ -7,7 +7,7 @@ public class ItemGraniteDoor extends ItemDoor { public ItemGraniteDoor() { - super(Doors.BlockGraniteDoor); + super(Doors.GraniteDoor); setUnlocalizedName("ItemGraniteDoor"); setRegistryName("granite_door"); setCreativeTab(CreativeTabs.REDSTONE); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemMossStoneDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemMossStoneDoor.java index 491faa9..233549a 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemMossStoneDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemMossStoneDoor.java @@ -7,7 +7,7 @@ public class ItemMossStoneDoor extends ItemDoor { public ItemMossStoneDoor() { - super(Doors.BlockMossStoneDoor); + super(Doors.MossStoneDoor); setUnlocalizedName("ItemMossStoneDoor"); setRegistryName("moss_stone_door"); setCreativeTab(CreativeTabs.REDSTONE); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemObsidianDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemObsidianDoor.java index 8c8e97b..ca8cb83 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemObsidianDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemObsidianDoor.java @@ -7,7 +7,7 @@ public class ItemObsidianDoor extends ItemDoor { public ItemObsidianDoor() { - super(Doors.BlockObsidianDoor); + super(Doors.ObsidianDoor); setUnlocalizedName("ItemObsidianDoor"); setRegistryName("obsidian_door"); setCreativeTab(CreativeTabs.REDSTONE); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemRedstoneDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemRedstoneDoor.java index 0f53c94..01e9496 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemRedstoneDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemRedstoneDoor.java @@ -2,14 +2,93 @@ import com.NetherNoah.ParadiseMod.init.ModBlocks.Doors; +import net.minecraft.block.Block; +import net.minecraft.block.BlockDoor; +import net.minecraft.block.SoundType; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.ItemDoor; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; -public class ItemRedstoneDoor extends ItemDoor { - public ItemRedstoneDoor() { - super(Doors.BlockRedstoneDoor); +public class ItemRedstoneDoor extends Item +{ + public ItemRedstoneDoor() + { + setCreativeTab(CreativeTabs.REDSTONE); setUnlocalizedName("ItemRedstoneDoor"); setRegistryName("redstone_door"); - setCreativeTab(CreativeTabs.REDSTONE); - } + } + + public EnumActionResult onItemUse(EntityPlayer player, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) + { + if (facing != EnumFacing.UP) + { + return EnumActionResult.FAIL; + } + else + { + Block block = worldIn.getBlockState(pos).getBlock(); + + if (!block.isReplaceable(worldIn, pos)) + { + pos = pos.offset(facing); + } + + ItemStack itemstack = player.getHeldItem(hand); + + if (player.canPlayerEdit(pos, facing, itemstack) && block.canPlaceBlockAt(worldIn, pos)) + { + EnumFacing enumfacing = EnumFacing.fromAngle((double)player.rotationYaw); + int i = enumfacing.getFrontOffsetX(); + int j = enumfacing.getFrontOffsetZ(); + boolean flag = i < 0 && hitZ < 0.5F || i > 0 && hitZ > 0.5F || j < 0 && hitX > 0.5F || j > 0 && hitX < 0.5F; + placeDoor(worldIn, pos, enumfacing, Doors.RedstoneDoor, flag); + SoundType soundtype = worldIn.getBlockState(pos).getBlock().getSoundType(worldIn.getBlockState(pos), worldIn, pos, player); + worldIn.playSound(player, pos, soundtype.getPlaceSound(), SoundCategory.BLOCKS, (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F); + itemstack.shrink(1); + return EnumActionResult.SUCCESS; + } + else + { + return EnumActionResult.FAIL; + } + } + } + + public static void placeDoor(World worldIn, BlockPos pos, EnumFacing facing, Block door, boolean isRightHinge) + { + BlockPos blockpos = pos.offset(facing.rotateY()); + BlockPos blockpos1 = pos.offset(facing.rotateYCCW()); + int i = (worldIn.getBlockState(blockpos1).isNormalCube() ? 1 : 0) + (worldIn.getBlockState(blockpos1.up()).isNormalCube() ? 1 : 0); + int j = (worldIn.getBlockState(blockpos).isNormalCube() ? 1 : 0) + (worldIn.getBlockState(blockpos.up()).isNormalCube() ? 1 : 0); + boolean flag = worldIn.getBlockState(blockpos1).getBlock() == door || worldIn.getBlockState(blockpos1.up()).getBlock() == door; + boolean flag1 = worldIn.getBlockState(blockpos).getBlock() == door || worldIn.getBlockState(blockpos.up()).getBlock() == door; + + if ((!flag || flag1) && j <= i) + { + if (flag1 && !flag || j < i) + { + isRightHinge = false; + } + } + else + { + isRightHinge = true; + } + + BlockPos blockpos2 = pos.up(); + boolean flag2 = worldIn.isBlockPowered(pos) || worldIn.isBlockPowered(blockpos2); + IBlockState iblockstate = door.getDefaultState().withProperty(BlockDoor.FACING, facing).withProperty(BlockDoor.HINGE, isRightHinge ? BlockDoor.EnumHingePosition.RIGHT : BlockDoor.EnumHingePosition.LEFT).withProperty(BlockDoor.OPEN, Boolean.valueOf(flag2)); + worldIn.setBlockState(pos, iblockstate.withProperty(BlockDoor.HALF, BlockDoor.EnumDoorHalf.LOWER), 2); + worldIn.setBlockState(blockpos2, iblockstate.withProperty(BlockDoor.HALF, BlockDoor.EnumDoorHalf.UPPER), 2); + worldIn.notifyNeighborsOfStateChange(pos, door, false); + worldIn.notifyNeighborsOfStateChange(blockpos2, door, false); + } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemRubyDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemRubyDoor.java index 3d54ce3..16a7c0b 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemRubyDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemRubyDoor.java @@ -7,7 +7,7 @@ public class ItemRubyDoor extends ItemDoor { public ItemRubyDoor() { - super(Doors.BlockRubyDoor); + super(Doors.RubyDoor); setUnlocalizedName("ItemRubyDoor"); setRegistryName("ruby_door"); setCreativeTab(CreativeTabs.REDSTONE); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemSilverDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemSilverDoor.java index 08bce26..d6b6267 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemSilverDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemSilverDoor.java @@ -7,7 +7,7 @@ public class ItemSilverDoor extends ItemDoor { public ItemSilverDoor() { - super(Doors.BlockSilverDoor); + super(Doors.SilverDoor); setUnlocalizedName("ItemSilverDoor"); setRegistryName("silver_door"); setCreativeTab(CreativeTabs.REDSTONE); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemStoneDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemStoneDoor.java index b5b52e8..52fedd7 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemStoneDoor.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/doors/ItemStoneDoor.java @@ -7,7 +7,7 @@ public class ItemStoneDoor extends ItemDoor { public ItemStoneDoor() { - super(Doors.BlockStoneDoor); + super(Doors.StoneDoor); setUnlocalizedName("ItemStoneDoor"); setRegistryName("stone_door"); setCreativeTab(CreativeTabs.REDSTONE); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/tileentity/furnace/TEMossyFurnace.java b/src/main/java/com/NetherNoah/ParadiseMod/tileentity/furnace/TEMossyFurnace.java index 41c69b7..4d5bb65 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/tileentity/furnace/TEMossyFurnace.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/tileentity/furnace/TEMossyFurnace.java @@ -2,7 +2,9 @@ package com.NetherNoah.ParadiseMod.tileentity.furnace; -import com.NetherNoah.ParadiseMod.CustomBlockCode.MossyFurnaceCode; +import javax.annotation.Nullable; + +import com.NetherNoah.ParadiseMod.init.ModBlocks.Misc; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -34,8 +36,12 @@ import net.minecraft.util.datafix.FixTypes; import net.minecraft.util.datafix.walkers.ItemStackDataLists; import net.minecraft.util.math.MathHelper; +import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.wrapper.SidedInvWrapper; public class TEMossyFurnace extends TileEntityLockable implements ITickable, ISidedInventory { @@ -102,8 +108,8 @@ public void setInventorySlotContents(int index, ItemStack stack) ItemStack itemstack = furnaceItemStacks.get(index); boolean flag = !stack.isEmpty() && stack.isItemEqual(itemstack) && ItemStack.areItemStackTagsEqual(stack, itemstack); furnaceItemStacks.set(index, stack); - if (stack.getCount() > getInventoryStackLimit()) - stack.setCount(getInventoryStackLimit()); + if (stack.getCount() > 64) + stack.setCount(64); if (index == 0 && !flag) { totalCookTime = getCookTime(stack); @@ -127,9 +133,9 @@ public boolean hasCustomName() { return furnaceCustomName != null && !furnaceCustomName.isEmpty(); } - public void setCustomInventoryName(String p_145951_1_) + public void setCustomInventoryName(String name) { - furnaceCustomName = p_145951_1_; + furnaceCustomName = name; } public static void registerFixesFurnace(DataFixer fixer) { @@ -164,6 +170,7 @@ public NBTTagCompound writeToNBT(NBTTagCompound compound) /** * Returns the maximum stack size for a inventory slot. Seems to always be 64, possibly will be extended. */ + @Override public int getInventoryStackLimit() { @@ -234,7 +241,7 @@ else if (!isBurning() && cookTime > 0) if (flag != isBurning()) { flag1 = true; - MossyFurnaceCode.setState(isBurning(), world, pos); + Misc.MossyFurnace.setState(isBurning(), world, pos); } } if (flag1) @@ -423,13 +430,13 @@ public void clear() { furnaceItemStacks.clear(); } - net.minecraftforge.items.IItemHandler handlerTop = new net.minecraftforge.items.wrapper.SidedInvWrapper(this, net.minecraft.util.EnumFacing.UP); - net.minecraftforge.items.IItemHandler handlerBottom = new net.minecraftforge.items.wrapper.SidedInvWrapper(this, net.minecraft.util.EnumFacing.DOWN); - net.minecraftforge.items.IItemHandler handlerSide = new net.minecraftforge.items.wrapper.SidedInvWrapper(this, net.minecraft.util.EnumFacing.WEST); + IItemHandler handlerTop = new SidedInvWrapper(this, EnumFacing.UP); + IItemHandler handlerBottom = new SidedInvWrapper(this, EnumFacing.DOWN); + IItemHandler handlerSide = new SidedInvWrapper(this, EnumFacing.WEST); @Override - public T getCapability(net.minecraftforge.common.capabilities.Capability capability, @javax.annotation.Nullable net.minecraft.util.EnumFacing facing) + public T getCapability(Capability capability, @Nullable EnumFacing facing) { - if (facing != null && capability == net.minecraftforge.items.CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) + if (facing != null && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) if (facing == EnumFacing.DOWN) return (T) handlerBottom; else if (facing == EnumFacing.UP) diff --git a/src/main/java/com/NetherNoah/ParadiseMod/tileentity/furnace/TEVoidFurnace.java b/src/main/java/com/NetherNoah/ParadiseMod/tileentity/furnace/TEVoidFurnace.java index acb1b02..353faa2 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/tileentity/furnace/TEVoidFurnace.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/tileentity/furnace/TEVoidFurnace.java @@ -1,8 +1,9 @@ -//this was derived from the vanilla code package com.NetherNoah.ParadiseMod.tileentity.furnace; -import com.NetherNoah.ParadiseMod.CustomBlockCode.VoidFurnaceCode; +import javax.annotation.Nullable; + +import com.NetherNoah.ParadiseMod.blocks.base.VoidFurnaceBase; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -34,8 +35,13 @@ import net.minecraft.util.datafix.FixTypes; import net.minecraft.util.datafix.walkers.ItemStackDataLists; import net.minecraft.util.math.MathHelper; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.wrapper.SidedInvWrapper; public class TEVoidFurnace extends TileEntityLockable implements ITickable, ISidedInventory { @@ -235,7 +241,7 @@ else if (!isBurning() && cookTime > 0) if (flag != isBurning()) { flag1 = true; - VoidFurnaceCode.setState(isBurning(), world, pos); + VoidFurnaceBase.setState(isBurning(), world, pos); } } if (flag1) @@ -299,7 +305,7 @@ public static int getItemBurnTime(ItemStack stack) Item item = stack.getItem(); if (!item.getRegistryName().getResourceDomain().equals("minecraft")) { - int burnTime = net.minecraftforge.fml.common.registry.GameRegistry.getFuelValue(stack); + int burnTime = GameRegistry.getFuelValue(stack); if (burnTime != 0) return burnTime; } return item == Item.getItemFromBlock(Blocks.WOODEN_SLAB) ? 150 : (item == Item.getItemFromBlock(Blocks.WOOL) ? 100 : (item == Item.getItemFromBlock(Blocks.CARPET) ? 67 : (item == Item.getItemFromBlock(Blocks.LADDER) ? 300 : (item == Item.getItemFromBlock(Blocks.WOODEN_BUTTON) ? 100 : (Block.getBlockFromItem(item).getDefaultState().getMaterial() == Material.WOOD ? 300 : (item == Item.getItemFromBlock(Blocks.COAL_BLOCK) ? 16000 : (item instanceof ItemTool && "WOOD".equals(((ItemTool)item).getToolMaterialName()) ? 200 : (item instanceof ItemSword && "WOOD".equals(((ItemSword)item).getToolMaterialName()) ? 200 : (item instanceof ItemHoe && "WOOD".equals(((ItemHoe)item).getMaterialName()) ? 200 : (item == Items.STICK ? 100 : (item != Items.BOW && item != Items.FISHING_ROD ? (item == Items.SIGN ? 200 : (item == Items.COAL ? 1600 : (item == Items.LAVA_BUCKET ? 20000 : (item != Item.getItemFromBlock(Blocks.SAPLING) && item != Items.BOWL ? (item == Items.BLAZE_ROD ? 2400 : (item instanceof ItemDoor && item != Items.IRON_DOOR ? 200 : (item instanceof ItemBoat ? 400 : 0))) : 100)))) : 300))))))))))); @@ -424,13 +430,13 @@ public void clear() { furnaceItemStacks.clear(); } - net.minecraftforge.items.IItemHandler handlerTop = new net.minecraftforge.items.wrapper.SidedInvWrapper(this, net.minecraft.util.EnumFacing.UP); - net.minecraftforge.items.IItemHandler handlerBottom = new net.minecraftforge.items.wrapper.SidedInvWrapper(this, net.minecraft.util.EnumFacing.DOWN); - net.minecraftforge.items.IItemHandler handlerSide = new net.minecraftforge.items.wrapper.SidedInvWrapper(this, net.minecraft.util.EnumFacing.WEST); + IItemHandler handlerTop = new SidedInvWrapper(this, EnumFacing.UP); + IItemHandler handlerBottom = new SidedInvWrapper(this, EnumFacing.DOWN); + IItemHandler handlerSide = new SidedInvWrapper(this, EnumFacing.WEST); @Override - public T getCapability(net.minecraftforge.common.capabilities.Capability capability, @javax.annotation.Nullable net.minecraft.util.EnumFacing facing) + public T getCapability(Capability capability, @Nullable EnumFacing facing) { - if (facing != null && capability == net.minecraftforge.items.CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) + if (facing != null && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) if (facing == EnumFacing.DOWN) return (T) handlerBottom; else if (facing == EnumFacing.UP) diff --git a/src/main/java/com/NetherNoah/ParadiseMod/tileentity/render/TileEntityCactusChestRender.java b/src/main/java/com/NetherNoah/ParadiseMod/tileentity/render/TileEntityCactusChestRender.java index fb2eb28..78055f8 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/tileentity/render/TileEntityCactusChestRender.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/tileentity/render/TileEntityCactusChestRender.java @@ -113,17 +113,20 @@ else if (te.getChestType() == BlockChest.Type.TRAP) GlStateManager.translate(0.5F, 0.5F, 0.5F); int j = 0; - if (i == 2) - j = 180; - - if (i == 3) - j = 0; - - if (i == 4) - j = 90; - - if (i == 5) - j = -90; + switch (i) { + case 2: + j = 180; + break; + case 4: + j = 90; + break; + case 5: + j = -90; + break; + case 3: + default: + j=0; + } if (i == 2 && te.adjacentChestXPos != null) GlStateManager.translate(1.0F, 0.0F, 0.0F); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/tileentity/render/TileEntityCompressedCactusChestRender.java b/src/main/java/com/NetherNoah/ParadiseMod/tileentity/render/TileEntityCompressedCactusChestRender.java index bcd5928..c96d68a 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/tileentity/render/TileEntityCompressedCactusChestRender.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/tileentity/render/TileEntityCompressedCactusChestRender.java @@ -114,17 +114,20 @@ else if (te.getChestType() == BlockChest.Type.TRAP) GlStateManager.translate(0.5F, 0.5F, 0.5F); int j = 0; - if (i == 2) - j = 180; - - if (i == 3) - j = 0; - - if (i == 4) - j = 90; - - if (i == 5) - j = -90; + switch(i) { + case 2: + j=180; + break; + case 4: + j=90; + break; + case 5: + j=-90; + break; + case 3: + default: + j=0; + } if (i == 2 && te.adjacentChestXPos != null) GlStateManager.translate(1.0F, 0.0F, 0.0F); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/world/dimension/DUChunkGenerator.java b/src/main/java/com/NetherNoah/ParadiseMod/world/dimension/DUChunkGenerator.java index b762f03..1a76220 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/world/dimension/DUChunkGenerator.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/world/dimension/DUChunkGenerator.java @@ -132,10 +132,10 @@ public class DUChunkGenerator implements IChunkGenerator { double[] noiseData4; double[] dr; - public DUChunkGenerator(World worldIn, boolean p_i45637_2_, long seed) { + public DUChunkGenerator(World worldIn) { world = worldIn; generateStructures = false; - rand = worldIn.rand;//new Random(seed); + rand = worldIn.rand; lperlinNoise1 = new NoiseGeneratorOctaves(rand, 16); lperlinNoise2 = new NoiseGeneratorOctaves(rand, 16); perlinNoise1 = new NoiseGeneratorOctaves(rand, 16); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/world/dimension/DUWorldProvider.java b/src/main/java/com/NetherNoah/ParadiseMod/world/dimension/DUWorldProvider.java index 0f5bf42..1c8b9d9 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/world/dimension/DUWorldProvider.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/world/dimension/DUWorldProvider.java @@ -28,7 +28,7 @@ public Vec3d getFogColor(float par1, float par2) { @Override public IChunkGenerator createChunkGenerator() { - return new DUChunkGenerator(world, false, DimensionRegistry.DeepUnderground); + return new DUChunkGenerator(world); } @Override diff --git a/src/main/java/com/NetherNoah/ParadiseMod/world/dimension/DVChunkGenerator.java b/src/main/java/com/NetherNoah/ParadiseMod/world/dimension/DVChunkGenerator.java index 782b0be..9f9857d 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/world/dimension/DVChunkGenerator.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/world/dimension/DVChunkGenerator.java @@ -45,7 +45,6 @@ public class DVChunkGenerator implements IChunkGenerator public NoiseGeneratorOctaves noiseGen5; public NoiseGeneratorOctaves noiseGen6; private final World world; - private final boolean mapFeaturesEnabled; private NoiseGeneratorSimplex islandNoise; private double[] buffer; private Biome[] biomesForGeneration; @@ -70,25 +69,24 @@ public class DVChunkGenerator implements IChunkGenerator private final WorldGenerator silverGen = new WorldGenMinable(Ores.SilverOreVoid.getDefaultState(), 7,BlockMatcher.forBlock(Misc.VoidStone)); private final WorldGenerator RStoneGen = new WorldGenMinable(Misc.RegenerationStone.getDefaultState(), 7,BlockMatcher.forBlock(Misc.VoidStone)); - public DVChunkGenerator(World p_i47241_1_, boolean p_i47241_2_, long p_i47241_3_){ - this.world = p_i47241_1_; - this.mapFeaturesEnabled = p_i47241_2_; - this.rand = new Random(p_i47241_3_); - this.lperlinNoise1 = new NoiseGeneratorOctaves(this.rand, 16); - this.lperlinNoise2 = new NoiseGeneratorOctaves(this.rand, 16); - this.perlinNoise1 = new NoiseGeneratorOctaves(this.rand, 8); - this.noiseGen5 = new NoiseGeneratorOctaves(this.rand, 10); - this.noiseGen6 = new NoiseGeneratorOctaves(this.rand, 16); - this.islandNoise = new NoiseGeneratorSimplex(this.rand); + public DVChunkGenerator(World worldIn){ + world = worldIn; + rand = worldIn.rand; + lperlinNoise1 = new NoiseGeneratorOctaves(this.rand, 16); + lperlinNoise2 = new NoiseGeneratorOctaves(this.rand, 16); + perlinNoise1 = new NoiseGeneratorOctaves(this.rand, 8); + noiseGen5 = new NoiseGeneratorOctaves(this.rand, 10); + noiseGen6 = new NoiseGeneratorOctaves(this.rand, 16); + islandNoise = new NoiseGeneratorSimplex(this.rand); InitNoiseGensEvent.ContextEnd ctx = new InitNoiseGensEvent.ContextEnd(lperlinNoise1, lperlinNoise2, perlinNoise1, noiseGen5, noiseGen6, islandNoise); - ctx = TerrainGen.getModdedNoiseGenerators(p_i47241_1_, this.rand, ctx); - this.lperlinNoise1 = ctx.getLPerlin1(); - this.lperlinNoise2 = ctx.getLPerlin2(); - this.perlinNoise1 = ctx.getPerlin(); - this.noiseGen5 = ctx.getDepth(); - this.noiseGen6 = ctx.getScale(); - this.islandNoise = ctx.getIsland(); + ctx = TerrainGen.getModdedNoiseGenerators(worldIn, this.rand, ctx); + lperlinNoise1 = ctx.getLPerlin1(); + lperlinNoise2 = ctx.getLPerlin2(); + perlinNoise1 = ctx.getPerlin(); + noiseGen5 = ctx.getDepth(); + noiseGen6 = ctx.getScale(); + islandNoise = ctx.getIsland(); } public void setBlocksInChunk(int x, int z, ChunkPrimer primer){ @@ -102,14 +100,14 @@ public void setBlocksInChunk(int x, int z, ChunkPrimer primer){ for (int j1 = 0; j1 < 2; ++j1){ for (int k1 = 0; k1 < 32; ++k1){ double d0 = 0.25D; - double d1 = this.buffer[((i1 + 0) * 3 + j1 + 0) * 33 + k1 + 0]; - double d2 = this.buffer[((i1 + 0) * 3 + j1 + 1) * 33 + k1 + 0]; - double d3 = this.buffer[((i1 + 1) * 3 + j1 + 0) * 33 + k1 + 0]; - double d4 = this.buffer[((i1 + 1) * 3 + j1 + 1) * 33 + k1 + 0]; - double d5 = (this.buffer[((i1 + 0) * 3 + j1 + 0) * 33 + k1 + 1] - d1) * 0.25D; - double d6 = (this.buffer[((i1 + 0) * 3 + j1 + 1) * 33 + k1 + 1] - d2) * 0.25D; - double d7 = (this.buffer[((i1 + 1) * 3 + j1 + 0) * 33 + k1 + 1] - d3) * 0.25D; - double d8 = (this.buffer[((i1 + 1) * 3 + j1 + 1) * 33 + k1 + 1] - d4) * 0.25D; + double d1 = buffer[((i1 + 0) * 3 + j1 + 0) * 33 + k1 + 0]; + double d2 = buffer[((i1 + 0) * 3 + j1 + 1) * 33 + k1 + 0]; + double d3 = buffer[((i1 + 1) * 3 + j1 + 0) * 33 + k1 + 0]; + double d4 = buffer[((i1 + 1) * 3 + j1 + 1) * 33 + k1 + 0]; + double d5 = (buffer[((i1 + 0) * 3 + j1 + 0) * 33 + k1 + 1] - d1) * 0.25D; + double d6 = (buffer[((i1 + 0) * 3 + j1 + 1) * 33 + k1 + 1] - d2) * 0.25D; + double d7 = (buffer[((i1 + 1) * 3 + j1 + 0) * 33 + k1 + 1] - d3) * 0.25D; + double d8 = (buffer[((i1 + 1) * 3 + j1 + 1) * 33 + k1 + 1] - d4) * 0.25D; for (int l1 = 0; l1 < 4; ++l1){ double d9 = 0.125D; @@ -189,12 +187,12 @@ else if (l > 0) @Override public Chunk generateChunk(int x, int z) { - this.chunkX = x; this.chunkZ = z; - this.rand.setSeed(x * 341873128712L + z * 132897987541L); + chunkX = x; this.chunkZ = z; + rand.setSeed(x * 341873128712L + z * 132897987541L); ChunkPrimer chunkprimer = new ChunkPrimer(); - this.biomesForGeneration = this.world.getBiomeProvider().getBiomes(this.biomesForGeneration, x * 16, z * 16, 16, 16); - this.setBlocksInChunk(x, z, chunkprimer); - this.buildSurfaces(chunkprimer); + biomesForGeneration = this.world.getBiomeProvider().getBiomes(this.biomesForGeneration, x * 16, z * 16, 16, 16); + setBlocksInChunk(x, z, chunkprimer); + buildSurfaces(chunkprimer); Chunk chunk = new Chunk(this.world, chunkprimer, x, z); byte[] abyte = chunk.getBiomeArray(); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/world/dimension/DVWorldProvider.java b/src/main/java/com/NetherNoah/ParadiseMod/world/dimension/DVWorldProvider.java index 9a0b370..9b89a07 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/world/dimension/DVWorldProvider.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/world/dimension/DVWorldProvider.java @@ -15,7 +15,7 @@ public class DVWorldProvider extends WorldProvider{ public void init() { biomeProvider=new BiomeProviderSingle(Biomes.VOID); hasSkyLight=false; - nether=true; + nether=false; } @Override @@ -31,7 +31,7 @@ public Vec3d getFogColor(float par1, float par2) { @Override public IChunkGenerator createChunkGenerator() { - return new DVChunkGenerator(world, false, DimensionRegistry.DeepVoid); + return new DVChunkGenerator(world); } @Override diff --git a/src/main/java/com/NetherNoah/ParadiseMod/world/mapgen/MapGenDUCaves.java b/src/main/java/com/NetherNoah/ParadiseMod/world/mapgen/MapGenDUCaves.java index 133347e..1eb95e5 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/world/mapgen/MapGenDUCaves.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/world/mapgen/MapGenDUCaves.java @@ -88,25 +88,18 @@ protected void addTunnel(long p_180702_1_, int p_180702_3_, int p_180702_4_, Chu int i3 = MathHelper.floor(p_180702_10_ - d2) - p_180702_4_ * 16 - 1; int i1 = MathHelper.floor(p_180702_10_ + d2) - p_180702_4_ * 16 + 1; - if (k2 < 0) - k2 = 0; - if (k > 16) - k = 16; - if (l2 < 1) - l2 = 1; - if (l > 248) - l = 248; - if (i3 < 0) - i3 = 0; - if (i1 > 16) - i1 = 16; + if (k2 < 0) k2 = 0; + if (k > 16) k = 16; + if (l2 < 1) l2 = 1; + if (l > 248) l = 248; + if (i3 < 0) i3 = 0; + if (i1 > 16) i1 = 16; for (int j1 = k2; j1 < k; ++j1){ for (int k1 = i3; k1 < i1; ++k1){ for (int l1 = l + 1; l1 >= l2 - 1; --l1){ if (l1 >= 0 && l1 < 256){ - if (l1 != l2 - 1 && j1 != k2 && j1 != k - 1 && k1 != i3 && k1 != i1 - 1) - l1 = l2; + if (l1 != l2 - 1 && j1 != k2 && j1 != k - 1 && k1 != i3 && k1 != i1 - 1) l1 = l2; } } } @@ -145,28 +138,17 @@ protected void addTunnel(long p_180702_1_, int p_180702_3_, int p_180702_4_, Chu } protected boolean canReplaceBlock(IBlockState block1, IBlockState block2){ - if (block1.getBlock() == Blocks.STONE) - return true; - else if (block1.getBlock() == Blocks.DIRT) - return true; - else if (block1.getBlock() == Blocks.GRASS) - return true; - else if (block1.getBlock() == Blocks.HARDENED_CLAY) - return true; - else if (block1.getBlock() == Blocks.STAINED_HARDENED_CLAY) - return true; - else if (block1.getBlock() == Blocks.SANDSTONE) - return true; - else if (block1.getBlock() == Blocks.RED_SANDSTONE) - return true; - else if (block1.getBlock() == Blocks.MYCELIUM) - return true; - else if (block1.getBlock() == Blocks.SNOW_LAYER) - return true; - else if (block1.getBlock()==Blocks.FLOWING_WATER||block1.getBlock()==Blocks.WATER) - return true; - else - return (block1.getBlock() == Blocks.SAND || block1.getBlock() == Blocks.GRAVEL) && block2.getMaterial() != Material.WATER; + if (block1.getBlock() == Blocks.STONE) return true; + else if (block1.getBlock() == Blocks.DIRT) return true; + else if (block1.getBlock() == Blocks.GRASS) return true; + else if (block1.getBlock() == Blocks.HARDENED_CLAY) return true; + else if (block1.getBlock() == Blocks.STAINED_HARDENED_CLAY) return true; + else if (block1.getBlock() == Blocks.SANDSTONE) return true; + else if (block1.getBlock() == Blocks.RED_SANDSTONE) return true; + else if (block1.getBlock() == Blocks.MYCELIUM) return true; + else if (block1.getBlock() == Blocks.SNOW_LAYER) return true; + else if (block1.getBlock()==Blocks.FLOWING_WATER||block1.getBlock()==Blocks.WATER) return true; + else return (block1.getBlock() == Blocks.SAND || block1.getBlock() == Blocks.GRAVEL) && block2.getMaterial() != Material.WATER; } protected void recursiveGenerate(World worldIn, int chunkX, int chunkZ, int originalX, int originalZ, ChunkPrimer chunkPrimerIn){ diff --git a/src/main/java/com/NetherNoah/ParadiseMod/world/mapgen/MapGenDURavines.java b/src/main/java/com/NetherNoah/ParadiseMod/world/mapgen/MapGenDURavines.java index cc9214d..82160a3 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/world/mapgen/MapGenDURavines.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/world/mapgen/MapGenDURavines.java @@ -12,8 +12,7 @@ import net.minecraft.world.chunk.ChunkPrimer; import net.minecraft.world.gen.MapGenBase; -public class MapGenDURavines extends MapGenBase -{ +public class MapGenDURavines extends MapGenBase { protected static final IBlockState AIR = Blocks.AIR.getDefaultState(); protected static final IBlockState WATER = Blocks.WATER.getDefaultState(); private final float[] rs = new float[1024]; @@ -43,7 +42,7 @@ protected void addTunnel(long p_180707_1_, int p_180707_3_, int p_180707_4_, Chu if (j == 0 || random.nextInt(3) == 0) f2 = 1.0F + random.nextFloat() * random.nextFloat(); - this.rs[j] = f2 * f2; + rs[j] = f2 * f2; } for (; p_180707_15_ < p_180707_16_; ++p_180707_15_){ @@ -81,18 +80,12 @@ protected void addTunnel(long p_180707_1_, int p_180707_3_, int p_180707_4_, Chu int i3 = MathHelper.floor(p_180707_10_ - d9) - p_180707_4_ * 16 - 1; int i1 = MathHelper.floor(p_180707_10_ + d9) - p_180707_4_ * 16 + 1; - if (k2 < 0) - k2 = 0; - if (k > 16) - k = 16; - if (l2 < 1) - l2 = 1; - if (l > 248) - l = 248; - if (i3 < 0) - i3 = 0; - if (i1 > 16) - i1 = 16; + if (k2 < 0) k2 = 0; + if (k > 16) k = 16; + if (l2 < 1) l2 = 1; + if (l > 248) l = 248; + if (i3 < 0) i3 = 0; + if (i1 > 16) i1 = 16; for (int j1 = k2; j1 < k; ++j1){ for (int k1 = i3; k1 < i1; ++k1){ @@ -123,8 +116,7 @@ protected void addTunnel(long p_180707_1_, int p_180707_3_, int p_180707_4_, Chu } } - if (flag1) - break; + if (flag1) break; } } } @@ -158,6 +150,7 @@ protected void digBlock(ChunkPrimer data, int x, int y, int z, int chunkX, int c IBlockState filler = Blocks.DIRT.getDefaultState(); if (state.getBlock() == Blocks.STONE || state.getBlock() == top.getBlock() || state.getBlock() == filler.getBlock()){ + //water generates below level 31 if (y<=31) { data.setBlockState(x, y, z, WATER); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/caveGen/CaveGenDesert.java b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/caveGen/CaveGenDesert.java index 7e4a937..c3ab48d 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/caveGen/CaveGenDesert.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/caveGen/CaveGenDesert.java @@ -30,6 +30,7 @@ public void generate(Random rand, int chunkX, int chunkZ, World world, IChunkGen // generate cave features if (ModConfig.worldgen.caves.betterCaves == false) return; + if(ModConfig.worldgen.caves.types.Dry == false) return; diff --git a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/caveGen/CaveGenHumid.java b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/caveGen/CaveGenHumid.java index ad19eeb..19290f2 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/caveGen/CaveGenHumid.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/caveGen/CaveGenHumid.java @@ -28,6 +28,7 @@ public class CaveGenHumid implements IWorldGenerator{ @Override public void generate(Random rand, int chunkX, int chunkZ, World world, IChunkGenerator chunkGenerator,IChunkProvider chunkProvider) { Chunk theChunk=world.getChunkFromChunkCoords(chunkX, chunkZ); + // don't generate if the config says not to // generate cave features if (ModConfig.worldgen.caves.betterCaves == false) diff --git a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/caveGen/CaveGenIcy.java b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/caveGen/CaveGenIcy.java index f6b7c18..b94446f 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/caveGen/CaveGenIcy.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/caveGen/CaveGenIcy.java @@ -26,6 +26,7 @@ public class CaveGenIcy implements IWorldGenerator{ @Override public void generate(Random rand, int chunkX, int chunkZ, World world, IChunkGenerator chunkGenerator,IChunkProvider chunkProvider) { Chunk theChunk=world.getChunkFromChunkCoords(chunkX, chunkZ); + // don't generate if the config says not to // generate cave features if (ModConfig.worldgen.caves.betterCaves == false) diff --git a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/caveGen/CaveGenMesa.java b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/caveGen/CaveGenMesa.java index 1ca5e02..1839bf3 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/caveGen/CaveGenMesa.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/caveGen/CaveGenMesa.java @@ -36,6 +36,7 @@ public class CaveGenMesa implements IWorldGenerator { public void generate(Random rand, int chunkX, int chunkZ, World world, IChunkGenerator chunkGenerator, IChunkProvider chunkProvider) { Chunk theChunk = world.getChunkFromChunkCoords(chunkX, chunkZ); + // don't generate if the config says not to // generate cave features if (ModConfig.worldgen.caves.betterCaves == false) diff --git a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Buoy.java b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Buoy.java index 88c184f..5ba0564 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Buoy.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Buoy.java @@ -34,7 +34,7 @@ public void generate(Random rand, int chunkX, int chunkZ, World world, IChunkGen int blockZ = chunkZ * 16; int y = getGroundFromAbove(world, blockX, blockZ); if (y>60||world.provider.getDimension()==DimensionRegistry.DeepUnderground) { - BlockPos pos = new BlockPos(blockX, y, blockZ); + BlockPos pos = new BlockPos(blockX, y, blockZ); generate(world, rand, pos); } } diff --git a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Dungeons/BrickPyramid.java b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Dungeons/BrickPyramid.java index a60c2ec..51680b2 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Dungeons/BrickPyramid.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Dungeons/BrickPyramid.java @@ -3,6 +3,7 @@ import java.util.Random; import com.NetherNoah.ParadiseMod.Reference; +import com.NetherNoah.ParadiseMod.Utils; import com.NetherNoah.ParadiseMod.config.ModConfig; import net.minecraft.block.Block; @@ -31,13 +32,31 @@ public void generate(Random rand, int chunkX, int chunkZ, World world, IChunkGen IChunkProvider chunkProvider) { int blockX = chunkX * 16; int blockZ = chunkZ * 16; - if (world.provider.getDimension() == 0) { - int y = getGroundFromAbove(world, blockX, blockZ); + if (world.provider.getDimension() == 0 && rand.nextInt(ModConfig.worldgen.structures.BrickPyramidsChance) == 0) { + int y = getLowestBlock(world, blockX, blockZ); BlockPos pos = new BlockPos(blockX, y, blockZ); generate(world, rand, pos); } } + //get the lowest block in the area + public static int getLowestBlock(World world, int blockX,int blockZ) { + int[] heights = new int[220]; + int index = 0; + for (int i=0;i<=54;i++) { + heights[index]=getGroundFromAbove(world, blockX, blockZ); + index++; + heights[index]=getGroundFromAbove(world, blockX+i+1, blockZ); + index++; + heights[index]=getGroundFromAbove(world, blockX+i+1, blockZ+i+1); + index++; + heights[index]=getGroundFromAbove(world, blockX+i+1, blockZ+i+1); + index++; + } + + return Utils.getMinValue(heights); + } + public static int getGroundFromAbove(World world, int x, int z) { int y = 255; @@ -45,12 +64,11 @@ public static int getGroundFromAbove(World world, int x, int z) while(!foundGround && y-- >= 31) { Block blockAt = world.getBlockState(new BlockPos(x,y,z)).getBlock(); - foundGround = blockAt == Blocks.GRAVEL||blockAt == Blocks.GRASS||blockAt == Blocks.SAND||blockAt == Blocks.DIRT||blockAt == Blocks.STONE; + foundGround = blockAt == Blocks.GRAVEL||blockAt == Blocks.GRASS||blockAt == Blocks.SAND||blockAt == Blocks.DIRT; } return y; } - @Override public boolean generate(World world, Random rand, BlockPos position) { WorldServer worldserver = (WorldServer) world; MinecraftServer minecraftserver = world.getMinecraftServer(); @@ -62,22 +80,33 @@ public boolean generate(World world, Random rand, BlockPos position) { if(ModConfig.worldgen.structures.BrickPyramids==false) return false; Biome biome = world.getBiomeForCoordsBody(position); - if(rand.nextInt(ModConfig.worldgen.structures.BrickPyramidsChance) == 0){ - IBlockState iblockstate = world.getBlockState(position); - world.notifyBlockUpdate(position, iblockstate, iblockstate, 3); - PlacementSettings placementsettings = (new PlacementSettings()).setMirror(Mirror.NONE) - .setRotation(Rotation.NONE).setIgnoreEntities(false).setChunk((ChunkPos) null) - .setReplacedBlock((Block) null).setIgnoreStructureBlock(false); - part1.getDataBlocks(position, placementsettings); - part1.addBlocksToWorld(world, position.add(0, -2, 0), placementsettings); - part2.getDataBlocks(position, placementsettings); - part2.addBlocksToWorld(world, position.add(26, -2, 0), placementsettings); - part3.getDataBlocks(position, placementsettings); - part3.addBlocksToWorld(world, position.add(0, -2, 27), placementsettings); - part4.getDataBlocks(position, placementsettings); - part4.addBlocksToWorld(world, position.add(26, -2, 27), placementsettings); - return true; + IBlockState iblockstate = world.getBlockState(position); + world.notifyBlockUpdate(position, iblockstate, iblockstate, 3); + PlacementSettings placementsettings = (new PlacementSettings()).setMirror(Mirror.NONE) + .setRotation(Rotation.NONE).setIgnoreEntities(false).setChunk((ChunkPos) null) + .setReplacedBlock((Block) null).setIgnoreStructureBlock(false); + part1.getDataBlocks(position, placementsettings); + part1.addBlocksToWorld(world, position.add(0, 0, 0), placementsettings); + part2.getDataBlocks(position, placementsettings); + part2.addBlocksToWorld(world, position.add(26, 0, 0), placementsettings); + part3.getDataBlocks(position, placementsettings); + part3.addBlocksToWorld(world, position.add(0, 0, 27), placementsettings); + part4.getDataBlocks(position, placementsettings); + part4.addBlocksToWorld(world, position.add(26, 0, 27), placementsettings); + + //remove foliage from the area + int x=position.getX(); + int y=position.getY(); + int z=position.getZ(); + for (int i=0;i<=53;i++) { + for (int j=0;j<=53;j++) { + for (int k=0;k<=53;k++) { + if (world.getBlockState(new BlockPos(x+i,y+j,z+k)).getBlock()==Blocks.LEAVES||world.getBlockState(new BlockPos(x+i,y+j,z+k)).getBlock()==Blocks.LEAVES2||world.getBlockState(new BlockPos(x+i,y+j,z+k)).getBlock()==Blocks.LOG||world.getBlockState(new BlockPos(x+i,y+j,z+k)).getBlock()==Blocks.LOG2||world.getBlockState(new BlockPos(x+i,y+j,z+k)).getBlock()==Blocks.BROWN_MUSHROOM_BLOCK||world.getBlockState(new BlockPos(x+i,y+j,z+k)).getBlock()==Blocks.RED_MUSHROOM_BLOCK) { + world.setBlockState(new BlockPos(x+i,y+j,z+k), Blocks.AIR.getDefaultState()); + } + } + } } - return false; + return true; } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Dungeons/Minerbase.java b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Dungeons/Minerbase.java index 3ff4e31..a7dc27d 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Dungeons/Minerbase.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Dungeons/Minerbase.java @@ -32,7 +32,7 @@ public void generate(Random rand, int chunkX, int chunkZ, World world, IChunkGen IChunkProvider chunkProvider) { int blockX = chunkX * 16; int blockZ = chunkZ * 16; - if (world.provider.getDimension() == 0||world.provider.getDimension() != DimensionRegistry.DeepUnderground) { + if (world.provider.getDimension() != DimensionRegistry.DeepVoid && world.provider.getDimension() != -1 && world.provider.getDimension() != 1) { BlockPos pos = new BlockPos(blockX, 30, blockZ); generate(world, rand, pos); } diff --git a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Dungeons/MiniStronghold.java b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Dungeons/MiniStronghold.java index e934862..aee63f8 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Dungeons/MiniStronghold.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Dungeons/MiniStronghold.java @@ -4,6 +4,7 @@ import com.NetherNoah.ParadiseMod.Reference; import com.NetherNoah.ParadiseMod.config.ModConfig; +import com.NetherNoah.ParadiseMod.world.dimension.DimensionRegistry; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -31,7 +32,7 @@ public void generate(Random rand, int chunkX, int chunkZ, World world, IChunkGen IChunkProvider chunkProvider) { int blockX = chunkX * 16; int blockZ = chunkZ * 16; - if (world.provider.getDimension() != 1 && world.provider.getDimension() != -3 && world.provider.getDimension() != -1) { + if (world.provider.getDimension() != DimensionRegistry.DeepVoid && world.provider.getDimension() != -1 && world.provider.getDimension() != 1) { BlockPos pos = new BlockPos(blockX, 16, blockZ); generate(world, rand, pos); } diff --git a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Dungeons/VoidDungeon.java b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Dungeons/VoidDungeon.java index 61581e5..c0a3c73 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Dungeons/VoidDungeon.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Dungeons/VoidDungeon.java @@ -31,21 +31,10 @@ public void generate(Random rand, int chunkX, int chunkZ, World world, IChunkGen IChunkProvider chunkProvider) { int blockX = chunkX * 16; int blockZ = chunkZ * 16; - //generateOverworld(world, rand, blockX + 8, blockZ + 8); int y = getGroundFromAbove(world, blockX, blockZ); BlockPos pos = new BlockPos(blockX, y, blockZ); - //WorldGenerator structure = new VoidDungeonGen(); generate(world, rand, pos); } - /*/ - private void generateOverworld(World world, Random rand, int blockX, int blockZ) - { - int y = getGroundFromAbove(world, blockX, blockZ); - BlockPos pos = new BlockPos(blockX, y, blockZ); - WorldGenerator structure = new VoidDungeonGen(); - structure.generate(world, rand, pos); - } - /*/ @Override public boolean generate(World world, Random rand, BlockPos position) { Biome biome = world.getBiomeForCoordsBody(position); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Dungeons/VoidDungeonLarge.java b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Dungeons/VoidDungeonLarge.java index 2a18793..00c6028 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Dungeons/VoidDungeonLarge.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Dungeons/VoidDungeonLarge.java @@ -3,11 +3,15 @@ import java.util.Random; import com.NetherNoah.ParadiseMod.Reference; +import com.NetherNoah.ParadiseMod.Utils; import com.NetherNoah.ParadiseMod.config.ModConfig; import com.NetherNoah.ParadiseMod.init.ModBlocks.Misc; +import com.NetherNoah.ParadiseMod.world.dimension.DimensionRegistry; +import java.util.Collections; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; import net.minecraft.server.MinecraftServer; import net.minecraft.util.Mirror; import net.minecraft.util.ResourceLocation; @@ -16,7 +20,6 @@ import net.minecraft.util.math.ChunkPos; import net.minecraft.world.World; import net.minecraft.world.WorldServer; -import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.IChunkGenerator; import net.minecraft.world.gen.feature.WorldGenerator; @@ -31,23 +34,12 @@ public void generate(Random rand, int chunkX, int chunkZ, World world, IChunkGen IChunkProvider chunkProvider) { int blockX = chunkX * 16; int blockZ = chunkZ * 16; - if (world.provider.getDimension() == -3) { - //generateOverworld(world, rand, blockX + 8, blockZ + 8); - int y = getGroundFromAbove(world, blockX, blockZ); + if (world.provider.getDimension() == DimensionRegistry.DeepVoid && rand.nextInt(ModConfig.worldgen.structures.VoidDungeonLargeChance) == 0) { + int y = getHighestBlock(world, blockX, blockZ); BlockPos pos = new BlockPos(blockX, y, blockZ); - //WorldGenerator structure = new VoidDungeonLargeGen(); generate(world, rand, pos); } } - /*/ - private void generateOverworld(World world, Random rand, int blockX, int blockZ) - { - int y = getGroundFromAbove(world, blockX, blockZ); - BlockPos pos = new BlockPos(blockX, y, blockZ); - WorldGenerator structure = new VoidDungeonLargeGen(); - structure.generate(world, rand, pos); - } - /*/ @Override public boolean generate(World world, Random rand, BlockPos position) { @@ -62,46 +54,56 @@ public boolean generate(World world, Random rand, BlockPos position) { return false; if(part1 == null) return false; - Biome biome = world.getBiomeForCoordsBody(position); - if(canSpawnHere(part1, worldserver, position)) { - if(rand.nextInt(ModConfig.worldgen.structures.VoidDungeonLargeChance) == 0){ - IBlockState iblockstate = world.getBlockState(position); - world.notifyBlockUpdate(position, iblockstate, iblockstate, 3); - PlacementSettings placementsettings = (new PlacementSettings()).setMirror(Mirror.NONE) - .setRotation(Rotation.NONE).setIgnoreEntities(false).setChunk((ChunkPos) null) - .setReplacedBlock((Block) null).setIgnoreStructureBlock(false); - part1.getDataBlocks(position, placementsettings); - part1.addBlocksToWorld(world, position.add(0, -11, 0), placementsettings); - part2.getDataBlocks(position, placementsettings); - part2.addBlocksToWorld(world, position.add(0, -11, 32), placementsettings); - part3.getDataBlocks(position, placementsettings); - part3.addBlocksToWorld(world, position.add(32, -11, 0), placementsettings); - part4.getDataBlocks(position, placementsettings); - part4.addBlocksToWorld(world, position.add(32, -11, 32), placementsettings); - return true; - } + if(isAreaValid(worldserver, position)) { + IBlockState iblockstate = world.getBlockState(position); + world.notifyBlockUpdate(position, iblockstate, iblockstate, 3); + PlacementSettings placementsettings = (new PlacementSettings()).setMirror(Mirror.NONE) + .setRotation(Rotation.NONE).setIgnoreEntities(false).setChunk((ChunkPos) null) + .setReplacedBlock((Block) null).setIgnoreStructureBlock(false); + part1.getDataBlocks(position, placementsettings); + part1.addBlocksToWorld(world, position.add(0, -10, 0), placementsettings); + part2.getDataBlocks(position, placementsettings); + part2.addBlocksToWorld(world, position.add(0, -10, 32), placementsettings); + part3.getDataBlocks(position, placementsettings); + part3.addBlocksToWorld(world, position.add(32, -10, 0), placementsettings); + part4.getDataBlocks(position, placementsettings); + part4.addBlocksToWorld(world, position.add(32, -10, 32), placementsettings); + return true; } return false; } - - public static boolean canSpawnHere(Template template, World world, BlockPos posAboveGround) - { - int zwidth = template.getSize().getZ(); - int xwidth = template.getSize().getX(); - boolean corner1 = isCornerValid(world, posAboveGround); - boolean corner2 = isCornerValid(world, posAboveGround.add(xwidth, 0, zwidth)); - return posAboveGround.getY() > 31 && corner1 && corner2; + //get the highest block in the area + public static int getHighestBlock(World world, int blockX,int blockZ) { + int[] heights = new int[264]; + int index = 0; + for (int i=0;i<=65;i++) { + heights[index]=getGroundFromAbove(world, blockX, blockZ); + index++; + heights[index]=getGroundFromAbove(world, blockX+i+1, blockZ); + index++; + heights[index]=getGroundFromAbove(world, blockX+i+1, blockZ+i+1); + index++; + heights[index]=getGroundFromAbove(world, blockX+i+1, blockZ+i+1); + index++; + } + + return Utils.getMaxValue(heights); } - public static boolean isCornerValid(World world, BlockPos pos) + //check to see if the area is valid for spawning the structure + public static boolean isAreaValid(World world, BlockPos postion) { - int variation = 3; - int highestBlock = getGroundFromAbove(world, pos.getX(), pos.getZ()); - if (highestBlock > pos.getY() - variation && highestBlock < pos.getY() + variation) - return true; - return false; + int x = postion.getX(); + int y = postion.getY(); + int z = postion.getZ(); + return postion.getY() > 31 + && world.getBlockState(new BlockPos(x,y-11,z)).getBlock()==Misc.VoidStone + && world.getBlockState(new BlockPos(x+64,y-11,z)).getBlock()==Misc.VoidStone + && world.getBlockState(new BlockPos(x,y-11,z+64)).getBlock()==Misc.VoidStone + && world.getBlockState(new BlockPos(x+64,y-11,z+64)).getBlock()==Misc.VoidStone; + } - + public static int getGroundFromAbove(World world, int x, int z) { int y = 120; @@ -110,7 +112,7 @@ public static int getGroundFromAbove(World world, int x, int z) { Block blockAt = world.getBlockState(new BlockPos(x,y,z)).getBlock(); Block blockAbove = world.getBlockState(new BlockPos(x,y+1,z)).getBlock(); - foundGround = blockAt == Misc.VoidStone; + foundGround = (blockAt == Misc.VoidStone && blockAbove == Blocks.AIR); } return y; } diff --git a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Dungeons/VoidTower.java b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Dungeons/VoidTower.java index 2da3634..3c53fa3 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Dungeons/VoidTower.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Dungeons/VoidTower.java @@ -71,13 +71,22 @@ public boolean generate(World world, Random rand, BlockPos position) { .setReplacedBlock((Block) null).setIgnoreStructureBlock(false); bottom.getDataBlocks(position, placementsettings); bottom.addBlocksToWorld(world, position.add(0, 0, 0), placementsettings); - for (int i=1;i1) { + for (int i=1;i0) { + world.setBlockState(new BlockPos(x,y,z), Utils.getRandomBrick()); + blockToReplace = world.getBlockState(new BlockPos(x,y-1,z)).getBlock(); + y--; + } + y=position.getY(); + + //(7,0) + blockToReplace = world.getBlockState(new BlockPos(x+6,y-1,z)).getBlock(); + while ((blockToReplace==Blocks.WATER + ||blockToReplace==Blocks.COBBLESTONE + ||blockToReplace==Blocks.FLOWING_WATER + ||blockToReplace instanceof BlockAir + ||blockToReplace instanceof BlockBush + ||blockToReplace instanceof BlockSnow + ||blockToReplace instanceof BlockFluidClassic + ||blockToReplace instanceof BlockLeaves) + &&y>0) { + world.setBlockState(new BlockPos(x+6,y,z), Utils.getRandomBrick()); + blockToReplace = world.getBlockState(new BlockPos(x+6,y-1,z)).getBlock(); + y--; + } + y=position.getY(); + + //(0,17) + blockToReplace = world.getBlockState(new BlockPos(x,y-1,z+16)).getBlock(); + while ((blockToReplace==Blocks.WATER + ||blockToReplace==Blocks.COBBLESTONE + ||blockToReplace==Blocks.FLOWING_WATER + ||blockToReplace instanceof BlockAir + ||blockToReplace instanceof BlockBush + ||blockToReplace instanceof BlockSnow + ||blockToReplace instanceof BlockFluidClassic + ||blockToReplace instanceof BlockLeaves) + &&y>0) { + world.setBlockState(new BlockPos(x,y,z+16), Utils.getRandomBrick()); + blockToReplace = world.getBlockState(new BlockPos(x,y-1,z+16)).getBlock(); + y--; + } + y=position.getY(); + + //(7,17) + blockToReplace = world.getBlockState(new BlockPos(x+6,y-1,z+16)).getBlock(); + while ((blockToReplace==Blocks.WATER + ||blockToReplace==Blocks.COBBLESTONE + ||blockToReplace==Blocks.FLOWING_WATER + ||blockToReplace instanceof BlockAir + ||blockToReplace instanceof BlockBush + ||blockToReplace instanceof BlockSnow + ||blockToReplace instanceof BlockFluidClassic + ||blockToReplace instanceof BlockLeaves) + &&y>0) { + world.setBlockState(new BlockPos(x+6,y,z+16), Utils.getRandomBrick()); + blockToReplace = world.getBlockState(new BlockPos(x+6,y-1,z+16)).getBlock(); + y--; + } return true; } return false; @@ -79,7 +164,6 @@ public boolean generate(World world, Random rand, BlockPos position, Boolean isU @Override public boolean generate(World worldIn, Random rand, BlockPos position) { - // TODO Auto-generated method stub return false; } diff --git a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Home.java b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Home.java index fd7012e..8308826 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Home.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Home.java @@ -4,8 +4,16 @@ import com.NetherNoah.ParadiseMod.Reference; import com.NetherNoah.ParadiseMod.config.ModConfig; +import com.NetherNoah.ParadiseMod.init.ModBlocks.Misc; import net.minecraft.block.Block; +import net.minecraft.block.BlockAir; +import net.minecraft.block.BlockBush; +import net.minecraft.block.BlockLeaves; +import net.minecraft.block.BlockNewLog; +import net.minecraft.block.BlockOldLog; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockSnow; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Biomes; import net.minecraft.init.Blocks; @@ -24,6 +32,7 @@ import net.minecraft.world.gen.structure.template.PlacementSettings; import net.minecraft.world.gen.structure.template.Template; import net.minecraft.world.gen.structure.template.TemplateManager; +import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fml.common.IWorldGenerator; public class Home extends WorldGenerator implements IWorldGenerator{ @@ -33,11 +42,6 @@ public void generate(Random rand, int chunkX, int chunkZ, World world, IChunkGen IChunkProvider chunkProvider) { int blockX = chunkX * 16; int blockZ = chunkZ * 16; - generateOverworld(world, rand, blockX + 8, blockZ + 8); - } - - private void generateOverworld(World world, Random rand, int blockX, int blockZ) - { int y = getGroundFromAbove(world, blockX, blockZ); BlockPos pos = new BlockPos(blockX, y, blockZ); generate(world, rand, pos); @@ -45,33 +49,20 @@ private void generateOverworld(World world, Random rand, int blockX, int blockZ) public static int getGroundFromAbove(World world, int x, int z) { - int y = 75; + int y = 255; boolean foundGround = false; while(!foundGround && y-- >= 31) { Block blockAt = world.getBlockState(new BlockPos(x,y,z)).getBlock(); Block blockAbove = world.getBlockState(new BlockPos(x,y+1,z)).getBlock(); - foundGround = (blockAt == Blocks.GRASS|| blockAt == Blocks.DIRT || blockAt == Blocks.SAND || blockAt == Blocks.SNOW ||blockAt == Blocks.MYCELIUM||blockAt==Blocks.STONE)&&blockAbove==Blocks.AIR; + foundGround = (blockAt == Blocks.GRASS|| blockAt == Blocks.DIRT || blockAt == Blocks.SAND || blockAt == Blocks.SNOW ||blockAt == Blocks.MYCELIUM||blockAt==Blocks.STONE||blockAt==Blocks.WATER)&&(blockAbove==Blocks.AIR||blockAbove==Blocks.SNOW_LAYER); } return y; } public static boolean canSpawnHere(Template template, World world, BlockPos posAboveGround) { - int zwidth = template.getSize().getZ(); - int xwidth = template.getSize().getX(); - boolean corner1 = isCornerValid(world, posAboveGround); - boolean corner2 = isCornerValid(world, posAboveGround.add(xwidth, 0, zwidth)); - return posAboveGround.getY() > 31 && corner1 && corner2; - } - - public static boolean isCornerValid(World world, BlockPos pos) - { - int variation = 3; - int highestBlock = getGroundFromAbove(world, pos.getX(), pos.getZ()); - if (highestBlock > pos.getY() - variation && highestBlock < pos.getY() + variation) - return true; - return false; + return posAboveGround.getY() > 31; } @Override @@ -82,25 +73,43 @@ public boolean generate(World world, Random rand, BlockPos position) { MinecraftServer minecraftserver = world.getMinecraftServer(); TemplateManager templatemanager = worldserver.getStructureTemplateManager(); Template template = templatemanager.getTemplate(minecraftserver, new ResourceLocation(Reference.MOD_ID+":homes/starter_house")); + IBlockState supportType = Blocks.LOG.getDefaultState().withProperty(BlockOldLog.VARIANT, BlockPlanks.EnumType.OAK); //savanna home - if(biome == Biomes.SAVANNA||biome == Biomes.SAVANNA_PLATEAU||biome == Biomes.MUTATED_SAVANNA||biome == Biomes.MUTATED_SAVANNA_ROCK) + if(biome == Biomes.SAVANNA||biome == Biomes.SAVANNA_PLATEAU||biome == Biomes.MUTATED_SAVANNA||biome == Biomes.MUTATED_SAVANNA_ROCK) { + supportType = Blocks.LOG2.getDefaultState().withProperty(BlockNewLog.VARIANT, BlockPlanks.EnumType.ACACIA); template = templatemanager.getTemplate(minecraftserver, new ResourceLocation(Reference.MOD_ID+":homes/starter_house_acacia")); + } + //birch forest home - if(biome == Biomes.BIRCH_FOREST_HILLS|| biome == Biomes.BIRCH_FOREST_HILLS) + if(biome == Biomes.BIRCH_FOREST_HILLS|| biome == Biomes.BIRCH_FOREST_HILLS) { + supportType = Blocks.LOG.getDefaultState().withProperty(BlockOldLog.VARIANT, BlockPlanks.EnumType.BIRCH); template = templatemanager.getTemplate(minecraftserver, new ResourceLocation(Reference.MOD_ID+":homes/starter_house_birch")); + } + //roofed forest home - if(biome == Biomes.ROOFED_FOREST) + if(biome == Biomes.ROOFED_FOREST) { template = templatemanager.getTemplate(minecraftserver, new ResourceLocation(Reference.MOD_ID+":homes/starter_house_dark_oak")); + supportType = Blocks.LOG2.getDefaultState().withProperty(BlockNewLog.VARIANT, BlockPlanks.EnumType.DARK_OAK); + } + //desert home - if(biome == Biomes.DESERT||biome == Biomes.DESERT_HILLS||biome == Biomes.MUTATED_DESERT) + if(biome == Biomes.DESERT||biome == Biomes.DESERT_HILLS||biome == Biomes.MUTATED_DESERT) { template = templatemanager.getTemplate(minecraftserver, new ResourceLocation(Reference.MOD_ID+":homes/starter_house_desert")); + supportType = Misc.CompressedCactus.getDefaultState(); + } + //jungle home - if(biome == Biomes.JUNGLE||biome == Biomes.JUNGLE_EDGE||biome == Biomes.JUNGLE_HILLS||biome == Biomes.MUTATED_JUNGLE||biome == Biomes.MUTATED_JUNGLE_EDGE) + if(biome == Biomes.JUNGLE||biome == Biomes.JUNGLE_EDGE||biome == Biomes.JUNGLE_HILLS||biome == Biomes.MUTATED_JUNGLE||biome == Biomes.MUTATED_JUNGLE_EDGE) { template = templatemanager.getTemplate(minecraftserver, new ResourceLocation(Reference.MOD_ID+":homes/starter_house_jungle")); + supportType = Blocks.LOG.getDefaultState().withProperty(BlockOldLog.VARIANT, BlockPlanks.EnumType.JUNGLE); + } + //spruce home - if(biome == Biomes.TAIGA||biome == Biomes.TAIGA_HILLS||biome == Biomes.COLD_TAIGA||biome == Biomes.COLD_TAIGA_HILLS||biome == Biomes.MUTATED_REDWOOD_TAIGA||biome == Biomes.MUTATED_REDWOOD_TAIGA_HILLS||biome == Biomes.MUTATED_TAIGA||biome == Biomes.MUTATED_TAIGA_COLD||biome == Biomes.REDWOOD_TAIGA||biome == Biomes.REDWOOD_TAIGA_HILLS||biome==Biomes.EXTREME_HILLS_WITH_TREES||biome==Biomes.MUTATED_EXTREME_HILLS_WITH_TREES) + if(biome == Biomes.TAIGA||biome == Biomes.TAIGA_HILLS||biome == Biomes.COLD_TAIGA||biome == Biomes.COLD_TAIGA_HILLS||biome == Biomes.MUTATED_REDWOOD_TAIGA||biome == Biomes.MUTATED_REDWOOD_TAIGA_HILLS||biome == Biomes.MUTATED_TAIGA||biome == Biomes.MUTATED_TAIGA_COLD||biome == Biomes.REDWOOD_TAIGA||biome == Biomes.REDWOOD_TAIGA_HILLS||biome==Biomes.EXTREME_HILLS_WITH_TREES||biome==Biomes.MUTATED_EXTREME_HILLS_WITH_TREES) { template = templatemanager.getTemplate(minecraftserver, new ResourceLocation(Reference.MOD_ID+":homes/starter_house_spruce")); + supportType = Blocks.LOG.getDefaultState().withProperty(BlockOldLog.VARIANT, BlockPlanks.EnumType.SPRUCE); + } if(ModConfig.worldgen.structures.Homes==false) return false; @@ -112,7 +121,83 @@ public boolean generate(World world, Random rand, BlockPos position) { .setRotation(Rotation.NONE).setIgnoreEntities(false).setChunk((ChunkPos) null) .setReplacedBlock((Block) null).setIgnoreStructureBlock(false); template.getDataBlocks(position, placementsettings); - template.addBlocksToWorld(world, position.add(0, 0, 0), placementsettings); + template.addBlocksToWorld(world, position.add(0, 0, 0), placementsettings); + + //generate supports if needed + int x=position.getX(); + int y=position.getY(); + int z=position.getZ(); + Block blockToReplace = world.getBlockState(new BlockPos(x,y-2,z+1)).getBlock(); + world.setBlockState(new BlockPos(x,y-1,z+1), supportType); + world.setBlockState(new BlockPos(x+5,y-1,z+1), supportType); + world.setBlockState(new BlockPos(x,y-1,z+7), supportType); + world.setBlockState(new BlockPos(x+5,y-1,z+7), supportType); + + //(0,0) + while ((blockToReplace==Blocks.WATER + ||blockToReplace==Blocks.COBBLESTONE + ||blockToReplace==Blocks.FLOWING_WATER + ||blockToReplace instanceof BlockAir + ||blockToReplace instanceof BlockBush + ||blockToReplace instanceof BlockSnow + ||blockToReplace instanceof BlockFluidClassic + ||blockToReplace instanceof BlockLeaves) + &&y>0) { + world.setBlockState(new BlockPos(x,y-1,z+1), supportType); + blockToReplace = world.getBlockState(new BlockPos(x,y-2,z)).getBlock(); + y--; + } + y=position.getY(); + + //(6,0) + blockToReplace = world.getBlockState(new BlockPos(x+5,y-2,z+1)).getBlock(); + while ((blockToReplace==Blocks.WATER + ||blockToReplace==Blocks.COBBLESTONE + ||blockToReplace==Blocks.FLOWING_WATER + ||blockToReplace instanceof BlockAir + ||blockToReplace instanceof BlockBush + ||blockToReplace instanceof BlockSnow + ||blockToReplace instanceof BlockFluidClassic + ||blockToReplace instanceof BlockLeaves) + &&y>0) { + world.setBlockState(new BlockPos(x+5,y-1,z+1), supportType); + blockToReplace = world.getBlockState(new BlockPos(x+5,y-2,z+1)).getBlock(); + y--; + } + y=position.getY(); + + //(0,7) + blockToReplace = world.getBlockState(new BlockPos(x,y-2,z+7)).getBlock(); + while ((blockToReplace==Blocks.WATER + ||blockToReplace==Blocks.COBBLESTONE + ||blockToReplace==Blocks.FLOWING_WATER + ||blockToReplace instanceof BlockAir + ||blockToReplace instanceof BlockBush + ||blockToReplace instanceof BlockSnow + ||blockToReplace instanceof BlockFluidClassic + ||blockToReplace instanceof BlockLeaves) + &&y>0) { + world.setBlockState(new BlockPos(x,y-1,z+7), supportType); + blockToReplace = world.getBlockState(new BlockPos(x,y-2,z+7)).getBlock(); + y--; + } + y=position.getY(); + + //(6,7) + blockToReplace = world.getBlockState(new BlockPos(x+5,y-2,z+7)).getBlock(); + while ((blockToReplace==Blocks.WATER + ||blockToReplace==Blocks.COBBLESTONE + ||blockToReplace==Blocks.FLOWING_WATER + ||blockToReplace instanceof BlockAir + ||blockToReplace instanceof BlockBush + ||blockToReplace instanceof BlockSnow + ||blockToReplace instanceof BlockFluidClassic + ||blockToReplace instanceof BlockLeaves) + &&y>0) { + world.setBlockState(new BlockPos(x+5,y-1,z+7), supportType); + blockToReplace = world.getBlockState(new BlockPos(x+5,y-2,z+7)).getBlock(); + y--; + } return true; } } diff --git a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Ocean.java b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Ocean.java index 208dd8b..148901a 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Ocean.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Ocean.java @@ -3,6 +3,7 @@ import java.util.Random; import com.NetherNoah.ParadiseMod.Reference; +import com.NetherNoah.ParadiseMod.Utils; import com.NetherNoah.ParadiseMod.config.ModConfig; import net.minecraft.block.Block; @@ -33,9 +34,12 @@ public void generate(Random rand, int chunkX, int chunkZ, World world, IChunkGen int blockX = chunkX * 16; int blockZ = chunkZ * 16; if (world.provider.getDimension() == 0) { + int structureType=rand.nextInt(2); int y = getGroundFromAbove(world, blockX, blockZ); + if (structureType==0) + y=getLowestBlock(world, blockX, blockZ); BlockPos pos = new BlockPos(blockX, y, blockZ); - generate(world, rand, pos); + generate(world, rand, pos,structureType); } } @@ -43,23 +47,40 @@ public static int getGroundFromAbove(World world, int x, int z) { int y = 255; boolean foundGround = false; - while(!foundGround && y-- >= 31) + while(!foundGround && y-- >= 20) { Block blockAt = world.getBlockState(new BlockPos(x,y,z)).getBlock(); - foundGround = blockAt == Blocks.GRAVEL; + foundGround = blockAt == Blocks.GRAVEL||blockAt == Blocks.DIRT||blockAt == Blocks.CLAY; } return y; } - @Override - public boolean generate(World world, Random rand, BlockPos position) { + //get the lowest block in the area + public static int getLowestBlock(World world, int blockX,int blockZ) { + int[] heights = new int[136]; + int index = 0; + for (int i=0;i<=33;i++) { + heights[index]=getGroundFromAbove(world, blockX, blockZ); + index++; + heights[index]=getGroundFromAbove(world, blockX+i+1, blockZ); + index++; + heights[index]=getGroundFromAbove(world, blockX+i+1, blockZ+i+1); + index++; + heights[index]=getGroundFromAbove(world, blockX+i+1, blockZ+i+1); + index++; + } + + return Utils.getMinValue(heights); + } + + public boolean generate(World world, Random rand, BlockPos position, int structureType) { WorldServer worldserver = (WorldServer) world; MinecraftServer minecraftserver = world.getMinecraftServer(); TemplateManager templatemanager = worldserver.getStructureTemplateManager(); Template template = null; int rarity=ModConfig.worldgen.structures.ShipwreckChance; - switch(rand.nextInt(2)) { + switch(structureType) { case 0: if (ModConfig.worldgen.structures.OceanVillage==true) { rarity=ModConfig.worldgen.structures.OceanVillageChance; @@ -99,4 +120,9 @@ public static boolean canSpawnHere(Template template, World world, BlockPos posA int xwidth = template.getSize().getX(); return posAboveGround.getY() > 31; } + + @Override + public boolean generate(World worldIn, Random rand, BlockPos position) { + return false; + } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Runway.java b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Runway.java index 5413f54..3d1d1e2 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Runway.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/Runway.java @@ -3,9 +3,15 @@ import java.util.Random; import com.NetherNoah.ParadiseMod.Reference; +import com.NetherNoah.ParadiseMod.Utils; import com.NetherNoah.ParadiseMod.config.ModConfig; +import com.NetherNoah.ParadiseMod.init.ModBlocks.Misc; import net.minecraft.block.Block; +import net.minecraft.block.BlockAir; +import net.minecraft.block.BlockBush; +import net.minecraft.block.BlockLeaves; +import net.minecraft.block.BlockSnow; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.server.MinecraftServer; @@ -23,6 +29,7 @@ import net.minecraft.world.gen.structure.template.PlacementSettings; import net.minecraft.world.gen.structure.template.Template; import net.minecraft.world.gen.structure.template.TemplateManager; +import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fml.common.IWorldGenerator; public class Runway extends WorldGenerator implements IWorldGenerator{ @@ -31,8 +38,8 @@ public void generate(Random rand, int chunkX, int chunkZ, World world, IChunkGen IChunkProvider chunkProvider) { int blockX = chunkX * 16; int blockZ = chunkZ * 16; - if (world.provider.getDimension() == 0){ - int y = getGroundFromAbove(world, blockX, blockZ); + if (world.provider.getDimension() == 0 && rand.nextInt(ModConfig.worldgen.structures.RunwayChance) == 0){ + int y = getHighestBlock(world, blockX, blockZ); BlockPos pos = new BlockPos(blockX, y, blockZ); generate(world, rand, pos); } @@ -45,10 +52,23 @@ public static int getGroundFromAbove(World world, int x, int z) while(!foundGround && y-- >= 31) { Block blockAt = world.getBlockState(new BlockPos(x,y,z)).getBlock(); - foundGround = blockAt == Blocks.GRASS|| blockAt == Blocks.DIRT || blockAt == Blocks.SAND || blockAt == Blocks.SNOW ||blockAt == Blocks.MYCELIUM||blockAt==Blocks.STONE||blockAt==Blocks.WATER; + foundGround = blockAt == Blocks.GRASS||blockAt == Blocks.SAND||blockAt == Blocks.SNOW||blockAt == Blocks.MYCELIUM||blockAt==Blocks.WATER; } return y; } + + public static Block getGroundBlock(World world, int x, int z) + { + int y = 255; + boolean foundGround = false; + Block blockAt = world.getBlockState(new BlockPos(x,y,z)).getBlock(); + while(!foundGround && y-- >= 31) + { + blockAt = world.getBlockState(new BlockPos(x,y,z)).getBlock(); + foundGround = blockAt == Blocks.GRASS||blockAt == Blocks.SAND||blockAt == Blocks.SNOW||blockAt == Blocks.MYCELIUM||blockAt==Blocks.WATER; + } + return blockAt; + } @Override public boolean generate(World world, Random rand, BlockPos position) { @@ -58,26 +78,167 @@ public boolean generate(World world, Random rand, BlockPos position) { Template template = templatemanager.getTemplate(minecraftserver, new ResourceLocation(Reference.MOD_ID+":runway")); if(template == null||ModConfig.worldgen.structures.Runway==false) return false; - Biome biome = world.getBiomeForCoordsBody(position); - if(canSpawnHere(template, worldserver, position)) { - if(rand.nextInt(ModConfig.worldgen.structures.RunwayChance) == 0){ - IBlockState iblockstate = world.getBlockState(position); - world.notifyBlockUpdate(position, iblockstate, iblockstate, 3); - PlacementSettings placementsettings = (new PlacementSettings()).setMirror(Mirror.NONE) - .setRotation(Rotation.NONE).setIgnoreEntities(false).setChunk((ChunkPos) null) - .setReplacedBlock((Block) null).setIgnoreStructureBlock(false); - template.getDataBlocks(position, placementsettings); - template.addBlocksToWorld(world, position.add(0, -4, 0), placementsettings); - return true; + + if(isAreaValid(world, position)) { + IBlockState iblockstate = world.getBlockState(position); + world.notifyBlockUpdate(position, iblockstate, iblockstate, 3); + PlacementSettings placementsettings = (new PlacementSettings()).setMirror(Mirror.NONE) + .setRotation(Rotation.NONE).setIgnoreEntities(false).setChunk((ChunkPos) null) + .setReplacedBlock((Block) null).setIgnoreStructureBlock(false); + template.getDataBlocks(position, placementsettings); + template.addBlocksToWorld(world, position.add(0, -4, 0), placementsettings); + + //generate supports if needed + int x=position.getX(); + int y=position.getY(); + int z=position.getZ(); + Block blockToReplace = world.getBlockState(new BlockPos(x,y-1,z+31)).getBlock(); + + //(0,32) + world.setBlockState(new BlockPos(x,y,z+31), Blocks.COBBLESTONE.getDefaultState()); + while ((blockToReplace==Blocks.WATER + ||blockToReplace==Blocks.COBBLESTONE + ||blockToReplace==Blocks.FLOWING_WATER + ||blockToReplace instanceof BlockAir + ||blockToReplace instanceof BlockBush + ||blockToReplace instanceof BlockSnow + ||blockToReplace instanceof BlockFluidClassic + ||blockToReplace instanceof BlockLeaves) + &&y>0) { + world.setBlockState(new BlockPos(x,y,z+31), Blocks.COBBLESTONE.getDefaultState()); + blockToReplace = world.getBlockState(new BlockPos(x,y-1,z+31)).getBlock(); + y--; + } + y=position.getY(); + + //(0,27) + blockToReplace = world.getBlockState(new BlockPos(x,y-1,z+26)).getBlock(); + world.setBlockState(new BlockPos(x,y,z+26), Blocks.COBBLESTONE.getDefaultState()); + while ((blockToReplace==Blocks.WATER + ||blockToReplace==Blocks.COBBLESTONE + ||blockToReplace==Blocks.FLOWING_WATER + ||blockToReplace instanceof BlockAir + ||blockToReplace instanceof BlockBush + ||blockToReplace instanceof BlockSnow + ||blockToReplace instanceof BlockFluidClassic + ||blockToReplace instanceof BlockLeaves) + &&y>0) { + world.setBlockState(new BlockPos(x,y,z+26), Blocks.COBBLESTONE.getDefaultState()); + blockToReplace = world.getBlockState(new BlockPos(x,y-1,z+26)).getBlock(); + y--; + } + y=position.getY(); + + //(14,0) + blockToReplace = world.getBlockState(new BlockPos(x+13,y-1,z)).getBlock(); + world.setBlockState(new BlockPos(x+13,y,z), Blocks.COBBLESTONE.getDefaultState()); + while ((blockToReplace==Blocks.WATER + ||blockToReplace==Blocks.COBBLESTONE + ||blockToReplace==Blocks.FLOWING_WATER + ||blockToReplace instanceof BlockAir + ||blockToReplace instanceof BlockBush + ||blockToReplace instanceof BlockSnow + ||blockToReplace instanceof BlockFluidClassic + ||blockToReplace instanceof BlockLeaves) + &&y>0) { + world.setBlockState(new BlockPos(x+13,y,z), Blocks.COBBLESTONE.getDefaultState()); + blockToReplace = world.getBlockState(new BlockPos(x+13,y-1,z)).getBlock(); + y--; + } + y=position.getY(); + + //(6,0) + blockToReplace = world.getBlockState(new BlockPos(x+5,y-1,z)).getBlock(); + world.setBlockState(new BlockPos(x+5,y,z), Blocks.COBBLESTONE.getDefaultState()); + while ((blockToReplace==Blocks.WATER + ||blockToReplace==Blocks.COBBLESTONE + ||blockToReplace==Blocks.FLOWING_WATER + ||blockToReplace instanceof BlockAir + ||blockToReplace instanceof BlockBush + ||blockToReplace instanceof BlockSnow + ||blockToReplace instanceof BlockFluidClassic + ||blockToReplace instanceof BlockLeaves) + &&y>0) { + world.setBlockState(new BlockPos(x+5,y,z), Blocks.COBBLESTONE.getDefaultState()); + blockToReplace = world.getBlockState(new BlockPos(x+5,y-1,z)).getBlock(); + y--; + } + y=position.getY(); + + //(14,32) + blockToReplace = world.getBlockState(new BlockPos(x+13,y-1,z+31)).getBlock(); + world.setBlockState(new BlockPos(x+13,y,z+31), Blocks.COBBLESTONE.getDefaultState()); + while ((blockToReplace==Blocks.WATER + ||blockToReplace==Blocks.COBBLESTONE + ||blockToReplace==Blocks.FLOWING_WATER + ||blockToReplace instanceof BlockAir + ||blockToReplace instanceof BlockBush + ||blockToReplace instanceof BlockSnow + ||blockToReplace instanceof BlockFluidClassic + ||blockToReplace instanceof BlockLeaves) + &&y>0) { + world.setBlockState(new BlockPos(x+13,y,z+31), Blocks.COBBLESTONE.getDefaultState()); + blockToReplace = world.getBlockState(new BlockPos(x+13,y-1,z+31)).getBlock(); + y--; } + return true; + } return false; } - public static boolean canSpawnHere(Template template, World world, BlockPos posAboveGround) + //check to see if the area is valid for spawning the structure + public static boolean isAreaValid(World world, BlockPos postion) { - int zwidth = template.getSize().getZ(); - int xwidth = template.getSize().getX(); - return posAboveGround.getY() > 10; + int x = postion.getX(); + int y = postion.getY(); + int z = postion.getZ(); + return postion.getY() > 31 + && ((getGroundBlock(world, x,z)==Blocks.GRASS + && getGroundBlock(world,x+14,z)==Blocks.GRASS + && getGroundBlock(world,x,z+32)==Blocks.GRASS + && getGroundBlock(world,x+14,z+32)==Blocks.GRASS) + + || (getGroundBlock(world,x,z)==Blocks.SAND + && getGroundBlock(world,x+14,z)==Blocks.SAND + && getGroundBlock(world,x,z+32)==Blocks.GRASS + && getGroundBlock(world,x+14,z+32)==Blocks.GRASS) + + || (getGroundBlock(world,x,z)==Blocks.SNOW + && getGroundBlock(world,x+14,z)==Blocks.SNOW + && getGroundBlock(world,x,z+32)==Blocks.SNOW + && getGroundBlock(world,x+14,z+32)==Blocks.SNOW) + + || (getGroundBlock(world,x,z)==Blocks.MYCELIUM + && getGroundBlock(world,x+14,z)==Blocks.MYCELIUM + && getGroundBlock(world,x,z+32)==Blocks.MYCELIUM + && getGroundBlock(world,x+14,z+32)==Blocks.MYCELIUM) + + || (getGroundBlock(world,x,z)==Blocks.WATER + && getGroundBlock(world,x+14,z)==Blocks.WATER + && getGroundBlock(world,x,z+32)==Blocks.WATER + && getGroundBlock(world,x+14,z+32)==Blocks.WATER)); + + } + + //get the highest block in the area + public static int getHighestBlock(World world, int blockX,int blockZ) { + int[] heights = new int[92]; + int index = 0; + for (int i=0;i<=13;i++) { + heights[index]=getGroundFromAbove(world, blockX, blockZ); + index++; + heights[index]=getGroundFromAbove(world, blockX+i+1, blockZ+32); + index++; + } + + for (int i=0;i<=31;i++) { + heights[index]=getGroundFromAbove(world, blockX, blockZ+i+1); + index++; + heights[index]=getGroundFromAbove(world, blockX+14, blockZ+i+1); + index++; + } + + return Utils.getMaxValue(heights); } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/TreasureChest.java b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/TreasureChest.java index 2e40135..5120e91 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/TreasureChest.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/TreasureChest.java @@ -33,7 +33,8 @@ public void generate(Random rand, int chunkX, int chunkZ, World world, IChunkGen int blockZ = chunkZ * 16; int y = getGroundFromAbove(world, blockX, blockZ); BlockPos pos = new BlockPos(blockX, y, blockZ); - generate(world, rand, pos); + if (y>31) + generate(world, rand, pos); } public static int getGroundFromAbove(World world, int x, int z) diff --git a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/blackCross.java b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/blackCross.java new file mode 100644 index 0000000..52cd2c2 --- /dev/null +++ b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/blackCross.java @@ -0,0 +1,167 @@ +package com.NetherNoah.ParadiseMod.world.worldgen.structures; + +import java.util.Random; + +import com.NetherNoah.ParadiseMod.Reference; +import com.NetherNoah.ParadiseMod.Utils; +import com.NetherNoah.ParadiseMod.config.ModConfig; +import com.NetherNoah.ParadiseMod.init.ModBlocks.Misc; +import com.NetherNoah.ParadiseMod.world.dimension.DimensionRegistry; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockAir; +import net.minecraft.block.BlockBush; +import net.minecraft.block.BlockLeaves; +import net.minecraft.block.BlockSnow; +import net.minecraft.block.BlockStoneBrick; +import net.minecraft.block.BlockStoneBrick.EnumType; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.Mirror; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Rotation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.ChunkPos; +import net.minecraft.world.World; +import net.minecraft.world.WorldServer; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.chunk.IChunkProvider; +import net.minecraft.world.gen.IChunkGenerator; +import net.minecraft.world.gen.feature.WorldGenerator; +import net.minecraft.world.gen.structure.template.PlacementSettings; +import net.minecraft.world.gen.structure.template.Template; +import net.minecraft.world.gen.structure.template.TemplateManager; +import net.minecraftforge.fluids.BlockFluidClassic; +import net.minecraftforge.fml.common.IWorldGenerator; + +//I'm NOT an apostolic christian, Genesis, nor do I want to be one! +//And yes, I'll continue listening to my "ungodly" death metal music! + +public class blackCross extends WorldGenerator implements IWorldGenerator{ + + @Override + public void generate(Random rand, int chunkX, int chunkZ, World world, IChunkGenerator chunkGenerator, + IChunkProvider chunkProvider) { + int blockX = chunkX * 16; + int blockZ = chunkZ * 16; + int y = getGroundFromAbove(world, blockX, blockZ); + boolean isVoid= world.provider.getDimension() == DimensionRegistry.DeepVoid; + BlockPos pos = new BlockPos(blockX, y, blockZ); + generate(world, rand, pos,isVoid); + } + + public static int getGroundFromAbove(World world, int x, int z) + { + int y = 255; + boolean foundGround = false; + while(!foundGround && y-- >= 50) + { + Block blockAt = world.getBlockState(new BlockPos(x,y,z)).getBlock(); + foundGround = blockAt == Blocks.SAND||blockAt == Blocks.GRASS||blockAt == Blocks.DIRT||blockAt == Blocks.STONE||blockAt == Blocks.WATER||blockAt==Misc.VoidStone; + } + return y; + } + + public boolean generate(World world, Random rand, BlockPos position, Boolean isVoid) { + WorldServer worldserver = (WorldServer) world; + MinecraftServer minecraftserver = world.getMinecraftServer(); + TemplateManager templatemanager = worldserver.getStructureTemplateManager(); + Template template = templatemanager.getTemplate(minecraftserver, new ResourceLocation(Reference.MOD_ID+":black_cross")); + if (isVoid==true) { + template = templatemanager.getTemplate(minecraftserver, new ResourceLocation(Reference.MOD_ID+":black_cross_void")); + } + if(ModConfig.worldgen.structures.blackCross==false) + return false; + Biome biome = world.getBiomeForCoordsBody(position); + if(rand.nextInt(777) == 0){ + IBlockState iblockstate = world.getBlockState(position); + world.notifyBlockUpdate(position, iblockstate, iblockstate, 3); + PlacementSettings placementsettings = (new PlacementSettings()).setMirror(Mirror.NONE) + .setRotation(Rotation.NONE).setIgnoreEntities(false).setChunk((ChunkPos) null) + .setReplacedBlock((Block) null).setIgnoreStructureBlock(false); + template.getDataBlocks(position, placementsettings); + template.addBlocksToWorld(world, position.add(0, 0, 0), placementsettings); + + //generate supports if needed + int x=position.getX(); + int y=position.getY(); + int z=position.getZ(); + Block blockToReplace = world.getBlockState(new BlockPos(x,y-1,z)).getBlock(); + + //(0,0) + while ((blockToReplace==Blocks.WATER + ||blockToReplace==Blocks.COBBLESTONE + ||blockToReplace==Blocks.FLOWING_WATER + ||blockToReplace instanceof BlockAir + ||blockToReplace instanceof BlockBush + ||blockToReplace instanceof BlockSnow + ||blockToReplace instanceof BlockFluidClassic + ||blockToReplace instanceof BlockLeaves) + &&y>0) { + world.setBlockState(new BlockPos(x,y,z), Utils.getRandomBrick()); + blockToReplace = world.getBlockState(new BlockPos(x,y-1,z)).getBlock(); + y--; + } + y=position.getY(); + + //(7,0) + blockToReplace = world.getBlockState(new BlockPos(x+6,y-1,z)).getBlock(); + while ((blockToReplace==Blocks.WATER + ||blockToReplace==Blocks.COBBLESTONE + ||blockToReplace==Blocks.FLOWING_WATER + ||blockToReplace instanceof BlockAir + ||blockToReplace instanceof BlockBush + ||blockToReplace instanceof BlockSnow + ||blockToReplace instanceof BlockFluidClassic + ||blockToReplace instanceof BlockLeaves) + &&y>0) { + world.setBlockState(new BlockPos(x+6,y,z), Utils.getRandomBrick()); + blockToReplace = world.getBlockState(new BlockPos(x+6,y-1,z)).getBlock(); + y--; + } + y=position.getY(); + + //(0,13) + blockToReplace = world.getBlockState(new BlockPos(x,y-1,z+12)).getBlock(); + while ((blockToReplace==Blocks.WATER + ||blockToReplace==Blocks.COBBLESTONE + ||blockToReplace==Blocks.FLOWING_WATER + ||blockToReplace instanceof BlockAir + ||blockToReplace instanceof BlockBush + ||blockToReplace instanceof BlockSnow + ||blockToReplace instanceof BlockFluidClassic + ||blockToReplace instanceof BlockLeaves) + &&y>0) { + world.setBlockState(new BlockPos(x,y,z+12), Utils.getRandomBrick()); + blockToReplace = world.getBlockState(new BlockPos(x,y-1,z+12)).getBlock(); + y--; + } + y=position.getY(); + + //(7,13) + blockToReplace = world.getBlockState(new BlockPos(x+6,y-1,z+12)).getBlock(); + while ((blockToReplace==Blocks.WATER + ||blockToReplace==Blocks.COBBLESTONE + ||blockToReplace==Blocks.FLOWING_WATER + ||blockToReplace instanceof BlockAir + ||blockToReplace instanceof BlockBush + ||blockToReplace instanceof BlockSnow + ||blockToReplace instanceof BlockFluidClassic + ||blockToReplace instanceof BlockLeaves) + &&y>0) { + world.setBlockState(new BlockPos(x+6,y,z+12), Utils.getRandomBrick()); + blockToReplace = world.getBlockState(new BlockPos(x+6,y-1,z+12)).getBlock(); + y--; + } + return true; + } + return false; + } + + @Override + public boolean generate(World worldIn, Random rand, BlockPos position) { + return false; + } + +} \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/block/acacia_door_bottom.json b/src/main/resources/assets/minecraft/models/block/acacia_door_bottom.json index 29fc3f9..72a80ac 100644 --- a/src/main/resources/assets/minecraft/models/block/acacia_door_bottom.json +++ b/src/main/resources/assets/minecraft/models/block/acacia_door_bottom.json @@ -1,141 +1,70 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "parent": "block/door_bottom", - "textures": {"bottom": "blocks/door_acacia_lower"}, + "textures": { + "bottom": "blocks/door_acacia_lower" + }, "elements": [ { - "name": "cube", "from": [0, 0, 13], "to": [3, 16, 16], "faces": { - "north": { - "uv": [13, 0, 16, 16], - "texture": "#bottom" - }, - "east": { - "uv": [16, 0, 13, 16], - "texture": "#bottom" - }, - "south": { - "uv": [15, 0, 16, 16], - "texture": "#bottom" - }, - "west": { - "uv": [13, 0, 16, 16], - "texture": "#bottom" - }, - "down": { - "uv": [0, 15, 3, 16], - "texture": "#bottom", - "rotation": 90 - } - }, - "_loading": false + "north": {"uv": [13, 0, 16, 16], "texture": "#bottom"}, + "east": {"uv": [16, 0, 13, 16], "texture": "#bottom"}, + "south": {"uv": [13, 0, 16, 16], "texture": "#bottom"}, + "west": {"uv": [13, 0, 16, 16], "texture": "#bottom"}, + "down": {"uv": [0, 15, 3, 16], "rotation": 90, "texture": "#bottom"} + } }, { - "name": "cube", "from": [0, 0, 0], "to": [3, 16, 3], "faces": { - "north": { - "uv": [0, 0, 1, 16], - "texture": "#bottom" - }, + "north": {"uv": [3, 0, 0, 16], "texture": "#bottom", "tintindex": 0}, "east": {"uv": [3, 0, 0, 16], "texture": "#bottom"}, - "south": { - "uv": [13, 0, 16, 16], - "texture": "#bottom" - }, + "south": {"uv": [13, 0, 16, 16], "texture": "#bottom"}, "west": {"uv": [0, 0, 3, 16], "texture": "#bottom"}, - "down": { - "uv": [13, 15, 16, 16], - "texture": "#bottom", - "rotation": 90 - } - }, - "_loading": false + "down": {"uv": [13, 15, 16, 16], "rotation": 90, "texture": "#bottom"} + } }, { - "name": "cube", "from": [0, 0, 3], "to": [3, 3, 13], "faces": { - "east": { - "uv": [13, 13, 3, 16], - "texture": "#bottom" - }, - "west": { - "uv": [3, 13, 13, 16], - "texture": "#bottom" - }, - "up": { - "uv": [3, 13, 13, 16], - "texture": "#bottom", - "rotation": 270 - }, - "down": { - "uv": [3, 15, 13, 16], - "texture": "#bottom", - "rotation": 90 - } + "east": {"uv": [13, 13, 3, 16], "texture": "#bottom"}, + "west": {"uv": [3, 13, 13, 16], "texture": "#bottom"}, + "up": {"uv": [3, 13, 13, 16], "rotation": 270, "texture": "#bottom"}, + "down": {"uv": [3, 15, 13, 16], "rotation": 90, "texture": "#bottom"} } }, { - "name": "cube", "from": [0, 15, 3], "to": [3, 16, 13], "faces": { "east": {"uv": [3, 0, 13, 1], "texture": "#bottom"}, "west": {"uv": [3, 0, 13, 1], "texture": "#bottom"}, - "down": { - "uv": [3, 13, 13, 16], - "texture": "#bottom", - "rotation": 90 - } + "down": {"uv": [3, 13, 13, 16], "rotation": 90, "texture": "#bottom"} } }, { - "name": "cube", "from": [0, 3, 9], "to": [3, 15, 11], "faces": { - "north": { - "uv": [13, 1, 16, 13], - "texture": "#bottom" - }, - "east": { - "uv": [9, 1, 11, 13], - "texture": "#bottom", - "rotation": 180 - }, - "south": { - "uv": [13, 1, 16, 13], - "texture": "#bottom" - }, + "north": {"uv": [13, 1, 16, 13], "texture": "#bottom"}, + "east": {"uv": [9, 1, 11, 13], "rotation": 180, "texture": "#bottom"}, + "south": {"uv": [13, 1, 16, 13], "texture": "#bottom"}, "west": {"uv": [9, 1, 11, 13], "texture": "#bottom"} } }, { - "name": "cube", "from": [0, 3, 5], "to": [3, 15, 7], "faces": { - "north": { - "uv": [13, 1, 16, 13], - "texture": "#bottom" - }, - "east": { - "uv": [9, 1, 11, 13], - "texture": "#bottom", - "rotation": 180 - }, - "south": { - "uv": [13, 1, 16, 13], - "texture": "#bottom" - }, + "north": {"uv": [13, 1, 16, 13], "texture": "#bottom"}, + "east": {"uv": [9, 1, 11, 13], "rotation": 180, "texture": "#bottom"}, + "south": {"uv": [13, 1, 16, 13], "texture": "#bottom"}, "west": {"uv": [5, 1, 7, 13], "texture": "#bottom"} } } - ], - "groups": [0, 1, 2, 3, 4, 5] + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/block/acacia_door_bottom_rh.json b/src/main/resources/assets/minecraft/models/block/acacia_door_bottom_rh.json index 1a80a3b..ee6356d 100644 --- a/src/main/resources/assets/minecraft/models/block/acacia_door_bottom_rh.json +++ b/src/main/resources/assets/minecraft/models/block/acacia_door_bottom_rh.json @@ -1,139 +1,70 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "parent": "block/door_bottom", - "textures": {"bottom": "blocks/door_acacia_lower"}, + "textures": { + "bottom": "blocks/door_acacia_lower" + }, "elements": [ { - "name": "cube", "from": [0, 0, 0], "to": [3, 16, 3], "faces": { - "north": { - "uv": [16, 0, 13, 16], - "texture": "#bottom" - }, - "east": { - "uv": [13, 0, 16, 16], - "texture": "#bottom" - }, - "south": { - "uv": [16, 0, 13, 16], - "texture": "#bottom" - }, - "west": { - "uv": [16, 0, 13, 16], - "texture": "#bottom" - }, - "down": { - "uv": [0, 16, 3, 13], - "texture": "#bottom", - "rotation": 90 - } + "north": {"uv": [13, 0, 16, 16], "texture": "#bottom"}, + "east": {"uv": [13, 0, 16, 16], "texture": "#bottom"}, + "south": {"uv": [16, 0, 13, 16], "texture": "#bottom"}, + "west": {"uv": [16, 0, 13, 16], "texture": "#bottom"}, + "down": {"uv": [0, 16, 3, 13], "rotation": 90, "texture": "#bottom"} } }, { - "name": "cube", "from": [0, 0, 13], "to": [3, 16, 16], "faces": { - "north": { - "uv": [16, 0, 13, 16], - "texture": "#bottom" - }, + "north": {"uv": [16, 0, 13, 16], "texture": "#bottom"}, "east": {"uv": [0, 0, 3, 16], "texture": "#bottom"}, - "south": { - "uv": [3, 0, 0, 16], - "texture": "#bottom" - }, + "south": {"uv": [0, 0, 3, 16], "texture": "#bottom"}, "west": {"uv": [3, 0, 0, 16], "texture": "#bottom"}, - "down": { - "uv": [13, 16, 16, 13], - "texture": "#bottom", - "rotation": 90 - } + "down": {"uv": [13, 16, 16, 13], "rotation": 90, "texture": "#bottom"} } }, { - "name": "cube", "from": [0, 0, 3], "to": [3, 3, 13], "faces": { - "east": { - "uv": [3, 13, 13, 16], - "texture": "#bottom" - }, - "west": { - "uv": [13, 13, 3, 16], - "texture": "#bottom" - }, - "up": { - "uv": [3, 16, 13, 13], - "texture": "#bottom", - "rotation": 270 - }, - "down": { - "uv": [3, 16, 13, 13], - "texture": "#bottom", - "rotation": 90 - } + "east": {"uv": [3, 13, 13, 16], "texture": "#bottom"}, + "west": {"uv": [13, 13, 3, 16], "texture": "#bottom"}, + "up": {"uv": [3, 16, 13, 13], "rotation": 270, "texture": "#bottom"}, + "down": {"uv": [3, 16, 13, 13], "rotation": 90, "texture": "#bottom"} } }, { - "name": "cube", "from": [0, 15, 3], "to": [3, 16, 13], "faces": { "east": {"uv": [13, 0, 3, 1], "texture": "#bottom"}, "west": {"uv": [13, 0, 3, 1], "texture": "#bottom"}, - "down": { - "uv": [3, 16, 13, 13], - "texture": "#bottom", - "rotation": 90 - } + "down": {"uv": [3, 16, 13, 13], "rotation": 90, "texture": "#bottom"} } }, { - "name": "cube", "from": [0, 3, 5], "to": [3, 15, 7], "faces": { - "north": { - "uv": [16, 1, 13, 13], - "texture": "#bottom" - }, - "east": { - "uv": [11, 1, 9, 13], - "texture": "#bottom", - "rotation": 180 - }, - "south": { - "uv": [16, 1, 13, 13], - "texture": "#bottom" - }, + "north": {"uv": [16, 1, 13, 13], "texture": "#bottom"}, + "east": {"uv": [11, 1, 9, 13], "rotation": 180, "texture": "#bottom"}, + "south": {"uv": [16, 1, 13, 13], "texture": "#bottom"}, "west": {"uv": [11, 1, 9, 13], "texture": "#bottom"} } }, { - "name": "cube", "from": [0, 3, 9], "to": [3, 15, 11], "faces": { - "north": { - "uv": [16, 1, 13, 13], - "texture": "#bottom" - }, - "east": { - "uv": [11, 1, 9, 13], - "texture": "#bottom", - "rotation": 180 - }, - "south": { - "uv": [16, 1, 13, 13], - "texture": "#bottom" - }, + "north": {"uv": [16, 1, 13, 13], "texture": "#bottom"}, + "east": {"uv": [11, 1, 9, 13], "rotation": 180, "texture": "#bottom"}, + "south": {"uv": [16, 1, 13, 13], "texture": "#bottom"}, "west": {"uv": [7, 1, 5, 13], "texture": "#bottom"} } } - ], - "groups": [0, 1, 2, 3, 4, 5] + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/block/acacia_door_top.json b/src/main/resources/assets/minecraft/models/block/acacia_door_top.json index f7ce261..8e8d302 100644 --- a/src/main/resources/assets/minecraft/models/block/acacia_door_top.json +++ b/src/main/resources/assets/minecraft/models/block/acacia_door_top.json @@ -1,26 +1,22 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "parent": "block/door_top", - "textures": {"top": "blocks/door_acacia_upper"}, + "textures": { + "top": "blocks/door_acacia_upper" + }, "elements": [ { - "name": "cube", "from": [0, 0, 13], "to": [3, 16, 16], "faces": { "north": {"uv": [16, 0, 13, 16], "texture": "#top"}, "east": {"uv": [16, 0, 13, 16], "texture": "#top"}, - "south": {"uv": [16, 0, 13, 16], "texture": "#top"}, + "south": {"uv": [13, 0, 16, 16], "texture": "#top"}, "west": {"uv": [13, 0, 16, 16], "texture": "#top"}, - "up": { - "uv": [16, 3, 13, 0], - "texture": "#top", - "rotation": 270 - } + "up": {"uv": [16, 3, 13, 0], "rotation": 270, "texture": "#top"} } }, { - "name": "cube", "from": [0, 0, 0], "to": [3, 16, 3], "faces": { @@ -28,48 +24,29 @@ "east": {"uv": [3, 0, 0, 16], "texture": "#top"}, "south": {"uv": [16, 0, 13, 16], "texture": "#top"}, "west": {"uv": [0, 0, 3, 16], "texture": "#top"}, - "up": { - "uv": [0, 3, 3, 0], - "texture": "#top", - "rotation": 180 - } + "up": {"uv": [0, 3, 3, 0], "rotation": 180, "texture": "#top"} } }, { - "name": "cube", "from": [0, 0, 3], "to": [3, 1, 13], "faces": { "east": {"uv": [13, 15, 3, 16], "texture": "#top"}, "west": {"uv": [3, 15, 13, 16], "texture": "#top"}, - "up": { - "uv": [3, 3, 13, 0], - "texture": "#top", - "rotation": 270 - } + "up": {"uv": [3, 3, 13, 0], "rotation": 270, "texture": "#top"} } }, { - "name": "cube", "from": [0, 13, 3], "to": [3, 16, 13], "faces": { "east": {"uv": [13, 0, 3, 3], "texture": "#top"}, "west": {"uv": [3, 0, 13, 3], "texture": "#top"}, - "up": { - "uv": [3, 3, 13, 0], - "texture": "#top", - "rotation": 270 - }, - "down": { - "uv": [3, 3, 13, 0], - "texture": "#top", - "rotation": 90 - } + "up": {"uv": [3, 3, 13, 0], "rotation": 270, "texture": "#top"}, + "down": {"uv": [3, 3, 13, 0], "rotation": 90, "texture": "#top"} } }, { - "name": "cube", "from": [0, 1, 5], "to": [3, 13, 7], "faces": { @@ -80,7 +57,6 @@ } }, { - "name": "cube", "from": [0, 1, 9], "to": [3, 13, 11], "faces": { @@ -90,6 +66,5 @@ "west": {"uv": [5, 3, 7, 15], "texture": "#top"} } } - ], - "groups": [0, 1, 2, 3, 4, 5] + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/block/acacia_door_top_rh.json b/src/main/resources/assets/minecraft/models/block/acacia_door_top_rh.json index 1d11403..0fee82a 100644 --- a/src/main/resources/assets/minecraft/models/block/acacia_door_top_rh.json +++ b/src/main/resources/assets/minecraft/models/block/acacia_door_top_rh.json @@ -1,10 +1,11 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "parent": "block/door_top", - "textures": {"top": "blocks/door_acacia_upper"}, + "textures": { + "top": "blocks/door_acacia_upper" + }, "elements": [ { - "name": "cube", "from": [0, 0, 0], "to": [3, 16, 3], "faces": { @@ -16,7 +17,6 @@ } }, { - "name": "cube", "from": [0, 0, 13], "to": [3, 16, 16], "faces": { @@ -24,48 +24,29 @@ "east": {"uv": [0, 0, 3, 16], "texture": "#top"}, "south": {"uv": [0, 0, 3, 16], "texture": "#top"}, "west": {"uv": [3, 0, 0, 16], "texture": "#top"}, - "up": { - "uv": [16, 0, 13, 3], - "texture": "#top", - "rotation": 270 - } + "up": {"uv": [16, 0, 13, 3], "rotation": 270, "texture": "#top"} } }, { - "name": "cube", "from": [0, 0, 3], "to": [3, 1, 13], "faces": { "east": {"uv": [3, 15, 13, 16], "texture": "#top"}, "west": {"uv": [13, 15, 3, 16], "texture": "#top"}, - "up": { - "uv": [3, 0, 13, 3], - "texture": "#top", - "rotation": 270 - } + "up": {"uv": [3, 0, 13, 3], "rotation": 270, "texture": "#top"} } }, { - "name": "cube", "from": [0, 13, 3], "to": [3, 16, 13], "faces": { "east": {"uv": [3, 0, 13, 3], "texture": "#top"}, "west": {"uv": [13, 0, 3, 3], "texture": "#top"}, - "up": { - "uv": [3, 0, 13, 3], - "texture": "#top", - "rotation": 270 - }, - "down": { - "uv": [3, 0, 13, 3], - "texture": "#top", - "rotation": 90 - } + "up": {"uv": [3, 0, 13, 3], "rotation": 270, "texture": "#top"}, + "down": {"uv": [3, 0, 13, 3], "rotation": 90, "texture": "#top"} } }, { - "name": "cube", "from": [0, 1, 9], "to": [3, 13, 11], "faces": { @@ -76,7 +57,6 @@ } }, { - "name": "cube", "from": [0, 1, 5], "to": [3, 13, 7], "faces": { @@ -86,6 +66,5 @@ "west": {"uv": [7, 3, 5, 15], "texture": "#top"} } } - ], - "groups": [0, 1, 2, 3, 4, 5] + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/block/activator_rail_active_flat.json b/src/main/resources/assets/minecraft/models/block/activator_rail_active_flat.json index a2b6745..225e8fc 100644 --- a/src/main/resources/assets/minecraft/models/block/activator_rail_active_flat.json +++ b/src/main/resources/assets/minecraft/models/block/activator_rail_active_flat.json @@ -1,18 +1,15 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "parent": "block/rail_flat", - "textures": {"1": "blocks/rail_activator_powered"}, + "textures": { + "1": "blocks/rail_activator_powered" + }, "elements": [ { - "name": "cube", "from": [2, 1, 0], "to": [4, 2, 16], "faces": { - "north": { - "uv": [2, 0, 4, 1], - "texture": "#1", - "rotation": 180 - }, + "north": {"uv": [2, 0, 4, 1], "rotation": 180, "texture": "#1"}, "east": {"uv": [3, 0, 4, 16], "texture": "#1"}, "south": {"uv": [2, 0, 4, 1], "texture": "#1"}, "west": {"uv": [2, 0, 3, 16], "texture": "#1"}, @@ -21,7 +18,6 @@ } }, { - "name": "cube", "from": [12, 1, 0], "to": [14, 2, 16], "faces": { @@ -34,7 +30,6 @@ } }, { - "name": "cube", "from": [4, 0, 9], "to": [12, 1, 11], "faces": { @@ -47,7 +42,6 @@ } }, { - "name": "cube", "from": [12, 0, 9], "to": [14, 1, 11], "faces": { @@ -56,36 +50,22 @@ "south": {"uv": [7, 1, 9, 2], "texture": "#1"}, "west": {"uv": [0, 0, 2, 1], "texture": "#1"}, "up": {"uv": [0, 0, 2, 2], "texture": "#1"}, - "down": { - "uv": [7, 1, 9, 3], - "texture": "#1", - "rotation": 180 - } + "down": {"uv": [7, 1, 9, 3], "rotation": 180, "texture": "#1"} } }, { - "name": "cube", "from": [14, 0, 9], "to": [15, 1, 11], "faces": { "north": {"uv": [1, 1, 2, 2], "texture": "#1"}, - "east": { - "uv": [1, 1, 2, 3], - "texture": "#1", - "rotation": 90 - }, + "east": {"uv": [1, 1, 2, 3], "rotation": 90, "texture": "#1"}, "south": {"uv": [1, 2, 2, 3], "texture": "#1"}, "west": {"uv": [0, 0, 2, 1], "texture": "#1"}, "up": {"uv": [1, 1, 2, 3], "texture": "#1"}, - "down": { - "uv": [1, 1, 2, 3], - "texture": "#1", - "rotation": 180 - } + "down": {"uv": [1, 1, 2, 3], "rotation": 180, "texture": "#1"} } }, { - "name": "cube", "from": [7, 0, 3], "to": [9, 1, 5], "faces": { @@ -98,7 +78,6 @@ } }, { - "name": "cube", "from": [7, 0, 11], "to": [9, 1, 13], "faces": { @@ -107,15 +86,10 @@ "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, "west": {"uv": [7, 11, 9, 12], "texture": "#1"}, "up": {"uv": [7, 11, 9, 13], "texture": "#1"}, - "down": { - "uv": [7, 11, 9, 13], - "texture": "#1", - "rotation": 270 - } + "down": {"uv": [7, 11, 9, 13], "rotation": 270, "texture": "#1"} } }, { - "name": "cube", "from": [7, 0, 7], "to": [9, 1, 9], "faces": { @@ -124,15 +98,10 @@ "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, "west": {"uv": [7, 7, 9, 8], "texture": "#1"}, "up": {"uv": [7, 7, 9, 9], "texture": "#1"}, - "down": { - "uv": [7, 7, 9, 9], - "texture": "#1", - "rotation": 90 - } + "down": {"uv": [7, 7, 9, 9], "rotation": 90, "texture": "#1"} } }, { - "name": "cube", "from": [4, 0, 1], "to": [12, 1, 3], "faces": { @@ -145,7 +114,6 @@ } }, { - "name": "cube", "from": [4, 0, 1], "to": [12, 1, 3], "faces": { @@ -158,7 +126,6 @@ } }, { - "name": "cube", "from": [4, 0, 5], "to": [12, 1, 7], "faces": { @@ -171,7 +138,6 @@ } }, { - "name": "cube", "from": [4, 0, 13], "to": [12, 1, 15], "faces": { @@ -184,238 +150,138 @@ } }, { - "name": "cube", "from": [14, 0, 13], "to": [15, 1, 15], "faces": { "north": {"uv": [1, 1, 2, 2], "texture": "#1"}, - "east": { - "uv": [1, 1, 2, 3], - "texture": "#1", - "rotation": 90 - }, + "east": {"uv": [1, 1, 2, 3], "rotation": 90, "texture": "#1"}, "south": {"uv": [1, 2, 2, 3], "texture": "#1"}, "west": {"uv": [0, 0, 2, 1], "texture": "#1"}, "up": {"uv": [1, 1, 2, 3], "texture": "#1"}, - "down": { - "uv": [1, 1, 2, 3], - "texture": "#1", - "rotation": 180 - } + "down": {"uv": [1, 1, 2, 3], "rotation": 180, "texture": "#1"} } }, { - "name": "cube", "from": [14, 0, 1], "to": [15, 1, 3], "faces": { "north": {"uv": [1, 1, 2, 2], "texture": "#1"}, - "east": { - "uv": [1, 1, 2, 3], - "texture": "#1", - "rotation": 90 - }, + "east": {"uv": [1, 1, 2, 3], "rotation": 90, "texture": "#1"}, "south": {"uv": [1, 2, 2, 3], "texture": "#1"}, "west": {"uv": [0, 0, 2, 1], "texture": "#1"}, "up": {"uv": [1, 1, 2, 3], "texture": "#1"}, - "down": { - "uv": [1, 1, 2, 3], - "texture": "#1", - "rotation": 180 - } + "down": {"uv": [1, 1, 2, 3], "rotation": 180, "texture": "#1"} } }, { - "name": "cube", "from": [14, 0, 5], "to": [15, 1, 7], "faces": { "north": {"uv": [1, 1, 2, 2], "texture": "#1"}, - "east": { - "uv": [1, 1, 2, 3], - "texture": "#1", - "rotation": 90 - }, + "east": {"uv": [1, 1, 2, 3], "rotation": 90, "texture": "#1"}, "south": {"uv": [1, 2, 2, 3], "texture": "#1"}, "west": {"uv": [0, 0, 2, 1], "texture": "#1"}, "up": {"uv": [1, 1, 2, 3], "texture": "#1"}, - "down": { - "uv": [1, 1, 2, 3], - "texture": "#1", - "rotation": 180 - } + "down": {"uv": [1, 1, 2, 3], "rotation": 180, "texture": "#1"} } }, { - "name": "cube", "from": [14, 0, 13], "to": [15, 1, 15], "faces": { "north": {"uv": [1, 1, 2, 2], "texture": "#1"}, - "east": { - "uv": [1, 1, 2, 3], - "texture": "#1", - "rotation": 90 - }, + "east": {"uv": [1, 1, 2, 3], "rotation": 90, "texture": "#1"}, "south": {"uv": [1, 2, 2, 3], "texture": "#1"}, "west": {"uv": [0, 0, 2, 1], "texture": "#1"}, "up": {"uv": [1, 1, 2, 3], "texture": "#1"}, - "down": { - "uv": [1, 1, 2, 3], - "texture": "#1", - "rotation": 180 - } + "down": {"uv": [1, 1, 2, 3], "rotation": 180, "texture": "#1"} } }, { - "name": "cube", "from": [14, 0, 9], "to": [15, 1, 11], "faces": { "north": {"uv": [1, 1, 2, 2], "texture": "#1"}, - "east": { - "uv": [1, 1, 2, 3], - "texture": "#1", - "rotation": 90 - }, + "east": {"uv": [1, 1, 2, 3], "rotation": 90, "texture": "#1"}, "south": {"uv": [1, 2, 2, 3], "texture": "#1"}, "west": {"uv": [0, 0, 2, 1], "texture": "#1"}, "up": {"uv": [1, 1, 2, 3], "texture": "#1"}, - "down": { - "uv": [1, 1, 2, 3], - "texture": "#1", - "rotation": 180 - } + "down": {"uv": [1, 1, 2, 3], "rotation": 180, "texture": "#1"} } }, { - "name": "cube", "from": [14, 0, 5], "to": [15, 1, 7], "faces": { "north": {"uv": [1, 1, 2, 2], "texture": "#1"}, - "east": { - "uv": [1, 1, 2, 3], - "texture": "#1", - "rotation": 90 - }, + "east": {"uv": [1, 1, 2, 3], "rotation": 90, "texture": "#1"}, "south": {"uv": [1, 2, 2, 3], "texture": "#1"}, "west": {"uv": [0, 0, 2, 1], "texture": "#1"}, "up": {"uv": [1, 1, 2, 3], "texture": "#1"}, - "down": { - "uv": [1, 1, 2, 3], - "texture": "#1", - "rotation": 180 - } + "down": {"uv": [1, 1, 2, 3], "rotation": 180, "texture": "#1"} } }, { - "name": "cube", "from": [14, 0, 1], "to": [15, 1, 3], "faces": { "north": {"uv": [1, 1, 2, 2], "texture": "#1"}, - "east": { - "uv": [1, 1, 2, 3], - "texture": "#1", - "rotation": 90 - }, + "east": {"uv": [1, 1, 2, 3], "rotation": 90, "texture": "#1"}, "south": {"uv": [1, 2, 2, 3], "texture": "#1"}, "west": {"uv": [0, 0, 2, 1], "texture": "#1"}, "up": {"uv": [1, 1, 2, 3], "texture": "#1"}, - "down": { - "uv": [1, 1, 2, 3], - "texture": "#1", - "rotation": 180 - } + "down": {"uv": [1, 1, 2, 3], "rotation": 180, "texture": "#1"} } }, { - "name": "cube", "from": [1, 0, 13], "to": [2, 1, 15], "faces": { "north": {"uv": [2, 1, 1, 2], "texture": "#1"}, "east": {"uv": [2, 0, 0, 1], "texture": "#1"}, "south": {"uv": [2, 2, 1, 3], "texture": "#1"}, - "west": { - "uv": [2, 1, 1, 3], - "texture": "#1", - "rotation": 90 - }, + "west": {"uv": [2, 1, 1, 3], "rotation": 90, "texture": "#1"}, "up": {"uv": [2, 1, 1, 3], "texture": "#1"}, - "down": { - "uv": [2, 1, 1, 3], - "texture": "#1", - "rotation": 180 - } + "down": {"uv": [2, 1, 1, 3], "rotation": 180, "texture": "#1"} } }, { - "name": "cube", "from": [1, 0, 9], "to": [2, 1, 11], "faces": { "north": {"uv": [2, 1, 1, 2], "texture": "#1"}, "east": {"uv": [2, 0, 0, 1], "texture": "#1"}, "south": {"uv": [2, 2, 1, 3], "texture": "#1"}, - "west": { - "uv": [2, 1, 1, 3], - "texture": "#1", - "rotation": 90 - }, + "west": {"uv": [2, 1, 1, 3], "rotation": 90, "texture": "#1"}, "up": {"uv": [2, 1, 1, 3], "texture": "#1"}, - "down": { - "uv": [2, 1, 1, 3], - "texture": "#1", - "rotation": 180 - } + "down": {"uv": [2, 1, 1, 3], "rotation": 180, "texture": "#1"} } }, { - "name": "cube", "from": [1, 0, 5], "to": [2, 1, 7], "faces": { "north": {"uv": [2, 1, 1, 2], "texture": "#1"}, "east": {"uv": [2, 0, 0, 1], "texture": "#1"}, "south": {"uv": [2, 2, 1, 3], "texture": "#1"}, - "west": { - "uv": [2, 1, 1, 3], - "texture": "#1", - "rotation": 90 - }, + "west": {"uv": [2, 1, 1, 3], "rotation": 90, "texture": "#1"}, "up": {"uv": [2, 1, 1, 3], "texture": "#1"}, - "down": { - "uv": [2, 1, 1, 3], - "texture": "#1", - "rotation": 180 - } + "down": {"uv": [2, 1, 1, 3], "rotation": 180, "texture": "#1"} } }, { - "name": "cube", "from": [1, 0, 1], "to": [2, 1, 3], "faces": { "north": {"uv": [2, 1, 1, 2], "texture": "#1"}, "east": {"uv": [2, 0, 0, 1], "texture": "#1"}, "south": {"uv": [2, 2, 1, 3], "texture": "#1"}, - "west": { - "uv": [2, 1, 1, 3], - "texture": "#1", - "rotation": 90 - }, + "west": {"uv": [2, 1, 1, 3], "rotation": 90, "texture": "#1"}, "up": {"uv": [2, 1, 1, 3], "texture": "#1"}, - "down": { - "uv": [2, 1, 1, 3], - "texture": "#1", - "rotation": 180 - } + "down": {"uv": [2, 1, 1, 3], "rotation": 180, "texture": "#1"} } }, { - "name": "cube", "from": [12, 0, 13], "to": [14, 1, 15], "faces": { @@ -424,15 +290,10 @@ "south": {"uv": [7, 1, 9, 2], "texture": "#1"}, "west": {"uv": [0, 0, 2, 1], "texture": "#1"}, "up": {"uv": [0, 0, 2, 2], "texture": "#1"}, - "down": { - "uv": [7, 1, 9, 3], - "texture": "#1", - "rotation": 180 - } + "down": {"uv": [7, 1, 9, 3], "rotation": 180, "texture": "#1"} } }, { - "name": "cube", "from": [12, 0, 1], "to": [14, 1, 3], "faces": { @@ -441,15 +302,10 @@ "south": {"uv": [7, 1, 9, 2], "texture": "#1"}, "west": {"uv": [0, 0, 2, 1], "texture": "#1"}, "up": {"uv": [0, 0, 2, 2], "texture": "#1"}, - "down": { - "uv": [7, 1, 9, 3], - "texture": "#1", - "rotation": 180 - } + "down": {"uv": [7, 1, 9, 3], "rotation": 180, "texture": "#1"} } }, { - "name": "cube", "from": [12, 0, 5], "to": [14, 1, 7], "faces": { @@ -458,15 +314,10 @@ "south": {"uv": [7, 1, 9, 2], "texture": "#1"}, "west": {"uv": [0, 0, 2, 1], "texture": "#1"}, "up": {"uv": [0, 0, 2, 2], "texture": "#1"}, - "down": { - "uv": [7, 1, 9, 3], - "texture": "#1", - "rotation": 180 - } + "down": {"uv": [7, 1, 9, 3], "rotation": 180, "texture": "#1"} } }, { - "name": "cube", "from": [2, 0, 1], "to": [4, 1, 3], "faces": { @@ -475,15 +326,10 @@ "south": {"uv": [9, 1, 7, 2], "texture": "#1"}, "west": {"uv": [2, 0, 0, 1], "texture": "#1"}, "up": {"uv": [2, 0, 0, 2], "texture": "#1"}, - "down": { - "uv": [9, 1, 7, 3], - "texture": "#1", - "rotation": 180 - } + "down": {"uv": [9, 1, 7, 3], "rotation": 180, "texture": "#1"} } }, { - "name": "cube", "from": [2, 0, 5], "to": [4, 1, 7], "faces": { @@ -492,15 +338,10 @@ "south": {"uv": [9, 1, 7, 2], "texture": "#1"}, "west": {"uv": [2, 0, 0, 1], "texture": "#1"}, "up": {"uv": [2, 0, 0, 2], "texture": "#1"}, - "down": { - "uv": [9, 1, 7, 3], - "texture": "#1", - "rotation": 180 - } + "down": {"uv": [9, 1, 7, 3], "rotation": 180, "texture": "#1"} } }, { - "name": "cube", "from": [2, 0, 9], "to": [4, 1, 11], "faces": { @@ -509,15 +350,10 @@ "south": {"uv": [9, 1, 7, 2], "texture": "#1"}, "west": {"uv": [2, 0, 0, 1], "texture": "#1"}, "up": {"uv": [2, 0, 0, 2], "texture": "#1"}, - "down": { - "uv": [9, 1, 7, 3], - "texture": "#1", - "rotation": 180 - } + "down": {"uv": [9, 1, 7, 3], "rotation": 180, "texture": "#1"} } }, { - "name": "cube", "from": [2, 0, 13], "to": [4, 1, 15], "faces": { @@ -526,44 +362,8 @@ "south": {"uv": [9, 1, 7, 2], "texture": "#1"}, "west": {"uv": [2, 0, 0, 1], "texture": "#1"}, "up": {"uv": [2, 0, 0, 2], "texture": "#1"}, - "down": { - "uv": [9, 1, 7, 3], - "texture": "#1", - "rotation": 180 - } + "down": {"uv": [9, 1, 7, 3], "rotation": 180, "texture": "#1"} } } - ], - "groups": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29 ] } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/block/dispenser.json b/src/main/resources/assets/minecraft/models/block/dispenser.json index 1e613a2..04b57d7 100644 --- a/src/main/resources/assets/minecraft/models/block/dispenser.json +++ b/src/main/resources/assets/minecraft/models/block/dispenser.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "parent": "block/orientable", "textures": { "top": "blocks/furnace_top", @@ -8,14 +8,10 @@ }, "elements": [ { - "name": "cube", "from": [0, 0, 0], "to": [16, 4, 8], "faces": { - "north": { - "uv": [0, 12, 16, 16], - "texture": "#front" - }, + "north": {"uv": [0, 12, 16, 16], "texture": "#front"}, "east": {"uv": [8, 12, 16, 16], "texture": "#side"}, "west": {"uv": [0, 12, 8, 16], "texture": "#side"}, "up": {"uv": [0, 11, 16, 12], "texture": "#front"}, @@ -23,35 +19,26 @@ } }, { - "name": "cube", "from": [9, 4, 0], "to": [16, 5, 8], "faces": { - "north": { - "uv": [0, 11, 7, 12], - "texture": "#front" - }, + "north": {"uv": [0, 11, 7, 12], "texture": "#front"}, "east": {"uv": [8, 12, 16, 13], "texture": "#side"}, "west": {"uv": [7, 9, 9, 10], "texture": "#front"}, "up": {"uv": [7, 9, 9, 11], "texture": "#front"} } }, { - "name": "cube", "from": [0, 4, 0], "to": [7, 5, 8], "faces": { - "north": { - "uv": [9, 11, 16, 12], - "texture": "#front" - }, + "north": {"uv": [9, 11, 16, 12], "texture": "#front"}, "east": {"uv": [7, 9, 9, 10], "texture": "#front"}, "west": {"uv": [0, 12, 8, 13], "texture": "#side"}, "up": {"uv": [7, 9, 9, 11], "texture": "#front"} } }, { - "name": "cube", "from": [10, 5, 0], "to": [16, 7, 8], "faces": { @@ -61,20 +48,15 @@ } }, { - "name": "cube", "from": [0, 5, 0], "to": [6, 7, 8], "faces": { - "north": { - "uv": [10, 9, 16, 11], - "texture": "#front" - }, + "north": {"uv": [10, 9, 16, 11], "texture": "#front"}, "east": {"uv": [9, 9, 10, 11], "texture": "#front"}, "west": {"uv": [0, 9, 8, 11], "texture": "#side"} } }, { - "name": "cube", "from": [9, 7, 0], "to": [16, 16, 8], "faces": { @@ -86,7 +68,6 @@ } }, { - "name": "cube", "from": [0, 7, 0], "to": [7, 16, 8], "faces": { @@ -98,7 +79,6 @@ } }, { - "name": "cube", "from": [7, 8, 0], "to": [9, 16, 8], "faces": { @@ -108,14 +88,10 @@ } }, { - "name": "cube", "from": [0, 0, 8], "to": [16, 16, 16], "faces": { - "north": { - "uv": [0, 0, 16, 16], - "texture": "#front" - }, + "north": {"uv": [0, 0, 16, 16], "texture": "#front"}, "east": {"uv": [0, 0, 8, 16], "texture": "#side"}, "south": {"uv": [0, 0, 16, 16], "texture": "#side"}, "west": {"uv": [8, 0, 16, 16], "texture": "#side"}, diff --git a/src/main/resources/assets/minecraft/models/block/dispenser_vertical.json b/src/main/resources/assets/minecraft/models/block/dispenser_vertical.json index e268b37..f9053dd 100644 --- a/src/main/resources/assets/minecraft/models/block/dispenser_vertical.json +++ b/src/main/resources/assets/minecraft/models/block/dispenser_vertical.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "parent": "block/orientable_vertical", "textures": { "front": "blocks/dispenser_front_vertical", @@ -7,7 +7,6 @@ }, "elements": [ { - "name": "cube", "from": [0, 0, 0], "to": [16, 10, 16], "faces": { @@ -20,7 +19,6 @@ } }, { - "name": "cube", "from": [0, 10, 10], "to": [7, 16, 16], "faces": { @@ -32,7 +30,6 @@ } }, { - "name": "cube", "from": [9, 10, 10], "to": [16, 16, 16], "faces": { @@ -44,7 +41,6 @@ } }, { - "name": "cube", "from": [9, 10, 0], "to": [16, 16, 6], "faces": { @@ -56,7 +52,6 @@ } }, { - "name": "cube", "from": [0, 10, 0], "to": [7, 16, 6], "faces": { @@ -68,7 +63,6 @@ } }, { - "name": "cube", "from": [0, 10, 7], "to": [5, 16, 9], "faces": { @@ -78,7 +72,6 @@ } }, { - "name": "cube", "from": [11, 10, 7], "to": [16, 16, 9], "faces": { @@ -88,21 +81,15 @@ } }, { - "name": "cube", "from": [7, 10, 11], "to": [9, 16, 16], "faces": { - "north": { - "uv": [7, 5, 9, 9], - "texture": "#front", - "rotation": 180 - }, + "north": {"uv": [7, 5, 9, 9], "rotation": 180, "texture": "#front"}, "south": {"uv": [7, 0, 9, 6], "texture": "#side"}, "up": {"uv": [7, 11, 9, 16], "texture": "#front"} } }, { - "name": "cube", "from": [7, 10, 0], "to": [9, 16, 5], "faces": { @@ -112,7 +99,6 @@ } }, { - "name": "cube", "from": [10, 10, 9], "to": [16, 16, 10], "faces": { @@ -123,7 +109,6 @@ } }, { - "name": "cube", "from": [10, 10, 6], "to": [16, 16, 7], "faces": { @@ -134,7 +119,6 @@ } }, { - "name": "cube", "from": [0, 10, 6], "to": [6, 16, 7], "faces": { @@ -145,7 +129,6 @@ } }, { - "name": "cube", "from": [0, 10, 9], "to": [6, 16, 10], "faces": { diff --git a/src/main/resources/assets/minecraft/models/block/iron_bars_side_alt.json b/src/main/resources/assets/minecraft/models/block/iron_bars_side_alt.json index 4722e46..8b4a1bc 100644 --- a/src/main/resources/assets/minecraft/models/block/iron_bars_side_alt.json +++ b/src/main/resources/assets/minecraft/models/block/iron_bars_side_alt.json @@ -1,10 +1,11 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "ambientocclusion": false, - "textures": {"bars": "blocks/iron_bars"}, + "textures": { + "bars": "blocks/iron_bars" + }, "elements": [ { - "name": "cube", "from": [8, 2, 9], "to": [9, 4, 12], "faces": { @@ -14,7 +15,6 @@ } }, { - "name": "cube", "from": [8, 1, 12], "to": [9, 15, 14], "faces": { @@ -24,67 +24,39 @@ } }, { - "name": "cube", "from": [8, 7, 14], "to": [9, 9, 16], "faces": { "east": {"uv": [14, 7, 16, 9], "texture": "#bars"}, - "up": { - "uv": [14, 7, 16, 8], - "texture": "#bars", - "rotation": 90 - }, - "down": { - "uv": [14, 8, 16, 9], - "texture": "#bars", - "rotation": 90 - } + "up": {"uv": [14, 7, 16, 8], "rotation": 90, "texture": "#bars"}, + "down": {"uv": [14, 8, 16, 9], "rotation": 90, "texture": "#bars"} } }, { - "name": "cube", "from": [7, 15, 8], "to": [9, 16, 16], "faces": { "north": {"uv": [7, 15, 9, 16], "texture": "#bars"}, - "east": { - "uv": [8, 8, 9, 16], - "texture": "#bars", - "rotation": 90 - }, + "east": {"uv": [8, 8, 9, 16], "rotation": 90, "texture": "#bars"}, "south": {"uv": [7, 8, 9, 9], "texture": "#bars"}, - "west": { - "uv": [7, 8, 8, 16], - "texture": "#bars", - "rotation": 90 - }, + "west": {"uv": [7, 8, 8, 16], "rotation": 90, "texture": "#bars"}, "up": {"uv": [7, 8, 9, 16], "texture": "#bars"}, "down": {"uv": [7, 8, 9, 16], "texture": "#bars"} } }, { - "name": "cube", "from": [7, 0, 8], "to": [9, 1, 16], "faces": { "north": {"uv": [7, 15, 9, 16], "texture": "#bars"}, - "east": { - "uv": [8, 0, 9, 8], - "texture": "#bars", - "rotation": 90 - }, + "east": {"uv": [8, 0, 9, 8], "rotation": 90, "texture": "#bars"}, "south": {"uv": [7, 8, 9, 9], "texture": "#bars"}, - "west": { - "uv": [7, 0, 8, 8], - "texture": "#bars", - "rotation": 90 - }, + "west": {"uv": [7, 0, 8, 8], "rotation": 90, "texture": "#bars"}, "up": {"uv": [7, 8, 9, 16], "texture": "#bars"}, "down": {"uv": [7, 6, 9, 16], "texture": "#bars"} } }, { - "name": "cube", "from": [7, 2, 9], "to": [8, 4, 12], "faces": { @@ -94,7 +66,6 @@ } }, { - "name": "cube", "from": [7, 1, 12], "to": [8, 15, 14], "faces": { @@ -104,25 +75,15 @@ } }, { - "name": "cube", "from": [7, 7, 14], "to": [8, 9, 16], "faces": { "west": {"uv": [14, 7, 16, 9], "texture": "#bars"}, - "up": { - "uv": [14, 8, 16, 9], - "texture": "#bars", - "rotation": 90 - }, - "down": { - "uv": [14, 8, 16, 9], - "texture": "#bars", - "rotation": 90 - } + "up": {"uv": [14, 8, 16, 9], "rotation": 90, "texture": "#bars"}, + "down": {"uv": [14, 8, 16, 9], "rotation": 90, "texture": "#bars"} } }, { - "name": "cube", "from": [7, 1, 8], "to": [9, 15, 9], "faces": { diff --git a/src/main/resources/assets/minecraft/models/block/iron_door_top.json b/src/main/resources/assets/minecraft/models/block/iron_door_top.json index 94306de..b41270a 100644 --- a/src/main/resources/assets/minecraft/models/block/iron_door_top.json +++ b/src/main/resources/assets/minecraft/models/block/iron_door_top.json @@ -1,14 +1,15 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "parent": "block/door_top", - "textures": {"top": "blocks/door_iron_upper"}, + "textures": { + "top": "blocks/door_iron_upper" + }, "elements": [ { - "name": "cube", "from": [0, 0, 0], "to": [3, 16, 3], "faces": { - "north": {"uv": [0, 0, 3, 16], "texture": "#top"}, + "north": {"uv": [3, 0, 0, 16], "texture": "#top"}, "east": {"uv": [3, 0, 0, 16], "texture": "#top"}, "south": {"uv": [13, 0, 14, 16], "texture": "#top"}, "west": {"uv": [0, 0, 3, 16], "texture": "#top"}, @@ -16,71 +17,46 @@ } }, { - "name": "cube", "from": [0, 0, 13], "to": [3, 16, 16], "faces": { "north": {"uv": [2, 0, 3, 16], "texture": "#top"}, "east": {"uv": [16, 0, 13, 16], "texture": "#top"}, - "south": {"uv": [13, 0, 16, 16], "texture": "#top"}, + "south": {"uv": [0, 0, 3, 16], "texture": "#top"}, "west": {"uv": [13, 0, 16, 16], "texture": "#top"}, "up": {"uv": [3, 3, 0, 0], "texture": "#top"} } }, { - "name": "cube", "from": [0, 13, 3], "to": [3, 16, 13], "faces": { "east": {"uv": [13, 0, 3, 3], "texture": "#top"}, "west": {"uv": [3, 0, 13, 3], "texture": "#top"}, - "up": { - "uv": [13, 3, 3, 0], - "texture": "#top", - "rotation": 90 - }, - "down": { - "uv": [13, 3, 3, 2], - "texture": "#top", - "rotation": 90 - } + "up": {"uv": [13, 3, 3, 0], "rotation": 90, "texture": "#top"}, + "down": {"uv": [13, 3, 3, 2], "rotation": 90, "texture": "#top"} } }, { - "name": "cube", "from": [0, 0, 3], "to": [3, 5, 13], "faces": { "east": {"uv": [12, 11, 2, 16], "texture": "#top"}, "west": {"uv": [3, 11, 13, 16], "texture": "#top"}, - "up": { - "uv": [13, 12, 3, 11], - "texture": "#top", - "rotation": 270 - } + "up": {"uv": [13, 12, 3, 11], "rotation": 270, "texture": "#top"} } }, { - "name": "cube", "from": [0, 8, 3], "to": [3, 10, 13], "faces": { "east": {"uv": [13, 6, 3, 8], "texture": "#top"}, "west": {"uv": [3, 6, 13, 8], "texture": "#top"}, - "up": { - "uv": [10, 1, 0, 0], - "texture": "#top", - "rotation": 270 - }, - "down": { - "uv": [13, 8, 3, 7], - "texture": "#top", - "rotation": 90 - } + "up": {"uv": [10, 1, 0, 0], "rotation": 270, "texture": "#top"}, + "down": {"uv": [13, 8, 3, 7], "rotation": 90, "texture": "#top"} } }, { - "name": "cube", "from": [0, 5, 7], "to": [3, 8, 9], "faces": { @@ -91,7 +67,6 @@ } }, { - "name": "cube", "from": [0, 10, 7], "to": [3, 13, 9], "faces": { @@ -101,6 +76,5 @@ "west": {"uv": [7, 3, 9, 6], "texture": "#top"} } } - ], - "groups": [0, 1, 2, 3, 4, 5, 6] + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/block/iron_door_top_rh.json b/src/main/resources/assets/minecraft/models/block/iron_door_top_rh.json index 6769437..bdbffdb 100644 --- a/src/main/resources/assets/minecraft/models/block/iron_door_top_rh.json +++ b/src/main/resources/assets/minecraft/models/block/iron_door_top_rh.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "parent": "block/door_top", "textures": { "top": "blocks/door_iron_upper", @@ -7,91 +7,57 @@ }, "elements": [ { - "name": "cube", "from": [0, 0, 13], "to": [3, 16, 16], "faces": { "north": {"uv": [14, 0, 13, 16], "texture": "#top"}, "east": {"uv": [0, 0, 3, 16], "texture": "#top"}, - "south": {"uv": [3, 0, 0, 16], "texture": "#top"}, + "south": {"uv": [0, 0, 3, 16], "texture": "#top"}, "west": {"uv": [3, 0, 0, 16], "texture": "#top"}, - "up": { - "uv": [16, 0, 13, 3], - "texture": "#top", - "rotation": 270 - } + "up": {"uv": [16, 0, 13, 3], "rotation": 270, "texture": "#top"} } }, { - "name": "cube", "from": [0, 0, 0], "to": [3, 16, 3], "faces": { - "north": {"uv": [16, 0, 13, 16], "texture": "#top"}, + "north": {"uv": [3, 0, 0, 16], "texture": "#top"}, "east": {"uv": [13, 0, 16, 16], "texture": "#top"}, "south": {"uv": [3, 0, 2, 16], "texture": "#top"}, "west": {"uv": [16, 0, 13, 16], "texture": "#top"}, - "up": { - "uv": [3, 0, 0, 3], - "texture": "#top", - "rotation": 270 - } + "up": {"uv": [3, 0, 0, 3], "rotation": 270, "texture": "#top"} } }, { - "name": "cube", "from": [0, 13, 3], "to": [3, 16, 13], "faces": { "east": {"uv": [3, 0, 13, 3], "texture": "#top"}, "west": {"uv": [13, 0, 3, 3], "texture": "#top"}, - "up": { - "uv": [13, 0, 3, 3], - "texture": "#top", - "rotation": 270 - }, - "down": { - "uv": [13, 2, 3, 3], - "texture": "#top", - "rotation": 90 - } + "up": {"uv": [13, 0, 3, 3], "rotation": 270, "texture": "#top"}, + "down": {"uv": [13, 2, 3, 3], "rotation": 90, "texture": "#top"} } }, { - "name": "cube", "from": [0, 0, 3], "to": [3, 5, 13], "faces": { "east": {"uv": [2, 11, 12, 16], "texture": "#top"}, "west": {"uv": [13, 11, 3, 16], "texture": "#top"}, - "up": { - "uv": [13, 11, 3, 12], - "texture": "#top", - "rotation": 270 - } + "up": {"uv": [13, 11, 3, 12], "rotation": 270, "texture": "#top"} } }, { - "name": "cube", "from": [0, 8, 3], "to": [3, 10, 13], "faces": { "east": {"uv": [3, 6, 13, 8], "texture": "#top"}, "west": {"uv": [13, 6, 3, 8], "texture": "#top"}, - "up": { - "uv": [10, 0, 0, 1], - "texture": "#top", - "rotation": 270 - }, - "down": { - "uv": [13, 7, 3, 8], - "texture": "#top", - "rotation": 90 - } + "up": {"uv": [10, 0, 0, 1], "rotation": 270, "texture": "#top"}, + "down": {"uv": [13, 7, 3, 8], "rotation": 90, "texture": "#top"} } }, { - "name": "cube", "from": [0, 5, 7], "to": [3, 8, 9], "faces": { @@ -102,7 +68,6 @@ } }, { - "name": "cube", "from": [0, 10, 7], "to": [3, 13, 9], "faces": { @@ -112,6 +77,5 @@ "west": {"uv": [9, 3, 7, 6], "texture": "#top"} } } - ], - "groups": [0, 1, 2, 3, 4, 5, 6] + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/block/iron_trapdoor_bottom.json b/src/main/resources/assets/minecraft/models/block/iron_trapdoor_bottom.json index eb9c0d1..7dbdd9e 100644 --- a/src/main/resources/assets/minecraft/models/block/iron_trapdoor_bottom.json +++ b/src/main/resources/assets/minecraft/models/block/iron_trapdoor_bottom.json @@ -1,12 +1,11 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "textures": { "1": "blocks/iron_trapdoor", "particle": "blocks/iron_trapdoor" }, "elements": [ { - "name": "cube", "from": [0, 0, 0], "to": [16, 3, 3], "faces": { @@ -19,15 +18,10 @@ } }, { - "name": "cube", "from": [0, 0, 13], "to": [16, 3, 16], "faces": { - "north": { - "uv": [0, 0, 16, 3], - "texture": "#1", - "rotation": 180 - }, + "north": {"uv": [0, 0, 16, 3], "rotation": 180, "texture": "#1"}, "east": {"uv": [0, 0, 3, 3], "texture": "#1"}, "south": {"uv": [0, 0, 16, 3], "texture": "#1"}, "west": {"uv": [13, 0, 16, 3], "texture": "#1"}, @@ -36,90 +30,54 @@ } }, { - "name": "cube", "from": [13, 0, 3], "to": [16, 3, 13], "faces": { - "north": {"uv": [0, 0, 3, 3], "texture": "#1"}, "east": {"uv": [3, 0, 13, 3], "texture": "#1"}, - "south": {"uv": [0, 0, 3, 3], "texture": "#1"}, - "west": { - "uv": [3, 0, 13, 3], - "texture": "#1", - "rotation": 180 - }, + "west": {"uv": [3, 0, 13, 3], "rotation": 180, "texture": "#1"}, "up": {"uv": [13, 3, 16, 13], "texture": "#1"}, "down": {"uv": [13, 3, 16, 13], "texture": "#1"} } }, { - "name": "cube", "from": [0, 0, 3], "to": [3, 3, 13], "faces": { - "north": {"uv": [0, 0, 3, 3], "texture": "#1"}, "east": {"uv": [3, 6, 13, 9], "texture": "#1"}, - "south": {"uv": [0, 0, 3, 3], "texture": "#1"}, "west": {"uv": [3, 0, 13, 3], "texture": "#1"}, "up": {"uv": [0, 3, 3, 13], "texture": "#1"}, "down": {"uv": [0, 3, 3, 13], "texture": "#1"} } }, { - "name": "cube", "from": [6, 0, 3], "to": [10, 3, 13], "faces": { - "north": {"uv": [0, 0, 4, 3], "texture": "#1"}, - "east": { - "uv": [3, 7, 13, 10], - "texture": "#1", - "rotation": 180 - }, - "south": {"uv": [0, 0, 4, 3], "texture": "#1"}, - "west": { - "uv": [3, 7, 13, 10], - "texture": "#1", - "rotation": 180 - }, + "east": {"uv": [3, 7, 13, 10], "rotation": 180, "texture": "#1"}, + "west": {"uv": [3, 7, 13, 10], "rotation": 180, "texture": "#1"}, "up": {"uv": [6, 3, 10, 13], "texture": "#1"}, "down": {"uv": [6, 3, 10, 13], "texture": "#1"} } }, { - "name": "cube", "from": [3, 0, 6], "to": [6, 3, 10], "faces": { "north": {"uv": [10, 6, 13, 9], "texture": "#1"}, - "east": {"uv": [0, 0, 4, 3], "texture": "#1"}, - "south": { - "uv": [3, 7, 6, 10], - "texture": "#1", - "rotation": 180 - }, - "west": {"uv": [0, 0, 4, 3], "texture": "#1"}, + "south": {"uv": [3, 7, 6, 10], "rotation": 180, "texture": "#1"}, "up": {"uv": [3, 6, 6, 10], "texture": "#1"}, "down": {"uv": [3, 6, 6, 10], "texture": "#1"} } }, { - "name": "cube", "from": [10, 0, 6], "to": [13, 3, 10], "faces": { "north": {"uv": [3, 6, 6, 9], "texture": "#1"}, - "east": {"uv": [0, 0, 4, 3], "texture": "#1"}, - "south": { - "uv": [10, 7, 13, 10], - "texture": "#1", - "rotation": 180 - }, - "west": {"uv": [0, 0, 4, 3], "texture": "#1"}, + "south": {"uv": [10, 7, 13, 10], "rotation": 180, "texture": "#1"}, "up": {"uv": [10, 6, 13, 10], "texture": "#1"}, "down": {"uv": [10, 6, 13, 10], "texture": "#1"} } } - ], - "groups": [0, 1, 2, 3, 4, 5, 6] + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/block/iron_trapdoor_open.json b/src/main/resources/assets/minecraft/models/block/iron_trapdoor_open.json index ab75bd4..921e109 100644 --- a/src/main/resources/assets/minecraft/models/block/iron_trapdoor_open.json +++ b/src/main/resources/assets/minecraft/models/block/iron_trapdoor_open.json @@ -1,252 +1,83 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "textures": { "1": "blocks/iron_trapdoor", "particle": "blocks/iron_trapdoor" }, "elements": [ { - "name": "cube", "from": [0, 0, 13], "to": [16, 3, 16], "faces": { - "north": { - "uv": [0, 0, 16, 3], - "texture": "#1", - "rotation": 180 - }, - "east": { - "uv": [13, 0, 16, 3], - "texture": "#1", - "rotation": 90 - }, + "north": {"uv": [0, 0, 16, 3], "rotation": 180, "texture": "#1"}, + "east": {"uv": [13, 0, 16, 3], "rotation": 90, "texture": "#1"}, "south": {"uv": [0, 13, 16, 16], "texture": "#1"}, - "west": { - "uv": [0, 0, 3, 3], - "texture": "#1", - "rotation": 270 - }, + "west": {"uv": [0, 0, 3, 3], "rotation": 270, "texture": "#1"}, "up": {"uv": [0, 0, 16, 3], "texture": "#1"}, - "down": { - "uv": [0, 0, 16, 3], - "texture": "#1", - "rotation": 180 - } - }, - "rotation": { - "origin": [8, 8, 21], - "axis": "x", - "angle": 0 + "down": {"uv": [0, 0, 16, 3], "rotation": 180, "texture": "#1"} } }, { - "name": "cube", "from": [0, 13, 13], "to": [16, 16, 16], "faces": { - "north": { - "uv": [0, 13, 16, 16], - "texture": "#1", - "rotation": 180 - }, - "east": { - "uv": [0, 0, 3, 3], - "texture": "#1", - "rotation": 90 - }, + "north": {"uv": [0, 13, 16, 16], "rotation": 180, "texture": "#1"}, + "east": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#1"}, "south": {"uv": [0, 0, 16, 3], "texture": "#1"}, - "west": { - "uv": [13, 0, 16, 3], - "texture": "#1", - "rotation": 270 - }, + "west": {"uv": [13, 0, 16, 3], "rotation": 270, "texture": "#1"}, "up": {"uv": [0, 0, 16, 3], "texture": "#1"}, "down": {"uv": [0, 0, 16, 3], "texture": "#1"} - }, - "rotation": { - "origin": [8, 8, 21], - "axis": "x", - "angle": 0 } }, { - "name": "cube", "from": [13, 3, 13], "to": [16, 13, 16], "faces": { - "north": { - "uv": [13, 3, 16, 13], - "texture": "#1", - "rotation": 180 - }, - "east": { - "uv": [3, 0, 13, 3], - "texture": "#1", - "rotation": 90 - }, + "north": {"uv": [13, 3, 16, 13], "rotation": 180, "texture": "#1"}, + "east": {"uv": [3, 0, 13, 3], "rotation": 90, "texture": "#1"}, "south": {"uv": [13, 3, 16, 13], "texture": "#1"}, - "west": { - "uv": [3, 0, 13, 3], - "texture": "#1", - "rotation": 90 - }, - "up": {"uv": [0, 0, 3, 3], "texture": "#1"}, - "down": { - "uv": [0, 0, 3, 3], - "texture": "#1", - "rotation": 180 - } - }, - "rotation": { - "origin": [8, 8, 21], - "axis": "x", - "angle": 0 + "west": {"uv": [3, 0, 13, 3], "rotation": 90, "texture": "#1"} } }, { - "name": "cube", "from": [0, 3, 13], "to": [3, 13, 16], "faces": { - "north": { - "uv": [0, 3, 3, 13], - "texture": "#1", - "rotation": 180 - }, - "east": { - "uv": [3, 6, 13, 9], - "texture": "#1", - "rotation": 90 - }, + "north": {"uv": [0, 3, 3, 13], "rotation": 180, "texture": "#1"}, + "east": {"uv": [3, 6, 13, 9], "rotation": 90, "texture": "#1"}, "south": {"uv": [0, 3, 3, 13], "texture": "#1"}, - "west": { - "uv": [3, 0, 13, 3], - "texture": "#1", - "rotation": 270 - }, - "up": {"uv": [0, 0, 3, 3], "texture": "#1"}, - "down": { - "uv": [0, 0, 3, 3], - "texture": "#1", - "rotation": 180 - } - }, - "rotation": { - "origin": [8, 8, 21], - "axis": "x", - "angle": 0 + "west": {"uv": [3, 0, 13, 3], "rotation": 270, "texture": "#1"} } }, { - "name": "cube", "from": [6, 3, 13], "to": [10, 13, 16], "faces": { - "north": { - "uv": [6, 3, 10, 13], - "texture": "#1", - "rotation": 180 - }, - "east": { - "uv": [3, 7, 13, 10], - "texture": "#1", - "rotation": 270 - }, + "north": {"uv": [6, 3, 10, 13], "rotation": 180, "texture": "#1"}, + "east": {"uv": [3, 7, 13, 10], "rotation": 270, "texture": "#1"}, "south": {"uv": [6, 3, 10, 13], "texture": "#1"}, - "west": { - "uv": [3, 7, 13, 10], - "texture": "#1", - "rotation": 90 - }, - "up": {"uv": [0, 0, 4, 3], "texture": "#1"}, - "down": { - "uv": [0, 0, 4, 3], - "texture": "#1", - "rotation": 180 - } - }, - "rotation": { - "origin": [8, 8, 21], - "axis": "x", - "angle": 0 + "west": {"uv": [3, 7, 13, 10], "rotation": 90, "texture": "#1"} } }, { - "name": "cube", "from": [3, 6, 13], "to": [6, 10, 16], "faces": { - "north": { - "uv": [3, 6, 6, 10], - "texture": "#1", - "rotation": 180 - }, - "east": { - "uv": [0, 0, 4, 3], - "texture": "#1", - "rotation": 90 - }, + "north": {"uv": [3, 6, 6, 10], "rotation": 180, "texture": "#1"}, "south": {"uv": [3, 6, 6, 10], "texture": "#1"}, - "west": { - "uv": [0, 0, 4, 3], - "texture": "#1", - "rotation": 270 - }, - "up": { - "uv": [3, 7, 6, 10], - "texture": "#1", - "rotation": 180 - }, - "down": { - "uv": [10, 6, 13, 9], - "texture": "#1", - "rotation": 180 - } - }, - "rotation": { - "origin": [8, 8, 21], - "axis": "x", - "angle": 0 + "up": {"uv": [3, 7, 6, 10], "rotation": 180, "texture": "#1"}, + "down": {"uv": [10, 6, 13, 9], "rotation": 180, "texture": "#1"} } }, { - "name": "cube", "from": [10, 6, 13], "to": [13, 10, 16], "faces": { - "north": { - "uv": [10, 6, 13, 10], - "texture": "#1", - "rotation": 180 - }, - "east": { - "uv": [0, 0, 4, 3], - "texture": "#1", - "rotation": 90 - }, + "north": {"uv": [10, 6, 13, 10], "rotation": 180, "texture": "#1"}, "south": {"uv": [10, 6, 13, 10], "texture": "#1"}, - "west": { - "uv": [0, 0, 4, 3], - "texture": "#1", - "rotation": 270 - }, - "up": { - "uv": [10, 7, 13, 10], - "texture": "#1", - "rotation": 180 - }, - "down": { - "uv": [3, 6, 6, 9], - "texture": "#1", - "rotation": 180 - } - }, - "rotation": { - "origin": [8, 8, 21], - "axis": "x", - "angle": 0 + "up": {"uv": [10, 7, 13, 10], "rotation": 180, "texture": "#1"}, + "down": {"uv": [3, 6, 6, 9], "rotation": 180, "texture": "#1"} } } - ], - "groups": [0, 1, 2, 3, 4, 5, 6] + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/block/iron_trapdoor_top.json b/src/main/resources/assets/minecraft/models/block/iron_trapdoor_top.json index 0f8b2a1..f034d9a 100644 --- a/src/main/resources/assets/minecraft/models/block/iron_trapdoor_top.json +++ b/src/main/resources/assets/minecraft/models/block/iron_trapdoor_top.json @@ -1,12 +1,11 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "textures": { "1": "blocks/iron_trapdoor", "particle": "blocks/iron_trapdoor" }, "elements": [ { - "name": "cube", "from": [0, 13, 0], "to": [16, 16, 3], "faces": { @@ -19,15 +18,10 @@ } }, { - "name": "cube", "from": [0, 13, 13], "to": [16, 16, 16], "faces": { - "north": { - "uv": [0, 0, 16, 3], - "texture": "#1", - "rotation": 180 - }, + "north": {"uv": [0, 0, 16, 3], "rotation": 180, "texture": "#1"}, "east": {"uv": [0, 0, 3, 3], "texture": "#1"}, "south": {"uv": [0, 0, 16, 3], "texture": "#1"}, "west": {"uv": [13, 0, 16, 3], "texture": "#1"}, @@ -36,90 +30,54 @@ } }, { - "name": "cube", "from": [13, 13, 3], "to": [16, 16, 13], "faces": { - "north": {"uv": [0, 0, 3, 3], "texture": "#1"}, "east": {"uv": [3, 0, 13, 3], "texture": "#1"}, - "south": {"uv": [0, 0, 3, 3], "texture": "#1"}, - "west": { - "uv": [3, 0, 13, 3], - "texture": "#1", - "rotation": 180 - }, + "west": {"uv": [3, 0, 13, 3], "rotation": 180, "texture": "#1"}, "up": {"uv": [13, 3, 16, 13], "texture": "#1"}, "down": {"uv": [13, 3, 16, 13], "texture": "#1"} } }, { - "name": "cube", "from": [0, 13, 3], "to": [3, 16, 13], "faces": { - "north": {"uv": [0, 0, 3, 3], "texture": "#1"}, "east": {"uv": [3, 6, 13, 9], "texture": "#1"}, - "south": {"uv": [0, 0, 3, 3], "texture": "#1"}, "west": {"uv": [3, 0, 13, 3], "texture": "#1"}, "up": {"uv": [0, 3, 3, 13], "texture": "#1"}, "down": {"uv": [0, 3, 3, 13], "texture": "#1"} } }, { - "name": "cube", "from": [6, 13, 3], "to": [10, 16, 13], "faces": { - "north": {"uv": [0, 0, 4, 3], "texture": "#1"}, - "east": { - "uv": [3, 7, 13, 10], - "texture": "#1", - "rotation": 180 - }, - "south": {"uv": [0, 0, 4, 3], "texture": "#1"}, - "west": { - "uv": [3, 7, 13, 10], - "texture": "#1", - "rotation": 180 - }, + "east": {"uv": [3, 7, 13, 10], "rotation": 180, "texture": "#1"}, + "west": {"uv": [3, 7, 13, 10], "rotation": 180, "texture": "#1"}, "up": {"uv": [6, 3, 10, 13], "texture": "#1"}, "down": {"uv": [6, 3, 10, 13], "texture": "#1"} } }, { - "name": "cube", "from": [3, 13, 6], "to": [6, 16, 10], "faces": { "north": {"uv": [10, 6, 13, 9], "texture": "#1"}, - "east": {"uv": [0, 0, 4, 3], "texture": "#1"}, - "south": { - "uv": [3, 7, 6, 10], - "texture": "#1", - "rotation": 180 - }, - "west": {"uv": [0, 0, 4, 3], "texture": "#1"}, + "south": {"uv": [3, 7, 6, 10], "rotation": 180, "texture": "#1"}, "up": {"uv": [3, 6, 6, 10], "texture": "#1"}, "down": {"uv": [3, 6, 6, 10], "texture": "#1"} } }, { - "name": "cube", "from": [10, 13, 6], "to": [13, 16, 10], "faces": { "north": {"uv": [3, 6, 6, 9], "texture": "#1"}, - "east": {"uv": [0, 0, 4, 3], "texture": "#1"}, - "south": { - "uv": [10, 7, 13, 10], - "texture": "#1", - "rotation": 180 - }, - "west": {"uv": [0, 0, 4, 3], "texture": "#1"}, + "south": {"uv": [10, 7, 13, 10], "rotation": 180, "texture": "#1"}, "up": {"uv": [10, 6, 13, 10], "texture": "#1"}, "down": {"uv": [10, 6, 13, 10], "texture": "#1"} } } - ], - "groups": [0, 1, 2, 3, 4, 5, 6] + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/block/jukebox.json b/src/main/resources/assets/minecraft/models/block/jukebox.json index eb4051a..185b985 100644 --- a/src/main/resources/assets/minecraft/models/block/jukebox.json +++ b/src/main/resources/assets/minecraft/models/block/jukebox.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "parent": "block/cube_top", "textures": { "top": "blocks/jukebox_top", @@ -7,7 +7,6 @@ }, "elements": [ { - "name": "cube", "from": [0, 0, 13], "to": [16, 16, 16], "faces": { @@ -20,7 +19,6 @@ } }, { - "name": "cube", "from": [0, 0, 0], "to": [16, 16, 3], "faces": { @@ -33,7 +31,6 @@ } }, { - "name": "cube", "from": [9, 0, 3], "to": [16, 16, 13], "faces": { @@ -44,7 +41,6 @@ } }, { - "name": "cube", "from": [0, 0, 3], "to": [7, 16, 13], "faces": { @@ -55,7 +51,6 @@ } }, { - "name": "cube", "from": [7, 0, 3], "to": [9, 4, 13], "faces": { diff --git a/src/main/resources/assets/minecraft/models/block/jungle_door_bottom.json b/src/main/resources/assets/minecraft/models/block/jungle_door_bottom.json index 6734365..4485bd8 100644 --- a/src/main/resources/assets/minecraft/models/block/jungle_door_bottom.json +++ b/src/main/resources/assets/minecraft/models/block/jungle_door_bottom.json @@ -1,101 +1,50 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "parent": "block/door_bottom", - "textures": {"bottom": "blocks/door_jungle_lower"}, + "textures": { + "bottom": "blocks/door_jungle_lower" + }, "elements": [ { - "name": "cube", "from": [0, 0, 0], "to": [3, 16, 7], "faces": { - "north": { - "uv": [0, 0, 3, 16], - "texture": "#bottom" - }, + "north": {"uv": [3, 0, 0, 16], "texture": "#bottom"}, "east": {"uv": [7, 0, 0, 16], "texture": "#bottom"}, - "south": { - "uv": [6, 0, 7, 16], - "texture": "#bottom" - }, + "south": {"uv": [6, 0, 7, 16], "texture": "#bottom"}, "west": {"uv": [0, 0, 7, 16], "texture": "#bottom"}, - "down": { - "uv": [0, 13, 7, 16], - "texture": "#bottom", - "rotation": 90 - } + "down": {"uv": [0, 13, 7, 16], "rotation": 90, "texture": "#bottom"} } }, { - "name": "cube", "from": [0, 0, 9], "to": [3, 16, 16], "faces": { - "north": { - "uv": [9, 0, 10, 16], - "texture": "#bottom" - }, - "east": { - "uv": [16, 0, 9, 16], - "texture": "#bottom" - }, - "south": { - "uv": [13, 0, 16, 16], - "texture": "#bottom" - }, - "west": { - "uv": [9, 0, 16, 16], - "texture": "#bottom" - }, - "down": { - "uv": [9, 13, 16, 16], - "texture": "#bottom", - "rotation": 90 - } + "north": {"uv": [9, 0, 10, 16], "texture": "#bottom"}, + "east": {"uv": [16, 0, 9, 16], "texture": "#bottom"}, + "south": {"uv": [13, 0, 16, 16], "texture": "#bottom"}, + "west": {"uv": [9, 0, 16, 16], "texture": "#bottom"}, + "down": {"uv": [9, 13, 16, 16], "rotation": 90, "texture": "#bottom"} } }, { - "name": "cube", "from": [0, 0, 7], "to": [3, 3, 9], "faces": { - "east": { - "uv": [9, 13, 7, 16], - "texture": "#bottom" - }, - "west": { - "uv": [7, 13, 9, 16], - "texture": "#bottom" - }, - "up": { - "uv": [7, 13, 9, 14], - "texture": "#bottom", - "rotation": 270 - }, - "down": { - "uv": [7, 13, 9, 16], - "texture": "#bottom", - "rotation": 90 - } + "east": {"uv": [9, 13, 7, 16], "texture": "#bottom"}, + "west": {"uv": [7, 13, 9, 16], "texture": "#bottom"}, + "up": {"uv": [7, 13, 9, 14], "rotation": 270, "texture": "#bottom"}, + "down": {"uv": [7, 13, 9, 16], "rotation": 90, "texture": "#bottom"} } }, { - "name": "cube", "from": [0, 14, 7], "to": [3, 16, 9], "faces": { "east": {"uv": [9, 0, 7, 2], "texture": "#bottom"}, - "south": { - "uv": [0, 0, 1, 2], - "texture": "#missing" - }, "west": {"uv": [7, 0, 9, 2], "texture": "#bottom"}, - "down": { - "uv": [7, 1, 9, 2], - "texture": "#bottom", - "rotation": 90 - } + "down": {"uv": [7, 1, 9, 2], "rotation": 90, "texture": "#bottom"} } } - ], - "groups": [0, 1, 2, 3] + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/block/jungle_door_bottom_rh.json b/src/main/resources/assets/minecraft/models/block/jungle_door_bottom_rh.json index ba3a980..7b76284 100644 --- a/src/main/resources/assets/minecraft/models/block/jungle_door_bottom_rh.json +++ b/src/main/resources/assets/minecraft/models/block/jungle_door_bottom_rh.json @@ -1,97 +1,50 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "parent": "block/door_bottom", - "textures": {"bottom": "blocks/door_jungle_lower"}, + "textures": { + "bottom": "blocks/door_jungle_lower" + }, "elements": [ { - "name": "cube", "from": [0, 0, 9], "to": [3, 16, 16], "faces": { - "north": { - "uv": [7, 0, 6, 16], - "texture": "#bottom" - }, + "north": {"uv": [7, 0, 6, 16], "texture": "#bottom"}, "east": {"uv": [0, 0, 7, 16], "texture": "#bottom"}, - "south": { - "uv": [3, 0, 0, 16], - "texture": "#bottom" - }, + "south": {"uv": [0, 0, 3, 16], "texture": "#bottom"}, "west": {"uv": [7, 0, 0, 16], "texture": "#bottom"}, - "down": { - "uv": [0, 16, 7, 13], - "texture": "#bottom", - "rotation": 90 - } + "down": {"uv": [0, 16, 7, 13], "rotation": 90, "texture": "#bottom"} } }, { - "name": "cube", "from": [0, 0, 0], "to": [3, 16, 7], "faces": { - "north": { - "uv": [16, 0, 13, 16], - "texture": "#bottom" - }, - "east": { - "uv": [9, 0, 16, 16], - "texture": "#bottom" - }, - "south": { - "uv": [10, 0, 9, 16], - "texture": "#bottom" - }, - "west": { - "uv": [16, 0, 9, 16], - "texture": "#bottom" - }, - "down": { - "uv": [9, 16, 16, 13], - "texture": "#bottom", - "rotation": 90 - } + "north": {"uv": [16, 0, 13, 16], "texture": "#bottom"}, + "east": {"uv": [9, 0, 16, 16], "texture": "#bottom"}, + "south": {"uv": [10, 0, 9, 16], "texture": "#bottom"}, + "west": {"uv": [16, 0, 9, 16], "texture": "#bottom"}, + "down": {"uv": [9, 16, 16, 13], "rotation": 90, "texture": "#bottom"} } }, { - "name": "cube", "from": [0, 0, 7], "to": [3, 3, 9], "faces": { - "east": { - "uv": [7, 13, 9, 16], - "texture": "#bottom" - }, - "west": { - "uv": [9, 13, 7, 16], - "texture": "#bottom" - }, - "up": { - "uv": [7, 14, 9, 13], - "texture": "#bottom", - "rotation": 270 - }, - "down": { - "uv": [7, 16, 9, 13], - "texture": "#bottom", - "rotation": 90 - } + "east": {"uv": [7, 13, 9, 16], "texture": "#bottom"}, + "west": {"uv": [9, 13, 7, 16], "texture": "#bottom"}, + "up": {"uv": [7, 14, 9, 13], "rotation": 270, "texture": "#bottom"}, + "down": {"uv": [7, 16, 9, 13], "rotation": 90, "texture": "#bottom"} } }, { - "name": "cube", "from": [0, 14, 7], "to": [3, 16, 9], "faces": { "east": {"uv": [7, 0, 9, 2], "texture": "#bottom"}, "west": {"uv": [9, 0, 7, 2], "texture": "#bottom"}, - "down": { - "uv": [7, 2, 9, 1], - "texture": "#bottom", - "rotation": 90 - } + "down": {"uv": [7, 2, 9, 1], "rotation": 90, "texture": "#bottom"} } } - ], - "groups": [0, 1, 2, 3] + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/block/jungle_door_top.json b/src/main/resources/assets/minecraft/models/block/jungle_door_top.json index 5dd4495..d6e13c0 100644 --- a/src/main/resources/assets/minecraft/models/block/jungle_door_top.json +++ b/src/main/resources/assets/minecraft/models/block/jungle_door_top.json @@ -1,145 +1,90 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "parent": "block/door_top", - "textures": {"top": "blocks/door_jungle_upper"}, + "textures": { + "top": "blocks/door_jungle_upper" + }, "elements": [ { - "name": "cube", "from": [0, 0, 12], "to": [3, 16, 16], "faces": { - "north": { - "uv": [12, 0, 15, 16], - "texture": "#top", - "rotation": 180 - }, + "north": {"uv": [12, 0, 15, 16], "rotation": 180, "texture": "#top"}, "east": {"uv": [16, 0, 12, 16], "texture": "#top"}, "south": {"uv": [13, 0, 16, 16], "texture": "#top"}, "west": {"uv": [12, 0, 16, 16], "texture": "#top"}, - "up": { - "uv": [12, 0, 16, 3], - "texture": "#top", - "rotation": 270 - } + "up": {"uv": [12, 0, 16, 3], "rotation": 270, "texture": "#top"} } }, { - "name": "cube", "from": [0, 0, 0], "to": [3, 16, 4], "faces": { - "north": {"uv": [0, 0, 3, 16], "texture": "#top"}, + "north": {"uv": [3, 0, 0, 16], "texture": "#top"}, "east": {"uv": [4, 0, 0, 16], "texture": "#top"}, - "south": { - "uv": [1, 0, 4, 16], - "texture": "#top", - "rotation": 180 - }, + "south": {"uv": [1, 0, 4, 16], "rotation": 180, "texture": "#top"}, "west": {"uv": [0, 0, 4, 16], "texture": "#top"}, - "up": { - "uv": [0, 0, 4, 3], - "texture": "#top", - "rotation": 270 - } + "up": {"uv": [0, 0, 4, 3], "rotation": 270, "texture": "#top"} } }, { - "name": "cube", "from": [0, 0, 4], "to": [3, 6, 12], "faces": { "east": {"uv": [12, 10, 4, 16], "texture": "#top"}, "west": {"uv": [4, 10, 12, 16], "texture": "#top"}, - "up": { - "uv": [4, 10, 12, 13], - "texture": "#top", - "rotation": 90 - } + "up": {"uv": [4, 10, 12, 13], "rotation": 90, "texture": "#top"} } }, { - "name": "cube", "from": [0, 13, 4], "to": [3, 16, 12], "faces": { "east": {"uv": [12, 0, 4, 3], "texture": "#top"}, "west": {"uv": [4, 0, 12, 3], "texture": "#top"}, - "up": { - "uv": [4, 0, 12, 3], - "texture": "#top", - "rotation": 270 - }, - "down": { - "uv": [4, 0, 12, 3], - "texture": "#top", - "rotation": 90 - } + "up": {"uv": [4, 0, 12, 3], "rotation": 270, "texture": "#top"}, + "down": {"uv": [4, 0, 12, 3], "rotation": 90, "texture": "#top"} } }, { - "name": "cube", "from": [0, 12, 4], "to": [3, 13, 6], "faces": { "east": {"uv": [10, 3, 12, 4], "texture": "#top"}, "south": {"uv": [5, 3, 6, 4], "texture": "#top"}, "west": {"uv": [4, 3, 6, 4], "texture": "#top"}, - "down": { - "uv": [4, 1, 6, 4], - "texture": "#top", - "rotation": 90 - } + "down": {"uv": [4, 1, 6, 4], "rotation": 90, "texture": "#top"} } }, { - "name": "cube", "from": [0, 12, 10], "to": [3, 13, 12], "faces": { "north": {"uv": [5, 3, 6, 4], "texture": "#top"}, "east": {"uv": [4, 3, 6, 4], "texture": "#top"}, "west": {"uv": [10, 3, 12, 4], "texture": "#top"}, - "down": { - "uv": [10, 3, 12, 4], - "texture": "#top", - "rotation": 270 - } + "down": {"uv": [10, 3, 12, 4], "rotation": 270, "texture": "#top"} } }, { - "name": "cube", "from": [0, 10, 4], "to": [3, 12, 5], "faces": { "east": {"uv": [11, 4, 12, 6], "texture": "#top"}, - "south": { - "uv": [2, 4, 5, 6], - "texture": "#top", - "rotation": 180 - }, - "west": { - "uv": [4, 4, 5, 6], - "texture": "#top", - "rotation": 180 - }, + "south": {"uv": [2, 4, 5, 6], "rotation": 180, "texture": "#top"}, + "west": {"uv": [4, 4, 5, 6], "rotation": 180, "texture": "#top"}, "down": {"uv": [4, 5, 5, 6], "texture": "#top"} } }, { - "name": "cube", "from": [0, 10, 11], "to": [3, 12, 12], "faces": { - "north": { - "uv": [11, 4, 14, 6], - "texture": "#top", - "rotation": 180 - }, + "north": {"uv": [11, 4, 14, 6], "rotation": 180, "texture": "#top"}, "east": {"uv": [5, 4, 4, 6], "texture": "#top"}, "west": {"uv": [11, 4, 12, 6], "texture": "#top"}, "down": {"uv": [11, 5, 12, 6], "texture": "#top"} } } - ], - "groups": [0, 1, 2, 3, 4, 5, 6, 7] + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/block/jungle_door_top_rh.json b/src/main/resources/assets/minecraft/models/block/jungle_door_top_rh.json index c655c7d..5fa5cad 100644 --- a/src/main/resources/assets/minecraft/models/block/jungle_door_top_rh.json +++ b/src/main/resources/assets/minecraft/models/block/jungle_door_top_rh.json @@ -1,120 +1,82 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "parent": "block/door_top", - "textures": {"top": "blocks/door_jungle_upper"}, + "textures": { + "top": "blocks/door_jungle_upper" + }, "elements": [ { - "name": "cube", "from": [0, 0, 0], "to": [3, 16, 4], "faces": { - "north": {"uv": [16, 0, 12, 16], "texture": "#top"}, + "north": {"uv": [16, 0, 13, 16], "texture": "#top"}, "east": {"uv": [12, 0, 16, 16], "texture": "#top"}, "south": {"uv": [15, 0, 12, 16], "texture": "#top"}, "west": {"uv": [16, 0, 12, 16], "texture": "#top"}, - "up": { - "uv": [12, 3, 16, 0], - "texture": "#top", - "rotation": 270 - } + "up": {"uv": [12, 3, 16, 0], "rotation": 270, "texture": "#top"} } }, { - "name": "cube", "from": [0, 0, 12], "to": [3, 16, 16], "faces": { "north": {"uv": [4, 0, 1, 16], "texture": "#top"}, "east": {"uv": [0, 0, 4, 16], "texture": "#top"}, - "south": {"uv": [3, 0, 0, 16], "texture": "#top"}, + "south": {"uv": [0, 0, 3, 16], "texture": "#top"}, "west": {"uv": [4, 0, 0, 16], "texture": "#top"}, - "up": { - "uv": [0, 3, 4, 0], - "texture": "#top", - "rotation": 270 - } + "up": {"uv": [0, 3, 4, 0], "rotation": 270, "texture": "#top"} } }, { - "name": "cube", "from": [0, 0, 4], "to": [3, 6, 12], "faces": { "east": {"uv": [4, 10, 12, 16], "texture": "#top"}, "west": {"uv": [12, 10, 4, 16], "texture": "#top"}, - "up": { - "uv": [4, 13, 12, 10], - "texture": "#top", - "rotation": 270 - } + "up": {"uv": [4, 13, 12, 10], "rotation": 270, "texture": "#top"} } }, { - "name": "cube", "from": [0, 13, 4], "to": [3, 16, 12], "faces": { "east": {"uv": [4, 0, 12, 3], "texture": "#top"}, "west": {"uv": [12, 0, 4, 3], "texture": "#top"}, - "up": { - "uv": [4, 3, 12, 0], - "texture": "#top", - "rotation": 270 - }, - "down": { - "uv": [4, 3, 12, 0], - "texture": "#top", - "rotation": 90 - } + "up": {"uv": [4, 3, 12, 0], "rotation": 270, "texture": "#top"}, + "down": {"uv": [4, 3, 12, 0], "rotation": 90, "texture": "#top"} } }, { - "name": "cube", "from": [0, 12, 10], "to": [3, 13, 12], "faces": { "north": {"uv": [6, 3, 3, 4], "texture": "#top"}, "east": {"uv": [12, 3, 10, 4], "texture": "#top"}, "west": {"uv": [6, 3, 4, 4], "texture": "#top"}, - "down": { - "uv": [4, 4, 6, 3], - "texture": "#top", - "rotation": 90 - } + "down": {"uv": [4, 4, 6, 3], "rotation": 90, "texture": "#top"} } }, { - "name": "cube", "from": [0, 12, 4], "to": [3, 13, 6], "faces": { "east": {"uv": [6, 3, 4, 4], "texture": "#top"}, "south": {"uv": [6, 3, 3, 4], "texture": "#top"}, "west": {"uv": [12, 3, 10, 4], "texture": "#top"}, - "down": { - "uv": [10, 4, 12, 3], - "texture": "#top", - "rotation": 270 - } + "down": {"uv": [10, 4, 12, 3], "rotation": 270, "texture": "#top"} } }, { - "name": "cube", "from": [0, 10, 11], "to": [3, 12, 12], "faces": { "north": {"uv": [5, 4, 2, 6], "texture": "#top"}, "east": {"uv": [12, 4, 11, 6], "texture": "#top"}, - "west": { - "uv": [5, 4, 4, 6], - "texture": "#top", - "rotation": 180 - }, + "west": {"uv": [5, 4, 4, 6], "rotation": 180, "texture": "#top"}, "down": {"uv": [4, 6, 5, 5], "texture": "#top"} } }, { - "name": "cube", "from": [0, 10, 4], "to": [3, 12, 5], "faces": { @@ -124,6 +86,5 @@ "down": {"uv": [11, 6, 12, 5], "texture": "#top"} } } - ], - "groups": [0, 1, 2, 3, 4, 5, 6, 7] + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/block/ladder.json b/src/main/resources/assets/minecraft/models/block/ladder.json index ed9bab0..e4aaafc 100644 --- a/src/main/resources/assets/minecraft/models/block/ladder.json +++ b/src/main/resources/assets/minecraft/models/block/ladder.json @@ -1,62 +1,36 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", + "ambientocclusion": false, "textures": { "0": "blocks/ladder", "particle": "blocks/ladder" }, "elements": [ { - "name": "cube", "from": [12, 0, 15], "to": [14, 16, 16], "faces": { "north": {"uv": [2, 0, 4, 16], "texture": "#0"}, "east": {"uv": [2, 0, 3, 16], "texture": "#0"}, - "south": { - "uv": [2, 0, 4, 16], - "texture": "#0", - "rotation": 180 - }, + "south": {"uv": [2, 0, 4, 16], "rotation": 180, "texture": "#0"}, "west": {"uv": [3, 0, 4, 16], "texture": "#0"}, - "up": { - "uv": [12, 0, 14, 1], - "texture": "#0", - "rotation": 180 - }, - "down": { - "uv": [2, 15, 4, 16], - "texture": "#0", - "rotation": 180 - } + "up": {"uv": [12, 0, 14, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2, 15, 4, 16], "rotation": 180, "texture": "#0"} } }, { - "name": "cube", "from": [2, 0, 15], "to": [4, 16, 16], "faces": { "north": {"uv": [12, 0, 14, 16], "texture": "#0"}, "east": {"uv": [12, 0, 13, 16], "texture": "#0"}, - "south": { - "uv": [2, 0, 4, 16], - "texture": "#0", - "rotation": 180 - }, + "south": {"uv": [2, 0, 4, 16], "rotation": 180, "texture": "#0"}, "west": {"uv": [13, 0, 14, 16], "texture": "#0"}, - "up": { - "uv": [2, 0, 4, 1], - "texture": "#0", - "rotation": 180 - }, - "down": { - "uv": [12, 15, 14, 16], - "texture": "#0", - "rotation": 180 - } + "up": {"uv": [2, 0, 4, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [12, 15, 14, 16], "rotation": 180, "texture": "#0"} } }, { - "name": "cube", "from": [1, 5, 14], "to": [15, 7, 15], "faces": { @@ -69,7 +43,6 @@ } }, { - "name": "cube", "from": [1, 9, 14], "to": [15, 11, 15], "faces": { @@ -82,7 +55,6 @@ } }, { - "name": "cube", "from": [1, 13, 14], "to": [15, 15, 15], "faces": { @@ -95,7 +67,6 @@ } }, { - "name": "cube", "from": [1, 1, 14], "to": [15, 3, 15], "faces": { @@ -107,7 +78,5 @@ "down": {"uv": [1, 14, 15, 15], "texture": "#0"} } } - ], - "groups": [0, 1, 2, 3, 4, 5], - "ambientocclusion": false + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/block/rail_curved.json b/src/main/resources/assets/minecraft/models/block/rail_curved.json index f936455..8a53483 100644 --- a/src/main/resources/assets/minecraft/models/block/rail_curved.json +++ b/src/main/resources/assets/minecraft/models/block/rail_curved.json @@ -1,1030 +1,433 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "textures": { "0": "blocks/rail_normal_turned", "particle": "blocks/rail_normal_turned" }, "elements": [ { - "name": "cube", - "from": [2, 1, 12], - "to": [4, 2, 16], + "from": [8, 1, 4], + "to": [10, 2, 6], "faces": { - "north": { - "uv": [2, 12, 3, 14], - "texture": "#0", - "rotation": 180 - }, - "east": {"uv": [3, 12, 4, 16], "texture": "#0"}, - "south": {"uv": [5, 7, 7, 8], "texture": "#0"}, - "west": {"uv": [2, 12, 3, 16], "texture": "#0"}, - "up": {"uv": [2, 12, 4, 16], "texture": "#0"}, - "down": {"uv": [2, 12, 4, 16], "texture": "#0"} + "north": {"uv": [8, 4, 10, 5], "texture": "#0"}, + "east": {"uv": [8, 5, 10, 6], "texture": "#0"}, + "south": {"uv": [8, 5, 10, 6], "texture": "#0"}, + "west": {"uv": [8, 4, 10, 5], "texture": "#0"}, + "up": {"uv": [8, 4, 10, 6], "texture": "#0"}, + "down": {"uv": [4, 8, 6, 10], "rotation": 270, "texture": "#0"} } }, { - "name": "cube", - "from": [3, 1, 10], - "to": [5, 2, 12], + "from": [7, 1, 5], + "to": [8, 2, 6], "faces": { - "north": {"uv": [8, 4, 10, 5], "texture": "#0"}, - "east": { - "uv": [5, 8, 6, 10], - "texture": "#0", - "rotation": 90 - }, - "south": {"uv": [10, 4, 12, 5], "texture": "#0"}, - "west": {"uv": [12, 2, 14, 3], "texture": "#0"}, - "up": {"uv": [3, 10, 5, 12], "texture": "#0"}, - "down": { - "uv": [8, 4, 10, 6], - "texture": "#0", - "rotation": 270 - } + "north": {"uv": [6, 6, 7, 7], "texture": "#0"}, + "west": {"uv": [6, 6, 7, 7], "texture": "#0"}, + "up": {"uv": [7, 5, 8, 6], "texture": "#0"}, + "down": {"uv": [5, 7, 6, 8], "texture": "#0"} } }, { - "name": "cube", - "from": [4, 1, 8], - "to": [6, 2, 10], + "from": [12, 1, 2], + "to": [16, 2, 4], "faces": { - "north": {"uv": [12, 2, 14, 3], "texture": "#0"}, - "east": { - "uv": [5, 8, 6, 10], - "texture": "#0", - "rotation": 90 - }, - "south": {"uv": [8, 5, 10, 6], "texture": "#0"}, - "west": {"uv": [10, 3, 12, 4], "texture": "#0"}, - "up": {"uv": [4, 8, 6, 10], "texture": "#0"}, - "down": { - "uv": [8, 4, 10, 6], - "texture": "#0", - "rotation": 270 - } + "north": {"uv": [12, 2, 16, 3], "texture": "#0"}, + "east": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#0", "cullface": "east"}, + "south": {"uv": [12, 3, 16, 4], "texture": "#0"}, + "west": {"uv": [8, 4, 10, 5], "texture": "#0"}, + "up": {"uv": [12, 2, 16, 4], "texture": "#0"}, + "down": {"uv": [2, 12, 4, 16], "rotation": 270, "texture": "#0"} } }, { - "name": "cube", "from": [5, 1, 7], "to": [7, 2, 8], "faces": { - "north": {"uv": [8, 4, 10, 5], "texture": "#0"}, - "east": {"uv": [6, 7, 7, 8], "texture": "#0"}, + "north": {"uv": [4, 8, 5, 10], "texture": "#0"}, + "east": {"uv": [7, 6, 8, 7], "texture": "#0"}, "south": {"uv": [8, 5, 10, 6], "texture": "#0"}, - "west": {"uv": [10, 3, 11, 4], "texture": "#0"}, + "west": {"uv": [5, 7, 6, 8], "texture": "#0"}, "up": {"uv": [5, 7, 7, 8], "texture": "#0"}, - "down": { - "uv": [6, 6, 7, 8], - "texture": "#0", - "rotation": 270 - } + "down": {"uv": [7, 5, 8, 7], "rotation": 270, "texture": "#0"} } }, { - "name": "cube", - "from": [6, 1, 6], - "to": [8, 2, 7], - "faces": { - "north": {"uv": [10, 3, 12, 4], "texture": "#0"}, - "east": {"uv": [6, 7, 7, 8], "texture": "#0"}, - "south": {"uv": [10, 4, 12, 5], "texture": "#0"}, - "west": {"uv": [4, 8, 5, 10], "texture": "#0"}, - "up": {"uv": [6, 6, 8, 7], "texture": "#0"}, - "down": { - "uv": [6, 6, 7, 8], - "texture": "#0", - "rotation": 270 - } - } - }, - { - "name": "cube", - "from": [7, 1, 5], - "to": [8, 2, 6], + "from": [2, 1, 12], + "to": [4, 2, 16], "faces": { - "north": {"uv": [10, 3, 11, 4], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#missing"}, - "south": { - "uv": [0, 0, 1, 1], - "texture": "#missing" - }, - "west": {"uv": [2, 12, 3, 15], "texture": "#0"}, - "up": { - "uv": [7, 5, 8, 6], - "texture": "#0", - "rotation": 270 - }, - "down": { - "uv": [4, 8, 5, 9], - "texture": "#0", - "rotation": 90 - } + "north": {"uv": [3, 10, 4, 12], "texture": "#0"}, + "east": {"uv": [12, 3, 16, 4], "texture": "#0"}, + "south": {"uv": [4, 8, 6, 9], "texture": "#0", "cullface": "south"}, + "west": {"uv": [2, 12, 3, 16], "texture": "#0"}, + "up": {"uv": [2, 12, 4, 16], "texture": "#0"}, + "down": {"uv": [12, 2, 16, 4], "rotation": 270, "texture": "#0"} } }, { - "name": "cube", - "from": [8, 1, 4], - "to": [10, 2, 6], + "from": [3, 1, 10], + "to": [5, 2, 12], "faces": { - "north": {"uv": [10, 3, 12, 4], "texture": "#0"}, - "east": { - "uv": [8, 5, 10, 6], - "texture": "#0", - "rotation": 90 - }, - "south": {"uv": [12, 3, 14, 4], "texture": "#0"}, - "west": {"uv": [8, 4, 10, 5], "texture": "#0"}, - "up": {"uv": [10, 3, 12, 5], "texture": "#0"}, - "down": { - "uv": [8, 4, 10, 6], - "texture": "#0", - "rotation": 180 - } + "north": {"uv": [4, 8, 5, 10], "texture": "#0"}, + "east": {"uv": [8, 5, 10, 6], "texture": "#0"}, + "south": {"uv": [10, 4, 12, 5], "texture": "#0"}, + "west": {"uv": [3, 10, 4, 12], "texture": "#0"}, + "up": {"uv": [3, 10, 5, 12], "texture": "#0"}, + "down": {"uv": [10, 3, 12, 5], "rotation": 270, "texture": "#0"} } }, { - "name": "cube", - "from": [10, 1, 3], - "to": [12, 2, 5], + "from": [4, 1, 8], + "to": [6, 2, 10], "faces": { - "north": {"uv": [10, 3, 12, 4], "texture": "#0"}, + "north": {"uv": [4, 8, 5, 10], "texture": "#0"}, "east": {"uv": [8, 5, 10, 6], "texture": "#0"}, "south": {"uv": [8, 5, 10, 6], "texture": "#0"}, - "west": {"uv": [8, 4, 10, 5], "texture": "#0"}, - "up": {"uv": [10, 3, 12, 5], "texture": "#0"}, - "down": { - "uv": [8, 4, 10, 6], - "texture": "#0", - "rotation": 180 - } + "west": {"uv": [4, 8, 5, 10], "texture": "#0"}, + "up": {"uv": [4, 8, 6, 10], "texture": "#0"}, + "down": {"uv": [8, 4, 10, 6], "rotation": 270, "texture": "#0"} } }, { - "name": "cube", - "from": [12, 1, 2], - "to": [16, 2, 4], + "from": [14, 1, 12], + "to": [16, 2, 14], "faces": { - "north": {"uv": [12, 2, 16, 3], "texture": "#0"}, - "east": { - "uv": [3, 10, 5, 11], - "texture": "#0", - "rotation": 180 - }, - "south": {"uv": [12, 3, 16, 4], "texture": "#0"}, - "west": { - "uv": [2, 12, 3, 14], - "texture": "#0", - "rotation": 90 - }, - "up": {"uv": [12, 2, 16, 4], "texture": "#0"}, - "down": { - "uv": [2, 12, 4, 16], - "texture": "#0", - "rotation": 270 - } + "north": {"uv": [8, 5, 10, 6], "texture": "#0"}, + "east": {"uv": [2, 12, 4, 13], "texture": "#0", "cullface": "east"}, + "south": {"uv": [8, 4, 10, 5], "texture": "#0"}, + "west": {"uv": [8, 5, 10, 6], "texture": "#0"}, + "up": {"uv": [14, 12, 16, 14], "texture": "#0"} } }, { - "name": "cube", "from": [12, 1, 14], "to": [14, 2, 16], "faces": { "north": {"uv": [10, 4, 12, 5], "texture": "#0"}, - "east": {"uv": [12, 2, 14, 3], "texture": "#0"}, - "south": {"uv": [12, 15, 14, 16], "texture": "#0"}, + "east": {"uv": [8, 4, 10, 5], "texture": "#0"}, + "south": {"uv": [2, 12, 4, 13], "rotation": 180, "texture": "#0", "cullface": "south"}, "west": {"uv": [8, 5, 10, 6], "texture": "#0"}, - "up": { - "uv": [4, 8, 6, 10], - "texture": "#0", - "rotation": 180 - }, - "down": { - "uv": [14, 12, 16, 14], - "texture": "#0", - "rotation": 270 - } + "up": {"uv": [12, 14, 14, 16], "texture": "#0"} } }, { - "name": "cube", - "from": [14, 1, 12], - "to": [16, 2, 14], - "faces": { - "north": {"uv": [10, 4, 12, 5], "texture": "#0"}, - "east": {"uv": [4, 8, 6, 9], "texture": "#0"}, - "south": {"uv": [10, 3, 12, 4], "texture": "#0"}, - "west": {"uv": [8, 5, 10, 6], "texture": "#0"}, - "up": {"uv": [14, 12, 16, 14], "texture": "#0"}, - "down": {"uv": [8, 4, 10, 6], "texture": "#0"} - } - }, - { - "name": "cube", "from": [13, 1, 13], "to": [14, 2, 14], "faces": { - "north": {"uv": [6, 7, 7, 8], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#missing"}, - "south": { - "uv": [0, 0, 1, 1], - "texture": "#missing" - }, + "north": {"uv": [7, 6, 8, 7], "texture": "#0"}, "west": {"uv": [7, 6, 8, 7], "texture": "#0"}, - "up": { - "uv": [13, 13, 14, 14], - "texture": "#0", - "rotation": 270 - }, - "down": { - "uv": [13, 13, 14, 14], - "texture": "#0", - "rotation": 90 - } + "up": {"uv": [13, 13, 14, 14], "texture": "#0"} } }, { - "name": "cube", - "from": [1, 0, 11], - "to": [3, 1, 13], + "from": [10, 1, 3], + "to": [12, 2, 5], "faces": { - "north": { - "uv": [12, 5, 14, 6], - "texture": "#0", - "rotation": 180 - }, - "east": { - "uv": [12, 4, 14, 6], - "texture": "#0", - "rotation": 180 - }, - "south": { - "uv": [12, 5, 14, 6], - "texture": "#0", - "rotation": 180 - }, - "west": { - "uv": [12, 5, 14, 6], - "texture": "#0", - "rotation": 180 - }, - "up": { - "uv": [12, 4, 14, 6], - "texture": "#0", - "rotation": 90 - }, - "down": { - "uv": [12, 4, 14, 6], - "texture": "#0", - "rotation": 270 - } + "north": {"uv": [8, 4, 10, 5], "texture": "#0"}, + "east": {"uv": [8, 5, 10, 6], "texture": "#0"}, + "south": {"uv": [8, 5, 10, 6], "texture": "#0"}, + "west": {"uv": [8, 4, 10, 5], "texture": "#0"}, + "up": {"uv": [10, 3, 12, 5], "texture": "#0"}, + "down": {"uv": [3, 10, 5, 12], "rotation": 270, "texture": "#0"} } }, { - "name": "cube", - "from": [4, 0, 12], - "to": [7, 1, 14], + "from": [6, 1, 6], + "to": [8, 2, 7], "faces": { - "north": { - "uv": [7, 14, 10, 15], - "texture": "#0", - "rotation": 180 - }, - "east": { - "uv": [12, 4, 14, 7], - "texture": "#0", - "rotation": 180 - }, - "south": { - "uv": [7, 14, 10, 15], - "texture": "#0", - "rotation": 180 - }, - "west": { - "uv": [12, 4, 14, 7], - "texture": "#0", - "rotation": 180 - }, - "up": { - "uv": [12, 4, 14, 7], - "texture": "#0", - "rotation": 90 - }, - "down": { - "uv": [12, 4, 14, 7], - "texture": "#0", - "rotation": 270 - } + "north": {"uv": [10, 3, 12, 4], "texture": "#0"}, + "east": {"uv": [7, 6, 8, 7], "texture": "#0"}, + "south": {"uv": [8, 5, 10, 6], "texture": "#0"}, + "west": {"uv": [6, 6, 7, 7], "texture": "#0"}, + "up": {"uv": [6, 6, 8, 7], "texture": "#0"} } }, { - "name": "cube", - "from": [7, 0, 13], - "to": [10, 1, 15], + "from": [5, 0, 5], + "to": [7, 1, 7], "faces": { - "north": { - "uv": [7, 14, 10, 15], - "texture": "#0", - "rotation": 180 - }, - "east": { - "uv": [13, 7, 15, 10], - "texture": "#0", - "rotation": 180 - }, - "south": { - "uv": [7, 14, 10, 15], - "texture": "#0", - "rotation": 180 - }, - "west": { - "uv": [13, 7, 15, 10], - "texture": "#0", - "rotation": 180 - }, - "up": { - "uv": [13, 7, 15, 10], - "texture": "#0", - "rotation": 90 - }, - "down": { - "uv": [13, 7, 15, 10], - "texture": "#0", - "rotation": 270 - } + "north": {"uv": [11, 1, 13, 2], "texture": "#0"}, + "east": {"uv": [11, 1, 13, 2], "texture": "#0"}, + "south": {"uv": [11, 1, 13, 2], "texture": "#0"}, + "west": {"uv": [11, 1, 13, 2], "texture": "#0"}, + "up": {"uv": [7, 7, 9, 9], "texture": "#0"}, + "down": {"uv": [7, 7, 9, 9], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", "from": [10, 0, 14], "to": [13, 1, 16], "faces": { - "north": { - "uv": [14, 7, 15, 10], - "texture": "#0", - "rotation": 90 - }, - "east": { - "uv": [13, 7, 15, 10], - "texture": "#0", - "rotation": 180 - }, - "south": { - "uv": [7, 14, 10, 15], - "texture": "#0", - "rotation": 180 - }, - "west": { - "uv": [13, 7, 15, 10], - "texture": "#0", - "rotation": 180 - }, - "up": { - "uv": [13, 7, 15, 10], - "texture": "#0", - "rotation": 90 - }, - "down": { - "uv": [13, 7, 15, 10], - "texture": "#0", - "rotation": 270 - } + "north": {"uv": [7, 13, 10, 14], "texture": "#0"}, + "south": {"uv": [7, 13, 10, 14], "texture": "#0", "cullface": "south"}, + "west": {"uv": [11, 1, 13, 2], "texture": "#0"}, + "up": {"uv": [7, 13, 10, 15], "texture": "#0"}, + "down": {"uv": [7, 13, 10, 15], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", "from": [14, 0, 10], "to": [16, 1, 13], "faces": { - "north": { - "uv": [13, 9, 15, 10], - "texture": "#0", - "rotation": 180 - }, - "east": { - "uv": [7, 14, 10, 15], - "texture": "#0", - "rotation": 90 - }, - "south": { - "uv": [13, 7, 15, 10], - "texture": "#0", - "rotation": 90 - }, - "west": { - "uv": [7, 14, 10, 15], - "texture": "#0", - "rotation": 90 - }, + "north": {"uv": [7, 7, 9, 8], "texture": "#0"}, + "east": {"uv": [7, 13, 10, 14], "texture": "#0", "cullface": "east"}, + "west": {"uv": [7, 13, 10, 14], "texture": "#0"}, "up": {"uv": [13, 7, 15, 10], "texture": "#0"}, - "down": { - "uv": [13, 7, 15, 10], - "texture": "#0", - "rotation": 180 - } + "down": {"uv": [13, 7, 15, 10], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", - "from": [13, 0, 7], - "to": [15, 1, 10], + "from": [7, 0, 13], + "to": [10, 1, 15], "faces": { - "north": { - "uv": [7, 14, 9, 15], - "texture": "#0", - "rotation": 180 - }, - "east": { - "uv": [7, 14, 10, 15], - "texture": "#0", - "rotation": 180 - }, - "south": { - "uv": [7, 13, 10, 15], - "texture": "#0", - "rotation": 180 - }, - "west": { - "uv": [7, 14, 10, 15], - "texture": "#0", - "rotation": 180 - }, - "up": { - "uv": [7, 13, 10, 15], - "texture": "#0", - "rotation": 90 - }, - "down": { - "uv": [7, 13, 10, 15], - "texture": "#0", - "rotation": 270 - } + "north": {"uv": [7, 13, 10, 14], "texture": "#0"}, + "east": {"uv": [11, 1, 13, 2], "texture": "#0"}, + "south": {"uv": [7, 13, 10, 14], "texture": "#0"}, + "west": {"uv": [11, 1, 13, 2], "texture": "#0"}, + "up": {"uv": [7, 13, 10, 15], "texture": "#0"}, + "down": {"uv": [7, 13, 10, 15], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", - "from": [12, 0, 4], - "to": [14, 1, 7], + "from": [13, 0, 7], + "to": [15, 1, 10], "faces": { - "north": { - "uv": [4, 12, 7, 14], - "texture": "#0", - "rotation": 180 - }, - "east": { - "uv": [4, 13, 7, 14], - "texture": "#0", - "rotation": 180 - }, - "south": { - "uv": [4, 13, 6, 14], - "texture": "#0", - "rotation": 180 - }, - "west": { - "uv": [4, 13, 7, 14], - "texture": "#0", - "rotation": 180 - }, - "up": { - "uv": [4, 12, 7, 14], - "texture": "#0", - "rotation": 90 - }, - "down": { - "uv": [4, 12, 7, 14], - "texture": "#0", - "rotation": 270 - } + "north": {"uv": [5, 5, 7, 6], "texture": "#0"}, + "east": {"uv": [7, 13, 10, 14], "texture": "#0"}, + "south": {"uv": [9, 9, 11, 10], "texture": "#0"}, + "west": {"uv": [7, 13, 10, 14], "texture": "#0"}, + "up": {"uv": [13, 7, 15, 10], "texture": "#0"}, + "down": {"uv": [13, 7, 15, 10], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", - "from": [11, 0, 1], - "to": [13, 1, 3], + "from": [9, 0, 9], + "to": [11, 1, 11], "faces": { - "north": { - "uv": [4, 13, 6, 14], - "texture": "#0", - "rotation": 180 - }, - "east": { - "uv": [4, 13, 6, 14], - "texture": "#0", - "rotation": 180 - }, - "south": { - "uv": [4, 12, 6, 14], - "texture": "#0", - "rotation": 180 - }, - "west": { - "uv": [4, 13, 6, 14], - "texture": "#0", - "rotation": 180 - }, - "up": { - "uv": [4, 12, 6, 14], - "texture": "#0", - "rotation": 90 - }, - "down": { - "uv": [4, 12, 6, 14], - "texture": "#0", - "rotation": 270 - } + "north": {"uv": [12, 1, 14, 2], "texture": "#0"}, + "east": {"uv": [11, 1, 13, 2], "texture": "#0"}, + "south": {"uv": [11, 1, 13, 2], "texture": "#0"}, + "west": {"uv": [11, 1, 13, 2], "texture": "#0"}, + "up": {"uv": [10, 10, 12, 12], "texture": "#0"}, + "down": {"uv": [10, 10, 12, 12], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", - "from": [9, 0, 9], - "to": [11, 1, 11], + "from": [1, 0, 11], + "to": [3, 1, 13], "faces": { - "north": {"uv": [10, 11, 12, 12], "texture": "#0"}, - "east": {"uv": [10, 11, 12, 12], "texture": "#0"}, - "south": {"uv": [10, 11, 12, 12], "texture": "#0"}, - "west": {"uv": [10, 11, 12, 12], "texture": "#0"}, - "up": { - "uv": [10, 10, 12, 12], - "texture": "#0", - "rotation": 270 - }, - "down": { - "uv": [10, 10, 12, 12], - "texture": "#0", - "rotation": 90 - } + "north": {"uv": [1, 11, 3, 12], "texture": "#0"}, + "south": {"uv": [11, 1, 13, 2], "texture": "#0"}, + "west": {"uv": [11, 1, 13, 2], "texture": "#0"}, + "up": {"uv": [4, 12, 6, 14], "texture": "#0"}, + "down": {"uv": [4, 12, 6, 14], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", - "from": [10, 0, 11], - "to": [11, 1, 12], + "from": [12, 0, 4], + "to": [14, 1, 7], "faces": { - "north": {"uv": [10, 11, 12, 12], "texture": "#0"}, - "east": {"uv": [10, 11, 12, 12], "texture": "#0"}, - "south": {"uv": [10, 11, 11, 12], "texture": "#0"}, - "west": {"uv": [10, 11, 11, 12], "texture": "#0"}, - "up": { - "uv": [10, 11, 11, 12], - "texture": "#0", - "rotation": 270 - }, - "down": { - "uv": [10, 11, 11, 12], - "texture": "#0", - "rotation": 90 - } + "east": {"uv": [4, 13, 7, 14], "rotation": 180, "texture": "#0"}, + "south": {"uv": [5, 12, 7, 13], "texture": "#0"}, + "west": {"uv": [4, 12, 7, 13], "texture": "#0"}, + "up": {"uv": [12, 4, 14, 7], "texture": "#0"}, + "down": {"uv": [12, 4, 14, 7], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", - "from": [8, 0, 9], - "to": [9, 1, 10], + "from": [11, 0, 1], + "to": [13, 1, 3], "faces": { - "north": {"uv": [8, 9, 10, 10], "texture": "#0"}, - "east": {"uv": [8, 9, 10, 10], "texture": "#0"}, - "south": {"uv": [8, 9, 9, 10], "texture": "#0"}, - "west": {"uv": [8, 9, 9, 10], "texture": "#0"}, - "up": { - "uv": [8, 9, 9, 10], - "texture": "#0", - "rotation": 270 - }, - "down": { - "uv": [8, 8, 10, 10], - "texture": "#0", - "rotation": 90 - } + "north": {"uv": [7, 7, 9, 8], "texture": "#0"}, + "east": {"uv": [12, 5, 14, 6], "rotation": 180, "texture": "#0"}, + "west": {"uv": [7, 7, 9, 8], "texture": "#0"}, + "up": {"uv": [12, 4, 14, 6], "texture": "#0"}, + "down": {"uv": [12, 4, 14, 6], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", "from": [11, 0, 11], "to": [13, 1, 13], "faces": { - "north": {"uv": [11, 12, 13, 13], "texture": "#0"}, - "east": {"uv": [11, 12, 13, 13], "texture": "#0"}, - "south": {"uv": [11, 12, 13, 13], "texture": "#0"}, - "west": {"uv": [11, 12, 13, 13], "texture": "#0"}, - "up": { - "uv": [11, 11, 13, 13], - "texture": "#0", - "rotation": 270 - }, - "down": { - "uv": [11, 11, 13, 13], - "texture": "#0", - "rotation": 90 - } + "north": {"uv": [11, 1, 13, 2], "texture": "#0"}, + "east": {"uv": [11, 1, 13, 2], "texture": "#0"}, + "south": {"uv": [11, 1, 13, 2], "texture": "#0"}, + "west": {"uv": [11, 1, 13, 2], "texture": "#0"}, + "up": {"uv": [10, 10, 12, 12], "texture": "#0"}, + "down": {"uv": [10, 10, 12, 12], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", - "from": [12, 0, 12], - "to": [14, 1, 14], + "from": [10, 0, 11], + "to": [11, 1, 12], "faces": { - "north": { - "uv": [11, 12, 13, 13], - "texture": "#0", - "rotation": 180 - }, - "east": { - "uv": [11, 11, 13, 13], - "texture": "#0", - "rotation": 180 - }, - "south": { - "uv": [11, 11, 13, 13], - "texture": "#0", - "rotation": 180 - }, - "west": { - "uv": [11, 12, 13, 13], - "texture": "#0", - "rotation": 180 - }, - "up": { - "uv": [11, 11, 13, 13], - "texture": "#0", - "rotation": 90 - }, - "down": { - "uv": [11, 11, 13, 13], - "texture": "#0", - "rotation": 270 - } + "south": {"uv": [11, 1, 12, 2], "texture": "#0"}, + "west": {"uv": [11, 1, 12, 2], "texture": "#0"}, + "up": {"uv": [9, 10, 10, 11], "texture": "#0"}, + "down": {"uv": [9, 10, 10, 11], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", - "from": [7, 0, 7], - "to": [9, 1, 9], + "from": [8, 0, 9], + "to": [9, 1, 10], "faces": { - "north": { - "uv": [7, 8, 9, 9], - "texture": "#0", - "rotation": 180 - }, - "east": { - "uv": [7, 8, 9, 9], - "texture": "#0", - "rotation": 180 - }, - "south": { - "uv": [8, 8, 9, 9], - "texture": "#0", - "rotation": 180 - }, - "west": { - "uv": [7, 7, 9, 9], - "texture": "#0", - "rotation": 180 - }, - "up": { - "uv": [7, 7, 9, 9], - "texture": "#0", - "rotation": 90 - }, - "down": { - "uv": [7, 7, 9, 9], - "texture": "#0", - "rotation": 270 - } + "south": {"uv": [11, 1, 12, 2], "texture": "#0"}, + "west": {"uv": [11, 1, 12, 2], "texture": "#0"}, + "up": {"uv": [8, 9, 9, 10], "texture": "#0"}, + "down": {"uv": [8, 9, 9, 10], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", - "from": [6, 0, 7], - "to": [7, 1, 8], + "from": [7, 0, 7], + "to": [9, 1, 9], "faces": { - "north": { - "uv": [7, 8, 9, 9], - "texture": "#0", - "rotation": 180 - }, - "east": { - "uv": [7, 8, 9, 9], - "texture": "#0", - "rotation": 180 - }, - "south": { - "uv": [8, 8, 9, 9], - "texture": "#0", - "rotation": 180 - }, - "west": { - "uv": [7, 8, 8, 9], - "texture": "#0", - "rotation": 180 - }, - "up": { - "uv": [7, 8, 8, 9], - "texture": "#0", - "rotation": 90 - }, - "down": { - "uv": [7, 8, 8, 9], - "texture": "#0", - "rotation": 270 - } + "north": {"uv": [11, 1, 13, 2], "texture": "#0"}, + "east": {"uv": [7, 7, 9, 8], "texture": "#0"}, + "south": {"uv": [11, 1, 13, 2], "texture": "#0"}, + "west": {"uv": [11, 1, 13, 2], "texture": "#0"}, + "up": {"uv": [8, 8, 10, 10], "texture": "#0"}, + "down": {"uv": [8, 8, 10, 10], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", - "from": [5, 0, 5], - "to": [7, 1, 7], + "from": [6, 0, 7], + "to": [7, 1, 8], "faces": { - "north": { - "uv": [7, 8, 9, 9], - "texture": "#0", - "rotation": 180 - }, - "east": { - "uv": [7, 8, 9, 9], - "texture": "#0", - "rotation": 180 - }, - "south": { - "uv": [8, 8, 9, 9], - "texture": "#0", - "rotation": 180 - }, - "west": { - "uv": [7, 8, 9, 9], - "texture": "#0", - "rotation": 180 - }, - "up": { - "uv": [7, 7, 9, 9], - "texture": "#0", - "rotation": 90 - }, - "down": { - "uv": [7, 7, 9, 9], - "texture": "#0", - "rotation": 270 - } + "south": {"uv": [11, 1, 12, 2], "texture": "#0"}, + "west": {"uv": [11, 1, 12, 2], "texture": "#0"}, + "down": {"uv": [7, 8, 8, 9], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", "from": [11, 0, 3], "to": [12, 1, 5], "faces": { - "north": { - "uv": [4, 12, 6, 13], - "texture": "#0", - "rotation": 180 - }, - "east": { - "uv": [4, 12, 6, 13], - "texture": "#0", - "rotation": 180 - }, - "south": { - "uv": [4, 13, 5, 14], - "texture": "#0", - "rotation": 180 - }, - "west": { - "uv": [4, 12, 6, 13], - "texture": "#0", - "rotation": 180 - }, - "up": { - "uv": [4, 12, 6, 13], - "texture": "#0", - "rotation": 90 - }, - "down": { - "uv": [4, 12, 6, 13], - "texture": "#0", - "rotation": 270 - } + "south": {"uv": [5, 5, 6, 6], "texture": "#0"}, + "west": {"uv": [11, 1, 13, 2], "texture": "#0"}, + "down": {"uv": [12, 4, 13, 6], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", "from": [3, 0, 11], "to": [5, 1, 12], "faces": { - "north": { - "uv": [12, 5, 14, 6], - "texture": "#0", - "rotation": 180 - }, - "east": { - "uv": [12, 4, 13, 6], - "texture": "#0", - "rotation": 180 - }, - "south": { - "uv": [12, 4, 13, 6], - "texture": "#0", - "rotation": 180 - }, - "west": { - "uv": [12, 4, 13, 6], - "texture": "#0", - "rotation": 180 - }, - "up": { - "uv": [12, 4, 13, 6], - "texture": "#0", - "rotation": 90 - }, - "down": { - "uv": [12, 4, 13, 6], - "texture": "#0", - "rotation": 270 - } + "north": {"uv": [11, 1, 13, 2], "texture": "#0"}, + "east": {"uv": [5, 5, 6, 6], "texture": "#0"}, + "down": {"uv": [5, 12, 7, 13], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", "from": [12, 0, 3], "to": [14, 1, 4], "faces": { - "north": {"uv": [4, 13, 6, 14], "texture": "#0"}, - "east": {"uv": [4, 13, 5, 14], "texture": "#0"}, - "south": {"uv": [4, 12, 5, 14], "texture": "#0"}, - "west": {"uv": [4, 12, 5, 14], "texture": "#0"}, - "up": { - "uv": [4, 12, 5, 14], - "texture": "#0", - "rotation": 270 - }, - "down": { - "uv": [4, 12, 5, 14], - "texture": "#0", - "rotation": 90 - } + "north": {"uv": [5, 12, 7, 13], "texture": "#0"}, + "east": {"uv": [7, 8, 8, 9], "texture": "#0"}, + "down": {"uv": [12, 4, 14, 5], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", "from": [3, 0, 12], "to": [4, 1, 14], "faces": { - "north": {"uv": [12, 4, 14, 5], "texture": "#0"}, - "east": {"uv": [12, 4, 14, 5], "texture": "#0"}, - "south": {"uv": [12, 4, 13, 5], "texture": "#0"}, - "west": {"uv": [12, 4, 14, 5], "texture": "#0"}, - "up": { - "uv": [12, 4, 14, 5], - "texture": "#0", - "rotation": 270 - }, - "down": { - "uv": [12, 4, 14, 5], - "texture": "#0", - "rotation": 90 - } + "south": {"uv": [5, 5, 6, 6], "texture": "#0"}, + "west": {"uv": [11, 1, 13, 2], "texture": "#0"}, + "down": {"uv": [6, 12, 7, 14], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", "from": [13, 0, 14], "to": [15, 1, 16], "faces": { - "north": {"uv": [8, 8, 10, 10], "texture": "#0"}, - "east": {"uv": [8, 9, 10, 10], "texture": "#0"}, - "south": {"uv": [8, 9, 10, 10], "texture": "#0"}, - "west": {"uv": [8, 8, 10, 10], "texture": "#0"}, - "up": { - "uv": [8, 8, 10, 10], - "texture": "#0", - "rotation": 270 - }, - "down": { - "uv": [8, 8, 10, 10], - "texture": "#0", - "rotation": 90 - } + "east": {"uv": [5, 12, 7, 13], "texture": "#0"}, + "south": {"uv": [11, 1, 13, 2], "texture": "#0", "cullface": "south"}, + "up": {"uv": [10, 14, 12, 16], "texture": "#0"}, + "down": {"uv": [10, 14, 12, 16], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", - "from": [14, 0, 13], - "to": [16, 1, 15], + "from": [7, 0, 6], + "to": [8, 1, 7], "faces": { - "north": {"uv": [10, 10, 12, 12], "texture": "#0"}, - "east": {"uv": [10, 11, 12, 12], "texture": "#0"}, - "south": {"uv": [10, 10, 12, 12], "texture": "#0"}, - "west": {"uv": [10, 10, 12, 12], "texture": "#0"}, - "up": { - "uv": [10, 10, 12, 12], - "texture": "#0", - "rotation": 270 - }, - "down": { - "uv": [8, 8, 10, 10], - "texture": "#0", - "rotation": 180 - } + "north": {"uv": [5, 5, 6, 6], "texture": "#0"}, + "east": {"uv": [5, 5, 6, 6], "texture": "#0"}, + "down": {"uv": [9, 8, 10, 9], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", - "from": [9, 0, 8], - "to": [10, 1, 9], + "from": [13, 0, 12], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [11, 1, 12, 2], "texture": "#0"}, + "up": {"uv": [12, 11, 13, 13], "texture": "#0"}, + "down": {"uv": [12, 11, 13, 13], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [12, 0, 13], + "to": [13, 1, 14], "faces": { - "north": {"uv": [7, 8, 8, 9], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#missing"}, - "south": { - "uv": [0, 0, 1, 1], - "texture": "#missing" - }, - "west": {"uv": [0, 0, 1, 1], "texture": "#missing"}, - "up": {"uv": [9, 8, 10, 9], "texture": "#0"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + "west": {"uv": [11, 1, 12, 2], "texture": "#0"}, + "up": {"uv": [12, 13, 13, 14], "texture": "#0"}, + "down": {"uv": [12, 13, 13, 14], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", "from": [11, 0, 10], "to": [12, 1, 11], "faces": { - "north": {"uv": [12, 11, 13, 12], "texture": "#0"}, - "east": {"uv": [10, 11, 11, 12], "texture": "#0"}, - "south": { - "uv": [0, 0, 1, 1], - "texture": "#missing" - }, - "west": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "north": {"uv": [5, 5, 6, 6], "texture": "#0"}, + "east": {"uv": [11, 1, 12, 2], "texture": "#0"}, "up": {"uv": [11, 10, 12, 11], "texture": "#0"}, - "down": {"uv": [9, 10, 10, 11], "texture": "#0"} + "down": {"uv": [11, 10, 12, 11], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", - "from": [7, 0, 6], - "to": [8, 1, 7], + "from": [14, 0, 13], + "to": [16, 1, 14], + "faces": { + "east": {"uv": [13, 5, 14, 6], "texture": "#0", "cullface": "east"}, + "down": {"uv": [14, 11, 16, 12], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [15, 0, 14], + "to": [16, 1, 15], "faces": { - "north": {"uv": [9, 8, 10, 9], "texture": "#0"}, - "east": {"uv": [8, 7, 9, 8], "texture": "#0"}, - "south": { - "uv": [0, 0, 1, 1], - "texture": "#missing" - }, - "west": {"uv": [0, 0, 1, 1], "texture": "#missing"}, - "up": {"uv": [9, 8, 10, 9], "texture": "#0"}, - "down": {"uv": [8, 9, 9, 10], "texture": "#0"} + "east": {"uv": [5, 5, 6, 6], "texture": "#0", "cullface": "east"}, + "south": {"uv": [5, 5, 6, 6], "texture": "#0"}, + "up": {"uv": [15, 11, 16, 12], "texture": "#0"}, + "down": {"uv": [15, 11, 16, 12], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [9, 0, 8], + "to": [10, 1, 9], + "faces": { + "north": {"uv": [5, 5, 6, 6], "texture": "#0"}, + "east": {"uv": [5, 5, 6, 6], "texture": "#0"}, + "up": {"uv": [10, 9, 11, 10], "texture": "#0"}, + "down": {"uv": [10, 9, 11, 10], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [4, 0, 12], + "to": [7, 1, 14], + "faces": { + "north": {"uv": [7, 13, 10, 14], "texture": "#0"}, + "east": {"uv": [11, 1, 13, 2], "texture": "#0"}, + "south": {"uv": [7, 13, 10, 14], "texture": "#0"}, + "up": {"uv": [7, 13, 10, 15], "texture": "#0"}, + "down": {"uv": [7, 13, 10, 15], "texture": "#0", "cullface": "down"} } } ], "groups": [ { "name": "track", - "origin": [8, 8, 8], - "isOpen": true, - "display": { - "visibility": true, - "export": true, - "autouv": true - }, - "children": [6, 5, 8, 3, 0, 1, 2, 10, 9, 11, 7, 4] + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] }, { "name": "supports", - "origin": [8, 8, 8], - "isOpen": true, - "display": { - "visibility": true, - "export": true, - "autouv": true - }, - "children": [ - 27, - 15, - 16, - 14, - 17, - 20, - 12, - 18, - 19, - 23, - 21, - 22, - 24, - 25, - 26, - 13 - ] - }, - 28, - 29, - 30, - 31, - 32, - 33, - 34, - 35, - 36 - ], - "display": { - "thirdperson_righthand": {"scale": [1, 1, 1]} - } + "children": [12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38] + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/block/rail_flat.json b/src/main/resources/assets/minecraft/models/block/rail_flat.json index d922bb0..dae3e41 100644 --- a/src/main/resources/assets/minecraft/models/block/rail_flat.json +++ b/src/main/resources/assets/minecraft/models/block/rail_flat.json @@ -1,451 +1,229 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "textures": { "0": "blocks/rail_normal", "particle": "blocks/rail_normal" }, "elements": [ { - "name": "cube", "from": [2, 0, 5], "to": [4, 1, 7], "faces": { "north": {"uv": [4, 1, 6, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, "south": {"uv": [4, 2, 6, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "up": { - "uv": [4, 1, 6, 3], - "texture": "#0", - "rotation": 90 - }, - "down": { - "uv": [4, 1, 6, 3], - "texture": "#0", - "rotation": 270 - } + "down": {"uv": [4, 1, 6, 3], "rotation": 270, "texture": "#0", "cullface": "down"} } }, { - "name": "cube", "from": [4, 0, 5], "to": [12, 1, 7], "faces": { "north": {"uv": [4, 2, 12, 3], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, "south": {"uv": [4, 2, 12, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "up": { - "uv": [4, 1, 12, 3], - "texture": "#0", - "rotation": 180 - }, - "down": {"uv": [4, 9, 12, 11], "texture": "#0"} + "up": {"uv": [4, 1, 12, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [4, 9, 12, 11], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", - "from": [0.9999999999999998, 0, 5], - "to": [1.9999999999999998, 1, 7], + "from": [1, 0, 5], + "to": [2, 1, 7], "faces": { "north": {"uv": [1, 1, 2, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, "south": {"uv": [1, 1, 2, 2], "texture": "#0"}, - "west": { - "uv": [1, 1, 2, 3], - "texture": "#0", - "rotation": 90 - }, - "up": { - "uv": [1, 1, 2, 3], - "texture": "#0", - "rotation": 180 - }, - "down": {"uv": [1, 1, 2, 3], "texture": "#0"} + "west": {"uv": [1, 1, 2, 3], "rotation": 90, "texture": "#0"}, + "up": {"uv": [1, 1, 2, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 1, 2, 3], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", - "from": [0.9999999999999998, 0, 1], - "to": [1.9999999999999998, 1, 3], + "from": [1, 0, 1], + "to": [2, 1, 3], "faces": { "north": {"uv": [1, 1, 2, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, "south": {"uv": [1, 1, 2, 2], "texture": "#0"}, - "west": { - "uv": [1, 1, 2, 3], - "texture": "#0", - "rotation": 90 - }, - "up": { - "uv": [1, 1, 2, 3], - "texture": "#0", - "rotation": 180 - }, - "down": {"uv": [1, 1, 2, 3], "texture": "#0"} + "west": {"uv": [1, 1, 2, 3], "rotation": 90, "texture": "#0"}, + "up": {"uv": [1, 1, 2, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 1, 2, 3], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", - "from": [0.9999999999999998, 0, 9], - "to": [1.9999999999999998, 1, 11], + "from": [1, 0, 9], + "to": [2, 1, 11], "faces": { "north": {"uv": [1, 1, 2, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, "south": {"uv": [1, 1, 2, 2], "texture": "#0"}, - "west": { - "uv": [1, 1, 2, 3], - "texture": "#0", - "rotation": 90 - }, - "up": { - "uv": [1, 1, 2, 3], - "texture": "#0", - "rotation": 180 - }, - "down": {"uv": [1, 1, 2, 3], "texture": "#0"} + "west": {"uv": [1, 1, 2, 3], "rotation": 90, "texture": "#0"}, + "up": {"uv": [1, 1, 2, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 1, 2, 3], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", "from": [4, 0, 1], "to": [12, 1, 3], "faces": { "north": {"uv": [4, 2, 12, 3], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, "south": {"uv": [4, 2, 12, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "up": { - "uv": [4, 1, 12, 3], - "texture": "#0", - "rotation": 180 - }, - "down": {"uv": [4, 9, 12, 11], "texture": "#0"} + "up": {"uv": [4, 1, 12, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [4, 9, 12, 11], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", "from": [4, 0, 13], "to": [12, 1, 15], "faces": { "north": {"uv": [4, 2, 12, 3], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, "south": {"uv": [4, 2, 12, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "up": { - "uv": [4, 1, 12, 3], - "texture": "#0", - "rotation": 180 - }, - "down": {"uv": [4, 9, 12, 11], "texture": "#0"} + "up": {"uv": [4, 1, 12, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [4, 9, 12, 11], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", "from": [4, 0, 9], "to": [12, 1, 11], "faces": { "north": {"uv": [4, 2, 12, 3], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, "south": {"uv": [4, 2, 12, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "up": { - "uv": [4, 1, 12, 3], - "texture": "#0", - "rotation": 180 - }, - "down": {"uv": [4, 9, 12, 11], "texture": "#0"} + "up": {"uv": [4, 1, 12, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [4, 9, 12, 11], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [12, 0, 5], + "to": [14, 1, 7], + "faces": { + "north": {"uv": [4, 1, 6, 2], "texture": "#0"}, + "south": {"uv": [4, 2, 6, 3], "texture": "#0"}, + "down": {"uv": [4, 1, 6, 3], "rotation": 270, "texture": "#0", "cullface": "down"} } }, { - "name": "cube", "from": [2, 0, 1], "to": [4, 1, 3], "faces": { "north": {"uv": [4, 1, 6, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, "south": {"uv": [4, 2, 6, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "up": { - "uv": [4, 1, 6, 3], - "texture": "#0", - "rotation": 90 - }, - "down": { - "uv": [4, 1, 6, 3], - "texture": "#0", - "rotation": 270 - } + "down": {"uv": [4, 1, 6, 3], "rotation": 270, "texture": "#0", "cullface": "down"} } }, { - "name": "cube", "from": [12, 0, 13], "to": [14, 1, 15], "faces": { "north": {"uv": [4, 1, 6, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, "south": {"uv": [4, 2, 6, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "up": { - "uv": [4, 1, 6, 3], - "texture": "#0", - "rotation": 90 - }, - "down": { - "uv": [4, 1, 6, 3], - "texture": "#0", - "rotation": 270 - } + "down": {"uv": [4, 1, 6, 3], "rotation": 270, "texture": "#0", "cullface": "down"} } }, { - "name": "cube", "from": [12, 0, 9], "to": [14, 1, 11], "faces": { "north": {"uv": [4, 1, 6, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, "south": {"uv": [4, 2, 6, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "up": { - "uv": [4, 1, 6, 3], - "texture": "#0", - "rotation": 90 - }, - "down": { - "uv": [4, 1, 6, 3], - "texture": "#0", - "rotation": 270 - } + "down": {"uv": [4, 1, 6, 3], "rotation": 270, "texture": "#0", "cullface": "down"} } }, { - "name": "cube", - "from": [12, 0, 5], - "to": [14, 1, 7], + "from": [2, 0, 13], + "to": [4, 1, 15], "faces": { "north": {"uv": [4, 1, 6, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, "south": {"uv": [4, 2, 6, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "up": { - "uv": [4, 1, 6, 3], - "texture": "#0", - "rotation": 90 - }, - "down": { - "uv": [4, 1, 6, 3], - "texture": "#0", - "rotation": 270 - } + "down": {"uv": [4, 1, 6, 3], "rotation": 270, "texture": "#0", "cullface": "down"} } }, { - "name": "cube", "from": [12, 0, 1], "to": [14, 1, 3], "faces": { "north": {"uv": [4, 1, 6, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, "south": {"uv": [4, 2, 6, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "up": { - "uv": [4, 1, 6, 3], - "texture": "#0", - "rotation": 90 - }, - "down": { - "uv": [4, 1, 6, 3], - "texture": "#0", - "rotation": 270 - } + "down": {"uv": [4, 1, 6, 3], "rotation": 270, "texture": "#0", "cullface": "down"} } }, { - "name": "cube", - "from": [2, 0, 13], - "to": [4, 1, 15], + "from": [14, 0, 5], + "to": [15, 1, 7], "faces": { - "north": {"uv": [4, 1, 6, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "south": {"uv": [4, 2, 6, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "up": { - "uv": [4, 1, 6, 3], - "texture": "#0", - "rotation": 90 - }, - "down": { - "uv": [4, 1, 6, 3], - "texture": "#0", - "rotation": 270 - } + "north": {"uv": [2, 1, 1, 2], "texture": "#0"}, + "east": {"uv": [2, 1, 1, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [2, 1, 1, 2], "texture": "#0"}, + "up": {"uv": [1, 3, 2, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 3, 2, 1], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", "from": [2, 0, 9], "to": [4, 1, 11], "faces": { "north": {"uv": [4, 1, 6, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, "south": {"uv": [4, 2, 6, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "up": { - "uv": [4, 1, 6, 3], - "texture": "#0", - "rotation": 90 - }, - "down": { - "uv": [4, 1, 6, 3], - "texture": "#0", - "rotation": 270 - } + "down": {"uv": [4, 1, 6, 3], "rotation": 270, "texture": "#0", "cullface": "down"} } }, { - "name": "cube", - "from": [0.9999999999999998, 0, 13], - "to": [1.9999999999999998, 1, 15], + "from": [1, 0, 13], + "to": [2, 1, 15], "faces": { "north": {"uv": [1, 1, 2, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, "south": {"uv": [1, 1, 2, 2], "texture": "#0"}, - "west": { - "uv": [1, 1, 2, 3], - "texture": "#0", - "rotation": 90 - }, - "up": { - "uv": [1, 1, 2, 3], - "texture": "#0", - "rotation": 180 - }, - "down": {"uv": [1, 1, 2, 3], "texture": "#0"} + "west": {"uv": [1, 1, 2, 3], "rotation": 90, "texture": "#0"}, + "up": {"uv": [1, 1, 2, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 1, 2, 3], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", "from": [14, 0, 13], "to": [15, 1, 15], "faces": { "north": {"uv": [2, 1, 1, 2], "texture": "#0"}, - "east": { - "uv": [2, 1, 1, 3], - "texture": "#0", - "rotation": 90 - }, + "east": {"uv": [2, 1, 1, 3], "rotation": 90, "texture": "#0"}, "south": {"uv": [2, 1, 1, 2], "texture": "#0"}, - "west": {"uv": [2, 0, 0, 1], "texture": "#missing"}, - "up": { - "uv": [1, 3, 2, 1], - "texture": "#0", - "rotation": 180 - }, - "down": {"uv": [1, 3, 2, 1], "texture": "#0"} + "up": {"uv": [1, 3, 2, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 3, 2, 1], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", "from": [14, 0, 9], "to": [15, 1, 11], "faces": { "north": {"uv": [2, 1, 1, 2], "texture": "#0"}, - "east": { - "uv": [2, 1, 1, 3], - "texture": "#0", - "rotation": 90 - }, - "south": {"uv": [2, 1, 1, 2], "texture": "#0"}, - "west": {"uv": [2, 0, 0, 1], "texture": "#missing"}, - "up": { - "uv": [1, 3, 2, 1], - "texture": "#0", - "rotation": 180 - }, - "down": {"uv": [1, 3, 2, 1], "texture": "#0"} - } - }, - { - "name": "cube", - "from": [14, 0, 5], - "to": [15, 1, 7], - "faces": { - "north": {"uv": [2, 1, 1, 2], "texture": "#0"}, - "east": { - "uv": [2, 1, 1, 3], - "texture": "#0", - "rotation": 90 - }, + "east": {"uv": [2, 1, 1, 3], "rotation": 90, "texture": "#0"}, "south": {"uv": [2, 1, 1, 2], "texture": "#0"}, - "west": {"uv": [2, 0, 0, 1], "texture": "#missing"}, - "up": { - "uv": [1, 3, 2, 1], - "texture": "#0", - "rotation": 180 - }, - "down": {"uv": [1, 3, 2, 1], "texture": "#0"} + "up": {"uv": [1, 3, 2, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 3, 2, 1], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", "from": [14, 0, 1], "to": [15, 1, 3], "faces": { "north": {"uv": [2, 1, 1, 2], "texture": "#0"}, - "east": { - "uv": [2, 1, 1, 3], - "texture": "#0", - "rotation": 90 - }, + "east": {"uv": [2, 1, 1, 3], "rotation": 90, "texture": "#0"}, "south": {"uv": [2, 1, 1, 2], "texture": "#0"}, - "west": {"uv": [2, 0, 0, 1], "texture": "#missing"}, - "up": { - "uv": [1, 3, 2, 1], - "texture": "#0", - "rotation": 180 - }, - "down": {"uv": [1, 3, 2, 1], "texture": "#0"} + "up": {"uv": [1, 3, 2, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 3, 2, 1], "texture": "#0", "cullface": "down"} } }, { - "name": "cube", "from": [12, 1, 0], "to": [14, 2, 16], "faces": { - "north": {"uv": [2, 0, 4, 1], "texture": "#0"}, + "north": {"uv": [2, 0, 4, 1], "texture": "#0", "cullface": "north"}, "east": {"uv": [2, 0, 3, 16], "texture": "#0"}, - "south": { - "uv": [2, 0, 4, 1], - "texture": "#0", - "rotation": 180 - }, + "south": {"uv": [2, 0, 4, 1], "rotation": 180, "texture": "#0", "cullface": "south"}, "west": {"uv": [3, 0, 4, 16], "texture": "#0"}, - "up": { - "uv": [2, 0, 4, 16], - "texture": "#0", - "rotation": 180 - }, - "down": { - "uv": [2, 0, 4, 16], - "texture": "#0", - "rotation": 180 - } + "up": {"uv": [2, 0, 4, 16], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2, 0, 4, 16], "rotation": 180, "texture": "#0"} } }, { - "name": "cube", "from": [2, 1, 0], "to": [4, 2, 16], "faces": { - "north": {"uv": [4, 0, 2, 1], "texture": "#0"}, + "north": {"uv": [4, 0, 2, 1], "texture": "#0", "cullface": "north"}, "east": {"uv": [4, 0, 3, 16], "texture": "#0"}, - "south": { - "uv": [4, 0, 2, 1], - "texture": "#0", - "rotation": 180 - }, + "south": {"uv": [4, 0, 2, 1], "rotation": 180, "texture": "#0", "cullface": "south"}, "west": {"uv": [3, 0, 2, 16], "texture": "#0"}, "up": {"uv": [2, 16, 4, 0], "texture": "#0"}, "down": {"uv": [2, 16, 4, 0], "texture": "#0"} @@ -455,45 +233,10 @@ "groups": [ { "name": "supports", - "origin": [8, 8, 8], - "isOpen": true, - "display": { - "visibility": true, - "export": true, - "autouv": true - }, - "children": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 11, - 8, - 9, - 10, - 13, - 12, - 18, - 14, - 15, - 16, - 17, - 19 - ] + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19] }, { "name": "track", - "origin": [8, 8, 8], - "isOpen": true, - "display": { - "visibility": true, - "export": true, - "autouv": true - }, "children": [20, 21] } ] diff --git a/src/main/resources/assets/minecraft/models/block/rail_raised_ne.json b/src/main/resources/assets/minecraft/models/block/rail_raised_ne.json index fc5a4b8..99c8ec1 100644 --- a/src/main/resources/assets/minecraft/models/block/rail_raised_ne.json +++ b/src/main/resources/assets/minecraft/models/block/rail_raised_ne.json @@ -1,728 +1,273 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", - "textures": {"particle": "blocks/rail_normal"}, + "credit": "Made with Blockbench", + "ambientocclusion": false, + "textures": { + "particle": "blocks/rail_normal" + }, "elements": [ { - "name": "cube", - "from": [2, 2, 7], - "to": [4, 18, 8], + "from": [1, -1, 15], + "to": [2, 0, 17], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 7, 23], "rescale": true}, "faces": { - "north": { - "uv": [12, 0, 14, 16], - "texture": "#particle" - }, - "east": { - "uv": [3, 0, 4, 16], - "texture": "#particle" - }, - "south": { - "uv": [2, 0, 4, 16], - "texture": "#particle" - }, - "west": { - "uv": [2, 0, 3, 16], - "texture": "#particle" - }, - "up": {"uv": [2, 0, 4, 1], "texture": "#particle"}, - "down": {"uv": [2, 0, 4, 1], "texture": "#particle"} - }, - "rotation": { - "origin": [10, 10, 8], - "axis": "x", - "angle": -45, - "rescale": true - } - }, - { - "name": "cube", - "from": [12, 2, 7], - "to": [14, 18, 8], - "faces": { - "north": { - "uv": [2, 0, 4, 16], - "texture": "#particle" - }, - "east": { - "uv": [2, 0, 3, 16], - "texture": "#particle" - }, - "south": { - "uv": [12, 0, 14, 16], - "texture": "#particle" - }, - "west": { - "uv": [3, 0, 4, 16], - "texture": "#particle" - }, - "up": { - "uv": [12, 0, 14, 1], - "texture": "#particle" - }, - "down": { - "uv": [12, 0, 14, 1], - "texture": "#particle" - } - }, - "rotation": { - "origin": [20, 10, 8], - "axis": "x", - "angle": -45, - "rescale": true + "north": {"uv": [1, 1, 2, 2], "texture": "#particle"}, + "south": {"uv": [1, 2, 2, 3], "texture": "#particle"}, + "west": {"uv": [1, 1, 2, 3], "rotation": 270, "texture": "#particle"}, + "up": {"uv": [1, 1, 2, 3], "texture": "#particle"}, + "down": {"uv": [1, 1, 2, 3], "rotation": 180, "texture": "#particle"} } }, { - "name": "cube", "from": [1, 3, 11], "to": [2, 4, 13], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 11, 19], "rescale": true}, "faces": { - "north": { - "uv": [1, 1, 2, 2], - "texture": "#particle" - }, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "south": { - "uv": [1, 2, 2, 3], - "texture": "#particle" - }, - "west": { - "uv": [1, 1, 2, 3], - "texture": "#particle", - "rotation": 270 - }, + "north": {"uv": [1, 1, 2, 2], "texture": "#particle"}, + "south": {"uv": [1, 2, 2, 3], "texture": "#particle"}, + "west": {"uv": [1, 1, 2, 3], "rotation": 270, "texture": "#particle"}, "up": {"uv": [1, 1, 2, 3], "texture": "#particle"}, - "down": { - "uv": [1, 1, 2, 3], - "texture": "#particle", - "rotation": 180 - } - }, - "rotation": { - "origin": [8, 11, 19], - "axis": "x", - "angle": 45, - "rescale": true + "down": {"uv": [1, 1, 2, 3], "rotation": 180, "texture": "#particle"} } }, { - "name": "cube", "from": [4, 3, 11], "to": [12, 4, 13], + "rotation": {"angle": 45, "axis": "x", "origin": [11, 11, 19], "rescale": true}, "faces": { - "north": { - "uv": [4, 2, 12, 3], - "texture": "#particle" - }, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "south": { - "uv": [4, 6, 12, 7], - "texture": "#particle" - }, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, + "north": {"uv": [4, 2, 12, 3], "texture": "#particle"}, + "south": {"uv": [4, 6, 12, 7], "texture": "#particle"}, "up": {"uv": [4, 1, 12, 3], "texture": "#particle"}, - "down": { - "uv": [4, 1, 12, 3], - "texture": "#particle", - "rotation": 180 - } - }, - "rotation": { - "origin": [11, 11, 19], - "axis": "x", - "angle": 45, - "rescale": true + "down": {"uv": [4, 1, 12, 3], "rotation": 180, "texture": "#particle"} } }, { - "name": "cube", "from": [2, 3, 11], "to": [4, 4, 13], + "rotation": {"angle": 45, "axis": "x", "origin": [9, 11, 19], "rescale": true}, "faces": { - "north": { - "uv": [4, 5, 6, 6], - "texture": "#particle" - }, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "south": { - "uv": [4, 2, 6, 3], - "texture": "#particle" - }, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, + "north": {"uv": [4, 5, 6, 6], "texture": "#particle"}, + "south": {"uv": [4, 2, 6, 3], "texture": "#particle"}, "up": {"uv": [4, 5, 6, 7], "texture": "#particle"}, - "down": { - "uv": [4, 1, 6, 3], - "texture": "#particle", - "rotation": 180 - } - }, - "rotation": { - "origin": [9, 11, 19], - "axis": "x", - "angle": 45, - "rescale": true + "down": {"uv": [4, 1, 6, 3], "rotation": 180, "texture": "#particle"} } }, { - "name": "cube", "from": [12, 3, 11], "to": [14, 4, 13], + "rotation": {"angle": 45, "axis": "x", "origin": [20, 11, 19], "rescale": true}, "faces": { - "north": { - "uv": [4, 2, 6, 3], - "texture": "#particle" - }, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "south": { - "uv": [10, 6, 12, 7], - "texture": "#particle" - }, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "up": { - "uv": [10, 5, 12, 7], - "texture": "#particle" - }, + "north": {"uv": [4, 2, 6, 3], "texture": "#particle"}, + "south": {"uv": [10, 6, 12, 7], "texture": "#particle"}, + "up": {"uv": [10, 5, 12, 7], "texture": "#particle"}, "down": {"uv": [4, 1, 6, 3], "texture": "#particle"} - }, - "rotation": { - "origin": [20, 11, 19], - "axis": "x", - "angle": 45, - "rescale": true } }, { - "name": "cube", "from": [14, 3, 11], "to": [15, 4, 13], + "rotation": {"angle": 45, "axis": "x", "origin": [21, 11, 19], "rescale": true}, "faces": { - "north": { - "uv": [1, 6, 2, 7], - "texture": "#particle" - }, - "east": { - "uv": [14, 1, 15, 3], - "texture": "#particle", - "rotation": 90 - }, - "south": { - "uv": [14, 6, 15, 7], - "texture": "#particle" - }, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, + "north": {"uv": [1, 6, 2, 7], "texture": "#particle"}, + "east": {"uv": [14, 1, 15, 3], "rotation": 90, "texture": "#particle"}, + "south": {"uv": [14, 6, 15, 7], "texture": "#particle"}, "up": {"uv": [1, 1, 2, 3], "texture": "#particle"}, - "down": { - "uv": [1, 1, 2, 3], - "texture": "#particle", - "rotation": 180 - } - }, - "rotation": { - "origin": [21, 11, 19], - "axis": "x", - "angle": 45, - "rescale": true + "down": {"uv": [1, 1, 2, 3], "rotation": 180, "texture": "#particle"} } }, { - "name": "cube", "from": [1, 7, 7], "to": [2, 8, 9], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 15, 15], "rescale": true}, "faces": { - "north": { - "uv": [1, 1, 2, 2], - "texture": "#particle" - }, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "south": { - "uv": [1, 2, 2, 3], - "texture": "#particle" - }, - "west": { - "uv": [1, 1, 2, 3], - "texture": "#particle", - "rotation": 270 - }, + "north": {"uv": [1, 1, 2, 2], "texture": "#particle"}, + "south": {"uv": [1, 2, 2, 3], "texture": "#particle"}, + "west": {"uv": [1, 1, 2, 3], "rotation": 270, "texture": "#particle"}, "up": {"uv": [1, 1, 2, 3], "texture": "#particle"}, - "down": { - "uv": [1, 1, 2, 3], - "texture": "#particle", - "rotation": 180 - } - }, - "rotation": { - "origin": [8, 15, 15], - "axis": "x", - "angle": 45, - "rescale": true + "down": {"uv": [1, 1, 2, 3], "rotation": 180, "texture": "#particle"} } }, { - "name": "cube", "from": [2, 7, 7], "to": [4, 8, 9], + "rotation": {"angle": 45, "axis": "x", "origin": [9, 15, 15], "rescale": true}, "faces": { - "north": { - "uv": [4, 5, 6, 6], - "texture": "#particle" - }, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "south": { - "uv": [4, 2, 6, 3], - "texture": "#particle" - }, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, + "north": {"uv": [4, 5, 6, 6], "texture": "#particle"}, + "south": {"uv": [4, 2, 6, 3], "texture": "#particle"}, "up": {"uv": [4, 5, 6, 7], "texture": "#particle"}, - "down": { - "uv": [4, 1, 6, 3], - "texture": "#particle", - "rotation": 180 - } - }, - "rotation": { - "origin": [9, 15, 15], - "axis": "x", - "angle": 45, - "rescale": true + "down": {"uv": [4, 1, 6, 3], "rotation": 180, "texture": "#particle"} } }, { - "name": "cube", "from": [4, 7, 7], "to": [12, 8, 9], + "rotation": {"angle": 45, "axis": "x", "origin": [11, 15, 15], "rescale": true}, "faces": { - "north": { - "uv": [4, 2, 12, 3], - "texture": "#particle" - }, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "south": { - "uv": [4, 6, 12, 7], - "texture": "#particle" - }, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, + "north": {"uv": [4, 2, 12, 3], "texture": "#particle"}, + "south": {"uv": [4, 6, 12, 7], "texture": "#particle"}, "up": {"uv": [4, 1, 12, 3], "texture": "#particle"}, - "down": { - "uv": [4, 1, 12, 3], - "texture": "#particle", - "rotation": 180 - } - }, - "rotation": { - "origin": [11, 15, 15], - "axis": "x", - "angle": 45, - "rescale": true + "down": {"uv": [4, 1, 12, 3], "rotation": 180, "texture": "#particle"} } }, { - "name": "cube", "from": [12, 7, 7], "to": [14, 8, 9], + "rotation": {"angle": 45, "axis": "x", "origin": [20, 15, 15], "rescale": true}, "faces": { - "north": { - "uv": [4, 2, 6, 3], - "texture": "#particle" - }, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "south": { - "uv": [10, 6, 12, 7], - "texture": "#particle" - }, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "up": { - "uv": [10, 5, 12, 7], - "texture": "#particle" - }, + "north": {"uv": [4, 2, 6, 3], "texture": "#particle"}, + "south": {"uv": [10, 6, 12, 7], "texture": "#particle"}, + "up": {"uv": [10, 5, 12, 7], "texture": "#particle"}, "down": {"uv": [4, 1, 6, 3], "texture": "#particle"} - }, - "rotation": { - "origin": [20, 15, 15], - "axis": "x", - "angle": 45, - "rescale": true } }, { - "name": "cube", "from": [14, 7, 7], "to": [15, 8, 9], + "rotation": {"angle": 45, "axis": "x", "origin": [21, 15, 15], "rescale": true}, "faces": { - "north": { - "uv": [1, 6, 2, 7], - "texture": "#particle" - }, - "east": { - "uv": [14, 1, 15, 3], - "texture": "#particle", - "rotation": 90 - }, - "south": { - "uv": [14, 6, 15, 7], - "texture": "#particle" - }, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, + "north": {"uv": [1, 6, 2, 7], "texture": "#particle"}, + "east": {"uv": [14, 1, 15, 3], "rotation": 90, "texture": "#particle"}, + "south": {"uv": [14, 6, 15, 7], "texture": "#particle"}, "up": {"uv": [1, 1, 2, 3], "texture": "#particle"}, - "down": { - "uv": [1, 1, 2, 3], - "texture": "#particle", - "rotation": 180 - } - }, - "rotation": { - "origin": [21, 15, 15], - "axis": "x", - "angle": 45, - "rescale": true + "down": {"uv": [1, 1, 2, 3], "rotation": 180, "texture": "#particle"} } }, { - "name": "cube", - "from": [1, -1.0000000000000002, 15], - "to": [2, -2.220446049250313e-16, 17], + "from": [2, -1, 15], + "to": [4, 0, 17], + "rotation": {"angle": 45, "axis": "x", "origin": [9, 7, 23], "rescale": true}, "faces": { - "north": { - "uv": [1, 1, 2, 2], - "texture": "#particle" - }, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "south": { - "uv": [1, 2, 2, 3], - "texture": "#particle" - }, - "west": { - "uv": [1, 1, 2, 3], - "texture": "#particle", - "rotation": 270 - }, - "up": {"uv": [1, 1, 2, 3], "texture": "#particle"}, - "down": { - "uv": [1, 1, 2, 3], - "texture": "#particle", - "rotation": 180 - } - }, - "rotation": { - "origin": [8, 7, 23], - "axis": "x", - "angle": 45, - "rescale": true + "north": {"uv": [4, 5, 6, 6], "texture": "#particle"}, + "south": {"uv": [4, 2, 6, 3], "texture": "#particle"}, + "up": {"uv": [4, 5, 6, 7], "texture": "#particle"}, + "down": {"uv": [4, 1, 6, 3], "rotation": 180, "texture": "#particle"} } }, { - "name": "cube", - "from": [2, -1.0000000000000002, 15], - "to": [4, -2.220446049250313e-16, 17], + "from": [4, -5, 19], + "to": [12, -4, 21], + "rotation": {"angle": 45, "axis": "x", "origin": [11, 3, 27], "rescale": true}, "faces": { - "north": { - "uv": [4, 5, 6, 6], - "texture": "#particle" - }, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "south": { - "uv": [4, 2, 6, 3], - "texture": "#particle" - }, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "up": {"uv": [4, 5, 6, 7], "texture": "#particle"}, - "down": { - "uv": [4, 1, 6, 3], - "texture": "#particle", - "rotation": 180 - } - }, - "rotation": { - "origin": [9, 7, 23], - "axis": "x", - "angle": 45, - "rescale": true + "north": {"uv": [4, 2, 12, 3], "texture": "#particle"}, + "south": {"uv": [4, 6, 12, 7], "texture": "#particle", "cullface": "south"}, + "up": {"uv": [4, 1, 12, 3], "texture": "#particle", "cullface": "south"}, + "down": {"uv": [4, 1, 12, 3], "rotation": 180, "texture": "#particle"} } }, { - "name": "cube", - "from": [4, -1.0000000000000002, 15], - "to": [12, -2.220446049250313e-16, 17], + "from": [4, -1, 15], + "to": [12, 0, 17], + "rotation": {"angle": 45, "axis": "x", "origin": [11, 7, 23], "rescale": true}, "faces": { - "north": { - "uv": [4, 2, 12, 3], - "texture": "#particle" - }, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "south": { - "uv": [4, 6, 12, 7], - "texture": "#particle" - }, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, + "north": {"uv": [4, 2, 12, 3], "texture": "#particle"}, + "south": {"uv": [4, 6, 12, 7], "texture": "#particle"}, "up": {"uv": [4, 1, 12, 3], "texture": "#particle"}, - "down": { - "uv": [4, 1, 12, 3], - "texture": "#particle", - "rotation": 180 - } - }, - "rotation": { - "origin": [11, 7, 23], - "axis": "x", - "angle": 45, - "rescale": true + "down": {"uv": [4, 1, 12, 3], "rotation": 180, "texture": "#particle"} + } + }, + { + "from": [14, -5, 19], + "to": [15, -4, 21], + "rotation": {"angle": 45, "axis": "x", "origin": [21, 3, 27], "rescale": true}, + "faces": { + "north": {"uv": [1, 6, 2, 7], "texture": "#particle"}, + "east": {"uv": [14, 1, 15, 3], "rotation": 90, "texture": "#particle"}, + "south": {"uv": [14, 6, 15, 7], "texture": "#particle", "cullface": "south"}, + "up": {"uv": [1, 1, 2, 3], "texture": "#particle", "cullface": "south"}, + "down": {"uv": [1, 1, 2, 3], "rotation": 180, "texture": "#particle"} } }, { - "name": "cube", - "from": [12, -1.0000000000000002, 15], - "to": [14, -2.220446049250313e-16, 17], + "from": [12, -5, 19], + "to": [14, -4, 21], + "rotation": {"angle": 45, "axis": "x", "origin": [20, 3, 27], "rescale": true}, "faces": { - "north": { - "uv": [4, 2, 6, 3], - "texture": "#particle" - }, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "south": { - "uv": [10, 6, 12, 7], - "texture": "#particle" - }, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "up": { - "uv": [10, 5, 12, 7], - "texture": "#particle" - }, + "north": {"uv": [4, 2, 6, 3], "texture": "#particle"}, + "south": {"uv": [10, 6, 12, 7], "texture": "#particle", "cullface": "south"}, + "up": {"uv": [10, 5, 12, 7], "texture": "#particle", "cullface": "south"}, "down": {"uv": [4, 1, 6, 3], "texture": "#particle"} - }, - "rotation": { - "origin": [20, 7, 23], - "axis": "x", - "angle": 45, - "rescale": true } }, { - "name": "cube", - "from": [14, -1.0000000000000002, 15], - "to": [15, -2.220446049250313e-16, 17], + "from": [2, -5, 19], + "to": [4, -4, 21], + "rotation": {"angle": 45, "axis": "x", "origin": [9, 3, 27], "rescale": true}, "faces": { - "north": { - "uv": [1, 6, 2, 7], - "texture": "#particle" - }, - "east": { - "uv": [14, 1, 15, 3], - "texture": "#particle", - "rotation": 90 - }, - "south": { - "uv": [14, 6, 15, 7], - "texture": "#particle" - }, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "up": {"uv": [1, 1, 2, 3], "texture": "#particle"}, - "down": { - "uv": [1, 1, 2, 3], - "texture": "#particle", - "rotation": 180 - } - }, - "rotation": { - "origin": [21, 7, 23], - "axis": "x", - "angle": 45, - "rescale": true + "north": {"uv": [4, 5, 6, 6], "texture": "#particle"}, + "south": {"uv": [4, 2, 6, 3], "texture": "#particle", "cullface": "south"}, + "up": {"uv": [4, 5, 6, 7], "texture": "#particle", "cullface": "south"}, + "down": {"uv": [4, 1, 6, 3], "rotation": 180, "texture": "#particle"} } }, { - "name": "cube", "from": [1, -5, 19], "to": [2, -4, 21], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 3, 27], "rescale": true}, "faces": { - "north": { - "uv": [1, 1, 2, 2], - "texture": "#particle" - }, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "south": { - "uv": [1, 2, 2, 3], - "texture": "#particle" - }, - "west": { - "uv": [1, 1, 2, 3], - "texture": "#particle", - "rotation": 270 - }, - "up": {"uv": [1, 1, 2, 3], "texture": "#particle"}, - "down": { - "uv": [1, 1, 2, 3], - "texture": "#particle", - "rotation": 180 - } - }, - "rotation": { - "origin": [8, 3, 27], - "axis": "x", - "angle": 45, - "rescale": true + "north": {"uv": [1, 1, 2, 2], "texture": "#particle"}, + "south": {"uv": [1, 2, 2, 3], "texture": "#particle", "cullface": "south"}, + "west": {"uv": [1, 1, 2, 3], "rotation": 270, "texture": "#particle"}, + "up": {"uv": [1, 1, 2, 3], "texture": "#particle", "cullface": "south"}, + "down": {"uv": [1, 1, 2, 3], "rotation": 180, "texture": "#particle"} } }, { - "name": "cube", - "from": [4, -5, 19], - "to": [12, -4, 21], + "from": [14, -1, 15], + "to": [15, 0, 17], + "rotation": {"angle": 45, "axis": "x", "origin": [21, 7, 23], "rescale": true}, "faces": { - "north": { - "uv": [4, 2, 12, 3], - "texture": "#particle" - }, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "south": { - "uv": [4, 6, 12, 7], - "texture": "#particle" - }, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "up": {"uv": [4, 1, 12, 3], "texture": "#particle"}, - "down": { - "uv": [4, 1, 12, 3], - "texture": "#particle", - "rotation": 180 - } - }, - "rotation": { - "origin": [11, 3, 27], - "axis": "x", - "angle": 45, - "rescale": true + "north": {"uv": [1, 6, 2, 7], "texture": "#particle"}, + "east": {"uv": [14, 1, 15, 3], "rotation": 90, "texture": "#particle"}, + "south": {"uv": [14, 6, 15, 7], "texture": "#particle"}, + "up": {"uv": [1, 1, 2, 3], "texture": "#particle"}, + "down": {"uv": [1, 1, 2, 3], "rotation": 180, "texture": "#particle"} } }, { - "name": "cube", - "from": [2, -5, 19], - "to": [4, -4, 21], + "from": [12, -1, 15], + "to": [14, 0, 17], + "rotation": {"angle": 45, "axis": "x", "origin": [20, 7, 23], "rescale": true}, "faces": { - "north": { - "uv": [4, 5, 6, 6], - "texture": "#particle" - }, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "south": { - "uv": [4, 2, 6, 3], - "texture": "#particle" - }, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "up": {"uv": [4, 5, 6, 7], "texture": "#particle"}, - "down": { - "uv": [4, 1, 6, 3], - "texture": "#particle", - "rotation": 180 - } - }, - "rotation": { - "origin": [9, 3, 27], - "axis": "x", - "angle": 45, - "rescale": true + "north": {"uv": [4, 2, 6, 3], "texture": "#particle"}, + "south": {"uv": [10, 6, 12, 7], "texture": "#particle"}, + "up": {"uv": [10, 5, 12, 7], "texture": "#particle"}, + "down": {"uv": [4, 1, 6, 3], "texture": "#particle"} } }, { - "name": "cube", - "from": [12, -5, 19], - "to": [14, -4, 21], + "from": [12, 2, 7], + "to": [14, 18, 8], + "rotation": {"angle": -45, "axis": "x", "origin": [20, 10, 8], "rescale": true}, "faces": { - "north": { - "uv": [4, 2, 6, 3], - "texture": "#particle" - }, - "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "south": { - "uv": [10, 6, 12, 7], - "texture": "#particle" - }, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "up": { - "uv": [10, 5, 12, 7], - "texture": "#particle" - }, - "down": {"uv": [4, 1, 6, 3], "texture": "#particle"} - }, - "rotation": { - "origin": [20, 3, 27], - "axis": "x", - "angle": 45, - "rescale": true + "north": {"uv": [2, 0, 4, 16], "texture": "#particle"}, + "east": {"uv": [2, 0, 3, 16], "texture": "#particle"}, + "south": {"uv": [12, 0, 14, 16], "texture": "#particle"}, + "west": {"uv": [3, 0, 4, 16], "texture": "#particle"}, + "up": {"uv": [12, 0, 14, 1], "texture": "#particle"}, + "down": {"uv": [12, 0, 14, 1], "texture": "#particle"} } }, { - "name": "cube", - "from": [14, -5, 19], - "to": [15, -4, 21], + "from": [2, 2, 7], + "to": [4, 18, 8], + "rotation": {"angle": -45, "axis": "x", "origin": [10, 10, 8], "rescale": true}, "faces": { - "north": { - "uv": [1, 6, 2, 7], - "texture": "#particle" - }, - "east": { - "uv": [14, 1, 15, 3], - "texture": "#particle", - "rotation": 90 - }, - "south": { - "uv": [14, 6, 15, 7], - "texture": "#particle" - }, - "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, - "up": {"uv": [1, 1, 2, 3], "texture": "#particle"}, - "down": { - "uv": [1, 1, 2, 3], - "texture": "#particle", - "rotation": 180 - } - }, - "rotation": { - "origin": [21, 3, 27], - "axis": "x", - "angle": 45, - "rescale": true + "north": {"uv": [12, 0, 14, 16], "texture": "#particle"}, + "east": {"uv": [3, 0, 4, 16], "texture": "#particle"}, + "south": {"uv": [2, 0, 4, 16], "texture": "#particle"}, + "west": {"uv": [2, 0, 3, 16], "texture": "#particle"}, + "up": {"uv": [2, 0, 4, 1], "texture": "#particle"}, + "down": {"uv": [2, 0, 4, 1], "texture": "#particle"} } } ], "groups": [ { "name": "supports", - "origin": [8, 8, 8], - "isOpen": false, - "display": { - "visibility": true, - "export": true, - "autouv": true - }, - "children": [ - 12, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 13, - 18, - 14, - 21, - 20, - 19, - 17, - 16, - 15 - ] + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19] }, { "name": "tracks", - "origin": [8, 8, 8], - "isOpen": false, - "display": { - "visibility": true, - "export": true, - "autouv": true - }, - "children": [1, 0] + "children": [20, 21] } - ], - "ambientocclusion": false + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/block/trapdoor_bottom.json b/src/main/resources/assets/minecraft/models/block/trapdoor_bottom.json index 7463058..394a879 100644 --- a/src/main/resources/assets/minecraft/models/block/trapdoor_bottom.json +++ b/src/main/resources/assets/minecraft/models/block/trapdoor_bottom.json @@ -1,12 +1,11 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "textures": { "0": "blocks/trapdoor", "particle": "blocks/trapdoor" }, "elements": [ { - "name": "cube", "from": [0, 0, 0], "to": [16, 3, 3], "faces": { @@ -19,15 +18,10 @@ } }, { - "name": "cube", "from": [0, 0, 13], "to": [16, 3, 16], "faces": { - "north": { - "uv": [0, 0, 16, 3], - "texture": "#0", - "rotation": 180 - }, + "north": {"uv": [0, 0, 16, 3], "rotation": 180, "texture": "#0"}, "east": {"uv": [0, 0, 3, 3], "texture": "#0"}, "south": {"uv": [0, 0, 16, 3], "texture": "#0"}, "west": {"uv": [13, 0, 16, 3], "texture": "#0"}, @@ -36,108 +30,54 @@ } }, { - "name": "cube", "from": [13, 0, 3], "to": [16, 3, 13], "faces": { - "north": { - "uv": [0, 0, 3, 3], - "texture": "#missing" - }, "east": {"uv": [3, 0, 13, 3], "texture": "#0"}, - "south": { - "uv": [0, 0, 3, 3], - "texture": "#missing" - }, - "west": { - "uv": [3, 0, 13, 3], - "texture": "#0", - "rotation": 180 - }, + "west": {"uv": [3, 0, 13, 3], "rotation": 180, "texture": "#0"}, "up": {"uv": [13, 3, 16, 13], "texture": "#0"}, "down": {"uv": [13, 3, 16, 13], "texture": "#0"} } }, { - "name": "cube", "from": [0, 0, 3], "to": [3, 3, 13], "faces": { - "north": { - "uv": [0, 0, 3, 3], - "texture": "#missing" - }, "east": {"uv": [3, 6, 13, 9], "texture": "#0"}, - "south": { - "uv": [0, 0, 3, 3], - "texture": "#missing" - }, "west": {"uv": [3, 0, 13, 3], "texture": "#0"}, "up": {"uv": [0, 3, 3, 13], "texture": "#0"}, "down": {"uv": [0, 3, 3, 13], "texture": "#0"} } }, { - "name": "cube", "from": [6, 0, 3], "to": [10, 3, 13], "faces": { - "north": { - "uv": [0, 0, 4, 3], - "texture": "#missing" - }, - "east": { - "uv": [3, 7, 13, 10], - "texture": "#0", - "rotation": 180 - }, - "south": { - "uv": [0, 0, 4, 3], - "texture": "#missing" - }, - "west": { - "uv": [3, 7, 13, 10], - "texture": "#0", - "rotation": 180 - }, + "east": {"uv": [3, 7, 13, 10], "rotation": 180, "texture": "#0"}, + "west": {"uv": [3, 7, 13, 10], "rotation": 180, "texture": "#0"}, "up": {"uv": [6, 3, 10, 13], "texture": "#0"}, "down": {"uv": [6, 3, 10, 13], "texture": "#0"} } }, { - "name": "cube", "from": [3, 0, 6], "to": [6, 3, 10], "faces": { "north": {"uv": [10, 6, 13, 9], "texture": "#0"}, - "east": {"uv": [0, 0, 4, 3], "texture": "#missing"}, - "south": { - "uv": [3, 7, 6, 10], - "texture": "#0", - "rotation": 180 - }, - "west": {"uv": [0, 0, 4, 3], "texture": "#missing"}, + "south": {"uv": [3, 7, 6, 10], "rotation": 180, "texture": "#0"}, "up": {"uv": [3, 6, 6, 10], "texture": "#0"}, "down": {"uv": [3, 6, 6, 10], "texture": "#0"} } }, { - "name": "cube", "from": [10, 0, 6], "to": [13, 3, 10], "faces": { "north": {"uv": [3, 6, 6, 9], "texture": "#0"}, - "east": {"uv": [0, 0, 4, 3], "texture": "#missing"}, - "south": { - "uv": [10, 7, 13, 10], - "texture": "#0", - "rotation": 180 - }, - "west": {"uv": [0, 0, 4, 3], "texture": "#missing"}, + "south": {"uv": [10, 7, 13, 10], "rotation": 180, "texture": "#0"}, "up": {"uv": [10, 6, 13, 10], "texture": "#0"}, "down": {"uv": [10, 6, 13, 10], "texture": "#0"} } } - ], - "groups": [0, 1, 2, 3, 4, 5, 6] + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/block/trapdoor_open.json b/src/main/resources/assets/minecraft/models/block/trapdoor_open.json index e50aadc..2e341ae 100644 --- a/src/main/resources/assets/minecraft/models/block/trapdoor_open.json +++ b/src/main/resources/assets/minecraft/models/block/trapdoor_open.json @@ -1,252 +1,83 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "textures": { "0": "blocks/trapdoor", "particle": "blocks/trapdoor" }, "elements": [ { - "name": "cube", "from": [0, 0, 13], "to": [16, 3, 16], "faces": { - "north": { - "uv": [0, 0, 16, 3], - "texture": "#0", - "rotation": 180 - }, - "east": { - "uv": [13, 0, 16, 3], - "texture": "#0", - "rotation": 90 - }, + "north": {"uv": [0, 0, 16, 3], "rotation": 180, "texture": "#0"}, + "east": {"uv": [13, 0, 16, 3], "rotation": 90, "texture": "#0"}, "south": {"uv": [0, 13, 16, 16], "texture": "#0"}, - "west": { - "uv": [0, 0, 3, 3], - "texture": "#0", - "rotation": 270 - }, + "west": {"uv": [0, 0, 3, 3], "rotation": 270, "texture": "#0"}, "up": {"uv": [0, 0, 16, 3], "texture": "#0"}, - "down": { - "uv": [0, 0, 16, 3], - "texture": "#0", - "rotation": 180 - } - }, - "rotation": { - "origin": [8, 8, 21], - "axis": "x", - "angle": 0 + "down": {"uv": [0, 0, 16, 3], "rotation": 180, "texture": "#0"} } }, { - "name": "cube", "from": [0, 13, 13], "to": [16, 16, 16], "faces": { - "north": { - "uv": [0, 13, 16, 16], - "texture": "#0", - "rotation": 180 - }, - "east": { - "uv": [0, 0, 3, 3], - "texture": "#0", - "rotation": 90 - }, + "north": {"uv": [0, 13, 16, 16], "rotation": 180, "texture": "#0"}, + "east": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, "south": {"uv": [0, 0, 16, 3], "texture": "#0"}, - "west": { - "uv": [13, 0, 16, 3], - "texture": "#0", - "rotation": 270 - }, + "west": {"uv": [13, 0, 16, 3], "rotation": 270, "texture": "#0"}, "up": {"uv": [0, 0, 16, 3], "texture": "#0"}, "down": {"uv": [0, 0, 16, 3], "texture": "#0"} - }, - "rotation": { - "origin": [8, 8, 21], - "axis": "x", - "angle": 0 } }, { - "name": "cube", "from": [13, 3, 13], "to": [16, 13, 16], "faces": { - "north": { - "uv": [13, 3, 16, 13], - "texture": "#0", - "rotation": 180 - }, - "east": { - "uv": [3, 0, 13, 3], - "texture": "#0", - "rotation": 90 - }, + "north": {"uv": [13, 3, 16, 13], "rotation": 180, "texture": "#0"}, + "east": {"uv": [3, 0, 13, 3], "rotation": 90, "texture": "#0"}, "south": {"uv": [13, 3, 16, 13], "texture": "#0"}, - "west": { - "uv": [3, 0, 13, 3], - "texture": "#0", - "rotation": 90 - }, - "up": {"uv": [0, 0, 3, 3], "texture": "#missing"}, - "down": { - "uv": [0, 0, 3, 3], - "texture": "#missing", - "rotation": 180 - } - }, - "rotation": { - "origin": [8, 8, 21], - "axis": "x", - "angle": 0 + "west": {"uv": [3, 0, 13, 3], "rotation": 90, "texture": "#0"} } }, { - "name": "cube", "from": [0, 3, 13], "to": [3, 13, 16], "faces": { - "north": { - "uv": [0, 3, 3, 13], - "texture": "#0", - "rotation": 180 - }, - "east": { - "uv": [3, 6, 13, 9], - "texture": "#0", - "rotation": 90 - }, + "north": {"uv": [0, 3, 3, 13], "rotation": 180, "texture": "#0"}, + "east": {"uv": [3, 6, 13, 9], "rotation": 90, "texture": "#0"}, "south": {"uv": [0, 3, 3, 13], "texture": "#0"}, - "west": { - "uv": [3, 0, 13, 3], - "texture": "#0", - "rotation": 270 - }, - "up": {"uv": [0, 0, 3, 3], "texture": "#missing"}, - "down": { - "uv": [0, 0, 3, 3], - "texture": "#missing", - "rotation": 180 - } - }, - "rotation": { - "origin": [8, 8, 21], - "axis": "x", - "angle": 0 + "west": {"uv": [3, 0, 13, 3], "rotation": 270, "texture": "#0"} } }, { - "name": "cube", "from": [6, 3, 13], "to": [10, 13, 16], "faces": { - "north": { - "uv": [6, 3, 10, 13], - "texture": "#0", - "rotation": 180 - }, - "east": { - "uv": [3, 7, 13, 10], - "texture": "#0", - "rotation": 270 - }, + "north": {"uv": [6, 3, 10, 13], "rotation": 180, "texture": "#0"}, + "east": {"uv": [3, 7, 13, 10], "rotation": 270, "texture": "#0"}, "south": {"uv": [6, 3, 10, 13], "texture": "#0"}, - "west": { - "uv": [3, 7, 13, 10], - "texture": "#0", - "rotation": 90 - }, - "up": {"uv": [0, 0, 4, 3], "texture": "#missing"}, - "down": { - "uv": [0, 0, 4, 3], - "texture": "#missing", - "rotation": 180 - } - }, - "rotation": { - "origin": [8, 8, 21], - "axis": "x", - "angle": 0 + "west": {"uv": [3, 7, 13, 10], "rotation": 90, "texture": "#0"} } }, { - "name": "cube", "from": [3, 6, 13], "to": [6, 10, 16], "faces": { - "north": { - "uv": [3, 6, 6, 10], - "texture": "#0", - "rotation": 180 - }, - "east": { - "uv": [0, 0, 4, 3], - "texture": "#missing", - "rotation": 90 - }, + "north": {"uv": [3, 6, 6, 10], "rotation": 180, "texture": "#0"}, "south": {"uv": [3, 6, 6, 10], "texture": "#0"}, - "west": { - "uv": [0, 0, 4, 3], - "texture": "#missing", - "rotation": 270 - }, - "up": { - "uv": [3, 7, 6, 10], - "texture": "#0", - "rotation": 180 - }, - "down": { - "uv": [10, 6, 13, 9], - "texture": "#0", - "rotation": 180 - } - }, - "rotation": { - "origin": [8, 8, 21], - "axis": "x", - "angle": 0 + "up": {"uv": [3, 7, 6, 10], "rotation": 180, "texture": "#0"}, + "down": {"uv": [10, 6, 13, 9], "rotation": 180, "texture": "#0"} } }, { - "name": "cube", "from": [10, 6, 13], "to": [13, 10, 16], "faces": { - "north": { - "uv": [10, 6, 13, 10], - "texture": "#0", - "rotation": 180 - }, - "east": { - "uv": [0, 0, 4, 3], - "texture": "#missing", - "rotation": 90 - }, + "north": {"uv": [10, 6, 13, 10], "rotation": 180, "texture": "#0"}, "south": {"uv": [10, 6, 13, 10], "texture": "#0"}, - "west": { - "uv": [0, 0, 4, 3], - "texture": "#missing", - "rotation": 270 - }, - "up": { - "uv": [10, 7, 13, 10], - "texture": "#0", - "rotation": 180 - }, - "down": { - "uv": [3, 6, 6, 9], - "texture": "#0", - "rotation": 180 - } - }, - "rotation": { - "origin": [8, 8, 21], - "axis": "x", - "angle": 0 + "up": {"uv": [10, 7, 13, 10], "rotation": 180, "texture": "#0"}, + "down": {"uv": [3, 6, 6, 9], "rotation": 180, "texture": "#0"} } } - ], - "groups": [0, 1, 2, 3, 4, 5, 6] + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/block/trapdoor_top.json b/src/main/resources/assets/minecraft/models/block/trapdoor_top.json index ac8b237..cc8f225 100644 --- a/src/main/resources/assets/minecraft/models/block/trapdoor_top.json +++ b/src/main/resources/assets/minecraft/models/block/trapdoor_top.json @@ -1,12 +1,11 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "textures": { "0": "blocks/trapdoor", "particle": "blocks/trapdoor" }, "elements": [ { - "name": "cube", "from": [0, 13, 0], "to": [16, 16, 3], "faces": { @@ -19,15 +18,10 @@ } }, { - "name": "cube", "from": [0, 13, 13], "to": [16, 16, 16], "faces": { - "north": { - "uv": [0, 0, 16, 3], - "texture": "#0", - "rotation": 180 - }, + "north": {"uv": [0, 0, 16, 3], "rotation": 180, "texture": "#0"}, "east": {"uv": [0, 0, 3, 3], "texture": "#0"}, "south": {"uv": [0, 0, 16, 3], "texture": "#0"}, "west": {"uv": [13, 0, 16, 3], "texture": "#0"}, @@ -36,112 +30,54 @@ } }, { - "name": "cube", "from": [13, 13, 3], "to": [16, 16, 13], "faces": { - "north": { - "uv": [0, 0, 3, 3], - "texture": "#missing" - }, "east": {"uv": [3, 0, 13, 3], "texture": "#0"}, - "south": { - "uv": [0, 0, 3, 3], - "texture": "#missing" - }, - "west": { - "uv": [3, 0, 13, 3], - "texture": "#0", - "rotation": 180 - }, + "west": {"uv": [3, 0, 13, 3], "rotation": 180, "texture": "#0"}, "up": {"uv": [13, 3, 16, 13], "texture": "#0"}, "down": {"uv": [13, 3, 16, 13], "texture": "#0"} } }, { - "name": "cube", "from": [0, 13, 3], "to": [3, 16, 13], "faces": { - "north": { - "uv": [0, 0, 3, 3], - "texture": "#missing" - }, "east": {"uv": [3, 6, 13, 9], "texture": "#0"}, - "south": { - "uv": [0, 0, 3, 3], - "texture": "#missing" - }, "west": {"uv": [3, 0, 13, 3], "texture": "#0"}, "up": {"uv": [0, 3, 3, 13], "texture": "#0"}, "down": {"uv": [0, 3, 3, 13], "texture": "#0"} } }, { - "name": "cube", "from": [6, 13, 3], "to": [10, 16, 13], "faces": { - "north": { - "uv": [0, 0, 4, 3], - "texture": "#missing" - }, - "east": { - "uv": [3, 7, 13, 10], - "texture": "#0", - "rotation": 180 - }, - "south": { - "uv": [0, 0, 4, 3], - "texture": "#missing" - }, - "west": { - "uv": [3, 7, 13, 10], - "texture": "#0", - "rotation": 180 - }, + "east": {"uv": [3, 7, 13, 10], "rotation": 180, "texture": "#0"}, + "west": {"uv": [3, 7, 13, 10], "rotation": 180, "texture": "#0"}, "up": {"uv": [6, 3, 10, 13], "texture": "#0"}, "down": {"uv": [6, 3, 10, 13], "texture": "#0"} } }, { - "name": "cube", "from": [3, 13, 6], "to": [6, 16, 10], "faces": { "north": {"uv": [10, 6, 13, 9], "texture": "#0"}, - "east": {"uv": [0, 0, 4, 3], "texture": "#missing"}, - "south": { - "uv": [3, 7, 6, 10], - "texture": "#0", - "rotation": 180 - }, - "west": {"uv": [0, 0, 4, 3], "texture": "#missing"}, + "south": {"uv": [3, 7, 6, 10], "rotation": 180, "texture": "#0"}, "up": {"uv": [3, 6, 6, 10], "texture": "#0"}, "down": {"uv": [3, 6, 6, 10], "texture": "#0"} } }, { - "name": "cube", "from": [10, 13, 6], "to": [13, 16, 10], "faces": { "north": {"uv": [3, 6, 6, 9], "texture": "#0"}, - "east": {"uv": [0, 0, 4, 3], "texture": "#missing"}, - "south": { - "uv": [10, 7, 13, 10], - "texture": "#0", - "rotation": 180 - }, - "west": {"uv": [0, 0, 4, 3], "texture": "#missing"}, + "south": {"uv": [10, 7, 13, 10], "rotation": 180, "texture": "#0"}, "up": {"uv": [10, 6, 13, 10], "texture": "#0"}, "down": {"uv": [10, 6, 13, 10], "texture": "#0"} } } - ], - "groups": [0, 1, 2, 3, 4, 5, 6], - "display": { - "thirdperson_righthand": {"scale": [1, 1, 1]}, - "ground": {"scale": [1, 1, 1]} - } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/block/wooden_door_top.json b/src/main/resources/assets/minecraft/models/block/wooden_door_top.json index d98c5f3..04f7cca 100644 --- a/src/main/resources/assets/minecraft/models/block/wooden_door_top.json +++ b/src/main/resources/assets/minecraft/models/block/wooden_door_top.json @@ -1,26 +1,22 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "parent": "block/door_top", - "textures": {"top": "blocks/door_wood_upper"}, + "textures": { + "top": "blocks/door_wood_upper" + }, "elements": [ { - "name": "cube", "from": [0, 0, 0], "to": [3, 16, 3], "faces": { - "north": {"uv": [0, 0, 3, 16], "texture": "#top"}, + "north": {"uv": [3, 0, 0, 16], "texture": "#top"}, "east": {"uv": [3, 0, 0, 16], "texture": "#top"}, "south": {"uv": [13, 0, 16, 16], "texture": "#top"}, "west": {"uv": [0, 0, 3, 16], "texture": "#top"}, - "up": { - "uv": [16, 3, 13, 0], - "texture": "#top", - "rotation": 90 - } + "up": {"uv": [16, 3, 13, 0], "rotation": 90, "texture": "#top"} } }, { - "name": "cube", "from": [0, 0, 13], "to": [3, 16, 16], "faces": { @@ -28,67 +24,39 @@ "east": {"uv": [16, 0, 13, 16], "texture": "#top"}, "south": {"uv": [13, 0, 16, 16], "texture": "#top"}, "west": {"uv": [13, 0, 16, 16], "texture": "#top"}, - "up": { - "uv": [3, 3, 0, 0], - "texture": "#top", - "rotation": 90 - } + "up": {"uv": [3, 3, 0, 0], "rotation": 90, "texture": "#top"} } }, { - "name": "cube", "from": [0, 13, 3], "to": [3, 16, 13], "faces": { "east": {"uv": [13, 0, 3, 3], "texture": "#top"}, "west": {"uv": [3, 0, 13, 3], "texture": "#top"}, - "up": { - "uv": [13, 3, 3, 0], - "texture": "#top", - "rotation": 90 - }, - "down": { - "uv": [13, 3, 3, 0], - "texture": "#top", - "rotation": 90 - } + "up": {"uv": [13, 3, 3, 0], "rotation": 90, "texture": "#top"}, + "down": {"uv": [13, 3, 3, 0], "rotation": 90, "texture": "#top"} } }, { - "name": "cube", "from": [0, 0, 3], "to": [3, 5, 13], "faces": { "east": {"uv": [12, 11, 2, 16], "texture": "#top"}, "west": {"uv": [3, 11, 13, 16], "texture": "#top"}, - "up": { - "uv": [13, 14, 3, 11], - "texture": "#top", - "rotation": 270 - } + "up": {"uv": [13, 14, 3, 11], "rotation": 270, "texture": "#top"} } }, { - "name": "cube", "from": [0, 8, 3], "to": [3, 10, 13], "faces": { "east": {"uv": [13, 6, 3, 8], "texture": "#top"}, "west": {"uv": [3, 6, 13, 8], "texture": "#top"}, - "up": { - "uv": [13, 3, 3, 0], - "texture": "#top", - "rotation": 270 - }, - "down": { - "uv": [13, 3, 3, 0], - "texture": "#top", - "rotation": 90 - } + "up": {"uv": [13, 3, 3, 0], "rotation": 270, "texture": "#top"}, + "down": {"uv": [13, 3, 3, 0], "rotation": 90, "texture": "#top"} } }, { - "name": "cube", "from": [0, 5, 7], "to": [3, 8, 9], "faces": { @@ -99,7 +67,6 @@ } }, { - "name": "cube", "from": [0, 10, 7], "to": [3, 13, 9], "faces": { @@ -109,6 +76,5 @@ "west": {"uv": [7, 3, 9, 6], "texture": "#top"} } } - ], - "groups": [0, 1, 2, 3, 4, 5, 6] + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/block/wooden_door_top_rh.json b/src/main/resources/assets/minecraft/models/block/wooden_door_top_rh.json index 35a5237..2bdb440 100644 --- a/src/main/resources/assets/minecraft/models/block/wooden_door_top_rh.json +++ b/src/main/resources/assets/minecraft/models/block/wooden_door_top_rh.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "parent": "block/door_top", "textures": { "0": "blocks/door_wood_upper", @@ -7,24 +7,18 @@ }, "elements": [ { - "name": "cube", "from": [0, 0, 13], "to": [3, 16, 16], "faces": { "north": {"uv": [14, 0, 13, 16], "texture": "#0"}, "east": {"uv": [0, 0, 3, 16], "texture": "#0"}, - "south": {"uv": [3, 0, 0, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 3, 16], "texture": "#0"}, "west": {"uv": [3, 0, 0, 16], "texture": "#0"}, - "up": { - "uv": [16, 0, 13, 3], - "texture": "#0", - "rotation": 270 - }, + "up": {"uv": [16, 0, 13, 3], "rotation": 270, "texture": "#0"}, "down": {"uv": [0, 0, 0, 0], "texture": "#0"} } }, { - "name": "cube", "from": [0, 0, 0], "to": [3, 16, 3], "faces": { @@ -32,16 +26,11 @@ "east": {"uv": [13, 0, 16, 16], "texture": "#0"}, "south": {"uv": [3, 0, 2, 16], "texture": "#0"}, "west": {"uv": [16, 0, 13, 16], "texture": "#0"}, - "up": { - "uv": [3, 0, 0, 3], - "texture": "#0", - "rotation": 270 - }, + "up": {"uv": [3, 0, 0, 3], "rotation": 270, "texture": "#0"}, "down": {"uv": [0, 0, 0, 0], "texture": "#0"} } }, { - "name": "cube", "from": [0, 13, 3], "to": [3, 16, 13], "faces": { @@ -49,20 +38,11 @@ "east": {"uv": [3, 0, 13, 3], "texture": "#0"}, "south": {"uv": [0, 0, 0, 0], "texture": "#0"}, "west": {"uv": [13, 0, 3, 3], "texture": "#0"}, - "up": { - "uv": [13, 0, 3, 3], - "texture": "#0", - "rotation": 270 - }, - "down": { - "uv": [13, 2, 3, 3], - "texture": "#0", - "rotation": 90 - } + "up": {"uv": [13, 0, 3, 3], "rotation": 270, "texture": "#0"}, + "down": {"uv": [13, 2, 3, 3], "rotation": 90, "texture": "#0"} } }, { - "name": "cube", "from": [0, 0, 3], "to": [3, 5, 13], "faces": { @@ -70,16 +50,11 @@ "east": {"uv": [2, 11, 12, 16], "texture": "#0"}, "south": {"uv": [0, 0, 0, 0], "texture": "#0"}, "west": {"uv": [13, 11, 3, 16], "texture": "#0"}, - "up": { - "uv": [13, 11, 3, 12], - "texture": "#0", - "rotation": 270 - }, + "up": {"uv": [13, 11, 3, 12], "rotation": 270, "texture": "#0"}, "down": {"uv": [0, 0, 0, 0], "texture": "#0"} } }, { - "name": "cube", "from": [0, 8, 3], "to": [3, 10, 13], "faces": { @@ -87,20 +62,11 @@ "east": {"uv": [3, 6, 13, 8], "texture": "#0"}, "south": {"uv": [0, 0, 0, 0], "texture": "#0"}, "west": {"uv": [13, 6, 3, 8], "texture": "#0"}, - "up": { - "uv": [10, 0, 0, 1], - "texture": "#0", - "rotation": 270 - }, - "down": { - "uv": [13, 7, 3, 8], - "texture": "#0", - "rotation": 90 - } + "up": {"uv": [10, 0, 0, 1], "rotation": 270, "texture": "#0"}, + "down": {"uv": [13, 7, 3, 8], "rotation": 90, "texture": "#0"} } }, { - "name": "cube", "from": [0, 5, 7], "to": [3, 8, 9], "faces": { @@ -113,7 +79,6 @@ } }, { - "name": "cube", "from": [0, 10, 7], "to": [3, 13, 9], "faces": { @@ -125,6 +90,5 @@ "down": {"uv": [0, 0, 0, 0], "texture": "#0"} } } - ], - "groups": [0, 1, 2, 3, 4, 5, 6] + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/item/iron_trapdoor.json b/src/main/resources/assets/minecraft/models/item/iron_trapdoor.json index 448c199..64a32f7 100644 --- a/src/main/resources/assets/minecraft/models/item/iron_trapdoor.json +++ b/src/main/resources/assets/minecraft/models/item/iron_trapdoor.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "parent": "block/iron_trapdoor_bottom", "textures": { "1": "blocks/iron_trapdoor", @@ -7,7 +7,6 @@ }, "elements": [ { - "name": "cube", "from": [0, 0, 0], "to": [16, 3, 3], "faces": { @@ -20,15 +19,10 @@ } }, { - "name": "cube", "from": [0, 0, 13], "to": [16, 3, 16], "faces": { - "north": { - "uv": [0, 0, 16, 3], - "texture": "#1", - "rotation": 180 - }, + "north": {"uv": [0, 0, 16, 3], "rotation": 180, "texture": "#1"}, "east": {"uv": [0, 0, 3, 3], "texture": "#1"}, "south": {"uv": [0, 0, 16, 3], "texture": "#1"}, "west": {"uv": [13, 0, 16, 3], "texture": "#1"}, @@ -37,106 +31,56 @@ } }, { - "name": "cube", "from": [13, 0, 3], "to": [16, 3, 13], "faces": { - "north": {"uv": [0, 0, 3, 3], "texture": "#1"}, "east": {"uv": [3, 0, 13, 3], "texture": "#1"}, - "south": {"uv": [0, 0, 3, 3], "texture": "#1"}, - "west": { - "uv": [3, 0, 13, 3], - "texture": "#1", - "rotation": 180 - }, + "west": {"uv": [3, 0, 13, 3], "rotation": 180, "texture": "#1"}, "up": {"uv": [13, 3, 16, 13], "texture": "#1"}, "down": {"uv": [13, 3, 16, 13], "texture": "#1"} } }, { - "name": "cube", "from": [0, 0, 3], "to": [3, 3, 13], "faces": { - "north": {"uv": [0, 0, 3, 3], "texture": "#1"}, "east": {"uv": [3, 6, 13, 9], "texture": "#1"}, - "south": {"uv": [0, 0, 3, 3], "texture": "#1"}, "west": {"uv": [3, 0, 13, 3], "texture": "#1"}, "up": {"uv": [0, 3, 3, 13], "texture": "#1"}, "down": {"uv": [0, 3, 3, 13], "texture": "#1"} } }, { - "name": "cube", "from": [6, 0, 3], "to": [10, 3, 13], "faces": { - "north": {"uv": [0, 0, 4, 3], "texture": "#1"}, - "east": { - "uv": [3, 7, 13, 10], - "texture": "#1", - "rotation": 180 - }, - "south": {"uv": [0, 0, 4, 3], "texture": "#1"}, - "west": { - "uv": [3, 7, 13, 10], - "texture": "#1", - "rotation": 180 - }, + "east": {"uv": [3, 7, 13, 10], "rotation": 180, "texture": "#1"}, + "west": {"uv": [3, 7, 13, 10], "rotation": 180, "texture": "#1"}, "up": {"uv": [6, 3, 10, 13], "texture": "#1"}, "down": {"uv": [6, 3, 10, 13], "texture": "#1"} } }, { - "name": "cube", "from": [3, 0, 6], "to": [6, 3, 10], "faces": { "north": {"uv": [10, 6, 13, 9], "texture": "#1"}, - "east": {"uv": [0, 0, 4, 3], "texture": "#1"}, - "south": { - "uv": [3, 7, 6, 10], - "texture": "#1", - "rotation": 180 - }, - "west": {"uv": [0, 0, 4, 3], "texture": "#1"}, + "south": {"uv": [3, 7, 6, 10], "rotation": 180, "texture": "#1"}, "up": {"uv": [3, 6, 6, 10], "texture": "#1"}, "down": {"uv": [3, 6, 6, 10], "texture": "#1"} } }, { - "name": "cube", "from": [10, 0, 6], "to": [13, 3, 10], "faces": { "north": {"uv": [3, 6, 6, 9], "texture": "#1"}, - "east": {"uv": [0, 0, 4, 3], "texture": "#1"}, - "south": { - "uv": [10, 7, 13, 10], - "texture": "#1", - "rotation": 180 - }, - "west": {"uv": [0, 0, 4, 3], "texture": "#1"}, + "south": {"uv": [10, 7, 13, 10], "rotation": 180, "texture": "#1"}, "up": {"uv": [10, 6, 13, 10], "texture": "#1"}, "down": {"uv": [10, 6, 13, 10], "texture": "#1"} } } ], - "groups": [ - 1, - 3, - 5, - { - "name": "iron_trapdoor", - "origin": [8, 8, 8], - "display": { - "visibility": true, - "export": true, - "autouv": true - }, - "children": [0, 1, 2, 3, 4, 5, 6] - } - ], "display": { "thirdperson_righthand": { "scale": [0.375, 0.375, 0.375], @@ -158,7 +102,6 @@ "rotation": [0, 225, 0], "translation": [0, 0, 0] }, - "head": {"scale": [1, 1, 1]}, "ground": { "scale": [0.25, 0.25, 0.25], "rotation": [0, 0, 0], @@ -174,5 +117,11 @@ "rotation": [30, 225, 0], "translation": [0, 0, 0] } - } + }, + "groups": [ + { + "name": "iron_trapdoor", + "children": [0, 1, 2, 3, 4, 5, 6] + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/item/trapdoor.json b/src/main/resources/assets/minecraft/models/item/trapdoor.json index d9b2c08..829039b 100644 --- a/src/main/resources/assets/minecraft/models/item/trapdoor.json +++ b/src/main/resources/assets/minecraft/models/item/trapdoor.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", + "credit": "Made with Blockbench", "parent": "block/wooden_trapdoor_bottom", "textures": { "0": "blocks/trapdoor", @@ -7,7 +7,6 @@ }, "elements": [ { - "name": "cube", "from": [0, 0, 0], "to": [16, 3, 3], "faces": { @@ -20,15 +19,10 @@ } }, { - "name": "cube", "from": [0, 0, 13], "to": [16, 3, 16], "faces": { - "north": { - "uv": [0, 0, 16, 3], - "texture": "#0", - "rotation": 180 - }, + "north": {"uv": [0, 0, 16, 3], "rotation": 180, "texture": "#0"}, "east": {"uv": [0, 0, 3, 3], "texture": "#0"}, "south": {"uv": [0, 0, 16, 3], "texture": "#0"}, "west": {"uv": [13, 0, 16, 3], "texture": "#0"}, @@ -37,125 +31,56 @@ } }, { - "name": "cube", "from": [13, 0, 3], "to": [16, 3, 13], "faces": { - "north": { - "uv": [0, 0, 3, 3], - "texture": "#missing" - }, "east": {"uv": [3, 0, 13, 3], "texture": "#0"}, - "south": { - "uv": [0, 0, 3, 3], - "texture": "#missing" - }, - "west": { - "uv": [3, 0, 13, 3], - "texture": "#0", - "rotation": 180 - }, + "west": {"uv": [3, 0, 13, 3], "rotation": 180, "texture": "#0"}, "up": {"uv": [13, 3, 16, 13], "texture": "#0"}, "down": {"uv": [13, 3, 16, 13], "texture": "#0"} } }, { - "name": "cube", "from": [0, 0, 3], "to": [3, 3, 13], "faces": { - "north": { - "uv": [0, 0, 3, 3], - "texture": "#missing" - }, "east": {"uv": [3, 6, 13, 9], "texture": "#0"}, - "south": { - "uv": [0, 0, 3, 3], - "texture": "#missing" - }, "west": {"uv": [3, 0, 13, 3], "texture": "#0"}, "up": {"uv": [0, 3, 3, 13], "texture": "#0"}, "down": {"uv": [0, 3, 3, 13], "texture": "#0"} } }, { - "name": "cube", "from": [6, 0, 3], "to": [10, 3, 13], "faces": { - "north": { - "uv": [0, 0, 4, 3], - "texture": "#missing" - }, - "east": { - "uv": [3, 7, 13, 10], - "texture": "#0", - "rotation": 180 - }, - "south": { - "uv": [0, 0, 4, 3], - "texture": "#missing" - }, - "west": { - "uv": [3, 7, 13, 10], - "texture": "#0", - "rotation": 180 - }, + "east": {"uv": [3, 7, 13, 10], "rotation": 180, "texture": "#0"}, + "west": {"uv": [3, 7, 13, 10], "rotation": 180, "texture": "#0"}, "up": {"uv": [6, 3, 10, 13], "texture": "#0"}, "down": {"uv": [6, 3, 10, 13], "texture": "#0"} } }, { - "name": "cube", "from": [3, 0, 6], "to": [6, 3, 10], "faces": { "north": {"uv": [10, 6, 13, 9], "texture": "#0"}, - "east": {"uv": [0, 0, 4, 3], "texture": "#missing"}, - "south": { - "uv": [3, 7, 6, 10], - "texture": "#0", - "rotation": 180 - }, - "west": {"uv": [0, 0, 4, 3], "texture": "#missing"}, + "south": {"uv": [3, 7, 6, 10], "rotation": 180, "texture": "#0"}, "up": {"uv": [3, 6, 6, 10], "texture": "#0"}, "down": {"uv": [3, 6, 6, 10], "texture": "#0"} } }, { - "name": "cube", "from": [10, 0, 6], "to": [13, 3, 10], "faces": { "north": {"uv": [3, 6, 6, 9], "texture": "#0"}, - "east": {"uv": [0, 0, 4, 3], "texture": "#missing"}, - "south": { - "uv": [10, 7, 13, 10], - "texture": "#0", - "rotation": 180 - }, - "west": {"uv": [0, 0, 4, 3], "texture": "#missing"}, + "south": {"uv": [10, 7, 13, 10], "rotation": 180, "texture": "#0"}, "up": {"uv": [10, 6, 13, 10], "texture": "#0"}, "down": {"uv": [10, 6, 13, 10], "texture": "#0"} } } ], - "groups": [ - 1, - 3, - 5, - { - "name": "trapdoor", - "origin": [8, 8, 8], - "isOpen": true, - "display": { - "visibility": true, - "export": true, - "autouv": true - }, - "children": [0, 1, 2, 3, 4, 5, 6] - } - ], "display": { "thirdperson_righthand": { "scale": [0.375, 0.375, 0.375], @@ -182,7 +107,6 @@ "rotation": [30, 225, 0], "translation": [0, 0, 0] }, - "head": {"scale": [1, 1, 1]}, "firstperson_lefthand": { "scale": [0.4, 0.4, 0.4], "rotation": [0, 225, 0], @@ -193,5 +117,11 @@ "rotation": [0, 45, 0], "translation": [0, 0, 0] } - } + }, + "groups": [ + { + "name": "trapdoor", + "children": [0, 1, 2, 3, 4, 5, 6] + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/texts/splashes.txt b/src/main/resources/assets/minecraft/texts/splashes.txt index c5c06a4..19505f5 100644 --- a/src/main/resources/assets/minecraft/texts/splashes.txt +++ b/src/main/resources/assets/minecraft/texts/splashes.txt @@ -1,7 +1,5 @@ Is that why you explode?! Burn creeper, BURN! -/locate Flagstaff,AZ -/locate Tuscon,AZ /kill @e[type=demon] Ivan Moody! Five Finger Death Punch! @@ -31,8 +29,6 @@ I'll never stop playing Minecraft, Angelica! Chester Bennington! LINKIN PARK! Mike Shinoda! -/locate GCU -/locate PHX College Method Man! DMX! Redman! @@ -61,7 +57,7 @@ Windows security is a big fat joke! Rob Halford! Judas Priest! Since 1969! -GNU/Linux>Microshaft+Apple! +GNU/Linux>Microshaft+crApple! Screw Windows 10 and macOS! I use Arch by the way... @@ -77,3 +73,6 @@ Strike while the iron is hot! I'm modding it now, Angelica! JAVA IS SO FREAKING CONFUSING!!!!! Java sucks! + +IN THIS HOUR, THE TOWER SHALL FALL!!!!!! +I AM THAT I AM!!!!!! diff --git a/src/main/resources/assets/minecraft/textures/blocks/anvil_base.png b/src/main/resources/assets/minecraft/textures/blocks/anvil_base.png new file mode 100644 index 0000000..50848f8 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/anvil_base.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/anvil_top_damaged_0.png b/src/main/resources/assets/minecraft/textures/blocks/anvil_top_damaged_0.png new file mode 100644 index 0000000..395dea4 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/anvil_top_damaged_0.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/anvil_top_damaged_1.png b/src/main/resources/assets/minecraft/textures/blocks/anvil_top_damaged_1.png new file mode 100644 index 0000000..eddc47f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/anvil_top_damaged_1.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/anvil_top_damaged_2.png b/src/main/resources/assets/minecraft/textures/blocks/anvil_top_damaged_2.png new file mode 100644 index 0000000..6cade1f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/anvil_top_damaged_2.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/beacon.png b/src/main/resources/assets/minecraft/textures/blocks/beacon.png new file mode 100644 index 0000000..a69e59d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/beacon.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/bedrock.png b/src/main/resources/assets/minecraft/textures/blocks/bedrock.png new file mode 100644 index 0000000..1643c99 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/bedrock.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/beetroots_stage_0.png b/src/main/resources/assets/minecraft/textures/blocks/beetroots_stage_0.png new file mode 100644 index 0000000..c1ef732 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/beetroots_stage_0.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/beetroots_stage_1.png b/src/main/resources/assets/minecraft/textures/blocks/beetroots_stage_1.png new file mode 100644 index 0000000..1275f4f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/beetroots_stage_1.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/beetroots_stage_2.png b/src/main/resources/assets/minecraft/textures/blocks/beetroots_stage_2.png new file mode 100644 index 0000000..b7347df Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/beetroots_stage_2.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/beetroots_stage_3.png b/src/main/resources/assets/minecraft/textures/blocks/beetroots_stage_3.png new file mode 100644 index 0000000..a13a0ec Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/beetroots_stage_3.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/bone_block_side.png b/src/main/resources/assets/minecraft/textures/blocks/bone_block_side.png new file mode 100644 index 0000000..ffdf641 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/bone_block_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/bone_block_top.png b/src/main/resources/assets/minecraft/textures/blocks/bone_block_top.png new file mode 100644 index 0000000..85a8b87 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/bone_block_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/bookshelf.png b/src/main/resources/assets/minecraft/textures/blocks/bookshelf.png new file mode 100644 index 0000000..7ac3737 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/bookshelf.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/brewing_stand.png b/src/main/resources/assets/minecraft/textures/blocks/brewing_stand.png new file mode 100644 index 0000000..60832aa Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/brewing_stand.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/brewing_stand_base.png b/src/main/resources/assets/minecraft/textures/blocks/brewing_stand_base.png new file mode 100644 index 0000000..0742fbf Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/brewing_stand_base.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/brick.png b/src/main/resources/assets/minecraft/textures/blocks/brick.png new file mode 100644 index 0000000..fd6959c Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/brick.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/cactus_bottom.png b/src/main/resources/assets/minecraft/textures/blocks/cactus_bottom.png new file mode 100644 index 0000000..4bc7885 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/cactus_bottom.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/cactus_side.png b/src/main/resources/assets/minecraft/textures/blocks/cactus_side.png new file mode 100644 index 0000000..9c55503 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/cactus_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/cactus_top.png b/src/main/resources/assets/minecraft/textures/blocks/cactus_top.png new file mode 100644 index 0000000..98e6faa Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/cactus_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/cake_bottom.png b/src/main/resources/assets/minecraft/textures/blocks/cake_bottom.png new file mode 100644 index 0000000..d93b15a Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/cake_bottom.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/cake_inner.png b/src/main/resources/assets/minecraft/textures/blocks/cake_inner.png new file mode 100644 index 0000000..ce7ce69 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/cake_inner.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/cake_side.png b/src/main/resources/assets/minecraft/textures/blocks/cake_side.png new file mode 100644 index 0000000..343a023 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/cake_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/cake_top.png b/src/main/resources/assets/minecraft/textures/blocks/cake_top.png new file mode 100644 index 0000000..2947892 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/cake_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/carrots_stage_0.png b/src/main/resources/assets/minecraft/textures/blocks/carrots_stage_0.png new file mode 100644 index 0000000..c1ef732 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/carrots_stage_0.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/carrots_stage_1.png b/src/main/resources/assets/minecraft/textures/blocks/carrots_stage_1.png new file mode 100644 index 0000000..1275f4f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/carrots_stage_1.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/carrots_stage_2.png b/src/main/resources/assets/minecraft/textures/blocks/carrots_stage_2.png new file mode 100644 index 0000000..b7347df Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/carrots_stage_2.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/carrots_stage_3.png b/src/main/resources/assets/minecraft/textures/blocks/carrots_stage_3.png new file mode 100644 index 0000000..2391be8 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/carrots_stage_3.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/cauldron_bottom.png b/src/main/resources/assets/minecraft/textures/blocks/cauldron_bottom.png new file mode 100644 index 0000000..acb4c08 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/cauldron_bottom.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/cauldron_inner.png b/src/main/resources/assets/minecraft/textures/blocks/cauldron_inner.png new file mode 100644 index 0000000..5ae6c70 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/cauldron_inner.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/cauldron_side.png b/src/main/resources/assets/minecraft/textures/blocks/cauldron_side.png new file mode 100644 index 0000000..b976acf Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/cauldron_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/cauldron_top.png b/src/main/resources/assets/minecraft/textures/blocks/cauldron_top.png new file mode 100644 index 0000000..970eefa Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/cauldron_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/chain_command_block_back.png b/src/main/resources/assets/minecraft/textures/blocks/chain_command_block_back.png new file mode 100644 index 0000000..aab8909 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/chain_command_block_back.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/chain_command_block_back.png.mcmeta b/src/main/resources/assets/minecraft/textures/blocks/chain_command_block_back.png.mcmeta new file mode 100644 index 0000000..4894b53 --- /dev/null +++ b/src/main/resources/assets/minecraft/textures/blocks/chain_command_block_back.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 10 + } +} diff --git a/src/main/resources/assets/minecraft/textures/blocks/chain_command_block_conditional.png b/src/main/resources/assets/minecraft/textures/blocks/chain_command_block_conditional.png new file mode 100644 index 0000000..b3bb6a4 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/chain_command_block_conditional.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/chain_command_block_conditional.png.mcmeta b/src/main/resources/assets/minecraft/textures/blocks/chain_command_block_conditional.png.mcmeta new file mode 100644 index 0000000..4894b53 --- /dev/null +++ b/src/main/resources/assets/minecraft/textures/blocks/chain_command_block_conditional.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 10 + } +} diff --git a/src/main/resources/assets/minecraft/textures/blocks/chain_command_block_front.png b/src/main/resources/assets/minecraft/textures/blocks/chain_command_block_front.png new file mode 100644 index 0000000..a3f94cb Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/chain_command_block_front.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/chain_command_block_front.png.mcmeta b/src/main/resources/assets/minecraft/textures/blocks/chain_command_block_front.png.mcmeta new file mode 100644 index 0000000..4894b53 --- /dev/null +++ b/src/main/resources/assets/minecraft/textures/blocks/chain_command_block_front.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 10 + } +} diff --git a/src/main/resources/assets/minecraft/textures/blocks/chain_command_block_side.png b/src/main/resources/assets/minecraft/textures/blocks/chain_command_block_side.png new file mode 100644 index 0000000..c67fd4c Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/chain_command_block_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/chain_command_block_side.png.mcmeta b/src/main/resources/assets/minecraft/textures/blocks/chain_command_block_side.png.mcmeta new file mode 100644 index 0000000..4894b53 --- /dev/null +++ b/src/main/resources/assets/minecraft/textures/blocks/chain_command_block_side.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 10 + } +} diff --git a/src/main/resources/assets/minecraft/textures/blocks/chorus_flower.png b/src/main/resources/assets/minecraft/textures/blocks/chorus_flower.png new file mode 100644 index 0000000..97d1ca6 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/chorus_flower.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/chorus_flower_dead.png b/src/main/resources/assets/minecraft/textures/blocks/chorus_flower_dead.png new file mode 100644 index 0000000..e9a3952 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/chorus_flower_dead.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/chorus_plant.png b/src/main/resources/assets/minecraft/textures/blocks/chorus_plant.png new file mode 100644 index 0000000..bc2de3c Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/chorus_plant.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/clay.png b/src/main/resources/assets/minecraft/textures/blocks/clay.png new file mode 100644 index 0000000..c19e031 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/clay.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/coal_block.png b/src/main/resources/assets/minecraft/textures/blocks/coal_block.png new file mode 100644 index 0000000..d440bb9 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/coal_block.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/coal_ore.png b/src/main/resources/assets/minecraft/textures/blocks/coal_ore.png new file mode 100644 index 0000000..49486d2 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/coal_ore.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/coarse_dirt.png b/src/main/resources/assets/minecraft/textures/blocks/coarse_dirt.png new file mode 100644 index 0000000..3107d43 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/coarse_dirt.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/cobblestone.png b/src/main/resources/assets/minecraft/textures/blocks/cobblestone.png new file mode 100644 index 0000000..da3498c Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/cobblestone.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/cobblestone_mossy.png b/src/main/resources/assets/minecraft/textures/blocks/cobblestone_mossy.png new file mode 100644 index 0000000..dd479ff Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/cobblestone_mossy.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/cocoa_stage_0.png b/src/main/resources/assets/minecraft/textures/blocks/cocoa_stage_0.png new file mode 100644 index 0000000..25892eb Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/cocoa_stage_0.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/cocoa_stage_1.png b/src/main/resources/assets/minecraft/textures/blocks/cocoa_stage_1.png new file mode 100644 index 0000000..1e1f48a Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/cocoa_stage_1.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/cocoa_stage_2.png b/src/main/resources/assets/minecraft/textures/blocks/cocoa_stage_2.png new file mode 100644 index 0000000..491ec26 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/cocoa_stage_2.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/command_block_back.png b/src/main/resources/assets/minecraft/textures/blocks/command_block_back.png new file mode 100644 index 0000000..dc919f4 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/command_block_back.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/command_block_back.png.mcmeta b/src/main/resources/assets/minecraft/textures/blocks/command_block_back.png.mcmeta new file mode 100644 index 0000000..4894b53 --- /dev/null +++ b/src/main/resources/assets/minecraft/textures/blocks/command_block_back.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 10 + } +} diff --git a/src/main/resources/assets/minecraft/textures/blocks/command_block_conditional.png b/src/main/resources/assets/minecraft/textures/blocks/command_block_conditional.png new file mode 100644 index 0000000..4af0ac1 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/command_block_conditional.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/command_block_conditional.png.mcmeta b/src/main/resources/assets/minecraft/textures/blocks/command_block_conditional.png.mcmeta new file mode 100644 index 0000000..4894b53 --- /dev/null +++ b/src/main/resources/assets/minecraft/textures/blocks/command_block_conditional.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 10 + } +} diff --git a/src/main/resources/assets/minecraft/textures/blocks/command_block_front.png b/src/main/resources/assets/minecraft/textures/blocks/command_block_front.png new file mode 100644 index 0000000..5584a8b Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/command_block_front.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/command_block_front.png.mcmeta b/src/main/resources/assets/minecraft/textures/blocks/command_block_front.png.mcmeta new file mode 100644 index 0000000..4894b53 --- /dev/null +++ b/src/main/resources/assets/minecraft/textures/blocks/command_block_front.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 10 + } +} diff --git a/src/main/resources/assets/minecraft/textures/blocks/command_block_side.png b/src/main/resources/assets/minecraft/textures/blocks/command_block_side.png new file mode 100644 index 0000000..e9b6377 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/command_block_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/command_block_side.png.mcmeta b/src/main/resources/assets/minecraft/textures/blocks/command_block_side.png.mcmeta new file mode 100644 index 0000000..4894b53 --- /dev/null +++ b/src/main/resources/assets/minecraft/textures/blocks/command_block_side.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 10 + } +} diff --git a/src/main/resources/assets/minecraft/textures/blocks/comparator_off.png b/src/main/resources/assets/minecraft/textures/blocks/comparator_off.png new file mode 100644 index 0000000..36b8199 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/comparator_off.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/comparator_on.png b/src/main/resources/assets/minecraft/textures/blocks/comparator_on.png new file mode 100644 index 0000000..bb9413c Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/comparator_on.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_black.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_black.png new file mode 100644 index 0000000..8413b9c Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_black.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_blue.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_blue.png new file mode 100644 index 0000000..e1f68fc Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_blue.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_brown.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_brown.png new file mode 100644 index 0000000..1ee6716 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_brown.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_cyan.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_cyan.png new file mode 100644 index 0000000..ec3936c Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_cyan.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_gray.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_gray.png new file mode 100644 index 0000000..ee95a15 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_gray.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_green.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_green.png new file mode 100644 index 0000000..8718898 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_green.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_light_blue.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_light_blue.png new file mode 100644 index 0000000..d5a46fe Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_light_blue.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_lime.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_lime.png new file mode 100644 index 0000000..c4df61e Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_lime.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_magenta.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_magenta.png new file mode 100644 index 0000000..3532620 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_magenta.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_orange.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_orange.png new file mode 100644 index 0000000..243bbc8 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_orange.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_pink.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_pink.png new file mode 100644 index 0000000..dd1950f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_pink.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_black.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_black.png new file mode 100644 index 0000000..529daaa Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_black.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_blue.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_blue.png new file mode 100644 index 0000000..e78597e Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_blue.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_brown.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_brown.png new file mode 100644 index 0000000..14487d7 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_brown.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_cyan.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_cyan.png new file mode 100644 index 0000000..3a23a95 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_cyan.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_gray.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_gray.png new file mode 100644 index 0000000..7d5a4d1 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_gray.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_green.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_green.png new file mode 100644 index 0000000..c3c78ec Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_green.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_light_blue.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_light_blue.png new file mode 100644 index 0000000..fe8b779 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_light_blue.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_lime.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_lime.png new file mode 100644 index 0000000..780aaee Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_lime.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_magenta.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_magenta.png new file mode 100644 index 0000000..054553d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_magenta.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_orange.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_orange.png new file mode 100644 index 0000000..2fb6f15 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_orange.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_pink.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_pink.png new file mode 100644 index 0000000..9f6a6bb Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_pink.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_purple.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_purple.png new file mode 100644 index 0000000..aa1b1ac Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_purple.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_red.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_red.png new file mode 100644 index 0000000..7612112 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_red.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_silver.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_silver.png new file mode 100644 index 0000000..18ebf59 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_silver.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_white.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_white.png new file mode 100644 index 0000000..35ae8ae Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_white.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_yellow.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_yellow.png new file mode 100644 index 0000000..7442983 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_powder_yellow.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_purple.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_purple.png new file mode 100644 index 0000000..bf90f74 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_purple.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_red.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_red.png new file mode 100644 index 0000000..7f97884 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_red.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_silver.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_silver.png new file mode 100644 index 0000000..21d57aa Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_silver.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_white.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_white.png new file mode 100644 index 0000000..e2f7f41 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_white.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/concrete_yellow.png b/src/main/resources/assets/minecraft/textures/blocks/concrete_yellow.png new file mode 100644 index 0000000..8bc8343 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/concrete_yellow.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/crafting_table_front.png b/src/main/resources/assets/minecraft/textures/blocks/crafting_table_front.png new file mode 100644 index 0000000..11986a4 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/crafting_table_front.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/crafting_table_side.png b/src/main/resources/assets/minecraft/textures/blocks/crafting_table_side.png new file mode 100644 index 0000000..4b71869 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/crafting_table_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/crafting_table_top.png b/src/main/resources/assets/minecraft/textures/blocks/crafting_table_top.png new file mode 100644 index 0000000..d95444d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/crafting_table_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/daylight_detector_inverted_top.png b/src/main/resources/assets/minecraft/textures/blocks/daylight_detector_inverted_top.png new file mode 100644 index 0000000..ce5bedf Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/daylight_detector_inverted_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/daylight_detector_side.png b/src/main/resources/assets/minecraft/textures/blocks/daylight_detector_side.png new file mode 100644 index 0000000..05f7e83 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/daylight_detector_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/daylight_detector_top.png b/src/main/resources/assets/minecraft/textures/blocks/daylight_detector_top.png new file mode 100644 index 0000000..9a408dc Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/daylight_detector_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/deadbush.png b/src/main/resources/assets/minecraft/textures/blocks/deadbush.png new file mode 100644 index 0000000..c64e079 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/deadbush.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/debug.png b/src/main/resources/assets/minecraft/textures/blocks/debug.png new file mode 100644 index 0000000..8643d0a Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/debug.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/debug2.png b/src/main/resources/assets/minecraft/textures/blocks/debug2.png new file mode 100644 index 0000000..e5b0d26 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/debug2.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_0.png b/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_0.png new file mode 100644 index 0000000..f65b7ed Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_0.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_1.png b/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_1.png new file mode 100644 index 0000000..7c91596 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_1.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_2.png b/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_2.png new file mode 100644 index 0000000..dadd6b0 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_2.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_3.png b/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_3.png new file mode 100644 index 0000000..52a40b6 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_3.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_4.png b/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_4.png new file mode 100644 index 0000000..e37c88a Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_4.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_5.png b/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_5.png new file mode 100644 index 0000000..9590d2f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_5.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_6.png b/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_6.png new file mode 100644 index 0000000..fb00ade Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_6.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_7.png b/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_7.png new file mode 100644 index 0000000..0b40c78 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_7.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_8.png b/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_8.png new file mode 100644 index 0000000..c0bf1de Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_8.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_9.png b/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_9.png new file mode 100644 index 0000000..e3185f8 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/destroy_stage_9.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/diamond_block.png b/src/main/resources/assets/minecraft/textures/blocks/diamond_block.png new file mode 100644 index 0000000..d8663d3 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/diamond_block.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/diamond_ore.png b/src/main/resources/assets/minecraft/textures/blocks/diamond_ore.png new file mode 100644 index 0000000..735ecda Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/diamond_ore.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/dirt.png b/src/main/resources/assets/minecraft/textures/blocks/dirt.png new file mode 100644 index 0000000..617d353 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/dirt.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/dirt_podzol_side.png b/src/main/resources/assets/minecraft/textures/blocks/dirt_podzol_side.png new file mode 100644 index 0000000..89a328b Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/dirt_podzol_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/dirt_podzol_top.png b/src/main/resources/assets/minecraft/textures/blocks/dirt_podzol_top.png new file mode 100644 index 0000000..60d1361 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/dirt_podzol_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/dispenser_front_horizontal.png b/src/main/resources/assets/minecraft/textures/blocks/dispenser_front_horizontal.png new file mode 100644 index 0000000..5465fea Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/dispenser_front_horizontal.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/dispenser_front_vertical.png b/src/main/resources/assets/minecraft/textures/blocks/dispenser_front_vertical.png new file mode 100644 index 0000000..9913188 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/dispenser_front_vertical.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/door_acacia_lower.png b/src/main/resources/assets/minecraft/textures/blocks/door_acacia_lower.png new file mode 100644 index 0000000..ba1bd2b Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/door_acacia_lower.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/door_acacia_upper.png b/src/main/resources/assets/minecraft/textures/blocks/door_acacia_upper.png new file mode 100644 index 0000000..9ea5df3 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/door_acacia_upper.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/door_birch_lower.png b/src/main/resources/assets/minecraft/textures/blocks/door_birch_lower.png new file mode 100644 index 0000000..98bca06 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/door_birch_lower.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/door_birch_upper.png b/src/main/resources/assets/minecraft/textures/blocks/door_birch_upper.png new file mode 100644 index 0000000..00183b2 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/door_birch_upper.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/door_dark_oak_lower.png b/src/main/resources/assets/minecraft/textures/blocks/door_dark_oak_lower.png new file mode 100644 index 0000000..1004d23 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/door_dark_oak_lower.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/door_dark_oak_upper.png b/src/main/resources/assets/minecraft/textures/blocks/door_dark_oak_upper.png new file mode 100644 index 0000000..cad8741 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/door_dark_oak_upper.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/door_iron_lower.png b/src/main/resources/assets/minecraft/textures/blocks/door_iron_lower.png new file mode 100644 index 0000000..13b68fd Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/door_iron_lower.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/door_iron_upper.png b/src/main/resources/assets/minecraft/textures/blocks/door_iron_upper.png new file mode 100644 index 0000000..56878fe Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/door_iron_upper.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/door_jungle_lower.png b/src/main/resources/assets/minecraft/textures/blocks/door_jungle_lower.png new file mode 100644 index 0000000..13f679f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/door_jungle_lower.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/door_jungle_upper.png b/src/main/resources/assets/minecraft/textures/blocks/door_jungle_upper.png new file mode 100644 index 0000000..df8a4c3 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/door_jungle_upper.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/door_spruce_lower.png b/src/main/resources/assets/minecraft/textures/blocks/door_spruce_lower.png new file mode 100644 index 0000000..411ef26 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/door_spruce_lower.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/door_spruce_upper.png b/src/main/resources/assets/minecraft/textures/blocks/door_spruce_upper.png new file mode 100644 index 0000000..43dceb2 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/door_spruce_upper.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/door_wood_lower.png b/src/main/resources/assets/minecraft/textures/blocks/door_wood_lower.png new file mode 100644 index 0000000..3a0bae9 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/door_wood_lower.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/door_wood_upper.png b/src/main/resources/assets/minecraft/textures/blocks/door_wood_upper.png new file mode 100644 index 0000000..93319d5 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/door_wood_upper.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/double_plant_fern_bottom.png b/src/main/resources/assets/minecraft/textures/blocks/double_plant_fern_bottom.png new file mode 100644 index 0000000..c5e43cc Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/double_plant_fern_bottom.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/double_plant_fern_top.png b/src/main/resources/assets/minecraft/textures/blocks/double_plant_fern_top.png new file mode 100644 index 0000000..f80d3e1 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/double_plant_fern_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/double_plant_grass_bottom.png b/src/main/resources/assets/minecraft/textures/blocks/double_plant_grass_bottom.png new file mode 100644 index 0000000..ecc4e5d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/double_plant_grass_bottom.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/double_plant_grass_top.png b/src/main/resources/assets/minecraft/textures/blocks/double_plant_grass_top.png new file mode 100644 index 0000000..f192abc Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/double_plant_grass_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/double_plant_paeonia_bottom.png b/src/main/resources/assets/minecraft/textures/blocks/double_plant_paeonia_bottom.png new file mode 100644 index 0000000..cdb9075 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/double_plant_paeonia_bottom.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/double_plant_paeonia_top.png b/src/main/resources/assets/minecraft/textures/blocks/double_plant_paeonia_top.png new file mode 100644 index 0000000..63f46e0 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/double_plant_paeonia_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/double_plant_rose_bottom.png b/src/main/resources/assets/minecraft/textures/blocks/double_plant_rose_bottom.png new file mode 100644 index 0000000..27aca8e Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/double_plant_rose_bottom.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/double_plant_rose_top.png b/src/main/resources/assets/minecraft/textures/blocks/double_plant_rose_top.png new file mode 100644 index 0000000..8a3d793 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/double_plant_rose_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/double_plant_sunflower_back.png b/src/main/resources/assets/minecraft/textures/blocks/double_plant_sunflower_back.png new file mode 100644 index 0000000..b0c53a7 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/double_plant_sunflower_back.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/double_plant_sunflower_bottom.png b/src/main/resources/assets/minecraft/textures/blocks/double_plant_sunflower_bottom.png new file mode 100644 index 0000000..5a1febe Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/double_plant_sunflower_bottom.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/double_plant_sunflower_front.png b/src/main/resources/assets/minecraft/textures/blocks/double_plant_sunflower_front.png new file mode 100644 index 0000000..9c13b76 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/double_plant_sunflower_front.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/double_plant_sunflower_top.png b/src/main/resources/assets/minecraft/textures/blocks/double_plant_sunflower_top.png new file mode 100644 index 0000000..6ab2f15 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/double_plant_sunflower_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/double_plant_syringa_bottom.png b/src/main/resources/assets/minecraft/textures/blocks/double_plant_syringa_bottom.png new file mode 100644 index 0000000..eccee1d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/double_plant_syringa_bottom.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/double_plant_syringa_top.png b/src/main/resources/assets/minecraft/textures/blocks/double_plant_syringa_top.png new file mode 100644 index 0000000..3b354e5 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/double_plant_syringa_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/dragon_egg.png b/src/main/resources/assets/minecraft/textures/blocks/dragon_egg.png new file mode 100644 index 0000000..ee9d67f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/dragon_egg.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/dropper_front_horizontal.png b/src/main/resources/assets/minecraft/textures/blocks/dropper_front_horizontal.png new file mode 100644 index 0000000..a2848da Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/dropper_front_horizontal.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/dropper_front_vertical.png b/src/main/resources/assets/minecraft/textures/blocks/dropper_front_vertical.png new file mode 100644 index 0000000..b0802c4 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/dropper_front_vertical.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/emerald_block.png b/src/main/resources/assets/minecraft/textures/blocks/emerald_block.png new file mode 100644 index 0000000..dc214ee Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/emerald_block.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/emerald_ore.png b/src/main/resources/assets/minecraft/textures/blocks/emerald_ore.png new file mode 100644 index 0000000..db820dd Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/emerald_ore.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/enchanting_table_bottom.png b/src/main/resources/assets/minecraft/textures/blocks/enchanting_table_bottom.png new file mode 100644 index 0000000..ad0de63 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/enchanting_table_bottom.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/enchanting_table_side.png b/src/main/resources/assets/minecraft/textures/blocks/enchanting_table_side.png new file mode 100644 index 0000000..f2f4614 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/enchanting_table_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/enchanting_table_top.png b/src/main/resources/assets/minecraft/textures/blocks/enchanting_table_top.png new file mode 100644 index 0000000..0d5f68f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/enchanting_table_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/end_bricks.png b/src/main/resources/assets/minecraft/textures/blocks/end_bricks.png new file mode 100644 index 0000000..b8a99a8 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/end_bricks.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/end_rod.png b/src/main/resources/assets/minecraft/textures/blocks/end_rod.png new file mode 100644 index 0000000..b01dd48 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/end_rod.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/end_stone.png b/src/main/resources/assets/minecraft/textures/blocks/end_stone.png new file mode 100644 index 0000000..c2a91e3 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/end_stone.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/endframe_eye.png b/src/main/resources/assets/minecraft/textures/blocks/endframe_eye.png new file mode 100644 index 0000000..afa1d5d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/endframe_eye.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/endframe_side.png b/src/main/resources/assets/minecraft/textures/blocks/endframe_side.png new file mode 100644 index 0000000..e6cb567 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/endframe_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/endframe_top.png b/src/main/resources/assets/minecraft/textures/blocks/endframe_top.png new file mode 100644 index 0000000..35215a5 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/endframe_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/farmland_dry.png b/src/main/resources/assets/minecraft/textures/blocks/farmland_dry.png new file mode 100644 index 0000000..d03a0f4 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/farmland_dry.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/farmland_wet.png b/src/main/resources/assets/minecraft/textures/blocks/farmland_wet.png new file mode 100644 index 0000000..f8d460d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/farmland_wet.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/fern.png b/src/main/resources/assets/minecraft/textures/blocks/fern.png new file mode 100644 index 0000000..fd76950 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/fern.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/fire_layer_0.png b/src/main/resources/assets/minecraft/textures/blocks/fire_layer_0.png new file mode 100644 index 0000000..6066dc4 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/fire_layer_0.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/fire_layer_0.png.mcmeta b/src/main/resources/assets/minecraft/textures/blocks/fire_layer_0.png.mcmeta new file mode 100644 index 0000000..7644671 --- /dev/null +++ b/src/main/resources/assets/minecraft/textures/blocks/fire_layer_0.png.mcmeta @@ -0,0 +1,38 @@ +{ + "animation": { + "frames": [ + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15 + ] + } +} diff --git a/src/main/resources/assets/minecraft/textures/blocks/fire_layer_1.png b/src/main/resources/assets/minecraft/textures/blocks/fire_layer_1.png new file mode 100644 index 0000000..fd439b1 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/fire_layer_1.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/fire_layer_1.png.mcmeta b/src/main/resources/assets/minecraft/textures/blocks/fire_layer_1.png.mcmeta new file mode 100644 index 0000000..4f0718a --- /dev/null +++ b/src/main/resources/assets/minecraft/textures/blocks/fire_layer_1.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": {} +} \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/textures/blocks/flower_allium.png b/src/main/resources/assets/minecraft/textures/blocks/flower_allium.png new file mode 100644 index 0000000..2068ace Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/flower_allium.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/flower_blue_orchid.png b/src/main/resources/assets/minecraft/textures/blocks/flower_blue_orchid.png new file mode 100644 index 0000000..7c00b5c Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/flower_blue_orchid.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/flower_dandelion.png b/src/main/resources/assets/minecraft/textures/blocks/flower_dandelion.png new file mode 100644 index 0000000..873e3f5 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/flower_dandelion.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/flower_houstonia.png b/src/main/resources/assets/minecraft/textures/blocks/flower_houstonia.png new file mode 100644 index 0000000..50151c8 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/flower_houstonia.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/flower_oxeye_daisy.png b/src/main/resources/assets/minecraft/textures/blocks/flower_oxeye_daisy.png new file mode 100644 index 0000000..03a11e5 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/flower_oxeye_daisy.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/flower_paeonia.png b/src/main/resources/assets/minecraft/textures/blocks/flower_paeonia.png new file mode 100644 index 0000000..fc14bde Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/flower_paeonia.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/flower_pot.png b/src/main/resources/assets/minecraft/textures/blocks/flower_pot.png new file mode 100644 index 0000000..09c2523 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/flower_pot.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/flower_rose.png b/src/main/resources/assets/minecraft/textures/blocks/flower_rose.png new file mode 100644 index 0000000..4a76098 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/flower_rose.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/flower_tulip_orange.png b/src/main/resources/assets/minecraft/textures/blocks/flower_tulip_orange.png new file mode 100644 index 0000000..200815f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/flower_tulip_orange.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/flower_tulip_pink.png b/src/main/resources/assets/minecraft/textures/blocks/flower_tulip_pink.png new file mode 100644 index 0000000..719457f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/flower_tulip_pink.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/flower_tulip_red.png b/src/main/resources/assets/minecraft/textures/blocks/flower_tulip_red.png new file mode 100644 index 0000000..1a01964 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/flower_tulip_red.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/flower_tulip_white.png b/src/main/resources/assets/minecraft/textures/blocks/flower_tulip_white.png new file mode 100644 index 0000000..30886cc Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/flower_tulip_white.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/frosted_ice_0.png b/src/main/resources/assets/minecraft/textures/blocks/frosted_ice_0.png new file mode 100644 index 0000000..ac946e9 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/frosted_ice_0.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/frosted_ice_1.png b/src/main/resources/assets/minecraft/textures/blocks/frosted_ice_1.png new file mode 100644 index 0000000..96f1f6a Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/frosted_ice_1.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/frosted_ice_2.png b/src/main/resources/assets/minecraft/textures/blocks/frosted_ice_2.png new file mode 100644 index 0000000..2a27187 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/frosted_ice_2.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/frosted_ice_3.png b/src/main/resources/assets/minecraft/textures/blocks/frosted_ice_3.png new file mode 100644 index 0000000..4cd4115 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/frosted_ice_3.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/furnace_front_off.png b/src/main/resources/assets/minecraft/textures/blocks/furnace_front_off.png new file mode 100644 index 0000000..3197bfd Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/furnace_front_off.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/furnace_front_on.png b/src/main/resources/assets/minecraft/textures/blocks/furnace_front_on.png new file mode 100644 index 0000000..90b8b8a Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/furnace_front_on.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/furnace_side.png b/src/main/resources/assets/minecraft/textures/blocks/furnace_side.png new file mode 100644 index 0000000..115f73d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/furnace_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/furnace_top.png b/src/main/resources/assets/minecraft/textures/blocks/furnace_top.png new file mode 100644 index 0000000..a3a5a08 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/furnace_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass.png b/src/main/resources/assets/minecraft/textures/blocks/glass.png new file mode 100644 index 0000000..acadb01 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_black.png b/src/main/resources/assets/minecraft/textures/blocks/glass_black.png new file mode 100644 index 0000000..50e6677 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_black.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_blue.png b/src/main/resources/assets/minecraft/textures/blocks/glass_blue.png new file mode 100644 index 0000000..d516889 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_blue.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_brown.png b/src/main/resources/assets/minecraft/textures/blocks/glass_brown.png new file mode 100644 index 0000000..5d7f01d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_brown.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_cyan.png b/src/main/resources/assets/minecraft/textures/blocks/glass_cyan.png new file mode 100644 index 0000000..0a4fc8d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_cyan.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_gray.png b/src/main/resources/assets/minecraft/textures/blocks/glass_gray.png new file mode 100644 index 0000000..3953a4b Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_gray.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_green.png b/src/main/resources/assets/minecraft/textures/blocks/glass_green.png new file mode 100644 index 0000000..73e4b4b Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_green.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_light_blue.png b/src/main/resources/assets/minecraft/textures/blocks/glass_light_blue.png new file mode 100644 index 0000000..f7f02d1 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_light_blue.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_lime.png b/src/main/resources/assets/minecraft/textures/blocks/glass_lime.png new file mode 100644 index 0000000..775a618 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_lime.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_magenta.png b/src/main/resources/assets/minecraft/textures/blocks/glass_magenta.png new file mode 100644 index 0000000..c1778c1 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_magenta.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_orange.png b/src/main/resources/assets/minecraft/textures/blocks/glass_orange.png new file mode 100644 index 0000000..95b0a68 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_orange.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top.png b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top.png new file mode 100644 index 0000000..02de587 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_black.png b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_black.png new file mode 100644 index 0000000..43d60c5 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_black.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_blue.png b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_blue.png new file mode 100644 index 0000000..55c614f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_blue.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_brown.png b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_brown.png new file mode 100644 index 0000000..cbd791a Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_brown.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_cyan.png b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_cyan.png new file mode 100644 index 0000000..9a34b84 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_cyan.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_gray.png b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_gray.png new file mode 100644 index 0000000..bb06114 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_gray.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_green.png b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_green.png new file mode 100644 index 0000000..a7d9fc7 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_green.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_light_blue.png b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_light_blue.png new file mode 100644 index 0000000..6a0e661 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_light_blue.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_lime.png b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_lime.png new file mode 100644 index 0000000..0607d75 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_lime.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_magenta.png b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_magenta.png new file mode 100644 index 0000000..5419e52 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_magenta.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_orange.png b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_orange.png new file mode 100644 index 0000000..2866571 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_orange.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_pink.png b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_pink.png new file mode 100644 index 0000000..6b6cd76 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_pink.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_purple.png b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_purple.png new file mode 100644 index 0000000..23e208e Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_purple.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_red.png b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_red.png new file mode 100644 index 0000000..22b69db Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_red.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_silver.png b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_silver.png new file mode 100644 index 0000000..f226ecc Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_silver.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_white.png b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_white.png new file mode 100644 index 0000000..0c7d091 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_white.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_yellow.png b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_yellow.png new file mode 100644 index 0000000..1c8580f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_pane_top_yellow.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_pink.png b/src/main/resources/assets/minecraft/textures/blocks/glass_pink.png new file mode 100644 index 0000000..c1f61f0 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_pink.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_purple.png b/src/main/resources/assets/minecraft/textures/blocks/glass_purple.png new file mode 100644 index 0000000..712a624 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_purple.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_red.png b/src/main/resources/assets/minecraft/textures/blocks/glass_red.png new file mode 100644 index 0000000..37b603d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_red.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_silver.png b/src/main/resources/assets/minecraft/textures/blocks/glass_silver.png new file mode 100644 index 0000000..528dfaa Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_silver.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_white.png b/src/main/resources/assets/minecraft/textures/blocks/glass_white.png new file mode 100644 index 0000000..fce23b7 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_white.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glass_yellow.png b/src/main/resources/assets/minecraft/textures/blocks/glass_yellow.png new file mode 100644 index 0000000..e576ca7 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glass_yellow.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_black.png b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_black.png new file mode 100644 index 0000000..18acd92 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_black.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_blue.png b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_blue.png new file mode 100644 index 0000000..8ced312 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_blue.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_brown.png b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_brown.png new file mode 100644 index 0000000..17bd427 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_brown.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_cyan.png b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_cyan.png new file mode 100644 index 0000000..9a14cc5 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_cyan.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_gray.png b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_gray.png new file mode 100644 index 0000000..8eab4ed Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_gray.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_green.png b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_green.png new file mode 100644 index 0000000..c1f81de Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_green.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_light_blue.png b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_light_blue.png new file mode 100644 index 0000000..516fb7e Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_light_blue.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_lime.png b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_lime.png new file mode 100644 index 0000000..d5ad2b6 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_lime.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_magenta.png b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_magenta.png new file mode 100644 index 0000000..5d6eb3a Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_magenta.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_orange.png b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_orange.png new file mode 100644 index 0000000..4e2d3d2 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_orange.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_pink.png b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_pink.png new file mode 100644 index 0000000..30a1975 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_pink.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_purple.png b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_purple.png new file mode 100644 index 0000000..d0f9e68 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_purple.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_red.png b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_red.png new file mode 100644 index 0000000..ee46623 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_red.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_silver.png b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_silver.png new file mode 100644 index 0000000..3478710 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_silver.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_white.png b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_white.png new file mode 100644 index 0000000..b94f6b9 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_white.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_yellow.png b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_yellow.png new file mode 100644 index 0000000..3d20abf Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glazed_terracotta_yellow.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/glowstone.png b/src/main/resources/assets/minecraft/textures/blocks/glowstone.png new file mode 100644 index 0000000..c7253b3 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/glowstone.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/gold_block.png b/src/main/resources/assets/minecraft/textures/blocks/gold_block.png new file mode 100644 index 0000000..4d233c7 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/gold_block.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/gold_ore.png b/src/main/resources/assets/minecraft/textures/blocks/gold_ore.png new file mode 100644 index 0000000..b1a7a55 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/gold_ore.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/grass_path_side.png b/src/main/resources/assets/minecraft/textures/blocks/grass_path_side.png new file mode 100644 index 0000000..c9de135 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/grass_path_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/grass_path_top.png b/src/main/resources/assets/minecraft/textures/blocks/grass_path_top.png new file mode 100644 index 0000000..d1f6e3a Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/grass_path_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/grass_side.png b/src/main/resources/assets/minecraft/textures/blocks/grass_side.png new file mode 100644 index 0000000..a4975e5 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/grass_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/grass_side_overlay.png b/src/main/resources/assets/minecraft/textures/blocks/grass_side_overlay.png new file mode 100644 index 0000000..fc3fa9d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/grass_side_overlay.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/grass_side_snowed.png b/src/main/resources/assets/minecraft/textures/blocks/grass_side_snowed.png new file mode 100644 index 0000000..8b28fc7 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/grass_side_snowed.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/grass_top.png b/src/main/resources/assets/minecraft/textures/blocks/grass_top.png new file mode 100644 index 0000000..eaa7e45 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/grass_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/gravel.png b/src/main/resources/assets/minecraft/textures/blocks/gravel.png new file mode 100644 index 0000000..388e5c5 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/gravel.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/hardened_clay.png b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay.png new file mode 100644 index 0000000..b94728a Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_black.png b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_black.png new file mode 100644 index 0000000..e1ce262 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_black.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_blue.png b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_blue.png new file mode 100644 index 0000000..7afe930 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_blue.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_brown.png b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_brown.png new file mode 100644 index 0000000..9937e72 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_brown.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_cyan.png b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_cyan.png new file mode 100644 index 0000000..b2d18c9 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_cyan.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_gray.png b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_gray.png new file mode 100644 index 0000000..dca1dd4 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_gray.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_green.png b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_green.png new file mode 100644 index 0000000..3c52b33 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_green.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_light_blue.png b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_light_blue.png new file mode 100644 index 0000000..3160623 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_light_blue.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_lime.png b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_lime.png new file mode 100644 index 0000000..cdd0c4d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_lime.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_magenta.png b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_magenta.png new file mode 100644 index 0000000..f28da0d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_magenta.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_orange.png b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_orange.png new file mode 100644 index 0000000..9ccdb4b Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_orange.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_pink.png b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_pink.png new file mode 100644 index 0000000..7ffea8d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_pink.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_purple.png b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_purple.png new file mode 100644 index 0000000..8bee14e Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_purple.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_red.png b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_red.png new file mode 100644 index 0000000..e0e800b Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_red.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_silver.png b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_silver.png new file mode 100644 index 0000000..cf7b22e Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_silver.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_white.png b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_white.png new file mode 100644 index 0000000..b7ba8e9 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_white.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_yellow.png b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_yellow.png new file mode 100644 index 0000000..ec96503 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/hardened_clay_stained_yellow.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/hay_block_side.png b/src/main/resources/assets/minecraft/textures/blocks/hay_block_side.png new file mode 100644 index 0000000..342d8fe Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/hay_block_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/hay_block_top.png b/src/main/resources/assets/minecraft/textures/blocks/hay_block_top.png new file mode 100644 index 0000000..3c74f6f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/hay_block_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/hopper_inside.png b/src/main/resources/assets/minecraft/textures/blocks/hopper_inside.png new file mode 100644 index 0000000..5ae6c70 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/hopper_inside.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/hopper_outside.png b/src/main/resources/assets/minecraft/textures/blocks/hopper_outside.png new file mode 100644 index 0000000..c961a17 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/hopper_outside.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/hopper_top.png b/src/main/resources/assets/minecraft/textures/blocks/hopper_top.png new file mode 100644 index 0000000..bfe83a3 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/hopper_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/ice.png b/src/main/resources/assets/minecraft/textures/blocks/ice.png new file mode 100644 index 0000000..ac946e9 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/ice.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/ice_packed.png b/src/main/resources/assets/minecraft/textures/blocks/ice_packed.png new file mode 100644 index 0000000..3b06f3f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/ice_packed.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/iron_bars.png b/src/main/resources/assets/minecraft/textures/blocks/iron_bars.png new file mode 100644 index 0000000..cb3057d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/iron_bars.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/iron_ore.png b/src/main/resources/assets/minecraft/textures/blocks/iron_ore.png new file mode 100644 index 0000000..250d8bb Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/iron_ore.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/iron_trapdoor.png b/src/main/resources/assets/minecraft/textures/blocks/iron_trapdoor.png new file mode 100644 index 0000000..c705ca1 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/iron_trapdoor.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/itemframe_background.png b/src/main/resources/assets/minecraft/textures/blocks/itemframe_background.png new file mode 100644 index 0000000..660bae6 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/itemframe_background.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/jukebox_side.png b/src/main/resources/assets/minecraft/textures/blocks/jukebox_side.png new file mode 100644 index 0000000..a3c27c1 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/jukebox_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/jukebox_top.png b/src/main/resources/assets/minecraft/textures/blocks/jukebox_top.png new file mode 100644 index 0000000..92ddb15 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/jukebox_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/ladder.png b/src/main/resources/assets/minecraft/textures/blocks/ladder.png new file mode 100644 index 0000000..e2ec5f2 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/ladder.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/lapis_block.png b/src/main/resources/assets/minecraft/textures/blocks/lapis_block.png new file mode 100644 index 0000000..24810ac Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/lapis_block.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/lapis_ore.png b/src/main/resources/assets/minecraft/textures/blocks/lapis_ore.png new file mode 100644 index 0000000..7e293cf Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/lapis_ore.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/lava_flow.png b/src/main/resources/assets/minecraft/textures/blocks/lava_flow.png new file mode 100644 index 0000000..ccb5d6b Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/lava_flow.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/lava_flow.png.mcmeta b/src/main/resources/assets/minecraft/textures/blocks/lava_flow.png.mcmeta new file mode 100644 index 0000000..8e55e43 --- /dev/null +++ b/src/main/resources/assets/minecraft/textures/blocks/lava_flow.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} diff --git a/src/main/resources/assets/minecraft/textures/blocks/lava_still.png b/src/main/resources/assets/minecraft/textures/blocks/lava_still.png new file mode 100644 index 0000000..e62298c Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/lava_still.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/lava_still.png.mcmeta b/src/main/resources/assets/minecraft/textures/blocks/lava_still.png.mcmeta new file mode 100644 index 0000000..7ceb363 --- /dev/null +++ b/src/main/resources/assets/minecraft/textures/blocks/lava_still.png.mcmeta @@ -0,0 +1,45 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/textures/blocks/leaves_acacia.png b/src/main/resources/assets/minecraft/textures/blocks/leaves_acacia.png new file mode 100644 index 0000000..5b9b421 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/leaves_acacia.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/leaves_big_oak.png b/src/main/resources/assets/minecraft/textures/blocks/leaves_big_oak.png new file mode 100644 index 0000000..a6773af Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/leaves_big_oak.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/leaves_birch.png b/src/main/resources/assets/minecraft/textures/blocks/leaves_birch.png new file mode 100644 index 0000000..a6773af Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/leaves_birch.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/leaves_jungle.png b/src/main/resources/assets/minecraft/textures/blocks/leaves_jungle.png new file mode 100644 index 0000000..e0cb935 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/leaves_jungle.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/leaves_oak.png b/src/main/resources/assets/minecraft/textures/blocks/leaves_oak.png new file mode 100644 index 0000000..a6773af Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/leaves_oak.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/leaves_spruce.png b/src/main/resources/assets/minecraft/textures/blocks/leaves_spruce.png new file mode 100644 index 0000000..602eab8 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/leaves_spruce.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/lever.png b/src/main/resources/assets/minecraft/textures/blocks/lever.png new file mode 100644 index 0000000..051187f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/lever.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/log_acacia.png b/src/main/resources/assets/minecraft/textures/blocks/log_acacia.png new file mode 100644 index 0000000..d4ee2f4 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/log_acacia.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/log_acacia_top.png b/src/main/resources/assets/minecraft/textures/blocks/log_acacia_top.png new file mode 100644 index 0000000..5342256 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/log_acacia_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/log_big_oak.png b/src/main/resources/assets/minecraft/textures/blocks/log_big_oak.png new file mode 100644 index 0000000..5101bdc Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/log_big_oak.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/log_big_oak_top.png b/src/main/resources/assets/minecraft/textures/blocks/log_big_oak_top.png new file mode 100644 index 0000000..2bde954 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/log_big_oak_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/log_birch.png b/src/main/resources/assets/minecraft/textures/blocks/log_birch.png new file mode 100644 index 0000000..bfb209d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/log_birch.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/log_birch_top.png b/src/main/resources/assets/minecraft/textures/blocks/log_birch_top.png new file mode 100644 index 0000000..afed5cb Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/log_birch_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/log_jungle.png b/src/main/resources/assets/minecraft/textures/blocks/log_jungle.png new file mode 100644 index 0000000..0b7120a Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/log_jungle.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/log_jungle_top.png b/src/main/resources/assets/minecraft/textures/blocks/log_jungle_top.png new file mode 100644 index 0000000..d2ab7d7 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/log_jungle_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/log_oak.png b/src/main/resources/assets/minecraft/textures/blocks/log_oak.png new file mode 100644 index 0000000..914cb5f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/log_oak.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/log_oak_top.png b/src/main/resources/assets/minecraft/textures/blocks/log_oak_top.png new file mode 100644 index 0000000..97eebd1 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/log_oak_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/log_spruce.png b/src/main/resources/assets/minecraft/textures/blocks/log_spruce.png new file mode 100644 index 0000000..77a22a4 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/log_spruce.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/log_spruce_top.png b/src/main/resources/assets/minecraft/textures/blocks/log_spruce_top.png new file mode 100644 index 0000000..e68e518 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/log_spruce_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/magma.png b/src/main/resources/assets/minecraft/textures/blocks/magma.png new file mode 100644 index 0000000..b48e598 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/magma.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/magma.png.mcmeta b/src/main/resources/assets/minecraft/textures/blocks/magma.png.mcmeta new file mode 100644 index 0000000..ffc3e52 --- /dev/null +++ b/src/main/resources/assets/minecraft/textures/blocks/magma.png.mcmeta @@ -0,0 +1,11 @@ +{ + "animation": { + "frametime": 8, + "interpolate": true, + "frames": [ + 0, + 1, + 2 + ] + } +} diff --git a/src/main/resources/assets/minecraft/textures/blocks/melon_side.png b/src/main/resources/assets/minecraft/textures/blocks/melon_side.png new file mode 100644 index 0000000..b56cce1 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/melon_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/melon_stem_connected.png b/src/main/resources/assets/minecraft/textures/blocks/melon_stem_connected.png new file mode 100644 index 0000000..6a5c10e Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/melon_stem_connected.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/melon_stem_disconnected.png b/src/main/resources/assets/minecraft/textures/blocks/melon_stem_disconnected.png new file mode 100644 index 0000000..38065ef Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/melon_stem_disconnected.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/melon_top.png b/src/main/resources/assets/minecraft/textures/blocks/melon_top.png new file mode 100644 index 0000000..d4f7b46 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/melon_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/mob_spawner.png b/src/main/resources/assets/minecraft/textures/blocks/mob_spawner.png new file mode 100644 index 0000000..7d55217 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/mob_spawner.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/mushroom_block_inside.png b/src/main/resources/assets/minecraft/textures/blocks/mushroom_block_inside.png new file mode 100644 index 0000000..efea671 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/mushroom_block_inside.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/mushroom_block_skin_brown.png b/src/main/resources/assets/minecraft/textures/blocks/mushroom_block_skin_brown.png new file mode 100644 index 0000000..1f52ba8 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/mushroom_block_skin_brown.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/mushroom_block_skin_red.png b/src/main/resources/assets/minecraft/textures/blocks/mushroom_block_skin_red.png new file mode 100644 index 0000000..532e1b9 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/mushroom_block_skin_red.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/mushroom_block_skin_stem.png b/src/main/resources/assets/minecraft/textures/blocks/mushroom_block_skin_stem.png new file mode 100644 index 0000000..09e4ede Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/mushroom_block_skin_stem.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/mushroom_brown.png b/src/main/resources/assets/minecraft/textures/blocks/mushroom_brown.png new file mode 100644 index 0000000..8351fd4 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/mushroom_brown.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/mushroom_red.png b/src/main/resources/assets/minecraft/textures/blocks/mushroom_red.png new file mode 100644 index 0000000..1b332b7 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/mushroom_red.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/mycelium_side.png b/src/main/resources/assets/minecraft/textures/blocks/mycelium_side.png new file mode 100644 index 0000000..5547425 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/mycelium_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/mycelium_top.png b/src/main/resources/assets/minecraft/textures/blocks/mycelium_top.png new file mode 100644 index 0000000..0b4462a Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/mycelium_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/nether_brick.png b/src/main/resources/assets/minecraft/textures/blocks/nether_brick.png new file mode 100644 index 0000000..5482be1 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/nether_brick.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/nether_wart_block.png b/src/main/resources/assets/minecraft/textures/blocks/nether_wart_block.png new file mode 100644 index 0000000..6231f3e Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/nether_wart_block.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/nether_wart_stage_0.png b/src/main/resources/assets/minecraft/textures/blocks/nether_wart_stage_0.png new file mode 100644 index 0000000..514a95b Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/nether_wart_stage_0.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/nether_wart_stage_1.png b/src/main/resources/assets/minecraft/textures/blocks/nether_wart_stage_1.png new file mode 100644 index 0000000..b4ad0d1 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/nether_wart_stage_1.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/nether_wart_stage_2.png b/src/main/resources/assets/minecraft/textures/blocks/nether_wart_stage_2.png new file mode 100644 index 0000000..b9b6743 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/nether_wart_stage_2.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/netherrack.png b/src/main/resources/assets/minecraft/textures/blocks/netherrack.png new file mode 100644 index 0000000..88129c4 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/netherrack.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/noteblock.png b/src/main/resources/assets/minecraft/textures/blocks/noteblock.png new file mode 100644 index 0000000..a3c27c1 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/noteblock.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/observer_back.png b/src/main/resources/assets/minecraft/textures/blocks/observer_back.png new file mode 100644 index 0000000..af6f03c Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/observer_back.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/observer_back_lit.png b/src/main/resources/assets/minecraft/textures/blocks/observer_back_lit.png new file mode 100644 index 0000000..7464876 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/observer_back_lit.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/observer_front.png b/src/main/resources/assets/minecraft/textures/blocks/observer_front.png new file mode 100644 index 0000000..8571ed4 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/observer_front.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/observer_side.png b/src/main/resources/assets/minecraft/textures/blocks/observer_side.png new file mode 100644 index 0000000..2d44cb1 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/observer_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/observer_top.png b/src/main/resources/assets/minecraft/textures/blocks/observer_top.png new file mode 100644 index 0000000..7f7e2d5 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/observer_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/obsidian.png b/src/main/resources/assets/minecraft/textures/blocks/obsidian.png new file mode 100644 index 0000000..ff0a683 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/obsidian.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/piston_bottom.png b/src/main/resources/assets/minecraft/textures/blocks/piston_bottom.png new file mode 100644 index 0000000..a3a5a08 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/piston_bottom.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/piston_inner.png b/src/main/resources/assets/minecraft/textures/blocks/piston_inner.png new file mode 100644 index 0000000..d1c2761 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/piston_inner.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/piston_side.png b/src/main/resources/assets/minecraft/textures/blocks/piston_side.png new file mode 100644 index 0000000..634f54a Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/piston_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/piston_top_normal.png b/src/main/resources/assets/minecraft/textures/blocks/piston_top_normal.png new file mode 100644 index 0000000..eeaadab Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/piston_top_normal.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/piston_top_sticky.png b/src/main/resources/assets/minecraft/textures/blocks/piston_top_sticky.png new file mode 100644 index 0000000..6ddd4ad Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/piston_top_sticky.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/planks_acacia.png b/src/main/resources/assets/minecraft/textures/blocks/planks_acacia.png new file mode 100644 index 0000000..ef59751 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/planks_acacia.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/planks_big_oak.png b/src/main/resources/assets/minecraft/textures/blocks/planks_big_oak.png new file mode 100644 index 0000000..9a9a3a4 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/planks_big_oak.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/planks_birch.png b/src/main/resources/assets/minecraft/textures/blocks/planks_birch.png new file mode 100644 index 0000000..b113e3a Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/planks_birch.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/planks_jungle.png b/src/main/resources/assets/minecraft/textures/blocks/planks_jungle.png new file mode 100644 index 0000000..22a0fef Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/planks_jungle.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/planks_oak.png b/src/main/resources/assets/minecraft/textures/blocks/planks_oak.png new file mode 100644 index 0000000..346f77d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/planks_oak.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/planks_spruce.png b/src/main/resources/assets/minecraft/textures/blocks/planks_spruce.png new file mode 100644 index 0000000..f45fa94 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/planks_spruce.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/portal.png b/src/main/resources/assets/minecraft/textures/blocks/portal.png new file mode 100644 index 0000000..42d4a75 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/portal.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/portal.png.mcmeta b/src/main/resources/assets/minecraft/textures/blocks/portal.png.mcmeta new file mode 100644 index 0000000..4f0718a --- /dev/null +++ b/src/main/resources/assets/minecraft/textures/blocks/portal.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": {} +} \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/textures/blocks/potatoes_stage_0.png b/src/main/resources/assets/minecraft/textures/blocks/potatoes_stage_0.png new file mode 100644 index 0000000..c1ef732 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/potatoes_stage_0.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/potatoes_stage_1.png b/src/main/resources/assets/minecraft/textures/blocks/potatoes_stage_1.png new file mode 100644 index 0000000..1275f4f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/potatoes_stage_1.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/potatoes_stage_2.png b/src/main/resources/assets/minecraft/textures/blocks/potatoes_stage_2.png new file mode 100644 index 0000000..b7347df Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/potatoes_stage_2.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/potatoes_stage_3.png b/src/main/resources/assets/minecraft/textures/blocks/potatoes_stage_3.png new file mode 100644 index 0000000..d7e8185 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/potatoes_stage_3.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/prismarine_bricks.png b/src/main/resources/assets/minecraft/textures/blocks/prismarine_bricks.png new file mode 100644 index 0000000..724377c Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/prismarine_bricks.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/prismarine_dark.png b/src/main/resources/assets/minecraft/textures/blocks/prismarine_dark.png new file mode 100644 index 0000000..a15b6b7 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/prismarine_dark.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/prismarine_rough.png b/src/main/resources/assets/minecraft/textures/blocks/prismarine_rough.png new file mode 100644 index 0000000..1209356 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/prismarine_rough.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/prismarine_rough.png.mcmeta b/src/main/resources/assets/minecraft/textures/blocks/prismarine_rough.png.mcmeta new file mode 100644 index 0000000..410b327 --- /dev/null +++ b/src/main/resources/assets/minecraft/textures/blocks/prismarine_rough.png.mcmeta @@ -0,0 +1,30 @@ +{ + "animation": { + "frametime": 300, + "interpolate": true, + "frames": [ + 0, + 1, + 0, + 2, + 0, + 3, + 0, + 1, + 2, + 1, + 3, + 1, + 0, + 2, + 1, + 2, + 3, + 2, + 0, + 3, + 1, + 3 + ] + } +} diff --git a/src/main/resources/assets/minecraft/textures/blocks/pumpkin_face_off.png b/src/main/resources/assets/minecraft/textures/blocks/pumpkin_face_off.png new file mode 100644 index 0000000..ecef025 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/pumpkin_face_off.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/pumpkin_face_on.png b/src/main/resources/assets/minecraft/textures/blocks/pumpkin_face_on.png new file mode 100644 index 0000000..907f499 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/pumpkin_face_on.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/pumpkin_side.png b/src/main/resources/assets/minecraft/textures/blocks/pumpkin_side.png new file mode 100644 index 0000000..75dfc47 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/pumpkin_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/pumpkin_stem_connected.png b/src/main/resources/assets/minecraft/textures/blocks/pumpkin_stem_connected.png new file mode 100644 index 0000000..6a5c10e Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/pumpkin_stem_connected.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/pumpkin_stem_disconnected.png b/src/main/resources/assets/minecraft/textures/blocks/pumpkin_stem_disconnected.png new file mode 100644 index 0000000..38065ef Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/pumpkin_stem_disconnected.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/pumpkin_top.png b/src/main/resources/assets/minecraft/textures/blocks/pumpkin_top.png new file mode 100644 index 0000000..1990a03 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/pumpkin_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/purpur_block.png b/src/main/resources/assets/minecraft/textures/blocks/purpur_block.png new file mode 100644 index 0000000..8897ef4 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/purpur_block.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/purpur_pillar.png b/src/main/resources/assets/minecraft/textures/blocks/purpur_pillar.png new file mode 100644 index 0000000..d46f064 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/purpur_pillar.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/purpur_pillar_top.png b/src/main/resources/assets/minecraft/textures/blocks/purpur_pillar_top.png new file mode 100644 index 0000000..2502aed Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/purpur_pillar_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/quartz_block_bottom.png b/src/main/resources/assets/minecraft/textures/blocks/quartz_block_bottom.png new file mode 100644 index 0000000..0eaa57d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/quartz_block_bottom.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/quartz_block_chiseled.png b/src/main/resources/assets/minecraft/textures/blocks/quartz_block_chiseled.png new file mode 100644 index 0000000..054e4ee Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/quartz_block_chiseled.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/quartz_block_chiseled_top.png b/src/main/resources/assets/minecraft/textures/blocks/quartz_block_chiseled_top.png new file mode 100644 index 0000000..1e3c4ca Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/quartz_block_chiseled_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/quartz_block_lines.png b/src/main/resources/assets/minecraft/textures/blocks/quartz_block_lines.png new file mode 100644 index 0000000..0940313 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/quartz_block_lines.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/quartz_block_lines_top.png b/src/main/resources/assets/minecraft/textures/blocks/quartz_block_lines_top.png new file mode 100644 index 0000000..37bed2b Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/quartz_block_lines_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/quartz_block_side.png b/src/main/resources/assets/minecraft/textures/blocks/quartz_block_side.png new file mode 100644 index 0000000..d49a864 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/quartz_block_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/quartz_block_top.png b/src/main/resources/assets/minecraft/textures/blocks/quartz_block_top.png new file mode 100644 index 0000000..d49a864 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/quartz_block_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/quartz_ore.png b/src/main/resources/assets/minecraft/textures/blocks/quartz_ore.png new file mode 100644 index 0000000..e30df18 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/quartz_ore.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/rail_activator.png b/src/main/resources/assets/minecraft/textures/blocks/rail_activator.png new file mode 100644 index 0000000..5736a14 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/rail_activator.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/rail_activator_powered.png b/src/main/resources/assets/minecraft/textures/blocks/rail_activator_powered.png new file mode 100644 index 0000000..7da9136 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/rail_activator_powered.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/rail_detector.png b/src/main/resources/assets/minecraft/textures/blocks/rail_detector.png new file mode 100644 index 0000000..92c1466 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/rail_detector.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/rail_detector_powered.png b/src/main/resources/assets/minecraft/textures/blocks/rail_detector_powered.png new file mode 100644 index 0000000..fa0a71d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/rail_detector_powered.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/rail_golden.png b/src/main/resources/assets/minecraft/textures/blocks/rail_golden.png new file mode 100644 index 0000000..1fc52c3 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/rail_golden.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/rail_golden_powered.png b/src/main/resources/assets/minecraft/textures/blocks/rail_golden_powered.png new file mode 100644 index 0000000..bd343be Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/rail_golden_powered.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/rail_normal.png b/src/main/resources/assets/minecraft/textures/blocks/rail_normal.png new file mode 100644 index 0000000..d609236 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/rail_normal.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/rail_normal_turned.png b/src/main/resources/assets/minecraft/textures/blocks/rail_normal_turned.png new file mode 100644 index 0000000..f394a23 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/rail_normal_turned.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/red_nether_brick.png b/src/main/resources/assets/minecraft/textures/blocks/red_nether_brick.png new file mode 100644 index 0000000..ef287de Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/red_nether_brick.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/red_sand.png b/src/main/resources/assets/minecraft/textures/blocks/red_sand.png new file mode 100644 index 0000000..096ed0e Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/red_sand.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/red_sandstone_bottom.png b/src/main/resources/assets/minecraft/textures/blocks/red_sandstone_bottom.png new file mode 100644 index 0000000..864370f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/red_sandstone_bottom.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/red_sandstone_carved.png b/src/main/resources/assets/minecraft/textures/blocks/red_sandstone_carved.png new file mode 100644 index 0000000..c86e0e9 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/red_sandstone_carved.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/red_sandstone_normal.png b/src/main/resources/assets/minecraft/textures/blocks/red_sandstone_normal.png new file mode 100644 index 0000000..30783bd Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/red_sandstone_normal.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/red_sandstone_smooth.png b/src/main/resources/assets/minecraft/textures/blocks/red_sandstone_smooth.png new file mode 100644 index 0000000..7958531 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/red_sandstone_smooth.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/red_sandstone_top.png b/src/main/resources/assets/minecraft/textures/blocks/red_sandstone_top.png new file mode 100644 index 0000000..bf23148 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/red_sandstone_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/redstone_block.png b/src/main/resources/assets/minecraft/textures/blocks/redstone_block.png new file mode 100644 index 0000000..57fb02b Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/redstone_block.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/redstone_dust_dot.png b/src/main/resources/assets/minecraft/textures/blocks/redstone_dust_dot.png new file mode 100644 index 0000000..ab8866d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/redstone_dust_dot.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/redstone_dust_line0.png b/src/main/resources/assets/minecraft/textures/blocks/redstone_dust_line0.png new file mode 100644 index 0000000..064b107 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/redstone_dust_line0.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/redstone_dust_line1.png b/src/main/resources/assets/minecraft/textures/blocks/redstone_dust_line1.png new file mode 100644 index 0000000..8e8a700 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/redstone_dust_line1.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/redstone_dust_overlay.png b/src/main/resources/assets/minecraft/textures/blocks/redstone_dust_overlay.png new file mode 100644 index 0000000..fd68e0a Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/redstone_dust_overlay.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/redstone_lamp_off.png b/src/main/resources/assets/minecraft/textures/blocks/redstone_lamp_off.png new file mode 100644 index 0000000..522765b Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/redstone_lamp_off.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/redstone_lamp_on.png b/src/main/resources/assets/minecraft/textures/blocks/redstone_lamp_on.png new file mode 100644 index 0000000..9562ef3 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/redstone_lamp_on.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/redstone_ore.png b/src/main/resources/assets/minecraft/textures/blocks/redstone_ore.png new file mode 100644 index 0000000..575a488 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/redstone_ore.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/redstone_torch_off.png b/src/main/resources/assets/minecraft/textures/blocks/redstone_torch_off.png new file mode 100644 index 0000000..635eabd Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/redstone_torch_off.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/redstone_torch_on.png b/src/main/resources/assets/minecraft/textures/blocks/redstone_torch_on.png new file mode 100644 index 0000000..2983d6c Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/redstone_torch_on.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/reeds.png b/src/main/resources/assets/minecraft/textures/blocks/reeds.png new file mode 100644 index 0000000..64bbfe0 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/reeds.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/repeater_off.png b/src/main/resources/assets/minecraft/textures/blocks/repeater_off.png new file mode 100644 index 0000000..8634669 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/repeater_off.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/repeater_on.png b/src/main/resources/assets/minecraft/textures/blocks/repeater_on.png new file mode 100644 index 0000000..d71d0d9 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/repeater_on.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/repeating_command_block_back.png b/src/main/resources/assets/minecraft/textures/blocks/repeating_command_block_back.png new file mode 100644 index 0000000..553c251 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/repeating_command_block_back.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/repeating_command_block_back.png.mcmeta b/src/main/resources/assets/minecraft/textures/blocks/repeating_command_block_back.png.mcmeta new file mode 100644 index 0000000..4894b53 --- /dev/null +++ b/src/main/resources/assets/minecraft/textures/blocks/repeating_command_block_back.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 10 + } +} diff --git a/src/main/resources/assets/minecraft/textures/blocks/repeating_command_block_conditional.png b/src/main/resources/assets/minecraft/textures/blocks/repeating_command_block_conditional.png new file mode 100644 index 0000000..2af3122 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/repeating_command_block_conditional.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/repeating_command_block_conditional.png.mcmeta b/src/main/resources/assets/minecraft/textures/blocks/repeating_command_block_conditional.png.mcmeta new file mode 100644 index 0000000..4894b53 --- /dev/null +++ b/src/main/resources/assets/minecraft/textures/blocks/repeating_command_block_conditional.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 10 + } +} diff --git a/src/main/resources/assets/minecraft/textures/blocks/repeating_command_block_front.png b/src/main/resources/assets/minecraft/textures/blocks/repeating_command_block_front.png new file mode 100644 index 0000000..f3333d3 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/repeating_command_block_front.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/repeating_command_block_front.png.mcmeta b/src/main/resources/assets/minecraft/textures/blocks/repeating_command_block_front.png.mcmeta new file mode 100644 index 0000000..4894b53 --- /dev/null +++ b/src/main/resources/assets/minecraft/textures/blocks/repeating_command_block_front.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 10 + } +} diff --git a/src/main/resources/assets/minecraft/textures/blocks/repeating_command_block_side.png b/src/main/resources/assets/minecraft/textures/blocks/repeating_command_block_side.png new file mode 100644 index 0000000..500fe63 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/repeating_command_block_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/repeating_command_block_side.png.mcmeta b/src/main/resources/assets/minecraft/textures/blocks/repeating_command_block_side.png.mcmeta new file mode 100644 index 0000000..4894b53 --- /dev/null +++ b/src/main/resources/assets/minecraft/textures/blocks/repeating_command_block_side.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 10 + } +} diff --git a/src/main/resources/assets/minecraft/textures/blocks/sand.png b/src/main/resources/assets/minecraft/textures/blocks/sand.png new file mode 100644 index 0000000..e135fbd Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/sand.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/sandstone_bottom.png b/src/main/resources/assets/minecraft/textures/blocks/sandstone_bottom.png new file mode 100644 index 0000000..e102220 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/sandstone_bottom.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/sandstone_carved.png b/src/main/resources/assets/minecraft/textures/blocks/sandstone_carved.png new file mode 100644 index 0000000..9bd7fa1 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/sandstone_carved.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/sandstone_normal.png b/src/main/resources/assets/minecraft/textures/blocks/sandstone_normal.png new file mode 100644 index 0000000..1b79145 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/sandstone_normal.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/sandstone_smooth.png b/src/main/resources/assets/minecraft/textures/blocks/sandstone_smooth.png new file mode 100644 index 0000000..ef118bd Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/sandstone_smooth.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/sandstone_top.png b/src/main/resources/assets/minecraft/textures/blocks/sandstone_top.png new file mode 100644 index 0000000..7483877 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/sandstone_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/sapling_acacia.png b/src/main/resources/assets/minecraft/textures/blocks/sapling_acacia.png new file mode 100644 index 0000000..840196d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/sapling_acacia.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/sapling_birch.png b/src/main/resources/assets/minecraft/textures/blocks/sapling_birch.png new file mode 100644 index 0000000..b5f01ff Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/sapling_birch.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/sapling_jungle.png b/src/main/resources/assets/minecraft/textures/blocks/sapling_jungle.png new file mode 100644 index 0000000..4e10b35 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/sapling_jungle.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/sapling_oak.png b/src/main/resources/assets/minecraft/textures/blocks/sapling_oak.png new file mode 100644 index 0000000..3c3abef Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/sapling_oak.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/sapling_roofed_oak.png b/src/main/resources/assets/minecraft/textures/blocks/sapling_roofed_oak.png new file mode 100644 index 0000000..1a9cdf3 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/sapling_roofed_oak.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/sapling_spruce.png b/src/main/resources/assets/minecraft/textures/blocks/sapling_spruce.png new file mode 100644 index 0000000..5767d48 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/sapling_spruce.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/sea_lantern.png b/src/main/resources/assets/minecraft/textures/blocks/sea_lantern.png new file mode 100644 index 0000000..8909ce8 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/sea_lantern.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/sea_lantern.png.mcmeta b/src/main/resources/assets/minecraft/textures/blocks/sea_lantern.png.mcmeta new file mode 100644 index 0000000..e8ac9bc --- /dev/null +++ b/src/main/resources/assets/minecraft/textures/blocks/sea_lantern.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 5 + } +} diff --git a/src/main/resources/assets/minecraft/textures/blocks/shulker_top_black.png b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_black.png new file mode 100644 index 0000000..213cec3 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_black.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/shulker_top_blue.png b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_blue.png new file mode 100644 index 0000000..3bcd44d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_blue.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/shulker_top_brown.png b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_brown.png new file mode 100644 index 0000000..2b52d9e Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_brown.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/shulker_top_cyan.png b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_cyan.png new file mode 100644 index 0000000..d9577df Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_cyan.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/shulker_top_gray.png b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_gray.png new file mode 100644 index 0000000..8c9ce4e Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_gray.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/shulker_top_green.png b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_green.png new file mode 100644 index 0000000..1b4214c Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_green.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/shulker_top_light_blue.png b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_light_blue.png new file mode 100644 index 0000000..597f4c5 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_light_blue.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/shulker_top_lime.png b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_lime.png new file mode 100644 index 0000000..339b765 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_lime.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/shulker_top_magenta.png b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_magenta.png new file mode 100644 index 0000000..ad34393 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_magenta.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/shulker_top_orange.png b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_orange.png new file mode 100644 index 0000000..a722de1 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_orange.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/shulker_top_pink.png b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_pink.png new file mode 100644 index 0000000..e817f96 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_pink.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/shulker_top_purple.png b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_purple.png new file mode 100644 index 0000000..771dbf2 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_purple.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/shulker_top_red.png b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_red.png new file mode 100644 index 0000000..00147c5 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_red.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/shulker_top_silver.png b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_silver.png new file mode 100644 index 0000000..63e494d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_silver.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/shulker_top_white.png b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_white.png new file mode 100644 index 0000000..3d87d64 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_white.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/shulker_top_yellow.png b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_yellow.png new file mode 100644 index 0000000..671b2c3 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/shulker_top_yellow.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/slime.png b/src/main/resources/assets/minecraft/textures/blocks/slime.png new file mode 100644 index 0000000..c577a5a Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/slime.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/snow.png b/src/main/resources/assets/minecraft/textures/blocks/snow.png new file mode 100644 index 0000000..d1a1416 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/snow.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/soul_sand.png b/src/main/resources/assets/minecraft/textures/blocks/soul_sand.png new file mode 100644 index 0000000..fca7e8f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/soul_sand.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/sponge.png b/src/main/resources/assets/minecraft/textures/blocks/sponge.png new file mode 100644 index 0000000..487ac43 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/sponge.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/sponge_wet.png b/src/main/resources/assets/minecraft/textures/blocks/sponge_wet.png new file mode 100644 index 0000000..e797208 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/sponge_wet.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/stone.png b/src/main/resources/assets/minecraft/textures/blocks/stone.png new file mode 100644 index 0000000..87e19ff Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/stone.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/stone_andesite.png b/src/main/resources/assets/minecraft/textures/blocks/stone_andesite.png new file mode 100644 index 0000000..01ba4a1 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/stone_andesite.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/stone_andesite_smooth.png b/src/main/resources/assets/minecraft/textures/blocks/stone_andesite_smooth.png new file mode 100644 index 0000000..591bb4d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/stone_andesite_smooth.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/stone_diorite.png b/src/main/resources/assets/minecraft/textures/blocks/stone_diorite.png new file mode 100644 index 0000000..3d752dd Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/stone_diorite.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/stone_diorite_smooth.png b/src/main/resources/assets/minecraft/textures/blocks/stone_diorite_smooth.png new file mode 100644 index 0000000..daebca4 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/stone_diorite_smooth.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/stone_granite.png b/src/main/resources/assets/minecraft/textures/blocks/stone_granite.png new file mode 100644 index 0000000..269c4a1 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/stone_granite.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/stone_granite_smooth.png b/src/main/resources/assets/minecraft/textures/blocks/stone_granite_smooth.png new file mode 100644 index 0000000..a4bee09 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/stone_granite_smooth.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/stone_slab_side.png b/src/main/resources/assets/minecraft/textures/blocks/stone_slab_side.png new file mode 100644 index 0000000..fe2a204 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/stone_slab_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/stone_slab_top.png b/src/main/resources/assets/minecraft/textures/blocks/stone_slab_top.png new file mode 100644 index 0000000..090657d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/stone_slab_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/stonebrick.png b/src/main/resources/assets/minecraft/textures/blocks/stonebrick.png new file mode 100644 index 0000000..69138cf Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/stonebrick.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/stonebrick_carved.png b/src/main/resources/assets/minecraft/textures/blocks/stonebrick_carved.png new file mode 100644 index 0000000..b7e88db Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/stonebrick_carved.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/stonebrick_cracked.png b/src/main/resources/assets/minecraft/textures/blocks/stonebrick_cracked.png new file mode 100644 index 0000000..918a884 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/stonebrick_cracked.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/stonebrick_mossy.png b/src/main/resources/assets/minecraft/textures/blocks/stonebrick_mossy.png new file mode 100644 index 0000000..fc67b4a Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/stonebrick_mossy.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/structure_block.png b/src/main/resources/assets/minecraft/textures/blocks/structure_block.png new file mode 100644 index 0000000..f03ea5f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/structure_block.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/structure_block_corner.png b/src/main/resources/assets/minecraft/textures/blocks/structure_block_corner.png new file mode 100644 index 0000000..418fd05 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/structure_block_corner.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/structure_block_data.png b/src/main/resources/assets/minecraft/textures/blocks/structure_block_data.png new file mode 100644 index 0000000..75ea308 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/structure_block_data.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/structure_block_load.png b/src/main/resources/assets/minecraft/textures/blocks/structure_block_load.png new file mode 100644 index 0000000..aca338b Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/structure_block_load.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/structure_block_save.png b/src/main/resources/assets/minecraft/textures/blocks/structure_block_save.png new file mode 100644 index 0000000..6470927 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/structure_block_save.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/tallgrass.png b/src/main/resources/assets/minecraft/textures/blocks/tallgrass.png new file mode 100644 index 0000000..489dfa9 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/tallgrass.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/tnt_bottom.png b/src/main/resources/assets/minecraft/textures/blocks/tnt_bottom.png new file mode 100644 index 0000000..cc2e586 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/tnt_bottom.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/tnt_side.png b/src/main/resources/assets/minecraft/textures/blocks/tnt_side.png new file mode 100644 index 0000000..21109fb Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/tnt_side.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/tnt_top.png b/src/main/resources/assets/minecraft/textures/blocks/tnt_top.png new file mode 100644 index 0000000..ceb44b6 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/tnt_top.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/torch_on.png b/src/main/resources/assets/minecraft/textures/blocks/torch_on.png new file mode 100644 index 0000000..a2ce41b Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/torch_on.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/trapdoor.png b/src/main/resources/assets/minecraft/textures/blocks/trapdoor.png new file mode 100644 index 0000000..5c3385f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/trapdoor.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/trip_wire.png b/src/main/resources/assets/minecraft/textures/blocks/trip_wire.png new file mode 100644 index 0000000..5b422ef Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/trip_wire.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/trip_wire_source.png b/src/main/resources/assets/minecraft/textures/blocks/trip_wire_source.png new file mode 100644 index 0000000..fbd464d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/trip_wire_source.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/vine.png b/src/main/resources/assets/minecraft/textures/blocks/vine.png new file mode 100644 index 0000000..df5e435 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/vine.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/water_flow.png b/src/main/resources/assets/minecraft/textures/blocks/water_flow.png new file mode 100644 index 0000000..41f823d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/water_flow.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/water_flow.png.mcmeta b/src/main/resources/assets/minecraft/textures/blocks/water_flow.png.mcmeta new file mode 100644 index 0000000..4f0718a --- /dev/null +++ b/src/main/resources/assets/minecraft/textures/blocks/water_flow.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": {} +} \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/textures/blocks/water_overlay.png b/src/main/resources/assets/minecraft/textures/blocks/water_overlay.png new file mode 100644 index 0000000..00b70ce Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/water_overlay.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/water_still.png b/src/main/resources/assets/minecraft/textures/blocks/water_still.png new file mode 100644 index 0000000..4e55799 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/water_still.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/water_still.png.mcmeta b/src/main/resources/assets/minecraft/textures/blocks/water_still.png.mcmeta new file mode 100644 index 0000000..0645f48 --- /dev/null +++ b/src/main/resources/assets/minecraft/textures/blocks/water_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/minecraft/textures/blocks/waterlily.png b/src/main/resources/assets/minecraft/textures/blocks/waterlily.png new file mode 100644 index 0000000..f6c84f8 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/waterlily.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/web.png b/src/main/resources/assets/minecraft/textures/blocks/web.png new file mode 100644 index 0000000..ae4bfd4 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/web.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/wheat_stage_0.png b/src/main/resources/assets/minecraft/textures/blocks/wheat_stage_0.png new file mode 100644 index 0000000..185af6f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/wheat_stage_0.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/wheat_stage_1.png b/src/main/resources/assets/minecraft/textures/blocks/wheat_stage_1.png new file mode 100644 index 0000000..67588c1 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/wheat_stage_1.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/wheat_stage_2.png b/src/main/resources/assets/minecraft/textures/blocks/wheat_stage_2.png new file mode 100644 index 0000000..3d33792 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/wheat_stage_2.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/wheat_stage_3.png b/src/main/resources/assets/minecraft/textures/blocks/wheat_stage_3.png new file mode 100644 index 0000000..4649f78 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/wheat_stage_3.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/wheat_stage_4.png b/src/main/resources/assets/minecraft/textures/blocks/wheat_stage_4.png new file mode 100644 index 0000000..ac04b52 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/wheat_stage_4.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/wheat_stage_5.png b/src/main/resources/assets/minecraft/textures/blocks/wheat_stage_5.png new file mode 100644 index 0000000..1713590 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/wheat_stage_5.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/wheat_stage_6.png b/src/main/resources/assets/minecraft/textures/blocks/wheat_stage_6.png new file mode 100644 index 0000000..cb5f195 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/wheat_stage_6.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/wheat_stage_7.png b/src/main/resources/assets/minecraft/textures/blocks/wheat_stage_7.png new file mode 100644 index 0000000..7acafb3 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/wheat_stage_7.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/wool_colored_black.png b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_black.png new file mode 100644 index 0000000..0e486b0 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_black.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/wool_colored_blue.png b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_blue.png new file mode 100644 index 0000000..14c5d71 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_blue.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/wool_colored_brown.png b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_brown.png new file mode 100644 index 0000000..ffaa750 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_brown.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/wool_colored_cyan.png b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_cyan.png new file mode 100644 index 0000000..6545f38 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_cyan.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/wool_colored_gray.png b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_gray.png new file mode 100644 index 0000000..1d12e2d Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_gray.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/wool_colored_green.png b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_green.png new file mode 100644 index 0000000..f8bc1ef Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_green.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/wool_colored_light_blue.png b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_light_blue.png new file mode 100644 index 0000000..529c92a Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_light_blue.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/wool_colored_lime.png b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_lime.png new file mode 100644 index 0000000..e106780 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_lime.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/wool_colored_magenta.png b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_magenta.png new file mode 100644 index 0000000..b9700a8 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_magenta.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/wool_colored_orange.png b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_orange.png new file mode 100644 index 0000000..61c1e4b Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_orange.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/wool_colored_pink.png b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_pink.png new file mode 100644 index 0000000..17ef62b Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_pink.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/wool_colored_purple.png b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_purple.png new file mode 100644 index 0000000..08d4ee0 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_purple.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/wool_colored_red.png b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_red.png new file mode 100644 index 0000000..f11cbcc Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_red.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/wool_colored_silver.png b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_silver.png new file mode 100644 index 0000000..f7f1353 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_silver.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/wool_colored_white.png b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_white.png new file mode 100644 index 0000000..fa2c56e Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_white.png differ diff --git a/src/main/resources/assets/minecraft/textures/blocks/wool_colored_yellow.png b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_yellow.png new file mode 100644 index 0000000..fba2787 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/blocks/wool_colored_yellow.png differ diff --git a/src/main/resources/assets/nnparadisemod/blockstates/bulletproof_glass_pane.json b/src/main/resources/assets/nnparadisemod/blockstates/bulletproof_glass_pane.json new file mode 100644 index 0000000..b0a8703 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/blockstates/bulletproof_glass_pane.json @@ -0,0 +1 @@ +{"multipart":[{"apply":{"model":"nnparadisemod:bulletproof_glass_pane_post"}},{"when":{"north":true},"apply":{"model":"nnparadisemod:bulletproof_glass_pane_side"}},{"when":{"east":true},"apply":{"model":"nnparadisemod:bulletproof_glass_pane_side","y":90}},{"when":{"south":true},"apply":{"model":"nnparadisemod:bulletproof_glass_pane_side_alt"}},{"when":{"west":true},"apply":{"model":"nnparadisemod:bulletproof_glass_pane_side_alt","y":90}},{"when":{"north":false},"apply":{"model":"nnparadisemod:bulletproof_glass_pane_noside"}},{"when":{"east":false},"apply":{"model":"nnparadisemod:bulletproof_glass_pane_noside_alt"}},{"when":{"south":false},"apply":{"model":"nnparadisemod:bulletproof_glass_pane_noside_alt","y":90}},{"when":{"west":false},"apply":{"model":"nnparadisemod:bulletproof_glass_pane_noside","y":270}}]} diff --git a/src/main/resources/assets/nnparadisemod/blockstates/christmas_sapling.json b/src/main/resources/assets/nnparadisemod/blockstates/christmas_sapling.json index fc05a7a..7cbb119 100644 --- a/src/main/resources/assets/nnparadisemod/blockstates/christmas_sapling.json +++ b/src/main/resources/assets/nnparadisemod/blockstates/christmas_sapling.json @@ -1 +1 @@ -{"variants":{"stage=0,type=christmas":{"model":"nnparadisemod:sapling_christmas"},"stage=1,type=christmas":{"model":"nnparadisemod:sapling_christmas"}}} +{"variants":{"stage=0":{"model":"nnparadisemod:sapling_christmas"},"stage=1":{"model":"nnparadisemod:sapling_christmas"}}} diff --git a/src/main/resources/assets/nnparadisemod/blockstates/glass_button.json b/src/main/resources/assets/nnparadisemod/blockstates/glass_button.json new file mode 100644 index 0000000..40b534c --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/blockstates/glass_button.json @@ -0,0 +1 @@ +{"variants":{"facing=up,powered=false":{"model":"nnparadisemod:glass_button","uvlock":true},"facing=down,powered=false":{"model":"nnparadisemod:glass_button","uvlock":true,"x":180},"facing=east,powered=false":{"model":"nnparadisemod:glass_button","uvlock":true,"x":90,"y":90},"facing=west,powered=false":{"model":"nnparadisemod:glass_button","uvlock":true,"x":90,"y":270},"facing=south,powered=false":{"model":"nnparadisemod:glass_button","uvlock":true,"x":90,"y":180},"facing=north,powered=false":{"model":"nnparadisemod:glass_button","uvlock":true,"x":90},"facing=up,powered=true":{"model":"nnparadisemod:glass_button_pressed","uvlock":true},"facing=down,powered=true":{"model":"nnparadisemod:glass_button_pressed","uvlock":true,"x":180},"facing=east,powered=true":{"model":"nnparadisemod:glass_button_pressed","uvlock":true,"x":90,"y":90},"facing=west,powered=true":{"model":"nnparadisemod:glass_button_pressed","uvlock":true,"x":90,"y":270},"facing=south,powered=true":{"model":"nnparadisemod:glass_button_pressed","uvlock":true,"x":90,"y":180},"facing=north,powered=true":{"model":"nnparadisemod:glass_button_pressed","uvlock":true,"x":90}}} diff --git a/src/main/resources/assets/nnparadisemod/blockstates/glass_pressure_plate.json b/src/main/resources/assets/nnparadisemod/blockstates/glass_pressure_plate.json new file mode 100644 index 0000000..d5ac689 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/blockstates/glass_pressure_plate.json @@ -0,0 +1 @@ +{"variants":{"powered=false":{"model":"nnparadisemod:glass_pressure_plate_up"},"powered=true":{"model":"nnparadisemod:glass_pressure_plate_down"}}} diff --git a/src/main/resources/assets/nnparadisemod/blockstates/red_sandstone_button.json b/src/main/resources/assets/nnparadisemod/blockstates/red_sandstone_button.json new file mode 100644 index 0000000..cb36d19 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/blockstates/red_sandstone_button.json @@ -0,0 +1 @@ +{"variants":{"facing=up,powered=false":{"model":"nnparadisemod:red_sandstone_button","uvlock":true},"facing=down,powered=false":{"model":"nnparadisemod:red_sandstone_button","uvlock":true,"x":180},"facing=east,powered=false":{"model":"nnparadisemod:red_sandstone_button","uvlock":true,"x":90,"y":90},"facing=west,powered=false":{"model":"nnparadisemod:red_sandstone_button","uvlock":true,"x":90,"y":270},"facing=south,powered=false":{"model":"nnparadisemod:red_sandstone_button","uvlock":true,"x":90,"y":180},"facing=north,powered=false":{"model":"nnparadisemod:red_sandstone_button","uvlock":true,"x":90},"facing=up,powered=true":{"model":"nnparadisemod:red_sandstone_button_pressed","uvlock":true},"facing=down,powered=true":{"model":"nnparadisemod:red_sandstone_button_pressed","uvlock":true,"x":180},"facing=east,powered=true":{"model":"nnparadisemod:red_sandstone_button_pressed","uvlock":true,"x":90,"y":90},"facing=west,powered=true":{"model":"nnparadisemod:red_sandstone_button_pressed","uvlock":true,"x":90,"y":270},"facing=south,powered=true":{"model":"nnparadisemod:red_sandstone_button_pressed","uvlock":true,"x":90,"y":180},"facing=north,powered=true":{"model":"nnparadisemod:red_sandstone_button_pressed","uvlock":true,"x":90}}} diff --git a/src/main/resources/assets/nnparadisemod/blockstates/red_sandstone_pressure_plate.json b/src/main/resources/assets/nnparadisemod/blockstates/red_sandstone_pressure_plate.json new file mode 100644 index 0000000..cce4256 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/blockstates/red_sandstone_pressure_plate.json @@ -0,0 +1 @@ +{"variants":{"powered=false":{"model":"nnparadisemod:red_sandstone_pressure_plate_up"},"powered=true":{"model":"nnparadisemod:red_sandstone_pressure_plate_down"}}} diff --git a/src/main/resources/assets/nnparadisemod/blockstates/redstone_door_block.json b/src/main/resources/assets/nnparadisemod/blockstates/redstone_door_block.json index 02f44e2..beafca0 100644 --- a/src/main/resources/assets/nnparadisemod/blockstates/redstone_door_block.json +++ b/src/main/resources/assets/nnparadisemod/blockstates/redstone_door_block.json @@ -1 +1 @@ -{"variants":{"facing=east,half=lower,hinge=left,open=false,powered=true":{"model":"nnparadisemod:redstone_door_bottom"},"facing=south,half=lower,hinge=left,open=false,powered=true":{"model":"nnparadisemod:redstone_door_bottom","y":90},"facing=west,half=lower,hinge=left,open=false,powered=true":{"model":"nnparadisemod:redstone_door_bottom","y":180},"facing=north,half=lower,hinge=left,open=false,powered=true":{"model":"nnparadisemod:redstone_door_bottom","y":270},"facing=east,half=lower,hinge=right,open=false,powered=true":{"model":"nnparadisemod:redstone_door_bottom_rh"},"facing=south,half=lower,hinge=right,open=false,powered=true":{"model":"nnparadisemod:redstone_door_bottom_rh","y":90},"facing=west,half=lower,hinge=right,open=false,powered=true":{"model":"nnparadisemod:redstone_door_bottom_rh","y":180},"facing=north,half=lower,hinge=right,open=false,powered=true":{"model":"nnparadisemod:redstone_door_bottom_rh","y":270},"facing=east,half=lower,hinge=left,open=true,powered=true":{"model":"nnparadisemod:redstone_door_bottom_rh","y":90},"facing=south,half=lower,hinge=left,open=true,powered=true":{"model":"nnparadisemod:redstone_door_bottom_rh","y":180},"facing=west,half=lower,hinge=left,open=true,powered=true":{"model":"nnparadisemod:redstone_door_bottom_rh","y":270},"facing=north,half=lower,hinge=left,open=true,powered=true":{"model":"nnparadisemod:redstone_door_bottom_rh"},"facing=east,half=lower,hinge=right,open=true,powered=true":{"model":"nnparadisemod:redstone_door_bottom","y":270},"facing=south,half=lower,hinge=right,open=true,powered=true":{"model":"nnparadisemod:redstone_door_bottom"},"facing=west,half=lower,hinge=right,open=true,powered=true":{"model":"nnparadisemod:redstone_door_bottom","y":90},"facing=north,half=lower,hinge=right,open=true,powered=true":{"model":"nnparadisemod:redstone_door_bottom","y":180},"facing=east,half=upper,hinge=left,open=false,powered=true":{"model":"nnparadisemod:redstone_door_top"},"facing=south,half=upper,hinge=left,open=false,powered=true":{"model":"nnparadisemod:redstone_door_top","y":90},"facing=west,half=upper,hinge=left,open=false,powered=true":{"model":"nnparadisemod:redstone_door_top","y":180},"facing=north,half=upper,hinge=left,open=false,powered=true":{"model":"nnparadisemod:redstone_door_top","y":270},"facing=east,half=upper,hinge=right,open=false,powered=true":{"model":"nnparadisemod:redstone_door_top_rh"},"facing=south,half=upper,hinge=right,open=false,powered=true":{"model":"nnparadisemod:redstone_door_top_rh","y":90},"facing=west,half=upper,hinge=right,open=false,powered=true":{"model":"nnparadisemod:redstone_door_top_rh","y":180},"facing=north,half=upper,hinge=right,open=false,powered=true":{"model":"nnparadisemod:redstone_door_top_rh","y":270},"facing=east,half=upper,hinge=left,open=true,powered=true":{"model":"nnparadisemod:redstone_door_top_rh","y":90},"facing=south,half=upper,hinge=left,open=true,powered=true":{"model":"nnparadisemod:redstone_door_top_rh","y":180},"facing=west,half=upper,hinge=left,open=true,powered=true":{"model":"nnparadisemod:redstone_door_top_rh","y":270},"facing=north,half=upper,hinge=left,open=true,powered=true":{"model":"nnparadisemod:redstone_door_top_rh"},"facing=east,half=upper,hinge=right,open=true,powered=true":{"model":"nnparadisemod:redstone_door_top","y":270},"facing=south,half=upper,hinge=right,open=true,powered=true":{"model":"nnparadisemod:redstone_door_top"},"facing=west,half=upper,hinge=right,open=true,powered=true":{"model":"nnparadisemod:redstone_door_top","y":90},"facing=north,half=upper,hinge=right,open=true,powered=true":{"model":"nnparadisemod:redstone_door_top","y":180},"facing=east,half=lower,hinge=left,open=false,powered=false":{"model":"nnparadisemod:redstone_door_bottom"},"facing=south,half=lower,hinge=left,open=false,powered=false":{"model":"nnparadisemod:redstone_door_bottom","y":90},"facing=west,half=lower,hinge=left,open=false,powered=false":{"model":"nnparadisemod:redstone_door_bottom","y":180},"facing=north,half=lower,hinge=left,open=false,powered=false":{"model":"nnparadisemod:redstone_door_bottom","y":270},"facing=east,half=lower,hinge=right,open=false,powered=false":{"model":"nnparadisemod:redstone_door_bottom_rh"},"facing=south,half=lower,hinge=right,open=false,powered=false":{"model":"nnparadisemod:redstone_door_bottom_rh","y":90},"facing=west,half=lower,hinge=right,open=false,powered=false":{"model":"nnparadisemod:redstone_door_bottom_rh","y":180},"facing=north,half=lower,hinge=right,open=false,powered=false":{"model":"nnparadisemod:redstone_door_bottom_rh","y":270},"facing=east,half=lower,hinge=left,open=true,powered=false":{"model":"nnparadisemod:redstone_door_bottom_rh","y":90},"facing=south,half=lower,hinge=left,open=true,powered=false":{"model":"nnparadisemod:redstone_door_bottom_rh","y":180},"facing=west,half=lower,hinge=left,open=true,powered=false":{"model":"nnparadisemod:redstone_door_bottom_rh","y":270},"facing=north,half=lower,hinge=left,open=true,powered=false":{"model":"nnparadisemod:redstone_door_bottom_rh"},"facing=east,half=lower,hinge=right,open=true,powered=false":{"model":"nnparadisemod:redstone_door_bottom","y":270},"facing=south,half=lower,hinge=right,open=true,powered=false":{"model":"nnparadisemod:redstone_door_bottom"},"facing=west,half=lower,hinge=right,open=true,powered=false":{"model":"nnparadisemod:redstone_door_bottom","y":90},"facing=north,half=lower,hinge=right,open=true,powered=false":{"model":"nnparadisemod:redstone_door_bottom","y":180},"facing=east,half=upper,hinge=left,open=false,powered=false":{"model":"nnparadisemod:redstone_door_top"},"facing=south,half=upper,hinge=left,open=false,powered=false":{"model":"nnparadisemod:redstone_door_top","y":90},"facing=west,half=upper,hinge=left,open=false,powered=false":{"model":"nnparadisemod:redstone_door_top","y":180},"facing=north,half=upper,hinge=left,open=false,powered=false":{"model":"nnparadisemod:redstone_door_top","y":270},"facing=east,half=upper,hinge=right,open=false,powered=false":{"model":"nnparadisemod:redstone_door_top_rh"},"facing=south,half=upper,hinge=right,open=false,powered=false":{"model":"nnparadisemod:redstone_door_top_rh","y":90},"facing=west,half=upper,hinge=right,open=false,powered=false":{"model":"nnparadisemod:redstone_door_top_rh","y":180},"facing=north,half=upper,hinge=right,open=false,powered=false":{"model":"nnparadisemod:redstone_door_top_rh","y":270},"facing=east,half=upper,hinge=left,open=true,powered=false":{"model":"nnparadisemod:redstone_door_top_rh","y":90},"facing=south,half=upper,hinge=left,open=true,powered=false":{"model":"nnparadisemod:redstone_door_top_rh","y":180},"facing=west,half=upper,hinge=left,open=true,powered=false":{"model":"nnparadisemod:redstone_door_top_rh","y":270},"facing=north,half=upper,hinge=left,open=true,powered=false":{"model":"nnparadisemod:redstone_door_top_rh"},"facing=east,half=upper,hinge=right,open=true,powered=false":{"model":"nnparadisemod:redstone_door_top","y":270},"facing=south,half=upper,hinge=right,open=true,powered=false":{"model":"nnparadisemod:redstone_door_top"},"facing=west,half=upper,hinge=right,open=true,powered=false":{"model":"nnparadisemod:redstone_door_top","y":90},"facing=north,half=upper,hinge=right,open=true,powered=false":{"model":"nnparadisemod:redstone_door_top","y":180}}} +{"variants":{"facing=east,half=lower,hinge=left,open=false":{"model":"nnparadisemod:redstone_door_bottom"},"facing=south,half=lower,hinge=left,open=false":{"model":"nnparadisemod:redstone_door_bottom","y":90},"facing=west,half=lower,hinge=left,open=false":{"model":"nnparadisemod:redstone_door_bottom","y":180},"facing=north,half=lower,hinge=left,open=false":{"model":"nnparadisemod:redstone_door_bottom","y":270},"facing=east,half=lower,hinge=right,open=false":{"model":"nnparadisemod:redstone_door_bottom_rh"},"facing=south,half=lower,hinge=right,open=false":{"model":"nnparadisemod:redstone_door_bottom_rh","y":90},"facing=west,half=lower,hinge=right,open=false":{"model":"nnparadisemod:redstone_door_bottom_rh","y":180},"facing=north,half=lower,hinge=right,open=false":{"model":"nnparadisemod:redstone_door_bottom_rh","y":270},"facing=east,half=lower,hinge=left,open=true":{"model":"nnparadisemod:redstone_door_bottom_rh","y":90},"facing=south,half=lower,hinge=left,open=true":{"model":"nnparadisemod:redstone_door_bottom_rh","y":180},"facing=west,half=lower,hinge=left,open=true":{"model":"nnparadisemod:redstone_door_bottom_rh","y":270},"facing=north,half=lower,hinge=left,open=true":{"model":"nnparadisemod:redstone_door_bottom_rh"},"facing=east,half=lower,hinge=right,open=true":{"model":"nnparadisemod:redstone_door_bottom","y":270},"facing=south,half=lower,hinge=right,open=true":{"model":"nnparadisemod:redstone_door_bottom"},"facing=west,half=lower,hinge=right,open=true":{"model":"nnparadisemod:redstone_door_bottom","y":90},"facing=north,half=lower,hinge=right,open=true":{"model":"nnparadisemod:redstone_door_bottom","y":180},"facing=east,half=upper,hinge=left,open=false":{"model":"nnparadisemod:redstone_door_top"},"facing=south,half=upper,hinge=left,open=false":{"model":"nnparadisemod:redstone_door_top","y":90},"facing=west,half=upper,hinge=left,open=false":{"model":"nnparadisemod:redstone_door_top","y":180},"facing=north,half=upper,hinge=left,open=false":{"model":"nnparadisemod:redstone_door_top","y":270},"facing=east,half=upper,hinge=right,open=false":{"model":"nnparadisemod:redstone_door_top_rh"},"facing=south,half=upper,hinge=right,open=false":{"model":"nnparadisemod:redstone_door_top_rh","y":90},"facing=west,half=upper,hinge=right,open=false":{"model":"nnparadisemod:redstone_door_top_rh","y":180},"facing=north,half=upper,hinge=right,open=false":{"model":"nnparadisemod:redstone_door_top_rh","y":270},"facing=east,half=upper,hinge=left,open=true":{"model":"nnparadisemod:redstone_door_top_rh","y":90},"facing=south,half=upper,hinge=left,open=true":{"model":"nnparadisemod:redstone_door_top_rh","y":180},"facing=west,half=upper,hinge=left,open=true":{"model":"nnparadisemod:redstone_door_top_rh","y":270},"facing=north,half=upper,hinge=left,open=true":{"model":"nnparadisemod:redstone_door_top_rh"},"facing=east,half=upper,hinge=right,open=true":{"model":"nnparadisemod:redstone_door_top","y":270},"facing=south,half=upper,hinge=right,open=true":{"model":"nnparadisemod:redstone_door_top"},"facing=west,half=upper,hinge=right,open=true":{"model":"nnparadisemod:redstone_door_top","y":90},"facing=north,half=upper,hinge=right,open=true":{"model":"nnparadisemod:redstone_door_top","y":180},"facing=east,half=lower,hinge=left,open=false":{"model":"nnparadisemod:redstone_door_bottom"},"facing=south,half=lower,hinge=left,open=false":{"model":"nnparadisemod:redstone_door_bottom","y":90},"facing=west,half=lower,hinge=left,open=false":{"model":"nnparadisemod:redstone_door_bottom","y":180},"facing=north,half=lower,hinge=left,open=false":{"model":"nnparadisemod:redstone_door_bottom","y":270},"facing=east,half=lower,hinge=right,open=false":{"model":"nnparadisemod:redstone_door_bottom_rh"},"facing=south,half=lower,hinge=right,open=false":{"model":"nnparadisemod:redstone_door_bottom_rh","y":90},"facing=west,half=lower,hinge=right,open=false":{"model":"nnparadisemod:redstone_door_bottom_rh","y":180},"facing=north,half=lower,hinge=right,open=false":{"model":"nnparadisemod:redstone_door_bottom_rh","y":270},"facing=east,half=lower,hinge=left,open=true":{"model":"nnparadisemod:redstone_door_bottom_rh","y":90},"facing=south,half=lower,hinge=left,open=true":{"model":"nnparadisemod:redstone_door_bottom_rh","y":180},"facing=west,half=lower,hinge=left,open=true":{"model":"nnparadisemod:redstone_door_bottom_rh","y":270},"facing=north,half=lower,hinge=left,open=true":{"model":"nnparadisemod:redstone_door_bottom_rh"},"facing=east,half=lower,hinge=right,open=true":{"model":"nnparadisemod:redstone_door_bottom","y":270},"facing=south,half=lower,hinge=right,open=true":{"model":"nnparadisemod:redstone_door_bottom"},"facing=west,half=lower,hinge=right,open=true":{"model":"nnparadisemod:redstone_door_bottom","y":90},"facing=north,half=lower,hinge=right,open=true":{"model":"nnparadisemod:redstone_door_bottom","y":180},"facing=east,half=upper,hinge=left,open=false":{"model":"nnparadisemod:redstone_door_top"},"facing=south,half=upper,hinge=left,open=false":{"model":"nnparadisemod:redstone_door_top","y":90},"facing=west,half=upper,hinge=left,open=false":{"model":"nnparadisemod:redstone_door_top","y":180},"facing=north,half=upper,hinge=left,open=false":{"model":"nnparadisemod:redstone_door_top","y":270},"facing=east,half=upper,hinge=right,open=false":{"model":"nnparadisemod:redstone_door_top_rh"},"facing=south,half=upper,hinge=right,open=false":{"model":"nnparadisemod:redstone_door_top_rh","y":90},"facing=west,half=upper,hinge=right,open=false":{"model":"nnparadisemod:redstone_door_top_rh","y":180},"facing=north,half=upper,hinge=right,open=false":{"model":"nnparadisemod:redstone_door_top_rh","y":270},"facing=east,half=upper,hinge=left,open=true":{"model":"nnparadisemod:redstone_door_top_rh","y":90},"facing=south,half=upper,hinge=left,open=true":{"model":"nnparadisemod:redstone_door_top_rh","y":180},"facing=west,half=upper,hinge=left,open=true":{"model":"nnparadisemod:redstone_door_top_rh","y":270},"facing=north,half=upper,hinge=left,open=true":{"model":"nnparadisemod:redstone_door_top_rh"},"facing=east,half=upper,hinge=right,open=true":{"model":"nnparadisemod:redstone_door_top","y":270},"facing=south,half=upper,hinge=right,open=true":{"model":"nnparadisemod:redstone_door_top"},"facing=west,half=upper,hinge=right,open=true":{"model":"nnparadisemod:redstone_door_top","y":90},"facing=north,half=upper,hinge=right,open=true":{"model":"nnparadisemod:redstone_door_top","y":180}}} diff --git a/src/main/resources/assets/nnparadisemod/blockstates/redstone_fence_gate.json b/src/main/resources/assets/nnparadisemod/blockstates/redstone_fence_gate.json index 6a479c1..4d466f2 100644 --- a/src/main/resources/assets/nnparadisemod/blockstates/redstone_fence_gate.json +++ b/src/main/resources/assets/nnparadisemod/blockstates/redstone_fence_gate.json @@ -1 +1 @@ -{"variants":{"facing=south,in_wall=false,open=false,powered=true":{"model":"nnparadisemod:redstone_fence_gate_closed","uvlock":true},"facing=west,in_wall=false,open=false,powered=true":{"model":"nnparadisemod:redstone_fence_gate_closed","uvlock":true,"y":90},"facing=north,in_wall=false,open=false,powered=true":{"model":"nnparadisemod:redstone_fence_gate_closed","uvlock":true,"y":180},"facing=east,in_wall=false,open=false,powered=true":{"model":"nnparadisemod:redstone_fence_gate_closed","uvlock":true,"y":270},"facing=south,in_wall=false,open=true,powered=true":{"model":"nnparadisemod:redstone_fence_gate_open","uvlock":true},"facing=west,in_wall=false,open=true,powered=true":{"model":"nnparadisemod:redstone_fence_gate_open","uvlock":true,"y":90},"facing=north,in_wall=false,open=true,powered=true":{"model":"nnparadisemod:redstone_fence_gate_open","uvlock":true,"y":180},"facing=east,in_wall=false,open=true,powered=true":{"model":"nnparadisemod:redstone_fence_gate_open","uvlock":true,"y":270},"facing=south,in_wall=true,open=false,powered=true":{"model":"nnparadisemod:redstone_wall_gate_closed","uvlock":true},"facing=west,in_wall=true,open=false,powered=true":{"model":"nnparadisemod:redstone_wall_gate_closed","uvlock":true,"y":90},"facing=north,in_wall=true,open=false,powered=true":{"model":"nnparadisemod:redstone_wall_gate_closed","uvlock":true,"y":180},"facing=east,in_wall=true,open=false,powered=true":{"model":"nnparadisemod:redstone_wall_gate_closed","uvlock":true,"y":270},"facing=south,in_wall=true,open=true,powered=true":{"model":"nnparadisemod:redstone_wall_gate_open","uvlock":true},"facing=west,in_wall=true,open=true,powered=true":{"model":"nnparadisemod:redstone_wall_gate_open","uvlock":true,"y":90},"facing=north,in_wall=true,open=true,powered=true":{"model":"nnparadisemod:redstone_wall_gate_open","uvlock":true,"y":180},"facing=east,in_wall=true,open=true,powered=true":{"model":"nnparadisemod:redstone_wall_gate_open","uvlock":true,"y":270},"facing=south,in_wall=false,open=false,powered=false":{"model":"nnparadisemod:redstone_fence_gate_closed","uvlock":true},"facing=west,in_wall=false,open=false,powered=false":{"model":"nnparadisemod:redstone_fence_gate_closed","uvlock":true,"y":90},"facing=north,in_wall=false,open=false,powered=false":{"model":"nnparadisemod:redstone_fence_gate_closed","uvlock":true,"y":180},"facing=east,in_wall=false,open=false,powered=false":{"model":"nnparadisemod:redstone_fence_gate_closed","uvlock":true,"y":270},"facing=south,in_wall=false,open=true,powered=false":{"model":"nnparadisemod:redstone_fence_gate_open","uvlock":true},"facing=west,in_wall=false,open=true,powered=false":{"model":"nnparadisemod:redstone_fence_gate_open","uvlock":true,"y":90},"facing=north,in_wall=false,open=true,powered=false":{"model":"nnparadisemod:redstone_fence_gate_open","uvlock":true,"y":180},"facing=east,in_wall=false,open=true,powered=false":{"model":"nnparadisemod:redstone_fence_gate_open","uvlock":true,"y":270},"facing=south,in_wall=true,open=false,powered=false":{"model":"nnparadisemod:redstone_wall_gate_closed","uvlock":true},"facing=west,in_wall=true,open=false,powered=false":{"model":"nnparadisemod:redstone_wall_gate_closed","uvlock":true,"y":90},"facing=north,in_wall=true,open=false,powered=false":{"model":"nnparadisemod:redstone_wall_gate_closed","uvlock":true,"y":180},"facing=east,in_wall=true,open=false,powered=false":{"model":"nnparadisemod:redstone_wall_gate_closed","uvlock":true,"y":270},"facing=south,in_wall=true,open=true,powered=false":{"model":"nnparadisemod:redstone_wall_gate_open","uvlock":true},"facing=west,in_wall=true,open=true,powered=false":{"model":"nnparadisemod:redstone_wall_gate_open","uvlock":true,"y":90},"facing=north,in_wall=true,open=true,powered=false":{"model":"nnparadisemod:redstone_wall_gate_open","uvlock":true,"y":180},"facing=east,in_wall=true,open=true,powered=false":{"model":"nnparadisemod:redstone_wall_gate_open","uvlock":true,"y":270}}} +{"variants":{"facing=south,in_wall=false,open=false":{"model":"nnparadisemod:redstone_fence_gate_closed","uvlock":true},"facing=west,in_wall=false,open=false":{"model":"nnparadisemod:redstone_fence_gate_closed","uvlock":true,"y":90},"facing=north,in_wall=false,open=false":{"model":"nnparadisemod:redstone_fence_gate_closed","uvlock":true,"y":180},"facing=east,in_wall=false,open=false":{"model":"nnparadisemod:redstone_fence_gate_closed","uvlock":true,"y":270},"facing=south,in_wall=false,open=true":{"model":"nnparadisemod:redstone_fence_gate_open","uvlock":true},"facing=west,in_wall=false,open=true":{"model":"nnparadisemod:redstone_fence_gate_open","uvlock":true,"y":90},"facing=north,in_wall=false,open=true":{"model":"nnparadisemod:redstone_fence_gate_open","uvlock":true,"y":180},"facing=east,in_wall=false,open=true":{"model":"nnparadisemod:redstone_fence_gate_open","uvlock":true,"y":270},"facing=south,in_wall=true,open=false":{"model":"nnparadisemod:redstone_wall_gate_closed","uvlock":true},"facing=west,in_wall=true,open=false":{"model":"nnparadisemod:redstone_wall_gate_closed","uvlock":true,"y":90},"facing=north,in_wall=true,open=false":{"model":"nnparadisemod:redstone_wall_gate_closed","uvlock":true,"y":180},"facing=east,in_wall=true,open=false":{"model":"nnparadisemod:redstone_wall_gate_closed","uvlock":true,"y":270},"facing=south,in_wall=true,open=true":{"model":"nnparadisemod:redstone_wall_gate_open","uvlock":true},"facing=west,in_wall=true,open=true":{"model":"nnparadisemod:redstone_wall_gate_open","uvlock":true,"y":90},"facing=north,in_wall=true,open=true":{"model":"nnparadisemod:redstone_wall_gate_open","uvlock":true,"y":180},"facing=east,in_wall=true,open=true":{"model":"nnparadisemod:redstone_wall_gate_open","uvlock":true,"y":270},"facing=south,in_wall=false,open=false":{"model":"nnparadisemod:redstone_fence_gate_closed","uvlock":true},"facing=west,in_wall=false,open=false":{"model":"nnparadisemod:redstone_fence_gate_closed","uvlock":true,"y":90},"facing=north,in_wall=false,open=false":{"model":"nnparadisemod:redstone_fence_gate_closed","uvlock":true,"y":180},"facing=east,in_wall=false,open=false":{"model":"nnparadisemod:redstone_fence_gate_closed","uvlock":true,"y":270},"facing=south,in_wall=false,open=true":{"model":"nnparadisemod:redstone_fence_gate_open","uvlock":true},"facing=west,in_wall=false,open=true":{"model":"nnparadisemod:redstone_fence_gate_open","uvlock":true,"y":90},"facing=north,in_wall=false,open=true":{"model":"nnparadisemod:redstone_fence_gate_open","uvlock":true,"y":180},"facing=east,in_wall=false,open=true":{"model":"nnparadisemod:redstone_fence_gate_open","uvlock":true,"y":270},"facing=south,in_wall=true,open=false":{"model":"nnparadisemod:redstone_wall_gate_closed","uvlock":true},"facing=west,in_wall=true,open=false":{"model":"nnparadisemod:redstone_wall_gate_closed","uvlock":true,"y":90},"facing=north,in_wall=true,open=false":{"model":"nnparadisemod:redstone_wall_gate_closed","uvlock":true,"y":180},"facing=east,in_wall=true,open=false":{"model":"nnparadisemod:redstone_wall_gate_closed","uvlock":true,"y":270},"facing=south,in_wall=true,open=true":{"model":"nnparadisemod:redstone_wall_gate_open","uvlock":true},"facing=west,in_wall=true,open=true":{"model":"nnparadisemod:redstone_wall_gate_open","uvlock":true,"y":90},"facing=north,in_wall=true,open=true":{"model":"nnparadisemod:redstone_wall_gate_open","uvlock":true,"y":180},"facing=east,in_wall=true,open=true":{"model":"nnparadisemod:redstone_wall_gate_open","uvlock":true,"y":270}}} diff --git a/src/main/resources/assets/nnparadisemod/blockstates/sandstone_button.json b/src/main/resources/assets/nnparadisemod/blockstates/sandstone_button.json new file mode 100644 index 0000000..e885ff4 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/blockstates/sandstone_button.json @@ -0,0 +1 @@ +{"variants":{"facing=up,powered=false":{"model":"nnparadisemod:sandstone_button","uvlock":true},"facing=down,powered=false":{"model":"nnparadisemod:sandstone_button","uvlock":true,"x":180},"facing=east,powered=false":{"model":"nnparadisemod:sandstone_button","uvlock":true,"x":90,"y":90},"facing=west,powered=false":{"model":"nnparadisemod:sandstone_button","uvlock":true,"x":90,"y":270},"facing=south,powered=false":{"model":"nnparadisemod:sandstone_button","uvlock":true,"x":90,"y":180},"facing=north,powered=false":{"model":"nnparadisemod:sandstone_button","uvlock":true,"x":90},"facing=up,powered=true":{"model":"nnparadisemod:sandstone_button_pressed","uvlock":true},"facing=down,powered=true":{"model":"nnparadisemod:sandstone_button_pressed","uvlock":true,"x":180},"facing=east,powered=true":{"model":"nnparadisemod:sandstone_button_pressed","uvlock":true,"x":90,"y":90},"facing=west,powered=true":{"model":"nnparadisemod:sandstone_button_pressed","uvlock":true,"x":90,"y":270},"facing=south,powered=true":{"model":"nnparadisemod:sandstone_button_pressed","uvlock":true,"x":90,"y":180},"facing=north,powered=true":{"model":"nnparadisemod:sandstone_button_pressed","uvlock":true,"x":90}}} diff --git a/src/main/resources/assets/nnparadisemod/blockstates/sandstone_pressure_plate.json b/src/main/resources/assets/nnparadisemod/blockstates/sandstone_pressure_plate.json new file mode 100644 index 0000000..c85b0d7 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/blockstates/sandstone_pressure_plate.json @@ -0,0 +1 @@ +{"variants":{"powered=false":{"model":"nnparadisemod:sandstone_pressure_plate_up"},"powered=true":{"model":"nnparadisemod:sandstone_pressure_plate_down"}}} diff --git a/src/main/resources/assets/nnparadisemod/lang/en_US.lang b/src/main/resources/assets/nnparadisemod/lang/en_US.lang index dc50ced..ec4d9c6 100644 --- a/src/main/resources/assets/nnparadisemod/lang/en_US.lang +++ b/src/main/resources/assets/nnparadisemod/lang/en_US.lang @@ -98,7 +98,14 @@ item.CactusStick.name=Cactus Stick item.VoidPearl.name=Void Pearl #Blocks -tile.bulletProofGlass.name=Bulletproof Glass +tile.bulletproofGlassPane.name=Blastproof Glass Pane +tile.SandstonePlate.name=Sandstone Pressure Plate +tile.RedSandstonePlate.name=Red Sandstone Pressure Plate +tile.GlassPlate.name=Glass Pressure Plate +tile.SandstoneButton.name=Sandstone Button +tile.RedSandstoneButton.name=Red Sandstone Button +tile.GlassButton.name=Glass Button +tile.bulletProofGlass.name=Blastproof Glass tile.bedrock_slab.name=Bedrock Slab tile.obsidian_slab.name=Obsidian Slab tile.void_slab.name=Void Stone Slab @@ -305,6 +312,7 @@ tile.prismarineCrystalBlock.name=Prismarine Crystal Block fluid.liquid_redstone=Liquid Redstone #Config +config.blackcross=Black Cross config.cavetypes=Cave Types config.caves=Better Caves config.crystalchance=Crystal Chance diff --git a/src/main/resources/assets/nnparadisemod/models/block/bulletproof_glass_pane_noside.json b/src/main/resources/assets/nnparadisemod/models/block/bulletproof_glass_pane_noside.json new file mode 100644 index 0000000..c3d5ffe --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/models/block/bulletproof_glass_pane_noside.json @@ -0,0 +1 @@ +{"parent":"block/pane_noside","textures":{"pane":"nnparadisemod:blocks/bulletproof_glass"}} diff --git a/src/main/resources/assets/nnparadisemod/models/block/bulletproof_glass_pane_noside_alt.json b/src/main/resources/assets/nnparadisemod/models/block/bulletproof_glass_pane_noside_alt.json new file mode 100644 index 0000000..d52d00f --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/models/block/bulletproof_glass_pane_noside_alt.json @@ -0,0 +1 @@ +{"parent":"block/pane_noside_alt","textures":{"pane":"nnparadisemod:blocks/bulletproof_glass"}} diff --git a/src/main/resources/assets/nnparadisemod/models/block/bulletproof_glass_pane_post.json b/src/main/resources/assets/nnparadisemod/models/block/bulletproof_glass_pane_post.json new file mode 100644 index 0000000..fe27100 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/models/block/bulletproof_glass_pane_post.json @@ -0,0 +1 @@ +{"parent":"block/pane_post","textures":{"edge":"nnparadisemod:blocks/bulletproof_glass","pane":"nnparadisemod:blocks/bulletproof_glass"}} diff --git a/src/main/resources/assets/nnparadisemod/models/block/bulletproof_glass_pane_side.json b/src/main/resources/assets/nnparadisemod/models/block/bulletproof_glass_pane_side.json new file mode 100644 index 0000000..ed70181 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/models/block/bulletproof_glass_pane_side.json @@ -0,0 +1 @@ +{"parent":"block/pane_side","textures":{"edge":"nnparadisemod:blocks/bulletproof_glass","pane":"nnparadisemod:blocks/bulletproof_glass"}} diff --git a/src/main/resources/assets/nnparadisemod/models/block/bulletproof_glass_pane_side_alt.json b/src/main/resources/assets/nnparadisemod/models/block/bulletproof_glass_pane_side_alt.json new file mode 100644 index 0000000..619e730 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/models/block/bulletproof_glass_pane_side_alt.json @@ -0,0 +1 @@ +{"parent":"block/pane_side_alt","textures":{"edge":"nnparadisemod:blocks/bulletproof_glass","pane":"nnparadisemod:blocks/bulletproof_glass"}} diff --git a/src/main/resources/assets/nnparadisemod/models/block/diamond_pressure_plate_down.json b/src/main/resources/assets/nnparadisemod/models/block/diamond_pressure_plate_down.json index e8e0b91..1856a20 100644 --- a/src/main/resources/assets/nnparadisemod/models/block/diamond_pressure_plate_down.json +++ b/src/main/resources/assets/nnparadisemod/models/block/diamond_pressure_plate_down.json @@ -1 +1 @@ -{"parent":"block/pressure_plate_up","textures":{"texture":"blocks/diamond_block"}} +{"parent":"block/pressure_plate_down","textures":{"texture":"blocks/diamond_block"}} diff --git a/src/main/resources/assets/nnparadisemod/models/block/glass_button.json b/src/main/resources/assets/nnparadisemod/models/block/glass_button.json new file mode 100644 index 0000000..e7bea3c --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/models/block/glass_button.json @@ -0,0 +1 @@ +{"parent":"block/button","textures":{"texture":"blocks/glass"}} diff --git a/src/main/resources/assets/nnparadisemod/models/block/glass_button_pressed.json b/src/main/resources/assets/nnparadisemod/models/block/glass_button_pressed.json new file mode 100644 index 0000000..0fd046d --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/models/block/glass_button_pressed.json @@ -0,0 +1 @@ +{"parent":"block/button_pressed","textures":{"texture":"blocks/glass"}} diff --git a/src/main/resources/assets/nnparadisemod/models/block/glass_pressure_plate_down.json b/src/main/resources/assets/nnparadisemod/models/block/glass_pressure_plate_down.json new file mode 100644 index 0000000..ccae9df --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/models/block/glass_pressure_plate_down.json @@ -0,0 +1 @@ +{"parent":"block/pressure_plate_down","textures":{"texture":"blocks/glass"}} diff --git a/src/main/resources/assets/nnparadisemod/models/block/glass_pressure_plate_up.json b/src/main/resources/assets/nnparadisemod/models/block/glass_pressure_plate_up.json new file mode 100644 index 0000000..bc2b8f1 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/models/block/glass_pressure_plate_up.json @@ -0,0 +1 @@ +{"parent":"block/pressure_plate_up","textures":{"texture":"blocks/glass"}} diff --git a/src/main/resources/assets/nnparadisemod/models/block/jungle_button.json b/src/main/resources/assets/nnparadisemod/models/block/jungle_button.json index 729eb9f..aef435d 100644 --- a/src/main/resources/assets/nnparadisemod/models/block/jungle_button.json +++ b/src/main/resources/assets/nnparadisemod/models/block/jungle_button.json @@ -1 +1 @@ -{"parent":"block/button_pressed","textures":{"texture":"blocks/planks_jungle"}} +{"parent":"block/button","textures":{"texture":"blocks/planks_jungle"}} diff --git a/src/main/resources/assets/nnparadisemod/models/block/red_sandstone_button.json b/src/main/resources/assets/nnparadisemod/models/block/red_sandstone_button.json new file mode 100644 index 0000000..d0f5a3c --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/models/block/red_sandstone_button.json @@ -0,0 +1 @@ +{"parent":"block/button","textures":{"texture":"blocks/red_sandstone_top"}} diff --git a/src/main/resources/assets/nnparadisemod/models/block/red_sandstone_button_pressed.json b/src/main/resources/assets/nnparadisemod/models/block/red_sandstone_button_pressed.json new file mode 100644 index 0000000..698ae78 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/models/block/red_sandstone_button_pressed.json @@ -0,0 +1 @@ +{"parent":"block/button_pressed","textures":{"texture":"blocks/red_sandstone_top"}} diff --git a/src/main/resources/assets/nnparadisemod/models/block/red_sandstone_pressure_plate_down.json b/src/main/resources/assets/nnparadisemod/models/block/red_sandstone_pressure_plate_down.json new file mode 100644 index 0000000..689b521 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/models/block/red_sandstone_pressure_plate_down.json @@ -0,0 +1 @@ +{"parent":"block/pressure_plate_down","textures":{"texture":"blocks/red_sandstone_top"}} diff --git a/src/main/resources/assets/nnparadisemod/models/block/red_sandstone_pressure_plate_up.json b/src/main/resources/assets/nnparadisemod/models/block/red_sandstone_pressure_plate_up.json new file mode 100644 index 0000000..e34c039 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/models/block/red_sandstone_pressure_plate_up.json @@ -0,0 +1 @@ +{"parent":"block/pressure_plate_up","textures":{"texture":"blocks/red_sandstone_top"}} diff --git a/src/main/resources/assets/nnparadisemod/models/block/sandstone_button.json b/src/main/resources/assets/nnparadisemod/models/block/sandstone_button.json new file mode 100644 index 0000000..b6a9525 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/models/block/sandstone_button.json @@ -0,0 +1 @@ +{"parent":"block/button","textures":{"texture":"blocks/sandstone_top"}} diff --git a/src/main/resources/assets/nnparadisemod/models/block/sandstone_button_pressed.json b/src/main/resources/assets/nnparadisemod/models/block/sandstone_button_pressed.json new file mode 100644 index 0000000..0d5d650 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/models/block/sandstone_button_pressed.json @@ -0,0 +1 @@ +{"parent":"block/button_pressed","textures":{"texture":"blocks/sandstone_top"}} diff --git a/src/main/resources/assets/nnparadisemod/models/block/sandstone_pressure_plate_down.json b/src/main/resources/assets/nnparadisemod/models/block/sandstone_pressure_plate_down.json new file mode 100644 index 0000000..fdccd74 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/models/block/sandstone_pressure_plate_down.json @@ -0,0 +1 @@ +{"parent":"block/pressure_plate_down","textures":{"texture":"blocks/sandstone_top"}} diff --git a/src/main/resources/assets/nnparadisemod/models/block/sandstone_pressure_plate_up.json b/src/main/resources/assets/nnparadisemod/models/block/sandstone_pressure_plate_up.json new file mode 100644 index 0000000..8f29aa7 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/models/block/sandstone_pressure_plate_up.json @@ -0,0 +1 @@ +{"parent":"block/pressure_plate_up","textures":{"texture":"blocks/sandstone_top"}} diff --git a/src/main/resources/assets/nnparadisemod/models/item/bulletproof_glass_pane.json b/src/main/resources/assets/nnparadisemod/models/item/bulletproof_glass_pane.json new file mode 100644 index 0000000..b5b78f9 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/models/item/bulletproof_glass_pane.json @@ -0,0 +1 @@ +{"parent":"item/generated","textures":{"layer0":"nnparadisemod:blocks/bulletproof_glass"},"display":{"thirdperson":{"rotation":[-90,0,0],"translation":[0,1,-3],"scale":[0.55,0.55,0.55]},"firstperson":{"rotation":[0,-135,25],"translation":[0,4,2],"scale":[1.7,1.7,1.7]}}} diff --git a/src/main/resources/assets/nnparadisemod/models/item/glass_button.json b/src/main/resources/assets/nnparadisemod/models/item/glass_button.json new file mode 100644 index 0000000..be113e1 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/models/item/glass_button.json @@ -0,0 +1 @@ +{"parent":"block/button_inventory","textures":{"texture":"blocks/glass"}} diff --git a/src/main/resources/assets/nnparadisemod/models/item/glass_pressure_plate.json b/src/main/resources/assets/nnparadisemod/models/item/glass_pressure_plate.json new file mode 100644 index 0000000..bc2b8f1 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/models/item/glass_pressure_plate.json @@ -0,0 +1 @@ +{"parent":"block/pressure_plate_up","textures":{"texture":"blocks/glass"}} diff --git a/src/main/resources/assets/nnparadisemod/models/item/red_sandstone_button.json b/src/main/resources/assets/nnparadisemod/models/item/red_sandstone_button.json new file mode 100644 index 0000000..4852108 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/models/item/red_sandstone_button.json @@ -0,0 +1 @@ +{"parent":"block/button_inventory","textures":{"texture":"blocks/red_sandstone_top"}} diff --git a/src/main/resources/assets/nnparadisemod/models/item/red_sandstone_pressure_plate.json b/src/main/resources/assets/nnparadisemod/models/item/red_sandstone_pressure_plate.json new file mode 100644 index 0000000..e34c039 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/models/item/red_sandstone_pressure_plate.json @@ -0,0 +1 @@ +{"parent":"block/pressure_plate_up","textures":{"texture":"blocks/red_sandstone_top"}} diff --git a/src/main/resources/assets/nnparadisemod/models/item/sandstone_button.json b/src/main/resources/assets/nnparadisemod/models/item/sandstone_button.json new file mode 100644 index 0000000..57559b5 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/models/item/sandstone_button.json @@ -0,0 +1 @@ +{"parent":"block/button_inventory","textures":{"texture":"blocks/sandstone_top"}} diff --git a/src/main/resources/assets/nnparadisemod/models/item/sandstone_pressure_plate.json b/src/main/resources/assets/nnparadisemod/models/item/sandstone_pressure_plate.json new file mode 100644 index 0000000..8f29aa7 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/models/item/sandstone_pressure_plate.json @@ -0,0 +1 @@ +{"parent":"block/pressure_plate_up","textures":{"texture":"blocks/sandstone_top"}} diff --git a/src/main/resources/assets/nnparadisemod/recipes/blastproof_glass_pane.json b/src/main/resources/assets/nnparadisemod/recipes/blastproof_glass_pane.json new file mode 100644 index 0000000..36238fb --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/recipes/blastproof_glass_pane.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "###" + ], + "key": { + "#": { + "item": "nnparadisemod:bulletproof_glass" + } + }, + "result": { + "item": "nnparadisemod:bulletproof_glass_pane", + "count": 16 + } +} diff --git a/src/main/resources/assets/nnparadisemod/recipes/buttons/generate.py b/src/main/resources/assets/nnparadisemod/recipes/buttons/generate.py deleted file mode 100644 index e1e81b0..0000000 --- a/src/main/resources/assets/nnparadisemod/recipes/buttons/generate.py +++ /dev/null @@ -1,34 +0,0 @@ -from shutil import copyfile -materials=["nnparadisemod:compressed_cactus","end_stone","obsidian","diamond","emerald","gold","iron","cobblestone","mossy_cobblestone","nnparadisemod:glowing_obsidian"] -types=["cactus","end","obsdidian","diamond","emerald","gold","iron","cobblestone","mossy","glowing_obsidian"] -woodtypes=["spruce","birch","jungle","acacia","dark_oak"] -stonetypes=["andesite","diorite","granite"] -stonemeta=[5,3,1] -master=open("type_button.json","r").read() -i=0 -for Type in types: - output=open(Type+"_button.json","w+") - master2=master.replace("Type",Type) - master3=master2.replace("material",materials[i]) - output.write(master3) - output.close() - i=i+1 -i=0 -for wood in woodtypes: - output=open(wood+"_button.json","w+") - master2=master.replace("Type",wood) - master3=master2.replace("material","planks") - master4=master3.replace("0",str(i+1)) - output.write(master4) - output.close() - i=i+1 -i=0 -for stone in stonetypes: - output=open(stone+"_button.json","w+") - master2=master.replace("Type",stone) - master3=master2.replace("material","stone") - master4=master3.replace("0",str(stonemeta[i])) - output.write(master4) - output.close() - i=i+1 - diff --git a/src/main/resources/assets/nnparadisemod/recipes/buttons/glass_button.json b/src/main/resources/assets/nnparadisemod/recipes/buttons/glass_button.json new file mode 100644 index 0000000..e8cf445 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/recipes/buttons/glass_button.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "#" + ], + "key": { + "#": { + "item": "minecraft:glass" + } + }, + "result": { + "item": "nnparadisemod:glass_button" + } +} diff --git a/src/main/resources/assets/nnparadisemod/recipes/buttons/glass_trapdoor.json b/src/main/resources/assets/nnparadisemod/recipes/buttons/glass_trapdoor.json deleted file mode 100644 index 8de2c5c..0000000 --- a/src/main/resources/assets/nnparadisemod/recipes/buttons/glass_trapdoor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###" - ], - "key": { - "#": { - "item": "minecraft:glass" - } - }, - "result": { - "item": "nnparadisemod:glass_trapdoor", - "count": 6 - } -} diff --git a/src/main/resources/assets/nnparadisemod/recipes/buttons/red_sandstone_button.json b/src/main/resources/assets/nnparadisemod/recipes/buttons/red_sandstone_button.json new file mode 100644 index 0000000..bd22b42 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/recipes/buttons/red_sandstone_button.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [{ + "item": "minecraft:red_sandstone", + "data": 0 + } + ], + "result": { + "item": "nnparadisemod:red_sandstone_button", + "count":1 + } +} diff --git a/src/main/resources/assets/nnparadisemod/recipes/buttons/sandstone_button.json b/src/main/resources/assets/nnparadisemod/recipes/buttons/sandstone_button.json new file mode 100644 index 0000000..9753ebb --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/recipes/buttons/sandstone_button.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [{ + "item": "minecraft:sandstone", + "data": 0 + } + ], + "result": { + "item": "nnparadisemod:sandstone_button", + "count":1 + } +} diff --git a/src/main/resources/assets/nnparadisemod/recipes/buttons/type_button.json b/src/main/resources/assets/nnparadisemod/recipes/buttons/type_button.json deleted file mode 100644 index 2a39cb5..0000000 --- a/src/main/resources/assets/nnparadisemod/recipes/buttons/type_button.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "#" - ], - "key": { - "#": { - "item": "material", - "data":0 - } - }, - "result": { - "item": "nnparadisemod:Type_button" - } -} diff --git a/src/main/resources/assets/nnparadisemod/recipes/fence gates/generate.py b/src/main/resources/assets/nnparadisemod/recipes/fence gates/generate.py deleted file mode 100644 index aedd678..0000000 --- a/src/main/resources/assets/nnparadisemod/recipes/fence gates/generate.py +++ /dev/null @@ -1,15 +0,0 @@ -from shutil import copyfile -types=["emerald","iron","diamond","gold","brick"] -blocks=["emerald_block","iron_block","diamond_block","gold_block","brick_block"] -items=["emerald","iron_ingot","diamond","gold_ingot","brick"] -master=open("type_fence_gate.json","r").read() -i=0 -for Type in types: - output=open(Type+"_fence_gate.json","w+") - master2=master.replace("block",blocks[i]) - master3=master2.replace("items",items[i]) - master4=master3.replace("Type",types[i]) - output.write(master4) - output.close() - i=i+1 - diff --git a/src/main/resources/assets/nnparadisemod/recipes/fence gates/type_fence_gate.json b/src/main/resources/assets/nnparadisemod/recipes/fence gates/type_fence_gate.json deleted file mode 100644 index 27bcb1a..0000000 --- a/src/main/resources/assets/nnparadisemod/recipes/fence gates/type_fence_gate.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "bBb", - "bBb" - ], - "key": { - "B": { - "item": "block" - }, - "b": { - "item": "items" - } - }, - "result": { - "item": "nnparadisemod:Type_fence_gate", - "count":3 - } -} diff --git a/src/main/resources/assets/nnparadisemod/recipes/fences/generate.py b/src/main/resources/assets/nnparadisemod/recipes/fences/generate.py deleted file mode 100644 index 1733150..0000000 --- a/src/main/resources/assets/nnparadisemod/recipes/fences/generate.py +++ /dev/null @@ -1,15 +0,0 @@ -from shutil import copyfile -types=["emerald","iron","diamond","gold","brick","cactus"] -blocks=["emerald_block","iron_block","diamond_block","gold_block","brick_block"] -items=["emerald","iron_ingot","diamond","gold_ingot","brick"] -master=open("type_fence.json","r").read() -i=0 -for Type in types: - output=open(Type+"_fence.json","w+") - master2=master.replace("block",blocks[i]) - master3=master2.replace("items",items[i]) - master4=master3.replace("Type",types[i]) - output.write(master4) - output.close() - i=i+1 - diff --git a/src/main/resources/assets/nnparadisemod/recipes/fences/type_fence.json b/src/main/resources/assets/nnparadisemod/recipes/fences/type_fence.json deleted file mode 100644 index 2c94cc3..0000000 --- a/src/main/resources/assets/nnparadisemod/recipes/fences/type_fence.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "BbB", - "BbB" - ], - "key": { - "B": { - "item": "block" - }, - "b": { - "item": "items" - } - }, - "result": { - "item": "nnparadisemod:Type_fence", - "count":6 - } -} diff --git a/src/main/resources/assets/nnparadisemod/recipes/lamps/color_redstone_lamp.json b/src/main/resources/assets/nnparadisemod/recipes/lamps/color_redstone_lamp.json deleted file mode 100644 index 77c1d51..0000000 --- a/src/main/resources/assets/nnparadisemod/recipes/lamps/color_redstone_lamp.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:ore_shaped", - "pattern": [ - "###", - "#X#", - "###" - ], - "key": { - "#": { - "item": "redstone_lamp" - }, - "X": { - "type": "forge:ore_dict", - "ore": "dyeColor" - } - }, - "result": { - "item": "nnparadisemod:color_redstone_lamp", - "count": 8 - } -} diff --git a/src/main/resources/assets/nnparadisemod/recipes/lamps/generate.py b/src/main/resources/assets/nnparadisemod/recipes/lamps/generate.py deleted file mode 100644 index a3783f8..0000000 --- a/src/main/resources/assets/nnparadisemod/recipes/lamps/generate.py +++ /dev/null @@ -1,15 +0,0 @@ -from shutil import copyfile -oredict_dyes=["Black","Red","Green","Brown","Blue","Purple","Cyan","LightGray","Gray","Pink","Lime","Yellow","LightBlue","Magenta","Orange","White"] -colors=["black","red","green","brown","blue","purple","cyan","silver","gray","pink","lime","yellow","light_blue","magenta","orange","white"] -master=open("color_redstone_lamp.json","r").read() -print(master) -i=0 -for color in colors: - print(color) - output=open(color+"_redstone_lamp.json","w+") - master2=master.replace("color",color) - master3=master2.replace("Color",oredict_dyes[i]) - output.write(master3) - output.close() - i=i+1 - diff --git a/src/main/resources/assets/nnparadisemod/recipes/plates/generate.py b/src/main/resources/assets/nnparadisemod/recipes/plates/generate.py deleted file mode 100644 index 894c0d9..0000000 --- a/src/main/resources/assets/nnparadisemod/recipes/plates/generate.py +++ /dev/null @@ -1,34 +0,0 @@ -from shutil import copyfile -materials=["nnparadisemod:compressed_cactus","diamond","emerald","cobblestone","mossy_cobblestone","end_stone"] -types=["cactus","diamond","emerald","cobblestone","mossy","end"] -woodtypes=["spruce","birch","jungle","acacia","dark_oak"] -stonetypes=["andesite","diorite","granite"] -stonemeta=[5,3,1] -master=open("type_pressure_plate.json","r").read() -i=0 -for Type in types: - output=open(Type+"_pressure_plate.json","w+") - master2=master.replace("Type",Type) - master3=master2.replace("material",materials[i]) - output.write(master3) - output.close() - i=i+1 -i=0 -for wood in woodtypes: - output=open(wood+"_pressure_plate.json","w+") - master2=master.replace("Type",wood) - master3=master2.replace("material","planks") - master4=master3.replace("0",str(i+1)) - output.write(master4) - output.close() - i=i+1 -i=0 -for stone in stonetypes: - output=open(stone+"_pressure_plate.json","w+") - master2=master.replace("Type",stone) - master3=master2.replace("material","stone") - master4=master3.replace("0",str(stonemeta[i])) - output.write(master4) - output.close() - i=i+1 - diff --git a/src/main/resources/assets/nnparadisemod/recipes/plates/glass_pressure_plate.json b/src/main/resources/assets/nnparadisemod/recipes/plates/glass_pressure_plate.json new file mode 100644 index 0000000..203d6aa --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/recipes/plates/glass_pressure_plate.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "##" + ], + "key": { + "#": { + "item": "minecraft:glass" + } + }, + "result": { + "item": "nnparadisemod:glass_pressure_plate" + } +} diff --git a/src/main/resources/assets/nnparadisemod/recipes/plates/red_sandstone_pressure_plate.json b/src/main/resources/assets/nnparadisemod/recipes/plates/red_sandstone_pressure_plate.json new file mode 100644 index 0000000..6529e42 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/recipes/plates/red_sandstone_pressure_plate.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "##" + ], + "key": { + "#": { + "item": "minecraft:red_sandstone", + "data":0 + } + }, + "result": { + "item": "nnparadisemod:red_sandstone_pressure_plate" + } +} diff --git a/src/main/resources/assets/nnparadisemod/recipes/plates/sandstone_pressure_plate.json b/src/main/resources/assets/nnparadisemod/recipes/plates/sandstone_pressure_plate.json new file mode 100644 index 0000000..386083f --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/recipes/plates/sandstone_pressure_plate.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "##" + ], + "key": { + "#": { + "item": "minecraft:sandstone", + "data":0 + } + }, + "result": { + "item": "nnparadisemod:sandstone_pressure_plate" + } +} diff --git a/src/main/resources/assets/nnparadisemod/recipes/plates/type_pressure_plate.json b/src/main/resources/assets/nnparadisemod/recipes/plates/type_pressure_plate.json deleted file mode 100644 index 35a46f4..0000000 --- a/src/main/resources/assets/nnparadisemod/recipes/plates/type_pressure_plate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "##" - ], - "key": { - "#": { - "item": "material", - "data":0 - } - }, - "result": { - "item": "nnparadisemod:Type_pressure_plate" - } -} diff --git a/src/main/resources/assets/nnparadisemod/structures/black_cross.nbt b/src/main/resources/assets/nnparadisemod/structures/black_cross.nbt new file mode 100644 index 0000000..d2853cc Binary files /dev/null and b/src/main/resources/assets/nnparadisemod/structures/black_cross.nbt differ diff --git a/src/main/resources/assets/nnparadisemod/structures/black_cross_void.nbt b/src/main/resources/assets/nnparadisemod/structures/black_cross_void.nbt new file mode 100644 index 0000000..7acddbd Binary files /dev/null and b/src/main/resources/assets/nnparadisemod/structures/black_cross_void.nbt differ diff --git a/src/main/resources/assets/nnparadisemod/textures/blocks/.directory b/src/main/resources/assets/nnparadisemod/textures/blocks/.directory index 137b0a0..5c7304d 100644 --- a/src/main/resources/assets/nnparadisemod/textures/blocks/.directory +++ b/src/main/resources/assets/nnparadisemod/textures/blocks/.directory @@ -1,4 +1,4 @@ [Dolphin] PreviewsShown=true -Timestamp=2018,1,2,21,52,30 -Version=3 +Timestamp=2018,12,29,12,38,45 +Version=4 diff --git a/src/main/resources/assets/nnparadisemod/textures/entity/crates/acacia_crate.png b/src/main/resources/assets/nnparadisemod/textures/entity/crates/acacia_crate.png new file mode 100644 index 0000000..913025b Binary files /dev/null and b/src/main/resources/assets/nnparadisemod/textures/entity/crates/acacia_crate.png differ diff --git a/src/main/resources/assets/nnparadisemod/textures/entity/crates/birch_crate.png b/src/main/resources/assets/nnparadisemod/textures/entity/crates/birch_crate.png new file mode 100644 index 0000000..d5b5da4 Binary files /dev/null and b/src/main/resources/assets/nnparadisemod/textures/entity/crates/birch_crate.png differ diff --git a/src/main/resources/assets/nnparadisemod/textures/entity/crates/dark_oak_crate.png b/src/main/resources/assets/nnparadisemod/textures/entity/crates/dark_oak_crate.png new file mode 100644 index 0000000..40908e7 Binary files /dev/null and b/src/main/resources/assets/nnparadisemod/textures/entity/crates/dark_oak_crate.png differ diff --git a/src/main/resources/assets/nnparadisemod/textures/entity/crates/jungle_crate.png b/src/main/resources/assets/nnparadisemod/textures/entity/crates/jungle_crate.png new file mode 100644 index 0000000..41eaa74 Binary files /dev/null and b/src/main/resources/assets/nnparadisemod/textures/entity/crates/jungle_crate.png differ diff --git a/src/main/resources/assets/nnparadisemod/textures/entity/crates/oak_crate.png b/src/main/resources/assets/nnparadisemod/textures/entity/crates/oak_crate.png new file mode 100644 index 0000000..91155ac Binary files /dev/null and b/src/main/resources/assets/nnparadisemod/textures/entity/crates/oak_crate.png differ diff --git a/src/main/resources/assets/nnparadisemod/textures/entity/crates/spruce_crate.png b/src/main/resources/assets/nnparadisemod/textures/entity/crates/spruce_crate.png new file mode 100644 index 0000000..30a0886 Binary files /dev/null and b/src/main/resources/assets/nnparadisemod/textures/entity/crates/spruce_crate.png differ diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index e31f182..8ceeea1 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,11 +3,11 @@ "modid": "nnparadisemod", "name": "Nether Noah's Paradise Mod", "description": "This Mod adds stuff that makes minecraft better!\nBest if used alongside Quark!", - "version": "1.3.1 (The Cave Update)", + "version": "1.4 (Update 2019)", "logoFile": "assets/nnparadisemod/textures/nnparadisemod.png", "url": "https://github.com/NoahJelen/nnparadisemod/tree/1.12.2", "updateUrl": "", - "authorList": ["NetherNoah777"], + "authorList": ["NetherNoah777","AttieCat"], "credits": "Thanks for the awesome modding tutorials, Loremaster!\nThanks for the sample mod, CJMinecraft!\nThanks for the door example, DragonFerocity!\nMore credits in the source code!", "parent": "", "screenshots": [],