From 24989689b34b91e810af91a012515ed3bd531593 Mon Sep 17 00:00:00 2001 From: cpw Date: Sat, 30 Aug 2014 00:06:21 -0400 Subject: [PATCH 1/8] GIANT FML UPDATE! Bump forge revision number, and fix patches for ItemStack changes. More to come on this branch I expect. MinecraftForge/FML@7c5cf219042581545b6073de4e947448ffa10879 Implement STDOUT/STDERR redirection. MinecraftForge/FML@bc78e31cb7ad4eda6e5faa173cd6b21e70a2c444 added support for \n in tooltip strings added \n test tooltip localization fixed int/double conversion error in slider entry added test slider scenario that highlighted conversion error MinecraftForge/FML@a2908e5c596bb5502bf455d468d2b1ead0520f55 Clean up a bunch of compiler warnings. MinecraftForge/FML@7f67523d870ae150071c67b002597542eb206725 Update realms to 1.3.2 MinecraftForge/FML@73f23c24b85240458f352f248e885684aaff4743 Merge branch 'std-redir' of github.com:Emberwalker/FML MinecraftForge/FML@1c6b25df740a64c94d9ba05dd7e4412515abf5bb If an IO exception comes from the datawatcher, spew it all over the console don't discard it silently. Should stop pixelmon blaming forge for their mistakes. MinecraftForge/FML@e77da9eb2f5c58a494ed100dd4c1dd1a0c341dbf And fix the read side too, incase someone is trying to bitbang and failing. MinecraftForge/FML@305d8950c9332c7a7f290db05e6f18ef328016e2 Make LogContext optional. This can be useful for debugging mod issues, but Apache's implementation in log4j2 is responsible for a very significant % of the overall runtime. Quite frankly this is shockingly bad performance from what is supposed to be a high performance logging framework. Anyway, until we can figure out if we can fix it, we're turning it off by default. MinecraftForge/FML@bdfca1c8ed463a6053526c7a46a990007711e3d0 Make more noise when people screw up mod downloading and put .jar.zip in their mod folders. MinecraftForge/FML@21084941127fc882d9968316a8f0669531e484df Add a custom version range factory method. Should hush skyboy's complaints. Closes #486 MinecraftForge/FML@7c1e6aaa40704001231e602ceaedfa21a5df1edf Add a delegate to every item and block. this should help with renaming fun stuffs. Also, fix all the tabs from my previous commits. *sigh* MinecraftForge/FML@61fcb4df06dc968fcc31d3e4e524e574acfdbb3b Tweak Itemstack patch to always delegate to the method call. Set the field, so it's in sync. MinecraftForge/FML@eb8c5ab146f2eb3ad3833d40607da97831278ffb Fix nested directory for language resources. Closes MinecraftForge#1264 MinecraftForge/FML@7c05e5f70d5387512d0bee33ef99510ee5aac739 Default collections, so that we don't crash if useDependencyInfo is true. Closes #485 MinecraftForge/FML@9729fe23326a3d4f6b03e60b5cdaf78a484b3657 Kill net.minecraft.src warning. It hasn't served a purpose in a long time now. Closes #313 MinecraftForge/FML@21e875ef22eef6068ccd6df1bd71cf58cba48eed AllowPlayerLogins only after the server has completed the core init tasks. Closes #372 MinecraftForge/FML@46cfeade80ae60ad2d8cdb40c5fdfdaeeaf16d00 Add a constructor to CustomModLoadingDisplayException. Closes #387 MinecraftForge/FML@a6eab2683a15a0cceca7a0ded6095b746cdd017b Update README.txt MinecraftForge/FML@f75838461cf6d9c5010cbfd2d9ef5ceec03268d7 Last part is the itemstack transformer. Itemstacks should now only be loosely coupled with the items within. MinecraftForge/FML@51f24e9e6d1bee371cf23cdfd0071de7c5175417 First draft of add alias. It is probably not properly persistent atm. MinecraftForge/FML@2a4c6424709b20ce1e9bda0d85ce7fac47d157c2 Finally fix stupid NPE error caused by FML trying to parse the super of Object in IDEA envs. MinecraftForge/FML@c1b1417ee168523154a0edae68c3180814eab1c7 FML now supports passing a json formatted modlist as an argument, as well as a comma separated argument list. These facilitate modpacks mostly, by meaning you don't need to duplicate mods. The modlist is arranged in the maven style, with mods referenced maven-like. MinecraftForge/FML@3d42cda2a2cf5b24e7a25537d883260857b2107a Build.Gradle Patch MinecraftForge/FML@20c7add8455cd16a4551ed13336a9ad4f9770cd1 Merge pull request #484 from bspkrs/master MinecraftForge/FML@26ed4b992eb6341d52d12fb6735415ab8e3c501d Clear button list on FML fatal error screens. The hidden cancel button should not be there. Closes #497 MinecraftForge/FML@ebe4f5c5e297d5d59ce57138810627a9c7a1b412 Merge pull request #494 from AntonBoch1244/patch-1 MinecraftForge/FML@ad0da05f5c78d7f3c35a331e993dd6e679fc7ac9 Fix the ItemStack transformer to find the method and field so it works with srg and mcp naming. MinecraftForge/FML@65d380181a84d35a78791e1bc3c7712cd90506f6 Extend timeout for client to 5 seconds. Should fix Forge #1322 MinecraftForge/FML@45486a0b6dfca65c4d1dd23176d4c9d13d46b6f5 Fix almost invisible NPE in TerminalTransformer when loading a non-existant class MinecraftForge/FML@13da3efce07653732971837709ccf4de7e4c5c8e Allow a clean way to exit the game without big ugly warnings, but with logging information available if needed. Closes #496 MinecraftForge/FML@fda305edfea15ba2015cede72327703f273f74e3 Some more tidying up of the exit handling MinecraftForge/FML@b087f60c3379d0767247e51cbc3f7c631fe97a08 More cleanup of exit handling, also add a couple more noise classes to the list of things ignored. MinecraftForge/FML@d6358a466b4614cfc35b403d756fe3ef550ebf50 Cleanup override warnings MinecraftForge/FML@af7a58b9e50dbacf63cf4b5009abc52301609e1f Update to legacylauncher 1.10 and asm 5.0.3 MinecraftForge/FML@e6d00440a612c235013f3f92f1756811139a6de0 ItemStack swapping MinecraftForge/FML@8597e45a0e417948db483006aa54e899f28b05ac Fix NPE from a boolean MinecraftForge/FML@b9b9daa8a9d1cac8550561f31f118589abc0c30a Fix ups from feedback. MinecraftForge/FML@d89165021f33fbffb4563d86b30bd261506c6ea6 Mark the promise a success in the outbound handler. MinecraftForge/FML@2e5ccf7988385d38b964c615776f23a1718f5c27 Update for launchwrapper 1.11. Fixes java 6 compatibility. MinecraftForge/FML@641250d8536bad3af5a036b70dae94097176b420 Fix java 8u20. Closes #501 and a bunch of other bugs too. MinecraftForge/FML@292be72639feded03ced26d9a06a98159f7a95b7 Allow client handshake to be reset by server to support BungeeCord. MinecraftForge/FML@092873fbe5baaee53bee67d26d2fc6d3d003f095 Merge branch 'bungeecord' of github.com:bloodmc/FML MinecraftForge/FML@134f2f8e8865a91292386a3738bb45bad0477a4b Fix bug with entityspawn - if the entity doesn't extend livingbase, it fails to write a headyaw byte, and everything will be derped for that packet. MinecraftForge/FML@4852de81e02e2b6c6d006abe20d8497499fdf51f Wrap the server description box a little bit shorter. Stops the overlapping. Closes #489 --- fml | 2 +- .../net/minecraft/block/Block.java.patch | 20 +++++++++---------- .../net/minecraft/item/Item.java.patch | 20 +++++++++---------- .../net/minecraft/item/ItemStack.java.patch | 14 ++++++------- .../minecraftforge/common/ForgeVersion.java | 2 +- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/fml b/fml index 3231db9376..4852de81e0 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit 3231db9376766d619f942b6a526718daa3c68038 +Subproject commit 4852de81e02e2b6c6d006abe20d8497499fdf51f 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/item/Item.java.patch b/patches/minecraft/net/minecraft/item/Item.java.patch index 684dd0db72..36afc465e4 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,581 @@ return this.field_111218_cA == null ? "MISSING_ICON_ITEM_" + field_150901_e.func_148757_b(this) + "_" + this.field_77774_bZ : this.field_111218_cA; } @@ -686,7 +686,7 @@ public static enum ToolMaterial { WOOD(0, 59, 2.0F, 0.0F, 15), -@@ -741,6 +1334,9 @@ +@@ -743,6 +1336,9 @@ private static final String __OBFID = "CL_00000042"; @@ -696,7 +696,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 +1375,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/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; From de521cf53116b5ef12f01ca0ec02688e1d492b9a Mon Sep 17 00:00:00 2001 From: cpw Date: Sun, 31 Aug 2014 21:59:47 -0400 Subject: [PATCH 2/8] MinecraftForge/FML@4ce3e73bfe36c02b10f504f93eff1bc94d640e32 Add overloaded version of SimpleNetworkWrapper#registerMessage that takes the MessageHandler instance directly, allowing to specify the same handler for multiple messages. MinecraftForge/FML@cbe2ccbda461ec0ecf4d776fcd19ab31930cc3f1 Add in ModType to the jar manifest. If it's present, and doesn't have value "FML" it will be skipped from the modloading cycle. This should let liteloader mods have a .jar extension. MinecraftForge/FML@37cf0174fc62a842d132b2c2cc31e477acfba205 OK, lets make that a csv list. It'll let you be liteloader and fml in one jar file! MinecraftForge/FML@0475b15eb1a7c35bf4959f1af40606e6ee8a9d03 Change the mods and modListFile argument handling a bit. Other tweakers will get a chance at looking at them now - they're only removed right before launch. MinecraftForge/FML@abeac06a2e9bf8825b058fa35291165b4d1f1fb3 Two new features. ModLists can have a "parent" mod list. Circularity will result in a crash, so be careful. Mods specified in a child will override ones from a parent (using the maven group:name:classifier triple to identify - ignoring the version component) MinecraftForge/FML@7fcfedcfef9b5fd85cd1c17aa2013fca1bacd871 Canonicalized file paths in modListFile handling with the minecraftDirectory. MinecraftForge/FML@633fce19d4b367aed56d79e916f17296842f675c Make Keyevent also fire for key releases MinecraftForge/FML@57ba2339b630afa22c0fdf060bf28edbf7b34d0f Merge branch 'keyup-event' of github.com:diesieben07/FML MinecraftForge/FML@1ff048062c7f122731619258a9e5a68a6111d5dd Merge branch 'simple-netw-improve' of github.com:diesieben07/FML --- fml | 2 +- .../net/minecraft/client/Minecraft.java.patch | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/fml b/fml index 4852de81e0..1ff048062c 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit 4852de81e02e2b6c6d006abe20d8497499fdf51f +Subproject commit 1ff048062c7f122731619258a9e5a68a6111d5dd 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) { From d9865fed66985e642f264f8c7a26d5c65306febc Mon Sep 17 00:00:00 2001 From: cpw Date: Mon, 1 Sep 2014 16:05:51 -0400 Subject: [PATCH 3/8] MinecraftForge/FML@dc02d56195606d3ba2f1c5036fc8c0ddb67c843f Fix derp with ModType annotation. mods should load again now.. --- fml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fml b/fml index 1ff048062c..dc02d56195 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit 1ff048062c7f122731619258a9e5a68a6111d5dd +Subproject commit dc02d56195606d3ba2f1c5036fc8c0ddb67c843f From 126d7e3ebec06f04677e1b2bededd00175861153 Mon Sep 17 00:00:00 2001 From: diesieben07 Date: Sat, 6 Sep 2014 23:39:38 +0200 Subject: [PATCH 4/8] Added Item#isBeaconpayment --- .../inventory/ContainerBeacon.java.patch | 11 +++++++++++ .../minecraft/net/minecraft/item/Item.java.patch | 16 +++++++++++++--- .../tileentity/TileEntityBeacon.java.patch | 8 ++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 patches/minecraft/net/minecraft/inventory/ContainerBeacon.java.patch 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 36afc465e4..9222192743 100644 --- a/patches/minecraft/net/minecraft/item/Item.java.patch +++ b/patches/minecraft/net/minecraft/item/Item.java.patch @@ -104,7 +104,7 @@ public Multimap func_111205_h() { return HashMultimap.create(); -@@ -728,6 +746,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), -@@ -743,6 +1336,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_; -@@ -779,7 +1375,15 @@ +@@ -779,7 +1385,15 @@ public Item func_150995_f() { 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_); + } + } From 69700d222701f87f296b313b646628f01f2e2151 Mon Sep 17 00:00:00 2001 From: cpw Date: Mon, 8 Sep 2014 08:52:45 +1200 Subject: [PATCH 5/8] MinecraftForge/FML@7ab69aff2e19b349e457c1b5fcab8b3b01d22af2 Clean up import MinecraftForge/FML@c5a90bd456230b201522c268dd9bc5e80a0b57be Is vanilla possible with this mod load, side tests. MinecraftForge/FML@cad11f3165505e6d725411a9fc2c2ee8362f5827 Allow injecting alternative container types. This is the core support code for allowing sponge plugins! --- fml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fml b/fml index dc02d56195..cad11f3165 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit dc02d56195606d3ba2f1c5036fc8c0ddb67c843f +Subproject commit cad11f3165505e6d725411a9fc2c2ee8362f5827 From 71cb9dfe5251ed335adb49b700254a6e4bd45b2a Mon Sep 17 00:00:00 2001 From: Michael Lawrence Date: Mon, 8 Sep 2014 05:42:53 -0700 Subject: [PATCH 6/8] check for IFluidBlock (in addition to Material.liquid) when determining render height so that non-liquids (gases) render correctly --- src/main/java/net/minecraftforge/fluids/RenderBlockFluid.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; } From f9c68bba8126b663edff33bb0cb3409877b9fa8a Mon Sep 17 00:00:00 2001 From: nekosune Date: Wed, 10 Sep 2014 00:24:36 +0100 Subject: [PATCH 7/8] Fixed Clientside GameProfile UUID being null on offline mode --- patches/minecraft/net/minecraft/util/Session.java.patch | 9 +++++++++ 1 file changed, 9 insertions(+) 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()); + } + } + From 97f715bf6d95ec4c8d3c64d12e4d29cf52f5cb37 Mon Sep 17 00:00:00 2001 From: cpw Date: Sun, 14 Sep 2014 18:20:06 -0400 Subject: [PATCH 8/8] MinecraftForge/FML@63b64482e6dd4c3e2226ec002ceee549045c35ed Add jsr305 dev-time dependancy for Nullable/Nonnull annotations. Unneeded at runtime. MinecraftForge/FML@5365f5ea3e90ec85552bdb7f1f1237c51b4ea493 Add IEventExceptionHandler for EventBus to allow special handeling exceptions that are fired while running an event. Events now track what 'phase' they are in during the execution process. Each EventPriority is a 'phase'. An exception is thrown if the event attempts to set its phase to a previous one. --- fml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fml b/fml index cad11f3165..5365f5ea3e 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit cad11f3165505e6d725411a9fc2c2ee8362f5827 +Subproject commit 5365f5ea3e90ec85552bdb7f1f1237c51b4ea493