Work on 1.14 PLW support
This commit is contained in:
parent
e88684a564
commit
42e91409c7
|
|
@ -1,26 +1,20 @@
|
|||
package buttondevteam.discordplugin.broadcaster;
|
||||
|
||||
import buttondevteam.discordplugin.mcchat.MCChatUtils;
|
||||
import buttondevteam.lib.TBMCCoreAPI;
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import lombok.val;
|
||||
import net.minecraft.server.v1_12_R1.*;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.craftbukkit.v1_12_R1.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_12_R1.util.CraftChatMessage;
|
||||
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
|
||||
import org.objenesis.ObjenesisStd;
|
||||
import org.mockito.Mockito;
|
||||
import org.mockito.invocation.InvocationOnMock;
|
||||
import org.mockito.stubbing.Answer;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Modifier;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public class PlayerListWatcher extends DedicatedPlayerList {
|
||||
private DedicatedPlayerList plist;
|
||||
public class PlayerListWatcher {
|
||||
private static Object plist;
|
||||
private static Object mock;
|
||||
|
||||
public PlayerListWatcher(DedicatedServer minecraftserver) {
|
||||
/*public PlayerListWatcher(DedicatedServer minecraftserver) {
|
||||
super(minecraftserver); // <-- Does some init stuff and calls Bukkit.setServer() so we have to use Objenesis
|
||||
}
|
||||
|
||||
|
|
@ -38,7 +32,7 @@ public class PlayerListWatcher extends DedicatedPlayerList {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void sendMessage(IChatBaseComponent ichatbasecomponent, boolean flag) { // Needed so it calls the overriden method
|
||||
public void sendMessage(IChatBaseComponent ichatbasecomponent, boolean flag) { // Needed so it calls the overridden method
|
||||
plist.getServer().sendMessage(ichatbasecomponent);
|
||||
ChatMessageType chatmessagetype = flag ? ChatMessageType.SYSTEM : ChatMessageType.CHAT;
|
||||
|
||||
|
|
@ -57,29 +51,50 @@ public class PlayerListWatcher extends DedicatedPlayerList {
|
|||
for (IChatBaseComponent component : iChatBaseComponents) {
|
||||
sendMessage(component, true);
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
static void hookUp() throws Exception {
|
||||
Field conf = CraftServer.class.getDeclaredField("console");
|
||||
val csc = Bukkit.getServer().getClass();
|
||||
Field conf = csc.getDeclaredField("console");
|
||||
conf.setAccessible(true);
|
||||
val server = (MinecraftServer) conf.get(Bukkit.getServer());
|
||||
val plw = new ObjenesisStd().newInstance(PlayerListWatcher.class); // Cannot call super constructor
|
||||
plw.plist = (DedicatedPlayerList) server.getPlayerList();
|
||||
plw.maxPlayers = plw.plist.getMaxPlayers();
|
||||
Field plf = plw.getClass().getField("players");
|
||||
val server = conf.get(Bukkit.getServer());
|
||||
val nms = server.getClass().getPackage().getName();
|
||||
val dplc = Class.forName(nms + ".DedicatedPlayerList");
|
||||
mock = Mockito.mock(dplc, new Answer() { // Cannot call super constructor
|
||||
@Override
|
||||
public Object answer(InvocationOnMock invocation) throws Throwable {
|
||||
return invocation.getMethod().invoke(plist, invocation.getArguments());
|
||||
}
|
||||
});
|
||||
plist = server.getClass().getMethod("getPlayerList").invoke(server);
|
||||
try {
|
||||
Field mpf = mock.getClass().getField("maxPlayers");
|
||||
mpf.setAccessible(true);
|
||||
Field modf = mpf.getClass().getDeclaredField("modifiers");
|
||||
modf.setAccessible(true);
|
||||
modf.set(mpf, mpf.getModifiers() & ~Modifier.FINAL);
|
||||
mpf.set(mock, mpf.get(plist));
|
||||
} catch (NoSuchFieldException ignored) {
|
||||
//The field no longer exists on 1.14
|
||||
}
|
||||
Field plf = mock.getClass().getField("players");
|
||||
plf.setAccessible(true);
|
||||
Field modf = plf.getClass().getDeclaredField("modifiers");
|
||||
modf.setAccessible(true);
|
||||
modf.set(plf, plf.getModifiers() & ~Modifier.FINAL);
|
||||
plf.set(plw, plw.plist.players);
|
||||
server.a(plw);
|
||||
plf.set(mock, plf.get(plist));
|
||||
try {
|
||||
server.getClass().getMethod("a", dplc).invoke(server, mock);
|
||||
} catch (NoSuchMethodException e) {
|
||||
server.getClass().getMethod("a", Class.forName(server.getClass().getPackage().getName() + ".PlayerList")).invoke(server, mock);
|
||||
}
|
||||
Field pllf = CraftServer.class.getDeclaredField("playerList");
|
||||
pllf.setAccessible(true);
|
||||
pllf.set(Bukkit.getServer(), plw);
|
||||
pllf.set(Bukkit.getServer(), mock);
|
||||
}
|
||||
|
||||
static boolean hookDown() throws Exception {
|
||||
Field conf = CraftServer.class.getDeclaredField("console");
|
||||
/*Field conf = CraftServer.class.getDeclaredField("console");
|
||||
conf.setAccessible(true);
|
||||
val server = (MinecraftServer) conf.get(Bukkit.getServer());
|
||||
val plist = (DedicatedPlayerList) server.getPlayerList();
|
||||
|
|
@ -88,275 +103,7 @@ public class PlayerListWatcher extends DedicatedPlayerList {
|
|||
server.a(((PlayerListWatcher) plist).plist);
|
||||
Field pllf = CraftServer.class.getDeclaredField("playerList");
|
||||
pllf.setAccessible(true);
|
||||
pllf.set(Bukkit.getServer(), ((PlayerListWatcher) plist).plist);
|
||||
pllf.set(Bukkit.getServer(), ((PlayerListWatcher) plist).plist);*/
|
||||
return true;
|
||||
}
|
||||
|
||||
public void a(EntityHuman entityhuman, IChatBaseComponent ichatbasecomponent) {
|
||||
plist.a(entityhuman, ichatbasecomponent);
|
||||
}
|
||||
|
||||
public void a(EntityPlayer entityplayer, int i) {
|
||||
plist.a(entityplayer, i);
|
||||
}
|
||||
|
||||
public void a(EntityPlayer entityplayer, WorldServer worldserver) {
|
||||
plist.a(entityplayer, worldserver);
|
||||
}
|
||||
|
||||
public NBTTagCompound a(EntityPlayer entityplayer) {
|
||||
return plist.a(entityplayer);
|
||||
}
|
||||
|
||||
public void a(int i) {
|
||||
plist.a(i);
|
||||
}
|
||||
|
||||
public void a(NetworkManager networkmanager, EntityPlayer entityplayer) {
|
||||
plist.a(networkmanager, entityplayer);
|
||||
}
|
||||
|
||||
public void a(Packet<?> packet, int i) {
|
||||
plist.a(packet, i);
|
||||
}
|
||||
|
||||
public EntityPlayer a(UUID uuid) {
|
||||
return plist.a(uuid);
|
||||
}
|
||||
|
||||
public void addOp(GameProfile gameprofile) {
|
||||
plist.addOp(gameprofile);
|
||||
}
|
||||
|
||||
public void addWhitelist(GameProfile gameprofile) {
|
||||
plist.addWhitelist(gameprofile);
|
||||
}
|
||||
|
||||
public EntityPlayer attemptLogin(LoginListener loginlistener, GameProfile gameprofile, String hostname) {
|
||||
return plist.attemptLogin(loginlistener, gameprofile, hostname);
|
||||
}
|
||||
|
||||
public String b(boolean flag) {
|
||||
return plist.b(flag);
|
||||
}
|
||||
|
||||
public void b(EntityHuman entityhuman, IChatBaseComponent ichatbasecomponent) {
|
||||
plist.b(entityhuman, ichatbasecomponent);
|
||||
}
|
||||
|
||||
public void b(EntityPlayer entityplayer, WorldServer worldserver) {
|
||||
plist.b(entityplayer, worldserver);
|
||||
}
|
||||
|
||||
public List<EntityPlayer> b(String s) {
|
||||
return plist.b(s);
|
||||
}
|
||||
|
||||
public Location calculateTarget(Location enter, World target) {
|
||||
return plist.calculateTarget(enter, target);
|
||||
}
|
||||
|
||||
public void changeDimension(EntityPlayer entityplayer, int i, TeleportCause cause) {
|
||||
plist.changeDimension(entityplayer, i, cause);
|
||||
}
|
||||
|
||||
public void changeWorld(Entity entity, int i, WorldServer worldserver, WorldServer worldserver1) {
|
||||
plist.changeWorld(entity, i, worldserver, worldserver1);
|
||||
}
|
||||
|
||||
public int d() {
|
||||
return plist.d();
|
||||
}
|
||||
|
||||
public void d(EntityPlayer entityplayer) {
|
||||
plist.d(entityplayer);
|
||||
}
|
||||
|
||||
public String disconnect(EntityPlayer entityplayer) {
|
||||
return plist.disconnect(entityplayer);
|
||||
}
|
||||
|
||||
public boolean equals(Object obj) {
|
||||
return plist.equals(obj);
|
||||
}
|
||||
|
||||
public String[] f() {
|
||||
return plist.f();
|
||||
}
|
||||
|
||||
public void f(EntityPlayer entityplayer) {
|
||||
plist.f(entityplayer);
|
||||
}
|
||||
|
||||
public boolean f(GameProfile gameprofile) {
|
||||
return plist.f(gameprofile);
|
||||
}
|
||||
|
||||
public GameProfile[] g() {
|
||||
return plist.g();
|
||||
}
|
||||
|
||||
public boolean getHasWhitelist() {
|
||||
return plist.getHasWhitelist();
|
||||
}
|
||||
|
||||
public IpBanList getIPBans() {
|
||||
return plist.getIPBans();
|
||||
}
|
||||
|
||||
public int getMaxPlayers() {
|
||||
return plist.getMaxPlayers();
|
||||
}
|
||||
|
||||
public OpList getOPs() {
|
||||
return plist.getOPs();
|
||||
}
|
||||
|
||||
public EntityPlayer getPlayer(String s) {
|
||||
return plist.getPlayer(s);
|
||||
}
|
||||
|
||||
public int getPlayerCount() {
|
||||
return plist.getPlayerCount();
|
||||
}
|
||||
|
||||
public GameProfileBanList getProfileBans() {
|
||||
return plist.getProfileBans();
|
||||
}
|
||||
|
||||
public String[] getSeenPlayers() {
|
||||
return plist.getSeenPlayers();
|
||||
}
|
||||
|
||||
public DedicatedServer getServer() {
|
||||
return plist.getServer();
|
||||
}
|
||||
|
||||
public WhiteList getWhitelist() {
|
||||
return plist.getWhitelist();
|
||||
}
|
||||
|
||||
public String[] getWhitelisted() {
|
||||
return plist.getWhitelisted();
|
||||
}
|
||||
|
||||
public AdvancementDataPlayer h(EntityPlayer entityplayer) {
|
||||
return plist.h(entityplayer);
|
||||
}
|
||||
|
||||
public int hashCode() {
|
||||
return plist.hashCode();
|
||||
}
|
||||
|
||||
public boolean isOp(GameProfile gameprofile) {
|
||||
return plist.isOp(gameprofile);
|
||||
}
|
||||
|
||||
public boolean isWhitelisted(GameProfile gameprofile) {
|
||||
return plist.isWhitelisted(gameprofile);
|
||||
}
|
||||
|
||||
public EntityPlayer moveToWorld(EntityPlayer entityplayer, int i, boolean flag, Location location,
|
||||
boolean avoidSuffocation) {
|
||||
return plist.moveToWorld(entityplayer, i, flag, location, avoidSuffocation);
|
||||
}
|
||||
|
||||
public EntityPlayer moveToWorld(EntityPlayer entityplayer, int i, boolean flag) {
|
||||
return plist.moveToWorld(entityplayer, i, flag);
|
||||
}
|
||||
|
||||
public String[] n() {
|
||||
return plist.n();
|
||||
}
|
||||
|
||||
public void onPlayerJoin(EntityPlayer entityplayer, String joinMessage) {
|
||||
plist.onPlayerJoin(entityplayer, joinMessage);
|
||||
}
|
||||
|
||||
public EntityPlayer processLogin(GameProfile gameprofile, EntityPlayer player) {
|
||||
return plist.processLogin(gameprofile, player);
|
||||
}
|
||||
|
||||
public void reload() {
|
||||
plist.reload();
|
||||
}
|
||||
|
||||
public void reloadWhitelist() {
|
||||
plist.reloadWhitelist();
|
||||
}
|
||||
|
||||
public void removeOp(GameProfile gameprofile) {
|
||||
plist.removeOp(gameprofile);
|
||||
}
|
||||
|
||||
public void removeWhitelist(GameProfile gameprofile) {
|
||||
plist.removeWhitelist(gameprofile);
|
||||
}
|
||||
|
||||
public void repositionEntity(Entity entity, Location exit, boolean portal) {
|
||||
plist.repositionEntity(entity, exit, portal);
|
||||
}
|
||||
|
||||
public int s() {
|
||||
return plist.s();
|
||||
}
|
||||
|
||||
public void savePlayers() {
|
||||
plist.savePlayers();
|
||||
}
|
||||
|
||||
@SuppressWarnings("rawtypes")
|
||||
public void sendAll(Packet packet, EntityHuman entityhuman) {
|
||||
plist.sendAll(packet, entityhuman);
|
||||
}
|
||||
|
||||
@SuppressWarnings("rawtypes")
|
||||
public void sendAll(Packet packet, World world) {
|
||||
plist.sendAll(packet, world);
|
||||
}
|
||||
|
||||
public void sendPacketNearby(EntityHuman entityhuman, double d0, double d1, double d2, double d3, int i,
|
||||
Packet<?> packet) {
|
||||
plist.sendPacketNearby(entityhuman, d0, d1, d2, d3, i, packet);
|
||||
}
|
||||
|
||||
public void sendScoreboard(ScoreboardServer scoreboardserver, EntityPlayer entityplayer) {
|
||||
plist.sendScoreboard(scoreboardserver, entityplayer);
|
||||
}
|
||||
|
||||
public void setHasWhitelist(boolean flag) {
|
||||
plist.setHasWhitelist(flag);
|
||||
}
|
||||
|
||||
public void setPlayerFileData(WorldServer[] aworldserver) {
|
||||
plist.setPlayerFileData(aworldserver);
|
||||
}
|
||||
|
||||
public NBTTagCompound t() {
|
||||
return plist.t();
|
||||
}
|
||||
|
||||
public void tick() {
|
||||
plist.tick();
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
return plist.toString();
|
||||
}
|
||||
|
||||
public void u() {
|
||||
plist.u();
|
||||
}
|
||||
|
||||
public void updateClient(EntityPlayer entityplayer) {
|
||||
plist.updateClient(entityplayer);
|
||||
}
|
||||
|
||||
public List<EntityPlayer> v() {
|
||||
return plist.v();
|
||||
}
|
||||
|
||||
public ServerStatisticManager getStatisticManager(EntityPlayer entityhuman) {
|
||||
return plist.getStatisticManager(entityhuman);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue