📃 Finished lua-ing

src/entities/entity.h

@@ -12,6 +12,7 @@
 #ifndef MINESERVER_ENTITY_H
 #define MINESERVER_ENTITY_H
 
+#include <plugins/luaheaders.h>
 #include <types/vector.hpp>
 #include <types/angle.hpp>
 #include <types/uuid.h>
@@ -57,7 +58,24 @@ class IEntity
      */
     UUID uuid;
 
-    // TODO implement everything in Lua
+    /**
+     * @brief Loads the IEntity class to a Lua one
+     *
+     * @param state the state to load to
+     * @param namespaceName the namespace to load to
+     */
+    static void loadLua(lua_State *state, const char *namespaceName)
+    {
+        luabridge::getGlobalNamespace(state)
+            .beginNamespace(namespaceName)
+            .beginClass<IEntity>("IEntity")
+            .addProperty("position", &IEntity::position)
+            .addProperty("yaw", &IEntity::yaw)
+            .addProperty("pitch", &IEntity::pitch)
+            .addProperty("uuid", &IEntity::uuid)
+            .endClass()
+            .endNamespace();
+    }
 };
 
 /**
@@ -75,7 +93,21 @@ class ILiving : public IEntity
      *
      */
     virtual ~ILiving() = default;
-    // TODO implement everything in Lua
+
+    /**
+     * @brief Loads the ILiving class to a Lua one
+     *
+     * @param state the state to load to
+     * @param namespaceName the namespace to load to
+     */
+    static void loadLua(lua_State *state, const char *namespaceName)
+    {
+        luabridge::getGlobalNamespace(state)
+            .beginNamespace(namespaceName)
+            .beginClass<ILiving>("ILiving")
+            .endClass()
+            .endNamespace();
+    }
 };
 
 #endif // MINESERVER_ENTITY_H

src/entities/luaregentities.hpp

@@ -0,0 +1,33 @@
+/**
+ * @file luaregentities.hpp
+ * @author Lygaen
+ * @brief Utility for loading types lua classes
+ * @version 0.1
+ * @date 2024-01-15
+ *
+ * @copyright Copyright (c) 2024
+ *
+ */
+
+#ifndef MINESERVER_LUAREGENTITIES_H
+#define MINESERVER_LUAREGENTITIES_H
+
+#include <plugins/luaheaders.h>
+#include <entities/entity.h>
+#include <entities/player.h>
+
+/**
+ * @brief Loads entities classes to lua
+ *
+ * @param state the lua state to load to
+ */
+void loadEntitiesLua(lua_State *state)
+{
+    const char *namespaceName = "entities";
+
+    IEntity::loadLua(state, namespaceName);
+    ILiving::loadLua(state, namespaceName);
+    Player::loadLua(state, namespaceName);
+}
+
+#endif // MINESERVER_LUAREGENTITIES_H

src/entities/player.h

@@ -40,7 +40,22 @@ class Player : public ILiving
      * Also called the username or tag
      */
     std::string name;
-    // TODO implement everything in Lua
+
+    /**
+     * @brief Loads the Player class to a Lua one
+     *
+     * @param state the state to load to
+     * @param namespaceName the namespace to load to
+     */
+    static void loadLua(lua_State *state, const char *namespaceName)
+    {
+        luabridge::getGlobalNamespace(state)
+            .beginNamespace(namespaceName)
+            .beginClass<Player>("Player")
+            .addProperty("name", &Player::name)
+            .endClass()
+            .endNamespace();
+    }
 };
 
 #endif // MINESERVER_PLAYER_H

src/net/packets/login/encryptionexchange.h

@@ -20,6 +20,10 @@
  *
  * Used in protocol encryption scheme,
  * for the server to ask to the client.
