fixed headers, implemented new armor computation for IC2

forge/forge_common/net/minecraft/src/forge/ArmorProperties.java

@@ -0,0 +1,11 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+public class ArmorProperties {
+	public int damageRemove = 0;
+	public boolean allowRegularComputation = false;
+}

forge/forge_common/net/minecraft/src/forge/ForgeHooks.java

@@ -4,8 +4,8 @@
  */
 
 package net.minecraft.src.forge;
+
 import net.minecraft.src.Block;
-import net.minecraft.src.World;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;

forge/forge_common/net/minecraft/src/forge/IBlockSecondaryProperties.java

@@ -5,7 +5,6 @@
 
 package net.minecraft.src.forge;
 
-import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.World;
 
 /**

forge/forge_common/net/minecraft/src/forge/IDestroyToolHandler.java

@@ -1,12 +1,12 @@
-/*
+/**
  * This software is provided under the terms of the Minecraft Forge Public 
  * License v1.0.
  */
+
 package net.minecraft.src.forge;
 
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.EnumStatus;
 
 public interface IDestroyToolHandler {
 	/** Called when the user's currently equipped item is destroyed.

forge/forge_common/net/minecraft/src/forge/ISleepHandler.java

@@ -1,7 +1,8 @@
-/*
+/**
  * This software is provided under the terms of the Minecraft Forge Public 
  * License v1.0.
  */
+
 package net.minecraft.src.forge;
 
 import net.minecraft.src.EntityPlayer;

forge/forge_common/net/minecraft/src/forge/ISpecialArmor.java

@@ -5,6 +5,9 @@
 
 package net.minecraft.src.forge;
 
+import javax.swing.text.html.parser.Entity;
+
+import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.ItemArmor;
 
 /**
@@ -15,13 +18,22 @@ import net.minecraft.src.ItemArmor;
  * @see ItemArmor
  */
 public interface ISpecialArmor {
+	
     /**
      * This interface will adjust the amount of damage received by the entity.
+     * @deprecated use getProperties instead.
      */
     public int adjustArmorDamage (int damage);
     
     /**
      * When this return true, the regular armor computation will be cancelled
+     * @deprecated use getProperties instead.
      */
     public boolean allowRegularComputation ();
+    
+    /**
+     * Return extra properties for the armor
+     */
+	public ArmorProperties getProperties(EntityPlayer player,
+			int intitialDamage, int currentDamage);
 }

forge/forge_common/net/minecraft/src/forge/MinecraftForge.java

@@ -5,11 +5,9 @@
 
 package net.minecraft.src.forge;
 
-import net.minecraft.src.BiomeGenBase;
 import net.minecraft.src.Block;
 import net.minecraft.src.Item;
 import net.minecraft.src.ItemStack;
-import net.minecraft.src.ItemTool;
 import net.minecraft.src.World;
 
 import java.util.*;

forge/release.bat

@@ -8,6 +8,6 @@ set PATH=E:\cygwin\bin;%PATH%
 
 cd forge
 
-sh package.sh 1.0.4
+sh package.sh 1.0.5
 
 pause