diff --git a/patches/minecraft/net/minecraft/inventory/Slot.java.patch b/patches/minecraft/net/minecraft/inventory/Slot.java.patch index 3b5a76863f..d47ee2d871 100644 --- a/patches/minecraft/net/minecraft/inventory/Slot.java.patch +++ b/patches/minecraft/net/minecraft/inventory/Slot.java.patch @@ -9,7 +9,7 @@ } public ItemStack func_75209_a(int p_75209_1_) -@@ -112,4 +112,64 @@ +@@ -112,4 +112,63 @@ { return true; } @@ -20,7 +20,7 @@ + protected Object backgroundMap; + /** + * Gets the path of the texture file to use for the background image of this slot when drawing the GUI. -+ * @return String: The texture file that will be used in GuiContainer.drawSlotInventory for the slot background. ++ * @return The resource location for the background image + */ + @SideOnly(Side.CLIENT) + public net.minecraft.util.ResourceLocation getBackgroundLocation() @@ -30,7 +30,7 @@ + + /** + * Sets the texture file to use for the background image of the slot when it's empty. -+ * @param textureFilename String: Path of texture file to use, or null to use "/gui/items.png" ++ * @param texture the resourcelocation for the texture + */ + @SideOnly(Side.CLIENT) + public void setBackgroundLocation(net.minecraft.util.ResourceLocation texture) @@ -40,8 +40,7 @@ + + /** + * Sets which icon index to use as the background image of the slot when it's empty. -+ * Getter is func_178171_c -+ * @param icon The icon to use, null for none ++ * @param name The icon to use, null for none + */ + public void setBackgroundName(String name) + { diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenForest.java.patch b/patches/minecraft/net/minecraft/world/biome/BiomeGenForest.java.patch index 9a2aa4c109..95b4694190 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenForest.java.patch +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenForest.java.patch @@ -1,17 +1,5 @@ --- ../src-base/minecraft/net/minecraft/world/biome/BiomeGenForest.java +++ ../src-work/minecraft/net/minecraft/world/biome/BiomeGenForest.java -@@ -188,9 +188,9 @@ - { - return this.field_76756_M != BiomeGenBase.field_150583_P.field_76756_M && this.field_76756_M != BiomeGenBase.field_150582_Q.field_76756_M ? new BiomeGenMutated(p_180277_1_, this) - { -- public void func_180624_a(World p_180624_1_, Random p_180624_2_, BlockPos p_180624_3_) -+ public void func_180624_a(World worldIn, Random p_180624_2_, BlockPos p_180624_3_) - { -- this.field_150611_aD.func_180624_a(p_180624_1_, p_180624_2_, p_180624_3_); -+ this.field_150611_aD.func_180624_a(worldIn, p_180624_2_, p_180624_3_); - } - }: new BiomeGenMutated(p_180277_1_, this) - { @@ -201,4 +201,20 @@ }; }