Upstream
/
SubServers-2
mirror of https://github.com/ME1312/SubServers-2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Optimizations for Client UI

This commit is contained in:
ME1312 2021-06-07 03:22:57 -04:00
parent b707f2cc0c
commit f5c8ade961
No known key found for this signature in database
GPG Key ID: FEFFE2F698E88FA8
3 changed files with 103 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SubServers.Client/Bukkit/pom.xml
View File

@ -21,8 +21,8 @@
<url>https://dev.me1312.net/maven</url> <url>https://dev.me1312.net/maven</url>
</repository> </repository>
<repository> <repository>
<id>puharesource-repo</id> <id>jitpack.io</id>
<url>https://repo.puha.io/repo/</url> <url>https://jitpack.io</url>
</repository> </repository>
<repository> <repository>
<id>placeholderapi</id> <id>placeholderapi</id>
@ -65,9 +65,9 @@
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.puharesource.mc</groupId> <groupId>com.github.ConnorLinfoot</groupId>
<artifactId>TitleManager</artifactId> <artifactId>TitleAPI</artifactId>
<version>1.5.11</version> <!-- Use this plugin to enable title messages on 1.8, 1.9, and 1.10 servers --> <version>1.7.6</version> <!-- Use this plugin to enable title messages on 1.8, 1.9, and 1.10 servers -->
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

161
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/UIRenderer.java
View File

