12w05a (with/without translation griefing)

12w05a.diff

diff --git a/12w05a-1/META-INF/MANIFEST.MF b/12w05a-2/META-INF/MANIFEST.MF
index fb83cb1..1ed199d 100755
--- a/12w05a-1/META-INF/MANIFEST.MF
+++ b/12w05a-2/META-INF/MANIFEST.MF
@@ -173,7 +173,7 @@ Name: di.class
 SHA1-Digest: 7+SXNCCpOZGnx28036vtopvXGrU=
 
 Name: bm.class
-SHA1-Digest: LaEzJzqwLiaNg5Q4xN/YFUTylMI=
+SHA1-Digest: kS74bA3FIe2ra6tOxR6SXv6l6+Y=
 
 Name: ml.class
 SHA1-Digest: TYUHDewyINyEga6S9FV0zUV5/lY=
@@ -209,7 +209,7 @@ Name: acl.class
 SHA1-Digest: LfX+Bfo3uy5zTHvJP1oPgWLXJQ0=
 
 Name: lang/pl_PL.lang
-SHA1-Digest: /kseTNX3WNJnJ2T1dP3c76GKSEU=
+SHA1-Digest: N37F4AGniwGVU3ixY0KTOTBR0Lo=
 
 Name: ahv.class
 SHA1-Digest: +3wEcU+TaXYzXqQxw2rzHMbnspw=
@@ -500,7 +500,7 @@ Name: mob/squid.png
 SHA1-Digest: uVnantqZV9ojjTTbUNM+cTmEX/M=
 
 Name: ub.class
-SHA1-Digest: bVV9Q8NkQTFJcgqVDYf0fUFfXVc=
+SHA1-Digest: YRVShlSnK8d6m62Koo/kohpFwgY=
 
 Name: jc.class
 SHA1-Digest: YR5OSWVLwrJ26Y6ypoeOqXF//fg=
@@ -767,7 +767,7 @@ Name: su.class
 SHA1-Digest: g6PsIS/j1U2esXyu9QnlYBQK1/c=
 
 Name: qy.class
-SHA1-Digest: n97VFYCm9KtLGB+G+g9nkaGufXk=
+SHA1-Digest: YN2hopkeMzjs83wzBygU9PZ4jSU=
 
 Name: xp.class
 SHA1-Digest: m/z9l9ofk+4B9M8feCD4hmbfA9E=
@@ -944,7 +944,7 @@ Name: ahl.class
 SHA1-Digest: UuMPj/5i+Uc7PY/lY53D7J67Zfc=
 
 Name: lang/ar_SA.lang
-SHA1-Digest: FTyVxSplvUHUeztxU3qO8OW31ow=
+SHA1-Digest: j9RKYzsFuKSurqzH39F5n8cmKbA=
 
 Name: com/jcraft/jorbis/PsyInfo.class
 SHA1-Digest: Ez9EQLkyxPhvJb2WM0m0w4eWPG0=
@@ -1079,7 +1079,7 @@ Name: sq.class
 SHA1-Digest: WlIz7PIspOtfO0E5NfqNyNMan3k=
 
 Name: lang/de_DE.lang
-SHA1-Digest: MRL9zqCuxwr370iutOhKJZeO7Bg=
+SHA1-Digest: cB1t3axcObRN3po3CJVwlyzcoiU=
 
 Name: aig.class
 SHA1-Digest: DlyYaPWpZUFzAJOXYaa6dHt6YtE=
@@ -1652,7 +1652,7 @@ Name: font/glyph_95.png
 SHA1-Digest: IsYCgz1fltZsBEKw1nMtppQ09aI=
 
 Name: lang/uk_UA.lang
-SHA1-Digest: rMylDoUDVL8lzgbeB2dT8cPVljU=
+SHA1-Digest: BYVVnS5jge8CS960PsP+ymFAGwM=
 
 Name: t.class
 SHA1-Digest: BsUxkQxKz7Y7YFZMly9JfUqpS4s=
@@ -1982,7 +1982,7 @@ Name: paulscode/sound/CommandObject.class
 SHA1-Digest: Tg7G5tIkUYmfcdUASCx63GFfHpY=
 
 Name: lang/en_CA.lang
