keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix up a couple of patches, affected by the recent update

Browse source
This commit is contained in:
cpw 2015-11-25 02:07:48 -05:00
parent 4f2feee931
commit cde6be7742
2 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
patches/minecraft/net/minecraft/inventory/Slot.java.patch
View file

@ -9,7 +9,7 @@
} }
public ItemStack func_75209_a(int p_75209_1_) public ItemStack func_75209_a(int p_75209_1_)
@@ -112,4 +112,64 @@ @@ -112,4 +112,63 @@
{ {
return true; return true;
} }
@ -20,7 +20,7 @@
+ protected Object backgroundMap; + protected Object backgroundMap;
+ /** + /**
+ * Gets the path of the texture file to use for the background image of this slot when drawing the GUI. + * 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) + @SideOnly(Side.CLIENT)
+ public net.minecraft.util.ResourceLocation getBackgroundLocation() + 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. + * 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) + @SideOnly(Side.CLIENT)
+ public void setBackgroundLocation(net.minecraft.util.ResourceLocation texture) + 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. + * Sets which icon index to use as the background image of the slot when it's empty.
+ * Getter is func_178171_c + * @param name The icon to use, null for none
+ * @param icon The icon to use, null for none
+ */ + */
+ public void setBackgroundName(String name) + public void setBackgroundName(String name)
+ { + {

12
patches/minecraft/net/minecraft/world/biome/BiomeGenForest.java.patch
View file

@ -1,17 +1,5 @@
--- ../src-base/minecraft/net/minecraft/world/biome/BiomeGenForest.java --- ../src-base/minecraft/net/minecraft/world/biome/BiomeGenForest.java
+++ ../src-work/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 @@ @@ -201,4 +201,20 @@
}; };
} }