diff --git a/SpigotCore_14/src/de/steamwar/core/FlatteningWrapper14.java b/SpigotCore_14/src/de/steamwar/core/FlatteningWrapper14.java
index b903db6..31214ef 100644
--- a/SpigotCore_14/src/de/steamwar/core/FlatteningWrapper14.java
+++ b/SpigotCore_14/src/de/steamwar/core/FlatteningWrapper14.java
@@ -222,11 +222,9 @@ public class FlatteningWrapper14 implements FlatteningWrapper.IFlatteningWrapper
}
private static final Reflection.FieldAccessor> scoreboardName = Reflection.getField(FlatteningWrapper.scoreboardObjective, Reflection.getClass("{nms.network.chat}.IChatBaseComponent"), 0);
- private static final Reflection.ConstructorInvoker chatComponentConstructor = Reflection.getConstructor(Reflection.getClass("{nms.network.chat}.ChatComponentText"), String.class);
-
@Override
public void setScoreboardTitle(Object packet, String title) {
- scoreboardName.set(packet, chatComponentConstructor.invoke(title));
+ scoreboardName.set(packet, ChatWrapper.impl.stringToChatComponent(title));
}
private static final Class> scoreActionEnum = Reflection.getClass("{nms.server}.ScoreboardServer$Action");
diff --git a/SpigotCore_19/src/de/steamwar/core/ChatWrapper19.java b/SpigotCore_19/src/de/steamwar/core/ChatWrapper19.java
new file mode 100644
index 0000000..8be810b
--- /dev/null
+++ b/SpigotCore_19/src/de/steamwar/core/ChatWrapper19.java
@@ -0,0 +1,38 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2022 SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+package de.steamwar.core;
+
+import com.comphenix.tinyprotocol.Reflection;
+import com.comphenix.tinyprotocol.TinyProtocol;
+import net.minecraft.network.chat.IChatMutableComponent;
+import net.minecraft.network.chat.contents.LiteralContents;
+
+public class ChatWrapper19 implements ChatWrapper {
+ @Override
+ public Object stringToChatComponent(String text) {
+ return IChatMutableComponent.a(new LiteralContents(text));
+ }
+
+ private static final Reflection.FieldAccessor getName = Reflection.getField(TinyProtocol.PACKET_LOGIN_IN_START, String.class, 0);
+ @Override
+ public String getNameByLoginPacket(Object packet) {
+ return getName.get(packet);
+ }
+}
diff --git a/SpigotCore_8/src/de/steamwar/core/ChatWrapper8.java b/SpigotCore_8/src/de/steamwar/core/ChatWrapper8.java
new file mode 100644
index 0000000..7d02dfd
--- /dev/null
+++ b/SpigotCore_8/src/de/steamwar/core/ChatWrapper8.java
@@ -0,0 +1,39 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2022 SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+package de.steamwar.core;
+
+import com.comphenix.tinyprotocol.Reflection;
+import com.comphenix.tinyprotocol.TinyProtocol;
+import com.mojang.authlib.GameProfile;
+
+public class ChatWrapper8 implements ChatWrapper {
+
+ private static final Reflection.ConstructorInvoker chatComponentConstructor = Reflection.getConstructor(Reflection.getClass("{nms.network.chat}.ChatComponentText"), String.class);
+ @Override
+ public Object stringToChatComponent(String text) {
+ return chatComponentConstructor.invoke(text);
+ }
+
+ private static final Reflection.FieldAccessor getGameProfile = Reflection.getField(TinyProtocol.PACKET_LOGIN_IN_START, GameProfile.class, 0);
+ @Override
+ public String getNameByLoginPacket(Object packet) {
+ return getGameProfile.get(packet).getName();
+ }
+}
diff --git a/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java b/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java
index cb63ee0..6951a9a 100644
--- a/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java
+++ b/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java
@@ -4,7 +4,7 @@ import com.comphenix.tinyprotocol.Reflection.FieldAccessor;
import com.comphenix.tinyprotocol.Reflection.MethodInvoker;
import com.google.common.collect.Lists;
import com.google.common.collect.MapMaker;
-import com.mojang.authlib.GameProfile;
+import de.steamwar.core.ChatWrapper;
import de.steamwar.core.Core;
import io.netty.channel.*;
import org.bukkit.Bukkit;
@@ -48,8 +48,7 @@ public class TinyProtocol {
private static final FieldAccessor getNetworkMarkers = Reflection.getField(serverConnectionClass, Collection.class, 1);
// Packets we have to intercept
- private static final Class> PACKET_LOGIN_IN_START = Reflection.getClass("{nms.network.protocol.login}.PacketLoginInStart");
- private static final FieldAccessor getGameProfile = Reflection.getField(PACKET_LOGIN_IN_START, GameProfile.class, 0);
+ public static final Class> PACKET_LOGIN_IN_START = Reflection.getClass("{nms.network.protocol.login}.PacketLoginInStart");
// Speedup channel lookup
private final Map channelLookup = new MapMaker().weakValues().makeMap();
@@ -404,8 +403,7 @@ public class TinyProtocol {
private void handleLoginStart(Channel channel, Object packet) {
if (PACKET_LOGIN_IN_START.isInstance(packet)) {
- GameProfile profile = getGameProfile.get(packet);
- channelLookup.put(profile.getName(), channel);
+ channelLookup.put(ChatWrapper.impl.getNameByLoginPacket(packet), channel);
}
}
}
diff --git a/SpigotCore_Main/src/de/steamwar/core/ChatWrapper.java b/SpigotCore_Main/src/de/steamwar/core/ChatWrapper.java
new file mode 100644
index 0000000..eeddd1c
--- /dev/null
+++ b/SpigotCore_Main/src/de/steamwar/core/ChatWrapper.java
@@ -0,0 +1,27 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2022 SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+package de.steamwar.core;
+
+public interface ChatWrapper {
+ ChatWrapper impl = VersionDependent.getVersionImpl(Core.getInstance());
+
+ Object stringToChatComponent(String text);
+ String getNameByLoginPacket(Object packet);
+}
diff --git a/SpigotCore_Main/src/de/steamwar/core/Core.java b/SpigotCore_Main/src/de/steamwar/core/Core.java
index 111d344..c18e6f9 100644
--- a/SpigotCore_Main/src/de/steamwar/core/Core.java
+++ b/SpigotCore_Main/src/de/steamwar/core/Core.java
@@ -49,7 +49,9 @@ public class Core extends JavaPlugin{
private static final int VERSION;
static{
String packageName = Bukkit.getServer().getClass().getPackage().getName();
- if(packageName.contains("1_18"))
+ if(packageName.contains("1_19"))
+ VERSION = 19;
+ else if(packageName.contains("1_18"))
VERSION = 18;
else if(packageName.contains("1_15"))
VERSION = 15;