+ *
+ * It is not exposed to lua for security
+ * reasons. A plugin should not handle
+ * encryption and stuff.
  */
 class EncryptionRequest : public IPacket
 {
@@ -55,15 +59,17 @@ class EncryptionRequest : public IPacket
     @deprecated should not be used, useless
     */
     void read(IMCStream *stream) override;
-
-    // TODO implement everything in Lua
 };
 
 /**
  * @brief Encryption Response Packet
  *
  * Used to verify the verify token as well
  * as encrypting the channel with the shared secret.
+ *
+ * It is not exposed to lua for security
+ * reasons. A plugin should not handle
+ * encryption and stuff.
  */
 class EncryptionResponse : public IPacket
 {
@@ -114,8 +120,6 @@ class EncryptionResponse : public IPacket
      * @param stream the stream to read from
      */
     void read(IMCStream *stream) override;
-
-    // TODO implement everything in Lua
 };
 
 #endif // MINESERVER_ENCRYPTIONEXCHANGE_H

src/net/packets/login/setcompression.h

@@ -17,6 +17,9 @@
 /**
  * @brief Set Compression Packet
  *
+ * Is not exposed to lua as it could
+ * break if the threshold value is
+ * modified.
  */
 class SetCompression : public IPacket
 {
@@ -48,8 +51,6 @@ class SetCompression : public IPacket
      * @deprecated should not be used, useless
      */
     void read(IMCStream *stream) override;
-
-    // TODO implement everything in Lua
 };
 
 #endif // MINESERVER_SETCOMPRESSION_H

src/net/packets/luaregpackets.hpp

@@ -15,6 +15,7 @@
 #include <net/packets/status/serverlist.h>
 #include <net/packets/status/pingpong.h>
 #include <net/packets/login/loginstartend.h>
+#include <net/packets/play/luaregplaypackets.hpp>
 #include <net/packets/handshake.h>
 
 /**
@@ -28,6 +29,8 @@ void loadPacketsLua(lua_State *state)
     LoginStart::loadLua(state, namespaceName);
     LoginSuccess::loadLua(state, namespaceName);
 
+    loadPlayPacketsLua(state);
+
     ServerListPacket::loadLua(state, namespaceName);
     PingPongPacket::loadLua(state, namespaceName);
 

src/net/packets/play/disconnect.cpp

@@ -23,6 +23,17 @@ void DisconnectLogin::read(IMCStream *stream)
     throw std::runtime_error("DisconnectLogin read should not be called !");
 }
 
+void DisconnectLogin::loadLua(lua_State *state, const char *baseNamespaceName)
+{
+    luabridge::getGlobalNamespace(state)
+        .beginNamespace(baseNamespaceName)
+        .beginClass<DisconnectLogin>("DisconnectLogin")
+        .addConstructor<void(const ChatMessage &)>()
+        .addProperty("reason", &DisconnectLogin::reason)
+        .endClass()
+        .endNamespace();
+}
+
 void DisconnectPlay::write(IMCStream *stream)
 {
     stream->writeChat(reason);
@@ -34,3 +45,14 @@ void DisconnectPlay::read(IMCStream *stream)
     // Does nothing
     throw std::runtime_error("DisconnectPlay read should not be called !");
 }
+
+void DisconnectPlay::loadLua(lua_State *state, const char *baseNamespaceName)
+{
+    luabridge::getGlobalNamespace(state)
+        .beginNamespace(baseNamespaceName)
+        .beginClass<DisconnectPlay>("DisconnectPlay")
+        .addConstructor<void(const ChatMessage &)>()
+        .addProperty("reason", &DisconnectPlay::reason)
+        .endClass()
+        .endNamespace();
+}

src/net/packets/play/disconnect.h

@@ -48,7 +48,13 @@ class DisconnectPlay : public IPacket
      */
     void read(IMCStream *stream) override;
 
-    // TODO implement everything in Lua
+    /**
+     * @brief Loads packet as lua class
+     *
+     * @param state lua state to load to
+     * @param baseNamespaceName the base namespace name to load to
+     */
+    static void loadLua(lua_State *state, const char *baseNamespaceName);
 };
 
 /**
@@ -85,7 +91,13 @@ class DisconnectLogin : public IPacket
      */
     void read(IMCStream *stream) override;
 
