Skip to content

Commit

Permalink
Make the Client UI API naming scheme a little less confusing
Browse files Browse the repository at this point in the history
  • Loading branch information
@ME1312
ME1312 committed Aug 12, 2018
1 parent cb7b396 commit 811cc89
Show file tree
Hide file tree
Showing 9 changed files with 200 additions and 42 deletions.
22 changes: 11 additions & 11 deletions ...ent/Bukkit/Graphic/InternalUIHandler.java → ...ient/Bukkit/Graphic/DefaultUIHandler.java
View file
Expand Up @@ -25,11 +25,11 @@
import java.util.UUID;

/**
* Internal GUI Listener
* Default GUI Listener
*/
public class InternalUIHandler implements UIHandler, Listener {
public class DefaultUIHandler implements UIHandler, Listener {
private HashMap<UUID, Callback<YAMLSection>> input = new HashMap<UUID, Callback<YAMLSection>>();
private HashMap<UUID, InternalUIRenderer> gui = new HashMap<UUID, InternalUIRenderer>();
private HashMap<UUID, DefaultUIRenderer> gui = new HashMap<UUID, DefaultUIRenderer>();
private boolean enabled = true;
private SubPlugin plugin;

Expand All @@ -38,14 +38,14 @@ public class InternalUIHandler implements UIHandler, Listener {
*
* @param plugin Event
*/
public InternalUIHandler(SubPlugin plugin) {
public DefaultUIHandler(SubPlugin plugin) {
if (Util.isNull(plugin)) throw new NullPointerException();
this.plugin = plugin;
Bukkit.getPluginManager().registerEvents(this, plugin);
}

public InternalUIRenderer getRenderer(Player player) {
if (!gui.keySet().contains(player.getUniqueId())) gui.put(player.getUniqueId(), new InternalUIRenderer(plugin, player.getUniqueId()));
public DefaultUIRenderer getRenderer(Player player) {
if (!gui.keySet().contains(player.getUniqueId())) gui.put(player.getUniqueId(), new DefaultUIRenderer(plugin, player.getUniqueId()));
return gui.get(player.getUniqueId());
}

Expand All @@ -57,7 +57,7 @@ public void disable() {
public void click(InventoryClickEvent event) {
Player player = (Player) event.getWhoClicked();
if (!event.isCancelled() && enabled && gui.keySet().contains(player.getUniqueId())) {
InternalUIRenderer gui = this.gui.get(player.getUniqueId());
DefaultUIRenderer gui = this.gui.get(player.getUniqueId());
if (gui.open && event.getClickedInventory() != null && event.getClickedInventory().getTitle() != null) {
if (plugin.subdata == null) {
new IllegalStateException("SubData is not connected").printStackTrace();
Expand Down Expand Up @@ -211,8 +211,8 @@ public void click(InventoryClickEvent event) {
gui.back();
} else {
player.closeInventory();
final Container<Renderer<Host>> plugin = new Container<Renderer<Host>>(null);
for (Renderer<Host> renderer : InternalUIRenderer.hostPlugins.values()) {
final Container<PluginRenderer<Host>> plugin = new Container<PluginRenderer<Host>>(null);
for (PluginRenderer<Host> renderer : DefaultUIRenderer.hostPlugins.values()) {
if (item.equals(renderer.getIcon().getItemMeta().getDisplayName())) plugin.set(renderer);
}
if (plugin.get() == null) {
Expand Down Expand Up @@ -403,8 +403,8 @@ public void run(YAMLSection json) {
gui.back();
} else {
player.closeInventory();
Container<Renderer<SubServer>> plugin = new Container<Renderer<SubServer>>(null);
for (Renderer<SubServer> renderer : InternalUIRenderer.subserverPlugins.values()) {
Container<PluginRenderer<SubServer>> plugin = new Container<PluginRenderer<SubServer>>(null);
for (PluginRenderer<SubServer> renderer : DefaultUIRenderer.subserverPlugins.values()) {
if (item.equals(renderer.getIcon().getItemMeta().getDisplayName())) plugin.set(renderer);
}
if (plugin.get() == null) {
Expand Down
6 changes: 3 additions & 3 deletions ...nt/Bukkit/Graphic/InternalUIRenderer.java → ...ent/Bukkit/Graphic/DefaultUIRenderer.java
View file
Expand Up @@ -19,9 +19,9 @@
import java.util.*;

/**
* Internal GUI Renderer Class
* Default GUI Renderer Class
*/
public class InternalUIRenderer extends UIRenderer {
public class DefaultUIRenderer extends UIRenderer {
private static int MAX_VISITED_OBJECTS = 2;
private List<Runnable> windowHistory = new LinkedList<Runnable>();
protected Object[] lastVisitedObjects = new Object[MAX_VISITED_OBJECTS];
Expand All @@ -31,7 +31,7 @@ public class InternalUIRenderer extends UIRenderer {
protected final UUID player;
private SubPlugin plugin;

protected InternalUIRenderer(SubPlugin plugin, UUID player) {
protected DefaultUIRenderer(SubPlugin plugin, UUID player) {
super(plugin, player);
this.plugin = plugin;
this.player = player;
Expand Down
4 changes: 2 additions & 2 deletions ...rvers/Client/Bukkit/Graphic/Renderer.java → ...Client/Bukkit/Graphic/PluginRenderer.java
View file
Expand Up @@ -4,9 +4,9 @@
import org.bukkit.inventory.ItemStack;

/**
* GUI Renderer Layout Class
* Plugin GUI Renderer Layout Class
*/
public interface Renderer<T> {
public interface PluginRenderer<T> {

/**
* Open the GUI
Expand Down
17 changes: 9 additions & 8 deletions SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/UIRenderer.java
View file
@@ -1,4 +1,5 @@
package net.ME1312.SubServers.Client.Bukkit.Graphic;

import net.ME1312.SubServers.Client.Bukkit.Library.Container;
import net.ME1312.SubServers.Client.Bukkit.Library.NamedContainer;
import net.ME1312.SubServers.Client.Bukkit.Library.Util;
Expand All @@ -19,8 +20,8 @@
* GUI Renderer Layout Class
*/
public abstract class UIRenderer {
protected static HashMap<String, Renderer<Host>> hostPlugins = new HashMap<String, Renderer<Host>>();
protected static HashMap<String, Renderer<SubServer>> subserverPlugins = new HashMap<String, Renderer<SubServer>>();
protected static HashMap<String, PluginRenderer<Host>> hostPlugins = new HashMap<String, PluginRenderer<Host>>();
protected static HashMap<String, PluginRenderer<SubServer>> subserverPlugins = new HashMap<String, PluginRenderer<SubServer>>();
private NamedContainer<String, Integer> tdownload = null;
private int download = -1;
private final UUID player;
Expand Down Expand Up @@ -267,7 +268,7 @@ public ItemStack parseItem(String str, ItemStack def) {
* @param handle Handle to bind
* @param renderer Renderer
*/
public static void addHostPlugin(String handle, Renderer<Host> renderer) {
public static void addHostPlugin(String handle, PluginRenderer<Host> renderer) {
if (Util.isNull(handle, renderer)) throw new NullPointerException();
hostPlugins.put(handle, renderer);
}
Expand All @@ -277,8 +278,8 @@ public static void addHostPlugin(String handle, Renderer<Host> renderer) {
*
* @return Host Plugins
*/
public static Map<String, Renderer> getHostPlugins() {
return new HashMap<String, Renderer>(hostPlugins);
public static Map<String, PluginRenderer> getHostPlugins() {
return new HashMap<String, PluginRenderer>(hostPlugins);
}

/**
Expand All @@ -297,7 +298,7 @@ public static void removeHostPlugin(String handle) {
* @param handle Handle to bind
* @param renderer Renderer
*/
public static void addSubServerPlugin(String handle, Renderer<SubServer> renderer) {
public static void addSubServerPlugin(String handle, PluginRenderer<SubServer> renderer) {
if (Util.isNull(handle, renderer)) throw new NullPointerException();
subserverPlugins.put(handle, renderer);
}
Expand All @@ -307,8 +308,8 @@ public static void addSubServerPlugin(String handle, Renderer<SubServer> rendere
*
* @return SubServer Plugins
*/
public static Map<String, Renderer> getSubServerPlugins() {
return new HashMap<String, Renderer>(subserverPlugins);
public static Map<String, PluginRenderer> getSubServerPlugins() {
return new HashMap<String, PluginRenderer>(subserverPlugins);
}

/**
Expand Down
6 changes: 3 additions & 3 deletions ...ient/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/BungeeChat.java
View file
Expand Up @@ -112,7 +112,7 @@ public void listCommand(CommandSender sender, String label) {
}
hover.setColor(ChatColor.WHITE);
hoverm.add(hover);
message.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, label + " open SubServer/ " + server));
message.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, label + " open SubServer/ " + server.getName()));
} else {
message.setColor(ChatColor.WHITE);
hover.setColor(ChatColor.WHITE);
Expand All @@ -122,9 +122,9 @@ public void listCommand(CommandSender sender, String label) {
hover.setColor(ChatColor.GRAY);
}
hoverm.add(hover);
hover = new TextComponent(plugin.api.getLang("SubServers", "Interface.Server-Menu.Server-External"));
hover = new TextComponent(plugin.api.getLang("SubServers", "Interface.Server-Menu.Server-External") + '\n');
hoverm.add(hover);
hover = new TextComponent(plugin.api.getLang("SubServers", "Interface.Server-Menu.Server-Player-Count").replace("$int$", new DecimalFormat("#,###").format(server.getPlayers().size())) + '\n');
hover = new TextComponent(plugin.api.getLang("SubServers", "Interface.Server-Menu.Server-Player-Count").replace("$int$", new DecimalFormat("#,###").format(server.getPlayers().size())));
hoverm.add(hover);
if (plugin.config.get().getSection("Settings").getBoolean("Show-Addresses", false)) {
hover = new TextComponent('\n' + server.getAddress().getAddress().getHostAddress() + ':' + server.getAddress().getPort());
Expand Down
4 changes: 2 additions & 2 deletions SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java
View file
@@ -1,6 +1,6 @@
package net.ME1312.SubServers.Client.Bukkit;

import net.ME1312.SubServers.Client.Bukkit.Graphic.InternalUIHandler;
import net.ME1312.SubServers.Client.Bukkit.Graphic.DefaultUIHandler;
import net.ME1312.SubServers.Client.Bukkit.Graphic.UIHandler;
import net.ME1312.SubServers.Client.Bukkit.Library.Config.YAMLConfig;
import net.ME1312.SubServers.Client.Bukkit.Library.Config.YAMLSection;
Expand Down Expand Up @@ -78,7 +78,7 @@ public void onEnable() {
reload(false);

if (config.get().getSection("Settings").getBoolean("Ingame-Access", true)) {
gui = new InternalUIHandler(this);
gui = new DefaultUIHandler(this);
SubCommand cmd = new SubCommand(this);
getCommand("subservers").setExecutor(cmd);
getCommand("subserver").setExecutor(cmd);
Expand Down
4 changes: 2 additions & 2 deletions ...rvers/Client/Sponge/Graphic/Renderer.java → ...Client/Sponge/Graphic/PluginRenderer.java
View file
Expand Up @@ -4,9 +4,9 @@
import org.spongepowered.api.item.inventory.ItemStack;

/**
* GUI Renderer Layout Class
* Plugin GUI Renderer Layout Class
*/
public interface Renderer<T> {
public interface PluginRenderer<T> {

/**
* Open the GUI
Expand Down

0 comments on commit 811cc89

Please sign in to comment.