From 09da6e7a6e649e29c044eb2e706ccb249937e5a2 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Thu, 19 Mar 2015 12:19:04 +0100
Subject: [PATCH] AllToLua: Fixed the parse order for bindings generation.

Fixes #1789.
---
 src/Bindings/AllToLua.pkg | 93 +++++++++++++++++++++++----------------
 1 file changed, 56 insertions(+), 37 deletions(-)

diff --git a/src/Bindings/AllToLua.pkg b/src/Bindings/AllToLua.pkg
index 7e174e770..bc0c9300f 100644
--- a/src/Bindings/AllToLua.pkg
+++ b/src/Bindings/AllToLua.pkg
@@ -1,4 +1,19 @@
 
+// AllToLua.pkg
+
+// Defines the bindings that are exported to Lua by the ToLua processor
+
+/*
+	Each file referenced in the $cfile is parsed by ToLua, and bindings are generated for classes and functions
+marked with "// tolua_export", or between the "// tolua_begin" and "// tolua_end" markers.
+
+  Note that if class D inherits from class B, then class B needs to be parsed before class D, otherwise the
+inheritance doesn't work properly (#1789).
+*/
+
+
+
+
 $#include "../Globals.h"
 
 // Typedefs from Globals.h, so that we don't have to process that file:
@@ -33,49 +48,12 @@ $cfile "../StringUtils.h"
 $cfile "../Defines.h"
 $cfile "../ChatColor.h"
 $cfile "../ClientHandle.h"
-$cfile "../Entities/ArrowEntity.h"
-$cfile "../Entities/Entity.h"
-$cfile "../Entities/EntityEffect.h"
-$cfile "../Entities/ExpBottleEntity.h"
-$cfile "../Entities/FireChargeEntity.h"
-$cfile "../Entities/FireworkEntity.h"
-$cfile "../Entities/Floater.h"
-$cfile "../Entities/GhastFireballEntity.h"
-$cfile "../Entities/HangingEntity.h"
-$cfile "../Entities/ItemFrame.h"
-$cfile "../Entities/Pawn.h"
-$cfile "../Entities/Player.h"
-$cfile "../Entities/Painting.h"
-$cfile "../Entities/Pickup.h"
-$cfile "../Entities/ProjectileEntity.h"
-$cfile "../Entities/SplashPotionEntity.h"
-$cfile "../Entities/ThrownEggEntity.h"
-$cfile "../Entities/ThrownEnderPearlEntity.h"
-$cfile "../Entities/ThrownSnowballEntity.h"
-$cfile "../Entities/TNTEntity.h"
-$cfile "../Entities/WitherSkullEntity.h"
 $cfile "../Server.h"
 $cfile "../World.h"
 $cfile "../Inventory.h"
 $cfile "../Enchantments.h"
 $cfile "../Item.h"
 $cfile "../ItemGrid.h"
-$cfile "../BlockEntities/BeaconEntity.h"
-$cfile "../BlockEntities/BlockEntity.h"
-$cfile "../BlockEntities/BlockEntityWithItems.h"
-$cfile "../BlockEntities/ChestEntity.h"
-$cfile "../BlockEntities/CommandBlockEntity.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 "../BlockEntities/MobHeadEntity.h"
-$cfile "../BlockEntities/MobSpawnerEntity.h"
-$cfile "../BlockEntities/FlowerPotEntity.h"
 $cfile "../WebAdmin.h"
 $cfile "../Root.h"
 $cfile "../Cuboid.h"
@@ -93,6 +71,47 @@ $cfile "../Scoreboard.h"
 $cfile "../Statistics.h"
 $cfile "../Protocol/MojangAPI.h"
 
+// Entities:
+$cfile "../Entities/Entity.h"
+$cfile "../Entities/Pawn.h"
+$cfile "../Entities/ProjectileEntity.h"
+$cfile "../Entities/ArrowEntity.h"
+$cfile "../Entities/EntityEffect.h"
+$cfile "../Entities/ExpBottleEntity.h"
+$cfile "../Entities/FireChargeEntity.h"
+$cfile "../Entities/FireworkEntity.h"
+$cfile "../Entities/Floater.h"
+$cfile "../Entities/GhastFireballEntity.h"
+$cfile "../Entities/HangingEntity.h"
+$cfile "../Entities/ItemFrame.h"
+$cfile "../Entities/Player.h"
+$cfile "../Entities/Painting.h"
+$cfile "../Entities/Pickup.h"
+$cfile "../Entities/SplashPotionEntity.h"
+$cfile "../Entities/ThrownEggEntity.h"
+$cfile "../Entities/ThrownEnderPearlEntity.h"
+$cfile "../Entities/ThrownSnowballEntity.h"
+$cfile "../Entities/TNTEntity.h"
+$cfile "../Entities/WitherSkullEntity.h"
+
+// Block entities:
+$cfile "../BlockEntities/BlockEntity.h"
+$cfile "../BlockEntities/BeaconEntity.h"
+$cfile "../BlockEntities/BlockEntityWithItems.h"
+$cfile "../BlockEntities/ChestEntity.h"
+$cfile "../BlockEntities/CommandBlockEntity.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 "../BlockEntities/MobHeadEntity.h"
+$cfile "../BlockEntities/MobSpawnerEntity.h"
+$cfile "../BlockEntities/FlowerPotEntity.h"
+