@ -2,8 +2,6 @@ package net.ME1312.SubServers.Client.Bukkit.Graphic;
import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Container.ContainedPair;
import net.ME1312.Galaxi.Library.Container.Container; import net.ME1312.Galaxi.Library.Container.Container;
import net.ME1312.Galaxi.Library.Container.Pair;
import net.ME1312.Galaxi.Library.Container.Value;
import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Util;
import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.Galaxi.Library.Version.Version;
import net.ME1312.SubServers.Client.Bukkit.SubPlugin; import net.ME1312.SubServers.Client.Bukkit.SubPlugin;
@ -24,9 +22,13 @@ import java.util.regex.Pattern;
* GUI Renderer Layout Class * GUI Renderer Layout Class
*/ */
public abstract class UIRenderer { public abstract class UIRenderer {
private final boolean USE_TITLES;
private final boolean TAPI_1_11;
private final boolean TAPI_PLUGIN;
static HashMap<String, PluginRenderer<Host>> hostPlugins = new HashMap<String, PluginRenderer<Host>>(); static HashMap<String, PluginRenderer<Host>> hostPlugins = new HashMap<String, PluginRenderer<Host>>();
static HashMap<String, PluginRenderer<SubServer>> subserverPlugins = new HashMap<String, PluginRenderer<SubServer>>(); static HashMap<String, PluginRenderer<SubServer>> subserverPlugins = new HashMap<String, PluginRenderer<SubServer>>();
private Pair<String, Integer> tdownload = null; private ContainedPair<String, Integer> tdownload = null;
private int download = -1; private int download = -1;
private final UUID player; private final UUID player;
private SubPlugin plugin; private SubPlugin plugin;
@ -41,6 +43,17 @@ public abstract class UIRenderer {
if (Util.isNull(plugin, player)) throw new NullPointerException(); if (Util.isNull(plugin, player)) throw new NullPointerException();
this.plugin = plugin; this.plugin = plugin;
this.player = player; this.player = player;
// Detect Title API
if (USE_TITLES = plugin.config.get().getMap("Settings").getBoolean("Use-Title-Messages", true)) {
if (TAPI_1_11 = plugin.api.getGameVersion().compareTo(new Version("1.11")) >= 0) {
TAPI_PLUGIN = false;
} else {
TAPI_PLUGIN = Bukkit.getPluginManager().getPlugin("TitleAPI") != null;
}
} else{
TAPI_1_11 = TAPI_PLUGIN = false;
}
} }
/** /**
@ -101,42 +114,56 @@ public abstract class UIRenderer {
* @return Success Status * @return Success Status
*/ */
public boolean sendTitle(String str, int fadein, int stay, int fadeout) { public boolean sendTitle(String str, int fadein, int stay, int fadeout) {
if (Util.isNull(str, fadein, stay, fadeout)) throw new NullPointerException(); if (USE_TITLES) {
if (plugin.config.get().getMap("Settings").getBoolean("Use-Title-Messages", true)) {
String line1, line2; String line1, line2;
if (!str.startsWith("\n") && str.contains("\n")) { if (str == null) {
line1 = str.split("\\n")[0]; line1 = line2 = null;
line2 = str.split("\\n")[1];
} else { } else {
line1 = str.replace("\n", ""); if (!str.contains("\n")) {
line2 = ChatColor.RESET.toString(); line1 = str;
line2 = ChatColor.RESET.toString();
} else if (str.startsWith("\n")) {
line1 = str.replace("\n", "");
line2 = ChatColor.RESET.toString();
} else {
String[] arr = str.split("\\n", 2);
line1 = arr[0];
line2 = arr[1];
}
} }
try { try {
Player player = Bukkit.getPlayer(this.player); Player player = Bukkit.getPlayer(this.player);
if (plugin.api.getGameVersion().compareTo(new Version("1.11")) >= 0) { if (player != null) {
if (ChatColor.stripColor(line1).length() == 0 && ChatColor.stripColor(line2).length() == 0) { if (TAPI_1_11) {
player.resetTitle(); if (str == null) {
} else { player.resetTitle();
player.sendTitle(line1, line2, (fadein >= 0)?fadein:10, (stay >= 0)?stay:70, (fadeout >= 0)?fadeout:20); } else {
player.sendTitle(line1, line2, (fadein >= 0)?fadein:10, (stay >= 0)?stay:70, (fadeout >= 0)?fadeout:20);
}
return true;
} else if (TAPI_PLUGIN) {
if (str == null) {
com.connorlinfoot.titleapi.TitleAPI.clearTitle(player);
} else {
com.connorlinfoot.titleapi.TitleAPI.sendTitle(player, (fadein >= 0)?fadein:10, (stay >= 0)?stay:70, (fadeout >= 0)?fadeout:20, line1, line2);
}
return true;
} }
return true; }
} else if (Bukkit.getPluginManager().getPlugin("TitleManager") != null) {
if (Util.isException(() -> Util.reflect(Class.forName("io.puharesource.mc.titlemanager.api.v2.TitleManagerAPI").getMethod("sendTitles", Player.class, String.class, String.class, int.class, int.class, int.class),
Bukkit.getPluginManager().getPlugin("TitleManager"), player, line1, line2, (fadein >= 0)?fadein:10, (stay >= 0)?stay:70, (fadeout >= 0)?fadeout:20))) { // Attempt TitleAPI v2
// Fallback to TitleAPI v1
io.puharesource.mc.titlemanager.api.TitleObject obj = io.puharesource.mc.titlemanager.api.TitleObject.class.getConstructor(String.class, String.class).newInstance(line1, line2);
if (fadein >= 0) obj.setFadeIn(fadein);
if (stay >= 0) obj.setStay(stay);
if (fadeout >= 0) obj.setFadeOut(fadeout);
obj.send(player);
}
return true;
} else return false;
} catch (Throwable e) { } catch (Throwable e) {
return false; return false;
} }
} else return false; }
return false;
}
/**
* See if Title Messages are available for use
*
* @return Title Message Availability
*/
public boolean canSendTitle() {
return USE_TITLES && (TAPI_1_11 || TAPI_PLUGIN);
} }
/** /**
@ -145,7 +172,7 @@ public abstract class UIRenderer {
* @param subtitle Subtitle to display (or null to hide) * @param subtitle Subtitle to display (or null to hide)
*/ */
public void setDownloading(String subtitle) { public void setDownloading(String subtitle) {
if (subtitle != null && !(plugin.config.get().getMap("Settings").getBoolean("Use-Title-Messages", true) && (plugin.api.getGameVersion().compareTo(new Version("1.11")) >= 0 || Bukkit.getPluginManager().getPlugin("TitleManager") != null))) { if (subtitle != null && !canSendTitle()) {
if (download != -1) Bukkit.getScheduler().cancelTask(download); if (download != -1) Bukkit.getScheduler().cancelTask(download);
download = Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> { download = Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> {
if (tdownload != null) Bukkit.getPlayer(player).sendMessage(plugin.api.getLang("SubServers", "Interface.Generic.Downloading").replace("$str$", subtitle)); if (tdownload != null) Bukkit.getPlayer(player).sendMessage(plugin.api.getLang("SubServers", "Interface.Generic.Downloading").replace("$str$", subtitle));
@ -153,40 +180,46 @@ public abstract class UIRenderer {
}, 50L); }, 50L);
} if (subtitle != null && tdownload == null) { } if (subtitle != null && tdownload == null) {
tdownload = new ContainedPair<String, Integer>(subtitle, 0); tdownload = new ContainedPair<String, Integer>(subtitle, 0);
final Value<Integer> delay = new Container<Integer>(0); final Container<Integer> delay = new Container<Integer>(0);
String word = ChatColor.stripColor(plugin.api.getLang("SubServers", "Interface.Generic.Downloading.Title"));
String a = plugin.api.getLang("SubServers", "Interface.Generic.Downloading.Title-Color-Alt");
String b = plugin.api.getLang("SubServers", "Interface.Generic.Downloading.Title-Color");
Bukkit.getScheduler().runTask(plugin, new Runnable() { Bukkit.getScheduler().runTask(plugin, new Runnable() {
@Override @Override
public void run() { public void run() {
if (tdownload != null) { if (tdownload != null) {
String word = ChatColor.stripColor(plugin.api.getLang("SubServers", "Interface.Generic.Downloading.Title"));
int i = 0; int i = 0;
int start = (tdownload.value() - 3 < 0)?0: tdownload.value()-3; int start = Math.max(tdownload.value - 3, 0);
int end = (tdownload.value() >= word.length())?word.length(): tdownload.value(); int end = Math.min(tdownload.value, word.length());
String str = plugin.api.getLang("SubServers", (delay.value() > 7 && start == 0)?"Interface.Generic.Downloading.Title-Color-Alt":"Interface.Generic.Downloading.Title-Color"); StringBuilder s = new StringBuilder((delay.value > 7 && start == 0)?a:b);
delay.value(delay.value() + 1); ++delay.value;
if (delay.value() > 7) tdownload.value(tdownload.value() + 1); if (delay.value > 7) ++tdownload.value;
if (tdownload.value() >= word.length() + 3) { if (tdownload.value >= word.length() + 3) {
tdownload.value(0); tdownload.value = 0;
delay.value(0); delay.value = 0;
} }
for (char c : word.toCharArray()) { for (char c : word.toCharArray()) {
i++; ++i;
if (i == start) str += plugin.api.getLang("SubServers", "Interface.Generic.Downloading.Title-Color-Alt"); if (i == start) s.append(a);
str += c; s.append(c);
if (i == end) str += plugin.api.getLang("SubServers", "Interface.Generic.Downloading.Title-Color"); if (i == end) s.append(b);
} }
str += '\n' + plugin.api.getLang("SubServers", "Interface.Generic.Downloading.Title-Color-Alt") + tdownload.key(); s.append('\n');
sendTitle(str, 0, 10, 5); s.append(a);
Bukkit.getScheduler().runTaskLater(plugin, this, 1); s.append(tdownload.key);
if (sendTitle(s.toString(), 0, 10, 5)) {
Bukkit.getScheduler().runTaskLater(plugin, this, 1);
}
} else { } else {
sendTitle(ChatColor.RESET.toString(), 0, 1, 0); sendTitle(null);
} }
} }
}); });
} else if (subtitle != null) { } else if (subtitle != null) {
tdownload.key(subtitle); tdownload.key = subtitle;
} else { } else {
if (tdownload != null) { if (tdownload != null) {
tdownload = null; tdownload = null;
@ -217,17 +250,17 @@ public abstract class UIRenderer {
*/ */
@SuppressWarnings({"deprecation", "JavaReflectionMemberAccess"}) @SuppressWarnings({"deprecation", "JavaReflectionMemberAccess"})
public ItemStack parseItem(String str, ItemStack def) { public ItemStack parseItem(String str, ItemStack def) {
final Value<String> item = new Container<String>(str); final Container<String> item = new Container<String>(str);
if (plugin.api.getGameVersion().compareTo(new Version("1.13")) < 0) { if (plugin.api.getGameVersion().compareTo(new Version("1.13")) < 0) {
try { try {
// int // int
Matcher matcher = Pattern.compile("(?i)^(\\d+)$").matcher(item.value()); Matcher matcher = Pattern.compile("(?i)^(\\d+)$").matcher(item.value);
if (matcher.find()) { if (matcher.find()) {
return new ItemStack(Integer.parseInt(matcher.group(1)), 1); return new ItemStack(Integer.parseInt(matcher.group(1)), 1);
} }
// int:int // int:int
matcher.reset(); matcher.reset();
matcher = Pattern.compile("(?i)^(\\d+):(\\d+)$").matcher(item.value()); matcher = Pattern.compile("(?i)^(\\d+):(\\d+)$").matcher(item.value);
if (matcher.find()) { if (matcher.find()) {
return new ItemStack(Integer.parseInt(matcher.group(1)), 1, Short.parseShort(matcher.group(2))); return new ItemStack(Integer.parseInt(matcher.group(1)), 1, Short.parseShort(matcher.group(2)));
} }
@ -236,19 +269,19 @@ public abstract class UIRenderer {
} }
} }
if (item.value().toLowerCase().startsWith("minecraft:")) { if (item.value.toLowerCase().startsWith("minecraft:")) {
item.value(item.value().substring(10)); item.value(item.value.substring(10));
} else if (item.value().toLowerCase().startsWith("bukkit:")) { } else if (item.value.toLowerCase().startsWith("bukkit:")) {
item.value(item.value().substring(7)); item.value(item.value.substring(7));
// Legacy Material Name // Legacy Material Name
Matcher matcher = Pattern.compile("(?i)\\W(\\d+)$").matcher(item.value()); Matcher matcher = Pattern.compile("(?i)\\W(\\d+)$").matcher(item.value);
try { try {
if (matcher.find()) { if (matcher.find()) {
item.value(item.value().substring(0, item.value().length() - matcher.group().length())); item.value(item.value.substring(0, item.value.length() - matcher.group().length()));
return new ItemStack(Material.valueOf(item.value().toUpperCase()), 1, Short.parseShort(matcher.group(1))); return new ItemStack(Material.valueOf(item.value.toUpperCase()), 1, Short.parseShort(matcher.group(1)));
} else { } else {
return new ItemStack(Material.valueOf(item.value().toUpperCase()), 1); return new ItemStack(Material.valueOf(item.value.toUpperCase()), 1);
} }
} catch (IllegalArgumentException e) {} } catch (IllegalArgumentException e) {}
} }
@ -256,11 +289,11 @@ public abstract class UIRenderer {
// Material Name // Material Name
if (plugin.api.getGameVersion().compareTo(new Version("1.13")) < 0) { if (plugin.api.getGameVersion().compareTo(new Version("1.13")) < 0) {
try { try {
return new ItemStack(Material.valueOf(item.value().toUpperCase()), 1); return new ItemStack(Material.valueOf(item.value.toUpperCase()), 1);
} catch (IllegalArgumentException e) {} } catch (IllegalArgumentException e) {}
} else try { } else try {
if (Material.class.getMethod("getMaterial", String.class, boolean.class).invoke(null, item.value().toUpperCase(), false) != null) { if (Material.class.getMethod("getMaterial", String.class, boolean.class).invoke(null, item.value.toUpperCase(), false) != null) {
return new ItemStack((Material) Material.class.getMethod("getMaterial", String.class, boolean.class).invoke(null, item.value().toUpperCase(), false), 1); return new ItemStack((Material) Material.class.getMethod("getMaterial", String.class, boolean.class).invoke(null, item.value.toUpperCase(), false), 1);
} }
} catch (Exception e) {} } catch (Exception e) {}

2
SubServers.Client/Bukkit/src/plugin.yml
View File

@ -2,7 +2,7 @@ name: SubServers-Client-Bukkit
main: net.ME1312.SubServers.Client.Bukkit.SubPlugin main: net.ME1312.SubServers.Client.Bukkit.SubPlugin
version: "2.17a" version: "2.17a"
authors: ["ME1312"] authors: ["ME1312"]
softdepend: [TitleManager, PlaceholderAPI] softdepend: [TitleAPI, PlaceholderAPI]
website: "https://github.com/ME1312/SubServers-2" website: "https://github.com/ME1312/SubServers-2"
#commands: #commands:
# subservers: # subservers: