flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Moved BlockEntities to a separate folder 

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1527 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2013-05-28 19:12:47 +00:00
parent 3138daa1f8
commit 9be27992e2
35 changed files with 175 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
VC2008/MCServer.vcproj
View File

@ -2297,75 +2297,75 @@
Name="BlockEntities"
>
<File
RelativePath="..\source\BlockEntity.h"
RelativePath="..\source\BlockEntities\BlockEntity.h"
>
</File>
<File
RelativePath="..\source\BlockEntityWithItems.h"
RelativePath="..\source\BlockEntities\BlockEntityWithItems.h"
>
</File>
<File
RelativePath="..\source\ChestEntity.cpp"
RelativePath="..\source\BlockEntities\ChestEntity.cpp"
>
</File>
<File
RelativePath="..\source\ChestEntity.h"
RelativePath="..\source\BlockEntities\ChestEntity.h"
>
</File>
<File
RelativePath="..\source\DispenserEntity.cpp"
RelativePath="..\source\BlockEntities\DispenserEntity.cpp"
>
</File>
<File
RelativePath="..\source\DispenserEntity.h"
RelativePath="..\source\BlockEntities\DispenserEntity.h"
>
</File>
<File
RelativePath="..\source\DropperEntity.cpp"
RelativePath="..\source\BlockEntities\DropperEntity.cpp"
>
</File>
<File
RelativePath="..\source\DropperEntity.h"
RelativePath="..\source\BlockEntities\DropperEntity.h"
>
</File>
<File
RelativePath="..\source\DropSpenserEntity.cpp"
RelativePath="..\source\BlockEntities\DropSpenserEntity.cpp"
>
</File>
<File
RelativePath="..\source\DropSpenserEntity.h"
RelativePath="..\source\BlockEntities\DropSpenserEntity.h"
>
</File>
<File
RelativePath="..\source\FurnaceEntity.cpp"
RelativePath="..\source\BlockEntities\FurnaceEntity.cpp"
>
</File>
<File
RelativePath="..\source\FurnaceEntity.h"
RelativePath="..\source\BlockEntities\FurnaceEntity.h"
>
</File>
<File
RelativePath="..\source\JukeboxEntity.cpp"
RelativePath="..\source\BlockEntities\JukeboxEntity.cpp"
>
</File>
<File
RelativePath="..\source\JukeboxEntity.h"
RelativePath="..\source\BlockEntities\JukeboxEntity.h"
>
</File>
<File
RelativePath="..\source\NoteEntity.cpp"
RelativePath="..\source\BlockEntities\NoteEntity.cpp"
>
</File>
<File
RelativePath="..\source\NoteEntity.h"
RelativePath="..\source\BlockEntities\NoteEntity.h"
>
</File>
<File
RelativePath="..\source\SignEntity.cpp"
RelativePath="..\source\BlockEntities\SignEntity.cpp"
>
</File>
<File
RelativePath="..\source\SignEntity.h"
RelativePath="..\source\BlockEntities\SignEntity.h"
>
</File>
</Filter>

12
source/AllToLua.pkg
View File

@ -39,12 +39,12 @@ $cfile "World.h"
$cfile "Inventory.h"
$cfile "Item.h"
$cfile "ItemGrid.h"
$cfile "BlockEntity.h"
$cfile "BlockEntityWithItems.h"
$cfile "ChestEntity.h"
$cfile "DropSpenserEntity.h"
$cfile "DispenserEntity.h"
$cfile "DropperEntity.h"
$cfile "BlockEntities/BlockEntity.h"
$cfile "BlockEntities/BlockEntityWithItems.h"
$cfile "BlockEntities/ChestEntity.h"
$cfile "BlockEntities/DropSpenserEntity.h"
$cfile "BlockEntities/DispenserEntity.h"
$cfile "BlockEntities/DropperEntity.h"
$cfile "WebAdmin.h"
$cfile "WebPlugin.h"
$cfile "Pickup.h"

80
source/Bindings.cpp
View File

@ -1,6 +1,6 @@
/*
** Lua binding: AllToLua
** Generated automatically by tolua++-1.0.92 on 05/28/13 14:04:23.
** Generated automatically by tolua++-1.0.92 on 05/28/13 21:11:42.
*/
#ifndef __cplusplus
@ -38,12 +38,12 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S);
#include "Inventory.h"
#include "Item.h"
#include "ItemGrid.h"
#include "BlockEntity.h"
#include "BlockEntityWithItems.h"
#include "ChestEntity.h"
#include "DropSpenserEntity.h"
#include "DispenserEntity.h"
#include "DropperEntity.h"
#include "BlockEntities/BlockEntity.h"
#include "BlockEntities/BlockEntityWithItems.h"
#include "BlockEntities/ChestEntity.h"
#include "BlockEntities/DropSpenserEntity.h"
#include "BlockEntities/DispenserEntity.h"
#include "BlockEntities/DropperEntity.h"
#include "WebAdmin.h"
#include "WebPlugin.h"
#include "Pickup.h"
@ -15845,6 +15845,70 @@ static int tolua_AllToLua_cBlockEntity_GetChunkZ00(lua_State* tolua_S)
}
#endif //#ifndef TOLUA_DISABLE
/* method: GetRelX of class cBlockEntity */
#ifndef TOLUA_DISABLE_tolua_AllToLua_cBlockEntity_GetRelX00
static int tolua_AllToLua_cBlockEntity_GetRelX00(lua_State* tolua_S)
{
#ifndef TOLUA_RELEASE
tolua_Error tolua_err;
if (
!tolua_isusertype(tolua_S,1,"const cBlockEntity",0,&tolua_err) ||
!tolua_isnoobj(tolua_S,2,&tolua_err)
)
goto tolua_lerror;
else
#endif
{
const cBlockEntity* self = (const cBlockEntity*) tolua_tousertype(tolua_S,1,0);
#ifndef TOLUA_RELEASE
if (!self) tolua_error(tolua_S,"invalid 'self' in function 'GetRelX'", NULL);
#endif
{
int tolua_ret = (int) self->GetRelX();
tolua_pushnumber(tolua_S,(lua_Number)tolua_ret);
}
}
return 1;
#ifndef TOLUA_RELEASE
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'GetRelX'.",&tolua_err);
return 0;
#endif
}
#endif //#ifndef TOLUA_DISABLE
/* method: GetRelZ of class cBlockEntity */
#ifndef TOLUA_DISABLE_tolua_AllToLua_cBlockEntity_GetRelZ00
static int tolua_AllToLua_cBlockEntity_GetRelZ00(lua_State* tolua_S)
{
#ifndef TOLUA_RELEASE
tolua_Error tolua_err;
if (
!tolua_isusertype(tolua_S,1,"const cBlockEntity",0,&tolua_err) ||
!tolua_isnoobj(tolua_S,2,&tolua_err)
)
goto tolua_lerror;
else
#endif
{
const cBlockEntity* self = (const cBlockEntity*) tolua_tousertype(tolua_S,1,0);
#ifndef TOLUA_RELEASE
if (!self) tolua_error(tolua_S,"invalid 'self' in function 'GetRelZ'", NULL);
#endif
{
int tolua_ret = (int) self->GetRelZ();
tolua_pushnumber(tolua_S,(lua_Number)tolua_ret);
}
}
return 1;
#ifndef TOLUA_RELEASE
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'GetRelZ'.",&tolua_err);
return 0;
#endif
}
#endif //#ifndef TOLUA_DISABLE
/* method: GetSlot of class cBlockEntityWithItems */
#ifndef TOLUA_DISABLE_tolua_AllToLua_cBlockEntityWithItems_GetSlot00
static int tolua_AllToLua_cBlockEntityWithItems_GetSlot00(lua_State* tolua_S)
@ -26659,6 +26723,8 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S)
tolua_function(tolua_S,"GetWorld",tolua_AllToLua_cBlockEntity_GetWorld00);
tolua_function(tolua_S,"GetChunkX",tolua_AllToLua_cBlockEntity_GetChunkX00);
tolua_function(tolua_S,"GetChunkZ",tolua_AllToLua_cBlockEntity_GetChunkZ00);
tolua_function(tolua_S,"GetRelX",tolua_AllToLua_cBlockEntity_GetRelX00);
tolua_function(tolua_S,"GetRelZ",tolua_AllToLua_cBlockEntity_GetRelZ00);
tolua_endmodule(tolua_S);
tolua_cclass(tolua_S,"cBlockEntityWithItems","cBlockEntityWithItems","cBlockEntity",NULL);
tolua_beginmodule(tolua_S,"cBlockEntityWithItems");

