Implement customizable Values GUI.#262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BONNe merged 1 commit into from
Jun 17, 2022
Merged

Implement customizable Values GUI. #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@
<spigot.version>1.16.5-R0.1-SNAPSHOT</spigot.version>
<bentobox.version>1.20.0</bentobox.version>
<!-- Panel Utils version -->
<panelutils.version>1.0.0</panelutils.version>
<panelutils.version>1.1.0</panelutils.version>
<!-- Revision variable removes warning about dynamic version -->
<revision>${build.version}-SNAPSHOT</revision>
<!-- Do not change unless you want different name for local builds. -->
Expand Down
1 change: 1 addition & 0 deletions src/main/java/world/bentobox/level/Level.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,7 @@ public void onLoad() {
// Save existing panels.
this.saveResource("panels/top_panel.yml", false);
this.saveResource("panels/detail_panel.yml", false);
this.saveResource("panels/value_panel.yml", false);
}

private boolean loadSettings() {
Expand Down
134 changes: 113 additions & 21 deletions src/main/java/world/bentobox/level/commands/IslandValueCommand.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,142 @@
package world.bentobox.level.commands;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;

import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.PlayerInventory;

import world.bentobox.bentobox.api.commands.CompositeCommand;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.util.Util;
import world.bentobox.level.Level;
import world.bentobox.level.panels.ValuePanel;
import world.bentobox.level.util.Utils;

public class IslandValueCommand extends CompositeCommand {

public class IslandValueCommand extends CompositeCommand
{
private final Level addon;

public IslandValueCommand(Level addon, CompositeCommand parent) {

public IslandValueCommand(Level addon, CompositeCommand parent)
{
super(parent, "value");
this.addon = addon;
}


@Override
public void setup() {
public void setup()
{
this.setPermission("island.value");
this.setDescription("island.value.description");
this.setParametersHelp("level.commands.value.parameters");
this.setDescription("level.commands.value.description");
this.setOnlyPlayer(true);
}


@Override
public boolean execute(User user, String label, List<String> args) {
Player player = user.getPlayer();
PlayerInventory inventory = player.getInventory();
if (!inventory.getItemInMainHand().getType().equals(Material.AIR)) {
Material material = inventory.getItemInMainHand().getType();
Integer value = addon.getBlockConfig().getValue(getWorld(), material);
if (value != null) {
user.sendMessage("island.value.success", "[value]", String.valueOf(value));
double underWater = addon.getSettings().getUnderWaterMultiplier();
if (underWater > 1.0) {
user.sendMessage("island.value.success-underwater", "[value]", (underWater * value) + "");
}
} else {
user.sendMessage("island.value.no-value");
public boolean execute(User user, String label, List<String> args)
{
if (args.size() > 1)
{
this.showHelp(this, user);
return true;
}

if (args.isEmpty())
{
ValuePanel.openPanel(this.addon, this.getWorld(), user);
}
else if (args.get(0).equalsIgnoreCase("HAND"))
{
Player player = user.getPlayer();
PlayerInventory inventory = player.getInventory();

if (!inventory.getItemInMainHand().getType().equals(Material.AIR))
{
this.printValue(user, inventory.getItemInMainHand().getType());
}
else
{
Utils.sendMessage(user, user.getTranslation("level.conversations.empty-hand"));
}
}
else
{
Material material = Material.matchMaterial(args.get(0));

if (material == null)
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(), "level.conversations.unknown-item",
"[material]", args.get(0)));
}
else
{
this.printValue(user, material);
}
} else {
user.sendMessage("island.value.empty-hand");
}

return true;
}

}

/**
* This method prints value of the given material in chat.
* @param user User who receives the message.
* @param material Material value.
*/
private void printValue(User user, Material material)
{
Integer value = this.addon.getBlockConfig().getValue(getWorld(), material);

if (value != null)
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(), "level.conversations.value",
"[value]", String.valueOf(value),
"[material]", Utils.prettifyObject(material, user)));

double underWater = this.addon.getSettings().getUnderWaterMultiplier();

if (underWater > 1.0)
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(),"level.conversations.success-underwater",
"[value]", (underWater * value) + ""),
"[material]", Utils.prettifyObject(material, user));
}
}
else
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(),"level.conversations.no-value"));
}
}


@Override
public Optional<List<String>> tabComplete(User user, String alias, List<String> args)
{
String lastArg = !args.isEmpty() ? args.get(args.size() - 1) : "";

if (args.isEmpty())
{
// Don't show every player on the server. Require at least the first letter
return Optional.empty();
}

List<String> options = new ArrayList<>(Arrays.stream(Material.values()).
filter(Material::isBlock).
map(Material::name).toList());

options.add("HAND");

return Optional.of(Util.tabLimit(options, lastArg));
}
}
105 changes: 8 additions & 97 deletions src/main/java/world/bentobox/level/panels/DetailsPanel.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,8 +165,8 @@ private void updateFilters()
{
if (o1.getValue().equals(o2.getValue()))
{
String o1Name = DetailsPanel.prettifyObject(o1.getKey(), this.user);
String o2Name = DetailsPanel.prettifyObject(o2.getKey(), this.user);
String o1Name = Utils.prettifyObject(o1.getKey(), this.user);
String o2Name = Utils.prettifyObject(o2.getKey(), this.user);

return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
}
Expand All@@ -193,8 +193,8 @@ private void updateFilters()

if (o1Value == o2Value)
{
String o1Name = DetailsPanel.prettifyObject(o1.getKey(), this.user);
String o2Name = DetailsPanel.prettifyObject(o2.getKey(), this.user);
String o1Name = Utils.prettifyObject(o1.getKey(), this.user);
String o2Name = Utils.prettifyObject(o2.getKey(), this.user);

return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
}
Expand All@@ -208,8 +208,8 @@ private void updateFilters()
{
sorter = (o1, o2) ->
{
String o1Name = DetailsPanel.prettifyObject(o1.getKey(), this.user);
String o2Name = DetailsPanel.prettifyObject(o2.getKey(), this.user);
String o1Name = Utils.prettifyObject(o1.getKey(), this.user);
String o2Name = Utils.prettifyObject(o2.getKey(), this.user);

return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
};
Expand DownExpand Up@@ -647,10 +647,10 @@ private PanelItem createMaterialButton(ItemTemplateRecord template,
{
builder.name(this.user.getTranslation(this.world, template.title(),
"[number]", String.valueOf(materialCount.getValue()),
"[material]", DetailsPanel.prettifyObject(materialCount.getKey(), this.user)));
"[material]", Utils.prettifyObject(materialCount.getKey(), this.user)));
}

String description = DetailsPanel.prettifyDescription(materialCount.getKey(), this.user);
String description = Utils.prettifyDescription(materialCount.getKey(), this.user);

final String reference = "level.gui.buttons.material.";
String blockId = this.user.getTranslationOrNothing(reference + "id",
Expand DownExpand Up@@ -710,95 +710,6 @@ public static void openPanel(Level addon,
}


/**
* Prettify Material object for user.
* @param object Object that must be pretty.
* @param user User who will see the object.
* @return Prettified string for Material.
*/
private static String prettifyObject(Material object, User user)
{
// Nothing to translate
if (object == null)
{
return "";
}

// Find addon structure with:
// [addon]:
// materials:
// [material]:
// name: [name]
String translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase() + ".name");

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// Find addon structure with:
// [addon]:
// materials:
// [material]: [name]

translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase());

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// Find general structure with:
// materials:
// [material]: [name]

translation = user.getTranslationOrNothing("materials." + object.name().toLowerCase());

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// Use Lang Utils Hook to translate material
return LangUtilsHook.getMaterialName(object, user);
}


/**
* Prettify Material object description for user.
* @param object Object that must be pretty.
* @param user User who will see the object.
* @return Prettified description string for Material.
*/
public static String prettifyDescription(Material object, User user)
{
// Nothing to translate
if (object == null)
{
return "";
}

// Find addon structure with:
// [addon]:
// materials:
// [material]:
// description: [text]
String translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase() + ".description");

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// No text to return.
return "";
}


// ---------------------------------------------------------------------
// Section: Enums
// ---------------------------------------------------------------------
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Implement customizable Values GUI.#262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BONNe merged 1 commit into from
Jun 17, 2022
Merged

Implement customizable Values GUI. #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@
<spigot.version>1.16.5-R0.1-SNAPSHOT</spigot.version>
<bentobox.version>1.20.0</bentobox.version>
<!-- Panel Utils version -->
<panelutils.version>1.0.0</panelutils.version>
<panelutils.version>1.1.0</panelutils.version>
<!-- Revision variable removes warning about dynamic version -->
<revision>${build.version}-SNAPSHOT</revision>
<!-- Do not change unless you want different name for local builds. -->
Expand Down
1 change: 1 addition & 0 deletions src/main/java/world/bentobox/level/Level.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,7 @@ public void onLoad() {
// Save existing panels.
this.saveResource("panels/top_panel.yml", false);
this.saveResource("panels/detail_panel.yml", false);
this.saveResource("panels/value_panel.yml", false);
}

private boolean loadSettings() {
Expand Down
134 changes: 113 additions & 21 deletions src/main/java/world/bentobox/level/commands/IslandValueCommand.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,142 @@
package world.bentobox.level.commands;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;

import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.PlayerInventory;

import world.bentobox.bentobox.api.commands.CompositeCommand;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.util.Util;
import world.bentobox.level.Level;
import world.bentobox.level.panels.ValuePanel;
import world.bentobox.level.util.Utils;

public class IslandValueCommand extends CompositeCommand {

public class IslandValueCommand extends CompositeCommand
{
private final Level addon;

public IslandValueCommand(Level addon, CompositeCommand parent) {

public IslandValueCommand(Level addon, CompositeCommand parent)
{
super(parent, "value");
this.addon = addon;
}


@Override
public void setup() {
public void setup()
{
this.setPermission("island.value");
this.setDescription("island.value.description");
this.setParametersHelp("level.commands.value.parameters");
this.setDescription("level.commands.value.description");
this.setOnlyPlayer(true);
}


@Override
public boolean execute(User user, String label, List<String> args) {
Player player = user.getPlayer();
PlayerInventory inventory = player.getInventory();
if (!inventory.getItemInMainHand().getType().equals(Material.AIR)) {
Material material = inventory.getItemInMainHand().getType();
Integer value = addon.getBlockConfig().getValue(getWorld(), material);
if (value != null) {
user.sendMessage("island.value.success", "[value]", String.valueOf(value));
double underWater = addon.getSettings().getUnderWaterMultiplier();
if (underWater > 1.0) {
user.sendMessage("island.value.success-underwater", "[value]", (underWater * value) + "");
}
} else {
user.sendMessage("island.value.no-value");
public boolean execute(User user, String label, List<String> args)
{
if (args.size() > 1)
{
this.showHelp(this, user);
return true;
}

if (args.isEmpty())
{
ValuePanel.openPanel(this.addon, this.getWorld(), user);
}
else if (args.get(0).equalsIgnoreCase("HAND"))
{
Player player = user.getPlayer();
PlayerInventory inventory = player.getInventory();

if (!inventory.getItemInMainHand().getType().equals(Material.AIR))
{
this.printValue(user, inventory.getItemInMainHand().getType());
}
else
{
Utils.sendMessage(user, user.getTranslation("level.conversations.empty-hand"));
}
}
else
{
Material material = Material.matchMaterial(args.get(0));

if (material == null)
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(), "level.conversations.unknown-item",
"[material]", args.get(0)));
}
else
{
this.printValue(user, material);
}
} else {
user.sendMessage("island.value.empty-hand");
}

return true;
}

}

/**
* This method prints value of the given material in chat.
* @param user User who receives the message.
* @param material Material value.
*/
private void printValue(User user, Material material)
{
Integer value = this.addon.getBlockConfig().getValue(getWorld(), material);

if (value != null)
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(), "level.conversations.value",
"[value]", String.valueOf(value),
"[material]", Utils.prettifyObject(material, user)));

double underWater = this.addon.getSettings().getUnderWaterMultiplier();

if (underWater > 1.0)
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(),"level.conversations.success-underwater",
"[value]", (underWater * value) + ""),
"[material]", Utils.prettifyObject(material, user));
}
}
else
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(),"level.conversations.no-value"));
}
}


@Override
public Optional<List<String>> tabComplete(User user, String alias, List<String> args)
{
String lastArg = !args.isEmpty() ? args.get(args.size() - 1) : "";

if (args.isEmpty())
{
// Don't show every player on the server. Require at least the first letter
return Optional.empty();
}

List<String> options = new ArrayList<>(Arrays.stream(Material.values()).
filter(Material::isBlock).
map(Material::name).toList());

options.add("HAND");

return Optional.of(Util.tabLimit(options, lastArg));
}
}
105 changes: 8 additions & 97 deletions src/main/java/world/bentobox/level/panels/DetailsPanel.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,8 +165,8 @@ private void updateFilters()
{
if (o1.getValue().equals(o2.getValue()))
{
String o1Name = DetailsPanel.prettifyObject(o1.getKey(), this.user);
String o2Name = DetailsPanel.prettifyObject(o2.getKey(), this.user);
String o1Name = Utils.prettifyObject(o1.getKey(), this.user);
String o2Name = Utils.prettifyObject(o2.getKey(), this.user);

return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
}
Expand All@@ -193,8 +193,8 @@ private void updateFilters()

if (o1Value == o2Value)
{
String o1Name = DetailsPanel.prettifyObject(o1.getKey(), this.user);
String o2Name = DetailsPanel.prettifyObject(o2.getKey(), this.user);
String o1Name = Utils.prettifyObject(o1.getKey(), this.user);
String o2Name = Utils.prettifyObject(o2.getKey(), this.user);

return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
}
Expand All@@ -208,8 +208,8 @@ private void updateFilters()
{
sorter = (o1, o2) ->
{
String o1Name = DetailsPanel.prettifyObject(o1.getKey(), this.user);
String o2Name = DetailsPanel.prettifyObject(o2.getKey(), this.user);
String o1Name = Utils.prettifyObject(o1.getKey(), this.user);
String o2Name = Utils.prettifyObject(o2.getKey(), this.user);

return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
};
Expand DownExpand Up@@ -647,10 +647,10 @@ private PanelItem createMaterialButton(ItemTemplateRecord template,
{
builder.name(this.user.getTranslation(this.world, template.title(),
"[number]", String.valueOf(materialCount.getValue()),
"[material]", DetailsPanel.prettifyObject(materialCount.getKey(), this.user)));
"[material]", Utils.prettifyObject(materialCount.getKey(), this.user)));
}

String description = DetailsPanel.prettifyDescription(materialCount.getKey(), this.user);
String description = Utils.prettifyDescription(materialCount.getKey(), this.user);

final String reference = "level.gui.buttons.material.";
String blockId = this.user.getTranslationOrNothing(reference + "id",
Expand DownExpand Up@@ -710,95 +710,6 @@ public static void openPanel(Level addon,
}


/**
* Prettify Material object for user.
* @param object Object that must be pretty.
* @param user User who will see the object.
* @return Prettified string for Material.
*/
private static String prettifyObject(Material object, User user)
{
// Nothing to translate
if (object == null)
{
return "";
}

// Find addon structure with:
// [addon]:
// materials:
// [material]:
// name: [name]
String translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase() + ".name");

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// Find addon structure with:
// [addon]:
// materials:
// [material]: [name]

translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase());

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// Find general structure with:
// materials:
// [material]: [name]

translation = user.getTranslationOrNothing("materials." + object.name().toLowerCase());

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// Use Lang Utils Hook to translate material
return LangUtilsHook.getMaterialName(object, user);
}


/**
* Prettify Material object description for user.
* @param object Object that must be pretty.
* @param user User who will see the object.
* @return Prettified description string for Material.
*/
public static String prettifyDescription(Material object, User user)
{
// Nothing to translate
if (object == null)
{
return "";
}

// Find addon structure with:
// [addon]:
// materials:
// [material]:
// description: [text]
String translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase() + ".description");

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// No text to return.
return "";
}


// ---------------------------------------------------------------------
// Section: Enums
// ---------------------------------------------------------------------
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Implement customizable Values GUI.#262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BONNe merged 1 commit into from
Jun 17, 2022
Merged

