Minor cosmetic fixes in protocol

adepierre · May 5, 2024 · 51856b1 · 51856b1
1 parent 2f0577d
commit 51856b1
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 9 deletions.
diff --git a/protocolCraft/include/protocolCraft/NetworkType.hpp b/protocolCraft/include/protocolCraft/NetworkType.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <vector>
-
 #include "protocolCraft/BinaryReadWrite.hpp"
 #include "protocolCraft/Utilities/Json.hpp"
 

diff --git a/protocolCraft/include/protocolCraft/Types/CommandNode/BrigadierProperty.hpp b/protocolCraft/include/protocolCraft/Types/CommandNode/BrigadierProperty.hpp
@@ -2,10 +2,11 @@
 
 #if PROTOCOL_VERSION > 344 /* > 1.12.2 */
 #include <memory>
-#include <string>
 
 #include "protocolCraft/NetworkType.hpp"
+#if PROTOCOL_VERSION < 759 /* < 1.19 */
 #include "protocolCraft/Types/Identifier.hpp"
+#endif
 
 namespace ProtocolCraft
 {

diff --git a/protocolCraft/include/protocolCraft/Types/CommandNode/BrigadierPropertyResourceOrTag.hpp b/protocolCraft/include/protocolCraft/Types/CommandNode/BrigadierPropertyResourceOrTag.hpp
@@ -2,6 +2,7 @@
 
 #if PROTOCOL_VERSION > 344 /* > 1.12.2 */
 #include "protocolCraft/Types/CommandNode/BrigadierProperty.hpp"
+#include "protocolCraft/Types/Identifier.hpp"
 
 namespace ProtocolCraft
 {

diff --git a/protocolCraft/include/protocolCraft/Types/GlobalPos.hpp b/protocolCraft/include/protocolCraft/Types/GlobalPos.hpp
@@ -1,8 +1,6 @@
 #if PROTOCOL_VERSION > 758 /* > 1.18.2 */
 #pragma once
 
-#include <string>
-
 #include "protocolCraft/NetworkType.hpp"
 #include "protocolCraft/Types/NetworkPosition.hpp"
 

diff --git a/protocolCraft/include/protocolCraft/Types/PackedRegistryEntry.hpp b/protocolCraft/include/protocolCraft/Types/PackedRegistryEntry.hpp
@@ -23,7 +23,7 @@ namespace ProtocolCraft
             id_ = id__;
         }
 
-        void SetNamespace(const std::optional<NBT::Value>& data_)
+        void SetData(const std::optional<NBT::Value>& data_)
         {
             data = data_;
         }

diff --git a/protocolCraft/include/protocolCraft/Types/Particles/Particle.hpp b/protocolCraft/include/protocolCraft/Types/Particles/Particle.hpp
@@ -263,7 +263,7 @@ namespace ProtocolCraft
         Particle();
         virtual ~Particle();
         std::string_view GetName() const;
-        ParticleType GetType() const;
+        ParticleType GetParticleType() const;
         std::shared_ptr<ParticleOptions> GetOptions() const;
 
         void SetParticleType(const ParticleType particle_type_);

diff --git a/protocolCraft/src/Types/Particles/Particle.cpp b/protocolCraft/src/Types/Particles/Particle.cpp
@@ -282,14 +282,14 @@ namespace ProtocolCraft
             "spit",
         };
 #endif
-        if (particle_type == ParticleType::None)
+        if (particle_type <= ParticleType::None || particle_type >= ParticleType::NUM_PARTICLE_TYPES)
         {
             return "";
         }
         return names[static_cast<size_t>(particle_type)];
     }
 
-    ParticleType Particle::GetType() const
+    ParticleType Particle::GetParticleType() const
     {
         return particle_type;
     }