License, readme and stuff

7 files changed, 8 insertions, 27 deletions

diff --git a/ihl/crop_harvestors/BlowerBlock.java b/ihl/crop_harvestors/BlowerBlock.java
index 9d4c782..3ec49b7 100644
--- a/ihl/crop_harvestors/BlowerBlock.java
+++ b/ihl/crop_harvestors/BlowerBlock.java
@@ -147,7 +147,6 @@ public class BlowerBlock extends Block implements ITileEntityProvider{
 		@SideOnly(Side.CLIENT)

 		public IIcon getIcon(int side, int meta) 

 		{

-			IIcon sideIcon = this.blockIcon;

 			switch (side)

 			{

 			case 0:

diff --git a/ihl/crop_harvestors/BlowerContainer.java b/ihl/crop_harvestors/BlowerContainer.java
index 65393bf..2a64488 100644
--- a/ihl/crop_harvestors/BlowerContainer.java
+++ b/ihl/crop_harvestors/BlowerContainer.java
@@ -6,7 +6,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.ICrafting;

 import net.minecraft.inventory.Slot;

 

-public class BlowerContainer extends ContainerBase {

+public class BlowerContainer extends ContainerBase<BlowerTileEntity> {

 

     protected BlowerTileEntity tileEntity;

     public int lastStorage = -1;

diff --git a/ihl/crop_harvestors/BlowerGui.java b/ihl/crop_harvestors/BlowerGui.java
index f74ac51..bedee1f 100644
--- a/ihl/crop_harvestors/BlowerGui.java
+++ b/ihl/crop_harvestors/BlowerGui.java
@@ -21,14 +21,6 @@ public class BlowerGui extends GuiContainer {
     }

     

     @Override

-	public void initGui()

-    {

-        super.initGui();

-        int x = (width - xSize) / 2;

-        int y = (height - ySize) / 2;

-    }

-    

-    @Override

     protected void drawGuiContainerForegroundLayer(int param1, int param2) {

             //the parameters for drawString are: string, x, y, color

     		String title = StatCollector.translateToLocal("tile.blowerBlock.name");

diff --git a/ihl/crop_harvestors/BlowerTileEntity.java b/ihl/crop_harvestors/BlowerTileEntity.java
index 1c06f6c..e26632b 100644
--- a/ihl/crop_harvestors/BlowerTileEntity.java
+++ b/ihl/crop_harvestors/BlowerTileEntity.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.HashSet;

 import java.util.Iterator;

 import java.util.List;

-import java.util.Random;

 import java.util.Set;

 

 import cpw.mods.fml.relauncher.Side;

@@ -34,7 +33,6 @@ import ic2.core.block.TileEntityInventory;
 import ic2.core.block.invslot.InvSlot;

 import ic2.core.block.invslot.InvSlotUpgrade;

 import ic2.core.block.invslot.InvSlot.Access;

-import ic2.core.network.NetworkManager;

 import ic2.core.upgrade.IUpgradableBlock;

 import ic2.core.upgrade.UpgradableProperty;

 import ihl.IHLMod;

@@ -52,16 +50,13 @@ public class BlowerTileEntity extends TileEntityInventory implements IEnergySink
     private double energyConsume=5D;

     private int defaultAirSpeedBase=100;

     public int airSpeedBase=100;

-    private boolean shouldCalculateAirFlow=true;

     private int sCAFCount=0;

     public boolean addedToEnergyNet = false;

-    private boolean hasEntityInFlow=false;

-    private ArrayList<AirSpeedZone> aszlist = new ArrayList();

+    private ArrayList<AirSpeedZone> aszlist = new ArrayList<AirSpeedZone>();

     public final InvSlotUpgrade upgradeSlot;

     public final IHLInvSlotDischarge dischargeSlot;

 	public int updateChecksum=-1;

     private final float lambda=0.00001F;

-    private Random rand = new Random();

     public int operationRange=-1;

     public int lastOperationRange=0;

     

@@ -254,7 +249,8 @@ public class BlowerTileEntity extends TileEntityInventory implements IEnergySink
     }

     	

     	

-    @Override

+    @SuppressWarnings("unchecked")

+	@Override

 	public void updateEntityServer()

     {

     	

@@ -650,12 +646,7 @@ public class BlowerTileEntity extends TileEntityInventory implements IEnergySink
 			return false;

 		}

 	}

-	

-	private boolean isCNE(int x,int y,int z,int x1,int y1,int z1)

-	{

-		return x!=x1||y!=y1||z!=z1;

-	}

-	

+		

 	private boolean isAirPassable(int x,int y,int z)

 	{

 		Block block = worldObj.getBlock(x,y,z);

diff --git a/ihl/crop_harvestors/RubberTreeBlock.java b/ihl/crop_harvestors/RubberTreeBlock.java
index bb2128b..9cfdea1 100644
--- a/ihl/crop_harvestors/RubberTreeBlock.java
+++ b/ihl/crop_harvestors/RubberTreeBlock.java
@@ -69,7 +69,6 @@ public class RubberTreeBlock extends Block{
 		@SideOnly(Side.CLIENT)

 		public void registerBlockIcons(IIconRegister par1IconRegister)

 		{

-			ItemStack result;

 			switch(type)

 			{

 			case RUBBERTREE:

@@ -120,7 +119,6 @@ public class RubberTreeBlock extends Block{
 		@SideOnly(Side.CLIENT)

 		public IIcon getIcon(int side, int meta) 

 		{

-			IIcon sideIcon = this.blockIcon;

 			switch (side)

 			{

 			case 0:

diff --git a/ihl/crop_harvestors/SackBlock.java b/ihl/crop_harvestors/SackBlock.java
index 78a5735..abf8c46 100644
--- a/ihl/crop_harvestors/SackBlock.java
+++ b/ihl/crop_harvestors/SackBlock.java
@@ -43,6 +43,7 @@ public class SackBlock extends Block implements ITileEntityProvider{
 	   		this.blockIcon = par1IconRegister.registerIcon(IHLModInfo.MODID + ":sackItem");

 		}

 		

+		@SuppressWarnings("rawtypes")

 		@Override

 	    public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB aabb, List list, Entity entity)

 	    {

diff --git a/ihl/crop_harvestors/SackTileEntity.java b/ihl/crop_harvestors/SackTileEntity.java
index 9704b7f..69418d8 100644
--- a/ihl/crop_harvestors/SackTileEntity.java
+++ b/ihl/crop_harvestors/SackTileEntity.java
@@ -17,9 +17,9 @@ import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;

 import ic2.core.IC2;

 import ic2.core.block.TileEntityInventory;

-import ic2.core.network.NetworkManager;

 import ihl.IHLMod;

 import ihl.utils.IHLFluidTank;

+import ihl.utils.IHLUtils;

 

 public class SackTileEntity extends TileEntityInventory implements IFluidHandler

 {

@@ -307,7 +307,7 @@ public class SackTileEntity extends TileEntityInventory implements IFluidHandler
     		meta=worldObj.getBlockMetadata(xCoord+mX(), yCoord-h, zCoord+mZ());

     		if(!isLogBlock(block, meta))

     		{

-    			if(block==Blocks.dirt)

+    			if(IHLUtils.isBlockRegisteredInOreDictionaryAs(block, "blockDirt"))

     			{

     				return true;

     			}