diff --git a/.gitignore b/.gitignore index 2e2f5df59e..b2054a98e3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ /patches-old/ /mcp/ /eclipse/ +/target/ +/temp/ diff --git a/MANIFEST.MF b/MANIFEST.MF deleted file mode 100644 index fab265cb7e..0000000000 --- a/MANIFEST.MF +++ /dev/null @@ -1,6 +0,0 @@ -Manifest-Version: 1.0 -Ant-Version: Apache Ant 1.8.2 -Created-By: 1.7.0_09-b30 (Oracle Corporation) -Main-Class: net.minecraft.server.MinecraftServer -Class-Path: minecraft_server.jar - diff --git a/changelog.py b/changelog.py index 44ee89bec4..017cf544b6 100644 --- a/changelog.py +++ b/changelog.py @@ -24,12 +24,16 @@ class PreemptiveBasicAuthHandler(urllib2.BaseHandler): def https_request(self,req): return self.http_request(req) -def getBuildInfo(url, current_version=None): +def read_url(url): handler = PreemptiveBasicAuthHandler() - handler.add_password(None, 'jenkins.minecraftforge.net', 'console_script', 'd29a4bb55ecdf4f99295c77cc4364fe6') + handler.add_password(None, 'jenkins.minecraftforge.net:81', 'console_script', 'fd584bffa72fcac12181f37f80001200') file = urllib2.build_opener(handler).open(url) data = file.read() file.close() + return data + +def getBuildInfo(url, current_version=None): + data = read_url(url) data = ast.literal_eval(data)['allBuilds'] data = sorted(data, key=lambda key: key['number'], reverse=False) @@ -57,9 +61,29 @@ def getBuildInfo(url, current_version=None): build.pop('changeSet') build.pop('actions') return sorted(output, key=lambda key: key['number'], reverse=True) + +def add_latest_build(url, builds, current_version=None): + data = read_url(url) + data = ast.literal_eval(data) + number = data['number'] + + if builds[0]['number'] == data['number']: + return builds + + for item in data['changeSet']['items']: + item['author'] = item['author']['fullName'] + + build = { + 'number' : data['number'], + 'result' : 'SUCCESS', #Currently build should always be success... Else things derp after words + 'version' : current_version, + 'items' : data['changeSet']['items'] + } + return [build] + builds def make_changelog(job_path, target_build, change_file, current_version=None): builds = getBuildInfo('%s/api/python?tree=allBuilds[result,number,actions[text],changeSet[items[author[fullName],comment]]]&pretty=true' % job_path, current_version) + builds = add_latest_build('%s/lastBuild/api/python?pretty=true&tree=number,changeSet[items[author[fullName],comment]]' % job_path, builds, current_version) log = [ "Changelog:" ] @@ -86,4 +110,4 @@ def make_changelog(job_path, target_build, change_file, current_version=None): file.close() if __name__ == '__main__': - make_changelog("http://jenkins.minecraftforge.net/job/minecraftforge/", 70000, 'changelog.txt', 'pinecone') \ No newline at end of file + make_changelog("http://jenkins.minecraftforge.net:81/job/minecraftforge/", 70000, 'changelog.txt', 'pinecone') \ No newline at end of file diff --git a/client/net/minecraftforge/client/ForgeHooksClient.java b/client/net/minecraftforge/client/ForgeHooksClient.java index 4efe3792e6..13d33094cb 100644 --- a/client/net/minecraftforge/client/ForgeHooksClient.java +++ b/client/net/minecraftforge/client/ForgeHooksClient.java @@ -4,6 +4,8 @@ import java.util.HashMap; import java.util.Random; import java.util.TreeSet; +import javax.imageio.ImageIO; + import org.lwjgl.LWJGLException; import org.lwjgl.opengl.Display; import org.lwjgl.opengl.GL11; @@ -19,8 +21,8 @@ import net.minecraft.block.BlockFluid; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.client.texturepacks.ITexturePack; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -28,17 +30,16 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.RenderEngine; import net.minecraft.client.renderer.RenderGlobal; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.resources.ResourceLocation; import net.minecraftforge.client.IItemRenderer.ItemRenderType; import net.minecraftforge.client.event.DrawBlockHighlightEvent; import net.minecraftforge.client.event.RenderWorldLastEvent; -import net.minecraftforge.client.event.TextureLoadEvent; import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.IArmorTextureProvider; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.RenderBlockFluid; @@ -47,30 +48,19 @@ import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.*; public class ForgeHooksClient { - static RenderEngine engine() + private static final ResourceLocation ITEM_GLINT = new ResourceLocation("textures/misc/enchanted_item_glint.png"); + static TextureManager engine() { return FMLClientHandler.instance().getClient().renderEngine; } - @Deprecated //Deprecated in 1.5.1, move to the more detailed one below. - @SuppressWarnings("deprecation") - public static String getArmorTexture(ItemStack armor, String _default) - { - String result = null; - if (armor.getItem() instanceof IArmorTextureProvider) - { - result = ((IArmorTextureProvider)armor.getItem()).getArmorTextureFile(armor); - } - return result != null ? result : _default; - } - - public static String getArmorTexture(Entity entity, ItemStack armor, String _default, int slot, int layer) + public static String getArmorTexture(Entity entity, ItemStack armor, String _default, int slot, int layer, String type) { String result = armor.getItem().getArmorTexture(armor, entity, slot, layer); return result != null ? result : _default; } - public static boolean renderEntityItem(EntityItem entity, ItemStack item, float bobing, float rotation, Random random, RenderEngine engine, RenderBlocks renderBlocks) + public static boolean renderEntityItem(EntityItem entity, ItemStack item, float bobing, float rotation, Random random, TextureManager engine, RenderBlocks renderBlocks) { IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(item, ENTITY); if (customRenderer == null) @@ -88,7 +78,7 @@ public class ForgeHooksClient } boolean is3D = customRenderer.shouldUseRenderHelper(ENTITY, item, BLOCK_3D); - engine.bindTexture(item.getItemSpriteNumber() == 0 ? "/terrain.png" : "/gui/items.png"); + engine.func_110577_a(item.getItemSpriteNumber() == 0 ? TextureMap.field_110575_b : TextureMap.field_110576_c); Block block = (item.itemID < Block.blocksList.length ? Block.blocksList[item.itemID] : null); if (is3D || (block != null && RenderBlocks.renderItemIn3d(block.getRenderType()))) { @@ -129,7 +119,7 @@ public class ForgeHooksClient return true; } - public static boolean renderInventoryItem(RenderBlocks renderBlocks, RenderEngine engine, ItemStack item, boolean inColor, float zLevel, float x, float y) + public static boolean renderInventoryItem(RenderBlocks renderBlocks, TextureManager engine, ItemStack item, boolean inColor, float zLevel, float x, float y) { IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(item, INVENTORY); if (customRenderer == null) @@ -137,7 +127,7 @@ public class ForgeHooksClient return false; } - engine.bindTexture(item.getItemSpriteNumber() == 0 ? "/terrain.png" : "/gui/items.png"); + engine.func_110577_a(item.getItemSpriteNumber() == 0 ? TextureMap.field_110575_b : TextureMap.field_110576_c); if (customRenderer.shouldUseRenderHelper(INVENTORY, item, INVENTORY_BLOCK)) { GL11.glPushMatrix(); @@ -182,16 +172,15 @@ public class ForgeHooksClient GL11.glPopMatrix(); GL11.glEnable(GL11.GL_LIGHTING); } + return true; } - - @Deprecated - public static void renderEquippedItem(IItemRenderer customRenderer, RenderBlocks renderBlocks, EntityLiving entity, ItemStack item) + + public static void renderEffectOverlay(TextureManager manager, RenderItem render) { - renderEquippedItem(ItemRenderType.EQUIPPED, customRenderer, renderBlocks, entity, item); } - public static void renderEquippedItem(ItemRenderType type, IItemRenderer customRenderer, RenderBlocks renderBlocks, EntityLiving entity, ItemStack item) + public static void renderEquippedItem(ItemRenderType type, IItemRenderer customRenderer, RenderBlocks renderBlocks, EntityLivingBase entity, ItemStack item) { if (customRenderer.shouldUseRenderHelper(type, item, EQUIPPED_BLOCK)) { @@ -218,7 +207,7 @@ public class ForgeHooksClient //Optifine Helper Functions u.u, these are here specifically for Optifine //Note: When using Optfine, these methods are invoked using reflection, which //incurs a major performance penalty. - public static void orientBedCamera(Minecraft mc, EntityLiving entity) + public static void orientBedCamera(Minecraft mc, EntityLivingBase entity) { int x = MathHelper.floor_double(entity.posX); int y = MathHelper.floor_double(entity.posY); @@ -242,11 +231,6 @@ public class ForgeHooksClient MinecraftForge.EVENT_BUS.post(new RenderWorldLastEvent(context, partialTicks)); } - public static void onTextureLoad(String texture, ITexturePack pack) - { - MinecraftForge.EVENT_BUS.post(new TextureLoadEvent(texture, pack)); - } - public static void onTextureStitchedPre(TextureMap map) { MinecraftForge.EVENT_BUS.post(new TextureStitchEvent.Pre(map)); @@ -290,7 +274,7 @@ public class ForgeHooksClient renderPass = pass; } - public static ModelBiped getArmorModel(EntityLiving entityLiving, ItemStack itemStack, int slotID, ModelBiped _default) + public static ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int slotID, ModelBiped _default) { ModelBiped modelbiped = itemStack.getItem().getArmorModel(entityLiving, itemStack, slotID); return modelbiped == null ? _default : modelbiped; @@ -299,6 +283,7 @@ public class ForgeHooksClient static int stencilBits = 0; public static void createDisplay() throws LWJGLException { + ImageIO.setUseCache(false); //Disable on-disc stream cache should speed up texture pack reloading. PixelFormat format = new PixelFormat().withDepthBits(24); try { @@ -313,6 +298,27 @@ public class ForgeHooksClient } } + //This properly moves the domain, if provided, to the front of the string before concatenating + public static String fixDomain(String base, String complex) + { + int idx = complex.indexOf(':'); + if (idx == -1) + { + return base + complex; + } + + String name = complex.substring(idx + 1, complex.length()); + if (idx > 1) + { + String domain = complex.substring(0, idx); + return domain + ':' + base + name; + } + else + { + return base + name; + } + } + /** * Initialization of Forge Renderers. */ diff --git a/client/net/minecraftforge/client/GuiControlsScrollPanel.java b/client/net/minecraftforge/client/GuiControlsScrollPanel.java index bfdda45a2a..793830243c 100644 --- a/client/net/minecraftforge/client/GuiControlsScrollPanel.java +++ b/client/net/minecraftforge/client/GuiControlsScrollPanel.java @@ -9,10 +9,13 @@ import net.minecraft.client.gui.GuiControls; import net.minecraft.client.gui.GuiSlot; import net.minecraft.client.settings.KeyBinding; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.resources.ResourceLocation; import net.minecraft.util.EnumChatFormatting; public class GuiControlsScrollPanel extends GuiSlot { + protected static final ResourceLocation WIDGITS = new ResourceLocation("textures/gui/widgets.png"); private GuiControls controls; private GameSettings options; private Minecraft mc; @@ -72,7 +75,6 @@ public class GuiControlsScrollPanel extends GuiSlot { if (Mouse.next() && Mouse.getEventButtonState()) { - System.out.println(Mouse.getEventButton()); options.setKeyBinding(selected, -100 + Mouse.getEventButton()); selected = -1; KeyBinding.resetKeyBindingArrayAndHash(); @@ -91,7 +93,7 @@ public class GuiControlsScrollPanel extends GuiSlot boolean flag = _mouseX >= xPosition && _mouseY >= yPosition && _mouseX < xPosition + width && _mouseY < yPosition + height; int k = (flag ? 2 : 1); - mc.renderEngine.bindTexture("/gui/gui.png"); + mc.renderEngine.func_110577_a(WIDGITS); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); controls.drawTexturedModalRect(xPosition, yPosition, 0, 46 + k * 20, width / 2, height); controls.drawTexturedModalRect(xPosition + width / 2, yPosition, 200 - width / 2, 46 + k * 20, width / 2, height); diff --git a/client/net/minecraftforge/client/GuiIngameForge.java b/client/net/minecraftforge/client/GuiIngameForge.java index e75f614a33..d06e8733f1 100644 --- a/client/net/minecraftforge/client/GuiIngameForge.java +++ b/client/net/minecraftforge/client/GuiIngameForge.java @@ -1,42 +1,37 @@ package net.minecraftforge.client; +import static net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType.*; + import java.awt.Color; import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; import java.util.List; -import java.util.Random; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import cpw.mods.fml.common.FMLCommonHandler; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiIngame; -import net.minecraft.client.gui.GuiNewChat; import net.minecraft.client.gui.GuiPlayerInfo; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.multiplayer.NetClientHandler; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.resources.ResourceLocation; import net.minecraft.crash.CallableMinecraftVersion; -import net.minecraft.entity.boss.BossStatus; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.AttributeInstance; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.scoreboard.Score; import net.minecraft.scoreboard.ScoreObjective; import net.minecraft.scoreboard.ScorePlayerTeam; -import net.minecraft.scoreboard.Scoreboard; import net.minecraft.util.Direction; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.FoodStats; -import net.minecraft.util.Icon; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; import net.minecraft.util.StringUtils; @@ -46,10 +41,18 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.MinecraftForge; -import static net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType.*; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import cpw.mods.fml.common.FMLCommonHandler; public class GuiIngameForge extends GuiIngame { + private static final ResourceLocation VIGNETTE = new ResourceLocation("textures/misc/vignette.png"); + private static final ResourceLocation WIDGITS = new ResourceLocation("textures/gui/widgets.png"); + private static final ResourceLocation PUMPKIN_BLUR = new ResourceLocation("textures/misc/pumpkinblur.png"); + private static final int WHITE = 0xFFFFFF; //Flags to toggle the rendering of certain aspects of the HUD, valid conditions @@ -63,9 +66,14 @@ public class GuiIngameForge extends GuiIngame public static boolean renderHealth = true; public static boolean renderArmor = true; public static boolean renderFood = true; + public static boolean renderHealthMount = true; public static boolean renderAir = true; public static boolean renderExperiance = true; + public static boolean renderJumpBar = true; public static boolean renderObjective = true; + + public static int left_height = 39; + public static int right_height = 39; private ScaledResolution res = null; private FontRenderer fontrenderer = null; @@ -84,6 +92,12 @@ public class GuiIngameForge extends GuiIngame eventParent = new RenderGameOverlayEvent(partialTicks, res, mouseX, mouseY); int width = res.getScaledWidth(); int height = res.getScaledHeight(); + renderHealthMount = mc.thePlayer.ridingEntity instanceof EntityLivingBase; + renderFood = mc.thePlayer.ridingEntity == null; + renderJumpBar = mc.thePlayer.func_110317_t(); + + right_height = 39; + left_height = 39; if (pre(ALL)) return; @@ -112,22 +126,30 @@ public class GuiIngameForge extends GuiIngame GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); zLevel = -90.0F; rand.setSeed((long)(updateCounter * 312871)); - mc.renderEngine.bindTexture("/gui/icons.png"); if (renderCrosshairs) renderCrosshairs(width, height); if (renderBossHealth) renderBossHealth(); - + if (this.mc.playerController.shouldDrawHUD()) { - if (renderArmor) renderArmor(width, height); if (renderHealth) renderHealth(width, height); + if (renderArmor) renderArmor(width, height); if (renderFood) renderFood(width, height); + if (renderHealthMount) renderHealthMount(width, height); if (renderAir) renderAir(width, height); } if (renderHotbar) renderHotbar(width, height, partialTicks); } - if (renderExperiance) renderExperience(width, height); + if (renderJumpBar) + { + renderJumpBar(width, height); + } + else if (renderExperiance) + { + renderExperience(width, height); + } + renderSleepFade(width, height); renderToolHightlight(width, height); renderHUDText(width, height); @@ -150,6 +172,8 @@ public class GuiIngameForge extends GuiIngame GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glDisable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_ALPHA_TEST); + + post(ALL); } public ScaledResolution getResolution() @@ -165,7 +189,7 @@ public class GuiIngameForge extends GuiIngame GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture("/gui/gui.png"); + mc.renderEngine.func_110577_a(WIDGITS); InventoryPlayer inv = mc.thePlayer.inventory; drawTexturedModalRect(width / 2 - 91, height - 22, 0, 0, 182, 22); @@ -191,6 +215,7 @@ public class GuiIngameForge extends GuiIngame protected void renderCrosshairs(int width, int height) { if (pre(CROSSHAIRS)) return; + bind(Gui.field_110324_m); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_ONE_MINUS_DST_COLOR, GL11.GL_ONE_MINUS_SRC_COLOR); drawTexturedModalRect(width / 2 - 7, height / 2 - 7, 0, 0, 16, 16); @@ -235,7 +260,7 @@ public class GuiIngameForge extends GuiIngame mc.mcProfiler.startSection("armor"); int left = width / 2 - 91; - int top = height - 49; + int top = height - left_height; int level = ForgeHooks.getTotalArmorValue(mc.thePlayer); for (int i = 1; level > 0 && i < 20; i += 2) @@ -254,6 +279,7 @@ public class GuiIngameForge extends GuiIngame } left += 8; } + left_height += 10; mc.mcProfiler.endSection(); post(ARMOR); @@ -267,7 +293,7 @@ public class GuiIngameForge extends GuiIngame if (f1 > 0.0F) { - renderPortalOverlay(f1, width, height); + func_130015_b(f1, width, height); } post(PORTAL); @@ -278,7 +304,7 @@ public class GuiIngameForge extends GuiIngame if (pre(AIR)) return; mc.mcProfiler.startSection("air"); int left = width / 2 + 91; - int top = height - 49; + int top = height - right_height; if (mc.thePlayer.isInsideOfMaterial(Material.water)) { @@ -290,6 +316,7 @@ public class GuiIngameForge extends GuiIngame { drawTexturedModalRect(left - i * 8 - 9, top, (i < full ? 16 : 25), 18, 9, 9); } + right_height += 10; } mc.mcProfiler.endSection(); @@ -298,6 +325,7 @@ public class GuiIngameForge extends GuiIngame public void renderHealth(int width, int height) { + bind(field_110324_m); if (pre(HEALTH)) return; mc.mcProfiler.startSection("health"); @@ -308,47 +336,72 @@ public class GuiIngameForge extends GuiIngame highlight = false; } - int health = mc.thePlayer.getHealth(); - int healthLast = mc.thePlayer.prevHealth; + AttributeInstance attrMaxHealth = this.mc.thePlayer.func_110148_a(SharedMonsterAttributes.field_111267_a); + int health = MathHelper.ceiling_float_int(mc.thePlayer.func_110143_aJ()); + int healthLast = MathHelper.ceiling_float_int(mc.thePlayer.prevHealth); + float healthMax = (float)attrMaxHealth.func_111126_e(); + float absorb = this.mc.thePlayer.func_110139_bj(); + + int healthRows = MathHelper.ceiling_float_int((healthMax + absorb) / 2.0F / 10.0F); + int rowHeight = Math.max(10 - (healthRows - 2), 3); + + this.rand.setSeed((long)(updateCounter * 312871)); + int left = width / 2 - 91; - int top = height - 39; + int top = height - left_height; + left_height += (healthRows * rowHeight); + if (rowHeight != 10) left_height += 10 - rowHeight; int regen = -1; if (mc.thePlayer.isPotionActive(Potion.regeneration)) { - regen = this.updateCounter % 25; + regen = updateCounter % 25; } - - for (int i = 0; i < 10; ++i) + + final int TOP = 9 * (mc.theWorld.getWorldInfo().isHardcoreModeEnabled() ? 5 : 0); + final int BACKGROUND = (highlight ? 25 : 16); + int MARGIN = 16; + if (mc.thePlayer.isPotionActive(Potion.poison)) MARGIN += 36; + else if (mc.thePlayer.isPotionActive(Potion.wither)) MARGIN += 72; + float absorbRemaining = absorb; + + for (int i = MathHelper.ceiling_float_int((healthMax + absorb) / 2.0F) - 1; i >= 0; --i) { - int idx = i * 2 + 1; - int iconX = 16; - if (mc.thePlayer.isPotionActive(Potion.poison)) iconX += 36; - else if (mc.thePlayer.isPotionActive(Potion.wither)) iconX += 72; + int b0 = (highlight ? 1 : 0); + int row = MathHelper.ceiling_float_int((float)(i + 1) / 10.0F) - 1; + int x = left + i % 10 * 8; + int y = top - row * rowHeight; - int x = left + i * 8; - int y = top; - if (health <= 4) y = top + rand.nextInt(2); - if (i == regen) y -= 2; + if (health <= 4) y += rand.nextInt(2); + if (i == regen) y -= 2; - byte iconY = 0; - if (mc.theWorld.getWorldInfo().isHardcoreModeEnabled()) iconY = 5; - - drawTexturedModalRect(x, y, 16 + (highlight ? 9 : 0), 9 * iconY, 9, 9); + drawTexturedModalRect(x, y, BACKGROUND, TOP, 9, 9); if (highlight) { - if (idx < healthLast) - drawTexturedModalRect(x, y, iconX + 54, 9 * iconY, 9, 9); - else if (idx == healthLast) - drawTexturedModalRect(x, y, iconX + 63, 9 * iconY, 9, 9); + if (i * 2 + 1 < healthLast) + drawTexturedModalRect(x, y, MARGIN + 54, TOP, 9, 9); //6 + else if (i * 2 + 1 == healthLast) + drawTexturedModalRect(x, y, MARGIN + 63, TOP, 9, 9); //7 } - if (idx < health) - drawTexturedModalRect(x, y, iconX + 36, 9 * iconY, 9, 9); - else if (idx == health) - drawTexturedModalRect(x, y, iconX + 45, 9 * iconY, 9, 9); + if (absorbRemaining > 0.0F) + { + if (absorbRemaining == absorb && absorb % 2.0F == 1.0F) + drawTexturedModalRect(x, y, MARGIN + 153, TOP, 9, 9); //17 + else + drawTexturedModalRect(x, y, MARGIN + 144, TOP, 9, 9); //16 + absorbRemaining -= 2.0F; + } + else + { + if (i * 2 + 1 < health) + drawTexturedModalRect(x, y, MARGIN + 36, TOP, 9, 9); //4 + else if (i * 2 + 1 == health) + drawTexturedModalRect(x, y, MARGIN + 45, TOP, 9, 9); //5 + } } + mc.mcProfiler.endSection(); post(HEALTH); } @@ -359,7 +412,8 @@ public class GuiIngameForge extends GuiIngame mc.mcProfiler.startSection("food"); int left = width / 2 + 91; - int top = height - 39; + int top = height - right_height; + right_height += 10; boolean unused = false;// Unused flag in vanilla, seems to be part of a 'fade out' mechanic FoodStats stats = mc.thePlayer.getFoodStats(); @@ -386,30 +440,20 @@ public class GuiIngameForge extends GuiIngame y = top + (rand.nextInt(3) - 1); } - this.drawTexturedModalRect(x, y, 16 + backgound * 9, 27, 9, 9); + drawTexturedModalRect(x, y, 16 + backgound * 9, 27, 9, 9); if (unused) { if (idx < levelLast) - { drawTexturedModalRect(x, y, icon + 54, 27, 9, 9); - } - - if (idx == levelLast) - { + else if (idx == levelLast) drawTexturedModalRect(x, y, icon + 63, 27, 9, 9); - } } if (idx < level) - { drawTexturedModalRect(x, y, icon + 36, 27, 9, 9); - } - - if (idx == level) - { + else if (idx == level) drawTexturedModalRect(x, y, icon + 45, 27, 9, 9); - } } mc.mcProfiler.endSection(); post(FOOD); @@ -440,50 +484,79 @@ public class GuiIngameForge extends GuiIngame protected void renderExperience(int width, int height) { + bind(field_110324_m); if (pre(EXPERIENCE)) return; GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - if (mc.playerController.shouldDrawHUD()) + + if (mc.playerController.func_78763_f()) { mc.mcProfiler.startSection("expBar"); - mc.renderEngine.bindTexture("/gui/icons.png"); int cap = this.mc.thePlayer.xpBarCap(); int left = width / 2 - 91; - + if (cap > 0) { - short short1 = 182; - int l2 = (int)(this.mc.thePlayer.experience * (float)(short1 + 1)); - int k2 = height - 32 + 3; - this.drawTexturedModalRect(left, k2, 0, 64, short1, 5); - - if (l2 > 0) + short barWidth = 182; + int filled = (int)(mc.thePlayer.experience * (float)(barWidth + 1)); + int top = height - 32 + 3; + drawTexturedModalRect(left, top, 0, 64, barWidth, 5); + + if (filled > 0) { - this.drawTexturedModalRect(left, k2, 0, 69, l2, 5); + drawTexturedModalRect(left, top, 0, 69, filled, 5); } } - mc.mcProfiler.endSection(); - } - if (mc.playerController.func_78763_f() && mc.thePlayer.experienceLevel > 0) - { - mc.mcProfiler.startSection("expLevel"); - boolean flag1 = false; - int color = flag1 ? 16777215 : 8453920; - String text = "" + mc.thePlayer.experienceLevel; - int x = (width - fontrenderer.getStringWidth(text)) / 2; - int y = height - 31 - 4; - fontrenderer.drawString(text, x + 1, y, 0); - fontrenderer.drawString(text, x - 1, y, 0); - fontrenderer.drawString(text, x, y + 1, 0); - fontrenderer.drawString(text, x, y - 1, 0); - fontrenderer.drawString(text, x, y, color); - mc.mcProfiler.endSection(); + this.mc.mcProfiler.endSection(); + + + if (mc.playerController.func_78763_f() && mc.thePlayer.experienceLevel > 0) + { + mc.mcProfiler.startSection("expLevel"); + boolean flag1 = false; + int color = flag1 ? 16777215 : 8453920; + String text = "" + mc.thePlayer.experienceLevel; + int x = (width - fontrenderer.getStringWidth(text)) / 2; + int y = height - 31 - 4; + fontrenderer.drawString(text, x + 1, y, 0); + fontrenderer.drawString(text, x - 1, y, 0); + fontrenderer.drawString(text, x, y + 1, 0); + fontrenderer.drawString(text, x, y - 1, 0); + fontrenderer.drawString(text, x, y, color); + mc.mcProfiler.endSection(); + } } GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); post(EXPERIENCE); } + protected void renderJumpBar(int width, int height) + { + bind(field_110324_m); + if (pre(JUMPBAR)) return; + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + + mc.mcProfiler.startSection("jumpBar"); + float charge = mc.thePlayer.func_110319_bJ(); + final int barWidth = 182; + int x = (width / 2) - (barWidth / 2); + int filled = (int)(charge * (float)(barWidth + 1)); + int top = height - 32 + 3; + + drawTexturedModalRect(x, top, 0, 84, barWidth, 5); + + if (filled > 0) + { + this.drawTexturedModalRect(x, top, 0, 89, filled, 5); + } + + mc.mcProfiler.endSection(); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + + post(JUMPBAR); + } + protected void renderToolHightlight(int width, int height) { if (this.mc.gameSettings.heldItemTooltips) @@ -717,7 +790,7 @@ public class GuiIngameForge extends GuiIngame GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture("/gui/icons.png"); + mc.func_110434_K().func_110577_a(Gui.field_110324_m); int pingIndex = 4; int ping = player.responseTime; if (ping < 0) pingIndex = 5; @@ -734,6 +807,54 @@ public class GuiIngameForge extends GuiIngame } } + protected void renderHealthMount(int width, int height) + { + Entity tmp = mc.thePlayer.ridingEntity; + if (!(tmp instanceof EntityLivingBase)) return; + + bind(field_110324_m); + + if (pre(HEALTHMOUNT)) return; + + boolean unused = false; + int left_align = width / 2 + 91; + + mc.mcProfiler.endStartSection("mountHealth"); + EntityLivingBase mount = (EntityLivingBase)tmp; + int health = (int)Math.ceil((double)mount.func_110143_aJ()); + float healthMax = mount.func_110138_aP(); + int hearts = (int)(healthMax + 0.5F) / 2; + + if (hearts > 30) hearts = 30; + + final int MARGIN = 52; + final int BACKGROUND = MARGIN + (unused ? 1 : 0); + final int HALF = MARGIN + 45; + final int FULL = MARGIN + 36; + + for (int heart = 0; hearts > 0; heart += 20) + { + int top = height - right_height; + + int rowCount = Math.min(hearts, 10); + hearts -= rowCount; + + for (int i = 0; i < rowCount; ++i) + { + int x = left_align - i * 8 - 9; + drawTexturedModalRect(x, top, BACKGROUND, 9, 9, 9); + + if (i * 2 + 1 + heart < health) + drawTexturedModalRect(x, top, FULL, 9, 9, 9); + else if (i * 2 + 1 + heart == health) + drawTexturedModalRect(x, top, HALF, 9, 9, 9); + } + + right_height += 10; + } + post(HEALTHMOUNT); + } + //Helper macros private boolean pre(ElementType type) { @@ -743,4 +864,8 @@ public class GuiIngameForge extends GuiIngame { MinecraftForge.EVENT_BUS.post(new RenderGameOverlayEvent.Post(eventParent, type)); } + private void bind(ResourceLocation res) + { + mc.func_110434_K().func_110577_a(res); + } } diff --git a/client/net/minecraftforge/client/MinecraftForgeClient.java b/client/net/minecraftforge/client/MinecraftForgeClient.java index a74c484843..585d8da8c2 100644 --- a/client/net/minecraftforge/client/MinecraftForgeClient.java +++ b/client/net/minecraftforge/client/MinecraftForgeClient.java @@ -20,15 +20,6 @@ import net.minecraftforge.common.MinecraftForge; public class MinecraftForgeClient { - /** - * NO-OP now. Not needed with new texturing system in MC 1.5 - */ - @Deprecated // without replacement - public static void preloadTexture(String texture) - { -// ForgeHooksClient.engine().getTexture(texture); - } - private static IItemRenderer[] customItemRenderers = new IItemRenderer[Item.itemsList.length]; /** diff --git a/client/net/minecraftforge/client/ModCompatibilityClient.java b/client/net/minecraftforge/client/ModCompatibilityClient.java deleted file mode 100644 index d3203d6ce0..0000000000 --- a/client/net/minecraftforge/client/ModCompatibilityClient.java +++ /dev/null @@ -1,278 +0,0 @@ -package net.minecraftforge.client; - -import java.io.File; -import java.io.IOException; -import java.lang.reflect.Field; -import java.util.logging.Level; - -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.common.FMLLog; - -import paulscode.sound.SoundSystemConfig; -import paulscode.sound.codecs.CodecIBXM; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.audio.SoundManager; -import net.minecraft.client.audio.SoundPool; -import net.minecraft.client.audio.SoundPoolEntry; -import net.minecraft.entity.Entity; -import net.minecraft.network.packet.Packet100OpenWindow; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; - -public class ModCompatibilityClient -{ - /** - * Tries to get the class for the specified name, will also try the - * net.minecraft.src package in case we are in MCP - * Returns null if not found. - * - * @param name The class name - * @return The Class, or null if not found - */ - private static Class getClass(String name) - { - try - { - return Class.forName(name); - } - catch (Exception e) - { - try - { - return Class.forName("net.minecraft.src." + name); - } - catch (Exception e2) - { - return null; - } - } - } - - /************************************************************************************************ - * Risugami's AudioMod Compatibility - * http://www.minecraftforum.net/topic/75440- - * - * AudioMod adds a few extra codecs, loads audio from /resources/mods/*, - * introduces the concept of 'cave' sounds, which are determined by if - * the player is underneath a solid block. - * - * It also lowers the interval between background music songs to 6000 - */ - public static SoundPool audioModSoundPoolCave; - - /** - * Populates the sound pools with with sounds from the /resources/mods folder - * And sets the interval between background music to 6000 - * - * @param mngr The SoundManager instance - */ - public static void audioModLoad(SoundManager mngr) - { - audioModSoundPoolCave = new SoundPool(); - audioModLoadModAudio("resources/mod/sound", mngr.soundPoolSounds); - audioModLoadModAudio("resources/mod/streaming", mngr.soundPoolStreaming); - audioModLoadModAudio("resources/mod/music", mngr.soundPoolMusic); - audioModLoadModAudio("resources/mod/cavemusic", audioModSoundPoolCave); - - if (mngr.MUSIC_INTERVAL == 12000) - { - mngr.MUSIC_INTERVAL = 6000; - } - } - - /** - * Walks the given path in the Minecraft app directory and adds audio to the SoundPool - * - * @param path The path to walk - * @param pool The pool to add sound to - */ - private static void audioModLoadModAudio(String path, SoundPool pool) - { - File folder = new File(Minecraft.getMinecraftDir(), path); - - try - { - audioModWalkFolder(folder, folder, pool); - } - catch (IOException ex) - { - FMLLog.log(Level.FINE, ex, "Loading Mod audio failed for folder: %s", path); - ex.printStackTrace(); - } - } - - /** - * Walks the folder path recursively and calls pool.addSound on any file it finds. - * - * @param base The base path for the folder, determines the name when calling addSound - * @param folder The current folder - * @param pool The SoundPool to add the sound to - * @throws IOException - */ - private static void audioModWalkFolder(File base, File folder, SoundPool pool) throws IOException - { - if (folder.exists() || folder.mkdirs()) - { - for (File file : folder.listFiles()) - { - if (!file.getName().startsWith(".")) - { - if (file.isDirectory()) - { - audioModWalkFolder(base, file, pool); - } - else if (file.isFile()) - { - String subpath = file.getPath().substring(base.getPath().length() + 1).replace('\\', '/'); - pool.addSound(subpath, file); - } - } - } - } - } - - /** - * Adds the IBXM codec and associates it with .xm, .s3m, and .mod - */ - public static void audioModAddCodecs() - { - SoundSystemConfig.setCodec("xm", CodecIBXM.class); - SoundSystemConfig.setCodec("s3m", CodecIBXM.class); - SoundSystemConfig.setCodec("mod", CodecIBXM.class); - } - - /** - * If the current player is underground, it picks a random song from the cave sound pool, - * if they are not it returns the passed in entry. - * - * @param soundManager The SoundManager instance - * @param current The currently selected entry - * @return A soundPool entry to be played as the background music - */ - public static SoundPoolEntry audioModPickBackgroundMusic(SoundManager soundManager, SoundPoolEntry current) - { - Minecraft mc = FMLClientHandler.instance().getClient(); - if (mc != null && mc.theWorld != null && audioModSoundPoolCave != null) - { - Entity ent = mc.renderViewEntity; - int x = MathHelper.truncateDoubleToInt(ent.posX); - int y = MathHelper.truncateDoubleToInt(ent.posY); - int z = MathHelper.truncateDoubleToInt(ent.posZ); - return (mc.theWorld.canBlockSeeTheSky(x, y, z) ? current : audioModSoundPoolCave.getRandomSound()); - } - return current; - } - - /*********************************************************************************************************** - * SDK's ModLoaderMP - * http://www.minecraftforum.net/topic/86765- - * - * ModLoaderMP was supposed to be a reliable server side version of ModLoader, however it has - * gotten the reputation of being really slow to update. Never having bugfixes, breaking compatibility - * with the client side ModLoader. - * - * So we have replaced it with our own system called FML (Forge ModLoader) - * it is a stand alone mod, that Forge relies on, and that is open source/community driven. - * https://github.com/cpw/FML - * - * However, for compatibilities sake, we provide the ModLoaderMP's hooks so that the end user - * does not need to make a choice between the two on the client side. - **/ - private static int isMLMPInstalled = -1; - - /** - * Determine if ModLoaderMP is installed by checking for the existence of the BaseModMp class. - * @return True if BaseModMp was installed (indicating the existance of MLMP) - */ - public static boolean isMLMPInstalled() - { - if (isMLMPInstalled == -1) - { - isMLMPInstalled = (getClass("ModLoaderMp") != null ? 1 : 0); - } - return isMLMPInstalled == 1; - } - - /** - * Attempts to spawn a vehicle using ModLoaderMP's vehicle spawn registry, if MLMP is not installed - * it returns the passed in currentEntity - * - * @param type The Type ID of the vehicle - * @param world The current world - * @param x The spawn X position - * @param y The spawn Y position - * @param z The spawn Z position - * @param thrower The entity that spawned the vehicle {possibly null} - * @param currentEntity The current value to return if MLMP is not installed - * @return The new spawned entity - * @throws Exception - */ - public static Object mlmpVehicleSpawn(int type, World world, double x, double y, double z, Entity thrower, Object currentEntity) throws Exception - { - Class mlmp = getClass("ModLoaderMp"); - if (!isMLMPInstalled() || mlmp == null) - { - return currentEntity; - } - - Object entry = mlmp.getDeclaredMethod("handleNetClientHandlerEntities", int.class).invoke(null, type); - if (entry == null) - { - return currentEntity; - } - - Class entityClass = (Class)entry.getClass().getDeclaredField("entityClass").get(entry); - Object ret = (Entity)entityClass.getConstructor(World.class, Double.TYPE, Double.TYPE, Double.TYPE).newInstance(world, x, y, z); - - if (entry.getClass().getDeclaredField("entityHasOwner").getBoolean(entry)) - { - Field owner = entityClass.getField("owner"); - - if (!Entity.class.isAssignableFrom(owner.getType())) - { - throw new Exception(String.format("Entity\'s owner field must be of type Entity, but it is of type %s.", owner.getType())); - } - - if (thrower == null) - { - System.out.println("Received spawn packet for entity with owner, but owner was not found."); - FMLLog.fine("Received spawn packet for entity with owner, but owner was not found."); - } - else - { - if (!owner.getType().isAssignableFrom(thrower.getClass())) - { - throw new Exception(String.format("Tried to assign an entity of type %s to entity owner, which is of type %s.", thrower.getClass(), owner.getType())); - } - - owner.set(ret, thrower); - } - } - return ret; - } - - /** - * Attempts to invoke ModLoaderMp.handleGUI if ModLoaderMP is installed. - * If not, it does nothing - * - * @param pkt The open window packet - */ - public static void mlmpOpenWindow(Packet100OpenWindow pkt) - { - Class mlmp = getClass("ModLoaderMp"); - if (!isMLMPInstalled() || mlmp == null) - { - return; - } - - try - { - mlmp.getDeclaredMethod("handleGUI", Packet100OpenWindow.class).invoke(null, pkt); - } - catch (Exception e) - { - e.printStackTrace(); - } - } -} diff --git a/client/net/minecraftforge/client/event/RenderGameOverlayEvent.java b/client/net/minecraftforge/client/event/RenderGameOverlayEvent.java index d35137bdcf..68ab5f73f7 100644 --- a/client/net/minecraftforge/client/event/RenderGameOverlayEvent.java +++ b/client/net/minecraftforge/client/event/RenderGameOverlayEvent.java @@ -22,7 +22,9 @@ public class RenderGameOverlayEvent extends Event AIR, HOTBAR, EXPERIENCE, - TEXT + TEXT, + HEALTHMOUNT, + JUMPBAR } public final float partialTicks; diff --git a/client/net/minecraftforge/client/event/RenderLivingEvent.java b/client/net/minecraftforge/client/event/RenderLivingEvent.java index 8f42ed2cdc..6c64db9c3b 100644 --- a/client/net/minecraftforge/client/event/RenderLivingEvent.java +++ b/client/net/minecraftforge/client/event/RenderLivingEvent.java @@ -1,18 +1,16 @@ package net.minecraftforge.client.event; -import net.minecraft.client.renderer.entity.RenderLiving; -import net.minecraft.client.renderer.entity.RenderPlayer; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.client.renderer.entity.RendererLivingEntity; +import net.minecraft.entity.EntityLivingBase; import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Event; public abstract class RenderLivingEvent extends Event { - public final EntityLiving entity; - public final RenderLiving renderer; + public final EntityLivingBase entity; + public final RendererLivingEntity renderer; - public RenderLivingEvent(EntityLiving entity, RenderLiving renderer) + public RenderLivingEvent(EntityLivingBase entity, RendererLivingEntity renderer) { this.entity = entity; this.renderer = renderer; @@ -20,16 +18,16 @@ public abstract class RenderLivingEvent extends Event public abstract static class Specials extends RenderLivingEvent { - public Specials(EntityLiving entity, RenderLiving renderer){ super(entity, renderer); } + public Specials(EntityLivingBase entity, RendererLivingEntity renderer){ super(entity, renderer); } @Cancelable public static class Pre extends Specials { - public Pre(EntityLiving entity, RenderLiving renderer){ super(entity, renderer); } + public Pre(EntityLivingBase entity, RendererLivingEntity renderer){ super(entity, renderer); } } public static class Post extends Specials { - public Post(EntityLiving entity, RenderLiving renderer){ super(entity, renderer); } + public Post(EntityLivingBase entity, RendererLivingEntity renderer){ super(entity, renderer); } } } } diff --git a/client/net/minecraftforge/client/event/TextureLoadEvent.java b/client/net/minecraftforge/client/event/TextureLoadEvent.java deleted file mode 100644 index b483db111c..0000000000 --- a/client/net/minecraftforge/client/event/TextureLoadEvent.java +++ /dev/null @@ -1,17 +0,0 @@ -package net.minecraftforge.client.event; - -import net.minecraft.client.texturepacks.ITexturePack; -import net.minecraftforge.event.Event; - -public class TextureLoadEvent extends Event -{ - - public final String texture; - public final ITexturePack pack; - - public TextureLoadEvent(String texture, ITexturePack pack) - { - this.texture = texture; - this.pack = pack; - } -} diff --git a/client/net/minecraftforge/client/model/AdvancedModelLoader.java b/client/net/minecraftforge/client/model/AdvancedModelLoader.java index f5137d1dd2..5d2afb4b99 100644 --- a/client/net/minecraftforge/client/model/AdvancedModelLoader.java +++ b/client/net/minecraftforge/client/model/AdvancedModelLoader.java @@ -6,6 +6,7 @@ import java.util.Collection; import java.util.Map; import net.minecraftforge.client.model.obj.ObjModelLoader; +import net.minecraftforge.client.model.techne.TechneModelLoader; import com.google.common.collect.Maps; @@ -78,5 +79,6 @@ public class AdvancedModelLoader { static { registerModelHandler(new ObjModelLoader()); + registerModelHandler(new TechneModelLoader()); } } diff --git a/client/net/minecraftforge/client/model/techne/TechneModel.java b/client/net/minecraftforge/client/model/techne/TechneModel.java new file mode 100644 index 0000000000..66a32aa9b3 --- /dev/null +++ b/client/net/minecraftforge/client/model/techne/TechneModel.java @@ -0,0 +1,301 @@ +package net.minecraftforge.client.model.techne; + +import java.awt.image.BufferedImage; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.URL; +import java.util.Arrays; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.zip.ZipEntry; +import java.util.zip.ZipException; +import java.util.zip.ZipFile; +import java.util.zip.ZipInputStream; + +import javax.imageio.ImageIO; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + +import org.lwjgl.opengl.GL11; +import org.w3c.dom.Document; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.SAXException; + +import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraftforge.client.model.IModelCustom; +import net.minecraftforge.client.model.ModelFormatException; + +/** + * Techne model importer, based on iChun's Hats importer + */ +@SideOnly(Side.CLIENT) +public class TechneModel extends ModelBase implements IModelCustom { + public static final List cubeTypes = Arrays.asList( + "d9e621f7-957f-4b77-b1ae-20dcd0da7751", + "de81aa14-bd60-4228-8d8d-5238bcd3caaa" + ); + + private String fileName; + private Map zipContents = new HashMap(); + + private Map parts = new LinkedHashMap(); + private String texture = null; + private int textureName; + private boolean textureNameSet = false; + + public TechneModel(String fileName, URL resource) throws ModelFormatException + { + this.fileName = fileName; + loadTechneModel(resource); + } + + private void loadTechneModel(URL fileURL) throws ModelFormatException + { + try + { + ZipInputStream zipInput = new ZipInputStream(fileURL.openStream()); + + ZipEntry entry; + while ((entry = zipInput.getNextEntry()) != null) + { + byte[] data = new byte[(int) entry.getSize()]; + // For some reason, using read(byte[]) makes reading stall upon reaching a 0x1E byte + int i = 0; + while (zipInput.available() > 0 && i < data.length) + { + data[i++] = (byte)zipInput.read(); + } + zipContents.put(entry.getName(), data); + } + + byte[] modelXml = zipContents.get("model.xml"); + if (modelXml == null) + { + throw new ModelFormatException("Model " + fileName + " contains no model.xml file"); + } + + DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); + DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); + Document document = documentBuilder.parse(new ByteArrayInputStream(modelXml)); + + NodeList nodeListTechne = document.getElementsByTagName("Techne"); + if (nodeListTechne.getLength() < 1) + { + throw new ModelFormatException("Model " + fileName + " contains no Techne tag"); + } + + NodeList nodeListModel = document.getElementsByTagName("Model"); + if (nodeListModel.getLength() < 1) + { + throw new ModelFormatException("Model " + fileName + " contains no Model tag"); + } + + NamedNodeMap modelAttributes = nodeListModel.item(0).getAttributes(); + if (modelAttributes == null) + { + throw new ModelFormatException("Model " + fileName + " contains a Model tag with no attributes"); + } + + Node modelTexture = modelAttributes.getNamedItem("texture"); + if (modelTexture != null) + { + texture = modelTexture.getTextContent(); + } + + NodeList shapes = document.getElementsByTagName("Shape"); + for (int i = 0; i < shapes.getLength(); i++) + { + Node shape = shapes.item(i); + NamedNodeMap shapeAttributes = shape.getAttributes(); + if (shapeAttributes == null) + { + throw new ModelFormatException("Shape #" + (i + 1) + " in " + fileName + " has no attributes"); + } + + Node name = shapeAttributes.getNamedItem("name"); + String shapeName = null; + if (name != null) + { + shapeName = name.getNodeValue(); + } + if (shapeName == null) + { + shapeName = "Shape #" + (i + 1); + } + + String shapeType = null; + Node type = shapeAttributes.getNamedItem("type"); + if (type != null) + { + shapeType = type.getNodeValue(); + } + if (shapeType != null && !cubeTypes.contains(shapeType)) + { + FMLLog.warning("Model shape [" + shapeName + "] in " + fileName + " is not a cube, ignoring"); + continue; + } + + try + { + boolean mirrored = false; + String[] offset = new String[3]; + String[] position = new String[3]; + String[] rotation = new String[3]; + String[] size = new String[3]; + String[] textureOffset = new String[2]; + + NodeList shapeChildren = shape.getChildNodes(); + for (int j = 0; j < shapeChildren.getLength(); j++) + { + Node shapeChild = shapeChildren.item(j); + + String shapeChildName = shapeChild.getNodeName(); + String shapeChildValue = shapeChild.getTextContent(); + if (shapeChildValue != null) + { + shapeChildValue = shapeChildValue.trim(); + + if (shapeChildName.equals("IsMirrored")) + { + mirrored = !shapeChildValue.equals("False"); + } + else if (shapeChildName.equals("Offset")) + { + offset = shapeChildValue.split(","); + } + else if (shapeChildName.equals("Position")) + { + position = shapeChildValue.split(","); + } + else if (shapeChildName.equals("Rotation")) + { + rotation = shapeChildValue.split(","); + } + else if (shapeChildName.equals("Size")) + { + size = shapeChildValue.split(","); + } + else if (shapeChildName.equals("TextureOffset")) + { + textureOffset = shapeChildValue.split(","); + } + } + } + + // That's what the ModelBase subclassing is needed for + ModelRenderer cube = new ModelRenderer(this, Integer.parseInt(textureOffset[0]), Integer.parseInt(textureOffset[1])); + cube.mirror = mirrored; + cube.addBox(Float.parseFloat(offset[0]), Float.parseFloat(offset[1]), Float.parseFloat(offset[2]), Integer.parseInt(size[0]), Integer.parseInt(size[1]), Integer.parseInt(size[2])); + cube.setRotationPoint(Float.parseFloat(position[0]), Float.parseFloat(position[1]) - 23.4F, Float.parseFloat(position[2])); + + cube.rotateAngleX = (float)Math.toRadians(Float.parseFloat(rotation[0])); + cube.rotateAngleY = (float)Math.toRadians(Float.parseFloat(rotation[1])); + cube.rotateAngleZ = (float)Math.toRadians(Float.parseFloat(rotation[2])); + + parts.put(shapeName, cube); + } + catch (NumberFormatException e) + { + FMLLog.warning("Model shape [" + shapeName + "] in " + fileName + " contains malformed integers within its data, ignoring"); + e.printStackTrace(); + } + } + } + catch (ZipException e) + { + throw new ModelFormatException("Model " + fileName + " is not a valid zip file"); + } + catch (IOException e) + { + throw new ModelFormatException("Model " + fileName + " could not be read", e); + } + catch (ParserConfigurationException e) + { + // hush + } + catch (SAXException e) + { + throw new ModelFormatException("Model " + fileName + " contains invalid XML", e); + } + } + + private void bindTexture() + { + /* TODO: Update to 1.6 + if (texture != null) + { + if (!textureNameSet) + { + try + { + byte[] textureEntry = zipContents.get(texture); + if (textureEntry == null) + { + throw new ModelFormatException("Model " + fileName + " has no such texture " + texture); + } + + BufferedImage image = ImageIO.read(new ByteArrayInputStream(textureEntry)); + textureName = Minecraft.getMinecraft().renderEngine.allocateAndSetupTexture(image); + textureNameSet = true; + } + catch (ZipException e) + { + throw new ModelFormatException("Model " + fileName + " is not a valid zip file"); + } + catch (IOException e) + { + throw new ModelFormatException("Texture for model " + fileName + " could not be read", e); + } + } + + if (textureNameSet) + { + GL11.glBindTexture(GL11.GL_TEXTURE_2D, textureName); + Minecraft.getMinecraft().renderEngine.resetBoundTexture(); + } + } + */ + } + + @Override + public String getType() + { + return "tcn"; + } + + @Override + public void renderAll() + { + bindTexture(); + + for (ModelRenderer part : parts.values()) + { + part.renderWithRotation(1.0F); + } + } + + @Override + public void renderPart(String partName) + { + ModelRenderer part = parts.get(partName); + if (part != null) + { + bindTexture(); + + part.renderWithRotation(1.0F); + } + } +} diff --git a/client/net/minecraftforge/client/model/techne/TechneModelLoader.java b/client/net/minecraftforge/client/model/techne/TechneModelLoader.java new file mode 100644 index 0000000000..c9dd469b3e --- /dev/null +++ b/client/net/minecraftforge/client/model/techne/TechneModelLoader.java @@ -0,0 +1,33 @@ +package net.minecraftforge.client.model.techne; + +import java.net.URL; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +import net.minecraftforge.client.model.IModelCustom; +import net.minecraftforge.client.model.IModelCustomLoader; +import net.minecraftforge.client.model.ModelFormatException; + +public class TechneModelLoader implements IModelCustomLoader { + + @Override + public String getType() + { + return "Techne model"; + } + + private static final String[] types = { "tcn" }; + @Override + public String[] getSuffixes() + { + return types; + } + + @Override + public IModelCustom loadInstance(String resourceName, URL resource) throws ModelFormatException + { + return new TechneModel(resourceName, resource); + } + +} diff --git a/common/forge_at.cfg b/common/forge_at.cfg index 6f813d1272..7063cee1a2 100644 --- a/common/forge_at.cfg +++ b/common/forge_at.cfg @@ -1,158 +1,164 @@ #Main Forge Access Transformer configuration file # Tessellator -public-f bgd.a #FD:Tessellator/field_78398_a #instance -public bgd.u #FD:Tessellator/field_78409_u #drawMode -public bgd.v #FD:Tessellator/field_78408_v #xOffset -public bgd.w #FD:Tessellator/field_78407_w #yOffset -public bgd.x #FD:Tessellator/field_78417_x #zOffset -public bgd.z #FD:Tessellator/field_78415_z #isDrawing +public-f bff.a #FD:Tessellator/field_78398_a #instance +public bff.u #FD:Tessellator/field_78409_u #drawMode +public bff.v #FD:Tessellator/field_78408_v #xOffset +public bff.w #FD:Tessellator/field_78407_w #yOffset +public bff.x #FD:Tessellator/field_78417_x #zOffset +public bff.z #FD:Tessellator/field_78415_z #isDrawing # ItemPickaxe -public wu.(ILwl;)V #MD:ItemPickaxe/(ILnet/minecraft/src/EnumToolMaterial;) #constructor -public+f wu.c #FD:ItemPickaxe/field_77867_c #blocksEffectiveAgainst +public yi.(ILxy;)V #MD:ItemPickaxe/(ILnet/minecraft/src/EnumToolMaterial;) #constructor +public+f yi.c #FD:ItemPickaxe/field_77867_c #blocksEffectiveAgainst # ItemAxe -public wi.(ILwl;)V #MD:ItemAxe/(ILnet/minecraft/src/EnumToolMaterial;) #constructor -public+f wi.c #FD:ItemAxe/field_77868_c #blocksEffectiveAgainst +public xv.(ILxy;)V #MD:ItemAxe/(ILnet/minecraft/src/EnumToolMaterial;) #constructor +public+f xv.c #FD:ItemAxe/field_77868_c #blocksEffectiveAgainst # ItemSpade -public xf.(ILwl;)V #MD:ItemSpade/(ILnet/minecraft/src/EnumToolMaterial;) #constructor -public+f xf.c #FD:ItemSpade/field_77866_c #blocksEffectiveAgainst +public yt.(ILxy;)V #MD:ItemSpade/(ILnet/minecraft/src/EnumToolMaterial;) #constructor +public+f yt.c #FD:ItemSpade/field_77866_c #blocksEffectiveAgainst # ItemTool -public vr.a #FD:ItemTool/field_77864_a #efficiencyOnProperMaterial -public vr.d #FD:ItemTool/field_77865_bY #damageVsEntity +public xe.a #FD:ItemTool/field_77864_a #efficiencyOnProperMaterial +public xe.d #FD:ItemTool/field_77865_bY #damageVsEntity # EntityEnderman -public rv.d #FD:EntityEnderman/field_70827_d #carriableBlocks +public td.br #FD:EntityEnderman/field_70827_d #carriableBlocks # RenderEngine -public bge.f(Ljava/lang/String;)I #MD:RenderEngine/func_78341_b #getTexture -public bge.i #FD:RenderEngine/field_94154_l #terrainTextureMap -public bge.j #FD:RenderEngine/field_94155_m #itemTextureMap +# -- MISSING MAPPING public bge.f(Ljava/lang/String;)I #MD:RenderEngine/func_78341_b #getTexture +# -- MISSING MAPPING public bge.i #FD:RenderEngine/field_94154_l #terrainTextureMap +# -- MISSING MAPPING public bge.j #FD:RenderEngine/field_94155_m #itemTextureMap # RenderGlobal -public bfy.h #FD:RenderGlobal/field_72769_h #theWorld -public bfy.i #FD:RenderGlobal/field_72770_i #renderEngine -public bfy.q #FD:RenderGlobal/field_72777_q #mc -public bfy.r #FD:RenderGlobal/field_72776_r #globalRenderBlocks -public bfy.E #FD:RenderGlobal/field_72738_E #damagedBlocks +public bfa.k #FD:RenderGlobal/field_72769_h #theWorld +public bfa.l #FD:RenderGlobal/field_72770_i #renderEngine +public bfa.t #FD:RenderGlobal/field_72777_q #mc +public bfa.u #FD:RenderGlobal/field_72776_r #globalRenderBlocks +public bfa.H #FD:RenderGlobal/field_72738_E #damagedBlocks # SoundManager -public bkc.a #FD:SoundManager/field_77381_a #sndSystem -public bkc.b #FD:SoundManager/field_77379_b #soundPoolSounds -public bkc.c #FD:SoundManager/field_77380_c #soundPoolStreaming -public bkc.d #FD:SoundManager/field_77377_d #soundPoolMusic +public blc.b #FD:SoundManager/field_77381_a #sndSystem +public blc.d #FD:SoundManager/field_77379_b #soundPoolSounds +public blc.e #FD:SoundManager/field_77380_c #soundPoolStreaming +public blc.f #FD:SoundManager/field_77377_d #soundPoolMusic # EntityMinecart -protected ri.* #FD:EntityMinecart/* # All private -> protected +protected sq.* #FD:EntityMinecart/* # All private -> protected # -- MISSING MAPPING public py.h()Z #MD:EntityMinecart/func_70490_h #isMinecartPowered # Block -public apa.(ILaif;)V #MD:Block/(ILnet/minecraft/src/Material;) #Constructor -public apa.(IILaif;)V #MD:Block/(IILnet/minecraft/src/Material;) #Constructor -public apa.cB #FD:Block/field_72029_cc #blockResistance -public apa.cA #FD:Block/field_71989_cb #blockHardness +public aqs.(ILajv;)V #MD:Block/(ILnet/minecraft/src/Material;) #Constructor +public aqs.(IILajv;)V #MD:Block/(IILnet/minecraft/src/Material;) #Constructor +public aqs.cH #FD:Block/field_72029_cc #blockResistance +public aqs.cG #FD:Block/field_71989_cb #blockHardness +public aqs.d(Ljava/lang/String;)Laqs; #MD:Block/func_111022_d #setIconName # -- MISSING MAPPING public amq.r()Lamq; #MD:Block/func_71912_p #setRequiresSelfNotify -public apa.a(Lape;)Lapa; #MD:Block/func_71884_a #setStepSound -public apa.b(F)Lapa; #MD:Block/func_71894_b #setResistance -public apa.c(F)Lapa; #MD:Block/func_71848_c #setHardness -public apa.k(I)Lapa; #MD:Block/func_71868_h #setLightOpacity -public apa.a(F)Lapa; #MD:Block/func_71900_a #setLightValue -public apa.r()Lapa; #MD:Block/func_71875_q #setBlockUnbreakable -public apa.b(Z)Lapa; #MD:Block/func_71907_b #setTickRandomly -public apa.a(FFFFFF)V #MD:Block/func_71905_a #setBlockBounds +public aqs.a(Laqw;)Laqs; #MD:Block/func_71884_a #setStepSound +public aqs.b(F)Laqs; #MD:Block/func_71894_b #setResistance +public aqs.c(F)Laqs; #MD:Block/func_71848_c #setHardness +public aqs.k(I)Laqs; #MD:Block/func_71868_h #setLightOpacity +public aqs.a(F)Laqs; #MD:Block/func_71900_a #setLightValue +public aqs.r()Laqs; #MD:Block/func_71875_q #setBlockUnbreakable +public aqs.b(Z)Laqs; #MD:Block/func_71907_b #setTickRandomly +public aqs.a(FFFFFF)V #MD:Block/func_71905_a #setBlockBounds # NetServerHandler -public jh.f #FD:NetServerHandler/field_72572_g #playerInAirTime +public jx.f #FD:NetServerHandler/field_72572_g #playerInAirTime # TileEntity -public aqp.k #FD:TileEntity/field_70331_k #worldObj +public asi.k #FD:TileEntity/field_70331_k #worldObj # BlockLeavesBase -public api.d #FD:BlockLeavesBase/field_72131_c #graphicsLevel +public ara.d #FD:BlockLeavesBase/field_72131_c #graphicsLevel # Item -public wk.(I)V #MD:Item/(I) #Constructor -public wk.e(I)Lwk; #MD:Item/func_77656_e #setMaxDamage -public-f wk.h(Lwm;)Llx; #MD:Item/func_77650_f #getIconIndex -public wk.c(Ljava/lang/String;)Lwk; #MD:Item/func_77631_c #setPotionEffect +public xx.(I)V #MD:Item/(I) #Constructor +public xx.e(I)Lxx; #MD:Item/func_77656_e #setMaxDamage +public-f xx.h(Lxz;)Lmp; #MD:Item/func_77650_f #getIconIndex +public xx.c(Ljava/lang/String;)Lxx; #MD:Item/func_77631_c #setPotionEffect # RailLogic -public alc #CL:BlockBaseRailLogic -public alc.a()I #MD:BlockBaseRailLogic/func_94505_a #getNAdjacentTiles +public ams #CL:BlockBaseRailLogic +public ams.a()I #MD:BlockBaseRailLogic/func_94505_a #getNAdjacentTiles # EntityPlayer -public sq.a(Lrh;)V #MD:EntityPlayer/func_71012_a #joinEntityItemWithWorld -public sq.h()V #MD:EntityPlayer/func_71053_j #closeScreen -public sq.b #FD:EntityPlayer/field_71076_b #sleepTimer +public ua.a(Lsp;)V #MD:EntityPlayer/func_71012_a #joinEntityItemWithWorld +public ua.i()V #MD:EntityPlayer/func_71053_j #closeScreen +public ua.b #FD:EntityPlayer/field_71076_b #sleepTimer # EntityPlayerMP -public bdv.a(Lrh;)V #MD:EntityClientPlayerMP/func_71012_a #joinEntityItemWithWorld +public bcx.a(Lsp;)V #MD:EntityClientPlayerMP/func_71012_a #joinEntityItemWithWorld # World Gen Chests Related -public lp.* #FD:WeightedRandomChestContent/* #all -public iz.S #FD:WorldServer/field_73069_S #bonusChestContent -public aem.a #FD:StructureMineshaftPieces/field_78818_a #mineshaftChestContents -public afq.i #FD:ComponentScatteredFeatureDesertPyramid/field_74941_i #itemsToGenerateInTemple -public afr.l #FD:ComponentScatteredFeatureJunglePyramid/field_74943_l #junglePyramidsChestContents -public afr.m #FD:ComponentScatteredFeatureJunglePyramid/field_74944_m #junglePyramidsDispenserContents -public agb.a #FD:ComponentStrongholdChestCorridor/field_75003_a #strongholdChestContents -public agf.b #FD:ComponentStrongholdLibrary/field_75007_b #strongholdLibraryChestContents -public agk.c #FD:ComponentStrongholdRoomCrossing/field_75014_c #strongholdCorridorChestContents -public ahl.a #FD:ComponentVillageHouse2/field_74918_a #villageBlacksmithChestContents +public mh.* #FD:WeightedRandomChestContent/* #all +public jp.T #FD:WorldServer/field_73069_S #bonusChestContent +public agc.a #FD:StructureMineshaftPieces/field_78818_a #mineshaftChestContents +public ahg.i #FD:ComponentScatteredFeatureDesertPyramid/field_74941_i #itemsToGenerateInTemple +public ahh.l #FD:ComponentScatteredFeatureJunglePyramid/field_74943_l #junglePyramidsChestContents +public ahh.m #FD:ComponentScatteredFeatureJunglePyramid/field_74944_m #junglePyramidsDispenserContents +public ahr.a #FD:ComponentStrongholdChestCorridor/field_75003_a #strongholdChestContents +public ahv.b #FD:ComponentStrongholdLibrary/field_75007_b #strongholdLibraryChestContents +public aia.c #FD:ComponentStrongholdRoomCrossing/field_75014_c #strongholdCorridorChestContents +public ajb.a #FD:ComponentVillageHouse2/field_74918_a #villageBlacksmithChestContents +public afk.a #FD:WorldGenDungeons/field_111189_a #chestContents # AnvilChunkLoader.chunkSaveLocation -public acj.d #FD:AnvilChunkLoader/field_75825_d +public adz.d #FD:AnvilChunkLoader/field_75825_d # ChunkProviderServer.currentChunkLoader -public iy.e #FD:ChunkProviderServer/field_73247_e +public jo.e #FD:ChunkProviderServer/field_73247_e # PlayerManager -public iw.a(IIZ)Lix; #MD:PlayerManager/func_72690_a #getOrCreateChunkWatcher +public jm.a(IIZ)Ljn; #MD:PlayerManager/func_72690_a #getOrCreateChunkWatcher # PlayerInstance -public ix #CL:PlayerInstance +public jn #CL:PlayerInstance # World -public-f aab.A #FD:World/field_72982_D #villageCollectionObj -public aab.G #FD:World/field_72993_I #activeChunkSet +public-f abr.A #FD:World/field_72982_D #villageCollectionObj +public abr.G #FD:World/field_72993_I #activeChunkSet # EntityLiving -public ng.be #FD:EntityLiving/field_70728_aV #experienceValue -public ng.bt #FD:EntityLiving/field_94063_bt #combatTracker -public ng.bp #FD:EntityLiving/field_70715_bh #targetTasks +public od.b #FD:EntityLiving/field_70728_aV #experienceValue +# -- MISSING MAPPING public ng.bt #FD:EntityLiving/field_94063_bt #combatTracker +public od.d #FD:EntityLiving/field_70715_bh #targetTasks # GuiFlatPresets -public axm.a(Ljava/lang/String;ILaav;Ljava/util/List;[Laei;)V #MD:GuiFlatPresets/func_82294_a -public axm.a(Ljava/lang/String;ILaav;[Laei;)V #MD:GuiFlatPresets/func_82297_a +public avq.a(Ljava/lang/String;ILacl;Ljava/util/List;[Lafy;)V #MD:GuiFlatPresets/func_82294_a +public avq.a(Ljava/lang/String;ILacl;[Lafy;)V #MD:GuiFlatPresets/func_82297_a # BiomeGenBase -public aav.*() #MD:BiomeGenBase/* #Everything protected->public +public acl.*() #MD:BiomeGenBase/* #Everything protected->public # MapGenVillage -public-f agz.e #FD:MapGenVillage/field_75055_e #villageSpawnBiomes +public-f aip.e #FD:MapGenVillage/field_75055_e #villageSpawnBiomes # ShapedRecipes -public+f yn.d #FD:ShapedRecipes/field_77574_d #recipeItems -public+f yn.b #FD:ShapedRecipes/field_77576_b #recipeWidth -public+f yn.c #FD:ShapedRecipes/field_77577_c #recipeHeight +public+f aad.d #FD:ShapedRecipes/field_77574_d #recipeItems +public+f aad.b #FD:ShapedRecipes/field_77576_b #recipeWidth +public+f aad.c #FD:ShapedRecipes/field_77577_c #recipeHeight # ShapelessRecipes -public yo.b #FD:ShapelessRecipes/field_77579_b #recipeItems +public aae.b #FD:ShapelessRecipes/field_77579_b #recipeItems # GuiContainer -protected ayl.a(Lul;)V #MD:GuiContainer/func_74192_a #drawSlotInventory +protected awp.a(Lvz;)V #MD:GuiContainer/func_74192_a #drawSlotInventory # ContainerPlayer -protected tz.h #FD:ContainerPlayer/field_82862_h #player +protected vq.h #FD:ContainerPlayer/field_82862_h #player # BlockButton -protected ali.n(Laab;III)V #MD:BlockButton/func_82535_o #checkActivation -protected-f ali.a #FD:BlockButton/field_82537_a #sensible +protected amy.n(Labr;III)V #MD:BlockButton/func_82535_o #checkActivation +protected-f amy.a #FD:BlockButton/field_82537_a #sensible # BiomeDecorator -public aaz.* #FD:BiomeDecorator/* # All private -> protected +public acp.* #FD:BiomeDecorator/* # All private -> protected # CreativeTabs -public-f ve.a #FD:CreativeTabs/field_78032_a # creativeTabArray non-final +public-f wr.a #FD:CreativeTabs/field_78032_a # creativeTabArray non-final # Packet -public ei.a(IZZLjava/lang/Class;)V #MD:Packet/func_73285_a #addIdClassMapping +public ex.a(IZZLjava/lang/Class;)V #MD:Packet/func_73285_a #addIdClassMapping # SaveHandler -public ajt.b()Ljava/io/File; #MD:SaveHandler/func_75765_b +public alj.b()Ljava/io/File; #MD:SaveHandler/func_75765_b # World stuff -public aab.b(Lmp;)V #MD:World/func_72847_b #releaseEntitySkin -public aab.m #FD:World/field_73003_n #prevRainingStrength -public aab.n #FD:World/field_73004_o #rainingStrength -public aab.p #FD:World/field_73017_q #thunderingStrength -public aab.o #FD:World/field_73018_p #prevThunderingStrength +public abr.b(Lnk;)V #MD:World/func_72847_b #releaseEntitySkin +public abr.m #FD:World/field_73003_n #prevRainingStrength +public abr.n #FD:World/field_73004_o #rainingStrength +public abr.p #FD:World/field_73017_q #thunderingStrength +public abr.o #FD:World/field_73018_p #prevThunderingStrength #WorldClient -public bds.b(Lmp;)V #MD:WorldClient/func_72847_b #releaseEntitySkin +public bcu.b(Lnk;)V #MD:WorldClient/func_72847_b #releaseEntitySkin #WorldServer -public iz.b(Lmp;)V #MD:WorldServer/func_72847_b #releaseEntitySkin -public iz.N #FD:WorldServer/field_73068_P #allPlayersSleeping +public jp.b(Lnk;)V #MD:WorldServer/func_72847_b #releaseEntitySkin +public jp.N #FD:WorldServer/field_73068_P #allPlayersSleeping #TextureMap -public bir.a #FD:TextureMap/field_94255_a -public bir.b #FD:TextureMap/field_94253_b -public bir.c #FD:TextureMap/field_94254_c -public bir.d #FD:TextureMap/field_94251_d +public bhz.g #FD:TextureMap/field_94255_a +# -- MISSING MAPPING public bir.b #FD:TextureMap/field_94253_b +public bhz.h #FD:TextureMap/field_94254_c +# -- MISSING MAPPING public bir.d #FD:TextureMap/field_94251_d #Potion -public mk.b(II)Lmk; #MD:Potion/func_76399_b #setIconIndex +public nf.b(II)Lnf; #MD:Potion/func_76399_b #setIconIndex #PotionHelper -public xu.m #FD:PotionHelper/field_77927_l #potionRequirements -public xu.n #FD:PotionHelper/field_77928_m #potionAmplifiers +public zk.m #FD:PotionHelper/field_77927_l #potionRequirements +public zk.n #FD:PotionHelper/field_77928_m #potionAmplifiers #PotionEffect -public ml.b #FD:PotionEffect/field_76460_b #duration +public ng.b #FD:PotionEffect/field_76460_b #duration #BlockFluid -protected ane.a #FD:BlockFluid/field_94425_a #theIcon +protected aov.a #FD:BlockFluid/field_94425_a #theIcon #GuiIngame -protected aww.* #FD:GuiIngame/* # All private -> protected -protected aww.*() #MD:GuiIngame/* # All private -> protected +protected ava.* #FD:GuiIngame/* # All private -> protected +protected ava.*() #MD:GuiIngame/* # All private -> protected #ItemStack -default wm.e #FD:ItemStack/field_77991_e # make default access for itemDamage +default xz.f #FD:ItemStack/field_77991_e # make default access for itemDamage +#GuiSlot +protected avx.b(IIII)V #MD:GuiSlot/func_77206_b #overlayBackground +#EntityPlayer +public ua.bu #FD:EntityPlayer/field_71092_bJ #username diff --git a/common/net/minecraftforge/common/ChestGenHooks.java b/common/net/minecraftforge/common/ChestGenHooks.java index 7ce6d66549..68c326c442 100644 --- a/common/net/minecraftforge/common/ChestGenHooks.java +++ b/common/net/minecraftforge/common/ChestGenHooks.java @@ -7,6 +7,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandom; import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.WorldServer; +import net.minecraft.world.gen.feature.WorldGenDungeons; import net.minecraft.world.gen.structure.*; import net.minecraftforge.oredict.OreDictionary; @@ -49,6 +50,7 @@ public class ChestGenHooks addInfo(STRONGHOLD_CROSSING, ComponentStrongholdRoomCrossing.strongholdRoomCrossingChestContents, 1, 5); addInfo(VILLAGE_BLACKSMITH, ComponentVillageHouse2.villageBlacksmithChestContents, 3, 9); addInfo(BONUS_CHEST, WorldServer.bonusChestContent, 10, 10); + addInfo(DUNGEON_CHEST, WorldGenDungeons.field_111189_a, 8, 8); ItemStack book = new ItemStack(Item.enchantedBook, 1, 0); WeightedRandomChestContent tmp = new WeightedRandomChestContent(book, 1, 1, 1); @@ -58,25 +60,7 @@ public class ChestGenHooks getInfo(STRONGHOLD_CORRIDOR ).addItem(tmp); getInfo(STRONGHOLD_LIBRARY ).addItem(new WeightedRandomChestContent(book, 1, 5, 2)); getInfo(STRONGHOLD_CROSSING ).addItem(tmp); - - //Wish Dungeons would get on the same wave length as other world gen... - ChestGenHooks d = new ChestGenHooks(DUNGEON_CHEST); - d.countMin = 8; - d.countMax = 8; - chestInfo.put(DUNGEON_CHEST, d); - addDungeonLoot(d, new ItemStack(Item.saddle), 100, 1, 1); - addDungeonLoot(d, new ItemStack(Item.ingotIron), 100, 1, 4); - addDungeonLoot(d, new ItemStack(Item.bread), 100, 1, 1); - addDungeonLoot(d, new ItemStack(Item.wheat), 100, 1, 4); - addDungeonLoot(d, new ItemStack(Item.gunpowder), 100, 1, 4); - addDungeonLoot(d, new ItemStack(Item.silk), 100, 1, 4); - addDungeonLoot(d, new ItemStack(Item.bucketEmpty), 100, 1, 1); - addDungeonLoot(d, new ItemStack(Item.appleGold), 1, 1, 1); - addDungeonLoot(d, new ItemStack(Item.redstone), 50, 1, 4); - addDungeonLoot(d, new ItemStack(Item.record13), 5, 1, 1); - addDungeonLoot(d, new ItemStack(Item.recordCat), 5, 1, 1); - addDungeonLoot(d, new ItemStack(Item.dyePowder, 1, 3), 100, 1, 1); - addDungeonLoot(d, book, 100, 1, 1); + getInfo(DUNGEON_CHEST ).addItem(tmp); } static void addDungeonLoot(ChestGenHooks dungeon, ItemStack item, int weight, int min, int max) diff --git a/common/net/minecraftforge/common/EnumHelper.java b/common/net/minecraftforge/common/EnumHelper.java index 979899b7dd..54fee617ba 100644 --- a/common/net/minecraftforge/common/EnumHelper.java +++ b/common/net/minecraftforge/common/EnumHelper.java @@ -46,7 +46,7 @@ public class EnumHelper {EnumMovingObjectType.class}, {EnumSkyBlock.class, int.class}, {EnumStatus.class}, - {EnumToolMaterial.class, int.class, int.class, float.class, int.class, int.class} + {EnumToolMaterial.class, int.class, int.class, float.class, float.class, int.class} }; public static EnumAction addAction(String name) @@ -102,7 +102,7 @@ public class EnumHelper { return addEnum(EnumStatus.class, name); } - public static EnumToolMaterial addToolMaterial(String name, int harvestLevel, int maxUses, float efficiency, int damage, int enchantability) + public static EnumToolMaterial addToolMaterial(String name, int harvestLevel, int maxUses, float efficiency, float damage, int enchantability) { return addEnum(EnumToolMaterial.class, name, harvestLevel, maxUses, efficiency, damage, enchantability); } diff --git a/common/net/minecraftforge/common/FakePlayer.java b/common/net/minecraftforge/common/FakePlayer.java index 2c118f9f87..1d462593f3 100644 --- a/common/net/minecraftforge/common/FakePlayer.java +++ b/common/net/minecraftforge/common/FakePlayer.java @@ -1,6 +1,7 @@ package net.minecraftforge.common; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ChatMessageComponent; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; @@ -9,8 +10,7 @@ public class FakePlayer extends EntityPlayer { public FakePlayer(World world, String name) { - super(world); - this.username = name; + super(world, name); } public void sendChatToPlayer(String s){} @@ -19,4 +19,7 @@ public class FakePlayer extends EntityPlayer { return new ChunkCoordinates(0,0,0); } + + @Override + public void sendChatToPlayer(ChatMessageComponent chatmessagecomponent){} } diff --git a/common/net/minecraftforge/common/ForgeHooks.java b/common/net/minecraftforge/common/ForgeHooks.java index fa1883fea6..8fa371847b 100644 --- a/common/net/minecraftforge/common/ForgeHooks.java +++ b/common/net/minecraftforge/common/ForgeHooks.java @@ -1,16 +1,14 @@ package net.minecraftforge.common; -import java.util.*; -import java.util.Map.Entry; - -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.ListMultimap; - -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.Loader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -19,6 +17,8 @@ import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; +import net.minecraft.network.NetServerHandler; +import net.minecraft.util.ChatMessageComponent; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumMovingObjectType; import net.minecraft.util.MovingObjectPosition; @@ -26,9 +26,16 @@ import net.minecraft.util.WeightedRandom; import net.minecraft.util.WeightedRandomItem; import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; +import net.minecraftforge.event.ServerChatEvent; import net.minecraftforge.event.entity.item.ItemTossEvent; -import net.minecraftforge.event.entity.living.*; -import net.minecraftforge.event.entity.living.LivingEvent.*; +import net.minecraftforge.event.entity.living.LivingAttackEvent; +import net.minecraftforge.event.entity.living.LivingDeathEvent; +import net.minecraftforge.event.entity.living.LivingDropsEvent; +import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; +import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; +import net.minecraftforge.event.entity.living.LivingFallEvent; +import net.minecraftforge.event.entity.living.LivingHurtEvent; +import net.minecraftforge.event.entity.living.LivingSetAttackTargetEvent; public class ForgeHooks { @@ -307,49 +314,49 @@ public class ForgeHooks //Optifine Helper Functions u.u, these are here specifically for Optifine //Note: When using Optfine, these methods are invoked using reflection, which //incurs a major performance penalty. - public static void onLivingSetAttackTarget(EntityLiving entity, EntityLiving target) + public static void onLivingSetAttackTarget(EntityLivingBase entity, EntityLivingBase target) { MinecraftForge.EVENT_BUS.post(new LivingSetAttackTargetEvent(entity, target)); } - public static boolean onLivingUpdate(EntityLiving entity) + public static boolean onLivingUpdate(EntityLivingBase entity) { return MinecraftForge.EVENT_BUS.post(new LivingUpdateEvent(entity)); } - public static boolean onLivingAttack(EntityLiving entity, DamageSource src, int amount) + public static boolean onLivingAttack(EntityLivingBase entity, DamageSource src, float amount) { return MinecraftForge.EVENT_BUS.post(new LivingAttackEvent(entity, src, amount)); } - public static int onLivingHurt(EntityLiving entity, DamageSource src, int amount) + public static float onLivingHurt(EntityLivingBase entity, DamageSource src, float amount) { LivingHurtEvent event = new LivingHurtEvent(entity, src, amount); return (MinecraftForge.EVENT_BUS.post(event) ? 0 : event.ammount); } - public static boolean onLivingDeath(EntityLiving entity, DamageSource src) + public static boolean onLivingDeath(EntityLivingBase entity, DamageSource src) { return MinecraftForge.EVENT_BUS.post(new LivingDeathEvent(entity, src)); } - public static boolean onLivingDrops(EntityLiving entity, DamageSource source, ArrayList drops, int lootingLevel, boolean recentlyHit, int specialDropValue) + public static boolean onLivingDrops(EntityLivingBase entity, DamageSource source, ArrayList drops, int lootingLevel, boolean recentlyHit, int specialDropValue) { return MinecraftForge.EVENT_BUS.post(new LivingDropsEvent(entity, source, drops, lootingLevel, recentlyHit, specialDropValue)); } - public static float onLivingFall(EntityLiving entity, float distance) + public static float onLivingFall(EntityLivingBase entity, float distance) { LivingFallEvent event = new LivingFallEvent(entity, distance); return (MinecraftForge.EVENT_BUS.post(event) ? 0.0f : event.distance); } - public static boolean isLivingOnLadder(Block block, World world, int x, int y, int z) + public static boolean isLivingOnLadder(Block block, World world, int x, int y, int z, EntityLivingBase entity) { - return block != null && block.isLadder(world, x, y, z); + return block != null && block.isLadder(world, x, y, z, entity); } - public static void onLivingJump(EntityLiving entity) + public static void onLivingJump(EntityLivingBase entity) { MinecraftForge.EVENT_BUS.post(new LivingJumpEvent(entity)); } @@ -381,4 +388,14 @@ public class ForgeHooks Block block = Block.blocksList[world.getBlockId(x, y, z)]; return (block == null ? 0 : block.getEnchantPowerBonus(world, x, y, z)); } + + public static ChatMessageComponent onServerChatEvent(NetServerHandler net, String raw, ChatMessageComponent comp) + { + ServerChatEvent event = new ServerChatEvent(net.playerEntity, raw, comp); + if (MinecraftForge.EVENT_BUS.post(event)) + { + return null; + } + return event.component; + } } diff --git a/common/net/minecraftforge/common/ForgeVersion.java b/common/net/minecraftforge/common/ForgeVersion.java index 374672c7e9..e162a21ab6 100644 --- a/common/net/minecraftforge/common/ForgeVersion.java +++ b/common/net/minecraftforge/common/ForgeVersion.java @@ -8,9 +8,9 @@ package net.minecraftforge.common; public class ForgeVersion { //This number is incremented every time we remove deprecated code/major API changes, never reset - public static final int majorVersion = 7; + public static final int majorVersion = 8; //This number is incremented every minecraft release, never reset - public static final int minorVersion = 8; + public static final int minorVersion = 9; //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; //This number is incremented every time Jenkins builds Forge, and never reset. Should always be 0 in the repo code. diff --git a/common/net/minecraftforge/common/IArmorTextureProvider.java b/common/net/minecraftforge/common/IArmorTextureProvider.java deleted file mode 100644 index 4106d170e7..0000000000 --- a/common/net/minecraftforge/common/IArmorTextureProvider.java +++ /dev/null @@ -1,27 +0,0 @@ -/** - * This software is provided under the terms of the Minecraft Forge Public - * License v1.0. - */ - -package net.minecraftforge.common; - -import net.minecraft.item.ItemStack; - -/** - * This interface has to be implemented by an instance of ItemArmor. - * It allows for the application of a custom texture file to the player skin - * when the armor is worn. - */ -@Deprecated //See Item.getArmorTexture -public interface IArmorTextureProvider -{ - - /** - * This interface has to return the path to a file that is the same - * format as iron_1.png (or any of the other armor files). It will be - * applied to the player skin when the armor is worn. - */ - public String getArmorTextureFile(ItemStack itemstack); - -} - diff --git a/common/net/minecraftforge/common/ISpecialArmor.java b/common/net/minecraftforge/common/ISpecialArmor.java index 3ae2d6ac91..dc3c9aa363 100644 --- a/common/net/minecraftforge/common/ISpecialArmor.java +++ b/common/net/minecraftforge/common/ISpecialArmor.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.Arrays; import net.minecraft.util.DamageSource; -import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; @@ -39,7 +39,7 @@ public interface ISpecialArmor * @param slot The armor slot the item is in. * @return A ArmorProperties instance holding information about how the armor effects damage. */ - public ArmorProperties getProperties(EntityLiving player, ItemStack armor, DamageSource source, double damage, int slot); + public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot); /** * Get the displayed effective armor. @@ -63,7 +63,7 @@ public interface ISpecialArmor * @param damage The amount of damage being applied to the armor * @param slot The armor slot the item is in. */ - public abstract void damageArmor(EntityLiving entity, ItemStack stack, DamageSource source, int damage, int slot); + public abstract void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot); public static class ArmorProperties implements Comparable { @@ -90,7 +90,7 @@ public interface ISpecialArmor * @param damage The total damage being done * @return The left over damage that has not been absorbed by the armor */ - public static int ApplyArmor(EntityLiving entity, ItemStack[] inventory, DamageSource source, double damage) + public static float ApplyArmor(EntityLivingBase entity, ItemStack[] inventory, DamageSource source, double damage) { if (DEBUG) { @@ -167,13 +167,11 @@ public interface ISpecialArmor } damage -= (damage * ratio); } - damage += entity.carryoverDamage; if (DEBUG) { - System.out.println("Return: " + (int)(damage / 25D) + " " + damage); + System.out.println("Return: " + (int)(damage / 25.0F) + " " + damage); } - entity.carryoverDamage = (int)damage % 25; - return (int)(damage / 25D); + return (float)(damage / 25.0F); } /** diff --git a/common/net/minecraftforge/common/IThrowableEntity.java b/common/net/minecraftforge/common/IThrowableEntity.java deleted file mode 100644 index b4a0e5c1ae..0000000000 --- a/common/net/minecraftforge/common/IThrowableEntity.java +++ /dev/null @@ -1,23 +0,0 @@ -package net.minecraftforge.common; - -import net.minecraft.entity.Entity; - -/** - * This interface should be implemented by an Entity that can be 'thrown', like snowballs. - * This was created to mimic ModLoaderMP's 'owner' functionality. - */ -@Deprecated //Moved to FML cpw.mods.fml.common.registry.IThrowableEntity -public interface IThrowableEntity -{ - /** - * Gets the entity that threw/created this entity. - * @return The owner instance, Null if none. - */ - public Entity getThrower(); - - /** - * Sets the entity that threw/created this entity. - * @param entity The new thrower/creator. - */ - public void setThrower(Entity entity); -} diff --git a/common/net/minecraftforge/common/MinecraftForge.java b/common/net/minecraftforge/common/MinecraftForge.java index b07c957d4b..942df06c04 100644 --- a/common/net/minecraftforge/common/MinecraftForge.java +++ b/common/net/minecraftforge/common/MinecraftForge.java @@ -187,7 +187,9 @@ public class MinecraftForge Block filler = new Block(0, Material.air) { - @SideOnly(Side.CLIENT) public void func_94332_a(IconRegister register){} + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IconRegister register){} }; Block.blocksList[0] = null; Block.opaqueCubeLookup[0] = false; diff --git a/common/net/minecraftforge/common/RotationHelper.java b/common/net/minecraftforge/common/RotationHelper.java index daef3f75a7..9c306978f4 100644 --- a/common/net/minecraftforge/common/RotationHelper.java +++ b/common/net/minecraftforge/common/RotationHelper.java @@ -1,19 +1,82 @@ package net.minecraftforge.common; +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; import net.minecraft.block.Block; +import net.minecraft.block.BlockAnvil; +import net.minecraft.block.BlockBed; +import net.minecraft.block.BlockButton; import net.minecraft.block.BlockChest; +import net.minecraft.block.BlockCocoa; +import net.minecraft.block.BlockComparator; +import net.minecraft.block.BlockDetectorRail; import net.minecraft.block.BlockDispenser; -import net.minecraft.block.BlockDropper; +import net.minecraft.block.BlockDoor; +import net.minecraft.block.BlockEndPortalFrame; +import net.minecraft.block.BlockEnderChest; +import net.minecraft.block.BlockFenceGate; +import net.minecraft.block.BlockFurnace; +import net.minecraft.block.BlockHopper; +import net.minecraft.block.BlockLadder; +import net.minecraft.block.BlockLever; +import net.minecraft.block.BlockLog; +import net.minecraft.block.BlockMushroomCap; import net.minecraft.block.BlockPistonBase; +import net.minecraft.block.BlockPistonExtension; +import net.minecraft.block.BlockPumpkin; +import net.minecraft.block.BlockRail; +import net.minecraft.block.BlockRailPowered; +import net.minecraft.block.BlockRedstoneRepeater; +import net.minecraft.block.BlockSkull; +import net.minecraft.block.BlockStairs; +import net.minecraft.block.BlockTorch; +import net.minecraft.block.BlockTrapDoor; +import net.minecraft.block.BlockTripWireSource; +import net.minecraft.block.BlockVine; import net.minecraft.world.World; + +import java.util.HashMap; +import java.util.Map; + import static net.minecraftforge.common.ForgeDirection.*; public class RotationHelper { + /** + * Some blocks have the same rotation. + * The first of these blocks (sorted by itemID) should be listed as a type. + * Some of the types aren't actual blocks (helper types). + */ + private static enum BlockType { + LOG, + DISPENSER, + BED, + RAIL, + RAIL_POWERED, + RAIL_ASCENDING, + RAIL_CORNER, + TORCH, + STAIR, + CHEST, + SIGNPOST, + DOOR, + LEVER, + BUTTON, + REDSTONE_REPEATER, + TRAPDOOR, + MUSHROOM_CAP, + MUSHROOM_CAP_CORNER, + MUSHROOM_CAP_SIDE, + VINE, + SKULL, + ANVIL + } private static final ForgeDirection[] UP_DOWN_AXES = new ForgeDirection[] { UP, DOWN }; + private static final Map> MAPPINGS = new HashMap>(); + public static ForgeDirection[] getValidVanillaBlockRotations(Block block) { - return block instanceof BlockChest ? UP_DOWN_AXES : VALID_DIRECTIONS; + return (block instanceof BlockBed || block instanceof BlockPumpkin || block instanceof BlockFenceGate || block instanceof BlockEndPortalFrame || block instanceof BlockTripWireSource || block instanceof BlockCocoa || block instanceof BlockRailPowered || block instanceof BlockDetectorRail || block instanceof BlockStairs || block instanceof BlockChest || block instanceof BlockEnderChest || block instanceof BlockFurnace || block instanceof BlockLadder || block.blockID == Block.signWall.blockID || block.blockID == Block.signPost.blockID || block instanceof BlockDoor || block instanceof BlockRail || block instanceof BlockButton || block instanceof BlockRedstoneRepeater || block instanceof BlockComparator || block instanceof BlockTrapDoor || block instanceof BlockMushroomCap || block instanceof BlockVine || block instanceof BlockSkull || block instanceof BlockAnvil) ? UP_DOWN_AXES : VALID_DIRECTIONS; } public static boolean rotateVanillaBlock(Block block, World worldObj, int x, int y, int z, ForgeDirection axis) @@ -23,25 +86,323 @@ public class RotationHelper { return false; } - if (block instanceof BlockChest && (axis == UP || axis == DOWN)) + if (axis == UP || axis == DOWN) { - return rotateBlock(worldObj, x, y, z, axis, 0x7); + if (block instanceof BlockBed || block instanceof BlockPumpkin || block instanceof BlockFenceGate || block instanceof BlockEndPortalFrame || block instanceof BlockTripWireSource || block instanceof BlockCocoa) + { + return rotateBlock(worldObj, x, y, z, axis, 0x3, BlockType.BED); + } + if (block instanceof BlockRail) + { + return rotateBlock(worldObj, x, y, z, axis, 0xF, BlockType.RAIL); + } + if (block instanceof BlockRailPowered || block instanceof BlockDetectorRail) + { + return rotateBlock(worldObj, x, y, z, axis, 0x7, BlockType.RAIL_POWERED); + } + if (block instanceof BlockStairs) + { + return rotateBlock(worldObj, x, y, z, axis, 0x3, BlockType.STAIR); + } + if (block instanceof BlockChest || block instanceof BlockEnderChest || block instanceof BlockFurnace || block instanceof BlockLadder || block.blockID == Block.signWall.blockID) + { + return rotateBlock(worldObj, x, y, z, axis, 0x7, BlockType.CHEST); + } + if (block.blockID == Block.signPost.blockID) + { + return rotateBlock(worldObj, x, y, z, axis, 0xF, BlockType.SIGNPOST); + } + if (block instanceof BlockDoor) + { + return rotateBlock(worldObj, x, y, z, axis, 0x3, BlockType.DOOR); + } + if (block instanceof BlockButton) + { + return rotateBlock(worldObj, x, y, z, axis, 0x7, BlockType.BUTTON); + } + if (block instanceof BlockRedstoneRepeater || block instanceof BlockComparator) + { + return rotateBlock(worldObj, x, y, z, axis, 0x3, BlockType.REDSTONE_REPEATER); + } + if (block instanceof BlockTrapDoor) + { + return rotateBlock(worldObj, x, y, z, axis, 0x3, BlockType.TRAPDOOR); + } + if (block instanceof BlockMushroomCap) + { + return rotateBlock(worldObj, x, y, z, axis, 0xF, BlockType.MUSHROOM_CAP); + } + if (block instanceof BlockVine) + { + return rotateBlock(worldObj, x, y, z, axis, 0xF, BlockType.VINE); + } + if (block instanceof BlockSkull) + { + return rotateBlock(worldObj, x, y, z, axis, 0x7, BlockType.SKULL); + } + if (block instanceof BlockAnvil) + { + return rotateBlock(worldObj, x, y, z, axis, 0x1, BlockType.ANVIL); + } } - if (block instanceof BlockPistonBase || block instanceof BlockDropper || block instanceof BlockDispenser) + + if (block instanceof BlockLog) { - return rotateBlock(worldObj, x, y, z, axis, 0x7); + return rotateBlock(worldObj, x, y, z, axis, 0xC, BlockType.LOG); } + if (block instanceof BlockDispenser || block instanceof BlockPistonBase || block instanceof BlockPistonExtension || block instanceof BlockHopper) + { + return rotateBlock(worldObj, x, y, z, axis, 0x7, BlockType.DISPENSER); + } + if (block instanceof BlockTorch) + { + return rotateBlock(worldObj, x, y, z, axis, 0xF, BlockType.TORCH); + } + if (block instanceof BlockLever) + { + return rotateBlock(worldObj, x, y, z, axis, 0x7, BlockType.LEVER); + } + return false; } - private static boolean rotateBlock(World worldObj, int x, int y, int z, ForgeDirection axis, int mask) + private static boolean rotateBlock(World worldObj, int x, int y, int z, ForgeDirection axis, int mask, BlockType blockType) { int rotMeta = worldObj.getBlockMetadata(x, y, z); + if (blockType == BlockType.DOOR && (rotMeta & 0x8) == 0x8) + { + return false; + } int masked = rotMeta & ~mask; - ForgeDirection orientation = ForgeDirection.getOrientation(rotMeta & mask); - ForgeDirection rotated = orientation.getRotation(axis); - worldObj.setBlockMetadataWithNotify(x,y,z,rotated.ordinal() & mask | masked,3); + int meta = rotateMetadata(axis, blockType, rotMeta & mask); + if (meta == -1) + { + return false; + } + worldObj.setBlockMetadataWithNotify(x, y, z, meta & mask | masked, 3); return true; } + private static int rotateMetadata(ForgeDirection axis, BlockType blockType, int meta) + { + if (blockType == BlockType.RAIL || blockType == BlockType.RAIL_POWERED) + { + if (meta == 0x0 || meta == 0x1) + { + return ~meta & 0x1; + } + if (meta >= 0x2 && meta <= 0x5) + { + blockType = BlockType.RAIL_ASCENDING; + } + if (meta >= 0x6 && meta <= 0x9 && blockType == BlockType.RAIL) + { + blockType = BlockType.RAIL_CORNER; + } + } + if (blockType == BlockType.SIGNPOST) + { + return (axis == UP) ? (meta + 0x4) % 0x10 : (meta + 0xC) % 0x10; + } + if (blockType == BlockType.LEVER && (axis == UP || axis == DOWN)) + { + switch (meta) + { + case 0x5: + return 0x6; + case 0x6: + return 0x5; + case 0x7: + return 0x0; + case 0x0: + return 0x7; + } + } + if (blockType == BlockType.MUSHROOM_CAP) + { + if (meta % 0x2 == 0) + { + blockType = BlockType.MUSHROOM_CAP_SIDE; + } + else + { + blockType = BlockType.MUSHROOM_CAP_CORNER; + } + } + if (blockType == BlockType.VINE) + { + return ((meta << 1) | ((meta & 0x8) >> 3)); + } + + ForgeDirection orientation = metadataToDirection(blockType, meta); + ForgeDirection rotated = orientation.getRotation(axis); + return directionToMetadata(blockType, rotated); + } + + private static ForgeDirection metadataToDirection(BlockType blockType, int meta) + { + if (blockType == BlockType.LEVER) + { + if (meta == 0x6) + { + meta = 0x5; + } + else if (meta == 0x0) + { + meta = 0x7; + } + } + + if (MAPPINGS.containsKey(blockType)) + { + BiMap biMap = MAPPINGS.get(blockType); + if (biMap.containsKey(meta)) + { + return biMap.get(meta); + } + } + + if (blockType == BlockType.TORCH) + { + return ForgeDirection.getOrientation(6 - meta); + } + if (blockType == BlockType.STAIR) + { + return ForgeDirection.getOrientation(5 - meta); + } + if (blockType == BlockType.CHEST || blockType == BlockType.DISPENSER || blockType == BlockType.SKULL) + { + return ForgeDirection.getOrientation(meta); + } + if (blockType == BlockType.BUTTON) + { + return ForgeDirection.getOrientation(6 - meta); + } + if (blockType == BlockType.TRAPDOOR) + { + return ForgeDirection.getOrientation(meta + 2).getOpposite(); + } + + return ForgeDirection.UNKNOWN; + } + + private static int directionToMetadata(BlockType blockType, ForgeDirection direction) + { + if ((blockType == BlockType.LOG || blockType == BlockType.ANVIL) && (direction.offsetX + direction.offsetY + direction.offsetZ) < 0) + { + direction = direction.getOpposite(); + } + + if (MAPPINGS.containsKey(blockType)) + { + BiMap biMap = MAPPINGS.get(blockType).inverse(); + if (biMap.containsKey(direction)) + { + return biMap.get(direction); + } + } + + if (blockType == BlockType.TORCH) + { + if (direction.ordinal() >= 1) + { + return 6 - direction.ordinal(); + } + } + if (blockType == BlockType.STAIR) + { + return 5 - direction.ordinal(); + } + if (blockType == BlockType.CHEST || blockType == BlockType.DISPENSER || blockType == BlockType.SKULL) + { + return direction.ordinal(); + } + if (blockType == BlockType.BUTTON) + { + if (direction.ordinal() >= 2) + { + return 6 - direction.ordinal(); + } + } + if (blockType == BlockType.TRAPDOOR) + { + return direction.getOpposite().ordinal() - 2; + } + + return -1; + } + + static + { + BiMap biMap; + + biMap = HashBiMap.create(3); + biMap.put(0x0, UP); + biMap.put(0x4, EAST); + biMap.put(0x8, SOUTH); + MAPPINGS.put(BlockType.LOG, biMap); + + biMap = HashBiMap.create(4); + biMap.put(0x0, SOUTH); + biMap.put(0x1, WEST); + biMap.put(0x2, NORTH); + biMap.put(0x3, EAST); + MAPPINGS.put(BlockType.BED, biMap); + + biMap = HashBiMap.create(4); + biMap.put(0x2, EAST); + biMap.put(0x3, WEST); + biMap.put(0x4, NORTH); + biMap.put(0x5, SOUTH); + MAPPINGS.put(BlockType.RAIL_ASCENDING, biMap); + + biMap = HashBiMap.create(4); + biMap.put(0x6, WEST); + biMap.put(0x7, NORTH); + biMap.put(0x8, EAST); + biMap.put(0x9, SOUTH); + MAPPINGS.put(BlockType.RAIL_CORNER, biMap); + + biMap = HashBiMap.create(6); + biMap.put(0x1, EAST); + biMap.put(0x2, WEST); + biMap.put(0x3, SOUTH); + biMap.put(0x4, NORTH); + biMap.put(0x5, UP); + biMap.put(0x7, DOWN); + MAPPINGS.put(BlockType.LEVER, biMap); + + biMap = HashBiMap.create(4); + biMap.put(0x0, WEST); + biMap.put(0x1, NORTH); + biMap.put(0x2, EAST); + biMap.put(0x3, SOUTH); + MAPPINGS.put(BlockType.DOOR, biMap); + + biMap = HashBiMap.create(4); + biMap.put(0x0, NORTH); + biMap.put(0x1, EAST); + biMap.put(0x2, SOUTH); + biMap.put(0x3, WEST); + MAPPINGS.put(BlockType.REDSTONE_REPEATER, biMap); + + biMap = HashBiMap.create(4); + biMap.put(0x1, EAST); + biMap.put(0x3, SOUTH); + biMap.put(0x7, NORTH); + biMap.put(0x9, WEST); + MAPPINGS.put(BlockType.MUSHROOM_CAP_CORNER, biMap); + + biMap = HashBiMap.create(4); + biMap.put(0x2, NORTH); + biMap.put(0x4, WEST); + biMap.put(0x6, EAST); + biMap.put(0x8, SOUTH); + MAPPINGS.put(BlockType.MUSHROOM_CAP_SIDE, biMap); + + biMap = HashBiMap.create(2); + biMap.put(0x0, SOUTH); + biMap.put(0x1, EAST); + MAPPINGS.put(BlockType.ANVIL, biMap); + } } diff --git a/common/net/minecraftforge/event/ASMEventHandler.java b/common/net/minecraftforge/event/ASMEventHandler.java index fdddb3993e..a9af9d3290 100644 --- a/common/net/minecraftforge/event/ASMEventHandler.java +++ b/common/net/minecraftforge/event/ASMEventHandler.java @@ -3,12 +3,15 @@ package net.minecraftforge.event; import static org.objectweb.asm.Opcodes.*; import java.lang.reflect.Method; +import java.util.HashMap; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Type; +import com.google.common.collect.Maps; + public class ASMEventHandler implements IEventListener { @@ -16,6 +19,7 @@ public class ASMEventHandler implements IEventListener private static final String HANDLER_DESC = Type.getInternalName(IEventListener.class); private static final String HANDLER_FUNC_DESC = Type.getMethodDescriptor(IEventListener.class.getDeclaredMethods()[0]); private static final ASMClassLoader LOADER = new ASMClassLoader(); + private static final HashMap> cache = Maps.newHashMap(); private final IEventListener handler; private final ForgeSubscribe subInfo; @@ -44,6 +48,11 @@ public class ASMEventHandler implements IEventListener public Class createWrapper(Method callback) { + if (cache.containsKey(callback)) + { + return cache.get(callback); + } + ClassWriter cw = new ClassWriter(0); MethodVisitor mv; @@ -92,7 +101,9 @@ public class ASMEventHandler implements IEventListener mv.visitEnd(); } cw.visitEnd(); - return LOADER.define(name, cw.toByteArray()); + Class ret = LOADER.define(name, cw.toByteArray()); + cache.put(callback, ret); + return ret; } private String getUniqueName(Method callback) diff --git a/common/net/minecraftforge/event/EventBus.java b/common/net/minecraftforge/event/EventBus.java index cce20e92fe..3fe149c44e 100644 --- a/common/net/minecraftforge/event/EventBus.java +++ b/common/net/minecraftforge/event/EventBus.java @@ -24,6 +24,11 @@ public class EventBus public void register(Object target) { + if (listeners.containsKey(target)) + { + return; + } + Set> supers = TypeToken.of(target.getClass()).getTypes().rawTypes(); for (Method method : target.getClass().getMethods()) { diff --git a/common/net/minecraftforge/event/ServerChatEvent.java b/common/net/minecraftforge/event/ServerChatEvent.java index 0d7f6aaf7c..9d50a14968 100644 --- a/common/net/minecraftforge/event/ServerChatEvent.java +++ b/common/net/minecraftforge/event/ServerChatEvent.java @@ -1,19 +1,20 @@ package net.minecraftforge.event; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.util.ChatMessageComponent; @Cancelable public class ServerChatEvent extends Event { public final String message, username; public final EntityPlayerMP player; - public String line; - public ServerChatEvent(EntityPlayerMP player, String message, String line) + public ChatMessageComponent component; + public ServerChatEvent(EntityPlayerMP player, String message, ChatMessageComponent component) { super(); this.message = message; this.player = player; this.username = player.username; - this.line = line; + this.component = component; } } diff --git a/common/net/minecraftforge/event/entity/living/EnderTeleportEvent.java b/common/net/minecraftforge/event/entity/living/EnderTeleportEvent.java index b556e75465..b90725e0d2 100644 --- a/common/net/minecraftforge/event/entity/living/EnderTeleportEvent.java +++ b/common/net/minecraftforge/event/entity/living/EnderTeleportEvent.java @@ -1,6 +1,7 @@ package net.minecraftforge.event.entity.living; import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Event; @@ -16,9 +17,9 @@ public class EnderTeleportEvent extends LivingEvent public double targetX; public double targetY; public double targetZ; - public int attackDamage; + public float attackDamage; - public EnderTeleportEvent(EntityLiving entity, double targetX, double targetY, double targetZ, int attackDamage) + public EnderTeleportEvent(EntityLivingBase entity, double targetX, double targetY, double targetZ, float attackDamage) { super(entity); this.targetX = targetX; diff --git a/common/net/minecraftforge/event/entity/living/LivingAttackEvent.java b/common/net/minecraftforge/event/entity/living/LivingAttackEvent.java index e8ddbce35c..2b1567b328 100644 --- a/common/net/minecraftforge/event/entity/living/LivingAttackEvent.java +++ b/common/net/minecraftforge/event/entity/living/LivingAttackEvent.java @@ -1,15 +1,15 @@ package net.minecraftforge.event.entity.living; import net.minecraft.util.DamageSource; -import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraftforge.event.Cancelable; @Cancelable public class LivingAttackEvent extends LivingEvent { public final DamageSource source; - public final int ammount; - public LivingAttackEvent(EntityLiving entity, DamageSource source, int ammount) + public final float ammount; + public LivingAttackEvent(EntityLivingBase entity, DamageSource source, float ammount) { super(entity); this.source = source; diff --git a/common/net/minecraftforge/event/entity/living/LivingDeathEvent.java b/common/net/minecraftforge/event/entity/living/LivingDeathEvent.java index ad7899347a..709380c461 100644 --- a/common/net/minecraftforge/event/entity/living/LivingDeathEvent.java +++ b/common/net/minecraftforge/event/entity/living/LivingDeathEvent.java @@ -1,14 +1,14 @@ package net.minecraftforge.event.entity.living; import net.minecraft.util.DamageSource; -import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraftforge.event.Cancelable; @Cancelable public class LivingDeathEvent extends LivingEvent { public final DamageSource source; - public LivingDeathEvent(EntityLiving entity, DamageSource source) + public LivingDeathEvent(EntityLivingBase entity, DamageSource source) { super(entity); this.source = source; diff --git a/common/net/minecraftforge/event/entity/living/LivingDropsEvent.java b/common/net/minecraftforge/event/entity/living/LivingDropsEvent.java index 445501df09..0de2175e35 100644 --- a/common/net/minecraftforge/event/entity/living/LivingDropsEvent.java +++ b/common/net/minecraftforge/event/entity/living/LivingDropsEvent.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import net.minecraft.util.DamageSource; import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraftforge.event.Cancelable; @Cancelable @@ -16,7 +16,7 @@ public class LivingDropsEvent extends LivingEvent public final boolean recentlyHit; public final int specialDropValue; - public LivingDropsEvent(EntityLiving entity, DamageSource source, ArrayList drops, int lootingLevel, boolean recentlyHit, int specialDropValue) + public LivingDropsEvent(EntityLivingBase entity, DamageSource source, ArrayList drops, int lootingLevel, boolean recentlyHit, int specialDropValue) { super(entity); this.source = source; diff --git a/common/net/minecraftforge/event/entity/living/LivingEvent.java b/common/net/minecraftforge/event/entity/living/LivingEvent.java index a3f6519d86..971cd06429 100644 --- a/common/net/minecraftforge/event/entity/living/LivingEvent.java +++ b/common/net/minecraftforge/event/entity/living/LivingEvent.java @@ -1,13 +1,13 @@ package net.minecraftforge.event.entity.living; -import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.entity.EntityEvent; public class LivingEvent extends EntityEvent { - public final EntityLiving entityLiving; - public LivingEvent(EntityLiving entity) + public final EntityLivingBase entityLiving; + public LivingEvent(EntityLivingBase entity) { super(entity); entityLiving = entity; @@ -16,11 +16,11 @@ public class LivingEvent extends EntityEvent @Cancelable public static class LivingUpdateEvent extends LivingEvent { - public LivingUpdateEvent(EntityLiving e){ super(e); } + public LivingUpdateEvent(EntityLivingBase e){ super(e); } } public static class LivingJumpEvent extends LivingEvent { - public LivingJumpEvent(EntityLiving e){ super(e); } + public LivingJumpEvent(EntityLivingBase e){ super(e); } } } diff --git a/common/net/minecraftforge/event/entity/living/LivingFallEvent.java b/common/net/minecraftforge/event/entity/living/LivingFallEvent.java index 64363198a2..4c32b7acf5 100644 --- a/common/net/minecraftforge/event/entity/living/LivingFallEvent.java +++ b/common/net/minecraftforge/event/entity/living/LivingFallEvent.java @@ -1,13 +1,13 @@ package net.minecraftforge.event.entity.living; -import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraftforge.event.Cancelable; @Cancelable public class LivingFallEvent extends LivingEvent { public float distance; - public LivingFallEvent(EntityLiving entity, float distance) + public LivingFallEvent(EntityLivingBase entity, float distance) { super(entity); this.distance = distance; diff --git a/common/net/minecraftforge/event/entity/living/LivingHurtEvent.java b/common/net/minecraftforge/event/entity/living/LivingHurtEvent.java index 7afcaea1cc..2437231159 100644 --- a/common/net/minecraftforge/event/entity/living/LivingHurtEvent.java +++ b/common/net/minecraftforge/event/entity/living/LivingHurtEvent.java @@ -1,15 +1,15 @@ package net.minecraftforge.event.entity.living; import net.minecraft.util.DamageSource; -import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraftforge.event.Cancelable; @Cancelable public class LivingHurtEvent extends LivingEvent { public final DamageSource source; - public int ammount; - public LivingHurtEvent(EntityLiving entity, DamageSource source, int ammount) + public float ammount; + public LivingHurtEvent(EntityLivingBase entity, DamageSource source, float ammount) { super(entity); this.source = source; diff --git a/common/net/minecraftforge/event/entity/living/LivingSetAttackTargetEvent.java b/common/net/minecraftforge/event/entity/living/LivingSetAttackTargetEvent.java index 6a5b734ad5..efff5ec2ff 100644 --- a/common/net/minecraftforge/event/entity/living/LivingSetAttackTargetEvent.java +++ b/common/net/minecraftforge/event/entity/living/LivingSetAttackTargetEvent.java @@ -1,12 +1,12 @@ package net.minecraftforge.event.entity.living; -import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; public class LivingSetAttackTargetEvent extends LivingEvent { - public final EntityLiving target; - public LivingSetAttackTargetEvent(EntityLiving entity, EntityLiving target) + public final EntityLivingBase target; + public LivingSetAttackTargetEvent(EntityLivingBase entity, EntityLivingBase target) { super(entity); this.target = target; diff --git a/common/net/minecraftforge/liquids/LiquidStack.java b/common/net/minecraftforge/liquids/LiquidStack.java index a52a9b36f5..c641c6cfd6 100644 --- a/common/net/minecraftforge/liquids/LiquidStack.java +++ b/common/net/minecraftforge/liquids/LiquidStack.java @@ -66,17 +66,6 @@ public class LiquidStack return nbt; } - - /** - * NO-OP now. Use {@link #loadLiquidStackFromNBT(NBTTagCompound)} to get a new instance - * - * @param nbt - */ - @Deprecated - public void readFromNBT(NBTTagCompound nbt) - { - } - /** * @return A copy of this LiquidStack */ diff --git a/common/net/minecraftforge/transformers/EventTransformer.java b/common/net/minecraftforge/transformers/EventTransformer.java index 149f30df2b..d3f8b34b1c 100644 --- a/common/net/minecraftforge/transformers/EventTransformer.java +++ b/common/net/minecraftforge/transformers/EventTransformer.java @@ -2,6 +2,7 @@ package net.minecraftforge.transformers; import java.util.List; +import net.minecraft.launchwrapper.IClassTransformer; import net.minecraftforge.event.Event; import net.minecraftforge.event.ListenerList; @@ -11,8 +12,6 @@ import static org.objectweb.asm.Opcodes.*; import static org.objectweb.asm.Type.*; import static org.objectweb.asm.ClassWriter.*; -import cpw.mods.fml.relauncher.IClassTransformer; - public class EventTransformer implements IClassTransformer { public EventTransformer() diff --git a/eclipse-workspace-dev.zip b/eclipse-workspace-dev.zip index 3567dfea5b..38cd5269f2 100644 Binary files a/eclipse-workspace-dev.zip and b/eclipse-workspace-dev.zip differ diff --git a/fml b/fml index edc1fb24e2..54e06e841d 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit edc1fb24e2cad9badd2dd18ccccd590d77156e18 +Subproject commit 54e06e841d1c8df24fc30e1ec3a51def67f58858 diff --git a/install/install.py b/install/install.py index eecd55c7e6..aac857fdcd 100644 --- a/install/install.py +++ b/install/install.py @@ -4,30 +4,37 @@ import shutil, glob, fnmatch import subprocess, logging from optparse import OptionParser -forge_dir = os.path.dirname(os.path.abspath(__file__)) -fml_dir = os.path.join(forge_dir, 'fml') - -sys.path.append(fml_dir) -from forge import apply_forge_patches -from fml import setup_fml, finish_setup_fml, apply_fml_patches, setup_mcp, reset_logger - -def main(mcp_dir): - src_dir = os.path.join(mcp_dir, 'src') - +def fml_main(fml_dir, mcp_dir, gen_conf=True, disable_patches=False, disable_at=False, disable_merge=False, enable_server=False, + disable_client=False, disable_rename=False, disable_assets=False, decompile=False): + sys.path.append(fml_dir) + from fml import download_mcp, setup_mcp, decompile_minecraft, apply_fml_patches, finish_setup_fml print '================ Forge ModLoader Setup Start ===================' - setup_mcp(fml_dir, mcp_dir, True) - setup_fml(fml_dir, mcp_dir) - apply_fml_patches(fml_dir, mcp_dir, os.path.join(mcp_dir, 'src')) - finish_setup_fml(fml_dir, mcp_dir) + download_mcp(fml_dir, mcp_dir) + setup_mcp(fml_dir, mcp_dir, gen_conf) + if decompile: + decompile_minecraft(fml_dir, mcp_dir, disable_at=disable_at, disable_merge=disable_merge, + enable_server=enable_server, disable_client=disable_client, + disable_assets=disable_assets) + if disable_patches: + print 'Patching disabled' + else: + apply_fml_patches(fml_dir, mcp_dir, os.path.join(mcp_dir, 'src')) + finish_setup_fml(fml_dir, mcp_dir, enable_server=enable_server, disable_client=disable_client, disable_rename=disable_rename) + else: + print 'Decompile free install is on the to-do!' print '================ Forge ModLoader Setup End ===================' - - sys.path.append(mcp_dir) + +def forge_main(forge_dir, fml_dir, mcp_dir): + sys.path.append(mcp_dir) + sys.path.append(fml_dir) from runtime.updatenames import updatenames from runtime.updatemd5 import updatemd5 + from forge import apply_forge_patches + from fml import reset_logger print '=============================== Minecraft Forge Setup Start =====================================' print 'Applying forge patches' - apply_forge_patches(os.path.join(forge_dir, 'fml'), mcp_dir, forge_dir, src_dir, True) + apply_forge_patches(fml_dir, mcp_dir, forge_dir, os.path.join(mcp_dir, 'src'), True) os.chdir(mcp_dir) updatenames(None, True, True, False) reset_logger() @@ -35,15 +42,37 @@ def main(mcp_dir): reset_logger() os.chdir(forge_dir) print '=============================== Minecraft Forge Setup Finished =================================' - + if __name__ == '__main__': parser = OptionParser() - parser.add_option('-m', '--mcp-dir', action='store', dest='mcp_dir', help='Path to download/extract MCP to', default=None) + parser.add_option('-m', '--mcp-dir', action='store', dest='mcp_dir', help='Path to download/extract MCP to', default=None ) + parser.add_option('-p', '--no-patch', action="store_true", dest='no_patch', help='Disable application of FML patches', default=False) + parser.add_option('-a', '--no-access', action="store_true", dest='no_access', help='Disable access transformers', default=False) + parser.add_option('-s', '--server', action="store_true", dest='enable_server', help='Enable decompilation of server', default=False) + parser.add_option('-c', '--no-client', action="store_true", dest='no_client', help='Disable decompilation of server', default=False) + parser.add_option('-e', '--no-merge', action="store_true", dest='no_merge', help='Disable merging server code into client', default=False) + parser.add_option('-n', '--no-rename', action="store_true", dest='no_rename', help='Disable running updatenames', default=False) + parser.add_option( '--no-assets', action="store_true", dest='no_assets', help='Disable downloading of assets folder', default=False) + parser.add_option('-d', '--decompile', action="store_true", dest='decompile', help='Decompile minecraft and apply patches', default=True) options, _ = parser.parse_args() + + forge_dir = os.path.dirname(os.path.abspath(__file__)) + fml_dir = os.path.abspath('fml') + mcp_dir = os.path.abspath('mcp') if not options.mcp_dir is None: - main(os.path.abspath(options.mcp_dir)) - elif os.path.isfile(os.path.join('..', 'runtime', 'commands.py')): - main(os.path.abspath('..')) - else: - main(os.path.abspath('mcp')) + mcp_dir = os.path.abspath(options.mcp_dir) + + if options.no_client: + options.no_patch = True + + if options.no_merge: + options.no_patch = True + + fml_main(fml_dir, mcp_dir, disable_patches=options.no_patch, + disable_at=options.no_access, disable_merge=options.no_merge, + enable_server=options.enable_server, disable_client=options.no_client, + disable_rename=options.no_rename, disable_assets=options.no_assets, + decompile=options.decompile, gen_conf=False) + + forge_main(forge_dir, fml_dir, mcp_dir) \ No newline at end of file diff --git a/patches/minecraft/net/minecraft/block/Block.java.patch b/patches/minecraft/net/minecraft/block/Block.java.patch index a251863240..0e43329d89 100644 --- a/patches/minecraft/net/minecraft/block/Block.java.patch +++ b/patches/minecraft/net/minecraft/block/Block.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/block/Block.java +++ ../src_work/minecraft/net/minecraft/block/Block.java -@@ -1,15 +1,20 @@ +@@ -1,15 +1,22 @@ package net.minecraft.block; -import cpw.mods.fml.relauncher.Side; @@ -18,12 +18,14 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; - import net.minecraft.entity.EntityLiving; + import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.EnumCreatureType; ++import net.minecraft.entity.boss.EntityDragon; ++import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.player.EntityPlayer; -@@ -26,8 +31,10 @@ +@@ -26,8 +33,10 @@ import net.minecraft.item.ItemSnow; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; @@ -34,7 +36,7 @@ import net.minecraft.util.Icon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; -@@ -35,9 +42,19 @@ +@@ -35,9 +44,19 @@ import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -54,7 +56,7 @@ /** * used as foreach item, if item.tab = current tab, display it on the screen */ -@@ -454,9 +471,10 @@ +@@ -460,9 +479,10 @@ return this.needsRandomTick; } @@ -66,7 +68,7 @@ } /** -@@ -479,7 +497,7 @@ +@@ -485,7 +505,7 @@ */ public float getBlockBrightness(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { @@ -75,7 +77,7 @@ } @SideOnly(Side.CLIENT) -@@ -489,7 +507,7 @@ +@@ -495,7 +515,7 @@ */ public int getMixedBrightnessForBlock(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { @@ -84,7 +86,7 @@ } @SideOnly(Side.CLIENT) -@@ -639,7 +657,13 @@ +@@ -645,7 +665,13 @@ /** * ejects contained items into the world, and notifies neighbours of an update, as appropriate */ @@ -99,7 +101,7 @@ /** * Returns the quantity of items to drop on block destruction. -@@ -664,7 +688,7 @@ +@@ -670,7 +696,7 @@ public float getPlayerRelativeBlockHardness(EntityPlayer par1EntityPlayer, World par2World, int par3, int par4, int par5) { float f = this.getBlockHardness(par2World, par3, par4, par5); @@ -108,7 +110,7 @@ } /** -@@ -682,18 +706,13 @@ +@@ -688,18 +714,13 @@ { if (!par1World.isRemote) { @@ -131,7 +133,7 @@ } } } -@@ -926,7 +945,8 @@ +@@ -932,7 +953,8 @@ public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { int l = par1World.getBlockId(par2, par3, par4); @@ -141,7 +143,7 @@ } /** -@@ -1086,7 +1106,7 @@ +@@ -1092,7 +1114,7 @@ par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1); par2EntityPlayer.addExhaustion(0.025F); @@ -150,7 +152,7 @@ { ItemStack itemstack = this.createStackedBlock(par6); -@@ -1102,12 +1122,13 @@ +@@ -1108,12 +1130,13 @@ } } @@ -165,7 +167,7 @@ } /** -@@ -1443,4 +1464,944 @@ +@@ -1453,4 +1476,952 @@ canBlockGrass[0] = true; StatList.initBreakableStats(); } @@ -197,9 +199,10 @@ + * @param x X Position + * @param y Y position + * @param z Z position ++ * @param entity The entity trying to use the ladder, CAN be null. + * @return True if the block should act like a ladder + */ -+ public boolean isLadder(World world, int x, int y, int z) ++ public boolean isLadder(World world, int x, int y, int z, EntityLivingBase entity) + { + return false; + } @@ -569,7 +572,7 @@ + * @param player The player or camera entity, null in some cases. + * @return True to treat this as a bed + */ -+ public boolean isBed(World world, int x, int y, int z, EntityLiving player) ++ public boolean isBed(World world, int x, int y, int z, EntityLivingBase player) + { + return blockID == Block.bed.blockID; + } @@ -1005,8 +1008,7 @@ + } + + /** -+ * Determines if this block is destroyed when a ender dragon tries to fly through it. -+ * The block will be set to 0, nothing will drop. ++ * Determines if this block is can be destroyed by the specified entities normal behavior. + * + * @param world The current world + * @param x X Position @@ -1014,6 +1016,20 @@ + * @param z Z position + * @return True to allow the ender dragon to destroy this block + */ ++ public boolean canEntityDestroy(World world, int x, int y, int z, Entity entity) ++ { ++ if (entity instanceof EntityWither) ++ { ++ return blockID != Block.bedrock.blockID && blockID != Block.endPortal.blockID && blockID != Block.endPortalFrame.blockID; ++ } ++ else if (entity instanceof EntityDragon) ++ { ++ return canDragonDestroy(world, x, y, z); ++ } ++ ++ return true; ++ } ++ @Deprecated + public boolean canDragonDestroy(World world, int x, int y, int z) + { + return blockID != obsidian.blockID && blockID != whiteStone.blockID && blockID != bedrock.blockID; @@ -1078,12 +1094,6 @@ + */ + public float getEnchantPowerBonus(World world, int x, int y, int z) + { -+ return getEnchantPower(world, x, y, z); -+ } -+ -+ @Deprecated //Changed return to float, see above. -+ public int getEnchantPower(World world, int x, int y, int z) -+ { + return blockID == bookShelf.blockID ? 1 : 0; + } + /** diff --git a/patches/minecraft/net/minecraft/block/BlockBaseRailLogic.java.patch b/patches/minecraft/net/minecraft/block/BlockBaseRailLogic.java.patch index 1d35f6eb31..47b610cc1c 100644 --- a/patches/minecraft/net/minecraft/block/BlockBaseRailLogic.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockBaseRailLogic.java.patch @@ -8,12 +8,12 @@ + final BlockRailBase theRail; - public BlockBaseRailLogic(BlockRailBase par1, World par2, int par3, int par4, int par5) + public BlockBaseRailLogic(BlockRailBase par1BlockRailBase, World par2World, int par3, int par4, int par5) @@ -27,17 +29,11 @@ this.railY = par4; this.railZ = par5; - int l = par2.getBlockId(par3, par4, par5); -- int i1 = par2.getBlockMetadata(par3, par4, par5); + int l = par2World.getBlockId(par3, par4, par5); +- int i1 = par2World.getBlockMetadata(par3, par4, par5); - - if (((BlockRailBase)Block.blocksList[l]).isPowered) - { @@ -26,9 +26,9 @@ - } + + BlockRailBase target = (BlockRailBase)Block.blocksList[l]; -+ int i1 = target.getBasicRailMetadata(par2, null, par3, par4, par5); -+ isStraightRail = !target.isFlexibleRail(par2, par3, par4, par5); -+ canMakeSlopes = target.canMakeSlopes(par2, par3, par4, par5); ++ int i1 = target.getBasicRailMetadata(par2World, null, par3, par4, par5); ++ isStraightRail = !target.isFlexibleRail(par2World, par3, par4, par5); ++ canMakeSlopes = target.canMakeSlopes(par2World, par3, par4, par5); this.setBasicRail(i1); } diff --git a/patches/minecraft/net/minecraft/block/BlockCactus.java.patch b/patches/minecraft/net/minecraft/block/BlockCactus.java.patch index 796e19d2a1..73060e10fd 100644 --- a/patches/minecraft/net/minecraft/block/BlockCactus.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockCactus.java.patch @@ -23,8 +23,8 @@ } @@ -182,4 +186,22 @@ - this.cactusTopIcon = par1IconRegister.registerIcon("cactus_top"); - this.cactusBottomIcon = par1IconRegister.registerIcon("cactus_bottom"); + this.cactusTopIcon = par1IconRegister.registerIcon(this.func_111023_E() + "_top"); + this.cactusBottomIcon = par1IconRegister.registerIcon(this.func_111023_E() + "_bottom"); } + + @Override diff --git a/patches/minecraft/net/minecraft/block/BlockCocoa.java.patch b/patches/minecraft/net/minecraft/block/BlockCocoa.java.patch index 17513fe7d8..a1587d8dce 100644 --- a/patches/minecraft/net/minecraft/block/BlockCocoa.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockCocoa.java.patch @@ -9,7 +9,7 @@ import java.util.Random; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; -@@ -202,7 +204,14 @@ +@@ -201,7 +203,14 @@ */ public void dropBlockAsItemWithChance(World par1World, int par2, int par3, int par4, int par5, float par6, int par7) { @@ -25,7 +25,7 @@ byte b0 = 1; if (j1 >= 2) -@@ -212,8 +221,9 @@ +@@ -211,8 +220,9 @@ for (int k1 = 0; k1 < b0; ++k1) { @@ -37,8 +37,8 @@ } @SideOnly(Side.CLIENT) -@@ -249,4 +259,10 @@ - this.iconArray[i] = par1IconRegister.registerIcon(cocoaIcons[i]); +@@ -248,4 +258,10 @@ + this.iconArray[i] = par1IconRegister.registerIcon(this.func_111023_E() + "_stage_" + i); } } + diff --git a/patches/minecraft/net/minecraft/block/BlockDoor.java.patch b/patches/minecraft/net/minecraft/block/BlockDoor.java.patch index 6e354d3c4e..8c2b8006e4 100644 --- a/patches/minecraft/net/minecraft/block/BlockDoor.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockDoor.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/block/BlockDoor.java +++ ../src_work/minecraft/net/minecraft/block/BlockDoor.java -@@ -303,7 +303,7 @@ +@@ -290,7 +290,7 @@ { if (this.blockMaterial == Material.iron) { diff --git a/patches/minecraft/net/minecraft/block/BlockFire.java.patch b/patches/minecraft/net/minecraft/block/BlockFire.java.patch index 303b28458d..dceb641c7d 100644 --- a/patches/minecraft/net/minecraft/block/BlockFire.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockFire.java.patch @@ -19,7 +19,7 @@ this.setBurnRate(Block.planks.blockID, 5, 20); this.setBurnRate(Block.woodDoubleSlab.blockID, 5, 20); this.setBurnRate(Block.woodSingleSlab.blockID, 5, 20); -@@ -60,8 +65,7 @@ +@@ -62,8 +67,7 @@ */ private void setBurnRate(int par1, int par2, int par3) { @@ -29,7 +29,7 @@ } /** -@@ -121,12 +125,8 @@ +@@ -123,12 +127,8 @@ { if (par1World.getGameRules().getGameRuleBooleanValue("doFireTick")) { @@ -44,7 +44,7 @@ if (!this.canPlaceBlockAt(par1World, par2, par3, par4)) { -@@ -155,7 +155,7 @@ +@@ -157,7 +157,7 @@ par1World.setBlockToAir(par2, par3, par4); } } @@ -53,7 +53,7 @@ { par1World.setBlockToAir(par2, par3, par4); } -@@ -169,12 +169,12 @@ +@@ -171,12 +171,12 @@ b0 = -50; } @@ -72,7 +72,7 @@ for (int i1 = par2 - 1; i1 <= par2 + 1; ++i1) { -@@ -228,9 +228,20 @@ +@@ -230,9 +230,20 @@ return false; } @@ -94,7 +94,7 @@ if (par6Random.nextInt(par5) < j1) { -@@ -264,7 +275,12 @@ +@@ -266,7 +277,12 @@ */ private boolean canNeighborBurn(World par1World, int par2, int par3, int par4) { @@ -108,7 +108,7 @@ } /** -@@ -280,12 +296,12 @@ +@@ -282,12 +298,12 @@ } else { @@ -127,7 +127,7 @@ return l; } } -@@ -300,21 +316,24 @@ +@@ -302,21 +318,24 @@ /** * Checks the specified block coordinate to see if it can catch fire. Args: blockAccess, x, y, z @@ -157,7 +157,7 @@ } /** -@@ -372,9 +391,9 @@ +@@ -374,9 +393,9 @@ float f1; float f2; @@ -170,7 +170,7 @@ { for (l = 0; l < 2; ++l) { -@@ -385,7 +404,7 @@ +@@ -387,7 +406,7 @@ } } @@ -179,7 +179,7 @@ { for (l = 0; l < 2; ++l) { -@@ -396,7 +415,7 @@ +@@ -398,7 +417,7 @@ } } @@ -188,7 +188,7 @@ { for (l = 0; l < 2; ++l) { -@@ -407,7 +426,7 @@ +@@ -409,7 +428,7 @@ } } @@ -197,7 +197,7 @@ { for (l = 0; l < 2; ++l) { -@@ -418,7 +437,7 @@ +@@ -420,7 +439,7 @@ } } @@ -206,7 +206,7 @@ { for (l = 0; l < 2; ++l) { -@@ -467,4 +486,46 @@ +@@ -469,4 +488,46 @@ { return this.iconArray[0]; } diff --git a/patches/minecraft/net/minecraft/block/BlockLadder.java.patch b/patches/minecraft/net/minecraft/block/BlockLadder.java.patch index 30a35a1f32..e5ee3915c5 100644 --- a/patches/minecraft/net/minecraft/block/BlockLadder.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockLadder.java.patch @@ -1,6 +1,10 @@ --- ../src_base/minecraft/net/minecraft/block/BlockLadder.java +++ ../src_work/minecraft/net/minecraft/block/BlockLadder.java -@@ -8,6 +8,9 @@ +@@ -5,9 +5,13 @@ + import java.util.Random; + import net.minecraft.block.material.Material; + import net.minecraft.creativetab.CreativeTabs; ++import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -10,7 +14,7 @@ public class BlockLadder extends Block { -@@ -104,7 +107,10 @@ +@@ -104,7 +108,10 @@ */ public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { @@ -22,7 +26,7 @@ } /** -@@ -114,22 +120,22 @@ +@@ -114,22 +121,22 @@ { int j1 = par9; @@ -49,7 +53,7 @@ { j1 = 5; } -@@ -146,22 +152,22 @@ +@@ -146,22 +153,22 @@ int i1 = par1World.getBlockMetadata(par2, par3, par4); boolean flag = false; @@ -76,13 +80,13 @@ { flag = true; } -@@ -182,4 +188,10 @@ +@@ -182,4 +189,10 @@ { return 1; } + + @Override -+ public boolean isLadder(World world, int x, int y, int z) ++ public boolean isLadder(World world, int x, int y, int z, EntityLivingBase entity) + { + return true; + } diff --git a/patches/minecraft/net/minecraft/block/BlockLeaves.java.patch b/patches/minecraft/net/minecraft/block/BlockLeaves.java.patch index 96faee9f8a..5c3dc0c105 100644 --- a/patches/minecraft/net/minecraft/block/BlockLeaves.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockLeaves.java.patch @@ -19,7 +19,7 @@ +public class BlockLeaves extends BlockLeavesBase implements IShearable { public static final String[] LEAF_TYPES = new String[] {"oak", "spruce", "birch", "jungle"}; - public static final String[][] field_94396_b = new String[][] {{"leaves", "leaves_spruce", "leaves", "leaves_jungle"}, {"leaves_opaque", "leaves_spruce_opaque", "leaves_opaque", "leaves_jungle_opaque"}}; + public static final String[][] field_94396_b = new String[][] {{"leaves_oak", "leaves_spruce", "leaves_birch", "leaves_jungle"}, {"leaves_oak_opaque", "leaves_spruce_opaque", "leaves_birch_opaque", "leaves_jungle_opaque"}}; @@ -107,10 +111,9 @@ { int j2 = par1World.getBlockId(par2 + k1, par3 + l1, par4 + i2); diff --git a/patches/minecraft/net/minecraft/block/BlockLog.java.patch b/patches/minecraft/net/minecraft/block/BlockLog.java.patch index f06fc4db70..4672a0522b 100644 --- a/patches/minecraft/net/minecraft/block/BlockLog.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockLog.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/block/BlockLog.java +++ ../src_work/minecraft/net/minecraft/block/BlockLog.java -@@ -69,14 +69,9 @@ +@@ -60,14 +60,9 @@ { int j2 = par1World.getBlockId(par2 + k1, par3 + l1, par4 + i2); @@ -17,8 +17,8 @@ } } } -@@ -176,4 +171,16 @@ - this.iconArray[i] = par1IconRegister.registerIcon(treeTextureTypes[i]); +@@ -125,4 +120,16 @@ + this.tree_top[i] = par1IconRegister.registerIcon(this.func_111023_E() + "_" + woodType[i] + "_top"); } } + diff --git a/patches/minecraft/net/minecraft/block/BlockMushroom.java.patch b/patches/minecraft/net/minecraft/block/BlockMushroom.java.patch index 113f9af078..a47d2ff80c 100644 --- a/patches/minecraft/net/minecraft/block/BlockMushroom.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockMushroom.java.patch @@ -1,7 +1,7 @@ --- ../src_base/minecraft/net/minecraft/block/BlockMushroom.java +++ ../src_work/minecraft/net/minecraft/block/BlockMushroom.java -@@ -6,6 +6,8 @@ - import net.minecraft.client.renderer.texture.IconRegister; +@@ -3,6 +3,8 @@ + import java.util.Random; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenBigMushroom; + @@ -9,7 +9,7 @@ public class BlockMushroom extends BlockFlower { -@@ -102,7 +104,9 @@ +@@ -96,7 +98,9 @@ if (par3 >= 0 && par3 < 256) { int l = par1World.getBlockId(par2, par3 - 1, par4); diff --git a/patches/minecraft/net/minecraft/block/BlockNetherStalk.java.patch b/patches/minecraft/net/minecraft/block/BlockNetherStalk.java.patch index edc095cf55..e19096e341 100644 --- a/patches/minecraft/net/minecraft/block/BlockNetherStalk.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockNetherStalk.java.patch @@ -17,7 +17,7 @@ public class BlockNetherStalk extends BlockFlower { -@@ -39,7 +42,8 @@ +@@ -38,7 +41,8 @@ */ public boolean canBlockStay(World par1World, int par2, int par3, int par4) { @@ -27,7 +27,7 @@ } /** -@@ -81,25 +85,7 @@ +@@ -80,25 +84,7 @@ */ public void dropBlockAsItemWithChance(World par1World, int par2, int par3, int par4, int par5, float par6, int par7) { @@ -54,8 +54,8 @@ } /** -@@ -143,4 +129,23 @@ - this.iconArray[i] = par1IconRegister.registerIcon(field_94373_a[i]); +@@ -142,4 +128,23 @@ + this.iconArray[i] = par1IconRegister.registerIcon(this.func_111023_E() + "_stage_" + i); } } + diff --git a/patches/minecraft/net/minecraft/block/BlockPane.java.patch b/patches/minecraft/net/minecraft/block/BlockPane.java.patch new file mode 100644 index 0000000000..5753ac2be0 --- /dev/null +++ b/patches/minecraft/net/minecraft/block/BlockPane.java.patch @@ -0,0 +1,51 @@ +--- ../src_base/minecraft/net/minecraft/block/BlockPane.java ++++ ../src_work/minecraft/net/minecraft/block/BlockPane.java +@@ -13,6 +13,7 @@ + import net.minecraft.util.Icon; + import net.minecraft.world.IBlockAccess; + import net.minecraft.world.World; ++import net.minecraftforge.common.ForgeDirection; + + public class BlockPane extends Block + { +@@ -90,10 +91,10 @@ + */ + public void addCollisionBoxesToList(World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) + { +- boolean flag = this.canThisPaneConnectToThisBlockID(par1World.getBlockId(par2, par3, par4 - 1)); +- boolean flag1 = this.canThisPaneConnectToThisBlockID(par1World.getBlockId(par2, par3, par4 + 1)); +- boolean flag2 = this.canThisPaneConnectToThisBlockID(par1World.getBlockId(par2 - 1, par3, par4)); +- boolean flag3 = this.canThisPaneConnectToThisBlockID(par1World.getBlockId(par2 + 1, par3, par4)); ++ boolean flag = this.canPaneConnectTo(par1World,par2, par3, par4,ForgeDirection.NORTH); ++ boolean flag1 = this.canPaneConnectTo(par1World,par2, par3, par4,ForgeDirection.SOUTH); ++ boolean flag2 = this.canPaneConnectTo(par1World,par2, par3, par4,ForgeDirection.WEST); ++ boolean flag3 = this.canPaneConnectTo(par1World,par2, par3, par4,ForgeDirection.EAST); + + if ((!flag2 || !flag3) && (flag2 || flag3 || flag || flag1)) + { +@@ -151,10 +152,10 @@ + float f1 = 0.5625F; + float f2 = 0.4375F; + float f3 = 0.5625F; +- boolean flag = this.canThisPaneConnectToThisBlockID(par1IBlockAccess.getBlockId(par2, par3, par4 - 1)); +- boolean flag1 = this.canThisPaneConnectToThisBlockID(par1IBlockAccess.getBlockId(par2, par3, par4 + 1)); +- boolean flag2 = this.canThisPaneConnectToThisBlockID(par1IBlockAccess.getBlockId(par2 - 1, par3, par4)); +- boolean flag3 = this.canThisPaneConnectToThisBlockID(par1IBlockAccess.getBlockId(par2 + 1, par3, par4)); ++ boolean flag = this.canPaneConnectTo(par1IBlockAccess,par2, par3, par4,ForgeDirection.NORTH); ++ boolean flag1 = this.canPaneConnectTo(par1IBlockAccess,par2, par3, par4,ForgeDirection.SOUTH); ++ boolean flag2 = this.canPaneConnectTo(par1IBlockAccess,par2, par3, par4,ForgeDirection.WEST); ++ boolean flag3 = this.canPaneConnectTo(par1IBlockAccess,par2, par3, par4,ForgeDirection.EAST); + + if ((!flag2 || !flag3) && (flag2 || flag3 || flag || flag1)) + { +@@ -240,4 +241,10 @@ + this.blockIcon = par1IconRegister.registerIcon(this.field_94402_c); + this.theIcon = par1IconRegister.registerIcon(this.sideTextureIndex); + } ++ ++ // FORGE START ++ public boolean canPaneConnectTo(IBlockAccess access, int x, int y, int z, ForgeDirection dir) ++ { ++ return canThisPaneConnectToThisBlockID(access.getBlockId(x+dir.offsetX, y+dir.offsetY, z+dir.offsetZ)) || access.isBlockSolidOnSide(x+dir.offsetX, y+dir.offsetY, z+dir.offsetZ, dir.getOpposite(), false); ++ } + } diff --git a/patches/minecraft/net/minecraft/block/BlockPistonBase.java.patch b/patches/minecraft/net/minecraft/block/BlockPistonBase.java.patch index 22e2d2d056..03c3ebcf3b 100644 --- a/patches/minecraft/net/minecraft/block/BlockPistonBase.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockPistonBase.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/block/BlockPistonBase.java +++ ../src_work/minecraft/net/minecraft/block/BlockPistonBase.java -@@ -437,7 +437,7 @@ +@@ -439,7 +439,7 @@ return false; } @@ -9,7 +9,7 @@ } } -@@ -455,7 +455,7 @@ +@@ -457,14 +457,14 @@ { if (l1 < 13) { @@ -18,7 +18,15 @@ { return false; } -@@ -505,7 +505,7 @@ + + int i2 = par0World.getBlockId(i1, j1, k1); + +- if (i2 != 0) ++ if (!par0World.isAirBlock(i1, j1, k1)) + { + if (!canPushBlock(i2, par0World, i1, j1, k1, true)) + { +@@ -507,14 +507,14 @@ if (l1 < 13) { @@ -27,12 +35,20 @@ { return false; } -@@ -533,7 +533,9 @@ + + i2 = par1World.getBlockId(i1, j1, k1); + +- if (i2 != 0) ++ if (!par1World.isAirBlock(i1, j1, k1)) + { + if (!canPushBlock(i2, par1World, i1, j1, k1, true)) + { +@@ -535,7 +535,9 @@ continue; } - Block.blocksList[i2].dropBlockAsItem(par1World, i1, j1, k1, par1World.getBlockMetadata(i1, j1, k1), 0); -+ //With our change to how snowballs are dropped this needs to dissallow to mimic vanilla behavior. ++ //With our change to how snowballs are dropped this needs to disallow to mimic vanilla behavior. + float chance = (Block.blocksList[i2] instanceof BlockSnow ? -1.0f : 1.0f); + Block.blocksList[i2].dropBlockAsItemWithChance(par1World, i1, j1, k1, par1World.getBlockMetadata(i1, j1, k1), chance, 0); par1World.setBlockToAir(i1, j1, k1); diff --git a/patches/minecraft/net/minecraft/block/BlockPortal.java.patch b/patches/minecraft/net/minecraft/block/BlockPortal.java.patch new file mode 100644 index 0000000000..94bd8008cd --- /dev/null +++ b/patches/minecraft/net/minecraft/block/BlockPortal.java.patch @@ -0,0 +1,28 @@ +--- ../src_base/minecraft/net/minecraft/block/BlockPortal.java ++++ ../src_work/minecraft/net/minecraft/block/BlockPortal.java +@@ -118,7 +118,7 @@ + } + else + { +- if (par1World.getBlockId(par2 - b0, par3, par4 - b1) == 0) ++ if (par1World.isAirBlock(par2 - b0, par3, par4 - b1)) + { + par2 -= b0; + par4 -= b1; +@@ -136,6 +136,7 @@ + if (l != -1 && l != 2 || i1 != -1 && i1 != 3) + { + int j1 = par1World.getBlockId(par2 + b0 * l, par3 + i1, par4 + b1 * l); ++ boolean isAirBlock = par1World.isAirBlock(par2 + b0 * l, par3 + i1, par4 + b1 * l); + + if (flag) + { +@@ -144,7 +145,7 @@ + return false; + } + } +- else if (j1 != 0 && j1 != Block.fire.blockID) ++ else if (!isAirBlock && j1 != Block.fire.blockID) + { + return false; + } diff --git a/patches/minecraft/net/minecraft/block/BlockSand.java.patch b/patches/minecraft/net/minecraft/block/BlockSand.java.patch new file mode 100644 index 0000000000..381cc4e610 --- /dev/null +++ b/patches/minecraft/net/minecraft/block/BlockSand.java.patch @@ -0,0 +1,11 @@ +--- ../src_base/minecraft/net/minecraft/block/BlockSand.java ++++ ../src_work/minecraft/net/minecraft/block/BlockSand.java +@@ -105,7 +105,7 @@ + { + int l = par0World.getBlockId(par1, par2, par3); + +- if (l == 0) ++ if (par0World.isAirBlock(par1, par2, par3)) + { + return true; + } diff --git a/patches/minecraft/net/minecraft/block/BlockSapling.java.patch b/patches/minecraft/net/minecraft/block/BlockSapling.java.patch index 59c0b4a06a..c0b596496d 100644 --- a/patches/minecraft/net/minecraft/block/BlockSapling.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockSapling.java.patch @@ -9,7 +9,7 @@ public class BlockSapling extends BlockFlower { public static final String[] WOOD_TYPES = new String[] {"oak", "spruce", "birch", "jungle"}; -@@ -77,6 +79,8 @@ +@@ -76,6 +78,8 @@ */ public void growTree(World par1World, int par2, int par3, int par4, Random par5Random) { diff --git a/patches/minecraft/net/minecraft/block/BlockTripWireSource.java.patch b/patches/minecraft/net/minecraft/block/BlockTripWireSource.java.patch index 626228d4d4..86e1f866b9 100644 --- a/patches/minecraft/net/minecraft/block/BlockTripWireSource.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockTripWireSource.java.patch @@ -28,10 +28,10 @@ public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { - return par1World.isBlockNormalCube(par2 - 1, par3, par4) ? true : (par1World.isBlockNormalCube(par2 + 1, par3, par4) ? true : (par1World.isBlockNormalCube(par2, par3, par4 - 1) ? true : par1World.isBlockNormalCube(par2, par3, par4 + 1))); -+ return par1World.isBlockSolidOnSide(par2 - 1, par3, par4, SOUTH) || -+ par1World.isBlockSolidOnSide(par2 + 1, par3, par4, NORTH) || -+ par1World.isBlockSolidOnSide(par2, par3, par4 - 1, EAST ) || -+ par1World.isBlockSolidOnSide(par2, par3, par4 + 1, WEST ); ++ return par1World.isBlockSolidOnSide(par2 - 1, par3, par4, EAST ) || ++ par1World.isBlockSolidOnSide(par2 + 1, par3, par4, WEST ) || ++ par1World.isBlockSolidOnSide(par2, par3, par4 - 1, SOUTH) || ++ par1World.isBlockSolidOnSide(par2, par3, par4 + 1, NORTH); } /** @@ -40,25 +40,25 @@ byte b0 = 0; - if (par5 == 2 && par1World.isBlockNormalCubeDefault(par2, par3, par4 + 1, true)) -+ if (par5 == 2 && par1World.isBlockSolidOnSide(par2, par3, par4 + 1, WEST, true)) ++ if (par5 == 2 && par1World.isBlockSolidOnSide(par2, par3, par4 + 1, NORTH, true)) { b0 = 2; } - if (par5 == 3 && par1World.isBlockNormalCubeDefault(par2, par3, par4 - 1, true)) -+ if (par5 == 3 && par1World.isBlockSolidOnSide(par2, par3, par4 - 1, EAST, true)) ++ if (par5 == 3 && par1World.isBlockSolidOnSide(par2, par3, par4 - 1, SOUTH, true)) { b0 = 0; } - if (par5 == 4 && par1World.isBlockNormalCubeDefault(par2 + 1, par3, par4, true)) -+ if (par5 == 4 && par1World.isBlockSolidOnSide(par2 + 1, par3, par4, NORTH, true)) ++ if (par5 == 4 && par1World.isBlockSolidOnSide(par2 + 1, par3, par4, WEST, true)) { b0 = 1; } - if (par5 == 5 && par1World.isBlockNormalCubeDefault(par2 - 1, par3, par4, true)) -+ if (par5 == 5 && par1World.isBlockSolidOnSide(par2 - 1, par3, par4, SOUTH, true)) ++ if (par5 == 5 && par1World.isBlockSolidOnSide(par2 - 1, par3, par4, EAST, true)) { b0 = 3; } @@ -67,25 +67,25 @@ boolean flag = false; - if (!par1World.isBlockNormalCube(par2 - 1, par3, par4) && j1 == 3) -+ if (!par1World.isBlockSolidOnSide(par2 - 1, par3, par4, SOUTH) && j1 == 3) ++ if (!par1World.isBlockSolidOnSide(par2 - 1, par3, par4, EAST) && j1 == 3) { flag = true; } - if (!par1World.isBlockNormalCube(par2 + 1, par3, par4) && j1 == 1) -+ if (!par1World.isBlockSolidOnSide(par2 + 1, par3, par4, NORTH) && j1 == 1) ++ if (!par1World.isBlockSolidOnSide(par2 + 1, par3, par4, WEST) && j1 == 1) { flag = true; } - if (!par1World.isBlockNormalCube(par2, par3, par4 - 1) && j1 == 0) -+ if (!par1World.isBlockSolidOnSide(par2, par3, par4 - 1, EAST) && j1 == 0) ++ if (!par1World.isBlockSolidOnSide(par2, par3, par4 - 1, SOUTH) && j1 == 0) { flag = true; } - if (!par1World.isBlockNormalCube(par2, par3, par4 + 1) && j1 == 2) -+ if (!par1World.isBlockSolidOnSide(par2, par3, par4 + 1, WEST) && j1 == 2) ++ if (!par1World.isBlockSolidOnSide(par2, par3, par4 + 1, NORTH) && j1 == 2) { flag = true; } diff --git a/patches/minecraft/net/minecraft/block/BlockVine.java.patch b/patches/minecraft/net/minecraft/block/BlockVine.java.patch index 3a004fc5dd..1042d045c8 100644 --- a/patches/minecraft/net/minecraft/block/BlockVine.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockVine.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/block/BlockVine.java +++ ../src_work/minecraft/net/minecraft/block/BlockVine.java -@@ -2,6 +2,8 @@ +@@ -2,9 +2,12 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -9,7 +9,11 @@ import java.util.Random; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; -@@ -15,7 +17,9 @@ ++import net.minecraft.entity.EntityLivingBase; + import net.minecraft.entity.player.EntityPlayer; + import net.minecraft.item.Item; + import net.minecraft.item.ItemStack; +@@ -15,7 +18,9 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -20,7 +24,7 @@ { public BlockVine(int par1) { -@@ -439,14 +443,26 @@ +@@ -440,14 +445,26 @@ */ public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6) { @@ -51,7 +55,7 @@ + } + + @Override -+ public boolean isLadder(World world, int x, int y, int z) ++ public boolean isLadder(World world, int x, int y, int z, EntityLivingBase entity) + { + return true; } diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch index e5d59881a1..f4f50ea910 100644 --- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/client/Minecraft.java +++ ../src_work/minecraft/net/minecraft/client/Minecraft.java -@@ -123,6 +123,14 @@ +@@ -136,6 +136,14 @@ import com.google.common.collect.MapDifference; @@ -13,9 +13,9 @@ +import net.minecraftforge.event.world.WorldEvent; + @SideOnly(Side.CLIENT) - public abstract class Minecraft implements Runnable, IPlayerUsage + public class Minecraft implements IPlayerUsage { -@@ -372,7 +380,7 @@ +@@ -414,7 +422,7 @@ try { @@ -24,16 +24,16 @@ } catch (LWJGLException lwjglexception) { -@@ -450,7 +458,7 @@ - } - +@@ -493,7 +501,7 @@ + this.effectRenderer = new EffectRenderer(this.theWorld, this.renderEngine); + FMLClientHandler.instance().finishMinecraftLoading(); this.checkGLError("Post startup"); - this.ingameGUI = new GuiIngame(this); + this.ingameGUI = new GuiIngameForge(this); if (this.serverName != null) { -@@ -1238,7 +1246,7 @@ +@@ -1296,7 +1304,7 @@ if (this.thePlayer.canCurrentToolHarvestBlock(j, k, l)) { @@ -42,7 +42,7 @@ this.thePlayer.swingItem(); } } -@@ -1304,7 +1312,8 @@ +@@ -1362,7 +1370,8 @@ { int j1 = itemstack != null ? itemstack.stackSize : 0; @@ -52,7 +52,7 @@ { flag = false; this.thePlayer.swingItem(); -@@ -1330,7 +1339,8 @@ +@@ -1388,7 +1397,8 @@ { ItemStack itemstack1 = this.thePlayer.inventory.getCurrentItem(); @@ -62,7 +62,7 @@ { this.entityRenderer.itemRenderer.resetEquippedProgress2(); } -@@ -2010,6 +2020,11 @@ +@@ -2036,6 +2046,11 @@ { this.statFileWriter.syncStats(); @@ -74,7 +74,7 @@ if (par1WorldClient == null) { NetClientHandler netclienthandler = this.getNetHandler(); -@@ -2027,6 +2042,18 @@ +@@ -2053,6 +2068,18 @@ if (this.theIntegratedServer != null) { this.theIntegratedServer.initiateShutdown(); @@ -93,7 +93,7 @@ } this.theIntegratedServer = null; -@@ -2354,103 +2381,12 @@ +@@ -2223,103 +2250,12 @@ if (this.objectMouseOver != null) { boolean flag = this.thePlayer.capabilities.isCreativeMode; @@ -201,7 +201,7 @@ if (flag) { -@@ -2539,11 +2475,18 @@ +@@ -2401,11 +2337,18 @@ par1PlayerUsageSnooper.addData("gl_max_texture_size", Integer.valueOf(getGLMaximumTextureSize())); } @@ -220,7 +220,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); -@@ -2551,6 +2494,7 @@ +@@ -2413,6 +2356,7 @@ if (j != 0) { diff --git a/patches/minecraft/net/minecraft/client/audio/SoundManager.java.patch b/patches/minecraft/net/minecraft/client/audio/SoundManager.java.patch index aef9c3638b..9130df90d2 100644 --- a/patches/minecraft/net/minecraft/client/audio/SoundManager.java.patch +++ b/patches/minecraft/net/minecraft/client/audio/SoundManager.java.patch @@ -10,52 +10,49 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import java.io.File; -@@ -53,9 +57,11 @@ +@@ -61,9 +65,11 @@ private Random rand = new Random(); private int ticksBeforeMusic; + public static int MUSIC_INTERVAL = 12000; + - public SoundManager() + public SoundManager(ResourceManager par1ResourceManager, GameSettings par2GameSettings, File par3File) { - this.ticksBeforeMusic = this.rand.nextInt(12000); + this.ticksBeforeMusic = this.rand.nextInt(MUSIC_INTERVAL); - } - - /** -@@ -70,6 +76,8 @@ - { - this.tryToSetLibraryAndCodecs(); + this.options = par2GameSettings; + this.field_130085_i = par3File; + this.soundPoolSounds = new SoundPool(par1ResourceManager, "sound", true); +@@ -75,6 +81,7 @@ + SoundSystemConfig.addLibrary(LibraryLWJGLOpenAL.class); + SoundSystemConfig.setCodec("ogg", CodecJOrbis.class); + SoundSystemConfig.setCodec("wav", CodecWav.class); ++ MinecraftForge.EVENT_BUS.post(new SoundSetupEvent(this)); } -+ ModCompatibilityClient.audioModLoad(this); + catch (SoundSystemException soundsystemexception) + { +@@ -90,6 +97,7 @@ + this.stopAllSounds(); + this.closeMinecraft(); + this.tryToSetLibraryAndCodecs(); + MinecraftForge.EVENT_BUS.post(new SoundLoadEvent(this)); } - /** -@@ -89,6 +97,8 @@ - SoundSystemConfig.setCodec("ogg", CodecJOrbis.class); - SoundSystemConfig.setCodec("mus", CodecMus.class); - SoundSystemConfig.setCodec("wav", CodecWav.class); -+ ModCompatibilityClient.audioModAddCodecs(); -+ MinecraftForge.EVENT_BUS.post(new SoundSetupEvent(this)); - sndSystem = new SoundSystem(); - this.options.soundVolume = f; - this.options.musicVolume = f1; -@@ -179,10 +189,12 @@ - } - - SoundPoolEntry soundpoolentry = this.soundPoolMusic.getRandomSound(); -+ soundpoolentry = ModCompatibilityClient.audioModPickBackgroundMusic(this, soundpoolentry); -+ soundpoolentry = SoundEvent.getResult(new PlayBackgroundMusicEvent(this, soundpoolentry)); - - if (soundpoolentry != null) + private void func_130083_h() +@@ -236,10 +244,11 @@ + else { -- this.ticksBeforeMusic = this.rand.nextInt(12000) + 12000; -+ this.ticksBeforeMusic = this.rand.nextInt(MUSIC_INTERVAL) + MUSIC_INTERVAL; - sndSystem.backgroundMusic("BgMusic", soundpoolentry.soundUrl, soundpoolentry.soundName, false); - sndSystem.setVolume("BgMusic", this.options.musicVolume); - sndSystem.play("BgMusic"); -@@ -249,6 +261,7 @@ + SoundPoolEntry soundpoolentry = this.soundPoolMusic.getRandomSound(); ++ soundpoolentry = SoundEvent.getResult(new PlayBackgroundMusicEvent(this, soundpoolentry)); + + if (soundpoolentry != null) + { +- this.ticksBeforeMusic = this.rand.nextInt(12000) + 12000; ++ this.ticksBeforeMusic = this.rand.nextInt(MUSIC_INTERVAL) + MUSIC_INTERVAL; + this.sndSystem.backgroundMusic("BgMusic", soundpoolentry.func_110457_b(), soundpoolentry.func_110458_a(), false); + this.sndSystem.setVolume("BgMusic", this.options.musicVolume); + this.sndSystem.play("BgMusic"); +@@ -307,6 +316,7 @@ if (par1Str != null) { SoundPoolEntry soundpoolentry = this.soundPoolStreaming.getRandomSoundFromSoundPool(par1Str); @@ -63,43 +60,43 @@ if (soundpoolentry != null) { -@@ -260,6 +273,7 @@ - float f3 = 16.0F; - sndSystem.newStreamingSource(true, s1, soundpoolentry.soundUrl, soundpoolentry.soundName, false, par2, par3, par4, 2, f3 * 4.0F); - sndSystem.setVolume(s1, 0.5F * this.options.soundVolume); +@@ -317,6 +327,7 @@ + + this.sndSystem.newStreamingSource(true, s1, soundpoolentry.func_110457_b(), soundpoolentry.func_110458_a(), false, par2, par3, par4, 2, 64.0F); + this.sndSystem.setVolume(s1, 0.5F * this.options.soundVolume); + MinecraftForge.EVENT_BUS.post(new PlayStreamingSourceEvent(this, s1, par2, par3, par4)); - sndSystem.play(s1); + this.sndSystem.play(s1); } } -@@ -439,6 +453,7 @@ - if (loaded && this.options.soundVolume != 0.0F) +@@ -485,6 +496,7 @@ + if (this.loaded && this.options.soundVolume != 0.0F) { SoundPoolEntry soundpoolentry = this.soundPoolSounds.getRandomSoundFromSoundPool(par1Str); + soundpoolentry = SoundEvent.getResult(new PlaySoundEvent(this, soundpoolentry, par1Str, par2, par3, par4, par5, par6)); if (soundpoolentry != null && par5 > 0.0F) { -@@ -460,6 +475,7 @@ - } +@@ -506,6 +518,7 @@ - sndSystem.setVolume(s1, par5 * this.options.soundVolume); + this.sndSystem.setPitch(s1, par6); + this.sndSystem.setVolume(s1, par5 * this.options.soundVolume); + MinecraftForge.EVENT_BUS.post(new PlaySoundSourceEvent(this, s1, par2, par3, par4)); - sndSystem.play(s1); + this.sndSystem.play(s1); } } -@@ -474,6 +490,7 @@ - if (loaded && this.options.soundVolume != 0.0F) +@@ -520,6 +533,7 @@ + if (this.loaded && this.options.soundVolume != 0.0F) { SoundPoolEntry soundpoolentry = this.soundPoolSounds.getRandomSoundFromSoundPool(par1Str); + soundpoolentry = SoundEvent.getResult(new PlaySoundEffectEvent(this, soundpoolentry, par1Str, par2, par3)); - if (soundpoolentry != null) + if (soundpoolentry != null && par2 > 0.0F) { -@@ -489,6 +506,7 @@ +@@ -535,6 +549,7 @@ par2 *= 0.25F; - sndSystem.setPitch(s1, par3); - sndSystem.setVolume(s1, par2 * this.options.soundVolume); + this.sndSystem.setPitch(s1, par3); + this.sndSystem.setVolume(s1, par2 * this.options.soundVolume); + MinecraftForge.EVENT_BUS.post(new PlaySoundEffectSourceEvent(this, s1)); - sndSystem.play(s1); + this.sndSystem.play(s1); } } diff --git a/patches/minecraft/net/minecraft/client/audio/SoundPool.java.patch b/patches/minecraft/net/minecraft/client/audio/SoundPool.java.patch index 996a895633..456e957e2b 100644 --- a/patches/minecraft/net/minecraft/client/audio/SoundPool.java.patch +++ b/patches/minecraft/net/minecraft/client/audio/SoundPool.java.patch @@ -1,53 +1,20 @@ --- ../src_base/minecraft/net/minecraft/client/audio/SoundPool.java +++ ../src_work/minecraft/net/minecraft/client/audio/SoundPool.java -@@ -4,6 +4,7 @@ - import cpw.mods.fml.relauncher.SideOnly; - import java.io.File; - import java.net.MalformedURLException; -+import java.net.URL; - import java.util.ArrayList; - import java.util.HashMap; - import java.util.List; -@@ -36,6 +37,26 @@ - */ - public SoundPoolEntry addSound(String par1Str, File par2File) - { -+ try -+ { -+ return addSound(par1Str, par2File.toURI().toURL()); -+ } -+ catch (MalformedURLException ex) -+ { -+ ex.printStackTrace(); -+ throw new RuntimeException(ex); -+ } -+ } -+ -+ /** -+ * URL version of addSound, as the back-end sound engine has full support for various types of URLs -+ * -+ * @param par1Str The name of the sound to add -+ * @param url The url of the sound resource -+ * @return A SoundPoolEntry for the newly added sound -+ */ -+ public SoundPoolEntry addSound(String par1Str, URL url) -+ { - try - { - String s1 = par1Str; -@@ -56,13 +77,13 @@ - this.nameToSoundPoolEntriesMapping.put(par1Str, new ArrayList()); - } +@@ -11,6 +11,7 @@ + import java.util.Map; + import java.util.Random; + import net.minecraft.client.resources.ResourceManager; ++import net.minecraftforge.client.ForgeHooksClient; -- SoundPoolEntry soundpoolentry = new SoundPoolEntry(s1, par2File.toURI().toURL()); -+ SoundPoolEntry soundpoolentry = new SoundPoolEntry(s1, url); - ((List)this.nameToSoundPoolEntriesMapping.get(par1Str)).add(soundpoolentry); - this.allSoundPoolEntries.add(soundpoolentry); - ++this.numberOfSoundPoolEntries; - return soundpoolentry; - } -- catch (MalformedURLException malformedurlexception) -+ catch (Exception malformedurlexception) - { - malformedurlexception.printStackTrace(); - throw new RuntimeException(malformedurlexception); + @SideOnly(Side.CLIENT) + public class SoundPool +@@ -71,7 +72,8 @@ + + private URL func_110654_c(String par1Str) throws MalformedURLException + { +- return new URL((URL)null, "minecraft:" + this.field_110656_d + "/" + par1Str, new SoundPoolProtocolHandler(this)); ++ String path = ForgeHooksClient.fixDomain(field_110656_d + "/", par1Str); ++ return new URL((URL)null, "minecraft:" + path, new SoundPoolProtocolHandler(this)); + } + + /** diff --git a/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch b/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch index 2006c64365..eb71fca162 100644 --- a/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch +++ b/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch @@ -1,15 +1,15 @@ --- ../src_base/minecraft/net/minecraft/client/entity/EntityPlayerSP.java +++ ../src_work/minecraft/net/minecraft/client/entity/EntityPlayerSP.java -@@ -46,6 +46,8 @@ +@@ -49,6 +49,8 @@ + import net.minecraft.util.MovementInput; import net.minecraft.util.Session; - import net.minecraft.util.StringUtils; import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.PlaySoundAtEntityEvent; @SideOnly(Side.CLIENT) - public class EntityPlayerSP extends EntityPlayer -@@ -661,6 +663,12 @@ + public class EntityPlayerSP extends AbstractClientPlayer +@@ -685,6 +687,12 @@ public void playSound(String par1Str, float par2, float par3) { @@ -21,4 +21,4 @@ + par1Str = event.name; this.worldObj.playSound(this.posX, this.posY - (double)this.yOffset, this.posZ, par1Str, par2, par3, false); } - } + diff --git a/patches/minecraft/net/minecraft/client/gui/GuiControls.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiControls.java.patch index 9e0a060850..5123e8f65f 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiControls.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/GuiControls.java.patch @@ -1,9 +1,9 @@ --- ../src_base/minecraft/net/minecraft/client/gui/GuiControls.java +++ ../src_work/minecraft/net/minecraft/client/gui/GuiControls.java @@ -6,6 +6,8 @@ + import net.minecraft.client.settings.GameSettings; import net.minecraft.client.settings.KeyBinding; import net.minecraft.util.EnumChatFormatting; - import net.minecraft.util.StringTranslate; + +import net.minecraftforge.client.GuiControlsScrollPanel; @@ -18,12 +18,10 @@ public GuiControls(GuiScreen par1GuiScreen, GameSettings par2GameSettings) { -@@ -43,15 +47,10 @@ +@@ -43,14 +47,9 @@ */ public void initGui() { -+ scrollPane = new GuiControlsScrollPanel(this, options, mc); - StringTranslate stringtranslate = StringTranslate.getInstance(); - int i = this.getLeftBorder(); - - for (int j = 0; j < this.options.keyBindings.length; ++j) @@ -31,13 +29,14 @@ - this.buttonList.add(new GuiSmallButton(j, i + j % 2 * 160, this.height / 6 + 24 * (j >> 1), 70, 20, this.options.getOptionDisplayString(j))); - } - -- this.buttonList.add(new GuiButton(200, this.width / 2 - 100, this.height / 6 + 168, stringtranslate.translateKey("gui.done"))); -+ this.buttonList.add(new GuiButton(200, this.width / 2 - 100, this.height - 28, stringtranslate.translateKey("gui.done"))); -+ scrollPane.registerScrollButtons(buttonList, 7, 8); - this.screenTitle = stringtranslate.translateKey("controls.title"); +- this.buttonList.add(new GuiButton(200, this.width / 2 - 100, this.height / 6 + 168, I18n.func_135053_a("gui.done"))); ++ scrollPane = new GuiControlsScrollPanel(this, options, mc); ++ this.buttonList.add(new GuiButton(200, this.width / 2 - 100, this.height - 28, I18n.func_135053_a("gui.done"))); ++ scrollPane.registerScrollButtons(7, 8); + this.screenTitle = I18n.func_135053_a("controls.title"); } -@@ -59,20 +58,10 @@ +@@ -58,20 +57,10 @@ * Fired when a control is clicked. This is the equivalent of ActionListener.actionPerformed(ActionEvent e). */ protected void actionPerformed(GuiButton par1GuiButton) @@ -59,7 +58,7 @@ } } -@@ -81,17 +70,7 @@ +@@ -80,17 +69,7 @@ */ protected void mouseClicked(int par1, int par2, int par3) { @@ -78,7 +77,7 @@ } /** -@@ -99,14 +78,7 @@ +@@ -98,14 +77,7 @@ */ protected void keyTyped(char par1, int par2) { @@ -94,7 +93,7 @@ { super.keyTyped(par1, par2); } -@@ -118,6 +90,7 @@ +@@ -117,6 +89,7 @@ public void drawScreen(int par1, int par2, float par3) { this.drawDefaultBackground(); @@ -102,7 +101,7 @@ this.drawCenteredString(this.fontRenderer, this.screenTitle, this.width / 2, 20, 16777215); int k = this.getLeftBorder(); int l = 0; -@@ -158,6 +131,10 @@ +@@ -157,6 +130,10 @@ break; } } diff --git a/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch index f5d3ee699b..26f56825ca 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/client/gui/GuiCreateWorld.java +++ ../src_work/minecraft/net/minecraft/client/gui/GuiCreateWorld.java -@@ -377,7 +377,7 @@ +@@ -376,7 +376,7 @@ } else if (par1GuiButton.id == 8) { @@ -9,13 +9,12 @@ } } } -@@ -395,7 +395,8 @@ +@@ -394,7 +394,7 @@ this.buttonBonusItems.drawButton = this.moreOptions; this.buttonWorldType.drawButton = this.moreOptions; this.buttonAllowCommands.drawButton = this.moreOptions; - this.buttonCustomize.drawButton = this.moreOptions && WorldType.worldTypes[this.worldTypeId] == WorldType.FLAT; + this.buttonCustomize.drawButton = this.moreOptions && (WorldType.worldTypes[this.worldTypeId].isCustomizable()); -+ - StringTranslate stringtranslate; if (this.moreOptions) + { diff --git a/patches/minecraft/net/minecraft/client/gui/GuiIngame.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiIngame.java.patch index 5490f7241f..37ed0182ca 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiIngame.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/GuiIngame.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/client/gui/GuiIngame.java +++ ../src_work/minecraft/net/minecraft/client/gui/GuiIngame.java -@@ -34,6 +34,8 @@ +@@ -40,6 +40,8 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -9,7 +9,7 @@ @SideOnly(Side.CLIENT) public class GuiIngame extends Gui { -@@ -90,9 +92,16 @@ +@@ -99,9 +101,16 @@ ItemStack itemstack = this.mc.thePlayer.inventory.armorItemInSlot(3); @@ -29,30 +29,29 @@ } if (!this.mc.thePlayer.isPotionActive(Potion.confusion)) -@@ -174,7 +183,7 @@ - - k3 = l - 39; - l2 = k3 - 10; -- k2 = this.mc.thePlayer.getTotalArmorValue(); -+ k2 = ForgeHooks.getTotalArmorValue(mc.thePlayer); - i3 = -1; - - if (this.mc.thePlayer.isPotionActive(Potion.regeneration)) -@@ -435,7 +444,16 @@ - GL11.glPushMatrix(); +@@ -275,6 +284,16 @@ GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); -- fontrenderer.drawStringWithShadow(s1, i1, j1, 16777215 + (j5 << 24)); + fontrenderer.drawStringWithShadow(s1, k1, i2, 16777215 + (j2 << 24)); + FontRenderer font = highlightingItemStack.getItem().getFontRenderer(highlightingItemStack); + if (font != null) + { -+ i1 = (k - font.getStringWidth(s1)) / 2; -+ font.drawStringWithShadow(s1, i1, j1, 16777215 + (j5 << 24)); ++ k1 = (k - font.getStringWidth(s1)) / 2; ++ font.drawStringWithShadow(s1, k1, i2, 16777215 + (j2 << 24)); + } + else + { -+ fontrenderer.drawStringWithShadow(s1, i1, j1, 16777215 + (j5 << 24)); ++ fontrenderer.drawStringWithShadow(s1, k1, i2, 16777215 + (j2 << 24)); + } GL11.glDisable(GL11.GL_BLEND); GL11.glPopMatrix(); } +@@ -563,7 +582,7 @@ + int k2 = Math.max(10 - (j2 - 2), 3); + int l2 = i2 - (j2 - 1) * k2 - 10; + float f2 = f1; +- int i3 = this.mc.thePlayer.getTotalArmorValue(); ++ int i3 = ForgeHooks.getTotalArmorValue(mc.thePlayer); + int j3 = -1; + + if (this.mc.thePlayer.isPotionActive(Potion.regeneration)) diff --git a/patches/minecraft/net/minecraft/client/gui/GuiSlot.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiSlot.java.patch index ad1a80e046..06b4ff689c 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiSlot.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/GuiSlot.java.patch @@ -1,19 +1,10 @@ --- ../src_base/minecraft/net/minecraft/client/gui/GuiSlot.java +++ ../src_work/minecraft/net/minecraft/client/gui/GuiSlot.java -@@ -68,6 +68,8 @@ - private boolean showSelectionBox = true; - private boolean field_77243_s; - private int field_77242_t; -+ -+ public String BACKGROUND_IMAGE = "/gui/background.png"; - - public GuiSlot(Minecraft par1Minecraft, int par2, int par3, int par4, int par5, int par6) - { -@@ -332,16 +334,7 @@ +@@ -331,16 +331,7 @@ GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_FOG); Tessellator tessellator = Tessellator.instance; -- this.mc.renderEngine.bindTexture("/gui/background.png"); +- this.mc.func_110434_K().func_110577_a(Gui.field_110325_k); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - float f1 = 32.0F; - tessellator.startDrawingQuads(); @@ -27,27 +18,14 @@ j1 = this.width / 2 - 92 - 16; k1 = this.top + 4 - (int)this.amountScrolled; -@@ -470,10 +463,10 @@ - /** - * Overlays the background to hide scrolled items - */ -- private void overlayBackground(int par1, int par2, int par3, int par4) -+ protected void overlayBackground(int par1, int par2, int par3, int par4) - { - Tessellator tessellator = Tessellator.instance; -- this.mc.renderEngine.bindTexture("/gui/background.png"); -+ this.mc.renderEngine.bindTexture(BACKGROUND_IMAGE); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - float f = 32.0F; - tessellator.startDrawingQuads(); -@@ -485,4 +478,18 @@ +@@ -484,4 +475,18 @@ tessellator.addVertexWithUV(0.0D, (double)par1, 0.0D, 0.0D, (double)((float)par1 / f)); tessellator.draw(); } + + protected void drawContainerBackground(Tessellator tess) + { -+ this.mc.renderEngine.bindTexture(BACKGROUND_IMAGE); ++ this.mc.func_110434_K().func_110577_a(Gui.field_110325_k); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + float height = 32.0F; + tess.startDrawingQuads(); diff --git a/patches/minecraft/net/minecraft/client/gui/RunnableTitleScreen.java.patch b/patches/minecraft/net/minecraft/client/gui/RunnableTitleScreen.java.patch deleted file mode 100644 index 23c473d43d..0000000000 --- a/patches/minecraft/net/minecraft/client/gui/RunnableTitleScreen.java.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ../src_base/minecraft/net/minecraft/client/gui/RunnableTitleScreen.java -+++ ../src_work/minecraft/net/minecraft/client/gui/RunnableTitleScreen.java -@@ -40,6 +40,10 @@ - } - } - } -+ catch (java.io.FileNotFoundException e) -+ { -+ //NomNomNom, Don't print the error when the flag isn't found. -+ } - catch (Throwable throwable) - { - throwable.printStackTrace(); diff --git a/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch index 207acf8782..6300fe0c07 100644 --- a/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch @@ -10,7 +10,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -@@ -20,6 +23,8 @@ +@@ -22,6 +25,8 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -19,8 +19,8 @@ @SideOnly(Side.CLIENT) public class GuiAchievements extends GuiScreen { -@@ -57,6 +62,10 @@ - private int isMouseButtonDown = 0; +@@ -60,6 +65,10 @@ + private int isMouseButtonDown; private StatFileWriter statFileWriter; + private int currentPage = -1; @@ -30,7 +30,7 @@ public GuiAchievements(StatFileWriter par1StatFileWriter) { this.statFileWriter = par1StatFileWriter; -@@ -64,6 +73,14 @@ +@@ -67,6 +76,14 @@ short short2 = 141; this.field_74117_m = this.guiMapX = this.field_74124_q = (double)(AchievementList.openInventory.displayColumn * 24 - short1 / 2 - 12); this.field_74115_n = this.guiMapY = this.field_74123_r = (double)(AchievementList.openInventory.displayRow * 24 - short2 / 2); @@ -45,15 +45,15 @@ } /** -@@ -73,6 +90,7 @@ +@@ -76,6 +93,7 @@ { this.buttonList.clear(); - this.buttonList.add(new GuiSmallButton(1, this.width / 2 + 24, this.height / 2 + 74, 80, 20, StatCollector.translateToLocal("gui.done"))); + this.buttonList.add(new GuiSmallButton(1, this.width / 2 + 24, this.height / 2 + 74, 80, 20, I18n.func_135053_a("gui.done"))); + this.buttonList.add(button = new GuiSmallButton(2, (width - achievementsPaneWidth) / 2 + 24, height / 2 + 74, 125, 20, AchievementPage.getTitle(currentPage))); } /** -@@ -84,6 +102,16 @@ +@@ -87,6 +105,16 @@ { this.mc.displayGuiScreen((GuiScreen)null); this.mc.setIngameFocus(); @@ -70,7 +70,7 @@ } super.actionPerformed(par1GuiButton); -@@ -306,11 +334,12 @@ +@@ -314,11 +342,12 @@ int i4; int j4; @@ -88,7 +88,7 @@ { k3 = achievement.displayColumn * 24 - k + 11 + k1; j3 = achievement.displayRow * 24 - l + 11 + l1; -@@ -344,9 +373,9 @@ +@@ -352,9 +381,9 @@ int l4; int i5; diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch index 56adb7ccff..404817911a 100644 --- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch @@ -8,21 +8,33 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; -@@ -203,8 +204,11 @@ +@@ -143,7 +144,11 @@ + } + } + ++ //Forge: Force lighting to be disabled as there are some issue where lighting would ++ //incorrectly be applied based on items that are in the inventory. ++ GL11.glDisable(GL11.GL_LIGHTING); + this.drawGuiContainerForegroundLayer(par1, par2); ++ GL11.glEnable(GL11.GL_LIGHTING); + InventoryPlayer inventoryplayer = this.mc.thePlayer.inventory; + ItemStack itemstack = this.draggedStack == null ? inventoryplayer.getItemStack() : this.draggedStack; + +@@ -207,8 +212,11 @@ GL11.glTranslatef(0.0F, 0.0F, 32.0F); this.zLevel = 200.0F; itemRenderer.zLevel = 200.0F; -- itemRenderer.renderItemAndEffectIntoGUI(this.fontRenderer, this.mc.renderEngine, par1ItemStack, par2, par3); -- itemRenderer.renderItemOverlayIntoGUI(this.fontRenderer, this.mc.renderEngine, par1ItemStack, par2, par3 - (this.draggedStack == null ? 0 : 8), par4Str); +- itemRenderer.renderItemAndEffectIntoGUI(this.fontRenderer, this.mc.func_110434_K(), par1ItemStack, par2, par3); +- itemRenderer.renderItemOverlayIntoGUI(this.fontRenderer, this.mc.func_110434_K(), par1ItemStack, par2, par3 - (this.draggedStack == null ? 0 : 8), par4Str); + FontRenderer font = null; + if (par1ItemStack != null) font = par1ItemStack.getItem().getFontRenderer(par1ItemStack); + if (font == null) font = fontRenderer; -+ itemRenderer.renderItemAndEffectIntoGUI(font, this.mc.renderEngine, par1ItemStack, par2, par3); -+ itemRenderer.renderItemOverlayIntoGUI(font, this.mc.renderEngine, par1ItemStack, par2, par3 - (this.draggedStack == null ? 0 : 8), par4Str); ++ itemRenderer.renderItemAndEffectIntoGUI(font, this.mc.func_110434_K(), par1ItemStack, par2, par3); ++ itemRenderer.renderItemOverlayIntoGUI(font, this.mc.func_110434_K(), par1ItemStack, par2, par3 - (this.draggedStack == null ? 0 : 8), par4Str); this.zLevel = 0.0F; itemRenderer.zLevel = 0.0F; } -@@ -225,7 +229,8 @@ +@@ -229,7 +237,8 @@ } } @@ -32,7 +44,7 @@ } /** -@@ -238,6 +243,11 @@ +@@ -242,6 +251,11 @@ } protected void func_102021_a(List par1List, int par2, int par3) @@ -44,7 +56,7 @@ { if (!par1List.isEmpty()) { -@@ -251,7 +261,7 @@ +@@ -255,7 +269,7 @@ while (iterator.hasNext()) { String s = (String)iterator.next(); @@ -53,7 +65,7 @@ if (l > k) { -@@ -296,7 +306,7 @@ +@@ -300,7 +314,7 @@ for (int k2 = 0; k2 < par1List.size(); ++k2) { String s1 = (String)par1List.get(k2); diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch index b399126ec4..8512301890 100644 --- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch @@ -1,15 +1,15 @@ --- ../src_base/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java +++ ../src_work/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java -@@ -56,6 +56,8 @@ - private Slot field_74235_v = null; - private boolean field_74234_w = false; +@@ -61,6 +61,8 @@ + private Slot field_74235_v; + private boolean field_74234_w; private CreativeCrafting field_82324_x; + private static int tabPage = 0; + private int maxPages = 0; public GuiContainerCreative(EntityPlayer par1EntityPlayer) { -@@ -196,7 +198,7 @@ +@@ -201,7 +203,7 @@ return; } @@ -18,7 +18,7 @@ { if (par3 == 0) { -@@ -274,6 +276,13 @@ +@@ -279,6 +281,13 @@ this.setCurrentCreativeTab(CreativeTabs.creativeTabArray[i]); this.field_82324_x = new CreativeCrafting(this.mc); this.mc.thePlayer.inventoryContainer.addCraftingToCrafters(this.field_82324_x); @@ -32,16 +32,16 @@ } else { -@@ -408,7 +417,7 @@ +@@ -413,7 +422,7 @@ { CreativeTabs creativetabs = CreativeTabs.creativeTabArray[selectedTabIndex]; - if (creativetabs.drawInForegroundOfTab()) + if (creativetabs != null && creativetabs.drawInForegroundOfTab()) { - this.fontRenderer.drawString(creativetabs.getTranslatedTabLabel(), 8, 6, 4210752); + this.fontRenderer.drawString(I18n.func_135053_a(creativetabs.getTranslatedTabLabel()), 8, 6, 4210752); } -@@ -457,7 +466,7 @@ +@@ -462,7 +471,7 @@ { CreativeTabs creativetabs = acreativetabs[k1]; @@ -50,7 +50,7 @@ { this.setCurrentCreativeTab(creativetabs); return; -@@ -473,11 +482,17 @@ +@@ -478,11 +487,17 @@ */ private boolean needsScrollBars() { @@ -68,7 +68,7 @@ int i = selectedTabIndex; selectedTabIndex = par1CreativeTabs.getTabIndex(); ContainerCreative containercreative = (ContainerCreative)this.inventorySlots; -@@ -648,21 +663,42 @@ +@@ -653,21 +668,42 @@ super.drawScreen(par1, par2, par3); CreativeTabs[] acreativetabs = CreativeTabs.creativeTabArray; @@ -86,7 +86,7 @@ - if (this.renderCreativeInventoryHoveringText(creativetabs, par1, par2)) - { -+ if (creativetabs != null && renderCreativeInventoryHoveringText(creativetabs, par1, par2)) ++ if (creativetabs != null && this.renderCreativeInventoryHoveringText(creativetabs, par1, par2)) + { + rendered = true; break; @@ -100,7 +100,7 @@ + if (this.field_74235_v != null && selectedTabIndex == CreativeTabs.tabInventory.getTabIndex() && this.isPointInRegion(this.field_74235_v.xDisplayPosition, this.field_74235_v.yDisplayPosition, 16, 16, par1, par2)) { - this.drawCreativeTabHoveringText(StringTranslate.getInstance().translateKey("inventory.binSlot"), par1, par2); + this.drawCreativeTabHoveringText(I18n.func_135053_a("inventory.binSlot"), par1, par2); + } + + if (maxPages != 0) @@ -116,7 +116,7 @@ } GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); -@@ -681,14 +717,32 @@ +@@ -741,14 +777,32 @@ int k = acreativetabs.length; int l; @@ -128,7 +128,7 @@ + for (l = start; l < k; ++l) { CreativeTabs creativetabs1 = acreativetabs[l]; - this.mc.renderEngine.bindTexture("/gui/allitems.png"); + this.mc.func_110434_K().func_110577_a(field_110424_t); - if (creativetabs1.getTabIndex() != selectedTabIndex) + if (creativetabs1 != null && creativetabs1.getTabIndex() != selectedTabIndex) @@ -141,17 +141,17 @@ + { + if (creativetabs != CreativeTabs.tabAllSearch) + { -+ mc.renderEngine.bindTexture("/gui/allitems.png"); ++ this.mc.func_110434_K().func_110577_a(field_110424_t); + renderCreativeTab(CreativeTabs.tabAllSearch); + } + if (creativetabs != CreativeTabs.tabInventory) + { -+ mc.renderEngine.bindTexture("/gui/allitems.png"); ++ this.mc.func_110434_K().func_110577_a(field_110424_t); + renderCreativeTab(CreativeTabs.tabInventory); } } -@@ -706,6 +760,14 @@ +@@ -766,6 +820,14 @@ this.drawTexturedModalRect(i1, k + (int)((float)(l - k - 17) * this.currentScroll), 232 + (this.needsScrollBars() ? 0 : 12), 0, 12, 15); } @@ -166,7 +166,7 @@ this.renderCreativeTab(creativetabs); if (creativetabs == CreativeTabs.tabInventory) -@@ -716,6 +778,15 @@ +@@ -776,6 +838,15 @@ protected boolean func_74232_a(CreativeTabs par1CreativeTabs, int par2, int par3) { @@ -182,7 +182,7 @@ int k = par1CreativeTabs.getTabColumn(); int l = 28 * k; byte b0 = 0; -@@ -823,6 +894,7 @@ +@@ -883,6 +954,7 @@ } GL11.glDisable(GL11.GL_LIGHTING); @@ -190,16 +190,16 @@ this.drawTexturedModalRect(l, i1, j, k, 28, b0); this.zLevel = 100.0F; itemRenderer.zLevel = 100.0F; -@@ -830,7 +902,7 @@ +@@ -890,7 +962,7 @@ i1 += 8 + (flag1 ? 1 : -1); GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - ItemStack itemstack = new ItemStack(par1CreativeTabs.getTabIconItem()); + ItemStack itemstack = par1CreativeTabs.getIconItemStack(); - itemRenderer.renderItemAndEffectIntoGUI(this.fontRenderer, this.mc.renderEngine, itemstack, l, i1); - itemRenderer.renderItemOverlayIntoGUI(this.fontRenderer, this.mc.renderEngine, itemstack, l, i1); + itemRenderer.renderItemAndEffectIntoGUI(this.fontRenderer, this.mc.func_110434_K(), itemstack, l, i1); + itemRenderer.renderItemOverlayIntoGUI(this.fontRenderer, this.mc.func_110434_K(), itemstack, l, i1); GL11.glDisable(GL11.GL_LIGHTING); -@@ -852,6 +924,15 @@ +@@ -912,6 +984,15 @@ { this.mc.displayGuiScreen(new GuiStats(this, this.mc.statFileWriter)); } diff --git a/patches/minecraft/net/minecraft/client/model/ModelBase.java.patch b/patches/minecraft/net/minecraft/client/model/ModelBase.java.patch index 5694901320..d8c9903b7b 100644 --- a/patches/minecraft/net/minecraft/client/model/ModelBase.java.patch +++ b/patches/minecraft/net/minecraft/client/model/ModelBase.java.patch @@ -2,7 +2,7 @@ +++ ../src_work/minecraft/net/minecraft/client/model/ModelBase.java @@ -10,7 +10,6 @@ import net.minecraft.entity.Entity; - import net.minecraft.entity.EntityLiving; + import net.minecraft.entity.EntityLivingBase; -@SideOnly(Side.CLIENT) public abstract class ModelBase diff --git a/patches/minecraft/net/minecraft/client/model/ModelRenderer.java.patch b/patches/minecraft/net/minecraft/client/model/ModelRenderer.java.patch index 198154c5ed..85723365d2 100644 --- a/patches/minecraft/net/minecraft/client/model/ModelRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/model/ModelRenderer.java.patch @@ -8,7 +8,7 @@ public class ModelRenderer { /** The size of the texture file's width in pixels. */ -@@ -121,7 +120,8 @@ +@@ -117,7 +116,8 @@ this.rotationPointY = par2; this.rotationPointZ = par3; } @@ -18,7 +18,7 @@ public void render(float par1) { if (!this.isHidden) -@@ -204,6 +204,7 @@ +@@ -200,6 +200,7 @@ } } @@ -26,7 +26,7 @@ public void renderWithRotation(float par1) { if (!this.isHidden) -@@ -242,6 +243,7 @@ +@@ -238,6 +239,7 @@ /** * Allows the changing of Angles after a box has been rendered */ @@ -34,7 +34,7 @@ public void postRender(float par1) { if (!this.isHidden) -@@ -286,6 +288,7 @@ +@@ -282,6 +284,7 @@ /** * Compiles a GL display list for this model */ diff --git a/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch b/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch index e14ae7ac44..1b062e2c37 100644 --- a/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch +++ b/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java +++ ../src_work/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java -@@ -176,6 +176,11 @@ +@@ -186,6 +186,11 @@ import net.minecraft.world.storage.MapStorage; import org.lwjgl.input.Keyboard; @@ -12,7 +12,7 @@ @SideOnly(Side.CLIENT) public class NetClientHandler extends NetHandler { -@@ -762,7 +767,7 @@ +@@ -778,7 +783,7 @@ public void handleKickDisconnect(Packet255KickDisconnect par1Packet255KickDisconnect) { @@ -21,20 +21,20 @@ this.disconnected = true; this.mc.loadWorld((WorldClient)null); -@@ -844,7 +849,11 @@ +@@ -860,7 +865,11 @@ public void handleChat(Packet3Chat par1Packet3Chat) { par1Packet3Chat = FMLNetworkHandler.handleChatMessage(this, par1Packet3Chat); -- this.mc.ingameGUI.getChatGUI().printChatMessage(par1Packet3Chat.message); +- this.mc.ingameGUI.getChatGUI().printChatMessage(ChatMessageComponent.func_111078_c(par1Packet3Chat.message).func_111068_a(true)); + ClientChatReceivedEvent event = new ClientChatReceivedEvent(par1Packet3Chat.message); + if (!MinecraftForge.EVENT_BUS.post(event) && event.message != null) + { -+ this.mc.ingameGUI.getChatGUI().printChatMessage(par1Packet3Chat.message); ++ this.mc.ingameGUI.getChatGUI().printChatMessage(ChatMessageComponent.func_111078_c(event.message).func_111068_a(true)); + } } public void handleAnimation(Packet18Animation par1Packet18Animation) -@@ -1278,6 +1287,10 @@ +@@ -1329,6 +1338,10 @@ { tileentity.readFromNBT(par1Packet132TileEntityData.customParam1); } diff --git a/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java.patch b/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java.patch index 4a5c81cddc..f7171d1639 100644 --- a/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java.patch +++ b/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java +++ ../src_work/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java -@@ -20,6 +20,10 @@ +@@ -22,6 +22,10 @@ import net.minecraft.world.EnumGameType; import net.minecraft.world.World; @@ -11,7 +11,7 @@ @SideOnly(Side.CLIENT) public class PlayerControllerMP { -@@ -124,6 +128,12 @@ +@@ -125,6 +129,12 @@ */ public boolean onPlayerDestroyBlock(int par1, int par2, int par3, int par4) { @@ -24,7 +24,7 @@ if (this.currentGameType.isAdventure() && !this.mc.thePlayer.canCurrentToolHarvestBlock(par1, par2, par3)) { return false; -@@ -141,7 +151,7 @@ +@@ -146,7 +156,7 @@ { worldclient.playAuxSFX(2001, par1, par2, par3, block.blockID + (worldclient.getBlockMetadata(par1, par2, par3) << 12)); int i1 = worldclient.getBlockMetadata(par1, par2, par3); @@ -33,7 +33,7 @@ if (flag) { -@@ -342,6 +352,12 @@ +@@ -347,6 +357,12 @@ float f2 = (float)par8Vec3.zCoord - (float)par6; boolean flag = false; int i1; @@ -46,7 +46,7 @@ if (!par1EntityPlayer.isSneaking() || par1EntityPlayer.getHeldItem() == null) { -@@ -384,7 +400,15 @@ +@@ -389,7 +405,15 @@ } else { @@ -63,7 +63,7 @@ } } -@@ -406,9 +430,10 @@ +@@ -411,9 +435,10 @@ { par1EntityPlayer.inventory.mainInventory[par1EntityPlayer.inventory.currentItem] = itemstack1; diff --git a/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.java.patch b/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.java.patch index 124915f7fc..5a0f5e5cdf 100644 --- a/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.java.patch +++ b/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.java.patch @@ -23,7 +23,7 @@ } /** -@@ -291,6 +297,12 @@ +@@ -296,6 +302,12 @@ */ protected void updateWeather() { diff --git a/patches/minecraft/net/minecraft/client/particle/EffectRenderer.java.patch b/patches/minecraft/net/minecraft/client/particle/EffectRenderer.java.patch index 2c83d010a2..d472b2ce59 100644 --- a/patches/minecraft/net/minecraft/client/particle/EffectRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/particle/EffectRenderer.java.patch @@ -1,14 +1,14 @@ --- ../src_base/minecraft/net/minecraft/client/particle/EffectRenderer.java +++ ../src_work/minecraft/net/minecraft/client/particle/EffectRenderer.java -@@ -11,6 +11,7 @@ - import net.minecraft.client.renderer.Tessellator; +@@ -13,6 +13,7 @@ + import net.minecraft.client.resources.ResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -@@ -59,9 +60,13 @@ +@@ -63,9 +64,13 @@ for (int j = 0; j < this.fxLayers[i].size(); ++j) { EntityFX entityfx = (EntityFX)this.fxLayers[i].get(j); @@ -25,7 +25,7 @@ { this.fxLayers[i].remove(j--); } -@@ -111,6 +116,7 @@ +@@ -115,6 +120,7 @@ for (int j = 0; j < this.fxLayers[i].size(); ++j) { EntityFX entityfx = (EntityFX)this.fxLayers[i].get(j); @@ -33,15 +33,15 @@ tessellator.setBrightness(entityfx.getBrightnessForRender(par2)); entityfx.renderParticle(tessellator, par2, f1, f5, f2, f3, f4); } -@@ -139,6 +145,7 @@ - for (int i = 0; i < this.fxLayers[b0].size(); ++i) +@@ -145,6 +151,7 @@ + for (int i = 0; i < list.size(); ++i) { - EntityFX entityfx = (EntityFX)this.fxLayers[b0].get(i); + EntityFX entityfx = (EntityFX)list.get(i); + if (entityfx == null) continue; tessellator.setBrightness(entityfx.getBrightnessForRender(par2)); - entityfx.renderParticle(tessellator, par2, f1, f5, f2, f3, f4); + entityfx.renderParticle(tessellator, par2, f2, f6, f3, f4, f5); } -@@ -157,9 +164,9 @@ +@@ -163,9 +170,9 @@ public void addBlockDestroyEffects(int par1, int par2, int par3, int par4, int par5) { @@ -54,7 +54,7 @@ byte b0 = 4; for (int j1 = 0; j1 < b0; ++j1) -@@ -232,4 +239,13 @@ +@@ -237,4 +244,13 @@ { return "" + (this.fxLayers[0].size() + this.fxLayers[1].size() + this.fxLayers[2].size()); } diff --git a/patches/minecraft/net/minecraft/client/particle/EntityDiggingFX.java.patch b/patches/minecraft/net/minecraft/client/particle/EntityDiggingFX.java.patch index 55fbd03204..adeb00887d 100644 --- a/patches/minecraft/net/minecraft/client/particle/EntityDiggingFX.java.patch +++ b/patches/minecraft/net/minecraft/client/particle/EntityDiggingFX.java.patch @@ -1,21 +1,26 @@ --- ../src_base/minecraft/net/minecraft/client/particle/EntityDiggingFX.java +++ ../src_work/minecraft/net/minecraft/client/particle/EntityDiggingFX.java -@@ -11,20 +11,22 @@ +@@ -10,20 +10,27 @@ public class EntityDiggingFX extends EntityFX { private Block blockInstance; + private int side; - public EntityDiggingFX(World par1World, double par2, double par4, double par6, double par8, double par10, double par12, Block par14Block, int par15, int par16, RenderEngine par17RenderEngine) + public EntityDiggingFX(World par1World, double par2, double par4, double par6, double par8, double par10, double par12, Block par14Block, int par15) { ++ this(par1World, par2, par4, par6, par8, par10, par12, par14Block, par15, par1World.rand.nextInt(6)); ++ } ++ ++ public EntityDiggingFX(World par1World, double par2, double par4, double par6, double par8, double par10, double par12, Block par14Block, int par15, int side) ++ { super(par1World, par2, par4, par6, par8, par10, par12); this.blockInstance = par14Block; -- this.setParticleIcon(par17RenderEngine, par14Block.getIcon(0, par16)); -+ this.setParticleIcon(par17RenderEngine, par14Block.getIcon(par15, par16)); +- this.func_110125_a(par14Block.getIcon(0, par15)); ++ this.func_110125_a(par14Block.getIcon(side, par15)); this.particleGravity = par14Block.blockParticleGravity; this.particleRed = this.particleGreen = this.particleBlue = 0.6F; this.particleScale /= 2.0F; -+ this.side = par15; ++ this.side = side; } public EntityDiggingFX func_70596_a(int par1, int par2, int par3) diff --git a/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch index 6b1e65a13b..ad8f316606 100644 --- a/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch @@ -1,8 +1,8 @@ --- ../src_base/minecraft/net/minecraft/client/renderer/EntityRenderer.java +++ ../src_work/minecraft/net/minecraft/client/renderer/EntityRenderer.java -@@ -37,6 +37,11 @@ +@@ -40,6 +40,11 @@ import org.lwjgl.opengl.GLContext; - import org.lwjgl.util.glu.GLU; + import org.lwjgl.util.glu.Project; +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.event.DrawBlockHighlightEvent; @@ -12,7 +12,7 @@ @SideOnly(Side.CLIENT) public class EntityRenderer { -@@ -339,8 +344,15 @@ +@@ -354,8 +359,15 @@ */ private void updateFovModifierHand() { @@ -30,87 +30,84 @@ this.fovModifierHandPrev = this.fovModifierHand; this.fovModifierHand += (this.fovMultiplierTemp - this.fovModifierHand) * 0.5F; -@@ -366,7 +378,7 @@ +@@ -381,7 +393,7 @@ } else { - EntityPlayer entityplayer = (EntityPlayer)this.mc.renderViewEntity; -+ EntityLiving entityplayer = (EntityLiving)this.mc.renderViewEntity; ++ EntityLivingBase entityplayer = (EntityLivingBase)this.mc.renderViewEntity; float f1 = 70.0F; if (par2) -@@ -453,15 +465,7 @@ +@@ -468,15 +480,7 @@ if (!this.mc.gameSettings.debugCamEnable) { -- int i = this.mc.theWorld.getBlockId(MathHelper.floor_double(entityliving.posX), MathHelper.floor_double(entityliving.posY), MathHelper.floor_double(entityliving.posZ)); +- int i = this.mc.theWorld.getBlockId(MathHelper.floor_double(entitylivingbase.posX), MathHelper.floor_double(entitylivingbase.posY), MathHelper.floor_double(entitylivingbase.posZ)); - - if (i == Block.bed.blockID) - { -- int j = this.mc.theWorld.getBlockMetadata(MathHelper.floor_double(entityliving.posX), MathHelper.floor_double(entityliving.posY), MathHelper.floor_double(entityliving.posZ)); +- int j = this.mc.theWorld.getBlockMetadata(MathHelper.floor_double(entitylivingbase.posX), MathHelper.floor_double(entitylivingbase.posY), MathHelper.floor_double(entitylivingbase.posZ)); - int k = j & 3; - GL11.glRotatef((float)(k * 90), 0.0F, 1.0F, 0.0F); - } - -+ ForgeHooksClient.orientBedCamera(mc, entityliving); - GL11.glRotatef(entityliving.prevRotationYaw + (entityliving.rotationYaw - entityliving.prevRotationYaw) * par1 + 180.0F, 0.0F, -1.0F, 0.0F); - GL11.glRotatef(entityliving.prevRotationPitch + (entityliving.rotationPitch - entityliving.prevRotationPitch) * par1, -1.0F, 0.0F, 0.0F); ++ ForgeHooksClient.orientBedCamera(mc, entitylivingbase); + GL11.glRotatef(entitylivingbase.prevRotationYaw + (entitylivingbase.rotationYaw - entitylivingbase.prevRotationYaw) * par1 + 180.0F, 0.0F, -1.0F, 0.0F); + GL11.glRotatef(entitylivingbase.prevRotationPitch + (entitylivingbase.rotationPitch - entitylivingbase.prevRotationPitch) * par1, -1.0F, 0.0F, 0.0F); } -@@ -1142,23 +1146,20 @@ +@@ -1152,7 +1156,10 @@ { RenderHelper.enableStandardItemLighting(); this.mc.mcProfiler.endStartSection("entities"); + ForgeHooksClient.setRenderPass(0); - renderglobal.renderEntities(entityliving.getPosition(par1), frustrum, par1); -- this.enableLightmap((double)par1); -- this.mc.mcProfiler.endStartSection("litParticles"); -- effectrenderer.renderLitParticles(entityliving, par1); -- RenderHelper.disableStandardItemLighting(); -- this.setupFog(0, par1); -- this.mc.mcProfiler.endStartSection("particles"); -- effectrenderer.renderParticles(entityliving, par1); -- this.disableLightmap((double)par1); -+ ForgeHooksClient.setRenderPass(-1); + renderglobal.renderEntities(entitylivingbase.getPosition(par1), frustrum, par1); ++ ForgeHooksClient.setRenderPass(0); ++ /* Forge: Moved down + this.enableLightmap((double)par1); + this.mc.mcProfiler.endStartSection("litParticles"); + effectrenderer.renderLitParticles(entitylivingbase, par1); +@@ -1161,13 +1168,17 @@ + this.mc.mcProfiler.endStartSection("particles"); + effectrenderer.renderParticles(entitylivingbase, par1); + this.disableLightmap((double)par1); ++ */ - if (this.mc.objectMouseOver != null && entityliving.isInsideOfMaterial(Material.water) && entityliving instanceof EntityPlayer && !this.mc.gameSettings.hideGUI) + if (this.mc.objectMouseOver != null && entitylivingbase.isInsideOfMaterial(Material.water) && entitylivingbase instanceof EntityPlayer && !this.mc.gameSettings.hideGUI) { - entityplayer = (EntityPlayer)entityliving; + entityplayer = (EntityPlayer)entitylivingbase; GL11.glDisable(GL11.GL_ALPHA_TEST); this.mc.mcProfiler.endStartSection("outline"); -- renderglobal.drawBlockBreaking(entityplayer, this.mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), par1); -- renderglobal.drawSelectionBox(entityplayer, this.mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), par1); +- renderglobal.drawSelectionBox(entityplayer, this.mc.objectMouseOver, 0, par1); + if (!ForgeHooksClient.onDrawBlockHighlight(renderglobal, entityplayer, mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), par1)) + { -+ renderglobal.drawBlockBreaking(entityplayer, this.mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), par1); -+ renderglobal.drawSelectionBox(entityplayer, this.mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), par1); ++ renderglobal.drawSelectionBox(entityplayer, this.mc.objectMouseOver, 0, par1); + } GL11.glEnable(GL11.GL_ALPHA_TEST); } } -@@ -1213,6 +1214,13 @@ - renderglobal.sortAndRender(entityliving, 1, (double)par1); +@@ -1222,6 +1233,13 @@ + renderglobal.sortAndRender(entitylivingbase, 1, (double)par1); } + RenderHelper.enableStandardItemLighting(); + this.mc.mcProfiler.endStartSection("entities"); + ForgeHooksClient.setRenderPass(1); -+ renderglobal.renderEntities(entityliving.getPosition(par1), frustrum, par1); ++ renderglobal.renderEntities(entitylivingbase.getPosition(par1), frustrum, par1); + ForgeHooksClient.setRenderPass(-1); + RenderHelper.disableStandardItemLighting(); + GL11.glDepthMask(true); GL11.glEnable(GL11.GL_CULL_FACE); GL11.glDisable(GL11.GL_BLEND); -@@ -1222,15 +1230,18 @@ - entityplayer = (EntityPlayer)entityliving; +@@ -1231,14 +1249,17 @@ + entityplayer = (EntityPlayer)entitylivingbase; GL11.glDisable(GL11.GL_ALPHA_TEST); this.mc.mcProfiler.endStartSection("outline"); -- renderglobal.drawBlockBreaking(entityplayer, this.mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), par1); -- renderglobal.drawSelectionBox(entityplayer, this.mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), par1); +- renderglobal.drawSelectionBox(entityplayer, this.mc.objectMouseOver, 0, par1); + if (!ForgeHooksClient.onDrawBlockHighlight(renderglobal, entityplayer, mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), par1)) + { -+ renderglobal.drawBlockBreaking(entityplayer, this.mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), par1); -+ renderglobal.drawSelectionBox(entityplayer, this.mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), par1); ++ renderglobal.drawSelectionBox(entityplayer, this.mc.objectMouseOver, 0, par1); + } GL11.glEnable(GL11.GL_ALPHA_TEST); } @@ -118,12 +115,12 @@ this.mc.mcProfiler.endStartSection("destroyProgress"); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); -- renderglobal.drawBlockDamageTexture(Tessellator.instance, (EntityPlayer)entityliving, par1); -+ renderglobal.drawBlockDamageTexture(Tessellator.instance, entityliving, par1); +- renderglobal.drawBlockDamageTexture(Tessellator.instance, (EntityPlayer)entitylivingbase, par1); ++ renderglobal.drawBlockDamageTexture(Tessellator.instance, entitylivingbase, par1); GL11.glDisable(GL11.GL_BLEND); this.mc.mcProfiler.endStartSection("weather"); this.renderRainSnow(par1); -@@ -1240,6 +1251,19 @@ +@@ -1248,6 +1269,20 @@ { this.renderCloudsCheck(renderglobal, par1); } @@ -131,12 +128,13 @@ + //Forge: Moved section from above, now particles are the last thing to render. + this.enableLightmap((double)par1); + this.mc.mcProfiler.endStartSection("litParticles"); -+ effectrenderer.renderLitParticles(entityliving, par1); ++ effectrenderer.renderLitParticles(entitylivingbase, par1); + RenderHelper.disableStandardItemLighting(); + this.setupFog(0, par1); + this.mc.mcProfiler.endStartSection("particles"); -+ effectrenderer.renderParticles(entityliving, par1); ++ effectrenderer.renderParticles(entitylivingbase, par1); + this.disableLightmap((double)par1); ++ //Forge: End Move + + this.mc.mcProfiler.endStartSection("FRenderLast"); + ForgeHooksClient.dispatchRenderLast(renderglobal, par1); diff --git a/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch index d9d2342f19..ecb5712328 100644 --- a/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch @@ -1,7 +1,7 @@ --- ../src_base/minecraft/net/minecraft/client/renderer/ItemRenderer.java +++ ../src_work/minecraft/net/minecraft/client/renderer/ItemRenderer.java -@@ -14,6 +14,8 @@ - import net.minecraft.entity.EntityLiving; +@@ -17,6 +17,8 @@ + import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.util.MathHelper; -@@ -21,6 +23,13 @@ +@@ -24,6 +26,13 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -23,25 +23,25 @@ @SideOnly(Side.CLIENT) public class ItemRenderer { -@@ -46,15 +55,40 @@ - this.mc = par1Minecraft; - this.mapItemRenderer = new MapItemRenderer(par1Minecraft.fontRenderer, par1Minecraft.gameSettings, par1Minecraft.renderEngine); +@@ -54,15 +63,32 @@ + this.mapItemRenderer = new MapItemRenderer(par1Minecraft.gameSettings, par1Minecraft.func_110434_K()); } -+ -+ public void renderItem(EntityLiving par1EntityLiving, ItemStack par2ItemStack, int par3) -+ { -+ this.renderItem(par1EntityLiving, par2ItemStack, par3, ItemRenderType.EQUIPPED); -+ } ++ public void renderItem(EntityLivingBase par1EntityLivingBase, ItemStack par2ItemStack, int par3) ++ { ++ this.renderItem(par1EntityLivingBase, par2ItemStack, par3, ItemRenderType.EQUIPPED); ++ } ++ /** * Renders the item stack for being in an entity's hand Args: itemStack */ -- public void renderItem(EntityLiving par1EntityLiving, ItemStack par2ItemStack, int par3) -+ public void renderItem(EntityLiving par1EntityLiving, ItemStack par2ItemStack, int par3, ItemRenderType type) +- public void renderItem(EntityLivingBase par1EntityLivingBase, ItemStack par2ItemStack, int par3) ++ public void renderItem(EntityLivingBase par1EntityLivingBase, ItemStack par2ItemStack, int par3, ItemRenderType type) { GL11.glPushMatrix(); + TextureManager texturemanager = this.mc.func_110434_K(); -- if (par2ItemStack.getItemSpriteNumber() == 0 && Block.blocksList[par2ItemStack.itemID] != null && RenderBlocks.renderItemIn3d(Block.blocksList[par2ItemStack.itemID].getRenderType())) +- if (par2ItemStack.getItemSpriteNumber() == 0 && par2ItemStack.itemID < Block.blocksList.length && Block.blocksList[par2ItemStack.itemID] != null && RenderBlocks.renderItemIn3d(Block.blocksList[par2ItemStack.itemID].getRenderType())) + Block block = null; + if (par2ItemStack.getItem() instanceof ItemBlock && par2ItemStack.itemID < Block.blocksList.length) + { @@ -49,24 +49,25 @@ + } + + IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(par2ItemStack, type); -+ //Backwards compatibility, Remove in 1.6, For 1.5 if they implement EQUIPPED then -+ //they must handle it how it was when 1.5 began. -+ if (customRenderer == null && type == ItemRenderType.EQUIPPED_FIRST_PERSON) -+ { -+ type = ItemRenderType.EQUIPPED; -+ customRenderer = MinecraftForgeClient.getItemRenderer(par2ItemStack, type); -+ } -+ + if (customRenderer != null) + { -+ this.mc.renderEngine.bindTexture(par2ItemStack.getItemSpriteNumber() == 0 ? "/terrain.png" : "/gui/items.png"); -+ ForgeHooksClient.renderEquippedItem(type, customRenderer, renderBlocksInstance, par1EntityLiving, par2ItemStack); ++ texturemanager.func_110577_a(texturemanager.func_130087_a(par2ItemStack.getItemSpriteNumber())); ++ ForgeHooksClient.renderEquippedItem(type, customRenderer, renderBlocksInstance, par1EntityLivingBase, par2ItemStack); + } + else if (block != null && par2ItemStack.getItemSpriteNumber() == 0 && RenderBlocks.renderItemIn3d(Block.blocksList[par2ItemStack.itemID].getRenderType())) { - this.mc.renderEngine.bindTexture("/terrain.png"); + texturemanager.func_110577_a(texturemanager.func_130087_a(0)); this.renderBlocksInstance.renderBlockAsItem(Block.blocksList[par2ItemStack.itemID], par2ItemStack.getItemDamage(), 1.0F); -@@ -272,7 +306,7 @@ +@@ -94,7 +120,7 @@ + GL11.glTranslatef(-0.9375F, -0.0625F, 0.0F); + renderItemIn2D(tessellator, f1, f2, f, f3, icon.getOriginX(), icon.getOriginY(), 0.0625F); + +- if (par2ItemStack.hasEffect() && par3 == 0) ++ if (par2ItemStack.hasEffect(par3)) + { + GL11.glDepthFunc(GL11.GL_EQUAL); + GL11.glDisable(GL11.GL_LIGHTING); +@@ -266,7 +292,7 @@ Render render; RenderPlayer renderplayer; @@ -74,8 +75,8 @@ + if (itemstack != null && itemstack.getItem() instanceof ItemMap) { GL11.glPushMatrix(); - f4 = 0.8F; -@@ -340,11 +374,20 @@ + f12 = 0.8F; +@@ -333,11 +359,20 @@ tessellator.addVertexWithUV((double)(128 + b0), (double)(0 - b0), 0.0D, 1.0D, 0.0D); tessellator.addVertexWithUV((double)(0 - b0), (double)(0 - b0), 0.0D, 0.0D, 0.0D); tessellator.draw(); @@ -83,7 +84,7 @@ - - if (mapdata != null) - { -- this.mapItemRenderer.renderMap(this.mc.thePlayer, this.mc.renderEngine, mapdata); +- this.mapItemRenderer.renderMap(this.mc.thePlayer, this.mc.func_110434_K(), mapdata); + + IItemRenderer custom = MinecraftForgeClient.getItemRenderer(itemstack, FIRST_PERSON_MAP); + MapData mapdata = ((ItemMap)itemstack.getItem()).getMapData(itemstack, this.mc.theWorld); @@ -92,34 +93,34 @@ + { + if (mapdata != null) + { -+ this.mapItemRenderer.renderMap(this.mc.thePlayer, this.mc.renderEngine, mapdata); ++ this.mapItemRenderer.renderMap(this.mc.thePlayer, this.mc.func_110434_K(), mapdata); + } + } + else + { -+ custom.renderItem(FIRST_PERSON_MAP, itemstack, mc.thePlayer, mc.renderEngine, mapdata); ++ custom.renderItem(FIRST_PERSON_MAP, itemstack, mc.thePlayer, mc.func_110434_K(), mapdata); } GL11.glPopMatrix(); -@@ -446,17 +489,20 @@ +@@ -439,17 +474,20 @@ if (itemstack.getItem().requiresMultipleRenderPasses()) { - this.renderItem(entityclientplayermp, itemstack, 0); - int i1 = Item.itemsList[itemstack.itemID].getColorFromItemStack(itemstack, 1); -- f10 = (float)(i1 >> 16 & 255) / 255.0F; -- f11 = (float)(i1 >> 8 & 255) / 255.0F; -- f12 = (float)(i1 & 255) / 255.0F; -- GL11.glColor4f(f3 * f10, f3 * f11, f3 * f12, 1.0F); +- f11 = (float)(i1 >> 16 & 255) / 255.0F; +- f13 = (float)(i1 >> 8 & 255) / 255.0F; +- f14 = (float)(i1 & 255) / 255.0F; +- GL11.glColor4f(f5 * f11, f5 * f13, f5 * f14, 1.0F); - this.renderItem(entityclientplayermp, itemstack, 1); + this.renderItem(entityclientplayermp, itemstack, 0, ItemRenderType.EQUIPPED_FIRST_PERSON); + for (int x = 1; x < itemstack.getItem().getRenderPasses(itemstack.getItemDamage()); x++) + { + int i1 = Item.itemsList[itemstack.itemID].getColorFromItemStack(itemstack, x); -+ f10 = (float)(i1 >> 16 & 255) / 255.0F; -+ f11 = (float)(i1 >> 8 & 255) / 255.0F; -+ f12 = (float)(i1 & 255) / 255.0F; -+ GL11.glColor4f(f3 * f10, f3 * f11, f3 * f12, 1.0F); ++ f11 = (float)(i1 >> 16 & 255) / 255.0F; ++ f13 = (float)(i1 >> 8 & 255) / 255.0F; ++ f14 = (float)(i1 & 255) / 255.0F; ++ GL11.glColor4f(f5 * f11, f5 * f13, f5 * f14, 1.0F); + this.renderItem(entityclientplayermp, itemstack, x, ItemRenderType.EQUIPPED_FIRST_PERSON); + } } diff --git a/patches/minecraft/net/minecraft/client/renderer/OpenGlHelper.java.patch b/patches/minecraft/net/minecraft/client/renderer/OpenGlHelper.java.patch index 4cddf89efe..f2af3b8a88 100644 --- a/patches/minecraft/net/minecraft/client/renderer/OpenGlHelper.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/OpenGlHelper.java.patch @@ -3,7 +3,7 @@ @@ -25,6 +25,10 @@ * True if the renderer supports multitextures and the OpenGL version != 1.3 */ - private static boolean useMultitextureARB = false; + private static boolean useMultitextureARB; + + /* Stores the last values sent into setLightmapTextureCoords */ + public static float lastBrightnessX = 0.0f; diff --git a/patches/minecraft/net/minecraft/client/renderer/RenderBlocks.java.patch b/patches/minecraft/net/minecraft/client/renderer/RenderBlocks.java.patch index 282a42f694..4604459992 100644 --- a/patches/minecraft/net/minecraft/client/renderer/RenderBlocks.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/RenderBlocks.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/client/renderer/RenderBlocks.java +++ ../src_work/minecraft/net/minecraft/client/renderer/RenderBlocks.java -@@ -44,6 +44,8 @@ +@@ -45,6 +45,8 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -9,7 +9,7 @@ @SideOnly(Side.CLIENT) public class RenderBlocks { -@@ -533,9 +535,8 @@ +@@ -534,9 +536,8 @@ public boolean renderBlockBed(Block par1Block, int par2, int par3, int par4) { Tessellator tessellator = Tessellator.instance; @@ -21,7 +21,7 @@ float f = 0.5F; float f1 = 1.0F; float f2 = 0.8F; -@@ -544,6 +545,7 @@ +@@ -545,6 +546,7 @@ tessellator.setBrightness(j1); tessellator.setColorOpaque_F(f, f, f); Icon icon = this.getBlockIcon(par1Block, this.blockAccess, par2, par3, par4, 0); @@ -29,7 +29,7 @@ double d0 = (double)icon.getMinU(); double d1 = (double)icon.getMaxU(); double d2 = (double)icon.getMinV(); -@@ -560,6 +562,7 @@ +@@ -561,6 +563,7 @@ tessellator.setBrightness(par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3 + 1, par4)); tessellator.setColorOpaque_F(f1, f1, f1); icon = this.getBlockIcon(par1Block, this.blockAccess, par2, par3, par4, 1); @@ -37,7 +37,7 @@ d0 = (double)icon.getMinU(); d1 = (double)icon.getMaxU(); d2 = (double)icon.getMinV(); -@@ -2351,7 +2354,7 @@ +@@ -2358,7 +2361,7 @@ double d9; double d10; @@ -46,7 +46,7 @@ { float f1 = 0.2F; float f2 = 0.0625F; -@@ -2371,7 +2374,7 @@ +@@ -2378,7 +2381,7 @@ d0 = d5; } @@ -55,7 +55,7 @@ { tessellator.addVertexWithUV((double)((float)par2 + f1), (double)((float)par3 + f + f2), (double)(par4 + 1), d2, d1); tessellator.addVertexWithUV((double)(par2 + 0), (double)((float)(par3 + 0) + f2), (double)(par4 + 1), d2, d3); -@@ -2383,7 +2386,7 @@ +@@ -2390,7 +2393,7 @@ tessellator.addVertexWithUV((double)((float)par2 + f1), (double)((float)par3 + f + f2), (double)(par4 + 1), d2, d1); } @@ -64,7 +64,7 @@ { tessellator.addVertexWithUV((double)((float)(par2 + 1) - f1), (double)((float)par3 + f + f2), (double)(par4 + 0), d0, d1); tessellator.addVertexWithUV((double)(par2 + 1 - 0), (double)((float)(par3 + 0) + f2), (double)(par4 + 0), d0, d3); -@@ -2395,7 +2398,7 @@ +@@ -2402,7 +2405,7 @@ tessellator.addVertexWithUV((double)((float)(par2 + 1) - f1), (double)((float)par3 + f + f2), (double)(par4 + 0), d0, d1); } @@ -73,7 +73,7 @@ { tessellator.addVertexWithUV((double)(par2 + 0), (double)((float)par3 + f + f2), (double)((float)par4 + f1), d2, d1); tessellator.addVertexWithUV((double)(par2 + 0), (double)((float)(par3 + 0) + f2), (double)(par4 + 0), d2, d3); -@@ -2407,7 +2410,7 @@ +@@ -2414,7 +2417,7 @@ tessellator.addVertexWithUV((double)(par2 + 0), (double)((float)par3 + f + f2), (double)((float)par4 + f1), d2, d1); } @@ -82,7 +82,7 @@ { tessellator.addVertexWithUV((double)(par2 + 1), (double)((float)par3 + f + f2), (double)((float)(par4 + 1) - f1), d0, d1); tessellator.addVertexWithUV((double)(par2 + 1), (double)((float)(par3 + 0) + f2), (double)(par4 + 1 - 0), d0, d3); -@@ -2419,7 +2422,7 @@ +@@ -2426,7 +2429,7 @@ tessellator.addVertexWithUV((double)(par2 + 1), (double)((float)par3 + f + f2), (double)((float)(par4 + 1) - f1), d0, d1); } @@ -91,3 +91,18 @@ { d5 = (double)par2 + 0.5D + 0.5D; d6 = (double)par2 + 0.5D - 0.5D; +@@ -3057,10 +3060,10 @@ + double d17 = (double)par2 + 0.5D + 0.0625D; + double d18 = (double)par4 + 0.5D - 0.0625D; + double d19 = (double)par4 + 0.5D + 0.0625D; +- boolean flag = par1BlockPane.canThisPaneConnectToThisBlockID(this.blockAccess.getBlockId(par2, par3, par4 - 1)); +- boolean flag1 = par1BlockPane.canThisPaneConnectToThisBlockID(this.blockAccess.getBlockId(par2, par3, par4 + 1)); +- boolean flag2 = par1BlockPane.canThisPaneConnectToThisBlockID(this.blockAccess.getBlockId(par2 - 1, par3, par4)); +- boolean flag3 = par1BlockPane.canThisPaneConnectToThisBlockID(this.blockAccess.getBlockId(par2 + 1, par3, par4)); ++ boolean flag = par1BlockPane.canPaneConnectTo(this.blockAccess,par2, par3, par4, NORTH); ++ boolean flag1 = par1BlockPane.canPaneConnectTo(this.blockAccess,par2, par3, par4, SOUTH); ++ boolean flag2 = par1BlockPane.canPaneConnectTo(this.blockAccess,par2, par3, par4, WEST); ++ boolean flag3 = par1BlockPane.canPaneConnectTo(this.blockAccess,par2, par3, par4, EAST); + boolean flag4 = par1BlockPane.shouldSideBeRendered(this.blockAccess, par2, par3 + 1, par4, 1); + boolean flag5 = par1BlockPane.shouldSideBeRendered(this.blockAccess, par2, par3 - 1, par4, 0); + double d20 = 0.01D; diff --git a/patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch b/patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch deleted file mode 100644 index 76198d5cf3..0000000000 --- a/patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- ../src_base/minecraft/net/minecraft/client/renderer/RenderEngine.java -+++ ../src_work/minecraft/net/minecraft/client/renderer/RenderEngine.java -@@ -28,6 +28,8 @@ - import org.lwjgl.opengl.GL11; - import org.lwjgl.opengl.GL12; - -+import net.minecraftforge.client.ForgeHooksClient; -+ - @SideOnly(Side.CLIENT) - public class RenderEngine - { -@@ -186,6 +188,7 @@ - - try - { -+ ForgeHooksClient.onTextureLoadPre(par1Str); - int i = GLAllocation.generateTextureNames(); - TextureFXManager.instance().bindTextureToName(par1Str, i); - boolean flag = par1Str.startsWith("%blur%"); -@@ -216,6 +219,7 @@ - } - - this.textureMap.put(s1, Integer.valueOf(i)); -+ ForgeHooksClient.onTextureLoad(par1Str, texturePack.getSelectedTexturePack()); - return i; - } - catch (Exception exception) -@@ -417,6 +421,7 @@ - { - this.textureMapBlocks.updateAnimations(); - this.textureMapItems.updateAnimations(); -+ this.resetBoundTexture(); //Forge: BugFix, Animations don't use our bindTexture, and thus don't change the cached texture. - } - - /** -@@ -515,6 +520,7 @@ - { - this.textureMapBlocks.refreshTextures(); - this.textureMapItems.refreshTextures(); -+ this.resetBoundTexture(); //Forge: BugFix, Animations don't use our bindTexture, and thus don't change the cached texture. - } - - public Icon getMissingIcon(int par1) diff --git a/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch b/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch index c5e5bf9015..7922399bd5 100644 --- a/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/client/renderer/RenderGlobal.java +++ ../src_work/minecraft/net/minecraft/client/renderer/RenderGlobal.java -@@ -65,6 +65,9 @@ +@@ -67,6 +67,9 @@ import org.lwjgl.opengl.ARBOcclusionQuery; import org.lwjgl.opengl.GL11; @@ -10,7 +10,7 @@ @SideOnly(Side.CLIENT) public class RenderGlobal implements IWorldAccess { -@@ -443,35 +446,47 @@ +@@ -446,35 +449,47 @@ */ public void renderEntities(Vec3 par1Vec3, ICamera par2ICamera, float par3) { @@ -26,32 +26,32 @@ else { this.theWorld.theProfiler.startSection("prepare"); -- TileEntityRenderer.instance.cacheActiveRenderInfo(this.theWorld, this.renderEngine, this.mc.fontRenderer, this.mc.renderViewEntity, par3); -- RenderManager.instance.cacheActiveRenderInfo(this.theWorld, this.renderEngine, this.mc.fontRenderer, this.mc.renderViewEntity, this.mc.pointedEntityLiving, this.mc.gameSettings, par3); +- TileEntityRenderer.instance.cacheActiveRenderInfo(this.theWorld, this.mc.func_110434_K(), this.mc.fontRenderer, this.mc.renderViewEntity, par3); +- RenderManager.instance.cacheActiveRenderInfo(this.theWorld, this.mc.func_110434_K(), this.mc.fontRenderer, this.mc.renderViewEntity, this.mc.pointedEntityLiving, this.mc.gameSettings, par3); - this.countEntitiesTotal = 0; - this.countEntitiesRendered = 0; - this.countEntitiesHidden = 0; -- EntityLiving entityliving = this.mc.renderViewEntity; -- RenderManager.renderPosX = entityliving.lastTickPosX + (entityliving.posX - entityliving.lastTickPosX) * (double)par3; -- RenderManager.renderPosY = entityliving.lastTickPosY + (entityliving.posY - entityliving.lastTickPosY) * (double)par3; -- RenderManager.renderPosZ = entityliving.lastTickPosZ + (entityliving.posZ - entityliving.lastTickPosZ) * (double)par3; -- TileEntityRenderer.staticPlayerX = entityliving.lastTickPosX + (entityliving.posX - entityliving.lastTickPosX) * (double)par3; -- TileEntityRenderer.staticPlayerY = entityliving.lastTickPosY + (entityliving.posY - entityliving.lastTickPosY) * (double)par3; -- TileEntityRenderer.staticPlayerZ = entityliving.lastTickPosZ + (entityliving.posZ - entityliving.lastTickPosZ) * (double)par3; +- EntityLivingBase entitylivingbase = this.mc.renderViewEntity; +- RenderManager.renderPosX = entitylivingbase.lastTickPosX + (entitylivingbase.posX - entitylivingbase.lastTickPosX) * (double)par3; +- RenderManager.renderPosY = entitylivingbase.lastTickPosY + (entitylivingbase.posY - entitylivingbase.lastTickPosY) * (double)par3; +- RenderManager.renderPosZ = entitylivingbase.lastTickPosZ + (entitylivingbase.posZ - entitylivingbase.lastTickPosZ) * (double)par3; +- TileEntityRenderer.staticPlayerX = entitylivingbase.lastTickPosX + (entitylivingbase.posX - entitylivingbase.lastTickPosX) * (double)par3; +- TileEntityRenderer.staticPlayerY = entitylivingbase.lastTickPosY + (entitylivingbase.posY - entitylivingbase.lastTickPosY) * (double)par3; +- TileEntityRenderer.staticPlayerZ = entitylivingbase.lastTickPosZ + (entitylivingbase.posZ - entitylivingbase.lastTickPosZ) * (double)par3; + if (pass == 0) + { -+ TileEntityRenderer.instance.cacheActiveRenderInfo(this.theWorld, this.renderEngine, this.mc.fontRenderer, this.mc.renderViewEntity, par3); -+ RenderManager.instance.cacheActiveRenderInfo(this.theWorld, this.renderEngine, this.mc.fontRenderer, this.mc.renderViewEntity, this.mc.pointedEntityLiving, this.mc.gameSettings, par3); ++ TileEntityRenderer.instance.cacheActiveRenderInfo(this.theWorld, this.mc.func_110434_K(), this.mc.fontRenderer, this.mc.renderViewEntity, par3); ++ RenderManager.instance.cacheActiveRenderInfo(this.theWorld, this.mc.func_110434_K(), this.mc.fontRenderer, this.mc.renderViewEntity, this.mc.pointedEntityLiving, this.mc.gameSettings, par3); + this.countEntitiesTotal = 0; + this.countEntitiesRendered = 0; + this.countEntitiesHidden = 0; -+ EntityLiving entityliving = this.mc.renderViewEntity; -+ RenderManager.renderPosX = entityliving.lastTickPosX + (entityliving.posX - entityliving.lastTickPosX) * (double)par3; -+ RenderManager.renderPosY = entityliving.lastTickPosY + (entityliving.posY - entityliving.lastTickPosY) * (double)par3; -+ RenderManager.renderPosZ = entityliving.lastTickPosZ + (entityliving.posZ - entityliving.lastTickPosZ) * (double)par3; -+ TileEntityRenderer.staticPlayerX = entityliving.lastTickPosX + (entityliving.posX - entityliving.lastTickPosX) * (double)par3; -+ TileEntityRenderer.staticPlayerY = entityliving.lastTickPosY + (entityliving.posY - entityliving.lastTickPosY) * (double)par3; -+ TileEntityRenderer.staticPlayerZ = entityliving.lastTickPosZ + (entityliving.posZ - entityliving.lastTickPosZ) * (double)par3; ++ EntityLivingBase entitylivingbase = this.mc.renderViewEntity; ++ RenderManager.renderPosX = entitylivingbase.lastTickPosX + (entitylivingbase.posX - entitylivingbase.lastTickPosX) * (double)par3; ++ RenderManager.renderPosY = entitylivingbase.lastTickPosY + (entitylivingbase.posY - entitylivingbase.lastTickPosY) * (double)par3; ++ RenderManager.renderPosZ = entitylivingbase.lastTickPosZ + (entitylivingbase.posZ - entitylivingbase.lastTickPosZ) * (double)par3; ++ TileEntityRenderer.staticPlayerX = entitylivingbase.lastTickPosX + (entitylivingbase.posX - entitylivingbase.lastTickPosX) * (double)par3; ++ TileEntityRenderer.staticPlayerY = entitylivingbase.lastTickPosY + (entitylivingbase.posY - entitylivingbase.lastTickPosY) * (double)par3; ++ TileEntityRenderer.staticPlayerZ = entitylivingbase.lastTickPosZ + (entitylivingbase.posZ - entitylivingbase.lastTickPosZ) * (double)par3; + } this.mc.entityRenderer.enableLightmap((double)par3); this.theWorld.theProfiler.endStartSection("global"); @@ -71,7 +71,7 @@ ++this.countEntitiesRendered; if (entity.isInRangeToRenderVec3D(par1Vec3)) -@@ -485,6 +500,7 @@ +@@ -488,6 +503,7 @@ for (i = 0; i < list.size(); ++i) { entity = (Entity)list.get(i); @@ -79,7 +79,7 @@ if (entity.isInRangeToRenderVec3D(par1Vec3) && (entity.ignoreFrustumCheck || par2ICamera.isBoundingBoxInFrustum(entity.boundingBox) || entity.riddenByEntity == this.mc.thePlayer) && (entity != this.mc.renderViewEntity || this.mc.gameSettings.thirdPersonView != 0 || this.mc.renderViewEntity.isPlayerSleeping()) && this.theWorld.blockExists(MathHelper.floor_double(entity.posX), 0, MathHelper.floor_double(entity.posZ))) { -@@ -498,7 +514,11 @@ +@@ -501,7 +517,11 @@ for (i = 0; i < this.tileEntities.size(); ++i) { @@ -92,7 +92,7 @@ } this.mc.entityRenderer.disableLightmap((double)par3); -@@ -933,6 +953,12 @@ +@@ -936,6 +956,12 @@ */ public void renderSky(float par1) { @@ -105,7 +105,7 @@ if (this.mc.theWorld.provider.dimensionId == 1) { GL11.glDisable(GL11.GL_FOG); -@@ -1171,6 +1197,13 @@ +@@ -1174,6 +1200,13 @@ public void renderClouds(float par1) { @@ -119,15 +119,15 @@ if (this.mc.theWorld.provider.isSurfaceWorld()) { if (this.mc.gameSettings.fancyGraphics) -@@ -1599,6 +1632,11 @@ +@@ -1582,6 +1615,11 @@ } public void drawBlockDamageTexture(Tessellator par1Tessellator, EntityPlayer par2EntityPlayer, float par3) + { -+ drawBlockDamageTexture(par1Tessellator, (EntityLiving)par2EntityPlayer, par3); ++ drawBlockDamageTexture(par1Tessellator, (EntityLivingBase)par2EntityPlayer, par3); + } + -+ public void drawBlockDamageTexture(Tessellator par1Tessellator, EntityLiving par2EntityPlayer, float par3) ++ public void drawBlockDamageTexture(Tessellator par1Tessellator, EntityLivingBase par2EntityPlayer, float par3) { double d0 = par2EntityPlayer.lastTickPosX + (par2EntityPlayer.posX - par2EntityPlayer.lastTickPosX) * (double)par3; double d1 = par2EntityPlayer.lastTickPosY + (par2EntityPlayer.posY - par2EntityPlayer.lastTickPosY) * (double)par3; diff --git a/patches/minecraft/net/minecraft/client/renderer/Tessellator.java.patch b/patches/minecraft/net/minecraft/client/renderer/Tessellator.java.patch index a735c65efb..82dbc93aa4 100644 --- a/patches/minecraft/net/minecraft/client/renderer/Tessellator.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/Tessellator.java.patch @@ -23,7 +23,7 @@ * Boolean used to check whether quads should be drawn as two triangles. Initialized to false and never changed. */ @@ -25,16 +33,16 @@ - private static boolean tryVBO = false; + private static boolean tryVBO; /** The byte buffer used for GL allocation. */ - private ByteBuffer byteBuffer; @@ -44,10 +44,10 @@ /** Raw integer array. */ private int[] rawBuffer; @@ -110,10 +118,10 @@ - public boolean isDrawing = false; + public boolean isDrawing; /** Whether we are currently using VBO or not. */ -- private boolean useVBO = false; +- private boolean useVBO; + private static boolean useVBO = false; /** An IntBuffer used to store the indices of vertex buffer objects. */ @@ -57,7 +57,7 @@ /** * The index of the last VBO used. This is used in round-robin fashion, sequentially, through the vboCount vertex @@ -122,25 +130,28 @@ - private int vboIndex = 0; + private int vboIndex; /** Number of vertex buffer objects allocated for use. */ - private int vboCount = 10; diff --git a/patches/minecraft/net/minecraft/client/renderer/WorldRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/WorldRenderer.java.patch index 2329907e8b..49e9cd3eaf 100644 --- a/patches/minecraft/net/minecraft/client/renderer/WorldRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/WorldRenderer.java.patch @@ -1,23 +1,15 @@ --- ../src_base/minecraft/net/minecraft/client/renderer/WorldRenderer.java +++ ../src_work/minecraft/net/minecraft/client/renderer/WorldRenderer.java -@@ -17,13 +17,15 @@ - import net.minecraft.world.chunk.Chunk; - import org.lwjgl.opengl.GL11; - -+import net.minecraftforge.client.ForgeHooksClient; -+ - @SideOnly(Side.CLIENT) - public class WorldRenderer - { +@@ -23,7 +23,7 @@ /** Reference to the World object. */ public World worldObj; private int glRenderList = -1; - private static Tessellator tessellator = Tessellator.instance; + //private static Tessellator tessellator = Tessellator.instance; - public static int chunksUpdated = 0; + public static int chunksUpdated; public int posX; public int posY; -@@ -192,15 +194,16 @@ +@@ -192,15 +192,16 @@ GL11.glTranslatef(-8.0F, -8.0F, -8.0F); GL11.glScalef(f, f, f); GL11.glTranslatef(8.0F, 8.0F, 8.0F); @@ -37,7 +29,7 @@ { TileEntity tileentity = chunkcache.getBlockTileEntity(k2, i2, j2); -@@ -212,14 +215,15 @@ +@@ -212,14 +213,15 @@ int i3 = block.getRenderBlockPass(); @@ -56,7 +48,7 @@ } } } -@@ -228,10 +232,11 @@ +@@ -228,10 +230,11 @@ if (flag2) { diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderBiped.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RenderBiped.java.patch index a095f896ce..db74765380 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderBiped.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderBiped.java.patch @@ -1,7 +1,7 @@ --- ../src_base/minecraft/net/minecraft/client/renderer/entity/RenderBiped.java +++ ../src_work/minecraft/net/minecraft/client/renderer/entity/RenderBiped.java -@@ -11,9 +11,15 @@ - import net.minecraft.entity.EntityLiving; +@@ -14,9 +14,15 @@ + import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.EnumArmorMaterial; import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; @@ -16,25 +16,72 @@ @SideOnly(Side.CLIENT) public class RenderBiped extends RenderLiving -@@ -59,7 +65,7 @@ +@@ -49,11 +55,13 @@ + this.field_82425_h = new ModelBiped(0.5F); + } + ++ @Deprecated //Use the more sensitve version getArmorResource below + public static ResourceLocation func_110857_a(ItemArmor par0ItemArmor, int par1) + { + return func_110858_a(par0ItemArmor, par1, (String)null); + } + ++ @Deprecated //Use the more sensitve version getArmorResource below + public static ResourceLocation func_110858_a(ItemArmor par0ItemArmor, int par1, String par2Str) + { + String s1 = String.format("textures/models/armor/%s_layer_%d%s.png", new Object[] {bipedArmorFilenamePrefix[par0ItemArmor.renderIndex], Integer.valueOf(par1 == 2 ? 2 : 1), par2Str == null ? "" : String.format("_%s", new Object[]{par2Str})}); +@@ -68,6 +76,33 @@ + return resourcelocation; + } + ++ /** ++ * More generic ForgeHook version of the above function, it allows for Items to have more control over what texture they provide. ++ * ++ * @param entity Entity wearing the armor ++ * @param stack ItemStack for the armor ++ * @param slot Slot ID that the item is in ++ * @param type Subtype, can be null or "overlay" ++ * @return ResourceLocation pointing at the armor's texture ++ */ ++ public static ResourceLocation getArmorResource(Entity entity, ItemStack stack, int slot, String type) ++ { ++ ItemArmor item = (ItemArmor)stack.getItem(); ++ String s1 = String.format("textures/models/armor/%s_layer_%d%s.png", ++ bipedArmorFilenamePrefix[item.renderIndex], (slot == 2 ? 2 : 1), type == null ? "" : String.format("_%s", type)); ++ ++ s1 = ForgeHooksClient.getArmorTexture(entity, stack, s1, slot, (slot == 2 ? 2 : 1), type); ++ ResourceLocation resourcelocation = (ResourceLocation)field_110859_k.get(s1); ++ ++ if (resourcelocation == null) ++ { ++ resourcelocation = new ResourceLocation(s1); ++ field_110859_k.put(s1, resourcelocation); ++ } ++ ++ return resourcelocation; ++ } ++ + protected int func_130006_a(EntityLiving par1EntityLiving, int par2, float par3) + { + ItemStack itemstack = par1EntityLiving.getCurrentArmor(3 - par2); +@@ -79,7 +114,7 @@ if (item instanceof ItemArmor) { ItemArmor itemarmor = (ItemArmor)item; -- this.loadTexture("/armor/" + bipedArmorFilenamePrefix[itemarmor.renderIndex] + "_" + (par2 == 2 ? 2 : 1) + ".png"); -+ this.loadTexture(ForgeHooksClient.getArmorTexture(par1EntityLiving, itemstack, "/armor/" + bipedArmorFilenamePrefix[itemarmor.renderIndex] + "_" + (par2 == 2 ? 2 : 1) + ".png", par2, 1)); +- this.func_110776_a(func_110857_a(itemarmor, par2)); ++ this.func_110776_a(getArmorResource(par1EntityLiving, itemstack, par2, null)); ModelBiped modelbiped = par2 == 2 ? this.field_82425_h : this.field_82423_g; modelbiped.bipedHead.showModel = par2 == 0; modelbiped.bipedHeadwear.showModel = par2 == 0; -@@ -68,6 +74,7 @@ +@@ -88,15 +123,17 @@ modelbiped.bipedLeftArm.showModel = par2 == 1; modelbiped.bipedRightLeg.showModel = par2 == 2 || par2 == 3; modelbiped.bipedLeftLeg.showModel = par2 == 2 || par2 == 3; + modelbiped = ForgeHooksClient.getArmorModel(par1EntityLiving, itemstack, par2, modelbiped); this.setRenderPassModel(modelbiped); - - if (modelbiped != null) -@@ -87,9 +94,10 @@ - + modelbiped.onGround = this.mainModel.onGround; + modelbiped.isRiding = this.mainModel.isRiding; + modelbiped.isChild = this.mainModel.isChild; float f1 = 1.0F; - if (itemarmor.getArmorMaterial() == EnumArmorMaterial.CLOTH) @@ -47,16 +94,16 @@ float f2 = (float)(j >> 16 & 255) / 255.0F; float f3 = (float)(j >> 8 & 255) / 255.0F; float f4 = (float)(j & 255) / 255.0F; -@@ -128,7 +136,7 @@ +@@ -134,7 +171,7 @@ + if (item instanceof ItemArmor) { - ItemArmor itemarmor = (ItemArmor)item; -- this.loadTexture("/armor/" + bipedArmorFilenamePrefix[itemarmor.renderIndex] + "_" + (par2 == 2 ? 2 : 1) + "_b.png"); -+ this.loadTexture(ForgeHooksClient.getArmorTexture(par1EntityLiving, itemstack, "/armor/" + bipedArmorFilenamePrefix[itemarmor.renderIndex] + "_" + (par2 == 2 ? 2 : 1) + "_b.png", par2, 2)); +- this.func_110776_a(func_110858_a((ItemArmor)item, par2, "overlay")); ++ this.func_110776_a(getArmorResource(par1, itemstack, par2, "overlay")); float f1 = 1.0F; GL11.glColor3f(f1, f1, f1); } -@@ -174,9 +182,12 @@ +@@ -185,9 +222,12 @@ GL11.glPushMatrix(); this.modelBipedMain.bipedHead.postRender(0.0625F); @@ -72,7 +119,7 @@ { f2 = 0.625F; GL11.glTranslatef(0.0F, -0.25F, 0.0F); -@@ -218,7 +229,10 @@ +@@ -229,7 +269,10 @@ this.modelBipedMain.bipedRightArm.postRender(0.0625F); GL11.glTranslatef(-0.0625F, 0.4375F, 0.0625F); @@ -84,7 +131,7 @@ { f2 = 0.5F; GL11.glTranslatef(0.0F, 0.1875F, -0.3125F); -@@ -265,7 +279,10 @@ +@@ -276,7 +319,10 @@ if (itemstack.getItem().requiresMultipleRenderPasses()) { diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.java.patch index fc6859159d..0dfa50699a 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/client/renderer/entity/RenderItem.java +++ ../src_work/minecraft/net/minecraft/client/renderer/entity/RenderItem.java -@@ -19,6 +19,8 @@ +@@ -21,6 +21,8 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -9,7 +9,7 @@ @SideOnly(Side.CLIENT) public class RenderItem extends Render { -@@ -49,29 +51,9 @@ +@@ -53,29 +55,9 @@ if (itemstack.getItem() != null) { GL11.glPushMatrix(); @@ -41,11 +41,11 @@ GL11.glTranslatef((float)par2, (float)par4 + f2, (float)par6); GL11.glEnable(GL12.GL_RESCALE_NORMAL); -@@ -80,9 +62,18 @@ - float f5; +@@ -84,9 +66,18 @@ float f6; + int i; -- if (itemstack.getItemSpriteNumber() == 0 && Block.blocksList[itemstack.itemID] != null && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) +- if (itemstack.getItemSpriteNumber() == 0 && itemstack.itemID < Block.blocksList.length && Block.blocksList[itemstack.itemID] != null && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) - { - Block block = Block.blocksList[itemstack.itemID]; + Block block = null; @@ -63,9 +63,9 @@ GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); if (renderInFrame) -@@ -138,10 +129,10 @@ - - this.loadTexture("/gui/items.png"); +@@ -139,10 +130,10 @@ + GL11.glScalef(0.5F, 0.5F, 0.5F); + } - for (int k = 0; k <= 1; ++k) + for (int k = 0; k < itemstack.getItem().getRenderPasses(itemstack.getItemDamage()); ++k) @@ -76,7 +76,32 @@ f8 = 1.0F; if (this.renderWithColor) -@@ -241,32 +232,26 @@ +@@ -152,11 +143,11 @@ + f4 = (float)(i >> 8 & 255) / 255.0F; + f6 = (float)(i & 255) / 255.0F; + GL11.glColor4f(f5 * f8, f4 * f8, f6 * f8, 1.0F); +- this.renderDroppedItem(par1EntityItem, icon, b0, par9, f5 * f8, f4 * f8, f6 * f8); ++ this.renderDroppedItem(par1EntityItem, icon, b0, par9, f5 * f8, f4 * f8, f6 * f8, k); + } + else + { +- this.renderDroppedItem(par1EntityItem, icon, b0, par9, 1.0F, 1.0F, 1.0F); ++ this.renderDroppedItem(par1EntityItem, icon, b0, par9, 1.0F, 1.0F, 1.0F, k); + } + } + } +@@ -204,6 +195,10 @@ + * Renders a dropped item + */ + private void renderDroppedItem(EntityItem par1EntityItem, Icon par2Icon, int par3, float par4, float par5, float par6, float par7) ++ { ++ renderDroppedItem(par1EntityItem, par2Icon, par3, par4, par5, par6, par7, 0); ++ } ++ private void renderDroppedItem(EntityItem par1EntityItem, Icon par2Icon, int par3, float par4, float par5, float par6, float par7, int pass) + { + Tessellator tessellator = Tessellator.instance; + +@@ -240,32 +235,26 @@ f11 = 0.021875F; ItemStack itemstack = par1EntityItem.getEntityItem(); int j = itemstack.stackSize; @@ -122,9 +147,29 @@ + + if (itemstack.getItemSpriteNumber() == 0) { - this.loadTexture("/terrain.png"); + this.func_110776_a(TextureMap.field_110575_b); } -@@ -356,10 +341,10 @@ +@@ -277,7 +266,7 @@ + GL11.glColor4f(par5, par6, par7, 1.0F); + ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((Icon)par2Icon).getOriginX(), ((Icon)par2Icon).getOriginY(), f12); + +- if (itemstack.hasEffect()) ++ if (itemstack.hasEffect(pass)) + { + GL11.glDepthFunc(GL11.GL_EQUAL); + GL11.glDisable(GL11.GL_LIGHTING); +@@ -348,6 +337,10 @@ + */ + public void renderItemIntoGUI(FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) + { ++ renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5, false); ++ } ++ public void renderItemIntoGUI(FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5, boolean renderEffect) ++ { + int k = par3ItemStack.itemID; + int l = par3ItemStack.getItemDamage(); + Object object = par3ItemStack.getIconIndex(); +@@ -356,10 +349,10 @@ float f1; float f2; @@ -132,41 +177,77 @@ + Block block = (k < Block.blocksList.length ? Block.blocksList[k] : null); + if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(Block.blocksList[k].getRenderType())) { - par2RenderEngine.bindTexture("/terrain.png"); + par2TextureManager.func_110577_a(TextureMap.field_110575_b); - Block block = Block.blocksList[k]; GL11.glPushMatrix(); GL11.glTranslatef((float)(par4 - 2), (float)(par5 + 3), -3.0F + this.zLevel); GL11.glScalef(10.0F, 10.0F, 10.0F); -@@ -390,11 +375,11 @@ - if (Item.itemsList[k].requiresMultipleRenderPasses()) - { - GL11.glDisable(GL11.GL_LIGHTING); -- par2RenderEngine.bindTexture("/gui/items.png"); +@@ -386,11 +379,11 @@ + else if (Item.itemsList[k].requiresMultipleRenderPasses()) + { + GL11.glDisable(GL11.GL_LIGHTING); +- par2TextureManager.func_110577_a(TextureMap.field_110576_c); - -- for (j1 = 0; j1 <= 1; ++j1) -- { -- Icon icon1 = Item.itemsList[k].getIconFromDamageForRenderPass(l, j1); -+ par2RenderEngine.bindTexture(par3ItemStack.getItemSpriteNumber() == 0 ? "/terrain.png" : "/gui/items.png"); +- for (int j1 = 0; j1 <= 1; ++j1) +- { +- Icon icon = Item.itemsList[k].getIconFromDamageForRenderPass(l, j1); + -+ for (j1 = 0; j1 < Item.itemsList[k].getRenderPasses(l); ++j1) ++ for (int j1 = 0; j1 < Item.itemsList[k].getRenderPasses(l); ++j1) ++ { ++ par2TextureManager.func_110577_a(par3ItemStack.getItemSpriteNumber() == 0 ? TextureMap.field_110575_b : TextureMap.field_110576_c); ++ Icon icon = Item.itemsList[k].getIcon(par3ItemStack, j1); + int k1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, j1); + f1 = (float)(k1 >> 16 & 255) / 255.0F; + f2 = (float)(k1 >> 8 & 255) / 255.0F; +@@ -402,6 +395,24 @@ + } + + this.renderIcon(par4, par5, icon, 16, 16); ++ ++ if (par3ItemStack.hasEffect(j1)) + { -+ Icon icon1 = Item.itemsList[k].getIcon(par3ItemStack, j1); - int k1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, j1); - f = (float)(k1 >> 16 & 255) / 255.0F; - f1 = (float)(k1 >> 8 & 255) / 255.0F; -@@ -453,7 +438,10 @@ ++ GL11.glDepthFunc(GL11.GL_GREATER); ++ GL11.glDisable(GL11.GL_LIGHTING); ++ GL11.glDepthMask(false); ++ par2TextureManager.func_110577_a(field_110798_h); ++ this.zLevel -= 50.0F; ++ GL11.glEnable(GL11.GL_BLEND); ++ GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR); ++ GL11.glColor4f(0.5F, 0.25F, 0.8F, 1.0F); ++ this.renderGlint(par4 * 431278612 + par5 * 32178161, par4 - 2, par5 - 2, 20, 20); ++ GL11.glDisable(GL11.GL_BLEND); ++ GL11.glDepthMask(true); ++ this.zLevel += 50.0F; ++ GL11.glEnable(GL11.GL_LIGHTING); ++ GL11.glDepthFunc(GL11.GL_LEQUAL); ++ } + } + + GL11.glEnable(GL11.GL_LIGHTING); +@@ -441,8 +452,12 @@ { if (par3ItemStack != null) { -- this.renderItemIntoGUI(par1FontRenderer, par2RenderEngine, par3ItemStack, par4, par5); -+ if (!ForgeHooksClient.renderInventoryItem(renderBlocks, par2RenderEngine, par3ItemStack, renderWithColor, zLevel, (float)par4, (float)par5)) +- this.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); +- ++ if (!ForgeHooksClient.renderInventoryItem(renderBlocks, par2TextureManager, par3ItemStack, renderWithColor, zLevel, (float)par4, (float)par5)) + { -+ this.renderItemIntoGUI(par1FontRenderer, par2RenderEngine, par3ItemStack, par4, par5); ++ this.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5, true); + } - ++ ++ /* Modders must handle this themselves if they use custom renderers! if (par3ItemStack.hasEffect()) { -@@ -590,4 +578,47 @@ + GL11.glDepthFunc(GL11.GL_GREATER); +@@ -460,6 +475,7 @@ + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDepthFunc(GL11.GL_LEQUAL); + } ++ */ + } + } + +@@ -583,4 +599,47 @@ { this.doRenderItem((EntityItem)par1Entity, par2, par4, par6, par8, par9); } diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLiving.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLiving.java.patch deleted file mode 100644 index e0c91b7519..0000000000 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLiving.java.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- ../src_base/minecraft/net/minecraft/client/renderer/entity/RenderLiving.java -+++ ../src_work/minecraft/net/minecraft/client/renderer/entity/RenderLiving.java -@@ -15,6 +15,9 @@ - import net.minecraft.entity.EntityLiving; - import net.minecraft.entity.projectile.EntityArrow; - import net.minecraft.util.MathHelper; -+import net.minecraftforge.client.event.RenderLivingEvent; -+import net.minecraftforge.common.MinecraftForge; -+ - import org.lwjgl.opengl.GL11; - import org.lwjgl.opengl.GL12; - -@@ -25,6 +28,8 @@ - - /** The model to be used during the render passes. */ - protected ModelBase renderPassModel; -+ public static float NAME_TAG_RANGE = 64.0f; -+ public static float NAME_TAG_RANGE_SNEAK = 32.0f; - - public RenderLiving(ModelBase par1ModelBase, float par2) - { -@@ -413,12 +418,13 @@ - */ - protected void passSpecialRender(EntityLiving par1EntityLiving, double par2, double par4, double par6) - { -+ if (MinecraftForge.EVENT_BUS.post(new RenderLivingEvent.Specials.Pre(par1EntityLiving, this))) return; - if (Minecraft.isGuiEnabled() && par1EntityLiving != this.renderManager.livingPlayer && !par1EntityLiving.func_98034_c(Minecraft.getMinecraft().thePlayer) && (par1EntityLiving.func_94059_bO() || par1EntityLiving.func_94056_bM() && par1EntityLiving == this.renderManager.field_96451_i)) - { - float f = 1.6F; - float f1 = 0.016666668F * f; - double d3 = par1EntityLiving.getDistanceSqToEntity(this.renderManager.livingPlayer); -- float f2 = par1EntityLiving.isSneaking() ? 32.0F : 64.0F; -+ float f2 = par1EntityLiving.isSneaking() ? NAME_TAG_RANGE_SNEAK : NAME_TAG_RANGE; - - if (d3 < (double)(f2 * f2)) - { -@@ -462,6 +468,7 @@ - } - } - } -+ MinecraftForge.EVENT_BUS.post(new RenderLivingEvent.Specials.Post(par1EntityLiving, this)); - } - - protected void func_96449_a(EntityLiving par1EntityLiving, double par2, double par4, double par6, String par8Str, float par9, double par10) diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.java.patch index 3bf8968709..d24e1117b3 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.java.patch @@ -1,22 +1,22 @@ --- ../src_base/minecraft/net/minecraft/client/renderer/entity/RenderManager.java +++ ../src_work/minecraft/net/minecraft/client/renderer/entity/RenderManager.java -@@ -221,12 +221,14 @@ +@@ -223,12 +223,14 @@ - if (par4EntityLiving.isPlayerSleeping()) + if (par4EntityLivingBase.isPlayerSleeping()) { -- int i = par1World.getBlockId(MathHelper.floor_double(par4EntityLiving.posX), MathHelper.floor_double(par4EntityLiving.posY), MathHelper.floor_double(par4EntityLiving.posZ)); +- int i = par1World.getBlockId(MathHelper.floor_double(par4EntityLivingBase.posX), MathHelper.floor_double(par4EntityLivingBase.posY), MathHelper.floor_double(par4EntityLivingBase.posZ)); - - if (i == Block.bed.blockID) -+ int x = MathHelper.floor_double(par4EntityLiving.posX); -+ int y = MathHelper.floor_double(par4EntityLiving.posY); -+ int z = MathHelper.floor_double(par4EntityLiving.posZ); ++ int x = MathHelper.floor_double(par4EntityLivingBase.posX); ++ int y = MathHelper.floor_double(par4EntityLivingBase.posY); ++ int z = MathHelper.floor_double(par4EntityLivingBase.posZ); + Block block = Block.blocksList[par1World.getBlockId(x, y, z)]; + -+ if (block != null && block.isBed(par1World, x, y, z, par4EntityLiving)) ++ if (block != null && block.isBed(par1World, x, y, z, par4EntityLivingBase)) { -- int j = par1World.getBlockMetadata(MathHelper.floor_double(par4EntityLiving.posX), MathHelper.floor_double(par4EntityLiving.posY), MathHelper.floor_double(par4EntityLiving.posZ)); +- int j = par1World.getBlockMetadata(MathHelper.floor_double(par4EntityLivingBase.posX), MathHelper.floor_double(par4EntityLivingBase.posY), MathHelper.floor_double(par4EntityLivingBase.posZ)); - int k = j & 3; -+ int k = block.getBedDirection(par1World, x, y, z);; ++ int k = block.getBedDirection(par1World, x, y, z); this.playerViewY = (float)(k * 90 + 180); this.playerViewX = 0.0F; } diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java.patch index 724baf72eb..4c02a8ce7c 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java +++ ../src_work/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java -@@ -19,7 +19,16 @@ +@@ -21,7 +21,16 @@ import net.minecraft.scoreboard.ScoreObjective; import net.minecraft.scoreboard.Scoreboard; import net.minecraft.util.MathHelper; @@ -16,23 +16,12 @@ +import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.BLOCK_3D; @SideOnly(Side.CLIENT) - public class RenderPlayer extends RenderLiving -@@ -28,6 +37,10 @@ - private ModelBiped modelArmorChestplate; - private ModelBiped modelArmor; - public static String[] armorFilenamePrefix = new String[] {"cloth", "chain", "iron", "diamond", "gold"}; -+ @Deprecated //Old dead code, tags are now in RenderLiving -+ public static float NAME_TAG_RANGE = 64.0f; -+ @Deprecated //Old dead code, tags are now in RenderLiving -+ public static float NAME_TAG_RANGE_SNEAK = 32.0f; - - public RenderPlayer() + public class RenderPlayer extends RendererLivingEntity +@@ -46,6 +55,13 @@ { -@@ -49,6 +62,13 @@ - { - ItemStack itemstack = par1EntityPlayer.inventory.armorItemInSlot(3 - par2); + ItemStack itemstack = par1AbstractClientPlayer.inventory.armorItemInSlot(3 - par2); -+ RenderPlayerEvent.SetArmorModel event = new RenderPlayerEvent.SetArmorModel(par1EntityPlayer, this, 3 - par2, par3, itemstack); ++ RenderPlayerEvent.SetArmorModel event = new RenderPlayerEvent.SetArmorModel(par1AbstractClientPlayer, this, 3 - par2, par3, itemstack); + MinecraftForge.EVENT_BUS.post(event); + if (event.result != -1) + { @@ -42,25 +31,24 @@ if (itemstack != null) { Item item = itemstack.getItem(); -@@ -56,7 +76,7 @@ +@@ -53,7 +69,7 @@ if (item instanceof ItemArmor) { ItemArmor itemarmor = (ItemArmor)item; -- this.loadTexture("/armor/" + armorFilenamePrefix[itemarmor.renderIndex] + "_" + (par2 == 2 ? 2 : 1) + ".png"); -+ this.loadTexture(ForgeHooksClient.getArmorTexture(par1EntityPlayer, itemstack, "/armor/" + armorFilenamePrefix[itemarmor.renderIndex] + "_" + (par2 == 2 ? 2 : 1) + ".png", par2, 1)); +- this.func_110776_a(RenderBiped.func_110857_a(itemarmor, par2)); ++ this.func_110776_a(RenderBiped.getArmorResource(par1AbstractClientPlayer, itemstack, par2, null)); ModelBiped modelbiped = par2 == 2 ? this.modelArmor : this.modelArmorChestplate; modelbiped.bipedHead.showModel = par2 == 0; modelbiped.bipedHeadwear.showModel = par2 == 0; -@@ -65,6 +85,7 @@ +@@ -62,15 +78,17 @@ modelbiped.bipedLeftArm.showModel = par2 == 1; modelbiped.bipedRightLeg.showModel = par2 == 2 || par2 == 3; modelbiped.bipedLeftLeg.showModel = par2 == 2 || par2 == 3; -+ modelbiped = ForgeHooksClient.getArmorModel(par1EntityPlayer, itemstack, par2, modelbiped); ++ modelbiped = ForgeHooksClient.getArmorModel(par1AbstractClientPlayer, itemstack, par2, modelbiped); this.setRenderPassModel(modelbiped); - - if (modelbiped != null) -@@ -84,9 +105,10 @@ - + modelbiped.onGround = this.mainModel.onGround; + modelbiped.isRiding = this.mainModel.isRiding; + modelbiped.isChild = this.mainModel.isChild; float f1 = 1.0F; - if (itemarmor.getArmorMaterial() == EnumArmorMaterial.CLOTH) @@ -73,36 +61,36 @@ float f2 = (float)(j >> 16 & 255) / 255.0F; float f3 = (float)(j >> 8 & 255) / 255.0F; float f4 = (float)(j & 255) / 255.0F; -@@ -125,7 +147,7 @@ +@@ -108,7 +126,7 @@ + if (item instanceof ItemArmor) { - ItemArmor itemarmor = (ItemArmor)item; -- this.loadTexture("/armor/" + armorFilenamePrefix[itemarmor.renderIndex] + "_" + (par2 == 2 ? 2 : 1) + "_b.png"); -+ this.loadTexture(ForgeHooksClient.getArmorTexture(par1EntityPlayer, itemstack, "/armor/" + armorFilenamePrefix[itemarmor.renderIndex] + "_" + (par2 == 2 ? 2 : 1) + "_b.png", par2, 2)); +- this.func_110776_a(RenderBiped.func_110858_a((ItemArmor)item, par2, "overlay")); ++ this.func_110776_a(RenderBiped.getArmorResource(par1, itemstack, par2, "overlay")); float f1 = 1.0F; GL11.glColor3f(f1, f1, f1); } -@@ -134,6 +156,7 @@ +@@ -117,6 +135,7 @@ - public void renderPlayer(EntityPlayer par1EntityPlayer, double par2, double par4, double par6, float par8, float par9) + public void renderPlayer(AbstractClientPlayer par1, double par2, double par4, double par6, float par8, float par9) { -+ if (MinecraftForge.EVENT_BUS.post(new RenderPlayerEvent.Pre(par1EntityPlayer, this))) return; ++ if (MinecraftForge.EVENT_BUS.post(new RenderPlayerEvent.Pre(par1, this))) return; float f2 = 1.0F; GL11.glColor3f(f2, f2, f2); - ItemStack itemstack = par1EntityPlayer.inventory.getCurrentItem(); -@@ -165,6 +188,7 @@ + ItemStack itemstack = par1.inventory.getCurrentItem(); +@@ -148,6 +167,7 @@ this.modelArmorChestplate.aimedBow = this.modelArmor.aimedBow = this.modelBipedMain.aimedBow = false; this.modelArmorChestplate.isSneak = this.modelArmor.isSneak = this.modelBipedMain.isSneak = false; this.modelArmorChestplate.heldItemRight = this.modelArmor.heldItemRight = this.modelBipedMain.heldItemRight = 0; -+ MinecraftForge.EVENT_BUS.post(new RenderPlayerEvent.Post(par1EntityPlayer, this)); ++ MinecraftForge.EVENT_BUS.post(new RenderPlayerEvent.Post(par1, this)); } - /** -@@ -172,21 +196,30 @@ + protected ResourceLocation func_110817_a(AbstractClientPlayer par1AbstractClientPlayer) +@@ -160,21 +180,30 @@ */ - protected void renderSpecials(EntityPlayer par1EntityPlayer, float par2) + protected void renderSpecials(AbstractClientPlayer par1AbstractClientPlayer, float par2) { -+ RenderPlayerEvent.Specials.Pre event = new RenderPlayerEvent.Specials.Pre(par1EntityPlayer, this, par2); ++ RenderPlayerEvent.Specials.Pre event = new RenderPlayerEvent.Specials.Pre(par1AbstractClientPlayer, this, par2); + if (MinecraftForge.EVENT_BUS.post(event)) + { + return; @@ -110,9 +98,9 @@ + float f1 = 1.0F; GL11.glColor3f(f1, f1, f1); - super.renderEquippedItems(par1EntityPlayer, par2); - super.renderArrowsStuckInEntity(par1EntityPlayer, par2); - ItemStack itemstack = par1EntityPlayer.inventory.armorItemInSlot(3); + super.renderEquippedItems(par1AbstractClientPlayer, par2); + super.renderArrowsStuckInEntity(par1AbstractClientPlayer, par2); + ItemStack itemstack = par1AbstractClientPlayer.inventory.armorItemInSlot(3); - if (itemstack != null) + if (itemstack != null && event.renderHelmet) @@ -133,27 +121,26 @@ { f2 = 0.625F; GL11.glTranslatef(0.0F, -0.25F, 0.0F); -@@ -238,7 +271,7 @@ - +@@ -226,6 +255,7 @@ + boolean flag = par1AbstractClientPlayer.func_110310_o().func_110557_a(); + boolean flag1 = !par1AbstractClientPlayer.isInvisible(); + boolean flag2 = !par1AbstractClientPlayer.getHideCape(); ++ flag = event.renderCape && flag; float f6; -- if (this.loadDownloadableImageTexture(par1EntityPlayer.cloakUrl, (String)null) && !par1EntityPlayer.isInvisible() && !par1EntityPlayer.getHideCape()) -+ if (event.renderCape && this.loadDownloadableImageTexture(par1EntityPlayer.cloakUrl, (String)null) && !par1EntityPlayer.isInvisible() && !par1EntityPlayer.getHideCape()) - { - GL11.glPushMatrix(); - GL11.glTranslatef(0.0F, 0.0F, 0.125F); -@@ -286,7 +319,7 @@ + if (flag && flag1 && flag2) +@@ -277,7 +307,7 @@ - ItemStack itemstack1 = par1EntityPlayer.inventory.getCurrentItem(); + ItemStack itemstack1 = par1AbstractClientPlayer.inventory.getCurrentItem(); - if (itemstack1 != null) + if (itemstack1 != null && event.renderItem) { GL11.glPushMatrix(); this.modelBipedMain.bipedRightArm.postRender(0.0625F); -@@ -304,7 +337,11 @@ - enumaction = itemstack1.getItemUseAction(); - } +@@ -297,7 +327,11 @@ + + float f11; - if (itemstack1.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack1.itemID].getRenderType())) + IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(itemstack1, EQUIPPED); @@ -162,9 +149,9 @@ + + if (is3D || (isBlock && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack1.itemID].getRenderType()))) { - f3 = 0.5F; + f11 = 0.5F; GL11.glTranslatef(0.0F, 0.1875F, -0.3125F); -@@ -361,7 +398,7 @@ +@@ -354,7 +388,7 @@ if (itemstack1.getItem().requiresMultipleRenderPasses()) { @@ -172,12 +159,12 @@ + for (j = 0; j < itemstack1.getItem().getRenderPasses(itemstack1.getItemDamage()); ++j) { int k = itemstack1.getItem().getColorFromItemStack(itemstack1, j); - f12 = (float)(k >> 16 & 255) / 255.0F; -@@ -383,6 +420,7 @@ + f13 = (float)(k >> 16 & 255) / 255.0F; +@@ -376,6 +410,7 @@ GL11.glPopMatrix(); } -+ MinecraftForge.EVENT_BUS.post(new RenderPlayerEvent.Specials.Post(par1EntityPlayer, this, par2)); ++ MinecraftForge.EVENT_BUS.post(new RenderPlayerEvent.Specials.Post(par1AbstractClientPlayer, this, par2)); } - protected void renderPlayerScale(EntityPlayer par1EntityPlayer, float par2) + protected void renderPlayerScale(AbstractClientPlayer par1AbstractClientPlayer, float par2) diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSnowMan.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSnowMan.java.patch index bbf94b4ea4..79c49ea4e6 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSnowMan.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSnowMan.java.patch @@ -1,8 +1,8 @@ --- ../src_base/minecraft/net/minecraft/client/renderer/entity/RenderSnowMan.java +++ ../src_work/minecraft/net/minecraft/client/renderer/entity/RenderSnowMan.java -@@ -7,8 +7,14 @@ - import net.minecraft.client.renderer.RenderBlocks; - import net.minecraft.entity.EntityLiving; +@@ -9,8 +9,14 @@ + import net.minecraft.entity.Entity; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntitySnowman; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -15,7 +15,7 @@ @SideOnly(Side.CLIENT) public class RenderSnowMan extends RenderLiving -@@ -31,12 +37,15 @@ +@@ -35,12 +41,15 @@ super.renderEquippedItems(par1EntitySnowman, par2); ItemStack itemstack = new ItemStack(Block.pumpkin, 1); diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java.patch new file mode 100644 index 0000000000..3fad37302f --- /dev/null +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java.patch @@ -0,0 +1,45 @@ +--- ../src_base/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java ++++ ../src_work/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java +@@ -17,6 +17,9 @@ + import net.minecraft.entity.player.EntityPlayer; + import net.minecraft.entity.projectile.EntityArrow; + import net.minecraft.util.MathHelper; ++import net.minecraftforge.client.event.RenderLivingEvent; ++import net.minecraftforge.common.MinecraftForge; ++ + import org.lwjgl.opengl.GL11; + import org.lwjgl.opengl.GL12; + +@@ -28,6 +31,9 @@ + + /** The model to be used during the render passes. */ + protected ModelBase renderPassModel; ++ ++ public static float NAME_TAG_RANGE = 64.0f; ++ public static float NAME_TAG_RANGE_SNEAK = 32.0f; + + public RendererLivingEntity(ModelBase par1ModelBase, float par2) + { +@@ -442,12 +448,13 @@ + */ + protected void passSpecialRender(EntityLivingBase par1EntityLivingBase, double par2, double par4, double par6) + { ++ if (MinecraftForge.EVENT_BUS.post(new RenderLivingEvent.Specials.Pre(par1EntityLivingBase, this))) return; + if (this.func_110813_b(par1EntityLivingBase)) + { + float f = 1.6F; + float f1 = 0.016666668F * f; + double d3 = par1EntityLivingBase.getDistanceSqToEntity(this.renderManager.livingPlayer); +- float f2 = par1EntityLivingBase.isSneaking() ? 32.0F : 64.0F; ++ float f2 = par1EntityLivingBase.isSneaking() ? NAME_TAG_RANGE_SNEAK : NAME_TAG_RANGE; + + if (d3 < (double)(f2 * f2)) + { +@@ -491,6 +498,7 @@ + } + } + } ++ MinecraftForge.EVENT_BUS.post(new RenderLivingEvent.Specials.Post(par1EntityLivingBase, this)); + } + + protected boolean func_110813_b(EntityLivingBase par1EntityLivingBase) diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch b/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch index 2ad1b84aaf..4a095b3023 100644 --- a/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/client/renderer/texture/Stitcher.java +++ ../src_work/minecraft/net/minecraft/client/renderer/texture/Stitcher.java -@@ -182,7 +182,7 @@ +@@ -186,7 +186,7 @@ if (flag4 ^ flag5) { diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureAtlasSprite.java.patch b/patches/minecraft/net/minecraft/client/renderer/texture/TextureAtlasSprite.java.patch new file mode 100644 index 0000000000..0df267583b --- /dev/null +++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureAtlasSprite.java.patch @@ -0,0 +1,32 @@ +--- ../src_base/minecraft/net/minecraft/client/renderer/texture/TextureAtlasSprite.java ++++ ../src_work/minecraft/net/minecraft/client/renderer/texture/TextureAtlasSprite.java +@@ -11,6 +11,8 @@ + import java.util.List; + import javax.imageio.ImageIO; + import net.minecraft.client.resources.Resource; ++import net.minecraft.client.resources.ResourceLocation; ++import net.minecraft.client.resources.ResourceManager; + import net.minecraft.client.resources.data.AnimationFrame; + import net.minecraft.client.resources.data.AnimationMetadataSection; + import net.minecraft.util.Icon; +@@ -184,6 +186,20 @@ + this.height = par1; + } + ++ /** ++ * Load the specified resource as this sprite's data. ++ * Returning false from this function will prevent this icon from being stitched onto the master texture. ++ * @param manager Main resource manager ++ * @param location File resource location ++ * @return False to prevent this Icon from being stitched ++ * @throws IOException ++ */ ++ public boolean load(ResourceManager manager, ResourceLocation location) throws IOException ++ { ++ func_130100_a(manager.func_110536_a(location)); ++ return true; ++ } ++ + public void func_130100_a(Resource par1Resource) throws IOException + { + this.func_130102_n(); diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureManager.java.patch b/patches/minecraft/net/minecraft/client/renderer/texture/TextureManager.java.patch deleted file mode 100644 index cdc1e66492..0000000000 --- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureManager.java.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- ../src_base/minecraft/net/minecraft/client/renderer/texture/TextureManager.java -+++ ../src_work/minecraft/net/minecraft/client/renderer/texture/TextureManager.java -@@ -66,17 +66,42 @@ - - public List createTexture(String par1Str) - { -+ return createNewTexture(par1Str, par1Str, null); -+ } -+ -+ public List createNewTexture(String textureName, String textureFile, TextureStitched stitched) -+ { -+ String par1Str = textureFile; - ArrayList arraylist = new ArrayList(); - ITexturePack itexturepack = Minecraft.getMinecraft().texturePackList.getSelectedTexturePack(); - - try - { -- BufferedImage bufferedimage = ImageIO.read(itexturepack.getResourceAsStream("/" + par1Str)); -- int i = bufferedimage.getHeight(); -- int j = bufferedimage.getWidth(); -- String s1 = this.getBasename(par1Str); -+ BufferedImage bufferedimage = null; -+ int i = 0; -+ int j = 0; -+ FileNotFoundException fnfe = null; -+ try -+ { -+ bufferedimage = ImageIO.read(itexturepack.getResourceAsStream("/" + textureFile)); -+ i = bufferedimage.getHeight(); -+ j = bufferedimage.getWidth(); -+ } -+ catch (FileNotFoundException e) -+ { -+ fnfe = e; -+ } -+ String s1 = textureName; - -- if (this.hasAnimationTxt(par1Str, itexturepack)) -+ if (stitched != null && stitched.loadTexture(this, itexturepack, textureName, textureFile, bufferedimage, arraylist)) -+ { -+ ; -+ } -+ else if (fnfe != null) -+ { -+ throw fnfe; -+ } -+ else if (this.hasAnimationTxt(par1Str, itexturepack)) - { - int k = j; - int l = j; diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch b/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch index f48eacd908..8ccfa7629b 100644 --- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch @@ -1,105 +1,57 @@ --- ../src_base/minecraft/net/minecraft/client/renderer/texture/TextureMap.java +++ ../src_work/minecraft/net/minecraft/client/renderer/texture/TextureMap.java -@@ -20,6 +20,8 @@ - import net.minecraft.client.texturepacks.ITexturePack; +@@ -21,6 +21,7 @@ import net.minecraft.item.Item; import net.minecraft.util.Icon; + import net.minecraft.util.ReportedException; +import net.minecraftforge.client.ForgeHooksClient; -+import net.minecraftforge.common.ForgeDummyContainer; @SideOnly(Side.CLIENT) - public class TextureMap implements IconRegister -@@ -48,6 +50,7 @@ - public void refreshTextures() - { - this.textureStichedMap.clear(); + public class TextureMap extends AbstractTexture implements TickableTextureObject, IconRegister +@@ -62,6 +63,7 @@ + Stitcher stitcher = new Stitcher(i, i, true); + this.mapTexturesStiched.clear(); + this.listTextureStiched.clear(); + ForgeHooksClient.onTextureStitchedPre(this); - int i; - int j; - -@@ -91,14 +94,22 @@ - StitchHolder stitchholder = new StitchHolder(texture); - stitcher.addStitchHolder(stitchholder); - hashmap.put(stitchholder, Arrays.asList(new Texture[] {texture})); -- Iterator iterator = this.textureStichedMap.keySet().iterator(); -- -- while (iterator.hasNext()) -- { -- String s = (String)iterator.next(); -- String s1 = this.basePath + s + this.textureExt; -- List list = TextureManager.instance().createTexture(s1); -- -+ -+ for (Map.Entry entry : ((Map)textureStichedMap).entrySet()) -+ { -+ String name = entry.getKey(); -+ String path; -+ if (name.indexOf(':') == -1) -+ { -+ path = this.basePath + name + this.textureExt; -+ } -+ else -+ { -+ String domain = name.substring(0, name.indexOf(':')); -+ String file = name.substring(name.indexOf(':') + 1); -+ path = "mods/" + domain +"/" + basePath + file + textureExt; -+ } -+ List list = TextureManager.instance().createNewTexture(name, path, entry.getValue()); - if (!list.isEmpty()) - { - StitchHolder stitchholder1 = new StitchHolder((Texture)list.get(0)); -@@ -117,7 +128,7 @@ - } - - this.atlasTexture = stitcher.getTexture(); -- iterator = stitcher.getStichSlots().iterator(); -+ Iterator iterator = stitcher.getStichSlots().iterator(); + Iterator iterator = this.field_110574_e.entrySet().iterator(); while (iterator.hasNext()) - { -@@ -151,7 +162,17 @@ - if (list1.size() > 1) +@@ -69,11 +71,14 @@ + Entry entry = (Entry)iterator.next(); + String s = (String)entry.getKey(); + TextureAtlasSprite textureatlassprite = (TextureAtlasSprite)entry.getValue(); +- ResourceLocation resourcelocation = new ResourceLocation(this.basePath + s + ".png"); ++ ResourceLocation resourcelocation = new ResourceLocation(ForgeHooksClient.fixDomain(basePath, s) + ".png"); + + try { - this.listTextureStiched.add(texturestitched); -- String s3 = this.basePath + s2 + ".txt"; -+ String s3; -+ if (s2.indexOf(':') == -1) +- textureatlassprite.func_130100_a(par1ResourceManager.func_110536_a(resourcelocation)); ++ if (!textureatlassprite.load(par1ResourceManager, resourcelocation)) + { -+ s3 = basePath + s2 + ".txt"; ++ continue; + } -+ else -+ { -+ String domain = s2.substring(0, s2.indexOf(':')); -+ String file = s2.substring(s2.indexOf(':') + 1); -+ s3 = "mods/" + domain + "/" + basePath + file + ".txt"; -+ } - ITexturePack itexturepack = Minecraft.getMinecraft().texturePackList.getSelectedTexturePack(); - boolean flag1 = !itexturepack.func_98138_b("/" + this.basePath + s2 + ".png", false); - -@@ -177,7 +198,11 @@ - texturestitched1.copyFrom(this.missingTextureStiched); + } + catch (RuntimeException runtimeexception) + { +@@ -142,6 +147,7 @@ + textureatlassprite1 = (TextureAtlasSprite)iterator1.next(); + textureatlassprite1.copyFrom(this.missingImage); } - -- this.atlasTexture.writeImage("debug.stitched_" + this.textureName + ".png"); -+ if (!ForgeDummyContainer.disableStitchedFileSaving) -+ { -+ this.atlasTexture.writeImage("debug.stitched_" + this.textureName + ".png"); -+ } + ForgeHooksClient.onTextureStitchedPost(this); - this.atlasTexture.uploadTexture(); } -@@ -202,6 +227,7 @@ + private void func_110573_f() +@@ -212,6 +218,7 @@ if (par1Str == null) { (new RuntimeException("Don\'t register null!")).printStackTrace(); + par1Str = "null"; //Don't allow things to actually register null.. } - TextureStitched texturestitched = (TextureStitched)this.textureStichedMap.get(par1Str); -@@ -219,4 +245,37 @@ + Object object = (TextureAtlasSprite)this.field_110574_e.get(par1Str); +@@ -253,4 +260,37 @@ { - return this.missingTextureStiched; + this.updateAnimations(); } + + //=================================================================================================== @@ -107,14 +59,14 @@ + //=================================================================================================== + /** + * Grabs the registered entry for the specified name, returning null if there was not a entry. -+ * Opposed to func_94245_a, this will not instantiate the entry, useful to test if a maping exists. ++ * Opposed to registerIcon, this will not instantiate the entry, useful to test if a mapping exists. + * + * @param name The name of the entry to find + * @return The registered entry, null if nothing was registered. + */ -+ public TextureStitched getTextureExtry(String name) ++ public TextureAtlasSprite getTextureExtry(String name) + { -+ return (TextureStitched)textureStichedMap.get(name); ++ return (TextureAtlasSprite)field_110574_e.get(name); + } + + /** @@ -125,11 +77,11 @@ + * @param entry Entry instance + * @return True if the entry was added to the map, false otherwise. + */ -+ public boolean setTextureEntry(String name, TextureStitched entry) ++ public boolean setTextureEntry(String name, TextureAtlasSprite entry) + { -+ if (!textureStichedMap.containsKey(name)) ++ if (!field_110574_e.containsKey(name)) + { -+ textureStichedMap.put(name, entry); ++ field_110574_e.put(name, entry); + return true; + } + return false; diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureStitched.java.patch b/patches/minecraft/net/minecraft/client/renderer/texture/TextureStitched.java.patch deleted file mode 100644 index 2337b1ecd2..0000000000 --- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureStitched.java.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- ../src_base/minecraft/net/minecraft/client/renderer/texture/TextureStitched.java -+++ ../src_work/minecraft/net/minecraft/client/renderer/texture/TextureStitched.java -@@ -3,9 +3,13 @@ - import cpw.mods.fml.client.TextureFXManager; - import cpw.mods.fml.relauncher.Side; - import cpw.mods.fml.relauncher.SideOnly; -+ -+import java.awt.image.BufferedImage; - import java.io.BufferedReader; - import java.util.ArrayList; - import java.util.List; -+ -+import net.minecraft.client.texturepacks.ITexturePack; - import net.minecraft.util.Icon; - import net.minecraft.util.Tuple; - -@@ -252,4 +256,28 @@ - t.createAndUploadTexture(); - } - } -+ -+ //=================================================================================================== -+ // Forge Start -+ //=================================================================================================== -+ /** -+ * Called when texture packs are refreshed, from TextureManager.createNewTexture, -+ * allows for finer control over loading the animation lists and verification of the image. -+ * If the return value from this is true, no further loading will be done by vanilla code. -+ * -+ * You need to add all Texture's to the textures argument. At the end of this function at least one -+ * entry should be in that argument, or a error should of been thrown. -+ * -+ * @param manager The invoking manager -+ * @param texturepack Current texture pack -+ * @param name The name of the texture -+ * @param fileName Resource path for this texture -+ * @param image Buffered image of the loaded resource -+ * @param textures ArrayList of element type Texture, split textures should be added to this list for the stitcher to handle. -+ * @return Return true to skip further vanilla texture loading for this texture -+ */ -+ public boolean loadTexture(TextureManager manager, ITexturePack texturepack, String name, String fileName, BufferedImage image, ArrayList textures) -+ { -+ return false; -+ } - } diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.java.patch index 14ac1a9e6a..62171239b1 100644 --- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.java.patch @@ -7,7 +7,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import java.util.Calendar; -@@ -52,7 +53,15 @@ +@@ -60,7 +61,15 @@ if (block instanceof BlockChest && i == 0) { diff --git a/patches/minecraft/net/minecraft/command/CommandHandler.java.patch b/patches/minecraft/net/minecraft/command/CommandHandler.java.patch index a54a0df8b5..8529ac9663 100644 --- a/patches/minecraft/net/minecraft/command/CommandHandler.java.patch +++ b/patches/minecraft/net/minecraft/command/CommandHandler.java.patch @@ -1,7 +1,7 @@ --- ../src_base/minecraft/net/minecraft/command/CommandHandler.java +++ ../src_work/minecraft/net/minecraft/command/CommandHandler.java -@@ -11,6 +11,9 @@ - import net.minecraft.entity.player.EntityPlayerMP; +@@ -12,6 +12,9 @@ + import net.minecraft.util.ChatMessageComponent; import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.common.MinecraftForge; @@ -10,7 +10,7 @@ public class CommandHandler implements ICommandManager { /** Map of Strings to the ICommand objects they represent */ -@@ -44,6 +47,16 @@ +@@ -45,6 +48,16 @@ if (icommand.canCommandSenderUseCommand(par1ICommandSender)) { diff --git a/patches/minecraft/net/minecraft/crash/CrashReport.java.patch b/patches/minecraft/net/minecraft/crash/CrashReport.java.patch new file mode 100644 index 0000000000..78fd5a6963 --- /dev/null +++ b/patches/minecraft/net/minecraft/crash/CrashReport.java.patch @@ -0,0 +1,12 @@ +--- ../src_base/minecraft/net/minecraft/crash/CrashReport.java ++++ ../src_work/minecraft/net/minecraft/crash/CrashReport.java +@@ -245,7 +245,8 @@ + StackTraceElement stacktraceelement = null; + StackTraceElement stacktraceelement1 = null; + +- if (astacktraceelement != null && astacktraceelement.length - j < astacktraceelement.length) ++ int idx = astacktraceelement.length - j; //Forge fix AIOOB exception. ++ if (astacktraceelement != null && idx < astacktraceelement.length && idx >= 0) + { + stacktraceelement = astacktraceelement[astacktraceelement.length - j]; + diff --git a/patches/minecraft/net/minecraft/creativetab/CreativeTabs.java.patch b/patches/minecraft/net/minecraft/creativetab/CreativeTabs.java.patch index fec57d5c54..378a68cc9f 100644 --- a/patches/minecraft/net/minecraft/creativetab/CreativeTabs.java.patch +++ b/patches/minecraft/net/minecraft/creativetab/CreativeTabs.java.patch @@ -5,12 +5,12 @@ import net.minecraft.enchantment.EnumEnchantmentType; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; - import net.minecraft.util.StringTranslate; public class CreativeTabs + { @@ -34,8 +35,22 @@ - /** Whether to draw the title in the foreground of the creative GUI */ private boolean drawTitle = true; + private EnumEnchantmentType[] field_111230_s; + public CreativeTabs(String label) + { @@ -53,29 +53,31 @@ return this.tabIndex < 6; } -@@ -149,11 +172,41 @@ +@@ -187,9 +210,17 @@ { Item item = aitem[j]; - if (item != null && item.getCreativeTab() == this) - { - item.getSubItems(item.itemID, this, par1List); -- } -- } + if (item == null) + { + continue; + } + -+ for(CreativeTabs tab : item.getCreativeTabs()) ++ for (CreativeTabs tab : item.getCreativeTabs()) + { + if (tab == this) + { + item.getSubItems(item.itemID, this, par1List); + } -+ } -+ } -+ } + } + } + +@@ -228,4 +259,26 @@ + } + } + } + + public int getTabPage() + { @@ -97,6 +99,5 @@ + public ItemStack getIconItemStack() + { + return new ItemStack(getTabIconItem()); - } - - @SideOnly(Side.CLIENT) ++ } + } diff --git a/patches/minecraft/net/minecraft/enchantment/Enchantment.java.patch b/patches/minecraft/net/minecraft/enchantment/Enchantment.java.patch index 303845dac6..ba8fb5409e 100644 --- a/patches/minecraft/net/minecraft/enchantment/Enchantment.java.patch +++ b/patches/minecraft/net/minecraft/enchantment/Enchantment.java.patch @@ -7,7 +7,7 @@ + +import com.google.common.collect.ObjectArrays; + - import net.minecraft.entity.EntityLiving; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; @@ -205,6 +208,27 @@ diff --git a/patches/minecraft/net/minecraft/entity/Entity.java.patch b/patches/minecraft/net/minecraft/entity/Entity.java.patch index 2ca66d9be2..beb0443d0f 100644 --- a/patches/minecraft/net/minecraft/entity/Entity.java.patch +++ b/patches/minecraft/net/minecraft/entity/Entity.java.patch @@ -25,7 +25,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagDouble; -@@ -25,12 +33,16 @@ +@@ -26,12 +34,16 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.Direction; import net.minecraft.util.MathHelper; @@ -42,7 +42,7 @@ public abstract class Entity { -@@ -225,6 +237,13 @@ +@@ -218,6 +230,13 @@ private boolean invulnerable; private UUID entityUniqueID; public EnumEntitySize myEntitySize; @@ -56,7 +56,7 @@ public Entity(World par1World) { -@@ -274,6 +293,15 @@ +@@ -245,6 +264,15 @@ this.dataWatcher.addObject(0, Byte.valueOf((byte)0)); this.dataWatcher.addObject(1, Short.valueOf((short)300)); this.entityInit(); @@ -72,16 +72,7 @@ } protected abstract void entityInit(); -@@ -554,7 +582,7 @@ - if (!this.worldObj.isRemote) - { - this.setFlag(0, this.fire > 0); -- this.setFlag(2, this.ridingEntity != null); -+ this.setFlag(2, this.ridingEntity != null && ridingEntity.shouldRiderSit()); - } - - this.firstUpdate = false; -@@ -1534,6 +1562,21 @@ +@@ -1515,6 +1543,21 @@ par1NBTTagCompound.setInteger("PortalCooldown", this.timeUntilPortal); par1NBTTagCompound.setLong("UUIDMost", this.entityUniqueID.getMostSignificantBits()); par1NBTTagCompound.setLong("UUIDLeast", this.entityUniqueID.getLeastSignificantBits()); @@ -103,7 +94,7 @@ this.writeEntityToNBT(par1NBTTagCompound); if (this.ridingEntity != null) -@@ -1604,6 +1647,26 @@ +@@ -1585,6 +1628,26 @@ this.setPosition(this.posX, this.posY, this.posZ); this.setRotation(this.rotationYaw, this.rotationPitch); @@ -130,32 +121,32 @@ this.readEntityFromNBT(par1NBTTagCompound); } catch (Throwable throwable) -@@ -1698,7 +1761,14 @@ - { - EntityItem entityitem = new EntityItem(this.worldObj, this.posX, this.posY + (double)par2, this.posZ, par1ItemStack); - entityitem.delayBeforeCanPickup = 10; -- this.worldObj.spawnEntityInWorld(entityitem); -+ if (captureDrops) -+ { -+ capturedDrops.add(entityitem); -+ } -+ else -+ { -+ this.worldObj.spawnEntityInWorld(entityitem); -+ } - return entityitem; +@@ -1687,7 +1750,14 @@ + { + EntityItem entityitem = new EntityItem(this.worldObj, this.posX, this.posY + (double)par2, this.posZ, par1ItemStack); + entityitem.delayBeforeCanPickup = 10; +- this.worldObj.spawnEntityInWorld(entityitem); ++ if (captureDrops) ++ { ++ capturedDrops.add(entityitem); ++ } ++ else ++ { ++ this.worldObj.spawnEntityInWorld(entityitem); ++ } + return entityitem; + } } - -@@ -2056,7 +2126,7 @@ +@@ -1985,7 +2055,7 @@ */ public boolean isRiding() { -- return this.ridingEntity != null || this.getFlag(2); -+ return (this.ridingEntity != null && ridingEntity.shouldRiderSit()) || this.getFlag(2); +- return this.ridingEntity != null; ++ return this.ridingEntity != null && ridingEntity.shouldRiderSit(); } /** -@@ -2400,7 +2470,7 @@ +@@ -2344,7 +2414,7 @@ public float func_82146_a(Explosion par1Explosion, World par2World, int par3, int par4, int par5, Block par6Block) { @@ -164,7 +155,7 @@ } public boolean func_96091_a(Explosion par1Explosion, World par2World, int par3, int par4, int par5, int par6, float par7) -@@ -2458,4 +2528,145 @@ +@@ -2407,4 +2477,145 @@ { return this.getEntityName(); } diff --git a/patches/minecraft/net/minecraft/entity/EntityLiving.java.patch b/patches/minecraft/net/minecraft/entity/EntityLiving.java.patch index 1da5899871..970fa5915b 100644 --- a/patches/minecraft/net/minecraft/entity/EntityLiving.java.patch +++ b/patches/minecraft/net/minecraft/entity/EntityLiving.java.patch @@ -1,223 +1,27 @@ --- ../src_base/minecraft/net/minecraft/entity/EntityLiving.java +++ ../src_work/minecraft/net/minecraft/entity/EntityLiving.java -@@ -22,6 +22,7 @@ - import net.minecraft.entity.item.EntityXPOrb; - import net.minecraft.entity.monster.EntityCreeper; - import net.minecraft.entity.monster.EntityGhast; -+import net.minecraft.entity.passive.EntityPig; - import net.minecraft.entity.passive.EntityWolf; - import net.minecraft.entity.player.EntityPlayer; - import net.minecraft.entity.projectile.EntityArrow; -@@ -50,6 +51,11 @@ +@@ -31,6 +31,7 @@ + import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.WorldServer; - +import net.minecraftforge.common.ForgeHooks; -+import net.minecraftforge.common.MinecraftForge; -+import net.minecraftforge.event.entity.living.*; -+import static net.minecraftforge.event.entity.living.LivingEvent.*; -+ - public abstract class EntityLiving extends Entity + + public abstract class EntityLiving extends EntityLivingBase { - /** -@@ -400,6 +406,7 @@ - public void setAttackTarget(EntityLiving par1EntityLiving) +@@ -141,6 +142,7 @@ + public void setAttackTarget(EntityLivingBase par1EntityLivingBase) { - this.attackTarget = par1EntityLiving; -+ ForgeHooks.onLivingSetAttackTarget(this, par1EntityLiving); + this.attackTarget = par1EntityLivingBase; ++ ForgeHooks.onLivingSetAttackTarget(this, par1EntityLivingBase); } /** -@@ -496,6 +503,7 @@ - { - this.entityLivingToAttack = par1EntityLiving; - this.revengeTimer = this.entityLivingToAttack != null ? 100 : 0; -+ ForgeHooks.onLivingSetAttackTarget(this, par1EntityLiving); - } - - protected void entityInit() -@@ -807,6 +815,11 @@ - */ - public void onUpdate() - { -+ if (ForgeHooks.onLivingUpdate(this)) -+ { -+ return; -+ } -+ - super.onUpdate(); - - if (!this.worldObj.isRemote) -@@ -992,6 +1005,11 @@ - */ - public boolean attackEntityFrom(DamageSource par1DamageSource, int par2) - { -+ if (ForgeHooks.onLivingAttack(this, par1DamageSource, par2)) -+ { -+ return false; -+ } -+ - if (this.isEntityInvulnerable()) - { - return false; -@@ -1229,6 +1247,11 @@ - { - if (!this.isEntityInvulnerable()) - { -+ par2 = ForgeHooks.onLivingHurt(this, par1DamageSource, par2); -+ if (par2 <= 0) -+ { -+ return; -+ } - par2 = this.applyArmorCalculations(par1DamageSource, par2); - par2 = this.applyPotionDamageCalculations(par1DamageSource, par2); - int j = this.getHealth(); -@@ -1295,6 +1318,11 @@ - */ - public void onDeath(DamageSource par1DamageSource) - { -+ if (ForgeHooks.onLivingDeath(this, par1DamageSource)) -+ { -+ return; -+ } -+ - Entity entity = par1DamageSource.getEntity(); - EntityLiving entityliving = this.func_94060_bK(); - -@@ -1319,6 +1347,10 @@ - i = EnchantmentHelper.getLootingModifier((EntityLiving)entity); - } - -+ captureDrops = true; -+ capturedDrops.clear(); -+ int j = 0; -+ - if (!this.isChild() && this.worldObj.getGameRules().getGameRuleBooleanValue("doMobLoot")) - { - this.dropFewItems(this.recentlyHit > 0, i); -@@ -1326,7 +1358,7 @@ - - if (this.recentlyHit > 0) - { -- int j = this.rand.nextInt(200) - i; -+ j = this.rand.nextInt(200) - i; - - if (j < 5) - { -@@ -1334,6 +1366,16 @@ - } - } - } -+ -+ captureDrops = false; -+ -+ if (!ForgeHooks.onLivingDrops(this, par1DamageSource, capturedDrops, i, recentlyHit > 0, j)) -+ { -+ for (EntityItem item : capturedDrops) -+ { -+ worldObj.spawnEntityInWorld(item); -+ } -+ } - } - - this.worldObj.setEntityState(this, (byte)3); -@@ -1378,6 +1420,12 @@ - */ - protected void fall(float par1) - { -+ par1 = ForgeHooks.onLivingFall(this, par1); -+ if (par1 <= 0) -+ { -+ return; -+ } -+ - super.fall(par1); - int i = MathHelper.ceiling_float_int(par1 - 3.0F); - -@@ -1580,7 +1628,7 @@ - int j = MathHelper.floor_double(this.boundingBox.minY); - int k = MathHelper.floor_double(this.posZ); - int l = this.worldObj.getBlockId(i, j, k); -- return l == Block.ladder.blockID || l == Block.vine.blockID; -+ return ForgeHooks.isLivingOnLadder(Block.blocksList[l], worldObj, i, j, k); - } - - /** -@@ -2002,6 +2050,7 @@ - } - - this.isAirBorne = true; -+ ForgeHooks.onLivingJump(this); - } - - /** -@@ -2554,8 +2603,6 @@ - return this.getCreatureAttribute() == EnumCreatureAttribute.UNDEAD; +@@ -726,8 +728,6 @@ + return this.worldObj.checkNoEntityCollision(this.boundingBox) && this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox).isEmpty() && !this.worldObj.isAnyLiquid(this.boundingBox); } - @SideOnly(Side.CLIENT) - /** - * Remove the speified potion effect from this entity. + * Returns render size modifier */ -@@ -2984,6 +3031,17 @@ - */ - public void swingItem() - { -+ ItemStack stack = this.getHeldItem(); -+ -+ if (stack != null && stack.getItem() != null) -+ { -+ Item item = stack.getItem(); -+ if (item.onEntitySwing(this, stack)) -+ { -+ return; -+ } -+ } -+ - if (!this.isSwingInProgress || this.swingProgressInt >= this.getArmSwingAnimationEnd() / 2 || this.swingProgressInt < 0) - { - this.swingProgressInt = -1; -@@ -3084,4 +3142,42 @@ - { - return this.persistenceRequired; - } -+ -+ /*** -+ * Removes all potion effects that have curativeItem as a curative item for its effect -+ * @param curativeItem The itemstack we are using to cure potion effects -+ */ -+ public void curePotionEffects(ItemStack curativeItem) -+ { -+ Iterator potionKey = activePotionsMap.keySet().iterator(); -+ -+ if (worldObj.isRemote) -+ { -+ return; -+ } -+ -+ while (potionKey.hasNext()) -+ { -+ Integer key = potionKey.next(); -+ PotionEffect effect = (PotionEffect)activePotionsMap.get(key); -+ -+ if (effect.isCurativeItem(curativeItem)) -+ { -+ potionKey.remove(); -+ onFinishedPotionEffect(effect); -+ } -+ } -+ } -+ -+ /** -+ * Returns true if the entity's rider (EntityPlayer) should face forward when mounted. -+ * currently only used in vanilla code by pigs. -+ * -+ * @param player The player who is riding the entity. -+ * @return If the player should orient the same direction as this entity. -+ */ -+ public boolean shouldRiderFaceForward(EntityPlayer player) -+ { -+ return this instanceof EntityPig; -+ } - } diff --git a/patches/minecraft/net/minecraft/entity/EntityLivingBase.java.patch b/patches/minecraft/net/minecraft/entity/EntityLivingBase.java.patch new file mode 100644 index 0000000000..294439ab09 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/EntityLivingBase.java.patch @@ -0,0 +1,198 @@ +--- ../src_base/minecraft/net/minecraft/entity/EntityLivingBase.java ++++ ../src_work/minecraft/net/minecraft/entity/EntityLivingBase.java +@@ -21,9 +21,11 @@ + import net.minecraft.entity.item.EntityItem; + import net.minecraft.entity.item.EntityXPOrb; + import net.minecraft.entity.monster.EntityZombie; ++import net.minecraft.entity.passive.EntityPig; + import net.minecraft.entity.passive.EntityWolf; + import net.minecraft.entity.player.EntityPlayer; + import net.minecraft.entity.projectile.EntityArrow; ++import net.minecraft.item.Item; + import net.minecraft.item.ItemArmor; + import net.minecraft.item.ItemStack; + import net.minecraft.nbt.NBTBase; +@@ -46,6 +48,7 @@ + import net.minecraft.util.Vec3; + import net.minecraft.world.World; + import net.minecraft.world.WorldServer; ++import net.minecraftforge.common.ForgeHooks; + + public abstract class EntityLivingBase extends Entity + { +@@ -451,6 +454,7 @@ + { + this.entityLivingToAttack = par1EntityLivingBase; + this.revengeTimer = this.entityLivingToAttack != null ? 100 : 0; ++ ForgeHooks.onLivingSetAttackTarget(this, par1EntityLivingBase); + } + + public EntityLivingBase func_110144_aD() +@@ -738,8 +742,6 @@ + return this.getCreatureAttribute() == EnumCreatureAttribute.UNDEAD; + } + +- @SideOnly(Side.CLIENT) +- + /** + * Remove the speified potion effect from this entity. + */ +@@ -824,6 +826,7 @@ + */ + public boolean attackEntityFrom(DamageSource par1DamageSource, float par2) + { ++ if (ForgeHooks.onLivingAttack(this, par1DamageSource, par2)) return false; + if (this.isEntityInvulnerable()) + { + return false; +@@ -974,6 +977,7 @@ + */ + public void onDeath(DamageSource par1DamageSource) + { ++ if (ForgeHooks.onLivingDeath(this, par1DamageSource)) return; + Entity entity = par1DamageSource.getEntity(); + EntityLivingBase entitylivingbase = this.func_94060_bK(); + +@@ -998,6 +1002,10 @@ + i = EnchantmentHelper.getLootingModifier((EntityLivingBase)entity); + } + ++ captureDrops = true; ++ capturedDrops.clear(); ++ int j = 0; ++ + if (!this.isChild() && this.worldObj.getGameRules().getGameRuleBooleanValue("doMobLoot")) + { + this.dropFewItems(this.recentlyHit > 0, i); +@@ -1005,12 +1013,22 @@ + + if (this.recentlyHit > 0) + { +- int j = this.rand.nextInt(200) - i; ++ j = this.rand.nextInt(200) - i; + + if (j < 5) + { + this.dropRareDrop(j <= 0 ? 1 : 0); + } ++ } ++ } ++ ++ captureDrops = false; ++ ++ if (!ForgeHooks.onLivingDrops(this, par1DamageSource, capturedDrops, i, recentlyHit > 0, j)) ++ { ++ for (EntityItem item : capturedDrops) ++ { ++ worldObj.spawnEntityInWorld(item); + } + } + } +@@ -1080,7 +1098,7 @@ + int j = MathHelper.floor_double(this.boundingBox.minY); + int k = MathHelper.floor_double(this.posZ); + int l = this.worldObj.getBlockId(i, j, k); +- return l == Block.ladder.blockID || l == Block.vine.blockID; ++ return ForgeHooks.isLivingOnLadder(Block.blocksList[l], worldObj, i, j, k, this); + } + + /** +@@ -1096,6 +1114,8 @@ + */ + protected void fall(float par1) + { ++ par1 = ForgeHooks.onLivingFall(this, par1); ++ if (par1 <= 0) return; + super.fall(par1); + PotionEffect potioneffect = this.getActivePotionEffect(Potion.jump); + float f1 = potioneffect != null ? (float)(potioneffect.getAmplifier() + 1) : 0.0F; +@@ -1229,6 +1249,8 @@ + { + if (!this.isEntityInvulnerable()) + { ++ par2 = ForgeHooks.onLivingHurt(this, par1DamageSource, par2); ++ if (par2 <= 0) return; + par2 = this.applyArmorCalculations(par1DamageSource, par2); + par2 = this.applyPotionDamageCalculations(par1DamageSource, par2); + float f1 = par2; +@@ -1290,6 +1312,17 @@ + */ + public void swingItem() + { ++ ItemStack stack = this.getHeldItem(); ++ ++ if (stack != null && stack.getItem() != null) ++ { ++ Item item = stack.getItem(); ++ if (item.onEntitySwing(this, stack)) ++ { ++ return; ++ } ++ } ++ + if (!this.isSwingInProgress || this.field_110158_av >= this.getArmSwingAnimationEnd() / 2 || this.field_110158_av < 0) + { + this.field_110158_av = -1; +@@ -1531,6 +1564,7 @@ + } + + this.isAirBorne = true; ++ ForgeHooks.onLivingJump(this); + } + + /** +@@ -1735,6 +1769,11 @@ + */ + public void onUpdate() + { ++ if (ForgeHooks.onLivingUpdate(this)) ++ { ++ return; ++ } ++ + super.onUpdate(); + + if (!this.worldObj.isRemote) +@@ -2255,4 +2294,42 @@ + + this.field_110151_bq = par1; + } ++ ++ /*** ++ * Removes all potion effects that have curativeItem as a curative item for its effect ++ * @param curativeItem The itemstack we are using to cure potion effects ++ */ ++ public void curePotionEffects(ItemStack curativeItem) ++ { ++ Iterator potionKey = activePotionsMap.keySet().iterator(); ++ ++ if (worldObj.isRemote) ++ { ++ return; ++ } ++ ++ while (potionKey.hasNext()) ++ { ++ Integer key = potionKey.next(); ++ PotionEffect effect = (PotionEffect)activePotionsMap.get(key); ++ ++ if (effect.isCurativeItem(curativeItem)) ++ { ++ potionKey.remove(); ++ onFinishedPotionEffect(effect); ++ } ++ } ++ } ++ ++ /** ++ * Returns true if the entity's rider (EntityPlayer) should face forward when mounted. ++ * currently only used in vanilla code by pigs. ++ * ++ * @param player The player who is riding the entity. ++ * @return If the player should orient the same direction as this entity. ++ */ ++ public boolean shouldRiderFaceForward(EntityPlayer player) ++ { ++ return this instanceof EntityPig; ++ } + } diff --git a/patches/minecraft/net/minecraft/entity/boss/EntityDragon.java.patch b/patches/minecraft/net/minecraft/entity/boss/EntityDragon.java.patch index 4b4217a2ec..1adbe8327e 100644 --- a/patches/minecraft/net/minecraft/entity/boss/EntityDragon.java.patch +++ b/patches/minecraft/net/minecraft/entity/boss/EntityDragon.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/entity/boss/EntityDragon.java +++ ../src_work/minecraft/net/minecraft/entity/boss/EntityDragon.java -@@ -531,10 +531,11 @@ +@@ -527,10 +527,11 @@ for (int i2 = k; i2 <= j1; ++i2) { int j2 = this.worldObj.getBlockId(k1, l1, i2); @@ -11,7 +11,7 @@ + if (block != null) { - if (j2 != Block.obsidian.blockID && j2 != Block.whiteStone.blockID && j2 != Block.bedrock.blockID && this.worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing")) -+ if (block.canDragonDestroy(worldObj, k1, l1, i2) && this.worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing")) ++ if (block.canEntityDestroy(worldObj, k1, l1, i2, this) && this.worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing")) { flag1 = this.worldObj.setBlockToAir(k1, l1, i2) || flag1; } diff --git a/patches/minecraft/net/minecraft/entity/boss/EntityWither.java.patch b/patches/minecraft/net/minecraft/entity/boss/EntityWither.java.patch new file mode 100644 index 0000000000..1808b32208 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/boss/EntityWither.java.patch @@ -0,0 +1,12 @@ +--- ../src_base/minecraft/net/minecraft/entity/boss/EntityWither.java ++++ ../src_work/minecraft/net/minecraft/entity/boss/EntityWither.java +@@ -355,7 +355,8 @@ + int l2 = j1 + l1; + int i3 = this.worldObj.getBlockId(j2, k2, l2); + +- if (i3 > 0 && i3 != Block.bedrock.blockID && i3 != Block.endPortal.blockID && i3 != Block.endPortalFrame.blockID) ++ Block block = Block.blocksList[i3]; ++ if (block != null && block.canEntityDestroy(worldObj, j2, k2, l2, this)) + { + flag = this.worldObj.destroyBlock(j2, k2, l2, true) || flag; + } diff --git a/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.java.patch b/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.java.patch index 5d631ad75f..5695a078f4 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.java.patch +++ b/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/entity/item/EntityEnderPearl.java +++ ../src_work/minecraft/net/minecraft/entity/item/EntityEnderPearl.java -@@ -8,6 +8,8 @@ +@@ -9,6 +9,8 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -9,20 +9,28 @@ public class EntityEnderPearl extends EntityThrowable { -@@ -50,9 +52,13 @@ +@@ -51,14 +53,18 @@ if (!entityplayermp.playerNetServerHandler.connectionClosed && entityplayermp.worldObj == this.worldObj) { -- this.getThrower().setPositionAndUpdate(this.posX, this.posY, this.posZ); -- this.getThrower().fallDistance = 0.0F; -- this.getThrower().attackEntityFrom(DamageSource.fall, 5); -+ EnderTeleportEvent event = new EnderTeleportEvent(entityplayermp, this.posX, this.posY, this.posZ, 5); -+ if (!MinecraftForge.EVENT_BUS.post(event)){ +- if (this.getThrower().isRiding()) ++ EnderTeleportEvent event = new EnderTeleportEvent(entityplayermp, this.posX, this.posY, this.posZ, 5.0F); ++ if (!MinecraftForge.EVENT_BUS.post(event)) + { +- this.getThrower().mountEntity((Entity)null); ++ if (this.getThrower().isRiding()) ++ { ++ this.getThrower().mountEntity((Entity)null); ++ } ++ + this.getThrower().setPositionAndUpdate(event.targetX, event.targetY, event.targetZ); + this.getThrower().fallDistance = 0.0F; + this.getThrower().attackEntityFrom(DamageSource.fall, event.attackDamage); -+ } -+ + } +- +- this.getThrower().setPositionAndUpdate(this.posX, this.posY, this.posZ); +- this.getThrower().fallDistance = 0.0F; +- this.getThrower().attackEntityFrom(DamageSource.fall, 5.0F); } } diff --git a/patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch b/patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch index 9fc290366c..eedc3671cd 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch +++ b/patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch @@ -24,7 +24,7 @@ public EntityItem(World par1World, double par2, double par4, double par6) { super(par1World); -@@ -49,6 +59,7 @@ +@@ -48,6 +58,7 @@ { this(par1World, par2, par4, par6); this.setEntityItemStack(par8ItemStack); @@ -32,7 +32,7 @@ } /** -@@ -80,6 +91,15 @@ +@@ -78,6 +89,15 @@ */ public void onUpdate() { @@ -48,7 +48,7 @@ super.onUpdate(); if (this.delayBeforeCanPickup > 0) -@@ -135,7 +155,29 @@ +@@ -133,7 +153,29 @@ ++this.age; @@ -79,7 +79,7 @@ { this.setDead(); } -@@ -270,6 +312,7 @@ +@@ -268,6 +310,7 @@ { par1NBTTagCompound.setShort("Health", (short)((byte)this.health)); par1NBTTagCompound.setShort("Age", (short)this.age); @@ -87,7 +87,7 @@ if (this.getEntityItem() != null) { -@@ -287,10 +330,17 @@ +@@ -285,10 +328,17 @@ NBTTagCompound nbttagcompound1 = par1NBTTagCompound.getCompoundTag("Item"); this.setEntityItemStack(ItemStack.loadItemStackFromNBT(nbttagcompound1)); @@ -106,7 +106,7 @@ } /** -@@ -300,10 +350,22 @@ +@@ -298,10 +348,22 @@ { if (!this.worldObj.isRemote) { diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecart.java.patch b/patches/minecraft/net/minecraft/entity/item/EntityMinecart.java.patch index 3d3872d8ac..a43ef0e884 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityMinecart.java.patch +++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecart.java.patch @@ -32,7 +32,7 @@ public EntityMinecart(World par1World) { super(par1World); -@@ -105,6 +123,10 @@ +@@ -104,6 +122,10 @@ */ public AxisAlignedBB getCollisionBox(Entity par1Entity) { @@ -43,7 +43,7 @@ return par1Entity.canBePushed() ? par1Entity.boundingBox : null; } -@@ -113,6 +135,10 @@ +@@ -112,6 +134,10 @@ */ public AxisAlignedBB getBoundingBox() { @@ -54,7 +54,7 @@ return null; } -@@ -121,7 +147,7 @@ +@@ -120,7 +146,7 @@ */ public boolean canBePushed() { @@ -63,7 +63,7 @@ } public EntityMinecart(World par1World, double par2, double par4, double par6) -@@ -353,19 +379,21 @@ +@@ -352,19 +378,21 @@ double d5 = 0.0078125D; int l = this.worldObj.getBlockId(j, i, k); @@ -92,7 +92,7 @@ } this.doBlockCollisions(); -@@ -392,7 +420,18 @@ +@@ -391,7 +419,18 @@ } this.setRotation(this.rotationYaw, this.rotationPitch); @@ -112,7 +112,7 @@ if (list != null && !list.isEmpty()) { -@@ -416,6 +455,8 @@ +@@ -415,6 +454,8 @@ this.riddenByEntity = null; } @@ -121,7 +121,7 @@ } } -@@ -444,6 +485,17 @@ +@@ -443,6 +484,17 @@ if (this.motionZ > par1) { this.motionZ = par1; @@ -139,7 +139,7 @@ } if (this.onGround) -@@ -453,13 +505,13 @@ +@@ -452,13 +504,13 @@ this.motionZ *= 0.5D; } @@ -157,7 +157,7 @@ } } -@@ -473,7 +525,7 @@ +@@ -472,7 +524,7 @@ if (par8 == Block.railPowered.blockID) { @@ -166,7 +166,7 @@ flag1 = !flag; } -@@ -544,7 +596,7 @@ +@@ -551,7 +603,7 @@ } } @@ -175,7 +175,7 @@ { d7 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ); -@@ -592,36 +644,8 @@ +@@ -599,36 +651,8 @@ this.posX = d8 + d2 * d7; this.posZ = d9 + d3 * d7; this.setPosition(this.posX, this.posY + (double)this.yOffset, this.posZ); @@ -214,7 +214,7 @@ if (aint[0][1] != 0 && MathHelper.floor_double(this.posX) - par1 == aint[0][0] && MathHelper.floor_double(this.posZ) - par3 == aint[0][2]) { -@@ -659,7 +683,12 @@ +@@ -666,7 +690,12 @@ this.motionZ = d6 * (double)(k1 - par3); } @@ -228,7 +228,7 @@ { double d15 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ); -@@ -730,12 +759,7 @@ +@@ -737,12 +766,7 @@ } else { @@ -242,7 +242,7 @@ par3 = (double)j; -@@ -781,13 +805,8 @@ +@@ -788,13 +812,8 @@ if (BlockRailBase.isRailBlock(l)) { @@ -257,7 +257,7 @@ if (i1 >= 2 && i1 <= 5) { -@@ -893,11 +912,17 @@ +@@ -900,11 +919,17 @@ */ public void applyEntityCollision(Entity par1Entity) { @@ -271,12 +271,12 @@ { if (par1Entity != this.riddenByEntity) { -- if (par1Entity instanceof EntityLiving && !(par1Entity instanceof EntityPlayer) && !(par1Entity instanceof EntityIronGolem) && this.getMinecartType() == 0 && this.motionX * this.motionX + this.motionZ * this.motionZ > 0.01D && this.riddenByEntity == null && par1Entity.ridingEntity == null) -+ if (par1Entity instanceof EntityLiving && !(par1Entity instanceof EntityPlayer) && !(par1Entity instanceof EntityIronGolem) && canBeRidden() && this.motionX * this.motionX + this.motionZ * this.motionZ > 0.01D && this.riddenByEntity == null && par1Entity.ridingEntity == null) +- if (par1Entity instanceof EntityLivingBase && !(par1Entity instanceof EntityPlayer) && !(par1Entity instanceof EntityIronGolem) && this.getMinecartType() == 0 && this.motionX * this.motionX + this.motionZ * this.motionZ > 0.01D && this.riddenByEntity == null && par1Entity.ridingEntity == null) ++ if (par1Entity instanceof EntityLivingBase && !(par1Entity instanceof EntityPlayer) && !(par1Entity instanceof EntityIronGolem) && canBeRidden() && this.motionX * this.motionX + this.motionZ * this.motionZ > 0.01D && this.riddenByEntity == null && par1Entity.ridingEntity == null) { par1Entity.mountEntity(this); } -@@ -943,7 +968,7 @@ +@@ -950,7 +975,7 @@ double d7 = par1Entity.motionX + this.motionX; double d8 = par1Entity.motionZ + this.motionZ; @@ -285,7 +285,7 @@ { this.motionX *= 0.20000000298023224D; this.motionZ *= 0.20000000298023224D; -@@ -951,7 +976,7 @@ +@@ -958,7 +983,7 @@ par1Entity.motionX *= 0.949999988079071D; par1Entity.motionZ *= 0.949999988079071D; } @@ -294,7 +294,7 @@ { par1Entity.motionX *= 0.20000000298023224D; par1Entity.motionZ *= 0.20000000298023224D; -@@ -1158,4 +1183,211 @@ +@@ -1165,4 +1190,211 @@ { return this.entityName; } diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartContainer.java.patch b/patches/minecraft/net/minecraft/entity/item/EntityMinecartContainer.java.patch index e90ecb6102..d582c2aa25 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartContainer.java.patch +++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartContainer.java.patch @@ -9,9 +9,9 @@ public abstract class EntityMinecartContainer extends EntityMinecart implements IInventory { -@@ -283,6 +285,10 @@ - */ - public boolean interact(EntityPlayer par1EntityPlayer) +@@ -280,6 +282,10 @@ + + public boolean func_130002_c(EntityPlayer par1EntityPlayer) { + if(MinecraftForge.EVENT_BUS.post(new MinecartInteractEvent(this, par1EntityPlayer))) + { diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.java.patch b/patches/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.java.patch index 7944835ed7..89caea5f2d 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.java.patch +++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.java.patch @@ -9,9 +9,9 @@ public class EntityMinecartEmpty extends EntityMinecart { -@@ -20,6 +22,10 @@ - */ - public boolean interact(EntityPlayer par1EntityPlayer) +@@ -17,6 +19,10 @@ + + public boolean func_130002_c(EntityPlayer par1EntityPlayer) { + if(MinecraftForge.EVENT_BUS.post(new MinecartInteractEvent(this, par1EntityPlayer))) + { diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartFurnace.java.patch b/patches/minecraft/net/minecraft/entity/item/EntityMinecartFurnace.java.patch index cd938f3e31..c1dd20b009 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartFurnace.java.patch +++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartFurnace.java.patch @@ -9,9 +9,9 @@ public class EntityMinecartFurnace extends EntityMinecart { -@@ -126,6 +128,10 @@ - */ - public boolean interact(EntityPlayer par1EntityPlayer) +@@ -123,6 +125,10 @@ + + public boolean func_130002_c(EntityPlayer par1EntityPlayer) { + if(MinecraftForge.EVENT_BUS.post(new MinecartInteractEvent(this, par1EntityPlayer))) + { diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartHopper.java.patch b/patches/minecraft/net/minecraft/entity/item/EntityMinecartHopper.java.patch index 104f919c34..36550b48c3 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartHopper.java.patch +++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartHopper.java.patch @@ -9,9 +9,9 @@ public class EntityMinecartHopper extends EntityMinecartContainer implements Hopper { -@@ -54,6 +56,10 @@ - */ - public boolean interact(EntityPlayer par1EntityPlayer) +@@ -51,6 +53,10 @@ + + public boolean func_130002_c(EntityPlayer par1EntityPlayer) { + if(MinecraftForge.EVENT_BUS.post(new MinecartInteractEvent(this, par1EntityPlayer))) + { diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityEnderman.java.patch b/patches/minecraft/net/minecraft/entity/monster/EntityEnderman.java.patch index 8c18e40a1a..a4b705feba 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityEnderman.java.patch +++ b/patches/minecraft/net/minecraft/entity/monster/EntityEnderman.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/entity/monster/EntityEnderman.java +++ ../src_work/minecraft/net/minecraft/entity/monster/EntityEnderman.java -@@ -12,6 +12,8 @@ +@@ -16,6 +16,8 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; import net.minecraft.world.World; @@ -9,7 +9,7 @@ public class EntityEnderman extends EntityMob { -@@ -275,12 +277,17 @@ +@@ -291,12 +293,17 @@ */ protected boolean teleportTo(double par1, double par3, double par5) { @@ -30,7 +30,7 @@ boolean flag = false; int i = MathHelper.floor_double(this.posX); int j = MathHelper.floor_double(this.posY); -@@ -457,7 +464,7 @@ +@@ -473,7 +480,7 @@ } } diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.java.patch b/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.java.patch index cc6af1ed18..a448204ade 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.java.patch +++ b/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.java.patch @@ -13,7 +13,7 @@ { public EntityMooshroom(World par1World) { -@@ -39,31 +43,7 @@ +@@ -38,31 +42,7 @@ } } @@ -26,7 +26,7 @@ - { - EntityCow entitycow = new EntityCow(this.worldObj); - entitycow.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, this.rotationPitch); -- entitycow.setEntityHealth(this.getHealth()); +- entitycow.setEntityHealth(this.func_110143_aJ()); - entitycow.renderYawOffset = this.renderYawOffset; - this.worldObj.spawnEntityInWorld(entitycow); - @@ -46,7 +46,7 @@ } public EntityMooshroom func_94900_c(EntityAgeable par1EntityAgeable) -@@ -83,4 +63,29 @@ +@@ -82,4 +62,29 @@ { return this.func_94900_c(par1EntityAgeable); } @@ -63,7 +63,7 @@ + setDead(); + EntityCow entitycow = new EntityCow(worldObj); + entitycow.setLocationAndAngles(posX, posY, posZ, rotationYaw, rotationPitch); -+ entitycow.setEntityHealth(getHealth()); ++ entitycow.setEntityHealth(func_110143_aJ()); + entitycow.renderYawOffset = renderYawOffset; + worldObj.spawnEntityInWorld(entitycow); + worldObj.spawnParticle("largeexplode", posX, posY + (double)(height / 2.0F), posZ, 0.0D, 0.0D, 0.0D); diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.java.patch b/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.java.patch index 7f264450fc..2237df0f64 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.java.patch +++ b/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/entity/passive/EntityOcelot.java +++ ../src_work/minecraft/net/minecraft/entity/passive/EntityOcelot.java -@@ -355,8 +355,9 @@ +@@ -334,8 +334,9 @@ } int l = this.worldObj.getBlockId(i, j - 1, k); diff --git a/patches/minecraft/net/minecraft/entity/passive/EntitySheep.java.patch b/patches/minecraft/net/minecraft/entity/passive/EntitySheep.java.patch index ee9c14bd71..980d333b03 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntitySheep.java.patch +++ b/patches/minecraft/net/minecraft/entity/passive/EntitySheep.java.patch @@ -9,7 +9,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.entity.EntityAgeable; -@@ -24,7 +26,9 @@ +@@ -26,7 +28,9 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; @@ -20,7 +20,7 @@ { private final InventoryCrafting field_90016_e = new InventoryCrafting(new ContainerSheep(this), 2, 1); -@@ -159,28 +163,6 @@ +@@ -141,28 +145,6 @@ */ public boolean interact(EntityPlayer par1EntityPlayer) { @@ -49,7 +49,7 @@ return super.interact(par1EntityPlayer); } -@@ -349,4 +331,24 @@ +@@ -343,4 +325,24 @@ { return this.func_90015_b(par1EntityAgeable); } diff --git a/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch b/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch index e8603c6eb2..582b79133f 100644 --- a/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch +++ b/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/entity/player/EntityPlayer.java +++ ../src_work/minecraft/net/minecraft/entity/player/EntityPlayer.java -@@ -66,8 +66,23 @@ +@@ -68,8 +68,21 @@ import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; @@ -16,24 +16,13 @@ +import net.minecraftforge.event.entity.player.PlayerFlyableFallEvent; +import net.minecraftforge.event.entity.player.PlayerSleepInBedEvent; + - public abstract class EntityPlayer extends EntityLiving implements ICommandSender + public abstract class EntityPlayer extends EntityLivingBase implements ICommandSender { + public static final String PERSISTED_NBT_TAG = "PlayerPersisted"; -+ public int maxHealth = 20; -+ /** Inventory of the player */ public InventoryPlayer inventory = new InventoryPlayer(this); private InventoryEnderChest theInventoryEnderChest = new InventoryEnderChest(); -@@ -181,7 +196,7 @@ - - public int getMaxHealth() - { -- return 20; -+ return maxHealth <= 0 ? 20 : maxHealth; - } - - protected void entityInit() -@@ -268,6 +283,7 @@ +@@ -269,6 +282,7 @@ if (itemstack == this.itemInUse) { @@ -41,21 +30,27 @@ if (this.itemInUseCount <= 25 && this.itemInUseCount % 4 == 0) { this.updateItemUse(itemstack, 5); -@@ -528,11 +544,11 @@ - this.cameraYaw = 0.0F; - this.addMountedMovementStat(this.posX - d0, this.posY - d1, this.posZ - d2); +@@ -539,11 +553,11 @@ + this.cameraYaw = 0.0F; + this.addMountedMovementStat(this.posX - d0, this.posY - d1, this.posZ - d2); -- if (this.ridingEntity instanceof EntityPig) -+ if (this.ridingEntity instanceof EntityLiving && ((EntityLiving)ridingEntity).shouldRiderFaceForward(this)) - { - this.rotationPitch = f1; - this.rotationYaw = f; -- this.renderYawOffset = ((EntityPig)this.ridingEntity).renderYawOffset; -+ this.renderYawOffset = ((EntityLiving)this.ridingEntity).renderYawOffset; +- if (this.ridingEntity instanceof EntityPig) ++ if (this.ridingEntity instanceof EntityLivingBase && ((EntityLivingBase)ridingEntity).shouldRiderFaceForward(this)) + { + this.rotationPitch = f1; + this.rotationYaw = f; +- this.renderYawOffset = ((EntityPig)this.ridingEntity).renderYawOffset; ++ this.renderYawOffset = ((EntityLivingBase)this.ridingEntity).renderYawOffset; + } } } - -@@ -661,6 +677,9 @@ +@@ -686,11 +700,15 @@ + */ + public void onDeath(DamageSource par1DamageSource) + { ++ if (ForgeHooks.onLivingDeath(this, par1DamageSource)) return; + super.onDeath(par1DamageSource); + this.setSize(0.2F, 0.2F); this.setPosition(this.posX, this.posY, this.posZ); this.motionY = 0.10000000149011612D; @@ -65,7 +60,7 @@ if (this.username.equals("Notch")) { this.dropPlayerItemWithRandomChoice(new ItemStack(Item.appleRed, 1), true); -@@ -669,6 +688,20 @@ +@@ -699,6 +717,20 @@ if (!this.worldObj.getGameRules().getGameRuleBooleanValue("keepInventory")) { this.inventory.dropAllItems(); @@ -86,7 +81,7 @@ } if (par1DamageSource != null) -@@ -719,7 +752,20 @@ +@@ -749,7 +781,20 @@ */ public EntityItem dropOneItem(boolean par1) { @@ -108,7 +103,7 @@ } /** -@@ -728,7 +774,7 @@ +@@ -758,7 +803,7 @@ */ public EntityItem dropPlayerItem(ItemStack par1ItemStack) { @@ -117,7 +112,7 @@ } /** -@@ -780,15 +826,28 @@ +@@ -814,15 +859,28 @@ */ public void joinEntityItemWithWorld(EntityItem par1EntityItem) { @@ -148,7 +143,7 @@ if (f > 1.0F) { -@@ -799,7 +858,9 @@ +@@ -833,7 +891,9 @@ { float f1 = (float)(i * i + 1); @@ -159,7 +154,7 @@ { f += f1 * 0.08F; } -@@ -830,7 +891,8 @@ +@@ -864,7 +924,8 @@ f /= 5.0F; } @@ -169,7 +164,7 @@ } /** -@@ -838,7 +900,7 @@ +@@ -872,7 +933,7 @@ */ public boolean canHarvestBlock(Block par1Block) { @@ -178,60 +173,40 @@ } /** -@@ -857,6 +919,9 @@ - this.experienceTotal = par1NBTTagCompound.getInteger("XpTotal"); - this.setScore(par1NBTTagCompound.getInteger("Score")); - -+ int tmp = par1NBTTagCompound.getInteger("MaxHealth"); -+ maxHealth = (tmp <= 0 ? 20 : tmp); -+ - if (this.sleeping) +@@ -982,6 +1043,7 @@ + */ + public boolean attackEntityFrom(DamageSource par1DamageSource, float par2) + { ++ if (ForgeHooks.onLivingAttack(this, par1DamageSource, par2)) return false; + if (this.isEntityInvulnerable()) { - this.playerLocation = new ChunkCoordinates(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double(this.posZ)); -@@ -893,6 +958,7 @@ - par1NBTTagCompound.setInteger("XpLevel", this.experienceLevel); - par1NBTTagCompound.setInteger("XpTotal", this.experienceTotal); - par1NBTTagCompound.setInteger("Score", this.getScore()); -+ par1NBTTagCompound.setInteger("MaxHealth", maxHealth); - - if (this.spawnChunk != null) - { -@@ -1096,12 +1162,22 @@ + return false; +@@ -1135,12 +1197,15 @@ { if (!this.isEntityInvulnerable()) { + par2 = ForgeHooks.onLivingHurt(this, par1DamageSource, par2); -+ if (par2 <= 0) -+ { -+ return; -+ } -+ - if (!par1DamageSource.isUnblockable() && this.isBlocking()) ++ if (par2 <= 0) return; + if (!par1DamageSource.isUnblockable() && this.isBlocking() && par2 > 0.0F) { - par2 = 1 + par2 >> 1; + par2 = (1.0F + par2) * 0.5F; } - par2 = this.applyArmorCalculations(par1DamageSource, par2); + par2 = ArmorProperties.ApplyArmor(this, inventory.armorInventory, par1DamageSource, par2); -+ if (par2 <= 0) -+ { -+ return; -+ } ++ if (par2 <= 0) return; par2 = this.applyPotionDamageCalculations(par1DamageSource, par2); - this.addExhaustion(par1DamageSource.getHungerDamage()); - int j = this.getHealth(); -@@ -1144,6 +1220,10 @@ + float f1 = par2; + par2 = Math.max(par2 - this.func_110139_bj(), 0.0F); +@@ -1190,6 +1255,7 @@ public boolean interactWith(Entity par1Entity) { -+ if (MinecraftForge.EVENT_BUS.post(new EntityInteractEvent(this, par1Entity))) -+ { -+ return false; -+ } - if (par1Entity.interact(this)) - { - return true; -@@ -1187,7 +1267,9 @@ ++ if (MinecraftForge.EVENT_BUS.post(new EntityInteractEvent(this, par1Entity))) return false; + ItemStack itemstack = this.getCurrentEquippedItem(); + ItemStack itemstack1 = itemstack != null ? itemstack.copy() : null; + +@@ -1246,7 +1312,9 @@ */ public void destroyCurrentEquippedItem() { @@ -241,7 +216,7 @@ } /** -@@ -1204,6 +1286,15 @@ +@@ -1263,6 +1331,15 @@ */ public void attackTargetEntityWithCurrentItem(Entity par1Entity) { @@ -257,7 +232,7 @@ if (par1Entity.canAttackWithItem()) { if (!par1Entity.func_85031_j(this)) -@@ -1378,6 +1469,12 @@ +@@ -1421,6 +1498,12 @@ */ public EnumStatus sleepInBedAt(int par1, int par2, int par3) { @@ -270,7 +245,7 @@ if (!this.worldObj.isRemote) { if (this.isPlayerSleeping() || !this.isEntityAlive()) -@@ -1417,6 +1514,11 @@ +@@ -1465,6 +1548,11 @@ { int l = this.worldObj.getBlockMetadata(par1, par2, par3); int i1 = BlockBed.getDirection(l); @@ -282,7 +257,7 @@ float f = 0.5F; float f1 = 0.5F; -@@ -1487,10 +1589,12 @@ +@@ -1535,10 +1623,12 @@ ChunkCoordinates chunkcoordinates = this.playerLocation; ChunkCoordinates chunkcoordinates1 = this.playerLocation; @@ -299,7 +274,7 @@ if (chunkcoordinates1 == null) { -@@ -1527,7 +1631,9 @@ +@@ -1575,7 +1665,9 @@ */ private boolean isInBed() { @@ -310,7 +285,7 @@ } /** -@@ -1542,9 +1648,12 @@ +@@ -1590,9 +1682,12 @@ ichunkprovider.loadChunk(par1ChunkCoordinates.posX - 3 >> 4, par1ChunkCoordinates.posZ + 3 >> 4); ichunkprovider.loadChunk(par1ChunkCoordinates.posX + 3 >> 4, par1ChunkCoordinates.posZ + 3 >> 4); @@ -326,7 +301,7 @@ return chunkcoordinates1; } else -@@ -1566,10 +1675,13 @@ +@@ -1614,10 +1709,13 @@ { if (this.playerLocation != null) { @@ -344,7 +319,7 @@ { case 0: return 90.0F; -@@ -1835,6 +1947,10 @@ +@@ -1891,6 +1989,10 @@ super.fall(par1); } @@ -355,7 +330,7 @@ } /** -@@ -1876,7 +1992,7 @@ +@@ -1932,7 +2034,7 @@ { if (par1ItemStack.getItem().requiresMultipleRenderPasses()) { @@ -364,7 +339,7 @@ } if (this.itemInUse != null && par1ItemStack.itemID == Item.bow.itemID) -@@ -1898,6 +2014,7 @@ +@@ -1954,6 +2056,7 @@ return Item.bow.getItemIconForUseDuration(0); } } @@ -372,7 +347,7 @@ } return icon; -@@ -2137,6 +2254,14 @@ +@@ -2176,6 +2279,14 @@ } this.theInventoryEnderChest = par1EntityPlayer.theInventoryEnderChest; @@ -387,7 +362,7 @@ } /** -@@ -2208,7 +2333,14 @@ +@@ -2239,7 +2350,14 @@ */ public void setCurrentItemOrArmor(int par1, ItemStack par2ItemStack) { diff --git a/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch b/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch index 15a2607ed7..42c1ddec78 100644 --- a/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch +++ b/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/entity/player/EntityPlayerMP.java +++ ../src_work/minecraft/net/minecraft/entity/player/EntityPlayerMP.java -@@ -87,6 +87,12 @@ +@@ -90,6 +90,12 @@ import net.minecraft.world.WorldServer; import net.minecraft.world.chunk.Chunk; @@ -12,8 +12,8 @@ + public class EntityPlayerMP extends EntityPlayer implements ICrafting { - private StringTranslate translator = new StringTranslate("en_US"); -@@ -158,18 +164,10 @@ + private String translator = "en_US"; +@@ -162,18 +168,10 @@ par4ItemInWorldManager.thisPlayerMP = this; this.theItemInWorldManager = par4ItemInWorldManager; this.renderDistance = par1MinecraftServer.getConfigurationManager().getViewDistance(); @@ -33,7 +33,7 @@ this.mcServer = par1MinecraftServer; this.stepHeight = 0.0F; -@@ -278,7 +276,10 @@ +@@ -287,7 +285,10 @@ if (chunkcoordintpair != null && this.worldObj.blockExists(chunkcoordintpair.chunkXPos << 4, 0, chunkcoordintpair.chunkZPos << 4)) { arraylist.add(this.worldObj.getChunkFromChunkCoords(chunkcoordintpair.chunkXPos, chunkcoordintpair.chunkZPos)); @@ -45,7 +45,7 @@ } } -@@ -299,6 +300,7 @@ +@@ -308,6 +309,7 @@ { Chunk chunk = (Chunk)iterator2.next(); this.getServerForPlayer().getEntityTracker().func_85172_a(this, chunk); @@ -53,16 +53,12 @@ } } } -@@ -366,11 +368,29 @@ +@@ -375,11 +377,25 @@ */ public void onDeath(DamageSource par1DamageSource) { -+ if (ForgeHooks.onLivingDeath(this, par1DamageSource)) -+ { -+ return; -+ } -+ - this.mcServer.getConfigurationManager().sendChatMsg(this.field_94063_bt.func_94546_b()); ++ if (ForgeHooks.onLivingDeath(this, par1DamageSource)) return; + this.mcServer.getConfigurationManager().sendChatMsg(this.func_110142_aN().func_94546_b()); if (!this.worldObj.getGameRules().getGameRuleBooleanValue("keepInventory")) { diff --git a/patches/minecraft/net/minecraft/entity/player/InventoryPlayer.java.patch b/patches/minecraft/net/minecraft/entity/player/InventoryPlayer.java.patch index acaddd6d2e..0c5cc440bf 100644 --- a/patches/minecraft/net/minecraft/entity/player/InventoryPlayer.java.patch +++ b/patches/minecraft/net/minecraft/entity/player/InventoryPlayer.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/entity/player/InventoryPlayer.java +++ ../src_work/minecraft/net/minecraft/entity/player/InventoryPlayer.java -@@ -338,6 +338,14 @@ +@@ -357,6 +357,14 @@ if (this.mainInventory[i] != null) { this.mainInventory[i].updateAnimation(this.player.worldObj, this.player, i, this.currentItem == i); diff --git a/patches/minecraft/net/minecraft/inventory/ContainerRepair.java.patch b/patches/minecraft/net/minecraft/inventory/ContainerRepair.java.patch index a05ae4e799..0006d14378 100644 --- a/patches/minecraft/net/minecraft/inventory/ContainerRepair.java.patch +++ b/patches/minecraft/net/minecraft/inventory/ContainerRepair.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/inventory/ContainerRepair.java +++ ../src_work/minecraft/net/minecraft/inventory/ContainerRepair.java -@@ -305,6 +305,11 @@ +@@ -315,6 +315,11 @@ k = Math.max(1, k / 2); } @@ -12,7 +12,7 @@ this.maximumCost = k + i; if (i <= 0) -@@ -322,6 +327,7 @@ +@@ -331,6 +336,7 @@ { itemstack1 = null; } diff --git a/patches/minecraft/net/minecraft/inventory/Slot.java.patch b/patches/minecraft/net/minecraft/inventory/Slot.java.patch index 5371563e7a..e18fd8e3c2 100644 --- a/patches/minecraft/net/minecraft/inventory/Slot.java.patch +++ b/patches/minecraft/net/minecraft/inventory/Slot.java.patch @@ -1,6 +1,15 @@ --- ../src_base/minecraft/net/minecraft/inventory/Slot.java +++ ../src_work/minecraft/net/minecraft/inventory/Slot.java -@@ -22,6 +22,12 @@ +@@ -2,6 +2,8 @@ + + import cpw.mods.fml.relauncher.Side; + import cpw.mods.fml.relauncher.SideOnly; ++import net.minecraft.client.renderer.texture.TextureMap; ++import net.minecraft.client.resources.ResourceLocation; + import net.minecraft.entity.player.EntityPlayer; + import net.minecraft.item.ItemStack; + import net.minecraft.util.Icon; +@@ -22,6 +24,13 @@ /** display position of the inventory slot on the screen y axis */ public int yDisplayPosition; @@ -9,32 +18,40 @@ + protected Icon backgroundIcon = null; + + /** Background texture file assigned to this slot, if any. Vanilla "/gui/items.png" is used if this is null. */ -+ protected String texture = "/gui/items.png"; ++ @SideOnly(Side.CLIENT) ++ protected ResourceLocation texture; public Slot(IInventory par1IInventory, int par2, int par3, int par4) { -@@ -148,6 +154,45 @@ +@@ -148,7 +157,7 @@ */ public Icon getBackgroundIconIndex() { - return null; + return backgroundIcon; } + + @SideOnly(Side.CLIENT) +@@ -156,4 +165,44 @@ + { + return true; + } + + /** + * Gets the path of the texture file to use for the background image of this slot when drawing the GUI. + * @return String: The texture file that will be used in GuiContainer.drawSlotInventory for the slot background. + */ -+ public String getBackgroundIconTexture() ++ @SideOnly(Side.CLIENT) ++ public ResourceLocation getBackgroundIconTexture() + { -+ return (texture == null ? "/gui/items.png" : texture); ++ return (texture == null ? TextureMap.field_110576_c : texture); + } + + /** + * Sets which icon index to use as the background image of the slot when it's empty. + * @param icon The icon to use, null for none + */ -+ public void setBackgroundIconIndex(Icon icon) ++ public void setBackgroundIcon(Icon icon) + { + backgroundIcon = icon; + } @@ -43,9 +60,10 @@ + * Sets the texture file to use for the background image of the slot when it's empty. + * @param textureFilename String: Path of texture file to use, or null to use "/gui/items.png" + */ -+ public void setBackgroundIconTexture(String textureFilename) ++ @SideOnly(Side.CLIENT) ++ public void setBackgroundIconTexture(ResourceLocation texture) + { -+ texture = textureFilename; ++ this.texture = texture; + } + + /** @@ -58,5 +76,4 @@ + { + return slotIndex; + } -+ } diff --git a/patches/minecraft/net/minecraft/item/BehaviorDispenseArmor.java.patch b/patches/minecraft/net/minecraft/item/BehaviorDispenseArmor.java.patch index e308481f42..26d558f062 100644 --- a/patches/minecraft/net/minecraft/item/BehaviorDispenseArmor.java.patch +++ b/patches/minecraft/net/minecraft/item/BehaviorDispenseArmor.java.patch @@ -1,11 +1,11 @@ --- ../src_base/minecraft/net/minecraft/item/BehaviorDispenseArmor.java +++ ../src_work/minecraft/net/minecraft/item/BehaviorDispenseArmor.java -@@ -31,7 +31,7 @@ +@@ -32,7 +32,7 @@ int i1 = EntityLiving.getArmorPosition(par2ItemStack); ItemStack itemstack1 = par2ItemStack.copy(); itemstack1.stackSize = 1; -- entityliving.setCurrentItemOrArmor(i1 - l, itemstack1); -+ entityliving.setCurrentItemOrArmor(i1, itemstack1); //Forge: Vanilla bug fix associated with fixed setCurrentItemOrArmor indexs for players. - entityliving.func_96120_a(i1, 2.0F); - --par2ItemStack.stackSize; - return par2ItemStack; +- entitylivingbase.setCurrentItemOrArmor(i1 - l, itemstack1); ++ entitylivingbase.setCurrentItemOrArmor(i1, itemstack1); //BUGFIX Forge: Vanilla bug fix associated with fixed setCurrentItemOrArmor indexs for players. + + if (entitylivingbase instanceof EntityLiving) + { diff --git a/patches/minecraft/net/minecraft/item/EnumToolMaterial.java.patch b/patches/minecraft/net/minecraft/item/EnumToolMaterial.java.patch index a99f5a41f0..4fe0bbb277 100644 --- a/patches/minecraft/net/minecraft/item/EnumToolMaterial.java.patch +++ b/patches/minecraft/net/minecraft/item/EnumToolMaterial.java.patch @@ -8,7 +8,7 @@ + //Added by forge for custom Armor materials. + public Item customCraftingMaterial = null; - private EnumToolMaterial(int par3, int par4, float par5, int par6, int par7) + private EnumToolMaterial(int par3, int par4, float par5, float par6, int par7) { @@ -86,6 +89,14 @@ */ diff --git a/patches/minecraft/net/minecraft/item/Item.java.patch b/patches/minecraft/net/minecraft/item/Item.java.patch index 3fab01b8be..9f9f135878 100644 --- a/patches/minecraft/net/minecraft/item/Item.java.patch +++ b/patches/minecraft/net/minecraft/item/Item.java.patch @@ -1,17 +1,16 @@ --- ../src_base/minecraft/net/minecraft/item/Item.java +++ ../src_work/minecraft/net/minecraft/item/Item.java -@@ -7,13 +7,19 @@ - import java.util.Random; +@@ -11,13 +11,18 @@ + import java.util.UUID; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -+import net.minecraft.client.entity.EntityClientPlayerMP; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; - import net.minecraft.entity.EntityLiving; + import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.entity.item.EntityPainting; @@ -20,20 +19,19 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionHelper; import net.minecraft.stats.StatList; -@@ -23,7 +29,10 @@ +@@ -26,7 +31,9 @@ + import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; - import net.minecraft.util.StringTranslate; import net.minecraft.util.Vec3; +import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.World; +import net.minecraftforge.common.ChestGenHooks; -+import net.minecraftforge.common.IArmorTextureProvider; public class Item { -@@ -238,13 +247,16 @@ - /** Icon index in the icons table. */ +@@ -248,13 +255,16 @@ protected Icon itemIcon; + protected String field_111218_cA; + /** FORGE: To disable repair recipes. */ + protected boolean canRepair = true; @@ -49,7 +47,15 @@ } itemsList[256 + par1] = this; -@@ -640,6 +652,10 @@ +@@ -600,6 +610,7 @@ + } + + @SideOnly(Side.CLIENT) ++ @Deprecated //Render pass sensitive version below. + public boolean hasEffect(ItemStack par1ItemStack) + { + return par1ItemStack.isItemEnchanted(); +@@ -639,6 +650,10 @@ float f7 = f4 * f5; float f8 = f3 * f5; double d3 = 5.0D; @@ -60,7 +66,7 @@ Vec3 vec31 = vec3.addVector((double)f7 * d3, (double)f6 * d3, (double)f8 * d3); return par1World.rayTraceBlocks_do_do(vec3, vec31, par3, !par3); } -@@ -720,4 +736,508 @@ +@@ -736,4 +751,514 @@ { StatList.initStats(); } @@ -362,11 +368,6 @@ + */ + public boolean isValidArmor(ItemStack stack, int armorType, Entity entity) + { -+ return isValidArmor(stack, armorType); -+ } -+ @Deprecated //Deprecated in 1.5.2, remove in 1.6, see EntityPlayer sensitive version above. -+ public boolean isValidArmor(ItemStack stack, int armorType) -+ { + if (this instanceof ItemArmor) + { + return ((ItemArmor)this).armorType == armorType; @@ -422,12 +423,11 @@ + * @param itemStack The itemstack + * @return the damage + */ -+ public int getDamageVsEntity(Entity par1Entity, ItemStack itemStack) ++ @Deprecated //Need to find a new place to hook this ++ public float getDamageVsEntity(Entity par1Entity, ItemStack itemStack) + { -+ return getDamageVsEntity(par1Entity); ++ return 0.0F; //getDamageVsEntity(par1Entity); + } -+ -+ @Deprecated private final boolean isArmorProvider = this instanceof IArmorTextureProvider; + /** + * Called by RenderBiped and RenderPlayer to determine the armor texture that + * should be use for the currently equiped item. @@ -443,9 +443,10 @@ + */ + public String getArmorTexture(ItemStack stack, Entity entity, int slot, int layer) + { -+ return isArmorProvider ? ((IArmorTextureProvider)this).getArmorTextureFile(stack) : null; ++ return null; + } + ++ + /** + * Returns the font renderer used to render tooltips and overlays for this item. + * Returning null will use the standard font renderer. @@ -469,7 +470,7 @@ + * @return A ModelBiped to render instead of the default + */ + @SideOnly(Side.CLIENT) -+ public ModelBiped getArmorModel(EntityLiving entityLiving, ItemStack itemStack, int armorSlot) ++ public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) + { + return null; + } @@ -481,7 +482,7 @@ + * @param stack The Item stack + * @return True to cancel any further processing by EntityLiving + */ -+ public boolean onEntitySwing(EntityLiving entityLiving, ItemStack stack) ++ public boolean onEntitySwing(EntityLivingBase entityLiving, ItemStack stack) + { + return false; + } @@ -507,7 +508,7 @@ + * @param stack The itemstack that is damaged + * @return the damage value + */ -+ public int getItemDamageFromStack(ItemStack stack) ++ public int getDamage(ItemStack stack) + { + return stack.itemDamage; + } @@ -517,20 +518,21 @@ + * @param stack the stack + * @return the damage value + */ -+ public int getItemDamageFromStackForDisplay(ItemStack stack) ++ public int getDisplayDamage(ItemStack stack) + { + return stack.itemDamage; + } + + /** -+ * Return the maxDamage for this ItemStack. Defaults to the maxDamage field in this item, but can be overridden here for other sources such as NBT. ++ * Return the maxDamage for this ItemStack. Defaults to the maxDamage field in this item, ++ * but can be overridden here for other sources such as NBT. + * + * @param stack The itemstack that is damaged + * @return the damage value + */ -+ public int getItemMaxDamageFromStack(ItemStack stack) ++ public int getMaxDamage(ItemStack stack) + { -+ return maxDamage; ++ return getMaxDamage(); + } + + /** @@ -538,7 +540,7 @@ + * @param stack the stack + * @return if the stack is damaged + */ -+ public boolean isItemStackDamaged(ItemStack stack) ++ public boolean isDamaged(ItemStack stack) + { + return stack.itemDamage > 0; + } @@ -548,7 +550,7 @@ + * @param stack the stack + * @param damage the new damage value + */ -+ public void setItemDamageForStack(ItemStack stack, int damage) ++ public void setDamage(ItemStack stack, int damage) + { + stack.itemDamage = damage; + @@ -567,5 +569,15 @@ + public boolean canHarvestBlock(Block par1Block, ItemStack itemStack) + { + return canHarvestBlock(par1Block); ++ } ++ ++ ++ /** ++ * Render Pass sensitive version of hasEffect() ++ */ ++ @SideOnly(Side.CLIENT) ++ public boolean hasEffect(ItemStack par1ItemStack, int pass) ++ { ++ return hasEffect(par1ItemStack) && (pass == 0 || itemID != Item.potion.itemID); + } } diff --git a/patches/minecraft/net/minecraft/item/ItemBucket.java.patch b/patches/minecraft/net/minecraft/item/ItemBucket.java.patch index 785d5cdada..c266b01f9a 100644 --- a/patches/minecraft/net/minecraft/item/ItemBucket.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemBucket.java.patch @@ -1,17 +1,17 @@ --- ../src_base/minecraft/net/minecraft/item/ItemBucket.java +++ ../src_work/minecraft/net/minecraft/item/ItemBucket.java @@ -8,6 +8,10 @@ - import net.minecraft.util.EnumMovingObjectType; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -+ + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.Event; +import net.minecraftforge.event.entity.player.FillBucketEvent; - ++ public class ItemBucket extends Item { -@@ -40,6 +44,32 @@ + /** field for checking if the bucket has been filled. */ +@@ -35,6 +39,32 @@ } else { diff --git a/patches/minecraft/net/minecraft/item/ItemDye.java.patch b/patches/minecraft/net/minecraft/item/ItemDye.java.patch index ba4fec69de..ec65db8416 100644 --- a/patches/minecraft/net/minecraft/item/ItemDye.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemDye.java.patch @@ -85,4 +85,4 @@ + } } - /** + public boolean func_111207_a(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, EntityLivingBase par3EntityLivingBase) diff --git a/patches/minecraft/net/minecraft/item/ItemFlintAndSteel.java.patch b/patches/minecraft/net/minecraft/item/ItemFlintAndSteel.java.patch new file mode 100644 index 0000000000..39a372d29f --- /dev/null +++ b/patches/minecraft/net/minecraft/item/ItemFlintAndSteel.java.patch @@ -0,0 +1,13 @@ +--- ../src_base/minecraft/net/minecraft/item/ItemFlintAndSteel.java ++++ ../src_work/minecraft/net/minecraft/item/ItemFlintAndSteel.java +@@ -57,9 +57,7 @@ + } + else + { +- int i1 = par3World.getBlockId(par4, par5, par6); +- +- if (i1 == 0) ++ if (par3World.isAirBlock(par4, par5, par6)) + { + par3World.playSoundEffect((double)par4 + 0.5D, (double)par5 + 0.5D, (double)par6 + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F); + par3World.setBlock(par4, par5, par6, Block.fire.blockID); diff --git a/patches/minecraft/net/minecraft/item/ItemHoe.java.patch b/patches/minecraft/net/minecraft/item/ItemHoe.java.patch index 9be305a652..b837ae6d7f 100644 --- a/patches/minecraft/net/minecraft/item/ItemHoe.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemHoe.java.patch @@ -10,7 +10,7 @@ public class ItemHoe extends Item { -@@ -32,6 +35,18 @@ +@@ -32,10 +35,22 @@ } else { @@ -27,5 +27,11 @@ + } + int i1 = par3World.getBlockId(par4, par5, par6); - int j1 = par3World.getBlockId(par4, par5 + 1, par6); +- int j1 = par3World.getBlockId(par4, par5 + 1, par6); ++ boolean air = par3World.isAirBlock(par4, par5 + 1, par6); +- if (par7 != 0 && j1 == 0 && (i1 == Block.grass.blockID || i1 == Block.dirt.blockID)) ++ if (par7 != 0 && air && (i1 == Block.grass.blockID || i1 == Block.dirt.blockID)) + { + Block block = Block.tilledField; + par3World.playSoundEffect((double)((float)par4 + 0.5F), (double)((float)par5 + 0.5F), (double)((float)par6 + 0.5F), block.stepSound.getStepSound(), (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F); diff --git a/patches/minecraft/net/minecraft/item/ItemInWorldManager.java.patch b/patches/minecraft/net/minecraft/item/ItemInWorldManager.java.patch index d888c18596..b17bb9490f 100644 --- a/patches/minecraft/net/minecraft/item/ItemInWorldManager.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemInWorldManager.java.patch @@ -82,7 +82,7 @@ if (block != null && flag) { -@@ -257,19 +293,30 @@ +@@ -261,19 +297,30 @@ } else { @@ -115,7 +115,7 @@ if (itemstack != null) { -@@ -281,6 +328,7 @@ +@@ -285,6 +332,7 @@ } } @@ -123,7 +123,7 @@ if (flag && flag1) { Block.blocksList[l].harvestBlock(this.theWorld, this.thisPlayerMP, par1, par2, par3, i1); -@@ -321,6 +369,7 @@ +@@ -325,6 +373,7 @@ if (itemstack1.stackSize == 0) { par1EntityPlayer.inventory.mainInventory[par1EntityPlayer.inventory.currentItem] = null; @@ -131,7 +131,7 @@ } if (!par1EntityPlayer.isUsingItem()) -@@ -338,35 +387,56 @@ +@@ -342,35 +391,56 @@ */ public boolean activateBlockOrUseItem(EntityPlayer par1EntityPlayer, World par2World, ItemStack par3ItemStack, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { @@ -215,7 +215,7 @@ } /** -@@ -376,4 +446,13 @@ +@@ -380,4 +450,13 @@ { this.theWorld = par1WorldServer; } diff --git a/patches/minecraft/net/minecraft/item/ItemShears.java.patch b/patches/minecraft/net/minecraft/item/ItemShears.java.patch index 0a3c8c82bb..b355b4c1ae 100644 --- a/patches/minecraft/net/minecraft/item/ItemShears.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemShears.java.patch @@ -10,28 +10,28 @@ import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; - import net.minecraft.entity.EntityLiving; ++import net.minecraft.entity.EntityLiving; + import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.stats.StatList; import net.minecraft.world.World; -+ +import net.minecraftforge.common.IShearable; public class ItemShears extends Item { @@ -17,13 +27,12 @@ - public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, int par3, int par4, int par5, int par6, EntityLiving par7EntityLiving) + public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, int par3, int par4, int par5, int par6, EntityLivingBase par7EntityLivingBase) { - if (par3 != Block.leaves.blockID && par3 != Block.web.blockID && par3 != Block.tallGrass.blockID && par3 != Block.vine.blockID && par3 != Block.tripWire.blockID) + if (par3 != Block.leaves.blockID && par3 != Block.web.blockID && par3 != Block.tallGrass.blockID && par3 != Block.vine.blockID && par3 != Block.tripWire.blockID && !(Block.blocksList[par3] instanceof IShearable)) { - return super.onBlockDestroyed(par1ItemStack, par2World, par3, par4, par5, par6, par7EntityLiving); + return super.onBlockDestroyed(par1ItemStack, par2World, par3, par4, par5, par6, par7EntityLivingBase); } else { -- par1ItemStack.damageItem(1, par7EntityLiving); +- par1ItemStack.damageItem(1, par7EntityLivingBase); return true; } } @@ -41,7 +41,7 @@ } + + @Override -+ public boolean itemInteractionForEntity(ItemStack itemstack, EntityLiving entity) ++ public boolean func_111207_a(ItemStack itemstack, EntityPlayer player, EntityLivingBase entity) + { + if (entity.worldObj.isRemote) + { diff --git a/patches/minecraft/net/minecraft/item/ItemStack.java.patch b/patches/minecraft/net/minecraft/item/ItemStack.java.patch index 5040d7cb6b..0a0f0f63f3 100644 --- a/patches/minecraft/net/minecraft/item/ItemStack.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemStack.java.patch @@ -1,65 +1,72 @@ --- ../src_base/minecraft/net/minecraft/item/ItemStack.java +++ ../src_work/minecraft/net/minecraft/item/ItemStack.java -@@ -249,7 +249,7 @@ +@@ -252,7 +252,9 @@ */ public boolean isItemDamaged() { - return this.isItemStackDamageable() && this.itemDamage > 0; -+ return this.isItemStackDamageable() && this.getItem().isItemStackDamaged(this); ++ boolean damaged = itemDamage > 0; ++ if (getItem() != null) damaged = getItem().isDamaged(this); ++ return this.isItemStackDamageable() && damaged; } /** -@@ -257,7 +257,7 @@ +@@ -260,6 +262,10 @@ */ public int getItemDamageForDisplay() { -- return this.itemDamage; -+ return this.getItem().getItemDamageFromStackForDisplay(this); ++ if (getItem() != null) ++ { ++ return getItem().getDisplayDamage(this); ++ } + return this.itemDamage; } - /** -@@ -265,7 +265,7 @@ +@@ -268,6 +274,10 @@ */ public int getItemDamage() { -- return this.itemDamage; -+ return this.getItem().getItemDamageFromStack(this); ++ if (getItem() != null) ++ { ++ return getItem().getDamage(this); ++ } + return this.itemDamage; } - /** -@@ -273,12 +273,7 @@ +@@ -276,6 +286,12 @@ */ public void setItemDamage(int par1) { -- this.itemDamage = par1; -- -- if (this.itemDamage < 0) -- { -- this.itemDamage = 0; -- } -+ this.getItem().setItemDamageForStack(this, par1); - } ++ if (getItem() != null) ++ { ++ getItem().setDamage(this, par1); ++ return; ++ } ++ + this.itemDamage = par1; - /** -@@ -286,7 +281,7 @@ + if (this.itemDamage < 0) +@@ -289,7 +305,7 @@ */ public int getMaxDamage() { - return Item.itemsList[this.itemID].getMaxDamage(); -+ return this.getItem().getItemMaxDamageFromStack(this); ++ return this.getItem().getMaxDamage(this); } /** -@@ -388,7 +383,7 @@ - */ - public int getDamageVsEntity(Entity par1Entity) - { -- return Item.itemsList[this.itemID].getDamageVsEntity(par1Entity); -+ return Item.itemsList[this.itemID].getDamageVsEntity(par1Entity, this); +@@ -327,8 +343,8 @@ + } + } + +- this.itemDamage += par1; +- return this.itemDamage > this.getMaxDamage(); ++ setItemDamage(getItemDamage() + par1); //Redirect through Item's callback if applicable. ++ return getItemDamage() > getMaxDamage(); + } } - /** -@@ -396,7 +391,7 @@ +@@ -396,7 +412,7 @@ */ public boolean canHarvestBlock(Block par1Block) { @@ -67,4 +74,22 @@ + return Item.itemsList[this.itemID].canHarvestBlock(par1Block, this); } - public boolean interactWith(EntityLiving par1EntityLiving) + public boolean func_111282_a(EntityPlayer par1EntityPlayer, EntityLivingBase par2EntityLivingBase) +@@ -737,10 +753,16 @@ + return arraylist; + } + ++ @Deprecated + @SideOnly(Side.CLIENT) + public boolean hasEffect() + { +- return this.getItem().hasEffect(this); ++ return hasEffect(0); ++ } ++ @SideOnly(Side.CLIENT) ++ public boolean hasEffect(int pass) ++ { ++ return this.getItem().hasEffect(this, pass); + } + + @SideOnly(Side.CLIENT) diff --git a/patches/minecraft/net/minecraft/item/ItemTool.java.patch b/patches/minecraft/net/minecraft/item/ItemTool.java.patch index 2d80fea426..a833ff6acd 100644 --- a/patches/minecraft/net/minecraft/item/ItemTool.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemTool.java.patch @@ -1,16 +1,16 @@ --- ../src_base/minecraft/net/minecraft/item/ItemTool.java +++ ../src_work/minecraft/net/minecraft/item/ItemTool.java -@@ -7,6 +7,7 @@ - import net.minecraft.entity.Entity; - import net.minecraft.entity.EntityLiving; +@@ -9,6 +9,7 @@ + import net.minecraft.entity.SharedMonsterAttributes; + import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; public class ItemTool extends Item { -@@ -110,4 +111,15 @@ - { - return this.toolMaterial.getToolCraftingMaterial() == par2ItemStack.itemID ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); +@@ -111,4 +112,15 @@ + multimap.put(SharedMonsterAttributes.field_111264_e.func_111108_a(), new AttributeModifier(field_111210_e, "Tool modifier", (double)this.damageVsEntity, 0)); + return multimap; } + + /** FORGE: Overridden to allow custom tool effectiveness */ diff --git a/patches/minecraft/net/minecraft/item/crafting/CraftingManager.java.patch b/patches/minecraft/net/minecraft/item/crafting/CraftingManager.java.patch index 9f78a316fe..1b10fb1475 100644 --- a/patches/minecraft/net/minecraft/item/crafting/CraftingManager.java.patch +++ b/patches/minecraft/net/minecraft/item/crafting/CraftingManager.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/item/crafting/CraftingManager.java +++ ../src_work/minecraft/net/minecraft/item/crafting/CraftingManager.java -@@ -282,7 +282,7 @@ +@@ -284,7 +284,7 @@ } } diff --git a/patches/minecraft/net/minecraft/item/crafting/FurnaceRecipes.java.patch b/patches/minecraft/net/minecraft/item/crafting/FurnaceRecipes.java.patch index f2ce70b235..fd593450e0 100644 --- a/patches/minecraft/net/minecraft/item/crafting/FurnaceRecipes.java.patch +++ b/patches/minecraft/net/minecraft/item/crafting/FurnaceRecipes.java.patch @@ -18,7 +18,7 @@ /** * Used to call methods addSmelting and getSmeltingResult. -@@ -56,7 +60,9 @@ +@@ -57,7 +61,9 @@ /** * Returns the smelting result of an item. @@ -28,7 +28,7 @@ public ItemStack getSmeltingResult(int par1) { return (ItemStack)this.smeltingList.get(Integer.valueOf(par1)); -@@ -67,8 +73,63 @@ +@@ -68,8 +74,63 @@ return this.smeltingList; } diff --git a/patches/minecraft/net/minecraft/nbt/NBTTagList.java.patch b/patches/minecraft/net/minecraft/nbt/NBTTagList.java.patch index a744f0b163..298a132db9 100644 --- a/patches/minecraft/net/minecraft/nbt/NBTTagList.java.patch +++ b/patches/minecraft/net/minecraft/nbt/NBTTagList.java.patch @@ -8,7 +8,7 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -@@ -92,8 +90,6 @@ +@@ -99,8 +97,6 @@ this.tagList.add(par1NBTBase); } diff --git a/patches/minecraft/net/minecraft/network/NetServerHandler.java.patch b/patches/minecraft/net/minecraft/network/NetServerHandler.java.patch index 656c74ae27..f84ab15142 100644 --- a/patches/minecraft/net/minecraft/network/NetServerHandler.java.patch +++ b/patches/minecraft/net/minecraft/network/NetServerHandler.java.patch @@ -1,9 +1,10 @@ --- ../src_base/minecraft/net/minecraft/network/NetServerHandler.java +++ ../src_work/minecraft/net/minecraft/network/NetServerHandler.java -@@ -65,6 +65,13 @@ - import net.minecraft.util.ReportedException; +@@ -69,6 +69,14 @@ import net.minecraft.world.WorldServer; + import org.apache.commons.lang3.StringUtils; ++import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.Event; +import net.minecraftforge.event.ForgeEventFactory; @@ -14,7 +15,7 @@ public class NetServerHandler extends NetHandler { /** The underlying network manager for this server handler. */ -@@ -233,6 +240,11 @@ +@@ -242,6 +250,11 @@ if (this.playerEntity.ridingEntity != null) { this.playerEntity.ridingEntity.updateRiderPosition(); @@ -26,7 +27,7 @@ } this.mcServer.getConfigurationManager().serverUpdateMountedMovingPlayer(this.playerEntity); -@@ -305,9 +317,9 @@ +@@ -319,9 +332,9 @@ d4 = d1 - this.playerEntity.posX; double d6 = d2 - this.playerEntity.posY; double d7 = d3 - this.playerEntity.posZ; @@ -38,8 +39,8 @@ + double d10 = Math.max(Math.abs(d7), Math.abs(this.playerEntity.motionZ)); double d11 = d8 * d8 + d9 * d9 + d10 * d10; - if (d11 > 100.0D && (!this.mcServer.isSinglePlayer() || !this.mcServer.getServerOwner().equals(this.playerEntity.username))) -@@ -323,6 +335,11 @@ + if (d11 > 100.0D && (!this.mcServer.isSinglePlayer() || !this.mcServer.getServerOwner().equals(this.playerEntity.getCommandSenderName()))) +@@ -337,6 +350,11 @@ if (this.playerEntity.onGround && !par1Packet10Flying.onGround && d6 > 0.0D) { this.playerEntity.addExhaustion(0.2F); @@ -51,8 +52,8 @@ } this.playerEntity.moveEntity(d4, d6, d7); -@@ -347,10 +364,15 @@ - this.mcServer.getLogAgent().logWarning(this.playerEntity.username + " moved wrongly!"); +@@ -361,10 +379,15 @@ + this.mcServer.getLogAgent().logWarning(this.playerEntity.getCommandSenderName() + " moved wrongly!"); } + if (!this.hasMoved) //Fixes "Moved Too Fast" kick when being teleported while moving @@ -68,7 +69,7 @@ { this.setPlayerLocation(this.lastPosX, this.lastPosY, this.lastPosZ, f2, f3); return; -@@ -358,7 +380,7 @@ +@@ -372,7 +395,7 @@ AxisAlignedBB axisalignedbb = this.playerEntity.boundingBox.copy().expand((double)f4, (double)f4, (double)f4).addCoord(0.0D, -0.55D, 0.0D); @@ -77,7 +78,7 @@ { if (d12 >= -0.03125D) { -@@ -377,6 +399,11 @@ +@@ -391,6 +414,11 @@ this.ticksForFloatKick = 0; } @@ -89,7 +90,7 @@ this.playerEntity.onGround = par1Packet10Flying.onGround; this.mcServer.getConfigurationManager().serverUpdateMountedMovingPlayer(this.playerEntity); this.playerEntity.updateFlyingState(this.playerEntity.posY - d0, par1Packet10Flying.onGround); -@@ -443,7 +470,10 @@ +@@ -461,7 +489,10 @@ double d2 = this.playerEntity.posZ - ((double)k + 0.5D); double d3 = d0 * d0 + d1 * d1 + d2 * d2; @@ -101,7 +102,7 @@ { return; } -@@ -503,7 +533,11 @@ +@@ -521,7 +552,11 @@ return; } @@ -114,7 +115,7 @@ } else if (par1Packet15Place.getYPosition() >= this.mcServer.getBuildLimit() - 1 && (par1Packet15Place.getDirection() == 1 || par1Packet15Place.getYPosition() >= this.mcServer.getBuildLimit())) { -@@ -512,7 +546,9 @@ +@@ -530,7 +565,9 @@ } else { @@ -125,22 +126,16 @@ { this.playerEntity.theItemInWorldManager.activateBlockOrUseItem(this.playerEntity, worldserver, itemstack, i, j, k, l, par1Packet15Place.getXOffset(), par1Packet15Place.getYOffset(), par1Packet15Place.getZOffset()); } -@@ -691,7 +727,14 @@ - return; +@@ -710,6 +747,8 @@ } -+ String old = s; - s = "<" + this.playerEntity.getTranslatedEntityName() + "> " + s; -+ ServerChatEvent event = new ServerChatEvent(this.playerEntity, old, s); -+ if (MinecraftForge.EVENT_BUS.post(event)) -+ { -+ return; -+ } -+ s = event.line; - this.mcServer.getLogAgent().logInfo(s); - this.mcServer.getConfigurationManager().sendPacketToAllPlayers(new Packet3Chat(s, false)); + ChatMessageComponent chatmessagecomponent = ChatMessageComponent.func_111082_b("chat.type.text", new Object[] {this.playerEntity.getTranslatedEntityName(), s}); ++ chatmessagecomponent = ForgeHooks.onServerChatEvent(this, s, chatmessagecomponent); ++ if (chatmessagecomponent == null) return; + this.mcServer.getConfigurationManager().func_110459_a(chatmessagecomponent, false); } -@@ -822,7 +865,7 @@ + +@@ -850,7 +889,7 @@ return; } @@ -149,12 +144,3 @@ } } } -@@ -1220,7 +1263,7 @@ - } - } - } -- -+ - - @Override - diff --git a/patches/minecraft/net/minecraft/network/packet/Packet51MapChunk.java.patch b/patches/minecraft/net/minecraft/network/packet/Packet51MapChunk.java.patch index e8d50c754a..3c6c38fb57 100644 --- a/patches/minecraft/net/minecraft/network/packet/Packet51MapChunk.java.patch +++ b/patches/minecraft/net/minecraft/network/packet/Packet51MapChunk.java.patch @@ -1,8 +1,8 @@ --- ../src_base/minecraft/net/minecraft/network/packet/Packet51MapChunk.java +++ ../src_work/minecraft/net/minecraft/network/packet/Packet51MapChunk.java @@ -5,6 +5,7 @@ - import java.io.DataInputStream; - import java.io.DataOutputStream; + import java.io.DataInput; + import java.io.DataOutput; import java.io.IOException; +import java.util.concurrent.Semaphore; import java.util.zip.DataFormatException; @@ -47,7 +47,7 @@ finally { @@ -97,13 +105,16 @@ - par1DataInputStream.readFully(temp, 0, this.tempLength); + par1DataInput.readFully(temp, 0, this.tempLength); int i = 0; int j; + int msb = 0; //BugFix: MC does not read the MSB array from the packet properly, causing issues for servers that use blocks > 256 @@ -65,7 +65,7 @@ { @@ -133,6 +144,16 @@ */ - public void writePacketData(DataOutputStream par1DataOutputStream) throws IOException + public void writePacketData(DataOutput par1DataOutput) throws IOException { + if (chunkData == null) + { @@ -77,6 +77,6 @@ + deflateGate.release(); + } + - par1DataOutputStream.writeInt(this.xCh); - par1DataOutputStream.writeInt(this.zCh); - par1DataOutputStream.writeBoolean(this.includeInitialize); + par1DataOutput.writeInt(this.xCh); + par1DataOutput.writeInt(this.zCh); + par1DataOutput.writeBoolean(this.includeInitialize); diff --git a/patches/minecraft/net/minecraft/network/packet/Packet52MultiBlockChange.java.patch b/patches/minecraft/net/minecraft/network/packet/Packet52MultiBlockChange.java.patch index 8292282743..12dca7774d 100644 --- a/patches/minecraft/net/minecraft/network/packet/Packet52MultiBlockChange.java.patch +++ b/patches/minecraft/net/minecraft/network/packet/Packet52MultiBlockChange.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/network/packet/Packet52MultiBlockChange.java +++ ../src_work/minecraft/net/minecraft/network/packet/Packet52MultiBlockChange.java -@@ -6,6 +6,8 @@ +@@ -7,6 +7,8 @@ import java.io.IOException; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; @@ -9,7 +9,7 @@ public class Packet52MultiBlockChange extends Packet { -@@ -38,10 +40,8 @@ +@@ -39,10 +41,8 @@ try { diff --git a/patches/minecraft/net/minecraft/network/packet/Packet56MapChunks.java.patch b/patches/minecraft/net/minecraft/network/packet/Packet56MapChunks.java.patch index f89f2651bf..1ef0a9d8bb 100644 --- a/patches/minecraft/net/minecraft/network/packet/Packet56MapChunks.java.patch +++ b/patches/minecraft/net/minecraft/network/packet/Packet56MapChunks.java.patch @@ -1,7 +1,7 @@ --- ../src_base/minecraft/net/minecraft/network/packet/Packet56MapChunks.java +++ ../src_work/minecraft/net/minecraft/network/packet/Packet56MapChunks.java @@ -6,6 +6,7 @@ - import java.io.DataOutputStream; + import java.io.DataOutput; import java.io.IOException; import java.util.List; +import java.util.concurrent.Semaphore; @@ -67,9 +67,9 @@ } finally { -@@ -155,6 +164,16 @@ +@@ -155,6 +164,15 @@ */ - public void writePacketData(DataOutputStream par1DataOutputStream) throws IOException + public void writePacketData(DataOutput par1DataOutput) throws IOException { + if (this.chunkDataBuffer == null) + { @@ -80,7 +80,6 @@ + } + deflateGate.release(); + } -+ - par1DataOutputStream.writeShort(this.chunkPostX.length); - par1DataOutputStream.writeInt(this.dataLength); - par1DataOutputStream.writeBoolean(this.skyLightSent); + par1DataOutput.writeShort(this.chunkPostX.length); + par1DataOutput.writeInt(this.dataLength); + par1DataOutput.writeBoolean(this.skyLightSent); diff --git a/patches/minecraft/net/minecraft/potion/PotionEffect.java.patch b/patches/minecraft/net/minecraft/potion/PotionEffect.java.patch index 5504c8ee4c..0a52e4c3f5 100644 --- a/patches/minecraft/net/minecraft/potion/PotionEffect.java.patch +++ b/patches/minecraft/net/minecraft/potion/PotionEffect.java.patch @@ -8,7 +8,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.entity.EntityLiving; + import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -104,4 +104,4 @@ + } } - public boolean isSplashPotionEffect() + /** diff --git a/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch b/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch index 51ef417c71..4b7218d2c2 100644 --- a/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch +++ b/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/server/MinecraftServer.java +++ ../src_work/minecraft/net/minecraft/server/MinecraftServer.java -@@ -12,6 +12,7 @@ +@@ -11,6 +11,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -8,7 +8,7 @@ import java.util.Iterator; import java.util.List; import java.util.logging.Level; -@@ -56,6 +57,10 @@ +@@ -54,6 +55,10 @@ import net.minecraft.world.storage.ISaveHandler; import net.minecraft.world.storage.WorldInfo; @@ -19,8 +19,17 @@ public abstract class MinecraftServer implements ICommandSender, Runnable, IPlayerUsage { /** Instance of Minecraft Server. */ -@@ -133,7 +138,8 @@ - public final long[] tickTimeArray = new long[100]; +@@ -78,7 +83,7 @@ + private int serverPort = -1; + + /** The server world instances. */ +- public WorldServer[] worldServers; ++ public WorldServer[] worldServers = new WorldServer[0]; + + /** The ServerConfigurationManager instance. */ + private ServerConfigurationManager serverConfigManager; +@@ -132,7 +137,8 @@ + public final long[] tickTimeArray; /** Stats are [dimension][tick%100] system.nanoTime is stored. */ - public long[][] timeOfLastDimensionTick; @@ -29,7 +38,7 @@ private KeyPair serverKeyPair; /** Username of the server owner (for integrated servers) */ -@@ -210,8 +216,6 @@ +@@ -216,8 +222,6 @@ { this.convertMapIfNeeded(par1Str); this.setUserMessage("menu.loadingLevel"); @@ -38,7 +47,7 @@ ISaveHandler isavehandler = this.anvilConverterForAnvilFile.getSaveLoader(par1Str, true); WorldInfo worldinfo = isavehandler.loadWorldInfo(); WorldSettings worldsettings; -@@ -231,46 +235,23 @@ +@@ -237,46 +241,23 @@ worldsettings.enableBonusChest(); } @@ -96,7 +105,15 @@ this.setDifficultyForAllWorlds(this.getDifficulty()); this.initialWorldChunkLoad(); } -@@ -399,7 +380,14 @@ +@@ -358,6 +339,7 @@ + if (!this.worldIsBeingDeleted) + { + WorldServer[] aworldserver = this.worldServers; ++ if (aworldserver == null) return; //ForgE: Just in case, NPE protection as it has been encountered. + int i = aworldserver.length; + + for (int j = 0; j < i; ++j) +@@ -411,7 +393,14 @@ for (int i = 0; i < this.worldServers.length; ++i) { WorldServer worldserver = this.worldServers[i]; @@ -111,7 +128,7 @@ } if (this.usageSnooper != null && this.usageSnooper.isSnooperRunning()) -@@ -623,13 +611,15 @@ +@@ -636,13 +625,15 @@ this.theProfiler.startSection("levels"); int i; @@ -132,7 +149,7 @@ this.theProfiler.startSection(worldserver.getWorldInfo().getWorldName()); this.theProfiler.startSection("pools"); worldserver.getWorldVec3Pool().clear(); -@@ -676,9 +666,11 @@ +@@ -689,9 +680,11 @@ this.theProfiler.endSection(); } @@ -147,7 +164,7 @@ this.theProfiler.endStartSection("connection"); this.getNetworkThread().networkTick(); this.theProfiler.endStartSection("players"); -@@ -732,7 +724,13 @@ +@@ -745,7 +738,13 @@ */ public WorldServer worldServerForDimension(int par1) { @@ -162,7 +179,7 @@ } @SideOnly(Side.SERVER) -@@ -1103,6 +1101,7 @@ +@@ -1108,6 +1107,7 @@ if (worldserver != null) { diff --git a/patches/minecraft/net/minecraft/server/gui/GuiStatsComponent.java.patch b/patches/minecraft/net/minecraft/server/gui/GuiStatsComponent.java.patch deleted file mode 100644 index 8ec5539a9b..0000000000 --- a/patches/minecraft/net/minecraft/server/gui/GuiStatsComponent.java.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- ../src_base/minecraft/net/minecraft/server/gui/GuiStatsComponent.java -+++ ../src_work/minecraft/net/minecraft/server/gui/GuiStatsComponent.java -@@ -10,6 +10,8 @@ - import javax.swing.Timer; - import net.minecraft.network.TcpConnection; - import net.minecraft.server.MinecraftServer; -+import net.minecraft.world.WorldServer; -+import net.minecraftforge.common.DimensionManager; - - @SideOnly(Side.SERVER) - public class GuiStatsComponent extends JComponent -@@ -43,6 +45,7 @@ - */ - private void updateStats() - { -+ this.displayStrings = new String[5 + DimensionManager.getIDs().length]; - long i = Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory(); - System.gc(); - this.displayStrings[0] = "Memory use: " + i / 1024L / 1024L + " mb (" + Runtime.getRuntime().freeMemory() * 100L / Runtime.getRuntime().maxMemory() + "% free)"; -@@ -53,15 +56,18 @@ - - if (this.field_79017_e.worldServers != null) - { -- for (int j = 0; j < this.field_79017_e.worldServers.length; ++j) -+ int j = 0; -+ for (Integer id : DimensionManager.getIDs()) - { -- this.displayStrings[5 + j] = "Lvl " + j + " tick: " + field_79020_a.format(this.calcArrayAverage(this.field_79017_e.timeOfLastDimensionTick[j]) * 1.0E-6D) + " ms"; -+ this.displayStrings[5 + j] = "Lvl " + id + " tick: " + field_79020_a.format(this.calcArrayAverage(this.field_79017_e.worldTickTimes.get(id)) * 1.0E-6D) + " ms"; - -- if (this.field_79017_e.worldServers[j] != null && this.field_79017_e.worldServers[j].theChunkProviderServer != null) -+ WorldServer world = DimensionManager.getWorld(id); -+ if (world != null && world.theChunkProviderServer != null) - { -- this.displayStrings[5 + j] = this.displayStrings[5 + j] + ", " + this.field_79017_e.worldServers[j].theChunkProviderServer.makeString(); -- this.displayStrings[5 + j] = this.displayStrings[5 + j] + ", Vec3: " + this.field_79017_e.worldServers[j].getWorldVec3Pool().func_82590_d() + " / " + this.field_79017_e.worldServers[j].getWorldVec3Pool().getPoolSize(); -+ this.displayStrings[5 + j] = this.displayStrings[5 + j] + ", " + world.theChunkProviderServer.makeString(); -+ this.displayStrings[5 + j] = this.displayStrings[5 + j] + ", Vec3: " + world.getWorldVec3Pool().func_82590_d() + " / " + world.getWorldVec3Pool().getPoolSize(); - } -+ j++; - } - } - diff --git a/patches/minecraft/net/minecraft/server/gui/StatsComponent.java.patch b/patches/minecraft/net/minecraft/server/gui/StatsComponent.java.patch new file mode 100644 index 0000000000..05baecfa2d --- /dev/null +++ b/patches/minecraft/net/minecraft/server/gui/StatsComponent.java.patch @@ -0,0 +1,43 @@ +--- ../src_base/minecraft/net/minecraft/server/gui/StatsComponent.java ++++ ../src_work/minecraft/net/minecraft/server/gui/StatsComponent.java +@@ -10,6 +10,8 @@ + import javax.swing.Timer; + import net.minecraft.network.TcpConnection; + import net.minecraft.server.MinecraftServer; ++import net.minecraft.world.WorldServer; ++import net.minecraftforge.common.DimensionManager; + + @SideOnly(Side.SERVER) + public class StatsComponent extends JComponent +@@ -32,6 +34,7 @@ + + private void func_120034_a() + { ++ this.field_120036_d = new String[5 + DimensionManager.getIDs().length]; + long i = Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory(); + System.gc(); + this.field_120036_d[0] = "Memory use: " + i / 1024L / 1024L + " mb (" + Runtime.getRuntime().freeMemory() * 100L / Runtime.getRuntime().maxMemory() + "% free)"; +@@ -42,15 +45,18 @@ + + if (this.field_120037_e.worldServers != null) + { +- for (int j = 0; j < this.field_120037_e.worldServers.length; ++j) ++ int j = 0; ++ for (Integer id : DimensionManager.getIDs()) + { +- this.field_120036_d[5 + j] = "Lvl " + j + " tick: " + field_120040_a.format(this.func_120035_a(this.field_120037_e.timeOfLastDimensionTick[j]) * 1.0E-6D) + " ms"; ++ this.field_120036_d[5 + j] = "Lvl " + id + " tick: " + field_120040_a.format(this.func_120035_a(this.field_120037_e.worldTickTimes.get(id)) * 1.0E-6D) + " ms"; + +- if (this.field_120037_e.worldServers[j] != null && this.field_120037_e.worldServers[j].theChunkProviderServer != null) ++ WorldServer world = DimensionManager.getWorld(id); ++ if (world != null && world.theChunkProviderServer != null) + { +- this.field_120036_d[5 + j] = this.field_120036_d[5 + j] + ", " + this.field_120037_e.worldServers[j].theChunkProviderServer.makeString(); +- this.field_120036_d[5 + j] = this.field_120036_d[5 + j] + ", Vec3: " + this.field_120037_e.worldServers[j].getWorldVec3Pool().func_82590_d() + " / " + this.field_120037_e.worldServers[j].getWorldVec3Pool().getPoolSize(); ++ this.field_120036_d[5 + j] = this.field_120036_d[5 + j] + ", " + world.theChunkProviderServer.makeString(); ++ this.field_120036_d[5 + j] = this.field_120036_d[5 + j] + ", Vec3: " + world.getWorldVec3Pool().func_82590_d() + " / " + world.getWorldVec3Pool().getPoolSize(); + } ++ j++; + } + } + diff --git a/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch b/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch index 51c02e4b5b..db0fe6d6c0 100644 --- a/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch +++ b/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch @@ -11,7 +11,7 @@ @SideOnly(Side.CLIENT) public class IntegratedServer extends MinecraftServer { -@@ -63,44 +67,23 @@ +@@ -65,44 +69,23 @@ protected void loadAllWorlds(String par1Str, String par2Str, long par3, WorldType par5WorldType, String par6Str) { this.convertMapIfNeeded(par1Str); diff --git a/patches/minecraft/net/minecraft/server/management/PlayerInstance.java.patch b/patches/minecraft/net/minecraft/server/management/PlayerInstance.java.patch index eb3679c79f..3b10eecf9b 100644 --- a/patches/minecraft/net/minecraft/server/management/PlayerInstance.java.patch +++ b/patches/minecraft/net/minecraft/server/management/PlayerInstance.java.patch @@ -8,17 +8,17 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.packet.Packet; -@@ -9,6 +10,9 @@ - import net.minecraft.network.packet.Packet53BlockChange; +@@ -10,6 +11,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.ChunkCoordIntPair; + import net.minecraft.world.chunk.Chunk; +import net.minecraftforge.common.ForgeDummyContainer; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.world.ChunkWatchEvent; public class PlayerInstance { -@@ -56,6 +60,8 @@ +@@ -63,6 +67,8 @@ this.playersInChunk.remove(par1EntityPlayerMP); par1EntityPlayerMP.loadedChunks.remove(this.chunkLocation); @@ -27,7 +27,7 @@ if (this.playersInChunk.isEmpty()) { long i = (long)this.chunkLocation.chunkXPos + 2147483647L | (long)this.chunkLocation.chunkZPos + 2147483647L << 32; -@@ -80,7 +86,7 @@ +@@ -100,7 +106,7 @@ this.field_73260_f |= 1 << (par2 >> 4); @@ -36,7 +36,7 @@ { short short1 = (short)(par1 << 12 | par3 << 8 | par2); -@@ -92,6 +98,10 @@ +@@ -112,6 +118,10 @@ } } @@ -47,7 +47,7 @@ this.locationOfBlockChange[this.numberOfTilesToUpdate++] = short1; } } -@@ -133,12 +143,13 @@ +@@ -153,12 +163,13 @@ { int l; @@ -62,7 +62,7 @@ for (k = 0; k < 16; ++k) { if ((this.field_73260_f & 1 << k) != 0) -@@ -152,11 +163,14 @@ +@@ -172,11 +183,14 @@ } } } diff --git a/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch b/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch index b7657c7afb..2fe38a1dc5 100644 --- a/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch +++ b/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/server/management/ServerConfigurationManager.java +++ ../src_work/minecraft/net/minecraft/server/management/ServerConfigurationManager.java -@@ -47,10 +47,14 @@ +@@ -48,10 +48,14 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MathHelper; import net.minecraft.world.EnumGameType; @@ -15,7 +15,7 @@ public abstract class ServerConfigurationManager { -@@ -386,6 +390,16 @@ +@@ -387,6 +391,16 @@ */ public EntityPlayerMP respawnPlayer(EntityPlayerMP par1EntityPlayerMP, int par2, boolean par3) { @@ -32,15 +32,15 @@ par1EntityPlayerMP.getServerForPlayer().getEntityTracker().removePlayerFromTrackers(par1EntityPlayerMP); par1EntityPlayerMP.getServerForPlayer().getEntityTracker().removeEntityFromAllTrackingPlayers(par1EntityPlayerMP); par1EntityPlayerMP.getServerForPlayer().getPlayerManager().removePlayer(par1EntityPlayerMP); -@@ -408,6 +422,7 @@ - EntityPlayerMP entityplayermp1 = new EntityPlayerMP(this.mcServer, this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension), par1EntityPlayerMP.username, (ItemInWorldManager)object); +@@ -409,6 +423,7 @@ + EntityPlayerMP entityplayermp1 = new EntityPlayerMP(this.mcServer, this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension), par1EntityPlayerMP.getCommandSenderName(), (ItemInWorldManager)object); entityplayermp1.playerNetServerHandler = par1EntityPlayerMP.playerNetServerHandler; entityplayermp1.clonePlayer(par1EntityPlayerMP, par3); + entityplayermp1.dimension = par2; entityplayermp1.entityId = par1EntityPlayerMP.entityId; WorldServer worldserver = this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension); this.func_72381_a(entityplayermp1, par1EntityPlayerMP, worldserver); -@@ -452,6 +467,11 @@ +@@ -453,6 +468,11 @@ public void transferPlayerToDimension(EntityPlayerMP par1EntityPlayerMP, int par2) { @@ -52,7 +52,7 @@ int j = par1EntityPlayerMP.dimension; WorldServer worldserver = this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension); par1EntityPlayerMP.dimension = par2; -@@ -459,7 +479,7 @@ +@@ -460,7 +480,7 @@ par1EntityPlayerMP.playerNetServerHandler.sendPacketToPlayer(new Packet9Respawn(par1EntityPlayerMP.dimension, (byte)par1EntityPlayerMP.worldObj.difficultySetting, worldserver1.getWorldInfo().getTerrainType(), worldserver1.getHeight(), par1EntityPlayerMP.theItemInWorldManager.getGameType())); worldserver.removePlayerEntityDangerously(par1EntityPlayerMP); par1EntityPlayerMP.isDead = false; @@ -61,7 +61,7 @@ this.func_72375_a(par1EntityPlayerMP, worldserver); par1EntityPlayerMP.playerNetServerHandler.setPlayerLocation(par1EntityPlayerMP.posX, par1EntityPlayerMP.posY, par1EntityPlayerMP.posZ, par1EntityPlayerMP.rotationYaw, par1EntityPlayerMP.rotationPitch); par1EntityPlayerMP.theItemInWorldManager.setWorld(worldserver1); -@@ -481,38 +501,23 @@ +@@ -482,38 +502,23 @@ */ public void transferEntityToWorld(Entity par1Entity, int par2, WorldServer par3WorldServer, WorldServer par4WorldServer) { @@ -111,7 +111,7 @@ { ChunkCoordinates chunkcoordinates; -@@ -549,7 +554,7 @@ +@@ -550,7 +555,7 @@ par4WorldServer.spawnEntityInWorld(par1Entity); par1Entity.setLocationAndAngles(d0, par1Entity.posY, d1, par1Entity.rotationYaw, par1Entity.rotationPitch); par4WorldServer.updateEntityWithOptionalForce(par1Entity, false); diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch b/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch index 24545aa785..e30701e535 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch @@ -75,7 +75,7 @@ { Block block = Block.blocksList[i]; -@@ -451,4 +457,50 @@ +@@ -456,4 +462,50 @@ { return par3 != 0 || par1 != 1 || par2ItemStack.itemID == Item.bucketEmpty.itemID; } diff --git a/patches/minecraft/net/minecraft/util/ThreadDownloadResources.java.patch b/patches/minecraft/net/minecraft/util/ThreadDownloadResources.java.patch deleted file mode 100644 index cf4942a114..0000000000 --- a/patches/minecraft/net/minecraft/util/ThreadDownloadResources.java.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- ../src_base/minecraft/net/minecraft/util/ThreadDownloadResources.java -+++ ../src_work/minecraft/net/minecraft/util/ThreadDownloadResources.java -@@ -8,6 +8,8 @@ - import java.io.FileOutputStream; - import java.io.IOException; - import java.net.URL; -+import java.net.URLConnection; -+ - import javax.xml.parsers.DocumentBuilder; - import javax.xml.parsers.DocumentBuilderFactory; - import net.minecraft.client.Minecraft; -@@ -48,7 +50,11 @@ - URL url = new URL("http://s3.amazonaws.com/MinecraftResources/"); - DocumentBuilderFactory documentbuilderfactory = DocumentBuilderFactory.newInstance(); - DocumentBuilder documentbuilder = documentbuilderfactory.newDocumentBuilder(); -- Document document = documentbuilder.parse(url.openStream()); -+ //Add a timeout of 60 seconds to getting the list, MC stalls without sound for some users. -+ URLConnection con = url.openConnection(); -+ con.setConnectTimeout(60000); -+ con.setReadTimeout(60000); -+ Document document = documentbuilder.parse(con.getInputStream()); - NodeList nodelist = document.getElementsByTagName("Contents"); - - for (int i = 0; i < 2; ++i) -@@ -168,7 +174,11 @@ - private void downloadResource(URL par1URL, File par2File, long par3) throws IOException - { - byte[] abyte = new byte[4096]; -- DataInputStream datainputstream = new DataInputStream(par1URL.openStream()); -+ //Add a timeout of 60 seconds to getting the list, MC stalls without sound for some users. -+ URLConnection con = par1URL.openConnection(); -+ con.setConnectTimeout(60000); -+ con.setReadTimeout(60000); -+ DataInputStream datainputstream = new DataInputStream(con.getInputStream()); - DataOutputStream dataoutputstream = new DataOutputStream(new FileOutputStream(par2File)); - boolean flag = false; - diff --git a/patches/minecraft/net/minecraft/util/WeightedRandomChestContent.java.patch b/patches/minecraft/net/minecraft/util/WeightedRandomChestContent.java.patch index 333e3cc711..a05146aa83 100644 --- a/patches/minecraft/net/minecraft/util/WeightedRandomChestContent.java.patch +++ b/patches/minecraft/net/minecraft/util/WeightedRandomChestContent.java.patch @@ -10,13 +10,14 @@ public class WeightedRandomChestContent extends WeightedRandomItem { -@@ -42,20 +45,11 @@ +@@ -40,22 +43,11 @@ + for (int j = 0; j < par3; ++j) + { WeightedRandomChestContent weightedrandomchestcontent = (WeightedRandomChestContent)WeightedRandom.getRandomItem(par0Random, par1ArrayOfWeightedRandomChestContent); - int k = weightedrandomchestcontent.theMinimumChanceToGenerateItem + par0Random.nextInt(weightedrandomchestcontent.theMaximumChanceToGenerateItem - weightedrandomchestcontent.theMinimumChanceToGenerateItem + 1); +- int k = weightedrandomchestcontent.theMinimumChanceToGenerateItem + par0Random.nextInt(weightedrandomchestcontent.theMaximumChanceToGenerateItem - weightedrandomchestcontent.theMinimumChanceToGenerateItem + 1); ++ ItemStack[] stacks = weightedrandomchestcontent.generateChestContent(par0Random, par2IInventory); - if (weightedrandomchestcontent.theItemId.getMaxStackSize() >= k) -+ ItemStack[] stacks = ChestGenHooks.generateStacks(par0Random, weightedrandomchestcontent.theItemId, weightedrandomchestcontent.theMinimumChanceToGenerateItem, weightedrandomchestcontent.theMaximumChanceToGenerateItem); -+ + for (ItemStack item : stacks) { - ItemStack itemstack = weightedrandomchestcontent.theItemId.copy(); @@ -35,12 +36,12 @@ } } } -@@ -68,22 +62,11 @@ +@@ -68,22 +60,11 @@ for (int j = 0; j < par3; ++j) { WeightedRandomChestContent weightedrandomchestcontent = (WeightedRandomChestContent)WeightedRandom.getRandomItem(par0Random, par1ArrayOfWeightedRandomChestContent); - int k = weightedrandomchestcontent.theMinimumChanceToGenerateItem + par0Random.nextInt(weightedrandomchestcontent.theMaximumChanceToGenerateItem - weightedrandomchestcontent.theMinimumChanceToGenerateItem + 1); -+ ItemStack[] stacks = ChestGenHooks.generateStacks(par0Random, weightedrandomchestcontent.theItemId, weightedrandomchestcontent.theMinimumChanceToGenerateItem, weightedrandomchestcontent.theMaximumChanceToGenerateItem); ++ ItemStack[] stacks = weightedrandomchestcontent.generateChestContent(par0Random, par2TileEntityDispenser); - if (weightedrandomchestcontent.theItemId.getMaxStackSize() >= k) + for (ItemStack item : stacks) @@ -61,7 +62,7 @@ } } } -@@ -109,4 +92,18 @@ +@@ -109,4 +90,18 @@ return aweightedrandomchestcontent1; } diff --git a/patches/minecraft/net/minecraft/village/VillageCollection.java.patch b/patches/minecraft/net/minecraft/village/VillageCollection.java.patch new file mode 100644 index 0000000000..f4811e4036 --- /dev/null +++ b/patches/minecraft/net/minecraft/village/VillageCollection.java.patch @@ -0,0 +1,11 @@ +--- ../src_base/minecraft/net/minecraft/village/VillageCollection.java ++++ ../src_work/minecraft/net/minecraft/village/VillageCollection.java +@@ -165,7 +165,7 @@ + { + Village village = (Village)iterator.next(); + int j = (int)village.getCenter().getDistanceSquared(villagedoorinfo.posX, villagedoorinfo.posY, villagedoorinfo.posZ); +- int k = 32 + village.getVillageRadius(); ++ float k = 32f + village.getVillageRadius(); + + if (j > k * k) + { diff --git a/patches/minecraft/net/minecraft/world/ChunkCache.java.patch b/patches/minecraft/net/minecraft/world/ChunkCache.java.patch index 964c526a6a..8bf965f666 100644 --- a/patches/minecraft/net/minecraft/world/ChunkCache.java.patch +++ b/patches/minecraft/net/minecraft/world/ChunkCache.java.patch @@ -1,6 +1,14 @@ --- ../src_base/minecraft/net/minecraft/world/ChunkCache.java +++ ../src_work/minecraft/net/minecraft/world/ChunkCache.java -@@ -108,7 +108,15 @@ +@@ -8,6 +8,7 @@ + import net.minecraft.util.Vec3Pool; + import net.minecraft.world.biome.BiomeGenBase; + import net.minecraft.world.chunk.Chunk; ++import net.minecraftforge.common.ForgeDirection; + + public class ChunkCache implements IBlockAccess + { +@@ -108,7 +109,15 @@ { int l = (par1 >> 4) - this.chunkX; int i1 = (par3 >> 4) - this.chunkZ; @@ -17,7 +25,7 @@ } @SideOnly(Side.CLIENT) -@@ -159,7 +167,12 @@ +@@ -159,7 +168,12 @@ { int l = (par1 >> 4) - this.chunkX; int i1 = (par3 >> 4) - this.chunkZ; @@ -31,7 +39,7 @@ } } -@@ -306,8 +319,7 @@ +@@ -306,8 +320,7 @@ */ public boolean doesBlockHaveSolidTopSurface(int par1, int par2, int par3) { @@ -41,3 +49,37 @@ } /** +@@ -325,8 +338,8 @@ + */ + public boolean isAirBlock(int par1, int par2, int par3) + { +- Block block = Block.blocksList[this.getBlockId(par1, par2, par3)]; +- return block == null; ++ int id = getBlockId(par1, par2, par3); ++ return id == 0 || Block.blocksList[id] == null || Block.blocksList[id].isAirBlock(this.worldObj, par1, par2, par3); + } + + @SideOnly(Side.CLIENT) +@@ -449,4 +462,22 @@ + int i1 = this.getBlockId(par1, par2, par3); + return i1 == 0 ? 0 : Block.blocksList[i1].isProvidingStrongPower(this, par1, par2, par3, par4); + } ++ ++ public boolean isBlockSolidOnSide(int x, int y, int z, ForgeDirection side, boolean _default) ++ { ++ if (x < -30000000 || z < -30000000 || x >= 30000000 || z >= 30000000) ++ { ++ return _default; ++ } ++ ++ int blockId = getBlockId(x, y, z); ++ Block block = Block.blocksList[blockId]; ++ ++ if (block != null) ++ { ++ return block.isBlockSolidOnSide(this.worldObj, x, y, z, side); ++ } ++ ++ return false; ++ } + } diff --git a/patches/minecraft/net/minecraft/world/IBlockAccess.java.patch b/patches/minecraft/net/minecraft/world/IBlockAccess.java.patch new file mode 100644 index 0000000000..eddd893e47 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/IBlockAccess.java.patch @@ -0,0 +1,27 @@ +--- ../src_base/minecraft/net/minecraft/world/IBlockAccess.java ++++ ../src_work/minecraft/net/minecraft/world/IBlockAccess.java +@@ -6,6 +6,7 @@ + import net.minecraft.tileentity.TileEntity; + import net.minecraft.util.Vec3Pool; + import net.minecraft.world.biome.BiomeGenBase; ++import net.minecraftforge.common.ForgeDirection; + + public interface IBlockAccess + { +@@ -103,4 +104,16 @@ + * Is this block powering in the specified direction Args: x, y, z, direction + */ + int isBlockProvidingPowerTo(int i, int j, int k, int l); ++ ++ /** ++ * FORGE: isBlockSolidOnSide, pulled up from {@link World} ++ * ++ * @param x X coord ++ * @param y Y coord ++ * @param z Z coord ++ * @param side Side ++ * @param _default default return value ++ * @return if the block is solid on the side ++ */ ++ boolean isBlockSolidOnSide(int x, int y, int z, ForgeDirection side, boolean _default); + } diff --git a/patches/minecraft/net/minecraft/world/SpawnerAnimals.java.patch b/patches/minecraft/net/minecraft/world/SpawnerAnimals.java.patch index d820f9872f..d42d2f2112 100644 --- a/patches/minecraft/net/minecraft/world/SpawnerAnimals.java.patch +++ b/patches/minecraft/net/minecraft/world/SpawnerAnimals.java.patch @@ -8,7 +8,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; -@@ -19,6 +21,10 @@ +@@ -17,6 +19,10 @@ import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.chunk.Chunk; @@ -19,38 +19,43 @@ public final class SpawnerAnimals { /** The 17x17 area around the player where mobs can spawn */ -@@ -90,9 +96,12 @@ +@@ -85,9 +91,12 @@ { EnumCreatureType enumcreaturetype = aenumcreaturetype[j1]; -- if ((!enumcreaturetype.getPeacefulCreature() || par2) && (enumcreaturetype.getPeacefulCreature() || par1) && (!enumcreaturetype.getAnimal() || par3) && par0WorldServer.countEntities(enumcreaturetype.getCreatureClass()) <= enumcreaturetype.getMaxNumberOfCreature() * eligibleChunksForSpawning.size() / 256) -+ if ((!enumcreaturetype.getPeacefulCreature() || par2) && (enumcreaturetype.getPeacefulCreature() || par1) && (!enumcreaturetype.getAnimal() || par3) && par0WorldServer.countEntities(enumcreaturetype, true) <= enumcreaturetype.getMaxNumberOfCreature() * eligibleChunksForSpawning.size() / 256) +- if ((!enumcreaturetype.getPeacefulCreature() || par3) && (enumcreaturetype.getPeacefulCreature() || par2) && (!enumcreaturetype.getAnimal() || par4) && par1WorldServer.countEntities(enumcreaturetype.getCreatureClass()) <= enumcreaturetype.getMaxNumberOfCreature() * this.eligibleChunksForSpawning.size() / 256) ++ if ((!enumcreaturetype.getPeacefulCreature() || par3) && (enumcreaturetype.getPeacefulCreature() || par2) && (!enumcreaturetype.getAnimal() || par4) && par1WorldServer.countEntities(enumcreaturetype, true) <= enumcreaturetype.getMaxNumberOfCreature() * this.eligibleChunksForSpawning.size() / 256) { - Iterator iterator = eligibleChunksForSpawning.keySet().iterator(); + Iterator iterator = this.eligibleChunksForSpawning.keySet().iterator(); + ArrayList tmp = new ArrayList(eligibleChunksForSpawning.keySet()); + Collections.shuffle(tmp); + iterator = tmp.iterator(); label110: while (iterator.hasNext()) -@@ -169,13 +178,14 @@ +@@ -165,13 +174,17 @@ - entityliving.setLocationAndAngles((double)f, (double)f1, (double)f2, par0WorldServer.rand.nextFloat() * 360.0F, 0.0F); + entityliving.setLocationAndAngles((double)f, (double)f1, (double)f2, par1WorldServer.rand.nextFloat() * 360.0F, 0.0F); - if (entityliving.getCanSpawnHere()) -+ Result canSpawn = ForgeEventFactory.canEntitySpawn(entityliving, par0WorldServer, f, f1, f2); ++ Result canSpawn = ForgeEventFactory.canEntitySpawn(entityliving, par1WorldServer, f, f1, f2); + if (canSpawn == Result.ALLOW || (canSpawn == Result.DEFAULT && entityliving.getCanSpawnHere())) { ++j2; - par0WorldServer.spawnEntityInWorld(entityliving); - creatureSpecificInit(entityliving, par0WorldServer, f, f1, f2); - + par1WorldServer.spawnEntityInWorld(entityliving); +- entitylivingdata = entityliving.func_110161_a(entitylivingdata); +- - if (j2 >= entityliving.getMaxSpawnedInChunk()) ++ if (!ForgeEventFactory.doSpecialSpawn(entityliving, par1WorldServer, f, f1, f2)) ++ { ++ entitylivingdata = entityliving.func_110161_a(entitylivingdata); ++ } ++ + if (j2 >= ForgeEventFactory.getMaxSpawnPackSize(entityliving)) { continue label110; } -@@ -221,7 +231,8 @@ +@@ -217,7 +230,8 @@ else { int l = par1World.getBlockId(par2, par3 - 1, par4); @@ -60,15 +65,3 @@ } } -@@ -230,6 +241,11 @@ - */ - private static void creatureSpecificInit(EntityLiving par0EntityLiving, World par1World, float par2, float par3, float par4) - { -+ if (ForgeEventFactory.doSpecialSpawn(par0EntityLiving, par1World, par2, par3, par4)) -+ { -+ return; -+ } -+ - par0EntityLiving.initCreature(); - } - diff --git a/patches/minecraft/net/minecraft/world/World.java.patch b/patches/minecraft/net/minecraft/world/World.java.patch index 6174ae6a05..27f1ff9121 100644 --- a/patches/minecraft/net/minecraft/world/World.java.patch +++ b/patches/minecraft/net/minecraft/world/World.java.patch @@ -7,7 +7,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; -@@ -52,8 +53,32 @@ +@@ -53,8 +54,32 @@ import net.minecraft.world.storage.MapStorage; import net.minecraft.world.storage.WorldInfo; @@ -40,18 +40,18 @@ /** * boolean; if true updates scheduled by scheduleBlockUpdate happen immediately */ -@@ -165,6 +190,11 @@ - * Gets the biome for a given set of x/z coordinates +@@ -167,6 +192,11 @@ */ public BiomeGenBase getBiomeGenForCoords(int par1, int par2) -+ { + { + return provider.getBiomeGenForCoords(par1, par2); + } + + public BiomeGenBase getBiomeGenForCoordsBody(int par1, int par2) - { ++ { if (this.blockExists(par1, 0, par2)) { + Chunk chunk = this.getChunkFromBlockCoords(par1, par2); @@ -194,8 +224,15 @@ this.theProfiler = par5Profiler; this.worldInfo = new WorldInfo(par4WorldSettings, par2Str); @@ -82,8 +82,8 @@ this.chunkProvider = this.createChunkProvider(); this.calculateInitialSkylight(); this.calculateInitialWeather(); -@@ -222,7 +261,7 @@ - this.isRemote = false; +@@ -221,7 +260,7 @@ + this.lightUpdateBlockList = new int[32768]; this.saveHandler = par1ISaveHandler; this.theProfiler = par5Profiler; - this.mapStorage = new MapStorage(par1ISaveHandler); @@ -91,7 +91,7 @@ this.worldLogAgent = par6ILogAgent; this.worldInfo = par1ISaveHandler.loadWorldInfo(); -@@ -276,12 +315,20 @@ +@@ -275,12 +314,20 @@ this.worldInfo.setServerInitialized(true); } @@ -114,7 +114,7 @@ } else { -@@ -291,6 +338,19 @@ +@@ -290,6 +337,19 @@ this.calculateInitialSkylight(); this.calculateInitialWeather(); @@ -134,7 +134,7 @@ } /** -@@ -374,7 +434,8 @@ +@@ -373,7 +433,8 @@ */ public boolean isAirBlock(int par1, int par2, int par3) { @@ -144,7 +144,7 @@ } /** -@@ -383,7 +444,8 @@ +@@ -382,7 +443,8 @@ public boolean blockHasTileEntity(int par1, int par2, int par3) { int l = this.getBlockId(par1, par2, par3); @@ -154,7 +154,7 @@ } /** -@@ -1158,7 +1220,7 @@ +@@ -1157,7 +1219,7 @@ */ public boolean isDaytime() { @@ -163,7 +163,7 @@ } /** -@@ -1190,7 +1252,7 @@ +@@ -1189,7 +1251,7 @@ int l1 = this.getBlockMetadata(l, i1, j1); Block block = Block.blocksList[k1]; @@ -172,7 +172,7 @@ { MovingObjectPosition movingobjectposition = block.collisionRayTrace(this, l, i1, j1, par1Vec3, par2Vec3); -@@ -1390,6 +1452,12 @@ +@@ -1389,6 +1451,12 @@ */ public void playSoundAtEntity(Entity par1Entity, String par2Str, float par3, float par4) { @@ -185,7 +185,7 @@ if (par1Entity != null && par2Str != null) { for (int i = 0; i < this.worldAccesses.size(); ++i) -@@ -1404,6 +1472,12 @@ +@@ -1403,6 +1471,12 @@ */ public void playSoundToNearExcept(EntityPlayer par1EntityPlayer, String par2Str, float par3, float par4) { @@ -198,7 +198,7 @@ if (par1EntityPlayer != null && par2Str != null) { for (int i = 0; i < this.worldAccesses.size(); ++i) -@@ -1490,6 +1564,11 @@ +@@ -1489,6 +1563,11 @@ EntityPlayer entityplayer = (EntityPlayer)par1Entity; this.playerEntities.add(entityplayer); this.updateAllPlayersSleepingFlag(); @@ -210,7 +210,7 @@ } this.getChunkFromChunkCoords(i, j).addEntity(par1Entity); -@@ -1736,6 +1815,12 @@ +@@ -1735,6 +1814,12 @@ * Calculates the color for the skybox */ public Vec3 getSkyColor(Entity par1Entity, float par2) @@ -223,7 +223,7 @@ { float f1 = this.getCelestialAngle(par2); float f2 = MathHelper.cos(f1 * (float)Math.PI * 2.0F) * 2.0F + 0.5F; -@@ -1828,6 +1913,12 @@ +@@ -1833,6 +1918,12 @@ @SideOnly(Side.CLIENT) public Vec3 getCloudColour(float par1) { @@ -236,7 +236,7 @@ float f1 = this.getCelestialAngle(par1); float f2 = MathHelper.cos(f1 * (float)Math.PI * 2.0F) * 2.0F + 0.5F; -@@ -1899,6 +1990,8 @@ +@@ -1904,6 +1995,8 @@ public int getTopSolidOrLiquidBlock(int par1, int par2) { Chunk chunk = this.getChunkFromBlockCoords(par1, par2); @@ -245,7 +245,7 @@ int k = chunk.getTopFilledSegment() + 15; par1 &= 15; -@@ -1906,7 +1999,7 @@ +@@ -1911,7 +2004,7 @@ { int l = chunk.getBlockID(par1, k, par2); @@ -254,7 +254,7 @@ { return k + 1; } -@@ -1921,6 +2014,12 @@ +@@ -1926,6 +2019,12 @@ * How bright are stars in the sky */ public float getStarBrightness(float par1) @@ -267,7 +267,7 @@ { float f1 = this.getCelestialAngle(par1); float f2 = 1.0F - (MathHelper.cos(f1 * (float)Math.PI * 2.0F) * 2.0F + 0.25F); -@@ -1985,7 +2084,15 @@ +@@ -1990,7 +2089,15 @@ entity.func_85029_a(crashreportcategory); } @@ -284,7 +284,7 @@ } if (entity.isDead) -@@ -2047,7 +2154,16 @@ +@@ -2052,7 +2159,16 @@ crashreport = CrashReport.makeCrashReport(throwable1, "Ticking entity"); crashreportcategory = crashreport.makeCategory("Entity being ticked"); entity.func_85029_a(crashreportcategory); @@ -302,7 +302,7 @@ } } -@@ -2090,7 +2206,16 @@ +@@ -2095,7 +2211,16 @@ crashreport = CrashReport.makeCrashReport(throwable2, "Ticking tile entity"); crashreportcategory = crashreport.makeCategory("Tile entity being ticked"); tileentity.func_85027_a(crashreportcategory); @@ -320,7 +320,7 @@ } } -@@ -2104,7 +2229,7 @@ +@@ -2109,7 +2234,7 @@ if (chunk != null) { @@ -329,7 +329,7 @@ } } } -@@ -2113,6 +2238,10 @@ +@@ -2118,6 +2243,10 @@ if (!this.entityRemoval.isEmpty()) { @@ -340,7 +340,7 @@ this.loadedTileEntityList.removeAll(this.entityRemoval); this.entityRemoval.clear(); } -@@ -2133,18 +2262,18 @@ +@@ -2138,18 +2267,18 @@ { this.loadedTileEntityList.add(tileentity1); } @@ -363,7 +363,7 @@ } } -@@ -2157,13 +2286,13 @@ +@@ -2162,13 +2291,13 @@ public void addTileEntity(Collection par1Collection) { @@ -384,7 +384,7 @@ } } -@@ -2183,9 +2312,17 @@ +@@ -2188,9 +2317,17 @@ { int i = MathHelper.floor_double(par1Entity.posX); int j = MathHelper.floor_double(par1Entity.posZ); @@ -405,7 +405,7 @@ { par1Entity.lastTickPosX = par1Entity.posX; par1Entity.lastTickPosY = par1Entity.posY; -@@ -2418,6 +2555,14 @@ +@@ -2423,6 +2560,14 @@ { return true; } @@ -420,7 +420,7 @@ } } } -@@ -2740,15 +2885,16 @@ +@@ -2745,15 +2890,16 @@ */ public void setBlockTileEntity(int par1, int par2, int par3, TileEntity par4TileEntity) { @@ -446,7 +446,7 @@ while (iterator.hasNext()) { TileEntity tileentity1 = (TileEntity)iterator.next(); -@@ -2759,19 +2905,18 @@ +@@ -2764,19 +2910,18 @@ iterator.remove(); } } @@ -475,7 +475,7 @@ } } -@@ -2780,27 +2925,10 @@ +@@ -2785,27 +2930,10 @@ */ public void removeBlockTileEntity(int par1, int par2, int par3) { @@ -507,7 +507,7 @@ } } -@@ -2826,7 +2954,8 @@ +@@ -2831,7 +2959,8 @@ */ public boolean isBlockNormalCube(int par1, int par2, int par3) { @@ -517,7 +517,7 @@ } public boolean func_85174_u(int par1, int par2, int par3) -@@ -2849,16 +2978,17 @@ +@@ -2854,16 +2983,17 @@ */ public boolean doesBlockHaveSolidTopSurface(int par1, int par2, int par3) { @@ -537,7 +537,7 @@ return par1Block == null ? false : (par1Block.blockMaterial.isOpaque() && par1Block.renderAsNormalBlock() ? true : (par1Block instanceof BlockStairs ? (par2 & 4) == 4 : (par1Block instanceof BlockHalfSlab ? (par2 & 8) == 8 : (par1Block instanceof BlockHopper ? true : (par1Block instanceof BlockSnow ? (par2 & 7) == 7 : false))))); } -@@ -2875,7 +3005,7 @@ +@@ -2880,7 +3010,7 @@ if (chunk != null && !chunk.isEmpty()) { Block block = Block.blocksList[this.getBlockId(par1, par2, par3)]; @@ -546,7 +546,7 @@ } else { -@@ -2906,8 +3036,7 @@ +@@ -2911,8 +3041,7 @@ */ public void setAllowedSpawnTypes(boolean par1, boolean par2) { @@ -556,7 +556,7 @@ } /** -@@ -2923,6 +3052,11 @@ +@@ -2928,6 +3057,11 @@ */ private void calculateInitialWeather() { @@ -568,7 +568,7 @@ if (this.worldInfo.isRaining()) { this.rainingStrength = 1.0F; -@@ -2938,6 +3072,11 @@ +@@ -2943,6 +3077,11 @@ * Updates all weather states. */ protected void updateWeather() @@ -580,7 +580,7 @@ { if (!this.provider.hasNoSky) { -@@ -3035,12 +3174,14 @@ +@@ -3040,12 +3179,14 @@ public void toggleRain() { @@ -596,7 +596,7 @@ this.theProfiler.startSection("buildList"); int i; EntityPlayer entityplayer; -@@ -3147,6 +3288,11 @@ +@@ -3152,6 +3293,11 @@ */ public boolean canBlockFreeze(int par1, int par2, int par3, boolean par4) { @@ -608,7 +608,7 @@ BiomeGenBase biomegenbase = this.getBiomeGenForCoords(par1, par3); float f = biomegenbase.getFloatTemperature(); -@@ -3205,6 +3351,11 @@ +@@ -3210,6 +3356,11 @@ */ public boolean canSnowAt(int par1, int par2, int par3) { @@ -620,7 +620,7 @@ BiomeGenBase biomegenbase = this.getBiomeGenForCoords(par1, par3); float f = biomegenbase.getFloatTemperature(); -@@ -3248,10 +3399,12 @@ +@@ -3253,10 +3404,12 @@ else { int l = this.getBlockId(par1, par2, par3); @@ -637,7 +637,7 @@ { j1 = 1; } -@@ -3347,7 +3500,9 @@ +@@ -3352,7 +3505,9 @@ int j4 = i2 + Facing.offsetsXForSide[i4]; int k4 = j2 + Facing.offsetsYForSide[i4]; int l4 = k2 + Facing.offsetsZForSide[i4]; @@ -648,7 +648,7 @@ i3 = this.getSavedLightValue(par1EnumSkyBlock, j4, k4, l4); if (i3 == l2 - i5 && i1 < this.lightUpdateBlockList.length) -@@ -3450,10 +3605,10 @@ +@@ -3455,10 +3610,10 @@ public List getEntitiesWithinAABBExcludingEntity(Entity par1Entity, AxisAlignedBB par2AxisAlignedBB, IEntitySelector par3IEntitySelector) { ArrayList arraylist = new ArrayList(); @@ -663,7 +663,7 @@ for (int i1 = i; i1 <= j; ++i1) { -@@ -3479,10 +3634,10 @@ +@@ -3484,10 +3639,10 @@ public List selectEntitiesWithinAABB(Class par1Class, AxisAlignedBB par2AxisAlignedBB, IEntitySelector par3IEntitySelector) { @@ -678,7 +678,7 @@ ArrayList arraylist = new ArrayList(); for (int i1 = i; i1 <= j; ++i1) -@@ -3575,11 +3730,14 @@ +@@ -3580,11 +3735,14 @@ */ public void addLoadedEntities(List par1List) { @@ -696,7 +696,7 @@ } } -@@ -3613,6 +3771,11 @@ +@@ -3618,6 +3776,11 @@ else { if (block != null && (block == Block.waterMoving || block == Block.waterStill || block == Block.lavaMoving || block == Block.lavaStill || block == Block.fire || block.blockMaterial.isReplaceable())) @@ -708,7 +708,7 @@ { block = null; } -@@ -3907,7 +4070,7 @@ +@@ -3912,7 +4075,7 @@ */ public long getSeed() { @@ -717,7 +717,7 @@ } public long getTotalWorldTime() -@@ -3917,7 +4080,7 @@ +@@ -3922,7 +4085,7 @@ public long getWorldTime() { @@ -726,7 +726,7 @@ } /** -@@ -3925,7 +4088,7 @@ +@@ -3930,7 +4093,7 @@ */ public void setWorldTime(long par1) { @@ -735,7 +735,7 @@ } /** -@@ -3933,13 +4096,13 @@ +@@ -3938,13 +4101,13 @@ */ public ChunkCoordinates getSpawnPoint() { @@ -751,7 +751,7 @@ } @SideOnly(Side.CLIENT) -@@ -3963,7 +4126,10 @@ +@@ -3968,7 +4131,10 @@ if (!this.loadedEntityList.contains(par1Entity)) { @@ -763,7 +763,7 @@ } } -@@ -3971,6 +4137,11 @@ +@@ -3976,6 +4142,11 @@ * Called when checking if a certain block can be mined or not. The 'spawn safe zone' check is located here. */ public boolean canMineBlock(EntityPlayer par1EntityPlayer, int par2, int par3, int par4) @@ -775,7 +775,7 @@ { return true; } -@@ -4091,8 +4262,7 @@ +@@ -4096,8 +4267,7 @@ */ public boolean isBlockHighHumidity(int par1, int par2, int par3) { @@ -785,7 +785,7 @@ } /** -@@ -4167,7 +4337,7 @@ +@@ -4172,7 +4342,7 @@ */ public int getHeight() { @@ -794,7 +794,7 @@ } /** -@@ -4175,7 +4345,7 @@ +@@ -4180,7 +4350,7 @@ */ public int getActualHeight() { @@ -803,7 +803,7 @@ } public IUpdatePlayerListBox func_82735_a(EntityMinecart par1EntityMinecart) -@@ -4218,7 +4388,7 @@ +@@ -4223,7 +4393,7 @@ */ public double getHorizon() { @@ -812,9 +812,9 @@ } /** -@@ -4321,4 +4491,114 @@ - { - return this.worldLogAgent; +@@ -4351,4 +4521,115 @@ + + return MathHelper.clamp_float(f, 0.0F, flag ? 1.5F : 1.0F); } + + /** @@ -856,6 +856,7 @@ + * @param _default The defult to return if the block doesn't exist. + * @return True if the side is solid + */ ++ @Override + public boolean isBlockSolidOnSide(int x, int y, int z, ForgeDirection side, boolean _default) + { + if (x < -30000000 || z < -30000000 || x >= 30000000 || z >= 30000000) diff --git a/patches/minecraft/net/minecraft/world/WorldProvider.java.patch b/patches/minecraft/net/minecraft/world/WorldProvider.java.patch index 3131361df9..827dd9d401 100644 --- a/patches/minecraft/net/minecraft/world/WorldProvider.java.patch +++ b/patches/minecraft/net/minecraft/world/WorldProvider.java.patch @@ -24,7 +24,7 @@ public abstract class WorldProvider { -@@ -197,7 +204,7 @@ +@@ -199,7 +206,7 @@ public static WorldProvider getProviderForDimension(int par0) { @@ -33,7 +33,7 @@ } @SideOnly(Side.CLIENT) -@@ -266,4 +273,277 @@ +@@ -268,4 +275,277 @@ * Returns the dimension's name, e.g. "The End", "Nether", or "Overworld". */ public abstract String getDimensionName(); diff --git a/patches/minecraft/net/minecraft/world/WorldServer.java.patch b/patches/minecraft/net/minecraft/world/WorldServer.java.patch index dec8066340..b0a6d60673 100644 --- a/patches/minecraft/net/minecraft/world/WorldServer.java.patch +++ b/patches/minecraft/net/minecraft/world/WorldServer.java.patch @@ -29,7 +29,7 @@ public class WorldServer extends World { -@@ -88,6 +98,10 @@ +@@ -89,6 +99,10 @@ /** An IntHashMap of entity IDs (integers) to their Entity objects. */ private IntHashMap entityIdMap; @@ -40,7 +40,7 @@ public WorldServer(MinecraftServer par1MinecraftServer, ISaveHandler par2ISaveHandler, String par3Str, int par4, WorldSettings par5WorldSettings, Profiler par6Profiler, ILogAgent par7ILogAgent) { super(par2ISaveHandler, par3Str, par5WorldSettings, WorldProvider.getProviderForDimension(par4), par6Profiler, par7ILogAgent); -@@ -120,8 +134,12 @@ +@@ -121,8 +135,12 @@ this.mapStorage.setData("scoreboard", scoreboardsavedata); } @@ -140,7 +140,7 @@ byte b0 = 0; if (this.scheduledUpdatesAreImmediate && par4 > 0) -@@ -496,7 +531,7 @@ +@@ -498,7 +533,7 @@ */ public void updateEntities() { @@ -149,7 +149,7 @@ { if (this.updateEntityTick++ >= 1200) { -@@ -562,6 +597,9 @@ +@@ -564,6 +599,9 @@ { nextticklistentry = (NextTickListEntry)iterator.next(); iterator.remove(); @@ -159,7 +159,7 @@ byte b0 = 0; if (this.checkChunksExist(nextticklistentry.xCoord - b0, nextticklistentry.yCoord - b0, nextticklistentry.zCoord - b0, nextticklistentry.xCoord + b0, nextticklistentry.yCoord + b0, nextticklistentry.zCoord + b0)) -@@ -705,16 +743,28 @@ +@@ -717,16 +755,28 @@ { ArrayList arraylist = new ArrayList(); @@ -198,7 +198,7 @@ return arraylist; } -@@ -722,6 +772,11 @@ +@@ -734,6 +784,11 @@ * Called when checking if a certain block can be mined or not. The 'spawn safe zone' check is located here. */ public boolean canMineBlock(EntityPlayer par1EntityPlayer, int par2, int par3, int par4) @@ -210,7 +210,7 @@ { return !this.mcServer.func_96290_a(this, par2, par3, par4, par1EntityPlayer); } -@@ -806,7 +861,7 @@ +@@ -818,7 +873,7 @@ */ protected void createBonusChest() { @@ -219,7 +219,7 @@ for (int i = 0; i < 10; ++i) { -@@ -849,6 +904,7 @@ +@@ -861,6 +916,7 @@ } this.chunkProvider.saveChunks(par1, par2IProgressUpdate); @@ -227,7 +227,7 @@ } } -@@ -868,6 +924,7 @@ +@@ -880,6 +936,7 @@ this.checkSessionLock(); this.saveHandler.saveWorldInfoWithPlayer(this.worldInfo, this.mcServer.getConfigurationManager().getHostPlayerData()); this.mapStorage.saveAllData(); @@ -235,7 +235,7 @@ } /** -@@ -1081,4 +1138,9 @@ +@@ -1093,4 +1150,9 @@ { return this.field_85177_Q; } diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeDecorator.java.patch b/patches/minecraft/net/minecraft/world/biome/BiomeDecorator.java.patch index 9a3e8e58b0..f7e827ab34 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeDecorator.java.patch +++ b/patches/minecraft/net/minecraft/world/biome/BiomeDecorator.java.patch @@ -12,7 +12,7 @@ public class BiomeDecorator { -@@ -206,26 +211,31 @@ +@@ -199,26 +204,31 @@ */ protected void decorate() { @@ -48,7 +48,7 @@ { j = this.chunk_X + this.randomGenerator.nextInt(16) + 8; k = this.chunk_Z + this.randomGenerator.nextInt(16) + 8; -@@ -241,7 +251,8 @@ +@@ -234,7 +244,8 @@ int l; @@ -58,7 +58,7 @@ { k = this.chunk_X + this.randomGenerator.nextInt(16) + 8; l = this.chunk_Z + this.randomGenerator.nextInt(16) + 8; -@@ -250,7 +261,8 @@ +@@ -243,7 +254,8 @@ worldgenerator.generate(this.currentWorld, this.randomGenerator, k, this.currentWorld.getHeightValue(k, l), l); } @@ -68,7 +68,7 @@ { k = this.chunk_X + this.randomGenerator.nextInt(16) + 8; l = this.chunk_Z + this.randomGenerator.nextInt(16) + 8; -@@ -259,7 +271,8 @@ +@@ -252,7 +264,8 @@ int i1; @@ -78,7 +78,7 @@ { k = this.chunk_X + this.randomGenerator.nextInt(16) + 8; l = this.randomGenerator.nextInt(128); -@@ -275,7 +288,8 @@ +@@ -268,7 +281,8 @@ } } @@ -88,7 +88,7 @@ { k = this.chunk_X + this.randomGenerator.nextInt(16) + 8; l = this.randomGenerator.nextInt(128); -@@ -284,7 +298,8 @@ +@@ -277,7 +291,8 @@ worldgenerator1.generate(this.currentWorld, this.randomGenerator, k, l, i1); } @@ -98,7 +98,7 @@ { k = this.chunk_X + this.randomGenerator.nextInt(16) + 8; l = this.randomGenerator.nextInt(128); -@@ -292,7 +307,8 @@ +@@ -285,7 +300,8 @@ (new WorldGenDeadBush(Block.deadBush.blockID)).generate(this.currentWorld, this.randomGenerator, k, l, i1); } @@ -108,7 +108,7 @@ { k = this.chunk_X + this.randomGenerator.nextInt(16) + 8; l = this.chunk_Z + this.randomGenerator.nextInt(16) + 8; -@@ -305,7 +321,8 @@ +@@ -298,7 +314,8 @@ this.waterlilyGen.generate(this.currentWorld, this.randomGenerator, k, i1, l); } @@ -118,7 +118,7 @@ { if (this.randomGenerator.nextInt(4) == 0) { -@@ -324,7 +341,7 @@ +@@ -317,7 +334,7 @@ } } @@ -127,7 +127,7 @@ { j = this.chunk_X + this.randomGenerator.nextInt(16) + 8; k = this.randomGenerator.nextInt(128); -@@ -332,7 +349,7 @@ +@@ -325,7 +342,7 @@ this.mushroomBrownGen.generate(this.currentWorld, this.randomGenerator, j, k, l); } @@ -136,7 +136,7 @@ { j = this.chunk_X + this.randomGenerator.nextInt(16) + 8; k = this.randomGenerator.nextInt(128); -@@ -340,7 +357,8 @@ +@@ -333,7 +350,8 @@ this.mushroomRedGen.generate(this.currentWorld, this.randomGenerator, j, k, l); } @@ -146,7 +146,7 @@ { k = this.chunk_X + this.randomGenerator.nextInt(16) + 8; l = this.chunk_Z + this.randomGenerator.nextInt(16) + 8; -@@ -348,7 +366,7 @@ +@@ -341,7 +359,7 @@ this.reedGen.generate(this.currentWorld, this.randomGenerator, k, i1, l); } @@ -155,7 +155,7 @@ { k = this.chunk_X + this.randomGenerator.nextInt(16) + 8; l = this.randomGenerator.nextInt(128); -@@ -356,7 +374,8 @@ +@@ -349,7 +367,8 @@ this.reedGen.generate(this.currentWorld, this.randomGenerator, k, l, i1); } @@ -165,7 +165,7 @@ { j = this.chunk_X + this.randomGenerator.nextInt(16) + 8; k = this.randomGenerator.nextInt(128); -@@ -364,7 +383,8 @@ +@@ -357,7 +376,8 @@ (new WorldGenPumpkin()).generate(this.currentWorld, this.randomGenerator, j, k, l); } @@ -175,7 +175,7 @@ { k = this.chunk_X + this.randomGenerator.nextInt(16) + 8; l = this.randomGenerator.nextInt(128); -@@ -372,7 +392,8 @@ +@@ -365,7 +385,8 @@ this.cactusGen.generate(this.currentWorld, this.randomGenerator, k, l, i1); } @@ -185,7 +185,7 @@ { for (j = 0; j < 50; ++j) { -@@ -390,6 +411,8 @@ +@@ -383,6 +404,8 @@ (new WorldGenLiquids(Block.lavaMoving.blockID)).generate(this.currentWorld, this.randomGenerator, k, l, i1); } } @@ -194,7 +194,7 @@ } /** -@@ -425,13 +448,23 @@ +@@ -418,13 +441,23 @@ */ protected void generateOres() { diff --git a/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch b/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch index 6d67b1952e..a1c294286f 100644 --- a/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch +++ b/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch @@ -11,7 +11,7 @@ public class Chunk { /** -@@ -146,7 +150,9 @@ +@@ -138,7 +142,9 @@ { for (int j1 = 0; j1 < k; ++j1) { @@ -22,7 +22,7 @@ if (b0 != 0) { -@@ -165,6 +171,90 @@ +@@ -157,6 +163,90 @@ } /** @@ -113,7 +113,7 @@ * Checks whether the chunk is at the X/Z location specified */ public boolean isAtLocation(int par1, int par2) -@@ -228,7 +318,7 @@ +@@ -220,7 +310,7 @@ { int i1 = this.getBlockID(j, l - 1, k); @@ -122,7 +122,7 @@ { --l; continue; -@@ -534,7 +624,10 @@ +@@ -526,7 +616,10 @@ public int getBlockLightOpacity(int par1, int par2, int par3) { @@ -134,7 +134,7 @@ } /** -@@ -621,9 +714,13 @@ +@@ -613,9 +706,13 @@ { Block.blocksList[l1].breakBlock(this.worldObj, j2, par2, k2, l1, i2); } @@ -151,7 +151,7 @@ } } -@@ -641,7 +738,7 @@ +@@ -633,7 +730,7 @@ } else { @@ -160,7 +160,7 @@ { if (par2 >= k1) { -@@ -665,29 +762,21 @@ +@@ -657,29 +754,21 @@ Block.blocksList[par4].onBlockAdded(this.worldObj, j2, par2, k2); } @@ -193,7 +193,7 @@ } } -@@ -722,7 +811,7 @@ +@@ -714,7 +803,7 @@ extendedblockstorage.setExtBlockMetadata(par1, par2 & 15, par3, par4); int j1 = extendedblockstorage.getExtBlockID(par1, par2 & 15, par3); @@ -202,7 +202,7 @@ { TileEntity tileentity = this.getChunkBlockTileEntity(par1, par2, par3); -@@ -835,6 +924,7 @@ +@@ -827,6 +916,7 @@ k = this.entityLists.length - 1; } @@ -210,7 +210,7 @@ par1Entity.addedToChunk = true; par1Entity.chunkCoordX = this.xPosition; par1Entity.chunkCoordY = k; -@@ -884,33 +974,32 @@ +@@ -876,33 +966,32 @@ ChunkPosition chunkposition = new ChunkPosition(par1, par2, par3); TileEntity tileentity = (TileEntity)this.chunkTileEntityMap.get(chunkposition); @@ -255,7 +255,7 @@ } /** -@@ -925,7 +1014,7 @@ +@@ -917,7 +1006,7 @@ if (this.isChunkLoaded) { @@ -264,7 +264,7 @@ } } -@@ -940,7 +1029,8 @@ +@@ -932,7 +1021,8 @@ par4TileEntity.yCoord = par2; par4TileEntity.zCoord = this.zPosition * 16 + par3; @@ -275,7 +275,7 @@ if (this.chunkTileEntityMap.containsKey(chunkposition)) { @@ -982,6 +1072,7 @@ - { + this.worldObj.addLoadedEntities(this.entityLists[i]); } + MinecraftForge.EVENT_BUS.post(new ChunkEvent.Load(this)); diff --git a/patches/minecraft/net/minecraft/world/gen/ChunkProviderGenerate.java.patch b/patches/minecraft/net/minecraft/world/gen/ChunkProviderGenerate.java.patch index 9cf69ffd43..2d7987bff9 100644 --- a/patches/minecraft/net/minecraft/world/gen/ChunkProviderGenerate.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/ChunkProviderGenerate.java.patch @@ -81,9 +81,9 @@ int l1; int i2; -- if (!flag && this.rand.nextInt(4) == 0) -+ if (TerrainGen.populate(par1IChunkProvider, worldObj, rand, par2, par3, flag, LAKE) && -+ !flag && this.rand.nextInt(4) == 0) +- if (biomegenbase != BiomeGenBase.desert && biomegenbase != BiomeGenBase.desertHills && !flag && this.rand.nextInt(4) == 0) ++ if (biomegenbase != BiomeGenBase.desert && biomegenbase != BiomeGenBase.desertHills && !flag && this.rand.nextInt(4) == 0 ++ && TerrainGen.populate(par1IChunkProvider, worldObj, rand, par2, par3, flag, LAKE)) { k1 = k + this.rand.nextInt(16) + 8; l1 = this.rand.nextInt(128); @@ -107,7 +107,7 @@ { l1 = k + this.rand.nextInt(16) + 8; i2 = this.rand.nextInt(128); -@@ -541,7 +579,8 @@ +@@ -537,7 +575,8 @@ k += 8; l += 8; @@ -117,7 +117,7 @@ { for (l1 = 0; l1 < 16; ++l1) { -@@ -558,6 +597,8 @@ +@@ -554,6 +593,8 @@ } } } diff --git a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenDungeons.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenDungeons.java.patch index 91161f8d9b..d9fe44071c 100644 --- a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenDungeons.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenDungeons.java.patch @@ -1,48 +1,30 @@ --- ../src_base/minecraft/net/minecraft/world/gen/feature/WorldGenDungeons.java +++ ../src_work/minecraft/net/minecraft/world/gen/feature/WorldGenDungeons.java -@@ -7,7 +7,13 @@ - import net.minecraft.item.ItemStack; - import net.minecraft.tileentity.TileEntityChest; +@@ -8,6 +8,8 @@ import net.minecraft.tileentity.TileEntityMobSpawner; -+import net.minecraft.util.WeightedRandom; -+import net.minecraft.util.WeightedRandomChestContent; + import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.World; -+ +import net.minecraftforge.common.ChestGenHooks; +import net.minecraftforge.common.DungeonHooks; -+import net.minecraftforge.common.MinecraftForge; public class WorldGenDungeons extends WorldGenerator { -@@ -124,15 +130,8 @@ +@@ -122,12 +124,12 @@ + if (k2 == 1) + { + par1World.setBlock(i2, par4, j2, Block.chest.blockID, 0, 2); +- WeightedRandomChestContent[] aweightedrandomchestcontent = WeightedRandomChestContent.func_92080_a(field_111189_a, new WeightedRandomChestContent[] {Item.enchantedBook.func_92114_b(par2Random)}); + TileEntityChest tileentitychest = (TileEntityChest)par1World.getBlockTileEntity(i2, par4, j2); if (tileentitychest != null) { -- for (int l2 = 0; l2 < 8; ++l2) -- { -- ItemStack itemstack = this.pickCheckLootItem(par2Random); -- -- if (itemstack != null) -- { -- tileentitychest.setInventorySlotContents(par2Random.nextInt(tileentitychest.getSizeInventory()), itemstack); -- } -- } +- WeightedRandomChestContent.generateChestContents(par2Random, aweightedrandomchestcontent, tileentitychest, 8); + ChestGenHooks info = ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST); + WeightedRandomChestContent.generateChestContents(par2Random, info.getItems(par2Random), tileentitychest, info.getCount(par2Random)); } - break label210; -@@ -174,8 +173,7 @@ - */ - private ItemStack pickCheckLootItem(Random par1Random) - { -- int i = par1Random.nextInt(12); -- return i == 0 ? new ItemStack(Item.saddle) : (i == 1 ? new ItemStack(Item.ingotIron, par1Random.nextInt(4) + 1) : (i == 2 ? new ItemStack(Item.bread) : (i == 3 ? new ItemStack(Item.wheat, par1Random.nextInt(4) + 1) : (i == 4 ? new ItemStack(Item.gunpowder, par1Random.nextInt(4) + 1) : (i == 5 ? new ItemStack(Item.silk, par1Random.nextInt(4) + 1) : (i == 6 ? new ItemStack(Item.bucketEmpty) : (i == 7 && par1Random.nextInt(100) == 0 ? new ItemStack(Item.appleGold) : (i == 8 && par1Random.nextInt(2) == 0 ? new ItemStack(Item.redstone, par1Random.nextInt(4) + 1) : (i == 9 && par1Random.nextInt(10) == 0 ? new ItemStack(Item.itemsList[Item.record13.itemID + par1Random.nextInt(2)]) : (i == 10 ? new ItemStack(Item.dyePowder, 1, 3) : (i == 11 ? Item.enchantedBook.func_92109_a(par1Random) : null))))))))))); -+ return ChestGenHooks.getOneItem(ChestGenHooks.DUNGEON_CHEST, par1Random); - } - - /** -@@ -183,7 +181,6 @@ + break label101; +@@ -169,7 +171,6 @@ */ private String pickMobSpawner(Random par1Random) { diff --git a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTrees.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTrees.java.patch index 24939b8d23..8eb716c3b4 100644 --- a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTrees.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTrees.java.patch @@ -11,14 +11,15 @@ public class WorldGenTrees extends WorldGenerator { -@@ -67,7 +69,13 @@ +@@ -67,7 +69,14 @@ { k1 = par1World.getBlockId(l1, i1, j1); - if (k1 != 0 && k1 != Block.leaves.blockID && k1 != Block.grass.blockID && k1 != Block.dirt.blockID && k1 != Block.wood.blockID) + Block block = Block.blocksList[k1]; ++ boolean isAir = par1World.isAirBlock(l1, i1, j1); + -+ if (k1 != 0 && ++ if (!isAir && + !block.isLeaves(par1World, l1, i1, j1) && + k1 != Block.grass.blockID && + k1 != Block.dirt.blockID && @@ -26,7 +27,7 @@ { flag = false; } -@@ -87,10 +95,12 @@ +@@ -87,10 +96,12 @@ else { i1 = par1World.getBlockId(par3, par4 - 1, par5); @@ -43,7 +44,7 @@ b0 = 3; byte b1 = 0; int i2; -@@ -113,8 +123,9 @@ +@@ -113,8 +124,9 @@ if (Math.abs(k2) != i2 || Math.abs(i3) != i2 || par2Random.nextInt(2) != 0 && k1 != 0) { int j3 = par1World.getBlockId(j2, j1, l2); @@ -55,7 +56,7 @@ { this.setBlockAndMetadata(par1World, j2, j1, l2, Block.leaves.blockID, this.metaLeaves); } -@@ -127,7 +138,9 @@ +@@ -127,7 +139,9 @@ { k1 = par1World.getBlockId(par3, par4 + j1, par5); @@ -66,7 +67,7 @@ { this.setBlockAndMetadata(par1World, par3, par4 + j1, par5, Block.wood.blockID, this.metaWood); -@@ -167,7 +180,8 @@ +@@ -167,24 +181,25 @@ { for (k2 = par5 - i2; k2 <= par5 + i2; ++k2) { @@ -74,5 +75,35 @@ + Block block = Block.blocksList[par1World.getBlockId(j2, j1, k2)]; + if (block != null && block.isLeaves(par1World, j2, j1, k2)) { - if (par2Random.nextInt(4) == 0 && par1World.getBlockId(j2 - 1, j1, k2) == 0) +- if (par2Random.nextInt(4) == 0 && par1World.getBlockId(j2 - 1, j1, k2) == 0) ++ if (par2Random.nextInt(4) == 0 && par1World.isAirBlock(j2 - 1, j1, k2)) { + this.growVines(par1World, j2 - 1, j1, k2, 8); + } + +- if (par2Random.nextInt(4) == 0 && par1World.getBlockId(j2 + 1, j1, k2) == 0) ++ if (par2Random.nextInt(4) == 0 && par1World.isAirBlock(j2 + 1, j1, k2)) + { + this.growVines(par1World, j2 + 1, j1, k2, 2); + } + +- if (par2Random.nextInt(4) == 0 && par1World.getBlockId(j2, j1, k2 - 1) == 0) ++ if (par2Random.nextInt(4) == 0 && par1World.isAirBlock(j2, j1, k2 - 1)) + { + this.growVines(par1World, j2, j1, k2 - 1, 1); + } + +- if (par2Random.nextInt(4) == 0 && par1World.getBlockId(j2, j1, k2 + 1) == 0) ++ if (par2Random.nextInt(4) == 0 && par1World.isAirBlock(j2, j1, k2 + 1)) + { + this.growVines(par1World, j2, j1, k2 + 1, 4); + } +@@ -235,7 +250,7 @@ + { + --par3; + +- if (par1World.getBlockId(par2, par3, par4) != 0 || i1 <= 0) ++ if (!par1World.isAirBlock(par2, par3, par4) || i1 <= 0) + { + return; + } diff --git a/patches/minecraft/net/minecraft/world/gen/structure/ComponentMineshaftCorridor.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/ComponentMineshaftCorridor.java.patch index cfc71ccf03..c61ed6ecac 100644 --- a/patches/minecraft/net/minecraft/world/gen/structure/ComponentMineshaftCorridor.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/ComponentMineshaftCorridor.java.patch @@ -10,7 +10,7 @@ public class ComponentMineshaftCorridor extends StructureComponent { -@@ -260,14 +263,16 @@ +@@ -264,14 +267,16 @@ this.randomlyPlaceBlock(par1World, par3StructureBoundingBox, par2Random, 0.05F, 1, 2, k - 1, Block.torchWood.blockID, 0); this.randomlyPlaceBlock(par1World, par3StructureBoundingBox, par2Random, 0.05F, 1, 2, k + 1, Block.torchWood.blockID, 0); diff --git a/patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdLibrary.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdLibrary.java.patch index 1e27056082..8b33acfaf9 100644 --- a/patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdLibrary.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdLibrary.java.patch @@ -10,7 +10,7 @@ public class ComponentStrongholdLibrary extends ComponentStronghold { -@@ -145,12 +148,14 @@ +@@ -147,12 +150,14 @@ this.placeBlockAtCurrentPosition(par1World, Block.torchWood.blockID, 0, b1, 8, b2 + 1, par3StructureBoundingBox); } diff --git a/patches/minecraft/net/minecraft/world/gen/structure/ComponentVillageStartPiece.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/ComponentVillageStartPiece.java.patch index 22c51f7aa3..62a064c90e 100644 --- a/patches/minecraft/net/minecraft/world/gen/structure/ComponentVillageStartPiece.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/ComponentVillageStartPiece.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentVillageStartPiece.java +++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentVillageStartPiece.java -@@ -11,6 +11,7 @@ +@@ -12,6 +12,7 @@ /** Boolean that determines if the village is in a desert or not. */ public final boolean inDesert; @@ -8,7 +8,7 @@ /** World terrain type, 0 for normal, 1 for flap map */ public final int terrainType; -@@ -32,6 +33,7 @@ +@@ -33,6 +34,7 @@ this.terrainType = par7; BiomeGenBase biomegenbase = par1WorldChunkManager.getBiomeGenAt(par4, par5); this.inDesert = biomegenbase == BiomeGenBase.desert || biomegenbase == BiomeGenBase.desertHills; diff --git a/release.py b/release.py index b8e8b72167..31d6bb012c 100644 --- a/release.py +++ b/release.py @@ -1,7 +1,11 @@ import os, os.path, sys, glob -import shutil, fnmatch -import logging, zipfile, re +import shutil, fnmatch, time +import logging, zipfile, re, subprocess +from pprint import pformat from optparse import OptionParser +from urllib2 import HTTPError +from contextlib import closing +from datetime import datetime forge_dir = os.path.dirname(os.path.abspath(__file__)) from forge import reset_logger, load_version, zip_folder, zip_create, inject_version, build_forge_dev @@ -66,6 +70,15 @@ def main(): zf.extractall(temp_dir) zf.close() + if os.path.isfile('MANIFEST.MF'): + os.remove('MANIFEST.MF') + + fml_name = os.path.basename(fml[0]).replace('src', 'universal').replace('.zip', '.jar').replace('-master.', '.') + print('Extracting %s MANIFEST.MF' % fml_name) + with closing(zipfile.ZipFile(os.path.join(forge_dir, 'fml', 'target', fml_name), mode='r')) as zip_in: + with closing(open('MANIFEST.MF', 'wb')) as out: + out.write(zip_in.read('META-INF/MANIFEST.MF')) + error_level = 0 try: sys.path.append(mcp_dir) @@ -79,8 +92,11 @@ def main(): print 'Reobfusicate Exception: %d ' % e.code error_level = e.code + extract_fml_obfed(fml_dir, mcp_dir, reobf_dir, client_dir) - extract_paulscode(mcp_dir, client_dir) + #extract_paulscode(mcp_dir, client_dir) + gen_bin_patches(mcp_dir, os.path.join(forge_dir, 'fml'), build_num, client_dir) + version = load_version(build_num) version_forge = '%d.%d.%d.%d' % (version['major'], version['minor'], version['revision'], version['build']) version_mc = load_mc_version(fml_dir) @@ -90,7 +106,7 @@ def main(): if not branch == "": version_str = '%s-%s' % (version_str, branch) - out_folder = os.path.join(forge_dir, 'forge-%s' % version_str) + out_folder = os.path.join(forge_dir, 'target') if os.path.isdir(out_folder): shutil.rmtree(out_folder) @@ -98,8 +114,12 @@ def main(): # options.skip_changelog = True #Disable till jenkins fixes its shit if not options.skip_changelog: - changelog_file = 'forge-%s/minecraftforge-changelog-%s.txt' % (version_str, version_str) - make_changelog("http://jenkins.minecraftforge.net/job/minecraftforge/", build_num, changelog_file, version_str) + changelog_file = 'target/minecraftforge-changelog-%s.txt' % (version_str) + try: + make_changelog("http://jenkins.minecraftforge.net:81/job/minecraftforge/", build_num, changelog_file, version_str) + except HTTPError, e: + print 'Changelog failed to generate: %s' % e + options.skip_changelog = True version_file = 'forgeversion.properties' if os.path.exists(version_file): @@ -112,9 +132,9 @@ def main(): fh.write('forge.build.number=%d\n' % version['build']) if not options.sign_jar is None: - sign_jar(forge_dir, options.sign_jar, client_dir, 'minecraftforge-universal-%s.zip' % version_str) + sign_jar(forge_dir, options.sign_jar, client_dir, 'minecraftforge-universal-%s.jar' % version_str) else: - zip_start('minecraftforge-universal-%s.zip' % version_str) + zip_start('minecraftforge-universal-%s.jar' % version_str) zip_folder(client_dir, '', zip) zip_add('MANIFEST.MF','META-INF/MANIFEST.MF') zip_add('client/forge_logo.png') @@ -136,13 +156,16 @@ def main(): 'common/fml_marker.cfg', 'common/fmlversion.properties', 'common/mcpmod.info', - 'client/mcp.png' + 'client/mcp.png', + 'common/deobfuscation_data-%s.lzma' % version_mc ] for file in FML_FILES: zip_add(os.path.join(fml_dir, file)) zip_end() + build_installer(forge_dir, version_str, version_forge, version_mc, out_folder) + inject_version(os.path.join(forge_dir, 'common/net/minecraftforge/common/ForgeVersion.java'.replace('/', os.sep)), build_num) zip_start('minecraftforge-src-%s.zip' % version_str, 'forge') zip_add('client', 'client') @@ -160,10 +183,57 @@ def main(): if os.path.exists(version_file): os.remove(version_file) shutil.rmtree(temp_dir) + if os.path.isfile('MANIFEST.MF'): + os.remove('MANIFEST.MF') print '=================================== Release Finished %d =================================' % error_level sys.exit(error_level) +def build_installer(forge_dir, version_str, version_forge, version_minecraft, out_folder): + file_name = 'minecraftforge-installer-%s.jar' % version_str + universal_name = 'minecraftforge-universal-%s.jar' % version_str + + def getTZ(): + ret = '-' + t = time.timezone + print t + if (t < 0): + ret = '+' + t *= -1 + + h = int(t/60/60) + t -= (h*60*60) + m = int(t/60) + return '%s%02d%02d' % (ret, h, m) + timestamp = datetime.now().replace(microsecond=0).isoformat() + getTZ() + + print '================== %s Start ==================' % file_name + with closing(zipfile.ZipFile(os.path.join(forge_dir, 'fml', 'installer_base.jar'), mode='a')) as zip_in: + with closing(zipfile.ZipFile(os.path.join(out_folder, file_name), 'w', zipfile.ZIP_DEFLATED)) as zip_out: + # Copy everything over + for i in zip_in.filelist: + if not i.filename in ['install_profile.json', 'big_logo.png']: + print(' %s' % i.filename) + zip_out.writestr(i.filename, zip_in.read(i.filename)) + print(' %s' % universal_name) + zip_out.write(os.path.join(out_folder, universal_name), universal_name) + print(' big_logo.png') + zip_out.write(os.path.join(forge_dir, 'client', 'forge_logo.png'), 'big_logo.png') + with closing(open(os.path.join(forge_dir, 'fml', 'jsons', '%s-rel.json' % version_minecraft), 'r')) as fh: + data = fh.read() + data = data.replace('@version@', version_forge) + data = data.replace('@timestamp@', timestamp) + data = data.replace('@minecraft_version@', version_minecraft) + data = data.replace('@universal_jar@', universal_name) + data = data.replace('FMLTweaker', 'F_M_L_Tweaker') + data = data.replace('FML', 'Forge') + data = data.replace('F_M_L_Tweaker', 'FMLTweaker') + data = data.replace('cpw.mods:fml:', 'net.minecraftforge:minecraftforge:') + print(' install_profile.json') + zip_out.writestr('install_profile.json', data) + + print '================== %s Finished ==================' % file_name + def zip_add(file, key=None): if key == None: key = os.path.basename(file) @@ -184,7 +254,7 @@ def zip_start(name, base=None): zip_name = name print '================== %s Start ==================' % zip_name - zip_file = os.path.join(forge_dir, 'forge-%s' % version_str, name) + zip_file = os.path.join(forge_dir, 'target', name) zip = zipfile.ZipFile(zip_file, 'w', zipfile.ZIP_DEFLATED) zip_base = base @@ -316,5 +386,37 @@ def zip_folder_filter(path, key, zip, filter): print file_key zip.write(file_path, file_key) +def gen_bin_patches(mcp_dir, fml_dir, build_num, client_dir): + print('Creating Binary patches') + os.environ['WORKSPACE'] = os.path.join(mcp_dir, '..') + os.environ['BUILD_NUMBER'] = str(build_num) + + BUILD = ['ant', 'makebinpatches'] + if sys.platform.startswith('win'): + BUILD = ['cmd', '/C'] + BUILD + + if not run_command(BUILD, cwd=fml_dir): + print('Could not crate binary patches') + sys.exit(1) + + fml_lzma = os.path.join(fml_dir, 'binpatches.pack.lzma') + obf_lzma = os.path.join(client_dir, 'binpatches.pack.lzma') + shutil.move(fml_lzma, obf_lzma) + +def run_command(command, cwd='.', verbose=True): + print('Running command: ') + print(pformat(command)) + + process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, bufsize=1, cwd=cwd) + while process.poll() is None: + line = process.stdout.readline() + if line: + line = line.rstrip() + print(line) + if process.returncode: + print "failed: {0}".format(process.returncode) + return False + return True + if __name__ == '__main__': main() diff --git a/setup.py b/setup.py index dd39e94702..f4556d915d 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ def main(): def setup_fml(mcp_dir, fml_dir, build_num=0): print 'Setting up Forge ModLoader' - os.environ['WORKSPACE'] = os.path.join(mcp_dir, '..') + os.environ['WORKSPACE'] = os.path.abspath(os.path.join(mcp_dir, '..')) os.environ['BUILD_NUMBER'] = str(build_num) BUILD = ['ant', 'jenkinsbuild'] diff --git a/submodule_changlog.py b/submodule_changlog.py index 411c864dba..73063a6f0c 100644 --- a/submodule_changlog.py +++ b/submodule_changlog.py @@ -28,11 +28,16 @@ def main(options, args): start = line[19:] elif line[0:18] == '+Subproject commit': end = line[19:] + if end.endswith('-dirty'): + end = end[0:len(end)-6] if start == None or end == None: print('Could not extract start and end range') sys.exit(1) + #print('Start: %s' % start) + #print('End: %s' % end) + output = run_command(['git', 'log', '--reverse', '--pretty=oneline', '%s...%s' % (start, end)], './fml') print('Updated FML:') for line in output: