Repo-Mirror/rpgregions-2
9
0
Fork 0
mirror of https://gitlab.com/SamB440/rpgregions-2.git synced 2025-12-28 03:09:14 +00:00
Code Issues Releases Activity

Add outlinepane, fix forward/back settings, fix outofbounds error, hide item attributes

Browse Source
This commit is contained in:
SamB440
2020-02-16 18:17:18 +00:00
parent d49ebc6933
commit c05e55d6ac
2 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rpgregions/src/main/java/net/islandearth/rpgregions/RPGRegions.java
View File

@@ -137,7 +137,7 @@ public final class RPGRegions extends JavaPlugin implements RPGRegionsAPI, Langu
config.addDefault("settings.server.gui.forward.forward", XMaterial.ARROW.parseMaterial().toString());
config.addDefault("settings.server.gui.back.back", XMaterial.ARROW.parseMaterial().toString());
config.addDefault("settings.server.gui.exit.exit", XMaterial.BARRIER.parseMaterial().toString());
config.addDefault("settings.server.gui.outlinePane.outlinePane", XMaterial.LIGHT_GRAY_STAINED_GLASS_PANE.parseMaterial().toString());
config.addDefault("settings.server.gui.outlinePane.outlinePane", XMaterial.GRAY_STAINED_GLASS_PANE.parseMaterial().toString());
config.options().copyDefaults(true);
saveConfig();
}

41
rpgregions/src/main/java/net/islandearth/rpgregions/gui/DiscoveryGUI.java
View File

@@ -30,10 +30,10 @@ public class DiscoveryGUI extends RPGRegionsGUI {
int backY = plugin.getConfig().getInt("settings.server.gui.back.posY");
int backL = plugin.getConfig().getInt("settings.server.gui.back.length");
int backH = plugin.getConfig().getInt("settings.server.gui.back.height");
int forwardX = plugin.getConfig().getInt("settings.server.gui.back.posX");
int forwardY = plugin.getConfig().getInt("settings.server.gui.back.posY");
int forwardL = plugin.getConfig().getInt("settings.server.gui.back.length");
int forwardH = plugin.getConfig().getInt("settings.server.gui.back.height");
int forwardX = plugin.getConfig().getInt("settings.server.gui.forward.posX");
int forwardY = plugin.getConfig().getInt("settings.server.gui.forward.posY");
int forwardL = plugin.getConfig().getInt("settings.server.gui.forward.length");
int forwardH = plugin.getConfig().getInt("settings.server.gui.forward.height");
int exitX = plugin.getConfig().getInt("settings.server.gui.exit.posX");
int exitY = plugin.getConfig().getInt("settings.server.gui.exit.posY");
int exitL = plugin.getConfig().getInt("settings.server.gui.exit.length");
@@ -52,13 +52,30 @@ public class DiscoveryGUI extends RPGRegionsGUI {
StaticPane forward = new StaticPane(forwardX, forwardY, forwardL, forwardH);
StaticPane exit = new StaticPane(exitX, exitY, exitL, exitH);
// Outline pane
if (plugin.getConfig().getBoolean("settings.server.gui.outlinePane.show")) {
oPane.setRepeat(true);
oPane.setOnClick(inventoryClickEvent -> {
inventoryClickEvent.setCancelled(true);
});
oPane.addItem(new GuiItem(new ItemStackBuilder(XMaterial.valueOf(
plugin.getConfig().getString("settings.server.gui.outlinePane.outlinePane")).parseMaterial())
.withName(" ")
.addFlags(ItemFlag.HIDE_ATTRIBUTES)
.build()));
gui.addPane(oPane);
}
// Back item
back.addItem(new GuiItem(new ItemStackBuilder(XMaterial.valueOf(
plugin.getConfig().getString("settings.server.gui.back.back")).parseMaterial())
.withName(Translations.PREVIOUS_PAGE.get(player))
.addFlags(ItemFlag.HIDE_ATTRIBUTES)
.build(), event -> {
event.setCancelled(true);
if (pane.getPages() == 1) return;
if (pane.getPages() == 0) return;
pane.setPage(pane.getPage() - 1);
@@ -76,9 +93,10 @@ public class DiscoveryGUI extends RPGRegionsGUI {
forward.addItem(new GuiItem(new ItemStackBuilder(XMaterial.valueOf(
plugin.getConfig().getString("settings.server.gui.forward.forward")).parseMaterial())
.withName(Translations.NEXT_PAGE.get(player))
.addFlags(ItemFlag.HIDE_ATTRIBUTES)
.build(), event -> {
event.setCancelled(true);
if (pane.getPages() == 1) return;
if (pane.getPages() == 0) return;
pane.setPage(pane.getPage() + 1);
@@ -95,6 +113,7 @@ public class DiscoveryGUI extends RPGRegionsGUI {
exit.addItem(new GuiItem(new ItemStackBuilder(XMaterial.valueOf(
plugin.getConfig().getString("settings.server.gui.exit.exit")).parseMaterial())
.withName(Translations.EXIT.get(player))
.addFlags(ItemFlag.HIDE_ATTRIBUTES)
.build(), event -> {
event.setCancelled(true);
gui.update();
@@ -104,16 +123,6 @@ public class DiscoveryGUI extends RPGRegionsGUI {
gui.addPane(exit);
}
// Outline pane
if (plugin.getConfig().getBoolean("settings.server.gui.outlinePane.show")) {
oPane.addItem(new GuiItem(new ItemStackBuilder(XMaterial.valueOf(
plugin.getConfig().getString("settings.server.gui.outlinePane.outlinePane")).parseMaterial())
.withName(Translations.EXIT.get(player))
.build()));
gui.addPane(oPane);
}
gui.addPane(back);
gui.addPane(forward);