From a0d78906b69fcbf289280a4fc5deb3d07b9bd970 Mon Sep 17 00:00:00 2001 From: Erik Broes Date: Fri, 1 Jul 2011 00:36:34 +0200 Subject: [PATCH] 1.7 --- META-INF/MANIFEST.MF | 8 +- achievement/map.txt | 892 ++++++------- font.txt | 18 +- lang/en_US.lang | 1148 +++++++++-------- lang/stats_US.lang | 162 +-- net/minecraft/server/Block.java | 174 +-- net/minecraft/server/BlockBed.java | 12 +- net/minecraft/server/BlockButton.java | 28 +- net/minecraft/server/BlockCactus.java | 2 +- net/minecraft/server/BlockCake.java | 4 +- net/minecraft/server/BlockChest.java | 10 +- net/minecraft/server/BlockCloth.java | 2 +- net/minecraft/server/BlockDiode.java | 24 +- net/minecraft/server/BlockDoor.java | 6 +- net/minecraft/server/BlockFence.java | 2 +- net/minecraft/server/BlockFire.java | 28 +- net/minecraft/server/BlockFlower.java | 4 +- net/minecraft/server/BlockFlowing.java | 2 +- net/minecraft/server/BlockFurnace.java | 1 + net/minecraft/server/BlockIce.java | 2 +- net/minecraft/server/BlockJukeBox.java | 2 +- net/minecraft/server/BlockLadder.java | 20 +- net/minecraft/server/BlockLeaves.java | 13 +- net/minecraft/server/BlockLever.java | 34 +- net/minecraft/server/BlockLog.java | 2 +- .../server/BlockMinecartDetector.java | 8 +- net/minecraft/server/BlockMinecartTrack.java | 18 +- net/minecraft/server/BlockMushroom.java | 2 +- net/minecraft/server/BlockOre.java | 2 +- net/minecraft/server/BlockPiston.java | 312 +++++ .../server/BlockPistonExtension.java | 132 ++ net/minecraft/server/BlockPistonMoving.java | 129 ++ net/minecraft/server/BlockPortal.java | 2 +- net/minecraft/server/BlockPressurePlate.java | 8 +- net/minecraft/server/BlockPumpkin.java | 2 +- net/minecraft/server/BlockRedstoneTorch.java | 2 +- net/minecraft/server/BlockRedstoneWire.java | 64 +- net/minecraft/server/BlockReed.java | 2 +- net/minecraft/server/BlockSapling.java | 2 +- net/minecraft/server/BlockSign.java | 2 +- net/minecraft/server/BlockSnow.java | 4 +- net/minecraft/server/BlockSnowBlock.java | 2 +- net/minecraft/server/BlockStairs.java | 8 +- net/minecraft/server/BlockStep.java | 2 +- net/minecraft/server/BlockTNT.java | 24 +- net/minecraft/server/BlockTorch.java | 46 +- net/minecraft/server/BlockTrapdoor.java | 6 +- net/minecraft/server/BlockWeb.java | 12 +- net/minecraft/server/Chunk.java | 46 +- net/minecraft/server/ChunkCache.java | 9 +- net/minecraft/server/CraftingManager.java | 2 + net/minecraft/server/Entity.java | 96 +- net/minecraft/server/EntityAnimal.java | 4 +- net/minecraft/server/EntityArrow.java | 10 +- net/minecraft/server/EntityBoat.java | 10 +- net/minecraft/server/EntityChicken.java | 4 +- net/minecraft/server/EntityCreature.java | 98 +- net/minecraft/server/EntityCreeper.java | 4 +- net/minecraft/server/EntityEgg.java | 10 +- net/minecraft/server/EntityFallingSand.java | 4 +- net/minecraft/server/EntityFireball.java | 14 +- net/minecraft/server/EntityFish.java | 14 +- net/minecraft/server/EntityFlying.java | 4 +- net/minecraft/server/EntityGhast.java | 6 +- net/minecraft/server/EntityGiantZombie.java | 2 +- net/minecraft/server/EntityHuman.java | 70 +- net/minecraft/server/EntityItem.java | 6 +- net/minecraft/server/EntityLiving.java | 88 +- net/minecraft/server/EntityMinecart.java | 14 +- net/minecraft/server/EntityMonster.java | 10 +- net/minecraft/server/EntityPainting.java | 6 +- net/minecraft/server/EntityPigZombie.java | 8 +- net/minecraft/server/EntityPlayer.java | 88 +- net/minecraft/server/EntitySheep.java | 38 +- net/minecraft/server/EntitySkeleton.java | 8 +- net/minecraft/server/EntitySlime.java | 6 +- net/minecraft/server/EntitySnowball.java | 10 +- net/minecraft/server/EntitySquid.java | 12 +- net/minecraft/server/EntityTNTPrimed.java | 4 +- net/minecraft/server/EntityTrackerEntry.java | 2 +- net/minecraft/server/EntityWeatherStorm.java | 4 +- net/minecraft/server/EntityWolf.java | 34 +- net/minecraft/server/EntityZombie.java | 4 +- net/minecraft/server/IBlockAccess.java | 4 +- net/minecraft/server/InventoryPlayer.java | 4 +- net/minecraft/server/Item.java | 11 +- net/minecraft/server/ItemArmor.java | 14 +- net/minecraft/server/ItemAxe.java | 4 +- net/minecraft/server/ItemBed.java | 2 +- net/minecraft/server/ItemBlock.java | 2 +- net/minecraft/server/ItemDoor.java | 4 +- net/minecraft/server/ItemDye.java | 3 +- net/minecraft/server/ItemFishingRod.java | 4 +- net/minecraft/server/ItemFood.java | 6 +- net/minecraft/server/ItemInWorldManager.java | 4 +- net/minecraft/server/ItemLeaves.java | 14 + net/minecraft/server/ItemPickaxe.java | 4 +- net/minecraft/server/ItemPiston.java | 12 + net/minecraft/server/ItemRecord.java | 2 +- net/minecraft/server/ItemShears.java | 26 + net/minecraft/server/ItemSpade.java | 4 +- net/minecraft/server/ItemSword.java | 6 +- net/minecraft/server/ItemTool.java | 20 +- net/minecraft/server/ItemWorldMap.java | 4 +- net/minecraft/server/Material.java | 87 +- net/minecraft/server/MaterialLiquid.java | 1 + net/minecraft/server/MetadataChunkBlock.java | 2 +- net/minecraft/server/MinecraftServer.java | 2 +- net/minecraft/server/NetServerHandler.java | 10 +- net/minecraft/server/Packet24MobSpawn.java | 2 +- net/minecraft/server/PistonBlockTextures.java | 11 + net/minecraft/server/PlayerInstance.java | 2 +- net/minecraft/server/RecipesTools.java | 2 + .../server/ServerConfigurationManager.java | 10 +- net/minecraft/server/SlotArmor.java | 2 +- net/minecraft/server/SpawnerCreature.java | 10 +- net/minecraft/server/StatisticList.java | 4 +- net/minecraft/server/TileEntity.java | 20 +- .../server/TileEntityMobSpawner.java | 21 +- net/minecraft/server/TileEntityPiston.java | 124 ++ net/minecraft/server/TileEntitySign.java | 2 +- net/minecraft/server/World.java | 260 ++-- net/minecraft/server/WorldGenClay.java | 4 +- 123 files changed, 2951 insertions(+), 1919 deletions(-) create mode 100644 net/minecraft/server/BlockPiston.java create mode 100644 net/minecraft/server/BlockPistonExtension.java create mode 100644 net/minecraft/server/BlockPistonMoving.java create mode 100644 net/minecraft/server/ItemLeaves.java create mode 100644 net/minecraft/server/ItemPiston.java create mode 100644 net/minecraft/server/ItemShears.java create mode 100644 net/minecraft/server/PistonBlockTextures.java create mode 100644 net/minecraft/server/TileEntityPiston.java diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index e2bcd05..e8694aa 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,4 +1,4 @@ -Manifest-Version: 1.0 -Created-By: 1.6.0 -Main-Class: net.minecraft.server.MinecraftServer - +Manifest-Version: 1.0 +Created-By: 1.6.0 +Main-Class: net.minecraft.server.MinecraftServer + diff --git a/achievement/map.txt b/achievement/map.txt index 7f1de22..aaf280a 100644 --- a/achievement/map.txt +++ b/achievement/map.txt @@ -1,446 +1,446 @@ -1000,43ddd8b48469d9a8c011718aa846facb -1001,aaed8c669f583cf35300f7c5d5396fce -1002,d517ae73160fd8576d7687ead1c1a973 -1003,ac37df168bae3c69a24d7fd5bae913c7 -1004,6d2591e94464b8327afadbdba44978d -1100,8b1df73e012e2ae34cd2d84a72a7898b -2000,c9ee0d494e0524c86a577cf684f5816d -2001,cd7a2836ea0b77b23a6131222f5be354 -2002,381aeedb2c5c5a7a9a01333e0eebc839 -2003,229048d1bb9e928831734cb2e5000286 -2004,b2c088c3c6928bfe29684a75ae1b127c -2005,1ce3491a1021a5aed07c687e3f6133e6 -2006,6c3d114caffd8160f7d56fc8757419a -2007,bcb501cfac8f7e73b455563bddbcb417 -2008,e1aa93d7bba48898a32810c43c6ff5c3 -2010,d0818779df1b967cc2f8ffc3ada631ec -2011,ecf0dbe93240e84edf6bd263645e634f -2020,b4a67353e11c3039ad755a3e96b4a046 -2021,1bb21f7731a5b3ffc6a1e2b586dae3f5 -2022,e58162e284df8fe339f05626eb46d835 -2023,739948643f5f6f685aea81c42883a480 -2024,799b0d35362a9574d3226c2d762b53c6 -2025,5ec18fbb462516a1e1a3427e0595a7d6 -16908544,12512904b67d2091dd516dc8eeb0cfa0 -16908545,a5c35cc01a263f91419d3e8e981708f1 -16908546,f6bdebf227e42c204066cede8cb5928c -16908547,9c44e6d3ab80afa2bb52fe3499559d5e -16908548,2e1799ddfdab14417c2a8e24d8c0c731 -16908549,3f4169a181feb5d2532efc6aa91f2ee5 -16908550,895725d3432cbf374b1cce4f7db28e9 -16908551,12892864f18d30521b6f4a6c45b65ece -16908552,146f6c3458adde8e0bca04d976275f85 -16908553,7c40dbd9451129b4762f3ab04ce7ffb9 -16908554,56d763eeb6a0107c2146d7dccd686d2a -16908555,9a4fff004ae419711c2a876b57cba69f -16908556,170ff67dd90d8d3d8dae393037da5e9b -16908557,3e65d657af8611cb3578cd8713419d4c -16908558,f3cb95383f698c4e9721b5aaa5fac3a7 -16908559,65bd006dc163a186f2dbb127f8ec0b27 -16908560,8c6479d786f9117e04910153a4f47d86 -16908561,75a25bd69f36250789d914ac01da34c1 -16908562,87a28b2bf2fad838af72ce00e2fb1937 -16908563,249ff32d605c5ba0a07694ff4fbbf15a -16908564,ba3b355eb9134bcd7522a1fc203c4c58 -16908565,321e1cb3657d2aca73fb9a8083d9c3bf -16908566,adb182051fab2c2269df89b4f75e505e -16908567,3d9ae8982f01fb6a6c56cffbe2fa074e -16908568,1efffb054b2c864f5ebe180ae46891c3 -16908569,25c73629d0b6b46690d222cecf331ba2 -16908570,6a46694c996e5721b14c9da1f00fe62c -16908571,5efc1c291eef23fe33f5209388b8cc33 -16908572,f71fc7deef6835c8efc305a00f1e8b8f -16908573,15484a373254c6024d90edf3b7a82947 -16908574,8253f1aaa2205dcaf828903cfce46e4 -16908575,ab778410d1fb2c0e55fec0c7d764b17c -16908576,19ad61c04ff3ae082955f72fc8771866 -16908577,b5d3eeff40086643a03f034b5345504d -16908578,3d647bf5562e743263cbd90be36b6a1c -16908579,5a9d2fb7050009785421257d5ef24416 -16908580,909b03e2d2eeee2e868b5aaf446e81ea -16908581,e603a4cbfdfcbf4d0bfe25efb753b424 -16908582,e355f481f99220e50e4b2b2eb45dcc56 -16908583,73a25e59c2d18ae77db02928b0a70e3 -16908584,8f81a2fb647f817422a299829994de7b -16908585,128e9978380ee9ef981d2e12d008255e -16908586,fd1453f3e2a3125e7d16cfe6fd2d4722 -16908587,8e27b6f750bec22333a5d4108ce1e094 -16908588,b2169f6190bdf95236037bed2301712b -16908589,536e6340e5328075ede672428d94d921 -16908590,cb9eede8b783b4a5d7ff7529e3fb1f44 -16908591,267d51d891c3c32b3a02577d38f4e242 -16908592,3f31e8ab260f02acca218c720fafc7b8 -16908593,552869a63aa3151e79e875596f31e505 -16908594,c5b0399e7fc64f0561a82063773e1282 -16908595,cfd61cdbf22133caeca528da9b53474e -16908596,8d3802169313f270d5adcda790170ca2 -16908597,a82c4f31d6d3f5bef9aa3062945c02d6 -16908598,85eca649072752e9ffafdefa1287470f -16908599,98ffd259abbe2e4794c00716a9d2da7 -16908600,263f8fab89ae0f9d695a74512443070b -16908601,b4ae28e8babe7bd09b2a392780565dbe -16908602,dfd84b5b35231267a47891cc8c8f48ba -16908603,f6990bbd57862a238aaf68b0c2f4c998 -16908604,9dca837e109ae977a89ed64dd17fab10 -16908605,ebdb407fd6e4d5c450f73173487c3162 -16908606,fdf869946d814f4f2aeebe269db06e31 -16908607,f9ea1fa393862a86e79ffade6a2662e7 -16908608,60491b4f5956534afd5959e7c2411cda -16908609,b78fc6d8b8b8ecb1266eb9c04c5129b -16908610,add241f6dcfe6af3f096a45b96fb04e1 -16908611,38760b28c0d26204b1e0383ca318947a -16908612,d3d8076b8b7a911b7cbbf5099f8ffd48 -16908613,fc78be6fb5735b715325ac499990550e -16908614,a7504fcd85d6696a8880f32b97b34a60 -16908615,f0821b6fdc8ebbf8a6fcb37c75086b1d -16908616,88b0e1b842fc88f0cbc5f38e95d68417 -16908617,d977f8453c349a44baa7e05c3dd81cb8 -16908618,26184c3c1edfa7623d5620433c0ff36 -16908619,8edbf7f3996852add4fcb18008cb722f -16908620,39e5881696ed1141fb934593dd6bab70 -16908621,1e0d787240ea16af6edbbdb1ab372fe7 -16908622,af6ec83a0b072b4abd4194d8d43f7f02 -16908623,658b5f77ff892a455a7fce5dc93268ac -16908624,6474336f089d541c9cec4a1df0c3b6cf -16908625,72cfc6fe503df207d53119aa7d5b84b4 -16908626,3070c2283ca5fd0fe00f7880a4bcdf18 -16908627,340cef5b043dceb7073ede0be69d700d -16908628,24dda1839a72d6707ed1932f6f32bd8e -16908629,1c50c7d94cec18710417d513708094d1 -16908630,2b1f11fed636bf7892650b9adc9b8e94 -16908631,afd9ba61c39fa742a840fe6ab2cfb490 -16908632,b709157ffabe225e820218b020508173 -16908633,3e9f7b867952f7b2df48e156402d558 -16908634,ab9f22a1fbc265d19a4dd7f84f3a4585 -16908635,c89cf9510108d63d7d181b3f7c546094 -16908636,c7af3251ce44f2dafb2c192d817e9c52 -16908637,796f607d214012447b7c552673f95b4a -16908638,ea796bd83dd7689d322085c74d0957a7 -16908639,ce2f6f842d68418baad5fc2ecefcb879 -16908640,6b3016429a5f814f3cccaff484a46831 -16908641,7dea9bdb69c9c5965609eab99af9f9d9 -16908642,3add5c50b3427182fcb7dd04fe953945 -16908643,4175965cd5cee134d43038ac54858b0f -16908644,feae27a32b6cc95860ec46da6d37c4b0 -16908645,5898813ee0b2785afc9dad2524f56162 -16910544,adb04e128238341b88a18532f3448d13 -16910545,8e274d3a14b5cb87cbce019d0a3b9a23 -16974080,cfed396d9f54d3c04bc390a004916c52 -16974081,64f1b3409c0937114f77f9933a4e2b82 -16974082,5a6e9dc254405a6cb066472172fa09b1 -16974083,b23adf8b24d9a42637977c3322f02b75 -16974091,df1b76bca1e6a035d3e22e7c01f67bc6 -16974092,4bb3d702d36739ba62041c0c936cbfb6 -16974093,d02062bdb07f81100381ef87e6fc2922 -16974094,1a0d208f9f489b37b800c6eeaaa752c9 -16974095,34ee6807c2040168606740d0e3f46e30 -16974096,9b8bb8517841df03f1a894b238251068 -16974097,bb0b43349ffa6aa13b5d84ca70d25eb3 -16974098,b3b647da85fe51c6da997e28b66cb4c3 -16974099,d33c3d7d3fbc6880e0e03ce573644b1e -16974100,17d45fba9866349c133608e9d42e4ac9 -16974101,74205e9529729bd0ef51c3d544c1e372 -16974102,edf620106dc10c10a3357436a306400d -16974103,74b3a17953dca5a0cb9bb8c47b241eca -16974107,1938aff98985ef5e79c7003868c1e91 -16974108,14b782f5d9afda571ce6c8bad868e2bd -16974109,cb124718b4ecfb29a900e1e617c79544 -16974110,ae3c73a1546a058da74d4b8a588b59f2 -16974114,cbdefe9bd14088ad45141843474d2bb0 -16974115,641938697f84f6e7b59ebc08edc4648b -16974116,74ccb1de521aa54c65ffcb906ffd1d3b -16974117,fffed44e7bb844ad6c69f7eb4540cff3 -16974118,536b2d3a4009eed61300bf5f0af7419e -16974122,8a8ea889723fc0f8de50c53339819871 -16974123,768b65f8e24b1e042b75cf6f576cfcd1 -16974124,a4b5522486920acfc2ed97e105c7831 -16974125,6e9b513f3c219f4276556070b36a0339 -16974126,942450301cd8068c9a14352c1cecc2d0 -16974127,c98e2b8eb252d75a2a1f90144596ada4 -16974128,7b13a95332dac62ad73cddf33d3bba0f -16974129,1951adc5a346867490626a854788b9ad -16974130,b75636944eeba77a4ce3f254460e0d49 -16974131,bb5bc2285c0a2e24548533f59af76788 -16974132,929561410b14786db52aa89b675a9759 -16974133,6b07bd2605f311d8134a8170ba49fd73 -16974134,2f97923d891e3e8c1967d53f7734ff55 -16974135,dea0b11c8760d28eafbe76e25df7d301 -16974136,586e309c00ba6f3c2ada595b742bef23 -16974137,29e48d74dc5062eb900d376196fd4f23 -16974138,fa79e8b641b225166b17ea86a9ecb174 -16974139,7a66328b6b976337ff5bde5c7edccaa5 -16974140,95559b402657cf222a87248d1e6ce0f5 -16974141,52843420526ced65d57513afad342515 -16974170,56690bacbebf8107b83e80528f40740 -16908289,83cfae9a11032a88e08c95b7fcef84cc -16908291,39a4ea3b5ddf7f89b41faf675f7bfc0f -16908292,64ec21dc8495fb180cc94f59f873efb8 -16908293,fda16e9858404b9545649ba21a828a6a -16908294,a57157213ffc25d269ea46e45984eae0 -16908295,90f2ac6ac3005ad4cabcd248831f2205 -16908296,4adafcbbef5ace168ca03e173af10452 -16908298,bb2e0425d8b489fc856cab2c0828f2ff -16908300,76b80613789c553593097956002a392b -16908301,23bd5cc4fb97d25e432604be0958320d -16908302,7b129f5775b2d4997681338012130cad -16908303,4935425ac3ef59e71bca7c4c8bf7e2ea -16908304,564d5c2df622b99692929bedbcd7f4b1 -16908305,e06bb538b6b224ce1376b47804ee2bbb -16908306,f13b4a0fa66e65ed33dcbd7ead08ac46 -16908307,29710a54739e35ae0d34919fca091640 -16908308,8693b46ac89dd595f8e3efd4437e6e90 -16908309,3ebf10825c7d8f2e17deae70b37d1fbd -16908310,354d414b2a1f29494a80b3acedb72ae2 -16908311,de662954670ec00899809b916abe6c60 -16908312,831dd7a79cd7e5f3cad86690c6724902 -16908313,265f19645487a858e4f53b9706cdff03 -16908314,2ad06f9f7e24f920fb067e2f2cc7869c -16908315,99f3286cc36b9a4393b3e967878b01d4 -16908316,4fbc91a39f7f4814f8f79ba425e4f30a -16908318,ccb82be2278587dd637ac763a1087c7 -16908323,8e8a2f6a87c3701e76650680e7b2f6e6 -16908325,fcd992a9a44518d5de6bd09c409ea7de -16908326,e41e706456c10963824e032484992946 -16908327,662301d3344073cc69887a27a8c42f24 -16908329,313738e052612f868d55f47940080288 -16908330,79474b10f860f09be4e9183ad5f1c7b4 -16908332,60a3062d151151a2ff229a02d3221337 -16908333,833c8c420ce04aa18b9912ff05e5ced2 -16908334,6e0f4183ad7abbb63c5b6a1ead24214a -16908335,477292deea02d72acc1087b2425c570a -16908336,82cf44076f1a94ed31f3172433a80ef6 -16908337,84f64a9f8523d35a1cf8319f580dd578 -16908338,b6365376050089a025a1ed1d85a85dba -16908339,4e989db8b445f22b61bd4d30daee1a05 -16908340,50ec890e85029d44ea96bfa31d8ed16a -16908341,b4f23438454d39a742546dafd5d3cfc6 -16908342,5414035b686e0fb0a1ce0d535d0a0f82 -16908343,72d6218e86d3787422fa6b03f30ccaf3 -16908344,ddfe42c53aae03dd94c2d3163869ddc0 -16908345,b8b09ac7af1bb81e28715a3e0f0eeb17 -16908346,c53d28ac584d8053ec438f692a58cd1a -16908347,243cf7fb2bf36e60e3a25cde83b33a5e -16908349,2837ae3dabc00c4c5515bafa34a302dc -16908351,4973e12438ce4c870f6ba1c158873c43 -16908352,37678301896aa95cc358bcd73308232c -16908353,31c5e38768bda9a8a7cd1bbca7c9226d -16908354,5ff1e27f9ef25fcf0a3c51b0551f7fd2 -16908355,60a060ee3e51167f4d87cf6d923f9ca7 -16908356,b24aa4a609b3483b795c4f3bf89116b7 -16908357,7a17a96ff758cd4ff8c0ffd070230cc7 -16908358,c14586711c04239a174c192d24b8ce20 -16908359,1f0abe2925128be5191932a1cc4a3019 -16908360,a9c8343cf444aa7686d9dd2b40e90a47 -16908361,94a02b3ef18bb35970105bf276001fe0 -16908363,bfa45b4169d1944debabc84b04880837 -16908365,a3d0bb31ba7c30209129e4366e072b05 -16908366,de6d35451526c85c7c5907a0adcbeff7 -16908367,4a0d45a9aedaa06eb574f88f580c265b -16908368,56ab2510d3cb4787bdcfa9680aa7e757 -16908369,feef935305ae32e1972d3b017a4eb -16908370,41b270e7ecb39d0b81d1b60f32c3943 -16908371,b159339fc55e60000efee4c55d0e1d1c -16908372,74ca5387c7d373fc88e65e0623d5991f -16908373,8b8ae20ea681d47cd899f74f75bde08d -16908374,5cb926f4743f6ccdb4988c8b35dc97dd -16908375,947a02e037fe9d31c8eb4c4a22dba58c -16908376,2c2a7e8a269a770cc4afbe695e662601 -16908377,9a992e19651652de8b4f5ce07d1d2af0 -16908378,3e37efadc720d972ddc30ccae606ab00 -16908380,77b1802a2504a685bf8ff34a1f9de6c3 -16908381,45c0dbda39dca97dc634a6e89f037716 -16908383,ca404ded18b83fd872a5810c8a44517d -16843027,ecc0eb0ba51e2c14aaa006e168eacc8c -16842753,f6282e18f6f87e4cf68970579aac7219 -16843026,6f3d105b3e6d1624af4ce68b2a55362d -16843025,aa1c8e137823bf5245f0d27c980796e7 -16843024,ed65803a11251872c6cf659381d0aaaa -16843031,fa2f9de197813d8e32d78bd184603161 -16842757,1a13db89ae6fdbb152856edbe3688d95 -16843030,46bd8fadf2f12988d808e69dcfc138cb -16843029,bf398d8ec9fef1d04c67fbf474fda790 -16843028,69ee29bc3bd715b3203d888ca2a88cc0 -16843035,2f79ed9030fe0339dec2eb43f56fa369 -16843034,e2f097a36cdf87a1b211d27eb31dea32 -16843033,c02e9379a6624b40fef669494a7e7183 -16843032,af44f7fe9a4366c67479a44b24ae80b -16843038,501ead1cb03222808aa09b376c9d5cac -16843037,a2d01853631a9b52006ad32497ddc865 -16843036,6e381ac09bfc75ef7f71e02f3b99f279 -16843010,bcfe734d49949142a5073766188213dc -16843011,88ea7e11c57b09139afe92169c443e20 -16843008,91f14375672f1b2003202ec7682771cb -16843009,f5007e4886946d1eb603979a35726d69 -16843014,b0bde3daab8a1cc6354cd86c65db90e2 -16842772,b59c880de07e668eaba0888fc4de229a -16843015,7184233667abf34d2ee3eea20fb9f82b -16842775,bcc06ff4c56de9b4a1557d3c47ec1783 -16842774,6f2eab110a33c15cb17238708244db4d -16843013,3fe45d065187550d481cc745780c29c2 -16843018,7bddb0161d99059f0a6c1c09d0b35b34 -16842777,fdc779803765398f0c782a1fd55a9d86 -16842776,6b6c09ee89a933288c37f55d2187eddd -16843019,87545673867c5cf2f97ea6cc3e0d3595 -16843016,e2288c9f60d09d5f2882175abf161bd -16842779,9667a31366f5dcf740d64b775402c64 -16843017,e3108d8ee8530e50d7b425de217a4585 -16843022,847f1b6f38ebf442a1d34cac0fd6080e -16843023,5d01d19f8441e4d5dd5c41266f480ffc -16842780,b02509b360e6f14eac4fb03f55c11fed -16843020,90e2ab194dab9f482eca64c651ea41e9 -16843021,58d3e73bd29c14b6ec97d4187cee5500 -16843057,bf533b7d78ccc350cfd2f41a8e1f0822 -16842787,e49146643faf3308ca7246d82fc5b2bb -16843056,d8e023c15aa80df2445c782c6b2179da -16843059,c649596d99d96be696332cb08b4a33f2 -16843058,d129fce211dfb56e80195a11f39ab1e9 -16843061,441d86175b74884ef3f672066ae52c90 -16843060,cf6d7dfef99b200a4551cd65467fb9fc -16843063,f50f8b7fafde6d640ced3ec4d797f807 -16843062,d22de0ebc290280b2699b5cb77568fcb -16842794,d347d92a886b9d445d7d60b090a5bcda -16843065,a393477443f20a1a8a511c390024f963 -16843064,e6f28eea0ebbad0d18d23ea3c15f2102 -16843067,d6efe6a63f529d675417c2092546e144 -16842793,d5ac3bcc56cbc370ae3b172dd6ed5df4 -16843066,935aa84de286e8bced6a127b69347997 -16842798,377a21bcb39dcfcb4a0902a7555a984f -16843069,63cc6da6165cc068740827890b4460ed -16843068,6dda3129884399b67b935bb4e51ad34f -16842799,d4831a785c1c65ad2054bb1232babf0c -16842796,48be99a37d3a885d38657a50d6f77365 -16842797,8da03c2f611c7f0654aa71096832b5c -16842802,9b2a96570a99f6677e299d8215b1eecd -16843042,322d7c02f205806126f1529564ab3cd0 -16843043,660acf0ca76261ec49deb7a7bd072f8c -16843044,d8dd28acc9e4431ff8eb481c1d8d9832 -16842806,919bc6715eddf74c0517372ead95cdcb -16843045,72ae59db2ef5c472f671b31f1c6f07ce -16842805,9e359ce06b5603c820bd749592beb4a7 -16843046,cee09c2303e44dfbbaadbf167cdc503c -16842810,8ecd9ec7607c958cdf2e252f516fe3d8 -16843049,47171b2af8bb14c3816f52f79579b46d -16842809,fef5bbbc588422579bf3de8a49c73e18 -16843050,6b29998dbe690122afdf6da71e905009 -16843051,5f9f017aa89719c7a282aa222c65baf -16843052,216a61701714cb3f04e23a74a1336864 -16843053,e146704e3fe30e6821352ceb3b090184 -16842813,899942760d5a83d94cf58a536be6171e -16843054,5aa0a467c7451f88f9c6056e8c7427cc -16843055,6881fc74a0574433e9e0f05f7cae53f7 -16843095,50f6c2ffdc69bea12cd7b58c69824be1 -16842821,42b4814e4e61191b61a8d3f7c6041938 -16843094,356c3f0d5b88d0e2077d85168eac6306 -16842822,d69011621d777519c5ab6a68da8959 -16843092,d84a39f3d30a72b13640e3afb7ea2018 -16843091,37603e187bd7ad9dceccb8ef2b6b5335 -16842817,bad6f1072232c28353aabf42142cbd26 -16842818,bd0c4079c99e529e55abef5ac44dcdf8 -16843088,5e5d08b1780bfd69747216c24b7aee92 -16842819,ae608e1ca5ca083163d92974d7c66b06 -16843103,d4d1b946336039e515c3e4a392694223 -16842828,6a15bcf38bcf78021f9416ac395cac85 -16843102,603020acbbdc6e8765c2e2cd589f7933 -16842829,41cce73f9ce59993afa3517becd4bd3c -16842824,2368ffe803beb1d06772e96eeffd9cc9 -16843099,c373e78822d440c926edf7f1b700d4c5 -16843098,503a4fb49cbfebe1fb71ef185c8ced56 -16843097,4e72dc4d35b34147ce69d691aa2937e3 -16842837,4c903ddf3b9cd49a952a3889fc2c5573 -16842836,a304f875b846d65498366479fbf34568 -16843076,1b11a34d5c6cee280c727938ee96054b -16843077,ff170af78a0a674445f16e24394546c0 -16843074,ba8bd10757ab9a4446f024952bf3f1e3 -16843075,b34ec8f0f5f92acf230925c89eacec65 -16842832,3b10180dc99ab99568b51010d89c655c -16843072,d752bd5dd907feec915d036d76707ee5 -16843073,168e43895b105169862fa2e3c205529b -16842834,58efc828918aa006d5af09e32fe7799b -16843085,b30c099494e63d26f755d58ba109136a -16842841,2c471142bddf9a982a48e0ecb52cbb8 -16843082,5574b9699d71e02f3efb48f3712da8bf -16843080,4945e39d1260ff273c49d39dfc58c2a8 -16842843,bfc9dce4c1ccef959c57360fb9f70205 -16843108,4e225dd49c0231b617a15ded1ba6cb0a -16843109,35715377a038019c56925b2e661cfdab -16843105,3b91182484dc677a0bf27263e612d818 -16843106,affab7221afa03df4b7306b9ce50be7f -16843107,e3710bc197d17e0dc78ae3f607c46048 -16777217,9012132a1d0f770eca67e62a68247137 -16777219,58fc65723143afeb33f742c17e028c94 -16777220,1d5e2088f7137e304366873dd829ca98 -16777221,66a18fa3f554756edc12bf1a08586bc8 -16777222,4007295f7bdae0b78a6e47a9d64521 -16777228,c154160ce7b52d4bdc220fc954edf796 -16777229,2400808c6f442f2663b6869e4930c879 -16777230,7ae3b31e8e0f2f22f50fbf224e1fe4f7 -16777231,fe5698e183b10037e38f979a411489b8 -16777232,aeae00c7b4a95ff05423c1629bf3ad7e -16777233,72153ea3d60930cebf4c0d37fac89102 -16777235,f517ab768fbb35e275440b74b6631bfc -16777236,623df9298630687873579ea16bb97e7b -16777237,6984cb9e6a322728be736860b97b971a -16777238,6947378f4e2abb24b47e2b943945b16f -16777239,55a585682bf0569a60a71a66f031ca2 -16777240,f653295b0c48244dc2aa68fc5b94fa29 -16777241,c213fb7ee968403b24ff6ede98686add -16777243,afd641da6f3834b319b761ba6d72ff74 -16777244,8d822c710a221b8a407b2def97885470 -16777246,9c99187cc6fd9c958417b4736772e4d3 -16777251,6418210d69669c4a602148ed42ab2ecd -16777253,afe51ea56dc8c831f9b0b5ae02bac702 -16777254,95812c1d4021558b6a7f62521228c52a -16777255,3a1252acb6fe968751d2b61d57557e09 -16777257,fd7caeeb5d16756028f19ba016ed1970 -16777258,6339b8043c05d19c6b15135eade95f94 -16777260,aa1ed939a8b275df9dc5474bc0477a33 -16777261,b631dcf219d3add3560f243ff6cceb75 -16777262,91eca0c33ac53fb155feb15db48c43de -16777263,b681c19d7812c281b4b2feabb88697f4 -16777264,a2b07ae4f37a65fe1f5992826b578b02 -16777265,af5255a4dcb486e2ab11669fd3de8441 -16777266,8a4b2b706f219e52a261e342b47a3964 -16777269,921cb54cfb47ca9eca0edcf8e660e3cd -16777270,b79b3a522d1e2f865eb1e9aeb63dc66a -16777272,36e1c1dd8cbb267488e1669811319e7e -16777273,c84a7d710228024c2e100a79a2c30e55 -16777274,a1674e3020689bae5680f29f937e5424 -16777277,46b34dd723f7efeb38f670925ee3824f -16777281,da71e3e4f9a25c6621d2f0b40ffd1c72 -16777282,388109bb9b9b49c1f5bb604abee91671 -16777283,eb6912fd84b2d57ed3433acb3f85d3e6 -16777285,619967351702f1d570d4d0195bbbcc1e -16777286,ebff74d54387fb154d5b467e01d92b64 -16777288,f8154dd7c9c1d397dd64eeb6569d7d34 -16777289,971cc6f827398c6c4755b310c6795672 -16777291,bb952ff9523f248ddaae56317e91a509 -16777293,e5c24577cf35a31bd217d206b88a7499 -16777294,f4c170867c75982e604358da611b26e3 -16777295,922200512d058ecc0ef19a0efcdb51bf -16777296,39283c3dbafb10b2a732f9d6ef3e08b6 -16777297,3603ae881c41c957a89aaa30990c0040 -16777298,fbf9e47600457d091060b0f877458a83 -16777300,2b0d53bafa91c68bf59b5863354bd7ae -16777301,50b99fabae858e971eb02ed5146fd63a -16777302,7a32eac396b4cf3930ba9ca7b5d8dbae -16777303,115f1e956219026bb9cca0bcafb2b11b -16777304,afb2f032a96d859ca5f24d8ff129bd64 -16777305,372b3a0fd7c09f64f3cfcab89f03a9a0 -16777306,e4b6233ac91337dcc3940e309d21c3c -16777311,d290638555ce76ce3053c70fdacf7d55 -5242880,8099ff561e194072c9086dea38757a89 -5242881,90b3d9a90a8cf3e21527fc8fe3b43c49 -5242882,c9806dd45be8ebed3e4ab94f66e65212 -5242883,f382ded5f9a4299e3879dea4f7fe1c50 -5242884,27af08a994f76a2a08ec8671d14fdcc2 -5242885,9969ce4355ae7338470461f48f4e5ef5 -5242886,39208e0b0f070629cad494da5fb95f0d -5242887,678e63329d3d813f22e0f15006a93768 -5242888,694ffe9efa49193780d4b757115c9064 -5242889,9080a51ccefd23f9924bae9a854e7b49 -5242890,5f1d51ccd1b4adf141707907233f8379 -5242891,73df45f45e0b7484ef51441ad0e50604 -5242892,c9e52234c475354483dc3e9e6386af61 -5242893,3c3ee1df989ecf5de70a5673acfa33b8 -5242894,468cc8b546e1586406b78ad733976f5f -5242895,e546a7afaaa6c6729e3b062fc4ace4ae +1000,43ddd8b48469d9a8c011718aa846facb +1001,aaed8c669f583cf35300f7c5d5396fce +1002,d517ae73160fd8576d7687ead1c1a973 +1003,ac37df168bae3c69a24d7fd5bae913c7 +1004,6d2591e94464b8327afadbdba44978d +1100,8b1df73e012e2ae34cd2d84a72a7898b +2000,c9ee0d494e0524c86a577cf684f5816d +2001,cd7a2836ea0b77b23a6131222f5be354 +2002,381aeedb2c5c5a7a9a01333e0eebc839 +2003,229048d1bb9e928831734cb2e5000286 +2004,b2c088c3c6928bfe29684a75ae1b127c +2005,1ce3491a1021a5aed07c687e3f6133e6 +2006,6c3d114caffd8160f7d56fc8757419a +2007,bcb501cfac8f7e73b455563bddbcb417 +2008,e1aa93d7bba48898a32810c43c6ff5c3 +2010,d0818779df1b967cc2f8ffc3ada631ec +2011,ecf0dbe93240e84edf6bd263645e634f +2020,b4a67353e11c3039ad755a3e96b4a046 +2021,1bb21f7731a5b3ffc6a1e2b586dae3f5 +2022,e58162e284df8fe339f05626eb46d835 +2023,739948643f5f6f685aea81c42883a480 +2024,799b0d35362a9574d3226c2d762b53c6 +2025,5ec18fbb462516a1e1a3427e0595a7d6 +16908544,12512904b67d2091dd516dc8eeb0cfa0 +16908545,a5c35cc01a263f91419d3e8e981708f1 +16908546,f6bdebf227e42c204066cede8cb5928c +16908547,9c44e6d3ab80afa2bb52fe3499559d5e +16908548,2e1799ddfdab14417c2a8e24d8c0c731 +16908549,3f4169a181feb5d2532efc6aa91f2ee5 +16908550,895725d3432cbf374b1cce4f7db28e9 +16908551,12892864f18d30521b6f4a6c45b65ece +16908552,146f6c3458adde8e0bca04d976275f85 +16908553,7c40dbd9451129b4762f3ab04ce7ffb9 +16908554,56d763eeb6a0107c2146d7dccd686d2a +16908555,9a4fff004ae419711c2a876b57cba69f +16908556,170ff67dd90d8d3d8dae393037da5e9b +16908557,3e65d657af8611cb3578cd8713419d4c +16908558,f3cb95383f698c4e9721b5aaa5fac3a7 +16908559,65bd006dc163a186f2dbb127f8ec0b27 +16908560,8c6479d786f9117e04910153a4f47d86 +16908561,75a25bd69f36250789d914ac01da34c1 +16908562,87a28b2bf2fad838af72ce00e2fb1937 +16908563,249ff32d605c5ba0a07694ff4fbbf15a +16908564,ba3b355eb9134bcd7522a1fc203c4c58 +16908565,321e1cb3657d2aca73fb9a8083d9c3bf +16908566,adb182051fab2c2269df89b4f75e505e +16908567,3d9ae8982f01fb6a6c56cffbe2fa074e +16908568,1efffb054b2c864f5ebe180ae46891c3 +16908569,25c73629d0b6b46690d222cecf331ba2 +16908570,6a46694c996e5721b14c9da1f00fe62c +16908571,5efc1c291eef23fe33f5209388b8cc33 +16908572,f71fc7deef6835c8efc305a00f1e8b8f +16908573,15484a373254c6024d90edf3b7a82947 +16908574,8253f1aaa2205dcaf828903cfce46e4 +16908575,ab778410d1fb2c0e55fec0c7d764b17c +16908576,19ad61c04ff3ae082955f72fc8771866 +16908577,b5d3eeff40086643a03f034b5345504d +16908578,3d647bf5562e743263cbd90be36b6a1c +16908579,5a9d2fb7050009785421257d5ef24416 +16908580,909b03e2d2eeee2e868b5aaf446e81ea +16908581,e603a4cbfdfcbf4d0bfe25efb753b424 +16908582,e355f481f99220e50e4b2b2eb45dcc56 +16908583,73a25e59c2d18ae77db02928b0a70e3 +16908584,8f81a2fb647f817422a299829994de7b +16908585,128e9978380ee9ef981d2e12d008255e +16908586,fd1453f3e2a3125e7d16cfe6fd2d4722 +16908587,8e27b6f750bec22333a5d4108ce1e094 +16908588,b2169f6190bdf95236037bed2301712b +16908589,536e6340e5328075ede672428d94d921 +16908590,cb9eede8b783b4a5d7ff7529e3fb1f44 +16908591,267d51d891c3c32b3a02577d38f4e242 +16908592,3f31e8ab260f02acca218c720fafc7b8 +16908593,552869a63aa3151e79e875596f31e505 +16908594,c5b0399e7fc64f0561a82063773e1282 +16908595,cfd61cdbf22133caeca528da9b53474e +16908596,8d3802169313f270d5adcda790170ca2 +16908597,a82c4f31d6d3f5bef9aa3062945c02d6 +16908598,85eca649072752e9ffafdefa1287470f +16908599,98ffd259abbe2e4794c00716a9d2da7 +16908600,263f8fab89ae0f9d695a74512443070b +16908601,b4ae28e8babe7bd09b2a392780565dbe +16908602,dfd84b5b35231267a47891cc8c8f48ba +16908603,f6990bbd57862a238aaf68b0c2f4c998 +16908604,9dca837e109ae977a89ed64dd17fab10 +16908605,ebdb407fd6e4d5c450f73173487c3162 +16908606,fdf869946d814f4f2aeebe269db06e31 +16908607,f9ea1fa393862a86e79ffade6a2662e7 +16908608,60491b4f5956534afd5959e7c2411cda +16908609,b78fc6d8b8b8ecb1266eb9c04c5129b +16908610,add241f6dcfe6af3f096a45b96fb04e1 +16908611,38760b28c0d26204b1e0383ca318947a +16908612,d3d8076b8b7a911b7cbbf5099f8ffd48 +16908613,fc78be6fb5735b715325ac499990550e +16908614,a7504fcd85d6696a8880f32b97b34a60 +16908615,f0821b6fdc8ebbf8a6fcb37c75086b1d +16908616,88b0e1b842fc88f0cbc5f38e95d68417 +16908617,d977f8453c349a44baa7e05c3dd81cb8 +16908618,26184c3c1edfa7623d5620433c0ff36 +16908619,8edbf7f3996852add4fcb18008cb722f +16908620,39e5881696ed1141fb934593dd6bab70 +16908621,1e0d787240ea16af6edbbdb1ab372fe7 +16908622,af6ec83a0b072b4abd4194d8d43f7f02 +16908623,658b5f77ff892a455a7fce5dc93268ac +16908624,6474336f089d541c9cec4a1df0c3b6cf +16908625,72cfc6fe503df207d53119aa7d5b84b4 +16908626,3070c2283ca5fd0fe00f7880a4bcdf18 +16908627,340cef5b043dceb7073ede0be69d700d +16908628,24dda1839a72d6707ed1932f6f32bd8e +16908629,1c50c7d94cec18710417d513708094d1 +16908630,2b1f11fed636bf7892650b9adc9b8e94 +16908631,afd9ba61c39fa742a840fe6ab2cfb490 +16908632,b709157ffabe225e820218b020508173 +16908633,3e9f7b867952f7b2df48e156402d558 +16908634,ab9f22a1fbc265d19a4dd7f84f3a4585 +16908635,c89cf9510108d63d7d181b3f7c546094 +16908636,c7af3251ce44f2dafb2c192d817e9c52 +16908637,796f607d214012447b7c552673f95b4a +16908638,ea796bd83dd7689d322085c74d0957a7 +16908639,ce2f6f842d68418baad5fc2ecefcb879 +16908640,6b3016429a5f814f3cccaff484a46831 +16908641,7dea9bdb69c9c5965609eab99af9f9d9 +16908642,3add5c50b3427182fcb7dd04fe953945 +16908643,4175965cd5cee134d43038ac54858b0f +16908644,feae27a32b6cc95860ec46da6d37c4b0 +16908645,5898813ee0b2785afc9dad2524f56162 +16910544,adb04e128238341b88a18532f3448d13 +16910545,8e274d3a14b5cb87cbce019d0a3b9a23 +16974080,cfed396d9f54d3c04bc390a004916c52 +16974081,64f1b3409c0937114f77f9933a4e2b82 +16974082,5a6e9dc254405a6cb066472172fa09b1 +16974083,b23adf8b24d9a42637977c3322f02b75 +16974091,df1b76bca1e6a035d3e22e7c01f67bc6 +16974092,4bb3d702d36739ba62041c0c936cbfb6 +16974093,d02062bdb07f81100381ef87e6fc2922 +16974094,1a0d208f9f489b37b800c6eeaaa752c9 +16974095,34ee6807c2040168606740d0e3f46e30 +16974096,9b8bb8517841df03f1a894b238251068 +16974097,bb0b43349ffa6aa13b5d84ca70d25eb3 +16974098,b3b647da85fe51c6da997e28b66cb4c3 +16974099,d33c3d7d3fbc6880e0e03ce573644b1e +16974100,17d45fba9866349c133608e9d42e4ac9 +16974101,74205e9529729bd0ef51c3d544c1e372 +16974102,edf620106dc10c10a3357436a306400d +16974103,74b3a17953dca5a0cb9bb8c47b241eca +16974107,1938aff98985ef5e79c7003868c1e91 +16974108,14b782f5d9afda571ce6c8bad868e2bd +16974109,cb124718b4ecfb29a900e1e617c79544 +16974110,ae3c73a1546a058da74d4b8a588b59f2 +16974114,cbdefe9bd14088ad45141843474d2bb0 +16974115,641938697f84f6e7b59ebc08edc4648b +16974116,74ccb1de521aa54c65ffcb906ffd1d3b +16974117,fffed44e7bb844ad6c69f7eb4540cff3 +16974118,536b2d3a4009eed61300bf5f0af7419e +16974122,8a8ea889723fc0f8de50c53339819871 +16974123,768b65f8e24b1e042b75cf6f576cfcd1 +16974124,a4b5522486920acfc2ed97e105c7831 +16974125,6e9b513f3c219f4276556070b36a0339 +16974126,942450301cd8068c9a14352c1cecc2d0 +16974127,c98e2b8eb252d75a2a1f90144596ada4 +16974128,7b13a95332dac62ad73cddf33d3bba0f +16974129,1951adc5a346867490626a854788b9ad +16974130,b75636944eeba77a4ce3f254460e0d49 +16974131,bb5bc2285c0a2e24548533f59af76788 +16974132,929561410b14786db52aa89b675a9759 +16974133,6b07bd2605f311d8134a8170ba49fd73 +16974134,2f97923d891e3e8c1967d53f7734ff55 +16974135,dea0b11c8760d28eafbe76e25df7d301 +16974136,586e309c00ba6f3c2ada595b742bef23 +16974137,29e48d74dc5062eb900d376196fd4f23 +16974138,fa79e8b641b225166b17ea86a9ecb174 +16974139,7a66328b6b976337ff5bde5c7edccaa5 +16974140,95559b402657cf222a87248d1e6ce0f5 +16974141,52843420526ced65d57513afad342515 +16974170,56690bacbebf8107b83e80528f40740 +16908289,83cfae9a11032a88e08c95b7fcef84cc +16908291,39a4ea3b5ddf7f89b41faf675f7bfc0f +16908292,64ec21dc8495fb180cc94f59f873efb8 +16908293,fda16e9858404b9545649ba21a828a6a +16908294,a57157213ffc25d269ea46e45984eae0 +16908295,90f2ac6ac3005ad4cabcd248831f2205 +16908296,4adafcbbef5ace168ca03e173af10452 +16908298,bb2e0425d8b489fc856cab2c0828f2ff +16908300,76b80613789c553593097956002a392b +16908301,23bd5cc4fb97d25e432604be0958320d +16908302,7b129f5775b2d4997681338012130cad +16908303,4935425ac3ef59e71bca7c4c8bf7e2ea +16908304,564d5c2df622b99692929bedbcd7f4b1 +16908305,e06bb538b6b224ce1376b47804ee2bbb +16908306,f13b4a0fa66e65ed33dcbd7ead08ac46 +16908307,29710a54739e35ae0d34919fca091640 +16908308,8693b46ac89dd595f8e3efd4437e6e90 +16908309,3ebf10825c7d8f2e17deae70b37d1fbd +16908310,354d414b2a1f29494a80b3acedb72ae2 +16908311,de662954670ec00899809b916abe6c60 +16908312,831dd7a79cd7e5f3cad86690c6724902 +16908313,265f19645487a858e4f53b9706cdff03 +16908314,2ad06f9f7e24f920fb067e2f2cc7869c +16908315,99f3286cc36b9a4393b3e967878b01d4 +16908316,4fbc91a39f7f4814f8f79ba425e4f30a +16908318,ccb82be2278587dd637ac763a1087c7 +16908323,8e8a2f6a87c3701e76650680e7b2f6e6 +16908325,fcd992a9a44518d5de6bd09c409ea7de +16908326,e41e706456c10963824e032484992946 +16908327,662301d3344073cc69887a27a8c42f24 +16908329,313738e052612f868d55f47940080288 +16908330,79474b10f860f09be4e9183ad5f1c7b4 +16908332,60a3062d151151a2ff229a02d3221337 +16908333,833c8c420ce04aa18b9912ff05e5ced2 +16908334,6e0f4183ad7abbb63c5b6a1ead24214a +16908335,477292deea02d72acc1087b2425c570a +16908336,82cf44076f1a94ed31f3172433a80ef6 +16908337,84f64a9f8523d35a1cf8319f580dd578 +16908338,b6365376050089a025a1ed1d85a85dba +16908339,4e989db8b445f22b61bd4d30daee1a05 +16908340,50ec890e85029d44ea96bfa31d8ed16a +16908341,b4f23438454d39a742546dafd5d3cfc6 +16908342,5414035b686e0fb0a1ce0d535d0a0f82 +16908343,72d6218e86d3787422fa6b03f30ccaf3 +16908344,ddfe42c53aae03dd94c2d3163869ddc0 +16908345,b8b09ac7af1bb81e28715a3e0f0eeb17 +16908346,c53d28ac584d8053ec438f692a58cd1a +16908347,243cf7fb2bf36e60e3a25cde83b33a5e +16908349,2837ae3dabc00c4c5515bafa34a302dc +16908351,4973e12438ce4c870f6ba1c158873c43 +16908352,37678301896aa95cc358bcd73308232c +16908353,31c5e38768bda9a8a7cd1bbca7c9226d +16908354,5ff1e27f9ef25fcf0a3c51b0551f7fd2 +16908355,60a060ee3e51167f4d87cf6d923f9ca7 +16908356,b24aa4a609b3483b795c4f3bf89116b7 +16908357,7a17a96ff758cd4ff8c0ffd070230cc7 +16908358,c14586711c04239a174c192d24b8ce20 +16908359,1f0abe2925128be5191932a1cc4a3019 +16908360,a9c8343cf444aa7686d9dd2b40e90a47 +16908361,94a02b3ef18bb35970105bf276001fe0 +16908363,bfa45b4169d1944debabc84b04880837 +16908365,a3d0bb31ba7c30209129e4366e072b05 +16908366,de6d35451526c85c7c5907a0adcbeff7 +16908367,4a0d45a9aedaa06eb574f88f580c265b +16908368,56ab2510d3cb4787bdcfa9680aa7e757 +16908369,feef935305ae32e1972d3b017a4eb +16908370,41b270e7ecb39d0b81d1b60f32c3943 +16908371,b159339fc55e60000efee4c55d0e1d1c +16908372,74ca5387c7d373fc88e65e0623d5991f +16908373,8b8ae20ea681d47cd899f74f75bde08d +16908374,5cb926f4743f6ccdb4988c8b35dc97dd +16908375,947a02e037fe9d31c8eb4c4a22dba58c +16908376,2c2a7e8a269a770cc4afbe695e662601 +16908377,9a992e19651652de8b4f5ce07d1d2af0 +16908378,3e37efadc720d972ddc30ccae606ab00 +16908380,77b1802a2504a685bf8ff34a1f9de6c3 +16908381,45c0dbda39dca97dc634a6e89f037716 +16908383,ca404ded18b83fd872a5810c8a44517d +16843027,ecc0eb0ba51e2c14aaa006e168eacc8c +16842753,f6282e18f6f87e4cf68970579aac7219 +16843026,6f3d105b3e6d1624af4ce68b2a55362d +16843025,aa1c8e137823bf5245f0d27c980796e7 +16843024,ed65803a11251872c6cf659381d0aaaa +16843031,fa2f9de197813d8e32d78bd184603161 +16842757,1a13db89ae6fdbb152856edbe3688d95 +16843030,46bd8fadf2f12988d808e69dcfc138cb +16843029,bf398d8ec9fef1d04c67fbf474fda790 +16843028,69ee29bc3bd715b3203d888ca2a88cc0 +16843035,2f79ed9030fe0339dec2eb43f56fa369 +16843034,e2f097a36cdf87a1b211d27eb31dea32 +16843033,c02e9379a6624b40fef669494a7e7183 +16843032,af44f7fe9a4366c67479a44b24ae80b +16843038,501ead1cb03222808aa09b376c9d5cac +16843037,a2d01853631a9b52006ad32497ddc865 +16843036,6e381ac09bfc75ef7f71e02f3b99f279 +16843010,bcfe734d49949142a5073766188213dc +16843011,88ea7e11c57b09139afe92169c443e20 +16843008,91f14375672f1b2003202ec7682771cb +16843009,f5007e4886946d1eb603979a35726d69 +16843014,b0bde3daab8a1cc6354cd86c65db90e2 +16842772,b59c880de07e668eaba0888fc4de229a +16843015,7184233667abf34d2ee3eea20fb9f82b +16842775,bcc06ff4c56de9b4a1557d3c47ec1783 +16842774,6f2eab110a33c15cb17238708244db4d +16843013,3fe45d065187550d481cc745780c29c2 +16843018,7bddb0161d99059f0a6c1c09d0b35b34 +16842777,fdc779803765398f0c782a1fd55a9d86 +16842776,6b6c09ee89a933288c37f55d2187eddd +16843019,87545673867c5cf2f97ea6cc3e0d3595 +16843016,e2288c9f60d09d5f2882175abf161bd +16842779,9667a31366f5dcf740d64b775402c64 +16843017,e3108d8ee8530e50d7b425de217a4585 +16843022,847f1b6f38ebf442a1d34cac0fd6080e +16843023,5d01d19f8441e4d5dd5c41266f480ffc +16842780,b02509b360e6f14eac4fb03f55c11fed +16843020,90e2ab194dab9f482eca64c651ea41e9 +16843021,58d3e73bd29c14b6ec97d4187cee5500 +16843057,bf533b7d78ccc350cfd2f41a8e1f0822 +16842787,e49146643faf3308ca7246d82fc5b2bb +16843056,d8e023c15aa80df2445c782c6b2179da +16843059,c649596d99d96be696332cb08b4a33f2 +16843058,d129fce211dfb56e80195a11f39ab1e9 +16843061,441d86175b74884ef3f672066ae52c90 +16843060,cf6d7dfef99b200a4551cd65467fb9fc +16843063,f50f8b7fafde6d640ced3ec4d797f807 +16843062,d22de0ebc290280b2699b5cb77568fcb +16842794,d347d92a886b9d445d7d60b090a5bcda +16843065,a393477443f20a1a8a511c390024f963 +16843064,e6f28eea0ebbad0d18d23ea3c15f2102 +16843067,d6efe6a63f529d675417c2092546e144 +16842793,d5ac3bcc56cbc370ae3b172dd6ed5df4 +16843066,935aa84de286e8bced6a127b69347997 +16842798,377a21bcb39dcfcb4a0902a7555a984f +16843069,63cc6da6165cc068740827890b4460ed +16843068,6dda3129884399b67b935bb4e51ad34f +16842799,d4831a785c1c65ad2054bb1232babf0c +16842796,48be99a37d3a885d38657a50d6f77365 +16842797,8da03c2f611c7f0654aa71096832b5c +16842802,9b2a96570a99f6677e299d8215b1eecd +16843042,322d7c02f205806126f1529564ab3cd0 +16843043,660acf0ca76261ec49deb7a7bd072f8c +16843044,d8dd28acc9e4431ff8eb481c1d8d9832 +16842806,919bc6715eddf74c0517372ead95cdcb +16843045,72ae59db2ef5c472f671b31f1c6f07ce +16842805,9e359ce06b5603c820bd749592beb4a7 +16843046,cee09c2303e44dfbbaadbf167cdc503c +16842810,8ecd9ec7607c958cdf2e252f516fe3d8 +16843049,47171b2af8bb14c3816f52f79579b46d +16842809,fef5bbbc588422579bf3de8a49c73e18 +16843050,6b29998dbe690122afdf6da71e905009 +16843051,5f9f017aa89719c7a282aa222c65baf +16843052,216a61701714cb3f04e23a74a1336864 +16843053,e146704e3fe30e6821352ceb3b090184 +16842813,899942760d5a83d94cf58a536be6171e +16843054,5aa0a467c7451f88f9c6056e8c7427cc +16843055,6881fc74a0574433e9e0f05f7cae53f7 +16843095,50f6c2ffdc69bea12cd7b58c69824be1 +16842821,42b4814e4e61191b61a8d3f7c6041938 +16843094,356c3f0d5b88d0e2077d85168eac6306 +16842822,d69011621d777519c5ab6a68da8959 +16843092,d84a39f3d30a72b13640e3afb7ea2018 +16843091,37603e187bd7ad9dceccb8ef2b6b5335 +16842817,bad6f1072232c28353aabf42142cbd26 +16842818,bd0c4079c99e529e55abef5ac44dcdf8 +16843088,5e5d08b1780bfd69747216c24b7aee92 +16842819,ae608e1ca5ca083163d92974d7c66b06 +16843103,d4d1b946336039e515c3e4a392694223 +16842828,6a15bcf38bcf78021f9416ac395cac85 +16843102,603020acbbdc6e8765c2e2cd589f7933 +16842829,41cce73f9ce59993afa3517becd4bd3c +16842824,2368ffe803beb1d06772e96eeffd9cc9 +16843099,c373e78822d440c926edf7f1b700d4c5 +16843098,503a4fb49cbfebe1fb71ef185c8ced56 +16843097,4e72dc4d35b34147ce69d691aa2937e3 +16842837,4c903ddf3b9cd49a952a3889fc2c5573 +16842836,a304f875b846d65498366479fbf34568 +16843076,1b11a34d5c6cee280c727938ee96054b +16843077,ff170af78a0a674445f16e24394546c0 +16843074,ba8bd10757ab9a4446f024952bf3f1e3 +16843075,b34ec8f0f5f92acf230925c89eacec65 +16842832,3b10180dc99ab99568b51010d89c655c +16843072,d752bd5dd907feec915d036d76707ee5 +16843073,168e43895b105169862fa2e3c205529b +16842834,58efc828918aa006d5af09e32fe7799b +16843085,b30c099494e63d26f755d58ba109136a +16842841,2c471142bddf9a982a48e0ecb52cbb8 +16843082,5574b9699d71e02f3efb48f3712da8bf +16843080,4945e39d1260ff273c49d39dfc58c2a8 +16842843,bfc9dce4c1ccef959c57360fb9f70205 +16843108,4e225dd49c0231b617a15ded1ba6cb0a +16843109,35715377a038019c56925b2e661cfdab +16843105,3b91182484dc677a0bf27263e612d818 +16843106,affab7221afa03df4b7306b9ce50be7f +16843107,e3710bc197d17e0dc78ae3f607c46048 +16777217,9012132a1d0f770eca67e62a68247137 +16777219,58fc65723143afeb33f742c17e028c94 +16777220,1d5e2088f7137e304366873dd829ca98 +16777221,66a18fa3f554756edc12bf1a08586bc8 +16777222,4007295f7bdae0b78a6e47a9d64521 +16777228,c154160ce7b52d4bdc220fc954edf796 +16777229,2400808c6f442f2663b6869e4930c879 +16777230,7ae3b31e8e0f2f22f50fbf224e1fe4f7 +16777231,fe5698e183b10037e38f979a411489b8 +16777232,aeae00c7b4a95ff05423c1629bf3ad7e +16777233,72153ea3d60930cebf4c0d37fac89102 +16777235,f517ab768fbb35e275440b74b6631bfc +16777236,623df9298630687873579ea16bb97e7b +16777237,6984cb9e6a322728be736860b97b971a +16777238,6947378f4e2abb24b47e2b943945b16f +16777239,55a585682bf0569a60a71a66f031ca2 +16777240,f653295b0c48244dc2aa68fc5b94fa29 +16777241,c213fb7ee968403b24ff6ede98686add +16777243,afd641da6f3834b319b761ba6d72ff74 +16777244,8d822c710a221b8a407b2def97885470 +16777246,9c99187cc6fd9c958417b4736772e4d3 +16777251,6418210d69669c4a602148ed42ab2ecd +16777253,afe51ea56dc8c831f9b0b5ae02bac702 +16777254,95812c1d4021558b6a7f62521228c52a +16777255,3a1252acb6fe968751d2b61d57557e09 +16777257,fd7caeeb5d16756028f19ba016ed1970 +16777258,6339b8043c05d19c6b15135eade95f94 +16777260,aa1ed939a8b275df9dc5474bc0477a33 +16777261,b631dcf219d3add3560f243ff6cceb75 +16777262,91eca0c33ac53fb155feb15db48c43de +16777263,b681c19d7812c281b4b2feabb88697f4 +16777264,a2b07ae4f37a65fe1f5992826b578b02 +16777265,af5255a4dcb486e2ab11669fd3de8441 +16777266,8a4b2b706f219e52a261e342b47a3964 +16777269,921cb54cfb47ca9eca0edcf8e660e3cd +16777270,b79b3a522d1e2f865eb1e9aeb63dc66a +16777272,36e1c1dd8cbb267488e1669811319e7e +16777273,c84a7d710228024c2e100a79a2c30e55 +16777274,a1674e3020689bae5680f29f937e5424 +16777277,46b34dd723f7efeb38f670925ee3824f +16777281,da71e3e4f9a25c6621d2f0b40ffd1c72 +16777282,388109bb9b9b49c1f5bb604abee91671 +16777283,eb6912fd84b2d57ed3433acb3f85d3e6 +16777285,619967351702f1d570d4d0195bbbcc1e +16777286,ebff74d54387fb154d5b467e01d92b64 +16777288,f8154dd7c9c1d397dd64eeb6569d7d34 +16777289,971cc6f827398c6c4755b310c6795672 +16777291,bb952ff9523f248ddaae56317e91a509 +16777293,e5c24577cf35a31bd217d206b88a7499 +16777294,f4c170867c75982e604358da611b26e3 +16777295,922200512d058ecc0ef19a0efcdb51bf +16777296,39283c3dbafb10b2a732f9d6ef3e08b6 +16777297,3603ae881c41c957a89aaa30990c0040 +16777298,fbf9e47600457d091060b0f877458a83 +16777300,2b0d53bafa91c68bf59b5863354bd7ae +16777301,50b99fabae858e971eb02ed5146fd63a +16777302,7a32eac396b4cf3930ba9ca7b5d8dbae +16777303,115f1e956219026bb9cca0bcafb2b11b +16777304,afb2f032a96d859ca5f24d8ff129bd64 +16777305,372b3a0fd7c09f64f3cfcab89f03a9a0 +16777306,e4b6233ac91337dcc3940e309d21c3c +16777311,d290638555ce76ce3053c70fdacf7d55 +5242880,8099ff561e194072c9086dea38757a89 +5242881,90b3d9a90a8cf3e21527fc8fe3b43c49 +5242882,c9806dd45be8ebed3e4ab94f66e65212 +5242883,f382ded5f9a4299e3879dea4f7fe1c50 +5242884,27af08a994f76a2a08ec8671d14fdcc2 +5242885,9969ce4355ae7338470461f48f4e5ef5 +5242886,39208e0b0f070629cad494da5fb95f0d +5242887,678e63329d3d813f22e0f15006a93768 +5242888,694ffe9efa49193780d4b757115c9064 +5242889,9080a51ccefd23f9924bae9a854e7b49 +5242890,5f1d51ccd1b4adf141707907233f8379 +5242891,73df45f45e0b7484ef51441ad0e50604 +5242892,c9e52234c475354483dc3e9e6386af61 +5242893,3c3ee1df989ecf5de70a5673acfa33b8 +5242894,468cc8b546e1586406b78ad733976f5f +5242895,e546a7afaaa6c6729e3b062fc4ace4ae diff --git a/font.txt b/font.txt index 138aa6f..59c1d31 100644 --- a/font.txt +++ b/font.txt @@ -1,10 +1,10 @@ -# This file NEEDS to be in UTF-8 format! - !"#$%&'()*+,-./ -0123456789:;<=>? -@ABCDEFGHIJKLMNO -PQRSTUVWXYZ[\]^_ -'abcdefghijklmno -pqrstuvwxyz{|}~⌂ -ÇüéâäàåçêëèïîìÄÅ -ÉæÆôöòûùÿÖÜø£Ø׃ +# This file NEEDS to be in UTF-8 format! + !"#$%&'()*+,-./ +0123456789:;<=>? +@ABCDEFGHIJKLMNO +PQRSTUVWXYZ[\]^_ +'abcdefghijklmno +pqrstuvwxyz{|}~⌂ +ÇüéâäàåçêëèïîìÄÅ +ÉæÆôöòûùÿÖÜø£Ø׃ áíóúñѪº¿®¬½¼¡«» \ No newline at end of file diff --git a/lang/en_US.lang b/lang/en_US.lang index 3d2cee4..704f1c4 100644 --- a/lang/en_US.lang +++ b/lang/en_US.lang @@ -1,569 +1,579 @@ - -gui.done=Done -gui.cancel=Cancel -gui.toMenu=Back to title screen -gui.up=Up -gui.down=Down -gui.yes=Yes -gui.no=No - -menu.singleplayer=Singleplayer -menu.multiplayer=Multiplayer -menu.mods=Mods and Texture Packs -menu.options=Options... -menu.quit=Quit Game - -selectWorld.title=Select World -selectWorld.empty=empty -selectWorld.world=World -selectWorld.select=Play Selected World -selectWorld.create=Create New World -selectWorld.createDemo=Play New Demo World -selectWorld.delete=Delete -selectWorld.rename=Rename -selectWorld.deleteQuestion=Are you sure you want to delete this world? -selectWorld.deleteWarning=will be lost forever! (A long time!) -selectWorld.deleteButton=Delete -selectWorld.renameButton=Rename -selectWorld.renameTitle=Rename World -selectWorld.conversion=Must be converted! -selectWorld.newWorld=New World -selectWorld.enterName=World Name -selectWorld.resultFolder=Will be saved in: -selectWorld.enterSeed=Seed for the World Generator -selectWorld.seedInfo=Leave blank for a random seed - -multiplayer.title=Play Multiplayer -multiplayer.connect=Connect -multiplayer.info1=Minecraft Multiplayer is currently not finished, but there -multiplayer.info2=is some buggy early testing going on. -multiplayer.ipinfo=Enter the IP of a server to connect to it: - -multiplayer.downloadingTerrain=Downloading terrain - -multiplayer.stopSleeping=Leave Bed - -demo.day.1=This demo will last five game days, do your best! -demo.day.2=Day Two -demo.day.3=Day Three -demo.day.4=Day Four -demo.day.5=This is your last day! -demo.day.warning=Your time is almost up! -demo.day.6=You have passed your fifth day, use F2 to save a screenshot of your creation -demo.reminder=The demo time has expired, buy the game to continue or start a new world! -demo.help.movement=Use %1$s, %2$s, %3$s, %4$s and the mouse to move around -demo.help.jump=Jump by pressing %1$s -demo.help.inventory=Use %1$s to open your inventory - -connect.connecting=Connecting to the server... -connect.authorizing=Logging in... -connect.failed=Failed to connect to the server - -disconnect.genericReason=%s -disconnect.disconnected=Disconnected by Server -disconnect.lost=Connection Lost -disconnect.kicked=Was kicked from the game -disconnect.timeout=Timed out -disconnect.closed=Connection closed -disconnect.loginFailed=Failed to login -disconnect.loginFailedInfo=Failed to login: %s -disconnect.quitting=Quitting -disconnect.endOfStream=End of stream -disconnect.overflow=Buffer overflow - -options.off=OFF -options.on=ON -options.title=Options -options.controls=Controls... -options.video=Video Settings... -options.videoTitle=Video Settings -options.music=Music -options.sound=Sound -options.invertMouse=Invert Mouse -options.sensitivity=Sensitivity -options.sensitivity.min=*yawn* -options.sensitivity.max=HYPERSPEED!!! -options.renderDistance=Render Distance -options.renderDistance.tiny=Tiny -options.renderDistance.short=Short -options.renderDistance.normal=Normal -options.renderDistance.far=Far -options.viewBobbing=View Bobbing -options.ao=Smooth Lighting -options.anaglyph=3D Anaglyph -options.framerateLimit=Performance -options.difficulty=Difficulty -options.difficulty.peaceful=Peaceful -options.difficulty.easy=Easy -options.difficulty.normal=Normal -options.difficulty.hard=Hard -options.graphics=Graphics -options.graphics.fancy=Fancy -options.graphics.fast=Fast -options.guiScale=GUI Scale -options.guiScale.auto=Auto -options.guiScale.small=Small -options.guiScale.normal=Normal -options.guiScale.large=Large -options.advancedOpengl=Advanced OpenGL - -performance.max=Max FPS -performance.balanced=Balanced -performance.powersaver=Power saver - -controls.title=Controls - -key.forward=Forward -key.left=Left -key.back=Back -key.right=Right -key.jump=Jump -key.inventory=Inventory -key.drop=Drop -key.chat=Chat -key.fog=Toggle Fog -key.sneak=Sneak -key.playerlist=List players - -texturePack.openFolder=Open texture pack folder -texturePack.title=Select Texture Pack -texturePack.folderInfo=(Place texture pack files here) - -tile.stone.name=Stone -tile.stone.desc= -tile.grass.name=Grass -tile.grass.desc= -tile.dirt.name=Dirt -tile.dirt.desc= -tile.stonebrick.name=Cobblestone -tile.stonebrick.desc= -tile.wood.name=Wooden Planks -tile.wood.desc= -tile.sapling.name=Sapling -tile.sapling.desc= -tile.bedrock.name=Bedrock -tile.bedrock.desc= -tile.water.name=Water -tile.water.desc= -tile.lava.name=Lava -tile.lava.desc= -tile.sand.name=Sand -tile.sand.desc= -tile.sandStone.name=Sandstone -tile.sand.desc= -tile.gravel.name=Gravel -tile.gravel.desc= -tile.oreGold.name=Gold Ore -tile.oreGold.desc= -tile.oreIron.name=Iron Ore -tile.oreIron.desc= -tile.oreCoal.name=Coal Ore -tile.oreCoal.desc= -tile.log.name=Wood -tile.log.desc= -tile.leaves.name=Leaves -tile.leaves.desc= -tile.sponge.name=Sponge -tile.sponge.desc= -tile.glass.name=Glass -tile.glass.desc= -tile.cloth.name=Wool -tile.cloth.desc= -tile.flower.name=Flower -tile.flower.desc= -tile.rose.name=Rose -tile.rose.desc= -tile.mushroom.name=Mushroom -tile.mushroom.desc= -tile.blockGold.name=Block of Gold -tile.blockGold.desc= -tile.blockIron.name=Block of Iron -tile.blockIron.desc= -tile.stoneSlab.stone.name=Stone Slab -tile.stoneSlab.stone.desc= -tile.stoneSlab.sand.name=Sandstone Slab -tile.stoneSlab.sand.desc= -tile.stoneSlab.wood.name=Wooden Slab -tile.stoneSlab.wood.desc= -tile.stoneSlab.cobble.name=Stone Slab -tile.stoneSlab.cobble.desc= -tile.brick.name=Bricks -tile.brick.desc= -tile.tnt.name=TNT -tile.tnt.desc= -tile.bookshelf.name=Bookshelf -tile.bookshelf.desc= -tile.stoneMoss.name=Moss Stone -tile.stoneMoss.desc= -tile.obsidian.name=Obsidian -tile.obsidian.desc= -tile.torch.name=Torch -tile.torch.desc= -tile.fire.name=Fire -tile.fire.desc= -tile.mobSpawner.name=Monster Spawner -tile.mobSpawner.desc= -tile.stairsWood.name=Wooden Stairs -tile.stairsWood.desc= -tile.chest.name=Chest -tile.chest.desc= -tile.redstoneDust.name=Redstone Dust -tile.redstoneDust.desc= -tile.oreDiamond.name=Diamond Ore -tile.oreDiamond.desc= -tile.blockDiamond.name=Block of Diamond -tile.blockDiamond.desc= -tile.workbench.name=Crafting Table -tile.workbench.desc= -tile.crops.name=Crops -tile.crops.desc= -tile.farmland.name=Farmland -tile.farmland.desc= -tile.furnace.name=Furnace -tile.furnace.desc= -tile.sign.name=Sign -tile.sign.desc= -tile.doorWood.name=Wooden Door -tile.doorWood.desc= -tile.ladder.name=Ladder -tile.ladder.desc= -tile.rail.name=Rail -tile.rail.desc= -tile.goldenRail.name=Powered Rail -tile.goldenRail.desc= -tile.detectorRail.name=Detector Rail -tile.detectorRail.desc= -tile.stairsStone.name=Stone Stairs -tile.stairsStone.desc= -tile.lever.name=Lever -tile.lever.desc= -tile.pressurePlate.name=Pressure Plate -tile.pressurePlate.desc= -tile.doorIron.name=Iron Door -tile.doorIron.desc= -tile.oreRedstone.name=Redstone Ore -tile.oreRedstone.desc= -tile.notGate.name=Redstone Torch -tile.notGate.desc= -tile.button.name=Button -tile.button.desc= -tile.snow.name=Snow -tile.snow.desc= -tile.ice.name=Ice -tile.ice.desc= -tile.cactus.name=Cactus -tile.cactus.desc= -tile.clay.name=Clay -tile.clay.desc= -tile.reeds.name=Sugar cane -tile.reeds.desc= -tile.jukebox.name=Jukebox -tile.jukebox.desc= -tile.fence.name=Fence -tile.fence.desc= -tile.pumpkin.name=Pumpkin -tile.pumpkin.desc= -tile.litpumpkin.name=Jack 'o' Lantern -tile.litpumpkin.desc= -tile.hellrock.name=Netherrack -tile.hellrock.desc= -tile.hellsand.name=Soul Sand -tile.hellsand.desc= -tile.lightgem.name=Glowstone -tile.lightgem.desc= -tile.portal.name=Portal -tile.portal.desc= -tile.cloth.black.name=Black Wool -tile.cloth.black.desc= -tile.cloth.red.name=Red Wool -tile.cloth.red.desc= -tile.cloth.green.name=Green Wool -tile.cloth.green.desc= -tile.cloth.brown.name=Brown Wool -tile.cloth.brown.desc= -tile.cloth.blue.name=Blue Wool -tile.cloth.blue.desc= -tile.cloth.purple.name=Purple Wool -tile.cloth.purple.desc= -tile.cloth.cyan.name=Cyan Wool -tile.cloth.cyan.desc= -tile.cloth.silver.name=Light Gray Wool -tile.cloth.silver.desc= -tile.cloth.gray.name=Gray Wool -tile.cloth.gray.desc= -tile.cloth.pink.name=Pink Wool -tile.cloth.pink.desc= -tile.cloth.lime.name=Lime Wool -tile.cloth.lime.desc= -tile.cloth.yellow.name=Yellow Wool -tile.cloth.yellow.desc= -tile.cloth.lightBlue.name=Light Blue Wool -tile.cloth.lightBlue.desc= -tile.cloth.magenta.name=Magenta Wool -tile.cloth.magenta.desc= -tile.cloth.orange.name=Orange Wool -tile.cloth.orange.desc= -tile.cloth.white.name=Wool -tile.cloth.white.desc= -tile.oreLapis.name=Lapis Lazuli Ore -tile.oreLapis.desc= -tile.blockLapis.name=Lapis Lazuli Block -tile.blockLapis.desc= -tile.dispenser.name=Dispenser -tile.dispenser.desc= -tile.musicBlock.name=Note Block -tile.musicBlock.desc= -tile.cake.name=Cake -tile.cake.desc= -tile.bed.name=Bed -tile.bed.desc= -tile.bed.occupied=This bed is occupied -tile.bed.noSleep=You can only sleep at night -tile.bed.notValid=Your home bed was missing or obstructed -tile.lockedchest.name=Locked chest -tile.lockedchest.desc= -tile.trapdoor.name=Trapdoor -tile.trapdoor.desc= -tile.web.name=Cobweb -tile.web.desc= - -item.shovelIron.name=Iron Shovel -item.shovelIron.desc= -item.pickaxeIron.name=Iron Pickaxe -item.pickaxeIron.desc= -item.hatchetIron.name=Iron Axe -item.hatchetIron.desc= -item.flintAndSteel.name=Flint and Steel -item.flintAndSteel.desc= -item.apple.name=Apple -item.apple.desc= -item.cookie.name=Cookie -item.cookie.desc= -item.bow.name=Bow -item.bow.desc= -item.arrow.name=Arrow -item.arrow.desc= -item.coal.name=Coal -item.coal.desc= -item.charcoal.name=Charcoal -item.charcoal.desc= -item.emerald.name=Diamond -item.emerald.desc= -item.ingotIron.name=Iron Ingot -item.ingotIron.desc= -item.ingotGold.name=Gold Ingot -item.ingotGold.desc= -item.swordIron.name=Iron Sword -item.swordIron.desc= -item.swordWood.name=Wooden Sword -item.swordWood.desc= -item.shovelWood.name=Wooden Shovel -item.shovelWood.desc= -item.pickaxeWood.name=Wooden Pickaxe -item.pickaxeWood.desc= -item.hatchetWood.name=Wooden Axe -item.hatchetWood.desc= -item.swordStone.name=Stone Sword -item.swordStone.desc= -item.shovelStone.name=Stone Shovel -item.shovelStone.desc= -item.pickaxeStone.name=Stone Pickaxe -item.pickaxeStone.desc= -item.hatchetStone.name=Stone Axe -item.hatchetStone.desc= -item.swordDiamond.name=Diamond Sword -item.swordDiamond.desc= -item.shovelDiamond.name=Diamond Shovel -item.shovelDiamond.desc= -item.pickaxeDiamond.name=Diamond Pickaxe -item.pickaxeDiamond.desc= -item.hatchetDiamond.name=Diamond Axe -item.hatchetDiamond.desc= -item.stick.name=Stick -item.stick.desc= -item.bowl.name=Bowl -item.bowl.desc= -item.mushroomStew.name=Mushroom Stew -item.mushroomStew.desc= -item.swordGold.name=Golden Sword -item.swordGold.desc= -item.shovelGold.name=Golden Shovel -item.shovelGold.desc= -item.pickaxeGold.name=Golden Pickaxe -item.pickaxeGold.desc= -item.hatchetGold.name=Golden Axe -item.hatchetGold.desc= -item.string.name=String -item.string.desc= -item.feather.name=Feather -item.feather.desc= -item.sulphur.name=Gunpowder -item.sulphur.desc= -item.hoeWood.name=Wooden Hoe -item.hoeWood.desc= -item.hoeStone.name=Stone Hoe -item.hoeStone.desc= -item.hoeIron.name=Iron Hoe -item.hoeIron.desc= -item.hoeDiamond.name=Diamond Hoe -item.hoeDiamond.desc= -item.hoeGold.name=Golden Hoe -item.hoeGold.desc= -item.seeds.name=Seeds -item.seeds.desc= -item.wheat.name=Wheat -item.wheat.desc= -item.bread.name=Bread -item.bread.desc= -item.helmetCloth.name=Leather Cap -item.helmetCloth.desc= -item.chestplateCloth.name=Leather Tunic -item.chestplateCloth.desc= -item.leggingsCloth.name=Leather Pants -item.leggingsCloth.desc= -item.bootsCloth.name=Leather Boots -item.bootsCloth.desc= -item.helmetChain.name=Chain Helmet -item.helmetChain.desc= -item.chestplateChain.name=Chain Chestplate -item.chestplateChain.desc= -item.leggingsChain.name=Chain Leggings -item.leggingsChain.desc= -item.bootsChain.name=Chain Boots -item.bootsChain.desc= -item.helmetIron.name=Iron Helmet -item.helmetIron.desc= -item.chestplateIron.name=Iron Chestplate -item.chestplateIron.desc= -item.leggingsIron.name=Iron Leggings -item.leggingsIron.desc= -item.bootsIron.name=Iron Boots -item.bootsIron.desc= -item.helmetDiamond.name=Diamond Helmet -item.helmetDiamond.desc= -item.chestplateDiamond.name=Diamond Chestplate -item.chestplateDiamond.desc= -item.leggingsDiamond.name=Diamond Leggings -item.leggingsDiamond.desc= -item.bootsDiamond.name=Diamond Boots -item.bootsDiamond.desc= -item.helmetGold.name=Golden Helmet -item.helmetGold.desc= -item.chestplateGold.name=Golden Chestplate -item.chestplateGold.desc= -item.leggingsGold.name=Golden Leggings -item.leggingsGold.desc= -item.bootsGold.name=Golden boots -item.bootsGold.desc= -item.flint.name=Flint -item.flint.desc= -item.porkchopRaw.name=Raw Porkchop -item.porkchopRaw.desc= -item.porkchopCooked.name=Cooked Porkchop -item.porkchopCooked.desc= -item.painting.name=Painting -item.painting.desc= -item.appleGold.name=Golden Apple -item.appleGold.desc= -item.sign.name=Sign -item.sign.desc= -item.doorWood.name=Wooden Door -item.doorWood.desc= -item.bucket.name=Bucket -item.bucket.desc= -item.bucketWater.name=Water Bucket -item.bucketWater.desc= -item.bucketLava.name=Lava bucket -item.bucketLava.desc= -item.minecart.name=Minecart -item.minecart.desc= -item.saddle.name=Saddle -item.saddle.desc= -item.doorIron.name=Iron Door -item.doorIron.desc= -item.redstone.name=Redstone -item.redstone.desc= -item.snowball.name=Snowball -item.snowball.desc= -item.boat.name=Boat -item.boat.desc= -item.leather.name=Leather -item.leather.desc= -item.milk.name=Milk -item.milk.desc= -item.brick.name=Brick -item.brick.desc= -item.clay.name=Clay -item.clay.desc= -item.reeds.name=Sugar Canes -item.reeds.desc= -item.paper.name=Paper -item.paper.desc= -item.book.name=Book -item.book.desc= -item.slimeball.name=Slimeball -item.slimeball.desc= -item.minecartChest.name=Minecart with Chest -item.minecartChest.desc= -item.minecartFurnace.name=Minecart with Furnace -item.minecartFurnace.desc= -item.egg.name=Egg -item.egg.desc= -item.compass.name=Compass -item.compass.desc= -item.fishingRod.name=Fishing Rod -item.fishingRod.desc= -item.clock.name=Clock -item.clock.desc= -item.yellowDust.name=Glowstone Dust -item.yellowDust.desc= -item.fishRaw.name=Raw Fish -item.fishRaw.desc= -item.fishCooked.name=Cooked Fish -item.fishCooked.desc= -item.record.name=Music Disc -item.record.desc= -item.bone.name=Bone -item.bone.desc= -item.dyePowder.black.name=Ink Sac -item.dyePowder.black.desc= -item.dyePowder.red.name=Rose Red -item.dyePowder.red.desc= -item.dyePowder.green.name=Cactus Green -item.dyePowder.green.desc= -item.dyePowder.brown.name=Cocoa Beans -item.dyePowder.brown.desc= -item.dyePowder.blue.name=Lapis Lazuli -item.dyePowder.blue.desc= -item.dyePowder.purple.name=Purple Dye -item.dyePowder.purple.desc= -item.dyePowder.cyan.name=Cyan Dye -item.dyePowder.cyan.desc= -item.dyePowder.silver.name=Light Gray Dye -item.dyePowder.silver.desc= -item.dyePowder.gray.name=Gray Dye -item.dyePowder.gray.desc= -item.dyePowder.pink.name=Pink Dye -item.dyePowder.pink.desc= -item.dyePowder.lime.name=Lime Dye -item.dyePowder.lime.desc= -item.dyePowder.yellow.name=Dandelion Yellow -item.dyePowder.yellow.desc= -item.dyePowder.lightBlue.name=Light Blue Dye -item.dyePowder.lightBlue.desc= -item.dyePowder.magenta.name=Magenta Dye -item.dyePowder.magenta.desc= -item.dyePowder.orange.name=Orange Dye -item.dyePowder.orange.desc= -item.dyePowder.white.name=Bone Meal -item.dyePowder.white.desc= -item.sugar.name=Sugar -item.sugar.desc= -item.cake.name=Cake -item.cake.desc= -item.bed.name=Bed -item.bed.desc= -item.diode.name=Redstone Repeater -item.diode.desc= -item.map.name=Map -item.map.desc= + +gui.done=Done +gui.cancel=Cancel +gui.toMenu=Back to title screen +gui.up=Up +gui.down=Down +gui.yes=Yes +gui.no=No + +menu.singleplayer=Singleplayer +menu.multiplayer=Multiplayer +menu.mods=Mods and Texture Packs +menu.options=Options... +menu.quit=Quit Game + +selectWorld.title=Select World +selectWorld.empty=empty +selectWorld.world=World +selectWorld.select=Play Selected World +selectWorld.create=Create New World +selectWorld.createDemo=Play New Demo World +selectWorld.delete=Delete +selectWorld.rename=Rename +selectWorld.deleteQuestion=Are you sure you want to delete this world? +selectWorld.deleteWarning=will be lost forever! (A long time!) +selectWorld.deleteButton=Delete +selectWorld.renameButton=Rename +selectWorld.renameTitle=Rename World +selectWorld.conversion=Must be converted! +selectWorld.newWorld=New World +selectWorld.enterName=World Name +selectWorld.resultFolder=Will be saved in: +selectWorld.enterSeed=Seed for the World Generator +selectWorld.seedInfo=Leave blank for a random seed + +multiplayer.title=Play Multiplayer +multiplayer.connect=Connect +multiplayer.info1=Minecraft Multiplayer is currently not finished, but there +multiplayer.info2=is some buggy early testing going on. +multiplayer.ipinfo=Enter the IP of a server to connect to it: + +multiplayer.downloadingTerrain=Downloading terrain + +multiplayer.stopSleeping=Leave Bed + +demo.day.1=This demo will last five game days, do your best! +demo.day.2=Day Two +demo.day.3=Day Three +demo.day.4=Day Four +demo.day.5=This is your last day! +demo.day.warning=Your time is almost up! +demo.day.6=You have passed your fifth day, use F2 to save a screenshot of your creation +demo.reminder=The demo time has expired, buy the game to continue or start a new world! +demo.help.movement=Use %1$s, %2$s, %3$s, %4$s and the mouse to move around +demo.help.jump=Jump by pressing %1$s +demo.help.inventory=Use %1$s to open your inventory + +connect.connecting=Connecting to the server... +connect.authorizing=Logging in... +connect.failed=Failed to connect to the server + +disconnect.genericReason=%s +disconnect.disconnected=Disconnected by Server +disconnect.lost=Connection Lost +disconnect.kicked=Was kicked from the game +disconnect.timeout=Timed out +disconnect.closed=Connection closed +disconnect.loginFailed=Failed to login +disconnect.loginFailedInfo=Failed to login: %s +disconnect.quitting=Quitting +disconnect.endOfStream=End of stream +disconnect.overflow=Buffer overflow + +options.off=OFF +options.on=ON +options.title=Options +options.controls=Controls... +options.video=Video Settings... +options.videoTitle=Video Settings +options.music=Music +options.sound=Sound +options.invertMouse=Invert Mouse +options.sensitivity=Sensitivity +options.sensitivity.min=*yawn* +options.sensitivity.max=HYPERSPEED!!! +options.renderDistance=Render Distance +options.renderDistance.tiny=Tiny +options.renderDistance.short=Short +options.renderDistance.normal=Normal +options.renderDistance.far=Far +options.viewBobbing=View Bobbing +options.ao=Smooth Lighting +options.anaglyph=3D Anaglyph +options.framerateLimit=Performance +options.difficulty=Difficulty +options.difficulty.peaceful=Peaceful +options.difficulty.easy=Easy +options.difficulty.normal=Normal +options.difficulty.hard=Hard +options.graphics=Graphics +options.graphics.fancy=Fancy +options.graphics.fast=Fast +options.guiScale=GUI Scale +options.guiScale.auto=Auto +options.guiScale.small=Small +options.guiScale.normal=Normal +options.guiScale.large=Large +options.advancedOpengl=Advanced OpenGL + +performance.max=Max FPS +performance.balanced=Balanced +performance.powersaver=Power saver + +controls.title=Controls + +key.forward=Forward +key.left=Left +key.back=Back +key.right=Right +key.jump=Jump +key.inventory=Inventory +key.drop=Drop +key.chat=Chat +key.fog=Toggle Fog +key.sneak=Sneak +key.playerlist=List players + +texturePack.openFolder=Open texture pack folder +texturePack.title=Select Texture Pack +texturePack.folderInfo=(Place texture pack files here) + +tile.stone.name=Stone +tile.stone.desc= +tile.grass.name=Grass +tile.grass.desc= +tile.dirt.name=Dirt +tile.dirt.desc= +tile.stonebrick.name=Cobblestone +tile.stonebrick.desc= +tile.wood.name=Wooden Planks +tile.wood.desc= +tile.sapling.name=Sapling +tile.sapling.desc= +tile.bedrock.name=Bedrock +tile.bedrock.desc= +tile.water.name=Water +tile.water.desc= +tile.lava.name=Lava +tile.lava.desc= +tile.sand.name=Sand +tile.sand.desc= +tile.sandStone.name=Sandstone +tile.sand.desc= +tile.gravel.name=Gravel +tile.gravel.desc= +tile.oreGold.name=Gold Ore +tile.oreGold.desc= +tile.oreIron.name=Iron Ore +tile.oreIron.desc= +tile.oreCoal.name=Coal Ore +tile.oreCoal.desc= +tile.log.name=Wood +tile.log.desc= +tile.leaves.name=Leaves +tile.leaves.desc= +tile.sponge.name=Sponge +tile.sponge.desc= +tile.glass.name=Glass +tile.glass.desc= +tile.cloth.name=Wool +tile.cloth.desc= +tile.flower.name=Flower +tile.flower.desc= +tile.rose.name=Rose +tile.rose.desc= +tile.mushroom.name=Mushroom +tile.mushroom.desc= +tile.blockGold.name=Block of Gold +tile.blockGold.desc= +tile.blockIron.name=Block of Iron +tile.blockIron.desc= +tile.stoneSlab.stone.name=Stone Slab +tile.stoneSlab.stone.desc= +tile.stoneSlab.sand.name=Sandstone Slab +tile.stoneSlab.sand.desc= +tile.stoneSlab.wood.name=Wooden Slab +tile.stoneSlab.wood.desc= +tile.stoneSlab.cobble.name=Stone Slab +tile.stoneSlab.cobble.desc= +tile.brick.name=Bricks +tile.brick.desc= +tile.tnt.name=TNT +tile.tnt.desc= +tile.bookshelf.name=Bookshelf +tile.bookshelf.desc= +tile.stoneMoss.name=Moss Stone +tile.stoneMoss.desc= +tile.obsidian.name=Obsidian +tile.obsidian.desc= +tile.torch.name=Torch +tile.torch.desc= +tile.fire.name=Fire +tile.fire.desc= +tile.mobSpawner.name=Monster Spawner +tile.mobSpawner.desc= +tile.stairsWood.name=Wooden Stairs +tile.stairsWood.desc= +tile.chest.name=Chest +tile.chest.desc= +tile.redstoneDust.name=Redstone Dust +tile.redstoneDust.desc= +tile.oreDiamond.name=Diamond Ore +tile.oreDiamond.desc= +tile.blockDiamond.name=Block of Diamond +tile.blockDiamond.desc= +tile.workbench.name=Crafting Table +tile.workbench.desc= +tile.crops.name=Crops +tile.crops.desc= +tile.farmland.name=Farmland +tile.farmland.desc= +tile.furnace.name=Furnace +tile.furnace.desc= +tile.sign.name=Sign +tile.sign.desc= +tile.doorWood.name=Wooden Door +tile.doorWood.desc= +tile.ladder.name=Ladder +tile.ladder.desc= +tile.rail.name=Rail +tile.rail.desc= +tile.goldenRail.name=Powered Rail +tile.goldenRail.desc= +tile.detectorRail.name=Detector Rail +tile.detectorRail.desc= +tile.stairsStone.name=Stone Stairs +tile.stairsStone.desc= +tile.lever.name=Lever +tile.lever.desc= +tile.pressurePlate.name=Pressure Plate +tile.pressurePlate.desc= +tile.doorIron.name=Iron Door +tile.doorIron.desc= +tile.oreRedstone.name=Redstone Ore +tile.oreRedstone.desc= +tile.notGate.name=Redstone Torch +tile.notGate.desc= +tile.button.name=Button +tile.button.desc= +tile.snow.name=Snow +tile.snow.desc= +tile.ice.name=Ice +tile.ice.desc= +tile.cactus.name=Cactus +tile.cactus.desc= +tile.clay.name=Clay +tile.clay.desc= +tile.reeds.name=Sugar cane +tile.reeds.desc= +tile.jukebox.name=Jukebox +tile.jukebox.desc= +tile.fence.name=Fence +tile.fence.desc= +tile.pumpkin.name=Pumpkin +tile.pumpkin.desc= +tile.litpumpkin.name=Jack 'o' Lantern +tile.litpumpkin.desc= +tile.hellrock.name=Netherrack +tile.hellrock.desc= +tile.hellsand.name=Soul Sand +tile.hellsand.desc= +tile.lightgem.name=Glowstone +tile.lightgem.desc= +tile.portal.name=Portal +tile.portal.desc= +tile.cloth.black.name=Black Wool +tile.cloth.black.desc= +tile.cloth.red.name=Red Wool +tile.cloth.red.desc= +tile.cloth.green.name=Green Wool +tile.cloth.green.desc= +tile.cloth.brown.name=Brown Wool +tile.cloth.brown.desc= +tile.cloth.blue.name=Blue Wool +tile.cloth.blue.desc= +tile.cloth.purple.name=Purple Wool +tile.cloth.purple.desc= +tile.cloth.cyan.name=Cyan Wool +tile.cloth.cyan.desc= +tile.cloth.silver.name=Light Gray Wool +tile.cloth.silver.desc= +tile.cloth.gray.name=Gray Wool +tile.cloth.gray.desc= +tile.cloth.pink.name=Pink Wool +tile.cloth.pink.desc= +tile.cloth.lime.name=Lime Wool +tile.cloth.lime.desc= +tile.cloth.yellow.name=Yellow Wool +tile.cloth.yellow.desc= +tile.cloth.lightBlue.name=Light Blue Wool +tile.cloth.lightBlue.desc= +tile.cloth.magenta.name=Magenta Wool +tile.cloth.magenta.desc= +tile.cloth.orange.name=Orange Wool +tile.cloth.orange.desc= +tile.cloth.white.name=Wool +tile.cloth.white.desc= +tile.oreLapis.name=Lapis Lazuli Ore +tile.oreLapis.desc= +tile.blockLapis.name=Lapis Lazuli Block +tile.blockLapis.desc= +tile.dispenser.name=Dispenser +tile.dispenser.desc= +tile.musicBlock.name=Note Block +tile.musicBlock.desc= +tile.cake.name=Cake +tile.cake.desc= +tile.bed.name=Bed +tile.bed.desc= +tile.bed.occupied=This bed is occupied +tile.bed.noSleep=You can only sleep at night +tile.bed.notValid=Your home bed was missing or obstructed +tile.lockedchest.name=Locked chest +tile.lockedchest.desc= +tile.trapdoor.name=Trapdoor +tile.trapdoor.desc= +tile.web.name=Cobweb +tile.web.desc= +tile.stonebricksmooth.name=Stone Bricks +tile.stonebricksmooth.desc= +tile.pistonBase.name=Piston +tile.pistonBase.desc= +tile.pistonStickyBase.name=Sticky Piston +tile.pistonStickyBase.desc= + +item.shovelIron.name=Iron Shovel +item.shovelIron.desc= +item.pickaxeIron.name=Iron Pickaxe +item.pickaxeIron.desc= +item.hatchetIron.name=Iron Axe +item.hatchetIron.desc= +item.flintAndSteel.name=Flint and Steel +item.flintAndSteel.desc= +item.apple.name=Apple +item.apple.desc= +item.cookie.name=Cookie +item.cookie.desc= +item.bow.name=Bow +item.bow.desc= +item.arrow.name=Arrow +item.arrow.desc= +item.coal.name=Coal +item.coal.desc= +item.charcoal.name=Charcoal +item.charcoal.desc= +item.emerald.name=Diamond +item.emerald.desc= +item.ingotIron.name=Iron Ingot +item.ingotIron.desc= +item.ingotGold.name=Gold Ingot +item.ingotGold.desc= +item.swordIron.name=Iron Sword +item.swordIron.desc= +item.swordWood.name=Wooden Sword +item.swordWood.desc= +item.shovelWood.name=Wooden Shovel +item.shovelWood.desc= +item.pickaxeWood.name=Wooden Pickaxe +item.pickaxeWood.desc= +item.hatchetWood.name=Wooden Axe +item.hatchetWood.desc= +item.swordStone.name=Stone Sword +item.swordStone.desc= +item.shovelStone.name=Stone Shovel +item.shovelStone.desc= +item.pickaxeStone.name=Stone Pickaxe +item.pickaxeStone.desc= +item.hatchetStone.name=Stone Axe +item.hatchetStone.desc= +item.swordDiamond.name=Diamond Sword +item.swordDiamond.desc= +item.shovelDiamond.name=Diamond Shovel +item.shovelDiamond.desc= +item.pickaxeDiamond.name=Diamond Pickaxe +item.pickaxeDiamond.desc= +item.hatchetDiamond.name=Diamond Axe +item.hatchetDiamond.desc= +item.stick.name=Stick +item.stick.desc= +item.bowl.name=Bowl +item.bowl.desc= +item.mushroomStew.name=Mushroom Stew +item.mushroomStew.desc= +item.swordGold.name=Golden Sword +item.swordGold.desc= +item.shovelGold.name=Golden Shovel +item.shovelGold.desc= +item.pickaxeGold.name=Golden Pickaxe +item.pickaxeGold.desc= +item.hatchetGold.name=Golden Axe +item.hatchetGold.desc= +item.string.name=String +item.string.desc= +item.feather.name=Feather +item.feather.desc= +item.sulphur.name=Gunpowder +item.sulphur.desc= +item.hoeWood.name=Wooden Hoe +item.hoeWood.desc= +item.hoeStone.name=Stone Hoe +item.hoeStone.desc= +item.hoeIron.name=Iron Hoe +item.hoeIron.desc= +item.hoeDiamond.name=Diamond Hoe +item.hoeDiamond.desc= +item.hoeGold.name=Golden Hoe +item.hoeGold.desc= +item.seeds.name=Seeds +item.seeds.desc= +item.wheat.name=Wheat +item.wheat.desc= +item.bread.name=Bread +item.bread.desc= +item.helmetCloth.name=Leather Cap +item.helmetCloth.desc= +item.chestplateCloth.name=Leather Tunic +item.chestplateCloth.desc= +item.leggingsCloth.name=Leather Pants +item.leggingsCloth.desc= +item.bootsCloth.name=Leather Boots +item.bootsCloth.desc= +item.helmetChain.name=Chain Helmet +item.helmetChain.desc= +item.chestplateChain.name=Chain Chestplate +item.chestplateChain.desc= +item.leggingsChain.name=Chain Leggings +item.leggingsChain.desc= +item.bootsChain.name=Chain Boots +item.bootsChain.desc= +item.helmetIron.name=Iron Helmet +item.helmetIron.desc= +item.chestplateIron.name=Iron Chestplate +item.chestplateIron.desc= +item.leggingsIron.name=Iron Leggings +item.leggingsIron.desc= +item.bootsIron.name=Iron Boots +item.bootsIron.desc= +item.helmetDiamond.name=Diamond Helmet +item.helmetDiamond.desc= +item.chestplateDiamond.name=Diamond Chestplate +item.chestplateDiamond.desc= +item.leggingsDiamond.name=Diamond Leggings +item.leggingsDiamond.desc= +item.bootsDiamond.name=Diamond Boots +item.bootsDiamond.desc= +item.helmetGold.name=Golden Helmet +item.helmetGold.desc= +item.chestplateGold.name=Golden Chestplate +item.chestplateGold.desc= +item.leggingsGold.name=Golden Leggings +item.leggingsGold.desc= +item.bootsGold.name=Golden boots +item.bootsGold.desc= +item.flint.name=Flint +item.flint.desc= +item.porkchopRaw.name=Raw Porkchop +item.porkchopRaw.desc= +item.porkchopCooked.name=Cooked Porkchop +item.porkchopCooked.desc= +item.painting.name=Painting +item.painting.desc= +item.appleGold.name=Golden Apple +item.appleGold.desc= +item.sign.name=Sign +item.sign.desc= +item.doorWood.name=Wooden Door +item.doorWood.desc= +item.bucket.name=Bucket +item.bucket.desc= +item.bucketWater.name=Water Bucket +item.bucketWater.desc= +item.bucketLava.name=Lava bucket +item.bucketLava.desc= +item.minecart.name=Minecart +item.minecart.desc= +item.saddle.name=Saddle +item.saddle.desc= +item.doorIron.name=Iron Door +item.doorIron.desc= +item.redstone.name=Redstone +item.redstone.desc= +item.snowball.name=Snowball +item.snowball.desc= +item.boat.name=Boat +item.boat.desc= +item.leather.name=Leather +item.leather.desc= +item.milk.name=Milk +item.milk.desc= +item.brick.name=Brick +item.brick.desc= +item.clay.name=Clay +item.clay.desc= +item.reeds.name=Sugar Canes +item.reeds.desc= +item.paper.name=Paper +item.paper.desc= +item.book.name=Book +item.book.desc= +item.slimeball.name=Slimeball +item.slimeball.desc= +item.minecartChest.name=Minecart with Chest +item.minecartChest.desc= +item.minecartFurnace.name=Minecart with Furnace +item.minecartFurnace.desc= +item.egg.name=Egg +item.egg.desc= +item.compass.name=Compass +item.compass.desc= +item.fishingRod.name=Fishing Rod +item.fishingRod.desc= +item.clock.name=Clock +item.clock.desc= +item.yellowDust.name=Glowstone Dust +item.yellowDust.desc= +item.fishRaw.name=Raw Fish +item.fishRaw.desc= +item.fishCooked.name=Cooked Fish +item.fishCooked.desc= +item.record.name=Music Disc +item.record.desc= +item.bone.name=Bone +item.bone.desc= +item.dyePowder.black.name=Ink Sac +item.dyePowder.black.desc= +item.dyePowder.red.name=Rose Red +item.dyePowder.red.desc= +item.dyePowder.green.name=Cactus Green +item.dyePowder.green.desc= +item.dyePowder.brown.name=Cocoa Beans +item.dyePowder.brown.desc= +item.dyePowder.blue.name=Lapis Lazuli +item.dyePowder.blue.desc= +item.dyePowder.purple.name=Purple Dye +item.dyePowder.purple.desc= +item.dyePowder.cyan.name=Cyan Dye +item.dyePowder.cyan.desc= +item.dyePowder.silver.name=Light Gray Dye +item.dyePowder.silver.desc= +item.dyePowder.gray.name=Gray Dye +item.dyePowder.gray.desc= +item.dyePowder.pink.name=Pink Dye +item.dyePowder.pink.desc= +item.dyePowder.lime.name=Lime Dye +item.dyePowder.lime.desc= +item.dyePowder.yellow.name=Dandelion Yellow +item.dyePowder.yellow.desc= +item.dyePowder.lightBlue.name=Light Blue Dye +item.dyePowder.lightBlue.desc= +item.dyePowder.magenta.name=Magenta Dye +item.dyePowder.magenta.desc= +item.dyePowder.orange.name=Orange Dye +item.dyePowder.orange.desc= +item.dyePowder.white.name=Bone Meal +item.dyePowder.white.desc= +item.sugar.name=Sugar +item.sugar.desc= +item.cake.name=Cake +item.cake.desc= +item.bed.name=Bed +item.bed.desc= +item.diode.name=Redstone Repeater +item.diode.desc= +item.map.name=Map +item.map.desc= +item.leaves.name=Leaves +item.leaves.desc= +item.shears.name=Shears +item.shears.desc= diff --git a/lang/stats_US.lang b/lang/stats_US.lang index 0cab4da..caba23a 100644 --- a/lang/stats_US.lang +++ b/lang/stats_US.lang @@ -1,81 +1,81 @@ -gui.achievements=Achievements -gui.stats=Statistics - -stat.generalButton=General -stat.blocksButton=Blocks -stat.itemsButton=Items - -stat.used=Times Used -stat.mined=Times Mined -stat.depleted=Times Depleted -stat.crafted=Times Crafted - -stat.startGame=Times played -stat.createWorld=Worlds played -stat.loadWorld=Saves loaded -stat.joinMultiplayer=Multiplayer joins -stat.leaveGame=Games quit - -stat.playOneMinute=Minutes Played - -stat.walkOneCm=Distance Walked -stat.fallOneCm=Distance Fallen -stat.swimOneCm=Distance Swum -stat.flyOneCm=Distance Flown -stat.climbOneCm=Distance Climbed -stat.diveOneCm=Distance Dove -stat.minecartOneCm=Distance by Minecart -stat.boatOneCm=Distance by Boat -stat.pigOneCm=Distance by Pig -stat.jump=Jumps -stat.drop=Items Dropped - -stat.damageDealt=Damage Dealt -stat.damageTaken=Damage Taken -stat.deaths=Number of Deaths -stat.mobKills=Mob Kills -stat.playerKills=Player Kills -stat.fishCaught=Fish Caught - -stat.mineBlock=%1$s Mined -stat.craftItem=%1$s Crafted -stat.useItem=%1$s Used -stat.breakItem=%1$s Depleted - -achievement.get=Achievement get! - -achievement.taken=Taken! - -achievement.requires=Requires '%1$s' -achievement.openInventory=Taking Inventory -achievement.openInventory.desc=Press '%1$s' to open your inventory. -achievement.mineWood=Getting Wood -achievement.mineWood.desc=Attack a tree until a block of wood pops out -achievement.buildWorkBench=Benchmarking -achievement.buildWorkBench.desc=Craft a workbench with four blocks of planks -achievement.buildPickaxe=Time to Mine! -achievement.buildPickaxe.desc=Use planks and sticks to make a pickaxe -achievement.buildFurnace=Hot Topic -achievement.buildFurnace.desc=Construct a furnace out of eight stone blocks -achievement.acquireIron=Acquire Hardware -achievement.acquireIron.desc=Smelt an iron ingot -achievement.buildHoe=Time to Farm! -achievement.buildHoe.desc=Use planks and sticks to make a hoe -achievement.makeBread=Bake Bread -achievement.makeBread.desc=Turn wheat into bread -achievement.bakeCake=The Lie -achievement.bakeCake.desc=Wheat, sugar, milk and eggs! -achievement.buildBetterPickaxe=Getting an Upgrade -achievement.buildBetterPickaxe.desc=Construct a better pickaxe -achievement.cookFish=Delicious Fish -achievement.cookFish.desc=Catch and cook fish! -achievement.onARail=On A Rail -achievement.onARail.desc=Travel by minecart at least 1 km from where you started -achievement.buildSword=Time to Strike! -achievement.buildSword.desc=Use planks and sticks to make a sword -achievement.killEnemy=Monster Hunter -achievement.killEnemy.desc=Attack and destroy a monster -achievement.killCow=Cow Tipper -achievement.killCow.desc=Harvest some leather -achievement.flyPig=When Pigs Fly -achievement.flyPig.desc=Fly a pig off a cliff +gui.achievements=Achievements +gui.stats=Statistics + +stat.generalButton=General +stat.blocksButton=Blocks +stat.itemsButton=Items + +stat.used=Times Used +stat.mined=Times Mined +stat.depleted=Times Depleted +stat.crafted=Times Crafted + +stat.startGame=Times played +stat.createWorld=Worlds played +stat.loadWorld=Saves loaded +stat.joinMultiplayer=Multiplayer joins +stat.leaveGame=Games quit + +stat.playOneMinute=Minutes Played + +stat.walkOneCm=Distance Walked +stat.fallOneCm=Distance Fallen +stat.swimOneCm=Distance Swum +stat.flyOneCm=Distance Flown +stat.climbOneCm=Distance Climbed +stat.diveOneCm=Distance Dove +stat.minecartOneCm=Distance by Minecart +stat.boatOneCm=Distance by Boat +stat.pigOneCm=Distance by Pig +stat.jump=Jumps +stat.drop=Items Dropped + +stat.damageDealt=Damage Dealt +stat.damageTaken=Damage Taken +stat.deaths=Number of Deaths +stat.mobKills=Mob Kills +stat.playerKills=Player Kills +stat.fishCaught=Fish Caught + +stat.mineBlock=%1$s Mined +stat.craftItem=%1$s Crafted +stat.useItem=%1$s Used +stat.breakItem=%1$s Depleted + +achievement.get=Achievement get! + +achievement.taken=Taken! + +achievement.requires=Requires '%1$s' +achievement.openInventory=Taking Inventory +achievement.openInventory.desc=Press '%1$s' to open your inventory. +achievement.mineWood=Getting Wood +achievement.mineWood.desc=Attack a tree until a block of wood pops out +achievement.buildWorkBench=Benchmarking +achievement.buildWorkBench.desc=Craft a workbench with four blocks of planks +achievement.buildPickaxe=Time to Mine! +achievement.buildPickaxe.desc=Use planks and sticks to make a pickaxe +achievement.buildFurnace=Hot Topic +achievement.buildFurnace.desc=Construct a furnace out of eight stone blocks +achievement.acquireIron=Acquire Hardware +achievement.acquireIron.desc=Smelt an iron ingot +achievement.buildHoe=Time to Farm! +achievement.buildHoe.desc=Use planks and sticks to make a hoe +achievement.makeBread=Bake Bread +achievement.makeBread.desc=Turn wheat into bread +achievement.bakeCake=The Lie +achievement.bakeCake.desc=Wheat, sugar, milk and eggs! +achievement.buildBetterPickaxe=Getting an Upgrade +achievement.buildBetterPickaxe.desc=Construct a better pickaxe +achievement.cookFish=Delicious Fish +achievement.cookFish.desc=Catch and cook fish! +achievement.onARail=On A Rail +achievement.onARail.desc=Travel by minecart at least 1 km from where you started +achievement.buildSword=Time to Strike! +achievement.buildSword.desc=Use planks and sticks to make a sword +achievement.killEnemy=Monster Hunter +achievement.killEnemy.desc=Attack and destroy a monster +achievement.killCow=Cow Tipper +achievement.killCow.desc=Harvest some leather +achievement.flyPig=When Pigs Fly +achievement.flyPig.desc=Fly a pig off a cliff diff --git a/net/minecraft/server/Block.java b/net/minecraft/server/Block.java index 1287a55..4fe71f1 100644 --- a/net/minecraft/server/Block.java +++ b/net/minecraft/server/Block.java @@ -26,38 +26,38 @@ public class Block { public static final BlockGrass GRASS = (BlockGrass) (new BlockGrass(2)).c(0.6F).a(g).a("grass"); public static final Block DIRT = (new BlockDirt(3, 2)).c(0.5F).a(f).a("dirt"); public static final Block COBBLESTONE = (new Block(4, 16, Material.STONE)).c(2.0F).b(10.0F).a(h).a("stonebrick"); - public static final Block WOOD = (new Block(5, 4, Material.WOOD)).c(2.0F).b(5.0F).a(e).a("wood").k(); - public static final Block SAPLING = (new BlockSapling(6, 15)).c(0.0F).a(g).a("sapling").k(); - public static final Block BEDROCK = (new Block(7, 17, Material.STONE)).c(-1.0F).b(6000000.0F).a(h).a("bedrock").j(); - public static final Block WATER = (new BlockFlowing(8, Material.WATER)).c(100.0F).f(3).a("water").j().k(); - public static final Block STATIONARY_WATER = (new BlockStationary(9, Material.WATER)).c(100.0F).f(3).a("water").j().k(); - public static final Block LAVA = (new BlockFlowing(10, Material.LAVA)).c(0.0F).a(1.0F).f(255).a("lava").j().k(); - public static final Block STATIONARY_LAVA = (new BlockStationary(11, Material.LAVA)).c(100.0F).a(1.0F).f(255).a("lava").j().k(); + public static final Block WOOD = (new Block(5, 4, Material.WOOD)).c(2.0F).b(5.0F).a(e).a("wood").g(); + public static final Block SAPLING = (new BlockSapling(6, 15)).c(0.0F).a(g).a("sapling").g(); + public static final Block BEDROCK = (new Block(7, 17, Material.STONE)).i().b(6000000.0F).a(h).a("bedrock").n(); + public static final Block WATER = (new BlockFlowing(8, Material.WATER)).c(100.0F).f(3).a("water").n().g(); + public static final Block STATIONARY_WATER = (new BlockStationary(9, Material.WATER)).c(100.0F).f(3).a("water").n().g(); + public static final Block LAVA = (new BlockFlowing(10, Material.LAVA)).c(0.0F).a(1.0F).f(255).a("lava").n().g(); + public static final Block STATIONARY_LAVA = (new BlockStationary(11, Material.LAVA)).c(100.0F).a(1.0F).f(255).a("lava").n().g(); public static final Block SAND = (new BlockSand(12, 18)).c(0.5F).a(l).a("sand"); public static final Block GRAVEL = (new BlockGravel(13, 19)).c(0.6F).a(f).a("gravel"); public static final Block GOLD_ORE = (new BlockOre(14, 32)).c(3.0F).b(5.0F).a(h).a("oreGold"); public static final Block IRON_ORE = (new BlockOre(15, 33)).c(3.0F).b(5.0F).a(h).a("oreIron"); public static final Block COAL_ORE = (new BlockOre(16, 34)).c(3.0F).b(5.0F).a(h).a("oreCoal"); - public static final Block LOG = (new BlockLog(17)).c(2.0F).a(e).a("log").k(); - public static final BlockLeaves LEAVES = (BlockLeaves) (new BlockLeaves(18, 52)).c(0.2F).f(1).a(g).a("leaves").j().k(); + public static final Block LOG = (new BlockLog(17)).c(2.0F).a(e).a("log").g(); + public static final BlockLeaves LEAVES = (BlockLeaves) (new BlockLeaves(18, 52)).c(0.2F).f(1).a(g).a("leaves").n().g(); public static final Block SPONGE = (new BlockSponge(19)).c(0.6F).a(g).a("sponge"); public static final Block GLASS = (new BlockGlass(20, 49, Material.SHATTERABLE, false)).c(0.3F).a(j).a("glass"); public static final Block LAPIS_ORE = (new BlockOre(21, 160)).c(3.0F).b(5.0F).a(h).a("oreLapis"); public static final Block LAPIS_BLOCK = (new Block(22, 144, Material.STONE)).c(3.0F).b(5.0F).a(h).a("blockLapis"); - public static final Block DISPENSER = (new BlockDispenser(23)).c(3.5F).a(h).a("dispenser").k(); + public static final Block DISPENSER = (new BlockDispenser(23)).c(3.5F).a(h).a("dispenser").g(); public static final Block SANDSTONE = (new BlockSandStone(24)).a(h).c(0.8F).a("sandStone"); - public static final Block NOTE_BLOCK = (new BlockNote(25)).c(0.8F).a("musicBlock").k(); - public static final Block BED = (new BlockBed(26)).c(0.2F).a("bed").j().k(); - public static final Block GOLDEN_RAIL = (new BlockMinecartTrack(27, 179, true)).c(0.7F).a(i).a("goldenRail").k(); - public static final Block DETECTOR_RAIL = (new BlockMinecartDetector(28, 195)).c(0.7F).a(i).a("detectorRail").k(); - public static final Block W = null; - public static final Block WEB = (new BlockWeb(30, 11)).a("web"); + public static final Block NOTE_BLOCK = (new BlockNote(25)).c(0.8F).a("musicBlock").g(); + public static final Block BED = (new BlockBed(26)).c(0.2F).a("bed").n().g(); + public static final Block GOLDEN_RAIL = (new BlockMinecartTrack(27, 179, true)).c(0.7F).a(i).a("goldenRail").g(); + public static final Block DETECTOR_RAIL = (new BlockMinecartDetector(28, 195)).c(0.7F).a(i).a("detectorRail").g(); + public static final Block PISTON_STICKY = (new BlockPiston(29, 106, true)).a("pistonStickyBase").g(); + public static final Block WEB = (new BlockWeb(30, 11)).f(1).c(4.0F).a("web"); public static final BlockLongGrass LONG_GRASS = (BlockLongGrass) (new BlockLongGrass(31, 39)).c(0.0F).a(g).a("tallgrass"); public static final BlockDeadBush DEAD_BUSH = (BlockDeadBush) (new BlockDeadBush(32, 55)).c(0.0F).a(g).a("deadbush"); - public static final Block aa = null; - public static final Block ab = null; - public static final Block WOOL = (new BlockCloth()).c(0.8F).a(k).a("cloth").k(); - public static final Block ad = null; + public static final Block PISTON = (new BlockPiston(33, 107, false)).a("pistonBase").g(); + public static final BlockPistonExtension PISTON_EXTENSION = (BlockPistonExtension) (new BlockPistonExtension(34, 107)).g(); + public static final Block WOOL = (new BlockCloth()).c(0.8F).a(k).a("cloth").g(); + public static final BlockPistonMoving PISTON_MOVING = new BlockPistonMoving(36); public static final BlockFlower YELLOW_FLOWER = (BlockFlower) (new BlockFlower(37, 13)).c(0.0F).a(g).a("flower"); public static final BlockFlower RED_ROSE = (BlockFlower) (new BlockFlower(38, 12)).c(0.0F).a(g).a("rose"); public static final BlockFlower BROWN_MUSHROOM = (BlockFlower) (new BlockMushroom(39, 29)).c(0.0F).a(g).a(0.125F).a("mushroom"); @@ -71,53 +71,53 @@ public class Block { public static final Block BOOKSHELF = (new BlockBookshelf(47, 35)).c(1.5F).a(e).a("bookshelf"); public static final Block MOSSY_COBBLESTONE = (new Block(48, 36, Material.STONE)).c(2.0F).b(10.0F).a(h).a("stoneMoss"); public static final Block OBSIDIAN = (new BlockObsidian(49, 37)).c(10.0F).b(2000.0F).a(h).a("obsidian"); - public static final Block TORCH = (new BlockTorch(50, 80)).c(0.0F).a(0.9375F).a(e).a("torch").k(); - public static final BlockFire FIRE = (BlockFire) (new BlockFire(51, 31)).c(0.0F).a(1.0F).a(e).a("fire").j().k(); - public static final Block MOB_SPAWNER = (new BlockMobSpawner(52, 65)).c(5.0F).a(i).a("mobSpawner").j(); - public static final Block WOOD_STAIRS = (new BlockStairs(53, WOOD)).a("stairsWood").k(); - public static final Block CHEST = (new BlockChest(54)).c(2.5F).a(e).a("chest").k(); - public static final Block REDSTONE_WIRE = (new BlockRedstoneWire(55, 164)).c(0.0F).a(d).a("redstoneDust").j().k(); + public static final Block TORCH = (new BlockTorch(50, 80)).c(0.0F).a(0.9375F).a(e).a("torch").g(); + public static final BlockFire FIRE = (BlockFire) (new BlockFire(51, 31)).c(0.0F).a(1.0F).a(e).a("fire").n().g(); + public static final Block MOB_SPAWNER = (new BlockMobSpawner(52, 65)).c(5.0F).a(i).a("mobSpawner").n(); + public static final Block WOOD_STAIRS = (new BlockStairs(53, WOOD)).a("stairsWood").g(); + public static final Block CHEST = (new BlockChest(54)).c(2.5F).a(e).a("chest").g(); + public static final Block REDSTONE_WIRE = (new BlockRedstoneWire(55, 164)).c(0.0F).a(d).a("redstoneDust").n().g(); public static final Block DIAMOND_ORE = (new BlockOre(56, 50)).c(3.0F).b(5.0F).a(h).a("oreDiamond"); public static final Block DIAMOND_BLOCK = (new BlockOreBlock(57, 24)).c(5.0F).b(10.0F).a(i).a("blockDiamond"); public static final Block WORKBENCH = (new BlockWorkbench(58)).c(2.5F).a(e).a("workbench"); - public static final Block CROPS = (new BlockCrops(59, 88)).c(0.0F).a(g).a("crops").j().k(); + public static final Block CROPS = (new BlockCrops(59, 88)).c(0.0F).a(g).a("crops").n().g(); public static final Block SOIL = (new BlockSoil(60)).c(0.6F).a(f).a("farmland"); - public static final Block FURNACE = (new BlockFurnace(61, false)).c(3.5F).a(h).a("furnace").k(); - public static final Block BURNING_FURNACE = (new BlockFurnace(62, true)).c(3.5F).a(h).a(0.875F).a("furnace").k(); - public static final Block SIGN_POST = (new BlockSign(63, TileEntitySign.class, true)).c(1.0F).a(e).a("sign").j().k(); - public static final Block WOODEN_DOOR = (new BlockDoor(64, Material.WOOD)).c(3.0F).a(e).a("doorWood").j().k(); - public static final Block LADDER = (new BlockLadder(65, 83)).c(0.4F).a(e).a("ladder").k(); - public static final Block RAILS = (new BlockMinecartTrack(66, 128, false)).c(0.7F).a(i).a("rail").k(); - public static final Block COBBLESTONE_STAIRS = (new BlockStairs(67, COBBLESTONE)).a("stairsStone").k(); - public static final Block WALL_SIGN = (new BlockSign(68, TileEntitySign.class, false)).c(1.0F).a(e).a("sign").j().k(); - public static final Block LEVER = (new BlockLever(69, 96)).c(0.5F).a(e).a("lever").k(); - public static final Block STONE_PLATE = (new BlockPressurePlate(70, STONE.textureId, EnumMobType.MOBS, Material.STONE)).c(0.5F).a(h).a("pressurePlate").k(); - public static final Block IRON_DOOR_BLOCK = (new BlockDoor(71, Material.ORE)).c(5.0F).a(i).a("doorIron").j().k(); - public static final Block WOOD_PLATE = (new BlockPressurePlate(72, WOOD.textureId, EnumMobType.EVERYTHING, Material.WOOD)).c(0.5F).a(e).a("pressurePlate").k(); - public static final Block REDSTONE_ORE = (new BlockRedstoneOre(73, 51, false)).c(3.0F).b(5.0F).a(h).a("oreRedstone").k(); - public static final Block GLOWING_REDSTONE_ORE = (new BlockRedstoneOre(74, 51, true)).a(0.625F).c(3.0F).b(5.0F).a(h).a("oreRedstone").k(); - public static final Block REDSTONE_TORCH_OFF = (new BlockRedstoneTorch(75, 115, false)).c(0.0F).a(e).a("notGate").k(); - public static final Block REDSTONE_TORCH_ON = (new BlockRedstoneTorch(76, 99, true)).c(0.0F).a(0.5F).a(e).a("notGate").k(); - public static final Block STONE_BUTTON = (new BlockButton(77, STONE.textureId)).c(0.5F).a(h).a("button").k(); + public static final Block FURNACE = (new BlockFurnace(61, false)).c(3.5F).a(h).a("furnace").g(); + public static final Block BURNING_FURNACE = (new BlockFurnace(62, true)).c(3.5F).a(h).a(0.875F).a("furnace").g(); + public static final Block SIGN_POST = (new BlockSign(63, TileEntitySign.class, true)).c(1.0F).a(e).a("sign").n().g(); + public static final Block WOODEN_DOOR = (new BlockDoor(64, Material.WOOD)).c(3.0F).a(e).a("doorWood").n().g(); + public static final Block LADDER = (new BlockLadder(65, 83)).c(0.4F).a(e).a("ladder").g(); + public static final Block RAILS = (new BlockMinecartTrack(66, 128, false)).c(0.7F).a(i).a("rail").g(); + public static final Block COBBLESTONE_STAIRS = (new BlockStairs(67, COBBLESTONE)).a("stairsStone").g(); + public static final Block WALL_SIGN = (new BlockSign(68, TileEntitySign.class, false)).c(1.0F).a(e).a("sign").n().g(); + public static final Block LEVER = (new BlockLever(69, 96)).c(0.5F).a(e).a("lever").g(); + public static final Block STONE_PLATE = (new BlockPressurePlate(70, STONE.textureId, EnumMobType.MOBS, Material.STONE)).c(0.5F).a(h).a("pressurePlate").g(); + public static final Block IRON_DOOR_BLOCK = (new BlockDoor(71, Material.ORE)).c(5.0F).a(i).a("doorIron").n().g(); + public static final Block WOOD_PLATE = (new BlockPressurePlate(72, WOOD.textureId, EnumMobType.EVERYTHING, Material.WOOD)).c(0.5F).a(e).a("pressurePlate").g(); + public static final Block REDSTONE_ORE = (new BlockRedstoneOre(73, 51, false)).c(3.0F).b(5.0F).a(h).a("oreRedstone").g(); + public static final Block GLOWING_REDSTONE_ORE = (new BlockRedstoneOre(74, 51, true)).a(0.625F).c(3.0F).b(5.0F).a(h).a("oreRedstone").g(); + public static final Block REDSTONE_TORCH_OFF = (new BlockRedstoneTorch(75, 115, false)).c(0.0F).a(e).a("notGate").g(); + public static final Block REDSTONE_TORCH_ON = (new BlockRedstoneTorch(76, 99, true)).c(0.0F).a(0.5F).a(e).a("notGate").g(); + public static final Block STONE_BUTTON = (new BlockButton(77, STONE.textureId)).c(0.5F).a(h).a("button").g(); public static final Block SNOW = (new BlockSnow(78, 66)).c(0.1F).a(k).a("snow"); public static final Block ICE = (new BlockIce(79, 67)).c(0.5F).f(3).a(j).a("ice"); public static final Block SNOW_BLOCK = (new BlockSnowBlock(80, 66)).c(0.2F).a(k).a("snow"); public static final Block CACTUS = (new BlockCactus(81, 70)).c(0.4F).a(k).a("cactus"); public static final Block CLAY = (new BlockClay(82, 72)).c(0.6F).a(f).a("clay"); - public static final Block SUGAR_CANE_BLOCK = (new BlockReed(83, 73)).c(0.0F).a(g).a("reeds").j(); - public static final Block JUKEBOX = (new BlockJukeBox(84, 74)).c(2.0F).b(10.0F).a(h).a("jukebox").k(); - public static final Block FENCE = (new BlockFence(85, 4)).c(2.0F).b(5.0F).a(e).a("fence").k(); - public static final Block PUMPKIN = (new BlockPumpkin(86, 102, false)).c(1.0F).a(e).a("pumpkin").k(); + public static final Block SUGAR_CANE_BLOCK = (new BlockReed(83, 73)).c(0.0F).a(g).a("reeds").n(); + public static final Block JUKEBOX = (new BlockJukeBox(84, 74)).c(2.0F).b(10.0F).a(h).a("jukebox").g(); + public static final Block FENCE = (new BlockFence(85, 4)).c(2.0F).b(5.0F).a(e).a("fence").g(); + public static final Block PUMPKIN = (new BlockPumpkin(86, 102, false)).c(1.0F).a(e).a("pumpkin").g(); public static final Block NETHERRACK = (new BlockBloodStone(87, 103)).c(0.4F).a(h).a("hellrock"); public static final Block SOUL_SAND = (new BlockSlowSand(88, 104)).c(0.5F).a(l).a("hellsand"); public static final Block GLOWSTONE = (new BlockLightStone(89, 105, Material.STONE)).c(0.3F).a(j).a(1.0F).a("lightgem"); public static final BlockPortal PORTAL = (BlockPortal) (new BlockPortal(90, 14)).c(-1.0F).a(j).a(0.75F).a("portal"); - public static final Block JACK_O_LANTERN = (new BlockPumpkin(91, 102, true)).c(1.0F).a(e).a(1.0F).a("litpumpkin").k(); - public static final Block CAKE_BLOCK = (new BlockCake(92, 121)).c(0.5F).a(k).a("cake").j().k(); - public static final Block DIODE_OFF = (new BlockDiode(93, false)).c(0.0F).a(e).a("diode").j().k(); - public static final Block DIODE_ON = (new BlockDiode(94, true)).c(0.0F).a(0.625F).a(e).a("diode").j().k(); - public static final Block LOCKED_CHEST = (new BlockLockedChest(95)).c(0.0F).a(1.0F).a(e).a("lockedchest").a(true).k(); - public static final Block TRAP_DOOR = (new BlockTrapdoor(96, Material.WOOD)).c(3.0F).a(e).a("trapdoor").j().k(); + public static final Block JACK_O_LANTERN = (new BlockPumpkin(91, 102, true)).c(1.0F).a(e).a(1.0F).a("litpumpkin").g(); + public static final Block CAKE_BLOCK = (new BlockCake(92, 121)).c(0.5F).a(k).a("cake").n().g(); + public static final Block DIODE_OFF = (new BlockDiode(93, false)).c(0.0F).a(e).a("diode").n().g(); + public static final Block DIODE_ON = (new BlockDiode(94, true)).c(0.0F).a(0.625F).a(e).a("diode").n().g(); + public static final Block LOCKED_CHEST = (new BlockLockedChest(95)).c(0.0F).a(1.0F).a(e).a("lockedchest").a(true).g(); + public static final Block TRAP_DOOR = (new BlockTrapdoor(96, Material.WOOD)).c(3.0F).a(e).a("trapdoor").n().g(); public int textureId; public final int id; protected float strength; @@ -156,12 +156,12 @@ protected Block(int i, Material material) { } } - private Block k() { + protected Block g() { t[this.id] = true; return this; } - protected void f() {} + protected void h() {} protected Block(int i, int j, Material material) { this(i, material); @@ -201,6 +201,15 @@ protected Block c(float f) { return this; } + protected Block i() { + this.c(-1.0F); + return this; + } + + public float j() { + return this.strength; + } + protected Block a(boolean flag) { n[this.id] = flag; return this; @@ -244,10 +253,10 @@ public boolean a() { } public boolean a(int i, boolean flag) { - return this.m_(); + return this.k_(); } - public boolean m_() { + public boolean k_() { return true; } @@ -277,7 +286,7 @@ public float getDamage(EntityHuman entityhuman) { return this.strength < 0.0F ? 0.0F : (!entityhuman.b(this) ? 1.0F / this.strength / 100.0F : entityhuman.a(this) / this.strength / 30.0F); } - public void b_(World world, int i, int j, int k, int l) { + public final void g(World world, int i, int j, int k, int l) { this.dropNaturally(world, i, j, k, l, 1.0F); } @@ -290,21 +299,27 @@ public void dropNaturally(World world, int i, int j, int k, int l, float f) { int k1 = this.a(l, world.random); if (k1 > 0) { - float f1 = 0.7F; - double d0 = (double) (world.random.nextFloat() * f1) + (double) (1.0F - f1) * 0.5D; - double d1 = (double) (world.random.nextFloat() * f1) + (double) (1.0F - f1) * 0.5D; - double d2 = (double) (world.random.nextFloat() * f1) + (double) (1.0F - f1) * 0.5D; - EntityItem entityitem = new EntityItem(world, (double) i + d0, (double) j + d1, (double) k + d2, new ItemStack(k1, 1, this.b(l))); - - entityitem.pickupDelay = 10; - world.addEntity(entityitem); + this.a(world, i, j, k, new ItemStack(k1, 1, this.a_(l))); } } } } } - protected int b(int i) { + protected void a(World world, int i, int j, int k, ItemStack itemstack) { + if (!world.isStatic) { + float f = 0.7F; + double d0 = (double) (world.random.nextFloat() * f) + (double) (1.0F - f) * 0.5D; + double d1 = (double) (world.random.nextFloat() * f) + (double) (1.0F - f) * 0.5D; + double d2 = (double) (world.random.nextFloat() * f) + (double) (1.0F - f) * 0.5D; + EntityItem entityitem = new EntityItem(world, (double) i + d0, (double) j + d1, (double) k + d2, itemstack); + + entityitem.pickupDelay = 10; + world.addEntity(entityitem); + } + } + + protected int a_(int i) { return 0; } @@ -454,13 +469,13 @@ public boolean isPowerSource() { public void a(World world, int i, int j, int k, Entity entity) {} - public boolean c(World world, int i, int j, int k, int l) { + public boolean d(World world, int i, int j, int k, int l) { return false; } public void a(World world, EntityHuman entityhuman, int i, int j, int k, int l) { entityhuman.a(StatisticList.C[this.id], 1); - this.b_(world, i, j, k, l); + this.g(world, i, j, k, l); } public boolean f(World world, int i, int j, int k) { @@ -474,35 +489,42 @@ public Block a(String s) { return this; } - public String g() { - return StatisticCollector.a(this.h() + ".name"); + public String k() { + return StatisticCollector.a(this.l() + ".name"); } - public String h() { + public String l() { return this.name; } public void a(World world, int i, int j, int k, int l, int i1) {} - public boolean i() { + public boolean m() { return this.br; } - protected Block j() { + protected Block n() { this.br = false; return this; } + public int f() { + return this.material.j(); + } + static { Item.byId[WOOL.id] = (new ItemCloth(WOOL.id - 256)).a("cloth"); Item.byId[LOG.id] = (new ItemLog(LOG.id - 256)).a("log"); Item.byId[STEP.id] = (new ItemStep(STEP.id - 256)).a("stoneSlab"); Item.byId[SAPLING.id] = (new ItemSapling(SAPLING.id - 256)).a("sapling"); + Item.byId[LEAVES.id] = (new ItemLeaves(LEAVES.id - 256)).a("leaves"); + Item.byId[PISTON.id] = new ItemPiston(PISTON.id - 256); + Item.byId[PISTON_STICKY.id] = new ItemPiston(PISTON_STICKY.id - 256); for (int i = 0; i < 256; ++i) { if (byId[i] != null && Item.byId[i] == null) { Item.byId[i] = new ItemBlock(i - 256); - byId[i].f(); + byId[i].h(); } } diff --git a/net/minecraft/server/BlockBed.java b/net/minecraft/server/BlockBed.java index 1673719..038badd 100644 --- a/net/minecraft/server/BlockBed.java +++ b/net/minecraft/server/BlockBed.java @@ -9,7 +9,7 @@ public class BlockBed extends Block { public BlockBed(int i) { super(i, 134, Material.CLOTH); - this.k(); + this.o(); } public boolean interact(World world, int i, int j, int k, EntityHuman entityhuman) { @@ -110,7 +110,7 @@ public boolean a() { } public void a(IBlockAccess iblockaccess, int i, int j, int k) { - this.k(); + this.o(); } public void doPhysics(World world, int i, int j, int k, int l) { @@ -124,7 +124,7 @@ public void doPhysics(World world, int i, int j, int k, int l) { } else if (world.getTypeId(i + a[j1][0], j, k + a[j1][1]) != this.id) { world.setTypeId(i, j, k, 0); if (!world.isStatic) { - this.b_(world, i, j, k, i1); + this.g(world, i, j, k, i1); } } } @@ -133,7 +133,7 @@ public int a(int i, Random random) { return d(i) ? 0 : Item.BED.id; } - private void k() { + private void o() { this.a(0.0F, 0.0F, 0.0F, 1.0F, 0.5625F, 1.0F); } @@ -161,7 +161,7 @@ public static void a(World world, int i, int j, int k, boolean flag) { world.setData(i, j, k, l); } - public static ChunkCoordinates g(World world, int i, int j, int k, int l) { + public static ChunkCoordinates f(World world, int i, int j, int k, int l) { int i1 = world.getData(i, j, k); int j1 = c(i1); @@ -173,7 +173,7 @@ public static ChunkCoordinates g(World world, int i, int j, int k, int l) { for (int l2 = l1; l2 <= j2; ++l2) { for (int i3 = i2; i3 <= k2; ++i3) { - if (world.d(l2, j - 1, i3) && world.isEmpty(l2, j, i3) && world.isEmpty(l2, j + 1, i3)) { + if (world.e(l2, j - 1, i3) && world.isEmpty(l2, j, i3) && world.isEmpty(l2, j + 1, i3)) { if (l <= 0) { return new ChunkCoordinates(l2, j, i3); } diff --git a/net/minecraft/server/BlockButton.java b/net/minecraft/server/BlockButton.java index e0196df..2217e32 100644 --- a/net/minecraft/server/BlockButton.java +++ b/net/minecraft/server/BlockButton.java @@ -26,11 +26,11 @@ public boolean b() { } public boolean canPlace(World world, int i, int j, int k, int l) { - return l == 2 && world.d(i, j, k + 1) ? true : (l == 3 && world.d(i, j, k - 1) ? true : (l == 4 && world.d(i + 1, j, k) ? true : l == 5 && world.d(i - 1, j, k))); + return l == 2 && world.e(i, j, k + 1) ? true : (l == 3 && world.e(i, j, k - 1) ? true : (l == 4 && world.e(i + 1, j, k) ? true : l == 5 && world.e(i - 1, j, k))); } public boolean canPlace(World world, int i, int j, int k) { - return world.d(i - 1, j, k) ? true : (world.d(i + 1, j, k) ? true : (world.d(i, j, k - 1) ? true : world.d(i, j, k + 1))); + return world.e(i - 1, j, k) ? true : (world.e(i + 1, j, k) ? true : (world.e(i, j, k - 1) ? true : world.e(i, j, k + 1))); } public void postPlace(World world, int i, int j, int k, int l) { @@ -38,13 +38,13 @@ public void postPlace(World world, int i, int j, int k, int l) { int j1 = i1 & 8; i1 &= 7; - if (l == 2 && world.d(i, j, k + 1)) { + if (l == 2 && world.e(i, j, k + 1)) { i1 = 4; - } else if (l == 3 && world.d(i, j, k - 1)) { + } else if (l == 3 && world.e(i, j, k - 1)) { i1 = 3; - } else if (l == 4 && world.d(i + 1, j, k)) { + } else if (l == 4 && world.e(i + 1, j, k)) { i1 = 2; - } else if (l == 5 && world.d(i - 1, j, k)) { + } else if (l == 5 && world.e(i - 1, j, k)) { i1 = 1; } else { i1 = this.g(world, i, j, k); @@ -54,7 +54,7 @@ public void postPlace(World world, int i, int j, int k, int l) { } private int g(World world, int i, int j, int k) { - return world.d(i - 1, j, k) ? 1 : (world.d(i + 1, j, k) ? 2 : (world.d(i, j, k - 1) ? 3 : (world.d(i, j, k + 1) ? 4 : 1))); + return world.e(i - 1, j, k) ? 1 : (world.e(i + 1, j, k) ? 2 : (world.e(i, j, k - 1) ? 3 : (world.e(i, j, k + 1) ? 4 : 1))); } public void doPhysics(World world, int i, int j, int k, int l) { @@ -62,24 +62,24 @@ public void doPhysics(World world, int i, int j, int k, int l) { int i1 = world.getData(i, j, k) & 7; boolean flag = false; - if (!world.d(i - 1, j, k) && i1 == 1) { + if (!world.e(i - 1, j, k) && i1 == 1) { flag = true; } - if (!world.d(i + 1, j, k) && i1 == 2) { + if (!world.e(i + 1, j, k) && i1 == 2) { flag = true; } - if (!world.d(i, j, k - 1) && i1 == 3) { + if (!world.e(i, j, k - 1) && i1 == 3) { flag = true; } - if (!world.d(i, j, k + 1) && i1 == 4) { + if (!world.e(i, j, k + 1) && i1 == 4) { flag = true; } if (flag) { - this.b_(world, i, j, k, world.getData(i, j, k)); + this.g(world, i, j, k, world.getData(i, j, k)); world.setTypeId(i, j, k, 0); } } @@ -87,7 +87,7 @@ public void doPhysics(World world, int i, int j, int k, int l) { private boolean h(World world, int i, int j, int k) { if (!this.canPlace(world, i, j, k)) { - this.b_(world, i, j, k, world.getData(i, j, k)); + this.g(world, i, j, k, world.getData(i, j, k)); world.setTypeId(i, j, k, 0); return false; } else { @@ -179,7 +179,7 @@ public boolean a(IBlockAccess iblockaccess, int i, int j, int k, int l) { return (iblockaccess.getData(i, j, k) & 8) > 0; } - public boolean c(World world, int i, int j, int k, int l) { + public boolean d(World world, int i, int j, int k, int l) { int i1 = world.getData(i, j, k); if ((i1 & 8) == 0) { diff --git a/net/minecraft/server/BlockCactus.java b/net/minecraft/server/BlockCactus.java index edb6189..d2c15e7 100644 --- a/net/minecraft/server/BlockCactus.java +++ b/net/minecraft/server/BlockCactus.java @@ -54,7 +54,7 @@ public boolean canPlace(World world, int i, int j, int k) { public void doPhysics(World world, int i, int j, int k, int l) { if (!this.f(world, i, j, k)) { - this.b_(world, i, j, k, world.getData(i, j, k)); + this.g(world, i, j, k, world.getData(i, j, k)); world.setTypeId(i, j, k, 0); } } diff --git a/net/minecraft/server/BlockCake.java b/net/minecraft/server/BlockCake.java index 158eb6a..58190e6 100644 --- a/net/minecraft/server/BlockCake.java +++ b/net/minecraft/server/BlockCake.java @@ -61,7 +61,7 @@ private void c(World world, int i, int j, int k, EntityHuman entityhuman) { world.setTypeId(i, j, k, 0); } else { world.setData(i, j, k, l); - world.h(i, j, k); + world.i(i, j, k); } } } @@ -72,7 +72,7 @@ public boolean canPlace(World world, int i, int j, int k) { public void doPhysics(World world, int i, int j, int k, int l) { if (!this.f(world, i, j, k)) { - this.b_(world, i, j, k, world.getData(i, j, k)); + this.g(world, i, j, k, world.getData(i, j, k)); world.setTypeId(i, j, k, 0); } } diff --git a/net/minecraft/server/BlockChest.java b/net/minecraft/server/BlockChest.java index 642294a..220495c 100644 --- a/net/minecraft/server/BlockChest.java +++ b/net/minecraft/server/BlockChest.java @@ -77,15 +77,15 @@ public void remove(World world, int i, int j, int k) { public boolean interact(World world, int i, int j, int k, EntityHuman entityhuman) { Object object = (TileEntityChest) world.getTileEntity(i, j, k); - if (world.d(i, j + 1, k)) { + if (world.e(i, j + 1, k)) { return true; - } else if (world.getTypeId(i - 1, j, k) == this.id && world.d(i - 1, j + 1, k)) { + } else if (world.getTypeId(i - 1, j, k) == this.id && world.e(i - 1, j + 1, k)) { return true; - } else if (world.getTypeId(i + 1, j, k) == this.id && world.d(i + 1, j + 1, k)) { + } else if (world.getTypeId(i + 1, j, k) == this.id && world.e(i + 1, j + 1, k)) { return true; - } else if (world.getTypeId(i, j, k - 1) == this.id && world.d(i, j + 1, k - 1)) { + } else if (world.getTypeId(i, j, k - 1) == this.id && world.e(i, j + 1, k - 1)) { return true; - } else if (world.getTypeId(i, j, k + 1) == this.id && world.d(i, j + 1, k + 1)) { + } else if (world.getTypeId(i, j, k + 1) == this.id && world.e(i, j + 1, k + 1)) { return true; } else { if (world.getTypeId(i - 1, j, k) == this.id) { diff --git a/net/minecraft/server/BlockCloth.java b/net/minecraft/server/BlockCloth.java index 39a17ff..c51c3b4 100644 --- a/net/minecraft/server/BlockCloth.java +++ b/net/minecraft/server/BlockCloth.java @@ -15,7 +15,7 @@ public int a(int i, int j) { } } - protected int b(int i) { + protected int a_(int i) { return i; } diff --git a/net/minecraft/server/BlockDiode.java b/net/minecraft/server/BlockDiode.java index bda835d..6089024 100644 --- a/net/minecraft/server/BlockDiode.java +++ b/net/minecraft/server/BlockDiode.java @@ -19,16 +19,16 @@ public boolean b() { } public boolean canPlace(World world, int i, int j, int k) { - return !world.d(i, j - 1, k) ? false : super.canPlace(world, i, j, k); + return !world.e(i, j - 1, k) ? false : super.canPlace(world, i, j, k); } public boolean f(World world, int i, int j, int k) { - return !world.d(i, j - 1, k) ? false : super.f(world, i, j, k); + return !world.e(i, j - 1, k) ? false : super.f(world, i, j, k); } public void a(World world, int i, int j, int k, Random random) { int l = world.getData(i, j, k); - boolean flag = this.g(world, i, j, k, l); + boolean flag = this.f(world, i, j, k, l); if (this.c && !flag) { world.setTypeIdAndData(i, j, k, Block.DIODE_OFF.id, l); @@ -50,7 +50,7 @@ public int a(int i) { return this.a(i, 0); } - public boolean c(World world, int i, int j, int k, int l) { + public boolean d(World world, int i, int j, int k, int l) { return this.a(world, i, j, k, l); } @@ -66,11 +66,11 @@ public boolean a(IBlockAccess iblockaccess, int i, int j, int k, int l) { public void doPhysics(World world, int i, int j, int k, int l) { if (!this.f(world, i, j, k)) { - this.b_(world, i, j, k, world.getData(i, j, k)); + this.g(world, i, j, k, world.getData(i, j, k)); world.setTypeId(i, j, k, 0); } else { int i1 = world.getData(i, j, k); - boolean flag = this.g(world, i, j, k, i1); + boolean flag = this.f(world, i, j, k, i1); int j1 = (i1 & 12) >> 2; if (this.c && !flag) { @@ -81,21 +81,21 @@ public void doPhysics(World world, int i, int j, int k, int l) { } } - private boolean g(World world, int i, int j, int k, int l) { + private boolean f(World world, int i, int j, int k, int l) { int i1 = l & 3; switch (i1) { case 0: - return world.isBlockFaceIndirectlyPowered(i, j, k + 1, 3); + return world.isBlockFaceIndirectlyPowered(i, j, k + 1, 3) || world.getTypeId(i, j, k + 1) == Block.REDSTONE_WIRE.id && world.getData(i, j, k + 1) > 0; case 1: - return world.isBlockFaceIndirectlyPowered(i - 1, j, k, 4); + return world.isBlockFaceIndirectlyPowered(i - 1, j, k, 4) || world.getTypeId(i - 1, j, k) == Block.REDSTONE_WIRE.id && world.getData(i - 1, j, k) > 0; case 2: - return world.isBlockFaceIndirectlyPowered(i, j, k - 1, 2); + return world.isBlockFaceIndirectlyPowered(i, j, k - 1, 2) || world.getTypeId(i, j, k - 1) == Block.REDSTONE_WIRE.id && world.getData(i, j, k - 1) > 0; case 3: - return world.isBlockFaceIndirectlyPowered(i + 1, j, k, 5); + return world.isBlockFaceIndirectlyPowered(i + 1, j, k, 5) || world.getTypeId(i + 1, j, k) == Block.REDSTONE_WIRE.id && world.getData(i + 1, j, k) > 0; default: return false; @@ -119,7 +119,7 @@ public void postPlace(World world, int i, int j, int k, EntityLiving entitylivin int l = ((MathHelper.floor((double) (entityliving.yaw * 4.0F / 360.0F) + 0.5D) & 3) + 2) % 4; world.setData(i, j, k, l); - boolean flag = this.g(world, i, j, k, l); + boolean flag = this.f(world, i, j, k, l); if (flag) { world.c(i, j, k, this.id, 1); diff --git a/net/minecraft/server/BlockDoor.java b/net/minecraft/server/BlockDoor.java index e433fd2..dcb2d2e 100644 --- a/net/minecraft/server/BlockDoor.java +++ b/net/minecraft/server/BlockDoor.java @@ -148,7 +148,7 @@ public void doPhysics(World world, int i, int j, int k, int l) { flag = true; } - if (!world.d(i, j - 1, k)) { + if (!world.e(i, j - 1, k)) { world.setTypeId(i, j, k, 0); flag = true; if (world.getTypeId(i, j + 1, k) == this.id) { @@ -158,7 +158,7 @@ public void doPhysics(World world, int i, int j, int k, int l) { if (flag) { if (!world.isStatic) { - this.b_(world, i, j, k, i1); + this.g(world, i, j, k, i1); } } else if (l > 0 && Block.byId[l].isPowerSource()) { boolean flag1 = world.isBlockIndirectlyPowered(i, j, k) || world.isBlockIndirectlyPowered(i, j + 1, k); @@ -182,7 +182,7 @@ public int d(int i) { } public boolean canPlace(World world, int i, int j, int k) { - return j >= 127 ? false : world.d(i, j - 1, k) && super.canPlace(world, i, j, k) && super.canPlace(world, i, j + 1, k); + return j >= 127 ? false : world.e(i, j - 1, k) && super.canPlace(world, i, j, k) && super.canPlace(world, i, j + 1, k); } public static boolean e(int i) { diff --git a/net/minecraft/server/BlockFence.java b/net/minecraft/server/BlockFence.java index 68aa11a..a1ea0ac 100644 --- a/net/minecraft/server/BlockFence.java +++ b/net/minecraft/server/BlockFence.java @@ -7,7 +7,7 @@ public BlockFence(int i, int j) { } public boolean canPlace(World world, int i, int j, int k) { - return world.getTypeId(i, j - 1, k) == this.id ? false : (!world.getMaterial(i, j - 1, k).isBuildable() ? false : super.canPlace(world, i, j, k)); + return world.getTypeId(i, j - 1, k) == this.id ? true : (!world.getMaterial(i, j - 1, k).isBuildable() ? false : super.canPlace(world, i, j, k)); } public AxisAlignedBB d(World world, int i, int j, int k) { diff --git a/net/minecraft/server/BlockFire.java b/net/minecraft/server/BlockFire.java index 4981183..0e3f17b 100644 --- a/net/minecraft/server/BlockFire.java +++ b/net/minecraft/server/BlockFire.java @@ -12,7 +12,7 @@ protected BlockFire(int i, int j) { this.a(true); } - public void f() { + public void h() { this.a(Block.WOOD.id, 5, 20); this.a(Block.FENCE.id, 5, 20); this.a(Block.WOOD_STAIRS.id, 5, 20); @@ -67,7 +67,7 @@ public void a(World world, int i, int j, int k, Random random) { world.c(i, j, k, this.id, this.c()); if (!flag && !this.g(world, i, j, k)) { - if (!world.d(i, j - 1, k) || l > 3) { + if (!world.e(i, j - 1, k) || l > 3) { world.setTypeId(i, j, k, 0); } } else if (!flag && !this.b(world, i, j - 1, k) && l == 15 && random.nextInt(4) == 0) { @@ -132,7 +132,7 @@ private void a(World world, int i, int j, int k, int l, Random random, int i1) { } if (flag) { - Block.TNT.postBreak(world, i, j, k, 0); + Block.TNT.postBreak(world, i, j, k, 1); } } } @@ -147,18 +147,18 @@ private int h(World world, int i, int j, int k) { if (!world.isEmpty(i, j, k)) { return 0; } else { - int l = this.g(world, i + 1, j, k, b0); + int l = this.f(world, i + 1, j, k, b0); - l = this.g(world, i - 1, j, k, l); - l = this.g(world, i, j - 1, k, l); - l = this.g(world, i, j + 1, k, l); - l = this.g(world, i, j, k - 1, l); - l = this.g(world, i, j, k + 1, l); + l = this.f(world, i - 1, j, k, l); + l = this.f(world, i, j - 1, k, l); + l = this.f(world, i, j + 1, k, l); + l = this.f(world, i, j, k - 1, l); + l = this.f(world, i, j, k + 1, l); return l; } } - public boolean m_() { + public boolean k_() { return false; } @@ -166,25 +166,25 @@ public boolean b(IBlockAccess iblockaccess, int i, int j, int k) { return this.a[iblockaccess.getTypeId(i, j, k)] > 0; } - public int g(World world, int i, int j, int k, int l) { + public int f(World world, int i, int j, int k, int l) { int i1 = this.a[world.getTypeId(i, j, k)]; return i1 > l ? i1 : l; } public boolean canPlace(World world, int i, int j, int k) { - return world.d(i, j - 1, k) || this.g(world, i, j, k); + return world.e(i, j - 1, k) || this.g(world, i, j, k); } public void doPhysics(World world, int i, int j, int k, int l) { - if (!world.d(i, j - 1, k) && !this.g(world, i, j, k)) { + if (!world.e(i, j - 1, k) && !this.g(world, i, j, k)) { world.setTypeId(i, j, k, 0); } } public void e(World world, int i, int j, int k) { if (world.getTypeId(i, j - 1, k) != Block.OBSIDIAN.id || !Block.PORTAL.a_(world, i, j, k)) { - if (!world.d(i, j - 1, k) && !this.g(world, i, j, k)) { + if (!world.e(i, j - 1, k) && !this.g(world, i, j, k)) { world.setTypeId(i, j, k, 0); } else { world.c(i, j, k, this.id, this.c()); diff --git a/net/minecraft/server/BlockFlower.java b/net/minecraft/server/BlockFlower.java index 35d1e59..8d55e89 100644 --- a/net/minecraft/server/BlockFlower.java +++ b/net/minecraft/server/BlockFlower.java @@ -32,13 +32,13 @@ public void a(World world, int i, int j, int k, Random random) { protected final void g(World world, int i, int j, int k) { if (!this.f(world, i, j, k)) { - this.b_(world, i, j, k, world.getData(i, j, k)); + this.g(world, i, j, k, world.getData(i, j, k)); world.setTypeId(i, j, k, 0); } } public boolean f(World world, int i, int j, int k) { - return (world.j(i, j, k) >= 8 || world.isChunkLoaded(i, j, k)) && this.c(world.getTypeId(i, j - 1, k)); + return (world.k(i, j, k) >= 8 || world.isChunkLoaded(i, j, k)) && this.c(world.getTypeId(i, j - 1, k)); } public AxisAlignedBB d(World world, int i, int j, int k) { diff --git a/net/minecraft/server/BlockFlowing.java b/net/minecraft/server/BlockFlowing.java index 4c65e61..45430b6 100644 --- a/net/minecraft/server/BlockFlowing.java +++ b/net/minecraft/server/BlockFlowing.java @@ -128,7 +128,7 @@ private void flow(World world, int i, int j, int k, int l) { if (this.material == Material.LAVA) { this.h(world, i, j, k); } else { - Block.byId[i1].b_(world, i, j, k, world.getData(i, j, k)); + Block.byId[i1].g(world, i, j, k, world.getData(i, j, k)); } } diff --git a/net/minecraft/server/BlockFurnace.java b/net/minecraft/server/BlockFurnace.java index 5c39a31..ce6b7ec 100644 --- a/net/minecraft/server/BlockFurnace.java +++ b/net/minecraft/server/BlockFurnace.java @@ -79,6 +79,7 @@ public static void a(boolean flag, World world, int i, int j, int k) { c = false; world.setData(i, j, k, l); + tileentity.j(); world.setTileEntity(i, j, k, tileentity); } diff --git a/net/minecraft/server/BlockIce.java b/net/minecraft/server/BlockIce.java index 120595f..998df9a 100644 --- a/net/minecraft/server/BlockIce.java +++ b/net/minecraft/server/BlockIce.java @@ -24,7 +24,7 @@ public int a(Random random) { public void a(World world, int i, int j, int k, Random random) { if (world.a(EnumSkyBlock.BLOCK, i, j, k) > 11 - Block.q[this.id]) { - this.b_(world, i, j, k, world.getData(i, j, k)); + this.g(world, i, j, k, world.getData(i, j, k)); world.setTypeId(i, j, k, Block.STATIONARY_WATER.id); } } diff --git a/net/minecraft/server/BlockJukeBox.java b/net/minecraft/server/BlockJukeBox.java index 0b6c6fa..4d08a71 100644 --- a/net/minecraft/server/BlockJukeBox.java +++ b/net/minecraft/server/BlockJukeBox.java @@ -19,7 +19,7 @@ public boolean interact(World world, int i, int j, int k, EntityHuman entityhuma } } - public void a_(World world, int i, int j, int k, int l) { + public void f(World world, int i, int j, int k, int l) { if (!world.isStatic) { TileEntityRecordPlayer tileentityrecordplayer = (TileEntityRecordPlayer) world.getTileEntity(i, j, k); diff --git a/net/minecraft/server/BlockLadder.java b/net/minecraft/server/BlockLadder.java index c630860..719ba31 100644 --- a/net/minecraft/server/BlockLadder.java +++ b/net/minecraft/server/BlockLadder.java @@ -40,25 +40,25 @@ public boolean b() { } public boolean canPlace(World world, int i, int j, int k) { - return world.d(i - 1, j, k) ? true : (world.d(i + 1, j, k) ? true : (world.d(i, j, k - 1) ? true : world.d(i, j, k + 1))); + return world.e(i - 1, j, k) ? true : (world.e(i + 1, j, k) ? true : (world.e(i, j, k - 1) ? true : world.e(i, j, k + 1))); } public void postPlace(World world, int i, int j, int k, int l) { int i1 = world.getData(i, j, k); - if ((i1 == 0 || l == 2) && world.d(i, j, k + 1)) { + if ((i1 == 0 || l == 2) && world.e(i, j, k + 1)) { i1 = 2; } - if ((i1 == 0 || l == 3) && world.d(i, j, k - 1)) { + if ((i1 == 0 || l == 3) && world.e(i, j, k - 1)) { i1 = 3; } - if ((i1 == 0 || l == 4) && world.d(i + 1, j, k)) { + if ((i1 == 0 || l == 4) && world.e(i + 1, j, k)) { i1 = 4; } - if ((i1 == 0 || l == 5) && world.d(i - 1, j, k)) { + if ((i1 == 0 || l == 5) && world.e(i - 1, j, k)) { i1 = 5; } @@ -69,24 +69,24 @@ public void doPhysics(World world, int i, int j, int k, int l) { int i1 = world.getData(i, j, k); boolean flag = false; - if (i1 == 2 && world.d(i, j, k + 1)) { + if (i1 == 2 && world.e(i, j, k + 1)) { flag = true; } - if (i1 == 3 && world.d(i, j, k - 1)) { + if (i1 == 3 && world.e(i, j, k - 1)) { flag = true; } - if (i1 == 4 && world.d(i + 1, j, k)) { + if (i1 == 4 && world.e(i + 1, j, k)) { flag = true; } - if (i1 == 5 && world.d(i - 1, j, k)) { + if (i1 == 5 && world.e(i - 1, j, k)) { flag = true; } if (!flag) { - this.b_(world, i, j, k, i1); + this.g(world, i, j, k, i1); world.setTypeId(i, j, k, 0); } diff --git a/net/minecraft/server/BlockLeaves.java b/net/minecraft/server/BlockLeaves.java index 36862fd..0a43c2c 100644 --- a/net/minecraft/server/BlockLeaves.java +++ b/net/minecraft/server/BlockLeaves.java @@ -117,7 +117,7 @@ public void a(World world, int i, int j, int k, Random random) { } private void g(World world, int i, int j, int k) { - this.b_(world, i, j, k, world.getData(i, j, k)); + this.g(world, i, j, k, world.getData(i, j, k)); world.setTypeId(i, j, k, 0); } @@ -129,7 +129,16 @@ public int a(int i, Random random) { return Block.SAPLING.id; } - protected int b(int i) { + public void a(World world, EntityHuman entityhuman, int i, int j, int k, int l) { + if (!world.isStatic && entityhuman.G() != null && entityhuman.G().id == Item.SHEARS.id) { + entityhuman.a(StatisticList.C[this.id], 1); + this.a(world, i, j, k, new ItemStack(Block.LEAVES.id, 1, l & 3)); + } else { + super.a(world, entityhuman, i, j, k, l); + } + } + + protected int a_(int i) { return i & 3; } diff --git a/net/minecraft/server/BlockLever.java b/net/minecraft/server/BlockLever.java index 0c529a0..514b59f 100644 --- a/net/minecraft/server/BlockLever.java +++ b/net/minecraft/server/BlockLever.java @@ -19,11 +19,11 @@ public boolean b() { } public boolean canPlace(World world, int i, int j, int k, int l) { - return l == 1 && world.d(i, j - 1, k) ? true : (l == 2 && world.d(i, j, k + 1) ? true : (l == 3 && world.d(i, j, k - 1) ? true : (l == 4 && world.d(i + 1, j, k) ? true : l == 5 && world.d(i - 1, j, k)))); + return l == 1 && world.e(i, j - 1, k) ? true : (l == 2 && world.e(i, j, k + 1) ? true : (l == 3 && world.e(i, j, k - 1) ? true : (l == 4 && world.e(i + 1, j, k) ? true : l == 5 && world.e(i - 1, j, k)))); } public boolean canPlace(World world, int i, int j, int k) { - return world.d(i - 1, j, k) ? true : (world.d(i + 1, j, k) ? true : (world.d(i, j, k - 1) ? true : (world.d(i, j, k + 1) ? true : world.d(i, j - 1, k)))); + return world.e(i - 1, j, k) ? true : (world.e(i + 1, j, k) ? true : (world.e(i, j, k - 1) ? true : (world.e(i, j, k + 1) ? true : world.e(i, j - 1, k)))); } public void postPlace(World world, int i, int j, int k, int l) { @@ -32,28 +32,28 @@ public void postPlace(World world, int i, int j, int k, int l) { i1 &= 7; i1 = -1; - if (l == 1 && world.d(i, j - 1, k)) { + if (l == 1 && world.e(i, j - 1, k)) { i1 = 5 + world.random.nextInt(2); } - if (l == 2 && world.d(i, j, k + 1)) { + if (l == 2 && world.e(i, j, k + 1)) { i1 = 4; } - if (l == 3 && world.d(i, j, k - 1)) { + if (l == 3 && world.e(i, j, k - 1)) { i1 = 3; } - if (l == 4 && world.d(i + 1, j, k)) { + if (l == 4 && world.e(i + 1, j, k)) { i1 = 2; } - if (l == 5 && world.d(i - 1, j, k)) { + if (l == 5 && world.e(i - 1, j, k)) { i1 = 1; } if (i1 == -1) { - this.b_(world, i, j, k, world.getData(i, j, k)); + this.g(world, i, j, k, world.getData(i, j, k)); world.setTypeId(i, j, k, 0); } else { world.setData(i, j, k, i1 + j1); @@ -65,32 +65,32 @@ public void doPhysics(World world, int i, int j, int k, int l) { int i1 = world.getData(i, j, k) & 7; boolean flag = false; - if (!world.d(i - 1, j, k) && i1 == 1) { + if (!world.e(i - 1, j, k) && i1 == 1) { flag = true; } - if (!world.d(i + 1, j, k) && i1 == 2) { + if (!world.e(i + 1, j, k) && i1 == 2) { flag = true; } - if (!world.d(i, j, k - 1) && i1 == 3) { + if (!world.e(i, j, k - 1) && i1 == 3) { flag = true; } - if (!world.d(i, j, k + 1) && i1 == 4) { + if (!world.e(i, j, k + 1) && i1 == 4) { flag = true; } - if (!world.d(i, j - 1, k) && i1 == 5) { + if (!world.e(i, j - 1, k) && i1 == 5) { flag = true; } - if (!world.d(i, j - 1, k) && i1 == 6) { + if (!world.e(i, j - 1, k) && i1 == 6) { flag = true; } if (flag) { - this.b_(world, i, j, k, world.getData(i, j, k)); + this.g(world, i, j, k, world.getData(i, j, k)); world.setTypeId(i, j, k, 0); } } @@ -98,7 +98,7 @@ public void doPhysics(World world, int i, int j, int k, int l) { private boolean g(World world, int i, int j, int k) { if (!this.canPlace(world, i, j, k)) { - this.b_(world, i, j, k, world.getData(i, j, k)); + this.g(world, i, j, k, world.getData(i, j, k)); world.setTypeId(i, j, k, 0); return false; } else { @@ -183,7 +183,7 @@ public boolean a(IBlockAccess iblockaccess, int i, int j, int k, int l) { return (iblockaccess.getData(i, j, k) & 8) > 0; } - public boolean c(World world, int i, int j, int k, int l) { + public boolean d(World world, int i, int j, int k, int l) { int i1 = world.getData(i, j, k); if ((i1 & 8) == 0) { diff --git a/net/minecraft/server/BlockLog.java b/net/minecraft/server/BlockLog.java index 204d690..68baaba 100644 --- a/net/minecraft/server/BlockLog.java +++ b/net/minecraft/server/BlockLog.java @@ -48,7 +48,7 @@ public int a(int i, int j) { return i == 1 ? 21 : (i == 0 ? 21 : (j == 1 ? 116 : (j == 2 ? 117 : 20))); } - protected int b(int i) { + protected int a_(int i) { return i; } } diff --git a/net/minecraft/server/BlockMinecartDetector.java b/net/minecraft/server/BlockMinecartDetector.java index e0416c0..3c3801c 100644 --- a/net/minecraft/server/BlockMinecartDetector.java +++ b/net/minecraft/server/BlockMinecartDetector.java @@ -23,7 +23,7 @@ public void a(World world, int i, int j, int k, Entity entity) { int l = world.getData(i, j, k); if ((l & 8) == 0) { - this.g(world, i, j, k, l); + this.f(world, i, j, k, l); } } } @@ -33,7 +33,7 @@ public void a(World world, int i, int j, int k, Random random) { int l = world.getData(i, j, k); if ((l & 8) != 0) { - this.g(world, i, j, k, l); + this.f(world, i, j, k, l); } } } @@ -42,11 +42,11 @@ public boolean a(IBlockAccess iblockaccess, int i, int j, int k, int l) { return (iblockaccess.getData(i, j, k) & 8) != 0; } - public boolean c(World world, int i, int j, int k, int l) { + public boolean d(World world, int i, int j, int k, int l) { return (world.getData(i, j, k) & 8) == 0 ? false : l == 1; } - private void g(World world, int i, int j, int k, int l) { + private void f(World world, int i, int j, int k, int l) { boolean flag = (l & 8) != 0; boolean flag1 = false; float f = 0.125F; diff --git a/net/minecraft/server/BlockMinecartTrack.java b/net/minecraft/server/BlockMinecartTrack.java index 3704f85..b7718c1 100644 --- a/net/minecraft/server/BlockMinecartTrack.java +++ b/net/minecraft/server/BlockMinecartTrack.java @@ -70,7 +70,7 @@ public int a(Random random) { } public boolean canPlace(World world, int i, int j, int k) { - return world.d(i, j - 1, k); + return world.e(i, j - 1, k); } public void e(World world, int i, int j, int k) { @@ -90,28 +90,28 @@ public void doPhysics(World world, int i, int j, int k, int l) { boolean flag = false; - if (!world.d(i, j - 1, k)) { + if (!world.e(i, j - 1, k)) { flag = true; } - if (j1 == 2 && !world.d(i + 1, j, k)) { + if (j1 == 2 && !world.e(i + 1, j, k)) { flag = true; } - if (j1 == 3 && !world.d(i - 1, j, k)) { + if (j1 == 3 && !world.e(i - 1, j, k)) { flag = true; } - if (j1 == 4 && !world.d(i, j, k - 1)) { + if (j1 == 4 && !world.e(i, j, k - 1)) { flag = true; } - if (j1 == 5 && !world.d(i, j, k + 1)) { + if (j1 == 5 && !world.e(i, j, k + 1)) { flag = true; } if (flag) { - this.b_(world, i, j, k, world.getData(i, j, k)); + this.g(world, i, j, k, world.getData(i, j, k)); world.setTypeId(i, j, k, 0); } else if (this.id == Block.GOLDEN_RAIL.id) { boolean flag1 = world.isBlockIndirectlyPowered(i, j, k) || world.isBlockIndirectlyPowered(i, j + 1, k); @@ -248,6 +248,10 @@ private boolean a(World world, int i, int j, int k, boolean flag, int l, int i1) return false; } + public int f() { + return 0; + } + static boolean a(BlockMinecartTrack blockminecarttrack) { return blockminecarttrack.a; } diff --git a/net/minecraft/server/BlockMushroom.java b/net/minecraft/server/BlockMushroom.java index 3b4e749..2716369 100644 --- a/net/minecraft/server/BlockMushroom.java +++ b/net/minecraft/server/BlockMushroom.java @@ -34,6 +34,6 @@ protected boolean c(int i) { } public boolean f(World world, int i, int j, int k) { - return j >= 0 && j < 128 ? world.j(i, j, k) < 13 && this.c(world.getTypeId(i, j - 1, k)) : false; + return j >= 0 && j < 128 ? world.k(i, j, k) < 13 && this.c(world.getTypeId(i, j - 1, k)) : false; } } diff --git a/net/minecraft/server/BlockOre.java b/net/minecraft/server/BlockOre.java index b4a6d91..3ecf3e8 100644 --- a/net/minecraft/server/BlockOre.java +++ b/net/minecraft/server/BlockOre.java @@ -16,7 +16,7 @@ public int a(Random random) { return this.id == Block.LAPIS_ORE.id ? 4 + random.nextInt(5) : 1; } - protected int b(int i) { + protected int a_(int i) { return this.id == Block.LAPIS_ORE.id ? 4 : 0; } } diff --git a/net/minecraft/server/BlockPiston.java b/net/minecraft/server/BlockPiston.java new file mode 100644 index 0000000..4769d70 --- /dev/null +++ b/net/minecraft/server/BlockPiston.java @@ -0,0 +1,312 @@ +package net.minecraft.server; + +import java.util.ArrayList; + +public class BlockPiston extends Block { + + private boolean a; + + public BlockPiston(int i, int j, boolean flag) { + super(i, j, Material.PISTON); + this.a = flag; + this.a(h); + this.c(0.5F); + } + + public int a(int i, int j) { + int k = c(j); + + return k > 5 ? this.textureId : (i == k ? (!d(j) && this.minX <= 0.0D && this.minY <= 0.0D && this.minZ <= 0.0D && this.maxX >= 1.0D && this.maxY >= 1.0D && this.maxZ >= 1.0D ? this.textureId : 110) : (i == PistonBlockTextures.a[k] ? 109 : 108)); + } + + public boolean a() { + return false; + } + + public boolean interact(World world, int i, int j, int k, EntityHuman entityhuman) { + return false; + } + + public void postPlace(World world, int i, int j, int k, EntityLiving entityliving) { + int l = c(world, i, j, k, (EntityHuman) entityliving); + + world.setData(i, j, k, l); + if (!world.isStatic) { + this.g(world, i, j, k); + } + } + + public void doPhysics(World world, int i, int j, int k, int l) { + if (!world.isStatic) { + this.g(world, i, j, k); + } + } + + public void e(World world, int i, int j, int k) { + if (!world.isStatic && world.getTileEntity(i, j, k) == null) { + this.g(world, i, j, k); + } + } + + private void g(World world, int i, int j, int k) { + boolean flag = world.isBlockIndirectlyPowered(i, j, k) || world.isBlockIndirectlyPowered(i, j + 1, k) || world.isBlockFaceIndirectlyPowered(i, j - 1, k, 0); + int l = world.getData(i, j, k); + int i1 = c(l); + + if (l != 7) { + if (flag && !d(l)) { + if (f(world, i, j, k, i1)) { + world.setRawData(i, j, k, i1 | 8); + world.playNote(i, j, k, 0, i1); + } + } else if (!flag && d(l)) { + world.setRawData(i, j, k, i1); + world.playNote(i, j, k, 1, i1); + } + } + } + + public void a(World world, int i, int j, int k, int l, int i1) { + if (l == 0) { + if (this.h(world, i, j, k, i1)) { + world.setData(i, j, k, i1 | 8); + world.makeSound((double) i + 0.5D, (double) j + 0.5D, (double) k + 0.5D, "tile.piston.out", 0.5F, world.random.nextFloat() * 0.25F + 0.6F); + } + } else if (l == 1) { + TileEntity tileentity = world.getTileEntity(i + PistonBlockTextures.b[i1], j + PistonBlockTextures.c[i1], k + PistonBlockTextures.d[i1]); + + if (tileentity != null && tileentity instanceof TileEntityPiston) { + ((TileEntityPiston) tileentity).k(); + } + + world.setRawTypeIdAndData(i, j, k, Block.PISTON_MOVING.id, i1); + world.setTileEntity(i, j, k, BlockPistonMoving.a(this.id, i1, i1, false, true)); + if (this.a) { + int j1 = i + PistonBlockTextures.b[i1] * 2; + int k1 = j + PistonBlockTextures.c[i1] * 2; + int l1 = k + PistonBlockTextures.d[i1] * 2; + int i2 = world.getTypeId(j1, k1, l1); + int j2 = world.getData(j1, k1, l1); + boolean flag = false; + + if (i2 == Block.PISTON_MOVING.id) { + TileEntity tileentity1 = world.getTileEntity(j1, k1, l1); + + if (tileentity1 != null && tileentity1 instanceof TileEntityPiston) { + TileEntityPiston tileentitypiston = (TileEntityPiston) tileentity1; + + if (tileentitypiston.d() == i1 && tileentitypiston.c()) { + tileentitypiston.k(); + i2 = tileentitypiston.a(); + j2 = tileentitypiston.e(); + flag = true; + } + } + } + + if (i2 > 0 && (flag || a(i2, world, j1, k1, l1)) && (Block.byId[i2].f() == 0 || i2 == Block.PISTON.id || i2 == Block.PISTON_STICKY.id)) { + world.setTypeId(j1, k1, l1, 0); + i += PistonBlockTextures.b[i1]; + j += PistonBlockTextures.c[i1]; + k += PistonBlockTextures.d[i1]; + world.setRawTypeIdAndData(i, j, k, Block.PISTON_MOVING.id, j2); + world.setTileEntity(i, j, k, BlockPistonMoving.a(i2, j2, i1, false, false)); + } else { + world.setTypeId(i + PistonBlockTextures.b[i1], j + PistonBlockTextures.c[i1], k + PistonBlockTextures.d[i1], 0); + } + } else { + world.setTypeId(i + PistonBlockTextures.b[i1], j + PistonBlockTextures.c[i1], k + PistonBlockTextures.d[i1], 0); + } + + world.makeSound((double) i + 0.5D, (double) j + 0.5D, (double) k + 0.5D, "tile.piston.in", 0.5F, world.random.nextFloat() * 0.15F + 0.6F); + } + } + + public void a(IBlockAccess iblockaccess, int i, int j, int k) { + int l = iblockaccess.getData(i, j, k); + + if (d(l)) { + switch (c(l)) { + case 0: + this.a(0.0F, 0.25F, 0.0F, 1.0F, 1.0F, 1.0F); + break; + + case 1: + this.a(0.0F, 0.0F, 0.0F, 1.0F, 0.75F, 1.0F); + break; + + case 2: + this.a(0.0F, 0.0F, 0.25F, 1.0F, 1.0F, 1.0F); + break; + + case 3: + this.a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 0.75F); + break; + + case 4: + this.a(0.25F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + break; + + case 5: + this.a(0.0F, 0.0F, 0.0F, 0.75F, 1.0F, 1.0F); + } + } else { + this.a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + } + } + + public void a(World world, int i, int j, int k, AxisAlignedBB axisalignedbb, ArrayList arraylist) { + this.a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + super.a(world, i, j, k, axisalignedbb, arraylist); + } + + public boolean b() { + return false; + } + + public static int c(int i) { + return i & 7; + } + + public static boolean d(int i) { + return (i & 8) != 0; + } + + private static int c(World world, int i, int j, int k, EntityHuman entityhuman) { + if (MathHelper.abs((float) entityhuman.locX - (float) i) < 2.0F && MathHelper.abs((float) entityhuman.locZ - (float) k) < 2.0F) { + double d0 = entityhuman.locY + 1.82D - (double) entityhuman.height; + + if (d0 - (double) j > 2.0D) { + return 1; + } + + if ((double) j - d0 > 0.0D) { + return 0; + } + } + + int l = MathHelper.floor((double) (entityhuman.yaw * 4.0F / 360.0F) + 0.5D) & 3; + + return l == 0 ? 2 : (l == 1 ? 5 : (l == 2 ? 3 : (l == 3 ? 4 : 0))); + } + + private static boolean a(int i, World world, int j, int k, int l) { + if (i == Block.OBSIDIAN.id) { + return false; + } else { + if (i != Block.PISTON.id && i != Block.PISTON_STICKY.id) { + if (Block.byId[i].j() == -1.0F) { + return false; + } + + if (Block.byId[i].f() == 2) { + return false; + } + } else if (d(world.getData(j, k, l))) { + return false; + } + + TileEntity tileentity = world.getTileEntity(j, k, l); + + return tileentity == null; + } + } + + private static boolean f(World world, int i, int j, int k, int l) { + int i1 = i + PistonBlockTextures.b[l]; + int j1 = j + PistonBlockTextures.c[l]; + int k1 = k + PistonBlockTextures.d[l]; + int l1 = 0; + + while (true) { + if (l1 < 13) { + if (j1 <= 0 || j1 >= 127) { + return false; + } + + int i2 = world.getTypeId(i1, j1, k1); + + if (i2 != 0) { + if (!a(i2, world, i1, j1, k1)) { + return false; + } + + if (Block.byId[i2].f() != 1) { + if (l1 == 12) { + return false; + } + + i1 += PistonBlockTextures.b[l]; + j1 += PistonBlockTextures.c[l]; + k1 += PistonBlockTextures.d[l]; + ++l1; + continue; + } + } + } + + return true; + } + } + + private boolean h(World world, int i, int j, int k, int l) { + int i1 = i + PistonBlockTextures.b[l]; + int j1 = j + PistonBlockTextures.c[l]; + int k1 = k + PistonBlockTextures.d[l]; + int l1 = 0; + + while (true) { + int i2; + + if (l1 < 13) { + if (j1 <= 0 || j1 >= 127) { + return false; + } + + i2 = world.getTypeId(i1, j1, k1); + if (i2 != 0) { + if (!a(i2, world, i1, j1, k1)) { + return false; + } + + if (Block.byId[i2].f() != 1) { + if (l1 == 12) { + return false; + } + + i1 += PistonBlockTextures.b[l]; + j1 += PistonBlockTextures.c[l]; + k1 += PistonBlockTextures.d[l]; + ++l1; + continue; + } + + Block.byId[i2].g(world, i1, j1, k1, 0); + world.setTypeId(i1, j1, k1, 0); + } + } + + while (i1 != i || j1 != j || k1 != k) { + l1 = i1 - PistonBlockTextures.b[l]; + i2 = j1 - PistonBlockTextures.c[l]; + int j2 = k1 - PistonBlockTextures.d[l]; + int k2 = world.getTypeId(l1, i2, j2); + int l2 = world.getData(l1, i2, j2); + + if (k2 == this.id && l1 == i && i2 == j && j2 == k) { + world.setRawTypeIdAndData(i1, j1, k1, Block.PISTON_MOVING.id, l | (this.a ? 8 : 0)); + world.setTileEntity(i1, j1, k1, BlockPistonMoving.a(Block.PISTON_EXTENSION.id, l | (this.a ? 8 : 0), l, true, false)); + } else { + world.setRawTypeIdAndData(i1, j1, k1, Block.PISTON_MOVING.id, l2); + world.setTileEntity(i1, j1, k1, BlockPistonMoving.a(k2, l2, l, true, false)); + } + + i1 = l1; + j1 = i2; + k1 = j2; + } + + return true; + } + } +} diff --git a/net/minecraft/server/BlockPistonExtension.java b/net/minecraft/server/BlockPistonExtension.java new file mode 100644 index 0000000..0aebd49 --- /dev/null +++ b/net/minecraft/server/BlockPistonExtension.java @@ -0,0 +1,132 @@ +package net.minecraft.server; + +import java.util.ArrayList; +import java.util.Random; + +public class BlockPistonExtension extends Block { + + private int a = -1; + + public BlockPistonExtension(int i, int j) { + super(i, j, Material.PISTON); + this.a(h); + this.c(-1.0F); + } + + public int a(int i, int j) { + int k = b(j); + + return i == k ? (this.a >= 0 ? this.a : ((j & 8) != 0 ? this.textureId - 1 : this.textureId)) : (i == PistonBlockTextures.a[k] ? 107 : 108); + } + + public boolean a() { + return false; + } + + public boolean b() { + return false; + } + + public boolean canPlace(World world, int i, int j, int k) { + return false; + } + + public boolean canPlace(World world, int i, int j, int k, int l) { + return false; + } + + public int a(Random random) { + return 0; + } + + public void a(World world, int i, int j, int k, AxisAlignedBB axisalignedbb, ArrayList arraylist) { + int l = world.getData(i, j, k); + + switch (b(l)) { + case 0: + this.a(0.0F, 0.0F, 0.0F, 1.0F, 0.25F, 1.0F); + super.a(world, i, j, k, axisalignedbb, arraylist); + this.a(0.375F, 0.25F, 0.375F, 0.625F, 1.0F, 0.625F); + super.a(world, i, j, k, axisalignedbb, arraylist); + break; + + case 1: + this.a(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); + super.a(world, i, j, k, axisalignedbb, arraylist); + this.a(0.375F, 0.0F, 0.375F, 0.625F, 0.75F, 0.625F); + super.a(world, i, j, k, axisalignedbb, arraylist); + break; + + case 2: + this.a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 0.25F); + super.a(world, i, j, k, axisalignedbb, arraylist); + this.a(0.25F, 0.375F, 0.25F, 0.75F, 0.625F, 1.0F); + super.a(world, i, j, k, axisalignedbb, arraylist); + break; + + case 3: + this.a(0.0F, 0.0F, 0.75F, 1.0F, 1.0F, 1.0F); + super.a(world, i, j, k, axisalignedbb, arraylist); + this.a(0.25F, 0.375F, 0.0F, 0.75F, 0.625F, 0.75F); + super.a(world, i, j, k, axisalignedbb, arraylist); + break; + + case 4: + this.a(0.0F, 0.0F, 0.0F, 0.25F, 1.0F, 1.0F); + super.a(world, i, j, k, axisalignedbb, arraylist); + this.a(0.375F, 0.25F, 0.25F, 0.625F, 0.75F, 1.0F); + super.a(world, i, j, k, axisalignedbb, arraylist); + break; + + case 5: + this.a(0.75F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + super.a(world, i, j, k, axisalignedbb, arraylist); + this.a(0.0F, 0.375F, 0.25F, 0.75F, 0.625F, 0.75F); + super.a(world, i, j, k, axisalignedbb, arraylist); + } + + this.a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + } + + public void a(IBlockAccess iblockaccess, int i, int j, int k) { + int l = iblockaccess.getData(i, j, k); + + switch (b(l)) { + case 0: + this.a(0.0F, 0.0F, 0.0F, 1.0F, 0.25F, 1.0F); + break; + + case 1: + this.a(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); + break; + + case 2: + this.a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 0.25F); + break; + + case 3: + this.a(0.0F, 0.0F, 0.75F, 1.0F, 1.0F, 1.0F); + break; + + case 4: + this.a(0.0F, 0.0F, 0.0F, 0.25F, 1.0F, 1.0F); + break; + + case 5: + this.a(0.75F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + } + } + + public void doPhysics(World world, int i, int j, int k, int l) { + int i1 = b(world.getData(i, j, k)); + int j1 = world.getTypeId(i - PistonBlockTextures.b[i1], j - PistonBlockTextures.c[i1], k - PistonBlockTextures.d[i1]); + + if (j1 != Block.PISTON.id && j1 != Block.PISTON_STICKY.id) { + world.setTypeId(i, j, k, 0); + } + } + + public static int b(int i) { + return i & 7; + } +} diff --git a/net/minecraft/server/BlockPistonMoving.java b/net/minecraft/server/BlockPistonMoving.java new file mode 100644 index 0000000..a989625 --- /dev/null +++ b/net/minecraft/server/BlockPistonMoving.java @@ -0,0 +1,129 @@ +package net.minecraft.server; + +import java.util.Random; + +public class BlockPistonMoving extends BlockContainer { + + public BlockPistonMoving(int i) { + super(i, Material.PISTON); + this.c(-1.0F); + } + + protected TileEntity a_() { + return null; + } + + public void e(World world, int i, int j, int k) {} + + public void remove(World world, int i, int j, int k) { + TileEntity tileentity = world.getTileEntity(i, j, k); + + if (tileentity != null && tileentity instanceof TileEntityPiston) { + ((TileEntityPiston) tileentity).k(); + } else { + super.remove(world, i, j, k); + } + } + + public boolean canPlace(World world, int i, int j, int k) { + return false; + } + + public boolean canPlace(World world, int i, int j, int k, int l) { + return false; + } + + public boolean a() { + return false; + } + + public boolean b() { + return false; + } + + public int a(int i, Random random) { + return 0; + } + + public void dropNaturally(World world, int i, int j, int k, int l, float f) { + if (!world.isStatic) { + TileEntityPiston tileentitypiston = this.b(world, i, j, k); + + if (tileentitypiston != null) { + Block.byId[tileentitypiston.a()].g(world, i, j, k, tileentitypiston.e()); + } + } + } + + public void doPhysics(World world, int i, int j, int k, int l) { + if (!world.isStatic && world.getTileEntity(i, j, k) == null) { + ; + } + } + + public static TileEntity a(int i, int j, int k, boolean flag, boolean flag1) { + return new TileEntityPiston(i, j, k, flag, flag1); + } + + public AxisAlignedBB d(World world, int i, int j, int k) { + TileEntityPiston tileentitypiston = this.b(world, i, j, k); + + if (tileentitypiston == null) { + return null; + } else { + float f = tileentitypiston.a(0.0F); + + if (tileentitypiston.c()) { + f = 1.0F - f; + } + + return this.a(world, i, j, k, tileentitypiston.a(), f, tileentitypiston.d()); + } + } + + public void a(IBlockAccess iblockaccess, int i, int j, int k) { + TileEntityPiston tileentitypiston = this.b(iblockaccess, i, j, k); + + if (tileentitypiston != null) { + Block block = Block.byId[tileentitypiston.a()]; + + block.a(iblockaccess, i, j, k); + float f = tileentitypiston.a(0.0F); + + if (tileentitypiston.c()) { + f = 1.0F - f; + } + + int l = tileentitypiston.d(); + + this.minX = block.minX - (double) ((float) PistonBlockTextures.b[l] * f); + this.minY = block.minY - (double) ((float) PistonBlockTextures.c[l] * f); + this.minZ = block.minZ - (double) ((float) PistonBlockTextures.d[l] * f); + this.maxX = block.maxX - (double) ((float) PistonBlockTextures.b[l] * f); + this.maxY = block.maxY - (double) ((float) PistonBlockTextures.c[l] * f); + this.maxZ = block.maxZ - (double) ((float) PistonBlockTextures.d[l] * f); + } + } + + public AxisAlignedBB a(World world, int i, int j, int k, int l, float f, int i1) { + AxisAlignedBB axisalignedbb = Block.byId[l].d(world, i, j, k); + + if (axisalignedbb == null) { + return null; + } else { + axisalignedbb.a -= (double) ((float) PistonBlockTextures.b[i1] * f); + axisalignedbb.d -= (double) ((float) PistonBlockTextures.b[i1] * f); + axisalignedbb.b -= (double) ((float) PistonBlockTextures.c[i1] * f); + axisalignedbb.e -= (double) ((float) PistonBlockTextures.c[i1] * f); + axisalignedbb.c -= (double) ((float) PistonBlockTextures.d[i1] * f); + axisalignedbb.f -= (double) ((float) PistonBlockTextures.d[i1] * f); + return axisalignedbb; + } + } + + private TileEntityPiston b(IBlockAccess iblockaccess, int i, int j, int k) { + TileEntityPiston tileentitypiston = (TileEntityPiston) iblockaccess.getTileEntity(i, j, k); + + return tileentitypiston; + } +} diff --git a/net/minecraft/server/BlockPortal.java b/net/minecraft/server/BlockPortal.java index 77d4c2c..c5318b5 100644 --- a/net/minecraft/server/BlockPortal.java +++ b/net/minecraft/server/BlockPortal.java @@ -134,7 +134,7 @@ public int a(Random random) { public void a(World world, int i, int j, int k, Entity entity) { if (entity.vehicle == null && entity.passenger == null) { - entity.O(); + entity.P(); } } } diff --git a/net/minecraft/server/BlockPressurePlate.java b/net/minecraft/server/BlockPressurePlate.java index 97ccd5d..1ce4d77 100644 --- a/net/minecraft/server/BlockPressurePlate.java +++ b/net/minecraft/server/BlockPressurePlate.java @@ -33,7 +33,7 @@ public boolean b() { } public boolean canPlace(World world, int i, int j, int k) { - return world.d(i, j - 1, k); + return world.e(i, j - 1, k); } public void e(World world, int i, int j, int k) {} @@ -41,12 +41,12 @@ public void e(World world, int i, int j, int k) {} public void doPhysics(World world, int i, int j, int k, int l) { boolean flag = false; - if (!world.d(i, j - 1, k)) { + if (!world.e(i, j - 1, k)) { flag = true; } if (flag) { - this.b_(world, i, j, k, world.getData(i, j, k)); + this.g(world, i, j, k, world.getData(i, j, k)); world.setTypeId(i, j, k, 0); } } @@ -136,7 +136,7 @@ public boolean a(IBlockAccess iblockaccess, int i, int j, int k, int l) { return iblockaccess.getData(i, j, k) > 0; } - public boolean c(World world, int i, int j, int k, int l) { + public boolean d(World world, int i, int j, int k, int l) { return world.getData(i, j, k) == 0 ? false : l == 1; } diff --git a/net/minecraft/server/BlockPumpkin.java b/net/minecraft/server/BlockPumpkin.java index 374fe81..c7cb3bf 100644 --- a/net/minecraft/server/BlockPumpkin.java +++ b/net/minecraft/server/BlockPumpkin.java @@ -38,7 +38,7 @@ public void e(World world, int i, int j, int k) { public boolean canPlace(World world, int i, int j, int k) { int l = world.getTypeId(i, j, k); - return (l == 0 || Block.byId[l].material.isReplacable()) && world.d(i, j - 1, k); + return (l == 0 || Block.byId[l].material.isReplacable()) && world.e(i, j - 1, k); } public void postPlace(World world, int i, int j, int k, EntityLiving entityliving) { diff --git a/net/minecraft/server/BlockRedstoneTorch.java b/net/minecraft/server/BlockRedstoneTorch.java index 519c8db..646982d 100644 --- a/net/minecraft/server/BlockRedstoneTorch.java +++ b/net/minecraft/server/BlockRedstoneTorch.java @@ -118,7 +118,7 @@ public void doPhysics(World world, int i, int j, int k, int l) { world.c(i, j, k, this.id, this.c()); } - public boolean c(World world, int i, int j, int k, int l) { + public boolean d(World world, int i, int j, int k, int l) { return l == 0 ? this.a(world, i, j, k, l) : false; } diff --git a/net/minecraft/server/BlockRedstoneWire.java b/net/minecraft/server/BlockRedstoneWire.java index 3644b0a..5d667b6 100644 --- a/net/minecraft/server/BlockRedstoneWire.java +++ b/net/minecraft/server/BlockRedstoneWire.java @@ -32,7 +32,7 @@ public boolean b() { } public boolean canPlace(World world, int i, int j, int k) { - return world.d(i, j - 1, k); + return world.e(i, j - 1, k); } private void g(World world, int i, int j, int k) { @@ -86,11 +86,11 @@ private void a(World world, int i, int j, int k, int l, int i1, int j1) { l1 = this.getPower(world, j2, j, k2, l1); } - if (world.d(j2, j, k2) && !world.d(i, j + 1, k)) { + if (world.e(j2, j, k2) && !world.e(i, j + 1, k)) { if (j2 != l || j + 1 != i1 || k2 != j1) { l1 = this.getPower(world, j2, j + 1, k2, l1); } - } else if (!world.d(j2, j, k2) && (j2 != l || j - 1 != i1 || k2 != j1)) { + } else if (!world.e(j2, j, k2) && (j2 != l || j - 1 != i1 || k2 != j1)) { l1 = this.getPower(world, j2, j - 1, k2, l1); } } @@ -129,7 +129,7 @@ private void a(World world, int i, int j, int k, int l, int i1, int j1) { ++k2; } - if (world.d(j2, j, k2)) { + if (world.e(j2, j, k2)) { l2 += 2; } @@ -190,25 +190,25 @@ public void e(World world, int i, int j, int k) { this.h(world, i + 1, j, k); this.h(world, i, j, k - 1); this.h(world, i, j, k + 1); - if (world.d(i - 1, j, k)) { + if (world.e(i - 1, j, k)) { this.h(world, i - 1, j + 1, k); } else { this.h(world, i - 1, j - 1, k); } - if (world.d(i + 1, j, k)) { + if (world.e(i + 1, j, k)) { this.h(world, i + 1, j + 1, k); } else { this.h(world, i + 1, j - 1, k); } - if (world.d(i, j, k - 1)) { + if (world.e(i, j, k - 1)) { this.h(world, i, j + 1, k - 1); } else { this.h(world, i, j - 1, k - 1); } - if (world.d(i, j, k + 1)) { + if (world.e(i, j, k + 1)) { this.h(world, i, j + 1, k + 1); } else { this.h(world, i, j - 1, k + 1); @@ -226,25 +226,25 @@ public void remove(World world, int i, int j, int k) { this.h(world, i + 1, j, k); this.h(world, i, j, k - 1); this.h(world, i, j, k + 1); - if (world.d(i - 1, j, k)) { + if (world.e(i - 1, j, k)) { this.h(world, i - 1, j + 1, k); } else { this.h(world, i - 1, j - 1, k); } - if (world.d(i + 1, j, k)) { + if (world.e(i + 1, j, k)) { this.h(world, i + 1, j + 1, k); } else { this.h(world, i + 1, j - 1, k); } - if (world.d(i, j, k - 1)) { + if (world.e(i, j, k - 1)) { this.h(world, i, j + 1, k - 1); } else { this.h(world, i, j - 1, k - 1); } - if (world.d(i, j, k + 1)) { + if (world.e(i, j, k + 1)) { this.h(world, i, j + 1, k + 1); } else { this.h(world, i, j - 1, k + 1); @@ -268,7 +268,7 @@ public void doPhysics(World world, int i, int j, int k, int l) { boolean flag = this.canPlace(world, i, j, k); if (!flag) { - this.b_(world, i, j, k, i1); + this.g(world, i, j, k, i1); world.setTypeId(i, j, k, 0); } else { this.g(world, i, j, k); @@ -282,7 +282,7 @@ public int a(int i, Random random) { return Item.REDSTONE.id; } - public boolean c(World world, int i, int j, int k, int l) { + public boolean d(World world, int i, int j, int k, int l) { return !this.a ? false : this.a(world, i, j, k, l); } @@ -294,25 +294,25 @@ public boolean a(IBlockAccess iblockaccess, int i, int j, int k, int l) { } else if (l == 1) { return true; } else { - boolean flag = b(iblockaccess, i - 1, j, k) || !iblockaccess.d(i - 1, j, k) && b(iblockaccess, i - 1, j - 1, k); - boolean flag1 = b(iblockaccess, i + 1, j, k) || !iblockaccess.d(i + 1, j, k) && b(iblockaccess, i + 1, j - 1, k); - boolean flag2 = b(iblockaccess, i, j, k - 1) || !iblockaccess.d(i, j, k - 1) && b(iblockaccess, i, j - 1, k - 1); - boolean flag3 = b(iblockaccess, i, j, k + 1) || !iblockaccess.d(i, j, k + 1) && b(iblockaccess, i, j - 1, k + 1); + boolean flag = c(iblockaccess, i - 1, j, k, 1) || !iblockaccess.e(i - 1, j, k) && c(iblockaccess, i - 1, j - 1, k, -1); + boolean flag1 = c(iblockaccess, i + 1, j, k, 3) || !iblockaccess.e(i + 1, j, k) && c(iblockaccess, i + 1, j - 1, k, -1); + boolean flag2 = c(iblockaccess, i, j, k - 1, 2) || !iblockaccess.e(i, j, k - 1) && c(iblockaccess, i, j - 1, k - 1, -1); + boolean flag3 = c(iblockaccess, i, j, k + 1, 0) || !iblockaccess.e(i, j, k + 1) && c(iblockaccess, i, j - 1, k + 1, -1); - if (!iblockaccess.d(i, j + 1, k)) { - if (iblockaccess.d(i - 1, j, k) && b(iblockaccess, i - 1, j + 1, k)) { + if (!iblockaccess.e(i, j + 1, k)) { + if (iblockaccess.e(i - 1, j, k) && c(iblockaccess, i - 1, j + 1, k, -1)) { flag = true; } - if (iblockaccess.d(i + 1, j, k) && b(iblockaccess, i + 1, j + 1, k)) { + if (iblockaccess.e(i + 1, j, k) && c(iblockaccess, i + 1, j + 1, k, -1)) { flag1 = true; } - if (iblockaccess.d(i, j, k - 1) && b(iblockaccess, i, j + 1, k - 1)) { + if (iblockaccess.e(i, j, k - 1) && c(iblockaccess, i, j + 1, k - 1, -1)) { flag2 = true; } - if (iblockaccess.d(i, j, k + 1) && b(iblockaccess, i, j + 1, k + 1)) { + if (iblockaccess.e(i, j, k + 1) && c(iblockaccess, i, j + 1, k + 1, -1)) { flag3 = true; } } @@ -325,9 +325,21 @@ public boolean isPowerSource() { return this.a; } - public static boolean b(IBlockAccess iblockaccess, int i, int j, int k) { - int l = iblockaccess.getTypeId(i, j, k); + public static boolean c(IBlockAccess iblockaccess, int i, int j, int k, int l) { + int i1 = iblockaccess.getTypeId(i, j, k); - return l == Block.REDSTONE_WIRE.id ? true : (l == 0 ? false : Block.byId[l].isPowerSource()); + if (i1 == Block.REDSTONE_WIRE.id) { + return true; + } else if (i1 == 0) { + return false; + } else if (Block.byId[i1].isPowerSource()) { + return true; + } else if (i1 != Block.DIODE_OFF.id && i1 != Block.DIODE_ON.id) { + return false; + } else { + int j1 = iblockaccess.getData(i, j, k); + + return l == BedBlockTextures.b[j1 & 3]; + } } } diff --git a/net/minecraft/server/BlockReed.java b/net/minecraft/server/BlockReed.java index e5c540c..2314be6 100644 --- a/net/minecraft/server/BlockReed.java +++ b/net/minecraft/server/BlockReed.java @@ -46,7 +46,7 @@ public void doPhysics(World world, int i, int j, int k, int l) { protected final void g(World world, int i, int j, int k) { if (!this.f(world, i, j, k)) { - this.b_(world, i, j, k, world.getData(i, j, k)); + this.g(world, i, j, k, world.getData(i, j, k)); world.setTypeId(i, j, k, 0); } } diff --git a/net/minecraft/server/BlockSapling.java b/net/minecraft/server/BlockSapling.java index 4e5f4d3..8b5d8ae 100644 --- a/net/minecraft/server/BlockSapling.java +++ b/net/minecraft/server/BlockSapling.java @@ -53,7 +53,7 @@ public void b(World world, int i, int j, int k, Random random) { } } - protected int b(int i) { + protected int a_(int i) { return i & 3; } } diff --git a/net/minecraft/server/BlockSign.java b/net/minecraft/server/BlockSign.java index a4e90d9..ed6c983 100644 --- a/net/minecraft/server/BlockSign.java +++ b/net/minecraft/server/BlockSign.java @@ -99,7 +99,7 @@ public void doPhysics(World world, int i, int j, int k, int l) { } if (flag) { - this.b_(world, i, j, k, world.getData(i, j, k)); + this.g(world, i, j, k, world.getData(i, j, k)); world.setTypeId(i, j, k, 0); } diff --git a/net/minecraft/server/BlockSnow.java b/net/minecraft/server/BlockSnow.java index 1c73410..ab13b2b 100644 --- a/net/minecraft/server/BlockSnow.java +++ b/net/minecraft/server/BlockSnow.java @@ -43,7 +43,7 @@ public void doPhysics(World world, int i, int j, int k, int l) { private boolean g(World world, int i, int j, int k) { if (!this.canPlace(world, i, j, k)) { - this.b_(world, i, j, k, world.getData(i, j, k)); + this.g(world, i, j, k, world.getData(i, j, k)); world.setTypeId(i, j, k, 0); return false; } else { @@ -75,7 +75,7 @@ public int a(Random random) { public void a(World world, int i, int j, int k, Random random) { if (world.a(EnumSkyBlock.BLOCK, i, j, k) > 11) { - this.b_(world, i, j, k, world.getData(i, j, k)); + this.g(world, i, j, k, world.getData(i, j, k)); world.setTypeId(i, j, k, 0); } } diff --git a/net/minecraft/server/BlockSnowBlock.java b/net/minecraft/server/BlockSnowBlock.java index 1301bbb..60c586e 100644 --- a/net/minecraft/server/BlockSnowBlock.java +++ b/net/minecraft/server/BlockSnowBlock.java @@ -19,7 +19,7 @@ public int a(Random random) { public void a(World world, int i, int j, int k, Random random) { if (world.a(EnumSkyBlock.BLOCK, i, j, k) > 11) { - this.b_(world, i, j, k, world.getData(i, j, k)); + this.g(world, i, j, k, world.getData(i, j, k)); world.setTypeId(i, j, k, 0); } } diff --git a/net/minecraft/server/BlockStairs.java b/net/minecraft/server/BlockStairs.java index 53f9858..5e240db 100644 --- a/net/minecraft/server/BlockStairs.java +++ b/net/minecraft/server/BlockStairs.java @@ -96,8 +96,8 @@ public void a(World world, int i, int j, int k, Entity entity, Vec3D vec3d) { this.a.a(world, i, j, k, entity, vec3d); } - public boolean m_() { - return this.a.m_(); + public boolean k_() { + return this.a.k_(); } public boolean a(int i, boolean flag) { @@ -121,10 +121,6 @@ public void dropNaturally(World world, int i, int j, int k, int l, float f) { this.a.dropNaturally(world, i, j, k, l, f); } - public void b_(World world, int i, int j, int k, int l) { - this.a.b_(world, i, j, k, l); - } - public void b(World world, int i, int j, int k, Entity entity) { this.a.b(world, i, j, k, entity); } diff --git a/net/minecraft/server/BlockStep.java b/net/minecraft/server/BlockStep.java index 909b486..1792a3d 100644 --- a/net/minecraft/server/BlockStep.java +++ b/net/minecraft/server/BlockStep.java @@ -54,7 +54,7 @@ public int a(Random random) { return this.b ? 2 : 1; } - protected int b(int i) { + protected int a_(int i) { return i; } diff --git a/net/minecraft/server/BlockTNT.java b/net/minecraft/server/BlockTNT.java index bc020ed..6396aa1 100644 --- a/net/minecraft/server/BlockTNT.java +++ b/net/minecraft/server/BlockTNT.java @@ -14,7 +14,7 @@ public int a(int i) { public void doPhysics(World world, int i, int j, int k, int l) { if (l > 0 && Block.byId[l].isPowerSource() && world.isBlockIndirectlyPowered(i, j, k)) { - this.postBreak(world, i, j, k, 0); + this.postBreak(world, i, j, k, 1); world.setTypeId(i, j, k, 0); } } @@ -32,10 +32,26 @@ public void c(World world, int i, int j, int k) { public void postBreak(World world, int i, int j, int k, int l) { if (!world.isStatic) { - EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, (double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F)); + if ((l & 1) == 0) { + this.a(world, i, j, k, new ItemStack(Block.TNT.id, 1, 0)); + } else { + EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, (double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F)); + + world.addEntity(entitytntprimed); + world.makeSound(entitytntprimed, "random.fuse", 1.0F, 1.0F); + } + } + } - world.addEntity(entitytntprimed); - world.makeSound(entitytntprimed, "random.fuse", 1.0F, 1.0F); + public void b(World world, int i, int j, int k, EntityHuman entityhuman) { + if (entityhuman.G() != null && entityhuman.G().id == Item.FLINT_AND_STEEL.id) { + world.setRawData(i, j, k, 1); } + + super.b(world, i, j, k, entityhuman); + } + + public boolean interact(World world, int i, int j, int k, EntityHuman entityhuman) { + return super.interact(world, i, j, k, entityhuman); } } diff --git a/net/minecraft/server/BlockTorch.java b/net/minecraft/server/BlockTorch.java index fd1ab4e..b8fe32b 100644 --- a/net/minecraft/server/BlockTorch.java +++ b/net/minecraft/server/BlockTorch.java @@ -21,30 +21,34 @@ public boolean b() { return false; } + private boolean g(World world, int i, int j, int k) { + return world.e(i, j, k) || world.getTypeId(i, j, k) == Block.FENCE.id; + } + public boolean canPlace(World world, int i, int j, int k) { - return world.d(i - 1, j, k) ? true : (world.d(i + 1, j, k) ? true : (world.d(i, j, k - 1) ? true : (world.d(i, j, k + 1) ? true : world.d(i, j - 1, k)))); + return world.e(i - 1, j, k) ? true : (world.e(i + 1, j, k) ? true : (world.e(i, j, k - 1) ? true : (world.e(i, j, k + 1) ? true : this.g(world, i, j - 1, k)))); } public void postPlace(World world, int i, int j, int k, int l) { int i1 = world.getData(i, j, k); - if (l == 1 && world.d(i, j - 1, k)) { + if (l == 1 && this.g(world, i, j - 1, k)) { i1 = 5; } - if (l == 2 && world.d(i, j, k + 1)) { + if (l == 2 && world.e(i, j, k + 1)) { i1 = 4; } - if (l == 3 && world.d(i, j, k - 1)) { + if (l == 3 && world.e(i, j, k - 1)) { i1 = 3; } - if (l == 4 && world.d(i + 1, j, k)) { + if (l == 4 && world.e(i + 1, j, k)) { i1 = 2; } - if (l == 5 && world.d(i - 1, j, k)) { + if (l == 5 && world.e(i - 1, j, k)) { i1 = 1; } @@ -59,56 +63,56 @@ public void a(World world, int i, int j, int k, Random random) { } public void e(World world, int i, int j, int k) { - if (world.d(i - 1, j, k)) { + if (world.e(i - 1, j, k)) { world.setData(i, j, k, 1); - } else if (world.d(i + 1, j, k)) { + } else if (world.e(i + 1, j, k)) { world.setData(i, j, k, 2); - } else if (world.d(i, j, k - 1)) { + } else if (world.e(i, j, k - 1)) { world.setData(i, j, k, 3); - } else if (world.d(i, j, k + 1)) { + } else if (world.e(i, j, k + 1)) { world.setData(i, j, k, 4); - } else if (world.d(i, j - 1, k)) { + } else if (this.g(world, i, j - 1, k)) { world.setData(i, j, k, 5); } - this.g(world, i, j, k); + this.h(world, i, j, k); } public void doPhysics(World world, int i, int j, int k, int l) { - if (this.g(world, i, j, k)) { + if (this.h(world, i, j, k)) { int i1 = world.getData(i, j, k); boolean flag = false; - if (!world.d(i - 1, j, k) && i1 == 1) { + if (!world.e(i - 1, j, k) && i1 == 1) { flag = true; } - if (!world.d(i + 1, j, k) && i1 == 2) { + if (!world.e(i + 1, j, k) && i1 == 2) { flag = true; } - if (!world.d(i, j, k - 1) && i1 == 3) { + if (!world.e(i, j, k - 1) && i1 == 3) { flag = true; } - if (!world.d(i, j, k + 1) && i1 == 4) { + if (!world.e(i, j, k + 1) && i1 == 4) { flag = true; } - if (!world.d(i, j - 1, k) && i1 == 5) { + if (!this.g(world, i, j - 1, k) && i1 == 5) { flag = true; } if (flag) { - this.b_(world, i, j, k, world.getData(i, j, k)); + this.g(world, i, j, k, world.getData(i, j, k)); world.setTypeId(i, j, k, 0); } } } - private boolean g(World world, int i, int j, int k) { + private boolean h(World world, int i, int j, int k) { if (!this.canPlace(world, i, j, k)) { - this.b_(world, i, j, k, world.getData(i, j, k)); + this.g(world, i, j, k, world.getData(i, j, k)); world.setTypeId(i, j, k, 0); return false; } else { diff --git a/net/minecraft/server/BlockTrapdoor.java b/net/minecraft/server/BlockTrapdoor.java index d624aa5..04ba39f 100644 --- a/net/minecraft/server/BlockTrapdoor.java +++ b/net/minecraft/server/BlockTrapdoor.java @@ -103,9 +103,9 @@ public void doPhysics(World world, int i, int j, int k, int l) { --j1; } - if (!world.d(j1, j, k1)) { + if (!world.e(j1, j, k1)) { world.setTypeId(i, j, k, 0); - this.b_(world, i, j, k, i1); + this.g(world, i, j, k, i1); } if (l > 0 && Block.byId[l].isPowerSource()) { @@ -165,7 +165,7 @@ public boolean canPlace(World world, int i, int j, int k, int l) { --i; } - return world.d(i, j, k); + return world.e(i, j, k); } } diff --git a/net/minecraft/server/BlockWeb.java b/net/minecraft/server/BlockWeb.java index 79e39da..a120cf7 100644 --- a/net/minecraft/server/BlockWeb.java +++ b/net/minecraft/server/BlockWeb.java @@ -1,9 +1,11 @@ package net.minecraft.server; +import java.util.Random; + public class BlockWeb extends Block { public BlockWeb(int i, int j) { - super(i, j, Material.CLOTH); + super(i, j, Material.WEB); } public void a(World world, int i, int j, int k, Entity entity) { @@ -17,4 +19,12 @@ public boolean a() { public AxisAlignedBB d(World world, int i, int j, int k) { return null; } + + public boolean b() { + return false; + } + + public int a(int i, Random random) { + return Item.STRING.id; + } } diff --git a/net/minecraft/server/Chunk.java b/net/minecraft/server/Chunk.java index f81fb48..9eda0ab 100644 --- a/net/minecraft/server/Chunk.java +++ b/net/minecraft/server/Chunk.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Random; @@ -359,15 +360,15 @@ public void a(Entity entity) { k = this.entitySlices.length - 1; } - entity.bF = true; - entity.bG = this.x; - entity.bH = k; - entity.bI = this.z; + entity.bG = true; + entity.bH = this.x; + entity.bI = k; + entity.bJ = this.z; this.entitySlices[k].add(entity); } public void b(Entity entity) { - this.a(entity, entity.bH); + this.a(entity, entity.bI); } public void a(Entity entity, int i) { @@ -403,7 +404,12 @@ public TileEntity d(int i, int j, int k) { tileentity = (TileEntity) this.tileEntities.get(chunkposition); } - return tileentity; + if (tileentity != null && tileentity.g()) { + this.tileEntities.remove(chunkposition); + return null; + } else { + return tileentity; + } } public void a(TileEntity tileentity) { @@ -412,6 +418,9 @@ public void a(TileEntity tileentity) { int k = tileentity.z - this.z * 16; this.a(i, j, k, tileentity); + if (this.c) { + this.world.c.add(tileentity); + } } public void a(int i, int j, int k, TileEntity tileentity) { @@ -422,14 +431,7 @@ public void a(int i, int j, int k, TileEntity tileentity) { tileentity.y = j; tileentity.z = this.z * 16 + k; if (this.getTypeId(i, j, k) != 0 && Block.byId[this.getTypeId(i, j, k)] instanceof BlockContainer) { - if (this.c) { - if (this.tileEntities.get(chunkposition) != null) { - this.world.c.remove(this.tileEntities.get(chunkposition)); - } - - this.world.c.add(tileentity); - } - + tileentity.j(); this.tileEntities.put(chunkposition, tileentity); } else { System.out.println("Attempted to place a tile entity where there was no entity tile!"); @@ -440,13 +442,17 @@ public void e(int i, int j, int k) { ChunkPosition chunkposition = new ChunkPosition(i, j, k); if (this.c) { - this.world.c.remove(this.tileEntities.remove(chunkposition)); + TileEntity tileentity = (TileEntity) this.tileEntities.remove(chunkposition); + + if (tileentity != null) { + tileentity.h(); + } } } public void addEntities() { this.c = true; - this.world.c.addAll(this.tileEntities.values()); + this.world.a(this.tileEntities.values()); for (int i = 0; i < this.entitySlices.length; ++i) { this.world.a(this.entitySlices[i]); @@ -455,7 +461,13 @@ public void addEntities() { public void removeEntities() { this.c = false; - this.world.c.removeAll(this.tileEntities.values()); + Iterator iterator = this.tileEntities.values().iterator(); + + while (iterator.hasNext()) { + TileEntity tileentity = (TileEntity) iterator.next(); + + tileentity.h(); + } for (int i = 0; i < this.entitySlices.length; ++i) { this.world.b(this.entitySlices[i]); diff --git a/net/minecraft/server/ChunkCache.java b/net/minecraft/server/ChunkCache.java index 3376539..fbac7b3 100644 --- a/net/minecraft/server/ChunkCache.java +++ b/net/minecraft/server/ChunkCache.java @@ -42,6 +42,13 @@ public int getTypeId(int i, int j, int k) { } } + public TileEntity getTileEntity(int i, int j, int k) { + int l = (i >> 4) - this.a; + int i1 = (k >> 4) - this.b; + + return this.c[l][i1].d(i & 15, j, k & 15); + } + public int getData(int i, int j, int k) { if (j < 0) { return 0; @@ -61,7 +68,7 @@ public Material getMaterial(int i, int j, int k) { return l == 0 ? Material.AIR : Block.byId[l].material; } - public boolean d(int i, int j, int k) { + public boolean e(int i, int j, int k) { Block block = Block.byId[this.getTypeId(i, j, k)]; return block == null ? false : block.material.isSolid() && block.b(); diff --git a/net/minecraft/server/CraftingManager.java b/net/minecraft/server/CraftingManager.java index 0e458cb..ef97516 100644 --- a/net/minecraft/server/CraftingManager.java +++ b/net/minecraft/server/CraftingManager.java @@ -76,6 +76,8 @@ private CraftingManager() { this.registerShapedRecipe(new ItemStack(Block.STONE_PLATE, 1), new Object[] { "##", Character.valueOf('#'), Block.STONE}); this.registerShapedRecipe(new ItemStack(Block.WOOD_PLATE, 1), new Object[] { "##", Character.valueOf('#'), Block.WOOD}); this.registerShapedRecipe(new ItemStack(Block.DISPENSER, 1), new Object[] { "###", "#X#", "#R#", Character.valueOf('#'), Block.COBBLESTONE, Character.valueOf('X'), Item.BOW, Character.valueOf('R'), Item.REDSTONE}); + this.registerShapedRecipe(new ItemStack(Block.PISTON, 1), new Object[] { "TTT", "#X#", "#R#", Character.valueOf('#'), Block.COBBLESTONE, Character.valueOf('X'), Item.IRON_INGOT, Character.valueOf('R'), Item.REDSTONE, Character.valueOf('T'), Block.WOOD}); + this.registerShapedRecipe(new ItemStack(Block.PISTON_STICKY, 1), new Object[] { "S", "P", Character.valueOf('S'), Item.SLIME_BALL, Character.valueOf('P'), Block.PISTON}); this.registerShapedRecipe(new ItemStack(Item.BED, 1), new Object[] { "###", "XXX", Character.valueOf('#'), Block.WOOL, Character.valueOf('X'), Block.WOOD}); Collections.sort(this.b, new RecipeSorter(this)); System.out.println(this.b.size() + " recipes"); diff --git a/net/minecraft/server/Entity.java b/net/minecraft/server/Entity.java index d50c899..6dfd1d0 100644 --- a/net/minecraft/server/Entity.java +++ b/net/minecraft/server/Entity.java @@ -59,13 +59,14 @@ public abstract class Entity { private boolean justCreated; protected boolean fireProof; protected DataWatcher datawatcher; + public float bF; private double d; private double e; - public boolean bF; - public int bG; + public boolean bG; public int bH; public int bI; - public boolean bJ; + public int bJ; + public boolean bK; public Entity(World world) { this.id = entityCount++; @@ -99,7 +100,8 @@ public Entity(World world) { this.justCreated = true; this.fireProof = false; this.datawatcher = new DataWatcher(); - this.bF = false; + this.bF = 0.0F; + this.bG = false; this.world = world; this.setPosition(0.0D, 0.0D, 0.0D); this.datawatcher.a(0, Byte.valueOf((byte) 0)); @@ -108,7 +110,7 @@ public Entity(World world) { protected abstract void b(); - public DataWatcher Z() { + public DataWatcher aa() { return this.datawatcher; } @@ -144,11 +146,11 @@ public void setPosition(double d0, double d1, double d2) { this.boundingBox.c(d0 - (double) f, d1 - (double) this.height + (double) this.br, d2 - (double) f, d0 + (double) f, d1 - (double) this.height + (double) this.br + (double) f1, d2 + (double) f); } - public void o_() { - this.Q(); + public void m_() { + this.R(); } - public void Q() { + public void R() { if (this.vehicle != null && this.vehicle.dead) { this.vehicle = null; } @@ -212,12 +214,12 @@ public void Q() { } } - if (this.ad()) { - this.aa(); + if (this.ae()) { + this.ab(); } if (this.locY < -64.0D) { - this.X(); + this.Y(); } if (!this.world.isStatic) { @@ -228,14 +230,14 @@ public void Q() { this.justCreated = false; } - protected void aa() { + protected void ab() { if (!this.fireProof) { this.damageEntity((Entity) null, 4); this.fireTicks = 600; } } - protected void X() { + protected void Y() { this.die(); } @@ -486,7 +488,7 @@ public void move(double d0, double d1, double d2) { } } - boolean flag2 = this.ab(); + boolean flag2 = this.ac(); if (this.world.d(this.boundingBox.shrink(0.0010D, 0.0010D, 0.0010D))) { this.burn(1); @@ -538,11 +540,11 @@ protected void a(float f) { } } - public boolean ab() { + public boolean ac() { return this.bA || this.world.s(MathHelper.floor(this.locX), MathHelper.floor(this.locY), MathHelper.floor(this.locZ)); } - public boolean ac() { + public boolean ad() { return this.bA; } @@ -551,7 +553,7 @@ public boolean f_() { } public boolean a(Material material) { - double d0 = this.locY + (double) this.s(); + double d0 = this.locY + (double) this.t(); int i = MathHelper.floor(this.locX); int j = MathHelper.d((float) MathHelper.floor(d0)); int k = MathHelper.floor(this.locZ); @@ -567,11 +569,11 @@ public boolean a(Material material) { } } - public float s() { + public float t() { return 0.0F; } - public boolean ad() { + public boolean ae() { return this.world.a(this.boundingBox.b(-0.10000000149011612D, -0.4000000059604645D, -0.10000000149011612D), Material.LAVA); } @@ -600,7 +602,17 @@ public float c(float f) { int j = MathHelper.floor(this.locY - (double) this.height + d0); int k = MathHelper.floor(this.locZ); - return this.world.a(MathHelper.floor(this.boundingBox.a), MathHelper.floor(this.boundingBox.b), MathHelper.floor(this.boundingBox.c), MathHelper.floor(this.boundingBox.d), MathHelper.floor(this.boundingBox.e), MathHelper.floor(this.boundingBox.f)) ? this.world.m(i, j, k) : 0.0F; + if (this.world.a(MathHelper.floor(this.boundingBox.a), MathHelper.floor(this.boundingBox.b), MathHelper.floor(this.boundingBox.c), MathHelper.floor(this.boundingBox.d), MathHelper.floor(this.boundingBox.e), MathHelper.floor(this.boundingBox.f))) { + float f1 = this.world.n(i, j, k); + + if (f1 < this.bF) { + f1 = this.bF; + } + + return f1; + } else { + return this.bF; + } } public void spawnIn(World world) { @@ -705,16 +717,16 @@ public void f(double d0, double d1, double d2) { this.motZ += d2; } - protected void ae() { + protected void af() { this.velocityChanged = true; } public boolean damageEntity(Entity entity, int i) { - this.ae(); + this.af(); return false; } - public boolean n_() { + public boolean l_() { return false; } @@ -725,7 +737,7 @@ public boolean d_() { public void c(Entity entity, int i) {} public boolean c(NBTTagCompound nbttagcompound) { - String s = this.af(); + String s = this.ag(); if (!this.dead && s != null) { nbttagcompound.setString("id", s); @@ -781,7 +793,7 @@ public void e(NBTTagCompound nbttagcompound) { this.a(nbttagcompound); } - protected final String af() { + protected final String ag() { return EntityTypes.b(this); } @@ -833,20 +845,20 @@ public EntityItem a(ItemStack itemstack, float f) { return entityitem; } - public boolean S() { + public boolean T() { return !this.dead; } - public boolean J() { + public boolean K() { for (int i = 0; i < 8; ++i) { float f = ((float) ((i >> 0) % 2) - 0.5F) * this.length * 0.9F; float f1 = ((float) ((i >> 1) % 2) - 0.5F) * 0.1F; float f2 = ((float) ((i >> 2) % 2) - 0.5F) * this.length * 0.9F; int j = MathHelper.floor(this.locX + (double) f); - int k = MathHelper.floor(this.locY + (double) this.s() + (double) f1); + int k = MathHelper.floor(this.locY + (double) this.t() + (double) f1); int l = MathHelper.floor(this.locZ + (double) f2); - if (this.world.d(j, k, l)) { + if (this.world.e(j, k, l)) { return true; } } @@ -862,14 +874,14 @@ public AxisAlignedBB a_(Entity entity) { return null; } - public void D() { + public void E() { if (this.vehicle.dead) { this.vehicle = null; } else { this.motX = 0.0D; this.motY = 0.0D; this.motZ = 0.0D; - this.o_(); + this.m_(); if (this.vehicle != null) { this.vehicle.f(); this.e += (double) (this.vehicle.yaw - this.vehicle.lastYaw); @@ -919,10 +931,10 @@ public void D() { } public void f() { - this.passenger.setPosition(this.locX, this.locY + this.m() + this.passenger.H(), this.locZ); + this.passenger.setPosition(this.locX, this.locY + this.m() + this.passenger.I(), this.locZ); } - public double H() { + public double I() { return (double) this.height; } @@ -958,11 +970,11 @@ public void mount(Entity entity) { } } - public Vec3D Y() { + public Vec3D Z() { return null; } - public void O() {} + public void P() {} public ItemStack[] getEquipment() { return null; @@ -1008,13 +1020,13 @@ protected boolean g(double d0, double d1, double d2) { double d4 = d1 - (double) j; double d5 = d2 - (double) k; - if (this.world.d(i, j, k)) { - boolean flag = !this.world.d(i - 1, j, k); - boolean flag1 = !this.world.d(i + 1, j, k); - boolean flag2 = !this.world.d(i, j - 1, k); - boolean flag3 = !this.world.d(i, j + 1, k); - boolean flag4 = !this.world.d(i, j, k - 1); - boolean flag5 = !this.world.d(i, j, k + 1); + if (this.world.e(i, j, k)) { + boolean flag = !this.world.e(i - 1, j, k); + boolean flag1 = !this.world.e(i + 1, j, k); + boolean flag2 = !this.world.e(i, j - 1, k); + boolean flag3 = !this.world.e(i, j + 1, k); + boolean flag4 = !this.world.e(i, j, k - 1); + boolean flag5 = !this.world.e(i, j, k + 1); byte b0 = -1; double d6 = 9999.0D; diff --git a/net/minecraft/server/EntityAnimal.java b/net/minecraft/server/EntityAnimal.java index 99f5eec..1d42583 100644 --- a/net/minecraft/server/EntityAnimal.java +++ b/net/minecraft/server/EntityAnimal.java @@ -7,7 +7,7 @@ public EntityAnimal(World world) { } protected float a(int i, int j, int k) { - return this.world.getTypeId(i, j - 1, k) == Block.GRASS.id ? 10.0F : this.world.m(i, j, k) - 0.5F; + return this.world.getTypeId(i, j - 1, k) == Block.GRASS.id ? 10.0F : this.world.n(i, j, k) - 0.5F; } public void b(NBTTagCompound nbttagcompound) { @@ -23,7 +23,7 @@ public boolean d() { int j = MathHelper.floor(this.boundingBox.b); int k = MathHelper.floor(this.locZ); - return this.world.getTypeId(i, j - 1, k) == Block.GRASS.id && this.world.j(i, j, k) > 8 && super.d(); + return this.world.getTypeId(i, j - 1, k) == Block.GRASS.id && this.world.k(i, j, k) > 8 && super.d(); } public int e() { diff --git a/net/minecraft/server/EntityArrow.java b/net/minecraft/server/EntityArrow.java index a47c5aa..bb94fde 100644 --- a/net/minecraft/server/EntityArrow.java +++ b/net/minecraft/server/EntityArrow.java @@ -33,7 +33,7 @@ public EntityArrow(World world, EntityLiving entityliving) { this.shooter = entityliving; this.fromPlayer = entityliving instanceof EntityHuman; this.b(0.5F, 0.5F); - this.setPositionRotation(entityliving.locX, entityliving.locY + (double) entityliving.s(), entityliving.locZ, entityliving.yaw, entityliving.pitch); + this.setPositionRotation(entityliving.locX, entityliving.locY + (double) entityliving.t(), entityliving.locZ, entityliving.yaw, entityliving.pitch); this.locX -= (double) (MathHelper.cos(this.yaw / 180.0F * 3.1415927F) * 0.16F); this.locY -= 0.10000000149011612D; this.locZ -= (double) (MathHelper.sin(this.yaw / 180.0F * 3.1415927F) * 0.16F); @@ -69,8 +69,8 @@ public void a(double d0, double d1, double d2, float f, float f1) { this.j = 0; } - public void o_() { - super.o_(); + public void m_() { + super.m_(); if (this.lastPitch == 0.0F && this.lastYaw == 0.0F) { float f = MathHelper.a(this.motX * this.motX + this.motZ * this.motZ); @@ -131,7 +131,7 @@ public void o_() { for (int k = 0; k < list.size(); ++k) { Entity entity1 = (Entity) list.get(k); - if (entity1.n_() && (entity1 != this.shooter || this.k >= 5)) { + if (entity1.l_() && (entity1 != this.shooter || this.k >= 5)) { f1 = 0.3F; AxisAlignedBB axisalignedbb1 = entity1.boundingBox.b((double) f1, (double) f1, (double) f1); MovingObjectPosition movingobjectposition1 = axisalignedbb1.a(vec3d, vec3d1); @@ -212,7 +212,7 @@ public void o_() { float f3 = 0.99F; f1 = 0.03F; - if (this.ac()) { + if (this.ad()) { for (int l = 0; l < 4; ++l) { float f4 = 0.25F; diff --git a/net/minecraft/server/EntityBoat.java b/net/minecraft/server/EntityBoat.java index 0230119..79aa9c4 100644 --- a/net/minecraft/server/EntityBoat.java +++ b/net/minecraft/server/EntityBoat.java @@ -62,7 +62,7 @@ public boolean damageEntity(Entity entity, int i) { this.c = -this.c; this.b = 10; this.damage += i * 10; - this.ae(); + this.af(); if (this.damage > 40) { if (this.passenger != null) { this.passenger.mount(this); @@ -87,12 +87,12 @@ public boolean damageEntity(Entity entity, int i) { } } - public boolean n_() { + public boolean l_() { return !this.dead; } - public void o_() { - super.o_(); + public void m_() { + super.m_(); if (this.b > 0) { --this.b; } @@ -303,7 +303,7 @@ public void f() { double d0 = Math.cos((double) this.yaw * 3.141592653589793D / 180.0D) * 0.4D; double d1 = Math.sin((double) this.yaw * 3.141592653589793D / 180.0D) * 0.4D; - this.passenger.setPosition(this.locX + d0, this.locY + this.m() + this.passenger.H(), this.locZ + d1); + this.passenger.setPosition(this.locX + d0, this.locY + this.m() + this.passenger.I(), this.locZ + d1); } } diff --git a/net/minecraft/server/EntityChicken.java b/net/minecraft/server/EntityChicken.java index 7679166..6299463 100644 --- a/net/minecraft/server/EntityChicken.java +++ b/net/minecraft/server/EntityChicken.java @@ -18,8 +18,8 @@ public EntityChicken(World world) { this.i = this.random.nextInt(6000) + 6000; } - public void u() { - super.u(); + public void v() { + super.v(); this.g = this.b; this.f = this.c; this.c = (float) ((double) this.c + (double) (this.onGround ? -1 : 4) * 0.3D); diff --git a/net/minecraft/server/EntityCreature.java b/net/minecraft/server/EntityCreature.java index 8c5d5aa..5877ffb 100644 --- a/net/minecraft/server/EntityCreature.java +++ b/net/minecraft/server/EntityCreature.java @@ -23,7 +23,7 @@ protected void c_() { if (this.target != null) { this.pathEntity = this.world.findPath(this, this.target, f); } - } else if (!this.target.S()) { + } else if (!this.target.T()) { this.target = null; } else { float f1 = this.target.f(this); @@ -38,35 +38,12 @@ protected void c_() { if (!this.e && this.target != null && (this.pathEntity == null || this.random.nextInt(20) == 0)) { this.pathEntity = this.world.findPath(this, this.target, f); } else if (!this.e && (this.pathEntity == null && this.random.nextInt(80) == 0 || this.random.nextInt(80) == 0)) { - boolean flag = false; - int i = -1; - int j = -1; - int k = -1; - float f2 = -99999.0F; - - for (int l = 0; l < 10; ++l) { - int i1 = MathHelper.floor(this.locX + (double) this.random.nextInt(13) - 6.0D); - int j1 = MathHelper.floor(this.locY + (double) this.random.nextInt(7) - 3.0D); - int k1 = MathHelper.floor(this.locZ + (double) this.random.nextInt(13) - 6.0D); - float f3 = this.a(i1, j1, k1); - - if (f3 > f2) { - f2 = f3; - i = i1; - j = j1; - k = k1; - flag = true; - } - } - - if (flag) { - this.pathEntity = this.world.a(this, i, j, k, 10.0F); - } + this.B(); } - int l1 = MathHelper.floor(this.boundingBox.b + 0.5D); - boolean flag1 = this.ac(); - boolean flag2 = this.ad(); + int i = MathHelper.floor(this.boundingBox.b + 0.5D); + boolean flag = this.ad(); + boolean flag1 = this.ae(); this.pitch = 0.0F; if (this.pathEntity != null && this.random.nextInt(100) != 0) { @@ -87,36 +64,36 @@ protected void c_() { if (vec3d != null) { double d1 = vec3d.a - this.locX; double d2 = vec3d.c - this.locZ; - double d3 = vec3d.b - (double) l1; - float f4 = (float) (Math.atan2(d2, d1) * 180.0D / 3.1415927410125732D) - 90.0F; - float f5 = f4 - this.yaw; + double d3 = vec3d.b - (double) i; + float f2 = (float) (Math.atan2(d2, d1) * 180.0D / 3.1415927410125732D) - 90.0F; + float f3 = f2 - this.yaw; - for (this.aA = this.aE; f5 < -180.0F; f5 += 360.0F) { + for (this.aA = this.aE; f3 < -180.0F; f3 += 360.0F) { ; } - while (f5 >= 180.0F) { - f5 -= 360.0F; + while (f3 >= 180.0F) { + f3 -= 360.0F; } - if (f5 > 30.0F) { - f5 = 30.0F; + if (f3 > 30.0F) { + f3 = 30.0F; } - if (f5 < -30.0F) { - f5 = -30.0F; + if (f3 < -30.0F) { + f3 = -30.0F; } - this.yaw += f5; + this.yaw += f3; if (this.e && this.target != null) { double d4 = this.target.locX - this.locX; double d5 = this.target.locZ - this.locZ; - float f6 = this.yaw; + float f4 = this.yaw; this.yaw = (float) (Math.atan2(d5, d4) * 180.0D / 3.1415927410125732D) - 90.0F; - f5 = (f6 - this.yaw + 90.0F) * 3.1415927F / 180.0F; - this.az = -MathHelper.sin(f5) * this.aA * 1.0F; - this.aA = MathHelper.cos(f5) * this.aA * 1.0F; + f3 = (f4 - this.yaw + 90.0F) * 3.1415927F / 180.0F; + this.az = -MathHelper.sin(f3) * this.aA * 1.0F; + this.aA = MathHelper.cos(f3) * this.aA * 1.0F; } if (d3 > 0.0D) { @@ -128,11 +105,11 @@ protected void c_() { this.a(this.target, 30.0F, 30.0F); } - if (this.positionChanged && !this.B()) { + if (this.positionChanged && !this.C()) { this.aC = true; } - if (this.random.nextFloat() < 0.8F && (flag1 || flag2)) { + if (this.random.nextFloat() < 0.8F && (flag || flag1)) { this.aC = true; } } else { @@ -141,6 +118,33 @@ protected void c_() { } } + protected void B() { + boolean flag = false; + int i = -1; + int j = -1; + int k = -1; + float f = -99999.0F; + + for (int l = 0; l < 10; ++l) { + int i1 = MathHelper.floor(this.locX + (double) this.random.nextInt(13) - 6.0D); + int j1 = MathHelper.floor(this.locY + (double) this.random.nextInt(7) - 3.0D); + int k1 = MathHelper.floor(this.locZ + (double) this.random.nextInt(13) - 6.0D); + float f1 = this.a(i1, j1, k1); + + if (f1 > f) { + f = f1; + i = i1; + j = j1; + k = k1; + flag = true; + } + } + + if (flag) { + this.pathEntity = this.world.a(this, i, j, k, 10.0F); + } + } + protected void a(Entity entity, float f) {} protected void b(Entity entity, float f) {} @@ -161,7 +165,7 @@ public boolean d() { return super.d() && this.a(i, j, k) >= 0.0F; } - public boolean B() { + public boolean C() { return this.pathEntity != null; } @@ -169,7 +173,7 @@ public void setPathEntity(PathEntity pathentity) { this.pathEntity = pathentity; } - public Entity E() { + public Entity F() { return this.target; } diff --git a/net/minecraft/server/EntityCreeper.java b/net/minecraft/server/EntityCreeper.java index d2eedb2..622ae9c 100644 --- a/net/minecraft/server/EntityCreeper.java +++ b/net/minecraft/server/EntityCreeper.java @@ -40,7 +40,7 @@ protected void b(Entity entity, float f) { } } - public void o_() { + public void m_() { this.b = this.fuseTicks; if (this.world.isStatic) { int i = this.x(); @@ -59,7 +59,7 @@ public void o_() { } } - super.o_(); + super.m_(); if (this.target == null && this.fuseTicks > 0) { this.e(-1); --this.fuseTicks; diff --git a/net/minecraft/server/EntityEgg.java b/net/minecraft/server/EntityEgg.java index 45d06be..5482e7c 100644 --- a/net/minecraft/server/EntityEgg.java +++ b/net/minecraft/server/EntityEgg.java @@ -25,7 +25,7 @@ public EntityEgg(World world, EntityLiving entityliving) { super(world); this.thrower = entityliving; this.b(0.25F, 0.25F); - this.setPositionRotation(entityliving.locX, entityliving.locY + (double) entityliving.s(), entityliving.locZ, entityliving.yaw, entityliving.pitch); + this.setPositionRotation(entityliving.locX, entityliving.locY + (double) entityliving.t(), entityliving.locZ, entityliving.yaw, entityliving.pitch); this.locX -= (double) (MathHelper.cos(this.yaw / 180.0F * 3.1415927F) * 0.16F); this.locY -= 0.10000000149011612D; this.locZ -= (double) (MathHelper.sin(this.yaw / 180.0F * 3.1415927F) * 0.16F); @@ -69,11 +69,11 @@ public void a(double d0, double d1, double d2, float f, float f1) { this.h = 0; } - public void o_() { + public void m_() { this.bo = this.locX; this.bp = this.locY; this.bq = this.locZ; - super.o_(); + super.m_(); if (this.a > 0) { --this.a; } @@ -118,7 +118,7 @@ public void o_() { for (int j = 0; j < list.size(); ++j) { Entity entity1 = (Entity) list.get(j); - if (entity1.n_() && (entity1 != this.thrower || this.i >= 5)) { + if (entity1.l_() && (entity1 != this.thrower || this.i >= 5)) { float f = 0.3F; AxisAlignedBB axisalignedbb = entity1.boundingBox.b((double) f, (double) f, (double) f); MovingObjectPosition movingobjectposition1 = axisalignedbb.a(vec3d, vec3d1); @@ -194,7 +194,7 @@ public void o_() { float f2 = 0.99F; float f3 = 0.03F; - if (this.ac()) { + if (this.ad()) { for (int i1 = 0; i1 < 4; ++i1) { float f4 = 0.25F; diff --git a/net/minecraft/server/EntityFallingSand.java b/net/minecraft/server/EntityFallingSand.java index 230df26..daea1c1 100644 --- a/net/minecraft/server/EntityFallingSand.java +++ b/net/minecraft/server/EntityFallingSand.java @@ -30,11 +30,11 @@ protected boolean n() { protected void b() {} - public boolean n_() { + public boolean l_() { return !this.dead; } - public void o_() { + public void m_() { if (this.a == 0) { this.die(); } else { diff --git a/net/minecraft/server/EntityFireball.java b/net/minecraft/server/EntityFireball.java index c152947..034fbcc 100644 --- a/net/minecraft/server/EntityFireball.java +++ b/net/minecraft/server/EntityFireball.java @@ -42,8 +42,8 @@ public EntityFireball(World world, EntityLiving entityliving, double d0, double this.e = d2 / d3 * 0.1D; } - public void o_() { - super.o_(); + public void m_() { + super.m_(); this.fireTicks = 10; if (this.a > 0) { --this.a; @@ -88,7 +88,7 @@ public void o_() { for (int j = 0; j < list.size(); ++j) { Entity entity1 = (Entity) list.get(j); - if (entity1.n_() && (entity1 != this.shooter || this.l >= 25)) { + if (entity1.l_() && (entity1 != this.shooter || this.l >= 25)) { float f = 0.3F; AxisAlignedBB axisalignedbb = entity1.boundingBox.b((double) f, (double) f, (double) f); MovingObjectPosition movingobjectposition1 = axisalignedbb.a(vec3d, vec3d1); @@ -147,7 +147,7 @@ public void o_() { this.yaw = this.lastYaw + (this.yaw - this.lastYaw) * 0.2F; float f2 = 0.95F; - if (this.ac()) { + if (this.ad()) { for (int k = 0; k < 4; ++k) { float f3 = 0.25F; @@ -185,14 +185,14 @@ public void a(NBTTagCompound nbttagcompound) { this.j = nbttagcompound.c("inGround") == 1; } - public boolean n_() { + public boolean l_() { return true; } public boolean damageEntity(Entity entity, int i) { - this.ae(); + this.af(); if (entity != null) { - Vec3D vec3d = entity.Y(); + Vec3D vec3d = entity.Z(); if (vec3d != null) { this.motX = vec3d.a; diff --git a/net/minecraft/server/EntityFish.java b/net/minecraft/server/EntityFish.java index 391d400..e793a9e 100644 --- a/net/minecraft/server/EntityFish.java +++ b/net/minecraft/server/EntityFish.java @@ -25,12 +25,12 @@ public class EntityFish extends Entity { public EntityFish(World world) { super(world); this.b(0.25F, 0.25F); - this.bJ = true; + this.bK = true; } public EntityFish(World world, EntityHuman entityhuman) { super(world); - this.bJ = true; + this.bK = true; this.owner = entityhuman; this.owner.hookedFish = this; this.b(0.25F, 0.25F); @@ -72,8 +72,8 @@ public void a(double d0, double d1, double d2, float f, float f1) { this.i = 0; } - public void o_() { - super.o_(); + public void m_() { + super.m_(); if (this.l > 0) { double d0 = this.locX + (this.m - this.locX) / (double) this.l; double d1 = this.locY + (this.n - this.locY) / (double) this.l; @@ -96,9 +96,9 @@ public void o_() { this.c(this.yaw, this.pitch); } else { if (!this.world.isStatic) { - ItemStack itemstack = this.owner.F(); + ItemStack itemstack = this.owner.G(); - if (this.owner.dead || !this.owner.S() || itemstack == null || itemstack.getItem() != Item.FISHING_ROD || this.g(this.owner) > 1024.0D) { + if (this.owner.dead || !this.owner.T() || itemstack == null || itemstack.getItem() != Item.FISHING_ROD || this.g(this.owner) > 1024.0D) { this.die(); this.owner.hookedFish = null; return; @@ -161,7 +161,7 @@ public void o_() { for (int j = 0; j < list.size(); ++j) { Entity entity1 = (Entity) list.get(j); - if (entity1.n_() && (entity1 != this.owner || this.j >= 5)) { + if (entity1.l_() && (entity1 != this.owner || this.j >= 5)) { float f = 0.3F; AxisAlignedBB axisalignedbb = entity1.boundingBox.b((double) f, (double) f, (double) f); MovingObjectPosition movingobjectposition1 = axisalignedbb.a(vec3d, vec3d1); diff --git a/net/minecraft/server/EntityFlying.java b/net/minecraft/server/EntityFlying.java index c6e8785..ecc90e5 100644 --- a/net/minecraft/server/EntityFlying.java +++ b/net/minecraft/server/EntityFlying.java @@ -9,13 +9,13 @@ public EntityFlying(World world) { protected void a(float f) {} public void a(float f, float f1) { - if (this.ac()) { + if (this.ad()) { this.a(f, f1, 0.02F); this.move(this.motX, this.motY, this.motZ); this.motX *= 0.800000011920929D; this.motY *= 0.800000011920929D; this.motZ *= 0.800000011920929D; - } else if (this.ad()) { + } else if (this.ae()) { this.a(f, f1, 0.02F); this.move(this.motX, this.motY, this.motZ); this.motX *= 0.5D; diff --git a/net/minecraft/server/EntityGhast.java b/net/minecraft/server/EntityGhast.java index c021be5..6ab7808 100644 --- a/net/minecraft/server/EntityGhast.java +++ b/net/minecraft/server/EntityGhast.java @@ -23,8 +23,8 @@ protected void b() { this.datawatcher.a(16, Byte.valueOf((byte) 0)); } - public void o_() { - super.o_(); + public void m_() { + super.m_(); byte b0 = this.datawatcher.a(16); this.texture = b0 == 1 ? "/mob/ghast_fire.png" : "/mob/ghast.png"; @@ -35,7 +35,7 @@ protected void c_() { this.die(); } - this.T(); + this.U(); this.e = this.f; double d0 = this.b - this.locX; double d1 = this.c - this.locY; diff --git a/net/minecraft/server/EntityGiantZombie.java b/net/minecraft/server/EntityGiantZombie.java index 62eb617..2fc9917 100644 --- a/net/minecraft/server/EntityGiantZombie.java +++ b/net/minecraft/server/EntityGiantZombie.java @@ -13,6 +13,6 @@ public EntityGiantZombie(World world) { } protected float a(int i, int j, int k) { - return this.world.m(i, j, k) - 0.5F; + return this.world.n(i, j, k) - 0.5F; } } diff --git a/net/minecraft/server/EntityHuman.java b/net/minecraft/server/EntityHuman.java index 56f5548..f4d773c 100644 --- a/net/minecraft/server/EntityHuman.java +++ b/net/minecraft/server/EntityHuman.java @@ -55,7 +55,7 @@ protected void b() { this.datawatcher.a(16, Byte.valueOf((byte) 0)); } - public void o_() { + public void m_() { if (this.isSleeping()) { ++this.sleepTicks; if (this.sleepTicks > 100) { @@ -76,9 +76,9 @@ public void o_() { } } - super.o_(); + super.m_(); if (!this.world.isStatic && this.activeContainer != null && !this.activeContainer.b(this)) { - this.x(); + this.y(); this.activeContainer = this.defaultContainer; } @@ -123,20 +123,20 @@ public void o_() { } } - protected boolean C() { + protected boolean D() { return this.health <= 0 || this.isSleeping(); } - protected void x() { + protected void y() { this.activeContainer = this.defaultContainer; } - public void D() { + public void E() { double d0 = this.locX; double d1 = this.locY; double d2 = this.locZ; - super.D(); + super.E(); this.n = this.o; this.o = 0.0F; this.i(this.locX - d0, this.locY - d1, this.locZ - d2); @@ -156,14 +156,14 @@ protected void c_() { this.aa = (float) this.q / 8.0F; } - public void u() { + public void v() { if (this.world.spawnMonsters == 0 && this.health < 20 && this.ticksLived % 20 * 12 == 0) { this.b(1); } this.inventory.f(); this.n = this.o; - super.u(); + super.v(); float f = MathHelper.a(this.motX * this.motX + this.motZ * this.motZ); float f1 = (float) Math.atan(-this.motY * 0.20000000298023224D) * 15.0F; @@ -230,7 +230,7 @@ public void c(Entity entity, int i) { } } - public void E() { + public void F() { this.a(this.inventory.splitStack(this.inventory.itemInHandIndex, 1), false); } @@ -240,7 +240,7 @@ public void b(ItemStack itemstack) { public void a(ItemStack itemstack, boolean flag) { if (itemstack != null) { - EntityItem entityitem = new EntityItem(this.world, this.locX, this.locY - 0.30000001192092896D + (double) this.s(), this.locZ, itemstack); + EntityItem entityitem = new EntityItem(this.world, this.locX, this.locY - 0.30000001192092896D + (double) this.t(), this.locZ, itemstack); entityitem.pickupDelay = 40; float f = 0.1F; @@ -330,11 +330,11 @@ public void b(int i, int j, int k) {} public void receive(Entity entity, int i) {} - public float s() { + public float t() { return 0.12F; } - protected void j_() { + protected void s() { this.height = 1.62F; } @@ -380,7 +380,7 @@ public boolean damageEntity(Entity entity, int i) { } } - protected boolean t() { + protected boolean j_() { return false; } @@ -394,7 +394,7 @@ protected void a(EntityLiving entityliving, boolean flag) { } } - if (!(entityliving instanceof EntityHuman) || this.t()) { + if (!(entityliving instanceof EntityHuman) || this.j_()) { List list = this.world.a(EntityWolf.class, AxisAlignedBB.b(this.locX, this.locY, this.locZ, this.locX + 1.0D, this.locY + 1.0D, this.locZ + 1.0D).b(16.0D, 4.0D, 16.0D)); Iterator iterator = list.iterator(); @@ -402,7 +402,7 @@ protected void a(EntityLiving entityliving, boolean flag) { Entity entity = (Entity) iterator.next(); EntityWolf entitywolf1 = (EntityWolf) entity; - if (entitywolf1.isTamed() && entitywolf1.E() == null && this.name.equals(entitywolf1.getOwnerName()) && (!flag || !entitywolf1.isSitting())) { + if (entitywolf1.isTamed() && entitywolf1.F() == null && this.name.equals(entitywolf1.getOwnerName()) && (!flag || !entitywolf1.isSitting())) { entitywolf1.setSitting(false); entitywolf1.setTarget(entityliving); } @@ -429,31 +429,31 @@ public void a(TileEntitySign tileentitysign) {} public void c(Entity entity) { if (!entity.a(this)) { - ItemStack itemstack = this.F(); + ItemStack itemstack = this.G(); if (itemstack != null && entity instanceof EntityLiving) { itemstack.a((EntityLiving) entity); if (itemstack.count <= 0) { itemstack.a(this); - this.G(); + this.H(); } } } } - public ItemStack F() { + public ItemStack G() { return this.inventory.getItemInHand(); } - public void G() { + public void H() { this.inventory.setItem(this.inventory.itemInHandIndex, (ItemStack) null); } - public double H() { + public double I() { return (double) (this.height - 0.5F); } - public void k_() { + public void w() { this.q = -1; this.p = true; } @@ -467,18 +467,18 @@ public void d(Entity entity) { } entity.damageEntity(this, i); - ItemStack itemstack = this.F(); + ItemStack itemstack = this.G(); if (itemstack != null && entity instanceof EntityLiving) { itemstack.a((EntityLiving) entity, this); if (itemstack.count <= 0) { itemstack.a(this); - this.G(); + this.H(); } } if (entity instanceof EntityLiving) { - if (entity.S()) { + if (entity.T()) { this.a((EntityLiving) entity, true); } @@ -497,13 +497,13 @@ public void die() { } } - public boolean J() { - return !this.sleeping && super.J(); + public boolean K() { + return !this.sleeping && super.K(); } public EnumBedError a(int i, int j, int k) { if (!this.world.isStatic) { - if (this.isSleeping() || !this.S()) { + if (this.isSleeping() || !this.T()) { return EnumBedError.OTHER_PROBLEM; } @@ -585,13 +585,13 @@ private void e(int i) { public void a(boolean flag, boolean flag1, boolean flag2) { this.b(0.6F, 1.8F); - this.j_(); + this.s(); ChunkCoordinates chunkcoordinates = this.A; ChunkCoordinates chunkcoordinates1 = this.A; if (chunkcoordinates != null && this.world.getTypeId(chunkcoordinates.x, chunkcoordinates.y, chunkcoordinates.z) == Block.BED.id) { BlockBed.a(this.world, chunkcoordinates.x, chunkcoordinates.y, chunkcoordinates.z, false); - chunkcoordinates1 = BlockBed.g(this.world, chunkcoordinates.x, chunkcoordinates.y, chunkcoordinates.z, 0); + chunkcoordinates1 = BlockBed.f(this.world, chunkcoordinates.x, chunkcoordinates.y, chunkcoordinates.z, 0); if (chunkcoordinates1 == null) { chunkcoordinates1 = new ChunkCoordinates(chunkcoordinates.x, chunkcoordinates.y + 1, chunkcoordinates.z); } @@ -629,7 +629,7 @@ public static ChunkCoordinates getBed(World world, ChunkCoordinates chunkcoordin if (world.getTypeId(chunkcoordinates.x, chunkcoordinates.y, chunkcoordinates.z) != Block.BED.id) { return null; } else { - ChunkCoordinates chunkcoordinates1 = BlockBed.g(world, chunkcoordinates.x, chunkcoordinates.y, chunkcoordinates.z, 0); + ChunkCoordinates chunkcoordinates1 = BlockBed.f(world, chunkcoordinates.x, chunkcoordinates.y, chunkcoordinates.z, 0); return chunkcoordinates1; } @@ -663,8 +663,8 @@ public void a(Statistic statistic) { public void a(Statistic statistic, int i) {} - protected void N() { - super.N(); + protected void O() { + super.O(); this.a(StatisticList.u, 1); } @@ -686,7 +686,7 @@ private void h(double d0, double d1, double d2) { if (i > 0) { this.a(StatisticList.q, i); } - } else if (this.ac()) { + } else if (this.ad()) { i = Math.round(MathHelper.a(d0 * d0 + d2 * d2) * 100.0F); if (i > 0) { this.a(StatisticList.m, i); @@ -744,7 +744,7 @@ public void a(EntityLiving entityliving) { } } - public void O() { + public void P() { if (this.D > 0) { this.D = 10; } else { diff --git a/net/minecraft/server/EntityItem.java b/net/minecraft/server/EntityItem.java index 4fcffc8..7770e30 100644 --- a/net/minecraft/server/EntityItem.java +++ b/net/minecraft/server/EntityItem.java @@ -33,8 +33,8 @@ public EntityItem(World world) { protected void b() {} - public void o_() { - super.o_(); + public void m_() { + super.m_(); if (this.pickupDelay > 0) { --this.pickupDelay; } @@ -86,7 +86,7 @@ protected void burn(int i) { } public boolean damageEntity(Entity entity, int i) { - this.ae(); + this.af(); this.f -= i; if (this.f <= 0) { this.die(); diff --git a/net/minecraft/server/EntityLiving.java b/net/minecraft/server/EntityLiving.java index 06eecd8..b7ad41f 100644 --- a/net/minecraft/server/EntityLiving.java +++ b/net/minecraft/server/EntityLiving.java @@ -71,10 +71,10 @@ public EntityLiving(World world) { protected void b() {} public boolean e(Entity entity) { - return this.world.a(Vec3D.create(this.locX, this.locY + (double) this.s(), this.locZ), Vec3D.create(entity.locX, entity.locY + (double) entity.s(), entity.locZ)) == null; + return this.world.a(Vec3D.create(this.locX, this.locY + (double) this.t(), this.locZ), Vec3D.create(entity.locX, entity.locY + (double) entity.t(), entity.locZ)) == null; } - public boolean n_() { + public boolean l_() { return !this.dead; } @@ -82,7 +82,7 @@ public boolean d_() { return !this.dead; } - public float s() { + public float t() { return this.width * 0.85F; } @@ -90,7 +90,7 @@ public int e() { return 80; } - public void P() { + public void Q() { String s = this.g(); if (s != null) { @@ -98,15 +98,15 @@ public void P() { } } - public void Q() { + public void R() { this.Z = this.aa; - super.Q(); + super.R(); if (this.random.nextInt(1000) < this.a++) { this.a = -this.e(); - this.P(); + this.Q(); } - if (this.S() && this.J()) { + if (this.T() && this.K()) { this.damageEntity((Entity) null, 1); } @@ -116,7 +116,7 @@ public void Q() { int i; - if (this.S() && this.a(Material.WATER) && !this.b_()) { + if (this.T() && this.a(Material.WATER) && !this.b_()) { --this.airTicks; if (this.airTicks == -20) { this.airTicks = 0; @@ -153,7 +153,7 @@ public void Q() { if (this.health <= 0) { ++this.deathTicks; if (this.deathTicks > 20) { - this.W(); + this.X(); this.die(); for (i = 0; i < 20; ++i) { @@ -172,7 +172,7 @@ public void Q() { this.lastPitch = this.pitch; } - public void R() { + public void S() { for (int i = 0; i < 20; ++i) { double d0 = this.random.nextGaussian() * 0.02D; double d1 = this.random.nextGaussian() * 0.02D; @@ -183,15 +183,15 @@ public void R() { } } - public void D() { - super.D(); + public void E() { + super.E(); this.M = this.N; this.N = 0.0F; } - public void o_() { - super.o_(); - this.u(); + public void m_() { + super.m_(); + this.v(); double d0 = this.locX - this.lastX; double d1 = this.locZ - this.lastZ; float f = MathHelper.a(d0 * d0 + d1 * d1); @@ -330,7 +330,7 @@ public boolean damageEntity(Entity entity, int i) { this.af = 0.0F; if (flag) { this.world.a(this, (byte) 2); - this.ae(); + this.af(); if (entity != null) { double d0 = entity.locX - this.locX; @@ -408,13 +408,13 @@ public void die(Entity entity) { this.ak = true; if (!this.world.isStatic) { - this.r(); + this.q(); } this.world.a(this, (byte) 3); } - protected void r() { + protected void q() { int i = this.j(); if (i > 0) { @@ -449,7 +449,7 @@ protected void a(float f) { public void a(float f, float f1) { double d0; - if (this.ac()) { + if (this.ad()) { d0 = this.locY; this.a(f, f1, 0.02F); this.move(this.motX, this.motY, this.motZ); @@ -460,7 +460,7 @@ public void a(float f, float f1) { if (this.positionChanged && this.b(this.motX, this.motY + 0.6000000238418579D - this.locY + d0, this.motZ)) { this.motY = 0.30000001192092896D; } - } else if (this.ad()) { + } else if (this.ae()) { d0 = this.locY; this.a(f, f1, 0.02F); this.move(this.motX, this.motY, this.motZ); @@ -575,7 +575,7 @@ public void a(NBTTagCompound nbttagcompound) { this.attackTicks = nbttagcompound.d("AttackTime"); } - public boolean S() { + public boolean T() { return !this.dead && this.health > 0; } @@ -583,7 +583,7 @@ public boolean b_() { return false; } - public void u() { + public void v() { if (this.aq > 0) { double d0 = this.locX + (this.ar - this.locX) / (double) this.aq; double d1 = this.locY + (this.as - this.locY) / (double) this.aq; @@ -622,7 +622,7 @@ public void u() { } } - if (this.C()) { + if (this.D()) { this.aC = false; this.az = 0.0F; this.aA = 0.0F; @@ -631,8 +631,8 @@ public void u() { this.c_(); } - boolean flag = this.ac(); - boolean flag1 = this.ad(); + boolean flag = this.ad(); + boolean flag1 = this.ae(); if (this.aC) { if (flag) { @@ -640,7 +640,7 @@ public void u() { } else if (flag1) { this.motY += 0.03999999910593033D; } else if (this.onGround) { - this.N(); + this.O(); } } @@ -661,22 +661,22 @@ public void u() { } } - protected boolean C() { + protected boolean D() { return this.health <= 0; } - protected void N() { + protected void O() { this.motY = 0.41999998688697815D; } - protected boolean l_() { + protected boolean h_() { return true; } - protected void T() { + protected void U() { EntityHuman entityhuman = this.world.findNearbyPlayer(this, -1.0D); - if (this.l_() && entityhuman != null) { + if (this.h_() && entityhuman != null) { double d0 = entityhuman.locX - this.locX; double d1 = entityhuman.locY - this.locY; double d2 = entityhuman.locZ - this.locZ; @@ -700,7 +700,7 @@ protected void c_() { ++this.ay; EntityHuman entityhuman = this.world.findNearbyPlayer(this, -1.0D); - this.T(); + this.U(); this.az = 0.0F; this.aA = 0.0F; float f = 8.0F; @@ -716,7 +716,7 @@ protected void c_() { } if (this.b != null) { - this.a(this.b, 10.0F, (float) this.v()); + this.a(this.b, 10.0F, (float) this.u()); if (this.aF-- <= 0 || this.b.dead || this.b.g(this) > (double) (f * f)) { this.b = null; } @@ -729,15 +729,15 @@ protected void c_() { this.pitch = this.aD; } - boolean flag = this.ac(); - boolean flag1 = this.ad(); + boolean flag = this.ad(); + boolean flag1 = this.ae(); if (flag || flag1) { this.aC = this.random.nextFloat() < 0.8F; } } - protected int v() { + protected int u() { return 40; } @@ -749,9 +749,9 @@ public void a(Entity entity, float f, float f1) { if (entity instanceof EntityLiving) { EntityLiving entityliving = (EntityLiving) entity; - d2 = this.locY + (double) this.s() - (entityliving.locY + (double) entityliving.s()); + d2 = this.locY + (double) this.t() - (entityliving.locY + (double) entityliving.t()); } else { - d2 = (entity.boundingBox.b + entity.boundingBox.e) / 2.0D - (this.locY + (double) this.s()); + d2 = (entity.boundingBox.b + entity.boundingBox.e) / 2.0D - (this.locY + (double) this.t()); } double d3 = (double) MathHelper.a(d0 * d0 + d1 * d1); @@ -762,11 +762,11 @@ public void a(Entity entity, float f, float f1) { this.yaw = this.b(this.yaw, f2, f); } - public boolean U() { + public boolean V() { return this.b != null; } - public Entity V() { + public Entity W() { return this.b; } @@ -792,17 +792,17 @@ private float b(float f, float f1, float f2) { return f + f3; } - public void W() {} + public void X() {} public boolean d() { return this.world.containsEntity(this.boundingBox) && this.world.getEntities(this, this.boundingBox).size() == 0 && !this.world.c(this.boundingBox); } - protected void X() { + protected void Y() { this.damageEntity((Entity) null, 4); } - public Vec3D Y() { + public Vec3D Z() { return this.b(1.0F); } diff --git a/net/minecraft/server/EntityMinecart.java b/net/minecraft/server/EntityMinecart.java index fc8772f..6bb9ca6 100644 --- a/net/minecraft/server/EntityMinecart.java +++ b/net/minecraft/server/EntityMinecart.java @@ -71,7 +71,7 @@ public boolean damageEntity(Entity entity, int i) { if (!this.world.isStatic && !this.dead) { this.c = -this.c; this.b = 10; - this.ae(); + this.af(); this.damage += i * 10; if (this.damage > 40) { if (this.passenger != null) { @@ -122,7 +122,7 @@ public boolean damageEntity(Entity entity, int i) { } } - public boolean n_() { + public boolean l_() { return !this.dead; } @@ -157,7 +157,7 @@ public void die() { super.die(); } - public void o_() { + public void m_() { if (this.b > 0) { --this.b; } @@ -413,15 +413,15 @@ public void o_() { this.motX += this.motX / d20 * d21; this.motZ += this.motZ / d20 * d21; } else if (i1 == 1) { - if (this.world.d(i - 1, j, k)) { + if (this.world.e(i - 1, j, k)) { this.motX = 0.02D; - } else if (this.world.d(i + 1, j, k)) { + } else if (this.world.e(i + 1, j, k)) { this.motX = -0.02D; } } else if (i1 == 0) { - if (this.world.d(i, j, k - 1)) { + if (this.world.e(i, j, k - 1)) { this.motZ = 0.02D; - } else if (this.world.d(i, j, k + 1)) { + } else if (this.world.e(i, j, k + 1)) { this.motZ = -0.02D; } } diff --git a/net/minecraft/server/EntityMonster.java b/net/minecraft/server/EntityMonster.java index 97b0e56..e56a926 100644 --- a/net/minecraft/server/EntityMonster.java +++ b/net/minecraft/server/EntityMonster.java @@ -9,18 +9,18 @@ public EntityMonster(World world) { this.health = 20; } - public void u() { + public void v() { float f = this.c(1.0F); if (f > 0.5F) { this.ay += 2; } - super.u(); + super.v(); } - public void o_() { - super.o_(); + public void m_() { + super.m_(); if (!this.world.isStatic && this.world.spawnMonsters == 0) { this.die(); } @@ -56,7 +56,7 @@ protected void a(Entity entity, float f) { } protected float a(int i, int j, int k) { - return 0.5F - this.world.m(i, j, k); + return 0.5F - this.world.n(i, j, k); } public void b(NBTTagCompound nbttagcompound) { diff --git a/net/minecraft/server/EntityPainting.java b/net/minecraft/server/EntityPainting.java index 8ace2f2..0a841f3 100644 --- a/net/minecraft/server/EntityPainting.java +++ b/net/minecraft/server/EntityPainting.java @@ -112,7 +112,7 @@ private float c(int i) { return i == 32 ? 0.5F : (i == 64 ? 0.5F : 0.0F); } - public void o_() { + public void m_() { if (this.f++ == 100 && !this.world.isStatic) { this.f = 0; if (!this.h()) { @@ -180,14 +180,14 @@ public boolean h() { } } - public boolean n_() { + public boolean l_() { return true; } public boolean damageEntity(Entity entity, int i) { if (!this.dead && !this.world.isStatic) { this.die(); - this.ae(); + this.af(); this.world.addEntity(new EntityItem(this.world, this.locX, this.locY, this.locZ, new ItemStack(Item.PAINTING))); } diff --git a/net/minecraft/server/EntityPigZombie.java b/net/minecraft/server/EntityPigZombie.java index e7c5fa0..f9f9376 100644 --- a/net/minecraft/server/EntityPigZombie.java +++ b/net/minecraft/server/EntityPigZombie.java @@ -16,13 +16,13 @@ public EntityPigZombie(World world) { this.fireProof = true; } - public void o_() { + public void m_() { this.aE = this.target != null ? 0.95F : 0.5F; if (this.soundDelay > 0 && --this.soundDelay == 0) { this.world.makeSound(this, "mob.zombiepig.zpigangry", this.k() * 2.0F, ((this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F) * 1.8F); } - super.o_(); + super.m_(); } public boolean d() { @@ -43,8 +43,8 @@ protected Entity findTarget() { return this.angerLevel == 0 ? null : super.findTarget(); } - public void u() { - super.u(); + public void v() { + super.v(); } public boolean damageEntity(Entity entity, int i) { diff --git a/net/minecraft/server/EntityPlayer.java b/net/minecraft/server/EntityPlayer.java index c5597b3..cc6616c 100644 --- a/net/minecraft/server/EntityPlayer.java +++ b/net/minecraft/server/EntityPlayer.java @@ -14,10 +14,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public double e; public List chunkCoordIntPairQueue = new LinkedList(); public Set playerChunkCoordIntPairs = new HashSet(); - private int bK = -99999999; - private int bL = 60; - private ItemStack[] bM = new ItemStack[] { null, null, null, null, null}; - private int bN = 0; + private int bL = -99999999; + private int bM = 60; + private ItemStack[] bN = new ItemStack[] { null, null, null, null, null}; + private int bO = 0; public boolean h; public EntityPlayer(MinecraftServer minecraftserver, World world, String s, ItemInWorldManager iteminworldmanager) { @@ -53,33 +53,33 @@ public void syncInventory() { } public ItemStack[] getEquipment() { - return this.bM; + return this.bN; } - protected void j_() { + protected void s() { this.height = 0.0F; } - public float s() { + public float t() { return 1.62F; } - public void o_() { + public void m_() { this.itemInWorldManager.a(); - --this.bL; + --this.bM; this.activeContainer.a(); for (int i = 0; i < 5; ++i) { - ItemStack itemstack = this.b_(i); + ItemStack itemstack = this.c_(i); - if (itemstack != this.bM[i]) { + if (itemstack != this.bN[i]) { this.b.getTracker(this.dimension).a(this, new Packet5EntityEquipment(this.id, i, itemstack)); - this.bM[i] = itemstack; + this.bN[i] = itemstack; } } } - public ItemStack b_(int i) { + public ItemStack c_(int i) { return i == 0 ? this.inventory.getItemInHand() : this.inventory.armor[i - 1]; } @@ -88,7 +88,7 @@ public void die(Entity entity) { } public boolean damageEntity(Entity entity, int i) { - if (this.bL > 0) { + if (this.bM > 0) { return false; } else { if (!this.b.pvpMode) { @@ -109,7 +109,7 @@ public boolean damageEntity(Entity entity, int i) { } } - protected boolean t() { + protected boolean j_() { return this.b.pvpMode; } @@ -118,7 +118,7 @@ public void b(int i) { } public void a(boolean flag) { - super.o_(); + super.m_(); for (int i = 0; i < this.inventory.getSize(); ++i) { ItemStack itemstack = this.inventory.getItem(i); @@ -185,15 +185,15 @@ public void a(boolean flag) { --this.D; } - if (this.health != this.bK) { + if (this.health != this.bL) { this.netServerHandler.sendPacket(new Packet8UpdateHealth(this.health)); - this.bK = this.health; + this.bL = this.health; } } private void a(TileEntity tileentity) { if (tileentity != null) { - Packet packet = tileentity.e(); + Packet packet = tileentity.f(); if (packet != null) { this.netServerHandler.sendPacket(packet); @@ -201,8 +201,8 @@ private void a(TileEntity tileentity) { } } - public void u() { - super.u(); + public void v() { + super.v(); } public void receive(Entity entity, int i) { @@ -222,7 +222,7 @@ public void receive(Entity entity, int i) { this.activeContainer.a(); } - public void k_() { + public void w() { if (!this.p) { this.q = -1; this.p = true; @@ -232,7 +232,7 @@ public void k_() { } } - public void w() {} + public void x() {} public EnumBedError a(int i, int j, int k) { EnumBedError enumbederror = super.a(i, j, k); @@ -274,39 +274,39 @@ public void b(double d0, boolean flag) { super.a(d0, flag); } - private void ah() { - this.bN = this.bN % 100 + 1; + private void ai() { + this.bO = this.bO % 100 + 1; } public void b(int i, int j, int k) { - this.ah(); - this.netServerHandler.sendPacket(new Packet100OpenWindow(this.bN, 1, "Crafting", 9)); + this.ai(); + this.netServerHandler.sendPacket(new Packet100OpenWindow(this.bO, 1, "Crafting", 9)); this.activeContainer = new ContainerWorkbench(this.inventory, this.world, i, j, k); - this.activeContainer.windowId = this.bN; + this.activeContainer.windowId = this.bO; this.activeContainer.a((ICrafting) this); } public void a(IInventory iinventory) { - this.ah(); - this.netServerHandler.sendPacket(new Packet100OpenWindow(this.bN, 0, iinventory.getName(), iinventory.getSize())); + this.ai(); + this.netServerHandler.sendPacket(new Packet100OpenWindow(this.bO, 0, iinventory.getName(), iinventory.getSize())); this.activeContainer = new ContainerChest(this.inventory, iinventory); - this.activeContainer.windowId = this.bN; + this.activeContainer.windowId = this.bO; this.activeContainer.a((ICrafting) this); } public void a(TileEntityFurnace tileentityfurnace) { - this.ah(); - this.netServerHandler.sendPacket(new Packet100OpenWindow(this.bN, 2, tileentityfurnace.getName(), tileentityfurnace.getSize())); + this.ai(); + this.netServerHandler.sendPacket(new Packet100OpenWindow(this.bO, 2, tileentityfurnace.getName(), tileentityfurnace.getSize())); this.activeContainer = new ContainerFurnace(this.inventory, tileentityfurnace); - this.activeContainer.windowId = this.bN; + this.activeContainer.windowId = this.bO; this.activeContainer.a((ICrafting) this); } public void a(TileEntityDispenser tileentitydispenser) { - this.ah(); - this.netServerHandler.sendPacket(new Packet100OpenWindow(this.bN, 3, tileentitydispenser.getName(), tileentitydispenser.getSize())); + this.ai(); + this.netServerHandler.sendPacket(new Packet100OpenWindow(this.bO, 3, tileentitydispenser.getName(), tileentitydispenser.getSize())); this.activeContainer = new ContainerDispenser(this.inventory, tileentitydispenser); - this.activeContainer.windowId = this.bN; + this.activeContainer.windowId = this.bO; this.activeContainer.a((ICrafting) this); } @@ -333,18 +333,18 @@ public void a(Container container, int i, int j) { public void a(ItemStack itemstack) {} - public void x() { + public void y() { this.netServerHandler.sendPacket(new Packet101CloseWindow(this.activeContainer.windowId)); - this.z(); + this.A(); } - public void y() { + public void z() { if (!this.h) { this.netServerHandler.sendPacket(new Packet103SetSlot(-1, -1, this.inventory.j())); } } - public void z() { + public void A() { this.activeContainer.a((EntityHuman) this); this.activeContainer = this.defaultContainer; } @@ -371,7 +371,7 @@ public void a(Statistic statistic, int i) { } } - public void A() { + public void B() { if (this.vehicle != null) { this.mount(this.vehicle); } @@ -385,8 +385,8 @@ public void A() { } } - public void B() { - this.bK = -99999999; + public void C() { + this.bL = -99999999; } public void a(String s) { diff --git a/net/minecraft/server/EntitySheep.java b/net/minecraft/server/EntitySheep.java index df08c6f..31383fc 100644 --- a/net/minecraft/server/EntitySheep.java +++ b/net/minecraft/server/EntitySheep.java @@ -18,20 +18,40 @@ protected void b() { } public boolean damageEntity(Entity entity, int i) { - if (!this.world.isStatic && !this.isSheared() && entity instanceof EntityLiving) { - this.setSheared(true); - int j = 1 + this.random.nextInt(3); + return super.damageEntity(entity, i); + } + + protected void q() { + if (!this.isSheared()) { + this.a(new ItemStack(Block.WOOL.id, 1, this.getColor()), 0.0F); + } + } - for (int k = 0; k < j; ++k) { - EntityItem entityitem = this.a(new ItemStack(Block.WOOL.id, 1, this.getColor()), 1.0F); + protected int j() { + return Block.WOOL.id; + } - entityitem.motY += (double) (this.random.nextFloat() * 0.05F); - entityitem.motX += (double) ((this.random.nextFloat() - this.random.nextFloat()) * 0.1F); - entityitem.motZ += (double) ((this.random.nextFloat() - this.random.nextFloat()) * 0.1F); + public boolean a(EntityHuman entityhuman) { + ItemStack itemstack = entityhuman.inventory.getItemInHand(); + + if (itemstack.id == Item.SHEARS.id && !this.isSheared()) { + if (!this.world.isStatic) { + this.setSheared(true); + int i = 2 + this.random.nextInt(3); + + for (int j = 0; j < i; ++j) { + EntityItem entityitem = this.a(new ItemStack(Block.WOOL.id, 1, this.getColor()), 1.0F); + + entityitem.motY += (double) (this.random.nextFloat() * 0.05F); + entityitem.motX += (double) ((this.random.nextFloat() - this.random.nextFloat()) * 0.1F); + entityitem.motZ += (double) ((this.random.nextFloat() - this.random.nextFloat()) * 0.1F); + } } + + itemstack.damage(1, entityhuman); } - return super.damageEntity(entity, i); + return false; } public void b(NBTTagCompound nbttagcompound) { diff --git a/net/minecraft/server/EntitySkeleton.java b/net/minecraft/server/EntitySkeleton.java index 2c5e72e..4e22353 100644 --- a/net/minecraft/server/EntitySkeleton.java +++ b/net/minecraft/server/EntitySkeleton.java @@ -21,7 +21,7 @@ protected String i() { return "mob.skeletonhurt"; } - public void u() { + public void v() { if (this.world.d()) { float f = this.c(1.0F); @@ -30,7 +30,7 @@ public void u() { } } - super.u(); + super.v(); } protected void a(Entity entity, float f) { @@ -42,7 +42,7 @@ protected void a(Entity entity, float f) { EntityArrow entityarrow = new EntityArrow(this.world, this); ++entityarrow.locY; - double d2 = entity.locY + (double) entity.s() - 0.20000000298023224D - entityarrow.locY; + double d2 = entity.locY + (double) entity.t() - 0.20000000298023224D - entityarrow.locY; float f1 = MathHelper.a(d0 * d0 + d1 * d1) * 0.2F; this.world.makeSound(this, "random.bow", 1.0F, 1.0F / (this.random.nextFloat() * 0.4F + 0.8F)); @@ -68,7 +68,7 @@ protected int j() { return Item.ARROW.id; } - protected void r() { + protected void q() { int i = this.random.nextInt(3); int j; diff --git a/net/minecraft/server/EntitySlime.java b/net/minecraft/server/EntitySlime.java index 128c2b0..4583297 100644 --- a/net/minecraft/server/EntitySlime.java +++ b/net/minecraft/server/EntitySlime.java @@ -42,11 +42,11 @@ public void a(NBTTagCompound nbttagcompound) { this.setSize(nbttagcompound.e("Size") + 1); } - public void o_() { + public void m_() { this.b = this.a; boolean flag = this.onGround; - super.o_(); + super.m_(); if (this.onGround && !flag) { int i = this.getSize(); @@ -70,7 +70,7 @@ public void o_() { } protected void c_() { - this.T(); + this.U(); EntityHuman entityhuman = this.world.findNearbyPlayer(this, 16.0D); if (entityhuman != null) { diff --git a/net/minecraft/server/EntitySnowball.java b/net/minecraft/server/EntitySnowball.java index af21227..e866307 100644 --- a/net/minecraft/server/EntitySnowball.java +++ b/net/minecraft/server/EntitySnowball.java @@ -25,7 +25,7 @@ public EntitySnowball(World world, EntityLiving entityliving) { super(world); this.shooter = entityliving; this.b(0.25F, 0.25F); - this.setPositionRotation(entityliving.locX, entityliving.locY + (double) entityliving.s(), entityliving.locZ, entityliving.yaw, entityliving.pitch); + this.setPositionRotation(entityliving.locX, entityliving.locY + (double) entityliving.t(), entityliving.locZ, entityliving.yaw, entityliving.pitch); this.locX -= (double) (MathHelper.cos(this.yaw / 180.0F * 3.1415927F) * 0.16F); this.locY -= 0.10000000149011612D; this.locZ -= (double) (MathHelper.sin(this.yaw / 180.0F * 3.1415927F) * 0.16F); @@ -69,11 +69,11 @@ public void a(double d0, double d1, double d2, float f, float f1) { this.h = 0; } - public void o_() { + public void m_() { this.bo = this.locX; this.bp = this.locY; this.bq = this.locZ; - super.o_(); + super.m_(); if (this.a > 0) { --this.a; } @@ -118,7 +118,7 @@ public void o_() { for (int j = 0; j < list.size(); ++j) { Entity entity1 = (Entity) list.get(j); - if (entity1.n_() && (entity1 != this.shooter || this.i >= 5)) { + if (entity1.l_() && (entity1 != this.shooter || this.i >= 5)) { float f = 0.3F; AxisAlignedBB axisalignedbb = entity1.boundingBox.b((double) f, (double) f, (double) f); MovingObjectPosition movingobjectposition1 = axisalignedbb.a(vec3d, vec3d1); @@ -179,7 +179,7 @@ public void o_() { float f2 = 0.99F; float f3 = 0.03F; - if (this.ac()) { + if (this.ad()) { for (int l = 0; l < 4; ++l) { float f4 = 0.25F; diff --git a/net/minecraft/server/EntitySquid.java b/net/minecraft/server/EntitySquid.java index 82b01eb..11f6995 100644 --- a/net/minecraft/server/EntitySquid.java +++ b/net/minecraft/server/EntitySquid.java @@ -52,7 +52,7 @@ protected int j() { return 0; } - protected void r() { + protected void q() { int i = this.random.nextInt(3) + 1; for (int j = 0; j < i; ++j) { @@ -64,12 +64,12 @@ public boolean a(EntityHuman entityhuman) { return false; } - public boolean ac() { + public boolean ad() { return this.world.a(this.boundingBox.b(0.0D, -0.6000000238418579D, 0.0D), Material.WATER, this); } - public void u() { - super.u(); + public void v() { + super.v(); this.b = this.a; this.f = this.c; this.h = this.g; @@ -82,7 +82,7 @@ public void u() { } } - if (this.ac()) { + if (this.ad()) { float f; if (this.g < 3.1415927F) { @@ -136,5 +136,7 @@ protected void c_() { this.o = -0.1F + this.random.nextFloat() * 0.2F; this.p = MathHelper.sin(f) * 0.2F; } + + this.U(); } } diff --git a/net/minecraft/server/EntityTNTPrimed.java b/net/minecraft/server/EntityTNTPrimed.java index c4a8863..e15afd7 100644 --- a/net/minecraft/server/EntityTNTPrimed.java +++ b/net/minecraft/server/EntityTNTPrimed.java @@ -32,11 +32,11 @@ protected boolean n() { return false; } - public boolean n_() { + public boolean l_() { return !this.dead; } - public void o_() { + public void m_() { this.lastX = this.locX; this.lastY = this.locY; this.lastZ = this.locZ; diff --git a/net/minecraft/server/EntityTrackerEntry.java b/net/minecraft/server/EntityTrackerEntry.java index 7837f19..c6b8680 100644 --- a/net/minecraft/server/EntityTrackerEntry.java +++ b/net/minecraft/server/EntityTrackerEntry.java @@ -108,7 +108,7 @@ public void track(List list) { this.a((Packet) object); } - DataWatcher datawatcher = this.tracker.Z(); + DataWatcher datawatcher = this.tracker.aa(); if (datawatcher.a()) { this.b((Packet) (new Packet40EntityMetadata(this.tracker.id, datawatcher))); diff --git a/net/minecraft/server/EntityWeatherStorm.java b/net/minecraft/server/EntityWeatherStorm.java index 1740fe0..cf735bd 100644 --- a/net/minecraft/server/EntityWeatherStorm.java +++ b/net/minecraft/server/EntityWeatherStorm.java @@ -35,8 +35,8 @@ public EntityWeatherStorm(World world, double d0, double d1, double d2) { } } - public void o_() { - super.o_(); + public void m_() { + super.m_(); if (this.lifeTicks == 2) { this.world.makeSound(this.locX, this.locY, this.locZ, "ambient.weather.thunder", 10000.0F, 0.8F + this.random.nextFloat() * 0.2F); this.world.makeSound(this.locX, this.locY, this.locZ, "random.explode", 2.0F, 0.5F + this.random.nextFloat() * 0.2F); diff --git a/net/minecraft/server/EntityWolf.java b/net/minecraft/server/EntityWolf.java index 453b918..eb52c93 100644 --- a/net/minecraft/server/EntityWolf.java +++ b/net/minecraft/server/EntityWolf.java @@ -55,7 +55,7 @@ public void a(NBTTagCompound nbttagcompound) { } } - protected boolean l_() { + protected boolean h_() { return !this.isTamed(); } @@ -81,7 +81,7 @@ protected int j() { protected void c_() { super.c_(); - if (!this.e && !this.B() && this.isTamed() && this.vehicle == null) { + if (!this.e && !this.C() && this.isTamed() && this.vehicle == null) { EntityHuman entityhuman = this.world.a(this.getOwnerName()); if (entityhuman != null) { @@ -90,10 +90,10 @@ protected void c_() { if (f > 5.0F) { this.c(entityhuman, f); } - } else if (!this.ac()) { + } else if (!this.ad()) { this.setSitting(true); } - } else if (this.target == null && !this.B() && !this.isTamed() && this.world.random.nextInt(100) == 0) { + } else if (this.target == null && !this.C() && !this.isTamed() && this.world.random.nextInt(100) == 0) { List list = this.world.a(EntitySheep.class, AxisAlignedBB.b(this.locX, this.locY, this.locZ, this.locX + 1.0D, this.locY + 1.0D, this.locZ + 1.0D).b(16.0D, 4.0D, 16.0D)); if (!list.isEmpty()) { @@ -101,7 +101,7 @@ protected void c_() { } } - if (this.ac()) { + if (this.ad()) { this.setSitting(false); } @@ -110,11 +110,11 @@ protected void c_() { } } - public void u() { - super.u(); + public void v() { + super.v(); this.a = false; - if (this.U() && !this.B() && !this.isAngry()) { - Entity entity = this.V(); + if (this.V() && !this.C() && !this.isAngry()) { + Entity entity = this.W(); if (entity instanceof EntityHuman) { EntityHuman entityhuman = (EntityHuman) entity; @@ -130,7 +130,7 @@ public void u() { } } - if (!this.Y && this.f && !this.g && !this.B() && this.onGround) { + if (!this.Y && this.f && !this.g && !this.C() && this.onGround) { this.g = true; this.h = 0.0F; this.i = 0.0F; @@ -138,8 +138,8 @@ public void u() { } } - public void o_() { - super.o_(); + public void m_() { + super.m_(); this.c = this.b; if (this.a) { this.b += (1.0F - this.b) * 0.4F; @@ -151,7 +151,7 @@ public void o_() { this.aF = 10; } - if (this.ab()) { + if (this.ac()) { this.f = true; this.g = false; this.h = 0.0F; @@ -184,12 +184,12 @@ public void o_() { } } - public float s() { + public float t() { return this.width * 0.8F; } - protected int v() { - return this.isSitting() ? 20 : super.v(); + protected int u() { + return this.isSitting() ? 20 : super.u(); } private void c(Entity entity, float f) { @@ -202,7 +202,7 @@ private void c(Entity entity, float f) { for (int l = 0; l <= 4; ++l) { for (int i1 = 0; i1 <= 4; ++i1) { - if ((l < 1 || i1 < 1 || l > 3 || i1 > 3) && this.world.d(i + l, k - 1, j + i1) && !this.world.d(i + l, k, j + i1) && !this.world.d(i + l, k + 1, j + i1)) { + if ((l < 1 || i1 < 1 || l > 3 || i1 > 3) && this.world.e(i + l, k - 1, j + i1) && !this.world.e(i + l, k, j + i1) && !this.world.e(i + l, k + 1, j + i1)) { this.setPositionRotation((double) ((float) (i + l) + 0.5F), (double) k, (double) ((float) (j + i1) + 0.5F), this.yaw, this.pitch); return; } diff --git a/net/minecraft/server/EntityZombie.java b/net/minecraft/server/EntityZombie.java index afa2d60..90f1843 100644 --- a/net/minecraft/server/EntityZombie.java +++ b/net/minecraft/server/EntityZombie.java @@ -9,7 +9,7 @@ public EntityZombie(World world) { this.damage = 5; } - public void u() { + public void v() { if (this.world.d()) { float f = this.c(1.0F); @@ -18,7 +18,7 @@ public void u() { } } - super.u(); + super.v(); } protected String g() { diff --git a/net/minecraft/server/IBlockAccess.java b/net/minecraft/server/IBlockAccess.java index 99e32ea..9f9073c 100644 --- a/net/minecraft/server/IBlockAccess.java +++ b/net/minecraft/server/IBlockAccess.java @@ -4,9 +4,11 @@ public interface IBlockAccess { int getTypeId(int i, int j, int k); + TileEntity getTileEntity(int i, int j, int k); + int getData(int i, int j, int k); Material getMaterial(int i, int j, int k); - boolean d(int i, int j, int k); + boolean e(int i, int j, int k); } diff --git a/net/minecraft/server/InventoryPlayer.java b/net/minecraft/server/InventoryPlayer.java index 137f074..d6b4513 100644 --- a/net/minecraft/server/InventoryPlayer.java +++ b/net/minecraft/server/InventoryPlayer.java @@ -258,7 +258,7 @@ public int a(Entity entity) { } public boolean b(Block block) { - if (block.material != Material.STONE && block.material != Material.ORE && block.material != Material.SNOW_BLOCK && block.material != Material.SNOW_LAYER) { + if (block.material.i()) { return true; } else { ItemStack itemstack = this.getItem(this.itemInHandIndex); @@ -280,7 +280,7 @@ public int g() { j += k1; k += i1; - int l1 = ((ItemArmor) this.armor[l].getItem()).bk; + int l1 = ((ItemArmor) this.armor[l].getItem()).bl; i += l1; } diff --git a/net/minecraft/server/Item.java b/net/minecraft/server/Item.java index 4be2c01..b67fe18 100644 --- a/net/minecraft/server/Item.java +++ b/net/minecraft/server/Item.java @@ -109,14 +109,15 @@ public class Item { public static Item DIODE = (new ItemReed(100, Block.DIODE_OFF)).a(6, 5).a("diode"); public static Item COOKIE = (new ItemCookie(101, 1, false, 8)).a(12, 5).a("cookie"); public static ItemWorldMap MAP = (ItemWorldMap) (new ItemWorldMap(102)).a(12, 3).a("map"); + public static ItemShears SHEARS = (ItemShears) (new ItemShears(103)).a(13, 5).a("shears"); public static Item GOLD_RECORD = (new ItemRecord(2000, "13")).a(0, 15).a("record"); public static Item GREEN_RECORD = (new ItemRecord(2001, "cat")).a(1, 15).a("record"); public final int id; protected int maxStackSize = 64; private int durability = 0; protected int textureId; - protected boolean bh = false; protected boolean bi = false; + protected boolean bj = false; private Item craftingResult = null; private String name; @@ -165,11 +166,11 @@ public int filterData(int i) { } public boolean d() { - return this.bi; + return this.bj; } protected Item a(boolean flag) { - this.bi = flag; + this.bj = flag; return this; } @@ -183,7 +184,7 @@ protected Item d(int i) { } public boolean f() { - return this.durability > 0 && !this.bi; + return this.durability > 0 && !this.bj; } public boolean a(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) { @@ -205,7 +206,7 @@ public boolean a(Block block) { public void a(ItemStack itemstack, EntityLiving entityliving) {} public Item g() { - this.bh = true; + this.bi = true; return this; } diff --git a/net/minecraft/server/ItemArmor.java b/net/minecraft/server/ItemArmor.java index b04ef18..b88dfc5 100644 --- a/net/minecraft/server/ItemArmor.java +++ b/net/minecraft/server/ItemArmor.java @@ -2,20 +2,20 @@ public class ItemArmor extends Item { - private static final int[] bm = new int[] { 3, 8, 6, 3}; - private static final int[] bn = new int[] { 11, 16, 15, 13}; + private static final int[] bn = new int[] { 3, 8, 6, 3}; + private static final int[] bo = new int[] { 11, 16, 15, 13}; public final int a; - public final int bj; public final int bk; public final int bl; + public final int bm; public ItemArmor(int i, int j, int k, int l) { super(i); this.a = j; - this.bj = l; - this.bl = k; - this.bk = bm[l]; - this.d(bn[l] * 3 << j); + this.bk = l; + this.bm = k; + this.bl = bn[l]; + this.d(bo[l] * 3 << j); this.maxStackSize = 1; } } diff --git a/net/minecraft/server/ItemAxe.java b/net/minecraft/server/ItemAxe.java index b72dea9..72b8627 100644 --- a/net/minecraft/server/ItemAxe.java +++ b/net/minecraft/server/ItemAxe.java @@ -2,9 +2,9 @@ public class ItemAxe extends ItemTool { - private static Block[] bj = new Block[] { Block.WOOD, Block.BOOKSHELF, Block.LOG, Block.CHEST}; + private static Block[] bk = new Block[] { Block.WOOD, Block.BOOKSHELF, Block.LOG, Block.CHEST}; protected ItemAxe(int i, EnumToolMaterial enumtoolmaterial) { - super(i, 3, enumtoolmaterial, bj); + super(i, 3, enumtoolmaterial, bk); } } diff --git a/net/minecraft/server/ItemBed.java b/net/minecraft/server/ItemBed.java index 7904eb9..b170c54 100644 --- a/net/minecraft/server/ItemBed.java +++ b/net/minecraft/server/ItemBed.java @@ -32,7 +32,7 @@ public boolean a(ItemStack itemstack, EntityHuman entityhuman, World world, int b0 = 1; } - if (world.isEmpty(i, j, k) && world.isEmpty(i + b0, j, k + b1) && world.d(i, j - 1, k) && world.d(i + b0, j - 1, k + b1)) { + if (world.isEmpty(i, j, k) && world.isEmpty(i + b0, j, k + b1) && world.e(i, j - 1, k) && world.e(i + b0, j - 1, k + b1)) { world.setTypeIdAndData(i, j, k, blockbed.id, i1); world.setTypeIdAndData(i + b0, j, k + b1, blockbed.id, i1 + 8); --itemstack.count; diff --git a/net/minecraft/server/ItemBlock.java b/net/minecraft/server/ItemBlock.java index ecd7b4d..e7d7da1 100644 --- a/net/minecraft/server/ItemBlock.java +++ b/net/minecraft/server/ItemBlock.java @@ -60,6 +60,6 @@ public boolean a(ItemStack itemstack, EntityHuman entityhuman, World world, int } public String a() { - return Block.byId[this.id].h(); + return Block.byId[this.id].l(); } } diff --git a/net/minecraft/server/ItemDoor.java b/net/minecraft/server/ItemDoor.java index 1ca1b76..78fd9b1 100644 --- a/net/minecraft/server/ItemDoor.java +++ b/net/minecraft/server/ItemDoor.java @@ -46,8 +46,8 @@ public boolean a(ItemStack itemstack, EntityHuman entityhuman, World world, int b0 = 1; } - int j1 = (world.d(i - b0, j, k - b1) ? 1 : 0) + (world.d(i - b0, j + 1, k - b1) ? 1 : 0); - int k1 = (world.d(i + b0, j, k + b1) ? 1 : 0) + (world.d(i + b0, j + 1, k + b1) ? 1 : 0); + int j1 = (world.e(i - b0, j, k - b1) ? 1 : 0) + (world.e(i - b0, j + 1, k - b1) ? 1 : 0); + int k1 = (world.e(i + b0, j, k + b1) ? 1 : 0) + (world.e(i + b0, j + 1, k + b1) ? 1 : 0); boolean flag = world.getTypeId(i - b0, j, k - b1) == block.id || world.getTypeId(i - b0, j + 1, k - b1) == block.id; boolean flag1 = world.getTypeId(i + b0, j, k + b1) == block.id || world.getTypeId(i + b0, j + 1, k + b1) == block.id; boolean flag2 = false; diff --git a/net/minecraft/server/ItemDye.java b/net/minecraft/server/ItemDye.java index 7153b58..5b87a6d 100644 --- a/net/minecraft/server/ItemDye.java +++ b/net/minecraft/server/ItemDye.java @@ -3,6 +3,7 @@ public class ItemDye extends Item { public static final String[] a = new String[] { "black", "red", "green", "brown", "blue", "purple", "cyan", "silver", "gray", "pink", "lime", "yellow", "lightBlue", "magenta", "orange", "white"}; + public static final int[] bk = new int[] { 1973019, 11743532, 3887386, 5320730, 2437522, 8073150, 2651799, 2651799, 4408131, 14188952, 4312372, 14602026, 6719955, 12801229, 15435844, 15790320}; public ItemDye(int i) { super(i); @@ -46,7 +47,7 @@ public boolean a(ItemStack itemstack, EntityHuman entityhuman, World world, int k1 += b.nextInt(3) - 1; l1 += (b.nextInt(3) - 1) * b.nextInt(3) / 2; i2 += b.nextInt(3) - 1; - if (world.getTypeId(k1, l1 - 1, i2) != Block.GRASS.id || world.d(k1, l1, i2)) { + if (world.getTypeId(k1, l1 - 1, i2) != Block.GRASS.id || world.e(k1, l1, i2)) { continue label53; } } diff --git a/net/minecraft/server/ItemFishingRod.java b/net/minecraft/server/ItemFishingRod.java index 8c8dafb..6dd083d 100644 --- a/net/minecraft/server/ItemFishingRod.java +++ b/net/minecraft/server/ItemFishingRod.java @@ -13,14 +13,14 @@ public ItemStack a(ItemStack itemstack, World world, EntityHuman entityhuman) { int i = entityhuman.hookedFish.h(); itemstack.damage(i, entityhuman); - entityhuman.k_(); + entityhuman.w(); } else { world.makeSound(entityhuman, "random.bow", 0.5F, 0.4F / (b.nextFloat() * 0.4F + 0.8F)); if (!world.isStatic) { world.addEntity(new EntityFish(world, entityhuman)); } - entityhuman.k_(); + entityhuman.w(); } return itemstack; diff --git a/net/minecraft/server/ItemFood.java b/net/minecraft/server/ItemFood.java index b77842b..e40cf54 100644 --- a/net/minecraft/server/ItemFood.java +++ b/net/minecraft/server/ItemFood.java @@ -3,12 +3,12 @@ public class ItemFood extends Item { private int a; - private boolean bj; + private boolean bk; public ItemFood(int i, int j, boolean flag) { super(i); this.a = j; - this.bj = flag; + this.bk = flag; this.maxStackSize = 1; } @@ -23,6 +23,6 @@ public int k() { } public boolean l() { - return this.bj; + return this.bk; } } diff --git a/net/minecraft/server/ItemInWorldManager.java b/net/minecraft/server/ItemInWorldManager.java index d07748e..5e84ab1 100644 --- a/net/minecraft/server/ItemInWorldManager.java +++ b/net/minecraft/server/ItemInWorldManager.java @@ -100,13 +100,13 @@ public boolean c(int i, int j, int k) { this.world.a(this.player, 2001, i, j, k, l + this.world.getData(i, j, k) * 256); boolean flag = this.b(i, j, k); - ItemStack itemstack = this.player.F(); + ItemStack itemstack = this.player.G(); if (itemstack != null) { itemstack.a(l, i, j, k, this.player); if (itemstack.count == 0) { itemstack.a(this.player); - this.player.G(); + this.player.H(); } } diff --git a/net/minecraft/server/ItemLeaves.java b/net/minecraft/server/ItemLeaves.java new file mode 100644 index 0000000..5b3f6a5 --- /dev/null +++ b/net/minecraft/server/ItemLeaves.java @@ -0,0 +1,14 @@ +package net.minecraft.server; + +public class ItemLeaves extends ItemBlock { + + public ItemLeaves(int i) { + super(i); + this.d(0); + this.a(true); + } + + public int filterData(int i) { + return i | 8; + } +} diff --git a/net/minecraft/server/ItemPickaxe.java b/net/minecraft/server/ItemPickaxe.java index b77cc9d..8c51b36 100644 --- a/net/minecraft/server/ItemPickaxe.java +++ b/net/minecraft/server/ItemPickaxe.java @@ -2,10 +2,10 @@ public class ItemPickaxe extends ItemTool { - private static Block[] bj = new Block[] { Block.COBBLESTONE, Block.DOUBLE_STEP, Block.STEP, Block.STONE, Block.SANDSTONE, Block.MOSSY_COBBLESTONE, Block.IRON_ORE, Block.IRON_BLOCK, Block.COAL_ORE, Block.GOLD_BLOCK, Block.GOLD_ORE, Block.DIAMOND_ORE, Block.DIAMOND_BLOCK, Block.ICE, Block.NETHERRACK, Block.LAPIS_ORE, Block.LAPIS_BLOCK}; + private static Block[] bk = new Block[] { Block.COBBLESTONE, Block.DOUBLE_STEP, Block.STEP, Block.STONE, Block.SANDSTONE, Block.MOSSY_COBBLESTONE, Block.IRON_ORE, Block.IRON_BLOCK, Block.COAL_ORE, Block.GOLD_BLOCK, Block.GOLD_ORE, Block.DIAMOND_ORE, Block.DIAMOND_BLOCK, Block.ICE, Block.NETHERRACK, Block.LAPIS_ORE, Block.LAPIS_BLOCK}; protected ItemPickaxe(int i, EnumToolMaterial enumtoolmaterial) { - super(i, 2, enumtoolmaterial, bj); + super(i, 2, enumtoolmaterial, bk); } public boolean a(Block block) { diff --git a/net/minecraft/server/ItemPiston.java b/net/minecraft/server/ItemPiston.java new file mode 100644 index 0000000..e94826e --- /dev/null +++ b/net/minecraft/server/ItemPiston.java @@ -0,0 +1,12 @@ +package net.minecraft.server; + +public class ItemPiston extends ItemBlock { + + public ItemPiston(int i) { + super(i); + } + + public int filterData(int i) { + return 7; + } +} diff --git a/net/minecraft/server/ItemRecord.java b/net/minecraft/server/ItemRecord.java index 98e75c9..8fc7615 100644 --- a/net/minecraft/server/ItemRecord.java +++ b/net/minecraft/server/ItemRecord.java @@ -15,7 +15,7 @@ public boolean a(ItemStack itemstack, EntityHuman entityhuman, World world, int if (world.isStatic) { return true; } else { - ((BlockJukeBox) Block.JUKEBOX).a_(world, i, j, k, this.id); + ((BlockJukeBox) Block.JUKEBOX).f(world, i, j, k, this.id); world.a((EntityHuman) null, 1005, i, j, k, this.id); --itemstack.count; return true; diff --git a/net/minecraft/server/ItemShears.java b/net/minecraft/server/ItemShears.java new file mode 100644 index 0000000..16f25c6 --- /dev/null +++ b/net/minecraft/server/ItemShears.java @@ -0,0 +1,26 @@ +package net.minecraft.server; + +public class ItemShears extends Item { + + public ItemShears(int i) { + super(i); + this.c(1); + this.d(789); + } + + public boolean a(ItemStack itemstack, int i, int j, int k, int l, EntityLiving entityliving) { + if (i == Block.LEAVES.id || i == Block.WEB.id) { + itemstack.damage(1, entityliving); + } + + return super.a(itemstack, i, j, k, l, entityliving); + } + + public boolean a(Block block) { + return block.id == Block.WEB.id; + } + + public float a(ItemStack itemstack, Block block) { + return block.id != Block.WEB.id && block.id != Block.LEAVES.id ? (block.id == Block.WOOL.id ? 5.0F : super.a(itemstack, block)) : 15.0F; + } +} diff --git a/net/minecraft/server/ItemSpade.java b/net/minecraft/server/ItemSpade.java index b20f4c6..ccd0c60 100644 --- a/net/minecraft/server/ItemSpade.java +++ b/net/minecraft/server/ItemSpade.java @@ -2,10 +2,10 @@ public class ItemSpade extends ItemTool { - private static Block[] bj = new Block[] { Block.GRASS, Block.DIRT, Block.SAND, Block.GRAVEL, Block.SNOW, Block.SNOW_BLOCK, Block.CLAY, Block.SOIL}; + private static Block[] bk = new Block[] { Block.GRASS, Block.DIRT, Block.SAND, Block.GRAVEL, Block.SNOW, Block.SNOW_BLOCK, Block.CLAY, Block.SOIL}; public ItemSpade(int i, EnumToolMaterial enumtoolmaterial) { - super(i, 1, enumtoolmaterial, bj); + super(i, 1, enumtoolmaterial, bk); } public boolean a(Block block) { diff --git a/net/minecraft/server/ItemSword.java b/net/minecraft/server/ItemSword.java index 0ee4349..4c47bfd 100644 --- a/net/minecraft/server/ItemSword.java +++ b/net/minecraft/server/ItemSword.java @@ -12,7 +12,7 @@ public ItemSword(int i, EnumToolMaterial enumtoolmaterial) { } public float a(ItemStack itemstack, Block block) { - return 1.5F; + return block.id == Block.WEB.id ? 15.0F : 1.5F; } public boolean a(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) { @@ -28,4 +28,8 @@ public boolean a(ItemStack itemstack, int i, int j, int k, int l, EntityLiving e public int a(Entity entity) { return this.a; } + + public boolean a(Block block) { + return block.id == Block.WEB.id; + } } diff --git a/net/minecraft/server/ItemTool.java b/net/minecraft/server/ItemTool.java index 3c17b4b..a33e75e 100644 --- a/net/minecraft/server/ItemTool.java +++ b/net/minecraft/server/ItemTool.java @@ -2,25 +2,25 @@ public class ItemTool extends Item { - private Block[] bj; - private float bk = 4.0F; - private int bl; + private Block[] bk; + private float bl = 4.0F; + private int bm; protected EnumToolMaterial a; protected ItemTool(int i, int j, EnumToolMaterial enumtoolmaterial, Block[] ablock) { super(i); this.a = enumtoolmaterial; - this.bj = ablock; + this.bk = ablock; this.maxStackSize = 1; this.d(enumtoolmaterial.a()); - this.bk = enumtoolmaterial.b(); - this.bl = j + enumtoolmaterial.c(); + this.bl = enumtoolmaterial.b(); + this.bm = j + enumtoolmaterial.c(); } public float a(ItemStack itemstack, Block block) { - for (int i = 0; i < this.bj.length; ++i) { - if (this.bj[i] == block) { - return this.bk; + for (int i = 0; i < this.bk.length; ++i) { + if (this.bk[i] == block) { + return this.bl; } } @@ -38,6 +38,6 @@ public boolean a(ItemStack itemstack, int i, int j, int k, int l, EntityLiving e } public int a(Entity entity) { - return this.bl; + return this.bm; } } diff --git a/net/minecraft/server/ItemWorldMap.java b/net/minecraft/server/ItemWorldMap.java index a791e47..3e2d9d3 100644 --- a/net/minecraft/server/ItemWorldMap.java +++ b/net/minecraft/server/ItemWorldMap.java @@ -95,7 +95,7 @@ public void a(World world, Entity entity, WorldMap worldmap) { j5 = chunk.getTypeId(l4 + k3, k4 - 1, j4 + l3); if (j5 == 0) { flag1 = false; - } else if (k4 > 0 && j5 > 0 && Block.byId[j5].material.A == MaterialMapColor.b) { + } else if (k4 > 0 && j5 > 0 && Block.byId[j5].material.C == MaterialMapColor.b) { flag1 = false; } @@ -152,7 +152,7 @@ public void a(World world, Entity entity, WorldMap worldmap) { i5 = 0; if (j4 > 0) { - MaterialMapColor materialmapcolor = Block.byId[j4].material.A; + MaterialMapColor materialmapcolor = Block.byId[j4].material.C; if (materialmapcolor == MaterialMapColor.n) { d2 = (double) i4 * 0.1D + (double) (k1 + j2 & 1) * 0.2D; diff --git a/net/minecraft/server/Material.java b/net/minecraft/server/Material.java index 46a48ad..d525b3d 100644 --- a/net/minecraft/server/Material.java +++ b/net/minecraft/server/Material.java @@ -5,36 +5,40 @@ public class Material { public static final Material AIR = new MaterialTransparent(MaterialMapColor.b); public static final Material GRASS = new Material(MaterialMapColor.c); public static final Material EARTH = new Material(MaterialMapColor.l); - public static final Material WOOD = (new Material(MaterialMapColor.o)).j(); - public static final Material STONE = new Material(MaterialMapColor.m); - public static final Material ORE = new Material(MaterialMapColor.h); - public static final Material WATER = new MaterialLiquid(MaterialMapColor.n); - public static final Material LAVA = new MaterialLiquid(MaterialMapColor.f); - public static final Material LEAVES = (new Material(MaterialMapColor.i)).j().i(); - public static final Material PLANT = new MaterialLogic(MaterialMapColor.i); + public static final Material WOOD = (new Material(MaterialMapColor.o)).o(); + public static final Material STONE = (new Material(MaterialMapColor.m)).n(); + public static final Material ORE = (new Material(MaterialMapColor.h)).n(); + public static final Material WATER = (new MaterialLiquid(MaterialMapColor.n)).k(); + public static final Material LAVA = (new MaterialLiquid(MaterialMapColor.f)).k(); + public static final Material LEAVES = (new Material(MaterialMapColor.i)).o().m().k(); + public static final Material PLANT = (new MaterialLogic(MaterialMapColor.i)).k(); public static final Material SPONGE = new Material(MaterialMapColor.e); - public static final Material CLOTH = (new Material(MaterialMapColor.e)).j(); - public static final Material FIRE = new MaterialTransparent(MaterialMapColor.b); + public static final Material CLOTH = (new Material(MaterialMapColor.e)).o(); + public static final Material FIRE = (new MaterialTransparent(MaterialMapColor.b)).k(); public static final Material SAND = new Material(MaterialMapColor.d); - public static final Material ORIENTABLE = new MaterialLogic(MaterialMapColor.b); - public static final Material SHATTERABLE = (new Material(MaterialMapColor.b)).i(); - public static final Material TNT = (new Material(MaterialMapColor.f)).j().i(); - public static final Material CORAL = new Material(MaterialMapColor.i); - public static final Material ICE = (new Material(MaterialMapColor.g)).i(); - public static final Material SNOW_LAYER = (new MaterialLogic(MaterialMapColor.j)).f().i(); - public static final Material SNOW_BLOCK = new Material(MaterialMapColor.j); - public static final Material CACTUS = (new Material(MaterialMapColor.i)).i(); + public static final Material ORIENTABLE = (new MaterialLogic(MaterialMapColor.b)).k(); + public static final Material SHATTERABLE = (new Material(MaterialMapColor.b)).m(); + public static final Material TNT = (new Material(MaterialMapColor.f)).o().m(); + public static final Material CORAL = (new Material(MaterialMapColor.i)).k(); + public static final Material ICE = (new Material(MaterialMapColor.g)).m(); + public static final Material SNOW_LAYER = (new MaterialLogic(MaterialMapColor.j)).f().m().n().k(); + public static final Material SNOW_BLOCK = (new Material(MaterialMapColor.j)).n(); + public static final Material CACTUS = (new Material(MaterialMapColor.i)).m().k(); public static final Material CLAY = new Material(MaterialMapColor.k); - public static final Material PUMPKIN = new Material(MaterialMapColor.i); - public static final Material PORTAL = new MaterialPortal(MaterialMapColor.b); - public static final Material CAKE = new Material(MaterialMapColor.b); + public static final Material PUMPKIN = (new Material(MaterialMapColor.i)).k(); + public static final Material PORTAL = (new MaterialPortal(MaterialMapColor.b)).l(); + public static final Material CAKE = (new Material(MaterialMapColor.b)).k(); + public static final Material WEB = (new Material(MaterialMapColor.e)).n().k(); + public static final Material PISTON = (new Material(MaterialMapColor.m)).l(); private boolean canBurn; - private boolean C; - private boolean D; - public final MaterialMapColor A; + private boolean E; + private boolean F; + public final MaterialMapColor C; + private boolean G = true; + private int H; public Material(MaterialMapColor materialmapcolor) { - this.A = materialmapcolor; + this.C = materialmapcolor; } public boolean isLiquid() { @@ -53,12 +57,17 @@ public boolean isSolid() { return true; } - private Material i() { - this.D = true; + private Material m() { + this.F = true; return this; } - private Material j() { + private Material n() { + this.G = false; + return this; + } + + private Material o() { this.canBurn = true; return this; } @@ -68,15 +77,33 @@ public boolean isBurnable() { } public Material f() { - this.C = true; + this.E = true; return this; } public boolean isReplacable() { - return this.C; + return this.E; } public boolean h() { - return this.D ? false : this.isSolid(); + return this.F ? false : this.isSolid(); + } + + public boolean i() { + return this.G; + } + + public int j() { + return this.H; + } + + protected Material k() { + this.H = 1; + return this; + } + + protected Material l() { + this.H = 2; + return this; } } diff --git a/net/minecraft/server/MaterialLiquid.java b/net/minecraft/server/MaterialLiquid.java index c3d5732..1670104 100644 --- a/net/minecraft/server/MaterialLiquid.java +++ b/net/minecraft/server/MaterialLiquid.java @@ -5,6 +5,7 @@ public class MaterialLiquid extends Material { public MaterialLiquid(MaterialMapColor materialmapcolor) { super(materialmapcolor); this.f(); + this.k(); } public boolean isLiquid() { diff --git a/net/minecraft/server/MetadataChunkBlock.java b/net/minecraft/server/MetadataChunkBlock.java index 3314b2a..17cd406 100644 --- a/net/minecraft/server/MetadataChunkBlock.java +++ b/net/minecraft/server/MetadataChunkBlock.java @@ -79,7 +79,7 @@ public void a(World world) { int k3 = 0; if (this.a == EnumSkyBlock.SKY) { - if (world.l(k1, k2, l1)) { + if (world.m(k1, k2, l1)) { k3 = 15; } } else if (this.a == EnumSkyBlock.BLOCK) { diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java index ccc931d..493917d 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -46,7 +46,7 @@ private boolean init() { threadcommandreader.setDaemon(true); threadcommandreader.start(); ConsoleLogManager.init(); - log.info("Starting minecraft server version Beta 1.6.6"); + log.info("Starting minecraft server version Beta 1.7 PRERELEASE"); if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) { log.warning("**** NOT ENOUGH RAM!"); log.warning("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\""); diff --git a/net/minecraft/server/NetServerHandler.java b/net/minecraft/server/NetServerHandler.java index 81fdc3d..6334145 100644 --- a/net/minecraft/server/NetServerHandler.java +++ b/net/minecraft/server/NetServerHandler.java @@ -39,7 +39,7 @@ public void a() { } public void disconnect(String s) { - this.player.A(); + this.player.B(); this.sendPacket(new Packet255KickDisconnect(s)); this.networkManager.d(); this.minecraftServer.serverConfigurationManager.sendAll(new Packet3Chat("\u00A7e" + this.player.name + " left the game.")); @@ -237,7 +237,7 @@ public void a(Packet14BlockDig packet14blockdig) { WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension); if (packet14blockdig.e == 4) { - this.player.E(); + this.player.F(); } else { boolean flag = worldserver.weirdIsOpCache = worldserver.worldProvider.dimension != 0 || this.minecraftServer.serverConfigurationManager.isOp(this.player.name); boolean flag1 = false; @@ -458,7 +458,7 @@ private void handleCommand(String s) { public void a(Packet18ArmAnimation packet18armanimation) { if (packet18armanimation.b == 1) { - this.player.k_(); + this.player.w(); } } @@ -509,7 +509,7 @@ public void a(Packet9Respawn packet9respawn) { } public void a(Packet101CloseWindow packet101closewindow) { - this.player.z(); + this.player.A(); } public void a(Packet102WindowClick packet102windowclick) { @@ -520,7 +520,7 @@ public void a(Packet102WindowClick packet102windowclick) { this.player.netServerHandler.sendPacket(new Packet106Transaction(packet102windowclick.a, packet102windowclick.d, true)); this.player.h = true; this.player.activeContainer.a(); - this.player.y(); + this.player.z(); this.player.h = false; } else { this.n.put(Integer.valueOf(this.player.activeContainer.windowId), Short.valueOf(packet102windowclick.d)); diff --git a/net/minecraft/server/Packet24MobSpawn.java b/net/minecraft/server/Packet24MobSpawn.java index 8fb0891..01dd8fc 100644 --- a/net/minecraft/server/Packet24MobSpawn.java +++ b/net/minecraft/server/Packet24MobSpawn.java @@ -26,7 +26,7 @@ public Packet24MobSpawn(EntityLiving entityliving) { this.e = MathHelper.floor(entityliving.locZ * 32.0D); this.f = (byte) ((int) (entityliving.yaw * 256.0F / 360.0F)); this.g = (byte) ((int) (entityliving.pitch * 256.0F / 360.0F)); - this.h = entityliving.Z(); + this.h = entityliving.aa(); } public void a(DataInputStream datainputstream) { diff --git a/net/minecraft/server/PistonBlockTextures.java b/net/minecraft/server/PistonBlockTextures.java new file mode 100644 index 0000000..1d2b290 --- /dev/null +++ b/net/minecraft/server/PistonBlockTextures.java @@ -0,0 +1,11 @@ +package net.minecraft.server; + +public class PistonBlockTextures { + + public static final int[] a = new int[] { 1, 0, 3, 2, 5, 4}; + public static final int[] b = new int[] { 0, 0, 0, 0, -1, 1}; + public static final int[] c = new int[] { -1, 1, 0, 0, 0, 0}; + public static final int[] d = new int[] { 0, 0, -1, 1, 0, 0}; + + public PistonBlockTextures() {} +} diff --git a/net/minecraft/server/PlayerInstance.java b/net/minecraft/server/PlayerInstance.java index aa28d26..fdc6385 100644 --- a/net/minecraft/server/PlayerInstance.java +++ b/net/minecraft/server/PlayerInstance.java @@ -174,7 +174,7 @@ public void a() { private void sendTileEntity(TileEntity tileentity) { if (tileentity != null) { - Packet packet = tileentity.e(); + Packet packet = tileentity.f(); if (packet != null) { this.sendAll(packet); diff --git a/net/minecraft/server/RecipesTools.java b/net/minecraft/server/RecipesTools.java index bb6df36..27fcd58 100644 --- a/net/minecraft/server/RecipesTools.java +++ b/net/minecraft/server/RecipesTools.java @@ -19,5 +19,7 @@ public void a(CraftingManager craftingmanager) { craftingmanager.registerShapedRecipe(new ItemStack(item), new Object[] { this.a[j], Character.valueOf('#'), Item.STICK, Character.valueOf('X'), object}); } } + + craftingmanager.registerShapedRecipe(new ItemStack(Item.SHEARS), new Object[] { " #", "# ", Character.valueOf('#'), Item.IRON_INGOT}); } } diff --git a/net/minecraft/server/ServerConfigurationManager.java b/net/minecraft/server/ServerConfigurationManager.java index ecdd5f6..44c8127 100644 --- a/net/minecraft/server/ServerConfigurationManager.java +++ b/net/minecraft/server/ServerConfigurationManager.java @@ -173,7 +173,7 @@ public EntityPlayer moveToWorld(EntityPlayer entityplayer, int i) { worldserver.addEntity(entityplayer1); this.players.add(entityplayer1); entityplayer1.syncInventory(); - entityplayer1.w(); + entityplayer1.x(); return entityplayer1; } @@ -202,19 +202,19 @@ public void f(EntityPlayer entityplayer) { d0 /= d2; d1 /= d2; entityplayer.setPositionRotation(d0, entityplayer.locY, d1, entityplayer.yaw, entityplayer.pitch); - if (entityplayer.S()) { + if (entityplayer.T()) { worldserver.entityJoinedWorld(entityplayer, false); } } else { d0 *= d2; d1 *= d2; entityplayer.setPositionRotation(d0, entityplayer.locY, d1, entityplayer.yaw, entityplayer.pitch); - if (entityplayer.S()) { + if (entityplayer.T()) { worldserver.entityJoinedWorld(entityplayer, false); } } - if (entityplayer.S()) { + if (entityplayer.T()) { worldserver1.addEntity(entityplayer); entityplayer.setPositionRotation(d0, entityplayer.locY, d1, entityplayer.yaw, entityplayer.pitch); worldserver1.entityJoinedWorld(entityplayer, false); @@ -541,6 +541,6 @@ public void a(EntityPlayer entityplayer, WorldServer worldserver) { public void updateClient(EntityPlayer entityplayer) { entityplayer.updateInventory(entityplayer.defaultContainer); - entityplayer.B(); + entityplayer.C(); } } diff --git a/net/minecraft/server/SlotArmor.java b/net/minecraft/server/SlotArmor.java index 38715e6..4883a7e 100644 --- a/net/minecraft/server/SlotArmor.java +++ b/net/minecraft/server/SlotArmor.java @@ -17,6 +17,6 @@ public int d() { } public boolean isAllowed(ItemStack itemstack) { - return itemstack.getItem() instanceof ItemArmor ? ((ItemArmor) itemstack.getItem()).bj == this.d : (itemstack.getItem().id == Block.PUMPKIN.id ? this.d == 0 : false); + return itemstack.getItem() instanceof ItemArmor ? ((ItemArmor) itemstack.getItem()).bk == this.d : (itemstack.getItem().id == Block.PUMPKIN.id ? this.d == 0 : false); } } diff --git a/net/minecraft/server/SpawnerCreature.java b/net/minecraft/server/SpawnerCreature.java index f7252a5..132c649 100644 --- a/net/minecraft/server/SpawnerCreature.java +++ b/net/minecraft/server/SpawnerCreature.java @@ -90,7 +90,7 @@ public static final int spawnEntities(World world, boolean flag, boolean flag1) int j2 = chunkposition.y; int k2 = chunkposition.z; - if (!world.d(i2, j2, k2) && world.getMaterial(i2, j2, k2) == enumcreaturetype.c()) { + if (!world.e(i2, j2, k2) && world.getMaterial(i2, j2, k2) == enumcreaturetype.c()) { int l2 = 0; for (int i3 = 0; i3 < 3; ++i3) { @@ -151,7 +151,7 @@ public static final int spawnEntities(World world, boolean flag, boolean flag1) } private static boolean a(EnumCreatureType enumcreaturetype, World world, int i, int j, int k) { - return enumcreaturetype.c() == Material.WATER ? world.getMaterial(i, j, k).isLiquid() && !world.d(i, j + 1, k) : world.d(i, j - 1, k) && !world.d(i, j, k) && !world.getMaterial(i, j, k).isLiquid() && !world.d(i, j + 1, k); + return enumcreaturetype.c() == Material.WATER ? world.getMaterial(i, j, k).isLiquid() && !world.e(i, j + 1, k) : world.e(i, j - 1, k) && !world.e(i, j, k) && !world.getMaterial(i, j, k).isLiquid() && !world.e(i, j + 1, k); } private static void a(EntityLiving entityliving, World world, float f, float f1, float f2) { @@ -193,7 +193,7 @@ public static boolean a(World world, List list) { int j1; - for (j1 = l; j1 > 2 && !world.d(j, j1 - 1, k); --j1) { + for (j1 = l; j1 > 2 && !world.e(j, j1 - 1, k); --j1) { ; } @@ -223,7 +223,7 @@ public static boolean a(World world, List list) { PathPoint pathpoint = pathentity.c(); if (Math.abs((double) pathpoint.a - entityhuman.locX) < 1.5D && Math.abs((double) pathpoint.c - entityhuman.locZ) < 1.5D && Math.abs((double) pathpoint.b - entityhuman.locY) < 1.5D) { - ChunkCoordinates chunkcoordinates = BlockBed.g(world, MathHelper.floor(entityhuman.locX), MathHelper.floor(entityhuman.locY), MathHelper.floor(entityhuman.locZ), 1); + ChunkCoordinates chunkcoordinates = BlockBed.f(world, MathHelper.floor(entityhuman.locX), MathHelper.floor(entityhuman.locY), MathHelper.floor(entityhuman.locZ), 1); if (chunkcoordinates == null) { chunkcoordinates = new ChunkCoordinates(j, j1 + 1, k); @@ -233,7 +233,7 @@ public static boolean a(World world, List list) { world.addEntity(entityliving); a(entityliving, world, (float) chunkcoordinates.x + 0.5F, (float) chunkcoordinates.y, (float) chunkcoordinates.z + 0.5F); entityhuman.a(true, false, false); - entityliving.P(); + entityliving.Q(); flag = true; flag1 = true; } diff --git a/net/minecraft/server/StatisticList.java b/net/minecraft/server/StatisticList.java index d49f530..3a36e70 100644 --- a/net/minecraft/server/StatisticList.java +++ b/net/minecraft/server/StatisticList.java @@ -102,8 +102,8 @@ private static Statistic[] a(String s, int i) { Statistic[] astatistic = new Statistic[256]; for (int j = 0; j < 256; ++j) { - if (Block.byId[j] != null && Block.byId[j].i()) { - String s1 = StatisticCollector.a(s, new Object[] { Block.byId[j].g()}); + if (Block.byId[j] != null && Block.byId[j].m()) { + String s1 = StatisticCollector.a(s, new Object[] { Block.byId[j].k()}); astatistic[j] = (new CraftingStatistic(i + j, s1, j)).d(); e.add((CraftingStatistic) astatistic[j]); diff --git a/net/minecraft/server/TileEntity.java b/net/minecraft/server/TileEntity.java index 783c3b5..64f1f3c 100644 --- a/net/minecraft/server/TileEntity.java +++ b/net/minecraft/server/TileEntity.java @@ -11,6 +11,7 @@ public class TileEntity { public int x; public int y; public int z; + protected boolean h; public TileEntity() {} @@ -66,16 +67,32 @@ public static TileEntity c(NBTTagCompound nbttagcompound) { return tileentity; } + public int e() { + return this.world.getData(this.x, this.y, this.z); + } + public void update() { if (this.world != null) { this.world.b(this.x, this.y, this.z, this); } } - public Packet e() { + public Packet f() { return null; } + public boolean g() { + return this.h; + } + + public void h() { + this.h = true; + } + + public void j() { + this.h = false; + } + static { a(TileEntityFurnace.class, "Furnace"); a(TileEntityChest.class, "Chest"); @@ -84,5 +101,6 @@ public Packet e() { a(TileEntitySign.class, "Sign"); a(TileEntityMobSpawner.class, "MobSpawner"); a(TileEntityNote.class, "Music"); + a(TileEntityPiston.class, "Piston"); } } diff --git a/net/minecraft/server/TileEntityMobSpawner.java b/net/minecraft/server/TileEntityMobSpawner.java index f20625c..71b9d87 100644 --- a/net/minecraft/server/TileEntityMobSpawner.java +++ b/net/minecraft/server/TileEntityMobSpawner.java @@ -33,13 +33,16 @@ public void g_() { this.b -= 360.0D; } - if (this.spawnDelay == -1) { - this.c(); - } + if (!this.world.isStatic) { + if (this.spawnDelay == -1) { + this.c(); + } + + if (this.spawnDelay > 0) { + --this.spawnDelay; + return; + } - if (this.spawnDelay > 0) { - --this.spawnDelay; - } else { byte b0 = 4; for (int i = 0; i < b0; ++i) { @@ -73,14 +76,14 @@ public void g_() { this.world.a("flame", d0, d1, d2, 0.0D, 0.0D, 0.0D); } - entityliving.R(); + entityliving.S(); this.c(); } } } - - super.g_(); } + + super.g_(); } } diff --git a/net/minecraft/server/TileEntityPiston.java b/net/minecraft/server/TileEntityPiston.java new file mode 100644 index 0000000..412039e --- /dev/null +++ b/net/minecraft/server/TileEntityPiston.java @@ -0,0 +1,124 @@ +package net.minecraft.server; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +public class TileEntityPiston extends TileEntity { + + private int a; + private int b; + private int c; + private boolean i; + private boolean j; + private float k; + private float l; + private static List m = new ArrayList(); + + public TileEntityPiston() {} + + public TileEntityPiston(int i, int j, int k, boolean flag, boolean flag1) { + this.a = i; + this.b = j; + this.c = k; + this.i = flag; + this.j = flag1; + } + + public int a() { + return this.a; + } + + public int e() { + return this.b; + } + + public boolean c() { + return this.i; + } + + public int d() { + return this.c; + } + + public float a(float f) { + if (f > 1.0F) { + f = 1.0F; + } + + return this.l + (this.k - this.l) * f; + } + + private void a(float f, float f1) { + if (!this.i) { + --f; + } else { + f = 1.0F - f; + } + + AxisAlignedBB axisalignedbb = Block.PISTON_MOVING.a(this.world, this.x, this.y, this.z, this.a, f, this.c); + + if (axisalignedbb != null) { + List list = this.world.b((Entity) null, axisalignedbb); + + if (!list.isEmpty()) { + m.addAll(list); + Iterator iterator = m.iterator(); + + while (iterator.hasNext()) { + Entity entity = (Entity) iterator.next(); + + entity.move((double) (f1 * (float) PistonBlockTextures.b[this.c]), (double) (f1 * (float) PistonBlockTextures.c[this.c]), (double) (f1 * (float) PistonBlockTextures.d[this.c])); + } + + m.clear(); + } + } + } + + public void k() { + if (this.l < 1.0F) { + this.l = this.k = 1.0F; + this.world.o(this.x, this.y, this.z); + this.h(); + this.world.setTypeIdAndData(this.x, this.y, this.z, this.a, this.b); + } + } + + public void g_() { + this.l = this.k; + if (this.l >= 1.0F) { + this.a(1.0F, 0.25F); + this.world.o(this.x, this.y, this.z); + this.h(); + this.world.setTypeIdAndData(this.x, this.y, this.z, this.a, this.b); + } else { + this.k += 0.5F; + if (this.k >= 1.0F) { + this.k = 1.0F; + } + + if (this.i) { + this.a(this.k, this.k - this.l + 0.0625F); + } + } + } + + public void a(NBTTagCompound nbttagcompound) { + super.a(nbttagcompound); + this.a = nbttagcompound.e("blockId"); + this.b = nbttagcompound.e("blockData"); + this.c = nbttagcompound.e("facing"); + this.l = this.k = nbttagcompound.g("progress"); + this.i = nbttagcompound.m("extending"); + } + + public void b(NBTTagCompound nbttagcompound) { + super.b(nbttagcompound); + nbttagcompound.a("blockId", this.a); + nbttagcompound.a("blockData", this.b); + nbttagcompound.a("facing", this.c); + nbttagcompound.a("progress", this.l); + nbttagcompound.a("extending", this.i); + } +} diff --git a/net/minecraft/server/TileEntitySign.java b/net/minecraft/server/TileEntitySign.java index abeb26e..e9d68ac 100644 --- a/net/minecraft/server/TileEntitySign.java +++ b/net/minecraft/server/TileEntitySign.java @@ -28,7 +28,7 @@ public void a(NBTTagCompound nbttagcompound) { } } - public Packet e() { + public Packet f() { String[] astring = new String[4]; for (int i = 0; i < 4; ++i) { diff --git a/net/minecraft/server/World.java b/net/minecraft/server/World.java index 7091448..098895d 100644 --- a/net/minecraft/server/World.java +++ b/net/minecraft/server/World.java @@ -1,6 +1,7 @@ package net.minecraft.server; import java.util.ArrayList; +import java.util.Collection; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -17,12 +18,13 @@ public class World implements IBlockAccess { private TreeSet E = new TreeSet(); private Set F = new HashSet(); public List c = new ArrayList(); + private List G = new ArrayList(); public List players = new ArrayList(); public List e = new ArrayList(); - private long G = 16777215L; + private long H = 16777215L; public int f = 0; protected int g = (new Random()).nextInt(); - protected int h = 1013904223; + protected final int h = 1013904223; protected float i; protected float j; protected float k; @@ -30,7 +32,7 @@ public class World implements IBlockAccess { protected int m = 0; public int n = 0; public boolean suppressPhysics = false; - private long H = System.currentTimeMillis(); + private long I = System.currentTimeMillis(); protected int p = 40; public int spawnMonsters; public Random random = new Random(); @@ -41,16 +43,17 @@ public class World implements IBlockAccess { protected final IDataManager w; protected WorldData worldData; public boolean isLoading; - private boolean I; + private boolean J; public WorldMapCollection worldMaps; - private ArrayList J = new ArrayList(); - private int K = 0; + private ArrayList K = new ArrayList(); + private boolean L; + private int M = 0; private boolean allowMonsters = true; private boolean allowAnimals = true; static int A = 0; - private Set N = new HashSet(); - private int O; - private List P; + private Set P = new HashSet(); + private int Q; + private List R; public boolean isStatic; public WorldChunkManager getWorldChunkManager() { @@ -58,8 +61,8 @@ public WorldChunkManager getWorldChunkManager() { } public World(IDataManager idatamanager, String s, long i, WorldProvider worldprovider) { - this.O = this.random.nextInt(12000); - this.P = new ArrayList(); + this.Q = this.random.nextInt(12000); + this.R = new ArrayList(); this.isStatic = false; this.w = idatamanager; this.worldMaps = new WorldMapCollection(idatamanager); @@ -322,7 +325,7 @@ public void g(int i, int j, int k, int l) { this.b(i, k, j, i, l, j); } - public void h(int i, int j, int k) { + public void i(int i, int j, int k) { for (int l = 0; l < this.u.size(); ++l) { ((IWorldAccess) this.u.get(l)).a(i, j, k, i, j, k); } @@ -357,7 +360,7 @@ public boolean isChunkLoaded(int i, int j, int k) { return this.getChunkAt(i >> 4, k >> 4).c(i & 15, j, k & 15); } - public int j(int i, int j, int k) { + public int k(int i, int j, int k) { if (j < 0) { return 0; } else { @@ -423,7 +426,7 @@ public int a(int i, int j, int k, boolean flag) { } } - public boolean l(int i, int j, int k) { + public boolean m(int i, int j, int k) { if (i >= -32000000 && k >= -32000000 && i < 32000000 && k <= 32000000) { if (j < 0) { return false; @@ -461,7 +464,7 @@ public void a(EnumSkyBlock enumskyblock, int i, int j, int k, int l) { if (!this.worldProvider.e || enumskyblock != EnumSkyBlock.SKY) { if (this.isLoaded(i, j, k)) { if (enumskyblock == EnumSkyBlock.SKY) { - if (this.l(i, j, k)) { + if (this.m(i, j, k)) { l = 15; } } else if (enumskyblock == EnumSkyBlock.BLOCK) { @@ -522,7 +525,7 @@ public void b(EnumSkyBlock enumskyblock, int i, int j, int k, int l) { } } - public float m(int i, int j, int k) { + public float n(int i, int j, int k) { return this.worldProvider.f[this.getLightLevel(i, j, k)]; } @@ -787,10 +790,10 @@ public void removeEntity(Entity entity) { this.everyoneSleeping(); } - int i = entity.bG; - int j = entity.bI; + int i = entity.bH; + int j = entity.bJ; - if (entity.bF && this.isChunkLoaded(i, j)) { + if (entity.bG && this.isChunkLoaded(i, j)) { this.getChunkAt(i, j).b(entity); } @@ -803,7 +806,7 @@ public void addIWorldAccess(IWorldAccess iworldaccess) { } public List getEntities(Entity entity, AxisAlignedBB axisalignedbb) { - this.J.clear(); + this.K.clear(); int i = MathHelper.floor(axisalignedbb.a); int j = MathHelper.floor(axisalignedbb.d + 1.0D); int k = MathHelper.floor(axisalignedbb.b); @@ -818,7 +821,7 @@ public List getEntities(Entity entity, AxisAlignedBB axisalignedbb) { Block block = Block.byId[this.getTypeId(k1, i2, l1)]; if (block != null) { - block.a(this, k1, i2, l1, axisalignedbb, this.J); + block.a(this, k1, i2, l1, axisalignedbb, this.K); } } } @@ -832,16 +835,16 @@ public List getEntities(Entity entity, AxisAlignedBB axisalignedbb) { AxisAlignedBB axisalignedbb1 = ((Entity) list.get(j2)).e_(); if (axisalignedbb1 != null && axisalignedbb1.a(axisalignedbb)) { - this.J.add(axisalignedbb1); + this.K.add(axisalignedbb1); } axisalignedbb1 = entity.a_((Entity) list.get(j2)); if (axisalignedbb1 != null && axisalignedbb1.a(axisalignedbb)) { - this.J.add(axisalignedbb1); + this.K.add(axisalignedbb1); } } - return this.J; + return this.K; } public int a(float f) { @@ -934,7 +937,7 @@ public void cleanUp() { for (i = 0; i < this.e.size(); ++i) { entity = (Entity) this.e.get(i); - entity.o_(); + entity.m_(); if (entity.dead) { this.e.remove(i--); } @@ -947,9 +950,9 @@ public void cleanUp() { for (i = 0; i < this.D.size(); ++i) { entity = (Entity) this.D.get(i); - j = entity.bG; - k = entity.bI; - if (entity.bF && this.isChunkLoaded(j, k)) { + j = entity.bH; + k = entity.bJ; + if (entity.bG && this.isChunkLoaded(j, k)) { this.getChunkAt(j, k).b(entity); } } @@ -976,9 +979,9 @@ public void cleanUp() { } if (entity.dead) { - j = entity.bG; - k = entity.bI; - if (entity.bF && this.isChunkLoaded(j, k)) { + j = entity.bH; + k = entity.bJ; + if (entity.bG && this.isChunkLoaded(j, k)) { this.getChunkAt(j, k).b(entity); } @@ -987,10 +990,57 @@ public void cleanUp() { } } - for (i = 0; i < this.c.size(); ++i) { - TileEntity tileentity = (TileEntity) this.c.get(i); + this.L = true; + Iterator iterator = this.c.iterator(); - tileentity.g_(); + while (iterator.hasNext()) { + TileEntity tileentity = (TileEntity) iterator.next(); + + if (!tileentity.g()) { + tileentity.g_(); + } + + if (tileentity.g()) { + iterator.remove(); + Chunk chunk = this.getChunkAt(tileentity.x >> 4, tileentity.z >> 4); + + if (chunk != null) { + chunk.e(tileentity.x & 15, tileentity.y, tileentity.z & 15); + } + } + } + + this.L = false; + if (!this.G.isEmpty()) { + Iterator iterator1 = this.G.iterator(); + + while (iterator1.hasNext()) { + TileEntity tileentity1 = (TileEntity) iterator1.next(); + + if (!tileentity1.g()) { + if (!this.c.contains(tileentity1)) { + this.c.add(tileentity1); + } + + Chunk chunk1 = this.getChunkAt(tileentity1.x >> 4, tileentity1.z >> 4); + + if (chunk1 != null) { + chunk1.a(tileentity1.x & 15, tileentity1.y, tileentity1.z & 15, tileentity1); + } + + this.notify(tileentity1.x, tileentity1.y, tileentity1.z); + } + } + + this.G.clear(); + } + } + + public void a(Collection collection) { + if (this.L) { + this.G.addAll(collection); + } else { + this.c.addAll(collection); } } @@ -1009,11 +1059,11 @@ public void entityJoinedWorld(Entity entity, boolean flag) { entity.bq = entity.locZ; entity.lastYaw = entity.yaw; entity.lastPitch = entity.pitch; - if (flag && entity.bF) { + if (flag && entity.bG) { if (entity.vehicle != null) { - entity.D(); + entity.E(); } else { - entity.o_(); + entity.m_(); } } @@ -1041,20 +1091,20 @@ public void entityJoinedWorld(Entity entity, boolean flag) { int l = MathHelper.floor(entity.locY / 16.0D); int i1 = MathHelper.floor(entity.locZ / 16.0D); - if (!entity.bF || entity.bG != k || entity.bH != l || entity.bI != i1) { - if (entity.bF && this.isChunkLoaded(entity.bG, entity.bI)) { - this.getChunkAt(entity.bG, entity.bI).a(entity, entity.bH); + if (!entity.bG || entity.bH != k || entity.bI != l || entity.bJ != i1) { + if (entity.bG && this.isChunkLoaded(entity.bH, entity.bJ)) { + this.getChunkAt(entity.bH, entity.bJ).a(entity, entity.bI); } if (this.isChunkLoaded(k, i1)) { - entity.bF = true; + entity.bG = true; this.getChunkAt(k, i1).a(entity); } else { - entity.bF = false; + entity.bG = false; } } - if (flag && entity.bF && entity.passenger != null) { + if (flag && entity.bG && entity.passenger != null) { if (!entity.passenger.dead && entity.passenger.vehicle == entity) { this.playerJoinedWorld(entity.passenger); } else { @@ -1350,18 +1400,38 @@ public TileEntity getTileEntity(int i, int j, int k) { } public void setTileEntity(int i, int j, int k, TileEntity tileentity) { - Chunk chunk = this.getChunkAt(i >> 4, k >> 4); + if (!tileentity.g()) { + if (this.L) { + tileentity.x = i; + tileentity.y = j; + tileentity.z = k; + this.G.add(tileentity); + } else { + this.c.add(tileentity); + Chunk chunk = this.getChunkAt(i >> 4, k >> 4); - if (chunk != null) { - chunk.a(i & 15, j, k & 15, tileentity); + if (chunk != null) { + chunk.a(i & 15, j, k & 15, tileentity); + } + } } } public void o(int i, int j, int k) { - Chunk chunk = this.getChunkAt(i >> 4, k >> 4); + TileEntity tileentity = this.getTileEntity(i, j, k); - if (chunk != null) { - chunk.e(i & 15, j, k & 15); + if (tileentity != null && this.L) { + tileentity.h(); + } else { + if (tileentity != null) { + this.c.remove(tileentity); + } + + Chunk chunk = this.getChunkAt(i >> 4, k >> 4); + + if (chunk != null) { + chunk.e(i & 15, j, k & 15); + } } } @@ -1371,17 +1441,17 @@ public boolean p(int i, int j, int k) { return block == null ? false : block.a(); } - public boolean d(int i, int j, int k) { + public boolean e(int i, int j, int k) { Block block = Block.byId[this.getTypeId(i, j, k)]; return block == null ? false : block.material.h() && block.b(); } public boolean doLighting() { - if (this.K >= 50) { + if (this.M >= 50) { return false; } else { - ++this.K; + ++this.M; boolean flag; @@ -1400,7 +1470,7 @@ public boolean doLighting() { flag = false; } finally { - --this.K; + --this.M; } return flag; @@ -1427,33 +1497,33 @@ public void a(EnumSkyBlock enumskyblock, int i, int j, int k, int l, int i1, int return; } - if (!this.getChunkAtWorldCoords(k1, l1).isEmpty()) { - int i2 = this.C.size(); - int j2; - - if (flag) { - j2 = 5; - if (j2 > i2) { - j2 = i2; - } + if (this.getChunkAtWorldCoords(k1, l1).isEmpty()) { + return; + } - for (int k2 = 0; k2 < j2; ++k2) { - MetadataChunkBlock metadatachunkblock = (MetadataChunkBlock) this.C.get(this.C.size() - k2 - 1); + int i2 = this.C.size(); + int j2; - if (metadatachunkblock.a == enumskyblock && metadatachunkblock.a(i, j, k, l, i1, j1)) { - return; - } - } + if (flag) { + j2 = 5; + if (j2 > i2) { + j2 = i2; } - this.C.add(new MetadataChunkBlock(enumskyblock, i, j, k, l, i1, j1)); - j2 = 1000000; - if (this.C.size() > 1000000) { - System.out.println("More than " + j2 + " updates, aborting lighting updates"); - this.C.clear(); + for (int k2 = 0; k2 < j2; ++k2) { + MetadataChunkBlock metadatachunkblock = (MetadataChunkBlock) this.C.get(this.C.size() - k2 - 1); + + if (metadatachunkblock.a == enumskyblock && metadatachunkblock.a(i, j, k, l, i1, j1)) { + return; + } } + } - return; + this.C.add(new MetadataChunkBlock(enumskyblock, i, j, k, l, i1, j1)); + j2 = 1000000; + if (this.C.size() > 1000000) { + System.out.println("More than " + j2 + " updates, aborting lighting updates"); + this.C.clear(); } } finally { --A; @@ -1601,7 +1671,7 @@ private void y() { } protected void j() { - this.N.clear(); + this.P.clear(); int i; int j; @@ -1617,16 +1687,16 @@ protected void j() { for (k = -b0; k <= b0; ++k) { for (l = -b0; l <= b0; ++l) { - this.N.add(new ChunkCoordIntPair(k + i, l + j)); + this.P.add(new ChunkCoordIntPair(k + i, l + j)); } } } - if (this.O > 0) { - --this.O; + if (this.Q > 0) { + --this.Q; } - Iterator iterator = this.N.iterator(); + Iterator iterator = this.P.iterator(); while (iterator.hasNext()) { ChunkCoordIntPair chunkcoordintpair = (ChunkCoordIntPair) iterator.next(); @@ -1638,8 +1708,8 @@ protected void j() { int k1; int l1; - if (this.O == 0) { - this.g = this.g * 3 + this.h; + if (this.Q == 0) { + this.g = this.g * 3 + 1013904223; k = this.g >> 2; l = k & 15; j1 = k >> 8 & 15; @@ -1647,18 +1717,18 @@ protected void j() { l1 = chunk.getTypeId(l, k1, j1); l += i; j1 += j; - if (l1 == 0 && this.j(l, k1, j1) <= this.random.nextInt(8) && this.a(EnumSkyBlock.SKY, l, k1, j1) <= 0) { + if (l1 == 0 && this.k(l, k1, j1) <= this.random.nextInt(8) && this.a(EnumSkyBlock.SKY, l, k1, j1) <= 0) { EntityHuman entityhuman1 = this.a((double) l + 0.5D, (double) k1 + 0.5D, (double) j1 + 0.5D, 8.0D); if (entityhuman1 != null && entityhuman1.d((double) l + 0.5D, (double) k1 + 0.5D, (double) j1 + 0.5D) > 4.0D) { this.makeSound((double) l + 0.5D, (double) k1 + 0.5D, (double) j1 + 0.5D, "ambient.cave.cave", 0.7F, 0.8F + this.random.nextFloat() * 0.2F); - this.O = this.random.nextInt(12000) + 6000; + this.Q = this.random.nextInt(12000) + 6000; } } } if (this.random.nextInt(100000) == 0 && this.v() && this.u()) { - this.g = this.g * 3 + this.h; + this.g = this.g * 3 + 1013904223; k = this.g >> 2; l = i + (k & 15); j1 = j + (k >> 8 & 15); @@ -1672,7 +1742,7 @@ protected void j() { int i2; if (this.random.nextInt(16) == 0) { - this.g = this.g * 3 + this.h; + this.g = this.g * 3 + 1013904223; k = this.g >> 2; l = k & 15; j1 = k >> 8 & 15; @@ -1691,7 +1761,7 @@ protected void j() { } for (k = 0; k < 80; ++k) { - this.g = this.g * 3 + this.h; + this.g = this.g * 3 + 1013904223; l = this.g >> 2; j1 = l & 15; k1 = l >> 8 & 15; @@ -1739,7 +1809,7 @@ public boolean a(boolean flag) { } public List b(Entity entity, AxisAlignedBB axisalignedbb) { - this.P.clear(); + this.R.clear(); int i = MathHelper.floor((axisalignedbb.a - 2.0D) / 16.0D); int j = MathHelper.floor((axisalignedbb.d + 2.0D) / 16.0D); int k = MathHelper.floor((axisalignedbb.c - 2.0D) / 16.0D); @@ -1748,12 +1818,12 @@ public List b(Entity entity, AxisAlignedBB axisalignedbb) { for (int i1 = i; i1 <= j; ++i1) { for (int j1 = k; j1 <= l; ++j1) { if (this.isChunkLoaded(i1, j1)) { - this.getChunkAt(i1, j1).a(entity, axisalignedbb, this.P); + this.getChunkAt(i1, j1).a(entity, axisalignedbb, this.R); } } } - return this.P; + return this.R; } public List a(Class oclass, AxisAlignedBB axisalignedbb) { @@ -1866,7 +1936,7 @@ public PathEntity a(Entity entity, int i, int j, int k, float f) { public boolean isBlockFacePowered(int i, int j, int k, int l) { int i1 = this.getTypeId(i, j, k); - return i1 == 0 ? false : Block.byId[i1].c(this, i, j, k, l); + return i1 == 0 ? false : Block.byId[i1].d(this, i, j, k, l); } public boolean isBlockPowered(int i, int j, int k) { @@ -1874,7 +1944,7 @@ public boolean isBlockPowered(int i, int j, int k) { } public boolean isBlockFaceIndirectlyPowered(int i, int j, int k, int l) { - if (this.d(i, j, k)) { + if (this.e(i, j, k)) { return this.isBlockPowered(i, j, k); } else { int i1 = this.getTypeId(i, j, k); @@ -2014,21 +2084,21 @@ public WorldData q() { } public void everyoneSleeping() { - this.I = !this.players.isEmpty(); + this.J = !this.players.isEmpty(); Iterator iterator = this.players.iterator(); while (iterator.hasNext()) { EntityHuman entityhuman = (EntityHuman) iterator.next(); if (!entityhuman.isSleeping()) { - this.I = false; + this.J = false; break; } } } protected void s() { - this.I = false; + this.J = false; Iterator iterator = this.players.iterator(); while (iterator.hasNext()) { @@ -2043,7 +2113,7 @@ protected void s() { } public boolean everyoneDeeplySleeping() { - if (this.I && !this.isStatic) { + if (this.J && !this.isStatic) { Iterator iterator = this.players.iterator(); EntityHuman entityhuman; diff --git a/net/minecraft/server/WorldGenClay.java b/net/minecraft/server/WorldGenClay.java index a68b7a0..6e5d87c 100644 --- a/net/minecraft/server/WorldGenClay.java +++ b/net/minecraft/server/WorldGenClay.java @@ -35,8 +35,8 @@ public boolean a(World world, Random random, int i, int j, int k) { int j1 = MathHelper.floor(d6 + d10 / 2.0D); int k1 = MathHelper.floor(d7 - d11 / 2.0D); int l1 = MathHelper.floor(d7 + d11 / 2.0D); - int i2 = MathHelper.floor(d6 - d10 / 2.0D); - int j2 = MathHelper.floor(d6 + d10 / 2.0D); + int i2 = MathHelper.floor(d8 - d10 / 2.0D); + int j2 = MathHelper.floor(d8 + d10 / 2.0D); for (int k2 = i1; k2 <= j1; ++k2) { for (int l2 = k1; l2 <= l1; ++l2) {