-SHA1-Digest: DgnYOj1SkMWgNSgPNXW9nfmmfJk=
+SHA1-Digest: r+Q9RRZvoKEevJrlSJ+9Py3EzLk=
 
 Name: aiq.class
 SHA1-Digest: QyAKT8KTYpmFtOP3t8UY0WMk8A8=
@@ -3506,7 +3506,7 @@ Name: zz.class
 SHA1-Digest: EuF7peuXEPjukZ3eAsXqyZNtAYo=
 
 Name: lang/af_ZA.lang
-SHA1-Digest: fc+BtotTm/Q9h4hxCZ80NEDrHMM=
+SHA1-Digest: xVeukn3eWOk2nqIVdsiqBrzIE7g=
 
 Name: uk.class
 SHA1-Digest: zKAEVj0wVt3bUnjkhULtloqOPyc=
@@ -3725,7 +3725,7 @@ Name: aes.class
 SHA1-Digest: 351fFeZSVM35EQP1Vm2Q3H4YyeU=
 
 Name: lang/en_GB.lang
-SHA1-Digest: gVMk0G3yWX0fEgOIvxC/tky6/P4=
+SHA1-Digest: bKE43m6SFVBB7eavVU4z51MaOWA=
 
 Name: armor/chain_2.png
 SHA1-Digest: o82RYls52TnsQgTA0mgK+e6bfCo=
diff --git a/12w05a-1/META-INF/MOJANG_C.DSA b/12w05a-2/META-INF/MOJANG_C.DSA
index 22123f4..fae6f09 100755
Binary files a/12w05a-1/META-INF/MOJANG_C.DSA and b/12w05a-2/META-INF/MOJANG_C.DSA differ
diff --git a/12w05a-1/META-INF/MOJANG_C.SF b/12w05a-2/META-INF/MOJANG_C.SF
index 8935839..ad5491d 100755
--- a/12w05a-1/META-INF/MOJANG_C.SF
+++ b/12w05a-2/META-INF/MOJANG_C.SF
@@ -1,7 +1,7 @@
 Signature-Version: 1.0
 SHA1-Digest-Manifest-Main-Attributes: zasvPbp2Pj22IZ986L4058c4i8Y=
 Created-By: 1.6.0_22 (Sun Microsystems Inc.)
-SHA1-Digest-Manifest: +uWboAqGqOHpDFdtaFXt4jkw7Ug=
+SHA1-Digest-Manifest: wQw2opYHvQ82r2DOoil20PYbiHQ=
 
 Name: dc.class
 SHA1-Digest: tr3RBbL6gQOrciyTcdaSQAWKYsk=
@@ -280,7 +280,7 @@ Name: aa.class
 SHA1-Digest: K3qya5fK51KLmat8ljSq8rAH5wU=
 
 Name: lang/ar_SA.lang
-SHA1-Digest: at513QOXbvBpD6daNW8Q0DVfIk0=
+SHA1-Digest: j6Z6MR6LNWjRycL//l1RB+ab4Cg=
 
 Name: misc/particlefield.png
 SHA1-Digest: BAEi1zblwKjpamQ0zddAa0R77FQ=
@@ -730,7 +730,7 @@ Name: font/glyph_0D.png
 SHA1-Digest: 17hzFZI3y2G/0Jg/80LlywAZrsQ=
 
 Name: lang/en_GB.lang
-SHA1-Digest: F+TTjTN/FElTu1ypTiF8MxdDa0Q=
+SHA1-Digest: GWxc8wErEJlEif9gLn3DO1diT9c=
 
 Name: wm.class
 SHA1-Digest: zctMrZs1Y3Fv6N3He5MDiZLdAJE=
@@ -1855,7 +1855,7 @@ Name: aja.class
 SHA1-Digest: cTdfmGkmuYR4MKf8ACLDrkt3UVA=
 
 Name: qy.class
-SHA1-Digest: mvmv9GKxobrwb8A4FMsme27EVc4=
+SHA1-Digest: uWgcN7sXqzc2Lq80hyeieyKVMLU=
 
 Name: al.class
 SHA1-Digest: yFDGLlOWCqbnAi+gdukJT3cVbLw=
@@ -2662,7 +2662,7 @@ Name: font/glyph_57.png
 SHA1-Digest: 4qqwBEY3HMSNeiGDpCVjKxBWGlY=
 
 Name: lang/uk_UA.lang
