Skip to content
This repository has been archived by the owner on May 26, 2018. It is now read-only.

Commit

Permalink
Update Dev mcp mappings to 11-30 snapshot.
Browse files Browse the repository at this point in the history
  • Loading branch information
@LexManos
LexManos committed Dec 2, 2014
1 parent 9c8ca4a commit 84a101f
Show file tree
Hide file tree
Showing 11 changed files with 39 additions and 29 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
10 changes: 10 additions & 0 deletions patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.java.patch
View file
Original file line number Diff line number Diff line change
@@ -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_);
2 changes: 1 addition & 1 deletion src/main/java/net/minecraftforge/fml/client/GuiModList.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ public void drawScreen(int p_571_1_, int p_571_2_, float p_571_3_)
;
}
}
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);
Expand Down
28 changes: 14 additions & 14 deletions src/main/java/net/minecraftforge/fml/client/GuiScrollingList.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ else if (var16 < 0)
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));
Expand Down Expand Up @@ -309,12 +309,12 @@ else if (var16 < 0)
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);
Expand All @@ -340,18 +340,18 @@ else if (var16 < 0)
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();
Expand Down Expand Up @@ -379,21 +379,21 @@ else if (var16 < 0)
}

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);
Expand All @@ -416,10 +416,10 @@ private void overlayBackground(int p_22239_1_, int p_22239_2_, int p_22239_3_, i
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();
Expand All @@ -443,10 +443,10 @@ protected void drawGradientRect(int par1, int par2, int par3, int par4, int par5
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();
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/minecraftforge/fml/client/config/GuiConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,13 +277,13 @@ else if (button.id == 2002)
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);
Expand All @@ -293,7 +293,7 @@ protected void mouseClicked(int x, int y, int mouseEvent) throws IOException
@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);
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/minecraftforge/fml/client/config/GuiEditArray.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,13 @@ else if (button.id == 2002)
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);
Expand All @@ -161,7 +161,7 @@ protected void mouseClicked(int x, int y, int mouseEvent) throws IOException
@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);
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/minecraftforge/fml/client/config/GuiSelectString.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,13 @@ else if (button.id == 2002)
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);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/minecraftforge/fml/common/network/internal/FMLNetworkHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public static void openGui(EntityPlayer entityPlayer, Object mod, int modGuiId,
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))
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/minecraftforge/fml/common/registry/GameData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -959,8 +959,8 @@ private static class ClearableObjectIntIdentityMap extends ObjectIntIdentityMap
{
private void clear()
{
this.field_148749_a.clear();
this.field_148748_b.clear();
this.identityMap.clear();
this.objectList.clear();
}
}
}
2 changes: 1 addition & 1 deletion src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ private static class VanillaTrades
},
{
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))
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/minecraftforge/fml/server/FMLServerHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public void queryUser(StartupQuery query) throws InterruptedException
{
for (Iterator<ServerCommand> 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"))
{
Expand Down

0 comments on commit 84a101f

Please sign in to comment.