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

Moved bindings-related to a Bindings subfolder.

Browse Source 
Ref.: #407
This commit is contained in:
madmaxoft 2013-12-08 12:17:54 +01:00
parent 13dd1b0c94
commit 044fd237b6
42 changed files with 1259 additions and 1264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
VC2008/MCServer.vcproj
View File

@ -1851,7 +1851,7 @@
Name="Bindings" Name="Bindings"
> >
<File <File
RelativePath="..\src\AllToLua.pkg" RelativePath="..\src\Bindings\AllToLua.pkg"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
@ -1910,11 +1910,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\MCServer\API.txt" RelativePath="..\src\Bindings\Bindings.cpp"
>
</File>
<File
RelativePath="..\src\Bindings.cpp"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
@ -1958,75 +1954,75 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\src\Bindings.h" RelativePath="..\src\Bindings\Bindings.h"
> >
</File> </File>
<File <File
RelativePath="..\src\LuaFunctions.h" RelativePath="..\src\Bindings\LuaFunctions.h"
> >
</File> </File>
<File <File
RelativePath="..\src\LuaState.cpp" RelativePath="..\src\Bindings\LuaState.cpp"
> >
</File> </File>
<File <File
RelativePath="..\src\LuaState.h" RelativePath="..\src\Bindings\LuaState.h"
> >
</File> </File>
<File <File
RelativePath="..\src\LuaWindow.cpp" RelativePath="..\src\Bindings\LuaWindow.cpp"
> >
</File> </File>
<File <File
RelativePath="..\src\LuaWindow.h" RelativePath="..\src\Bindings\LuaWindow.h"
> >
</File> </File>
<File <File
RelativePath="..\src\ManualBindings.cpp" RelativePath="..\src\Bindings\ManualBindings.cpp"
> >
</File> </File>
<File <File
RelativePath="..\src\ManualBindings.h" RelativePath="..\src\Bindings\ManualBindings.h"
> >
</File> </File>
<File <File
RelativePath="..\src\Plugin.cpp" RelativePath="..\src\Bindings\Plugin.cpp"
> >
</File> </File>
<File <File
RelativePath="..\src\Plugin.h" RelativePath="..\src\Bindings\Plugin.h"
> >
</File> </File>
<File <File
RelativePath="..\src\PluginLua.cpp" RelativePath="..\src\Bindings\PluginLua.cpp"
> >
</File> </File>
<File <File
RelativePath="..\src\PluginLua.h" RelativePath="..\src\Bindings\PluginLua.h"
> >
</File> </File>
<File <File
RelativePath="..\src\PluginManager.cpp" RelativePath="..\src\Bindings\PluginManager.cpp"
> >
</File> </File>
<File <File
RelativePath="..\src\PluginManager.h" RelativePath="..\src\Bindings\PluginManager.h"
> >
</File> </File>
<File <File
RelativePath="..\src\tolua++.h" RelativePath="..\src\Bindings\tolua++.h"
> >
</File> </File>
<File <File
RelativePath="..\src\tolua_base.h" RelativePath="..\src\Bindings\tolua_base.h"
> >
</File> </File>
<File <File
RelativePath="..\src\WebPlugin.cpp" RelativePath="..\src\Bindings\WebPlugin.cpp"
> >
</File> </File>
<File <File
RelativePath="..\src\WebPlugin.h" RelativePath="..\src\Bindings\WebPlugin.h"
> >
</File> </File>
</Filter> </Filter>

81
src/AllToLua.pkg
View File

