From 1ca4a6f3a5e114fb9571d9c451c2e9185805bfe4 Mon Sep 17 00:00:00 2001
From: Qiuzhizhe <42761326+quizhizhe@users.noreply.github.com>
Date: Fri, 30 Sep 2022 11:09:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=B3=E5=B0=91=E4=B8=8D=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LiteLoader/Header/MC/ColorFormat.hpp    |  2 +-
 LiteLoader/Header/MC/RakNet.hpp         |  3 ++-
 LiteLoader/Header/MC/ScoreboardId.hpp   |  8 ++++----
 LiteLoader/Header/MC/Types.hpp          |  6 +++---
 LiteLoader/Kernel/MC/ColorFormatAPI.cpp | 18 +++++++++---------
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/LiteLoader/Header/MC/ColorFormat.hpp b/LiteLoader/Header/MC/ColorFormat.hpp
index 01f4672..438632f 100644
--- a/LiteLoader/Header/MC/ColorFormat.hpp
+++ b/LiteLoader/Header/MC/ColorFormat.hpp
@@ -4,7 +4,7 @@
 #include "../Global.h"
 
 #define BEFORE_EXTRA
-using namespace mce;
+using mce::Color;
 #undef BEFORE_EXTRA
 
 namespace ColorFormat {
diff --git a/LiteLoader/Header/MC/RakNet.hpp b/LiteLoader/Header/MC/RakNet.hpp
index a38ab69..741323c 100644
--- a/LiteLoader/Header/MC/RakNet.hpp
+++ b/LiteLoader/Header/MC/RakNet.hpp
@@ -25,7 +25,8 @@ namespace RakNet {
 
     struct SystemAddress {
         char filler[17 * 8]; // uncertain?
-        MCAPI void ToString_New(bool, char, char*);
+    private:
+        MCAPI void ToString_New(bool, char, char*) const;
     };
     struct RakNetGUID {
         uint64_t unk;
diff --git a/LiteLoader/Header/MC/ScoreboardId.hpp b/LiteLoader/Header/MC/ScoreboardId.hpp
index 7e8ea59..28c6559 100644
--- a/LiteLoader/Header/MC/ScoreboardId.hpp
+++ b/LiteLoader/Header/MC/ScoreboardId.hpp
@@ -26,14 +26,14 @@ public:
         return id != a1.id;
     }
     bool isValid(){
-        return *this != ScoreboardId::INVALID;
+        return *this != 0xFFFFFFFF;
     }
 #undef AFTER_EXTRA
 #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SCOREBOARDID
 public:
-    struct ScoreboardId& operator=(struct ScoreboardId const &);
-    // ScoreboardId(struct ScoreboardId const &)= delete;
-    // ScoreboardId()= delete;
+    struct ScoreboardId& operator=(struct ScoreboardId const &) = delete;
+    ScoreboardId(struct ScoreboardId const &)= delete;
+    //ScoreboardId()= delete;
 #endif
 public:
 #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCOREBOARDID
diff --git a/LiteLoader/Header/MC/Types.hpp b/LiteLoader/Header/MC/Types.hpp
index 3a26e06..047a6c7 100644
--- a/LiteLoader/Header/MC/Types.hpp
+++ b/LiteLoader/Header/MC/Types.hpp
@@ -139,9 +139,9 @@ public:
     LIAPI double deltaE94(mce::Color const& dst) const; // 1.0 for JND
     LIAPI double deltaE00(mce::Color const& dst) const; // 1.0 for JND
 
-    MCAPI static mce::Color const NIL;
-    MCAPI static class mce::Color fromHexString(std::string const&);
-    MCAPI bool operator==(class mce::Color const&) const;
+    MCAPI static Color const NIL;
+    MCAPI static class Color fromHexString(std::string const&);
+    MCAPI bool operator==(class Color const&) const;
     MCAPI int toABGR(void) const;
     MCAPI int toARGB(void) const;
     MCAPI std::string toHexString(void) const;
diff --git a/LiteLoader/Kernel/MC/ColorFormatAPI.cpp b/LiteLoader/Kernel/MC/ColorFormatAPI.cpp
index 6054c01..ddc236f 100644
--- a/LiteLoader/Kernel/MC/ColorFormatAPI.cpp
+++ b/LiteLoader/Kernel/MC/ColorFormatAPI.cpp
@@ -102,7 +102,7 @@ std::string consoleCodeFromColorCode(std::string const& mcCode) {
     return iter->second;
 }
 
-mce::Color ColorFromConsoleCode(std::string const& console) {
+Color ColorFromConsoleCode(std::string const& console) {
     unsigned char decoration = 0;
     unsigned char r = 0;
     unsigned char g = 0;
@@ -110,10 +110,10 @@ mce::Color ColorFromConsoleCode(std::string const& console) {
     std::istringstream iss(console);
     int c = 0;
     if (iss.get() != '\x1b' || iss.get() != '[')
-        return mce::Color::NIL;
+        return Color::NIL;
     c = __readUnsignedChar(decoration, iss);
     if (c == EOF)
-        return mce::Color::NIL;
+        return Color::NIL;
     if (c == 'm') {
         auto codeIter = decorationToColorCodeMap.find(decoration);
         if (codeIter != decorationToColorCodeMap.end())
@@ -124,19 +124,19 @@ mce::Color ColorFromConsoleCode(std::string const& console) {
         unsigned char unk;
         c = __readUnsignedChar(unk, iss);
         if (c != ';')
-            return mce::Color::NIL;
+            return Color::NIL;
         c = __readUnsignedChar(r, iss);
         if (c != ';')
-            return mce::Color::NIL;
+            return Color::NIL;
         c = __readUnsignedChar(g, iss);
         if (c != ';')
-            return mce::Color::NIL;
+            return Color::NIL;
         c = __readUnsignedChar(b, iss);
         if (c != 'm')
-            return mce::Color::NIL;
-        return mce::Color(r, g, b);
+            return Color::NIL;
+        return Color(r, g, b);
     }
-    return mce::Color::NIL;
+    return Color::NIL;
 }
 
 std::string nearestColorCodeFromConsoleCode(std::string const& code) {