AE2 First Commit, the dawn of 1.7 hast arrived.

block/solids/BlockMatrixFrame.java

@@ -0,0 +1,37 @@
+package appeng.block.solids;
+
+import java.util.EnumSet;
+import java.util.List;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+import appeng.block.AEBaseBlock;
+import appeng.client.render.BaseBlockRender;
+import appeng.client.render.blocks.RenderNull;
+import appeng.core.features.AEFeature;
+
+public class BlockMatrixFrame extends AEBaseBlock
+{
+
+	public BlockMatrixFrame() {
+		super( BlockMatrixFrame.class, Material.portal );
+		setfeature( EnumSet.of( AEFeature.SpatialIO ) );
+		setResistance( 6000000.0F );
+		setBlockUnbreakable();
+		setLightOpacity( 0 );
+		isOpaque = false;
+	}
+
+	@Override
+	protected Class<? extends BaseBlockRender> getRenderer()
+	{
+		return RenderNull.class;
+	}
+
+	@Override
+	public void getSubBlocks(int id, CreativeTabs tab, List list)
+	{
+
+	}
+
+}

block/solids/BlockQuartz.java

@@ -0,0 +1,17 @@
+package appeng.block.solids;
+
+import java.util.EnumSet;
+
+import net.minecraft.block.material.Material;
+import appeng.block.AEBaseBlock;
+import appeng.core.features.AEFeature;
+
+public class BlockQuartz extends AEBaseBlock
+{
+
+	public BlockQuartz() {
+		super( BlockQuartz.class, Material.rock );
+		setfeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
+	}
+
+}

block/solids/BlockQuartzChiseled.java

@@ -0,0 +1,17 @@
+package appeng.block.solids;
+
+import java.util.EnumSet;
+
+import net.minecraft.block.material.Material;
+import appeng.block.AEBaseBlock;
+import appeng.core.features.AEFeature;
+
+public class BlockQuartzChiseled extends AEBaseBlock
+{
+
+	public BlockQuartzChiseled() {
+		super( BlockQuartzChiseled.class, Material.rock );
+		setfeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
+	}
+
+}

block/solids/BlockQuartzGlass.java

@@ -0,0 +1,47 @@
+package appeng.block.solids;
+
+import java.util.EnumSet;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.world.IBlockAccess;
+import appeng.block.AEBaseBlock;
+import appeng.client.render.BaseBlockRender;
+import appeng.client.render.blocks.RenderQuartzGlass;
+import appeng.core.features.AEFeature;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class BlockQuartzGlass extends AEBaseBlock
+{
+
+	public BlockQuartzGlass() {
+		this( BlockQuartzGlass.class );
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public Class<? extends BaseBlockRender> getRenderer()
+	{
+		return RenderQuartzGlass.class;
+	}
+
+	@Override
+	public boolean shouldSideBeRendered(IBlockAccess w, int x, int y, int z, int side)
+	{
+		if ( w.getBlockMaterial( x, y, z ) == Material.glass )
+		{
+			if ( Block.blocksList[w.getBlockId( x, y, z )].getRenderType() == this.getRenderType() )
+				return false;
+		}
+		return super.shouldSideBeRendered( w, x, y, z, side );
+	}
+
+	public BlockQuartzGlass(Class c) {
+		super( c, Material.glass );
+		setfeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
+		setLightOpacity( 0 );
+		isOpaque = false;
+	}
+
+}

block/solids/BlockQuartzLamp.java

@@ -0,0 +1,41 @@
+package appeng.block.solids;
+
+import java.util.EnumSet;
+import java.util.Random;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.particle.EntityFX;
+import net.minecraft.world.World;
+import appeng.client.render.effects.VibrantEffect;
+import appeng.core.Configuration;
+import appeng.core.features.AEFeature;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class BlockQuartzLamp extends BlockQuartzGlass
+{
+
+	public BlockQuartzLamp() {
+		super( BlockQuartzLamp.class );
+		setfeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks, AEFeature.DecorativeLights ) );
+		setLightValue( 1.0f );
+		setTextureName( "BlockQuartzGlass" );
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void randomDisplayTick(World w, int x, int y, int z, Random r)
+	{
+		if ( !Configuration.instance.enableEffects )
+			return;
+
+		double d0 = (double) (r.nextFloat() - 0.5F) * 0.96D;
+		double d1 = (double) (r.nextFloat() - 0.5F) * 0.96D;
+		double d2 = (double) (r.nextFloat() - 0.5F) * 0.96D;
+
+		VibrantEffect fx = new VibrantEffect( w, 0.5 + x + d0, 0.5 + y + d1, 0.5 + z + d2, 0.0D, 0.0D, 0.0D );
+
+		Minecraft.getMinecraft().effectRenderer.addEffect( (EntityFX) fx );
+	}
+
+}

block/solids/BlockQuartzPillar.java

@@ -0,0 +1,27 @@
+package appeng.block.solids;
+
+import java.util.EnumSet;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.world.IBlockAccess;
+import appeng.api.util.IOrientable;
+import appeng.api.util.IOrientableBlock;
+import appeng.block.AEBaseBlock;
+import appeng.core.features.AEFeature;
+import appeng.helpers.MetaRotation;
+
+public class BlockQuartzPillar extends AEBaseBlock implements IOrientableBlock
+{
+
+	public BlockQuartzPillar() {
+		super( BlockQuartzPillar.class, Material.rock );
+		setfeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
+	}
+
+	@Override
+	public IOrientable getOrientable(final IBlockAccess w, final int x, final int y, final int z)
+	{
+		return new MetaRotation( w, x, y, z );
+	}
+
+}

block/solids/OreQuartz.java

@@ -0,0 +1,129 @@
+package appeng.block.solids;
+
+import java.util.EnumSet;
+import java.util.Random;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import appeng.api.AEApi;
+import appeng.api.util.IOrientable;
+import appeng.api.util.IOrientableBlock;
+import appeng.block.AEBaseBlock;
+import appeng.client.render.BaseBlockRender;
+import appeng.client.render.blocks.RenderQuartzOre;
+import appeng.core.features.AEFeature;
+import appeng.helpers.LocationRotation;
+
+public class OreQuartz extends AEBaseBlock implements IOrientableBlock
+{
+
+	public int boostBrightnessLow;
+	public int boostBrightnessHigh;
+	public boolean enhanceBrightness;
+
+	public OreQuartz(Class self) {
+		super( self, Material.rock );
+		setfeature( EnumSet.of( AEFeature.Core ) );
+		setHardness( 3.0F );
+		setResistance( 5.0F );
+		boostBrightnessLow = 0;
+		boostBrightnessHigh = 1;
+		enhanceBrightness = false;
+	}
+
+	@Override
+	protected Class<? extends BaseBlockRender> getRenderer()
+	{
+		return RenderQuartzOre.class;
+	}
+
+	@Override
+	public int getMixedBrightnessForBlock(IBlockAccess par1iBlockAccess, int par2, int par3, int par4)
+	{
+		int j1 = super.getMixedBrightnessForBlock( par1iBlockAccess, par2, par3, par4 );
+		if ( enhanceBrightness )
+		{
+			j1 = Math.max( j1 >> 20, j1 >> 4 );
+
+			if ( j1 > 4 )
+				j1 += boostBrightnessHigh;
+			else
+				j1 += boostBrightnessLow;
+
+			if ( j1 > 15 )
+				j1 = 15;
+			return j1 << 20 | j1 << 4;
+		}
+		return j1;
+	}
+
+	public OreQuartz() {
+		this( OreQuartz.class );
+	}
+
+	ItemStack getItemDropped()
+	{
+		return AEApi.instance().materials().materialCertusQuartzCrystal.stack( 1 );
+	}
+
+	@Override
+	public IOrientable getOrientable(final IBlockAccess w, final int x, final int y, final int z)
+	{
+		return new LocationRotation( w, x, y, z );
+	}
+
+	@Override
+	public int idDropped(int id, Random rand, int meta)
+	{
+		return getItemDropped().itemID;
+	}
+
+	@Override
+	public int damageDropped(int id)
+	{
+		return getItemDropped().getItemDamage();
+	}
+
+	@Override
+	public int quantityDropped(Random rand)
+	{
+		return 1 + rand.nextInt( 2 );
+	}
+
+	@Override
+	public int quantityDroppedWithBonus(int fortune, Random rand)
+	{
+		if ( fortune > 0 && this.blockID != this.idDropped( 0, rand, fortune ) )
+		{
+			int j = rand.nextInt( fortune + 2 ) - 1;
+
+			if ( j < 0 )
+			{
+				j = 0;
+			}
+
+			return this.quantityDropped( rand ) * (j + 1);
+		}
+		else
+		{
+			return this.quantityDropped( rand );
+		}
+	}
+
+	@Override
+	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 );
+
+		if ( this.idDropped( blockid, w.rand, meta ) != this.blockID )
+		{
+			int xp = MathHelper.getRandomIntegerInRange( w.rand, 2, 5 );
+
+			this.dropXpOnBlockBreak( w, x, y, z, xp );
+		}
+	}
+
+}

block/solids/OreQuartzCharged.java

@@ -0,0 +1,70 @@
+package appeng.block.solids;
+
+import java.util.Random;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.particle.EntityFX;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import appeng.api.AEApi;
+import appeng.client.render.effects.ChargedOreEffect;
+import appeng.core.Configuration;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class OreQuartzCharged extends OreQuartz
+{
+
+	public OreQuartzCharged() {
+		super( OreQuartzCharged.class );
+		boostBrightnessLow = 2;
+		boostBrightnessHigh = 5;
+	}
+
+	@Override
+	ItemStack getItemDropped()
+	{
+		return AEApi.instance().materials().materialCertusQuartzCrystalCharged.stack( 1 );
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void randomDisplayTick(World w, int x, int y, int z, Random r)
+	{
+		if ( !Configuration.instance.enableEffects )
+			return;
+
+		double xOff = (double) (r.nextFloat());
+		double yOff = (double) (r.nextFloat());
+		double zOff = (double) (r.nextFloat());
+
+		switch (r.nextInt( 6 ))
+		{
+		case 0:
+			xOff = -0.01;
+			break;
+		case 1:
+			yOff = -0.01;
+			break;
+		case 2:
+			xOff = -0.01;
+			break;
+		case 3:
+			zOff = -0.01;
+			break;
+		case 4:
+			xOff = 1.01;
+			break;
+		case 5:
+			yOff = 1.01;
+			break;
+		case 6:
+			zOff = 1.01;
+			break;
+		}
+
+		ChargedOreEffect fx = new ChargedOreEffect( w, x + xOff, y + yOff, z + zOff, 0.0f, 0.0f, 0.0f );
+		Minecraft.getMinecraft().effectRenderer.addEffect( (EntityFX) fx );
+	}
+
+}