Implement customizable Values GUI. #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@
<spigot.version>1.16.5-R0.1-SNAPSHOT</spigot.version>
<bentobox.version>1.20.0</bentobox.version>
<!-- Panel Utils version -->
<panelutils.version>1.0.0</panelutils.version>
<panelutils.version>1.1.0</panelutils.version>
<!-- Revision variable removes warning about dynamic version -->
<revision>${build.version}-SNAPSHOT</revision>
<!-- Do not change unless you want different name for local builds. -->
Expand Down
1 change: 1 addition & 0 deletions src/main/java/world/bentobox/level/Level.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,7 @@ public void onLoad() {
// Save existing panels.
this.saveResource("panels/top_panel.yml", false);
this.saveResource("panels/detail_panel.yml", false);
this.saveResource("panels/value_panel.yml", false);
}

private boolean loadSettings() {
Expand Down
134 changes: 113 additions & 21 deletions src/main/java/world/bentobox/level/commands/IslandValueCommand.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,142 @@
package world.bentobox.level.commands;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;

import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.PlayerInventory;

import world.bentobox.bentobox.api.commands.CompositeCommand;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.util.Util;
import world.bentobox.level.Level;
import world.bentobox.level.panels.ValuePanel;
import world.bentobox.level.util.Utils;

public class IslandValueCommand extends CompositeCommand {

public class IslandValueCommand extends CompositeCommand
{
private final Level addon;

public IslandValueCommand(Level addon, CompositeCommand parent) {

public IslandValueCommand(Level addon, CompositeCommand parent)
{
super(parent, "value");
this.addon = addon;
}


@Override
public void setup() {
public void setup()
{
this.setPermission("island.value");
this.setDescription("island.value.description");
this.setParametersHelp("level.commands.value.parameters");
this.setDescription("level.commands.value.description");
this.setOnlyPlayer(true);
}


@Override
public boolean execute(User user, String label, List<String> args) {
Player player = user.getPlayer();
PlayerInventory inventory = player.getInventory();
if (!inventory.getItemInMainHand().getType().equals(Material.AIR)) {
Material material = inventory.getItemInMainHand().getType();
Integer value = addon.getBlockConfig().getValue(getWorld(), material);
if (value != null) {
user.sendMessage("island.value.success", "[value]", String.valueOf(value));
double underWater = addon.getSettings().getUnderWaterMultiplier();
if (underWater > 1.0) {
user.sendMessage("island.value.success-underwater", "[value]", (underWater * value) + "");
}
} else {
user.sendMessage("island.value.no-value");
public boolean execute(User user, String label, List<String> args)
{
if (args.size() > 1)
{
this.showHelp(this, user);
return true;
}

if (args.isEmpty())
{
ValuePanel.openPanel(this.addon, this.getWorld(), user);
}
else if (args.get(0).equalsIgnoreCase("HAND"))
{
Player player = user.getPlayer();
PlayerInventory inventory = player.getInventory();

if (!inventory.getItemInMainHand().getType().equals(Material.AIR))
{
this.printValue(user, inventory.getItemInMainHand().getType());
}
else
{
Utils.sendMessage(user, user.getTranslation("level.conversations.empty-hand"));
}
}
else
{
Material material = Material.matchMaterial(args.get(0));

if (material == null)
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(), "level.conversations.unknown-item",
"[material]", args.get(0)));
}
else
{
this.printValue(user, material);
}
} else {
user.sendMessage("island.value.empty-hand");
}

return true;
}

}

/**
* This method prints value of the given material in chat.
* @param user User who receives the message.
* @param material Material value.
*/
private void printValue(User user, Material material)
{
Integer value = this.addon.getBlockConfig().getValue(getWorld(), material);

if (value != null)
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(), "level.conversations.value",
"[value]", String.valueOf(value),
"[material]", Utils.prettifyObject(material, user)));

double underWater = this.addon.getSettings().getUnderWaterMultiplier();

if (underWater > 1.0)
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(),"level.conversations.success-underwater",
"[value]", (underWater * value) + ""),
"[material]", Utils.prettifyObject(material, user));
}
}
else
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(),"level.conversations.no-value"));
}
}


@Override
public Optional<List<String>> tabComplete(User user, String alias, List<String> args)
{
String lastArg = !args.isEmpty() ? args.get(args.size() - 1) : "";

if (args.isEmpty())
{
// Don't show every player on the server. Require at least the first letter
return Optional.empty();
}

List<String> options = new ArrayList<>(Arrays.stream(Material.values()).
filter(Material::isBlock).
map(Material::name).toList());

options.add("HAND");

return Optional.of(Util.tabLimit(options, lastArg));
}
}
105 changes: 8 additions & 97 deletions src/main/java/world/bentobox/level/panels/DetailsPanel.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,8 +165,8 @@ private void updateFilters()
{
if (o1.getValue().equals(o2.getValue()))
{
String o1Name = DetailsPanel.prettifyObject(o1.getKey(), this.user);
String o2Name = DetailsPanel.prettifyObject(o2.getKey(), this.user);
String o1Name = Utils.prettifyObject(o1.getKey(), this.user);
String o2Name = Utils.prettifyObject(o2.getKey(), this.user);

return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
}
Expand All@@ -193,8 +193,8 @@ private void updateFilters()

if (o1Value == o2Value)
{
String o1Name = DetailsPanel.prettifyObject(o1.getKey(), this.user);
String o2Name = DetailsPanel.prettifyObject(o2.getKey(), this.user);
String o1Name = Utils.prettifyObject(o1.getKey(), this.user);
String o2Name = Utils.prettifyObject(o2.getKey(), this.user);

return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
}
Expand All@@ -208,8 +208,8 @@ private void updateFilters()
{
sorter = (o1, o2) ->
{
String o1Name = DetailsPanel.prettifyObject(o1.getKey(), this.user);
String o2Name = DetailsPanel.prettifyObject(o2.getKey(), this.user);
String o1Name = Utils.prettifyObject(o1.getKey(), this.user);
String o2Name = Utils.prettifyObject(o2.getKey(), this.user);

return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
};
Expand DownExpand Up@@ -647,10 +647,10 @@ private PanelItem createMaterialButton(ItemTemplateRecord template,
{
builder.name(this.user.getTranslation(this.world, template.title(),
"[number]", String.valueOf(materialCount.getValue()),
"[material]", DetailsPanel.prettifyObject(materialCount.getKey(), this.user)));
"[material]", Utils.prettifyObject(materialCount.getKey(), this.user)));
}

String description = DetailsPanel.prettifyDescription(materialCount.getKey(), this.user);
String description = Utils.prettifyDescription(materialCount.getKey(), this.user);

final String reference = "level.gui.buttons.material.";
String blockId = this.user.getTranslationOrNothing(reference + "id",
Expand DownExpand Up@@ -710,95 +710,6 @@ public static void openPanel(Level addon,
}


/**
* Prettify Material object for user.
* @param object Object that must be pretty.
* @param user User who will see the object.
* @return Prettified string for Material.
*/
private static String prettifyObject(Material object, User user)
{
// Nothing to translate
if (object == null)
{
return "";
}

// Find addon structure with:
// [addon]:
// materials:
// [material]:
// name: [name]
String translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase() + ".name");

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// Find addon structure with:
// [addon]:
// materials:
// [material]: [name]

translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase());

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// Find general structure with:
// materials:
// [material]: [name]

translation = user.getTranslationOrNothing("materials." + object.name().toLowerCase());

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// Use Lang Utils Hook to translate material
return LangUtilsHook.getMaterialName(object, user);
}


/**
* Prettify Material object description for user.
* @param object Object that must be pretty.
* @param user User who will see the object.
* @return Prettified description string for Material.
*/
public static String prettifyDescription(Material object, User user)
{
// Nothing to translate
if (object == null)
{
return "";
}

// Find addon structure with:
// [addon]:
// materials:
// [material]:
// description: [text]
String translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase() + ".description");

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// No text to return.
return "";
}


// ---------------------------------------------------------------------
// Section: Enums
// ---------------------------------------------------------------------
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Implement customizable Values GUI.#262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BONNe merged 1 commit into from
Jun 17, 2022
Merged

Implement customizable Values GUI. #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@
<spigot.version>1.16.5-R0.1-SNAPSHOT</spigot.version>
<bentobox.version>1.20.0</bentobox.version>
<!-- Panel Utils version -->
<panelutils.version>1.0.0</panelutils.version>
<panelutils.version>1.1.0</panelutils.version>
<!-- Revision variable removes warning about dynamic version -->
<revision>${build.version}-SNAPSHOT</revision>
<!-- Do not change unless you want different name for local builds. -->
Expand Down
1 change: 1 addition & 0 deletions src/main/java/world/bentobox/level/Level.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,7 @@ public void onLoad() {
// Save existing panels.
this.saveResource("panels/top_panel.yml", false);
this.saveResource("panels/detail_panel.yml", false);
this.saveResource("panels/value_panel.yml", false);
}

private boolean loadSettings() {
Expand Down
134 changes: 113 additions & 21 deletions src/main/java/world/bentobox/level/commands/IslandValueCommand.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,142 @@
package world.bentobox.level.commands;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;

import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.PlayerInventory;

import world.bentobox.bentobox.api.commands.CompositeCommand;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.util.Util;
import world.bentobox.level.Level;
import world.bentobox.level.panels.ValuePanel;
import world.bentobox.level.util.Utils;

public class IslandValueCommand extends CompositeCommand {

public class IslandValueCommand extends CompositeCommand
{
private final Level addon;

public IslandValueCommand(Level addon, CompositeCommand parent) {

public IslandValueCommand(Level addon, CompositeCommand parent)
{
super(parent, "value");
this.addon = addon;
}


@Override
public void setup() {
public void setup()
{
this.setPermission("island.value");
this.setDescription("island.value.description");
this.setParametersHelp("level.commands.value.parameters");
this.setDescription("level.commands.value.description");
this.setOnlyPlayer(true);
}


@Override
public boolean execute(User user, String label, List<String> args) {
Player player = user.getPlayer();
PlayerInventory inventory = player.getInventory();
if (!inventory.getItemInMainHand().getType().equals(Material.AIR)) {
Material material = inventory.getItemInMainHand().getType();
Integer value = addon.getBlockConfig().getValue(getWorld(), material);
if (value != null) {
user.sendMessage("island.value.success", "[value]", String.valueOf(value));
double underWater = addon.getSettings().getUnderWaterMultiplier();
if (underWater > 1.0) {
user.sendMessage("island.value.success-underwater", "[value]", (underWater * value) + "");
}
} else {
user.sendMessage("island.value.no-value");
public boolean execute(User user, String label, List<String> args)
{
if (args.size() > 1)
{
this.showHelp(this, user);
return true;
}

if (args.isEmpty())
{
ValuePanel.openPanel(this.addon, this.getWorld(), user);
}
else if (args.get(0).equalsIgnoreCase("HAND"))
{
Player player = user.getPlayer();
PlayerInventory inventory = player.getInventory();

if (!inventory.getItemInMainHand().getType().equals(Material.AIR))
{
this.printValue(user, inventory.getItemInMainHand().getType());
}
else
{
Utils.sendMessage(user, user.getTranslation("level.conversations.empty-hand"));
}
}
else
{
Material material = Material.matchMaterial(args.get(0));

if (material == null)
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(), "level.conversations.unknown-item",
"[material]", args.get(0)));
}
else
{
this.printValue(user, material);
}
} else {
user.sendMessage("island.value.empty-hand");
}

return true;
}

}

/**
* This method prints value of the given material in chat.
* @param user User who receives the message.
* @param material Material value.
*/
private void printValue(User user, Material material)
{
Integer value = this.addon.getBlockConfig().getValue(getWorld(), material);

if (value != null)
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(), "level.conversations.value",
"[value]", String.valueOf(value),
"[material]", Utils.prettifyObject(material, user)));

double underWater = this.addon.getSettings().getUnderWaterMultiplier();

if (underWater > 1.0)
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(),"level.conversations.success-underwater",
"[value]", (underWater * value) + ""),
"[material]", Utils.prettifyObject(material, user));
}
}
else
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(),"level.conversations.no-value"));
}
}


@Override
public Optional<List<String>> tabComplete(User user, String alias, List<String> args)
{
String lastArg = !args.isEmpty() ? args.get(args.size() - 1) : "";

if (args.isEmpty())
{
// Don't show every player on the server. Require at least the first letter
return Optional.empty();
}

List<String> options = new ArrayList<>(Arrays.stream(Material.values()).
filter(Material::isBlock).
map(Material::name).toList());

options.add("HAND");

return Optional.of(Util.tabLimit(options, lastArg));
}
}
105 changes: 8 additions & 97 deletions src/main/java/world/bentobox/level/panels/DetailsPanel.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,8 +165,8 @@ private void updateFilters()
{
if (o1.getValue().equals(o2.getValue()))
{
String o1Name = DetailsPanel.prettifyObject(o1.getKey(), this.user);
String o2Name = DetailsPanel.prettifyObject(o2.getKey(), this.user);
String o1Name = Utils.prettifyObject(o1.getKey(), this.user);
String o2Name = Utils.prettifyObject(o2.getKey(), this.user);

return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
}
Expand All@@ -193,8 +193,8 @@ private void updateFilters()

if (o1Value == o2Value)
{
String o1Name = DetailsPanel.prettifyObject(o1.getKey(), this.user);
String o2Name = DetailsPanel.prettifyObject(o2.getKey(), this.user);
String o1Name = Utils.prettifyObject(o1.getKey(), this.user);
String o2Name = Utils.prettifyObject(o2.getKey(), this.user);

return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
}
Expand All@@ -208,8 +208,8 @@ private void updateFilters()
{
sorter = (o1, o2) ->
{
String o1Name = DetailsPanel.prettifyObject(o1.getKey(), this.user);
String o2Name = DetailsPanel.prettifyObject(o2.getKey(), this.user);
String o1Name = Utils.prettifyObject(o1.getKey(), this.user);
String o2Name = Utils.prettifyObject(o2.getKey(), this.user);

return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
};
Expand DownExpand Up@@ -647,10 +647,10 @@ private PanelItem createMaterialButton(ItemTemplateRecord template,
{
builder.name(this.user.getTranslation(this.world, template.title(),
"[number]", String.valueOf(materialCount.getValue()),
"[material]", DetailsPanel.prettifyObject(materialCount.getKey(), this.user)));
"[material]", Utils.prettifyObject(materialCount.getKey(), this.user)));
}

String description = DetailsPanel.prettifyDescription(materialCount.getKey(), this.user);
String description = Utils.prettifyDescription(materialCount.getKey(), this.user);

final String reference = "level.gui.buttons.material.";
String blockId = this.user.getTranslationOrNothing(reference + "id",
Expand DownExpand Up@@ -710,95 +710,6 @@ public static void openPanel(Level addon,
}


/**
* Prettify Material object for user.
* @param object Object that must be pretty.
* @param user User who will see the object.
* @return Prettified string for Material.
*/
private static String prettifyObject(Material object, User user)
{
// Nothing to translate
if (object == null)
{
return "";
}

// Find addon structure with:
// [addon]:
// materials:
// [material]:
// name: [name]
String translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase() + ".name");

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// Find addon structure with:
// [addon]:
// materials:
// [material]: [name]

translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase());

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// Find general structure with:
// materials:
// [material]: [name]

translation = user.getTranslationOrNothing("materials." + object.name().toLowerCase());

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// Use Lang Utils Hook to translate material
return LangUtilsHook.getMaterialName(object, user);
}


/**
* Prettify Material object description for user.
* @param object Object that must be pretty.
* @param user User who will see the object.
* @return Prettified description string for Material.
*/
public static String prettifyDescription(Material object, User user)
{
// Nothing to translate
if (object == null)
{
return "";
}

// Find addon structure with:
// [addon]:
// materials:
// [material]:
// description: [text]
String translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase() + ".description");

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// No text to return.
return "";
}


// ---------------------------------------------------------------------
// Section: Enums
// ---------------------------------------------------------------------
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Implement customizable Values GUI.#262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BONNe merged 1 commit into from
Jun 17, 2022
Merged

Implement customizable Values GUI. #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@
<spigot.version>1.16.5-R0.1-SNAPSHOT</spigot.version>
<bentobox.version>1.20.0</bentobox.version>
<!-- Panel Utils version -->
<panelutils.version>1.0.0</panelutils.version>
<panelutils.version>1.1.0</panelutils.version>
<!-- Revision variable removes warning about dynamic version -->
<revision>${build.version}-SNAPSHOT</revision>
<!-- Do not change unless you want different name for local builds. -->
Expand Down
1 change: 1 addition & 0 deletions src/main/java/world/bentobox/level/Level.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,7 @@ public void onLoad() {
// Save existing panels.
this.saveResource("panels/top_panel.yml", false);
this.saveResource("panels/detail_panel.yml", false);
this.saveResource("panels/value_panel.yml", false);
}

private boolean loadSettings() {
Expand Down
134 changes: 113 additions & 21 deletions src/main/java/world/bentobox/level/commands/IslandValueCommand.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,142 @@
package world.bentobox.level.commands;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;

import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.PlayerInventory;

import world.bentobox.bentobox.api.commands.CompositeCommand;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.util.Util;
import world.bentobox.level.Level;
import world.bentobox.level.panels.ValuePanel;
import world.bentobox.level.util.Utils;

public class IslandValueCommand extends CompositeCommand {

public class IslandValueCommand extends CompositeCommand
{
private final Level addon;

public IslandValueCommand(Level addon, CompositeCommand parent) {

public IslandValueCommand(Level addon, CompositeCommand parent)
{
super(parent, "value");
this.addon = addon;
}


@Override
public void setup() {
public void setup()
{
this.setPermission("island.value");
this.setDescription("island.value.description");
this.setParametersHelp("level.commands.value.parameters");
this.setDescription("level.commands.value.description");
this.setOnlyPlayer(true);
}


@Override
public boolean execute(User user, String label, List<String> args) {
Player player = user.getPlayer();
PlayerInventory inventory = player.getInventory();
if (!inventory.getItemInMainHand().getType().equals(Material.AIR)) {
Material material = inventory.getItemInMainHand().getType();
Integer value = addon.getBlockConfig().getValue(getWorld(), material);
if (value != null) {
user.sendMessage("island.value.success", "[value]", String.valueOf(value));
double underWater = addon.getSettings().getUnderWaterMultiplier();
if (underWater > 1.0) {
user.sendMessage("island.value.success-underwater", "[value]", (underWater * value) + "");
}
} else {
user.sendMessage("island.value.no-value");
public boolean execute(User user, String label, List<String> args)
{
if (args.size() > 1)
{
this.showHelp(this, user);
return true;
}

if (args.isEmpty())
{
ValuePanel.openPanel(this.addon, this.getWorld(), user);
}
else if (args.get(0).equalsIgnoreCase("HAND"))
{
Player player = user.getPlayer();
PlayerInventory inventory = player.getInventory();

if (!inventory.getItemInMainHand().getType().equals(Material.AIR))
{
this.printValue(user, inventory.getItemInMainHand().getType());
}
else
{
Utils.sendMessage(user, user.getTranslation("level.conversations.empty-hand"));
}
}
else
{
Material material = Material.matchMaterial(args.get(0));

if (material == null)
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(), "level.conversations.unknown-item",
"[material]", args.get(0)));
}
else
{
this.printValue(user, material);
}
} else {
user.sendMessage("island.value.empty-hand");
}

return true;
}

}

/**
* This method prints value of the given material in chat.
* @param user User who receives the message.
* @param material Material value.
*/
private void printValue(User user, Material material)
{
Integer value = this.addon.getBlockConfig().getValue(getWorld(), material);

if (value != null)
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(), "level.conversations.value",
"[value]", String.valueOf(value),
"[material]", Utils.prettifyObject(material, user)));

double underWater = this.addon.getSettings().getUnderWaterMultiplier();

if (underWater > 1.0)
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(),"level.conversations.success-underwater",
"[value]", (underWater * value) + ""),
"[material]", Utils.prettifyObject(material, user));
}
}
else
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(),"level.conversations.no-value"));
}
}


@Override
public Optional<List<String>> tabComplete(User user, String alias, List<String> args)
{
String lastArg = !args.isEmpty() ? args.get(args.size() - 1) : "";

if (args.isEmpty())
{
// Don't show every player on the server. Require at least the first letter
return Optional.empty();
}

List<String> options = new ArrayList<>(Arrays.stream(Material.values()).
filter(Material::isBlock).
map(Material::name).toList());

options.add("HAND");

return Optional.of(Util.tabLimit(options, lastArg));
}
}
105 changes: 8 additions & 97 deletions src/main/java/world/bentobox/level/panels/DetailsPanel.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,8 +165,8 @@ private void updateFilters()
{
if (o1.getValue().equals(o2.getValue()))
{
String o1Name = DetailsPanel.prettifyObject(o1.getKey(), this.user);
String o2Name = DetailsPanel.prettifyObject(o2.getKey(), this.user);
String o1Name = Utils.prettifyObject(o1.getKey(), this.user);
String o2Name = Utils.prettifyObject(o2.getKey(), this.user);

return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
}
Expand All@@ -193,8 +193,8 @@ private void updateFilters()

if (o1Value == o2Value)
{
String o1Name = DetailsPanel.prettifyObject(o1.getKey(), this.user);
String o2Name = DetailsPanel.prettifyObject(o2.getKey(), this.user);
String o1Name = Utils.prettifyObject(o1.getKey(), this.user);
String o2Name = Utils.prettifyObject(o2.getKey(), this.user);

return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
}
Expand All@@ -208,8 +208,8 @@ private void updateFilters()
{
sorter = (o1, o2) ->
{
String o1Name = DetailsPanel.prettifyObject(o1.getKey(), this.user);
String o2Name = DetailsPanel.prettifyObject(o2.getKey(), this.user);
String o1Name = Utils.prettifyObject(o1.getKey(), this.user);
String o2Name = Utils.prettifyObject(o2.getKey(), this.user);

return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
};
Expand DownExpand Up@@ -647,10 +647,10 @@ private PanelItem createMaterialButton(ItemTemplateRecord template,
{
builder.name(this.user.getTranslation(this.world, template.title(),
"[number]", String.valueOf(materialCount.getValue()),
"[material]", DetailsPanel.prettifyObject(materialCount.getKey(), this.user)));
"[material]", Utils.prettifyObject(materialCount.getKey(), this.user)));
}

String description = DetailsPanel.prettifyDescription(materialCount.getKey(), this.user);
String description = Utils.prettifyDescription(materialCount.getKey(), this.user);

final String reference = "level.gui.buttons.material.";
String blockId = this.user.getTranslationOrNothing(reference + "id",
Expand DownExpand Up@@ -710,95 +710,6 @@ public static void openPanel(Level addon,
}


/**
* Prettify Material object for user.
* @param object Object that must be pretty.
* @param user User who will see the object.
* @return Prettified string for Material.
*/
private static String prettifyObject(Material object, User user)
{
// Nothing to translate
if (object == null)
{
return "";
}

// Find addon structure with:
// [addon]:
// materials:
// [material]:
// name: [name]
String translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase() + ".name");

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// Find addon structure with:
// [addon]:
// materials:
// [material]: [name]

translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase());

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// Find general structure with:
// materials:
// [material]: [name]

translation = user.getTranslationOrNothing("materials." + object.name().toLowerCase());

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// Use Lang Utils Hook to translate material
return LangUtilsHook.getMaterialName(object, user);
}


/**
* Prettify Material object description for user.
* @param object Object that must be pretty.
* @param user User who will see the object.
* @return Prettified description string for Material.
*/
public static String prettifyDescription(Material object, User user)
{
// Nothing to translate
if (object == null)
{
return "";
}

// Find addon structure with:
// [addon]:
// materials:
// [material]:
// description: [text]
String translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase() + ".description");

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// No text to return.
return "";
}


// ---------------------------------------------------------------------
// Section: Enums
// ---------------------------------------------------------------------
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Implement customizable Values GUI.#262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BONNe merged 1 commit into from
Jun 17, 2022
Merged

