Merge branch '1.12.2' into 1.12.2-dev

src/main/java/electroblob/wizardry/block/BlockSnare.java

@@ -51,7 +51,7 @@ public class BlockSnare extends BlockContainer {
 	}
 
 	@Override
-	public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity entity){
+	public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity entity){
 
 		if(!world.isRemote && entity instanceof EntityLivingBase){
 			if(world.getTileEntity(pos) instanceof TileEntityPlayerSave){
@@ -80,7 +80,7 @@ public class BlockSnare extends BlockContainer {
 	}
 
 	@Override
-	public BlockRenderLayer getBlockLayer(){
+	public BlockRenderLayer getRenderLayer() {
 		return BlockRenderLayer.CUTOUT;
 	}
 

src/main/java/electroblob/wizardry/block/BlockSpectral.java

@@ -36,7 +36,7 @@ public class BlockSpectral extends BlockContainer {
 
 	// Replaces getRenderBlockPass
 	@Override
-	public BlockRenderLayer getBlockLayer(){
+	public BlockRenderLayer getRenderLayer(){
 		return BlockRenderLayer.TRANSLUCENT;
 	}
 

src/main/java/electroblob/wizardry/block/BlockStatue.java

@@ -101,7 +101,7 @@ public class BlockStatue extends BlockContainer {
 	}
 
 	@Override
-	public BlockRenderLayer getBlockLayer(){
+	public BlockRenderLayer getRenderLayer(){
 		return this.isIce ? BlockRenderLayer.TRANSLUCENT : BlockRenderLayer.SOLID;
 	}
 

src/main/java/electroblob/wizardry/block/BlockVanishingCobweb.java

@@ -55,7 +55,7 @@ public class BlockVanishingCobweb extends BlockContainer {
 	}
 
 	@Override
-	public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity entity){
+	public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity entity){
 		entity.setInWeb();
 	}