@ -1,81 +0,0 @@
$#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
$#include "tolua_base.h"
// Typedefs from Globals.h, so that we don't have to include that file:
typedef long long Int64;
typedef int Int32;
typedef short Int16;
typedef unsigned long long UInt64;
typedef unsigned int UInt32;
typedef unsigned short UInt16;
$cfile "ChunkDef.h"
$cfile "../lib/inifile/iniFile.h"
$cfile "OSSupport/File.h"
$cfile "BlockID.h"
$cfile "StringUtils.h"
$cfile "Defines.h"
$cfile "LuaFunctions.h"
$cfile "ChatColor.h"
$cfile "ClientHandle.h"
$cfile "Entities/Entity.h"
$cfile "Entities/Pawn.h"
$cfile "Entities/Player.h"
$cfile "Entities/Pickup.h"
$cfile "Entities/ProjectileEntity.h"
$cfile "PluginManager.h"
$cfile "Plugin.h"
$cfile "PluginLua.h"
$cfile "Server.h"
$cfile "World.h"
$cfile "Inventory.h"
$cfile "Enchantments.h"
$cfile "Item.h"
$cfile "ItemGrid.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 "BlockEntities/FurnaceEntity.h"
$cfile "BlockEntities/HopperEntity.h"
$cfile "BlockEntities/JukeboxEntity.h"
$cfile "BlockEntities/NoteEntity.h"
$cfile "BlockEntities/SignEntity.h"
$cfile "WebAdmin.h"
$cfile "WebPlugin.h"
$cfile "Root.h"
$cfile "Vector3f.h"
$cfile "Vector3d.h"
$cfile "Vector3i.h"
$cfile "Matrix4f.h"
$cfile "Cuboid.h"
$cfile "BoundingBox.h"
$cfile "Tracer.h"
$cfile "Group.h"
$cfile "BlockArea.h"
$cfile "Generating/ChunkDesc.h"
$cfile "CraftingRecipes.h"
$cfile "UI/Window.h"
$cfile "LuaWindow.h"
$cfile "Mobs/Monster.h"
// Need to declare this class so that the usertype is properly registered in Bindings.cpp -
// it seems impossible to register a usertype in ManualBindings.cpp
class cLineBlockTracer;

0
src/AllToLua.bat → src/Bindings/AllToLua.bat
View File

82
src/Bindings/AllToLua.pkg Normal file
View File

@ -0,0 +1,82 @@
$#include "../Globals.h"
$#include "tolua_base.h"
// Typedefs from Globals.h, so that we don't have to process that file:
typedef long long Int64;
typedef int Int32;
typedef short Int16;
typedef unsigned long long UInt64;
typedef unsigned int UInt32;
typedef unsigned short UInt16;
$cfile "../ChunkDef.h"
$cfile "../../lib/inifile/iniFile.h"
$cfile "../OSSupport/File.h"
$cfile "LuaFunctions.h"
$cfile "PluginManager.h"
$cfile "Plugin.h"
$cfile "PluginLua.h"
$cfile "WebPlugin.h"
$cfile "LuaWindow.h"
$cfile "../BlockID.h"
$cfile "../StringUtils.h"
$cfile "../Defines.h"
$cfile "../ChatColor.h"
$cfile "../ClientHandle.h"
$cfile "../Entities/Entity.h"
$cfile "../Entities/Pawn.h"
$cfile "../Entities/Player.h"
$cfile "../Entities/Pickup.h"
$cfile "../Entities/ProjectileEntity.h"
$cfile "../Server.h"
$cfile "../World.h"
$cfile "../Inventory.h"
$cfile "../Enchantments.h"
$cfile "../Item.h"
$cfile "../ItemGrid.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 "../BlockEntities/FurnaceEntity.h"
$cfile "../BlockEntities/HopperEntity.h"
$cfile "../BlockEntities/JukeboxEntity.h"
$cfile "../BlockEntities/NoteEntity.h"
$cfile "../BlockEntities/SignEntity.h"
$cfile "../WebAdmin.h"
$cfile "../Root.h"
$cfile "../Vector3f.h"
$cfile "../Vector3d.h"
$cfile "../Vector3i.h"
$cfile "../Matrix4f.h"
$cfile "../Cuboid.h"
$cfile "../BoundingBox.h"
$cfile "../Tracer.h"
$cfile "../Group.h"
$cfile "../BlockArea.h"
$cfile "../Generating/ChunkDesc.h"
$cfile "../CraftingRecipes.h"
$cfile "../UI/Window.h"
$cfile "../Mobs/Monster.h"
// Need to declare this class so that the usertype is properly registered in Bindings.cpp -
// it seems impossible to register a usertype in ManualBindings.cpp
class cLineBlockTracer;

0
src/AllToLua.sh → src/Bindings/AllToLua.sh Executable file → Normal file
View File

2222
src/Bindings.cpp → src/Bindings/Bindings.cpp
View File

File diff suppressed because it is too large Load Diff

2
src/Bindings.h → src/Bindings/Bindings.h
View File

@ -1,6 +1,6 @@
/* /*
** Lua binding: AllToLua ** Lua binding: AllToLua
** Generated automatically by tolua++-1.0.92 on 12/07/13 14:15:50. ** Generated automatically by tolua++-1.0.92 on 12/08/13 12:15:48.
*/ */
/* Exported function */ /* Exported function */

