diff --git a/client/net/minecraftforge/client/ModCompatibilityClient.java b/client/net/minecraftforge/client/ModCompatibilityClient.java index 258f6ff168..94b87b0e86 100644 --- a/client/net/minecraftforge/client/ModCompatibilityClient.java +++ b/client/net/minecraftforge/client/ModCompatibilityClient.java @@ -17,7 +17,7 @@ import net.minecraft.src.*; public class ModCompatibilityClient { /** - * Trys to get the class for the specified name, will also try the + * Tries to get the class for the specified name, will also try the * net.minecraft.src package in case we are in MCP * Returns null if not found. * @@ -77,6 +77,7 @@ public class ModCompatibilityClient /** * Walks the given path in the Minecraft app directory and adds audio to the SoundPool + * * @param path The path to walk * @param pool The pool to add sound to */ diff --git a/common/net/minecraftforge/common/ISpecialArmor.java b/common/net/minecraftforge/common/ISpecialArmor.java index b440029be8..919ced9cff 100644 --- a/common/net/minecraftforge/common/ISpecialArmor.java +++ b/common/net/minecraftforge/common/ISpecialArmor.java @@ -31,7 +31,7 @@ public interface ISpecialArmor * same priority, damage will be distributed between them based on there * absorption ratio. * - * @param entity The entity wearing the armor. + * @param player The entity wearing the armor. * @param armor The ItemStack of the armor item itself. * @param source The source of the damage, which can be used to alter armor * properties based on the type or source of damage. @@ -57,7 +57,7 @@ public interface ISpecialArmor * up automatically. * * @param entity The entity wearing the armor - * @param armor The ItemStack of the armor item itself. + * @param stack The ItemStack of the armor item itself. * @param source The source of the damage, which can be used to alter armor * properties based on the type or source of damage. * @param damage The amount of damage being applied to the armor diff --git a/common/net/minecraftforge/common/MinecraftForge.java b/common/net/minecraftforge/common/MinecraftForge.java index 905f4f1489..fb6b7698ad 100644 --- a/common/net/minecraftforge/common/MinecraftForge.java +++ b/common/net/minecraftforge/common/MinecraftForge.java @@ -71,7 +71,7 @@ public class MinecraftForge * classes, if multiple tool types can be used to harvest this block. * @param harvestLevel The minimum tool harvest level required to successfully * harvest the block. - * @see setToolClass for details on tool classes. + * @see MinecraftForge#setToolClass for details on tool classes. */ public static void setBlockHarvestLevel(Block block, int metadata, String toolClass, int harvestLevel) { @@ -90,7 +90,7 @@ public class MinecraftForge * @param block The block to remove effectiveness from. * @param metadata The metadata for the block subtype. * @param toolClass The tool class to remove the effectiveness mapping from. - * @see setToolClass for details on tool classes. + * @see MinecraftForge#setToolClass for details on tool classes. */ public static void removeBlockEffectiveness(Block block, int metadata, String toolClass) { @@ -108,7 +108,7 @@ public class MinecraftForge * classes, if multiple tool types can be used to harvest this block. * @param harvestLevel The minimum tool harvest level required to successfully * harvest the block. - * @see setToolClass for details on tool classes. + * @see MinecraftForge#setToolClass for details on tool classes. */ public static void setBlockHarvestLevel(Block block, String toolClass, int harvestLevel) { @@ -126,7 +126,7 @@ public class MinecraftForge * @param block The block to check. * @param metadata The metadata for the block subtype. * @param toolClass The tool class to check as able to remove this block. - * @see setToolClass for details on tool classes. + * @see MinecraftForge#setToolClass for details on tool classes. * @return The harvest level or -1 if no mapping exists. */ public static int getBlockHarvestLevel(Block block, int metadata, String toolClass) @@ -150,7 +150,7 @@ public class MinecraftForge * * @param block The block to remove effectiveness from. * @param toolClass The tool class to remove the effectiveness mapping from. - * @see setToolClass for details on tool classes. + * @see MinecraftForge#setToolClass for details on tool classes. */ public static void removeBlockEffectiveness(Block block, String toolClass) { diff --git a/common/net/minecraftforge/oredict/OreDictionary.java b/common/net/minecraftforge/oredict/OreDictionary.java index 171053ff41..e4d7dbb222 100644 --- a/common/net/minecraftforge/oredict/OreDictionary.java +++ b/common/net/minecraftforge/oredict/OreDictionary.java @@ -60,7 +60,7 @@ public class OreDictionary * Retrieves the ArrayList of items that are registered to this ore type. * Creates the list as empty if it did not exist. * - * @param id The ore ID, see getOreID + * @param name The ore name, directly calls getOreID * @return An arrayList containing ItemStacks registered for this ore */ public static ArrayList getOres(String name) diff --git a/patches/common/net/minecraft/src/Block.java.patch b/patches/common/net/minecraft/src/Block.java.patch index 277ecf9b50..c22971c276 100644 --- a/patches/common/net/minecraft/src/Block.java.patch +++ b/patches/common/net/minecraft/src/Block.java.patch @@ -161,7 +161,7 @@ + * @param x X Position + * @param y Y position + * @param z Z position -+ * @param size The side to check ++ * @param side The side to check + * @return True if the block is solid on the specified side. + */ + public boolean isBlockSolidOnSide(World world, int x, int y, int z, ForgeDirection side) @@ -338,7 +338,7 @@ + * @param z The blocks Z position + * @param metadata The blocks current metadata + * @param side The face that the fire is coming from -+ * @return ++ * @return True if this block sustains fire, meaning it will never go out. + */ + public boolean isFireSource(World world, int x, int y, int z, int metadata, ForgeDirection side) + { @@ -416,8 +416,8 @@ + * + * @param world The current world + * @param x X Position -+ * @param Y Y Position -+ * @param Z Z Position ++ * @param y Y Position ++ * @param z Z Position + * @param metadata Current metadata + * @param fortune Breakers fortune level + * @return A ArrayList containing all items this block drops @@ -677,15 +677,15 @@ + /** + * Location sensitive version of getExplosionRestance + * -+ * @param par1Entity ++ * @param par1Entity The entity that caused the explosion + * @param world The current world + * @param x X Position + * @param y Y Position + * @param z Z Position -+ * @param explosionX -+ * @param explosionY -+ * @param explosionZ -+ * @return ++ * @param explosionX Explosion source X Position ++ * @param explosionY Explosion source X Position ++ * @param explosionZ Explosion source X Position ++ * @return The amount of the explosion absorbed. + */ + public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) + { diff --git a/patches/common/net/minecraft/src/Chunk.java.patch b/patches/common/net/minecraft/src/Chunk.java.patch index dda21cffb6..626f490553 100644 --- a/patches/common/net/minecraft/src/Chunk.java.patch +++ b/patches/common/net/minecraft/src/Chunk.java.patch @@ -41,9 +41,9 @@ + * @param chunkX The chunk's X position + * @param chunkZ The Chunk's Z position + */ -+ public Chunk(World world, byte[] ids, byte[] metadata, int chunkX, int chunkY) ++ public Chunk(World world, byte[] ids, byte[] metadata, int chunkX, int chunkZ) + { -+ this(world, chunkX, chunkY); ++ this(world, chunkX, chunkZ); + int var5 = ids.length / 256; + + for (int x = 0; x < 16; ++x)