Implement customizable Values GUI. #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@
<spigot.version>1.16.5-R0.1-SNAPSHOT</spigot.version>
<bentobox.version>1.20.0</bentobox.version>
<!-- Panel Utils version -->
<panelutils.version>1.0.0</panelutils.version>
<panelutils.version>1.1.0</panelutils.version>
<!-- Revision variable removes warning about dynamic version -->
<revision>${build.version}-SNAPSHOT</revision>
<!-- Do not change unless you want different name for local builds. -->
Expand Down
1 change: 1 addition & 0 deletions src/main/java/world/bentobox/level/Level.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,7 @@ public void onLoad() {
// Save existing panels.
this.saveResource("panels/top_panel.yml", false);
this.saveResource("panels/detail_panel.yml", false);
this.saveResource("panels/value_panel.yml", false);
}

private boolean loadSettings() {
Expand Down
134 changes: 113 additions & 21 deletions src/main/java/world/bentobox/level/commands/IslandValueCommand.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,142 @@
package world.bentobox.level.commands;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;

import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.PlayerInventory;

import world.bentobox.bentobox.api.commands.CompositeCommand;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.util.Util;
import world.bentobox.level.Level;
import world.bentobox.level.panels.ValuePanel;
import world.bentobox.level.util.Utils;

public class IslandValueCommand extends CompositeCommand {

public class IslandValueCommand extends CompositeCommand
{
private final Level addon;

public IslandValueCommand(Level addon, CompositeCommand parent) {

public IslandValueCommand(Level addon, CompositeCommand parent)
{
super(parent, "value");
this.addon = addon;
}


@Override
public void setup() {
public void setup()
{
this.setPermission("island.value");
this.setDescription("island.value.description");
this.setParametersHelp("level.commands.value.parameters");
this.setDescription("level.commands.value.description");
this.setOnlyPlayer(true);
}


@Override
public boolean execute(User user, String label, List<String> args) {
Player player = user.getPlayer();
PlayerInventory inventory = player.getInventory();
if (!inventory.getItemInMainHand().getType().equals(Material.AIR)) {
Material material = inventory.getItemInMainHand().getType();
Integer value = addon.getBlockConfig().getValue(getWorld(), material);
if (value != null) {
user.sendMessage("island.value.success", "[value]", String.valueOf(value));
double underWater = addon.getSettings().getUnderWaterMultiplier();
if (underWater > 1.0) {
user.sendMessage("island.value.success-underwater", "[value]", (underWater * value) + "");
}
} else {
user.sendMessage("island.value.no-value");
public boolean execute(User user, String label, List<String> args)
{
if (args.size() > 1)
{
this.showHelp(this, user);
return true;
}

if (args.isEmpty())
{
ValuePanel.openPanel(this.addon, this.getWorld(), user);
}
else if (args.get(0).equalsIgnoreCase("HAND"))
{
Player player = user.getPlayer();
PlayerInventory inventory = player.getInventory();

if (!inventory.getItemInMainHand().getType().equals(Material.AIR))
{
this.printValue(user, inventory.getItemInMainHand().getType());
}
else
{
Utils.sendMessage(user, user.getTranslation("level.conversations.empty-hand"));
}
}
else
{
Material material = Material.matchMaterial(args.get(0));

if (material == null)
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(), "level.conversations.unknown-item",
"[material]", args.get(0)));
}
else
{
this.printValue(user, material);
}
} else {
user.sendMessage("island.value.empty-hand");
}

return true;
}

}

/**
* This method prints value of the given material in chat.
* @param user User who receives the message.
* @param material Material value.
*/
private void printValue(User user, Material material)
{
Integer value = this.addon.getBlockConfig().getValue(getWorld(), material);

if (value != null)
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(), "level.conversations.value",
"[value]", String.valueOf(value),
"[material]", Utils.prettifyObject(material, user)));

double underWater = this.addon.getSettings().getUnderWaterMultiplier();

if (underWater > 1.0)
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(),"level.conversations.success-underwater",
"[value]", (underWater * value) + ""),
"[material]", Utils.prettifyObject(material, user));
}
}
else
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(),"level.conversations.no-value"));
}
}


@Override
public Optional<List<String>> tabComplete(User user, String alias, List<String> args)
{
String lastArg = !args.isEmpty() ? args.get(args.size() - 1) : "";

if (args.isEmpty())
{
// Don't show every player on the server. Require at least the first letter
return Optional.empty();
}

List<String> options = new ArrayList<>(Arrays.stream(Material.values()).
filter(Material::isBlock).
map(Material::name).toList());

options.add("HAND");

return Optional.of(Util.tabLimit(options, lastArg));
}
}
105 changes: 8 additions & 97 deletions src/main/java/world/bentobox/level/panels/DetailsPanel.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,8 +165,8 @@ private void updateFilters()
{
if (o1.getValue().equals(o2.getValue()))
{
String o1Name = DetailsPanel.prettifyObject(o1.getKey(), this.user);
String o2Name = DetailsPanel.prettifyObject(o2.getKey(), this.user);
String o1Name = Utils.prettifyObject(o1.getKey(), this.user);
String o2Name = Utils.prettifyObject(o2.getKey(), this.user);

return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
}
Expand All@@ -193,8 +193,8 @@ private void updateFilters()

if (o1Value == o2Value)
{
String o1Name = DetailsPanel.prettifyObject(o1.getKey(), this.user);
String o2Name = DetailsPanel.prettifyObject(o2.getKey(), this.user);
String o1Name = Utils.prettifyObject(o1.getKey(), this.user);
String o2Name = Utils.prettifyObject(o2.getKey(), this.user);

return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
}
Expand All@@ -208,8 +208,8 @@ private void updateFilters()
{
sorter = (o1, o2) ->
{
String o1Name = DetailsPanel.prettifyObject(o1.getKey(), this.user);
String o2Name = DetailsPanel.prettifyObject(o2.getKey(), this.user);
String o1Name = Utils.prettifyObject(o1.getKey(), this.user);
String o2Name = Utils.prettifyObject(o2.getKey(), this.user);

return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
};
Expand DownExpand Up@@ -647,10 +647,10 @@ private PanelItem createMaterialButton(ItemTemplateRecord template,
{
builder.name(this.user.getTranslation(this.world, template.title(),
"[number]", String.valueOf(materialCount.getValue()),
"[material]", DetailsPanel.prettifyObject(materialCount.getKey(), this.user)));
"[material]", Utils.prettifyObject(materialCount.getKey(), this.user)));
}

String description = DetailsPanel.prettifyDescription(materialCount.getKey(), this.user);
String description = Utils.prettifyDescription(materialCount.getKey(), this.user);

final String reference = "level.gui.buttons.material.";
String blockId = this.user.getTranslationOrNothing(reference + "id",
Expand DownExpand Up@@ -710,95 +710,6 @@ public static void openPanel(Level addon,
}


/**
* Prettify Material object for user.
* @param object Object that must be pretty.
* @param user User who will see the object.
* @return Prettified string for Material.
*/
private static String prettifyObject(Material object, User user)
{
// Nothing to translate
if (object == null)
{
return "";
}

// Find addon structure with:
// [addon]:
// materials:
// [material]:
// name: [name]
String translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase() + ".name");

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// Find addon structure with:
// [addon]:
// materials:
// [material]: [name]

translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase());

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// Find general structure with:
// materials:
// [material]: [name]

translation = user.getTranslationOrNothing("materials." + object.name().toLowerCase());

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// Use Lang Utils Hook to translate material
return LangUtilsHook.getMaterialName(object, user);
}


/**
* Prettify Material object description for user.
* @param object Object that must be pretty.
* @param user User who will see the object.
* @return Prettified description string for Material.
*/
public static String prettifyDescription(Material object, User user)
{
// Nothing to translate
if (object == null)
{
return "";
}

// Find addon structure with:
// [addon]:
// materials:
// [material]:
// description: [text]
String translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase() + ".description");

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// No text to return.
return "";
}


// ---------------------------------------------------------------------
// Section: Enums
// ---------------------------------------------------------------------
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Implement customizable Values GUI.#262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BONNe merged 1 commit into from
Jun 17, 2022
Merged

Implement customizable Values GUI. #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@
<spigot.version>1.16.5-R0.1-SNAPSHOT</spigot.version>
<bentobox.version>1.20.0</bentobox.version>
<!-- Panel Utils version -->
<panelutils.version>1.0.0</panelutils.version>
<panelutils.version>1.1.0</panelutils.version>
<!-- Revision variable removes warning about dynamic version -->
<revision>${build.version}-SNAPSHOT</revision>
<!-- Do not change unless you want different name for local builds. -->
Expand Down
1 change: 1 addition & 0 deletions src/main/java/world/bentobox/level/Level.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,7 @@ public void onLoad() {
// Save existing panels.
this.saveResource("panels/top_panel.yml", false);
this.saveResource("panels/detail_panel.yml", false);
this.saveResource("panels/value_panel.yml", false);
}

private boolean loadSettings() {
Expand Down
134 changes: 113 additions & 21 deletions src/main/java/world/bentobox/level/commands/IslandValueCommand.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,142 @@
package world.bentobox.level.commands;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;

import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.PlayerInventory;

import world.bentobox.bentobox.api.commands.CompositeCommand;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.util.Util;
import world.bentobox.level.Level;
import world.bentobox.level.panels.ValuePanel;
import world.bentobox.level.util.Utils;

public class IslandValueCommand extends CompositeCommand {

public class IslandValueCommand extends CompositeCommand
{
private final Level addon;

public IslandValueCommand(Level addon, CompositeCommand parent) {

public IslandValueCommand(Level addon, CompositeCommand parent)
{
super(parent, "value");
this.addon = addon;
}


@Override
public void setup() {
public void setup()
{
this.setPermission("island.value");
this.setDescription("island.value.description");
this.setParametersHelp("level.commands.value.parameters");
this.setDescription("level.commands.value.description");
this.setOnlyPlayer(true);
}


@Override
public boolean execute(User user, String label, List<String> args) {
Player player = user.getPlayer();
PlayerInventory inventory = player.getInventory();
if (!inventory.getItemInMainHand().getType().equals(Material.AIR)) {
Material material = inventory.getItemInMainHand().getType();
Integer value = addon.getBlockConfig().getValue(getWorld(), material);
if (value != null) {
user.sendMessage("island.value.success", "[value]", String.valueOf(value));
double underWater = addon.getSettings().getUnderWaterMultiplier();
if (underWater > 1.0) {
user.sendMessage("island.value.success-underwater", "[value]", (underWater * value) + "");
}
} else {
user.sendMessage("island.value.no-value");
public boolean execute(User user, String label, List<String> args)
{
if (args.size() > 1)
{
this.showHelp(this, user);
return true;
}

if (args.isEmpty())
{
ValuePanel.openPanel(this.addon, this.getWorld(), user);
}
else if (args.get(0).equalsIgnoreCase("HAND"))
{
Player player = user.getPlayer();
PlayerInventory inventory = player.getInventory();

if (!inventory.getItemInMainHand().getType().equals(Material.AIR))
{
this.printValue(user, inventory.getItemInMainHand().getType());
}
else
{
Utils.sendMessage(user, user.getTranslation("level.conversations.empty-hand"));
}
}
else
{
Material material = Material.matchMaterial(args.get(0));

if (material == null)
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(), "level.conversations.unknown-item",
"[material]", args.get(0)));
}
else
{
this.printValue(user, material);
}
} else {
user.sendMessage("island.value.empty-hand");
}

return true;
}

}

/**
* This method prints value of the given material in chat.
* @param user User who receives the message.
* @param material Material value.
*/
private void printValue(User user, Material material)
{
Integer value = this.addon.getBlockConfig().getValue(getWorld(), material);

if (value != null)
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(), "level.conversations.value",
"[value]", String.valueOf(value),
"[material]", Utils.prettifyObject(material, user)));

double underWater = this.addon.getSettings().getUnderWaterMultiplier();

if (underWater > 1.0)
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(),"level.conversations.success-underwater",
"[value]", (underWater * value) + ""),
"[material]", Utils.prettifyObject(material, user));
}
}
else
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(),"level.conversations.no-value"));
}
}


@Override
public Optional<List<String>> tabComplete(User user, String alias, List<String> args)
{
String lastArg = !args.isEmpty() ? args.get(args.size() - 1) : "";

if (args.isEmpty())
{
// Don't show every player on the server. Require at least the first letter
return Optional.empty();
}

List<String> options = new ArrayList<>(Arrays.stream(Material.values()).
filter(Material::isBlock).
map(Material::name).toList());

options.add("HAND");

return Optional.of(Util.tabLimit(options, lastArg));
}
}
105 changes: 8 additions & 97 deletions src/main/java/world/bentobox/level/panels/DetailsPanel.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,8 +165,8 @@ private void updateFilters()
{
if (o1.getValue().equals(o2.getValue()))
{
String o1Name = DetailsPanel.prettifyObject(o1.getKey(), this.user);
String o2Name = DetailsPanel.prettifyObject(o2.getKey(), this.user);
String o1Name = Utils.prettifyObject(o1.getKey(), this.user);
String o2Name = Utils.prettifyObject(o2.getKey(), this.user);

return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
}
Expand All@@ -193,8 +193,8 @@ private void updateFilters()

if (o1Value == o2Value)
{
String o1Name = DetailsPanel.prettifyObject(o1.getKey(), this.user);
String o2Name = DetailsPanel.prettifyObject(o2.getKey(), this.user);
String o1Name = Utils.prettifyObject(o1.getKey(), this.user);
String o2Name = Utils.prettifyObject(o2.getKey(), this.user);

return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
}
Expand All@@ -208,8 +208,8 @@ private void updateFilters()
{
sorter = (o1, o2) ->
{
String o1Name = DetailsPanel.prettifyObject(o1.getKey(), this.user);
String o2Name = DetailsPanel.prettifyObject(o2.getKey(), this.user);
String o1Name = Utils.prettifyObject(o1.getKey(), this.user);
String o2Name = Utils.prettifyObject(o2.getKey(), this.user);

return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
};
Expand DownExpand Up@@ -647,10 +647,10 @@ private PanelItem createMaterialButton(ItemTemplateRecord template,
{
builder.name(this.user.getTranslation(this.world, template.title(),
"[number]", String.valueOf(materialCount.getValue()),
"[material]", DetailsPanel.prettifyObject(materialCount.getKey(), this.user)));
"[material]", Utils.prettifyObject(materialCount.getKey(), this.user)));
}

String description = DetailsPanel.prettifyDescription(materialCount.getKey(), this.user);
String description = Utils.prettifyDescription(materialCount.getKey(), this.user);

final String reference = "level.gui.buttons.material.";
String blockId = this.user.getTranslationOrNothing(reference + "id",
Expand DownExpand Up@@ -710,95 +710,6 @@ public static void openPanel(Level addon,
}


/**
* Prettify Material object for user.
* @param object Object that must be pretty.
* @param user User who will see the object.
* @return Prettified string for Material.
*/
private static String prettifyObject(Material object, User user)
{
// Nothing to translate
if (object == null)
{
return "";
}

// Find addon structure with:
// [addon]:
// materials:
// [material]:
// name: [name]
String translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase() + ".name");

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// Find addon structure with:
// [addon]:
// materials:
// [material]: [name]

translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase());

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// Find general structure with:
// materials:
// [material]: [name]

translation = user.getTranslationOrNothing("materials." + object.name().toLowerCase());

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// Use Lang Utils Hook to translate material
return LangUtilsHook.getMaterialName(object, user);
}


/**
* Prettify Material object description for user.
* @param object Object that must be pretty.
* @param user User who will see the object.
* @return Prettified description string for Material.
*/
public static String prettifyDescription(Material object, User user)
{
// Nothing to translate
if (object == null)
{
return "";
}

// Find addon structure with:
// [addon]:
// materials:
// [material]:
// description: [text]
String translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase() + ".description");

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// No text to return.
return "";
}


// ---------------------------------------------------------------------
// Section: Enums
// ---------------------------------------------------------------------
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Implement customizable Values GUI.#262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BONNe merged 1 commit into from
Jun 17, 2022
Merged

