BLOCKFANTASY
/
LOOHP-Limbo
Template
mirror of https://github.com/LOOHP/Limbo.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master

This commit is contained in:
LOOHP 2021-11-24 17:13:59 +00:00 committed by GitHub
parent 120f9dce3f d86bcdb48d
commit 0fcab21a4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 94 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.classpath
View File

@ -1,32 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>

23
.project
View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Limbo</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>

4
.settings/org.eclipse.core.resources.prefs
View File

@ -1,4 +0,0 @@
eclipse.preferences.version=1
encoding//src/main/java=ISO-8859-1
encoding//src/main/resources=UTF-8
encoding/<project>=UTF-8

8
.settings/org.eclipse.jdt.core.prefs
View File

@ -1,8 +0,0 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8

4
.settings/org.eclipse.m2e.core.prefs
View File

@ -1,4 +0,0 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1

2
pom.xml
View File

@ -5,7 +5,7 @@
<groupId>com.loohp</groupId> <groupId>com.loohp</groupId>
<artifactId>Limbo</artifactId> <artifactId>Limbo</artifactId>
<name>Limbo</name> <name>Limbo</name>
<version>0.6.2-ALPHA</version> <version>0.6.3-ALPHA</version>
<description>Standalone Limbo Minecraft Server.</description> <description>Standalone Limbo Minecraft Server.</description>
<url>https://github.com/LOOHP/Limbo</url> <url>https://github.com/LOOHP/Limbo</url>

1
src/main/java/com/loohp/limbo/events/player/PlayerResourcePackStatusEvent.java
View File

@ -12,6 +12,7 @@ public class PlayerResourcePackStatusEvent extends PlayerEvent {
super(player); super(player);
} }
@Override
public Player getPlayer() { public Player getPlayer() {
return player; return player;
} }

16
src/main/java/com/loohp/limbo/file/ServerProperties.java
View File

@ -50,10 +50,10 @@ public class ServerProperties {
private double ticksPerSecond; private double ticksPerSecond;
private boolean handshakeVerbose; private boolean handshakeVerbose;
private String resourcePackSHA; private String resourcePackSHA1;
private String resourcePackLink; private String resourcePackLink;
private boolean resourcePackRequired; private boolean resourcePackRequired;
private String resourcePackPrompt; private String resourcePackPromptJson;
private String tabHeader; private String tabHeader;
private String tabFooter; private String tabFooter;
@ -132,9 +132,9 @@ public class ServerProperties {
handshakeVerbose = Boolean.parseBoolean(prop.getProperty("handshake-verbose")); handshakeVerbose = Boolean.parseBoolean(prop.getProperty("handshake-verbose"));
resourcePackLink = prop.getProperty("resource-pack"); resourcePackLink = prop.getProperty("resource-pack");
resourcePackSHA = prop.getProperty("resource-pack-sha1"); resourcePackSHA1 = prop.getProperty("resource-pack-sha1");
resourcePackRequired = Boolean.parseBoolean(prop.getProperty("required-resource-pack")); resourcePackRequired = Boolean.parseBoolean(prop.getProperty("required-resource-pack"));
resourcePackPrompt = prop.getProperty("resource-pack-prompt"); resourcePackPromptJson = prop.getProperty("resource-pack-prompt");
tabHeader = prop.getProperty("tab-header"); tabHeader = prop.getProperty("tab-header");
tabFooter = prop.getProperty("tab-footer"); tabFooter = prop.getProperty("tab-footer");
@ -263,16 +263,16 @@ public class ServerProperties {
return resourcePackLink; return resourcePackLink;
} }
public String getResourcePackSHA() { public String getResourcePackSHA1() {
return resourcePackSHA; return resourcePackSHA1;
} }
public boolean getResourcePackRequired() { public boolean getResourcePackRequired() {
return resourcePackRequired; return resourcePackRequired;
} }
public String getResourcePackPrompt() { public String getResourcePackPromptJson() {
return resourcePackPrompt; return resourcePackPromptJson;
} }
public String getTabHeader() { public String getTabHeader() {

22
src/main/java/com/loohp/limbo/player/Player.java
View File

@ -25,10 +25,13 @@ import com.loohp.limbo.utils.GameMode;
import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import net.md_5.bungee.api.chat.TranslatableComponent;
import net.md_5.bungee.chat.ComponentSerializer; import net.md_5.bungee.chat.ComponentSerializer;
public class Player extends LivingEntity implements CommandSender { public class Player extends LivingEntity implements CommandSender {
public static final String CHAT_DEFAULT_FORMAT = "<%name%> %message%";
public final ClientConnection clientConnection; public final ClientConnection clientConnection;
public final PlayerInteractManager playerInteractManager; public final PlayerInteractManager playerInteractManager;
@ -233,7 +236,7 @@ public class Player extends LivingEntity implements CommandSender {
} }
public void disconnect() { public void disconnect() {
disconnect("Disconnected!"); disconnect(new TranslatableComponent("multiplayer.disconnect.kicked"));
} }
public void disconnect(String reason) { public void disconnect(String reason) {
@ -250,24 +253,31 @@ public class Player extends LivingEntity implements CommandSender {
public void chat(String message) { public void chat(String message) {
if (Limbo.getInstance().getServerProperties().isAllowChat()) { if (Limbo.getInstance().getServerProperties().isAllowChat()) {
String format = "<%name%> %message%"; PlayerChatEvent event = (PlayerChatEvent) Limbo.getInstance().getEventsManager().callEvent(new PlayerChatEvent(this, CHAT_DEFAULT_FORMAT, message, false));
PlayerChatEvent event = (PlayerChatEvent) Limbo.getInstance().getEventsManager().callEvent(new PlayerChatEvent(this, format, message, false));
if (!event.isCancelled() && this.hasPermission("limboserver.chat")) { if (!event.isCancelled() && this.hasPermission("limboserver.chat")) {
String chat = event.getFormat().replace("%name%", username).replace("%message%", event.getMessage()); String chat = event.getFormat().replace("%name%", username).replace("%message%", event.getMessage());
Limbo.getInstance().getConsole().sendMessage(chat); Limbo.getInstance().getConsole().sendMessage(chat);
if (event.getFormat().equals(CHAT_DEFAULT_FORMAT)) {
TranslatableComponent translatable = new TranslatableComponent("chat.type.text", username, event.getMessage());
for (Player each : Limbo.getInstance().getPlayers()) {
each.sendMessage(translatable, uuid);
}
} else {
for (Player each : Limbo.getInstance().getPlayers()) { for (Player each : Limbo.getInstance().getPlayers()) {
each.sendMessage(chat, uuid); each.sendMessage(chat, uuid);
} }
} }
} }
} }
}
public void setResourcePack(String url, String hash, boolean forced, BaseComponent promptmessage) {
setResourcePack(url, hash, forced, new BaseComponent[] {promptmessage});
}
public void setResourcePack(String url, String hash, boolean forced, BaseComponent[] promptmessage) { public void setResourcePack(String url, String hash, boolean forced, BaseComponent[] promptmessage) {
try { try {
PacketPlayOutResourcePackSend packsend = new PacketPlayOutResourcePackSend(url, hash, forced, PacketPlayOutResourcePackSend packsend = new PacketPlayOutResourcePackSend(url, hash, forced, promptmessage != null, promptmessage != null ? promptmessage : null);
(promptmessage != null || !ComponentSerializer.toString(promptmessage).equalsIgnoreCase("")) ? true : false,
ComponentSerializer.toString(promptmessage));
clientConnection.sendPacket(packsend); clientConnection.sendPacket(packsend);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();

11
src/main/java/com/loohp/limbo/server/ClientConnection.java
View File

@ -47,6 +47,7 @@ import com.loohp.limbo.server.packets.PacketPlayInKeepAlive;
import com.loohp.limbo.server.packets.PacketPlayInPosition; import com.loohp.limbo.server.packets.PacketPlayInPosition;
import com.loohp.limbo.server.packets.PacketPlayInPositionAndLook; import com.loohp.limbo.server.packets.PacketPlayInPositionAndLook;
import com.loohp.limbo.server.packets.PacketPlayInResourcePackStatus; import com.loohp.limbo.server.packets.PacketPlayInResourcePackStatus;
import com.loohp.limbo.server.packets.PacketPlayInResourcePackStatus.EnumResourcePackStatus;
import com.loohp.limbo.server.packets.PacketPlayInRotation; import com.loohp.limbo.server.packets.PacketPlayInRotation;
import com.loohp.limbo.server.packets.PacketPlayInTabComplete; import com.loohp.limbo.server.packets.PacketPlayInTabComplete;
import com.loohp.limbo.server.packets.PacketPlayOutDeclareCommands; import com.loohp.limbo.server.packets.PacketPlayOutDeclareCommands;
@ -85,6 +86,7 @@ import com.loohp.limbo.world.World;
import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import net.md_5.bungee.api.chat.TranslatableComponent;
import net.md_5.bungee.chat.ComponentSerializer; import net.md_5.bungee.chat.ComponentSerializer;
public class ClientConnection extends Thread { public class ClientConnection extends Thread {
@ -422,11 +424,11 @@ public class ClientConnection extends Thread {
// RESOURCEPACK CODE ADDED BY GAMERDUCK123 // RESOURCEPACK CODE ADDED BY GAMERDUCK123
if (properties.getResourcePackLink() != null && !properties.getResourcePackLink().equalsIgnoreCase("")) { if (properties.getResourcePackLink() != null && !properties.getResourcePackLink().equalsIgnoreCase("")) {
if (properties.getResourcePackSHA() != null && !properties.getResourcePackSHA().equalsIgnoreCase("")) { if (properties.getResourcePackSHA1() != null && !properties.getResourcePackSHA1().equalsIgnoreCase("")) {
//SEND RESOURCEPACK //SEND RESOURCEPACK
player.setResourcePack(properties.getResourcePackLink(), player.setResourcePack(properties.getResourcePackLink(),
properties.getResourcePackSHA(), properties.getResourcePackRequired(), properties.getResourcePackSHA1(), properties.getResourcePackRequired(),
ComponentSerializer.parse(properties.getResourcePackPrompt())); ComponentSerializer.parse(properties.getResourcePackPromptJson()));
} else { } else {
//NO SHA //NO SHA
Limbo.getInstance().getConsole().sendMessage("ResourcePacks require SHA1s"); Limbo.getInstance().getConsole().sendMessage("ResourcePacks require SHA1s");
@ -547,6 +549,9 @@ public class ClientConnection extends Thread {
PacketPlayInResourcePackStatus rpcheck = new PacketPlayInResourcePackStatus(input); PacketPlayInResourcePackStatus rpcheck = new PacketPlayInResourcePackStatus(input);
// Pass on result to the events // Pass on result to the events
Limbo.getInstance().getEventsManager().callEvent(new PlayerResourcePackStatusEvent(player, rpcheck.getLoadedValue())); Limbo.getInstance().getEventsManager().callEvent(new PlayerResourcePackStatusEvent(player, rpcheck.getLoadedValue()));
if (rpcheck.getLoadedValue().equals(EnumResourcePackStatus.DECLINED) && properties.getResourcePackRequired()) {
player.disconnect(new TranslatableComponent("multiplayer.requiredTexturePrompt.disconnect"));
}
} else { } else {
input.skipBytes(size - DataTypeIO.getVarIntLength(packetId)); input.skipBytes(size - DataTypeIO.getVarIntLength(packetId));
} }

34
src/main/java/com/loohp/limbo/server/packets/PacketPlayInResourcePackStatus.java
View File

@ -7,36 +7,40 @@ import com.loohp.limbo.utils.DataTypeIO;
public class PacketPlayInResourcePackStatus extends PacketIn { public class PacketPlayInResourcePackStatus extends PacketIn {
public static enum EnumResourcePackStatus {
public enum EnumResourcePackStatus {
SUCCESS, SUCCESS,
DECLINED, DECLINED,
FAILED, FAILED,
ACCEPTED; ACCEPTED;
} }
private int loaded; private EnumResourcePackStatus loaded;
public PacketPlayInResourcePackStatus(int loaded) { public PacketPlayInResourcePackStatus(EnumResourcePackStatus loaded) {
this.loaded = loaded; this.loaded = loaded;
} }
public PacketPlayInResourcePackStatus(DataInputStream in) throws IOException { public PacketPlayInResourcePackStatus(DataInputStream in) throws IOException {
this(DataTypeIO.readVarInt(in)); this(toLoadedValue(DataTypeIO.readVarInt(in)));
} }
public EnumResourcePackStatus getLoadedValue() { public EnumResourcePackStatus getLoadedValue() {
switch (loaded) { return loaded;
case 0: return EnumResourcePackStatus.SUCCESS; }
case 1: return EnumResourcePackStatus.DECLINED;
case 2: return EnumResourcePackStatus.FAILED; private static EnumResourcePackStatus toLoadedValue(int value) {
case 3: return EnumResourcePackStatus.ACCEPTED; switch (value) {
default: return EnumResourcePackStatus.FAILED; case 0:
return EnumResourcePackStatus.SUCCESS;
case 1:
return EnumResourcePackStatus.DECLINED;
case 2:
return EnumResourcePackStatus.FAILED;
case 3:
return EnumResourcePackStatus.ACCEPTED;
default:
return EnumResourcePackStatus.FAILED;
} }
} }
public boolean isLoadedValue(EnumResourcePackStatus status) {
return getLoadedValue() == status;
}
} }

19
src/main/java/com/loohp/limbo/server/packets/PacketPlayOutResourcePackSend.java
View File

@ -7,19 +7,30 @@ import java.nio.charset.StandardCharsets;
import com.loohp.limbo.utils.DataTypeIO; import com.loohp.limbo.utils.DataTypeIO;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.chat.ComponentSerializer;
public class PacketPlayOutResourcePackSend extends PacketOut { public class PacketPlayOutResourcePackSend extends PacketOut {
public static final int MAX_HASH_LENGTH = 40;
private String url; private String url;
private String hash; private String hash;
private boolean isForced; private boolean isForced;
private boolean hasPromptMessage; private boolean hasPromptMessage;
private String promptMessage; private BaseComponent[] promptMessage;
public PacketPlayOutResourcePackSend(String url, String hash, boolean isForced, boolean hasPromptMessage, String promptMessage) { public PacketPlayOutResourcePackSend(String url, String hash, boolean isForced, boolean hasPromptMessage, BaseComponent[] promptMessage) {
if (hash.length() > MAX_HASH_LENGTH) {
throw new IllegalArgumentException("Hash is too long (max " + MAX_HASH_LENGTH + ", was " + hash.length() + ")");
}
this.url = url; this.url = url;
this.hash = hash; this.hash = hash;
this.isForced = isForced; this.isForced = isForced;
this.hasPromptMessage = hasPromptMessage; this.hasPromptMessage = hasPromptMessage;
if (hasPromptMessage && promptMessage == null) {
throw new IllegalArgumentException("promptMessage cannot be null when hasPromptMessage is true");
}
this.promptMessage = promptMessage; this.promptMessage = promptMessage;
} }
@ -39,7 +50,7 @@ public class PacketPlayOutResourcePackSend extends PacketOut {
return hasPromptMessage; return hasPromptMessage;
} }
public String getPromptMessage() { public BaseComponent[] getPromptMessage() {
return promptMessage; return promptMessage;
} }
@ -54,7 +65,7 @@ public class PacketPlayOutResourcePackSend extends PacketOut {
output.writeBoolean(isForced); output.writeBoolean(isForced);
output.writeBoolean(hasPromptMessage); output.writeBoolean(hasPromptMessage);
if (hasPromptMessage) { if (hasPromptMessage) {
DataTypeIO.writeString(output, promptMessage, StandardCharsets.UTF_8); DataTypeIO.writeString(output, ComponentSerializer.toString(promptMessage), StandardCharsets.UTF_8);
} }
return buffer.toByteArray(); return buffer.toByteArray();
} }

6
src/main/resources/mapping.json
View File

@ -19,7 +19,8 @@
"0x13": "PacketPlayInRotation", "0x13": "PacketPlayInRotation",
"0x0A": "PacketPlayInPluginMessaging", "0x0A": "PacketPlayInPluginMessaging",
"0x06": "PacketPlayInTabComplete", "0x06": "PacketPlayInTabComplete",
"0x25": "PacketPlayInHeldItemChange" "0x25": "PacketPlayInHeldItemChange",
"0x21": "PacketPlayInResourcePackStatus"
}, },
"PlayOut": { "PlayOut": {
"PacketPlayOutLogin": "0x26", "PacketPlayOutLogin": "0x26",
@ -44,7 +45,8 @@
"PacketPlayOutSpawnEntity": "0x00", "PacketPlayOutSpawnEntity": "0x00",
"PacketPlayOutSpawnEntityLiving": "0x02", "PacketPlayOutSpawnEntityLiving": "0x02",
"PacketPlayOutHeldItemChange": "0x48", "PacketPlayOutHeldItemChange": "0x48",
"PacketPlayOutPlayerListHeaderFooter": "0x5E" "PacketPlayOutPlayerListHeaderFooter": "0x5E",
"PacketPlayOutResourcePackSend": "0x3C"
}, },
"StatusIn": { "StatusIn": {
"0x01": "PacketStatusInPing", "0x01": "PacketStatusInPing",

20
src/main/resources/server.properties
View File

@ -59,8 +59,20 @@ motd={"text":"","extra":[{"text":"Limbo Server!","color":"yellow"}]}
#Server list version as string #Server list version as string
version=Limbo! version=Limbo!
#Tab-List Header #Tab-List Header (May be left blank)
tab-header={"text":"","extra":[{"text":"Welcome to Limbo!","color":"green"}]} tab-header=
#Tab-List Footer #Tab-List Footer (May be left blank)
tab-footer={"text":"","extra":[{"text":"Limbo Server by LOOHP","color":"yellow"}]} tab-footer=
#Server resource pack url (May be left blank)
resource-pack=
#Server resource pack hash (May be left blank)
resource-pack-sha1=
#Whether to kick players if they do not accept the server resource pack
required-resource-pack=false
#JSON formatted text to show when prompting the player to install the resource pack (May be left blank)
resource-pack-prompt={"text":"","extra":[{"text":"Install server resource pack!","color":"yellow"}]}