From 644f86a42d96a8daccba31d63d13a47ac387d39c Mon Sep 17 00:00:00 2001
From: MCMDEV <john-m.1@gmx.de>
Date: Sun, 13 Mar 2022 16:58:16 +0100
Subject: [PATCH] Fixed title packet

---
 .idea/artifacts/i18n_paper.xml                |  2 +-
 .idea/jarRepositories.xml                     |  5 ++
 .idea/misc.xml                                |  2 +-
 .idea/workspace.xml                           | 61 ++++++++-----------
 i18n-adventure/i18n-adventure.iml             | 12 ----
 i18n-adventure/pom.xml                        |  2 +-
 .../AdventureTranslationConsumer.java         |  2 +-
 .../i18n/common/platform/I18nPlatform.java    |  2 +-
 i18n-paper/i18n-paper.iml                     | 13 ----
 i18n-paper/pom.xml                            | 10 +--
 .../i18n/paper/protocollib/TitleAdapter.java  |  2 +-
 pom.xml                                       |  4 ++
 12 files changed, 47 insertions(+), 70 deletions(-)
 delete mode 100644 i18n-adventure/i18n-adventure.iml
 delete mode 100644 i18n-paper/i18n-paper.iml

diff --git a/.idea/artifacts/i18n_paper.xml b/.idea/artifacts/i18n_paper.xml
index 24c5d8c..34c4d88 100644
--- a/.idea/artifacts/i18n_paper.xml
+++ b/.idea/artifacts/i18n_paper.xml
@@ -1,6 +1,6 @@
 <component name="ArtifactManager">
   <artifact type="jar" name="i18n-paper">
-    <output-path>$PROJECT_DIR$/../../TestServer/1.16.5-dev/plugins</output-path>
+    <output-path>$PROJECT_DIR$/../../TestServer/1.18.2/plugins</output-path>
     <root id="archive" name="i18n-paper.jar">
       <element id="module-output" name="i18n-paper" />
       <element id="module-output" name="i18n-common" />
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index e27e79f..b3528b9 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -6,6 +6,11 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="papermc" />
+      <option name="name" value="papermc" />
+      <option name="url" value="https://papermc.io/repo/repository/maven-public/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="spigot-repo" />
       <option name="name" value="spigot-repo" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c5c656a..0c2d125 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -31,7 +31,7 @@
       </set>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="azul-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a3d23e1..0bd25e4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,37 +10,17 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="74946188-9329-4ff1-a845-b7e2e0d1d7a2" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/i18n-common/src/main/java/de/helixdevs/i18n/common/command/CommandReloadtranslations.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/i18n-common/src/main/java/de/helixdevs/i18n/common/command/api/Command.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/i18n-common/src/main/java/de/helixdevs/i18n/common/command/api/Sender.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/i18n-paper/src/main/java/de/helixdevs/i18n/paper/command/BukkitSender.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/i18n-paper/src/main/java/de/helixdevs/i18n/paper/protocollib/BossbarAdapter.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/i18n-paper/src/main/java/de/helixdevs/i18n/paper/protocollib/ChatAdapter.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/i18n-paper/src/main/java/de/helixdevs/i18n/paper/protocollib/DisconnectAdapter.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/i18n-paper/src/main/java/de/helixdevs/i18n/paper/protocollib/EntityMetadataAdapter.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/i18n-paper/src/main/java/de/helixdevs/i18n/paper/protocollib/EquipmentAdapter.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/i18n-paper/src/main/java/de/helixdevs/i18n/paper/protocollib/HeaderFooterAdapter.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/i18n-paper/src/main/java/de/helixdevs/i18n/paper/protocollib/ITranslationAdapter.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/i18n-paper/src/main/java/de/helixdevs/i18n/paper/protocollib/ObjectiveAdapter.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/i18n-paper/src/main/java/de/helixdevs/i18n/paper/protocollib/OpenWindowAdapter.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/i18n-paper/src/main/java/de/helixdevs/i18n/paper/protocollib/PlayerInfoAdapter.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/i18n-paper/src/main/java/de/helixdevs/i18n/paper/protocollib/SetSlotAdapter.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/i18n-paper/src/main/java/de/helixdevs/i18n/paper/protocollib/TeamAdapter.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/i18n-paper/src/main/java/de/helixdevs/i18n/paper/protocollib/TitleAdapter.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/i18n-paper/src/main/java/de/helixdevs/i18n/paper/protocollib/WindowItemsAdapter.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/artifacts/i18n_paper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/i18n_paper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/i18n-adventure/i18n-adventure.iml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/i18n-adventure/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/i18n-adventure/pom.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/i18n-adventure/src/main/java/de/helixdevs/i18n/adventure/AdventureTranslationConsumer.java" beforeDir="false" afterPath="$PROJECT_DIR$/i18n-adventure/src/main/java/de/helixdevs/i18n/adventure/AdventureTranslationConsumer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/i18n-api/src/main/java/de/helixdevs/i18n/api/TranslationConsumer.java" beforeDir="false" afterPath="$PROJECT_DIR$/i18n-api/src/main/java/de/helixdevs/i18n/api/TranslationConsumer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/i18n-api/src/main/java/de/helixdevs/i18n/api/TranslationManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/i18n-api/src/main/java/de/helixdevs/i18n/api/TranslationManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/i18n-common/src/main/java/de/helixdevs/i18n/common/TranslationManagerImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/i18n-common/src/main/java/de/helixdevs/i18n/common/TranslationManagerImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/i18n-common/src/main/java/de/helixdevs/i18n/common/platform/I18nPlatform.java" beforeDir="false" afterPath="$PROJECT_DIR$/i18n-common/src/main/java/de/helixdevs/i18n/common/platform/I18nPlatform.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/i18n-common/src/main/java/de/helixdevs/i18n/common/platform/I18nPlugin.java" beforeDir="false" afterPath="$PROJECT_DIR$/i18n-common/src/main/java/de/helixdevs/i18n/common/platform/I18nPlugin.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/i18n-common/src/main/java/de/helixdevs/i18n/common/repositories/FilesTranslationRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/i18n-common/src/main/java/de/helixdevs/i18n/common/repositories/FilesTranslationRepository.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/i18n-paper/src/main/java/de/helixdevs/i18n/paper/I18nPaperPlugin.java" beforeDir="false" afterPath="$PROJECT_DIR$/i18n-paper/src/main/java/de/helixdevs/i18n/paper/I18nPaperPlugin.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/i18n-paper/src/main/java/de/helixdevs/i18n/paper/protocollib/TranslationPacketAdapter.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/i18n-paper/src/main/resources/plugin.yml" beforeDir="false" afterPath="$PROJECT_DIR$/i18n-paper/src/main/resources/plugin.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/i18n-paper/i18n-paper.iml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/i18n-paper/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/i18n-paper/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/i18n-paper/src/main/java/de/helixdevs/i18n/paper/protocollib/TitleAdapter.java" beforeDir="false" afterPath="$PROJECT_DIR$/i18n-paper/src/main/java/de/helixdevs/i18n/paper/protocollib/TitleAdapter.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -59,6 +39,9 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
@@ -76,10 +59,9 @@
   <component name="PropertiesComponent">
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../Comp/ProtocolLib-master" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_package_manager_path" value="npm" />
     <property name="project.structure.last.edited" value="Artifacts" />
     <property name="project.structure.proportion" value="0.15" />
@@ -91,10 +73,10 @@
   </component>
   <component name="RunManager">
     <configuration name="Debug" type="JarApplication">
-      <option name="JAR_PATH" value="$PROJECT_DIR$/../../TestServer/1.16.5-dev/paper-1.16.5-719.jar" />
-      <option name="WORKING_DIRECTORY" value="D:\Documents\Minecraft\TestServer\1.16.5-dev" />
+      <option name="JAR_PATH" value="$PROJECT_DIR$/../../TestServer/1.18.2/paper-1.18.2-238.jar" />
+      <option name="WORKING_DIRECTORY" value="D:\Documents\Minecraft\TestServer\1.18.2" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-      <option name="ALTERNATIVE_JRE_PATH" value="openjdk-16" />
+      <option name="ALTERNATIVE_JRE_PATH" value="azul-17" />
       <method v="2">
         <option name="BuildArtifacts" enabled="true">
           <artifact name="i18n-paper" />
@@ -125,6 +107,9 @@
       <workItem from="1623600423746" duration="666000" />
       <workItem from="1623601217447" duration="9083000" />
       <workItem from="1623679144929" duration="587000" />
+      <workItem from="1632066894659" duration="1783000" />
+      <workItem from="1647185809950" duration="726000" />
+      <workItem from="1647186547369" duration="324000" />
     </task>
     <task id="LOCAL-00001" summary="Initial commit">
       <created>1621100170243</created>
@@ -140,7 +125,14 @@
       <option name="project" value="LOCAL" />
       <updated>1621784919181</updated>
     </task>
-    <option name="localTasksCounter" value="3" />
+    <task id="LOCAL-00003" summary="More adapters">
+      <created>1632066998561</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1632066998561</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -149,7 +141,8 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Initial commit" />
     <MESSAGE value="Basic implementation" />
-    <option name="LAST_COMMIT_MESSAGE" value="Basic implementation" />
+    <MESSAGE value="More adapters" />
+    <option name="LAST_COMMIT_MESSAGE" value="More adapters" />
   </component>
   <component name="XDebuggerManager">
     <pin-to-top-manager>
