diff --git a/conf/mcp2notch.srg b/conf/mcp2notch.srg index 6ff7d91..ce89aa5 100644 --- a/conf/mcp2notch.srg +++ b/conf/mcp2notch.srg @@ -1,5 +1,5 @@ PK: net/minecraft/client/main net/minecraft/client/main -PK: . net/minecraft/src +PK: net/minecraft/src . PK: net/minecraft/realms net/minecraft/realms PK: net/minecraft net/minecraft PK: net/minecraft/client net/minecraft/client diff --git a/conf/mcp2srg.srg b/conf/mcp2srg.srg index 385b5bb..133f5e5 100644 --- a/conf/mcp2srg.srg +++ b/conf/mcp2srg.srg @@ -1,10 +1,3 @@ -PK: net/minecraft/client/main net/minecraft/client/main -PK: . net/minecraft/src -PK: net/minecraft/realms net/minecraft/realms -PK: net/minecraft net/minecraft -PK: net/minecraft/client net/minecraft/client -PK: net/minecraft/server net/minecraft/server -PK: net net CL: net/minecraft/world/chunk/storage/IChunkLoader net/minecraft/world/chunk/storage/IChunkLoader CL: net/minecraft/block/BlockMycelium net/minecraft/block/BlockMycelium CL: net/minecraft/inventory/ContainerEnchantment net/minecraft/inventory/ContainerEnchantment diff --git a/src/main/java/net/minecraft/block/Block.java b/src/main/java/net/minecraft/block/Block.java index 237fe5f..cb63589 100644 --- a/src/main/java/net/minecraft/block/Block.java +++ b/src/main/java/net/minecraft/block/Block.java @@ -1158,7 +1158,7 @@ /* ======================================== FORGE START =====================================*/ //For ForgeInternal use Only! protected ThreadLocal harvesters = new ThreadLocal(); - private ThreadLocal silk_check_meta = new ThreadLocal(); + private ThreadLocal silk_check_meta = new ThreadLocal(); /** * Get a light value for the block at the specified coordinates, normal ranges are between 0 and 15 * @@ -1326,7 +1326,7 @@ * @param x X Position * @param y Y position * @param z Z position - * @param willHarvest True if Block.harvestBlock will be called after this, if the return in true. + * @param willHarvest True if Block.harvestBlock will be called after this, if the return in true. * Can be useful to delay the destruction of tile entities till after harvestBlock * @return True if the block is actually destroyed. */ @@ -1791,6 +1791,11 @@ * @param target The full target the player is looking at * @return A ItemStack to add to the player's inventory, Null if nothing should be added. */ + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) + { + return getPickBlock(target, world, x, y, z); + } + @Deprecated public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { Item item = getItem(world, x, y, z); @@ -1993,7 +1998,7 @@ } else if (entity instanceof EntityDragon) { - return this != Blocks.obsidian && this != Blocks.end_stone && this != Blocks.bedrock; + return this != Blocks.obsidian && this != Blocks.end_stone && this != Blocks.bedrock; } return true; @@ -2087,7 +2092,7 @@ /** * Gathers how much experience this block drops when broken. - * + * * @param world The world * @param metadata * @param fortune @@ -2130,7 +2135,7 @@ * If this block should be notified of weak changes. * Weak changes are changes 1 block away through a solid block. * Similar to comparators. - * + * * @param world The current world * @param x X Position * @param y Y position @@ -2147,7 +2152,7 @@ private int[] harvestLevel = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; /** * Sets or removes the tool and level required to harvest this block. - * + * * @param toolClass Class * @param level Harvest level: * Wood: 0 @@ -2166,7 +2171,7 @@ /** * Sets or removes the tool and level required to harvest this block. - * + * * @param toolClass Class * @param level Harvest level: * Wood: 0 @@ -2183,9 +2188,9 @@ } /** - * Queries the class of tool required to harvest this block, if null is returned + * Queries the class of tool required to harvest this block, if null is returned * we assume that anything can harvest this block. - * + * * @param metadata * @return */ @@ -2197,7 +2202,7 @@ /** * Queries the harvest level of this item stack for the specifred tool class, * Returns -1 if this tool is not of the specified type - * + * * @param stack This item stack instance * @return Harvest level, or -1 if not the specified tool type. */ @@ -2207,9 +2212,9 @@ } /** - * Checks if the specified tool type is efficient on this block, + * Checks if the specified tool type is efficient on this block, * meaning that it digs at full speed. - * + * * @param type * @param metadata * @return diff --git a/src/main/java/net/minecraft/client/gui/inventory/GuiContainer.java b/src/main/java/net/minecraft/client/gui/inventory/GuiContainer.java index b9f022e..1b3d1cc 100644 --- a/src/main/java/net/minecraft/client/gui/inventory/GuiContainer.java +++ b/src/main/java/net/minecraft/client/gui/inventory/GuiContainer.java @@ -251,8 +251,10 @@ if (iicon != null) { GL11.glDisable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_BLEND); // Forge: Blending needs to be enabled for this. this.mc.getTextureManager().bindTexture(TextureMap.locationItemsTexture); this.drawTexturedModelRectFromIcon(i, j, iicon, 16, 16); + GL11.glDisable(GL11.GL_BLEND); // Forge: And clean that up GL11.glEnable(GL11.GL_LIGHTING); flag1 = true; } diff --git a/src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java b/src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java index 7b5be5c..8476f30 100644 --- a/src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java +++ b/src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java @@ -33,7 +33,7 @@ private static Pattern face_V_VT_Pattern = Pattern.compile("(f( \\d+/\\d+){3,4} *\\n)|(f( \\d+/\\d+){3,4} *$)"); private static Pattern face_V_VN_Pattern = Pattern.compile("(f( \\d+//\\d+){3,4} *\\n)|(f( \\d+//\\d+){3,4} *$)"); private static Pattern face_V_Pattern = Pattern.compile("(f( \\d+){3,4} *\\n)|(f( \\d+){3,4} *$)"); - private static Pattern groupObjectPattern = Pattern.compile("([go]( [\\w\\d]+) *\\n)|([go]( [\\w\\d]+) *$)"); + private static Pattern groupObjectPattern = Pattern.compile("([go]( [\\w\\d\\.]+) *\\n)|([go]( [\\w\\d\\.]+) *$)"); private static Matcher vertexMatcher, vertexNormalMatcher, textureCoordinateMatcher; private static Matcher face_V_VT_VN_Matcher, face_V_VT_Matcher, face_V_VN_Matcher, face_V_Matcher; diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index a1cde99..2dc3457 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -224,7 +224,7 @@ return false; } - result = block.getPickBlock(target, world, x, y, z); + result = block.getPickBlock(target, world, x, y, z, player); } else { @@ -475,10 +475,10 @@ { itemstack.setTagCompound(nbt); } - if (blockSnapshots.size() > 1) + if (blockSnapshots.size() > 1) { placeEvent = ForgeEventFactory.onPlayerMultiBlockPlace(player, blockSnapshots, net.minecraftforge.common.util.ForgeDirection.getOrientation(side)); - } + } else if (blockSnapshots.size() == 1) { placeEvent = ForgeEventFactory.onPlayerBlockPlace(player, blockSnapshots.get(0), net.minecraftforge.common.util.ForgeDirection.getOrientation(side)); @@ -540,7 +540,7 @@ container.stackSizeToBeUsedInRepair = e.materialCost; return false; } - + public static float onAnvilRepair(EntityPlayer player, ItemStack output, ItemStack left, ItemStack right) { AnvilRepairEvent e = new AnvilRepairEvent(player, left, right, output); diff --git a/src/main/resources/fmlversion.properties b/src/main/resources/fmlversion.properties index 966762a..89e914b 100644 --- a/src/main/resources/fmlversion.properties +++ b/src/main/resources/fmlversion.properties @@ -1,6 +1,6 @@ fmlbuild.major.number=7 fmlbuild.minor.number=10 fmlbuild.revision.number=85 -fmlbuild.build.number=19 +fmlbuild.build.number=20 fmlbuild.mcversion=1.7.10 fmlbuild.mcpversion=9.05