-SHA1-Digest: p3ftxN1i9e1/zXXViMM0x9Br/lU=
+SHA1-Digest: V9rfcYUryGzUgryaiJBBfyXHIPI=
 
 Name: ff.class
 SHA1-Digest: 1EIGGXwz4hiKa5OQPqU/KKSc7rc=
@@ -2851,7 +2851,7 @@ Name: mq.class
 SHA1-Digest: SzpisdClqzPOuEAZD8llUipi0AU=
 
 Name: bm.class
-SHA1-Digest: wD/kUob3OyV9GxQrXKy0yoXY71w=
+SHA1-Digest: lhSJHrmWBvmpOyLdv5fl2KLxFp4=
 
 Name: ao.class
 SHA1-Digest: MgBlSYG0fvakj2RLpYorUFRmC4k=
@@ -2923,7 +2923,7 @@ Name: font/glyph_11.png
 SHA1-Digest: Vctmjz6bCjBV6RlHXDLH8khu23I=
 
 Name: lang/pl_PL.lang
-SHA1-Digest: /EY/bHYeGs7FH3fQz0s5dU7oF70=
+SHA1-Digest: jvIA8gXWnR/64aSZeU1fUZIiITg=
 
 Name: font/glyph_0E.png
 SHA1-Digest: BN54RbwoCQrRqxOuawzOYa10kfw=
@@ -3199,7 +3199,7 @@ Name: ua.class
 SHA1-Digest: CMWWBrJ08dFZShXzeiaEXB3lVR4=
 
 Name: lang/af_ZA.lang
-SHA1-Digest: J6vjHgu284kC050KNzkdrSpgLdY=
+SHA1-Digest: d1xt1So6eCffmHSzMuis6bgOwZs=
 
 Name: bq.class
 SHA1-Digest: 4cfMH0nQ0awb5LCAKTO/MjSa2w4=
@@ -3382,7 +3382,7 @@ Name: gui/alchemy.png
 SHA1-Digest: LQ2FRgrcVOrms5I1dvZqHXmYhcQ=
 
 Name: lang/de_DE.lang
-SHA1-Digest: BttUe/qZG6+NXe2JwDPXF3I785s=
+SHA1-Digest: o39ODZragf55+pq958cgvn7zrpo=
 
 Name: font/glyph_BA.png
 SHA1-Digest: kOXsjSyykkexCxDH6LUdbJ6qDow=
@@ -3523,7 +3523,7 @@ Name: acu.class
 SHA1-Digest: 9NhfTDH8BgUMkAglS8rwoy7rI4k=
 
 Name: lang/en_CA.lang
-SHA1-Digest: SpDkIoQVTZeCS1OlZpCCc0sfR9c=
+SHA1-Digest: BrBHZ1ubhM/Q+ilUSL+lEJy4LMc=
 
 Name: ajc.class
 SHA1-Digest: PFI7nBer4oEVI9hhKf2xRFB/NLo=
@@ -3934,7 +3934,7 @@ Name: qx.class
 SHA1-Digest: TkkEf4zM1OZXPHSYlxIybTyI8UQ=
 
 Name: ub.class
-SHA1-Digest: 5pHG2VLXZboKE94tO2TqSv/xekA=
+SHA1-Digest: lhJNj5tPR/vphKzPT3LmvmNvyhM=
 
 Name: qn.class
 SHA1-Digest: 4uiWX4g6ATQeoV/q6VtLpBfZ8/k=