diff --git a/i18n-adventure/i18n-adventure.iml b/i18n-adventure/i18n-adventure.iml
deleted file mode 100644
index c462275..0000000
--- a/i18n-adventure/i18n-adventure.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="FacetManager">
-    <facet type="minecraft" name="Minecraft">
-      <configuration>
-        <autoDetectTypes>
-          <platformType>ADVENTURE</platformType>
-        </autoDetectTypes>
-      </configuration>
-    </facet>
-  </component>
-</module>
\ No newline at end of file
diff --git a/i18n-adventure/pom.xml b/i18n-adventure/pom.xml
index f900dce..a88a4db 100644
--- a/i18n-adventure/pom.xml
+++ b/i18n-adventure/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-api</artifactId>
-            <version>4.7.0</version>
+            <version>4.10.1</version>
         </dependency>
         <dependency>
             <groupId>de.helixdevs</groupId>
diff --git a/i18n-adventure/src/main/java/de/helixdevs/i18n/adventure/AdventureTranslationConsumer.java b/i18n-adventure/src/main/java/de/helixdevs/i18n/adventure/AdventureTranslationConsumer.java
index 1f67d67..81dd4ff 100644
--- a/i18n-adventure/src/main/java/de/helixdevs/i18n/adventure/AdventureTranslationConsumer.java
+++ b/i18n-adventure/src/main/java/de/helixdevs/i18n/adventure/AdventureTranslationConsumer.java
@@ -10,7 +10,7 @@
 
 public class AdventureTranslationConsumer implements TranslationConsumer {
 
-    private final GlobalTranslator globalTranslator = GlobalTranslator.get();
+    private final GlobalTranslator globalTranslator = GlobalTranslator.translator();
     private final TranslationRegistry adventureRegistry = TranslationRegistry.create(Key.key("i18n", "main"));
 
     @Override
diff --git a/i18n-common/src/main/java/de/helixdevs/i18n/common/platform/I18nPlatform.java b/i18n-common/src/main/java/de/helixdevs/i18n/common/platform/I18nPlatform.java
index 7119e71..dbe8360 100644
--- a/i18n-common/src/main/java/de/helixdevs/i18n/common/platform/I18nPlatform.java
+++ b/i18n-common/src/main/java/de/helixdevs/i18n/common/platform/I18nPlatform.java
@@ -46,8 +46,8 @@ public void unloadTranslations()    {
     }
 
     public void reload()    {
-        loadCommands();
         unloadTranslations();
+        loadTranslations();
     }
 
     public void disable() {
diff --git a/i18n-paper/i18n-paper.iml b/i18n-paper/i18n-paper.iml
deleted file mode 100644
index f5de878..0000000
--- a/i18n-paper/i18n-paper.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="FacetManager">
-    <facet type="minecraft" name="Minecraft">
-      <configuration>
-        <autoDetectTypes>
-          <platformType>PAPER</platformType>
-          <platformType>ADVENTURE</platformType>
-        </autoDetectTypes>
-      </configuration>
-    </facet>
-  </component>
-</module>
\ No newline at end of file
diff --git a/i18n-paper/pom.xml b/i18n-paper/pom.xml
index 0f98e74..bc5ddb1 100644
--- a/i18n-paper/pom.xml
+++ b/i18n-paper/pom.xml
@@ -12,21 +12,21 @@
     <artifactId>i18n-paper</artifactId>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>com.destroystokyo.paper</groupId>
+            <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.16.5-R0.1-SNAPSHOT</version>
+            <version>1.18.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.comphenix.protocol</groupId>
             <artifactId>ProtocolLib</artifactId>
-            <version>4.6.1-SNAPSHOT</version>
+            <version>4.8.0</version>
         </dependency>
         <dependency>
             <groupId>de.helixdevs</groupId>
diff --git a/i18n-paper/src/main/java/de/helixdevs/i18n/paper/protocollib/TitleAdapter.java b/i18n-paper/src/main/java/de/helixdevs/i18n/paper/protocollib/TitleAdapter.java
index 653f4c5..8c0484b 100644
--- a/i18n-paper/src/main/java/de/helixdevs/i18n/paper/protocollib/TitleAdapter.java
+++ b/i18n-paper/src/main/java/de/helixdevs/i18n/paper/protocollib/TitleAdapter.java
@@ -7,7 +7,7 @@
 
 public class TitleAdapter extends PacketAdapter implements ITranslationAdapter {
     public TitleAdapter(Plugin plugin) {
-        super(plugin, PacketType.Play.Server.TITLE);
+        super(plugin, PacketType.Play.Server.SET_TITLE_TEXT, PacketType.Play.Server.SET_SUBTITLE_TEXT);
     }
 
     @Override
diff --git a/pom.xml b/pom.xml
index c3c6382..4d40d48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,10 @@
             <id>dmulloy2-repo</id>
             <url>https://repo.dmulloy2.net/repository/public/</url>
         </repository>
+        <repository>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
+        </repository>
     </repositories>
 
 </project>
\ No newline at end of file