0.3.6-ALPHA Update to 1.16.4

This commit is contained in:
LOOHP 2020-11-03 15:42:46 +08:00
parent bae75e0d0a
commit 027cff9ab5
5 changed files with 59 additions and 18 deletions

View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.loohp</groupId> <groupId>com.loohp</groupId>
<artifactId>Limbo</artifactId> <artifactId>Limbo</artifactId>
<version>0.3.5-ALPHA</version> <version>0.3.6-ALPHA</version>
<build> <build>
<sourceDirectory>src</sourceDirectory> <sourceDirectory>src</sourceDirectory>
<resources> <resources>
@ -53,7 +53,7 @@
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
<finalName>${project.artifactId}-${project.version}-1.16.3</finalName> <finalName>${project.artifactId}-${project.version}-1.16.4</finalName>
</build> </build>
<repositories> <repositories>

View File

@ -1,9 +1,17 @@
package com.loohp.limbo.Commands; package com.loohp.limbo.Commands;
import java.util.UUID;
import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.BaseComponent;
public interface CommandSender { 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);
public void sendMessage(BaseComponent component); public void sendMessage(BaseComponent component);

View File

@ -13,6 +13,7 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.UUID;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.fusesource.jansi.Ansi; import org.fusesource.jansi.Ansi;
@ -104,6 +105,24 @@ public class Console implements CommandSender {
return CONSOLE; 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 @Override
public void sendMessage(BaseComponent component) { public void sendMessage(BaseComponent component) {
sendMessage(new BaseComponent[] {component}); sendMessage(new 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()))); 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) { public void sendMessage(String message) {
stashLine(); stashLine();
String date = new SimpleDateFormat("HH':'mm':'ss").format(new Date()); String date = new SimpleDateFormat("HH':'mm':'ss").format(new Date());

View File

@ -104,8 +104,8 @@ public class Limbo {
//=========================== //===========================
public final String serverImplementationVersion = "1.16.3"; public final String serverImplementationVersion = "1.16.4";
public final int serverImplmentationProtocol = 753; public final int serverImplmentationProtocol = 754;
public final String limboImplementationVersion; public final String limboImplementationVersion;
private ServerConnection server; private ServerConnection server;
@ -147,7 +147,7 @@ public class Limbo {
} }
limboImplementationVersion = getLimboVersion(); limboImplementationVersion = getLimboVersion();
console.sendMessage("Loading Limbo Version " + limboImplementationVersion); console.sendMessage("Loading Limbo Version " + limboImplementationVersion + " on Minecraft " + serverImplementationVersion);
String spName = "server.properties"; String spName = "server.properties";
File sp = new File(spName); File sp = new File(spName);

View File

@ -84,14 +84,6 @@ public class Player implements CommandSender {
return Limbo.getInstance().getPermissionsManager().hasPermission(this, permission); 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) { public void teleport(Location location) {
PlayerTeleportEvent event = Limbo.getInstance().getEventsManager().callEvent(new PlayerTeleportEvent(this, getLocation(), location)); PlayerTeleportEvent event = Limbo.getInstance().getEventsManager().callEvent(new PlayerTeleportEvent(this, getLocation(), location));
if (!event.isCancelled()) { if (!event.isCancelled()) {
@ -109,6 +101,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 @Override
public void sendMessage(BaseComponent[] component) { public void sendMessage(BaseComponent[] component) {
try { try {
@ -142,7 +160,7 @@ public class Player implements CommandSender {
String chat = event.getPrefix() + event.getMessage(); String chat = event.getPrefix() + event.getMessage();
Limbo.getInstance().getConsole().sendMessage(chat); Limbo.getInstance().getConsole().sendMessage(chat);
for (Player each : Limbo.getInstance().getPlayers()) { for (Player each : Limbo.getInstance().getPlayers()) {
each.sendMessage(chat); each.sendMessage(chat, uuid);
} }
} }
} }