diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-09-24 00:09:57 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-09-24 00:09:57 +0200 |
| commit | ecfe6ab65bd1fc2c7f5733fe6ef4e6ddaac44a26 (patch) | |
| tree | 898e37fe747f0fdcefeb88f833557fd45db3347c /source/items | |
| parent | Source files cleanup: ChunkDataSerializer is Protocol-related (diff) | |
| download | cuberite-ecfe6ab65bd1fc2c7f5733fe6ef4e6ddaac44a26.tar cuberite-ecfe6ab65bd1fc2c7f5733fe6ef4e6ddaac44a26.tar.gz cuberite-ecfe6ab65bd1fc2c7f5733fe6ef4e6ddaac44a26.tar.bz2 cuberite-ecfe6ab65bd1fc2c7f5733fe6ef4e6ddaac44a26.tar.lz cuberite-ecfe6ab65bd1fc2c7f5733fe6ef4e6ddaac44a26.tar.xz cuberite-ecfe6ab65bd1fc2c7f5733fe6ef4e6ddaac44a26.tar.zst cuberite-ecfe6ab65bd1fc2c7f5733fe6ef4e6ddaac44a26.zip | |
Diffstat (limited to 'source/items')
| -rw-r--r-- | source/items/ItemBucket.h | 5 | ||||
| -rw-r--r-- | source/items/ItemCloth.h | 2 | ||||
| -rw-r--r-- | source/items/ItemDoor.h | 5 | ||||
| -rw-r--r-- | source/items/ItemDye.h | 8 | ||||
| -rw-r--r-- | source/items/ItemFood.h | 3 | ||||
| -rw-r--r-- | source/items/ItemHandler.cpp (renamed from source/items/Item.cpp) | 10 | ||||
| -rw-r--r-- | source/items/ItemHandler.h (renamed from source/items/Item.h) | 0 | ||||
| -rw-r--r-- | source/items/ItemHoe.h | 8 | ||||
| -rw-r--r-- | source/items/ItemLeaves.h | 2 | ||||
| -rw-r--r-- | source/items/ItemLighter.h | 6 | ||||
| -rw-r--r-- | source/items/ItemPickaxe.h | 8 | ||||
| -rw-r--r-- | source/items/ItemRedstoneDust.h | 3 | ||||
| -rw-r--r-- | source/items/ItemRedstoneRepeater.h | 3 | ||||
| -rw-r--r-- | source/items/ItemSapling.h | 2 | ||||
| -rw-r--r-- | source/items/ItemSeeds.h | 4 | ||||
| -rw-r--r-- | source/items/ItemShears.h | 7 | ||||
| -rw-r--r-- | source/items/ItemShovel.h | 14 | ||||
| -rw-r--r-- | source/items/ItemSign.h | 5 | ||||
| -rw-r--r-- | source/items/ItemSlab.h | 4 | ||||
| -rw-r--r-- | source/items/ItemSugarcane.h | 4 | ||||
| -rw-r--r-- | source/items/ItemSword.h | 8 | ||||
| -rw-r--r-- | source/items/ItemWood.h | 2 |
22 files changed, 67 insertions, 46 deletions
diff --git a/source/items/ItemBucket.h b/source/items/ItemBucket.h index 3e233e4f6..736112960 100644 --- a/source/items/ItemBucket.h +++ b/source/items/ItemBucket.h @@ -1,7 +1,8 @@ +
#pragma once
-#include "Item.h"
-#include "../cWorld.h"
+#include "ItemHandler.h"
+#include "../World.h"
class cItemBucketHandler : public cItemHandler
{
diff --git a/source/items/ItemCloth.h b/source/items/ItemCloth.h index d67e14864..5de064397 100644 --- a/source/items/ItemCloth.h +++ b/source/items/ItemCloth.h @@ -1,7 +1,7 @@ #pragma once
-#include "Item.h"
+#include "ItemHandler.h"
diff --git a/source/items/ItemDoor.h b/source/items/ItemDoor.h index ac5bc6872..6e841333f 100644 --- a/source/items/ItemDoor.h +++ b/source/items/ItemDoor.h @@ -1,7 +1,8 @@ +
#pragma once
-#include "Item.h"
-#include "../cWorld.h"
+#include "ItemHandler.h"
+#include "../World.h"
class cItemDoorHandler : public cItemHandler
{
diff --git a/source/items/ItemDye.h b/source/items/ItemDye.h index 2203f410b..5b21a501c 100644 --- a/source/items/ItemDye.h +++ b/source/items/ItemDye.h @@ -1,7 +1,9 @@ +
#pragma once
-#include "Item.h"
-#include "../cWorld.h"
-#include "../cPlayer.h"
+
+#include "ItemHandler.h"
+#include "../World.h"
+#include "../Player.h"
class cItemDyeHandler : public cItemHandler
{
diff --git a/source/items/ItemFood.h b/source/items/ItemFood.h index 8998fd503..6e5a27d5d 100644 --- a/source/items/ItemFood.h +++ b/source/items/ItemFood.h @@ -1,6 +1,7 @@ +
#pragma once
-#include "Item.h"
+#include "ItemHandler.h"
class cItemFoodHandler : public cItemHandler
diff --git a/source/items/Item.cpp b/source/items/ItemHandler.cpp index f1b376493..44f6438e1 100644 --- a/source/items/Item.cpp +++ b/source/items/ItemHandler.cpp @@ -1,9 +1,9 @@ #include "Globals.h"
-#include "Item.h"
-#include "../cItem.h"
-#include "../cWorld.h"
-#include "../cPlayer.h"
+#include "ItemHandler.h"
+#include "../Item.h"
+#include "../World.h"
+#include "../Player.h"
//Handler
#include "ItemCloth.h"
@@ -27,7 +27,7 @@ #include "ItemFood.h"
#include "ItemSign.h"
-#include "../blocks/Block.h"
+#include "../blocks/BlockHandler.h"
diff --git a/source/items/Item.h b/source/items/ItemHandler.h index 67935ecb4..67935ecb4 100644 --- a/source/items/Item.h +++ b/source/items/ItemHandler.h diff --git a/source/items/ItemHoe.h b/source/items/ItemHoe.h index 64dc4ca34..e7ea9135c 100644 --- a/source/items/ItemHoe.h +++ b/source/items/ItemHoe.h @@ -1,7 +1,9 @@ +
#pragma once
-#include "Item.h"
-#include "../cWorld.h"
-#include "../cPlayer.h"
+
+#include "ItemHandler.h"
+#include "../World.h"
+#include "../Player.h"
class cItemHoeHandler : public cItemHandler
{
diff --git a/source/items/ItemLeaves.h b/source/items/ItemLeaves.h index 01b090a2f..f96adb0b8 100644 --- a/source/items/ItemLeaves.h +++ b/source/items/ItemLeaves.h @@ -1,7 +1,7 @@ #pragma once
-#include "Item.h"
+#include "ItemHandler.h"
diff --git a/source/items/ItemLighter.h b/source/items/ItemLighter.h index 213677e4e..92279aafa 100644 --- a/source/items/ItemLighter.h +++ b/source/items/ItemLighter.h @@ -1,8 +1,8 @@ #pragma once
-#include "Item.h"
-#include "../cWorld.h"
-#include "../cPlayer.h"
+#include "ItemHandler.h"
+#include "../World.h"
+#include "../Player.h"
class cItemLighterHandler : public cItemHandler
{
diff --git a/source/items/ItemPickaxe.h b/source/items/ItemPickaxe.h index a179d154f..158aca44f 100644 --- a/source/items/ItemPickaxe.h +++ b/source/items/ItemPickaxe.h @@ -1,7 +1,9 @@ +
#pragma once
-#include "Item.h"
-#include "../cWorld.h"
-#include "../cPlayer.h"
+
+#include "ItemHandler.h"
+#include "../World.h"
+#include "../Player.h"
class cItemPickaxeHandler : public cItemHandler
{
diff --git a/source/items/ItemRedstoneDust.h b/source/items/ItemRedstoneDust.h index 4d1459bc6..1ce316d9e 100644 --- a/source/items/ItemRedstoneDust.h +++ b/source/items/ItemRedstoneDust.h @@ -1,6 +1,7 @@ #pragma once
-#include "Item.h"
+
+#include "ItemHandler.h"
diff --git a/source/items/ItemRedstoneRepeater.h b/source/items/ItemRedstoneRepeater.h index 85500c9f4..c31c2af53 100644 --- a/source/items/ItemRedstoneRepeater.h +++ b/source/items/ItemRedstoneRepeater.h @@ -1,6 +1,7 @@ #pragma once
-#include "Item.h"
+
+#include "ItemHandler.h"
diff --git a/source/items/ItemSapling.h b/source/items/ItemSapling.h index 7edbc76c9..b0c223f29 100644 --- a/source/items/ItemSapling.h +++ b/source/items/ItemSapling.h @@ -1,7 +1,7 @@ #pragma once
-#include "Item.h"
+#include "ItemHandler.h"
diff --git a/source/items/ItemSeeds.h b/source/items/ItemSeeds.h index 07cf0e5de..3eb9d6e86 100644 --- a/source/items/ItemSeeds.h +++ b/source/items/ItemSeeds.h @@ -1,8 +1,8 @@ #pragma once
-#include "Item.h"
-#include "../cWorld.h"
+#include "ItemHandler.h"
+#include "../World.h"
diff --git a/source/items/ItemShears.h b/source/items/ItemShears.h index ab2981aae..2f3476735 100644 --- a/source/items/ItemShears.h +++ b/source/items/ItemShears.h @@ -1,8 +1,9 @@ +
#pragma once
-#include "Item.h"
-#include "../cWorld.h"
-#include "../cPlayer.h"
+#include "ItemHandler.h"
+#include "../World.h"
+#include "../Player.h"
class cItemShearsHandler : public cItemHandler
{
diff --git a/source/items/ItemShovel.h b/source/items/ItemShovel.h index 3279ef419..24928efb8 100644 --- a/source/items/ItemShovel.h +++ b/source/items/ItemShovel.h @@ -1,9 +1,15 @@ +
#pragma once
-#include "Item.h"
-#include "../cWorld.h"
-#include "../cPlayer.h"
-#include "../blocks/Block.h"
+#include "ItemHandler.h"
+#include "../World.h"
+#include "../Player.h"
+
+#include "../blocks/BlockHandler.h"
+
+
+
+
class cItemShovelHandler : public cItemHandler
{
diff --git a/source/items/ItemSign.h b/source/items/ItemSign.h index 06116f0e8..a0c6aaa9c 100644 --- a/source/items/ItemSign.h +++ b/source/items/ItemSign.h @@ -1,7 +1,8 @@ +
#pragma once
-#include "Item.h"
-#include "../cWorld.h"
+#include "ItemHandler.h"
+#include "../World.h"
class cItemSignHandler : public cItemHandler
{
diff --git a/source/items/ItemSlab.h b/source/items/ItemSlab.h index 955d3acfc..0bab038a2 100644 --- a/source/items/ItemSlab.h +++ b/source/items/ItemSlab.h @@ -1,8 +1,8 @@ #pragma once
-#include "Item.h"
-#include "../cWorld.h"
+#include "ItemHandler.h"
+#include "../World.h"
diff --git a/source/items/ItemSugarcane.h b/source/items/ItemSugarcane.h index 74557479e..4fdf43428 100644 --- a/source/items/ItemSugarcane.h +++ b/source/items/ItemSugarcane.h @@ -1,8 +1,8 @@ #pragma once
-#include "Item.h"
-#include "../cWorld.h"
+#include "ItemHandler.h"
+#include "../World.h"
diff --git a/source/items/ItemSword.h b/source/items/ItemSword.h index cbe172c8f..eb4aa0ef9 100644 --- a/source/items/ItemSword.h +++ b/source/items/ItemSword.h @@ -1,7 +1,9 @@ +
#pragma once
-#include "Item.h"
-#include "../cWorld.h"
-#include "../cPlayer.h"
+
+#include "ItemHandler.h"
+#include "../World.h"
+#include "../Player.h"
class cItemSwordHandler : public cItemHandler
{
diff --git a/source/items/ItemWood.h b/source/items/ItemWood.h index 7e874efc2..d6f66d1c5 100644 --- a/source/items/ItemWood.h +++ b/source/items/ItemWood.h @@ -1,7 +1,7 @@ #pragma once
-#include "Item.h"
+#include "ItemHandler.h"
|