diff --git a/12w05a-1/bm.java b/12w05a-2/bm.java
index 2110a7e..fe26296 100755
--- a/12w05a-1/bm.java
+++ b/12w05a-2/bm.java
@@ -31,7 +31,7 @@ public class bm extends qt {
 
    public void e() {
       this.c = -1;
-      this.a.aM().a((double)this.b.a(), (double)this.b.b(), (double)this.b.c(), 0.3F);
+      this.a.aM().a((double)this.b.a() + 0.5D, (double)this.b.b(), (double)this.b.c() + 0.5D, 0.3F);
    }
 
    public void b() {
diff --git a/12w05a-1/lang/af_ZA.lang b/12w05a-2/lang/af_ZA.lang
index 7b12cf6..fb763f5 100755
--- a/12w05a-1/lang/af_ZA.lang
+++ b/12w05a-2/lang/af_ZA.lang
@@ -723,13 +723,13 @@ stat.craftItem=%1$s Gemaak
 stat.useItem=%1$s Gebruik
 stat.breakItem=%1$s Uitgeput
 
-achievement.get=Achievement get!
+achievement.get=Prestasie gekry!
 
 achievement.taken=Geneem!
 
 achievement.requires=Vereis '%1$s'
-achievement.openInventory=You are a N-IGGER!!!
-achievement.openInventory.desc=Press '%1$s' to confirm "You are a N-IGGER!!!".
+achievement.openInventory=Neem Inventaris
+achievement.openInventory.desc=Druk '%1$s' om jou inventaris oop te maak.
 achievement.mineWood=Verkry Hout
 achievement.mineWood.desc=Slaan 'n boom totdat 'n blok hout uit val
 achievement.buildWorkBench=WERKSBANK GEBRUIK
diff --git a/12w05a-1/lang/ar_SA.lang b/12w05a-2/lang/ar_SA.lang
index 6c32613..8049bd1 100755
--- a/12w05a-1/lang/ar_SA.lang
+++ b/12w05a-2/lang/ar_SA.lang
@@ -134,7 +134,7 @@ options.title=خيارات
 options.controls=التحكم...
 options.video=إعدادات الفيديو...
 options.language=اللغة...
-options.languageWarning=OMG! You are a TERRORIST!!!
+options.languageWarning=قد لا تكون الترجمة دقيقة بنسبة 100 ٪
 options.videoTitle=إعدادات الفيديو
 options.music=الموسيقى
 options.sound=الأصوات
diff --git a/12w05a-1/lang/de_DE.lang b/12w05a-2/lang/de_DE.lang
index 6a5850b..9aee844 100755
--- a/12w05a-1/lang/de_DE.lang
+++ b/12w05a-2/lang/de_DE.lang
@@ -134,7 +134,7 @@ options.title=Optionen
 options.controls=Steuerung...
 options.video=Grafikeinstellungen ...
 options.language=Sprache...
-options.languageWarning=You are a NAZI!!!
+options.languageWarning=Die Übersetzungen sind möglicherweise nicht zu 100% korrekt
 options.videoTitle=Grafikeinstellungen
 options.music=Musik
 options.sound=Geräusche
diff --git a/12w05a-1/lang/en_CA.lang b/12w05a-2/lang/en_CA.lang
index d65688d..4be5d2a 100755
--- a/12w05a-1/lang/en_CA.lang
+++ b/12w05a-2/lang/en_CA.lang
@@ -134,7 +134,7 @@ options.title=Options
 options.controls=Controls...
 options.video=Video Settings...
 options.language=Language...
-options.languageWarning=Jeb didn't ban me! I won't stop!
+options.languageWarning=Language translations may not be 100% accurate
 options.videoTitle=Video Settings
 options.music=Music
 options.sound=Sound
diff --git a/12w05a-1/lang/en_GB.lang b/12w05a-2/lang/en_GB.lang
index 1409457..d2c90b2 100755
--- a/12w05a-1/lang/en_GB.lang
+++ b/12w05a-2/lang/en_GB.lang
@@ -275,7 +275,7 @@ tile.notGate.name=Redstone Torch
 tile.button.name=Button
 tile.snow.name=Snow
 tile.ice.name=Ice
-tile.cactus.name=Cactus
+tile.cactus.name=A Myth
 tile.clay.name=Clay
 tile.reeds.name=Sugar cane
 tile.jukebox.name=Jukebox
diff --git a/12w05a-1/lang/pl_PL.lang b/12w05a-2/lang/pl_PL.lang
index d6bd5bf..24cbfb1 100755
--- a/12w05a-1/lang/pl_PL.lang
+++ b/12w05a-2/lang/pl_PL.lang
@@ -482,7 +482,7 @@ item.brewingStand.name=Statyw alchemiczny
 item.eyeOfEnder.name=Oko kresu
 item.speckledMelon.name=Błyszczący arbuz
 item.monsterPlacer.name=Spawn
-item.expBottle.name=Zaklęta butla
+item.expBottle.name=Butelka z doświadczeniem
 item.fireball.name=Ognisty Ładunek
 
 container.inventory=Ekwipunek
diff --git a/12w05a-1/lang/uk_UA.lang b/12w05a-2/lang/uk_UA.lang
index bf07863..670d659 100755
--- a/12w05a-1/lang/uk_UA.lang
+++ b/12w05a-2/lang/uk_UA.lang
@@ -355,18 +355,18 @@ item.pickaxeWood.name=Дерев'яне Кайло
 item.hatchetWood.name=Дерев'яна Сокира
 item.swordStone.name=Кам'яний Меч
 item.shovelStone.name=Кам'яна Лопата
-item.pickaxeStone.name=Кам'яне кайло
+item.pickaxeStone.name=Кам'яне Кайло
 item.hatchetStone.name=Кам'яна Сокира
 item.swordDiamond.name=Алмазний Меч
 item.shovelDiamond.name=Алмазна Лопата
-item.pickaxeDiamond.name=Алмазна кирка
+item.pickaxeDiamond.name=Алмазне Кайло
 item.hatchetDiamond.name=Алмазна Сокира
 item.stick.name=Палиці
 item.bowl.name=Миска
 item.mushroomStew.name=Тушковані Гриби
 item.swordGold.name=Золотий Меч
 item.shovelGold.name=Золота Лопата
-item.pickaxeGold.name=Золота Кирка
+item.pickaxeGold.name=Золоте Кайло
 item.hatchetGold.name=Золота Сокира
 item.string.name=Нитка
 item.feather.name=Перо
@@ -735,7 +735,7 @@ achievement.mineWood.desc=Бий дерево, поки не випаде дер
 achievement.buildWorkBench=Виробництво
 achievement.buildWorkBench.desc=Створи верстак з 4 блоків дощок
 achievement.buildPickaxe=Час Добувати!
-achievement.buildPickaxe.desc=Використай палиці та дошки для створення кирки
+achievement.buildPickaxe.desc=Використай палиці та дошки для створення кайла
 achievement.buildFurnace=Гаряча Тема
 achievement.buildFurnace.desc=Збери піч з восьми каменів
 achievement.acquireIron=Отримуємо Обладнання
diff --git a/12w05a-1/qy.java b/12w05a-2/qy.java
index e2a4ffc..3e297b7 100755
--- a/12w05a-1/qy.java
+++ b/12w05a-2/qy.java
@@ -230,10 +230,10 @@ public class qy implements dx {
       if (!this.b(var12, var2, var13, var4, var5, var6, var7, var8, var10)) {
          return false;
       } else {
-         for(int var14 = var1; var14 < var1 + var4; ++var14) {
-            for(int var15 = var3; var15 < var3 + var6; ++var15) {
-               double var16 = (double)var14 - var7.a;
-               double var18 = (double)var15 - var7.c;
+         for(int var14 = var12; var14 < var12 + var4; ++var14) {
+            for(int var15 = var13; var15 < var13 + var6; ++var15) {
+               double var16 = (double)var14 + 0.5D - var7.a;
+               double var18 = (double)var15 + 0.5D - var7.c;
                if (!(var16 * var8 + var18 * var10 < 0.0D)) {
                   int var20 = this.b.a(var14, var2 - 1, var15);
                   if (var20 <= 0) {
@@ -260,8 +260,8 @@ public class qy implements dx {
       for(int var12 = var1; var12 < var1 + var4; ++var12) {
          for(int var13 = var2; var13 < var2 + var5; ++var13) {
             for(int var14 = var3; var14 < var3 + var6; ++var14) {
-               double var15 = (double)var12 - var7.a;
-               double var17 = (double)var14 - var7.c;
+               double var15 = (double)var12 + 0.5D - var7.a;
+               double var17 = (double)var14 + 0.5D - var7.c;
                if (!(var15 * var8 + var17 * var10 < 0.0D)) {
                   int var19 = this.b.a(var12, var13, var14);
                   if (var19 > 0 && !os.m[var19].b((akf)this.b, var12, var13, var14)) {
diff --git a/12w05a-1/ub.java b/12w05a-2/ub.java
index 7061a2c..613c829 100755
--- a/12w05a-1/ub.java
+++ b/12w05a-2/ub.java
@@ -141,7 +141,7 @@ public class ub extends vm {
 
          return true;
       } else {
-         if (var1.aA.equalsIgnoreCase(this.ai()) && !this.k.J && !this.a(var2)) {
+         if (var2 != null && var1.aA.equalsIgnoreCase(this.ai()) && !this.k.J && !this.a(var2)) {
             this.a.a(!this.ah());
          }