From 027cff9ab541c06f214b55792284429ed3cdcf77 Mon Sep 17 00:00:00 2001 From: LOOHP Date: Tue, 3 Nov 2020 15:42:46 +0800 Subject: [PATCH] 0.3.6-ALPHA Update to 1.16.4 --- pom.xml | 4 +-- .../loohp/limbo/Commands/CommandSender.java | 8 +++++ src/com/loohp/limbo/Console.java | 23 +++++++++--- src/com/loohp/limbo/Limbo.java | 6 ++-- src/com/loohp/limbo/Player/Player.java | 36 ++++++++++++++----- 5 files changed, 59 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index b64f558..4617b0c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.loohp Limbo - 0.3.5-ALPHA + 0.3.6-ALPHA src @@ -53,7 +53,7 @@ - ${project.artifactId}-${project.version}-1.16.3 + ${project.artifactId}-${project.version}-1.16.4 diff --git a/src/com/loohp/limbo/Commands/CommandSender.java b/src/com/loohp/limbo/Commands/CommandSender.java index ef5256e..a0a6ca8 100644 --- a/src/com/loohp/limbo/Commands/CommandSender.java +++ b/src/com/loohp/limbo/Commands/CommandSender.java @@ -1,9 +1,17 @@ package com.loohp.limbo.Commands; +import java.util.UUID; + import net.md_5.bungee.api.chat.BaseComponent; public interface CommandSender { + public void sendMessage(BaseComponent[] component, UUID uuid); + + public void sendMessage(BaseComponent component, UUID uuid); + + public void sendMessage(String message, UUID uuid); + public void sendMessage(BaseComponent[] component); public void sendMessage(BaseComponent component); diff --git a/src/com/loohp/limbo/Console.java b/src/com/loohp/limbo/Console.java index 05b0d21..96d3726 100644 --- a/src/com/loohp/limbo/Console.java +++ b/src/com/loohp/limbo/Console.java @@ -13,6 +13,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Map.Entry; +import java.util.UUID; import java.util.stream.Collectors; import org.fusesource.jansi.Ansi; @@ -103,6 +104,24 @@ public class Console implements CommandSender { public String getName() { return CONSOLE; } + + public boolean hasPermission(String permission) { + return Limbo.getInstance().getPermissionsManager().hasPermission(this, permission); + } + + @Override + public void sendMessage(BaseComponent component, UUID uuid) { + sendMessage(component); + } + + @Override + public void sendMessage(BaseComponent[] component, UUID uuid) { + sendMessage(component); + } + + public void sendMessage(String message, UUID uuid) { + sendMessage(message); + } @Override public void sendMessage(BaseComponent component) { @@ -114,10 +133,6 @@ public class Console implements CommandSender { sendMessage(String.join("", Arrays.asList(component).stream().map(each -> each.toLegacyText()).collect(Collectors.toList()))); } - public boolean hasPermission(String permission) { - return Limbo.getInstance().getPermissionsManager().hasPermission(this, permission); - } - public void sendMessage(String message) { stashLine(); String date = new SimpleDateFormat("HH':'mm':'ss").format(new Date()); diff --git a/src/com/loohp/limbo/Limbo.java b/src/com/loohp/limbo/Limbo.java index 6a8738f..23ef653 100644 --- a/src/com/loohp/limbo/Limbo.java +++ b/src/com/loohp/limbo/Limbo.java @@ -104,8 +104,8 @@ public class Limbo { //=========================== - public final String serverImplementationVersion = "1.16.3"; - public final int serverImplmentationProtocol = 753; + public final String serverImplementationVersion = "1.16.4"; + public final int serverImplmentationProtocol = 754; public final String limboImplementationVersion; private ServerConnection server; @@ -147,7 +147,7 @@ public class Limbo { } limboImplementationVersion = getLimboVersion(); - console.sendMessage("Loading Limbo Version " + limboImplementationVersion); + console.sendMessage("Loading Limbo Version " + limboImplementationVersion + " on Minecraft " + serverImplementationVersion); String spName = "server.properties"; File sp = new File(spName); diff --git a/src/com/loohp/limbo/Player/Player.java b/src/com/loohp/limbo/Player/Player.java index 29f4c97..7b18ee9 100644 --- a/src/com/loohp/limbo/Player/Player.java +++ b/src/com/loohp/limbo/Player/Player.java @@ -84,14 +84,6 @@ public class Player implements CommandSender { return Limbo.getInstance().getPermissionsManager().hasPermission(this, permission); } - public void sendMessage(String message) { - sendMessage(TextComponent.fromLegacyText(message)); - } - - public void sendMessage(BaseComponent component) { - sendMessage(new BaseComponent[] { component }); - } - public void teleport(Location location) { PlayerTeleportEvent event = Limbo.getInstance().getEventsManager().callEvent(new PlayerTeleportEvent(this, getLocation(), location)); if (!event.isCancelled()) { @@ -108,6 +100,32 @@ public class Player implements CommandSender { } } } + + public void sendMessage(String message, UUID uuid) { + sendMessage(TextComponent.fromLegacyText(message), uuid); + } + + public void sendMessage(BaseComponent component, UUID uuid) { + sendMessage(new BaseComponent[] { component }, uuid); + } + + @Override + public void sendMessage(BaseComponent[] component, UUID uuid) { + try { + PacketPlayOutChat chat = new PacketPlayOutChat(ComponentSerializer.toString(component), 0, uuid); + clientConnection.sendPacket(chat); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public void sendMessage(String message) { + sendMessage(TextComponent.fromLegacyText(message)); + } + + public void sendMessage(BaseComponent component) { + sendMessage(new BaseComponent[] { component }); + } @Override public void sendMessage(BaseComponent[] component) { @@ -142,7 +160,7 @@ public class Player implements CommandSender { String chat = event.getPrefix() + event.getMessage(); Limbo.getInstance().getConsole().sendMessage(chat); for (Player each : Limbo.getInstance().getPlayers()) { - each.sendMessage(chat); + each.sendMessage(chat, uuid); } } }