From PR #72. Thanks @Klotzi111! Merge branch 'various-improvements'

psu-de · Aug 14, 2024 · 4ac5bd7 · 4ac5bd7
2 parents 1516f89 + f09627a
commit 4ac5bd7
Show file tree

Hide file tree

Showing 285 changed files with 10,727 additions and 3,577 deletions.
diff --git a/Components/MineSharp.Auth/MineSharp.Auth.csproj b/Components/MineSharp.Auth/MineSharp.Auth.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>12</LangVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageReadmeFile>README.md</PackageReadmeFile>

diff --git a/Components/MineSharp.ChatComponent/Components/TranslatableComponent.cs b/Components/MineSharp.ChatComponent/Components/TranslatableComponent.cs
@@ -101,11 +101,16 @@ protected override string GetRawMessage(MinecraftData? data)
         var with = With.Select(x => x.GetMessage(data)).ToArray();
         if (data == null)
         {
-            Logger.Warn("Cannot translate message because no minecraft data was provided!");
+            Logger.Warn("Cannot translate message because no minecraft data was provided! For: {TranslationKey}", Translation);
             return string.Join(' ', with);
         }
 
         var rule = data.Language.GetTranslation(Translation)!;
+        if (rule == null)
+        {
+            Logger.Warn("Cannot translate message because no translation string was found! For: {TranslationKey}", Translation);
+            return string.Join(' ', with);
+        }
         return TranslateString(rule, with);
     }
 

diff --git a/Components/MineSharp.ChatComponent/MineSharp.ChatComponent.csproj b/Components/MineSharp.ChatComponent/MineSharp.ChatComponent.csproj
@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <TargetFrameworks>net8.0;net7.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageReadmeFile>README.md</PackageReadmeFile>
 

diff --git a/Components/MineSharp.Commands/CommandTree.cs b/Components/MineSharp.Commands/CommandTree.cs
@@ -1,6 +1,7 @@
 using MineSharp.Commands.Parser;
 using MineSharp.Core;
 using MineSharp.Core.Common;
+using MineSharp.Core.Serialization;
 using MineSharp.Data;
 
 namespace MineSharp.Commands;
@@ -74,12 +75,12 @@ private static CommandNode ReadNode(PacketBuffer buffer, MinecraftData data)
             return null;
         }
 
