Added missing Block.damageDropped() to OreQuartzCharged

This was previously handled by a template method, but it was removed with
the api refactoring.

Fixes #1174

src/main/java/appeng/block/solids/OreQuartz.java

@@ -18,6 +18,7 @@
 
 package appeng.block.solids;
 
+
 import java.util.EnumSet;
 import java.util.Random;
 
@@ -38,13 +39,15 @@ import appeng.client.render.BaseBlockRender;
 import appeng.client.render.blocks.RenderQuartzOre;
 import appeng.core.features.AEFeature;
 
+
 public class OreQuartz extends AEBaseBlock
 {
 	private int boostBrightnessLow;
 	private int boostBrightnessHigh;
 	private boolean enhanceBrightness;
 
-	public OreQuartz(Class<? extends OreQuartz> self) {
+	public OreQuartz( Class<? extends OreQuartz> self )
+	{
 		super( self, Material.rock );
 		this.setFeature( EnumSet.of( AEFeature.Core ) );
 		this.setHardness( 3.0F );
@@ -67,7 +70,7 @@ public class OreQuartz extends AEBaseBlock
 	}
 
 	@Override
-	public int getMixedBrightnessForBlock(IBlockAccess par1iBlockAccess, int par2, int par3, int par4)
+	public int getMixedBrightnessForBlock( IBlockAccess par1iBlockAccess, int par2, int par3, int par4 )
 	{
 		int j1 = super.getMixedBrightnessForBlock( par1iBlockAccess, par2, par3, par4 );
 		if ( this.enhanceBrightness )
@@ -90,13 +93,14 @@ public class OreQuartz extends AEBaseBlock
 		return j1;
 	}
 
-	public OreQuartz() {
+	public OreQuartz()
+	{
 		this( OreQuartz.class );
 	}
 
 	@Nullable
 	@Override
-	public Item getItemDropped(int id, Random rand, int meta)
+	public Item getItemDropped( int id, Random rand, int meta )
 	{
 		for ( Item crystalItem : AEApi.instance().definitions().materials().certusQuartzCrystal().maybeItem().asSet() )
 		{
@@ -107,7 +111,7 @@ public class OreQuartz extends AEBaseBlock
 	}
 
 	@Override
-	public int damageDropped(int id)
+	public int damageDropped( int id )
 	{
 		for ( ItemStack crystalStack : AEApi.instance().definitions().materials().certusQuartzCrystal().maybeStack( 1 ).asSet() )
 		{
@@ -118,13 +122,13 @@ public class OreQuartz extends AEBaseBlock
 	}
 
 	@Override
-	public int quantityDropped(Random rand)
+	public int quantityDropped( Random rand )
 	{
 		return 1 + rand.nextInt( 2 );
 	}
 
 	@Override
-	public int quantityDroppedWithBonus(int fortune, Random rand)
+	public int quantityDroppedWithBonus( int fortune, Random rand )
 	{
 		if ( fortune > 0 && Item.getItemFromBlock( this ) != this.getItemDropped( 0, rand, fortune ) )
 		{
@@ -135,7 +139,7 @@ public class OreQuartz extends AEBaseBlock
 				j = 0;
 			}
 
-			return this.quantityDropped( rand ) * (j + 1);
+			return this.quantityDropped( rand ) * ( j + 1 );
 		}
 		else
 		{
@@ -144,7 +148,7 @@ public class OreQuartz extends AEBaseBlock
 	}
 
 	@Override
-	public void dropBlockAsItemWithChance(World w, int x, int y, int z, int blockID, float something, int meta)
+	public void dropBlockAsItemWithChance( World w, int x, int y, int z, int blockID, float something, int meta )
 	{
 		super.dropBlockAsItemWithChance( w, x, y, z, blockID, something, meta );
 

src/main/java/appeng/block/solids/OreQuartzCharged.java

@@ -18,11 +18,14 @@
 
 package appeng.block.solids;
 
+
 import java.util.Random;
+
 import javax.annotation.Nullable;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.relauncher.Side;
@@ -34,10 +37,12 @@ import appeng.client.render.effects.ChargedOreFX;
 import appeng.core.AEConfig;
 import appeng.core.CommonHelper;
 
+
 public class OreQuartzCharged extends OreQuartz
 {
 
-	public OreQuartzCharged() {
+	public OreQuartzCharged()
+	{
 		super( OreQuartzCharged.class );
 		this.setBoostBrightnessLow( 2 );
 		this.setBoostBrightnessHigh( 5 );
@@ -56,39 +61,50 @@ public class OreQuartzCharged extends OreQuartz
 	}
 
 	@Override
-	@SideOnly(Side.CLIENT)
+	public int damageDropped( int id )
-	public void randomDisplayTick(World w, int x, int y, int z, Random r)
+	{
+		for ( ItemStack crystalStack : AEApi.instance().definitions().materials().certusQuartzCrystalCharged().maybeStack( 1 ).asSet() )
+		{
+			return crystalStack.getItemDamage();
+		}
+
+		throw new MissingDefinition( "Tried to access charged certus quartz crystal, even though they are disabled" );
+	}
+
+	@Override
+	@SideOnly( Side.CLIENT )
+	public void randomDisplayTick( World w, int x, int y, int z, Random r )
 	{
 		if ( !AEConfig.instance.enableEffects )
 			return;
 
-		double xOff = (r.nextFloat());
+		double xOff = ( r.nextFloat() );
-		double yOff = (r.nextFloat());
+		double yOff = ( r.nextFloat() );
-		double zOff = (r.nextFloat());
+		double zOff = ( r.nextFloat() );
 
-		switch (r.nextInt( 6 ))
+		switch ( r.nextInt( 6 ) )
 		{
-		case 0:
+			case 0:
-			xOff = -0.01;
+				xOff = -0.01;
-			break;
+				break;
-		case 1:
+			case 1:
-			yOff = -0.01;
+				yOff = -0.01;
-			break;
+				break;
-		case 2:
+			case 2:
-			xOff = -0.01;
+				xOff = -0.01;
-			break;
+				break;
-		case 3:
+			case 3:
-			zOff = -0.01;
+				zOff = -0.01;
-			break;
+				break;
-		case 4:
+			case 4:
-			xOff = 1.01;
+				xOff = 1.01;
-			break;
+				break;
-		case 5:
+			case 5:
-			yOff = 1.01;
+				yOff = 1.01;
-			break;
+				break;
-		case 6:
+			case 6:
-			zOff = 1.01;
+				zOff = 1.01;
-			break;
+				break;
 		}
 
 		if ( CommonHelper.proxy.shouldAddParticles( r ) )