Implement customizable Values GUI. #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@
<spigot.version>1.16.5-R0.1-SNAPSHOT</spigot.version>
<bentobox.version>1.20.0</bentobox.version>
<!-- Panel Utils version -->
<panelutils.version>1.0.0</panelutils.version>
<panelutils.version>1.1.0</panelutils.version>
<!-- Revision variable removes warning about dynamic version -->
<revision>${build.version}-SNAPSHOT</revision>
<!-- Do not change unless you want different name for local builds. -->
Expand Down
1 change: 1 addition & 0 deletions src/main/java/world/bentobox/level/Level.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,7 @@ public void onLoad() {
// Save existing panels.
this.saveResource("panels/top_panel.yml", false);
this.saveResource("panels/detail_panel.yml", false);
this.saveResource("panels/value_panel.yml", false);
}

private boolean loadSettings() {
Expand Down
134 changes: 113 additions & 21 deletions src/main/java/world/bentobox/level/commands/IslandValueCommand.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,142 @@
package world.bentobox.level.commands;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;

import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.PlayerInventory;

import world.bentobox.bentobox.api.commands.CompositeCommand;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.util.Util;
import world.bentobox.level.Level;
import world.bentobox.level.panels.ValuePanel;
import world.bentobox.level.util.Utils;

public class IslandValueCommand extends CompositeCommand {

public class IslandValueCommand extends CompositeCommand
{
private final Level addon;

public IslandValueCommand(Level addon, CompositeCommand parent) {

public IslandValueCommand(Level addon, CompositeCommand parent)
{
super(parent, "value");
this.addon = addon;
}


@Override
public void setup() {
public void setup()
{
this.setPermission("island.value");
this.setDescription("island.value.description");
this.setParametersHelp("level.commands.value.parameters");
this.setDescription("level.commands.value.description");
this.setOnlyPlayer(true);
}


@Override
public boolean execute(User user, String label, List<String> args) {
Player player = user.getPlayer();
PlayerInventory inventory = player.getInventory();
if (!inventory.getItemInMainHand().getType().equals(Material.AIR)) {
Material material = inventory.getItemInMainHand().getType();
Integer value = addon.getBlockConfig().getValue(getWorld(), material);
if (value != null) {
user.sendMessage("island.value.success", "[value]", String.valueOf(value));
double underWater = addon.getSettings().getUnderWaterMultiplier();
if (underWater > 1.0) {
user.sendMessage("island.value.success-underwater", "[value]", (underWater * value) + "");
}
} else {
user.sendMessage("island.value.no-value");
public boolean execute(User user, String label, List<String> args)
{
if (args.size() > 1)
{
this.showHelp(this, user);
return true;
}

if (args.isEmpty())
{
ValuePanel.openPanel(this.addon, this.getWorld(), user);
}
else if (args.get(0).equalsIgnoreCase("HAND"))
{
Player player = user.getPlayer();
PlayerInventory inventory = player.getInventory();

if (!inventory.getItemInMainHand().getType().equals(Material.AIR))
{
this.printValue(user, inventory.getItemInMainHand().getType());
}
else
{
Utils.sendMessage(user, user.getTranslation("level.conversations.empty-hand"));
}
}
else
{
Material material = Material.matchMaterial(args.get(0));

if (material == null)
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(), "level.conversations.unknown-item",
"[material]", args.get(0)));
}
else
{
this.printValue(user, material);
}
} else {
user.sendMessage("island.value.empty-hand");
}

return true;
}

}

/**
* This method prints value of the given material in chat.
* @param user User who receives the message.
* @param material Material value.
*/
private void printValue(User user, Material material)
{
Integer value = this.addon.getBlockConfig().getValue(getWorld(), material);

if (value != null)
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(), "level.conversations.value",
"[value]", String.valueOf(value),
"[material]", Utils.prettifyObject(material, user)));

double underWater = this.addon.getSettings().getUnderWaterMultiplier();

if (underWater > 1.0)
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(),"level.conversations.success-underwater",
"[value]", (underWater * value) + ""),
"[material]", Utils.prettifyObject(material, user));
}
}
else
{
Utils.sendMessage(user,
user.getTranslation(this.getWorld(),"level.conversations.no-value"));
}
}


@Override
public Optional<List<String>> tabComplete(User user, String alias, List<String> args)
{
String lastArg = !args.isEmpty() ? args.get(args.size() - 1) : "";

if (args.isEmpty())
{
// Don't show every player on the server. Require at least the first letter
return Optional.empty();
}

List<String> options = new ArrayList<>(Arrays.stream(Material.values()).
filter(Material::isBlock).
map(Material::name).toList());

options.add("HAND");

return Optional.of(Util.tabLimit(options, lastArg));
}
}
105 changes: 8 additions & 97 deletions src/main/java/world/bentobox/level/panels/DetailsPanel.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,8 +165,8 @@ private void updateFilters()
{
if (o1.getValue().equals(o2.getValue()))
{
String o1Name = DetailsPanel.prettifyObject(o1.getKey(), this.user);
String o2Name = DetailsPanel.prettifyObject(o2.getKey(), this.user);
String o1Name = Utils.prettifyObject(o1.getKey(), this.user);
String o2Name = Utils.prettifyObject(o2.getKey(), this.user);

return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
}
Expand All@@ -193,8 +193,8 @@ private void updateFilters()

if (o1Value == o2Value)
{
String o1Name = DetailsPanel.prettifyObject(o1.getKey(), this.user);
String o2Name = DetailsPanel.prettifyObject(o2.getKey(), this.user);
String o1Name = Utils.prettifyObject(o1.getKey(), this.user);
String o2Name = Utils.prettifyObject(o2.getKey(), this.user);

return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
}
Expand All@@ -208,8 +208,8 @@ private void updateFilters()
{
sorter = (o1, o2) ->
{
String o1Name = DetailsPanel.prettifyObject(o1.getKey(), this.user);
String o2Name = DetailsPanel.prettifyObject(o2.getKey(), this.user);
String o1Name = Utils.prettifyObject(o1.getKey(), this.user);
String o2Name = Utils.prettifyObject(o2.getKey(), this.user);

return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
};
Expand DownExpand Up@@ -647,10 +647,10 @@ private PanelItem createMaterialButton(ItemTemplateRecord template,
{
builder.name(this.user.getTranslation(this.world, template.title(),
"[number]", String.valueOf(materialCount.getValue()),
"[material]", DetailsPanel.prettifyObject(materialCount.getKey(), this.user)));
"[material]", Utils.prettifyObject(materialCount.getKey(), this.user)));
}

String description = DetailsPanel.prettifyDescription(materialCount.getKey(), this.user);
String description = Utils.prettifyDescription(materialCount.getKey(), this.user);

final String reference = "level.gui.buttons.material.";
String blockId = this.user.getTranslationOrNothing(reference + "id",
Expand DownExpand Up@@ -710,95 +710,6 @@ public static void openPanel(Level addon,
}


/**
* Prettify Material object for user.
* @param object Object that must be pretty.
* @param user User who will see the object.
* @return Prettified string for Material.
*/
private static String prettifyObject(Material object, User user)
{
// Nothing to translate
if (object == null)
{
return "";
}

// Find addon structure with:
// [addon]:
// materials:
// [material]:
// name: [name]
String translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase() + ".name");

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// Find addon structure with:
// [addon]:
// materials:
// [material]: [name]

translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase());

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// Find general structure with:
// materials:
// [material]: [name]

translation = user.getTranslationOrNothing("materials." + object.name().toLowerCase());

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// Use Lang Utils Hook to translate material
return LangUtilsHook.getMaterialName(object, user);
}


/**
* Prettify Material object description for user.
* @param object Object that must be pretty.
* @param user User who will see the object.
* @return Prettified description string for Material.
*/
public static String prettifyDescription(Material object, User user)
{
// Nothing to translate
if (object == null)
{
return "";
}

// Find addon structure with:
// [addon]:
// materials:
// [material]:
// description: [text]
String translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase() + ".description");

if (!translation.isEmpty())
{
// We found our translation.
return translation;
}

// No text to return.
return "";
}


// ---------------------------------------------------------------------
// Section: Enums
// ---------------------------------------------------------------------
Expand Down
Loading