From 67a922d528bb4108ca21bae2fb049f551a4e19e2 Mon Sep 17 00:00:00 2001 From: LAX1DUDE Date: Thu, 29 Dec 2022 22:10:05 -0800 Subject: [PATCH] Made ECR diffs more preview-friendly in future commits --- buildtools/BuildTools.jar | Bin 220229 -> 222220 bytes .../gui/CompileLatestClientFrame.java | 68 ++++- .../task/diff/EaglerContextRedacted.java | 25 +- .../task/init/DecompileMinecraft.java | 1 + .../v1_8/buildtools/util/JARSubprocess.java | 28 ++ .../net/minecraft/block/Block.edit.java | 26 +- .../net/minecraft/block/BlockAnvil.edit.java | 4 +- .../net/minecraft/block/BlockBanner.edit.java | 2 +- .../block/BlockBasePressurePlate.edit.java | 10 +- .../net/minecraft/block/BlockBeacon.edit.java | 12 +- .../net/minecraft/block/BlockBed.edit.java | 18 +- .../minecraft/block/BlockBookshelf.edit.java | 4 +- .../block/BlockBrewingStand.edit.java | 8 +- .../net/minecraft/block/BlockBush.edit.java | 2 +- .../net/minecraft/block/BlockButton.edit.java | 8 +- .../net/minecraft/block/BlockCactus.edit.java | 2 +- .../net/minecraft/block/BlockCake.edit.java | 4 +- .../minecraft/block/BlockCauldron.edit.java | 12 +- .../net/minecraft/block/BlockChest.edit.java | 6 +- .../net/minecraft/block/BlockClay.edit.java | 4 +- .../net/minecraft/block/BlockCocoa.edit.java | 6 +- .../block/BlockCommandBlock.edit.java | 6 +- .../net/minecraft/block/BlockCrops.edit.java | 10 +- .../block/BlockDaylightDetector.edit.java | 4 +- .../minecraft/block/BlockDeadBush.edit.java | 10 +- .../net/minecraft/block/BlockDirt.edit.java | 4 +- .../minecraft/block/BlockDispenser.edit.java | 12 +- .../net/minecraft/block/BlockDoor.edit.java | 10 +- .../block/BlockDoublePlant.edit.java | 18 +- .../minecraft/block/BlockDragonEgg.edit.java | 6 +- .../block/BlockDynamicLiquid.edit.java | 6 +- .../block/BlockEnchantmentTable.edit.java | 4 +- .../minecraft/block/BlockEndPortal.edit.java | 4 +- .../block/BlockEndPortalFrame.edit.java | 2 +- .../minecraft/block/BlockEnderChest.edit.java | 12 +- .../minecraft/block/BlockFalling.edit.java | 2 +- .../minecraft/block/BlockFarmland.edit.java | 8 +- .../net/minecraft/block/BlockFence.edit.java | 4 +- .../minecraft/block/BlockFenceGate.edit.java | 2 +- .../net/minecraft/block/BlockFire.edit.java | 10 +- .../net/minecraft/block/BlockFlower.edit.java | 2 +- .../minecraft/block/BlockFlowerPot.edit.java | 6 +- .../minecraft/block/BlockFurnace.edit.java | 8 +- .../net/minecraft/block/BlockGlass.edit.java | 2 +- .../minecraft/block/BlockGlowstone.edit.java | 6 +- .../net/minecraft/block/BlockGrass.edit.java | 6 +- .../net/minecraft/block/BlockGravel.edit.java | 2 +- .../net/minecraft/block/BlockHopper.edit.java | 6 +- .../block/BlockHugeMushroom.edit.java | 6 +- .../net/minecraft/block/BlockIce.edit.java | 4 +- .../minecraft/block/BlockJukebox.edit.java | 10 +- .../net/minecraft/block/BlockLeaves.edit.java | 10 +- .../net/minecraft/block/BlockLever.edit.java | 6 +- .../net/minecraft/block/BlockLiquid.edit.java | 6 +- .../net/minecraft/block/BlockLog.edit.java | 4 +- .../net/minecraft/block/BlockMelon.edit.java | 6 +- .../minecraft/block/BlockMobSpawner.edit.java | 4 +- .../minecraft/block/BlockMushroom.edit.java | 10 +- .../minecraft/block/BlockMycelium.edit.java | 4 +- .../minecraft/block/BlockNetherWart.edit.java | 8 +- .../minecraft/block/BlockNewLeaf.edit.java | 12 +- .../net/minecraft/block/BlockNewLog.edit.java | 6 +- .../net/minecraft/block/BlockNote.edit.java | 8 +- .../minecraft/block/BlockObsidian.edit.java | 2 +- .../minecraft/block/BlockOldLeaf.edit.java | 12 +- .../net/minecraft/block/BlockOldLog.edit.java | 6 +- .../net/minecraft/block/BlockOre.edit.java | 6 +- .../minecraft/block/BlockPackedIce.edit.java | 2 +- .../net/minecraft/block/BlockPane.edit.java | 2 +- .../minecraft/block/BlockPistonBase.edit.java | 6 +- .../block/BlockPistonExtension.edit.java | 6 +- .../block/BlockPistonMoving.edit.java | 12 +- .../net/minecraft/block/BlockPlanks.edit.java | 4 +- .../net/minecraft/block/BlockPortal.edit.java | 8 +- .../net/minecraft/block/BlockPotato.edit.java | 4 +- .../block/BlockPressurePlate.edit.java | 2 +- .../minecraft/block/BlockPrismarine.edit.java | 4 +- .../net/minecraft/block/BlockQuartz.edit.java | 4 +- .../net/minecraft/block/BlockRail.edit.java | 4 +- .../minecraft/block/BlockRailBase.edit.java | 6 +- .../block/BlockRailDetector.edit.java | 8 +- .../block/BlockRailPowered.edit.java | 4 +- .../block/BlockRedSandstone.edit.java | 4 +- .../block/BlockRedstoneComparator.edit.java | 10 +- .../block/BlockRedstoneDiode.edit.java | 4 +- .../block/BlockRedstoneLight.edit.java | 2 +- .../block/BlockRedstoneOre.edit.java | 12 +- .../block/BlockRedstoneRepeater.edit.java | 4 +- .../block/BlockRedstoneTorch.edit.java | 10 +- .../block/BlockRedstoneWire.edit.java | 16 +- .../net/minecraft/block/BlockReed.edit.java | 4 +- .../net/minecraft/block/BlockSand.edit.java | 4 +- .../minecraft/block/BlockSandStone.edit.java | 4 +- .../minecraft/block/BlockSapling.edit.java | 16 +- .../minecraft/block/BlockSeaLantern.edit.java | 6 +- .../net/minecraft/block/BlockSign.edit.java | 4 +- .../minecraft/block/BlockSilverfish.edit.java | 8 +- .../net/minecraft/block/BlockSkull.edit.java | 22 +- .../net/minecraft/block/BlockSlab.edit.java | 6 +- .../net/minecraft/block/BlockSnow.edit.java | 6 +- .../minecraft/block/BlockSnowBlock.edit.java | 6 +- .../net/minecraft/block/BlockSponge.edit.java | 6 +- .../block/BlockStainedGlass.edit.java | 6 +- .../block/BlockStainedGlassPane.edit.java | 4 +- .../net/minecraft/block/BlockStairs.edit.java | 8 +- .../block/BlockStaticLiquid.edit.java | 2 +- .../net/minecraft/block/BlockStem.edit.java | 14 +- .../net/minecraft/block/BlockStone.edit.java | 6 +- .../minecraft/block/BlockStoneBrick.edit.java | 4 +- .../minecraft/block/BlockStoneSlab.edit.java | 4 +- .../block/BlockStoneSlabNew.edit.java | 6 +- .../net/minecraft/block/BlockTNT.edit.java | 14 +- .../minecraft/block/BlockTallGrass.edit.java | 18 +- .../net/minecraft/block/BlockTorch.edit.java | 4 +- .../minecraft/block/BlockTrapDoor.edit.java | 6 +- .../minecraft/block/BlockTripWire.edit.java | 8 +- .../block/BlockTripWireHook.edit.java | 6 +- .../net/minecraft/block/BlockVine.edit.java | 12 +- .../net/minecraft/block/BlockWall.edit.java | 4 +- .../net/minecraft/block/BlockWeb.edit.java | 2 +- .../minecraft/block/BlockWoodSlab.edit.java | 6 +- .../minecraft/block/BlockWorkbench.edit.java | 4 +- .../net/minecraft/block/IGrowable.edit.java | 2 +- .../block/properties/PropertyBool.edit.java | 6 +- .../properties/PropertyDirection.edit.java | 2 +- .../block/properties/PropertyEnum.edit.java | 6 +- .../properties/PropertyInteger.edit.java | 6 +- .../BlockPistonStructureHelper.edit.java | 2 +- .../block/state/BlockState.edit.java | 10 +- .../block/state/BlockStateBase.edit.java | 6 +- .../block/state/IBlockState.edit.java | 2 +- .../state/pattern/BlockPattern.edit.java | 18 +- .../state/pattern/BlockStateHelper.edit.java | 2 +- .../pattern/FactoryBlockPattern.edit.java | 8 +- .../client/LoadingScreenRenderer.edit.java | 20 +- .../net/minecraft/client/Minecraft.edit.java | 286 +++++++++--------- .../client/audio/MusicTicker.edit.java | 4 +- .../client/audio/SoundCategory.edit.java | 4 +- .../SoundEventAccessorComposite.edit.java | 4 +- .../client/audio/SoundHandler.edit.java | 30 +- .../client/audio/SoundList.edit.java | 4 +- .../audio/SoundListSerializer.edit.java | 24 +- .../client/audio/SoundRegistry.edit.java | 2 +- .../entity/AbstractClientPlayer.edit.java | 6 +- .../entity/EntityOtherPlayerMP.edit.java | 2 +- .../client/entity/EntityPlayerSP.edit.java | 10 +- .../client/gui/FontRenderer.edit.java | 50 +-- .../net/minecraft/client/gui/Gui.edit.java | 4 +- .../minecraft/client/gui/GuiButton.edit.java | 2 +- .../client/gui/GuiButtonLanguage.edit.java | 2 +- .../minecraft/client/gui/GuiChat.edit.java | 20 +- .../client/gui/GuiCommandBlock.edit.java | 8 +- .../client/gui/GuiConfirmOpenLink.edit.java | 2 +- .../client/gui/GuiControls.edit.java | 8 +- .../client/gui/GuiCustomizeSkin.edit.java | 2 +- .../client/gui/GuiDisconnected.edit.java | 10 +- .../client/gui/GuiDownloadTerrain.edit.java | 2 +- .../client/gui/GuiEnchantment.edit.java | 18 +- .../client/gui/GuiErrorScreen.edit.java | 4 +- .../client/gui/GuiGameOver.edit.java | 8 +- .../minecraft/client/gui/GuiHopper.edit.java | 2 +- .../minecraft/client/gui/GuiIngame.edit.java | 28 +- .../client/gui/GuiIngameMenu.edit.java | 18 +- .../client/gui/GuiKeyBindingList.edit.java | 4 +- .../minecraft/client/gui/GuiLabel.edit.java | 4 +- .../client/gui/GuiLanguage.edit.java | 10 +- .../client/gui/GuiLockIconButton.edit.java | 2 +- .../client/gui/GuiMainMenu.edit.java | 108 +++---- .../client/gui/GuiMemoryErrorScreen.edit.java | 4 +- .../client/gui/GuiMerchant.edit.java | 8 +- .../client/gui/GuiMultiplayer.edit.java | 54 ++-- .../minecraft/client/gui/GuiNewChat.edit.java | 8 +- .../client/gui/GuiOptionSlider.edit.java | 2 +- .../minecraft/client/gui/GuiOptions.edit.java | 28 +- .../client/gui/GuiOptionsRowList.edit.java | 4 +- .../client/gui/GuiOverlayDebug.edit.java | 46 +-- .../client/gui/GuiPageButtonList.edit.java | 4 +- .../client/gui/GuiPlayerTabOverlay.edit.java | 20 +- .../minecraft/client/gui/GuiRepair.edit.java | 12 +- .../gui/GuiResourcePackAvailable.edit.java | 2 +- .../client/gui/GuiResourcePackList.edit.java | 2 +- .../gui/GuiResourcePackSelected.edit.java | 2 +- .../minecraft/client/gui/GuiScreen.edit.java | 40 +-- .../client/gui/GuiScreenAddServer.edit.java | 30 +- .../client/gui/GuiScreenBook.edit.java | 16 +- .../gui/GuiScreenOptionsSounds.edit.java | 4 +- .../gui/GuiScreenResourcePacks.edit.java | 24 +- .../client/gui/GuiScreenServerList.edit.java | 18 +- .../minecraft/client/gui/GuiSleepMP.edit.java | 4 +- .../minecraft/client/gui/GuiSlider.edit.java | 2 +- .../minecraft/client/gui/GuiSlot.edit.java | 10 +- .../client/gui/GuiSpectator.edit.java | 4 +- .../client/gui/GuiTextField.edit.java | 12 +- .../gui/GuiUtilRenderComponents.edit.java | 4 +- .../client/gui/GuiVideoSettings.edit.java | 12 +- .../minecraft/client/gui/GuiWinGame.edit.java | 18 +- .../minecraft/client/gui/GuiYesNo.edit.java | 10 +- .../client/gui/MapItemRenderer.edit.java | 14 +- .../client/gui/ScreenChatOptions.edit.java | 2 +- .../gui/ServerListEntryNormal.edit.java | 32 +- .../client/gui/ServerSelectionList.edit.java | 14 +- .../gui/achievement/GuiAchievement.edit.java | 4 +- .../gui/achievement/GuiAchievements.edit.java | 26 +- .../client/gui/achievement/GuiStats.edit.java | 10 +- .../client/gui/inventory/GuiBeacon.edit.java | 6 +- .../client/gui/inventory/GuiChest.edit.java | 2 +- .../gui/inventory/GuiContainer.edit.java | 22 +- .../inventory/GuiContainerCreative.edit.java | 16 +- .../gui/inventory/GuiEditSign.edit.java | 8 +- .../gui/inventory/GuiInventory.edit.java | 10 +- .../GuiScreenHorseInventory.edit.java | 2 +- .../spectator/BaseSpectatorGroup.edit.java | 2 +- .../gui/spectator/PlayerMenuObject.edit.java | 8 +- .../gui/spectator/SpectatorMenu.edit.java | 4 +- .../categories/SpectatorDetails.edit.java | 2 +- .../categories/TeleportToPlayer.edit.java | 2 +- .../categories/TeleportToTeam.edit.java | 12 +- .../client/main/GameConfiguration.edit.java | 20 +- .../net/minecraft/client/main/Main.edit.java | 12 +- .../client/model/ModelBase.edit.java | 4 +- .../client/model/ModelBiped.edit.java | 2 +- .../client/model/ModelEnderman.edit.java | 4 +- .../client/model/ModelGhast.edit.java | 2 +- .../client/model/ModelPlayer.edit.java | 4 +- .../client/model/ModelRenderer.edit.java | 10 +- .../client/model/ModelSpider.edit.java | 2 +- .../client/model/ModelZombie.edit.java | 4 +- .../client/model/TexturedQuad.edit.java | 2 +- .../multiplayer/ChunkProviderClient.edit.java | 4 +- .../multiplayer/GuiConnecting.edit.java | 50 +-- .../multiplayer/PlayerControllerMP.edit.java | 8 +- .../multiplayer/ServerAddress.edit.java | 6 +- .../client/multiplayer/ServerData.edit.java | 26 +- .../client/multiplayer/ServerList.edit.java | 30 +- .../client/multiplayer/WorldClient.edit.java | 8 +- .../network/NetHandlerPlayClient.edit.java | 202 ++++++------- .../network/NetworkPlayerInfo.edit.java | 14 +- .../client/particle/Barrier.edit.java | 4 +- .../client/particle/EffectRenderer.edit.java | 34 +-- .../particle/EntityBreakingFX.edit.java | 6 +- .../client/particle/EntityDiggingFX.edit.java | 6 +- .../client/particle/EntityFX.edit.java | 8 +- .../client/particle/EntityFirework.edit.java | 6 +- .../particle/EntityFootStepFX.edit.java | 4 +- .../particle/EntityLargeExplodeFX.edit.java | 10 +- .../client/particle/EntityPickupFX.edit.java | 2 +- .../particle/EntitySpellParticleFX.edit.java | 2 +- .../client/particle/MobAppearance.edit.java | 2 +- .../inventory/ContainerLocalMenu.edit.java | 2 +- .../renderer/ActiveRenderInfo.edit.java | 10 +- .../renderer/BlockFluidRenderer.edit.java | 10 +- .../renderer/BlockModelRenderer.edit.java | 6 +- .../renderer/BlockModelShapes.edit.java | 14 +- .../BlockRendererDispatcher.edit.java | 8 +- .../client/renderer/ChestRenderer.edit.java | 2 +- .../renderer/ChunkRenderContainer.edit.java | 2 +- .../client/renderer/EntityRenderer.edit.java | 104 +++---- .../client/renderer/GLAllocation.edit.java | 14 +- .../client/renderer/IImageBuffer.edit.java | 2 +- .../renderer/ImageBufferDownload.edit.java | 6 +- .../InventoryEffectRenderer.edit.java | 4 +- .../client/renderer/ItemModelMesher.edit.java | 8 +- .../client/renderer/ItemRenderer.edit.java | 16 +- .../renderer/RegionRenderCache.edit.java | 8 +- .../client/renderer/RenderGlobal.edit.java | 98 +++--- .../client/renderer/RenderHelper.edit.java | 8 +- .../client/renderer/RenderList.edit.java | 4 +- .../client/renderer/Tessellator.edit.java | 2 +- .../block/model/BlockFaceUV.edit.java | 14 +- .../renderer/block/model/BlockPart.edit.java | 50 +-- .../block/model/BlockPartFace.edit.java | 12 +- .../block/model/BlockPartRotation.edit.java | 2 +- .../block/model/BreakingFour.edit.java | 6 +- .../renderer/block/model/FaceBakery.edit.java | 16 +- .../model/ItemCameraTransforms.edit.java | 8 +- .../block/model/ItemModelGenerator.edit.java | 12 +- .../block/model/ItemTransformVec3f.edit.java | 12 +- .../renderer/block/model/ModelBlock.edit.java | 36 +-- .../model/ModelBlockDefinition.edit.java | 32 +- .../block/statemap/BlockStateMapper.edit.java | 4 +- .../block/statemap/StateMap.edit.java | 8 +- .../block/statemap/StateMapperBase.edit.java | 4 +- .../chunk/ChunkCompileTaskGenerator.edit.java | 26 +- .../chunk/ChunkRenderWorker.edit.java | 42 +-- .../renderer/chunk/CompiledChunk.edit.java | 4 +- .../chunk/ListedRenderChunk.edit.java | 12 +- .../renderer/chunk/RenderChunk.edit.java | 46 +-- .../client/renderer/chunk/VisGraph.edit.java | 2 +- .../culling/ClippingHelperImpl.edit.java | 12 +- .../entity/ArmorStandRenderer.edit.java | 2 +- .../client/renderer/entity/Render.edit.java | 14 +- .../renderer/entity/RenderArrow.edit.java | 10 +- .../renderer/entity/RenderBat.edit.java | 2 +- .../renderer/entity/RenderBiped.edit.java | 2 +- .../renderer/entity/RenderBoat.edit.java | 2 +- .../renderer/entity/RenderCreeper.edit.java | 2 +- .../renderer/entity/RenderDragon.edit.java | 4 +- .../renderer/entity/RenderEnderman.edit.java | 4 +- .../entity/RenderEntityItem.edit.java | 6 +- .../entity/RenderFallingBlock.edit.java | 4 +- .../renderer/entity/RenderFireball.edit.java | 6 +- .../renderer/entity/RenderFish.edit.java | 4 +- .../renderer/entity/RenderGhast.edit.java | 2 +- .../entity/RenderGiantZombie.edit.java | 4 +- .../renderer/entity/RenderGuardian.edit.java | 10 +- .../renderer/entity/RenderHorse.edit.java | 4 +- .../renderer/entity/RenderIronGolem.edit.java | 2 +- .../renderer/entity/RenderItem.edit.java | 4 +- .../renderer/entity/RenderLeashKnot.edit.java | 2 +- .../entity/RenderLightningBolt.edit.java | 6 +- .../renderer/entity/RenderLiving.edit.java | 6 +- .../renderer/entity/RenderMagmaCube.edit.java | 2 +- .../renderer/entity/RenderManager.edit.java | 14 +- .../renderer/entity/RenderMinecart.edit.java | 2 +- .../renderer/entity/RenderOcelot.edit.java | 2 +- .../renderer/entity/RenderPainting.edit.java | 2 +- .../renderer/entity/RenderPigZombie.edit.java | 2 +- .../renderer/entity/RenderPlayer.edit.java | 22 +- .../renderer/entity/RenderSkeleton.edit.java | 2 +- .../renderer/entity/RenderSlime.edit.java | 2 +- .../renderer/entity/RenderSnowball.edit.java | 2 +- .../renderer/entity/RenderSquid.edit.java | 2 +- .../renderer/entity/RenderTNTPrimed.edit.java | 2 +- .../entity/RenderTntMinecart.edit.java | 2 +- .../renderer/entity/RenderVillager.edit.java | 2 +- .../renderer/entity/RenderWitch.edit.java | 2 +- .../renderer/entity/RenderWither.edit.java | 2 +- .../renderer/entity/RenderWolf.edit.java | 2 +- .../renderer/entity/RenderXPOrb.edit.java | 2 +- .../renderer/entity/RenderZombie.edit.java | 6 +- .../entity/RendererLivingEntity.edit.java | 16 +- .../entity/layers/LayerArmorBase.edit.java | 14 +- .../entity/layers/LayerArrow.edit.java | 6 +- .../entity/layers/LayerCape.edit.java | 8 +- .../layers/LayerCreeperCharge.edit.java | 4 +- .../entity/layers/LayerCustomHead.edit.java | 6 +- .../entity/layers/LayerDeadmau5Head.edit.java | 8 +- .../layers/LayerEnderDragonDeath.edit.java | 4 +- .../layers/LayerEnderDragonEyes.edit.java | 2 +- .../entity/layers/LayerEndermanEyes.edit.java | 2 +- .../entity/layers/LayerHeldBlock.edit.java | 4 +- .../entity/layers/LayerHeldItem.edit.java | 4 +- .../layers/LayerHeldItemWitch.edit.java | 4 +- .../layers/LayerIronGolemFlower.edit.java | 4 +- .../layers/LayerMooshroomMushroom.edit.java | 4 +- .../entity/layers/LayerSheepWool.edit.java | 4 +- .../entity/layers/LayerSlimeGel.edit.java | 8 +- .../entity/layers/LayerSnowmanHead.edit.java | 4 +- .../entity/layers/LayerSpiderEyes.edit.java | 2 +- .../entity/layers/LayerWitherAura.edit.java | 4 +- .../entity/layers/LayerWolfCollar.edit.java | 2 +- .../texture/AbstractTexture.edit.java | 6 +- .../renderer/texture/DynamicTexture.edit.java | 4 +- .../texture/LayeredColorMaskTexture.edit.java | 20 +- .../renderer/texture/LayeredTexture.edit.java | 12 +- .../renderer/texture/SimpleTexture.edit.java | 6 +- .../renderer/texture/Stitcher.edit.java | 20 +- .../renderer/texture/TextureClock.edit.java | 8 +- .../renderer/texture/TextureCompass.edit.java | 8 +- .../renderer/texture/TextureManager.edit.java | 24 +- .../renderer/texture/TextureMap.edit.java | 52 ++-- .../renderer/texture/TextureUtil.edit.java | 42 +-- .../tileentity/RenderEnderCrystal.edit.java | 2 +- .../tileentity/RenderItemFrame.edit.java | 20 +- .../tileentity/RenderWitherSkull.edit.java | 2 +- .../TileEntityBannerRenderer.edit.java | 8 +- .../TileEntityBeaconRenderer.edit.java | 6 +- .../TileEntityChestRenderer.edit.java | 12 +- ...leEntityEnchantmentTableRenderer.edit.java | 2 +- .../TileEntityEndPortalRenderer.edit.java | 12 +- .../TileEntityEnderChestRenderer.edit.java | 2 +- .../TileEntityItemStackRenderer.edit.java | 4 +- .../TileEntityMobSpawnerRenderer.edit.java | 2 +- .../TileEntityPistonRenderer.edit.java | 6 +- .../TileEntityRendererDispatcher.edit.java | 8 +- .../TileEntitySignRenderer.edit.java | 6 +- .../TileEntitySkullRenderer.edit.java | 8 +- .../vertex/DefaultVertexFormats.edit.java | 2 +- .../resources/AbstractResourcePack.edit.java | 26 +- .../resources/DefaultPlayerSkin.edit.java | 6 +- .../resources/DefaultResourcePack.edit.java | 22 +- .../FallbackResourceManager.edit.java | 10 +- .../FoliageColorReloadListener.edit.java | 4 +- .../GrassColorReloadListener.edit.java | 4 +- .../client/resources/IResourcePack.edit.java | 4 +- .../client/resources/Language.edit.java | 2 +- .../resources/LanguageManager.edit.java | 4 +- .../client/resources/Locale.edit.java | 22 +- .../client/resources/ResourceIndex.edit.java | 6 +- ...esourcePackFileNotFoundException.edit.java | 2 +- .../resources/ResourcePackListEntry.edit.java | 12 +- .../ResourcePackListEntryDefault.edit.java | 8 +- .../ResourcePackRepository.edit.java | 74 ++--- .../SimpleReloadableResourceManager.edit.java | 4 +- .../client/resources/SimpleResource.edit.java | 14 +- .../data/AnimationMetadataSection.edit.java | 4 +- ...imationMetadataSectionSerializer.edit.java | 38 +-- .../FontMetadataSectionSerializer.edit.java | 24 +- .../data/IMetadataSectionSerializer.edit.java | 2 +- .../data/IMetadataSerializer.edit.java | 14 +- .../data/LanguageMetadataSection.edit.java | 2 +- ...anguageMetadataSectionSerializer.edit.java | 14 +- .../PackMetadataSectionSerializer.edit.java | 10 +- ...TextureMetadataSectionSerializer.edit.java | 18 +- .../resources/model/BuiltInModel.edit.java | 4 +- .../resources/model/IBakedModel.edit.java | 4 +- .../resources/model/ModelBakery.edit.java | 58 ++-- .../model/ModelResourceLocation.edit.java | 2 +- .../resources/model/ModelRotation.edit.java | 4 +- .../model/SimpleBakedModel.edit.java | 20 +- .../model/WeightedBakedModel.edit.java | 6 +- .../client/settings/GameSettings.edit.java | 108 +++---- .../client/settings/KeyBinding.edit.java | 2 +- .../minecraft/client/stream/IStream.edit.java | 10 +- .../client/util/JsonBlendingMode.edit.java | 16 +- .../client/util/JsonException.edit.java | 4 +- .../command/ICommandSender.edit.java | 2 +- .../command/PlayerSelector.edit.java | 52 ++-- .../server/CommandBlockLogic.edit.java | 28 +- .../net/minecraft/crash/CrashReport.edit.java | 36 +-- .../crash/CrashReportCategory.edit.java | 38 +-- .../enchantment/Enchantment.edit.java | 2 +- .../EnchantmentDurability.edit.java | 2 +- .../enchantment/EnchantmentHelper.edit.java | 14 +- .../enchantment/EnchantmentThorns.edit.java | 6 +- .../minecraft/entity/DataWatcher.edit.java | 36 +-- .../net/minecraft/entity/Entity.edit.java | 84 ++--- .../minecraft/entity/EntityAgeable.edit.java | 10 +- .../minecraft/entity/EntityCreature.edit.java | 14 +- .../minecraft/entity/EntityHanging.edit.java | 12 +- .../entity/EntityLeashKnot.edit.java | 4 +- .../net/minecraft/entity/EntityList.edit.java | 36 +-- .../minecraft/entity/EntityLiving.edit.java | 34 +-- .../entity/EntityLivingBase.edit.java | 72 ++--- .../EntityMinecartCommandBlock.edit.java | 2 +- .../EntitySpawnPlacementRegistry.edit.java | 2 +- .../entity/SharedMonsterAttributes.edit.java | 6 +- .../ai/attributes/AttributeModifier.edit.java | 8 +- .../ai/attributes/BaseAttributeMap.edit.java | 2 +- .../attributes/IAttributeInstance.edit.java | 2 +- .../ModifiableAttributeInstance.edit.java | 14 +- .../entity/boss/EntityDragon.edit.java | 38 +-- .../entity/boss/EntityWither.edit.java | 18 +- .../effect/EntityLightningBolt.edit.java | 8 +- .../entity/item/EntityArmorStand.edit.java | 18 +- .../entity/item/EntityBoat.edit.java | 16 +- .../entity/item/EntityEnderCrystal.edit.java | 2 +- .../entity/item/EntityEnderEye.edit.java | 6 +- .../entity/item/EntityEnderPearl.edit.java | 6 +- .../entity/item/EntityExpBottle.edit.java | 6 +- .../entity/item/EntityFallingBlock.edit.java | 18 +- .../item/EntityFireworkRocket.edit.java | 4 +- .../entity/item/EntityItem.edit.java | 16 +- .../entity/item/EntityItemFrame.edit.java | 2 +- .../entity/item/EntityMinecart.edit.java | 20 +- .../item/EntityMinecartContainer.edit.java | 2 +- .../entity/item/EntityMinecartEmpty.edit.java | 2 +- .../item/EntityMinecartHopper.edit.java | 6 +- .../entity/item/EntityMinecartTNT.edit.java | 6 +- .../entity/item/EntityPainting.edit.java | 2 +- .../entity/item/EntityTNTPrimed.edit.java | 2 +- .../entity/monster/EntityBlaze.edit.java | 12 +- .../entity/monster/EntityCreeper.edit.java | 10 +- .../entity/monster/EntityEnderman.edit.java | 32 +- .../entity/monster/EntityEndermite.edit.java | 6 +- .../entity/monster/EntityGhast.edit.java | 16 +- .../entity/monster/EntityGuardian.edit.java | 50 +-- .../entity/monster/EntityIronGolem.edit.java | 18 +- .../entity/monster/EntityMob.edit.java | 2 +- .../entity/monster/EntityPigZombie.edit.java | 16 +- .../entity/monster/EntitySilverfish.edit.java | 14 +- .../entity/monster/EntitySkeleton.edit.java | 18 +- .../entity/monster/EntitySlime.edit.java | 10 +- .../entity/monster/EntitySnowman.edit.java | 10 +- .../entity/monster/EntitySpider.edit.java | 16 +- .../entity/monster/EntityWitch.edit.java | 14 +- .../entity/monster/EntityZombie.edit.java | 32 +- .../entity/passive/EntityBat.edit.java | 6 +- .../entity/passive/EntityChicken.edit.java | 4 +- .../entity/passive/EntityCow.edit.java | 4 +- .../entity/passive/EntityHorse.edit.java | 38 +-- .../entity/passive/EntityMooshroom.edit.java | 4 +- .../entity/passive/EntityOcelot.edit.java | 16 +- .../entity/passive/EntityPig.edit.java | 16 +- .../entity/passive/EntityRabbit.edit.java | 32 +- .../entity/passive/EntitySheep.edit.java | 18 +- .../entity/passive/EntitySquid.edit.java | 10 +- .../entity/passive/EntityTameable.edit.java | 16 +- .../entity/passive/EntityVillager.edit.java | 54 ++-- .../entity/passive/EntityWolf.edit.java | 16 +- .../entity/player/EntityPlayer.edit.java | 56 ++-- .../entity/player/InventoryPlayer.edit.java | 2 +- .../entity/projectile/EntityArrow.edit.java | 10 +- .../entity/projectile/EntityEgg.edit.java | 4 +- .../projectile/EntityFireball.edit.java | 2 +- .../projectile/EntityFishHook.edit.java | 22 +- .../projectile/EntityLargeFireball.edit.java | 6 +- .../entity/projectile/EntityPotion.edit.java | 8 +- .../projectile/EntitySmallFireball.edit.java | 6 +- .../projectile/EntitySnowball.edit.java | 2 +- .../projectile/EntityThrowable.edit.java | 8 +- .../projectile/EntityWitherSkull.edit.java | 6 +- .../net/minecraft/event/ClickEvent.edit.java | 2 +- .../net/minecraft/event/HoverEvent.edit.java | 2 +- .../net/minecraft/init/Blocks.edit.java | 4 +- .../net/minecraft/init/Bootstrap.edit.java | 38 +-- .../net/minecraft/init/Items.edit.java | 4 +- .../minecraft/inventory/Container.edit.java | 6 +- .../inventory/ContainerBeacon.edit.java | 2 +- .../inventory/ContainerEnchantment.edit.java | 14 +- .../inventory/ContainerMerchant.edit.java | 2 +- .../inventory/ContainerPlayer.edit.java | 8 +- .../inventory/ContainerRepair.edit.java | 8 +- .../inventory/ContainerWorkbench.edit.java | 2 +- .../inventory/InventoryBasic.edit.java | 4 +- .../inventory/InventoryHelper.edit.java | 4 +- .../inventory/SlotFurnaceOutput.edit.java | 10 +- .../net/minecraft/item/Item.edit.java | 8 +- .../minecraft/item/ItemAppleGold.edit.java | 6 +- .../net/minecraft/item/ItemArmor.edit.java | 4 +- .../minecraft/item/ItemArmorStand.edit.java | 10 +- .../net/minecraft/item/ItemAxe.edit.java | 8 +- .../net/minecraft/item/ItemBanner.edit.java | 10 +- .../net/minecraft/item/ItemBed.edit.java | 6 +- .../net/minecraft/item/ItemBlock.edit.java | 4 +- .../net/minecraft/item/ItemBoat.edit.java | 4 +- .../net/minecraft/item/ItemBow.edit.java | 2 +- .../net/minecraft/item/ItemBucket.edit.java | 2 +- .../minecraft/item/ItemBucketMilk.edit.java | 2 +- .../item/ItemCarrotOnAStick.edit.java | 4 +- .../net/minecraft/item/ItemCoal.edit.java | 2 +- .../minecraft/item/ItemDoublePlant.edit.java | 2 +- .../net/minecraft/item/ItemDye.edit.java | 6 +- .../minecraft/item/ItemEditableBook.edit.java | 8 +- .../net/minecraft/item/ItemEgg.edit.java | 2 +- .../item/ItemEnchantedBook.edit.java | 6 +- .../net/minecraft/item/ItemEnderEye.edit.java | 8 +- .../minecraft/item/ItemEnderPearl.edit.java | 4 +- .../minecraft/item/ItemExpBottle.edit.java | 4 +- .../net/minecraft/item/ItemFireball.edit.java | 4 +- .../net/minecraft/item/ItemFirework.edit.java | 12 +- .../item/ItemFireworkCharge.edit.java | 2 +- .../net/minecraft/item/ItemFishFood.edit.java | 4 +- .../minecraft/item/ItemFishingRod.edit.java | 2 +- .../net/minecraft/item/ItemFood.edit.java | 2 +- .../item/ItemHangingEntity.edit.java | 2 +- .../net/minecraft/item/ItemHoe.edit.java | 2 +- .../net/minecraft/item/ItemLead.edit.java | 2 +- .../net/minecraft/item/ItemMap.edit.java | 8 +- .../net/minecraft/item/ItemMinecart.edit.java | 2 +- .../item/ItemMonsterPlacer.edit.java | 8 +- .../minecraft/item/ItemMultiTexture.edit.java | 2 +- .../net/minecraft/item/ItemPickaxe.edit.java | 8 +- .../net/minecraft/item/ItemPotion.edit.java | 18 +- .../net/minecraft/item/ItemRecord.edit.java | 6 +- .../net/minecraft/item/ItemSign.edit.java | 8 +- .../net/minecraft/item/ItemSkull.edit.java | 14 +- .../net/minecraft/item/ItemSlab.edit.java | 2 +- .../net/minecraft/item/ItemSnowball.edit.java | 2 +- .../net/minecraft/item/ItemSpade.edit.java | 8 +- .../net/minecraft/item/ItemStack.edit.java | 14 +- .../net/minecraft/item/ItemSword.edit.java | 2 +- .../net/minecraft/item/ItemTool.edit.java | 4 +- .../item/crafting/CraftingManager.edit.java | 8 +- .../item/crafting/FurnaceRecipes.edit.java | 6 +- .../item/crafting/RecipeFireworks.edit.java | 4 +- .../item/crafting/RecipeRepairItem.edit.java | 4 +- .../item/crafting/RecipesArmorDyes.edit.java | 4 +- .../item/crafting/RecipesIngots.edit.java | 4 +- .../item/crafting/RecipesTools.edit.java | 4 +- .../item/crafting/RecipesWeapons.edit.java | 4 +- .../item/crafting/ShapelessRecipes.edit.java | 6 +- .../nbt/CompressedStreamTools.edit.java | 10 +- .../net/minecraft/nbt/JsonToNBT.edit.java | 4 +- .../minecraft/nbt/NBTTagCompound.edit.java | 8 +- .../net/minecraft/nbt/NBTTagList.edit.java | 4 +- .../net/minecraft/nbt/NBTUtil.edit.java | 20 +- .../network/EnumConnectionState.edit.java | 8 +- .../minecraft/network/PacketBuffer.edit.java | 48 +-- .../network/ServerStatusResponse.edit.java | 40 +-- .../client/C00PacketLoginStart.edit.java | 4 +- .../C01PacketEncryptionResponse.edit.java | 8 +- .../S01PacketEncryptionRequest.edit.java | 12 +- .../server/S02PacketLoginSuccess.edit.java | 6 +- .../client/C14PacketTabComplete.edit.java | 2 +- .../client/C17PacketCustomPayload.edit.java | 2 +- .../play/client/C18PacketSpectate.edit.java | 8 +- .../server/S0CPacketSpawnPlayer.edit.java | 4 +- .../S20PacketEntityProperties.edit.java | 4 +- .../play/server/S21PacketChunkData.edit.java | 8 +- .../server/S26PacketMapChunkBulk.edit.java | 2 +- .../play/server/S27PacketExplosion.edit.java | 2 +- .../server/S29PacketSoundEffect.edit.java | 2 +- .../play/server/S37PacketStatistics.edit.java | 2 +- .../server/S38PacketPlayerListItem.edit.java | 6 +- .../play/server/S3EPacketTeams.edit.java | 2 +- .../server/S3FPacketCustomPayload.edit.java | 2 +- .../server/S00PacketServerInfo.edit.java | 10 +- .../net/minecraft/potion/Potion.edit.java | 10 +- .../minecraft/potion/PotionEffect.edit.java | 2 +- .../minecraft/potion/PotionHelper.edit.java | 2 +- .../net/minecraft/profiler/Profiler.edit.java | 4 +- .../minecraft/scoreboard/GoalColor.edit.java | 2 +- .../IScoreObjectiveCriteria.edit.java | 4 +- .../net/minecraft/scoreboard/Score.edit.java | 2 +- .../scoreboard/ScoreDummyCriteria.edit.java | 2 +- .../scoreboard/ScoreHealthCriteria.edit.java | 2 +- .../scoreboard/ScorePlayerTeam.edit.java | 2 +- .../minecraft/scoreboard/Scoreboard.edit.java | 10 +- .../scoreboard/ScoreboardSaveData.edit.java | 4 +- .../net/minecraft/scoreboard/Team.edit.java | 2 +- .../management/LowerStringMap.edit.java | 6 +- .../minecraft/stats/AchievementList.edit.java | 8 +- .../net/minecraft/stats/StatBase.edit.java | 2 +- .../minecraft/stats/StatFileWriter.edit.java | 6 +- .../net/minecraft/stats/StatList.edit.java | 6 +- .../tileentity/MobSpawnerBaseLogic.edit.java | 10 +- .../minecraft/tileentity/TileEntity.edit.java | 16 +- .../tileentity/TileEntityBanner.edit.java | 18 +- .../tileentity/TileEntityBeacon.edit.java | 10 +- .../TileEntityBrewingStand.edit.java | 6 +- .../tileentity/TileEntityChest.edit.java | 6 +- .../TileEntityCommandBlock.edit.java | 4 +- .../TileEntityDaylightDetector.edit.java | 2 +- .../tileentity/TileEntityDispenser.edit.java | 4 +- .../TileEntityEnchantmentTable.edit.java | 4 +- .../tileentity/TileEntityFurnace.edit.java | 8 +- .../tileentity/TileEntityHopper.edit.java | 12 +- .../tileentity/TileEntityPiston.edit.java | 4 +- .../tileentity/TileEntitySign.edit.java | 22 +- .../tileentity/TileEntitySkull.edit.java | 6 +- .../net/minecraft/util/BlockPos.edit.java | 10 +- .../net/minecraft/util/Cartesian.edit.java | 6 +- .../util/ChatComponentProcessor.edit.java | 2 +- .../util/ChatComponentScore.edit.java | 2 +- .../util/ChatComponentStyle.edit.java | 2 +- .../util/ChatComponentTranslation.edit.java | 8 +- ...ponentTranslationFormatException.edit.java | 6 +- .../net/minecraft/util/ChatStyle.edit.java | 48 +-- .../util/ClassInheritanceMultiMap.edit.java | 6 +- .../minecraft/util/CombatTracker.edit.java | 4 +- .../util/EnchantmentNameParts.edit.java | 2 +- .../util/EnumChatFormatting.edit.java | 2 +- .../net/minecraft/util/EnumFacing.edit.java | 6 +- .../util/EnumParticleTypes.edit.java | 2 +- .../minecraft/util/IChatComponent.edit.java | 86 +++--- .../util/IJsonSerializable.edit.java | 4 +- .../minecraft/util/IThreadListener.edit.java | 2 +- .../util/JsonSerializableSet.edit.java | 8 +- .../util/LoggingPrintStream.edit.java | 12 +- .../net/minecraft/util/MapPopulator.edit.java | 4 +- .../net/minecraft/util/MathHelper.edit.java | 10 +- .../util/ObjectIntIdentityMap.edit.java | 6 +- .../util/RegistryNamespaced.edit.java | 4 +- .../minecraft/util/RegistrySimple.edit.java | 6 +- .../minecraft/util/ScreenShotHelper.edit.java | 6 +- .../net/minecraft/util/Session.edit.java | 16 +- .../minecraft/util/StringTranslate.edit.java | 16 +- .../net/minecraft/util/Util.edit.java | 2 +- .../net/minecraft/util/Vec3i.edit.java | 2 +- .../minecraft/util/WeightedRandom.edit.java | 4 +- .../util/WeightedRandomChestContent.edit.java | 8 +- .../util/WeightedRandomFishable.edit.java | 4 +- .../village/MerchantRecipeList.edit.java | 2 +- .../net/minecraft/world/Explosion.edit.java | 8 +- .../net/minecraft/world/World.edit.java | 66 ++-- .../minecraft/world/WorldProvider.edit.java | 12 +- .../world/WorldProviderEnd.edit.java | 4 +- .../world/WorldProviderHell.edit.java | 6 +- .../world/biome/BiomeGenBase.edit.java | 36 +-- .../world/biome/BiomeGenBeach.edit.java | 2 +- .../world/biome/BiomeGenDesert.edit.java | 6 +- .../world/biome/BiomeGenEnd.edit.java | 2 +- .../world/biome/BiomeGenForest.edit.java | 14 +- .../world/biome/BiomeGenHills.edit.java | 12 +- .../world/biome/BiomeGenJungle.edit.java | 12 +- .../world/biome/BiomeGenMesa.edit.java | 16 +- .../biome/BiomeGenMushroomIsland.edit.java | 2 +- .../world/biome/BiomeGenMutated.edit.java | 10 +- .../world/biome/BiomeGenOcean.edit.java | 4 +- .../world/biome/BiomeGenPlains.edit.java | 8 +- .../world/biome/BiomeGenSavanna.edit.java | 22 +- .../world/biome/BiomeGenSnow.edit.java | 6 +- .../world/biome/BiomeGenStoneBeach.edit.java | 2 +- .../world/biome/BiomeGenSwamp.edit.java | 14 +- .../world/biome/BiomeGenTaiga.edit.java | 16 +- .../world/border/WorldBorder.edit.java | 4 +- .../net/minecraft/world/chunk/Chunk.edit.java | 40 +-- .../world/chunk/EmptyChunk.edit.java | 6 +- .../world/chunk/IChunkProvider.edit.java | 2 +- .../world/gen/FlatGeneratorInfo.edit.java | 6 +- .../gen/NoiseGeneratorImproved.edit.java | 4 +- .../world/gen/NoiseGeneratorOctaves.edit.java | 4 +- .../world/gen/NoiseGeneratorPerlin.edit.java | 2 +- .../world/gen/NoiseGeneratorSimplex.edit.java | 4 +- .../world/storage/ISaveHandler.edit.java | 6 +- .../minecraft/world/storage/MapData.edit.java | 2 +- .../world/storage/MapStorage.edit.java | 14 +- .../world/storage/SaveHandlerMP.edit.java | 8 +- .../world/storage/WorldInfo.edit.java | 16 +- .../assets/minecraft/lang/en_US.edit.lang | 6 +- 701 files changed, 3835 insertions(+), 3747 deletions(-) diff --git a/buildtools/BuildTools.jar b/buildtools/BuildTools.jar index 20885f5670bb8e6c1c0b877e55e9f25735cc3b24..9ab1a21c18a7870b38ba4cc88a51c0f36002364d 100644 GIT binary patch delta 53063 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"PY<94>*gH1%HfnH^ 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 diff --git a/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/gui/CompileLatestClientFrame.java b/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/gui/CompileLatestClientFrame.java index 0502d4d..4d8c4d4 100644 --- a/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/gui/CompileLatestClientFrame.java +++ b/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/gui/CompileLatestClientFrame.java @@ -45,6 +45,9 @@ import java.net.URL; import java.nio.charset.StandardCharsets; import java.awt.event.ActionEvent; import javax.swing.event.HyperlinkListener; +import javax.swing.text.BadLocationException; +import javax.swing.text.Element; +import javax.swing.text.html.HTMLDocument; import net.lax1dude.eaglercraft.v1_8.buildtools.gui.TeaVMBinaries.MissingJARsException; import net.lax1dude.eaglercraft.v1_8.buildtools.task.init.FFMPEG; @@ -1155,7 +1158,7 @@ public class CompileLatestClientFrame { txtpnLogOutput.setAutoscrolls(false); txtpnLogOutput.setMargin(new Insets(10, 10, 10, 10)); txtpnLogOutput.setContentType("text/html"); - txtpnLogOutput.setText("shit"); + txtpnLogOutput.setText("shit
");
 		txtpnLogOutput.setEditable(false);
 		scrollPane.setViewportView(txtpnLogOutput);
 		
@@ -1192,18 +1195,30 @@ public class CompileLatestClientFrame {
 		panel_29.setLayout(null);
 	}
 
-	private final StringBuilder logAccum = new StringBuilder();
+	private StringBuilder logAccumPrev = new StringBuilder();
+	private StringBuilder logAccum = new StringBuilder();
+	private Element logAccumBody = null;
 	private volatile boolean logDirty = false;
 	private volatile boolean isError = false;
 
 	public void logInfo(String line) {
 		line = htmlentities2(line);
 		synchronized(logAccum) {
-			if(isError) {
-				isError = false;
-				logAccum.append("
");
+			if(logAccum.length() > 0) {
+				if(isError) {
+					isError = false;
+					logAccum.append("
");
+				}
+				logAccum.append(line);
+			}else {
+				if(isError) {
+					isError = false;
+					logAccum.append("
");
+					logAccum.append(line);
+				}else {
+					logAccumPrev.append(line);
+				}
 			}
-			logAccum.append(line);
 			logDirty = true;
 		}
 	}
@@ -1211,11 +1226,21 @@ public class CompileLatestClientFrame {
 	public void logError(String line) {
 		line = htmlentities2(line);
 		synchronized(logAccum) {
-			if(!isError) {
-				isError = true;
-				logAccum.append("
");
+			if(logAccum.length() > 0) {
+				if(!isError) {
+					isError = true;
+					logAccum.append("
");
+				}
+				logAccum.append(line);
+			}else {
+				if(!isError) {
+					isError = true;
+					logAccum.append("
");
+					logAccum.append(line);
+				}else {
+					logAccumPrev.append(line);
+				}
 			}
-			logAccum.append(line);
 			logDirty = true;
 		}
 	}
@@ -1226,12 +1251,31 @@ public class CompileLatestClientFrame {
 			public void run() {
 				while(true) {
 					try {
-						Thread.sleep(150l);
+						Thread.sleep(100l);
 						synchronized(logAccum) {
 							if(logDirty) {
 								EventQueue.invokeAndWait(new Runnable() {
 									public void run() {
-										txtpnLogOutput.setText("shit
" + logAccum + "
");
+										HTMLDocument ee = ((HTMLDocument)txtpnLogOutput.getDocument());
+										if(logAccumBody == null) {
+											logAccumBody = ee.getElement("logContainer");
+										}
+										if(logAccumPrev.length() > 0) {
+											try {
+												ee.insertString(logAccumBody.getElement(logAccumBody.getElementCount() - 1).getEndOffset() - 1, logAccumPrev.toString(), null);
+											} catch (BadLocationException e) {
+											}
+											logAccumPrev = new StringBuilder();
+										}
+										if(logAccum.length() > 0) {
+											logAccum.append("
");
+											try {
+												ee.insertBeforeEnd(logAccumBody, logAccum.toString());
+											} catch (BadLocationException e) {
+											} catch (IOException e) {
+											}
+											logAccum = new StringBuilder();
+										}
 									}
 								});
 								EventQueue.invokeAndWait(new Runnable() {
diff --git a/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/diff/EaglerContextRedacted.java b/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/diff/EaglerContextRedacted.java
index 9cf6d39..dd420c2 100644
--- a/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/diff/EaglerContextRedacted.java
+++ b/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/diff/EaglerContextRedacted.java
@@ -41,7 +41,9 @@ public class EaglerContextRedacted {
 		output.println("# Version: 1.0");
 		output.println("# Author: lax1dude");
 		output.println();
-		
+
+		int lastSourcePos = 0;
+		int lastTargetPos = 0;
 		List> deltas = patch.getDeltas();
 		delta_itr: for(int i = 0, l = deltas.size(); i < l; ++i) {
 			AbstractDelta delta = deltas.get(i);
@@ -72,13 +74,17 @@ public class EaglerContextRedacted {
 			int sourcePos = source.getPosition();
 			int sourceLen = source.getLines().size();
 			
+			int sourcePosRelative = sourcePos - lastSourcePos;
+			
 			Chunk target = delta.getTarget();
 			int targetPos = target.getPosition();
 			List linesToWrite = target.getLines();
 			int targetLen = linesToWrite.size();
 			
-			output.println(blockType + "  " + targetPos + (targetLen > 0 ? " : " + (targetPos + targetLen) : "") + "  @  "
-					+ sourcePos + (sourceLen > 0 ? " : " + (sourcePos + sourceLen) : ""));
+			int targetPosRelative = targetPos - lastTargetPos;
+			
+			output.println(blockType + "  " + targetPosRelative + (targetLen > 0 ? " : " + (targetPosRelative + targetLen) : "") + "  @  "
+					+ sourcePosRelative + (sourceLen > 0 ? " : " + (sourcePosRelative + sourceLen) : ""));
 			
 			output.println();
 			
@@ -89,6 +95,9 @@ public class EaglerContextRedacted {
 				
 				output.println();
 			}
+			
+			lastSourcePos = sourcePos;
+			lastTargetPos = targetPos;
 		}
 		
 		output.println("> EOF");
@@ -104,6 +113,8 @@ public class EaglerContextRedacted {
 		int targetLen = 0;
 		List targetLines = null;
 		
+		int lastSourcePos = 0;
+		int lastTargetPos = 0;
 		String line;
 		readLinesLoop: while((line = reader.readLine()) != null) {
 			if(line.length() < 2) {
@@ -145,7 +156,9 @@ public class EaglerContextRedacted {
 				}
 				
 				if(currentDeltaType != null) {
-					newPatch.addDelta(makeDelta(currentDeltaType, sourceStart, sourceLen, targetStart, targetLen, context, targetLines));
+					lastSourcePos += sourceStart;
+					lastTargetPos += targetStart;
+					newPatch.addDelta(makeDelta(currentDeltaType, lastSourcePos, sourceLen, lastTargetPos, targetLen, context, targetLines));
 				}
 				
 				switch(split[0]) {
@@ -214,7 +227,9 @@ public class EaglerContextRedacted {
 		}
 		
 		if(currentDeltaType != null) {
-			newPatch.addDelta(makeDelta(currentDeltaType, sourceStart, sourceLen, targetStart, targetLen, context, targetLines));
+			lastSourcePos += sourceStart;
+			lastTargetPos += targetStart;
+			newPatch.addDelta(makeDelta(currentDeltaType, lastSourcePos, sourceLen, lastTargetPos, targetLen, context, targetLines));
 		}
 		
 		return newPatch;
diff --git a/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/init/DecompileMinecraft.java b/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/init/DecompileMinecraft.java
index f8faaee..7283bb6 100644
--- a/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/init/DecompileMinecraft.java
+++ b/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/init/DecompileMinecraft.java
@@ -209,6 +209,7 @@ public class DecompileMinecraft {
 			ApplyPatchesToZip.applyPatches(formatOut, null, new File(EaglerBuildTools.repositoryRoot, "patches/minecraft"), patchOut, true, true);
 		}catch(Throwable t) {
 			System.err.println("ERROR: Could not apply 'patches' directory to: " + patchOut.getName());
+			t.printStackTrace();
 			return false;
 		}
 		
diff --git a/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/util/JARSubprocess.java b/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/util/JARSubprocess.java
index ea2b79e..bc76460 100644
--- a/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/util/JARSubprocess.java
+++ b/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/util/JARSubprocess.java
@@ -5,6 +5,8 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Copyright (c) 2022 LAX1DUDE. All Rights Reserved.
@@ -27,6 +29,10 @@ public class JARSubprocess {
 		classPathSeperator = System.getProperty("os.name").toLowerCase().contains("windows") ? ';' : ':';
 	}
 
+	private static final List activeProcesses = new ArrayList();
+
+	private static boolean shutdownThreadStarted = false;
+
 	public static int runJava(File directory, String[] javaExeArguments, String logPrefix) throws IOException {
 		if(logPrefix.length() > 0 && !logPrefix.endsWith(" ")) {
 			logPrefix = logPrefix + " ";
@@ -60,6 +66,28 @@ public class JARSubprocess {
 		exec.directory(directory);
 		
 		Process ps = exec.start();
+		
+		synchronized(activeProcesses) {
+			if(!shutdownThreadStarted) {
+				Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
+					public void run() {
+						synchronized(activeProcesses) {
+							for(Process proc : activeProcesses) {
+								try {
+									if(proc.isAlive()) {
+										proc.destroy();
+									}
+								}catch(Throwable t) {
+								}
+							}
+						}
+					}
+				}, "Subprocess Exit Thread"));
+				shutdownThreadStarted = true;
+			}
+			activeProcesses.add(ps);
+		}
+		
 		InputStream is = ps.getInputStream();
 		InputStream ise = ps.getErrorStream();
 		BufferedReader isb = new BufferedReader(new InputStreamReader(is));
diff --git a/patches/minecraft/net/minecraft/block/Block.edit.java b/patches/minecraft/net/minecraft/block/Block.edit.java
index d807627..6f24d02 100644
--- a/patches/minecraft/net/minecraft/block/Block.edit.java
+++ b/patches/minecraft/net/minecraft/block/Block.edit.java
@@ -10,47 +10,47 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  14  @  144 : 146
+> DELETE  11  @  141 : 143
 
-> CHANGE  357 : 358  @  489 : 490
+> CHANGE  343 : 344  @  345 : 346
 
 ~ 	public void randomTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
 
-> CHANGE  361 : 362  @  493 : 494
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public void updateTick(World var1, BlockPos var2, IBlockState var3, EaglercraftRandom var4) {
 
-> CHANGE  364 : 365  @  496 : 497
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 	public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom rand) {
 
-> CHANGE  383 : 384  @  515 : 516
+> CHANGE  19 : 20  @  19 : 20
 
 ~ 	public int quantityDropped(EaglercraftRandom random) {
 
-> CHANGE  387 : 388  @  519 : 520
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
-> DELETE  403  @  535 : 537
+> DELETE  16  @  16 : 18
 
-> DELETE  404  @  538 : 548
+> DELETE  1  @  3 : 13
 
-> CHANGE  407 : 408  @  551 : 561
+> CHANGE  3 : 4  @  13 : 23
 
 ~ 
 
-> DELETE  411  @  564 : 572
+> DELETE  4  @  13 : 21
 
-> CHANGE  663 : 664  @  824 : 825
+> CHANGE  252 : 253  @  260 : 261
 
 ~ 	public int quantityDroppedWithBonus(int fortune, EaglercraftRandom random) {
 
-> INSERT  800 : 801  @  961
+> INSERT  137 : 138  @  137
 
 + 		bootstrapStates();
 
-> INSERT  1269 : 1309  @  1429
+> INSERT  469 : 509  @  468
 
 + 	public static void bootstrapStates() {
 + 		BlockBed.bootstrapStates();
diff --git a/patches/minecraft/net/minecraft/block/BlockAnvil.edit.java b/patches/minecraft/net/minecraft/block/BlockAnvil.edit.java
index 905467a..af8af98 100644
--- a/patches/minecraft/net/minecraft/block/BlockAnvil.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockAnvil.edit.java
@@ -9,9 +9,9 @@
 
 ~ 
 
-> DELETE  55  @  55 : 64
+> DELETE  52  @  52 : 61
 
-> INSERT  96 : 101  @  105
+> INSERT  41 : 46  @  50
 
 + 	public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn,
 + 			EnumFacing side, float hitX, float hitY, float hitZ) {
diff --git a/patches/minecraft/net/minecraft/block/BlockBanner.edit.java b/patches/minecraft/net/minecraft/block/BlockBanner.edit.java
index b19e9a1..45d1f7f 100644
--- a/patches/minecraft/net/minecraft/block/BlockBanner.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockBanner.edit.java
@@ -10,7 +10,7 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  68 : 69  @  69 : 70
+> CHANGE  66 : 67  @  67 : 68
 
 ~ 	public Item getItemDropped(IBlockState state, EaglercraftRandom rand, int fortune) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockBasePressurePlate.edit.java b/patches/minecraft/net/minecraft/block/BlockBasePressurePlate.edit.java
index a96e28b..e9058be 100644
--- a/patches/minecraft/net/minecraft/block/BlockBasePressurePlate.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockBasePressurePlate.edit.java
@@ -10,18 +10,18 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  8  @  9 : 10
+> DELETE  6  @  7 : 8
 
-> CHANGE  81 : 82  @  83 : 84
+> CHANGE  73 : 74  @  74 : 75
 
 ~ 	public void randomTick(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom random) {
 
-> CHANGE  84 : 85  @  86 : 92
+> CHANGE  3 : 4  @  3 : 9
 
 ~ 	public void updateTick(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom rand) {
 
-> DELETE  86  @  93 : 94
+> DELETE  2  @  7 : 8
 
-> DELETE  88  @  96 : 106
+> DELETE  2  @  3 : 13
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockBeacon.edit.java b/patches/minecraft/net/minecraft/block/BlockBeacon.edit.java
index 8396096..2377fdc 100644
--- a/patches/minecraft/net/minecraft/block/BlockBeacon.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockBeacon.edit.java
@@ -7,18 +7,18 @@
 
 > DELETE  2  @  2 : 4
 
-> DELETE  8  @  10 : 11
+> DELETE  6  @  8 : 9
 
-> DELETE  9  @  12 : 13
+> DELETE  1  @  2 : 3
 
-> DELETE  14  @  18 : 19
+> DELETE  5  @  6 : 7
 
-> DELETE  15  @  20 : 22
+> DELETE  1  @  2 : 4
 
-> CHANGE  29 : 30  @  36 : 47
+> CHANGE  14 : 15  @  16 : 27
 
 ~ 		return true;
 
-> DELETE  69  @  86 : 115
+> DELETE  40  @  50 : 79
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockBed.edit.java b/patches/minecraft/net/minecraft/block/BlockBed.edit.java
index e84a973..cf7c12c 100644
--- a/patches/minecraft/net/minecraft/block/BlockBed.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockBed.edit.java
@@ -10,32 +10,32 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  10  @  11 : 12
+> DELETE  8  @  9 : 10
 
-> DELETE  14  @  16 : 17
+> DELETE  4  @  5 : 6
 
-> DELETE  19  @  22 : 23
+> DELETE  5  @  6 : 7
 
-> CHANGE  21 : 22  @  25 : 27
+> CHANGE  2 : 3  @  3 : 5
 
 ~ 	public static PropertyEnum PART;
 
-> INSERT  31 : 35  @  36
+> INSERT  10 : 14  @  11
 
 + 	public static void bootstrapStates() {
 + 		PART = PropertyEnum.create("part", BlockBed.EnumPartType.class);
 + 	}
 + 
 
-> CHANGE  37 : 38  @  38 : 90
+> CHANGE  6 : 7  @  2 : 54
 
 ~ 		return true;
 
-> DELETE  40  @  92 : 102
+> DELETE  3  @  54 : 64
 
-> DELETE  60  @  122 : 125
+> DELETE  20  @  30 : 33
 
-> CHANGE  64 : 65  @  129 : 130
+> CHANGE  4 : 5  @  7 : 8
 
 ~ 	public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockBookshelf.edit.java b/patches/minecraft/net/minecraft/block/BlockBookshelf.edit.java
index 186bed9..a09f2ab 100644
--- a/patches/minecraft/net/minecraft/block/BlockBookshelf.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockBookshelf.edit.java
@@ -10,11 +10,11 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  16 : 17  @  16 : 17
+> CHANGE  14 : 15  @  14 : 15
 
 ~ 	public int quantityDropped(EaglercraftRandom var1) {
 
-> CHANGE  20 : 21  @  20 : 21
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockBrewingStand.edit.java b/patches/minecraft/net/minecraft/block/BlockBrewingStand.edit.java
index 2051c16..f1aeefa 100644
--- a/patches/minecraft/net/minecraft/block/BlockBrewingStand.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockBrewingStand.edit.java
@@ -10,17 +10,17 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  18  @  18 : 19
+> DELETE  15  @  15 : 16
 
-> CHANGE  73 : 74  @  74 : 85
+> CHANGE  55 : 56  @  56 : 67
 
 ~ 		return true;
 
-> CHANGE  87 : 88  @  98 : 99
+> CHANGE  14 : 15  @  24 : 25
 
 ~ 	public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {
 
-> CHANGE  103 : 104  @  114 : 115
+> CHANGE  16 : 17  @  16 : 17
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockBush.edit.java b/patches/minecraft/net/minecraft/block/BlockBush.edit.java
index 9ea83c5..6ba0ac3 100644
--- a/patches/minecraft/net/minecraft/block/BlockBush.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockBush.edit.java
@@ -10,7 +10,7 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  45 : 46  @  45 : 46
+> CHANGE  43 : 44  @  43 : 44
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockButton.edit.java b/patches/minecraft/net/minecraft/block/BlockButton.edit.java
index a25eee9..e59f59e 100644
--- a/patches/minecraft/net/minecraft/block/BlockButton.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockButton.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 5
 
-> DELETE  9  @  12 : 13
+> DELETE  7  @  10 : 11
 
-> DELETE  11  @  15 : 16
+> DELETE  2  @  3 : 4
 
-> DELETE  164  @  169 : 189
+> DELETE  153  @  154 : 174
 
-> DELETE  171  @  196 : 236
+> DELETE  7  @  27 : 67
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockCactus.edit.java b/patches/minecraft/net/minecraft/block/BlockCactus.edit.java
index cd32eb2..276cfad 100644
--- a/patches/minecraft/net/minecraft/block/BlockCactus.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockCactus.edit.java
@@ -10,7 +10,7 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  29 : 30  @  29 : 30
+> CHANGE  27 : 28  @  27 : 28
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockCake.edit.java b/patches/minecraft/net/minecraft/block/BlockCake.edit.java
index 6ac5c2b..4387bf3 100644
--- a/patches/minecraft/net/minecraft/block/BlockCake.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockCake.edit.java
@@ -10,11 +10,11 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  103 : 104  @  103 : 104
+> CHANGE  101 : 102  @  101 : 102
 
 ~ 	public int quantityDropped(EaglercraftRandom var1) {
 
-> CHANGE  107 : 108  @  107 : 108
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockCauldron.edit.java b/patches/minecraft/net/minecraft/block/BlockCauldron.edit.java
index 731d368..98f9ce6 100644
--- a/patches/minecraft/net/minecraft/block/BlockCauldron.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockCauldron.edit.java
@@ -10,19 +10,19 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  12  @  12 : 13
+> DELETE  9  @  9 : 10
 
-> DELETE  13  @  14 : 15
+> DELETE  1  @  2 : 3
 
-> DELETE  15  @  17 : 22
+> DELETE  2  @  3 : 8
 
-> DELETE  57  @  64 : 74
+> DELETE  42  @  47 : 57
 
-> CHANGE  59 : 60  @  76 : 164
+> CHANGE  2 : 3  @  12 : 100
 
 ~ 		return true;
 
-> CHANGE  77 : 78  @  181 : 182
+> CHANGE  18 : 19  @  105 : 106
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockChest.edit.java b/patches/minecraft/net/minecraft/block/BlockChest.edit.java
index 998bd2f..cf1b3f2 100644
--- a/patches/minecraft/net/minecraft/block/BlockChest.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockChest.edit.java
@@ -7,13 +7,13 @@
 
 > DELETE  2  @  2 : 4
 
-> DELETE  17  @  19 : 20
+> DELETE  15  @  17 : 18
 
-> CHANGE  131 : 132  @  134 : 206
+> CHANGE  114 : 115  @  115 : 187
 
 ~ 		return state;
 
-> CHANGE  249 : 250  @  323 : 338
+> CHANGE  118 : 119  @  189 : 204
 
 ~ 		return true;
 
diff --git a/patches/minecraft/net/minecraft/block/BlockClay.edit.java b/patches/minecraft/net/minecraft/block/BlockClay.edit.java
index f2c7ae4..58f1b5f 100644
--- a/patches/minecraft/net/minecraft/block/BlockClay.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockClay.edit.java
@@ -10,11 +10,11 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  16 : 17  @  16 : 17
+> CHANGE  14 : 15  @  14 : 15
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
-> CHANGE  20 : 21  @  20 : 21
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public int quantityDropped(EaglercraftRandom var1) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockCocoa.edit.java b/patches/minecraft/net/minecraft/block/BlockCocoa.edit.java
index e850a74..83ec79e 100644
--- a/patches/minecraft/net/minecraft/block/BlockCocoa.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockCocoa.edit.java
@@ -10,15 +10,15 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  32 : 33  @  35 : 36
+> CHANGE  30 : 31  @  33 : 34
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {
 
-> CHANGE  150 : 151  @  153 : 154
+> CHANGE  118 : 119  @  118 : 119
 
 ~ 	public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) {
 
-> CHANGE  154 : 155  @  157 : 158
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public void grow(World world, EaglercraftRandom var2, BlockPos blockpos, IBlockState iblockstate) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockCommandBlock.edit.java b/patches/minecraft/net/minecraft/block/BlockCommandBlock.edit.java
index b68026d..3b76de9 100644
--- a/patches/minecraft/net/minecraft/block/BlockCommandBlock.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockCommandBlock.edit.java
@@ -10,13 +10,13 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  32 : 33  @  33 : 48
+> CHANGE  30 : 31  @  31 : 46
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) {
 
-> DELETE  73  @  88 : 92
+> DELETE  41  @  55 : 59
 
-> CHANGE  76 : 77  @  95 : 96
+> CHANGE  3 : 4  @  7 : 8
 
 ~ 	public int quantityDropped(EaglercraftRandom var1) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockCrops.edit.java b/patches/minecraft/net/minecraft/block/BlockCrops.edit.java
index 56377ea..039c5d1 100644
--- a/patches/minecraft/net/minecraft/block/BlockCrops.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockCrops.edit.java
@@ -10,21 +10,21 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  12  @  15 : 16
+> DELETE  10  @  13 : 14
 
-> CHANGE  34 : 35  @  38 : 39
+> CHANGE  22 : 23  @  23 : 24
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
 
-> CHANGE  116 : 117  @  120 : 138
+> CHANGE  82 : 83  @  82 : 100
 
 ~ 	public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) {
 
-> CHANGE  128 : 129  @  149 : 150
+> CHANGE  12 : 13  @  29 : 30
 
 ~ 	public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) {
 
-> CHANGE  132 : 133  @  153 : 154
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public void grow(World world, EaglercraftRandom var2, BlockPos blockpos, IBlockState iblockstate) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockDaylightDetector.edit.java b/patches/minecraft/net/minecraft/block/BlockDaylightDetector.edit.java
index a65d6c5..b0e9919 100644
--- a/patches/minecraft/net/minecraft/block/BlockDaylightDetector.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockDaylightDetector.edit.java
@@ -10,11 +10,11 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  70 : 71  @  70 : 86
+> CHANGE  67 : 68  @  67 : 83
 
 ~ 			return true;
 
-> CHANGE  76 : 77  @  91 : 92
+> CHANGE  6 : 7  @  21 : 22
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockDeadBush.edit.java b/patches/minecraft/net/minecraft/block/BlockDeadBush.edit.java
index cbca6fb..e16b085 100644
--- a/patches/minecraft/net/minecraft/block/BlockDeadBush.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockDeadBush.edit.java
@@ -10,16 +10,16 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  7  @  8 : 9
+> DELETE  5  @  6 : 7
 
-> DELETE  8  @  10 : 11
+> DELETE  1  @  2 : 3
 
-> DELETE  9  @  12 : 15
+> DELETE  1  @  2 : 5
 
-> CHANGE  32 : 33  @  38 : 39
+> CHANGE  23 : 24  @  26 : 27
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
-> DELETE  36  @  42 : 53
+> DELETE  4  @  4 : 15
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockDirt.edit.java b/patches/minecraft/net/minecraft/block/BlockDirt.edit.java
index 4908a9a..d292055 100644
--- a/patches/minecraft/net/minecraft/block/BlockDirt.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockDirt.edit.java
@@ -9,11 +9,11 @@
 
 ~ 
 
-> CHANGE  21 : 22  @  21 : 23
+> CHANGE  18 : 19  @  18 : 20
 
 ~ 	public static PropertyEnum VARIANT;
 
-> INSERT  31 : 35  @  32
+> INSERT  10 : 14  @  11
 
 + 	public static void bootstrapStates() {
 + 		VARIANT = PropertyEnum.create("variant", BlockDirt.DirtType.class);
diff --git a/patches/minecraft/net/minecraft/block/BlockDispenser.edit.java b/patches/minecraft/net/minecraft/block/BlockDispenser.edit.java
index 829fb08..5840efb 100644
--- a/patches/minecraft/net/minecraft/block/BlockDispenser.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockDispenser.edit.java
@@ -10,20 +10,20 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  22  @  25 : 26
+> DELETE  20  @  23 : 24
 
-> DELETE  24  @  28 : 29
+> DELETE  2  @  3 : 4
 
-> CHANGE  34 : 35  @  39 : 40
+> CHANGE  10 : 11  @  11 : 12
 
 ~ 	protected EaglercraftRandom rand = new EaglercraftRandom();
 
-> DELETE  47  @  52 : 81
+> DELETE  13  @  13 : 42
 
-> CHANGE  49 : 50  @  83 : 98
+> CHANGE  2 : 3  @  31 : 46
 
 ~ 		return true;
 
-> DELETE  87  @  135 : 142
+> DELETE  38  @  52 : 59
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockDoor.edit.java b/patches/minecraft/net/minecraft/block/BlockDoor.edit.java
index 743ee41..542506f 100644
--- a/patches/minecraft/net/minecraft/block/BlockDoor.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockDoor.edit.java
@@ -10,15 +10,15 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  29 : 30  @  29 : 31
+> CHANGE  27 : 28  @  27 : 29
 
 ~ 	public static PropertyEnum HINGE;
 
-> CHANGE  31 : 32  @  32 : 34
+> CHANGE  2 : 3  @  3 : 5
 
 ~ 	public static PropertyEnum HALF;
 
-> INSERT  40 : 45  @  42
+> INSERT  9 : 14  @  10
 
 + 	public static void bootstrapStates() {
 + 		HINGE = PropertyEnum.create("hinge", BlockDoor.EnumHingePosition.class);
@@ -26,11 +26,11 @@
 + 	}
 + 
 
-> CHANGE  180 : 181  @  177 : 182
+> CHANGE  140 : 141  @  135 : 140
 
 ~ 			if (!flag1) {
 
-> CHANGE  196 : 197  @  197 : 198
+> CHANGE  16 : 17  @  20 : 21
 
 ~ 	public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockDoublePlant.edit.java b/patches/minecraft/net/minecraft/block/BlockDoublePlant.edit.java
index aacdd19..e48f59a 100644
--- a/patches/minecraft/net/minecraft/block/BlockDoublePlant.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockDoublePlant.edit.java
@@ -10,14 +10,14 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  17  @  21 : 23
+> DELETE  14  @  18 : 20
 
-> CHANGE  25 : 27  @  31 : 35
+> CHANGE  8 : 10  @  10 : 14
 
 ~ 	public static PropertyEnum VARIANT;
 ~ 	public static PropertyEnum HALF;
 
-> INSERT  40 : 45  @  48
+> INSERT  15 : 20  @  17
 
 + 	public static void bootstrapStates() {
 + 		VARIANT = PropertyEnum.create("variant", BlockDoublePlant.EnumPlantType.class);
@@ -25,21 +25,21 @@
 + 	}
 + 
 
-> CHANGE  105 : 106  @  108 : 109
+> CHANGE  65 : 66  @  60 : 61
 
 ~ 	public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom random, int var3) {
 
-> DELETE  145  @  148 : 158
+> DELETE  40  @  40 : 50
 
-> DELETE  155  @  168 : 176
+> DELETE  10  @  20 : 28
 
-> DELETE  169  @  190 : 206
+> DELETE  14  @  22 : 38
 
-> CHANGE  186 : 187  @  223 : 224
+> CHANGE  17 : 18  @  33 : 34
 
 ~ 	public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) {
 
-> CHANGE  190 : 191  @  227 : 228
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public void grow(World world, EaglercraftRandom var2, BlockPos blockpos, IBlockState var4) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockDragonEgg.edit.java b/patches/minecraft/net/minecraft/block/BlockDragonEgg.edit.java
index 92baa02..132ce57 100644
--- a/patches/minecraft/net/minecraft/block/BlockDragonEgg.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockDragonEgg.edit.java
@@ -10,11 +10,11 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  30 : 31  @  31 : 32
+> CHANGE  28 : 29  @  29 : 30
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) {
 
-> CHANGE  75 : 88  @  76 : 94
+> CHANGE  45 : 58  @  45 : 63
 
 ~ 					for (int j = 0; j < 128; ++j) {
 ~ 						double d0 = worldIn.rand.nextDouble();
@@ -30,6 +30,6 @@
 ~ 						worldIn.spawnParticle(EnumParticleTypes.PORTAL, d1, d2, d3, (double) f, (double) f1,
 ~ 								(double) f2, new int[0]);
 
-> DELETE  89  @  95 : 96
+> DELETE  14  @  19 : 20
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockDynamicLiquid.edit.java b/patches/minecraft/net/minecraft/block/BlockDynamicLiquid.edit.java
index 5731989..87c1a02 100644
--- a/patches/minecraft/net/minecraft/block/BlockDynamicLiquid.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockDynamicLiquid.edit.java
@@ -9,15 +9,15 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 
-> CHANGE  5 : 6  @  5 : 8
+> CHANGE  2 : 3  @  2 : 5
 
 ~ 
 
-> CHANGE  26 : 27  @  28 : 29
+> CHANGE  21 : 22  @  23 : 24
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
 
-> CHANGE  102 : 103  @  104 : 105
+> CHANGE  76 : 77  @  76 : 77
 
 ~ 			Set set = this.getPossibleFlowDirections(world, blockpos);
 
diff --git a/patches/minecraft/net/minecraft/block/BlockEnchantmentTable.edit.java b/patches/minecraft/net/minecraft/block/BlockEnchantmentTable.edit.java
index 7e733a7..1368deb 100644
--- a/patches/minecraft/net/minecraft/block/BlockEnchantmentTable.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockEnchantmentTable.edit.java
@@ -10,11 +10,11 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  31 : 32  @  31 : 32
+> CHANGE  29 : 30  @  29 : 30
 
 ~ 	public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
 
-> CHANGE  75 : 76  @  75 : 85
+> CHANGE  44 : 45  @  44 : 54
 
 ~ 		return true;
 
diff --git a/patches/minecraft/net/minecraft/block/BlockEndPortal.edit.java b/patches/minecraft/net/minecraft/block/BlockEndPortal.edit.java
index 223e804..29754f7 100644
--- a/patches/minecraft/net/minecraft/block/BlockEndPortal.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockEndPortal.edit.java
@@ -10,11 +10,11 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  50 : 51  @  50 : 51
+> CHANGE  47 : 48  @  47 : 48
 
 ~ 	public int quantityDropped(EaglercraftRandom var1) {
 
-> CHANGE  54 : 55  @  54 : 62
+> CHANGE  4 : 5  @  4 : 12
 
 ~ 	public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockEndPortalFrame.edit.java b/patches/minecraft/net/minecraft/block/BlockEndPortalFrame.edit.java
index e3f91dc..cc8267e 100644
--- a/patches/minecraft/net/minecraft/block/BlockEndPortalFrame.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockEndPortalFrame.edit.java
@@ -10,7 +10,7 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  50 : 51  @  50 : 51
+> CHANGE  47 : 48  @  47 : 48
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockEnderChest.edit.java b/patches/minecraft/net/minecraft/block/BlockEnderChest.edit.java
index 952e260..5592de7 100644
--- a/patches/minecraft/net/minecraft/block/BlockEnderChest.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockEnderChest.edit.java
@@ -10,23 +10,23 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  13  @  13 : 14
+> DELETE  11  @  11 : 12
 
-> DELETE  15  @  16 : 17
+> DELETE  2  @  3 : 4
 
-> CHANGE  44 : 45  @  46 : 47
+> CHANGE  29 : 30  @  30 : 31
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
-> CHANGE  48 : 49  @  50 : 51
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public int quantityDropped(EaglercraftRandom var1) {
 
-> CHANGE  69 : 70  @  71 : 87
+> CHANGE  21 : 22  @  21 : 37
 
 ~ 		return true;
 
-> CHANGE  76 : 77  @  93 : 94
+> CHANGE  7 : 8  @  22 : 23
 
 ~ 	public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockFalling.edit.java b/patches/minecraft/net/minecraft/block/BlockFalling.edit.java
index 6bd53a9..8b278d2 100644
--- a/patches/minecraft/net/minecraft/block/BlockFalling.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockFalling.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  2  @  2 : 4
 
-> DELETE  30  @  32 : 66
+> DELETE  28  @  30 : 64
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockFarmland.edit.java b/patches/minecraft/net/minecraft/block/BlockFarmland.edit.java
index 3643a31..a216ede 100644
--- a/patches/minecraft/net/minecraft/block/BlockFarmland.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockFarmland.edit.java
@@ -10,15 +10,15 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  11  @  14 : 15
+> DELETE  9  @  12 : 13
 
-> CHANGE  43 : 44  @  47 : 48
+> CHANGE  32 : 33  @  33 : 34
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {
 
-> DELETE  59  @  63 : 71
+> DELETE  16  @  16 : 24
 
-> CHANGE  102 : 103  @  114 : 115
+> CHANGE  43 : 44  @  51 : 52
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int i) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockFence.edit.java b/patches/minecraft/net/minecraft/block/BlockFence.edit.java
index 920665d..ba399ce 100644
--- a/patches/minecraft/net/minecraft/block/BlockFence.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockFence.edit.java
@@ -9,9 +9,9 @@
 
 ~ 
 
-> DELETE  14  @  15 : 16
+> DELETE  11  @  12 : 13
 
-> CHANGE  144 : 145  @  146 : 147
+> CHANGE  130 : 131  @  131 : 132
 
 ~ 		return true;
 
diff --git a/patches/minecraft/net/minecraft/block/BlockFenceGate.edit.java b/patches/minecraft/net/minecraft/block/BlockFenceGate.edit.java
index b50e7e9..4f183c2 100644
--- a/patches/minecraft/net/minecraft/block/BlockFenceGate.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockFenceGate.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  2  @  2 : 5
 
-> DELETE  114  @  117 : 139
+> DELETE  112  @  115 : 137
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockFire.edit.java b/patches/minecraft/net/minecraft/block/BlockFire.edit.java
index 0952594..64703d9 100644
--- a/patches/minecraft/net/minecraft/block/BlockFire.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockFire.edit.java
@@ -7,26 +7,26 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 7  @  4 : 7
+> CHANGE  1 : 5  @  2 : 5
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 ~ import com.google.common.collect.Maps;
 ~ 
 
-> CHANGE  125 : 126  @  125 : 126
+> CHANGE  122 : 123  @  121 : 122
 
 ~ 	public int quantityDropped(EaglercraftRandom var1) {
 
-> CHANGE  133 : 134  @  133 : 134
+> CHANGE  8 : 9  @  8 : 9
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
 
-> CHANGE  240 : 241  @  240 : 241
+> CHANGE  107 : 108  @  107 : 108
 
 ~ 	private void catchOnFire(World worldIn, BlockPos pos, int chance, EaglercraftRandom random, int age) {
 
-> CHANGE  318 : 319  @  318 : 319
+> CHANGE  78 : 79  @  78 : 79
 
 ~ 	public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockFlower.edit.java b/patches/minecraft/net/minecraft/block/BlockFlower.edit.java
index 3c6e51c..740a699 100644
--- a/patches/minecraft/net/minecraft/block/BlockFlower.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockFlower.edit.java
@@ -11,7 +11,7 @@
 + import java.util.List;
 + 
 
-> CHANGE  8 : 9  @  5 : 9
+> CHANGE  6 : 7  @  3 : 7
 
 ~ 
 
diff --git a/patches/minecraft/net/minecraft/block/BlockFlowerPot.edit.java b/patches/minecraft/net/minecraft/block/BlockFlowerPot.edit.java
index ca31383..d5dc8a7 100644
--- a/patches/minecraft/net/minecraft/block/BlockFlowerPot.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockFlowerPot.edit.java
@@ -10,18 +10,18 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  29 : 30  @  33 : 35
+> CHANGE  27 : 28  @  31 : 33
 
 ~ 	public static PropertyEnum CONTENTS;
 
-> INSERT  38 : 42  @  43
+> INSERT  9 : 13  @  10
 
 + 	public static void bootstrapStates() {
 + 		CONTENTS = PropertyEnum.create("contents", BlockFlowerPot.EnumFlowerType.class);
 + 	}
 + 
 
-> CHANGE  166 : 167  @  167 : 168
+> CHANGE  128 : 129  @  124 : 125
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockFurnace.edit.java b/patches/minecraft/net/minecraft/block/BlockFurnace.edit.java
index 694bbd4..2e7aa16 100644
--- a/patches/minecraft/net/minecraft/block/BlockFurnace.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockFurnace.edit.java
@@ -10,17 +10,17 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  16  @  17 : 18
+> DELETE  14  @  15 : 16
 
-> CHANGE  34 : 35  @  36 : 37
+> CHANGE  18 : 19  @  19 : 20
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
-> CHANGE  38 : 39  @  40 : 66
+> CHANGE  4 : 5  @  4 : 30
 
 ~ 	public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
 
-> CHANGE  69 : 70  @  96 : 107
+> CHANGE  31 : 32  @  56 : 67
 
 ~ 		return true;
 
diff --git a/patches/minecraft/net/minecraft/block/BlockGlass.edit.java b/patches/minecraft/net/minecraft/block/BlockGlass.edit.java
index 137bfa9..3adbdd2 100644
--- a/patches/minecraft/net/minecraft/block/BlockGlass.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockGlass.edit.java
@@ -10,7 +10,7 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  14 : 15  @  14 : 15
+> CHANGE  12 : 13  @  12 : 13
 
 ~ 	public int quantityDropped(EaglercraftRandom var1) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockGlowstone.edit.java b/patches/minecraft/net/minecraft/block/BlockGlowstone.edit.java
index 2d571f8..a9be182 100644
--- a/patches/minecraft/net/minecraft/block/BlockGlowstone.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockGlowstone.edit.java
@@ -10,15 +10,15 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  18 : 19  @  18 : 19
+> CHANGE  16 : 17  @  16 : 17
 
 ~ 	public int quantityDroppedWithBonus(int i, EaglercraftRandom random) {
 
-> CHANGE  22 : 23  @  22 : 23
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public int quantityDropped(EaglercraftRandom random) {
 
-> CHANGE  26 : 27  @  26 : 27
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockGrass.edit.java b/patches/minecraft/net/minecraft/block/BlockGrass.edit.java
index e35e549..651c016 100644
--- a/patches/minecraft/net/minecraft/block/BlockGrass.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockGrass.edit.java
@@ -10,15 +10,15 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  46 : 47  @  50 : 75
+> CHANGE  44 : 45  @  48 : 73
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int i) {
 
-> CHANGE  55 : 56  @  83 : 84
+> CHANGE  9 : 10  @  33 : 34
 
 ~ 	public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) {
 
-> CHANGE  59 : 60  @  87 : 88
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public void grow(World world, EaglercraftRandom random, BlockPos blockpos, IBlockState var4) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockGravel.edit.java b/patches/minecraft/net/minecraft/block/BlockGravel.edit.java
index 2d60240..567af29 100644
--- a/patches/minecraft/net/minecraft/block/BlockGravel.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockGravel.edit.java
@@ -10,7 +10,7 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  10 : 11  @  10 : 11
+> CHANGE  8 : 9  @  8 : 9
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int i) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockHopper.edit.java b/patches/minecraft/net/minecraft/block/BlockHopper.edit.java
index b18abd9..846620f 100644
--- a/patches/minecraft/net/minecraft/block/BlockHopper.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockHopper.edit.java
@@ -7,15 +7,15 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 6  @  4 : 6
+> CHANGE  1 : 4  @  2 : 4
 
 ~ 
 ~ import com.google.common.base.Predicate;
 ~ 
 
-> DELETE  20  @  20 : 21
+> DELETE  17  @  16 : 17
 
-> CHANGE  97 : 98  @  98 : 109
+> CHANGE  77 : 78  @  78 : 89
 
 ~ 		return true;
 
diff --git a/patches/minecraft/net/minecraft/block/BlockHugeMushroom.edit.java b/patches/minecraft/net/minecraft/block/BlockHugeMushroom.edit.java
index c203d83..46960bd 100644
--- a/patches/minecraft/net/minecraft/block/BlockHugeMushroom.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockHugeMushroom.edit.java
@@ -10,11 +10,11 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  18 : 19  @  18 : 20
+> CHANGE  16 : 17  @  16 : 18
 
 ~ 	public static PropertyEnum VARIANT;
 
-> CHANGE  28 : 33  @  29 : 30
+> CHANGE  10 : 15  @  11 : 12
 
 ~ 	public static void bootstrapStates() {
 ~ 		VARIANT = PropertyEnum.create("variant", BlockHugeMushroom.EnumType.class);
@@ -22,7 +22,7 @@
 ~ 
 ~ 	public int quantityDropped(EaglercraftRandom random) {
 
-> CHANGE  49 : 50  @  46 : 47
+> CHANGE  21 : 22  @  17 : 18
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockIce.edit.java b/patches/minecraft/net/minecraft/block/BlockIce.edit.java
index a30fb18..1e462c4 100644
--- a/patches/minecraft/net/minecraft/block/BlockIce.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockIce.edit.java
@@ -10,11 +10,11 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  55 : 56  @  56 : 57
+> CHANGE  53 : 54  @  54 : 55
 
 ~ 	public int quantityDropped(EaglercraftRandom var1) {
 
-> CHANGE  59 : 60  @  60 : 61
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockJukebox.edit.java b/patches/minecraft/net/minecraft/block/BlockJukebox.edit.java
index a18a5c3..10cdafb 100644
--- a/patches/minecraft/net/minecraft/block/BlockJukebox.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockJukebox.edit.java
@@ -7,14 +7,14 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  9  @  10 : 11
+> DELETE  7  @  8 : 9
 
-> DELETE  31  @  33 : 34
+> DELETE  22  @  23 : 24
 
-> DELETE  40  @  43 : 52
+> DELETE  9  @  10 : 19
 
-> DELETE  41  @  53 : 75
+> DELETE  1  @  10 : 32
 
-> DELETE  43  @  77 : 88
+> DELETE  2  @  24 : 35
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockLeaves.edit.java b/patches/minecraft/net/minecraft/block/BlockLeaves.edit.java
index 2e56bae..fa3a6d5 100644
--- a/patches/minecraft/net/minecraft/block/BlockLeaves.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockLeaves.edit.java
@@ -10,20 +10,20 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  10  @  12 : 13
+> DELETE  8  @  10 : 11
 
-> CHANGE  70 : 71  @  73 : 158
+> CHANGE  60 : 61  @  61 : 146
 
 ~ 	public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {
 
-> CHANGE  86 : 87  @  173 : 174
+> CHANGE  16 : 17  @  100 : 101
 
 ~ 	public int quantityDropped(EaglercraftRandom random) {
 
-> CHANGE  90 : 91  @  177 : 178
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
-> DELETE  94  @  181 : 209
+> DELETE  4  @  4 : 32
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockLever.edit.java b/patches/minecraft/net/minecraft/block/BlockLever.edit.java
index fcb9667..beba351 100644
--- a/patches/minecraft/net/minecraft/block/BlockLever.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockLever.edit.java
@@ -7,18 +7,18 @@
 
 > DELETE  2  @  2 : 4
 
-> CHANGE  19 : 20  @  21 : 23
+> CHANGE  17 : 18  @  19 : 21
 
 ~ 	public static PropertyEnum FACING;
 
-> INSERT  29 : 33  @  32
+> INSERT  10 : 14  @  11
 
 + 	public static void bootstrapStates() {
 + 		FACING = PropertyEnum.create("facing", BlockLever.EnumOrientation.class);
 + 	}
 + 
 
-> CHANGE  154 : 155  @  153 : 166
+> CHANGE  125 : 126  @  121 : 134
 
 ~ 		return true;
 
diff --git a/patches/minecraft/net/minecraft/block/BlockLiquid.edit.java b/patches/minecraft/net/minecraft/block/BlockLiquid.edit.java
index 5d55729..25f1514 100644
--- a/patches/minecraft/net/minecraft/block/BlockLiquid.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockLiquid.edit.java
@@ -10,15 +10,15 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  108 : 109  @  110 : 111
+> CHANGE  106 : 107  @  108 : 109
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
-> CHANGE  112 : 113  @  114 : 115
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public int quantityDropped(EaglercraftRandom var1) {
 
-> CHANGE  177 : 178  @  179 : 180
+> CHANGE  65 : 66  @  65 : 66
 
 ~ 	public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockLog.edit.java b/patches/minecraft/net/minecraft/block/BlockLog.edit.java
index 0d793cb..bef4446 100644
--- a/patches/minecraft/net/minecraft/block/BlockLog.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockLog.edit.java
@@ -7,11 +7,11 @@
 
 > DELETE  2  @  2 : 4
 
-> CHANGE  13 : 14  @  15 : 17
+> CHANGE  11 : 12  @  13 : 15
 
 ~ 	public static PropertyEnum LOG_AXIS = null;
 
-> INSERT  22 : 26  @  25
+> INSERT  9 : 13  @  10
 
 + 	public static void bootstrapStates() {
 + 		LOG_AXIS = PropertyEnum.create("axis", BlockLog.EnumAxis.class);
diff --git a/patches/minecraft/net/minecraft/block/BlockMelon.edit.java b/patches/minecraft/net/minecraft/block/BlockMelon.edit.java
index bb36a53..460dcf4 100644
--- a/patches/minecraft/net/minecraft/block/BlockMelon.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockMelon.edit.java
@@ -10,15 +10,15 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  17 : 18  @  17 : 18
+> CHANGE  15 : 16  @  15 : 16
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
-> CHANGE  21 : 22  @  21 : 22
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public int quantityDropped(EaglercraftRandom random) {
 
-> CHANGE  25 : 26  @  25 : 26
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public int quantityDroppedWithBonus(int i, EaglercraftRandom random) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockMobSpawner.edit.java b/patches/minecraft/net/minecraft/block/BlockMobSpawner.edit.java
index 9fecf57..3d6984e 100644
--- a/patches/minecraft/net/minecraft/block/BlockMobSpawner.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockMobSpawner.edit.java
@@ -10,11 +10,11 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  22 : 23  @  22 : 23
+> CHANGE  20 : 21  @  20 : 21
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
-> CHANGE  26 : 27  @  26 : 27
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public int quantityDropped(EaglercraftRandom var1) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockMushroom.edit.java b/patches/minecraft/net/minecraft/block/BlockMushroom.edit.java
index 776b725..71c3cdd 100644
--- a/patches/minecraft/net/minecraft/block/BlockMushroom.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockMushroom.edit.java
@@ -10,18 +10,18 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  8  @  11 : 12
+> DELETE  6  @  9 : 10
 
-> CHANGE  16 : 17  @  20 : 21
+> CHANGE  8 : 9  @  9 : 10
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {
 
-> DELETE  69  @  73 : 90
+> DELETE  53  @  53 : 70
 
-> CHANGE  73 : 74  @  94 : 95
+> CHANGE  4 : 5  @  21 : 22
 
 ~ 	public boolean canUseBonemeal(World var1, EaglercraftRandom random, BlockPos var3, IBlockState var4) {
 
-> DELETE  76  @  97 : 101
+> DELETE  3  @  3 : 7
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockMycelium.edit.java b/patches/minecraft/net/minecraft/block/BlockMycelium.edit.java
index 0edf3d6..cde3062 100644
--- a/patches/minecraft/net/minecraft/block/BlockMycelium.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockMycelium.edit.java
@@ -10,11 +10,11 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  33 : 34  @  34 : 60
+> CHANGE  31 : 32  @  32 : 58
 
 ~ 	public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
 
-> CHANGE  43 : 44  @  69 : 70
+> CHANGE  10 : 11  @  35 : 36
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int i) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockNetherWart.edit.java b/patches/minecraft/net/minecraft/block/BlockNetherWart.edit.java
index 50c070b..55e42b3 100644
--- a/patches/minecraft/net/minecraft/block/BlockNetherWart.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockNetherWart.edit.java
@@ -10,17 +10,17 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  14  @  15 : 16
+> DELETE  12  @  13 : 14
 
-> CHANGE  37 : 38  @  39 : 40
+> CHANGE  23 : 24  @  24 : 25
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
 
-> CHANGE  47 : 48  @  49 : 67
+> CHANGE  10 : 11  @  10 : 28
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
-> CHANGE  51 : 52  @  70 : 71
+> CHANGE  4 : 5  @  21 : 22
 
 ~ 	public int quantityDropped(EaglercraftRandom var1) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockNewLeaf.edit.java b/patches/minecraft/net/minecraft/block/BlockNewLeaf.edit.java
index a11428f..411a63e 100644
--- a/patches/minecraft/net/minecraft/block/BlockNewLeaf.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockNewLeaf.edit.java
@@ -7,21 +7,21 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 6  @  4 : 7
+> CHANGE  1 : 4  @  2 : 5
 
 ~ 
 ~ import com.google.common.base.Predicate;
 ~ 
 
-> DELETE  11  @  12 : 13
+> DELETE  8  @  8 : 9
 
-> DELETE  14  @  16 : 18
+> DELETE  3  @  4 : 6
 
-> CHANGE  18 : 19  @  22 : 28
+> CHANGE  4 : 5  @  6 : 12
 
 ~ 	public static PropertyEnum VARIANT;
 
-> INSERT  25 : 33  @  34
+> INSERT  7 : 15  @  12
 
 + 	public static void bootstrapStates() {
 + 		VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate() {
@@ -32,6 +32,6 @@
 + 	}
 + 
 
-> DELETE  87  @  88 : 99
+> DELETE  62  @  54 : 65
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockNewLog.edit.java b/patches/minecraft/net/minecraft/block/BlockNewLog.edit.java
index b2c937f..f1201ef 100644
--- a/patches/minecraft/net/minecraft/block/BlockNewLog.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockNewLog.edit.java
@@ -7,17 +7,17 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 6  @  4 : 6
+> CHANGE  1 : 4  @  2 : 4
 
 ~ 
 ~ import com.google.common.base.Predicate;
 ~ 
 
-> CHANGE  16 : 17  @  16 : 22
+> CHANGE  13 : 14  @  12 : 18
 
 ~ 	public static PropertyEnum VARIANT;
 
-> INSERT  23 : 31  @  28
+> INSERT  7 : 15  @  12
 
 + 	public static void bootstrapStates() {
 + 		VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate() {
diff --git a/patches/minecraft/net/minecraft/block/BlockNote.edit.java b/patches/minecraft/net/minecraft/block/BlockNote.edit.java
index 5078aca..7bae349 100644
--- a/patches/minecraft/net/minecraft/block/BlockNote.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockNote.edit.java
@@ -7,18 +7,18 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 6  @  4 : 6
+> CHANGE  1 : 4  @  2 : 4
 
 ~ 
 ~ import com.google.common.collect.Lists;
 ~ 
 
-> DELETE  10  @  10 : 11
+> DELETE  7  @  6 : 7
 
-> CHANGE  44 : 45  @  45 : 58
+> CHANGE  34 : 35  @  35 : 48
 
 ~ 		return true;
 
-> DELETE  47  @  60 : 71
+> DELETE  3  @  15 : 26
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockObsidian.edit.java b/patches/minecraft/net/minecraft/block/BlockObsidian.edit.java
index fa045e0..aeae9c9 100644
--- a/patches/minecraft/net/minecraft/block/BlockObsidian.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockObsidian.edit.java
@@ -10,7 +10,7 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  17 : 18  @  17 : 18
+> CHANGE  15 : 16  @  15 : 16
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockOldLeaf.edit.java b/patches/minecraft/net/minecraft/block/BlockOldLeaf.edit.java
index 017e438..c22cbc7 100644
--- a/patches/minecraft/net/minecraft/block/BlockOldLeaf.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockOldLeaf.edit.java
@@ -7,21 +7,21 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 6  @  4 : 7
+> CHANGE  1 : 4  @  2 : 5
 
 ~ 
 ~ import com.google.common.base.Predicate;
 ~ 
 
-> DELETE  11  @  12 : 13
+> DELETE  8  @  8 : 9
 
-> DELETE  14  @  16 : 18
+> DELETE  3  @  4 : 6
 
-> CHANGE  20 : 21  @  24 : 30
+> CHANGE  6 : 7  @  8 : 14
 
 ~ 	public static PropertyEnum VARIANT;
 
-> INSERT  27 : 35  @  36
+> INSERT  7 : 15  @  12
 
 + 	public static void bootstrapStates() {
 + 		VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate() {
@@ -32,6 +32,6 @@
 + 	}
 + 
 
-> DELETE  118  @  119 : 130
+> DELETE  91  @  83 : 94
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockOldLog.edit.java b/patches/minecraft/net/minecraft/block/BlockOldLog.edit.java
index 273fff3..1cabd01 100644
--- a/patches/minecraft/net/minecraft/block/BlockOldLog.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockOldLog.edit.java
@@ -7,17 +7,17 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 6  @  4 : 6
+> CHANGE  1 : 4  @  2 : 4
 
 ~ 
 ~ import com.google.common.base.Predicate;
 ~ 
 
-> CHANGE  16 : 17  @  16 : 22
+> CHANGE  13 : 14  @  12 : 18
 
 ~ 	public static PropertyEnum VARIANT;
 
-> INSERT  23 : 31  @  28
+> INSERT  7 : 15  @  12
 
 + 	public static void bootstrapStates() {
 + 		VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate() {
diff --git a/patches/minecraft/net/minecraft/block/BlockOre.edit.java b/patches/minecraft/net/minecraft/block/BlockOre.edit.java
index cdcef53..015a5e0 100644
--- a/patches/minecraft/net/minecraft/block/BlockOre.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockOre.edit.java
@@ -10,15 +10,15 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  26 : 27  @  26 : 27
+> CHANGE  24 : 25  @  24 : 25
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
-> CHANGE  34 : 35  @  34 : 35
+> CHANGE  8 : 9  @  8 : 9
 
 ~ 	public int quantityDropped(EaglercraftRandom random) {
 
-> CHANGE  38 : 39  @  38 : 39
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public int quantityDroppedWithBonus(int i, EaglercraftRandom random) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockPackedIce.edit.java b/patches/minecraft/net/minecraft/block/BlockPackedIce.edit.java
index 137bfa9..3adbdd2 100644
--- a/patches/minecraft/net/minecraft/block/BlockPackedIce.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockPackedIce.edit.java
@@ -10,7 +10,7 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  14 : 15  @  14 : 15
+> CHANGE  12 : 13  @  12 : 13
 
 ~ 	public int quantityDropped(EaglercraftRandom var1) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockPane.edit.java b/patches/minecraft/net/minecraft/block/BlockPane.edit.java
index 68becac..b00159d 100644
--- a/patches/minecraft/net/minecraft/block/BlockPane.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockPane.edit.java
@@ -10,7 +10,7 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  52 : 53  @  52 : 53
+> CHANGE  49 : 50  @  49 : 50
 
 ~ 	public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom random, int i) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockPistonBase.edit.java b/patches/minecraft/net/minecraft/block/BlockPistonBase.edit.java
index e2f61d6..fb148b6 100644
--- a/patches/minecraft/net/minecraft/block/BlockPistonBase.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockPistonBase.edit.java
@@ -9,10 +9,10 @@
 
 ~ 
 
-> DELETE  48  @  51 : 55
+> DELETE  45  @  48 : 52
 
-> DELETE  50  @  57 : 71
+> DELETE  2  @  6 : 20
 
-> DELETE  95  @  116 : 128
+> DELETE  45  @  59 : 71
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockPistonExtension.edit.java b/patches/minecraft/net/minecraft/block/BlockPistonExtension.edit.java
index 662962c..7a9f2a3 100644
--- a/patches/minecraft/net/minecraft/block/BlockPistonExtension.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockPistonExtension.edit.java
@@ -10,11 +10,11 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  25 : 26  @  26 : 28
+> CHANGE  22 : 23  @  23 : 25
 
 ~ 	public static PropertyEnum TYPE;
 
-> INSERT  37 : 42  @  39
+> INSERT  12 : 17  @  13
 
 + 	public static void bootstrapStates() {
 + 		TYPE = PropertyEnum.create("type",
@@ -22,7 +22,7 @@
 + 	}
 + 
 
-> CHANGE  86 : 87  @  83 : 84
+> CHANGE  49 : 50  @  44 : 45
 
 ~ 	public int quantityDropped(EaglercraftRandom var1) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockPistonMoving.edit.java b/patches/minecraft/net/minecraft/block/BlockPistonMoving.edit.java
index e93df63..d267651 100644
--- a/patches/minecraft/net/minecraft/block/BlockPistonMoving.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockPistonMoving.edit.java
@@ -10,25 +10,25 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  10  @  13 : 14
+> DELETE  8  @  11 : 12
 
-> CHANGE  24 : 25  @  28 : 29
+> CHANGE  14 : 15  @  15 : 16
 
 ~ 	public static PropertyEnum TYPE;
 
-> INSERT  33 : 37  @  37
+> INSERT  9 : 13  @  9
 
 + 	public static void bootstrapStates() {
 + 		TYPE = BlockPistonExtension.TYPE;
 + 	}
 + 
 
-> CHANGE  82 : 83  @  82 : 93
+> CHANGE  49 : 50  @  45 : 56
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
-> DELETE  86  @  96 : 106
+> DELETE  4  @  14 : 24
 
-> DELETE  90  @  110 : 117
+> DELETE  4  @  14 : 21
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockPlanks.edit.java b/patches/minecraft/net/minecraft/block/BlockPlanks.edit.java
index 6bb7025..8f17014 100644
--- a/patches/minecraft/net/minecraft/block/BlockPlanks.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockPlanks.edit.java
@@ -9,11 +9,11 @@
 
 ~ 
 
-> CHANGE  16 : 17  @  16 : 18
+> CHANGE  13 : 14  @  13 : 15
 
 ~ 	public static PropertyEnum VARIANT;
 
-> INSERT  24 : 28  @  25
+> INSERT  8 : 12  @  9
 
 + 	public static void bootstrapStates() {
 + 		VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class);
diff --git a/patches/minecraft/net/minecraft/block/BlockPortal.edit.java b/patches/minecraft/net/minecraft/block/BlockPortal.edit.java
index c56e86f..3526137 100644
--- a/patches/minecraft/net/minecraft/block/BlockPortal.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockPortal.edit.java
@@ -11,19 +11,19 @@
 ~ import net.lax1dude.eaglercraft.v1_8.cache.EaglerLoadingCache;
 ~ 
 
-> CHANGE  34 : 35  @  35 : 36
+> CHANGE  32 : 33  @  33 : 34
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
 
-> CHANGE  154 : 155  @  155 : 156
+> CHANGE  120 : 121  @  120 : 121
 
 ~ 	public int quantityDropped(EaglercraftRandom var1) {
 
-> CHANGE  169 : 170  @  170 : 171
+> CHANGE  15 : 16  @  15 : 16
 
 ~ 	public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {
 
-> CHANGE  216 : 217  @  217 : 218
+> CHANGE  47 : 48  @  47 : 48
 
 ~ 		EaglerLoadingCache loadingcache = BlockPattern.func_181627_a(parWorld, true);
 
diff --git a/patches/minecraft/net/minecraft/block/BlockPotato.edit.java b/patches/minecraft/net/minecraft/block/BlockPotato.edit.java
index 426efca..6456a17 100644
--- a/patches/minecraft/net/minecraft/block/BlockPotato.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockPotato.edit.java
@@ -7,8 +7,8 @@
 
 > DELETE  2  @  2 : 4
 
-> DELETE  4  @  6 : 9
+> DELETE  2  @  4 : 7
 
-> DELETE  14  @  19 : 28
+> DELETE  10  @  13 : 22
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockPressurePlate.edit.java b/patches/minecraft/net/minecraft/block/BlockPressurePlate.edit.java
index f42f38f..86cdde9 100644
--- a/patches/minecraft/net/minecraft/block/BlockPressurePlate.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockPressurePlate.edit.java
@@ -9,7 +9,7 @@
 
 ~ 
 
-> CHANGE  35 : 36  @  35 : 36
+> CHANGE  32 : 33  @  32 : 33
 
 ~ 		List list;
 
diff --git a/patches/minecraft/net/minecraft/block/BlockPrismarine.edit.java b/patches/minecraft/net/minecraft/block/BlockPrismarine.edit.java
index 3c29b6c..fc062b8 100644
--- a/patches/minecraft/net/minecraft/block/BlockPrismarine.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockPrismarine.edit.java
@@ -9,11 +9,11 @@
 
 ~ 
 
-> CHANGE  17 : 18  @  17 : 19
+> CHANGE  14 : 15  @  14 : 16
 
 ~ 	public static PropertyEnum VARIANT;
 
-> INSERT  28 : 32  @  29
+> INSERT  11 : 15  @  12
 
 + 	public static void bootstrapStates() {
 + 		VARIANT = PropertyEnum.create("variant", BlockPrismarine.EnumType.class);
diff --git a/patches/minecraft/net/minecraft/block/BlockQuartz.edit.java b/patches/minecraft/net/minecraft/block/BlockQuartz.edit.java
index 7c15696..b955e43 100644
--- a/patches/minecraft/net/minecraft/block/BlockQuartz.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockQuartz.edit.java
@@ -9,11 +9,11 @@
 
 ~ 
 
-> CHANGE  20 : 21  @  20 : 22
+> CHANGE  17 : 18  @  17 : 19
 
 ~ 	public static PropertyEnum VARIANT;
 
-> INSERT  28 : 32  @  29
+> INSERT  8 : 12  @  9
 
 + 	public static void bootstrapStates() {
 + 		VARIANT = PropertyEnum.create("variant", BlockQuartz.EnumType.class);
diff --git a/patches/minecraft/net/minecraft/block/BlockRail.edit.java b/patches/minecraft/net/minecraft/block/BlockRail.edit.java
index 20e7a48..c23a2ba 100644
--- a/patches/minecraft/net/minecraft/block/BlockRail.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockRail.edit.java
@@ -7,11 +7,11 @@
 
 > DELETE  2  @  2 : 4
 
-> CHANGE  10 : 11  @  12 : 14
+> CHANGE  8 : 9  @  10 : 12
 
 ~ 	public static PropertyEnum SHAPE;
 
-> INSERT  18 : 22  @  21
+> INSERT  8 : 12  @  9
 
 + 	public static void bootstrapStates() {
 + 		SHAPE = PropertyEnum.create("shape", BlockRailBase.EnumRailDirection.class);
diff --git a/patches/minecraft/net/minecraft/block/BlockRailBase.edit.java b/patches/minecraft/net/minecraft/block/BlockRailBase.edit.java
index d1b1cec..c4a3de0 100644
--- a/patches/minecraft/net/minecraft/block/BlockRailBase.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockRailBase.edit.java
@@ -7,15 +7,15 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 6  @  4 : 5
+> CHANGE  1 : 4  @  2 : 3
 
 ~ 
 ~ import com.google.common.collect.Lists;
 ~ 
 
-> DELETE  75  @  74 : 117
+> DELETE  72  @  70 : 113
 
-> CHANGE  80 : 81  @  122 : 125
+> CHANGE  5 : 6  @  48 : 51
 
 ~ 		return parIBlockState;
 
diff --git a/patches/minecraft/net/minecraft/block/BlockRailDetector.edit.java b/patches/minecraft/net/minecraft/block/BlockRailDetector.edit.java
index df5c1e0..fc0d6af 100644
--- a/patches/minecraft/net/minecraft/block/BlockRailDetector.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockRailDetector.edit.java
@@ -7,17 +7,17 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 6  @  4 : 6
+> CHANGE  1 : 4  @  2 : 4
 
 ~ 
 ~ import com.google.common.base.Predicate;
 ~ 
 
-> CHANGE  24 : 25  @  24 : 33
+> CHANGE  21 : 22  @  20 : 29
 
 ~ 	public static PropertyEnum SHAPE;
 
-> INSERT  34 : 46  @  42
+> INSERT  10 : 22  @  18
 
 + 	public static void bootstrapStates() {
 + 		SHAPE = PropertyEnum.create("shape", BlockRailBase.EnumRailDirection.class,
@@ -32,6 +32,6 @@
 + 	}
 + 
 
-> DELETE  54  @  50 : 67
+> DELETE  20  @  8 : 25
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockRailPowered.edit.java b/patches/minecraft/net/minecraft/block/BlockRailPowered.edit.java
index 8fc3b2c..adf5086 100644
--- a/patches/minecraft/net/minecraft/block/BlockRailPowered.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockRailPowered.edit.java
@@ -9,11 +9,11 @@
 
 ~ 
 
-> CHANGE  13 : 14  @  14 : 23
+> CHANGE  10 : 11  @  11 : 20
 
 ~ 	public static PropertyEnum SHAPE;
 
-> INSERT  23 : 35  @  32
+> INSERT  10 : 22  @  18
 
 + 	public static void bootstrapStates() {
 + 		SHAPE = PropertyEnum.create("shape", BlockRailBase.EnumRailDirection.class,
diff --git a/patches/minecraft/net/minecraft/block/BlockRedSandstone.edit.java b/patches/minecraft/net/minecraft/block/BlockRedSandstone.edit.java
index 1d0c8fd..c3e285a 100644
--- a/patches/minecraft/net/minecraft/block/BlockRedSandstone.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockRedSandstone.edit.java
@@ -9,11 +9,11 @@
 
 ~ 
 
-> CHANGE  15 : 16  @  16 : 18
+> CHANGE  12 : 13  @  13 : 15
 
 ~ 	public static PropertyEnum TYPE;
 
-> INSERT  23 : 27  @  25
+> INSERT  8 : 12  @  9
 
 + 	public static void bootstrapStates() {
 + 		TYPE = PropertyEnum.create("type", BlockRedSandstone.EnumType.class);
diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneComparator.edit.java b/patches/minecraft/net/minecraft/block/BlockRedstoneComparator.edit.java
index e69862e..e4b4d30 100644
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneComparator.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneComparator.edit.java
@@ -7,29 +7,29 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 7  @  4 : 8
+> CHANGE  1 : 5  @  2 : 6
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 ~ import com.google.common.base.Predicate;
 ~ 
 
-> CHANGE  32 : 33  @  33 : 35
+> CHANGE  29 : 30  @  29 : 31
 
 ~ 	public static PropertyEnum MODE;
 
-> INSERT  42 : 46  @  44
+> INSERT  10 : 14  @  11
 
 + 	public static void bootstrapStates() {
 + 		MODE = PropertyEnum.create("mode", BlockRedstoneComparator.Mode.class);
 + 	}
 + 
 
-> CHANGE  50 : 51  @  48 : 49
+> CHANGE  8 : 9  @  4 : 5
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
-> CHANGE  199 : 200  @  197 : 198
+> CHANGE  149 : 150  @  149 : 150
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneDiode.edit.java b/patches/minecraft/net/minecraft/block/BlockRedstoneDiode.edit.java
index 7f8fb38..3f95c5e 100644
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneDiode.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneDiode.edit.java
@@ -10,11 +10,11 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  37 : 38  @  39 : 40
+> CHANGE  35 : 36  @  37 : 38
 
 ~ 	public void randomTick(World var1, BlockPos var2, IBlockState var3, EaglercraftRandom var4) {
 
-> CHANGE  40 : 41  @  42 : 43
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneLight.edit.java b/patches/minecraft/net/minecraft/block/BlockRedstoneLight.edit.java
index 5c78ba0..036d780 100644
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneLight.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneLight.edit.java
@@ -10,7 +10,7 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  24 : 25  @  24 : 56
+> CHANGE  22 : 23  @  22 : 54
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneOre.edit.java b/patches/minecraft/net/minecraft/block/BlockRedstoneOre.edit.java
index e3da69e..2a631eb 100644
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneOre.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneOre.edit.java
@@ -10,27 +10,27 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  57 : 58  @  57 : 58
+> CHANGE  55 : 56  @  55 : 56
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) {
 
-> CHANGE  64 : 65  @  64 : 65
+> CHANGE  7 : 8  @  7 : 8
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
-> CHANGE  68 : 69  @  68 : 69
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public int quantityDroppedWithBonus(int i, EaglercraftRandom random) {
 
-> CHANGE  72 : 73  @  72 : 73
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public int quantityDropped(EaglercraftRandom random) {
 
-> CHANGE  85 : 86  @  85 : 86
+> CHANGE  13 : 14  @  13 : 14
 
 ~ 	public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) {
 
-> CHANGE  93 : 94  @  93 : 94
+> CHANGE  8 : 9  @  8 : 9
 
 ~ 		EaglercraftRandom random = worldIn.rand;
 
diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneRepeater.edit.java b/patches/minecraft/net/minecraft/block/BlockRedstoneRepeater.edit.java
index 22f50a6..ec26841 100644
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneRepeater.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneRepeater.edit.java
@@ -10,11 +10,11 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  68 : 69  @  69 : 70
+> CHANGE  66 : 67  @  67 : 68
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
-> CHANGE  84 : 85  @  85 : 86
+> CHANGE  16 : 17  @  16 : 17
 
 ~ 	public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneTorch.edit.java b/patches/minecraft/net/minecraft/block/BlockRedstoneTorch.edit.java
index c73497e..cd8c575 100644
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneTorch.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneTorch.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 4
 
-> CHANGE  4 : 9  @  6 : 9
+> CHANGE  2 : 7  @  4 : 7
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
@@ -15,19 +15,19 @@
 ~ import com.google.common.collect.Maps;
 ~ 
 
-> CHANGE  85 : 86  @  85 : 86
+> CHANGE  81 : 82  @  79 : 80
 
 ~ 	public void randomTick(World var1, BlockPos var2, IBlockState var3, EaglercraftRandom var4) {
 
-> CHANGE  88 : 89  @  88 : 89
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
 
-> CHANGE  137 : 138  @  137 : 138
+> CHANGE  49 : 50  @  49 : 50
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
-> CHANGE  145 : 146  @  145 : 146
+> CHANGE  8 : 9  @  8 : 9
 
 ~ 	public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneWire.edit.java b/patches/minecraft/net/minecraft/block/BlockRedstoneWire.edit.java
index c37582d..fc221c4 100644
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneWire.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneWire.edit.java
@@ -7,25 +7,25 @@
 
 > DELETE  2  @  2 : 4
 
-> CHANGE  4 : 5  @  6 : 7
+> CHANGE  2 : 3  @  4 : 5
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 
-> CHANGE  6 : 10  @  8 : 11
+> CHANGE  2 : 6  @  2 : 5
 
 ~ 
 ~ import com.google.common.collect.Lists;
 ~ import com.google.common.collect.Sets;
 ~ 
 
-> CHANGE  30 : 34  @  31 : 39
+> CHANGE  24 : 28  @  23 : 31
 
 ~ 	public static PropertyEnum NORTH;
 ~ 	public static PropertyEnum EAST;
 ~ 	public static PropertyEnum SOUTH;
 ~ 	public static PropertyEnum WEST;
 
-> INSERT  48 : 59  @  53
+> INSERT  18 : 29  @  22
 
 + 	public static void bootstrapStates() {
 + 		NORTH = PropertyEnum.create("north",
@@ -39,17 +39,17 @@
 + 	}
 + 
 
-> CHANGE  108 : 109  @  102 : 103
+> CHANGE  60 : 61  @  49 : 50
 
 ~ 		ArrayList arraylist = Lists.newArrayList(this.blocksNeedingUpdate);
 
-> DELETE  189  @  183 : 232
+> DELETE  81  @  81 : 130
 
-> CHANGE  198 : 199  @  241 : 254
+> CHANGE  9 : 10  @  58 : 71
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
-> CHANGE  298 : 299  @  353 : 354
+> CHANGE  100 : 101  @  112 : 113
 
 ~ 	public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockReed.edit.java b/patches/minecraft/net/minecraft/block/BlockReed.edit.java
index 81bd73c..97bcedd 100644
--- a/patches/minecraft/net/minecraft/block/BlockReed.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockReed.edit.java
@@ -10,11 +10,11 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  30 : 31  @  30 : 31
+> CHANGE  28 : 29  @  28 : 29
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {
 
-> CHANGE  93 : 94  @  93 : 94
+> CHANGE  63 : 64  @  63 : 64
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockSand.edit.java b/patches/minecraft/net/minecraft/block/BlockSand.edit.java
index 82e623d..9d6d56c 100644
--- a/patches/minecraft/net/minecraft/block/BlockSand.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockSand.edit.java
@@ -9,11 +9,11 @@
 
 ~ 
 
-> CHANGE  15 : 16  @  15 : 17
+> CHANGE  12 : 13  @  12 : 14
 
 ~ 	public static PropertyEnum VARIANT;
 
-> INSERT  21 : 25  @  22
+> INSERT  6 : 10  @  7
 
 + 	public static void bootstrapStates() {
 + 		VARIANT = PropertyEnum.create("variant", BlockSand.EnumType.class);
diff --git a/patches/minecraft/net/minecraft/block/BlockSandStone.edit.java b/patches/minecraft/net/minecraft/block/BlockSandStone.edit.java
index 1ff828a..1ed2c6f 100644
--- a/patches/minecraft/net/minecraft/block/BlockSandStone.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockSandStone.edit.java
@@ -9,11 +9,11 @@
 
 ~ 
 
-> CHANGE  16 : 17  @  16 : 18
+> CHANGE  13 : 14  @  13 : 15
 
 ~ 	public static PropertyEnum TYPE;
 
-> INSERT  24 : 28  @  25
+> INSERT  8 : 12  @  9
 
 + 	public static void bootstrapStates() {
 + 		TYPE = PropertyEnum.create("type", BlockSandStone.EnumType.class);
diff --git a/patches/minecraft/net/minecraft/block/BlockSapling.edit.java b/patches/minecraft/net/minecraft/block/BlockSapling.edit.java
index 6f94f41..e8ef63e 100644
--- a/patches/minecraft/net/minecraft/block/BlockSapling.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockSapling.edit.java
@@ -10,31 +10,31 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  11  @  16 : 17
+> DELETE  8  @  13 : 14
 
-> DELETE  16  @  22 : 31
+> DELETE  5  @  6 : 15
 
-> CHANGE  18 : 19  @  33 : 35
+> CHANGE  2 : 3  @  11 : 13
 
 ~ 	public static PropertyEnum TYPE;
 
-> INSERT  29 : 33  @  45
+> INSERT  11 : 15  @  12
 
 + 	public static void bootstrapStates() {
 + 		TYPE = PropertyEnum.create("type", BlockPlanks.EnumType.class);
 + 	}
 + 
 
-> CHANGE  38 : 39  @  50 : 58
+> CHANGE  9 : 10  @  5 : 13
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
 
-> DELETE  41  @  60 : 161
+> DELETE  3  @  10 : 111
 
-> CHANGE  69 : 70  @  189 : 190
+> CHANGE  28 : 29  @  129 : 130
 
 ~ 	public boolean canUseBonemeal(World world, EaglercraftRandom var2, BlockPos var3, IBlockState var4) {
 
-> DELETE  73  @  193 : 197
+> DELETE  4  @  4 : 8
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockSeaLantern.edit.java b/patches/minecraft/net/minecraft/block/BlockSeaLantern.edit.java
index d81a357..b637a75 100644
--- a/patches/minecraft/net/minecraft/block/BlockSeaLantern.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockSeaLantern.edit.java
@@ -10,15 +10,15 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  18 : 19  @  18 : 19
+> CHANGE  16 : 17  @  16 : 17
 
 ~ 	public int quantityDropped(EaglercraftRandom random) {
 
-> CHANGE  22 : 23  @  22 : 23
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public int quantityDroppedWithBonus(int i, EaglercraftRandom random) {
 
-> CHANGE  26 : 27  @  26 : 27
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockSign.edit.java b/patches/minecraft/net/minecraft/block/BlockSign.edit.java
index 0b9e18d..fd4d52e 100644
--- a/patches/minecraft/net/minecraft/block/BlockSign.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockSign.edit.java
@@ -10,11 +10,11 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  54 : 55  @  54 : 55
+> CHANGE  52 : 53  @  52 : 53
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
-> CHANGE  64 : 65  @  64 : 71
+> CHANGE  10 : 11  @  10 : 17
 
 ~ 		return true;
 
diff --git a/patches/minecraft/net/minecraft/block/BlockSilverfish.edit.java b/patches/minecraft/net/minecraft/block/BlockSilverfish.edit.java
index 3653e54..da3d3d1 100644
--- a/patches/minecraft/net/minecraft/block/BlockSilverfish.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockSilverfish.edit.java
@@ -10,13 +10,13 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  11  @  13 : 14
+> DELETE  8  @  10 : 11
 
-> CHANGE  19 : 20  @  22 : 24
+> CHANGE  8 : 9  @  9 : 11
 
 ~ 	public static PropertyEnum VARIANT;
 
-> CHANGE  28 : 33  @  32 : 33
+> CHANGE  9 : 14  @  10 : 11
 
 ~ 	public static void bootstrapStates() {
 ~ 		VARIANT = PropertyEnum.create("variant", BlockSilverfish.EnumType.class);
@@ -24,6 +24,6 @@
 ~ 
 ~ 	public int quantityDropped(EaglercraftRandom var1) {
 
-> DELETE  59  @  59 : 70
+> DELETE  31  @  27 : 38
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockSkull.edit.java b/patches/minecraft/net/minecraft/block/BlockSkull.edit.java
index 48432e1..2a7e08a 100644
--- a/patches/minecraft/net/minecraft/block/BlockSkull.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockSkull.edit.java
@@ -10,32 +10,32 @@
 + import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 + 
 
-> CHANGE  5 : 6  @  3 : 5
+> CHANGE  3 : 4  @  1 : 3
 
 ~ 
 
-> DELETE  17  @  16 : 17
+> DELETE  12  @  13 : 14
 
-> DELETE  22  @  22 : 25
+> DELETE  5  @  6 : 9
 
-> DELETE  27  @  30 : 31
+> DELETE  5  @  8 : 9
 
-> DELETE  28  @  32 : 33
+> DELETE  1  @  2 : 3
 
-> DELETE  122  @  127 : 139
+> DELETE  94  @  95 : 107
 
-> DELETE  123  @  140 : 146
+> DELETE  1  @  13 : 19
 
-> CHANGE  125 : 126  @  148 : 149
+> CHANGE  2 : 3  @  8 : 9
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
-> CHANGE  130 : 131  @  153 : 155
+> CHANGE  5 : 6  @  5 : 7
 
 ~ 		return false;
 
-> DELETE  134  @  158 : 168
+> DELETE  4  @  5 : 15
 
-> DELETE  135  @  169 : 210
+> DELETE  1  @  11 : 52
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockSlab.edit.java b/patches/minecraft/net/minecraft/block/BlockSlab.edit.java
index f89ca53..18c22f6 100644
--- a/patches/minecraft/net/minecraft/block/BlockSlab.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockSlab.edit.java
@@ -10,18 +10,18 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  21 : 22  @  21 : 23
+> CHANGE  18 : 19  @  18 : 20
 
 ~ 	public static PropertyEnum HALF;
 
-> INSERT  34 : 38  @  35
+> INSERT  13 : 17  @  14
 
 + 	public static void bootstrapStates() {
 + 		HALF = PropertyEnum.create("half", BlockSlab.EnumBlockHalf.class);
 + 	}
 + 
 
-> CHANGE  86 : 87  @  83 : 84
+> CHANGE  52 : 53  @  48 : 49
 
 ~ 	public int quantityDropped(EaglercraftRandom var1) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockSnow.edit.java b/patches/minecraft/net/minecraft/block/BlockSnow.edit.java
index 1972225..abf751d 100644
--- a/patches/minecraft/net/minecraft/block/BlockSnow.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockSnow.edit.java
@@ -10,15 +10,15 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  100 : 101  @  100 : 101
+> CHANGE  98 : 99  @  98 : 99
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
-> CHANGE  104 : 105  @  104 : 105
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public int quantityDropped(EaglercraftRandom var1) {
 
-> CHANGE  108 : 109  @  108 : 109
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockSnowBlock.edit.java b/patches/minecraft/net/minecraft/block/BlockSnowBlock.edit.java
index 396e032..e2c7d75 100644
--- a/patches/minecraft/net/minecraft/block/BlockSnowBlock.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockSnowBlock.edit.java
@@ -10,15 +10,15 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  20 : 21  @  20 : 21
+> CHANGE  18 : 19  @  18 : 19
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
-> CHANGE  24 : 25  @  24 : 25
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public int quantityDropped(EaglercraftRandom var1) {
 
-> CHANGE  28 : 29  @  28 : 29
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockSponge.edit.java b/patches/minecraft/net/minecraft/block/BlockSponge.edit.java
index dfe6d6c..53c8b6b 100644
--- a/patches/minecraft/net/minecraft/block/BlockSponge.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockSponge.edit.java
@@ -7,18 +7,18 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  5 : 9  @  6 : 8
+> CHANGE  3 : 7  @  4 : 6
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 ~ import com.google.common.collect.Lists;
 ~ 
 
-> CHANGE  61 : 62  @  60 : 61
+> CHANGE  56 : 57  @  54 : 55
 
 ~ 		ArrayList arraylist = Lists.newArrayList();
 
-> CHANGE  111 : 112  @  110 : 111
+> CHANGE  50 : 51  @  50 : 51
 
 ~ 	public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockStainedGlass.edit.java b/patches/minecraft/net/minecraft/block/BlockStainedGlass.edit.java
index 8925d29..1b6df5c 100644
--- a/patches/minecraft/net/minecraft/block/BlockStainedGlass.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockStainedGlass.edit.java
@@ -10,12 +10,12 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  48 : 49  @  49 : 50
+> CHANGE  45 : 46  @  46 : 47
 
 ~ 	public int quantityDropped(EaglercraftRandom var1) {
 
-> DELETE  65  @  66 : 69
+> DELETE  17  @  17 : 20
 
-> DELETE  69  @  73 : 76
+> DELETE  4  @  7 : 10
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockStainedGlassPane.edit.java b/patches/minecraft/net/minecraft/block/BlockStainedGlassPane.edit.java
index 4a6a9cf..94171ef 100644
--- a/patches/minecraft/net/minecraft/block/BlockStainedGlassPane.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockStainedGlassPane.edit.java
@@ -9,8 +9,8 @@
 
 ~ 
 
-> DELETE  62  @  63 : 66
+> DELETE  59  @  60 : 63
 
-> DELETE  66  @  70 : 73
+> DELETE  4  @  7 : 10
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockStairs.edit.java b/patches/minecraft/net/minecraft/block/BlockStairs.edit.java
index 5e7f0f0..5692eed 100644
--- a/patches/minecraft/net/minecraft/block/BlockStairs.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockStairs.edit.java
@@ -10,12 +10,12 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  30 : 32  @  30 : 34
+> CHANGE  26 : 28  @  26 : 30
 
 ~ 	public static PropertyEnum HALF;
 ~ 	public static PropertyEnum SHAPE;
 
-> INSERT  52 : 57  @  54
+> INSERT  22 : 27  @  24
 
 + 	public static void bootstrapStates() {
 + 		HALF = PropertyEnum.create("half", BlockStairs.EnumHalf.class);
@@ -23,11 +23,11 @@
 + 	}
 + 
 
-> CHANGE  401 : 402  @  398 : 399
+> CHANGE  349 : 350  @  344 : 345
 
 ~ 	public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
 
-> CHANGE  462 : 463  @  459 : 460
+> CHANGE  61 : 62  @  61 : 62
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockStaticLiquid.edit.java b/patches/minecraft/net/minecraft/block/BlockStaticLiquid.edit.java
index ae961cf..63bcc5a 100644
--- a/patches/minecraft/net/minecraft/block/BlockStaticLiquid.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockStaticLiquid.edit.java
@@ -10,7 +10,7 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  34 : 35  @  36 : 37
+> CHANGE  32 : 33  @  34 : 35
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockStem.edit.java b/patches/minecraft/net/minecraft/block/BlockStem.edit.java
index a8217a3..b7a4a42 100644
--- a/patches/minecraft/net/minecraft/block/BlockStem.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockStem.edit.java
@@ -10,27 +10,27 @@
 + import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 + 
 
-> CHANGE  5 : 6  @  3 : 8
+> CHANGE  3 : 4  @  1 : 6
 
 ~ 
 
-> DELETE  16  @  18 : 19
+> DELETE  11  @  15 : 16
 
-> CHANGE  58 : 59  @  61 : 62
+> CHANGE  42 : 43  @  43 : 44
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
 
-> DELETE  119  @  122 : 139
+> DELETE  61  @  61 : 78
 
-> CHANGE  124 : 125  @  144 : 145
+> CHANGE  5 : 6  @  22 : 23
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
-> CHANGE  137 : 138  @  157 : 158
+> CHANGE  13 : 14  @  13 : 14
 
 ~ 	public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) {
 
-> CHANGE  141 : 142  @  161 : 162
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public void grow(World world, EaglercraftRandom var2, BlockPos blockpos, IBlockState iblockstate) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockStone.edit.java b/patches/minecraft/net/minecraft/block/BlockStone.edit.java
index 83b5107..8399c08 100644
--- a/patches/minecraft/net/minecraft/block/BlockStone.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockStone.edit.java
@@ -10,18 +10,18 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  19 : 20  @  19 : 21
+> CHANGE  16 : 17  @  16 : 18
 
 ~ 	public static PropertyEnum VARIANT;
 
-> INSERT  27 : 31  @  28
+> INSERT  8 : 12  @  9
 
 + 	public static void bootstrapStates() {
 + 		VARIANT = PropertyEnum.create("variant", BlockStone.EnumType.class);
 + 	}
 + 
 
-> CHANGE  40 : 41  @  37 : 38
+> CHANGE  13 : 14  @  9 : 10
 
 ~ 	public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockStoneBrick.edit.java b/patches/minecraft/net/minecraft/block/BlockStoneBrick.edit.java
index fabad13..d0aa8cc 100644
--- a/patches/minecraft/net/minecraft/block/BlockStoneBrick.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockStoneBrick.edit.java
@@ -9,11 +9,11 @@
 
 ~ 
 
-> CHANGE  15 : 16  @  15 : 17
+> CHANGE  12 : 13  @  12 : 14
 
 ~ 	public static PropertyEnum VARIANT;
 
-> INSERT  27 : 31  @  28
+> INSERT  12 : 16  @  13
 
 + 	public static void bootstrapStates() {
 + 		VARIANT = PropertyEnum.create("variant", BlockStoneBrick.EnumType.class);
diff --git a/patches/minecraft/net/minecraft/block/BlockStoneSlab.edit.java b/patches/minecraft/net/minecraft/block/BlockStoneSlab.edit.java
index 376382d..ae44733 100644
--- a/patches/minecraft/net/minecraft/block/BlockStoneSlab.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockStoneSlab.edit.java
@@ -10,11 +10,11 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  22 : 23  @  22 : 24
+> CHANGE  19 : 20  @  19 : 21
 
 ~ 	public static PropertyEnum VARIANT;
 
-> CHANGE  37 : 42  @  38 : 39
+> CHANGE  15 : 20  @  16 : 17
 
 ~ 	public static void bootstrapStates() {
 ~ 		VARIANT = PropertyEnum.create("variant", BlockStoneSlab.EnumType.class);
diff --git a/patches/minecraft/net/minecraft/block/BlockStoneSlabNew.edit.java b/patches/minecraft/net/minecraft/block/BlockStoneSlabNew.edit.java
index 9360b67..a8b57bb 100644
--- a/patches/minecraft/net/minecraft/block/BlockStoneSlabNew.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockStoneSlabNew.edit.java
@@ -10,18 +10,18 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  23 : 24  @  24 : 26
+> CHANGE  20 : 21  @  21 : 23
 
 ~ 	public static PropertyEnum VARIANT;
 
-> INSERT  38 : 42  @  40
+> INSERT  15 : 19  @  16
 
 + 	public static void bootstrapStates() {
 + 		VARIANT = PropertyEnum.create("variant", BlockStoneSlabNew.EnumType.class);
 + 	}
 + 
 
-> CHANGE  46 : 47  @  44 : 45
+> CHANGE  8 : 9  @  4 : 5
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockTNT.edit.java b/patches/minecraft/net/minecraft/block/BlockTNT.edit.java
index 8a7ff91..0bc7f84 100644
--- a/patches/minecraft/net/minecraft/block/BlockTNT.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockTNT.edit.java
@@ -7,18 +7,18 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  8  @  9 : 10
+> DELETE  6  @  7 : 8
 
-> DELETE  9  @  11 : 12
+> DELETE  1  @  2 : 3
 
-> DELETE  10  @  13 : 14
+> DELETE  1  @  2 : 3
 
-> DELETE  43  @  47 : 57
+> DELETE  33  @  34 : 44
 
-> DELETE  48  @  62 : 69
+> DELETE  5  @  15 : 22
 
-> DELETE  49  @  70 : 71
+> DELETE  1  @  8 : 9
 
-> DELETE  71  @  93 : 108
+> DELETE  22  @  23 : 38
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockTallGrass.edit.java b/patches/minecraft/net/minecraft/block/BlockTallGrass.edit.java
index e331568..f417594 100644
--- a/patches/minecraft/net/minecraft/block/BlockTallGrass.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockTallGrass.edit.java
@@ -10,36 +10,36 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  11  @  14 : 15
+> DELETE  8  @  11 : 12
 
-> DELETE  15  @  19 : 21
+> DELETE  4  @  5 : 7
 
-> CHANGE  22 : 23  @  28 : 30
+> CHANGE  7 : 8  @  9 : 11
 
 ~ 	public static PropertyEnum TYPE;
 
-> INSERT  31 : 35  @  38
+> INSERT  9 : 13  @  10
 
 + 	public static void bootstrapStates() {
 + 		TYPE = PropertyEnum.create("type", BlockTallGrass.EnumType.class);
 + 	}
 + 
 
-> CHANGE  61 : 62  @  64 : 65
+> CHANGE  30 : 31  @  26 : 27
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int var3) {
 
-> CHANGE  65 : 66  @  68 : 69
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public int quantityDroppedWithBonus(int i, EaglercraftRandom random) {
 
-> DELETE  69  @  72 : 85
+> DELETE  4  @  4 : 17
 
-> CHANGE  85 : 86  @  101 : 102
+> CHANGE  16 : 17  @  29 : 30
 
 ~ 	public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) {
 
-> CHANGE  89 : 90  @  105 : 106
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public void grow(World world, EaglercraftRandom var2, BlockPos blockpos, IBlockState iblockstate) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockTorch.edit.java b/patches/minecraft/net/minecraft/block/BlockTorch.edit.java
index 56e1cc3..7a0aca1 100644
--- a/patches/minecraft/net/minecraft/block/BlockTorch.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockTorch.edit.java
@@ -10,11 +10,11 @@
 + import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 + 
 
-> CHANGE  5 : 6  @  3 : 6
+> CHANGE  3 : 4  @  1 : 4
 
 ~ 
 
-> CHANGE  155 : 156  @  155 : 156
+> CHANGE  150 : 151  @  152 : 153
 
 ~ 	public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockTrapDoor.edit.java b/patches/minecraft/net/minecraft/block/BlockTrapDoor.edit.java
index fcfe3e2..ba5095d 100644
--- a/patches/minecraft/net/minecraft/block/BlockTrapDoor.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockTrapDoor.edit.java
@@ -7,17 +7,17 @@
 
 > DELETE  2  @  2 : 5
 
-> CHANGE  26 : 27  @  29 : 31
+> CHANGE  24 : 25  @  27 : 29
 
 ~ 	public static PropertyEnum HALF;
 
-> INSERT  38 : 42  @  42
+> INSERT  12 : 16  @  13
 
 + 	public static void bootstrapStates() {
 + 		HALF = PropertyEnum.create("half", BlockTrapDoor.DoorHalf.class);
 + 	}
 + 
 
-> DELETE  119  @  119 : 139
+> DELETE  81  @  77 : 97
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockTripWire.edit.java b/patches/minecraft/net/minecraft/block/BlockTripWire.edit.java
index 40b6dbf..4e9d1dc 100644
--- a/patches/minecraft/net/minecraft/block/BlockTripWire.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockTripWire.edit.java
@@ -10,14 +10,14 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  9  @  11 : 13
+> DELETE  7  @  9 : 11
 
-> CHANGE  68 : 69  @  72 : 73
+> CHANGE  59 : 60  @  61 : 62
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
-> DELETE  111  @  115 : 125
+> DELETE  43  @  43 : 53
 
-> DELETE  131  @  145 : 193
+> DELETE  20  @  30 : 78
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockTripWireHook.edit.java b/patches/minecraft/net/minecraft/block/BlockTripWireHook.edit.java
index 5807e62..7a3806a 100644
--- a/patches/minecraft/net/minecraft/block/BlockTripWireHook.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockTripWireHook.edit.java
@@ -10,15 +10,15 @@
 + import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 + 
 
-> CHANGE  5 : 6  @  3 : 6
+> CHANGE  3 : 4  @  1 : 4
 
 ~ 
 
-> CHANGE  173 : 174  @  173 : 174
+> CHANGE  168 : 169  @  170 : 171
 
 ~ 	public void randomTick(World var1, BlockPos var2, IBlockState var3, EaglercraftRandom var4) {
 
-> CHANGE  176 : 177  @  176 : 177
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 	public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockVine.edit.java b/patches/minecraft/net/minecraft/block/BlockVine.edit.java
index 6e546bf..7eec21b 100644
--- a/patches/minecraft/net/minecraft/block/BlockVine.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockVine.edit.java
@@ -10,20 +10,20 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  11  @  11 : 14
+> DELETE  9  @  9 : 12
 
-> DELETE  12  @  15 : 18
+> DELETE  1  @  4 : 7
 
-> DELETE  179  @  185 : 319
+> DELETE  167  @  170 : 304
 
-> CHANGE  189 : 190  @  329 : 330
+> CHANGE  10 : 11  @  144 : 145
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
-> CHANGE  193 : 194  @  333 : 334
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public int quantityDropped(EaglercraftRandom var1) {
 
-> DELETE  197  @  337 : 349
+> DELETE  4  @  4 : 16
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockWall.edit.java b/patches/minecraft/net/minecraft/block/BlockWall.edit.java
index 26d9ba6..a669a43 100644
--- a/patches/minecraft/net/minecraft/block/BlockWall.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockWall.edit.java
@@ -9,11 +9,11 @@
 
 ~ 
 
-> CHANGE  28 : 29  @  29 : 31
+> CHANGE  25 : 26  @  26 : 28
 
 ~ 	public static PropertyEnum VARIANT;
 
-> INSERT  42 : 46  @  44
+> INSERT  14 : 18  @  15
 
 + 	public static void bootstrapStates() {
 + 		VARIANT = PropertyEnum.create("variant", BlockWall.EnumType.class);
diff --git a/patches/minecraft/net/minecraft/block/BlockWeb.edit.java b/patches/minecraft/net/minecraft/block/BlockWeb.edit.java
index 2710783..3f51b28 100644
--- a/patches/minecraft/net/minecraft/block/BlockWeb.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockWeb.edit.java
@@ -10,7 +10,7 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  37 : 38  @  37 : 38
+> CHANGE  35 : 36  @  35 : 36
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockWoodSlab.edit.java b/patches/minecraft/net/minecraft/block/BlockWoodSlab.edit.java
index e9953c1..be0b23d 100644
--- a/patches/minecraft/net/minecraft/block/BlockWoodSlab.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockWoodSlab.edit.java
@@ -10,18 +10,18 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  19 : 20  @  20 : 22
+> CHANGE  16 : 17  @  17 : 19
 
 ~ 	public static PropertyEnum VARIANT;
 
-> INSERT  32 : 36  @  34
+> INSERT  13 : 17  @  14
 
 + 	public static void bootstrapStates() {
 + 		VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class);
 + 	}
 + 
 
-> CHANGE  40 : 41  @  38 : 39
+> CHANGE  8 : 9  @  4 : 5
 
 ~ 	public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
 
diff --git a/patches/minecraft/net/minecraft/block/BlockWorkbench.edit.java b/patches/minecraft/net/minecraft/block/BlockWorkbench.edit.java
index ccdba35..193d61a 100644
--- a/patches/minecraft/net/minecraft/block/BlockWorkbench.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockWorkbench.edit.java
@@ -7,9 +7,9 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  10  @  11 : 12
+> DELETE  8  @  9 : 10
 
-> CHANGE  25 : 26  @  27 : 34
+> CHANGE  15 : 16  @  16 : 23
 
 ~ 		return true;
 
diff --git a/patches/minecraft/net/minecraft/block/IGrowable.edit.java b/patches/minecraft/net/minecraft/block/IGrowable.edit.java
index eb404ec..783f689 100644
--- a/patches/minecraft/net/minecraft/block/IGrowable.edit.java
+++ b/patches/minecraft/net/minecraft/block/IGrowable.edit.java
@@ -10,7 +10,7 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  11 : 12  @  10 : 13
+> CHANGE  9 : 10  @  8 : 11
 
 ~ 	boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4);
 
diff --git a/patches/minecraft/net/minecraft/block/properties/PropertyBool.edit.java b/patches/minecraft/net/minecraft/block/properties/PropertyBool.edit.java
index b75b366..ed47feb 100644
--- a/patches/minecraft/net/minecraft/block/properties/PropertyBool.edit.java
+++ b/patches/minecraft/net/minecraft/block/properties/PropertyBool.edit.java
@@ -7,14 +7,14 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  3  @  4 : 5
+> DELETE  1  @  2 : 3
 
-> INSERT  4 : 6  @  6
+> INSERT  1 : 3  @  2
 
 + import com.google.common.collect.ImmutableSet;
 + 
 
-> CHANGE  21 : 23  @  21 : 23
+> CHANGE  17 : 19  @  15 : 17
 
 ~ 	public String getName(Object value) {
 ~ 		return ((Boolean) value).toString();
diff --git a/patches/minecraft/net/minecraft/block/properties/PropertyDirection.edit.java b/patches/minecraft/net/minecraft/block/properties/PropertyDirection.edit.java
index 66a48de..0816247 100644
--- a/patches/minecraft/net/minecraft/block/properties/PropertyDirection.edit.java
+++ b/patches/minecraft/net/minecraft/block/properties/PropertyDirection.edit.java
@@ -10,7 +10,7 @@
 + import java.util.Collection;
 + 
 
-> CHANGE  8 : 9  @  6 : 8
+> CHANGE  6 : 7  @  4 : 6
 
 ~ 
 
diff --git a/patches/minecraft/net/minecraft/block/properties/PropertyEnum.edit.java b/patches/minecraft/net/minecraft/block/properties/PropertyEnum.edit.java
index 02ca5d6..7243d35 100644
--- a/patches/minecraft/net/minecraft/block/properties/PropertyEnum.edit.java
+++ b/patches/minecraft/net/minecraft/block/properties/PropertyEnum.edit.java
@@ -11,15 +11,15 @@
 + import java.util.Map;
 + 
 
-> CHANGE  11 : 12  @  8 : 11
+> CHANGE  9 : 10  @  6 : 9
 
 ~ 
 
-> CHANGE  22 : 23  @  21 : 22
+> CHANGE  11 : 12  @  13 : 14
 
 ~ 		for (T oenum : allowedValues) {
 
-> CHANGE  37 : 38  @  36 : 37
+> CHANGE  15 : 16  @  15 : 16
 
 ~ 	public String getName(Object oenum) {
 
diff --git a/patches/minecraft/net/minecraft/block/properties/PropertyInteger.edit.java b/patches/minecraft/net/minecraft/block/properties/PropertyInteger.edit.java
index 7eda9ef..3b80156 100644
--- a/patches/minecraft/net/minecraft/block/properties/PropertyInteger.edit.java
+++ b/patches/minecraft/net/minecraft/block/properties/PropertyInteger.edit.java
@@ -7,15 +7,15 @@
 
 > DELETE  2  @  2 : 4
 
-> DELETE  4  @  6 : 7
+> DELETE  2  @  4 : 5
 
-> INSERT  5 : 8  @  8
+> INSERT  1 : 4  @  2
 
 + import com.google.common.collect.ImmutableSet;
 + import com.google.common.collect.Sets;
 + 
 
-> CHANGE  57 : 58  @  57 : 58
+> CHANGE  52 : 53  @  49 : 50
 
 ~ 	public String getName(Object integer) {
 
diff --git a/patches/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.edit.java b/patches/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.edit.java
index 87f357f..ee5b2dc 100644
--- a/patches/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.edit.java
+++ b/patches/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  4 : 7  @  5
+> INSERT  2 : 5  @  3
 
 + 
 + import com.google.common.collect.Lists;
diff --git a/patches/minecraft/net/minecraft/block/state/BlockState.edit.java b/patches/minecraft/net/minecraft/block/state/BlockState.edit.java
index c4f3e7f..771423e 100644
--- a/patches/minecraft/net/minecraft/block/state/BlockState.edit.java
+++ b/patches/minecraft/net/minecraft/block/state/BlockState.edit.java
@@ -18,21 +18,21 @@
 + import java.util.Map;
 + 
 
-> CHANGE  22 : 23  @  12 : 21
+> CHANGE  20 : 21  @  10 : 19
 
 ~ 
 
-> DELETE  25  @  23 : 25
+> DELETE  3  @  11 : 13
 
-> CHANGE  48 : 49  @  48 : 49
+> CHANGE  23 : 24  @  25 : 26
 
 ~ 		ArrayList arraylist = Lists.newArrayList();
 
-> CHANGE  156 : 157  @  156 : 157
+> CHANGE  108 : 109  @  108 : 109
 
 ~ 					for (Object comparable : iproperty.getAllowedValues()) {
 
-> CHANGE  159 : 160  @  159 : 160
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 									map.get(this.getPropertiesWithValue(iproperty, (Comparable) comparable)));
 
diff --git a/patches/minecraft/net/minecraft/block/state/BlockStateBase.edit.java b/patches/minecraft/net/minecraft/block/state/BlockStateBase.edit.java
index eeb9a2a..d4b50df 100644
--- a/patches/minecraft/net/minecraft/block/state/BlockStateBase.edit.java
+++ b/patches/minecraft/net/minecraft/block/state/BlockStateBase.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 5
 
-> INSERT  5 : 10  @  8
+> INSERT  3 : 8  @  6
 
 + 
 + import com.google.common.base.Function;
@@ -15,9 +15,9 @@
 + import com.google.common.collect.Iterables;
 + 
 
-> DELETE  12  @  10 : 11
+> DELETE  7  @  2 : 3
 
-> CHANGE  28 : 29  @  27 : 28
+> CHANGE  16 : 17  @  17 : 18
 
 ~ 				(T) cyclePropertyValue(property.getAllowedValues(), this.getValue(property)));
 
diff --git a/patches/minecraft/net/minecraft/block/state/IBlockState.edit.java b/patches/minecraft/net/minecraft/block/state/IBlockState.edit.java
index 58780e9..a4bf6d5 100644
--- a/patches/minecraft/net/minecraft/block/state/IBlockState.edit.java
+++ b/patches/minecraft/net/minecraft/block/state/IBlockState.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.collect.ImmutableMap;
diff --git a/patches/minecraft/net/minecraft/block/state/pattern/BlockPattern.edit.java b/patches/minecraft/net/minecraft/block/state/pattern/BlockPattern.edit.java
index aa96d96..05d2050 100644
--- a/patches/minecraft/net/minecraft/block/state/pattern/BlockPattern.edit.java
+++ b/patches/minecraft/net/minecraft/block/state/pattern/BlockPattern.edit.java
@@ -11,40 +11,40 @@
 ~ import net.lax1dude.eaglercraft.v1_8.cache.EaglerCacheProvider;
 ~ import net.lax1dude.eaglercraft.v1_8.cache.EaglerLoadingCache;
 
-> CHANGE  45 : 46  @  44 : 45
+> CHANGE  41 : 42  @  40 : 41
 
 ~ 			EaglerLoadingCache lcache) {
 
-> CHANGE  49 : 50  @  48 : 50
+> CHANGE  4 : 5  @  4 : 6
 
 ~ 					if (!this.blockMatches[k][j][i].apply(lcache.get(translateOffset(pos, finger, thumb, i, j, k)))) {
 
-> CHANGE  61 : 62  @  61 : 62
+> CHANGE  12 : 13  @  13 : 14
 
 ~ 		EaglerLoadingCache loadingcache = func_181627_a(worldIn, false);
 
-> CHANGE  81 : 83  @  81 : 83
+> CHANGE  20 : 22  @  20 : 22
 
 ~ 	public static EaglerLoadingCache func_181627_a(World parWorld, boolean parFlag) {
 ~ 		return new EaglerLoadingCache(new BlockPattern.CacheLoader(parWorld, parFlag));
 
-> CHANGE  99 : 100  @  99 : 100
+> CHANGE  18 : 19  @  18 : 19
 
 ~ 	static class CacheLoader implements EaglerCacheProvider {
 
-> CHANGE  108 : 109  @  108 : 109
+> CHANGE  9 : 10  @  9 : 10
 
 ~ 		public BlockWorldState create(BlockPos parBlockPos) {
 
-> CHANGE  117 : 118  @  117 : 118
+> CHANGE  9 : 10  @  9 : 10
 
 ~ 		private final EaglerLoadingCache lcache;
 
-> CHANGE  123 : 124  @  123 : 124
+> CHANGE  6 : 7  @  6 : 7
 
 ~ 				EaglerLoadingCache parLoadingCache, int parInt1, int parInt2, int parInt3) {
 
-> CHANGE  154 : 155  @  154 : 155
+> CHANGE  31 : 32  @  31 : 32
 
 ~ 			return (BlockWorldState) this.lcache.get(BlockPattern.translateOffset(this.pos, this.getFinger(),
 
diff --git a/patches/minecraft/net/minecraft/block/state/pattern/BlockStateHelper.edit.java b/patches/minecraft/net/minecraft/block/state/pattern/BlockStateHelper.edit.java
index a34c5fe..86cf7af 100644
--- a/patches/minecraft/net/minecraft/block/state/pattern/BlockStateHelper.edit.java
+++ b/patches/minecraft/net/minecraft/block/state/pattern/BlockStateHelper.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 4
 
-> INSERT  4 : 8  @  6
+> INSERT  2 : 6  @  4
 
 + 
 + import com.google.common.base.Predicate;
diff --git a/patches/minecraft/net/minecraft/block/state/pattern/FactoryBlockPattern.edit.java b/patches/minecraft/net/minecraft/block/state/pattern/FactoryBlockPattern.edit.java
index 44e4735..7453454 100644
--- a/patches/minecraft/net/minecraft/block/state/pattern/FactoryBlockPattern.edit.java
+++ b/patches/minecraft/net/minecraft/block/state/pattern/FactoryBlockPattern.edit.java
@@ -7,11 +7,11 @@
 
 > DELETE  2  @  2 : 7
 
-> CHANGE  7 : 8  @  12 : 15
+> CHANGE  5 : 6  @  10 : 13
 
 ~ 
 
-> INSERT  10 : 18  @  17
+> INSERT  3 : 11  @  5
 
 + import com.google.common.base.Joiner;
 + import com.google.common.base.Predicate;
@@ -22,11 +22,11 @@
 + import net.minecraft.block.state.BlockWorldState;
 + 
 
-> CHANGE  30 : 31  @  29 : 30
+> CHANGE  20 : 21  @  12 : 13
 
 ~ 		if (aisle.length > 0 && !StringUtils.isEmpty(aisle[0])) {
 
-> CHANGE  49 : 50  @  48 : 49
+> CHANGE  19 : 20  @  19 : 20
 
 ~ 							this.symbolMap.put(Character.valueOf(c0), (Predicate) null);
 
diff --git a/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.edit.java b/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.edit.java
index 0710154..3b661ee 100644
--- a/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.edit.java
@@ -10,23 +10,23 @@
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  6  @  5 : 7
+> DELETE  4  @  3 : 5
 
-> DELETE  7  @  8 : 9
+> DELETE  1  @  3 : 4
 
-> DELETE  8  @  10 : 11
+> DELETE  1  @  2 : 3
 
-> DELETE  18  @  21 : 22
+> DELETE  10  @  11 : 12
 
-> DELETE  22  @  26 : 28
+> DELETE  4  @  5 : 7
 
-> CHANGE  44 : 47  @  50 : 60
+> CHANGE  22 : 25  @  24 : 34
 
 ~ 			ScaledResolution scaledresolution = new ScaledResolution(this.mc);
 ~ 			GlStateManager.ortho(0.0D, scaledresolution.getScaledWidth_double(),
 ~ 					scaledresolution.getScaledHeight_double(), 0.0D, 100.0D, 300.0D);
 
-> INSERT  66 : 80  @  79
+> INSERT  22 : 36  @  29
 
 + 	public void eaglerShow(String line1, String line2) {
 + 		if (!this.mc.running) {
@@ -43,15 +43,15 @@
 + 	}
 + 
 
-> CHANGE  93 : 94  @  92 : 99
+> CHANGE  27 : 28  @  13 : 20
 
 ~ 				GlStateManager.clear(256);
 
-> CHANGE  101 : 103  @  106 : 109
+> CHANGE  8 : 10  @  14 : 17
 
 ~ 				GlStateManager.clear(16640);
 ~ 				GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
 
-> DELETE  147  @  153 : 158
+> DELETE  46  @  47 : 52
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/Minecraft.edit.java b/patches/minecraft/net/minecraft/client/Minecraft.edit.java
index 1aa3418..478c25c 100644
--- a/patches/minecraft/net/minecraft/client/Minecraft.edit.java
+++ b/patches/minecraft/net/minecraft/client/Minecraft.edit.java
@@ -7,17 +7,17 @@
 
 > DELETE  2  @  2 : 17
 
-> DELETE  4  @  19 : 23
+> DELETE  2  @  17 : 21
 
-> DELETE  5  @  24 : 25
+> DELETE  1  @  5 : 6
 
-> CHANGE  7 : 8  @  27 : 31
+> CHANGE  2 : 3  @  3 : 7
 
 ~ import java.util.LinkedList;
 
-> DELETE  9  @  32 : 35
+> DELETE  2  @  5 : 8
 
-> CHANGE  10 : 41  @  36 : 39
+> CHANGE  1 : 32  @  4 : 7
 
 ~ 
 ~ import org.apache.commons.lang3.Validate;
@@ -51,94 +51,94 @@
 ~ import net.lax1dude.eaglercraft.v1_8.socket.EaglercraftNetworkManager;
 ~ import net.lax1dude.eaglercraft.v1_8.socket.RateLimitTracker;
 
-> DELETE  43  @  41 : 43
+> DELETE  33  @  5 : 7
 
-> DELETE  56  @  56 : 58
+> DELETE  13  @  15 : 17
 
-> DELETE  59  @  61 : 62
+> DELETE  3  @  5 : 6
 
-> INSERT  62 : 63  @  65
+> INSERT  3 : 4  @  4
 
 + import net.minecraft.client.multiplayer.ServerAddress;
 
-> INSERT  64 : 65  @  66
+> INSERT  2 : 3  @  1
 
 + import net.minecraft.client.multiplayer.ServerList;
 
-> DELETE  66  @  67 : 68
+> DELETE  2  @  1 : 2
 
-> DELETE  70  @  72 : 73
+> DELETE  4  @  5 : 6
 
-> DELETE  71  @  74 : 75
+> DELETE  1  @  2 : 3
 
-> DELETE  73  @  77 : 78
+> DELETE  2  @  3 : 4
 
-> DELETE  88  @  93 : 94
+> DELETE  15  @  16 : 17
 
-> DELETE  90  @  96 : 97
+> DELETE  2  @  3 : 4
 
-> DELETE  104  @  111 : 112
+> DELETE  14  @  15 : 16
 
-> DELETE  105  @  113 : 115
+> DELETE  1  @  2 : 4
 
-> DELETE  126  @  136 : 140
+> DELETE  21  @  23 : 27
 
-> DELETE  127  @  141 : 143
+> DELETE  1  @  5 : 7
 
-> DELETE  128  @  144 : 146
+> DELETE  1  @  3 : 5
 
-> DELETE  133  @  151 : 152
+> DELETE  5  @  7 : 8
 
-> INSERT  144 : 145  @  163
+> INSERT  11 : 12  @  12
 
 + import net.minecraft.util.StringTranslate;
 
-> DELETE  151  @  169 : 189
+> DELETE  7  @  6 : 26
 
-> CHANGE  152 : 153  @  190 : 191
+> CHANGE  1 : 2  @  21 : 22
 
 ~ public class Minecraft implements IThreadListener {
 
-> CHANGE  155 : 156  @  193 : 200
+> CHANGE  3 : 4  @  3 : 10
 
 ~ 	public static final boolean isRunningOnMac = false;
 
-> DELETE  168  @  212 : 214
+> DELETE  13  @  19 : 21
 
-> DELETE  187  @  233 : 234
+> DELETE  19  @  21 : 22
 
-> DELETE  193  @  240 : 242
+> DELETE  6  @  7 : 9
 
-> DELETE  194  @  243 : 245
+> DELETE  1  @  3 : 5
 
-> CHANGE  205 : 206  @  256 : 257
+> CHANGE  11 : 12  @  13 : 14
 
 ~ 	private EaglercraftNetworkManager myNetworkManager;
 
-> DELETE  215  @  266 : 268
+> DELETE  10  @  10 : 12
 
-> CHANGE  219 : 220  @  272 : 275
+> CHANGE  4 : 5  @  6 : 9
 
 ~ 	private final List> scheduledTasks = new LinkedList();
 
-> INSERT  234 : 236  @  289
+> INSERT  15 : 17  @  17
 
 + 	public int joinWorldTickCounter = 0;
 + 	private int dontPauseTimer = 0;
 
-> CHANGE  239 : 240  @  292 : 295
+> CHANGE  5 : 6  @  3 : 6
 
 ~ 		StringTranslate.doCLINIT();
 
-> CHANGE  241 : 242  @  296 : 304
+> CHANGE  2 : 3  @  4 : 12
 
 ~ 		this.mcDefaultResourcePack = new DefaultResourcePack();
 
-> CHANGE  243 : 244  @  305 : 307
+> CHANGE  2 : 3  @  9 : 11
 
 ~ 		logger.info("Setting user: " + this.session.getProfile().getName());
 
-> CHANGE  251 : 256  @  314 : 318
+> CHANGE  8 : 13  @  9 : 13
 
 ~ 		String serverToJoin = EagRuntime.getConfiguration().getServerToJoin();
 ~ 		if (serverToJoin != null) {
@@ -146,16 +146,16 @@
 ~ 			this.serverName = addr.getIP();
 ~ 			this.serverPort = addr.getPort();
 
-> DELETE  258  @  320 : 321
+> DELETE  7  @  6 : 7
 
-> CHANGE  273 : 275  @  336 : 338
+> CHANGE  15 : 17  @  16 : 18
 
 ~ 		try {
 ~ 			while (true) {
 
-> DELETE  291  @  354 : 371
+> DELETE  18  @  18 : 35
 
-> CHANGE  292 : 307  @  372 : 374
+> CHANGE  1 : 16  @  18 : 20
 
 ~ 		} catch (MinecraftError var12) {
 ~ 			// ??
@@ -173,85 +173,85 @@
 ~ 		} finally {
 ~ 			this.shutdownMinecraftApplet();
 
-> CHANGE  311 : 313  @  378 : 380
+> CHANGE  19 : 21  @  6 : 8
 
 ~ 	private void startGame() throws IOException {
 ~ 		this.gameSettings = new GameSettings(this);
 
-> DELETE  314  @  381 : 382
+> DELETE  3  @  3 : 4
 
-> CHANGE  319 : 320  @  387 : 390
+> CHANGE  5 : 6  @  6 : 9
 
 ~ 		logger.info("EagRuntime Version: " + EagRuntime.getVersion());
 
-> DELETE  321  @  391 : 394
+> DELETE  2  @  4 : 7
 
-> CHANGE  322 : 323  @  395 : 397
+> CHANGE  1 : 2  @  4 : 6
 
 ~ 		this.mcResourcePackRepository = new ResourcePackRepository(this.mcDefaultResourcePack, this.metadataSerializer_,
 
-> DELETE  331  @  405 : 408
+> DELETE  9  @  10 : 13
 
-> CHANGE  334 : 336  @  411 : 413
+> CHANGE  3 : 5  @  6 : 8
 
 ~ 		this.fontRendererObj = new EaglerFontRenderer(this.gameSettings,
 ~ 				new ResourceLocation("textures/font/ascii.png"), this.renderEngine, false);
 
-> CHANGE  341 : 342  @  418 : 419
+> CHANGE  7 : 8  @  7 : 8
 
 ~ 		this.standardGalacticFontRenderer = new EaglerFontRenderer(this.gameSettings,
 
-> CHANGE  350 : 351  @  427 : 428
+> CHANGE  9 : 10  @  9 : 10
 
 ~ 					return HString.format(parString1, new Object[] { GameSettings
 
-> CHANGE  361 : 362  @  438 : 439
+> CHANGE  11 : 12  @  11 : 12
 
 ~ 		GlStateManager.clearDepth(1.0f);
 
-> INSERT  392 : 393  @  469
+> INSERT  31 : 32  @  31
 
 + 		SkinPreviewRenderer.initialize();
 
-> INSERT  395 : 399  @  471
+> INSERT  3 : 7  @  2
 
 + 
 + 		ServerList.initServerList(this);
 + 		EaglerProfile.read();
 + 
 
-> CHANGE  400 : 402  @  472 : 473
+> CHANGE  5 : 7  @  1 : 2
 
 ~ 			this.displayGuiScreen(new GuiScreenEditProfile(
 ~ 					new GuiConnecting(new GuiMainMenu(), this, this.serverName, this.serverPort)));
 
-> CHANGE  403 : 404  @  474 : 475
+> CHANGE  3 : 4  @  2 : 3
 
 ~ 			this.displayGuiScreen(new GuiScreenEditProfile(new GuiMainMenu()));
 
-> DELETE  409  @  480 : 492
+> DELETE  6  @  6 : 18
 
-> CHANGE  425 : 426  @  508 : 516
+> CHANGE  16 : 17  @  28 : 36
 
 ~ 		throw new UnsupportedOperationException("wtf u trying to twitch stream in a browser game?");
 
-> CHANGE  428 : 431  @  518 : 540
+> CHANGE  3 : 6  @  10 : 32
 
 ~ 	private void createDisplay() {
 ~ 		Display.create();
 ~ 		Display.setTitle("Eaglercraft 1.8.8");
 
-> DELETE  433  @  542 : 579
+> DELETE  5  @  24 : 61
 
-> CHANGE  434 : 435  @  580 : 590
+> CHANGE  1 : 2  @  38 : 48
 
 ~ 		return true;
 
-> DELETE  437  @  592 : 596
+> DELETE  3  @  12 : 16
 
-> DELETE  441  @  600 : 617
+> DELETE  4  @  8 : 25
 
-> CHANGE  447 : 459  @  623 : 636
+> CHANGE  6 : 18  @  23 : 36
 
 ~ 		String report = crashReportIn.getCompleteReport();
 ~ 		Bootstrap.printToSYSOUT(report);
@@ -266,76 +266,76 @@
 ~ 			System.err.println(
 ~ 					"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%");
 
-> DELETE  460  @  637 : 638
+> DELETE  13  @  14 : 15
 
-> INSERT  467 : 469  @  645
+> INSERT  7 : 9  @  8
 
 + 		GlStateManager.recompileShaders();
 + 
 
-> CHANGE  483 : 485  @  659 : 660
+> CHANGE  16 : 18  @  14 : 15
 
 ~ 			logger.info("Caught error stitching, removing all assigned resourcepacks");
 ~ 			logger.info(runtimeexception);
 
-> CHANGE  501 : 504  @  676 : 688
+> CHANGE  18 : 21  @  17 : 29
 
 ~ 	private void updateDisplayMode() {
 ~ 		this.displayWidth = Display.getWidth();
 ~ 		this.displayHeight = Display.getHeight();
 
-> CHANGE  506 : 510  @  690 : 734
+> CHANGE  5 : 9  @  14 : 58
 
 ~ 	private void drawSplashScreen(TextureManager textureManagerInstance) {
 ~ 		Display.update();
 ~ 		updateDisplayMode();
 ~ 		GlStateManager.viewport(0, 0, displayWidth, displayHeight);
 
-> DELETE  512  @  736 : 739
+> DELETE  6  @  46 : 49
 
-> CHANGE  528 : 529  @  755 : 756
+> CHANGE  16 : 17  @  19 : 20
 
 ~ 					new DynamicTexture(ImageData.loadImageFile(inputstream)));
 
-> DELETE  553  @  780 : 782
+> DELETE  25  @  25 : 27
 
-> DELETE  579  @  808 : 812
+> DELETE  26  @  28 : 32
 
-> CHANGE  610 : 611  @  843 : 844
+> CHANGE  31 : 32  @  35 : 36
 
 ~ 	public void checkGLError(String message) {
 
-> CHANGE  612 : 613  @  845 : 846
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 			int i = EaglercraftGPU.glGetError();
 
-> CHANGE  614 : 615  @  847 : 848
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 				String s = EaglercraftGPU.gluErrorString(i);
 
-> DELETE  625  @  858 : 859
+> DELETE  11  @  11 : 12
 
-> CHANGE  635 : 636  @  869 : 870
+> CHANGE  10 : 11  @  11 : 12
 
 ~ 			EagRuntime.destroy();
 
-> CHANGE  637 : 638  @  871 : 872
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 				EagRuntime.exit();
 
-> DELETE  641  @  875 : 877
+> DELETE  4  @  4 : 6
 
-> CHANGE  646 : 647  @  882 : 883
+> CHANGE  5 : 6  @  7 : 8
 
 ~ 		if (Display.isCloseRequested()) {
 
-> CHANGE  661 : 662  @  897 : 898
+> CHANGE  15 : 16  @  15 : 16
 
 ~ 				Util.func_181617_a((FutureTask) this.scheduledTasks.remove(0), logger);
 
-> DELETE  680  @  916 : 924
+> DELETE  19  @  19 : 27
 
-> CHANGE  681 : 691  @  925 : 929
+> CHANGE  1 : 11  @  9 : 13
 
 ~ 		if (!Display.contextLost()) {
 ~ 			GlStateManager.clearColor(0.0f, 0.0f, 0.0f, 1.0f);
@@ -348,7 +348,7 @@
 ~ 			}
 ~ 
 
-> CHANGE  692 : 697  @  930 : 931
+> CHANGE  11 : 16  @  5 : 6
 
 ~ 			if (!this.skipRenderWorld) {
 ~ 				this.mcProfiler.endStartSection("gameRenderer");
@@ -356,7 +356,7 @@
 ~ 				this.mcProfiler.endSection();
 ~ 			}
 
-> CHANGE  698 : 710  @  932 : 936
+> CHANGE  6 : 18  @  2 : 6
 
 ~ 			this.mcProfiler.endSection();
 ~ 			if (this.gameSettings.showDebugInfo && this.gameSettings.showDebugProfilerChart
@@ -371,72 +371,72 @@
 ~ 				this.mcProfiler.profilingEnabled = false;
 ~ 				this.prevFrameTime = System.nanoTime();
 
-> CHANGE  712 : 714  @  938 : 943
+> CHANGE  14 : 16  @  6 : 11
 
 ~ 			this.guiAchievement.updateAchievementWindow();
 ~ 			GlStateManager.popMatrix();
 
-> DELETE  716  @  945 : 954
+> DELETE  4  @  7 : 16
 
-> DELETE  718  @  956 : 964
+> DELETE  2  @  11 : 19
 
-> INSERT  719 : 720  @  965
+> INSERT  1 : 2  @  9
 
 + 
 
-> CHANGE  721 : 722  @  966 : 968
+> CHANGE  2 : 3  @  1 : 3
 
 ~ 		this.isGamePaused = false;
 
-> CHANGE  728 : 729  @  974 : 975
+> CHANGE  7 : 8  @  8 : 9
 
 ~ 			this.debug = HString.format("%d fps (%d chunk update%s) T: %s%s%s%s",
 
-> CHANGE  734 : 736  @  980 : 984
+> CHANGE  6 : 8  @  6 : 10
 
 ~ 							this.gameSettings.fancyGraphics ? "" : " fast", this.gameSettings.clouds == 0 ? ""
 ~ 									: (this.gameSettings.clouds == 1 ? " fast-clouds" : " fancy-clouds") });
 
-> DELETE  739  @  987 : 991
+> DELETE  5  @  7 : 11
 
-> DELETE  788  @  1040 : 1047
+> DELETE  49  @  53 : 60
 
-> CHANGE  836 : 837  @  1095 : 1096
+> CHANGE  48 : 49  @  55 : 56
 
 ~ 			EaglercraftGPU.glLineWidth(1.0F);
 
-> CHANGE  846 : 847  @  1105 : 1106
+> CHANGE  10 : 11  @  10 : 11
 
 ~ 					(double) ((float) j - (float) short1 * 0.6F - 16.0F), 0.0D).color(0, 0, 0, 100).endVertex();
 
-> CHANGE  848 : 849  @  1107 : 1108
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 					.color(0, 0, 0, 100).endVertex();
 
-> CHANGE  850 : 851  @  1109 : 1110
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 					.color(0, 0, 0, 100).endVertex();
 
-> CHANGE  852 : 853  @  1111 : 1112
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 					(double) ((float) j - (float) short1 * 0.6F - 16.0F), 0.0D).color(0, 0, 0, 100).endVertex();
 
-> DELETE  963  @  1222 : 1226
+> DELETE  111  @  111 : 115
 
-> CHANGE  1071 : 1072  @  1334 : 1374
+> CHANGE  108 : 109  @  112 : 152
 
 ~ 		logger.error("Use F11 to toggle fullscreen!");
 
-> DELETE  1083  @  1385 : 1386
+> DELETE  12  @  51 : 52
 
-> DELETE  1085  @  1388 : 1396
+> DELETE  2  @  3 : 11
 
-> INSERT  1094 : 1096  @  1405
+> INSERT  9 : 11  @  17
 
 + 		RateLimitTracker.tick();
 + 
 
-> INSERT  1119 : 1125  @  1428
+> INSERT  25 : 31  @  23
 
 + 			if (this.currentScreen == null && this.dontPauseTimer <= 0) {
 + 				if (!Mouse.isMouseGrabbed()) {
@@ -445,7 +445,7 @@
 + 				}
 + 			}
 
-> INSERT  1132 : 1137  @  1435
+> INSERT  13 : 18  @  7
 
 + 			this.dontPauseTimer = 6;
 + 		} else {
@@ -453,28 +453,28 @@
 + 				--this.dontPauseTimer;
 + 			}
 
-> CHANGE  1147 : 1148  @  1445 : 1446
+> CHANGE  15 : 16  @  10 : 11
 
 ~ 						return Minecraft.this.currentScreen.getClass().getName();
 
-> CHANGE  1161 : 1162  @  1459 : 1460
+> CHANGE  14 : 15  @  14 : 15
 
 ~ 							return Minecraft.this.currentScreen.getClass().getName();
 
-> CHANGE  1202 : 1204  @  1500 : 1501
+> CHANGE  41 : 43  @  41 : 42
 
 ~ 						if ((!this.inGameHasFocus || !Mouse.isActuallyGrabbed()) && Mouse.getEventButtonState()) {
 ~ 							this.inGameHasFocus = false;
 
-> CHANGE  1246 : 1247  @  1543 : 1544
+> CHANGE  44 : 45  @  43 : 44
 
 ~ 						if (k == 1 || (k > -1 && k == this.gameSettings.keyBindClose.getKeyCode())) {
 
-> INSERT  1288 : 1289  @  1585
+> INSERT  42 : 43  @  42
 
 + 							GlStateManager.recompileShaders();
 
-> INSERT  1495 : 1501  @  1791
+> INSERT  207 : 213  @  206
 
 + 		if (this.theWorld != null) {
 + 			++joinWorldTickCounter;
@@ -483,95 +483,95 @@
 + 		}
 + 
 
-> CHANGE  1506 : 1507  @  1796 : 1845
+> CHANGE  11 : 12  @  5 : 54
 
 ~ 		throw new UnsupportedOperationException("singleplayer has been removed");
 
-> INSERT  1519 : 1520  @  1857
+> INSERT  13 : 14  @  61
 
 + 			session.reset();
 
-> DELETE  1521  @  1858 : 1864
+> DELETE  2  @  1 : 7
 
-> DELETE  1561  @  1904 : 1905
+> DELETE  40  @  46 : 47
 
-> CHANGE  1581 : 1582  @  1925 : 1927
+> CHANGE  20 : 21  @  21 : 23
 
 ~ 		this.thePlayer = this.playerController.func_178892_a(this.theWorld, new StatFileWriter());
 
-> CHANGE  1747 : 1748  @  2092 : 2093
+> CHANGE  166 : 167  @  167 : 168
 
 ~ 				return EagRuntime.getVersion();
 
-> CHANGE  1752 : 1754  @  2097 : 2098
+> CHANGE  5 : 7  @  5 : 6
 
 ~ 				return EaglercraftGPU.glGetString(7937) + " GL version " + EaglercraftGPU.glGetString(7938) + ", "
 ~ 						+ EaglercraftGPU.glGetString(7936);
 
-> DELETE  1756  @  2100 : 2110
+> DELETE  4  @  3 : 13
 
-> CHANGE  1758 : 1759  @  2112 : 2116
+> CHANGE  2 : 3  @  12 : 16
 
 ~ 				return "Definitely Not; You're an eagler";
 
-> DELETE  1795  @  2152 : 2157
+> DELETE  37  @  40 : 45
 
-> INSERT  1809 : 1811  @  2171
+> INSERT  14 : 16  @  19
 
 + 				Minecraft.this.loadingScreen.eaglerShow(I18n.format("resourcePack.load.refreshing"),
 + 						I18n.format("resourcePack.load.pleaseWait"));
 
-> DELETE  1816  @  2176 : 2203
+> DELETE  7  @  5 : 32
 
-> CHANGE  1817 : 1818  @  2204 : 2209
+> CHANGE  1 : 2  @  28 : 33
 
 ~ 		return this.currentServerData != null ? "multiplayer" : "out_of_game";
 
-> DELETE  1820  @  2211 : 2428
+> DELETE  3  @  7 : 224
 
-> CHANGE  1837 : 1838  @  2445 : 2446
+> CHANGE  17 : 18  @  234 : 235
 
 ~ 		return false;
 
-> DELETE  1840  @  2448 : 2452
+> DELETE  3  @  3 : 7
 
-> DELETE  1841  @  2453 : 2458
+> DELETE  1  @  5 : 10
 
-> DELETE  1842  @  2459 : 2460
+> DELETE  1  @  6 : 7
 
-> DELETE  1844  @  2462 : 2466
+> DELETE  2  @  3 : 7
 
-> CHANGE  1845 : 1846  @  2467 : 2468
+> CHANGE  1 : 2  @  5 : 6
 
 ~ 		return System.currentTimeMillis();
 
-> DELETE  1856  @  2478 : 2495
+> DELETE  11  @  11 : 28
 
-> DELETE  1900  @  2539 : 2543
+> DELETE  44  @  61 : 65
 
-> CHANGE  1906 : 1908  @  2549 : 2589
+> CHANGE  6 : 8  @  10 : 50
 
 ~ 					if (i == this.gameSettings.keyBindScreenshot.getKeyCode()) {
 ~ 						this.ingameGUI.getChatGUI().printChatMessage(ScreenShotHelper.saveScreenshot());
 
-> DELETE  1909  @  2590 : 2592
+> DELETE  3  @  41 : 43
 
-> DELETE  1910  @  2593 : 2594
+> DELETE  1  @  3 : 4
 
-> DELETE  1914  @  2598 : 2606
+> DELETE  4  @  5 : 13
 
-> CHANGE  1925 : 1929  @  2617 : 2629
+> CHANGE  11 : 15  @  19 : 31
 
 ~ 		ListenableFutureTask listenablefuturetask = ListenableFutureTask.create(callableToSchedule);
 ~ 		synchronized (this.scheduledTasks) {
 ~ 			this.scheduledTasks.add(listenablefuturetask);
 ~ 			return listenablefuturetask;
 
-> DELETE  1937  @  2637 : 2641
+> DELETE  12  @  20 : 24
 
-> DELETE  1961  @  2665 : 2673
+> DELETE  24  @  28 : 36
 
-> INSERT  1968 : 1972  @  2680
+> INSERT  7 : 11  @  15
 
 + 
 + 	public static int getGLMaximumTextureSize() {
diff --git a/patches/minecraft/net/minecraft/client/audio/MusicTicker.edit.java b/patches/minecraft/net/minecraft/client/audio/MusicTicker.edit.java
index eb41a0b..bb82cd8 100644
--- a/patches/minecraft/net/minecraft/client/audio/MusicTicker.edit.java
+++ b/patches/minecraft/net/minecraft/client/audio/MusicTicker.edit.java
@@ -10,9 +10,9 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  5  @  4 : 6
+> DELETE  3  @  2 : 4
 
-> CHANGE  10 : 11  @  11 : 12
+> CHANGE  5 : 6  @  7 : 8
 
 ~ 	private final EaglercraftRandom rand = new EaglercraftRandom();
 
diff --git a/patches/minecraft/net/minecraft/client/audio/SoundCategory.edit.java b/patches/minecraft/net/minecraft/client/audio/SoundCategory.edit.java
index e1b658b..cd62558 100644
--- a/patches/minecraft/net/minecraft/client/audio/SoundCategory.edit.java
+++ b/patches/minecraft/net/minecraft/client/audio/SoundCategory.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  4 : 6  @  5
+> INSERT  2 : 4  @  3
 
 + import com.google.common.collect.Maps;
 + 
 
-> CHANGE  8 : 9  @  7 : 8
+> CHANGE  4 : 5  @  2 : 3
 
 ~ 	MOBS("hostile", 5), ANIMALS("neutral", 6), PLAYERS("player", 7), AMBIENT("ambient", 8), VOICE("voice", 9);
 
diff --git a/patches/minecraft/net/minecraft/client/audio/SoundEventAccessorComposite.edit.java b/patches/minecraft/net/minecraft/client/audio/SoundEventAccessorComposite.edit.java
index bc60f46..190d4c9 100644
--- a/patches/minecraft/net/minecraft/client/audio/SoundEventAccessorComposite.edit.java
+++ b/patches/minecraft/net/minecraft/client/audio/SoundEventAccessorComposite.edit.java
@@ -7,14 +7,14 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 7  @  4 : 9
+> CHANGE  1 : 5  @  2 : 7
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 ~ import com.google.common.collect.Lists;
 ~ 
 
-> CHANGE  11 : 12  @  13 : 14
+> CHANGE  8 : 9  @  9 : 10
 
 ~ 	private final EaglercraftRandom rnd = new EaglercraftRandom();
 
diff --git a/patches/minecraft/net/minecraft/client/audio/SoundHandler.edit.java b/patches/minecraft/net/minecraft/client/audio/SoundHandler.edit.java
index 83f7721..70e29b8 100644
--- a/patches/minecraft/net/minecraft/client/audio/SoundHandler.edit.java
+++ b/patches/minecraft/net/minecraft/client/audio/SoundHandler.edit.java
@@ -7,15 +7,15 @@
 
 > DELETE  2  @  2 : 5
 
-> DELETE  5  @  8 : 9
+> DELETE  3  @  6 : 7
 
-> INSERT  7 : 8  @  11
+> INSERT  2 : 3  @  3
 
 + import java.nio.charset.StandardCharsets;
 
-> DELETE  10  @  13 : 14
+> DELETE  3  @  2 : 3
 
-> CHANGE  11 : 24  @  15 : 25
+> CHANGE  1 : 14  @  2 : 12
 
 ~ import java.util.Set;
 ~ 
@@ -31,25 +31,25 @@
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
-> DELETE  31  @  32 : 36
+> DELETE  20  @  17 : 21
 
-> CHANGE  34 : 35  @  39 : 41
+> CHANGE  3 : 4  @  7 : 9
 
 ~ 
 
-> CHANGE  51 : 52  @  57 : 58
+> CHANGE  17 : 18  @  18 : 19
 
 ~ 	private final EaglercraftSoundManager sndManager;
 
-> CHANGE  56 : 57  @  62 : 63
+> CHANGE  5 : 6  @  5 : 6
 
 ~ 		this.sndManager = new EaglercraftSoundManager(gameSettingsIn, this);
 
-> CHANGE  69 : 70  @  75 : 76
+> CHANGE  13 : 14  @  13 : 14
 
 ~ 						for (Entry entry : (Set) map.entrySet()) {
 
-> INSERT  84 : 94  @  90
+> INSERT  15 : 25  @  15
 
 + 	public static class SoundMap {
 + 
@@ -62,25 +62,25 @@
 + 	}
 + 
 
-> CHANGE  95 : 96  @  91 : 92
+> CHANGE  11 : 12  @  1 : 2
 
 ~ 		Map map = null;
 
-> CHANGE  97 : 101  @  93 : 94
+> CHANGE  2 : 6  @  2 : 3
 
 ~ 			map = JSONTypeProvider.deserialize(IOUtils.inputStreamToString(stream, StandardCharsets.UTF_8),
 ~ 					SoundMap.class).soundMap;
 ~ 		} catch (IOException e) {
 ~ 			throw new RuntimeException("Exception caught reading JSON", e);
 
-> INSERT  223 : 227  @  216
+> INSERT  126 : 130  @  123
 
 + 		if (category == SoundCategory.VOICE) {
 + 			PlatformAudio.setMicVol(volume);
 + 		}
 + 
 
-> CHANGE  240 : 246  @  229 : 231
+> CHANGE  17 : 23  @  13 : 15
 
 ~ 			SoundCategory cat = soundeventaccessorcomposite.getSoundCategory();
 ~ 			for (int i = 0; i < categories.length; ++i) {
@@ -89,7 +89,7 @@
 ~ 					break;
 ~ 				}
 
-> CHANGE  252 : 253  @  237 : 238
+> CHANGE  12 : 13  @  8 : 9
 
 ~ 			return (SoundEventAccessorComposite) arraylist.get((new EaglercraftRandom()).nextInt(arraylist.size()));
 
diff --git a/patches/minecraft/net/minecraft/client/audio/SoundList.edit.java b/patches/minecraft/net/minecraft/client/audio/SoundList.edit.java
index 0e7a6e9..6e96103 100644
--- a/patches/minecraft/net/minecraft/client/audio/SoundList.edit.java
+++ b/patches/minecraft/net/minecraft/client/audio/SoundList.edit.java
@@ -7,9 +7,9 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  3  @  4 : 5
+> DELETE  1  @  2 : 3
 
-> INSERT  4 : 6  @  6
+> INSERT  1 : 3  @  2
 
 + import com.google.common.collect.Lists;
 + 
diff --git a/patches/minecraft/net/minecraft/client/audio/SoundListSerializer.edit.java b/patches/minecraft/net/minecraft/client/audio/SoundListSerializer.edit.java
index 8da5553..7718d24 100644
--- a/patches/minecraft/net/minecraft/client/audio/SoundListSerializer.edit.java
+++ b/patches/minecraft/net/minecraft/client/audio/SoundListSerializer.edit.java
@@ -7,37 +7,37 @@
 
 > DELETE  2  @  2 : 12
 
-> INSERT  3 : 6  @  13
+> INSERT  1 : 4  @  11
 
 + import org.json.JSONArray;
 + import org.json.JSONException;
 + import org.json.JSONObject;
 
-> CHANGE  7 : 11  @  14 : 18
+> CHANGE  4 : 8  @  1 : 5
 
 ~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeDeserializer;
 ~ 
 ~ public class SoundListSerializer implements JSONTypeDeserializer {
 ~ 	public SoundList deserialize(JSONObject jsonobject) throws JSONException {
 
-> CHANGE  12 : 13  @  19 : 20
+> CHANGE  5 : 6  @  5 : 6
 
 ~ 		soundlist.setReplaceExisting(jsonobject.optBoolean("replace", false));
 
-> CHANGE  14 : 15  @  21 : 22
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 				.getCategory(jsonobject.optString("category", SoundCategory.MASTER.getCategoryName()));
 
-> CHANGE  18 : 19  @  25 : 26
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 			JSONArray jsonarray = jsonobject.getJSONArray("sounds");
 
-> CHANGE  20 : 22  @  27 : 29
+> CHANGE  2 : 4  @  2 : 4
 
 ~ 			for (int i = 0; i < jsonarray.length(); ++i) {
 ~ 				Object jsonelement = jsonarray.get(i);
 
-> CHANGE  23 : 28  @  30 : 35
+> CHANGE  3 : 8  @  3 : 8
 
 ~ 				if (jsonelement instanceof String) {
 ~ 					soundlist$soundentry.setSoundEntryName((String) jsonelement);
@@ -45,23 +45,23 @@
 ~ 					JSONObject jsonobject1 = (JSONObject) jsonelement;
 ~ 					soundlist$soundentry.setSoundEntryName(jsonobject1.getString("name"));
 
-> CHANGE  30 : 31  @  37 : 38
+> CHANGE  7 : 8  @  7 : 8
 
 ~ 								.getType(jsonobject1.getString("type"));
 
-> CHANGE  36 : 37  @  43 : 44
+> CHANGE  6 : 7  @  6 : 7
 
 ~ 						float f = jsonobject1.getFloat("volume");
 
-> CHANGE  42 : 43  @  49 : 50
+> CHANGE  6 : 7  @  6 : 7
 
 ~ 						float f1 = jsonobject1.getFloat("pitch");
 
-> CHANGE  48 : 49  @  55 : 56
+> CHANGE  6 : 7  @  6 : 7
 
 ~ 						int j = jsonobject1.getInt("weight");
 
-> CHANGE  54 : 55  @  61 : 62
+> CHANGE  6 : 7  @  6 : 7
 
 ~ 						soundlist$soundentry.setStreaming(jsonobject1.getBoolean("stream"));
 
diff --git a/patches/minecraft/net/minecraft/client/audio/SoundRegistry.edit.java b/patches/minecraft/net/minecraft/client/audio/SoundRegistry.edit.java
index c34ac5b..2d4d04f 100644
--- a/patches/minecraft/net/minecraft/client/audio/SoundRegistry.edit.java
+++ b/patches/minecraft/net/minecraft/client/audio/SoundRegistry.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 6  @  4 : 5
+> CHANGE  1 : 4  @  2 : 3
 
 ~ 
 ~ import com.google.common.collect.Maps;
diff --git a/patches/minecraft/net/minecraft/client/entity/AbstractClientPlayer.edit.java b/patches/minecraft/net/minecraft/client/entity/AbstractClientPlayer.edit.java
index 8bdb3e3..41c5168 100644
--- a/patches/minecraft/net/minecraft/client/entity/AbstractClientPlayer.edit.java
+++ b/patches/minecraft/net/minecraft/client/entity/AbstractClientPlayer.edit.java
@@ -9,10 +9,10 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
 
-> DELETE  5  @  6 : 10
+> DELETE  3  @  4 : 8
 
-> DELETE  11  @  16 : 17
+> DELETE  6  @  10 : 11
 
-> DELETE  55  @  61 : 79
+> DELETE  44  @  45 : 63
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.edit.java b/patches/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.edit.java
index 6ca22dd..6ef7c53 100644
--- a/patches/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.edit.java
+++ b/patches/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.edit.java
@@ -9,6 +9,6 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
 
-> DELETE  4  @  4 : 5
+> DELETE  2  @  2 : 3
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.edit.java b/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.edit.java
index 4c6308d..58a16d9 100644
--- a/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.edit.java
+++ b/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.edit.java
@@ -7,19 +7,19 @@
 
 > DELETE  5  @  5 : 6
 
-> DELETE  56  @  57 : 58
+> DELETE  51  @  52 : 53
 
-> INSERT  78 : 79  @  80
+> INSERT  22 : 23  @  23
 
 + 	private StatFileWriter statWriter;
 
-> CHANGE  80 : 81  @  81 : 82
+> CHANGE  2 : 3  @  1 : 2
 
 ~ 	public EntityPlayerSP(Minecraft mcIn, World worldIn, NetHandlerPlayClient netHandler, StatFileWriter statWriter) {
 
-> DELETE  83  @  84 : 85
+> DELETE  3  @  3 : 4
 
-> INSERT  85 : 86  @  87
+> INSERT  2 : 3  @  3
 
 + 		this.statWriter = statWriter;
 
diff --git a/patches/minecraft/net/minecraft/client/gui/FontRenderer.edit.java b/patches/minecraft/net/minecraft/client/gui/FontRenderer.edit.java
index 7a27e65..5f06a7e 100644
--- a/patches/minecraft/net/minecraft/client/gui/FontRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/FontRenderer.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 6
 
-> CHANGE  6 : 13  @  10 : 12
+> CHANGE  4 : 11  @  8 : 10
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
@@ -17,18 +17,18 @@
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  14  @  13 : 14
+> DELETE  8  @  3 : 4
 
-> DELETE  15  @  15 : 16
+> DELETE  1  @  2 : 3
 
-> DELETE  22  @  23 : 25
+> DELETE  7  @  8 : 10
 
-> CHANGE  24 : 26  @  27 : 29
+> CHANGE  2 : 4  @  4 : 6
 
 ~ 	protected static final ResourceLocation[] unicodePageLocations = new ResourceLocation[256];
 ~ 	protected int[] charWidth = new int[256];
 
-> CHANGE  27 : 46  @  30 : 49
+> CHANGE  3 : 22  @  3 : 22
 
 ~ 	public EaglercraftRandom fontRandom = new EaglercraftRandom();
 ~ 	protected byte[] glyphWidth = new byte[65536];
@@ -50,17 +50,17 @@
 ~ 	protected boolean underlineStyle;
 ~ 	protected boolean strikethroughStyle;
 
-> CHANGE  89 : 90  @  92 : 93
+> CHANGE  62 : 63  @  62 : 63
 
 ~ 		ImageData bufferedimage;
 
-> CHANGE  97 : 100  @  100 : 104
+> CHANGE  8 : 11  @  8 : 12
 
 ~ 		int i = bufferedimage.width;
 ~ 		int j = bufferedimage.height;
 ~ 		int[] aint = bufferedimage.pixels;
 
-> CHANGE  168 : 187  @  172 : 182
+> CHANGE  71 : 90  @  72 : 82
 
 ~ 		Tessellator tessellator = Tessellator.getInstance();
 ~ 		WorldRenderer worldrenderer = tessellator.getWorldRenderer();
@@ -82,11 +82,11 @@
 ~ 		tessellator.draw();
 ~ 
 
-> CHANGE  193 : 194  @  188 : 189
+> CHANGE  25 : 26  @  16 : 17
 
 ~ 					HString.format("textures/font/unicode_page_%02x.png", new Object[] { Integer.valueOf(parInt1) }));
 
-> CHANGE  217 : 235  @  212 : 222
+> CHANGE  24 : 42  @  24 : 34
 
 ~ 			Tessellator tessellator = Tessellator.getInstance();
 ~ 			WorldRenderer worldrenderer = tessellator.getWorldRenderer();
@@ -107,7 +107,7 @@
 ~ 			tessellator.draw();
 ~ 
 
-> CHANGE  262 : 270  @  249 : 256
+> CHANGE  45 : 53  @  37 : 44
 
 ~ //		try {
 ~ //			Bidi bidi = new Bidi((new ArabicShaping(8)).shape(parString1), 127);
@@ -118,59 +118,59 @@
 ~ //		}
 ~ 		return parString1;
 
-> CHANGE  272 : 273  @  258 : 259
+> CHANGE  10 : 11  @  9 : 10
 
 ~ 	protected void resetStyles() {
 
-> CHANGE  280 : 281  @  266 : 267
+> CHANGE  8 : 9  @  8 : 9
 
 ~ 	protected void renderStringAtPos(String parString1, boolean parFlag) {
 
-> CHANGE  284 : 285  @  270 : 271
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 				int i1 = "0123456789abcdefklmnor".indexOf(Character.toLowerCase(parString1.charAt(i + 1)));
 
-> CHANGE  418 : 419  @  404 : 405
+> CHANGE  134 : 135  @  134 : 135
 
 ~ 	private int renderStringAligned(String text, int x, int y, int wrapWidth, int color, boolean parFlag) {
 
-> CHANGE  421 : 422  @  407 : 408
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 			x = x + wrapWidth - i;
 
-> CHANGE  424 : 425  @  410 : 411
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 		return this.renderString(text, (float) x, (float) y, color, parFlag);
 
-> CHANGE  429 : 431  @  415 : 416
+> CHANGE  5 : 7  @  5 : 6
 
 ~ 			this.posX = x;
 ~ 			this.posY = y;
 
-> DELETE  452  @  437 : 438
+> DELETE  23  @  22 : 23
 
-> INSERT  453 : 454  @  439
+> INSERT  1 : 2  @  2
 
 + 		return (int) this.posX;
 
-> INSERT  573 : 576  @  558
+> INSERT  120 : 123  @  119
 
 + 		if ((textColor & -67108864) == 0) {
 + 			textColor |= -16777216;
 + 		}
 
-> CHANGE  606 : 607  @  588 : 589
+> CHANGE  33 : 34  @  30 : 31
 
 ~ 		return Arrays.asList(this.wrapFormattedStringToWidth(str, wrapWidth, 0).split("\n"));
 
-> CHANGE  609 : 613  @  591 : 592
+> CHANGE  3 : 7  @  3 : 4
 
 ~ 	String wrapFormattedStringToWidth(String str, int wrapWidth, int depthCheck) { // TODO: fix recursive
 ~ 		if (depthCheck > 20) {
 ~ 			return str;
 ~ 		}
 
-> CHANGE  621 : 622  @  600 : 601
+> CHANGE  12 : 13  @  9 : 10
 
 ~ 			return s + "\n" + this.wrapFormattedStringToWidth(s1, wrapWidth, ++depthCheck);
 
diff --git a/patches/minecraft/net/minecraft/client/gui/Gui.edit.java b/patches/minecraft/net/minecraft/client/gui/Gui.edit.java
index 5decd2c..ff6fc2c 100644
--- a/patches/minecraft/net/minecraft/client/gui/Gui.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/Gui.edit.java
@@ -11,9 +11,9 @@
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  6  @  5 : 7
+> DELETE  4  @  3 : 5
 
-> CHANGE  141 : 142  @  142 : 143
+> CHANGE  135 : 136  @  137 : 138
 
 ~ 	public void drawTexturedModalRect(int xCoord, int yCoord, EaglerTextureAtlasSprite textureSprite, int widthIn,
 
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiButton.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiButton.edit.java
index ef0d172..49ebceb 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiButton.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiButton.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  6  @  5 : 8
+> DELETE  4  @  3 : 6
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiButtonLanguage.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiButtonLanguage.edit.java
index 23934c6..060e994 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiButtonLanguage.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiButtonLanguage.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 5
+> DELETE  2  @  1 : 3
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiChat.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiChat.edit.java
index 681dbc8..1535ae0 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiChat.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiChat.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  4 : 15  @  5 : 7
+> CHANGE  2 : 13  @  3 : 5
 
 ~ 
 ~ import org.apache.commons.lang3.StringUtils;
@@ -21,32 +21,32 @@
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 ~ import net.minecraft.client.resources.I18n;
 
-> DELETE  21  @  13 : 18
+> DELETE  17  @  8 : 13
 
-> INSERT  33 : 35  @  30
+> INSERT  12 : 14  @  17
 
 + 	private GuiButton exitButton;
 + 
 
-> INSERT  44 : 47  @  39
+> INSERT  11 : 14  @  9
 
 + 		if (!(this instanceof GuiSleepMP)) {
 + 			this.buttonList.add(exitButton = new GuiButton(69, this.width - 100, 3, 97, 20, I18n.format("chat.exit")));
 + 		}
 
-> CHANGE  65 : 66  @  57 : 58
+> CHANGE  21 : 22  @  18 : 19
 
 ~ 	protected void keyTyped(char parChar1, int parInt1) {
 
-> CHANGE  73 : 74  @  65 : 68
+> CHANGE  8 : 9  @  8 : 11
 
 ~ 		if (parInt1 != 28 && parInt1 != 156) {
 
-> CHANGE  117 : 118  @  111 : 112
+> CHANGE  44 : 45  @  46 : 47
 
 ~ 	protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
 
-> INSERT  129 : 135  @  123
+> INSERT  12 : 18  @  12
 
 + 	protected void actionPerformed(GuiButton par1GuiButton) {
 + 		if (par1GuiButton.id == 69) {
@@ -55,11 +55,11 @@
 + 	}
 + 
 
-> INSERT  220 : 221  @  208
+> INSERT  91 : 92  @  85
 
 + 		GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
 
-> INSERT  226 : 230  @  213
+> INSERT  6 : 10  @  5
 
 + 		if (exitButton != null) {
 + 			exitButton.yPosition = 3 + mc.guiAchievement.getHeight();
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiCommandBlock.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiCommandBlock.edit.java
index 9a3fce1..3cc4f3a 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiCommandBlock.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiCommandBlock.edit.java
@@ -12,17 +12,17 @@
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
-> DELETE  11  @  12 : 15
+> DELETE  9  @  10 : 13
 
-> CHANGE  55 : 56  @  59 : 60
+> CHANGE  44 : 45  @  47 : 48
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
-> CHANGE  80 : 81  @  84 : 85
+> CHANGE  25 : 26  @  25 : 26
 
 ~ 	protected void keyTyped(char parChar1, int parInt1) {
 
-> CHANGE  94 : 95  @  98 : 99
+> CHANGE  14 : 15  @  14 : 15
 
 ~ 	protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
 
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiConfirmOpenLink.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiConfirmOpenLink.edit.java
index c488800..045df05 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiConfirmOpenLink.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiConfirmOpenLink.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 6
 
-> CHANGE  32 : 33  @  36 : 37
+> CHANGE  30 : 31  @  34 : 35
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiControls.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiControls.edit.java
index 944386f..d25efad 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiControls.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiControls.edit.java
@@ -9,17 +9,17 @@
 
 + 
 
-> DELETE  5  @  4 : 9
+> DELETE  2  @  1 : 6
 
-> CHANGE  54 : 55  @  58 : 59
+> CHANGE  49 : 50  @  54 : 55
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
-> CHANGE  71 : 72  @  75 : 76
+> CHANGE  17 : 18  @  17 : 18
 
 ~ 	protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
 
-> CHANGE  89 : 90  @  93 : 94
+> CHANGE  18 : 19  @  18 : 19
 
 ~ 	protected void keyTyped(char parChar1, int parInt1) {
 
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiCustomizeSkin.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiCustomizeSkin.edit.java
index dfa0f97..20607a8 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiCustomizeSkin.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiCustomizeSkin.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 5
 
-> CHANGE  32 : 33  @  35 : 36
+> CHANGE  30 : 31  @  33 : 34
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiDisconnected.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiDisconnected.edit.java
index 1dbc9ae..c529321 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiDisconnected.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiDisconnected.edit.java
@@ -7,23 +7,23 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 4  @  4 : 6
+> CHANGE  1 : 2  @  2 : 4
 
 ~ 
 
-> INSERT  5 : 6  @  7
+> INSERT  2 : 3  @  3
 
 + import net.minecraft.util.ChatComponentTranslation;
 
-> CHANGE  21 : 22  @  22 : 23
+> CHANGE  16 : 17  @  15 : 16
 
 ~ 	protected void keyTyped(char parChar1, int parInt1) {
 
-> CHANGE  34 : 35  @  35 : 36
+> CHANGE  13 : 14  @  13 : 14
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
-> INSERT  55 : 59  @  56
+> INSERT  21 : 25  @  21
 
 + 
 + 	public static GuiScreen createRateLimitKick(GuiScreen prev) {
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiDownloadTerrain.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiDownloadTerrain.edit.java
index 00e33e5..9ddd0c1 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiDownloadTerrain.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiDownloadTerrain.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 4
 
-> CHANGE  14 : 15  @  16 : 17
+> CHANGE  12 : 13  @  14 : 15
 
 ~ 	protected void keyTyped(char parChar1, int parInt1) {
 
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiEnchantment.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiEnchantment.edit.java
index 4fc81a5..286e872 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiEnchantment.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiEnchantment.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 4
 
-> CHANGE  3 : 8  @  5 : 8
+> CHANGE  1 : 6  @  3 : 6
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
@@ -15,33 +15,33 @@
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  10  @  10 : 11
+> DELETE  7  @  5 : 6
 
-> DELETE  23  @  24 : 25
+> DELETE  13  @  14 : 15
 
-> CHANGE  31 : 32  @  33 : 34
+> CHANGE  8 : 9  @  9 : 10
 
 ~ 	private EaglercraftRandom random = new EaglercraftRandom();
 
-> CHANGE  61 : 62  @  63 : 64
+> CHANGE  30 : 31  @  30 : 31
 
 ~ 	protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
 
-> CHANGE  87 : 90  @  89 : 92
+> CHANGE  26 : 29  @  26 : 29
 
 ~ 		GlStateManager.viewport((scaledresolution.getScaledWidth() - 290 - 110) / 2 * scaledresolution.getScaleFactor(),
 ~ 				(scaledresolution.getScaledHeight() - 220 + 60) / 2 * scaledresolution.getScaleFactor(),
 ~ 				290 * scaledresolution.getScaleFactor(), 220 * scaledresolution.getScaleFactor());
 
-> CHANGE  91 : 92  @  93 : 94
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 		GlStateManager.gluPerspective(90.0F, 1.3333334F, 9.0F, 80.0F);
 
-> INSERT  128 : 129  @  130
+> INSERT  37 : 38  @  37
 
 + 		GlStateManager.enableDepth();
 
-> INSERT  130 : 131  @  131
+> INSERT  2 : 3  @  1
 
 + 		GlStateManager.disableDepth();
 
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiErrorScreen.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiErrorScreen.edit.java
index eef24ee..95a913b 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiErrorScreen.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiErrorScreen.edit.java
@@ -7,11 +7,11 @@
 
 > DELETE  2  @  2 : 5
 
-> CHANGE  25 : 26  @  28 : 29
+> CHANGE  23 : 24  @  26 : 27
 
 ~ 	protected void keyTyped(char parChar1, int parInt1) {
 
-> CHANGE  28 : 29  @  31 : 32
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiGameOver.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiGameOver.edit.java
index 7a6c8eb..e4412cb 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiGameOver.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiGameOver.edit.java
@@ -9,17 +9,17 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  9 : 10
+> DELETE  2  @  7 : 8
 
-> CHANGE  37 : 38  @  43 : 44
+> CHANGE  33 : 34  @  34 : 35
 
 ~ 	protected void keyTyped(char parChar1, int parInt1) {
 
-> CHANGE  40 : 41  @  46 : 47
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
-> INSERT  48 : 50  @  54
+> INSERT  8 : 10  @  8
 
 + 				this.mc.theWorld.sendQuittingDisconnectingPacket();
 + 				this.mc.loadWorld((WorldClient) null);
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiHopper.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiHopper.edit.java
index f84fcd9..7f1dded 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiHopper.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiHopper.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  5  @  4 : 5
+> DELETE  3  @  2 : 3
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiIngame.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiIngame.edit.java
index bfb24ee..6a3408b 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiIngame.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiIngame.edit.java
@@ -14,50 +14,50 @@
 + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
 + 
 
-> CHANGE  11 : 14  @  5 : 8
+> CHANGE  9 : 12  @  3 : 6
 
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  16  @  10 : 19
+> DELETE  5  @  5 : 14
 
-> DELETE  18  @  21 : 22
+> DELETE  2  @  11 : 12
 
-> DELETE  19  @  23 : 24
+> DELETE  1  @  2 : 3
 
-> CHANGE  51 : 52  @  56 : 57
+> CHANGE  32 : 33  @  33 : 34
 
 ~ 	private final EaglercraftRandom rand = new EaglercraftRandom();
 
-> DELETE  55  @  60 : 61
+> DELETE  4  @  4 : 5
 
-> DELETE  82  @  88 : 89
+> DELETE  27  @  28 : 29
 
-> CHANGE  177 : 178  @  184 : 187
+> CHANGE  95 : 96  @  96 : 99
 
 ~ 		this.overlayDebug.renderDebugInfo(scaledresolution, partialTicks);
 
-> INSERT  265 : 268  @  274
+> INSERT  88 : 91  @  90
 
 + 		if (this.mc.gameSettings.hudWorld && (mc.currentScreen == null || !(mc.currentScreen instanceof GuiChat))) {
 + 			j -= 10;
 + 		}
 
-> DELETE  434  @  440 : 444
+> DELETE  169  @  166 : 170
 
-> CHANGE  451 : 452  @  461 : 462
+> CHANGE  17 : 18  @  21 : 22
 
 ~ 		for (Score score : (List) arraylist1) {
 
-> CHANGE  464 : 465  @  474 : 475
+> CHANGE  13 : 14  @  13 : 14
 
 ~ 		for (Score score1 : (List) arraylist1) {
 
-> CHANGE  808 : 809  @  818 : 819
+> CHANGE  344 : 345  @  344 : 345
 
 ~ 		EaglerTextureAtlasSprite textureatlassprite = this.mc.getBlockRendererDispatcher().getBlockModelShapes()
 
-> DELETE  866  @  876 : 877
+> DELETE  58  @  58 : 59
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.edit.java
index f672bc9..7c2486f 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.edit.java
@@ -9,29 +9,29 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.Mouse;
 
-> DELETE  7  @  13 : 14
+> DELETE  5  @  11 : 12
 
-> DELETE  9  @  16 : 18
+> DELETE  2  @  3 : 5
 
-> DELETE  11  @  20 : 21
+> DELETE  2  @  4 : 5
 
-> CHANGE  31 : 32  @  41 : 42
+> CHANGE  20 : 21  @  21 : 22
 
 ~ 		guibutton.enabled = false;
 
-> CHANGE  34 : 35  @  44 : 45
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
-> DELETE  41  @  51 : 52
+> DELETE  7  @  7 : 8
 
-> DELETE  46  @  57 : 60
+> DELETE  5  @  6 : 9
 
-> CHANGE  64 : 65  @  78 : 79
+> CHANGE  18 : 19  @  21 : 22
 
 ~ 			break;
 
-> CHANGE  71 : 74  @  85 : 86
+> CHANGE  7 : 10  @  7 : 8
 
 ~ 		if (Mouse.isActuallyGrabbed()) {
 ~ 			Mouse.setGrabbed(false);
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiKeyBindingList.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiKeyBindingList.edit.java
index 97c966b..cd6e0d3 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiKeyBindingList.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiKeyBindingList.edit.java
@@ -10,8 +10,8 @@
 + 
 + import net.lax1dude.eaglercraft.v1_8.ArrayUtils;
 
-> DELETE  6  @  4 : 7
+> DELETE  3  @  1 : 4
 
-> DELETE  10  @  11 : 12
+> DELETE  4  @  7 : 8
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiLabel.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiLabel.edit.java
index 3260063..2293683 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiLabel.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiLabel.edit.java
@@ -7,13 +7,13 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 7  @  4
+> INSERT  1 : 5  @  2
 
 + 
 + import com.google.common.collect.Lists;
 + 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  8  @  5 : 8
+> DELETE  5  @  1 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiLanguage.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiLanguage.edit.java
index 55c8960..e0c6c8d 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiLanguage.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiLanguage.edit.java
@@ -7,25 +7,25 @@
 
 > DELETE  2  @  2 : 4
 
-> INSERT  4 : 8  @  6
+> INSERT  2 : 6  @  4
 
 + 
 + import com.google.common.collect.Lists;
 + import com.google.common.collect.Maps;
 + 
 
-> DELETE  9  @  7 : 12
+> DELETE  5  @  1 : 6
 
-> CHANGE  43 : 44  @  46 : 47
+> CHANGE  34 : 35  @  39 : 40
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
-> INSERT  100 : 102  @  103
+> INSERT  57 : 59  @  57
 
 + 			this.mc.loadingScreen.eaglerShow(I18n.format("resourcePack.load.refreshing"),
 + 					I18n.format("resourcePack.load.pleaseWait"));
 
-> INSERT  111 : 112  @  112
+> INSERT  11 : 12  @  9
 
 + 			GuiLanguage.this.mc.displayGuiScreen(GuiLanguage.this);
 
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiLockIconButton.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiLockIconButton.edit.java
index 23934c6..060e994 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiLockIconButton.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiLockIconButton.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 5
+> DELETE  2  @  1 : 3
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.edit.java
index 8006c8a..2304091 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.edit.java
@@ -7,13 +7,13 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  5  @  6 : 7
+> DELETE  3  @  4 : 5
 
-> INSERT  6 : 7  @  8
+> INSERT  1 : 2  @  2
 
 + import java.util.Arrays;
 
-> CHANGE  9 : 26  @  10 : 12
+> CHANGE  3 : 20  @  2 : 4
 
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
@@ -33,23 +33,23 @@
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 ~ import net.lax1dude.eaglercraft.v1_8.profile.GuiScreenEditProfile;
 
-> CHANGE  27 : 28  @  13 : 25
+> CHANGE  18 : 19  @  3 : 15
 
 ~ import net.minecraft.client.audio.PositionedSoundRecord;
 
-> DELETE  29  @  26 : 27
+> DELETE  2  @  13 : 14
 
-> DELETE  32  @  30 : 32
+> DELETE  3  @  4 : 6
 
-> DELETE  34  @  34 : 43
+> DELETE  2  @  4 : 13
 
-> DELETE  36  @  45 : 46
+> DELETE  2  @  11 : 12
 
-> CHANGE  37 : 38  @  47 : 48
+> CHANGE  1 : 2  @  2 : 3
 
 ~ 	private static final EaglercraftRandom RANDOM = new EaglercraftRandom();
 
-> INSERT  39 : 45  @  49
+> INSERT  2 : 8  @  2
 
 + 	private boolean isDefault;
 + 	private static final int lendef = 5987;
@@ -58,25 +58,25 @@
 + 	private static final byte[] sha1def = new byte[] { -107, 77, 108, 49, 11, -100, -8, -119, -1, -100, -85, -55, 18,
 + 			-69, -107, 113, -93, -101, -79, 32 };
 
-> CHANGE  48 : 49  @  52 : 53
+> CHANGE  9 : 10  @  3 : 4
 
 ~ 	private static DynamicTexture viewportTexture = null;
 
-> DELETE  50  @  54 : 55
+> DELETE  2  @  2 : 3
 
-> DELETE  52  @  57 : 58
+> DELETE  2  @  3 : 4
 
-> DELETE  62  @  68 : 70
+> DELETE  10  @  11 : 13
 
-> CHANGE  68 : 69  @  76 : 78
+> CHANGE  6 : 7  @  8 : 10
 
 ~ 	private static ResourceLocation backgroundTexture = null;
 
-> DELETE  71  @  80 : 81
+> DELETE  3  @  4 : 5
 
-> DELETE  110  @  120 : 126
+> DELETE  39  @  40 : 46
 
-> INSERT  111 : 131  @  127
+> INSERT  1 : 21  @  7
 
 + 		MD5Digest md5 = new MD5Digest();
 + 		SHA1Digest sha1 = new SHA1Digest();
@@ -99,20 +99,20 @@
 + 			this.isDefault = false;
 + 		}
 
-> CHANGE  141 : 142  @  137 : 138
+> CHANGE  30 : 31  @  10 : 11
 
 ~ 	protected void keyTyped(char parChar1, int parInt1) {
 
-> CHANGE  145 : 149  @  141 : 144
+> CHANGE  4 : 8  @  4 : 7
 
 ~ 		if (viewportTexture == null) {
 ~ 			viewportTexture = new DynamicTexture(256, 256);
 ~ 			backgroundTexture = this.mc.getTextureManager().getDynamicTextureLocation("background", viewportTexture);
 ~ 		}
 
-> DELETE  159  @  154 : 155
+> DELETE  14  @  13 : 14
 
-> CHANGE  160 : 165  @  156 : 160
+> CHANGE  1 : 6  @  2 : 6
 
 ~ 
 ~ 		boolean isFork = !EaglercraftVersion.projectOriginAuthor.equalsIgnoreCase(EaglercraftVersion.projectForkVendor);
@@ -120,18 +120,18 @@
 ~ 		if (isFork && EaglercraftVersion.mainMenuStringF != null && EaglercraftVersion.mainMenuStringF.length() > 0) {
 ~ 			i += 11;
 
-> INSERT  167 : 169  @  162
+> INSERT  7 : 9  @  6
 
 + 		this.addSingleplayerMultiplayerButtons(i, 24);
 + 
 
-> CHANGE  171 : 174  @  164 : 166
+> CHANGE  4 : 7  @  2 : 4
 
 ~ 		this.buttonList.add(new GuiButton(4, this.width / 2 + 2, i + 72 + 12, 98, 20,
 ~ 				I18n.format("menu.editProfile", new Object[0])));
 ~ 
 
-> CHANGE  175 : 180  @  167 : 168
+> CHANGE  4 : 9  @  3 : 4
 
 ~ 
 ~ 		if (isFork) {
@@ -139,73 +139,73 @@
 ~ 			this.openGLWarning2 = EaglercraftVersion.mainMenuStringF;
 ~ 			boolean line2 = this.openGLWarning2 != null && this.openGLWarning2.length() > 0;
 
-> CHANGE  184 : 185  @  172 : 173
+> CHANGE  9 : 10  @  5 : 6
 
 ~ 			this.field_92021_u = ((GuiButton) this.buttonList.get(0)).yPosition - (line2 ? 32 : 21);
 
-> CHANGE  186 : 187  @  174 : 175
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 			this.field_92019_w = this.field_92021_u + (line2 ? 24 : 11);
 
-> CHANGE  193 : 197  @  181 : 184
+> CHANGE  7 : 11  @  7 : 10
 
 ~ 		// this.buttonList
 ~ 		// .add(new GuiButton(1, this.width / 2 - 100, parInt1,
 ~ 		// I18n.format("menu.singleplayer", new Object[0])));
 ~ 		this.buttonList.add(new GuiButton(2, this.width / 2 - 100, parInt1 + parInt2 * 0,
 
-> CHANGE  198 : 202  @  185 : 187
+> CHANGE  5 : 9  @  4 : 6
 
 ~ 		GuiButton btn;
 ~ 		this.buttonList.add(btn = new GuiButton(14, this.width / 2 - 100, parInt1 + parInt2 * 1,
 ~ 				I18n.format("menu.forkOnGitlab", new Object[0])));
 ~ 		btn.enabled = EaglercraftVersion.mainMenuEnableGithubButton;
 
-> CHANGE  204 : 205  @  189 : 203
+> CHANGE  6 : 7  @  4 : 18
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
-> CHANGE  214 : 215  @  212 : 213
+> CHANGE  10 : 11  @  23 : 24
 
 ~ 			logger.error("Singleplayer was removed dumbass");
 
-> DELETE  221  @  219 : 223
+> DELETE  7  @  7 : 11
 
-> CHANGE  222 : 223  @  224 : 225
+> CHANGE  1 : 2  @  5 : 6
 
 ~ 			this.mc.displayGuiScreen(new GuiScreenEditProfile(this));
 
-> CHANGE  225 : 227  @  227 : 229
+> CHANGE  3 : 5  @  3 : 5
 
 ~ 		if (parGuiButton.id == 14) {
 ~ 			EagRuntime.openLink(EaglercraftVersion.projectForkURL);
 
-> DELETE  229  @  231 : 240
+> DELETE  4  @  4 : 13
 
-> DELETE  231  @  242 : 270
+> DELETE  2  @  11 : 39
 
-> CHANGE  237 : 238  @  276 : 277
+> CHANGE  6 : 7  @  34 : 35
 
 ~ 		GlStateManager.gluPerspective(120.0F, 1.0F, 0.05F, 10.0F);
 
-> CHANGE  311 : 315  @  350 : 354
+> CHANGE  74 : 78  @  74 : 78
 
 ~ 		this.mc.getTextureManager().bindTexture(backgroundTexture);
 ~ 		EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 ~ 		EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 ~ 		EaglercraftGPU.glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, 256, 256);
 
-> DELETE  345  @  384 : 385
+> DELETE  34  @  34 : 35
 
-> DELETE  354  @  394 : 395
+> DELETE  9  @  10 : 11
 
-> DELETE  378  @  419 : 421
+> DELETE  24  @  25 : 27
 
-> CHANGE  385 : 386  @  428 : 429
+> CHANGE  7 : 8  @  9 : 10
 
 ~ 		if (this.isDefault || (double) this.updateCounter < 1.0E-4D) {
 
-> INSERT  396 : 409  @  439
+> INSERT  11 : 24  @  11
 
 + 		boolean isForkLabel = ((this.openGLWarning1 != null && this.openGLWarning1.length() > 0)
 + 				|| (this.openGLWarning2 != null && this.openGLWarning2.length() > 0));
@@ -221,36 +221,36 @@
 + 		}
 + 
 
-> CHANGE  411 : 412  @  441 : 442
+> CHANGE  15 : 16  @  2 : 3
 
 ~ 		GlStateManager.rotate(isForkLabel ? -12.0F : -20.0F, 0.0F, 0.0F, 1.0F);
 
-> INSERT  415 : 418  @  445
+> INSERT  4 : 7  @  4
 
 + 		if (isForkLabel) {
 + 			f1 *= 0.8f;
 + 		}
 
-> DELETE  421  @  448 : 452
+> DELETE  6  @  3 : 7
 
-> INSERT  422 : 425  @  453
+> INSERT  1 : 4  @  5
 
 + 		String s = EaglercraftVersion.mainMenuStringA;
 + 		this.drawString(this.fontRendererObj, s, 2, this.height - 20, -1);
 + 		s = EaglercraftVersion.mainMenuStringB;
 
-> CHANGE  426 : 428  @  454 : 455
+> CHANGE  4 : 6  @  1 : 2
 
 ~ 
 ~ 		String s1 = EaglercraftVersion.mainMenuStringC;
 
-> INSERT  429 : 432  @  456
+> INSERT  3 : 6  @  2
 
 + 				this.height - 20, -1);
 + 		s1 = EaglercraftVersion.mainMenuStringD;
 + 		this.drawString(this.fontRendererObj, s1, this.width - this.fontRendererObj.getStringWidth(s1) - 2,
 
-> CHANGE  433 : 441  @  457 : 463
+> CHANGE  4 : 12  @  1 : 7
 
 ~ 
 ~ 		String lbl = "CREDITS.txt";
@@ -261,7 +261,7 @@
 ~ 		} else {
 ~ 			drawRect((this.width - w - 4), 0, this.width, 10, 0x55200000);
 
-> INSERT  443 : 449  @  465
+> INSERT  10 : 16  @  8
 
 + 		GlStateManager.pushMatrix();
 + 		GlStateManager.translate((this.width - w - 2), 2.0f, 0.0f);
@@ -270,7 +270,7 @@
 + 		GlStateManager.popMatrix();
 + 
 
-> CHANGE  452 : 464  @  468 : 476
+> CHANGE  9 : 21  @  3 : 11
 
 ~ 	protected void mouseClicked(int par1, int par2, int par3) {
 ~ 		if (par3 == 0) {
@@ -285,9 +285,9 @@
 ~ 						.playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F));
 ~ 				return;
 
-> DELETE  465  @  477 : 478
+> DELETE  13  @  9 : 10
 
-> INSERT  466 : 467  @  479
+> INSERT  1 : 2  @  2
 
 + 		super.mouseClicked(par1, par2, par3);
 
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiMemoryErrorScreen.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiMemoryErrorScreen.edit.java
index 0f2981c..982f7d2 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiMemoryErrorScreen.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiMemoryErrorScreen.edit.java
@@ -7,11 +7,11 @@
 
 > DELETE  2  @  2 : 7
 
-> CHANGE  13 : 14  @  18 : 19
+> CHANGE  11 : 12  @  16 : 17
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
-> CHANGE  22 : 23  @  27 : 28
+> CHANGE  9 : 10  @  9 : 10
 
 ~ 	protected void keyTyped(char parChar1, int parInt1) {
 
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiMerchant.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiMerchant.edit.java
index a18e361..889892c 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiMerchant.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiMerchant.edit.java
@@ -12,13 +12,13 @@
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  7  @  5 : 6
+> DELETE  5  @  3 : 4
 
-> DELETE  8  @  7 : 8
+> DELETE  1  @  2 : 3
 
-> DELETE  21  @  21 : 23
+> DELETE  13  @  14 : 16
 
-> CHANGE  65 : 66  @  67 : 68
+> CHANGE  44 : 45  @  46 : 47
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.edit.java
index df574bc..7c31458 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.edit.java
@@ -10,42 +10,42 @@
 + import java.io.IOException;
 + 
 
-> CHANGE  6 : 10  @  4 : 17
+> CHANGE  4 : 8  @  2 : 15
 
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.Keyboard;
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
-> DELETE  13  @  20 : 22
+> DELETE  7  @  16 : 18
 
-> DELETE  14  @  23 : 26
+> DELETE  1  @  3 : 6
 
-> DELETE  17  @  29 : 30
+> DELETE  3  @  6 : 7
 
-> DELETE  29  @  42 : 44
+> DELETE  12  @  13 : 15
 
-> INSERT  30 : 31  @  45
+> INSERT  1 : 2  @  3
 
 + 	private static long lastRefreshCommit = 0l;
 
-> CHANGE  41 : 42  @  55 : 56
+> CHANGE  11 : 12  @  10 : 11
 
 ~ 			this.savedServerList = ServerList.getServerList();
 
-> DELETE  43  @  57 : 66
+> DELETE  2  @  2 : 11
 
-> CHANGE  78 : 79  @  101 : 108
+> CHANGE  35 : 36  @  44 : 51
 
 ~ 		this.savedServerList.updateServerPing();
 
-> DELETE  83  @  112 : 118
+> DELETE  5  @  11 : 17
 
-> CHANGE  85 : 86  @  120 : 121
+> CHANGE  2 : 3  @  8 : 9
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
-> CHANGE  122 : 127  @  157 : 158
+> CHANGE  37 : 42  @  37 : 38
 
 ~ 				long millis = System.currentTimeMillis();
 ~ 				if (millis - lastRefreshCommit > 700l) {
@@ -53,11 +53,11 @@
 ~ 					this.refreshServerList();
 ~ 				}
 
-> CHANGE  132 : 133  @  163 : 164
+> CHANGE  10 : 11  @  6 : 7
 
 ~ 	public void refreshServerList() {
 
-> CHANGE  147 : 152  @  178 : 180
+> CHANGE  15 : 20  @  15 : 17
 
 ~ 			long millis = System.currentTimeMillis();
 ~ 			if (millis - lastRefreshCommit > 700l) {
@@ -65,7 +65,7 @@
 ~ 				this.refreshServerList();
 ~ 			}
 
-> CHANGE  167 : 172  @  195 : 197
+> CHANGE  20 : 25  @  17 : 19
 
 ~ 			long millis = System.currentTimeMillis();
 ~ 			if (millis - lastRefreshCommit > 700l) {
@@ -73,7 +73,7 @@
 ~ 				this.refreshServerList();
 ~ 			}
 
-> CHANGE  182 : 187  @  207 : 209
+> CHANGE  15 : 20  @  12 : 14
 
 ~ 			long millis = System.currentTimeMillis();
 ~ 			if (millis - lastRefreshCommit > 700l) {
@@ -81,33 +81,33 @@
 ~ 				this.refreshServerList();
 ~ 			}
 
-> DELETE  188  @  210 : 211
+> DELETE  6  @  3 : 4
 
-> CHANGE  190 : 191  @  213 : 214
+> CHANGE  2 : 3  @  3 : 4
 
 ~ 	protected void keyTyped(char parChar1, int parInt1) {
 
-> DELETE  209  @  232 : 241
+> DELETE  19  @  19 : 28
 
-> CHANGE  220 : 221  @  252 : 253
+> CHANGE  11 : 12  @  20 : 21
 
 ~ 					} else if (i < this.serverListSelector.getSize() - 1) {
 
-> DELETE  223  @  255 : 264
+> DELETE  3  @  3 : 12
 
-> DELETE  256  @  297 : 302
+> DELETE  33  @  42 : 47
 
-> DELETE  257  @  303 : 304
+> DELETE  1  @  6 : 7
 
-> CHANGE  270 : 271  @  317 : 319
+> CHANGE  13 : 14  @  14 : 16
 
 ~ 		if (guilistextended$iguilistentry != null) {
 
-> DELETE  277  @  325 : 326
+> DELETE  7  @  8 : 9
 
-> DELETE  279  @  328 : 332
+> DELETE  2  @  3 : 7
 
-> CHANGE  283 : 284  @  336 : 337
+> CHANGE  4 : 5  @  8 : 9
 
 ~ 	protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
 
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiNewChat.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiNewChat.edit.java
index 07ec3b9..163ee0e 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiNewChat.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiNewChat.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  4 : 10  @  5
+> INSERT  2 : 8  @  3
 
 + 
 + import com.google.common.collect.Lists;
@@ -16,11 +16,11 @@
 + import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  11  @  6 : 12
+> DELETE  7  @  1 : 7
 
-> DELETE  15  @  16 : 18
+> DELETE  4  @  10 : 12
 
-> CHANGE  123 : 124  @  126 : 127
+> CHANGE  108 : 109  @  110 : 111
 
 ~ 		for (IChatComponent ichatcomponent : (List) list) {
 
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiOptionSlider.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiOptionSlider.edit.java
index 23934c6..060e994 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiOptionSlider.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiOptionSlider.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 5
+> DELETE  2  @  1 : 3
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiOptions.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiOptions.edit.java
index 620f1fb..9c30a10 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiOptions.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiOptions.edit.java
@@ -10,60 +10,60 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 ~ import net.lax1dude.eaglercraft.v1_8.vfs.SYS;
 
-> DELETE  8  @  7 : 24
+> DELETE  6  @  5 : 22
 
-> DELETE  10  @  26 : 27
+> DELETE  2  @  19 : 20
 
-> INSERT  22 : 24  @  39
+> INSERT  12 : 14  @  13
 
 + 	private GuiButton notSoSuperSecret;
 + 	private GuiButton broadcastSettings;
 
-> CHANGE  70 : 72  @  85 : 87
+> CHANGE  48 : 50  @  46 : 48
 
 ~ 		this.buttonList.add(notSoSuperSecret = new GuiButton(8675309, this.width / 2 + 5, this.height / 6 + 48 - 6, 150,
 ~ 				20, "Super Secret Settings...") {
 
-> CHANGE  85 : 88  @  100 : 102
+> CHANGE  15 : 18  @  15 : 17
 
 ~ 		this.buttonList.add(broadcastSettings = new GuiButton(107, this.width / 2 + 5, this.height / 6 + 72 - 6, 150,
 ~ 				20, I18n.format(EagRuntime.getRecText(), new Object[0])));
 ~ 		broadcastSettings.enabled = EagRuntime.recSupported();
 
-> CHANGE  96 : 98  @  110 : 111
+> CHANGE  11 : 13  @  10 : 11
 
 ~ 		GuiButton rp;
 ~ 		this.buttonList.add(rp = new GuiButton(105, this.width / 2 - 155, this.height / 6 + 144 - 6, 150, 20,
 
-> CHANGE  99 : 101  @  112 : 113
+> CHANGE  3 : 5  @  2 : 3
 
 ~ 		GuiButton b;
 ~ 		this.buttonList.add(b = new GuiButton(104, this.width / 2 + 5, this.height / 6 + 144 - 6, 150, 20,
 
-> INSERT  102 : 103  @  114
+> INSERT  3 : 4  @  2
 
 + 		b.enabled = false;
 
-> INSERT  105 : 107  @  116
+> INSERT  3 : 5  @  2
 
 + 
 + 		rp.enabled = SYS.VFS != null;
 
-> CHANGE  129 : 130  @  138 : 139
+> CHANGE  24 : 25  @  22 : 23
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
-> CHANGE  162 : 163  @  171 : 172
+> CHANGE  33 : 34  @  33 : 34
 
 ~ 				notSoSuperSecret.displayString = "Nope!";
 
-> DELETE  185  @  194 : 199
+> DELETE  23  @  23 : 28
 
-> CHANGE  201 : 203  @  215 : 222
+> CHANGE  16 : 18  @  21 : 28
 
 ~ 				EagRuntime.toggleRec();
 ~ 				broadcastSettings.displayString = I18n.format(EagRuntime.getRecText(), new Object[0]);
 
-> DELETE  204  @  223 : 224
+> DELETE  3  @  8 : 9
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiOptionsRowList.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiOptionsRowList.edit.java
index d9325ac..c18911f 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiOptionsRowList.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiOptionsRowList.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.collect.Lists;
 + 
 
-> DELETE  7  @  5 : 9
+> DELETE  4  @  1 : 5
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.edit.java
index 0d32d82..22e9981 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.edit.java
@@ -9,16 +9,16 @@
 
 ~ import java.text.SimpleDateFormat;
 
-> INSERT  4 : 6  @  5
+> INSERT  2 : 4  @  3
 
 + import java.util.Calendar;
 + import java.util.Iterator;
 
-> INSERT  7 : 8  @  6
+> INSERT  3 : 4  @  1
 
 + import java.util.Locale;
 
-> INSERT  9 : 21  @  7
+> INSERT  2 : 14  @  1
 
 + import java.util.TimeZone;
 + 
@@ -33,30 +33,30 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
 
-> CHANGE  26 : 29  @  12 : 17
+> CHANGE  17 : 20  @  5 : 10
 
 ~ import net.minecraft.client.renderer.RenderHelper;
 ~ import net.minecraft.client.renderer.entity.RenderManager;
 ~ import net.minecraft.client.resources.I18n;
 
-> CHANGE  30 : 32  @  18 : 19
+> CHANGE  4 : 6  @  6 : 7
 
 ~ import net.minecraft.entity.EntityLivingBase;
 ~ import net.minecraft.potion.PotionEffect;
 
-> CHANGE  40 : 41  @  27 : 28
+> CHANGE  10 : 11  @  9 : 10
 
 ~ import net.minecraft.world.biome.BiomeGenBase;
 
-> DELETE  42  @  29 : 31
+> DELETE  2  @  2 : 4
 
-> CHANGE  52 : 55  @  41 : 42
+> CHANGE  10 : 13  @  12 : 13
 
 ~ 	public void renderDebugInfo(ScaledResolution scaledResolutionIn, float partialTicks) {
 ~ 		int ww = scaledResolutionIn.getScaledWidth();
 ~ 		int hh = scaledResolutionIn.getScaledHeight();
 
-> CHANGE  56 : 79  @  43 : 49
+> CHANGE  4 : 27  @  2 : 8
 
 ~ 		if (this.mc.gameSettings.showDebugInfo) {
 ~ 			GlStateManager.pushMatrix();
@@ -82,7 +82,7 @@
 ~ 				drawPlayer(ww - 3, 3, partialTicks);
 ~ 			}
 
-> INSERT  81 : 105  @  51
+> INSERT  25 : 49  @  8
 
 + 		if (this.mc.currentScreen == null || !(this.mc.currentScreen instanceof GuiChat)) {
 + 			if (this.mc.gameSettings.hudStats) {
@@ -109,7 +109,7 @@
 + 		}
 + 
 
-> INSERT  108 : 300  @  54
+> INSERT  27 : 219  @  3
 
 + 	private void drawFPS(int x, int y) {
 + 		this.fontRenderer.drawStringWithShadow(this.mc.renderGlobal.getDebugInfoShort(), x, y, 0xFFFFFF);
@@ -304,7 +304,7 @@
 + 	}
 + 
 
-> INSERT  339 : 346  @  93
+> INSERT  231 : 238  @  39
 
 + 		if (!this.mc.gameSettings.showDebugInfo) {
 + 			BlockPos blockpos = new BlockPos(this.mc.getRenderViewEntity().posX,
@@ -314,41 +314,41 @@
 + 		}
 + 
 
-> CHANGE  356 : 357  @  103 : 104
+> CHANGE  17 : 18  @  10 : 11
 
 ~ 					HString.format("Chunk-relative: %d %d %d", new Object[] { Integer.valueOf(blockpos.getX() & 15),
 
-> CHANGE  382 : 383  @  129 : 130
+> CHANGE  26 : 27  @  26 : 27
 
 ~ 					HString.format("XYZ: %.3f / %.5f / %.3f",
 
-> CHANGE  386 : 387  @  133 : 134
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 					HString.format("Block: %d %d %d",
 
-> CHANGE  389 : 390  @  136 : 137
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 					HString.format("Chunk: %d %d %d in %d %d %d",
 
-> CHANGE  393 : 394  @  140 : 141
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 					HString.format("Facing: %s (%s) (%.1f / %.1f)",
 
-> CHANGE  399 : 400  @  146 : 147
+> CHANGE  6 : 7  @  6 : 7
 
 ~ 				arraylist.add("Biome: " + chunk.getBiome(blockpos).biomeName);
 
-> CHANGE  404 : 405  @  151 : 161
+> CHANGE  5 : 6  @  5 : 15
 
 ~ 				arraylist.add(HString.format("Local Difficulty: %.2f (Day %d)",
 
-> DELETE  409  @  165 : 169
+> DELETE  5  @  14 : 18
 
-> CHANGE  413 : 414  @  173 : 174
+> CHANGE  4 : 5  @  8 : 9
 
 ~ 				arraylist.add(HString.format("Looking at: %d %d %d", new Object[] { Integer.valueOf(blockpos1.getX()),
 
-> CHANGE  422 : 450  @  182 : 199
+> CHANGE  9 : 37  @  9 : 26
 
 ~ 		ArrayList arraylist;
 ~ 		if (EagRuntime.getPlatformType() != EnumPlatformType.JAVASCRIPT) {
@@ -379,6 +379,6 @@
 ~ 							EaglercraftGPU.glGetString(7937), EaglercraftGPU.glGetString(7938) });
 ~ 		}
 
-> DELETE  458  @  207 : 211
+> DELETE  36  @  25 : 29
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiPageButtonList.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiPageButtonList.edit.java
index 45ec92e..f1dc16f 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiPageButtonList.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiPageButtonList.edit.java
@@ -10,10 +10,10 @@
 + import java.util.List;
 + 
 
-> CHANGE  8 : 9  @  6 : 7
+> CHANGE  6 : 7  @  4 : 5
 
 ~ 
 
-> DELETE  10  @  8 : 16
+> DELETE  2  @  2 : 10
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiPlayerTabOverlay.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiPlayerTabOverlay.edit.java
index c3e3ab1..183949d 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiPlayerTabOverlay.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiPlayerTabOverlay.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 5
 
-> INSERT  4 : 10  @  7
+> INSERT  2 : 8  @  5
 
 + 
 + import com.google.common.collect.ComparisonChain;
@@ -16,35 +16,35 @@
 + import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  11  @  8 : 10
+> DELETE  7  @  1 : 3
 
-> DELETE  13  @  12 : 13
+> DELETE  2  @  4 : 5
 
-> CHANGE  59 : 60  @  59 : 60
+> CHANGE  46 : 47  @  47 : 48
 
 ~ 		for (NetworkPlayerInfo networkplayerinfo : (List) list) {
 
-> CHANGE  80 : 81  @  80 : 82
+> CHANGE  21 : 22  @  21 : 23
 
 ~ 		boolean flag = true;
 
-> CHANGE  101 : 102  @  102 : 103
+> CHANGE  21 : 22  @  22 : 23
 
 ~ 			for (String s : (List) list1) {
 
-> CHANGE  109 : 110  @  110 : 111
+> CHANGE  8 : 9  @  8 : 9
 
 ~ 			for (String s2 : (List) list2) {
 
-> CHANGE  118 : 119  @  119 : 120
+> CHANGE  9 : 10  @  9 : 10
 
 ~ 			for (String s3 : (List) list1) {
 
-> CHANGE  151 : 152  @  152 : 153
+> CHANGE  33 : 34  @  33 : 34
 
 ~ 					if (entityplayer == null || entityplayer.isWearing(EnumPlayerModelParts.HAT)) {
 
-> CHANGE  185 : 186  @  186 : 187
+> CHANGE  34 : 35  @  34 : 35
 
 ~ 			for (String s4 : (List) list2) {
 
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiRepair.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiRepair.edit.java
index 6e36ea3..2d39dfb 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiRepair.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiRepair.edit.java
@@ -7,24 +7,24 @@
 
 > DELETE  2  @  2 : 4
 
-> INSERT  3 : 7  @  5
+> INSERT  1 : 5  @  3
 
 + 
 + import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
 + import net.lax1dude.eaglercraft.v1_8.Keyboard;
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  8  @  6 : 7
+> DELETE  5  @  1 : 2
 
-> DELETE  9  @  8 : 9
+> DELETE  1  @  2 : 3
 
-> DELETE  21  @  21 : 22
+> DELETE  12  @  13 : 14
 
-> CHANGE  91 : 92  @  92 : 93
+> CHANGE  70 : 71  @  71 : 72
 
 ~ 	protected void keyTyped(char parChar1, int parInt1) {
 
-> CHANGE  113 : 114  @  114 : 115
+> CHANGE  22 : 23  @  22 : 23
 
 ~ 	protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
 
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiResourcePackAvailable.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiResourcePackAvailable.edit.java
index 681a62a..c0406de 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiResourcePackAvailable.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiResourcePackAvailable.edit.java
@@ -9,6 +9,6 @@
 
 + 
 
-> DELETE  5  @  4 : 5
+> DELETE  2  @  1 : 2
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiResourcePackList.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiResourcePackList.edit.java
index 681a62a..c0406de 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiResourcePackList.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiResourcePackList.edit.java
@@ -9,6 +9,6 @@
 
 + 
 
-> DELETE  5  @  4 : 5
+> DELETE  2  @  1 : 2
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiResourcePackSelected.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiResourcePackSelected.edit.java
index 681a62a..c0406de 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiResourcePackSelected.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiResourcePackSelected.edit.java
@@ -9,6 +9,6 @@
 
 + 
 
-> DELETE  5  @  4 : 5
+> DELETE  2  @  1 : 2
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreen.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiScreen.edit.java
index e23cddc..fe02855 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiScreen.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiScreen.edit.java
@@ -7,9 +7,9 @@
 
 > DELETE  2  @  2 : 11
 
-> DELETE  3  @  12 : 14
+> DELETE  1  @  10 : 12
 
-> INSERT  7 : 22  @  18
+> INSERT  4 : 19  @  6
 
 + 
 + import org.apache.commons.lang3.StringUtils;
@@ -27,24 +27,24 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> CHANGE  23 : 24  @  19 : 27
+> CHANGE  16 : 17  @  1 : 9
 
 ~ import net.minecraft.client.gui.inventory.GuiContainer;
 
-> DELETE  26  @  29 : 30
+> DELETE  3  @  10 : 11
 
-> INSERT  28 : 29  @  32
+> INSERT  2 : 3  @  3
 
 + import net.minecraft.client.resources.I18n;
 
-> DELETE  42  @  45 : 51
+> DELETE  14  @  13 : 19
 
-> CHANGE  59 : 61  @  68 : 69
+> CHANGE  17 : 19  @  23 : 24
 
 ~ 	private String clickedLinkURI;
 ~ 	protected long showingCloseKey = 0;
 
-> INSERT  71 : 101  @  79
+> INSERT  12 : 42  @  11
 
 + 		long millis = System.currentTimeMillis();
 + 		long closeKeyTimeout = millis - showingCloseKey;
@@ -77,7 +77,7 @@
 + 		}
 + 
 
-> CHANGE  103 : 115  @  81 : 83
+> CHANGE  32 : 44  @  2 : 4
 
 ~ 	protected int getCloseKey() {
 ~ 		if (this instanceof GuiContainer) {
@@ -92,26 +92,26 @@
 ~ 				|| parInt1 == this.mc.gameSettings.keyBindClose.getKeyCode()
 ~ 				|| (parInt1 == 1 && this.mc.gameSettings.keyBindClose.getKeyCode() == 0)) {
 
-> INSERT  119 : 121  @  87
+> INSERT  16 : 18  @  6
 
 + 		} else if (parInt1 == 1) {
 + 			showingCloseKey = System.currentTimeMillis();
 
-> DELETE  122  @  88 : 89
+> DELETE  3  @  1 : 2
 
-> CHANGE  125 : 126  @  92 : 102
+> CHANGE  3 : 4  @  4 : 14
 
 ~ 		return EagRuntime.getClipboard();
 
-> CHANGE  130 : 131  @  106 : 113
+> CHANGE  5 : 6  @  14 : 21
 
 ~ 			EagRuntime.setClipboard(copyText);
 
-> INSERT  307 : 308  @  289
+> INSERT  177 : 178  @  183
 
 + 					String uri = clickevent.getValue();
 
-> CHANGE  309 : 314  @  290 : 311
+> CHANGE  2 : 7  @  1 : 22
 
 ~ 					if (this.mc.gameSettings.chatLinksPrompt) {
 ~ 						this.clickedLinkURI = uri;
@@ -119,11 +119,11 @@
 ~ 					} else {
 ~ 						this.openWebLink(uri);
 
-> CHANGE  316 : 317  @  313 : 315
+> CHANGE  7 : 8  @  23 : 25
 
 ~ 					// rip
 
-> CHANGE  322 : 329  @  320 : 326
+> CHANGE  6 : 13  @  7 : 13
 
 ~ 					/*
 ~ 					 * ChatUserInfo chatuserinfo =
@@ -133,15 +133,15 @@
 ~ 					 */
 ~ 					LOGGER.error("Tried to handle twitch user but couldn\'t find them!");
 
-> CHANGE  352 : 353  @  349 : 350
+> CHANGE  30 : 31  @  29 : 30
 
 ~ 	protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
 
-> CHANGE  377 : 378  @  374 : 375
+> CHANGE  25 : 26  @  25 : 26
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
-> CHANGE  497 : 499  @  494 : 503
+> CHANGE  120 : 122  @  120 : 129
 
 ~ 	private void openWebLink(String parURI) {
 ~ 		EagRuntime.openLink(parURI);
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreenAddServer.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiScreenAddServer.edit.java
index 26d1a58..2820fb6 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiScreenAddServer.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiScreenAddServer.edit.java
@@ -10,27 +10,27 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 ~ import net.lax1dude.eaglercraft.v1_8.Keyboard;
 
-> DELETE  6  @  10 : 11
+> DELETE  4  @  8 : 9
 
-> CHANGE  13 : 14  @  18 : 37
+> CHANGE  7 : 8  @  8 : 27
 
 ~ 	private GuiButton hideAddress;
 
-> INSERT  27 : 28  @  50
+> INSERT  14 : 15  @  32
 
 + 		int i = 80;
 
-> CHANGE  29 : 32  @  51 : 52
+> CHANGE  2 : 5  @  1 : 2
 
 ~ 		GuiButton done;
 ~ 		GuiButton cancel;
 ~ 		this.buttonList.add(done = new GuiButton(0, this.width / 2 - 100, i + 96 + 12,
 
-> CHANGE  33 : 34  @  53 : 54
+> CHANGE  4 : 5  @  2 : 3
 
 ~ 		this.buttonList.add(cancel = new GuiButton(1, this.width / 2 - 100, i + 120 + 12,
 
-> CHANGE  35 : 42  @  55 : 56
+> CHANGE  2 : 9  @  2 : 3
 
 ~ 		if (EagRuntime.requireSSL()) {
 ~ 			done.yPosition = cancel.yPosition;
@@ -40,21 +40,21 @@
 ~ 		}
 ~ 		this.buttonList.add(this.serverResourcePacks = new GuiButton(2, this.width / 2 - 100, i + 54,
 
-> INSERT  44 : 47  @  58
+> INSERT  9 : 12  @  3
 
 + 		this.buttonList.add(this.hideAddress = new GuiButton(3, this.width / 2 - 100, i + 78,
 + 				I18n.format("addServer.hideAddress", new Object[0]) + ": "
 + 						+ I18n.format(this.serverData.hideAddress ? "gui.yes" : "gui.no", new Object[0])));
 
-> CHANGE  53 : 54  @  64 : 67
+> CHANGE  9 : 10  @  6 : 9
 
 ~ 		((GuiButton) this.buttonList.get(0)).enabled = this.serverIPField.getText().trim().length() > 0;
 
-> CHANGE  60 : 61  @  73 : 74
+> CHANGE  7 : 8  @  9 : 10
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
-> CHANGE  62 : 67  @  75 : 76
+> CHANGE  2 : 7  @  2 : 3
 
 ~ 			if (parGuiButton.id == 3) {
 ~ 				this.serverData.hideAddress = !this.serverData.hideAddress;
@@ -62,24 +62,24 @@
 ~ 						+ I18n.format(this.serverData.hideAddress ? "gui.yes" : "gui.no", new Object[0]);
 ~ 			} else if (parGuiButton.id == 2) {
 
-> CHANGE  75 : 77  @  84 : 86
+> CHANGE  13 : 15  @  9 : 11
 
 ~ 				this.serverData.serverName = this.serverNameField.getText().trim();
 ~ 				this.serverData.serverIP = this.serverIPField.getText().trim();
 
-> CHANGE  83 : 84  @  92 : 93
+> CHANGE  8 : 9  @  8 : 9
 
 ~ 	protected void keyTyped(char parChar1, int parInt1) {
 
-> CHANGE  95 : 96  @  104 : 106
+> CHANGE  12 : 13  @  12 : 14
 
 ~ 		((GuiButton) this.buttonList.get(0)).enabled = this.serverIPField.getText().trim().length() > 0;
 
-> CHANGE  98 : 99  @  108 : 109
+> CHANGE  3 : 4  @  4 : 5
 
 ~ 	protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
 
-> INSERT  112 : 118  @  122
+> INSERT  14 : 20  @  14
 
 + 		if (EagRuntime.requireSSL()) {
 + 			this.drawCenteredString(this.fontRendererObj, I18n.format("addServer.SSLWarn1"), this.width / 2, 184,
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreenBook.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiScreenBook.edit.java
index d4e8314..c48dfd8 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiScreenBook.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiScreenBook.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 6
 
-> INSERT  3 : 13  @  7
+> INSERT  1 : 11  @  5
 
 + 
 + import org.json.JSONException;
@@ -20,25 +20,25 @@
 + import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  14  @  8 : 12
+> DELETE  11  @  1 : 5
 
-> DELETE  30  @  28 : 31
+> DELETE  16  @  20 : 23
 
-> CHANGE  169 : 170  @  170 : 171
+> CHANGE  139 : 140  @  142 : 143
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
-> CHANGE  208 : 209  @  209 : 211
+> CHANGE  39 : 40  @  39 : 41
 
 ~ 	protected void keyTyped(char parChar1, int parInt1) {
 
-> DELETE  215  @  217 : 218
+> DELETE  7  @  8 : 9
 
-> CHANGE  344 : 345  @  347 : 348
+> CHANGE  129 : 130  @  130 : 131
 
 ~ 					} catch (JSONException var13) {
 
-> CHANGE  379 : 380  @  382 : 383
+> CHANGE  35 : 36  @  35 : 36
 
 ~ 	protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
 
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreenOptionsSounds.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiScreenOptionsSounds.edit.java
index a126206..ca0d261 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiScreenOptionsSounds.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiScreenOptionsSounds.edit.java
@@ -9,9 +9,9 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  7  @  7 : 10
+> DELETE  5  @  5 : 8
 
-> CHANGE  44 : 45  @  47 : 48
+> CHANGE  37 : 38  @  40 : 41
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreenResourcePacks.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiScreenResourcePacks.edit.java
index 599ec22..a9c9267 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiScreenResourcePacks.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiScreenResourcePacks.edit.java
@@ -9,9 +9,9 @@
 
 ~ import java.io.ByteArrayInputStream;
 
-> DELETE  4  @  5 : 6
+> DELETE  2  @  3 : 4
 
-> CHANGE  7 : 15  @  9 : 14
+> CHANGE  3 : 11  @  4 : 9
 
 ~ 
 ~ import com.google.common.collect.Lists;
@@ -22,43 +22,43 @@
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
-> DELETE  20  @  19 : 23
+> DELETE  13  @  10 : 14
 
-> CHANGE  35 : 37  @  38 : 39
+> CHANGE  15 : 17  @  19 : 20
 
 ~ 		GuiButton btn;
 ~ 		this.buttonList.add(btn = new GuiOptionButton(2, this.width / 2 - 154, this.height - 48,
 
-> INSERT  38 : 39  @  40
+> INSERT  3 : 4  @  2
 
 + 		btn.enabled = SYS.VFS != null;
 
-> CHANGE  49 : 50  @  50 : 51
+> CHANGE  11 : 12  @  10 : 11
 
 ~ 			for (ResourcePackRepository.Entry resourcepackrepository$entry : (List) arraylist) {
 
-> CHANGE  94 : 95  @  95 : 96
+> CHANGE  45 : 46  @  45 : 46
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
-> CHANGE  97 : 100  @  98 : 135
+> CHANGE  3 : 6  @  3 : 40
 
 ~ 				if (SYS.VFS == null)
 ~ 					return;
 ~ 				EagRuntime.displayFileChooser("application/zip", "zip");
 
-> CHANGE  115 : 116  @  150 : 151
+> CHANGE  18 : 19  @  52 : 53
 
 ~ 					for (ResourcePackRepository.Entry resourcepackrepository$entry : (List) arraylist) {
 
-> INSERT  122 : 124  @  157
+> INSERT  7 : 9  @  7
 
 + 					this.mc.loadingScreen.eaglerShow(I18n.format("resourcePack.load.refreshing"),
 + 							I18n.format("resourcePack.load.pleaseWait"));
 
-> DELETE  127  @  160 : 161
+> DELETE  5  @  3 : 4
 
-> CHANGE  133 : 173  @  167 : 168
+> CHANGE  6 : 46  @  7 : 8
 
 ~ 	public void updateScreen() {
 ~ 		FileChooserResult packFile = null;
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreenServerList.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiScreenServerList.edit.java
index c0cc544..89970bb 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiScreenServerList.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiScreenServerList.edit.java
@@ -10,9 +10,9 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 ~ import net.lax1dude.eaglercraft.v1_8.Keyboard;
 
-> DELETE  6  @  8 : 9
+> DELETE  4  @  6 : 7
 
-> CHANGE  28 : 34  @  31 : 32
+> CHANGE  22 : 28  @  23 : 24
 
 ~ 		if (EagRuntime.requireSSL()) {
 ~ 			this.field_146302_g = new GuiTextField(2, this.fontRendererObj, this.width / 2 - 100, this.height / 4 + 35,
@@ -21,31 +21,31 @@
 ~ 			this.field_146302_g = new GuiTextField(2, this.fontRendererObj, this.width / 2 - 100, 116, 200, 20);
 ~ 		}
 
-> CHANGE  37 : 38  @  35 : 37
+> CHANGE  9 : 10  @  4 : 6
 
 ~ 		((GuiButton) this.buttonList.get(0)).enabled = this.field_146302_g.getText().trim().length() > 0;
 
-> CHANGE  46 : 47  @  45 : 46
+> CHANGE  9 : 10  @  10 : 11
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
-> CHANGE  51 : 52  @  50 : 51
+> CHANGE  5 : 6  @  5 : 6
 
 ~ 				this.field_146301_f.serverIP = this.field_146302_g.getText().trim();
 
-> CHANGE  58 : 59  @  57 : 58
+> CHANGE  7 : 8  @  7 : 8
 
 ~ 	protected void keyTyped(char parChar1, int parInt1) {
 
-> CHANGE  60 : 61  @  59 : 61
+> CHANGE  2 : 3  @  2 : 4
 
 ~ 			((GuiButton) this.buttonList.get(0)).enabled = this.field_146302_g.getText().trim().length() > 0;
 
-> CHANGE  67 : 68  @  67 : 68
+> CHANGE  7 : 8  @  8 : 9
 
 ~ 	protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
 
-> CHANGE  76 : 87  @  76 : 78
+> CHANGE  9 : 20  @  9 : 11
 
 ~ 		if (EagRuntime.requireSSL()) {
 ~ 			this.drawString(this.fontRendererObj, I18n.format("addServer.enterIp", new Object[0]), this.width / 2 - 100,
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiSleepMP.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiSleepMP.edit.java
index b76dcef..bc6bfa4 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiSleepMP.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiSleepMP.edit.java
@@ -7,11 +7,11 @@
 
 > DELETE  2  @  2 : 5
 
-> CHANGE  13 : 14  @  16 : 17
+> CHANGE  11 : 12  @  14 : 15
 
 ~ 	protected void keyTyped(char parChar1, int parInt1) {
 
-> CHANGE  30 : 31  @  33 : 34
+> CHANGE  17 : 18  @  17 : 18
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiSlider.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiSlider.edit.java
index 49ebceb..42e703d 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiSlider.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiSlider.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 6
+> DELETE  2  @  1 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiSlot.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiSlot.edit.java
index 757e8ff..9766009 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiSlot.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiSlot.edit.java
@@ -13,19 +13,19 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  8  @  3 : 6
+> DELETE  6  @  1 : 4
 
-> DELETE  9  @  7 : 8
+> DELETE  1  @  4 : 5
 
-> DELETE  11  @  10 : 11
+> DELETE  2  @  3 : 4
 
-> INSERT  13 : 16  @  13
+> INSERT  2 : 5  @  3
 
 + 
 + 	private static final Logger excLogger = LogManager.getLogger("GuiSlotRenderer");
 + 
 
-> CHANGE  397 : 404  @  394 : 395
+> CHANGE  384 : 391  @  381 : 382
 
 ~ 			try {
 ~ 				this.drawSlot(j, mouseXIn, k, l, parInt3, parInt4);
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiSpectator.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiSpectator.edit.java
index 0b0539a..e360253 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiSpectator.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiSpectator.edit.java
@@ -9,8 +9,8 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 5
+> DELETE  2  @  1 : 3
 
-> DELETE  8  @  9 : 10
+> DELETE  4  @  6 : 7
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiTextField.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiTextField.edit.java
index cc97fc8..e0da413 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiTextField.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiTextField.edit.java
@@ -11,13 +11,13 @@
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  8  @  10 : 11
+> DELETE  4  @  6 : 7
 
-> CHANGE  19 : 20  @  22 : 23
+> CHANGE  11 : 12  @  12 : 13
 
 ~ 	protected String text = "";
 
-> INSERT  64 : 76  @  67
+> INSERT  45 : 57  @  45
 
 + 	public void updateText(String parString1) {
 + 		if (this.field_175209_y.apply(parString1)) {
@@ -32,15 +32,15 @@
 + 	}
 + 
 
-> CHANGE  429 : 432  @  420 : 421
+> CHANGE  365 : 368  @  353 : 354
 
 ~ 		GlStateManager.color(0.2F, 0.2F, 1.0F, 1.0F);
 ~ 		GlStateManager.enableBlend();
 ~ 		GlStateManager.blendFunc(775, 770);
 
-> DELETE  433  @  422 : 424
+> DELETE  4  @  2 : 4
 
-> CHANGE  439 : 440  @  430 : 431
+> CHANGE  6 : 7  @  8 : 9
 
 ~ 		GlStateManager.disableBlend();
 
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.edit.java
index 6ed2506..409f927 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  4 : 7  @  5
+> INSERT  2 : 5  @  3
 
 + 
 + import com.google.common.collect.Lists;
 + 
 
-> DELETE  8  @  6 : 7
+> DELETE  4  @  1 : 2
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiVideoSettings.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiVideoSettings.edit.java
index 653748a..9721164 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiVideoSettings.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiVideoSettings.edit.java
@@ -9,7 +9,7 @@
 
 ~ 
 
-> CHANGE  16 : 21  @  21 : 24
+> CHANGE  13 : 18  @  18 : 21
 
 ~ 			GameSettings.Options.PARTICLES, GameSettings.Options.FXAA, GameSettings.Options.MIPMAP_LEVELS,
 ~ 			GameSettings.Options.BLOCK_ALTERNATIVES, GameSettings.Options.ENTITY_SHADOWS, GameSettings.Options.FOG,
@@ -17,28 +17,28 @@
 ~ 			GameSettings.Options.HUD_STATS, GameSettings.Options.HUD_WORLD, GameSettings.Options.HUD_24H,
 ~ 			GameSettings.Options.CHUNK_FIX };
 
-> CHANGE  32 : 34  @  35 : 38
+> CHANGE  16 : 18  @  14 : 17
 
 ~ 		GameSettings.Options[] agamesettings$options = new GameSettings.Options[videoOptions.length];
 ~ 		int i = 0;
 
-> CHANGE  35 : 38  @  39 : 53
+> CHANGE  3 : 6  @  4 : 18
 
 ~ 		for (GameSettings.Options gamesettings$options : videoOptions) {
 ~ 			agamesettings$options[i] = gamesettings$options;
 ~ 			++i;
 
-> INSERT  40 : 43  @  55
+> INSERT  5 : 8  @  16
 
 + 		this.optionsRowList = new GuiOptionsRowList(this.mc, this.width, this.height, 32, this.height - 32, 25,
 + 				agamesettings$options);
 + 
 
-> CHANGE  50 : 51  @  62 : 63
+> CHANGE  10 : 11  @  7 : 8
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
-> CHANGE  60 : 61  @  72 : 73
+> CHANGE  10 : 11  @  10 : 11
 
 ~ 	protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
 
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiWinGame.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiWinGame.edit.java
index b1648cd..c36695e 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiWinGame.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiWinGame.edit.java
@@ -7,9 +7,9 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  3  @  4 : 5
+> DELETE  1  @  2 : 3
 
-> CHANGE  6 : 16  @  8 : 9
+> CHANGE  3 : 13  @  4 : 5
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
@@ -22,25 +22,25 @@
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 ~ import net.lax1dude.eaglercraft.v1_8.profile.EaglerProfile;
 
-> DELETE  18  @  11 : 14
+> DELETE  12  @  3 : 6
 
-> DELETE  19  @  15 : 16
+> DELETE  1  @  4 : 5
 
-> DELETE  23  @  20 : 23
+> DELETE  4  @  5 : 8
 
-> CHANGE  51 : 52  @  51 : 52
+> CHANGE  28 : 29  @  31 : 32
 
 ~ 	protected void keyTyped(char parChar1, int parInt1) {
 
-> CHANGE  80 : 81  @  80 : 81
+> CHANGE  29 : 30  @  29 : 30
 
 ~ 				EaglercraftRandom random = new EaglercraftRandom(8124371L);
 
-> CHANGE  85 : 86  @  85 : 86
+> CHANGE  5 : 6  @  5 : 6
 
 ~ 					for (s = s.replaceAll("PLAYERNAME", EaglerProfile.getName()); s
 
-> CHANGE  108 : 109  @  108 : 109
+> CHANGE  23 : 24  @  23 : 24
 
 ~ 					s = s.replaceAll("PLAYERNAME", EaglerProfile.getName());
 
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiYesNo.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiYesNo.edit.java
index f4c43e1..8f882f7 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiYesNo.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiYesNo.edit.java
@@ -7,21 +7,21 @@
 
 > DELETE  2  @  2 : 4
 
-> CHANGE  3 : 6  @  5 : 9
+> CHANGE  1 : 4  @  3 : 7
 
 ~ 
 ~ import com.google.common.collect.Lists;
 ~ 
 
-> INSERT  17 : 18  @  20
+> INSERT  14 : 15  @  15
 
 + 	private boolean opaqueBackground = false;
 
-> CHANGE  46 : 47  @  48 : 49
+> CHANGE  29 : 30  @  28 : 29
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
-> CHANGE  51 : 56  @  53 : 54
+> CHANGE  5 : 10  @  5 : 6
 
 ~ 		if (opaqueBackground) {
 ~ 			this.drawBackground(0);
@@ -29,7 +29,7 @@
 ~ 			this.drawDefaultBackground();
 ~ 		}
 
-> INSERT  85 : 90  @  83
+> INSERT  34 : 39  @  30
 
 + 
 + 	public GuiYesNo withOpaqueBackground() {
diff --git a/patches/minecraft/net/minecraft/client/gui/MapItemRenderer.edit.java b/patches/minecraft/net/minecraft/client/gui/MapItemRenderer.edit.java
index 0fe1c8c..58171ce 100644
--- a/patches/minecraft/net/minecraft/client/gui/MapItemRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/MapItemRenderer.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 8  @  4
+> INSERT  1 : 6  @  2
 
 + 
 + import com.google.common.collect.Maps;
@@ -15,23 +15,23 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  9  @  5 : 6
+> DELETE  6  @  1 : 2
 
-> DELETE  10  @  7 : 8
+> DELETE  1  @  2 : 3
 
-> INSERT  75 : 76  @  73
+> INSERT  65 : 66  @  66
 
 + 				int c;
 
-> CHANGE  77 : 78  @  74 : 75
+> CHANGE  2 : 3  @  1 : 2
 
 ~ 					c = (i + i / 128 & 1) * 8 + 16 << 24;
 
-> CHANGE  79 : 80  @  76 : 77
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 					c = MapColor.mapColorArray[j / 4].func_151643_b(j & 3);
 
-> INSERT  81 : 82  @  78
+> INSERT  2 : 3  @  2
 
 + 				this.mapTextureData[i] = (c & 0xFF00FF00) | ((c & 0x00FF0000) >> 16) | ((c & 0x000000FF) << 16);
 
diff --git a/patches/minecraft/net/minecraft/client/gui/ScreenChatOptions.edit.java b/patches/minecraft/net/minecraft/client/gui/ScreenChatOptions.edit.java
index bea096f..4432ef3 100644
--- a/patches/minecraft/net/minecraft/client/gui/ScreenChatOptions.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/ScreenChatOptions.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 7
 
-> CHANGE  41 : 42  @  46 : 47
+> CHANGE  39 : 40  @  44 : 45
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
diff --git a/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.edit.java b/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.edit.java
index 3b027ac..6933734 100644
--- a/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.edit.java
@@ -7,32 +7,32 @@
 
 > DELETE  2  @  2 : 10
 
-> CHANGE  3 : 7  @  11 : 13
+> CHANGE  1 : 5  @  9 : 11
 
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  8  @  14 : 18
+> DELETE  5  @  3 : 7
 
-> CHANGE  9 : 10  @  19 : 22
+> CHANGE  1 : 2  @  5 : 8
 
 ~ import net.minecraft.client.resources.I18n;
 
-> DELETE  12  @  24 : 27
+> DELETE  3  @  5 : 8
 
-> DELETE  15  @  30 : 32
+> DELETE  3  @  6 : 8
 
-> DELETE  21  @  38 : 39
+> DELETE  6  @  8 : 9
 
-> DELETE  22  @  40 : 41
+> DELETE  1  @  2 : 3
 
-> DELETE  28  @  47 : 49
+> DELETE  6  @  7 : 9
 
-> DELETE  36  @  57 : 74
+> DELETE  8  @  10 : 27
 
-> CHANGE  44 : 54  @  82 : 85
+> CHANGE  8 : 18  @  25 : 28
 
 ~ 		for (int k1 = 0; k1 < 2; ++k1) {
 ~ 			if (k1 < list.size()) {
@@ -45,32 +45,32 @@
 ~ 						j + 32 + 3, k + 12 + this.mc.fontRendererObj.FONT_HEIGHT * k1 + k1, 0x444444);
 ~ 			}
 
-> CHANGE  103 : 107  @  134 : 139
+> CHANGE  59 : 63  @  52 : 57
 
 ~ 		if (this.mc.gameSettings.touchscreen || flag) {
 ~ 			GlStateManager.enableShaderBlendAdd();
 ~ 			GlStateManager.setShaderBlendSrc(0.6f, 0.6f, 0.6f, 1.0f);
 ~ 			GlStateManager.setShaderBlendAdd(0.3f, 0.3f, 0.3f, 0.0f);
 
-> CHANGE  108 : 110  @  140 : 143
+> CHANGE  5 : 7  @  6 : 9
 
 ~ 		if (field_148301_e.iconTextureObject != null) {
 ~ 			this.func_178012_a(j, k, field_148301_e.iconResourceLocation);
 
-> INSERT  113 : 116  @  146
+> INSERT  5 : 8  @  6
 
 + 		if (this.mc.gameSettings.touchscreen || flag) {
 + 			GlStateManager.disableShaderBlendAdd();
 + 		}
 
-> CHANGE  127 : 128  @  157 : 158
+> CHANGE  14 : 15  @  11 : 12
 
 ~ 			// Gui.drawRect(j, k, j + 32, k + 32, -1601138544);
 
-> INSERT  161 : 162  @  191
+> INSERT  34 : 35  @  34
 
 + 		GlStateManager.blendFunc(770, 771);
 
-> DELETE  170  @  199 : 238
+> DELETE  9  @  8 : 47
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/ServerSelectionList.edit.java b/patches/minecraft/net/minecraft/client/gui/ServerSelectionList.edit.java
index 71fadd9..b7f017a 100644
--- a/patches/minecraft/net/minecraft/client/gui/ServerSelectionList.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/ServerSelectionList.edit.java
@@ -7,26 +7,26 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.collect.Lists;
 + 
 
-> DELETE  7  @  5 : 10
+> DELETE  4  @  1 : 6
 
-> DELETE  8  @  11 : 12
+> DELETE  1  @  6 : 7
 
-> DELETE  12  @  16 : 18
+> DELETE  4  @  5 : 7
 
-> CHANGE  21 : 22  @  27 : 38
+> CHANGE  9 : 10  @  11 : 22
 
 ~ 		return (GuiListExtended.IGuiListEntry) this.field_148198_l.get(i);
 
-> CHANGE  25 : 26  @  41 : 42
+> CHANGE  4 : 5  @  14 : 15
 
 ~ 		return this.field_148198_l.size();
 
-> DELETE  49  @  65 : 74
+> DELETE  24  @  24 : 33
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievement.edit.java b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievement.edit.java
index 31c62b4..9641888 100644
--- a/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievement.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievement.edit.java
@@ -9,9 +9,9 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  6  @  5 : 6
+> DELETE  4  @  3 : 4
 
-> INSERT  120 : 152  @  120
+> INSERT  114 : 146  @  115
 
 + 	public int getHeight() {
 + 		if (this.theAchievement != null && this.notificationTime != 0L && Minecraft.getMinecraft().thePlayer != null) {
diff --git a/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.edit.java b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.edit.java
index 6d54191..af7374f 100644
--- a/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.edit.java
@@ -13,52 +13,52 @@
 ~ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  13  @  10 : 11
+> DELETE  11  @  8 : 9
 
-> DELETE  14  @  12 : 13
+> DELETE  1  @  2 : 3
 
-> DELETE  24  @  23 : 24
+> DELETE  10  @  11 : 12
 
-> CHANGE  67 : 68  @  67 : 68
+> CHANGE  43 : 44  @  44 : 45
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
-> CHANGE  76 : 78  @  76 : 84
+> CHANGE  9 : 11  @  9 : 17
 
 ~ 	protected int getCloseKey() {
 ~ 		return this.mc.gameSettings.keyBindInventory.getKeyCode();
 
-> CHANGE  154 : 155  @  160 : 161
+> CHANGE  78 : 79  @  84 : 85
 
 ~ 			GlStateManager.disableLighting();
 
-> INSERT  216 : 220  @  222
+> INSERT  62 : 66  @  62
 
 + 		GlStateManager.enableDepth();
 + 		GlStateManager.clearDepth(0.0f);
 + 		GlStateManager.clear(256);
 + 		GlStateManager.clearDepth(1.0f);
 
-> CHANGE  237 : 238  @  239 : 240
+> CHANGE  21 : 22  @  17 : 18
 
 ~ 		EaglercraftRandom random = new EaglercraftRandom();
 
-> CHANGE  246 : 248  @  248 : 249
+> CHANGE  9 : 11  @  9 : 10
 
 ~ 				random.setSeed(
 ~ 						(long) (this.mc.getSession().getProfile().getId().hashCode() + k1 + l2 + (l1 + k2) * 16));
 
-> CHANGE  249 : 250  @  250 : 251
+> CHANGE  3 : 4  @  2 : 3
 
 ~ 				EaglerTextureAtlasSprite textureatlassprite = this.func_175371_a(Blocks.sand);
 
-> DELETE  276  @  277 : 278
+> DELETE  27  @  27 : 28
 
-> CHANGE  434 : 435  @  436 : 437
+> CHANGE  158 : 159  @  159 : 160
 
 ~ 		GlStateManager.disableBlend();
 
-> CHANGE  438 : 439  @  440 : 441
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	private EaglerTextureAtlasSprite func_175371_a(Block parBlock) {
 
diff --git a/patches/minecraft/net/minecraft/client/gui/achievement/GuiStats.edit.java b/patches/minecraft/net/minecraft/client/gui/achievement/GuiStats.edit.java
index 8037666..d32d9a5 100644
--- a/patches/minecraft/net/minecraft/client/gui/achievement/GuiStats.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/achievement/GuiStats.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  6 : 12  @  7
+> INSERT  4 : 10  @  5
 
 + 
 + import com.google.common.collect.Lists;
@@ -16,13 +16,13 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  18  @  13 : 14
+> DELETE  12  @  6 : 7
 
-> DELETE  20  @  16 : 17
+> DELETE  2  @  3 : 4
 
-> DELETE  31  @  28 : 29
+> DELETE  11  @  12 : 13
 
-> CHANGE  102 : 103  @  100 : 101
+> CHANGE  71 : 72  @  72 : 73
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiBeacon.edit.java b/patches/minecraft/net/minecraft/client/gui/inventory/GuiBeacon.edit.java
index 9f63b8b..4dfe5c0 100644
--- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiBeacon.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiBeacon.edit.java
@@ -12,11 +12,11 @@
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  9  @  7 : 9
+> DELETE  7  @  5 : 7
 
-> DELETE  21  @  21 : 23
+> DELETE  12  @  14 : 16
 
-> CHANGE  101 : 102  @  103 : 104
+> CHANGE  80 : 81  @  82 : 83
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiChest.edit.java b/patches/minecraft/net/minecraft/client/gui/inventory/GuiChest.edit.java
index 23934c6..060e994 100644
--- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiChest.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiChest.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 5
+> DELETE  2  @  1 : 3
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.edit.java b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.edit.java
index 3ea91da..9c29f36 100644
--- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 4
 
-> INSERT  3 : 11  @  5
+> INSERT  1 : 9  @  3
 
 + 
 + import com.google.common.collect.Sets;
@@ -18,37 +18,37 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
 
-> DELETE  13  @  7 : 9
+> DELETE  10  @  2 : 4
 
-> DELETE  14  @  10 : 11
+> DELETE  1  @  3 : 4
 
-> DELETE  22  @  19 : 20
+> DELETE  8  @  9 : 10
 
-> INSERT  103 : 104  @  101
+> INSERT  81 : 82  @  82
 
 + 			GlStateManager.enableAlpha();
 
-> CHANGE  211 : 212  @  208 : 209
+> CHANGE  108 : 109  @  107 : 108
 
 ~ 				EaglerTextureAtlasSprite textureatlassprite = this.mc.getTextureMapBlocks().getAtlasSprite(s1);
 
-> CHANGE  268 : 269  @  265 : 266
+> CHANGE  57 : 58  @  57 : 58
 
 ~ 	protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
 
-> CHANGE  504 : 508  @  501 : 503
+> CHANGE  236 : 240  @  236 : 238
 
 ~ 	protected void keyTyped(char parChar1, int parInt1) {
 ~ 		if (parInt1 == this.mc.gameSettings.keyBindClose.getKeyCode()
 ~ 				|| parInt1 == this.mc.gameSettings.keyBindInventory.getKeyCode()
 ~ 				|| (parInt1 == 1 && this.mc.gameSettings.keyBindClose.getKeyCode() == 0)) {
 
-> CHANGE  509 : 511  @  504 : 512
+> CHANGE  5 : 7  @  3 : 11
 
 ~ 			if (this.mc.currentScreen == null) {
 ~ 				this.mc.setIngameFocus();
 
-> INSERT  512 : 523  @  513
+> INSERT  3 : 14  @  9
 
 + 		} else if (parInt1 == 1) {
 + 			showingCloseKey = System.currentTimeMillis();
@@ -62,6 +62,6 @@
 + 				}
 + 			}
 
-> DELETE  524  @  514 : 515
+> DELETE  12  @  1 : 2
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.edit.java b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.edit.java
index ad8bfd3..752b751 100644
--- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  6 : 12  @  7
+> INSERT  4 : 10  @  5
 
 + 
 + import com.google.common.collect.Lists;
@@ -16,21 +16,21 @@
 + import net.lax1dude.eaglercraft.v1_8.Mouse;
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  16  @  11 : 14
+> DELETE  10  @  4 : 7
 
-> DELETE  35  @  33 : 35
+> DELETE  19  @  22 : 24
 
-> CHANGE  221 : 222  @  221 : 222
+> CHANGE  186 : 187  @  188 : 189
 
 ~ 	protected void keyTyped(char parChar1, int parInt1) {
 
-> CHANGE  235 : 238  @  235 : 236
+> CHANGE  14 : 17  @  14 : 15
 
 ~ 			if (parInt1 == getCloseKey()) {
 ~ 				mc.displayGuiScreen(null);
 ~ 			} else if (!this.checkHotbarKeys(parInt1)) {
 
-> INSERT  248 : 253  @  246
+> INSERT  13 : 18  @  11
 
 + 	protected int getCloseKey() {
 + 		return selectedTabIndex != CreativeTabs.tabAllSearch.getTabIndex() ? super.getCloseKey()
@@ -38,11 +38,11 @@
 + 	}
 + 
 
-> CHANGE  302 : 303  @  295 : 296
+> CHANGE  54 : 55  @  49 : 50
 
 ~ 	protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
 
-> CHANGE  625 : 626  @  618 : 619
+> CHANGE  323 : 324  @  323 : 324
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiEditSign.edit.java b/patches/minecraft/net/minecraft/client/gui/inventory/GuiEditSign.edit.java
index f6532b6..759c718 100644
--- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiEditSign.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiEditSign.edit.java
@@ -10,15 +10,15 @@
 ~ import net.lax1dude.eaglercraft.v1_8.Keyboard;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  8  @  7 : 8
+> DELETE  6  @  5 : 6
 
-> DELETE  15  @  15 : 16
+> DELETE  7  @  8 : 9
 
-> CHANGE  49 : 50  @  50 : 51
+> CHANGE  34 : 35  @  35 : 36
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
-> CHANGE  59 : 60  @  60 : 61
+> CHANGE  10 : 11  @  10 : 11
 
 ~ 	protected void keyTyped(char parChar1, int parInt1) {
 
diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiInventory.edit.java b/patches/minecraft/net/minecraft/client/gui/inventory/GuiInventory.edit.java
index 0d9d03e..a6114a4 100644
--- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiInventory.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiInventory.edit.java
@@ -10,19 +10,19 @@
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
 
-> DELETE  8  @  7 : 9
+> DELETE  6  @  5 : 7
 
-> DELETE  9  @  10 : 11
+> DELETE  1  @  3 : 4
 
-> INSERT  58 : 59  @  60
+> INSERT  49 : 50  @  50
 
 + 		GlStateManager.enableDepth();
 
-> INSERT  61 : 62  @  62
+> INSERT  3 : 4  @  2
 
 + 		GlStateManager.disableDepth();
 
-> CHANGE  104 : 105  @  104 : 105
+> CHANGE  43 : 44  @  42 : 43
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiScreenHorseInventory.edit.java b/patches/minecraft/net/minecraft/client/gui/inventory/GuiScreenHorseInventory.edit.java
index 49ebceb..42e703d 100644
--- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiScreenHorseInventory.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiScreenHorseInventory.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 6
+> DELETE  2  @  1 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/spectator/BaseSpectatorGroup.edit.java b/patches/minecraft/net/minecraft/client/gui/spectator/BaseSpectatorGroup.edit.java
index 89ce3a0..cf67380 100644
--- a/patches/minecraft/net/minecraft/client/gui/spectator/BaseSpectatorGroup.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/spectator/BaseSpectatorGroup.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 6  @  4 : 6
+> CHANGE  1 : 4  @  2 : 4
 
 ~ 
 ~ import com.google.common.collect.Lists;
diff --git a/patches/minecraft/net/minecraft/client/gui/spectator/PlayerMenuObject.edit.java b/patches/minecraft/net/minecraft/client/gui/spectator/PlayerMenuObject.edit.java
index 1742fa4..1d215bf 100644
--- a/patches/minecraft/net/minecraft/client/gui/spectator/PlayerMenuObject.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/spectator/PlayerMenuObject.edit.java
@@ -10,13 +10,13 @@
 ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  7  @  6 : 9
+> DELETE  5  @  4 : 7
 
-> DELETE  14  @  16 : 17
+> DELETE  7  @  10 : 11
 
-> DELETE  17  @  20 : 22
+> DELETE  3  @  4 : 6
 
-> CHANGE  28 : 30  @  33 : 34
+> CHANGE  11 : 13  @  13 : 14
 
 ~ 		Minecraft.getMinecraft().getTextureManager().bindTexture(
 ~ 				Minecraft.getMinecraft().getNetHandler().getSkinCache().getSkin(profile).getResourceLocation());
diff --git a/patches/minecraft/net/minecraft/client/gui/spectator/SpectatorMenu.edit.java b/patches/minecraft/net/minecraft/client/gui/spectator/SpectatorMenu.edit.java
index 4cc7924..7306f23 100644
--- a/patches/minecraft/net/minecraft/client/gui/spectator/SpectatorMenu.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/spectator/SpectatorMenu.edit.java
@@ -7,13 +7,13 @@
 
 > DELETE  2  @  2 : 4
 
-> INSERT  4 : 8  @  6
+> INSERT  2 : 6  @  4
 
 + 
 + import com.google.common.base.Objects;
 + import com.google.common.collect.Lists;
 + 
 
-> DELETE  11  @  9 : 13
+> DELETE  7  @  3 : 7
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/spectator/categories/SpectatorDetails.edit.java b/patches/minecraft/net/minecraft/client/gui/spectator/categories/SpectatorDetails.edit.java
index ffa8afe..73ff2d6 100644
--- a/patches/minecraft/net/minecraft/client/gui/spectator/categories/SpectatorDetails.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/spectator/categories/SpectatorDetails.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.base.Objects;
diff --git a/patches/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.edit.java b/patches/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.edit.java
index f31a944..ee5bb33 100644
--- a/patches/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 5
 
-> INSERT  5 : 10  @  8
+> INSERT  3 : 8  @  6
 
 + 
 + import com.google.common.collect.ComparisonChain;
diff --git a/patches/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToTeam.edit.java b/patches/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToTeam.edit.java
index 086f276..f869793 100644
--- a/patches/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToTeam.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToTeam.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 8  @  4 : 5
+> CHANGE  1 : 6  @  2 : 3
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
@@ -15,18 +15,18 @@
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  16  @  13 : 14
+> DELETE  13  @  9 : 10
 
-> DELETE  17  @  15 : 16
+> DELETE  1  @  2 : 3
 
-> INSERT  83 : 87  @  82
+> INSERT  66 : 70  @  67
 
 + 			this.field_178677_c = DefaultPlayerSkin.getDefaultSkinLegacy();
 + 
 + 			// TODO: program team skins
 + 
 
-> CHANGE  88 : 93  @  83 : 87
+> CHANGE  5 : 10  @  1 : 5
 
 ~ 				// String s1 = ((NetworkPlayerInfo) this.field_178675_d
 ~ 				// .get((new
@@ -34,7 +34,7 @@
 ~ 				// this.field_178677_c = AbstractClientPlayer.getLocationSkin(s1);
 ~ 				// AbstractClientPlayer.getDownloadImageSkin(this.field_178677_c, s1);
 
-> CHANGE  94 : 95  @  88 : 89
+> CHANGE  6 : 7  @  5 : 6
 
 ~ 				// this.field_178677_c = DefaultPlayerSkin.getDefaultSkinLegacy();
 
diff --git a/patches/minecraft/net/minecraft/client/main/GameConfiguration.edit.java b/patches/minecraft/net/minecraft/client/main/GameConfiguration.edit.java
index ac5fed0..ce4bfa7 100644
--- a/patches/minecraft/net/minecraft/client/main/GameConfiguration.edit.java
+++ b/patches/minecraft/net/minecraft/client/main/GameConfiguration.edit.java
@@ -7,28 +7,28 @@
 
 > DELETE  2  @  2 : 5
 
-> DELETE  7  @  10 : 11
+> DELETE  5  @  8 : 9
 
-> DELETE  8  @  12 : 13
+> DELETE  1  @  2 : 3
 
-> CHANGE  10 : 11  @  15 : 17
+> CHANGE  2 : 3  @  3 : 5
 
 ~ 			GameConfiguration.DisplayInformation displayInfoIn, GameConfiguration.GameInformation gameInfoIn) {
 
-> DELETE  13  @  19 : 20
+> DELETE  3  @  4 : 5
 
-> DELETE  14  @  21 : 22
+> DELETE  1  @  2 : 3
 
-> DELETE  30  @  38 : 52
+> DELETE  16  @  17 : 31
 
-> DELETE  40  @  62 : 72
+> DELETE  10  @  24 : 34
 
-> DELETE  42  @  74 : 77
+> DELETE  2  @  12 : 15
 
-> CHANGE  43 : 44  @  78 : 80
+> CHANGE  1 : 2  @  4 : 6
 
 ~ 		public UserInformation(Session parSession) {
 
-> DELETE  45  @  81 : 84
+> DELETE  2  @  3 : 6
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/main/Main.edit.java b/patches/minecraft/net/minecraft/client/main/Main.edit.java
index 88042d4..09755ea 100644
--- a/patches/minecraft/net/minecraft/client/main/Main.edit.java
+++ b/patches/minecraft/net/minecraft/client/main/Main.edit.java
@@ -9,23 +9,23 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
 
-> DELETE  4  @  18 : 19
+> DELETE  2  @  16 : 17
 
-> CHANGE  7 : 8  @  22 : 23
+> CHANGE  3 : 4  @  4 : 5
 
 ~ 	public static void appMain(String[] astring) {
 
-> DELETE  9  @  24 : 68
+> DELETE  2  @  2 : 46
 
-> DELETE  10  @  69 : 119
+> DELETE  1  @  45 : 95
 
-> CHANGE  11 : 15  @  120 : 131
+> CHANGE  1 : 5  @  51 : 62
 
 ~ 				new GameConfiguration.UserInformation(new Session()),
 ~ 				new GameConfiguration.DisplayInformation(854, 480, false, true),
 ~ 				new GameConfiguration.GameInformation(false, "1.8.8"));
 ~ 		PlatformRuntime.setThreadName("Client thread");
 
-> DELETE  17  @  133 : 137
+> DELETE  6  @  13 : 17
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/model/ModelBase.edit.java b/patches/minecraft/net/minecraft/client/model/ModelBase.edit.java
index e4e66ef..c112a54 100644
--- a/patches/minecraft/net/minecraft/client/model/ModelBase.edit.java
+++ b/patches/minecraft/net/minecraft/client/model/ModelBase.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 4
 
-> CHANGE  4 : 9  @  6 : 9
+> CHANGE  2 : 7  @  4 : 7
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
@@ -15,7 +15,7 @@
 ~ import com.google.common.collect.Maps;
 ~ 
 
-> CHANGE  30 : 31  @  30 : 31
+> CHANGE  26 : 27  @  24 : 25
 
 ~ 	public ModelRenderer getRandomModelBox(EaglercraftRandom rand) {
 
diff --git a/patches/minecraft/net/minecraft/client/model/ModelBiped.edit.java b/patches/minecraft/net/minecraft/client/model/ModelBiped.edit.java
index 7437e1f..a4d0f35 100644
--- a/patches/minecraft/net/minecraft/client/model/ModelBiped.edit.java
+++ b/patches/minecraft/net/minecraft/client/model/ModelBiped.edit.java
@@ -9,7 +9,7 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> CHANGE  74 : 75  @  76 : 77
+> CHANGE  72 : 73  @  74 : 75
 
 ~ 			if (entity != null && entity.isSneaking()) {
 
diff --git a/patches/minecraft/net/minecraft/client/model/ModelEnderman.edit.java b/patches/minecraft/net/minecraft/client/model/ModelEnderman.edit.java
index f89cd31..d6ae189 100644
--- a/patches/minecraft/net/minecraft/client/model/ModelEnderman.edit.java
+++ b/patches/minecraft/net/minecraft/client/model/ModelEnderman.edit.java
@@ -7,11 +7,11 @@
 
 > DELETE  2  @  2 : 4
 
-> CHANGE  39 : 40  @  41 : 42
+> CHANGE  37 : 38  @  39 : 40
 
 ~ 		this.bipedBody.rotationPointZ = 0.0F;
 
-> CHANGE  92 : 93  @  94 : 95
+> CHANGE  53 : 54  @  53 : 54
 
 ~ 		this.bipedHead.rotationPointZ = 0.0F;
 
diff --git a/patches/minecraft/net/minecraft/client/model/ModelGhast.edit.java b/patches/minecraft/net/minecraft/client/model/ModelGhast.edit.java
index c947a6b..f3296ee 100644
--- a/patches/minecraft/net/minecraft/client/model/ModelGhast.edit.java
+++ b/patches/minecraft/net/minecraft/client/model/ModelGhast.edit.java
@@ -11,7 +11,7 @@
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> CHANGE  17 : 18  @  18 : 19
+> CHANGE  15 : 16  @  16 : 17
 
 ~ 		EaglercraftRandom random = new EaglercraftRandom(1660L);
 
diff --git a/patches/minecraft/net/minecraft/client/model/ModelPlayer.edit.java b/patches/minecraft/net/minecraft/client/model/ModelPlayer.edit.java
index 3049a84..251d3aa 100644
--- a/patches/minecraft/net/minecraft/client/model/ModelPlayer.edit.java
+++ b/patches/minecraft/net/minecraft/client/model/ModelPlayer.edit.java
@@ -9,11 +9,11 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> CHANGE  75 : 76  @  77 : 78
+> CHANGE  73 : 74  @  75 : 76
 
 ~ 			if (entity != null && entity.isSneaking()) {
 
-> CHANGE  107 : 108  @  109 : 110
+> CHANGE  32 : 33  @  32 : 33
 
 ~ 		if (entity != null && entity.isSneaking()) {
 
diff --git a/patches/minecraft/net/minecraft/client/model/ModelRenderer.edit.java b/patches/minecraft/net/minecraft/client/model/ModelRenderer.edit.java
index 67d6020..9bef5df 100644
--- a/patches/minecraft/net/minecraft/client/model/ModelRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/model/ModelRenderer.edit.java
@@ -10,7 +10,7 @@
 ~ import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
 ~ 
 
-> CHANGE  5 : 11  @  4 : 7
+> CHANGE  3 : 9  @  2 : 5
 
 ~ 
 ~ import com.google.common.collect.Lists;
@@ -19,16 +19,16 @@
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  12  @  8 : 9
+> DELETE  7  @  4 : 5
 
-> DELETE  13  @  10 : 12
+> DELETE  1  @  2 : 4
 
-> CHANGE  227 : 229  @  226 : 228
+> CHANGE  214 : 216  @  216 : 218
 
 ~ 		this.displayList = GLAllocation.generateDisplayLists();
 ~ 		EaglercraftGPU.glNewList(this.displayList, GL_COMPILE);
 
-> CHANGE  235 : 236  @  234 : 235
+> CHANGE  8 : 9  @  8 : 9
 
 ~ 		EaglercraftGPU.glEndList();
 
diff --git a/patches/minecraft/net/minecraft/client/model/ModelSpider.edit.java b/patches/minecraft/net/minecraft/client/model/ModelSpider.edit.java
index d92f45e..4eb1bf4 100644
--- a/patches/minecraft/net/minecraft/client/model/ModelSpider.edit.java
+++ b/patches/minecraft/net/minecraft/client/model/ModelSpider.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 4
 
-> CHANGE  83 : 84  @  85 : 86
+> CHANGE  81 : 82  @  83 : 84
 
 ~ 		float f5 = 0.0F;
 
diff --git a/patches/minecraft/net/minecraft/client/model/ModelZombie.edit.java b/patches/minecraft/net/minecraft/client/model/ModelZombie.edit.java
index d6cd15d..2a65403 100644
--- a/patches/minecraft/net/minecraft/client/model/ModelZombie.edit.java
+++ b/patches/minecraft/net/minecraft/client/model/ModelZombie.edit.java
@@ -7,11 +7,11 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  7 : 8  @  8 : 9
+> CHANGE  5 : 6  @  6 : 7
 
 ~ 		this(0.0F, true);
 
-> CHANGE  15 : 16  @  16 : 17
+> CHANGE  8 : 9  @  8 : 9
 
 ~ 		super(modelSize, 0.0F, 64, parFlag ? 64 : 32);
 
diff --git a/patches/minecraft/net/minecraft/client/model/TexturedQuad.edit.java b/patches/minecraft/net/minecraft/client/model/TexturedQuad.edit.java
index fa21f3d..b07e1da 100644
--- a/patches/minecraft/net/minecraft/client/model/TexturedQuad.edit.java
+++ b/patches/minecraft/net/minecraft/client/model/TexturedQuad.edit.java
@@ -9,6 +9,6 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  4  @  4 : 5
+> DELETE  2  @  2 : 3
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.edit.java b/patches/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.edit.java
index bf2e6e8..4e5da61 100644
--- a/patches/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.edit.java
+++ b/patches/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 8  @  4
+> INSERT  1 : 6  @  2
 
 + 
 + import com.google.common.collect.Lists;
@@ -15,6 +15,6 @@
 + import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 + import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
-> DELETE  18  @  14 : 16
+> DELETE  15  @  10 : 12
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.edit.java b/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.edit.java
index be5df63..6331eb7 100644
--- a/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.edit.java
+++ b/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.edit.java
@@ -18,32 +18,32 @@
 ~ import net.lax1dude.eaglercraft.v1_8.socket.EaglercraftNetworkManager;
 ~ import net.lax1dude.eaglercraft.v1_8.socket.RateLimitTracker;
 
-> CHANGE  17 : 18  @  10 : 14
+> CHANGE  14 : 15  @  7 : 11
 
 ~ import net.minecraft.client.network.NetHandlerPlayClient;
 
-> DELETE  20  @  16 : 19
+> DELETE  3  @  6 : 9
 
-> DELETE  21  @  20 : 23
+> DELETE  1  @  4 : 7
 
-> DELETE  23  @  25 : 26
+> DELETE  2  @  5 : 6
 
-> CHANGE  24 : 28  @  27 : 28
+> CHANGE  1 : 5  @  2 : 3
 
 ~ 	private EaglercraftNetworkManager networkManager;
 ~ 	private String currentAddress;
 ~ 	private String currentPassword;
 ~ 	private boolean allowPlaintext;
 
-> INSERT  29 : 30  @  29
+> INSERT  5 : 6  @  2
 
 + 	private boolean hasOpened;
 
-> INSERT  31 : 32  @  30
+> INSERT  2 : 3  @  1
 
 + 	private int timer = 0;
 
-> INSERT  34 : 47  @  32
+> INSERT  3 : 16  @  2
 
 + 		this(parGuiScreen, mcIn, parServerData, false);
 + 	}
@@ -59,11 +59,11 @@
 + 	public GuiConnecting(GuiScreen parGuiScreen, Minecraft mcIn, ServerData parServerData, String password,
 + 			boolean allowPlaintext) {
 
-> CHANGE  49 : 50  @  34 : 35
+> CHANGE  15 : 16  @  2 : 3
 
 ~ 		String serveraddress = AddressResolver.resolveURI(parServerData);
 
-> CHANGE  52 : 57  @  37 : 38
+> CHANGE  3 : 8  @  3 : 4
 
 ~ 		if (RateLimitTracker.isLockedOut(serveraddress)) {
 ~ 			logger.error("Server locked this client out on a previous connection, will not attempt to reconnect");
@@ -71,7 +71,7 @@
 ~ 			this.connect(serveraddress, password, allowPlaintext);
 ~ 		}
 
-> INSERT  60 : 73  @  41
+> INSERT  8 : 21  @  4
 
 + 		this(parGuiScreen, mcIn, hostName, port, false);
 + 	}
@@ -87,17 +87,17 @@
 + 	public GuiConnecting(GuiScreen parGuiScreen, Minecraft mcIn, String hostName, int port, String password,
 + 			boolean allowPlaintext) {
 
-> CHANGE  76 : 77  @  44 : 45
+> CHANGE  16 : 17  @  3 : 4
 
 ~ 		this.connect(hostName, password, allowPlaintext);
 
-> CHANGE  79 : 82  @  47 : 52
+> CHANGE  3 : 6  @  3 : 8
 
 ~ 	public GuiConnecting(GuiConnecting previous, String password) {
 ~ 		this(previous, password, false);
 ~ 	}
 
-> CHANGE  83 : 88  @  53 : 57
+> CHANGE  4 : 9  @  6 : 10
 
 ~ 	public GuiConnecting(GuiConnecting previous, String password, boolean allowPlaintext) {
 ~ 		this.mc = previous.mc;
@@ -105,7 +105,7 @@
 ~ 		this.connect(previous.currentAddress, password, allowPlaintext);
 ~ 	}
 
-> CHANGE  89 : 94  @  58 : 72
+> CHANGE  6 : 11  @  5 : 19
 
 ~ 	private void connect(String ip, String password, boolean allowPlaintext) {
 ~ 		this.currentAddress = ip;
@@ -113,7 +113,7 @@
 ~ 		this.allowPlaintext = allowPlaintext;
 ~ 	}
 
-> CHANGE  95 : 131  @  73 : 80
+> CHANGE  6 : 42  @  15 : 22
 
 ~ 	public void updateScreen() {
 ~ 		++timer;
@@ -152,13 +152,13 @@
 ~ 							return;
 ~ 						}
 
-> CHANGE  132 : 135  @  81 : 87
+> CHANGE  37 : 40  @  8 : 14
 
 ~ 					try {
 ~ 						this.networkManager.processReceivedPackets();
 ~ 					} catch (IOException ex) {
 
-> CHANGE  136 : 164  @  88 : 92
+> CHANGE  4 : 32  @  7 : 11
 
 ~ 				} else {
 ~ 					if (PlatformNetworking.playConnectionState() == EnumEaglerConnectionState.FAILED) {
@@ -189,28 +189,28 @@
 ~ 						}
 ~ 					}
 
-> DELETE  165  @  93 : 94
+> DELETE  29  @  5 : 6
 
-> DELETE  166  @  95 : 105
+> DELETE  1  @  2 : 12
 
-> CHANGE  170 : 171  @  109 : 110
+> CHANGE  4 : 5  @  14 : 15
 
 ~ 	protected void keyTyped(char parChar1, int parInt1) {
 
-> CHANGE  175 : 177  @  114 : 116
+> CHANGE  5 : 7  @  5 : 7
 
 ~ 		this.buttonList.add(
 ~ 				new GuiButton(0, this.width / 2 - 100, this.height / 2 - 10, I18n.format("gui.cancel", new Object[0])));
 
-> CHANGE  179 : 180  @  118 : 119
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	protected void actionPerformed(GuiButton parGuiButton) {
 
-> CHANGE  193 : 194  @  132 : 133
+> CHANGE  14 : 15  @  14 : 15
 
 ~ 		if (this.networkManager == null || !this.networkManager.isChannelOpen()) {
 
-> INSERT  203 : 217  @  142
+> INSERT  10 : 24  @  10
 
 + 
 + 	private void checkLowLevelRatelimit() {
diff --git a/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.edit.java b/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.edit.java
index f532552..e9197f8 100644
--- a/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.edit.java
+++ b/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.edit.java
@@ -11,13 +11,13 @@
 + 
 + import net.lax1dude.eaglercraft.v1_8.socket.EaglercraftNetworkManager;
 
-> DELETE  11  @  8 : 9
+> DELETE  9  @  6 : 7
 
-> INSERT  27 : 28  @  25
+> INSERT  16 : 17  @  17
 
 + import net.minecraft.util.ChatComponentText;
 
-> CHANGE  256 : 267  @  253 : 254
+> CHANGE  229 : 240  @  228 : 229
 
 ~ 			try {
 ~ 				this.netClientHandler.getNetworkManager().processReceivedPackets();
@@ -31,7 +31,7 @@
 ~ 			}
 ~ 			this.netClientHandler.getSkinCache().flush();
 
-> CHANGE  363 : 365  @  350 : 352
+> CHANGE  107 : 109  @  97 : 99
 
 ~ 	public EntityPlayerSP func_178892_a(World worldIn, StatFileWriter statWriter) {
 ~ 		return new EntityPlayerSP(this.mc, worldIn, this.netClientHandler, statWriter);
diff --git a/patches/minecraft/net/minecraft/client/multiplayer/ServerAddress.edit.java b/patches/minecraft/net/minecraft/client/multiplayer/ServerAddress.edit.java
index 6b93762..9260003 100644
--- a/patches/minecraft/net/minecraft/client/multiplayer/ServerAddress.edit.java
+++ b/patches/minecraft/net/minecraft/client/multiplayer/ServerAddress.edit.java
@@ -7,14 +7,14 @@
 
 > DELETE  2  @  2 : 7
 
-> CHANGE  6 : 7  @  11 : 12
+> CHANGE  4 : 5  @  9 : 10
 
 ~ 	public ServerAddress(String parString1, int parInt1) {
 
-> CHANGE  12 : 13  @  17 : 18
+> CHANGE  6 : 7  @  6 : 7
 
 ~ 		return this.ipAddress;
 
-> DELETE  19  @  24 : 84
+> DELETE  7  @  7 : 67
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/multiplayer/ServerData.edit.java b/patches/minecraft/net/minecraft/client/multiplayer/ServerData.edit.java
index 7151320..e3edb6c 100644
--- a/patches/minecraft/net/minecraft/client/multiplayer/ServerData.edit.java
+++ b/patches/minecraft/net/minecraft/client/multiplayer/ServerData.edit.java
@@ -19,21 +19,21 @@
 + import net.lax1dude.eaglercraft.v1_8.profile.EaglerSkinTexture;
 + import net.minecraft.client.Minecraft;
 
-> INSERT  16 : 17  @  5
+> INSERT  14 : 15  @  3
 
 + import net.minecraft.util.ResourceLocation;
 
-> CHANGE  21 : 24  @  9 : 12
+> CHANGE  5 : 8  @  4 : 7
 
 ~ 	public String populationInfo = "";
 ~ 	public String serverMOTD = "";
 ~ 	public long pingToServer = -1l;
 
-> CHANGE  29 : 30  @  17 : 18
+> CHANGE  8 : 9  @  8 : 9
 
 ~ 	public boolean hideAddress = false;
 
-> INSERT  31 : 39  @  19
+> INSERT  2 : 10  @  2
 
 + 	public IServerQuery currentQuery = null;
 + 	public final ResourceLocation iconResourceLocation;
@@ -44,27 +44,27 @@
 + 	public boolean serverIconEnabled = false;
 + 	public boolean isDefault = false;
 
-> INSERT  40 : 44  @  20
+> INSERT  9 : 13  @  1
 
 + 	private static final Logger logger = LogManager.getLogger("MOTDQuery");
 + 
 + 	private static int serverTextureId = 0;
 + 
 
-> INSERT  48 : 49  @  24
+> INSERT  8 : 9  @  4
 
 + 		this.iconResourceLocation = new ResourceLocation("eagler:servers/icons/tex_" + serverTextureId++);
 
-> DELETE  55  @  30 : 33
+> DELETE  7  @  6 : 9
 
-> INSERT  62 : 64  @  40
+> INSERT  7 : 9  @  10
 
 + 		nbttagcompound.setBoolean("hideAddress", this.hideAddress);
 + 
 
-> DELETE  77  @  53 : 56
+> DELETE  15  @  13 : 16
 
-> INSERT  88 : 94  @  67
+> INSERT  11 : 17  @  14
 
 + 		if (nbtCompound.hasKey("hideAddress", 1)) {
 + 			serverdata.hideAddress = nbtCompound.getBoolean("hideAddress");
@@ -73,13 +73,13 @@
 + 		}
 + 
 
-> DELETE  97  @  70 : 78
+> DELETE  9  @  3 : 11
 
-> CHANGE  105 : 106  @  86 : 87
+> CHANGE  8 : 9  @  16 : 17
 
 ~ 		this.hideAddress = serverDataIn.hideAddress;
 
-> INSERT  122 : 188  @  103
+> INSERT  17 : 83  @  17
 
 + 
 + 	public void setMOTDFromQuery(QueryResponse pkt) {
diff --git a/patches/minecraft/net/minecraft/client/multiplayer/ServerList.edit.java b/patches/minecraft/net/minecraft/client/multiplayer/ServerList.edit.java
index bf25e8a..617a51e 100644
--- a/patches/minecraft/net/minecraft/client/multiplayer/ServerList.edit.java
+++ b/patches/minecraft/net/minecraft/client/multiplayer/ServerList.edit.java
@@ -10,7 +10,7 @@
 ~ import java.io.ByteArrayOutputStream;
 ~ import java.util.Iterator;
 
-> INSERT  5 : 18  @  5
+> INSERT  3 : 16  @  3
 
 + 
 + import com.google.common.collect.Lists;
@@ -26,25 +26,25 @@
 + import net.lax1dude.eaglercraft.v1_8.socket.RateLimitTracker;
 + import net.lax1dude.eaglercraft.v1_8.socket.ServerQueryDispatch;
 
-> CHANGE  19 : 20  @  6 : 7
+> CHANGE  14 : 15  @  1 : 2
 
 ~ import net.minecraft.client.renderer.texture.TextureManager;
 
-> CHANGE  23 : 24  @  10 : 12
+> CHANGE  4 : 5  @  4 : 6
 
 ~ import net.minecraft.util.EnumChatFormatting;
 
-> INSERT  28 : 29  @  16
+> INSERT  5 : 6  @  6
 
 + 	private final List allServers = Lists.newArrayList();
 
-> CHANGE  31 : 34  @  18 : 19
+> CHANGE  3 : 6  @  2 : 3
 
 ~ 	private static ServerList instance = null;
 ~ 
 ~ 	private ServerList(Minecraft mcIn) {
 
-> INSERT  38 : 46  @  23
+> INSERT  7 : 15  @  5
 
 + 	public static void initServerList(Minecraft mc) {
 + 		instance = new ServerList(mc);
@@ -55,7 +55,7 @@
 + 	}
 + 
 
-> CHANGE  48 : 55  @  25 : 29
+> CHANGE  10 : 17  @  2 : 6
 
 ~ 			freeServerIcons();
 ~ 
@@ -65,11 +65,11 @@
 ~ 				dat.isDefault = true;
 ~ 				this.allServers.add(dat);
 
-> CHANGE  57 : 58  @  31 : 32
+> CHANGE  9 : 10  @  6 : 7
 
 ~ 			byte[] localStorage = EagRuntime.getStorage("s");
 
-> CHANGE  59 : 72  @  33 : 35
+> CHANGE  2 : 15  @  2 : 4
 
 ~ 			if (localStorage != null) {
 ~ 				NBTTagCompound nbttagcompound = CompressedStreamTools
@@ -85,22 +85,22 @@
 ~ 					this.allServers.add(srv);
 ~ 				}
 
-> INSERT  73 : 74  @  36
+> INSERT  14 : 15  @  3
 
 + 
 
-> INSERT  76 : 78  @  38
+> INSERT  3 : 5  @  2
 
 + 		} finally {
 + 			refreshServerPing();
 
-> CHANGE  87 : 90  @  47 : 48
+> CHANGE  11 : 14  @  9 : 10
 
 ~ 				if (!serverdata.isDefault) {
 ~ 					nbttaglist.appendTag(serverdata.getNBTCompound());
 ~ 				}
 
-> CHANGE  94 : 99  @  52 : 53
+> CHANGE  7 : 12  @  5 : 6
 
 ~ 
 ~ 			ByteArrayOutputStream bao = new ByteArrayOutputStream();
@@ -108,7 +108,7 @@
 ~ 			EagRuntime.setStorage("s", bao.toByteArray());
 ~ 
 
-> CHANGE  110 : 115  @  64 : 65
+> CHANGE  16 : 21  @  12 : 13
 
 ~ 		ServerData data = this.servers.remove(parInt1);
 ~ 		if (data != null && data.iconTextureObject != null) {
@@ -116,7 +116,7 @@
 ~ 			data.iconTextureObject = null;
 ~ 		}
 
-> INSERT  151 : 259  @  101
+> INSERT  41 : 149  @  37
 
 + 
 + 	public void freeServerIcons() {
diff --git a/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.edit.java b/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.edit.java
index e8ad952..2ada982 100644
--- a/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.edit.java
+++ b/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.edit.java
@@ -9,19 +9,19 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 
-> INSERT  5 : 8  @  6
+> INSERT  3 : 6  @  4
 
 + 
 + import com.google.common.collect.Sets;
 + 
 
-> DELETE  13  @  11 : 12
+> DELETE  8  @  5 : 6
 
-> CHANGE  224 : 225  @  223 : 224
+> CHANGE  211 : 212  @  212 : 213
 
 ~ 		EaglercraftRandom random = new EaglercraftRandom();
 
-> CHANGE  308 : 309  @  307 : 309
+> CHANGE  84 : 85  @  84 : 86
 
 ~ 				return "Non-integrated multiplayer server";
 
diff --git a/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.edit.java b/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.edit.java
index 453adce..00ef84a 100644
--- a/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.edit.java
+++ b/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.edit.java
@@ -7,9 +7,9 @@
 
 > DELETE  2  @  2 : 8
 
-> DELETE  6  @  12 : 14
+> DELETE  4  @  10 : 12
 
-> INSERT  7 : 19  @  15
+> INSERT  1 : 13  @  3
 
 + import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 + import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
@@ -24,203 +24,203 @@
 + import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 + import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
 
-> DELETE  33  @  29 : 31
+> DELETE  26  @  14 : 16
 
-> DELETE  42  @  40 : 41
+> DELETE  9  @  11 : 12
 
-> DELETE  47  @  46 : 49
+> DELETE  5  @  6 : 9
 
-> DELETE  94  @  96 : 97
+> DELETE  47  @  50 : 51
 
-> DELETE  96  @  99 : 100
+> DELETE  2  @  3 : 4
 
-> DELETE  174  @  178 : 179
+> DELETE  78  @  79 : 80
 
-> DELETE  206  @  211 : 213
+> DELETE  32  @  33 : 35
 
-> CHANGE  209 : 210  @  216 : 217
+> CHANGE  3 : 4  @  5 : 6
 
 ~ 	private final EaglercraftNetworkManager netManager;
 
-> CHANGE  215 : 216  @  222 : 223
+> CHANGE  6 : 7  @  6 : 7
 
 ~ 	private final Map playerInfoMap = Maps.newHashMap();
 
-> CHANGE  218 : 220  @  225 : 226
+> CHANGE  3 : 5  @  3 : 4
 
 ~ 	private final EaglercraftRandom avRandomizer = new EaglercraftRandom();
 ~ 	private final ServerSkinCache skinCache;
 
-> CHANGE  221 : 222  @  227 : 228
+> CHANGE  3 : 4  @  2 : 3
 
 ~ 	public NetHandlerPlayClient(Minecraft mcIn, GuiScreen parGuiScreen, EaglercraftNetworkManager parNetworkManager,
 
-> INSERT  227 : 228  @  233
+> INSERT  6 : 7  @  6
 
 + 		this.skinCache = new ServerSkinCache(parNetworkManager, mcIn.getTextureManager());
 
-> INSERT  232 : 233  @  237
+> INSERT  5 : 6  @  4
 
 + 		this.skinCache.destroy();
 
-> INSERT  235 : 239  @  239
+> INSERT  3 : 7  @  2
 
 + 	public ServerSkinCache getSkinCache() {
 + 		return this.skinCache;
 + 	}
 + 
 
-> DELETE  240  @  240 : 241
+> DELETE  5  @  1 : 2
 
-> DELETE  259  @  260 : 261
+> DELETE  19  @  20 : 21
 
-> DELETE  364  @  366 : 367
+> DELETE  105  @  106 : 107
 
-> DELETE  376  @  379 : 380
+> DELETE  12  @  13 : 14
 
-> DELETE  397  @  401 : 402
+> DELETE  21  @  22 : 23
 
-> DELETE  403  @  408 : 409
+> DELETE  6  @  7 : 8
 
-> DELETE  411  @  417 : 418
+> DELETE  8  @  9 : 10
 
-> DELETE  419  @  426 : 427
+> DELETE  8  @  9 : 10
 
-> DELETE  450  @  458 : 459
+> DELETE  31  @  32 : 33
 
-> DELETE  472  @  481 : 482
+> DELETE  22  @  23 : 24
 
-> DELETE  480  @  490 : 491
+> DELETE  8  @  9 : 10
 
-> DELETE  497  @  508 : 509
+> DELETE  17  @  18 : 19
 
-> DELETE  505  @  517 : 519
+> DELETE  8  @  9 : 11
 
-> DELETE  512  @  526 : 527
+> DELETE  7  @  9 : 10
 
-> DELETE  559  @  574 : 576
+> DELETE  47  @  48 : 50
 
-> DELETE  568  @  585 : 586
+> DELETE  9  @  11 : 12
 
-> DELETE  590  @  608 : 609
+> DELETE  22  @  23 : 24
 
-> CHANGE  598 : 601  @  617 : 618
+> CHANGE  8 : 11  @  9 : 10
 
 ~ 		if (this.gameController.theWorld != null) {
 ~ 			this.gameController.loadWorld((WorldClient) null);
 ~ 		}
 
-> CHANGE  602 : 604  @  619 : 627
+> CHANGE  4 : 6  @  2 : 10
 
 ~ 			this.gameController
 ~ 					.displayGuiScreen(new GuiDisconnected(this.guiScreenServer, "disconnect.lost", ichatcomponent));
 
-> DELETE  608  @  631 : 632
+> DELETE  6  @  12 : 13
 
-> DELETE  615  @  639 : 640
+> DELETE  7  @  8 : 9
 
-> DELETE  638  @  663 : 664
+> DELETE  23  @  24 : 25
 
-> DELETE  647  @  673 : 674
+> DELETE  9  @  10 : 11
 
-> DELETE  667  @  694 : 695
+> DELETE  20  @  21 : 22
 
-> DELETE  671  @  699 : 700
+> DELETE  4  @  5 : 6
 
-> DELETE  706  @  735 : 736
+> DELETE  35  @  36 : 37
 
-> DELETE  711  @  741 : 742
+> DELETE  5  @  6 : 7
 
-> DELETE  716  @  747 : 748
+> DELETE  5  @  6 : 7
 
-> DELETE  755  @  787 : 788
+> DELETE  39  @  40 : 41
 
-> DELETE  767  @  800 : 801
+> DELETE  12  @  13 : 14
 
-> DELETE  773  @  807 : 808
+> DELETE  6  @  7 : 8
 
-> DELETE  778  @  813 : 814
+> DELETE  5  @  6 : 7
 
-> DELETE  795  @  831 : 832
+> DELETE  17  @  18 : 19
 
-> DELETE  804  @  841 : 842
+> DELETE  9  @  10 : 11
 
-> DELETE  831  @  869 : 870
+> DELETE  27  @  28 : 29
 
-> DELETE  858  @  897 : 898
+> DELETE  27  @  28 : 29
 
-> DELETE  874  @  914 : 915
+> DELETE  16  @  17 : 18
 
-> DELETE  884  @  925 : 926
+> DELETE  10  @  11 : 12
 
-> DELETE  895  @  937 : 938
+> DELETE  11  @  12 : 13
 
-> DELETE  917  @  960 : 961
+> DELETE  22  @  23 : 24
 
-> DELETE  933  @  977 : 978
+> DELETE  16  @  17 : 18
 
-> DELETE  941  @  986 : 987
+> DELETE  8  @  9 : 10
 
-> DELETE  949  @  995 : 996
+> DELETE  8  @  9 : 10
 
-> DELETE  953  @  1000 : 1001
+> DELETE  4  @  5 : 6
 
-> DELETE  958  @  1006 : 1007
+> DELETE  5  @  6 : 7
 
-> DELETE  963  @  1012 : 1014
+> DELETE  5  @  6 : 8
 
-> DELETE  981  @  1032 : 1033
+> DELETE  18  @  20 : 21
 
-> CHANGE  1002 : 1005  @  1054 : 1073
+> CHANGE  21 : 24  @  22 : 41
 
 ~ 
 ~ 			// minecraft demo screen
 ~ 
 
-> DELETE  1023  @  1091 : 1092
+> DELETE  21  @  37 : 38
 
-> DELETE  1029  @  1098 : 1099
+> DELETE  6  @  7 : 8
 
-> DELETE  1040  @  1110 : 1111
+> DELETE  11  @  12 : 13
 
-> DELETE  1049  @  1120 : 1121
+> DELETE  9  @  10 : 11
 
-> DELETE  1074  @  1146 : 1147
+> DELETE  25  @  26 : 27
 
-> DELETE  1084  @  1157 : 1173
+> DELETE  10  @  11 : 27
 
-> INSERT  1085 : 1087  @  1174
+> INSERT  1 : 3  @  17
 
 + 		// used by twitch stream
 + 
 
-> DELETE  1090  @  1177 : 1178
+> DELETE  5  @  3 : 4
 
-> CHANGE  1095 : 1096  @  1183 : 1184
+> CHANGE  5 : 6  @  6 : 7
 
 ~ 
 
-> DELETE  1104  @  1192 : 1193
+> DELETE  9  @  9 : 10
 
-> DELETE  1108  @  1197 : 1198
+> DELETE  4  @  5 : 6
 
-> DELETE  1144  @  1234 : 1235
+> DELETE  36  @  37 : 38
 
-> DELETE  1152  @  1243 : 1245
+> DELETE  8  @  9 : 11
 
-> CHANGE  1154 : 1157  @  1247 : 1248
+> CHANGE  2 : 5  @  4 : 5
 
 ~ 				EaglercraftUUID uuid = s38packetplayerlistitem$addplayerdata.getProfile().getId();
 ~ 				this.playerInfoMap.remove(uuid);
 ~ 				this.skinCache.evictSkin(uuid);
 
-> DELETE  1191  @  1282 : 1283
+> DELETE  37  @  35 : 36
 
-> DELETE  1201  @  1293 : 1294
+> DELETE  10  @  11 : 12
 
-> DELETE  1210  @  1303 : 1304
+> DELETE  9  @  10 : 11
 
-> CHANGE  1218 : 1240  @  1312 : 1335
+> CHANGE  8 : 30  @  9 : 32
 
 ~ 			this.netManager
 ~ 					.sendPacket(new C19PacketResourcePackStatus(s1, C19PacketResourcePackStatus.Action.DECLINED));
@@ -245,7 +245,7 @@
 ~ 			this.netManager
 ~ 					.sendPacket(new C19PacketResourcePackStatus(s1, C19PacketResourcePackStatus.Action.DECLINED));
 
-> CHANGE  1241 : 1249  @  1336 : 1346
+> CHANGE  23 : 31  @  24 : 34
 
 ~ 			NetHandlerPlayClient.this.gameController.displayGuiScreen(new GuiYesNo(new GuiYesNoCallback() {
 ~ 				public void confirmClicked(boolean flag, int var2) {
@@ -256,7 +256,7 @@
 ~ 									.setResourceMode(ServerData.ServerResourceMode.ENABLED);
 ~ 						}
 
-> CHANGE  1250 : 1260  @  1347 : 1366
+> CHANGE  9 : 19  @  11 : 30
 
 ~ 						NetHandlerPlayClient.this.netManager.sendPacket(
 ~ 								new C19PacketResourcePackStatus(s1, C19PacketResourcePackStatus.Action.ACCEPTED));
@@ -269,7 +269,7 @@
 ~ 										NetHandlerPlayClient.this.netManager.sendPacket(new C19PacketResourcePackStatus(
 ~ 												s1, C19PacketResourcePackStatus.Action.FAILED_DOWNLOAD));
 
-> INSERT  1261 : 1267  @  1367
+> INSERT  11 : 17  @  20
 
 + 								});
 + 					} else {
@@ -278,14 +278,14 @@
 + 									.setResourceMode(ServerData.ServerResourceMode.DISABLED);
 + 						}
 
-> CHANGE  1268 : 1270  @  1368 : 1401
+> CHANGE  7 : 9  @  1 : 34
 
 ~ 						NetHandlerPlayClient.this.netManager.sendPacket(
 ~ 								new C19PacketResourcePackStatus(s1, C19PacketResourcePackStatus.Action.DECLINED));
 
-> DELETE  1271  @  1402 : 1404
+> DELETE  3  @  34 : 36
 
-> INSERT  1272 : 1277  @  1405
+> INSERT  1 : 6  @  3
 
 + 					ServerList.func_147414_b(NetHandlerPlayClient.this.gameController.getCurrentServerData());
 + 					NetHandlerPlayClient.this.gameController.displayGuiScreen((GuiScreen) null);
@@ -293,15 +293,15 @@
 + 			}, I18n.format("multiplayer.texturePrompt.line1", new Object[0]),
 + 					I18n.format("multiplayer.texturePrompt.line2", new Object[0]), 0));
 
-> DELETE  1281  @  1409 : 1410
+> DELETE  9  @  4 : 5
 
-> DELETE  1289  @  1418 : 1419
+> DELETE  8  @  9 : 10
 
-> DELETE  1291  @  1421 : 1422
+> DELETE  2  @  3 : 4
 
-> DELETE  1302  @  1433 : 1435
+> DELETE  11  @  12 : 14
 
-> INSERT  1311 : 1318  @  1444
+> INSERT  9 : 16  @  11
 
 + 		} else if ("EAG|Skins-1.8".equals(packetIn.getChannelName())) {
 + 			try {
@@ -311,23 +311,23 @@
 + 				logger.error(e);
 + 			}
 
-> DELETE  1323  @  1449 : 1450
+> DELETE  12  @  5 : 6
 
-> DELETE  1342  @  1469 : 1470
+> DELETE  19  @  20 : 21
 
-> DELETE  1358  @  1486 : 1487
+> DELETE  16  @  17 : 18
 
-> DELETE  1369  @  1498 : 1499
+> DELETE  11  @  12 : 13
 
-> DELETE  1408  @  1538 : 1539
+> DELETE  39  @  40 : 41
 
-> DELETE  1443  @  1574 : 1575
+> DELETE  35  @  36 : 37
 
-> CHANGE  1472 : 1473  @  1604 : 1605
+> CHANGE  29 : 30  @  30 : 31
 
 ~ 	public EaglercraftNetworkManager getNetworkManager() {
 
-> CHANGE  1480 : 1481  @  1612 : 1613
+> CHANGE  8 : 9  @  8 : 9
 
 ~ 	public NetworkPlayerInfo getPlayerInfo(EaglercraftUUID parUUID) {
 
diff --git a/patches/minecraft/net/minecraft/client/network/NetworkPlayerInfo.edit.java b/patches/minecraft/net/minecraft/client/network/NetworkPlayerInfo.edit.java
index a29be2e..3a9f305 100644
--- a/patches/minecraft/net/minecraft/client/network/NetworkPlayerInfo.edit.java
+++ b/patches/minecraft/net/minecraft/client/network/NetworkPlayerInfo.edit.java
@@ -11,27 +11,27 @@
 ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
 ~ import net.lax1dude.eaglercraft.v1_8.profile.EaglerProfile;
 
-> DELETE  8  @  8 : 9
+> DELETE  5  @  5 : 6
 
-> DELETE  18  @  19 : 22
+> DELETE  10  @  11 : 14
 
-> CHANGE  58 : 59  @  62 : 63
+> CHANGE  40 : 41  @  43 : 44
 
 ~ 		return true;
 
-> CHANGE  62 : 64  @  66 : 67
+> CHANGE  4 : 6  @  4 : 5
 
 ~ 		return Minecraft.getMinecraft().getNetHandler().getSkinCache().getSkin(this.gameProfile)
 ~ 				.getSkinModel().profileSkinType;
 
-> CHANGE  67 : 68  @  70 : 76
+> CHANGE  5 : 6  @  4 : 10
 
 ~ 		return Minecraft.getMinecraft().getNetHandler().getSkinCache().getSkin(this.gameProfile).getResourceLocation();
 
-> CHANGE  71 : 72  @  79 : 84
+> CHANGE  4 : 5  @  9 : 14
 
 ~ 		return null;
 
-> DELETE  78  @  90 : 117
+> DELETE  7  @  11 : 38
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/particle/Barrier.edit.java b/patches/minecraft/net/minecraft/client/particle/Barrier.edit.java
index 054c592..d879b7a 100644
--- a/patches/minecraft/net/minecraft/client/particle/Barrier.edit.java
+++ b/patches/minecraft/net/minecraft/client/particle/Barrier.edit.java
@@ -10,9 +10,9 @@
 + import net.lax1dude.eaglercraft.v1_8.minecraft.IAcceleratedParticleEngine;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  5  @  3 : 6
+> DELETE  3  @  1 : 4
 
-> INSERT  59 : 67  @  60
+> INSERT  54 : 62  @  57
 
 + 	public boolean renderAccelerated(IAcceleratedParticleEngine accelerator, Entity var2, float f, float f1, float f2,
 + 			float f3, float f4, float f5) {
diff --git a/patches/minecraft/net/minecraft/client/particle/EffectRenderer.edit.java b/patches/minecraft/net/minecraft/client/particle/EffectRenderer.edit.java
index e14a941..6b045b9 100644
--- a/patches/minecraft/net/minecraft/client/particle/EffectRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/particle/EffectRenderer.edit.java
@@ -7,13 +7,13 @@
 
 > DELETE  2  @  2 : 4
 
-> CHANGE  5 : 8  @  7 : 8
+> CHANGE  3 : 6  @  5 : 6
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ import net.lax1dude.eaglercraft.v1_8.minecraft.AcceleratedEffectRenderer;
 ~ 
 
-> INSERT  9 : 15  @  9
+> INSERT  4 : 10  @  2
 
 + 
 + import com.google.common.collect.Lists;
@@ -22,27 +22,27 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  18  @  12 : 45
+> DELETE  9  @  3 : 36
 
-> DELETE  19  @  46 : 47
+> DELETE  1  @  34 : 35
 
-> DELETE  20  @  48 : 49
+> DELETE  1  @  2 : 3
 
-> CHANGE  40 : 41  @  69 : 70
+> CHANGE  20 : 21  @  21 : 22
 
 ~ 	private EaglercraftRandom rand = new EaglercraftRandom();
 
-> INSERT  43 : 45  @  72
+> INSERT  3 : 5  @  3
 
 + 	private AcceleratedEffectRenderer acceleratedParticleRenderer = new AcceleratedEffectRenderer();
 + 
 
-> CHANGE  215 : 217  @  242 : 244
+> CHANGE  172 : 174  @  170 : 172
 
 ~ 		for (int i = 0; i < 3; ++i) {
 ~ 			for (int j = 1; j >= 0; --j) {
 
-> CHANGE  218 : 225  @  245 : 252
+> CHANGE  3 : 10  @  3 : 10
 
 ~ //					switch (j) {
 ~ //					case 0:
@@ -52,29 +52,29 @@
 ~ //						GlStateManager.depthMask(true);
 ~ //					}
 
-> INSERT  226 : 228  @  253
+> INSERT  8 : 10  @  8
 
 + 					float texCoordWidth = 0.001f;
 + 					float texCoordHeight = 0.001f;
 
-> INSERT  232 : 233  @  257
+> INSERT  6 : 7  @  4
 
 + 						texCoordWidth = texCoordHeight = 1.0f / 256.0f;
 
-> INSERT  236 : 239  @  260
+> INSERT  4 : 7  @  3
 
 + 						TextureMap blockMap = (TextureMap) this.renderer.getTexture(TextureMap.locationBlocksTexture);
 + 						texCoordWidth = 1.0f / blockMap.getWidth();
 + 						texCoordHeight = 1.0f / blockMap.getHeight();
 
-> INSERT  246 : 250  @  267
+> INSERT  10 : 14  @  7
 
 + 					boolean legacyRenderingHasOccured = false;
 + 
 + 					acceleratedParticleRenderer.begin(partialTicks);
 + 
 
-> CHANGE  254 : 259  @  271 : 272
+> CHANGE  8 : 13  @  4 : 5
 
 ~ 							if (!entityfx.renderAccelerated(acceleratedParticleRenderer, entityIn, partialTicks, f, f4,
 ~ 									f1, f2, f3)) {
@@ -82,17 +82,17 @@
 ~ 								legacyRenderingHasOccured = true;
 ~ 							}
 
-> INSERT  268 : 269  @  281
+> INSERT  14 : 15  @  10
 
 + 							final int l = i;
 
-> CHANGE  271 : 274  @  283 : 286
+> CHANGE  3 : 6  @  2 : 5
 
 ~ 									return l == 0 ? "MISC_TEXTURE"
 ~ 											: (l == 1 ? "TERRAIN_TEXTURE"
 ~ 													: (l == 3 ? "ENTITY_PARTICLE_TEXTURE" : "Unknown - " + l));
 
-> CHANGE  280 : 287  @  292 : 293
+> CHANGE  9 : 16  @  9 : 10
 
 ~ 					if (legacyRenderingHasOccured) {
 ~ 						tessellator.draw();
diff --git a/patches/minecraft/net/minecraft/client/particle/EntityBreakingFX.edit.java b/patches/minecraft/net/minecraft/client/particle/EntityBreakingFX.edit.java
index e220fe4..c7dc115 100644
--- a/patches/minecraft/net/minecraft/client/particle/EntityBreakingFX.edit.java
+++ b/patches/minecraft/net/minecraft/client/particle/EntityBreakingFX.edit.java
@@ -10,13 +10,13 @@
 + import net.lax1dude.eaglercraft.v1_8.minecraft.IAcceleratedParticleEngine;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  5  @  3 : 6
+> DELETE  3  @  1 : 4
 
-> INSERT  9 : 10  @  10
+> INSERT  4 : 5  @  7
 
 + import net.minecraft.util.MathHelper;
 
-> INSERT  83 : 96  @  83
+> INSERT  74 : 87  @  73
 
 + 	public boolean renderAccelerated(IAcceleratedParticleEngine accelerator, Entity var2, float f, float f1, float f2,
 + 			float f3, float f4, float f5) {
diff --git a/patches/minecraft/net/minecraft/client/particle/EntityDiggingFX.edit.java b/patches/minecraft/net/minecraft/client/particle/EntityDiggingFX.edit.java
index 40b696d..337982f 100644
--- a/patches/minecraft/net/minecraft/client/particle/EntityDiggingFX.edit.java
+++ b/patches/minecraft/net/minecraft/client/particle/EntityDiggingFX.edit.java
@@ -10,13 +10,13 @@
 + import net.lax1dude.eaglercraft.v1_8.minecraft.IAcceleratedParticleEngine;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  7  @  5 : 8
+> DELETE  5  @  3 : 6
 
-> INSERT  10 : 11  @  11
+> INSERT  3 : 4  @  6
 
 + import net.minecraft.util.MathHelper;
 
-> INSERT  101 : 114  @  101
+> INSERT  91 : 104  @  90
 
 + 	public boolean renderAccelerated(IAcceleratedParticleEngine accelerator, Entity var2, float f, float f1, float f2,
 + 			float f3, float f4, float f5) {
diff --git a/patches/minecraft/net/minecraft/client/particle/EntityFX.edit.java b/patches/minecraft/net/minecraft/client/particle/EntityFX.edit.java
index df86d75..607d83c 100644
--- a/patches/minecraft/net/minecraft/client/particle/EntityFX.edit.java
+++ b/patches/minecraft/net/minecraft/client/particle/EntityFX.edit.java
@@ -11,13 +11,13 @@
 + import net.lax1dude.eaglercraft.v1_8.minecraft.IAcceleratedParticleEngine;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  6  @  3 : 5
+> DELETE  4  @  1 : 3
 
-> CHANGE  24 : 25  @  23 : 24
+> CHANGE  18 : 19  @  20 : 21
 
 ~ 	protected EaglerTextureAtlasSprite particleIcon;
 
-> INSERT  177 : 189  @  176
+> INSERT  153 : 165  @  153
 
 + 	public boolean renderAccelerated(IAcceleratedParticleEngine accelerator, Entity var2, float f, float f1, float f2,
 + 			float f3, float f4, float f5) {
@@ -32,7 +32,7 @@
 + 	}
 + 
 
-> CHANGE  199 : 200  @  186 : 187
+> CHANGE  22 : 23  @  10 : 11
 
 ~ 	public void setParticleIcon(EaglerTextureAtlasSprite icon) {
 
diff --git a/patches/minecraft/net/minecraft/client/particle/EntityFirework.edit.java b/patches/minecraft/net/minecraft/client/particle/EntityFirework.edit.java
index 602bef8..eb0bcc3 100644
--- a/patches/minecraft/net/minecraft/client/particle/EntityFirework.edit.java
+++ b/patches/minecraft/net/minecraft/client/particle/EntityFirework.edit.java
@@ -10,9 +10,9 @@
 + import net.lax1dude.eaglercraft.v1_8.minecraft.IAcceleratedParticleEngine;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  5  @  3 : 7
+> DELETE  3  @  1 : 5
 
-> INSERT  69 : 78  @  71
+> INSERT  64 : 73  @  68
 
 + 
 + 		public boolean renderAccelerated(IAcceleratedParticleEngine accelerator, Entity var2, float f, float f1,
@@ -24,7 +24,7 @@
 + 			return true;
 + 		}
 
-> INSERT  300 : 301  @  293
+> INSERT  231 : 232  @  222
 
 + 				entityfirework$overlayfx.particleAlpha = 0.99f;
 
diff --git a/patches/minecraft/net/minecraft/client/particle/EntityFootStepFX.edit.java b/patches/minecraft/net/minecraft/client/particle/EntityFootStepFX.edit.java
index d7a9732..8aca2bd 100644
--- a/patches/minecraft/net/minecraft/client/particle/EntityFootStepFX.edit.java
+++ b/patches/minecraft/net/minecraft/client/particle/EntityFootStepFX.edit.java
@@ -10,8 +10,8 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  5  @  3 : 6
+> DELETE  3  @  1 : 4
 
-> DELETE  6  @  7 : 8
+> DELETE  1  @  4 : 5
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/particle/EntityLargeExplodeFX.edit.java b/patches/minecraft/net/minecraft/client/particle/EntityLargeExplodeFX.edit.java
index f7e2aa7..764eb85 100644
--- a/patches/minecraft/net/minecraft/client/particle/EntityLargeExplodeFX.edit.java
+++ b/patches/minecraft/net/minecraft/client/particle/EntityLargeExplodeFX.edit.java
@@ -10,15 +10,15 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  5  @  3 : 6
+> DELETE  3  @  1 : 4
 
-> DELETE  7  @  8 : 9
+> DELETE  2  @  5 : 6
 
-> DELETE  9  @  11 : 12
+> DELETE  2  @  3 : 4
 
-> DELETE  15  @  18 : 22
+> DELETE  6  @  7 : 11
 
-> CHANGE  45 : 46  @  52 : 53
+> CHANGE  30 : 31  @  34 : 35
 
 ~ 			worldrenderer.begin(7, DefaultVertexFormats.PARTICLE_POSITION_TEX_COLOR_LMAP);
 
diff --git a/patches/minecraft/net/minecraft/client/particle/EntityPickupFX.edit.java b/patches/minecraft/net/minecraft/client/particle/EntityPickupFX.edit.java
index 346006e..a93a316 100644
--- a/patches/minecraft/net/minecraft/client/particle/EntityPickupFX.edit.java
+++ b/patches/minecraft/net/minecraft/client/particle/EntityPickupFX.edit.java
@@ -11,6 +11,6 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  6  @  3 : 7
+> DELETE  4  @  1 : 5
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/particle/EntitySpellParticleFX.edit.java b/patches/minecraft/net/minecraft/client/particle/EntitySpellParticleFX.edit.java
index b985883..1f225b2 100644
--- a/patches/minecraft/net/minecraft/client/particle/EntitySpellParticleFX.edit.java
+++ b/patches/minecraft/net/minecraft/client/particle/EntitySpellParticleFX.edit.java
@@ -10,7 +10,7 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> CHANGE  9 : 10  @  11 : 12
+> CHANGE  7 : 8  @  9 : 10
 
 ~ 	private static final EaglercraftRandom RANDOM = new EaglercraftRandom();
 
diff --git a/patches/minecraft/net/minecraft/client/particle/MobAppearance.edit.java b/patches/minecraft/net/minecraft/client/particle/MobAppearance.edit.java
index 1f88b64..62c88bc 100644
--- a/patches/minecraft/net/minecraft/client/particle/MobAppearance.edit.java
+++ b/patches/minecraft/net/minecraft/client/particle/MobAppearance.edit.java
@@ -11,6 +11,6 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  6  @  3 : 8
+> DELETE  4  @  1 : 6
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/player/inventory/ContainerLocalMenu.edit.java b/patches/minecraft/net/minecraft/client/player/inventory/ContainerLocalMenu.edit.java
index 3827cac..54ebf0a 100644
--- a/patches/minecraft/net/minecraft/client/player/inventory/ContainerLocalMenu.edit.java
+++ b/patches/minecraft/net/minecraft/client/player/inventory/ContainerLocalMenu.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.collect.Maps;
diff --git a/patches/minecraft/net/minecraft/client/renderer/ActiveRenderInfo.edit.java b/patches/minecraft/net/minecraft/client/renderer/ActiveRenderInfo.edit.java
index 287c86b..ceb60e6 100644
--- a/patches/minecraft/net/minecraft/client/renderer/ActiveRenderInfo.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/ActiveRenderInfo.edit.java
@@ -14,18 +14,18 @@
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  11  @  7 : 9
+> DELETE  9  @  5 : 7
 
-> DELETE  17  @  15 : 17
+> DELETE  6  @  8 : 10
 
-> CHANGE  19 : 23  @  19 : 23
+> CHANGE  2 : 6  @  4 : 8
 
 ~ 	private static final int[] VIEWPORT = new int[4];
 ~ 	private static final float[] MODELVIEW = new float[16];
 ~ 	private static final float[] PROJECTION = new float[16];
 ~ 	private static final float[] OBJECTCOORDS = new float[3];
 
-> CHANGE  33 : 38  @  33 : 38
+> CHANGE  14 : 19  @  14 : 19
 
 ~ 		EaglercraftGPU.glGetInteger(GL_VIEWPORT, VIEWPORT);
 ~ 		float f = (float) ((VIEWPORT[0] + VIEWPORT[2]) / 2);
@@ -33,7 +33,7 @@
 ~ 		GlStateManager.gluUnProject(f, f1, 0.0F, MODELVIEW, PROJECTION, VIEWPORT, OBJECTCOORDS);
 ~ 		position = new Vec3((double) OBJECTCOORDS[0], (double) OBJECTCOORDS[1], (double) OBJECTCOORDS[2]);
 
-> CHANGE  50 : 51  @  50 : 51
+> CHANGE  17 : 18  @  17 : 18
 
 ~ 		double d1 = parEntity.prevPosY + (parEntity.posY - parEntity.prevPosY) * parDouble1 + parEntity.getEyeHeight();
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/BlockFluidRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/BlockFluidRenderer.edit.java
index cf47ae2..fe9be80 100644
--- a/patches/minecraft/net/minecraft/client/renderer/BlockFluidRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/BlockFluidRenderer.edit.java
@@ -10,23 +10,23 @@
 + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  8  @  6 : 8
+> DELETE  6  @  4 : 6
 
-> CHANGE  15 : 17  @  15 : 17
+> CHANGE  7 : 9  @  9 : 11
 
 ~ 	private EaglerTextureAtlasSprite[] atlasSpritesLava = new EaglerTextureAtlasSprite[2];
 ~ 	private EaglerTextureAtlasSprite[] atlasSpritesWater = new EaglerTextureAtlasSprite[2];
 
-> CHANGE  34 : 36  @  34 : 35
+> CHANGE  19 : 21  @  19 : 20
 
 ~ 		EaglerTextureAtlasSprite[] atextureatlassprite = blockliquid.getMaterial() == Material.lava
 ~ 				? this.atlasSpritesLava
 
-> CHANGE  67 : 68  @  66 : 67
+> CHANGE  33 : 34  @  32 : 33
 
 ~ 				EaglerTextureAtlasSprite textureatlassprite = atextureatlassprite[0];
 
-> CHANGE  173 : 174  @  172 : 173
+> CHANGE  106 : 107  @  106 : 107
 
 ~ 				EaglerTextureAtlasSprite textureatlassprite1 = atextureatlassprite[1];
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.edit.java
index 775b567..ef43f67 100644
--- a/patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.edit.java
@@ -11,13 +11,13 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  10  @  7 : 11
+> DELETE  6  @  3 : 7
 
-> INSERT  85 : 86  @  86
+> INSERT  75 : 76  @  79
 
 + 		BlockPos.MutableBlockPos pointer = new BlockPos.MutableBlockPos();
 
-> CHANGE  89 : 90  @  89 : 90
+> CHANGE  4 : 5  @  3 : 4
 
 ~ 				BlockPos blockpos = blockPosIn.offsetEvenFaster(enumfacing, pointer);
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/BlockModelShapes.edit.java b/patches/minecraft/net/minecraft/client/renderer/BlockModelShapes.edit.java
index ac8e734..e7ef6b7 100644
--- a/patches/minecraft/net/minecraft/client/renderer/BlockModelShapes.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/BlockModelShapes.edit.java
@@ -7,33 +7,33 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  5 : 9  @  6
+> INSERT  3 : 7  @  4
 
 + 
 + import com.google.common.collect.Maps;
 + 
 + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
 
-> DELETE  54  @  51 : 52
+> DELETE  49  @  45 : 46
 
-> CHANGE  75 : 76  @  73 : 74
+> CHANGE  21 : 22  @  22 : 23
 
 ~ 	public EaglerTextureAtlasSprite getTexture(IBlockState state) {
 
-> CHANGE  130 : 131  @  128 : 129
+> CHANGE  55 : 56  @  55 : 56
 
 ~ 			this.bakedModelStore.put((IBlockState) entry.getKey(),
 
-> CHANGE  306 : 307  @  304 : 305
+> CHANGE  176 : 177  @  176 : 177
 
 ~ 				String s = BlockDirt.VARIANT.getName((BlockDirt.DirtType) linkedhashmap.remove(BlockDirt.VARIANT));
 
-> CHANGE  317 : 319  @  315 : 316
+> CHANGE  11 : 13  @  11 : 12
 
 ~ 				String s = BlockStoneSlab.VARIANT
 ~ 						.getName((BlockStoneSlab.EnumType) linkedhashmap.remove(BlockStoneSlab.VARIANT));
 
-> CHANGE  328 : 329  @  325 : 326
+> CHANGE  11 : 12  @  10 : 11
 
 ~ 						.getName((BlockStoneSlabNew.EnumType) linkedhashmap.remove(BlockStoneSlabNew.VARIANT));
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/BlockRendererDispatcher.edit.java b/patches/minecraft/net/minecraft/client/renderer/BlockRendererDispatcher.edit.java
index 2d6bf14..0c62eb7 100644
--- a/patches/minecraft/net/minecraft/client/renderer/BlockRendererDispatcher.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/BlockRendererDispatcher.edit.java
@@ -10,15 +10,15 @@
 + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  6  @  4 : 11
+> DELETE  4  @  2 : 9
 
-> DELETE  18  @  23 : 24
+> DELETE  12  @  19 : 20
 
-> CHANGE  35 : 36  @  41 : 42
+> CHANGE  17 : 18  @  18 : 19
 
 ~ 	public void renderBlockDamage(IBlockState state, BlockPos pos, EaglerTextureAtlasSprite texture,
 
-> CHANGE  91 : 95  @  97 : 103
+> CHANGE  56 : 60  @  56 : 62
 
 ~ 
 ~ 		try {
diff --git a/patches/minecraft/net/minecraft/client/renderer/ChestRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/ChestRenderer.edit.java
index 35c39b8..8d67b35 100644
--- a/patches/minecraft/net/minecraft/client/renderer/ChestRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/ChestRenderer.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 4
+> DELETE  2  @  1 : 2
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/ChunkRenderContainer.edit.java b/patches/minecraft/net/minecraft/client/renderer/ChunkRenderContainer.edit.java
index 6c8fb64..68e7007 100644
--- a/patches/minecraft/net/minecraft/client/renderer/ChunkRenderContainer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/ChunkRenderContainer.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 7  @  4 : 5
+> CHANGE  1 : 5  @  2 : 3
 
 ~ 
 ~ import com.google.common.collect.Lists;
diff --git a/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.edit.java
index ab8f06a..832fc53 100644
--- a/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.edit.java
@@ -9,12 +9,12 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
 
-> CHANGE  4 : 6  @  8 : 9
+> CHANGE  2 : 4  @  6 : 7
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ import net.lax1dude.eaglercraft.v1_8.HString;
 
-> INSERT  7 : 20  @  10
+> INSERT  3 : 16  @  2
 
 + 
 + import com.google.common.base.Predicate;
@@ -30,23 +30,23 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  30  @  20 : 29
+> DELETE  23  @  10 : 19
 
-> DELETE  37  @  36 : 38
+> DELETE  7  @  16 : 18
 
-> DELETE  44  @  45 : 48
+> DELETE  7  @  9 : 12
 
-> DELETE  64  @  68 : 75
+> DELETE  20  @  23 : 30
 
-> CHANGE  73 : 74  @  84 : 85
+> CHANGE  9 : 10  @  16 : 17
 
 ~ 	private EaglercraftRandom random = new EaglercraftRandom();
 
-> DELETE  117  @  128 : 129
+> DELETE  44  @  44 : 45
 
-> DELETE  147  @  159 : 160
+> DELETE  30  @  31 : 32
 
-> INSERT  148 : 157  @  161
+> INSERT  1 : 10  @  2
 
 + 		GlStateManager.setActiveTexture(OpenGlHelper.lightmapTexUnit);
 + 		GlStateManager.matrixMode(5890);
@@ -58,51 +58,51 @@
 + 		GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit);
 + 
 
-> CHANGE  170 : 171  @  174 : 175
+> CHANGE  22 : 23  @  13 : 14
 
 ~ 		return false;
 
-> DELETE  174  @  178 : 184
+> DELETE  4  @  4 : 10
 
-> DELETE  181  @  191 : 206
+> DELETE  7  @  13 : 28
 
-> DELETE  184  @  209 : 224
+> DELETE  3  @  18 : 33
 
-> CHANGE  187 : 188  @  227 : 242
+> CHANGE  3 : 4  @  18 : 33
 
 ~ 		this.useShader = false;
 
-> DELETE  191  @  245 : 256
+> DELETE  4  @  18 : 29
 
-> DELETE  194  @  259 : 263
+> DELETE  3  @  14 : 18
 
-> DELETE  238  @  307 : 311
+> DELETE  44  @  48 : 52
 
-> DELETE  239  @  312 : 319
+> DELETE  1  @  5 : 12
 
-> CHANGE  357 : 358  @  437 : 438
+> CHANGE  118 : 119  @  125 : 126
 
 ~ 				f = this.mc.gameSettings.keyBindZoomCamera.isKeyDown() ? 17.0f : this.mc.gameSettings.fovSetting;
 
-> CHANGE  527 : 528  @  607 : 608
+> CHANGE  170 : 171  @  170 : 171
 
 ~ 		GlStateManager.gluPerspective(this.getFOVModifier(partialTicks, true),
 
-> CHANGE  529 : 530  @  609 : 610
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 				this.farPlaneDistance * 2.0f * MathHelper.SQRT_2);
 
-> CHANGE  587 : 588  @  667 : 668
+> CHANGE  58 : 59  @  58 : 59
 
 ~ 			GlStateManager.gluPerspective(this.getFOVModifier(partialTicks, false),
 
-> DELETE  631  @  711 : 723
+> DELETE  44  @  44 : 56
 
-> CHANGE  752 : 753  @  844 : 845
+> CHANGE  121 : 122  @  133 : 134
 
 ~ 					this.lightmapColors[i] = short1 << 24 | j | k << 8 | l << 16;
 
-> INSERT  756 : 770  @  848
+> INSERT  4 : 18  @  4
 
 + 
 + 				GlStateManager.setActiveTexture(OpenGlHelper.lightmapTexUnit);
@@ -119,35 +119,35 @@
 + 				GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit);
 + 
 
-> DELETE  793  @  871 : 876
+> DELETE  37  @  23 : 28
 
-> INSERT  797 : 800  @  880
+> INSERT  4 : 7  @  9
 
 + 			if (this.mc.gameSettings.keyBindZoomCamera.isKeyDown()) {
 + 				f *= 0.7f;
 + 			}
 
-> DELETE  839  @  919 : 932
+> DELETE  42  @  39 : 52
 
-> CHANGE  867 : 868  @  960 : 961
+> CHANGE  28 : 29  @  41 : 42
 
 ~ 							return EntityRenderer.this.mc.currentScreen.getClass().getName();
 
-> CHANGE  872 : 873  @  965 : 966
+> CHANGE  5 : 6  @  5 : 6
 
 ~ 							return HString.format("Scaled: (%d, %d). Absolute: (%d, %d)",
 
-> CHANGE  879 : 880  @  972 : 973
+> CHANGE  7 : 8  @  7 : 8
 
 ~ 							return HString.format("Scaled: (%d, %d). Absolute: (%d, %d). Scale factor of %d",
 
-> DELETE  895  @  988 : 990
+> DELETE  16  @  16 : 18
 
-> CHANGE  927 : 928  @  1022 : 1023
+> CHANGE  32 : 33  @  34 : 35
 
 ~ 			EaglercraftGPU.glLineWidth(1.0F);
 
-> INSERT  953 : 958  @  1048
+> INSERT  26 : 31  @  26
 
 + 
 + 		if (this.mc.gameSettings.fxaa) {
@@ -155,76 +155,76 @@
 + 		}
 + 
 
-> INSERT  974 : 978  @  1064
+> INSERT  21 : 25  @  16
 
 + 		if (this.mc.gameSettings.fxaa) {
 + 			EffectPipelineFXAA.end();
 + 		}
 + 
 
-> CHANGE  1007 : 1009  @  1093 : 1095
+> CHANGE  33 : 35  @  29 : 31
 
 ~ 			GlStateManager.gluPerspective(this.getFOVModifier(partialTicks, true),
 ~ 					(float) this.mc.displayWidth / (float) this.mc.displayHeight, 0.05F, this.farPlaneDistance * 4.0F);
 
-> CHANGE  1013 : 1014  @  1099 : 1100
+> CHANGE  6 : 7  @  6 : 7
 
 ~ 			GlStateManager.gluPerspective(this.getFOVModifier(partialTicks, true),
 
-> INSERT  1041 : 1042  @  1127
+> INSERT  28 : 29  @  28
 
 + 		GlStateManager.disableBlend();
 
-> DELETE  1048  @  1133 : 1134
+> DELETE  7  @  6 : 7
 
-> INSERT  1049 : 1050  @  1135
+> INSERT  1 : 2  @  2
 
 + 		GlStateManager.shadeModel(7424);
 
-> CHANGE  1141 : 1142  @  1226 : 1227
+> CHANGE  92 : 93  @  91 : 92
 
 ~ 			GlStateManager.gluPerspective(this.getFOVModifier(partialTicks, true),
 
-> CHANGE  1151 : 1152  @  1236 : 1237
+> CHANGE  10 : 11  @  10 : 11
 
 ~ 			GlStateManager.gluPerspective(this.getFOVModifier(partialTicks, true),
 
-> CHANGE  1239 : 1240  @  1324 : 1325
+> CHANGE  88 : 89  @  88 : 89
 
 ~ 			EaglercraftGPU.glNormal3f(0.0F, 1.0F, 0.0F);
 
-> CHANGE  1287 : 1288  @  1372 : 1373
+> CHANGE  48 : 49  @  48 : 49
 
 ~ 							if (f2 >= 0.15F) {
 
-> CHANGE  1524 : 1525  @  1609 : 1610
+> CHANGE  237 : 238  @  237 : 238
 
 ~ 		GlStateManager.clearColor(this.fogColorRed, this.fogColorGreen, this.fogColorBlue, 1.0F);
 
-> CHANGE  1534 : 1537  @  1619 : 1621
+> CHANGE  10 : 13  @  10 : 12
 
 ~ 		EaglercraftGPU.glFog(GL_FOG_COLOR,
 ~ 				this.setFogColorBuffer(this.fogColorRed, this.fogColorGreen, this.fogColorBlue, 1.0F));
 ~ 		EaglercraftGPU.glNormal3f(0.0F, -1.0F, 0.0F);
 
-> CHANGE  1554 : 1555  @  1638 : 1642
+> CHANGE  20 : 21  @  19 : 23
 
 ~ 			EaglercraftGPU.glFogi('\u855a', '\u855b');
 
-> INSERT  1569 : 1572  @  1656
+> INSERT  15 : 18  @  18
 
 + 		} else if (!this.mc.gameSettings.fog) {
 + 			GlStateManager.setFog(2048);
 + 			GlStateManager.setFogDensity(0.0F);
 
-> INSERT  1573 : 1574  @  1657
+> INSERT  4 : 5  @  1
 
 + 			GlStateManager.setFogDensity(0.001F);
 
-> CHANGE  1584 : 1585  @  1667 : 1670
+> CHANGE  11 : 12  @  10 : 13
 
 ~ 			EaglercraftGPU.glFogi('\u855a', '\u855b');
 
-> DELETE  1594  @  1679 : 1680
+> DELETE  10  @  12 : 13
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/GLAllocation.edit.java b/patches/minecraft/net/minecraft/client/renderer/GLAllocation.edit.java
index b3064b2..51c4946 100644
--- a/patches/minecraft/net/minecraft/client/renderer/GLAllocation.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/GLAllocation.edit.java
@@ -11,34 +11,34 @@
 ~ import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
 ~ import net.lax1dude.eaglercraft.v1_8.internal.buffer.IntBuffer;
 
-> CHANGE  6 : 8  @  9 : 18
+> CHANGE  4 : 6  @  7 : 16
 
 ~ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
 
-> CHANGE  9 : 12  @  19 : 24
+> CHANGE  3 : 6  @  10 : 15
 
 ~ public class GLAllocation {
 ~ 	public static int generateDisplayLists() {
 ~ 		return EaglercraftGPU.glGenLists();
 
-> CHANGE  14 : 16  @  26 : 28
+> CHANGE  5 : 7  @  7 : 9
 
 ~ 	public static void deleteDisplayLists(int list) {
 ~ 		EaglercraftGPU.glDeleteLists(list);
 
-> CHANGE  18 : 20  @  30 : 32
+> CHANGE  4 : 6  @  4 : 6
 
 ~ 	public static ByteBuffer createDirectByteBuffer(int capacity) {
 ~ 		return EagRuntime.allocateByteBuffer(capacity);
 
-> DELETE  22  @  34 : 38
+> DELETE  4  @  4 : 8
 
-> CHANGE  23 : 24  @  39 : 40
+> CHANGE  1 : 2  @  5 : 6
 
 ~ 		return EagRuntime.allocateIntBuffer(capacity);
 
-> CHANGE  27 : 28  @  43 : 44
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 		return EagRuntime.allocateFloatBuffer(capacity);
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/IImageBuffer.edit.java b/patches/minecraft/net/minecraft/client/renderer/IImageBuffer.edit.java
index 3f0947a..cebb853 100644
--- a/patches/minecraft/net/minecraft/client/renderer/IImageBuffer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/IImageBuffer.edit.java
@@ -9,7 +9,7 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
 
-> CHANGE  5 : 6  @  5 : 6
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 	ImageData parseUserSkin(ImageData var1);
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/ImageBufferDownload.edit.java b/patches/minecraft/net/minecraft/client/renderer/ImageBufferDownload.edit.java
index cba4fa6..7138bf8 100644
--- a/patches/minecraft/net/minecraft/client/renderer/ImageBufferDownload.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/ImageBufferDownload.edit.java
@@ -9,11 +9,11 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
 
-> CHANGE  9 : 10  @  13 : 14
+> CHANGE  7 : 8  @  11 : 12
 
 ~ 	public ImageData parseUserSkin(ImageData bufferedimage) {
 
-> CHANGE  15 : 31  @  19 : 35
+> CHANGE  6 : 22  @  6 : 22
 
 ~ 			ImageData bufferedimage1 = new ImageData(this.imageWidth, this.imageHeight, true);
 ~ 			bufferedimage1.copyPixelsFrom(bufferedimage, 0, 0, bufferedimage.width, bufferedimage.height, 0, 0,
@@ -32,7 +32,7 @@
 ~ 				bufferedimage1.drawLayer(bufferedimage, 44, 52, 40, 64, 40, 20, 44, 32);
 ~ 				bufferedimage1.drawLayer(bufferedimage, 48, 52, 44, 64, 52, 20, 56, 32);
 
-> CHANGE  33 : 34  @  37 : 39
+> CHANGE  18 : 19  @  18 : 20
 
 ~ 			this.imageData = bufferedimage1.pixels;
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.edit.java
index 890f3b2..b011127 100644
--- a/patches/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.edit.java
@@ -10,9 +10,9 @@
 + 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  6  @  4 : 5
+> DELETE  3  @  1 : 2
 
-> INSERT  50 : 51  @  49
+> INSERT  44 : 45  @  45
 
 + 			GlStateManager.enableAlpha();
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/ItemModelMesher.edit.java b/patches/minecraft/net/minecraft/client/renderer/ItemModelMesher.edit.java
index 3439419..1ffabc9 100644
--- a/patches/minecraft/net/minecraft/client/renderer/ItemModelMesher.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/ItemModelMesher.edit.java
@@ -7,22 +7,22 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  4 : 8  @  5 : 7
+> CHANGE  2 : 6  @  3 : 5
 
 ~ 
 ~ import com.google.common.collect.Maps;
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
 
-> CHANGE  24 : 25  @  23 : 24
+> CHANGE  20 : 21  @  18 : 19
 
 ~ 	public EaglerTextureAtlasSprite getParticleIcon(Item item) {
 
-> CHANGE  28 : 29  @  27 : 28
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public EaglerTextureAtlasSprite getParticleIcon(Item item, int meta) {
 
-> CHANGE  78 : 79  @  77 : 78
+> CHANGE  50 : 51  @  50 : 51
 
 ~ 			this.simpleShapesCache.put((Integer) entry.getKey(),
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.edit.java
index 0973bed..3149912 100644
--- a/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.edit.java
@@ -13,33 +13,33 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  13  @  8 : 13
+> DELETE  11  @  6 : 11
 
-> DELETE  18  @  18 : 19
+> DELETE  5  @  10 : 11
 
-> DELETE  30  @  31 : 32
+> DELETE  12  @  13 : 14
 
-> CHANGE  56 : 59  @  58 : 61
+> CHANGE  26 : 29  @  27 : 30
 
 ~ //				if (this.isBlockTranslucent(block)) { //TODO: figure out why this code exists, it breaks slime blocks
 ~ //					GlStateManager.depthMask(false);
 ~ //				}
 
-> CHANGE  62 : 65  @  64 : 67
+> CHANGE  6 : 9  @  6 : 9
 
 ~ //			if (this.isBlockTranslucent(block)) {
 ~ //				GlStateManager.depthMask(true);
 ~ //			}
 
-> CHANGE  166 : 167  @  168 : 169
+> CHANGE  104 : 105  @  104 : 105
 
 ~ 		EaglercraftGPU.glNormal3f(0.0F, 0.0F, -1.0F);
 
-> CHANGE  361 : 362  @  363 : 364
+> CHANGE  195 : 196  @  195 : 196
 
 ~ 	private void func_178108_a(float parFloat1, EaglerTextureAtlasSprite parTextureAtlasSprite) {
 
-> CHANGE  427 : 428  @  429 : 430
+> CHANGE  66 : 67  @  66 : 67
 
 ~ 			EaglerTextureAtlasSprite textureatlassprite = this.mc.getTextureMapBlocks()
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/RegionRenderCache.edit.java b/patches/minecraft/net/minecraft/client/renderer/RegionRenderCache.edit.java
index cdca76e..33a471f 100644
--- a/patches/minecraft/net/minecraft/client/renderer/RegionRenderCache.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/RegionRenderCache.edit.java
@@ -9,11 +9,11 @@
 
 + 
 
-> CHANGE  14 : 15  @  13 : 14
+> CHANGE  11 : 12  @  10 : 11
 
 ~ 	private final IBlockState DEFAULT_STATE = Blocks.air.getDefaultState();
 
-> INSERT  56 : 70  @  55
+> INSERT  42 : 56  @  42
 
 + 	/**
 + 	 * only use with a regular "net.minecraft.util.BlockPos"!
@@ -30,7 +30,7 @@
 + 	}
 + 
 
-> INSERT  80 : 93  @  65
+> INSERT  24 : 37  @  10
 
 + 	/**
 + 	 * only use with a regular "net.minecraft.util.BlockPos"!
@@ -46,7 +46,7 @@
 + 	}
 + 
 
-> INSERT  99 : 109  @  71
+> INSERT  19 : 29  @  6
 
 + 
 + 	/**
diff --git a/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.edit.java b/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.edit.java
index 889e39b..c468d59 100644
--- a/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 7
 
-> CHANGE  8 : 10  @  13 : 14
+> CHANGE  6 : 8  @  11 : 12
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ import net.lax1dude.eaglercraft.v1_8.HString;
 
-> INSERT  12 : 26  @  16
+> INSERT  4 : 18  @  3
 
 + 
 + import com.google.common.collect.Lists;
@@ -29,52 +29,52 @@
 + import net.lax1dude.eaglercraft.v1_8.vector.Vector3f;
 + import net.lax1dude.eaglercraft.v1_8.vector.Vector4f;
 
-> DELETE  38  @  28 : 41
+> DELETE  26  @  12 : 25
 
-> DELETE  42  @  45 : 46
+> DELETE  4  @  17 : 18
 
-> DELETE  48  @  52 : 53
+> DELETE  6  @  7 : 8
 
-> DELETE  52  @  57 : 60
+> DELETE  4  @  5 : 8
 
-> DELETE  54  @  62 : 65
+> DELETE  2  @  5 : 8
 
-> DELETE  83  @  94 : 99
+> DELETE  29  @  32 : 37
 
-> DELETE  103  @  119 : 123
+> DELETE  20  @  25 : 29
 
-> CHANGE  106 : 107  @  126 : 129
+> CHANGE  3 : 4  @  7 : 10
 
 ~ 	private final EaglerTextureAtlasSprite[] destroyBlockIcons = new EaglerTextureAtlasSprite[10];
 
-> CHANGE  118 : 119  @  140 : 141
+> CHANGE  12 : 13  @  14 : 15
 
 ~ 	private final ChunkUpdateManager renderDispatcher = new ChunkUpdateManager();
 
-> CHANGE  141 : 143  @  163 : 165
+> CHANGE  23 : 25  @  23 : 25
 
 ~ 		EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
 ~ 		EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
 
-> CHANGE  145 : 148  @  167 : 179
+> CHANGE  4 : 7  @  4 : 16
 
 ~ 		this.vboEnabled = false;
 ~ 		this.renderContainer = new RenderList();
 ~ 		this.renderChunkFactory = new ListChunkFactory();
 
-> DELETE  167  @  198 : 202
+> DELETE  22  @  31 : 35
 
-> DELETE  168  @  203 : 224
+> DELETE  1  @  5 : 26
 
-> DELETE  171  @  227 : 233
+> DELETE  3  @  24 : 30
 
-> CHANGE  175 : 176  @  237 : 239
+> CHANGE  4 : 5  @  10 : 12
 
 ~ 		return false;
 
-> DELETE  181  @  244 : 247
+> DELETE  6  @  7 : 10
 
-> CHANGE  187 : 192  @  253 : 266
+> CHANGE  6 : 11  @  9 : 22
 
 ~ 		this.glSkyList2 = GLAllocation.generateDisplayLists();
 ~ 		EaglercraftGPU.glNewList(this.glSkyList2, GL_COMPILE);
@@ -82,9 +82,9 @@
 ~ 		tessellator.draw();
 ~ 		EaglercraftGPU.glEndList();
 
-> DELETE  198  @  272 : 275
+> DELETE  11  @  19 : 22
 
-> CHANGE  204 : 209  @  281 : 294
+> CHANGE  6 : 11  @  9 : 22
 
 ~ 		this.glSkyList = GLAllocation.generateDisplayLists();
 ~ 		EaglercraftGPU.glNewList(this.glSkyList, GL_COMPILE);
@@ -92,9 +92,9 @@
 ~ 		tessellator.draw();
 ~ 		EaglercraftGPU.glEndList();
 
-> DELETE  238  @  323 : 326
+> DELETE  34  @  42 : 45
 
-> CHANGE  244 : 251  @  332 : 347
+> CHANGE  6 : 13  @  9 : 24
 
 ~ 		this.starGLCallList = GLAllocation.generateDisplayLists();
 ~ 		GlStateManager.pushMatrix();
@@ -104,42 +104,42 @@
 ~ 		EaglercraftGPU.glEndList();
 ~ 		GlStateManager.popMatrix();
 
-> CHANGE  255 : 256  @  351 : 352
+> CHANGE  11 : 12  @  19 : 20
 
 ~ 		EaglercraftRandom random = new EaglercraftRandom(10842L);
 
-> DELETE  326  @  422 : 431
+> DELETE  71  @  71 : 80
 
-> DELETE  327  @  432 : 438
+> DELETE  1  @  10 : 16
 
-> DELETE  355  @  466 : 470
+> DELETE  28  @  34 : 38
 
-> DELETE  356  @  471 : 472
+> DELETE  1  @  5 : 6
 
-> DELETE  397  @  513 : 550
+> DELETE  41  @  42 : 79
 
-> CHANGE  450 : 451  @  603 : 604
+> CHANGE  53 : 54  @  90 : 91
 
 ~ 					for (TileEntity tileentity2 : (List) list1) {
 
-> CHANGE  503 : 504  @  656 : 657
+> CHANGE  53 : 54  @  53 : 54
 
 ~ 		return HString.format("C: %d/%d %sD: %d, %s",
 
-> DELETE  619  @  772 : 773
+> DELETE  116  @  116 : 117
 
-> CHANGE  621 : 622  @  775 : 776
+> CHANGE  2 : 3  @  3 : 4
 
 ~ 					if ((!flag1 || !renderglobal$containerlocalrenderinformation1.setFacing // TODO:
 
-> DELETE  644  @  798 : 799
+> DELETE  23  @  23 : 24
 
-> CHANGE  651 : 653  @  806 : 807
+> CHANGE  7 : 9  @  8 : 9
 
 ~ 				if (this.mc.gameSettings.chunkFix ? this.isPositionInRenderChunkHack(blockpos1, renderchunk4)
 ~ 						: this.isPositionInRenderChunk(blockpos, renderchunk4)) {
 
-> INSERT  674 : 684  @  828
+> INSERT  23 : 33  @  22
 
 + 	/**
 + 	 * WARNING: use only in the above "build near" logic
@@ -152,49 +152,49 @@
 + 	}
 + 
 
-> INSERT  713 : 714  @  857
+> INSERT  39 : 40  @  29
 
 + 		((ClippingHelperImpl) this.debugFixedClippingHelper).destroy();
 
-> DELETE  808  @  951 : 961
+> DELETE  95  @  94 : 104
 
-> DELETE  809  @  962 : 982
+> DELETE  1  @  11 : 31
 
-> CHANGE  902 : 903  @  1075 : 1085
+> CHANGE  93 : 94  @  113 : 123
 
 ~ 			GlStateManager.callList(this.glSkyList);
 
-> CHANGE  941 : 942  @  1123 : 1124
+> CHANGE  39 : 40  @  48 : 49
 
 ~ 							.pos((double) (f12 * 120.0F), (double) (f13 * 120.0F), (double) (f13 * 40.0F * afloat[3]))
 
-> CHANGE  984 : 985  @  1166 : 1176
+> CHANGE  43 : 44  @  43 : 53
 
 ~ 				GlStateManager.callList(this.starGLCallList);
 
-> CHANGE  998 : 999  @  1189 : 1199
+> CHANGE  14 : 15  @  23 : 33
 
 ~ 				GlStateManager.callList(this.glSkyList2);
 
-> CHANGE  1371 : 1372  @  1571 : 1572
+> CHANGE  373 : 374  @  382 : 383
 
 ~ 		this.displayListEntitiesDirty |= this.renderDispatcher.updateChunks(finishTimeNano);
 
-> DELETE  1389  @  1589 : 1590
+> DELETE  18  @  18 : 19
 
-> CHANGE  1564 : 1565  @  1765 : 1766
+> CHANGE  175 : 176  @  176 : 177
 
 ~ 							EaglerTextureAtlasSprite textureatlassprite = this.destroyBlockIcons[i];
 
-> CHANGE  1586 : 1587  @  1787 : 1788
+> CHANGE  22 : 23  @  22 : 23
 
 ~ 			EaglercraftGPU.glLineWidth(2.0F);
 
-> CHANGE  1827 : 1828  @  2028 : 2029
+> CHANGE  241 : 242  @  241 : 242
 
 ~ 		EaglercraftRandom random = this.theWorld.rand;
 
-> INSERT  2057 : 2074  @  2258
+> INSERT  230 : 247  @  230
 
 + 
 + 	public String getDebugInfoShort() {
diff --git a/patches/minecraft/net/minecraft/client/renderer/RenderHelper.edit.java b/patches/minecraft/net/minecraft/client/renderer/RenderHelper.edit.java
index 9b65b60..8ea9f0b 100644
--- a/patches/minecraft/net/minecraft/client/renderer/RenderHelper.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/RenderHelper.edit.java
@@ -11,19 +11,19 @@
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  6  @  6 : 7
+> DELETE  4  @  4 : 5
 
-> CHANGE  14 : 16  @  15 : 17
+> CHANGE  8 : 10  @  9 : 11
 
 ~ 		GlStateManager.disableMCLight(0);
 ~ 		GlStateManager.disableMCLight(1);
 
-> CHANGE  21 : 24  @  22 : 24
+> CHANGE  7 : 10  @  7 : 9
 
 ~ 		GlStateManager.enableMCLight(0, 0.6f, LIGHT0_POS.xCoord, LIGHT0_POS.yCoord, LIGHT0_POS.zCoord, 0.0D);
 ~ 		GlStateManager.enableMCLight(1, 0.6f, LIGHT1_POS.xCoord, LIGHT1_POS.yCoord, LIGHT1_POS.zCoord, 0.0D);
 ~ 		GlStateManager.setMCLightAmbient(0.4f, 0.4f, 0.4f);
 
-> DELETE  25  @  25 : 39
+> DELETE  4  @  3 : 17
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/RenderList.edit.java b/patches/minecraft/net/minecraft/client/renderer/RenderList.edit.java
index 0880281..1fa7d64 100644
--- a/patches/minecraft/net/minecraft/client/renderer/RenderList.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/RenderList.edit.java
@@ -10,9 +10,9 @@
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  7  @  7 : 8
+> DELETE  5  @  5 : 6
 
-> CHANGE  15 : 16  @  16 : 17
+> CHANGE  8 : 9  @  9 : 10
 
 ~ 				EaglercraftGPU.glCallList(
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/Tessellator.edit.java b/patches/minecraft/net/minecraft/client/renderer/Tessellator.edit.java
index 58f3265..9adbfa1 100644
--- a/patches/minecraft/net/minecraft/client/renderer/Tessellator.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/Tessellator.edit.java
@@ -11,7 +11,7 @@
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldVertexBufferUploader;
 
-> INSERT  9 : 18  @  8
+> INSERT  7 : 16  @  6
 
 + 
 + 	public static final int GL_TRIANGLES = RealOpenGLEnums.GL_TRIANGLES;
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockFaceUV.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockFaceUV.edit.java
index 918d391..30e46c4 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockFaceUV.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockFaceUV.edit.java
@@ -11,36 +11,36 @@
 ~ import org.json.JSONException;
 ~ import org.json.JSONObject;
 
-> INSERT  6 : 8  @  11
+> INSERT  4 : 6  @  9
 
 + import net.lax1dude.eaglercraft.v1_8.json.JSONTypeDeserializer;
 + 
 
-> CHANGE  50 : 52  @  53 : 57
+> CHANGE  44 : 46  @  42 : 46
 
 ~ 	public static class Deserializer implements JSONTypeDeserializer {
 ~ 		public BlockFaceUV deserialize(JSONObject jsonobject) throws JSONException {
 
-> CHANGE  57 : 59  @  62 : 64
+> CHANGE  7 : 9  @  9 : 11
 
 ~ 		protected int parseRotation(JSONObject parJsonObject) {
 ~ 			int i = parJsonObject.optInt("rotation", 0);
 
-> CHANGE  62 : 63  @  67 : 68
+> CHANGE  5 : 6  @  5 : 6
 
 ~ 				throw new JSONException("Invalid rotation " + i + " found, only 0/90/180/270 allowed");
 
-> CHANGE  66 : 67  @  71 : 72
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 		private float[] parseUV(JSONObject parJsonObject) {
 
-> CHANGE  70 : 73  @  75 : 78
+> CHANGE  4 : 7  @  4 : 7
 
 ~ 				JSONArray jsonarray = parJsonObject.getJSONArray("uv");
 ~ 				if (jsonarray.length() != 4) {
 ~ 					throw new JSONException("Expected 4 uv values, found: " + jsonarray.length());
 
-> CHANGE  77 : 78  @  82 : 83
+> CHANGE  7 : 8  @  7 : 8
 
 ~ 						afloat[i] = jsonarray.getFloat(i);
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPart.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPart.edit.java
index 57e3fd5..8e2f393 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPart.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPart.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 10
 
-> CHANGE  5 : 15  @  13 : 15
+> CHANGE  3 : 13  @  11 : 13
 
 ~ 
 ~ import org.json.JSONArray;
@@ -20,107 +20,107 @@
 ~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider;
 ~ import net.lax1dude.eaglercraft.v1_8.vector.Vector3f;
 
-> DELETE  16  @  16 : 17
+> DELETE  11  @  3 : 4
 
-> DELETE  17  @  18 : 19
+> DELETE  1  @  2 : 3
 
-> CHANGE  67 : 69  @  69 : 73
+> CHANGE  50 : 52  @  51 : 55
 
 ~ 	public static class Deserializer implements JSONTypeDeserializer {
 ~ 		public BlockPart deserialize(JSONObject jsonobject) throws JSONException {
 
-> CHANGE  72 : 75  @  76 : 79
+> CHANGE  5 : 8  @  7 : 10
 
 ~ 			Map map = this.parseFacesCheck(jsonobject);
 ~ 			if (jsonobject.has("shade") && !(jsonobject.get("shade") instanceof Boolean)) {
 ~ 				throw new JSONException("Expected shade to be a Boolean");
 
-> CHANGE  76 : 77  @  80 : 81
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 				boolean flag = jsonobject.optBoolean("shade", true);
 
-> CHANGE  81 : 82  @  85 : 86
+> CHANGE  5 : 6  @  5 : 6
 
 ~ 		private BlockPartRotation parseRotation(JSONObject parJsonObject) {
 
-> CHANGE  84 : 85  @  88 : 89
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 				JSONObject jsonobject = parJsonObject.getJSONObject("rotation");
 
-> CHANGE  89 : 90  @  93 : 94
+> CHANGE  5 : 6  @  5 : 6
 
 ~ 				boolean flag = jsonobject.optBoolean("rescale", false);
 
-> CHANGE  96 : 98  @  100 : 102
+> CHANGE  7 : 9  @  7 : 9
 
 ~ 		private float parseAngle(JSONObject parJsonObject) {
 ~ 			float f = parJsonObject.getFloat("angle");
 
-> CHANGE  99 : 100  @  103 : 104
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 				throw new JSONException("Invalid rotation " + f + " found, only -45/-22.5/0/22.5/45 allowed");
 
-> CHANGE  105 : 107  @  109 : 111
+> CHANGE  6 : 8  @  6 : 8
 
 ~ 		private EnumFacing.Axis parseAxis(JSONObject parJsonObject) {
 ~ 			String s = parJsonObject.getString("axis");
 
-> CHANGE  109 : 110  @  113 : 114
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 				throw new JSONException("Invalid rotation axis: " + s);
 
-> CHANGE  115 : 117  @  119 : 122
+> CHANGE  6 : 8  @  6 : 9
 
 ~ 		private Map parseFacesCheck(JSONObject parJsonObject) {
 ~ 			Map map = this.parseFaces(parJsonObject);
 
-> CHANGE  118 : 119  @  123 : 124
+> CHANGE  3 : 4  @  4 : 5
 
 ~ 				throw new JSONException("Expected between 1 and 6 unique faces, got 0");
 
-> CHANGE  124 : 125  @  129 : 131
+> CHANGE  6 : 7  @  6 : 8
 
 ~ 		private Map parseFaces(JSONObject parJsonObject) {
 
-> CHANGE  126 : 127  @  132 : 133
+> CHANGE  2 : 3  @  3 : 4
 
 ~ 			JSONObject jsonobject = parJsonObject.getJSONObject("faces");
 
-> CHANGE  128 : 132  @  134 : 138
+> CHANGE  2 : 6  @  2 : 6
 
 ~ 			for (String entry : jsonobject.keySet()) {
 ~ 				EnumFacing enumfacing = this.parseEnumFacing(entry);
 ~ 				enummap.put(enumfacing,
 ~ 						JSONTypeProvider.deserialize(jsonobject.getJSONObject(entry), BlockPartFace.class));
 
-> CHANGE  140 : 141  @  146 : 147
+> CHANGE  12 : 13  @  12 : 13
 
 ~ 				throw new JSONException("Unknown facing: " + name);
 
-> CHANGE  146 : 147  @  152 : 153
+> CHANGE  6 : 7  @  6 : 7
 
 ~ 		private Vector3f parsePositionTo(JSONObject parJsonObject) {
 
-> CHANGE  152 : 153  @  158 : 159
+> CHANGE  6 : 7  @  6 : 7
 
 ~ 				throw new JSONException("\'to\' specifier exceeds the allowed boundaries: " + vector3f);
 
-> CHANGE  156 : 157  @  162 : 163
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 		private Vector3f parsePositionFrom(JSONObject parJsonObject) {
 
-> CHANGE  162 : 163  @  168 : 169
+> CHANGE  6 : 7  @  6 : 7
 
 ~ 				throw new JSONException("\'from\' specifier exceeds the allowed boundaries: " + vector3f);
 
-> CHANGE  166 : 170  @  172 : 176
+> CHANGE  4 : 8  @  4 : 8
 
 ~ 		private Vector3f parsePosition(JSONObject parJsonObject, String parString1) {
 ~ 			JSONArray jsonarray = parJsonObject.getJSONArray(parString1);
 ~ 			if (jsonarray.length() != 3) {
 ~ 				throw new JSONException("Expected 3 " + parString1 + " values, found: " + jsonarray.length());
 
-> CHANGE  174 : 175  @  180 : 181
+> CHANGE  8 : 9  @  8 : 9
 
 ~ 					afloat[i] = jsonarray.getFloat(i);
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartFace.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartFace.edit.java
index 31c4726..d66f025 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartFace.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartFace.edit.java
@@ -13,28 +13,28 @@
 ~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeDeserializer;
 ~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider;
 
-> DELETE  8  @  10 : 11
+> DELETE  6  @  8 : 9
 
-> CHANGE  23 : 25  @  26 : 30
+> CHANGE  15 : 17  @  16 : 20
 
 ~ 	public static class Deserializer implements JSONTypeDeserializer {
 ~ 		public BlockPartFace deserialize(JSONObject jsonobject) throws JSONException {
 
-> CHANGE  28 : 29  @  33 : 35
+> CHANGE  5 : 6  @  7 : 9
 
 ~ 			BlockFaceUV blockfaceuv = JSONTypeProvider.deserialize(jsonobject, BlockFaceUV.class);
 
-> CHANGE  32 : 34  @  38 : 40
+> CHANGE  4 : 6  @  5 : 7
 
 ~ 		protected int parseTintIndex(JSONObject parJsonObject) {
 ~ 			return parJsonObject.optInt("tintindex", -1);
 
-> CHANGE  36 : 38  @  42 : 44
+> CHANGE  4 : 6  @  4 : 6
 
 ~ 		private String parseTexture(JSONObject parJsonObject) {
 ~ 			return parJsonObject.getString("texture");
 
-> CHANGE  40 : 42  @  46 : 48
+> CHANGE  4 : 6  @  4 : 6
 
 ~ 		private EnumFacing parseCullFace(JSONObject parJsonObject) {
 ~ 			String s = parJsonObject.optString("cullface", "");
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartRotation.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartRotation.edit.java
index 989fffa..1ae6df6 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartRotation.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartRotation.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.vector.Vector3f;
 
-> DELETE  4  @  3 : 4
+> DELETE  2  @  1 : 2
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/BreakingFour.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/BreakingFour.edit.java
index a5efcf6..e5e83e7 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/BreakingFour.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/BreakingFour.edit.java
@@ -7,16 +7,16 @@
 
 > DELETE  3  @  3 : 6
 
-> INSERT  4 : 6  @  7
+> INSERT  1 : 3  @  4
 
 + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
 + 
 
-> CHANGE  7 : 8  @  8 : 9
+> CHANGE  3 : 4  @  1 : 2
 
 ~ 	private final EaglerTextureAtlasSprite texture;
 
-> CHANGE  9 : 10  @  10 : 11
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 	public BreakingFour(BakedQuad parBakedQuad, EaglerTextureAtlasSprite textureIn) {
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.edit.java
index 8d85f9a..bab815f 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.edit.java
@@ -12,34 +12,34 @@
 + import net.lax1dude.eaglercraft.v1_8.vector.Vector3f;
 + import net.lax1dude.eaglercraft.v1_8.vector.Vector4f;
 
-> DELETE  7  @  3 : 8
+> DELETE  5  @  1 : 6
 
-> DELETE  11  @  12 : 15
+> DELETE  4  @  9 : 12
 
-> CHANGE  16 : 19  @  20 : 23
+> CHANGE  5 : 8  @  8 : 11
 
 ~ 	public BakedQuad makeBakedQuad(Vector3f posFrom, Vector3f posTo, BlockPartFace face,
 ~ 			EaglerTextureAtlasSprite sprite, EnumFacing facing, ModelRotation modelRotationIn,
 ~ 			BlockPartRotation partRotation, boolean uvLocked, boolean shade) {
 
-> CHANGE  33 : 34  @  37 : 38
+> CHANGE  17 : 18  @  17 : 18
 
 ~ 	private int[] makeQuadVertexData(BlockPartFace partFace, EaglerTextureAtlasSprite sprite, EnumFacing facing,
 
-> CHANGE  81 : 83  @  85 : 87
+> CHANGE  48 : 50  @  48 : 50
 
 ~ 			float[] sprite, EaglerTextureAtlasSprite modelRotationIn, ModelRotation partRotation,
 ~ 			BlockPartRotation uvLocked, boolean shade, boolean parFlag2) {
 
-> CHANGE  96 : 97  @  100 : 101
+> CHANGE  15 : 16  @  15 : 16
 
 ~ 			EaglerTextureAtlasSprite sprite, BlockFaceUV faceUV) {
 
-> CHANGE  210 : 211  @  214 : 215
+> CHANGE  114 : 115  @  114 : 115
 
 ~ 			EaglerTextureAtlasSprite parTextureAtlasSprite) {
 
-> CHANGE  287 : 288  @  291 : 292
+> CHANGE  77 : 78  @  77 : 78
 
 ~ 			EaglerTextureAtlasSprite parTextureAtlasSprite) {
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemCameraTransforms.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemCameraTransforms.edit.java
index e5c420c..1eb2e73 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemCameraTransforms.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemCameraTransforms.edit.java
@@ -10,14 +10,14 @@
 ~ import org.json.JSONException;
 ~ import org.json.JSONObject;
 
-> INSERT  5 : 9  @  11
+> INSERT  3 : 7  @  9
 
 + import net.lax1dude.eaglercraft.v1_8.json.JSONTypeDeserializer;
 + import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider;
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 + 
 
-> CHANGE  90 : 98  @  92 : 108
+> CHANGE  85 : 93  @  81 : 97
 
 ~ 	public static class Deserializer implements JSONTypeDeserializer {
 ~ 		public ItemCameraTransforms deserialize(JSONObject jsonobject) throws JSONException {
@@ -28,11 +28,11 @@
 ~ 			ItemTransformVec3f itemtransformvec3f4 = this.func_181683_a(jsonobject, "ground");
 ~ 			ItemTransformVec3f itemtransformvec3f5 = this.func_181683_a(jsonobject, "fixed");
 
-> CHANGE  102 : 103  @  112 : 114
+> CHANGE  12 : 13  @  20 : 22
 
 ~ 		private ItemTransformVec3f func_181683_a(JSONObject parJsonObject, String parString1) {
 
-> CHANGE  104 : 105  @  115 : 117
+> CHANGE  2 : 3  @  3 : 5
 
 ~ 					? JSONTypeProvider.deserialize(parJsonObject.get(parString1), ItemTransformVec3f.class)
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemModelGenerator.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemModelGenerator.edit.java
index bf40412..f40be89 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemModelGenerator.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemModelGenerator.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 4
 
-> CHANGE  5 : 11  @  7 : 13
+> CHANGE  3 : 9  @  5 : 11
 
 ~ 
 ~ import com.google.common.collect.Lists;
@@ -16,24 +16,24 @@
 ~ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
 ~ import net.lax1dude.eaglercraft.v1_8.vector.Vector3f;
 
-> DELETE  14  @  16 : 17
+> DELETE  9  @  9 : 10
 
-> CHANGE  31 : 33  @  34 : 35
+> CHANGE  17 : 19  @  18 : 19
 
 ~ 			EaglerTextureAtlasSprite textureatlassprite = textureMapIn
 ~ 					.getAtlasSprite((new ResourceLocation(s1)).toString());
 
-> CHANGE  45 : 47  @  47 : 48
+> CHANGE  14 : 16  @  13 : 14
 
 ~ 	private List func_178394_a(int parInt1, String parString1,
 ~ 			EaglerTextureAtlasSprite parTextureAtlasSprite) {
 
-> CHANGE  59 : 61  @  60 : 61
+> CHANGE  14 : 16  @  13 : 14
 
 ~ 	private List func_178397_a(EaglerTextureAtlasSprite parTextureAtlasSprite, String parString1,
 ~ 			int parInt1) {
 
-> CHANGE  163 : 164  @  163 : 164
+> CHANGE  104 : 105  @  103 : 104
 
 ~ 	private List func_178393_a(EaglerTextureAtlasSprite parTextureAtlasSprite) {
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemTransformVec3f.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemTransformVec3f.edit.java
index bb4ffc2..c20dd02 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemTransformVec3f.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemTransformVec3f.edit.java
@@ -14,27 +14,27 @@
 ~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeDeserializer;
 ~ import net.lax1dude.eaglercraft.v1_8.vector.Vector3f;
 
-> DELETE  9  @  11 : 12
+> DELETE  7  @  9 : 10
 
-> CHANGE  43 : 44  @  46 : 47
+> CHANGE  34 : 35  @  35 : 36
 
 ~ 	public static class Deserializer implements JSONTypeDeserializer {
 
-> CHANGE  48 : 49  @  51 : 54
+> CHANGE  5 : 6  @  5 : 8
 
 ~ 		public ItemTransformVec3f deserialize(JSONObject jsonobject) throws JSONException {
 
-> CHANGE  62 : 63  @  67 : 68
+> CHANGE  14 : 15  @  16 : 17
 
 ~ 		private Vector3f parseVector3f(JSONObject jsonObject, String key, Vector3f defaultValue) {
 
-> CHANGE  66 : 69  @  71 : 74
+> CHANGE  4 : 7  @  4 : 7
 
 ~ 				JSONArray jsonarray = jsonObject.getJSONArray(key);
 ~ 				if (jsonarray.length() != 3) {
 ~ 					throw new JSONException("Expected 3 " + key + " values, found: " + jsonarray.length());
 
-> CHANGE  73 : 74  @  78 : 79
+> CHANGE  7 : 8  @  7 : 8
 
 ~ 						afloat[i] = jsonarray.getFloat(i);
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlock.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlock.edit.java
index 3525963..f850efc 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlock.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlock.edit.java
@@ -7,16 +7,16 @@
 
 > DELETE  2  @  2 : 11
 
-> CHANGE  11 : 12  @  20 : 27
+> CHANGE  9 : 10  @  18 : 25
 
 ~ 
 
-> CHANGE  13 : 15  @  28 : 30
+> CHANGE  2 : 4  @  8 : 10
 
 ~ import org.json.JSONException;
 ~ import org.json.JSONObject;
 
-> INSERT  16 : 25  @  31
+> INSERT  3 : 12  @  3
 
 + import com.google.common.collect.Lists;
 + import com.google.common.collect.Maps;
@@ -28,69 +28,69 @@
 + import net.minecraft.util.ResourceLocation;
 + 
 
-> CHANGE  27 : 28  @  33 : 40
+> CHANGE  11 : 12  @  2 : 9
 
 ~ 
 
-> DELETE  37  @  49 : 53
+> DELETE  10  @  16 : 20
 
-> CHANGE  38 : 39  @  54 : 55
+> CHANGE  1 : 2  @  5 : 6
 
 ~ 		return (ModelBlock) JSONTypeProvider.deserialize(new JSONObject(parString1), ModelBlock.class);
 
-> CHANGE  163 : 166  @  179 : 180
+> CHANGE  125 : 128  @  125 : 126
 
 ~ 			} catch (ModelBlock.LoopException var5) {
 ~ 				throw var5;
 ~ 			} catch (Throwable var6) {
 
-> CHANGE  181 : 184  @  195 : 200
+> CHANGE  18 : 21  @  16 : 21
 
 ~ 	public static class Deserializer implements JSONTypeDeserializer {
 ~ 		public ModelBlock deserialize(JSONObject jsonobject) throws JSONException {
 ~ 			List list = this.getModelElements(jsonobject);
 
-> CHANGE  188 : 189  @  204 : 205
+> CHANGE  7 : 8  @  9 : 10
 
 ~ 				throw new JSONException("BlockModel requires either elements or parent, found neither");
 
-> CHANGE  190 : 191  @  206 : 207
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 				throw new JSONException("BlockModel requires either elements or parent, found both");
 
-> CHANGE  196 : 198  @  212 : 215
+> CHANGE  6 : 8  @  6 : 9
 
 ~ 					JSONObject jsonobject1 = jsonobject.getJSONObject("display");
 ~ 					itemcameratransforms = JSONTypeProvider.deserialize(jsonobject1, ItemCameraTransforms.class);
 
-> CHANGE  205 : 206  @  222 : 223
+> CHANGE  9 : 10  @  10 : 11
 
 ~ 		private Map getTextures(JSONObject parJsonObject) {
 
-> CHANGE  208 : 209  @  225 : 226
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 				JSONObject jsonobject = parJsonObject.getJSONObject("textures");
 
-> CHANGE  210 : 212  @  227 : 229
+> CHANGE  2 : 4  @  2 : 4
 
 ~ 				for (String entry : jsonobject.keySet()) {
 ~ 					hashmap.put(entry, jsonobject.getString(entry));
 
-> CHANGE  218 : 220  @  235 : 237
+> CHANGE  8 : 10  @  8 : 10
 
 ~ 		private String getParent(JSONObject parJsonObject) {
 ~ 			return parJsonObject.optString("parent", "");
 
-> CHANGE  222 : 224  @  239 : 241
+> CHANGE  4 : 6  @  4 : 6
 
 ~ 		protected boolean getAmbientOcclusionEnabled(JSONObject parJsonObject) {
 ~ 			return parJsonObject.optBoolean("ambientocclusion", true);
 
-> CHANGE  226 : 227  @  243 : 245
+> CHANGE  4 : 5  @  4 : 6
 
 ~ 		protected List getModelElements(JSONObject parJsonObject) {
 
-> CHANGE  229 : 231  @  247 : 249
+> CHANGE  3 : 5  @  4 : 6
 
 ~ 				for (Object jsonelement : parJsonObject.getJSONArray("elements")) {
 ~ 					arraylist.add((BlockPart) JSONTypeProvider.deserialize(jsonelement, BlockPart.class));
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlockDefinition.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlockDefinition.edit.java
index e77b0cb..6c06e67 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlockDefinition.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlockDefinition.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 11
 
-> INSERT  9 : 19  @  18
+> INSERT  7 : 17  @  16
 
 + 
 + import org.json.JSONArray;
@@ -20,73 +20,73 @@
 + import net.lax1dude.eaglercraft.v1_8.json.JSONTypeDeserializer;
 + import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider;
 
-> DELETE  20  @  19 : 20
+> DELETE  11  @  1 : 2
 
-> CHANGE  23 : 24  @  23 : 27
+> CHANGE  3 : 4  @  4 : 8
 
 ~ 
 
-> CHANGE  27 : 28  @  30 : 31
+> CHANGE  4 : 5  @  7 : 8
 
 ~ 		return (ModelBlockDefinition) JSONTypeProvider.deserialize(parReader, ModelBlockDefinition.class);
 
-> CHANGE  69 : 73  @  72 : 78
+> CHANGE  42 : 46  @  42 : 48
 
 ~ 	public static class Deserializer implements JSONTypeDeserializer {
 ~ 		public ModelBlockDefinition deserialize(JSONObject jsonobject) throws JSONException {
 ~ 			List list = this.parseVariantsList(jsonobject);
 ~ 			return new ModelBlockDefinition((Collection) list);
 
-> CHANGE  75 : 77  @  80 : 83
+> CHANGE  6 : 8  @  8 : 11
 
 ~ 		protected List parseVariantsList(JSONObject parJsonObject) {
 ~ 			JSONObject jsonobject = parJsonObject.getJSONObject("variants");
 
-> CHANGE  79 : 81  @  85 : 87
+> CHANGE  4 : 6  @  5 : 7
 
 ~ 			for (String entry : jsonobject.keySet()) {
 ~ 				arraylist.add(this.parseVariants(entry, jsonobject.get(entry)));
 
-> CHANGE  86 : 87  @  92 : 95
+> CHANGE  7 : 8  @  7 : 10
 
 ~ 		protected ModelBlockDefinition.Variants parseVariants(String s, Object jsonelement) {
 
-> CHANGE  88 : 91  @  96 : 101
+> CHANGE  2 : 5  @  4 : 9
 
 ~ 			if (jsonelement instanceof JSONArray) {
 ~ 				for (Object jsonelement1 : (JSONArray) jsonelement) {
 ~ 					arraylist.add(JSONTypeProvider.deserialize(jsonelement1, ModelBlockDefinition.Variant.class));
 
-> CHANGE  93 : 94  @  103 : 105
+> CHANGE  5 : 6  @  7 : 9
 
 ~ 				arraylist.add(JSONTypeProvider.deserialize(jsonelement, ModelBlockDefinition.Variant.class));
 
-> CHANGE  153 : 155  @  164 : 168
+> CHANGE  60 : 62  @  61 : 65
 
 ~ 		public static class Deserializer implements JSONTypeDeserializer {
 ~ 			public ModelBlockDefinition.Variant deserialize(JSONObject jsonobject) throws JSONException {
 
-> CHANGE  169 : 171  @  182 : 184
+> CHANGE  16 : 18  @  18 : 20
 
 ~ 			private boolean parseUvLock(JSONObject parJsonObject) {
 ~ 				return parJsonObject.optBoolean("uvlock", false);
 
-> CHANGE  173 : 176  @  186 : 189
+> CHANGE  4 : 7  @  4 : 7
 
 ~ 			protected ModelRotation parseRotation(JSONObject parJsonObject) {
 ~ 				int i = parJsonObject.optInt("x", 0);
 ~ 				int j = parJsonObject.optInt("y", 0);
 
-> CHANGE  178 : 179  @  191 : 192
+> CHANGE  5 : 6  @  5 : 6
 
 ~ 					throw new JSONException("Invalid BlockModelRotation x: " + i + ", y: " + j);
 
-> CHANGE  184 : 186  @  197 : 199
+> CHANGE  6 : 8  @  6 : 8
 
 ~ 			protected String parseModel(JSONObject parJsonObject) {
 ~ 				return parJsonObject.getString("model");
 
-> CHANGE  188 : 190  @  201 : 203
+> CHANGE  4 : 6  @  4 : 6
 
 ~ 			protected int parseWeight(JSONObject parJsonObject) {
 ~ 				return parJsonObject.optInt("weight", 1);
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/statemap/BlockStateMapper.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/statemap/BlockStateMapper.edit.java
index a2a73c2..1a3fb7f 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/statemap/BlockStateMapper.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/statemap/BlockStateMapper.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 5
 
-> INSERT  6 : 11  @  9
+> INSERT  4 : 9  @  7
 
 + 
 + import com.google.common.base.Objects;
@@ -15,6 +15,6 @@
 + import com.google.common.collect.Sets;
 + 
 
-> DELETE  13  @  11 : 13
+> DELETE  7  @  2 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMap.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMap.edit.java
index e7bb329..3c921b9 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMap.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMap.edit.java
@@ -7,20 +7,20 @@
 
 > DELETE  2  @  2 : 4
 
-> INSERT  5 : 9  @  7
+> INSERT  3 : 7  @  5
 
 + 
 + import com.google.common.collect.Lists;
 + import com.google.common.collect.Maps;
 + 
 
-> DELETE  12  @  10 : 11
+> DELETE  7  @  3 : 4
 
-> CHANGE  27 : 28  @  26 : 27
+> CHANGE  15 : 16  @  16 : 17
 
 ~ 		LinkedHashMap linkedhashmap = Maps.newLinkedHashMap(iblockstate.getProperties());
 
-> CHANGE  32 : 33  @  31 : 32
+> CHANGE  5 : 6  @  5 : 6
 
 ~ 			s = this.name.getName(linkedhashmap.remove(this.name));
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMapperBase.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMapperBase.edit.java
index b774dd4..1ded474 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMapperBase.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMapperBase.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  4 : 7  @  5
+> INSERT  2 : 5  @  3
 
 + 
 + import com.google.common.collect.Maps;
 + 
 
-> DELETE  10  @  8 : 9
+> DELETE  6  @  3 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkCompileTaskGenerator.edit.java b/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkCompileTaskGenerator.edit.java
index 66f8e68..93ae523 100644
--- a/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkCompileTaskGenerator.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkCompileTaskGenerator.edit.java
@@ -7,57 +7,57 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 6  @  4 : 5
+> CHANGE  1 : 4  @  2 : 3
 
 ~ 
 ~ import com.google.common.collect.Lists;
 ~ 
 
-> CHANGE  7 : 8  @  6 : 8
+> CHANGE  4 : 5  @  2 : 4
 
 ~ import net.minecraft.util.EnumWorldBlockLayer;
 
-> DELETE  11  @  11 : 12
+> DELETE  4  @  5 : 6
 
-> INSERT  17 : 19  @  18
+> INSERT  6 : 8  @  7
 
 + 	public long goddamnFuckingTimeout = 0l;
 + 	public long time = 0;
 
-> CHANGE  50 : 51  @  49 : 57
+> CHANGE  33 : 34  @  31 : 39
 
 ~ 		this.status = statusIn;
 
-> CHANGE  54 : 58  @  60 : 61
+> CHANGE  4 : 8  @  11 : 12
 
 ~ 		if (this.type == ChunkCompileTaskGenerator.Type.REBUILD_CHUNK
 ~ 				&& this.status != ChunkCompileTaskGenerator.Status.DONE) {
 ~ 			this.renderChunk.setNeedsUpdate(true);
 ~ 		}
 
-> CHANGE  59 : 61  @  62 : 67
+> CHANGE  5 : 7  @  2 : 7
 
 ~ 		this.finished = true;
 ~ 		this.status = ChunkCompileTaskGenerator.Status.DONE;
 
-> CHANGE  62 : 64  @  68 : 76
+> CHANGE  3 : 5  @  6 : 14
 
 ~ 		for (Runnable runnable : this.listFinishRunnables) {
 ~ 			runnable.run();
 
-> DELETE  65  @  77 : 78
+> DELETE  3  @  9 : 10
 
-> CHANGE  68 : 71  @  81 : 90
+> CHANGE  3 : 6  @  4 : 13
 
 ~ 		this.listFinishRunnables.add(parRunnable);
 ~ 		if (this.finished) {
 ~ 			parRunnable.run();
 
-> DELETE  72  @  91 : 92
+> DELETE  4  @  10 : 11
 
-> DELETE  74  @  94 : 98
+> DELETE  2  @  3 : 7
 
-> INSERT  82 : 90  @  106
+> INSERT  8 : 16  @  12
 
 + 	public boolean canExecuteYet() {
 + 		if (this.type == ChunkCompileTaskGenerator.Type.RESORT_TRANSPARENCY) {
diff --git a/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderWorker.edit.java b/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderWorker.edit.java
index a67da61..7f3daa6 100644
--- a/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderWorker.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderWorker.edit.java
@@ -11,94 +11,94 @@
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 ~ import net.lax1dude.eaglercraft.v1_8.minecraft.ChunkUpdateManager;
 
-> DELETE  7  @  11 : 15
+> DELETE  5  @  9 : 13
 
-> DELETE  9  @  17 : 19
+> DELETE  2  @  6 : 8
 
-> CHANGE  10 : 11  @  20 : 21
+> CHANGE  1 : 2  @  3 : 4
 
 ~ public class ChunkRenderWorker {
 
-> CHANGE  12 : 13  @  22 : 23
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 	private final ChunkUpdateManager chunkRenderDispatcher;
 
-> CHANGE  15 : 16  @  25 : 26
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 	public ChunkRenderWorker(ChunkUpdateManager parChunkRenderDispatcher) {
 
-> CHANGE  19 : 20  @  29 : 30
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public ChunkRenderWorker(ChunkUpdateManager chunkRenderDispatcherIn,
 
-> DELETE  25  @  35 : 51
+> DELETE  6  @  6 : 22
 
-> CHANGE  26 : 30  @  52 : 62
+> CHANGE  1 : 5  @  17 : 27
 
 ~ 		if (generator.getStatus() != ChunkCompileTaskGenerator.Status.PENDING) {
 ~ 			if (!generator.isFinished()) {
 ~ 				LOGGER.warn("Chunk render task was " + generator.getStatus()
 ~ 						+ " when I expected it to be pending; ignoring task");
 
-> CHANGE  32 : 33  @  64 : 67
+> CHANGE  6 : 7  @  12 : 15
 
 ~ 			return;
 
-> INSERT  35 : 37  @  69
+> INSERT  3 : 5  @  5
 
 + 		generator.setStatus(ChunkCompileTaskGenerator.Status.COMPILING);
 + 
 
-> CHANGE  52 : 56  @  84 : 95
+> CHANGE  17 : 21  @  15 : 26
 
 ~ 			if (generator.getStatus() != ChunkCompileTaskGenerator.Status.COMPILING) {
 ~ 				if (!generator.isFinished()) {
 ~ 					LOGGER.warn("Chunk render task was " + generator.getStatus()
 ~ 							+ " when I expected it to be compiling; aborting task");
 
-> CHANGE  58 : 60  @  97 : 100
+> CHANGE  6 : 8  @  13 : 16
 
 ~ 				this.freeRenderBuilder(generator);
 ~ 				return;
 
-> INSERT  62 : 64  @  102
+> INSERT  4 : 6  @  5
 
 + 			generator.setStatus(ChunkCompileTaskGenerator.Status.UPLOADING);
 + 
 
-> CHANGE  65 : 68  @  103 : 104
+> CHANGE  3 : 6  @  1 : 2
 
 ~ 			if (compiledchunk == null) {
 ~ 				System.out.println(chunkcompiletaskgenerator$type);
 ~ 			}
 
-> CHANGE  70 : 72  @  106 : 108
+> CHANGE  5 : 7  @  3 : 5
 
 ~ 					if (!compiledchunk.isLayerEmpty(enumworldblocklayer)) {
 ~ 						this.chunkRenderDispatcher.uploadChunk(enumworldblocklayer,
 
-> CHANGE  73 : 76  @  109 : 110
+> CHANGE  3 : 6  @  3 : 4
 
 ~ 								generator.getRenderChunk(), compiledchunk);
 ~ 						generator.getRenderChunk().setCompiledChunk(compiledchunk);
 ~ 						generator.setStatus(ChunkCompileTaskGenerator.Status.DONE);
 
-> CHANGE  79 : 80  @  113 : 114
+> CHANGE  6 : 7  @  4 : 5
 
 ~ 				this.chunkRenderDispatcher.uploadChunk(
 
-> CHANGE  82 : 85  @  116 : 117
+> CHANGE  3 : 6  @  3 : 4
 
 ~ 						generator.getRenderChunk(), compiledchunk);
 ~ 				generator.getRenderChunk().setCompiledChunk(compiledchunk);
 ~ 				generator.setStatus(ChunkCompileTaskGenerator.Status.DONE);
 
-> DELETE  87  @  119 : 159
+> DELETE  5  @  3 : 43
 
-> CHANGE  91 : 92  @  163 : 165
+> CHANGE  4 : 5  @  44 : 46
 
 ~ 		return this.regionRenderCacheBuilder;
 
-> DELETE  95  @  168 : 171
+> DELETE  4  @  5 : 8
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/chunk/CompiledChunk.edit.java b/patches/minecraft/net/minecraft/client/renderer/chunk/CompiledChunk.edit.java
index 0733b1d..1ef107a 100644
--- a/patches/minecraft/net/minecraft/client/renderer/chunk/CompiledChunk.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/chunk/CompiledChunk.edit.java
@@ -7,14 +7,14 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 7  @  4 : 6
+> CHANGE  1 : 5  @  2 : 4
 
 ~ 
 ~ import com.google.common.collect.Lists;
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> CHANGE  22 : 23  @  21 : 22
+> CHANGE  19 : 20  @  17 : 18
 
 ~ 			return true;
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/chunk/ListedRenderChunk.edit.java b/patches/minecraft/net/minecraft/client/renderer/chunk/ListedRenderChunk.edit.java
index bcfb39e..81a3954 100644
--- a/patches/minecraft/net/minecraft/client/renderer/chunk/ListedRenderChunk.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/chunk/ListedRenderChunk.edit.java
@@ -9,30 +9,30 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
 
-> DELETE  5  @  4 : 6
+> DELETE  3  @  2 : 4
 
-> CHANGE  10 : 11  @  11 : 12
+> CHANGE  5 : 6  @  7 : 8
 
 ~ 	private final int[] baseDisplayList;
 
-> INSERT  14 : 18  @  15
+> INSERT  4 : 8  @  4
 
 + 		this.baseDisplayList = new int[EnumWorldBlockLayer.values().length];
 + 		for (int i = 0; i < this.baseDisplayList.length; ++i) {
 + 			this.baseDisplayList[i] = GLAllocation.generateDisplayLists();
 + 		}
 
-> CHANGE  21 : 22  @  18 : 19
+> CHANGE  7 : 8  @  3 : 4
 
 ~ 		return !parCompiledChunk.isLayerEmpty(layer) ? this.baseDisplayList[layer.ordinal()] : -1;
 
-> CHANGE  26 : 29  @  23 : 24
+> CHANGE  5 : 8  @  5 : 6
 
 ~ 		for (int i = 0; i < this.baseDisplayList.length; ++i) {
 ~ 			GLAllocation.deleteDisplayLists(this.baseDisplayList[i]);
 ~ 		}
 
-> INSERT  30 : 40  @  25
+> INSERT  4 : 14  @  2
 
 + 
 + 	public void rebuildChunk(float x, float y, float z, ChunkCompileTaskGenerator generator) {
diff --git a/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.edit.java b/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.edit.java
index 4297047..f22b535 100644
--- a/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.edit.java
@@ -9,7 +9,7 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
 
-> CHANGE  6 : 12  @  8 : 9
+> CHANGE  4 : 10  @  6 : 7
 
 ~ 
 ~ import com.google.common.collect.Maps;
@@ -18,47 +18,47 @@
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  16  @  13 : 16
+> DELETE  10  @  5 : 8
 
-> DELETE  18  @  18 : 22
+> DELETE  2  @  5 : 9
 
-> DELETE  21  @  25 : 26
+> DELETE  3  @  7 : 8
 
-> DELETE  34  @  39 : 41
+> DELETE  13  @  14 : 16
 
-> CHANGE  37 : 38  @  44 : 46
+> CHANGE  3 : 4  @  5 : 7
 
 ~ 	private final float[] modelviewMatrix = new float[16];
 
-> DELETE  51  @  59 : 65
+> DELETE  14  @  15 : 21
 
-> DELETE  62  @  76 : 80
+> DELETE  11  @  17 : 21
 
-> DELETE  93  @  111 : 112
+> DELETE  31  @  35 : 36
 
-> CHANGE  95 : 97  @  114 : 123
+> CHANGE  2 : 4  @  3 : 12
 
 ~ 		if (generator.getStatus() != ChunkCompileTaskGenerator.Status.COMPILING) {
 ~ 			return;
 
-> INSERT  99 : 102  @  125
+> INSERT  4 : 7  @  11
 
 + 		regionrendercache = new RegionRenderCache(this.world, blockpos.add(-1, -1, -1), blockpos1.add(1, 1, 1), 1);
 + 		generator.setCompiledChunk(compiledchunk);
 + 
 
-> CHANGE  109 : 111  @  132 : 134
+> CHANGE  10 : 12  @  7 : 9
 
 ~ 			for (BlockPos blockpos$mutableblockpos : BlockPos.getAllInBox(blockpos, blockpos1)) {
 ~ 				IBlockState iblockstate = regionrendercache.getBlockStateFaster(blockpos$mutableblockpos);
 
-> CHANGE  117 : 118  @  140 : 141
+> CHANGE  8 : 9  @  8 : 9
 
 ~ 					TileEntity tileentity = regionrendercache.getTileEntity(blockpos$mutableblockpos);
 
-> DELETE  156  @  179 : 180
+> DELETE  39  @  39 : 40
 
-> CHANGE  157 : 164  @  181 : 192
+> CHANGE  1 : 8  @  2 : 13
 
 ~ 		HashSet hashset1 = Sets.newHashSet(hashset);
 ~ 		HashSet hashset2 = Sets.newHashSet(this.field_181056_j);
@@ -68,34 +68,34 @@
 ~ 		this.field_181056_j.addAll(hashset);
 ~ 		this.renderGlobal.func_181023_a(hashset2, hashset1);
 
-> CHANGE  168 : 171  @  196 : 205
+> CHANGE  11 : 14  @  15 : 24
 
 ~ 		if (this.compileTask != null && this.compileTask.getStatus() != ChunkCompileTaskGenerator.Status.DONE) {
 ~ 			this.compileTask.finish();
 ~ 			this.compileTask = null;
 
-> DELETE  172  @  206 : 207
+> DELETE  4  @  10 : 11
 
-> DELETE  174  @  209 : 213
+> DELETE  2  @  3 : 7
 
-> DELETE  175  @  214 : 216
+> DELETE  1  @  5 : 7
 
-> CHANGE  176 : 179  @  217 : 225
+> CHANGE  1 : 4  @  3 : 11
 
 ~ 		this.finishCompileTask();
 ~ 		this.compileTask = new ChunkCompileTaskGenerator(this, ChunkCompileTaskGenerator.Type.REBUILD_CHUNK);
 ~ 		chunkcompiletaskgenerator = this.compileTask;
 
-> CHANGE  183 : 186  @  229 : 252
+> CHANGE  7 : 10  @  12 : 35
 
 ~ 		this.compileTask = new ChunkCompileTaskGenerator(this, ChunkCompileTaskGenerator.Type.RESORT_TRANSPARENCY);
 ~ 		this.compileTask.setCompiledChunk(this.compiledChunk);
 ~ 		return this.compileTask;
 
-> CHANGE  223 : 224  @  289 : 297
+> CHANGE  40 : 41  @  60 : 68
 
 ~ 		this.compiledChunk = compiledChunkIn;
 
-> DELETE  234  @  307 : 314
+> DELETE  11  @  18 : 25
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/chunk/VisGraph.edit.java b/patches/minecraft/net/minecraft/client/renderer/chunk/VisGraph.edit.java
index 7c7a500..97c8b7d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/chunk/VisGraph.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/chunk/VisGraph.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  6 : 9  @  7 : 8
+> CHANGE  4 : 7  @  5 : 6
 
 ~ 
 ~ import com.google.common.collect.Lists;
diff --git a/patches/minecraft/net/minecraft/client/renderer/culling/ClippingHelperImpl.edit.java b/patches/minecraft/net/minecraft/client/renderer/culling/ClippingHelperImpl.edit.java
index 9673445..434181a 100644
--- a/patches/minecraft/net/minecraft/client/renderer/culling/ClippingHelperImpl.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/culling/ClippingHelperImpl.edit.java
@@ -12,22 +12,22 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  7  @  4 : 6
+> DELETE  5  @  2 : 4
 
-> DELETE  11  @  10 : 13
+> DELETE  4  @  6 : 9
 
-> INSERT  14 : 15  @  16
+> INSERT  3 : 4  @  6
 
 + 		instance.destroy();
 
-> DELETE  28  @  29 : 34
+> DELETE  14  @  13 : 18
 
-> CHANGE  30 : 32  @  36 : 40
+> CHANGE  2 : 4  @  7 : 11
 
 ~ 		GlStateManager.getFloat(2983, afloat);
 ~ 		GlStateManager.getFloat(2982, afloat1);
 
-> INSERT  101 : 105  @  109
+> INSERT  71 : 75  @  73
 
 + 
 + 	public void destroy() {
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/ArmorStandRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/ArmorStandRenderer.edit.java
index f3b8c08..0fec1a6 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/ArmorStandRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/ArmorStandRenderer.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  5  @  4 : 7
+> DELETE  3  @  2 : 5
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/Render.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/Render.edit.java
index 45a8aca..72039fe 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/Render.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/Render.edit.java
@@ -12,24 +12,24 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  9  @  5 : 6
+> DELETE  7  @  3 : 4
 
-> DELETE  10  @  7 : 8
+> DELETE  1  @  2 : 3
 
-> DELETE  11  @  9 : 11
+> DELETE  1  @  2 : 4
 
-> DELETE  21  @  21 : 22
+> DELETE  10  @  12 : 13
 
-> CHANGE  82 : 84  @  83 : 85
+> CHANGE  61 : 63  @  62 : 64
 
 ~ 		EaglerTextureAtlasSprite textureatlassprite = texturemap.getAtlasSprite("minecraft:blocks/fire_layer_0");
 ~ 		EaglerTextureAtlasSprite textureatlassprite1 = texturemap.getAtlasSprite("minecraft:blocks/fire_layer_1");
 
-> CHANGE  102 : 103  @  103 : 104
+> CHANGE  20 : 21  @  20 : 21
 
 ~ 			EaglerTextureAtlasSprite textureatlassprite2 = i % 2 == 0 ? textureatlassprite : textureatlassprite1;
 
-> CHANGE  282 : 283  @  283 : 284
+> CHANGE  180 : 181  @  180 : 181
 
 ~ 			EaglercraftGPU.glNormal3f(0.0F, 1.0F, 0.0F);
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderArrow.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderArrow.edit.java
index 3072a84..7962639 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderArrow.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderArrow.edit.java
@@ -11,19 +11,19 @@
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  6  @  4 : 7
+> DELETE  4  @  2 : 5
 
-> DELETE  10  @  11 : 12
+> DELETE  4  @  7 : 8
 
-> CHANGE  51 : 52  @  53 : 54
+> CHANGE  41 : 42  @  42 : 43
 
 ~ 		EaglercraftGPU.glNormal3f(f10, 0.0F, 0.0F);
 
-> CHANGE  58 : 59  @  60 : 61
+> CHANGE  7 : 8  @  7 : 8
 
 ~ 		EaglercraftGPU.glNormal3f(-f10, 0.0F, 0.0F);
 
-> CHANGE  68 : 69  @  70 : 71
+> CHANGE  10 : 11  @  10 : 11
 
 ~ 			EaglercraftGPU.glNormal3f(0.0F, 0.0F, f10);
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderBat.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderBat.edit.java
index 49ebceb..42e703d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderBat.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderBat.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 6
+> DELETE  2  @  1 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderBiped.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderBiped.edit.java
index 49ebceb..42e703d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderBiped.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderBiped.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 6
+> DELETE  2  @  1 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderBoat.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderBoat.edit.java
index f3b8c08..0fec1a6 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderBoat.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderBoat.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  5  @  4 : 7
+> DELETE  3  @  2 : 5
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderCreeper.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderCreeper.edit.java
index 49ebceb..42e703d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderCreeper.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderCreeper.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 6
+> DELETE  2  @  1 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderDragon.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderDragon.edit.java
index df0d3ca..3505ff1 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderDragon.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderDragon.edit.java
@@ -10,8 +10,8 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  5  @  3 : 4
+> DELETE  3  @  1 : 2
 
-> DELETE  7  @  6 : 9
+> DELETE  2  @  3 : 6
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderEnderman.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderEnderman.edit.java
index 5857c31..96c68ea 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderEnderman.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderEnderman.edit.java
@@ -10,9 +10,9 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  6  @  5 : 7
+> DELETE  4  @  3 : 5
 
-> CHANGE  15 : 16  @  16 : 17
+> CHANGE  9 : 10  @  11 : 12
 
 ~ 	private EaglercraftRandom rnd = new EaglercraftRandom();
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderEntityItem.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderEntityItem.edit.java
index 64bf1ce..ea98d30 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderEntityItem.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderEntityItem.edit.java
@@ -11,13 +11,13 @@
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  6  @  5 : 8
+> DELETE  4  @  3 : 6
 
-> CHANGE  16 : 17  @  18 : 19
+> CHANGE  10 : 11  @  13 : 14
 
 ~ 	private EaglercraftRandom field_177079_e = new EaglercraftRandom();
 
-> CHANGE  45 : 47  @  47 : 49
+> CHANGE  29 : 31  @  29 : 31
 
 ~ 				float f6 = 0.0F * (float) (i - 1) * 0.5F;
 ~ 				float f4 = 0.0F * (float) (i - 1) * 0.5F;
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderFallingBlock.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderFallingBlock.edit.java
index 650f964..56e761d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderFallingBlock.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderFallingBlock.edit.java
@@ -10,8 +10,8 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  8  @  6 : 7
+> DELETE  6  @  4 : 5
 
-> DELETE  9  @  8 : 11
+> DELETE  1  @  2 : 5
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderFireball.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderFireball.edit.java
index 851f807..d751c10 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderFireball.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderFireball.edit.java
@@ -11,11 +11,11 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  6  @  3 : 4
+> DELETE  4  @  1 : 2
 
-> DELETE  7  @  5 : 9
+> DELETE  1  @  2 : 6
 
-> CHANGE  27 : 28  @  29 : 30
+> CHANGE  20 : 21  @  24 : 25
 
 ~ 		EaglerTextureAtlasSprite textureatlassprite = Minecraft.getMinecraft().getRenderItem().getItemModelMesher()
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderFish.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderFish.edit.java
index 16b90d8..6aa9145 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderFish.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderFish.edit.java
@@ -10,8 +10,8 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  5  @  3 : 4
+> DELETE  3  @  1 : 2
 
-> DELETE  6  @  5 : 8
+> DELETE  1  @  2 : 5
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderGhast.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderGhast.edit.java
index 49ebceb..42e703d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderGhast.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderGhast.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 6
+> DELETE  2  @  1 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderGiantZombie.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderGiantZombie.edit.java
index 2866203..5aa7279 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderGiantZombie.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderGiantZombie.edit.java
@@ -9,9 +9,9 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  5  @  4 : 7
+> DELETE  3  @  2 : 5
 
-> CHANGE  20 : 22  @  22 : 24
+> CHANGE  15 : 17  @  18 : 20
 
 ~ 				this.field_177189_c = new ModelZombie(0.5F, false);
 ~ 				this.field_177186_d = new ModelZombie(1.0F, false);
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderGuardian.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderGuardian.edit.java
index b137cc4..2c83355 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderGuardian.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderGuardian.edit.java
@@ -12,15 +12,15 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  7  @  3 : 5
+> DELETE  5  @  1 : 3
 
-> DELETE  8  @  6 : 7
+> DELETE  1  @  3 : 4
 
-> DELETE  9  @  8 : 10
+> DELETE  1  @  2 : 4
 
-> DELETE  15  @  16 : 17
+> DELETE  6  @  8 : 9
 
-> CHANGE  72 : 74  @  74 : 76
+> CHANGE  57 : 59  @  58 : 60
 
 ~ 			EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, 10497.0F);
 ~ 			EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, 10497.0F);
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderHorse.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderHorse.edit.java
index ec230e5..45804cf 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderHorse.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderHorse.edit.java
@@ -7,13 +7,13 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 7  @  4
+> INSERT  1 : 5  @  2
 
 + 
 + import com.google.common.collect.Maps;
 + 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  9  @  6 : 9
+> DELETE  6  @  2 : 5
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderIronGolem.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderIronGolem.edit.java
index 49ebceb..42e703d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderIronGolem.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderIronGolem.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 6
+> DELETE  2  @  1 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.edit.java
index d52eb72..b38a359 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.edit.java
@@ -11,8 +11,8 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  28  @  25 : 26
+> DELETE  24  @  21 : 22
 
-> DELETE  31  @  29 : 30
+> DELETE  3  @  4 : 5
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLeashKnot.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLeashKnot.edit.java
index 49ebceb..42e703d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLeashKnot.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLeashKnot.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 6
+> DELETE  2  @  1 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLightningBolt.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLightningBolt.edit.java
index 38ecafd..bca66ba 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLightningBolt.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLightningBolt.edit.java
@@ -12,13 +12,13 @@
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  7  @  5 : 8
+> DELETE  5  @  3 : 6
 
-> CHANGE  28 : 29  @  29 : 30
+> CHANGE  21 : 22  @  24 : 25
 
 ~ 		EaglercraftRandom random = new EaglercraftRandom(entitylightningbolt.boltVertex);
 
-> CHANGE  38 : 39  @  39 : 40
+> CHANGE  10 : 11  @  10 : 11
 
 ~ 			EaglercraftRandom random1 = new EaglercraftRandom(entitylightningbolt.boltVertex);
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLiving.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLiving.edit.java
index 7d89666..7bb4f24 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLiving.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLiving.edit.java
@@ -11,10 +11,10 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  6  @  3 : 5
+> DELETE  4  @  1 : 3
 
-> DELETE  7  @  6 : 7
+> DELETE  1  @  3 : 4
 
-> DELETE  8  @  8 : 10
+> DELETE  1  @  2 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderMagmaCube.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderMagmaCube.edit.java
index 49ebceb..42e703d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderMagmaCube.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderMagmaCube.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 6
+> DELETE  2  @  1 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.edit.java
index f0859ed..1cc4a6c 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 9  @  4
+> INSERT  1 : 7  @  2
 
 + 
 + import com.google.common.collect.Maps;
@@ -16,22 +16,22 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  25  @  20 : 22
+> DELETE  22  @  16 : 18
 
-> DELETE  27  @  24 : 25
+> DELETE  2  @  4 : 5
 
-> DELETE  28  @  26 : 80
+> DELETE  1  @  2 : 56
 
-> CHANGE  191 : 193  @  243 : 244
+> CHANGE  163 : 165  @  217 : 218
 
 ~ 		this.skinMap.put("slim", new RenderPlayer(this, true, false));
 ~ 		this.skinMap.put("zombie", new RenderPlayer(this, false, true));
 
-> CHANGE  204 : 205  @  255 : 256
+> CHANGE  13 : 14  @  12 : 13
 
 ~ 			render = this.getEntityClassRenderObject((Class) parClass1.getSuperclass());
 
-> CHANGE  211 : 212  @  262 : 263
+> CHANGE  7 : 8  @  7 : 8
 
 ~ 	public  Render getEntityRenderObject(Entity entityIn) {
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderMinecart.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderMinecart.edit.java
index e086ddc..f3b8c08 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderMinecart.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderMinecart.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  7  @  6 : 9
+> DELETE  5  @  4 : 7
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderOcelot.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderOcelot.edit.java
index 49ebceb..42e703d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderOcelot.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderOcelot.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 6
+> DELETE  2  @  1 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderPainting.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderPainting.edit.java
index e3c80b1..72b3314 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderPainting.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderPainting.edit.java
@@ -11,6 +11,6 @@
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  6  @  5 : 8
+> DELETE  4  @  3 : 6
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderPigZombie.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderPigZombie.edit.java
index 7ce3c0d..b653f27 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderPigZombie.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderPigZombie.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  3  @  3 : 5
 
-> CHANGE  17 : 19  @  19 : 21
+> CHANGE  14 : 16  @  16 : 18
 
 ~ 				this.field_177189_c = new ModelZombie(0.5F, false);
 ~ 				this.field_177186_d = new ModelZombie(1.0F, false);
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.edit.java
index f5814ec..9375854 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.edit.java
@@ -9,41 +9,41 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> INSERT  5 : 6  @  4
+> INSERT  3 : 4  @  2
 
 + import net.minecraft.client.model.ModelBiped;
 
-> CHANGE  7 : 8  @  5 : 8
+> CHANGE  2 : 3  @  1 : 4
 
 ~ import net.minecraft.client.model.ModelZombie;
 
-> INSERT  24 : 25  @  24
+> INSERT  17 : 18  @  19
 
 + 	private boolean zombieModel;
 
-> CHANGE  27 : 28  @  26 : 27
+> CHANGE  3 : 4  @  2 : 3
 
 ~ 		this(renderManager, false, false);
 
-> CHANGE  30 : 32  @  29 : 31
+> CHANGE  3 : 5  @  3 : 5
 
 ~ 	public RenderPlayer(RenderManager renderManager, boolean useSmallArms, boolean zombieModel) {
 ~ 		super(renderManager, zombieModel ? new ModelZombie(0.0F, true) : new ModelPlayer(0.0F, useSmallArms), 0.5F);
 
-> INSERT  33 : 34  @  32
+> INSERT  3 : 4  @  3
 
 + 		this.zombieModel = zombieModel;
 
-> CHANGE  42 : 44  @  40 : 42
+> CHANGE  9 : 11  @  8 : 10
 
 ~ 	public ModelBiped getMainModel() {
 ~ 		return (ModelBiped) super.getMainModel();
 
-> CHANGE  60 : 61  @  58 : 59
+> CHANGE  18 : 19  @  18 : 19
 
 ~ 		ModelBiped modelplayer = this.getMainModel();
 
-> CHANGE  69 : 77  @  67 : 72
+> CHANGE  9 : 17  @  9 : 14
 
 ~ 			if (!zombieModel) {
 ~ 				ModelPlayer modelplayer_ = (ModelPlayer) modelplayer;
@@ -54,7 +54,7 @@
 ~ 				modelplayer_.bipedRightArmwear.showModel = clientPlayer.isWearing(EnumPlayerModelParts.RIGHT_SLEEVE);
 ~ 			}
 
-> CHANGE  127 : 137  @  122 : 130
+> CHANGE  58 : 68  @  55 : 63
 
 ~ 		if (!zombieModel) {
 ~ 			float f = 1.0F;
@@ -67,7 +67,7 @@
 ~ 			((ModelPlayer) modelplayer).renderRightArm();
 ~ 		}
 
-> CHANGE  140 : 150  @  133 : 141
+> CHANGE  13 : 23  @  11 : 19
 
 ~ 		if (!zombieModel) {
 ~ 			float f = 1.0F;
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSkeleton.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSkeleton.edit.java
index 49ebceb..42e703d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSkeleton.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSkeleton.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 6
+> DELETE  2  @  1 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSlime.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSlime.edit.java
index 49ebceb..42e703d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSlime.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSlime.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 6
+> DELETE  2  @  1 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSnowball.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSnowball.edit.java
index 58aaaa0..0e94dd3 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSnowball.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSnowball.edit.java
@@ -9,6 +9,6 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  4 : 7
+> DELETE  2  @  2 : 5
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSquid.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSquid.edit.java
index 49ebceb..42e703d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSquid.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSquid.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 6
+> DELETE  2  @  1 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderTNTPrimed.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderTNTPrimed.edit.java
index f3b8c08..0fec1a6 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderTNTPrimed.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderTNTPrimed.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  5  @  4 : 7
+> DELETE  3  @  2 : 5
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderTntMinecart.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderTntMinecart.edit.java
index ef0d172..49ebceb 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderTntMinecart.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderTntMinecart.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  6  @  5 : 8
+> DELETE  4  @  3 : 6
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderVillager.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderVillager.edit.java
index 49ebceb..42e703d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderVillager.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderVillager.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 6
+> DELETE  2  @  1 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderWitch.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderWitch.edit.java
index 49ebceb..42e703d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderWitch.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderWitch.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 6
+> DELETE  2  @  1 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderWither.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderWither.edit.java
index 49ebceb..42e703d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderWither.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderWither.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 6
+> DELETE  2  @  1 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderWolf.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderWolf.edit.java
index 49ebceb..42e703d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderWolf.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderWolf.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 6
+> DELETE  2  @  1 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderXPOrb.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderXPOrb.edit.java
index e3c80b1..72b3314 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderXPOrb.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderXPOrb.edit.java
@@ -11,6 +11,6 @@
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  6  @  5 : 8
+> DELETE  4  @  3 : 6
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderZombie.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderZombie.edit.java
index a8c8300..f49c6f2 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderZombie.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderZombie.edit.java
@@ -7,15 +7,15 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.collect.Lists;
 + 
 
-> DELETE  9  @  7 : 9
+> DELETE  6  @  3 : 5
 
-> CHANGE  34 : 36  @  34 : 36
+> CHANGE  25 : 27  @  27 : 29
 
 ~ 				this.field_177189_c = new ModelZombie(0.5F, false);
 ~ 				this.field_177186_d = new ModelZombie(1.0F, false);
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.edit.java
index 5720a26..d11d76e 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.edit.java
@@ -9,7 +9,7 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
 
-> INSERT  4 : 13  @  5
+> INSERT  2 : 11  @  3
 
 + 
 + import com.google.common.collect.Lists;
@@ -21,17 +21,17 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  18  @  10 : 12
+> DELETE  14  @  5 : 7
 
-> DELETE  19  @  13 : 16
+> DELETE  1  @  3 : 6
 
-> DELETE  29  @  26 : 29
+> DELETE  10  @  13 : 16
 
-> CHANGE  45 : 46  @  45 : 46
+> CHANGE  16 : 17  @  19 : 20
 
 ~ 		return this.layerRenderers.add((LayerRenderer) layer);
 
-> CHANGE  240 : 247  @  240 : 296
+> CHANGE  195 : 202  @  195 : 251
 
 ~ 			GlStateManager.enableShaderBlendAdd();
 ~ 			float f1 = 1.0F - (float) (i >> 24 & 255) / 255.0F;
@@ -41,11 +41,11 @@
 ~ 			GlStateManager.setShaderBlendSrc(f1, f1, f1, 1.0F);
 ~ 			GlStateManager.setShaderBlendAdd(f2 * f1 + 0.4F, f3 * f1, f4 * f1, 0.0f);
 
-> CHANGE  252 : 253  @  301 : 338
+> CHANGE  12 : 13  @  61 : 98
 
 ~ 		GlStateManager.disableShaderBlendAdd();
 
-> CHANGE  326 : 327  @  411 : 412
+> CHANGE  74 : 75  @  110 : 111
 
 ~ 					EaglercraftGPU.glNormal3f(0.0F, 1.0F, 0.0F);
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.edit.java
index c2936a6..34ea310 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 8  @  4
+> INSERT  1 : 6  @  2
 
 + 
 + import com.google.common.collect.Maps;
@@ -15,23 +15,23 @@
 + import net.lax1dude.eaglercraft.v1_8.HString;
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  9  @  5 : 6
+> DELETE  6  @  1 : 2
 
-> DELETE  10  @  7 : 8
+> DELETE  1  @  2 : 3
 
-> CHANGE  57 : 58  @  55 : 56
+> CHANGE  47 : 48  @  48 : 49
 
 ~ 			this.func_177179_a((T) modelbase, parInt1);
 
-> CHANGE  77 : 78  @  75 : 76
+> CHANGE  20 : 21  @  20 : 21
 
 ~ 					this.func_177183_a(entitylivingbaseIn, (T) modelbase, armorSlot, parFloat2, parFloat3, parFloat4,
 
-> CHANGE  136 : 137  @  134 : 135
+> CHANGE  59 : 60  @  59 : 60
 
 ~ 		String s = HString.format("textures/models/armor/%s_layer_%d%s.png",
 
-> CHANGE  138 : 139  @  136 : 137
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 						parString1 == null ? "" : HString.format("_%s", new Object[] { parString1 }) });
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArrow.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArrow.edit.java
index af91309..5f98a42 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArrow.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArrow.edit.java
@@ -11,11 +11,11 @@
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  7  @  5 : 6
+> DELETE  5  @  3 : 4
 
-> DELETE  9  @  8 : 9
+> DELETE  2  @  3 : 4
 
-> CHANGE  26 : 27  @  26 : 27
+> CHANGE  17 : 18  @  18 : 19
 
 ~ 			EaglercraftRandom random = new EaglercraftRandom((long) entitylivingbase.getEntityId());
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCape.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCape.edit.java
index aa90635..8d8f336 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCape.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCape.edit.java
@@ -9,18 +9,18 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> CHANGE  4 : 5  @  3 : 4
+> CHANGE  2 : 3  @  1 : 2
 
 ~ import net.minecraft.client.model.ModelPlayer;
 
-> DELETE  6  @  5 : 6
+> DELETE  2  @  2 : 3
 
-> CHANGE  20 : 22  @  20 : 21
+> CHANGE  14 : 16  @  15 : 16
 
 ~ 				&& abstractclientplayer.getLocationCape() != null
 ~ 				&& this.playerRenderer.getMainModel() instanceof ModelPlayer) {
 
-> CHANGE  64 : 65  @  63 : 64
+> CHANGE  44 : 45  @  43 : 44
 
 ~ 			((ModelPlayer) this.playerRenderer.getMainModel()).renderCape(0.0625F);
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCreeperCharge.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCreeperCharge.edit.java
index 27cd162..3f8fbda 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCreeperCharge.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCreeperCharge.edit.java
@@ -9,8 +9,8 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 4
+> DELETE  2  @  1 : 2
 
-> DELETE  5  @  5 : 6
+> DELETE  1  @  2 : 3
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCustomHead.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCustomHead.edit.java
index 7020e6d..efa94ac 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCustomHead.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCustomHead.edit.java
@@ -12,11 +12,11 @@
 ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  8  @  6 : 7
+> DELETE  6  @  4 : 5
 
-> DELETE  9  @  8 : 9
+> DELETE  1  @  2 : 3
 
-> CHANGE  78 : 79  @  78 : 79
+> CHANGE  69 : 70  @  70 : 71
 
 ~ 							gameprofile = TileEntitySkull.updateGameprofile(new GameProfile((EaglercraftUUID) null, s));
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerDeadmau5Head.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerDeadmau5Head.edit.java
index 628614e..e885110 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerDeadmau5Head.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerDeadmau5Head.edit.java
@@ -9,17 +9,17 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> CHANGE  4 : 5  @  3 : 4
+> CHANGE  2 : 3  @  1 : 2
 
 ~ import net.minecraft.client.model.ModelPlayer;
 
-> DELETE  6  @  5 : 6
+> DELETE  2  @  2 : 3
 
-> CHANGE  17 : 18  @  17 : 18
+> CHANGE  11 : 12  @  12 : 13
 
 ~ 				&& !abstractclientplayer.isInvisible() && this.playerRenderer.getMainModel() instanceof ModelPlayer) {
 
-> CHANGE  37 : 38  @  37 : 38
+> CHANGE  20 : 21  @  20 : 21
 
 ~ 				((ModelPlayer) this.playerRenderer.getMainModel()).renderDeadmau5Head(0.0625F);
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonDeath.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonDeath.edit.java
index 26e1b4d..7d0d3c8 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonDeath.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonDeath.edit.java
@@ -12,9 +12,9 @@
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  8  @  6 : 8
+> DELETE  6  @  4 : 6
 
-> CHANGE  24 : 25  @  24 : 25
+> CHANGE  16 : 17  @  18 : 19
 
 ~ 			EaglercraftRandom random = new EaglercraftRandom(432L);
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonEyes.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonEyes.edit.java
index 7f6db67..f7f5eb7 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonEyes.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonEyes.edit.java
@@ -10,6 +10,6 @@
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
 
-> DELETE  5  @  5 : 6
+> DELETE  3  @  3 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEndermanEyes.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEndermanEyes.edit.java
index 7f6db67..f7f5eb7 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEndermanEyes.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEndermanEyes.edit.java
@@ -10,6 +10,6 @@
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
 
-> DELETE  5  @  5 : 6
+> DELETE  3  @  3 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldBlock.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldBlock.edit.java
index 94c615e..2abc02a 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldBlock.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldBlock.edit.java
@@ -10,8 +10,8 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
 
-> DELETE  8  @  6 : 8
+> DELETE  6  @  4 : 6
 
-> DELETE  9  @  9 : 10
+> DELETE  1  @  3 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItem.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItem.edit.java
index 323913c..43b007d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItem.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItem.edit.java
@@ -9,8 +9,8 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  6  @  5 : 6
+> DELETE  4  @  3 : 4
 
-> DELETE  8  @  8 : 9
+> DELETE  2  @  3 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItemWitch.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItemWitch.edit.java
index 323913c..43b007d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItemWitch.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItemWitch.edit.java
@@ -9,8 +9,8 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  6  @  5 : 6
+> DELETE  4  @  3 : 4
 
-> DELETE  8  @  8 : 9
+> DELETE  2  @  3 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.edit.java
index c0b443d..155464d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.edit.java
@@ -10,8 +10,8 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
 
-> DELETE  7  @  5 : 7
+> DELETE  5  @  3 : 5
 
-> DELETE  8  @  8 : 9
+> DELETE  1  @  3 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerMooshroomMushroom.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerMooshroomMushroom.edit.java
index 51a6afb..50f3e4e 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerMooshroomMushroom.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerMooshroomMushroom.edit.java
@@ -9,8 +9,8 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  6  @  5 : 6
+> DELETE  4  @  3 : 4
 
-> DELETE  7  @  7 : 8
+> DELETE  1  @  2 : 3
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSheepWool.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSheepWool.edit.java
index 27cd162..3f8fbda 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSheepWool.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSheepWool.edit.java
@@ -9,8 +9,8 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 4
+> DELETE  2  @  1 : 2
 
-> DELETE  5  @  5 : 6
+> DELETE  1  @  2 : 3
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSlimeGel.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSlimeGel.edit.java
index 3f0c81e..95e548e 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSlimeGel.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSlimeGel.edit.java
@@ -9,12 +9,12 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  5  @  4 : 5
+> DELETE  3  @  2 : 3
 
-> DELETE  6  @  6 : 7
+> DELETE  1  @  2 : 3
 
-> DELETE  20  @  21 : 22
+> DELETE  14  @  15 : 16
 
-> DELETE  25  @  27 : 28
+> DELETE  5  @  6 : 7
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSnowmanHead.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSnowmanHead.edit.java
index c5a9a60..426ef1b 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSnowmanHead.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSnowmanHead.edit.java
@@ -9,8 +9,8 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 4
+> DELETE  2  @  1 : 2
 
-> DELETE  6  @  6 : 7
+> DELETE  2  @  3 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSpiderEyes.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSpiderEyes.edit.java
index 7f6db67..f7f5eb7 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSpiderEyes.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSpiderEyes.edit.java
@@ -10,6 +10,6 @@
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
 
-> DELETE  5  @  5 : 6
+> DELETE  3  @  3 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerWitherAura.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerWitherAura.edit.java
index 27cd162..3f8fbda 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerWitherAura.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerWitherAura.edit.java
@@ -9,8 +9,8 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 4
+> DELETE  2  @  1 : 2
 
-> DELETE  5  @  5 : 6
+> DELETE  1  @  2 : 3
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerWolfCollar.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerWolfCollar.edit.java
index 599647f..e696635 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerWolfCollar.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerWolfCollar.edit.java
@@ -9,6 +9,6 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  4 : 5
+> DELETE  2  @  2 : 3
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/AbstractTexture.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/AbstractTexture.edit.java
index f68beb4..5804d75 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/AbstractTexture.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/AbstractTexture.edit.java
@@ -9,12 +9,12 @@
 
 ~ import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
 
-> INSERT  4 : 6  @  6
+> INSERT  2 : 4  @  4
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
 + 
 
-> CHANGE  14 : 26  @  14 : 25
+> CHANGE  10 : 22  @  8 : 19
 
 ~ 		if (blur != parFlag || mipmap != parFlag2) {
 ~ 			this.blur = parFlag;
@@ -29,7 +29,7 @@
 ~ 				short1 = 9728;
 ~ 			}
 
-> CHANGE  27 : 30  @  26 : 28
+> CHANGE  13 : 16  @  12 : 14
 
 ~ 			EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, i);
 ~ 			EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, short1);
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/DynamicTexture.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/DynamicTexture.edit.java
index 98abd07..2c672ed 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/DynamicTexture.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/DynamicTexture.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 5  @  4 : 6
+> CHANGE  1 : 3  @  2 : 4
 
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
 
-> CHANGE  12 : 15  @  13 : 17
+> CHANGE  9 : 12  @  9 : 13
 
 ~ 	public DynamicTexture(ImageData bufferedImage) {
 ~ 		this(bufferedImage.width, bufferedImage.height);
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.edit.java
index 495f6fe..630665b 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.edit.java
@@ -7,34 +7,34 @@
 
 > DELETE  2  @  2 : 5
 
-> INSERT  5 : 9  @  8
+> INSERT  3 : 7  @  6
 
 + 
 + import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 + import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 + import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
 
-> DELETE  10  @  9 : 11
+> DELETE  5  @  1 : 3
 
-> DELETE  14  @  15 : 17
+> DELETE  4  @  6 : 8
 
-> CHANGE  31 : 32  @  34 : 35
+> CHANGE  17 : 18  @  19 : 20
 
 ~ 		ImageData bufferedimage;
 
-> CHANGE  33 : 34  @  36 : 37
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 			ImageData bufferedimage1 = TextureUtil
 
-> DELETE  35  @  38 : 42
+> DELETE  2  @  2 : 6
 
-> CHANGE  36 : 39  @  43 : 46
+> CHANGE  1 : 4  @  5 : 8
 
 ~ 			bufferedimage = new ImageData(bufferedimage1.width, bufferedimage1.height, false);
 ~ 			bufferedimage.drawLayer(bufferedimage1, 0, 0, bufferedimage1.width, bufferedimage1.height, 0, 0,
 ~ 					bufferedimage1.width, bufferedimage1.height);
 
-> CHANGE  45 : 50  @  52 : 59
+> CHANGE  9 : 14  @  9 : 16
 
 ~ 					ImageData bufferedimage2 = TextureUtil.readBufferedImage(inputstream);
 ~ 					if (bufferedimage2.width == bufferedimage.width && bufferedimage2.height == bufferedimage.height) {
@@ -42,14 +42,14 @@
 ~ 							for (int l = 0; l < bufferedimage2.width; ++l) {
 ~ 								int i1 = bufferedimage2.pixels[k * bufferedimage2.width + l];
 
-> CHANGE  52 : 56  @  61 : 64
+> CHANGE  7 : 11  @  9 : 12
 
 ~ 									int k1 = bufferedimage1.pixels[k * bufferedimage1.width + l];
 ~ 									int l1 = MathHelper.func_180188_d(k1, ImageData.swapRB(mapcolor.colorValue))
 ~ 											& 16777215;
 ~ 									bufferedimage2.pixels[k * bufferedimage2.width + l] = j1 | l1;
 
-> CHANGE  60 : 62  @  68 : 69
+> CHANGE  8 : 10  @  7 : 8
 
 ~ 						bufferedimage.drawLayer(bufferedimage2, 0, 0, bufferedimage2.width, bufferedimage2.height, 0, 0,
 ~ 								bufferedimage2.width, bufferedimage2.height);
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/LayeredTexture.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/LayeredTexture.edit.java
index f16b77a..ccc7863 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/LayeredTexture.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/LayeredTexture.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 5
 
-> CHANGE  5 : 11  @  8 : 10
+> CHANGE  3 : 9  @  6 : 8
 
 ~ 
 ~ import com.google.common.collect.Lists;
@@ -16,21 +16,21 @@
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
 
-> DELETE  13  @  12 : 14
+> DELETE  8  @  4 : 6
 
-> CHANGE  24 : 25  @  25 : 26
+> CHANGE  11 : 12  @  13 : 14
 
 ~ 		ImageData bufferedimage = null;
 
-> CHANGE  30 : 31  @  31 : 32
+> CHANGE  6 : 7  @  6 : 7
 
 ~ 					ImageData bufferedimage1 = TextureUtil.readBufferedImage(inputstream);
 
-> CHANGE  32 : 33  @  33 : 34
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 						bufferedimage = new ImageData(bufferedimage1.width, bufferedimage1.height, true);
 
-> CHANGE  35 : 37  @  36 : 37
+> CHANGE  3 : 5  @  3 : 4
 
 ~ 					bufferedimage.drawLayer(bufferedimage1, 0, 0, bufferedimage1.width, bufferedimage1.height, 0, 0,
 ~ 							bufferedimage1.width, bufferedimage1.height);
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/SimpleTexture.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/SimpleTexture.edit.java
index c3ae816..511ed47 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/SimpleTexture.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/SimpleTexture.edit.java
@@ -7,16 +7,16 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  4 : 8  @  5 : 7
+> CHANGE  2 : 6  @  3 : 5
 
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
 
-> DELETE  12  @  11 : 13
+> DELETE  8  @  6 : 8
 
-> CHANGE  28 : 29  @  29 : 30
+> CHANGE  16 : 17  @  18 : 19
 
 ~ 			ImageData bufferedimage = TextureUtil.readBufferedImage(inputstream);
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.edit.java
index ab1b84c..c143352 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 4
 
-> INSERT  6 : 13  @  8
+> INSERT  4 : 11  @  6
 
 + 
 + import net.lax1dude.eaglercraft.v1_8.HString;
@@ -17,37 +17,37 @@
 + import com.google.common.collect.Sets;
 + 
 
-> DELETE  14  @  9 : 10
+> DELETE  8  @  1 : 2
 
-> CHANGE  43 : 44  @  39 : 40
+> CHANGE  29 : 30  @  30 : 31
 
 ~ 	public void addSprite(EaglerTextureAtlasSprite parTextureAtlasSprite) {
 
-> CHANGE  59 : 60  @  55 : 56
+> CHANGE  16 : 17  @  16 : 17
 
 ~ 				String s = HString.format("Unable to fit: %s - size: %dx%d - Maybe try a lowerresolution resourcepack?",
 
-> CHANGE  74 : 75  @  70 : 71
+> CHANGE  15 : 16  @  15 : 16
 
 ~ 	public List getStichSlots() {
 
-> CHANGE  83 : 84  @  79 : 80
+> CHANGE  9 : 10  @  9 : 10
 
 ~ 		for (Stitcher.Slot stitcher$slot1 : (List) arraylist) {
 
-> CHANGE  85 : 86  @  81 : 82
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 			EaglerTextureAtlasSprite textureatlassprite = stitcher$holder.getAtlasSprite();
 
-> CHANGE  176 : 177  @  172 : 173
+> CHANGE  91 : 92  @  91 : 92
 
 ~ 		private final EaglerTextureAtlasSprite theTexture;
 
-> CHANGE  183 : 184  @  179 : 180
+> CHANGE  7 : 8  @  7 : 8
 
 ~ 		public Holder(EaglerTextureAtlasSprite parTextureAtlasSprite, int parInt1) {
 
-> CHANGE  192 : 193  @  188 : 189
+> CHANGE  9 : 10  @  9 : 10
 
 ~ 		public EaglerTextureAtlasSprite getAtlasSprite() {
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureClock.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/TextureClock.edit.java
index 5aaf9ab..980df9b 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureClock.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureClock.edit.java
@@ -9,18 +9,18 @@
 
 + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
 
-> DELETE  4  @  3 : 5
+> DELETE  2  @  1 : 3
 
-> CHANGE  6 : 7  @  7 : 8
+> CHANGE  2 : 3  @  4 : 5
 
 ~ public class TextureClock extends EaglerTextureAtlasSprite {
 
-> CHANGE  48 : 50  @  49 : 51
+> CHANGE  42 : 44  @  42 : 44
 
 ~ 				animationCache.copyFrameLevelsToTex2D(this.frameCounter, this.originX, this.originY, this.width,
 ~ 						this.height);
 
-> INSERT  54 : 55  @  55
+> INSERT  6 : 7  @  6
 
 + 
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureCompass.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/TextureCompass.edit.java
index 3d859eb..38d7f36 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureCompass.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureCompass.edit.java
@@ -9,18 +9,18 @@
 
 + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
 
-> DELETE  4  @  3 : 5
+> DELETE  2  @  1 : 3
 
-> CHANGE  8 : 9  @  9 : 10
+> CHANGE  4 : 5  @  6 : 7
 
 ~ public class TextureCompass extends EaglerTextureAtlasSprite {
 
-> CHANGE  71 : 73  @  72 : 74
+> CHANGE  63 : 65  @  63 : 65
 
 ~ 				animationCache.copyFrameLevelsToTex2D(this.frameCounter, this.originX, this.originY, this.width,
 ~ 						this.height);
 
-> INSERT  77 : 78  @  78
+> INSERT  6 : 7  @  6
 
 + 
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureManager.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/TextureManager.edit.java
index dc09b14..93958a1 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureManager.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureManager.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 4
 
-> CHANGE  7 : 14  @  9 : 15
+> CHANGE  5 : 12  @  7 : 13
 
 ~ 
 ~ import com.google.common.collect.Lists;
@@ -17,9 +17,9 @@
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
-> DELETE  20  @  21 : 23
+> DELETE  13  @  12 : 14
 
-> CHANGE  33 : 41  @  36 : 41
+> CHANGE  13 : 21  @  15 : 20
 
 ~ 		if (resource.cachedPointer != null) {
 ~ 			TextureUtil.bindTexture(((ITextureObject) resource.cachedPointer).getGlTextureId()); // unsafe, lol
@@ -30,29 +30,29 @@
 ~ 				this.loadTexture(resource, (ITextureObject) object);
 ~ 			}
 
-> CHANGE  42 : 45  @  42 : 43
+> CHANGE  9 : 12  @  6 : 7
 
 ~ 			resource.cachedPointer = object;
 ~ 			TextureUtil.bindTexture(((ITextureObject) object).getGlTextureId());
 ~ 		}
 
-> CHANGE  56 : 57  @  54 : 55
+> CHANGE  14 : 15  @  12 : 13
 
 ~ 	public boolean loadTexture(ResourceLocation textureLocation, ITextureObject textureObj) {
 
-> INSERT  70 : 71  @  68
+> INSERT  14 : 15  @  14
 
 + 			final ITextureObject textureObj2 = textureObj;
 
-> CHANGE  73 : 74  @  70 : 71
+> CHANGE  3 : 4  @  2 : 3
 
 ~ 					return textureObj2.getClass().getName();
 
-> INSERT  79 : 80  @  76
+> INSERT  6 : 7  @  6
 
 + 		textureLocation.cachedPointer = textureObj;
 
-> CHANGE  85 : 90  @  81 : 82
+> CHANGE  6 : 11  @  5 : 6
 
 ~ 		if (textureLocation.cachedPointer != null) {
 ~ 			return (ITextureObject) textureLocation.cachedPointer;
@@ -60,14 +60,14 @@
 ~ 			return (ITextureObject) (textureLocation.cachedPointer = this.mapTextureObjects.get(textureLocation));
 ~ 		}
 
-> CHANGE  102 : 103  @  94 : 95
+> CHANGE  17 : 18  @  13 : 14
 
 ~ 				HString.format("dynamic/%s_%d", new Object[] { name, integer }));
 
-> CHANGE  115 : 116  @  107 : 108
+> CHANGE  13 : 14  @  13 : 14
 
 ~ 		ITextureObject itextureobject = this.mapTextureObjects.remove(textureLocation);
 
-> DELETE  119  @  111 : 112
+> DELETE  4  @  4 : 5
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.edit.java
index cd6a1ba..15dbc21 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.edit.java
@@ -7,11 +7,11 @@
 
 > DELETE  2  @  2 : 5
 
-> INSERT  3 : 4  @  6
+> INSERT  1 : 2  @  4
 
 + import java.util.Collection;
 
-> INSERT  10 : 19  @  12
+> INSERT  7 : 16  @  6
 
 + 
 + import com.google.common.collect.Lists;
@@ -23,90 +23,90 @@
 + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
 + import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
 
-> DELETE  21  @  14 : 20
+> DELETE  11  @  2 : 8
 
-> DELETE  30  @  29 : 31
+> DELETE  9  @  15 : 17
 
-> CHANGE  35 : 38  @  36 : 39
+> CHANGE  5 : 8  @  7 : 10
 
 ~ 	private final List listAnimatedSprites;
 ~ 	private final Map mapRegisteredSprites;
 ~ 	private final Map mapUploadedSprites;
 
-> CHANGE  41 : 44  @  42 : 43
+> CHANGE  6 : 9  @  6 : 7
 
 ~ 	private final EaglerTextureAtlasSprite missingImage;
 ~ 	private int width;
 ~ 	private int height;
 
-> CHANGE  53 : 54  @  52 : 53
+> CHANGE  12 : 13  @  10 : 11
 
 ~ 		this.missingImage = new EaglerTextureAtlasSprite("missingno");
 
-> DELETE  71  @  70 : 71
+> DELETE  18  @  18 : 19
 
-> INSERT  74 : 75  @  74
+> INSERT  3 : 4  @  4
 
 + 		destroyAnimationCaches();
 
-> CHANGE  91 : 92  @  90 : 91
+> CHANGE  17 : 18  @  16 : 17
 
 ~ 			EaglerTextureAtlasSprite textureatlassprite = (EaglerTextureAtlasSprite) entry.getValue();
 
-> CHANGE  97 : 98  @  96 : 97
+> CHANGE  6 : 7  @  6 : 7
 
 ~ 				ImageData[] abufferedimage = new ImageData[1 + this.mipmapLevels];
 
-> CHANGE  104 : 106  @  103 : 105
+> CHANGE  7 : 9  @  7 : 9
 
 ~ 						int l = abufferedimage[0].width;
 ~ 						int i1 = abufferedimage[0].height;
 
-> CHANGE  124 : 126  @  123 : 124
+> CHANGE  20 : 22  @  20 : 21
 
 ~ 										new Object[] { Integer.valueOf(i2), resourcelocation2 });
 ~ 								logger.error(ioexception);
 
-> CHANGE  135 : 137  @  133 : 134
+> CHANGE  11 : 13  @  10 : 11
 
 ~ 				logger.error("Unable to parse metadata from " + resourcelocation1);
 ~ 				logger.error(runtimeexception);
 
-> CHANGE  139 : 141  @  136 : 137
+> CHANGE  4 : 6  @  3 : 4
 
 ~ 				logger.error("Using missing texture, unable to load " + resourcelocation1);
 ~ 				logger.error(ioexception1);
 
-> CHANGE  167 : 168  @  163 : 164
+> CHANGE  28 : 29  @  27 : 28
 
 ~ 		for (final EaglerTextureAtlasSprite textureatlassprite1 : this.mapRegisteredSprites.values()) {
 
-> CHANGE  208 : 212  @  204 : 205
+> CHANGE  41 : 45  @  41 : 42
 
 ~ 		width = stitcher.getCurrentWidth();
 ~ 		height = stitcher.getCurrentHeight();
 ~ 
 ~ 		for (EaglerTextureAtlasSprite textureatlassprite2 : stitcher.getStichSlots()) {
 
-> CHANGE  233 : 234  @  226 : 227
+> CHANGE  25 : 26  @  22 : 23
 
 ~ 		for (EaglerTextureAtlasSprite textureatlassprite3 : (Collection) hashmap.values()) {
 
-> CHANGE  242 : 244  @  235 : 237
+> CHANGE  9 : 11  @  9 : 11
 
 ~ 						HString.format("%s/%s%s", new Object[] { this.basePath, location.getResourcePath(), ".png" }))
 ~ 				: new ResourceLocation(location.getResourceDomain(), HString.format("%s/mipmaps/%s.%d%s",
 
-> CHANGE  247 : 249  @  240 : 242
+> CHANGE  5 : 7  @  5 : 7
 
 ~ 	public EaglerTextureAtlasSprite getAtlasSprite(String iconName) {
 ~ 		EaglerTextureAtlasSprite textureatlassprite = (EaglerTextureAtlasSprite) this.mapUploadedSprites.get(iconName);
 
-> CHANGE  259 : 260  @  252 : 253
+> CHANGE  12 : 13  @  12 : 13
 
 ~ 		for (EaglerTextureAtlasSprite textureatlassprite : this.listAnimatedSprites) {
 
-> CHANGE  265 : 272  @  258 : 259
+> CHANGE  6 : 13  @  6 : 7
 
 ~ 	private void destroyAnimationCaches() {
 ~ 		for (EaglerTextureAtlasSprite textureatlassprite : this.listAnimatedSprites) {
@@ -116,20 +116,20 @@
 ~ 
 ~ 	public EaglerTextureAtlasSprite registerSprite(ResourceLocation location) {
 
-> CHANGE  275 : 277  @  262 : 263
+> CHANGE  10 : 12  @  4 : 5
 
 ~ 			EaglerTextureAtlasSprite textureatlassprite = (EaglerTextureAtlasSprite) this.mapRegisteredSprites
 ~ 					.get(location);
 
-> CHANGE  278 : 279  @  264 : 265
+> CHANGE  3 : 4  @  2 : 3
 
 ~ 				textureatlassprite = EaglerTextureAtlasSprite.makeAtlasSprite(location);
 
-> CHANGE  294 : 295  @  280 : 281
+> CHANGE  16 : 17  @  16 : 17
 
 ~ 	public EaglerTextureAtlasSprite getMissingSprite() {
 
-> INSERT  297 : 306  @  283
+> INSERT  3 : 12  @  3
 
 + 
 + 	public int getWidth() {
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureUtil.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/TextureUtil.edit.java
index 5dbf57e..88cd34c 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureUtil.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureUtil.edit.java
@@ -10,7 +10,7 @@
 ~ import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
 ~ 
 
-> CHANGE  6 : 14  @  5 : 7
+> CHANGE  4 : 12  @  3 : 5
 
 ~ import net.lax1dude.eaglercraft.v1_8.internal.buffer.IntBuffer;
 ~ 
@@ -21,93 +21,93 @@
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
 
-> DELETE  16  @  9 : 11
+> DELETE  10  @  4 : 6
 
-> DELETE  18  @  13 : 17
+> DELETE  2  @  4 : 8
 
-> CHANGE  34 : 35  @  33 : 34
+> CHANGE  16 : 17  @  20 : 21
 
 ~ 	public static int uploadTextureImage(int parInt1, ImageData parBufferedImage) {
 
-> CHANGE  155 : 157  @  154 : 155
+> CHANGE  121 : 123  @  121 : 122
 
 ~ 			EaglercraftGPU.glTexSubImage2D(GL_TEXTURE_2D, parInt1, parInt4, parInt5 + k, parInt2, l, GL_RGBA,
 ~ 					GL_UNSIGNED_BYTE, dataBuffer);
 
-> CHANGE  161 : 162  @  159 : 160
+> CHANGE  6 : 7  @  5 : 6
 
 ~ 	public static int uploadTextureImageAllocate(int parInt1, ImageData parBufferedImage, boolean parFlag,
 
-> CHANGE  163 : 164  @  161 : 162
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 		allocateTexture(parInt1, parBufferedImage.width, parBufferedImage.height);
 
-> CHANGE  172 : 173  @  170 : 171
+> CHANGE  9 : 10  @  9 : 10
 
 ~ 		// deleteTexture(parInt1); //TODO: why
 
-> CHANGE  175 : 179  @  173 : 177
+> CHANGE  3 : 7  @  3 : 7
 
 ~ 			EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, '\u813d', parInt2);
 ~ 			EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, '\u813a', 0.0F);
 ~ 			EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, '\u813b', (float) parInt2);
 ~ 			// EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, '\u8501', 0.0F);
 
-> CHANGE  182 : 184  @  180 : 181
+> CHANGE  7 : 9  @  7 : 8
 
 ~ 			EaglercraftGPU.glTexImage2D(GL_TEXTURE_2D, i, GL_RGBA, parInt3 >> i, parInt4 >> i, 0, GL_RGBA,
 ~ 					GL_UNSIGNED_BYTE, (IntBuffer) null);
 
-> CHANGE  188 : 189  @  185 : 186
+> CHANGE  6 : 7  @  5 : 6
 
 ~ 	public static int uploadTextureImageSub(int textureId, ImageData parBufferedImage, int parInt2, int parInt3,
 
-> CHANGE  195 : 199  @  192 : 196
+> CHANGE  7 : 11  @  7 : 11
 
 ~ 	private static void uploadTextureImageSubImpl(ImageData parBufferedImage, int parInt1, int parInt2, boolean parFlag,
 ~ 			boolean parFlag2) {
 ~ 		int i = parBufferedImage.width;
 ~ 		int j = parBufferedImage.height;
 
-> CHANGE  210 : 212  @  207 : 208
+> CHANGE  15 : 17  @  15 : 16
 
 ~ 			EaglercraftGPU.glTexSubImage2D(GL_TEXTURE_2D, 0, parInt1, parInt2 + i1, i, j1, GL_RGBA, GL_UNSIGNED_BYTE,
 ~ 					dataBuffer);
 
-> CHANGE  218 : 220  @  214 : 216
+> CHANGE  8 : 10  @  7 : 9
 
 ~ 			EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 ~ 			EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
-> CHANGE  221 : 223  @  217 : 219
+> CHANGE  3 : 5  @  3 : 5
 
 ~ 			EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
 ~ 			EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
 
-> CHANGE  233 : 235  @  229 : 231
+> CHANGE  12 : 14  @  12 : 14
 
 ~ 			EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, parFlag2 ? 9987 : 9729);
 ~ 			EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
-> CHANGE  236 : 238  @  232 : 234
+> CHANGE  3 : 5  @  3 : 5
 
 ~ 			EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, parFlag2 ? 9986 : 9728);
 ~ 			EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 
-> CHANGE  263 : 264  @  259 : 265
+> CHANGE  27 : 28  @  27 : 33
 
 ~ 		return readBufferedImage(resourceManager.getResource(imageLocation).getInputStream()).pixels;
 
-> CHANGE  266 : 268  @  267 : 269
+> CHANGE  3 : 5  @  8 : 10
 
 ~ 	public static ImageData readBufferedImage(InputStream imageStream) throws IOException {
 ~ 		ImageData bufferedimage;
 
-> CHANGE  269 : 270  @  270 : 271
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 			bufferedimage = ImageData.loadImageFile(imageStream);
 
-> INSERT  310 : 318  @  311
+> INSERT  41 : 49  @  41
 
 + 	public static int[] convertComponentOrder(int[] arr) {
 + 		for (int i = 0; i < arr.length; ++i) {
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderEnderCrystal.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderEnderCrystal.edit.java
index f84fcd9..7f1dded 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderEnderCrystal.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderEnderCrystal.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  5  @  4 : 5
+> DELETE  3  @  2 : 3
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderItemFrame.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderItemFrame.edit.java
index 69a4b85..ecc2e81 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderItemFrame.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderItemFrame.edit.java
@@ -12,35 +12,35 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  9  @  5 : 6
+> DELETE  7  @  3 : 4
 
-> DELETE  11  @  8 : 9
+> DELETE  2  @  3 : 4
 
-> DELETE  15  @  13 : 14
+> DELETE  4  @  5 : 6
 
-> DELETE  31  @  30 : 31
+> DELETE  16  @  17 : 18
 
-> INSERT  67 : 69  @  67
+> INSERT  36 : 38  @  37
 
 + 		GlStateManager.enableLighting();
 + 		GlStateManager.enableColorMaterial();
 
-> INSERT  76 : 78  @  74
+> INSERT  9 : 11  @  7
 
 + 		GlStateManager.enableLighting();
 + 		GlStateManager.enableColorMaterial();
 
-> DELETE  111  @  107 : 128
+> DELETE  35  @  33 : 54
 
-> CHANGE  116 : 117  @  133 : 134
+> CHANGE  5 : 6  @  26 : 27
 
 ~ 				GlStateManager.pushLightCoords();
 
-> CHANGE  120 : 121  @  137 : 141
+> CHANGE  4 : 5  @  4 : 8
 
 ~ 				GlStateManager.popLightCoords();
 
-> CHANGE  142 : 143  @  162 : 163
+> CHANGE  22 : 23  @  25 : 26
 
 ~ 					EaglercraftGPU.glNormal3f(0.0F, 1.0F, 0.0F);
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderWitherSkull.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderWitherSkull.edit.java
index 35c39b8..8d67b35 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderWitherSkull.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderWitherSkull.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 4
+> DELETE  2  @  1 : 2
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.edit.java
index a15be46..60b03aa 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 4
 
-> INSERT  6 : 11  @  8
+> INSERT  4 : 9  @  6
 
 + 
 + import com.google.common.collect.Lists;
@@ -15,11 +15,11 @@
 + 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  13  @  10 : 11
+> DELETE  7  @  2 : 3
 
-> DELETE  14  @  12 : 13
+> DELETE  1  @  2 : 3
 
-> CHANGE  109 : 110  @  108 : 109
+> CHANGE  95 : 96  @  96 : 97
 
 ~ 				for (TileEntityBanner.EnumBannerPattern tileentitybanner$enumbannerpattern : (List) list1) {
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer.edit.java
index 4007436..57d16f7 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer.edit.java
@@ -12,11 +12,11 @@
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  8  @  5 : 7
+> DELETE  5  @  2 : 4
 
-> DELETE  12  @  11 : 12
+> DELETE  4  @  6 : 7
 
-> CHANGE  31 : 33  @  31 : 33
+> CHANGE  19 : 21  @  20 : 22
 
 ~ 				EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, 10497.0F);
 ~ 				EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, 10497.0F);
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.edit.java
index a9e36da..ab8fabc 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.edit.java
@@ -10,22 +10,22 @@
 + 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  9  @  7 : 9
+> DELETE  6  @  4 : 6
 
-> INSERT  58 : 59  @  58
+> INSERT  49 : 50  @  51
 
 + 				isChristams = true;
 
-> DELETE  66  @  65 : 67
+> DELETE  8  @  7 : 9
 
-> INSERT  68 : 70  @  69
+> INSERT  2 : 4  @  4
 
 + 				} else if (tileentitychest.getChestType() == 1) {
 + 					this.bindTexture(textureTrapped);
 
-> DELETE  82  @  81 : 83
+> DELETE  14  @  12 : 14
 
-> INSERT  84 : 86  @  85
+> INSERT  2 : 4  @  4
 
 + 				} else if (tileentitychest.getChestType() == 1) {
 + 					this.bindTexture(textureTrappedDouble);
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.edit.java
index 23934c6..060e994 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 5
+> DELETE  2  @  1 : 3
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEndPortalRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEndPortalRenderer.edit.java
index 9158631..69897e4 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEndPortalRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEndPortalRenderer.edit.java
@@ -13,23 +13,23 @@
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  10  @  7 : 8
+> DELETE  8  @  5 : 6
 
-> DELETE  11  @  9 : 11
+> DELETE  1  @  2 : 4
 
-> CHANGE  18 : 19  @  18 : 19
+> CHANGE  7 : 8  @  9 : 10
 
 ~ 	private static final EaglercraftRandom field_147527_e = new EaglercraftRandom(31100L);
 
-> CHANGE  53 : 54  @  53 : 54
+> CHANGE  35 : 36  @  35 : 36
 
 ~ 			float f7 = (float) (-(d1 + (double) f3 - 1.25));
 
-> CHANGE  67 : 68  @  67 : 71
+> CHANGE  14 : 15  @  14 : 18
 
 ~ 			GlStateManager.enableTexGen();
 
-> CHANGE  102 : 103  @  105 : 109
+> CHANGE  35 : 36  @  38 : 42
 
 ~ 		GlStateManager.disableTexGen();
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.edit.java
index 23934c6..060e994 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 5
+> DELETE  2  @  1 : 3
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityItemStackRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityItemStackRenderer.edit.java
index 2c6ffdb..526f424 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityItemStackRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityItemStackRenderer.edit.java
@@ -12,9 +12,9 @@
 ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  7  @  5 : 8
+> DELETE  5  @  3 : 6
 
-> CHANGE  38 : 39  @  39 : 40
+> CHANGE  31 : 32  @  34 : 35
 
 ~ 					gameprofile = new GameProfile((EaglercraftUUID) null, nbttagcompound.getString("SkullOwner"));
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer.edit.java
index 23934c6..060e994 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer.edit.java
@@ -9,6 +9,6 @@
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  4  @  3 : 5
+> DELETE  2  @  1 : 3
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityPistonRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityPistonRenderer.edit.java
index 8e76321..c7169a2 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityPistonRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityPistonRenderer.edit.java
@@ -10,10 +10,10 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 
-> DELETE  11  @  9 : 10
+> DELETE  9  @  7 : 8
 
-> DELETE  13  @  12 : 13
+> DELETE  2  @  3 : 4
 
-> DELETE  14  @  14 : 15
+> DELETE  1  @  2 : 3
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.edit.java
index 845a257..d0fe3c4 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 8  @  4
+> INSERT  1 : 6  @  2
 
 + 
 + import com.google.common.collect.Maps;
@@ -15,11 +15,11 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
 
-> DELETE  9  @  5 : 7
+> DELETE  6  @  1 : 3
 
-> DELETE  10  @  8 : 19
+> DELETE  1  @  3 : 14
 
-> CHANGE  68 : 70  @  77 : 78
+> CHANGE  58 : 60  @  69 : 70
 
 ~ 			tileentityspecialrenderer = this
 ~ 					.getSpecialRendererByClass((Class) teClass.getSuperclass());
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.edit.java
index 46a316a..8b9acae 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.edit.java
@@ -11,11 +11,11 @@
 + import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  10  @  7 : 9
+> DELETE  7  @  4 : 6
 
-> DELETE  14  @  13 : 14
+> DELETE  4  @  6 : 7
 
-> CHANGE  69 : 70  @  69 : 70
+> CHANGE  55 : 56  @  56 : 57
 
 ~ 		EaglercraftGPU.glNormal3f(0.0F, 0.0F, -1.0F * f3);
 
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySkullRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySkullRenderer.edit.java
index ccc7053..070d55e 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySkullRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySkullRenderer.edit.java
@@ -10,19 +10,19 @@
 ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> CHANGE  7 : 8  @  10 : 13
+> CHANGE  5 : 6  @  8 : 11
 
 ~ import net.minecraft.client.network.NetHandlerPlayClient;
 
-> DELETE  10  @  15 : 16
+> DELETE  3  @  5 : 6
 
-> CHANGE  65 : 69  @  71 : 80
+> CHANGE  55 : 59  @  56 : 65
 
 ~ 				if (parGameProfile != null && parGameProfile.getId() != null) {
 ~ 					NetHandlerPlayClient netHandler = Minecraft.getMinecraft().getNetHandler();
 ~ 					if (netHandler != null) {
 ~ 						resourcelocation = netHandler.getSkinCache().getSkin(parGameProfile).getResourceLocation();
 
-> DELETE  71  @  82 : 83
+> DELETE  6  @  11 : 12
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/vertex/DefaultVertexFormats.edit.java b/patches/minecraft/net/minecraft/client/renderer/vertex/DefaultVertexFormats.edit.java
index f7b3463..7cbfbee 100644
--- a/patches/minecraft/net/minecraft/client/renderer/vertex/DefaultVertexFormats.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/vertex/DefaultVertexFormats.edit.java
@@ -9,7 +9,7 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.VertexFormat;
 
-> CHANGE  5 : 17  @  6 : 74
+> CHANGE  3 : 15  @  4 : 72
 
 ~ 	public static final VertexFormat BLOCK = VertexFormat.BLOCK;
 ~ 	public static final VertexFormat ITEM = VertexFormat.ITEM;
diff --git a/patches/minecraft/net/minecraft/client/resources/AbstractResourcePack.edit.java b/patches/minecraft/net/minecraft/client/resources/AbstractResourcePack.edit.java
index 1930df7..83e0d65 100644
--- a/patches/minecraft/net/minecraft/client/resources/AbstractResourcePack.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/AbstractResourcePack.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 9
 
-> CHANGE  4 : 15  @  11 : 12
+> CHANGE  2 : 13  @  9 : 10
 
 ~ import java.nio.charset.StandardCharsets;
 ~ 
@@ -21,25 +21,25 @@
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
 
-> DELETE  16  @  13 : 14
+> DELETE  12  @  2 : 3
 
-> DELETE  19  @  17 : 20
+> DELETE  3  @  4 : 7
 
-> CHANGE  22 : 23  @  23 : 24
+> CHANGE  3 : 4  @  6 : 7
 
 ~ 	protected final String resourcePackFile;
 
-> CHANGE  24 : 25  @  25 : 26
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 	public AbstractResourcePack(String resourcePackFileIn) {
 
-> CHANGE  29 : 30  @  30 : 31
+> CHANGE  5 : 6  @  5 : 6
 
 ~ 		return HString.format("%s/%s/%s",
 
-> DELETE  33  @  34 : 38
+> DELETE  4  @  4 : 8
 
-> CHANGE  52 : 60  @  57 : 58
+> CHANGE  19 : 27  @  23 : 24
 
 ~ 		try {
 ~ 			return readMetadata(parIMetadataSerializer, this.getInputStreamByName("pack.mcmeta"), parString1);
@@ -50,25 +50,25 @@
 ~ 			throw e;
 ~ 		}
 
-> CHANGE  64 : 65  @  62 : 64
+> CHANGE  12 : 13  @  5 : 7
 
 ~ 		JSONObject jsonobject = null;
 
-> CHANGE  67 : 70  @  66 : 70
+> CHANGE  3 : 6  @  4 : 8
 
 ~ 			jsonobject = new JSONObject(IOUtils.inputStreamToString(parInputStream, StandardCharsets.UTF_8));
 ~ 		} catch (RuntimeException | IOException runtimeexception) {
 ~ 			throw new JSONException(runtimeexception);
 
-> CHANGE  71 : 72  @  71 : 72
+> CHANGE  4 : 5  @  5 : 6
 
 ~ 			IOUtils.closeQuietly(parInputStream);
 
-> CHANGE  77 : 78  @  77 : 78
+> CHANGE  6 : 7  @  6 : 7
 
 ~ 	public ImageData getPackImage() throws IOException {
 
-> CHANGE  82 : 83  @  82 : 83
+> CHANGE  5 : 6  @  5 : 6
 
 ~ 		return this.resourcePackFile;
 
diff --git a/patches/minecraft/net/minecraft/client/resources/DefaultPlayerSkin.edit.java b/patches/minecraft/net/minecraft/client/resources/DefaultPlayerSkin.edit.java
index bbf4ff6..49d3d8b 100644
--- a/patches/minecraft/net/minecraft/client/resources/DefaultPlayerSkin.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/DefaultPlayerSkin.edit.java
@@ -10,15 +10,15 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 ~ 
 
-> CHANGE  14 : 15  @  13 : 14
+> CHANGE  12 : 13  @  11 : 12
 
 ~ 	public static ResourceLocation getDefaultSkin(EaglercraftUUID playerUUID) {
 
-> CHANGE  18 : 19  @  17 : 18
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public static String getSkinType(EaglercraftUUID playerUUID) {
 
-> CHANGE  22 : 23  @  21 : 22
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	private static boolean isSlimSkin(EaglercraftUUID playerUUID) {
 
diff --git a/patches/minecraft/net/minecraft/client/resources/DefaultResourcePack.edit.java b/patches/minecraft/net/minecraft/client/resources/DefaultResourcePack.edit.java
index 11a8ce3..9c12a9a 100644
--- a/patches/minecraft/net/minecraft/client/resources/DefaultResourcePack.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/DefaultResourcePack.edit.java
@@ -7,9 +7,9 @@
 
 > DELETE  2  @  2 : 6
 
-> DELETE  5  @  9 : 10
+> DELETE  3  @  7 : 8
 
-> INSERT  6 : 11  @  11
+> INSERT  1 : 6  @  2
 
 + 
 + import com.google.common.collect.ImmutableSet;
@@ -17,35 +17,35 @@
 + import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 + import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
 
-> DELETE  12  @  12 : 14
+> DELETE  6  @  1 : 3
 
-> CHANGE  17 : 18  @  19 : 21
+> CHANGE  5 : 6  @  7 : 9
 
 ~ 	public static final Set defaultResourceDomains = ImmutableSet.of("minecraft", "eagler");
 
-> DELETE  19  @  22 : 26
+> DELETE  2  @  3 : 7
 
-> CHANGE  34 : 35  @  41 : 43
+> CHANGE  15 : 16  @  19 : 21
 
 ~ 		return null;
 
-> CHANGE  38 : 40  @  46 : 48
+> CHANGE  4 : 6  @  5 : 7
 
 ~ 		return EagRuntime
 ~ 				.getResourceStream("/assets/" + location.getResourceDomain() + "/" + location.getResourcePath());
 
-> CHANGE  43 : 44  @  51 : 53
+> CHANGE  5 : 6  @  5 : 7
 
 ~ 		return this.getResourceStream(resourcelocation) != null;
 
-> CHANGE  53 : 55  @  62 : 64
+> CHANGE  10 : 12  @  11 : 13
 
 ~ 			return AbstractResourcePack.readMetadata(parIMetadataSerializer,
 ~ 					EagRuntime.getResourceStream("pack.mcmeta"), parString1);
 
-> DELETE  57  @  66 : 68
+> DELETE  4  @  4 : 6
 
-> CHANGE  60 : 62  @  71 : 74
+> CHANGE  3 : 5  @  5 : 8
 
 ~ 	public ImageData getPackImage() throws IOException {
 ~ 		return TextureUtil.readBufferedImage(EagRuntime.getResourceStream("pack.png"));
diff --git a/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.edit.java b/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.edit.java
index 9cba5cc..09ff017 100644
--- a/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.edit.java
@@ -7,9 +7,9 @@
 
 > DELETE  2  @  2 : 4
 
-> DELETE  5  @  7 : 8
+> DELETE  3  @  5 : 6
 
-> CHANGE  8 : 13  @  11 : 15
+> CHANGE  3 : 8  @  4 : 8
 
 ~ 
 ~ import com.google.common.collect.Lists;
@@ -17,12 +17,12 @@
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
-> DELETE  15  @  17 : 19
+> DELETE  7  @  6 : 8
 
-> CHANGE  58 : 59  @  62 : 67
+> CHANGE  43 : 44  @  45 : 50
 
 ~ 		return resourcePack.getInputStream(location);
 
-> DELETE  86  @  94 : 125
+> DELETE  28  @  32 : 63
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/resources/FoliageColorReloadListener.edit.java b/patches/minecraft/net/minecraft/client/resources/FoliageColorReloadListener.edit.java
index 246f0c4..aaa99f5 100644
--- a/patches/minecraft/net/minecraft/client/resources/FoliageColorReloadListener.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/FoliageColorReloadListener.edit.java
@@ -9,9 +9,9 @@
 
 + 
 
-> DELETE  5  @  4 : 6
+> DELETE  2  @  1 : 3
 
-> CHANGE  13 : 15  @  14 : 15
+> CHANGE  8 : 10  @  10 : 11
 
 ~ 			ColorizerFoliage.setFoliageBiomeColorizer(
 ~ 					TextureUtil.convertComponentOrder(TextureUtil.readImageData(iresourcemanager, LOC_FOLIAGE_PNG)));
diff --git a/patches/minecraft/net/minecraft/client/resources/GrassColorReloadListener.edit.java b/patches/minecraft/net/minecraft/client/resources/GrassColorReloadListener.edit.java
index ea58d29..7e44877 100644
--- a/patches/minecraft/net/minecraft/client/resources/GrassColorReloadListener.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/GrassColorReloadListener.edit.java
@@ -9,9 +9,9 @@
 
 + 
 
-> DELETE  5  @  4 : 6
+> DELETE  2  @  1 : 3
 
-> CHANGE  13 : 15  @  14 : 15
+> CHANGE  8 : 10  @  10 : 11
 
 ~ 			ColorizerGrass.setGrassBiomeColorizer(
 ~ 					TextureUtil.convertComponentOrder(TextureUtil.readImageData(iresourcemanager, LOC_GRASS_PNG)));
diff --git a/patches/minecraft/net/minecraft/client/resources/IResourcePack.edit.java b/patches/minecraft/net/minecraft/client/resources/IResourcePack.edit.java
index d1ac688..3b653ae 100644
--- a/patches/minecraft/net/minecraft/client/resources/IResourcePack.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/IResourcePack.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  5 : 7  @  6
+> INSERT  3 : 5  @  4
 
 + 
 + import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
 
-> CHANGE  20 : 21  @  19 : 20
+> CHANGE  15 : 16  @  13 : 14
 
 ~ 	ImageData getPackImage() throws IOException;
 
diff --git a/patches/minecraft/net/minecraft/client/resources/Language.edit.java b/patches/minecraft/net/minecraft/client/resources/Language.edit.java
index 3d1f770..cc1c99d 100644
--- a/patches/minecraft/net/minecraft/client/resources/Language.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/Language.edit.java
@@ -10,7 +10,7 @@
 + import net.lax1dude.eaglercraft.v1_8.HString;
 + 
 
-> CHANGE  26 : 27  @  24 : 25
+> CHANGE  24 : 25  @  22 : 23
 
 ~ 		return HString.format("%s (%s)", new Object[] { this.name, this.region });
 
diff --git a/patches/minecraft/net/minecraft/client/resources/LanguageManager.edit.java b/patches/minecraft/net/minecraft/client/resources/LanguageManager.edit.java
index 9a137a6..c0c3e1c 100644
--- a/patches/minecraft/net/minecraft/client/resources/LanguageManager.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/LanguageManager.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 5
 
-> CHANGE  7 : 14  @  10 : 16
+> CHANGE  5 : 12  @  8 : 14
 
 ~ 
 ~ import com.google.common.collect.Lists;
@@ -17,6 +17,6 @@
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
-> DELETE  17  @  19 : 21
+> DELETE  10  @  9 : 11
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/resources/Locale.edit.java b/patches/minecraft/net/minecraft/client/resources/Locale.edit.java
index 555588b..8df9f52 100644
--- a/patches/minecraft/net/minecraft/client/resources/Locale.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/Locale.edit.java
@@ -7,15 +7,15 @@
 
 > DELETE  2  @  2 : 5
 
-> INSERT  4 : 5  @  7
+> INSERT  2 : 3  @  5
 
 + import java.util.HashSet;
 
-> INSERT  8 : 9  @  10
+> INSERT  4 : 5  @  3
 
 + import java.util.Set;
 
-> CHANGE  10 : 19  @  11 : 13
+> CHANGE  2 : 11  @  1 : 3
 
 ~ 
 ~ import com.google.common.base.Charsets;
@@ -27,18 +27,18 @@
 ~ import net.lax1dude.eaglercraft.v1_8.HString;
 ~ import net.lax1dude.eaglercraft.v1_8.IOUtils;
 
-> DELETE  20  @  14 : 16
+> DELETE  10  @  3 : 5
 
-> INSERT  27 : 29  @  23
+> INSERT  7 : 9  @  9
 
 + 	private static final Set hasShownMissing = new HashSet();
 + 
 
-> CHANGE  33 : 34  @  27 : 28
+> CHANGE  6 : 7  @  4 : 5
 
 ~ 			String s1 = HString.format("lang/%s.lang", new Object[] { s });
 
-> CHANGE  37 : 45  @  31 : 32
+> CHANGE  4 : 12  @  4 : 5
 
 ~ 					List res = resourceManager.getAllResources(new ResourceLocation(s2, s1));
 ~ 					if (res.size() > 0) {
@@ -49,24 +49,24 @@
 ~ 						}
 ~ 					}
 
-> CHANGE  46 : 49  @  33 : 34
+> CHANGE  9 : 12  @  2 : 3
 
 ~ 					if (s2.equalsIgnoreCase("minecraft") && hasShownMissing.add(s)) {
 ~ 						EagRuntime.showPopup("ERROR: language \"" + s + "\" is not available on this site!");
 ~ 					}
 
-> CHANGE  99 : 101  @  84 : 85
+> CHANGE  53 : 55  @  51 : 52
 
 ~ 					String s2 = pattern.matcher(astring[1]).replaceAll("%s"); // TODO: originally "%$1s" but must be
 ~ 																				// "%s" to work with TeaVM (why?)
 
-> INSERT  102 : 105  @  86
+> INSERT  3 : 6  @  2
 
 + 					if (s1.startsWith("eaglercraft.")) {
 + 						this.properties.put(s1.substring(12), s2);
 + 					}
 
-> CHANGE  120 : 121  @  101 : 102
+> CHANGE  18 : 19  @  15 : 16
 
 ~ 			return HString.format(s, parameters);
 
diff --git a/patches/minecraft/net/minecraft/client/resources/ResourceIndex.edit.java b/patches/minecraft/net/minecraft/client/resources/ResourceIndex.edit.java
index c358698..2fb614a 100644
--- a/patches/minecraft/net/minecraft/client/resources/ResourceIndex.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/ResourceIndex.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 18
 
-> CHANGE  3 : 5  @  19 : 21
+> CHANGE  1 : 3  @  17 : 19
 
 ~ 	// private static final Logger logger = LogManager.getLogger();
 ~ 	// private final Map resourceMap = Maps.newHashMap();
 
-> CHANGE  6 : 30  @  22 : 27
+> CHANGE  3 : 27  @  3 : 8
 
 ~ 	// public ResourceIndex(File parFile, String parString1) {
 ~ 	/*
@@ -39,7 +39,7 @@
 ~ 	 */
 ~ 	// }
 
-> CHANGE  31 : 34  @  28 : 57
+> CHANGE  25 : 28  @  6 : 35
 
 ~ 	// public Map getResourceMap() {
 ~ 	// return this.resourceMap;
diff --git a/patches/minecraft/net/minecraft/client/resources/ResourcePackFileNotFoundException.edit.java b/patches/minecraft/net/minecraft/client/resources/ResourcePackFileNotFoundException.edit.java
index f8baeb4..5fbba6a 100644
--- a/patches/minecraft/net/minecraft/client/resources/ResourcePackFileNotFoundException.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/ResourcePackFileNotFoundException.edit.java
@@ -10,7 +10,7 @@
 + import net.lax1dude.eaglercraft.v1_8.HString;
 + 
 
-> CHANGE  9 : 10  @  7 : 8
+> CHANGE  4 : 5  @  2 : 3
 
 ~ 		super(HString.format("\'%s\' in ResourcePack \'%s\'", new Object[] { parString1, parFile }));
 
diff --git a/patches/minecraft/net/minecraft/client/resources/ResourcePackListEntry.edit.java b/patches/minecraft/net/minecraft/client/resources/ResourcePackListEntry.edit.java
index 83dc8ad..51fb3e2 100644
--- a/patches/minecraft/net/minecraft/client/resources/ResourcePackListEntry.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/ResourcePackListEntry.edit.java
@@ -13,9 +13,9 @@
 + import net.lax1dude.eaglercraft.v1_8.internal.KeyboardConstants;
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 
-> DELETE  14  @  9 : 11
+> DELETE  11  @  6 : 8
 
-> INSERT  142 : 171  @  139
+> INSERT  128 : 157  @  130
 
 + 	private void proceedWithBs(int l, boolean deleteInstead) {
 + 		if (!deleteInstead && l != 1) {
@@ -47,24 +47,24 @@
 + 	}
 + 
 
-> CHANGE  176 : 180  @  144 : 148
+> CHANGE  34 : 38  @  5 : 9
 
 ~ 				if (Keyboard.isKeyDown(KeyboardConstants.KEY_LSHIFT)
 ~ 						|| Keyboard.isKeyDown(KeyboardConstants.KEY_RSHIFT)) {
 ~ 					proceedWithBs(l, false);
 ~ 				} else {
 
-> CHANGE  182 : 183  @  150 : 158
+> CHANGE  6 : 7  @  6 : 14
 
 ~ 							proceedWithBs(l, flag);
 
-> CHANGE  185 : 189  @  160 : 164
+> CHANGE  3 : 7  @  10 : 14
 
 ~ 					}, I18n.format("resourcePack.prompt.title", this.func_148312_b()),
 ~ 							I18n.format("resourcePack.prompt.text", new Object[0]),
 ~ 							I18n.format("resourcePack.prompt.delete", new Object[0]),
 ~ 							I18n.format("resourcePack.prompt.add", new Object[0]), 0).withOpaqueBackground());
 
-> DELETE  190  @  165 : 166
+> DELETE  5  @  5 : 6
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/resources/ResourcePackListEntryDefault.edit.java b/patches/minecraft/net/minecraft/client/resources/ResourcePackListEntryDefault.edit.java
index 2585010..6c6b047 100644
--- a/patches/minecraft/net/minecraft/client/resources/ResourcePackListEntryDefault.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/ResourcePackListEntryDefault.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 8  @  4
+> INSERT  1 : 6  @  2
 
 + 
 + import org.json.JSONException;
@@ -15,11 +15,11 @@
 + import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 + import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
-> DELETE  11  @  7 : 9
+> DELETE  8  @  3 : 5
 
-> DELETE  14  @  12 : 14
+> DELETE  3  @  5 : 7
 
-> CHANGE  46 : 47  @  46 : 47
+> CHANGE  32 : 33  @  34 : 35
 
 ~ 		} catch (JSONException jsonparseexception) {
 
diff --git a/patches/minecraft/net/minecraft/client/resources/ResourcePackRepository.edit.java b/patches/minecraft/net/minecraft/client/resources/ResourcePackRepository.edit.java
index 8c48f49..af04e9b 100644
--- a/patches/minecraft/net/minecraft/client/resources/ResourcePackRepository.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/ResourcePackRepository.edit.java
@@ -7,11 +7,11 @@
 
 > DELETE  2  @  2 : 11
 
-> DELETE  3  @  12 : 14
+> DELETE  1  @  10 : 12
 
-> DELETE  4  @  15 : 18
+> DELETE  1  @  3 : 6
 
-> CHANGE  6 : 18  @  20 : 22
+> CHANGE  2 : 14  @  5 : 7
 
 ~ import java.util.function.Consumer;
 ~ 
@@ -26,73 +26,73 @@
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 ~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
 
-> DELETE  19  @  23 : 24
+> DELETE  13  @  3 : 4
 
-> DELETE  21  @  26 : 29
+> DELETE  2  @  3 : 6
 
-> DELETE  25  @  33 : 34
+> DELETE  4  @  7 : 8
 
-> DELETE  26  @  35 : 42
+> DELETE  1  @  2 : 9
 
-> DELETE  29  @  45 : 53
+> DELETE  3  @  10 : 18
 
-> DELETE  30  @  54 : 55
+> DELETE  1  @  9 : 10
 
-> DELETE  32  @  57 : 58
+> DELETE  2  @  3 : 4
 
-> CHANGE  36 : 37  @  62 : 64
+> CHANGE  4 : 5  @  5 : 7
 
 ~ 	public ResourcePackRepository(IResourcePack rprDefaultResourcePackIn, IMetadataSerializer rprMetadataSerializerIn,
 
-> DELETE  38  @  65 : 67
+> DELETE  2  @  3 : 5
 
-> DELETE  40  @  69 : 70
+> DELETE  2  @  4 : 5
 
-> DELETE  63  @  93 : 111
+> DELETE  23  @  24 : 42
 
-> CHANGE  64 : 66  @  112 : 113
+> CHANGE  1 : 3  @  19 : 20
 
 ~ 		if (SYS.VFS == null)
 ~ 			return;
 
-> CHANGE  67 : 70  @  114 : 115
+> CHANGE  3 : 6  @  2 : 3
 
 ~ 		List list = Lists.newArrayList();
 ~ 
 ~ 		for (String file1 : SYS.getResourcePackNames()) {
 
-> INSERT  71 : 72  @  116
+> INSERT  4 : 5  @  2
 
 + 
 
-> CHANGE  75 : 76  @  119 : 120
+> CHANGE  4 : 5  @  3 : 4
 
 ~ 					list.add(resourcepackrepository$entry);
 
-> CHANGE  77 : 81  @  121 : 122
+> CHANGE  2 : 6  @  2 : 3
 
 ~ 					logger.error("Failed to call \"updateResourcePack\" for resource pack \"{}\"",
 ~ 							resourcepackrepository$entry.resourcePackFile);
 ~ 					logger.error(var6);
 ~ 					list.remove(resourcepackrepository$entry);
 
-> INSERT  84 : 85  @  125
+> INSERT  7 : 8  @  4
 
 + 
 
-> CHANGE  86 : 87  @  126 : 127
+> CHANGE  2 : 3  @  1 : 2
 
 ~ 					list.add(this.repositoryEntriesAll.get(i));
 
-> CHANGE  91 : 92  @  131 : 132
+> CHANGE  5 : 6  @  5 : 6
 
 ~ 		this.repositoryEntriesAll.removeAll(list);
 
-> CHANGE  97 : 98  @  137 : 138
+> CHANGE  6 : 7  @  6 : 7
 
 ~ 		this.repositoryEntriesAll = list;
 
-> CHANGE  113 : 120  @  153 : 185
+> CHANGE  16 : 23  @  16 : 48
 
 ~ 	public void downloadResourcePack(String s1, String s2, Consumer cb) {
 ~ 		SYS.loadRemoteResourcePack(s1, s2, res -> {
@@ -102,7 +102,7 @@
 ~ 				cb.accept(true);
 ~ 				return;
 
-> CHANGE  121 : 128  @  186 : 214
+> CHANGE  8 : 15  @  33 : 61
 
 ~ 			cb.accept(false);
 ~ 		}, runnable -> {
@@ -112,55 +112,55 @@
 ~ 					"Server resource pack");
 ~ 		});
 
-> DELETE  130  @  216 : 236
+> DELETE  9  @  30 : 50
 
-> CHANGE  135 : 138  @  241 : 255
+> CHANGE  5 : 8  @  25 : 39
 
 ~ 		if (this.resourcePackInstance != null) {
 ~ 			this.resourcePackInstance = null;
 ~ 			Minecraft.getMinecraft().scheduleResourcesRefresh();
 
-> DELETE  139  @  256 : 257
+> DELETE  4  @  15 : 16
 
-> CHANGE  142 : 143  @  260 : 261
+> CHANGE  3 : 4  @  4 : 5
 
 ~ 		private final String resourcePackFile;
 
-> CHANGE  145 : 146  @  263 : 264
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 		private ImageData texturePackIcon;
 
-> INSERT  147 : 148  @  265
+> INSERT  2 : 3  @  2
 
 + 		private TextureManager iconTextureManager;
 
-> CHANGE  149 : 150  @  266 : 267
+> CHANGE  2 : 3  @  1 : 2
 
 ~ 		private Entry(String resourcePackFileIn) {
 
-> CHANGE  154 : 157  @  271 : 274
+> CHANGE  5 : 8  @  5 : 8
 
 ~ 			if (SYS.VFS == null)
 ~ 				return;
 ~ 			this.reResourcePack = (IResourcePack) new FolderResourcePack(this.resourcePackFile, "resourcepacks/");
 
-> CHANGE  163 : 165  @  280 : 281
+> CHANGE  9 : 11  @  9 : 10
 
 ~ 				logger.error("Failed to load resource pack icon for \"{}\"!", resourcePackFile);
 ~ 				logger.error(var2);
 
-> INSERT  176 : 177  @  292
+> INSERT  13 : 14  @  12
 
 + 				this.iconTextureManager = textureManagerIn;
 
-> INSERT  185 : 189  @  300
+> INSERT  9 : 13  @  8
 
 + 			if (this.locationTexturePackIcon != null) {
 + 				this.iconTextureManager.deleteTexture(this.locationTexturePackIcon);
 + 				this.locationTexturePackIcon = null;
 + 			}
 
-> CHANGE  224 : 225  @  335 : 339
+> CHANGE  39 : 40  @  35 : 39
 
 ~ 			return this.resourcePackFile;
 
diff --git a/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.edit.java b/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.edit.java
index d47c309..696856b 100644
--- a/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.edit.java
@@ -14,12 +14,12 @@
 + import java.util.Set;
 + 
 
-> CHANGE  14 : 17  @  8 : 19
+> CHANGE  12 : 15  @  6 : 17
 
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
-> DELETE  19  @  21 : 23
+> DELETE  5  @  13 : 15
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/resources/SimpleResource.edit.java b/patches/minecraft/net/minecraft/client/resources/SimpleResource.edit.java
index ae15f9a..0da7f3f 100644
--- a/patches/minecraft/net/minecraft/client/resources/SimpleResource.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/SimpleResource.edit.java
@@ -9,11 +9,11 @@
 
 ~ import java.io.IOException;
 
-> CHANGE  4 : 5  @  7 : 8
+> CHANGE  2 : 3  @  5 : 6
 
 ~ import java.nio.charset.StandardCharsets;
 
-> CHANGE  6 : 13  @  9 : 10
+> CHANGE  2 : 9  @  2 : 3
 
 ~ 
 ~ import org.json.JSONException;
@@ -23,22 +23,22 @@
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.IOUtils;
 
-> DELETE  16  @  13 : 14
+> DELETE  10  @  4 : 5
 
-> CHANGE  25 : 26  @  23 : 24
+> CHANGE  9 : 10  @  10 : 11
 
 ~ 	private JSONObject mcmetaJson;
 
-> DELETE  55  @  53 : 54
+> DELETE  30  @  30 : 31
 
-> CHANGE  57 : 61  @  56 : 58
+> CHANGE  2 : 6  @  3 : 5
 
 ~ 					this.mcmetaJson = new JSONObject(
 ~ 							IOUtils.inputStreamToString(this.mcmetaInputStream, StandardCharsets.UTF_8));
 ~ 				} catch (IOException e) {
 ~ 					throw new JSONException(e);
 
-> CHANGE  62 : 63  @  59 : 60
+> CHANGE  5 : 6  @  3 : 4
 
 ~ 					IOUtils.closeQuietly(this.mcmetaInputStream);
 
diff --git a/patches/minecraft/net/minecraft/client/resources/data/AnimationMetadataSection.edit.java b/patches/minecraft/net/minecraft/client/resources/data/AnimationMetadataSection.edit.java
index 73e05ad..19d88e1 100644
--- a/patches/minecraft/net/minecraft/client/resources/data/AnimationMetadataSection.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/data/AnimationMetadataSection.edit.java
@@ -7,9 +7,9 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  5  @  6 : 8
+> DELETE  3  @  4 : 6
 
-> INSERT  6 : 8  @  9
+> INSERT  1 : 3  @  3
 
 + import com.google.common.collect.Sets;
 + 
diff --git a/patches/minecraft/net/minecraft/client/resources/data/AnimationMetadataSectionSerializer.edit.java b/patches/minecraft/net/minecraft/client/resources/data/AnimationMetadataSectionSerializer.edit.java
index 85d604f..3c3223b 100644
--- a/patches/minecraft/net/minecraft/client/resources/data/AnimationMetadataSectionSerializer.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/data/AnimationMetadataSectionSerializer.edit.java
@@ -7,55 +7,55 @@
 
 > DELETE  2  @  2 : 12
 
-> CHANGE  3 : 4  @  13 : 17
+> CHANGE  1 : 2  @  11 : 15
 
 ~ 
 
-> INSERT  5 : 8  @  18
+> INSERT  2 : 5  @  5
 
 + import org.json.JSONArray;
 + import org.json.JSONException;
 + import org.json.JSONObject;
 
-> INSERT  9 : 13  @  19
+> INSERT  4 : 8  @  1
 
 + import com.google.common.collect.Lists;
 + 
 + import net.lax1dude.eaglercraft.v1_8.json.JSONTypeSerializer;
 + 
 
-> CHANGE  14 : 16  @  20 : 23
+> CHANGE  5 : 7  @  1 : 4
 
 ~ 		implements JSONTypeSerializer {
 ~ 	public AnimationMetadataSection deserialize(JSONObject jsonobject) throws JSONException {
 
-> CHANGE  17 : 18  @  24 : 26
+> CHANGE  3 : 4  @  4 : 6
 
 ~ 		int i = jsonobject.optInt("frametime", 1);
 
-> CHANGE  24 : 25  @  32 : 33
+> CHANGE  7 : 8  @  8 : 9
 
 ~ 				JSONArray jsonarray = jsonobject.getJSONArray("frames");
 
-> CHANGE  26 : 28  @  34 : 37
+> CHANGE  2 : 4  @  2 : 5
 
 ~ 				for (int j = 0; j < jsonarray.length(); ++j) {
 ~ 					AnimationFrame animationframe = this.parseAnimationFrame(j, jsonarray.get(j));
 
-> CHANGE  33 : 34  @  42 : 44
+> CHANGE  7 : 8  @  8 : 10
 
 ~ 				throw new JSONException("Invalid animation->frames: expected array, was " + jsonobject.get("frames"),
 
-> CHANGE  38 : 40  @  48 : 50
+> CHANGE  5 : 7  @  6 : 8
 
 ~ 		int k = jsonobject.optInt("width", -1);
 ~ 		int l = jsonobject.optInt("height", -1);
 
-> CHANGE  48 : 49  @  58 : 59
+> CHANGE  10 : 11  @  10 : 11
 
 ~ 		boolean flag = jsonobject.optBoolean("interpolate", false);
 
-> CHANGE  52 : 58  @  62 : 68
+> CHANGE  4 : 10  @  4 : 10
 
 ~ 	private AnimationFrame parseAnimationFrame(int parInt1, Object parJsonElement) {
 ~ 		if (parJsonElement instanceof Number) {
@@ -64,40 +64,40 @@
 ~ 			JSONObject jsonobject = (JSONObject) parJsonElement;
 ~ 			int i = jsonobject.optInt("time", -1);
 
-> CHANGE  62 : 63  @  72 : 73
+> CHANGE  10 : 11  @  10 : 11
 
 ~ 			int j = jsonobject.getInt(getSectionName());
 
-> CHANGE  70 : 73  @  80 : 84
+> CHANGE  8 : 11  @  8 : 12
 
 ~ 	public JSONObject serialize(AnimationMetadataSection animationmetadatasection) {
 ~ 		JSONObject jsonobject = new JSONObject();
 ~ 		jsonobject.put("frametime", Integer.valueOf(animationmetadatasection.getFrameTime()));
 
-> CHANGE  74 : 75  @  85 : 86
+> CHANGE  4 : 5  @  5 : 6
 
 ~ 			jsonobject.put("width", Integer.valueOf(animationmetadatasection.getFrameWidth()));
 
-> CHANGE  78 : 79  @  89 : 90
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 			jsonobject.put("height", Integer.valueOf(animationmetadatasection.getFrameHeight()));
 
-> CHANGE  82 : 83  @  93 : 94
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 			JSONArray jsonarray = new JSONArray();
 
-> CHANGE  86 : 90  @  97 : 101
+> CHANGE  4 : 8  @  4 : 8
 
 ~ 					JSONObject jsonobject1 = new JSONObject();
 ~ 					jsonobject1.put("index", Integer.valueOf(animationmetadatasection.getFrameIndex(i)));
 ~ 					jsonobject1.put("time", Integer.valueOf(animationmetadatasection.getFrameTimeSingle(i)));
 ~ 					jsonarray.put(jsonobject1);
 
-> CHANGE  91 : 92  @  102 : 103
+> CHANGE  5 : 6  @  5 : 6
 
 ~ 					jsonarray.put(Integer.valueOf(animationmetadatasection.getFrameIndex(i)));
 
-> CHANGE  95 : 96  @  106 : 107
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 			jsonobject.put("frames", jsonarray);
 
diff --git a/patches/minecraft/net/minecraft/client/resources/data/FontMetadataSectionSerializer.edit.java b/patches/minecraft/net/minecraft/client/resources/data/FontMetadataSectionSerializer.edit.java
index ce9d82d..7a0be76 100644
--- a/patches/minecraft/net/minecraft/client/resources/data/FontMetadataSectionSerializer.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/data/FontMetadataSectionSerializer.edit.java
@@ -7,56 +7,56 @@
 
 > DELETE  2  @  2 : 10
 
-> INSERT  3 : 5  @  11
+> INSERT  1 : 3  @  9
 
 + import org.json.JSONException;
 + import org.json.JSONObject;
 
-> CHANGE  7 : 8  @  13 : 16
+> CHANGE  4 : 5  @  2 : 5
 
 ~ 	public FontMetadataSection deserialize(JSONObject jsonobject) throws JSONException {
 
-> CHANGE  15 : 17  @  23 : 25
+> CHANGE  8 : 10  @  10 : 12
 
 ~ 			if (!(jsonobject.get("characters") instanceof JSONObject)) {
 ~ 				throw new JSONException(
 
-> CHANGE  20 : 21  @  28 : 29
+> CHANGE  5 : 6  @  5 : 6
 
 ~ 			JSONObject jsonobject1 = jsonobject.getJSONObject("characters");
 
-> CHANGE  22 : 24  @  30 : 32
+> CHANGE  2 : 4  @  2 : 4
 
 ~ 				if (!(jsonobject1.get("default") instanceof JSONObject)) {
 ~ 					throw new JSONException(
 
-> CHANGE  27 : 29  @  35 : 37
+> CHANGE  5 : 7  @  5 : 7
 
 ~ 				JSONObject jsonobject2 = jsonobject1.getJSONObject("default");
 ~ 				f = jsonobject2.optFloat("width", f);
 
-> CHANGE  30 : 31  @  38 : 39
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 				f1 = jsonobject2.optFloat("spacing", f1);
 
-> CHANGE  32 : 33  @  40 : 41
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 				f2 = jsonobject2.optFloat("left", f1);
 
-> CHANGE  37 : 38  @  45 : 46
+> CHANGE  5 : 6  @  5 : 6
 
 ~ 				JSONObject jsonobject3 = jsonobject1.optJSONObject(Integer.toString(i));
 
-> CHANGE  41 : 43  @  49 : 52
+> CHANGE  4 : 6  @  4 : 7
 
 ~ 				if (jsonobject3 != null) {
 ~ 					f3 = jsonobject3.optFloat("width", f);
 
-> CHANGE  44 : 45  @  53 : 54
+> CHANGE  3 : 4  @  4 : 5
 
 ~ 					f4 = jsonobject3.optFloat("spacing", f1);
 
-> CHANGE  46 : 47  @  55 : 56
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 					f5 = jsonobject3.optFloat("left", f2);
 
diff --git a/patches/minecraft/net/minecraft/client/resources/data/IMetadataSectionSerializer.edit.java b/patches/minecraft/net/minecraft/client/resources/data/IMetadataSectionSerializer.edit.java
index 4645fb9..7c3b43b 100644
--- a/patches/minecraft/net/minecraft/client/resources/data/IMetadataSectionSerializer.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/data/IMetadataSectionSerializer.edit.java
@@ -9,7 +9,7 @@
 
 ~ import org.json.JSONObject;
 
-> CHANGE  4 : 7  @  5 : 6
+> CHANGE  2 : 5  @  3 : 4
 
 ~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeDeserializer;
 ~ 
diff --git a/patches/minecraft/net/minecraft/client/resources/data/IMetadataSerializer.edit.java b/patches/minecraft/net/minecraft/client/resources/data/IMetadataSerializer.edit.java
index 5898778..c7932e0 100644
--- a/patches/minecraft/net/minecraft/client/resources/data/IMetadataSerializer.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/data/IMetadataSerializer.edit.java
@@ -11,24 +11,24 @@
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider;
 
-> DELETE  10  @  15 : 17
+> DELETE  8  @  13 : 15
 
-> DELETE  11  @  18 : 24
+> DELETE  1  @  3 : 9
 
-> DELETE  15  @  28 : 30
+> DELETE  4  @  10 : 12
 
-> CHANGE  17 : 18  @  32 : 33
+> CHANGE  2 : 3  @  4 : 5
 
 ~ 	public  T parseMetadataSection(String parString1, JSONObject parJsonObject) {
 
-> CHANGE  22 : 23  @  37 : 38
+> CHANGE  5 : 6  @  5 : 6
 
 ~ 		} else if (parJsonObject.optJSONObject(parString1) == null) {
 
-> CHANGE  31 : 32  @  46 : 47
+> CHANGE  9 : 10  @  9 : 10
 
 ~ 				return (T) ((IMetadataSection) JSONTypeProvider.deserialize(parJsonObject.getJSONObject(parString1),
 
-> DELETE  37  @  52 : 60
+> DELETE  6  @  6 : 14
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/resources/data/LanguageMetadataSection.edit.java b/patches/minecraft/net/minecraft/client/resources/data/LanguageMetadataSection.edit.java
index 681a62a..c0406de 100644
--- a/patches/minecraft/net/minecraft/client/resources/data/LanguageMetadataSection.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/data/LanguageMetadataSection.edit.java
@@ -9,6 +9,6 @@
 
 + 
 
-> DELETE  5  @  4 : 5
+> DELETE  2  @  1 : 2
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/resources/data/LanguageMetadataSectionSerializer.edit.java b/patches/minecraft/net/minecraft/client/resources/data/LanguageMetadataSectionSerializer.edit.java
index ff69f15..587c5c0 100644
--- a/patches/minecraft/net/minecraft/client/resources/data/LanguageMetadataSectionSerializer.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/data/LanguageMetadataSectionSerializer.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 8
 
-> CHANGE  3 : 9  @  9 : 10
+> CHANGE  1 : 7  @  7 : 8
 
 ~ 
 ~ import org.json.JSONException;
@@ -16,13 +16,13 @@
 ~ import com.google.common.collect.Sets;
 ~ 
 
-> DELETE  10  @  11 : 14
+> DELETE  7  @  2 : 5
 
-> CHANGE  12 : 13  @  16 : 19
+> CHANGE  2 : 3  @  5 : 8
 
 ~ 	public LanguageMetadataSection deserialize(JSONObject jsonobject) throws JSONException {
 
-> CHANGE  15 : 20  @  21 : 27
+> CHANGE  3 : 8  @  5 : 11
 
 ~ 		for (String s : jsonobject.keySet()) {
 ~ 			JSONObject jsonobject1 = jsonobject.getJSONObject(s);
@@ -30,15 +30,15 @@
 ~ 			String s2 = jsonobject1.getString("name");
 ~ 			boolean flag = jsonobject1.optBoolean("bidirectional", false);
 
-> CHANGE  21 : 22  @  28 : 29
+> CHANGE  6 : 7  @  7 : 8
 
 ~ 				throw new JSONException("Invalid language->\'" + s + "\'->region: empty value");
 
-> CHANGE  25 : 26  @  32 : 33
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 				throw new JSONException("Invalid language->\'" + s + "\'->name: empty value");
 
-> CHANGE  29 : 30  @  36 : 37
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 				throw new JSONException("Duplicate language->\'" + s + "\' defined");
 
diff --git a/patches/minecraft/net/minecraft/client/resources/data/PackMetadataSectionSerializer.edit.java b/patches/minecraft/net/minecraft/client/resources/data/PackMetadataSectionSerializer.edit.java
index 79ee409..6770811 100644
--- a/patches/minecraft/net/minecraft/client/resources/data/PackMetadataSectionSerializer.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/data/PackMetadataSectionSerializer.edit.java
@@ -13,24 +13,24 @@
 ~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeSerializer;
 ~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider;
 
-> DELETE  8  @  12 : 13
+> DELETE  6  @  10 : 11
 
-> CHANGE  10 : 14  @  15 : 21
+> CHANGE  2 : 6  @  3 : 9
 
 ~ 		implements JSONTypeSerializer {
 ~ 	public PackMetadataSection deserialize(JSONObject jsonobject) throws JSONException {
 ~ 		IChatComponent ichatcomponent = JSONTypeProvider.deserialize(jsonobject.get("description"),
 ~ 				IChatComponent.class);
 
-> CHANGE  15 : 16  @  22 : 23
+> CHANGE  5 : 6  @  7 : 8
 
 ~ 			throw new JSONException("Invalid/missing description!");
 
-> CHANGE  17 : 18  @  24 : 25
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 			int i = jsonobject.getInt("pack_format");
 
-> CHANGE  22 : 27  @  29 : 34
+> CHANGE  5 : 10  @  5 : 10
 
 ~ 	public JSONObject serialize(PackMetadataSection packmetadatasection) {
 ~ 		JSONObject jsonobject = new JSONObject();
diff --git a/patches/minecraft/net/minecraft/client/resources/data/TextureMetadataSectionSerializer.edit.java b/patches/minecraft/net/minecraft/client/resources/data/TextureMetadataSectionSerializer.edit.java
index 0d54ab8..a5c37e8 100644
--- a/patches/minecraft/net/minecraft/client/resources/data/TextureMetadataSectionSerializer.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/data/TextureMetadataSectionSerializer.edit.java
@@ -7,9 +7,9 @@
 
 > DELETE  2  @  2 : 9
 
-> DELETE  3  @  10 : 13
+> DELETE  1  @  8 : 11
 
-> INSERT  4 : 10  @  14
+> INSERT  1 : 7  @  4
 
 + import org.json.JSONArray;
 + import org.json.JSONException;
@@ -18,36 +18,36 @@
 + import com.google.common.collect.Lists;
 + 
 
-> CHANGE  11 : 14  @  15 : 20
+> CHANGE  7 : 10  @  1 : 6
 
 ~ 	public TextureMetadataSection deserialize(JSONObject jsonobject) throws JSONException {
 ~ 		boolean flag = jsonobject.optBoolean("blur", false);
 ~ 		boolean flag1 = jsonobject.optBoolean("clamp", false);
 
-> CHANGE  17 : 18  @  23 : 24
+> CHANGE  6 : 7  @  8 : 9
 
 ~ 				JSONArray jsonarray = jsonobject.getJSONArray("mipmaps");
 
-> CHANGE  19 : 22  @  25 : 28
+> CHANGE  2 : 5  @  2 : 5
 
 ~ 				for (int i = 0; i < jsonarray.length(); ++i) {
 ~ 					Object jsonelement = jsonarray.get(i);
 ~ 					if (jsonelement instanceof Number) {
 
-> CHANGE  23 : 24  @  29 : 30
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 							arraylist.add(((Number) jsonelement).intValue());
 
-> CHANGE  25 : 26  @  31 : 32
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 							throw new JSONException(
 
-> CHANGE  29 : 31  @  35 : 37
+> CHANGE  4 : 6  @  4 : 6
 
 ~ 					} else if (jsonelement instanceof JSONObject) {
 ~ 						throw new JSONException(
 
-> CHANGE  35 : 36  @  41 : 43
+> CHANGE  6 : 7  @  6 : 8
 
 ~ 				throw new JSONException("Invalid texture->mipmaps: expected array, was " + jsonobject.get("mipmaps"),
 
diff --git a/patches/minecraft/net/minecraft/client/resources/model/BuiltInModel.edit.java b/patches/minecraft/net/minecraft/client/resources/model/BuiltInModel.edit.java
index 3cf97e0..d81f3f2 100644
--- a/patches/minecraft/net/minecraft/client/resources/model/BuiltInModel.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/model/BuiltInModel.edit.java
@@ -10,9 +10,9 @@
 + 
 + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
 
-> DELETE  7  @  5 : 7
+> DELETE  4  @  2 : 4
 
-> CHANGE  36 : 37  @  36 : 37
+> CHANGE  29 : 30  @  31 : 32
 
 ~ 	public EaglerTextureAtlasSprite getParticleTexture() {
 
diff --git a/patches/minecraft/net/minecraft/client/resources/model/IBakedModel.edit.java b/patches/minecraft/net/minecraft/client/resources/model/IBakedModel.edit.java
index b1798c1..c1641b8 100644
--- a/patches/minecraft/net/minecraft/client/resources/model/IBakedModel.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/model/IBakedModel.edit.java
@@ -10,9 +10,9 @@
 + 
 + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
 
-> DELETE  7  @  5 : 6
+> DELETE  4  @  2 : 3
 
-> CHANGE  20 : 21  @  19 : 20
+> CHANGE  13 : 14  @  14 : 15
 
 ~ 	EaglerTextureAtlasSprite getParticleTexture();
 
diff --git a/patches/minecraft/net/minecraft/client/resources/model/ModelBakery.edit.java b/patches/minecraft/net/minecraft/client/resources/model/ModelBakery.edit.java
index 4da85d8..7f7e3e8 100644
--- a/patches/minecraft/net/minecraft/client/resources/model/ModelBakery.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/model/ModelBakery.edit.java
@@ -7,13 +7,13 @@
 
 > DELETE  2  @  2 : 8
 
-> INSERT  8 : 9  @  14
+> INSERT  6 : 7  @  12
 
 + import java.nio.charset.StandardCharsets;
 
-> DELETE  17  @  22 : 23
+> DELETE  9  @  8 : 9
 
-> INSERT  18 : 30  @  24
+> INSERT  1 : 13  @  2
 
 + import java.util.Set;
 + 
@@ -28,108 +28,108 @@
 + import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
 
-> DELETE  39  @  33 : 34
+> DELETE  21  @  9 : 10
 
-> DELETE  42  @  37 : 43
+> DELETE  3  @  4 : 10
 
-> DELETE  49  @  50 : 53
+> DELETE  7  @  13 : 16
 
-> CHANGE  69 : 70  @  73 : 74
+> CHANGE  20 : 21  @  23 : 24
 
 ~ 	private final Map sprites = Maps.newHashMap();
 
-> INSERT  130 : 131  @  134
+> INSERT  61 : 62  @  61
 
 + 					LOGGER.warn(var6);
 
-> CHANGE  133 : 135  @  136 : 137
+> CHANGE  3 : 5  @  2 : 3
 
 ~ 				LOGGER.warn("Unable to load definition " + modelresourcelocation);
 ~ 				LOGGER.warn(exception);
 
-> CHANGE  174 : 175  @  176 : 177
+> CHANGE  41 : 42  @  40 : 41
 
 ~ 			modelblockdefinition = new ModelBlockDefinition((ArrayList) arraylist);
 
-> CHANGE  197 : 199  @  199 : 200
+> CHANGE  23 : 25  @  23 : 24
 
 ~ 								+ modelresourcelocation + "\'");
 ~ 						LOGGER.warn(exception);
 
-> CHANGE  217 : 218  @  218 : 219
+> CHANGE  20 : 21  @  19 : 20
 
 ~ 			String str;
 
-> CHANGE  220 : 222  @  221 : 223
+> CHANGE  3 : 5  @  3 : 5
 
 ~ 				str = (String) BUILT_IN_MODELS.get(s1);
 ~ 				if (str == null) {
 
-> DELETE  224  @  225 : 227
+> DELETE  4  @  4 : 6
 
-> CHANGE  226 : 229  @  229 : 230
+> CHANGE  2 : 5  @  4 : 5
 
 ~ 				try (InputStream is = iresource.getInputStream()) {
 ~ 					str = IOUtils.inputStreamToString(is, StandardCharsets.UTF_8);
 ~ 				}
 
-> CHANGE  231 : 233  @  232 : 240
+> CHANGE  5 : 7  @  3 : 11
 
 ~ 			ModelBlock modelblock = ModelBlock.deserialize(str);
 ~ 			modelblock.name = parResourceLocation.toString();
 
-> CHANGE  234 : 235  @  241 : 242
+> CHANGE  3 : 4  @  9 : 10
 
 ~ 			return modelblock;
 
-> CHANGE  256 : 258  @  263 : 264
+> CHANGE  22 : 24  @  22 : 23
 
 ~ 								+ Item.itemRegistry.getNameForObject(item) + "\'");
 ~ 						LOGGER.warn(exception);
 
-> CHANGE  446 : 447  @  452 : 453
+> CHANGE  190 : 191  @  189 : 190
 
 ~ 		for (ModelResourceLocation modelresourcelocation : (List) arraylist) {
 
-> CHANGE  466 : 467  @  472 : 473
+> CHANGE  20 : 21  @  20 : 21
 
 ~ 		EaglerTextureAtlasSprite textureatlassprite = (EaglerTextureAtlasSprite) this.sprites
 
-> CHANGE  474 : 475  @  480 : 481
+> CHANGE  8 : 9  @  8 : 9
 
 ~ 				EaglerTextureAtlasSprite textureatlassprite1 = (EaglerTextureAtlasSprite) this.sprites
 
-> CHANGE  491 : 492  @  497 : 498
+> CHANGE  17 : 18  @  17 : 18
 
 ~ 			EaglerTextureAtlasSprite parTextureAtlasSprite, EnumFacing parEnumFacing, ModelRotation parModelRotation,
 
-> CHANGE  509 : 510  @  515 : 516
+> CHANGE  18 : 19  @  18 : 19
 
 ~ 		List arraydeque = Lists.newLinkedList();
 
-> CHANGE  521 : 522  @  527 : 528
+> CHANGE  12 : 13  @  12 : 13
 
 ~ 			ResourceLocation resourcelocation2 = (ResourceLocation) arraydeque.remove(0);
 
-> CHANGE  536 : 538  @  542 : 543
+> CHANGE  15 : 17  @  15 : 16
 
 ~ 						+ "; unable to load model: \'" + resourcelocation2 + "\'");
 ~ 				LOGGER.warn(exception);
 
-> CHANGE  588 : 590  @  593 : 595
+> CHANGE  52 : 54  @  51 : 53
 
 ~ 				for (ResourceLocation resourcelocation : (Set) set) {
 ~ 					EaglerTextureAtlasSprite textureatlassprite = texturemap.registerSprite(resourcelocation);
 
-> CHANGE  611 : 612  @  616 : 617
+> CHANGE  23 : 24  @  23 : 24
 
 ~ 							EaglerTextureAtlasSprite.setLocationNameCompass(resourcelocation2.toString());
 
-> CHANGE  614 : 615  @  619 : 620
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 							EaglerTextureAtlasSprite.setLocationNameClock(resourcelocation2.toString());
 
-> CHANGE  667 : 668  @  672 : 673
+> CHANGE  53 : 54  @  53 : 54
 
 ~ 		for (EaglerTextureAtlasSprite textureatlassprite : this.sprites.values()) {
 
diff --git a/patches/minecraft/net/minecraft/client/resources/model/ModelResourceLocation.edit.java b/patches/minecraft/net/minecraft/client/resources/model/ModelResourceLocation.edit.java
index b8cfb7d..3fc7b5f 100644
--- a/patches/minecraft/net/minecraft/client/resources/model/ModelResourceLocation.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/model/ModelResourceLocation.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  4 : 6  @  5
+> INSERT  2 : 4  @  3
 
 + import net.minecraft.util.ResourceLocation;
 + 
diff --git a/patches/minecraft/net/minecraft/client/resources/model/ModelRotation.edit.java b/patches/minecraft/net/minecraft/client/resources/model/ModelRotation.edit.java
index 3e350ab..98e8b15 100644
--- a/patches/minecraft/net/minecraft/client/resources/model/ModelRotation.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/model/ModelRotation.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 8  @  4
+> INSERT  1 : 6  @  2
 
 + 
 + import com.google.common.collect.Maps;
@@ -15,6 +15,6 @@
 + import net.lax1dude.eaglercraft.v1_8.vector.Matrix4f;
 + import net.lax1dude.eaglercraft.v1_8.vector.Vector3f;
 
-> DELETE  10  @  6 : 8
+> DELETE  7  @  2 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/resources/model/SimpleBakedModel.edit.java b/patches/minecraft/net/minecraft/client/resources/model/SimpleBakedModel.edit.java
index dc34805..692b867 100644
--- a/patches/minecraft/net/minecraft/client/resources/model/SimpleBakedModel.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/model/SimpleBakedModel.edit.java
@@ -7,45 +7,45 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 7  @  4
+> INSERT  1 : 5  @  2
 
 + 
 + import com.google.common.collect.Lists;
 + 
 + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
 
-> DELETE  11  @  8 : 10
+> DELETE  8  @  4 : 6
 
-> CHANGE  18 : 19  @  17 : 18
+> CHANGE  7 : 8  @  9 : 10
 
 ~ 	protected final EaglerTextureAtlasSprite texture;
 
-> CHANGE  22 : 23  @  21 : 22
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 			EaglerTextureAtlasSprite parTextureAtlasSprite, ItemCameraTransforms parItemCameraTransforms) {
 
-> CHANGE  51 : 52  @  50 : 51
+> CHANGE  29 : 30  @  29 : 30
 
 ~ 	public EaglerTextureAtlasSprite getParticleTexture() {
 
-> CHANGE  63 : 64  @  62 : 63
+> CHANGE  12 : 13  @  12 : 13
 
 ~ 		private EaglerTextureAtlasSprite builderTexture;
 
-> CHANGE  71 : 72  @  70 : 71
+> CHANGE  8 : 9  @  8 : 9
 
 ~ 		public Builder(IBakedModel parIBakedModel, EaglerTextureAtlasSprite parTextureAtlasSprite) {
 
-> CHANGE  83 : 84  @  82 : 83
+> CHANGE  12 : 13  @  12 : 13
 
 ~ 		private void addFaceBreakingFours(IBakedModel parIBakedModel, EaglerTextureAtlasSprite parTextureAtlasSprite,
 
-> CHANGE  91 : 93  @  90 : 91
+> CHANGE  8 : 10  @  8 : 9
 
 ~ 		private void addGeneralBreakingFours(IBakedModel parIBakedModel,
 ~ 				EaglerTextureAtlasSprite parTextureAtlasSprite) {
 
-> CHANGE  122 : 123  @  120 : 121
+> CHANGE  31 : 32  @  30 : 31
 
 ~ 		public SimpleBakedModel.Builder setTexture(EaglerTextureAtlasSprite parTextureAtlasSprite) {
 
diff --git a/patches/minecraft/net/minecraft/client/resources/model/WeightedBakedModel.edit.java b/patches/minecraft/net/minecraft/client/resources/model/WeightedBakedModel.edit.java
index e74ddb6..db2058f 100644
--- a/patches/minecraft/net/minecraft/client/resources/model/WeightedBakedModel.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/model/WeightedBakedModel.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 4
 
-> INSERT  4 : 9  @  6
+> INSERT  2 : 7  @  4
 
 + 
 + import com.google.common.collect.ComparisonChain;
@@ -15,9 +15,9 @@
 + 
 + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
 
-> DELETE  11  @  8 : 10
+> DELETE  7  @  2 : 4
 
-> CHANGE  45 : 46  @  44 : 45
+> CHANGE  34 : 35  @  36 : 37
 
 ~ 	public EaglerTextureAtlasSprite getParticleTexture() {
 
diff --git a/patches/minecraft/net/minecraft/client/settings/GameSettings.edit.java b/patches/minecraft/net/minecraft/client/settings/GameSettings.edit.java
index 1180ffb..5eb29d3 100644
--- a/patches/minecraft/net/minecraft/client/settings/GameSettings.edit.java
+++ b/patches/minecraft/net/minecraft/client/settings/GameSettings.edit.java
@@ -7,15 +7,15 @@
 
 > DELETE  2  @  2 : 7
 
-> CHANGE  3 : 6  @  8 : 11
+> CHANGE  1 : 4  @  6 : 9
 
 ~ import java.io.ByteArrayOutputStream;
 ~ import java.io.InputStreamReader;
 ~ import java.io.OutputStreamWriter;
 
-> DELETE  7  @  12 : 14
+> DELETE  4  @  4 : 6
 
-> INSERT  10 : 28  @  17
+> INSERT  3 : 21  @  5
 
 + 
 + import org.json.JSONArray;
@@ -36,29 +36,29 @@
 + import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 + import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
-> DELETE  33  @  22 : 24
+> DELETE  23  @  5 : 7
 
-> DELETE  38  @  29 : 35
+> DELETE  5  @  7 : 13
 
-> DELETE  41  @  38 : 43
+> DELETE  3  @  9 : 14
 
-> DELETE  42  @  44 : 52
+> DELETE  1  @  6 : 14
 
-> CHANGE  65 : 68  @  75 : 78
+> CHANGE  23 : 26  @  31 : 34
 
 ~ 	public int clouds = 1;
 ~ 	public boolean fancyGraphics = false;
 ~ 	public int ambientOcclusion = 0;
 
-> DELETE  76  @  86 : 87
+> DELETE  11  @  11 : 12
 
-> DELETE  77  @  88 : 89
+> DELETE  1  @  2 : 3
 
-> CHANGE  113 : 114  @  125 : 126
+> CHANGE  36 : 37  @  37 : 38
 
 ~ 	public KeyBinding keyBindSprint = new KeyBinding("key.sprint", KeyboardConstants.KEY_R, "key.categories.movement");
 
-> CHANGE  124 : 130  @  136 : 143
+> CHANGE  11 : 17  @  11 : 18
 
 ~ 	public KeyBinding keyBindSmoothCamera = new KeyBinding("key.smoothCamera", KeyboardConstants.KEY_M,
 ~ 			"key.categories.misc");
@@ -67,13 +67,13 @@
 ~ 	public KeyBinding keyBindFunction = new KeyBinding("key.function", KeyboardConstants.KEY_F, "key.categories.misc");
 ~ 	public KeyBinding keyBindClose = new KeyBinding("key.close", KeyboardConstants.KEY_GRAVE, "key.categories.misc");
 
-> DELETE  142  @  155 : 156
+> DELETE  18  @  19 : 20
 
-> CHANGE  154 : 155  @  168 : 169
+> CHANGE  12 : 13  @  13 : 14
 
 ~ 	public int guiScale = 3;
 
-> INSERT  158 : 167  @  172
+> INSERT  4 : 13  @  4
 
 + 	public boolean hudFps = true;
 + 	public boolean hudCoords = true;
@@ -85,46 +85,46 @@
 + 	public boolean fog = true;
 + 	public boolean fxaa = true;
 
-> CHANGE  168 : 169  @  173 : 174
+> CHANGE  10 : 11  @  1 : 2
 
 ~ 	public GameSettings(Minecraft mcIn) {
 
-> CHANGE  173 : 175  @  178 : 181
+> CHANGE  5 : 7  @  5 : 8
 
 ~ 				this.keyBindTogglePerspective, this.keyBindSmoothCamera, this.keyBindZoomCamera, this.keyBindFunction,
 ~ 				this.keyBindClose }, this.keyBindsHotbar);
 
-> CHANGE  178 : 180  @  184 : 185
+> CHANGE  5 : 7  @  6 : 7
 
 ~ 		this.gammaSetting = 1.0F;
 ~ 		this.language = EagRuntime.getConfiguration().getDefaultLocale();
 
-> CHANGE  182 : 183  @  187 : 193
+> CHANGE  4 : 5  @  3 : 9
 
 ~ 		GameSettings.Options.RENDER_DISTANCE.setValueMax(18.0F);
 
-> CHANGE  184 : 185  @  194 : 195
+> CHANGE  2 : 3  @  7 : 8
 
 ~ 		this.renderDistanceChunks = 4;
 
-> DELETE  188  @  198 : 213
+> DELETE  4  @  4 : 19
 
-> CHANGE  191 : 192  @  216 : 217
+> CHANGE  3 : 4  @  18 : 19
 
 ~ 						: HString.format("%c", new Object[] { Character.valueOf((char) (parInt1 - 256)) })
 
-> DELETE  275  @  300 : 301
+> DELETE  84  @  84 : 85
 
-> DELETE  279  @  305 : 306
+> DELETE  4  @  5 : 6
 
-> INSERT  324 : 326  @  351
+> INSERT  45 : 47  @  46
 
 + 			this.mc.loadingScreen.eaglerShow(I18n.format("resourcePack.load.refreshing"),
 + 					I18n.format("resourcePack.load.pleaseWait"));
 
-> DELETE  384  @  409 : 426
+> DELETE  60  @  58 : 75
 
-> INSERT  397 : 433  @  439
+> INSERT  13 : 49  @  30
 
 + 		if (parOptions == GameSettings.Options.HUD_FPS) {
 + 			this.hudFps = !this.hudFps;
@@ -163,9 +163,9 @@
 + 		}
 + 
 
-> DELETE  487  @  493 : 499
+> DELETE  90  @  54 : 60
 
-> INSERT  499 : 517  @  511
+> INSERT  12 : 30  @  18
 
 + 		case HUD_COORDS:
 + 			return this.hudCoords;
@@ -186,21 +186,21 @@
 + 		case FXAA:
 + 			return this.fxaa;
 
-> CHANGE  560 : 563  @  554 : 558
+> CHANGE  61 : 64  @  43 : 47
 
 ~ 																	: (parOptions == GameSettings.Options.CHAT_SCALE
 ~ 																			? s + (int) (f * 90.0F + 10.0F) + "%"
 ~ 																			: (parOptions == GameSettings.Options.CHAT_HEIGHT_UNFOCUSED
 
-> CHANGE  566 : 567  @  561 : 562
+> CHANGE  6 : 7  @  7 : 8
 
 ~ 																					: (parOptions == GameSettings.Options.CHAT_HEIGHT_FOCUSED
 
-> CHANGE  568 : 569  @  563 : 564
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 																									.calculateChatboxHeight(
 
-> CHANGE  571 : 590  @  566 : 600
+> CHANGE  3 : 22  @  3 : 37
 
 ~ 																							: (parOptions == GameSettings.Options.CHAT_WIDTH
 ~ 																									? s + GuiNewChat
@@ -222,17 +222,17 @@
 ~ 																																	+ "%")
 ~ 																													: "yee"))))))))))));
 
-> CHANGE  625 : 627  @  635 : 636
+> CHANGE  54 : 56  @  69 : 70
 
 ~ 			byte[] options = EagRuntime.getStorage("g");
 ~ 			if (options == null) {
 
-> CHANGE  630 : 632  @  639 : 640
+> CHANGE  5 : 7  @  4 : 5
 
 ~ 			BufferedReader bufferedreader = new BufferedReader(
 ~ 					new InputStreamReader(EaglerZLIB.newGZIPInputStream(new EaglerInputStream(options))));
 
-> CHANGE  715 : 721  @  723 : 724
+> CHANGE  85 : 91  @  84 : 85
 
 ~ 						this.resourcePacks.clear();
 ~ 						for (Object o : (new JSONArray(s.substring(s.indexOf(58) + 1))).toList()) {
@@ -241,7 +241,7 @@
 ~ 							}
 ~ 						}
 
-> CHANGE  727 : 733  @  730 : 731
+> CHANGE  12 : 18  @  7 : 8
 
 ~ 						this.field_183018_l.clear();
 ~ 						for (Object o : (new JSONArray(s.substring(s.indexOf(58) + 1))).toList()) {
@@ -250,11 +250,11 @@
 ~ 							}
 ~ 						}
 
-> DELETE  771  @  769 : 773
+> DELETE  44  @  39 : 43
 
-> DELETE  775  @  777 : 781
+> DELETE  4  @  8 : 12
 
-> INSERT  891 : 927  @  897
+> INSERT  116 : 152  @  120
 
 + 					if (astring[0].equals("hudFps")) {
 + 						this.hudFps = astring[1].equals("true");
@@ -293,28 +293,28 @@
 + 					}
 + 
 
-> INSERT  933 : 935  @  903
+> INSERT  42 : 44  @  6
 
 + 					Keyboard.setFunctionKeyModifier(keyBindFunction.getKeyCode());
 + 
 
-> DELETE  952  @  920 : 921
+> DELETE  19  @  17 : 18
 
-> CHANGE  964 : 966  @  933 : 934
+> CHANGE  12 : 14  @  13 : 14
 
 ~ 			ByteArrayOutputStream bao = new ByteArrayOutputStream();
 ~ 			PrintWriter printwriter = new PrintWriter(new OutputStreamWriter(EaglerZLIB.newGZIPOutputStream(bao)));
 
-> CHANGE  992 : 994  @  960 : 962
+> CHANGE  28 : 30  @  27 : 29
 
 ~ 			printwriter.println("resourcePacks:" + toJSONArray(this.resourcePacks));
 ~ 			printwriter.println("incompatibleResourcePacks:" + toJSONArray(this.field_183018_l));
 
-> DELETE  1002  @  970 : 971
+> DELETE  10  @  10 : 11
 
-> DELETE  1003  @  972 : 973
+> DELETE  1  @  2 : 3
 
-> INSERT  1032 : 1041  @  1002
+> INSERT  29 : 38  @  30
 
 + 			printwriter.println("hudFps:" + this.hudFps);
 + 			printwriter.println("hudWorld:" + this.hudWorld);
@@ -326,21 +326,21 @@
 + 			printwriter.println("fog:" + this.fog);
 + 			printwriter.println("fxaa:" + this.fxaa);
 
-> INSERT  1046 : 1048  @  1007
+> INSERT  14 : 16  @  5
 
 + 			Keyboard.setFunctionKeyModifier(keyBindFunction.getKeyCode());
 + 
 
-> INSERT  1059 : 1061  @  1018
+> INSERT  13 : 15  @  11
 
 + 
 + 			EagRuntime.setStorage("g", bao.toByteArray());
 
-> CHANGE  1071 : 1072  @  1028 : 1029
+> CHANGE  12 : 13  @  10 : 11
 
 ~ 				: (parSoundCategory == SoundCategory.VOICE ? 0.0F : 1.0F);
 
-> INSERT  1125 : 1133  @  1082
+> INSERT  54 : 62  @  54
 
 + 	private String toJSONArray(List e) {
 + 		JSONArray arr = new JSONArray();
@@ -351,16 +351,16 @@
 + 	}
 + 
 
-> CHANGE  1137 : 1138  @  1086 : 1087
+> CHANGE  12 : 13  @  4 : 5
 
 ~ 		RENDER_DISTANCE("options.renderDistance", true, false, 1.0F, 16.0F, 1.0F),
 
-> CHANGE  1146 : 1148  @  1095 : 1099
+> CHANGE  9 : 11  @  9 : 13
 
 ~ 		TOUCHSCREEN("options.touchscreen", false, true), CHAT_SCALE("options.chat.scale", true, false),
 ~ 		CHAT_WIDTH("options.chat.width", true, false), CHAT_HEIGHT_FOCUSED("options.chat.height.focused", true, false),
 
-> CHANGE  1162 : 1167  @  1113 : 1114
+> CHANGE  16 : 21  @  18 : 19
 
 ~ 		ENTITY_SHADOWS("options.entityShadows", false, true), HUD_FPS("options.hud.fps", false, true),
 ~ 		HUD_COORDS("options.hud.coords", false, true), HUD_STATS("options.hud.stats", false, true),
diff --git a/patches/minecraft/net/minecraft/client/settings/KeyBinding.edit.java b/patches/minecraft/net/minecraft/client/settings/KeyBinding.edit.java
index d182d08..76297ce 100644
--- a/patches/minecraft/net/minecraft/client/settings/KeyBinding.edit.java
+++ b/patches/minecraft/net/minecraft/client/settings/KeyBinding.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 4
 
-> INSERT  4 : 8  @  6
+> INSERT  2 : 6  @  4
 
 + 
 + import com.google.common.collect.Lists;
diff --git a/patches/minecraft/net/minecraft/client/stream/IStream.edit.java b/patches/minecraft/net/minecraft/client/stream/IStream.edit.java
index 8083f55..fe182f3 100644
--- a/patches/minecraft/net/minecraft/client/stream/IStream.edit.java
+++ b/patches/minecraft/net/minecraft/client/stream/IStream.edit.java
@@ -7,14 +7,14 @@
 
 > DELETE  2  @  2 : 8
 
-> DELETE  15  @  21 : 25
+> DELETE  13  @  19 : 23
 
-> DELETE  29  @  39 : 41
+> DELETE  14  @  18 : 20
 
-> DELETE  31  @  43 : 45
+> DELETE  2  @  4 : 6
 
-> DELETE  39  @  53 : 55
+> DELETE  8  @  10 : 12
 
-> DELETE  43  @  59 : 61
+> DELETE  4  @  6 : 8
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/client/util/JsonBlendingMode.edit.java b/patches/minecraft/net/minecraft/client/util/JsonBlendingMode.edit.java
index 8ba60e3..192f46d 100644
--- a/patches/minecraft/net/minecraft/client/util/JsonBlendingMode.edit.java
+++ b/patches/minecraft/net/minecraft/client/util/JsonBlendingMode.edit.java
@@ -9,41 +9,41 @@
 
 ~ import org.json.JSONObject;
 
-> INSERT  4 : 7  @  7
+> INSERT  2 : 5  @  5
 
 + import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
 + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 + 
 
-> CHANGE  52 : 53  @  52 : 53
+> CHANGE  48 : 49  @  45 : 46
 
 ~ 			EaglercraftGPU.glBlendEquation(this.field_148112_f);
 
-> CHANGE  95 : 96  @  95 : 96
+> CHANGE  43 : 44  @  43 : 44
 
 ~ 	public static JsonBlendingMode func_148110_a(JSONObject parJsonObject) {
 
-> CHANGE  106 : 108  @  106 : 108
+> CHANGE  11 : 13  @  11 : 13
 
 ~ 			if (parJsonObject.get("func") instanceof String) {
 ~ 				i = func_148108_a(parJsonObject.getString("func"));
 
-> CHANGE  113 : 115  @  113 : 115
+> CHANGE  7 : 9  @  7 : 9
 
 ~ 			if (parJsonObject.get("srcrgb") instanceof String) {
 ~ 				j = func_148107_b(parJsonObject.getString("srcrgb"));
 
-> CHANGE  120 : 122  @  120 : 122
+> CHANGE  7 : 9  @  7 : 9
 
 ~ 			if (parJsonObject.get("dstrgb") instanceof String) {
 ~ 				k = func_148107_b(parJsonObject.getString("dstrgb"));
 
-> CHANGE  127 : 129  @  127 : 129
+> CHANGE  7 : 9  @  7 : 9
 
 ~ 			if (parJsonObject.get("srcalpha") instanceof String) {
 ~ 				l = func_148107_b(parJsonObject.getString("srcalpha"));
 
-> CHANGE  136 : 138  @  136 : 138
+> CHANGE  9 : 11  @  9 : 11
 
 ~ 			if (parJsonObject.get("dstalpha") instanceof String) {
 ~ 				i1 = func_148107_b(parJsonObject.getString("dstalpha"));
diff --git a/patches/minecraft/net/minecraft/client/util/JsonException.edit.java b/patches/minecraft/net/minecraft/client/util/JsonException.edit.java
index f1fb721..5d78d70 100644
--- a/patches/minecraft/net/minecraft/client/util/JsonException.edit.java
+++ b/patches/minecraft/net/minecraft/client/util/JsonException.edit.java
@@ -7,11 +7,11 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  5 : 6  @  6
+> INSERT  3 : 4  @  4
 
 + 
 
-> INSERT  8 : 10  @  8
+> INSERT  3 : 5  @  2
 
 + import com.google.common.collect.Lists;
 + 
diff --git a/patches/minecraft/net/minecraft/command/ICommandSender.edit.java b/patches/minecraft/net/minecraft/command/ICommandSender.edit.java
index 641b33f..2c4c901 100644
--- a/patches/minecraft/net/minecraft/command/ICommandSender.edit.java
+++ b/patches/minecraft/net/minecraft/command/ICommandSender.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  27  @  28 : 29
+> DELETE  25  @  26 : 27
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/command/PlayerSelector.edit.java b/patches/minecraft/net/minecraft/command/PlayerSelector.edit.java
index b5eaa59..a7acbff 100644
--- a/patches/minecraft/net/minecraft/command/PlayerSelector.edit.java
+++ b/patches/minecraft/net/minecraft/command/PlayerSelector.edit.java
@@ -7,13 +7,13 @@
 
 > DELETE  2  @  2 : 8
 
-> DELETE  8  @  14 : 15
+> DELETE  6  @  12 : 13
 
-> INSERT  9 : 10  @  16
+> INSERT  1 : 2  @  2
 
 + import java.util.Set;
 
-> CHANGE  12 : 21  @  18 : 20
+> CHANGE  3 : 12  @  2 : 4
 
 ~ 
 ~ import com.google.common.base.Predicate;
@@ -25,95 +25,95 @@
 ~ 
 ~ import net.minecraft.client.Minecraft;
 
-> DELETE  25  @  24 : 25
+> DELETE  13  @  6 : 7
 
-> DELETE  29  @  29 : 30
+> DELETE  4  @  5 : 6
 
-> DELETE  46  @  47 : 51
+> DELETE  17  @  18 : 22
 
-> CHANGE  59 : 60  @  64 : 65
+> CHANGE  13 : 14  @  17 : 18
 
 ~ 			for (Entity entity : (List) list) {
 
-> CHANGE  63 : 64  @  68 : 69
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 			return IChatComponent.join(arraylist);
 
-> CHANGE  80 : 81  @  85 : 86
+> CHANGE  17 : 18  @  17 : 18
 
 ~ 				for (World world : (List) list) {
 
-> CHANGE  107 : 111  @  112 : 113
+> CHANGE  27 : 31  @  27 : 28
 
 ~ 			Minecraft mc = Minecraft.getMinecraft();
 ~ 			if (mc.theWorld != null) {
 ~ 				arraylist.add(mc.thePlayer);
 ~ 			}
 
-> CHANGE  133 : 135  @  135 : 137
+> CHANGE  26 : 28  @  23 : 25
 
 ~ 		String ss = func_179651_b(parMap, "type");
 ~ 		final boolean flag = ss != null && ss.startsWith("!");
 
-> CHANGE  136 : 137  @  138 : 139
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 			ss = ss.substring(1);
 
-> INSERT  138 : 139  @  140
+> INSERT  2 : 3  @  2
 
 + 		final String s = ss;
 
-> CHANGE  168 : 169  @  169 : 176
+> CHANGE  30 : 31  @  29 : 36
 
 ~ 					return false;
 
-> CHANGE  182 : 183  @  189 : 195
+> CHANGE  14 : 15  @  20 : 26
 
 ~ 					return false;
 
-> CHANGE  192 : 194  @  204 : 206
+> CHANGE  10 : 12  @  15 : 17
 
 ~ 		String ss = func_179651_b(parMap, "team");
 ~ 		final boolean flag = ss != null && ss.startsWith("!");
 
-> CHANGE  195 : 196  @  207 : 208
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 			ss = ss.substring(1);
 
-> INSERT  197 : 198  @  209
+> INSERT  2 : 3  @  2
 
 + 		final String s = ss;
 
-> CHANGE  219 : 220  @  230 : 231
+> CHANGE  22 : 23  @  21 : 22
 
 ~ 		final Map map = func_96560_a(parMap);
 
-> CHANGE  223 : 224  @  234 : 235
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 					Scoreboard scoreboard = Minecraft.getMinecraft().theWorld.getScoreboard();
 
-> CHANGE  238 : 239  @  249 : 251
+> CHANGE  15 : 16  @  15 : 17
 
 ~ 						String s1 = entity instanceof EntityPlayer ? entity.getName() : entity.getUniqueID().toString();
 
-> CHANGE  264 : 266  @  276 : 278
+> CHANGE  26 : 28  @  27 : 29
 
 ~ 		String ss = func_179651_b(parMap, "name");
 ~ 		final boolean flag = ss != null && ss.startsWith("!");
 
-> CHANGE  267 : 268  @  279 : 280
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 			ss = ss.substring(1);
 
-> INSERT  269 : 270  @  281
+> INSERT  2 : 3  @  2
 
 + 		final String s = ss;
 
-> CHANGE  410 : 411  @  421 : 422
+> CHANGE  141 : 142  @  140 : 141
 
 ~ 			parList = (List) Lists.newArrayList(new Entity[] { entity });
 
-> INSERT  544 : 545  @  555
+> INSERT  134 : 135  @  134
 
 + 
 
diff --git a/patches/minecraft/net/minecraft/command/server/CommandBlockLogic.edit.java b/patches/minecraft/net/minecraft/command/server/CommandBlockLogic.edit.java
index 2a8ff94..a9ce147 100644
--- a/patches/minecraft/net/minecraft/command/server/CommandBlockLogic.edit.java
+++ b/patches/minecraft/net/minecraft/command/server/CommandBlockLogic.edit.java
@@ -7,41 +7,41 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 5  @  4 : 11
+> CHANGE  1 : 3  @  2 : 9
 
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf;
 
-> DELETE  7  @  13 : 14
+> DELETE  4  @  9 : 10
 
-> DELETE  9  @  16 : 17
+> DELETE  2  @  3 : 4
 
-> CHANGE  11 : 12  @  19 : 20
+> CHANGE  2 : 3  @  3 : 4
 
 ~ public abstract class CommandBlockLogic {
 
-> DELETE  18  @  26 : 27
+> DELETE  7  @  7 : 8
 
-> DELETE  35  @  44 : 46
+> DELETE  17  @  18 : 20
 
-> DELETE  51  @  62 : 64
+> DELETE  16  @  18 : 20
 
-> DELETE  67  @  80 : 83
+> DELETE  16  @  18 : 21
 
-> DELETE  68  @  84 : 110
+> DELETE  1  @  4 : 30
 
-> DELETE  83  @  125 : 130
+> DELETE  15  @  41 : 46
 
-> CHANGE  87 : 88  @  134 : 137
+> CHANGE  4 : 5  @  9 : 12
 
 ~ 		return true;
 
-> DELETE  90  @  139 : 143
+> DELETE  3  @  5 : 9
 
-> CHANGE  112 : 113  @  165 : 169
+> CHANGE  22 : 23  @  26 : 30
 
 ~ 			playerIn.openEditCommandBlock(this);
 
-> DELETE  116  @  172 : 176
+> DELETE  4  @  7 : 11
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/crash/CrashReport.edit.java b/patches/minecraft/net/minecraft/crash/CrashReport.edit.java
index e37dece..4a9252b 100644
--- a/patches/minecraft/net/minecraft/crash/CrashReport.edit.java
+++ b/patches/minecraft/net/minecraft/crash/CrashReport.edit.java
@@ -7,9 +7,9 @@
 
 > DELETE  2  @  2 : 5
 
-> DELETE  4  @  7 : 9
+> DELETE  2  @  5 : 7
 
-> CHANGE  8 : 17  @  13 : 14
+> CHANGE  4 : 13  @  6 : 7
 
 ~ 
 ~ import com.google.common.collect.Lists;
@@ -21,19 +21,19 @@
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
-> DELETE  18  @  15 : 20
+> DELETE  10  @  2 : 7
 
-> DELETE  25  @  27 : 28
+> DELETE  7  @  12 : 13
 
-> CHANGE  26 : 27  @  29 : 30
+> CHANGE  1 : 2  @  2 : 3
 
 ~ 	private String[] stacktrace;
 
-> INSERT  31 : 32  @  34
+> INSERT  5 : 6  @  5
 
 + 		this.stacktrace = EagRuntime.getStackTraceElements(causeThrowable);
 
-> CHANGE  58 : 69  @  60 : 88
+> CHANGE  27 : 38  @  26 : 54
 
 ~ 		if (EagRuntime.getPlatformType() != EnumPlatformType.JAVASCRIPT) {
 ~ 			this.theReportCategory.addCrashSectionCallable("Memory", new Callable() {
@@ -47,24 +47,24 @@
 ~ 					return k + " bytes (" + j1 + " MB) / " + j + " bytes (" + i1 + " MB) up to " + i + " bytes (" + l
 ~ 							+ " MB)";
 
-> CHANGE  70 : 72  @  89 : 98
+> CHANGE  12 : 14  @  29 : 38
 
 ~ 			});
 ~ 		}
 
-> CHANGE  84 : 85  @  110 : 111
+> CHANGE  14 : 15  @  21 : 22
 
 ~ 			this.stacktrace = (String[]) ArrayUtils
 
-> CHANGE  92 : 93  @  118 : 119
+> CHANGE  8 : 9  @  8 : 9
 
 ~ 			for (String stacktraceelement : this.stacktrace) {
 
-> CHANGE  109 : 110  @  135 : 146
+> CHANGE  17 : 18  @  17 : 28
 
 ~ 		StringBuilder stackTrace = new StringBuilder();
 
-> CHANGE  111 : 118  @  147 : 148
+> CHANGE  2 : 9  @  12 : 13
 
 ~ 		if ((this.cause.getMessage() == null || this.cause.getMessage().length() == 0)
 ~ 				&& ((this.cause instanceof NullPointerException) || (this.cause instanceof StackOverflowError)
@@ -74,29 +74,29 @@
 ~ 		} else {
 ~ 			stackTrace.append(this.cause.toString()).append('\n');
 
-> CHANGE  120 : 123  @  150 : 151
+> CHANGE  9 : 12  @  3 : 4
 
 ~ 		EagRuntime.getStackTrace(this.cause, (s) -> {
 ~ 			stackTrace.append("\tat ").append(s).append('\n');
 ~ 		});
 
-> CHANGE  124 : 125  @  152 : 163
+> CHANGE  4 : 5  @  2 : 13
 
 ~ 		return stackTrace.toString();
 
-> DELETE  152  @  190 : 215
+> DELETE  28  @  38 : 63
 
-> CHANGE  164 : 167  @  227 : 230
+> CHANGE  12 : 15  @  37 : 40
 
 ~ 			String[] astacktraceelement = EagRuntime.getStackTraceElements(cause);
 ~ 			String stacktraceelement = null;
 ~ 			String stacktraceelement1 = null;
 
-> CHANGE  188 : 189  @  251 : 252
+> CHANGE  24 : 25  @  24 : 25
 
 ~ 				this.stacktrace = new String[j];
 
-> CHANGE  200 : 201  @  263 : 282
+> CHANGE  12 : 13  @  12 : 31
 
 ~ 		return "eagler";
 
diff --git a/patches/minecraft/net/minecraft/crash/CrashReportCategory.edit.java b/patches/minecraft/net/minecraft/crash/CrashReportCategory.edit.java
index 61a23b5..6b99ecc 100644
--- a/patches/minecraft/net/minecraft/crash/CrashReportCategory.edit.java
+++ b/patches/minecraft/net/minecraft/crash/CrashReportCategory.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  4 : 9  @  5
+> INSERT  2 : 7  @  3
 
 + 
 + import com.google.common.collect.Lists;
@@ -15,76 +15,76 @@
 + import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 + import net.lax1dude.eaglercraft.v1_8.HString;
 
-> DELETE  11  @  7 : 8
+> DELETE  7  @  2 : 3
 
-> CHANGE  17 : 18  @  14 : 15
+> CHANGE  6 : 7  @  7 : 8
 
 ~ 	private String[] stackTrace = new String[0];
 
-> CHANGE  25 : 26  @  22 : 23
+> CHANGE  8 : 9  @  8 : 9
 
 ~ 		return HString.format("%.2f,%.2f,%.2f - %s", new Object[] { Double.valueOf(x), Double.valueOf(y),
 
-> CHANGE  36 : 37  @  33 : 34
+> CHANGE  11 : 12  @  11 : 12
 
 ~ 			stringbuilder.append(HString.format("World: (%d,%d,%d)",
 
-> CHANGE  54 : 55  @  51 : 52
+> CHANGE  18 : 19  @  18 : 19
 
 ~ 			stringbuilder.append(HString.format("Chunk: (at %d,%d,%d in %d,%d; contains blocks %d,0,%d to %d,255,%d)",
 
-> CHANGE  76 : 77  @  73 : 74
+> CHANGE  22 : 23  @  22 : 23
 
 ~ 					HString.format("Region: (%d,%d; contains chunks %d,%d to %d,%d, blocks %d,0,%d to %d,255,%d)",
 
-> CHANGE  105 : 107  @  102 : 104
+> CHANGE  29 : 31  @  29 : 31
 
 ~ 		String[] astacktraceelement = EagRuntime.getStackTraceElements(new Exception());
 ~ 		if (astacktraceelement.length - 3 - size <= 0) {
 
-> CHANGE  109 : 110  @  106 : 107
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 			this.stackTrace = new String[astacktraceelement.length - 3 - size];
 
-> CHANGE  115 : 116  @  112 : 113
+> CHANGE  6 : 7  @  6 : 7
 
 ~ 	public boolean firstTwoElementsOfStackTraceMatch(String s1, String s2) {
 
-> CHANGE  117 : 119  @  114 : 119
+> CHANGE  2 : 4  @  2 : 7
 
 ~ 			String stacktraceelement = this.stackTrace[0];
 ~ 			if (s1.equals(stacktraceelement)) {
 
-> CHANGE  136 : 137  @  136 : 137
+> CHANGE  19 : 20  @  22 : 23
 
 ~ 		String[] astacktraceelement = new String[this.stackTrace.length - amount];
 
-> CHANGE  155 : 156  @  155 : 156
+> CHANGE  19 : 20  @  19 : 20
 
 ~ 			for (String stacktraceelement : this.stackTrace) {
 
-> CHANGE  157 : 158  @  157 : 158
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 				builder.append(stacktraceelement);
 
-> CHANGE  163 : 164  @  163 : 164
+> CHANGE  6 : 7  @  6 : 7
 
 ~ 	public String[] getStackTrace() {
 
-> CHANGE  173 : 175  @  173 : 175
+> CHANGE  10 : 12  @  10 : 12
 
 ~ 					return HString.format("ID #%d (%s // %s)", new Object[] { Integer.valueOf(i),
 ~ 							blockIn.getUnlocalizedName(), blockIn.getClass().getName() });
 
-> CHANGE  185 : 186  @  185 : 186
+> CHANGE  12 : 13  @  12 : 13
 
 ~ 					String s = HString.format("%4s", new Object[] { Integer.toBinaryString(blockData) }).replace(" ",
 
-> CHANGE  187 : 188  @  187 : 188
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 					return HString.format("%1$d / 0x%1$X / 0b%2$s", new Object[] { Integer.valueOf(blockData), s });
 
-> CHANGE  221 : 222  @  221 : 222
+> CHANGE  34 : 35  @  34 : 35
 
 ~ 				this.value = "~~ERROR~~ " + throwable.getClass().getName() + ": " + throwable.getMessage();
 
diff --git a/patches/minecraft/net/minecraft/enchantment/Enchantment.edit.java b/patches/minecraft/net/minecraft/enchantment/Enchantment.edit.java
index 4e01412..440760c 100644
--- a/patches/minecraft/net/minecraft/enchantment/Enchantment.edit.java
+++ b/patches/minecraft/net/minecraft/enchantment/Enchantment.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 4
 
-> CHANGE  5 : 9  @  7 : 25
+> CHANGE  3 : 7  @  5 : 23
 
 ~ 
 ~ import com.google.common.collect.Lists;
diff --git a/patches/minecraft/net/minecraft/enchantment/EnchantmentDurability.edit.java b/patches/minecraft/net/minecraft/enchantment/EnchantmentDurability.edit.java
index 3e3e443..9ba3984 100644
--- a/patches/minecraft/net/minecraft/enchantment/EnchantmentDurability.edit.java
+++ b/patches/minecraft/net/minecraft/enchantment/EnchantmentDurability.edit.java
@@ -10,7 +10,7 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  30 : 31  @  31 : 32
+> CHANGE  28 : 29  @  29 : 30
 
 ~ 	public static boolean negateDamage(ItemStack parItemStack, int parInt1, EaglercraftRandom parRandom) {
 
diff --git a/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.edit.java b/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.edit.java
index 74b1e38..a6e8fa8 100644
--- a/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.edit.java
+++ b/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 4
 
-> CHANGE  8 : 13  @  10 : 13
+> CHANGE  6 : 11  @  8 : 11
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
@@ -15,29 +15,29 @@
 ~ import com.google.common.collect.Maps;
 ~ 
 
-> CHANGE  26 : 27  @  26 : 27
+> CHANGE  18 : 19  @  16 : 17
 
 ~ 	private static final EaglercraftRandom enchantmentRand = new EaglercraftRandom();
 
-> CHANGE  238 : 240  @  238 : 239
+> CHANGE  212 : 214  @  212 : 213
 
 ~ 	public static int calcItemStackEnchantability(EaglercraftRandom parRandom, int parInt1, int parInt2,
 ~ 			ItemStack parItemStack) {
 
-> CHANGE  254 : 255  @  253 : 254
+> CHANGE  16 : 17  @  15 : 16
 
 ~ 	public static ItemStack addRandomEnchantment(EaglercraftRandom parRandom, ItemStack parItemStack, int parInt1) {
 
-> CHANGE  262 : 263  @  261 : 262
+> CHANGE  8 : 9  @  8 : 9
 
 ~ 			for (EnchantmentData enchantmentdata : (List) list) {
 
-> CHANGE  274 : 276  @  273 : 274
+> CHANGE  12 : 14  @  12 : 13
 
 ~ 	public static List buildEnchantmentList(EaglercraftRandom randomIn, ItemStack itemStackIn,
 ~ 			int parInt1) {
 
-> CHANGE  306 : 307  @  304 : 305
+> CHANGE  32 : 33  @  31 : 32
 
 ~ 							for (EnchantmentData enchantmentdata1 : (List) arraylist) {
 
diff --git a/patches/minecraft/net/minecraft/enchantment/EnchantmentThorns.edit.java b/patches/minecraft/net/minecraft/enchantment/EnchantmentThorns.edit.java
index 19bb772..e5ddfd8 100644
--- a/patches/minecraft/net/minecraft/enchantment/EnchantmentThorns.edit.java
+++ b/patches/minecraft/net/minecraft/enchantment/EnchantmentThorns.edit.java
@@ -10,15 +10,15 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> CHANGE  34 : 35  @  36 : 37
+> CHANGE  32 : 33  @  34 : 35
 
 ~ 		EaglercraftRandom random = entitylivingbase.getRNG();
 
-> CHANGE  52 : 53  @  54 : 55
+> CHANGE  18 : 19  @  18 : 19
 
 ~ 	public static boolean func_92094_a(int parInt1, EaglercraftRandom parRandom) {
 
-> CHANGE  56 : 57  @  58 : 59
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public static int func_92095_b(int parInt1, EaglercraftRandom parRandom) {
 
diff --git a/patches/minecraft/net/minecraft/entity/DataWatcher.edit.java b/patches/minecraft/net/minecraft/entity/DataWatcher.edit.java
index 0e94b6e..8c6587a 100644
--- a/patches/minecraft/net/minecraft/entity/DataWatcher.edit.java
+++ b/patches/minecraft/net/minecraft/entity/DataWatcher.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 4
 
-> CHANGE  6 : 12  @  8 : 10
+> CHANGE  4 : 10  @  6 : 8
 
 ~ 
 ~ import org.apache.commons.lang3.ObjectUtils;
@@ -16,38 +16,38 @@
 ~ import com.google.common.collect.Maps;
 ~ 
 
-> DELETE  14  @  12 : 13
+> DELETE  8  @  4 : 5
 
-> DELETE  19  @  18 : 19
+> DELETE  5  @  6 : 7
 
-> DELETE  26  @  26 : 27
+> DELETE  7  @  8 : 9
 
-> DELETE  42  @  43 : 44
+> DELETE  16  @  17 : 18
 
-> DELETE  43  @  45 : 46
+> DELETE  1  @  2 : 3
 
-> DELETE  50  @  53 : 54
+> DELETE  7  @  8 : 9
 
-> DELETE  51  @  55 : 56
+> DELETE  1  @  2 : 3
 
-> DELETE  79  @  84 : 86
+> DELETE  28  @  29 : 31
 
-> DELETE  88  @  95 : 97
+> DELETE  9  @  11 : 13
 
-> DELETE  129  @  138 : 140
+> DELETE  41  @  43 : 45
 
-> DELETE  139  @  150 : 152
+> DELETE  10  @  12 : 14
 
-> DELETE  146  @  159 : 161
+> DELETE  7  @  9 : 11
 
-> DELETE  149  @  164 : 166
+> DELETE  3  @  5 : 7
 
-> DELETE  154  @  171 : 172
+> DELETE  5  @  7 : 8
 
-> DELETE  163  @  181 : 182
+> DELETE  9  @  10 : 11
 
-> DELETE  256  @  275 : 276
+> DELETE  93  @  94 : 95
 
-> DELETE  266  @  286 : 287
+> DELETE  10  @  11 : 12
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/Entity.edit.java b/patches/minecraft/net/minecraft/entity/Entity.edit.java
index f72515e..d91872a 100644
--- a/patches/minecraft/net/minecraft/entity/Entity.edit.java
+++ b/patches/minecraft/net/minecraft/entity/Entity.edit.java
@@ -11,139 +11,139 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 ~ import net.lax1dude.eaglercraft.v1_8.HString;
 
-> INSERT  7 : 8  @  6
+> INSERT  4 : 5  @  3
 
 + 
 
-> DELETE  15  @  13 : 16
+> DELETE  8  @  7 : 10
 
-> DELETE  19  @  20 : 23
+> DELETE  4  @  7 : 10
 
-> DELETE  22  @  26 : 27
+> DELETE  3  @  6 : 7
 
-> DELETE  30  @  35 : 36
+> DELETE  8  @  9 : 10
 
-> DELETE  44  @  50 : 51
+> DELETE  14  @  15 : 16
 
-> CHANGE  45 : 46  @  52 : 53
+> CHANGE  1 : 2  @  2 : 3
 
 ~ public abstract class Entity {
 
-> CHANGE  90 : 91  @  97 : 98
+> CHANGE  45 : 46  @  45 : 46
 
 ~ 	protected EaglercraftRandom rand;
 
-> CHANGE  118 : 119  @  125 : 127
+> CHANGE  28 : 29  @  28 : 30
 
 ~ 	protected EaglercraftUUID entityUniqueID;
 
-> CHANGE  139 : 140  @  147 : 148
+> CHANGE  21 : 22  @  22 : 23
 
 ~ 		this.rand = new EaglercraftRandom();
 
-> DELETE  143  @  151 : 152
+> DELETE  4  @  4 : 5
 
-> DELETE  202  @  211 : 214
+> DELETE  59  @  60 : 63
 
-> DELETE  247  @  259 : 274
+> DELETE  45  @  48 : 63
 
-> DELETE  248  @  275 : 297
+> DELETE  1  @  16 : 38
 
-> CHANGE  250 : 251  @  299 : 311
+> CHANGE  2 : 3  @  24 : 36
 
 ~ 		this.fire = 0;
 
-> DELETE  252  @  312 : 316
+> DELETE  2  @  13 : 17
 
-> DELETE  261  @  325 : 329
+> DELETE  9  @  13 : 17
 
-> CHANGE  377 : 378  @  445 : 446
+> CHANGE  116 : 117  @  120 : 121
 
 ~ 			for (AxisAlignedBB axisalignedbb1 : (List) list1) {
 
-> CHANGE  384 : 385  @  452 : 453
+> CHANGE  7 : 8  @  7 : 8
 
 ~ 			for (AxisAlignedBB axisalignedbb2 : (List) list1) {
 
-> CHANGE  390 : 391  @  458 : 459
+> CHANGE  6 : 7  @  6 : 7
 
 ~ 			for (AxisAlignedBB axisalignedbb13 : (List) list1) {
 
-> CHANGE  408 : 409  @  476 : 477
+> CHANGE  18 : 19  @  18 : 19
 
 ~ 				for (AxisAlignedBB axisalignedbb6 : (List) list) {
 
-> CHANGE  415 : 416  @  483 : 484
+> CHANGE  7 : 8  @  7 : 8
 
 ~ 				for (AxisAlignedBB axisalignedbb7 : (List) list) {
 
-> CHANGE  422 : 423  @  490 : 491
+> CHANGE  7 : 8  @  7 : 8
 
 ~ 				for (AxisAlignedBB axisalignedbb8 : (List) list) {
 
-> CHANGE  430 : 431  @  498 : 499
+> CHANGE  8 : 9  @  8 : 9
 
 ~ 				for (AxisAlignedBB axisalignedbb9 : (List) list) {
 
-> CHANGE  437 : 438  @  505 : 506
+> CHANGE  7 : 8  @  7 : 8
 
 ~ 				for (AxisAlignedBB axisalignedbb10 : (List) list) {
 
-> CHANGE  444 : 445  @  512 : 513
+> CHANGE  7 : 8  @  7 : 8
 
 ~ 				for (AxisAlignedBB axisalignedbb11 : (List) list) {
 
-> CHANGE  463 : 464  @  531 : 532
+> CHANGE  19 : 20  @  19 : 20
 
 ~ 				for (AxisAlignedBB axisalignedbb12 : (List) list) {
 
-> DELETE  1059  @  1127 : 1128
+> DELETE  596  @  596 : 597
 
-> CHANGE  1114 : 1116  @  1183 : 1184
+> CHANGE  55 : 57  @  56 : 57
 
 ~ 				this.entityUniqueID = new EaglercraftUUID(tagCompund.getLong("UUIDMost"),
 ~ 						tagCompund.getLong("UUIDLeast"));
 
-> CHANGE  1117 : 1118  @  1185 : 1186
+> CHANGE  3 : 4  @  2 : 3
 
 ~ 				this.entityUniqueID = EaglercraftUUID.fromString(tagCompund.getString("UUID"));
 
-> DELETE  1127  @  1195 : 1196
+> DELETE  10  @  10 : 11
 
-> CHANGE  1343 : 1344  @  1412 : 1413
+> CHANGE  216 : 217  @  217 : 218
 
 ~ 			for (AxisAlignedBB axisalignedbb : (List) list) {
 
-> DELETE  1367  @  1436 : 1457
+> DELETE  24  @  24 : 45
 
-> CHANGE  1395 : 1396  @  1485 : 1486
+> CHANGE  28 : 29  @  49 : 50
 
 ~ 		boolean flag = this.worldObj != null;
 
-> CHANGE  1579 : 1580  @  1669 : 1670
+> CHANGE  184 : 185  @  184 : 185
 
 ~ 		return HString.format("%s[\'%s\'/%d, l=\'%s\', x=%.2f, y=%.2f, z=%.2f]",
 
-> DELETE  1605  @  1695 : 1729
+> DELETE  26  @  26 : 60
 
-> CHANGE  1635 : 1636  @  1759 : 1760
+> CHANGE  30 : 31  @  64 : 65
 
 ~ 				return EntityList.getEntityString(Entity.this) + " (" + Entity.this.getClass().getName() + ")";
 
-> CHANGE  1644 : 1645  @  1768 : 1769
+> CHANGE  9 : 10  @  9 : 10
 
 ~ 		category.addCrashSection("Entity\'s Exact location", HString.format("%.2f, %.2f, %.2f",
 
-> CHANGE  1649 : 1650  @  1773 : 1774
+> CHANGE  5 : 6  @  5 : 6
 
 ~ 		category.addCrashSection("Entity\'s Momentum", HString.format("%.2f, %.2f, %.2f", new Object[] {
 
-> CHANGE  1667 : 1668  @  1791 : 1792
+> CHANGE  18 : 19  @  18 : 19
 
 ~ 	public EaglercraftUUID getUniqueID() {
 
-> DELETE  1730  @  1854 : 1858
+> DELETE  63  @  63 : 67
 
-> DELETE  1781  @  1909 : 1921
+> DELETE  51  @  55 : 67
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/EntityAgeable.edit.java b/patches/minecraft/net/minecraft/entity/EntityAgeable.edit.java
index 223ffa2..ccfff42 100644
--- a/patches/minecraft/net/minecraft/entity/EntityAgeable.edit.java
+++ b/patches/minecraft/net/minecraft/entity/EntityAgeable.edit.java
@@ -7,13 +7,13 @@
 
 > DELETE  2  @  2 : 4
 
-> DELETE  26  @  28 : 51
+> DELETE  24  @  26 : 49
 
-> CHANGE  38 : 39  @  63 : 64
+> CHANGE  12 : 13  @  35 : 36
 
 ~ 		return this.dataWatcher.getWatchableObjectByte(12);
 
-> CHANGE  91 : 98  @  116 : 127
+> CHANGE  53 : 60  @  53 : 64
 
 ~ 		if (this.field_175503_c > 0) {
 ~ 			if (this.field_175503_c % 4 == 0) {
@@ -23,11 +23,11 @@
 ~ 						this.posZ + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width, 0.0D,
 ~ 						0.0D, 0.0D, new int[0]);
 
-> CHANGE  100 : 101  @  129 : 142
+> CHANGE  9 : 10  @  13 : 26
 
 ~ 			--this.field_175503_c;
 
-> INSERT  103 : 104  @  144
+> INSERT  3 : 4  @  15
 
 + 		this.setScaleForAge(this.isChild());
 
diff --git a/patches/minecraft/net/minecraft/entity/EntityCreature.edit.java b/patches/minecraft/net/minecraft/entity/EntityCreature.edit.java
index 4509d05..c1a3395 100644
--- a/patches/minecraft/net/minecraft/entity/EntityCreature.edit.java
+++ b/patches/minecraft/net/minecraft/entity/EntityCreature.edit.java
@@ -10,23 +10,23 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 ~ 
 
-> DELETE  6  @  9 : 10
+> DELETE  4  @  7 : 8
 
-> CHANGE  10 : 12  @  14 : 15
+> CHANGE  4 : 6  @  5 : 6
 
 ~ 	public static final EaglercraftUUID FLEEING_SPEED_MODIFIER_UUID = EaglercraftUUID
 ~ 			.fromString("E199AD21-BA8A-4C53-8D13-6182D5C69D3A");
 
-> DELETE  16  @  19 : 20
+> DELETE  6  @  5 : 6
 
-> CHANGE  32 : 33  @  36 : 37
+> CHANGE  16 : 17  @  17 : 18
 
 ~ 		return false;
 
-> DELETE  81  @  85 : 90
+> DELETE  49  @  49 : 54
 
-> DELETE  85  @  94 : 98
+> DELETE  4  @  9 : 13
 
-> DELETE  99  @  112 : 117
+> DELETE  14  @  18 : 23
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/EntityHanging.edit.java b/patches/minecraft/net/minecraft/entity/EntityHanging.edit.java
index 018dc4a..a99fa03 100644
--- a/patches/minecraft/net/minecraft/entity/EntityHanging.edit.java
+++ b/patches/minecraft/net/minecraft/entity/EntityHanging.edit.java
@@ -10,18 +10,18 @@
 + import org.apache.commons.lang3.Validate;
 + 
 
-> DELETE  6  @  4 : 5
+> DELETE  4  @  2 : 3
 
-> DELETE  13  @  12 : 13
+> DELETE  7  @  8 : 9
 
-> CHANGE  81 : 82  @  81 : 89
+> CHANGE  68 : 69  @  69 : 77
 
 ~ 		this.tickCounter1++;
 
-> DELETE  128  @  135 : 149
+> DELETE  47  @  54 : 68
 
-> DELETE  129  @  150 : 154
+> DELETE  1  @  15 : 19
 
-> DELETE  133  @  158 : 162
+> DELETE  4  @  8 : 12
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/EntityLeashKnot.edit.java b/patches/minecraft/net/minecraft/entity/EntityLeashKnot.edit.java
index 750ccbc..60e1a9f 100644
--- a/patches/minecraft/net/minecraft/entity/EntityLeashKnot.edit.java
+++ b/patches/minecraft/net/minecraft/entity/EntityLeashKnot.edit.java
@@ -7,8 +7,8 @@
 
 > DELETE  3  @  3 : 6
 
-> DELETE  4  @  7 : 9
+> DELETE  1  @  4 : 6
 
-> DELETE  63  @  68 : 97
+> DELETE  59  @  61 : 90
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/EntityList.edit.java b/patches/minecraft/net/minecraft/entity/EntityList.edit.java
index c02170d..0b80322 100644
--- a/patches/minecraft/net/minecraft/entity/EntityList.edit.java
+++ b/patches/minecraft/net/minecraft/entity/EntityList.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 4
 
-> CHANGE  6 : 12  @  8 : 12
+> CHANGE  4 : 10  @  6 : 10
 
 ~ 
 ~ import com.google.common.collect.Lists;
@@ -16,81 +16,81 @@
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
-> DELETE  78  @  78 : 80
+> DELETE  72  @  70 : 72
 
-> INSERT  82 : 84  @  84
+> INSERT  4 : 6  @  6
 
 + 	private static final Map> stringToConstructorMapping = Maps
 + 			.newHashMap();
 
-> INSERT  86 : 87  @  86
+> INSERT  4 : 5  @  2
 
 + 	private static final Map> idToConstructorMapping = Maps.newHashMap();
 
-> CHANGE  91 : 93  @  90 : 91
+> CHANGE  5 : 7  @  4 : 5
 
 ~ 	private static void addMapping(Class entityClass,
 ~ 			EntityConstructor entityConstructor, String entityName, int id) {
 
-> INSERT  103 : 104  @  101
+> INSERT  12 : 13  @  11
 
 + 			stringToConstructorMapping.put(entityName, entityConstructor);
 
-> INSERT  106 : 107  @  103
+> INSERT  3 : 4  @  2
 
 + 			idToConstructorMapping.put(Integer.valueOf(id), entityConstructor);
 
-> CHANGE  112 : 114  @  108 : 109
+> CHANGE  6 : 8  @  5 : 6
 
 ~ 	private static void addMapping(Class entityClass,
 ~ 			EntityConstructor entityConstructor, String entityName, int entityID, int baseColor,
 
-> CHANGE  115 : 116  @  110 : 111
+> CHANGE  3 : 4  @  2 : 3
 
 ~ 		addMapping(entityClass, entityConstructor, entityName, entityID);
 
-> CHANGE  123 : 126  @  118 : 122
+> CHANGE  8 : 11  @  8 : 12
 
 ~ 			EntityConstructor constructor = stringToConstructorMapping.get(entityName);
 ~ 			if (constructor != null) {
 ~ 				entity = constructor.createEntity(worldIn);
 
-> CHANGE  128 : 129  @  124 : 125
+> CHANGE  5 : 6  @  6 : 7
 
 ~ 			logger.error("Could not create entity", exception);
 
-> CHANGE  142 : 145  @  138 : 142
+> CHANGE  14 : 17  @  14 : 18
 
 ~ 			EntityConstructor constructor = stringToConstructorMapping.get(nbt.getString("id"));
 ~ 			if (constructor != null) {
 ~ 				entity = constructor.createEntity(worldIn);
 
-> CHANGE  147 : 148  @  144 : 145
+> CHANGE  5 : 6  @  6 : 7
 
 ~ 			logger.error("Could not create entity", exception);
 
-> CHANGE  163 : 166  @  160 : 164
+> CHANGE  16 : 19  @  16 : 20
 
 ~ 			EntityConstructor constructor = getConstructorFromID(entityID);
 ~ 			if (constructor != null) {
 ~ 				entity = constructor.createEntity(worldIn);
 
-> CHANGE  168 : 169  @  166 : 167
+> CHANGE  5 : 6  @  6 : 7
 
 ~ 			logger.error("Could not create entity", exception);
 
-> INSERT  187 : 191  @  185
+> INSERT  19 : 23  @  19
 
 + 	public static EntityConstructor getConstructorFromID(int entityID) {
 + 		return idToConstructorMapping.get(Integer.valueOf(entityID));
 + 	}
 + 
 
-> CHANGE  208 : 209  @  202 : 203
+> CHANGE  21 : 22  @  17 : 18
 
 ~ 		Set set = stringToClassMapping.keySet();
 
-> CHANGE  238 : 307  @  232 : 294
+> CHANGE  30 : 99  @  30 : 92
 
 ~ 		addMapping(EntityItem.class, (w) -> new EntityItem(w), "Item", 1);
 ~ 		addMapping(EntityXPOrb.class, (w) -> new EntityXPOrb(w), "XPOrb", 2);
diff --git a/patches/minecraft/net/minecraft/entity/EntityLiving.edit.java b/patches/minecraft/net/minecraft/entity/EntityLiving.edit.java
index 9a9375d..10ebb13 100644
--- a/patches/minecraft/net/minecraft/entity/EntityLiving.edit.java
+++ b/patches/minecraft/net/minecraft/entity/EntityLiving.edit.java
@@ -10,25 +10,25 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 ~ 
 
-> DELETE  5  @  4 : 16
+> DELETE  3  @  2 : 14
 
-> DELETE  22  @  33 : 36
+> DELETE  17  @  29 : 32
 
-> DELETE  29  @  43 : 44
+> DELETE  7  @  10 : 11
 
-> DELETE  33  @  48 : 51
+> DELETE  4  @  5 : 8
 
-> DELETE  34  @  52 : 55
+> DELETE  1  @  4 : 7
 
-> DELETE  35  @  56 : 57
+> DELETE  1  @  4 : 5
 
-> DELETE  45  @  67 : 73
+> DELETE  10  @  11 : 17
 
-> DELETE  46  @  74 : 81
+> DELETE  1  @  7 : 14
 
-> DELETE  53  @  88 : 112
+> DELETE  7  @  14 : 38
 
-> CHANGE  114 : 124  @  173 : 188
+> CHANGE  61 : 71  @  85 : 100
 
 ~ 		for (int i = 0; i < 20; ++i) {
 ~ 			double d0 = this.rand.nextGaussian() * 0.02D;
@@ -41,19 +41,19 @@
 ~ 					this.posZ + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width - d2 * d3,
 ~ 					d0, d1, d2, new int[0]);
 
-> DELETE  125  @  189 : 190
+> DELETE  11  @  16 : 17
 
-> DELETE  136  @  201 : 209
+> DELETE  11  @  12 : 20
 
-> DELETE  249  @  322 : 338
+> DELETE  113  @  121 : 137
 
-> DELETE  344  @  433 : 461
+> DELETE  95  @  111 : 139
 
-> DELETE  672  @  789 : 797
+> DELETE  328  @  356 : 364
 
-> DELETE  691  @  816 : 821
+> DELETE  19  @  27 : 32
 
-> CHANGE  696 : 698  @  826 : 827
+> CHANGE  5 : 7  @  10 : 11
 
 ~ 				EaglercraftUUID uuid = new EaglercraftUUID(this.leashNBTTag.getLong("UUIDMost"),
 ~ 						this.leashNBTTag.getLong("UUIDLeast"));
diff --git a/patches/minecraft/net/minecraft/entity/EntityLivingBase.edit.java b/patches/minecraft/net/minecraft/entity/EntityLivingBase.edit.java
index 7f44b2a..00aaeba 100644
--- a/patches/minecraft/net/minecraft/entity/EntityLivingBase.edit.java
+++ b/patches/minecraft/net/minecraft/entity/EntityLivingBase.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 5
 
-> CHANGE  6 : 13  @  9 : 11
+> CHANGE  4 : 11  @  7 : 9
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
@@ -17,94 +17,94 @@
 ~ import com.google.common.collect.Maps;
 ~ 
 
-> DELETE  15  @  13 : 14
+> DELETE  9  @  4 : 5
 
-> DELETE  16  @  15 : 19
+> DELETE  1  @  2 : 6
 
-> DELETE  21  @  24 : 27
+> DELETE  5  @  9 : 12
 
-> DELETE  22  @  28 : 30
+> DELETE  1  @  4 : 6
 
-> DELETE  31  @  39 : 42
+> DELETE  9  @  11 : 14
 
-> DELETE  44  @  55 : 56
+> DELETE  13  @  16 : 17
 
-> CHANGE  46 : 48  @  58 : 59
+> CHANGE  2 : 4  @  3 : 4
 
 ~ 	private static final EaglercraftUUID sprintingSpeedBoostModifierUUID = EaglercraftUUID
 ~ 			.fromString("662A6B8D-DA3E-4C1C-8813-96EA6097278D");
 
-> DELETE  141  @  152 : 169
+> DELETE  95  @  94 : 111
 
-> CHANGE  166 : 167  @  194 : 197
+> CHANGE  25 : 26  @  42 : 45
 
 ~ 		this.extinguish();
 
-> DELETE  189  @  219 : 222
+> DELETE  23  @  25 : 28
 
-> CHANGE  203 : 204  @  236 : 237
+> CHANGE  14 : 15  @  17 : 18
 
 ~ 		if (this.hurtResistantTime > 0) {
 
-> DELETE  245  @  278 : 281
+> DELETE  42  @  42 : 45
 
-> DELETE  246  @  282 : 290
+> DELETE  1  @  4 : 12
 
-> CHANGE  279 : 280  @  323 : 324
+> CHANGE  33 : 34  @  41 : 42
 
 ~ 	public EaglercraftRandom getRNG() {
 
-> DELETE  354  @  398 : 401
+> DELETE  75  @  75 : 78
 
-> CHANGE  391 : 392  @  438 : 444
+> CHANGE  37 : 38  @  40 : 46
 
 ~ 			if (potioneffect.onUpdate(this) && potioneffect.getDuration() % 600 == 0) {
 
-> CHANGE  396 : 397  @  448 : 452
+> CHANGE  5 : 6  @  10 : 14
 
 ~ 		this.potionsNeedUpdate = false;
 
-> DELETE  398  @  453 : 456
+> DELETE  2  @  5 : 8
 
-> DELETE  445  @  503 : 504
+> DELETE  47  @  50 : 51
 
-> DELETE  446  @  505 : 514
+> DELETE  1  @  2 : 11
 
-> DELETE  508  @  576 : 581
+> DELETE  62  @  71 : 76
 
-> DELETE  512  @  585 : 592
+> DELETE  4  @  9 : 16
 
-> DELETE  516  @  596 : 601
+> DELETE  4  @  11 : 16
 
-> CHANGE  535 : 536  @  620 : 713
+> CHANGE  19 : 20  @  24 : 117
 
 ~ 		return false;
 
-> DELETE  569  @  746 : 751
+> DELETE  34  @  126 : 131
 
-> DELETE  570  @  752 : 761
+> DELETE  1  @  6 : 15
 
-> DELETE  760  @  951 : 955
+> DELETE  190  @  199 : 203
 
-> DELETE  819  @  1014 : 1015
+> DELETE  59  @  63 : 64
 
-> CHANGE  973 : 976  @  1169 : 1174
+> CHANGE  154 : 157  @  155 : 160
 
 ~ 					if (!this.worldObj.isBlockLoaded(new BlockPos((int) this.posX, 0, (int) this.posZ))
 ~ 							|| !this.worldObj.getChunkFromBlockCoords(new BlockPos((int) this.posX, 0, (int) this.posZ))
 ~ 									.isLoaded()) {
 
-> DELETE  1063  @  1261 : 1297
+> DELETE  90  @  92 : 128
 
-> DELETE  1221  @  1455 : 1459
+> DELETE  158  @  194 : 198
 
-> DELETE  1250  @  1488 : 1492
+> DELETE  29  @  33 : 37
 
-> DELETE  1281  @  1523 : 1529
+> DELETE  31  @  35 : 41
 
-> DELETE  1282  @  1530 : 1541
+> DELETE  1  @  7 : 18
 
-> CHANGE  1313 : 1314  @  1572 : 1573
+> CHANGE  31 : 32  @  42 : 43
 
 ~ 		return false;
 
diff --git a/patches/minecraft/net/minecraft/entity/EntityMinecartCommandBlock.edit.java b/patches/minecraft/net/minecraft/entity/EntityMinecartCommandBlock.edit.java
index 9d1c038..76fd257 100644
--- a/patches/minecraft/net/minecraft/entity/EntityMinecartCommandBlock.edit.java
+++ b/patches/minecraft/net/minecraft/entity/EntityMinecartCommandBlock.edit.java
@@ -9,6 +9,6 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf;
 
-> DELETE  5  @  5 : 6
+> DELETE  3  @  3 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/EntitySpawnPlacementRegistry.edit.java b/patches/minecraft/net/minecraft/entity/EntitySpawnPlacementRegistry.edit.java
index c34ac5b..2d4d04f 100644
--- a/patches/minecraft/net/minecraft/entity/EntitySpawnPlacementRegistry.edit.java
+++ b/patches/minecraft/net/minecraft/entity/EntitySpawnPlacementRegistry.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 6  @  4 : 5
+> CHANGE  1 : 4  @  2 : 3
 
 ~ 
 ~ import com.google.common.collect.Maps;
diff --git a/patches/minecraft/net/minecraft/entity/SharedMonsterAttributes.edit.java b/patches/minecraft/net/minecraft/entity/SharedMonsterAttributes.edit.java
index bbf5a6d..21d029c 100644
--- a/patches/minecraft/net/minecraft/entity/SharedMonsterAttributes.edit.java
+++ b/patches/minecraft/net/minecraft/entity/SharedMonsterAttributes.edit.java
@@ -12,13 +12,13 @@
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
-> DELETE  14  @  11 : 13
+> DELETE  11  @  8 : 10
 
-> CHANGE  47 : 48  @  46 : 47
+> CHANGE  33 : 34  @  35 : 36
 
 ~ 			for (AttributeModifier attributemodifier : (Collection) collection) {
 
-> CHANGE  105 : 107  @  104 : 105
+> CHANGE  58 : 60  @  58 : 59
 
 ~ 		EaglercraftUUID uuid = new EaglercraftUUID(parNBTTagCompound.getLong("UUIDMost"),
 ~ 				parNBTTagCompound.getLong("UUIDLeast"));
diff --git a/patches/minecraft/net/minecraft/entity/ai/attributes/AttributeModifier.edit.java b/patches/minecraft/net/minecraft/entity/ai/attributes/AttributeModifier.edit.java
index 382b1d0..314be98 100644
--- a/patches/minecraft/net/minecraft/entity/ai/attributes/AttributeModifier.edit.java
+++ b/patches/minecraft/net/minecraft/entity/ai/attributes/AttributeModifier.edit.java
@@ -10,21 +10,21 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 ~ 
 
-> INSERT  6 : 9  @  7
+> INSERT  4 : 7  @  5
 
 + import net.lax1dude.eaglercraft.v1_8.ThreadLocalRandom;
 + import net.minecraft.util.MathHelper;
 + 
 
-> CHANGE  13 : 14  @  11 : 12
+> CHANGE  7 : 8  @  4 : 5
 
 ~ 	private final EaglercraftUUID id;
 
-> CHANGE  20 : 21  @  18 : 19
+> CHANGE  7 : 8  @  7 : 8
 
 ~ 	public AttributeModifier(EaglercraftUUID idIn, String nameIn, double amountIn, int operationIn) {
 
-> CHANGE  30 : 31  @  28 : 29
+> CHANGE  10 : 11  @  10 : 11
 
 ~ 	public EaglercraftUUID getID() {
 
diff --git a/patches/minecraft/net/minecraft/entity/ai/attributes/BaseAttributeMap.edit.java b/patches/minecraft/net/minecraft/entity/ai/attributes/BaseAttributeMap.edit.java
index ae743c7..f48bce2 100644
--- a/patches/minecraft/net/minecraft/entity/ai/attributes/BaseAttributeMap.edit.java
+++ b/patches/minecraft/net/minecraft/entity/ai/attributes/BaseAttributeMap.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 5
 
-> CHANGE  5 : 10  @  8 : 11
+> CHANGE  3 : 8  @  6 : 9
 
 ~ 
 ~ import com.google.common.collect.HashMultimap;
diff --git a/patches/minecraft/net/minecraft/entity/ai/attributes/IAttributeInstance.edit.java b/patches/minecraft/net/minecraft/entity/ai/attributes/IAttributeInstance.edit.java
index a2764ec..d45888b 100644
--- a/patches/minecraft/net/minecraft/entity/ai/attributes/IAttributeInstance.edit.java
+++ b/patches/minecraft/net/minecraft/entity/ai/attributes/IAttributeInstance.edit.java
@@ -9,7 +9,7 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 
-> CHANGE  18 : 19  @  20 : 21
+> CHANGE  15 : 16  @  17 : 18
 
 ~ 	AttributeModifier getModifier(EaglercraftUUID var1);
 
diff --git a/patches/minecraft/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.edit.java b/patches/minecraft/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.edit.java
index c043dcb..87d424e 100644
--- a/patches/minecraft/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.edit.java
+++ b/patches/minecraft/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.edit.java
@@ -7,34 +7,34 @@
 
 > DELETE  2  @  2 : 5
 
-> INSERT  4 : 5  @  7
+> INSERT  2 : 3  @  5
 
 + import java.util.List;
 
-> CHANGE  7 : 8  @  9 : 14
+> CHANGE  3 : 4  @  2 : 7
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 
-> INSERT  9 : 13  @  15
+> INSERT  2 : 6  @  6
 
 + import com.google.common.collect.Lists;
 + import com.google.common.collect.Maps;
 + import com.google.common.collect.Sets;
 + 
 
-> CHANGE  18 : 19  @  20 : 21
+> CHANGE  9 : 10  @  5 : 6
 
 ~ 	private final Map mapByUUID = Maps.newHashMap();
 
-> CHANGE  63 : 64  @  65 : 66
+> CHANGE  45 : 46  @  45 : 46
 
 ~ 	public AttributeModifier getModifier(EaglercraftUUID uuid) {
 
-> CHANGE  75 : 76  @  77 : 78
+> CHANGE  12 : 13  @  12 : 13
 
 ~ 			Set object = (Set) this.mapByName.get(attributemodifier.getName());
 
-> CHANGE  114 : 115  @  116 : 117
+> CHANGE  39 : 40  @  39 : 40
 
 ~ 			for (AttributeModifier attributemodifier : (List) Lists.newArrayList(collection)) {
 
diff --git a/patches/minecraft/net/minecraft/entity/boss/EntityDragon.edit.java b/patches/minecraft/net/minecraft/entity/boss/EntityDragon.edit.java
index 4d70747..ef03c0f 100644
--- a/patches/minecraft/net/minecraft/entity/boss/EntityDragon.edit.java
+++ b/patches/minecraft/net/minecraft/entity/boss/EntityDragon.edit.java
@@ -7,23 +7,23 @@
 
 > DELETE  2  @  2 : 5
 
-> CHANGE  3 : 4  @  6 : 9
+> CHANGE  1 : 2  @  4 : 7
 
 ~ 
 
-> DELETE  6  @  11 : 12
+> DELETE  3  @  5 : 6
 
-> DELETE  8  @  14 : 16
+> DELETE  2  @  3 : 5
 
-> DELETE  9  @  17 : 18
+> DELETE  1  @  3 : 4
 
-> DELETE  11  @  20 : 23
+> DELETE  2  @  3 : 6
 
-> DELETE  13  @  25 : 26
+> DELETE  2  @  5 : 6
 
-> DELETE  15  @  28 : 30
+> DELETE  2  @  3 : 5
 
-> CHANGE  86 : 91  @  101 : 108
+> CHANGE  71 : 76  @  73 : 80
 
 ~ 		float f = MathHelper.cos(this.animTime * 3.1415927F * 2.0F);
 ~ 		float f1 = MathHelper.cos(this.prevAnimTime * 3.1415927F * 2.0F);
@@ -31,7 +31,7 @@
 ~ 			this.worldObj.playSound(this.posX, this.posY, this.posZ, "mob.enderdragon.wings", 5.0F,
 ~ 					0.8F + this.rand.nextFloat() * 0.3F, false);
 
-> CHANGE  129 : 142  @  146 : 240
+> CHANGE  43 : 56  @  45 : 139
 
 ~ 				if (this.newPosRotationIncrements > 0) {
 ~ 					double d10 = this.posX + (this.newPosX - this.posX) / (double) this.newPosRotationIncrements;
@@ -47,26 +47,26 @@
 ~ 					this.setPosition(d10, d0, d1);
 ~ 					this.setRotation(this.rotationYaw, this.rotationPitch);
 
-> DELETE  171  @  269 : 279
+> DELETE  42  @  123 : 133
 
-> DELETE  208  @  316 : 321
+> DELETE  37  @  47 : 52
 
-> DELETE  215  @  328 : 333
+> DELETE  7  @  12 : 17
 
-> CHANGE  228 : 229  @  346 : 347
+> CHANGE  13 : 14  @  18 : 19
 
 ~ 			for (EntityEnderCrystal entityendercrystal1 : (List) list) {
 
-> DELETE  241  @  359 : 421
+> DELETE  13  @  13 : 75
 
-> DELETE  245  @  425 : 466
+> DELETE  4  @  66 : 107
 
-> DELETE  290  @  511 : 529
+> DELETE  45  @  86 : 104
 
-> DELETE  292  @  531 : 534
+> DELETE  2  @  20 : 23
 
-> DELETE  293  @  535 : 547
+> DELETE  1  @  4 : 16
 
-> DELETE  295  @  549 : 592
+> DELETE  2  @  14 : 57
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/boss/EntityWither.edit.java b/patches/minecraft/net/minecraft/entity/boss/EntityWither.edit.java
index 47be141..8f3cfa3 100644
--- a/patches/minecraft/net/minecraft/entity/boss/EntityWither.edit.java
+++ b/patches/minecraft/net/minecraft/entity/boss/EntityWither.edit.java
@@ -10,24 +10,24 @@
 + import java.util.List;
 + 
 
-> CHANGE  6 : 7  @  4 : 5
+> CHANGE  4 : 5  @  2 : 3
 
 ~ 
 
-> DELETE  10  @  8 : 9
+> DELETE  4  @  4 : 5
 
-> DELETE  14  @  13 : 21
+> DELETE  4  @  5 : 13
 
-> DELETE  22  @  29 : 30
+> DELETE  8  @  16 : 17
 
-> DELETE  23  @  31 : 32
+> DELETE  1  @  2 : 3
 
-> DELETE  51  @  60 : 69
+> DELETE  28  @  29 : 38
 
-> DELETE  86  @  104 : 111
+> DELETE  35  @  44 : 51
 
-> DELETE  87  @  112 : 126
+> DELETE  1  @  8 : 22
 
-> DELETE  398  @  437 : 444
+> DELETE  311  @  325 : 332
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/effect/EntityLightningBolt.edit.java b/patches/minecraft/net/minecraft/entity/effect/EntityLightningBolt.edit.java
index 1d018e2..f24b247 100644
--- a/patches/minecraft/net/minecraft/entity/effect/EntityLightningBolt.edit.java
+++ b/patches/minecraft/net/minecraft/entity/effect/EntityLightningBolt.edit.java
@@ -7,13 +7,13 @@
 
 > DELETE  2  @  2 : 7
 
-> DELETE  3  @  8 : 11
+> DELETE  1  @  6 : 9
 
-> DELETE  16  @  24 : 43
+> DELETE  13  @  16 : 35
 
-> DELETE  35  @  62 : 69
+> DELETE  19  @  38 : 45
 
-> CHANGE  39 : 40  @  73 : 85
+> CHANGE  4 : 5  @  11 : 23
 
 ~ 			this.worldObj.setLastLightningBolt(2);
 
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityArmorStand.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityArmorStand.edit.java
index 352401e..b11ddf5 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityArmorStand.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityArmorStand.edit.java
@@ -9,24 +9,24 @@
 
 ~ 
 
-> DELETE  7  @  7 : 8
+> DELETE  4  @  4 : 5
 
-> DELETE  8  @  9 : 14
+> DELETE  1  @  2 : 7
 
-> DELETE  12  @  18 : 19
+> DELETE  4  @  9 : 10
 
-> DELETE  13  @  20 : 21
+> DELETE  1  @  2 : 3
 
-> DELETE  16  @  24 : 25
+> DELETE  3  @  4 : 5
 
-> DELETE  264  @  273 : 336
+> DELETE  248  @  249 : 312
 
-> DELETE  269  @  341 : 368
+> DELETE  5  @  68 : 95
 
-> CHANGE  270 : 271  @  369 : 424
+> CHANGE  1 : 2  @  28 : 83
 
 ~ 		return false;
 
-> DELETE  283  @  436 : 476
+> DELETE  13  @  67 : 107
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityBoat.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityBoat.edit.java
index 57611e4..2e14f18 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityBoat.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityBoat.edit.java
@@ -7,26 +7,26 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  8  @  9 : 11
+> DELETE  6  @  7 : 9
 
-> DELETE  11  @  14 : 16
+> DELETE  3  @  5 : 7
 
-> DELETE  73  @  78 : 111
+> DELETE  62  @  64 : 97
 
-> CHANGE  182 : 183  @  220 : 221
+> CHANGE  109 : 110  @  142 : 143
 
 ~ 		if (this.isBoatEmpty) {
 
-> CHANGE  276 : 277  @  314 : 328
+> CHANGE  94 : 95  @  94 : 108
 
 ~ 			if (!(this.isCollidedHorizontally && d9 > 0.2975D)) {
 
-> DELETE  301  @  352 : 369
+> DELETE  25  @  38 : 55
 
-> CHANGE  320 : 321  @  388 : 398
+> CHANGE  19 : 20  @  36 : 46
 
 ~ 		return true;
 
-> DELETE  327  @  404 : 417
+> DELETE  7  @  16 : 29
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityEnderCrystal.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityEnderCrystal.edit.java
index 7af5040..74c46c6 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityEnderCrystal.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityEnderCrystal.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  6  @  6 : 7
 
-> DELETE  61  @  62 : 79
+> DELETE  55  @  56 : 73
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityEnderEye.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityEnderEye.edit.java
index bebc520..220a498 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityEnderEye.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityEnderEye.edit.java
@@ -7,10 +7,10 @@
 
 > DELETE  3  @  3 : 6
 
-> DELETE  108  @  111 : 121
+> DELETE  105  @  108 : 118
 
-> DELETE  109  @  122 : 131
+> DELETE  1  @  11 : 20
 
-> DELETE  124  @  146 : 160
+> DELETE  15  @  24 : 38
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.edit.java
index 7964db9..2852316 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.edit.java
@@ -7,10 +7,10 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  3  @  4 : 5
+> DELETE  1  @  2 : 3
 
-> DELETE  4  @  6 : 7
+> DELETE  1  @  2 : 3
 
-> DELETE  42  @  45 : 74
+> DELETE  38  @  39 : 68
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityExpBottle.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityExpBottle.edit.java
index f4b55b3..ec70b0d 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityExpBottle.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityExpBottle.edit.java
@@ -7,10 +7,10 @@
 
 > DELETE  3  @  3 : 4
 
-> DELETE  4  @  5 : 6
+> DELETE  1  @  2 : 3
 
-> DELETE  33  @  35 : 38
+> DELETE  29  @  30 : 33
 
-> DELETE  34  @  39 : 48
+> DELETE  1  @  4 : 13
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityFallingBlock.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityFallingBlock.edit.java
index a290505..4dcca6b 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityFallingBlock.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityFallingBlock.edit.java
@@ -7,28 +7,28 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 7  @  4
+> INSERT  1 : 5  @  2
 
 + import java.util.List;
 + 
 + import com.google.common.collect.Lists;
 + 
 
-> DELETE  9  @  6 : 8
+> DELETE  6  @  2 : 4
 
-> DELETE  14  @  13 : 15
+> DELETE  5  @  7 : 9
 
-> DELETE  15  @  16 : 17
+> DELETE  1  @  3 : 4
 
-> DELETE  17  @  19 : 20
+> DELETE  2  @  3 : 4
 
-> DELETE  72  @  75 : 78
+> DELETE  55  @  56 : 59
 
-> DELETE  80  @  86 : 101
+> DELETE  8  @  11 : 26
 
-> DELETE  81  @  102 : 135
+> DELETE  1  @  16 : 49
 
-> CHANGE  94 : 95  @  148 : 149
+> CHANGE  13 : 14  @  46 : 47
 
 ~ 				for (Entity entity : (List) arraylist) {
 
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityFireworkRocket.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityFireworkRocket.edit.java
index 26d65fa..760f5fb 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityFireworkRocket.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityFireworkRocket.edit.java
@@ -9,9 +9,9 @@
 
 ~ 		if (this.fireworkAge % 2 < 2) {
 
-> DELETE  105  @  105 : 110
+> DELETE  6  @  6 : 11
 
-> CHANGE  108 : 109  @  113 : 114
+> CHANGE  3 : 4  @  8 : 9
 
 ~ 		if (b0 == 17) {
 
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityItem.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityItem.edit.java
index 6bd3d95..64df19a 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityItem.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityItem.edit.java
@@ -10,20 +10,20 @@
 + import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 + import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
-> DELETE  9  @  7 : 8
+> DELETE  7  @  5 : 6
 
-> DELETE  11  @  10 : 11
+> DELETE  2  @  3 : 4
 
-> DELETE  16  @  16 : 18
+> DELETE  5  @  6 : 8
 
-> DELETE  84  @  86 : 90
+> DELETE  68  @  70 : 74
 
-> DELETE  105  @  111 : 114
+> DELETE  21  @  25 : 28
 
-> DELETE  241  @  250 : 259
+> DELETE  136  @  139 : 148
 
-> DELETE  242  @  260 : 295
+> DELETE  1  @  10 : 45
 
-> DELETE  253  @  306 : 314
+> DELETE  11  @  46 : 54
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityItemFrame.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityItemFrame.edit.java
index eda1ae5..9a5336d 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityItemFrame.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityItemFrame.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  41  @  41 : 46
 
-> DELETE  167  @  172 : 185
+> DELETE  126  @  131 : 144
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecart.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityMinecart.edit.java
index 8604f5c..4a71f85 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityMinecart.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecart.edit.java
@@ -7,23 +7,23 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.collect.Maps;
 + 
 
-> DELETE  14  @  12 : 19
+> DELETE  11  @  8 : 15
 
-> DELETE  18  @  23 : 24
+> DELETE  4  @  11 : 12
 
-> DELETE  29  @  35 : 36
+> DELETE  11  @  12 : 13
 
-> CHANGE  114 : 115  @  121 : 148
+> CHANGE  85 : 86  @  86 : 113
 
 ~ 		return true;
 
-> CHANGE  157 : 168  @  190 : 245
+> CHANGE  43 : 54  @  69 : 124
 
 ~ 		if (this.turnProgress > 0) {
 ~ 			double d4 = this.posX + (this.minecartX - this.posX) / (double) this.turnProgress;
@@ -37,14 +37,14 @@
 ~ 			this.setPosition(d4, d5, d6);
 ~ 			this.setRotation(this.rotationYaw, this.rotationPitch);
 
-> CHANGE  169 : 170  @  246 : 286
+> CHANGE  12 : 13  @  56 : 96
 
 ~ 			this.setPosition(this.posX, this.posY, this.posZ);
 
-> DELETE  171  @  287 : 304
+> DELETE  2  @  41 : 58
 
-> DELETE  522  @  655 : 665
+> DELETE  351  @  368 : 378
 
-> DELETE  523  @  666 : 733
+> DELETE  1  @  11 : 78
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartContainer.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityMinecartContainer.edit.java
index 4b31f10..17045d7 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartContainer.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartContainer.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  144  @  145 : 149
+> DELETE  142  @  143 : 147
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.edit.java
index 3f565a4..6a6277f 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  3  @  3 : 4
 
-> DELETE  22  @  23 : 27
+> DELETE  19  @  20 : 24
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartHopper.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityMinecartHopper.edit.java
index 008836c..97f9774 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartHopper.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartHopper.edit.java
@@ -9,10 +9,10 @@
 
 + 
 
-> DELETE  5  @  4 : 7
+> DELETE  2  @  1 : 4
 
-> DELETE  49  @  51 : 55
+> DELETE  44  @  47 : 51
 
-> DELETE  84  @  90 : 111
+> DELETE  35  @  39 : 60
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartTNT.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityMinecartTNT.edit.java
index 5f3124b..bd79954 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartTNT.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartTNT.edit.java
@@ -7,10 +7,10 @@
 
 > DELETE  5  @  5 : 6
 
-> DELETE  80  @  81 : 86
+> DELETE  75  @  76 : 81
 
-> DELETE  81  @  87 : 92
+> DELETE  1  @  6 : 11
 
-> DELETE  110  @  121 : 128
+> DELETE  29  @  34 : 41
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityPainting.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityPainting.edit.java
index a620c08..6e6896b 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityPainting.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityPainting.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.collect.Lists;
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityTNTPrimed.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityTNTPrimed.edit.java
index 3a572e2..8f3adca 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityTNTPrimed.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityTNTPrimed.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  61  @  61 : 64
 
-> DELETE  69  @  72 : 77
+> DELETE  8  @  11 : 16
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityBlaze.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityBlaze.edit.java
index e5ca398..684ed89 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntityBlaze.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntityBlaze.edit.java
@@ -7,20 +7,20 @@
 
 > DELETE  4  @  4 : 14
 
-> DELETE  6  @  16 : 17
+> DELETE  2  @  12 : 13
 
-> DELETE  8  @  19 : 20
+> DELETE  2  @  3 : 4
 
-> DELETE  18  @  30 : 37
+> DELETE  10  @  11 : 18
 
-> CHANGE  57 : 61  @  76 : 81
+> CHANGE  39 : 43  @  46 : 51
 
 ~ 		if (this.rand.nextInt(24) == 0 && !this.isSilent()) {
 ~ 			this.worldObj.playSound(this.posX + 0.5D, this.posY + 0.5D, this.posZ + 0.5D, "fire.fire",
 ~ 					1.0F + this.rand.nextFloat(), this.rand.nextFloat() * 0.7F + 0.3F, false);
 ~ 		}
 
-> CHANGE  62 : 67  @  82 : 89
+> CHANGE  5 : 10  @  6 : 13
 
 ~ 		for (int i = 0; i < 2; ++i) {
 ~ 			this.worldObj.spawnParticle(EnumParticleTypes.SMOKE_LARGE,
@@ -28,6 +28,6 @@
 ~ 					this.posY + this.rand.nextDouble() * (double) this.height,
 ~ 					this.posZ + (this.rand.nextDouble() - 0.5D) * (double) this.width, 0.0D, 0.0D, 0.0D, new int[0]);
 
-> DELETE  134  @  156 : 234
+> DELETE  72  @  74 : 152
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityCreeper.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityCreeper.edit.java
index 0a08400..63a1516 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntityCreeper.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntityCreeper.edit.java
@@ -7,14 +7,14 @@
 
 > DELETE  4  @  4 : 13
 
-> DELETE  5  @  14 : 17
+> DELETE  1  @  10 : 13
 
-> DELETE  22  @  34 : 43
+> DELETE  17  @  20 : 29
 
-> DELETE  96  @  117 : 118
+> DELETE  74  @  83 : 84
 
-> DELETE  162  @  184 : 189
+> DELETE  66  @  67 : 72
 
-> DELETE  167  @  194 : 205
+> DELETE  5  @  10 : 21
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityEnderman.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityEnderman.edit.java
index 80763c4..a91d474 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntityEnderman.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntityEnderman.edit.java
@@ -7,35 +7,35 @@
 
 > DELETE  2  @  2 : 7
 
-> CHANGE  3 : 7  @  8 : 9
+> CHANGE  1 : 5  @  6 : 7
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 ~ 
 ~ import com.google.common.collect.Sets;
 ~ 
 
-> DELETE  8  @  10 : 11
+> DELETE  5  @  2 : 3
 
-> DELETE  12  @  15 : 23
+> DELETE  4  @  5 : 13
 
-> DELETE  13  @  24 : 27
+> DELETE  1  @  9 : 12
 
-> DELETE  14  @  28 : 29
+> DELETE  1  @  4 : 5
 
-> DELETE  17  @  32 : 33
+> DELETE  3  @  4 : 5
 
-> DELETE  23  @  39 : 40
+> DELETE  6  @  7 : 8
 
-> CHANGE  27 : 29  @  44 : 45
+> CHANGE  4 : 6  @  5 : 6
 
 ~ 	private static final EaglercraftUUID attackingSpeedBoostModifierUUID = EaglercraftUUID
 ~ 			.fromString("020E0DFB-87AE-4653-9556-831010E291A0");
 
-> DELETE  38  @  54 : 69
+> DELETE  11  @  10 : 25
 
-> DELETE  76  @  107 : 123
+> DELETE  38  @  53 : 69
 
-> CHANGE  81 : 88  @  128 : 137
+> CHANGE  5 : 12  @  21 : 30
 
 ~ 		for (int i = 0; i < 2; ++i) {
 ~ 			this.worldObj.spawnParticle(EnumParticleTypes.PORTAL,
@@ -45,18 +45,18 @@
 ~ 					(this.rand.nextDouble() - 0.5D) * 2.0D, -this.rand.nextDouble(),
 ~ 					(this.rand.nextDouble() - 0.5D) * 2.0D, new int[0]);
 
-> DELETE  89  @  138 : 139
+> DELETE  8  @  10 : 11
 
-> DELETE  232  @  282 : 285
+> DELETE  143  @  144 : 147
 
-> CHANGE  234 : 235  @  287 : 293
+> CHANGE  2 : 3  @  5 : 11
 
 ~ 					this.isAggressive = true;
 
-> CHANGE  267 : 268  @  325 : 326
+> CHANGE  33 : 34  @  38 : 39
 
 ~ 	public static void bootstrap() {
 
-> DELETE  284  @  342 : 493
+> DELETE  17  @  17 : 168
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityEndermite.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityEndermite.edit.java
index 164676b..3d96b90 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntityEndermite.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntityEndermite.edit.java
@@ -7,9 +7,9 @@
 
 > DELETE  5  @  5 : 13
 
-> DELETE  20  @  28 : 35
+> DELETE  15  @  23 : 30
 
-> CHANGE  84 : 91  @  99 : 116
+> CHANGE  64 : 71  @  71 : 88
 
 ~ 		for (int i = 0; i < 2; ++i) {
 ~ 			this.worldObj.spawnParticle(EnumParticleTypes.PORTAL,
@@ -19,6 +19,6 @@
 ~ 					(this.rand.nextDouble() - 0.5D) * 2.0D, -this.rand.nextDouble(),
 ~ 					(this.rand.nextDouble() - 0.5D) * 2.0D, new int[0]);
 
-> DELETE  92  @  117 : 118
+> DELETE  8  @  18 : 19
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityGhast.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityGhast.edit.java
index 25ba236..e37ce75 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntityGhast.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntityGhast.edit.java
@@ -7,20 +7,20 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  3  @  4 : 5
+> DELETE  1  @  2 : 3
 
-> DELETE  4  @  6 : 10
+> DELETE  1  @  2 : 6
 
-> DELETE  5  @  11 : 12
+> DELETE  1  @  5 : 6
 
-> DELETE  9  @  16 : 18
+> DELETE  4  @  5 : 7
 
-> DELETE  10  @  19 : 21
+> DELETE  1  @  3 : 5
 
-> DELETE  21  @  32 : 37
+> DELETE  11  @  13 : 18
 
-> DELETE  35  @  51 : 59
+> DELETE  14  @  19 : 27
 
-> DELETE  120  @  144 : 311
+> DELETE  85  @  93 : 260
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityGuardian.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityGuardian.edit.java
index 77195d4..c7978da 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntityGuardian.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntityGuardian.edit.java
@@ -7,33 +7,33 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  6  @  7 : 19
+> DELETE  4  @  5 : 17
 
-> DELETE  12  @  25 : 30
+> DELETE  6  @  18 : 23
 
-> DELETE  15  @  33 : 34
+> DELETE  3  @  8 : 9
 
-> DELETE  18  @  37 : 38
+> DELETE  3  @  4 : 5
 
-> DELETE  29  @  49 : 50
+> DELETE  11  @  12 : 13
 
-> DELETE  34  @  55 : 67
+> DELETE  5  @  6 : 18
 
-> DELETE  55  @  88 : 92
+> DELETE  21  @  33 : 37
 
-> DELETE  79  @  116 : 120
+> DELETE  24  @  28 : 32
 
-> DELETE  95  @  136 : 137
+> DELETE  16  @  20 : 21
 
-> DELETE  104  @  146 : 150
+> DELETE  9  @  10 : 14
 
-> CHANGE  111 : 112  @  157 : 158
+> CHANGE  7 : 8  @  11 : 12
 
 ~ 		} else {
 
-> DELETE  123  @  169 : 171
+> DELETE  12  @  12 : 14
 
-> CHANGE  173 : 178  @  221 : 239
+> CHANGE  50 : 55  @  52 : 70
 
 ~ 		this.field_175484_c = this.field_175482_b;
 ~ 		if (!this.isInWater()) {
@@ -41,7 +41,7 @@
 ~ 			if (this.motionY > 0.0D && this.field_175480_bp && !this.isSilent()) {
 ~ 				this.worldObj.playSound(this.posX, this.posY, this.posZ, "mob.guardian.flop", 1.0F, 1.0F, false);
 
-> CHANGE  180 : 185  @  241 : 247
+> CHANGE  7 : 12  @  20 : 26
 
 ~ 			this.field_175480_bp = this.motionY < 0.0D
 ~ 					&& this.worldObj.isBlockNormalCube((new BlockPos(this)).down(), false);
@@ -49,17 +49,17 @@
 ~ 			if (this.field_175483_bk < 0.5F) {
 ~ 				this.field_175483_bk = 4.0F;
 
-> CHANGE  186 : 187  @  248 : 249
+> CHANGE  6 : 7  @  7 : 8
 
 ~ 				this.field_175483_bk += (0.5F - this.field_175483_bk) * 0.1F;
 
-> INSERT  188 : 191  @  250
+> INSERT  2 : 5  @  2
 
 + 		} else {
 + 			this.field_175483_bk += (0.125F - this.field_175483_bk) * 0.2F;
 + 		}
 
-> CHANGE  192 : 201  @  251 : 253
+> CHANGE  4 : 13  @  1 : 3
 
 ~ 		this.field_175482_b += this.field_175483_bk;
 ~ 		this.field_175486_bm = this.field_175485_bl;
@@ -71,7 +71,7 @@
 ~ 			this.field_175485_bl += (1.0F - this.field_175485_bl) * 0.06F;
 ~ 		}
 
-> CHANGE  202 : 211  @  254 : 261
+> CHANGE  10 : 19  @  3 : 10
 
 ~ 		if (this.func_175472_n() && this.isInWater()) {
 ~ 			Vec3 vec3 = this.getLook(0.0F);
@@ -83,18 +83,18 @@
 ~ 						this.posZ + (this.rand.nextDouble() - 0.5D) * (double) this.width - vec3.zCoord * 1.5D, 0.0D,
 ~ 						0.0D, 0.0D, new int[0]);
 
-> INSERT  212 : 213  @  262
+> INSERT  10 : 11  @  8
 
 + 		}
 
-> CHANGE  214 : 218  @  263 : 267
+> CHANGE  2 : 6  @  1 : 5
 
 ~ 		if (this.hasTargetedEntity()) {
 ~ 			if (this.field_175479_bo < this.func_175464_ck()) {
 ~ 				++this.field_175479_bo;
 ~ 			}
 
-> CHANGE  219 : 231  @  268 : 282
+> CHANGE  5 : 17  @  5 : 19
 
 ~ 			EntityLivingBase entitylivingbase = this.getTargetedEntity();
 ~ 			if (entitylivingbase != null) {
@@ -109,7 +109,7 @@
 ~ 				d2 = d2 / d3;
 ~ 				double d4 = this.rand.nextDouble();
 
-> CHANGE  232 : 237  @  283 : 289
+> CHANGE  13 : 18  @  15 : 21
 
 ~ 				while (d4 < d3) {
 ~ 					d4 += 1.8D - d5 + this.rand.nextDouble() * (1.7D - d5);
@@ -117,10 +117,10 @@
 ~ 							this.posY + d1 * d4 + (double) this.getEyeHeight(), this.posZ + d2 * d4, 0.0D, 0.0D, 0.0D,
 ~ 							new int[0]);
 
-> DELETE  271  @  323 : 356
+> DELETE  39  @  40 : 73
 
-> DELETE  319  @  404 : 405
+> DELETE  48  @  81 : 82
 
-> DELETE  346  @  432 : 568
+> DELETE  27  @  28 : 164
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityIronGolem.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityIronGolem.edit.java
index 2e9d84c..ef26d3f 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntityIronGolem.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntityIronGolem.edit.java
@@ -7,22 +7,22 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  7  @  8 : 10
+> DELETE  5  @  6 : 8
 
-> DELETE  9  @  12 : 26
+> DELETE  2  @  4 : 18
 
-> DELETE  14  @  31 : 32
+> DELETE  5  @  19 : 20
 
-> DELETE  18  @  36 : 37
+> DELETE  4  @  5 : 6
 
-> DELETE  22  @  41 : 42
+> DELETE  4  @  5 : 6
 
-> DELETE  28  @  48 : 61
+> DELETE  6  @  7 : 20
 
-> DELETE  35  @  68 : 83
+> DELETE  7  @  20 : 35
 
-> DELETE  122  @  170 : 174
+> DELETE  87  @  102 : 106
 
-> DELETE  176  @  228 : 275
+> DELETE  54  @  58 : 105
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityMob.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityMob.edit.java
index 9d1fcec..31da3d8 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntityMob.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntityMob.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  7  @  7 : 8
 
-> DELETE  30  @  31 : 39
+> DELETE  23  @  24 : 32
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityPigZombie.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityPigZombie.edit.java
index cd66313..e22a849 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntityPigZombie.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntityPigZombie.edit.java
@@ -10,26 +10,26 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 ~ 
 
-> DELETE  5  @  4 : 5
+> DELETE  3  @  2 : 3
 
-> DELETE  8  @  8 : 10
+> DELETE  3  @  4 : 6
 
-> DELETE  10  @  12 : 13
+> DELETE  2  @  4 : 5
 
-> CHANGE  20 : 21  @  23 : 24
+> CHANGE  10 : 11  @  11 : 12
 
 ~ 	private static final EaglercraftUUID ATTACK_SPEED_BOOST_MODIFIER_UUID = EaglercraftUUID
 
-> CHANGE  26 : 27  @  29 : 30
+> CHANGE  6 : 7  @  6 : 7
 
 ~ 	private EaglercraftUUID angerTargetUUID;
 
-> DELETE  41  @  44 : 49
+> DELETE  15  @  15 : 20
 
-> CHANGE  105 : 106  @  113 : 114
+> CHANGE  64 : 65  @  69 : 70
 
 ~ 			this.angerTargetUUID = EaglercraftUUID.fromString(s);
 
-> DELETE  188  @  196 : 219
+> DELETE  83  @  83 : 106
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntitySilverfish.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntitySilverfish.edit.java
index 26f4bf6..1bd155b 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntitySilverfish.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntitySilverfish.edit.java
@@ -7,18 +7,18 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  3  @  4 : 6
+> DELETE  1  @  2 : 4
 
-> DELETE  5  @  8 : 15
+> DELETE  2  @  4 : 11
 
-> DELETE  9  @  19 : 22
+> DELETE  4  @  11 : 14
 
-> DELETE  12  @  25 : 26
+> DELETE  3  @  6 : 7
 
-> DELETE  16  @  30 : 36
+> DELETE  4  @  5 : 11
 
-> DELETE  49  @  69 : 81
+> DELETE  33  @  39 : 51
 
-> DELETE  84  @  116 : 225
+> DELETE  35  @  47 : 156
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntitySkeleton.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntitySkeleton.edit.java
index e9218ae..0eff036 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntitySkeleton.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntitySkeleton.edit.java
@@ -9,24 +9,24 @@
 
 + 
 
-> DELETE  14  @  13 : 28
+> DELETE  11  @  10 : 25
 
-> DELETE  28  @  42 : 43
+> DELETE  14  @  29 : 30
 
-> DELETE  30  @  45 : 48
+> DELETE  2  @  3 : 6
 
-> DELETE  33  @  51 : 65
+> DELETE  3  @  6 : 20
 
-> DELETE  78  @  110 : 124
+> DELETE  45  @  59 : 73
 
-> CHANGE  79 : 80  @  125 : 135
+> CHANGE  1 : 2  @  15 : 25
 
 ~ 		if (this.getSkeletonType() == 1) {
 
-> DELETE  156  @  211 : 221
+> DELETE  77  @  86 : 96
 
-> DELETE  171  @  236 : 245
+> DELETE  15  @  25 : 34
 
-> DELETE  227  @  301 : 309
+> DELETE  56  @  65 : 73
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntitySlime.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntitySlime.edit.java
index 7f89bd0..bea441a 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntitySlime.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntitySlime.edit.java
@@ -7,14 +7,14 @@
 
 > DELETE  7  @  7 : 13
 
-> DELETE  11  @  17 : 18
+> DELETE  4  @  10 : 11
 
-> DELETE  30  @  37 : 44
+> DELETE  19  @  20 : 27
 
-> DELETE  78  @  92 : 97
+> DELETE  48  @  55 : 60
 
-> DELETE  137  @  156 : 183
+> DELETE  59  @  64 : 91
 
-> DELETE  246  @  292 : 450
+> DELETE  109  @  136 : 294
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntitySnowman.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntitySnowman.edit.java
index 21ef55d..210bd86 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntitySnowman.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntitySnowman.edit.java
@@ -7,14 +7,14 @@
 
 > DELETE  2  @  2 : 4
 
-> DELETE  5  @  7 : 15
+> DELETE  3  @  5 : 13
 
-> DELETE  6  @  16 : 17
+> DELETE  1  @  9 : 10
 
-> DELETE  8  @  19 : 22
+> DELETE  2  @  3 : 6
 
-> DELETE  15  @  29 : 36
+> DELETE  7  @  10 : 17
 
-> DELETE  23  @  44 : 75
+> DELETE  8  @  15 : 46
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntitySpider.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntitySpider.edit.java
index 3d66f4c..4db7a4b 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntitySpider.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntitySpider.edit.java
@@ -10,21 +10,21 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  5  @  4 : 6
+> DELETE  3  @  2 : 4
 
-> DELETE  8  @  9 : 21
+> DELETE  3  @  5 : 17
 
-> DELETE  10  @  23 : 25
+> DELETE  2  @  14 : 16
 
-> DELETE  21  @  36 : 46
+> DELETE  11  @  13 : 23
 
-> DELETE  27  @  52 : 56
+> DELETE  6  @  16 : 20
 
-> DELETE  32  @  61 : 69
+> DELETE  5  @  9 : 17
 
-> DELETE  129  @  166 : 197
+> DELETE  97  @  105 : 136
 
-> CHANGE  132 : 133  @  200 : 201
+> CHANGE  3 : 4  @  34 : 35
 
 ~ 		public void func_111104_a(EaglercraftRandom rand) {
 
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityWitch.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityWitch.edit.java
index 6102d0f..f60a238 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntityWitch.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntityWitch.edit.java
@@ -10,21 +10,21 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 ~ 
 
-> DELETE  7  @  8 : 15
+> DELETE  5  @  6 : 13
 
-> DELETE  8  @  16 : 19
+> DELETE  1  @  8 : 11
 
-> DELETE  11  @  22 : 23
+> DELETE  3  @  6 : 7
 
-> DELETE  12  @  24 : 25
+> DELETE  1  @  2 : 3
 
-> CHANGE  18 : 20  @  31 : 32
+> CHANGE  6 : 8  @  7 : 8
 
 ~ 	private static final EaglercraftUUID MODIFIER_UUID = EaglercraftUUID
 ~ 			.fromString("5CD17E52-A79A-43D3-A529-90FDE04B181E");
 
-> DELETE  29  @  41 : 48
+> DELETE  11  @  10 : 17
 
-> DELETE  62  @  81 : 138
+> DELETE  33  @  40 : 97
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityZombie.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityZombie.edit.java
index df8a0c1..1e1751b 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntityZombie.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntityZombie.edit.java
@@ -10,39 +10,39 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 ~ 
 
-> DELETE  13  @  12 : 22
+> DELETE  9  @  8 : 18
 
-> DELETE  15  @  24 : 25
+> DELETE  2  @  12 : 13
 
-> DELETE  16  @  26 : 30
+> DELETE  1  @  2 : 6
 
-> DELETE  24  @  38 : 39
+> DELETE  8  @  12 : 13
 
-> CHANGE  37 : 39  @  52 : 53
+> CHANGE  13 : 15  @  14 : 15
 
 ~ 	private static final EaglercraftUUID babySpeedBoostUUID = EaglercraftUUID
 ~ 			.fromString("B9766B59-9566-4402-BC1F-2EE2A276D836");
 
-> DELETE  41  @  55 : 56
+> DELETE  4  @  3 : 4
 
-> DELETE  48  @  63 : 71
+> DELETE  7  @  8 : 16
 
-> DELETE  51  @  74 : 84
+> DELETE  3  @  11 : 21
 
-> DELETE  80  @  113 : 125
+> DELETE  29  @  39 : 51
 
-> DELETE  94  @  139 : 147
+> DELETE  14  @  26 : 34
 
-> DELETE  105  @  158 : 190
+> DELETE  11  @  19 : 51
 
-> DELETE  158  @  243 : 255
+> DELETE  53  @  85 : 97
 
-> DELETE  248  @  345 : 347
+> DELETE  90  @  102 : 104
 
-> DELETE  334  @  433 : 434
+> DELETE  86  @  88 : 89
 
-> DELETE  358  @  458 : 459
+> DELETE  24  @  25 : 26
 
-> DELETE  375  @  476 : 480
+> DELETE  17  @  18 : 22
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityBat.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityBat.edit.java
index 75f2f1f..aaa84d2 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntityBat.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntityBat.edit.java
@@ -9,10 +9,10 @@
 
 + 
 
-> DELETE  7  @  6 : 7
+> DELETE  4  @  3 : 4
 
-> DELETE  10  @  10 : 11
+> DELETE  3  @  4 : 5
 
-> DELETE  151  @  152 : 164
+> DELETE  141  @  142 : 154
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityChicken.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityChicken.edit.java
index 4eef49b..ce57a21 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntityChicken.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntityChicken.edit.java
@@ -7,8 +7,8 @@
 
 > DELETE  6  @  6 : 15
 
-> DELETE  28  @  37 : 45
+> DELETE  22  @  31 : 39
 
-> DELETE  56  @  73 : 79
+> DELETE  28  @  36 : 42
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityCow.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityCow.edit.java
index 16ac9ed..68d2b34 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntityCow.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntityCow.edit.java
@@ -7,8 +7,8 @@
 
 > DELETE  5  @  5 : 14
 
-> DELETE  9  @  18 : 19
+> DELETE  4  @  13 : 14
 
-> DELETE  16  @  26 : 35
+> DELETE  7  @  8 : 17
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityHorse.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityHorse.edit.java
index 1880ec5..e66e08c 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntityHorse.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntityHorse.edit.java
@@ -9,47 +9,47 @@
 
 + 
 
-> DELETE  11  @  10 : 18
+> DELETE  8  @  7 : 15
 
-> DELETE  14  @  21 : 22
+> DELETE  3  @  11 : 12
 
-> DELETE  24  @  32 : 33
+> DELETE  10  @  11 : 12
 
-> DELETE  25  @  34 : 35
+> DELETE  1  @  2 : 3
 
-> DELETE  84  @  94 : 103
+> DELETE  59  @  60 : 69
 
-> CHANGE  296 : 297  @  315 : 319
+> CHANGE  212 : 213  @  221 : 225
 
 ~ 
 
-> DELETE  358  @  380 : 386
+> DELETE  62  @  65 : 71
 
-> DELETE  573  @  601 : 606
+> DELETE  215  @  221 : 226
 
-> DELETE  719  @  752 : 755
+> DELETE  146  @  151 : 154
 
-> DELETE  753  @  789 : 797
+> DELETE  34  @  37 : 45
 
-> DELETE  759  @  803 : 829
+> DELETE  6  @  14 : 40
 
-> CHANGE  763 : 764  @  833 : 834
+> CHANGE  4 : 5  @  30 : 31
 
 ~ 		if (this.dataWatcher.hasObjectChanged()) {
 
-> DELETE  773  @  843 : 848
+> DELETE  10  @  10 : 15
 
-> DELETE  829  @  904 : 908
+> DELETE  56  @  61 : 65
 
-> DELETE  854  @  933 : 937
+> DELETE  25  @  29 : 33
 
-> DELETE  872  @  955 : 962
+> DELETE  18  @  22 : 29
 
-> DELETE  873  @  963 : 964
+> DELETE  1  @  8 : 9
 
-> DELETE  921  @  1012 : 1017
+> DELETE  48  @  49 : 54
 
-> CHANGE  991 : 992  @  1087 : 1095
+> CHANGE  70 : 71  @  75 : 83
 
 ~ 		String s = nbttagcompound.getString("OwnerUUID");
 
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.edit.java
index 1825dd4..5d0a801 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.edit.java
@@ -7,8 +7,8 @@
 
 > DELETE  3  @  3 : 5
 
-> DELETE  37  @  39 : 47
+> DELETE  34  @  36 : 44
 
-> DELETE  38  @  48 : 59
+> DELETE  1  @  9 : 20
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.edit.java
index a77d90f..497639d 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.edit.java
@@ -7,20 +7,20 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  8  @  9 : 24
+> DELETE  6  @  7 : 22
 
-> DELETE  13  @  29 : 30
+> DELETE  5  @  20 : 21
 
-> DELETE  20  @  37 : 39
+> DELETE  7  @  8 : 10
 
-> DELETE  24  @  43 : 55
+> DELETE  4  @  6 : 18
 
-> DELETE  31  @  62 : 82
+> DELETE  7  @  19 : 39
 
-> DELETE  84  @  135 : 136
+> DELETE  53  @  73 : 74
 
-> DELETE  91  @  143 : 179
+> DELETE  7  @  8 : 44
 
-> DELETE  158  @  246 : 258
+> DELETE  67  @  103 : 115
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityPig.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityPig.edit.java
index cd47428..c937c98 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntityPig.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntityPig.edit.java
@@ -7,20 +7,20 @@
 
 > DELETE  5  @  5 : 14
 
-> DELETE  6  @  15 : 17
+> DELETE  1  @  10 : 12
 
-> DELETE  11  @  22 : 23
+> DELETE  5  @  7 : 8
 
-> DELETE  16  @  28 : 29
+> DELETE  5  @  6 : 7
 
-> DELETE  20  @  33 : 44
+> DELETE  4  @  5 : 16
 
-> DELETE  64  @  88 : 100
+> DELETE  44  @  55 : 67
 
-> DELETE  99  @  135 : 144
+> DELETE  35  @  47 : 56
 
-> DELETE  100  @  145 : 148
+> DELETE  1  @  10 : 13
 
-> DELETE  117  @  165 : 169
+> DELETE  17  @  20 : 24
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityRabbit.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityRabbit.edit.java
index ee55914..4633ef7 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntityRabbit.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntityRabbit.edit.java
@@ -7,36 +7,36 @@
 
 > DELETE  3  @  3 : 5
 
-> DELETE  5  @  7 : 8
+> DELETE  2  @  4 : 5
 
-> DELETE  7  @  10 : 25
+> DELETE  2  @  3 : 18
 
-> DELETE  13  @  31 : 34
+> DELETE  6  @  21 : 24
 
-> DELETE  15  @  36 : 39
+> DELETE  2  @  5 : 8
 
-> DELETE  19  @  43 : 44
+> DELETE  4  @  7 : 8
 
-> DELETE  31  @  56 : 72
+> DELETE  12  @  13 : 29
 
-> DELETE  33  @  74 : 79
+> DELETE  2  @  18 : 23
 
-> DELETE  42  @  88 : 93
+> DELETE  9  @  14 : 19
 
-> DELETE  49  @  100 : 101
+> DELETE  7  @  12 : 13
 
-> DELETE  71  @  123 : 178
+> DELETE  22  @  23 : 78
 
-> DELETE  74  @  181 : 203
+> DELETE  3  @  58 : 80
 
-> DELETE  77  @  206 : 210
+> DELETE  3  @  25 : 29
 
-> DELETE  183  @  316 : 327
+> DELETE  106  @  110 : 121
 
-> DELETE  206  @  350 : 354
+> DELETE  23  @  34 : 38
 
-> DELETE  230  @  378 : 491
+> DELETE  24  @  28 : 141
 
-> DELETE  263  @  524 : 571
+> DELETE  33  @  146 : 193
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntitySheep.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntitySheep.edit.java
index 56fab26..367525a 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntitySheep.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntitySheep.edit.java
@@ -7,30 +7,30 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 7  @  4 : 5
+> CHANGE  1 : 5  @  2 : 3
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 ~ import com.google.common.collect.Maps;
 ~ 
 
-> DELETE  11  @  9 : 20
+> DELETE  8  @  5 : 16
 
-> DELETE  21  @  30 : 31
+> DELETE  10  @  21 : 22
 
-> DELETE  34  @  44 : 45
+> DELETE  13  @  14 : 15
 
-> DELETE  42  @  53 : 63
+> DELETE  8  @  9 : 19
 
-> DELETE  46  @  67 : 72
+> DELETE  4  @  14 : 19
 
-> CHANGE  47 : 48  @  73 : 77
+> CHANGE  1 : 2  @  6 : 10
 
 ~ 		this.sheepTimer = Math.max(0, this.sheepTimer - 1);
 
-> DELETE  112  @  141 : 155
+> DELETE  65  @  68 : 82
 
-> CHANGE  170 : 171  @  213 : 214
+> CHANGE  58 : 59  @  72 : 73
 
 ~ 	public static EnumDyeColor getRandomSheepColor(EaglercraftRandom random) {
 
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntitySquid.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntitySquid.edit.java
index 1028cd7..143271e 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntitySquid.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntitySquid.edit.java
@@ -7,16 +7,16 @@
 
 > DELETE  4  @  4 : 6
 
-> DELETE  32  @  34 : 35
+> DELETE  28  @  30 : 31
 
-> CHANGE  89 : 90  @  92 : 102
+> CHANGE  57 : 58  @  58 : 68
 
 ~ 			this.squidRotation = 6.2831855F;
 
-> DELETE  108  @  120 : 126
+> DELETE  19  @  28 : 34
 
-> DELETE  117  @  135 : 142
+> DELETE  9  @  15 : 22
 
-> DELETE  149  @  174 : 199
+> DELETE  32  @  39 : 64
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityTameable.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityTameable.edit.java
index a5fdcd5..4ca1582 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntityTameable.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntityTameable.edit.java
@@ -10,24 +10,24 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 ~ 
 
-> DELETE  6  @  5 : 8
+> DELETE  4  @  3 : 6
 
-> DELETE  8  @  10 : 12
+> DELETE  2  @  5 : 7
 
-> DELETE  12  @  16 : 17
+> DELETE  4  @  6 : 7
 
-> CHANGE  37 : 38  @  42 : 50
+> CHANGE  25 : 26  @  26 : 34
 
 ~ 		String s = nbttagcompound.getString("OwnerUUID");
 
-> DELETE  42  @  54 : 56
+> DELETE  5  @  12 : 14
 
-> CHANGE  117 : 118  @  131 : 132
+> CHANGE  75 : 76  @  77 : 78
 
 ~ 			EaglercraftUUID uuid = EaglercraftUUID.fromString(this.getOwnerId());
 
-> DELETE  128  @  142 : 146
+> DELETE  11  @  11 : 15
 
-> DELETE  157  @  175 : 184
+> DELETE  29  @  33 : 42
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityVillager.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityVillager.edit.java
index 4e10f31..a2eec1b 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntityVillager.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntityVillager.edit.java
@@ -10,27 +10,27 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  7  @  6 : 7
+> DELETE  5  @  4 : 5
 
-> DELETE  8  @  8 : 10
+> DELETE  1  @  2 : 4
 
-> DELETE  12  @  14 : 30
+> DELETE  4  @  6 : 22
 
-> DELETE  15  @  33 : 36
+> DELETE  3  @  19 : 22
 
-> DELETE  24  @  45 : 48
+> DELETE  9  @  12 : 15
 
-> DELETE  28  @  52 : 53
+> DELETE  4  @  7 : 8
 
-> DELETE  34  @  59 : 60
+> DELETE  6  @  7 : 8
 
-> DELETE  41  @  67 : 68
+> DELETE  7  @  8 : 9
 
-> CHANGE  53 : 54  @  80 : 232
+> CHANGE  12 : 13  @  13 : 165
 
 ~ 	private static EntityVillager.ITradeList[][][][] DEFAULT_TRADE_LIST_MAP = null;
 
-> INSERT  55 : 220  @  233
+> INSERT  2 : 167  @  153
 
 + 	public static void bootstrap() {
 + 		DEFAULT_TRADE_LIST_MAP = new EntityVillager.ITradeList[][][][] {
@@ -198,51 +198,51 @@
 + 	}
 + 
 
-> DELETE  229  @  242 : 258
+> DELETE  174  @  9 : 25
 
-> DELETE  232  @  261 : 281
+> DELETE  3  @  19 : 39
 
-> DELETE  237  @  286 : 329
+> DELETE  5  @  25 : 68
 
-> DELETE  241  @  333 : 338
+> DELETE  4  @  47 : 52
 
-> DELETE  298  @  395 : 396
+> DELETE  57  @  62 : 63
 
-> DELETE  340  @  438 : 477
+> DELETE  42  @  43 : 82
 
-> DELETE  413  @  550 : 558
+> DELETE  73  @  112 : 120
 
-> DELETE  553  @  698 : 699
+> DELETE  140  @  148 : 149
 
-> DELETE  572  @  718 : 728
+> DELETE  19  @  20 : 30
 
-> DELETE  573  @  729 : 732
+> DELETE  1  @  11 : 14
 
-> CHANGE  667 : 668  @  826 : 827
+> CHANGE  94 : 95  @  97 : 98
 
 ~ 		public void modifyMerchantRecipeList(MerchantRecipeList recipeList, EaglercraftRandom random) {
 
-> CHANGE  678 : 679  @  837 : 838
+> CHANGE  11 : 12  @  11 : 12
 
 ~ 		void modifyMerchantRecipeList(MerchantRecipeList var1, EaglercraftRandom var2);
 
-> CHANGE  695 : 696  @  854 : 855
+> CHANGE  17 : 18  @  17 : 18
 
 ~ 		public void modifyMerchantRecipeList(MerchantRecipeList merchantrecipelist, EaglercraftRandom random) {
 
-> CHANGE  714 : 715  @  873 : 874
+> CHANGE  19 : 20  @  19 : 20
 
 ~ 		public void modifyMerchantRecipeList(MerchantRecipeList merchantrecipelist, EaglercraftRandom random) {
 
-> CHANGE  738 : 739  @  897 : 898
+> CHANGE  24 : 25  @  24 : 25
 
 ~ 		public void modifyMerchantRecipeList(MerchantRecipeList merchantrecipelist, EaglercraftRandom random) {
 
-> CHANGE  765 : 766  @  924 : 925
+> CHANGE  27 : 28  @  27 : 28
 
 ~ 		public void modifyMerchantRecipeList(MerchantRecipeList merchantrecipelist, EaglercraftRandom random) {
 
-> CHANGE  790 : 791  @  949 : 950
+> CHANGE  25 : 26  @  25 : 26
 
 ~ 		public int getPrice(EaglercraftRandom rand) {
 
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityWolf.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityWolf.edit.java
index 2527ba2..53898d3 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntityWolf.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntityWolf.edit.java
@@ -7,20 +7,20 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  7  @  8 : 22
+> DELETE  5  @  6 : 20
 
-> DELETE  9  @  24 : 30
+> DELETE  2  @  16 : 22
 
-> DELETE  17  @  38 : 39
+> DELETE  8  @  14 : 15
 
-> DELETE  34  @  56 : 77
+> DELETE  17  @  18 : 39
 
-> DELETE  114  @  157 : 172
+> DELETE  80  @  101 : 116
 
-> DELETE  198  @  256 : 257
+> DELETE  84  @  99 : 100
 
-> DELETE  259  @  318 : 325
+> DELETE  61  @  62 : 69
 
-> DELETE  268  @  334 : 350
+> DELETE  9  @  16 : 32
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/player/EntityPlayer.edit.java b/patches/minecraft/net/minecraft/entity/player/EntityPlayer.edit.java
index 924f471..8741dfa 100644
--- a/patches/minecraft/net/minecraft/entity/player/EntityPlayer.edit.java
+++ b/patches/minecraft/net/minecraft/entity/player/EntityPlayer.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 5
 
-> CHANGE  4 : 10  @  7 : 8
+> CHANGE  2 : 8  @  5 : 6
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 ~ 
@@ -16,39 +16,39 @@
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
 
-> INSERT  15 : 16  @  13
+> INSERT  11 : 12  @  6
 
 + import net.minecraft.command.ICommandSender;
 
-> DELETE  31  @  28 : 29
+> DELETE  16  @  15 : 16
 
-> DELETE  34  @  32 : 36
+> DELETE  3  @  4 : 8
 
-> DELETE  50  @  52 : 53
+> DELETE  16  @  20 : 21
 
-> DELETE  57  @  60 : 61
+> DELETE  7  @  8 : 9
 
-> CHANGE  77 : 78  @  81 : 82
+> CHANGE  20 : 21  @  21 : 22
 
 ~ public abstract class EntityPlayer extends EntityLivingBase implements ICommandSender {
 
-> CHANGE  120 : 121  @  124 : 125
+> CHANGE  43 : 44  @  43 : 44
 
 ~ 		this.inventoryContainer = new ContainerPlayer(this.inventory, false, this);
 
-> DELETE  170  @  174 : 178
+> DELETE  50  @  50 : 54
 
-> CHANGE  189 : 190  @  197 : 200
+> CHANGE  19 : 20  @  23 : 26
 
 ~ 				--this.itemInUseCount;
 
-> DELETE  204  @  214 : 222
+> DELETE  15  @  17 : 25
 
-> DELETE  212  @  230 : 234
+> DELETE  8  @  16 : 20
 
-> DELETE  255  @  277 : 285
+> DELETE  43  @  47 : 55
 
-> CHANGE  355 : 368  @  385 : 404
+> CHANGE  100 : 113  @  108 : 127
 
 ~ 		double d0 = this.posX;
 ~ 		double d1 = this.posY;
@@ -64,41 +64,41 @@
 ~ 			this.rotationYaw = f;
 ~ 			this.renderYawOffset = ((EntityPig) this.ridingEntity).renderYawOffset;
 
-> DELETE  404  @  440 : 443
+> DELETE  49  @  55 : 58
 
-> CHANGE  512 : 513  @  551 : 552
+> CHANGE  108 : 109  @  111 : 112
 
 ~ 		for (ScoreObjective scoreobjective : (Collection) collection) {
 
-> DELETE  724  @  763 : 767
+> DELETE  212  @  212 : 216
 
-> DELETE  925  @  968 : 977
+> DELETE  201  @  205 : 214
 
-> DELETE  1007  @  1059 : 1063
+> DELETE  82  @  91 : 95
 
-> DELETE  1008  @  1064 : 1089
+> DELETE  1  @  5 : 30
 
-> DELETE  1044  @  1125 : 1128
+> DELETE  36  @  61 : 64
 
-> DELETE  1083  @  1167 : 1170
+> DELETE  39  @  42 : 45
 
-> DELETE  1375  @  1462 : 1466
+> DELETE  292  @  295 : 299
 
-> DELETE  1376  @  1467 : 1468
+> DELETE  1  @  5 : 6
 
-> DELETE  1394  @  1486 : 1490
+> DELETE  18  @  19 : 23
 
-> CHANGE  1550 : 1552  @  1646 : 1648
+> CHANGE  156 : 158  @  160 : 162
 
 ~ 	public static EaglercraftUUID getUUID(GameProfile profile) {
 ~ 		EaglercraftUUID uuid = profile.getId();
 
-> CHANGE  1559 : 1561  @  1655 : 1657
+> CHANGE  9 : 11  @  9 : 11
 
 ~ 	public static EaglercraftUUID getOfflineUUID(String username) {
 ~ 		return EaglercraftUUID.nameUUIDFromBytes(("OfflinePlayer:" + username).getBytes(Charsets.UTF_8));
 
-> CHANGE  1579 : 1580  @  1675 : 1676
+> CHANGE  20 : 21  @  20 : 21
 
 ~ 		return true;
 
diff --git a/patches/minecraft/net/minecraft/entity/player/InventoryPlayer.edit.java b/patches/minecraft/net/minecraft/entity/player/InventoryPlayer.edit.java
index 3b27105..63c41b9 100644
--- a/patches/minecraft/net/minecraft/entity/player/InventoryPlayer.edit.java
+++ b/patches/minecraft/net/minecraft/entity/player/InventoryPlayer.edit.java
@@ -9,6 +9,6 @@
 
 + 
 
-> DELETE  7  @  6 : 7
+> DELETE  4  @  3 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityArrow.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityArrow.edit.java
index 5db4a8a..2df3b19 100644
--- a/patches/minecraft/net/minecraft/entity/projectile/EntityArrow.edit.java
+++ b/patches/minecraft/net/minecraft/entity/projectile/EntityArrow.edit.java
@@ -9,14 +9,14 @@
 
 + 
 
-> DELETE  13  @  12 : 15
+> DELETE  10  @  9 : 12
 
-> DELETE  14  @  16 : 17
+> DELETE  1  @  4 : 5
 
-> DELETE  264  @  267 : 271
+> DELETE  250  @  251 : 255
 
-> DELETE  281  @  288 : 295
+> DELETE  17  @  21 : 28
 
-> DELETE  422  @  436 : 455
+> DELETE  141  @  148 : 167
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityEgg.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityEgg.edit.java
index 891090c..2e5a918 100644
--- a/patches/minecraft/net/minecraft/entity/projectile/EntityEgg.edit.java
+++ b/patches/minecraft/net/minecraft/entity/projectile/EntityEgg.edit.java
@@ -7,8 +7,8 @@
 
 > DELETE  3  @  3 : 5
 
-> DELETE  29  @  31 : 45
+> DELETE  26  @  28 : 42
 
-> DELETE  37  @  53 : 57
+> DELETE  8  @  22 : 26
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityFireball.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityFireball.edit.java
index c1101e7..0681a50 100644
--- a/patches/minecraft/net/minecraft/entity/projectile/EntityFireball.edit.java
+++ b/patches/minecraft/net/minecraft/entity/projectile/EntityFireball.edit.java
@@ -9,7 +9,7 @@
 
 + 
 
-> CHANGE  78 : 79  @  77 : 79
+> CHANGE  75 : 76  @  74 : 76
 
 ~ 		if (this.worldObj.isBlockLoaded(new BlockPos(this))) {
 
diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.edit.java
index 02cbc51..6dd69f6 100644
--- a/patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.edit.java
+++ b/patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.edit.java
@@ -9,28 +9,28 @@
 
 + 
 
-> DELETE  7  @  6 : 7
+> DELETE  3  @  2 : 3
 
-> DELETE  8  @  8 : 10
+> DELETE  1  @  2 : 4
 
-> DELETE  15  @  17 : 18
+> DELETE  7  @  9 : 10
 
-> DELETE  18  @  21 : 22
+> DELETE  3  @  4 : 5
 
-> DELETE  22  @  26 : 27
+> DELETE  4  @  5 : 6
 
-> DELETE  24  @  29 : 30
+> DELETE  2  @  3 : 4
 
-> DELETE  189  @  195 : 204
+> DELETE  165  @  166 : 175
 
-> DELETE  190  @  205 : 218
+> DELETE  1  @  10 : 23
 
-> DELETE  308  @  336 : 437
+> DELETE  118  @  131 : 232
 
-> CHANGE  348 : 349  @  477 : 516
+> CHANGE  40 : 41  @  141 : 180
 
 ~ 		return 0;
 
-> DELETE  351  @  518 : 543
+> DELETE  3  @  41 : 66
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityLargeFireball.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityLargeFireball.edit.java
index a4ec278..19b298b 100644
--- a/patches/minecraft/net/minecraft/entity/projectile/EntityLargeFireball.edit.java
+++ b/patches/minecraft/net/minecraft/entity/projectile/EntityLargeFireball.edit.java
@@ -7,10 +7,10 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  3  @  4 : 5
+> DELETE  1  @  2 : 3
 
-> DELETE  4  @  6 : 7
+> DELETE  1  @  2 : 3
 
-> DELETE  24  @  27 : 40
+> DELETE  20  @  21 : 34
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityPotion.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityPotion.edit.java
index 4f7edf5..5bab53a 100644
--- a/patches/minecraft/net/minecraft/entity/projectile/EntityPotion.edit.java
+++ b/patches/minecraft/net/minecraft/entity/projectile/EntityPotion.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  3  @  4 : 5
+> DELETE  1  @  2 : 3
 
-> DELETE  6  @  8 : 12
+> DELETE  3  @  4 : 8
 
-> DELETE  63  @  69 : 82
+> DELETE  57  @  61 : 74
 
-> DELETE  64  @  83 : 105
+> DELETE  1  @  14 : 36
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntitySmallFireball.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntitySmallFireball.edit.java
index d586366..cdf4193 100644
--- a/patches/minecraft/net/minecraft/entity/projectile/EntitySmallFireball.edit.java
+++ b/patches/minecraft/net/minecraft/entity/projectile/EntitySmallFireball.edit.java
@@ -7,10 +7,10 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  3  @  4 : 7
+> DELETE  1  @  2 : 5
 
-> DELETE  25  @  29 : 44
+> DELETE  22  @  25 : 40
 
-> DELETE  26  @  45 : 56
+> DELETE  1  @  16 : 27
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntitySnowball.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntitySnowball.edit.java
index ee3d4de..3d26f13 100644
--- a/patches/minecraft/net/minecraft/entity/projectile/EntitySnowball.edit.java
+++ b/patches/minecraft/net/minecraft/entity/projectile/EntitySnowball.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  4  @  4 : 5
 
-> DELETE  38  @  39 : 43
+> DELETE  34  @  35 : 39
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityThrowable.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityThrowable.edit.java
index a848c74..29df262 100644
--- a/patches/minecraft/net/minecraft/entity/projectile/EntityThrowable.edit.java
+++ b/patches/minecraft/net/minecraft/entity/projectile/EntityThrowable.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 4
 
-> DELETE  9  @  11 : 12
+> DELETE  7  @  9 : 10
 
-> DELETE  16  @  19 : 20
+> DELETE  7  @  8 : 9
 
-> DELETE  158  @  162 : 191
+> DELETE  142  @  143 : 172
 
-> DELETE  259  @  292 : 302
+> DELETE  101  @  130 : 140
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityWitherSkull.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityWitherSkull.edit.java
index 45540d0..cebbe5a 100644
--- a/patches/minecraft/net/minecraft/entity/projectile/EntityWitherSkull.edit.java
+++ b/patches/minecraft/net/minecraft/entity/projectile/EntityWitherSkull.edit.java
@@ -7,10 +7,10 @@
 
 > DELETE  6  @  6 : 9
 
-> DELETE  9  @  12 : 13
+> DELETE  3  @  6 : 7
 
-> DELETE  47  @  51 : 65
+> DELETE  38  @  39 : 53
 
-> DELETE  48  @  66 : 86
+> DELETE  1  @  15 : 35
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/event/ClickEvent.edit.java b/patches/minecraft/net/minecraft/event/ClickEvent.edit.java
index 68d9884..c694cb2 100644
--- a/patches/minecraft/net/minecraft/event/ClickEvent.edit.java
+++ b/patches/minecraft/net/minecraft/event/ClickEvent.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  4 : 6  @  5
+> INSERT  2 : 4  @  3
 
 + import com.google.common.collect.Maps;
 + 
diff --git a/patches/minecraft/net/minecraft/event/HoverEvent.edit.java b/patches/minecraft/net/minecraft/event/HoverEvent.edit.java
index 3827cac..54ebf0a 100644
--- a/patches/minecraft/net/minecraft/event/HoverEvent.edit.java
+++ b/patches/minecraft/net/minecraft/event/HoverEvent.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.collect.Maps;
diff --git a/patches/minecraft/net/minecraft/init/Blocks.edit.java b/patches/minecraft/net/minecraft/init/Blocks.edit.java
index 1c3a5a3..c52fb29 100644
--- a/patches/minecraft/net/minecraft/init/Blocks.edit.java
+++ b/patches/minecraft/net/minecraft/init/Blocks.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  34  @  34 : 35
 
-> CHANGE  37 : 235  @  38 : 236
+> CHANGE  3 : 201  @  4 : 202
 
 ~ 	public static Block air;
 ~ 	public static Block stone;
@@ -208,7 +208,7 @@
 ~ 	public static BlockSlab double_stone_slab2;
 ~ 	public static BlockSlab stone_slab2;
 
-> CHANGE  240 : 241  @  241 : 242
+> CHANGE  203 : 204  @  203 : 204
 
 ~ 	static void doBootstrap() {
 
diff --git a/patches/minecraft/net/minecraft/init/Bootstrap.edit.java b/patches/minecraft/net/minecraft/init/Bootstrap.edit.java
index 384107b..007176b 100644
--- a/patches/minecraft/net/minecraft/init/Bootstrap.edit.java
+++ b/patches/minecraft/net/minecraft/init/Bootstrap.edit.java
@@ -7,76 +7,76 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 7  @  4 : 6
+> CHANGE  1 : 5  @  2 : 4
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
-> INSERT  29 : 31  @  28
+> INSERT  26 : 28  @  24
 
 + import net.minecraft.entity.monster.EntityEnderman;
 + import net.minecraft.entity.passive.EntityVillager;
 
-> DELETE  36  @  33 : 35
+> DELETE  7  @  5 : 7
 
-> INSERT  38 : 39  @  37
+> INSERT  2 : 3  @  4
 
 + import net.minecraft.item.ItemAxe;
 
-> INSERT  42 : 43  @  40
+> INSERT  4 : 5  @  3
 
 + import net.minecraft.item.ItemPickaxe;
 
-> INSERT  44 : 45  @  41
+> INSERT  2 : 3  @  1
 
 + import net.minecraft.item.ItemSpade;
 
-> DELETE  46  @  42 : 44
+> DELETE  2  @  1 : 3
 
-> DELETE  47  @  45 : 46
+> DELETE  1  @  3 : 4
 
-> DELETE  48  @  47 : 48
+> DELETE  1  @  2 : 3
 
-> DELETE  51  @  51 : 52
+> DELETE  3  @  4 : 5
 
-> CHANGE  52 : 53  @  53 : 55
+> CHANGE  1 : 2  @  2 : 4
 
 ~ import net.minecraft.world.biome.BiomeGenBase;
 
-> CHANGE  155 : 156  @  157 : 158
+> CHANGE  103 : 104  @  104 : 105
 
 ~ 				EaglercraftRandom random = world.rand;
 
-> CHANGE  294 : 295  @  296 : 301
+> CHANGE  139 : 140  @  139 : 144
 
 ~ 					if (!ItemDye.applyBonemeal(itemstack, world, blockpos)) {
 
-> CHANGE  335 : 336  @  341 : 375
+> CHANGE  41 : 42  @  45 : 79
 
 ~ 				if (!(world.isAirBlock(blockpos) && blockskull.canDispenserPlace(world, blockpos, itemstack))) {
 
-> DELETE  361  @  400 : 404
+> DELETE  26  @  59 : 63
 
-> INSERT  388 : 390  @  431
+> INSERT  27 : 29  @  31
 
 + 			Blocks.doBootstrap();
 + 			BiomeGenBase.bootstrap();
 
-> INSERT  391 : 395  @  432
+> INSERT  3 : 7  @  1
 
 + 			EntityEnderman.bootstrap();
 + 			ItemAxe.bootstrap();
 + 			ItemPickaxe.bootstrap();
 + 			ItemSpade.bootstrap();
 
-> INSERT  396 : 398  @  433
+> INSERT  5 : 7  @  1
 
 + 			Items.doBootstrap();
 + 			EntityVillager.bootstrap();
 
-> CHANGE  404 : 406  @  439 : 441
+> CHANGE  8 : 10  @  6 : 8
 
 ~ 		System.setErr(new LoggingPrintStream("STDERR", true, System.err));
 ~ 		System.setOut(new LoggingPrintStream("STDOUT", false, SYSOUT));
diff --git a/patches/minecraft/net/minecraft/init/Items.edit.java b/patches/minecraft/net/minecraft/init/Items.edit.java
index b579438..eb43f05 100644
--- a/patches/minecraft/net/minecraft/init/Items.edit.java
+++ b/patches/minecraft/net/minecraft/init/Items.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  15 : 202  @  16 : 203
+> CHANGE  13 : 200  @  14 : 201
 
 ~ 	public static Item iron_shovel;
 ~ 	public static Item iron_pickaxe;
@@ -197,7 +197,7 @@
 ~ 	public static Item prismarine_crystals;
 ~ 	public static Item banner;
 
-> CHANGE  207 : 208  @  208 : 209
+> CHANGE  192 : 193  @  192 : 193
 
 ~ 	static void doBootstrap() {
 
diff --git a/patches/minecraft/net/minecraft/inventory/Container.edit.java b/patches/minecraft/net/minecraft/inventory/Container.edit.java
index d55f20a..b56fa4e 100644
--- a/patches/minecraft/net/minecraft/inventory/Container.edit.java
+++ b/patches/minecraft/net/minecraft/inventory/Container.edit.java
@@ -7,16 +7,16 @@
 
 > DELETE  2  @  2 : 4
 
-> INSERT  5 : 9  @  7
+> INSERT  3 : 7  @  5
 
 + 
 + import com.google.common.collect.Lists;
 + import com.google.common.collect.Sets;
 + 
 
-> DELETE  11  @  9 : 12
+> DELETE  6  @  2 : 5
 
-> CHANGE  30 : 31  @  31 : 32
+> CHANGE  19 : 20  @  22 : 23
 
 ~ 		this.inventoryItemStacks.add((ItemStack) null);
 
diff --git a/patches/minecraft/net/minecraft/inventory/ContainerBeacon.edit.java b/patches/minecraft/net/minecraft/inventory/ContainerBeacon.edit.java
index 535c289..0579462 100644
--- a/patches/minecraft/net/minecraft/inventory/ContainerBeacon.edit.java
+++ b/patches/minecraft/net/minecraft/inventory/ContainerBeacon.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  4  @  4 : 8
 
-> DELETE  41  @  45 : 56
+> DELETE  37  @  41 : 52
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/inventory/ContainerEnchantment.edit.java b/patches/minecraft/net/minecraft/inventory/ContainerEnchantment.edit.java
index efb23ca..c5dd921 100644
--- a/patches/minecraft/net/minecraft/inventory/ContainerEnchantment.edit.java
+++ b/patches/minecraft/net/minecraft/inventory/ContainerEnchantment.edit.java
@@ -10,24 +10,24 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  11  @  10 : 15
+> DELETE  8  @  7 : 12
 
-> DELETE  13  @  17 : 18
+> DELETE  2  @  7 : 8
 
-> CHANGE  20 : 21  @  25 : 26
+> CHANGE  7 : 8  @  8 : 9
 
 ~ 	private EaglercraftRandom rand;
 
-> CHANGE  40 : 41  @  45 : 46
+> CHANGE  20 : 21  @  20 : 21
 
 ~ 		this.rand = new EaglercraftRandom();
 
-> CHANGE  117 : 118  @  122 : 191
+> CHANGE  77 : 78  @  77 : 146
 
 ~ 			if (!(itemstack != null && itemstack.isItemEnchantable())) {
 
-> DELETE  136  @  209 : 241
+> DELETE  19  @  87 : 119
 
-> DELETE  157  @  262 : 275
+> DELETE  21  @  53 : 66
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/inventory/ContainerMerchant.edit.java b/patches/minecraft/net/minecraft/inventory/ContainerMerchant.edit.java
index 29f6c11..f0c6695 100644
--- a/patches/minecraft/net/minecraft/inventory/ContainerMerchant.edit.java
+++ b/patches/minecraft/net/minecraft/inventory/ContainerMerchant.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  5  @  5 : 11
 
-> DELETE  106  @  112 : 124
+> DELETE  101  @  107 : 119
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/inventory/ContainerPlayer.edit.java b/patches/minecraft/net/minecraft/inventory/ContainerPlayer.edit.java
index af0f665..1bcdb9c 100644
--- a/patches/minecraft/net/minecraft/inventory/ContainerPlayer.edit.java
+++ b/patches/minecraft/net/minecraft/inventory/ContainerPlayer.edit.java
@@ -7,20 +7,20 @@
 
 > DELETE  6  @  6 : 12
 
-> CHANGE  29 : 31  @  35 : 36
+> CHANGE  23 : 25  @  29 : 30
 
 ~ 		for (int k = 0; k < 4; ++k) {
 ~ 			final int k2 = k;
 
-> CHANGE  40 : 41  @  45 : 46
+> CHANGE  11 : 12  @  10 : 11
 
 ~ 											? ((ItemArmor) itemstack.getItem()).armorType == k2
 
-> CHANGE  42 : 43  @  47 : 48
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 													&& itemstack.getItem() != Items.skull ? false : k2 == 0));
 
-> CHANGE  46 : 47  @  51 : 52
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 							return ItemArmor.EMPTY_SLOT_NAMES[k2];
 
diff --git a/patches/minecraft/net/minecraft/inventory/ContainerRepair.edit.java b/patches/minecraft/net/minecraft/inventory/ContainerRepair.edit.java
index 6860ace..cddcd81 100644
--- a/patches/minecraft/net/minecraft/inventory/ContainerRepair.edit.java
+++ b/patches/minecraft/net/minecraft/inventory/ContainerRepair.edit.java
@@ -13,12 +13,12 @@
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
-> DELETE  15  @  12 : 18
+> DELETE  11  @  8 : 14
 
-> DELETE  18  @  21 : 24
+> DELETE  3  @  9 : 12
 
-> DELETE  78  @  84 : 100
+> DELETE  60  @  63 : 79
 
-> DELETE  297  @  319 : 332
+> DELETE  219  @  235 : 248
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/inventory/ContainerWorkbench.edit.java b/patches/minecraft/net/minecraft/inventory/ContainerWorkbench.edit.java
index 321d5d8..1e4a4f7 100644
--- a/patches/minecraft/net/minecraft/inventory/ContainerWorkbench.edit.java
+++ b/patches/minecraft/net/minecraft/inventory/ContainerWorkbench.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  5  @  5 : 11
 
-> DELETE  46  @  52 : 65
+> DELETE  41  @  47 : 60
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/inventory/InventoryBasic.edit.java b/patches/minecraft/net/minecraft/inventory/InventoryBasic.edit.java
index 8a96b84..aeefed6 100644
--- a/patches/minecraft/net/minecraft/inventory/InventoryBasic.edit.java
+++ b/patches/minecraft/net/minecraft/inventory/InventoryBasic.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.collect.Lists;
 + 
 
-> DELETE  7  @  5 : 7
+> DELETE  4  @  1 : 3
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/inventory/InventoryHelper.edit.java b/patches/minecraft/net/minecraft/inventory/InventoryHelper.edit.java
index 10b8729..8441c6b 100644
--- a/patches/minecraft/net/minecraft/inventory/InventoryHelper.edit.java
+++ b/patches/minecraft/net/minecraft/inventory/InventoryHelper.edit.java
@@ -10,9 +10,9 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  6  @  5 : 6
+> DELETE  4  @  3 : 4
 
-> CHANGE  12 : 13  @  12 : 13
+> CHANGE  6 : 7  @  7 : 8
 
 ~ 	private static final EaglercraftRandom RANDOM = new EaglercraftRandom();
 
diff --git a/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.edit.java b/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.edit.java
index e087e7e..8427109 100644
--- a/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.edit.java
+++ b/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.edit.java
@@ -7,14 +7,14 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  4  @  5 : 7
+> DELETE  2  @  3 : 5
 
-> DELETE  5  @  8 : 9
+> DELETE  1  @  3 : 4
 
-> DELETE  6  @  10 : 11
+> DELETE  1  @  2 : 3
 
-> DELETE  40  @  45 : 56
+> DELETE  34  @  35 : 46
 
-> DELETE  41  @  57 : 68
+> DELETE  1  @  12 : 23
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/Item.edit.java b/patches/minecraft/net/minecraft/item/Item.edit.java
index f2f6183..4085034 100644
--- a/patches/minecraft/net/minecraft/item/Item.edit.java
+++ b/patches/minecraft/net/minecraft/item/Item.edit.java
@@ -13,18 +13,18 @@
 + import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 + 
 
-> CHANGE  11 : 12  @  6 : 10
+> CHANGE  9 : 10  @  4 : 8
 
 ~ 
 
-> DELETE  35  @  33 : 101
+> DELETE  24  @  27 : 95
 
-> CHANGE  51 : 53  @  117 : 118
+> CHANGE  16 : 18  @  84 : 85
 
 ~ 	protected static final EaglercraftUUID itemModifierUUID = EaglercraftUUID
 ~ 			.fromString("CB3F55D3-645C-4F38-A497-9C13A33DB5CF");
 
-> CHANGE  54 : 55  @  119 : 120
+> CHANGE  3 : 4  @  2 : 3
 
 ~ 	protected static EaglercraftRandom itemRand = new EaglercraftRandom();
 
diff --git a/patches/minecraft/net/minecraft/item/ItemAppleGold.edit.java b/patches/minecraft/net/minecraft/item/ItemAppleGold.edit.java
index 8b23bd0..bf7c596 100644
--- a/patches/minecraft/net/minecraft/item/ItemAppleGold.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemAppleGold.edit.java
@@ -9,12 +9,12 @@
 
 + 
 
-> DELETE  6  @  5 : 11
+> DELETE  3  @  2 : 8
 
-> CHANGE  23 : 24  @  28 : 39
+> CHANGE  17 : 18  @  23 : 34
 
 ~ 		if (itemstack.getMetadata() == 0) {
 
-> DELETE  26  @  41 : 42
+> DELETE  3  @  13 : 14
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemArmor.edit.java b/patches/minecraft/net/minecraft/item/ItemArmor.edit.java
index 75669ca..d37e68f 100644
--- a/patches/minecraft/net/minecraft/item/ItemArmor.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemArmor.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.base.Predicates;
 + 
 
-> DELETE  15  @  13 : 15
+> DELETE  12  @  9 : 11
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemArmorStand.edit.java b/patches/minecraft/net/minecraft/item/ItemArmorStand.edit.java
index 954a411..4cb59f8 100644
--- a/patches/minecraft/net/minecraft/item/ItemArmorStand.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemArmorStand.edit.java
@@ -9,14 +9,14 @@
 
 ~ 
 
-> DELETE  6  @  6 : 7
+> DELETE  3  @  3 : 4
 
-> DELETE  7  @  8 : 11
+> DELETE  1  @  2 : 5
 
-> DELETE  10  @  14 : 16
+> DELETE  3  @  6 : 8
 
-> DELETE  43  @  49 : 70
+> DELETE  33  @  35 : 56
 
-> DELETE  50  @  77 : 89
+> DELETE  7  @  28 : 40
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemAxe.edit.java b/patches/minecraft/net/minecraft/item/ItemAxe.edit.java
index 6b6767c..68cc775 100644
--- a/patches/minecraft/net/minecraft/item/ItemAxe.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemAxe.edit.java
@@ -7,19 +7,19 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.collect.Sets;
 + 
 
-> DELETE  9  @  7 : 10
+> DELETE  6  @  3 : 6
 
-> CHANGE  11 : 12  @  12 : 15
+> CHANGE  2 : 3  @  5 : 8
 
 ~ 	private static Set EFFECTIVE_ON;
 
-> INSERT  13 : 18  @  16
+> INSERT  2 : 7  @  4
 
 + 	public static void bootstrap() {
 + 		EFFECTIVE_ON = Sets.newHashSet(new Block[] { Blocks.planks, Blocks.bookshelf, Blocks.log, Blocks.log2,
diff --git a/patches/minecraft/net/minecraft/item/ItemBanner.edit.java b/patches/minecraft/net/minecraft/item/ItemBanner.edit.java
index 5eb0a2e..6e415cf 100644
--- a/patches/minecraft/net/minecraft/item/ItemBanner.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemBanner.edit.java
@@ -9,14 +9,14 @@
 
 ~ 
 
-> DELETE  7  @  8 : 12
+> DELETE  4  @  5 : 9
 
-> DELETE  9  @  14 : 15
+> DELETE  2  @  6 : 7
 
-> DELETE  12  @  18 : 19
+> DELETE  3  @  4 : 5
 
-> DELETE  36  @  43 : 45
+> DELETE  24  @  25 : 27
 
-> DELETE  37  @  46 : 62
+> DELETE  1  @  3 : 19
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemBed.edit.java b/patches/minecraft/net/minecraft/item/ItemBed.edit.java
index c85a606..adcb487 100644
--- a/patches/minecraft/net/minecraft/item/ItemBed.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemBed.edit.java
@@ -7,11 +7,11 @@
 
 > DELETE  2  @  2 : 5
 
-> DELETE  4  @  7 : 10
+> DELETE  2  @  5 : 8
 
-> DELETE  6  @  12 : 13
+> DELETE  2  @  5 : 6
 
-> CHANGE  15 : 16  @  22 : 62
+> CHANGE  9 : 10  @  10 : 50
 
 ~ 		return true;
 
diff --git a/patches/minecraft/net/minecraft/item/ItemBlock.edit.java b/patches/minecraft/net/minecraft/item/ItemBlock.edit.java
index cee888c..98e71d9 100644
--- a/patches/minecraft/net/minecraft/item/ItemBlock.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemBlock.edit.java
@@ -9,9 +9,9 @@
 
 + 
 
-> DELETE  10  @  9 : 14
+> DELETE  7  @  6 : 11
 
-> CHANGE  63 : 64  @  67 : 98
+> CHANGE  53 : 54  @  58 : 89
 
 ~ 		return false;
 
diff --git a/patches/minecraft/net/minecraft/item/ItemBoat.edit.java b/patches/minecraft/net/minecraft/item/ItemBoat.edit.java
index 61ce530..8cf0990 100644
--- a/patches/minecraft/net/minecraft/item/ItemBoat.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemBoat.edit.java
@@ -9,8 +9,8 @@
 
 + 
 
-> DELETE  9  @  8 : 10
+> DELETE  6  @  5 : 7
 
-> DELETE  82  @  83 : 87
+> DELETE  73  @  75 : 79
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemBow.edit.java b/patches/minecraft/net/minecraft/item/ItemBow.edit.java
index ce85984..fe76d21 100644
--- a/patches/minecraft/net/minecraft/item/ItemBow.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemBow.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  8  @  8 : 11
 
-> DELETE  64  @  67 : 70
+> DELETE  56  @  59 : 62
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemBucket.edit.java b/patches/minecraft/net/minecraft/item/ItemBucket.edit.java
index ed1bae4..e75a6a0 100644
--- a/patches/minecraft/net/minecraft/item/ItemBucket.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemBucket.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  10  @  10 : 12
 
-> DELETE  115  @  117 : 121
+> DELETE  105  @  107 : 111
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemBucketMilk.edit.java b/patches/minecraft/net/minecraft/item/ItemBucketMilk.edit.java
index e478b02..6ec6b36 100644
--- a/patches/minecraft/net/minecraft/item/ItemBucketMilk.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemBucketMilk.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  5  @  5 : 8
 
-> DELETE  18  @  21 : 26
+> DELETE  13  @  16 : 21
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemCarrotOnAStick.edit.java b/patches/minecraft/net/minecraft/item/ItemCarrotOnAStick.edit.java
index caa38d2..6a52ff6 100644
--- a/patches/minecraft/net/minecraft/item/ItemCarrotOnAStick.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemCarrotOnAStick.edit.java
@@ -7,8 +7,8 @@
 
 > DELETE  3  @  3 : 4
 
-> DELETE  4  @  5 : 9
+> DELETE  1  @  2 : 6
 
-> DELETE  22  @  27 : 42
+> DELETE  18  @  22 : 37
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemCoal.edit.java b/patches/minecraft/net/minecraft/item/ItemCoal.edit.java
index 3efecf1..e888843 100644
--- a/patches/minecraft/net/minecraft/item/ItemCoal.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemCoal.edit.java
@@ -9,6 +9,6 @@
 
 + 
 
-> DELETE  5  @  4 : 6
+> DELETE  2  @  1 : 3
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemDoublePlant.edit.java b/patches/minecraft/net/minecraft/item/ItemDoublePlant.edit.java
index 66c85a1..a3ed4c9 100644
--- a/patches/minecraft/net/minecraft/item/ItemDoublePlant.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemDoublePlant.edit.java
@@ -9,6 +9,6 @@
 
 + 
 
-> DELETE  6  @  5 : 7
+> DELETE  3  @  2 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemDye.edit.java b/patches/minecraft/net/minecraft/item/ItemDye.edit.java
index fb91e05..d2526cd 100644
--- a/patches/minecraft/net/minecraft/item/ItemDye.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemDye.edit.java
@@ -9,11 +9,11 @@
 
 + 
 
-> DELETE  14  @  13 : 16
+> DELETE  11  @  10 : 13
 
-> DELETE  42  @  44 : 48
+> DELETE  28  @  31 : 35
 
-> CHANGE  78 : 79  @  84 : 93
+> CHANGE  36 : 37  @  40 : 49
 
 ~ 			if (igrowable.canGrow(worldIn, target, iblockstate, true)) {
 
diff --git a/patches/minecraft/net/minecraft/item/ItemEditableBook.edit.java b/patches/minecraft/net/minecraft/item/ItemEditableBook.edit.java
index eb2154b..3b9eec3 100644
--- a/patches/minecraft/net/minecraft/item/ItemEditableBook.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemEditableBook.edit.java
@@ -9,12 +9,12 @@
 
 + 
 
-> DELETE  5  @  4 : 9
+> DELETE  2  @  1 : 6
 
-> DELETE  8  @  12 : 13
+> DELETE  3  @  8 : 9
 
-> DELETE  65  @  70 : 74
+> DELETE  57  @  58 : 62
 
-> DELETE  93  @  102 : 109
+> DELETE  28  @  32 : 39
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemEgg.edit.java b/patches/minecraft/net/minecraft/item/ItemEgg.edit.java
index b5d7155..cca4131 100644
--- a/patches/minecraft/net/minecraft/item/ItemEgg.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemEgg.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  4  @  4 : 7
 
-> DELETE  19  @  22 : 25
+> DELETE  15  @  18 : 21
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemEnchantedBook.edit.java b/patches/minecraft/net/minecraft/item/ItemEnchantedBook.edit.java
index 3d63f06..2bd9de1 100644
--- a/patches/minecraft/net/minecraft/item/ItemEnchantedBook.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemEnchantedBook.edit.java
@@ -10,13 +10,13 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  10  @  9 : 12
+> DELETE  7  @  6 : 9
 
-> CHANGE  92 : 93  @  94 : 95
+> CHANGE  82 : 83  @  85 : 86
 
 ~ 	public WeightedRandomChestContent getRandom(EaglercraftRandom rand) {
 
-> CHANGE  96 : 97  @  98 : 99
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public WeightedRandomChestContent getRandom(EaglercraftRandom rand, int minChance, int maxChance, int weight) {
 
diff --git a/patches/minecraft/net/minecraft/item/ItemEnderEye.edit.java b/patches/minecraft/net/minecraft/item/ItemEnderEye.edit.java
index 081feb5..6c257ef 100644
--- a/patches/minecraft/net/minecraft/item/ItemEnderEye.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemEnderEye.edit.java
@@ -7,14 +7,14 @@
 
 > DELETE  5  @  5 : 6
 
-> DELETE  7  @  8 : 11
+> DELETE  2  @  3 : 6
 
-> DELETE  9  @  13 : 15
+> DELETE  2  @  5 : 7
 
-> CHANGE  22 : 23  @  28 : 111
+> CHANGE  13 : 14  @  15 : 98
 
 ~ 			return true;
 
-> DELETE  28  @  116 : 144
+> DELETE  6  @  88 : 116
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemEnderPearl.edit.java b/patches/minecraft/net/minecraft/item/ItemEnderPearl.edit.java
index 51b81c1..3e82668 100644
--- a/patches/minecraft/net/minecraft/item/ItemEnderPearl.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemEnderPearl.edit.java
@@ -7,8 +7,8 @@
 
 > DELETE  3  @  3 : 4
 
-> DELETE  4  @  5 : 7
+> DELETE  1  @  2 : 4
 
-> DELETE  19  @  22 : 25
+> DELETE  15  @  17 : 20
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemExpBottle.edit.java b/patches/minecraft/net/minecraft/item/ItemExpBottle.edit.java
index 079eab8..ac45663 100644
--- a/patches/minecraft/net/minecraft/item/ItemExpBottle.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemExpBottle.edit.java
@@ -7,8 +7,8 @@
 
 > DELETE  3  @  3 : 4
 
-> DELETE  4  @  5 : 7
+> DELETE  1  @  2 : 4
 
-> DELETE  22  @  25 : 28
+> DELETE  18  @  20 : 23
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemFireball.edit.java b/patches/minecraft/net/minecraft/item/ItemFireball.edit.java
index 2aba31d..c6daf60 100644
--- a/patches/minecraft/net/minecraft/item/ItemFireball.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemFireball.edit.java
@@ -7,9 +7,9 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  4  @  5 : 8
+> DELETE  2  @  3 : 6
 
-> CHANGE  15 : 16  @  19 : 40
+> CHANGE  11 : 12  @  14 : 35
 
 ~ 		return true;
 
diff --git a/patches/minecraft/net/minecraft/item/ItemFirework.edit.java b/patches/minecraft/net/minecraft/item/ItemFirework.edit.java
index 880bac6..748f826 100644
--- a/patches/minecraft/net/minecraft/item/ItemFirework.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemFirework.edit.java
@@ -7,20 +7,20 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  4 : 7  @  5 : 6
+> CHANGE  2 : 5  @  3 : 4
 
 ~ 
 ~ import com.google.common.collect.Lists;
 ~ 
 
-> DELETE  8  @  7 : 10
+> DELETE  4  @  2 : 5
 
-> DELETE  10  @  12 : 14
+> DELETE  2  @  5 : 7
 
-> DELETE  11  @  15 : 16
+> DELETE  1  @  3 : 4
 
-> DELETE  13  @  18 : 28
+> DELETE  2  @  3 : 13
 
-> DELETE  14  @  29 : 35
+> DELETE  1  @  11 : 17
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemFireworkCharge.edit.java b/patches/minecraft/net/minecraft/item/ItemFireworkCharge.edit.java
index d87ed20..107d5a7 100644
--- a/patches/minecraft/net/minecraft/item/ItemFireworkCharge.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemFireworkCharge.edit.java
@@ -9,6 +9,6 @@
 
 + 
 
-> DELETE  5  @  4 : 8
+> DELETE  2  @  1 : 5
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemFishFood.edit.java b/patches/minecraft/net/minecraft/item/ItemFishFood.edit.java
index 6a7724d..69859d5 100644
--- a/patches/minecraft/net/minecraft/item/ItemFishFood.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemFishFood.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  4 : 7  @  5
+> INSERT  2 : 5  @  3
 
 + 
 + import com.google.common.collect.Maps;
 + 
 
-> DELETE  9  @  7 : 10
+> DELETE  5  @  2 : 5
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemFishingRod.edit.java b/patches/minecraft/net/minecraft/item/ItemFishingRod.edit.java
index 679079d..c8ed442 100644
--- a/patches/minecraft/net/minecraft/item/ItemFishingRod.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemFishingRod.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  4  @  4 : 7
 
-> DELETE  29  @  32 : 36
+> DELETE  25  @  28 : 32
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemFood.edit.java b/patches/minecraft/net/minecraft/item/ItemFood.edit.java
index 15f8626..e78a5fe 100644
--- a/patches/minecraft/net/minecraft/item/ItemFood.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemFood.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  4  @  4 : 8
 
-> DELETE  40  @  44 : 49
+> DELETE  36  @  40 : 45
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemHangingEntity.edit.java b/patches/minecraft/net/minecraft/item/ItemHangingEntity.edit.java
index 68096ad..e8c7aba 100644
--- a/patches/minecraft/net/minecraft/item/ItemHangingEntity.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemHangingEntity.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  7  @  7 : 9
 
-> DELETE  32  @  34 : 38
+> DELETE  25  @  27 : 31
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemHoe.edit.java b/patches/minecraft/net/minecraft/item/ItemHoe.edit.java
index eda18e3..3b8c269 100644
--- a/patches/minecraft/net/minecraft/item/ItemHoe.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemHoe.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  9  @  9 : 11
 
-> CHANGE  57 : 58  @  59 : 66
+> CHANGE  48 : 49  @  50 : 57
 
 ~ 		return true;
 
diff --git a/patches/minecraft/net/minecraft/item/ItemLead.edit.java b/patches/minecraft/net/minecraft/item/ItemLead.edit.java
index e21b058..1274b99 100644
--- a/patches/minecraft/net/minecraft/item/ItemLead.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemLead.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  8  @  8 : 10
 
-> CHANGE  22 : 23  @  24 : 30
+> CHANGE  14 : 15  @  16 : 22
 
 ~ 			return true;
 
diff --git a/patches/minecraft/net/minecraft/item/ItemMap.edit.java b/patches/minecraft/net/minecraft/item/ItemMap.edit.java
index 28fb95b..f7b0ed8 100644
--- a/patches/minecraft/net/minecraft/item/ItemMap.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemMap.edit.java
@@ -10,14 +10,14 @@
 + import java.util.List;
 + 
 
-> CHANGE  7 : 8  @  5 : 6
+> CHANGE  5 : 6  @  3 : 4
 
 ~ 
 
-> DELETE  17  @  15 : 17
+> DELETE  10  @  10 : 12
 
-> DELETE  43  @  43 : 55
+> DELETE  26  @  28 : 40
 
-> DELETE  180  @  192 : 207
+> DELETE  137  @  149 : 164
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemMinecart.edit.java b/patches/minecraft/net/minecraft/item/ItemMinecart.edit.java
index 00de504..a4976b0 100644
--- a/patches/minecraft/net/minecraft/item/ItemMinecart.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemMinecart.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  12  @  12 : 14
 
-> DELETE  87  @  89 : 109
+> DELETE  75  @  77 : 97
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemMonsterPlacer.edit.java b/patches/minecraft/net/minecraft/item/ItemMonsterPlacer.edit.java
index 6492304..83fa8cf 100644
--- a/patches/minecraft/net/minecraft/item/ItemMonsterPlacer.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemMonsterPlacer.edit.java
@@ -9,14 +9,14 @@
 
 ~ 
 
-> DELETE  11  @  13 : 20
+> DELETE  8  @  10 : 17
 
-> DELETE  14  @  23 : 24
+> DELETE  3  @  10 : 11
 
-> CHANGE  43 : 44  @  53 : 94
+> CHANGE  29 : 30  @  30 : 71
 
 ~ 		return true;
 
-> DELETE  46  @  96 : 137
+> DELETE  3  @  43 : 84
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemMultiTexture.edit.java b/patches/minecraft/net/minecraft/item/ItemMultiTexture.edit.java
index 3efecf1..e888843 100644
--- a/patches/minecraft/net/minecraft/item/ItemMultiTexture.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemMultiTexture.edit.java
@@ -9,6 +9,6 @@
 
 + 
 
-> DELETE  5  @  4 : 6
+> DELETE  2  @  1 : 3
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemPickaxe.edit.java b/patches/minecraft/net/minecraft/item/ItemPickaxe.edit.java
index cc7c7ae..1e58716 100644
--- a/patches/minecraft/net/minecraft/item/ItemPickaxe.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemPickaxe.edit.java
@@ -7,19 +7,19 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.collect.Sets;
 + 
 
-> DELETE  9  @  7 : 10
+> DELETE  6  @  3 : 6
 
-> CHANGE  11 : 12  @  12 : 18
+> CHANGE  2 : 3  @  5 : 11
 
 ~ 	private static Set EFFECTIVE_ON;
 
-> INSERT  13 : 22  @  19
+> INSERT  2 : 11  @  7
 
 + 	public static void bootstrap() {
 + 		EFFECTIVE_ON = Sets.newHashSet(new Block[] { Blocks.activator_rail, Blocks.coal_ore, Blocks.cobblestone,
diff --git a/patches/minecraft/net/minecraft/item/ItemPotion.edit.java b/patches/minecraft/net/minecraft/item/ItemPotion.edit.java
index cb8ef1c..81b7f26 100644
--- a/patches/minecraft/net/minecraft/item/ItemPotion.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemPotion.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 5
 
-> INSERT  7 : 13  @  10
+> INSERT  5 : 11  @  8
 
 + import java.util.Set;
 + 
@@ -16,27 +16,27 @@
 + import com.google.common.collect.Maps;
 + 
 
-> DELETE  17  @  14 : 15
+> DELETE  10  @  4 : 5
 
-> DELETE  18  @  16 : 19
+> DELETE  1  @  2 : 5
 
-> DELETE  79  @  80 : 89
+> DELETE  61  @  64 : 73
 
-> DELETE  106  @  116 : 119
+> DELETE  27  @  36 : 39
 
-> CHANGE  130 : 131  @  143 : 144
+> CHANGE  24 : 25  @  27 : 28
 
 ~ 			for (PotionEffect potioneffect : (List) list) {
 
-> CHANGE  168 : 169  @  181 : 182
+> CHANGE  38 : 39  @  38 : 39
 
 ~ 				for (PotionEffect potioneffect : (List) list1) {
 
-> CHANGE  173 : 174  @  186 : 187
+> CHANGE  5 : 6  @  5 : 6
 
 ~ 						for (Entry entry : (Set) map.entrySet()) {
 
-> CHANGE  207 : 208  @  220 : 221
+> CHANGE  34 : 35  @  34 : 35
 
 ~ 				for (Entry entry1 : (Set) hashmultimap.entries()) {
 
diff --git a/patches/minecraft/net/minecraft/item/ItemRecord.edit.java b/patches/minecraft/net/minecraft/item/ItemRecord.edit.java
index 007d1e3..f6c1d3d 100644
--- a/patches/minecraft/net/minecraft/item/ItemRecord.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemRecord.edit.java
@@ -7,15 +7,15 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  4 : 7  @  5
+> INSERT  2 : 5  @  3
 
 + 
 + import com.google.common.collect.Maps;
 + 
 
-> DELETE  12  @  10 : 14
+> DELETE  8  @  5 : 9
 
-> CHANGE  33 : 34  @  35 : 44
+> CHANGE  21 : 22  @  25 : 34
 
 ~ 			return true;
 
diff --git a/patches/minecraft/net/minecraft/item/ItemSign.edit.java b/patches/minecraft/net/minecraft/item/ItemSign.edit.java
index 7fdb9fb..1917d81 100644
--- a/patches/minecraft/net/minecraft/item/ItemSign.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemSign.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 4
 
-> DELETE  5  @  7 : 12
+> DELETE  3  @  5 : 10
 
-> DELETE  7  @  14 : 15
+> DELETE  2  @  7 : 8
 
-> DELETE  27  @  35 : 37
+> DELETE  20  @  21 : 23
 
-> DELETE  28  @  38 : 55
+> DELETE  1  @  3 : 20
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemSkull.edit.java b/patches/minecraft/net/minecraft/item/ItemSkull.edit.java
index 75608e9..4ebc8fd 100644
--- a/patches/minecraft/net/minecraft/item/ItemSkull.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemSkull.edit.java
@@ -7,23 +7,23 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 6  @  4 : 5
+> CHANGE  1 : 4  @  2 : 3
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
 
-> DELETE  7  @  6 : 7
+> DELETE  4  @  2 : 3
 
-> DELETE  11  @  11 : 13
+> DELETE  4  @  5 : 7
 
-> DELETE  13  @  15 : 16
+> DELETE  2  @  4 : 5
 
-> DELETE  16  @  19 : 20
+> DELETE  3  @  4 : 5
 
-> DELETE  49  @  53 : 89
+> DELETE  33  @  34 : 70
 
-> CHANGE  96 : 97  @  136 : 137
+> CHANGE  47 : 48  @  83 : 84
 
 ~ 			GameProfile gameprofile = new GameProfile((EaglercraftUUID) null, nbt.getString("SkullOwner"));
 
diff --git a/patches/minecraft/net/minecraft/item/ItemSlab.edit.java b/patches/minecraft/net/minecraft/item/ItemSlab.edit.java
index 5e03c1f..4f39eb2 100644
--- a/patches/minecraft/net/minecraft/item/ItemSlab.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemSlab.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  7  @  7 : 9
 
-> CHANGE  95 : 96  @  97 : 98
+> CHANGE  88 : 89  @  90 : 91
 
 ~ 						.withProperty((IProperty) this.singleSlab.getVariantProperty(), comparable);
 
diff --git a/patches/minecraft/net/minecraft/item/ItemSnowball.edit.java b/patches/minecraft/net/minecraft/item/ItemSnowball.edit.java
index b5d7155..cca4131 100644
--- a/patches/minecraft/net/minecraft/item/ItemSnowball.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemSnowball.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  4  @  4 : 7
 
-> DELETE  19  @  22 : 25
+> DELETE  15  @  18 : 21
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemSpade.edit.java b/patches/minecraft/net/minecraft/item/ItemSpade.edit.java
index d2f0868..b958d33 100644
--- a/patches/minecraft/net/minecraft/item/ItemSpade.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemSpade.edit.java
@@ -7,19 +7,19 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.collect.Sets;
 + 
 
-> DELETE  8  @  6 : 8
+> DELETE  5  @  2 : 4
 
-> CHANGE  10 : 11  @  10 : 13
+> CHANGE  2 : 3  @  4 : 7
 
 ~ 	private static Set EFFECTIVE_ON;
 
-> INSERT  12 : 17  @  14
+> INSERT  2 : 7  @  4
 
 + 	public static void bootstrap() {
 + 		EFFECTIVE_ON = Sets.newHashSet(new Block[] { Blocks.clay, Blocks.dirt, Blocks.farmland, Blocks.grass,
diff --git a/patches/minecraft/net/minecraft/item/ItemStack.edit.java b/patches/minecraft/net/minecraft/item/ItemStack.edit.java
index 128dc40..77282d5 100644
--- a/patches/minecraft/net/minecraft/item/ItemStack.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemStack.edit.java
@@ -7,9 +7,9 @@
 
 > DELETE  2  @  2 : 5
 
-> DELETE  5  @  8 : 9
+> DELETE  3  @  6 : 7
 
-> INSERT  6 : 14  @  10
+> INSERT  1 : 9  @  2
 
 + import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 + import net.lax1dude.eaglercraft.v1_8.HString;
@@ -20,21 +20,21 @@
 + import com.google.common.collect.Multimap;
 + 
 
-> DELETE  27  @  23 : 27
+> DELETE  21  @  13 : 17
 
-> CHANGE  212 : 213  @  212 : 213
+> CHANGE  185 : 186  @  189 : 190
 
 ~ 	public boolean attemptDamageItem(int amount, EaglercraftRandom rand) {
 
-> CHANGE  462 : 463  @  462 : 463
+> CHANGE  250 : 251  @  250 : 251
 
 ~ 				s = s + HString.format("#%04d/%d%s",
 
-> CHANGE  465 : 466  @  465 : 466
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 				s = s + HString.format("#%04d%s", new Object[] { Integer.valueOf(i), s1 });
 
-> CHANGE  522 : 523  @  522 : 523
+> CHANGE  57 : 58  @  57 : 58
 
 ~ 			for (Entry entry : (Set) multimap.entries()) {
 
diff --git a/patches/minecraft/net/minecraft/item/ItemSword.edit.java b/patches/minecraft/net/minecraft/item/ItemSword.edit.java
index a7a99d0..bab7d9a 100644
--- a/patches/minecraft/net/minecraft/item/ItemSword.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemSword.edit.java
@@ -9,6 +9,6 @@
 
 + 
 
-> DELETE  12  @  11 : 14
+> DELETE  9  @  8 : 11
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemTool.edit.java b/patches/minecraft/net/minecraft/item/ItemTool.edit.java
index 8f8780a..6f6d809 100644
--- a/patches/minecraft/net/minecraft/item/ItemTool.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemTool.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.collect.Multimap;
 + 
 
-> DELETE  11  @  9 : 11
+> DELETE  8  @  5 : 7
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/crafting/CraftingManager.edit.java b/patches/minecraft/net/minecraft/item/crafting/CraftingManager.edit.java
index 0c016d3..22b52f4 100644
--- a/patches/minecraft/net/minecraft/item/crafting/CraftingManager.edit.java
+++ b/patches/minecraft/net/minecraft/item/crafting/CraftingManager.edit.java
@@ -7,20 +7,20 @@
 
 > DELETE  2  @  2 : 4
 
-> INSERT  7 : 11  @  9
+> INSERT  5 : 9  @  7
 
 + 
 + import com.google.common.collect.Lists;
 + import com.google.common.collect.Maps;
 + 
 
-> DELETE  23  @  21 : 38
+> DELETE  16  @  12 : 29
 
-> CHANGE  26 : 27  @  41 : 42
+> CHANGE  3 : 4  @  20 : 21
 
 ~ 	private static CraftingManager instance;
 
-> INSERT  30 : 33  @  45
+> INSERT  4 : 7  @  4
 
 + 		if (instance == null) {
 + 			instance = new CraftingManager();
diff --git a/patches/minecraft/net/minecraft/item/crafting/FurnaceRecipes.edit.java b/patches/minecraft/net/minecraft/item/crafting/FurnaceRecipes.edit.java
index 748bdf0..874a3ce 100644
--- a/patches/minecraft/net/minecraft/item/crafting/FurnaceRecipes.edit.java
+++ b/patches/minecraft/net/minecraft/item/crafting/FurnaceRecipes.edit.java
@@ -7,17 +7,17 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  4 : 7  @  5
+> INSERT  2 : 5  @  3
 
 + 
 + import com.google.common.collect.Maps;
 + 
 
-> CHANGE  17 : 18  @  15 : 16
+> CHANGE  13 : 14  @  10 : 11
 
 ~ 	private static FurnaceRecipes smeltingBase;
 
-> INSERT  22 : 25  @  20
+> INSERT  5 : 8  @  5
 
 + 		if (smeltingBase == null) {
 + 			smeltingBase = new FurnaceRecipes();
diff --git a/patches/minecraft/net/minecraft/item/crafting/RecipeFireworks.edit.java b/patches/minecraft/net/minecraft/item/crafting/RecipeFireworks.edit.java
index 9de9c4f..5752feb 100644
--- a/patches/minecraft/net/minecraft/item/crafting/RecipeFireworks.edit.java
+++ b/patches/minecraft/net/minecraft/item/crafting/RecipeFireworks.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.collect.Lists;
 + 
 
-> DELETE  10  @  8 : 9
+> DELETE  7  @  4 : 5
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/crafting/RecipeRepairItem.edit.java b/patches/minecraft/net/minecraft/item/crafting/RecipeRepairItem.edit.java
index a2eaaa6..54b1248 100644
--- a/patches/minecraft/net/minecraft/item/crafting/RecipeRepairItem.edit.java
+++ b/patches/minecraft/net/minecraft/item/crafting/RecipeRepairItem.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.collect.Lists;
 + 
 
-> DELETE  9  @  7 : 8
+> DELETE  6  @  3 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/crafting/RecipesArmorDyes.edit.java b/patches/minecraft/net/minecraft/item/crafting/RecipesArmorDyes.edit.java
index b55299d..39ee64c 100644
--- a/patches/minecraft/net/minecraft/item/crafting/RecipesArmorDyes.edit.java
+++ b/patches/minecraft/net/minecraft/item/crafting/RecipesArmorDyes.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.collect.Lists;
 + 
 
-> DELETE  12  @  10 : 11
+> DELETE  9  @  6 : 7
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/item/crafting/RecipesIngots.edit.java b/patches/minecraft/net/minecraft/item/crafting/RecipesIngots.edit.java
index e92233f..7e8d3e8 100644
--- a/patches/minecraft/net/minecraft/item/crafting/RecipesIngots.edit.java
+++ b/patches/minecraft/net/minecraft/item/crafting/RecipesIngots.edit.java
@@ -7,11 +7,11 @@
 
 > DELETE  7  @  7 : 8
 
-> CHANGE  9 : 10  @  10 : 18
+> CHANGE  2 : 3  @  3 : 11
 
 ~ 	private Object[][] recipeItems;
 
-> INSERT  12 : 21  @  20
+> INSERT  3 : 12  @  10
 
 + 		recipeItems = new Object[][] { { Blocks.gold_block, new ItemStack(Items.gold_ingot, 9) },
 + 				{ Blocks.iron_block, new ItemStack(Items.iron_ingot, 9) },
diff --git a/patches/minecraft/net/minecraft/item/crafting/RecipesTools.edit.java b/patches/minecraft/net/minecraft/item/crafting/RecipesTools.edit.java
index a5cbccb..d813a24 100644
--- a/patches/minecraft/net/minecraft/item/crafting/RecipesTools.edit.java
+++ b/patches/minecraft/net/minecraft/item/crafting/RecipesTools.edit.java
@@ -7,11 +7,11 @@
 
 > DELETE  6  @  6 : 7
 
-> CHANGE  10 : 11  @  11 : 18
+> CHANGE  4 : 5  @  5 : 12
 
 ~ 	private Object[][] recipeItems;
 
-> INSERT  13 : 21  @  20
+> INSERT  3 : 11  @  9
 
 + 		recipeItems = new Object[][] {
 + 				{ Blocks.planks, Blocks.cobblestone, Items.iron_ingot, Items.diamond, Items.gold_ingot },
diff --git a/patches/minecraft/net/minecraft/item/crafting/RecipesWeapons.edit.java b/patches/minecraft/net/minecraft/item/crafting/RecipesWeapons.edit.java
index a267371..2d56ae8 100644
--- a/patches/minecraft/net/minecraft/item/crafting/RecipesWeapons.edit.java
+++ b/patches/minecraft/net/minecraft/item/crafting/RecipesWeapons.edit.java
@@ -7,11 +7,11 @@
 
 > DELETE  6  @  6 : 7
 
-> CHANGE  9 : 10  @  10 : 13
+> CHANGE  3 : 4  @  4 : 7
 
 ~ 	private Object[][] recipeItems;
 
-> INSERT  12 : 15  @  15
+> INSERT  3 : 6  @  5
 
 + 		recipeItems = new Object[][] {
 + 				{ Blocks.planks, Blocks.cobblestone, Items.iron_ingot, Items.diamond, Items.gold_ingot },
diff --git a/patches/minecraft/net/minecraft/item/crafting/ShapelessRecipes.edit.java b/patches/minecraft/net/minecraft/item/crafting/ShapelessRecipes.edit.java
index 5d19591..5d71fec 100644
--- a/patches/minecraft/net/minecraft/item/crafting/ShapelessRecipes.edit.java
+++ b/patches/minecraft/net/minecraft/item/crafting/ShapelessRecipes.edit.java
@@ -7,15 +7,15 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  4 : 7  @  5
+> INSERT  2 : 5  @  3
 
 + 
 + import com.google.common.collect.Lists;
 + 
 
-> DELETE  9  @  7 : 8
+> DELETE  5  @  2 : 3
 
-> CHANGE  46 : 47  @  45 : 46
+> CHANGE  37 : 38  @  38 : 39
 
 ~ 					for (ItemStack itemstack1 : (List) arraylist) {
 
diff --git a/patches/minecraft/net/minecraft/nbt/CompressedStreamTools.edit.java b/patches/minecraft/net/minecraft/nbt/CompressedStreamTools.edit.java
index 02fe817..5434aae 100644
--- a/patches/minecraft/net/minecraft/nbt/CompressedStreamTools.edit.java
+++ b/patches/minecraft/net/minecraft/nbt/CompressedStreamTools.edit.java
@@ -7,22 +7,22 @@
 
 > DELETE  8  @  8 : 11
 
-> CHANGE  11 : 13  @  14 : 16
+> CHANGE  3 : 5  @  6 : 8
 
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglerZLIB;
 
-> DELETE  15  @  18 : 22
+> DELETE  4  @  4 : 8
 
-> CHANGE  19 : 21  @  26 : 27
+> CHANGE  4 : 6  @  8 : 9
 
 ~ 		DataInputStream datainputstream = new DataInputStream(
 ~ 				new BufferedInputStream(EaglerZLIB.newGZIPInputStream(is)));
 
-> CHANGE  34 : 35  @  40 : 41
+> CHANGE  15 : 16  @  14 : 15
 
 ~ 				new BufferedOutputStream(EaglerZLIB.newGZIPOutputStream(parOutputStream)));
 
-> DELETE  44  @  50 : 96
+> DELETE  10  @  10 : 56
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/nbt/JsonToNBT.edit.java b/patches/minecraft/net/minecraft/nbt/JsonToNBT.edit.java
index 580766c..e671686 100644
--- a/patches/minecraft/net/minecraft/nbt/JsonToNBT.edit.java
+++ b/patches/minecraft/net/minecraft/nbt/JsonToNBT.edit.java
@@ -11,9 +11,9 @@
 + import java.util.regex.Pattern;
 + 
 
-> DELETE  8  @  5 : 21
+> DELETE  6  @  3 : 19
 
-> INSERT  9 : 12  @  22
+> INSERT  1 : 4  @  17
 
 + import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 + import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
diff --git a/patches/minecraft/net/minecraft/nbt/NBTTagCompound.edit.java b/patches/minecraft/net/minecraft/nbt/NBTTagCompound.edit.java
index f19faf7..6ae1dbd 100644
--- a/patches/minecraft/net/minecraft/nbt/NBTTagCompound.edit.java
+++ b/patches/minecraft/net/minecraft/nbt/NBTTagCompound.edit.java
@@ -7,18 +7,18 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  6  @  7 : 8
+> DELETE  4  @  5 : 6
 
-> INSERT  7 : 8  @  9
+> INSERT  1 : 2  @  2
 
 + import java.util.Set;
 
-> INSERT  9 : 12  @  10
+> INSERT  2 : 5  @  1
 
 + 
 + import com.google.common.collect.Maps;
 + 
 
-> DELETE  14  @  12 : 24
+> DELETE  5  @  2 : 14
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/nbt/NBTTagList.edit.java b/patches/minecraft/net/minecraft/nbt/NBTTagList.edit.java
index b2287ee..3d76569 100644
--- a/patches/minecraft/net/minecraft/nbt/NBTTagList.edit.java
+++ b/patches/minecraft/net/minecraft/nbt/NBTTagList.edit.java
@@ -7,9 +7,9 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  6  @  7 : 16
+> DELETE  4  @  5 : 14
 
-> INSERT  7 : 12  @  17
+> INSERT  1 : 6  @  10
 
 + import com.google.common.collect.Lists;
 + 
diff --git a/patches/minecraft/net/minecraft/nbt/NBTUtil.edit.java b/patches/minecraft/net/minecraft/nbt/NBTUtil.edit.java
index 6f406af..e756cf5 100644
--- a/patches/minecraft/net/minecraft/nbt/NBTUtil.edit.java
+++ b/patches/minecraft/net/minecraft/nbt/NBTUtil.edit.java
@@ -15,25 +15,25 @@
 ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
 ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.Property;
 
-> CHANGE  26 : 27  @  25 : 26
+> CHANGE  24 : 25  @  23 : 24
 
 ~ 			EaglercraftUUID uuid;
 
-> CHANGE  28 : 29  @  27 : 28
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 				uuid = EaglercraftUUID.fromString(s1);
 
-> CHANGE  33 : 34  @  32 : 33
+> CHANGE  5 : 6  @  5 : 6
 
 ~ 			Multimap propertiesMap = MultimapBuilder.hashKeys().arrayListValues().build();
 
-> DELETE  36  @  35 : 36
+> DELETE  3  @  3 : 4
 
-> CHANGE  38 : 39  @  38 : 40
+> CHANGE  2 : 3  @  3 : 5
 
 ~ 					for (int i = 0, l = nbttaglist.tagCount(); i < l; ++i) {
 
-> CHANGE  40 : 48  @  41 : 47
+> CHANGE  2 : 10  @  3 : 9
 
 ~ 						String value = nbttagcompound1.getString("Value");
 ~ 						if (!StringUtils.isNullOrEmpty(value)) {
@@ -44,17 +44,17 @@
 ~ 								propertiesMap.put(s2, new Property(s2, value));
 ~ 							}
 
-> CHANGE  53 : 54  @  52 : 53
+> CHANGE  13 : 14  @  11 : 12
 
 ~ 			return new GameProfile(uuid, s, propertiesMap);
 
-> CHANGE  66 : 68  @  65 : 66
+> CHANGE  13 : 15  @  13 : 14
 
 ~ 		Multimap propertiesMap = profile.getProperties();
 ~ 		if (!propertiesMap.isEmpty()) {
 
-> DELETE  69  @  67 : 68
+> DELETE  3  @  2 : 3
 
-> DELETE  84  @  83 : 85
+> DELETE  15  @  16 : 18
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/network/EnumConnectionState.edit.java b/patches/minecraft/net/minecraft/network/EnumConnectionState.edit.java
index 774384f..db70db5 100644
--- a/patches/minecraft/net/minecraft/network/EnumConnectionState.edit.java
+++ b/patches/minecraft/net/minecraft/network/EnumConnectionState.edit.java
@@ -11,18 +11,18 @@
 + import java.util.Map;
 + 
 
-> CHANGE  8 : 10  @  5 : 8
+> CHANGE  6 : 8  @  3 : 6
 
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 
-> DELETE  115  @  113 : 114
+> DELETE  107  @  108 : 109
 
-> CHANGE  262 : 263  @  261 : 262
+> CHANGE  147 : 148  @  148 : 149
 
 ~ 			this.directionMaps.put(direction, (BiMap>) object);
 
-> CHANGE  308 : 310  @  307 : 308
+> CHANGE  46 : 48  @  46 : 47
 
 ~ 				for (Class oclass : (Collection) ((BiMap) enumconnectionstate.directionMaps
 ~ 						.get(enumpacketdirection)).values()) {
diff --git a/patches/minecraft/net/minecraft/network/PacketBuffer.edit.java b/patches/minecraft/net/minecraft/network/PacketBuffer.edit.java
index e1f7bb6..b9c5aec 100644
--- a/patches/minecraft/net/minecraft/network/PacketBuffer.edit.java
+++ b/patches/minecraft/net/minecraft/network/PacketBuffer.edit.java
@@ -7,9 +7,9 @@
 
 > DELETE  2  @  2 : 10
 
-> DELETE  8  @  16 : 18
+> DELETE  6  @  14 : 16
 
-> CHANGE  9 : 18  @  19 : 20
+> CHANGE  1 : 10  @  3 : 4
 
 ~ import java.nio.charset.StandardCharsets;
 ~ 
@@ -21,26 +21,26 @@
 ~ import net.lax1dude.eaglercraft.v1_8.netty.ByteBufInputStream;
 ~ import net.lax1dude.eaglercraft.v1_8.netty.ByteBufOutputStream;
 
-> CHANGE  116 : 117  @  118 : 119
+> CHANGE  107 : 108  @  99 : 100
 
 ~ 	public void writeUuid(EaglercraftUUID uuid) {
 
-> CHANGE  121 : 123  @  123 : 125
+> CHANGE  5 : 7  @  5 : 7
 
 ~ 	public EaglercraftUUID readUuid() {
 ~ 		return new EaglercraftUUID(this.readLong(), this.readLong());
 
-> CHANGE  205 : 206  @  207 : 208
+> CHANGE  84 : 85  @  84 : 85
 
 ~ 			String s = new String(this.readBytes(i).array(), StandardCharsets.UTF_8);
 
-> CHANGE  216 : 217  @  218 : 219
+> CHANGE  11 : 12  @  11 : 12
 
 ~ 		byte[] abyte = string.getBytes(StandardCharsets.UTF_8);
 
-> DELETE  238  @  240 : 244
+> DELETE  22  @  22 : 26
 
-> CHANGE  391 : 396  @  397 : 398
+> CHANGE  153 : 158  @  157 : 158
 
 ~ 		if (parByteBuf instanceof PacketBuffer) {
 ~ 			return this.buf.getBytes(parInt1, ((PacketBuffer) parByteBuf).buf);
@@ -48,7 +48,7 @@
 ~ 			return this.buf.getBytes(parInt1, parByteBuf);
 ~ 		}
 
-> CHANGE  399 : 404  @  401 : 402
+> CHANGE  8 : 13  @  4 : 5
 
 ~ 		if (bytebuf instanceof PacketBuffer) {
 ~ 			return this.buf.getBytes(i, ((PacketBuffer) bytebuf).buf, j);
@@ -56,7 +56,7 @@
 ~ 			return this.buf.getBytes(i, bytebuf, j);
 ~ 		}
 
-> CHANGE  407 : 412  @  405 : 406
+> CHANGE  8 : 13  @  4 : 5
 
 ~ 		if (bytebuf instanceof PacketBuffer) {
 ~ 			return this.buf.getBytes(i, ((PacketBuffer) bytebuf).buf, j, k);
@@ -64,9 +64,9 @@
 ~ 			return this.buf.getBytes(i, bytebuf, j, k);
 ~ 		}
 
-> DELETE  430  @  424 : 428
+> DELETE  23  @  19 : 23
 
-> CHANGE  471 : 476  @  469 : 470
+> CHANGE  41 : 46  @  45 : 46
 
 ~ 		if (bytebuf instanceof PacketBuffer) {
 ~ 			return this.buf.setBytes(i, ((PacketBuffer) bytebuf).buf, j);
@@ -74,7 +74,7 @@
 ~ 			return this.buf.setBytes(i, bytebuf, j);
 ~ 		}
 
-> CHANGE  479 : 484  @  473 : 474
+> CHANGE  8 : 13  @  4 : 5
 
 ~ 		if (bytebuf instanceof PacketBuffer) {
 ~ 			return this.buf.setBytes(i, ((PacketBuffer) bytebuf).buf, j, k);
@@ -82,9 +82,9 @@
 ~ 			return this.buf.setBytes(i, bytebuf, j, k);
 ~ 		}
 
-> DELETE  502  @  492 : 496
+> DELETE  23  @  19 : 23
 
-> CHANGE  567 : 572  @  561 : 562
+> CHANGE  65 : 70  @  69 : 70
 
 ~ 		if (bytebuf instanceof PacketBuffer) {
 ~ 			return this.buf.readBytes(((PacketBuffer) bytebuf).buf);
@@ -92,7 +92,7 @@
 ~ 			return this.buf.readBytes(bytebuf);
 ~ 		}
 
-> CHANGE  575 : 580  @  565 : 566
+> CHANGE  8 : 13  @  4 : 5
 
 ~ 		if (bytebuf instanceof PacketBuffer) {
 ~ 			return this.buf.readBytes(((PacketBuffer) bytebuf).buf, i);
@@ -100,7 +100,7 @@
 ~ 			return this.buf.readBytes(bytebuf, i);
 ~ 		}
 
-> CHANGE  583 : 588  @  569 : 570
+> CHANGE  8 : 13  @  4 : 5
 
 ~ 		if (bytebuf instanceof PacketBuffer) {
 ~ 			return this.buf.readBytes(((PacketBuffer) bytebuf).buf, i, j);
@@ -108,9 +108,9 @@
 ~ 			return this.buf.readBytes(bytebuf, i, j);
 ~ 		}
 
-> DELETE  606  @  588 : 592
+> DELETE  23  @  19 : 23
 
-> CHANGE  647 : 652  @  633 : 634
+> CHANGE  41 : 46  @  45 : 46
 
 ~ 		if (parByteBuf instanceof PacketBuffer) {
 ~ 			return this.buf.writeBytes(((PacketBuffer) parByteBuf).buf);
@@ -118,7 +118,7 @@
 ~ 			return this.buf.writeBytes(parByteBuf);
 ~ 		}
 
-> CHANGE  655 : 660  @  637 : 638
+> CHANGE  8 : 13  @  4 : 5
 
 ~ 		if (bytebuf instanceof PacketBuffer) {
 ~ 			return this.buf.writeBytes(((PacketBuffer) bytebuf).buf, i);
@@ -126,7 +126,7 @@
 ~ 			return this.buf.writeBytes(bytebuf, i);
 ~ 		}
 
-> CHANGE  663 : 668  @  641 : 642
+> CHANGE  8 : 13  @  4 : 5
 
 ~ 		if (bytebuf instanceof PacketBuffer) {
 ~ 			return this.buf.writeBytes(((PacketBuffer) bytebuf).buf, i, j);
@@ -134,10 +134,10 @@
 ~ 			return this.buf.writeBytes(bytebuf, i, j);
 ~ 		}
 
-> DELETE  686  @  660 : 664
+> DELETE  23  @  19 : 23
 
-> DELETE  706  @  684 : 700
+> DELETE  20  @  24 : 40
 
-> DELETE  794  @  788 : 807
+> DELETE  88  @  104 : 123
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/network/ServerStatusResponse.edit.java b/patches/minecraft/net/minecraft/network/ServerStatusResponse.edit.java
index 81e0fa7..88f0976 100644
--- a/patches/minecraft/net/minecraft/network/ServerStatusResponse.edit.java
+++ b/patches/minecraft/net/minecraft/network/ServerStatusResponse.edit.java
@@ -16,9 +16,9 @@
 ~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider;
 ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
 
-> DELETE  11  @  14 : 15
+> DELETE  9  @  12 : 13
 
-> CHANGE  68 : 73  @  72 : 79
+> CHANGE  57 : 62  @  58 : 65
 
 ~ 				implements JSONTypeCodec {
 ~ 			public ServerStatusResponse.MinecraftProtocolVersionIdentifier deserialize(JSONObject jsonobject)
@@ -26,7 +26,7 @@
 ~ 				return new ServerStatusResponse.MinecraftProtocolVersionIdentifier(jsonobject.getString("name"),
 ~ 						jsonobject.getInt("protocol"));
 
-> CHANGE  75 : 80  @  81 : 87
+> CHANGE  7 : 12  @  9 : 15
 
 ~ 			public JSONObject serialize(
 ~ 					ServerStatusResponse.MinecraftProtocolVersionIdentifier serverstatusresponse$minecraftprotocolversionidentifier) {
@@ -34,12 +34,12 @@
 ~ 				jsonobject.put("name", serverstatusresponse$minecraftprotocolversionidentifier.getName());
 ~ 				jsonobject.put("protocol",
 
-> CHANGE  112 : 114  @  119 : 124
+> CHANGE  37 : 39  @  38 : 43
 
 ~ 		public static class Serializer implements JSONTypeCodec {
 ~ 			public ServerStatusResponse.PlayerCountData deserialize(JSONObject jsonobject) throws JSONException {
 
-> CHANGE  115 : 120  @  125 : 130
+> CHANGE  3 : 8  @  6 : 11
 
 ~ 						jsonobject.getInt("max"), jsonobject.getInt("online"));
 ~ 				JSONArray jsonarray = jsonobject.optJSONArray("sample");
@@ -47,14 +47,14 @@
 ~ 					if (jsonarray.length() > 0) {
 ~ 						GameProfile[] agameprofile = new GameProfile[jsonarray.length()];
 
-> CHANGE  122 : 126  @  132 : 136
+> CHANGE  7 : 11  @  7 : 11
 
 ~ 							JSONObject jsonobject1 = jsonarray.getJSONObject(i);
 ~ 							String s = jsonobject1.getString("id");
 ~ 							agameprofile[i] = new GameProfile(EaglercraftUUID.fromString(s),
 ~ 									jsonobject1.getString("name"));
 
-> CHANGE  135 : 140  @  145 : 151
+> CHANGE  13 : 18  @  13 : 19
 
 ~ 			public JSONObject serialize(ServerStatusResponse.PlayerCountData serverstatusresponse$playercountdata)
 ~ 					throws JSONException {
@@ -62,11 +62,11 @@
 ~ 				jsonobject.put("max", Integer.valueOf(serverstatusresponse$playercountdata.getMaxPlayers()));
 ~ 				jsonobject.put("online", Integer.valueOf(serverstatusresponse$playercountdata.getOnlinePlayerCount()));
 
-> CHANGE  142 : 143  @  153 : 154
+> CHANGE  7 : 8  @  8 : 9
 
 ~ 					JSONArray jsonarray = new JSONArray();
 
-> CHANGE  145 : 150  @  156 : 161
+> CHANGE  3 : 8  @  3 : 8
 
 ~ 						JSONObject jsonobject1 = new JSONObject();
 ~ 						EaglercraftUUID uuid = serverstatusresponse$playercountdata.getPlayers()[i].getId();
@@ -74,55 +74,55 @@
 ~ 						jsonobject1.put("name", serverstatusresponse$playercountdata.getPlayers()[i].getName());
 ~ 						jsonarray.put(jsonobject1);
 
-> CHANGE  152 : 153  @  163 : 164
+> CHANGE  7 : 8  @  7 : 8
 
 ~ 					jsonobject.put("sample", jsonarray);
 
-> CHANGE  160 : 162  @  171 : 176
+> CHANGE  8 : 10  @  8 : 13
 
 ~ 	public static class Serializer implements JSONTypeCodec {
 ~ 		public ServerStatusResponse deserialize(JSONObject jsonobject) throws JSONException {
 
-> CHANGE  164 : 165  @  178 : 179
+> CHANGE  4 : 5  @  7 : 8
 
 ~ 				serverstatusresponse.setServerDescription((IChatComponent) JSONTypeProvider
 
-> CHANGE  169 : 171  @  183 : 186
+> CHANGE  5 : 7  @  5 : 8
 
 ~ 				serverstatusresponse.setPlayerCountData((ServerStatusResponse.PlayerCountData) JSONTypeProvider
 ~ 						.deserialize(jsonobject.get("players"), ServerStatusResponse.PlayerCountData.class));
 
-> CHANGE  175 : 178  @  190 : 193
+> CHANGE  6 : 9  @  7 : 10
 
 ~ 						(ServerStatusResponse.MinecraftProtocolVersionIdentifier) JSONTypeProvider.deserialize(
 ~ 								jsonobject.get("version"),
 ~ 								ServerStatusResponse.MinecraftProtocolVersionIdentifier.class));
 
-> CHANGE  181 : 182  @  196 : 197
+> CHANGE  6 : 7  @  6 : 7
 
 ~ 				serverstatusresponse.setFavicon(jsonobject.getString("favicon"));
 
-> CHANGE  187 : 189  @  202 : 205
+> CHANGE  6 : 8  @  6 : 9
 
 ~ 		public JSONObject serialize(ServerStatusResponse serverstatusresponse) {
 ~ 			JSONObject jsonobject = new JSONObject();
 
-> CHANGE  190 : 192  @  206 : 208
+> CHANGE  3 : 5  @  4 : 6
 
 ~ 				jsonobject.put("description",
 ~ 						(Object) JSONTypeProvider.serialize(serverstatusresponse.getServerDescription()));
 
-> CHANGE  195 : 197  @  211 : 213
+> CHANGE  5 : 7  @  5 : 7
 
 ~ 				jsonobject.put("players",
 ~ 						(Object) JSONTypeProvider.serialize(serverstatusresponse.getPlayerCountData()));
 
-> CHANGE  200 : 202  @  216 : 218
+> CHANGE  5 : 7  @  5 : 7
 
 ~ 				jsonobject.put("version",
 ~ 						(Object) JSONTypeProvider.serialize(serverstatusresponse.getProtocolVersionInfo()));
 
-> CHANGE  205 : 206  @  221 : 222
+> CHANGE  5 : 6  @  5 : 6
 
 ~ 				jsonobject.put("favicon", serverstatusresponse.getFavicon());
 
diff --git a/patches/minecraft/net/minecraft/network/login/client/C00PacketLoginStart.edit.java b/patches/minecraft/net/minecraft/network/login/client/C00PacketLoginStart.edit.java
index 70353de..4f0c46f 100644
--- a/patches/minecraft/net/minecraft/network/login/client/C00PacketLoginStart.edit.java
+++ b/patches/minecraft/net/minecraft/network/login/client/C00PacketLoginStart.edit.java
@@ -7,13 +7,13 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 6  @  4 : 5
+> CHANGE  1 : 4  @  2 : 3
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
 
-> CHANGE  21 : 22  @  20 : 21
+> CHANGE  18 : 19  @  16 : 17
 
 ~ 		this.profile = new GameProfile((EaglercraftUUID) null, parPacketBuffer.readStringFromBuffer(16));
 
diff --git a/patches/minecraft/net/minecraft/network/login/client/C01PacketEncryptionResponse.edit.java b/patches/minecraft/net/minecraft/network/login/client/C01PacketEncryptionResponse.edit.java
index 2897856..28e45f2 100644
--- a/patches/minecraft/net/minecraft/network/login/client/C01PacketEncryptionResponse.edit.java
+++ b/patches/minecraft/net/minecraft/network/login/client/C01PacketEncryptionResponse.edit.java
@@ -9,22 +9,22 @@
 
 ~ 
 
-> DELETE  7  @  9 : 10
+> DELETE  4  @  6 : 7
 
-> CHANGE  15 : 19  @  18 : 22
+> CHANGE  8 : 12  @  9 : 13
 
 ~ //	public C01PacketEncryptionResponse(SecretKey secretKey, PublicKey publicKey, byte[] verifyToken) {
 ~ //		this.secretKeyEncrypted = CryptManager.encryptData(publicKey, secretKey.getEncoded());
 ~ //		this.verifyTokenEncrypted = CryptManager.encryptData(publicKey, verifyToken);
 ~ //	}
 
-> CHANGE  34 : 37  @  37 : 40
+> CHANGE  19 : 22  @  19 : 22
 
 ~ //	public SecretKey getSecretKey(PrivateKey key) {
 ~ //		return CryptManager.decryptSharedKey(key, this.secretKeyEncrypted);
 ~ //	}
 
-> CHANGE  38 : 41  @  41 : 44
+> CHANGE  4 : 7  @  4 : 7
 
 ~ //	public byte[] getVerifyToken(PrivateKey key) {
 ~ //		return key == null ? this.verifyTokenEncrypted : CryptManager.decryptData(key, this.verifyTokenEncrypted);
diff --git a/patches/minecraft/net/minecraft/network/login/server/S01PacketEncryptionRequest.edit.java b/patches/minecraft/net/minecraft/network/login/server/S01PacketEncryptionRequest.edit.java
index 1e27e24..9145e0f 100644
--- a/patches/minecraft/net/minecraft/network/login/server/S01PacketEncryptionRequest.edit.java
+++ b/patches/minecraft/net/minecraft/network/login/server/S01PacketEncryptionRequest.edit.java
@@ -9,13 +9,13 @@
 
 ~ 
 
-> DELETE  7  @  7 : 8
+> DELETE  4  @  4 : 5
 
-> CHANGE  10 : 11  @  11 : 12
+> CHANGE  3 : 4  @  4 : 5
 
 ~ 	// private PublicKey publicKey;
 
-> CHANGE  16 : 21  @  17 : 22
+> CHANGE  6 : 11  @  6 : 11
 
 ~ //	public S01PacketEncryptionRequest(String serverId, PublicKey key, byte[] verifyToken) {
 ~ //		this.hashedServerId = serverId;
@@ -23,19 +23,19 @@
 ~ //		this.verifyToken = verifyToken;
 ~ //	}
 
-> CHANGE  24 : 27  @  25 : 26
+> CHANGE  8 : 11  @  8 : 9
 
 ~ 		// this.publicKey =
 ~ 		// CryptManager.decodePublicKey(parPacketBuffer.readByteArray());
 ~ 		parPacketBuffer.readByteArray(); // skip
 
-> CHANGE  31 : 34  @  30 : 33
+> CHANGE  7 : 10  @  5 : 8
 
 ~ //		parPacketBuffer.writeString(this.hashedServerId);
 ~ //		parPacketBuffer.writeByteArray(this.publicKey.getEncoded());
 ~ //		parPacketBuffer.writeByteArray(this.verifyToken);
 
-> CHANGE  44 : 47  @  43 : 46
+> CHANGE  13 : 16  @  13 : 16
 
 ~ //	public PublicKey getPublicKey() {
 ~ //		return this.publicKey;
diff --git a/patches/minecraft/net/minecraft/network/login/server/S02PacketLoginSuccess.edit.java b/patches/minecraft/net/minecraft/network/login/server/S02PacketLoginSuccess.edit.java
index 3843f53..4d2148c 100644
--- a/patches/minecraft/net/minecraft/network/login/server/S02PacketLoginSuccess.edit.java
+++ b/patches/minecraft/net/minecraft/network/login/server/S02PacketLoginSuccess.edit.java
@@ -7,17 +7,17 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 6  @  4 : 5
+> CHANGE  1 : 4  @  2 : 3
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
 
-> CHANGE  23 : 24  @  22 : 23
+> CHANGE  20 : 21  @  18 : 19
 
 ~ 		EaglercraftUUID uuid = EaglercraftUUID.fromString(s);
 
-> CHANGE  28 : 29  @  27 : 28
+> CHANGE  5 : 6  @  5 : 6
 
 ~ 		EaglercraftUUID uuid = this.profile.getId();
 
diff --git a/patches/minecraft/net/minecraft/network/play/client/C14PacketTabComplete.edit.java b/patches/minecraft/net/minecraft/network/play/client/C14PacketTabComplete.edit.java
index f31ed4b..e7b6e6d 100644
--- a/patches/minecraft/net/minecraft/network/play/client/C14PacketTabComplete.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/client/C14PacketTabComplete.edit.java
@@ -11,6 +11,6 @@
 + import org.apache.commons.lang3.StringUtils;
 + 
 
-> DELETE  10  @  7 : 8
+> DELETE  7  @  4 : 5
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/network/play/client/C17PacketCustomPayload.edit.java b/patches/minecraft/net/minecraft/network/play/client/C17PacketCustomPayload.edit.java
index c93b66d..6335ae1 100644
--- a/patches/minecraft/net/minecraft/network/play/client/C17PacketCustomPayload.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/client/C17PacketCustomPayload.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 5  @  4
+> INSERT  1 : 3  @  2
 
 + 
 + import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf;
diff --git a/patches/minecraft/net/minecraft/network/play/client/C18PacketSpectate.edit.java b/patches/minecraft/net/minecraft/network/play/client/C18PacketSpectate.edit.java
index 126e355..8e5589f 100644
--- a/patches/minecraft/net/minecraft/network/play/client/C18PacketSpectate.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/client/C18PacketSpectate.edit.java
@@ -10,16 +10,16 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 ~ 
 
-> DELETE  8  @  8 : 9
+> DELETE  5  @  5 : 6
 
-> CHANGE  10 : 11  @  11 : 12
+> CHANGE  2 : 3  @  3 : 4
 
 ~ 	private EaglercraftUUID id;
 
-> CHANGE  15 : 16  @  16 : 17
+> CHANGE  5 : 6  @  5 : 6
 
 ~ 	public C18PacketSpectate(EaglercraftUUID id) {
 
-> DELETE  31  @  32 : 35
+> DELETE  16  @  16 : 19
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/network/play/server/S0CPacketSpawnPlayer.edit.java b/patches/minecraft/net/minecraft/network/play/server/S0CPacketSpawnPlayer.edit.java
index 3dce0c2..f1dfe50 100644
--- a/patches/minecraft/net/minecraft/network/play/server/S0CPacketSpawnPlayer.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/server/S0CPacketSpawnPlayer.edit.java
@@ -10,11 +10,11 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 ~ 
 
-> CHANGE  17 : 18  @  16 : 17
+> CHANGE  13 : 14  @  12 : 13
 
 ~ 	private EaglercraftUUID playerId;
 
-> CHANGE  83 : 84  @  82 : 83
+> CHANGE  66 : 67  @  66 : 67
 
 ~ 	public EaglercraftUUID getPlayer() {
 
diff --git a/patches/minecraft/net/minecraft/network/play/server/S20PacketEntityProperties.edit.java b/patches/minecraft/net/minecraft/network/play/server/S20PacketEntityProperties.edit.java
index ddc7206..048cd4a 100644
--- a/patches/minecraft/net/minecraft/network/play/server/S20PacketEntityProperties.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/server/S20PacketEntityProperties.edit.java
@@ -7,14 +7,14 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  6 : 10  @  7 : 8
+> CHANGE  4 : 8  @  5 : 6
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 ~ 
 ~ import com.google.common.collect.Lists;
 ~ 
 
-> CHANGE  45 : 46  @  43 : 44
+> CHANGE  39 : 40  @  36 : 37
 
 ~ 				EaglercraftUUID uuid = parPacketBuffer.readUuid();
 
diff --git a/patches/minecraft/net/minecraft/network/play/server/S21PacketChunkData.edit.java b/patches/minecraft/net/minecraft/network/play/server/S21PacketChunkData.edit.java
index 141bb2e..863cb5c 100644
--- a/patches/minecraft/net/minecraft/network/play/server/S21PacketChunkData.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/server/S21PacketChunkData.edit.java
@@ -7,21 +7,21 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  4 : 7  @  5
+> INSERT  2 : 5  @  3
 
 + 
 + import com.google.common.collect.Lists;
 + 
 
-> CHANGE  81 : 82  @  79 : 80
+> CHANGE  77 : 78  @  74 : 75
 
 ~ 		for (ExtendedBlockStorage extendedblockstorage1 : (ArrayList) arraylist) {
 
-> CHANGE  90 : 91  @  88 : 89
+> CHANGE  9 : 10  @  9 : 10
 
 ~ 		for (ExtendedBlockStorage extendedblockstorage2 : (ArrayList) arraylist) {
 
-> CHANGE  96 : 97  @  94 : 95
+> CHANGE  6 : 7  @  6 : 7
 
 ~ 			for (ExtendedBlockStorage extendedblockstorage3 : (ArrayList) arraylist) {
 
diff --git a/patches/minecraft/net/minecraft/network/play/server/S26PacketMapChunkBulk.edit.java b/patches/minecraft/net/minecraft/network/play/server/S26PacketMapChunkBulk.edit.java
index 5370dcf..b641099 100644
--- a/patches/minecraft/net/minecraft/network/play/server/S26PacketMapChunkBulk.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/server/S26PacketMapChunkBulk.edit.java
@@ -9,6 +9,6 @@
 
 + 
 
-> DELETE  8  @  7 : 8
+> DELETE  4  @  3 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/network/play/server/S27PacketExplosion.edit.java b/patches/minecraft/net/minecraft/network/play/server/S27PacketExplosion.edit.java
index 87f357f..ee5b2dc 100644
--- a/patches/minecraft/net/minecraft/network/play/server/S27PacketExplosion.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/server/S27PacketExplosion.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  4 : 7  @  5
+> INSERT  2 : 5  @  3
 
 + 
 + import com.google.common.collect.Lists;
diff --git a/patches/minecraft/net/minecraft/network/play/server/S29PacketSoundEffect.edit.java b/patches/minecraft/net/minecraft/network/play/server/S29PacketSoundEffect.edit.java
index fdf5b51..6bc3b95 100644
--- a/patches/minecraft/net/minecraft/network/play/server/S29PacketSoundEffect.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/server/S29PacketSoundEffect.edit.java
@@ -11,6 +11,6 @@
 + import org.apache.commons.lang3.Validate;
 + 
 
-> DELETE  10  @  7 : 8
+> DELETE  7  @  4 : 5
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/network/play/server/S37PacketStatistics.edit.java b/patches/minecraft/net/minecraft/network/play/server/S37PacketStatistics.edit.java
index bb99c36..3827cac 100644
--- a/patches/minecraft/net/minecraft/network/play/server/S37PacketStatistics.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/server/S37PacketStatistics.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  5 : 8  @  6
+> INSERT  3 : 6  @  4
 
 + 
 + import com.google.common.collect.Maps;
diff --git a/patches/minecraft/net/minecraft/network/play/server/S38PacketPlayerListItem.edit.java b/patches/minecraft/net/minecraft/network/play/server/S38PacketPlayerListItem.edit.java
index 41be344..b9ac5e2 100644
--- a/patches/minecraft/net/minecraft/network/play/server/S38PacketPlayerListItem.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/server/S38PacketPlayerListItem.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 6
 
-> CHANGE  4 : 10  @  8 : 9
+> CHANGE  2 : 8  @  6 : 7
 
 ~ 
 ~ import com.google.common.base.Objects;
@@ -16,9 +16,9 @@
 ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
 ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.Property;
 
-> DELETE  23  @  22 : 44
+> DELETE  19  @  14 : 36
 
-> CHANGE  81 : 82  @  102 : 155
+> CHANGE  58 : 59  @  80 : 133
 
 ~ 		// server only
 
diff --git a/patches/minecraft/net/minecraft/network/play/server/S3EPacketTeams.edit.java b/patches/minecraft/net/minecraft/network/play/server/S3EPacketTeams.edit.java
index 87f357f..ee5b2dc 100644
--- a/patches/minecraft/net/minecraft/network/play/server/S3EPacketTeams.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/server/S3EPacketTeams.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  4 : 7  @  5
+> INSERT  2 : 5  @  3
 
 + 
 + import com.google.common.collect.Lists;
diff --git a/patches/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.edit.java b/patches/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.edit.java
index c93b66d..6335ae1 100644
--- a/patches/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 5  @  4
+> INSERT  1 : 3  @  2
 
 + 
 + import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf;
diff --git a/patches/minecraft/net/minecraft/network/status/server/S00PacketServerInfo.edit.java b/patches/minecraft/net/minecraft/network/status/server/S00PacketServerInfo.edit.java
index 52c61be..3ccd40a 100644
--- a/patches/minecraft/net/minecraft/network/status/server/S00PacketServerInfo.edit.java
+++ b/patches/minecraft/net/minecraft/network/status/server/S00PacketServerInfo.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 4
 
-> INSERT  3 : 8  @  5
+> INSERT  1 : 6  @  3
 
 + 
 + import org.json.JSONException;
@@ -15,13 +15,13 @@
 + 
 + import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider;
 
-> DELETE  13  @  10 : 11
+> DELETE  10  @  5 : 6
 
-> CHANGE  16 : 17  @  14 : 23
+> CHANGE  3 : 4  @  4 : 13
 
 ~ 
 
-> CHANGE  27 : 33  @  33 : 35
+> CHANGE  11 : 17  @  19 : 21
 
 ~ 		try {
 ~ 			this.response = (ServerStatusResponse) JSONTypeProvider.deserialize(
@@ -30,7 +30,7 @@
 ~ 			throw new IOException("Invalid ServerStatusResponse JSON payload", exc);
 ~ 		}
 
-> CHANGE  36 : 41  @  38 : 39
+> CHANGE  9 : 14  @  5 : 6
 
 ~ 		try {
 ~ 			parPacketBuffer.writeString(((JSONObject) JSONTypeProvider.serialize(this.response)).toString());
diff --git a/patches/minecraft/net/minecraft/potion/Potion.edit.java b/patches/minecraft/net/minecraft/potion/Potion.edit.java
index d3ffb81..c02590d 100644
--- a/patches/minecraft/net/minecraft/potion/Potion.edit.java
+++ b/patches/minecraft/net/minecraft/potion/Potion.edit.java
@@ -7,9 +7,9 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  3  @  4 : 6
+> DELETE  1  @  2 : 4
 
-> INSERT  4 : 9  @  7
+> INSERT  1 : 6  @  3
 
 + import java.util.Set;
 + import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
@@ -17,13 +17,13 @@
 + import com.google.common.collect.Maps;
 + 
 
-> DELETE  17  @  15 : 20
+> DELETE  13  @  8 : 13
 
-> CHANGE  140 : 141  @  143 : 146
+> CHANGE  123 : 124  @  128 : 131
 
 ~ 			// multiplayer only
 
-> CHANGE  242 : 244  @  247 : 249
+> CHANGE  102 : 104  @  104 : 106
 
 ~ 		AttributeModifier attributemodifier = new AttributeModifier(EaglercraftUUID.fromString(parString1),
 ~ 				this.getName(), parDouble1, parInt1);
diff --git a/patches/minecraft/net/minecraft/potion/PotionEffect.edit.java b/patches/minecraft/net/minecraft/potion/PotionEffect.edit.java
index 8fc4917..238f84f 100644
--- a/patches/minecraft/net/minecraft/potion/PotionEffect.edit.java
+++ b/patches/minecraft/net/minecraft/potion/PotionEffect.edit.java
@@ -10,6 +10,6 @@
 + import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 + import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
-> DELETE  6  @  4 : 7
+> DELETE  4  @  2 : 5
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/potion/PotionHelper.edit.java b/patches/minecraft/net/minecraft/potion/PotionHelper.edit.java
index 01df8f1..48a11e1 100644
--- a/patches/minecraft/net/minecraft/potion/PotionHelper.edit.java
+++ b/patches/minecraft/net/minecraft/potion/PotionHelper.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 4
 
-> CHANGE  6 : 10  @  8 : 10
+> CHANGE  4 : 8  @  6 : 8
 
 ~ 
 ~ import com.google.common.collect.Lists;
diff --git a/patches/minecraft/net/minecraft/profiler/Profiler.edit.java b/patches/minecraft/net/minecraft/profiler/Profiler.edit.java
index 6c6665f..bc35fbf 100644
--- a/patches/minecraft/net/minecraft/profiler/Profiler.edit.java
+++ b/patches/minecraft/net/minecraft/profiler/Profiler.edit.java
@@ -7,9 +7,9 @@
 
 > DELETE  2  @  2 : 4
 
-> DELETE  6  @  8 : 10
+> DELETE  4  @  6 : 8
 
-> INSERT  7 : 13  @  11
+> INSERT  1 : 7  @  3
 
 + import com.google.common.collect.Lists;
 + import com.google.common.collect.Maps;
diff --git a/patches/minecraft/net/minecraft/scoreboard/GoalColor.edit.java b/patches/minecraft/net/minecraft/scoreboard/GoalColor.edit.java
index 681a62a..c0406de 100644
--- a/patches/minecraft/net/minecraft/scoreboard/GoalColor.edit.java
+++ b/patches/minecraft/net/minecraft/scoreboard/GoalColor.edit.java
@@ -9,6 +9,6 @@
 
 + 
 
-> DELETE  5  @  4 : 5
+> DELETE  2  @  1 : 2
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/scoreboard/IScoreObjectiveCriteria.edit.java b/patches/minecraft/net/minecraft/scoreboard/IScoreObjectiveCriteria.edit.java
index 4efef00..f8171f1 100644
--- a/patches/minecraft/net/minecraft/scoreboard/IScoreObjectiveCriteria.edit.java
+++ b/patches/minecraft/net/minecraft/scoreboard/IScoreObjectiveCriteria.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  4 : 7  @  5
+> INSERT  2 : 5  @  3
 
 + 
 + import com.google.common.collect.Maps;
 + 
 
-> DELETE  8  @  6 : 9
+> DELETE  4  @  1 : 4
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/scoreboard/Score.edit.java b/patches/minecraft/net/minecraft/scoreboard/Score.edit.java
index bc4b50e..4d6a666 100644
--- a/patches/minecraft/net/minecraft/scoreboard/Score.edit.java
+++ b/patches/minecraft/net/minecraft/scoreboard/Score.edit.java
@@ -9,6 +9,6 @@
 
 + 
 
-> DELETE  6  @  5 : 7
+> DELETE  2  @  1 : 3
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/scoreboard/ScoreDummyCriteria.edit.java b/patches/minecraft/net/minecraft/scoreboard/ScoreDummyCriteria.edit.java
index 681a62a..c0406de 100644
--- a/patches/minecraft/net/minecraft/scoreboard/ScoreDummyCriteria.edit.java
+++ b/patches/minecraft/net/minecraft/scoreboard/ScoreDummyCriteria.edit.java
@@ -9,6 +9,6 @@
 
 + 
 
-> DELETE  5  @  4 : 5
+> DELETE  2  @  1 : 2
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/scoreboard/ScoreHealthCriteria.edit.java b/patches/minecraft/net/minecraft/scoreboard/ScoreHealthCriteria.edit.java
index 3efecf1..e888843 100644
--- a/patches/minecraft/net/minecraft/scoreboard/ScoreHealthCriteria.edit.java
+++ b/patches/minecraft/net/minecraft/scoreboard/ScoreHealthCriteria.edit.java
@@ -9,6 +9,6 @@
 
 + 
 
-> DELETE  5  @  4 : 6
+> DELETE  2  @  1 : 3
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/scoreboard/ScorePlayerTeam.edit.java b/patches/minecraft/net/minecraft/scoreboard/ScorePlayerTeam.edit.java
index 0de3756..3124671 100644
--- a/patches/minecraft/net/minecraft/scoreboard/ScorePlayerTeam.edit.java
+++ b/patches/minecraft/net/minecraft/scoreboard/ScorePlayerTeam.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  4 : 7  @  5 : 7
+> CHANGE  2 : 5  @  3 : 5
 
 ~ 
 ~ import com.google.common.collect.Sets;
diff --git a/patches/minecraft/net/minecraft/scoreboard/Scoreboard.edit.java b/patches/minecraft/net/minecraft/scoreboard/Scoreboard.edit.java
index 9ce5ef5..ede8791 100644
--- a/patches/minecraft/net/minecraft/scoreboard/Scoreboard.edit.java
+++ b/patches/minecraft/net/minecraft/scoreboard/Scoreboard.edit.java
@@ -7,24 +7,24 @@
 
 > DELETE  2  @  2 : 4
 
-> INSERT  7 : 11  @  9
+> INSERT  5 : 9  @  7
 
 + 
 + import com.google.common.collect.Lists;
 + import com.google.common.collect.Maps;
 + 
 
-> DELETE  13  @  11 : 15
+> DELETE  6  @  2 : 6
 
-> CHANGE  40 : 41  @  42 : 43
+> CHANGE  27 : 28  @  31 : 32
 
 ~ 					this.scoreObjectiveCriterias.put(criteria, (List) object);
 
-> CHANGE  73 : 74  @  75 : 76
+> CHANGE  33 : 34  @  33 : 34
 
 ~ 				this.entitiesScoreObjectives.put(name, (Map) object);
 
-> CHANGE  135 : 136  @  137 : 138
+> CHANGE  62 : 63  @  62 : 63
 
 ~ 		for (Map map : (Collection) collection) {
 
diff --git a/patches/minecraft/net/minecraft/scoreboard/ScoreboardSaveData.edit.java b/patches/minecraft/net/minecraft/scoreboard/ScoreboardSaveData.edit.java
index 705ba08..6b20785 100644
--- a/patches/minecraft/net/minecraft/scoreboard/ScoreboardSaveData.edit.java
+++ b/patches/minecraft/net/minecraft/scoreboard/ScoreboardSaveData.edit.java
@@ -10,8 +10,8 @@
 + import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 + import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
-> DELETE  7  @  5 : 11
+> DELETE  5  @  3 : 9
 
-> DELETE  9  @  13 : 15
+> DELETE  2  @  8 : 10
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/scoreboard/Team.edit.java b/patches/minecraft/net/minecraft/scoreboard/Team.edit.java
index f8b8212..e566f15 100644
--- a/patches/minecraft/net/minecraft/scoreboard/Team.edit.java
+++ b/patches/minecraft/net/minecraft/scoreboard/Team.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  5 : 7  @  6
+> INSERT  3 : 5  @  4
 
 + import com.google.common.collect.Maps;
 + 
diff --git a/patches/minecraft/net/minecraft/server/management/LowerStringMap.edit.java b/patches/minecraft/net/minecraft/server/management/LowerStringMap.edit.java
index 959a4e0..a3c6529 100644
--- a/patches/minecraft/net/minecraft/server/management/LowerStringMap.edit.java
+++ b/patches/minecraft/net/minecraft/server/management/LowerStringMap.edit.java
@@ -7,14 +7,14 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  5  @  6 : 7
+> DELETE  3  @  4 : 5
 
-> INSERT  6 : 8  @  8
+> INSERT  1 : 3  @  2
 
 + import com.google.common.collect.Maps;
 + 
 
-> CHANGE  41 : 42  @  41 : 42
+> CHANGE  35 : 36  @  33 : 34
 
 ~ 			this.put((String) entry.getKey(), (V) entry.getValue());
 
diff --git a/patches/minecraft/net/minecraft/stats/AchievementList.edit.java b/patches/minecraft/net/minecraft/stats/AchievementList.edit.java
index c1fe8e2..df3bb8c 100644
--- a/patches/minecraft/net/minecraft/stats/AchievementList.edit.java
+++ b/patches/minecraft/net/minecraft/stats/AchievementList.edit.java
@@ -7,15 +7,15 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.collect.Lists;
 + 
 
-> DELETE  9  @  7 : 8
+> DELETE  6  @  3 : 4
 
-> CHANGE  16 : 51  @  15 : 84
+> CHANGE  7 : 42  @  8 : 77
 
 ~ 	public static List achievementList;
 ~ 	public static Achievement openInventory;
@@ -53,7 +53,7 @@
 ~ 	public static Achievement exploreAllBiomes;
 ~ 	public static Achievement overpowered;
 
-> INSERT  53 : 116  @  86
+> INSERT  37 : 100  @  71
 
 + 		achievementList = Lists.newArrayList();
 + 		openInventory = (new Achievement("achievement.openInventory", "openInventory", 0, 0, Items.book,
diff --git a/patches/minecraft/net/minecraft/stats/StatBase.edit.java b/patches/minecraft/net/minecraft/stats/StatBase.edit.java
index b394ae5..2978a6d 100644
--- a/patches/minecraft/net/minecraft/stats/StatBase.edit.java
+++ b/patches/minecraft/net/minecraft/stats/StatBase.edit.java
@@ -9,6 +9,6 @@
 
 + 
 
-> DELETE  8  @  7 : 10
+> DELETE  3  @  2 : 5
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/stats/StatFileWriter.edit.java b/patches/minecraft/net/minecraft/stats/StatFileWriter.edit.java
index 866077c..54c27d7 100644
--- a/patches/minecraft/net/minecraft/stats/StatFileWriter.edit.java
+++ b/patches/minecraft/net/minecraft/stats/StatFileWriter.edit.java
@@ -7,15 +7,15 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.collect.Maps;
 + 
 
-> DELETE  7  @  5 : 7
+> DELETE  4  @  1 : 3
 
-> CHANGE  11 : 12  @  11 : 12
+> CHANGE  4 : 5  @  6 : 7
 
 ~ 	protected final Map statsData = Maps.newHashMap();
 
diff --git a/patches/minecraft/net/minecraft/stats/StatList.edit.java b/patches/minecraft/net/minecraft/stats/StatList.edit.java
index 3158ba0..4924f23 100644
--- a/patches/minecraft/net/minecraft/stats/StatList.edit.java
+++ b/patches/minecraft/net/minecraft/stats/StatList.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 5
 
-> INSERT  5 : 10  @  8
+> INSERT  3 : 8  @  6
 
 + 
 + import com.google.common.collect.Lists;
@@ -15,9 +15,9 @@
 + import com.google.common.collect.Sets;
 + 
 
-> DELETE  19  @  17 : 21
+> DELETE  14  @  9 : 13
 
-> CHANGE  165 : 166  @  167 : 168
+> CHANGE  146 : 147  @  150 : 151
 
 ~ 		for (Item item : (HashSet) hashset) {
 
diff --git a/patches/minecraft/net/minecraft/tileentity/MobSpawnerBaseLogic.edit.java b/patches/minecraft/net/minecraft/tileentity/MobSpawnerBaseLogic.edit.java
index 9e9f970..1bf4fb4 100644
--- a/patches/minecraft/net/minecraft/tileentity/MobSpawnerBaseLogic.edit.java
+++ b/patches/minecraft/net/minecraft/tileentity/MobSpawnerBaseLogic.edit.java
@@ -7,15 +7,15 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.collect.Lists;
 + 
 
-> DELETE  15  @  13 : 14
+> DELETE  12  @  9 : 10
 
-> CHANGE  62 : 70  @  61 : 131
+> CHANGE  47 : 55  @  48 : 118
 
 ~ 			double d3 = (double) ((float) blockpos.getX() + this.getSpawnerWorld().rand.nextFloat());
 ~ 			double d4 = (double) ((float) blockpos.getY() + this.getSpawnerWorld().rand.nextFloat());
@@ -26,12 +26,12 @@
 ~ 			if (this.spawnDelay > 0) {
 ~ 				--this.spawnDelay;
 
-> INSERT  72 : 74  @  133
+> INSERT  10 : 12  @  72
 
 + 			this.prevMobRotation = this.mobRotation;
 + 			this.mobRotation = (this.mobRotation + (double) (1000.0F / ((float) this.spawnDelay + 200.0F))) % 360.0D;
 
-> CHANGE  230 : 231  @  289 : 290
+> CHANGE  158 : 159  @  156 : 157
 
 ~ 		if (delay == 1) {
 
diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntity.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntity.edit.java
index e3646c6..cd4868d 100644
--- a/patches/minecraft/net/minecraft/tileentity/TileEntity.edit.java
+++ b/patches/minecraft/net/minecraft/tileentity/TileEntity.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  4 : 10  @  5
+> INSERT  2 : 8  @  3
 
 + 
 + import com.google.common.collect.Maps;
@@ -16,27 +16,27 @@
 + import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 + import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
-> DELETE  17  @  12 : 32
+> DELETE  13  @  7 : 27
 
-> DELETE  19  @  34 : 36
+> DELETE  2  @  22 : 24
 
-> CHANGE  77 : 78  @  94 : 95
+> CHANGE  58 : 59  @  60 : 61
 
 ~ 			logger.error("Could not create TileEntity", exception);
 
-> CHANGE  162 : 163  @  179 : 180
+> CHANGE  85 : 86  @  85 : 86
 
 ~ 						+ TileEntity.this.getClass().getName();
 
-> CHANGE  173 : 174  @  190 : 191
+> CHANGE  11 : 12  @  11 : 12
 
 ~ 						return HString.format("ID #%d (%s // %s)",
 
-> CHANGE  175 : 176  @  192 : 193
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 										Block.getBlockById(i).getClass().getName() });
 
-> CHANGE  188 : 190  @  205 : 207
+> CHANGE  13 : 15  @  13 : 15
 
 ~ 						String s = HString.format("%4s", new Object[] { Integer.toBinaryString(i) }).replace(" ", "0");
 ~ 						return HString.format("%1$d / 0x%1$X / 0b%2$s", new Object[] { Integer.valueOf(i), s });
diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityBanner.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityBanner.edit.java
index 85c8d3e..8f30dfb 100644
--- a/patches/minecraft/net/minecraft/tileentity/TileEntityBanner.edit.java
+++ b/patches/minecraft/net/minecraft/tileentity/TileEntityBanner.edit.java
@@ -7,16 +7,16 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 7  @  4
+> INSERT  1 : 5  @  2
 
 + import java.util.function.Supplier;
 + 
 + import com.google.common.collect.Lists;
 + 
 
-> DELETE  16  @  13 : 14
+> DELETE  13  @  9 : 10
 
-> CHANGE  185 : 194  @  183 : 190
+> CHANGE  169 : 178  @  170 : 177
 
 ~ 		BORDER("border", "bo", "###", "# #", "###"),
 ~ 		CURLY_BORDER("curly_border", "cbo", () -> new ItemStack(Blocks.vine)),
@@ -28,27 +28,27 @@
 ~ 				() -> new ItemStack(Blocks.red_flower, 1, BlockFlower.EnumFlowerType.OXEYE_DAISY.getMeta())),
 ~ 		MOJANG("mojang", "moj", () -> new ItemStack(Items.golden_apple, 1, 1));
 
-> INSERT  198 : 199  @  194
+> INSERT  13 : 14  @  11
 
 + 		private Supplier patternCraftingStackSupplier;
 
-> CHANGE  207 : 208  @  202 : 203
+> CHANGE  9 : 10  @  8 : 9
 
 ~ 		private EnumBannerPattern(String name, String id, Supplier craftingItem) {
 
-> CHANGE  209 : 210  @  204 : 205
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 			this.patternCraftingStackSupplier = craftingItem;
 
-> CHANGE  232 : 233  @  227 : 228
+> CHANGE  23 : 24  @  23 : 24
 
 ~ 			return this.patternCraftingStackSupplier != null || this.craftingLayers[0] != null;
 
-> CHANGE  236 : 237  @  231 : 232
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 			return this.patternCraftingStackSupplier != null;
 
-> INSERT  240 : 243  @  235
+> INSERT  4 : 7  @  4
 
 + 			if (patternCraftingStack == null) {
 + 				patternCraftingStack = patternCraftingStackSupplier.get();
diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityBeacon.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityBeacon.edit.java
index 7771286..015a8bf 100644
--- a/patches/minecraft/net/minecraft/tileentity/TileEntityBeacon.edit.java
+++ b/patches/minecraft/net/minecraft/tileentity/TileEntityBeacon.edit.java
@@ -7,18 +7,18 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  4 : 7  @  5
+> INSERT  2 : 5  @  3
 
 + 
 + import com.google.common.collect.Lists;
 + 
 
-> DELETE  25  @  23 : 27
+> DELETE  21  @  18 : 22
 
-> DELETE  54  @  56 : 62
+> DELETE  29  @  33 : 39
 
-> DELETE  55  @  63 : 82
+> DELETE  1  @  7 : 26
 
-> DELETE  137  @  164 : 172
+> DELETE  82  @  101 : 109
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.edit.java
index 51b7d7d..420728b 100644
--- a/patches/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.edit.java
+++ b/patches/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 4  @  4 : 6
+> CHANGE  1 : 2  @  2 : 4
 
 ~ 
 
-> DELETE  16  @  18 : 19
+> DELETE  13  @  14 : 15
 
-> DELETE  62  @  65 : 83
+> DELETE  46  @  47 : 65
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityChest.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityChest.edit.java
index df8c044..0a82d88 100644
--- a/patches/minecraft/net/minecraft/tileentity/TileEntityChest.edit.java
+++ b/patches/minecraft/net/minecraft/tileentity/TileEntityChest.edit.java
@@ -7,10 +7,10 @@
 
 > DELETE  9  @  9 : 10
 
-> DELETE  12  @  13 : 16
+> DELETE  3  @  4 : 7
 
-> DELETE  219  @  223 : 226
+> DELETE  207  @  210 : 213
 
-> DELETE  220  @  227 : 241
+> DELETE  1  @  4 : 18
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityCommandBlock.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityCommandBlock.edit.java
index b406b61..b5f8d4d 100644
--- a/patches/minecraft/net/minecraft/tileentity/TileEntityCommandBlock.edit.java
+++ b/patches/minecraft/net/minecraft/tileentity/TileEntityCommandBlock.edit.java
@@ -9,8 +9,8 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf;
 
-> DELETE  8  @  9 : 10
+> DELETE  6  @  7 : 8
 
-> DELETE  76  @  78 : 81
+> DELETE  68  @  69 : 72
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityDaylightDetector.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityDaylightDetector.edit.java
index 7866049..c71a017 100644
--- a/patches/minecraft/net/minecraft/tileentity/TileEntityDaylightDetector.edit.java
+++ b/patches/minecraft/net/minecraft/tileentity/TileEntityDaylightDetector.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  2  @  2 : 4
 
-> DELETE  6  @  8 : 15
+> DELETE  4  @  6 : 13
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityDispenser.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityDispenser.edit.java
index f5bc475..688644a 100644
--- a/patches/minecraft/net/minecraft/tileentity/TileEntityDispenser.edit.java
+++ b/patches/minecraft/net/minecraft/tileentity/TileEntityDispenser.edit.java
@@ -10,9 +10,9 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  12  @  11 : 12
+> DELETE  10  @  9 : 10
 
-> CHANGE  14 : 15  @  14 : 15
+> CHANGE  2 : 3  @  3 : 4
 
 ~ 	private static final EaglercraftRandom RNG = new EaglercraftRandom();
 
diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityEnchantmentTable.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityEnchantmentTable.edit.java
index e39986b..39b42e6 100644
--- a/patches/minecraft/net/minecraft/tileentity/TileEntityEnchantmentTable.edit.java
+++ b/patches/minecraft/net/minecraft/tileentity/TileEntityEnchantmentTable.edit.java
@@ -10,9 +10,9 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  9  @  8 : 9
+> DELETE  7  @  6 : 7
 
-> CHANGE  27 : 28  @  27 : 28
+> CHANGE  18 : 19  @  19 : 20
 
 ~ 	private static EaglercraftRandom rand = new EaglercraftRandom();
 
diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.edit.java
index f37021a..402e9b3 100644
--- a/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.edit.java
+++ b/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  3  @  3 : 4
 
-> DELETE  22  @  23 : 24
+> DELETE  19  @  20 : 21
 
-> DELETE  24  @  26 : 27
+> DELETE  2  @  3 : 4
 
-> DELETE  160  @  163 : 165
+> DELETE  136  @  137 : 139
 
-> DELETE  163  @  168 : 210
+> DELETE  3  @  5 : 47
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityHopper.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityHopper.edit.java
index a2050f8..ba5f55d 100644
--- a/patches/minecraft/net/minecraft/tileentity/TileEntityHopper.edit.java
+++ b/patches/minecraft/net/minecraft/tileentity/TileEntityHopper.edit.java
@@ -9,18 +9,18 @@
 
 + 
 
-> DELETE  6  @  5 : 6
+> DELETE  3  @  2 : 3
 
-> DELETE  17  @  17 : 21
+> DELETE  11  @  12 : 16
 
-> DELETE  153  @  157 : 165
+> DELETE  136  @  140 : 148
 
-> CHANGE  156 : 157  @  168 : 190
+> CHANGE  3 : 4  @  11 : 33
 
 ~ 		return false;
 
-> DELETE  159  @  192 : 240
+> DELETE  3  @  24 : 72
 
-> DELETE  347  @  428 : 435
+> DELETE  188  @  236 : 243
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityPiston.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityPiston.edit.java
index b2fa269..45058e0 100644
--- a/patches/minecraft/net/minecraft/tileentity/TileEntityPiston.edit.java
+++ b/patches/minecraft/net/minecraft/tileentity/TileEntityPiston.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.collect.Lists;
 + 
 
-> DELETE  11  @  9 : 10
+> DELETE  8  @  5 : 6
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntitySign.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntitySign.edit.java
index 76c8390..9a18851 100644
--- a/patches/minecraft/net/minecraft/tileentity/TileEntitySign.edit.java
+++ b/patches/minecraft/net/minecraft/tileentity/TileEntitySign.edit.java
@@ -10,28 +10,28 @@
 ~ import org.json.JSONException;
 ~ 
 
-> DELETE  5  @  4 : 5
+> DELETE  3  @  2 : 3
 
-> DELETE  8  @  8 : 9
+> DELETE  3  @  4 : 5
 
-> DELETE  11  @  12 : 14
+> DELETE  3  @  4 : 6
 
-> DELETE  14  @  17 : 18
+> DELETE  3  @  5 : 6
 
-> DELETE  24  @  28 : 29
+> DELETE  10  @  11 : 12
 
-> DELETE  33  @  38 : 39
+> DELETE  9  @  10 : 11
 
-> DELETE  75  @  81 : 83
+> DELETE  42  @  43 : 45
 
-> CHANGE  89 : 90  @  97 : 98
+> CHANGE  14 : 15  @  16 : 17
 
 ~ 			} catch (JSONException var8) {
 
-> DELETE  94  @  102 : 103
+> DELETE  5  @  5 : 6
 
-> DELETE  127  @  136 : 189
+> DELETE  33  @  34 : 87
 
-> DELETE  130  @  192 : 195
+> DELETE  3  @  56 : 59
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntitySkull.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntitySkull.edit.java
index 8fe736e..ce5a96b 100644
--- a/patches/minecraft/net/minecraft/tileentity/TileEntitySkull.edit.java
+++ b/patches/minecraft/net/minecraft/tileentity/TileEntitySkull.edit.java
@@ -11,13 +11,13 @@
 ~ 
 ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
 
-> DELETE  9  @  10 : 12
+> DELETE  7  @  8 : 10
 
-> CHANGE  38 : 39  @  41 : 42
+> CHANGE  29 : 30  @  31 : 32
 
 ~ 					this.playerProfile = new GameProfile((EaglercraftUUID) null, s);
 
-> CHANGE  73 : 74  @  76 : 100
+> CHANGE  35 : 36  @  35 : 59
 
 ~ 		return input;
 
diff --git a/patches/minecraft/net/minecraft/util/BlockPos.edit.java b/patches/minecraft/net/minecraft/util/BlockPos.edit.java
index 1ea19be..a7c89cb 100644
--- a/patches/minecraft/net/minecraft/util/BlockPos.edit.java
+++ b/patches/minecraft/net/minecraft/util/BlockPos.edit.java
@@ -7,15 +7,15 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.collect.AbstractIterator;
 + 
 
-> DELETE  7  @  5 : 9
+> DELETE  4  @  1 : 5
 
-> INSERT  110 : 127  @  112
+> INSERT  103 : 120  @  107
 
 + 	public BlockPos offsetFaster(EnumFacing facing, MutableBlockPos ret) {
 + 		ret.x = this.getX() + facing.getFrontOffsetX();
@@ -35,9 +35,9 @@
 + 	}
 + 
 
-> DELETE  235  @  220 : 223
+> DELETE  125  @  108 : 111
 
-> CHANGE  241 : 242  @  229 : 233
+> CHANGE  6 : 7  @  9 : 13
 
 ~ 			super(x_, y_, z_);
 
diff --git a/patches/minecraft/net/minecraft/util/Cartesian.edit.java b/patches/minecraft/net/minecraft/util/Cartesian.edit.java
index b92fb19..a7a09a6 100644
--- a/patches/minecraft/net/minecraft/util/Cartesian.edit.java
+++ b/patches/minecraft/net/minecraft/util/Cartesian.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 6
 
-> INSERT  10 : 15  @  14
+> INSERT  8 : 13  @  12
 
 + import com.google.common.base.Function;
 + import com.google.common.collect.Iterables;
@@ -15,11 +15,11 @@
 + import com.google.common.collect.UnmodifiableIterator;
 + 
 
-> CHANGE  47 : 48  @  46 : 47
+> CHANGE  37 : 38  @  32 : 33
 
 ~ 			return (List) Arrays.asList((Object[]) aobject);
 
-> CHANGE  62 : 63  @  61 : 62
+> CHANGE  15 : 16  @  15 : 16
 
 ~ 					? Collections.singletonList((T[]) Cartesian.createArray(this.clazz, 0)).iterator()
 
diff --git a/patches/minecraft/net/minecraft/util/ChatComponentProcessor.edit.java b/patches/minecraft/net/minecraft/util/ChatComponentProcessor.edit.java
index fdeaffb..d6b0d30 100644
--- a/patches/minecraft/net/minecraft/util/ChatComponentProcessor.edit.java
+++ b/patches/minecraft/net/minecraft/util/ChatComponentProcessor.edit.java
@@ -9,6 +9,6 @@
 
 + 
 
-> DELETE  9  @  8 : 14
+> DELETE  6  @  5 : 11
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/util/ChatComponentScore.edit.java b/patches/minecraft/net/minecraft/util/ChatComponentScore.edit.java
index 8c2ce3c..35de7f2 100644
--- a/patches/minecraft/net/minecraft/util/ChatComponentScore.edit.java
+++ b/patches/minecraft/net/minecraft/util/ChatComponentScore.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  2  @  2 : 10
 
-> DELETE  25  @  33 : 45
+> DELETE  23  @  31 : 43
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/util/ChatComponentStyle.edit.java b/patches/minecraft/net/minecraft/util/ChatComponentStyle.edit.java
index 4011e14..52a90c7 100644
--- a/patches/minecraft/net/minecraft/util/ChatComponentStyle.edit.java
+++ b/patches/minecraft/net/minecraft/util/ChatComponentStyle.edit.java
@@ -11,6 +11,6 @@
 + import java.util.List;
 + 
 
-> DELETE  8  @  5 : 11
+> DELETE  6  @  3 : 9
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/util/ChatComponentTranslation.edit.java b/patches/minecraft/net/minecraft/util/ChatComponentTranslation.edit.java
index 4f56e89..3c2d1d2 100644
--- a/patches/minecraft/net/minecraft/util/ChatComponentTranslation.edit.java
+++ b/patches/minecraft/net/minecraft/util/ChatComponentTranslation.edit.java
@@ -7,9 +7,9 @@
 
 > DELETE  2  @  2 : 4
 
-> DELETE  8  @  10 : 16
+> DELETE  6  @  8 : 14
 
-> INSERT  9 : 14  @  17
+> INSERT  1 : 6  @  7
 
 + import com.google.common.collect.Iterators;
 + import com.google.common.collect.Lists;
@@ -17,11 +17,11 @@
 + import net.lax1dude.eaglercraft.v1_8.HString;
 + 
 
-> CHANGE  72 : 73  @  75 : 76
+> CHANGE  63 : 64  @  58 : 59
 
 ~ 							HString.format(format.substring(j, k), new Object[0]));
 
-> CHANGE  98 : 99  @  101 : 102
+> CHANGE  26 : 27  @  26 : 27
 
 ~ 						HString.format(format.substring(j), new Object[0]));
 
diff --git a/patches/minecraft/net/minecraft/util/ChatComponentTranslationFormatException.edit.java b/patches/minecraft/net/minecraft/util/ChatComponentTranslationFormatException.edit.java
index 385a6ce..614791f 100644
--- a/patches/minecraft/net/minecraft/util/ChatComponentTranslationFormatException.edit.java
+++ b/patches/minecraft/net/minecraft/util/ChatComponentTranslationFormatException.edit.java
@@ -9,15 +9,15 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.HString;
 
-> CHANGE  6 : 7  @  6 : 7
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 		super(HString.format("Error parsing: %s: %s", new Object[] { component, message }));
 
-> CHANGE  10 : 11  @  10 : 11
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 		super(HString.format("Invalid index %d requested for %s", new Object[] { Integer.valueOf(index), component }));
 
-> CHANGE  14 : 15  @  14 : 15
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 		super(HString.format("Error while parsing: %s", new Object[] { component }), cause);
 
diff --git a/patches/minecraft/net/minecraft/util/ChatStyle.edit.java b/patches/minecraft/net/minecraft/util/ChatStyle.edit.java
index 66da729..b909b50 100644
--- a/patches/minecraft/net/minecraft/util/ChatStyle.edit.java
+++ b/patches/minecraft/net/minecraft/util/ChatStyle.edit.java
@@ -13,9 +13,9 @@
 ~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeCodec;
 ~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider;
 
-> DELETE  9  @  13 : 15
+> DELETE  7  @  11 : 13
 
-> CHANGE  339 : 348  @  345 : 357
+> CHANGE  330 : 339  @  332 : 344
 
 ~ 	public static class Serializer implements JSONTypeCodec {
 ~ 		public ChatStyle deserialize(JSONObject jsonobject) throws JSONException {
@@ -27,43 +27,43 @@
 ~ 					chatstyle.bold = jsonobject.getBoolean("bold");
 ~ 				}
 
-> CHANGE  349 : 352  @  358 : 361
+> CHANGE  10 : 13  @  13 : 16
 
 ~ 				if (jsonobject.has("italic")) {
 ~ 					chatstyle.italic = jsonobject.getBoolean("italic");
 ~ 				}
 
-> CHANGE  353 : 356  @  362 : 365
+> CHANGE  4 : 7  @  4 : 7
 
 ~ 				if (jsonobject.has("underlined")) {
 ~ 					chatstyle.underlined = jsonobject.getBoolean("underlined");
 ~ 				}
 
-> CHANGE  357 : 360  @  366 : 369
+> CHANGE  4 : 7  @  4 : 7
 
 ~ 				if (jsonobject.has("strikethrough")) {
 ~ 					chatstyle.strikethrough = jsonobject.getBoolean("strikethrough");
 ~ 				}
 
-> CHANGE  361 : 364  @  370 : 373
+> CHANGE  4 : 7  @  4 : 7
 
 ~ 				if (jsonobject.has("obfuscated")) {
 ~ 					chatstyle.obfuscated = jsonobject.getBoolean("obfuscated");
 ~ 				}
 
-> CHANGE  365 : 368  @  374 : 378
+> CHANGE  4 : 7  @  4 : 8
 
 ~ 				if (jsonobject.has("color")) {
 ~ 					chatstyle.color = EnumChatFormatting.getValueByName(jsonobject.getString("color"));
 ~ 				}
 
-> CHANGE  369 : 372  @  379 : 382
+> CHANGE  4 : 7  @  5 : 8
 
 ~ 				if (jsonobject.has("insertion")) {
 ~ 					chatstyle.insertion = jsonobject.getString("insertion");
 ~ 				}
 
-> CHANGE  373 : 383  @  383 : 394
+> CHANGE  4 : 14  @  4 : 15
 
 ~ 				if (jsonobject.has("clickEvent")) {
 ~ 					JSONObject jsonobject1 = jsonobject.getJSONObject("clickEvent");
@@ -76,11 +76,11 @@
 ~ 								&& clickevent$action.shouldAllowInChat()) {
 ~ 							chatstyle.chatClickEvent = new ClickEvent(clickevent$action, jsonprimitive1);
 
-> INSERT  385 : 386  @  396
+> INSERT  12 : 13  @  13
 
 + 				}
 
-> CHANGE  387 : 398  @  397 : 409
+> CHANGE  2 : 13  @  1 : 13
 
 ~ 				if (jsonobject.has("hoverEvent")) {
 ~ 					JSONObject jsonobject2 = jsonobject.getJSONObject("hoverEvent");
@@ -94,57 +94,57 @@
 ~ 								&& hoverevent$action.shouldAllowInChat()) {
 ~ 							chatstyle.chatHoverEvent = new HoverEvent(hoverevent$action, ichatcomponent);
 
-> DELETE  400  @  411 : 413
+> DELETE  13  @  14 : 16
 
-> CHANGE  401 : 403  @  414 : 416
+> CHANGE  1 : 3  @  3 : 5
 
 ~ 
 ~ 				return chatstyle;
 
-> CHANGE  406 : 407  @  419 : 421
+> CHANGE  5 : 6  @  5 : 7
 
 ~ 		public JSONObject serialize(ChatStyle chatstyle) {
 
-> CHANGE  410 : 411  @  424 : 425
+> CHANGE  4 : 5  @  5 : 6
 
 ~ 				JSONObject jsonobject = new JSONObject();
 
-> CHANGE  412 : 413  @  426 : 427
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 					jsonobject.put("bold", chatstyle.bold);
 
-> CHANGE  416 : 417  @  430 : 431
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 					jsonobject.put("italic", chatstyle.italic);
 
-> CHANGE  420 : 421  @  434 : 435
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 					jsonobject.put("underlined", chatstyle.underlined);
 
-> CHANGE  424 : 425  @  438 : 439
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 					jsonobject.put("strikethrough", chatstyle.strikethrough);
 
-> CHANGE  428 : 429  @  442 : 443
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 					jsonobject.put("obfuscated", chatstyle.obfuscated);
 
-> CHANGE  432 : 433  @  446 : 447
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 					jsonobject.put("color", (String) JSONTypeProvider.serialize(chatstyle.color));
 
-> CHANGE  436 : 437  @  450 : 451
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 					jsonobject.put("insertion", chatstyle.insertion);
 
-> CHANGE  440 : 444  @  454 : 458
+> CHANGE  4 : 8  @  4 : 8
 
 ~ 					JSONObject jsonobject1 = new JSONObject();
 ~ 					jsonobject1.put("action", chatstyle.chatClickEvent.getAction().getCanonicalName());
 ~ 					jsonobject1.put("value", chatstyle.chatClickEvent.getValue());
 ~ 					jsonobject.put("clickEvent", jsonobject1);
 
-> CHANGE  447 : 452  @  461 : 465
+> CHANGE  7 : 12  @  7 : 11
 
 ~ 					JSONObject jsonobject2 = new JSONObject();
 ~ 					jsonobject2.put("action", chatstyle.chatHoverEvent.getAction().getCanonicalName());
diff --git a/patches/minecraft/net/minecraft/util/ClassInheritanceMultiMap.edit.java b/patches/minecraft/net/minecraft/util/ClassInheritanceMultiMap.edit.java
index 7bcabcd..9909ca5 100644
--- a/patches/minecraft/net/minecraft/util/ClassInheritanceMultiMap.edit.java
+++ b/patches/minecraft/net/minecraft/util/ClassInheritanceMultiMap.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 6
 
-> INSERT  8 : 13  @  12
+> INSERT  6 : 11  @  10
 
 + import com.google.common.collect.Iterators;
 + import com.google.common.collect.Lists;
@@ -15,11 +15,11 @@
 + import com.google.common.collect.Sets;
 + 
 
-> CHANGE  36 : 37  @  35 : 36
+> CHANGE  28 : 29  @  23 : 24
 
 ~ 				this.func_181743_a((T) object, clazz);
 
-> CHANGE  68 : 69  @  67 : 68
+> CHANGE  32 : 33  @  32 : 33
 
 ~ 			this.map.put(parClass1, (List) Lists.newArrayList(new Object[] { parObject }));
 
diff --git a/patches/minecraft/net/minecraft/util/CombatTracker.edit.java b/patches/minecraft/net/minecraft/util/CombatTracker.edit.java
index 4a1f518..d316741 100644
--- a/patches/minecraft/net/minecraft/util/CombatTracker.edit.java
+++ b/patches/minecraft/net/minecraft/util/CombatTracker.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.collect.Lists;
 + 
 
-> DELETE  12  @  10 : 15
+> DELETE  9  @  6 : 11
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/util/EnchantmentNameParts.edit.java b/patches/minecraft/net/minecraft/util/EnchantmentNameParts.edit.java
index c5be617..fe36e3d 100644
--- a/patches/minecraft/net/minecraft/util/EnchantmentNameParts.edit.java
+++ b/patches/minecraft/net/minecraft/util/EnchantmentNameParts.edit.java
@@ -9,7 +9,7 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 
-> CHANGE  6 : 7  @  6 : 7
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	private EaglercraftRandom rand = new EaglercraftRandom();
 
diff --git a/patches/minecraft/net/minecraft/util/EnumChatFormatting.edit.java b/patches/minecraft/net/minecraft/util/EnumChatFormatting.edit.java
index 0dafbda..c1547f7 100644
--- a/patches/minecraft/net/minecraft/util/EnumChatFormatting.edit.java
+++ b/patches/minecraft/net/minecraft/util/EnumChatFormatting.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 4
 
-> INSERT  7 : 10  @  9
+> INSERT  5 : 8  @  7
 
 + import com.google.common.collect.Lists;
 + import com.google.common.collect.Maps;
diff --git a/patches/minecraft/net/minecraft/util/EnumFacing.edit.java b/patches/minecraft/net/minecraft/util/EnumFacing.edit.java
index 17a5949..2f5dd99 100644
--- a/patches/minecraft/net/minecraft/util/EnumFacing.edit.java
+++ b/patches/minecraft/net/minecraft/util/EnumFacing.edit.java
@@ -12,13 +12,13 @@
 + import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 + 
 
-> DELETE  9  @  5 : 11
+> DELETE  7  @  3 : 9
 
-> CHANGE  180 : 181  @  182 : 183
+> CHANGE  171 : 172  @  177 : 178
 
 ~ 	public static EnumFacing random(EaglercraftRandom rand) {
 
-> CHANGE  321 : 322  @  323 : 324
+> CHANGE  141 : 142  @  141 : 142
 
 ~ 		public EnumFacing random(EaglercraftRandom rand) {
 
diff --git a/patches/minecraft/net/minecraft/util/EnumParticleTypes.edit.java b/patches/minecraft/net/minecraft/util/EnumParticleTypes.edit.java
index c1547f7..fb60ee1 100644
--- a/patches/minecraft/net/minecraft/util/EnumParticleTypes.edit.java
+++ b/patches/minecraft/net/minecraft/util/EnumParticleTypes.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 4
 
-> INSERT  5 : 8  @  7
+> INSERT  3 : 6  @  5
 
 + import com.google.common.collect.Lists;
 + import com.google.common.collect.Maps;
diff --git a/patches/minecraft/net/minecraft/util/IChatComponent.edit.java b/patches/minecraft/net/minecraft/util/IChatComponent.edit.java
index 4fbe0eb..460bb09 100644
--- a/patches/minecraft/net/minecraft/util/IChatComponent.edit.java
+++ b/patches/minecraft/net/minecraft/util/IChatComponent.edit.java
@@ -7,9 +7,9 @@
 
 > DELETE  2  @  2 : 14
 
-> DELETE  3  @  15 : 23
+> DELETE  1  @  13 : 21
 
-> INSERT  4 : 11  @  24
+> INSERT  1 : 8  @  9
 
 + import org.json.JSONArray;
 + import org.json.JSONException;
@@ -19,11 +19,11 @@
 + import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider;
 + 
 
-> CHANGE  30 : 31  @  43 : 45
+> CHANGE  26 : 27  @  19 : 21
 
 ~ 	public static class Serializer implements JSONTypeCodec {
 
-> CHANGE  32 : 38  @  46 : 53
+> CHANGE  2 : 8  @  3 : 10
 
 ~ 		public IChatComponent deserialize(Object parJsonElement) throws JSONException {
 ~ 			if (parJsonElement instanceof String) {
@@ -32,138 +32,138 @@
 ~ 				if (parJsonElement instanceof JSONArray) {
 ~ 					JSONArray jsonarray1 = (JSONArray) parJsonElement;
 
-> CHANGE  40 : 42  @  55 : 58
+> CHANGE  8 : 10  @  9 : 12
 
 ~ 					for (Object jsonelement : jsonarray1) {
 ~ 						IChatComponent ichatcomponent1 = this.deserialize(jsonelement);
 
-> CHANGE  51 : 53  @  67 : 69
+> CHANGE  11 : 13  @  12 : 14
 
 ~ 					throw new JSONException("Don\'t know how to turn " + parJsonElement.getClass().getSimpleName()
 ~ 							+ " into a Component");
 
-> CHANGE  55 : 56  @  71 : 72
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 				JSONObject jsonobject = (JSONObject) parJsonElement;
 
-> CHANGE  58 : 59  @  74 : 75
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 					object = new ChatComponentText(jsonobject.getString("text"));
 
-> CHANGE  60 : 61  @  76 : 77
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 					String s = jsonobject.getString("translate");
 
-> CHANGE  62 : 64  @  78 : 80
+> CHANGE  2 : 4  @  2 : 4
 
 ~ 						JSONArray jsonarray = jsonobject.getJSONArray("with");
 ~ 						Object[] aobject = new Object[jsonarray.length()];
 
-> CHANGE  66 : 67  @  82 : 83
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 							aobject[i] = this.deserialize(jsonarray.get(i));
 
-> CHANGE  81 : 82  @  97 : 98
+> CHANGE  15 : 16  @  15 : 16
 
 ~ 					JSONObject jsonobject1 = jsonobject.getJSONObject("score");
 
-> CHANGE  83 : 84  @  99 : 100
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 						throw new JSONException("A score component needs a least a name and an objective");
 
-> CHANGE  86 : 87  @  102 : 104
+> CHANGE  3 : 4  @  3 : 5
 
 ~ 					object = new ChatComponentScore(jsonobject1.getString("name"), jsonobject1.getString("objective"));
 
-> CHANGE  88 : 89  @  105 : 106
+> CHANGE  2 : 3  @  3 : 4
 
 ~ 						((ChatComponentScore) object).setValue(jsonobject1.getString("value"));
 
-> CHANGE  92 : 93  @  109 : 110
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 						throw new JSONException(
 
-> CHANGE  96 : 97  @  113 : 114
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 					object = new ChatComponentSelector(jsonobject.getString("selector"));
 
-> CHANGE  100 : 103  @  117 : 120
+> CHANGE  4 : 7  @  4 : 7
 
 ~ 					JSONArray jsonarray2 = jsonobject.getJSONArray("extra");
 ~ 					if (jsonarray2.length() <= 0) {
 ~ 						throw new JSONException("Unexpected empty array of components");
 
-> CHANGE  105 : 107  @  122 : 125
+> CHANGE  5 : 7  @  5 : 8
 
 ~ 					for (int j = 0; j < jsonarray2.length(); ++j) {
 ~ 						((IChatComponent) object).appendSibling(this.deserialize(jsonarray2.get(j)));
 
-> CHANGE  110 : 111  @  128 : 130
+> CHANGE  5 : 6  @  6 : 8
 
 ~ 				((IChatComponent) object).setChatStyle(JSONTypeProvider.deserialize(parJsonElement, ChatStyle.class));
 
-> CHANGE  115 : 119  @  134 : 142
+> CHANGE  5 : 9  @  6 : 14
 
 ~ 		private void serializeChatStyle(ChatStyle style, JSONObject object) {
 ~ 			JSONObject jsonelement = JSONTypeProvider.serialize(style);
 ~ 			for (String entry : jsonelement.keySet()) {
 ~ 				object.put(entry, jsonelement.get(entry));
 
-> DELETE  120  @  143 : 144
+> DELETE  5  @  9 : 10
 
-> CHANGE  122 : 123  @  146 : 148
+> CHANGE  2 : 3  @  3 : 5
 
 ~ 		public Object serialize(IChatComponent ichatcomponent) {
 
-> CHANGE  125 : 126  @  150 : 151
+> CHANGE  3 : 4  @  4 : 5
 
 ~ 				return ((ChatComponentText) ichatcomponent).getChatComponentText_TextValue();
 
-> CHANGE  127 : 128  @  152 : 153
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 				JSONObject jsonobject = new JSONObject();
 
-> CHANGE  129 : 130  @  154 : 155
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 					this.serializeChatStyle(ichatcomponent.getChatStyle(), jsonobject);
 
-> CHANGE  133 : 134  @  158 : 159
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 					JSONArray jsonarray = new JSONArray();
 
-> CHANGE  136 : 137  @  161 : 163
+> CHANGE  3 : 4  @  3 : 5
 
 ~ 						jsonarray.put(this.serialize(ichatcomponent1));
 
-> CHANGE  139 : 140  @  165 : 166
+> CHANGE  3 : 4  @  4 : 5
 
 ~ 					jsonobject.put("extra", jsonarray);
 
-> CHANGE  143 : 144  @  169 : 171
+> CHANGE  4 : 5  @  4 : 6
 
 ~ 					jsonobject.put("text", ((ChatComponentText) ichatcomponent).getChatComponentText_TextValue());
 
-> CHANGE  146 : 147  @  173 : 174
+> CHANGE  3 : 4  @  4 : 5
 
 ~ 					jsonobject.put("translate", chatcomponenttranslation.getKey());
 
-> CHANGE  149 : 150  @  176 : 177
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 						JSONArray jsonarray1 = new JSONArray();
 
-> CHANGE  153 : 154  @  180 : 182
+> CHANGE  4 : 5  @  4 : 6
 
 ~ 								jsonarray1.put(this.serialize((IChatComponent) object));
 
-> CHANGE  155 : 156  @  183 : 184
+> CHANGE  2 : 3  @  3 : 4
 
 ~ 								jsonarray1.put(String.valueOf(object));
 
-> CHANGE  159 : 160  @  187 : 188
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 						jsonobject.put("with", jsonarray1);
 
-> CHANGE  163 : 168  @  191 : 196
+> CHANGE  4 : 9  @  4 : 9
 
 ~ 					JSONObject jsonobject1 = new JSONObject();
 ~ 					jsonobject1.put("name", chatcomponentscore.getName());
@@ -171,17 +171,17 @@
 ~ 					jsonobject1.put("value", chatcomponentscore.getUnformattedTextForChat());
 ~ 					jsonobject.put("score", jsonobject1);
 
-> CHANGE  175 : 176  @  203 : 204
+> CHANGE  12 : 13  @  12 : 13
 
 ~ 					jsonobject.put("selector", chatcomponentselector.getSelector());
 
-> INSERT  182 : 185  @  210
+> INSERT  7 : 10  @  7
 
 + 		/**
 + 		 * So sorry for this implementation
 + 		 */
 
-> CHANGE  186 : 192  @  211 : 212
+> CHANGE  4 : 10  @  1 : 2
 
 ~ 			if (component instanceof ChatComponentText) {
 ~ 				String escaped = new JSONObject().put("E", component.getUnformattedTextForChat()).toString();
@@ -190,15 +190,15 @@
 ~ 				return JSONTypeProvider.serialize(component).toString();
 ~ 			}
 
-> CHANGE  195 : 196  @  215 : 216
+> CHANGE  9 : 10  @  4 : 5
 
 ~ 			return (IChatComponent) JSONTypeProvider.deserialize(json, IChatComponent.class);
 
-> INSERT  197 : 198  @  217
+> INSERT  2 : 3  @  2
 
 + 	}
 
-> CHANGE  199 : 212  @  218 : 224
+> CHANGE  2 : 15  @  1 : 7
 
 ~ 	public static IChatComponent join(List components) {
 ~ 		ChatComponentText chatcomponenttext = new ChatComponentText("");
@@ -214,7 +214,7 @@
 ~ 
 ~ 			chatcomponenttext.appendSibling((IChatComponent) components.get(i));
 
-> INSERT  213 : 215  @  225
+> INSERT  14 : 16  @  7
 
 + 
 + 		return chatcomponenttext;
diff --git a/patches/minecraft/net/minecraft/util/IJsonSerializable.edit.java b/patches/minecraft/net/minecraft/util/IJsonSerializable.edit.java
index cc8dcaa..3ca6a7d 100644
--- a/patches/minecraft/net/minecraft/util/IJsonSerializable.edit.java
+++ b/patches/minecraft/net/minecraft/util/IJsonSerializable.edit.java
@@ -7,11 +7,11 @@
 
 > DELETE  2  @  2 : 4
 
-> CHANGE  3 : 4  @  5 : 6
+> CHANGE  1 : 2  @  3 : 4
 
 ~ 	void fromJson(Object var1);
 
-> CHANGE  5 : 6  @  7 : 8
+> CHANGE  2 : 3  @  2 : 3
 
 ~ 	Object getSerializableElement();
 
diff --git a/patches/minecraft/net/minecraft/util/IThreadListener.edit.java b/patches/minecraft/net/minecraft/util/IThreadListener.edit.java
index 0527585..d171883 100644
--- a/patches/minecraft/net/minecraft/util/IThreadListener.edit.java
+++ b/patches/minecraft/net/minecraft/util/IThreadListener.edit.java
@@ -9,6 +9,6 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.futures.ListenableFuture;
 
-> DELETE  6  @  6 : 8
+> DELETE  4  @  4 : 6
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/util/JsonSerializableSet.edit.java b/patches/minecraft/net/minecraft/util/JsonSerializableSet.edit.java
index 4bc4670..662d16f 100644
--- a/patches/minecraft/net/minecraft/util/JsonSerializableSet.edit.java
+++ b/patches/minecraft/net/minecraft/util/JsonSerializableSet.edit.java
@@ -12,9 +12,9 @@
 + import org.json.JSONArray;
 + 
 
-> DELETE  8  @  4 : 9
+> DELETE  6  @  2 : 7
 
-> CHANGE  12 : 17  @  13 : 17
+> CHANGE  4 : 9  @  9 : 13
 
 ~ 	public void fromJson(Object jsonelement) {
 ~ 		if (jsonelement instanceof JSONArray) {
@@ -22,12 +22,12 @@
 ~ 			for (int i = 0; i < arr.length(); ++i) {
 ~ 				underlyingSet.add(arr.getString(i));
 
-> CHANGE  22 : 24  @  22 : 24
+> CHANGE  10 : 12  @  9 : 11
 
 ~ 	public Object getSerializableElement() {
 ~ 		JSONArray jsonarray = new JSONArray();
 
-> CHANGE  26 : 27  @  26 : 27
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 			jsonarray.put(s);
 
diff --git a/patches/minecraft/net/minecraft/util/LoggingPrintStream.edit.java b/patches/minecraft/net/minecraft/util/LoggingPrintStream.edit.java
index 313fba6..8f96408 100644
--- a/patches/minecraft/net/minecraft/util/LoggingPrintStream.edit.java
+++ b/patches/minecraft/net/minecraft/util/LoggingPrintStream.edit.java
@@ -7,30 +7,30 @@
 
 > DELETE  4  @  4 : 6
 
-> INSERT  5 : 9  @  7
+> INSERT  1 : 5  @  3
 
 + import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
 + import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 + import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 + 
 
-> DELETE  10  @  8 : 9
+> DELETE  5  @  1 : 2
 
-> INSERT  11 : 13  @  10
+> INSERT  1 : 3  @  2
 
 + 	private final Logger logger;
 + 	private final boolean err;
 
-> CHANGE  14 : 15  @  11 : 12
+> CHANGE  3 : 4  @  1 : 2
 
 ~ 	public LoggingPrintStream(String domainIn, boolean err, OutputStream outStream) {
 
-> INSERT  17 : 19  @  14
+> INSERT  3 : 5  @  3
 
 + 		this.logger = LogManager.getLogger(domainIn);
 + 		this.err = err;
 
-> CHANGE  30 : 44  @  25 : 29
+> CHANGE  13 : 27  @  11 : 15
 
 ~ 		String callingClass = PlatformRuntime.getCallingClass(3);
 ~ 		if (callingClass == null) {
diff --git a/patches/minecraft/net/minecraft/util/MapPopulator.edit.java b/patches/minecraft/net/minecraft/util/MapPopulator.edit.java
index 8a6353e..16a5e05 100644
--- a/patches/minecraft/net/minecraft/util/MapPopulator.edit.java
+++ b/patches/minecraft/net/minecraft/util/MapPopulator.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  6 : 8  @  7
+> INSERT  4 : 6  @  5
 
 + import com.google.common.collect.Maps;
 + 
 
-> CHANGE  17 : 18  @  16 : 17
+> CHANGE  11 : 12  @  9 : 10
 
 ~ 			map.put((K) object, (V) iterator.next());
 
diff --git a/patches/minecraft/net/minecraft/util/MathHelper.edit.java b/patches/minecraft/net/minecraft/util/MathHelper.edit.java
index 165eb6d..d22112e 100644
--- a/patches/minecraft/net/minecraft/util/MathHelper.edit.java
+++ b/patches/minecraft/net/minecraft/util/MathHelper.edit.java
@@ -10,23 +10,23 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 
-> CHANGE  103 : 104  @  104 : 105
+> CHANGE  101 : 102  @  102 : 103
 
 ~ 	public static int getRandomIntegerInRange(EaglercraftRandom parRandom, int parInt1, int parInt2) {
 
-> CHANGE  107 : 108  @  108 : 109
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public static float randomFloatClamp(EaglercraftRandom parRandom, float parFloat1, float parFloat2) {
 
-> CHANGE  111 : 112  @  112 : 113
+> CHANGE  4 : 5  @  4 : 5
 
 ~ 	public static double getRandomDoubleInRange(EaglercraftRandom parRandom, double parDouble1, double parDouble2) {
 
-> CHANGE  259 : 260  @  260 : 261
+> CHANGE  148 : 149  @  148 : 149
 
 ~ 	public static EaglercraftUUID getRandomUuid(EaglercraftRandom rand) {
 
-> CHANGE  262 : 263  @  263 : 264
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 		return new EaglercraftUUID(i, j);
 
diff --git a/patches/minecraft/net/minecraft/util/ObjectIntIdentityMap.edit.java b/patches/minecraft/net/minecraft/util/ObjectIntIdentityMap.edit.java
index 0e4be8d..3e6f303 100644
--- a/patches/minecraft/net/minecraft/util/ObjectIntIdentityMap.edit.java
+++ b/patches/minecraft/net/minecraft/util/ObjectIntIdentityMap.edit.java
@@ -7,16 +7,16 @@
 
 > DELETE  2  @  2 : 5
 
-> DELETE  5  @  8 : 9
+> DELETE  3  @  6 : 7
 
-> INSERT  6 : 10  @  10
+> INSERT  1 : 5  @  2
 
 + import com.google.common.base.Predicates;
 + import com.google.common.collect.Iterators;
 + import com.google.common.collect.Lists;
 + 
 
-> CHANGE  18 : 19  @  18 : 19
+> CHANGE  12 : 13  @  8 : 9
 
 ~ 			this.objectList.add((T) null);
 
diff --git a/patches/minecraft/net/minecraft/util/RegistryNamespaced.edit.java b/patches/minecraft/net/minecraft/util/RegistryNamespaced.edit.java
index 16ee99c..38b9b04 100644
--- a/patches/minecraft/net/minecraft/util/RegistryNamespaced.edit.java
+++ b/patches/minecraft/net/minecraft/util/RegistryNamespaced.edit.java
@@ -7,9 +7,9 @@
 
 > DELETE  2  @  2 : 4
 
-> DELETE  4  @  6 : 9
+> DELETE  2  @  4 : 7
 
-> INSERT  5 : 8  @  10
+> INSERT  1 : 4  @  4
 
 + import com.google.common.collect.BiMap;
 + import com.google.common.collect.HashBiMap;
diff --git a/patches/minecraft/net/minecraft/util/RegistrySimple.edit.java b/patches/minecraft/net/minecraft/util/RegistrySimple.edit.java
index 9ce76a3..155f415 100644
--- a/patches/minecraft/net/minecraft/util/RegistrySimple.edit.java
+++ b/patches/minecraft/net/minecraft/util/RegistrySimple.edit.java
@@ -7,13 +7,13 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  6 : 7  @  7 : 8
+> CHANGE  4 : 5  @  5 : 6
 
 ~ 
 
-> DELETE  8  @  9 : 11
+> DELETE  2  @  2 : 4
 
-> INSERT  9 : 14  @  12
+> INSERT  1 : 6  @  3
 
 + import com.google.common.collect.Maps;
 + 
diff --git a/patches/minecraft/net/minecraft/util/ScreenShotHelper.edit.java b/patches/minecraft/net/minecraft/util/ScreenShotHelper.edit.java
index 7526212..bb75570 100644
--- a/patches/minecraft/net/minecraft/util/ScreenShotHelper.edit.java
+++ b/patches/minecraft/net/minecraft/util/ScreenShotHelper.edit.java
@@ -9,13 +9,13 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.internal.PlatformApplication;
 
-> DELETE  5  @  23 : 27
+> DELETE  3  @  21 : 25
 
-> CHANGE  6 : 8  @  28 : 30
+> CHANGE  1 : 3  @  5 : 7
 
 ~ 	public static IChatComponent saveScreenshot() {
 ~ 		return new ChatComponentText("Saved Screenshot As: " + PlatformApplication.saveScreenshot());
 
-> DELETE  9  @  31 : 107
+> DELETE  3  @  3 : 79
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/util/Session.edit.java b/patches/minecraft/net/minecraft/util/Session.edit.java
index 369e252..a807b35 100644
--- a/patches/minecraft/net/minecraft/util/Session.edit.java
+++ b/patches/minecraft/net/minecraft/util/Session.edit.java
@@ -12,41 +12,41 @@
 ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
 ~ import net.lax1dude.eaglercraft.v1_8.profile.EaglerProfile;
 
-> CHANGE  8 : 9  @  9 : 13
+> CHANGE  6 : 7  @  7 : 11
 
 ~ 	private GameProfile profile;
 
-> CHANGE  10 : 11  @  14 : 20
+> CHANGE  2 : 3  @  5 : 11
 
 ~ 	private static final EaglercraftUUID offlineUUID;
 
-> CHANGE  12 : 14  @  21 : 23
+> CHANGE  2 : 4  @  7 : 9
 
 ~ 	public Session() {
 ~ 		reset();
 
-> CHANGE  16 : 18  @  25 : 27
+> CHANGE  4 : 6  @  4 : 6
 
 ~ 	public GameProfile getProfile() {
 ~ 		return profile;
 
-> CHANGE  20 : 22  @  29 : 31
+> CHANGE  4 : 6  @  4 : 6
 
 ~ 	public void update(String serverUsername, EaglercraftUUID uuid) {
 ~ 		profile = new GameProfile(uuid, serverUsername);
 
-> CHANGE  24 : 26  @  33 : 35
+> CHANGE  4 : 6  @  4 : 6
 
 ~ 	public void reset() {
 ~ 		update(EaglerProfile.getName(), offlineUUID);
 
-> CHANGE  28 : 32  @  37 : 44
+> CHANGE  4 : 8  @  4 : 11
 
 ~ 	static {
 ~ 		byte[] bytes = new byte[16];
 ~ 		(new EaglercraftRandom()).nextBytes(bytes);
 ~ 		offlineUUID = new EaglercraftUUID(bytes);
 
-> DELETE  34  @  46 : 71
+> DELETE  6  @  9 : 34
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/util/StringTranslate.edit.java b/patches/minecraft/net/minecraft/util/StringTranslate.edit.java
index 12fabb4..dd4d068 100644
--- a/patches/minecraft/net/minecraft/util/StringTranslate.edit.java
+++ b/patches/minecraft/net/minecraft/util/StringTranslate.edit.java
@@ -7,13 +7,13 @@
 
 > DELETE  2  @  2 : 6
 
-> INSERT  5 : 6  @  9
+> INSERT  3 : 4  @  7
 
 + import java.util.regex.Matcher;
 
-> DELETE  7  @  10 : 12
+> DELETE  2  @  1 : 3
 
-> INSERT  8 : 17  @  13
+> INSERT  1 : 10  @  3
 
 + import com.google.common.base.Charsets;
 + import com.google.common.base.Splitter;
@@ -25,12 +25,12 @@
 + import net.lax1dude.eaglercraft.v1_8.IOUtils;
 + 
 
-> CHANGE  25 : 27  @  21 : 23
+> CHANGE  17 : 19  @  8 : 10
 
 ~ 		this.lastUpdateTimeInMilliseconds = System.currentTimeMillis();
 ~ 	}
 
-> CHANGE  28 : 40  @  24 : 32
+> CHANGE  3 : 15  @  3 : 11
 
 ~ 	public static void doCLINIT() {
 ~ 		InputStream inputstream = EagRuntime.getResourceStream("/assets/minecraft/lang/en_US.lang");
@@ -45,13 +45,13 @@
 ~ 																								// (why?)
 ~ 					instance.languageList.put(s1, s2);
 
-> DELETE  42  @  34 : 38
+> DELETE  14  @  10 : 14
 
-> INSERT  44 : 45  @  40
+> INSERT  2 : 3  @  6
 
 + 		instance.lastUpdateTimeInMilliseconds = System.currentTimeMillis();
 
-> CHANGE  65 : 66  @  60 : 61
+> CHANGE  21 : 22  @  20 : 21
 
 ~ 			return HString.format(s, format);
 
diff --git a/patches/minecraft/net/minecraft/util/Util.edit.java b/patches/minecraft/net/minecraft/util/Util.edit.java
index e0c1008..8e28bfe 100644
--- a/patches/minecraft/net/minecraft/util/Util.edit.java
+++ b/patches/minecraft/net/minecraft/util/Util.edit.java
@@ -12,7 +12,7 @@
 ~ import net.lax1dude.eaglercraft.v1_8.futures.FutureTask;
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
-> CHANGE  9 : 10  @  8 : 15
+> CHANGE  7 : 8  @  6 : 13
 
 ~ 		return EagRuntime.getPlatformOS().getMinecraftEnum();
 
diff --git a/patches/minecraft/net/minecraft/util/Vec3i.edit.java b/patches/minecraft/net/minecraft/util/Vec3i.edit.java
index 31dc692..db24c16 100644
--- a/patches/minecraft/net/minecraft/util/Vec3i.edit.java
+++ b/patches/minecraft/net/minecraft/util/Vec3i.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  3  @  3 : 4
 
-> CHANGE  6 : 9  @  7 : 10
+> CHANGE  3 : 6  @  4 : 7
 
 ~ 	public int x;
 ~ 	public int y;
diff --git a/patches/minecraft/net/minecraft/util/WeightedRandom.edit.java b/patches/minecraft/net/minecraft/util/WeightedRandom.edit.java
index b9b9653..6f5992b 100644
--- a/patches/minecraft/net/minecraft/util/WeightedRandom.edit.java
+++ b/patches/minecraft/net/minecraft/util/WeightedRandom.edit.java
@@ -9,11 +9,11 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 
-> CHANGE  16 : 17  @  16 : 17
+> CHANGE  13 : 14  @  13 : 14
 
 ~ 	public static  T getRandomItem(EaglercraftRandom random, Collection collection,
 
-> CHANGE  37 : 38  @  37 : 38
+> CHANGE  21 : 22  @  21 : 22
 
 ~ 	public static  T getRandomItem(EaglercraftRandom random, Collection collection) {
 
diff --git a/patches/minecraft/net/minecraft/util/WeightedRandomChestContent.edit.java b/patches/minecraft/net/minecraft/util/WeightedRandomChestContent.edit.java
index ecae70f..39389c9 100644
--- a/patches/minecraft/net/minecraft/util/WeightedRandomChestContent.edit.java
+++ b/patches/minecraft/net/minecraft/util/WeightedRandomChestContent.edit.java
@@ -7,21 +7,21 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  5 : 9  @  6 : 7
+> CHANGE  3 : 7  @  4 : 5
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 ~ import com.google.common.collect.Lists;
 ~ 
 
-> DELETE  13  @  11 : 12
+> DELETE  8  @  5 : 6
 
-> CHANGE  34 : 36  @  33 : 35
+> CHANGE  21 : 23  @  22 : 24
 
 ~ 	public static void generateChestContents(EaglercraftRandom random, List listIn,
 ~ 			IInventory inv, int max) {
 
-> CHANGE  56 : 57  @  55 : 56
+> CHANGE  22 : 23  @  22 : 23
 
 ~ 	public static void generateDispenserContents(EaglercraftRandom random, List listIn,
 
diff --git a/patches/minecraft/net/minecraft/util/WeightedRandomFishable.edit.java b/patches/minecraft/net/minecraft/util/WeightedRandomFishable.edit.java
index 3d2a3a0..df46143 100644
--- a/patches/minecraft/net/minecraft/util/WeightedRandomFishable.edit.java
+++ b/patches/minecraft/net/minecraft/util/WeightedRandomFishable.edit.java
@@ -10,9 +10,9 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  6  @  5 : 6
+> DELETE  4  @  3 : 4
 
-> CHANGE  17 : 18  @  17 : 18
+> CHANGE  11 : 12  @  12 : 13
 
 ~ 	public ItemStack getItemStack(EaglercraftRandom random) {
 
diff --git a/patches/minecraft/net/minecraft/village/MerchantRecipeList.edit.java b/patches/minecraft/net/minecraft/village/MerchantRecipeList.edit.java
index 0248129..e44982d 100644
--- a/patches/minecraft/net/minecraft/village/MerchantRecipeList.edit.java
+++ b/patches/minecraft/net/minecraft/village/MerchantRecipeList.edit.java
@@ -9,6 +9,6 @@
 
 + 
 
-> DELETE  10  @  9 : 10
+> DELETE  6  @  5 : 6
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/world/Explosion.edit.java b/patches/minecraft/net/minecraft/world/Explosion.edit.java
index 7c6047a..a4e043e 100644
--- a/patches/minecraft/net/minecraft/world/Explosion.edit.java
+++ b/patches/minecraft/net/minecraft/world/Explosion.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 5
 
-> CHANGE  5 : 11  @  8 : 9
+> CHANGE  3 : 9  @  6 : 7
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
@@ -16,13 +16,13 @@
 ~ import com.google.common.collect.Sets;
 ~ 
 
-> DELETE  26  @  24 : 25
+> DELETE  21  @  16 : 17
 
-> CHANGE  30 : 31  @  29 : 30
+> CHANGE  4 : 5  @  5 : 6
 
 ~ 	private final EaglercraftRandom explosionRNG;
 
-> CHANGE  53 : 54  @  52 : 53
+> CHANGE  23 : 24  @  23 : 24
 
 ~ 		this.explosionRNG = new EaglercraftRandom();
 
diff --git a/patches/minecraft/net/minecraft/world/World.edit.java b/patches/minecraft/net/minecraft/world/World.edit.java
index 7d79939..de79521 100644
--- a/patches/minecraft/net/minecraft/world/World.edit.java
+++ b/patches/minecraft/net/minecraft/world/World.edit.java
@@ -7,15 +7,15 @@
 
 > DELETE  2  @  2 : 5
 
-> CHANGE  7 : 8  @  10 : 11
+> CHANGE  5 : 6  @  8 : 9
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 
-> CHANGE  9 : 10  @  12 : 13
+> CHANGE  2 : 3  @  2 : 3
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 
-> INSERT  11 : 16  @  14
+> INSERT  2 : 7  @  2
 
 + 
 + import com.google.common.base.Predicate;
@@ -23,93 +23,93 @@
 + import com.google.common.collect.Sets;
 + 
 
-> DELETE  34  @  32 : 33
+> DELETE  23  @  18 : 19
 
-> DELETE  46  @  45 : 60
+> DELETE  12  @  13 : 28
 
-> DELETE  47  @  61 : 62
+> DELETE  1  @  16 : 17
 
-> DELETE  50  @  65 : 66
+> DELETE  3  @  4 : 5
 
-> CHANGE  68 : 69  @  84 : 85
+> CHANGE  18 : 19  @  19 : 20
 
 ~ 	protected int updateLCG = (new EaglercraftRandom()).nextInt();
 
-> CHANGE  75 : 76  @  91 : 92
+> CHANGE  7 : 8  @  7 : 8
 
 ~ 	public final EaglercraftRandom rand = new EaglercraftRandom();
 
-> DELETE  83  @  99 : 100
+> DELETE  8  @  8 : 9
 
-> DELETE  86  @  103 : 104
+> DELETE  3  @  4 : 5
 
-> INSERT  96 : 99  @  114
+> INSERT  10 : 13  @  11
 
 + 		if (!client) {
 + 			throw new IllegalStateException("Singleplayer is unavailable because all of it's code was deleted");
 + 		}
 
-> DELETE  107  @  122 : 123
+> DELETE  11  @  8 : 9
 
-> CHANGE  119 : 120  @  135 : 136
+> CHANGE  12 : 13  @  13 : 14
 
 ~ 				return chunk.getBiome(pos);
 
-> CHANGE  131 : 132  @  147 : 148
+> CHANGE  12 : 13  @  12 : 13
 
 ~ 			return BiomeGenBase.plains;
 
-> DELETE  135  @  151 : 155
+> DELETE  4  @  4 : 8
 
-> DELETE  189  @  209 : 217
+> DELETE  54  @  58 : 66
 
-> DELETE  225  @  253 : 255
+> DELETE  36  @  44 : 46
 
-> CHANGE  240 : 241  @  270 : 271
+> CHANGE  15 : 16  @  17 : 18
 
 ~ 				if ((flags & 2) != 0 && ((flags & 4) == 0) && chunk.isPopulated()) {
 
-> DELETE  244  @  274 : 281
+> DELETE  4  @  4 : 11
 
-> CHANGE  280 : 281  @  317 : 321
+> CHANGE  36 : 37  @  43 : 47
 
 ~ 		this.notifyNeighborsOfStateChange(pos, blockType);
 
-> DELETE  348  @  388 : 390
+> DELETE  68  @  71 : 73
 
-> DELETE  349  @  391 : 411
+> DELETE  1  @  3 : 23
 
-> DELETE  1753  @  1815 : 1873
+> DELETE  1404  @  1424 : 1482
 
-> DELETE  1793  @  1913 : 1937
+> DELETE  40  @  98 : 122
 
-> CHANGE  1801 : 1802  @  1945 : 1946
+> CHANGE  8 : 9  @  32 : 33
 
 ~ 	public void forceBlockUpdateTick(Block blockType, BlockPos pos, EaglercraftRandom random) {
 
-> DELETE  2033  @  2177 : 2181
+> DELETE  232  @  232 : 236
 
-> CHANGE  2061 : 2062  @  2209 : 2210
+> CHANGE  28 : 29  @  32 : 33
 
 ~ 			if (entityType.isAssignableFrom(entity.getClass()) && filter.apply((T) entity)) {
 
-> CHANGE  2072 : 2074  @  2220 : 2222
+> CHANGE  11 : 13  @  11 : 13
 
 ~ 		for (EntityPlayer entity : this.playerEntities) {
 ~ 			if (playerType.isAssignableFrom(entity.getClass()) && filter.apply((T) entity)) {
 
-> CHANGE  2306 : 2307  @  2454 : 2455
+> CHANGE  234 : 235  @  234 : 235
 
 ~ 	public EntityPlayer getPlayerEntityByUUID(EaglercraftUUID uuid) {
 
-> CHANGE  2504 : 2505  @  2652 : 2653
+> CHANGE  198 : 199  @  198 : 199
 
 ~ 	public EaglercraftRandom setRandomSeed(int parInt1, int parInt2, int parInt3) {
 
-> CHANGE  2557 : 2558  @  2705 : 2706
+> CHANGE  53 : 54  @  53 : 54
 
 ~ 			this.theCalendar.setTimeInMillis(System.currentTimeMillis());
 
-> DELETE  2625  @  2773 : 2777
+> DELETE  68  @  68 : 72
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/world/WorldProvider.edit.java b/patches/minecraft/net/minecraft/world/WorldProvider.edit.java
index 8644282..6536577 100644
--- a/patches/minecraft/net/minecraft/world/WorldProvider.edit.java
+++ b/patches/minecraft/net/minecraft/world/WorldProvider.edit.java
@@ -7,18 +7,18 @@
 
 > DELETE  6  @  6 : 14
 
-> DELETE  7  @  15 : 20
+> DELETE  1  @  9 : 14
 
-> DELETE  13  @  26 : 27
+> DELETE  6  @  11 : 12
 
-> DELETE  38  @  52 : 64
+> DELETE  25  @  26 : 38
 
-> DELETE  41  @  67 : 79
+> DELETE  3  @  15 : 27
 
-> CHANGE  72 : 73  @  110 : 111
+> CHANGE  31 : 32  @  43 : 44
 
 ~ 		float f2 = 0.0F;
 
-> DELETE  136  @  174 : 178
+> DELETE  64  @  64 : 68
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/world/WorldProviderEnd.edit.java b/patches/minecraft/net/minecraft/world/WorldProviderEnd.edit.java
index 9b6d23d..bc2e88d 100644
--- a/patches/minecraft/net/minecraft/world/WorldProviderEnd.edit.java
+++ b/patches/minecraft/net/minecraft/world/WorldProviderEnd.edit.java
@@ -7,8 +7,8 @@
 
 > DELETE  5  @  5 : 10
 
-> DELETE  8  @  13 : 14
+> DELETE  3  @  8 : 9
 
-> DELETE  12  @  18 : 22
+> DELETE  4  @  5 : 9
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/world/WorldProviderHell.edit.java b/patches/minecraft/net/minecraft/world/WorldProviderHell.edit.java
index ad088f8..2af1c44 100644
--- a/patches/minecraft/net/minecraft/world/WorldProviderHell.edit.java
+++ b/patches/minecraft/net/minecraft/world/WorldProviderHell.edit.java
@@ -7,10 +7,10 @@
 
 > DELETE  3  @  3 : 6
 
-> DELETE  4  @  7 : 9
+> DELETE  1  @  4 : 6
 
-> DELETE  7  @  12 : 13
+> DELETE  3  @  5 : 6
 
-> DELETE  26  @  32 : 37
+> DELETE  19  @  20 : 25
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenBase.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenBase.edit.java
index dec2942..6b0c851 100644
--- a/patches/minecraft/net/minecraft/world/biome/BiomeGenBase.edit.java
+++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenBase.edit.java
@@ -7,11 +7,11 @@
 
 > DELETE  2  @  2 : 5
 
-> CHANGE  5 : 6  @  8 : 9
+> CHANGE  3 : 4  @  6 : 7
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 
-> INSERT  7 : 14  @  10
+> INSERT  2 : 9  @  2
 
 + 
 + import com.google.common.collect.Lists;
@@ -21,13 +21,13 @@
 + import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 + import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
-> DELETE  16  @  12 : 13
+> DELETE  9  @  2 : 3
 
-> DELETE  41  @  38 : 57
+> DELETE  25  @  26 : 45
 
-> DELETE  43  @  59 : 68
+> DELETE  2  @  21 : 30
 
-> CHANGE  62 : 107  @  87 : 178
+> CHANGE  19 : 64  @  28 : 119
 
 ~ 	public static BiomeGenBase ocean;
 ~ 	public static BiomeGenBase plains;
@@ -75,33 +75,33 @@
 ~ 	protected static final NoiseGeneratorPerlin GRASS_COLOR_NOISE = new NoiseGeneratorPerlin(
 ~ 			new EaglercraftRandom(2345L), 1);
 
-> DELETE  118  @  189 : 190
+> DELETE  56  @  102 : 103
 
-> DELETE  125  @  197 : 200
+> DELETE  7  @  8 : 11
 
-> DELETE  137  @  212 : 215
+> DELETE  12  @  15 : 18
 
-> DELETE  139  @  217 : 218
+> DELETE  2  @  5 : 6
 
-> DELETE  155  @  234 : 238
+> DELETE  16  @  17 : 21
 
-> CHANGE  176 : 177  @  259 : 268
+> CHANGE  21 : 22  @  25 : 34
 
 ~ 	public BlockFlower.EnumFlowerType pickRandomFlower(EaglercraftRandom rand, BlockPos pos) {
 
-> DELETE  271  @  362 : 366
+> DELETE  95  @  103 : 107
 
-> CHANGE  287 : 289  @  382 : 384
+> CHANGE  16 : 18  @  20 : 22
 
 ~ 	public void genTerrainBlocks(World worldIn, EaglercraftRandom rand, ChunkPrimer chunkPrimerIn, int parInt1,
 ~ 			int parInt2, double parDouble1) {
 
-> CHANGE  292 : 294  @  387 : 389
+> CHANGE  5 : 7  @  5 : 7
 
 ~ 	public final void generateBiomeTerrain(World worldIn, EaglercraftRandom rand, ChunkPrimer chunkPrimerIn,
 ~ 			int parInt1, int parInt2, double parDouble1) {
 
-> CHANGE  395 : 508  @  490 : 491
+> CHANGE  103 : 216  @  103 : 104
 
 ~ 	public static class Height {
 ~ 		public float rootHeight;
@@ -217,8 +217,8 @@
 ~ 		field_180279_ad = ocean;
 ~ 
 
-> DELETE  549  @  532 : 535
+> DELETE  154  @  42 : 45
 
-> DELETE  551  @  537 : 573
+> DELETE  2  @  5 : 41
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenBeach.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenBeach.edit.java
index 958ec24..faca344 100644
--- a/patches/minecraft/net/minecraft/world/biome/BiomeGenBeach.edit.java
+++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenBeach.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  3  @  3 : 4
 
-> DELETE  10  @  11 : 15
+> DELETE  7  @  8 : 12
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenDesert.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenDesert.edit.java
index d87afb3..04d3335 100644
--- a/patches/minecraft/net/minecraft/world/biome/BiomeGenDesert.edit.java
+++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenDesert.edit.java
@@ -7,10 +7,10 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  3  @  4 : 8
+> DELETE  1  @  2 : 6
 
-> DELETE  10  @  15 : 19
+> DELETE  7  @  11 : 15
 
-> DELETE  12  @  21 : 32
+> DELETE  2  @  6 : 17
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenEnd.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenEnd.edit.java
index 832e4c3..0ad5cc9 100644
--- a/patches/minecraft/net/minecraft/world/biome/BiomeGenEnd.edit.java
+++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenEnd.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  4  @  4 : 6
 
-> DELETE  15  @  17 : 18
+> DELETE  11  @  13 : 14
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenForest.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenForest.edit.java
index 87f1181..8f04768 100644
--- a/patches/minecraft/net/minecraft/world/biome/BiomeGenForest.edit.java
+++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenForest.edit.java
@@ -10,21 +10,21 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  8  @  8 : 15
+> DELETE  6  @  6 : 13
 
-> DELETE  11  @  18 : 21
+> DELETE  3  @  10 : 13
 
-> DELETE  15  @  25 : 32
+> DELETE  4  @  7 : 14
 
-> DELETE  28  @  45 : 49
+> DELETE  13  @  20 : 24
 
-> CHANGE  44 : 45  @  65 : 71
+> CHANGE  16 : 17  @  20 : 26
 
 ~ 	public BlockFlower.EnumFlowerType pickRandomFlower(EaglercraftRandom random, BlockPos blockpos) {
 
-> DELETE  59  @  85 : 135
+> DELETE  15  @  20 : 70
 
-> CHANGE  74 : 76  @  150 : 160
+> CHANGE  15 : 17  @  65 : 75
 
 ~ 					&& this.biomeID != BiomeGenBase.birchForestHills.biomeID ? new BiomeGenMutated(i, this)
 ~ 							: new BiomeGenMutated(i, this);
diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenHills.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenHills.edit.java
index ad00b67..9f55e36 100644
--- a/patches/minecraft/net/minecraft/world/biome/BiomeGenHills.edit.java
+++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenHills.edit.java
@@ -10,17 +10,17 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  5  @  5 : 6
+> DELETE  3  @  3 : 4
 
-> DELETE  6  @  7 : 8
+> DELETE  1  @  2 : 3
 
-> DELETE  7  @  9 : 13
+> DELETE  1  @  2 : 6
 
-> DELETE  9  @  15 : 19
+> DELETE  2  @  6 : 10
 
-> DELETE  18  @  28 : 29
+> DELETE  9  @  13 : 14
 
-> CHANGE  23 : 25  @  34 : 62
+> CHANGE  5 : 7  @  6 : 34
 
 ~ 	public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j,
 ~ 			double d0) {
diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenJungle.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenJungle.edit.java
index 0063007..15b0db5 100644
--- a/patches/minecraft/net/minecraft/world/biome/BiomeGenJungle.edit.java
+++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenJungle.edit.java
@@ -7,17 +7,17 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  6  @  7 : 8
+> DELETE  4  @  5 : 6
 
-> DELETE  10  @  12 : 23
+> DELETE  4  @  5 : 16
 
-> CHANGE  13 : 16  @  26 : 34
+> CHANGE  3 : 6  @  14 : 22
 
 ~ 	private final IBlockState field_181620_aE;
 ~ 	private final IBlockState field_181621_aF;
 ~ 	private final IBlockState field_181622_aG;
 
-> INSERT  19 : 25  @  37
+> INSERT  6 : 12  @  11
 
 + 		field_181620_aE = Blocks.log.getDefaultState().withProperty(BlockOldLog.VARIANT, BlockPlanks.EnumType.JUNGLE);
 + 		field_181621_aF = Blocks.leaves.getDefaultState()
@@ -26,8 +26,8 @@
 + 		field_181622_aG = Blocks.leaves.getDefaultState().withProperty(BlockOldLeaf.VARIANT, BlockPlanks.EnumType.OAK)
 + 				.withProperty(BlockLeaves.CHECK_DECAY, Boolean.valueOf(false));
 
-> DELETE  26  @  38 : 46
+> DELETE  7  @  1 : 9
 
-> DELETE  33  @  53 : 83
+> DELETE  7  @  15 : 45
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenMesa.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenMesa.edit.java
index 81b668f..1722511 100644
--- a/patches/minecraft/net/minecraft/world/biome/BiomeGenMesa.edit.java
+++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenMesa.edit.java
@@ -10,26 +10,26 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  14  @  13 : 14
+> DELETE  11  @  10 : 11
 
-> DELETE  16  @  16 : 17
+> DELETE  2  @  3 : 4
 
-> DELETE  35  @  36 : 41
+> DELETE  19  @  20 : 25
 
-> DELETE  36  @  42 : 46
+> DELETE  1  @  6 : 10
 
-> DELETE  38  @  48 : 52
+> DELETE  2  @  6 : 10
 
-> CHANGE  46 : 48  @  60 : 65
+> CHANGE  8 : 10  @  12 : 17
 
 ~ 	public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j,
 ~ 			double d0) {
 
-> CHANGE  53 : 54  @  70 : 71
+> CHANGE  7 : 8  @  10 : 11
 
 ~ 			EaglercraftRandom random1 = new EaglercraftRandom(this.field_150622_aD);
 
-> CHANGE  165 : 166  @  182 : 183
+> CHANGE  112 : 113  @  112 : 113
 
 ~ 		EaglercraftRandom random = new EaglercraftRandom(parLong1);
 
diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenMushroomIsland.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenMushroomIsland.edit.java
index a4a9920..a79f106 100644
--- a/patches/minecraft/net/minecraft/world/biome/BiomeGenMushroomIsland.edit.java
+++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenMushroomIsland.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  4  @  4 : 5
 
-> DELETE  8  @  9 : 14
+> DELETE  4  @  5 : 10
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenMutated.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenMutated.edit.java
index c6e6cc1..19e745d 100644
--- a/patches/minecraft/net/minecraft/world/biome/BiomeGenMutated.edit.java
+++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenMutated.edit.java
@@ -10,19 +10,19 @@
 + import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 + 
 
-> CHANGE  5 : 6  @  3 : 4
+> CHANGE  3 : 4  @  1 : 2
 
 ~ 
 
-> DELETE  8  @  6 : 7
+> DELETE  3  @  3 : 4
 
-> DELETE  9  @  8 : 9
+> DELETE  1  @  2 : 3
 
-> CHANGE  38 : 40  @  38 : 43
+> CHANGE  29 : 31  @  30 : 35
 
 ~ 	public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j,
 ~ 			double d0) {
 
-> DELETE  47  @  50 : 54
+> DELETE  9  @  12 : 16
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenOcean.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenOcean.edit.java
index 3eeb55d..e617874 100644
--- a/patches/minecraft/net/minecraft/world/biome/BiomeGenOcean.edit.java
+++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenOcean.edit.java
@@ -10,9 +10,9 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  5  @  4 : 5
+> DELETE  3  @  2 : 3
 
-> CHANGE  17 : 19  @  17 : 18
+> CHANGE  12 : 14  @  13 : 14
 
 ~ 	public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j,
 ~ 			double d0) {
diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenPlains.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenPlains.edit.java
index d1cad27..6a5bbce 100644
--- a/patches/minecraft/net/minecraft/world/biome/BiomeGenPlains.edit.java
+++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenPlains.edit.java
@@ -10,14 +10,14 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  7  @  7 : 9
+> DELETE  5  @  5 : 7
 
-> DELETE  16  @  18 : 21
+> DELETE  9  @  11 : 14
 
-> CHANGE  18 : 19  @  23 : 24
+> CHANGE  2 : 3  @  5 : 6
 
 ~ 	public BlockFlower.EnumFlowerType pickRandomFlower(EaglercraftRandom random, BlockPos blockpos) {
 
-> DELETE  43  @  48 : 81
+> DELETE  25  @  25 : 58
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenSavanna.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenSavanna.edit.java
index 3c8d50c..8798dcf 100644
--- a/patches/minecraft/net/minecraft/world/biome/BiomeGenSavanna.edit.java
+++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenSavanna.edit.java
@@ -10,29 +10,29 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  5  @  4 : 5
+> DELETE  3  @  2 : 3
 
-> DELETE  7  @  7 : 8
+> DELETE  2  @  3 : 4
 
-> DELETE  8  @  9 : 11
+> DELETE  1  @  2 : 4
 
-> DELETE  9  @  12 : 14
+> DELETE  1  @  3 : 5
 
-> DELETE  11  @  16 : 17
+> DELETE  2  @  4 : 5
 
-> DELETE  15  @  21 : 24
+> DELETE  4  @  5 : 8
 
-> DELETE  17  @  26 : 30
+> DELETE  2  @  5 : 9
 
-> DELETE  25  @  38 : 51
+> DELETE  8  @  12 : 25
 
-> DELETE  28  @  54 : 57
+> DELETE  3  @  16 : 19
 
-> CHANGE  30 : 32  @  59 : 60
+> CHANGE  2 : 4  @  5 : 6
 
 ~ 		public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j,
 ~ 				double d0) {
 
-> DELETE  44  @  72 : 76
+> DELETE  14  @  13 : 17
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenSnow.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenSnow.edit.java
index 3032131..cdaf83e 100644
--- a/patches/minecraft/net/minecraft/world/biome/BiomeGenSnow.edit.java
+++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenSnow.edit.java
@@ -7,10 +7,10 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  3  @  4 : 11
+> DELETE  1  @  2 : 9
 
-> DELETE  6  @  14 : 16
+> DELETE  3  @  10 : 12
 
-> DELETE  17  @  27 : 49
+> DELETE  11  @  13 : 35
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenStoneBeach.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenStoneBeach.edit.java
index 958ec24..faca344 100644
--- a/patches/minecraft/net/minecraft/world/biome/BiomeGenStoneBeach.edit.java
+++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenStoneBeach.edit.java
@@ -7,6 +7,6 @@
 
 > DELETE  3  @  3 : 4
 
-> DELETE  10  @  11 : 15
+> DELETE  7  @  8 : 12
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenSwamp.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenSwamp.edit.java
index bca3dad..8da48bf 100644
--- a/patches/minecraft/net/minecraft/world/biome/BiomeGenSwamp.edit.java
+++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenSwamp.edit.java
@@ -10,20 +10,20 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  5  @  4 : 5
+> DELETE  3  @  2 : 3
 
-> DELETE  6  @  6 : 7
+> DELETE  1  @  2 : 3
 
-> DELETE  7  @  8 : 12
+> DELETE  1  @  2 : 6
 
-> DELETE  11  @  16 : 26
+> DELETE  4  @  8 : 18
 
-> DELETE  15  @  30 : 34
+> DELETE  4  @  14 : 18
 
-> CHANGE  25 : 26  @  44 : 45
+> CHANGE  10 : 11  @  14 : 15
 
 ~ 	public BlockFlower.EnumFlowerType pickRandomFlower(EaglercraftRandom var1, BlockPos var2) {
 
-> DELETE  28  @  47 : 69
+> DELETE  3  @  3 : 25
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenTaiga.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenTaiga.edit.java
index e9ad701..0acd820 100644
--- a/patches/minecraft/net/minecraft/world/biome/BiomeGenTaiga.edit.java
+++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenTaiga.edit.java
@@ -10,23 +10,23 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  5  @  4 : 6
+> DELETE  3  @  2 : 4
 
-> DELETE  7  @  8 : 9
+> DELETE  2  @  4 : 5
 
-> DELETE  8  @  10 : 11
+> DELETE  1  @  2 : 3
 
-> DELETE  9  @  12 : 19
+> DELETE  1  @  2 : 9
 
-> DELETE  11  @  21 : 26
+> DELETE  2  @  9 : 14
 
-> DELETE  17  @  32 : 42
+> DELETE  6  @  11 : 21
 
-> CHANGE  19 : 21  @  44 : 57
+> CHANGE  2 : 4  @  12 : 25
 
 ~ 	public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j,
 ~ 			double d0) {
 
-> DELETE  22  @  58 : 82
+> DELETE  3  @  14 : 38
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/world/border/WorldBorder.edit.java b/patches/minecraft/net/minecraft/world/border/WorldBorder.edit.java
index b90b9a1..10e1dd0 100644
--- a/patches/minecraft/net/minecraft/world/border/WorldBorder.edit.java
+++ b/patches/minecraft/net/minecraft/world/border/WorldBorder.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 3
 
-> INSERT  3 : 6  @  4
+> INSERT  1 : 4  @  2
 
 + 
 + import com.google.common.collect.Lists;
 + 
 
-> DELETE  10  @  8 : 10
+> DELETE  7  @  4 : 6
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/world/chunk/Chunk.edit.java b/patches/minecraft/net/minecraft/world/chunk/Chunk.edit.java
index 1b2cd7c..eb98ba5 100644
--- a/patches/minecraft/net/minecraft/world/chunk/Chunk.edit.java
+++ b/patches/minecraft/net/minecraft/world/chunk/Chunk.edit.java
@@ -9,11 +9,11 @@
 
 ~ import java.util.ArrayList;
 
-> CHANGE  6 : 7  @  8 : 9
+> CHANGE  4 : 5  @  6 : 7
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 
-> CHANGE  8 : 14  @  10 : 11
+> CHANGE  2 : 8  @  2 : 3
 
 ~ 
 ~ import com.google.common.base.Predicate;
@@ -22,21 +22,21 @@
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
-> DELETE  32  @  29 : 30
+> DELETE  24  @  19 : 20
 
-> DELETE  33  @  31 : 35
+> DELETE  1  @  2 : 6
 
-> DELETE  34  @  36 : 39
+> DELETE  1  @  5 : 8
 
-> CHANGE  58 : 59  @  63 : 64
+> CHANGE  24 : 25  @  27 : 28
 
 ~ 	private List tileEntityPosQueue;
 
-> CHANGE  67 : 68  @  72 : 73
+> CHANGE  9 : 10  @  9 : 10
 
 ~ 		this.tileEntityPosQueue = new ArrayList();
 
-> CHANGE  410 : 419  @  415 : 419
+> CHANGE  343 : 352  @  343 : 347
 
 ~ 		try {
 ~ 			if (pos.getY() >= 0 && pos.getY() >> 4 < this.storageArrays.length) {
@@ -48,7 +48,7 @@
 ~ 					return extendedblockstorage.get(j, k, i);
 ~ 				}
 
-> CHANGE  421 : 428  @  421 : 436
+> CHANGE  11 : 18  @  6 : 21
 
 ~ 			return Blocks.air.getDefaultState();
 ~ 		} catch (Throwable throwable) {
@@ -58,14 +58,14 @@
 ~ 				public String call() throws Exception {
 ~ 					return CrashReportCategory.getCoordinateInfo(pos);
 
-> INSERT  429 : 433  @  437
+> INSERT  8 : 12  @  16
 
 + 			});
 + 			throw new ReportedException(crashreport);
 + 		}
 + 	}
 
-> CHANGE  434 : 447  @  438 : 448
+> CHANGE  5 : 18  @  1 : 11
 
 ~ 	/**
 ~ 	 * only use with a regular "net.minecraft.util.BlockPos"!
@@ -81,7 +81,7 @@
 ~ 					return extendedblockstorage.get(j, k, i);
 ~ 				}
 
-> INSERT  448 : 459  @  449
+> INSERT  14 : 25  @  11
 
 + 
 + 			return Blocks.air.getDefaultState();
@@ -95,34 +95,34 @@
 + 			});
 + 			throw new ReportedException(crashreport);
 
-> CHANGE  505 : 506  @  495 : 498
+> CHANGE  57 : 58  @  46 : 49
 
 ~ 				if (block1 instanceof ITileEntityProvider) {
 
-> DELETE  539  @  531 : 535
+> DELETE  34  @  36 : 40
 
-> CHANGE  790 : 792  @  786 : 788
+> CHANGE  251 : 253  @  255 : 257
 
 ~ 						&& (predicate == null || predicate.apply((T) entity))) {
 ~ 					list.add((T) entity);
 
-> CHANGE  810 : 812  @  806 : 808
+> CHANGE  20 : 22  @  20 : 22
 
 ~ 	public EaglercraftRandom getRandomWithSeed(long i) {
 ~ 		return new EaglercraftRandom(this.worldObj.getSeed() + (long) (this.xPosition * this.xPosition * 4987142)
 
-> CHANGE  895 : 896  @  891 : 892
+> CHANGE  85 : 86  @  85 : 86
 
 ~ 			this.recheckGaps(true);
 
-> CHANGE  904 : 905  @  900 : 901
+> CHANGE  9 : 10  @  9 : 10
 
 ~ 			BlockPos blockpos = (BlockPos) this.tileEntityPosQueue.remove(0);
 
-> CHANGE  1014 : 1015  @  1010 : 1011
+> CHANGE  110 : 111  @  110 : 111
 
 ~ 	public BiomeGenBase getBiome(BlockPos pos) {
 
-> DELETE  1018  @  1014 : 1020
+> DELETE  4  @  4 : 10
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/world/chunk/EmptyChunk.edit.java b/patches/minecraft/net/minecraft/world/chunk/EmptyChunk.edit.java
index a7d90c4..bf73787 100644
--- a/patches/minecraft/net/minecraft/world/chunk/EmptyChunk.edit.java
+++ b/patches/minecraft/net/minecraft/world/chunk/EmptyChunk.edit.java
@@ -7,16 +7,16 @@
 
 > DELETE  2  @  2 : 3
 
-> CHANGE  3 : 7  @  4 : 5
+> CHANGE  1 : 5  @  2 : 3
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 ~ import com.google.common.base.Predicate;
 ~ 
 
-> DELETE  15  @  13 : 14
+> DELETE  12  @  9 : 10
 
-> CHANGE  105 : 107  @  104 : 106
+> CHANGE  90 : 92  @  91 : 93
 
 ~ 	public EaglercraftRandom getRandomWithSeed(long seed) {
 ~ 		return new EaglercraftRandom(this.getWorld().getSeed() + (long) (this.xPosition * this.xPosition * 4987142)
diff --git a/patches/minecraft/net/minecraft/world/chunk/IChunkProvider.edit.java b/patches/minecraft/net/minecraft/world/chunk/IChunkProvider.edit.java
index ffa970d..c939e8b 100644
--- a/patches/minecraft/net/minecraft/world/chunk/IChunkProvider.edit.java
+++ b/patches/minecraft/net/minecraft/world/chunk/IChunkProvider.edit.java
@@ -9,6 +9,6 @@
 
 + 
 
-> DELETE  9  @  8 : 9
+> DELETE  6  @  5 : 6
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/world/gen/FlatGeneratorInfo.edit.java b/patches/minecraft/net/minecraft/world/gen/FlatGeneratorInfo.edit.java
index bb55c2d..40c0cdc 100644
--- a/patches/minecraft/net/minecraft/world/gen/FlatGeneratorInfo.edit.java
+++ b/patches/minecraft/net/minecraft/world/gen/FlatGeneratorInfo.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 4
 
-> INSERT  7 : 12  @  9
+> INSERT  5 : 10  @  7
 
 + import java.util.Set;
 + 
@@ -15,9 +15,9 @@
 + import com.google.common.collect.Maps;
 + 
 
-> DELETE  16  @  13 : 14
+> DELETE  9  @  4 : 5
 
-> CHANGE  78 : 79  @  76 : 77
+> CHANGE  62 : 63  @  63 : 64
 
 ~ 					for (Entry entry1 : (Set) map.entrySet()) {
 
diff --git a/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorImproved.edit.java b/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorImproved.edit.java
index 4e8c0f6..8a211a3 100644
--- a/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorImproved.edit.java
+++ b/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorImproved.edit.java
@@ -9,11 +9,11 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 
-> CHANGE  21 : 22  @  22 : 23
+> CHANGE  19 : 20  @  20 : 21
 
 ~ 		this(new EaglercraftRandom());
 
-> CHANGE  24 : 25  @  25 : 26
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 	public NoiseGeneratorImproved(EaglercraftRandom parRandom) {
 
diff --git a/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorOctaves.edit.java b/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorOctaves.edit.java
index c260d5c..c93aa2a 100644
--- a/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorOctaves.edit.java
+++ b/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorOctaves.edit.java
@@ -10,9 +10,9 @@
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 ~ 
 
-> DELETE  5  @  4 : 6
+> DELETE  3  @  2 : 4
 
-> CHANGE  10 : 11  @  11 : 12
+> CHANGE  5 : 6  @  7 : 8
 
 ~ 	public NoiseGeneratorOctaves(EaglercraftRandom parRandom, int parInt1) {
 
diff --git a/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorPerlin.edit.java b/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorPerlin.edit.java
index 1847500..95e7ff2 100644
--- a/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorPerlin.edit.java
+++ b/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorPerlin.edit.java
@@ -9,7 +9,7 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 
-> CHANGE  8 : 9  @  10 : 11
+> CHANGE  6 : 7  @  8 : 9
 
 ~ 	public NoiseGeneratorPerlin(EaglercraftRandom parRandom, int parInt1) {
 
diff --git a/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorSimplex.edit.java b/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorSimplex.edit.java
index 481c5a0..79dd0ea 100644
--- a/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorSimplex.edit.java
+++ b/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorSimplex.edit.java
@@ -9,11 +9,11 @@
 
 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 
-> CHANGE  17 : 18  @  17 : 18
+> CHANGE  15 : 16  @  15 : 16
 
 ~ 		this(new EaglercraftRandom());
 
-> CHANGE  20 : 21  @  20 : 21
+> CHANGE  3 : 4  @  3 : 4
 
 ~ 	public NoiseGeneratorSimplex(EaglercraftRandom parRandom) {
 
diff --git a/patches/minecraft/net/minecraft/world/storage/ISaveHandler.edit.java b/patches/minecraft/net/minecraft/world/storage/ISaveHandler.edit.java
index fe5b5aa..91b516c 100644
--- a/patches/minecraft/net/minecraft/world/storage/ISaveHandler.edit.java
+++ b/patches/minecraft/net/minecraft/world/storage/ISaveHandler.edit.java
@@ -7,10 +7,10 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  4  @  5 : 9
+> DELETE  2  @  3 : 7
 
-> DELETE  10  @  15 : 17
+> DELETE  6  @  10 : 12
 
-> DELETE  18  @  25 : 29
+> DELETE  8  @  10 : 14
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/world/storage/MapData.edit.java b/patches/minecraft/net/minecraft/world/storage/MapData.edit.java
index 62986a0..33a8856 100644
--- a/patches/minecraft/net/minecraft/world/storage/MapData.edit.java
+++ b/patches/minecraft/net/minecraft/world/storage/MapData.edit.java
@@ -7,7 +7,7 @@
 
 > DELETE  2  @  2 : 4
 
-> INSERT  4 : 8  @  6
+> INSERT  2 : 6  @  4
 
 + 
 + import com.google.common.collect.Lists;
diff --git a/patches/minecraft/net/minecraft/world/storage/MapStorage.edit.java b/patches/minecraft/net/minecraft/world/storage/MapStorage.edit.java
index 58b959c..a478a11 100644
--- a/patches/minecraft/net/minecraft/world/storage/MapStorage.edit.java
+++ b/patches/minecraft/net/minecraft/world/storage/MapStorage.edit.java
@@ -7,30 +7,30 @@
 
 > DELETE  2  @  2 : 10
 
-> CHANGE  4 : 8  @  12 : 16
+> CHANGE  2 : 6  @  10 : 14
 
 ~ 
 ~ import com.google.common.collect.Lists;
 ~ import com.google.common.collect.Maps;
 ~ 
 
-> DELETE  9  @  17 : 18
+> DELETE  5  @  5 : 6
 
-> CHANGE  22 : 23  @  31 : 63
+> CHANGE  13 : 14  @  14 : 46
 
 ~ 		return (WorldSavedData) this.loadedDataMap.get(s);
 
-> CHANGE  36 : 37  @  76 : 81
+> CHANGE  14 : 15  @  45 : 50
 
 ~ 			((WorldSavedData) this.loadedDataList.get(i)).setDirty(false);
 
-> DELETE  41  @  85 : 105
+> DELETE  5  @  9 : 29
 
-> CHANGE  42 : 43  @  106 : 131
+> CHANGE  1 : 2  @  21 : 46
 
 ~ 		this.idCounts.clear();
 
-> CHANGE  54 : 55  @  142 : 165
+> CHANGE  12 : 13  @  36 : 59
 
 ~ 		return oshort.shortValue();
 
diff --git a/patches/minecraft/net/minecraft/world/storage/SaveHandlerMP.edit.java b/patches/minecraft/net/minecraft/world/storage/SaveHandlerMP.edit.java
index 55d1cf7..b9ea626 100644
--- a/patches/minecraft/net/minecraft/world/storage/SaveHandlerMP.edit.java
+++ b/patches/minecraft/net/minecraft/world/storage/SaveHandlerMP.edit.java
@@ -7,12 +7,12 @@
 
 > DELETE  2  @  2 : 3
 
-> DELETE  4  @  5 : 10
+> DELETE  2  @  3 : 8
 
-> DELETE  13  @  19 : 23
+> DELETE  9  @  14 : 18
 
-> DELETE  26  @  36 : 40
+> DELETE  13  @  17 : 21
 
-> DELETE  30  @  44 : 47
+> DELETE  4  @  8 : 11
 
 > EOF
diff --git a/patches/minecraft/net/minecraft/world/storage/WorldInfo.edit.java b/patches/minecraft/net/minecraft/world/storage/WorldInfo.edit.java
index 5527b98..cb24657 100644
--- a/patches/minecraft/net/minecraft/world/storage/WorldInfo.edit.java
+++ b/patches/minecraft/net/minecraft/world/storage/WorldInfo.edit.java
@@ -9,35 +9,35 @@
 
 + 
 
-> DELETE  6  @  5 : 6
+> DELETE  3  @  2 : 3
 
-> INSERT  12 : 14  @  12
+> INSERT  6 : 8  @  7
 
 + import net.lax1dude.eaglercraft.v1_8.HString;
 + 
 
-> CHANGE  251 : 252  @  249 : 250
+> CHANGE  239 : 240  @  237 : 238
 
 ~ 		// nbt.setLong("LastPlayed", MinecraftServer.getCurrentTimeMillis());
 
-> CHANGE  553 : 554  @  551 : 552
+> CHANGE  302 : 303  @  302 : 303
 
 ~ 				return HString.format("ID %02d - %s, ver %d. Features enabled: %b",
 
-> CHANGE  573 : 575  @  571 : 573
+> CHANGE  20 : 22  @  20 : 22
 
 ~ 				return HString.format("%d game time, %d day time", new Object[] {
 ~ 						Long.valueOf(WorldInfo.this.totalTime), Long.valueOf(WorldInfo.this.worldTime) });
 
-> CHANGE  598 : 599  @  596 : 597
+> CHANGE  25 : 26  @  25 : 26
 
 ~ 				return HString.format("0x%05X - %s", new Object[] { Integer.valueOf(WorldInfo.this.saveVersion), s });
 
-> CHANGE  603 : 604  @  601 : 602
+> CHANGE  5 : 6  @  5 : 6
 
 ~ 				return HString.format("Rain time: %d (now: %b), thunder time: %d (now: %b)",
 
-> CHANGE  611 : 612  @  609 : 610
+> CHANGE  8 : 9  @  8 : 9
 
 ~ 				return HString.format("Game mode: %s (ID %d). Hardcore: %b. Cheats: %b", new Object[] {
 
diff --git a/patches/resources/assets/minecraft/lang/en_US.edit.lang b/patches/resources/assets/minecraft/lang/en_US.edit.lang
index 4657dce..c042a37 100644
--- a/patches/resources/assets/minecraft/lang/en_US.edit.lang
+++ b/patches/resources/assets/minecraft/lang/en_US.edit.lang
@@ -12,7 +12,7 @@
 ~ eaglercraft.recording.start=Record Screen...
 ~ eaglercraft.soundCategory.voice=Voice
 
-> INSERT  22 : 88  @  25
+> INSERT  5 : 71  @  8
 
 + eaglercraft.resourcePack.prompt.title=What do you want to do with '%s'?
 + eaglercraft.resourcePack.prompt.text=Tip: Hold Shift to skip this screen when selecting a resource pack!
@@ -81,11 +81,11 @@
 + eaglercraft.auth.continue=Join Server
 + 
 
-> CHANGE  556 : 557  @  493 : 494
+> CHANGE  534 : 535  @  468 : 469
 
 ~ resourcePack.openFolder=Open resource pack
 
-> CHANGE  560 : 561  @  497 : 498
+> CHANGE  4 : 5  @  4 : 5
 
 ~ resourcePack.folderInfo=(Select resource pack files here)