From 5b07c7fead9c6aebaede9b9a152231d5f7ff2956 Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Mon, 1 Dec 2014 18:28:18 -0800 Subject: [PATCH] Update Dev mcp mappings to 11-30 snapshot. --- fml/build.gradle | 2 +- .../FallbackResourceManager.java.patch | 10 +++++++ .../minecraftforge/fml/client/GuiModList.java | 2 +- .../fml/client/GuiScrollingList.java | 28 +++++++++---------- .../fml/client/config/GuiConfig.java | 6 ++-- .../fml/client/config/GuiEditArray.java | 6 ++-- .../fml/client/config/GuiSelectString.java | 4 +-- .../network/internal/FMLNetworkHandler.java | 2 +- .../fml/common/registry/GameData.java | 4 +-- .../fml/common/registry/VillagerRegistry.java | 2 +- .../fml/server/FMLServerHandler.java | 2 +- 11 files changed, 39 insertions(+), 29 deletions(-) create mode 100644 fml/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.java.patch diff --git a/fml/build.gradle b/fml/build.gradle index b2af25bf7f..2602899761 100644 --- a/fml/build.gradle +++ b/fml/build.gradle @@ -31,7 +31,7 @@ repositories { minecraft { version = '1.8' mcpVersion = '9.10' - mappings = 'snapshot_nodoc_20140930' + mappings = 'snapshot_nodoc_20141130' fmlDir = projectDir.getAbsolutePath(); mainClass = 'net.minecraftforge.fml.relauncher.ServerLaunchWrapper' tweakClass = 'net.minecraftforge.fml.common.launcher.FMLTweaker' diff --git a/fml/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.java.patch b/fml/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.java.patch new file mode 100644 index 0000000000..c002dd01fb --- /dev/null +++ b/fml/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.java.patch @@ -0,0 +1,10 @@ +--- ../src-base/minecraft/net/minecraft/client/resources/FallbackResourceManager.java ++++ ../src-work/minecraft/net/minecraft/client/resources/FallbackResourceManager.java +@@ -70,6 +70,7 @@ + throw new FileNotFoundException(p_110536_1_.toString()); + } + ++ @SuppressWarnings("resource") + protected InputStream func_177245_a(ResourceLocation p_177245_1_, IResourcePack p_177245_2_) throws IOException + { + InputStream inputstream = p_177245_2_.func_110590_a(p_177245_1_); diff --git a/fml/src/main/java/net/minecraftforge/fml/client/GuiModList.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiModList.java index f587c9e3cf..d33a83df8d 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/GuiModList.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiModList.java @@ -210,7 +210,7 @@ public class GuiModList extends GuiScreen ; } } - this.fontRendererObj.func_175063_a(selectedMod.getMetadata().name, offset, shifty, 0xFFFFFF); + this.fontRendererObj.drawStringWithShadow(selectedMod.getMetadata().name, offset, shifty, 0xFFFFFF); shifty += 12; shifty = drawLine(String.format("Version: %s (%s)", selectedMod.getDisplayVersion(), selectedMod.getVersion()), offset, shifty); diff --git a/fml/src/main/java/net/minecraftforge/fml/client/GuiScrollingList.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiScrollingList.java index 8826332dc2..be38ab0018 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/GuiScrollingList.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiScrollingList.java @@ -278,7 +278,7 @@ public abstract class GuiScrollingList GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); float var17 = 32.0F; worldr.startDrawingQuads(); - worldr.func_178991_c(2105376); + worldr.setColorOpaque_I(2105376); worldr.addVertexWithUV((double)this.left, (double)this.bottom, 0.0D, (double)((float)this.left / var17), (double)((float)(this.bottom + (int)this.scrollDistance) / var17)); worldr.addVertexWithUV((double)this.right, (double)this.bottom, 0.0D, (double)((float)this.right / var17), (double)((float)(this.bottom + (int)this.scrollDistance) / var17)); worldr.addVertexWithUV((double)this.right, (double)this.top, 0.0D, (double)((float)this.right / var17), (double)((float)(this.top + (int)this.scrollDistance) / var17)); @@ -309,12 +309,12 @@ public abstract class GuiScrollingList GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glDisable(GL11.GL_TEXTURE_2D); worldr.startDrawingQuads(); - worldr.func_178991_c(8421504); + worldr.setColorOpaque_I(8421504); worldr.addVertexWithUV((double)var14, (double)(var19 + var13 + 2), 0.0D, 0.0D, 1.0D); worldr.addVertexWithUV((double)var15, (double)(var19 + var13 + 2), 0.0D, 1.0D, 1.0D); worldr.addVertexWithUV((double)var15, (double)(var19 - 2), 0.0D, 1.0D, 0.0D); worldr.addVertexWithUV((double)var14, (double)(var19 - 2), 0.0D, 0.0D, 0.0D); - worldr.func_178991_c(0); + worldr.setColorOpaque_I(0); worldr.addVertexWithUV((double)(var14 + 1), (double)(var19 + var13 + 1), 0.0D, 0.0D, 1.0D); worldr.addVertexWithUV((double)(var15 - 1), (double)(var19 + var13 + 1), 0.0D, 1.0D, 1.0D); worldr.addVertexWithUV((double)(var15 - 1), (double)(var19 - 1), 0.0D, 1.0D, 0.0D); @@ -340,18 +340,18 @@ public abstract class GuiScrollingList GL11.glShadeModel(GL11.GL_SMOOTH); GL11.glDisable(GL11.GL_TEXTURE_2D); worldr.startDrawingQuads(); - worldr.func_178974_a(0, 0); + worldr.setColorRGBA_I(0, 0); worldr.addVertexWithUV((double)this.left, (double)(this.top + var20), 0.0D, 0.0D, 1.0D); worldr.addVertexWithUV((double)this.right, (double)(this.top + var20), 0.0D, 1.0D, 1.0D); - worldr.func_178974_a(0, 255); + worldr.setColorRGBA_I(0, 255); worldr.addVertexWithUV((double)this.right, (double)this.top, 0.0D, 1.0D, 0.0D); worldr.addVertexWithUV((double)this.left, (double)this.top, 0.0D, 0.0D, 0.0D); tess.draw(); worldr.startDrawingQuads(); - worldr.func_178974_a(0, 255); + worldr.setColorRGBA_I(0, 255); worldr.addVertexWithUV((double)this.left, (double)this.bottom, 0.0D, 0.0D, 1.0D); worldr.addVertexWithUV((double)this.right, (double)this.bottom, 0.0D, 1.0D, 1.0D); - worldr.func_178974_a(0, 0); + worldr.setColorRGBA_I(0, 0); worldr.addVertexWithUV((double)this.right, (double)(this.bottom - var20), 0.0D, 1.0D, 0.0D); worldr.addVertexWithUV((double)this.left, (double)(this.bottom - var20), 0.0D, 0.0D, 0.0D); tess.draw(); @@ -379,21 +379,21 @@ public abstract class GuiScrollingList } worldr.startDrawingQuads(); - worldr.func_178974_a(0, 255); + worldr.setColorRGBA_I(0, 255); worldr.addVertexWithUV((double)scrollBarXStart, (double)this.bottom, 0.0D, 0.0D, 1.0D); worldr.addVertexWithUV((double)scrollBarXEnd, (double)this.bottom, 0.0D, 1.0D, 1.0D); worldr.addVertexWithUV((double)scrollBarXEnd, (double)this.top, 0.0D, 1.0D, 0.0D); worldr.addVertexWithUV((double)scrollBarXStart, (double)this.top, 0.0D, 0.0D, 0.0D); tess.draw(); worldr.startDrawingQuads(); - worldr.func_178974_a(8421504, 255); + worldr.setColorRGBA_I(8421504, 255); worldr.addVertexWithUV((double)scrollBarXStart, (double)(var14 + var13), 0.0D, 0.0D, 1.0D); worldr.addVertexWithUV((double)scrollBarXEnd, (double)(var14 + var13), 0.0D, 1.0D, 1.0D); worldr.addVertexWithUV((double)scrollBarXEnd, (double)var14, 0.0D, 1.0D, 0.0D); worldr.addVertexWithUV((double)scrollBarXStart, (double)var14, 0.0D, 0.0D, 0.0D); tess.draw(); worldr.startDrawingQuads(); - worldr.func_178974_a(12632256, 255); + worldr.setColorRGBA_I(12632256, 255); worldr.addVertexWithUV((double)scrollBarXStart, (double)(var14 + var13 - 1), 0.0D, 0.0D, 1.0D); worldr.addVertexWithUV((double)(scrollBarXEnd - 1), (double)(var14 + var13 - 1), 0.0D, 1.0D, 1.0D); worldr.addVertexWithUV((double)(scrollBarXEnd - 1), (double)var14, 0.0D, 1.0D, 0.0D); @@ -416,10 +416,10 @@ public abstract class GuiScrollingList GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); float var6 = 32.0F; worldr.startDrawingQuads(); - worldr.func_178974_a(4210752, p_22239_4_); + worldr.setColorRGBA_I(4210752, p_22239_4_); worldr.addVertexWithUV(0.0D, (double)p_22239_2_, 0.0D, 0.0D, (double)((float)p_22239_2_ / var6)); worldr.addVertexWithUV((double)this.listWidth + 30, (double)p_22239_2_, 0.0D, (double)((float)(this.listWidth + 30) / var6), (double)((float)p_22239_2_ / var6)); - worldr.func_178974_a(4210752, p_22239_3_); + worldr.setColorRGBA_I(4210752, p_22239_3_); worldr.addVertexWithUV((double)this.listWidth + 30, (double)p_22239_1_, 0.0D, (double)((float)(this.listWidth + 30) / var6), (double)((float)p_22239_1_ / var6)); worldr.addVertexWithUV(0.0D, (double)p_22239_1_, 0.0D, 0.0D, (double)((float)p_22239_1_ / var6)); var5.draw(); @@ -443,10 +443,10 @@ public abstract class GuiScrollingList Tessellator tessellator = Tessellator.getInstance(); WorldRenderer worldrenderer = tessellator.getWorldRenderer(); worldrenderer.startDrawingQuads(); - worldrenderer.func_178960_a(f1, f2, f3, f); + worldrenderer.setColorRGBA_F(f1, f2, f3, f); worldrenderer.addVertex((double)par3, (double)par2, 0.0D); worldrenderer.addVertex((double)par1, (double)par2, 0.0D); - worldrenderer.func_178960_a(f5, f6, f7, f4); + worldrenderer.setColorRGBA_F(f5, f6, f7, f4); worldrenderer.addVertex((double)par1, (double)par4, 0.0D); worldrenderer.addVertex((double)par3, (double)par4, 0.0D); tessellator.draw(); diff --git a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiConfig.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiConfig.java index 3ed811b24d..e2a5333c2a 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiConfig.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiConfig.java @@ -277,13 +277,13 @@ public class GuiConfig extends GuiScreen public void handleMouseInput() throws IOException { super.handleMouseInput(); - this.entryList.func_178039_p(); + this.entryList.handleMouseInput(); } @Override protected void mouseClicked(int x, int y, int mouseEvent) throws IOException { - if (mouseEvent != 0 || !this.entryList.func_148179_a(x, y, mouseEvent)) + if (mouseEvent != 0 || !this.entryList.mouseClicked(x, y, mouseEvent)) { this.entryList.mouseClickedPassThru(x, y, mouseEvent); super.mouseClicked(x, y, mouseEvent); @@ -293,7 +293,7 @@ public class GuiConfig extends GuiScreen @Override protected void mouseReleased(int x, int y, int mouseEvent) { - if (mouseEvent != 0 || !this.entryList.func_148181_b(x, y, mouseEvent)) + if (mouseEvent != 0 || !this.entryList.mouseReleased(x, y, mouseEvent)) { super.mouseReleased(x, y, mouseEvent); } diff --git a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiEditArray.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiEditArray.java index 351888184b..d6c6bb03bc 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiEditArray.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiEditArray.java @@ -145,13 +145,13 @@ public class GuiEditArray extends GuiScreen public void handleMouseInput() throws IOException { super.handleMouseInput(); - this.entryList.func_178039_p(); + this.entryList.handleMouseInput(); } @Override protected void mouseClicked(int x, int y, int mouseEvent) throws IOException { - if (mouseEvent != 0 || !this.entryList.func_148179_a(x, y, mouseEvent)) + if (mouseEvent != 0 || !this.entryList.mouseClicked(x, y, mouseEvent)) { this.entryList.mouseClickedPassThru(x, y, mouseEvent); super.mouseClicked(x, y, mouseEvent); @@ -161,7 +161,7 @@ public class GuiEditArray extends GuiScreen @Override protected void mouseReleased(int x, int y, int mouseEvent) { - if (mouseEvent != 0 || !this.entryList.func_148181_b(x, y, mouseEvent)) + if (mouseEvent != 0 || !this.entryList.mouseReleased(x, y, mouseEvent)) { super.mouseReleased(x, y, mouseEvent); } diff --git a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiSelectString.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiSelectString.java index 47de6b6f7c..851792b438 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiSelectString.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiSelectString.java @@ -140,13 +140,13 @@ public class GuiSelectString extends GuiScreen public void handleMouseInput() throws IOException { super.handleMouseInput(); - this.entryList.func_178039_p(); + this.entryList.handleMouseInput(); } @Override protected void mouseReleased(int x, int y, int mouseEvent) { - if (mouseEvent != 0 || !this.entryList.func_148181_b(x, y, mouseEvent)) + if (mouseEvent != 0 || !this.entryList.mouseReleased(x, y, mouseEvent)) { super.mouseReleased(x, y, mouseEvent); } diff --git a/fml/src/main/java/net/minecraftforge/fml/common/network/internal/FMLNetworkHandler.java b/fml/src/main/java/net/minecraftforge/fml/common/network/internal/FMLNetworkHandler.java index aed06a4973..4d86fbd041 100644 --- a/fml/src/main/java/net/minecraftforge/fml/common/network/internal/FMLNetworkHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/internal/FMLNetworkHandler.java @@ -89,7 +89,7 @@ public class FMLNetworkHandler embeddedChannel.writeOutbound(openGui); entityPlayerMP.openContainer = remoteGuiContainer; entityPlayerMP.openContainer.windowId = windowId; - entityPlayerMP.openContainer.onCraftGuiOpened(entityPlayerMP); + entityPlayerMP.openContainer.addCraftingToCrafters(entityPlayerMP); } } else if (FMLCommonHandler.instance().getSide().equals(Side.CLIENT)) diff --git a/fml/src/main/java/net/minecraftforge/fml/common/registry/GameData.java b/fml/src/main/java/net/minecraftforge/fml/common/registry/GameData.java index 3b7e271cde..37e98bc037 100644 --- a/fml/src/main/java/net/minecraftforge/fml/common/registry/GameData.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/registry/GameData.java @@ -959,8 +959,8 @@ public class GameData { { private void clear() { - this.field_148749_a.clear(); - this.field_148748_b.clear(); + this.identityMap.clear(); + this.objectList.clear(); } } } diff --git a/fml/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java b/fml/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java index 44d26f0c32..cf3999a66e 100644 --- a/fml/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java @@ -407,7 +407,7 @@ public class VillagerRegistry }, { new ListItemForEmeralds(Items.redstone, new PriceInfo(-4, -1)), - new ListItemForEmeralds(new ItemStack(Items.dye, 1, EnumDyeColor.BLUE.getDyeColorDamage()), + new ListItemForEmeralds(new ItemStack(Items.dye, 1, EnumDyeColor.BLUE.getDyeDamage()), new PriceInfo(-2, -1)) }, { diff --git a/fml/src/main/java/net/minecraftforge/fml/server/FMLServerHandler.java b/fml/src/main/java/net/minecraftforge/fml/server/FMLServerHandler.java index a0c47096e9..bbb64e0557 100644 --- a/fml/src/main/java/net/minecraftforge/fml/server/FMLServerHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/server/FMLServerHandler.java @@ -179,7 +179,7 @@ public class FMLServerHandler implements IFMLSidedHandler { for (Iterator it = GenericIterableFactory.newCastingIterable(dedServer.pendingCommandList, ServerCommand.class).iterator(); it.hasNext(); ) { - String cmd = it.next().command.trim().toLowerCase(); + String cmd = it.next().input.trim().toLowerCase(); if (cmd.equals("/fml confirm")) {