License, readme and stuff

8 files changed, 19 insertions, 41 deletions

diff --git a/ihl/datanet/Contact.java b/ihl/datanet/Contact.java
index 3d5b6af..5dce365 100644
--- a/ihl/datanet/Contact.java
+++ b/ihl/datanet/Contact.java
@@ -20,7 +20,7 @@ public class Contact implements IDataNode
 {

 	public final int innerId;

 	private int dataGridID=-1;

-	private Set<IDataNode> connectedContacts = new HashSet();

+	private Set<IDataNode> connectedContacts = new HashSet<IDataNode>(8);

 	public final InvSlotSignalProcessor attachedSlot;

 	public final int attachedSlotNumber;

 	public final int type; //Free:-1; A1:0; A2:1; C:2; NO:3; NC:4;

diff --git a/ihl/datanet/DataCableItem.java b/ihl/datanet/DataCableItem.java
index d8bce25..c8349ca 100644
--- a/ihl/datanet/DataCableItem.java
+++ b/ihl/datanet/DataCableItem.java
@@ -1,7 +1,6 @@
 package ihl.datanet;

 

 import java.util.HashMap;

-import java.util.Iterator;

 import java.util.List;

 import java.util.Map;

 

@@ -10,35 +9,24 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

 import net.minecraft.client.renderer.texture.IIconRegister;

 import net.minecraft.creativetab.CreativeTabs;

-import net.minecraft.entity.Entity;

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.item.Item;

 import net.minecraft.item.ItemStack;

-import net.minecraft.nbt.NBTBase;

 import net.minecraft.nbt.NBTTagCompound;

 import net.minecraft.tileentity.TileEntity;

-import net.minecraft.util.AxisAlignedBB;

 import net.minecraft.util.IIcon;

-import net.minecraft.util.MathHelper;

-import net.minecraft.util.MovingObjectPosition;

-import net.minecraft.util.Vec3;

 import net.minecraft.world.World;

-import ihl.IHLCreativeTab;

-import ihl.IHLMod;

 import ihl.IHLModInfo;

 import ihl.flexible_cable.NodeEntity;

-import ihl.flexible_cable.PowerCableNodeEntity;

 import ihl.interfaces.IDataCableHolder;

-import ihl.interfaces.IEnergyNetNode;

-import ihl.interfaces.IWire;

 import ihl.items_blocks.FlexibleCableItem;

 import ihl.utils.IHLUtils;

 

 public class DataCableItem extends FlexibleCableItem {

     

-	private static Map<Integer, IIcon> iconMap = new HashMap();

-	private static Map<Integer, String> nameMap = new HashMap();

-	private static Map<Integer, String> descriptionMap = new HashMap();

+	private static Map<Integer, IIcon> iconMap = new HashMap<Integer, IIcon>();

+	private static Map<Integer, String> nameMap = new HashMap<Integer, String>();

+	private static Map<Integer, String> descriptionMap = new HashMap<Integer, String>();

 	public static DataCableItem dataCableInstance; 

 	

     public DataCableItem() 

@@ -49,6 +37,7 @@ public class DataCableItem extends FlexibleCableItem {
 		dataCableInstance=this;

 	}

 

+	@SuppressWarnings({ "unchecked", "rawtypes" })

 	@Override

 	@SideOnly(Side.CLIENT)

     public void getSubItems(Item item, CreativeTabs tabs, List itemList)

@@ -121,7 +110,8 @@ public class DataCableItem extends FlexibleCableItem {
 	    }

 

 

-    @Override

+    @SuppressWarnings({ "rawtypes", "unchecked" })

+	@Override

     public void addInformation(ItemStack itemStack, EntityPlayer player, List info, boolean flag)

     {

         if(itemStack.stackTagCompound!=null)

diff --git a/ihl/datanet/DataGrid.java b/ihl/datanet/DataGrid.java
index 2c577b0..0f4f9f9 100644
--- a/ihl/datanet/DataGrid.java
+++ b/ihl/datanet/DataGrid.java
@@ -8,20 +8,13 @@ import java.util.Set;
 

 public class DataGrid 

 {

-	public final Set<IDataNode> telist = new HashSet();

+	public final Set<IDataNode> telist = new HashSet<IDataNode>();

 	public double energy=0D;

-	private IDataNode sink;

-	private IDataNode source;

-	private double voltage;

-	private short frequency=0;

-	private double lastVoltage;

 	public boolean isGridValid=true;

-	private double total20TicksEU;

-	private int lastTickCounter=0;

 	

 	public Set<IDataNode> getListOfExcludedNodes()

 	{

-		Set<IDataNode> excludedNodes = new HashSet();

+		Set<IDataNode> excludedNodes = new HashSet<IDataNode>();

 		if(this.telist.isEmpty())

 		{

 			return excludedNodes;

diff --git a/ihl/datanet/DataNet.java b/ihl/datanet/DataNet.java
index 3f88c55..a241517 100644
--- a/ihl/datanet/DataNet.java
+++ b/ihl/datanet/DataNet.java
@@ -13,7 +13,7 @@ import net.minecraft.nbt.NBTTagCompound;
 

 public class DataNet {

 	

-	public Map<Integer, DataGrid> grids = new HashMap();

+	public Map<Integer, DataGrid> grids = new HashMap<Integer, DataGrid>();

 	private int griduid=0;

 	

 	public DataNet()

diff --git a/ihl/datanet/GuiInvisibleButton.java b/ihl/datanet/GuiInvisibleButton.java
index 2222859..31e8b3f 100644
--- a/ihl/datanet/GuiInvisibleButton.java
+++ b/ihl/datanet/GuiInvisibleButton.java
@@ -8,6 +8,7 @@ import net.minecraft.client.gui.GuiButton;
 

 public class GuiInvisibleButton extends GuiButton {

 

+	@SuppressWarnings({ "rawtypes", "unchecked" })

 	public GuiInvisibleButton(int id1, int x, int y, int w, int h, Map<Integer, Integer[]> linksCoordinatesMap, List buttonList) 

 	{

         super(id1, x, y, w, h, "");

diff --git a/ihl/datanet/RedstoneSignalConverterContainer.java b/ihl/datanet/RedstoneSignalConverterContainer.java
index c075b38..261c9d5 100644
--- a/ihl/datanet/RedstoneSignalConverterContainer.java
+++ b/ihl/datanet/RedstoneSignalConverterContainer.java
@@ -5,12 +5,11 @@ import java.util.List;
 import ic2.core.ContainerBase;

 import ic2.core.IC2;

 import ic2.core.slot.SlotInvSlot;

-import ihl.processing.invslots.SlotRedstoneConverterCableInvSlot;

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.inventory.ICrafting;

 import net.minecraft.inventory.Slot;

 

-public class RedstoneSignalConverterContainer extends ContainerBase {

+public class RedstoneSignalConverterContainer extends ContainerBase<RedstoneSignalConverterTileEntity> {

 

     protected RedstoneSignalConverterTileEntity tileEntity;

     private int lastLinksAmount = -1;

diff --git a/ihl/datanet/RedstoneSignalConverterGui.java b/ihl/datanet/RedstoneSignalConverterGui.java
index b823f9f..ce7e2d4 100644
--- a/ihl/datanet/RedstoneSignalConverterGui.java
+++ b/ihl/datanet/RedstoneSignalConverterGui.java
@@ -12,15 +12,12 @@ import net.minecraft.util.ResourceLocation;
 

 import org.lwjgl.opengl.GL11;

 

-import ic2.core.network.NetworkManager;

 import ihl.collector.GuiMultiTextureButton;

 

 @SideOnly(Side.CLIENT)

 public class RedstoneSignalConverterGui extends GuiContainer {

 	private static final ResourceLocation background = new ResourceLocation("ihl", "textures/gui/GUIRedstoneSignalConverter.png");

 	private RedstoneSignalConverterContainer container;

-	private GuiInvisibleButton batterySlotPlus;

-	private GuiInvisibleButton batterySlotMinus;

 	private GuiInvisibleButton[] sensorsEmittersPlus = new GuiInvisibleButton[6];

 	private GuiInvisibleButton[] sensorsEmittersMinus = new GuiInvisibleButton[6];

 	private GuiInvisibleButton[][] cableContacts = new GuiInvisibleButton[4][8];

@@ -37,15 +34,16 @@ public class RedstoneSignalConverterGui extends GuiContainer {
             this.xSize=RedstoneSignalConverterContainer.width;

     }

     

-    @Override

+    @SuppressWarnings("unchecked")

+	@Override

     public void initGui()

     {

     	super.initGui();

         int x = (width - xSize) / 2;

         int y = (height - ySize) / 2;

         int i,i1;

-        batterySlotPlus = new GuiInvisibleButton(0, x+24, y+121, 3, 3, linksCoordinatesMap, buttonList);

-        batterySlotMinus = new GuiInvisibleButton(1, x+24, y+124, 3, 3, linksCoordinatesMap, buttonList);

+        new GuiInvisibleButton(0, x+24, y+121, 3, 3, linksCoordinatesMap, buttonList); //battery plus

+        new GuiInvisibleButton(1, x+24, y+124, 3, 3, linksCoordinatesMap, buttonList); //battery minus

         for(i=0;i<sensorsEmittersPlus.length;i++)

         {

         	sensorsEmittersPlus[i]=new GuiInvisibleButton(i+2, x+24, y+13+18*i, 3, 3, linksCoordinatesMap, buttonList);

diff --git a/ihl/datanet/RedstoneSignalConverterTileEntity.java b/ihl/datanet/RedstoneSignalConverterTileEntity.java
index de1a4f7..6d36cb2 100644
--- a/ihl/datanet/RedstoneSignalConverterTileEntity.java
+++ b/ihl/datanet/RedstoneSignalConverterTileEntity.java
@@ -17,7 +17,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;

 import net.minecraft.server.MinecraftServer;

 import net.minecraft.tileentity.TileEntity;

-import net.minecraft.util.AxisAlignedBB;

 import net.minecraftforge.common.util.ForgeDirection;

 import ic2.api.network.INetworkClientTileEntityEventListener;

 import ic2.core.ContainerBase;

@@ -26,9 +25,7 @@ import ic2.core.IHasGui;
 import ic2.core.Ic2Items;

 import ic2.core.block.TileEntityInventory;

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

-import ic2.core.network.NetworkManager;

 import ihl.IHLMod;

-import ihl.flexible_cable.NodeEntity;

 import ihl.interfaces.IDataCableHolder;

 import ihl.interfaces.IDataNode;

 import ihl.processing.invslots.InvSlotSignalProcessor;

@@ -63,7 +60,7 @@ public class RedstoneSignalConverterTileEntity extends TileEntityInventory imple
 	public RedstoneSignalConverterTileEntity()

 	{

 		sensorEmitterSlots = new InvSlotSignalProcessor(this, "sensorEmitterSlots", 0, Access.IO, 6, 2);

-		cableList = new ArrayList();

+		cableList = new ArrayList<NBTTagCompound>();

 		dischargeSlot = new IHLInvSlotDischarge(this, 2, Access.IO, 4);

 		contacts[0]=new Contact(this,0,null,-1,0);

 		contacts[1]=new Contact(this,1,null,-1,1);

@@ -163,8 +160,8 @@ public class RedstoneSignalConverterTileEntity extends TileEntityInventory imple
         super.updateEntityServer();

         if(this.linksOrInventoryChanged && this.energy>0)

         {

-			Set<Integer> checkedGrids = new HashSet();

-			Set<Integer> unCheckedGrids = new HashSet();

+			Set<Integer> checkedGrids = new HashSet<Integer>();

+			Set<Integer> unCheckedGrids = new HashSet<Integer>();

 			InvSlotSignalProcessor slots = this.sensorEmitterSlots;

     		for(int i=0;i<slots.size();i++)

     		{