diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 83c4832f..1177506a 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ # -#Sat Mar 19 08:23:11 EDT 2016 +#Mon Mar 21 18:42:09 EDT 2016 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert org.eclipse.jdt.core.formatter.brace_position_for_block=next_line org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert @@ -288,10 +288,10 @@ org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -eclipse.preferences.version=1 org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=next_line -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +eclipse.preferences.version=1 org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.formatter.blank_lines_after_package=1 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 diff --git a/changelog.txt b/changelog.txt index 048d55d3..c30443b0 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +------------------------------------------------------ +Version 2.0.0-23 +------------------------------------------------------ +- Fixed "see through world" syndrome for most blocks + ------------------------------------------------------ Version 2.0.0-22 ------------------------------------------------------ diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java index 3a2ddfa5..534c30ac 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java @@ -76,6 +76,12 @@ public class BlockAlchemyArray extends BlockContainer return false; } + @Override + public boolean isOpaqueCube(IBlockState state) + { + return false; + } + @Override public EnumBlockRenderType getRenderType(IBlockState state) { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java index c26498ca..7801ad4b 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java @@ -100,6 +100,12 @@ public class BlockAltar extends BlockContainer implements IVariantProvider return false; } + @Override + public boolean isOpaqueCube(IBlockState state) + { + return false; + } + @Override public boolean isFullCube(IBlockState state) { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java index f61974b8..d56379e5 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java @@ -50,7 +50,7 @@ public class BlockDemonCrucible extends BlockContainer implements IVariantProvid } @Override - public boolean isFullCube(IBlockState state) + public boolean isOpaqueCube(IBlockState state) { return false; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java index 68b748e2..efa7ed9e 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java @@ -96,6 +96,12 @@ public class BlockDemonCrystal extends BlockContainer return false; } + @Override + public boolean isOpaqueCube(IBlockState state) + { + return false; + } + @Override public boolean isFullCube(IBlockState state) { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java index 2cd7a155..97a47bf3 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java @@ -43,6 +43,12 @@ public class BlockDemonCrystallizer extends BlockContainer implements IVariantPr return side == EnumFacing.UP; } + @Override + public boolean isOpaqueCube(IBlockState state) + { + return false; + } + @Override public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java index ea312ba8..f975a52f 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java @@ -42,6 +42,12 @@ public class BlockDemonPylon extends BlockContainer implements IVariantProvider return false; } + @Override + public boolean isOpaqueCube(IBlockState state) + { + return false; + } + @Override public boolean isFullCube(IBlockState state) { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java index 154f7442..c2a1321c 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java @@ -43,6 +43,12 @@ public class BlockIncenseAltar extends BlockContainer implements IVariantProvide return AABB; } + @Override + public boolean isOpaqueCube(IBlockState state) + { + return false; + } + @Override public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPedestal.java b/src/main/java/WayofTime/bloodmagic/block/BlockPedestal.java index e1566e6d..c8a51524 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPedestal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPedestal.java @@ -32,6 +32,12 @@ public class BlockPedestal extends BlockStringContainer setResistance(5.0F); } + @Override + public boolean isOpaqueCube(IBlockState state) + { + return false; + } + @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java index 08a4f947..48e05221 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java @@ -42,6 +42,12 @@ public abstract class BlockRoutingNode extends BlockContainer return AABB; } + @Override + public boolean isOpaqueCube(IBlockState state) + { + return false; + } + @Override public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java index b1813006..cc7f5068 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java @@ -43,6 +43,12 @@ public class BlockSoulForge extends BlockContainer implements IVariantProvider setCreativeTab(BloodMagic.tabBloodMagic); } + @Override + public boolean isOpaqueCube(IBlockState state) + { + return false; + } + @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) {