2
src/LuaFunctions.h → src/Bindings/LuaFunctions.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "MCLogger.h" #include "../MCLogger.h"
#include <time.h> #include <time.h>
// tolua_begin // tolua_begin

0
src/LuaState.cpp → src/Bindings/LuaState.cpp
View File

0
src/LuaState.h → src/Bindings/LuaState.h
View File

4
src/LuaWindow.cpp → src/Bindings/LuaWindow.cpp
View File

@ -5,9 +5,9 @@
#include "Globals.h" #include "Globals.h"
#include "LuaWindow.h" #include "LuaWindow.h"
#include "UI/SlotArea.h" #include "../UI/SlotArea.h"
#include "PluginLua.h" #include "PluginLua.h"
#include "Entities/Player.h" #include "../Entities/Player.h"
#include "lua/src/lauxlib.h" // Needed for LUA_REFNIL #include "lua/src/lauxlib.h" // Needed for LUA_REFNIL

4
src/LuaWindow.h → src/Bindings/LuaWindow.h
View File

@ -9,8 +9,8 @@
#pragma once #pragma once
#include "UI/Window.h" #include "../UI/Window.h"
#include "ItemGrid.h" #include "../ItemGrid.h"

24
src/ManualBindings.cpp → src/Bindings/ManualBindings.cpp
View File

@ -4,22 +4,22 @@
#include "ManualBindings.h" #include "ManualBindings.h"
#include "tolua++.h" #include "tolua++.h"
#include "Root.h"
#include "World.h"
#include "Plugin.h" #include "Plugin.h"
#include "PluginLua.h" #include "PluginLua.h"
#include "PluginManager.h" #include "PluginManager.h"
#include "Entities/Player.h"
#include "WebAdmin.h"
#include "ClientHandle.h"
#include "BlockEntities/ChestEntity.h"
#include "BlockEntities/DispenserEntity.h"
#include "BlockEntities/DropperEntity.h"
#include "BlockEntities/FurnaceEntity.h"
#include "BlockEntities/HopperEntity.h"
#include "md5/md5.h"
#include "LuaWindow.h" #include "LuaWindow.h"
#include "LineBlockTracer.h" #include "../Root.h"
#include "../World.h"
#include "../Entities/Player.h"
#include "../WebAdmin.h"
#include "../ClientHandle.h"
#include "../BlockEntities/ChestEntity.h"
#include "../BlockEntities/DispenserEntity.h"
#include "../BlockEntities/DropperEntity.h"
#include "../BlockEntities/FurnaceEntity.h"
#include "../BlockEntities/HopperEntity.h"
#include "md5/md5.h"
#include "../LineBlockTracer.h"

0
src/ManualBindings.h → src/Bindings/ManualBindings.h
View File

0
src/Plugin.cpp → src/Bindings/Plugin.cpp
View File

1
src/Plugin.h → src/Bindings/Plugin.h
View File

@ -1,7 +1,6 @@
#pragma once #pragma once
#include "Item.h"
#include "PluginManager.h" #include "PluginManager.h"

2
src/PluginLua.cpp → src/Bindings/PluginLua.cpp
View File

