diff --git a/fml b/fml index 3231db9376..5365f5ea3e 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit 3231db9376766d619f942b6a526718daa3c68038 +Subproject commit 5365f5ea3e90ec85552bdb7f1f1237c51b4ea493 diff --git a/patches/minecraft/net/minecraft/block/Block.java.patch b/patches/minecraft/net/minecraft/block/Block.java.patch index ceee83fdae..493340132d 100644 --- a/patches/minecraft/net/minecraft/block/Block.java.patch +++ b/patches/minecraft/net/minecraft/block/Block.java.patch @@ -53,7 +53,7 @@ public class Block { -@@ -110,7 +131,8 @@ +@@ -112,7 +133,8 @@ public static Block func_149729_e(int p_149729_0_) { @@ -63,7 +63,7 @@ } public static Block func_149634_a(Item p_149634_0_) -@@ -481,9 +503,10 @@ +@@ -483,9 +505,10 @@ return this.field_149789_z; } @@ -75,7 +75,7 @@ } public final void func_149676_a(float p_149676_1_, float p_149676_2_, float p_149676_3_, float p_149676_4_, float p_149676_5_, float p_149676_6_) -@@ -500,13 +523,13 @@ +@@ -502,13 +525,13 @@ public int func_149677_c(IBlockAccess p_149677_1_, int p_149677_2_, int p_149677_3_, int p_149677_4_) { Block block = p_149677_1_.func_147439_a(p_149677_2_, p_149677_3_, p_149677_4_); @@ -91,7 +91,7 @@ } else { -@@ -595,7 +618,13 @@ +@@ -597,7 +620,13 @@ public void func_149726_b(World p_149726_1_, int p_149726_2_, int p_149726_3_, int p_149726_4_) {} @@ -106,7 +106,7 @@ public int func_149745_a(Random p_149745_1_) { -@@ -609,8 +638,7 @@ +@@ -611,8 +640,7 @@ public float func_149737_a(EntityPlayer p_149737_1_, World p_149737_2_, int p_149737_3_, int p_149737_4_, int p_149737_5_) { @@ -116,7 +116,7 @@ } public final void func_149697_b(World p_149697_1_, int p_149697_2_, int p_149697_3_, int p_149697_4_, int p_149697_5_, int p_149697_6_) -@@ -622,18 +650,14 @@ +@@ -624,18 +652,14 @@ { if (!p_149690_1_.field_72995_K) { @@ -139,7 +139,7 @@ } } } -@@ -643,6 +667,11 @@ +@@ -645,6 +669,11 @@ { if (!p_149642_1_.field_72995_K && p_149642_1_.func_82736_K().func_82766_b("doTileDrops")) { @@ -151,7 +151,7 @@ float f = 0.7F; double d0 = (double)(p_149642_1_.field_73012_v.nextFloat() * f) + (double)(1.0F - f) * 0.5D; double d1 = (double)(p_149642_1_.field_73012_v.nextFloat() * f) + (double)(1.0F - f) * 0.5D; -@@ -827,7 +856,7 @@ +@@ -829,7 +858,7 @@ public boolean func_149742_c(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_) { @@ -160,7 +160,7 @@ } public boolean func_149727_a(World p_149727_1_, int p_149727_2_, int p_149727_3_, int p_149727_4_, EntityPlayer p_149727_5_, int p_149727_6_, float p_149727_7_, float p_149727_8_, float p_149727_9_) -@@ -920,25 +949,35 @@ +@@ -922,25 +951,35 @@ p_149636_2_.func_71064_a(StatList.field_75934_C[func_149682_b(this)], 1); p_149636_2_.func_71020_j(0.025F); @@ -199,7 +199,7 @@ } protected ItemStack func_149644_j(int p_149644_1_) -@@ -1114,6 +1153,1099 @@ +@@ -1116,6 +1155,1099 @@ return null; } diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch index fb443a4c9a..9ec8287970 100644 --- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -56,7 +56,7 @@ if (p_147108_1_ instanceof GuiMainMenu) { this.field_71474_y.field_74330_P = false; -@@ -1342,7 +1347,7 @@ +@@ -1341,7 +1346,7 @@ if (this.field_71439_g.func_82246_f(i, j, k)) { @@ -65,7 +65,7 @@ this.field_71439_g.func_71038_i(); } } -@@ -1423,11 +1428,12 @@ +@@ -1422,11 +1427,12 @@ int j = this.field_71476_x.field_72312_c; int k = this.field_71476_x.field_72309_d; @@ -80,7 +80,7 @@ { flag = false; this.field_71439_g.func_71038_i(); -@@ -1454,7 +1460,8 @@ +@@ -1453,7 +1459,8 @@ { ItemStack itemstack1 = this.field_71439_g.field_71071_by.func_70448_g(); @@ -90,7 +90,7 @@ { this.field_71460_t.field_78516_c.func_78445_c(); } -@@ -1666,6 +1673,8 @@ +@@ -1665,6 +1672,8 @@ while (Mouse.next()) { @@ -99,7 +99,7 @@ j = Mouse.getEventButton(); KeyBinding.func_74510_a(j - 100, Mouse.getEventButtonState()); -@@ -2128,6 +2137,11 @@ +@@ -2127,6 +2136,11 @@ public void func_71353_a(WorldClient p_71353_1_, String p_71353_2_) { @@ -111,7 +111,7 @@ if (p_71353_1_ == null) { NetHandlerPlayClient nethandlerplayclient = this.func_147114_u(); -@@ -2140,6 +2154,18 @@ +@@ -2139,6 +2153,18 @@ if (this.field_71437_Z != null) { this.field_71437_Z.func_71263_m(); @@ -130,7 +130,7 @@ } this.field_71437_Z = null; -@@ -2288,113 +2314,10 @@ +@@ -2287,113 +2313,10 @@ if (this.field_71476_x != null) { boolean flag = this.field_71439_g.field_71075_bZ.field_75098_d; @@ -246,7 +246,7 @@ if (flag) { j = this.field_71439_g.field_71069_bz.field_75151_b.size() - 9 + this.field_71439_g.field_71071_by.field_70461_c; -@@ -2660,8 +2583,15 @@ +@@ -2659,8 +2582,15 @@ p_70001_1_.func_152767_b("gl_max_texture_size", Integer.valueOf(func_71369_N())); } @@ -262,7 +262,7 @@ for (int i = 16384; i > 0; i >>= 1) { GL11.glTexImage2D(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_RGBA, i, i, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, (ByteBuffer)null); -@@ -2669,6 +2599,7 @@ +@@ -2668,6 +2598,7 @@ if (j != 0) { diff --git a/patches/minecraft/net/minecraft/inventory/ContainerBeacon.java.patch b/patches/minecraft/net/minecraft/inventory/ContainerBeacon.java.patch new file mode 100644 index 0000000000..561e6c890c --- /dev/null +++ b/patches/minecraft/net/minecraft/inventory/ContainerBeacon.java.patch @@ -0,0 +1,11 @@ +--- ../src-base/minecraft/net/minecraft/inventory/ContainerBeacon.java ++++ ../src-work/minecraft/net/minecraft/inventory/ContainerBeacon.java +@@ -156,7 +156,7 @@ + + public boolean func_75214_a(ItemStack p_75214_1_) + { +- return p_75214_1_ == null ? false : p_75214_1_.func_77973_b() == Items.field_151166_bC || p_75214_1_.func_77973_b() == Items.field_151045_i || p_75214_1_.func_77973_b() == Items.field_151043_k || p_75214_1_.func_77973_b() == Items.field_151042_j; ++ return p_75214_1_ != null && p_75214_1_.func_77973_b() != null && p_75214_1_.func_77973_b().isBeaconPayment(p_75214_1_); + } + + public int func_75219_a() diff --git a/patches/minecraft/net/minecraft/item/Item.java.patch b/patches/minecraft/net/minecraft/item/Item.java.patch index 684dd0db72..9222192743 100644 --- a/patches/minecraft/net/minecraft/item/Item.java.patch +++ b/patches/minecraft/net/minecraft/item/Item.java.patch @@ -43,7 +43,7 @@ public class Item { -@@ -448,6 +458,7 @@ +@@ -450,6 +460,7 @@ return p_77654_1_; } @@ -51,7 +51,7 @@ public int func_77639_j() { return this.field_77777_bU; -@@ -566,6 +577,7 @@ +@@ -568,6 +579,7 @@ return this.field_77700_c; } @@ -59,7 +59,7 @@ public boolean func_77634_r() { return this.field_77700_c != null; -@@ -623,6 +635,7 @@ +@@ -625,6 +637,7 @@ } @SideOnly(Side.CLIENT) @@ -67,7 +67,7 @@ public boolean func_77636_d(ItemStack p_77636_1_) { return p_77636_1_.func_77948_v(); -@@ -635,7 +648,7 @@ +@@ -637,7 +650,7 @@ public boolean func_77616_k(ItemStack p_77616_1_) { @@ -76,7 +76,7 @@ } protected MovingObjectPosition func_77621_a(World p_77621_1_, EntityPlayer p_77621_2_, boolean p_77621_3_) -@@ -644,7 +657,7 @@ +@@ -646,7 +659,7 @@ float f1 = p_77621_2_.field_70127_C + (p_77621_2_.field_70125_A - p_77621_2_.field_70127_C) * f; float f2 = p_77621_2_.field_70126_B + (p_77621_2_.field_70177_z - p_77621_2_.field_70126_B) * f; double d0 = p_77621_2_.field_70169_q + (p_77621_2_.field_70165_t - p_77621_2_.field_70169_q) * (double)f; @@ -85,7 +85,7 @@ double d2 = p_77621_2_.field_70166_s + (p_77621_2_.field_70161_v - p_77621_2_.field_70166_s) * (double)f; Vec3 vec3 = Vec3.func_72443_a(d0, d1, d2); float f3 = MathHelper.func_76134_b(-f2 * 0.017453292F - (float)Math.PI); -@@ -654,6 +667,10 @@ +@@ -656,6 +669,10 @@ float f7 = f4 * f5; float f8 = f3 * f5; double d3 = 5.0D; @@ -96,7 +96,7 @@ Vec3 vec31 = vec3.func_72441_c((double)f7 * d3, (double)f6 * d3, (double)f8 * d3); return p_77621_1_.func_147447_a(vec3, vec31, p_77621_3_, !p_77621_3_, false); } -@@ -709,6 +726,7 @@ +@@ -711,6 +728,7 @@ this.field_77791_bV = p_94581_1_.func_94245_a(this.func_111208_A()); } @@ -104,7 +104,7 @@ public Multimap func_111205_h() { return HashMultimap.create(); -@@ -726,6 +744,581 @@ +@@ -728,6 +746,591 @@ return this.field_111218_cA == null ? "MISSING_ICON_ITEM_" + field_150901_e.func_148757_b(this) + "_" + this.field_77774_bZ : this.field_111218_cA; } @@ -681,12 +681,22 @@ + { + return func_77619_b(); + } ++ ++ /** ++ * Whether this Item can be used as a payment to activate the vanilla beacon. ++ * @param stack the ItemStack ++ * @return true if this Item can be used ++ */ ++ public boolean isBeaconPayment(ItemStack stack) ++ { ++ return this == Items.field_151166_bC || this == Items.field_151045_i || this == Items.field_151043_k || this == Items.field_151042_j; ++ } + /* ======================================== FORGE END =====================================*/ + public static enum ToolMaterial { WOOD(0, 59, 2.0F, 0.0F, 15), -@@ -741,6 +1334,9 @@ +@@ -743,6 +1346,9 @@ private static final String __OBFID = "CL_00000042"; @@ -696,7 +706,7 @@ private ToolMaterial(int p_i1874_3_, int p_i1874_4_, float p_i1874_5_, float p_i1874_6_, int p_i1874_7_) { this.field_78001_f = p_i1874_3_; -@@ -777,7 +1373,15 @@ +@@ -779,7 +1385,15 @@ public Item func_150995_f() { diff --git a/patches/minecraft/net/minecraft/item/ItemStack.java.patch b/patches/minecraft/net/minecraft/item/ItemStack.java.patch index caa6b5ec43..10f06c8c79 100644 --- a/patches/minecraft/net/minecraft/item/ItemStack.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemStack.java.patch @@ -8,7 +8,7 @@ public final class ItemStack { -@@ -181,7 +182,7 @@ +@@ -182,7 +183,7 @@ public int func_77976_d() { @@ -17,7 +17,7 @@ } public boolean func_77985_e() -@@ -191,7 +192,7 @@ +@@ -192,7 +193,7 @@ public boolean func_77984_f() { @@ -26,7 +26,7 @@ } public boolean func_77981_g() -@@ -201,32 +202,27 @@ +@@ -202,32 +203,27 @@ public boolean func_77951_h() { @@ -64,7 +64,7 @@ } public boolean func_96631_a(int p_96631_1_, Random p_96631_2_) -@@ -258,8 +254,8 @@ +@@ -259,8 +255,8 @@ } } @@ -75,7 +75,7 @@ } } -@@ -318,7 +314,7 @@ +@@ -319,7 +315,7 @@ public boolean func_150998_b(Block p_150998_1_) { @@ -84,7 +84,7 @@ } public boolean func_111282_a(EntityPlayer p_111282_1_, EntityLivingBase p_111282_2_) -@@ -625,16 +621,24 @@ +@@ -626,16 +622,24 @@ { arraylist.add("Durability: " + (this.func_77958_k() - this.func_77952_i()) + " / " + this.func_77958_k()); } @@ -110,7 +110,7 @@ public EnumRarity func_77953_t() { return this.func_77973_b().func_77613_e(this); -@@ -736,7 +740,7 @@ +@@ -737,7 +741,7 @@ } else { diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityBeacon.java.patch b/patches/minecraft/net/minecraft/tileentity/TileEntityBeacon.java.patch index 555b5515b9..6b8861bc89 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityBeacon.java.patch +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityBeacon.java.patch @@ -9,3 +9,11 @@ { flag = false; break; +@@ -357,6 +357,6 @@ + + public boolean func_94041_b(int p_94041_1_, ItemStack p_94041_2_) + { +- return p_94041_2_.func_77973_b() == Items.field_151166_bC || p_94041_2_.func_77973_b() == Items.field_151045_i || p_94041_2_.func_77973_b() == Items.field_151043_k || p_94041_2_.func_77973_b() == Items.field_151042_j; ++ return p_94041_2_.func_77973_b() != null && p_94041_2_.func_77973_b().isBeaconPayment(p_94041_2_); + } + } diff --git a/patches/minecraft/net/minecraft/util/Session.java.patch b/patches/minecraft/net/minecraft/util/Session.java.patch index 257c70443e..6f6c0e0899 100644 --- a/patches/minecraft/net/minecraft/util/Session.java.patch +++ b/patches/minecraft/net/minecraft/util/Session.java.patch @@ -20,3 +20,12 @@ this.field_74286_b = p_i1098_1_; this.field_148257_b = p_i1098_2_; this.field_148258_c = p_i1098_3_; +@@ -54,7 +67,7 @@ + } + catch (IllegalArgumentException illegalargumentexception) + { +- return new GameProfile((UUID)null, this.func_111285_a()); ++ return new GameProfile(net.minecraft.entity.player.EntityPlayer.func_146094_a(new GameProfile((UUID)null, this.func_111285_a())), this.func_111285_a()); + } + } + diff --git a/src/main/java/net/minecraftforge/common/ForgeVersion.java b/src/main/java/net/minecraftforge/common/ForgeVersion.java index cc62016052..a3dd9b176b 100644 --- a/src/main/java/net/minecraftforge/common/ForgeVersion.java +++ b/src/main/java/net/minecraftforge/common/ForgeVersion.java @@ -23,7 +23,7 @@ public class ForgeVersion //This number is incremented every minecraft release, never reset public static final int minorVersion = 13; //This number is incremented every time a interface changes or new major feature is added, and reset every Minecraft version - public static final int revisionVersion = 0; + public static final int revisionVersion = 1; //This number is incremented every time Jenkins builds Forge, and never reset. Should always be 0 in the repo code. public static final int buildVersion = 0; diff --git a/src/main/java/net/minecraftforge/fluids/RenderBlockFluid.java b/src/main/java/net/minecraftforge/fluids/RenderBlockFluid.java index 93590ba779..3fb858c04d 100644 --- a/src/main/java/net/minecraftforge/fluids/RenderBlockFluid.java +++ b/src/main/java/net/minecraftforge/fluids/RenderBlockFluid.java @@ -57,7 +57,8 @@ public class RenderBlockFluid implements ISimpleBlockRenderingHandler { if (world.getBlock(x, y, z) == block) { - if (world.getBlock(x, y - block.densityDir, z).getMaterial().isLiquid()) + Block verticalOrigin = world.getBlock(x, y - block.densityDir, z); + if (verticalOrigin.getMaterial().isLiquid() || verticalOrigin instanceof IFluidBlock) { return 1; }