From 260be687239b7ba04d6be2f5b9a0ce432f923cf6 Mon Sep 17 00:00:00 2001 From: cpw Date: Thu, 23 Jun 2016 02:39:36 -0400 Subject: [PATCH] Update to 1.10 --- build.gradle | 6 +- jsons/1.10-dev.json | 92 +++ jsons/1.10-rel.json | 139 +++++ jsons/1.10.json | 563 ++++++++++++++++++ .../net/minecraft/block/Block.java.patch | 28 +- .../block/BlockDoublePlant.java.patch | 4 +- .../minecraft/block/BlockFalling.java.patch | 4 +- .../minecraft/block/BlockLeaves.java.patch | 2 +- .../net/minecraft/block/BlockNote.java.patch | 2 +- .../minecraft/block/BlockPumpkin.java.patch | 2 +- .../minecraft/block/BlockQuartz.java.patch | 2 +- .../minecraft/block/BlockRailBase.java.patch | 20 +- .../block/BlockRedstoneComparator.java.patch | 2 +- .../net/minecraft/block/BlockSkull.java.patch | 8 +- .../minecraft/block/BlockTrapDoor.java.patch | 2 +- .../state/BlockStateContainer.java.patch | 4 +- .../block/state/IBlockProperties.java.patch | 6 +- .../net/minecraft/client/Minecraft.java.patch | 76 +-- .../client/entity/EntityPlayerSP.java.patch | 8 +- .../client/gui/GuiControls.java.patch | 2 +- .../client/gui/GuiCreateWorld.java.patch | 8 +- .../minecraft/client/gui/GuiIngame.java.patch | 6 +- .../client/gui/GuiIngameMenu.java.patch | 17 +- .../client/gui/GuiMainMenu.java.patch | 20 +- .../client/gui/GuiMultiplayer.java.patch | 4 +- .../client/gui/GuiOverlayDebug.java.patch | 4 +- .../minecraft/client/gui/GuiScreen.java.patch | 16 +- .../minecraft/client/gui/GuiSlot.java.patch | 8 +- .../gui/GuiUtilRenderComponents.java.patch | 9 +- .../gui/ServerListEntryNormal.java.patch | 2 +- .../achievement/GuiAchievements.java.patch | 26 +- .../inventory/GuiContainerCreative.java.patch | 2 +- .../client/model/ModelBox.java.patch | 4 +- .../multiplayer/GuiConnecting.java.patch | 4 +- .../multiplayer/PlayerControllerMP.java.patch | 66 +- .../client/multiplayer/WorldClient.java.patch | 2 +- .../network/NetHandlerPlayClient.java.patch | 20 +- .../client/network/ServerPinger.java.patch | 9 + .../particle/ParticleManager.java.patch | 6 +- .../renderer/BlockModelRenderer.java.patch | 8 +- .../client/renderer/EntityRenderer.java.patch | 34 +- .../InventoryEffectRenderer.java.patch | 11 +- .../client/renderer/RenderGlobal.java.patch | 8 +- .../client/renderer/RenderItem.java.patch | 2 +- .../client/renderer/VertexBuffer.java.patch | 8 +- .../block/model/ModelBakery.java.patch | 4 +- .../renderer/chunk/RenderChunk.java.patch | 10 +- .../renderer/color/BlockColors.java.patch | 27 +- .../renderer/color/ItemColors.java.patch | 30 +- .../entity/RenderLivingBase.java.patch | 2 +- .../renderer/entity/RenderManager.java.patch | 4 +- .../renderer/entity/RenderZombie.java.patch | 2 +- .../renderer/texture/Stitcher.java.patch | 2 +- .../renderer/texture/TextureMap.java.patch | 8 +- .../TileEntityRendererDispatcher.java.patch | 8 +- .../TileEntitySpecialRenderer.java.patch | 10 +- ...SimpleReloadableResourceManager.java.patch | 10 +- .../client/settings/GameSettings.java.patch | 34 +- .../minecraft/command/CommandFill.java.patch | 4 +- .../command/CommandHandler.java.patch | 2 +- .../enchantment/EnchantmentHelper.java.patch | 8 +- .../net/minecraft/entity/Entity.java.patch | 26 +- .../minecraft/entity/EntityHanging.java.patch | 8 +- .../minecraft/entity/EntityList.java.patch | 8 +- .../minecraft/entity/EntityLiving.java.patch | 6 +- .../entity/EntityLivingBase.java.patch | 48 +- .../entity/ai/EntityAIAttackMelee.java.patch | 2 +- .../entity/boss/EntityDragon.java.patch | 2 +- .../entity/boss/EntityWither.java.patch | 2 +- .../entity/item/EntityEnderPearl.java.patch | 6 +- .../entity/item/EntityFallingBlock.java.patch | 2 +- .../entity/item/EntityItem.java.patch | 22 +- .../entity/item/EntityItemFrame.java.patch | 2 +- .../entity/item/EntityMinecart.java.patch | 61 +- .../EntityMinecartCommandBlock.java.patch | 2 +- .../item/EntityMinecartContainer.java.patch | 4 +- .../item/EntityMinecartEmpty.java.patch | 2 +- .../item/EntityMinecartFurnace.java.patch | 2 +- .../item/EntityMinecartHopper.java.patch | 2 +- .../entity/item/EntityXPOrb.java.patch | 2 +- .../entity/monster/EntityEnderman.java.patch | 4 +- .../entity/monster/EntityMagmaCube.java.patch | 2 +- .../entity/monster/EntitySlime.java.patch | 8 +- .../entity/monster/EntityZombie.java.patch | 163 +++-- .../entity/monster/ZombieType.java.patch | 13 + .../entity/passive/EntityHorse.java.patch | 6 +- .../entity/passive/EntityMooshroom.java.patch | 10 +- .../entity/passive/EntityOcelot.java.patch | 2 +- .../entity/passive/EntitySheep.java.patch | 6 +- .../entity/passive/EntityVillager.java.patch | 29 +- .../entity/player/EntityPlayer.java.patch | 68 +-- .../entity/player/EntityPlayerMP.java.patch | 15 +- .../entity/player/InventoryPlayer.java.patch | 16 +- .../inventory/ContainerBeacon.java.patch | 2 +- .../inventory/ContainerEnchantment.java.patch | 8 +- .../net/minecraft/item/Item.java.patch | 10 +- .../net/minecraft/item/ItemArmor.java.patch | 4 +- .../minecraft/item/ItemSeedFood.java.patch | 4 +- .../net/minecraft/item/ItemSeeds.java.patch | 4 +- .../net/minecraft/item/ItemStack.java.patch | 44 +- .../item/crafting/RecipeFireworks.java.patch | 2 +- .../item/crafting/ShapedRecipes.java.patch | 2 +- .../net/minecraft/nbt/NBTTagString.java.patch | 2 +- .../network/NetHandlerPlayServer.java.patch | 16 +- .../minecraft/realms/RealmsConnect.java.patch | 4 +- .../server/MinecraftServer.java.patch | 52 +- .../dedicated/DedicatedServer.java.patch | 20 +- .../dedicated/ServerHangWatchdog.java.patch | 2 +- .../integrated/IntegratedServer.java.patch | 10 +- .../management/PlayerChunkMapEntry.java.patch | 10 +- .../PlayerInteractionManager.java.patch | 73 ++- .../server/management/PlayerList.java.patch | 8 +- .../tileentity/TileEntity.java.patch | 26 +- .../TileEntityBrewingStand.java.patch | 12 +- .../tileentity/TileEntityChest.java.patch | 4 +- .../tileentity/TileEntityFurnace.java.patch | 22 +- .../tileentity/TileEntityHopper.java.patch | 8 +- .../tileentity/TileEntityPiston.java.patch | 4 +- .../tileentity/TileEntitySign.java.patch | 2 +- .../net/minecraft/util/SoundEvent.java.patch | 2 +- .../minecraft/util/TabCompleter.java.patch | 6 +- .../net/minecraft/util/math/Vec3d.java.patch | 22 + .../net/minecraft/world/World.java.patch | 117 ++-- .../world/WorldEntitySpawner.java.patch | 4 +- .../minecraft/world/WorldProvider.java.patch | 2 +- .../minecraft/world/WorldServer.java.patch | 4 +- .../world/WorldServerMulti.java.patch | 2 +- .../world/biome/BiomeDecorator.java.patch | 32 +- .../world/biome/BiomePlains.java.patch | 10 +- .../world/biome/BiomeSwamp.java.patch | 2 +- .../minecraft/world/chunk/Chunk.java.patch | 50 +- .../chunk/storage/AnvilChunkLoader.java.patch | 37 +- .../world/gen/ChunkProviderEnd.java.patch | 8 +- .../world/gen/ChunkProviderHell.java.patch | 39 +- .../gen/ChunkProviderOverworld.java.patch | 14 +- .../world/gen/MapGenCaves.java.patch | 16 +- .../feature/WorldGenBigMushroom.java.patch | 6 +- .../gen/feature/WorldGenDeadBush.java.patch | 16 +- .../gen/feature/WorldGenShrub.java.patch | 15 +- .../gen/feature/WorldGenTaiga1.java.patch | 8 +- .../gen/feature/WorldGenTallGrass.java.patch | 16 +- .../WorldGeneratorBonusChest.java.patch | 20 +- .../world/gen/layer/GenLayer.java.patch | 6 +- .../world/gen/layer/GenLayerBiome.java.patch | 6 +- .../structure/StructureComponent.java.patch | 2 +- .../StructureVillagePieces.java.patch | 52 +- .../world/storage/WorldInfo.java.patch | 4 +- .../world/storage/loot/LootEntry.java.patch | 2 +- .../storage/loot/LootEntryItem.java.patch | 6 +- .../client/EnumHelperClient.java | 2 +- .../minecraftforge/client/GuiIngameForge.java | 9 - .../net/minecraftforge/common/ForgeHooks.java | 4 +- .../minecraftforge/common/ForgeVersion.java | 6 +- .../common/util/BlockSnapshot.java | 2 +- .../event/terraingen/PopulateChunkEvent.java | 2 +- .../fluids/DispenseFluidContainer.java | 4 +- .../fml/common/FMLModContainer.java | 1 + .../deobf/FMLDeobfuscatingRemapper.java | 4 +- .../fml/common/registry/VillagerRegistry.java | 29 +- src/main/resources/forge_at.cfg | 5 +- .../test/NoBedSleepingTest.java | 2 +- .../test/PlayerInteractEventTest.java | 3 +- 162 files changed, 1930 insertions(+), 1016 deletions(-) create mode 100644 jsons/1.10-dev.json create mode 100644 jsons/1.10-rel.json create mode 100644 jsons/1.10.json create mode 100644 patches/minecraft/net/minecraft/entity/monster/ZombieType.java.patch diff --git a/build.gradle b/build.gradle index 34d3e1761..7b6485587 100644 --- a/build.gradle +++ b/build.gradle @@ -26,10 +26,10 @@ apply plugin: "net.minecraftforge.gradle.patcher" apply plugin: "net.minecraftforge.gradle.launch4j" minecraft { - version = "1.9.4" + version = "1.10" mappings = 'snapshot_nodoc_20160518' workspaceDir = "projects" - versionJson = "jsons/1.9.4-dev.json" + versionJson = "jsons/1.10-dev.json" buildUserdev = true buildInstaller = true installerVersion = "1.4" @@ -66,7 +66,7 @@ extractForgeResources { exclude "**/log4j2.xml" } genGradleProjects { addTestCompileDep "junit:junit:4.12" } processJson { - releaseJson = "jsons/1.9.4-rel.json" + releaseJson = "jsons/1.10-rel.json" addReplacements([ "@minecraft_version@": project.minecraft.version, "@version@": project.version, diff --git a/jsons/1.10-dev.json b/jsons/1.10-dev.json new file mode 100644 index 000000000..5792e2111 --- /dev/null +++ b/jsons/1.10-dev.json @@ -0,0 +1,92 @@ +{ + "id": "@minecraft_version@-@project@@version@", + "time": "@timestamp@", + "releaseTime": "1960-01-01T00:00:00-0700", + "type": "release", + "inheritsFrom": "1.10", + "minecraftArguments": "--version FML_DEV --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker", + "libraries": [ + { + "name": "net.minecraft:launchwrapper:1.12" + }, + { + "name": "jline:jline:2.13", + "children": ["sources"], + "url" : "http://repo.maven.apache.org/maven2" + }, + { + "name": "com.google.code.findbugs:jsr305:1.3.9", + "children": ["sources"], + "url" : "http://repo.maven.apache.org/maven2" + }, + { + "name": "org.ow2.asm:asm-debug-all:5.0.3", + "children" : ["sources"], + "url" : "http://repo.maven.apache.org/maven2" + }, + { + "name": "com.typesafe.akka:akka-actor_2.11:2.3.3", + "children" : ["sources"], + "url" : "http://repo.maven.apache.org/maven2" + }, + { + "name": "com.typesafe:config:1.2.1", + "children" : ["sources"], + "url" : "http://repo.maven.apache.org/maven2" + }, + { + "name": "org.scala-lang:scala-actors-migration_2.11:1.1.0", + "children" : ["sources"], + "url" : "http://repo.maven.apache.org/maven2" + }, + { + "name": "org.scala-lang:scala-compiler:2.11.1", + "children" : ["sources"], + "url" : "http://repo.maven.apache.org/maven2" + }, + { + "name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2", + "children" : ["sources"], + "url" : "http://repo.maven.apache.org/maven2" + }, + { + "name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2", + "children" : ["sources"], + "url" : "http://repo.maven.apache.org/maven2" + }, + { + "name": "org.scala-lang:scala-library:2.11.1", + "children" : ["sources"], + "url" : "http://repo.maven.apache.org/maven2" + }, + { + "name": "org.scala-lang.modules:scala-parser-combinators_2.11:1.0.1", + "children" : ["sources"], + "url" : "http://repo.maven.apache.org/maven2" + }, + { + "name": "org.scala-lang:scala-reflect:2.11.1", + "children" : ["sources"], + "url" : "http://repo.maven.apache.org/maven2" + }, + { + "name": "org.scala-lang.modules:scala-swing_2.11:1.0.1", + "children" : ["sources"], + "url" : "http://repo.maven.apache.org/maven2" + }, + { + "name": "org.scala-lang.modules:scala-xml_2.11:1.0.2", + "children" : ["sources"], + "url" : "http://repo.maven.apache.org/maven2" + }, + { + "name": "lzma:lzma:0.0.1" + }, + { + "name": "java3d:vecmath:1.5.2" + }, + { + "name": "net.sf.trove4j:trove4j:3.0.3" + } + ] +} diff --git a/jsons/1.10-rel.json b/jsons/1.10-rel.json new file mode 100644 index 000000000..6336ff0b6 --- /dev/null +++ b/jsons/1.10-rel.json @@ -0,0 +1,139 @@ +{ +"install": { + "profileName": "@project@", + "target":"@minecraft_version@-@project@@version@", + "path":"@artifact@", + "version":"@project@ @version@", + "filePath":"@universal_jar@", + "welcome":"Welcome to the simple @project@ installer.", + "minecraft":"@minecraft_version@", + "mirrorList" : "http://files.minecraftforge.net/mirror-brand.list", + "logo":"/big_logo.png" +}, +"versionInfo": { + "id": "@minecraft_version@-@project@@version@", + "time": "@timestamp@", + "releaseTime": "1960-01-01T00:00:00-0700", + "type": "release", + "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker --versionType Forge", + "mainClass": "net.minecraft.launchwrapper.Launch", + "inheritsFrom": "1.10", + "jar": "1.10", + "libraries": [ + { + "name": "@artifact@", + "url": "http://files.minecraftforge.net/maven/" + }, + { + "name": "net.minecraft:launchwrapper:1.12", + "serverreq":true + }, + { + "name": "org.ow2.asm:asm-all:5.0.3", + "serverreq":true + }, + { + "name": "jline:jline:2.13", + "url" : "http://files.minecraftforge.net/maven/", + "checksums" : [ "2d9530d0a25daffaffda7c35037b046b627bb171" ], + "serverreq":true, + "clientreq":false + }, + { + "name": "com.typesafe.akka:akka-actor_2.11:2.3.3", + "url" : "http://files.minecraftforge.net/maven/", + "checksums" : [ "ed62e9fc709ca0f2ff1a3220daa8b70a2870078e", "25a86ccfdb6f6dfe08971f4825d0a01be83a6f2e" ], + "serverreq":true, + "clientreq":true + }, + { + "name": "com.typesafe:config:1.2.1", + "url" : "http://files.minecraftforge.net/maven/", + "checksums" : [ "f771f71fdae3df231bcd54d5ca2d57f0bf93f467", "7d7bc36df0989d72f2d5d057309675777acc528b" ], + "serverreq":true, + "clientreq":true + }, + { + "name": "org.scala-lang:scala-actors-migration_2.11:1.1.0", + "url" : "http://files.minecraftforge.net/maven/", + "checksums" : [ "dfa8bc42b181d5b9f1a5dd147f8ae308b893eb6f", "8c9aaeeb68487ca519411a14068e1b4d69739207" ], + "serverreq":true, + "clientreq":true + }, + { + "name": "org.scala-lang:scala-compiler:2.11.1", + "url" : "http://files.minecraftforge.net/maven/", + "checksums" : [ "56ea2e6c025e0821f28d73ca271218b8dd04926a", "1444992390544ba3780867a13ff696a89d7d1639" ], + "serverreq":true, + "clientreq":true + }, + { + "name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2", + "url" : "http://files.minecraftforge.net/maven/", + "checksums" : [ "87213338cd5a153a7712cb574c0ddd2edfee0386", "0b4c1bf8d48993f138d6e10c0c144e50acfff581" ], + "serverreq":true, + "clientreq":true + }, + { + "name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2", + "url" : "http://files.minecraftforge.net/maven/", + "checksums" : [ "1f7371605d4ba42aa26d3443440c0083c587b4e9", "1ea655dda4504ae0a367327e2340cd3beaee6c73" ], + "serverreq":true, + "clientreq":true + }, + { + "name": "org.scala-lang:scala-library:2.11.1", + "url" : "http://files.minecraftforge.net/maven/", + "checksums" : [ "0e11da23da3eabab9f4777b9220e60d44c1aab6a", "1e4df76e835201c6eabd43adca89ab11f225f134" ], + "serverreq":true, + "clientreq":true + }, + { + "name": "org.scala-lang:scala-parser-combinators_2.11:1.0.1", + "url" : "http://files.minecraftforge.net/maven/", + "checksums" : [ "f05d7345bf5a58924f2837c6c1f4d73a938e1ff0", "a1cbbcbde1dcc614f4253ed1aa0b320bc78d8f1d" ], + "serverreq":true, + "clientreq":true + }, + { + "name": "org.scala-lang:scala-reflect:2.11.1", + "url" : "http://files.minecraftforge.net/maven/", + "checksums" : [ "6580347e61cc7f8e802941e7fde40fa83b8badeb", "91ce0f0be20f4a536321724b4b3bbc6530ddcd88" ], + "serverreq":true, + "clientreq":true + }, + { + "name": "org.scala-lang:scala-swing_2.11:1.0.1", + "url" : "http://files.minecraftforge.net/maven/", + "checksums" : [ "b1cdd92bd47b1e1837139c1c53020e86bb9112ae", "d77152691dcf5bbdb00529af37aa7d3d887b3e63" ], + "serverreq":true, + "clientreq":true + }, + { + "name": "org.scala-lang:scala-xml_2.11:1.0.2", + "url" : "http://files.minecraftforge.net/maven/", + "checksums" : [ "7a80ec00aec122fba7cd4e0d4cdd87ff7e4cb6d0", "62736b01689d56b6d09a0164b7ef9da2b0b9633d" ], + "serverreq":true, + "clientreq":true + }, + { + "name": "lzma:lzma:0.0.1", + "serverreq":true + }, + { + "name": "net.sf.jopt-simple:jopt-simple:4.6", + "serverreq":true + }, + { + "name": "java3d:vecmath:1.5.2", + "clientreq":true, + "serverreq":true + }, + { + "name": "net.sf.trove4j:trove4j:3.0.3", + "clientreq":true, + "serverreq":true + } + ] +} +} diff --git a/jsons/1.10.json b/jsons/1.10.json new file mode 100644 index 000000000..dbe5a807c --- /dev/null +++ b/jsons/1.10.json @@ -0,0 +1,563 @@ +{ + "assetIndex": { + "id": "1.10", + "sha1": "d3bfc4ffba1ea334c725dd91eaf4ecd402d641f7", + "size": 145627, + "url": "https://launchermeta.mojang.com/mc/assets/1.10/d3bfc4ffba1ea334c725dd91eaf4ecd402d641f7/1.10.json", + "totalSize": 121931230 + }, + "assets": "1.10", + "downloads": { + "client": { + "sha1": "ba038efbc6d9e4a046927a7658413d0276895739", + "size": 8856992, + "url": "https://launcher.mojang.com/mc/game/1.10/client/ba038efbc6d9e4a046927a7658413d0276895739/client.jar" + }, + "server": { + "sha1": "a96617ffdf5dabbb718ab11a9a68e50545fc5bee", + "size": 9459395, + "url": "https://launcher.mojang.com/mc/game/1.10/server/a96617ffdf5dabbb718ab11a9a68e50545fc5bee/server.jar" + } + }, + "id": "1.10", + "libraries": [ + { + "name": "com.mojang:netty:1.6", + "downloads": { + "artifact": { + "size": 7877, + "sha1": "4b75825a06139752bd800d9e29c5fd55b8b1b1e4", + "path": "com/mojang/netty/1.6/netty-1.6.jar", + "url": "https://libraries.minecraft.net/com/mojang/netty/1.6/netty-1.6.jar" + } + } + }, + { + "name": "oshi-project:oshi-core:1.1", + "downloads": { + "artifact": { + "size": 30973, + "sha1": "9ddf7b048a8d701be231c0f4f95fd986198fd2d8", + "path": "oshi-project/oshi-core/1.1/oshi-core-1.1.jar", + "url": "https://libraries.minecraft.net/oshi-project/oshi-core/1.1/oshi-core-1.1.jar" + } + } + }, + { + "name": "net.java.dev.jna:jna:3.4.0", + "downloads": { + "artifact": { + "size": 1008730, + "sha1": "803ff252fedbd395baffd43b37341dc4a150a554", + "path": "net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar", + "url": "https://libraries.minecraft.net/net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar" + } + } + }, + { + "name": "net.java.dev.jna:platform:3.4.0", + "downloads": { + "artifact": { + "size": 913436, + "sha1": "e3f70017be8100d3d6923f50b3d2ee17714e9c13", + "path": "net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar", + "url": "https://libraries.minecraft.net/net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar" + } + } + }, + { + "name": "com.ibm.icu:icu4j-core-mojang:51.2", + "downloads": { + "artifact": { + "size": 1634692, + "sha1": "63d216a9311cca6be337c1e458e587f99d382b84", + "path": "com/ibm/icu/icu4j-core-mojang/51.2/icu4j-core-mojang-51.2.jar", + "url": "https://libraries.minecraft.net/com/ibm/icu/icu4j-core-mojang/51.2/icu4j-core-mojang-51.2.jar" + } + } + }, + { + "name": "net.sf.jopt-simple:jopt-simple:4.6", + "downloads": { + "artifact": { + "size": 62477, + "sha1": "306816fb57cf94f108a43c95731b08934dcae15c", + "path": "net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar", + "url": "https://libraries.minecraft.net/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar" + } + } + }, + { + "name": "com.paulscode:codecjorbis:20101023", + "downloads": { + "artifact": { + "size": 103871, + "sha1": "c73b5636faf089d9f00e8732a829577de25237ee", + "path": "com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar", + "url": "https://libraries.minecraft.net/com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar" + } + } + }, + { + "name": "com.paulscode:codecwav:20101023", + "downloads": { + "artifact": { + "size": 5618, + "sha1": "12f031cfe88fef5c1dd36c563c0a3a69bd7261da", + "path": "com/paulscode/codecwav/20101023/codecwav-20101023.jar", + "url": "https://libraries.minecraft.net/com/paulscode/codecwav/20101023/codecwav-20101023.jar" + } + } + }, + { + "name": "com.paulscode:libraryjavasound:20101123", + "downloads": { + "artifact": { + "size": 21679, + "sha1": "5c5e304366f75f9eaa2e8cca546a1fb6109348b3", + "path": "com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar", + "url": "https://libraries.minecraft.net/com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar" + } + } + }, + { + "name": "com.paulscode:librarylwjglopenal:20100824", + "downloads": { + "artifact": { + "size": 18981, + "sha1": "73e80d0794c39665aec3f62eee88ca91676674ef", + "path": "com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar", + "url": "https://libraries.minecraft.net/com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar" + } + } + }, + { + "name": "com.paulscode:soundsystem:20120107", + "downloads": { + "artifact": { + "size": 65020, + "sha1": "419c05fe9be71f792b2d76cfc9b67f1ed0fec7f6", + "path": "com/paulscode/soundsystem/20120107/soundsystem-20120107.jar", + "url": "https://libraries.minecraft.net/com/paulscode/soundsystem/20120107/soundsystem-20120107.jar" + } + } + }, + { + "name": "io.netty:netty-all:4.0.23.Final", + "downloads": { + "artifact": { + "size": 1779991, + "sha1": "0294104aaf1781d6a56a07d561e792c5d0c95f45", + "path": "io/netty/netty-all/4.0.23.Final/netty-all-4.0.23.Final.jar", + "url": "https://libraries.minecraft.net/io/netty/netty-all/4.0.23.Final/netty-all-4.0.23.Final.jar" + } + } + }, + { + "name": "com.google.guava:guava:17.0", + "downloads": { + "artifact": { + "size": 2243036, + "sha1": "9c6ef172e8de35fd8d4d8783e4821e57cdef7445", + "path": "com/google/guava/guava/17.0/guava-17.0.jar", + "url": "https://libraries.minecraft.net/com/google/guava/guava/17.0/guava-17.0.jar" + } + } + }, + { + "name": "org.apache.commons:commons-lang3:3.3.2", + "downloads": { + "artifact": { + "size": 412739, + "sha1": "90a3822c38ec8c996e84c16a3477ef632cbc87a3", + "path": "org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2.jar", + "url": "https://libraries.minecraft.net/org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2.jar" + } + } + }, + { + "name": "commons-io:commons-io:2.4", + "downloads": { + "artifact": { + "size": 185140, + "sha1": "b1b6ea3b7e4aa4f492509a4952029cd8e48019ad", + "path": "commons-io/commons-io/2.4/commons-io-2.4.jar", + "url": "https://libraries.minecraft.net/commons-io/commons-io/2.4/commons-io-2.4.jar" + } + } + }, + { + "name": "commons-codec:commons-codec:1.9", + "downloads": { + "artifact": { + "size": 263965, + "sha1": "9ce04e34240f674bc72680f8b843b1457383161a", + "path": "commons-codec/commons-codec/1.9/commons-codec-1.9.jar", + "url": "https://libraries.minecraft.net/commons-codec/commons-codec/1.9/commons-codec-1.9.jar" + } + } + }, + { + "name": "net.java.jinput:jinput:2.0.5", + "downloads": { + "artifact": { + "size": 208338, + "sha1": "39c7796b469a600f72380316f6b1f11db6c2c7c4", + "path": "net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar", + "url": "https://libraries.minecraft.net/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar" + } + } + }, + { + "name": "net.java.jutils:jutils:1.0.0", + "downloads": { + "artifact": { + "size": 7508, + "sha1": "e12fe1fda814bd348c1579329c86943d2cd3c6a6", + "path": "net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar", + "url": "https://libraries.minecraft.net/net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar" + } + } + }, + { + "name": "com.google.code.gson:gson:2.2.4", + "downloads": { + "artifact": { + "size": 190432, + "sha1": "a60a5e993c98c864010053cb901b7eab25306568", + "path": "com/google/code/gson/gson/2.2.4/gson-2.2.4.jar", + "url": "https://libraries.minecraft.net/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar" + } + } + }, + { + "name": "com.mojang:authlib:1.5.22", + "downloads": { + "artifact": { + "size": 64539, + "sha1": "afaa8f6df976fcb5520e76ef1d5798c9e6b5c0b2", + "path": "com/mojang/authlib/1.5.22/authlib-1.5.22.jar", + "url": "https://libraries.minecraft.net/com/mojang/authlib/1.5.22/authlib-1.5.22.jar" + } + } + }, + { + "name": "com.mojang:realms:1.9.1", + "downloads": { + "artifact": { + "size": 1575796, + "sha1": "cd3929316dfd85be640e1c1f15df5577cdcd860b", + "path": "com/mojang/realms/1.9.1/realms-1.9.1.jar", + "url": "https://libraries.minecraft.net/com/mojang/realms/1.9.1/realms-1.9.1.jar" + } + } + }, + { + "name": "org.apache.commons:commons-compress:1.8.1", + "downloads": { + "artifact": { + "size": 365552, + "sha1": "a698750c16740fd5b3871425f4cb3bbaa87f529d", + "path": "org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar", + "url": "https://libraries.minecraft.net/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar" + } + } + }, + { + "name": "org.apache.httpcomponents:httpclient:4.3.3", + "downloads": { + "artifact": { + "size": 589512, + "sha1": "18f4247ff4572a074444572cee34647c43e7c9c7", + "path": "org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar", + "url": "https://libraries.minecraft.net/org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar" + } + } + }, + { + "name": "commons-logging:commons-logging:1.1.3", + "downloads": { + "artifact": { + "size": 62050, + "sha1": "f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f", + "path": "commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar", + "url": "https://libraries.minecraft.net/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar" + } + } + }, + { + "name": "org.apache.httpcomponents:httpcore:4.3.2", + "downloads": { + "artifact": { + "size": 282269, + "sha1": "31fbbff1ddbf98f3aa7377c94d33b0447c646b6e", + "path": "org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar", + "url": "https://libraries.minecraft.net/org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar" + } + } + }, + { + "name": "it.unimi.dsi:fastutil:7.0.12_mojang", + "downloads": { + "artifact": { + "size": 522306, + "sha1": "ba787e741efdc425fc5d2ea654b57c15fba27efa", + "path": "it/unimi/dsi/fastutil/7.0.12_mojang/fastutil-7.0.12_mojang.jar", + "url": "https://libraries.minecraft.net/it/unimi/dsi/fastutil/7.0.12_mojang/fastutil-7.0.12_mojang.jar" + } + } + }, + { + "name": "org.apache.logging.log4j:log4j-api:2.0-beta9", + "downloads": { + "artifact": { + "size": 108161, + "sha1": "1dd66e68cccd907880229f9e2de1314bd13ff785", + "path": "org/apache/logging/log4j/log4j-api/2.0-beta9/log4j-api-2.0-beta9.jar", + "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-api/2.0-beta9/log4j-api-2.0-beta9.jar" + } + } + }, + { + "name": "org.apache.logging.log4j:log4j-core:2.0-beta9", + "downloads": { + "artifact": { + "size": 681134, + "sha1": "678861ba1b2e1fccb594bb0ca03114bb05da9695", + "path": "org/apache/logging/log4j/log4j-core/2.0-beta9/log4j-core-2.0-beta9.jar", + "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-core/2.0-beta9/log4j-core-2.0-beta9.jar" + } + } + }, + { + "name": "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209", + "rules": [ + { + "action": "allow" + }, + { + "action": "disallow", + "os": { + "name": "osx" + } + } + ], + "downloads": { + "artifact": { + "size": 1047168, + "sha1": "697517568c68e78ae0b4544145af031c81082dfe", + "path": "org/lwjgl/lwjgl/lwjgl/2.9.4-nightly-20150209/lwjgl-2.9.4-nightly-20150209.jar", + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl/2.9.4-nightly-20150209/lwjgl-2.9.4-nightly-20150209.jar" + } + } + }, + { + "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209", + "rules": [ + { + "action": "allow" + }, + { + "action": "disallow", + "os": { + "name": "osx" + } + } + ], + "downloads": { + "artifact": { + "size": 173887, + "sha1": "d51a7c040a721d13efdfbd34f8b257b2df882ad0", + "path": "org/lwjgl/lwjgl/lwjgl_util/2.9.4-nightly-20150209/lwjgl_util-2.9.4-nightly-20150209.jar", + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl_util/2.9.4-nightly-20150209/lwjgl_util-2.9.4-nightly-20150209.jar" + } + } + }, + { + "extract": { + "exclude": [ + "META-INF/" + ] + }, + "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209", + "natives": { + "linux": "natives-linux", + "osx": "natives-osx", + "windows": "natives-windows" + }, + "rules": [ + { + "action": "allow" + }, + { + "action": "disallow", + "os": { + "name": "osx" + } + } + ], + "downloads": { + "classifiers": { + "natives-linux": { + "size": 578680, + "sha1": "931074f46c795d2f7b30ed6395df5715cfd7675b", + "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-linux.jar", + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-linux.jar" + }, + "natives-osx": { + "size": 426822, + "sha1": "bcab850f8f487c3f4c4dbabde778bb82bd1a40ed", + "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar", + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar" + }, + "natives-windows": { + "size": 613748, + "sha1": "b84d5102b9dbfabfeb5e43c7e2828d98a7fc80e0", + "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-windows.jar", + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-windows.jar" + } + }, + "artifact": { + "size": 22, + "sha1": "b04f3ee8f5e43fa3b162981b50bb72fe1acabb33", + "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209.jar", + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209.jar" + } + } + }, + { + "name": "org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-20140822", + "rules": [ + { + "action": "allow", + "os": { + "name": "osx" + } + } + ], + "downloads": { + "artifact": { + "size": 1045632, + "sha1": "7707204c9ffa5d91662de95f0a224e2f721b22af", + "path": "org/lwjgl/lwjgl/lwjgl/2.9.2-nightly-20140822/lwjgl-2.9.2-nightly-20140822.jar", + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl/2.9.2-nightly-20140822/lwjgl-2.9.2-nightly-20140822.jar" + } + } + }, + { + "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-20140822", + "rules": [ + { + "action": "allow", + "os": { + "name": "osx" + } + } + ], + "downloads": { + "artifact": { + "size": 173887, + "sha1": "f0e612c840a7639c1f77f68d72a28dae2f0c8490", + "path": "org/lwjgl/lwjgl/lwjgl_util/2.9.2-nightly-20140822/lwjgl_util-2.9.2-nightly-20140822.jar", + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl_util/2.9.2-nightly-20140822/lwjgl_util-2.9.2-nightly-20140822.jar" + } + } + }, + { + "extract": { + "exclude": [ + "META-INF/" + ] + }, + "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.2-nightly-20140822", + "natives": { + "linux": "natives-linux", + "osx": "natives-osx", + "windows": "natives-windows" + }, + "rules": [ + { + "action": "allow", + "os": { + "name": "osx" + } + } + ], + "downloads": { + "classifiers": { + "natives-linux": { + "size": 578539, + "sha1": "d898a33b5d0a6ef3fed3a4ead506566dce6720a5", + "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-linux.jar", + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-linux.jar" + }, + "natives-osx": { + "size": 468116, + "sha1": "79f5ce2fea02e77fe47a3c745219167a542121d7", + "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-osx.jar", + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-osx.jar" + }, + "natives-windows": { + "size": 613680, + "sha1": "78b2a55ce4dc29c6b3ec4df8ca165eba05f9b341", + "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-windows.jar", + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-windows.jar" + } + } + } + }, + { + "extract": { + "exclude": [ + "META-INF/" + ] + }, + "name": "net.java.jinput:jinput-platform:2.0.5", + "natives": { + "linux": "natives-linux", + "osx": "natives-osx", + "windows": "natives-windows" + }, + "downloads": { + "classifiers": { + "natives-linux": { + "size": 10362, + "sha1": "7ff832a6eb9ab6a767f1ade2b548092d0fa64795", + "path": "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux.jar", + "url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux.jar" + }, + "natives-osx": { + "size": 12186, + "sha1": "53f9c919f34d2ca9de8c51fc4e1e8282029a9232", + "path": "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-osx.jar", + "url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-osx.jar" + }, + "natives-windows": { + "size": 155179, + "sha1": "385ee093e01f587f30ee1c8a2ee7d408fd732e16", + "path": "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-windows.jar", + "url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-windows.jar" + } + } + } + } + ], + "logging": { + "client": { + "file": { + "id": "client-1.7.xml", + "sha1": "49e2e41bc339698bd8199e0da9398c926e68c95d", + "size": 467, + "url": "https://launchermeta.mojang.com/mc/log_configs/client-1.7.xml/49e2e41bc339698bd8199e0da9398c926e68c95d/client-1.7.xml" + }, + "argument": "-Dlog4j.configurationFile=${path}", + "type": "log4j2-xml" + } + }, + "mainClass": "net.minecraft.client.main.Main", + "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --versionType ${version_type}", + "minimumLauncherVersion": 18, + "releaseTime": "2016-06-08T13:06:18+00:00", + "time": "2016-06-20T15:31:06+00:00", + "type": "release" +} diff --git a/patches/minecraft/net/minecraft/block/Block.java.patch b/patches/minecraft/net/minecraft/block/Block.java.patch index 051c24dab..1212077fc 100644 --- a/patches/minecraft/net/minecraft/block/Block.java.patch +++ b/patches/minecraft/net/minecraft/block/Block.java.patch @@ -26,7 +26,7 @@ } public static IBlockState func_176220_d(int p_176220_0_) -@@ -286,7 +288,7 @@ +@@ -292,7 +294,7 @@ public boolean func_176200_f(IBlockAccess p_176200_1_, BlockPos p_176200_2_) { @@ -35,7 +35,7 @@ } public Block func_149711_c(float p_149711_1_) -@@ -324,9 +326,10 @@ +@@ -330,9 +332,10 @@ return this.field_149789_z; } @@ -47,7 +47,7 @@ } @Deprecated -@@ -370,13 +373,13 @@ +@@ -376,13 +379,13 @@ @SideOnly(Side.CLIENT) public int func_185484_c(IBlockState p_185484_1_, IBlockAccess p_185484_2_, BlockPos p_185484_3_) { @@ -63,7 +63,7 @@ } else { -@@ -440,7 +443,7 @@ +@@ -446,7 +449,7 @@ } } @@ -72,7 +72,7 @@ } @Deprecated -@@ -500,6 +503,10 @@ +@@ -506,6 +509,10 @@ public void func_180663_b(World p_180663_1_, BlockPos p_180663_2_, IBlockState p_180663_3_) { @@ -83,7 +83,7 @@ } public int func_149745_a(Random p_149745_1_) -@@ -516,8 +523,7 @@ +@@ -522,8 +529,7 @@ @Deprecated public float func_180647_a(IBlockState p_180647_1_, EntityPlayer p_180647_2_, World p_180647_3_, BlockPos p_180647_4_) { @@ -93,7 +93,7 @@ } public final void func_176226_b(World p_176226_1_, BlockPos p_176226_2_, IBlockState p_176226_3_, int p_176226_4_) -@@ -527,20 +533,16 @@ +@@ -533,20 +539,16 @@ public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_) { @@ -119,7 +119,7 @@ } } } -@@ -548,8 +550,13 @@ +@@ -554,8 +556,13 @@ public static void func_180635_a(World p_180635_0_, BlockPos p_180635_1_, ItemStack p_180635_2_) { @@ -132,9 +132,9 @@ + return; + } float f = 0.5F; - double d0 = (double)(p_180635_0_.field_73012_v.nextFloat() * f) + (double)(1.0F - f) * 0.5D; - double d1 = (double)(p_180635_0_.field_73012_v.nextFloat() * f) + (double)(1.0F - f) * 0.5D; -@@ -621,7 +628,7 @@ + double d0 = (double)(p_180635_0_.field_73012_v.nextFloat() * 0.5F) + 0.25D; + double d1 = (double)(p_180635_0_.field_73012_v.nextFloat() * 0.5F) + 0.25D; +@@ -627,7 +634,7 @@ public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_) { @@ -143,7 +143,7 @@ } public boolean func_180639_a(World p_180639_1_, BlockPos p_180639_2_, IBlockState p_180639_3_, EntityPlayer p_180639_4_, EnumHand p_180639_5_, @Nullable ItemStack p_180639_6_, EnumFacing p_180639_7_, float p_180639_8_, float p_180639_9_, float p_180639_10_) -@@ -674,25 +681,35 @@ +@@ -680,25 +687,35 @@ p_180657_2_.func_71029_a(StatList.func_188055_a(this)); p_180657_2_.func_71020_j(0.025F); @@ -182,7 +182,7 @@ } @Nullable -@@ -788,9 +805,11 @@ +@@ -794,9 +811,11 @@ } @Nullable @@ -195,7 +195,7 @@ } @SideOnly(Side.CLIENT) -@@ -887,6 +906,1141 @@ +@@ -893,6 +912,1141 @@ return "Block{" + field_149771_c.func_177774_c(this) + "}"; } diff --git a/patches/minecraft/net/minecraft/block/BlockDoublePlant.java.patch b/patches/minecraft/net/minecraft/block/BlockDoublePlant.java.patch index d9174d467..ff7053ba2 100644 --- a/patches/minecraft/net/minecraft/block/BlockDoublePlant.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockDoublePlant.java.patch @@ -45,7 +45,7 @@ { super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_, p_180657_6_); } -@@ -214,8 +211,6 @@ +@@ -211,8 +208,6 @@ else { p_176489_4_.func_71029_a(StatList.func_188055_a(this)); @@ -54,7 +54,7 @@ return true; } } -@@ -286,6 +281,33 @@ +@@ -283,6 +278,33 @@ return Block.EnumOffsetType.XZ; } diff --git a/patches/minecraft/net/minecraft/block/BlockFalling.java.patch b/patches/minecraft/net/minecraft/block/BlockFalling.java.patch index 6d9cfd9f4..d4ae54f68 100644 --- a/patches/minecraft/net/minecraft/block/BlockFalling.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockFalling.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/block/BlockFalling.java +++ ../src-work/minecraft/net/minecraft/block/BlockFalling.java -@@ -44,7 +44,7 @@ +@@ -47,7 +47,7 @@ private void func_176503_e(World p_176503_1_, BlockPos p_176503_2_) { @@ -9,7 +9,7 @@ { int i = 32; -@@ -62,7 +62,7 @@ +@@ -65,7 +65,7 @@ p_176503_1_.func_175698_g(p_176503_2_); BlockPos blockpos; diff --git a/patches/minecraft/net/minecraft/block/BlockLeaves.java.patch b/patches/minecraft/net/minecraft/block/BlockLeaves.java.patch index be6d95bd8..37bb7d5e0 100644 --- a/patches/minecraft/net/minecraft/block/BlockLeaves.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockLeaves.java.patch @@ -31,7 +31,7 @@ - if (iblockstate.func_185904_a() == Material.field_151584_j) + if (block.isLeaves(iblockstate, p_180650_1_, blockpos$mutableblockpos.func_181079_c(k + i2, l + j2, i1 + k2))) { - this.field_150128_a[(i2 + l1) * k1 + (j2 + l1) * j1 + k2 + l1] = -2; + this.field_150128_a[(i2 + 16) * 1024 + (j2 + 16) * 32 + k2 + 16] = -2; } @@ -207,40 +207,7 @@ diff --git a/patches/minecraft/net/minecraft/block/BlockNote.java.patch b/patches/minecraft/net/minecraft/block/BlockNote.java.patch index a40bace0f..658b677d2 100644 --- a/patches/minecraft/net/minecraft/block/BlockNote.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockNote.java.patch @@ -19,5 +19,5 @@ + p_189539_4_ = e.getInstrument().ordinal(); + p_189539_5_ = e.getVanillaNoteId(); float f = (float)Math.pow(2.0D, (double)(p_189539_5_ - 12) / 12.0D); - p_189539_2_.func_184133_a((EntityPlayer)null, p_189539_3_, this.func_185576_e(p_189539_4_), SoundCategory.BLOCKS, 3.0F, f); + p_189539_2_.func_184133_a((EntityPlayer)null, p_189539_3_, this.func_185576_e(p_189539_4_), SoundCategory.RECORDS, 3.0F, f); p_189539_2_.func_175688_a(EnumParticleTypes.NOTE, (double)p_189539_3_.func_177958_n() + 0.5D, (double)p_189539_3_.func_177956_o() + 1.2D, (double)p_189539_3_.func_177952_p() + 0.5D, (double)p_189539_5_ / 24.0D, 0.0D, 0.0D, new int[0]); diff --git a/patches/minecraft/net/minecraft/block/BlockPumpkin.java.patch b/patches/minecraft/net/minecraft/block/BlockPumpkin.java.patch index 6629230b8..3b0aad014 100644 --- a/patches/minecraft/net/minecraft/block/BlockPumpkin.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockPumpkin.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/block/BlockPumpkin.java +++ ../src-work/minecraft/net/minecraft/block/BlockPumpkin.java -@@ -118,7 +118,7 @@ +@@ -124,7 +124,7 @@ public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_) { diff --git a/patches/minecraft/net/minecraft/block/BlockQuartz.java.patch b/patches/minecraft/net/minecraft/block/BlockQuartz.java.patch index 5bc96aff1..dbf07920f 100644 --- a/patches/minecraft/net/minecraft/block/BlockQuartz.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockQuartz.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/block/BlockQuartz.java +++ ../src-work/minecraft/net/minecraft/block/BlockQuartz.java -@@ -113,6 +113,26 @@ +@@ -110,6 +110,26 @@ return new BlockStateContainer(this, new IProperty[] {field_176335_a}); } diff --git a/patches/minecraft/net/minecraft/block/BlockRailBase.java.patch b/patches/minecraft/net/minecraft/block/BlockRailBase.java.patch index b2890fbf4..5a6027d12 100644 --- a/patches/minecraft/net/minecraft/block/BlockRailBase.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockRailBase.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/block/BlockRailBase.java +++ ../src-work/minecraft/net/minecraft/block/BlockRailBase.java -@@ -33,7 +33,7 @@ +@@ -32,7 +32,7 @@ public static boolean func_176563_d(IBlockState p_176563_0_) { Block block = p_176563_0_.func_177230_c(); @@ -9,7 +9,7 @@ } protected BlockRailBase(boolean p_i45389_1_) -@@ -67,7 +67,7 @@ +@@ -66,7 +66,7 @@ public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_) { @@ -18,7 +18,7 @@ } public void func_176213_c(World p_176213_1_, BlockPos p_176213_2_, IBlockState p_176213_3_) -@@ -90,24 +90,24 @@ +@@ -89,24 +89,24 @@ BlockRailBase.EnumRailDirection blockrailbase$enumraildirection = (BlockRailBase.EnumRailDirection)p_189540_1_.func_177229_b(this.func_176560_l()); boolean flag = false; @@ -48,7 +48,7 @@ { flag = true; } -@@ -162,6 +162,98 @@ +@@ -161,6 +161,98 @@ public abstract IProperty func_176560_l(); @@ -147,7 +147,7 @@ public static enum EnumRailDirection implements IStringSerializable { NORTH_SOUTH(0, "north_south"), -@@ -232,6 +324,7 @@ +@@ -231,6 +323,7 @@ private IBlockState field_180366_e; private final boolean field_150656_f; private final List field_150657_g = Lists.newArrayList(); @@ -155,7 +155,7 @@ public Rail(World p_i45739_2_, BlockPos p_i45739_3_, IBlockState p_i45739_4_) { -@@ -239,8 +332,9 @@ +@@ -238,8 +331,9 @@ this.field_180367_c = p_i45739_3_; this.field_180366_e = p_i45739_4_; this.field_180365_d = (BlockRailBase)p_i45739_4_.func_177230_c(); @@ -167,7 +167,7 @@ this.func_180360_a(blockrailbase$enumraildirection); } -@@ -432,7 +526,7 @@ +@@ -431,7 +525,7 @@ } } @@ -176,7 +176,7 @@ { if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos.func_177984_a())) { -@@ -445,7 +539,7 @@ +@@ -444,7 +538,7 @@ } } @@ -185,7 +185,7 @@ { if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos3.func_177984_a())) { -@@ -588,7 +682,7 @@ +@@ -587,7 +681,7 @@ } } @@ -194,7 +194,7 @@ { if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos.func_177984_a())) { -@@ -601,7 +695,7 @@ +@@ -600,7 +694,7 @@ } } diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneComparator.java.patch b/patches/minecraft/net/minecraft/block/BlockRedstoneComparator.java.patch index b1f640862..d0dc16fc5 100644 --- a/patches/minecraft/net/minecraft/block/BlockRedstoneComparator.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockRedstoneComparator.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/block/BlockRedstoneComparator.java +++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneComparator.java -@@ -313,6 +313,21 @@ +@@ -312,6 +312,21 @@ return this.func_176223_P().func_177226_a(field_185512_D, p_180642_8_.func_174811_aO().func_176734_d()).func_177226_a(field_176464_a, Boolean.valueOf(false)).func_177226_a(field_176463_b, BlockRedstoneComparator.Mode.COMPARE); } diff --git a/patches/minecraft/net/minecraft/block/BlockSkull.java.patch b/patches/minecraft/net/minecraft/block/BlockSkull.java.patch index 23c306757..a8e559768 100644 --- a/patches/minecraft/net/minecraft/block/BlockSkull.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockSkull.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/block/BlockSkull.java +++ ../src-work/minecraft/net/minecraft/block/BlockSkull.java -@@ -117,10 +117,6 @@ +@@ -118,10 +118,6 @@ return new ItemStack(Items.field_151144_bL, 1, i); } @@ -11,7 +11,7 @@ public void func_176208_a(World p_176208_1_, BlockPos p_176208_2_, IBlockState p_176208_3_, EntityPlayer p_176208_4_) { if (p_176208_4_.field_71075_bZ.field_75098_d) -@@ -128,13 +124,18 @@ +@@ -129,13 +125,18 @@ p_176208_3_ = p_176208_3_.func_177226_a(field_176417_b, Boolean.valueOf(true)); p_176208_1_.func_180501_a(p_176208_2_, p_176208_3_, 4); } @@ -31,7 +31,7 @@ { if (!((Boolean)p_180663_3_.func_177229_b(field_176417_b)).booleanValue()) { -@@ -143,7 +144,7 @@ +@@ -144,7 +145,7 @@ if (tileentity instanceof TileEntitySkull) { TileEntitySkull tileentityskull = (TileEntitySkull)tileentity; @@ -40,7 +40,7 @@ if (tileentityskull.func_145904_a() == 3 && tileentityskull.func_152108_a() != null) { -@@ -153,12 +154,11 @@ +@@ -154,12 +155,11 @@ itemstack.func_77978_p().func_74782_a("SkullOwner", nbttagcompound); } diff --git a/patches/minecraft/net/minecraft/block/BlockTrapDoor.java.patch b/patches/minecraft/net/minecraft/block/BlockTrapDoor.java.patch index b3ef4e159..462017af8 100644 --- a/patches/minecraft/net/minecraft/block/BlockTrapDoor.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockTrapDoor.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/block/BlockTrapDoor.java +++ ../src-work/minecraft/net/minecraft/block/BlockTrapDoor.java -@@ -242,6 +242,18 @@ +@@ -240,6 +240,18 @@ return new BlockStateContainer(this, new IProperty[] {field_176284_a, field_176283_b, field_176285_M}); } diff --git a/patches/minecraft/net/minecraft/block/state/BlockStateContainer.java.patch b/patches/minecraft/net/minecraft/block/state/BlockStateContainer.java.patch index 5453b968e..1188777ff 100644 --- a/patches/minecraft/net/minecraft/block/state/BlockStateContainer.java.patch +++ b/patches/minecraft/net/minecraft/block/state/BlockStateContainer.java.patch @@ -35,7 +35,7 @@ map2.put(map1, blockstatecontainer$stateimplementation); list1.add(blockstatecontainer$stateimplementation); } -@@ -166,6 +176,13 @@ +@@ -165,6 +175,13 @@ this.field_177237_b = p_i45660_2_; } @@ -49,7 +49,7 @@ public Collection < IProperty> func_177227_a() { return Collections. < IProperty> unmodifiableCollection(this.field_177237_b.keySet()); -@@ -441,5 +458,86 @@ +@@ -445,5 +462,86 @@ { this.field_177239_a.func_189540_a(this, p_189546_1_, p_189546_2_, p_189546_3_); } diff --git a/patches/minecraft/net/minecraft/block/state/IBlockProperties.java.patch b/patches/minecraft/net/minecraft/block/state/IBlockProperties.java.patch index 584b15fc6..917c74d42 100644 --- a/patches/minecraft/net/minecraft/block/state/IBlockProperties.java.patch +++ b/patches/minecraft/net/minecraft/block/state/IBlockProperties.java.patch @@ -1,8 +1,8 @@ --- ../src-base/minecraft/net/minecraft/block/state/IBlockProperties.java +++ ../src-work/minecraft/net/minecraft/block/state/IBlockProperties.java -@@ -26,9 +26,13 @@ +@@ -28,9 +28,13 @@ - boolean func_185913_b(); + boolean func_189884_a(Entity p_189884_1_); + @Deprecated //Forge location aware version below int func_185891_c(); @@ -14,7 +14,7 @@ @SideOnly(Side.CLIENT) boolean func_185895_e(); -@@ -90,5 +94,10 @@ +@@ -92,5 +96,10 @@ RayTraceResult func_185910_a(World p_185910_1_, BlockPos p_185910_2_, Vec3d p_185910_3_, Vec3d p_185910_4_); diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch index 4fd4b012f..274d1e559 100644 --- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -1,14 +1,14 @@ --- ../src-base/minecraft/net/minecraft/client/Minecraft.java +++ ../src-work/minecraft/net/minecraft/client/Minecraft.java -@@ -321,7 +321,6 @@ +@@ -322,7 +322,6 @@ this.field_152355_az = (new YggdrasilAuthenticationService(this.field_110453_aa, UUID.randomUUID().toString())).createMinecraftSessionService(); this.field_71449_j = p_i45547_1_.field_178745_a.field_178752_a; - field_147123_G.info("Setting user: " + this.field_71449_j.func_111285_a()); -- field_147123_G.debug("(Session ID is " + this.field_71449_j.func_111286_b() + ")"); + field_147123_G.info("Setting user: {}", new Object[] {this.field_71449_j.func_111285_a()}); +- field_147123_G.debug("(Session ID is {})", new Object[] {this.field_71449_j.func_111286_b()}); this.field_71459_aj = p_i45547_1_.field_178741_d.field_178756_a; this.field_71443_c = p_i45547_1_.field_178743_b.field_178764_a > 0 ? p_i45547_1_.field_178743_b.field_178764_a : 1; this.field_71440_d = p_i45547_1_.field_178743_b.field_178762_b > 0 ? p_i45547_1_.field_178743_b.field_178762_b : 1; -@@ -435,10 +434,10 @@ +@@ -437,10 +436,10 @@ this.field_110451_am = new SimpleReloadableResourceManager(this.field_110452_an); this.field_135017_as = new LanguageManager(this.field_110452_an, this.field_71474_y.field_74363_ab); this.field_110451_am.func_110542_a(this.field_135017_as); @@ -21,7 +21,7 @@ this.field_152350_aA = new SkinManager(this.field_71446_o, new File(this.field_110446_Y, "skins"), this.field_152355_az); this.field_71469_aa = new AnvilSaveConverter(new File(this.field_71412_D, "saves"), this.field_184131_U); this.field_147127_av = new SoundHandler(this.field_110451_am, this.field_71474_y); -@@ -463,7 +462,7 @@ +@@ -465,7 +464,7 @@ { try { @@ -30,7 +30,7 @@ } catch (Exception exception) { -@@ -472,6 +471,8 @@ +@@ -474,6 +473,8 @@ } }); this.field_71417_B = new MouseHelper(); @@ -39,7 +39,7 @@ this.func_71361_d("Pre startup"); GlStateManager.func_179098_w(); GlStateManager.func_179103_j(7425); -@@ -485,19 +486,24 @@ +@@ -487,19 +488,24 @@ GlStateManager.func_179096_D(); GlStateManager.func_179128_n(5888); this.func_71361_d("Startup"); @@ -65,7 +65,7 @@ this.field_71460_t = new EntityRenderer(this, this.field_110451_am); this.field_110451_am.func_110542_a(this.field_71460_t); this.field_175618_aM = new BlockRendererDispatcher(this.field_175617_aL.func_174954_c(), this.field_184127_aH); -@@ -507,23 +513,27 @@ +@@ -509,23 +515,27 @@ this.field_71458_u = new GuiAchievement(this); GlStateManager.func_179083_b(0, 0, this.field_71443_c, this.field_71440_d); this.field_71452_i = new ParticleManager(this.field_71441_e, this.field_71446_o); @@ -96,7 +96,7 @@ if (this.field_71474_y.field_74353_u && !this.field_71431_Q) { this.func_71352_k(); -@@ -695,21 +705,23 @@ +@@ -697,21 +707,23 @@ File file2 = new File(file1, "crash-" + (new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss")).format(new Date()) + "-client.txt"); Bootstrap.func_179870_a(p_71377_1_.func_71502_e()); @@ -123,7 +123,7 @@ } public boolean func_152349_b() -@@ -902,11 +914,6 @@ +@@ -904,11 +916,6 @@ public void func_147108_a(@Nullable GuiScreen p_147108_1_) { @@ -135,7 +135,7 @@ if (p_147108_1_ == null && this.field_71441_e == null) { p_147108_1_ = new GuiMainMenu(); -@@ -916,6 +923,17 @@ +@@ -918,6 +925,17 @@ p_147108_1_ = new GuiGameOver((ITextComponent)null); } @@ -153,7 +153,7 @@ if (p_147108_1_ instanceof GuiMainMenu || p_147108_1_ instanceof GuiMultiplayer) { this.field_71474_y.field_74330_P = false; -@@ -1054,9 +1072,11 @@ +@@ -1053,9 +1071,11 @@ if (!this.field_71454_w) { @@ -165,7 +165,7 @@ } this.field_71424_I.func_76319_b(); -@@ -1396,9 +1416,9 @@ +@@ -1398,9 +1418,9 @@ { BlockPos blockpos = this.field_71476_x.func_178782_a(); @@ -177,7 +177,7 @@ this.field_71439_g.func_184609_a(EnumHand.MAIN_HAND); } } -@@ -1432,7 +1452,7 @@ +@@ -1434,7 +1454,7 @@ case BLOCK: BlockPos blockpos = this.field_71476_x.func_178782_a(); @@ -186,7 +186,7 @@ { this.field_71442_b.func_180511_b(blockpos, this.field_71476_x.field_178784_b); break; -@@ -1447,6 +1467,7 @@ +@@ -1448,6 +1468,7 @@ } this.field_71439_g.func_184821_cY(); @@ -194,7 +194,7 @@ } this.field_71439_g.func_184609_a(EnumHand.MAIN_HAND); -@@ -1476,7 +1497,6 @@ +@@ -1477,7 +1498,6 @@ switch (this.field_71476_x.field_72313_a) { case ENTITY: @@ -202,7 +202,7 @@ if (this.field_71442_b.func_187102_a(this.field_71439_g, this.field_71476_x.field_72308_g, this.field_71476_x, this.field_71439_g.func_184586_b(enumhand), enumhand) == EnumActionResult.SUCCESS) { return; -@@ -1519,7 +1539,7 @@ +@@ -1520,7 +1540,7 @@ } ItemStack itemstack1 = this.field_71439_g.func_184586_b(enumhand); @@ -211,7 +211,7 @@ if (itemstack1 != null && this.field_71442_b.func_187101_a(this.field_71439_g, this.field_71441_e, itemstack1, enumhand) == EnumActionResult.SUCCESS) { this.field_71460_t.field_78516_c.func_187460_a(enumhand); -@@ -1626,6 +1646,8 @@ +@@ -1627,6 +1647,8 @@ --this.field_71467_ac; } @@ -220,7 +220,7 @@ this.field_71424_I.func_76320_a("gui"); if (!this.field_71445_n) -@@ -1737,6 +1759,7 @@ +@@ -1738,6 +1760,7 @@ this.field_71457_ai = 0; this.field_71441_e.func_72897_h(this.field_71439_g); } @@ -228,7 +228,7 @@ } this.field_71424_I.func_76318_c("gameRenderer"); -@@ -1824,6 +1847,7 @@ +@@ -1825,6 +1848,7 @@ this.field_71453_ak.func_74428_b(); } @@ -236,7 +236,7 @@ this.field_71424_I.func_76319_b(); this.field_71423_H = func_71386_F(); } -@@ -1930,6 +1954,7 @@ +@@ -1931,6 +1955,7 @@ } } } @@ -244,7 +244,7 @@ } this.func_184117_aA(); -@@ -2169,6 +2194,8 @@ +@@ -2177,6 +2202,8 @@ { while (Mouse.next()) { @@ -253,7 +253,7 @@ int i = Mouse.getEventButton(); KeyBinding.func_74510_a(i - 100, Mouse.getEventButtonState()); -@@ -2234,6 +2261,7 @@ +@@ -2242,6 +2269,7 @@ public void func_71371_a(String p_71371_1_, String p_71371_2_, @Nullable WorldSettings p_71371_3_) { @@ -261,7 +261,7 @@ this.func_71403_a((WorldClient)null); System.gc(); ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false); -@@ -2276,6 +2304,12 @@ +@@ -2284,6 +2312,12 @@ while (!this.field_71437_Z.func_71200_ad()) { @@ -274,13 +274,13 @@ String s = this.field_71437_Z.func_71195_b_(); if (s != null) -@@ -2301,8 +2335,14 @@ +@@ -2309,8 +2343,14 @@ SocketAddress socketaddress = this.field_71437_Z.func_147137_ag().func_151270_a(); NetworkManager networkmanager = NetworkManager.func_150722_a(socketaddress); networkmanager.func_150719_a(new NetHandlerLoginClient(networkmanager, this, (GuiScreen)null)); -- networkmanager.func_179290_a(new C00Handshake(110, socketaddress.toString(), 0, EnumConnectionState.LOGIN)); +- networkmanager.func_179290_a(new C00Handshake(210, socketaddress.toString(), 0, EnumConnectionState.LOGIN)); - networkmanager.func_179290_a(new CPacketLoginStart(this.func_110432_I().func_148256_e())); -+ networkmanager.func_179290_a(new C00Handshake(110, socketaddress.toString(), 0, EnumConnectionState.LOGIN, true)); ++ networkmanager.func_179290_a(new C00Handshake(210, socketaddress.toString(), 0, EnumConnectionState.LOGIN, true)); + com.mojang.authlib.GameProfile gameProfile = this.func_110432_I().func_148256_e(); + if (!this.func_110432_I().hasCachedProperties()) + { @@ -291,7 +291,7 @@ this.field_71453_ak = networkmanager; } -@@ -2313,6 +2353,8 @@ +@@ -2321,6 +2361,8 @@ public void func_71353_a(@Nullable WorldClient p_71353_1_, String p_71353_2_) { @@ -300,7 +300,7 @@ if (p_71353_1_ == null) { NetHandlerPlayClient nethandlerplayclient = this.func_147114_u(); -@@ -2325,6 +2367,18 @@ +@@ -2333,6 +2375,18 @@ if (this.field_71437_Z != null && this.field_71437_Z.func_175578_N()) { this.field_71437_Z.func_71263_m(); @@ -319,7 +319,7 @@ } this.field_71437_Z = null; -@@ -2348,6 +2402,7 @@ +@@ -2356,6 +2410,7 @@ this.field_71456_v.func_181029_i(); this.func_71351_a((ServerData)null); this.field_71455_al = false; @@ -327,7 +327,7 @@ } this.field_147127_av.func_147690_c(); -@@ -2464,159 +2519,8 @@ +@@ -2473,159 +2528,8 @@ { if (this.field_71476_x != null && this.field_71476_x.field_72313_a != RayTraceResult.Type.MISS) { @@ -489,7 +489,7 @@ } } -@@ -2912,18 +2816,8 @@ +@@ -2927,18 +2831,8 @@ public static int func_71369_N() { @@ -510,7 +510,7 @@ } public boolean func_70002_Q() -@@ -3060,15 +2954,16 @@ +@@ -3077,15 +2971,16 @@ { if (Keyboard.getEventKeyState()) { @@ -529,14 +529,16 @@ } } } -@@ -3195,4 +3090,10 @@ - { +@@ -3205,6 +3100,12 @@ return this.field_184127_aH; } -+ + + // FORGE + public ItemColors getItemColors() + { + return this.field_184128_aI; + } - } ++ + public boolean func_189648_am() + { + return this.field_71439_g != null && this.field_71439_g.func_175140_cp() || this.field_71474_y.field_178879_v; diff --git a/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch b/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch index c2af00bca..c94b8cbcb 100644 --- a/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch +++ b/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/client/entity/EntityPlayerSP.java +++ ../src-work/minecraft/net/minecraft/client/entity/EntityPlayerSP.java -@@ -404,6 +404,15 @@ +@@ -415,6 +415,15 @@ this.field_71159_c.field_71456_v.func_146158_b().func_146227_a(p_146105_1_); } @@ -16,7 +16,7 @@ protected boolean func_145771_j(double p_145771_1_, double p_145771_3_, double p_145771_5_) { if (this.field_70145_X) -@@ -416,30 +425,34 @@ +@@ -427,30 +436,34 @@ double d0 = p_145771_1_ - (double)blockpos.func_177958_n(); double d1 = p_145771_5_ - (double)blockpos.func_177952_p(); @@ -56,7 +56,7 @@ { d2 = 1.0D - d1; i = 5; -@@ -474,7 +487,7 @@ +@@ -485,7 +498,7 @@ private boolean func_175162_d(BlockPos p_175162_1_) { @@ -65,7 +65,7 @@ } public void func_70031_b(boolean p_70031_1_) -@@ -519,7 +532,13 @@ +@@ -530,7 +543,13 @@ public void func_184185_a(SoundEvent p_184185_1_, float p_184185_2_, float p_184185_3_) { diff --git a/patches/minecraft/net/minecraft/client/gui/GuiControls.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiControls.java.patch index 5a9cdd75b..615cc2df8 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiControls.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/GuiControls.java.patch @@ -46,5 +46,5 @@ - if (keybinding.func_151463_i() != keybinding.func_151469_h()) + if (!keybinding.isSetToDefaultValue()) { - flag = false; + flag = true; break; diff --git a/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch index 5261e6fa9..8299dd441 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch @@ -1,15 +1,15 @@ --- ../src-base/minecraft/net/minecraft/client/gui/GuiCreateWorld.java +++ ../src-work/minecraft/net/minecraft/client/gui/GuiCreateWorld.java -@@ -205,6 +205,8 @@ +@@ -206,6 +206,8 @@ } } + WorldType.field_77139_a[this.field_146331_K].onGUICreateWorldPress(); + - WorldSettings worldsettings = new WorldSettings(i, WorldSettings.GameType.func_77142_a(this.field_146342_r), this.field_146341_s, this.field_146337_w, WorldType.field_77139_a[this.field_146331_K]); + WorldSettings worldsettings = new WorldSettings(i, GameType.func_77142_a(this.field_146342_r), this.field_146341_s, this.field_146337_w, WorldType.field_77139_a[this.field_146331_K]); worldsettings.func_82750_a(this.field_146334_a); -@@ -311,14 +313,7 @@ +@@ -312,14 +314,7 @@ } else if (p_146284_1_.field_146127_k == 8) { @@ -25,7 +25,7 @@ } } } -@@ -370,7 +365,7 @@ +@@ -371,7 +366,7 @@ this.field_146326_C.field_146125_m = this.field_146344_y; this.field_146320_D.field_146125_m = this.field_146344_y; this.field_146321_E.field_146125_m = this.field_146344_y; diff --git a/patches/minecraft/net/minecraft/client/gui/GuiIngame.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiIngame.java.patch index 29c9752ad..9d96734bc 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiIngame.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/GuiIngame.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/client/gui/GuiIngame.java +++ ../src-work/minecraft/net/minecraft/client/gui/GuiIngame.java -@@ -361,7 +361,8 @@ +@@ -360,7 +360,8 @@ BlockPos blockpos = raytraceresult.func_178782_a(); @@ -10,7 +10,7 @@ { return; } -@@ -419,7 +420,10 @@ +@@ -418,7 +419,10 @@ { Potion potion = potioneffect.func_188419_a(); @@ -22,7 +22,7 @@ { int k = p_184048_1_.func_78326_a(); int l = 1; -@@ -456,7 +460,10 @@ +@@ -455,7 +459,10 @@ } GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, f); diff --git a/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch index 492f39e3e..0334dae3d 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch @@ -1,17 +1,16 @@ --- ../src-base/minecraft/net/minecraft/client/gui/GuiIngameMenu.java +++ ../src-work/minecraft/net/minecraft/client/gui/GuiIngameMenu.java -@@ -30,8 +30,9 @@ +@@ -30,7 +30,8 @@ - this.field_146292_n.add(new GuiButton(4, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 24 + i, I18n.func_135052_a("menu.returnToGame", new Object[0]))); - this.field_146292_n.add(new GuiButton(0, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 96 + i, 98, 20, I18n.func_135052_a("menu.options", new Object[0]))); + this.field_146292_n.add(new GuiButton(4, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 24 + -16, I18n.func_135052_a("menu.returnToGame", new Object[0]))); + this.field_146292_n.add(new GuiButton(0, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 96 + -16, 98, 20, I18n.func_135052_a("menu.options", new Object[0]))); +- GuiButton guibutton = this.func_189646_b(new GuiButton(7, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 96 + -16, 98, 20, I18n.func_135052_a("menu.shareToLan", new Object[0]))); + this.field_146292_n.add(new GuiButton(12, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 96 + i, 98, 20, I18n.func_135052_a("fml.menu.modoptions"))); - GuiButton guibutton; -- this.field_146292_n.add(guibutton = new GuiButton(7, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 96 + i, 98, 20, I18n.func_135052_a("menu.shareToLan", new Object[0]))); -+ this.field_146292_n.add(guibutton = new GuiButton(7, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 72 + i, 200, 20, I18n.func_135052_a("menu.shareToLan", new Object[0]))); - this.field_146292_n.add(new GuiButton(5, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 48 + i, 98, 20, I18n.func_135052_a("gui.achievements", new Object[0]))); - this.field_146292_n.add(new GuiButton(6, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 48 + i, 98, 20, I18n.func_135052_a("gui.stats", new Object[0]))); ++ GuiButton guibutton = this.func_189646_b(new GuiButton(7, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 72 + -16, 200, 20, I18n.func_135052_a("menu.shareToLan", new Object[0]))); guibutton.field_146124_l = this.field_146297_k.func_71356_B() && !this.field_146297_k.func_71401_C().func_71344_c(); -@@ -74,13 +75,19 @@ + this.field_146292_n.add(new GuiButton(5, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 48 + -16, 98, 20, I18n.func_135052_a("gui.achievements", new Object[0]))); + this.field_146292_n.add(new GuiButton(6, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 48 + -16, 98, 20, I18n.func_135052_a("gui.stats", new Object[0]))); +@@ -73,13 +74,19 @@ this.field_146297_k.func_71381_h(); break; case 5: diff --git a/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch index 22dec2e57..39fd2bd9c 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch @@ -9,7 +9,7 @@ public GuiMainMenu() { -@@ -210,13 +212,15 @@ +@@ -209,13 +211,15 @@ this.field_183503_M.func_183500_a(this.field_146294_l, this.field_146295_m); this.field_183503_M.func_73866_w_(); } @@ -20,13 +20,13 @@ { this.field_146292_n.add(new GuiButton(1, this.field_146294_l / 2 - 100, p_73969_1_, I18n.func_135052_a("menu.singleplayer", new Object[0]))); this.field_146292_n.add(new GuiButton(2, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 1, I18n.func_135052_a("menu.multiplayer", new Object[0]))); -- this.field_146292_n.add(this.field_175372_K = new GuiButton(14, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.func_135052_a("menu.online", new Object[0]))); -+ this.field_146292_n.add(this.field_175372_K = new GuiButton(14, this.field_146294_l / 2 + 2, p_73969_1_ + p_73969_2_ * 2, 98, 20, I18n.func_135052_a("menu.online", new Object[0]).replace("Minecraft", "").trim())); +- this.field_175372_K = this.func_189646_b(new GuiButton(14, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.func_135052_a("menu.online", new Object[0]))); ++ this.field_175372_K = this.func_189646_b(new GuiButton(14, this.field_146294_l / 2 + 2, p_73969_1_ + p_73969_2_ * 2, 98, 20, I18n.func_135052_a("menu.online", new Object[0]))); + this.field_146292_n.add(modButton = new GuiButton(6, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, 98, 20, I18n.func_135052_a("fml.menu.mods"))); } private void func_73972_b(int p_73972_1_, int p_73972_2_) -@@ -264,6 +268,11 @@ +@@ -263,6 +267,11 @@ this.field_146297_k.func_71400_g(); } @@ -38,8 +38,8 @@ if (p_146284_1_.field_146127_k == 11) { this.field_146297_k.func_71371_a("Demo_World", "Demo_World", DemoWorldServer.field_73071_a); -@@ -493,6 +502,8 @@ - this.func_73729_b(j + 155, k + 0, 0, 45, 155, 44); +@@ -490,6 +499,8 @@ + this.func_73729_b(j + 155, 30, 0, 45, 155, 44); } + this.field_73975_c = net.minecraftforge.client.ForgeHooksClient.renderMainMenu(this, this.field_146289_q, this.field_146294_l, this.field_146295_m, this.field_73975_c); @@ -47,7 +47,7 @@ GlStateManager.func_179094_E(); GlStateManager.func_179109_b((float)(this.field_146294_l / 2 + 90), 70.0F, 0.0F); GlStateManager.func_179114_b(-20.0F, 0.0F, 0.0F, 1.0F); -@@ -512,7 +523,15 @@ +@@ -509,7 +520,15 @@ s = s + ("release".equalsIgnoreCase(this.field_146297_k.func_184123_d()) ? "" : "/" + this.field_146297_k.func_184123_d()); } @@ -62,9 +62,9 @@ + } + } String s1 = "Copyright Mojang AB. Do not distribute!"; - this.func_73731_b(this.field_146289_q, s1, this.field_146294_l - this.field_146289_q.func_78256_a(s1) - 2, this.field_146295_m - 10, -1); + this.func_73731_b(this.field_146289_q, "Copyright Mojang AB. Do not distribute!", this.field_146294_l - this.field_146289_q.func_78256_a("Copyright Mojang AB. Do not distribute!") - 2, this.field_146295_m - 10, -1); -@@ -529,6 +548,7 @@ +@@ -526,6 +545,7 @@ { this.field_183503_M.func_73863_a(p_73863_1_, p_73863_2_, p_73863_3_); } @@ -72,7 +72,7 @@ } protected void func_73864_a(int p_73864_1_, int p_73864_2_, int p_73864_3_) throws IOException -@@ -549,6 +569,8 @@ +@@ -546,6 +566,8 @@ { this.field_183503_M.func_73864_a(p_73864_1_, p_73864_2_, p_73864_3_); } diff --git a/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.java.patch index fadee0c78..761db19b7 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/client/gui/GuiMultiplayer.java +++ ../src-work/minecraft/net/minecraft/client/gui/GuiMultiplayer.java -@@ -40,6 +40,7 @@ +@@ -41,6 +41,7 @@ public GuiMultiplayer(GuiScreen p_i1040_1_) { this.field_146798_g = p_i1040_1_; @@ -8,7 +8,7 @@ } public void func_73866_w_() -@@ -372,7 +373,7 @@ +@@ -375,7 +376,7 @@ private void func_146791_a(ServerData p_146791_1_) { diff --git a/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch index ea495f49b..c95daa27c 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch @@ -1,12 +1,12 @@ --- ../src-base/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java +++ ../src-work/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java -@@ -193,6 +193,9 @@ +@@ -188,6 +188,9 @@ long l = j - k; List list = Lists.newArrayList(new String[] {String.format("Java: %s %dbit", new Object[]{System.getProperty("java.version"), Integer.valueOf(this.field_175242_a.func_147111_S() ? 64 : 32)}), String.format("Mem: % 2d%% %03d/%03dMB", new Object[]{Long.valueOf(l * 100L / i), Long.valueOf(func_175240_a(l)), Long.valueOf(func_175240_a(i))}), String.format("Allocated: % 2d%% %03dMB", new Object[]{Long.valueOf(j * 100L / i), Long.valueOf(func_175240_a(j))}), "", String.format("CPU: %s", new Object[]{OpenGlHelper.func_183029_j()}), "", String.format("Display: %dx%d (%s)", new Object[]{Integer.valueOf(Display.getWidth()), Integer.valueOf(Display.getHeight()), GlStateManager.func_187416_u(7936)}), GlStateManager.func_187416_u(7937), GlStateManager.func_187416_u(7938)}); + list.add(""); + list.addAll(net.minecraftforge.fml.common.FMLCommonHandler.instance().getBrandings(false)); + - if (this.func_175236_d()) + if (this.field_175242_a.func_189648_am()) { return list; diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreen.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiScreen.java.patch index 3110c8976..7f0473a5c 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiScreen.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/GuiScreen.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/client/gui/GuiScreen.java +++ ../src-work/minecraft/net/minecraft/client/gui/GuiScreen.java -@@ -141,7 +141,8 @@ +@@ -147,7 +147,8 @@ } } @@ -10,7 +10,7 @@ } protected void func_146279_a(String p_146279_1_, int p_146279_2_, int p_146279_3_) -@@ -151,7 +152,13 @@ +@@ -157,7 +158,13 @@ protected void func_146283_a(List p_146283_1_, int p_146283_2_, int p_146283_3_) { @@ -25,7 +25,7 @@ { GlStateManager.func_179101_C(); RenderHelper.func_74518_a(); -@@ -421,6 +428,7 @@ +@@ -427,6 +434,7 @@ { this.field_146297_k.field_71456_v.func_146158_b().func_146239_a(p_175281_1_); } @@ -33,7 +33,7 @@ this.field_146297_k.field_71439_g.func_71165_d(p_175281_1_); } -@@ -435,9 +443,15 @@ +@@ -441,9 +449,15 @@ if (guibutton.func_146116_c(this.field_146297_k, p_73864_1_, p_73864_2_)) { @@ -49,7 +49,7 @@ } } } -@@ -467,8 +481,12 @@ +@@ -473,8 +487,12 @@ this.field_146289_q = p_146280_1_.field_71466_p; this.field_146294_l = p_146280_2_; this.field_146295_m = p_146280_3_; @@ -62,7 +62,7 @@ } public void func_183500_a(int p_183500_1_, int p_183500_2_) -@@ -487,7 +505,9 @@ +@@ -493,7 +511,9 @@ { while (Mouse.next()) { @@ -72,7 +72,7 @@ } } -@@ -495,7 +515,9 @@ +@@ -501,7 +521,9 @@ { while (Keyboard.next()) { @@ -82,7 +82,7 @@ } } } -@@ -557,6 +579,7 @@ +@@ -563,6 +585,7 @@ public void func_146276_q_() { this.func_146270_b(0); diff --git a/patches/minecraft/net/minecraft/client/gui/GuiSlot.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiSlot.java.patch index fa8d3be0e..8304f70be 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiSlot.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/GuiSlot.java.patch @@ -8,10 +8,10 @@ - GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, 1.0F); - float f = 32.0F; - vertexbuffer.func_181668_a(7, DefaultVertexFormats.field_181709_i); -- vertexbuffer.func_181662_b((double)this.field_148152_e, (double)this.field_148154_c, 0.0D).func_187315_a((double)((float)this.field_148152_e / f), (double)((float)(this.field_148154_c + (int)this.field_148169_q) / f)).func_181669_b(32, 32, 32, 255).func_181675_d(); -- vertexbuffer.func_181662_b((double)this.field_148151_d, (double)this.field_148154_c, 0.0D).func_187315_a((double)((float)this.field_148151_d / f), (double)((float)(this.field_148154_c + (int)this.field_148169_q) / f)).func_181669_b(32, 32, 32, 255).func_181675_d(); -- vertexbuffer.func_181662_b((double)this.field_148151_d, (double)this.field_148153_b, 0.0D).func_187315_a((double)((float)this.field_148151_d / f), (double)((float)(this.field_148153_b + (int)this.field_148169_q) / f)).func_181669_b(32, 32, 32, 255).func_181675_d(); -- vertexbuffer.func_181662_b((double)this.field_148152_e, (double)this.field_148153_b, 0.0D).func_187315_a((double)((float)this.field_148152_e / f), (double)((float)(this.field_148153_b + (int)this.field_148169_q) / f)).func_181669_b(32, 32, 32, 255).func_181675_d(); +- vertexbuffer.func_181662_b((double)this.field_148152_e, (double)this.field_148154_c, 0.0D).func_187315_a((double)((float)this.field_148152_e / 32.0F), (double)((float)(this.field_148154_c + (int)this.field_148169_q) / 32.0F)).func_181669_b(32, 32, 32, 255).func_181675_d(); +- vertexbuffer.func_181662_b((double)this.field_148151_d, (double)this.field_148154_c, 0.0D).func_187315_a((double)((float)this.field_148151_d / 32.0F), (double)((float)(this.field_148154_c + (int)this.field_148169_q) / 32.0F)).func_181669_b(32, 32, 32, 255).func_181675_d(); +- vertexbuffer.func_181662_b((double)this.field_148151_d, (double)this.field_148153_b, 0.0D).func_187315_a((double)((float)this.field_148151_d / 32.0F), (double)((float)(this.field_148153_b + (int)this.field_148169_q) / 32.0F)).func_181669_b(32, 32, 32, 255).func_181675_d(); +- vertexbuffer.func_181662_b((double)this.field_148152_e, (double)this.field_148153_b, 0.0D).func_187315_a((double)((float)this.field_148152_e / 32.0F), (double)((float)(this.field_148153_b + (int)this.field_148169_q) / 32.0F)).func_181669_b(32, 32, 32, 255).func_181675_d(); - tessellator.func_78381_a(); + // Forge: background rendering moved into separate method. + this.drawContainerBackground(tessellator); diff --git a/patches/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.java.patch index 90631f9ae..2279e0a97 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.java.patch @@ -1,10 +1,11 @@ --- ../src-base/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.java +++ ../src-work/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.java -@@ -73,6 +73,7 @@ +@@ -73,6 +73,8 @@ s3 = s4; } + s3 = FontRenderer.func_78282_e(s2) + s3; //Forge: Fix chat formatting not surviving line wrapping. - TextComponentString textcomponentstring2 = new TextComponentString(s3); - textcomponentstring2.func_150255_a(itextcomponent1.func_150256_b().func_150232_l()); - list1.add(j + 1, textcomponentstring2); ++ + TextComponentString textcomponentstring1 = new TextComponentString(s3); + textcomponentstring1.func_150255_a(itextcomponent1.func_150256_b().func_150232_l()); + list1.add(j + 1, textcomponentstring1); diff --git a/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch b/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch index d4606c3f0..d229b6e3f 100644 --- a/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch @@ -1,7 +1,7 @@ --- ../src-base/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java +++ ../src-work/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java @@ -82,7 +82,7 @@ - boolean flag1 = this.field_148301_e.field_82821_f < 110; + boolean flag1 = this.field_148301_e.field_82821_f < 210; boolean flag2 = flag || flag1; this.field_148300_d.field_71466_p.func_78276_b(this.field_148301_e.field_78847_a, p_180790_2_ + 32 + 3, p_180790_3_ + 1, 16777215); - List list = this.field_148300_d.field_71466_p.func_78271_c(this.field_148301_e.field_78843_d, p_180790_4_ - 32 - 2); diff --git a/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch index 6a051900c..2bc64296a 100644 --- a/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch @@ -1,7 +1,7 @@ --- ../src-base/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java +++ ../src-work/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java @@ -49,6 +49,10 @@ - private StatisticsManager field_146556_E; + private final StatisticsManager field_146556_E; private boolean field_146558_F = true; + private int currentPage = -1; @@ -11,10 +11,10 @@ public GuiAchievements(GuiScreen p_i45026_1_, StatisticsManager p_i45026_2_) { this.field_146562_a = p_i45026_1_; -@@ -57,6 +61,14 @@ - int j = 141; - this.field_146569_s = this.field_146567_u = this.field_146565_w = (double)(AchievementList.field_187982_f.field_75993_a * 24 - i / 2 - 12); - this.field_146568_t = this.field_146566_v = this.field_146573_x = (double)(AchievementList.field_187982_f.field_75991_b * 24 - j / 2); +@@ -61,6 +65,14 @@ + this.field_146573_x = (double)(AchievementList.field_187982_f.field_75991_b * 24 - 70); + this.field_146568_t = this.field_146573_x; + this.field_146566_v = this.field_146573_x; + minecraftAchievements.clear(); + for (Achievement achievement : AchievementList.field_187981_e) + { @@ -26,7 +26,7 @@ } public void func_73866_w_() -@@ -64,6 +76,7 @@ +@@ -68,6 +80,7 @@ this.field_146297_k.func_147114_u().func_147297_a(new CPacketClientStatus(CPacketClientStatus.State.REQUEST_STATS)); this.field_146292_n.clear(); this.field_146292_n.add(new GuiOptionButton(1, this.field_146294_l / 2 + 24, this.field_146295_m / 2 + 74, 80, 20, I18n.func_135052_a("gui.done", new Object[0]))); @@ -34,7 +34,7 @@ } protected void func_146284_a(GuiButton p_146284_1_) throws IOException -@@ -74,12 +87,22 @@ +@@ -78,12 +91,22 @@ { this.field_146297_k.func_147108_a(this.field_146562_a); } @@ -58,7 +58,7 @@ { this.field_146297_k.func_147108_a((GuiScreen)null); this.field_146297_k.func_71381_h(); -@@ -257,7 +280,9 @@ +@@ -264,7 +287,9 @@ GlStateManager.func_179143_c(518); GlStateManager.func_179094_E(); GlStateManager.func_179109_b((float)i1, (float)j1, -200.0F); @@ -69,7 +69,7 @@ GlStateManager.func_179098_w(); GlStateManager.func_179140_f(); GlStateManager.func_179091_B(); -@@ -331,11 +356,12 @@ +@@ -338,11 +363,12 @@ GlStateManager.func_179143_c(515); this.field_146297_k.func_110434_K().func_110577_a(field_146561_C); @@ -85,7 +85,7 @@ { int k5 = achievement1.field_75993_a * 24 - i + 11; int l5 = achievement1.field_75991_b * 24 - j + 11; -@@ -389,9 +415,9 @@ +@@ -396,9 +422,9 @@ GlStateManager.func_179091_B(); GlStateManager.func_179142_g(); @@ -97,7 +97,7 @@ int l6 = achievement2.field_75993_a * 24 - i; int j7 = achievement2.field_75991_b * 24 - j; -@@ -432,6 +458,7 @@ +@@ -439,6 +465,7 @@ this.field_146297_k.func_110434_K().func_110577_a(field_146561_C); @@ -105,7 +105,7 @@ if (achievement2.func_75984_f()) { this.func_73729_b(l6 - 2, j7 - 2, 26, 202, 26, 26); -@@ -440,6 +467,7 @@ +@@ -447,6 +474,7 @@ { this.func_73729_b(l6 - 2, j7 - 2, 0, 202, 26, 26); } @@ -113,7 +113,7 @@ if (!this.field_146556_E.func_77442_b(achievement2)) { -@@ -448,7 +476,7 @@ +@@ -455,7 +483,7 @@ this.field_146296_j.func_175039_a(false); } diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch index c6aa93901..9712efcd8 100644 --- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch @@ -235,7 +235,7 @@ GlStateManager.func_179140_f(); + GlStateManager.func_179124_c(1F, 1F, 1F); //Forge: Reset color in case Items change it. + GlStateManager.func_179147_l(); //Forge: Make sure blend is enabled else tabs show a white border. - this.func_73729_b(l, i1, j, k, 28, j1); + this.func_73729_b(l, i1, j, k, 28, 32); this.field_73735_i = 100.0F; this.field_146296_j.field_77023_b = 100.0F; @@ -794,6 +880,15 @@ diff --git a/patches/minecraft/net/minecraft/client/model/ModelBox.java.patch b/patches/minecraft/net/minecraft/client/model/ModelBox.java.patch index 387c49616..f50228fff 100644 --- a/patches/minecraft/net/minecraft/client/model/ModelBox.java.patch +++ b/patches/minecraft/net/minecraft/client/model/ModelBox.java.patch @@ -7,7 +7,7 @@ -@SideOnly(Side.CLIENT) public class ModelBox { - private PositionTextureVertex[] field_78253_h; + private final PositionTextureVertex[] field_78253_h; @@ -81,6 +80,7 @@ } } @@ -15,4 +15,4 @@ + @SideOnly(Side.CLIENT) public void func_178780_a(VertexBuffer p_178780_1_, float p_178780_2_) { - for (int i = 0; i < this.field_78254_i.length; ++i) + for (TexturedQuad texturedquad : this.field_78254_i) diff --git a/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java.patch b/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java.patch index 3bb2a1d0f..2323322a9 100644 --- a/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java.patch +++ b/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java.patch @@ -4,8 +4,8 @@ inetaddress = InetAddress.getByName(p_146367_1_); GuiConnecting.this.field_146371_g = NetworkManager.func_181124_a(inetaddress, p_146367_2_, GuiConnecting.this.field_146297_k.field_71474_y.func_181148_f()); GuiConnecting.this.field_146371_g.func_150719_a(new NetHandlerLoginClient(GuiConnecting.this.field_146371_g, GuiConnecting.this.field_146297_k, GuiConnecting.this.field_146374_i)); -- GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(110, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN)); -+ GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(110, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN, true)); +- GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(210, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN)); ++ GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(210, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN, true)); GuiConnecting.this.field_146371_g.func_179290_a(new CPacketLoginStart(GuiConnecting.this.field_146297_k.func_110432_I().func_148256_e())); } catch (UnknownHostException unknownhostexception) diff --git a/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java.patch b/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java.patch index 087652171..0a87b4920 100644 --- a/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java.patch +++ b/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java +++ ../src-work/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java -@@ -122,6 +122,12 @@ +@@ -123,6 +123,12 @@ } } @@ -13,7 +13,7 @@ if (this.field_78779_k.func_77145_d() && this.field_78776_a.field_71439_g.func_184614_ca() != null && this.field_78776_a.field_71439_g.func_184614_ca().func_77973_b() instanceof ItemSword) { return false; -@@ -143,14 +149,7 @@ +@@ -144,14 +150,7 @@ else { world.func_175718_b(2001, p_187103_1_, Block.func_176210_f(iblockstate)); @@ -28,7 +28,7 @@ this.field_178895_c = new BlockPos(this.field_178895_c.func_177958_n(), -1, this.field_178895_c.func_177952_p()); if (!this.field_78779_k.func_77145_d()) -@@ -161,13 +160,20 @@ +@@ -162,13 +161,20 @@ { itemstack1.func_179548_a(world, iblockstate, p_187103_1_, this.field_78776_a.field_71439_g); @@ -50,7 +50,7 @@ return flag; } } -@@ -207,6 +213,7 @@ +@@ -208,6 +214,7 @@ if (this.field_78779_k.func_77145_d()) { this.field_78774_b.func_147297_a(new CPacketPlayerDigging(CPacketPlayerDigging.Action.START_DESTROY_BLOCK, p_180511_1_, p_180511_2_)); @@ -58,7 +58,7 @@ func_178891_a(this.field_78776_a, this, p_180511_1_, p_180511_2_); this.field_78781_i = 5; } -@@ -218,14 +225,17 @@ +@@ -219,14 +226,17 @@ } this.field_78774_b.func_147297_a(new CPacketPlayerDigging(CPacketPlayerDigging.Action.START_DESTROY_BLOCK, p_180511_1_, p_180511_2_)); @@ -77,7 +77,7 @@ if (flag && iblockstate.func_185903_a(this.field_78776_a.field_71439_g, this.field_78776_a.field_71439_g.field_70170_p, p_180511_1_) >= 1.0F) { this.func_187103_a(p_180511_1_); -@@ -372,13 +382,32 @@ +@@ -373,13 +383,32 @@ } else { @@ -91,7 +91,7 @@ + } + EnumActionResult result = EnumActionResult.PASS; + - if (this.field_78779_k != WorldSettings.GameType.SPECTATOR) + if (this.field_78779_k != GameType.SPECTATOR) { + net.minecraft.item.Item item = p_187099_3_ == null ? null : p_187099_3_.func_77973_b(); + EnumActionResult ret = item == null ? EnumActionResult.PASS : item.onItemUseFirst(p_187099_3_, p_187099_1_, p_187099_2_, p_187099_4_, p_187099_5_, f, f1, f2, p_187099_7_); @@ -112,37 +112,37 @@ } if (!flag && p_187099_3_ != null && p_187099_3_.func_77973_b() instanceof ItemBlock) -@@ -394,7 +423,7 @@ +@@ -395,7 +424,7 @@ this.field_78774_b.func_147297_a(new CPacketPlayerTryUseItemOnBlock(p_187099_4_, p_187099_5_, p_187099_7_, f, f1, f2)); -- if (!flag && this.field_78779_k != WorldSettings.GameType.SPECTATOR) -+ if (!flag && this.field_78779_k != WorldSettings.GameType.SPECTATOR || event.getUseItem() == net.minecraftforge.fml.common.eventhandler.Event.Result.ALLOW) +- if (!flag && this.field_78779_k != GameType.SPECTATOR) ++ if (!flag && this.field_78779_k != GameType.SPECTATOR || event.getUseItem() == net.minecraftforge.fml.common.eventhandler.Event.Result.ALLOW) { if (p_187099_3_ == null) { -@@ -412,14 +441,19 @@ - { - int i = p_187099_3_.func_77960_j(); - int j = p_187099_3_.field_77994_a; -+ if (event.getUseItem() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY) { - EnumActionResult enumactionresult = p_187099_3_.func_179546_a(p_187099_1_, p_187099_2_, p_187099_4_, p_187099_7_, p_187099_5_, f, f1, f2); - p_187099_3_.func_77964_b(i); - p_187099_3_.field_77994_a = j; - return enumactionresult; -+ } else return result; - } - else - { -- return p_187099_3_.func_179546_a(p_187099_1_, p_187099_2_, p_187099_4_, p_187099_7_, p_187099_5_, f, f1, f2); -+ if (event.getUseItem() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY) -+ result = p_187099_3_.func_179546_a(p_187099_1_, p_187099_2_, p_187099_4_, p_187099_7_, p_187099_5_, f, f1, f2); -+ if (p_187099_3_.field_77994_a <= 0) net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(p_187099_1_, p_187099_3_, p_187099_7_); -+ return result; +@@ -421,14 +450,19 @@ + { + int i = p_187099_3_.func_77960_j(); + int j = p_187099_3_.field_77994_a; ++ if (event.getUseItem() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY) { + EnumActionResult enumactionresult = p_187099_3_.func_179546_a(p_187099_1_, p_187099_2_, p_187099_4_, p_187099_7_, p_187099_5_, f, f1, f2); + p_187099_3_.func_77964_b(i); + p_187099_3_.field_77994_a = j; + return enumactionresult; ++ } else return result; + } + else + { +- return p_187099_3_.func_179546_a(p_187099_1_, p_187099_2_, p_187099_4_, p_187099_7_, p_187099_5_, f, f1, f2); ++ if (event.getUseItem() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY) ++ result = p_187099_3_.func_179546_a(p_187099_1_, p_187099_2_, p_187099_4_, p_187099_7_, p_187099_5_, f, f1, f2); ++ if (p_187099_3_.field_77994_a <= 0) net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(p_187099_1_, p_187099_3_, p_187099_7_); ++ return result; + } } } - else -@@ -446,6 +480,7 @@ +@@ -456,6 +490,7 @@ } else { @@ -150,7 +150,7 @@ int i = p_187101_3_.field_77994_a; ActionResult actionresult = p_187101_3_.func_77957_a(p_187101_2_, p_187101_1_, p_187101_4_); ItemStack itemstack = (ItemStack)actionresult.func_188398_b(); -@@ -454,9 +489,10 @@ +@@ -464,9 +499,10 @@ { p_187101_1_.func_184611_a(p_187101_4_, itemstack); @@ -162,11 +162,11 @@ } } -@@ -494,6 +530,7 @@ +@@ -504,6 +540,7 @@ this.func_78750_j(); Vec3d vec3d = new Vec3d(p_187102_3_.field_72307_f.field_72450_a - p_187102_2_.field_70165_t, p_187102_3_.field_72307_f.field_72448_b - p_187102_2_.field_70163_u, p_187102_3_.field_72307_f.field_72449_c - p_187102_2_.field_70161_v); this.field_78774_b.func_147297_a(new CPacketUseEntity(p_187102_2_, p_187102_5_, vec3d)); + if(net.minecraftforge.common.ForgeHooks.onInteractEntityAt(p_187102_1_, p_187102_2_, p_187102_3_, p_187102_1_.func_184586_b(p_187102_5_), p_187102_5_)) return EnumActionResult.PASS; - return this.field_78779_k == WorldSettings.GameType.SPECTATOR ? EnumActionResult.PASS : p_187102_2_.func_184199_a(p_187102_1_, vec3d, p_187102_4_, p_187102_5_); + return this.field_78779_k == GameType.SPECTATOR ? EnumActionResult.PASS : p_187102_2_.func_184199_a(p_187102_1_, vec3d, p_187102_4_, p_187102_5_); } diff --git a/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.java.patch b/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.java.patch index d29998294..83f738dc7 100644 --- a/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.java.patch +++ b/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/client/multiplayer/WorldClient.java +++ ../src-work/minecraft/net/minecraft/client/multiplayer/WorldClient.java -@@ -59,17 +59,18 @@ +@@ -60,17 +60,18 @@ public WorldClient(NetHandlerPlayClient p_i45063_1_, WorldSettings p_i45063_2_, int p_i45063_3_, EnumDifficulty p_i45063_4_, Profiler p_i45063_5_) { diff --git a/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch b/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch index 19d54fabb..054c4bf4e 100644 --- a/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch +++ b/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java +++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java -@@ -268,7 +268,7 @@ +@@ -271,7 +271,7 @@ { PacketThreadUtil.func_180031_a(p_147282_1_, this, this.field_147299_f); this.field_147299_f.field_71442_b = new PlayerControllerMP(this.field_147299_f, this); @@ -9,7 +9,7 @@ this.field_147299_f.field_71474_y.field_74318_M = p_147282_1_.func_149192_g(); this.field_147299_f.func_71403_a(this.field_147300_g); this.field_147299_f.field_71439_g.field_71093_bK = p_147282_1_.func_149194_f(); -@@ -719,7 +719,7 @@ +@@ -725,7 +725,7 @@ if (tileentity != null) { @@ -18,7 +18,7 @@ } } } -@@ -797,14 +797,16 @@ +@@ -803,14 +803,16 @@ public void func_147251_a(SPacketChat p_147251_1_) { PacketThreadUtil.func_180031_a(p_147251_1_, this, this.field_147299_f); @@ -37,7 +37,7 @@ } } -@@ -860,6 +862,11 @@ +@@ -866,6 +868,11 @@ float f = (float)(p_147281_1_.func_149028_l() * 360) / 256.0F; float f1 = (float)(p_147281_1_.func_149030_m() * 360) / 256.0F; EntityLivingBase entitylivingbase = (EntityLivingBase)EntityList.func_75616_a(p_147281_1_.func_149025_e(), this.field_147299_f.field_71441_e); @@ -47,9 +47,9 @@ + return; + } EntityTracker.func_187254_a(entitylivingbase, d0, d1, d2); - entitylivingbase.field_70761_aq = entitylivingbase.field_70759_as = (float)(p_147281_1_.func_149032_n() * 360) / 256.0F; - Entity[] aentity = entitylivingbase.func_70021_al(); -@@ -931,7 +938,7 @@ + entitylivingbase.field_70761_aq = (float)(p_147281_1_.func_149032_n() * 360) / 256.0F; + entitylivingbase.field_70759_as = (float)(p_147281_1_.func_149032_n() * 360) / 256.0F; +@@ -938,7 +945,7 @@ if (entity1 == this.field_147299_f.field_71439_g && !flag) { @@ -58,7 +58,7 @@ } } } -@@ -1162,6 +1169,10 @@ +@@ -1169,6 +1176,10 @@ { tileentity.func_145839_a(p_147273_1_.func_148857_g()); } @@ -69,7 +69,7 @@ if (flag && this.field_147299_f.field_71462_r instanceof GuiCommandBlock) { -@@ -1259,15 +1270,15 @@ +@@ -1266,15 +1277,15 @@ } else if (f == 101.0F) { @@ -88,7 +88,7 @@ } } else if (i == 6) -@@ -1361,7 +1372,7 @@ +@@ -1368,7 +1379,7 @@ if (entity instanceof EntityLivingBase) { diff --git a/patches/minecraft/net/minecraft/client/network/ServerPinger.java.patch b/patches/minecraft/net/minecraft/client/network/ServerPinger.java.patch index 0168e2cc5..b32b646a2 100644 --- a/patches/minecraft/net/minecraft/client/network/ServerPinger.java.patch +++ b/patches/minecraft/net/minecraft/client/network/ServerPinger.java.patch @@ -8,3 +8,12 @@ this.field_175092_e = Minecraft.func_71386_F(); networkmanager.func_179290_a(new CPacketPing(this.field_175092_e)); this.field_147403_d = true; +@@ -176,7 +177,7 @@ + + try + { +- networkmanager.func_179290_a(new C00Handshake(210, serveraddress.func_78861_a(), serveraddress.func_78864_b(), EnumConnectionState.STATUS)); ++ networkmanager.func_179290_a(new C00Handshake(210, serveraddress.func_78861_a(), serveraddress.func_78864_b(), EnumConnectionState.STATUS, true)); + networkmanager.func_179290_a(new CPacketServerQuery()); + } + catch (Throwable throwable) diff --git a/patches/minecraft/net/minecraft/client/particle/ParticleManager.java.patch b/patches/minecraft/net/minecraft/client/particle/ParticleManager.java.patch index 42fac1883..63fcf306e 100644 --- a/patches/minecraft/net/minecraft/client/particle/ParticleManager.java.patch +++ b/patches/minecraft/net/minecraft/client/particle/ParticleManager.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/client/particle/ParticleManager.java +++ ../src-work/minecraft/net/minecraft/client/particle/ParticleManager.java -@@ -145,6 +145,7 @@ +@@ -146,6 +146,7 @@ public void func_78873_a(Particle p_78873_1_) { @@ -8,7 +8,7 @@ this.field_187241_h.add(p_78873_1_); } -@@ -378,7 +379,7 @@ +@@ -380,7 +381,7 @@ public void func_180533_a(BlockPos p_180533_1_, IBlockState p_180533_2_) { @@ -17,7 +17,7 @@ { p_180533_2_ = p_180533_2_.func_185899_b(this.field_78878_a, p_180533_1_); int i = 4; -@@ -462,4 +463,13 @@ +@@ -464,4 +465,13 @@ return "" + i; } diff --git a/patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.java.patch index f3d7fc94e..f0313eddf 100644 --- a/patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.java.patch @@ -16,10 +16,10 @@ if (bakedquad.func_178212_b()) { int k = this.field_187499_a.func_186724_a(p_187492_2_, p_187492_1_, p_187492_3_, bakedquad.func_178211_c()); -@@ -290,11 +297,26 @@ - float f = (float)(l >> 16 & 255) / 255.0F; - float f1 = (float)(l >> 8 & 255) / 255.0F; - float f2 = (float)(l & 255) / 255.0F; +@@ -291,11 +298,26 @@ + float f = (float)(j1 >> 16 & 255) / 255.0F; + float f1 = (float)(j1 >> 8 & 255) / 255.0F; + float f2 = (float)(j1 & 255) / 255.0F; + if(bakedquad.shouldApplyDiffuseLighting()) + { + float diffuse = net.minecraftforge.client.model.pipeline.LightUtil.diffuseLight(bakedquad.func_178210_d()); diff --git a/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch index fa8071fea..2e5d953c2 100644 --- a/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/client/renderer/EntityRenderer.java +++ ../src-work/minecraft/net/minecraft/client/renderer/EntityRenderer.java -@@ -208,6 +208,7 @@ +@@ -207,6 +207,7 @@ { this.func_175069_a(new ResourceLocation("shaders/post/invert.json")); } @@ -8,7 +8,7 @@ } } -@@ -399,7 +400,7 @@ +@@ -398,7 +399,7 @@ if (d3 < d2 || d2 == 0.0D) { @@ -17,7 +17,7 @@ { if (d2 == 0.0D) { -@@ -492,7 +493,7 @@ +@@ -491,7 +492,7 @@ f = f * 60.0F / 70.0F; } @@ -26,7 +26,7 @@ } } -@@ -556,14 +557,8 @@ +@@ -555,14 +556,8 @@ { BlockPos blockpos = new BlockPos(entity); IBlockState iblockstate = this.field_78531_r.field_71441_e.func_180495_p(blockpos); @@ -42,7 +42,7 @@ GlStateManager.func_179114_b(entity.field_70126_B + (entity.field_70177_z - entity.field_70126_B) * p_78467_1_ + 180.0F, 0.0F, -1.0F, 0.0F); GlStateManager.func_179114_b(entity.field_70127_C + (entity.field_70125_A - entity.field_70127_C) * p_78467_1_, -1.0F, 0.0F, 0.0F); } -@@ -630,17 +625,20 @@ +@@ -629,17 +624,20 @@ if (!this.field_78531_r.field_71474_y.field_74325_U) { @@ -70,7 +70,7 @@ } GlStateManager.func_179109_b(0.0F, -f, 0.0F); -@@ -758,6 +756,7 @@ +@@ -757,6 +755,7 @@ boolean flag = this.field_78531_r.func_175606_aa() instanceof EntityLivingBase && ((EntityLivingBase)this.field_78531_r.func_175606_aa()).func_70608_bn(); @@ -78,7 +78,7 @@ if (this.field_78531_r.field_71474_y.field_74320_O == 0 && !flag && !this.field_78531_r.field_71474_y.field_74319_N && !this.field_78531_r.field_71442_b.func_78747_a()) { this.func_180436_i(); -@@ -1093,7 +1092,7 @@ +@@ -1092,7 +1091,7 @@ try { @@ -87,16 +87,16 @@ } catch (Throwable throwable) { -@@ -1188,7 +1187,7 @@ +@@ -1187,7 +1186,7 @@ - if (this.field_78531_r.field_71442_b.func_178889_l() == WorldSettings.GameType.SPECTATOR) + if (this.field_78531_r.field_71442_b.func_178889_l() == GameType.SPECTATOR) { - flag = block.func_149716_u() && this.field_78531_r.field_71441_e.func_175625_s(blockpos) instanceof IInventory; + flag = block.hasTileEntity(this.field_78531_r.field_71441_e.func_180495_p(blockpos)) && this.field_78531_r.field_71441_e.func_175625_s(blockpos) instanceof IInventory; } else { -@@ -1313,7 +1312,9 @@ +@@ -1312,7 +1311,9 @@ GlStateManager.func_179094_E(); RenderHelper.func_74519_b(); this.field_78531_r.field_71424_I.func_76318_c("entities"); @@ -106,7 +106,7 @@ RenderHelper.func_74518_a(); this.func_175072_h(); } -@@ -1326,6 +1327,7 @@ +@@ -1325,6 +1326,7 @@ EntityPlayer entityplayer = (EntityPlayer)entity; GlStateManager.func_179118_c(); this.field_78531_r.field_71424_I.func_76318_c("outline"); @@ -114,7 +114,7 @@ renderglobal.func_72731_b(entityplayer, this.field_78531_r.field_71476_x, 0, p_175068_2_); GlStateManager.func_179141_d(); } -@@ -1367,6 +1369,17 @@ +@@ -1371,6 +1373,17 @@ GlStateManager.func_179103_j(7425); this.field_78531_r.field_71424_I.func_76318_c("translucent"); renderglobal.func_174977_a(BlockRenderLayer.TRANSLUCENT, (double)p_175068_2_, p_175068_1_, entity); @@ -132,7 +132,7 @@ GlStateManager.func_179103_j(7424); GlStateManager.func_179132_a(true); GlStateManager.func_179089_o(); -@@ -1379,6 +1392,9 @@ +@@ -1383,6 +1396,9 @@ this.func_180437_a(renderglobal, p_175068_2_, p_175068_1_); } @@ -142,7 +142,7 @@ this.field_78531_r.field_71424_I.func_76318_c("hand"); if (this.field_175074_C) -@@ -1491,6 +1507,13 @@ +@@ -1498,6 +1514,13 @@ protected void func_78474_d(float p_78474_1_) { @@ -156,7 +156,7 @@ float f = this.field_78531_r.field_71441_e.func_72867_j(p_78474_1_); if (f > 0.0F) -@@ -1821,6 +1844,13 @@ +@@ -1828,6 +1851,13 @@ this.field_175081_S = f7; } @@ -170,7 +170,7 @@ GlStateManager.func_179082_a(this.field_175080_Q, this.field_175082_R, this.field_175081_S, 0.0F); } -@@ -1831,7 +1861,9 @@ +@@ -1838,7 +1868,9 @@ GlStateManager.func_187432_a(0.0F, -1.0F, 0.0F); GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, 1.0F); IBlockState iblockstate = ActiveRenderInfo.func_186703_a(this.field_78531_r.field_71441_e, entity, p_78468_2_); @@ -181,7 +181,7 @@ if (entity instanceof EntityLivingBase && ((EntityLivingBase)entity).func_70644_a(MobEffects.field_76440_q)) { float f1 = 5.0F; -@@ -1916,6 +1948,7 @@ +@@ -1923,6 +1955,7 @@ GlStateManager.func_179102_b(f * 0.05F); GlStateManager.func_179153_c(Math.min(f, 192.0F) * 0.5F); } diff --git a/patches/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.java.patch index 81041e73d..11a8ba613 100644 --- a/patches/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.java.patch @@ -1,16 +1,21 @@ --- ../src-base/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.java +++ ../src-work/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.java -@@ -28,8 +28,14 @@ +@@ -28,13 +28,19 @@ protected void func_175378_g() { -- if (!this.field_146297_k.field_71439_g.func_70651_bq().isEmpty()) +- if (this.field_146297_k.field_71439_g.func_70651_bq().isEmpty()) + boolean hasVisibleEffect = false; + for(PotionEffect potioneffect : this.field_146297_k.field_71439_g.func_70651_bq()) { + Potion potion = potioneffect.func_188419_a(); + if(potion.shouldRender(potioneffect)) { hasVisibleEffect = true; break; } + } -+ if (!this.field_146297_k.field_71439_g.func_70651_bq().isEmpty() && hasVisibleEffect) ++ if (this.field_146297_k.field_71439_g.func_70651_bq().isEmpty() || !hasVisibleEffect) + { + this.field_147003_i = (this.field_146294_l - this.field_146999_f) / 2; + this.field_147045_u = false; + } + else { + if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.PotionShiftEvent(this))) this.field_147003_i = (this.field_146294_l - this.field_146999_f) / 2; else this.field_147003_i = 160 + (this.field_146294_l - this.field_146999_f - 200) / 2; diff --git a/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch b/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch index 97010fc01..e195326f8 100644 --- a/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch @@ -13,7 +13,7 @@ else @@ -560,9 +562,12 @@ this.field_72769_h.field_72984_F.func_76320_a("prepare"); - TileEntityRendererDispatcher.field_147556_a.func_178470_a(this.field_72769_h, this.field_72777_q.func_110434_K(), this.field_72777_q.field_71466_p, this.field_72777_q.func_175606_aa(), p_180446_3_); + TileEntityRendererDispatcher.field_147556_a.func_190056_a(this.field_72769_h, this.field_72777_q.func_110434_K(), this.field_72777_q.field_71466_p, this.field_72777_q.func_175606_aa(), this.field_72777_q.field_71476_x, p_180446_3_); this.field_175010_j.func_180597_a(this.field_72769_h, this.field_72777_q.field_71466_p, this.field_72777_q.func_175606_aa(), this.field_72777_q.field_147125_j, this.field_72777_q.field_71474_y, p_180446_3_); + if(pass == 0) + { @@ -93,7 +93,7 @@ { TileEntityRendererDispatcher.field_147556_a.func_180546_a(tileentity1, p_180446_3_, destroyblockprogress.func_73106_e()); } -@@ -1214,6 +1229,13 @@ +@@ -1213,6 +1228,13 @@ public void func_174976_a(float p_174976_1_, int p_174976_2_) { @@ -107,7 +107,7 @@ if (this.field_72777_q.field_71441_e.field_73011_w.func_186058_p().func_186068_a() == 1) { this.func_180448_r(); -@@ -1431,6 +1453,12 @@ +@@ -1430,6 +1452,12 @@ public void func_180447_b(float p_180447_1_, int p_180447_2_) { @@ -120,7 +120,7 @@ if (this.field_72777_q.field_71441_e.field_73011_w.func_76569_d()) { if (this.field_72777_q.field_71474_y.func_181147_e() == 2) -@@ -1858,8 +1886,11 @@ +@@ -1857,8 +1885,11 @@ double d4 = (double)blockpos.func_177956_o() - d1; double d5 = (double)blockpos.func_177952_p() - d2; Block block = this.field_72769_h.func_180495_p(blockpos).func_177230_c(); diff --git a/patches/minecraft/net/minecraft/client/renderer/RenderItem.java.patch b/patches/minecraft/net/minecraft/client/renderer/RenderItem.java.patch index b2b512426..08410f932 100644 --- a/patches/minecraft/net/minecraft/client/renderer/RenderItem.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/RenderItem.java.patch @@ -83,7 +83,7 @@ GlStateManager.func_179140_f(); GlStateManager.func_179097_i(); GlStateManager.func_179090_x(); -@@ -1054,6 +1043,7 @@ +@@ -1059,6 +1048,7 @@ this.func_175029_a(Blocks.field_185779_df, TileEntityStructure.Mode.LOAD.func_185110_a(), "structure_block"); this.func_175029_a(Blocks.field_185779_df, TileEntityStructure.Mode.CORNER.func_185110_a(), "structure_block"); this.func_175029_a(Blocks.field_185779_df, TileEntityStructure.Mode.DATA.func_185110_a(), "structure_block"); diff --git a/patches/minecraft/net/minecraft/client/renderer/VertexBuffer.java.patch b/patches/minecraft/net/minecraft/client/renderer/VertexBuffer.java.patch index fbf7ce941..834a89968 100644 --- a/patches/minecraft/net/minecraft/client/renderer/VertexBuffer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/VertexBuffer.java.patch @@ -1,15 +1,15 @@ --- ../src-base/minecraft/net/minecraft/client/renderer/VertexBuffer.java +++ ../src-work/minecraft/net/minecraft/client/renderer/VertexBuffer.java -@@ -126,6 +126,8 @@ +@@ -123,6 +123,8 @@ - bitset.set(l1); + bitset.set(i1); } + this.field_178999_b.limit(this.field_178999_b.capacity()); + this.field_178999_b.position(this.func_181664_j()); } public VertexBuffer.State func_181672_a() -@@ -510,15 +512,15 @@ +@@ -507,15 +509,15 @@ break; case USHORT: case SHORT: @@ -31,7 +31,7 @@ } this.func_181667_k(); -@@ -609,4 +611,9 @@ +@@ -606,4 +608,9 @@ return this.field_179018_e; } } diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBakery.java.patch b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBakery.java.patch index 8f8b0f81c..95347b26f 100644 --- a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBakery.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBakery.java.patch @@ -42,7 +42,7 @@ { if (!modelblockdefinition.func_188002_b()) { -- field_177603_c.warn("Unable to load variant: " + modelresourcelocation.func_177518_c() + " from " + modelresourcelocation); +- field_177603_c.warn("Unable to load variant: {} from {}", new Object[] {modelresourcelocation.func_177518_c(), modelresourcelocation}); + field_177603_c.warn("Unable to load variant: " + modelresourcelocation.func_177518_c() + " from " + modelresourcelocation, var12); } } @@ -51,7 +51,7 @@ } - catch (Exception exception) - { -- field_177603_c.warn((String)("Unable to load definition " + resourcelocation), (Throwable)exception); +- field_177603_c.warn("Unable to load definition {}", new Object[] {resourcelocation, exception}); - } } } diff --git a/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java.patch b/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java.patch index 10a7b17ec..cb3a179f5 100644 --- a/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java +++ ../src-work/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java -@@ -162,7 +162,7 @@ +@@ -161,7 +161,7 @@ lvt_9_1_.func_178606_a(blockpos$mutableblockpos); } @@ -9,7 +9,7 @@ { TileEntity tileentity = this.field_189564_r.func_175625_s(new BlockPos(blockpos$mutableblockpos)); -@@ -182,7 +182,9 @@ +@@ -181,7 +181,9 @@ } } @@ -20,7 +20,7 @@ int j = blockrenderlayer1.ordinal(); if (block.func_176223_P().func_185901_i() != EnumBlockRenderType.INVISIBLE) -@@ -197,6 +199,8 @@ +@@ -196,6 +198,8 @@ aboolean[j] |= blockrendererdispatcher.func_175018_a(iblockstate, blockpos$mutableblockpos, this.field_189564_r, vertexbuffer); } @@ -29,7 +29,7 @@ } for (BlockRenderLayer blockrenderlayer : BlockRenderLayer.values()) -@@ -278,7 +282,9 @@ +@@ -277,7 +281,9 @@ private void func_189563_q() { int i = 1; @@ -40,7 +40,7 @@ } @Nullable -@@ -427,6 +433,26 @@ +@@ -426,6 +432,26 @@ return this.field_178593_n && this.field_188284_q; } diff --git a/patches/minecraft/net/minecraft/client/renderer/color/BlockColors.java.patch b/patches/minecraft/net/minecraft/client/renderer/color/BlockColors.java.patch index 16a5a36ad..78f1e7c35 100644 --- a/patches/minecraft/net/minecraft/client/renderer/color/BlockColors.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/color/BlockColors.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/client/renderer/color/BlockColors.java +++ ../src-work/minecraft/net/minecraft/client/renderer/color/BlockColors.java -@@ -26,7 +26,8 @@ +@@ -27,7 +27,8 @@ @SideOnly(Side.CLIENT) public class BlockColors { @@ -10,7 +10,16 @@ public static BlockColors func_186723_a() { -@@ -146,7 +147,7 @@ +@@ -147,7 +148,7 @@ + + public int func_189991_a(IBlockState p_189991_1_) + { +- IBlockColor iblockcolor = (IBlockColor)this.field_186725_a.func_148745_a(Block.func_149682_b(p_189991_1_.func_177230_c())); ++ IBlockColor iblockcolor = (IBlockColor)this.blockColorMap.get(p_189991_1_.func_177230_c().delegate); + + if (iblockcolor != null) + { +@@ -162,7 +163,7 @@ public int func_186724_a(IBlockState p_186724_1_, @Nullable IBlockAccess p_186724_2_, @Nullable BlockPos p_186724_3_, int p_186724_4_) { @@ -19,14 +28,14 @@ return iblockcolor == null ? -1 : iblockcolor.func_186720_a(p_186724_1_, p_186724_2_, p_186724_3_, p_186724_4_); } -@@ -156,7 +157,9 @@ - - for (int j = p_186722_2_.length; i < j; ++i) +@@ -170,7 +171,9 @@ + { + for (Block block : p_186722_2_) { -- this.field_186725_a.func_148746_a(p_186722_1_, Block.func_149682_b(p_186722_2_[i])); -+ if (p_186722_2_[i] == null) throw new IllegalArgumentException("Block registered to block color handler cannot be null!"); -+ if (p_186722_2_[i].getRegistryName() == null) throw new IllegalArgumentException("Block must be registered before assigning color handler."); -+ this.blockColorMap.put(p_186722_2_[i].delegate, p_186722_1_); +- this.field_186725_a.func_148746_a(p_186722_1_, Block.func_149682_b(block)); ++ if (block == null) throw new IllegalArgumentException("Block registered to block color handler cannot be null!"); ++ if (block.getRegistryName() == null) throw new IllegalArgumentException("Block must be registered before assigning color handler."); ++ this.blockColorMap.put(block.delegate, p_186722_1_); } } } diff --git a/patches/minecraft/net/minecraft/client/renderer/color/ItemColors.java.patch b/patches/minecraft/net/minecraft/client/renderer/color/ItemColors.java.patch index c9764c984..c250d8cca 100644 --- a/patches/minecraft/net/minecraft/client/renderer/color/ItemColors.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/color/ItemColors.java.patch @@ -10,7 +10,7 @@ public static ItemColors func_186729_a(final BlockColors p_186729_0_) { -@@ -136,7 +137,7 @@ +@@ -134,7 +135,7 @@ public int func_186728_a(ItemStack p_186728_1_, int p_186728_2_) { @@ -19,25 +19,25 @@ return iitemcolor == null ? -1 : iitemcolor.func_186726_a(p_186728_1_, p_186728_2_); } -@@ -146,7 +147,9 @@ - - for (int j = p_186731_2_.length; i < j; ++i) +@@ -142,7 +143,9 @@ + { + for (Block block : p_186731_2_) { -- this.field_186732_a.func_148746_a(p_186731_1_, Item.func_150891_b(Item.func_150898_a(p_186731_2_[i]))); -+ if (p_186731_2_[i] == null) throw new IllegalArgumentException("Block registered to item color handler cannot be null!"); -+ if (p_186731_2_[i].getRegistryName() == null) throw new IllegalArgumentException("Block must be registered before assigning color handler."); -+ this.itemColorMap.put(Item.func_150898_a(p_186731_2_[i]).delegate, p_186731_1_); +- this.field_186732_a.func_148746_a(p_186731_1_, Item.func_150891_b(Item.func_150898_a(block))); ++ if (block == null) throw new IllegalArgumentException("Block registered to item color handler cannot be null!"); ++ if (block.getRegistryName() == null) throw new IllegalArgumentException("Block must be registered before assigning color handler."); ++ this.itemColorMap.put(Item.func_150898_a(block).delegate, p_186731_1_); } } -@@ -156,7 +159,9 @@ - - for (int j = p_186730_2_.length; i < j; ++i) +@@ -150,7 +153,9 @@ + { + for (Item item : p_186730_2_) { -- this.field_186732_a.func_148746_a(p_186730_1_, Item.func_150891_b(p_186730_2_[i])); -+ if (p_186730_2_[i] == null) throw new IllegalArgumentException("Item registered to item color handler cannot be null!"); -+ if (p_186730_2_[i].getRegistryName() == null) throw new IllegalArgumentException("Item must be registered before assigning color handler."); -+ this.itemColorMap.put(p_186730_2_[i].delegate, p_186730_1_); +- this.field_186732_a.func_148746_a(p_186730_1_, Item.func_150891_b(item)); ++ if (item == null) throw new IllegalArgumentException("Item registered to item color handler cannot be null!"); ++ if (item.getRegistryName() == null) throw new IllegalArgumentException("Item must be registered before assigning color handler."); ++ this.itemColorMap.put(item.delegate, p_186730_1_); } } } diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLivingBase.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLivingBase.java.patch index 8d2a95086..c5fc8210e 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLivingBase.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLivingBase.java.patch @@ -2,7 +2,7 @@ +++ ../src-work/minecraft/net/minecraft/client/renderer/entity/RenderLivingBase.java @@ -32,6 +32,9 @@ protected List> field_177097_h = Lists.>newArrayList(); - protected boolean field_188323_j = false; + protected boolean field_188323_j; + public static float NAME_TAG_RANGE = 64.0f; + public static float NAME_TAG_RANGE_SNEAK = 32.0f; diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.java.patch index 18e64c359..5690b9e38 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/client/renderer/entity/RenderManager.java +++ ../src-work/minecraft/net/minecraft/client/renderer/entity/RenderManager.java -@@ -205,8 +205,13 @@ +@@ -209,8 +209,13 @@ this.field_178637_m = new RenderPlayer(this); this.field_178636_l.put("default", this.field_178637_m); this.field_178636_l.put("slim", new RenderPlayer(this, true)); @@ -14,7 +14,7 @@ public void func_178628_a(double p_178628_1_, double p_178628_3_, double p_178628_5_) { this.field_78725_b = p_178628_1_; -@@ -255,9 +260,9 @@ +@@ -259,9 +264,9 @@ IBlockState iblockstate = p_180597_1_.func_180495_p(new BlockPos(p_180597_3_)); Block block = iblockstate.func_177230_c(); diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderZombie.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RenderZombie.java.patch index 9ac125093..3e789e527 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderZombie.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderZombie.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/client/renderer/entity/RenderZombie.java +++ ../src-work/minecraft/net/minecraft/client/renderer/entity/RenderZombie.java -@@ -69,21 +69,7 @@ +@@ -83,21 +83,7 @@ { if (p_110775_1_.func_82231_m()) { diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch b/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch index 9f4d33cb8..85ac975ae 100644 --- a/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch @@ -25,7 +25,7 @@ } public List func_94309_g() -@@ -238,7 +244,7 @@ +@@ -240,7 +246,7 @@ public String toString() { diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch b/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch index eecabb795..2af2a385a 100644 --- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch @@ -71,15 +71,15 @@ } catch (RuntimeException runtimeexception) { -- field_147635_d.error((String)("Unable to parse metadata from " + resourcelocation), (Throwable)runtimeexception); -+ //logger.error((String)("Unable to parse metadata from " + resourcelocation), (Throwable)runtimeexception); +- field_147635_d.error("Unable to parse metadata from {}", new Object[] {resourcelocation, runtimeexception}); ++ //LOGGER.error("Unable to parse metadata from {}", new Object[] {resourcelocation, runtimeexception}); + net.minecraftforge.fml.client.FMLClientHandler.instance().trackBrokenTexture(resourcelocation, runtimeexception.getMessage()); continue; } catch (IOException ioexception) { -- field_147635_d.error((String)("Using missing texture, unable to load " + resourcelocation), (Throwable)ioexception); -+ //logger.error((String)("Using missing texture, unable to load " + resourcelocation), (Throwable)ioexception); +- field_147635_d.error("Using missing texture, unable to load {}", new Object[] {resourcelocation, ioexception}); ++ //LOGGER.error("Using missing texture, unable to load {}", new Object[] {resourcelocation, ioexception}); + net.minecraftforge.fml.client.FMLClientHandler.instance().trackMissingTexture(resourcelocation); continue; } diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java.patch b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java.patch index 0927701b5..5fb23fd30 100644 --- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java.patch @@ -1,9 +1,9 @@ --- ../src-base/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java +++ ../src-work/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java -@@ -108,11 +108,14 @@ - { +@@ -113,11 +113,14 @@ if (p_180546_1_.func_145835_a(this.field_147560_j, this.field_147561_k, this.field_147558_l) < p_180546_1_.func_145833_n()) { + RenderHelper.func_74519_b(); + if(!drawingBatch || !p_180546_1_.hasFastRenderer()) + { int i = this.field_147550_f.func_175626_b(p_180546_1_.func_174877_v(), 0); @@ -15,7 +15,7 @@ BlockPos blockpos = p_180546_1_.func_174877_v(); this.func_178469_a(p_180546_1_, (double)blockpos.func_177958_n() - field_147554_b, (double)blockpos.func_177956_o() - field_147555_c, (double)blockpos.func_177952_p() - field_147552_d, p_180546_2_, p_180546_3_); } -@@ -131,6 +134,11 @@ +@@ -136,6 +139,11 @@ { try { @@ -27,7 +27,7 @@ tileentityspecialrenderer.func_180535_a(p_178469_1_, p_178469_2_, p_178469_4_, p_178469_6_, p_178469_8_, p_178469_9_); } catch (Throwable throwable) -@@ -157,4 +165,52 @@ +@@ -162,4 +170,52 @@ { return this.field_147557_n; } diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySpecialRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySpecialRenderer.java.patch index adf45bb4c..165835c27 100644 --- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySpecialRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySpecialRenderer.java.patch @@ -1,9 +1,11 @@ --- ../src-base/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySpecialRenderer.java +++ ../src-work/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySpecialRenderer.java -@@ -45,4 +45,6 @@ - { +@@ -77,6 +77,8 @@ return false; } -+ + + public void renderTileEntityFast(T te, double x, double y, double z, float partialTicks, int destroyStage, net.minecraft.client.renderer.VertexBuffer buffer) {} - } ++ + protected void func_190052_a(T p_190052_1_, String p_190052_2_, double p_190052_3_, double p_190052_5_, double p_190052_7_, int p_190052_9_) + { + Entity entity = this.field_147501_a.field_147551_g; diff --git a/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java.patch b/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java.patch index 297e9f843..53804f5e3 100644 --- a/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java.patch +++ b/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java.patch @@ -1,14 +1,14 @@ --- ../src-base/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java +++ ../src-work/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java -@@ -93,6 +93,7 @@ +@@ -92,6 +92,7 @@ + public void func_110541_a(List p_110541_1_) { - this.func_110543_a(); + net.minecraftforge.fml.common.ProgressManager.ProgressBar resReload = net.minecraftforge.fml.common.ProgressManager.push("Loading Resources", p_110541_1_.size()+1, true); - field_147967_a.info("Reloading ResourceManager: " + field_130074_a.join(Iterables.transform(p_110541_1_, new Function() + this.func_110543_a(); + field_147967_a.info("Reloading ResourceManager: {}", new Object[] {field_130074_a.join(Iterables.transform(p_110541_1_, new Function() { - public String apply(@Nullable IResourcePack p_apply_1_) -@@ -103,23 +104,32 @@ +@@ -104,23 +105,32 @@ for (IResourcePack iresourcepack : p_110541_1_) { diff --git a/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch b/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch index 33730ce00..23ec79c15 100644 --- a/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch +++ b/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/client/settings/GameSettings.java +++ ../src-work/minecraft/net/minecraft/client/settings/GameSettings.java -@@ -148,6 +148,7 @@ +@@ -156,6 +156,7 @@ public GameSettings(Minecraft p_i46326_1_, File p_i46326_2_) { @@ -8,7 +8,7 @@ this.field_74324_K = (KeyBinding[])ArrayUtils.addAll(new KeyBinding[] {this.field_74312_F, this.field_74313_G, this.field_74351_w, this.field_74370_x, this.field_74368_y, this.field_74366_z, this.field_74314_A, this.field_74311_E, this.field_151444_V, this.field_74316_C, this.field_151445_Q, this.field_74310_D, this.field_74321_H, this.field_74322_I, this.field_74323_J, this.field_151447_Z, this.field_151457_aa, this.field_151458_ab, this.field_152395_am, this.field_178883_an, this.field_186718_X}, this.field_151456_ac); this.field_74318_M = EnumDifficulty.NORMAL; this.field_74332_R = ""; -@@ -172,6 +173,7 @@ +@@ -179,6 +180,7 @@ public GameSettings() { @@ -16,23 +16,27 @@ this.field_74324_K = (KeyBinding[])ArrayUtils.addAll(new KeyBinding[] {this.field_74312_F, this.field_74313_G, this.field_74351_w, this.field_74370_x, this.field_74368_y, this.field_74366_z, this.field_74314_A, this.field_74311_E, this.field_151444_V, this.field_74316_C, this.field_151445_Q, this.field_74310_D, this.field_74321_H, this.field_74322_I, this.field_74323_J, this.field_151447_Z, this.field_151457_aa, this.field_151458_ab, this.field_152395_am, this.field_178883_an, this.field_186718_X}, this.field_151456_ac); this.field_74318_M = EnumDifficulty.NORMAL; this.field_74332_R = ""; -@@ -854,6 +856,7 @@ - if (astring[0].equals("key_" + keybinding.func_151464_g())) - { - keybinding.func_151462_b(Integer.parseInt(astring[1])); -+ if (astring.length == 3) keybinding.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.valueFromString(astring[2]), Integer.parseInt(astring[1])); - } - } +@@ -547,6 +549,7 @@ -@@ -895,6 +898,7 @@ - - public void func_74303_b() + public void func_74300_a() { + if (net.minecraftforge.fml.client.FMLClientHandler.instance().isLoading()) return; try { - PrintWriter printwriter = new PrintWriter(new FileWriter(this.field_74354_ai)); -@@ -964,7 +968,8 @@ + if (!this.field_74354_ai.exists()) +@@ -887,6 +890,11 @@ + if (s1.equals("key_" + keybinding.func_151464_g())) + { + keybinding.func_151462_b(Integer.parseInt(s2)); ++ if (s2.indexOf(':') != -1) ++ { ++ String[] t = s2.split(":"); ++ keybinding.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.valueFromString(t[1]), Integer.parseInt(t[0])); ++ } + } + } + +@@ -1016,7 +1024,8 @@ for (KeyBinding keybinding : this.field_74324_K) { @@ -42,7 +46,7 @@ } for (SoundCategory soundcategory : SoundCategory.values()) -@@ -1194,4 +1199,24 @@ +@@ -1249,4 +1258,24 @@ return p_148264_1_; } } diff --git a/patches/minecraft/net/minecraft/command/CommandFill.java.patch b/patches/minecraft/net/minecraft/command/CommandFill.java.patch index a46078847..ba7356a85 100644 --- a/patches/minecraft/net/minecraft/command/CommandFill.java.patch +++ b/patches/minecraft/net/minecraft/command/CommandFill.java.patch @@ -21,8 +21,8 @@ continue; } } -- else if (p_184881_3_[8].equals("replace") && !block.func_149716_u()) -+ else if (p_184881_3_[8].equals("replace") && !block.hasTileEntity(state)) +- else if ("replace".equals(p_184881_3_[8]) && !block.func_149716_u()) ++ else if ("replace".equals(p_184881_3_[8]) && !block.hasTileEntity(state)) { if (p_184881_3_.length > 9) { diff --git a/patches/minecraft/net/minecraft/command/CommandHandler.java.patch b/patches/minecraft/net/minecraft/command/CommandHandler.java.patch index 83be37bcc..2888426d9 100644 --- a/patches/minecraft/net/minecraft/command/CommandHandler.java.patch +++ b/patches/minecraft/net/minecraft/command/CommandHandler.java.patch @@ -21,7 +21,7 @@ TextComponentTranslation textcomponenttranslation = new TextComponentTranslation("commands.generic.exception", new Object[0]); textcomponenttranslation.func_150256_b().func_150238_a(TextFormatting.RED); p_175786_1_.func_145747_a(textcomponenttranslation); -- field_147175_a.warn("Couldn\'t process command: \'" + p_175786_4_ + "\'"); +- field_147175_a.warn("Couldn\'t process command: \'{}\'", new Object[] {p_175786_4_}); + field_147175_a.warn("Couldn\'t process command: \'" + p_175786_4_ + "\'", var9); } diff --git a/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.java.patch b/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.java.patch index 85d71dd20..e501e6bc9 100644 --- a/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.java.patch +++ b/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/enchantment/EnchantmentHelper.java +++ ../src-work/minecraft/net/minecraft/enchantment/EnchantmentHelper.java -@@ -294,7 +294,7 @@ +@@ -299,7 +299,7 @@ public static int func_77514_a(Random p_77514_0_, int p_77514_1_, int p_77514_2_, ItemStack p_77514_3_) { Item item = p_77514_3_.func_77973_b(); @@ -9,7 +9,7 @@ if (i <= 0) { -@@ -341,7 +341,7 @@ +@@ -346,7 +346,7 @@ { List list = Lists.newArrayList(); Item item = p_77513_1_.func_77973_b(); @@ -18,7 +18,7 @@ if (i <= 0) { -@@ -382,7 +382,8 @@ +@@ -387,7 +387,8 @@ while (iterator.hasNext()) { @@ -28,7 +28,7 @@ { iterator.remove(); } -@@ -397,7 +398,7 @@ +@@ -402,7 +403,7 @@ for (Enchantment enchantment : Enchantment.field_185264_b) { diff --git a/patches/minecraft/net/minecraft/entity/Entity.java.patch b/patches/minecraft/net/minecraft/entity/Entity.java.patch index e0550d393..d6572aada 100644 --- a/patches/minecraft/net/minecraft/entity/Entity.java.patch +++ b/patches/minecraft/net/minecraft/entity/Entity.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/Entity.java +++ ../src-work/minecraft/net/minecraft/entity/Entity.java -@@ -77,7 +77,7 @@ +@@ -78,7 +78,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -9,7 +9,7 @@ { private static final Logger field_184243_a = LogManager.getLogger(); private static final AxisAlignedBB field_174836_a = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D); -@@ -188,7 +188,7 @@ +@@ -190,7 +190,7 @@ if (p_i1582_1_ != null) { @@ -18,9 +18,9 @@ } this.field_70180_af = new EntityDataManager(this); -@@ -198,8 +198,16 @@ - this.field_70180_af.func_187214_a(field_184242_az, ""); +@@ -201,8 +201,16 @@ this.field_70180_af.func_187214_a(field_184234_aB, Boolean.valueOf(false)); + this.field_70180_af.func_187214_a(field_189655_aD, Boolean.valueOf(false)); this.func_70088_a(); + net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.entity.EntityEvent.EntityConstructing(this)); + capabilities = net.minecraftforge.event.ForgeEventFactory.gatherCapabilities(this); @@ -35,7 +35,7 @@ public int func_145782_y() { return this.field_145783_c; -@@ -1138,12 +1146,12 @@ +@@ -1151,12 +1159,12 @@ BlockPos blockpos = new BlockPos(this.field_70165_t, d0, this.field_70161_v); IBlockState iblockstate = this.field_70170_p.func_180495_p(blockpos); @@ -52,7 +52,7 @@ } else { -@@ -1539,6 +1547,9 @@ +@@ -1568,6 +1576,9 @@ p_189511_1_.func_74782_a("Tags", nbttaglist); } @@ -62,8 +62,8 @@ this.func_70014_b(p_189511_1_); if (this.func_184207_aI()) -@@ -1637,6 +1648,9 @@ - this.func_174810_b(p_70020_1_.func_74767_n("Silent")); +@@ -1675,6 +1686,9 @@ + this.func_189654_d(p_70020_1_.func_74767_n("NoGravity")); this.func_184195_f(p_70020_1_.func_74767_n("Glowing")); + if (p_70020_1_.func_74764_b("ForgeData")) customEntityData = p_70020_1_.func_74775_l("ForgeData"); @@ -72,7 +72,7 @@ if (p_70020_1_.func_150297_b("Tags", 9)) { this.field_184236_aF.clear(); -@@ -1723,7 +1737,10 @@ +@@ -1757,7 +1771,10 @@ { EntityItem entityitem = new EntityItem(this.field_70170_p, this.field_70165_t, this.field_70163_u + (double)p_70099_2_, this.field_70161_v, p_70099_1_); entityitem.func_174869_p(); @@ -84,7 +84,7 @@ return entityitem; } else -@@ -1833,6 +1850,7 @@ +@@ -1867,6 +1884,7 @@ public boolean func_184205_a(Entity p_184205_1_, boolean p_184205_2_) { @@ -92,7 +92,7 @@ if (p_184205_2_ || this.func_184228_n(p_184205_1_) && p_184205_1_.func_184219_q(this)) { if (this.func_184218_aH()) -@@ -2289,6 +2307,7 @@ +@@ -2336,6 +2354,7 @@ { if (!this.field_70170_p.field_72995_K && !this.field_70128_L) { @@ -100,7 +100,7 @@ this.field_70170_p.field_72984_F.func_76320_a("changeDimension"); MinecraftServer minecraftserver = this.func_184102_h(); int i = this.field_71093_bK; -@@ -2382,7 +2401,7 @@ +@@ -2429,7 +2448,7 @@ public float func_180428_a(Explosion p_180428_1_, World p_180428_2_, BlockPos p_180428_3_, IBlockState p_180428_4_) { @@ -109,7 +109,7 @@ } public boolean func_174816_a(Explosion p_174816_1_, World p_174816_2_, BlockPos p_174816_3_, IBlockState p_174816_4_, float p_174816_5_) -@@ -2679,6 +2698,164 @@ +@@ -2726,6 +2745,164 @@ EnchantmentHelper.func_151385_b(p_174815_1_, p_174815_2_); } diff --git a/patches/minecraft/net/minecraft/entity/EntityHanging.java.patch b/patches/minecraft/net/minecraft/entity/EntityHanging.java.patch index cfa772921..c45f2b206 100644 --- a/patches/minecraft/net/minecraft/entity/EntityHanging.java.patch +++ b/patches/minecraft/net/minecraft/entity/EntityHanging.java.patch @@ -1,10 +1,10 @@ --- ../src-base/minecraft/net/minecraft/entity/EntityHanging.java +++ ../src-work/minecraft/net/minecraft/entity/EntityHanging.java -@@ -141,6 +141,9 @@ - BlockPos blockpos1 = blockpos.func_177967_a(enumfacing, k + i1).func_177981_b(l + j1); - IBlockState iblockstate = this.field_70170_p.func_180495_p(blockpos1); +@@ -144,6 +144,9 @@ + blockpos$mutableblockpos.func_189533_g(blockpos).func_189534_c(enumfacing, k + i1).func_189534_c(EnumFacing.UP, l + j1); + IBlockState iblockstate = this.field_70170_p.func_180495_p(blockpos$mutableblockpos); -+ if (iblockstate.isSideSolid(this.field_70170_p, blockpos1, this.field_174860_b)) ++ if (iblockstate.isSideSolid(this.field_70170_p, blockpos$mutableblockpos, this.field_174860_b)) + continue; + if (!iblockstate.func_185904_a().func_76220_a() && !BlockRedstoneDiode.func_185546_B(iblockstate)) diff --git a/patches/minecraft/net/minecraft/entity/EntityList.java.patch b/patches/minecraft/net/minecraft/entity/EntityList.java.patch index ca7396ad2..c306cf7b0 100644 --- a/patches/minecraft/net/minecraft/entity/EntityList.java.patch +++ b/patches/minecraft/net/minecraft/entity/EntityList.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/EntityList.java +++ ../src-work/minecraft/net/minecraft/entity/EntityList.java -@@ -92,6 +92,7 @@ +@@ -93,6 +93,7 @@ public static void func_75618_a(Class p_75618_0_, String p_75618_1_, int p_75618_2_) { @@ -8,7 +8,7 @@ if (field_75625_b.containsKey(p_75618_1_)) { throw new IllegalArgumentException("ID is already registered: " + p_75618_1_); -@@ -151,9 +152,10 @@ +@@ -152,9 +153,10 @@ { Entity entity = null; @@ -20,7 +20,7 @@ if (oclass != null) { -@@ -167,7 +169,17 @@ +@@ -168,7 +170,17 @@ if (entity != null) { @@ -38,7 +38,7 @@ } else { -@@ -207,7 +219,8 @@ +@@ -208,7 +220,8 @@ @Nullable public static Entity func_188429_b(String p_188429_0_, World p_188429_1_) { diff --git a/patches/minecraft/net/minecraft/entity/EntityLiving.java.patch b/patches/minecraft/net/minecraft/entity/EntityLiving.java.patch index c0a795da8..a24764760 100644 --- a/patches/minecraft/net/minecraft/entity/EntityLiving.java.patch +++ b/patches/minecraft/net/minecraft/entity/EntityLiving.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/EntityLiving.java +++ ../src-work/minecraft/net/minecraft/entity/EntityLiving.java -@@ -174,6 +174,7 @@ +@@ -170,6 +170,7 @@ public void func_70624_b(@Nullable EntityLivingBase p_70624_1_) { this.field_70696_bz = p_70624_1_; @@ -8,7 +8,7 @@ } public boolean func_70686_a(Class p_70686_1_) -@@ -705,10 +706,22 @@ +@@ -712,10 +713,22 @@ protected void func_70623_bb() { @@ -31,7 +31,7 @@ else { Entity entity = this.field_70170_p.func_72890_a(this, -1.0D); -@@ -841,7 +854,6 @@ +@@ -849,7 +862,6 @@ return !this.field_70170_p.func_72953_d(this.func_174813_aQ()) && this.field_70170_p.func_184144_a(this, this.func_174813_aQ()).isEmpty() && this.field_70170_p.func_72917_a(this.func_174813_aQ(), this); } diff --git a/patches/minecraft/net/minecraft/entity/EntityLivingBase.java.patch b/patches/minecraft/net/minecraft/entity/EntityLivingBase.java.patch index aaf06f3bc..c842cddc9 100644 --- a/patches/minecraft/net/minecraft/entity/EntityLivingBase.java.patch +++ b/patches/minecraft/net/minecraft/entity/EntityLivingBase.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/EntityLivingBase.java +++ ../src-work/minecraft/net/minecraft/entity/EntityLivingBase.java -@@ -191,10 +191,11 @@ +@@ -193,10 +193,11 @@ { float f = (float)MathHelper.func_76123_f(this.field_70143_R - 3.0F); @@ -13,7 +13,7 @@ ((WorldServer)this.field_70170_p).func_175739_a(EnumParticleTypes.BLOCK_DUST, this.field_70165_t, this.field_70163_u, this.field_70161_v, i, 0.0D, 0.0D, 0.0D, 0.15000000596046448D, new int[] {Block.func_176210_f(p_184231_4_)}); } } -@@ -271,7 +272,7 @@ +@@ -273,7 +274,7 @@ } } @@ -22,7 +22,7 @@ { this.func_184210_p(); } -@@ -370,7 +371,7 @@ +@@ -372,7 +373,7 @@ if (!this.field_70170_p.field_72995_K && (this.func_70684_aJ() || this.field_70718_bc > 0 && this.func_146066_aG() && this.field_70170_p.func_82736_K().func_82766_b("doMobLoot"))) { int i = this.func_70693_a(this.field_70717_bb); @@ -31,7 +31,7 @@ while (i > 0) { int j = EntityXPOrb.func_70527_a(i); -@@ -431,6 +432,7 @@ +@@ -433,6 +434,7 @@ { this.field_70755_b = p_70604_1_; this.field_70756_c = this.field_70173_aa; @@ -39,7 +39,7 @@ } public EntityLivingBase func_110144_aD() -@@ -784,6 +786,8 @@ +@@ -793,6 +795,8 @@ public void func_70691_i(float p_70691_1_) { @@ -48,7 +48,7 @@ float f = this.func_110143_aJ(); if (f > 0.0F) -@@ -804,6 +808,7 @@ +@@ -813,6 +817,7 @@ public boolean func_70097_a(DamageSource p_70097_1_, float p_70097_2_) { @@ -56,7 +56,7 @@ if (this.func_180431_b(p_70097_1_)) { return false; -@@ -892,9 +897,9 @@ +@@ -902,9 +907,9 @@ this.field_70718_bc = 100; this.field_70717_bb = (EntityPlayer)entity; } @@ -68,7 +68,7 @@ if (entitywolf.func_70909_n()) { -@@ -1016,6 +1021,7 @@ +@@ -1043,6 +1048,7 @@ public void func_70645_a(DamageSource p_70645_1_) { @@ -76,7 +76,7 @@ if (!this.field_70729_aU) { Entity entity = p_70645_1_.func_76346_g(); -@@ -1043,11 +1049,24 @@ +@@ -1070,11 +1076,24 @@ i = EnchantmentHelper.func_185283_h((EntityLivingBase)entity); } @@ -101,7 +101,7 @@ } this.field_70170_p.func_72960_a(this, (byte)3); -@@ -1124,7 +1143,7 @@ +@@ -1151,7 +1170,7 @@ BlockPos blockpos = new BlockPos(i, j, k); IBlockState iblockstate = this.field_70170_p.func_180495_p(blockpos); Block block = iblockstate.func_177230_c(); @@ -110,7 +110,7 @@ } } -@@ -1150,6 +1169,9 @@ +@@ -1177,6 +1196,9 @@ public void func_180430_e(float p_180430_1_, float p_180430_2_) { @@ -120,7 +120,7 @@ super.func_180430_e(p_180430_1_, p_180430_2_); PotionEffect potioneffect = this.func_70660_b(MobEffects.field_76430_j); float f = potioneffect == null ? 0.0F : (float)(potioneffect.func_76458_c() + 1); -@@ -1242,6 +1264,8 @@ +@@ -1270,6 +1292,8 @@ { if (!this.func_180431_b(p_70665_1_)) { @@ -129,7 +129,7 @@ p_70665_2_ = this.func_70655_b(p_70665_1_, p_70665_2_); p_70665_2_ = this.func_70672_c(p_70665_1_, p_70665_2_); float f = p_70665_2_; -@@ -1290,6 +1314,11 @@ +@@ -1319,6 +1343,11 @@ public void func_184609_a(EnumHand p_184609_1_) { @@ -141,7 +141,7 @@ if (!this.field_82175_bq || this.field_110158_av >= this.func_82166_i() / 2 || this.field_110158_av < 0) { this.field_110158_av = -1; -@@ -1491,6 +1520,7 @@ +@@ -1521,6 +1550,7 @@ public void func_110145_l(Entity p_110145_1_) { @@ -149,7 +149,7 @@ if (!(p_110145_1_ instanceof EntityBoat) && !(p_110145_1_ instanceof EntityHorse)) { double d1 = p_110145_1_.field_70165_t; -@@ -1515,7 +1545,7 @@ +@@ -1545,7 +1575,7 @@ if (!this.field_70170_p.func_184143_b(axisalignedbb1)) { @@ -158,7 +158,7 @@ { this.func_70634_a(d11, this.field_70163_u + 1.0D, d12); return; -@@ -1523,14 +1553,14 @@ +@@ -1553,14 +1583,14 @@ BlockPos blockpos = new BlockPos(d11, this.field_70163_u - 1.0D, d12); @@ -175,7 +175,7 @@ { d1 = d11; d13 = this.field_70163_u + 2.0D; -@@ -1601,6 +1631,7 @@ +@@ -1631,6 +1661,7 @@ } this.field_70160_al = true; @@ -183,7 +183,7 @@ } protected void func_70629_bd() -@@ -1860,6 +1891,7 @@ +@@ -1903,6 +1934,7 @@ public void func_70071_h_() { @@ -191,7 +191,7 @@ super.func_70071_h_(); this.func_184608_ct(); -@@ -2366,6 +2398,40 @@ +@@ -2409,6 +2441,40 @@ this.field_70752_e = true; } @@ -232,7 +232,7 @@ public abstract EnumHandSide func_184591_cq(); public boolean func_184587_cr() -@@ -2386,12 +2452,19 @@ +@@ -2429,12 +2495,19 @@ if (itemstack == this.field_184627_bm) { @@ -253,7 +253,7 @@ { this.func_71036_o(); } -@@ -2409,8 +2482,10 @@ +@@ -2452,8 +2525,10 @@ if (itemstack != null && !this.func_184587_cr()) { @@ -265,7 +265,7 @@ if (!this.field_70170_p.field_72995_K) { -@@ -2493,6 +2568,8 @@ +@@ -2536,6 +2611,8 @@ this.func_184584_a(this.field_184627_bm, 16); ItemStack itemstack = this.field_184627_bm.func_77950_b(this.field_70170_p, this); @@ -274,7 +274,7 @@ if (itemstack != null && itemstack.field_77994_a == 0) { itemstack = null; -@@ -2523,7 +2600,8 @@ +@@ -2566,7 +2643,8 @@ { if (this.field_184627_bm != null) { @@ -284,7 +284,7 @@ } this.func_184602_cy(); -@@ -2642,4 +2720,28 @@ +@@ -2685,4 +2763,28 @@ { return true; } diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIAttackMelee.java.patch b/patches/minecraft/net/minecraft/entity/ai/EntityAIAttackMelee.java.patch index 2962e3ed5..515c3f8f5 100644 --- a/patches/minecraft/net/minecraft/entity/ai/EntityAIAttackMelee.java.patch +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIAttackMelee.java.patch @@ -29,7 +29,7 @@ this.field_75438_g = this.field_75441_b.func_70661_as().func_75494_a(entitylivingbase); return this.field_75438_g != null; } -@@ -89,6 +104,23 @@ +@@ -88,6 +103,23 @@ this.field_151496_k = entitylivingbase.field_70161_v; this.field_75445_i = 4 + this.field_75441_b.func_70681_au().nextInt(7); diff --git a/patches/minecraft/net/minecraft/entity/boss/EntityDragon.java.patch b/patches/minecraft/net/minecraft/entity/boss/EntityDragon.java.patch index 72ccd5a0a..088ed3963 100644 --- a/patches/minecraft/net/minecraft/entity/boss/EntityDragon.java.patch +++ b/patches/minecraft/net/minecraft/entity/boss/EntityDragon.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/boss/EntityDragon.java +++ ../src-work/minecraft/net/minecraft/entity/boss/EntityDragon.java -@@ -475,13 +475,13 @@ +@@ -481,13 +481,13 @@ IBlockState iblockstate = this.field_70170_p.func_180495_p(blockpos); Block block = iblockstate.func_177230_c(); diff --git a/patches/minecraft/net/minecraft/entity/boss/EntityWither.java.patch b/patches/minecraft/net/minecraft/entity/boss/EntityWither.java.patch index 541e55bde..c68ec555f 100644 --- a/patches/minecraft/net/minecraft/entity/boss/EntityWither.java.patch +++ b/patches/minecraft/net/minecraft/entity/boss/EntityWither.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/boss/EntityWither.java +++ ../src-work/minecraft/net/minecraft/entity/boss/EntityWither.java -@@ -366,7 +366,7 @@ +@@ -372,7 +372,7 @@ IBlockState iblockstate = this.field_70170_p.func_180495_p(blockpos); Block block = iblockstate.func_177230_c(); diff --git a/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.java.patch b/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.java.patch index 2e5a3e8f9..023e80b51 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.java.patch +++ b/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/item/EntityEnderPearl.java +++ ../src-work/minecraft/net/minecraft/entity/item/EntityEnderPearl.java -@@ -84,6 +84,9 @@ +@@ -90,6 +90,9 @@ if (entityplayermp.field_71135_a.func_147362_b().func_150724_d() && entityplayermp.field_70170_p == this.field_70170_p && !entityplayermp.func_70608_bn()) { @@ -10,8 +10,8 @@ if (this.field_70146_Z.nextFloat() < 0.05F && this.field_70170_p.func_82736_K().func_82766_b("doMobSpawning")) { EntityEndermite entityendermite = new EntityEndermite(this.field_70170_p); -@@ -97,9 +100,10 @@ - this.func_184210_p(); +@@ -103,9 +106,10 @@ + entitylivingbase.func_184210_p(); } - entitylivingbase.func_70634_a(this.field_70165_t, this.field_70163_u, this.field_70161_v); diff --git a/patches/minecraft/net/minecraft/entity/item/EntityFallingBlock.java.patch b/patches/minecraft/net/minecraft/entity/item/EntityFallingBlock.java.patch index d92bedd8b..503b46aaa 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityFallingBlock.java.patch +++ b/patches/minecraft/net/minecraft/entity/item/EntityFallingBlock.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/item/EntityFallingBlock.java +++ ../src-work/minecraft/net/minecraft/entity/item/EntityFallingBlock.java -@@ -130,6 +130,7 @@ +@@ -135,6 +135,7 @@ { IBlockState iblockstate = this.field_70170_p.func_180495_p(blockpos1); diff --git a/patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch b/patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch index 8adc92b8e..8c5a2cc5e 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch +++ b/patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/item/EntityItem.java +++ ../src-work/minecraft/net/minecraft/entity/item/EntityItem.java -@@ -38,6 +38,11 @@ +@@ -41,6 +41,11 @@ private String field_145802_g; public float field_70290_d; @@ -12,7 +12,7 @@ public EntityItem(World p_i1709_1_, double p_i1709_2_, double p_i1709_4_, double p_i1709_6_) { super(p_i1709_1_); -@@ -55,6 +60,7 @@ +@@ -58,6 +63,7 @@ { this(p_i1710_1_, p_i1710_2_, p_i1710_4_, p_i1710_6_); this.func_92058_a(p_i1710_8_); @@ -20,7 +20,7 @@ } protected boolean func_70041_e_() -@@ -78,6 +84,8 @@ +@@ -81,6 +87,8 @@ public void func_70071_h_() { @@ -29,7 +29,7 @@ if (this.func_92059_d() == null) { this.func_70106_y(); -@@ -138,8 +146,16 @@ +@@ -146,8 +154,16 @@ this.func_70072_I(); @@ -47,7 +47,7 @@ this.func_70106_y(); } } -@@ -196,6 +212,10 @@ +@@ -204,6 +220,10 @@ { return false; } @@ -58,7 +58,7 @@ else { itemstack1.field_77994_a += itemstack.field_77994_a; -@@ -280,6 +300,7 @@ +@@ -293,6 +313,7 @@ p_70014_1_.func_74777_a("Health", (short)this.field_70291_e); p_70014_1_.func_74777_a("Age", (short)this.field_70292_b); p_70014_1_.func_74777_a("PickupDelay", (short)this.field_145804_b); @@ -66,7 +66,7 @@ if (this.func_145800_j() != null) { -@@ -320,20 +341,23 @@ +@@ -333,20 +354,23 @@ NBTTagCompound nbttagcompound = p_70037_1_.func_74775_l("Item"); this.func_92058_a(ItemStack.func_77949_a(nbttagcompound)); @@ -95,7 +95,7 @@ { if (itemstack.func_77973_b() == Item.func_150898_a(Blocks.field_150364_r)) { -@@ -370,6 +394,7 @@ +@@ -383,6 +407,7 @@ } } @@ -103,19 +103,19 @@ if (!this.func_174814_R()) { this.field_70170_p.func_184148_a((EntityPlayer)null, p_70100_1_.field_70165_t, p_70100_1_.field_70163_u, p_70100_1_.field_70161_v, SoundEvents.field_187638_cR, SoundCategory.PLAYERS, 0.2F, ((this.field_70146_Z.nextFloat() - this.field_70146_Z.nextFloat()) * 0.7F + 1.0F) * 2.0F); -@@ -416,11 +441,6 @@ +@@ -429,11 +454,6 @@ if (itemstack == null) { - if (this.field_70170_p != null) - { -- field_145803_d.error("Item entity " + this.func_145782_y() + " has no item?!"); +- field_145803_d.error("Item entity {} has no item?!", new Object[] {Integer.valueOf(this.func_145782_y())}); - } - return new ItemStack(Blocks.field_150348_b); } else -@@ -494,6 +514,6 @@ +@@ -507,6 +527,6 @@ public void func_174870_v() { this.func_174871_r(); diff --git a/patches/minecraft/net/minecraft/entity/item/EntityItemFrame.java.patch b/patches/minecraft/net/minecraft/entity/item/EntityItemFrame.java.patch index 6491831b4..0df5cd919 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityItemFrame.java.patch +++ b/patches/minecraft/net/minecraft/entity/item/EntityItemFrame.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/item/EntityItemFrame.java +++ ../src-work/minecraft/net/minecraft/entity/item/EntityItemFrame.java -@@ -138,7 +138,7 @@ +@@ -141,7 +141,7 @@ { if (p_110131_1_ != null) { diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecart.java.patch b/patches/minecraft/net/minecraft/entity/item/EntityMinecart.java.patch index fc9c5cd4e..96d1aaebd 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityMinecart.java.patch +++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecart.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/item/EntityMinecart.java +++ ../src-work/minecraft/net/minecraft/entity/item/EntityMinecart.java -@@ -55,6 +55,20 @@ +@@ -58,6 +58,20 @@ @SideOnly(Side.CLIENT) private double field_70506_as; @@ -21,7 +21,7 @@ public EntityMinecart(World p_i1712_1_) { super(p_i1712_1_); -@@ -101,18 +115,20 @@ +@@ -104,18 +118,20 @@ @Nullable public AxisAlignedBB func_70114_g(Entity p_70114_1_) { @@ -43,7 +43,7 @@ } public EntityMinecart(World p_i1713_1_, double p_i1713_2_, double p_i1713_4_, double p_i1713_6_) -@@ -318,7 +334,7 @@ +@@ -326,7 +342,7 @@ BlockPos blockpos = new BlockPos(k, l, i1); IBlockState iblockstate = this.field_70170_p.func_180495_p(blockpos); @@ -52,19 +52,32 @@ { this.func_180460_a(blockpos, iblockstate); -@@ -357,7 +373,10 @@ +@@ -365,9 +381,13 @@ this.func_70101_b(this.field_70177_z, this.field_70125_A); -- for (Entity entity : this.field_70170_p.func_72839_b(this, this.func_174813_aQ().func_72314_b(0.20000000298023224D, 0.0D, 0.20000000298023224D))) +- if (this.func_184264_v() == EntityMinecart.Type.RIDEABLE && this.field_70159_w * this.field_70159_w + this.field_70179_y * this.field_70179_y > 0.01D) + AxisAlignedBB box; + if (getCollisionHandler() != null) box = getCollisionHandler().getMinecartCollisionBox(this); + else box = this.func_174813_aQ().func_72314_b(0.20000000298023224D, 0.0D, 0.20000000298023224D); -+ for (Entity entity : this.field_70170_p.func_72839_b(this, box)) ++ ++ if (canBeRidden() && this.field_70159_w * this.field_70159_w + this.field_70179_y * this.field_70179_y > 0.01D) { - if (!this.func_184196_w(entity) && entity.func_70104_M() && entity instanceof EntityMinecart) +- List list = this.field_70170_p.func_175674_a(this, this.func_174813_aQ().func_72314_b(0.20000000298023224D, 0.0D, 0.20000000298023224D), EntitySelectors.func_188442_a(this)); ++ List list = this.field_70170_p.func_175674_a(this, box, EntitySelectors.func_188442_a(this)); + + if (!list.isEmpty()) { -@@ -366,6 +385,7 @@ +@@ -388,7 +408,7 @@ + } + else + { +- for (Entity entity : this.field_70170_p.func_72839_b(this, this.func_174813_aQ().func_72314_b(0.20000000298023224D, 0.0D, 0.20000000298023224D))) ++ for (Entity entity : this.field_70170_p.func_72839_b(this, box)) + { + if (!this.func_184196_w(entity) && entity.func_70104_M() && entity instanceof EntityMinecart) + { +@@ -398,6 +418,7 @@ } this.func_70072_I(); @@ -72,7 +85,7 @@ } } -@@ -380,10 +400,21 @@ +@@ -412,10 +433,21 @@ protected void func_180459_n() { @@ -95,7 +108,7 @@ if (this.field_70122_E) { this.field_70159_w *= 0.5D; -@@ -391,13 +422,13 @@ +@@ -423,13 +455,13 @@ this.field_70179_y *= 0.5D; } @@ -113,7 +126,7 @@ } } -@@ -417,25 +448,25 @@ +@@ -449,25 +481,25 @@ flag1 = !flag; } @@ -145,7 +158,7 @@ ++this.field_70163_u; } -@@ -481,7 +512,7 @@ +@@ -513,7 +545,7 @@ } } @@ -154,9 +167,9 @@ { double d17 = Math.sqrt(this.field_70159_w * this.field_70159_w + this.field_70179_y * this.field_70179_y); -@@ -527,20 +558,8 @@ - this.field_70165_t = d19 + d1 * d18; - this.field_70161_v = d20 + d2 * d18; +@@ -559,20 +591,8 @@ + this.field_70165_t = d18 + d1 * d10; + this.field_70161_v = d19 + d2 * d10; this.func_70107_b(this.field_70165_t, this.field_70163_u, this.field_70161_v); - double d22 = this.field_70159_w; - double d23 = this.field_70179_y; @@ -176,7 +189,7 @@ if (aint[0][1] != 0 && MathHelper.func_76128_c(this.field_70165_t) - p_180460_1_.func_177958_n() == aint[0][0] && MathHelper.func_76128_c(this.field_70161_v) - p_180460_1_.func_177952_p() == aint[0][2]) { this.func_70107_b(this.field_70165_t, this.field_70163_u + (double)aint[0][1], this.field_70161_v); -@@ -577,8 +596,14 @@ +@@ -609,8 +629,14 @@ this.field_70179_y = d5 * (double)(i - p_180460_1_.func_177952_p()); } @@ -192,7 +205,7 @@ double d15 = Math.sqrt(this.field_70159_w * this.field_70159_w + this.field_70179_y * this.field_70179_y); if (d15 > 0.01D) -@@ -798,13 +823,19 @@ +@@ -832,6 +858,12 @@ public void func_70108_f(Entity p_70108_1_) { @@ -205,15 +218,7 @@ if (!this.field_70170_p.field_72995_K) { if (!p_70108_1_.field_70145_X && !this.field_70145_X) - { - if (!this.func_184196_w(p_70108_1_)) - { -- if (p_70108_1_ instanceof EntityLivingBase && this.func_184264_v() == EntityMinecart.Type.RIDEABLE && this.field_70159_w * this.field_70159_w + this.field_70179_y * this.field_70179_y > 0.01D && !(p_70108_1_ instanceof EntityPlayer) && !(p_70108_1_ instanceof EntityIronGolem) && !this.func_184207_aI() && !p_70108_1_.func_184218_aH()) -+ if (p_70108_1_ instanceof EntityLivingBase && canBeRidden() && this.field_70159_w * this.field_70159_w + this.field_70179_y * this.field_70179_y > 0.01D && !(p_70108_1_ instanceof EntityPlayer) && !(p_70108_1_ instanceof EntityIronGolem) && !this.func_184207_aI() && !p_70108_1_.func_184218_aH()) - { - p_70108_1_.func_184220_m(this); - } -@@ -850,7 +881,7 @@ +@@ -879,7 +911,7 @@ double d7 = p_70108_1_.field_70159_w + this.field_70159_w; double d8 = p_70108_1_.field_70179_y + this.field_70179_y; @@ -222,7 +227,7 @@ { this.field_70159_w *= 0.20000000298023224D; this.field_70179_y *= 0.20000000298023224D; -@@ -858,7 +889,7 @@ +@@ -887,7 +919,7 @@ p_70108_1_.field_70159_w *= 0.949999988079071D; p_70108_1_.field_70179_y *= 0.949999988079071D; } @@ -231,7 +236,7 @@ { p_70108_1_.field_70159_w *= 0.20000000298023224D; p_70108_1_.field_70179_y *= 0.20000000298023224D; -@@ -985,6 +1016,221 @@ +@@ -1017,6 +1049,221 @@ this.func_184212_Q().func_187227_b(field_184270_f, Boolean.valueOf(p_94096_1_)); } diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartCommandBlock.java.patch b/patches/minecraft/net/minecraft/entity/item/EntityMinecartCommandBlock.java.patch index 6a79a62ac..3f65941ca 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartCommandBlock.java.patch +++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartCommandBlock.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/item/EntityMinecartCommandBlock.java +++ ../src-work/minecraft/net/minecraft/entity/item/EntityMinecartCommandBlock.java -@@ -123,6 +123,7 @@ +@@ -146,6 +146,7 @@ public boolean func_184230_a(EntityPlayer p_184230_1_, @Nullable ItemStack p_184230_2_, EnumHand p_184230_3_) { diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartContainer.java.patch b/patches/minecraft/net/minecraft/entity/item/EntityMinecartContainer.java.patch index a41e2ece8..dbb8c3e64 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartContainer.java.patch +++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartContainer.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/item/EntityMinecartContainer.java +++ ../src-work/minecraft/net/minecraft/entity/item/EntityMinecartContainer.java -@@ -200,6 +200,7 @@ +@@ -209,6 +209,7 @@ public boolean func_184230_a(EntityPlayer p_184230_1_, @Nullable ItemStack p_184230_2_, EnumHand p_184230_3_) { @@ -8,7 +8,7 @@ if (!this.field_70170_p.field_72995_K) { p_184230_1_.func_71007_a(this); -@@ -279,6 +280,25 @@ +@@ -288,6 +289,25 @@ } } diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.java.patch b/patches/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.java.patch index 07f5bb16e..f562c5ed9 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.java.patch +++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.java +++ ../src-work/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.java -@@ -20,6 +20,8 @@ +@@ -26,6 +26,8 @@ public boolean func_184230_a(EntityPlayer p_184230_1_, @Nullable ItemStack p_184230_2_, EnumHand p_184230_3_) { diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartFurnace.java.patch b/patches/minecraft/net/minecraft/entity/item/EntityMinecartFurnace.java.patch index 8eac7c184..84b3bfc1b 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartFurnace.java.patch +++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartFurnace.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/item/EntityMinecartFurnace.java +++ ../src-work/minecraft/net/minecraft/entity/item/EntityMinecartFurnace.java -@@ -137,6 +137,8 @@ +@@ -144,6 +144,8 @@ public boolean func_184230_a(EntityPlayer p_184230_1_, @Nullable ItemStack p_184230_2_, EnumHand p_184230_3_) { diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartHopper.java.patch b/patches/minecraft/net/minecraft/entity/item/EntityMinecartHopper.java.patch index 8f4fa759a..0f8e58e27 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartHopper.java.patch +++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartHopper.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/item/EntityMinecartHopper.java +++ ../src-work/minecraft/net/minecraft/entity/item/EntityMinecartHopper.java -@@ -57,6 +57,7 @@ +@@ -58,6 +58,7 @@ public boolean func_184230_a(EntityPlayer p_184230_1_, @Nullable ItemStack p_184230_2_, EnumHand p_184230_3_) { diff --git a/patches/minecraft/net/minecraft/entity/item/EntityXPOrb.java.patch b/patches/minecraft/net/minecraft/entity/item/EntityXPOrb.java.patch index dbdf0519d..a3dd5f748 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityXPOrb.java.patch +++ b/patches/minecraft/net/minecraft/entity/item/EntityXPOrb.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/item/EntityXPOrb.java +++ ../src-work/minecraft/net/minecraft/entity/item/EntityXPOrb.java -@@ -204,6 +204,7 @@ +@@ -208,6 +208,7 @@ { if (this.field_70532_c == 0 && p_70100_1_.field_71090_bL == 0) { diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityEnderman.java.patch b/patches/minecraft/net/minecraft/entity/monster/EntityEnderman.java.patch index 1a1f5343d..2e17729ae 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityEnderman.java.patch +++ b/patches/minecraft/net/minecraft/entity/monster/EntityEnderman.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/monster/EntityEnderman.java +++ ../src-work/minecraft/net/minecraft/entity/monster/EntityEnderman.java -@@ -260,7 +260,9 @@ +@@ -267,7 +267,9 @@ private boolean func_70825_j(double p_70825_1_, double p_70825_3_, double p_70825_5_) { @@ -11,7 +11,7 @@ if (flag) { -@@ -345,6 +347,18 @@ +@@ -358,6 +360,18 @@ } } diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityMagmaCube.java.patch b/patches/minecraft/net/minecraft/entity/monster/EntityMagmaCube.java.patch index 5e43e090b..14f6a4bc4 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityMagmaCube.java.patch +++ b/patches/minecraft/net/minecraft/entity/monster/EntityMagmaCube.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/monster/EntityMagmaCube.java +++ ../src-work/minecraft/net/minecraft/entity/monster/EntityMagmaCube.java -@@ -88,6 +88,7 @@ +@@ -95,6 +95,7 @@ { this.field_70181_x = (double)(0.42F + (float)this.func_70809_q() * 0.1F); this.field_70160_al = true; diff --git a/patches/minecraft/net/minecraft/entity/monster/EntitySlime.java.patch b/patches/minecraft/net/minecraft/entity/monster/EntitySlime.java.patch index 8d52e35be..ae4d1e232 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntitySlime.java.patch +++ b/patches/minecraft/net/minecraft/entity/monster/EntitySlime.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/monster/EntitySlime.java +++ ../src-work/minecraft/net/minecraft/entity/monster/EntitySlime.java -@@ -126,7 +126,7 @@ +@@ -132,7 +132,7 @@ if (this.field_70122_E && !this.field_175452_bi) { int i = this.func_70809_q(); @@ -9,7 +9,7 @@ for (int j = 0; j < i * 8; ++j) { float f = this.field_70146_Z.nextFloat() * ((float)Math.PI * 2F); -@@ -293,7 +293,7 @@ +@@ -299,7 +299,7 @@ BlockPos blockpos = new BlockPos(MathHelper.func_76128_c(this.field_70165_t), 0, MathHelper.func_76128_c(this.field_70161_v)); Chunk chunk = this.field_70170_p.func_175726_f(blockpos); @@ -18,7 +18,7 @@ { return false; } -@@ -359,6 +359,14 @@ +@@ -365,6 +365,14 @@ return this.func_189101_db() ? SoundEvents.field_189110_fE : SoundEvents.field_187882_fq; } @@ -32,4 +32,4 @@ + static class AISlimeAttack extends EntityAIBase { - private EntitySlime field_179466_a; + private final EntitySlime field_179466_a; diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityZombie.java.patch b/patches/minecraft/net/minecraft/entity/monster/EntityZombie.java.patch index 0a8ce3606..756b6a37f 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityZombie.java.patch +++ b/patches/minecraft/net/minecraft/entity/monster/EntityZombie.java.patch @@ -1,14 +1,14 @@ --- ../src-base/minecraft/net/minecraft/entity/monster/EntityZombie.java +++ ../src-work/minecraft/net/minecraft/entity/monster/EntityZombie.java -@@ -63,6 +63,7 @@ +@@ -67,6 +67,7 @@ private static final DataParameter field_184738_bw = EntityDataManager.func_187226_a(EntityZombie.class, DataSerializers.field_187192_b); private static final DataParameter field_184739_bx = EntityDataManager.func_187226_a(EntityZombie.class, DataSerializers.field_187198_h); private static final DataParameter field_184740_by = EntityDataManager.func_187226_a(EntityZombie.class, DataSerializers.field_187198_h); + private static final DataParameter VILLAGER_TYPE_STR = EntityDataManager.func_187226_a(EntityZombie.class, DataSerializers.field_187194_d); private final EntityAIBreakDoor field_146075_bs = new EntityAIBreakDoor(this); private int field_82234_d; - private boolean field_146076_bu = false; -@@ -102,7 +103,7 @@ + private boolean field_146076_bu; +@@ -106,7 +107,7 @@ this.func_110148_a(SharedMonsterAttributes.field_111263_d).func_111128_a(0.23000000417232513D); this.func_110148_a(SharedMonsterAttributes.field_111264_e).func_111128_a(3.0D); this.func_110148_a(SharedMonsterAttributes.field_188791_g).func_111128_a(2.0D); @@ -17,7 +17,7 @@ } protected void func_70088_a() -@@ -110,6 +111,7 @@ +@@ -114,6 +115,7 @@ super.func_70088_a(); this.func_184212_Q().func_187214_a(field_184737_bv, Boolean.valueOf(false)); this.func_184212_Q().func_187214_a(field_184738_bw, Integer.valueOf(0)); @@ -25,48 +25,55 @@ this.func_184212_Q().func_187214_a(field_184739_bx, Boolean.valueOf(false)); this.func_184212_Q().func_187214_a(field_184740_by, Boolean.valueOf(false)); } -@@ -183,18 +185,33 @@ +@@ -185,6 +187,8 @@ + this.func_146071_k(p_82227_1_); + } + ++ @Deprecated //Do not use, Replacement TBD ++ @Nullable + public ZombieType func_189777_di() + { + return ZombieType.func_190146_a(((Integer)this.func_184212_Q().func_187225_a(field_184738_bw)).intValue()); +@@ -192,32 +196,54 @@ public boolean func_82231_m() { -- return ((Integer)this.func_184212_Q().func_187225_a(field_184738_bw)).intValue() > 0; +- return this.func_189777_di().func_190154_b(); + return getVillagerTypeForge() != null; } -+ @Deprecated // Use Forge Variant - public int func_184736_de() - { - return ((Integer)this.func_184212_Q().func_187225_a(field_184738_bw)).intValue() - 1; - } +- public int func_184736_de() + private net.minecraftforge.fml.common.registry.VillagerRegistry.VillagerProfession prof; + @Nullable + public net.minecraftforge.fml.common.registry.VillagerRegistry.VillagerProfession getVillagerTypeForge() -+ { + { +- return this.func_189777_di().func_190148_c(); + return this.prof; -+ } + } + @Deprecated //Use Forge version below - public void func_184735_a(int p_184735_1_) + public void func_189778_a(ZombieType p_189778_1_) { - this.func_184212_Q().func_187227_b(field_184738_bw, Integer.valueOf(p_184735_1_ + 1)); -+ net.minecraftforge.fml.common.registry.VillagerRegistry.onSetProfession(this, p_184735_1_); + this.func_184212_Q().func_187227_b(field_184738_bw, Integer.valueOf(p_189778_1_.func_190150_a())); ++ net.minecraftforge.fml.common.registry.VillagerRegistry.onSetProfession(this, p_189778_1_, p_189778_1_.func_190150_a()); } + + public void setVillagerType(@Nullable net.minecraftforge.fml.common.registry.VillagerRegistry.VillagerProfession type) + { + this.prof = type; + this.func_184212_Q().func_187227_b(VILLAGER_TYPE_STR, type == null ? "" : type.getRegistryName().toString()); + net.minecraftforge.fml.common.registry.VillagerRegistry.onSetProfession(this, type); + } - - public void func_184732_df() ++ + public void func_184206_a(DataParameter p_184206_1_) { -@@ -207,6 +224,17 @@ + if (field_184737_bv.equals(p_184206_1_)) { this.func_146071_k(this.func_70631_g_()); } + else if (field_184738_bw.equals(p_184206_1_)) + { -+ net.minecraftforge.fml.common.registry.VillagerRegistry.onSetProfession(this, this.func_184212_Q().func_187225_a(field_184738_bw) - 1); ++ net.minecraftforge.fml.common.registry.VillagerRegistry.onSetProfession(this, ZombieType.func_190146_a(this.func_184212_Q().func_187225_a(field_184738_bw)), this.func_184212_Q().func_187225_a(field_184738_bw)); + } + else if (VILLAGER_TYPE_STR.equals(p_184206_1_)) + { @@ -78,7 +85,15 @@ super.func_184206_a(p_184206_1_); } -@@ -260,12 +288,24 @@ + + public void func_70636_d() + { +- if (this.field_70170_p.func_72935_r() && !this.field_70170_p.field_72995_K && !this.func_70631_g_() && this.func_189777_di().func_190155_e()) ++ if (this.field_70170_p.func_72935_r() && !this.field_70170_p.field_72995_K && !this.func_70631_g_() && (this.func_189777_di() == null || this.func_189777_di().func_190155_e())) + { + float f = this.func_70013_c(1.0F); + BlockPos blockpos = this.func_184187_bx() instanceof EntityBoat ? (new BlockPos(this.field_70165_t, (double)Math.round(this.field_70163_u), this.field_70161_v)).func_177984_a() : new BlockPos(this.field_70165_t, (double)Math.round(this.field_70163_u), this.field_70161_v); +@@ -264,12 +290,24 @@ entitylivingbase = (EntityLivingBase)p_70097_1_.func_76346_g(); } @@ -108,7 +123,7 @@ for (int l = 0; l < 50; ++l) { -@@ -273,14 +313,14 @@ +@@ -277,14 +315,14 @@ int j1 = j + MathHelper.func_76136_a(this.field_70146_Z, 7, 40) * MathHelper.func_76136_a(this.field_70146_Z, -1, 1); int k1 = k + MathHelper.func_76136_a(this.field_70146_Z, 7, 40) * MathHelper.func_76136_a(this.field_70146_Z, -1, 1); @@ -125,43 +140,90 @@ entityzombie.func_180482_a(this.field_70170_p.func_175649_E(new BlockPos(entityzombie)), (IEntityLivingData)null); this.func_110148_a(field_110186_bp).func_111121_a(new AttributeModifier("Zombie reinforcement caller charge", -0.05000000074505806D, 0)); entityzombie.func_110148_a(field_110186_bp).func_111121_a(new AttributeModifier("Zombie reinforcement callee charge", -0.05000000074505806D, 0)); -@@ -394,6 +434,7 @@ - { - p_70014_1_.func_74757_a("IsVillager", true); - p_70014_1_.func_74768_a("VillagerProfession", this.func_184736_de()); -+ p_70014_1_.func_74778_a("VillagerProfessionName", this.getVillagerTypeForge() == null ? "" : this.getVillagerTypeForge().getRegistryName().toString()); +@@ -345,22 +383,25 @@ + + protected SoundEvent func_184639_G() + { ++ if (this.func_189777_di() == null) return SoundEvents.field_187940_hn; + return this.func_189777_di().func_190153_f(); + } + + protected SoundEvent func_184601_bQ() + { ++ if (this.func_189777_di() == null) return SoundEvents.field_187944_hr; + return this.func_189777_di().func_190152_g(); + } + + protected SoundEvent func_184615_bR() + { ++ if (this.func_189777_di() == null) return SoundEvents.field_187943_hq; + return this.func_189777_di().func_190151_h(); + } + + protected void func_180429_a(BlockPos p_180429_1_, Block p_180429_2_) + { +- SoundEvent soundevent = this.func_189777_di().func_190149_i(); ++ SoundEvent soundevent = this.func_189777_di() == null ? SoundEvents.field_187946_ht : this.func_189777_di().func_190149_i(); + this.func_184185_a(soundevent, 0.15F, 1.0F); + } + +@@ -408,7 +449,8 @@ + p_70014_1_.func_74757_a("IsBaby", true); } +- p_70014_1_.func_74768_a("ZombieType", this.func_189777_di().func_190150_a()); ++ p_70014_1_.func_74768_a("ZombieType", this.func_184212_Q().func_187225_a(field_184738_bw)); ++ p_70014_1_.func_74778_a("VillagerProfessionName", this.getVillagerTypeForge() == null ? "" : this.getVillagerTypeForge().getRegistryName().toString()); p_70014_1_.func_74768_a("ConversionTime", this.func_82230_o() ? this.field_82234_d : -1); -@@ -417,8 +458,17 @@ + p_70014_1_.func_74757_a("CanBreakDoors", this.func_146072_bX()); + } +@@ -426,19 +468,33 @@ + { + if (p_70037_1_.func_150297_b("VillagerProfession", 99)) + { +- this.func_189778_a(ZombieType.func_190146_a(p_70037_1_.func_74762_e("VillagerProfession") + 1)); ++ int id = p_70037_1_.func_74762_e("VillagerProfession") + 1; ++ this.func_184212_Q().func_187227_b(field_184738_bw, id); ++ net.minecraftforge.fml.common.registry.VillagerRegistry.onSetProfession(this, ZombieType.func_190146_a(id), id); } else { -- this.func_184735_a(this.field_70170_p.field_73012_v.nextInt(5)); +- this.func_189778_a(ZombieType.func_190146_a(this.field_70170_p.field_73012_v.nextInt(5) + 1)); + net.minecraftforge.fml.common.registry.VillagerRegistry.setRandomProfession(this, this.field_70170_p.field_73012_v); } -+ String name = p_70037_1_.func_74779_i("VillagerProfessionName"); -+ if (!"".equals(name)) -+ { -+ net.minecraftforge.fml.common.registry.VillagerRegistry.VillagerProfession p = -+ net.minecraftforge.fml.common.registry.ForgeRegistries.VILLAGER_PROFESSIONS.getValue(new ResourceLocation(name)); -+ if (p == null) -+ p = net.minecraftforge.fml.common.registry.ForgeRegistries.VILLAGER_PROFESSIONS.getValue(new ResourceLocation("minecraft:farmer")); -+ this.setVillagerType(p); -+ } } + if (p_70037_1_.func_74764_b("ZombieType")) + { +- this.func_189778_a(ZombieType.func_190146_a(p_70037_1_.func_74762_e("ZombieType"))); ++ int id = p_70037_1_.func_74762_e("ZombieType"); ++ this.func_184212_Q().func_187227_b(field_184738_bw, id); ++ net.minecraftforge.fml.common.registry.VillagerRegistry.onSetProfession(this, ZombieType.func_190146_a(id), id); + } + ++ String name = p_70037_1_.func_74779_i("VillagerProfessionName"); ++ if (!"".equals(name)) ++ { ++ net.minecraftforge.fml.common.registry.VillagerRegistry.VillagerProfession p = ++ net.minecraftforge.fml.common.registry.ForgeRegistries.VILLAGER_PROFESSIONS.getValue(new ResourceLocation(name)); ++ if (p == null) ++ p = net.minecraftforge.fml.common.registry.ForgeRegistries.VILLAGER_PROFESSIONS.getValue(new ResourceLocation("minecraft:farmer")); ++ this.setVillagerType(p); ++ } ++ if (p_70037_1_.func_150297_b("ConversionTime", 99) && p_70037_1_.func_74762_e("ConversionTime") > -1) -@@ -445,7 +495,7 @@ + { + this.func_82228_a(p_70037_1_.func_74762_e("ConversionTime")); +@@ -463,7 +519,7 @@ entityzombie.func_82149_j(p_70074_1_); this.field_70170_p.func_72900_e(p_70074_1_); entityzombie.func_180482_a(this.field_70170_p.func_175649_E(new BlockPos(entityzombie)), new EntityZombie.GroupData(false, true)); -- entityzombie.func_184735_a(entityvillager.func_70946_n()); +- entityzombie.func_189778_a(ZombieType.func_190146_a(entityvillager.func_70946_n() + 1)); + entityzombie.setVillagerType(entityvillager.getProfessionForge()); entityzombie.func_82227_f(p_70074_1_.func_70631_g_()); entityzombie.func_94061_f(entityvillager.func_175446_cd()); -@@ -486,7 +536,7 @@ +@@ -504,7 +560,7 @@ if (p_180482_2_ == null) { @@ -170,16 +232,16 @@ } if (p_180482_2_ instanceof EntityZombie.GroupData) -@@ -495,7 +545,7 @@ +@@ -521,7 +577,7 @@ - if (entityzombie$groupdata.field_142046_b) + if (!flag && entityzombie$groupdata.field_142046_b) { -- this.func_184735_a(this.field_70146_Z.nextInt(5)); +- this.func_189778_a(ZombieType.func_190146_a(this.field_70146_Z.nextInt(5) + 1)); + net.minecraftforge.fml.common.registry.VillagerRegistry.setRandomProfession(this, this.field_70146_Z); } if (entityzombie$groupdata.field_142048_a) -@@ -629,7 +679,10 @@ +@@ -655,7 +711,10 @@ this.field_70170_p.func_72900_e(this); entityvillager.func_94061_f(this.func_175446_cd()); @@ -191,3 +253,14 @@ if (this.func_145818_k_()) { +@@ -742,7 +801,9 @@ + + public String func_70005_c_() + { +- return this.func_145818_k_() ? this.func_95999_t() : this.func_189777_di().func_190145_d().func_150260_c(); ++ if (this.func_145818_k_()) return this.func_95999_t(); ++ if (this.getVillagerTypeForge() != null) return "entity.Zombie.name"; ++ return this.func_189777_di().func_190145_d().func_150260_c(); + } + + class GroupData implements IEntityLivingData diff --git a/patches/minecraft/net/minecraft/entity/monster/ZombieType.java.patch b/patches/minecraft/net/minecraft/entity/monster/ZombieType.java.patch new file mode 100644 index 000000000..51a22bb12 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/monster/ZombieType.java.patch @@ -0,0 +1,13 @@ +--- ../src-base/minecraft/net/minecraft/entity/monster/ZombieType.java ++++ ../src-work/minecraft/net/minecraft/entity/monster/ZombieType.java +@@ -38,8 +38,10 @@ + return this.field_190163_h ? this.func_190150_a() - 1 : 0; + } + ++ @javax.annotation.Nullable + public static ZombieType func_190146_a(int p_190146_0_) + { ++ if (p_190146_0_ < 0 || p_190146_0_ >= values().length) return null; + return values()[p_190146_0_]; + } + diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityHorse.java.patch b/patches/minecraft/net/minecraft/entity/passive/EntityHorse.java.patch index 3674103ba..afea0593c 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityHorse.java.patch +++ b/patches/minecraft/net/minecraft/entity/passive/EntityHorse.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/passive/EntityHorse.java +++ ../src-work/minecraft/net/minecraft/entity/passive/EntityHorse.java -@@ -436,6 +436,7 @@ +@@ -441,6 +441,7 @@ this.field_110296_bG.func_110134_a(this); this.func_110232_cE(); @@ -8,7 +8,7 @@ } private void func_110232_cE() -@@ -1204,6 +1205,7 @@ +@@ -1212,6 +1213,7 @@ } this.field_110277_bt = 0.0F; @@ -16,7 +16,7 @@ } this.field_70747_aH = this.func_70689_ay() * 0.1F; -@@ -1798,4 +1800,21 @@ +@@ -1813,4 +1815,21 @@ this.field_188477_b = p_i46589_2_; } } diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.java.patch b/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.java.patch index d28d23cc9..f039e3aff 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.java.patch +++ b/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/passive/EntityMooshroom.java +++ ../src-work/minecraft/net/minecraft/entity/passive/EntityMooshroom.java -@@ -14,7 +14,7 @@ +@@ -16,7 +16,7 @@ import net.minecraft.world.World; import net.minecraft.world.storage.loot.LootTableList; @@ -9,15 +9,15 @@ { public EntityMooshroom(World p_i1687_1_) { -@@ -23,6 +23,7 @@ - this.field_175506_bl = Blocks.field_150391_bh; +@@ -30,6 +30,7 @@ + EntityLiving.func_189752_a(p_189791_0_, "MushroomCow"); } + @SuppressWarnings("unused") public boolean func_184645_a(EntityPlayer p_184645_1_, EnumHand p_184645_2_, @Nullable ItemStack p_184645_3_) { if (p_184645_3_ != null && p_184645_3_.func_77973_b() == Items.field_151054_z && this.func_70874_b() >= 0 && !p_184645_1_.field_71075_bZ.field_75098_d) -@@ -38,7 +39,7 @@ +@@ -45,7 +46,7 @@ return true; } @@ -26,7 +26,7 @@ { this.func_70106_y(); this.field_70170_p.func_175688_a(EnumParticleTypes.EXPLOSION_LARGE, this.field_70165_t, this.field_70163_u + (double)(this.field_70131_O / 2.0F), this.field_70161_v, 0.0D, 0.0D, 0.0D, new int[0]); -@@ -79,6 +80,35 @@ +@@ -86,6 +87,35 @@ return new EntityMooshroom(this.field_70170_p); } diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.java.patch b/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.java.patch index 37677c0c4..bd828575d 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.java.patch +++ b/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/passive/EntityOcelot.java +++ ../src-work/minecraft/net/minecraft/entity/passive/EntityOcelot.java -@@ -288,7 +288,7 @@ +@@ -297,7 +297,7 @@ IBlockState iblockstate = this.field_70170_p.func_180495_p(blockpos.func_177977_b()); Block block = iblockstate.func_177230_c(); diff --git a/patches/minecraft/net/minecraft/entity/passive/EntitySheep.java.patch b/patches/minecraft/net/minecraft/entity/passive/EntitySheep.java.patch index 50ef9a971..fb8f2a984 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntitySheep.java.patch +++ b/patches/minecraft/net/minecraft/entity/passive/EntitySheep.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/passive/EntitySheep.java +++ ../src-work/minecraft/net/minecraft/entity/passive/EntitySheep.java -@@ -43,7 +43,7 @@ +@@ -45,7 +45,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -9,7 +9,7 @@ { private static final DataParameter field_184774_bv = EntityDataManager.func_187226_a(EntitySheep.class, DataSerializers.field_187191_a); private final InventoryCrafting field_90016_e = new InventoryCrafting(new Container() -@@ -173,8 +173,10 @@ +@@ -176,8 +176,10 @@ } } @@ -20,7 +20,7 @@ if (p_184645_3_ != null && p_184645_3_.func_77973_b() == Items.field_151097_aZ && !this.func_70892_o() && !this.func_70631_g_()) { if (!this.field_70170_p.field_72995_K) -@@ -359,4 +361,19 @@ +@@ -367,4 +369,19 @@ field_175514_bm.put(EnumDyeColor.RED, new float[] {0.6F, 0.2F, 0.2F}); field_175514_bm.put(EnumDyeColor.BLACK, new float[] {0.1F, 0.1F, 0.1F}); } diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityVillager.java.patch b/patches/minecraft/net/minecraft/entity/passive/EntityVillager.java.patch index d9f9509fa..7f68f6342 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityVillager.java.patch +++ b/patches/minecraft/net/minecraft/entity/passive/EntityVillager.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/passive/EntityVillager.java +++ ../src-work/minecraft/net/minecraft/entity/passive/EntityVillager.java -@@ -75,6 +75,7 @@ +@@ -81,6 +81,7 @@ public class EntityVillager extends EntityAgeable implements IMerchant, INpc { private static final DataParameter field_184752_bw = EntityDataManager.func_187226_a(EntityVillager.class, DataSerializers.field_187192_b); @@ -8,15 +8,15 @@ private int field_70955_e; private boolean field_70952_f; private boolean field_70953_g; -@@ -91,6 +92,7 @@ +@@ -97,6 +98,7 @@ private boolean field_82190_bM; private boolean field_175564_by; - private InventoryBasic field_175560_bz; + private final InventoryBasic field_175560_bz; + @Deprecated //Use VillagerRegistry private static final EntityVillager.ITradeList[][][][] field_175561_bA = new EntityVillager.ITradeList[][][][] {{{{new EntityVillager.EmeraldForItems(Items.field_151015_O, new EntityVillager.PriceInfo(18, 22)), new EntityVillager.EmeraldForItems(Items.field_151174_bG, new EntityVillager.PriceInfo(15, 19)), new EntityVillager.EmeraldForItems(Items.field_151172_bF, new EntityVillager.PriceInfo(15, 19)), new EntityVillager.ListItemForEmeralds(Items.field_151025_P, new EntityVillager.PriceInfo(-4, -2))}, {new EntityVillager.EmeraldForItems(Item.func_150898_a(Blocks.field_150423_aK), new EntityVillager.PriceInfo(8, 13)), new EntityVillager.ListItemForEmeralds(Items.field_151158_bO, new EntityVillager.PriceInfo(-3, -2))}, {new EntityVillager.EmeraldForItems(Item.func_150898_a(Blocks.field_150440_ba), new EntityVillager.PriceInfo(7, 12)), new EntityVillager.ListItemForEmeralds(Items.field_151034_e, new EntityVillager.PriceInfo(-5, -7))}, {new EntityVillager.ListItemForEmeralds(Items.field_151106_aX, new EntityVillager.PriceInfo(-6, -10)), new EntityVillager.ListItemForEmeralds(Items.field_151105_aU, new EntityVillager.PriceInfo(1, 1))}}, {{new EntityVillager.EmeraldForItems(Items.field_151007_F, new EntityVillager.PriceInfo(15, 20)), new EntityVillager.EmeraldForItems(Items.field_151044_h, new EntityVillager.PriceInfo(16, 24)), new EntityVillager.ItemAndEmeraldToItem(Items.field_151115_aP, new EntityVillager.PriceInfo(6, 6), Items.field_179566_aV, new EntityVillager.PriceInfo(6, 6))}, {new EntityVillager.ListEnchantedItemForEmeralds(Items.field_151112_aM, new EntityVillager.PriceInfo(7, 8))}}, {{new EntityVillager.EmeraldForItems(Item.func_150898_a(Blocks.field_150325_L), new EntityVillager.PriceInfo(16, 22)), new EntityVillager.ListItemForEmeralds(Items.field_151097_aZ, new EntityVillager.PriceInfo(3, 4))}, {new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L)), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 1), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 2), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 3), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 4), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 5), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 6), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 7), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 8), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 9), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 10), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 11), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 12), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 13), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 14), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 15), new EntityVillager.PriceInfo(1, 2))}}, {{new EntityVillager.EmeraldForItems(Items.field_151007_F, new EntityVillager.PriceInfo(15, 20)), new EntityVillager.ListItemForEmeralds(Items.field_151032_g, new EntityVillager.PriceInfo(-12, -8))}, {new EntityVillager.ListItemForEmeralds(Items.field_151031_f, new EntityVillager.PriceInfo(2, 3)), new EntityVillager.ItemAndEmeraldToItem(Item.func_150898_a(Blocks.field_150351_n), new EntityVillager.PriceInfo(10, 10), Items.field_151145_ak, new EntityVillager.PriceInfo(6, 10))}}}, {{{new EntityVillager.EmeraldForItems(Items.field_151121_aF, new EntityVillager.PriceInfo(24, 36)), new EntityVillager.ListEnchantedBookForEmeralds()}, {new EntityVillager.EmeraldForItems(Items.field_151122_aG, new EntityVillager.PriceInfo(8, 10)), new EntityVillager.ListItemForEmeralds(Items.field_151111_aL, new EntityVillager.PriceInfo(10, 12)), new EntityVillager.ListItemForEmeralds(Item.func_150898_a(Blocks.field_150342_X), new EntityVillager.PriceInfo(3, 4))}, {new EntityVillager.EmeraldForItems(Items.field_151164_bB, new EntityVillager.PriceInfo(2, 2)), new EntityVillager.ListItemForEmeralds(Items.field_151113_aN, new EntityVillager.PriceInfo(10, 12)), new EntityVillager.ListItemForEmeralds(Item.func_150898_a(Blocks.field_150359_w), new EntityVillager.PriceInfo(-5, -3))}, {new EntityVillager.ListEnchantedBookForEmeralds()}, {new EntityVillager.ListEnchantedBookForEmeralds()}, {new EntityVillager.ListItemForEmeralds(Items.field_151057_cb, new EntityVillager.PriceInfo(20, 22))}}}, {{{new EntityVillager.EmeraldForItems(Items.field_151078_bh, new EntityVillager.PriceInfo(36, 40)), new EntityVillager.EmeraldForItems(Items.field_151043_k, new EntityVillager.PriceInfo(8, 10))}, {new EntityVillager.ListItemForEmeralds(Items.field_151137_ax, new EntityVillager.PriceInfo(-4, -1)), new EntityVillager.ListItemForEmeralds(new ItemStack(Items.field_151100_aR, 1, EnumDyeColor.BLUE.func_176767_b()), new EntityVillager.PriceInfo(-2, -1))}, {new EntityVillager.ListItemForEmeralds(Items.field_151079_bi, new EntityVillager.PriceInfo(4, 7)), new EntityVillager.ListItemForEmeralds(Item.func_150898_a(Blocks.field_150426_aN), new EntityVillager.PriceInfo(-3, -1))}, {new EntityVillager.ListItemForEmeralds(Items.field_151062_by, new EntityVillager.PriceInfo(3, 11))}}}, {{{new EntityVillager.EmeraldForItems(Items.field_151044_h, new EntityVillager.PriceInfo(16, 24)), new EntityVillager.ListItemForEmeralds(Items.field_151028_Y, new EntityVillager.PriceInfo(4, 6))}, {new EntityVillager.EmeraldForItems(Items.field_151042_j, new EntityVillager.PriceInfo(7, 9)), new EntityVillager.ListItemForEmeralds(Items.field_151030_Z, new EntityVillager.PriceInfo(10, 14))}, {new EntityVillager.EmeraldForItems(Items.field_151045_i, new EntityVillager.PriceInfo(3, 4)), new EntityVillager.ListEnchantedItemForEmeralds(Items.field_151163_ad, new EntityVillager.PriceInfo(16, 19))}, {new EntityVillager.ListItemForEmeralds(Items.field_151029_X, new EntityVillager.PriceInfo(5, 7)), new EntityVillager.ListItemForEmeralds(Items.field_151022_W, new EntityVillager.PriceInfo(9, 11)), new EntityVillager.ListItemForEmeralds(Items.field_151020_U, new EntityVillager.PriceInfo(5, 7)), new EntityVillager.ListItemForEmeralds(Items.field_151023_V, new EntityVillager.PriceInfo(11, 15))}}, {{new EntityVillager.EmeraldForItems(Items.field_151044_h, new EntityVillager.PriceInfo(16, 24)), new EntityVillager.ListItemForEmeralds(Items.field_151036_c, new EntityVillager.PriceInfo(6, 8))}, {new EntityVillager.EmeraldForItems(Items.field_151042_j, new EntityVillager.PriceInfo(7, 9)), new EntityVillager.ListEnchantedItemForEmeralds(Items.field_151040_l, new EntityVillager.PriceInfo(9, 10))}, {new EntityVillager.EmeraldForItems(Items.field_151045_i, new EntityVillager.PriceInfo(3, 4)), new EntityVillager.ListEnchantedItemForEmeralds(Items.field_151048_u, new EntityVillager.PriceInfo(12, 15)), new EntityVillager.ListEnchantedItemForEmeralds(Items.field_151056_x, new EntityVillager.PriceInfo(9, 12))}}, {{new EntityVillager.EmeraldForItems(Items.field_151044_h, new EntityVillager.PriceInfo(16, 24)), new EntityVillager.ListEnchantedItemForEmeralds(Items.field_151037_a, new EntityVillager.PriceInfo(5, 7))}, {new EntityVillager.EmeraldForItems(Items.field_151042_j, new EntityVillager.PriceInfo(7, 9)), new EntityVillager.ListEnchantedItemForEmeralds(Items.field_151035_b, new EntityVillager.PriceInfo(9, 11))}, {new EntityVillager.EmeraldForItems(Items.field_151045_i, new EntityVillager.PriceInfo(3, 4)), new EntityVillager.ListEnchantedItemForEmeralds(Items.field_151046_w, new EntityVillager.PriceInfo(12, 15))}}}, {{{new EntityVillager.EmeraldForItems(Items.field_151147_al, new EntityVillager.PriceInfo(14, 18)), new EntityVillager.EmeraldForItems(Items.field_151076_bf, new EntityVillager.PriceInfo(14, 18))}, {new EntityVillager.EmeraldForItems(Items.field_151044_h, new EntityVillager.PriceInfo(16, 24)), new EntityVillager.ListItemForEmeralds(Items.field_151157_am, new EntityVillager.PriceInfo(-7, -5)), new EntityVillager.ListItemForEmeralds(Items.field_151077_bg, new EntityVillager.PriceInfo(-8, -6))}}, {{new EntityVillager.EmeraldForItems(Items.field_151116_aA, new EntityVillager.PriceInfo(9, 12)), new EntityVillager.ListItemForEmeralds(Items.field_151026_S, new EntityVillager.PriceInfo(2, 4))}, {new EntityVillager.ListEnchantedItemForEmeralds(Items.field_151027_R, new EntityVillager.PriceInfo(7, 12))}, {new EntityVillager.ListItemForEmeralds(Items.field_151141_av, new EntityVillager.PriceInfo(8, 10))}}}}; public EntityVillager(World p_i1747_1_) -@@ -222,7 +224,7 @@ +@@ -228,7 +230,7 @@ { boolean flag = p_184645_3_ != null && p_184645_3_.func_77973_b() == Items.field_151063_bx; @@ -25,14 +25,15 @@ { if (!this.field_70170_p.field_72995_K && (this.field_70963_i == null || !this.field_70963_i.isEmpty())) { -@@ -243,12 +245,14 @@ +@@ -249,6 +251,7 @@ { super.func_70088_a(); this.field_70180_af.func_187214_a(field_184752_bw, Integer.valueOf(0)); + this.field_70180_af.func_187214_a(PROFESSION_STR, "minecraft:farmer"); } - public void func_70014_b(NBTTagCompound p_70014_1_) + public static void func_189785_b(DataFixer p_189785_0_) +@@ -287,6 +290,7 @@ { super.func_70014_b(p_70014_1_); p_70014_1_.func_74768_a("Profession", this.func_70946_n()); @@ -40,7 +41,7 @@ p_70014_1_.func_74768_a("Riches", this.field_70956_bz); p_70014_1_.func_74768_a("Career", this.field_175563_bv); p_70014_1_.func_74768_a("CareerLevel", this.field_175562_bw); -@@ -278,6 +282,14 @@ +@@ -316,6 +320,14 @@ { super.func_70037_a(p_70037_1_); this.func_70938_b(p_70037_1_.func_74762_e("Profession")); @@ -55,7 +56,7 @@ this.field_70956_bz = p_70037_1_.func_74762_e("Riches"); this.field_175563_bv = p_70037_1_.func_74762_e("Career"); this.field_175562_bw = p_70037_1_.func_74762_e("CareerLevel"); -@@ -328,13 +340,52 @@ +@@ -366,13 +378,52 @@ public void func_70938_b(int p_70938_1_) { this.field_70180_af.func_187227_b(field_184752_bw, Integer.valueOf(p_70938_1_)); @@ -108,7 +109,7 @@ public boolean func_70941_o() { return this.field_70952_f; -@@ -534,15 +585,13 @@ +@@ -572,15 +623,13 @@ private void func_175554_cu() { @@ -125,7 +126,7 @@ this.field_175562_bw = 1; } -@@ -553,13 +602,11 @@ +@@ -591,13 +640,11 @@ int i = this.field_175563_bv - 1; int j = this.field_175562_bw - 1; @@ -142,7 +143,7 @@ { entityvillager$itradelist.func_179401_a(this.field_70963_i, this.field_70146_Z); } -@@ -648,9 +695,9 @@ +@@ -686,9 +733,9 @@ } } @@ -154,7 +155,7 @@ textcomponenttranslation.func_150256_b().func_150209_a(this.func_174823_aP()); textcomponenttranslation.func_150256_b().func_179989_a(this.func_189512_bd()); -@@ -661,10 +708,6 @@ +@@ -699,10 +746,6 @@ return textcomponenttranslation; } @@ -165,7 +166,7 @@ } } -@@ -710,7 +753,7 @@ +@@ -748,7 +791,7 @@ public IEntityLivingData func_180482_a(DifficultyInstance p_180482_1_, @Nullable IEntityLivingData p_180482_2_) { p_180482_2_ = super.func_180482_a(p_180482_1_, p_180482_2_); @@ -174,7 +175,7 @@ this.func_175552_ct(); return p_180482_2_; } -@@ -1030,4 +1073,6 @@ +@@ -1068,4 +1111,6 @@ return ((Integer)this.func_76341_a()).intValue() >= ((Integer)this.func_76340_b()).intValue() ? ((Integer)this.func_76341_a()).intValue() : ((Integer)this.func_76341_a()).intValue() + p_179412_1_.nextInt(((Integer)this.func_76340_b()).intValue() - ((Integer)this.func_76341_a()).intValue() + 1); } } diff --git a/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch b/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch index 9e85c62d8..f9bb19ccc 100644 --- a/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch +++ b/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/player/EntityPlayer.java +++ ../src-work/minecraft/net/minecraft/entity/player/EntityPlayer.java -@@ -94,6 +94,11 @@ +@@ -99,6 +99,11 @@ @SuppressWarnings("incomplete-switch") public abstract class EntityPlayer extends EntityLivingBase { @@ -12,7 +12,7 @@ private static final DataParameter field_184829_a = EntityDataManager.func_187226_a(EntityPlayer.class, DataSerializers.field_187193_c); private static final DataParameter field_184830_b = EntityDataManager.func_187226_a(EntityPlayer.class, DataSerializers.field_187192_b); protected static final DataParameter field_184827_bp = EntityDataManager.func_187226_a(EntityPlayer.class, DataSerializers.field_187191_a); -@@ -175,6 +180,7 @@ +@@ -181,6 +186,7 @@ public void func_70071_h_() { @@ -20,7 +20,7 @@ this.field_70145_X = this.func_175149_v(); if (this.func_175149_v()) -@@ -361,6 +367,7 @@ +@@ -373,6 +379,7 @@ this.func_70105_a(f, f1); } } @@ -28,7 +28,7 @@ } public int func_82145_z() -@@ -443,11 +450,11 @@ +@@ -455,11 +462,11 @@ this.field_71109_bG = 0.0F; this.func_71015_k(this.field_70165_t - d0, this.field_70163_u - d1, this.field_70161_v - d2); @@ -42,7 +42,7 @@ } } } -@@ -577,11 +584,15 @@ +@@ -589,11 +596,15 @@ public void func_70645_a(DamageSource p_70645_1_) { @@ -55,10 +55,10 @@ + captureDrops = true; + capturedDrops.clear(); + - if (this.func_70005_c_().equals("Notch")) + if ("Notch".equals(this.func_70005_c_())) { this.func_146097_a(new ItemStack(Items.field_151034_e, 1), true, false); -@@ -589,9 +600,13 @@ +@@ -601,9 +612,13 @@ if (!this.field_70170_p.func_82736_K().func_82766_b("keepInventory") && !this.func_175149_v()) { @@ -72,7 +72,7 @@ if (p_70645_1_ != null) { this.field_70159_w = (double)(-MathHelper.func_76134_b((this.field_70739_aP + this.field_70177_z) * 0.017453292F) * 0.1F); -@@ -680,13 +695,26 @@ +@@ -692,13 +707,26 @@ @Nullable public EntityItem func_71040_bB(boolean p_71040_1_) { @@ -101,7 +101,7 @@ } @Nullable -@@ -751,14 +779,22 @@ +@@ -763,14 +791,22 @@ @Nullable public ItemStack func_184816_a(EntityItem p_184816_1_) { @@ -125,7 +125,7 @@ if (f > 1.0F) { int i = EnchantmentHelper.func_185293_e(this); -@@ -808,12 +844,13 @@ +@@ -820,12 +856,13 @@ f /= 5.0F; } @@ -140,8 +140,8 @@ + return net.minecraftforge.event.ForgeEventFactory.doPlayerHarvestCheck(this, p_184823_1_, this.field_71071_by.func_184432_b(p_184823_1_)); } - public void func_70037_a(NBTTagCompound p_70037_1_) -@@ -849,6 +886,16 @@ + public static void func_189806_a(DataFixer p_189806_0_) +@@ -874,6 +911,16 @@ this.field_82248_d = p_70037_1_.func_74767_n("SpawnForced"); } @@ -158,7 +158,7 @@ this.field_71100_bB.func_75112_a(p_70037_1_); this.field_71075_bZ.func_75095_b(p_70037_1_); -@@ -881,6 +928,23 @@ +@@ -906,6 +953,23 @@ p_70014_1_.func_74757_a("SpawnForced", this.field_82248_d); } @@ -182,7 +182,7 @@ this.field_71100_bB.func_75117_b(p_70014_1_); this.field_71075_bZ.func_75091_a(p_70014_1_); p_70014_1_.func_74782_a("EnderItems", this.field_71078_a.func_70487_g()); -@@ -888,6 +952,7 @@ +@@ -913,6 +977,7 @@ public boolean func_70097_a(DamageSource p_70097_1_, float p_70097_2_) { @@ -190,7 +190,7 @@ if (this.func_180431_b(p_70097_1_)) { return false; -@@ -970,6 +1035,7 @@ +@@ -981,6 +1046,7 @@ if (this.field_184627_bm.field_77994_a <= 0) { EnumHand enumhand = this.func_184600_cs(); @@ -198,7 +198,7 @@ if (enumhand == EnumHand.MAIN_HAND) { -@@ -1005,7 +1071,10 @@ +@@ -1016,7 +1082,10 @@ { if (!this.func_180431_b(p_70665_1_)) { @@ -210,7 +210,7 @@ p_70665_2_ = this.func_70672_c(p_70665_1_, p_70665_2_); float f = p_70665_2_; p_70665_2_ = Math.max(p_70665_2_ - this.func_110139_bj(), 0.0F); -@@ -1071,6 +1140,7 @@ +@@ -1086,6 +1155,7 @@ } else { @@ -218,7 +218,7 @@ ItemStack itemstack = p_184822_2_ != null ? p_184822_2_.func_77946_l() : null; if (!p_184822_1_.func_184230_a(this, p_184822_2_, p_184822_3_)) -@@ -1086,6 +1156,7 @@ +@@ -1101,6 +1171,7 @@ { if (p_184822_2_.field_77994_a <= 0 && !this.field_71075_bZ.field_75098_d) { @@ -226,7 +226,7 @@ this.func_184611_a(p_184822_3_, (ItemStack)null); } -@@ -1101,6 +1172,7 @@ +@@ -1116,6 +1187,7 @@ { if (p_184822_2_.field_77994_a <= 0 && !this.field_71075_bZ.field_75098_d) { @@ -234,7 +234,7 @@ this.func_184611_a(p_184822_3_, (ItemStack)null); } else if (p_184822_2_.field_77994_a < itemstack.field_77994_a && this.field_71075_bZ.field_75098_d) -@@ -1127,6 +1199,7 @@ +@@ -1142,6 +1214,7 @@ public void func_71059_n(Entity p_71059_1_) { @@ -242,7 +242,7 @@ if (p_71059_1_.func_70075_an()) { if (!p_71059_1_.func_85031_j(this)) -@@ -1326,6 +1399,7 @@ +@@ -1340,6 +1413,7 @@ if (itemstack1.field_77994_a <= 0) { this.func_184611_a(EnumHand.MAIN_HAND, (ItemStack)null); @@ -250,7 +250,7 @@ } } -@@ -1414,6 +1488,8 @@ +@@ -1428,6 +1502,8 @@ public EntityPlayer.SleepResult func_180469_a(BlockPos p_180469_1_) { @@ -259,7 +259,7 @@ if (!this.field_70170_p.field_72995_K) { if (this.func_70608_bn() || !this.func_70089_S()) -@@ -1453,9 +1529,10 @@ +@@ -1467,9 +1543,10 @@ this.func_70105_a(0.2F, 0.2F); @@ -273,7 +273,7 @@ float f = 0.5F; float f1 = 0.5F; -@@ -1518,13 +1595,14 @@ +@@ -1534,13 +1611,14 @@ public void func_70999_a(boolean p_70999_1_, boolean p_70999_2_, boolean p_70999_3_) { @@ -291,7 +291,7 @@ if (blockpos == null) { -@@ -1533,6 +1611,10 @@ +@@ -1549,6 +1627,10 @@ this.func_70107_b((double)((float)blockpos.func_177958_n() + 0.5F), (double)((float)blockpos.func_177956_o() + 0.1F), (double)((float)blockpos.func_177952_p() + 0.5F)); } @@ -302,7 +302,7 @@ this.field_71083_bS = false; -@@ -1551,15 +1633,16 @@ +@@ -1567,15 +1649,16 @@ private boolean func_175143_p() { @@ -322,7 +322,7 @@ { if (!p_180467_2_) { -@@ -1574,16 +1657,17 @@ +@@ -1590,16 +1673,17 @@ } else { @@ -343,7 +343,7 @@ switch (enumfacing) { -@@ -1623,16 +1707,24 @@ +@@ -1639,16 +1723,24 @@ public BlockPos func_180470_cg() { @@ -370,7 +370,7 @@ if (p_180473_1_ != null) { this.field_71077_c = p_180473_1_; -@@ -1827,6 +1919,10 @@ +@@ -1843,6 +1935,10 @@ super.func_180430_e(p_180430_1_, p_180430_2_); } @@ -381,7 +381,7 @@ } protected void func_71061_d_() -@@ -2027,6 +2123,18 @@ +@@ -2043,6 +2139,18 @@ this.field_175152_f = p_71049_1_.field_175152_f; this.field_71078_a = p_71049_1_.field_71078_a; this.func_184212_Q().func_187227_b(field_184827_bp, p_71049_1_.func_184212_Q().func_187225_a(field_184827_bp)); @@ -400,7 +400,7 @@ } protected boolean func_70041_e_() -@@ -2126,7 +2234,10 @@ +@@ -2142,7 +2250,10 @@ public ITextComponent func_145748_c_() { @@ -412,7 +412,7 @@ itextcomponent.func_150256_b().func_150241_a(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/msg " + this.func_70005_c_() + " ")); itextcomponent.func_150256_b().func_150209_a(this.func_174823_aP()); itextcomponent.func_150256_b().func_179989_a(this.func_70005_c_()); -@@ -2135,7 +2246,7 @@ +@@ -2151,7 +2262,7 @@ public float func_70047_e() { @@ -421,8 +421,8 @@ if (this.func_70608_bn()) { -@@ -2346,6 +2457,161 @@ - return (float)this.func_110148_a(SharedMonsterAttributes.field_188792_h).func_111126_e(); +@@ -2367,6 +2478,161 @@ + return this.field_71075_bZ.field_75098_d && this.func_70003_b(2, ""); } + /** diff --git a/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch b/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch index 6b16c9a7c..f74c3de69 100644 --- a/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch +++ b/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch @@ -13,11 +13,20 @@ - BlockPos blockpos = p_i45285_2_.func_175694_M(); + BlockPos blockpos = p_i45285_2_.field_73011_w.getRandomizedSpawnPoint(); -- if (!p_i45285_2_.field_73011_w.func_177495_o() && p_i45285_2_.func_72912_H().func_76077_q() != WorldSettings.GameType.ADVENTURE) -+ if (false && !p_i45285_2_.field_73011_w.func_177495_o() && p_i45285_2_.func_72912_H().func_76077_q() != WorldSettings.GameType.ADVENTURE) +- if (!p_i45285_2_.field_73011_w.func_177495_o() && p_i45285_2_.func_72912_H().func_76077_q() != GameType.ADVENTURE) ++ if (false && !p_i45285_2_.field_73011_w.func_177495_o() && p_i45285_2_.func_72912_H().func_76077_q() != GameType.ADVENTURE) { int i = Math.max(0, p_i45285_1_.func_184108_a(p_i45285_2_)); int j = MathHelper.func_76128_c(p_i45285_2_.func_175723_af().func_177729_b((double)blockpos.func_177958_n(), (double)blockpos.func_177952_p())); +@@ -252,7 +253,7 @@ + + this.field_71070_bA.func_75142_b(); + +- if (!this.field_70170_p.field_72995_K && !this.field_71070_bA.func_75145_c(this)) ++ if (!this.field_70170_p.field_72995_K && this.field_71070_bA != null && this.field_71070_bA.func_75145_c(this)) + { + this.func_71053_j(); + this.field_71070_bA = this.field_71069_bz; @@ -435,6 +436,7 @@ public void func_70645_a(DamageSource p_70645_1_) @@ -64,7 +73,7 @@ { BlockPos blockpos1 = blockpos.func_177977_b(); IBlockState iblockstate1 = this.field_70170_p.func_180495_p(blockpos1); -@@ -924,6 +940,7 @@ +@@ -921,6 +937,7 @@ { if (p_71064_1_ != null) { diff --git a/patches/minecraft/net/minecraft/entity/player/InventoryPlayer.java.patch b/patches/minecraft/net/minecraft/entity/player/InventoryPlayer.java.patch index c2f9cf743..9e132fd5e 100644 --- a/patches/minecraft/net/minecraft/entity/player/InventoryPlayer.java.patch +++ b/patches/minecraft/net/minecraft/entity/player/InventoryPlayer.java.patch @@ -1,22 +1,14 @@ --- ../src-base/minecraft/net/minecraft/entity/player/InventoryPlayer.java +++ ../src-work/minecraft/net/minecraft/entity/player/InventoryPlayer.java -@@ -272,13 +272,8 @@ +@@ -279,6 +279,7 @@ + itemstack.func_77982_d(p_70452_1_.func_77978_p().func_74737_b()); + } - if (itemstack == null) - { -- itemstack = new ItemStack(item, 0, p_70452_1_.func_77960_j()); -- -- if (p_70452_1_.func_77942_o()) -- { -- itemstack.func_77982_d((NBTTagCompound)p_70452_1_.func_77978_p().func_74737_b()); -- } -- + itemstack = p_70452_1_.func_77946_l(); // Forge: Replace Item clone above to preserve item capabilities when picking the item up. -+ itemstack.field_77994_a = 0; this.func_70299_a(j, itemstack); } -@@ -346,6 +341,14 @@ +@@ -344,6 +345,14 @@ } } } diff --git a/patches/minecraft/net/minecraft/inventory/ContainerBeacon.java.patch b/patches/minecraft/net/minecraft/inventory/ContainerBeacon.java.patch index 6529375dc..23a8e90ce 100644 --- a/patches/minecraft/net/minecraft/inventory/ContainerBeacon.java.patch +++ b/patches/minecraft/net/minecraft/inventory/ContainerBeacon.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/inventory/ContainerBeacon.java +++ ../src-work/minecraft/net/minecraft/inventory/ContainerBeacon.java -@@ -145,7 +145,7 @@ +@@ -146,7 +146,7 @@ public boolean func_75214_a(@Nullable ItemStack p_75214_1_) { diff --git a/patches/minecraft/net/minecraft/inventory/ContainerEnchantment.java.patch b/patches/minecraft/net/minecraft/inventory/ContainerEnchantment.java.patch index f725b9137..166bf10cf 100644 --- a/patches/minecraft/net/minecraft/inventory/ContainerEnchantment.java.patch +++ b/patches/minecraft/net/minecraft/inventory/ContainerEnchantment.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/inventory/ContainerEnchantment.java +++ ../src-work/minecraft/net/minecraft/inventory/ContainerEnchantment.java -@@ -69,9 +69,12 @@ +@@ -71,9 +71,12 @@ }); this.func_75146_a(new Slot(this.field_75168_e, 1, 35, 47) { @@ -14,7 +14,7 @@ } }); -@@ -156,6 +159,7 @@ +@@ -158,6 +161,7 @@ if (!this.field_75172_h.field_72995_K) { int l = 0; @@ -22,7 +22,7 @@ for (int j = -1; j <= 1; ++j) { -@@ -163,37 +167,14 @@ +@@ -165,37 +169,14 @@ { if ((j != 0 || k != 0) && this.field_75172_h.func_175623_d(this.field_178150_j.func_177982_a(k, 0, j)) && this.field_75172_h.func_175623_d(this.field_178150_j.func_177982_a(k, 1, j))) { @@ -66,7 +66,7 @@ } } } -@@ -203,7 +184,7 @@ +@@ -205,7 +186,7 @@ for (int i1 = 0; i1 < 3; ++i1) { diff --git a/patches/minecraft/net/minecraft/item/Item.java.patch b/patches/minecraft/net/minecraft/item/Item.java.patch index cf16a13e8..3f1556f81 100644 --- a/patches/minecraft/net/minecraft/item/Item.java.patch +++ b/patches/minecraft/net/minecraft/item/Item.java.patch @@ -39,17 +39,19 @@ } protected RayTraceResult func_77621_a(World p_77621_1_, EntityPlayer p_77621_2_, boolean p_77621_3_) -@@ -389,6 +391,10 @@ +@@ -389,7 +391,11 @@ float f6 = f3 * f4; float f7 = f2 * f4; double d3 = 5.0D; +- Vec3d vec3d1 = vec3d.func_72441_c((double)f6 * 5.0D, (double)f5 * 5.0D, (double)f7 * 5.0D); + if (p_77621_2_ instanceof net.minecraft.entity.player.EntityPlayerMP) + { + d3 = ((net.minecraft.entity.player.EntityPlayerMP)p_77621_2_).field_71134_c.getBlockReachDistance(); + } - Vec3d vec3d1 = vec3d.func_72441_c((double)f6 * d3, (double)f5 * d3, (double)f7 * d3); ++ Vec3d vec3d1 = vec3d.func_72441_c((double)f6 * d3, (double)f5 * d3, (double)f7 * d3); return p_77621_1_.func_147447_a(vec3d, vec3d1, p_77621_3_, !p_77621_3_, false); } + @@ -426,11 +432,557 @@ return false; } @@ -608,7 +610,7 @@ public static void func_150900_l() { func_179214_a(Blocks.field_150348_b, (new ItemMultiTexture(Blocks.field_150348_b, Blocks.field_150348_b, new Function() -@@ -956,6 +1508,10 @@ +@@ -962,6 +1514,10 @@ private final float field_78011_i; private final int field_78008_j; @@ -619,7 +621,7 @@ private ToolMaterial(int p_i1874_3_, int p_i1874_4_, float p_i1874_5_, float p_i1874_6_, int p_i1874_7_) { this.field_78001_f = p_i1874_3_; -@@ -990,9 +1546,36 @@ +@@ -996,9 +1552,36 @@ return this.field_78008_j; } diff --git a/patches/minecraft/net/minecraft/item/ItemArmor.java.patch b/patches/minecraft/net/minecraft/item/ItemArmor.java.patch index bcc4033bc..00a62ea70 100644 --- a/patches/minecraft/net/minecraft/item/ItemArmor.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemArmor.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/item/ItemArmor.java +++ ../src-work/minecraft/net/minecraft/item/ItemArmor.java -@@ -239,6 +239,8 @@ +@@ -236,6 +236,8 @@ private final int field_78055_h; private final SoundEvent field_185020_j; private final float field_189417_k; @@ -9,7 +9,7 @@ private ArmorMaterial(String p_i47117_3_, int p_i47117_4_, int[] p_i47117_5_, int p_i47117_6_, SoundEvent p_i47117_7_, float p_i47117_8_) { -@@ -272,7 +274,15 @@ +@@ -269,7 +271,15 @@ public Item func_151685_b() { diff --git a/patches/minecraft/net/minecraft/item/ItemSeedFood.java.patch b/patches/minecraft/net/minecraft/item/ItemSeedFood.java.patch index 462562362..e780f8e1b 100644 --- a/patches/minecraft/net/minecraft/item/ItemSeedFood.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemSeedFood.java.patch @@ -7,8 +7,8 @@ -public class ItemSeedFood extends ItemFood +public class ItemSeedFood extends ItemFood implements net.minecraftforge.common.IPlantable { - private Block field_150908_b; - private Block field_82809_c; + private final Block field_150908_b; + private final Block field_82809_c; @@ -22,7 +22,8 @@ public EnumActionResult func_180614_a(ItemStack p_180614_1_, EntityPlayer p_180614_2_, World p_180614_3_, BlockPos p_180614_4_, EnumHand p_180614_5_, EnumFacing p_180614_6_, float p_180614_7_, float p_180614_8_, float p_180614_9_) diff --git a/patches/minecraft/net/minecraft/item/ItemSeeds.java.patch b/patches/minecraft/net/minecraft/item/ItemSeeds.java.patch index c433dc17c..ffb8aacc5 100644 --- a/patches/minecraft/net/minecraft/item/ItemSeeds.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemSeeds.java.patch @@ -7,8 +7,8 @@ -public class ItemSeeds extends Item +public class ItemSeeds extends Item implements net.minecraftforge.common.IPlantable { - private Block field_150925_a; - private Block field_77838_b; + private final Block field_150925_a; + private final Block field_77838_b; @@ -23,7 +23,8 @@ public EnumActionResult func_180614_a(ItemStack p_180614_1_, EntityPlayer p_180614_2_, World p_180614_3_, BlockPos p_180614_4_, EnumHand p_180614_5_, EnumFacing p_180614_6_, float p_180614_7_, float p_180614_8_, float p_180614_9_) diff --git a/patches/minecraft/net/minecraft/item/ItemStack.java.patch b/patches/minecraft/net/minecraft/item/ItemStack.java.patch index 0fc9f7b0a..be477abce 100644 --- a/patches/minecraft/net/minecraft/item/ItemStack.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemStack.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/item/ItemStack.java +++ ../src-work/minecraft/net/minecraft/item/ItemStack.java -@@ -42,7 +42,7 @@ +@@ -46,7 +46,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -9,7 +9,7 @@ { public static final DecimalFormat field_111284_a = new DecimalFormat("#.##"); public int field_77994_a; -@@ -56,6 +56,10 @@ +@@ -60,6 +60,10 @@ private Block field_179550_j; private boolean field_179551_k; @@ -20,25 +20,21 @@ public ItemStack(Block p_i1876_1_) { this((Block)p_i1876_1_, 1); -@@ -81,13 +85,15 @@ +@@ -85,9 +89,11 @@ this((Item)p_i1880_1_, p_i1880_2_, 0); } - public ItemStack(Item p_i1881_1_, int p_i1881_2_, int p_i1881_3_) -+ public ItemStack(Item p_i1881_1_, int p_i1881_2_, int p_i1881_3_) { this (p_i1881_1_, p_i1881_2_, p_i1881_3_, null); } ++ public ItemStack(Item p_i1881_1_, int p_i1881_2_, int p_i1881_3_){ this(p_i1881_1_, p_i1881_2_, p_i1881_3_, null); } + public ItemStack(Item p_i1881_1_, int p_i1881_2_, int p_i1881_3_, NBTTagCompound capNBT) { -+ this.capNBT = capNBT; - this.field_179552_h = null; - this.field_179553_i = false; - this.field_179550_j = null; - this.field_179551_k = false; - this.field_151002_e = p_i1881_1_; ++ this.capNBT = capNBT; + this.func_150996_a(p_i1881_1_); this.field_77994_a = p_i1881_2_; this.field_77991_e = p_i1881_3_; -@@ -115,7 +121,7 @@ +@@ -117,7 +123,7 @@ public ItemStack func_77979_a(int p_77979_1_) { p_77979_1_ = Math.min(p_77979_1_, this.field_77994_a); @@ -47,7 +43,7 @@ if (this.field_77990_d != null) { -@@ -128,11 +134,12 @@ +@@ -130,11 +136,12 @@ public Item func_77973_b() { @@ -61,7 +57,7 @@ EnumActionResult enumactionresult = this.func_77973_b().func_180614_a(this, p_179546_1_, p_179546_2_, p_179546_3_, p_179546_4_, p_179546_5_, p_179546_6_, p_179546_7_, p_179546_8_); if (enumactionresult == EnumActionResult.SUCCESS) -@@ -171,12 +178,16 @@ +@@ -173,12 +180,16 @@ p_77955_1_.func_74782_a("tag", this.field_77990_d); } @@ -79,7 +75,7 @@ this.field_77994_a = p_77963_1_.func_74771_c("Count"); this.field_77991_e = p_77963_1_.func_74765_d("Damage"); -@@ -194,11 +205,12 @@ +@@ -196,11 +207,12 @@ this.field_151002_e.func_179215_a(this.field_77990_d); } } @@ -93,7 +89,7 @@ } public boolean func_77985_e() -@@ -208,7 +220,7 @@ +@@ -210,7 +222,7 @@ public boolean func_77984_f() { @@ -102,7 +98,7 @@ } public boolean func_77981_g() -@@ -218,32 +230,27 @@ +@@ -220,32 +232,27 @@ public boolean func_77951_h() { @@ -140,7 +136,7 @@ } public boolean func_96631_a(int p_96631_1_, Random p_96631_2_) -@@ -275,8 +282,8 @@ +@@ -277,8 +284,8 @@ } } @@ -151,7 +147,7 @@ } } -@@ -330,7 +337,7 @@ +@@ -332,7 +339,7 @@ public boolean func_150998_b(IBlockState p_150998_1_) { @@ -160,7 +156,7 @@ } public boolean func_111282_a(EntityPlayer p_111282_1_, EntityLivingBase p_111282_2_, EnumHand p_111282_3_) -@@ -340,7 +347,7 @@ +@@ -342,7 +349,7 @@ public ItemStack func_77946_l() { @@ -169,7 +165,7 @@ if (this.field_77990_d != null) { -@@ -352,7 +359,19 @@ +@@ -354,7 +361,19 @@ public static boolean func_77970_a(@Nullable ItemStack p_77970_0_, @Nullable ItemStack p_77970_1_) { @@ -190,7 +186,7 @@ } public static boolean func_77989_b(@Nullable ItemStack p_77989_0_, @Nullable ItemStack p_77989_1_) -@@ -362,7 +381,11 @@ +@@ -364,7 +383,11 @@ private boolean func_77959_d(ItemStack p_77959_1_) { @@ -203,7 +199,7 @@ } public static boolean func_179545_c(@Nullable ItemStack p_179545_0_, @Nullable ItemStack p_179545_1_) -@@ -762,6 +785,7 @@ +@@ -764,6 +787,7 @@ } } @@ -211,7 +207,7 @@ return list; } -@@ -873,7 +897,7 @@ +@@ -875,7 +899,7 @@ } else { @@ -220,7 +216,7 @@ } return multimap; -@@ -906,6 +930,18 @@ +@@ -908,6 +932,18 @@ @Deprecated public void func_150996_a(Item p_150996_1_) { @@ -239,7 +235,7 @@ this.field_151002_e = p_150996_1_; } -@@ -991,4 +1027,45 @@ +@@ -993,4 +1029,45 @@ return false; } } diff --git a/patches/minecraft/net/minecraft/item/crafting/RecipeFireworks.java.patch b/patches/minecraft/net/minecraft/item/crafting/RecipeFireworks.java.patch index d11fff671..f21dd4979 100644 --- a/patches/minecraft/net/minecraft/item/crafting/RecipeFireworks.java.patch +++ b/patches/minecraft/net/minecraft/item/crafting/RecipeFireworks.java.patch @@ -2,7 +2,7 @@ +++ ../src-work/minecraft/net/minecraft/item/crafting/RecipeFireworks.java @@ -87,9 +87,9 @@ { - this.field_92102_a = new ItemStack(Items.field_151152_bP); + this.field_92102_a = new ItemStack(Items.field_151152_bP, 3); + NBTTagCompound nbttagcompound1 = new NBTTagCompound(); if (l > 0) diff --git a/patches/minecraft/net/minecraft/item/crafting/ShapedRecipes.java.patch b/patches/minecraft/net/minecraft/item/crafting/ShapedRecipes.java.patch index e04487d29..719da837b 100644 --- a/patches/minecraft/net/minecraft/item/crafting/ShapedRecipes.java.patch +++ b/patches/minecraft/net/minecraft/item/crafting/ShapedRecipes.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/item/crafting/ShapedRecipes.java +++ ../src-work/minecraft/net/minecraft/item/crafting/ShapedRecipes.java -@@ -35,11 +35,7 @@ +@@ -34,11 +34,7 @@ for (int i = 0; i < aitemstack.length; ++i) { ItemStack itemstack = p_179532_1_.func_70301_a(i); diff --git a/patches/minecraft/net/minecraft/nbt/NBTTagString.java.patch b/patches/minecraft/net/minecraft/nbt/NBTTagString.java.patch index a193b9c04..663efa2b7 100644 --- a/patches/minecraft/net/minecraft/nbt/NBTTagString.java.patch +++ b/patches/minecraft/net/minecraft/nbt/NBTTagString.java.patch @@ -18,4 +18,4 @@ + return "\"" + org.apache.commons.lang3.StringUtils.replaceEach(this.field_74751_a, new String[]{"\\","\""}, new String[]{"\\\\","\\\""}) + "\""; } - public NBTBase func_74737_b() + public NBTTagString func_74737_b() diff --git a/patches/minecraft/net/minecraft/network/NetHandlerPlayServer.java.patch b/patches/minecraft/net/minecraft/network/NetHandlerPlayServer.java.patch index df2660338..fe2dcb358 100644 --- a/patches/minecraft/net/minecraft/network/NetHandlerPlayServer.java.patch +++ b/patches/minecraft/net/minecraft/network/NetHandlerPlayServer.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/network/NetHandlerPlayServer.java +++ ../src-work/minecraft/net/minecraft/network/NetHandlerPlayServer.java -@@ -612,7 +612,10 @@ +@@ -611,7 +611,10 @@ double d2 = this.field_147369_b.field_70161_v - ((double)blockpos.func_177952_p() + 0.5D); double d3 = d0 * d0 + d1 * d1 + d2 * d2; @@ -12,7 +12,7 @@ { return; } -@@ -670,7 +673,9 @@ +@@ -669,7 +672,9 @@ if (blockpos.func_177956_o() < this.field_147367_d.func_71207_Z() - 1 || enumfacing != EnumFacing.UP && blockpos.func_177956_o() < this.field_147367_d.func_71207_Z()) { @@ -23,15 +23,15 @@ { this.field_147369_b.field_71134_c.func_187251_a(this.field_147369_b, worldserver, itemstack, enumhand, blockpos, enumfacing, p_184337_1_.func_187026_d(), p_184337_1_.func_187025_e(), p_184337_1_.func_187020_f()); } -@@ -689,6 +694,7 @@ +@@ -688,6 +693,7 @@ if (itemstack != null && itemstack.field_77994_a == 0) { this.field_147369_b.func_184611_a(enumhand, (ItemStack)null); + net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(this.field_147369_b, itemstack, enumhand); - itemstack = null; } } -@@ -709,6 +715,7 @@ + +@@ -707,6 +713,7 @@ if (itemstack != null && itemstack.field_77994_a == 0) { this.field_147369_b.func_184611_a(enumhand, (ItemStack)null); @@ -39,7 +39,7 @@ itemstack = null; } } -@@ -888,7 +895,9 @@ +@@ -886,7 +893,9 @@ } else { @@ -50,7 +50,7 @@ this.field_147367_d.func_184103_al().func_148544_a(itextcomponent, false); } -@@ -1018,6 +1027,7 @@ +@@ -1016,6 +1025,7 @@ { EnumHand enumhand1 = p_147340_1_.func_186994_b(); ItemStack itemstack1 = this.field_147369_b.func_184586_b(enumhand1); @@ -58,7 +58,7 @@ entity.func_184199_a(this.field_147369_b, p_147340_1_.func_179712_b(), itemstack1, enumhand1); } else if (p_147340_1_.func_149565_c() == CPacketUseEntity.Action.ATTACK) -@@ -1057,7 +1067,7 @@ +@@ -1055,7 +1065,7 @@ return; } diff --git a/patches/minecraft/net/minecraft/realms/RealmsConnect.java.patch b/patches/minecraft/net/minecraft/realms/RealmsConnect.java.patch index 48c2e07a7..6a6839fca 100644 --- a/patches/minecraft/net/minecraft/realms/RealmsConnect.java.patch +++ b/patches/minecraft/net/minecraft/realms/RealmsConnect.java.patch @@ -12,8 +12,8 @@ return; } -- RealmsConnect.this.connection.func_179290_a(new C00Handshake(110, p_connect_1_, p_connect_2_, EnumConnectionState.LOGIN)); -+ RealmsConnect.this.connection.func_179290_a(new C00Handshake(110, p_connect_1_, p_connect_2_, EnumConnectionState.LOGIN, true)); +- RealmsConnect.this.connection.func_179290_a(new C00Handshake(210, p_connect_1_, p_connect_2_, EnumConnectionState.LOGIN)); ++ RealmsConnect.this.connection.func_179290_a(new C00Handshake(210, p_connect_1_, p_connect_2_, EnumConnectionState.LOGIN, true)); if (RealmsConnect.this.aborted) { diff --git a/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch b/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch index b2ee322bb..a4291f466 100644 --- a/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch +++ b/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/server/MinecraftServer.java +++ ../src-work/minecraft/net/minecraft/server/MinecraftServer.java -@@ -102,7 +102,7 @@ +@@ -103,7 +103,7 @@ @SideOnly(Side.SERVER) private String field_71320_r; private int field_71319_s = -1; @@ -9,9 +9,9 @@ private PlayerList field_71318_t; private boolean field_71317_u = true; private boolean field_71316_v; -@@ -119,7 +119,8 @@ +@@ -120,7 +120,8 @@ private int field_71280_D; - private int field_143008_E = 0; + private int field_143008_E; public final long[] field_71311_j = new long[100]; - public long[][] field_71312_k; + //public long[][] timeOfLastDimensionTick; @@ -19,7 +19,7 @@ private KeyPair field_71292_I; private String field_71293_J; private String field_71294_K; -@@ -217,8 +218,6 @@ +@@ -218,8 +219,6 @@ { this.func_71237_c(p_71247_1_); this.func_71192_d("menu.loadingLevel"); @@ -28,7 +28,7 @@ ISaveHandler isavehandler = this.field_71310_m.func_75804_a(p_71247_1_, true); this.func_175584_a(this.func_71270_I(), isavehandler); WorldInfo worldinfo = isavehandler.func_75757_d(); -@@ -249,47 +248,21 @@ +@@ -250,47 +249,21 @@ worldsettings = new WorldSettings(worldinfo); } @@ -84,22 +84,22 @@ this.func_147139_a(this.func_147135_j()); this.func_71222_d(); } -@@ -304,7 +277,7 @@ +@@ -305,7 +278,7 @@ this.func_71192_d("menu.generatingTerrain"); int j1 = 0; - field_147145_h.info("Preparing start region for level " + j1); -- WorldServer worldserver = this.field_71305_c[j1]; + field_147145_h.info("Preparing start region for level 0"); +- WorldServer worldserver = this.field_71305_c[0]; + WorldServer worldserver = net.minecraftforge.common.DimensionManager.getWorld(j1); BlockPos blockpos = worldserver.func_175694_M(); long k1 = func_130071_aq(); -@@ -422,9 +395,15 @@ +@@ -423,9 +396,16 @@ { - if (this.field_71305_c[j] != null) + if (worldserver1 != null) { -+ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.WorldEvent.Unload(this.field_71305_c[j])); } - this.field_71305_c[j].func_73041_k(); -- } ++ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.WorldEvent.Unload(worldserver1)); + worldserver1.func_73041_k(); + } } + + WorldServer[] tmp = field_71305_c; @@ -110,7 +110,7 @@ } if (this.field_71307_n.func_76468_d()) -@@ -449,6 +428,7 @@ +@@ -450,6 +430,7 @@ { if (this.func_71197_b()) { @@ -118,7 +118,7 @@ this.field_175591_ab = func_130071_aq(); long i = 0L; this.field_147147_p.func_151315_a(new TextComponentString(this.field_71286_C)); -@@ -493,12 +473,20 @@ +@@ -494,12 +475,20 @@ Thread.sleep(Math.max(1L, 50L - i)); this.field_71296_Q = true; } @@ -139,7 +139,7 @@ catch (Throwable throwable1) { field_147145_h.error("Encountered an unexpected exception", throwable1); -@@ -524,14 +512,15 @@ +@@ -525,14 +514,15 @@ field_147145_h.error("We were unable to save this crash report to disk."); } @@ -156,7 +156,7 @@ } catch (Throwable throwable) { -@@ -539,6 +528,8 @@ +@@ -540,6 +530,8 @@ } finally { @@ -165,7 +165,7 @@ this.func_71240_o(); } } -@@ -606,6 +597,7 @@ +@@ -607,6 +599,7 @@ public void func_71217_p() { long i = System.nanoTime(); @@ -173,7 +173,7 @@ ++this.field_71315_w; if (this.field_71295_T) -@@ -632,6 +624,7 @@ +@@ -633,6 +626,7 @@ Collections.shuffle(Arrays.asList(agameprofile)); this.field_147147_p.func_151318_b().func_151330_a(agameprofile); @@ -181,7 +181,7 @@ } if (this.field_71315_w % 900 == 0) -@@ -659,6 +652,7 @@ +@@ -660,6 +654,7 @@ this.field_71304_b.func_76319_b(); this.field_71304_b.func_76319_b(); @@ -189,7 +189,7 @@ } public void func_71190_q() -@@ -674,24 +668,28 @@ +@@ -675,24 +670,28 @@ } this.field_71304_b.func_76318_c("levels"); @@ -222,7 +222,7 @@ try { -@@ -715,6 +713,7 @@ +@@ -716,6 +715,7 @@ throw new ReportedException(crashreport1); } @@ -230,7 +230,7 @@ this.field_71304_b.func_76319_b(); this.field_71304_b.func_76320_a("tracker"); worldserver.func_73039_n().func_72788_a(); -@@ -722,9 +721,11 @@ +@@ -723,9 +723,11 @@ this.field_71304_b.func_76319_b(); } @@ -243,7 +243,7 @@ this.field_71304_b.func_76318_c("connection"); this.func_147137_ag().func_151269_c(); this.field_71304_b.func_76318_c("players"); -@@ -746,6 +747,7 @@ +@@ -747,6 +749,7 @@ public void func_71256_s() { @@ -251,7 +251,7 @@ this.field_175590_aa = new Thread(this, "Server thread"); this.field_175590_aa.start(); } -@@ -762,7 +764,13 @@ +@@ -763,7 +766,13 @@ public WorldServer func_71218_a(int p_71218_1_) { @@ -266,7 +266,7 @@ } public String func_71249_w() -@@ -792,7 +800,7 @@ +@@ -793,7 +802,7 @@ public String getServerModName() { diff --git a/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch b/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch index fb8a487b0..bc0d9783b 100644 --- a/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch +++ b/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch @@ -1,14 +1,14 @@ --- ../src-base/minecraft/net/minecraft/server/dedicated/DedicatedServer.java +++ ../src-work/minecraft/net/minecraft/server/dedicated/DedicatedServer.java -@@ -55,6 +55,7 @@ +@@ -58,6 +58,7 @@ private boolean field_71338_p; - private WorldSettings.GameType field_71337_q; + private GameType field_71337_q; private boolean field_71335_s; + public static boolean allowPlayerLogins = false; public DedicatedServer(File p_i47086_1_, DataFixer p_i47086_2_, YggdrasilAuthenticationService p_i47086_3_, MinecraftSessionService p_i47086_4_, GameProfileRepository p_i47086_5_, PlayerProfileCache p_i47086_6_) { -@@ -88,6 +89,7 @@ +@@ -91,6 +92,7 @@ { public void run() { @@ -16,7 +16,7 @@ BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(System.in)); String s4; -@@ -113,6 +115,8 @@ +@@ -116,6 +118,8 @@ field_155771_h.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\""); } @@ -25,7 +25,7 @@ field_155771_h.info("Loading properties"); this.field_71340_o = new PropertyManager(new File("server.properties")); this.field_154332_n = new ServerEula(new File("eula.txt")); -@@ -204,6 +208,7 @@ +@@ -207,6 +211,7 @@ } else { @@ -33,15 +33,15 @@ this.func_184105_a(new DedicatedPlayerList(this)); long j = System.nanoTime(); -@@ -253,6 +258,7 @@ +@@ -256,6 +261,7 @@ TileEntitySkull.func_184293_a(this.func_152358_ax()); TileEntitySkull.func_184294_a(this.func_147130_as()); PlayerProfileCache.func_187320_a(this.func_71266_T()); + if (!net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerAboutToStart(this)) return false; - field_155771_h.info("Preparing level \"" + this.func_71270_I() + "\""); + field_155771_h.info("Preparing level \"{}\"", new Object[] {this.func_71270_I()}); this.func_71247_a(this.func_71270_I(), this.func_71270_I(), k, worldtype, s2); long i1 = System.nanoTime() - j; -@@ -281,7 +287,7 @@ +@@ -284,7 +290,7 @@ thread1.start(); } @@ -50,7 +50,7 @@ } } } -@@ -505,7 +511,7 @@ +@@ -507,7 +513,7 @@ public boolean func_175579_a(World p_175579_1_, BlockPos p_175579_2_, EntityPlayer p_175579_3_) { @@ -59,7 +59,7 @@ { return false; } -@@ -579,6 +585,9 @@ +@@ -581,6 +587,9 @@ return this.field_71340_o.func_73669_a("network-compression-threshold", super.func_175577_aI()); } diff --git a/patches/minecraft/net/minecraft/server/dedicated/ServerHangWatchdog.java.patch b/patches/minecraft/net/minecraft/server/dedicated/ServerHangWatchdog.java.patch index 72c264640..f4bcc652b 100644 --- a/patches/minecraft/net/minecraft/server/dedicated/ServerHangWatchdog.java.patch +++ b/patches/minecraft/net/minecraft/server/dedicated/ServerHangWatchdog.java.patch @@ -15,7 +15,7 @@ - if (k > this.field_180250_c) + if (k > this.field_180250_c && !this.firstRun) { - field_180251_a.fatal("A single server tick took " + String.format("%.2f", new Object[] {Float.valueOf((float)k / 1000.0F)}) + " seconds (should be max " + String.format("%.2f", new Object[] {Float.valueOf(0.05F)}) + ")"); + field_180251_a.fatal("A single server tick took {} seconds (should be max {})", new Object[] {String.format("%.2f", new Object[]{Float.valueOf((float)k / 1000.0F)}), String.format("%.2f", new Object[]{Float.valueOf(0.05F)})}); field_180251_a.fatal("Considering it to be crashed, server will forcibly shutdown."); @@ -75,6 +76,8 @@ this.func_180248_a(); diff --git a/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch b/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch index 43fcd26f7..17b4ce466 100644 --- a/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch +++ b/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch @@ -1,7 +1,7 @@ --- ../src-base/minecraft/net/minecraft/server/integrated/IntegratedServer.java +++ ../src-work/minecraft/net/minecraft/server/integrated/IntegratedServer.java -@@ -68,8 +68,6 @@ - protected void func_71247_a(String p_71247_1_, String p_71247_2_, long p_71247_3_, WorldType p_71247_5_, String p_71247_6_) +@@ -69,8 +69,6 @@ + public void func_71247_a(String p_71247_1_, String p_71247_2_, long p_71247_3_, WorldType p_71247_5_, String p_71247_6_) { this.func_71237_c(p_71247_1_); - this.field_71305_c = new WorldServer[3]; @@ -9,7 +9,7 @@ ISaveHandler isavehandler = this.func_71254_M().func_75804_a(p_71247_1_, true); this.func_175584_a(this.func_71270_I(), isavehandler); WorldInfo worldinfo = isavehandler.func_75757_d(); -@@ -83,44 +81,23 @@ +@@ -84,44 +82,23 @@ worldinfo.func_76062_a(p_71247_2_); } @@ -65,7 +65,7 @@ { this.func_147139_a(this.field_71349_l.field_71474_y.field_74318_M); } -@@ -138,9 +115,10 @@ +@@ -139,9 +116,10 @@ this.func_71245_h(true); field_147148_h.info("Generating keypair"); this.func_71253_a(CryptManager.func_75891_b()); @@ -77,7 +77,7 @@ } public void func_71217_p() -@@ -213,6 +191,7 @@ +@@ -214,6 +192,7 @@ public EnumDifficulty func_147135_j() { diff --git a/patches/minecraft/net/minecraft/server/management/PlayerChunkMapEntry.java.patch b/patches/minecraft/net/minecraft/server/management/PlayerChunkMapEntry.java.patch index 50ef14395..1b210d8c6 100644 --- a/patches/minecraft/net/minecraft/server/management/PlayerChunkMapEntry.java.patch +++ b/patches/minecraft/net/minecraft/server/management/PlayerChunkMapEntry.java.patch @@ -72,14 +72,14 @@ return true; @@ -131,6 +159,8 @@ { - entityplayermp.field_71135_a.func_147359_a(spacketchunkdata); + entityplayermp.field_71135_a.func_147359_a(packet); this.field_187282_b.func_72688_a().func_73039_n().func_85172_a(entityplayermp, this.field_187286_f); + // chunk watch event - delayed to here as the chunk wasn't ready in addPlayer + net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.ChunkWatchEvent.Watch(this.field_187284_d, entityplayermp)); } return true; -@@ -167,7 +197,7 @@ +@@ -169,7 +199,7 @@ this.field_187288_h |= 1 << (p_187265_2_ >> 4); @@ -88,7 +88,7 @@ { short short1 = (short)(p_187265_1_ << 12 | p_187265_3_ << 8 | p_187265_2_); -@@ -178,7 +208,8 @@ +@@ -180,7 +210,8 @@ return; } } @@ -98,7 +98,7 @@ this.field_187285_e[this.field_187287_g++] = short1; } } -@@ -195,6 +226,7 @@ +@@ -197,6 +228,7 @@ } } @@ -106,7 +106,7 @@ public void func_187280_d() { if (this.field_187290_j && this.field_187286_f != null) -@@ -208,28 +240,32 @@ +@@ -210,28 +242,32 @@ int k = (this.field_187285_e[0] >> 8 & 15) + this.field_187284_d.field_77275_b * 16; BlockPos blockpos = new BlockPos(i, j, k); this.func_187267_a(new SPacketBlockChange(this.field_187282_b.func_72688_a(), blockpos)); diff --git a/patches/minecraft/net/minecraft/server/management/PlayerInteractionManager.java.patch b/patches/minecraft/net/minecraft/server/management/PlayerInteractionManager.java.patch index 7195588ca..846ded03e 100644 --- a/patches/minecraft/net/minecraft/server/management/PlayerInteractionManager.java.patch +++ b/patches/minecraft/net/minecraft/server/management/PlayerInteractionManager.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/server/management/PlayerInteractionManager.java +++ ../src-work/minecraft/net/minecraft/server/management/PlayerInteractionManager.java -@@ -28,6 +28,8 @@ +@@ -29,6 +29,8 @@ public class PlayerInteractionManager { @@ -8,8 +8,8 @@ + private double blockReachDistance = 5.0d; public World field_73092_a; public EntityPlayerMP field_73090_b; - private WorldSettings.GameType field_73091_c = WorldSettings.GameType.NOT_SET; -@@ -89,7 +91,7 @@ + private GameType field_73091_c = GameType.NOT_SET; +@@ -90,7 +92,7 @@ IBlockState iblockstate = this.field_73092_a.func_180495_p(this.field_180241_i); Block block = iblockstate.func_177230_c(); @@ -18,7 +18,7 @@ { this.field_73097_j = false; } -@@ -116,7 +118,7 @@ +@@ -117,7 +119,7 @@ IBlockState iblockstate1 = this.field_73092_a.func_180495_p(this.field_180240_f); Block block1 = iblockstate1.func_177230_c(); @@ -27,7 +27,7 @@ { this.field_73092_a.func_175715_c(this.field_73090_b.func_145782_y(), this.field_180240_f, -1); this.field_73094_o = -1; -@@ -125,7 +127,7 @@ +@@ -126,7 +128,7 @@ else { int k = this.field_73100_i - this.field_73089_e; @@ -36,7 +36,7 @@ int l = (int)(f1 * 10.0F); if (l != this.field_73094_o) -@@ -139,6 +141,15 @@ +@@ -140,6 +142,15 @@ public void func_180784_a(BlockPos p_180784_1_, EnumFacing p_180784_2_) { @@ -52,7 +52,7 @@ if (this.func_73083_d()) { if (!this.field_73092_a.func_175719_a((EntityPlayer)null, p_180784_1_, p_180784_2_)) -@@ -174,17 +185,36 @@ +@@ -175,17 +186,36 @@ } } @@ -93,7 +93,7 @@ { this.func_180237_b(p_180784_1_); } -@@ -206,7 +236,7 @@ +@@ -207,7 +237,7 @@ int i = this.field_73100_i - this.field_73089_e; IBlockState iblockstate = this.field_73092_a.func_180495_p(p_180785_1_); @@ -102,7 +102,7 @@ { float f = iblockstate.func_185903_a(this.field_73090_b, this.field_73090_b.field_70170_p, p_180785_1_) * (float)(i + 1); -@@ -235,13 +265,17 @@ +@@ -236,13 +266,17 @@ private boolean func_180235_c(BlockPos p_180235_1_) { @@ -124,7 +124,7 @@ } return flag; -@@ -249,7 +283,8 @@ +@@ -250,7 +284,8 @@ public boolean func_180237_b(BlockPos p_180237_1_) { @@ -134,13 +134,13 @@ { return false; } -@@ -265,58 +300,46 @@ +@@ -267,58 +302,46 @@ } else { - if (this.field_73091_c.func_82752_c()) - { -- if (this.field_73091_c == WorldSettings.GameType.SPECTATOR) +- if (this.field_73091_c == GameType.SPECTATOR) - { - return false; - } @@ -156,7 +156,7 @@ - return false; - } - -- if (!itemstack.func_179544_c(iblockstate.func_177230_c())) +- if (!itemstack.func_179544_c(block)) - { - return false; - } @@ -206,7 +206,7 @@ return flag1; } } -@@ -334,6 +357,7 @@ +@@ -336,6 +359,7 @@ } else { @@ -214,7 +214,7 @@ int i = p_187250_3_.field_77994_a; int j = p_187250_3_.func_77960_j(); ActionResult actionresult = p_187250_3_.func_77957_a(p_187250_2_, p_187250_1_, p_187250_4_); -@@ -360,6 +384,7 @@ +@@ -362,6 +386,7 @@ if (itemstack.field_77994_a == 0) { p_187250_1_.func_184611_a(p_187250_4_, (ItemStack)null); @@ -222,7 +222,7 @@ } if (!p_187250_1_.func_184587_cr()) -@@ -404,13 +429,26 @@ +@@ -406,13 +431,26 @@ } else { @@ -252,29 +252,28 @@ } } -@@ -430,14 +468,21 @@ - { - int j = p_187251_3_.func_77960_j(); - int i = p_187251_3_.field_77994_a; -+ if (result != EnumActionResult.SUCCESS && event.getUseItem() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY -+ || result == EnumActionResult.SUCCESS && event.getUseItem() == net.minecraftforge.fml.common.eventhandler.Event.Result.ALLOW) { - EnumActionResult enumactionresult = p_187251_3_.func_179546_a(p_187251_1_, p_187251_2_, p_187251_5_, p_187251_4_, p_187251_6_, p_187251_7_, p_187251_8_, p_187251_9_); - p_187251_3_.func_77964_b(j); - p_187251_3_.field_77994_a = i; - return enumactionresult; -+ } else return result; -+ - } - else - { -+ if (result != EnumActionResult.SUCCESS && event.getUseItem() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY -+ || result == EnumActionResult.SUCCESS && event.getUseItem() == net.minecraftforge.fml.common.eventhandler.Event.Result.ALLOW) - return p_187251_3_.func_179546_a(p_187251_1_, p_187251_2_, p_187251_5_, p_187251_4_, p_187251_6_, p_187251_7_, p_187251_8_, p_187251_9_); -+ else return result; +@@ -440,14 +478,20 @@ + { + int j = p_187251_3_.func_77960_j(); + int i = p_187251_3_.field_77994_a; ++ if (result != EnumActionResult.SUCCESS && event.getUseItem() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY ++ || result == EnumActionResult.SUCCESS && event.getUseItem() == net.minecraftforge.fml.common.eventhandler.Event.Result.ALLOW) { + EnumActionResult enumactionresult = p_187251_3_.func_179546_a(p_187251_1_, p_187251_2_, p_187251_5_, p_187251_4_, p_187251_6_, p_187251_7_, p_187251_8_, p_187251_9_); + p_187251_3_.func_77964_b(j); + p_187251_3_.field_77994_a = i; + return enumactionresult; ++ } else return result; + } + else + { ++ if (result != EnumActionResult.SUCCESS && event.getUseItem() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY ++ || result == EnumActionResult.SUCCESS && event.getUseItem() == net.minecraftforge.fml.common.eventhandler.Event.Result.ALLOW) + return p_187251_3_.func_179546_a(p_187251_1_, p_187251_2_, p_187251_5_, p_187251_4_, p_187251_6_, p_187251_7_, p_187251_8_, p_187251_9_); ++ else return result; + } } } - } -@@ -446,4 +491,13 @@ +@@ -457,4 +501,13 @@ { this.field_73092_a = p_73080_1_; } diff --git a/patches/minecraft/net/minecraft/server/management/PlayerList.java.patch b/patches/minecraft/net/minecraft/server/management/PlayerList.java.patch index 12da4cfaf..f556df712 100644 --- a/patches/minecraft/net/minecraft/server/management/PlayerList.java.patch +++ b/patches/minecraft/net/minecraft/server/management/PlayerList.java.patch @@ -199,8 +199,8 @@ - if (p_82448_1_.field_71093_bK == -1) + if (false && p_82448_1_.field_71093_bK == -1) { - d0 = MathHelper.func_151237_a(d0 / d2, p_82448_4_.func_175723_af().func_177726_b() + 16.0D, p_82448_4_.func_175723_af().func_177728_d() - 16.0D); - d1 = MathHelper.func_151237_a(d1 / d2, p_82448_4_.func_175723_af().func_177736_c() + 16.0D, p_82448_4_.func_175723_af().func_177733_e() - 16.0D); + d0 = MathHelper.func_151237_a(d0 / 8.0D, p_82448_4_.func_175723_af().func_177726_b() + 16.0D, p_82448_4_.func_175723_af().func_177728_d() - 16.0D); + d1 = MathHelper.func_151237_a(d1 / 8.0D, p_82448_4_.func_175723_af().func_177736_c() + 16.0D, p_82448_4_.func_175723_af().func_177733_e() - 16.0D); @@ -587,7 +646,7 @@ p_82448_3_.func_72866_a(p_82448_1_, false); } @@ -208,8 +208,8 @@ - else if (p_82448_1_.field_71093_bK == 0) + else if (false && p_82448_1_.field_71093_bK == 0) { - d0 = MathHelper.func_151237_a(d0 * d2, p_82448_4_.func_175723_af().func_177726_b() + 16.0D, p_82448_4_.func_175723_af().func_177728_d() - 16.0D); - d1 = MathHelper.func_151237_a(d1 * d2, p_82448_4_.func_175723_af().func_177736_c() + 16.0D, p_82448_4_.func_175723_af().func_177733_e() - 16.0D); + d0 = MathHelper.func_151237_a(d0 * 8.0D, p_82448_4_.func_175723_af().func_177726_b() + 16.0D, p_82448_4_.func_175723_af().func_177728_d() - 16.0D); + d1 = MathHelper.func_151237_a(d1 * 8.0D, p_82448_4_.func_175723_af().func_177736_c() + 16.0D, p_82448_4_.func_175723_af().func_177733_e() - 16.0D); @@ -598,7 +657,8 @@ p_82448_3_.func_72866_a(p_82448_1_, false); } diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch b/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch index 6cb437f5f..64201c392 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch +++ b/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/tileentity/TileEntity.java +++ ../src-work/minecraft/net/minecraft/tileentity/TileEntity.java -@@ -18,7 +18,7 @@ +@@ -21,7 +21,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -8,8 +8,8 @@ +public abstract class TileEntity implements net.minecraftforge.common.capabilities.ICapabilitySerializable { private static final Logger field_145852_a = LogManager.getLogger(); - private static Map < String, Class > field_145855_i = Maps. < String, Class > newHashMap(); -@@ -60,6 +60,8 @@ + private static final Map < String, Class > field_145855_i = Maps. < String, Class > newHashMap(); +@@ -63,6 +63,8 @@ public void func_145839_a(NBTTagCompound p_145839_1_) { this.field_174879_c = new BlockPos(p_145839_1_.func_74762_e("x"), p_145839_1_.func_74762_e("y"), p_145839_1_.func_74762_e("z")); @@ -18,7 +18,7 @@ } public NBTTagCompound func_189515_b(NBTTagCompound p_189515_1_) -@@ -81,6 +83,8 @@ +@@ -84,6 +86,8 @@ p_189516_1_.func_74768_a("x", this.field_174879_c.func_177958_n()); p_189516_1_.func_74768_a("y", this.field_174879_c.func_177956_o()); p_189516_1_.func_74768_a("z", this.field_174879_c.func_177952_p()); @@ -27,10 +27,10 @@ return p_189516_1_; } } -@@ -89,10 +93,11 @@ +@@ -92,10 +96,11 @@ { TileEntity tileentity = null; - String s = p_189514_0_.func_74779_i("id"); + String s = p_190200_1_.func_74779_i("id"); + Class oclass = null; try @@ -40,27 +40,27 @@ if (oclass != null) { -@@ -102,6 +107,9 @@ +@@ -105,6 +110,9 @@ catch (Throwable throwable1) { - field_145852_a.error("Failed to create block entity " + s, throwable1); + field_145852_a.error("Failed to create block entity {}", new Object[] {s, throwable1}); + net.minecraftforge.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, throwable1, + "A TileEntity %s(%s) has thrown an exception during loading, its state cannot be restored. Report this to the mod author", + s, oclass.getName()); } if (tileentity != null) -@@ -113,6 +121,9 @@ +@@ -117,6 +125,9 @@ catch (Throwable throwable) { - field_145852_a.error("Failed to load data for block entity " + s, throwable); + field_145852_a.error("Failed to load data for block entity {}", new Object[] {s, throwable}); + net.minecraftforge.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, throwable, + "A TileEntity %s(%s) has thrown an exception during loading, its state cannot be restored. Report this to the mod author", + s, oclass.getName()); tileentity = null; } } -@@ -150,7 +161,6 @@ +@@ -158,7 +169,6 @@ } } @@ -68,8 +68,8 @@ public double func_145835_a(double p_145835_1_, double p_145835_3_, double p_145835_5_) { double d0 = (double)this.field_174879_c.func_177958_n() + 0.5D - p_145835_1_; -@@ -283,6 +293,198 @@ - return false; +@@ -305,6 +315,198 @@ + { } + // -- BEGIN FORGE PATCHES -- diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.java.patch b/patches/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.java.patch index b980f3b7e..2be1cd6d4 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.java.patch +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.java +++ ../src-work/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.java -@@ -141,7 +141,7 @@ +@@ -144,7 +144,7 @@ private boolean func_145934_k() { @@ -9,7 +9,7 @@ { ItemStack itemstack = this.field_145945_j[3]; -@@ -166,25 +166,23 @@ +@@ -169,25 +169,23 @@ } else { @@ -40,15 +40,15 @@ if (itemstack.field_77994_a <= 0) { -@@ -203,6 +201,7 @@ +@@ -206,6 +204,7 @@ this.field_145945_j[3] = itemstack; this.field_145850_b.func_175718_b(1035, blockpos, 0); + net.minecraftforge.event.ForgeEventFactory.onPotionBrewed(field_145945_j); } - public void func_145839_a(NBTTagCompound p_145839_1_) -@@ -308,12 +307,12 @@ + public static void func_189675_a(DataFixer p_189675_0_) +@@ -316,12 +315,12 @@ { if (p_94041_1_ == 3) { @@ -63,7 +63,7 @@ } } -@@ -367,6 +366,26 @@ +@@ -375,6 +374,26 @@ } } diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityChest.java.patch b/patches/minecraft/net/minecraft/tileentity/TileEntityChest.java.patch index 9aa186e5f..ee47db69a 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityChest.java.patch +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityChest.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/tileentity/TileEntityChest.java +++ ../src-work/minecraft/net/minecraft/tileentity/TileEntityChest.java -@@ -176,6 +176,7 @@ +@@ -184,6 +184,7 @@ { super.func_145836_u(); this.field_145984_a = false; @@ -8,7 +8,7 @@ } @SuppressWarnings("incomplete-switch") -@@ -462,4 +463,26 @@ +@@ -470,4 +471,26 @@ this.field_145985_p[i] = null; } } diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch b/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch index 4a601515d..00ef493cf 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/tileentity/TileEntityFurnace.java +++ ../src-work/minecraft/net/minecraft/tileentity/TileEntityFurnace.java -@@ -114,9 +114,9 @@ +@@ -122,9 +122,9 @@ } } @@ -13,7 +13,7 @@ this.field_145963_i = func_145952_a(this.field_145957_n[1]); if (p_145839_1_.func_150297_b("CustomName", 8)) -@@ -128,9 +128,9 @@ +@@ -136,9 +136,9 @@ public NBTTagCompound func_189515_b(NBTTagCompound p_189515_1_) { super.func_189515_b(p_189515_1_); @@ -26,7 +26,7 @@ NBTTagList nbttaglist = new NBTTagList(); for (int i = 0; i < this.field_145957_n.length; ++i) -@@ -198,8 +198,7 @@ +@@ -207,8 +207,7 @@ if (this.field_145957_n[1].field_77994_a == 0) { @@ -36,7 +36,7 @@ } } } -@@ -254,7 +253,11 @@ +@@ -263,7 +262,11 @@ else { ItemStack itemstack = FurnaceRecipes.func_77602_a().func_151395_a(this.field_145957_n[0]); @@ -49,7 +49,7 @@ } } -@@ -270,7 +273,7 @@ +@@ -279,7 +282,7 @@ } else if (this.field_145957_n[2].func_77973_b() == itemstack.func_77973_b()) { @@ -58,14 +58,14 @@ } if (this.field_145957_n[0].func_77973_b() == Item.func_150898_a(Blocks.field_150360_v) && this.field_145957_n[0].func_77960_j() == 1 && this.field_145957_n[1] != null && this.field_145957_n[1].func_77973_b() == Items.field_151133_ar) -@@ -317,7 +320,15 @@ +@@ -326,7 +329,15 @@ } } -- return item instanceof ItemTool && ((ItemTool)item).func_77861_e().equals("WOOD") ? 200 : (item instanceof ItemSword && ((ItemSword)item).func_150932_j().equals("WOOD") ? 200 : (item instanceof ItemHoe && ((ItemHoe)item).func_77842_f().equals("WOOD") ? 200 : (item == Items.field_151055_y ? 100 : (item == Items.field_151044_h ? 1600 : (item == Items.field_151129_at ? 20000 : (item == Item.func_150898_a(Blocks.field_150345_g) ? 100 : (item == Items.field_151072_bj ? 2400 : 0))))))); -+ if (item instanceof ItemTool && ((ItemTool)item).func_77861_e().equals("WOOD")) return 200; -+ if (item instanceof ItemSword && ((ItemSword)item).func_150932_j().equals("WOOD")) return 200; -+ if (item instanceof ItemHoe && ((ItemHoe)item).func_77842_f().equals("WOOD")) return 200; +- return item instanceof ItemTool && "WOOD".equals(((ItemTool)item).func_77861_e()) ? 200 : (item instanceof ItemSword && "WOOD".equals(((ItemSword)item).func_150932_j()) ? 200 : (item instanceof ItemHoe && "WOOD".equals(((ItemHoe)item).func_77842_f()) ? 200 : (item == Items.field_151055_y ? 100 : (item == Items.field_151044_h ? 1600 : (item == Items.field_151129_at ? 20000 : (item == Item.func_150898_a(Blocks.field_150345_g) ? 100 : (item == Items.field_151072_bj ? 2400 : 0))))))); ++ if (item instanceof ItemTool && "WOOD".equals(((ItemTool)item).func_77861_e())) return 200; ++ if (item instanceof ItemSword && "WOOD".equals(((ItemSword)item).func_150932_j())) return 200; ++ if (item instanceof ItemHoe && "WOOD".equals(((ItemHoe)item).func_77842_f())) return 200; + if (item == Items.field_151055_y) return 100; + if (item == Items.field_151044_h) return 1600; + if (item == Items.field_151129_at) return 20000; @@ -75,7 +75,7 @@ } } -@@ -438,4 +449,22 @@ +@@ -447,4 +458,22 @@ this.field_145957_n[i] = null; } } diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityHopper.java.patch b/patches/minecraft/net/minecraft/tileentity/TileEntityHopper.java.patch index 2ffd6a684..b03d1e59b 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityHopper.java.patch +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityHopper.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/tileentity/TileEntityHopper.java +++ ../src-work/minecraft/net/minecraft/tileentity/TileEntityHopper.java -@@ -243,6 +243,7 @@ +@@ -251,6 +251,7 @@ private boolean func_145883_k() { @@ -8,7 +8,7 @@ IInventory iinventory = this.func_145895_l(); if (iinventory == null) -@@ -349,6 +350,7 @@ +@@ -357,6 +358,7 @@ public static boolean func_145891_a(IHopper p_145891_0_) { @@ -16,7 +16,7 @@ IInventory iinventory = func_145884_b(p_145891_0_); if (iinventory != null) -@@ -498,17 +500,31 @@ +@@ -506,17 +508,31 @@ if (itemstack == null) { @@ -49,7 +49,7 @@ } if (flag) -@@ -654,4 +670,10 @@ +@@ -662,4 +678,10 @@ this.field_145900_a[i] = null; } } diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityPiston.java.patch b/patches/minecraft/net/minecraft/tileentity/TileEntityPiston.java.patch index 9a9ead760..cf2a090b7 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityPiston.java.patch +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityPiston.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/tileentity/TileEntityPiston.java +++ ../src-work/minecraft/net/minecraft/tileentity/TileEntityPiston.java -@@ -201,7 +201,8 @@ +@@ -203,7 +203,8 @@ if (this.field_145850_b.func_180495_p(this.field_174879_c).func_177230_c() == Blocks.field_180384_M) { this.field_145850_b.func_180501_a(this.field_174879_c, this.field_174932_a, 3); @@ -10,7 +10,7 @@ } } } -@@ -219,7 +220,8 @@ +@@ -221,7 +222,8 @@ if (this.field_145850_b.func_180495_p(this.field_174879_c).func_177230_c() == Blocks.field_180384_M) { this.field_145850_b.func_180501_a(this.field_174879_c, this.field_174932_a, 3); diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntitySign.java.patch b/patches/minecraft/net/minecraft/tileentity/TileEntitySign.java.patch index 6b66af8ce..b5069bceb 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntitySign.java.patch +++ b/patches/minecraft/net/minecraft/tileentity/TileEntitySign.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/tileentity/TileEntitySign.java +++ ../src-work/minecraft/net/minecraft/tileentity/TileEntitySign.java -@@ -61,7 +61,7 @@ +@@ -66,7 +66,7 @@ } public boolean func_70003_b(int p_70003_1_, String p_70003_2_) { diff --git a/patches/minecraft/net/minecraft/util/SoundEvent.java.patch b/patches/minecraft/net/minecraft/util/SoundEvent.java.patch index 26b5a580d..a8d86ef43 100644 --- a/patches/minecraft/net/minecraft/util/SoundEvent.java.patch +++ b/patches/minecraft/net/minecraft/util/SoundEvent.java.patch @@ -10,5 +10,5 @@ - public static final RegistryNamespaced field_187505_a = new RegistryNamespaced(); + public static final RegistryNamespaced field_187505_a = net.minecraftforge.fml.common.registry.GameData.getSoundEventRegistry(); private final ResourceLocation field_187506_b; - private static int field_187507_c = 0; + private static int field_187507_c; diff --git a/patches/minecraft/net/minecraft/util/TabCompleter.java.patch b/patches/minecraft/net/minecraft/util/TabCompleter.java.patch index e86dd9d75..4d34d47f2 100644 --- a/patches/minecraft/net/minecraft/util/TabCompleter.java.patch +++ b/patches/minecraft/net/minecraft/util/TabCompleter.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/util/TabCompleter.java +++ ../src-work/minecraft/net/minecraft/util/TabCompleter.java -@@ -54,13 +54,14 @@ +@@ -55,13 +55,14 @@ this.field_186844_a.func_146175_b(i - this.field_186844_a.func_146198_h()); } @@ -16,7 +16,7 @@ Minecraft.func_71410_x().field_71439_g.field_71174_a.func_147297_a(new CPacketTabComplete(p_186838_1_, this.func_186839_b(), this.field_186845_b)); this.field_186847_d = true; } -@@ -76,6 +77,12 @@ +@@ -77,6 +78,12 @@ this.field_186846_c = false; this.field_186849_f.clear(); @@ -29,7 +29,7 @@ for (String s : p_186840_1_) { if (!s.isEmpty()) -@@ -86,6 +93,7 @@ +@@ -87,6 +94,7 @@ String s1 = this.field_186844_a.func_146179_b().substring(this.field_186844_a.func_146197_a(-1, this.field_186844_a.func_146198_h(), false)); String s2 = org.apache.commons.lang3.StringUtils.getCommonPrefix(p_186840_1_); diff --git a/patches/minecraft/net/minecraft/util/math/Vec3d.java.patch b/patches/minecraft/net/minecraft/util/math/Vec3d.java.patch index b40d5474c..cfcc654e4 100644 --- a/patches/minecraft/net/minecraft/util/math/Vec3d.java.patch +++ b/patches/minecraft/net/minecraft/util/math/Vec3d.java.patch @@ -18,3 +18,25 @@ public Vec3d func_72431_c(Vec3d p_72431_1_) { return new Vec3d(this.field_72448_b * p_72431_1_.field_72449_c - this.field_72449_c * p_72431_1_.field_72448_b, this.field_72449_c * p_72431_1_.field_72450_a - this.field_72450_a * p_72431_1_.field_72449_c, this.field_72450_a * p_72431_1_.field_72448_b - this.field_72448_b * p_72431_1_.field_72450_a); +@@ -114,7 +110,6 @@ + return (double)MathHelper.func_76133_a(this.field_72450_a * this.field_72450_a + this.field_72448_b * this.field_72448_b + this.field_72449_c * this.field_72449_c); + } + +- @SideOnly(Side.CLIENT) + public double func_189985_c() + { + return this.field_72450_a * this.field_72450_a + this.field_72448_b * this.field_72448_b + this.field_72449_c * this.field_72449_c; +@@ -227,13 +222,11 @@ + return new Vec3d(d0, d1, d2); + } + +- @SideOnly(Side.CLIENT) + public static Vec3d func_189984_a(Vec2f p_189984_0_) + { + return func_189986_a(p_189984_0_.field_189982_i, p_189984_0_.field_189983_j); + } + +- @SideOnly(Side.CLIENT) + public static Vec3d func_189986_a(float p_189986_0_, float p_189986_1_) + { + float f = MathHelper.func_76134_b(-p_189986_1_ * 0.017453292F - (float)Math.PI); diff --git a/patches/minecraft/net/minecraft/world/World.java.patch b/patches/minecraft/net/minecraft/world/World.java.patch index 6c96ad693..dd1985559 100644 --- a/patches/minecraft/net/minecraft/world/World.java.patch +++ b/patches/minecraft/net/minecraft/world/World.java.patch @@ -159,7 +159,7 @@ { return false; } -@@ -790,7 +839,7 @@ +@@ -795,7 +844,7 @@ public boolean func_72935_r() { @@ -168,7 +168,7 @@ } @Nullable -@@ -993,6 +1042,13 @@ +@@ -998,6 +1047,13 @@ public void func_184148_a(@Nullable EntityPlayer p_184148_1_, double p_184148_2_, double p_184148_4_, double p_184148_6_, SoundEvent p_184148_8_, SoundCategory p_184148_9_, float p_184148_10_, float p_184148_11_) { @@ -182,7 +182,7 @@ for (int i = 0; i < this.field_73021_x.size(); ++i) { ((IWorldEventListener)this.field_73021_x.get(i)).func_184375_a(p_184148_1_, p_184148_8_, p_184148_9_, p_184148_2_, p_184148_4_, p_184148_6_, p_184148_10_, p_184148_11_); -@@ -1038,6 +1094,9 @@ +@@ -1043,6 +1099,9 @@ public boolean func_72838_d(Entity p_72838_1_) { @@ -192,7 +192,7 @@ int i = MathHelper.func_76128_c(p_72838_1_.field_70165_t / 16.0D); int j = MathHelper.func_76128_c(p_72838_1_.field_70161_v / 16.0D); boolean flag = p_72838_1_.field_98038_p; -@@ -1060,6 +1119,8 @@ +@@ -1065,6 +1124,8 @@ this.func_72854_c(); } @@ -201,7 +201,7 @@ this.func_72964_e(i, j).func_76612_a(p_72838_1_); this.field_72996_f.add(p_72838_1_); this.func_72923_a(p_72838_1_); -@@ -1291,7 +1352,6 @@ +@@ -1296,7 +1357,6 @@ return list; } @@ -209,7 +209,7 @@ public void func_72848_b(IWorldEventListener p_72848_1_) { this.field_73021_x.remove(p_72848_1_); -@@ -1354,19 +1414,38 @@ +@@ -1359,19 +1419,38 @@ public int func_72967_a(float p_72967_1_) { @@ -250,7 +250,7 @@ float f = this.func_72826_c(p_72971_1_); float f1 = 1.0F - (MathHelper.func_76134_b(f * ((float)Math.PI * 2F)) * 2.0F + 0.2F); f1 = MathHelper.func_76131_a(f1, 0.0F, 1.0F); -@@ -1379,6 +1458,12 @@ +@@ -1384,6 +1463,12 @@ @SideOnly(Side.CLIENT) public Vec3d func_72833_a(Entity p_72833_1_, float p_72833_2_) { @@ -263,7 +263,7 @@ float f = this.func_72826_c(p_72833_2_); float f1 = MathHelper.func_76134_b(f * ((float)Math.PI * 2F)) * 2.0F + 0.5F; f1 = MathHelper.func_76131_a(f1, 0.0F, 1.0F); -@@ -1386,9 +1471,7 @@ +@@ -1391,9 +1476,7 @@ int j = MathHelper.func_76128_c(p_72833_1_.field_70163_u); int k = MathHelper.func_76128_c(p_72833_1_.field_70161_v); BlockPos blockpos = new BlockPos(i, j, k); @@ -274,7 +274,7 @@ float f3 = (float)(l >> 16 & 255) / 255.0F; float f4 = (float)(l >> 8 & 255) / 255.0F; float f5 = (float)(l & 255) / 255.0F; -@@ -1448,6 +1531,11 @@ +@@ -1453,6 +1536,11 @@ public float func_130001_d() { @@ -286,7 +286,7 @@ return WorldProvider.field_111203_a[this.field_73011_w.func_76559_b(this.field_72986_A.func_76073_f())]; } -@@ -1460,6 +1548,12 @@ +@@ -1465,6 +1553,12 @@ @SideOnly(Side.CLIENT) public Vec3d func_72824_f(float p_72824_1_) { @@ -299,7 +299,7 @@ float f = this.func_72826_c(p_72824_1_); float f1 = MathHelper.func_76134_b(f * ((float)Math.PI * 2F)) * 2.0F + 0.5F; f1 = MathHelper.func_76131_a(f1, 0.0F, 1.0F); -@@ -1515,9 +1609,9 @@ +@@ -1520,9 +1614,9 @@ for (blockpos = new BlockPos(p_175672_1_.func_177958_n(), chunk.func_76625_h() + 16, p_175672_1_.func_177952_p()); blockpos.func_177956_o() >= 0; blockpos = blockpos1) { blockpos1 = blockpos.func_177977_b(); @@ -311,7 +311,7 @@ { break; } -@@ -1529,6 +1623,12 @@ +@@ -1534,6 +1628,12 @@ @SideOnly(Side.CLIENT) public float func_72880_h(float p_72880_1_) { @@ -324,7 +324,7 @@ float f = this.func_72826_c(p_72880_1_); float f1 = 1.0F - (MathHelper.func_76134_b(f * ((float)Math.PI * 2F)) * 2.0F + 0.25F); f1 = MathHelper.func_76131_a(f1, 0.0F, 1.0F); -@@ -1580,6 +1680,12 @@ +@@ -1585,6 +1685,12 @@ entity.func_85029_a(crashreportcategory); } @@ -337,7 +337,7 @@ throw new ReportedException(crashreport); } -@@ -1641,6 +1747,12 @@ +@@ -1646,6 +1752,12 @@ CrashReport crashreport1 = CrashReport.func_85055_a(throwable1, "Ticking entity"); CrashReportCategory crashreportcategory1 = crashreport1.func_85058_a("Entity being ticked"); entity2.func_85029_a(crashreportcategory1); @@ -350,7 +350,7 @@ throw new ReportedException(crashreport1); } } -@@ -1677,7 +1789,7 @@ +@@ -1682,7 +1794,7 @@ { BlockPos blockpos = tileentity.func_174877_v(); @@ -359,7 +359,7 @@ { try { -@@ -1690,6 +1802,13 @@ +@@ -1695,6 +1807,13 @@ CrashReport crashreport2 = CrashReport.func_85055_a(throwable, "Ticking block entity"); CrashReportCategory crashreportcategory2 = crashreport2.func_85058_a("Block entity being ticked"); tileentity.func_145828_a(crashreportcategory2); @@ -373,7 +373,7 @@ throw new ReportedException(crashreport2); } } -@@ -1702,20 +1821,28 @@ +@@ -1707,20 +1826,28 @@ if (this.func_175667_e(tileentity.func_174877_v())) { @@ -405,7 +405,7 @@ this.field_72984_F.func_76318_c("pendingBlockEntities"); if (!this.field_147484_a.isEmpty()) -@@ -1754,8 +1881,12 @@ +@@ -1759,8 +1886,12 @@ public boolean func_175700_a(TileEntity p_175700_1_) { @@ -419,7 +419,7 @@ if (flag && p_175700_1_ instanceof ITickable) { this.field_175730_i.add(p_175700_1_); -@@ -1768,6 +1899,11 @@ +@@ -1773,6 +1904,11 @@ { if (this.field_147481_N) { @@ -431,7 +431,7 @@ this.field_147484_a.addAll(p_147448_1_); } else -@@ -1788,9 +1924,13 @@ +@@ -1793,9 +1929,12 @@ { int i = MathHelper.func_76128_c(p_72866_1_.field_70165_t); int j = MathHelper.func_76128_c(p_72866_1_.field_70161_v); @@ -439,15 +439,14 @@ + boolean isForced = getPersistentChunks().containsKey(new net.minecraft.util.math.ChunkPos(i >> 4, j >> 4)); + int k = isForced ? 0 : 32; + boolean canUpdate = !p_72866_2_ || this.func_175663_a(i - k, 0, j - k, i + k, 0, j + k, true); - -- if (!p_72866_2_ || this.func_175663_a(i - k, 0, j - k, i + k, 0, j + k, true)) + if (!canUpdate) canUpdate = net.minecraftforge.event.ForgeEventFactory.canEntityUpdate(p_72866_1_); -+ + +- if (!p_72866_2_ || this.func_175663_a(i - 32, 0, j - 32, i + 32, 0, j + 32, true)) + if (canUpdate) { p_72866_1_.field_70142_S = p_72866_1_.field_70165_t; p_72866_1_.field_70137_T = p_72866_1_.field_70163_u; -@@ -1989,6 +2129,10 @@ +@@ -1994,6 +2133,10 @@ blockpos$pooledmutableblockpos.func_185344_t(); return true; } @@ -458,7 +457,7 @@ } } } -@@ -2028,6 +2172,16 @@ +@@ -2033,6 +2176,16 @@ IBlockState iblockstate = this.func_180495_p(blockpos$pooledmutableblockpos); Block block = iblockstate.func_177230_c(); @@ -475,9 +474,9 @@ if (iblockstate.func_185904_a() == p_72918_2_) { double d0 = (double)((float)(l1 + 1) - BlockLiquid.func_149801_b(((Integer)iblockstate.func_177229_b(BlockLiquid.field_176367_b)).intValue())); -@@ -2104,6 +2258,9 @@ +@@ -2109,6 +2262,9 @@ { - IBlockState iblockstate = this.func_180495_p(blockpos$pooledmutableblockpos.func_185343_d(k1, l1, i2)); + IBlockState iblockstate = this.func_180495_p(blockpos$pooledmutableblockpos.func_181079_c(k1, l1, i2)); + Boolean result = iblockstate.func_177230_c().isAABBInsideMaterial(this, blockpos$pooledmutableblockpos, p_72830_1_, p_72830_2_); + if (result != null) return result; @@ -485,7 +484,7 @@ if (iblockstate.func_185904_a() == p_72830_2_) { int j2 = ((Integer)iblockstate.func_177229_b(BlockLiquid.field_176367_b)).intValue(); -@@ -2136,6 +2293,7 @@ +@@ -2141,6 +2297,7 @@ public Explosion func_72885_a(@Nullable Entity p_72885_1_, double p_72885_2_, double p_72885_4_, double p_72885_6_, float p_72885_8_, boolean p_72885_9_, boolean p_72885_10_) { Explosion explosion = new Explosion(this, p_72885_1_, p_72885_2_, p_72885_4_, p_72885_6_, p_72885_8_, p_72885_9_, p_72885_10_); @@ -493,7 +492,7 @@ explosion.func_77278_a(); explosion.func_77279_a(true); return explosion; -@@ -2258,6 +2416,7 @@ +@@ -2263,6 +2420,7 @@ public void func_175690_a(BlockPos p_175690_1_, @Nullable TileEntity p_175690_2_) { @@ -501,7 +500,7 @@ if (!this.func_189509_E(p_175690_1_)) { if (p_175690_2_ != null && !p_175690_2_.func_145837_r()) -@@ -2265,6 +2424,8 @@ +@@ -2270,6 +2428,8 @@ if (this.field_147481_N) { p_175690_2_.func_174878_a(p_175690_1_); @@ -510,7 +509,7 @@ Iterator iterator = this.field_147484_a.iterator(); while (iterator.hasNext()) -@@ -2283,8 +2444,10 @@ +@@ -2288,8 +2448,10 @@ else { this.func_175700_a(p_175690_2_); @@ -522,7 +521,7 @@ } } } -@@ -2297,6 +2460,8 @@ +@@ -2302,6 +2464,8 @@ { tileentity.func_145843_s(); this.field_147484_a.remove(tileentity); @@ -531,7 +530,7 @@ } else { -@@ -2309,6 +2474,7 @@ +@@ -2314,6 +2478,7 @@ this.func_175726_f(p_175713_1_).func_177425_e(p_175713_1_); } @@ -539,7 +538,7 @@ } public void func_147457_a(TileEntity p_147457_1_) -@@ -2335,7 +2501,7 @@ +@@ -2340,7 +2505,7 @@ if (chunk != null && !chunk.func_76621_g()) { IBlockState iblockstate = this.func_180495_p(p_175677_1_); @@ -548,7 +547,7 @@ } else { -@@ -2358,6 +2524,7 @@ +@@ -2363,6 +2528,7 @@ { this.field_72985_G = p_72891_1_; this.field_72992_H = p_72891_2_; @@ -556,7 +555,7 @@ } public void func_72835_b() -@@ -2367,6 +2534,11 @@ +@@ -2372,6 +2538,11 @@ protected void func_72947_a() { @@ -568,7 +567,7 @@ if (this.field_72986_A.func_76059_o()) { this.field_73004_o = 1.0F; -@@ -2380,6 +2552,11 @@ +@@ -2385,6 +2556,11 @@ protected void func_72979_l() { @@ -580,7 +579,7 @@ if (!this.field_73011_w.func_177495_o()) { if (!this.field_72995_K) -@@ -2499,6 +2676,11 @@ +@@ -2504,6 +2680,11 @@ public boolean func_175670_e(BlockPos p_175670_1_, boolean p_175670_2_) { @@ -592,7 +591,7 @@ Biome biome = this.func_180494_b(p_175670_1_); float f = biome.func_180626_a(p_175670_1_); -@@ -2540,6 +2722,11 @@ +@@ -2545,6 +2726,11 @@ public boolean func_175708_f(BlockPos p_175708_1_, boolean p_175708_2_) { @@ -604,7 +603,7 @@ Biome biome = this.func_180494_b(p_175708_1_); float f = biome.func_180626_a(p_175708_1_); -@@ -2557,7 +2744,7 @@ +@@ -2562,7 +2748,7 @@ { IBlockState iblockstate = this.func_180495_p(p_175708_1_); @@ -613,7 +612,7 @@ { return true; } -@@ -2589,10 +2776,11 @@ +@@ -2594,10 +2780,11 @@ else { IBlockState iblockstate = this.func_180495_p(p_175638_1_); @@ -628,16 +627,16 @@ { j = 1; } -@@ -2691,7 +2879,7 @@ +@@ -2696,7 +2883,7 @@ int j4 = j2 + enumfacing.func_96559_d(); int k4 = k2 + enumfacing.func_82599_e(); - blockpos$pooledmutableblockpos.func_185343_d(i4, j4, k4); + blockpos$pooledmutableblockpos.func_181079_c(i4, j4, k4); - int l4 = Math.max(1, this.func_180495_p(blockpos$pooledmutableblockpos).func_185891_c()); + int l4 = Math.max(1, this.func_180495_p(blockpos$pooledmutableblockpos).func_177230_c().getLightOpacity(this.func_180495_p(blockpos$pooledmutableblockpos), this, blockpos$pooledmutableblockpos)); i3 = this.func_175642_b(p_180500_1_, blockpos$pooledmutableblockpos); if (i3 == l2 - l4 && j < this.field_72994_J.length) -@@ -2799,10 +2987,10 @@ +@@ -2804,10 +2991,10 @@ public List func_175674_a(@Nullable Entity p_175674_1_, AxisAlignedBB p_175674_2_, @Nullable Predicate p_175674_3_) { List list = Lists.newArrayList(); @@ -652,7 +651,7 @@ for (int i1 = i; i1 <= j; ++i1) { -@@ -2855,10 +3043,10 @@ +@@ -2860,10 +3047,10 @@ public List func_175647_a(Class p_175647_1_, AxisAlignedBB p_175647_2_, @Nullable Predicate p_175647_3_) { @@ -667,7 +666,7 @@ List list = Lists.newArrayList(); for (int i1 = i; i1 < j; ++i1) -@@ -2938,11 +3126,13 @@ +@@ -2943,11 +3130,13 @@ public void func_175650_b(Collection p_175650_1_) { @@ -684,7 +683,7 @@ } } -@@ -2955,7 +3145,7 @@ +@@ -2960,7 +3149,7 @@ { IBlockState iblockstate = this.func_180495_p(p_175716_2_); AxisAlignedBB axisalignedbb = p_175716_3_ ? null : p_175716_1_.func_176223_P().func_185890_d(this, p_175716_2_); @@ -693,7 +692,7 @@ } public int func_181545_F() -@@ -3038,7 +3228,7 @@ +@@ -3043,7 +3232,7 @@ public int func_175651_c(BlockPos p_175651_1_, EnumFacing p_175651_2_) { IBlockState iblockstate = this.func_180495_p(p_175651_1_); @@ -702,7 +701,7 @@ } public boolean func_175640_z(BlockPos p_175640_1_) -@@ -3235,7 +3425,7 @@ +@@ -3240,7 +3429,7 @@ public long func_72905_C() { @@ -711,7 +710,7 @@ } public long func_82737_E() -@@ -3245,17 +3435,17 @@ +@@ -3250,17 +3439,17 @@ public long func_72820_D() { @@ -732,7 +731,7 @@ if (!this.func_175723_af().func_177746_a(blockpos)) { -@@ -3267,7 +3457,7 @@ +@@ -3272,7 +3461,7 @@ public void func_175652_B(BlockPos p_175652_1_) { @@ -741,7 +740,7 @@ } @SideOnly(Side.CLIENT) -@@ -3287,12 +3477,18 @@ +@@ -3292,12 +3481,18 @@ if (!this.field_72996_f.contains(p_72897_1_)) { @@ -760,7 +759,7 @@ return true; } -@@ -3386,8 +3582,7 @@ +@@ -3391,8 +3586,7 @@ public boolean func_180502_D(BlockPos p_180502_1_) { @@ -770,7 +769,7 @@ } @Nullable -@@ -3448,12 +3643,12 @@ +@@ -3453,12 +3647,12 @@ public int func_72800_K() { @@ -785,7 +784,7 @@ } public Random func_72843_D(int p_72843_1_, int p_72843_2_, int p_72843_3_) -@@ -3503,7 +3698,7 @@ +@@ -3508,7 +3702,7 @@ @SideOnly(Side.CLIENT) public double func_72919_O() { @@ -794,7 +793,7 @@ } public void func_175715_c(int p_175715_1_, BlockPos p_175715_2_, int p_175715_3_) -@@ -3537,7 +3732,7 @@ +@@ -3542,7 +3736,7 @@ public void func_175666_e(BlockPos p_175666_1_, Block p_175666_2_) { @@ -803,7 +802,7 @@ { BlockPos blockpos = p_175666_1_.func_177972_a(enumfacing); -@@ -3545,18 +3740,14 @@ +@@ -3550,18 +3744,14 @@ { IBlockState iblockstate = this.func_180495_p(blockpos); @@ -826,8 +825,8 @@ } } } -@@ -3622,6 +3813,87 @@ - return i >= -k && i <= k && j >= -k && j <= k; +@@ -3627,6 +3817,87 @@ + return i >= -128 && i <= 128 && j >= -128 && j <= 128; } + /* ======================================== FORGE START =====================================*/ diff --git a/patches/minecraft/net/minecraft/world/WorldEntitySpawner.java.patch b/patches/minecraft/net/minecraft/world/WorldEntitySpawner.java.patch index 3ae10c8cb..4f35cdf57 100644 --- a/patches/minecraft/net/minecraft/world/WorldEntitySpawner.java.patch +++ b/patches/minecraft/net/minecraft/world/WorldEntitySpawner.java.patch @@ -13,7 +13,7 @@ + java.util.ArrayList shuffled = com.google.common.collect.Lists.newArrayList(this.field_77193_b); + java.util.Collections.shuffle(shuffled); BlockPos.MutableBlockPos blockpos$mutableblockpos = new BlockPos.MutableBlockPos(); - label415: + label411: - for (ChunkPos chunkpos1 : this.field_77193_b) + for (ChunkPos chunkpos1 : shuffled) @@ -39,7 +39,7 @@ - if (j2 >= entityliving.func_70641_bl()) + if (i2 >= net.minecraftforge.event.ForgeEventFactory.getMaxSpawnPackSize(entityliving)) { - continue label415; + continue label411; } @@ -212,8 +216,9 @@ else diff --git a/patches/minecraft/net/minecraft/world/WorldProvider.java.patch b/patches/minecraft/net/minecraft/world/WorldProvider.java.patch index 78c382d6c..1930a4258 100644 --- a/patches/minecraft/net/minecraft/world/WorldProvider.java.patch +++ b/patches/minecraft/net/minecraft/world/WorldProvider.java.patch @@ -181,7 +181,7 @@ + { + BlockPos ret = this.field_76579_a.func_175694_M(); + -+ boolean isAdventure = field_76579_a.func_72912_H().func_76077_q() == WorldSettings.GameType.ADVENTURE; ++ boolean isAdventure = field_76579_a.func_72912_H().func_76077_q() == GameType.ADVENTURE; + int spawnFuzz = this.field_76579_a instanceof WorldServer ? field_76577_b.getSpawnFuzz((WorldServer)this.field_76579_a, this.field_76579_a.func_73046_m()) : 1; + int border = MathHelper.func_76128_c(field_76579_a.func_175723_af().func_177729_b(ret.func_177958_n(), ret.func_177952_p())); + if (border < spawnFuzz) spawnFuzz = border; diff --git a/patches/minecraft/net/minecraft/world/WorldServer.java.patch b/patches/minecraft/net/minecraft/world/WorldServer.java.patch index 2497d26f7..39103b4e3 100644 --- a/patches/minecraft/net/minecraft/world/WorldServer.java.patch +++ b/patches/minecraft/net/minecraft/world/WorldServer.java.patch @@ -2,7 +2,7 @@ +++ ../src-work/minecraft/net/minecraft/world/WorldServer.java @@ -98,30 +98,39 @@ private int field_147489_T; - private List field_94579_S = Lists.newArrayList(); + private final List field_94579_S = Lists.newArrayList(); + /** Stores the recently processed (lighting) chunks */ + protected Set doneChunks = new java.util.HashSet(); @@ -138,7 +138,7 @@ + //byte b0 = isForced ? 0 : 8; int k = 0; - if (this.func_175707_a(nextticklistentry1.field_180282_a.func_177982_a(-k, -k, -k), nextticklistentry1.field_180282_a.func_177982_a(k, k, k))) + if (this.func_175707_a(nextticklistentry1.field_180282_a.func_177982_a(0, 0, 0), nextticklistentry1.field_180282_a.func_177982_a(0, 0, 0))) @@ -837,6 +855,10 @@ public boolean func_175660_a(EntityPlayer p_175660_1_, BlockPos p_175660_2_) diff --git a/patches/minecraft/net/minecraft/world/WorldServerMulti.java.patch b/patches/minecraft/net/minecraft/world/WorldServerMulti.java.patch index 915671b99..a5fdfe84d 100644 --- a/patches/minecraft/net/minecraft/world/WorldServerMulti.java.patch +++ b/patches/minecraft/net/minecraft/world/WorldServerMulti.java.patch @@ -3,7 +3,7 @@ @@ -11,12 +11,13 @@ public class WorldServerMulti extends WorldServer { - private WorldServer field_175743_a; + private final WorldServer field_175743_a; + private IBorderListener borderListener; public WorldServerMulti(MinecraftServer p_i45923_1_, ISaveHandler p_i45923_2_, int p_i45923_3_, WorldServer p_i45923_4_, Profiler p_i45923_5_) diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeDecorator.java.patch b/patches/minecraft/net/minecraft/world/biome/BiomeDecorator.java.patch index 33356a6a6..0948dff44 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeDecorator.java.patch +++ b/patches/minecraft/net/minecraft/world/biome/BiomeDecorator.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/world/biome/BiomeDecorator.java +++ ../src-work/minecraft/net/minecraft/world/biome/BiomeDecorator.java -@@ -91,8 +91,10 @@ +@@ -92,8 +92,10 @@ protected void func_150513_a(Biome p_150513_1_, World p_150513_2_, Random p_150513_3_) { @@ -11,7 +11,7 @@ for (int i = 0; i < this.field_76805_H; ++i) { int j = p_150513_3_.nextInt(16) + 8; -@@ -100,6 +102,7 @@ +@@ -101,6 +103,7 @@ this.field_76810_g.func_180709_b(p_150513_2_, p_150513_3_, p_150513_2_.func_175672_r(this.field_180294_c.func_177982_a(j, 0, k))); } @@ -19,7 +19,7 @@ for (int i1 = 0; i1 < this.field_76806_I; ++i1) { int l1 = p_150513_3_.nextInt(16) + 8; -@@ -107,6 +110,7 @@ +@@ -108,6 +111,7 @@ this.field_76809_f.func_180709_b(p_150513_2_, p_150513_3_, p_150513_2_.func_175672_r(this.field_180294_c.func_177982_a(l1, 0, i6))); } @@ -27,7 +27,7 @@ for (int j1 = 0; j1 < this.field_76801_G; ++j1) { int i2 = p_150513_3_.nextInt(16) + 8; -@@ -121,6 +125,7 @@ +@@ -122,6 +126,7 @@ ++k1; } @@ -35,7 +35,7 @@ for (int j2 = 0; j2 < k1; ++j2) { int k6 = p_150513_3_.nextInt(16) + 8; -@@ -135,6 +140,7 @@ +@@ -136,6 +141,7 @@ } } @@ -43,7 +43,7 @@ for (int k2 = 0; k2 < this.field_76807_J; ++k2) { int l6 = p_150513_3_.nextInt(16) + 8; -@@ -142,6 +148,7 @@ +@@ -143,6 +149,7 @@ this.field_76826_u.func_180709_b(p_150513_2_, p_150513_3_, p_150513_2_.func_175645_m(this.field_180294_c.func_177982_a(l6, 0, k10))); } @@ -51,7 +51,7 @@ for (int l2 = 0; l2 < this.field_76802_A; ++l2) { int i7 = p_150513_3_.nextInt(16) + 8; -@@ -163,6 +170,7 @@ +@@ -164,6 +171,7 @@ } } @@ -59,7 +59,7 @@ for (int i3 = 0; i3 < this.field_76803_B; ++i3) { int j7 = p_150513_3_.nextInt(16) + 8; -@@ -176,6 +184,7 @@ +@@ -177,6 +185,7 @@ } } @@ -67,7 +67,7 @@ for (int j3 = 0; j3 < this.field_76804_C; ++j3) { int k7 = p_150513_3_.nextInt(16) + 8; -@@ -189,6 +198,7 @@ +@@ -190,6 +199,7 @@ } } @@ -75,7 +75,7 @@ for (int k3 = 0; k3 < this.field_76833_y; ++k3) { int l7 = p_150513_3_.nextInt(16) + 8; -@@ -215,6 +225,8 @@ +@@ -216,6 +226,8 @@ } } @@ -84,7 +84,7 @@ for (int l3 = 0; l3 < this.field_76798_D; ++l3) { if (p_150513_3_.nextInt(4) == 0) -@@ -265,7 +277,9 @@ +@@ -266,7 +278,9 @@ this.field_76827_t.func_180709_b(p_150513_2_, p_150513_3_, this.field_180294_c.func_177982_a(j4, l15, l8)); } } @@ -95,7 +95,7 @@ for (int k4 = 0; k4 < this.field_76799_E; ++k4) { int i9 = p_150513_3_.nextInt(16) + 8; -@@ -291,7 +305,8 @@ +@@ -292,7 +306,8 @@ this.field_76825_v.func_180709_b(p_150513_2_, p_150513_3_, this.field_180294_c.func_177982_a(j9, i19, i13)); } } @@ -105,7 +105,7 @@ if (p_150513_3_.nextInt(32) == 0) { int i5 = p_150513_3_.nextInt(16) + 8; -@@ -305,6 +320,7 @@ +@@ -306,6 +321,7 @@ } } @@ -113,7 +113,7 @@ for (int j5 = 0; j5 < this.field_76800_F; ++j5) { int l9 = p_150513_3_.nextInt(16) + 8; -@@ -320,6 +336,7 @@ +@@ -321,6 +337,7 @@ if (this.field_76808_K) { @@ -121,7 +121,7 @@ for (int k5 = 0; k5 < 50; ++k5) { int i10 = p_150513_3_.nextInt(16) + 8; -@@ -334,6 +351,7 @@ +@@ -335,6 +352,7 @@ } } @@ -129,7 +129,7 @@ for (int l5 = 0; l5 < 20; ++l5) { int j10 = p_150513_3_.nextInt(16) + 8; -@@ -343,21 +361,35 @@ +@@ -344,21 +362,35 @@ (new WorldGenLiquids(Blocks.field_150356_k)).func_180709_b(p_150513_2_, p_150513_3_, blockpos3); } } diff --git a/patches/minecraft/net/minecraft/world/biome/BiomePlains.java.patch b/patches/minecraft/net/minecraft/world/biome/BiomePlains.java.patch index b188d1548..c1b73f125 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomePlains.java.patch +++ b/patches/minecraft/net/minecraft/world/biome/BiomePlains.java.patch @@ -1,10 +1,9 @@ --- ../src-base/minecraft/net/minecraft/world/biome/BiomePlains.java +++ ../src-work/minecraft/net/minecraft/world/biome/BiomePlains.java -@@ -92,4 +92,19 @@ - +@@ -95,6 +95,21 @@ super.func_180624_a(p_180624_1_, p_180624_2_, p_180624_3_); } -+ + + @Override + public void addDefaultFlowers() + { @@ -19,4 +18,7 @@ + addFlower(red.func_176223_P().func_177226_a(red.func_176494_l(), BlockFlower.EnumFlowerType.OXEYE_DAISY), 20); + addFlower(yel.func_176223_P().func_177226_a(yel.func_176494_l(), BlockFlower.EnumFlowerType.DANDELION), 30); + } - } ++ + public WorldGenAbstractTree func_150567_a(Random p_150567_1_) + { + return (WorldGenAbstractTree)(p_150567_1_.nextInt(3) == 0 ? field_76758_O : field_76757_N); diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeSwamp.java.patch b/patches/minecraft/net/minecraft/world/biome/BiomeSwamp.java.patch index bdd743ecb..9b4a4ee1a 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeSwamp.java.patch +++ b/patches/minecraft/net/minecraft/world/biome/BiomeSwamp.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/world/biome/BiomeSwamp.java +++ ../src-work/minecraft/net/minecraft/world/biome/BiomeSwamp.java -@@ -86,4 +86,10 @@ +@@ -97,4 +97,10 @@ { return 6975545; } diff --git a/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch b/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch index b667eee8f..5137f4b72 100644 --- a/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch +++ b/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch @@ -33,7 +33,7 @@ ExtendedBlockStorage extendedblockstorage = this.field_76652_q[j >> 4]; boolean flag = false; -@@ -554,14 +556,19 @@ +@@ -555,14 +557,19 @@ extendedblockstorage.func_177484_a(i, j & 15, k, p_177436_2_); @@ -55,7 +55,7 @@ this.field_76637_e.func_175713_t(p_177436_1_); } } -@@ -578,8 +585,7 @@ +@@ -579,8 +586,7 @@ } else { @@ -65,7 +65,7 @@ if (j1 > 0) { -@@ -599,28 +605,19 @@ +@@ -600,28 +606,19 @@ } } @@ -98,7 +98,7 @@ this.field_76637_e.func_175690_a(p_177436_1_, tileentity1); } -@@ -723,6 +720,7 @@ +@@ -725,6 +722,7 @@ k = this.field_76645_j.length - 1; } @@ -106,7 +106,7 @@ p_76612_1_.field_70175_ag = true; p_76612_1_.field_70176_ah = this.field_76635_g; p_76612_1_.field_70162_ai = k; -@@ -763,7 +761,7 @@ +@@ -765,7 +763,7 @@ { IBlockState iblockstate = this.func_177435_g(p_177422_1_); Block block = iblockstate.func_177230_c(); @@ -115,7 +115,7 @@ } @Nullable -@@ -771,6 +769,12 @@ +@@ -773,6 +771,12 @@ { TileEntity tileentity = (TileEntity)this.field_150816_i.get(p_177424_1_); @@ -128,7 +128,7 @@ if (tileentity == null) { if (p_177424_2_ == Chunk.EnumCreateEntityType.IMMEDIATE) -@@ -780,14 +784,9 @@ +@@ -782,14 +786,9 @@ } else if (p_177424_2_ == Chunk.EnumCreateEntityType.QUEUED) { @@ -144,7 +144,7 @@ return tileentity; } -@@ -804,10 +803,11 @@ +@@ -806,10 +805,11 @@ public void func_177426_a(BlockPos p_177426_1_, TileEntity p_177426_2_) { @@ -157,7 +157,7 @@ { if (this.field_150816_i.containsKey(p_177426_1_)) { -@@ -816,6 +816,7 @@ +@@ -818,6 +818,7 @@ p_177426_2_.func_145829_t(); this.field_150816_i.put(p_177426_1_, p_177426_2_); @@ -165,26 +165,26 @@ } } -@@ -844,8 +845,9 @@ - entity.func_110123_P(); - } +@@ -841,8 +842,9 @@ -- this.field_76637_e.func_175650_b(this.field_76645_j[i]); -+ this.field_76637_e.func_175650_b(com.google.common.collect.ImmutableList.copyOf(this.field_76645_j[i])); + for (ClassInheritanceMultiMap classinheritancemultimap : this.field_76645_j) + { +- this.field_76637_e.func_175650_b(classinheritancemultimap); ++ this.field_76637_e.func_175650_b(com.google.common.collect.ImmutableList.copyOf(classinheritancemultimap)); } + net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.ChunkEvent.Load(this)); } public void func_76623_d() -@@ -861,6 +863,7 @@ +@@ -858,6 +860,7 @@ { - this.field_76637_e.func_175681_c(this.field_76645_j[i]); + this.field_76637_e.func_175681_c(classinheritancemultimap); } + net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.ChunkEvent.Unload(this)); } public void func_76630_e() -@@ -870,8 +873,8 @@ +@@ -867,8 +870,8 @@ public void func_177414_a(@Nullable Entity p_177414_1_, AxisAlignedBB p_177414_2_, List p_177414_3_, Predicate p_177414_4_) { @@ -195,7 +195,7 @@ i = MathHelper.func_76125_a(i, 0, this.field_76645_j.length - 1); j = MathHelper.func_76125_a(j, 0, this.field_76645_j.length - 1); -@@ -910,8 +913,8 @@ +@@ -905,8 +908,8 @@ public void func_177430_a(Class p_177430_1_, AxisAlignedBB p_177430_2_, List p_177430_3_, Predicate p_177430_4_) { @@ -206,7 +206,7 @@ i = MathHelper.func_76125_a(i, 0, this.field_76645_j.length - 1); j = MathHelper.func_76125_a(j, 0, this.field_76645_j.length - 1); -@@ -1000,6 +1003,7 @@ +@@ -995,6 +998,7 @@ { this.func_150809_p(); p_186034_1_.func_185931_b(this.field_76635_g, this.field_76647_h); @@ -214,7 +214,7 @@ this.func_76630_e(); } } -@@ -1056,7 +1060,7 @@ +@@ -1051,7 +1055,7 @@ { BlockPos blockpos = (BlockPos)this.field_177447_w.poll(); @@ -223,7 +223,7 @@ { TileEntity tileentity = this.func_177422_i(blockpos); this.field_76637_e.func_175690_a(blockpos, tileentity); -@@ -1120,6 +1124,13 @@ +@@ -1115,6 +1119,13 @@ @SideOnly(Side.CLIENT) public void func_186033_a(PacketBuffer p_186033_1_, int p_186033_2_, boolean p_186033_3_) { @@ -237,7 +237,7 @@ boolean flag = !this.field_76637_e.field_73011_w.func_177495_o(); for (int i = 0; i < this.field_76652_q.length; ++i) -@@ -1168,10 +1179,16 @@ +@@ -1163,10 +1174,16 @@ this.field_76646_k = true; this.func_76590_a(); @@ -254,7 +254,7 @@ } public Biome func_177411_a(BlockPos p_177411_1_, BiomeProvider p_177411_2_) -@@ -1239,13 +1256,13 @@ +@@ -1231,13 +1248,13 @@ BlockPos blockpos1 = blockpos.func_177982_a(k, (j << 4) + i1, l); boolean flag = i1 == 0 || i1 == 15 || k == 0 || k == 15 || l == 0 || l == 15; @@ -270,7 +270,7 @@ { this.field_76637_e.func_175664_x(blockpos2); } -@@ -1376,7 +1393,7 @@ +@@ -1368,7 +1385,7 @@ { blockpos$mutableblockpos.func_181079_c(blockpos$mutableblockpos.func_177958_n(), l, blockpos$mutableblockpos.func_177952_p()); @@ -279,7 +279,7 @@ { this.field_76637_e.func_175664_x(blockpos$mutableblockpos); } -@@ -1487,4 +1504,20 @@ +@@ -1476,4 +1493,20 @@ QUEUED, CHECK; } diff --git a/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch b/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch index a355b258e..73dacaf9e 100644 --- a/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch +++ b/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java +++ ../src-work/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java -@@ -47,9 +47,43 @@ +@@ -49,9 +49,43 @@ this.field_186055_e = p_i46673_2_; } @@ -44,7 +44,7 @@ ChunkPos chunkpos = new ChunkPos(p_75815_2_, p_75815_3_); NBTTagCompound nbttagcompound = (NBTTagCompound)this.field_75828_a.get(chunkpos); -@@ -65,11 +99,17 @@ +@@ -67,11 +101,17 @@ nbttagcompound = this.field_186055_e.func_188257_a(FixTypes.CHUNK, CompressedStreamTools.func_74794_a(datainputstream)); } @@ -62,9 +62,9 @@ + { if (!p_75822_4_.func_150297_b("Level", 10)) { - field_151505_a.error("Chunk file at " + p_75822_2_ + "," + p_75822_3_ + " is missing level data, skipping"); -@@ -93,10 +133,29 @@ - field_151505_a.error("Chunk file at " + p_75822_2_ + "," + p_75822_3_ + " is in the wrong location; relocating. (Expected " + p_75822_2_ + ", " + p_75822_3_ + ", got " + chunk.field_76635_g + ", " + chunk.field_76647_h + ")"); + field_151505_a.error("Chunk file at {},{} is missing level data, skipping", new Object[] {Integer.valueOf(p_75822_2_), Integer.valueOf(p_75822_3_)}); +@@ -95,10 +135,29 @@ + field_151505_a.error("Chunk file at {},{} is in the wrong location; relocating. (Expected {}, {}, got {}, {})", new Object[] {Integer.valueOf(p_75822_2_), Integer.valueOf(p_75822_3_), Integer.valueOf(p_75822_2_), Integer.valueOf(p_75822_3_), Integer.valueOf(chunk.field_76635_g), Integer.valueOf(chunk.field_76647_h)}); nbttagcompound.func_74768_a("xPos", p_75822_2_); nbttagcompound.func_74768_a("zPos", p_75822_3_); + @@ -94,30 +94,15 @@ } } } -@@ -112,6 +171,7 @@ +@@ -114,6 +173,7 @@ nbttagcompound.func_74782_a("Level", nbttagcompound1); - nbttagcompound.func_74768_a("DataVersion", 184); + nbttagcompound.func_74768_a("DataVersion", 510); this.func_75820_a(p_75816_2_, p_75816_1_, nbttagcompound1); + net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.ChunkDataEvent.Save(p_75816_2_, nbttagcompound)); this.func_75824_a(p_75816_2_.func_76632_l(), nbttagcompound); } catch (Exception exception) -@@ -195,13 +255,7 @@ - { - this.field_183014_e = true; - -- while (true) -- { -- if (this.func_75814_c()) -- { -- continue; -- } -- } -+ while (this.func_75814_c()); // Fernflower decompile issue... - } - finally - { -@@ -267,8 +321,17 @@ +@@ -299,8 +359,17 @@ if (entity.func_70039_c(nbttagcompound2)) { @@ -135,7 +120,7 @@ } } } -@@ -278,8 +341,17 @@ +@@ -310,8 +379,17 @@ for (TileEntity tileentity : p_75820_1_.func_177434_r().values()) { @@ -153,7 +138,7 @@ } p_75820_3_.func_74782_a("TileEntities", nbttaglist2); -@@ -348,6 +420,12 @@ +@@ -380,6 +458,12 @@ chunk.func_76616_a(p_75823_2_.func_74770_j("Biomes")); } @@ -166,7 +151,7 @@ NBTTagList nbttaglist1 = p_75823_2_.func_150295_c("Entities", 10); if (nbttaglist1 != null) -@@ -400,8 +478,6 @@ +@@ -432,8 +516,6 @@ } } } diff --git a/patches/minecraft/net/minecraft/world/gen/ChunkProviderEnd.java.patch b/patches/minecraft/net/minecraft/world/gen/ChunkProviderEnd.java.patch index 3a1687ec3..50573abdc 100644 --- a/patches/minecraft/net/minecraft/world/gen/ChunkProviderEnd.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/ChunkProviderEnd.java.patch @@ -35,7 +35,7 @@ for (int i = 0; i < 16; ++i) { for (int j = 0; j < 16; ++j) -@@ -175,6 +189,7 @@ +@@ -169,6 +183,7 @@ public Chunk func_185932_a(int p_185932_1_, int p_185932_2_) { @@ -43,7 +43,7 @@ this.field_73220_k.setSeed((long)p_185932_1_ * 341873128712L + (long)p_185932_2_ * 132897987541L); ChunkPrimer chunkprimer = new ChunkPrimer(); this.field_73231_z = this.field_73230_p.func_72959_q().func_76933_b(this.field_73231_z, p_185932_1_ * 16, p_185932_2_ * 16, 16, 16); -@@ -256,6 +271,10 @@ +@@ -250,6 +265,10 @@ private double[] func_185963_a(double[] p_185963_1_, int p_185963_2_, int p_185963_3_, int p_185963_4_, int p_185963_5_, int p_185963_6_, int p_185963_7_) { @@ -54,7 +54,7 @@ if (p_185963_1_ == null) { p_185963_1_ = new double[p_185963_5_ * p_185963_6_ * p_185963_7_]; -@@ -328,6 +347,7 @@ +@@ -322,6 +341,7 @@ public void func_185931_b(int p_185931_1_, int p_185931_2_) { BlockFalling.field_149832_M = true; @@ -62,7 +62,7 @@ BlockPos blockpos = new BlockPos(p_185931_1_ * 16, 0, p_185931_2_ * 16); if (this.field_73229_q) -@@ -375,6 +395,7 @@ +@@ -369,6 +389,7 @@ } } diff --git a/patches/minecraft/net/minecraft/world/gen/ChunkProviderHell.java.patch b/patches/minecraft/net/minecraft/world/gen/ChunkProviderHell.java.patch index 620605216..6baf68b13 100644 --- a/patches/minecraft/net/minecraft/world/gen/ChunkProviderHell.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/ChunkProviderHell.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/world/gen/ChunkProviderHell.java +++ ../src-work/minecraft/net/minecraft/world/gen/ChunkProviderHell.java -@@ -77,6 +77,19 @@ +@@ -78,6 +78,19 @@ this.field_185946_g = new NoiseGeneratorOctaves(this.field_185954_p, 10); this.field_185947_h = new NoiseGeneratorOctaves(this.field_185954_p, 16); p_i45637_1_.func_181544_b(63); @@ -20,15 +20,15 @@ } public void func_185936_a(int p_185936_1_, int p_185936_2_, ChunkPrimer p_185936_3_) -@@ -155,6 +168,7 @@ +@@ -156,6 +169,7 @@ public void func_185937_b(int p_185937_1_, int p_185937_2_, ChunkPrimer p_185937_3_) { + if (!net.minecraftforge.event.ForgeEventFactory.onReplaceBiomeBlocks(this, p_185937_1_, p_185937_2_, p_185937_3_, this.field_185952_n)) return; int i = this.field_185952_n.func_181545_F() + 1; double d0 = 0.03125D; - this.field_73185_q = this.field_73177_m.func_76304_a(this.field_73185_q, p_185937_1_ * 16, p_185937_2_ * 16, 0, 16, 16, 1, d0, d0, 1.0D); -@@ -277,6 +291,10 @@ + this.field_73185_q = this.field_73177_m.func_76304_a(this.field_73185_q, p_185937_1_ * 16, p_185937_2_ * 16, 0, 16, 16, 1, 0.03125D, 0.03125D, 1.0D); +@@ -278,6 +292,10 @@ p_185938_1_ = new double[p_185938_5_ * p_185938_6_ * p_185938_7_]; } @@ -39,33 +39,36 @@ double d0 = 684.412D; double d1 = 2053.236D; this.field_73168_g = this.field_185946_g.func_76304_a(this.field_73168_g, p_185938_2_, p_185938_3_, p_185938_4_, p_185938_5_, 1, p_185938_7_, 1.0D, 0.0D, 1.0D); -@@ -358,20 +376,25 @@ +@@ -359,6 +377,7 @@ public void func_185931_b(int p_185931_1_, int p_185931_2_) { BlockFalling.field_149832_M = true; + net.minecraftforge.event.ForgeEventFactory.onChunkPopulate(true, this, this.field_185952_n, this.field_185954_p, p_185931_1_, p_185931_2_, false); - BlockPos blockpos = new BlockPos(p_185931_1_ * 16, 0, p_185931_2_ * 16); + int i = p_185931_1_ * 16; + int j = p_185931_2_ * 16; + BlockPos blockpos = new BlockPos(i, 0, j); +@@ -366,16 +385,20 @@ ChunkPos chunkpos = new ChunkPos(p_185931_1_, p_185931_2_); this.field_73172_c.func_175794_a(this.field_185952_n, this.field_185954_p, chunkpos); + if (net.minecraftforge.event.terraingen.TerrainGen.populate(this, this.field_185952_n, this.field_185954_p, p_185931_1_, p_185931_2_, false, net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.NETHER_LAVA)) - for (int i = 0; i < 8; ++i) + for (int k = 0; k < 8; ++k) { this.field_177472_y.func_180709_b(this.field_185952_n, this.field_185954_p, blockpos.func_177982_a(this.field_185954_p.nextInt(16) + 8, this.field_185954_p.nextInt(120) + 4, this.field_185954_p.nextInt(16) + 8)); } + if (net.minecraftforge.event.terraingen.TerrainGen.populate(this, this.field_185952_n, this.field_185954_p, p_185931_1_, p_185931_2_, false, net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.FIRE)) - for (int j = 0; j < this.field_185954_p.nextInt(this.field_185954_p.nextInt(10) + 1) + 1; ++j) + for (int i1 = 0; i1 < this.field_185954_p.nextInt(this.field_185954_p.nextInt(10) + 1) + 1; ++i1) { this.field_177470_t.func_180709_b(this.field_185952_n, this.field_185954_p, blockpos.func_177982_a(this.field_185954_p.nextInt(16) + 8, this.field_185954_p.nextInt(120) + 4, this.field_185954_p.nextInt(16) + 8)); } + if (net.minecraftforge.event.terraingen.TerrainGen.populate(this, this.field_185952_n, this.field_185954_p, p_185931_1_, p_185931_2_, false, net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.GLOWSTONE)) + { - for (int k = 0; k < this.field_185954_p.nextInt(this.field_185954_p.nextInt(10) + 1); ++k) + for (int j1 = 0; j1 < this.field_185954_p.nextInt(this.field_185954_p.nextInt(10) + 1); ++j1) { this.field_177469_u.func_180709_b(this.field_185952_n, this.field_185954_p, blockpos.func_177982_a(this.field_185954_p.nextInt(16) + 8, this.field_185954_p.nextInt(120) + 4, this.field_185954_p.nextInt(16) + 8)); -@@ -381,7 +404,13 @@ +@@ -385,7 +408,13 @@ { this.field_177468_v.func_180709_b(this.field_185952_n, this.field_185954_p, blockpos.func_177982_a(this.field_185954_p.nextInt(16) + 8, this.field_185954_p.nextInt(128), this.field_185954_p.nextInt(16) + 8)); } @@ -79,24 +82,34 @@ if (this.field_185954_p.nextBoolean()) { this.field_177471_z.func_180709_b(this.field_185952_n, this.field_185954_p, blockpos.func_177982_a(this.field_185954_p.nextInt(16) + 8, this.field_185954_p.nextInt(128), this.field_185954_p.nextInt(16) + 8)); -@@ -391,17 +420,22 @@ +@@ -395,7 +424,9 @@ { this.field_177465_A.func_180709_b(this.field_185952_n, this.field_185954_p, blockpos.func_177982_a(this.field_185954_p.nextInt(16) + 8, this.field_185954_p.nextInt(128), this.field_185954_p.nextInt(16) + 8)); } + } + if (net.minecraftforge.event.terraingen.TerrainGen.generateOre(this.field_185952_n, this.field_185954_p, field_177467_w, blockpos, net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.QUARTZ)) - for (int i1 = 0; i1 < 16; ++i1) + for (int l1 = 0; l1 < 16; ++l1) { this.field_177467_w.func_180709_b(this.field_185952_n, this.field_185954_p, blockpos.func_177982_a(this.field_185954_p.nextInt(16), this.field_185954_p.nextInt(108) + 10, this.field_185954_p.nextInt(16))); +@@ -403,17 +434,22 @@ + + int i2 = this.field_185952_n.func_181545_F() / 2 + 1; + ++ if (net.minecraftforge.event.terraingen.TerrainGen.populate(this, this.field_185952_n, this.field_185954_p, p_185931_1_, p_185931_2_, false, net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.NETHER_MAGMA)) + for (int l = 0; l < 4; ++l) + { + this.field_189888_D.func_180709_b(this.field_185952_n, this.field_185954_p, blockpos.func_177982_a(this.field_185954_p.nextInt(16), i2 - 5 + this.field_185954_p.nextInt(10), this.field_185954_p.nextInt(16))); } + if (net.minecraftforge.event.terraingen.TerrainGen.populate(this, this.field_185952_n, this.field_185954_p, p_185931_1_, p_185931_2_, false, net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.NETHER_LAVA2)) - for (int j1 = 0; j1 < 16; ++j1) + for (int j2 = 0; j2 < 16; ++j2) { this.field_177473_x.func_180709_b(this.field_185952_n, this.field_185954_p, blockpos.func_177982_a(this.field_185954_p.nextInt(16), this.field_185954_p.nextInt(108) + 10, this.field_185954_p.nextInt(16))); } + biome.func_180624_a(this.field_185952_n, this.field_185954_p, new BlockPos(i, 0, j)); ++ + net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.terraingen.DecorateBiomeEvent.Post(this.field_185952_n, this.field_185954_p, blockpos)); + BlockFalling.field_149832_M = false; diff --git a/patches/minecraft/net/minecraft/world/gen/ChunkProviderOverworld.java.patch b/patches/minecraft/net/minecraft/world/gen/ChunkProviderOverworld.java.patch index 396a122e6..4a24c86b3 100644 --- a/patches/minecraft/net/minecraft/world/gen/ChunkProviderOverworld.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/ChunkProviderOverworld.java.patch @@ -40,9 +40,9 @@ { + if (!net.minecraftforge.event.ForgeEventFactory.onReplaceBiomeBlocks(this, p_185977_1_, p_185977_2_, p_185977_3_, this.field_185995_n)) return; double d0 = 0.03125D; - this.field_186002_u = this.field_185994_m.func_151599_a(this.field_186002_u, (double)(p_185977_1_ * 16), (double)(p_185977_2_ * 16), 16, 16, d0 * 2.0D, d0 * 2.0D, 1.0D); + this.field_186002_u = this.field_185994_m.func_151599_a(this.field_186002_u, (double)(p_185977_1_ * 16), (double)(p_185977_2_ * 16), 16, 16, 0.0625D, 0.0625D, 1.0D); -@@ -366,6 +387,8 @@ +@@ -364,6 +385,8 @@ boolean flag = false; ChunkPos chunkpos = new ChunkPos(p_185931_1_, p_185931_2_); @@ -51,7 +51,7 @@ if (this.field_185996_o) { if (this.field_186000_s.field_177829_w) -@@ -395,6 +418,7 @@ +@@ -393,6 +416,7 @@ } if (biome != Biomes.field_76769_d && biome != Biomes.field_76786_s && this.field_186000_s.field_177781_A && !flag && this.field_185990_i.nextInt(this.field_186000_s.field_177782_B) == 0) @@ -59,7 +59,7 @@ { int i1 = this.field_185990_i.nextInt(16) + 8; int j1 = this.field_185990_i.nextInt(256); -@@ -403,6 +427,7 @@ +@@ -401,6 +425,7 @@ } if (!flag && this.field_185990_i.nextInt(this.field_186000_s.field_177777_D / 10) == 0 && this.field_186000_s.field_177783_C) @@ -67,7 +67,7 @@ { int i2 = this.field_185990_i.nextInt(16) + 8; int l2 = this.field_185990_i.nextInt(this.field_185990_i.nextInt(248) + 8); -@@ -415,6 +440,7 @@ +@@ -413,6 +438,7 @@ } if (this.field_186000_s.field_177837_s) @@ -75,7 +75,7 @@ { for (int j2 = 0; j2 < this.field_186000_s.field_177835_t; ++j2) { -@@ -426,9 +452,12 @@ +@@ -424,9 +450,12 @@ } biome.func_180624_a(this.field_185995_n, this.field_185990_i, new BlockPos(i, 0, j)); @@ -88,7 +88,7 @@ for (int k2 = 0; k2 < 16; ++k2) { for (int j3 = 0; j3 < 16; ++j3) -@@ -447,7 +476,10 @@ +@@ -445,7 +474,10 @@ } } } diff --git a/patches/minecraft/net/minecraft/world/gen/MapGenCaves.java.patch b/patches/minecraft/net/minecraft/world/gen/MapGenCaves.java.patch index 6857f7b42..258e466ea 100644 --- a/patches/minecraft/net/minecraft/world/gen/MapGenCaves.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/MapGenCaves.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/world/gen/MapGenCaves.java +++ ../src-work/minecraft/net/minecraft/world/gen/MapGenCaves.java -@@ -141,9 +141,7 @@ +@@ -140,9 +140,7 @@ { if (l1 >= 0 && l1 < 256) { @@ -11,7 +11,7 @@ { flag3 = true; } -@@ -181,33 +179,12 @@ +@@ -180,28 +178,12 @@ IBlockState iblockstate1 = p_180702_5_.func_177856_a(j3, j2, i2); IBlockState iblockstate2 = (IBlockState)Objects.firstNonNull(p_180702_5_.func_177856_a(j3, j2 + 1, i2), field_186127_b); @@ -31,11 +31,6 @@ - { - p_180702_5_.func_177855_a(j3, j2, i2, field_186127_b); - -- if (iblockstate2.func_177230_c() == Blocks.field_150354_m) -- { -- p_180702_5_.func_177855_a(j3, j2 + 1, i2, iblockstate2.func_177229_b(BlockSand.field_176504_a) == BlockSand.EnumType.RED_SAND ? field_186129_d : field_186128_c); -- } -- - if (flag1 && p_180702_5_.func_177856_a(j3, j2 - 1, i2).func_177230_c() == Blocks.field_150346_d) - { - blockpos$mutableblockpos.func_181079_c(j3 + p_180702_3_ * 16, 0, i2 + p_180702_4_ * 16); @@ -47,7 +42,7 @@ } } } -@@ -266,4 +243,71 @@ +@@ -260,4 +242,66 @@ } } } @@ -106,11 +101,6 @@ + { + data.func_177855_a(x, y, z, field_186127_b); + -+ if (up.func_177230_c() == Blocks.field_150354_m) -+ { -+ data.func_177855_a(x, y + 1, z, up.func_177229_b(BlockSand.field_176504_a) == BlockSand.EnumType.RED_SAND ? field_186129_d : field_186128_c); -+ } -+ + if (foundTop && data.func_177856_a(x, y - 1, z).func_177230_c() == filler.func_177230_c()) + { + data.func_177855_a(x, y - 1, z, top.func_177230_c().func_176223_P()); diff --git a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenBigMushroom.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenBigMushroom.java.patch index 2ee32167e..5bf7cfad5 100644 --- a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenBigMushroom.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenBigMushroom.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/world/gen/feature/WorldGenBigMushroom.java +++ ../src-work/minecraft/net/minecraft/world/gen/feature/WorldGenBigMushroom.java -@@ -56,9 +56,9 @@ +@@ -62,9 +62,9 @@ { if (j >= 0 && j < 256) { @@ -12,7 +12,7 @@ { flag = false; } -@@ -193,8 +193,9 @@ +@@ -199,8 +199,9 @@ if (p_180709_3_.func_177956_o() >= p_180709_3_.func_177956_o() + i - 1 || blockhugemushroom$enumtype != BlockHugeMushroom.EnumType.ALL_INSIDE) { BlockPos blockpos = new BlockPos(l1, l2, i2); @@ -23,7 +23,7 @@ { this.func_175903_a(p_180709_1_, blockpos, block.func_176223_P().func_177226_a(BlockHugeMushroom.field_176380_a, blockhugemushroom$enumtype)); } -@@ -207,7 +208,7 @@ +@@ -213,7 +214,7 @@ { IBlockState iblockstate = p_180709_1_.func_180495_p(p_180709_3_.func_177981_b(i3)); diff --git a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenDeadBush.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenDeadBush.java.patch index 6f023be26..f1d9ad72c 100644 --- a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenDeadBush.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenDeadBush.java.patch @@ -1,19 +1,11 @@ --- ../src-base/minecraft/net/minecraft/world/gen/feature/WorldGenDeadBush.java +++ ../src-work/minecraft/net/minecraft/world/gen/feature/WorldGenDeadBush.java -@@ -11,12 +11,12 @@ +@@ -11,7 +11,7 @@ { public boolean func_180709_b(World p_180709_1_, Random p_180709_2_, BlockPos p_180709_3_) { -- IBlockState iblockstate; -- -- while (((iblockstate = p_180709_1_.func_180495_p(p_180709_3_)).func_185904_a() == Material.field_151579_a || iblockstate.func_185904_a() == Material.field_151584_j) && p_180709_3_.func_177956_o() > 0) -+ do +- for (IBlockState iblockstate = p_180709_1_.func_180495_p(p_180709_3_); (iblockstate.func_185904_a() == Material.field_151579_a || iblockstate.func_185904_a() == Material.field_151584_j) && p_180709_3_.func_177956_o() > 0; iblockstate = p_180709_1_.func_180495_p(p_180709_3_)) ++ for (IBlockState iblockstate = p_180709_1_.func_180495_p(p_180709_3_); (iblockstate.func_177230_c().isAir(iblockstate, p_180709_1_, p_180709_3_) || iblockstate.func_177230_c().isLeaves(iblockstate, p_180709_1_, p_180709_3_)) && p_180709_3_.func_177956_o() > 0; iblockstate = p_180709_1_.func_180495_p(p_180709_3_)) { -+ IBlockState state = p_180709_1_.func_180495_p(p_180709_3_); -+ if (!state.func_177230_c().isAir(state, p_180709_1_, p_180709_3_) && !state.func_177230_c().isLeaves(state, p_180709_1_, p_180709_3_)) break; p_180709_3_ = p_180709_3_.func_177977_b(); -- } -+ } while (p_180709_3_.func_177956_o() > 0); - - for (int i = 0; i < 4; ++i) - { + } diff --git a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenShrub.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenShrub.java.patch index 250006da9..1826fe68b 100644 --- a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenShrub.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenShrub.java.patch @@ -1,19 +1,14 @@ --- ../src-base/minecraft/net/minecraft/world/gen/feature/WorldGenShrub.java +++ ../src-work/minecraft/net/minecraft/world/gen/feature/WorldGenShrub.java -@@ -22,16 +22,16 @@ +@@ -22,14 +22,14 @@ public boolean func_180709_b(World p_180709_1_, Random p_180709_2_, BlockPos p_180709_3_) { -- IBlockState iblockstate; -- -- while (((iblockstate = p_180709_1_.func_180495_p(p_180709_3_)).func_185904_a() == Material.field_151579_a || iblockstate.func_185904_a() == Material.field_151584_j) && p_180709_3_.func_177956_o() > 0) -+ do +- for (IBlockState iblockstate = p_180709_1_.func_180495_p(p_180709_3_); (iblockstate.func_185904_a() == Material.field_151579_a || iblockstate.func_185904_a() == Material.field_151584_j) && p_180709_3_.func_177956_o() > 0; iblockstate = p_180709_1_.func_180495_p(p_180709_3_)) ++ for (IBlockState iblockstate = p_180709_1_.func_180495_p(p_180709_3_); (iblockstate.func_177230_c().isAir(iblockstate, p_180709_1_, p_180709_3_) || iblockstate.func_177230_c().isLeaves(iblockstate, p_180709_1_, p_180709_3_)) && p_180709_3_.func_177956_o() > 0; iblockstate = p_180709_1_.func_180495_p(p_180709_3_)) { -+ IBlockState state = p_180709_1_.func_180495_p(p_180709_3_); -+ if (!state.func_177230_c().isAir(state, p_180709_1_, p_180709_3_) && !state.func_177230_c().isLeaves(state, p_180709_1_, p_180709_3_)) break; p_180709_3_ = p_180709_3_.func_177977_b(); -- } -+ } while (p_180709_3_.func_177956_o() > 0); + } - Block block = p_180709_1_.func_180495_p(p_180709_3_).func_177230_c(); + IBlockState state = p_180709_1_.func_180495_p(p_180709_3_); @@ -23,7 +18,7 @@ { p_180709_3_ = p_180709_3_.func_177984_a(); this.func_175903_a(p_180709_1_, p_180709_3_, this.field_150527_b); -@@ -52,9 +52,9 @@ +@@ -50,9 +50,9 @@ if (Math.abs(i1) != k || Math.abs(k1) != k || p_180709_2_.nextInt(2) != 0) { BlockPos blockpos = new BlockPos(l, i, j1); diff --git a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga1.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga1.java.patch index c2f74f747..f228c6167 100644 --- a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga1.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga1.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga1.java +++ ../src-work/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga1.java -@@ -53,7 +53,7 @@ +@@ -54,7 +54,7 @@ { if (i1 >= 0 && i1 < 256) { @@ -9,7 +9,7 @@ { flag = false; } -@@ -72,11 +72,13 @@ +@@ -73,11 +73,13 @@ } else { @@ -26,7 +26,7 @@ int k2 = 0; for (int l2 = p_180709_3_.func_177956_o() + i; l2 >= p_180709_3_.func_177956_o() + j; --l2) -@@ -92,8 +94,9 @@ +@@ -93,8 +95,9 @@ if (Math.abs(k3) != k2 || Math.abs(j2) != k2 || k2 <= 0) { BlockPos blockpos = new BlockPos(j3, l2, i2); @@ -37,7 +37,7 @@ { this.func_175903_a(p_180709_1_, blockpos, field_181637_b); } -@@ -113,9 +116,10 @@ +@@ -114,9 +117,10 @@ for (int i3 = 0; i3 < i - 1; ++i3) { diff --git a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTallGrass.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTallGrass.java.patch index c100cd6a2..2f6ab26ee 100644 --- a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTallGrass.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTallGrass.java.patch @@ -1,19 +1,11 @@ --- ../src-base/minecraft/net/minecraft/world/gen/feature/WorldGenTallGrass.java +++ ../src-work/minecraft/net/minecraft/world/gen/feature/WorldGenTallGrass.java -@@ -19,12 +19,12 @@ +@@ -19,7 +19,7 @@ public boolean func_180709_b(World p_180709_1_, Random p_180709_2_, BlockPos p_180709_3_) { -- IBlockState iblockstate; -- -- while (((iblockstate = p_180709_1_.func_180495_p(p_180709_3_)).func_185904_a() == Material.field_151579_a || iblockstate.func_185904_a() == Material.field_151584_j) && p_180709_3_.func_177956_o() > 0) -+ do +- for (IBlockState iblockstate = p_180709_1_.func_180495_p(p_180709_3_); (iblockstate.func_185904_a() == Material.field_151579_a || iblockstate.func_185904_a() == Material.field_151584_j) && p_180709_3_.func_177956_o() > 0; iblockstate = p_180709_1_.func_180495_p(p_180709_3_)) ++ for (IBlockState iblockstate = p_180709_1_.func_180495_p(p_180709_3_); (iblockstate.func_177230_c().isAir(iblockstate, p_180709_1_, p_180709_3_) || iblockstate.func_177230_c().isLeaves(iblockstate, p_180709_1_, p_180709_3_)) && p_180709_3_.func_177956_o() > 0; iblockstate = p_180709_1_.func_180495_p(p_180709_3_)) { -+ IBlockState state = p_180709_1_.func_180495_p(p_180709_3_); -+ if (!state.func_177230_c().isAir(state, p_180709_1_, p_180709_3_) && !state.func_177230_c().isLeaves(state, p_180709_1_, p_180709_3_)) break; p_180709_3_ = p_180709_3_.func_177977_b(); -- } -+ } while (p_180709_3_.func_177956_o() > 0); - - for (int i = 0; i < 128; ++i) - { + } diff --git a/patches/minecraft/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java.patch index 3a95d326f..15c8c9b41 100644 --- a/patches/minecraft/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java.patch @@ -1,23 +1,15 @@ --- ../src-base/minecraft/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java +++ ../src-work/minecraft/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java -@@ -14,12 +14,12 @@ +@@ -14,7 +14,7 @@ { public boolean func_180709_b(World p_180709_1_, Random p_180709_2_, BlockPos p_180709_3_) { -- IBlockState iblockstate; -- -- while (((iblockstate = p_180709_1_.func_180495_p(p_180709_3_)).func_185904_a() == Material.field_151579_a || iblockstate.func_185904_a() == Material.field_151584_j) && p_180709_3_.func_177956_o() > 1) -+ do +- for (IBlockState iblockstate = p_180709_1_.func_180495_p(p_180709_3_); (iblockstate.func_185904_a() == Material.field_151579_a || iblockstate.func_185904_a() == Material.field_151584_j) && p_180709_3_.func_177956_o() > 1; iblockstate = p_180709_1_.func_180495_p(p_180709_3_)) ++ for (IBlockState iblockstate = p_180709_1_.func_180495_p(p_180709_3_); (iblockstate.func_177230_c().isAir(iblockstate, p_180709_1_, p_180709_3_) || iblockstate.func_177230_c().isLeaves(iblockstate, p_180709_1_, p_180709_3_)) && p_180709_3_.func_177956_o() > 1; iblockstate = p_180709_1_.func_180495_p(p_180709_3_)) { -+ IBlockState state = p_180709_1_.func_180495_p(p_180709_3_); -+ if (!state.func_177230_c().isAir(state, p_180709_1_, p_180709_3_) && !state.func_177230_c().isLeaves(state, p_180709_1_, p_180709_3_)) break; p_180709_3_ = p_180709_3_.func_177977_b(); -- } -+ } while (p_180709_3_.func_177956_o() > 0); - - if (p_180709_3_.func_177956_o() < 1) - { -@@ -33,7 +33,7 @@ + } +@@ -31,7 +31,7 @@ { BlockPos blockpos = p_180709_3_.func_177982_a(p_180709_2_.nextInt(4) - p_180709_2_.nextInt(4), p_180709_2_.nextInt(3) - p_180709_2_.nextInt(3), p_180709_2_.nextInt(4) - p_180709_2_.nextInt(4)); @@ -26,7 +18,7 @@ { p_180709_1_.func_180501_a(blockpos, Blocks.field_150486_ae.func_176223_P(), 2); TileEntity tileentity = p_180709_1_.func_175625_s(blockpos); -@@ -48,22 +48,22 @@ +@@ -46,22 +46,22 @@ BlockPos blockpos3 = blockpos.func_177978_c(); BlockPos blockpos4 = blockpos.func_177968_d(); diff --git a/patches/minecraft/net/minecraft/world/gen/layer/GenLayer.java.patch b/patches/minecraft/net/minecraft/world/gen/layer/GenLayer.java.patch index 18db5243b..760ae52ff 100644 --- a/patches/minecraft/net/minecraft/world/gen/layer/GenLayer.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/layer/GenLayer.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/world/gen/layer/GenLayer.java +++ ../src-work/minecraft/net/minecraft/world/gen/layer/GenLayer.java -@@ -49,12 +49,12 @@ +@@ -48,12 +48,12 @@ i = 6; } @@ -16,7 +16,7 @@ GenLayer genlayerhills = new GenLayerHills(1000L, genlayerbiomeedge, lvt_10_1_); GenLayer genlayer5 = GenLayerZoom.func_75915_a(1000L, genlayerriverinit, 2); genlayer5 = GenLayerZoom.func_75915_a(1000L, genlayer5, j); -@@ -158,8 +158,7 @@ +@@ -157,8 +157,7 @@ protected static boolean func_151618_b(int p_151618_0_) { @@ -26,7 +26,7 @@ } protected int func_151619_a(int... p_151619_1_) -@@ -171,4 +170,27 @@ +@@ -170,4 +169,27 @@ { return p_151617_2_ == p_151617_3_ && p_151617_3_ == p_151617_4_ ? p_151617_2_ : (p_151617_1_ == p_151617_2_ && p_151617_1_ == p_151617_3_ ? p_151617_1_ : (p_151617_1_ == p_151617_2_ && p_151617_1_ == p_151617_4_ ? p_151617_1_ : (p_151617_1_ == p_151617_3_ && p_151617_1_ == p_151617_4_ ? p_151617_1_ : (p_151617_1_ == p_151617_2_ && p_151617_3_ != p_151617_4_ ? p_151617_1_ : (p_151617_1_ == p_151617_3_ && p_151617_2_ != p_151617_4_ ? p_151617_1_ : (p_151617_1_ == p_151617_4_ && p_151617_2_ != p_151617_3_ ? p_151617_1_ : (p_151617_2_ == p_151617_3_ && p_151617_1_ != p_151617_4_ ? p_151617_2_ : (p_151617_2_ == p_151617_4_ && p_151617_1_ != p_151617_3_ ? p_151617_2_ : (p_151617_3_ == p_151617_4_ && p_151617_1_ != p_151617_2_ ? p_151617_3_ : this.func_151619_a(new int[] {p_151617_1_, p_151617_2_, p_151617_3_, p_151617_4_})))))))))); } diff --git a/patches/minecraft/net/minecraft/world/gen/layer/GenLayerBiome.java.patch b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerBiome.java.patch index aa13256fe..c517dd716 100644 --- a/patches/minecraft/net/minecraft/world/gen/layer/GenLayerBiome.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerBiome.java.patch @@ -5,9 +5,9 @@ public class GenLayerBiome extends GenLayer { - private Biome[] field_151623_c = new Biome[] {Biomes.field_76769_d, Biomes.field_76769_d, Biomes.field_76769_d, Biomes.field_150588_X, Biomes.field_150588_X, Biomes.field_76772_c}; -- private Biome[] field_151621_d = new Biome[] {Biomes.field_76767_f, Biomes.field_150585_R, Biomes.field_76770_e, Biomes.field_76772_c, Biomes.field_150583_P, Biomes.field_76780_h}; -- private Biome[] field_151622_e = new Biome[] {Biomes.field_76767_f, Biomes.field_76770_e, Biomes.field_76768_g, Biomes.field_76772_c}; -- private Biome[] field_151620_f = new Biome[] {Biomes.field_76774_n, Biomes.field_76774_n, Biomes.field_76774_n, Biomes.field_150584_S}; +- private final Biome[] field_151621_d = new Biome[] {Biomes.field_76767_f, Biomes.field_150585_R, Biomes.field_76770_e, Biomes.field_76772_c, Biomes.field_150583_P, Biomes.field_76780_h}; +- private final Biome[] field_151622_e = new Biome[] {Biomes.field_76767_f, Biomes.field_76770_e, Biomes.field_76768_g, Biomes.field_76772_c}; +- private final Biome[] field_151620_f = new Biome[] {Biomes.field_76774_n, Biomes.field_76774_n, Biomes.field_76774_n, Biomes.field_150584_S}; + @SuppressWarnings("unchecked") + private java.util.List[] biomes = new java.util.ArrayList[net.minecraftforge.common.BiomeManager.BiomeType.values().length]; private final ChunkProviderSettings field_175973_g; diff --git a/patches/minecraft/net/minecraft/world/gen/structure/StructureComponent.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/StructureComponent.java.patch index eaec27f2e..8b8d8c9c7 100644 --- a/patches/minecraft/net/minecraft/world/gen/structure/StructureComponent.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/StructureComponent.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/world/gen/structure/StructureComponent.java +++ ../src-work/minecraft/net/minecraft/world/gen/structure/StructureComponent.java -@@ -39,6 +39,10 @@ +@@ -40,6 +40,10 @@ public final NBTTagCompound func_143010_b() { diff --git a/patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java.patch index 22dfc8912..b63a761a8 100644 --- a/patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java +++ ../src-work/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java -@@ -58,6 +58,7 @@ +@@ -68,6 +68,7 @@ list.add(new StructureVillagePieces.PieceWeight(StructureVillagePieces.Field2.class, 3, MathHelper.func_76136_a(p_75084_0_, 2 + p_75084_1_, 4 + p_75084_1_ * 2))); list.add(new StructureVillagePieces.PieceWeight(StructureVillagePieces.House2.class, 15, MathHelper.func_76136_a(p_75084_0_, 0, 1 + p_75084_1_))); list.add(new StructureVillagePieces.PieceWeight(StructureVillagePieces.House3.class, 8, MathHelper.func_76136_a(p_75084_0_, 0 + p_75084_1_, 3 + p_75084_1_ * 2))); @@ -8,7 +8,7 @@ Iterator iterator = list.iterator(); while (iterator.hasNext()) -@@ -130,6 +131,10 @@ +@@ -140,6 +141,10 @@ { structurevillagepieces$village = StructureVillagePieces.House3.func_175849_a(p_176065_0_, p_176065_2_, p_176065_3_, p_176065_4_, p_176065_5_, p_176065_6_, p_176065_7_, p_176065_8_); } @@ -19,7 +19,7 @@ return structurevillagepieces$village; } -@@ -1447,6 +1452,7 @@ +@@ -1539,6 +1544,7 @@ public List field_74931_h; public List field_74932_i = Lists.newArrayList(); public List field_74930_j = Lists.newArrayList(); @@ -27,38 +27,48 @@ public Start() { -@@ -1460,6 +1466,8 @@ +@@ -1551,6 +1557,8 @@ + this.field_74931_h = p_i2104_6_; this.field_74928_c = p_i2104_7_; Biome biome = p_i2104_1_.func_180300_a(new BlockPos(p_i2104_4_, 0, p_i2104_5_), Biomes.field_180279_ad); - this.field_74927_b = biome == Biomes.field_76769_d || biome == Biomes.field_76786_s; + this.biome = biome; + this.startPiece = this; - this.func_175846_a(this.field_74927_b); - } -@@ -1520,6 +1528,7 @@ - protected int field_143015_k = -1; + if (biome instanceof BiomeDesert) + { +@@ -1623,6 +1631,7 @@ private int field_74896_a; - private boolean field_143014_b; + protected int field_189928_h; + protected boolean field_189929_i; + protected StructureVillagePieces.Start startPiece; public Village() { -@@ -1532,6 +1541,7 @@ - if (p_i2107_1_ != null) +@@ -1636,6 +1645,7 @@ { - this.field_143014_b = p_i2107_1_.field_74927_b; + this.field_189928_h = p_i2107_1_.field_189928_h; + this.field_189929_i = p_i2107_1_.field_189929_i; + startPiece = p_i2107_1_; } } -@@ -1647,19 +1657,27 @@ - EntityVillager entityvillager = new EntityVillager(p_74893_1_); - entityvillager.func_70012_b((double)j + 0.5D, (double)k, (double)l + 0.5D, 0.0F, 0.0F); - entityvillager.func_180482_a(p_74893_1_.func_175649_E(new BlockPos(entityvillager)), (IEntityLivingData)null); -- entityvillager.func_70938_b(this.func_180779_c(i, entityvillager.func_70946_n())); -+ entityvillager.setProfession(this.chooseForgeProfession(i, entityvillager.getProfessionForge())); - p_74893_1_.func_72838_d(entityvillager); +@@ -1768,7 +1778,7 @@ + EntityZombie entityzombie = new EntityZombie(p_74893_1_); + entityzombie.func_70012_b((double)j + 0.5D, (double)k, (double)l + 0.5D, 0.0F, 0.0F); + entityzombie.func_180482_a(p_74893_1_.func_175649_E(new BlockPos(entityzombie)), (IEntityLivingData)null); +- entityzombie.func_189778_a(ZombieType.func_190144_b(this.func_180779_c(i, 0))); ++ entityzombie.setVillagerType(chooseForgeProfession(i, net.minecraftforge.fml.common.registry.ForgeRegistries.VILLAGER_PROFESSIONS.getValue(new net.minecraft.util.ResourceLocation("minecraft:farmer")))); + entityzombie.func_110163_bv(); + p_74893_1_.func_72838_d(entityzombie); + } +@@ -1777,20 +1787,28 @@ + EntityVillager entityvillager = new EntityVillager(p_74893_1_); + entityvillager.func_70012_b((double)j + 0.5D, (double)k, (double)l + 0.5D, 0.0F, 0.0F); + entityvillager.func_180482_a(p_74893_1_.func_175649_E(new BlockPos(entityvillager)), (IEntityLivingData)null); +- entityvillager.func_70938_b(this.func_180779_c(i, entityvillager.func_70946_n())); ++ entityvillager.setProfession(this.chooseForgeProfession(i, entityvillager.getProfessionForge())); + p_74893_1_.func_72838_d(entityvillager); + } } } } @@ -78,6 +88,6 @@ + net.minecraftforge.event.terraingen.BiomeEvent.GetVillageBlockID event = new net.minecraftforge.event.terraingen.BiomeEvent.GetVillageBlockID(startPiece == null ? null : startPiece.biome, p_175847_1_); + net.minecraftforge.common.MinecraftForge.TERRAIN_GEN_BUS.post(event); + if (event.getResult() == net.minecraftforge.fml.common.eventhandler.Event.Result.DENY) return event.getReplacement(); - if (this.field_143014_b) + if (this.field_189928_h == 1) { if (p_175847_1_.func_177230_c() == Blocks.field_150364_r || p_175847_1_.func_177230_c() == Blocks.field_150363_s) diff --git a/patches/minecraft/net/minecraft/world/storage/WorldInfo.java.patch b/patches/minecraft/net/minecraft/world/storage/WorldInfo.java.patch index cae175b98..d3dbb5335 100644 --- a/patches/minecraft/net/minecraft/world/storage/WorldInfo.java.patch +++ b/patches/minecraft/net/minecraft/world/storage/WorldInfo.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/world/storage/WorldInfo.java +++ ../src-work/minecraft/net/minecraft/world/storage/WorldInfo.java -@@ -61,6 +61,7 @@ +@@ -66,6 +66,7 @@ private int field_176155_J = 15; private final Map field_186348_N = Maps.newEnumMap(DimensionType.class); private GameRules field_82577_x = new GameRules(); @@ -8,7 +8,7 @@ protected WorldInfo() { -@@ -786,6 +787,26 @@ +@@ -807,6 +808,26 @@ }); } diff --git a/patches/minecraft/net/minecraft/world/storage/loot/LootEntry.java.patch b/patches/minecraft/net/minecraft/world/storage/loot/LootEntry.java.patch index 31c3c5384..5bd7392dc 100644 --- a/patches/minecraft/net/minecraft/world/storage/loot/LootEntry.java.patch +++ b/patches/minecraft/net/minecraft/world/storage/loot/LootEntry.java.patch @@ -35,7 +35,7 @@ + LootEntry ret = net.minecraftforge.common.ForgeHooks.deserializeJsonLootEntry(s, jsonobject, i, j, alootcondition); + if (ret != null) return ret; + - if (s.equals("item")) + if ("item".equals(s)) { return LootEntryItem.func_186367_a(jsonobject, p_deserialize_3_, i, j, alootcondition); @@ -78,6 +85,8 @@ diff --git a/patches/minecraft/net/minecraft/world/storage/loot/LootEntryItem.java.patch b/patches/minecraft/net/minecraft/world/storage/loot/LootEntryItem.java.patch index ea6336293..240a8c049 100644 --- a/patches/minecraft/net/minecraft/world/storage/loot/LootEntryItem.java.patch +++ b/patches/minecraft/net/minecraft/world/storage/loot/LootEntryItem.java.patch @@ -12,7 +12,7 @@ this.field_186368_a = p_i46644_1_; this.field_186369_b = p_i46644_4_; } -@@ -42,7 +42,7 @@ +@@ -39,7 +39,7 @@ if (itemstack.field_77994_a > 0) { @@ -21,7 +21,7 @@ { p_186363_1_.add(itemstack); } -@@ -82,6 +82,7 @@ +@@ -79,6 +79,7 @@ public static LootEntryItem func_186367_a(JsonObject p_186367_0_, JsonDeserializationContext p_186367_1_, int p_186367_2_, int p_186367_3_, LootCondition[] p_186367_4_) { @@ -29,7 +29,7 @@ Item item = JsonUtils.func_188180_i(p_186367_0_, "name"); LootFunction[] alootfunction; -@@ -94,6 +95,6 @@ +@@ -91,6 +92,6 @@ alootfunction = new LootFunction[0]; } diff --git a/src/main/java/net/minecraftforge/client/EnumHelperClient.java b/src/main/java/net/minecraftforge/client/EnumHelperClient.java index 80679db27..e12349cc7 100644 --- a/src/main/java/net/minecraftforge/client/EnumHelperClient.java +++ b/src/main/java/net/minecraftforge/client/EnumHelperClient.java @@ -20,7 +20,7 @@ package net.minecraftforge.client; import net.minecraft.util.Util.EnumOS; -import net.minecraft.world.WorldSettings.GameType; +import net.minecraft.world.GameType; import net.minecraft.client.settings.GameSettings.Options; import net.minecraftforge.common.util.EnumHelper; diff --git a/src/main/java/net/minecraftforge/client/GuiIngameForge.java b/src/main/java/net/minecraftforge/client/GuiIngameForge.java index 9d01ca8e7..94eb07221 100644 --- a/src/main/java/net/minecraftforge/client/GuiIngameForge.java +++ b/src/main/java/net/minecraftforge/client/GuiIngameForge.java @@ -478,7 +478,6 @@ public class GuiIngameForge extends GuiIngame FoodStats stats = mc.thePlayer.getFoodStats(); int level = stats.getFoodLevel(); - int levelLast = stats.getPrevFoodLevel(); for (int i = 0; i < 10; ++i) { @@ -502,14 +501,6 @@ public class GuiIngameForge extends GuiIngame drawTexturedModalRect(x, y, 16 + background * 9, 27, 9, 9); - if (unused) - { - if (idx < levelLast) - drawTexturedModalRect(x, y, icon + 54, 27, 9, 9); - else if (idx == levelLast) - drawTexturedModalRect(x, y, icon + 63, 27, 9, 9); - } - if (idx < level) drawTexturedModalRect(x, y, icon + 36, 27, 9, 9); else if (idx == level) diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index f88e77d2e..9e41636a7 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -90,7 +90,7 @@ import net.minecraft.util.text.event.ClickEvent; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.world.WorldSettings; -import net.minecraft.world.WorldSettings.GameType; +import net.minecraft.world.GameType; import net.minecraft.world.storage.loot.LootEntry; import net.minecraft.world.storage.loot.LootTable; import net.minecraft.world.storage.loot.LootTableManager; @@ -682,7 +682,7 @@ public class ForgeHooks if (gameType.isAdventure()) { - if (gameType == WorldSettings.GameType.SPECTATOR) + if (gameType == GameType.SPECTATOR) preCancelEvent = true; if (!entityPlayer.isAllowEdit()) diff --git a/src/main/java/net/minecraftforge/common/ForgeVersion.java b/src/main/java/net/minecraftforge/common/ForgeVersion.java index 80714804e..eefba13d0 100644 --- a/src/main/java/net/minecraftforge/common/ForgeVersion.java +++ b/src/main/java/net/minecraftforge/common/ForgeVersion.java @@ -56,11 +56,11 @@ public class ForgeVersion //This number is incremented every time a interface changes or new major feature is added, and reset every Minecraft version public static final int revisionVersion = 0; //This number is incremented every time Jenkins builds Forge, and never reset. Should always be 0 in the repo code. - public static final int buildVersion = 0; + public static final int buildVersion = 9999; // This is the minecraft version we're building for - used in various places in Forge/FML code - public static final String mcVersion = "1.9.4"; + public static final String mcVersion = "1.10"; // This is the MCP data version we're using - public static final String mcpVersion = "9.28"; + public static final String mcpVersion = "9.32"; @SuppressWarnings("unused") private static Status status = PENDING; @SuppressWarnings("unused") diff --git a/src/main/java/net/minecraftforge/common/util/BlockSnapshot.java b/src/main/java/net/minecraftforge/common/util/BlockSnapshot.java index c437b1667..b312c23b6 100644 --- a/src/main/java/net/minecraftforge/common/util/BlockSnapshot.java +++ b/src/main/java/net/minecraftforge/common/util/BlockSnapshot.java @@ -158,7 +158,7 @@ public class BlockSnapshot implements Serializable public TileEntity getTileEntity() { if (getNbt() != null) - return TileEntity.create(getNbt()); + return TileEntity.func_190200_a(getWorld(), getNbt()); else return null; } diff --git a/src/main/java/net/minecraftforge/event/terraingen/PopulateChunkEvent.java b/src/main/java/net/minecraftforge/event/terraingen/PopulateChunkEvent.java index a1de0601f..7429938fa 100644 --- a/src/main/java/net/minecraftforge/event/terraingen/PopulateChunkEvent.java +++ b/src/main/java/net/minecraftforge/event/terraingen/PopulateChunkEvent.java @@ -134,7 +134,7 @@ public class PopulateChunkEvent extends ChunkGeneratorEvent /** Use CUSTOM to filter custom event types */ - public static enum EventType { DUNGEON, FIRE, GLOWSTONE, ICE, LAKE, LAVA, NETHER_LAVA, NETHER_LAVA2, ANIMALS, CUSTOM } + public static enum EventType { DUNGEON, FIRE, GLOWSTONE, ICE, LAKE, LAVA, NETHER_LAVA, NETHER_LAVA2, NETHER_MAGMA, ANIMALS, CUSTOM } private final EventType type; diff --git a/src/main/java/net/minecraftforge/fluids/DispenseFluidContainer.java b/src/main/java/net/minecraftforge/fluids/DispenseFluidContainer.java index 967e3dad2..a92d330a5 100644 --- a/src/main/java/net/minecraftforge/fluids/DispenseFluidContainer.java +++ b/src/main/java/net/minecraftforge/fluids/DispenseFluidContainer.java @@ -63,7 +63,7 @@ public class DispenseFluidContainer extends BehaviorDefaultDispenseItem private ItemStack fillContainer(IBlockSource source, ItemStack stack) { World world = source.getWorld(); - EnumFacing dispenserFacing = BlockDispenser.getFacing(source.getBlockMetadata()); + EnumFacing dispenserFacing = source.func_189992_e().getValue(BlockDispenser.FACING); BlockPos blockpos = source.getBlockPos().offset(dispenserFacing); ItemStack result = FluidUtil.tryPickUpFluid(stack, null, world, blockpos, dispenserFacing.getOpposite()); @@ -100,7 +100,7 @@ public class DispenseFluidContainer extends BehaviorDefaultDispenseItem } FluidStack fluidStack = fluidHandler.drain(Fluid.BUCKET_VOLUME, false); - EnumFacing dispenserFacing = BlockDispenser.getFacing(source.getBlockMetadata()); + EnumFacing dispenserFacing = source.func_189992_e().getValue(BlockDispenser.FACING); BlockPos blockpos = source.getBlockPos().offset(dispenserFacing); if (fluidStack != null && fluidStack.amount == Fluid.BUCKET_VOLUME && FluidUtil.tryPlaceFluid(null, source.getWorld(), fluidStack, blockpos)) diff --git a/src/main/java/net/minecraftforge/fml/common/FMLModContainer.java b/src/main/java/net/minecraftforge/fml/common/FMLModContainer.java index caed4443d..c38db80d2 100644 --- a/src/main/java/net/minecraftforge/fml/common/FMLModContainer.java +++ b/src/main/java/net/minecraftforge/fml/common/FMLModContainer.java @@ -225,6 +225,7 @@ public class FMLModContainer implements ModContainer String mcVersionString = (String)descriptor.get("acceptedMinecraftVersions"); if ("[1.8.8]".equals(mcVersionString)) mcVersionString = "[1.8.8,1.8.9]"; // MC 1.8.8 and 1.8.9 is forward SRG compatible so accept these versions by default. + if ("[1.9.4]".equals(mcVersionString) || "[1.9,1.9.4]".equals(mcVersionString)) mcVersionString = "[1.9.4,1.10]"; // MC 1.8.8 and 1.8.9 is forward SRG compatible so accept these versions by default. if (!Strings.isNullOrEmpty(mcVersionString)) { minecraftAccepted = VersionParser.parseRange(mcVersionString); diff --git a/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java b/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java index 4ed480eaa..c445baaa7 100644 --- a/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java +++ b/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java @@ -267,7 +267,7 @@ public class FMLDeobfuscatingRemapper extends Remapper { return name; } Map fieldMap = getFieldMap(owner); - return fieldMap!=null && fieldMap.containsKey(name+":"+desc) ? fieldMap.get(name+":"+desc) : name; + return fieldMap!=null && fieldMap.containsKey(name+":"+desc) ? fieldMap.get(name+":"+desc) : fieldMap!=null && fieldMap.containsKey(name+":null") ? fieldMap.get(name+":null") :name; } @Override @@ -443,7 +443,7 @@ public class FMLDeobfuscatingRemapper extends Remapper { public String getStaticFieldType(String oldType, String oldName, String newType, String newName) { - String fType = getFieldType(oldType, oldName); + String fType = getFieldType(newType, newName); if (oldType.equals(newType)) { return fType; diff --git a/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java b/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java index 0a843306f..55a7ffea5 100644 --- a/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java +++ b/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java @@ -28,6 +28,7 @@ import com.google.common.collect.Maps; import org.apache.commons.lang3.Validate; import net.minecraft.entity.monster.EntityZombie; +import net.minecraft.entity.monster.ZombieType; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.passive.EntityVillager.ITradeList; import net.minecraft.util.EnumFacing; @@ -355,8 +356,8 @@ public class VillagerRegistry { if (prof == null) { - if (entity.getVillagerType() != 0) - entity.setVillagerType(-1); + if (entity.func_189777_di() != ZombieType.NORMAL) + entity.func_189778_a(ZombieType.NORMAL); return; } @@ -366,21 +367,31 @@ public class VillagerRegistry throw new RuntimeException("Attempted to set villager profession to unregistered profession: " + network + " " + prof); } - if (network != entity.getVillagerType()) - entity.setVillagerType(network); + if (network >= 0 && network < 5) // Vanilla + { + if (entity.func_189777_di() == null || entity.func_189777_di().func_190150_a() != network + 1) + { + entity.func_189778_a(ZombieType.func_190144_b(network)); + } + } + else if (entity.func_189777_di() != null) + entity.func_189778_a(null); } - public static void onSetProfession(EntityZombie entity, int network) + public static void onSetProfession(EntityZombie entity, ZombieType type, int network) { - if (network == -1) + if (type == ZombieType.NORMAL || type == ZombieType.HUSK) { if (entity.getVillagerTypeForge() != null) entity.setVillagerType(null); return; } - VillagerProfession prof = INSTANCE.professions.getObjectById(network); - if (prof == null && network != 0 || INSTANCE.professions.getId(prof) != network) + int realID = network - 1; + if (type == null) //Forge type? + realID = network * -1; // Forge encoded as -ID + VillagerProfession prof = INSTANCE.professions.getObjectById(realID); + if (prof == null && network != 0 || INSTANCE.professions.getId(prof) != realID) { - throw new RuntimeException("Attempted to set villager profession to unregistered profession: " + network + " " + prof); + throw new RuntimeException("Attempted to set villager profession to unregistered profession: " + realID + " " + prof); } if (prof != entity.getVillagerTypeForge()) diff --git a/src/main/resources/forge_at.cfg b/src/main/resources/forge_at.cfg index 93aafaae5..26a401b57 100644 --- a/src/main/resources/forge_at.cfg +++ b/src/main/resources/forge_at.cfg @@ -270,4 +270,7 @@ public net.minecraft.client.renderer.entity.RenderLivingBase func_177089_b(Lnet/ # LootTable Stuff private-f net.minecraft.world.storage.loot.LootPool field_186455_c # rolls -private-f net.minecraft.world.storage.loot.LootPool field_186456_d # bonusRolls \ No newline at end of file +private-f net.minecraft.world.storage.loot.LootPool field_186456_d # bonusRolls + +#NBTPrimitive +public net.minecraft.nbt.NBTPrimitive \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/test/NoBedSleepingTest.java b/src/test/java/net/minecraftforge/test/NoBedSleepingTest.java index 56ad676c6..630ed3c38 100644 --- a/src/test/java/net/minecraftforge/test/NoBedSleepingTest.java +++ b/src/test/java/net/minecraftforge/test/NoBedSleepingTest.java @@ -7,7 +7,7 @@ import net.minecraft.entity.player.EntityPlayer.SleepResult; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTBase.NBTPrimitive; +import net.minecraft.nbt.NBTPrimitive; import net.minecraft.nbt.NBTTagByte; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; diff --git a/src/test/java/net/minecraftforge/test/PlayerInteractEventTest.java b/src/test/java/net/minecraftforge/test/PlayerInteractEventTest.java index 744ecfec5..271086f15 100644 --- a/src/test/java/net/minecraftforge/test/PlayerInteractEventTest.java +++ b/src/test/java/net/minecraftforge/test/PlayerInteractEventTest.java @@ -3,6 +3,7 @@ package net.minecraftforge.test; import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntitySkeleton; +import net.minecraft.entity.monster.SkeletonType; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.init.Items; import net.minecraft.tileentity.TileEntity; @@ -135,7 +136,7 @@ public class PlayerInteractEventTest && evt.getLocalPos().yCoord > evt.getTarget().height / 2.0) { // If we right click the upper half of a skeleton it becomes wither skeleton. Otherwise nothing happens. - ((EntitySkeleton) evt.getTarget()).setSkeletonType(1); + ((EntitySkeleton) evt.getTarget()).func_189768_a(SkeletonType.WITHER); evt.setCanceled(true); } }