fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ported to 1.7

Browse Source
This commit is contained in:
AlgorithmX2
2014-02-08 19:34:52 -06:00
parent 30c1deb8cf
commit d50c7f6312
328 changed files with 2209 additions and 2311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
entity/EntityChargedQuartz.java
+4 -4
View File
@@ -6,7 +6,7 @@ import java.util.List;
import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.Item;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.MathHelper;
@@ -45,7 +45,7 @@ final public class EntityChargedQuartz extends EntityItem
int i = MathHelper.floor_double( this.posY );
int k = MathHelper.floor_double( this.posZ );
Material mat = worldObj.getBlockMaterial( j, i, k );
Material mat = worldObj.getBlock( j, i, k ).getMaterial();
if ( Platform.isServer() && mat.isLiquid() )
{
transformTime++;
@@ -77,10 +77,10 @@ final public class EntityChargedQuartz extends EntityItem
ItemStack other = ((EntityItem) e).getEntityItem();
if ( other != null && other.stackSize > 0 )
{
if ( Platform.isSameItem( other, new ItemStack( Item.redstone ) ) )
if ( Platform.isSameItem( other, new ItemStack( Items.redstone ) ) )
redstone = (EntityItem) e;
if ( Platform.isSameItem( other, new ItemStack( Item.netherQuartz ) ) )
if ( Platform.isSameItem( other, new ItemStack( Items.quartz ) ) )
netherQuartz = (EntityItem) e;
}
}