2
source/Bindings.h
View File

@ -1,6 +1,6 @@
/*
** Lua binding: AllToLua
** Generated automatically by tolua++-1.0.92 on 05/28/13 14:04:23.
** Generated automatically by tolua++-1.0.92 on 05/28/13 21:11:43.
*/
/* Exported function */

4
source/BlockEntity.h → source/BlockEntities/BlockEntity.h
View File

@ -1,8 +1,8 @@
#pragma once
#include "ClientHandle.h"
#include "World.h"
#include "../ClientHandle.h"
#include "../World.h"

2
source/BlockEntityWithItems.h → source/BlockEntities/BlockEntityWithItems.h
View File

@ -10,7 +10,7 @@
#pragma once
#include "BlockEntity.h"
#include "ItemGrid.h"
#include "../ItemGrid.h"

19
source/ChestEntity.cpp → source/BlockEntities/ChestEntity.cpp
View File

@ -2,27 +2,16 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "ChestEntity.h"
#include "Item.h"
#include "ClientHandle.h"
#include "Player.h"
#include "UI/Window.h"
#include "World.h"
#include "Root.h"
#include "Pickup.h"
#include "Noise.h"
#include "../Item.h"
#include "../Player.h"
#include "../UI/Window.h"
#include "../Noise.h"
#include <json/json.h>
class cWorld;
class cRoot;
cChestEntity::cChestEntity(int a_BlockX, int a_BlockY, int a_BlockZ) :
super(E_BLOCK_CHEST, a_BlockX, a_BlockY, a_BlockZ, ContentsWidth, ContentsHeight, NULL)
{

2
source/ChestEntity.h → source/BlockEntities/ChestEntity.h
View File

@ -2,7 +2,7 @@
#pragma once
#include "BlockEntityWithItems.h"
#include "UI/WindowOwner.h"
#include "../UI/WindowOwner.h"

6
source/DispenserEntity.cpp → source/BlockEntities/DispenserEntity.cpp
View File

@ -2,9 +2,9 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "DispenserEntity.h"
#include "Player.h"
#include "Simulator/FluidSimulator.h"
#include "Chunk.h"
#include "../Player.h"
#include "../Simulator/FluidSimulator.h"
#include "../Chunk.h"

0
source/DispenserEntity.h → source/BlockEntities/DispenserEntity.h
View File

4
source/DropSpenserEntity.cpp → source/BlockEntities/DropSpenserEntity.cpp
View File

@ -6,8 +6,8 @@
#include "Globals.h"
#include "DropSpenserEntity.h"
#include "Player.h"
#include "Chunk.h"
#include "../Player.h"
#include "../Chunk.h"

2
source/DropSpenserEntity.h → source/BlockEntities/DropSpenserEntity.h
View File

@ -11,7 +11,7 @@
#pragma once
#include "BlockEntityWithItems.h"
#include "UI/WindowOwner.h"
#include "../UI/WindowOwner.h"

4
source/DropperEntity.cpp → source/BlockEntities/DropperEntity.cpp
View File

@ -5,8 +5,8 @@
#include "Globals.h"
#include "DropperEntity.h"
#include "Player.h"
#include "Simulator/FluidSimulator.h"
#include "../Player.h"
#include "../Simulator/FluidSimulator.h"

0
source/DropperEntity.h → source/BlockEntities/DropperEntity.h
View File

14
source/FurnaceEntity.cpp → source/BlockEntities/FurnaceEntity.cpp
View File

@ -2,16 +2,10 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "FurnaceEntity.h"
#include "BlockID.h"
#include "Item.h"
#include "UI/Window.h"
#include "Player.h"
#include "World.h"
#include "ClientHandle.h"
#include "FurnaceRecipe.h"
#include "Server.h"
#include "Pickup.h"
#include "Root.h"
#include "../UI/Window.h"
#include "../Player.h"
#include "../FurnaceRecipe.h"
#include "../Root.h"
#include <json/json.h>

4
source/FurnaceEntity.h → source/BlockEntities/FurnaceEntity.h
View File

@ -2,8 +2,8 @@
#pragma once
#include "BlockEntity.h"
#include "UI/WindowOwner.h"
#include "Item.h"
#include "../UI/WindowOwner.h"
#include "../Item.h"

2
source/JukeboxEntity.cpp → source/BlockEntities/JukeboxEntity.cpp
View File

@ -2,7 +2,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "JukeboxEntity.h"
#include "World.h"
#include "../World.h"
#include <json/json.h>

2
source/JukeboxEntity.h → source/BlockEntities/JukeboxEntity.h
View File

@ -2,7 +2,7 @@
#pragma once
#include "BlockEntity.h"
#include "Player.h"
#include "../Player.h"

2
source/NoteEntity.cpp → source/BlockEntities/NoteEntity.cpp
View File

@ -2,7 +2,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "NoteEntity.h"
#include "World.h"
#include "../World.h"
#include <json/json.h>

8
source/NoteEntity.h → source/BlockEntities/NoteEntity.h
View File

@ -15,11 +15,11 @@ namespace Json
enum ENUM_NOTE_INSTRUMENTS
{
E_INST_HARP_PIANO = 0,
E_INST_HARP_PIANO = 0,
E_INST_DOUBLE_BASS = 1,
E_INST_SNARE_DRUM = 2,
E_INST_CLICKS = 3,
E_INST_BASS_DRUM = 4
E_INST_SNARE_DRUM = 2,
E_INST_CLICKS = 3,
E_INST_BASS_DRUM = 4
};

8
source/SignEntity.cpp → source/BlockEntities/SignEntity.cpp
View File

@ -3,10 +3,10 @@
#include "SignEntity.h"
#include "Player.h"
#include "ClientHandle.h"
#include "World.h"
#include "Root.h"
#include "../Player.h"
// #include "ClientHandle.h"
// #include "World.h"
// #include "Root.h"
#include <json/json.h>

0
source/SignEntity.h → source/BlockEntities/SignEntity.h
View File

14
source/Chunk.cpp
View File

@ -12,13 +12,13 @@
#include "Server.h"
#include "zlib.h"
#include "Defines.h"
#include "ChestEntity.h"
#include "DispenserEntity.h"
#include "DropperEntity.h"
#include "FurnaceEntity.h"
#include "SignEntity.h"
#include "NoteEntity.h"
#include "JukeboxEntity.h"
#include "BlockEntities/ChestEntity.h"
#include "BlockEntities/DispenserEntity.h"
#include "BlockEntities/DropperEntity.h"
#include "BlockEntities/FurnaceEntity.h"
#include "BlockEntities/JukeboxEntity.h"
#include "BlockEntities/NoteEntity.h"
#include "BlockEntities/SignEntity.h"
#include "Torch.h"
#include "Ladder.h"
#include "Pickup.h"

4
source/ClientHandle.cpp
View File

@ -8,8 +8,8 @@
#include "PluginManager.h"
#include "Player.h"
#include "Inventory.h"
#include "ChestEntity.h"
#include "SignEntity.h"
#include "BlockEntities/ChestEntity.h"
#include "BlockEntities/SignEntity.h"
#include "UI/Window.h"
#include "Item.h"
#include "Torch.h"

2
source/Generating/MineShafts.cpp
View File

@ -19,7 +19,7 @@ in a depth-first processing. Each of the descendants will branch randomly, if no
#include "Globals.h"
#include "MineShafts.h"
#include "../Cuboid.h"
#include "../ChestEntity.h"
#include "../BlockEntities/ChestEntity.h"

8
source/ManualBindings.cpp
View File

@ -13,10 +13,10 @@
#include "WebAdmin.h"
#include "StringMap.h"
#include "ClientHandle.h"
#include "ChestEntity.h"
#include "DispenserEntity.h"
#include "DropperEntity.h"
#include "FurnaceEntity.h"
#include "BlockEntities/ChestEntity.h"
#include "BlockEntities/DispenserEntity.h"
#include "BlockEntities/DropperEntity.h"
#include "BlockEntities/FurnaceEntity.h"
#include "md5/md5.h"

2
source/Player.cpp
View File

@ -9,7 +9,7 @@
#include "World.h"
#include "Pickup.h"
#include "PluginManager.h"
#include "BlockEntity.h"
#include "BlockEntities/BlockEntity.h"
#include "GroupManager.h"
#include "Group.h"
#include "ChatColor.h"

2
source/Simulator/FireSimulator.h
View File

@ -2,7 +2,7 @@
#pragma once
#include "Simulator.h"
#include "../BlockEntity.h"
#include "../BlockEntities/BlockEntity.h"

2
source/Simulator/RedstoneSimulator.cpp
View File

@ -2,7 +2,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "RedstoneSimulator.h"
#include "../DispenserEntity.h"
#include "../BlockEntities/DropSpenserEntity.h"
#include "../Piston.h"
#include "../World.h"
#include "../BlockID.h"

6
source/UI/SlotArea.cpp
View File

@ -6,9 +6,9 @@
#include "Globals.h"
#include "SlotArea.h"
#include "../Player.h"
#include "../ChestEntity.h"
#include "../DropSpenserEntity.h"
#include "../FurnaceEntity.h"
#include "../BlockEntities/ChestEntity.h"
#include "../BlockEntities/DropSpenserEntity.h"
#include "../BlockEntities/FurnaceEntity.h"
#include "../Items/ItemHandler.h"
#include "Window.h"
#include "../CraftingRecipes.h"

6
source/UI/Window.cpp
View File

@ -2,15 +2,15 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "Window.h"
#include "WindowOwner.h"
#include "SlotArea.h"
#include "../Item.h"
#include "../ClientHandle.h"
#include "../Player.h"
#include "../Pickup.h"
#include "../Inventory.h"
#include "WindowOwner.h"
#include "../Items/ItemHandler.h"
#include "SlotArea.h"
#include "../ChestEntity.h"
#include "../BlockEntities/ChestEntity.h"

2
source/UI/WindowOwner.h
View File

@ -1,7 +1,7 @@
#pragma once
#include "../BlockEntity.h"
#include "../BlockEntities/BlockEntity.h"
#include "../Entity.h"
#include "Window.h"

14
source/WorldStorage/NBTChunkSerializer.cpp
View File

@ -5,13 +5,13 @@
#include "Globals.h"
#include "NBTChunkSerializer.h"
#include "../BlockID.h"
#include "../ChestEntity.h"
#include "../DispenserEntity.h"
#include "../DropperEntity.h"
#include "../FurnaceEntity.h"
#include "../SignEntity.h"
#include "../NoteEntity.h"
#include "../JukeboxEntity.h"
#include "../BlockEntities/ChestEntity.h"
#include "../BlockEntities/DispenserEntity.h"
#include "../BlockEntities/DropperEntity.h"
#include "../BlockEntities/FurnaceEntity.h"
#include "../BlockEntities/JukeboxEntity.h"
#include "../BlockEntities/NoteEntity.h"
#include "../BlockEntities/SignEntity.h"
#include "../ItemGrid.h"
#include "../StringCompression.h"
#include "../Entity.h"

14
source/WorldStorage/WSSAnvil.cpp
View File

@ -9,13 +9,13 @@
#include "../World.h"
#include "zlib.h"
#include "../BlockID.h"
#include "../ChestEntity.h"
#include "../DispenserEntity.h"
#include "../DropperEntity.h"
#include "../FurnaceEntity.h"
#include "../SignEntity.h"
#include "../NoteEntity.h"
#include "../JukeboxEntity.h"
#include "../BlockEntities/ChestEntity.h"
#include "../BlockEntities/DispenserEntity.h"
#include "../BlockEntities/DropperEntity.h"
#include "../BlockEntities/FurnaceEntity.h"
#include "../BlockEntities/JukeboxEntity.h"
#include "../BlockEntities/NoteEntity.h"
#include "../BlockEntities/SignEntity.h"
#include "../Item.h"
#include "../ItemGrid.h"
#include "../StringCompression.h"

13
source/WorldStorage/WSSCompact.cpp
View File

@ -9,13 +9,12 @@
#include "zlib.h"
#include <json/json.h>
#include "../StringCompression.h"
#include "../ChestEntity.h"
#include "../SignEntity.h"
#include "../DispenserEntity.h"
#include "../FurnaceEntity.h"
#include "../NoteEntity.h"
#include "../JukeboxEntity.h"
#include "../BlockID.h"
#include "../BlockEntities/ChestEntity.h"
#include "../BlockEntities/DispenserEntity.h"
#include "../BlockEntities/FurnaceEntity.h"
#include "../BlockEntities/JukeboxEntity.h"
#include "../BlockEntities/NoteEntity.h"
#include "../BlockEntities/SignEntity.h"