From 9809e84e99f5c0a49d2edfa638896a9b0291c4d0 Mon Sep 17 00:00:00 2001
From: Luke Rogers <lukeroge@gmail.com>
Date: Thu, 19 Apr 2012 23:46:47 +1200
Subject: [PATCH] Tweaked some data files

---
 plugins/data/itemids.txt | 30 ++++++++++++++++++------------
 plugins/data/slaps.txt   |  4 +++-
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/plugins/data/itemids.txt b/plugins/data/itemids.txt
index 917d88f..11b81d3 100755
--- a/plugins/data/itemids.txt
+++ b/plugins/data/itemids.txt
@@ -6,18 +6,24 @@
 3 Dirt
 4 Cobblestone
 5 Wooden Planks
+5:1 Pine Wood Planks
+5:2 Birch Wood Planks
+5:3 Jungle Wood Planks
 6 Sapling
 7 Bedrock
 8 Water
-9 Water
+9 Stationary Water
 10 Lava
-11 Lava
+11 Stationary Lava
 12 Sand
 13 Gravel
 14 Gold Ore
 15 Iron Ore
 16 Coal Ore
 17 Wood
+17:1 Pine Wood
+17:2 Birch Wood
+17:3 Jungle Wood
 18 Leaves
 19 Sponge
 20 Glass
@@ -34,7 +40,7 @@
 31 Grass
 32 Dead Bush
 33 Piston
-34 Piston Extended
+//34 Piston Extended
 35 Wool
 35:1 Orange Wool
 35:2 Magenta Wool
@@ -52,7 +58,7 @@
 35:14 Red Wool
 35:15 Black Wool
 35:0 White Wool
-36 Block Moved by Piston
+//36 Block Moved by Piston
 37 Flower
 38 Rose
 39 Brown Mushroom
@@ -78,7 +84,7 @@
 59 Crops
 60 Farmland
 61 Furnace
-62 Furnace
+62 Lit Furnace
 63 Sign
 64 Wooden Door
 65 Ladder
@@ -90,9 +96,9 @@
 71 Iron Door
 72 Pressure Plate
 73 Redstone Ore
-74 Redstone Ore
+74 Glowing Redstone Ore
 75 Redstone Torch
-76 Redstone Torch
+76 Lit Redstone Torch
 77 Button
 78 Snow
 79 Ice
@@ -108,9 +114,9 @@
 89 Glowstone
 90 Portal
 91 Jack 'o' Lantern
-92 Cake
-93 Redstone Repeater (off)
-94 Redstone Repeater (on)
+92 Cake Block
+93 Redstone Repeater
+94 Redstone Repeater (On)
 95 Locked chest
 96 Trapdoor
 97 Hidden Silverfish
@@ -139,8 +145,8 @@
 120 End Portal Frame
 121 End Stone
 122 Dragon Egg
-123 Redstone Lamp (Off)
-124 Redstone Lamp (On)
+123 Redstone Lamp
+124 Lit Redstone Lamp
 // Items Ids
 256 Iron Shovel
 257 Iron Pickaxe
diff --git a/plugins/data/slaps.txt b/plugins/data/slaps.txt
index d8ee0b2..9f9a12d 100755
--- a/plugins/data/slaps.txt
+++ b/plugins/data/slaps.txt
@@ -4,9 +4,11 @@ throws a <item> at <who>.
 chucks a few <item>s at <who>.
 grabs a <item> and throws it in <who>'s face.
 launches a <item> in <who>'s general direction.
-sits on <who>'s face, while slamming a <item> into their crotch.
+sits on <who>'s face while slamming a <item> into their crotch.
+starts slapping <who> silly with a <item>.
 holds <who> down and repeatedly whacks them with a <item>.
 prods <who> with a flaming <item>.
 picks up a <item> and whacks <who> with it.
 ties <who> to a chair and throws a <item> at them.
 hits <who> on the head with a <item>.
+ties <who> to a pole and whips them with a <item>.