-    // TODO implement everything in Lua
+    /**
+     * @brief Loads packet as lua class
+     *
+     * @param state lua state to load to
+     * @param baseNamespaceName the base namespace name to load to
+     */
+    static void loadLua(lua_State *state, const char *baseNamespaceName);
 };
 
 #endif // MINESERVER_DISCONNECT_H

src/net/packets/play/luaregplaypackets.hpp

@@ -0,0 +1,31 @@
+/**
+ * @file luaregplaypackets.hpp
+ * @author Lygaen
+ * @brief Utility for loading types lua classes
+ * @version 0.1
+ * @date 2024-01-15
+ *
+ * @copyright Copyright (c) 2024
+ *
+ */
+
+#ifndef MINESERVER_LUAREGPLAYPACKETS_H
+#define MINESERVER_LUAREGPLAYPACKETS_H
+
+#include <plugins/luaheaders.h>
+#include <net/packets/play/disconnect.h>
+
+/**
+ * @brief Loads entities classes to lua
+ *
+ * @param state the lua state to load to
+ */
+void loadPlayPacketsLua(lua_State *state)
+{
+    const char *namespaceName = "packets";
+
+    DisconnectLogin::loadLua(state, namespaceName);
+    DisconnectPlay::loadLua(state, namespaceName);
+}
+
+#endif // MINESERVER_LUAREGPLAYPACKETS_H

src/plugins/plugins.cpp

@@ -18,6 +18,7 @@
 #include <net/luaregnet.hpp>
 #include <utils/luaregutils.hpp>
 #include <plugins/events/luaregevents.hpp>
+#include <entities/luaregentities.hpp>
 
 Plugin::Plugin(std::string path) : path(std::move(path)), state(nullptr)
 {
@@ -64,6 +65,7 @@ void Plugin::defineLibs()
     loadEventsLua(state);
     loadUtilsLua(state);
     loadNetLua(state);
+    loadEntitiesLua(state);
 }
 
 PluginsManager::PluginsManager() : plugins()

src/types/angle.hpp

@@ -13,6 +13,7 @@
 #define MINESERVER_ANGLE_H
 
 #include <cstddef>
+#include <plugins/luaheaders.h>
 
 /**
  * @brief Angle class holder
@@ -70,7 +71,23 @@ class Angle
         return value;
     }
 
-    // TODO implement everything in Lua
+    /**
+     * @brief Loads Angle to lua state
+     *
+     * @param state lua state
+     * @param namespaceName base namespace name
+     */
+    static void loadLua(lua_State *state, const char *namespaceName)
+    {
+        luabridge::getGlobalNamespace(state)
+            .beginNamespace(namespaceName)
+            .beginClass<Angle>("Angle")
+            .addConstructor<void(float), void(std::byte)>()
+            .addFunction("getDegrees", &Angle::getDegrees)
+            .addFunction("getByte", &Angle::getByte)
+            .endClass()
+            .endNamespace();
+    }
 };
 
 #endif // MINESERVER_ANGLE_H

src/types/luaregtypes.hpp

@@ -15,6 +15,8 @@
 #include <plugins/luaheaders.h>
 #include <types/clientstate.h>
 #include <types/chatmessage.h>
+#include <types/angle.hpp>
+#include <types/vector.hpp>
 #include <types/uuid.h>
 
 /**
@@ -29,6 +31,8 @@ void loadTypesLua(lua_State *state)
     UUID::loadLua(state, namespaceName);
     loadClientStateLua(state, namespaceName);
     ChatMessage::loadLua(state, namespaceName);
+    Angle::loadLua(state, namespaceName);
+    loadVectorLua(state, namespaceName);
 }
 
 #endif // MINESERVER_LUAREGTYPES_H