Anvilcraft/aether-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Cleanup!

Browse source
This commit is contained in:
Kino 2017-03-02 22:24:48 -05:00
parent f6606d7946
commit 7408611b13
9 changed files with 16 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/legacy/aether/server/blocks/BlocksAether.java
View file

@ -137,7 +137,7 @@ public class BlocksAether
treasure_chest = register("treasure_chest", new BlockTreasureChest());
purple_flower = register("purple_flower", new BlockAetherFlower());
white_flower = register("white_flower", new BlockAetherFlower());
skyroot_sapling = register("skyroot_sapling", new BlockAetherSapling(new AetherGenSkyrootTree()));
skyroot_sapling = register("skyroot_sapling", new BlockAetherSapling(new AetherGenSkyrootTree(true)));
golden_oak_sapling = register("golden_oak_sapling", new BlockAetherSapling(new AetherGenOakTree()));
crystal_leaves = registerMeta("crystal_leaves", new BlockCrystalLeaves());
holiday_leaves = registerMeta("holiday_leaves", new BlockHolidayLeaves());

17
src/main/java/com/legacy/aether/server/blocks/natural/BlockAercloud.java
View file

@ -40,8 +40,6 @@ public class BlockAercloud extends Block implements IAetherMeta
super(Material.ICE);
this.setHardness(0.2F);
this.setLightOpacity(3);
this.setTickRandomly(true);
this.setSoundType(SoundType.CLOTH);
this.setCreativeTab(AetherCreativeTabs.blocks);
this.setDefaultState(this.blockState.getBaseState().withProperty(cloud_type, EnumCloudType.Cold));
@ -175,7 +173,6 @@ public class BlockAercloud extends Block implements IAetherMeta
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("deprecation")
public boolean shouldSideBeRendered(IBlockState state, IBlockAccess worldIn, BlockPos pos, EnumFacing side)
{
IBlockState iblockstate = worldIn.getBlockState(pos);
@ -191,7 +188,7 @@ public class BlockAercloud extends Block implements IAetherMeta
return false;
}
return super.shouldSideBeRendered(state, worldIn, pos, side);
return !worldIn.getBlockState(pos.offset(side)).doesSideBlockRendering(worldIn, pos.offset(side), side.getOpposite());
}
@Override
@ -200,18 +197,6 @@ public class BlockAercloud extends Block implements IAetherMeta
return false;
}
@Override
public boolean isFullCube(IBlockState state)
{
return false;
}
@Override
public boolean isPassable(IBlockAccess world, BlockPos pos)
{
return true;
}
@Override
public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World worldIn, BlockPos pos)
{

2
src/main/java/com/legacy/aether/server/blocks/natural/BlockAetherFlower.java
View file

@ -18,8 +18,8 @@ public class BlockAetherFlower extends BlockBush
public BlockAetherFlower()
{
this.setTickRandomly(true);
this.setHardness(0.0F);
this.setTickRandomly(true);
this.setSoundType(SoundType.PLANT);
this.FLOWER_AABB = new AxisAlignedBB(0.5F - 0.2F, 0.0F, 0.5F - 0.2F, 0.5F + 0.2F, 0.2F * 3.0F, 0.5F + 0.2F);
}

3
src/main/java/com/legacy/aether/server/blocks/natural/BlockAetherLeaves.java
View file

@ -116,8 +116,7 @@ public class BlockAetherLeaves extends BlockLeaves implements IAetherMeta
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "unchecked", "rawtypes" })
public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
public void getSubBlocks(Item itemIn, CreativeTabs tab, List<ItemStack> list)
{
for (int j = 0; j < EnumLeafType.values().length; ++j)
{

2
src/main/java/com/legacy/aether/server/blocks/natural/BlockAetherLog.java
View file

@ -19,7 +19,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.stats.StatList;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.Rotation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
@ -48,6 +47,7 @@ public class BlockAetherLog extends BlockLog implements IAetherMeta
public BlockAetherLog()
{
super();
this.setHardness(2.0F);
this.setSoundType(SoundType.WOOD);
this.setCreativeTab(AetherCreativeTabs.blocks);

10
src/main/java/com/legacy/aether/server/blocks/natural/BlockBerryBush.java
View file

@ -61,7 +61,7 @@ public class BlockBerryBush extends BlockAetherFlower
if (world.getBlockState(pos.down()).getBlock() == BlocksAether.enchanted_aether_grass)
{
min = 2;
min = 1;
max = 4;
}
else
@ -74,12 +74,12 @@ public class BlockBerryBush extends BlockAetherFlower
entityplayer.addStat(StatList.getBlockStats(this), 1);
entityplayer.addExhaustion(0.025F);
world.setBlockState(pos, BlocksAether.berry_bush_stem.getDefaultState());
if (randomNum != 0)
{
spawnAsEntity(world, pos.up(), new ItemStack(ItemsAether.blue_berry, randomNum, 0));
spawnAsEntity(world, pos, new ItemStack(ItemsAether.blue_berry, randomNum, 0));
}
world.setBlockState(pos, BlocksAether.berry_bush_stem.getDefaultState());
}
@Override
@ -87,7 +87,7 @@ public class BlockBerryBush extends BlockAetherFlower
{
if(!this.canBlockStay(world, pos, state))
{
spawnAsEntity(world, pos.up(), new ItemStack(ItemsAether.blue_berry, 1, 0));
spawnAsEntity(world, pos, new ItemStack(ItemsAether.blue_berry, 1, 0));
super.checkAndDropBlock(world, pos, state);
}
}

4
src/main/java/com/legacy/aether/server/blocks/natural/BlockCrystalLeaves.java
View file

@ -108,8 +108,7 @@ public class BlockCrystalLeaves extends BlockLeaves implements IAetherMeta
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "unchecked", "rawtypes" })
public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
public void getSubBlocks(Item itemIn, CreativeTabs tab, List<ItemStack> list)
{
for (int j = 0; j < EnumLeafType.values().length; ++j)
{
@ -170,6 +169,7 @@ public class BlockCrystalLeaves extends BlockLeaves implements IAetherMeta
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
{
List<ItemStack> ret = new ArrayList<ItemStack>();
if (((EnumCrystalType)state.getValue(leaf_type)) == EnumCrystalType.Crystal_Fruited)
{
ret.add(new ItemStack(ItemsAether.white_apple));

3
src/main/java/com/legacy/aether/server/blocks/natural/BlockHolidayLeaves.java
View file

@ -106,8 +106,7 @@ public class BlockHolidayLeaves extends BlockLeaves implements IAetherMeta
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "unchecked", "rawtypes" })
public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
public void getSubBlocks(Item itemIn, CreativeTabs tab, List<ItemStack> list)
{
for (int j = 0; j < EnumLeafType.values().length; ++j)
{

3
src/main/java/com/legacy/aether/server/blocks/util/BlockFloating.java
View file

@ -19,7 +19,10 @@ public class BlockFloating extends Block
public BlockFloating(Material material, boolean leveled)
{
super(material);
this.leveled = leveled;
this.setTickRandomly(true);
}
@Override