-        string name;
+        Identifier name;
 
         if (data.Version.Protocol < ProtocolVersion.V_1_19)
         {
             // in 1.18.x, the parser was specified by its name.
-            name = buffer.ReadString();
+            name = buffer.ReadIdentifier();
         }
         else
         {

diff --git a/Components/MineSharp.Commands/MineSharp.Commands.csproj b/Components/MineSharp.Commands/MineSharp.Commands.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <AssemblyName>MineSharp.Commands</AssemblyName>
     <RootNamespace>MineSharp.Commands</RootNamespace>
-    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>12</LangVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageReadmeFile>README.md</PackageReadmeFile>

diff --git a/Components/MineSharp.Commands/Parser/BlockPositionParser.cs b/Components/MineSharp.Commands/Parser/BlockPositionParser.cs
@@ -1,13 +1,16 @@
 using MineSharp.Core.Common;
+using MineSharp.Core.Serialization;
 using MineSharp.Data;
 
 namespace MineSharp.Commands.Parser;
 
 public class BlockPositionParser : IParser
 {
-    public string GetName()
+    public static readonly Identifier BlockPosIdentifier = Identifier.Parse("minecraft:block_pos");
+
+    public Identifier GetName()
     {
-        return "minecraft:block_pos";
+        return BlockPosIdentifier;
     }
 
     public int GetArgumentCount()

diff --git a/Components/MineSharp.Commands/Parser/ColumnPosParser.cs b/Components/MineSharp.Commands/Parser/ColumnPosParser.cs
@@ -1,13 +1,16 @@
 using MineSharp.Core.Common;
+using MineSharp.Core.Serialization;
 using MineSharp.Data;
 
 namespace MineSharp.Commands.Parser;
 
 public class ColumnPosParser : IParser
 {
-    public string GetName()
+    public static readonly Identifier ColumnPosIdentifier = Identifier.Parse("minecraft:column_pos");
+
+    public Identifier GetName()
     {
-        return "minecraft:column_pos";
+        return ColumnPosIdentifier;
     }
 
     public int GetArgumentCount()

diff --git a/Components/MineSharp.Commands/Parser/DoubleParser.cs b/Components/MineSharp.Commands/Parser/DoubleParser.cs
@@ -1,16 +1,19 @@
 using MineSharp.Core.Common;
+using MineSharp.Core.Serialization;
 using MineSharp.Data;
 
 namespace MineSharp.Commands.Parser;
 
 public class DoubleParser : IParser
 {
+    public static readonly Identifier BrigadierDoubleIdentifier = Identifier.Parse("brigadier:double");
+
     public double Min { get; private set; }
     public double Max { get; private set; }
 
-    public string GetName()
+    public Identifier GetName()
     {
-        return "brigadier:double";
+        return BrigadierDoubleIdentifier;
     }
 
     public int GetArgumentCount()

diff --git a/Components/MineSharp.Commands/Parser/EmptyParser.cs b/Components/MineSharp.Commands/Parser/EmptyParser.cs
@@ -1,13 +1,14 @@
 using MineSharp.Core.Common;
+using MineSharp.Core.Serialization;
 using MineSharp.Data;
 
 namespace MineSharp.Commands.Parser;
 
 public class EmptyParser : IParser
 {
-    public string GetName()
+    public Identifier GetName()
     {
-        return string.Empty;
+        return Identifier.Empty;
     }
 
     public int GetArgumentCount()

diff --git a/Components/MineSharp.Commands/Parser/EntityParser.cs b/Components/MineSharp.Commands/Parser/EntityParser.cs
@@ -1,15 +1,18 @@
 using MineSharp.Core.Common;
+using MineSharp.Core.Serialization;
 using MineSharp.Data;
 
 namespace MineSharp.Commands.Parser;
 
 public class EntityParser : IParser
 {
+    public static readonly Identifier EntityIdentifier = Identifier.Parse("minecraft:entity");
+
     public byte Flags { get; private set; }
 
-    public string GetName()
+    public Identifier GetName()
     {
-        return "minecraft:entity";
+        return EntityIdentifier;
     }
 
     public int GetArgumentCount()

diff --git a/Components/MineSharp.Commands/Parser/FloatParser.cs b/Components/MineSharp.Commands/Parser/FloatParser.cs
@@ -1,16 +1,19 @@
 using MineSharp.Core.Common;
+using MineSharp.Core.Serialization;
 using MineSharp.Data;
 
 namespace MineSharp.Commands.Parser;
 
 public class FloatParser : IParser
 {
+    public static readonly Identifier BrigadierFloatIdentifier = Identifier.Parse("brigadier:float");
+
     public float Min { get; private set; }
     public float Max { get; private set; }
 
-    public string GetName()
+    public Identifier GetName()
     {
-        return "brigadier:float";
+        return BrigadierFloatIdentifier;
     }
 
     public int GetArgumentCount()

diff --git a/Components/MineSharp.Commands/Parser/IParser.cs b/Components/MineSharp.Commands/Parser/IParser.cs
@@ -1,11 +1,12 @@
 using MineSharp.Core.Common;
+using MineSharp.Core.Serialization;
 using MineSharp.Data;
 
 namespace MineSharp.Commands.Parser;
 
 public interface IParser
 {
-    public string GetName();
+    public Identifier GetName();
     public int GetArgumentCount();
 
     public void ReadProperties(PacketBuffer buffer, MinecraftData data);

diff --git a/Components/MineSharp.Commands/Parser/IntegerParser.cs b/Components/MineSharp.Commands/Parser/IntegerParser.cs
@@ -1,16 +1,19 @@
 using MineSharp.Core.Common;
+using MineSharp.Core.Serialization;
 using MineSharp.Data;
 
 namespace MineSharp.Commands.Parser;
 
 public class IntegerParser : IParser
 {
+    public static readonly Identifier BrigadierIntegerIdentifier = Identifier.Parse("brigadier:integer");
+
     public int Min { get; private set; }
     public int Max { get; private set; }
 
-    public string GetName()
+    public Identifier GetName()
     {
-        return "brigadier:integer";
+        return BrigadierIntegerIdentifier;
     }
 
     public int GetArgumentCount()

diff --git a/Components/MineSharp.Commands/Parser/LongParser.cs b/Components/MineSharp.Commands/Parser/LongParser.cs
@@ -1,16 +1,19 @@
 using MineSharp.Core.Common;
+using MineSharp.Core.Serialization;
 using MineSharp.Data;
 
 namespace MineSharp.Commands.Parser;
 
 public class LongParser : IParser
 {
+    public static readonly Identifier BrigadierLongIdentifier = Identifier.Parse("brigadier:long");
+
     public long Min { get; private set; }
     public long Max { get; private set; }
 
-    public string GetName()
+    public Identifier GetName()
     {
-        return "brigadier:long";
+        return BrigadierLongIdentifier;
     }
 
     public int GetArgumentCount()

diff --git a/Components/MineSharp.Commands/Parser/MessageParser.cs b/Components/MineSharp.Commands/Parser/MessageParser.cs
@@ -1,13 +1,16 @@
 using MineSharp.Core.Common;
+using MineSharp.Core.Serialization;
 using MineSharp.Data;
 
 namespace MineSharp.Commands.Parser;
 
 public class MessageParser : IParser
 {
-    public string GetName()
+    public static readonly Identifier MessageIdentifier = Identifier.Parse("minecraft:message");
+
+    public Identifier GetName()
     {
-        return "minecraft:message";
+        return MessageIdentifier;
     }
 
     public int GetArgumentCount()