@ -7,7 +7,7 @@
#define LUA_USE_POSIX #define LUA_USE_POSIX
#include "PluginLua.h" #include "PluginLua.h"
#include "CommandOutput.h" #include "../CommandOutput.h"
extern "C" extern "C"
{ {

0
src/PluginLua.h → src/Bindings/PluginLua.h
View File

12
src/PluginManager.cpp → src/Bindings/PluginManager.cpp
View File

@ -4,15 +4,15 @@
#include "PluginManager.h" #include "PluginManager.h"
#include "Plugin.h" #include "Plugin.h"
#include "PluginLua.h" #include "PluginLua.h"
#include "WebAdmin.h" #include "../WebAdmin.h"
#include "Item.h" #include "../Item.h"
#include "Root.h" #include "../Root.h"
#include "Server.h" #include "../Server.h"
#include "CommandOutput.h" #include "../CommandOutput.h"
#include "inifile/iniFile.h" #include "inifile/iniFile.h"
#include "tolua++.h" #include "tolua++.h"
#include "Entities/Player.h" #include "../Entities/Player.h"

2
src/PluginManager.h → src/Bindings/PluginManager.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "Item.h" #include "../Item.h"

6
src/WebPlugin.cpp → src/Bindings/WebPlugin.cpp
View File

@ -2,9 +2,9 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "WebPlugin.h" #include "WebPlugin.h"
#include "WebAdmin.h" #include "../WebAdmin.h"
#include "Server.h" #include "../Server.h"
#include "Root.h" #include "../Root.h"

0
src/WebPlugin.h → src/Bindings/WebPlugin.h
View File

0
src/lua5.1.dll → src/Bindings/lua5.1.dll
View File

0
src/tolua++.exe → src/Bindings/tolua++.exe
View File

0
src/tolua++.h → src/Bindings/tolua++.h
View File

0
src/tolua_base.h → src/Bindings/tolua_base.h
View File

0
src/virtual_method_hooks.lua → src/Bindings/virtual_method_hooks.lua
View File

2
src/BlockEntities/HopperEntity.cpp
View File

@ -7,7 +7,7 @@
#include "HopperEntity.h" #include "HopperEntity.h"
#include "../Chunk.h" #include "../Chunk.h"
#include "../Entities/Player.h" #include "../Entities/Player.h"
#include "../PluginManager.h" #include "../Bindings/PluginManager.h"
#include "ChestEntity.h" #include "ChestEntity.h"
#include "DropSpenserEntity.h" #include "DropSpenserEntity.h"
#include "FurnaceEntity.h" #include "FurnaceEntity.h"

2
src/Blocks/BlockHandler.cpp
View File

@ -4,7 +4,7 @@
#include "../Item.h" #include "../Item.h"
#include "../World.h" #include "../World.h"
#include "../Root.h" #include "../Root.h"
#include "../PluginManager.h" #include "../Bindings/PluginManager.h"
#include "BlockBed.h" #include "BlockBed.h"
#include "BlockBrewingStand.h" #include "BlockBrewingStand.h"
#include "BlockButton.h" #include "BlockButton.h"

2
src/Chunk.cpp
View File

@ -27,7 +27,7 @@
#include "MersenneTwister.h" #include "MersenneTwister.h"
#include "Entities/Player.h" #include "Entities/Player.h"
#include "BlockArea.h" #include "BlockArea.h"
#include "PluginManager.h" #include "Bindings/PluginManager.h"
#include "Blocks/BlockHandler.h" #include "Blocks/BlockHandler.h"
#include "Simulator/FluidSimulator.h" #include "Simulator/FluidSimulator.h"
#include "MobCensus.h" #include "MobCensus.h"

2
src/ChunkMap.cpp
View File

@ -10,7 +10,7 @@
#include "Chunk.h" #include "Chunk.h"
#include "Generating/Trees.h" // used in cChunkMap::ReplaceTreeBlocks() for tree block discrimination #include "Generating/Trees.h" // used in cChunkMap::ReplaceTreeBlocks() for tree block discrimination
#include "BlockArea.h" #include "BlockArea.h"
#include "PluginManager.h" #include "Bindings/PluginManager.h"
#include "Entities/TNTEntity.h" #include "Entities/TNTEntity.h"
#include "Blocks/BlockHandler.h" #include "Blocks/BlockHandler.h"
#include "MobCensus.h" #include "MobCensus.h"

2
src/ClientHandle.cpp
View File

@ -4,7 +4,7 @@
#include "Server.h" #include "Server.h"
#include "World.h" #include "World.h"
#include "Entities/Pickup.h" #include "Entities/Pickup.h"
#include "PluginManager.h" #include "Bindings/PluginManager.h"
#include "Entities/Player.h" #include "Entities/Player.h"
#include "Inventory.h" #include "Inventory.h"
#include "BlockEntities/ChestEntity.h" #include "BlockEntities/ChestEntity.h"

2
src/CraftingRecipes.cpp
View File

@ -6,7 +6,7 @@
#include "Globals.h" #include "Globals.h"
#include "CraftingRecipes.h" #include "CraftingRecipes.h"
#include "Root.h" #include "Root.h"
#include "PluginManager.h" #include "Bindings/PluginManager.h"

2
src/Entities/Entity.cpp
View File

@ -10,7 +10,7 @@
#include "../ClientHandle.h" #include "../ClientHandle.h"
#include "../Chunk.h" #include "../Chunk.h"
#include "../Simulator/FluidSimulator.h" #include "../Simulator/FluidSimulator.h"
#include "../PluginManager.h" #include "../Bindings/PluginManager.h"
#include "../Tracer.h" #include "../Tracer.h"
#include "Minecart.h" #include "Minecart.h"

2
src/Entities/Pickup.cpp
View File

@ -12,7 +12,7 @@
#include "../Simulator/FluidSimulator.h" #include "../Simulator/FluidSimulator.h"
#include "../Server.h" #include "../Server.h"
#include "Player.h" #include "Player.h"
#include "../PluginManager.h" #include "../Bindings/PluginManager.h"
#include "../Item.h" #include "../Item.h"
#include "../Root.h" #include "../Root.h"
#include "../Chunk.h" #include "../Chunk.h"

2
src/Entities/Player.cpp
View File

@ -8,7 +8,7 @@
#include "../UI/WindowOwner.h" #include "../UI/WindowOwner.h"
#include "../World.h" #include "../World.h"
#include "Pickup.h" #include "Pickup.h"
#include "../PluginManager.h" #include "../Bindings/PluginManager.h"
#include "../BlockEntities/BlockEntity.h" #include "../BlockEntities/BlockEntity.h"
#include "../GroupManager.h" #include "../GroupManager.h"
#include "../Group.h" #include "../Group.h"

2
src/Generating/ChunkGenerator.cpp
View File

@ -5,7 +5,7 @@
#include "../World.h" #include "../World.h"
#include "inifile/iniFile.h" #include "inifile/iniFile.h"
#include "../Root.h" #include "../Root.h"
#include "../PluginManager.h" #include "../Bindings/PluginManager.h"
#include "ChunkDesc.h" #include "ChunkDesc.h"
#include "ComposableGenerator.h" #include "ComposableGenerator.h"
#include "Noise3DGenerator.h" #include "Noise3DGenerator.h"

2
src/Root.cpp
View File

@ -8,7 +8,7 @@
#include "FurnaceRecipe.h" #include "FurnaceRecipe.h"
#include "GroupManager.h" #include "GroupManager.h"
#include "CraftingRecipes.h" #include "CraftingRecipes.h"
#include "PluginManager.h" #include "Bindings/PluginManager.h"
#include "MonsterConfig.h" #include "MonsterConfig.h"
#include "Entities/Player.h" #include "Entities/Player.h"
#include "Blocks/BlockHandler.h" #include "Blocks/BlockHandler.h"

2
src/Server.cpp
View File

@ -10,7 +10,7 @@
#include "Root.h" #include "Root.h"
#include "World.h" #include "World.h"
#include "ChunkDef.h" #include "ChunkDef.h"
#include "PluginManager.h" #include "Bindings/PluginManager.h"
#include "GroupManager.h" #include "GroupManager.h"
#include "ChatColor.h" #include "ChatColor.h"
#include "Entities/Player.h" #include "Entities/Player.h"

6
src/WebAdmin.cpp
View File

@ -2,10 +2,10 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "WebAdmin.h" #include "WebAdmin.h"
#include "WebPlugin.h" #include "Bindings/WebPlugin.h"
#include "PluginManager.h" #include "Bindings/PluginManager.h"
#include "Plugin.h" #include "Bindings/Plugin.h"
#include "World.h" #include "World.h"
#include "Entities/Player.h" #include "Entities/Player.h"

2
src/WebAdmin.h
View File

@ -6,7 +6,7 @@
#pragma once #pragma once
#include "OSSupport/Socket.h" #include "OSSupport/Socket.h"
#include "LuaState.h" #include "Bindings/LuaState.h"
#include "inifile/iniFile.h" #include "inifile/iniFile.h"
#include "HTTPServer/HTTPServer.h" #include "HTTPServer/HTTPServer.h"
#include "HTTPServer/HTTPFormParser.h" #include "HTTPServer/HTTPFormParser.h"

3
src/World.cpp
View File

@ -36,12 +36,11 @@
#include "MersenneTwister.h" #include "MersenneTwister.h"
#include "Generating/Trees.h" #include "Generating/Trees.h"
#include "PluginManager.h" #include "Bindings/PluginManager.h"
#include "Blocks/BlockHandler.h" #include "Blocks/BlockHandler.h"
#include "Vector3d.h" #include "Vector3d.h"
#include "Tracer.h" #include "Tracer.h"
#include "tolua++.h"
// DEBUG: Test out the cLineBlockTracer class by tracing a few lines: // DEBUG: Test out the cLineBlockTracer class by tracing a few lines:
#include "LineBlockTracer.h" #include "LineBlockTracer.h"