diff --git a/forge_common/net/minecraft/src/forge/ArmorProperties.java b/forge_common/net/minecraft/src/forge/ArmorProperties.java index 44eeb00335..0a12b754f7 100755 --- a/forge_common/net/minecraft/src/forge/ArmorProperties.java +++ b/forge_common/net/minecraft/src/forge/ArmorProperties.java @@ -8,4 +8,13 @@ package net.minecraft.src.forge; public class ArmorProperties { public int damageRemove = 0; public boolean allowRegularComputation = false; + + public ArmorProperties () { + + } + + public ArmorProperties (int damageRemove, boolean allowRegularCompuation) { + this.damageRemove = damageRemove; + this.allowRegularComputation = allowRegularCompuation; + } } diff --git a/forge_common/net/minecraft/src/forge/ISpecialArmor.java b/forge_common/net/minecraft/src/forge/ISpecialArmor.java index c950cd2923..d6dbfa0268 100755 --- a/forge_common/net/minecraft/src/forge/ISpecialArmor.java +++ b/forge_common/net/minecraft/src/forge/ISpecialArmor.java @@ -5,8 +5,6 @@ package net.minecraft.src.forge; -import javax.swing.text.html.parser.Entity; - import net.minecraft.src.EntityPlayer; import net.minecraft.src.ItemArmor; @@ -18,18 +16,6 @@ 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 diff --git a/install/README.txt b/install/README.txt index c649f02191..7d55174933 100755 --- a/install/README.txt +++ b/install/README.txt @@ -1,10 +1,12 @@ *** HOW TO INSTALL *** -The forge directory should have been uncompacted right under your MCP root -directory. +Extract the download archive directly into your MCP-directiory. +It should create a folder "forge" within that directory, containing all +extracted files. -You should a a fresh minecraft and minecraft_server.jar freshly decompiled -with ModLoader and ModLoaderMP. +You should use freshly decompiled jars, solely including ModLoader & +ModLoaderMP respectively. Anything else can eventually cause conflicts. + +Now just start the install-bat, MCForge will install itself into the proper +locations and copy all ned files, as well as modifying the ned baseclasses. -Just run the script install.bat. It will copy the Minecraft Forge source on your -src directory, and modify the Minecraft source files. diff --git a/release.bat b/release.bat index f3ef746cb6..a7ae2d692d 100755 --- a/release.bat +++ b/release.bat @@ -8,6 +8,6 @@ set PATH=E:\cygwin\bin;%PATH% cd forge -sh package.sh 1.0.5 +sh package.sh 1.0.6-beta pause