Merge branch '1.12.2' into 1.12.2-dev

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

@@ -1,17 +1,13 @@
 package electroblob.wizardry.block;
 
-import java.util.Random;
-
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.WizardryGuiHandler;
 import electroblob.wizardry.tileentity.TileEntityArcaneWorkbench;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.inventory.InventoryHelper;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumBlockRenderType;
 import net.minecraft.util.EnumFacing;
@@ -65,59 +61,20 @@ public class BlockArcaneWorkbench extends BlockContainer {
 			return false;
 		}
 
-		player.openGui(Wizardry.instance, WizardryGuiHandler.ARCANE_WORKBENCH, world, pos.getX(), pos.getY(),
-				pos.getZ());
+		player.openGui(Wizardry.instance, WizardryGuiHandler.ARCANE_WORKBENCH, world, pos.getX(), pos.getY(), pos.getZ());
 		return true;
 	}
 
 	@Override
 	public void breakBlock(World world, BlockPos pos, IBlockState block){
+		
+        TileEntity tileentity = world.getTileEntity(pos);
 
-		Random random = new Random();
-		TileEntityArcaneWorkbench tileentityarcaneworkbench = (TileEntityArcaneWorkbench)world.getTileEntity(pos);
+        if(tileentity instanceof TileEntityArcaneWorkbench){
+            InventoryHelper.dropInventoryItems(world, pos, (TileEntityArcaneWorkbench)tileentity);
+        }
 
-		if(tileentityarcaneworkbench != null){
-
-			for(int j1 = 0; j1 < tileentityarcaneworkbench.getSizeInventory(); ++j1){
-
-				ItemStack itemstack = tileentityarcaneworkbench.getStackInSlot(j1);
-
-				if(!itemstack.isEmpty()){
-
-					float f = random.nextFloat() * 0.8F + 0.1F;
-					float f1 = random.nextFloat() * 0.8F + 0.1F;
-					EntityItem entityitem;
-
-					for(float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.getCount() > 0; world
-							.spawnEntity(entityitem)){
-
-						int k1 = random.nextInt(21) + 10;
-
-						if(k1 > itemstack.getCount()){
-							k1 = itemstack.getCount();
-						}
-
-						itemstack.shrink(k1);
-
-						entityitem = new EntityItem(world, (double)((float)pos.getX() + f),
-								(double)((float)pos.getY() + f1), (double)((float)pos.getZ() + f2),
-								new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage()));
-						float f3 = 0.05F;
-						entityitem.motionX = (double)((float)random.nextGaussian() * f3);
-						entityitem.motionY = (double)((float)random.nextGaussian() * f3 + 0.2F);
-						entityitem.motionZ = (double)((float)random.nextGaussian() * f3);
-
-						if(itemstack.hasTagCompound()){
-							entityitem.getItem().setTagCompound(((NBTTagCompound)itemstack.getTagCompound().copy()));
-						}
-					}
-				}
-			}
-
-			// par1World.func_96440_m(par2, par3, par4, block);
-		}
-
-		super.breakBlock(world, pos, block);
+        super.breakBlock(world, pos, block);
 	}
 
 }

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

@@ -8,6 +8,10 @@ import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.Item;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
 
 public class BlockCrystalOre extends Block {
 
@@ -20,10 +24,17 @@ public class BlockCrystalOre extends Block {
 
 	@Override
 	public int quantityDropped(IBlockState state, int fortune, Random random){
+		// This now works the same way as vanilla ores
 		if(fortune > 0){
-			return random.nextInt(2) + 1 + random.nextInt(fortune);
+			
+			int i = random.nextInt(fortune + 2) - 1;
+			
+            if(i < 0) i = 0;
+            
+			return (random.nextInt(3) + 1) * (i + 1);
+			
 		}else{
-			return random.nextInt(2) + 1;
+			return random.nextInt(3) + 1;
 		}
 	}
 
@@ -31,4 +42,16 @@ public class BlockCrystalOre extends Block {
 	public Item getItemDropped(IBlockState state, Random random, int fortune){
 		return WizardryItems.magic_crystal;
 	}
+	
+	@Override
+	public int getExpDrop(IBlockState state, IBlockAccess world, BlockPos pos, int fortune){
+		
+		Random rand = world instanceof World ? ((World)world).rand : RANDOM;
+		
+        if(this.getItemDropped(state, rand, fortune) != Item.getItemFromBlock(this)){
+            return MathHelper.getInt(rand, 1, 4);
+        }
+        
+        return 0;
+	}
 }

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

@@ -66,14 +66,15 @@ public class BlockTransportationStone extends Block {
 		return false;
 	}
 
+	@SuppressWarnings("deprecation")
 	@Override
-	public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor){
+	public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos fromPos){
 
-		super.onNeighborChange(world, pos, neighbor);
+		super.neighborChanged(state, world, pos, block, fromPos);
 
-		if(!world.isSideSolid(pos.down(), EnumFacing.UP, false) && world instanceof World){
-			this.dropBlockAsItem((World)world, pos, world.getBlockState(pos), 0);
-			((World)world).setBlockToAir(pos);
+		if(!world.isSideSolid(pos.down(), EnumFacing.UP, false)){
+			this.dropBlockAsItem(world, pos, world.getBlockState(pos), 0);
+			world.setBlockToAir(pos);
 		}
 	}