From ad42901b7e7d170701d1cea286e2e7f66bb8184d Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 12 Dec 2012 23:45:13 -0800 Subject: [PATCH] Update patches for repackage. --- .../net/minecraft/src/BlockDoor.java.patch | 19 --- .../src/CallableSuspiciousClasses.java.patch | 10 -- .../net/minecraft/block}/Block.java.patch | 55 ++++++--- .../minecraft/block}/BlockButton.java.patch | 25 ++-- .../minecraft/block}/BlockCactus.java.patch | 14 +-- .../minecraft/block}/BlockChest.java.patch | 19 +-- .../block}/BlockContainer.java.patch | 8 +- .../minecraft/block}/BlockCrops.java.patch | 15 ++- .../net/minecraft/block/BlockDoor.java.patch | 11 ++ .../minecraft/block}/BlockFarmland.java.patch | 14 +-- .../net/minecraft/block}/BlockFire.java.patch | 45 +++---- .../minecraft/block}/BlockFlower.java.patch | 16 +-- .../minecraft/block}/BlockFluid.java.patch | 6 +- .../minecraft/block}/BlockGrass.java.patch | 8 +- .../minecraft/block}/BlockLadder.java.patch | 19 +-- .../minecraft/block}/BlockLeaves.java.patch | 19 +-- .../minecraft/block}/BlockLever.java.patch | 22 ++-- .../net/minecraft/block}/BlockLog.java.patch | 8 +- .../minecraft/block}/BlockMushroom.java.patch | 12 +- .../minecraft/block}/BlockMycelium.java.patch | 8 +- .../block}/BlockNetherStalk.java.patch | 17 +-- .../block}/BlockPistonBase.java.patch | 10 +- .../net/minecraft/block}/BlockRail.java.patch | 63 +++++----- .../block}/BlockRedstoneWire.java.patch | 6 +- .../net/minecraft/block}/BlockReed.java.patch | 14 +-- .../minecraft/block}/BlockSapling.java.patch | 16 +-- .../net/minecraft/block}/BlockSnow.java.patch | 14 +-- .../net/minecraft/block}/BlockStem.java.patch | 23 ++-- .../block}/BlockTallGrass.java.patch | 17 +-- .../minecraft/block}/BlockTorch.java.patch | 25 ++-- .../minecraft/block}/BlockTrapDoor.java.patch | 21 ++-- .../block}/BlockTripWireSource.java.patch | 22 ++-- .../net/minecraft/block}/BlockVine.java.patch | 14 ++- .../net/minecraft/block}/RailLogic.java.patch | 16 +-- .../net/minecraft/client/Minecraft.java.patch | 25 ++-- .../audio}/SoundManager.java.patch | 26 ++-- .../audio}/SoundPool.java.patch | 4 +- .../gui}/GuiControls.java.patch | 26 ++-- .../{src => client/gui}/GuiIngame.java.patch | 18 +-- .../{src => client/gui}/GuiSlot.java.patch | 12 +- .../achievement}/GuiAchievements.java.patch | 30 +++-- .../gui/inventory}/GuiContainer.java.patch | 6 +- .../GuiContainerCreative.java.patch | 26 ++-- .../client/model/ModelBase.java.patch | 10 ++ .../{src => client/model}/ModelBox.java.patch | 10 +- .../model}/ModelRenderer.java.patch | 16 +-- .../model/PositionTextureVertex.java.patch | 10 ++ .../client/model/TexturedQuad.java.patch | 10 ++ .../multiplayer}/NetClientHandler.java.patch | 24 ++-- .../PlayerControllerMP.java.patch | 25 ++-- .../multiplayer}/WorldClient.java.patch | 19 +-- .../particle}/EffectRenderer.java.patch | 39 +++--- .../particle}/EntityDiggingFX.java.patch | 6 +- .../renderer}/EntityRenderer.java.patch | 30 ++--- .../renderer}/ItemRenderer.java.patch | 31 +++-- .../renderer}/RenderBlocks.java.patch | 50 ++++---- .../renderer}/RenderEngine.java.patch | 23 ++-- .../renderer}/RenderGlobal.java.patch | 34 +++--- .../renderer}/Tessellator.java.patch | 4 +- .../renderer}/WorldRenderer.java.patch | 24 ++-- .../renderer/entity}/RenderBiped.java.patch | 22 ++-- .../renderer/entity}/RenderItem.java.patch | 40 ++++--- .../renderer/entity}/RenderManager.java.patch | 6 +- .../renderer/entity}/RenderPlayer.java.patch | 35 +++--- .../renderer/entity}/RenderSnowMan.java.patch | 19 +-- .../TileEntityRendererPiston.java.patch | 20 ++-- .../command}/CommandHandler.java.patch | 10 +- .../CallableSuspiciousClasses.java.patch | 10 ++ .../creativetab}/CreativeTabs.java.patch | 18 +-- .../enchantment}/Enchantment.java.patch | 14 ++- .../enchantment}/EnchantmentHelper.java.patch | 6 +- .../net/minecraft/entity}/Entity.java.patch | 54 ++++++--- .../minecraft/entity}/EntityLiving.java.patch | 51 ++++---- .../entity/boss}/EntityDragon.java.patch | 6 +- .../entity/item}/EntityItem.java.patch | 26 ++-- .../entity/item}/EntityMinecart.java.patch | 73 ++++++------ .../passive}/EntityMooshroom.java.patch | 13 +- .../entity/passive}/EntityOcelot.java.patch | 6 +- .../entity/passive}/EntitySheep.java.patch | 15 ++- .../entity/player}/EntityPlayer.java.patch | 54 ++++----- .../entity/player}/EntityPlayerMP.java.patch | 29 +++-- .../inventory}/ContainerFurnace.java.patch | 6 +- .../net/minecraft/inventory}/Slot.java.patch | 8 +- .../inventory}/SlotCrafting.java.patch | 16 +-- .../inventory}/SlotFurnace.java.patch | 6 +- .../item/EnumArmorMaterial.java.patch | 28 +++++ .../item/EnumToolMaterial.java.patch | 28 +++++ .../net/minecraft/item}/Item.java.patch | 28 +++-- .../net/minecraft/item}/ItemBlock.java.patch | 14 +-- .../net/minecraft/item}/ItemBow.java.patch | 14 ++- .../net/minecraft/item}/ItemBucket.java.patch | 12 +- .../minecraft/item}/ItemBucketMilk.java.patch | 13 +- .../net/minecraft/item}/ItemDye.java.patch | 20 ++-- .../net/minecraft/item}/ItemHoe.java.patch | 10 +- .../item}/ItemInWorldManager.java.patch | 30 ++--- .../net/minecraft/item}/ItemMap.java.patch | 8 +- .../net/minecraft/item}/ItemSeeds.java.patch | 17 ++- .../net/minecraft/item}/ItemShears.java.patch | 40 +++++-- .../net/minecraft/item}/ItemTool.java.patch | 10 +- .../item/crafting}/CraftingManager.java.patch | 6 +- .../item/crafting}/FurnaceRecipes.java.patch | 16 +-- .../nbt}/CompressedStreamTools.java.patch | 4 +- .../network}/NetServerHandler.java.patch | 35 +++--- .../packet}/Packet51MapChunk.java.patch | 6 +- .../packet}/Packet56MapChunks.java.patch | 6 +- .../minecraft/potion}/PotionEffect.java.patch | 24 ++-- .../server/MinecraftServer.java.patch | 42 +++---- .../server/gui}/GuiStatsComponent.java.patch | 15 +-- .../integrated}/IntegratedServer.java.patch | 17 +-- .../management}/PlayerInstance.java.patch | 14 +-- .../ServerConfigurationManager.java.patch | 29 +++-- .../net/minecraft/src/ModelBase.java.patch | 10 -- .../src/PositionTextureVertex.java.patch | 10 -- .../net/minecraft/src/TexturedQuad.java.patch | 10 -- .../net/minecraft/stats}/StatList.java.patch | 6 +- .../tileentity}/TileEntity.java.patch | 16 ++- .../tileentity}/TileEntityBeacon.java.patch | 6 +- .../TileEntityBrewingStand.java.patch | 14 +-- .../tileentity}/TileEntityFurnace.java.patch | 37 +++--- .../util}/MovingObjectPosition.java.patch | 6 +- .../ThreadDownloadResources.java.patch | 4 +- .../WeightedRandomChestContent.java.patch | 21 ++-- .../minecraft/world}/ChunkCache.java.patch | 8 +- .../net/minecraft/world}/Explosion.java.patch | 6 +- .../world}/SpawnerAnimals.java.patch | 23 ++-- .../net/minecraft/world}/World.java.patch | 112 +++++++++--------- .../minecraft/world}/WorldProvider.java.patch | 34 ++++-- .../minecraft/world}/WorldServer.java.patch | 53 +++++---- .../net/minecraft/world}/WorldType.java.patch | 11 +- .../world/biome}/BiomeDecorator.java.patch | 49 ++++---- .../world/biome}/BiomeGenBase.java.patch | 18 +-- .../world/biome}/WorldChunkManager.java.patch | 16 ++- .../minecraft/world/chunk}/Chunk.java.patch | 68 +++++------ .../storage}/AnvilChunkLoader.java.patch | 14 +-- .../storage}/AnvilSaveHandler.java.patch | 6 +- .../world/gen}/ChunkProviderEnd.java.patch | 22 ++-- .../gen}/ChunkProviderGenerate.java.patch | 38 +++--- .../world/gen}/ChunkProviderHell.java.patch | 42 ++++--- .../world/gen}/ChunkProviderServer.java.patch | 22 ++-- .../feature}/WorldGenBigMushroom.java.patch | 10 +- .../gen/feature}/WorldGenDeadBush.java.patch | 6 +- .../gen/feature}/WorldGenDungeons.java.patch | 16 +-- .../gen/feature}/WorldGenForest.java.patch | 10 +- .../gen/feature}/WorldGenHugeTrees.java.patch | 16 +-- .../gen/feature}/WorldGenMinable.java.patch | 10 +- .../gen/feature}/WorldGenShrub.java.patch | 8 +- .../gen/feature}/WorldGenSwamp.java.patch | 12 +- .../gen/feature}/WorldGenTaiga1.java.patch | 10 +- .../gen/feature}/WorldGenTaiga2.java.patch | 10 +- .../gen/feature}/WorldGenTallGrass.java.patch | 6 +- .../gen/feature}/WorldGenTrees.java.patch | 12 +- .../world/gen/layer}/GenLayer.java.patch | 16 +-- .../ComponentMineshaftCorridor.java.patch | 14 +-- ...ntScatteredFeatureDesertPyramid.java.patch | 14 +-- ...ntScatteredFeatureJunglePyramid.java.patch | 20 ++-- ...omponentStrongholdChestCorridor.java.patch | 14 +-- .../ComponentStrongholdLibrary.java.patch | 14 +-- ...ComponentStrongholdRoomCrossing.java.patch | 14 +-- .../structure}/ComponentVillage.java.patch | 16 +-- .../ComponentVillageHouse2.java.patch | 14 +-- .../ComponentVillageStartPiece.java.patch | 8 +- .../structure}/MapGenStronghold.java.patch | 12 +- .../world/storage}/MapData.java.patch | 6 +- 163 files changed, 1733 insertions(+), 1455 deletions(-) delete mode 100644 patches/common/net/minecraft/src/BlockDoor.java.patch delete mode 100644 patches/common/net/minecraft/src/CallableSuspiciousClasses.java.patch rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/Block.java.patch (96%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockButton.java.patch (91%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockCactus.java.patch (80%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockChest.java.patch (88%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockContainer.java.patch (82%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockCrops.java.patch (85%) create mode 100644 patches/minecraft/net/minecraft/block/BlockDoor.java.patch rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockFarmland.java.patch (70%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockFire.java.patch (94%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockFlower.java.patch (89%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockFluid.java.patch (77%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockGrass.java.patch (87%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockLadder.java.patch (90%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockLeaves.java.patch (91%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockLever.java.patch (94%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockLog.java.patch (87%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockMushroom.java.patch (73%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockMycelium.java.patch (86%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockNetherStalk.java.patch (84%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockPistonBase.java.patch (77%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockRail.java.patch (92%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockRedstoneWire.java.patch (70%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockReed.java.patch (86%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockSapling.java.patch (56%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockSnow.java.patch (89%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockStem.java.patch (86%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockTallGrass.java.patch (87%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockTorch.java.patch (93%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockTrapDoor.java.patch (82%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockTripWireSource.java.patch (92%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/BlockVine.java.patch (81%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/block}/RailLogic.java.patch (88%) rename patches/minecraft/net/minecraft/{src => client/audio}/SoundManager.java.patch (91%) rename patches/minecraft/net/minecraft/{src => client/audio}/SoundPool.java.patch (92%) rename patches/minecraft/net/minecraft/{src => client/gui}/GuiControls.java.patch (90%) rename patches/minecraft/net/minecraft/{src => client/gui}/GuiIngame.java.patch (63%) rename patches/minecraft/net/minecraft/{src => client/gui}/GuiSlot.java.patch (93%) rename patches/minecraft/net/minecraft/{src => client/gui/achievement}/GuiAchievements.java.patch (88%) rename patches/minecraft/net/minecraft/{src => client/gui/inventory}/GuiContainer.java.patch (73%) rename patches/minecraft/net/minecraft/{src => client/gui/inventory}/GuiContainerCreative.java.patch (94%) create mode 100644 patches/minecraft/net/minecraft/client/model/ModelBase.java.patch rename patches/minecraft/net/minecraft/{src => client/model}/ModelBox.java.patch (60%) rename patches/minecraft/net/minecraft/{src => client/model}/ModelRenderer.java.patch (75%) create mode 100644 patches/minecraft/net/minecraft/client/model/PositionTextureVertex.java.patch create mode 100644 patches/minecraft/net/minecraft/client/model/TexturedQuad.java.patch rename patches/minecraft/net/minecraft/{src => client/multiplayer}/NetClientHandler.java.patch (78%) rename patches/minecraft/net/minecraft/{src => client/multiplayer}/PlayerControllerMP.java.patch (88%) rename patches/minecraft/net/minecraft/{src => client/multiplayer}/WorldClient.java.patch (74%) rename patches/minecraft/net/minecraft/{src => client/particle}/EffectRenderer.java.patch (89%) rename patches/minecraft/net/minecraft/{src => client/particle}/EntityDiggingFX.java.patch (85%) rename patches/minecraft/net/minecraft/{src => client/renderer}/EntityRenderer.java.patch (91%) rename patches/minecraft/net/minecraft/{src => client/renderer}/ItemRenderer.java.patch (89%) rename patches/minecraft/net/minecraft/{src => client/renderer}/RenderBlocks.java.patch (93%) rename patches/minecraft/net/minecraft/{src => client/renderer}/RenderEngine.java.patch (66%) rename patches/minecraft/net/minecraft/{src => client/renderer}/RenderGlobal.java.patch (89%) rename patches/minecraft/net/minecraft/{src => client/renderer}/Tessellator.java.patch (97%) rename patches/minecraft/net/minecraft/{src => client/renderer}/WorldRenderer.java.patch (91%) rename patches/minecraft/net/minecraft/{src => client/renderer/entity}/RenderBiped.java.patch (85%) rename patches/minecraft/net/minecraft/{src => client/renderer/entity}/RenderItem.java.patch (89%) rename patches/minecraft/net/minecraft/{src => client/renderer/entity}/RenderManager.java.patch (85%) rename patches/minecraft/net/minecraft/{src => client/renderer/entity}/RenderPlayer.java.patch (86%) rename patches/minecraft/net/minecraft/{src => client/renderer/entity}/RenderSnowMan.java.patch (68%) rename patches/minecraft/net/minecraft/{src => client/renderer/tileentity}/TileEntityRendererPiston.java.patch (68%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/command}/CommandHandler.java.patch (79%) create mode 100644 patches/minecraft/net/minecraft/crash/CallableSuspiciousClasses.java.patch rename patches/{common/net/minecraft/src => minecraft/net/minecraft/creativetab}/CreativeTabs.java.patch (88%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/enchantment}/Enchantment.java.patch (57%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/enchantment}/EnchantmentHelper.java.patch (64%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/entity}/Entity.java.patch (80%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/entity}/EntityLiving.java.patch (85%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/entity/boss}/EntityDragon.java.patch (81%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/entity/item}/EntityItem.java.patch (90%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/entity/item}/EntityMinecart.java.patch (96%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/entity/passive}/EntityMooshroom.java.patch (89%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/entity/passive}/EntityOcelot.java.patch (72%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/entity/passive}/EntitySheep.java.patch (85%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/entity/player}/EntityPlayer.java.patch (94%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/entity/player}/EntityPlayerMP.java.patch (84%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/inventory}/ContainerFurnace.java.patch (69%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/inventory}/Slot.java.patch (92%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/inventory}/SlotCrafting.java.patch (77%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/inventory}/SlotFurnace.java.patch (68%) create mode 100644 patches/minecraft/net/minecraft/item/EnumArmorMaterial.java.patch create mode 100644 patches/minecraft/net/minecraft/item/EnumToolMaterial.java.patch rename patches/{common/net/minecraft/src => minecraft/net/minecraft/item}/Item.java.patch (95%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/item}/ItemBlock.java.patch (94%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/item}/ItemBow.java.patch (84%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/item}/ItemBucket.java.patch (80%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/item}/ItemBucketMilk.java.patch (51%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/item}/ItemDye.java.patch (88%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/item}/ItemHoe.java.patch (80%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/item}/ItemInWorldManager.java.patch (95%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/item}/ItemMap.java.patch (85%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/item}/ItemSeeds.java.patch (80%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/item}/ItemShears.java.patch (73%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/item}/ItemTool.java.patch (76%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/item/crafting}/CraftingManager.java.patch (73%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/item/crafting}/FurnaceRecipes.java.patch (91%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/nbt}/CompressedStreamTools.java.patch (77%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/network}/NetServerHandler.java.patch (93%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/network/packet}/Packet51MapChunk.java.patch (68%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/network/packet}/Packet56MapChunks.java.patch (77%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/potion}/PotionEffect.java.patch (87%) rename patches/{common => minecraft}/net/minecraft/server/MinecraftServer.java.patch (90%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/server/gui}/GuiStatsComponent.java.patch (88%) rename patches/minecraft/net/minecraft/{src => server/integrated}/IntegratedServer.java.patch (89%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/server/management}/PlayerInstance.java.patch (85%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/server/management}/ServerConfigurationManager.java.patch (88%) delete mode 100644 patches/minecraft/net/minecraft/src/ModelBase.java.patch delete mode 100644 patches/minecraft/net/minecraft/src/PositionTextureVertex.java.patch delete mode 100644 patches/minecraft/net/minecraft/src/TexturedQuad.java.patch rename patches/{common/net/minecraft/src => minecraft/net/minecraft/stats}/StatList.java.patch (75%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/tileentity}/TileEntity.java.patch (78%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/tileentity}/TileEntityBeacon.java.patch (79%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/tileentity}/TileEntityBrewingStand.java.patch (78%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/tileentity}/TileEntityFurnace.java.patch (83%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/util}/MovingObjectPosition.java.patch (60%) rename patches/minecraft/net/minecraft/{src => util}/ThreadDownloadResources.java.patch (91%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/util}/WeightedRandomChestContent.java.patch (90%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world}/ChunkCache.java.patch (87%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world}/Explosion.java.patch (82%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world}/SpawnerAnimals.java.patch (83%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world}/World.java.patch (95%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world}/WorldProvider.java.patch (88%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world}/WorldServer.java.patch (89%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world}/WorldType.java.patch (62%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/biome}/BiomeDecorator.java.patch (93%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/biome}/BiomeGenBase.java.patch (85%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/biome}/WorldChunkManager.java.patch (81%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/chunk}/Chunk.java.patch (95%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/chunk/storage}/AnvilChunkLoader.java.patch (70%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/chunk/storage}/AnvilSaveHandler.java.patch (76%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen}/ChunkProviderEnd.java.patch (87%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen}/ChunkProviderGenerate.java.patch (91%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen}/ChunkProviderHell.java.patch (91%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen}/ChunkProviderServer.java.patch (86%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen/feature}/WorldGenBigMushroom.java.patch (88%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen/feature}/WorldGenDeadBush.java.patch (76%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen/feature}/WorldGenDungeons.java.patch (74%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen/feature}/WorldGenForest.java.patch (89%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen/feature}/WorldGenHugeTrees.java.patch (93%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen/feature}/WorldGenMinable.java.patch (87%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen/feature}/WorldGenShrub.java.patch (87%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen/feature}/WorldGenSwamp.java.patch (92%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen/feature}/WorldGenTaiga1.java.patch (89%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen/feature}/WorldGenTaiga2.java.patch (89%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen/feature}/WorldGenTallGrass.java.patch (76%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen/feature}/WorldGenTrees.java.patch (92%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen/layer}/GenLayer.java.patch (74%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen/structure}/ComponentMineshaftCorridor.java.patch (81%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen/structure}/ComponentScatteredFeatureDesertPyramid.java.patch (69%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen/structure}/ComponentScatteredFeatureJunglePyramid.java.patch (86%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen/structure}/ComponentStrongholdChestCorridor.java.patch (68%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen/structure}/ComponentStrongholdLibrary.java.patch (78%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen/structure}/ComponentStrongholdRoomCrossing.java.patch (76%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen/structure}/ComponentVillage.java.patch (74%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen/structure}/ComponentVillageHouse2.java.patch (68%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen/structure}/ComponentVillageStartPiece.java.patch (70%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/gen/structure}/MapGenStronghold.java.patch (87%) rename patches/{common/net/minecraft/src => minecraft/net/minecraft/world/storage}/MapData.java.patch (72%) diff --git a/patches/common/net/minecraft/src/BlockDoor.java.patch b/patches/common/net/minecraft/src/BlockDoor.java.patch deleted file mode 100644 index d8c08dbce5..0000000000 --- a/patches/common/net/minecraft/src/BlockDoor.java.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ../src_base/common/net/minecraft/src/BlockDoor.java -+++ ../src_work/common/net/minecraft/src/BlockDoor.java -@@ -3,6 +3,7 @@ - import cpw.mods.fml.common.Side; - import cpw.mods.fml.common.asm.SideOnly; - import java.util.Random; -+import static net.minecraftforge.common.ForgeDirection.*; - - public class BlockDoor extends Block - { -@@ -260,7 +261,7 @@ - { - if (this.blockMaterial == Material.iron) - { -- return true; -+ return false; //Allow items to interact with the door - } - else - { diff --git a/patches/common/net/minecraft/src/CallableSuspiciousClasses.java.patch b/patches/common/net/minecraft/src/CallableSuspiciousClasses.java.patch deleted file mode 100644 index 35ce3a4068..0000000000 --- a/patches/common/net/minecraft/src/CallableSuspiciousClasses.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ../src_base/common/net/minecraft/src/CallableSuspiciousClasses.java -+++ ../src_work/common/net/minecraft/src/CallableSuspiciousClasses.java -@@ -130,6 +130,6 @@ - - public Object call() - { -- return "FML is installed"; -+ return "FML and Forge are installed"; - } - } diff --git a/patches/common/net/minecraft/src/Block.java.patch b/patches/minecraft/net/minecraft/block/Block.java.patch similarity index 96% rename from patches/common/net/minecraft/src/Block.java.patch rename to patches/minecraft/net/minecraft/block/Block.java.patch index d614bdbfa9..15b84a7234 100644 --- a/patches/common/net/minecraft/src/Block.java.patch +++ b/patches/minecraft/net/minecraft/block/Block.java.patch @@ -1,28 +1,51 @@ ---- ../src_base/common/net/minecraft/src/Block.java -+++ ../src_work/common/net/minecraft/src/Block.java -@@ -2,11 +2,21 @@ +--- ../src_base/minecraft/net/minecraft/block/Block.java ++++ ../src_work/minecraft/net/minecraft/block/Block.java +@@ -2,13 +2,16 @@ import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; -+ +import java.util.ArrayList; import java.util.List; import java.util.Random; - + import net.minecraft.block.material.Material; ++import net.minecraft.client.particle.EffectRenderer; + import net.minecraft.creativetab.CreativeTabs; + import net.minecraft.enchantment.EnchantmentHelper; + import net.minecraft.entity.Entity; + import net.minecraft.entity.EntityLiving; ++import net.minecraft.entity.EnumCreatureType; + import net.minecraft.entity.item.EntityItem; + import net.minecraft.entity.item.EntityXPOrb; + import net.minecraft.entity.player.EntityPlayer; +@@ -24,17 +27,27 @@ + import net.minecraft.item.ItemSlab; + import net.minecraft.item.ItemStack; + import net.minecraft.stats.StatList; ++import net.minecraft.tileentity.TileEntity; + import net.minecraft.tileentity.TileEntitySign; + import net.minecraft.util.AxisAlignedBB; ++import net.minecraft.util.ChunkCoordinates; + import net.minecraft.util.MovingObjectPosition; + import net.minecraft.util.StatCollector; + import net.minecraft.util.Vec3; + import net.minecraft.world.Explosion; + import net.minecraft.world.IBlockAccess; + import net.minecraft.world.World; ++import net.minecraft.world.WorldProviderEnd; ++ +import net.minecraftforge.common.*; +import static net.minecraftforge.common.ForgeDirection.*; -+ + public class Block { + protected static int[] blockFireSpreadSpeed = new int[4096]; + protected static int[] blockFlammability = new int[4096]; + protected String currentTexture = "/terrain.png"; + public boolean isDefaultTexture = true; -+ /** * used as foreach item, if item.tab = current tab, display it on the screen */ -@@ -291,6 +301,7 @@ +@@ -319,6 +332,7 @@ lightOpacity[par1] = this.isOpaqueCube() ? 255 : 0; canBlockGrass[par1] = !par2Material.getCanBlockGrass(); } @@ -30,7 +53,7 @@ } /** -@@ -429,9 +440,10 @@ +@@ -457,9 +471,10 @@ return this.needsRandomTick; } @@ -42,7 +65,7 @@ } /** -@@ -454,7 +466,7 @@ +@@ -482,7 +497,7 @@ */ public float getBlockBrightness(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { @@ -51,7 +74,7 @@ } @SideOnly(Side.CLIENT) -@@ -464,7 +476,7 @@ +@@ -492,7 +507,7 @@ */ public int getMixedBrightnessForBlock(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { @@ -60,7 +83,7 @@ } @SideOnly(Side.CLIENT) -@@ -609,7 +621,13 @@ +@@ -637,7 +652,13 @@ /** * ejects contained items into the world, and notifies neighbours of an update, as appropriate */ @@ -75,7 +98,7 @@ /** * Returns the quantity of items to drop on block destruction. -@@ -633,8 +651,7 @@ +@@ -661,8 +682,7 @@ */ public float getPlayerRelativeBlockHardness(EntityPlayer par1EntityPlayer, World par2World, int par3, int par4, int par5) { @@ -85,7 +108,7 @@ } /** -@@ -652,18 +669,13 @@ +@@ -680,18 +700,13 @@ { if (!par1World.isRemote) { @@ -108,7 +131,7 @@ } } } -@@ -1048,7 +1060,7 @@ +@@ -1076,7 +1091,7 @@ par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1); par2EntityPlayer.addExhaustion(0.025F); @@ -117,7 +140,7 @@ { ItemStack var8 = this.createStackedBlock(par6); -@@ -1325,4 +1337,849 @@ +@@ -1353,4 +1368,849 @@ canBlockGrass[0] = true; StatList.initBreakableStats(); } diff --git a/patches/common/net/minecraft/src/BlockButton.java.patch b/patches/minecraft/net/minecraft/block/BlockButton.java.patch similarity index 91% rename from patches/common/net/minecraft/src/BlockButton.java.patch rename to patches/minecraft/net/minecraft/block/BlockButton.java.patch index 124bef8192..4ed3b93c43 100644 --- a/patches/common/net/minecraft/src/BlockButton.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockButton.java.patch @@ -1,17 +1,16 @@ ---- ../src_base/common/net/minecraft/src/BlockButton.java -+++ ../src_work/common/net/minecraft/src/BlockButton.java -@@ -2,6 +2,10 @@ +--- ../src_base/minecraft/net/minecraft/block/BlockButton.java ++++ ../src_work/minecraft/net/minecraft/block/BlockButton.java +@@ -11,6 +11,9 @@ + import net.minecraft.world.IBlockAccess; + import net.minecraft.world.World; - import java.util.List; - import java.util.Random; -+ +import net.minecraftforge.common.ForgeDirection; -+ +import static net.minecraftforge.common.ForgeDirection.*; - ++ public class BlockButton extends Block { -@@ -55,7 +59,11 @@ + /** Whether this button is sensible to arrows, used by wooden buttons. */ +@@ -63,7 +66,11 @@ */ public boolean canPlaceBlockOnSide(World par1World, int par2, int par3, int par4, int par5) { @@ -24,7 +23,7 @@ } /** -@@ -63,7 +71,10 @@ +@@ -71,7 +78,10 @@ */ public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { @@ -36,7 +35,7 @@ } public int func_85104_a(World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9) -@@ -72,19 +83,22 @@ +@@ -80,19 +90,22 @@ int var11 = var10 & 8; var10 &= 7; @@ -63,7 +62,7 @@ { var10 = 1; } -@@ -101,7 +115,11 @@ +@@ -109,7 +122,11 @@ */ private int getOrientation(World par1World, int par2, int par3, int par4) { @@ -76,7 +75,7 @@ } /** -@@ -115,22 +133,22 @@ +@@ -123,22 +140,22 @@ int var6 = par1World.getBlockMetadata(par2, par3, par4) & 7; boolean var7 = false; diff --git a/patches/common/net/minecraft/src/BlockCactus.java.patch b/patches/minecraft/net/minecraft/block/BlockCactus.java.patch similarity index 80% rename from patches/common/net/minecraft/src/BlockCactus.java.patch rename to patches/minecraft/net/minecraft/block/BlockCactus.java.patch index eb9878298f..7699dad7eb 100644 --- a/patches/common/net/minecraft/src/BlockCactus.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockCactus.java.patch @@ -1,8 +1,8 @@ ---- ../src_base/common/net/minecraft/src/BlockCactus.java -+++ ../src_work/common/net/minecraft/src/BlockCactus.java -@@ -4,7 +4,11 @@ - import cpw.mods.fml.common.asm.SideOnly; - import java.util.Random; +--- ../src_base/minecraft/net/minecraft/block/BlockCactus.java ++++ ../src_work/minecraft/net/minecraft/block/BlockCactus.java +@@ -10,7 +10,11 @@ + import net.minecraft.util.DamageSource; + import net.minecraft.world.World; -public class BlockCactus extends Block +import net.minecraftforge.common.EnumPlantType; @@ -13,7 +13,7 @@ { protected BlockCactus(int par1, int par2) { -@@ -143,7 +147,7 @@ +@@ -149,7 +153,7 @@ else { int var5 = par1World.getBlockId(par2, par3 - 1, par4); @@ -22,7 +22,7 @@ } } -@@ -154,4 +158,22 @@ +@@ -160,4 +164,22 @@ { par5Entity.attackEntityFrom(DamageSource.cactus, 1); } diff --git a/patches/common/net/minecraft/src/BlockChest.java.patch b/patches/minecraft/net/minecraft/block/BlockChest.java.patch similarity index 88% rename from patches/common/net/minecraft/src/BlockChest.java.patch rename to patches/minecraft/net/minecraft/block/BlockChest.java.patch index daf25d97b0..df104847ff 100644 --- a/patches/common/net/minecraft/src/BlockChest.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockChest.java.patch @@ -1,14 +1,15 @@ ---- ../src_base/common/net/minecraft/src/BlockChest.java -+++ ../src_work/common/net/minecraft/src/BlockChest.java -@@ -4,6 +4,7 @@ - import cpw.mods.fml.common.asm.SideOnly; - import java.util.Iterator; - import java.util.Random; -+import static net.minecraftforge.common.ForgeDirection.*; +--- ../src_base/minecraft/net/minecraft/block/BlockChest.java ++++ ../src_work/minecraft/net/minecraft/block/BlockChest.java +@@ -21,6 +21,8 @@ + import net.minecraft.world.IBlockAccess; + import net.minecraft.world.World; ++import static net.minecraftforge.common.ForgeDirection.*; ++ public class BlockChest extends BlockContainer { -@@ -411,7 +412,7 @@ + private Random random = new Random(); +@@ -427,7 +429,7 @@ { return true; } @@ -17,7 +18,7 @@ { return true; } -@@ -419,19 +420,19 @@ +@@ -435,19 +437,19 @@ { return true; } diff --git a/patches/common/net/minecraft/src/BlockContainer.java.patch b/patches/minecraft/net/minecraft/block/BlockContainer.java.patch similarity index 82% rename from patches/common/net/minecraft/src/BlockContainer.java.patch rename to patches/minecraft/net/minecraft/block/BlockContainer.java.patch index f275b6e367..4b2f718ab4 100644 --- a/patches/common/net/minecraft/src/BlockContainer.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockContainer.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/BlockContainer.java -+++ ../src_work/common/net/minecraft/src/BlockContainer.java -@@ -20,7 +20,7 @@ +--- ../src_base/minecraft/net/minecraft/block/BlockContainer.java ++++ ../src_work/minecraft/net/minecraft/block/BlockContainer.java +@@ -24,7 +24,7 @@ public void onBlockAdded(World par1World, int par2, int par3, int par4) { super.onBlockAdded(par1World, par2, par3, par4); @@ -9,7 +9,7 @@ } /** -@@ -36,6 +36,12 @@ +@@ -40,6 +40,12 @@ * Returns a new instance of a block's tile entity class. Called on placing the block. */ public abstract TileEntity createNewTileEntity(World var1); diff --git a/patches/common/net/minecraft/src/BlockCrops.java.patch b/patches/minecraft/net/minecraft/block/BlockCrops.java.patch similarity index 85% rename from patches/common/net/minecraft/src/BlockCrops.java.patch rename to patches/minecraft/net/minecraft/block/BlockCrops.java.patch index 00eebcc391..c3a2e0fd92 100644 --- a/patches/common/net/minecraft/src/BlockCrops.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockCrops.java.patch @@ -1,18 +1,21 @@ ---- ../src_base/common/net/minecraft/src/BlockCrops.java -+++ ../src_work/common/net/minecraft/src/BlockCrops.java -@@ -2,7 +2,11 @@ +--- ../src_base/minecraft/net/minecraft/block/BlockCrops.java ++++ ../src_work/minecraft/net/minecraft/block/BlockCrops.java +@@ -2,11 +2,14 @@ import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; -+ +import java.util.ArrayList; import java.util.Random; + import net.minecraft.creativetab.CreativeTabs; + import net.minecraft.item.Item; + import net.minecraft.item.ItemStack; + import net.minecraft.world.World; + +import net.minecraftforge.common.ForgeDirection; public class BlockCrops extends BlockFlower { -@@ -88,11 +92,11 @@ +@@ -92,11 +95,11 @@ int var19 = par1World.getBlockId(var17, par3 - 1, var18); float var20 = 0.0F; @@ -26,7 +29,7 @@ { var20 = 3.0F; } -@@ -158,22 +162,25 @@ +@@ -162,22 +165,25 @@ public void dropBlockAsItemWithChance(World par1World, int par2, int par3, int par4, int par5, float par6, int par7) { super.dropBlockAsItemWithChance(par1World, par2, par3, par4, par5, par6, 0); diff --git a/patches/minecraft/net/minecraft/block/BlockDoor.java.patch b/patches/minecraft/net/minecraft/block/BlockDoor.java.patch new file mode 100644 index 0000000000..13046b8e38 --- /dev/null +++ b/patches/minecraft/net/minecraft/block/BlockDoor.java.patch @@ -0,0 +1,11 @@ +--- ../src_base/minecraft/net/minecraft/block/BlockDoor.java ++++ ../src_work/minecraft/net/minecraft/block/BlockDoor.java +@@ -268,7 +268,7 @@ + { + if (this.blockMaterial == Material.iron) + { +- return true; ++ return false; //Allow items to interact with the door + } + else + { diff --git a/patches/common/net/minecraft/src/BlockFarmland.java.patch b/patches/minecraft/net/minecraft/block/BlockFarmland.java.patch similarity index 70% rename from patches/common/net/minecraft/src/BlockFarmland.java.patch rename to patches/minecraft/net/minecraft/block/BlockFarmland.java.patch index 62093e593c..c3fe990995 100644 --- a/patches/common/net/minecraft/src/BlockFarmland.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockFarmland.java.patch @@ -1,16 +1,16 @@ ---- ../src_base/common/net/minecraft/src/BlockFarmland.java -+++ ../src_work/common/net/minecraft/src/BlockFarmland.java -@@ -3,6 +3,9 @@ - import cpw.mods.fml.common.Side; - import cpw.mods.fml.common.asm.SideOnly; - import java.util.Random; +--- ../src_base/minecraft/net/minecraft/block/BlockFarmland.java ++++ ../src_work/minecraft/net/minecraft/block/BlockFarmland.java +@@ -7,6 +7,9 @@ + import net.minecraft.entity.Entity; + import net.minecraft.util.AxisAlignedBB; + import net.minecraft.world.World; + +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.IPlantable; public class BlockFarmland extends Block { -@@ -97,7 +100,8 @@ +@@ -101,7 +104,8 @@ { int var8 = par1World.getBlockId(var6, par3 + 1, var7); diff --git a/patches/common/net/minecraft/src/BlockFire.java.patch b/patches/minecraft/net/minecraft/block/BlockFire.java.patch similarity index 94% rename from patches/common/net/minecraft/src/BlockFire.java.patch rename to patches/minecraft/net/minecraft/block/BlockFire.java.patch index 1e33dab2c2..9388137612 100644 --- a/patches/common/net/minecraft/src/BlockFire.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockFire.java.patch @@ -1,15 +1,16 @@ ---- ../src_base/common/net/minecraft/src/BlockFire.java -+++ ../src_work/common/net/minecraft/src/BlockFire.java -@@ -3,6 +3,8 @@ - import cpw.mods.fml.common.Side; - import cpw.mods.fml.common.asm.SideOnly; - import java.util.Random; +--- ../src_base/minecraft/net/minecraft/block/BlockFire.java ++++ ../src_work/minecraft/net/minecraft/block/BlockFire.java +@@ -9,6 +9,9 @@ + import net.minecraft.world.World; + import net.minecraft.world.WorldProviderEnd; + +import net.minecraftforge.common.ForgeDirection; +import static net.minecraftforge.common.ForgeDirection.*; - ++ public class BlockFire extends Block { -@@ -27,6 +29,8 @@ + /** The chance this block will encourage nearby blocks to catch on fire */ +@@ -32,6 +35,8 @@ */ public void initializeBlock() { @@ -18,7 +19,7 @@ this.setBurnRate(Block.planks.blockID, 5, 20); this.setBurnRate(Block.woodDoubleSlab.blockID, 5, 20); this.setBurnRate(Block.woodSingleSlab.blockID, 5, 20); -@@ -51,8 +55,7 @@ +@@ -56,8 +61,7 @@ */ private void setBurnRate(int par1, int par2, int par3) { @@ -28,7 +29,7 @@ } /** -@@ -112,12 +115,8 @@ +@@ -117,12 +121,8 @@ { if (par1World.getGameRules().getGameRuleBooleanValue("doFireTick")) { @@ -43,7 +44,7 @@ if (!this.canPlaceBlockAt(par1World, par2, par3, par4)) { -@@ -146,7 +145,7 @@ +@@ -151,7 +151,7 @@ par1World.setBlockWithNotify(par2, par3, par4, 0); } } @@ -52,7 +53,7 @@ { par1World.setBlockWithNotify(par2, par3, par4, 0); } -@@ -160,12 +159,12 @@ +@@ -165,12 +165,12 @@ var9 = -50; } @@ -71,7 +72,7 @@ for (int var10 = par2 - 1; var10 <= par2 + 1; ++var10) { -@@ -219,9 +218,20 @@ +@@ -224,9 +224,20 @@ return false; } @@ -93,7 +94,7 @@ if (par6Random.nextInt(par5) < var8) { -@@ -255,7 +265,12 @@ +@@ -260,7 +271,12 @@ */ private boolean canNeighborBurn(World par1World, int par2, int par3, int par4) { @@ -107,7 +108,7 @@ } /** -@@ -271,12 +286,12 @@ +@@ -276,12 +292,12 @@ } else { @@ -126,7 +127,7 @@ return var6; } } -@@ -291,21 +306,24 @@ +@@ -296,21 +312,24 @@ /** * Checks the specified block coordinate to see if it can catch fire. Args: blockAccess, x, y, z @@ -156,7 +157,7 @@ } /** -@@ -363,9 +381,9 @@ +@@ -368,9 +387,9 @@ float var8; float var9; @@ -169,7 +170,7 @@ { for (var6 = 0; var6 < 2; ++var6) { -@@ -376,7 +394,7 @@ +@@ -381,7 +400,7 @@ } } @@ -178,7 +179,7 @@ { for (var6 = 0; var6 < 2; ++var6) { -@@ -387,7 +405,7 @@ +@@ -392,7 +411,7 @@ } } @@ -187,7 +188,7 @@ { for (var6 = 0; var6 < 2; ++var6) { -@@ -398,7 +416,7 @@ +@@ -403,7 +422,7 @@ } } @@ -196,7 +197,7 @@ { for (var6 = 0; var6 < 2; ++var6) { -@@ -409,7 +427,7 @@ +@@ -414,7 +433,7 @@ } } @@ -205,7 +206,7 @@ { for (var6 = 0; var6 < 2; ++var6) { -@@ -431,4 +449,46 @@ +@@ -436,4 +455,46 @@ } } } diff --git a/patches/common/net/minecraft/src/BlockFlower.java.patch b/patches/minecraft/net/minecraft/block/BlockFlower.java.patch similarity index 89% rename from patches/common/net/minecraft/src/BlockFlower.java.patch rename to patches/minecraft/net/minecraft/block/BlockFlower.java.patch index a32fcfc626..ea87db049c 100644 --- a/patches/common/net/minecraft/src/BlockFlower.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockFlower.java.patch @@ -1,8 +1,8 @@ ---- ../src_base/common/net/minecraft/src/BlockFlower.java -+++ ../src_work/common/net/minecraft/src/BlockFlower.java -@@ -2,7 +2,12 @@ - - import java.util.Random; +--- ../src_base/minecraft/net/minecraft/block/BlockFlower.java ++++ ../src_work/minecraft/net/minecraft/block/BlockFlower.java +@@ -6,7 +6,12 @@ + import net.minecraft.util.AxisAlignedBB; + import net.minecraft.world.World; -public class BlockFlower extends Block +import net.minecraftforge.common.EnumPlantType; @@ -14,7 +14,7 @@ { protected BlockFlower(int par1, int par2, Material par3Material) { -@@ -24,7 +29,7 @@ +@@ -28,7 +33,7 @@ */ public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { @@ -23,7 +23,7 @@ } /** -@@ -68,7 +73,9 @@ +@@ -72,7 +77,9 @@ */ public boolean canBlockStay(World par1World, int par2, int par3, int par4) { @@ -34,7 +34,7 @@ } /** -@@ -104,4 +111,32 @@ +@@ -108,4 +115,32 @@ { return 1; } diff --git a/patches/common/net/minecraft/src/BlockFluid.java.patch b/patches/minecraft/net/minecraft/block/BlockFluid.java.patch similarity index 77% rename from patches/common/net/minecraft/src/BlockFluid.java.patch rename to patches/minecraft/net/minecraft/block/BlockFluid.java.patch index ea1a796ff9..aadc035ab1 100644 --- a/patches/common/net/minecraft/src/BlockFluid.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockFluid.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/BlockFluid.java -+++ ../src_work/common/net/minecraft/src/BlockFluid.java -@@ -48,7 +48,7 @@ +--- ../src_base/minecraft/net/minecraft/block/BlockFluid.java ++++ ../src_work/minecraft/net/minecraft/block/BlockFluid.java +@@ -54,7 +54,7 @@ { for (int var9 = -1; var9 <= 1; ++var9) { diff --git a/patches/common/net/minecraft/src/BlockGrass.java.patch b/patches/minecraft/net/minecraft/block/BlockGrass.java.patch similarity index 87% rename from patches/common/net/minecraft/src/BlockGrass.java.patch rename to patches/minecraft/net/minecraft/block/BlockGrass.java.patch index ac43e88543..f04373b10b 100644 --- a/patches/common/net/minecraft/src/BlockGrass.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockGrass.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/BlockGrass.java -+++ ../src_work/common/net/minecraft/src/BlockGrass.java -@@ -95,7 +95,7 @@ +--- ../src_base/minecraft/net/minecraft/block/BlockGrass.java ++++ ../src_work/minecraft/net/minecraft/block/BlockGrass.java +@@ -100,7 +100,7 @@ { if (!par1World.isRemote) { @@ -9,7 +9,7 @@ { par1World.setBlockWithNotify(par2, par3, par4, Block.dirt.blockID); } -@@ -108,7 +108,7 @@ +@@ -113,7 +113,7 @@ int var9 = par4 + par5Random.nextInt(3) - 1; int var10 = par1World.getBlockId(var7, var8 + 1, var9); diff --git a/patches/common/net/minecraft/src/BlockLadder.java.patch b/patches/minecraft/net/minecraft/block/BlockLadder.java.patch similarity index 90% rename from patches/common/net/minecraft/src/BlockLadder.java.patch rename to patches/minecraft/net/minecraft/block/BlockLadder.java.patch index 4648f51140..aedf818dec 100644 --- a/patches/common/net/minecraft/src/BlockLadder.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockLadder.java.patch @@ -1,15 +1,16 @@ ---- ../src_base/common/net/minecraft/src/BlockLadder.java -+++ ../src_work/common/net/minecraft/src/BlockLadder.java -@@ -3,6 +3,8 @@ - import cpw.mods.fml.common.Side; - import cpw.mods.fml.common.asm.SideOnly; - import java.util.Random; +--- ../src_base/minecraft/net/minecraft/block/BlockLadder.java ++++ ../src_work/minecraft/net/minecraft/block/BlockLadder.java +@@ -8,6 +8,9 @@ + import net.minecraft.util.AxisAlignedBB; + import net.minecraft.world.IBlockAccess; + import net.minecraft.world.World; ++ +import net.minecraftforge.common.ForgeDirection; +import static net.minecraftforge.common.ForgeDirection.*; public class BlockLadder extends Block { -@@ -96,29 +98,32 @@ +@@ -101,29 +104,32 @@ */ public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { @@ -47,7 +48,7 @@ { var10 = 5; } -@@ -135,22 +140,22 @@ +@@ -140,22 +146,22 @@ int var6 = par1World.getBlockMetadata(par2, par3, par4); boolean var7 = false; @@ -74,7 +75,7 @@ { var7 = true; } -@@ -171,4 +176,10 @@ +@@ -176,4 +182,10 @@ { return 1; } diff --git a/patches/common/net/minecraft/src/BlockLeaves.java.patch b/patches/minecraft/net/minecraft/block/BlockLeaves.java.patch similarity index 91% rename from patches/common/net/minecraft/src/BlockLeaves.java.patch rename to patches/minecraft/net/minecraft/block/BlockLeaves.java.patch index 6c24a9ecc5..2230e2d2c1 100644 --- a/patches/common/net/minecraft/src/BlockLeaves.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockLeaves.java.patch @@ -1,13 +1,16 @@ ---- ../src_base/common/net/minecraft/src/BlockLeaves.java -+++ ../src_work/common/net/minecraft/src/BlockLeaves.java -@@ -2,10 +2,14 @@ +--- ../src_base/minecraft/net/minecraft/block/BlockLeaves.java ++++ ../src_work/minecraft/net/minecraft/block/BlockLeaves.java +@@ -2,6 +2,7 @@ import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; -+ +import java.util.ArrayList; import java.util.List; import java.util.Random; + import net.minecraft.block.material.Material; +@@ -14,7 +15,9 @@ + import net.minecraft.world.IBlockAccess; + import net.minecraft.world.World; -public class BlockLeaves extends BlockLeavesBase +import net.minecraftforge.common.IShearable; @@ -16,7 +19,7 @@ { /** * The base index in terrain.png corresponding to the fancy version of the leaf texture. This is stored so we can -@@ -98,10 +102,9 @@ +@@ -107,10 +110,9 @@ { int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11); @@ -29,7 +32,7 @@ } } } -@@ -147,11 +150,13 @@ +@@ -156,11 +158,13 @@ { var15 = par1World.getBlockId(par2 + var12, par3 + var13, par4 + var14); @@ -45,7 +48,7 @@ { this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = -2; } -@@ -294,15 +299,7 @@ +@@ -303,15 +307,7 @@ */ public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6) { @@ -62,7 +65,7 @@ } /** -@@ -353,4 +350,30 @@ +@@ -362,4 +358,30 @@ par3List.add(new ItemStack(par1, 1, 2)); par3List.add(new ItemStack(par1, 1, 3)); } diff --git a/patches/common/net/minecraft/src/BlockLever.java.patch b/patches/minecraft/net/minecraft/block/BlockLever.java.patch similarity index 94% rename from patches/common/net/minecraft/src/BlockLever.java.patch rename to patches/minecraft/net/minecraft/block/BlockLever.java.patch index cbdec23029..2f1c3fb412 100644 --- a/patches/common/net/minecraft/src/BlockLever.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockLever.java.patch @@ -1,14 +1,16 @@ ---- ../src_base/common/net/minecraft/src/BlockLever.java -+++ ../src_work/common/net/minecraft/src/BlockLever.java -@@ -1,4 +1,7 @@ - package net.minecraft.src; -+ +--- ../src_base/minecraft/net/minecraft/block/BlockLever.java ++++ ../src_work/minecraft/net/minecraft/block/BlockLever.java +@@ -7,6 +7,9 @@ + import net.minecraft.world.IBlockAccess; + import net.minecraft.world.World; + +import net.minecraftforge.common.ForgeDirection; +import static net.minecraftforge.common.ForgeDirection.*; - ++ public class BlockLever extends Block { -@@ -47,7 +50,13 @@ + protected BlockLever(int par1, int par2) +@@ -54,7 +57,13 @@ */ public boolean canPlaceBlockOnSide(World par1World, int par2, int par3, int par4, int par5) { @@ -23,7 +25,7 @@ } /** -@@ -55,7 +64,12 @@ +@@ -62,7 +71,12 @@ */ public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { @@ -37,7 +39,7 @@ } public int func_85104_a(World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9) -@@ -64,32 +78,32 @@ +@@ -71,32 +85,32 @@ int var10 = par9 & 7; var10 = -1; @@ -76,7 +78,7 @@ { var10 = 1; } -@@ -132,42 +146,42 @@ +@@ -139,42 +153,42 @@ int var6 = par1World.getBlockMetadata(par2, par3, par4) & 7; boolean var7 = false; diff --git a/patches/common/net/minecraft/src/BlockLog.java.patch b/patches/minecraft/net/minecraft/block/BlockLog.java.patch similarity index 87% rename from patches/common/net/minecraft/src/BlockLog.java.patch rename to patches/minecraft/net/minecraft/block/BlockLog.java.patch index 093bd109ed..1e7ebfe995 100644 --- a/patches/common/net/minecraft/src/BlockLog.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockLog.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/BlockLog.java -+++ ../src_work/common/net/minecraft/src/BlockLog.java -@@ -59,14 +59,9 @@ +--- ../src_base/minecraft/net/minecraft/block/BlockLog.java ++++ ../src_work/minecraft/net/minecraft/block/BlockLog.java +@@ -63,14 +63,9 @@ { int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11); @@ -17,7 +17,7 @@ } } } -@@ -144,4 +139,16 @@ +@@ -148,4 +143,16 @@ { return new ItemStack(this.blockID, 1, limitToValidMetadata(par1)); } diff --git a/patches/common/net/minecraft/src/BlockMushroom.java.patch b/patches/minecraft/net/minecraft/block/BlockMushroom.java.patch similarity index 73% rename from patches/common/net/minecraft/src/BlockMushroom.java.patch rename to patches/minecraft/net/minecraft/block/BlockMushroom.java.patch index 9cafc49201..b454f9cc6c 100644 --- a/patches/common/net/minecraft/src/BlockMushroom.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockMushroom.java.patch @@ -1,15 +1,15 @@ ---- ../src_base/common/net/minecraft/src/BlockMushroom.java -+++ ../src_work/common/net/minecraft/src/BlockMushroom.java -@@ -1,6 +1,8 @@ - package net.minecraft.src; - +--- ../src_base/minecraft/net/minecraft/block/BlockMushroom.java ++++ ../src_work/minecraft/net/minecraft/block/BlockMushroom.java +@@ -3,6 +3,8 @@ import java.util.Random; + import net.minecraft.world.World; + import net.minecraft.world.gen.feature.WorldGenBigMushroom; + +import net.minecraftforge.common.ForgeDirection; public class BlockMushroom extends BlockFlower { -@@ -94,7 +96,9 @@ +@@ -96,7 +98,9 @@ if (par3 >= 0 && par3 < 256) { int var5 = par1World.getBlockId(par2, par3 - 1, par4); diff --git a/patches/common/net/minecraft/src/BlockMycelium.java.patch b/patches/minecraft/net/minecraft/block/BlockMycelium.java.patch similarity index 86% rename from patches/common/net/minecraft/src/BlockMycelium.java.patch rename to patches/minecraft/net/minecraft/block/BlockMycelium.java.patch index a5406d6c88..0dcfb1f52f 100644 --- a/patches/common/net/minecraft/src/BlockMycelium.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockMycelium.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/BlockMycelium.java -+++ ../src_work/common/net/minecraft/src/BlockMycelium.java -@@ -51,7 +51,7 @@ +--- ../src_base/minecraft/net/minecraft/block/BlockMycelium.java ++++ ../src_work/minecraft/net/minecraft/block/BlockMycelium.java +@@ -55,7 +55,7 @@ { if (!par1World.isRemote) { @@ -9,7 +9,7 @@ { par1World.setBlockWithNotify(par2, par3, par4, Block.dirt.blockID); } -@@ -64,7 +64,7 @@ +@@ -68,7 +68,7 @@ int var9 = par4 + par5Random.nextInt(3) - 1; int var10 = par1World.getBlockId(var7, var8 + 1, var9); diff --git a/patches/common/net/minecraft/src/BlockNetherStalk.java.patch b/patches/minecraft/net/minecraft/block/BlockNetherStalk.java.patch similarity index 84% rename from patches/common/net/minecraft/src/BlockNetherStalk.java.patch rename to patches/minecraft/net/minecraft/block/BlockNetherStalk.java.patch index 8c434b11a0..0e9328b683 100644 --- a/patches/common/net/minecraft/src/BlockNetherStalk.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockNetherStalk.java.patch @@ -1,18 +1,21 @@ ---- ../src_base/common/net/minecraft/src/BlockNetherStalk.java -+++ ../src_work/common/net/minecraft/src/BlockNetherStalk.java -@@ -2,7 +2,11 @@ +--- ../src_base/minecraft/net/minecraft/block/BlockNetherStalk.java ++++ ../src_work/minecraft/net/minecraft/block/BlockNetherStalk.java +@@ -2,11 +2,14 @@ import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; -+ +import java.util.ArrayList; import java.util.Random; + import net.minecraft.creativetab.CreativeTabs; + import net.minecraft.item.Item; + import net.minecraft.item.ItemStack; + import net.minecraft.world.World; + +import net.minecraftforge.common.ForgeDirection; public class BlockNetherStalk extends BlockFlower { -@@ -29,7 +33,8 @@ +@@ -33,7 +36,8 @@ */ public boolean canBlockStay(World par1World, int par2, int par3, int par4) { @@ -22,7 +25,7 @@ } /** -@@ -69,25 +74,7 @@ +@@ -73,25 +77,7 @@ */ public void dropBlockAsItemWithChance(World par1World, int par2, int par3, int par4, int par5, float par6, int par7) { @@ -49,7 +52,7 @@ } /** -@@ -115,4 +102,23 @@ +@@ -119,4 +105,23 @@ { return Item.netherStalkSeeds.shiftedIndex; } diff --git a/patches/common/net/minecraft/src/BlockPistonBase.java.patch b/patches/minecraft/net/minecraft/block/BlockPistonBase.java.patch similarity index 77% rename from patches/common/net/minecraft/src/BlockPistonBase.java.patch rename to patches/minecraft/net/minecraft/block/BlockPistonBase.java.patch index 026c5169c2..fe373cbc76 100644 --- a/patches/common/net/minecraft/src/BlockPistonBase.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockPistonBase.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/BlockPistonBase.java -+++ ../src_work/common/net/minecraft/src/BlockPistonBase.java -@@ -368,7 +368,7 @@ +--- ../src_base/minecraft/net/minecraft/block/BlockPistonBase.java ++++ ../src_work/minecraft/net/minecraft/block/BlockPistonBase.java +@@ -380,7 +380,7 @@ return false; } @@ -9,7 +9,7 @@ } } -@@ -386,7 +386,7 @@ +@@ -398,7 +398,7 @@ { if (var8 < 13) { @@ -18,7 +18,7 @@ { return false; } -@@ -436,7 +436,7 @@ +@@ -448,7 +448,7 @@ if (var9 < 13) { diff --git a/patches/common/net/minecraft/src/BlockRail.java.patch b/patches/minecraft/net/minecraft/block/BlockRail.java.patch similarity index 92% rename from patches/common/net/minecraft/src/BlockRail.java.patch rename to patches/minecraft/net/minecraft/block/BlockRail.java.patch index 2d5553369a..90d683369b 100644 --- a/patches/common/net/minecraft/src/BlockRail.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockRail.java.patch @@ -1,34 +1,23 @@ ---- ../src_base/common/net/minecraft/src/BlockRail.java -+++ ../src_work/common/net/minecraft/src/BlockRail.java -@@ -1,11 +1,27 @@ - package net.minecraft.src; - +--- ../src_base/minecraft/net/minecraft/block/BlockRail.java ++++ ../src_work/minecraft/net/minecraft/block/BlockRail.java +@@ -3,12 +3,16 @@ import java.util.Random; -+ + import net.minecraft.block.material.Material; + import net.minecraft.creativetab.CreativeTabs; ++import net.minecraft.entity.item.EntityMinecart; + import net.minecraft.util.AxisAlignedBB; + import net.minecraft.util.MovingObjectPosition; + import net.minecraft.util.Vec3; + import net.minecraft.world.IBlockAccess; + import net.minecraft.world.World; + +import net.minecraftforge.common.ForgeDirection; +import static net.minecraftforge.common.ForgeDirection.*; - ++ public class BlockRail extends Block { /** Power related rails have this field at true. */ - private final boolean isPowered; -+ -+ /** -+ * Forge: Moved render type to a field and a setter. -+ * This allows for a mod to change the render type -+ * for vanilla rails, and any mod rails that extend -+ * this class. -+ */ -+ private int renderType = 9; -+ -+ public void setRenderType(int value) -+ { -+ renderType = value; -+ } - - /** - * Returns true if the block at the coordinates of world passed is a valid rail block (current is rail, powered or -@@ -14,7 +30,7 @@ +@@ -21,7 +25,7 @@ public static final boolean isRailBlockAt(World par0World, int par1, int par2, int par3) { int var4 = par0World.getBlockId(par1, par2, par3); @@ -37,7 +26,7 @@ } /** -@@ -22,7 +38,7 @@ +@@ -29,7 +33,7 @@ */ public static final boolean isRailBlock(int par0) { @@ -46,7 +35,7 @@ } protected BlockRail(int par1, int par2, boolean par3) -@@ -119,7 +135,7 @@ +@@ -126,7 +130,7 @@ */ public int getRenderType() { @@ -55,7 +44,7 @@ } /** -@@ -135,7 +151,7 @@ +@@ -142,7 +146,7 @@ */ public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { @@ -64,7 +53,7 @@ } /** -@@ -172,27 +188,27 @@ +@@ -179,27 +183,27 @@ boolean var8 = false; @@ -97,7 +86,7 @@ { var8 = true; } -@@ -393,9 +409,121 @@ +@@ -400,9 +404,135 @@ /** * Return true if the blocks passed is a power related rail. @@ -218,5 +207,19 @@ + public boolean hasPowerBit(World world, int x, int y, int z) + { + return isPowered; ++ } ++ ++ ++ /** ++ * Forge: Moved render type to a field and a setter. ++ * This allows for a mod to change the render type ++ * for vanilla rails, and any mod rails that extend ++ * this class. ++ */ ++ private int renderType = 9; ++ ++ public void setRenderType(int value) ++ { ++ renderType = value; + } } diff --git a/patches/common/net/minecraft/src/BlockRedstoneWire.java.patch b/patches/minecraft/net/minecraft/block/BlockRedstoneWire.java.patch similarity index 70% rename from patches/common/net/minecraft/src/BlockRedstoneWire.java.patch rename to patches/minecraft/net/minecraft/block/BlockRedstoneWire.java.patch index 18c9c03710..5c99df5686 100644 --- a/patches/common/net/minecraft/src/BlockRedstoneWire.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockRedstoneWire.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/BlockRedstoneWire.java -+++ ../src_work/common/net/minecraft/src/BlockRedstoneWire.java -@@ -557,7 +557,7 @@ +--- ../src_base/minecraft/net/minecraft/block/BlockRedstoneWire.java ++++ ../src_work/minecraft/net/minecraft/block/BlockRedstoneWire.java +@@ -564,7 +564,7 @@ } else if (var5 != Block.redstoneRepeaterIdle.blockID && var5 != Block.redstoneRepeaterActive.blockID) { diff --git a/patches/common/net/minecraft/src/BlockReed.java.patch b/patches/minecraft/net/minecraft/block/BlockReed.java.patch similarity index 86% rename from patches/common/net/minecraft/src/BlockReed.java.patch rename to patches/minecraft/net/minecraft/block/BlockReed.java.patch index 84f05a22c8..0100774b52 100644 --- a/patches/common/net/minecraft/src/BlockReed.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockReed.java.patch @@ -1,8 +1,8 @@ ---- ../src_base/common/net/minecraft/src/BlockReed.java -+++ ../src_work/common/net/minecraft/src/BlockReed.java -@@ -4,7 +4,11 @@ - import cpw.mods.fml.common.asm.SideOnly; - import java.util.Random; +--- ../src_base/minecraft/net/minecraft/block/BlockReed.java ++++ ../src_work/minecraft/net/minecraft/block/BlockReed.java +@@ -8,7 +8,11 @@ + import net.minecraft.util.AxisAlignedBB; + import net.minecraft.world.World; -public class BlockReed extends Block +import net.minecraftforge.common.EnumPlantType; @@ -13,7 +13,7 @@ { protected BlockReed(int par1, int par2) { -@@ -51,8 +55,8 @@ +@@ -55,8 +59,8 @@ */ public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { @@ -24,7 +24,7 @@ } /** -@@ -135,4 +139,22 @@ +@@ -139,4 +143,22 @@ { return Item.reed.shiftedIndex; } diff --git a/patches/common/net/minecraft/src/BlockSapling.java.patch b/patches/minecraft/net/minecraft/block/BlockSapling.java.patch similarity index 56% rename from patches/common/net/minecraft/src/BlockSapling.java.patch rename to patches/minecraft/net/minecraft/block/BlockSapling.java.patch index 49f00589f2..cba8037a75 100644 --- a/patches/common/net/minecraft/src/BlockSapling.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockSapling.java.patch @@ -1,20 +1,20 @@ ---- ../src_base/common/net/minecraft/src/BlockSapling.java -+++ ../src_work/common/net/minecraft/src/BlockSapling.java -@@ -4,6 +4,8 @@ - import cpw.mods.fml.common.asm.SideOnly; - import java.util.List; - import java.util.Random; +--- ../src_base/minecraft/net/minecraft/block/BlockSapling.java ++++ ../src_work/minecraft/net/minecraft/block/BlockSapling.java +@@ -13,6 +13,8 @@ + import net.minecraft.world.gen.feature.WorldGenTaiga2; + import net.minecraft.world.gen.feature.WorldGenTrees; + import net.minecraft.world.gen.feature.WorldGenerator; + +import net.minecraftforge.event.terraingen.TerrainGen; public class BlockSapling extends BlockFlower { -@@ -56,6 +58,8 @@ +@@ -65,6 +67,8 @@ */ public void growTree(World par1World, int par2, int par3, int par4, Random par5Random) { + if (!TerrainGen.saplingGrowTree(par1World, par5Random, par2, par3, par4)) return; -+ ++ int var6 = par1World.getBlockMetadata(par2, par3, par4) & 3; Object var7 = null; int var8 = 0; diff --git a/patches/common/net/minecraft/src/BlockSnow.java.patch b/patches/minecraft/net/minecraft/block/BlockSnow.java.patch similarity index 89% rename from patches/common/net/minecraft/src/BlockSnow.java.patch rename to patches/minecraft/net/minecraft/block/BlockSnow.java.patch index e41c426891..06ee10c596 100644 --- a/patches/common/net/minecraft/src/BlockSnow.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockSnow.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/BlockSnow.java -+++ ../src_work/common/net/minecraft/src/BlockSnow.java -@@ -57,7 +57,8 @@ +--- ../src_base/minecraft/net/minecraft/block/BlockSnow.java ++++ ../src_work/minecraft/net/minecraft/block/BlockSnow.java +@@ -67,7 +67,8 @@ public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { int var5 = par1World.getBlockId(par2, par3 - 1, par4); @@ -10,7 +10,7 @@ } /** -@@ -76,7 +77,6 @@ +@@ -86,7 +87,6 @@ { if (!this.canPlaceBlockAt(par1World, par2, par3, par4)) { @@ -18,7 +18,7 @@ par1World.setBlockWithNotify(par2, par3, par4, 0); return false; } -@@ -92,10 +92,8 @@ +@@ -102,10 +102,8 @@ */ public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6) { @@ -30,7 +30,7 @@ } /** -@@ -111,7 +109,7 @@ +@@ -121,7 +119,7 @@ */ public int quantityDropped(Random par1Random) { @@ -39,7 +39,7 @@ } /** -@@ -121,7 +119,6 @@ +@@ -131,7 +129,6 @@ { if (par1World.getSavedLightValue(EnumSkyBlock.Block, par2, par3, par4) > 11) { diff --git a/patches/common/net/minecraft/src/BlockStem.java.patch b/patches/minecraft/net/minecraft/block/BlockStem.java.patch similarity index 86% rename from patches/common/net/minecraft/src/BlockStem.java.patch rename to patches/minecraft/net/minecraft/block/BlockStem.java.patch index 5544fc3eb5..84b6c364b2 100644 --- a/patches/common/net/minecraft/src/BlockStem.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockStem.java.patch @@ -1,18 +1,23 @@ ---- ../src_base/common/net/minecraft/src/BlockStem.java -+++ ../src_work/common/net/minecraft/src/BlockStem.java -@@ -2,7 +2,11 @@ +--- ../src_base/minecraft/net/minecraft/block/BlockStem.java ++++ ../src_work/minecraft/net/minecraft/block/BlockStem.java +@@ -2,6 +2,7 @@ import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; -+ +import java.util.ArrayList; import java.util.Random; -+ -+import net.minecraftforge.common.ForgeDirection; + import net.minecraft.creativetab.CreativeTabs; + import net.minecraft.item.Item; +@@ -9,6 +10,8 @@ + import net.minecraft.world.IBlockAccess; + import net.minecraft.world.World; ++import net.minecraftforge.common.ForgeDirection; ++ public class BlockStem extends BlockFlower { -@@ -96,7 +100,8 @@ + /** Defines if it is a Melon or a Pumpkin that the stem is producing. */ +@@ -101,7 +104,8 @@ int var11 = par1World.getBlockId(var9, par3 - 1, var10); @@ -22,7 +27,7 @@ { par1World.setBlockWithNotify(var9, par3, var10, this.fruitType.blockID); } -@@ -132,11 +137,11 @@ +@@ -137,11 +141,11 @@ int var19 = par1World.getBlockId(var17, par3 - 1, var18); float var20 = 0.0F; @@ -36,7 +41,7 @@ { var20 = 3.0F; } -@@ -236,29 +241,22 @@ +@@ -241,29 +245,22 @@ public void dropBlockAsItemWithChance(World par1World, int par2, int par3, int par4, int par5, float par6, int par7) { super.dropBlockAsItemWithChance(par1World, par2, par3, par4, par5, par6, par7); diff --git a/patches/common/net/minecraft/src/BlockTallGrass.java.patch b/patches/minecraft/net/minecraft/block/BlockTallGrass.java.patch similarity index 87% rename from patches/common/net/minecraft/src/BlockTallGrass.java.patch rename to patches/minecraft/net/minecraft/block/BlockTallGrass.java.patch index 69425d833d..7fc5323ef4 100644 --- a/patches/common/net/minecraft/src/BlockTallGrass.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockTallGrass.java.patch @@ -1,13 +1,16 @@ ---- ../src_base/common/net/minecraft/src/BlockTallGrass.java -+++ ../src_work/common/net/minecraft/src/BlockTallGrass.java -@@ -2,10 +2,15 @@ +--- ../src_base/minecraft/net/minecraft/block/BlockTallGrass.java ++++ ../src_work/minecraft/net/minecraft/block/BlockTallGrass.java +@@ -2,6 +2,7 @@ import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; -+ +import java.util.ArrayList; import java.util.List; import java.util.Random; + import net.minecraft.block.material.Material; +@@ -15,7 +16,10 @@ + import net.minecraft.world.IBlockAccess; + import net.minecraft.world.World; -public class BlockTallGrass extends BlockFlower +import net.minecraftforge.common.ForgeHooks; @@ -17,7 +20,7 @@ { protected BlockTallGrass(int par1, int par2) { -@@ -27,7 +32,7 @@ +@@ -37,7 +41,7 @@ */ public int idDropped(int par1, Random par2Random, int par3) { @@ -26,7 +29,7 @@ } /** -@@ -44,15 +49,7 @@ +@@ -54,15 +58,7 @@ */ public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6) { @@ -43,7 +46,7 @@ } @SideOnly(Side.CLIENT) -@@ -105,4 +102,35 @@ +@@ -115,4 +111,35 @@ par3List.add(new ItemStack(par1, 1, var4)); } } diff --git a/patches/common/net/minecraft/src/BlockTorch.java.patch b/patches/minecraft/net/minecraft/block/BlockTorch.java.patch similarity index 93% rename from patches/common/net/minecraft/src/BlockTorch.java.patch rename to patches/minecraft/net/minecraft/block/BlockTorch.java.patch index 29c960d619..09b5d1874c 100644 --- a/patches/common/net/minecraft/src/BlockTorch.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockTorch.java.patch @@ -1,15 +1,16 @@ ---- ../src_base/common/net/minecraft/src/BlockTorch.java -+++ ../src_work/common/net/minecraft/src/BlockTorch.java -@@ -3,6 +3,8 @@ - import cpw.mods.fml.common.Side; - import cpw.mods.fml.common.asm.SideOnly; - import java.util.Random; +--- ../src_base/minecraft/net/minecraft/block/BlockTorch.java ++++ ../src_work/minecraft/net/minecraft/block/BlockTorch.java +@@ -10,6 +10,9 @@ + import net.minecraft.util.Vec3; + import net.minecraft.world.World; + +import net.minecraftforge.common.ForgeDirection; +import static net.minecraftforge.common.ForgeDirection.*; - ++ public class BlockTorch extends Block { -@@ -59,7 +61,7 @@ + protected BlockTorch(int par1, int par2) +@@ -65,7 +68,7 @@ else { int var5 = par1World.getBlockId(par2, par3, par4); @@ -18,7 +19,7 @@ } } -@@ -68,7 +70,11 @@ +@@ -74,7 +77,11 @@ */ public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { @@ -31,7 +32,7 @@ } public int func_85104_a(World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9) -@@ -80,22 +86,22 @@ +@@ -86,22 +93,22 @@ var10 = 5; } @@ -58,7 +59,7 @@ { var10 = 1; } -@@ -123,19 +129,19 @@ +@@ -129,19 +136,19 @@ { if (par1World.getBlockMetadata(par2, par3, par4) == 0) { @@ -82,7 +83,7 @@ { par1World.setBlockMetadataWithNotify(par2, par3, par4, 4); } -@@ -159,22 +165,22 @@ +@@ -165,22 +172,22 @@ int var6 = par1World.getBlockMetadata(par2, par3, par4); boolean var7 = false; diff --git a/patches/common/net/minecraft/src/BlockTrapDoor.java.patch b/patches/minecraft/net/minecraft/block/BlockTrapDoor.java.patch similarity index 82% rename from patches/common/net/minecraft/src/BlockTrapDoor.java.patch rename to patches/minecraft/net/minecraft/block/BlockTrapDoor.java.patch index d362966bbf..d77061ce1c 100644 --- a/patches/common/net/minecraft/src/BlockTrapDoor.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockTrapDoor.java.patch @@ -1,12 +1,11 @@ ---- ../src_base/common/net/minecraft/src/BlockTrapDoor.java -+++ ../src_work/common/net/minecraft/src/BlockTrapDoor.java -@@ -1,10 +1,14 @@ - package net.minecraft.src; +--- ../src_base/minecraft/net/minecraft/block/BlockTrapDoor.java ++++ ../src_work/minecraft/net/minecraft/block/BlockTrapDoor.java +@@ -11,8 +11,13 @@ + import net.minecraft.world.IBlockAccess; + import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; - import cpw.mods.fml.common.Side; - import cpw.mods.fml.common.asm.SideOnly; - ++ public class BlockTrapDoor extends Block { + /** Set this to allow trapdoors to remain free-floating */ @@ -15,7 +14,7 @@ protected BlockTrapDoor(int par1, Material par2Material) { super(par1, par2Material); -@@ -193,7 +197,7 @@ +@@ -201,7 +206,7 @@ --var7; } @@ -24,7 +23,7 @@ { par1World.setBlockWithNotify(par2, par3, par4, 0); this.dropBlockAsItem(par1World, par2, par3, par4, var6, 0); -@@ -255,6 +259,10 @@ +@@ -263,6 +268,10 @@ */ public boolean canPlaceBlockOnSide(World par1World, int par2, int par3, int par4, int par5) { @@ -35,7 +34,7 @@ if (par5 == 0) { return false; -@@ -285,7 +293,7 @@ +@@ -293,7 +302,7 @@ --par2; } @@ -44,7 +43,7 @@ } } -@@ -300,6 +308,10 @@ +@@ -308,6 +317,10 @@ */ private static boolean isValidSupportBlock(int par0) { diff --git a/patches/common/net/minecraft/src/BlockTripWireSource.java.patch b/patches/minecraft/net/minecraft/block/BlockTripWireSource.java.patch similarity index 92% rename from patches/common/net/minecraft/src/BlockTripWireSource.java.patch rename to patches/minecraft/net/minecraft/block/BlockTripWireSource.java.patch index d450766e8e..33b14f2103 100644 --- a/patches/common/net/minecraft/src/BlockTripWireSource.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockTripWireSource.java.patch @@ -1,16 +1,16 @@ ---- ../src_base/common/net/minecraft/src/BlockTripWireSource.java -+++ ../src_work/common/net/minecraft/src/BlockTripWireSource.java -@@ -1,6 +1,9 @@ - package net.minecraft.src; +--- ../src_base/minecraft/net/minecraft/block/BlockTripWireSource.java ++++ ../src_work/minecraft/net/minecraft/block/BlockTripWireSource.java +@@ -8,6 +8,9 @@ + import net.minecraft.world.IBlockAccess; + import net.minecraft.world.World; - import java.util.Random; -+ +import net.minecraftforge.common.ForgeDirection; +import static net.minecraftforge.common.ForgeDirection.*; - ++ public class BlockTripWireSource extends Block { -@@ -58,7 +61,11 @@ + public BlockTripWireSource(int par1) +@@ -64,7 +67,11 @@ */ public boolean canPlaceBlockOnSide(World par1World, int par2, int par3, int par4, int par5) { @@ -23,7 +23,7 @@ } /** -@@ -66,29 +73,32 @@ +@@ -72,29 +79,32 @@ */ public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { @@ -61,7 +61,7 @@ { var10 = 3; } -@@ -115,22 +125,22 @@ +@@ -121,22 +131,22 @@ int var7 = var6 & 3; boolean var8 = false; @@ -88,7 +88,7 @@ { var8 = true; } -@@ -151,7 +161,7 @@ +@@ -157,7 +167,7 @@ boolean var12 = (par6 & 8) == 8; boolean var13 = par5 == Block.tripWireSource.blockID; boolean var14 = false; diff --git a/patches/common/net/minecraft/src/BlockVine.java.patch b/patches/minecraft/net/minecraft/block/BlockVine.java.patch similarity index 81% rename from patches/common/net/minecraft/src/BlockVine.java.patch rename to patches/minecraft/net/minecraft/block/BlockVine.java.patch index 754e2419ab..2e9958d5f8 100644 --- a/patches/common/net/minecraft/src/BlockVine.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockVine.java.patch @@ -1,12 +1,16 @@ ---- ../src_base/common/net/minecraft/src/BlockVine.java -+++ ../src_work/common/net/minecraft/src/BlockVine.java -@@ -2,9 +2,13 @@ +--- ../src_base/minecraft/net/minecraft/block/BlockVine.java ++++ ../src_work/minecraft/net/minecraft/block/BlockVine.java +@@ -2,6 +2,7 @@ import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; -+ +import java.util.ArrayList; import java.util.Random; + import net.minecraft.block.material.Material; + import net.minecraft.creativetab.CreativeTabs; +@@ -15,7 +16,9 @@ + import net.minecraft.world.IBlockAccess; + import net.minecraft.world.World; -public class BlockVine extends Block +import net.minecraftforge.common.IShearable; @@ -15,7 +19,7 @@ { public BlockVine(int par1) { -@@ -425,14 +429,26 @@ +@@ -436,14 +439,26 @@ */ public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6) { diff --git a/patches/common/net/minecraft/src/RailLogic.java.patch b/patches/minecraft/net/minecraft/block/RailLogic.java.patch similarity index 88% rename from patches/common/net/minecraft/src/RailLogic.java.patch rename to patches/minecraft/net/minecraft/block/RailLogic.java.patch index a4ac2ea164..bb15e0c1aa 100644 --- a/patches/common/net/minecraft/src/RailLogic.java.patch +++ b/patches/minecraft/net/minecraft/block/RailLogic.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/RailLogic.java -+++ ../src_work/common/net/minecraft/src/RailLogic.java -@@ -18,6 +18,7 @@ +--- ../src_base/minecraft/net/minecraft/block/RailLogic.java ++++ ../src_work/minecraft/net/minecraft/block/RailLogic.java +@@ -20,6 +20,7 @@ private List connectedTracks; final BlockRail rail; @@ -8,7 +8,7 @@ public RailLogic(BlockRail par1BlockRail, World par2World, int par3, int par4, int par5) { -@@ -28,18 +29,11 @@ +@@ -30,18 +31,11 @@ this.trackY = par4; this.trackZ = par5; int var6 = par2World.getBlockId(par3, par4, par5); @@ -32,7 +32,7 @@ this.setConnections(var7); } -@@ -258,7 +252,7 @@ +@@ -260,7 +254,7 @@ } } @@ -41,7 +41,7 @@ { if (BlockRail.isRailBlockAt(this.worldObj, this.trackX, this.trackY + 1, this.trackZ - 1)) { -@@ -271,7 +265,7 @@ +@@ -273,7 +267,7 @@ } } @@ -50,7 +50,7 @@ { if (BlockRail.isRailBlockAt(this.worldObj, this.trackX + 1, this.trackY + 1, this.trackZ)) { -@@ -422,7 +416,7 @@ +@@ -424,7 +418,7 @@ } } @@ -59,7 +59,7 @@ { if (BlockRail.isRailBlockAt(this.worldObj, this.trackX, this.trackY + 1, this.trackZ - 1)) { -@@ -435,7 +429,7 @@ +@@ -437,7 +431,7 @@ } } diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch index d642fab6ca..789c2bb0be 100644 --- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -1,16 +1,17 @@ --- ../src_base/minecraft/net/minecraft/client/Minecraft.java +++ ../src_work/minecraft/net/minecraft/client/Minecraft.java -@@ -128,6 +128,9 @@ - import net.minecraft.src.WorldInfo; - import net.minecraft.src.WorldRenderer; - import net.minecraft.src.WorldSettings; +@@ -130,6 +130,10 @@ + + import com.google.common.collect.MapDifference; + +import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.event.ForgeEventFactory; +import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; - - import org.lwjgl.LWJGLException; - import org.lwjgl.Sys; -@@ -1266,7 +1269,7 @@ ++ + @SideOnly(Side.CLIENT) + public abstract class Minecraft implements Runnable, IPlayerUsage + { +@@ -1249,7 +1253,7 @@ if (this.thePlayer.canCurrentToolHarvestBlock(var3, var4, var5)) { @@ -19,7 +20,7 @@ this.thePlayer.swingItem(); } } -@@ -1332,7 +1335,8 @@ +@@ -1315,7 +1319,8 @@ { int var8 = var3 != null ? var3.stackSize : 0; @@ -29,7 +30,7 @@ { var2 = false; this.thePlayer.swingItem(); -@@ -1358,7 +1362,8 @@ +@@ -1341,7 +1346,8 @@ { ItemStack var9 = this.thePlayer.inventory.getCurrentItem(); @@ -39,7 +40,7 @@ { this.entityRenderer.itemRenderer.func_78445_c(); } -@@ -2047,6 +2052,18 @@ +@@ -2037,6 +2043,18 @@ if (this.theIntegratedServer != null) { this.theIntegratedServer.initiateShutdown(); @@ -58,7 +59,7 @@ } this.theIntegratedServer = null; -@@ -2356,95 +2373,12 @@ +@@ -2346,95 +2364,12 @@ if (this.objectMouseOver != null) { boolean var1 = this.thePlayer.capabilities.isCreativeMode; diff --git a/patches/minecraft/net/minecraft/src/SoundManager.java.patch b/patches/minecraft/net/minecraft/client/audio/SoundManager.java.patch similarity index 91% rename from patches/minecraft/net/minecraft/src/SoundManager.java.patch rename to patches/minecraft/net/minecraft/client/audio/SoundManager.java.patch index 8f9fd9774c..cb5c8f9e26 100644 --- a/patches/minecraft/net/minecraft/src/SoundManager.java.patch +++ b/patches/minecraft/net/minecraft/client/audio/SoundManager.java.patch @@ -1,7 +1,7 @@ ---- ../src_base/minecraft/net/minecraft/src/SoundManager.java -+++ ../src_work/minecraft/net/minecraft/src/SoundManager.java +--- ../src_base/minecraft/net/minecraft/client/audio/SoundManager.java ++++ ../src_work/minecraft/net/minecraft/client/audio/SoundManager.java @@ -1,5 +1,9 @@ - package net.minecraft.src; + package net.minecraft.client.audio; +import net.minecraftforge.client.*; +import net.minecraftforge.client.event.sound.*; @@ -10,7 +10,7 @@ import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; import java.io.File; -@@ -46,9 +50,11 @@ +@@ -50,9 +54,11 @@ private Random rand = new Random(); private int ticksBeforeMusic; @@ -23,7 +23,7 @@ } /** -@@ -63,6 +69,8 @@ +@@ -67,6 +73,8 @@ { this.tryToSetLibraryAndCodecs(); } @@ -32,7 +32,7 @@ } /** -@@ -82,6 +90,8 @@ +@@ -86,6 +94,8 @@ SoundSystemConfig.setCodec("ogg", CodecJOrbis.class); SoundSystemConfig.setCodec("mus", CodecMus.class); SoundSystemConfig.setCodec("wav", CodecWav.class); @@ -41,7 +41,7 @@ sndSystem = new SoundSystem(); this.options.soundVolume = var1; this.options.musicVolume = var2; -@@ -170,10 +180,12 @@ +@@ -174,10 +184,12 @@ } SoundPoolEntry var1 = this.soundPoolMusic.getRandomSound(); @@ -55,7 +55,7 @@ sndSystem.backgroundMusic("BgMusic", var1.soundUrl, var1.soundName, false); sndSystem.setVolume("BgMusic", this.options.musicVolume); sndSystem.play("BgMusic"); -@@ -240,6 +252,7 @@ +@@ -244,6 +256,7 @@ if (par1Str != null) { SoundPoolEntry var6 = this.soundPoolStreaming.getRandomSoundFromSoundPool(par1Str); @@ -63,7 +63,7 @@ if (var6 != null) { -@@ -251,6 +264,7 @@ +@@ -255,6 +268,7 @@ float var7 = 16.0F; sndSystem.newStreamingSource(true, var5, var6.soundUrl, var6.soundName, false, par2, par3, par4, 2, var7 * 4.0F); sndSystem.setVolume(var5, 0.5F * this.options.soundVolume); @@ -71,7 +71,7 @@ sndSystem.play(var5); } } -@@ -430,6 +444,7 @@ +@@ -434,6 +448,7 @@ if (loaded && this.options.soundVolume != 0.0F) { SoundPoolEntry var7 = this.soundPoolSounds.getRandomSoundFromSoundPool(par1Str); @@ -79,7 +79,7 @@ if (var7 != null && par5 > 0.0F) { -@@ -451,6 +466,7 @@ +@@ -455,6 +470,7 @@ } sndSystem.setVolume(var8, par5 * this.options.soundVolume); @@ -87,7 +87,7 @@ sndSystem.play(var8); } } -@@ -465,6 +481,7 @@ +@@ -469,6 +485,7 @@ if (loaded && this.options.soundVolume != 0.0F) { SoundPoolEntry var4 = this.soundPoolSounds.getRandomSoundFromSoundPool(par1Str); @@ -95,7 +95,7 @@ if (var4 != null) { -@@ -480,6 +497,7 @@ +@@ -484,6 +501,7 @@ par2 *= 0.25F; sndSystem.setPitch(var5, par3); sndSystem.setVolume(var5, par2 * this.options.soundVolume); diff --git a/patches/minecraft/net/minecraft/src/SoundPool.java.patch b/patches/minecraft/net/minecraft/client/audio/SoundPool.java.patch similarity index 92% rename from patches/minecraft/net/minecraft/src/SoundPool.java.patch rename to patches/minecraft/net/minecraft/client/audio/SoundPool.java.patch index 4e8a3dd0f7..3b13b39ceb 100644 --- a/patches/minecraft/net/minecraft/src/SoundPool.java.patch +++ b/patches/minecraft/net/minecraft/client/audio/SoundPool.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/SoundPool.java -+++ ../src_work/minecraft/net/minecraft/src/SoundPool.java +--- ../src_base/minecraft/net/minecraft/client/audio/SoundPool.java ++++ ../src_work/minecraft/net/minecraft/client/audio/SoundPool.java @@ -4,6 +4,7 @@ import cpw.mods.fml.common.asm.SideOnly; import java.io.File; diff --git a/patches/minecraft/net/minecraft/src/GuiControls.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiControls.java.patch similarity index 90% rename from patches/minecraft/net/minecraft/src/GuiControls.java.patch rename to patches/minecraft/net/minecraft/client/gui/GuiControls.java.patch index 90ef0d43a4..c34aa49ab7 100644 --- a/patches/minecraft/net/minecraft/src/GuiControls.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/GuiControls.java.patch @@ -1,13 +1,15 @@ ---- ../src_base/minecraft/net/minecraft/src/GuiControls.java -+++ ../src_work/minecraft/net/minecraft/src/GuiControls.java -@@ -1,4 +1,6 @@ - package net.minecraft.src; +--- ../src_base/minecraft/net/minecraft/client/gui/GuiControls.java ++++ ../src_work/minecraft/net/minecraft/client/gui/GuiControls.java +@@ -5,6 +5,8 @@ + import net.minecraft.client.settings.GameSettings; + import net.minecraft.client.settings.KeyBinding; + import net.minecraft.util.StringTranslate; + +import net.minecraftforge.client.GuiControlsScrollPanel; - import cpw.mods.fml.common.Side; - import cpw.mods.fml.common.asm.SideOnly; -@@ -20,6 +22,8 @@ + @SideOnly(Side.CLIENT) + public class GuiControls extends GuiScreen +@@ -23,6 +25,8 @@ /** The ID of the button that has been pressed. */ private int buttonId = -1; @@ -16,7 +18,7 @@ public GuiControls(GuiScreen par1GuiScreen, GameSettings par2GameSettings) { this.parentScreen = par1GuiScreen; -@@ -36,15 +40,12 @@ +@@ -39,15 +43,12 @@ */ public void initGui() { @@ -35,7 +37,7 @@ this.screenTitle = var1.translateKey("controls.title"); } -@@ -53,19 +54,9 @@ +@@ -56,19 +57,9 @@ */ protected void actionPerformed(GuiButton par1GuiButton) { @@ -55,7 +57,7 @@ } } -@@ -74,17 +65,7 @@ +@@ -77,17 +68,7 @@ */ protected void mouseClicked(int par1, int par2, int par3) { @@ -74,7 +76,7 @@ } /** -@@ -92,14 +73,7 @@ +@@ -95,14 +76,7 @@ */ protected void keyTyped(char par1, int par2) { @@ -90,7 +92,7 @@ { super.keyTyped(par1, par2); } -@@ -111,47 +85,8 @@ +@@ -114,47 +88,8 @@ public void drawScreen(int par1, int par2, float par3) { this.drawDefaultBackground(); diff --git a/patches/minecraft/net/minecraft/src/GuiIngame.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiIngame.java.patch similarity index 63% rename from patches/minecraft/net/minecraft/src/GuiIngame.java.patch rename to patches/minecraft/net/minecraft/client/gui/GuiIngame.java.patch index 26ab853205..f4602f9d44 100644 --- a/patches/minecraft/net/minecraft/src/GuiIngame.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/GuiIngame.java.patch @@ -1,15 +1,15 @@ ---- ../src_base/minecraft/net/minecraft/src/GuiIngame.java -+++ ../src_work/minecraft/net/minecraft/src/GuiIngame.java -@@ -6,6 +6,8 @@ - import java.util.List; - import java.util.Random; - import net.minecraft.client.Minecraft; -+import net.minecraftforge.common.ForgeHooks; -+ +--- ../src_base/minecraft/net/minecraft/client/gui/GuiIngame.java ++++ ../src_work/minecraft/net/minecraft/client/gui/GuiIngame.java +@@ -26,6 +26,8 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -@@ -140,7 +142,7 @@ ++import net.minecraftforge.common.ForgeHooks; ++ + @SideOnly(Side.CLIENT) + public class GuiIngame extends Gui + { +@@ -157,7 +159,7 @@ var47 = var7 - 39; var22 = var47 - 10; diff --git a/patches/minecraft/net/minecraft/src/GuiSlot.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiSlot.java.patch similarity index 93% rename from patches/minecraft/net/minecraft/src/GuiSlot.java.patch rename to patches/minecraft/net/minecraft/client/gui/GuiSlot.java.patch index 27f69cff25..3208f01869 100644 --- a/patches/minecraft/net/minecraft/src/GuiSlot.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/GuiSlot.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/minecraft/net/minecraft/src/GuiSlot.java -+++ ../src_work/minecraft/net/minecraft/src/GuiSlot.java -@@ -67,6 +67,8 @@ +--- ../src_base/minecraft/net/minecraft/client/gui/GuiSlot.java ++++ ../src_work/minecraft/net/minecraft/client/gui/GuiSlot.java +@@ -68,6 +68,8 @@ private boolean showSelectionBox = true; private boolean field_77243_s; private int field_77242_t; @@ -9,7 +9,7 @@ public GuiSlot(Minecraft par1Minecraft, int par2, int par3, int par4, int par5, int par6) { -@@ -331,16 +333,7 @@ +@@ -332,16 +334,7 @@ GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_FOG); Tessellator var18 = Tessellator.instance; @@ -27,7 +27,7 @@ var9 = this.width / 2 - 92 - 16; var10 = this.top + 4 - (int)this.amountScrolled; -@@ -469,10 +462,10 @@ +@@ -470,10 +463,10 @@ /** * Overlays the background to hide scrolled items */ @@ -40,7 +40,7 @@ GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); float var6 = 32.0F; var5.startDrawingQuads(); -@@ -484,4 +477,18 @@ +@@ -485,4 +478,18 @@ var5.addVertexWithUV(0.0D, (double)par1, 0.0D, 0.0D, (double)((float)par1 / var6)); var5.draw(); } diff --git a/patches/minecraft/net/minecraft/src/GuiAchievements.java.patch b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch similarity index 88% rename from patches/minecraft/net/minecraft/src/GuiAchievements.java.patch rename to patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch index 5421a94679..7adaa5c378 100644 --- a/patches/minecraft/net/minecraft/src/GuiAchievements.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch @@ -1,20 +1,24 @@ ---- ../src_base/minecraft/net/minecraft/src/GuiAchievements.java -+++ ../src_work/minecraft/net/minecraft/src/GuiAchievements.java -@@ -2,8 +2,13 @@ +--- ../src_base/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java ++++ ../src_work/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java +@@ -2,6 +2,8 @@ import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; -+ +import java.util.LinkedList; +import java.util.List; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -+import net.minecraftforge.common.AchievementPage; -+ - import org.lwjgl.input.Mouse; +@@ -19,6 +21,8 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -@@ -44,6 +49,10 @@ + ++import net.minecraftforge.common.AchievementPage; ++ + @SideOnly(Side.CLIENT) + public class GuiAchievements extends GuiScreen + { +@@ -55,6 +59,10 @@ /** Whether the Mouse Button is down or not */ private int isMouseButtonDown = 0; private StatFileWriter statFileWriter; @@ -25,7 +29,7 @@ public GuiAchievements(StatFileWriter par1StatFileWriter) { -@@ -52,6 +61,14 @@ +@@ -63,6 +71,14 @@ short var3 = 141; this.field_74117_m = this.guiMapX = this.field_74124_q = (double)(AchievementList.openInventory.displayColumn * 24 - var2 / 2 - 12); this.field_74115_n = this.guiMapY = this.field_74123_r = (double)(AchievementList.openInventory.displayRow * 24 - var3 / 2); @@ -40,7 +44,7 @@ } /** -@@ -61,6 +78,7 @@ +@@ -72,6 +88,7 @@ { this.controlList.clear(); this.controlList.add(new GuiSmallButton(1, this.width / 2 + 24, this.height / 2 + 74, 80, 20, StatCollector.translateToLocal("gui.done"))); @@ -48,7 +52,7 @@ } /** -@@ -72,6 +90,16 @@ +@@ -83,6 +100,16 @@ { this.mc.displayGuiScreen((GuiScreen)null); this.mc.setIngameFocus(); @@ -65,7 +69,7 @@ } super.actionPerformed(par1GuiButton); -@@ -296,11 +324,12 @@ +@@ -307,11 +334,12 @@ int var27; int var30; @@ -83,7 +87,7 @@ { var24 = var33.displayColumn * 24 - var4 + 11 + var10; var25 = var33.displayRow * 24 - var5 + 11 + var11; -@@ -334,9 +363,9 @@ +@@ -345,9 +373,9 @@ int var42; int var41; diff --git a/patches/minecraft/net/minecraft/src/GuiContainer.java.patch b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch similarity index 73% rename from patches/minecraft/net/minecraft/src/GuiContainer.java.patch rename to patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch index c12dac5aa4..3a5b9d4eb4 100644 --- a/patches/minecraft/net/minecraft/src/GuiContainer.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/minecraft/net/minecraft/src/GuiContainer.java -+++ ../src_work/minecraft/net/minecraft/src/GuiContainer.java -@@ -309,7 +309,7 @@ +--- ../src_base/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java ++++ ../src_work/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java +@@ -318,7 +318,7 @@ if (var6 >= 0) { GL11.glDisable(GL11.GL_LIGHTING); diff --git a/patches/minecraft/net/minecraft/src/GuiContainerCreative.java.patch b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch similarity index 94% rename from patches/minecraft/net/minecraft/src/GuiContainerCreative.java.patch rename to patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch index 50e9897d5a..a7a4ed2afd 100644 --- a/patches/minecraft/net/minecraft/src/GuiContainerCreative.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/minecraft/net/minecraft/src/GuiContainerCreative.java -+++ ../src_work/minecraft/net/minecraft/src/GuiContainerCreative.java -@@ -33,6 +33,8 @@ +--- ../src_base/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java ++++ ../src_work/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java +@@ -49,6 +49,8 @@ private Slot field_74235_v = null; private boolean field_74234_w = false; private CreativeCrafting field_82324_x; @@ -9,7 +9,7 @@ public GuiContainerCreative(EntityPlayer par1EntityPlayer) { -@@ -207,6 +209,13 @@ +@@ -223,6 +225,13 @@ this.func_74227_b(CreativeTabs.creativeTabArray[var1]); this.field_82324_x = new CreativeCrafting(this.mc); this.mc.thePlayer.inventoryContainer.addCraftingToCrafters(this.field_82324_x); @@ -23,7 +23,7 @@ } else { -@@ -327,7 +336,7 @@ +@@ -343,7 +352,7 @@ { CreativeTabs var3 = CreativeTabs.creativeTabArray[selectedTabIndex]; @@ -32,7 +32,7 @@ { this.fontRenderer.drawString(var3.getTranslatedTabLabel(), 8, 6, 4210752); } -@@ -349,7 +358,7 @@ +@@ -365,7 +374,7 @@ { CreativeTabs var9 = var6[var8]; @@ -41,7 +41,7 @@ { this.func_74227_b(var9); return; -@@ -365,11 +374,17 @@ +@@ -381,11 +390,17 @@ */ private boolean needsScrollBars() { @@ -59,7 +59,7 @@ int var2 = selectedTabIndex; selectedTabIndex = par1CreativeTabs.getTabIndex(); ContainerCreative var3 = (ContainerCreative)this.inventorySlots; -@@ -539,21 +554,42 @@ +@@ -555,21 +570,42 @@ super.drawScreen(par1, par2, par3); CreativeTabs[] var11 = CreativeTabs.creativeTabArray; @@ -107,7 +107,7 @@ } GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); -@@ -574,14 +610,32 @@ +@@ -590,14 +626,32 @@ int var8 = var7.length; int var9; @@ -142,7 +142,7 @@ } } -@@ -599,6 +653,14 @@ +@@ -615,6 +669,14 @@ this.drawTexturedModalRect(var11, var8 + (int)((float)(var9 - var8 - 17) * this.currentScroll), 232 + (this.needsScrollBars() ? 0 : 12), 0, 12, 15); } @@ -157,7 +157,7 @@ this.renderCreativeTab(var5); if (var5 == CreativeTabs.tabInventory) -@@ -609,6 +671,15 @@ +@@ -625,6 +687,15 @@ protected boolean func_74232_a(CreativeTabs par1CreativeTabs, int par2, int par3) { @@ -173,7 +173,7 @@ int var4 = par1CreativeTabs.getTabColumn(); int var5 = 28 * var4; byte var6 = 0; -@@ -723,7 +794,7 @@ +@@ -739,7 +810,7 @@ var8 += 8 + (var3 ? 1 : -1); GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL12.GL_RESCALE_NORMAL); @@ -182,7 +182,7 @@ itemRenderer.renderItemAndEffectIntoGUI(this.fontRenderer, this.mc.renderEngine, var10, var7, var8); itemRenderer.renderItemOverlayIntoGUI(this.fontRenderer, this.mc.renderEngine, var10, var7, var8); GL11.glDisable(GL11.GL_LIGHTING); -@@ -745,6 +816,15 @@ +@@ -761,6 +832,15 @@ { this.mc.displayGuiScreen(new GuiStats(this, this.mc.statFileWriter)); } diff --git a/patches/minecraft/net/minecraft/client/model/ModelBase.java.patch b/patches/minecraft/net/minecraft/client/model/ModelBase.java.patch new file mode 100644 index 0000000000..5694901320 --- /dev/null +++ b/patches/minecraft/net/minecraft/client/model/ModelBase.java.patch @@ -0,0 +1,10 @@ +--- ../src_base/minecraft/net/minecraft/client/model/ModelBase.java ++++ ../src_work/minecraft/net/minecraft/client/model/ModelBase.java +@@ -10,7 +10,6 @@ + import net.minecraft.entity.Entity; + import net.minecraft.entity.EntityLiving; + +-@SideOnly(Side.CLIENT) + public abstract class ModelBase + { + public float onGround; diff --git a/patches/minecraft/net/minecraft/src/ModelBox.java.patch b/patches/minecraft/net/minecraft/client/model/ModelBox.java.patch similarity index 60% rename from patches/minecraft/net/minecraft/src/ModelBox.java.patch rename to patches/minecraft/net/minecraft/client/model/ModelBox.java.patch index 88929aaef8..2871f6c221 100644 --- a/patches/minecraft/net/minecraft/src/ModelBox.java.patch +++ b/patches/minecraft/net/minecraft/client/model/ModelBox.java.patch @@ -1,14 +1,14 @@ ---- ../src_base/minecraft/net/minecraft/src/ModelBox.java -+++ ../src_work/minecraft/net/minecraft/src/ModelBox.java -@@ -3,7 +3,6 @@ - import cpw.mods.fml.common.Side; +--- ../src_base/minecraft/net/minecraft/client/model/ModelBox.java ++++ ../src_work/minecraft/net/minecraft/client/model/ModelBox.java +@@ -4,7 +4,6 @@ import cpw.mods.fml.common.asm.SideOnly; + import net.minecraft.client.renderer.Tessellator; -@SideOnly(Side.CLIENT) public class ModelBox { /** -@@ -95,6 +94,7 @@ +@@ -96,6 +95,7 @@ /** * Draw the six sided box defined by this ModelBox */ diff --git a/patches/minecraft/net/minecraft/src/ModelRenderer.java.patch b/patches/minecraft/net/minecraft/client/model/ModelRenderer.java.patch similarity index 75% rename from patches/minecraft/net/minecraft/src/ModelRenderer.java.patch rename to patches/minecraft/net/minecraft/client/model/ModelRenderer.java.patch index c87f2554b3..198154c5ed 100644 --- a/patches/minecraft/net/minecraft/src/ModelRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/model/ModelRenderer.java.patch @@ -1,14 +1,14 @@ ---- ../src_base/minecraft/net/minecraft/src/ModelRenderer.java -+++ ../src_work/minecraft/net/minecraft/src/ModelRenderer.java -@@ -6,7 +6,6 @@ - import java.util.List; +--- ../src_base/minecraft/net/minecraft/client/model/ModelRenderer.java ++++ ../src_work/minecraft/net/minecraft/client/model/ModelRenderer.java +@@ -8,7 +8,6 @@ + import net.minecraft.client.renderer.Tessellator; import org.lwjgl.opengl.GL11; -@SideOnly(Side.CLIENT) public class ModelRenderer { /** The size of the texture file's width in pixels. */ -@@ -119,7 +118,8 @@ +@@ -121,7 +120,8 @@ this.rotationPointY = par2; this.rotationPointZ = par3; } @@ -18,7 +18,7 @@ public void render(float par1) { if (!this.isHidden) -@@ -202,6 +202,7 @@ +@@ -204,6 +204,7 @@ } } @@ -26,7 +26,7 @@ public void renderWithRotation(float par1) { if (!this.isHidden) -@@ -240,6 +241,7 @@ +@@ -242,6 +243,7 @@ /** * Allows the changing of Angles after a box has been rendered */ @@ -34,7 +34,7 @@ public void postRender(float par1) { if (!this.isHidden) -@@ -284,6 +286,7 @@ +@@ -286,6 +288,7 @@ /** * Compiles a GL display list for this model */ diff --git a/patches/minecraft/net/minecraft/client/model/PositionTextureVertex.java.patch b/patches/minecraft/net/minecraft/client/model/PositionTextureVertex.java.patch new file mode 100644 index 0000000000..a74b56755e --- /dev/null +++ b/patches/minecraft/net/minecraft/client/model/PositionTextureVertex.java.patch @@ -0,0 +1,10 @@ +--- ../src_base/minecraft/net/minecraft/client/model/PositionTextureVertex.java ++++ ../src_work/minecraft/net/minecraft/client/model/PositionTextureVertex.java +@@ -4,7 +4,6 @@ + import cpw.mods.fml.common.asm.SideOnly; + import net.minecraft.util.Vec3; + +-@SideOnly(Side.CLIENT) + public class PositionTextureVertex + { + public Vec3 vector3D; diff --git a/patches/minecraft/net/minecraft/client/model/TexturedQuad.java.patch b/patches/minecraft/net/minecraft/client/model/TexturedQuad.java.patch new file mode 100644 index 0000000000..5b698e8549 --- /dev/null +++ b/patches/minecraft/net/minecraft/client/model/TexturedQuad.java.patch @@ -0,0 +1,10 @@ +--- ../src_base/minecraft/net/minecraft/client/model/TexturedQuad.java ++++ ../src_work/minecraft/net/minecraft/client/model/TexturedQuad.java +@@ -5,7 +5,6 @@ + import net.minecraft.client.renderer.Tessellator; + import net.minecraft.util.Vec3; + +-@SideOnly(Side.CLIENT) + public class TexturedQuad + { + public PositionTextureVertex[] vertexPositions; diff --git a/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch b/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch similarity index 78% rename from patches/minecraft/net/minecraft/src/NetClientHandler.java.patch rename to patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch index eb5d50a5c3..d56c4a636a 100644 --- a/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch +++ b/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch @@ -1,18 +1,18 @@ ---- ../src_base/minecraft/net/minecraft/src/NetClientHandler.java -+++ ../src_work/minecraft/net/minecraft/src/NetClientHandler.java -@@ -22,6 +22,11 @@ - import java.util.Random; - import javax.crypto.SecretKey; - import net.minecraft.client.Minecraft; +--- ../src_base/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java ++++ ../src_work/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java +@@ -159,6 +159,11 @@ + import net.minecraft.world.storage.MapStorage; + import org.lwjgl.input.Keyboard; + +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.event.ClientChatReceivedEvent; +import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.common.MinecraftForge; + - import org.lwjgl.input.Keyboard; - @SideOnly(Side.CLIENT) -@@ -611,7 +616,7 @@ + public class NetClientHandler extends NetHandler + { +@@ -746,7 +751,7 @@ public void handleKickDisconnect(Packet255KickDisconnect par1Packet255KickDisconnect) { @@ -21,10 +21,10 @@ this.disconnected = true; this.mc.loadWorld((WorldClient)null); this.mc.displayGuiScreen(new GuiDisconnected("disconnect.disconnected", "disconnect.genericReason", new Object[] {par1Packet255KickDisconnect.reason})); -@@ -677,7 +682,11 @@ +@@ -811,7 +816,11 @@ public void handleChat(Packet3Chat par1Packet3Chat) { - par1Packet3Chat = FMLNetworkHandler.handleChatMessage(this, par1Packet3Chat); + FMLNetworkHandler.onConnectionClosed(this.netManager, this.getPlayer()); - this.mc.ingameGUI.getChatGUI().printChatMessage(par1Packet3Chat.message); + ClientChatReceivedEvent event = new ClientChatReceivedEvent(par1Packet3Chat.message); + if (!MinecraftForge.EVENT_BUS.post(event) && event.message != null) @@ -34,7 +34,7 @@ } public void handleAnimation(Packet18Animation par1Packet18Animation) -@@ -1059,6 +1068,10 @@ +@@ -1193,6 +1202,10 @@ { var2.readFromNBT(par1Packet132TileEntityData.customParam1); } diff --git a/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch b/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java.patch similarity index 88% rename from patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch rename to patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java.patch index 4323c97bc2..643e3ac923 100644 --- a/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch +++ b/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java.patch @@ -1,16 +1,17 @@ ---- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java -@@ -3,6 +3,9 @@ - import cpw.mods.fml.common.Side; - import cpw.mods.fml.common.asm.SideOnly; - import net.minecraft.client.Minecraft; +--- ../src_base/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java ++++ ../src_work/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java +@@ -20,6 +20,10 @@ + import net.minecraft.world.EnumGameType; + import net.minecraft.world.World; + +import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; - ++ @SideOnly(Side.CLIENT) public class PlayerControllerMP -@@ -105,6 +108,12 @@ + { +@@ -121,6 +125,12 @@ */ public boolean onPlayerDestroyBlock(int par1, int par2, int par3, int par4) { @@ -23,7 +24,7 @@ if (this.currentGameType.isAdventure() && !this.mc.thePlayer.canCurrentToolHarvestBlock(par1, par2, par3)) { return false; -@@ -122,7 +131,7 @@ +@@ -138,7 +148,7 @@ { var5.playAuxSFX(2001, par1, par2, par3, var6.blockID + (var5.getBlockMetadata(par1, par2, par3) << 12)); int var7 = var5.getBlockMetadata(par1, par2, par3); @@ -32,7 +33,7 @@ if (var8) { -@@ -318,6 +327,12 @@ +@@ -334,6 +344,12 @@ float var11 = (float)par8Vec3.zCoord - (float)par6; boolean var12 = false; int var13 = par2World.getBlockId(par4, par5, par6); @@ -45,7 +46,7 @@ if (var13 > 0 && Block.blocksList[var13].onBlockActivated(par2World, par4, par5, par6, par1EntityPlayer, par7, var9, var10, var11)) { -@@ -355,7 +370,15 @@ +@@ -371,7 +387,15 @@ } else { @@ -62,7 +63,7 @@ } } -@@ -377,9 +400,10 @@ +@@ -393,9 +417,10 @@ { par1EntityPlayer.inventory.mainInventory[par1EntityPlayer.inventory.currentItem] = var5; diff --git a/patches/minecraft/net/minecraft/src/WorldClient.java.patch b/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.java.patch similarity index 74% rename from patches/minecraft/net/minecraft/src/WorldClient.java.patch rename to patches/minecraft/net/minecraft/client/multiplayer/WorldClient.java.patch index 54f5541e5a..ec7e05795a 100644 --- a/patches/minecraft/net/minecraft/src/WorldClient.java.patch +++ b/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.java.patch @@ -1,15 +1,16 @@ ---- ../src_base/minecraft/net/minecraft/src/WorldClient.java -+++ ../src_work/minecraft/net/minecraft/src/WorldClient.java -@@ -7,6 +7,8 @@ - import java.util.Random; - import java.util.Set; - import net.minecraft.client.Minecraft; +--- ../src_base/minecraft/net/minecraft/client/multiplayer/WorldClient.java ++++ ../src_work/minecraft/net/minecraft/client/multiplayer/WorldClient.java +@@ -25,6 +25,9 @@ + import net.minecraft.world.chunk.IChunkProvider; + import net.minecraft.world.storage.SaveHandlerMP; + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.world.WorldEvent; - ++ @SideOnly(Side.CLIENT) public class WorldClient extends World -@@ -38,8 +40,11 @@ + { +@@ -55,8 +58,11 @@ super(new SaveHandlerMP(), "MpServer", WorldProvider.getProviderForDimension(par3), par2WorldSettings, par5Profiler); this.sendQueue = par1NetClientHandler; this.difficultySetting = par4; @@ -22,7 +23,7 @@ } /** -@@ -271,6 +276,12 @@ +@@ -288,6 +294,12 @@ */ protected void updateWeather() { diff --git a/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch b/patches/minecraft/net/minecraft/client/particle/EffectRenderer.java.patch similarity index 89% rename from patches/minecraft/net/minecraft/src/EffectRenderer.java.patch rename to patches/minecraft/net/minecraft/client/particle/EffectRenderer.java.patch index a4de8518b8..ed0e2bcb65 100644 --- a/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/particle/EffectRenderer.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java -@@ -3,9 +3,18 @@ +--- ../src_base/minecraft/net/minecraft/client/particle/EffectRenderer.java ++++ ../src_work/minecraft/net/minecraft/client/particle/EffectRenderer.java +@@ -3,7 +3,9 @@ import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; import java.util.ArrayList; @@ -8,18 +8,27 @@ import java.util.List; +import java.util.Map.Entry; import java.util.Random; + import net.minecraft.block.Block; + import net.minecraft.client.renderer.ActiveRenderInfo; +@@ -12,10 +14,17 @@ + import net.minecraft.crash.CrashReport; + import net.minecraft.crash.CrashReportCategory; + import net.minecraft.entity.Entity; ++import net.minecraft.item.Item; + import net.minecraft.util.MathHelper; ++import net.minecraft.util.MovingObjectPosition; + import net.minecraft.util.ReportedException; + import net.minecraft.world.World; + import org.lwjgl.opengl.GL11; + +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.common.ForgeHooks; -+ - import org.lwjgl.opengl.GL11; -+ +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Multimap; @SideOnly(Side.CLIENT) public class EffectRenderer -@@ -18,6 +27,8 @@ +@@ -28,6 +37,8 @@ /** RNG. */ private Random rand = new Random(); @@ -28,7 +37,7 @@ public EffectRenderer(World par1World, RenderEngine par2RenderEngine) { if (par1World != null) -@@ -56,9 +67,13 @@ +@@ -66,9 +77,13 @@ for (int var3 = 0; var3 < this.fxLayers[var1].size(); ++var3) { var2 = (EntityFX)this.fxLayers[var1].get(var3); @@ -45,7 +54,7 @@ { this.fxLayers[var1].remove(var3--); } -@@ -71,6 +86,17 @@ +@@ -81,6 +96,17 @@ var5.addCrashSectionCallable("Last ticked particle", new CallableLastTickedParticle(this, var2)); var5.addCrashSection("Texture index", Integer.valueOf(var1)); throw new ReportedException(var4); @@ -63,7 +72,7 @@ } } } -@@ -120,6 +146,7 @@ +@@ -130,6 +156,7 @@ for (int var11 = 0; var11 < this.fxLayers[var8].size(); ++var11) { EntityFX var12 = (EntityFX)this.fxLayers[var8].get(var11); @@ -71,7 +80,7 @@ var10.setBrightness(var12.getBrightnessForRender(par2)); var12.renderParticle(var10, par2, var3, var7, var4, var5, var6); } -@@ -127,6 +154,27 @@ +@@ -137,6 +164,27 @@ var10.draw(); GL11.glDisable(GL11.GL_BLEND); } @@ -99,7 +108,7 @@ } } -@@ -146,6 +194,7 @@ +@@ -156,6 +204,7 @@ for (int var11 = 0; var11 < this.fxLayers[var9].size(); ++var11) { EntityFX var12 = (EntityFX)this.fxLayers[var9].get(var11); @@ -107,7 +116,7 @@ var10.setBrightness(var12.getBrightnessForRender(par2)); var12.renderParticle(var10, par2, var4, var8, var5, var6, var7); } -@@ -160,13 +209,15 @@ +@@ -170,13 +219,15 @@ { this.fxLayers[var2].clear(); } @@ -126,7 +135,7 @@ byte var7 = 4; for (int var8 = 0; var8 < var7; ++var8) -@@ -179,7 +230,7 @@ +@@ -189,7 +240,7 @@ double var13 = (double)par2 + ((double)var9 + 0.5D) / (double)var7; double var15 = (double)par3 + ((double)var10 + 0.5D) / (double)var7; int var17 = this.rand.nextInt(6); @@ -135,7 +144,7 @@ } } } -@@ -231,12 +282,60 @@ +@@ -241,12 +292,60 @@ var8 = (double)par1 + var6.getBlockBoundsMaxX() + (double)var7; } diff --git a/patches/minecraft/net/minecraft/src/EntityDiggingFX.java.patch b/patches/minecraft/net/minecraft/client/particle/EntityDiggingFX.java.patch similarity index 85% rename from patches/minecraft/net/minecraft/src/EntityDiggingFX.java.patch rename to patches/minecraft/net/minecraft/client/particle/EntityDiggingFX.java.patch index 9fb089bcf0..9c29c2e06f 100644 --- a/patches/minecraft/net/minecraft/src/EntityDiggingFX.java.patch +++ b/patches/minecraft/net/minecraft/client/particle/EntityDiggingFX.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/minecraft/net/minecraft/src/EntityDiggingFX.java -+++ ../src_work/minecraft/net/minecraft/src/EntityDiggingFX.java -@@ -7,20 +7,22 @@ +--- ../src_base/minecraft/net/minecraft/client/particle/EntityDiggingFX.java ++++ ../src_work/minecraft/net/minecraft/client/particle/EntityDiggingFX.java +@@ -10,20 +10,22 @@ public class EntityDiggingFX extends EntityFX { private Block blockInstance; diff --git a/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch similarity index 91% rename from patches/minecraft/net/minecraft/src/EntityRenderer.java.patch rename to patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch index eb8bb56bea..b0da4d22f5 100644 --- a/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch @@ -1,18 +1,18 @@ ---- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java -+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java -@@ -7,6 +7,11 @@ - import java.util.List; - import java.util.Random; - import net.minecraft.client.Minecraft; +--- ../src_base/minecraft/net/minecraft/client/renderer/EntityRenderer.java ++++ ../src_work/minecraft/net/minecraft/client/renderer/EntityRenderer.java +@@ -37,6 +37,11 @@ + import org.lwjgl.opengl.GLContext; + import org.lwjgl.util.glu.GLU; + +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.event.DrawBlockHighlightEvent; +import net.minecraftforge.client.event.RenderWorldLastEvent; +import net.minecraftforge.common.MinecraftForge; + - import org.lwjgl.input.Mouse; - import org.lwjgl.opengl.Display; - import org.lwjgl.opengl.GL11; -@@ -309,8 +314,15 @@ + @SideOnly(Side.CLIENT) + public class EntityRenderer + { +@@ -333,8 +338,15 @@ */ private void updateFovModifierHand() { @@ -30,7 +30,7 @@ this.fovModifierHandPrev = this.fovModifierHand; this.fovModifierHand += (this.fovMultiplierTemp - this.fovModifierHand) * 0.5F; } -@@ -326,7 +338,7 @@ +@@ -350,7 +362,7 @@ } else { @@ -39,7 +39,7 @@ float var4 = 70.0F; if (par2) -@@ -413,15 +425,7 @@ +@@ -437,15 +449,7 @@ if (!this.mc.gameSettings.debugCamEnable) { @@ -56,7 +56,7 @@ GL11.glRotatef(var2.prevRotationYaw + (var2.rotationYaw - var2.prevRotationYaw) * par1 + 180.0F, 0.0F, -1.0F, 0.0F); GL11.glRotatef(var2.prevRotationPitch + (var2.rotationPitch - var2.prevRotationPitch) * par1, -1.0F, 0.0F, 0.0F); } -@@ -1112,8 +1116,11 @@ +@@ -1136,8 +1140,11 @@ var17 = (EntityPlayer)var4; GL11.glDisable(GL11.GL_ALPHA_TEST); this.mc.mcProfiler.endStartSection("outline"); @@ -70,7 +70,7 @@ GL11.glEnable(GL11.GL_ALPHA_TEST); } } -@@ -1177,15 +1184,18 @@ +@@ -1201,15 +1208,18 @@ var17 = (EntityPlayer)var4; GL11.glDisable(GL11.GL_ALPHA_TEST); this.mc.mcProfiler.endStartSection("outline"); @@ -92,7 +92,7 @@ GL11.glDisable(GL11.GL_BLEND); this.mc.mcProfiler.endStartSection("weather"); this.renderRainSnow(par1); -@@ -1195,6 +1205,9 @@ +@@ -1219,6 +1229,9 @@ { this.func_82829_a(var5, par1); } diff --git a/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch similarity index 89% rename from patches/minecraft/net/minecraft/src/ItemRenderer.java.patch rename to patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch index ce4567009c..0b9e16cae7 100644 --- a/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch @@ -1,28 +1,35 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java -@@ -7,6 +7,12 @@ +--- ../src_base/minecraft/net/minecraft/client/renderer/ItemRenderer.java ++++ ../src_work/minecraft/net/minecraft/client/renderer/ItemRenderer.java +@@ -15,11 +15,19 @@ + import net.minecraft.entity.EntityLiving; + import net.minecraft.item.EnumAction; + import net.minecraft.item.Item; ++import net.minecraft.item.ItemBlock; ++import net.minecraft.item.ItemMap; + import net.minecraft.item.ItemStack; + import net.minecraft.util.MathHelper; + import net.minecraft.world.storage.MapData; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; - ++ +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.client.MinecraftForgeClient; +import static net.minecraftforge.client.IItemRenderer.ItemRenderType.*; +import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.*; -+ + @SideOnly(Side.CLIENT) public class ItemRenderer - { -@@ -39,27 +45,21 @@ - public void renderItem(EntityLiving par1EntityLiving, ItemStack par2ItemStack, int par3) +@@ -54,27 +62,21 @@ { GL11.glPushMatrix(); -- + - Block var4 = null; - if (par2ItemStack.itemID < Block.blocksList.length) - { - var4 = Block.blocksList[par2ItemStack.itemID]; - } +- - if (var4 != null && RenderBlocks.renderItemIn3d(var4.getRenderType())) - { - GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.mc.renderEngine.getTexture("/terrain.png")); @@ -53,7 +60,7 @@ Tessellator var5 = Tessellator.instance; int var6 = par1EntityLiving.getItemIcon(par2ItemStack, par3); -@@ -265,8 +265,9 @@ +@@ -280,8 +282,9 @@ Render var24; RenderPlayer var26; @@ -65,7 +72,7 @@ GL11.glPushMatrix(); var7 = 0.8F; var20 = var3.getSwingProgress(par1); -@@ -332,11 +333,17 @@ +@@ -347,11 +350,17 @@ var28.addVertexWithUV((double)(128 + var27), (double)(0 - var27), 0.0D, 1.0D, 0.0D); var28.addVertexWithUV((double)(0 - var27), (double)(0 - var27), 0.0D, 0.0D, 0.0D); var28.draw(); @@ -88,7 +95,7 @@ } GL11.glPopMatrix(); -@@ -439,12 +446,15 @@ +@@ -454,12 +463,15 @@ if (var17.getItem().requiresMultipleRenderPasses()) { this.renderItem(var3, var17, 0); diff --git a/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch b/patches/minecraft/net/minecraft/client/renderer/RenderBlocks.java.patch similarity index 93% rename from patches/minecraft/net/minecraft/src/RenderBlocks.java.patch rename to patches/minecraft/net/minecraft/client/renderer/RenderBlocks.java.patch index da4966d19b..9f503d9d10 100644 --- a/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/RenderBlocks.java.patch @@ -1,15 +1,15 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java -@@ -3,6 +3,8 @@ - import cpw.mods.fml.common.Side; - import cpw.mods.fml.common.asm.SideOnly; - import net.minecraft.client.Minecraft; -+import static net.minecraftforge.common.ForgeDirection.*; -+ +--- ../src_base/minecraft/net/minecraft/client/renderer/RenderBlocks.java ++++ ../src_work/minecraft/net/minecraft/client/renderer/RenderBlocks.java +@@ -37,6 +37,8 @@ + import net.minecraft.world.World; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; ++ ++import static net.minecraftforge.common.ForgeDirection.*; -@@ -558,9 +560,8 @@ + @SideOnly(Side.CLIENT) + public class RenderBlocks +@@ -591,9 +593,8 @@ public boolean renderBlockBed(Block par1Block, int par2, int par3, int par4) { Tessellator var5 = Tessellator.instance; @@ -21,7 +21,7 @@ float var9 = 0.5F; float var10 = 1.0F; float var11 = 0.8F; -@@ -569,6 +570,7 @@ +@@ -602,6 +603,7 @@ var5.setBrightness(var25); var5.setColorOpaque_F(var9, var9, var9); int var27 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 0); @@ -29,7 +29,7 @@ int var28 = (var27 & 15) << 4; int var29 = var27 & 240; double var30 = (double)((float)var28 / 256.0F); -@@ -587,6 +589,7 @@ +@@ -620,6 +622,7 @@ var5.setBrightness(par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3 + 1, par4)); var5.setColorOpaque_F(var10, var10, var10); var27 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 1); @@ -37,7 +37,7 @@ var28 = (var27 & 15) << 4; var29 = var27 & 240; var30 = (double)((float)var28 / 256.0F); -@@ -2316,7 +2319,7 @@ +@@ -2349,7 +2352,7 @@ double var28; double var30; @@ -46,7 +46,7 @@ { float var36 = 0.2F; float var19 = 0.0625F; -@@ -2336,7 +2339,7 @@ +@@ -2369,7 +2372,7 @@ var9 = var20; } @@ -55,7 +55,7 @@ { var5.addVertexWithUV((double)((float)par2 + var36), (double)((float)par3 + var17 + var19), (double)(par4 + 1), var11, var13); var5.addVertexWithUV((double)(par2 + 0), (double)((float)(par3 + 0) + var19), (double)(par4 + 1), var11, var15); -@@ -2348,7 +2351,7 @@ +@@ -2381,7 +2384,7 @@ var5.addVertexWithUV((double)((float)par2 + var36), (double)((float)par3 + var17 + var19), (double)(par4 + 1), var11, var13); } @@ -64,7 +64,7 @@ { var5.addVertexWithUV((double)((float)(par2 + 1) - var36), (double)((float)par3 + var17 + var19), (double)(par4 + 0), var9, var13); var5.addVertexWithUV((double)(par2 + 1 - 0), (double)((float)(par3 + 0) + var19), (double)(par4 + 0), var9, var15); -@@ -2360,7 +2363,7 @@ +@@ -2393,7 +2396,7 @@ var5.addVertexWithUV((double)((float)(par2 + 1) - var36), (double)((float)par3 + var17 + var19), (double)(par4 + 0), var9, var13); } @@ -73,7 +73,7 @@ { var5.addVertexWithUV((double)(par2 + 0), (double)((float)par3 + var17 + var19), (double)((float)par4 + var36), var11, var13); var5.addVertexWithUV((double)(par2 + 0), (double)((float)(par3 + 0) + var19), (double)(par4 + 0), var11, var15); -@@ -2372,7 +2375,7 @@ +@@ -2405,7 +2408,7 @@ var5.addVertexWithUV((double)(par2 + 0), (double)((float)par3 + var17 + var19), (double)((float)par4 + var36), var11, var13); } @@ -82,7 +82,7 @@ { var5.addVertexWithUV((double)(par2 + 1), (double)((float)par3 + var17 + var19), (double)((float)(par4 + 1) - var36), var9, var13); var5.addVertexWithUV((double)(par2 + 1), (double)((float)(par3 + 0) + var19), (double)(par4 + 1 - 0), var9, var15); -@@ -2384,7 +2387,7 @@ +@@ -2417,7 +2420,7 @@ var5.addVertexWithUV((double)(par2 + 1), (double)((float)par3 + var17 + var19), (double)((float)(par4 + 1) - var36), var9, var13); } @@ -91,7 +91,7 @@ { var20 = (double)par2 + 0.5D + 0.5D; var22 = (double)par2 + 0.5D - 0.5D; -@@ -4580,7 +4583,7 @@ +@@ -4613,7 +4616,7 @@ var27 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 2); this.renderEastFace(par1Block, (double)par2, (double)par3, (double)par4, var27); @@ -100,7 +100,7 @@ { this.colorRedTopLeft *= par5; this.colorRedBottomLeft *= par5; -@@ -4703,7 +4706,7 @@ +@@ -4736,7 +4739,7 @@ var27 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 3); this.renderWestFace(par1Block, (double)par2, (double)par3, (double)par4, par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 3)); @@ -109,7 +109,7 @@ { this.colorRedTopLeft *= par5; this.colorRedBottomLeft *= par5; -@@ -4826,7 +4829,7 @@ +@@ -4859,7 +4862,7 @@ var27 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 4); this.renderNorthFace(par1Block, (double)par2, (double)par3, (double)par4, var27); @@ -118,7 +118,7 @@ { this.colorRedTopLeft *= par5; this.colorRedBottomLeft *= par5; -@@ -4949,7 +4952,7 @@ +@@ -4982,7 +4985,7 @@ var27 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 5); this.renderSouthFace(par1Block, (double)par2, (double)par3, (double)par4, var27); @@ -127,7 +127,7 @@ { this.colorRedTopLeft *= par5; this.colorRedBottomLeft *= par5; -@@ -5061,7 +5064,7 @@ +@@ -5094,7 +5097,7 @@ var28 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 2); this.renderEastFace(par1Block, (double)par2, (double)par3, (double)par4, var28); @@ -136,7 +136,7 @@ { var8.setColorOpaque_F(var18 * par5, var21 * par6, var24 * par7); this.renderEastFace(par1Block, (double)par2, (double)par3, (double)par4, 38); -@@ -5077,7 +5080,7 @@ +@@ -5110,7 +5113,7 @@ var28 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 3); this.renderWestFace(par1Block, (double)par2, (double)par3, (double)par4, var28); @@ -145,7 +145,7 @@ { var8.setColorOpaque_F(var18 * par5, var21 * par6, var24 * par7); this.renderWestFace(par1Block, (double)par2, (double)par3, (double)par4, 38); -@@ -5093,7 +5096,7 @@ +@@ -5126,7 +5129,7 @@ var28 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 4); this.renderNorthFace(par1Block, (double)par2, (double)par3, (double)par4, var28); @@ -154,7 +154,7 @@ { var8.setColorOpaque_F(var19 * par5, var22 * par6, var25 * par7); this.renderNorthFace(par1Block, (double)par2, (double)par3, (double)par4, 38); -@@ -5109,7 +5112,7 @@ +@@ -5142,7 +5145,7 @@ var28 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 5); this.renderSouthFace(par1Block, (double)par2, (double)par3, (double)par4, var28); diff --git a/patches/minecraft/net/minecraft/src/RenderEngine.java.patch b/patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch similarity index 66% rename from patches/minecraft/net/minecraft/src/RenderEngine.java.patch rename to patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch index aa40a08a55..c8b14acba7 100644 --- a/patches/minecraft/net/minecraft/src/RenderEngine.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch @@ -1,16 +1,15 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderEngine.java -+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java -@@ -20,6 +20,9 @@ - import java.util.logging.Logger; - - import javax.imageio.ImageIO; -+ -+import net.minecraftforge.client.ForgeHooksClient; -+ +--- ../src_base/minecraft/net/minecraft/client/renderer/RenderEngine.java ++++ ../src_work/minecraft/net/minecraft/client/renderer/RenderEngine.java +@@ -29,6 +29,8 @@ + import net.minecraft.util.IntHashMap; import org.lwjgl.opengl.GL11; - import cpw.mods.fml.client.TextureFXManager; -@@ -167,6 +170,7 @@ ++import net.minecraftforge.client.ForgeHooksClient; ++ + @SideOnly(Side.CLIENT) + public class RenderEngine + { +@@ -172,6 +174,7 @@ try { @@ -18,7 +17,7 @@ this.singleIntBuffer.clear(); GLAllocation.generateTextureNames(this.singleIntBuffer); int var3 = this.singleIntBuffer.get(0); -@@ -210,6 +214,7 @@ +@@ -215,6 +218,7 @@ } this.textureMap.put(par1Str, Integer.valueOf(var3)); diff --git a/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch b/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch similarity index 89% rename from patches/minecraft/net/minecraft/src/RenderGlobal.java.patch rename to patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch index 63a42c3648..d524fadffe 100644 --- a/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch @@ -1,17 +1,15 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java -+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java -@@ -11,7 +11,10 @@ - import java.util.List; - import java.util.Map; - import java.util.Random; -+ - import net.minecraft.client.Minecraft; -+import net.minecraftforge.client.SkyProvider; -+ +--- ../src_base/minecraft/net/minecraft/client/renderer/RenderGlobal.java ++++ ../src_work/minecraft/net/minecraft/client/renderer/RenderGlobal.java +@@ -61,6 +61,8 @@ import org.lwjgl.opengl.ARBOcclusionQuery; import org.lwjgl.opengl.GL11; -@@ -882,6 +885,12 @@ ++import net.minecraftforge.client.SkyProvider; ++ + @SideOnly(Side.CLIENT) + public class RenderGlobal implements IWorldAccess + { +@@ -928,6 +930,12 @@ */ public void renderSky(float par1) { @@ -24,7 +22,7 @@ if (this.mc.theWorld.provider.dimensionId == 1) { GL11.glDisable(GL11.GL_FOG); -@@ -1120,6 +1129,13 @@ +@@ -1166,6 +1174,13 @@ public void renderClouds(float par1) { @@ -38,7 +36,7 @@ if (this.mc.theWorld.provider.isSurfaceWorld()) { if (this.mc.gameSettings.fancyGraphics) -@@ -1546,6 +1562,11 @@ +@@ -1592,6 +1607,11 @@ } public void drawBlockDamageTexture(Tessellator par1Tessellator, EntityPlayer par2EntityPlayer, float par3) @@ -50,7 +48,7 @@ { double var4 = par2EntityPlayer.lastTickPosX + (par2EntityPlayer.posX - par2EntityPlayer.lastTickPosX) * (double)par3; double var6 = par2EntityPlayer.lastTickPosY + (par2EntityPlayer.posY - par2EntityPlayer.lastTickPosY) * (double)par3; -@@ -1817,6 +1838,7 @@ +@@ -1863,6 +1883,7 @@ double var17 = this.mc.renderViewEntity.posY - par4; double var19 = this.mc.renderViewEntity.posZ - par6; EntityFX var21 = null; @@ -58,7 +56,7 @@ if (par1Str.equals("hugeexplosion")) { -@@ -1949,6 +1971,7 @@ +@@ -1995,6 +2016,7 @@ else if (par1Str.equals("snowballpoof")) { var21 = new EntityBreakingFX(this.theWorld, par2, par4, par6, Item.snowball); @@ -66,7 +64,7 @@ } else if (par1Str.equals("dripWater")) { -@@ -1965,6 +1988,7 @@ +@@ -2011,6 +2033,7 @@ else if (par1Str.equals("slime")) { var21 = new EntityBreakingFX(this.theWorld, par2, par4, par6, Item.slimeBall); @@ -74,7 +72,7 @@ } else if (par1Str.equals("heart")) { -@@ -1986,6 +2010,7 @@ +@@ -2032,6 +2055,7 @@ { int var27 = Integer.parseInt(par1Str.substring(par1Str.indexOf("_") + 1)); var21 = new EntityBreakingFX(this.theWorld, par2, par4, par6, par8, par10, par12, Item.itemsList[var27]); @@ -82,7 +80,7 @@ } else if (par1Str.startsWith("tilecrack_")) { -@@ -1993,11 +2018,12 @@ +@@ -2039,11 +2063,12 @@ int var25 = Integer.parseInt(var28[1]); int var26 = Integer.parseInt(var28[2]); var21 = (new EntityDiggingFX(this.theWorld, par2, par4, par6, par8, par10, par12, Block.blocksList[var25], 0, var26)).func_90019_g(var26); diff --git a/patches/minecraft/net/minecraft/src/Tessellator.java.patch b/patches/minecraft/net/minecraft/client/renderer/Tessellator.java.patch similarity index 97% rename from patches/minecraft/net/minecraft/src/Tessellator.java.patch rename to patches/minecraft/net/minecraft/client/renderer/Tessellator.java.patch index 7fcb3a1a32..29511973eb 100644 --- a/patches/minecraft/net/minecraft/src/Tessellator.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/Tessellator.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/Tessellator.java -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java +--- ../src_base/minecraft/net/minecraft/client/renderer/Tessellator.java ++++ ../src_work/minecraft/net/minecraft/client/renderer/Tessellator.java @@ -7,6 +7,8 @@ import java.nio.FloatBuffer; import java.nio.IntBuffer; diff --git a/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/WorldRenderer.java.patch similarity index 91% rename from patches/minecraft/net/minecraft/src/WorldRenderer.java.patch rename to patches/minecraft/net/minecraft/client/renderer/WorldRenderer.java.patch index 4b41250340..9b0c333141 100644 --- a/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/WorldRenderer.java.patch @@ -1,16 +1,14 @@ ---- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java -@@ -5,6 +5,9 @@ - import java.util.ArrayList; - import java.util.HashSet; - import java.util.List; -+ -+import net.minecraftforge.client.ForgeHooksClient; -+ +--- ../src_base/minecraft/net/minecraft/client/renderer/WorldRenderer.java ++++ ../src_work/minecraft/net/minecraft/client/renderer/WorldRenderer.java +@@ -17,13 +17,15 @@ + import net.minecraft.world.chunk.Chunk; import org.lwjgl.opengl.GL11; ++import net.minecraftforge.client.ForgeHooksClient; ++ @SideOnly(Side.CLIENT) -@@ -13,7 +16,7 @@ + public class WorldRenderer + { /** Reference to the World object. */ public World worldObj; private int glRenderList = -1; @@ -19,7 +17,7 @@ public static int chunksUpdated = 0; public int posX; public int posY; -@@ -182,15 +185,16 @@ +@@ -192,15 +194,16 @@ GL11.glTranslatef(-8.0F, -8.0F, -8.0F); GL11.glScalef(var19, var19, var19); GL11.glTranslatef(8.0F, 8.0F, 8.0F); @@ -39,7 +37,7 @@ { TileEntity var20 = var9.getBlockTileEntity(var17, var15, var16); -@@ -202,14 +206,17 @@ +@@ -212,14 +215,17 @@ int var24 = var23.getRenderBlockPass(); @@ -60,7 +58,7 @@ } } } -@@ -218,10 +225,11 @@ +@@ -228,10 +234,11 @@ if (var14) { diff --git a/patches/minecraft/net/minecraft/src/RenderBiped.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RenderBiped.java.patch similarity index 85% rename from patches/minecraft/net/minecraft/src/RenderBiped.java.patch rename to patches/minecraft/net/minecraft/client/renderer/entity/RenderBiped.java.patch index 7b4cfed7d1..62f49e873d 100644 --- a/patches/minecraft/net/minecraft/src/RenderBiped.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderBiped.java.patch @@ -1,8 +1,12 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderBiped.java -+++ ../src_work/minecraft/net/minecraft/src/RenderBiped.java -@@ -3,6 +3,11 @@ - import cpw.mods.fml.common.Side; - import cpw.mods.fml.common.asm.SideOnly; +--- ../src_base/minecraft/net/minecraft/client/renderer/entity/RenderBiped.java ++++ ../src_work/minecraft/net/minecraft/client/renderer/entity/RenderBiped.java +@@ -11,9 +11,15 @@ + import net.minecraft.entity.EntityLiving; + import net.minecraft.item.EnumArmorMaterial; + import net.minecraft.item.Item; ++import net.minecraft.item.ItemBlock; + import net.minecraft.item.ItemArmor; + import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; +import static net.minecraftforge.client.IItemRenderer.ItemRenderType.EQUIPPED; +import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.BLOCK_3D; @@ -12,7 +16,7 @@ @SideOnly(Side.CLIENT) public class RenderBiped extends RenderLiving -@@ -48,7 +53,7 @@ +@@ -59,7 +65,7 @@ if (var5 instanceof ItemArmor) { ItemArmor var6 = (ItemArmor)var5; @@ -21,7 +25,7 @@ ModelBiped var7 = par2 == 2 ? this.field_82425_h : this.field_82423_g; var7.bipedHead.showModel = par2 == 0; var7.bipedHeadwear.showModel = par2 == 0; -@@ -163,9 +168,12 @@ +@@ -174,9 +180,12 @@ GL11.glPushMatrix(); this.modelBipedMain.bipedHead.postRender(0.0625F); @@ -37,7 +41,7 @@ { var6 = 0.625F; GL11.glTranslatef(0.0F, -0.25F, 0.0F); -@@ -207,7 +215,10 @@ +@@ -218,7 +227,10 @@ this.modelBipedMain.bipedRightArm.postRender(0.0625F); GL11.glTranslatef(-0.0625F, 0.4375F, 0.0625F); @@ -49,7 +53,7 @@ { var6 = 0.5F; GL11.glTranslatef(0.0F, 0.1875F, -0.3125F); -@@ -254,7 +265,10 @@ +@@ -265,7 +277,10 @@ if (var4.getItem().requiresMultipleRenderPasses()) { diff --git a/patches/minecraft/net/minecraft/src/RenderItem.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.java.patch similarity index 89% rename from patches/minecraft/net/minecraft/src/RenderItem.java.patch rename to patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.java.patch index 6827aa1053..4abbf075e8 100644 --- a/patches/minecraft/net/minecraft/src/RenderItem.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.java.patch @@ -1,15 +1,21 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderItem.java -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java -@@ -4,6 +4,8 @@ - import cpw.mods.fml.common.asm.SideOnly; - import java.util.Random; - import net.minecraft.client.Minecraft; -+import net.minecraftforge.client.ForgeHooksClient; -+ +--- ../src_base/minecraft/net/minecraft/client/renderer/entity/RenderItem.java ++++ ../src_work/minecraft/net/minecraft/client/renderer/entity/RenderItem.java +@@ -12,11 +12,14 @@ + import net.minecraft.entity.Entity; + import net.minecraft.entity.item.EntityItem; + import net.minecraft.item.Item; ++import net.minecraft.item.ItemBlock; + import net.minecraft.item.ItemStack; + import net.minecraft.util.MathHelper; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -@@ -58,13 +60,16 @@ ++import net.minecraftforge.client.ForgeHooksClient; ++ + @SideOnly(Side.CLIENT) + public class RenderItem extends Render + { +@@ -68,13 +71,16 @@ GL11.glTranslatef((float)par2, (float)par4 + var11, (float)par6); GL11.glEnable(GL12.GL_RESCALE_NORMAL); @@ -28,7 +34,7 @@ { GL11.glRotatef(var12, 0.0F, 1.0F, 0.0F); -@@ -75,9 +80,9 @@ +@@ -85,9 +91,9 @@ GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); } @@ -40,7 +46,7 @@ if (var16 == 1 || var16 == 19 || var16 == 12 || var16 == 2) { -@@ -99,7 +104,7 @@ +@@ -109,7 +115,7 @@ } var24 = 1.0F; @@ -49,7 +55,7 @@ GL11.glPopMatrix(); } } -@@ -121,11 +126,12 @@ +@@ -131,11 +137,12 @@ GL11.glScalef(0.5F, 0.5F, 0.5F); } @@ -67,7 +73,7 @@ var17 = 1.0F; if (this.field_77024_a) -@@ -155,14 +161,7 @@ +@@ -165,14 +172,7 @@ var15 = var10.getIconIndex(); @@ -83,7 +89,7 @@ if (this.field_77024_a) { -@@ -231,10 +230,10 @@ +@@ -241,10 +241,10 @@ float var13; float var16; @@ -97,7 +103,7 @@ GL11.glPushMatrix(); GL11.glTranslatef((float)(par4 - 2), (float)(par5 + 3), -3.0F + this.zLevel); GL11.glScalef(10.0F, 10.0F, 10.0F); -@@ -265,11 +264,11 @@ +@@ -275,11 +275,11 @@ if (Item.itemsList[var6].requiresMultipleRenderPasses()) { GL11.glDisable(GL11.GL_LIGHTING); @@ -114,7 +120,7 @@ int var11 = Item.itemsList[var6].getColorFromItemStack(par3ItemStack, var9); var12 = (float)(var11 >> 16 & 255) / 255.0F; var13 = (float)(var11 >> 8 & 255) / 255.0F; -@@ -289,14 +288,7 @@ +@@ -299,14 +299,7 @@ { GL11.glDisable(GL11.GL_LIGHTING); @@ -130,7 +136,7 @@ var9 = Item.itemsList[var6].getColorFromItemStack(par3ItemStack, 0); float var17 = (float)(var9 >> 16 & 255) / 255.0F; -@@ -323,7 +315,10 @@ +@@ -333,7 +326,10 @@ { if (par3ItemStack != null) { diff --git a/patches/minecraft/net/minecraft/src/RenderManager.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.java.patch similarity index 85% rename from patches/minecraft/net/minecraft/src/RenderManager.java.patch rename to patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.java.patch index 039f17d7f3..3c1a699be2 100644 --- a/patches/minecraft/net/minecraft/src/RenderManager.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderManager.java -+++ ../src_work/minecraft/net/minecraft/src/RenderManager.java -@@ -133,12 +133,14 @@ +--- ../src_base/minecraft/net/minecraft/client/renderer/entity/RenderManager.java ++++ ../src_work/minecraft/net/minecraft/client/renderer/entity/RenderManager.java +@@ -211,12 +211,14 @@ if (par4EntityLiving.isPlayerSleeping()) { diff --git a/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java.patch similarity index 86% rename from patches/minecraft/net/minecraft/src/RenderPlayer.java.patch rename to patches/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java.patch index 55f37d42cb..a34cf0129b 100644 --- a/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java.patch @@ -1,19 +1,24 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java -@@ -3,6 +3,12 @@ - import cpw.mods.fml.common.Side; - import cpw.mods.fml.common.asm.SideOnly; - import net.minecraft.client.Minecraft; +--- ../src_base/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java ++++ ../src_work/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java +@@ -16,10 +16,17 @@ + import net.minecraft.item.EnumAction; + import net.minecraft.item.EnumArmorMaterial; + import net.minecraft.item.Item; ++import net.minecraft.item.ItemBlock; + import net.minecraft.item.ItemArmor; + import net.minecraft.item.ItemStack; + import net.minecraft.util.MathHelper; + import org.lwjgl.opengl.GL11; ++ +import static net.minecraftforge.client.IItemRenderer.ItemRenderType.*; +import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.*; +import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraftforge.client.ForgeHooksClient; -+ - import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -@@ -12,6 +18,8 @@ + public class RenderPlayer extends RenderLiving +@@ -28,6 +35,8 @@ private ModelBiped modelArmorChestplate; private ModelBiped modelArmor; public static String[] armorFilenamePrefix = new String[] {"cloth", "chain", "iron", "diamond", "gold"}; @@ -22,7 +27,7 @@ public RenderPlayer() { -@@ -35,7 +43,7 @@ +@@ -51,7 +60,7 @@ if (var5 instanceof ItemArmor) { ItemArmor var6 = (ItemArmor)var5; @@ -31,7 +36,7 @@ ModelBiped var7 = par2 == 2 ? this.modelArmor : this.modelArmorChestplate; var7.bipedHead.showModel = par2 == 0; var7.bipedHeadwear.showModel = par2 == 0; -@@ -104,7 +112,7 @@ +@@ -120,7 +129,7 @@ if (var5 instanceof ItemArmor) { ItemArmor var6 = (ItemArmor)var5; @@ -40,7 +45,7 @@ float var7 = 1.0F; GL11.glColor3f(var7, var7, var7); } -@@ -156,7 +164,7 @@ +@@ -172,7 +181,7 @@ float var8 = 1.6F; float var9 = 0.016666668F * var8; double var10 = par1EntityPlayer.getDistanceSqToEntity(this.renderManager.livingPlayer); @@ -49,7 +54,7 @@ if (var10 < (double)(var12 * var12)) { -@@ -223,9 +231,12 @@ +@@ -239,9 +248,12 @@ this.modelBipedMain.bipedHead.postRender(0.0625F); float var5; @@ -65,7 +70,7 @@ { var5 = 0.625F; GL11.glTranslatef(0.0F, -0.25F, 0.0F); -@@ -343,7 +354,10 @@ +@@ -359,7 +371,10 @@ var23 = var21.getItemUseAction(); } @@ -77,7 +82,7 @@ { var7 = 0.5F; GL11.glTranslatef(0.0F, 0.1875F, -0.3125F); -@@ -400,7 +414,7 @@ +@@ -416,7 +431,7 @@ if (var21.getItem().requiresMultipleRenderPasses()) { diff --git a/patches/minecraft/net/minecraft/src/RenderSnowMan.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSnowMan.java.patch similarity index 68% rename from patches/minecraft/net/minecraft/src/RenderSnowMan.java.patch rename to patches/minecraft/net/minecraft/client/renderer/entity/RenderSnowMan.java.patch index 33d1b9cdd6..6799dcd770 100644 --- a/patches/minecraft/net/minecraft/src/RenderSnowMan.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSnowMan.java.patch @@ -1,16 +1,21 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderSnowMan.java -+++ ../src_work/minecraft/net/minecraft/src/RenderSnowMan.java -@@ -1,4 +1,9 @@ - package net.minecraft.src; +--- ../src_base/minecraft/net/minecraft/client/renderer/entity/RenderSnowMan.java ++++ ../src_work/minecraft/net/minecraft/client/renderer/entity/RenderSnowMan.java +@@ -7,8 +7,14 @@ + import net.minecraft.client.renderer.RenderBlocks; + import net.minecraft.entity.EntityLiving; + import net.minecraft.entity.monster.EntitySnowman; ++import net.minecraft.item.ItemBlock; + import net.minecraft.item.ItemStack; + import org.lwjgl.opengl.GL11; + +import net.minecraftforge.client.IItemRenderer; +import static net.minecraftforge.client.IItemRenderer.ItemRenderType.*; +import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.*; +import net.minecraftforge.client.MinecraftForgeClient; - import cpw.mods.fml.common.Side; - import cpw.mods.fml.common.asm.SideOnly; -@@ -25,12 +30,15 @@ + @SideOnly(Side.CLIENT) + public class RenderSnowMan extends RenderLiving +@@ -31,12 +37,15 @@ super.renderEquippedItems(par1EntitySnowman, par2); ItemStack var3 = new ItemStack(Block.pumpkin, 1); diff --git a/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererPiston.java.patch similarity index 68% rename from patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch rename to patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererPiston.java.patch index f89fe34dd2..83793e2746 100644 --- a/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererPiston.java.patch @@ -1,15 +1,15 @@ ---- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java -+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java -@@ -3,6 +3,8 @@ - import cpw.mods.fml.common.Side; - import cpw.mods.fml.common.asm.SideOnly; - import net.minecraft.client.Minecraft; -+import net.minecraftforge.client.ForgeHooksClient; -+ +--- ../src_base/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererPiston.java ++++ ../src_work/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererPiston.java +@@ -12,6 +12,8 @@ + import net.minecraft.tileentity.TileEntityPiston; + import net.minecraft.world.World; import org.lwjgl.opengl.GL11; ++ ++import net.minecraftforge.client.ForgeHooksClient; @SideOnly(Side.CLIENT) -@@ -33,6 +35,7 @@ + public class TileEntityRendererPiston extends TileEntitySpecialRenderer +@@ -41,6 +43,7 @@ GL11.glShadeModel(GL11.GL_FLAT); } @@ -17,7 +17,7 @@ var10.startDrawingQuads(); var10.setTranslation((double)((float)par2 - (float)par1TileEntityPiston.xCoord + par1TileEntityPiston.getOffsetX(par8)), (double)((float)par4 - (float)par1TileEntityPiston.yCoord + par1TileEntityPiston.getOffsetY(par8)), (double)((float)par6 - (float)par1TileEntityPiston.zCoord + par1TileEntityPiston.getOffsetZ(par8))); var10.setColorOpaque(1, 1, 1); -@@ -56,6 +59,7 @@ +@@ -64,6 +67,7 @@ var10.setTranslation(0.0D, 0.0D, 0.0D); var10.draw(); diff --git a/patches/common/net/minecraft/src/CommandHandler.java.patch b/patches/minecraft/net/minecraft/command/CommandHandler.java.patch similarity index 79% rename from patches/common/net/minecraft/src/CommandHandler.java.patch rename to patches/minecraft/net/minecraft/command/CommandHandler.java.patch index 81523c3e7c..7b5a80b946 100644 --- a/patches/common/net/minecraft/src/CommandHandler.java.patch +++ b/patches/minecraft/net/minecraft/command/CommandHandler.java.patch @@ -1,8 +1,8 @@ ---- ../src_base/common/net/minecraft/src/CommandHandler.java -+++ ../src_work/common/net/minecraft/src/CommandHandler.java -@@ -9,6 +9,9 @@ - import java.util.Set; +--- ../src_base/minecraft/net/minecraft/command/CommandHandler.java ++++ ../src_work/minecraft/net/minecraft/command/CommandHandler.java +@@ -10,6 +10,9 @@ import java.util.Map.Entry; + import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.CommandEvent; @@ -10,7 +10,7 @@ public class CommandHandler implements ICommandManager { /** Map of Strings to the ICommand objects they represent */ -@@ -39,6 +42,16 @@ +@@ -40,6 +43,16 @@ if (var5.canCommandSenderUseCommand(par1ICommandSender)) { diff --git a/patches/minecraft/net/minecraft/crash/CallableSuspiciousClasses.java.patch b/patches/minecraft/net/minecraft/crash/CallableSuspiciousClasses.java.patch new file mode 100644 index 0000000000..44ee2ec9db --- /dev/null +++ b/patches/minecraft/net/minecraft/crash/CallableSuspiciousClasses.java.patch @@ -0,0 +1,10 @@ +--- ../src_base/minecraft/net/minecraft/crash/CallableSuspiciousClasses.java ++++ ../src_work/minecraft/net/minecraft/crash/CallableSuspiciousClasses.java +@@ -130,6 +130,6 @@ + + public Object call() + { +- return "FML is installed"; ++ return "FML and Forge are installed"; + } + } diff --git a/patches/common/net/minecraft/src/CreativeTabs.java.patch b/patches/minecraft/net/minecraft/creativetab/CreativeTabs.java.patch similarity index 88% rename from patches/common/net/minecraft/src/CreativeTabs.java.patch rename to patches/minecraft/net/minecraft/creativetab/CreativeTabs.java.patch index a31ac9e533..8709fc6aa8 100644 --- a/patches/common/net/minecraft/src/CreativeTabs.java.patch +++ b/patches/minecraft/net/minecraft/creativetab/CreativeTabs.java.patch @@ -1,12 +1,14 @@ ---- ../src_base/common/net/minecraft/src/CreativeTabs.java -+++ ../src_work/common/net/minecraft/src/CreativeTabs.java -@@ -2,11 +2,13 @@ +--- ../src_base/minecraft/net/minecraft/creativetab/CreativeTabs.java ++++ ../src_work/minecraft/net/minecraft/creativetab/CreativeTabs.java +@@ -2,13 +2,15 @@ import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; -+ +import java.util.Arrays; import java.util.List; + import net.minecraft.item.Item; ++import net.minecraft.item.ItemStack; + import net.minecraft.util.StringTranslate; public class CreativeTabs { @@ -15,7 +17,7 @@ public static final CreativeTabs tabBlock = new CreativeTabBlock(0, "buildingBlocks"); public static final CreativeTabs tabDecorations = new CreativeTabDeco(1, "decorations"); public static final CreativeTabs tabRedstone = new CreativeTabRedstone(2, "redstone"); -@@ -29,8 +31,22 @@ +@@ -31,8 +33,22 @@ /** Whether to draw the title in the foreground of the creative GUI */ private boolean drawTitle = true; @@ -38,7 +40,7 @@ this.tabIndex = par1; this.tabLabel = par2Str; creativeTabArray[par1] = this; -@@ -117,6 +133,10 @@ +@@ -119,6 +135,10 @@ */ public int getTabColumn() { @@ -49,7 +51,7 @@ return this.tabIndex % 6; } -@@ -127,6 +147,10 @@ +@@ -129,6 +149,10 @@ */ public boolean isTabInFirstRow() { @@ -60,7 +62,7 @@ return this.tabIndex < 6; } -@@ -144,10 +168,40 @@ +@@ -146,10 +170,40 @@ { Item var5 = var2[var4]; diff --git a/patches/common/net/minecraft/src/Enchantment.java.patch b/patches/minecraft/net/minecraft/enchantment/Enchantment.java.patch similarity index 57% rename from patches/common/net/minecraft/src/Enchantment.java.patch rename to patches/minecraft/net/minecraft/enchantment/Enchantment.java.patch index 13e00fad82..80010c33d7 100644 --- a/patches/common/net/minecraft/src/Enchantment.java.patch +++ b/patches/minecraft/net/minecraft/enchantment/Enchantment.java.patch @@ -1,6 +1,14 @@ ---- ../src_base/common/net/minecraft/src/Enchantment.java -+++ ../src_work/common/net/minecraft/src/Enchantment.java -@@ -191,4 +191,14 @@ +--- ../src_base/minecraft/net/minecraft/enchantment/Enchantment.java ++++ ../src_work/minecraft/net/minecraft/enchantment/Enchantment.java +@@ -1,6 +1,7 @@ + package net.minecraft.enchantment; + + import net.minecraft.entity.EntityLiving; ++import net.minecraft.item.ItemStack; + import net.minecraft.util.DamageSource; + import net.minecraft.util.StatCollector; + +@@ -195,4 +196,14 @@ String var2 = StatCollector.translateToLocal(this.getName()); return var2 + " " + StatCollector.translateToLocal("enchantment.level." + par1); } diff --git a/patches/common/net/minecraft/src/EnchantmentHelper.java.patch b/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.java.patch similarity index 64% rename from patches/common/net/minecraft/src/EnchantmentHelper.java.patch rename to patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.java.patch index dbb1b56fba..1220823fcc 100644 --- a/patches/common/net/minecraft/src/EnchantmentHelper.java.patch +++ b/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/EnchantmentHelper.java -+++ ../src_work/common/net/minecraft/src/EnchantmentHelper.java -@@ -411,7 +411,7 @@ +--- ../src_base/minecraft/net/minecraft/enchantment/EnchantmentHelper.java ++++ ../src_work/minecraft/net/minecraft/enchantment/EnchantmentHelper.java +@@ -418,7 +418,7 @@ { Enchantment var7 = var4[var6]; diff --git a/patches/common/net/minecraft/src/Entity.java.patch b/patches/minecraft/net/minecraft/entity/Entity.java.patch similarity index 80% rename from patches/common/net/minecraft/src/Entity.java.patch rename to patches/minecraft/net/minecraft/entity/Entity.java.patch index e4c70d1d04..fea67b43b5 100644 --- a/patches/common/net/minecraft/src/Entity.java.patch +++ b/patches/minecraft/net/minecraft/entity/Entity.java.patch @@ -1,15 +1,39 @@ ---- ../src_base/common/net/minecraft/src/Entity.java -+++ ../src_work/common/net/minecraft/src/Entity.java -@@ -4,6 +4,8 @@ +--- ../src_base/minecraft/net/minecraft/entity/Entity.java ++++ ../src_work/minecraft/net/minecraft/entity/Entity.java +@@ -2,8 +2,10 @@ + + import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; ++import java.util.ArrayList; import java.util.List; import java.util.Random; +import java.util.UUID; -+import java.util.ArrayList; - import net.minecraft.server.MinecraftServer; - - public abstract class Entity -@@ -197,6 +199,11 @@ + import net.minecraft.block.Block; + import net.minecraft.block.BlockFluid; + import net.minecraft.block.StepSound; +@@ -11,8 +13,13 @@ + import net.minecraft.crash.CrashReport; + import net.minecraft.crash.CrashReportCategory; + import net.minecraft.entity.effect.EntityLightningBolt; ++import net.minecraft.entity.item.EntityBoat; + import net.minecraft.entity.item.EntityItem; ++import net.minecraft.entity.item.EntityItemFrame; ++import net.minecraft.entity.item.EntityMinecart; ++import net.minecraft.entity.item.EntityPainting; + import net.minecraft.entity.player.EntityPlayer; ++import net.minecraft.item.Item; + import net.minecraft.item.ItemStack; + import net.minecraft.nbt.NBTTagCompound; + import net.minecraft.nbt.NBTTagDouble; +@@ -23,6 +30,7 @@ + import net.minecraft.util.DamageSource; + import net.minecraft.util.Direction; + import net.minecraft.util.MathHelper; ++import net.minecraft.util.MovingObjectPosition; + import net.minecraft.util.ReportedException; + import net.minecraft.util.StatCollector; + import net.minecraft.util.Vec3; +@@ -221,6 +229,11 @@ protected int field_82152_aq; private boolean field_83001_bt; public EnumEntitySize myEntitySize; @@ -21,7 +45,7 @@ public Entity(World par1World) { -@@ -519,7 +526,7 @@ +@@ -543,7 +556,7 @@ if (!this.worldObj.isRemote) { this.setFlag(0, this.fire > 0); @@ -30,7 +54,7 @@ } this.firstUpdate = false; -@@ -1489,6 +1496,15 @@ +@@ -1513,6 +1526,15 @@ par1NBTTagCompound.setInteger("Dimension", this.dimension); par1NBTTagCompound.setBoolean("Invulnerable", this.field_83001_bt); par1NBTTagCompound.setInteger("PortalCooldown", this.timeUntilPortal); @@ -46,7 +70,7 @@ this.writeEntityToNBT(par1NBTTagCompound); } catch (Throwable var5) -@@ -1543,6 +1559,14 @@ +@@ -1567,6 +1589,14 @@ this.timeUntilPortal = par1NBTTagCompound.getInteger("PortalCooldown"); this.setPosition(this.posX, this.posY, this.posZ); this.setRotation(this.rotationYaw, this.rotationPitch); @@ -61,7 +85,7 @@ this.readEntityFromNBT(par1NBTTagCompound); } catch (Throwable var5) -@@ -1637,7 +1661,14 @@ +@@ -1661,7 +1691,14 @@ { EntityItem var3 = new EntityItem(this.worldObj, this.posX, this.posY + (double)par2, this.posZ, par1ItemStack); var3.delayBeforeCanPickup = 10; @@ -77,7 +101,7 @@ return var3; } -@@ -1996,7 +2027,7 @@ +@@ -2020,7 +2057,7 @@ */ public boolean isRiding() { @@ -86,7 +110,7 @@ } /** -@@ -2331,7 +2362,7 @@ +@@ -2355,7 +2392,7 @@ public float func_82146_a(Explosion par1Explosion, Block par2Block, int par3, int par4, int par5) { @@ -95,7 +119,7 @@ } public int func_82143_as() -@@ -2367,4 +2398,84 @@ +@@ -2391,4 +2428,84 @@ { return this.isBurning(); } diff --git a/patches/common/net/minecraft/src/EntityLiving.java.patch b/patches/minecraft/net/minecraft/entity/EntityLiving.java.patch similarity index 85% rename from patches/common/net/minecraft/src/EntityLiving.java.patch rename to patches/minecraft/net/minecraft/entity/EntityLiving.java.patch index 2c93fe4aae..c9592b78f2 100644 --- a/patches/common/net/minecraft/src/EntityLiving.java.patch +++ b/patches/minecraft/net/minecraft/entity/EntityLiving.java.patch @@ -1,17 +1,26 @@ ---- ../src_base/common/net/minecraft/src/EntityLiving.java -+++ ../src_work/common/net/minecraft/src/EntityLiving.java -@@ -7,6 +7,10 @@ - import java.util.Iterator; - import java.util.List; - import java.util.Random; +--- ../src_base/minecraft/net/minecraft/entity/EntityLiving.java ++++ ../src_work/minecraft/net/minecraft/entity/EntityLiving.java +@@ -20,6 +20,7 @@ + import net.minecraft.entity.item.EntityXPOrb; + import net.minecraft.entity.monster.EntityCreeper; + import net.minecraft.entity.monster.EntityGhast; ++import net.minecraft.entity.passive.EntityPig; + import net.minecraft.entity.passive.EntityWolf; + import net.minecraft.entity.player.EntityPlayer; + import net.minecraft.entity.projectile.EntityArrow; +@@ -45,6 +46,11 @@ + import net.minecraft.world.World; + import net.minecraft.world.WorldServer; + +import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.living.*; +import static net.minecraftforge.event.entity.living.LivingEvent.*; - ++ public abstract class EntityLiving extends Entity { -@@ -344,6 +348,7 @@ + /** +@@ -381,6 +387,7 @@ public void setAttackTarget(EntityLiving par1EntityLiving) { this.attackTarget = par1EntityLiving; @@ -19,7 +28,7 @@ } /** -@@ -440,6 +445,7 @@ +@@ -477,6 +484,7 @@ { this.entityLivingToAttack = par1EntityLiving; this.revengeTimer = this.entityLivingToAttack != null ? 60 : 0; @@ -27,7 +36,7 @@ } protected void entityInit() -@@ -729,6 +735,11 @@ +@@ -766,6 +774,11 @@ */ public void onUpdate() { @@ -39,7 +48,7 @@ super.onUpdate(); if (!this.worldObj.isRemote) -@@ -914,6 +925,11 @@ +@@ -951,6 +964,11 @@ */ public boolean attackEntityFrom(DamageSource par1DamageSource, int par2) { @@ -51,7 +60,7 @@ if (this.func_85032_ar()) { return false; -@@ -1124,6 +1140,11 @@ +@@ -1161,6 +1179,11 @@ { if (!this.func_85032_ar()) { @@ -63,7 +72,7 @@ par2 = this.applyArmorCalculations(par1DamageSource, par2); par2 = this.applyPotionDamageCalculations(par1DamageSource, par2); this.health -= par2; -@@ -1188,6 +1209,11 @@ +@@ -1225,6 +1248,11 @@ */ public void onDeath(DamageSource par1DamageSource) { @@ -75,7 +84,7 @@ Entity var2 = par1DamageSource.getEntity(); if (this.scoreValue >= 0 && var2 != null) -@@ -1210,6 +1236,10 @@ +@@ -1247,6 +1275,10 @@ { var3 = EnchantmentHelper.getLootingModifier((EntityLiving)var2); } @@ -86,7 +95,7 @@ if (!this.isChild() && this.worldObj.getGameRules().getGameRuleBooleanValue("doMobLoot")) { -@@ -1218,7 +1248,7 @@ +@@ -1255,7 +1287,7 @@ if (this.recentlyHit > 0) { @@ -95,7 +104,7 @@ if (var4 < 5) { -@@ -1226,6 +1256,16 @@ +@@ -1263,6 +1295,16 @@ } } } @@ -112,7 +121,7 @@ } this.worldObj.setEntityState(this, (byte)3); -@@ -1269,6 +1309,12 @@ +@@ -1306,6 +1348,12 @@ */ protected void fall(float par1) { @@ -125,7 +134,7 @@ super.fall(par1); int var2 = MathHelper.ceiling_float_int(par1 - 3.0F); -@@ -1471,7 +1517,7 @@ +@@ -1508,7 +1556,7 @@ int var2 = MathHelper.floor_double(this.boundingBox.minY); int var3 = MathHelper.floor_double(this.posZ); int var4 = this.worldObj.getBlockId(var1, var2, var3); @@ -134,7 +143,7 @@ } /** -@@ -1878,6 +1924,7 @@ +@@ -1915,6 +1963,7 @@ } this.isAirBorne = true; @@ -142,7 +151,7 @@ } /** -@@ -2415,8 +2462,6 @@ +@@ -2452,8 +2501,6 @@ return this.getCreatureAttribute() == EnumCreatureAttribute.UNDEAD; } @@ -151,7 +160,7 @@ /** * Remove the speified potion effect from this entity. */ -@@ -2867,4 +2912,42 @@ +@@ -2904,4 +2951,42 @@ { this.dataWatcher.updateObject(10, Byte.valueOf((byte)par1)); } diff --git a/patches/common/net/minecraft/src/EntityDragon.java.patch b/patches/minecraft/net/minecraft/entity/boss/EntityDragon.java.patch similarity index 81% rename from patches/common/net/minecraft/src/EntityDragon.java.patch rename to patches/minecraft/net/minecraft/entity/boss/EntityDragon.java.patch index 427cc93bc8..6c7a261d28 100644 --- a/patches/common/net/minecraft/src/EntityDragon.java.patch +++ b/patches/minecraft/net/minecraft/entity/boss/EntityDragon.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/EntityDragon.java -+++ ../src_work/common/net/minecraft/src/EntityDragon.java -@@ -517,10 +517,11 @@ +--- ../src_base/minecraft/net/minecraft/entity/boss/EntityDragon.java ++++ ../src_work/minecraft/net/minecraft/entity/boss/EntityDragon.java +@@ -530,10 +530,11 @@ for (int var12 = var4; var12 <= var7; ++var12) { int var13 = this.worldObj.getBlockId(var10, var11, var12); diff --git a/patches/common/net/minecraft/src/EntityItem.java.patch b/patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch similarity index 90% rename from patches/common/net/minecraft/src/EntityItem.java.patch rename to patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch index 7cba51deaf..02b8f9b3b7 100644 --- a/patches/common/net/minecraft/src/EntityItem.java.patch +++ b/patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch @@ -1,7 +1,7 @@ ---- ../src_base/common/net/minecraft/src/EntityItem.java -+++ ../src_work/common/net/minecraft/src/EntityItem.java +--- ../src_base/minecraft/net/minecraft/entity/item/EntityItem.java ++++ ../src_work/minecraft/net/minecraft/entity/item/EntityItem.java @@ -1,6 +1,11 @@ - package net.minecraft.src; + package net.minecraft.entity.item; import java.util.Iterator; + @@ -11,20 +11,20 @@ +import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import cpw.mods.fml.common.registry.GameRegistry; - -@@ -20,6 +25,11 @@ - + import net.minecraft.block.Block; +@@ -33,6 +38,11 @@ /** The EntityItem's random initial float height. */ public float hoverStart = (float)(Math.random() * Math.PI * 2.0D); -+ + + /** + * The maximum age of this EntityItem. The item is expired once this is reached. + */ + public int lifespan = 6000; - ++ public EntityItem(World par1World, double par2, double par4, double par6, ItemStack par8ItemStack) { -@@ -32,6 +42,7 @@ + super(par1World); +@@ -44,6 +54,7 @@ this.motionX = (double)((float)(Math.random() * 0.20000000298023224D - 0.10000000149011612D)); this.motionY = 0.20000000298023224D; this.motionZ = (double)((float)(Math.random() * 0.20000000298023224D - 0.10000000149011612D)); @@ -32,7 +32,7 @@ } /** -@@ -112,7 +123,20 @@ +@@ -124,7 +135,20 @@ ++this.age; @@ -54,7 +54,7 @@ { this.setDead(); } -@@ -228,6 +252,7 @@ +@@ -240,6 +264,7 @@ { par1NBTTagCompound.setShort("Health", (short)((byte)this.health)); par1NBTTagCompound.setShort("Age", (short)this.age); @@ -62,7 +62,7 @@ if (this.item != null) { -@@ -245,10 +270,15 @@ +@@ -257,10 +282,15 @@ NBTTagCompound var2 = par1NBTTagCompound.getCompoundTag("Item"); this.item = ItemStack.loadItemStackFromNBT(var2); @@ -79,7 +79,7 @@ } /** -@@ -258,9 +288,21 @@ +@@ -270,9 +300,21 @@ { if (!this.worldObj.isRemote) { diff --git a/patches/common/net/minecraft/src/EntityMinecart.java.patch b/patches/minecraft/net/minecraft/entity/item/EntityMinecart.java.patch similarity index 96% rename from patches/common/net/minecraft/src/EntityMinecart.java.patch rename to patches/minecraft/net/minecraft/entity/item/EntityMinecart.java.patch index d8064d07b5..008d8b5c6a 100644 --- a/patches/common/net/minecraft/src/EntityMinecart.java.patch +++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecart.java.patch @@ -1,22 +1,27 @@ ---- ../src_base/common/net/minecraft/src/EntityMinecart.java -+++ ../src_work/common/net/minecraft/src/EntityMinecart.java -@@ -2,7 +2,15 @@ +--- ../src_base/minecraft/net/minecraft/entity/item/EntityMinecart.java ++++ ../src_work/minecraft/net/minecraft/entity/item/EntityMinecart.java +@@ -2,6 +2,8 @@ import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; + +import java.util.ArrayList; import java.util.List; + import net.minecraft.block.Block; + import net.minecraft.block.BlockRail; +@@ -21,6 +23,11 @@ + import net.minecraft.util.Vec3; + import net.minecraft.world.World; + +import net.minecraftforge.common.IMinecartCollisionHandler; +import net.minecraftforge.common.MinecartRegistry; +import net.minecraftforge.common.MinecraftForge; -+import net.minecraftforge.event.entity.minecart.MinecartCollisionEvent; -+import net.minecraftforge.event.entity.minecart.MinecartInteractEvent; -+import net.minecraftforge.event.entity.minecart.MinecartUpdateEvent; - ++import net.minecraftforge.event.entity.minecart.*; ++ public class EntityMinecart extends Entity implements IInventory { -@@ -33,6 +41,25 @@ + /** Array of item stacks stored in minecart (for storage minecarts). */ +@@ -50,6 +57,25 @@ @SideOnly(Side.CLIENT) protected double velocityZ; @@ -42,7 +47,7 @@ public EntityMinecart(World par1World) { super(par1World); -@@ -44,6 +71,18 @@ +@@ -61,6 +87,18 @@ this.setSize(0.98F, 0.7F); this.yOffset = this.height / 2.0F; this.field_82344_g = par1World != null ? par1World.func_82735_a(this) : null; @@ -61,7 +66,7 @@ } /** -@@ -69,6 +108,10 @@ +@@ -86,6 +124,10 @@ */ public AxisAlignedBB getCollisionBox(Entity par1Entity) { @@ -72,7 +77,7 @@ return par1Entity.canBePushed() ? par1Entity.boundingBox : null; } -@@ -77,6 +120,10 @@ +@@ -94,6 +136,10 @@ */ public AxisAlignedBB getBoundingBox() { @@ -83,7 +88,7 @@ return null; } -@@ -85,7 +132,7 @@ +@@ -102,7 +148,7 @@ */ public boolean canBePushed() { @@ -92,7 +97,7 @@ } public EntityMinecart(World par1World, double par2, double par4, double par6, int par8) -@@ -140,48 +187,7 @@ +@@ -157,48 +203,7 @@ } this.setDead(); @@ -142,7 +147,7 @@ } return true; -@@ -299,7 +305,7 @@ +@@ -316,7 +321,7 @@ this.kill(); } @@ -151,7 +156,7 @@ { this.worldObj.spawnParticle("largesmoke", this.posX, this.posY + 0.8D, this.posZ, 0.0D, 0.0D, 0.0D); } -@@ -343,18 +349,18 @@ +@@ -360,18 +365,18 @@ double var6 = 0.0078125D; int var8 = this.worldObj.getBlockId(var1, var2, var3); @@ -173,7 +178,7 @@ var12 = !var11; } -@@ -368,25 +374,7 @@ +@@ -385,25 +390,7 @@ this.posY = (double)(var2 + 1); } @@ -200,7 +205,7 @@ int[][] var13 = field_70500_g[var10]; double var14 = (double)(var13[1][0] - var13[0][0]); -@@ -419,7 +407,7 @@ +@@ -436,7 +423,7 @@ } } @@ -209,7 +214,7 @@ { var24 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ); -@@ -467,36 +455,8 @@ +@@ -484,36 +471,8 @@ this.posX = var26 + var14 * var24; this.posZ = var28 + var16 * var24; this.setPosition(this.posX, this.posY + (double)this.yOffset, this.posZ); @@ -248,7 +253,7 @@ if (var13[0][1] != 0 && MathHelper.floor_double(this.posX) - var1 == var13[0][0] && MathHelper.floor_double(this.posZ) - var3 == var13[0][2]) { -@@ -507,42 +467,7 @@ +@@ -524,42 +483,7 @@ this.setPosition(this.posX, this.posY + (double)var13[1][1], this.posZ); } @@ -292,7 +297,7 @@ Vec3 var52 = this.func_70489_a(this.posX, this.posY, this.posZ); -@@ -572,30 +497,14 @@ +@@ -589,30 +513,14 @@ double var41; @@ -331,7 +336,7 @@ { var41 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ); -@@ -631,41 +540,7 @@ +@@ -648,41 +556,7 @@ } else { @@ -374,7 +379,7 @@ } this.doBlockCollisions(); -@@ -692,7 +567,18 @@ +@@ -709,7 +583,18 @@ } this.setRotation(this.rotationYaw, this.rotationPitch); @@ -394,7 +399,7 @@ if (var15 != null && !var15.isEmpty()) { -@@ -717,17 +603,8 @@ +@@ -734,17 +619,8 @@ this.riddenByEntity = null; } @@ -414,7 +419,7 @@ } } -@@ -751,12 +628,7 @@ +@@ -768,12 +644,7 @@ } else { @@ -428,7 +433,7 @@ par3 = (double)var10; -@@ -802,13 +674,8 @@ +@@ -819,13 +690,8 @@ if (BlockRail.isRailBlock(var10)) { @@ -443,7 +448,7 @@ if (var11 >= 2 && var11 <= 5) { -@@ -873,13 +740,14 @@ +@@ -890,13 +756,14 @@ { par1NBTTagCompound.setInteger("Type", this.minecartType); @@ -462,7 +467,7 @@ { NBTTagList var2 = new NBTTagList(); -@@ -905,13 +773,21 @@ +@@ -922,13 +789,21 @@ { this.minecartType = par1NBTTagCompound.getInteger("Type"); @@ -488,7 +493,7 @@ { NBTTagList var2 = par1NBTTagCompound.getTagList("Items"); this.cargoItems = new ItemStack[this.getSizeInventory()]; -@@ -940,11 +816,17 @@ +@@ -957,11 +832,17 @@ */ public void applyEntityCollision(Entity par1Entity) { @@ -507,7 +512,7 @@ { par1Entity.mountEntity(this); } -@@ -990,7 +872,7 @@ +@@ -1007,7 +888,7 @@ double var18 = par1Entity.motionX + this.motionX; double var20 = par1Entity.motionZ + this.motionZ; @@ -516,7 +521,7 @@ { this.motionX *= 0.20000000298023224D; this.motionZ *= 0.20000000298023224D; -@@ -998,7 +880,7 @@ +@@ -1015,7 +896,7 @@ par1Entity.motionX *= 0.949999988079071D; par1Entity.motionZ *= 0.949999988079071D; } @@ -525,7 +530,7 @@ { par1Entity.motionX *= 0.20000000298023224D; par1Entity.motionZ *= 0.20000000298023224D; -@@ -1033,7 +915,7 @@ +@@ -1050,7 +931,7 @@ */ public int getSizeInventory() { @@ -534,7 +539,7 @@ } /** -@@ -1136,7 +1018,12 @@ +@@ -1153,7 +1034,12 @@ */ public boolean interact(EntityPlayer par1EntityPlayer) { @@ -548,7 +553,7 @@ { if (this.riddenByEntity != null && this.riddenByEntity instanceof EntityPlayer && this.riddenByEntity != par1EntityPlayer) { -@@ -1148,14 +1035,14 @@ +@@ -1165,14 +1051,14 @@ par1EntityPlayer.mountEntity(this); } } @@ -565,7 +570,7 @@ { ItemStack var2 = par1EntityPlayer.inventory.getCurrentItem(); -@@ -1279,4 +1166,375 @@ +@@ -1296,4 +1182,375 @@ { return this.dataWatcher.getWatchableObjectInt(18); } diff --git a/patches/common/net/minecraft/src/EntityMooshroom.java.patch b/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.java.patch similarity index 89% rename from patches/common/net/minecraft/src/EntityMooshroom.java.patch rename to patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.java.patch index 8ce5e987d8..d374530710 100644 --- a/patches/common/net/minecraft/src/EntityMooshroom.java.patch +++ b/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.java.patch @@ -1,7 +1,8 @@ ---- ../src_base/common/net/minecraft/src/EntityMooshroom.java -+++ ../src_work/common/net/minecraft/src/EntityMooshroom.java -@@ -1,6 +1,10 @@ - package net.minecraft.src; +--- ../src_base/minecraft/net/minecraft/entity/passive/EntityMooshroom.java ++++ ../src_work/minecraft/net/minecraft/entity/passive/EntityMooshroom.java +@@ -8,7 +8,11 @@ + import net.minecraft.item.ItemStack; + import net.minecraft.world.World; -public class EntityMooshroom extends EntityCow +import java.util.ArrayList; @@ -12,7 +13,7 @@ { public EntityMooshroom(World par1World) { -@@ -31,31 +35,7 @@ +@@ -39,31 +43,7 @@ } } @@ -45,7 +46,7 @@ } /** -@@ -70,4 +50,29 @@ +@@ -78,4 +58,29 @@ { return this.spawnBabyAnimal(par1EntityAgeable); } diff --git a/patches/common/net/minecraft/src/EntityOcelot.java.patch b/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.java.patch similarity index 72% rename from patches/common/net/minecraft/src/EntityOcelot.java.patch rename to patches/minecraft/net/minecraft/entity/passive/EntityOcelot.java.patch index c72bc0dbb1..8d3f485adf 100644 --- a/patches/common/net/minecraft/src/EntityOcelot.java.patch +++ b/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/EntityOcelot.java -+++ ../src_work/common/net/minecraft/src/EntityOcelot.java -@@ -333,8 +333,9 @@ +--- ../src_base/minecraft/net/minecraft/entity/passive/EntityOcelot.java ++++ ../src_work/minecraft/net/minecraft/entity/passive/EntityOcelot.java +@@ -354,8 +354,9 @@ } int var4 = this.worldObj.getBlockId(var1, var2 - 1, var3); diff --git a/patches/common/net/minecraft/src/EntitySheep.java.patch b/patches/minecraft/net/minecraft/entity/passive/EntitySheep.java.patch similarity index 85% rename from patches/common/net/minecraft/src/EntitySheep.java.patch rename to patches/minecraft/net/minecraft/entity/passive/EntitySheep.java.patch index e2d76522d3..ec6637903a 100644 --- a/patches/common/net/minecraft/src/EntitySheep.java.patch +++ b/patches/minecraft/net/minecraft/entity/passive/EntitySheep.java.patch @@ -1,12 +1,17 @@ ---- ../src_base/common/net/minecraft/src/EntitySheep.java -+++ ../src_work/common/net/minecraft/src/EntitySheep.java -@@ -2,9 +2,13 @@ +--- ../src_base/minecraft/net/minecraft/entity/passive/EntitySheep.java ++++ ../src_work/minecraft/net/minecraft/entity/passive/EntitySheep.java +@@ -2,6 +2,8 @@ import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; + +import java.util.ArrayList; import java.util.Random; + import net.minecraft.block.Block; + import net.minecraft.entity.EntityAgeable; +@@ -24,7 +26,9 @@ + import net.minecraft.util.MathHelper; + import net.minecraft.world.World; -public class EntitySheep extends EntityAnimal +import net.minecraftforge.common.IShearable; @@ -15,7 +20,7 @@ { private final InventoryCrafting field_90016_e = new InventoryCrafting(new ContainerSheep(this), 2, 1); -@@ -118,28 +122,6 @@ +@@ -138,28 +142,6 @@ */ public boolean interact(EntityPlayer par1EntityPlayer) { @@ -44,7 +49,7 @@ return super.interact(par1EntityPlayer); } -@@ -328,4 +310,24 @@ +@@ -348,4 +330,24 @@ { return this.func_90015_b(par1EntityAgeable); } diff --git a/patches/common/net/minecraft/src/EntityPlayer.java.patch b/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch similarity index 94% rename from patches/common/net/minecraft/src/EntityPlayer.java.patch rename to patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch index 39e67c56e1..05f2d5bd08 100644 --- a/patches/common/net/minecraft/src/EntityPlayer.java.patch +++ b/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch @@ -1,8 +1,8 @@ ---- ../src_base/common/net/minecraft/src/EntityPlayer.java -+++ ../src_work/common/net/minecraft/src/EntityPlayer.java -@@ -8,8 +8,21 @@ - import java.util.Iterator; - import java.util.List; +--- ../src_base/minecraft/net/minecraft/entity/player/EntityPlayer.java ++++ ../src_work/minecraft/net/minecraft/entity/player/EntityPlayer.java +@@ -55,8 +55,21 @@ + import net.minecraft.world.World; + import net.minecraft.world.chunk.IChunkProvider; +import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.common.ISpecialArmor.ArmorProperties; @@ -22,7 +22,7 @@ /** Inventory of the player */ public InventoryPlayer inventory = new InventoryPlayer(this); private InventoryEnderChest theInventoryEnderChest = new InventoryEnderChest(); -@@ -212,6 +225,7 @@ +@@ -259,6 +272,7 @@ if (var1 == this.itemInUse) { @@ -30,7 +30,7 @@ if (this.itemInUseCount <= 25 && this.itemInUseCount % 4 == 0) { this.updateItemUse(var1, 5); -@@ -450,11 +464,11 @@ +@@ -497,11 +511,11 @@ this.cameraYaw = 0.0F; this.addMountedMovementStat(this.posX - var1, this.posY - var3, this.posZ - var5); @@ -44,7 +44,7 @@ } } -@@ -577,6 +591,9 @@ +@@ -624,6 +638,9 @@ this.setPosition(this.posX, this.posY, this.posZ); this.motionY = 0.10000000149011612D; @@ -54,7 +54,7 @@ if (this.username.equals("Notch")) { this.dropPlayerItemWithRandomChoice(new ItemStack(Item.appleRed, 1), true); -@@ -585,6 +602,20 @@ +@@ -632,6 +649,20 @@ if (!this.worldObj.getGameRules().getGameRuleBooleanValue("keepInventory")) { this.inventory.dropAllItems(); @@ -75,7 +75,7 @@ } if (par1DamageSource != null) -@@ -624,7 +655,16 @@ +@@ -671,7 +702,16 @@ */ public EntityItem dropOneItem() { @@ -93,7 +93,7 @@ } /** -@@ -633,7 +673,7 @@ +@@ -680,7 +720,7 @@ */ public EntityItem dropPlayerItem(ItemStack par1ItemStack) { @@ -102,7 +102,7 @@ } /** -@@ -685,18 +725,33 @@ +@@ -732,18 +772,33 @@ */ public void joinEntityItemWithWorld(EntityItem par1EntityItem) { @@ -140,7 +140,7 @@ { var2 += (float)(var3 * var3 + 1); } -@@ -721,7 +776,8 @@ +@@ -768,7 +823,8 @@ var2 /= 5.0F; } @@ -150,7 +150,7 @@ } /** -@@ -729,7 +785,7 @@ +@@ -776,7 +832,7 @@ */ public boolean canHarvestBlock(Block par1Block) { @@ -159,7 +159,7 @@ } /** -@@ -1014,12 +1070,22 @@ +@@ -1061,12 +1117,22 @@ { if (!this.func_85032_ar()) { @@ -183,7 +183,7 @@ par2 = this.applyPotionDamageCalculations(par1DamageSource, par2); this.addExhaustion(par1DamageSource.getHungerDamage()); this.health -= par2; -@@ -1060,6 +1126,10 @@ +@@ -1107,6 +1173,10 @@ public boolean interactWith(Entity par1Entity) { @@ -194,7 +194,7 @@ if (par1Entity.interact(this)) { return true; -@@ -1103,7 +1173,9 @@ +@@ -1150,7 +1220,9 @@ */ public void destroyCurrentEquippedItem() { @@ -204,7 +204,7 @@ } /** -@@ -1120,6 +1192,15 @@ +@@ -1167,6 +1239,15 @@ */ public void attackTargetEntityWithCurrentItem(Entity par1Entity) { @@ -220,7 +220,7 @@ if (par1Entity.canAttackWithItem()) { if (!par1Entity.func_85031_j(this)) -@@ -1278,6 +1359,12 @@ +@@ -1325,6 +1406,12 @@ */ public EnumStatus sleepInBedAt(int par1, int par2, int par3) { @@ -233,7 +233,7 @@ if (!this.worldObj.isRemote) { if (this.isPlayerSleeping() || !this.isEntityAlive()) -@@ -1317,6 +1404,11 @@ +@@ -1364,6 +1451,11 @@ { int var9 = this.worldObj.getBlockMetadata(par1, par2, par3); int var5 = BlockBed.getDirection(var9); @@ -245,7 +245,7 @@ float var10 = 0.5F; float var7 = 0.5F; -@@ -1387,10 +1479,12 @@ +@@ -1434,10 +1526,12 @@ ChunkCoordinates var4 = this.playerLocation; ChunkCoordinates var5 = this.playerLocation; @@ -262,7 +262,7 @@ if (var5 == null) { -@@ -1427,7 +1521,9 @@ +@@ -1474,7 +1568,9 @@ */ private boolean isInBed() { @@ -273,7 +273,7 @@ } /** -@@ -1442,9 +1538,12 @@ +@@ -1489,9 +1585,12 @@ var3.loadChunk(par1ChunkCoordinates.posX - 3 >> 4, par1ChunkCoordinates.posZ + 3 >> 4); var3.loadChunk(par1ChunkCoordinates.posX + 3 >> 4, par1ChunkCoordinates.posZ + 3 >> 4); @@ -289,7 +289,7 @@ return var8; } else -@@ -1466,8 +1565,11 @@ +@@ -1513,8 +1612,11 @@ { if (this.playerLocation != null) { @@ -303,7 +303,7 @@ switch (var2) { -@@ -1776,7 +1878,7 @@ +@@ -1823,7 +1925,7 @@ { if (par1ItemStack.getItem().requiresMultipleRenderPasses()) { @@ -312,7 +312,7 @@ } if (this.itemInUse != null && par1ItemStack.itemID == Item.bow.shiftedIndex) -@@ -1798,6 +1900,7 @@ +@@ -1845,6 +1947,7 @@ return 101; } } @@ -320,7 +320,7 @@ } return var3; -@@ -2016,6 +2119,14 @@ +@@ -2063,6 +2166,14 @@ } this.theInventoryEnderChest = par1EntityPlayer.theInventoryEnderChest; diff --git a/patches/common/net/minecraft/src/EntityPlayerMP.java.patch b/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch similarity index 84% rename from patches/common/net/minecraft/src/EntityPlayerMP.java.patch rename to patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch index 389172979d..bf472fbd0a 100644 --- a/patches/common/net/minecraft/src/EntityPlayerMP.java.patch +++ b/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch @@ -1,17 +1,26 @@ ---- ../src_base/common/net/minecraft/src/EntityPlayerMP.java -+++ ../src_work/common/net/minecraft/src/EntityPlayerMP.java -@@ -8,6 +8,10 @@ - import java.util.LinkedList; +--- ../src_base/minecraft/net/minecraft/entity/player/EntityPlayerMP.java ++++ ../src_work/minecraft/net/minecraft/entity/player/EntityPlayerMP.java +@@ -9,6 +9,7 @@ import java.util.List; - import net.minecraft.server.MinecraftServer; + import net.minecraft.entity.Entity; + import net.minecraft.entity.IMerchant; ++import net.minecraft.entity.item.EntityItem; + import net.minecraft.entity.projectile.EntityArrow; + import net.minecraft.inventory.Container; + import net.minecraft.inventory.ContainerBeacon; +@@ -74,6 +75,11 @@ + import net.minecraft.world.WorldServer; + import net.minecraft.world.chunk.Chunk; + +import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.PlayerDropsEvent; +import net.minecraftforge.event.world.ChunkWatchEvent; - ++ public class EntityPlayerMP extends EntityPlayer implements ICrafting { -@@ -80,18 +84,10 @@ + private StringTranslate translator = new StringTranslate("en_US"); +@@ -145,18 +151,10 @@ par4ItemInWorldManager.thisPlayerMP = this; this.theItemInWorldManager = par4ItemInWorldManager; this.renderDistance = par1MinecraftServer.getConfigurationManager().getViewDistance(); @@ -31,7 +40,7 @@ this.setLocationAndAngles((double)var6 + 0.5D, (double)var8, (double)var7 + 0.5D, 0.0F, 0.0F); this.mcServer = par1MinecraftServer; -@@ -188,7 +184,10 @@ +@@ -253,7 +251,10 @@ if (var9 != null && this.worldObj.blockExists(var9.chunkXPos << 4, 0, var9.chunkZPos << 4)) { var6.add(this.worldObj.getChunkFromChunkCoords(var9.chunkXPos, var9.chunkZPos)); @@ -43,7 +52,7 @@ } } -@@ -209,6 +208,7 @@ +@@ -274,6 +275,7 @@ { Chunk var10 = (Chunk)var11.next(); this.getServerForPlayer().getEntityTracker().func_85172_a(this, var10); @@ -51,7 +60,7 @@ } } } -@@ -253,11 +253,29 @@ +@@ -318,11 +320,29 @@ */ public void onDeath(DamageSource par1DamageSource) { diff --git a/patches/common/net/minecraft/src/ContainerFurnace.java.patch b/patches/minecraft/net/minecraft/inventory/ContainerFurnace.java.patch similarity index 69% rename from patches/common/net/minecraft/src/ContainerFurnace.java.patch rename to patches/minecraft/net/minecraft/inventory/ContainerFurnace.java.patch index 7715db275f..72d618e4d8 100644 --- a/patches/common/net/minecraft/src/ContainerFurnace.java.patch +++ b/patches/minecraft/net/minecraft/inventory/ContainerFurnace.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/ContainerFurnace.java -+++ ../src_work/common/net/minecraft/src/ContainerFurnace.java -@@ -120,7 +120,7 @@ +--- ../src_base/minecraft/net/minecraft/inventory/ContainerFurnace.java ++++ ../src_work/minecraft/net/minecraft/inventory/ContainerFurnace.java +@@ -125,7 +125,7 @@ } else if (par2 != 1 && par2 != 0) { diff --git a/patches/common/net/minecraft/src/Slot.java.patch b/patches/minecraft/net/minecraft/inventory/Slot.java.patch similarity index 92% rename from patches/common/net/minecraft/src/Slot.java.patch rename to patches/minecraft/net/minecraft/inventory/Slot.java.patch index 0e375c5da8..e3b84d5ce0 100644 --- a/patches/common/net/minecraft/src/Slot.java.patch +++ b/patches/minecraft/net/minecraft/inventory/Slot.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/Slot.java -+++ ../src_work/common/net/minecraft/src/Slot.java -@@ -19,6 +19,12 @@ +--- ../src_base/minecraft/net/minecraft/inventory/Slot.java ++++ ../src_work/minecraft/net/minecraft/inventory/Slot.java +@@ -21,6 +21,12 @@ /** display position of the inventory slot on the screen y axis */ public int yDisplayPosition; @@ -13,7 +13,7 @@ public Slot(IInventory par1IInventory, int par2, int par3, int par4) { -@@ -145,6 +151,44 @@ +@@ -147,6 +153,44 @@ */ public int getBackgroundIconIndex() { diff --git a/patches/common/net/minecraft/src/SlotCrafting.java.patch b/patches/minecraft/net/minecraft/inventory/SlotCrafting.java.patch similarity index 77% rename from patches/common/net/minecraft/src/SlotCrafting.java.patch rename to patches/minecraft/net/minecraft/inventory/SlotCrafting.java.patch index 87b0462d76..ce1dbd925e 100644 --- a/patches/common/net/minecraft/src/SlotCrafting.java.patch +++ b/patches/minecraft/net/minecraft/inventory/SlotCrafting.java.patch @@ -1,15 +1,17 @@ ---- ../src_base/common/net/minecraft/src/SlotCrafting.java -+++ ../src_work/common/net/minecraft/src/SlotCrafting.java -@@ -1,4 +1,8 @@ - package net.minecraft.src; +--- ../src_base/minecraft/net/minecraft/inventory/SlotCrafting.java ++++ ../src_work/minecraft/net/minecraft/inventory/SlotCrafting.java +@@ -6,6 +6,10 @@ + import net.minecraft.item.Item; + import net.minecraft.item.ItemStack; + import net.minecraft.stats.AchievementList; + +import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; - import cpw.mods.fml.common.registry.GameRegistry; - -@@ -119,9 +123,15 @@ + public class SlotCrafting extends Slot + { +@@ -124,9 +128,15 @@ if (var4.getItem().hasContainerItem()) { diff --git a/patches/common/net/minecraft/src/SlotFurnace.java.patch b/patches/minecraft/net/minecraft/inventory/SlotFurnace.java.patch similarity index 68% rename from patches/common/net/minecraft/src/SlotFurnace.java.patch rename to patches/minecraft/net/minecraft/inventory/SlotFurnace.java.patch index 831199617f..34425d78e9 100644 --- a/patches/common/net/minecraft/src/SlotFurnace.java.patch +++ b/patches/minecraft/net/minecraft/inventory/SlotFurnace.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/SlotFurnace.java -+++ ../src_work/common/net/minecraft/src/SlotFurnace.java -@@ -62,7 +62,7 @@ +--- ../src_base/minecraft/net/minecraft/inventory/SlotFurnace.java ++++ ../src_work/minecraft/net/minecraft/inventory/SlotFurnace.java +@@ -69,7 +69,7 @@ if (!this.thePlayer.worldObj.isRemote) { int var2 = this.field_75228_b; diff --git a/patches/minecraft/net/minecraft/item/EnumArmorMaterial.java.patch b/patches/minecraft/net/minecraft/item/EnumArmorMaterial.java.patch new file mode 100644 index 0000000000..58ca050c85 --- /dev/null +++ b/patches/minecraft/net/minecraft/item/EnumArmorMaterial.java.patch @@ -0,0 +1,28 @@ +--- ../src_base/minecraft/net/minecraft/item/EnumArmorMaterial.java ++++ ../src_work/minecraft/net/minecraft/item/EnumArmorMaterial.java +@@ -22,6 +22,9 @@ + + /** Return the enchantability factor of the material */ + private int enchantability; ++ ++ //Added by forge for custom Armor materials. ++ public Item customCraftingMaterial = null; + + private EnumArmorMaterial(int par3, int[] par4ArrayOfInteger, int par5) + { +@@ -61,6 +64,14 @@ + */ + public int getArmorCraftingMaterial() + { +- return this == CLOTH ? Item.leather.shiftedIndex : (this == CHAIN ? Item.ingotIron.shiftedIndex : (this == GOLD ? Item.ingotGold.shiftedIndex : (this == IRON ? Item.ingotIron.shiftedIndex : (this == DIAMOND ? Item.diamond.shiftedIndex : 0)))); ++ switch (this) ++ { ++ case CLOTH: return Item.leather.shiftedIndex; ++ case CHAIN: return Item.ingotIron.shiftedIndex; ++ case GOLD: return Item.ingotGold.shiftedIndex; ++ case IRON: return Item.ingotIron.shiftedIndex; ++ case DIAMOND: return Item.diamond.shiftedIndex; ++ default: return (customCraftingMaterial == null ? 0 : customCraftingMaterial.shiftedIndex); ++ } + } + } diff --git a/patches/minecraft/net/minecraft/item/EnumToolMaterial.java.patch b/patches/minecraft/net/minecraft/item/EnumToolMaterial.java.patch new file mode 100644 index 0000000000..b62b636911 --- /dev/null +++ b/patches/minecraft/net/minecraft/item/EnumToolMaterial.java.patch @@ -0,0 +1,28 @@ +--- ../src_base/minecraft/net/minecraft/item/EnumToolMaterial.java ++++ ../src_work/minecraft/net/minecraft/item/EnumToolMaterial.java +@@ -30,6 +30,9 @@ + + /** Defines the natural enchantability factor of the material. */ + private final int enchantability; ++ ++ //Added by forge for custom Armor materials. ++ public Item customCraftingMaterial = null; + + private EnumToolMaterial(int par3, int par4, float par5, int par6, int par7) + { +@@ -86,6 +89,14 @@ + */ + public int getToolCraftingMaterial() + { +- return this == WOOD ? Block.planks.blockID : (this == STONE ? Block.cobblestone.blockID : (this == GOLD ? Item.ingotGold.shiftedIndex : (this == IRON ? Item.ingotIron.shiftedIndex : (this == EMERALD ? Item.diamond.shiftedIndex : 0)))); ++ switch (this) ++ { ++ case WOOD: return Block.planks.blockID; ++ case STONE: return Block.cobblestone.blockID; ++ case GOLD: return Item.ingotGold.shiftedIndex; ++ case IRON: return Item.ingotIron.shiftedIndex; ++ case EMERALD: return Item.diamond.shiftedIndex; ++ default: return (customCraftingMaterial == null ? 0 : customCraftingMaterial.shiftedIndex); ++ } + } + } diff --git a/patches/common/net/minecraft/src/Item.java.patch b/patches/minecraft/net/minecraft/item/Item.java.patch similarity index 95% rename from patches/common/net/minecraft/src/Item.java.patch rename to patches/minecraft/net/minecraft/item/Item.java.patch index ca92037ae1..e6d3bbd59b 100644 --- a/patches/common/net/minecraft/src/Item.java.patch +++ b/patches/minecraft/net/minecraft/item/Item.java.patch @@ -1,15 +1,24 @@ ---- ../src_base/common/net/minecraft/src/Item.java -+++ ../src_work/common/net/minecraft/src/Item.java -@@ -212,17 +212,25 @@ +--- ../src_base/minecraft/net/minecraft/item/Item.java ++++ ../src_work/minecraft/net/minecraft/item/Item.java +@@ -14,6 +14,7 @@ + import net.minecraft.entity.item.EntityItemFrame; + import net.minecraft.entity.item.EntityPainting; + import net.minecraft.entity.player.EntityPlayer; ++import net.minecraft.entity.player.EntityPlayerMP; + import net.minecraft.potion.Potion; + import net.minecraft.potion.PotionHelper; + import net.minecraft.stats.StatList; +@@ -227,6 +228,9 @@ + /** full name of item from language file */ private String itemName; - ++ + /** FORGE: To disable repair recipes. */ + protected boolean canRepair = true; -+ + public Item(int par1) { - this.shiftedIndex = 256 + par1; +@@ -234,12 +238,17 @@ if (itemsList[256 + par1] != null) { @@ -18,8 +27,9 @@ } itemsList[256 + par1] = this; + GameData.newItemAdded(this); -+ ++ + if (!(this instanceof ItemBlock)) + { + isDefaultTexture = "/gui/items.png".equals(getTextureFile()); @@ -27,7 +37,7 @@ } /** -@@ -608,6 +616,10 @@ +@@ -625,6 +634,10 @@ float var18 = var15 * var16; float var20 = var14 * var16; double var21 = 5.0D; @@ -38,7 +48,7 @@ Vec3 var23 = var13.addVector((double)var18 * var21, (double)var17 * var21, (double)var20 * var21); return par1World.rayTraceBlocks_do_do(var13, var23, par3, !par3); } -@@ -682,4 +694,279 @@ +@@ -699,4 +712,279 @@ { StatList.initStats(); } diff --git a/patches/common/net/minecraft/src/ItemBlock.java.patch b/patches/minecraft/net/minecraft/item/ItemBlock.java.patch similarity index 94% rename from patches/common/net/minecraft/src/ItemBlock.java.patch rename to patches/minecraft/net/minecraft/item/ItemBlock.java.patch index 936cdcf616..6ba66b9814 100644 --- a/patches/common/net/minecraft/src/ItemBlock.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemBlock.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/ItemBlock.java -+++ ../src_work/common/net/minecraft/src/ItemBlock.java -@@ -14,6 +14,7 @@ +--- ../src_base/minecraft/net/minecraft/item/ItemBlock.java ++++ ../src_work/minecraft/net/minecraft/item/ItemBlock.java +@@ -19,6 +19,7 @@ super(par1); this.blockID = par1 + 256; this.setIconIndex(Block.blocksList[par1 + 256].getBlockTextureFromSide(2)); @@ -8,7 +8,7 @@ } /** -@@ -36,7 +37,8 @@ +@@ -41,7 +42,8 @@ { par7 = 1; } @@ -18,7 +18,7 @@ { if (par7 == 0) { -@@ -87,14 +89,8 @@ +@@ -92,14 +94,8 @@ int var13 = this.getMetadata(par1ItemStack.getItemDamage()); int var14 = Block.blocksList[this.blockID].func_85104_a(par3World, par4, par5, par6, par7, par8, par9, par10, var13); @@ -35,7 +35,7 @@ par3World.playSoundEffect((double)((float)par4 + 0.5F), (double)((float)par5 + 0.5F), (double)((float)par6 + 0.5F), var12.stepSound.getPlaceSound(), (var12.stepSound.getVolume() + 1.0F) / 2.0F, var12.stepSound.getPitch() * 0.8F); --par1ItemStack.stackSize; } -@@ -120,7 +116,8 @@ +@@ -125,7 +121,8 @@ { par5 = 1; } @@ -45,7 +45,7 @@ { if (par5 == 0) { -@@ -185,4 +182,28 @@ +@@ -190,4 +187,28 @@ { Block.blocksList[this.blockID].getSubBlocks(par1, par2CreativeTabs, par3List); } diff --git a/patches/common/net/minecraft/src/ItemBow.java.patch b/patches/minecraft/net/minecraft/item/ItemBow.java.patch similarity index 84% rename from patches/common/net/minecraft/src/ItemBow.java.patch rename to patches/minecraft/net/minecraft/item/ItemBow.java.patch index ec930b6ed9..42fe3efbb0 100644 --- a/patches/common/net/minecraft/src/ItemBow.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemBow.java.patch @@ -1,7 +1,9 @@ ---- ../src_base/common/net/minecraft/src/ItemBow.java -+++ ../src_work/common/net/minecraft/src/ItemBow.java -@@ -1,4 +1,8 @@ - package net.minecraft.src; +--- ../src_base/minecraft/net/minecraft/item/ItemBow.java ++++ ../src_work/minecraft/net/minecraft/item/ItemBow.java +@@ -6,6 +6,10 @@ + import net.minecraft.entity.player.EntityPlayer; + import net.minecraft.entity.projectile.EntityArrow; + import net.minecraft.world.World; + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.ArrowLooseEvent; @@ -9,7 +11,7 @@ public class ItemBow extends Item { -@@ -15,11 +19,20 @@ +@@ -22,11 +26,20 @@ */ public void onPlayerStoppedUsing(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, int par4) { @@ -31,7 +33,7 @@ float var7 = (float)var6 / 20.0F; var7 = (var7 * var7 + var7 * 2.0F) / 3.0F; -@@ -104,6 +117,13 @@ +@@ -111,6 +124,13 @@ */ public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { diff --git a/patches/common/net/minecraft/src/ItemBucket.java.patch b/patches/minecraft/net/minecraft/item/ItemBucket.java.patch similarity index 80% rename from patches/common/net/minecraft/src/ItemBucket.java.patch rename to patches/minecraft/net/minecraft/item/ItemBucket.java.patch index f6b0a12319..195f6f443a 100644 --- a/patches/common/net/minecraft/src/ItemBucket.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemBucket.java.patch @@ -1,7 +1,9 @@ ---- ../src_base/common/net/minecraft/src/ItemBucket.java -+++ ../src_work/common/net/minecraft/src/ItemBucket.java -@@ -1,4 +1,8 @@ - package net.minecraft.src; +--- ../src_base/minecraft/net/minecraft/item/ItemBucket.java ++++ ../src_work/minecraft/net/minecraft/item/ItemBucket.java +@@ -8,6 +8,10 @@ + import net.minecraft.util.EnumMovingObjectType; + import net.minecraft.util.MovingObjectPosition; + import net.minecraft.world.World; + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.Event; @@ -9,7 +11,7 @@ public class ItemBucket extends Item { -@@ -31,6 +35,32 @@ +@@ -40,6 +44,32 @@ } else { diff --git a/patches/common/net/minecraft/src/ItemBucketMilk.java.patch b/patches/minecraft/net/minecraft/item/ItemBucketMilk.java.patch similarity index 51% rename from patches/common/net/minecraft/src/ItemBucketMilk.java.patch rename to patches/minecraft/net/minecraft/item/ItemBucketMilk.java.patch index 80b78a34a7..a03156a47a 100644 --- a/patches/common/net/minecraft/src/ItemBucketMilk.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemBucketMilk.java.patch @@ -1,13 +1,6 @@ ---- ../src_base/common/net/minecraft/src/ItemBucketMilk.java -+++ ../src_work/common/net/minecraft/src/ItemBucketMilk.java -@@ -1,4 +1,6 @@ - package net.minecraft.src; -+ -+import java.util.HashMap; - - public class ItemBucketMilk extends Item - { -@@ -18,7 +20,7 @@ +--- ../src_base/minecraft/net/minecraft/item/ItemBucketMilk.java ++++ ../src_work/minecraft/net/minecraft/item/ItemBucketMilk.java +@@ -22,7 +22,7 @@ if (!par2World.isRemote) { diff --git a/patches/common/net/minecraft/src/ItemDye.java.patch b/patches/minecraft/net/minecraft/item/ItemDye.java.patch similarity index 88% rename from patches/common/net/minecraft/src/ItemDye.java.patch rename to patches/minecraft/net/minecraft/item/ItemDye.java.patch index 5224788a8d..62cdf17671 100644 --- a/patches/common/net/minecraft/src/ItemDye.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemDye.java.patch @@ -1,18 +1,18 @@ ---- ../src_base/common/net/minecraft/src/ItemDye.java -+++ ../src_work/common/net/minecraft/src/ItemDye.java -@@ -3,6 +3,11 @@ - import cpw.mods.fml.common.Side; - import cpw.mods.fml.common.asm.SideOnly; - import java.util.List; -+ +--- ../src_base/minecraft/net/minecraft/item/ItemDye.java ++++ ../src_work/minecraft/net/minecraft/item/ItemDye.java +@@ -18,6 +18,11 @@ + import net.minecraft.util.MathHelper; + import net.minecraft.world.World; + +import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.Event.Result; +import net.minecraftforge.event.entity.player.BonemealEvent; - ++ public class ItemDye extends Item { -@@ -54,6 +59,21 @@ + /** List of dye color names */ +@@ -68,6 +73,21 @@ if (par1ItemStack.getItemDamage() == 15) { var11 = par3World.getBlockId(par4, par5, par6); @@ -34,7 +34,7 @@ if (var11 == Block.sapling.blockID) { -@@ -153,16 +173,9 @@ +@@ -167,16 +187,9 @@ par3World.setBlockAndMetadataWithNotify(var13, var14, var15, Block.tallGrass.blockID, 1); } } diff --git a/patches/common/net/minecraft/src/ItemHoe.java.patch b/patches/minecraft/net/minecraft/item/ItemHoe.java.patch similarity index 80% rename from patches/common/net/minecraft/src/ItemHoe.java.patch rename to patches/minecraft/net/minecraft/item/ItemHoe.java.patch index 4605d0c121..aba72724a2 100644 --- a/patches/common/net/minecraft/src/ItemHoe.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemHoe.java.patch @@ -1,15 +1,15 @@ ---- ../src_base/common/net/minecraft/src/ItemHoe.java -+++ ../src_work/common/net/minecraft/src/ItemHoe.java +--- ../src_base/minecraft/net/minecraft/item/ItemHoe.java ++++ ../src_work/minecraft/net/minecraft/item/ItemHoe.java @@ -1,5 +1,8 @@ - package net.minecraft.src; + package net.minecraft.item; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.Event.Result; +import net.minecraftforge.event.entity.player.UseHoeEvent; import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; - -@@ -28,6 +31,18 @@ + import net.minecraft.block.Block; +@@ -32,6 +35,18 @@ } else { diff --git a/patches/common/net/minecraft/src/ItemInWorldManager.java.patch b/patches/minecraft/net/minecraft/item/ItemInWorldManager.java.patch similarity index 95% rename from patches/common/net/minecraft/src/ItemInWorldManager.java.patch rename to patches/minecraft/net/minecraft/item/ItemInWorldManager.java.patch index 27e3ee8517..4b06343dbf 100644 --- a/patches/common/net/minecraft/src/ItemInWorldManager.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemInWorldManager.java.patch @@ -1,8 +1,9 @@ ---- ../src_base/common/net/minecraft/src/ItemInWorldManager.java -+++ ../src_work/common/net/minecraft/src/ItemInWorldManager.java -@@ -1,7 +1,17 @@ - package net.minecraft.src; -+ +--- ../src_base/minecraft/net/minecraft/item/ItemInWorldManager.java ++++ ../src_work/minecraft/net/minecraft/item/ItemInWorldManager.java +@@ -8,8 +8,19 @@ + import net.minecraft.world.World; + import net.minecraft.world.WorldServer; + +import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.Event; @@ -10,15 +11,16 @@ +import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; - ++ public class ItemInWorldManager { + /** Forge reach distance */ + private double blockReachDistance = 5.0d; ++ /** The world object that this object is connected to. */ public World theWorld; -@@ -134,6 +144,13 @@ +@@ -142,6 +153,13 @@ { if (!this.gameType.isAdventure() || this.thisPlayerMP.canCurrentToolHarvestBlock(par1, par2, par3)) { @@ -32,7 +34,7 @@ if (this.isCreative()) { if (!this.theWorld.extinguishFire((EntityPlayer)null, par1, par2, par3, par4)) -@@ -143,15 +160,32 @@ +@@ -151,15 +169,32 @@ } else { @@ -71,7 +73,7 @@ } if (var6 > 0 && var5 >= 1.0F) -@@ -225,7 +259,7 @@ +@@ -233,7 +268,7 @@ var4.onBlockHarvested(this.theWorld, par1, par2, par3, var5, this.thisPlayerMP); } @@ -80,7 +82,7 @@ if (var4 != null && var6) { -@@ -246,19 +280,30 @@ +@@ -254,19 +289,30 @@ } else { @@ -113,7 +115,7 @@ if (var7 != null) { -@@ -267,9 +312,11 @@ +@@ -275,9 +321,11 @@ if (var7.stackSize == 0) { this.thisPlayerMP.destroyCurrentEquippedItem(); @@ -125,7 +127,7 @@ if (var6 && var8) { Block.blocksList[var4].harvestBlock(this.theWorld, this.thisPlayerMP, par1, par2, par3, var5); -@@ -310,6 +357,7 @@ +@@ -318,6 +366,7 @@ if (var6.stackSize == 0) { par1EntityPlayer.inventory.mainInventory[par1EntityPlayer.inventory.currentItem] = null; @@ -133,7 +135,7 @@ } if (!par1EntityPlayer.isUsingItem()) -@@ -327,29 +375,56 @@ +@@ -335,29 +384,56 @@ */ public boolean activateBlockOrUseItem(EntityPlayer par1EntityPlayer, World par2World, ItemStack par3ItemStack, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { @@ -212,7 +214,7 @@ } /** -@@ -359,4 +434,13 @@ +@@ -367,4 +443,13 @@ { this.theWorld = par1WorldServer; } diff --git a/patches/common/net/minecraft/src/ItemMap.java.patch b/patches/minecraft/net/minecraft/item/ItemMap.java.patch similarity index 85% rename from patches/common/net/minecraft/src/ItemMap.java.patch rename to patches/minecraft/net/minecraft/item/ItemMap.java.patch index 9f69ce65ed..7f6b0d3b08 100644 --- a/patches/common/net/minecraft/src/ItemMap.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemMap.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/ItemMap.java -+++ ../src_work/common/net/minecraft/src/ItemMap.java -@@ -87,7 +87,7 @@ +--- ../src_base/minecraft/net/minecraft/item/ItemMap.java ++++ ../src_work/minecraft/net/minecraft/item/ItemMap.java +@@ -98,7 +98,7 @@ boolean var21 = var19 * var19 + var20 * var20 > (var11 - 2) * (var11 - 2); int var22 = (var7 / var6 + var13 - var4 / 2) * var6; int var23 = (var8 / var6 + var18 - var5 / 2) * var6; @@ -9,7 +9,7 @@ Chunk var25 = par1World.getChunkFromBlockCoords(var22, var23); if (!var25.isEmpty()) -@@ -183,7 +183,7 @@ +@@ -194,7 +194,7 @@ var31 = 0; var32 = 0; diff --git a/patches/common/net/minecraft/src/ItemSeeds.java.patch b/patches/minecraft/net/minecraft/item/ItemSeeds.java.patch similarity index 80% rename from patches/common/net/minecraft/src/ItemSeeds.java.patch rename to patches/minecraft/net/minecraft/item/ItemSeeds.java.patch index d1eeb4ad9d..a8df3c1387 100644 --- a/patches/common/net/minecraft/src/ItemSeeds.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemSeeds.java.patch @@ -1,7 +1,12 @@ ---- ../src_base/common/net/minecraft/src/ItemSeeds.java -+++ ../src_work/common/net/minecraft/src/ItemSeeds.java -@@ -1,6 +1,10 @@ - package net.minecraft.src; +--- ../src_base/minecraft/net/minecraft/item/ItemSeeds.java ++++ ../src_work/minecraft/net/minecraft/item/ItemSeeds.java +@@ -1,10 +1,15 @@ + package net.minecraft.item; + ++import net.minecraft.block.Block; + import net.minecraft.creativetab.CreativeTabs; + import net.minecraft.entity.player.EntityPlayer; + import net.minecraft.world.World; -public class ItemSeeds extends Item +import net.minecraftforge.common.EnumPlantType; @@ -12,7 +17,7 @@ { /** * The type of block this seed turns into (wheat or pumpkin stems for instance) -@@ -31,8 +35,9 @@ +@@ -35,8 +40,9 @@ else if (par2EntityPlayer.canPlayerEdit(par4, par5, par6, par7, par1ItemStack) && par2EntityPlayer.canPlayerEdit(par4, par5 + 1, par6, par7, par1ItemStack)) { int var11 = par3World.getBlockId(par4, par5, par6); @@ -23,7 +28,7 @@ { par3World.setBlockWithNotify(par4, par5 + 1, par6, this.blockType); --par1ItemStack.stackSize; -@@ -48,4 +53,22 @@ +@@ -52,4 +58,22 @@ return false; } } diff --git a/patches/common/net/minecraft/src/ItemShears.java.patch b/patches/minecraft/net/minecraft/item/ItemShears.java.patch similarity index 73% rename from patches/common/net/minecraft/src/ItemShears.java.patch rename to patches/minecraft/net/minecraft/item/ItemShears.java.patch index bb2f4b1c93..0a3c8c82bb 100644 --- a/patches/common/net/minecraft/src/ItemShears.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemShears.java.patch @@ -1,15 +1,26 @@ ---- ../src_base/common/net/minecraft/src/ItemShears.java -+++ ../src_work/common/net/minecraft/src/ItemShears.java -@@ -1,4 +1,8 @@ - package net.minecraft.src; +--- ../src_base/minecraft/net/minecraft/item/ItemShears.java ++++ ../src_work/minecraft/net/minecraft/item/ItemShears.java +@@ -1,9 +1,19 @@ + package net.minecraft.item; + +import java.util.ArrayList; ++import java.util.Random; + + import net.minecraft.block.Block; + import net.minecraft.creativetab.CreativeTabs; ++import net.minecraft.enchantment.Enchantment; ++import net.minecraft.enchantment.EnchantmentHelper; + import net.minecraft.entity.EntityLiving; ++import net.minecraft.entity.item.EntityItem; ++import net.minecraft.entity.player.EntityPlayer; ++import net.minecraft.stats.StatList; + import net.minecraft.world.World; + +import net.minecraftforge.common.IShearable; public class ItemShears extends Item { -@@ -12,13 +16,12 @@ +@@ -17,13 +27,12 @@ public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, int par3, int par4, int par5, int par6, EntityLiving par7EntityLiving) { @@ -24,7 +35,7 @@ return true; } } -@@ -39,4 +42,64 @@ +@@ -44,4 +53,69 @@ { return par2Block.blockID != Block.web.blockID && par2Block.blockID != Block.leaves.blockID ? (par2Block.blockID == Block.cloth.blockID ? 5.0F : super.getStrVsBlock(par1ItemStack, par2Block)) : 15.0F; } @@ -43,12 +54,14 @@ + { + ArrayList drops = target.onSheared(itemstack, entity.worldObj, (int)entity.posX, (int)entity.posY, (int)entity.posZ, + EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, itemstack)); ++ ++ Random rand = new Random(); + for(ItemStack stack : drops) + { + EntityItem ent = entity.entityDropItem(stack, 1.0F); -+ ent.motionY += entity.rand.nextFloat() * 0.05F; -+ ent.motionX += (entity.rand.nextFloat() - entity.rand.nextFloat()) * 0.1F; -+ ent.motionZ += (entity.rand.nextFloat() - entity.rand.nextFloat()) * 0.1F; ++ ent.motionY += rand.nextFloat() * 0.05F; ++ ent.motionX += (rand.nextFloat() - rand.nextFloat()) * 0.1F; ++ ent.motionZ += (rand.nextFloat() - rand.nextFloat()) * 0.1F; + } + itemstack.damageItem(1, entity); + } @@ -72,16 +85,19 @@ + { + ArrayList drops = target.onSheared(itemstack, player.worldObj, x, y, z, + EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, itemstack)); ++ Random rand = new Random(); ++ + for(ItemStack stack : drops) + { + float f = 0.7F; -+ double d = (double)(player.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; -+ double d1 = (double)(player.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; -+ double d2 = (double)(player.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; ++ double d = (double)(rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; ++ double d1 = (double)(rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; ++ double d2 = (double)(rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; + EntityItem entityitem = new EntityItem(player.worldObj, (double)x + d, (double)y + d1, (double)z + d2, stack); + entityitem.delayBeforeCanPickup = 10; + player.worldObj.spawnEntityInWorld(entityitem); + } ++ + itemstack.damageItem(1, player); + player.addStat(StatList.mineBlockStatArray[id], 1); + } diff --git a/patches/common/net/minecraft/src/ItemTool.java.patch b/patches/minecraft/net/minecraft/item/ItemTool.java.patch similarity index 76% rename from patches/common/net/minecraft/src/ItemTool.java.patch rename to patches/minecraft/net/minecraft/item/ItemTool.java.patch index c454fc95c0..834fc41fdd 100644 --- a/patches/common/net/minecraft/src/ItemTool.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemTool.java.patch @@ -1,13 +1,13 @@ ---- ../src_base/common/net/minecraft/src/ItemTool.java -+++ ../src_work/common/net/minecraft/src/ItemTool.java +--- ../src_base/minecraft/net/minecraft/item/ItemTool.java ++++ ../src_work/minecraft/net/minecraft/item/ItemTool.java @@ -1,5 +1,6 @@ - package net.minecraft.src; + package net.minecraft.item; +import net.minecraftforge.common.ForgeHooks; import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; - -@@ -105,4 +106,15 @@ + import net.minecraft.block.Block; +@@ -110,4 +111,15 @@ { return this.toolMaterial.getToolCraftingMaterial() == par2ItemStack.itemID ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); } diff --git a/patches/common/net/minecraft/src/CraftingManager.java.patch b/patches/minecraft/net/minecraft/item/crafting/CraftingManager.java.patch similarity index 73% rename from patches/common/net/minecraft/src/CraftingManager.java.patch rename to patches/minecraft/net/minecraft/item/crafting/CraftingManager.java.patch index 0ba88eab20..1ffb31cd24 100644 --- a/patches/common/net/minecraft/src/CraftingManager.java.patch +++ b/patches/minecraft/net/minecraft/item/crafting/CraftingManager.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/CraftingManager.java -+++ ../src_work/common/net/minecraft/src/CraftingManager.java -@@ -263,7 +263,7 @@ +--- ../src_base/minecraft/net/minecraft/item/crafting/CraftingManager.java ++++ ../src_work/minecraft/net/minecraft/item/crafting/CraftingManager.java +@@ -268,7 +268,7 @@ } } diff --git a/patches/common/net/minecraft/src/FurnaceRecipes.java.patch b/patches/minecraft/net/minecraft/item/crafting/FurnaceRecipes.java.patch similarity index 91% rename from patches/common/net/minecraft/src/FurnaceRecipes.java.patch rename to patches/minecraft/net/minecraft/item/crafting/FurnaceRecipes.java.patch index 3eeba12b3c..9dbc8752a5 100644 --- a/patches/common/net/minecraft/src/FurnaceRecipes.java.patch +++ b/patches/minecraft/net/minecraft/item/crafting/FurnaceRecipes.java.patch @@ -1,15 +1,15 @@ ---- ../src_base/common/net/minecraft/src/FurnaceRecipes.java -+++ ../src_work/common/net/minecraft/src/FurnaceRecipes.java +--- ../src_base/minecraft/net/minecraft/item/crafting/FurnaceRecipes.java ++++ ../src_work/minecraft/net/minecraft/item/crafting/FurnaceRecipes.java @@ -1,6 +1,8 @@ - package net.minecraft.src; + package net.minecraft.item.crafting; +import java.util.Arrays; import java.util.HashMap; +import java.util.List; import java.util.Map; - - public class FurnaceRecipes -@@ -10,6 +12,8 @@ + import net.minecraft.block.Block; + import net.minecraft.item.Item; +@@ -13,6 +15,8 @@ /** The list of smelting results. */ private Map smeltingList = new HashMap(); private Map experienceList = new HashMap(); @@ -18,7 +18,7 @@ /** * Used to call methods addSmelting and getSmeltingResult. -@@ -51,7 +55,9 @@ +@@ -54,7 +58,9 @@ /** * Returns the smelting result of an item. @@ -28,7 +28,7 @@ public ItemStack getSmeltingResult(int par1) { return (ItemStack)this.smeltingList.get(Integer.valueOf(par1)); -@@ -62,8 +68,70 @@ +@@ -65,8 +71,70 @@ return this.smeltingList; } diff --git a/patches/common/net/minecraft/src/CompressedStreamTools.java.patch b/patches/minecraft/net/minecraft/nbt/CompressedStreamTools.java.patch similarity index 77% rename from patches/common/net/minecraft/src/CompressedStreamTools.java.patch rename to patches/minecraft/net/minecraft/nbt/CompressedStreamTools.java.patch index 31f735cb6a..7657a86330 100644 --- a/patches/common/net/minecraft/src/CompressedStreamTools.java.patch +++ b/patches/minecraft/net/minecraft/nbt/CompressedStreamTools.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/common/net/minecraft/src/CompressedStreamTools.java -+++ ../src_work/common/net/minecraft/src/CompressedStreamTools.java +--- ../src_base/minecraft/net/minecraft/nbt/CompressedStreamTools.java ++++ ../src_work/minecraft/net/minecraft/nbt/CompressedStreamTools.java @@ -140,7 +140,6 @@ NBTBase.writeNamedTag(par0NBTTagCompound, par1DataOutput); } diff --git a/patches/common/net/minecraft/src/NetServerHandler.java.patch b/patches/minecraft/net/minecraft/network/NetServerHandler.java.patch similarity index 93% rename from patches/common/net/minecraft/src/NetServerHandler.java.patch rename to patches/minecraft/net/minecraft/network/NetServerHandler.java.patch index 2b83a18cc5..d31ad125ae 100644 --- a/patches/common/net/minecraft/src/NetServerHandler.java.patch +++ b/patches/minecraft/net/minecraft/network/NetServerHandler.java.patch @@ -1,19 +1,20 @@ ---- ../src_base/common/net/minecraft/src/NetServerHandler.java -+++ ../src_work/common/net/minecraft/src/NetServerHandler.java -@@ -10,6 +10,12 @@ +--- ../src_base/minecraft/net/minecraft/network/NetServerHandler.java ++++ ../src_work/minecraft/net/minecraft/network/NetServerHandler.java +@@ -64,6 +64,13 @@ + import net.minecraft.util.MathHelper; + import net.minecraft.world.WorldServer; - import cpw.mods.fml.common.network.FMLNetworkHandler; - import net.minecraft.server.MinecraftServer; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.Event; +import net.minecraftforge.event.ForgeEventFactory; +import net.minecraftforge.event.ServerChatEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; - ++ public class NetServerHandler extends NetHandler { -@@ -182,6 +188,11 @@ + /** The logging system. */ +@@ -235,6 +242,11 @@ if (this.playerEntity.ridingEntity != null) { this.playerEntity.ridingEntity.updateRiderPosition(); @@ -25,7 +26,7 @@ } this.mcServer.getConfigurationManager().serverUpdateMountedMovingPlayer(this.playerEntity); -@@ -274,6 +285,11 @@ +@@ -327,6 +339,11 @@ this.playerEntity.addExhaustion(0.2F); } @@ -37,7 +38,7 @@ this.playerEntity.moveEntity(var13, var15, var17); this.playerEntity.onGround = par1Packet10Flying.onGround; this.playerEntity.addMovementStat(var13, var15, var17); -@@ -296,10 +312,15 @@ +@@ -349,10 +366,15 @@ logger.warning(this.playerEntity.username + " moved wrongly!"); } @@ -54,7 +55,7 @@ { this.setPlayerLocation(this.lastPosX, this.lastPosY, this.lastPosZ, var11, var12); return; -@@ -307,7 +328,7 @@ +@@ -360,7 +382,7 @@ AxisAlignedBB var33 = this.playerEntity.boundingBox.copy().expand((double)var27, (double)var27, (double)var27).addCoord(0.0D, -0.55D, 0.0D); @@ -63,7 +64,7 @@ { if (var29 >= -0.03125D) { -@@ -326,6 +347,11 @@ +@@ -379,6 +401,11 @@ this.ticksForFloatKick = 0; } @@ -75,7 +76,7 @@ this.playerEntity.onGround = par1Packet10Flying.onGround; this.mcServer.getConfigurationManager().serverUpdateMountedMovingPlayer(this.playerEntity); this.playerEntity.updateFlyingState(this.playerEntity.posY - var3, par1Packet10Flying.onGround); -@@ -384,7 +410,10 @@ +@@ -437,7 +464,10 @@ double var12 = this.playerEntity.posZ - ((double)var7 + 0.5D); double var14 = var8 * var8 + var10 * var10 + var12 * var12; @@ -87,7 +88,7 @@ { return; } -@@ -408,6 +437,7 @@ +@@ -461,6 +491,7 @@ { if (var20 <= this.mcServer.getSpawnProtectionSize() && !var3) { @@ -95,7 +96,7 @@ this.playerEntity.playerNetServerHandler.sendPacketToPlayer(new Packet53BlockChange(var5, var6, var7, var2)); } else -@@ -466,7 +496,11 @@ +@@ -519,7 +550,11 @@ return; } @@ -108,7 +109,7 @@ } else if (par1Packet15Place.getYPosition() >= this.mcServer.getBuildLimit() - 1 && (par1Packet15Place.getDirection() == 1 || par1Packet15Place.getYPosition() >= this.mcServer.getBuildLimit())) { -@@ -484,7 +518,9 @@ +@@ -537,7 +572,9 @@ var12 = var11; } @@ -119,7 +120,7 @@ { this.playerEntity.theItemInWorldManager.activateBlockOrUseItem(this.playerEntity, var2, var3, var5, var6, var7, var8, par1Packet15Place.getXOffset(), par1Packet15Place.getYOffset(), par1Packet15Place.getZOffset()); } -@@ -651,8 +687,12 @@ +@@ -704,8 +741,12 @@ this.sendPacketToPlayer(new Packet3Chat("Cannot send chat message.")); return; } @@ -134,7 +135,7 @@ logger.info(var2); this.mcServer.getConfigurationManager().sendPacketToAllPlayers(new Packet3Chat(var2, false)); } -@@ -783,7 +823,7 @@ +@@ -836,7 +877,7 @@ return; } diff --git a/patches/common/net/minecraft/src/Packet51MapChunk.java.patch b/patches/minecraft/net/minecraft/network/packet/Packet51MapChunk.java.patch similarity index 68% rename from patches/common/net/minecraft/src/Packet51MapChunk.java.patch rename to patches/minecraft/net/minecraft/network/packet/Packet51MapChunk.java.patch index 6bcaf58a74..c1e312382b 100644 --- a/patches/common/net/minecraft/src/Packet51MapChunk.java.patch +++ b/patches/minecraft/net/minecraft/network/packet/Packet51MapChunk.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/Packet51MapChunk.java -+++ ../src_work/common/net/minecraft/src/Packet51MapChunk.java -@@ -100,6 +100,13 @@ +--- ../src_base/minecraft/net/minecraft/network/packet/Packet51MapChunk.java ++++ ../src_work/minecraft/net/minecraft/network/packet/Packet51MapChunk.java +@@ -103,6 +103,13 @@ var3 = 12288 * var2; diff --git a/patches/common/net/minecraft/src/Packet56MapChunks.java.patch b/patches/minecraft/net/minecraft/network/packet/Packet56MapChunks.java.patch similarity index 77% rename from patches/common/net/minecraft/src/Packet56MapChunks.java.patch rename to patches/minecraft/net/minecraft/network/packet/Packet56MapChunks.java.patch index 581065efd6..e3ffb50718 100644 --- a/patches/common/net/minecraft/src/Packet56MapChunks.java.patch +++ b/patches/minecraft/net/minecraft/network/packet/Packet56MapChunks.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/Packet56MapChunks.java -+++ ../src_work/common/net/minecraft/src/Packet56MapChunks.java -@@ -121,7 +121,13 @@ +--- ../src_base/minecraft/net/minecraft/network/packet/Packet56MapChunks.java ++++ ../src_work/minecraft/net/minecraft/network/packet/Packet56MapChunks.java +@@ -122,7 +122,13 @@ var7 += this.field_73590_a[var6] >> var8 & 1; } diff --git a/patches/common/net/minecraft/src/PotionEffect.java.patch b/patches/minecraft/net/minecraft/potion/PotionEffect.java.patch similarity index 87% rename from patches/common/net/minecraft/src/PotionEffect.java.patch rename to patches/minecraft/net/minecraft/potion/PotionEffect.java.patch index 1389991412..51081d9ae5 100644 --- a/patches/common/net/minecraft/src/PotionEffect.java.patch +++ b/patches/minecraft/net/minecraft/potion/PotionEffect.java.patch @@ -1,14 +1,18 @@ ---- ../src_base/common/net/minecraft/src/PotionEffect.java -+++ ../src_work/common/net/minecraft/src/PotionEffect.java -@@ -1,4 +1,7 @@ - package net.minecraft.src; -+ +--- ../src_base/minecraft/net/minecraft/potion/PotionEffect.java ++++ ../src_work/minecraft/net/minecraft/potion/PotionEffect.java +@@ -1,6 +1,11 @@ + package net.minecraft.potion; + +import java.util.ArrayList; +import java.util.List; ++ + import net.minecraft.entity.EntityLiving; ++import net.minecraft.item.Item; ++import net.minecraft.item.ItemStack; + import net.minecraft.nbt.NBTTagCompound; public class PotionEffect - { -@@ -13,6 +16,9 @@ +@@ -16,6 +21,9 @@ private boolean field_82723_d; private boolean field_82724_e; @@ -18,7 +22,7 @@ public PotionEffect(int par1, int par2) { this(par1, par2, 0); -@@ -29,6 +35,8 @@ +@@ -32,6 +40,8 @@ this.duration = par2; this.amplifier = par3; this.field_82724_e = par4; @@ -27,7 +31,7 @@ } public PotionEffect(PotionEffect par1PotionEffect) -@@ -36,6 +44,7 @@ +@@ -39,6 +49,7 @@ this.potionID = par1PotionEffect.potionID; this.duration = par1PotionEffect.duration; this.amplifier = par1PotionEffect.amplifier; @@ -35,7 +39,7 @@ } /** -@@ -80,6 +89,63 @@ +@@ -83,6 +94,63 @@ public int getAmplifier() { return this.amplifier; diff --git a/patches/common/net/minecraft/server/MinecraftServer.java.patch b/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch similarity index 90% rename from patches/common/net/minecraft/server/MinecraftServer.java.patch rename to patches/minecraft/net/minecraft/server/MinecraftServer.java.patch index 01ff9a2d64..3bf94f5d92 100644 --- a/patches/common/net/minecraft/server/MinecraftServer.java.patch +++ b/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/server/MinecraftServer.java -+++ ../src_work/common/net/minecraft/server/MinecraftServer.java -@@ -9,6 +9,7 @@ +--- ../src_base/minecraft/net/minecraft/server/MinecraftServer.java ++++ ../src_work/minecraft/net/minecraft/server/MinecraftServer.java +@@ -13,6 +13,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -8,17 +8,18 @@ import java.util.Iterator; import java.util.List; import java.util.logging.Level; -@@ -70,6 +71,9 @@ - import net.minecraft.src.WorldServerMulti; - import net.minecraft.src.WorldSettings; - import net.minecraft.src.WorldType; +@@ -66,6 +67,10 @@ + import net.minecraft.world.storage.ISaveHandler; + import net.minecraft.world.storage.WorldInfo; + +import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.world.WorldEvent; - ++ public abstract class MinecraftServer implements ICommandSender, Runnable, IPlayerUsage { -@@ -151,7 +155,8 @@ + /** The logging system. */ +@@ -146,7 +151,8 @@ public final long[] tickTimeArray = new long[100]; /** Stats are [dimension][tick%100] system.nanoTime is stored. */ @@ -28,7 +29,7 @@ private KeyPair serverKeyPair; /** Username of the server owner (for integrated servers) */ -@@ -242,8 +247,6 @@ +@@ -237,8 +243,6 @@ { this.convertMapIfNeeded(par1Str); this.setUserMessage("menu.loadingLevel"); @@ -37,7 +38,7 @@ ISaveHandler var7 = this.anvilConverterForAnvilFile.getSaveLoader(par1Str, true); WorldInfo var9 = var7.loadWorldInfo(); WorldSettings var8; -@@ -263,46 +266,23 @@ +@@ -258,46 +262,23 @@ var8.enableBonusChest(); } @@ -95,7 +96,7 @@ this.setDifficultyForAllWorlds(this.getDifficulty()); this.initialWorldChunkLoad(); } -@@ -431,7 +411,14 @@ +@@ -426,7 +407,14 @@ for (int var1 = 0; var1 < this.worldServers.length; ++var1) { WorldServer var2 = this.worldServers[var1]; @@ -110,7 +111,7 @@ } if (this.usageSnooper != null && this.usageSnooper.isSnooperRunning()) -@@ -653,13 +640,15 @@ +@@ -649,13 +637,15 @@ this.theProfiler.startSection("levels"); int var1; @@ -131,7 +132,7 @@ this.theProfiler.startSection(var4.getWorldInfo().getWorldName()); this.theProfiler.startSection("pools"); var4.getWorldVec3Pool().clear(); -@@ -706,9 +695,11 @@ +@@ -702,9 +692,11 @@ this.theProfiler.endSection(); } @@ -146,7 +147,7 @@ this.theProfiler.endStartSection("connection"); this.getNetworkThread().networkTick(); this.theProfiler.endStartSection("players"); -@@ -762,7 +753,13 @@ +@@ -758,7 +750,13 @@ */ public WorldServer worldServerForDimension(int par1) { @@ -161,16 +162,7 @@ } @SideOnly(Side.SERVER) -@@ -871,7 +868,7 @@ - - public String getServerModName() - { -- return "vanilla"; -+ return "forge,fml"; - } - - /** -@@ -1133,6 +1130,7 @@ +@@ -1129,6 +1127,7 @@ if (var2 != null) { diff --git a/patches/common/net/minecraft/src/GuiStatsComponent.java.patch b/patches/minecraft/net/minecraft/server/gui/GuiStatsComponent.java.patch similarity index 88% rename from patches/common/net/minecraft/src/GuiStatsComponent.java.patch rename to patches/minecraft/net/minecraft/server/gui/GuiStatsComponent.java.patch index 56c429b8df..00dd3afd53 100644 --- a/patches/common/net/minecraft/src/GuiStatsComponent.java.patch +++ b/patches/minecraft/net/minecraft/server/gui/GuiStatsComponent.java.patch @@ -1,14 +1,15 @@ ---- ../src_base/common/net/minecraft/src/GuiStatsComponent.java -+++ ../src_work/common/net/minecraft/src/GuiStatsComponent.java -@@ -8,6 +8,7 @@ - import java.text.DecimalFormat; - import javax.swing.JComponent; +--- ../src_base/minecraft/net/minecraft/server/gui/GuiStatsComponent.java ++++ ../src_work/minecraft/net/minecraft/server/gui/GuiStatsComponent.java +@@ -10,6 +10,8 @@ + import javax.swing.Timer; + import net.minecraft.network.TcpConnection; import net.minecraft.server.MinecraftServer; ++import net.minecraft.world.WorldServer; +import net.minecraftforge.common.DimensionManager; @SideOnly(Side.SERVER) public class GuiStatsComponent extends JComponent -@@ -41,6 +42,7 @@ +@@ -43,6 +45,7 @@ */ private void updateStats() { @@ -16,7 +17,7 @@ long var1 = Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory(); System.gc(); this.displayStrings[0] = "Memory use: " + var1 / 1024L / 1024L + " mb (" + Runtime.getRuntime().freeMemory() * 100L / Runtime.getRuntime().maxMemory() + "% free)"; -@@ -51,15 +53,18 @@ +@@ -53,15 +56,18 @@ if (this.field_79017_e.worldServers != null) { diff --git a/patches/minecraft/net/minecraft/src/IntegratedServer.java.patch b/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch similarity index 89% rename from patches/minecraft/net/minecraft/src/IntegratedServer.java.patch rename to patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch index 78a8f2c7f5..ed03c1af38 100644 --- a/patches/minecraft/net/minecraft/src/IntegratedServer.java.patch +++ b/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch @@ -1,16 +1,17 @@ ---- ../src_base/minecraft/net/minecraft/src/IntegratedServer.java -+++ ../src_work/minecraft/net/minecraft/src/IntegratedServer.java -@@ -8,6 +8,9 @@ - import cpw.mods.fml.common.FMLCommonHandler; - import net.minecraft.client.Minecraft; - import net.minecraft.server.MinecraftServer; +--- ../src_base/minecraft/net/minecraft/server/integrated/IntegratedServer.java ++++ ../src_work/minecraft/net/minecraft/server/integrated/IntegratedServer.java +@@ -21,6 +21,10 @@ + import net.minecraft.world.demo.DemoWorldServer; + import net.minecraft.world.storage.ISaveHandler; + +import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.world.WorldEvent; - ++ @SideOnly(Side.CLIENT) public class IntegratedServer extends MinecraftServer -@@ -48,44 +51,22 @@ + { +@@ -60,44 +64,22 @@ protected void loadAllWorlds(String par1Str, String par2Str, long par3, WorldType par5WorldType, String par6Str) { this.convertMapIfNeeded(par1Str); diff --git a/patches/common/net/minecraft/src/PlayerInstance.java.patch b/patches/minecraft/net/minecraft/server/management/PlayerInstance.java.patch similarity index 85% rename from patches/common/net/minecraft/src/PlayerInstance.java.patch rename to patches/minecraft/net/minecraft/server/management/PlayerInstance.java.patch index 0d4bcdfd0f..7c654c4b5a 100644 --- a/patches/common/net/minecraft/src/PlayerInstance.java.patch +++ b/patches/minecraft/net/minecraft/server/management/PlayerInstance.java.patch @@ -1,8 +1,8 @@ ---- ../src_base/common/net/minecraft/src/PlayerInstance.java -+++ ../src_work/common/net/minecraft/src/PlayerInstance.java -@@ -3,9 +3,12 @@ - import java.util.ArrayList; - import java.util.List; +--- ../src_base/minecraft/net/minecraft/server/management/PlayerInstance.java ++++ ../src_work/minecraft/net/minecraft/server/management/PlayerInstance.java +@@ -10,9 +10,12 @@ + import net.minecraft.tileentity.TileEntity; + import net.minecraft.world.ChunkCoordIntPair; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.world.ChunkWatchEvent; @@ -14,7 +14,7 @@ /** note: this is final */ private final ChunkCoordIntPair chunkLocation; -@@ -48,6 +51,8 @@ +@@ -55,6 +58,8 @@ par1EntityPlayerMP.playerNetServerHandler.sendPacketToPlayer(new Packet51MapChunk(PlayerManager.getWorldServer(this.myManager).getChunkFromChunkCoords(this.chunkLocation.chunkXPos, this.chunkLocation.chunkZPos), true, 0)); this.playersInChunk.remove(par1EntityPlayerMP); par1EntityPlayerMP.loadedChunks.remove(this.chunkLocation); @@ -23,7 +23,7 @@ if (this.playersInChunk.isEmpty()) { -@@ -137,7 +142,10 @@ +@@ -144,7 +149,10 @@ if ((this.field_73260_f & 1 << var3) != 0) { var4 = var3 << 4; diff --git a/patches/common/net/minecraft/src/ServerConfigurationManager.java.patch b/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch similarity index 88% rename from patches/common/net/minecraft/src/ServerConfigurationManager.java.patch rename to patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch index 8d9af2579d..28cb9d8cf1 100644 --- a/patches/common/net/minecraft/src/ServerConfigurationManager.java.patch +++ b/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch @@ -1,14 +1,21 @@ ---- ../src_base/common/net/minecraft/src/ServerConfigurationManager.java -+++ ../src_work/common/net/minecraft/src/ServerConfigurationManager.java -@@ -17,6 +17,7 @@ - import cpw.mods.fml.common.network.NetworkRegistry; - import cpw.mods.fml.common.registry.GameRegistry; - import net.minecraft.server.MinecraftServer; +--- ../src_base/minecraft/net/minecraft/server/management/ServerConfigurationManager.java ++++ ../src_work/minecraft/net/minecraft/server/management/ServerConfigurationManager.java +@@ -38,10 +38,14 @@ + import net.minecraft.util.ChunkCoordinates; + import net.minecraft.util.MathHelper; + import net.minecraft.world.EnumGameType; ++import net.minecraft.world.Teleporter; + import net.minecraft.world.World; ++import net.minecraft.world.WorldProvider; + import net.minecraft.world.WorldServer; + import net.minecraft.world.demo.DemoWorldManager; + import net.minecraft.world.storage.IPlayerFileData; ++ +import net.minecraftforge.common.DimensionManager; public abstract class ServerConfigurationManager { -@@ -296,6 +297,16 @@ +@@ -322,6 +326,16 @@ */ public EntityPlayerMP respawnPlayer(EntityPlayerMP par1EntityPlayerMP, int par2, boolean par3) { @@ -25,7 +32,7 @@ par1EntityPlayerMP.getServerForPlayer().getEntityTracker().removeAllTrackingPlayers(par1EntityPlayerMP); par1EntityPlayerMP.getServerForPlayer().getEntityTracker().removeEntityFromAllTrackingPlayers(par1EntityPlayerMP); par1EntityPlayerMP.getServerForPlayer().getPlayerManager().removePlayer(par1EntityPlayerMP); -@@ -318,6 +329,7 @@ +@@ -344,6 +358,7 @@ EntityPlayerMP var7 = new EntityPlayerMP(this.mcServer, this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension), par1EntityPlayerMP.username, (ItemInWorldManager)var6); var7.playerNetServerHandler = par1EntityPlayerMP.playerNetServerHandler; var7.clonePlayer(par1EntityPlayerMP, par3); @@ -33,7 +40,7 @@ var7.entityId = par1EntityPlayerMP.entityId; WorldServer var8 = this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension); this.func_72381_a(var7, par1EntityPlayerMP, var8); -@@ -361,14 +373,20 @@ +@@ -387,14 +402,20 @@ public void transferPlayerToDimension(EntityPlayerMP par1EntityPlayerMP, int par2) { @@ -55,7 +62,7 @@ this.func_72375_a(par1EntityPlayerMP, var4); par1EntityPlayerMP.playerNetServerHandler.setPlayerLocation(par1EntityPlayerMP.posX, par1EntityPlayerMP.posY, par1EntityPlayerMP.posZ, par1EntityPlayerMP.rotationYaw, par1EntityPlayerMP.rotationPitch); par1EntityPlayerMP.theItemInWorldManager.setWorld(var5); -@@ -389,38 +407,23 @@ +@@ -416,38 +437,23 @@ */ public void transferEntityToWorld(Entity par1Entity, int par2, WorldServer par3WorldServer, WorldServer par4WorldServer) { @@ -105,7 +112,7 @@ { ChunkCoordinates var18; -@@ -457,7 +460,7 @@ +@@ -484,7 +490,7 @@ par4WorldServer.spawnEntityInWorld(par1Entity); par1Entity.setLocationAndAngles(var5, par1Entity.posY, var7, par1Entity.rotationYaw, par1Entity.rotationPitch); par4WorldServer.updateEntityWithOptionalForce(par1Entity, false); diff --git a/patches/minecraft/net/minecraft/src/ModelBase.java.patch b/patches/minecraft/net/minecraft/src/ModelBase.java.patch deleted file mode 100644 index 3e27bba295..0000000000 --- a/patches/minecraft/net/minecraft/src/ModelBase.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ../src_base/minecraft/net/minecraft/src/ModelBase.java -+++ ../src_work/minecraft/net/minecraft/src/ModelBase.java -@@ -8,7 +8,6 @@ - import java.util.Map; - import java.util.Random; - --@SideOnly(Side.CLIENT) - public abstract class ModelBase - { - public float onGround; diff --git a/patches/minecraft/net/minecraft/src/PositionTextureVertex.java.patch b/patches/minecraft/net/minecraft/src/PositionTextureVertex.java.patch deleted file mode 100644 index 4ded62ff0c..0000000000 --- a/patches/minecraft/net/minecraft/src/PositionTextureVertex.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ../src_base/minecraft/net/minecraft/src/PositionTextureVertex.java -+++ ../src_work/minecraft/net/minecraft/src/PositionTextureVertex.java -@@ -3,7 +3,6 @@ - import cpw.mods.fml.common.Side; - import cpw.mods.fml.common.asm.SideOnly; - --@SideOnly(Side.CLIENT) - public class PositionTextureVertex - { - public Vec3 vector3D; diff --git a/patches/minecraft/net/minecraft/src/TexturedQuad.java.patch b/patches/minecraft/net/minecraft/src/TexturedQuad.java.patch deleted file mode 100644 index f5882d1eff..0000000000 --- a/patches/minecraft/net/minecraft/src/TexturedQuad.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ../src_base/minecraft/net/minecraft/src/TexturedQuad.java -+++ ../src_work/minecraft/net/minecraft/src/TexturedQuad.java -@@ -3,7 +3,6 @@ - import cpw.mods.fml.common.Side; - import cpw.mods.fml.common.asm.SideOnly; - --@SideOnly(Side.CLIENT) - public class TexturedQuad - { - public PositionTextureVertex[] vertexPositions; diff --git a/patches/common/net/minecraft/src/StatList.java.patch b/patches/minecraft/net/minecraft/stats/StatList.java.patch similarity index 75% rename from patches/common/net/minecraft/src/StatList.java.patch rename to patches/minecraft/net/minecraft/stats/StatList.java.patch index 0e07717867..57861631ff 100644 --- a/patches/common/net/minecraft/src/StatList.java.patch +++ b/patches/minecraft/net/minecraft/stats/StatList.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/StatList.java -+++ ../src_work/common/net/minecraft/src/StatList.java -@@ -175,9 +175,9 @@ +--- ../src_base/minecraft/net/minecraft/stats/StatList.java ++++ ../src_work/minecraft/net/minecraft/stats/StatList.java +@@ -182,9 +182,9 @@ */ private static StatBase[] initMinableStats(String par0Str, int par1) { diff --git a/patches/common/net/minecraft/src/TileEntity.java.patch b/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch similarity index 78% rename from patches/common/net/minecraft/src/TileEntity.java.patch rename to patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch index f41c4bfe07..e9a418748d 100644 --- a/patches/common/net/minecraft/src/TileEntity.java.patch +++ b/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch @@ -1,6 +1,16 @@ ---- ../src_base/common/net/minecraft/src/TileEntity.java -+++ ../src_work/common/net/minecraft/src/TileEntity.java -@@ -287,4 +287,52 @@ +--- ../src_base/minecraft/net/minecraft/tileentity/TileEntity.java ++++ ../src_work/minecraft/net/minecraft/tileentity/TileEntity.java +@@ -11,7 +11,9 @@ + import net.minecraft.block.TileEntityRecordPlayer; + import net.minecraft.crash.CrashReportCategory; + import net.minecraft.nbt.NBTTagCompound; ++import net.minecraft.network.INetworkManager; + import net.minecraft.network.packet.Packet; ++import net.minecraft.network.packet.Packet132TileEntityData; + import net.minecraft.world.World; + + public class TileEntity +@@ -296,4 +298,52 @@ addMapping(TileEntityBeacon.class, "Beacon"); addMapping(TileEntitySkull.class, "Skull"); } diff --git a/patches/common/net/minecraft/src/TileEntityBeacon.java.patch b/patches/minecraft/net/minecraft/tileentity/TileEntityBeacon.java.patch similarity index 79% rename from patches/common/net/minecraft/src/TileEntityBeacon.java.patch rename to patches/minecraft/net/minecraft/tileentity/TileEntityBeacon.java.patch index 4bc5b15c81..b594acb93f 100644 --- a/patches/common/net/minecraft/src/TileEntityBeacon.java.patch +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityBeacon.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/TileEntityBeacon.java -+++ ../src_work/common/net/minecraft/src/TileEntityBeacon.java -@@ -104,8 +104,9 @@ +--- ../src_base/minecraft/net/minecraft/tileentity/TileEntityBeacon.java ++++ ../src_work/minecraft/net/minecraft/tileentity/TileEntityBeacon.java +@@ -114,8 +114,9 @@ for (int var5 = this.zCoord - var1; var5 <= this.zCoord + var1; ++var5) { int var6 = this.worldObj.getBlockId(var4, var2, var5); diff --git a/patches/common/net/minecraft/src/TileEntityBrewingStand.java.patch b/patches/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.java.patch similarity index 78% rename from patches/common/net/minecraft/src/TileEntityBrewingStand.java.patch rename to patches/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.java.patch index f721ef0674..215dfd1e5a 100644 --- a/patches/common/net/minecraft/src/TileEntityBrewingStand.java.patch +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.java.patch @@ -1,8 +1,8 @@ ---- ../src_base/common/net/minecraft/src/TileEntityBrewingStand.java -+++ ../src_work/common/net/minecraft/src/TileEntityBrewingStand.java -@@ -4,7 +4,10 @@ - import cpw.mods.fml.common.asm.SideOnly; - import java.util.List; +--- ../src_base/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.java ++++ ../src_work/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.java +@@ -12,7 +12,10 @@ + import net.minecraft.nbt.NBTTagList; + import net.minecraft.potion.PotionHelper; -public class TileEntityBrewingStand extends TileEntity implements IInventory +import net.minecraftforge.common.ISidedInventory; @@ -12,7 +12,7 @@ { /** The itemstacks currently placed in the slots of the brewing stand */ private ItemStack[] brewingItemStacks = new ItemStack[4]; -@@ -158,7 +161,7 @@ +@@ -166,7 +169,7 @@ if (Item.itemsList[var1.itemID].hasContainerItem()) { @@ -21,7 +21,7 @@ } else { -@@ -325,4 +328,16 @@ +@@ -333,4 +336,16 @@ return var1; } diff --git a/patches/common/net/minecraft/src/TileEntityFurnace.java.patch b/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch similarity index 83% rename from patches/common/net/minecraft/src/TileEntityFurnace.java.patch rename to patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch index 0441adda28..d3cad9cc80 100644 --- a/patches/common/net/minecraft/src/TileEntityFurnace.java.patch +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch @@ -1,21 +1,26 @@ ---- ../src_base/common/net/minecraft/src/TileEntityFurnace.java -+++ ../src_work/common/net/minecraft/src/TileEntityFurnace.java -@@ -1,11 +1,13 @@ - package net.minecraft.src; - -+import net.minecraftforge.common.ISidedInventory; -+import net.minecraftforge.common.ForgeDirection; - import cpw.mods.fml.common.registry.GameRegistry; - - import cpw.mods.fml.common.Side; - import cpw.mods.fml.common.asm.SideOnly; +--- ../src_base/minecraft/net/minecraft/tileentity/TileEntityFurnace.java ++++ ../src_work/minecraft/net/minecraft/tileentity/TileEntityFurnace.java +@@ -9,6 +9,7 @@ + import net.minecraft.entity.player.EntityPlayer; + import net.minecraft.inventory.IInventory; + import net.minecraft.item.Item; ++import net.minecraft.item.ItemBlock; + import net.minecraft.item.ItemHoe; + import net.minecraft.item.ItemStack; + import net.minecraft.item.ItemSword; +@@ -17,7 +18,10 @@ + import net.minecraft.nbt.NBTTagCompound; + import net.minecraft.nbt.NBTTagList; -public class TileEntityFurnace extends TileEntity implements IInventory ++import net.minecraftforge.common.ForgeDirection; ++import net.minecraftforge.common.ISidedInventory; ++ +public class TileEntityFurnace extends TileEntity implements IInventory, ISidedInventory { /** * The ItemStacks that hold the items currently being used in the furnace -@@ -235,8 +237,7 @@ +@@ -247,8 +251,7 @@ if (this.furnaceItemStacks[1].stackSize == 0) { @@ -25,7 +30,7 @@ } } } -@@ -282,8 +283,12 @@ +@@ -294,8 +297,12 @@ } else { @@ -40,7 +45,7 @@ } } -@@ -294,15 +299,15 @@ +@@ -306,15 +313,15 @@ { if (this.canSmelt()) { @@ -60,7 +65,7 @@ } --this.furnaceItemStacks[0].stackSize; -@@ -329,7 +334,7 @@ +@@ -341,7 +348,7 @@ int var1 = par0ItemStack.getItem().shiftedIndex; Item var2 = par0ItemStack.getItem(); @@ -69,7 +74,7 @@ { Block var3 = Block.blocksList[var1]; -@@ -374,4 +379,18 @@ +@@ -387,4 +394,18 @@ public void openChest() {} public void closeChest() {} diff --git a/patches/common/net/minecraft/src/MovingObjectPosition.java.patch b/patches/minecraft/net/minecraft/util/MovingObjectPosition.java.patch similarity index 60% rename from patches/common/net/minecraft/src/MovingObjectPosition.java.patch rename to patches/minecraft/net/minecraft/util/MovingObjectPosition.java.patch index a9c5e9a6c5..df6dea4aa9 100644 --- a/patches/common/net/minecraft/src/MovingObjectPosition.java.patch +++ b/patches/minecraft/net/minecraft/util/MovingObjectPosition.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/MovingObjectPosition.java -+++ ../src_work/common/net/minecraft/src/MovingObjectPosition.java -@@ -25,6 +25,9 @@ +--- ../src_base/minecraft/net/minecraft/util/MovingObjectPosition.java ++++ ../src_work/minecraft/net/minecraft/util/MovingObjectPosition.java +@@ -27,6 +27,9 @@ /** The hit entity */ public Entity entityHit; diff --git a/patches/minecraft/net/minecraft/src/ThreadDownloadResources.java.patch b/patches/minecraft/net/minecraft/util/ThreadDownloadResources.java.patch similarity index 91% rename from patches/minecraft/net/minecraft/src/ThreadDownloadResources.java.patch rename to patches/minecraft/net/minecraft/util/ThreadDownloadResources.java.patch index 268240f4b1..efcc1e59c2 100644 --- a/patches/minecraft/net/minecraft/src/ThreadDownloadResources.java.patch +++ b/patches/minecraft/net/minecraft/util/ThreadDownloadResources.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ThreadDownloadResources.java -+++ ../src_work/minecraft/net/minecraft/src/ThreadDownloadResources.java +--- ../src_base/minecraft/net/minecraft/util/ThreadDownloadResources.java ++++ ../src_work/minecraft/net/minecraft/util/ThreadDownloadResources.java @@ -8,6 +8,8 @@ import java.io.FileOutputStream; import java.io.IOException; diff --git a/patches/common/net/minecraft/src/WeightedRandomChestContent.java.patch b/patches/minecraft/net/minecraft/util/WeightedRandomChestContent.java.patch similarity index 90% rename from patches/common/net/minecraft/src/WeightedRandomChestContent.java.patch rename to patches/minecraft/net/minecraft/util/WeightedRandomChestContent.java.patch index 6d0a763998..dd63685673 100644 --- a/patches/common/net/minecraft/src/WeightedRandomChestContent.java.patch +++ b/patches/minecraft/net/minecraft/util/WeightedRandomChestContent.java.patch @@ -1,15 +1,14 @@ ---- ../src_base/common/net/minecraft/src/WeightedRandomChestContent.java -+++ ../src_work/common/net/minecraft/src/WeightedRandomChestContent.java -@@ -1,6 +1,8 @@ - package net.minecraft.src; - - import java.util.Random; -+ +--- ../src_base/minecraft/net/minecraft/util/WeightedRandomChestContent.java ++++ ../src_work/minecraft/net/minecraft/util/WeightedRandomChestContent.java +@@ -5,6 +5,7 @@ + import net.minecraft.item.ItemStack; + import net.minecraft.tileentity.TileEntityChest; + import net.minecraft.tileentity.TileEntityDispenser; +import net.minecraftforge.common.ChestGenHooks; public class WeightedRandomChestContent extends WeightedRandomItem { -@@ -15,6 +17,8 @@ +@@ -19,6 +20,8 @@ /** The maximum chance of item generating. */ private int theMaximumChanceToGenerateItem; @@ -18,7 +17,7 @@ public WeightedRandomChestContent(int par1, int par2, int par3, int par4, int par5) { -@@ -23,8 +27,16 @@ +@@ -27,8 +30,16 @@ this.theItemDamage = par2; this.theMinimumChanceToGenerateItem = par3; this.theMaximumChanceToGenerateItem = par4; @@ -36,7 +35,7 @@ /** * Generates the Chest contents. */ -@@ -33,18 +45,11 @@ +@@ -37,18 +48,11 @@ for (int var4 = 0; var4 < par3; ++var4) { WeightedRandomChestContent var5 = (WeightedRandomChestContent)WeightedRandom.getRandomItem(par0Random, par1ArrayOfWeightedRandomChestContent); @@ -58,7 +57,7 @@ } } } -@@ -57,18 +62,11 @@ +@@ -61,18 +65,11 @@ for (int var4 = 0; var4 < par3; ++var4) { WeightedRandomChestContent var5 = (WeightedRandomChestContent)WeightedRandom.getRandomItem(par0Random, par1ArrayOfWeightedRandomChestContent); diff --git a/patches/common/net/minecraft/src/ChunkCache.java.patch b/patches/minecraft/net/minecraft/world/ChunkCache.java.patch similarity index 87% rename from patches/common/net/minecraft/src/ChunkCache.java.patch rename to patches/minecraft/net/minecraft/world/ChunkCache.java.patch index 2fd8b14280..2b7ba413b2 100644 --- a/patches/common/net/minecraft/src/ChunkCache.java.patch +++ b/patches/minecraft/net/minecraft/world/ChunkCache.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/ChunkCache.java -+++ ../src_work/common/net/minecraft/src/ChunkCache.java -@@ -91,7 +91,15 @@ +--- ../src_base/minecraft/net/minecraft/world/ChunkCache.java ++++ ../src_work/minecraft/net/minecraft/world/ChunkCache.java +@@ -99,7 +99,15 @@ { int var4 = (par1 >> 4) - this.chunkX; int var5 = (par3 >> 4) - this.chunkZ; @@ -17,7 +17,7 @@ } @SideOnly(Side.CLIENT) -@@ -239,7 +247,12 @@ +@@ -247,7 +255,12 @@ { int var4 = (par1 >> 4) - this.chunkX; int var5 = (par3 >> 4) - this.chunkZ; diff --git a/patches/common/net/minecraft/src/Explosion.java.patch b/patches/minecraft/net/minecraft/world/Explosion.java.patch similarity index 82% rename from patches/common/net/minecraft/src/Explosion.java.patch rename to patches/minecraft/net/minecraft/world/Explosion.java.patch index d0a5daeada..247436804a 100644 --- a/patches/common/net/minecraft/src/Explosion.java.patch +++ b/patches/minecraft/net/minecraft/world/Explosion.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/Explosion.java -+++ ../src_work/common/net/minecraft/src/Explosion.java -@@ -82,7 +82,7 @@ +--- ../src_base/minecraft/net/minecraft/world/Explosion.java ++++ ../src_work/minecraft/net/minecraft/world/Explosion.java +@@ -89,7 +89,7 @@ if (var25 > 0) { Block var26 = Block.blocksList[var25]; diff --git a/patches/common/net/minecraft/src/SpawnerAnimals.java.patch b/patches/minecraft/net/minecraft/world/SpawnerAnimals.java.patch similarity index 83% rename from patches/common/net/minecraft/src/SpawnerAnimals.java.patch rename to patches/minecraft/net/minecraft/world/SpawnerAnimals.java.patch index c96e946711..c1d560a7a2 100644 --- a/patches/common/net/minecraft/src/SpawnerAnimals.java.patch +++ b/patches/minecraft/net/minecraft/world/SpawnerAnimals.java.patch @@ -1,21 +1,24 @@ ---- ../src_base/common/net/minecraft/src/SpawnerAnimals.java -+++ ../src_work/common/net/minecraft/src/SpawnerAnimals.java -@@ -1,9 +1,14 @@ - package net.minecraft.src; +--- ../src_base/minecraft/net/minecraft/world/SpawnerAnimals.java ++++ ../src_work/minecraft/net/minecraft/world/SpawnerAnimals.java +@@ -1,5 +1,7 @@ + package net.minecraft.world; +import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.List; - import java.util.Random; -+ +@@ -19,6 +21,9 @@ + import net.minecraft.world.biome.SpawnListEntry; + import net.minecraft.world.chunk.Chunk; + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.living.LivingSpecialSpawnEvent; - ++ public final class SpawnerAnimals { -@@ -79,6 +84,9 @@ + /** The 17x17 area around the player where mobs can spawn */ +@@ -93,6 +98,9 @@ if ((!var35.getPeacefulCreature() || par2) && (var35.getPeacefulCreature() || par1) && (!var35.getAnimal() || par3) && par0WorldServer.countEntities(var35.getCreatureClass()) <= var35.getMaxNumberOfCreature() * eligibleChunksForSpawning.size() / 256) { Iterator var37 = eligibleChunksForSpawning.keySet().iterator(); @@ -25,7 +28,7 @@ label110: while (var37.hasNext()) -@@ -207,7 +215,8 @@ +@@ -221,7 +229,8 @@ else { int var5 = par1World.getBlockId(par2, par3 - 1, par4); @@ -35,7 +38,7 @@ } } -@@ -216,6 +225,11 @@ +@@ -230,6 +239,11 @@ */ private static void creatureSpecificInit(EntityLiving par0EntityLiving, World par1World, float par2, float par3, float par4) { diff --git a/patches/common/net/minecraft/src/World.java.patch b/patches/minecraft/net/minecraft/world/World.java.patch similarity index 95% rename from patches/common/net/minecraft/src/World.java.patch rename to patches/minecraft/net/minecraft/world/World.java.patch index 31599d75ee..319bd39105 100644 --- a/patches/common/net/minecraft/src/World.java.patch +++ b/patches/minecraft/net/minecraft/world/World.java.patch @@ -1,8 +1,8 @@ ---- ../src_base/common/net/minecraft/src/World.java -+++ ../src_work/common/net/minecraft/src/World.java -@@ -11,8 +11,30 @@ - import java.util.Random; - import java.util.Set; +--- ../src_base/minecraft/net/minecraft/world/World.java ++++ ../src_work/minecraft/net/minecraft/world/World.java +@@ -43,8 +43,30 @@ + import net.minecraft.world.storage.MapStorage; + import net.minecraft.world.storage.WorldInfo; +import com.google.common.collect.ImmutableSetMultimap; + @@ -31,7 +31,7 @@ /** * boolean; if true updates scheduled by scheduleBlockUpdate happen immediately */ -@@ -137,6 +159,11 @@ +@@ -169,6 +191,11 @@ * Gets the biome for a given set of x/z coordinates */ public BiomeGenBase getBiomeGenForCoords(int par1, int par2) @@ -43,7 +43,7 @@ { if (this.blockExists(par1, 0, par2)) { -@@ -167,7 +194,13 @@ +@@ -199,7 +226,13 @@ this.theProfiler = par5Profiler; this.worldInfo = new WorldInfo(par4WorldSettings, par2Str); this.provider = par3WorldProvider; @@ -58,7 +58,7 @@ VillageCollection var6 = (VillageCollection)this.mapStorage.loadData(VillageCollection.class, "villages"); if (var6 == null) -@@ -181,7 +214,7 @@ +@@ -213,7 +246,7 @@ this.villageCollectionObj.func_82566_a(this); } @@ -67,7 +67,7 @@ this.chunkProvider = this.createChunkProvider(); this.calculateInitialSkylight(); this.calculateInitialWeather(); -@@ -195,7 +228,7 @@ +@@ -227,7 +260,7 @@ this.isRemote = false; this.saveHandler = par1ISaveHandler; this.theProfiler = par5Profiler; @@ -76,7 +76,7 @@ this.worldInfo = par1ISaveHandler.loadWorldInfo(); if (par4WorldProvider != null) -@@ -248,12 +281,20 @@ +@@ -280,12 +313,20 @@ this.worldInfo.setServerInitialized(true); } @@ -99,7 +99,7 @@ } else { -@@ -263,6 +304,19 @@ +@@ -295,6 +336,19 @@ this.calculateInitialSkylight(); this.calculateInitialWeather(); @@ -119,7 +119,7 @@ } /** -@@ -351,7 +405,8 @@ +@@ -383,7 +437,8 @@ */ public boolean isAirBlock(int par1, int par2, int par3) { @@ -129,7 +129,7 @@ } /** -@@ -360,7 +415,8 @@ +@@ -392,7 +447,8 @@ public boolean blockHasTileEntity(int par1, int par2, int par3) { int var4 = this.getBlockId(par1, par2, par3); @@ -139,7 +139,7 @@ } public int func_85175_e(int par1, int par2, int par3) -@@ -1102,7 +1158,7 @@ +@@ -1134,7 +1190,7 @@ */ public boolean isDaytime() { @@ -148,7 +148,7 @@ } /** -@@ -1134,7 +1190,7 @@ +@@ -1166,7 +1222,7 @@ int var12 = this.getBlockMetadata(var8, var9, var10); Block var13 = Block.blocksList[var11]; @@ -157,7 +157,7 @@ { MovingObjectPosition var14 = var13.collisionRayTrace(this, var8, var9, var10, par1Vec3, par2Vec3); -@@ -1334,6 +1390,12 @@ +@@ -1366,6 +1422,12 @@ */ public void playSoundAtEntity(Entity par1Entity, String par2Str, float par3, float par4) { @@ -170,7 +170,7 @@ if (par1Entity != null && par2Str != null) { for (int var5 = 0; var5 < this.worldAccesses.size(); ++var5) -@@ -1431,6 +1493,11 @@ +@@ -1463,6 +1525,11 @@ EntityPlayer var5 = (EntityPlayer)par1Entity; this.playerEntities.add(var5); this.updateAllPlayersSleepingFlag(); @@ -182,7 +182,7 @@ } this.getChunkFromChunkCoords(var2, var3).addEntity(par1Entity); -@@ -1674,6 +1741,12 @@ +@@ -1706,6 +1773,12 @@ * Calculates the color for the skybox */ public Vec3 getSkyColor(Entity par1Entity, float par2) @@ -195,7 +195,7 @@ { float var3 = this.getCelestialAngle(par2); float var4 = MathHelper.cos(var3 * (float)Math.PI * 2.0F) * 2.0F + 0.5F; -@@ -1769,6 +1842,12 @@ +@@ -1801,6 +1874,12 @@ @SideOnly(Side.CLIENT) public Vec3 drawClouds(float par1) { @@ -208,7 +208,7 @@ float var2 = this.getCelestialAngle(par1); float var3 = MathHelper.cos(var2 * (float)Math.PI * 2.0F) * 2.0F + 0.5F; -@@ -1847,7 +1926,7 @@ +@@ -1879,7 +1958,7 @@ { int var5 = var3.getBlockID(par1, var4, par2); @@ -217,7 +217,7 @@ { return var4 + 1; } -@@ -1862,6 +1941,12 @@ +@@ -1894,6 +1973,12 @@ * How bright are stars in the sky */ public float getStarBrightness(float par1) @@ -230,7 +230,7 @@ { float var2 = this.getCelestialAngle(par1); float var3 = 1.0F - (MathHelper.cos(var2 * (float)Math.PI * 2.0F) * 2.0F + 0.25F); -@@ -2062,7 +2147,7 @@ +@@ -2094,7 +2179,7 @@ if (var11 != null) { @@ -239,7 +239,7 @@ } } } -@@ -2070,6 +2155,10 @@ +@@ -2103,6 +2188,10 @@ if (!this.entityRemoval.isEmpty()) { @@ -250,7 +250,7 @@ this.loadedTileEntityList.removeAll(this.entityRemoval); this.entityRemoval.clear(); } -@@ -2090,18 +2179,18 @@ +@@ -2123,18 +2212,18 @@ { this.loadedTileEntityList.add(var12); } @@ -273,7 +273,7 @@ } } -@@ -2114,13 +2203,13 @@ +@@ -2147,13 +2236,13 @@ public void addTileEntity(Collection par1Collection) { @@ -294,7 +294,7 @@ } } -@@ -2140,9 +2229,17 @@ +@@ -2173,9 +2262,17 @@ { int var3 = MathHelper.floor_double(par1Entity.posX); int var4 = MathHelper.floor_double(par1Entity.posZ); @@ -315,7 +315,7 @@ { par1Entity.lastTickPosX = par1Entity.posX; par1Entity.lastTickPosY = par1Entity.posY; -@@ -2374,6 +2471,14 @@ +@@ -2407,6 +2504,14 @@ { return true; } @@ -330,7 +330,7 @@ } } } -@@ -2679,25 +2784,21 @@ +@@ -2712,25 +2817,21 @@ */ public void setBlockTileEntity(int par1, int par2, int par3, TileEntity par4TileEntity) { @@ -371,7 +371,7 @@ } } -@@ -2706,27 +2807,10 @@ +@@ -2739,27 +2840,10 @@ */ public void removeBlockTileEntity(int par1, int par2, int par3) { @@ -403,7 +403,7 @@ } } -@@ -2752,7 +2836,8 @@ +@@ -2785,7 +2869,8 @@ */ public boolean isBlockNormalCube(int par1, int par2, int par3) { @@ -413,7 +413,7 @@ } public boolean func_85174_u(int par1, int par2, int par3) -@@ -2775,8 +2860,7 @@ +@@ -2808,8 +2893,7 @@ */ public boolean doesBlockHaveSolidTopSurface(int par1, int par2, int par3) { @@ -423,7 +423,7 @@ } /** -@@ -2792,7 +2876,7 @@ +@@ -2825,7 +2909,7 @@ if (var5 != null && !var5.isEmpty()) { Block var6 = Block.blocksList[this.getBlockId(par1, par2, par3)]; @@ -432,7 +432,7 @@ } else { -@@ -2823,8 +2907,7 @@ +@@ -2856,8 +2940,7 @@ */ public void setAllowedSpawnTypes(boolean par1, boolean par2) { @@ -442,7 +442,7 @@ } /** -@@ -2840,6 +2923,11 @@ +@@ -2873,6 +2956,11 @@ */ private void calculateInitialWeather() { @@ -454,7 +454,7 @@ if (this.worldInfo.isRaining()) { this.rainingStrength = 1.0F; -@@ -2855,6 +2943,11 @@ +@@ -2888,6 +2976,11 @@ * Updates all weather states. */ protected void updateWeather() @@ -466,7 +466,7 @@ { if (!this.provider.hasNoSky) { -@@ -2957,12 +3050,14 @@ +@@ -2990,12 +3083,14 @@ public void toggleRain() { @@ -482,7 +482,7 @@ this.theProfiler.startSection("buildList"); int var1; EntityPlayer var2; -@@ -3069,6 +3164,11 @@ +@@ -3102,6 +3197,11 @@ */ public boolean canBlockFreeze(int par1, int par2, int par3, boolean par4) { @@ -494,7 +494,7 @@ BiomeGenBase var5 = this.getBiomeGenForCoords(par1, par3); float var6 = var5.getFloatTemperature(); -@@ -3126,6 +3226,11 @@ +@@ -3159,6 +3259,11 @@ * Tests whether or not snow can be placed at a given location */ public boolean canSnowAt(int par1, int par2, int par3) @@ -506,7 +506,7 @@ { BiomeGenBase var4 = this.getBiomeGenForCoords(par1, par3); float var5 = var4.getFloatTemperature(); -@@ -3219,7 +3324,7 @@ +@@ -3252,7 +3357,7 @@ private int computeBlockLightValue(int par1, int par2, int par3, int par4, int par5, int par6) { @@ -515,7 +515,7 @@ int var8 = this.getSavedLightValue(EnumSkyBlock.Block, par2 - 1, par3, par4) - par6; int var9 = this.getSavedLightValue(EnumSkyBlock.Block, par2 + 1, par3, par4) - par6; int var10 = this.getSavedLightValue(EnumSkyBlock.Block, par2, par3 - 1, par4) - par6; -@@ -3354,7 +3459,7 @@ +@@ -3387,7 +3492,7 @@ int var21 = var24 + (var18 / 2 + 1) % 3 / 2 * var19; int var22 = var12 + (var18 / 2 + 2) % 3 / 2 * var19; var14 = this.getSavedLightValue(par1EnumSkyBlock, var20, var21, var22); @@ -524,7 +524,7 @@ if (var23 == 0) { -@@ -3385,7 +3490,7 @@ +@@ -3418,7 +3523,7 @@ var12 = (var9 >> 12 & 63) - 32 + par4; var13 = this.getSavedLightValue(par1EnumSkyBlock, var10, var24, var12); var14 = this.getBlockId(var10, var24, var12); @@ -533,7 +533,7 @@ if (var15 == 0) { -@@ -3487,10 +3592,10 @@ +@@ -3520,10 +3625,10 @@ public List getEntitiesWithinAABBExcludingEntity(Entity par1Entity, AxisAlignedBB par2AxisAlignedBB) { this.entitiesWithinAABBExcludingEntity.clear(); @@ -548,7 +548,7 @@ for (int var7 = var3; var7 <= var4; ++var7) { -@@ -3516,10 +3621,10 @@ +@@ -3549,10 +3654,10 @@ public List selectEntitiesWithinAABB(Class par1Class, AxisAlignedBB par2AxisAlignedBB, IEntitySelector par3IEntitySelector) { @@ -563,7 +563,7 @@ ArrayList var8 = new ArrayList(); for (int var9 = var4; var9 <= var5; ++var9) -@@ -3612,11 +3717,14 @@ +@@ -3645,11 +3750,14 @@ */ public void addLoadedEntities(List par1List) { @@ -581,7 +581,7 @@ } } -@@ -3650,6 +3758,11 @@ +@@ -3683,6 +3791,11 @@ else { if (var9 != null && (var9 == Block.waterMoving || var9 == Block.waterStill || var9 == Block.lavaMoving || var9 == Block.lavaStill || var9 == Block.fire || var9.blockMaterial.isReplaceable())) @@ -593,7 +593,7 @@ { var9 = null; } -@@ -3867,7 +3980,7 @@ +@@ -3900,7 +4013,7 @@ */ public long getSeed() { @@ -602,7 +602,7 @@ } public long getTotalWorldTime() -@@ -3877,7 +3990,7 @@ +@@ -3910,7 +4023,7 @@ public long getWorldTime() { @@ -611,7 +611,7 @@ } /** -@@ -3885,7 +3998,7 @@ +@@ -3918,7 +4031,7 @@ */ public void setWorldTime(long par1) { @@ -620,7 +620,7 @@ } /** -@@ -3893,13 +4006,13 @@ +@@ -3926,13 +4039,13 @@ */ public ChunkCoordinates getSpawnPoint() { @@ -636,7 +636,7 @@ } @SideOnly(Side.CLIENT) -@@ -3923,7 +4036,10 @@ +@@ -3956,7 +4069,10 @@ if (!this.loadedEntityList.contains(par1Entity)) { @@ -648,7 +648,7 @@ } } -@@ -3931,6 +4047,11 @@ +@@ -3964,6 +4080,11 @@ * Called when checking if a certain block can be mined or not. The 'spawn safe zone' check is located here. */ public boolean canMineBlock(EntityPlayer par1EntityPlayer, int par2, int par3, int par4) @@ -660,7 +660,7 @@ { return true; } -@@ -4051,8 +4172,7 @@ +@@ -4084,8 +4205,7 @@ */ public boolean isBlockHighHumidity(int par1, int par2, int par3) { @@ -670,7 +670,7 @@ } /** -@@ -4114,7 +4234,7 @@ +@@ -4147,7 +4267,7 @@ */ public int getHeight() { @@ -679,7 +679,7 @@ } /** -@@ -4122,7 +4242,7 @@ +@@ -4155,7 +4275,7 @@ */ public int getActualHeight() { @@ -688,7 +688,7 @@ } public IUpdatePlayerListBox func_82735_a(EntityMinecart par1EntityMinecart) -@@ -4165,7 +4285,7 @@ +@@ -4198,7 +4318,7 @@ */ public double getHorizon() { @@ -697,7 +697,7 @@ } /** -@@ -4223,4 +4343,75 @@ +@@ -4256,4 +4376,75 @@ return this.theCalendar; } diff --git a/patches/common/net/minecraft/src/WorldProvider.java.patch b/patches/minecraft/net/minecraft/world/WorldProvider.java.patch similarity index 88% rename from patches/common/net/minecraft/src/WorldProvider.java.patch rename to patches/minecraft/net/minecraft/world/WorldProvider.java.patch index 2aa5ac2dfa..5055321d10 100644 --- a/patches/common/net/minecraft/src/WorldProvider.java.patch +++ b/patches/minecraft/net/minecraft/world/WorldProvider.java.patch @@ -1,14 +1,32 @@ ---- ../src_base/common/net/minecraft/src/WorldProvider.java -+++ ../src_work/common/net/minecraft/src/WorldProvider.java -@@ -1,5 +1,7 @@ - package net.minecraft.src; +--- ../src_base/minecraft/net/minecraft/world/WorldProvider.java ++++ ../src_work/minecraft/net/minecraft/world/WorldProvider.java +@@ -1,18 +1,25 @@ + package net.minecraft.world; +import net.minecraftforge.client.SkyProvider; +import net.minecraftforge.common.DimensionManager; import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; + import net.minecraft.block.Block; ++import net.minecraft.entity.Entity; ++import net.minecraft.entity.player.EntityPlayer; ++import net.minecraft.entity.player.EntityPlayerMP; + import net.minecraft.util.ChunkCoordinates; + import net.minecraft.util.MathHelper; + import net.minecraft.util.Vec3; + import net.minecraft.world.biome.BiomeGenBase; + import net.minecraft.world.biome.WorldChunkManager; + import net.minecraft.world.biome.WorldChunkManagerHell; ++import net.minecraft.world.chunk.Chunk; + import net.minecraft.world.chunk.IChunkProvider; + import net.minecraft.world.gen.ChunkProviderFlat; + import net.minecraft.world.gen.ChunkProviderGenerate; + import net.minecraft.world.gen.FlatGeneratorInfo; ++import net.minecraft.world.storage.WorldInfo; -@@ -187,7 +189,7 @@ + public abstract class WorldProvider + { +@@ -198,7 +205,7 @@ public static WorldProvider getProviderForDimension(int par0) { @@ -17,7 +35,7 @@ } @SideOnly(Side.CLIENT) -@@ -256,4 +258,277 @@ +@@ -267,4 +274,277 @@ * Returns the dimension's name, e.g. "The End", "Nether", or "Overworld". */ public abstract String getDimensionName(); @@ -284,12 +302,12 @@ + worldObj.worldInfo.setThunderTime(0); + worldObj.worldInfo.setThundering(false); + } -+ ++ + public boolean canDoLightning(Chunk chunk) + { + return true; + } -+ ++ + public boolean canDoRainSnowIce(Chunk chunk) + { + return true; diff --git a/patches/common/net/minecraft/src/WorldServer.java.patch b/patches/minecraft/net/minecraft/world/WorldServer.java.patch similarity index 89% rename from patches/common/net/minecraft/src/WorldServer.java.patch rename to patches/minecraft/net/minecraft/world/WorldServer.java.patch index fe3bb1689f..8709d30380 100644 --- a/patches/common/net/minecraft/src/WorldServer.java.patch +++ b/patches/minecraft/net/minecraft/world/WorldServer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/common/net/minecraft/src/WorldServer.java -+++ ../src_work/common/net/minecraft/src/WorldServer.java +--- ../src_base/minecraft/net/minecraft/world/WorldServer.java ++++ ../src_work/minecraft/net/minecraft/world/WorldServer.java @@ -2,6 +2,8 @@ import cpw.mods.fml.common.Side; @@ -9,10 +9,17 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; -@@ -10,6 +12,11 @@ - import java.util.Set; - import java.util.TreeSet; - import net.minecraft.server.MinecraftServer; +@@ -45,11 +47,18 @@ + import net.minecraft.world.biome.WorldChunkManager; + import net.minecraft.world.chunk.Chunk; + import net.minecraft.world.chunk.IChunkProvider; ++import net.minecraft.world.chunk.storage.AnvilChunkLoader; + import net.minecraft.world.chunk.storage.ExtendedBlockStorage; + import net.minecraft.world.chunk.storage.IChunkLoader; + import net.minecraft.world.gen.ChunkProviderServer; + import net.minecraft.world.gen.feature.WorldGeneratorBonusChest; + import net.minecraft.world.storage.ISaveHandler; ++ +import net.minecraftforge.common.ChestGenHooks; +import static net.minecraftforge.common.ChestGenHooks.*; +import net.minecraftforge.common.DimensionManager; @@ -21,7 +28,7 @@ public class WorldServer extends World { -@@ -45,6 +52,10 @@ +@@ -85,6 +94,10 @@ /** An IntHashMap of entity IDs (integers) to their Entity objects. */ private IntHashMap entityIdMap; @@ -32,7 +39,7 @@ public WorldServer(MinecraftServer par1MinecraftServer, ISaveHandler par2ISaveHandler, String par3Str, int par4, WorldSettings par5WorldSettings, Profiler par6Profiler) { super(par2ISaveHandler, par3Str, par5WorldSettings, WorldProvider.getProviderForDimension(par4), par6Profiler); -@@ -68,6 +79,7 @@ +@@ -108,6 +121,7 @@ } this.field_85177_Q = new Teleporter(this); @@ -40,7 +47,7 @@ } /** -@@ -131,6 +143,10 @@ +@@ -171,6 +185,10 @@ this.villageSiegeObj.tick(); this.theProfiler.endStartSection("portalForcer"); this.field_85177_Q.func_85189_a(this.getTotalWorldTime()); @@ -51,7 +58,7 @@ this.theProfiler.endSection(); this.sendAndApplyBlockEvents(); } -@@ -184,10 +200,7 @@ +@@ -224,10 +242,7 @@ private void resetRainAndThunder() { @@ -63,7 +70,7 @@ } public boolean areAllPlayersAsleep() -@@ -258,6 +271,14 @@ +@@ -298,6 +313,14 @@ int var1 = 0; int var2 = 0; Iterator var3 = this.activeChunkSet.iterator(); @@ -78,7 +85,7 @@ while (var3.hasNext()) { -@@ -268,14 +289,16 @@ +@@ -308,14 +331,16 @@ Chunk var7 = this.getChunkFromChunkCoords(var4.chunkXPos, var4.chunkZPos); this.moodSoundAndLightCheck(var5, var6, var7); this.theProfiler.endStartSection("tickChunk"); @@ -97,7 +104,7 @@ { this.updateLCG = this.updateLCG * 3 + 1013904223; var8 = this.updateLCG >> 2; -@@ -293,7 +316,7 @@ +@@ -333,7 +358,7 @@ this.theProfiler.endStartSection("iceandsnow"); int var13; @@ -106,7 +113,7 @@ { this.updateLCG = this.updateLCG * 3 + 1013904223; var8 = this.updateLCG >> 2; -@@ -372,7 +395,8 @@ +@@ -412,7 +437,8 @@ public void func_82740_a(int par1, int par2, int par3, int par4, int par5, int par6) { NextTickListEntry var7 = new NextTickListEntry(par1, par2, par3, par4); @@ -116,7 +123,7 @@ if (this.scheduledUpdatesAreImmediate && par4 > 0) { -@@ -434,7 +458,7 @@ +@@ -474,7 +500,7 @@ */ public void updateEntities() { @@ -125,7 +132,7 @@ { if (this.updateEntityTick++ >= 1200) { -@@ -486,7 +510,8 @@ +@@ -526,7 +552,8 @@ this.pendingTickListEntries.remove(var4); this.field_73064_N.remove(var4); @@ -135,7 +142,7 @@ if (this.checkChunksExist(var4.xCoord - var5, var4.yCoord - var5, var4.zCoord - var5, var4.xCoord + var5, var4.yCoord + var5, var4.zCoord + var5)) { -@@ -605,16 +630,28 @@ +@@ -645,16 +672,28 @@ { ArrayList var7 = new ArrayList(); @@ -174,7 +181,7 @@ return var7; } -@@ -622,6 +659,11 @@ +@@ -662,6 +701,11 @@ * Called when checking if a certain block can be mined or not. The 'spawn safe zone' check is located here. */ public boolean canMineBlock(EntityPlayer par1EntityPlayer, int par2, int par3, int par4) @@ -186,7 +193,7 @@ { int var5 = MathHelper.abs_int(par2 - this.worldInfo.getSpawnX()); int var6 = MathHelper.abs_int(par4 - this.worldInfo.getSpawnZ()); -@@ -631,7 +673,7 @@ +@@ -671,7 +715,7 @@ var6 = var5; } @@ -195,7 +202,7 @@ } protected void initialize(WorldSettings par1WorldSettings) -@@ -714,7 +756,7 @@ +@@ -754,7 +798,7 @@ */ protected void createBonusChest() { @@ -204,7 +211,7 @@ for (int var2 = 0; var2 < 10; ++var2) { -@@ -757,6 +799,7 @@ +@@ -797,6 +841,7 @@ } this.chunkProvider.saveChunks(par1, par2IProgressUpdate); @@ -212,7 +219,7 @@ } } -@@ -768,6 +811,7 @@ +@@ -808,6 +853,7 @@ this.checkSessionLock(); this.saveHandler.saveWorldInfoWithPlayer(this.worldInfo, this.mcServer.getConfigurationManager().getTagsFromLastWrite()); this.mapStorage.saveAllData(); @@ -220,7 +227,7 @@ } /** -@@ -990,4 +1034,9 @@ +@@ -1030,4 +1076,9 @@ { return this.field_85177_Q; } diff --git a/patches/common/net/minecraft/src/WorldType.java.patch b/patches/minecraft/net/minecraft/world/WorldType.java.patch similarity index 62% rename from patches/common/net/minecraft/src/WorldType.java.patch rename to patches/minecraft/net/minecraft/world/WorldType.java.patch index dd62bf1ae4..143fdd700f 100644 --- a/patches/common/net/minecraft/src/WorldType.java.patch +++ b/patches/minecraft/net/minecraft/world/WorldType.java.patch @@ -1,11 +1,6 @@ ---- ../src_base/common/net/minecraft/src/WorldType.java -+++ ../src_work/common/net/minecraft/src/WorldType.java -@@ -213,8 +213,19 @@ - { - return this == FLAT ? random.nextInt(4) != 1 : false; - } -+ - /** +--- ../src_base/minecraft/net/minecraft/world/WorldType.java ++++ ../src_work/minecraft/net/minecraft/world/WorldType.java +@@ -224,4 +224,14 @@ * Called when 'Create New World' button is pressed before starting game */ public void onGUICreateWorldPress() { } diff --git a/patches/common/net/minecraft/src/BiomeDecorator.java.patch b/patches/minecraft/net/minecraft/world/biome/BiomeDecorator.java.patch similarity index 93% rename from patches/common/net/minecraft/src/BiomeDecorator.java.patch rename to patches/minecraft/net/minecraft/world/biome/BiomeDecorator.java.patch index 0cef20a710..c8ea52f190 100644 --- a/patches/common/net/minecraft/src/BiomeDecorator.java.patch +++ b/patches/minecraft/net/minecraft/world/biome/BiomeDecorator.java.patch @@ -1,19 +1,18 @@ ---- ../src_base/common/net/minecraft/src/BiomeDecorator.java -+++ ../src_work/common/net/minecraft/src/BiomeDecorator.java -@@ -1,6 +1,12 @@ - package net.minecraft.src; - +--- ../src_base/minecraft/net/minecraft/world/biome/BiomeDecorator.java ++++ ../src_work/minecraft/net/minecraft/world/biome/BiomeDecorator.java +@@ -15,6 +15,11 @@ + import net.minecraft.world.gen.feature.WorldGenSand; + import net.minecraft.world.gen.feature.WorldGenWaterlily; + import net.minecraft.world.gen.feature.WorldGenerator; ++ +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.*; +import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.*; -+ - import java.util.Random; -+ +import net.minecraftforge.common.*; +import net.minecraftforge.event.terraingen.*; public class BiomeDecorator { -@@ -192,26 +198,31 @@ +@@ -206,26 +211,31 @@ */ protected void decorate() { @@ -49,7 +48,7 @@ { var2 = this.chunk_X + this.randomGenerator.nextInt(16) + 8; var3 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8; -@@ -227,7 +238,8 @@ +@@ -241,7 +251,8 @@ int var4; @@ -59,7 +58,7 @@ { var3 = this.chunk_X + this.randomGenerator.nextInt(16) + 8; var4 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8; -@@ -236,7 +248,8 @@ +@@ -250,7 +261,8 @@ var5.generate(this.currentWorld, this.randomGenerator, var3, this.currentWorld.getHeightValue(var3, var4), var4); } @@ -69,7 +68,7 @@ { var3 = this.chunk_X + this.randomGenerator.nextInt(16) + 8; var4 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8; -@@ -245,7 +258,8 @@ +@@ -259,7 +271,8 @@ int var7; @@ -79,7 +78,7 @@ { var3 = this.chunk_X + this.randomGenerator.nextInt(16) + 8; var4 = this.randomGenerator.nextInt(128); -@@ -261,7 +275,8 @@ +@@ -275,7 +288,8 @@ } } @@ -89,7 +88,7 @@ { var3 = this.chunk_X + this.randomGenerator.nextInt(16) + 8; var4 = this.randomGenerator.nextInt(128); -@@ -270,7 +285,8 @@ +@@ -284,7 +298,8 @@ var6.generate(this.currentWorld, this.randomGenerator, var3, var4, var7); } @@ -99,7 +98,7 @@ { var3 = this.chunk_X + this.randomGenerator.nextInt(16) + 8; var4 = this.randomGenerator.nextInt(128); -@@ -278,7 +294,8 @@ +@@ -292,7 +307,8 @@ (new WorldGenDeadBush(Block.deadBush.blockID)).generate(this.currentWorld, this.randomGenerator, var3, var4, var7); } @@ -109,7 +108,7 @@ { var3 = this.chunk_X + this.randomGenerator.nextInt(16) + 8; var4 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8; -@@ -291,7 +308,8 @@ +@@ -305,7 +321,8 @@ this.waterlilyGen.generate(this.currentWorld, this.randomGenerator, var3, var7, var4); } @@ -119,7 +118,7 @@ { if (this.randomGenerator.nextInt(4) == 0) { -@@ -310,7 +328,7 @@ +@@ -324,7 +341,7 @@ } } @@ -128,7 +127,7 @@ { var2 = this.chunk_X + this.randomGenerator.nextInt(16) + 8; var3 = this.randomGenerator.nextInt(128); -@@ -318,7 +336,7 @@ +@@ -332,7 +349,7 @@ this.mushroomBrownGen.generate(this.currentWorld, this.randomGenerator, var2, var3, var4); } @@ -137,7 +136,7 @@ { var2 = this.chunk_X + this.randomGenerator.nextInt(16) + 8; var3 = this.randomGenerator.nextInt(128); -@@ -326,7 +344,8 @@ +@@ -340,7 +357,8 @@ this.mushroomRedGen.generate(this.currentWorld, this.randomGenerator, var2, var3, var4); } @@ -147,7 +146,7 @@ { var3 = this.chunk_X + this.randomGenerator.nextInt(16) + 8; var4 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8; -@@ -334,7 +353,7 @@ +@@ -348,7 +366,7 @@ this.reedGen.generate(this.currentWorld, this.randomGenerator, var3, var7, var4); } @@ -156,7 +155,7 @@ { var3 = this.chunk_X + this.randomGenerator.nextInt(16) + 8; var4 = this.randomGenerator.nextInt(128); -@@ -342,7 +361,8 @@ +@@ -356,7 +374,8 @@ this.reedGen.generate(this.currentWorld, this.randomGenerator, var3, var4, var7); } @@ -166,7 +165,7 @@ { var2 = this.chunk_X + this.randomGenerator.nextInt(16) + 8; var3 = this.randomGenerator.nextInt(128); -@@ -350,7 +370,8 @@ +@@ -364,7 +383,8 @@ (new WorldGenPumpkin()).generate(this.currentWorld, this.randomGenerator, var2, var3, var4); } @@ -176,7 +175,7 @@ { var3 = this.chunk_X + this.randomGenerator.nextInt(16) + 8; var4 = this.randomGenerator.nextInt(128); -@@ -358,7 +379,8 @@ +@@ -372,7 +392,8 @@ this.cactusGen.generate(this.currentWorld, this.randomGenerator, var3, var4, var7); } @@ -186,7 +185,7 @@ { for (var2 = 0; var2 < 50; ++var2) { -@@ -376,6 +398,8 @@ +@@ -390,6 +411,8 @@ (new WorldGenLiquids(Block.lavaMoving.blockID)).generate(this.currentWorld, this.randomGenerator, var3, var4, var7); } } @@ -195,7 +194,7 @@ } /** -@@ -411,13 +435,23 @@ +@@ -425,13 +448,23 @@ */ protected void generateOres() { diff --git a/patches/common/net/minecraft/src/BiomeGenBase.java.patch b/patches/minecraft/net/minecraft/world/biome/BiomeGenBase.java.patch similarity index 85% rename from patches/common/net/minecraft/src/BiomeGenBase.java.patch rename to patches/minecraft/net/minecraft/world/biome/BiomeGenBase.java.patch index 84572e7e33..c6dd1236b5 100644 --- a/patches/common/net/minecraft/src/BiomeGenBase.java.patch +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenBase.java.patch @@ -1,16 +1,16 @@ ---- ../src_base/common/net/minecraft/src/BiomeGenBase.java -+++ ../src_work/common/net/minecraft/src/BiomeGenBase.java -@@ -6,6 +6,9 @@ - import java.util.ArrayList; - import java.util.List; - import java.util.Random; +--- ../src_base/minecraft/net/minecraft/world/biome/BiomeGenBase.java ++++ ../src_work/minecraft/net/minecraft/world/biome/BiomeGenBase.java +@@ -30,6 +30,9 @@ + import net.minecraft.world.gen.feature.WorldGenTallGrass; + import net.minecraft.world.gen.feature.WorldGenTrees; + import net.minecraft.world.gen.feature.WorldGenerator; + +import net.minecraftforge.common.*; +import net.minecraftforge.event.terraingen.*; public abstract class BiomeGenBase { -@@ -155,8 +158,8 @@ +@@ -179,8 +182,8 @@ * Allocate a new BiomeDecorator for this BiomeGenBase */ public BiomeDecorator createBiomeDecorator() @@ -21,7 +21,7 @@ } /** -@@ -348,7 +351,7 @@ +@@ -372,7 +375,7 @@ { double var1 = (double)MathHelper.clamp_float(this.getFloatTemperature(), 0.0F, 1.0F); double var3 = (double)MathHelper.clamp_float(this.getFloatRainfall(), 0.0F, 1.0F); @@ -30,7 +30,7 @@ } @SideOnly(Side.CLIENT) -@@ -360,6 +363,38 @@ +@@ -384,6 +387,38 @@ { double var1 = (double)MathHelper.clamp_float(this.getFloatTemperature(), 0.0F, 1.0F); double var3 = (double)MathHelper.clamp_float(this.getFloatRainfall(), 0.0F, 1.0F); diff --git a/patches/common/net/minecraft/src/WorldChunkManager.java.patch b/patches/minecraft/net/minecraft/world/biome/WorldChunkManager.java.patch similarity index 81% rename from patches/common/net/minecraft/src/WorldChunkManager.java.patch rename to patches/minecraft/net/minecraft/world/biome/WorldChunkManager.java.patch index 7dc9098a10..0617b92ef0 100644 --- a/patches/common/net/minecraft/src/WorldChunkManager.java.patch +++ b/patches/minecraft/net/minecraft/world/biome/WorldChunkManager.java.patch @@ -1,16 +1,20 @@ ---- ../src_base/common/net/minecraft/src/WorldChunkManager.java -+++ ../src_work/common/net/minecraft/src/WorldChunkManager.java -@@ -3,11 +3,17 @@ +--- ../src_base/minecraft/net/minecraft/world/biome/WorldChunkManager.java ++++ ../src_work/minecraft/net/minecraft/world/biome/WorldChunkManager.java +@@ -3,6 +3,7 @@ import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Random; + import net.minecraft.world.ChunkPosition; +@@ -11,8 +12,13 @@ + import net.minecraft.world.gen.layer.GenLayer; + import net.minecraft.world.gen.layer.IntCache; +import net.minecraftforge.common.*; +import net.minecraftforge.event.terraingen.*; -+import static net.minecraft.src.BiomeGenBase.*; ++import static net.minecraft.world.biome.BiomeGenBase.*; + public class WorldChunkManager { @@ -18,7 +22,7 @@ private GenLayer genBiomes; /** A GenLayer containing the indices into BiomeGenBase.biomeList[] */ -@@ -23,19 +29,14 @@ +@@ -28,19 +34,14 @@ { this.biomeCache = new BiomeCache(this); this.biomesToSpawnIn = new ArrayList(); @@ -40,7 +44,7 @@ this.genBiomes = var4[0]; this.biomeIndexLayer = var4[1]; } -@@ -259,4 +260,11 @@ +@@ -264,4 +265,11 @@ { this.biomeCache.cleanupCache(); } diff --git a/patches/common/net/minecraft/src/Chunk.java.patch b/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch similarity index 95% rename from patches/common/net/minecraft/src/Chunk.java.patch rename to patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch index fc8ec7066e..4cfb907fe4 100644 --- a/patches/common/net/minecraft/src/Chunk.java.patch +++ b/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch @@ -1,17 +1,17 @@ ---- ../src_base/common/net/minecraft/src/Chunk.java -+++ ../src_work/common/net/minecraft/src/Chunk.java -@@ -9,6 +9,10 @@ - import java.util.List; - import java.util.Map; - import java.util.Random; -+ +--- ../src_base/minecraft/net/minecraft/world/chunk/Chunk.java ++++ ../src_work/minecraft/net/minecraft/world/chunk/Chunk.java +@@ -25,6 +25,10 @@ + import net.minecraft.world.biome.WorldChunkManager; + import net.minecraft.world.chunk.storage.ExtendedBlockStorage; + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.EntityEvent; +import net.minecraftforge.event.world.ChunkEvent; - ++ public class Chunk { -@@ -124,7 +128,9 @@ + /** +@@ -139,7 +143,9 @@ { for (int var8 = 0; var8 < var5; ++var8) { @@ -22,7 +22,7 @@ if (var9 != 0) { -@@ -143,6 +149,90 @@ +@@ -158,6 +164,90 @@ } /** @@ -113,7 +113,7 @@ * Checks whether the chunk is at the X/Z location specified */ public boolean isAtLocation(int par1, int par2) -@@ -206,7 +296,7 @@ +@@ -221,7 +311,7 @@ { int var5 = this.getBlockID(var2, var4 - 1, var3); @@ -122,7 +122,7 @@ { --var4; continue; -@@ -512,7 +602,10 @@ +@@ -527,7 +617,10 @@ public int getBlockLightOpacity(int par1, int par2, int par3) { @@ -134,7 +134,7 @@ } /** -@@ -520,7 +613,7 @@ +@@ -535,7 +628,7 @@ */ public int getBlockID(int par1, int par2, int par3) { @@ -143,7 +143,7 @@ { return 0; } -@@ -536,7 +629,7 @@ +@@ -551,7 +644,7 @@ */ public int getBlockMetadata(int par1, int par2, int par3) { @@ -152,7 +152,7 @@ { return 0; } -@@ -577,6 +670,11 @@ +@@ -592,6 +685,11 @@ } else { @@ -164,7 +164,7 @@ ExtendedBlockStorage var10 = this.storageArrays[par2 >> 4]; boolean var11 = false; -@@ -607,9 +705,13 @@ +@@ -622,9 +720,13 @@ { Block.blocksList[var8].breakBlock(this.worldObj, var12, par2, var13, var8, var9); } @@ -181,7 +181,7 @@ } } -@@ -627,7 +729,7 @@ +@@ -642,7 +744,7 @@ } else { @@ -190,7 +190,7 @@ { if (par2 >= var7) { -@@ -651,29 +753,21 @@ +@@ -666,29 +768,21 @@ Block.blocksList[par4].onBlockAdded(this.worldObj, var12, par2, var13); } @@ -223,7 +223,7 @@ } } -@@ -688,7 +782,7 @@ +@@ -703,7 +797,7 @@ */ public boolean setBlockMetadata(int par1, int par2, int par3, int par4) { @@ -232,7 +232,7 @@ if (var5 == null) { -@@ -708,7 +802,7 @@ +@@ -723,7 +817,7 @@ var5.setExtBlockMetadata(par1, par2 & 15, par3, par4); int var7 = var5.getExtBlockID(par1, par2 & 15, par3); @@ -241,7 +241,7 @@ { TileEntity var8 = this.getChunkBlockTileEntity(par1, par2, par3); -@@ -729,7 +823,7 @@ +@@ -744,7 +838,7 @@ */ public int getSavedLightValue(EnumSkyBlock par1EnumSkyBlock, int par2, int par3, int par4) { @@ -250,7 +250,7 @@ return var5 == null ? (this.canBlockSeeTheSky(par2, par3, par4) ? par1EnumSkyBlock.defaultLightValue : 0) : (par1EnumSkyBlock == EnumSkyBlock.Sky ? var5.getExtSkylightValue(par2, par3 & 15, par4) : (par1EnumSkyBlock == EnumSkyBlock.Block ? var5.getExtBlocklightValue(par2, par3 & 15, par4) : par1EnumSkyBlock.defaultLightValue)); } -@@ -739,6 +833,11 @@ +@@ -754,6 +848,11 @@ */ public void setLightValue(EnumSkyBlock par1EnumSkyBlock, int par2, int par3, int par4, int par5) { @@ -262,7 +262,7 @@ ExtendedBlockStorage var6 = this.storageArrays[par3 >> 4]; if (var6 == null) -@@ -767,7 +866,7 @@ +@@ -782,7 +881,7 @@ */ public int getBlockLightValue(int par1, int par2, int par3, int par4) { @@ -271,7 +271,7 @@ if (var5 == null) { -@@ -820,7 +919,7 @@ +@@ -835,7 +934,7 @@ { var4 = this.entityLists.length - 1; } @@ -280,7 +280,7 @@ par1Entity.addedToChunk = true; par1Entity.chunkCoordX = this.xPosition; par1Entity.chunkCoordY = var4; -@@ -870,33 +969,33 @@ +@@ -885,33 +984,33 @@ ChunkPosition var4 = new ChunkPosition(par1, par2, par3); TileEntity var5 = (TileEntity)this.chunkTileEntityMap.get(var4); @@ -325,7 +325,7 @@ } /** -@@ -911,7 +1010,7 @@ +@@ -926,7 +1025,7 @@ if (this.isChunkLoaded) { @@ -334,7 +334,7 @@ } } -@@ -926,8 +1025,14 @@ +@@ -941,8 +1040,14 @@ par4TileEntity.yCoord = par2; par4TileEntity.zCoord = this.zPosition * 16 + par3; @@ -351,7 +351,7 @@ par4TileEntity.validate(); this.chunkTileEntityMap.put(var5, par4TileEntity); } -@@ -963,6 +1068,7 @@ +@@ -978,6 +1083,7 @@ { this.worldObj.addLoadedEntities(this.entityLists[var1]); } @@ -359,7 +359,7 @@ } /** -@@ -983,6 +1089,7 @@ +@@ -998,6 +1104,7 @@ { this.worldObj.unloadEntities(this.entityLists[var3]); } @@ -367,7 +367,7 @@ } /** -@@ -999,8 +1106,8 @@ +@@ -1014,8 +1121,8 @@ */ public void getEntitiesWithinAABBForEntity(Entity par1Entity, AxisAlignedBB par2AxisAlignedBB, List par3List) { @@ -378,7 +378,7 @@ if (var4 < 0) { -@@ -1047,8 +1154,8 @@ +@@ -1062,8 +1169,8 @@ */ public void getEntitiesOfTypeWithinAAAB(Class par1Class, AxisAlignedBB par2AxisAlignedBB, List par3List, IEntitySelector par4IEntitySelector) { @@ -389,7 +389,7 @@ if (var5 < 0) { -@@ -1231,6 +1338,15 @@ +@@ -1246,6 +1353,15 @@ */ public void fillChunk(byte[] par1ArrayOfByte, int par2, int par3, boolean par4) { @@ -405,7 +405,7 @@ int var5 = 0; int var6; -@@ -1327,12 +1443,26 @@ +@@ -1342,12 +1458,26 @@ } this.generateHeightMap(); @@ -438,7 +438,7 @@ } } -@@ -1441,4 +1571,18 @@ +@@ -1456,4 +1586,18 @@ } } } diff --git a/patches/common/net/minecraft/src/AnvilChunkLoader.java.patch b/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch similarity index 70% rename from patches/common/net/minecraft/src/AnvilChunkLoader.java.patch rename to patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch index c1e38953ad..4eb0621c9e 100644 --- a/patches/common/net/minecraft/src/AnvilChunkLoader.java.patch +++ b/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch @@ -1,8 +1,8 @@ ---- ../src_base/common/net/minecraft/src/AnvilChunkLoader.java -+++ ../src_work/common/net/minecraft/src/AnvilChunkLoader.java -@@ -13,6 +13,9 @@ - - import cpw.mods.fml.common.FMLLog; +--- ../src_base/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java ++++ ../src_work/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java +@@ -28,6 +28,9 @@ + import net.minecraft.world.storage.IThreadedFileIO; + import net.minecraft.world.storage.ThreadedFileIOBase; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.world.ChunkDataEvent; @@ -10,7 +10,7 @@ public class AnvilChunkLoader implements IThreadedFileIO, IChunkLoader { private List chunksToRemove = new ArrayList(); -@@ -93,6 +96,7 @@ +@@ -108,6 +111,7 @@ var5 = this.readChunkFromNBT(par1World, par4NBTTagCompound.getCompoundTag("Level")); } @@ -18,7 +18,7 @@ return var5; } } -@@ -108,6 +112,7 @@ +@@ -123,6 +127,7 @@ var3.setTag("Level", var4); this.writeChunkToNBT(par2Chunk, par1World, var4); this.func_75824_a(par2Chunk.getChunkCoordIntPair(), var3); diff --git a/patches/common/net/minecraft/src/AnvilSaveHandler.java.patch b/patches/minecraft/net/minecraft/world/chunk/storage/AnvilSaveHandler.java.patch similarity index 76% rename from patches/common/net/minecraft/src/AnvilSaveHandler.java.patch rename to patches/minecraft/net/minecraft/world/chunk/storage/AnvilSaveHandler.java.patch index d53a1d6017..5129d51d3c 100644 --- a/patches/common/net/minecraft/src/AnvilSaveHandler.java.patch +++ b/patches/minecraft/net/minecraft/world/chunk/storage/AnvilSaveHandler.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/AnvilSaveHandler.java -+++ ../src_work/common/net/minecraft/src/AnvilSaveHandler.java -@@ -17,15 +17,9 @@ +--- ../src_base/minecraft/net/minecraft/world/chunk/storage/AnvilSaveHandler.java ++++ ../src_work/minecraft/net/minecraft/world/chunk/storage/AnvilSaveHandler.java +@@ -24,15 +24,9 @@ File var2 = this.getSaveDirectory(); File var3; diff --git a/patches/common/net/minecraft/src/ChunkProviderEnd.java.patch b/patches/minecraft/net/minecraft/world/gen/ChunkProviderEnd.java.patch similarity index 87% rename from patches/common/net/minecraft/src/ChunkProviderEnd.java.patch rename to patches/minecraft/net/minecraft/world/gen/ChunkProviderEnd.java.patch index 95acb0a866..98d9112405 100644 --- a/patches/common/net/minecraft/src/ChunkProviderEnd.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/ChunkProviderEnd.java.patch @@ -1,17 +1,17 @@ ---- ../src_base/common/net/minecraft/src/ChunkProviderEnd.java -+++ ../src_work/common/net/minecraft/src/ChunkProviderEnd.java -@@ -2,6 +2,10 @@ +--- ../src_base/minecraft/net/minecraft/world/gen/ChunkProviderEnd.java ++++ ../src_work/minecraft/net/minecraft/world/gen/ChunkProviderEnd.java +@@ -13,6 +13,10 @@ + import net.minecraft.world.chunk.Chunk; + import net.minecraft.world.chunk.IChunkProvider; - import java.util.List; - import java.util.Random; -+ +import net.minecraftforge.common.*; +import net.minecraftforge.event.Event.*; +import net.minecraftforge.event.terraingen.*; - ++ public class ChunkProviderEnd implements IChunkProvider { -@@ -32,7 +36,15 @@ + private Random endRNG; +@@ -42,7 +46,15 @@ this.noiseGen3 = new NoiseGeneratorOctaves(this.endRNG, 8); this.noiseGen4 = new NoiseGeneratorOctaves(this.endRNG, 10); this.noiseGen5 = new NoiseGeneratorOctaves(this.endRNG, 16); @@ -28,7 +28,7 @@ public void generateTerrain(int par1, int par2, byte[] par3ArrayOfByte, BiomeGenBase[] par4ArrayOfBiomeGenBase) { -@@ -104,6 +116,10 @@ +@@ -114,6 +126,10 @@ public void replaceBlocksForBiome(int par1, int par2, byte[] par3ArrayOfByte, BiomeGenBase[] par4ArrayOfBiomeGenBase) { @@ -39,7 +39,7 @@ for (int var5 = 0; var5 < 16; ++var5) { for (int var6 = 0; var6 < 16; ++var6) -@@ -191,6 +207,10 @@ +@@ -201,6 +217,10 @@ */ private double[] initializeNoiseField(double[] par1ArrayOfDouble, int par2, int par3, int par4, int par5, int par6, int par7) { @@ -50,7 +50,7 @@ if (par1ArrayOfDouble == null) { par1ArrayOfDouble = new double[par5 * par6 * par7]; -@@ -338,10 +358,16 @@ +@@ -348,10 +368,16 @@ public void populate(IChunkProvider par1IChunkProvider, int par2, int par3) { BlockSand.fallInstantly = true; diff --git a/patches/common/net/minecraft/src/ChunkProviderGenerate.java.patch b/patches/minecraft/net/minecraft/world/gen/ChunkProviderGenerate.java.patch similarity index 91% rename from patches/common/net/minecraft/src/ChunkProviderGenerate.java.patch rename to patches/minecraft/net/minecraft/world/gen/ChunkProviderGenerate.java.patch index 60ad58843d..ae851325b4 100644 --- a/patches/common/net/minecraft/src/ChunkProviderGenerate.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/ChunkProviderGenerate.java.patch @@ -1,21 +1,19 @@ ---- ../src_base/common/net/minecraft/src/ChunkProviderGenerate.java -+++ ../src_work/common/net/minecraft/src/ChunkProviderGenerate.java -@@ -1,7 +1,14 @@ - package net.minecraft.src; -+ +--- ../src_base/minecraft/net/minecraft/world/gen/ChunkProviderGenerate.java ++++ ../src_work/minecraft/net/minecraft/world/gen/ChunkProviderGenerate.java +@@ -20,6 +20,12 @@ + import net.minecraft.world.gen.structure.MapGenStronghold; + import net.minecraft.world.gen.structure.MapGenVillage; + +import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.*; +import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.*; - - import java.util.List; - import java.util.Random; -+ +import net.minecraftforge.common.*; +import net.minecraftforge.event.Event.*; +import net.minecraftforge.event.terraingen.*; - ++ public class ChunkProviderGenerate implements IChunkProvider { -@@ -74,6 +81,15 @@ + /** RNG. */ +@@ -91,6 +97,15 @@ */ float[] parabolicField; int[][] field_73219_j = new int[32][32]; @@ -31,7 +29,7 @@ public ChunkProviderGenerate(World par1World, long par2, boolean par4) { -@@ -87,6 +103,16 @@ +@@ -104,6 +119,16 @@ this.noiseGen5 = new NoiseGeneratorOctaves(this.rand, 10); this.noiseGen6 = new NoiseGeneratorOctaves(this.rand, 16); this.mobSpawnerNoise = new NoiseGeneratorOctaves(this.rand, 8); @@ -48,7 +46,7 @@ } /** -@@ -172,6 +198,10 @@ +@@ -189,6 +214,10 @@ */ public void replaceBlocksForBiome(int par1, int par2, byte[] par3ArrayOfByte, BiomeGenBase[] par4ArrayOfBiomeGenBase) { @@ -59,7 +57,7 @@ byte var5 = 63; double var6 = 0.03125D; this.stoneNoise = this.noiseGen4.generateNoiseOctaves(this.stoneNoise, par1 * 16, par2 * 16, 0, 16, 16, 1, var6 * 2.0D, var6 * 2.0D, var6 * 2.0D); -@@ -307,6 +337,10 @@ +@@ -324,6 +353,10 @@ */ private double[] initializeNoiseField(double[] par1ArrayOfDouble, int par2, int par3, int par4, int par5, int par6, int par7) { @@ -70,7 +68,7 @@ if (par1ArrayOfDouble == null) { par1ArrayOfDouble = new double[par5 * par6 * par7]; -@@ -475,6 +509,8 @@ +@@ -492,6 +525,8 @@ this.rand.setSeed((long)par2 * var7 + (long)par3 * var9 ^ this.worldObj.getSeed()); boolean var11 = false; @@ -79,7 +77,7 @@ if (this.mapFeaturesEnabled) { this.mineshaftGenerator.generateStructuresInChunk(this.worldObj, this.rand, par2, par3); -@@ -487,7 +523,8 @@ +@@ -504,7 +539,8 @@ int var13; int var14; @@ -89,7 +87,7 @@ { var12 = var4 + this.rand.nextInt(16) + 8; var13 = this.rand.nextInt(128); -@@ -495,7 +532,8 @@ +@@ -512,7 +548,8 @@ (new WorldGenLakes(Block.waterStill.blockID)).generate(this.worldObj, this.rand, var12, var13, var14); } @@ -99,7 +97,7 @@ { var12 = var4 + this.rand.nextInt(16) + 8; var13 = this.rand.nextInt(this.rand.nextInt(120) + 8); -@@ -507,7 +545,8 @@ +@@ -524,7 +561,8 @@ } } @@ -109,7 +107,7 @@ { var13 = var4 + this.rand.nextInt(16) + 8; var14 = this.rand.nextInt(128); -@@ -524,7 +563,8 @@ +@@ -541,7 +579,8 @@ var4 += 8; var5 += 8; @@ -119,7 +117,7 @@ { for (var13 = 0; var13 < 16; ++var13) { -@@ -541,6 +581,8 @@ +@@ -558,6 +597,8 @@ } } } diff --git a/patches/common/net/minecraft/src/ChunkProviderHell.java.patch b/patches/minecraft/net/minecraft/world/gen/ChunkProviderHell.java.patch similarity index 91% rename from patches/common/net/minecraft/src/ChunkProviderHell.java.patch rename to patches/minecraft/net/minecraft/world/gen/ChunkProviderHell.java.patch index 3afb7e5fcd..ee60d7d137 100644 --- a/patches/common/net/minecraft/src/ChunkProviderHell.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/ChunkProviderHell.java.patch @@ -1,22 +1,20 @@ ---- ../src_base/common/net/minecraft/src/ChunkProviderHell.java -+++ ../src_work/common/net/minecraft/src/ChunkProviderHell.java -@@ -1,7 +1,15 @@ - package net.minecraft.src; -+ +--- ../src_base/minecraft/net/minecraft/world/gen/ChunkProviderHell.java ++++ ../src_work/minecraft/net/minecraft/world/gen/ChunkProviderHell.java +@@ -18,6 +18,13 @@ + import net.minecraft.world.gen.feature.WorldGenHellLava; + import net.minecraft.world.gen.structure.MapGenNetherBridge; + +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.*; +import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.*; +import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.*; - - import java.util.List; - import java.util.Random; -+ +import net.minecraftforge.common.*; +import net.minecraftforge.event.Event.*; +import net.minecraftforge.event.terraingen.*; - ++ public class ChunkProviderHell implements IChunkProvider { -@@ -43,6 +51,11 @@ + private Random hellRNG; +@@ -58,6 +65,11 @@ double[] noiseData3; double[] noiseData4; double[] noiseData5; @@ -28,7 +26,7 @@ public ChunkProviderHell(World par1World, long par2) { -@@ -55,6 +68,16 @@ +@@ -70,6 +82,16 @@ this.netherrackExculsivityNoiseGen = new NoiseGeneratorOctaves(this.hellRNG, 4); this.netherNoiseGen6 = new NoiseGeneratorOctaves(this.hellRNG, 10); this.netherNoiseGen7 = new NoiseGeneratorOctaves(this.hellRNG, 16); @@ -45,7 +43,7 @@ } /** -@@ -139,6 +162,10 @@ +@@ -154,6 +176,10 @@ */ public void replaceBlocksForBiome(int par1, int par2, byte[] par3ArrayOfByte) { @@ -56,7 +54,7 @@ byte var4 = 64; double var5 = 0.03125D; this.slowsandNoise = this.slowsandGravelNoiseGen.generateNoiseOctaves(this.slowsandNoise, par1 * 16, par2 * 16, 0, 16, 16, 1, var5, var5, 1.0D); -@@ -274,6 +301,9 @@ +@@ -289,6 +315,9 @@ */ private double[] initializeNoiseField(double[] par1ArrayOfDouble, int par2, int par3, int par4, int par5, int par6, int par7) { @@ -66,7 +64,7 @@ if (par1ArrayOfDouble == null) { par1ArrayOfDouble = new double[par5 * par6 * par7]; -@@ -426,6 +456,9 @@ +@@ -441,6 +470,9 @@ public void populate(IChunkProvider par1IChunkProvider, int par2, int par3) { BlockSand.fallInstantly = true; @@ -76,7 +74,7 @@ int var4 = par2 * 16; int var5 = par3 * 16; this.genNetherBridge.generateStructuresInChunk(this.worldObj, this.hellRNG, par2, par3); -@@ -434,7 +467,8 @@ +@@ -449,7 +481,8 @@ int var8; int var9; @@ -86,7 +84,7 @@ { var7 = var4 + this.hellRNG.nextInt(16) + 8; var8 = this.hellRNG.nextInt(120) + 4; -@@ -445,7 +479,8 @@ +@@ -460,7 +493,8 @@ var6 = this.hellRNG.nextInt(this.hellRNG.nextInt(10) + 1) + 1; int var10; @@ -96,7 +94,7 @@ { var8 = var4 + this.hellRNG.nextInt(16) + 8; var9 = this.hellRNG.nextInt(120) + 4; -@@ -455,7 +490,8 @@ +@@ -470,7 +504,8 @@ var6 = this.hellRNG.nextInt(this.hellRNG.nextInt(10) + 1); @@ -106,7 +104,7 @@ { var8 = var4 + this.hellRNG.nextInt(16) + 8; var9 = this.hellRNG.nextInt(120) + 4; -@@ -463,7 +499,7 @@ +@@ -478,7 +513,7 @@ (new WorldGenGlowStone1()).generate(this.worldObj, this.hellRNG, var8, var9, var10); } @@ -115,7 +113,7 @@ { var8 = var4 + this.hellRNG.nextInt(16) + 8; var9 = this.hellRNG.nextInt(128); -@@ -471,7 +507,10 @@ +@@ -486,7 +521,10 @@ (new WorldGenGlowStone2()).generate(this.worldObj, this.hellRNG, var8, var9, var10); } @@ -127,7 +125,7 @@ { var7 = var4 + this.hellRNG.nextInt(16) + 8; var8 = this.hellRNG.nextInt(128); -@@ -479,7 +518,7 @@ +@@ -494,7 +532,7 @@ (new WorldGenFlowers(Block.mushroomBrown.blockID)).generate(this.worldObj, this.hellRNG, var7, var8, var9); } @@ -136,7 +134,7 @@ { var7 = var4 + this.hellRNG.nextInt(16) + 8; var8 = this.hellRNG.nextInt(128); -@@ -487,6 +526,9 @@ +@@ -502,6 +540,9 @@ (new WorldGenFlowers(Block.mushroomRed.blockID)).generate(this.worldObj, this.hellRNG, var7, var8, var9); } diff --git a/patches/common/net/minecraft/src/ChunkProviderServer.java.patch b/patches/minecraft/net/minecraft/world/gen/ChunkProviderServer.java.patch similarity index 86% rename from patches/common/net/minecraft/src/ChunkProviderServer.java.patch rename to patches/minecraft/net/minecraft/world/gen/ChunkProviderServer.java.patch index 8203ac9907..428cf17732 100644 --- a/patches/common/net/minecraft/src/ChunkProviderServer.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/ChunkProviderServer.java.patch @@ -1,16 +1,16 @@ ---- ../src_base/common/net/minecraft/src/ChunkProviderServer.java -+++ ../src_work/common/net/minecraft/src/ChunkProviderServer.java -@@ -7,6 +7,9 @@ +--- ../src_base/minecraft/net/minecraft/world/gen/ChunkProviderServer.java ++++ ../src_work/minecraft/net/minecraft/world/gen/ChunkProviderServer.java +@@ -6,6 +6,9 @@ + import java.util.Iterator; import java.util.List; import java.util.Set; - ++ +import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.common.ForgeChunkManager; -+ - import cpw.mods.fml.common.registry.GameRegistry; - public class ChunkProviderServer implements IChunkProvider -@@ -50,7 +53,7 @@ + import cpw.mods.fml.common.registry.GameRegistry; + import net.minecraft.crash.CrashReport; +@@ -66,7 +69,7 @@ */ public void unloadChunksIfNotNearSpawn(int par1, int par2) { @@ -19,7 +19,7 @@ { ChunkCoordinates var3 = this.currentServer.getSpawnPoint(); int var4 = par1 * 16 + 8 - var3.posX; -@@ -93,7 +96,11 @@ +@@ -109,7 +112,11 @@ if (var5 == null) { @@ -32,7 +32,7 @@ if (var5 == null) { -@@ -290,6 +297,11 @@ +@@ -306,6 +313,11 @@ { if (!this.currentServer.canNotSave) { @@ -44,7 +44,7 @@ for (int var1 = 0; var1 < 100; ++var1) { if (!this.chunksToUnload.isEmpty()) -@@ -302,6 +314,11 @@ +@@ -318,6 +330,11 @@ this.chunksToUnload.remove(var2); this.loadedChunkHashMap.remove(var2.longValue()); this.loadedChunks.remove(var3); diff --git a/patches/common/net/minecraft/src/WorldGenBigMushroom.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenBigMushroom.java.patch similarity index 88% rename from patches/common/net/minecraft/src/WorldGenBigMushroom.java.patch rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenBigMushroom.java.patch index 80cad5d382..6b470cb701 100644 --- a/patches/common/net/minecraft/src/WorldGenBigMushroom.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenBigMushroom.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/WorldGenBigMushroom.java -+++ ../src_work/common/net/minecraft/src/WorldGenBigMushroom.java -@@ -54,7 +54,9 @@ +--- ../src_base/minecraft/net/minecraft/world/gen/feature/WorldGenBigMushroom.java ++++ ../src_work/minecraft/net/minecraft/world/gen/feature/WorldGenBigMushroom.java +@@ -56,7 +56,9 @@ { var13 = par1World.getBlockId(var11, var9, var12); @@ -11,7 +11,7 @@ { var8 = false; } -@@ -181,7 +183,9 @@ +@@ -183,7 +185,9 @@ var15 = 0; } @@ -22,7 +22,7 @@ { this.setBlockAndMetadata(par1World, var13, var11, var14, Block.mushroomCapBrown.blockID + var6, var15); } -@@ -193,7 +197,9 @@ +@@ -195,7 +199,9 @@ { var12 = par1World.getBlockId(par3, par4 + var11, par5); diff --git a/patches/common/net/minecraft/src/WorldGenDeadBush.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenDeadBush.java.patch similarity index 76% rename from patches/common/net/minecraft/src/WorldGenDeadBush.java.patch rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenDeadBush.java.patch index 60c7bc3984..f4eedf232e 100644 --- a/patches/common/net/minecraft/src/WorldGenDeadBush.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenDeadBush.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/WorldGenDeadBush.java -+++ ../src_work/common/net/minecraft/src/WorldGenDeadBush.java -@@ -16,10 +16,16 @@ +--- ../src_base/minecraft/net/minecraft/world/gen/feature/WorldGenDeadBush.java ++++ ../src_work/minecraft/net/minecraft/world/gen/feature/WorldGenDeadBush.java +@@ -18,10 +18,16 @@ { int var11; diff --git a/patches/common/net/minecraft/src/WorldGenDungeons.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenDungeons.java.patch similarity index 74% rename from patches/common/net/minecraft/src/WorldGenDungeons.java.patch rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenDungeons.java.patch index 518249dbdb..b2be14dbbd 100644 --- a/patches/common/net/minecraft/src/WorldGenDungeons.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenDungeons.java.patch @@ -1,16 +1,16 @@ ---- ../src_base/common/net/minecraft/src/WorldGenDungeons.java -+++ ../src_work/common/net/minecraft/src/WorldGenDungeons.java -@@ -1,6 +1,9 @@ - package net.minecraft.src; - - import java.util.Random; +--- ../src_base/minecraft/net/minecraft/world/gen/feature/WorldGenDungeons.java ++++ ../src_work/minecraft/net/minecraft/world/gen/feature/WorldGenDungeons.java +@@ -8,6 +8,9 @@ + import net.minecraft.tileentity.TileEntityChest; + import net.minecraft.tileentity.TileEntityMobSpawner; + import net.minecraft.world.World; + +import net.minecraftforge.common.DungeonHooks; +import net.minecraftforge.common.MinecraftForge; public class WorldGenDungeons extends WorldGenerator { -@@ -117,9 +120,9 @@ +@@ -124,9 +127,9 @@ if (var16 != null) { @@ -22,7 +22,7 @@ if (var18 != null) { -@@ -147,7 +150,7 @@ +@@ -154,7 +157,7 @@ if (var19 != null) { diff --git a/patches/common/net/minecraft/src/WorldGenForest.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenForest.java.patch similarity index 89% rename from patches/common/net/minecraft/src/WorldGenForest.java.patch rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenForest.java.patch index 8b27473aff..9ae5752969 100644 --- a/patches/common/net/minecraft/src/WorldGenForest.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenForest.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/WorldGenForest.java -+++ ../src_work/common/net/minecraft/src/WorldGenForest.java -@@ -43,7 +43,9 @@ +--- ../src_base/minecraft/net/minecraft/world/gen/feature/WorldGenForest.java ++++ ../src_work/minecraft/net/minecraft/world/gen/feature/WorldGenForest.java +@@ -45,7 +45,9 @@ { var12 = par1World.getBlockId(var10, var8, var11); @@ -11,7 +11,7 @@ { var7 = false; } -@@ -82,7 +84,10 @@ +@@ -84,7 +86,10 @@ { int var15 = var14 - par5; @@ -23,7 +23,7 @@ { this.setBlockAndMetadata(par1World, var12, var16, var14, Block.leaves.blockID, 2); } -@@ -94,7 +99,9 @@ +@@ -96,7 +101,9 @@ { var10 = par1World.getBlockId(par3, par4 + var16, par5); diff --git a/patches/common/net/minecraft/src/WorldGenHugeTrees.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenHugeTrees.java.patch similarity index 93% rename from patches/common/net/minecraft/src/WorldGenHugeTrees.java.patch rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenHugeTrees.java.patch index 748979f153..76c350b3db 100644 --- a/patches/common/net/minecraft/src/WorldGenHugeTrees.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenHugeTrees.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/WorldGenHugeTrees.java -+++ ../src_work/common/net/minecraft/src/WorldGenHugeTrees.java -@@ -55,7 +55,12 @@ +--- ../src_base/minecraft/net/minecraft/world/gen/feature/WorldGenHugeTrees.java ++++ ../src_work/minecraft/net/minecraft/world/gen/feature/WorldGenHugeTrees.java +@@ -58,7 +58,12 @@ { var12 = par1World.getBlockId(var10, var8, var11); @@ -14,7 +14,7 @@ { var7 = false; } -@@ -103,7 +108,7 @@ +@@ -106,7 +111,7 @@ { var11 = par1World.getBlockId(par3, par4 + var10, par5); @@ -23,7 +23,7 @@ { this.setBlockAndMetadata(par1World, par3, par4 + var10, par5, Block.wood.blockID, this.woodMetadata); -@@ -125,7 +130,7 @@ +@@ -128,7 +133,7 @@ { var11 = par1World.getBlockId(par3 + 1, par4 + var10, par5); @@ -32,7 +32,7 @@ { this.setBlockAndMetadata(par1World, par3 + 1, par4 + var10, par5, Block.wood.blockID, this.woodMetadata); -@@ -145,7 +150,7 @@ +@@ -148,7 +153,7 @@ var11 = par1World.getBlockId(par3 + 1, par4 + var10, par5 + 1); @@ -41,7 +41,7 @@ { this.setBlockAndMetadata(par1World, par3 + 1, par4 + var10, par5 + 1, Block.wood.blockID, this.woodMetadata); -@@ -165,7 +170,7 @@ +@@ -168,7 +173,7 @@ var11 = par1World.getBlockId(par3, par4 + var10, par5 + 1); @@ -50,7 +50,7 @@ { this.setBlockAndMetadata(par1World, par3, par4 + var10, par5 + 1, Block.wood.blockID, this.woodMetadata); -@@ -216,7 +221,12 @@ +@@ -219,7 +224,12 @@ { int var14 = var13 - par3; diff --git a/patches/common/net/minecraft/src/WorldGenMinable.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenMinable.java.patch similarity index 87% rename from patches/common/net/minecraft/src/WorldGenMinable.java.patch rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenMinable.java.patch index 216459e1d0..5ce27701f7 100644 --- a/patches/common/net/minecraft/src/WorldGenMinable.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenMinable.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/WorldGenMinable.java -+++ ../src_work/common/net/minecraft/src/WorldGenMinable.java -@@ -6,6 +6,7 @@ +--- ../src_base/minecraft/net/minecraft/world/gen/feature/WorldGenMinable.java ++++ ../src_work/minecraft/net/minecraft/world/gen/feature/WorldGenMinable.java +@@ -9,6 +9,7 @@ { /** The block ID of the ore to be placed using this generator. */ private int minableBlockId; @@ -8,7 +8,7 @@ /** The number of blocks to generate. */ private int numberOfBlocks; -@@ -14,6 +15,12 @@ +@@ -17,6 +18,12 @@ { this.minableBlockId = par1; this.numberOfBlocks = par2; @@ -21,7 +21,7 @@ } public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) -@@ -57,9 +64,10 @@ +@@ -60,9 +67,10 @@ { double var45 = ((double)var44 + 0.5D - var24) / (var28 / 2.0D); diff --git a/patches/common/net/minecraft/src/WorldGenShrub.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenShrub.java.patch similarity index 87% rename from patches/common/net/minecraft/src/WorldGenShrub.java.patch rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenShrub.java.patch index 6166c4e55c..5135eaa5b4 100644 --- a/patches/common/net/minecraft/src/WorldGenShrub.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenShrub.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/WorldGenShrub.java -+++ ../src_work/common/net/minecraft/src/WorldGenShrub.java -@@ -17,10 +17,16 @@ +--- ../src_base/minecraft/net/minecraft/world/gen/feature/WorldGenShrub.java ++++ ../src_work/minecraft/net/minecraft/world/gen/feature/WorldGenShrub.java +@@ -19,10 +19,16 @@ { int var15; @@ -20,7 +20,7 @@ int var7 = par1World.getBlockId(par3, par4, par5); -@@ -42,7 +48,10 @@ +@@ -44,7 +50,10 @@ { int var14 = var13 - par5; diff --git a/patches/common/net/minecraft/src/WorldGenSwamp.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenSwamp.java.patch similarity index 92% rename from patches/common/net/minecraft/src/WorldGenSwamp.java.patch rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenSwamp.java.patch index 92101f68d3..3143a20c76 100644 --- a/patches/common/net/minecraft/src/WorldGenSwamp.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenSwamp.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/WorldGenSwamp.java -+++ ../src_work/common/net/minecraft/src/WorldGenSwamp.java -@@ -44,7 +44,7 @@ +--- ../src_base/minecraft/net/minecraft/world/gen/feature/WorldGenSwamp.java ++++ ../src_work/minecraft/net/minecraft/world/gen/feature/WorldGenSwamp.java +@@ -47,7 +47,7 @@ { var12 = par1World.getBlockId(var10, var8, var11); @@ -9,7 +9,7 @@ { if (var12 != Block.waterStill.blockID && var12 != Block.waterMoving.blockID) { -@@ -91,7 +91,10 @@ +@@ -94,7 +94,10 @@ { int var15 = var14 - par5; @@ -21,7 +21,7 @@ { this.setBlock(par1World, var12, var16, var14, Block.leaves.blockID); } -@@ -103,7 +106,9 @@ +@@ -106,7 +109,9 @@ { var10 = par1World.getBlockId(par3, par4 + var16, par5); @@ -32,7 +32,7 @@ { this.setBlock(par1World, par3, par4 + var16, par5, Block.wood.blockID); } -@@ -118,7 +123,8 @@ +@@ -121,7 +126,8 @@ { for (var13 = par5 - var11; var13 <= par5 + var11; ++var13) { diff --git a/patches/common/net/minecraft/src/WorldGenTaiga1.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga1.java.patch similarity index 89% rename from patches/common/net/minecraft/src/WorldGenTaiga1.java.patch rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga1.java.patch index b7a305cdc0..c928aa0a26 100644 --- a/patches/common/net/minecraft/src/WorldGenTaiga1.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga1.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/WorldGenTaiga1.java -+++ ../src_work/common/net/minecraft/src/WorldGenTaiga1.java -@@ -41,7 +41,9 @@ +--- ../src_base/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga1.java ++++ ../src_work/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga1.java +@@ -43,7 +43,9 @@ { var15 = par1World.getBlockId(var13, var11, var14); @@ -11,7 +11,7 @@ { var10 = false; } -@@ -77,7 +79,10 @@ +@@ -79,7 +81,10 @@ { int var17 = var16 - par5; @@ -23,7 +23,7 @@ { this.setBlockAndMetadata(par1World, var14, var13, var16, Block.leaves.blockID, 1); } -@@ -98,7 +103,9 @@ +@@ -100,7 +105,9 @@ { var14 = par1World.getBlockId(par3, par4 + var13, par5); diff --git a/patches/common/net/minecraft/src/WorldGenTaiga2.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga2.java.patch similarity index 89% rename from patches/common/net/minecraft/src/WorldGenTaiga2.java.patch rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga2.java.patch index cea928f0d8..dedf0eb468 100644 --- a/patches/common/net/minecraft/src/WorldGenTaiga2.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga2.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/WorldGenTaiga2.java -+++ ../src_work/common/net/minecraft/src/WorldGenTaiga2.java -@@ -45,7 +45,9 @@ +--- ../src_base/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga2.java ++++ ../src_work/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga2.java +@@ -47,7 +47,9 @@ { var15 = par1World.getBlockId(var13, var11, var14); @@ -11,7 +11,7 @@ { var10 = false; } -@@ -87,7 +89,10 @@ +@@ -89,7 +91,10 @@ { int var20 = var19 - par5; @@ -23,7 +23,7 @@ { this.setBlockAndMetadata(par1World, var17, var16, var19, Block.leaves.blockID, 1); } -@@ -117,7 +122,9 @@ +@@ -119,7 +124,9 @@ { var17 = par1World.getBlockId(par3, par4 + var16, par5); diff --git a/patches/common/net/minecraft/src/WorldGenTallGrass.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTallGrass.java.patch similarity index 76% rename from patches/common/net/minecraft/src/WorldGenTallGrass.java.patch rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenTallGrass.java.patch index e51c8c184e..f25bd80ef5 100644 --- a/patches/common/net/minecraft/src/WorldGenTallGrass.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTallGrass.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/WorldGenTallGrass.java -+++ ../src_work/common/net/minecraft/src/WorldGenTallGrass.java -@@ -18,10 +18,16 @@ +--- ../src_base/minecraft/net/minecraft/world/gen/feature/WorldGenTallGrass.java ++++ ../src_work/minecraft/net/minecraft/world/gen/feature/WorldGenTallGrass.java +@@ -20,10 +20,16 @@ { int var11; diff --git a/patches/common/net/minecraft/src/WorldGenTrees.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTrees.java.patch similarity index 92% rename from patches/common/net/minecraft/src/WorldGenTrees.java.patch rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenTrees.java.patch index bb44cbdb39..6a494a9c5b 100644 --- a/patches/common/net/minecraft/src/WorldGenTrees.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTrees.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/WorldGenTrees.java -+++ ../src_work/common/net/minecraft/src/WorldGenTrees.java -@@ -64,7 +64,13 @@ +--- ../src_base/minecraft/net/minecraft/world/gen/feature/WorldGenTrees.java ++++ ../src_work/minecraft/net/minecraft/world/gen/feature/WorldGenTrees.java +@@ -67,7 +67,13 @@ { var12 = par1World.getBlockId(var10, var8, var11); @@ -15,7 +15,7 @@ { var7 = false; } -@@ -107,7 +113,10 @@ +@@ -110,7 +116,10 @@ { int var17 = var16 - par5; @@ -27,7 +27,7 @@ { this.setBlockAndMetadata(par1World, var14, var11, var16, Block.leaves.blockID, this.metaLeaves); } -@@ -119,7 +128,9 @@ +@@ -122,7 +131,9 @@ { var12 = par1World.getBlockId(par3, par4 + var11, par5); @@ -38,7 +38,7 @@ { this.setBlockAndMetadata(par1World, par3, par4 + var11, par5, Block.wood.blockID, this.metaWood); -@@ -159,7 +170,8 @@ +@@ -162,7 +173,8 @@ { for (var15 = par5 - var13; var15 <= par5 + var13; ++var15) { diff --git a/patches/common/net/minecraft/src/GenLayer.java.patch b/patches/minecraft/net/minecraft/world/gen/layer/GenLayer.java.patch similarity index 74% rename from patches/common/net/minecraft/src/GenLayer.java.patch rename to patches/minecraft/net/minecraft/world/gen/layer/GenLayer.java.patch index e7450f2e22..4c988b6787 100644 --- a/patches/common/net/minecraft/src/GenLayer.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/layer/GenLayer.java.patch @@ -1,14 +1,16 @@ ---- ../src_base/common/net/minecraft/src/GenLayer.java -+++ ../src_work/common/net/minecraft/src/GenLayer.java -@@ -1,4 +1,7 @@ - package net.minecraft.src; +--- ../src_base/minecraft/net/minecraft/world/gen/layer/GenLayer.java ++++ ../src_work/minecraft/net/minecraft/world/gen/layer/GenLayer.java +@@ -1,6 +1,9 @@ + package net.minecraft.world.gen.layer; + + import net.minecraft.world.WorldType; + +import net.minecraftforge.common.*; +import net.minecraftforge.event.terraingen.*; public abstract class GenLayer { -@@ -40,6 +43,7 @@ +@@ -42,6 +45,7 @@ { var4 = 6; } @@ -16,11 +18,11 @@ GenLayer var5 = GenLayerZoom.func_75915_a(1000L, var16, 0); GenLayerRiverInit var13 = new GenLayerRiverInit(100L, var5); -@@ -149,4 +153,11 @@ +@@ -151,4 +155,11 @@ * amounts, or biomeList[] indices based on the particular GenLayer subclass. */ public abstract int[] getInts(int var1, int var2, int var3, int var4); -+ ++ + public static byte getModdedBiomeSize(WorldType worldType, byte original) + { + WorldTypeEvent.BiomeSize event = new WorldTypeEvent.BiomeSize(worldType, original); diff --git a/patches/common/net/minecraft/src/ComponentMineshaftCorridor.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/ComponentMineshaftCorridor.java.patch similarity index 81% rename from patches/common/net/minecraft/src/ComponentMineshaftCorridor.java.patch rename to patches/minecraft/net/minecraft/world/gen/structure/ComponentMineshaftCorridor.java.patch index 83e591c64f..d77a1f6efb 100644 --- a/patches/common/net/minecraft/src/ComponentMineshaftCorridor.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/ComponentMineshaftCorridor.java.patch @@ -1,16 +1,16 @@ ---- ../src_base/common/net/minecraft/src/ComponentMineshaftCorridor.java -+++ ../src_work/common/net/minecraft/src/ComponentMineshaftCorridor.java -@@ -2,6 +2,9 @@ - - import java.util.List; - import java.util.Random; +--- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentMineshaftCorridor.java ++++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentMineshaftCorridor.java +@@ -5,6 +5,9 @@ + import net.minecraft.block.Block; + import net.minecraft.tileentity.TileEntityMobSpawner; + import net.minecraft.world.World; + +import net.minecraftforge.common.ChestGenHooks; +import static net.minecraftforge.common.ChestGenHooks.*; public class ComponentMineshaftCorridor extends StructureComponent { -@@ -231,14 +234,16 @@ +@@ -234,14 +237,16 @@ this.randomlyPlaceBlock(par1World, par3StructureBoundingBox, par2Random, 0.05F, 1, 2, var10 - 1, Block.torchWood.blockID, 0); this.randomlyPlaceBlock(par1World, par3StructureBoundingBox, par2Random, 0.05F, 1, 2, var10 + 1, Block.torchWood.blockID, 0); diff --git a/patches/common/net/minecraft/src/ComponentScatteredFeatureDesertPyramid.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureDesertPyramid.java.patch similarity index 69% rename from patches/common/net/minecraft/src/ComponentScatteredFeatureDesertPyramid.java.patch rename to patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureDesertPyramid.java.patch index 98274b552e..db139ca403 100644 --- a/patches/common/net/minecraft/src/ComponentScatteredFeatureDesertPyramid.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureDesertPyramid.java.patch @@ -1,16 +1,16 @@ ---- ../src_base/common/net/minecraft/src/ComponentScatteredFeatureDesertPyramid.java -+++ ../src_work/common/net/minecraft/src/ComponentScatteredFeatureDesertPyramid.java -@@ -1,6 +1,9 @@ - package net.minecraft.src; - - import java.util.Random; +--- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureDesertPyramid.java ++++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureDesertPyramid.java +@@ -6,6 +6,9 @@ + import net.minecraft.util.Direction; + import net.minecraft.util.WeightedRandomChestContent; + import net.minecraft.world.World; + +import net.minecraftforge.common.ChestGenHooks; +import static net.minecraftforge.common.ChestGenHooks.*; public class ComponentScatteredFeatureDesertPyramid extends ComponentScatteredFeature { -@@ -216,7 +219,7 @@ +@@ -221,7 +224,7 @@ { int var11 = Direction.offsetX[var10] * 2; int var12 = Direction.offsetZ[var10] * 2; diff --git a/patches/common/net/minecraft/src/ComponentScatteredFeatureJunglePyramid.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureJunglePyramid.java.patch similarity index 86% rename from patches/common/net/minecraft/src/ComponentScatteredFeatureJunglePyramid.java.patch rename to patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureJunglePyramid.java.patch index faaa827ebc..1f5041f375 100644 --- a/patches/common/net/minecraft/src/ComponentScatteredFeatureJunglePyramid.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureJunglePyramid.java.patch @@ -1,16 +1,16 @@ ---- ../src_base/common/net/minecraft/src/ComponentScatteredFeatureJunglePyramid.java -+++ ../src_work/common/net/minecraft/src/ComponentScatteredFeatureJunglePyramid.java -@@ -1,6 +1,9 @@ - package net.minecraft.src; - - import java.util.Random; +--- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureJunglePyramid.java ++++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureJunglePyramid.java +@@ -6,6 +6,9 @@ + import net.minecraft.item.Item; + import net.minecraft.util.WeightedRandomChestContent; + import net.minecraft.world.World; + +import net.minecraftforge.common.ChestGenHooks; +import static net.minecraftforge.common.ChestGenHooks.*; public class ComponentScatteredFeatureJunglePyramid extends ComponentScatteredFeature { -@@ -159,9 +162,12 @@ +@@ -164,9 +167,12 @@ this.placeBlockAtCurrentPosition(par1World, Block.redstoneWire.blockID, 0, 4, -3, 1, par3StructureBoundingBox); this.placeBlockAtCurrentPosition(par1World, Block.cobblestoneMossy.blockID, 0, 3, -3, 1, par3StructureBoundingBox); @@ -24,7 +24,7 @@ } this.placeBlockAtCurrentPosition(par1World, Block.vine.blockID, 15, 3, -2, 2, par3StructureBoundingBox); -@@ -178,7 +184,7 @@ +@@ -183,7 +189,7 @@ if (!this.field_74946_k) { @@ -33,7 +33,7 @@ } this.placeBlockAtCurrentPosition(par1World, Block.vine.blockID, 15, 8, -1, 3, par3StructureBoundingBox); -@@ -186,7 +192,7 @@ +@@ -191,7 +197,7 @@ if (!this.field_74947_h) { @@ -42,7 +42,7 @@ } this.placeBlockAtCurrentPosition(par1World, Block.cobblestoneMossy.blockID, 0, 9, -3, 2, par3StructureBoundingBox); -@@ -219,7 +225,7 @@ +@@ -224,7 +230,7 @@ if (!this.field_74948_i) { diff --git a/patches/common/net/minecraft/src/ComponentStrongholdChestCorridor.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdChestCorridor.java.patch similarity index 68% rename from patches/common/net/minecraft/src/ComponentStrongholdChestCorridor.java.patch rename to patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdChestCorridor.java.patch index 619539f58f..daff6e8ff1 100644 --- a/patches/common/net/minecraft/src/ComponentStrongholdChestCorridor.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdChestCorridor.java.patch @@ -1,16 +1,16 @@ ---- ../src_base/common/net/minecraft/src/ComponentStrongholdChestCorridor.java -+++ ../src_work/common/net/minecraft/src/ComponentStrongholdChestCorridor.java -@@ -2,6 +2,9 @@ - - import java.util.List; - import java.util.Random; +--- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdChestCorridor.java ++++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdChestCorridor.java +@@ -6,6 +6,9 @@ + import net.minecraft.item.Item; + import net.minecraft.util.WeightedRandomChestContent; + import net.minecraft.world.World; + +import net.minecraftforge.common.ChestGenHooks; +import static net.minecraftforge.common.ChestGenHooks.*; public class ComponentStrongholdChestCorridor extends ComponentStronghold { -@@ -68,7 +71,7 @@ +@@ -72,7 +75,7 @@ if (par3StructureBoundingBox.isVecInside(var5, var4, var6)) { this.hasMadeChest = true; diff --git a/patches/common/net/minecraft/src/ComponentStrongholdLibrary.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdLibrary.java.patch similarity index 78% rename from patches/common/net/minecraft/src/ComponentStrongholdLibrary.java.patch rename to patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdLibrary.java.patch index 1e02a27b10..986eef8c52 100644 --- a/patches/common/net/minecraft/src/ComponentStrongholdLibrary.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdLibrary.java.patch @@ -1,16 +1,16 @@ ---- ../src_base/common/net/minecraft/src/ComponentStrongholdLibrary.java -+++ ../src_work/common/net/minecraft/src/ComponentStrongholdLibrary.java -@@ -2,6 +2,9 @@ - - import java.util.List; - import java.util.Random; +--- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdLibrary.java ++++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdLibrary.java +@@ -6,6 +6,9 @@ + import net.minecraft.item.Item; + import net.minecraft.util.WeightedRandomChestContent; + import net.minecraft.world.World; + +import net.minecraftforge.common.ChestGenHooks; +import static net.minecraftforge.common.ChestGenHooks.*; public class ComponentStrongholdLibrary extends ComponentStronghold { -@@ -141,12 +144,13 @@ +@@ -145,12 +148,13 @@ this.placeBlockAtCurrentPosition(par1World, Block.torchWood.blockID, 0, var8, 8, var9 + 1, par3StructureBoundingBox); } diff --git a/patches/common/net/minecraft/src/ComponentStrongholdRoomCrossing.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdRoomCrossing.java.patch similarity index 76% rename from patches/common/net/minecraft/src/ComponentStrongholdRoomCrossing.java.patch rename to patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdRoomCrossing.java.patch index 828ebbcf1c..dbc85c162a 100644 --- a/patches/common/net/minecraft/src/ComponentStrongholdRoomCrossing.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdRoomCrossing.java.patch @@ -1,16 +1,16 @@ ---- ../src_base/common/net/minecraft/src/ComponentStrongholdRoomCrossing.java -+++ ../src_work/common/net/minecraft/src/ComponentStrongholdRoomCrossing.java -@@ -2,6 +2,9 @@ - - import java.util.List; - import java.util.Random; +--- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdRoomCrossing.java ++++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdRoomCrossing.java +@@ -6,6 +6,9 @@ + import net.minecraft.item.Item; + import net.minecraft.util.WeightedRandomChestContent; + import net.minecraft.world.World; + +import net.minecraftforge.common.ChestGenHooks; +import static net.minecraftforge.common.ChestGenHooks.*; public class ComponentStrongholdRoomCrossing extends ComponentStronghold { -@@ -140,7 +143,7 @@ +@@ -144,7 +147,7 @@ this.placeBlockAtCurrentPosition(par1World, Block.ladder.blockID, this.getMetadataWithOffset(Block.ladder.blockID, 4), 9, 1, 3, par3StructureBoundingBox); this.placeBlockAtCurrentPosition(par1World, Block.ladder.blockID, this.getMetadataWithOffset(Block.ladder.blockID, 4), 9, 2, 3, par3StructureBoundingBox); this.placeBlockAtCurrentPosition(par1World, Block.ladder.blockID, this.getMetadataWithOffset(Block.ladder.blockID, 4), 9, 3, 3, par3StructureBoundingBox); diff --git a/patches/common/net/minecraft/src/ComponentVillage.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/ComponentVillage.java.patch similarity index 74% rename from patches/common/net/minecraft/src/ComponentVillage.java.patch rename to patches/minecraft/net/minecraft/world/gen/structure/ComponentVillage.java.patch index bab4d1fd29..abbf02e387 100644 --- a/patches/common/net/minecraft/src/ComponentVillage.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/ComponentVillage.java.patch @@ -1,9 +1,9 @@ ---- ../src_base/common/net/minecraft/src/ComponentVillage.java -+++ ../src_work/common/net/minecraft/src/ComponentVillage.java -@@ -2,6 +2,10 @@ - - import java.util.List; - import java.util.Random; +--- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentVillage.java ++++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentVillage.java +@@ -5,6 +5,10 @@ + import net.minecraft.block.Block; + import net.minecraft.entity.passive.EntityVillager; + import net.minecraft.world.World; + +import net.minecraftforge.common.*; +import net.minecraftforge.event.Event.*; @@ -11,7 +11,7 @@ public abstract class ComponentVillage extends StructureComponent { -@@ -133,6 +137,10 @@ +@@ -136,6 +140,10 @@ */ protected int getBiomeSpecificBlock(int par1, int par2) { @@ -22,7 +22,7 @@ if (this.startPiece.inDesert) { if (par1 == Block.wood.blockID) -@@ -174,6 +182,10 @@ +@@ -177,6 +185,10 @@ */ protected int getBiomeSpecificBlockMetadata(int par1, int par2) { diff --git a/patches/common/net/minecraft/src/ComponentVillageHouse2.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/ComponentVillageHouse2.java.patch similarity index 68% rename from patches/common/net/minecraft/src/ComponentVillageHouse2.java.patch rename to patches/minecraft/net/minecraft/world/gen/structure/ComponentVillageHouse2.java.patch index 0ad1eae3bb..80b56a80e8 100644 --- a/patches/common/net/minecraft/src/ComponentVillageHouse2.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/ComponentVillageHouse2.java.patch @@ -1,16 +1,16 @@ ---- ../src_base/common/net/minecraft/src/ComponentVillageHouse2.java -+++ ../src_work/common/net/minecraft/src/ComponentVillageHouse2.java -@@ -2,6 +2,9 @@ - - import java.util.List; - import java.util.Random; +--- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentVillageHouse2.java ++++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentVillageHouse2.java +@@ -6,6 +6,9 @@ + import net.minecraft.item.Item; + import net.minecraft.util.WeightedRandomChestContent; + import net.minecraft.world.World; + +import net.minecraftforge.common.ChestGenHooks; +import static net.minecraftforge.common.ChestGenHooks.*; public class ComponentVillageHouse2 extends ComponentVillage { -@@ -88,7 +91,7 @@ +@@ -92,7 +95,7 @@ if (par3StructureBoundingBox.isVecInside(var5, var4, var6)) { this.hasMadeChest = true; diff --git a/patches/common/net/minecraft/src/ComponentVillageStartPiece.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/ComponentVillageStartPiece.java.patch similarity index 70% rename from patches/common/net/minecraft/src/ComponentVillageStartPiece.java.patch rename to patches/minecraft/net/minecraft/world/gen/structure/ComponentVillageStartPiece.java.patch index 05b8145e8b..58887589f8 100644 --- a/patches/common/net/minecraft/src/ComponentVillageStartPiece.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/ComponentVillageStartPiece.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/ComponentVillageStartPiece.java -+++ ../src_work/common/net/minecraft/src/ComponentVillageStartPiece.java -@@ -9,6 +9,7 @@ +--- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentVillageStartPiece.java ++++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentVillageStartPiece.java +@@ -11,6 +11,7 @@ /** Boolean that determines if the village is in a desert or not. */ public final boolean inDesert; @@ -8,7 +8,7 @@ /** World terrain type, 0 for normal, 1 for flap map */ public final int terrainType; -@@ -30,6 +31,7 @@ +@@ -32,6 +33,7 @@ this.terrainType = par7; BiomeGenBase var8 = par1WorldChunkManager.getBiomeGenAt(par4, par5); this.inDesert = var8 == BiomeGenBase.desert || var8 == BiomeGenBase.desertHills; diff --git a/patches/common/net/minecraft/src/MapGenStronghold.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/MapGenStronghold.java.patch similarity index 87% rename from patches/common/net/minecraft/src/MapGenStronghold.java.patch rename to patches/minecraft/net/minecraft/world/gen/structure/MapGenStronghold.java.patch index 7ef459cd36..55b156239c 100644 --- a/patches/common/net/minecraft/src/MapGenStronghold.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/MapGenStronghold.java.patch @@ -1,14 +1,14 @@ ---- ../src_base/common/net/minecraft/src/MapGenStronghold.java -+++ ../src_work/common/net/minecraft/src/MapGenStronghold.java +--- ../src_base/minecraft/net/minecraft/world/gen/structure/MapGenStronghold.java ++++ ../src_work/minecraft/net/minecraft/world/gen/structure/MapGenStronghold.java @@ -1,6 +1,7 @@ - package net.minecraft.src; + package net.minecraft.world.gen.structure; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.Iterator; import java.util.List; -@@ -10,6 +11,7 @@ +@@ -14,6 +15,7 @@ public class MapGenStronghold extends MapGenStructure { @@ -16,7 +16,7 @@ private BiomeGenBase[] allowedBiomeGenBases; /** -@@ -22,7 +24,7 @@ +@@ -26,7 +28,7 @@ public MapGenStronghold() { @@ -25,7 +25,7 @@ this.structureCoords = new ChunkCoordIntPair[3]; this.field_82671_h = 32.0D; this.field_82672_i = 3; -@@ -30,7 +32,7 @@ +@@ -34,7 +36,7 @@ public MapGenStronghold(Map par1Map) { diff --git a/patches/common/net/minecraft/src/MapData.java.patch b/patches/minecraft/net/minecraft/world/storage/MapData.java.patch similarity index 72% rename from patches/common/net/minecraft/src/MapData.java.patch rename to patches/minecraft/net/minecraft/world/storage/MapData.java.patch index 0d9976a483..dfb195e8a4 100644 --- a/patches/common/net/minecraft/src/MapData.java.patch +++ b/patches/minecraft/net/minecraft/world/storage/MapData.java.patch @@ -1,6 +1,6 @@ ---- ../src_base/common/net/minecraft/src/MapData.java -+++ ../src_work/common/net/minecraft/src/MapData.java -@@ -167,7 +167,7 @@ +--- ../src_base/minecraft/net/minecraft/world/storage/MapData.java ++++ ../src_work/minecraft/net/minecraft/world/storage/MapData.java +@@ -173,7 +173,7 @@ par8 += par8 < 0.0D ? -8.0D : 8.0D; var15 = (byte)((int)(par8 * 16.0D / 360.0D));