Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,7 @@
<!-- Do not change unless you want different name for local builds. -->
<build.number>-LOCAL</build.number>
<!-- This allows to change between versions. -->
<build.version>2.25.0</build.version>
<build.version>2.26.0</build.version>
<sonar.projectKey>BentoBoxWorld_Level</sonar.projectKey>
<sonar.organization>bentobox-world</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/world/bentobox/level/Level.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,6 +102,7 @@ public void onLoad() {
this.saveResource("panels/top_panel.yml", false);
this.saveResource("panels/detail_panel.yml", false);
this.saveResource("panels/value_panel.yml", false);
this.saveResource("panels/donation_panel.yml", false);
}

private boolean loadSettings() {
Expand Down
117 changes: 65 additions & 52 deletions src/main/java/world/bentobox/level/panels/DonationPanel.java
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
package world.bentobox.level.panels;

import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

import org.bukkit.Bukkit;
import org.bukkit.Material;
Expand All@@ -23,6 +26,8 @@
import net.kyori.adventure.text.format.TextDecoration;

import world.bentobox.bentobox.api.localization.TextVariables;
import world.bentobox.bentobox.api.panels.reader.PanelTemplateRecord;
import world.bentobox.bentobox.api.panels.reader.TemplateReader;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.database.objects.Island;
import world.bentobox.bentobox.util.Util;
Expand All@@ -37,78 +42,89 @@
*/
public class DonationPanel implements Listener {

private static final int SIZE = 36; // 4 rows
private static final String TITLE_REF = "island.donate.gui-title";
private static final String POINTS_PLACEHOLDER = "[points]";

// Slot layout
private static final int INFO_SLOT = 4;
private static final int CANCEL_SLOT = 28;
private static final int PREVIEW_SLOT = 31;
private static final int CONFIRM_SLOT = 34;

// Donation slots: rows 2 and 3, columns 2-8 (slots 10-16, 19-25)
private static final int[] DONATION_SLOTS = {
10, 11, 12, 13, 14, 15, 16,
19, 20, 21, 22, 23, 24, 25
};

// Border slots: everything else
private static final Material BORDER_MATERIAL = Material.BLACK_STAINED_GLASS_PANE;

private final Level addon;
private final World world;
private final User user;
private final Island island;
private final Inventory inventory;
private final DonationPanelLayout layout;
private final Set<Integer> donationSlotSet;
private boolean confirmed = false;

private DonationPanel(Level addon, World world, User user, Island island) {
this.addon = addon;
this.world = world;
this.user = user;
this.island = island;
this.layout = loadLayout(addon);
this.donationSlotSet = HashSet.newHashSet(layout.donationSlots.length);
for (int s : layout.donationSlots) {
donationSlotSet.add(s);
}

// Create the inventory
// Create the inventory — use the title from the template (falls back to the
// default translation key when no template title is set).
Component title = removeDefaultItalic(
Util.parseMiniMessageOrLegacy(user.getTranslation(TITLE_REF)));
this.inventory = Bukkit.createInventory(null, SIZE, title);

// Fill borders
ItemStack border = createNamedItem(BORDER_MATERIAL, " ");
for (int i = 0; i < SIZE; i++) {
inventory.setItem(i, border);
Util.parseMiniMessageOrLegacy(user.getTranslation(layout.panelTitle)));
this.inventory = Bukkit.createInventory(null, layout.size, title);

// Fill borders if a border material is configured
if (layout.borderMaterial != null && layout.borderMaterial != Material.AIR) {
ItemStack border = createNamedItem(layout.borderMaterial, " ");
for (int i = 0; i < layout.size; i++) {
if (!donationSlotSet.contains(i)
&& i != layout.infoSlot && i != layout.cancelSlot
&& i != layout.previewSlot && i != layout.confirmSlot
&& !layout.decorativeItems.containsKey(i)) {
inventory.setItem(i, border);
}
}
}

// Clear donation slots
for (int slot : DONATION_SLOTS) {
inventory.setItem(slot, null);
}
// Place decorative items from the template (non-button, non-border entries)
layout.decorativeItems.forEach(inventory::setItem);

// Info pane
long currentDonated = addon.getManager().getDonatedPoints(island);
ItemStack info = createNamedItem(Material.BOOK,
ItemStack info = createNamedItem(layout.infoMaterial,
user.getTranslation("island.donate.gui-info",
POINTS_PLACEHOLDER, Utils.formatNumber(user, currentDonated)));
inventory.setItem(INFO_SLOT, info);
inventory.setItem(layout.infoSlot, info);

// Cancel button
ItemStack cancel = createNamedItem(Material.RED_STAINED_GLASS_PANE,
user.getTranslation("island.donate.cancel"));
inventory.setItem(CANCEL_SLOT, cancel);
String cancelKey = layout.cancelTitleOverride != null
? layout.cancelTitleOverride : "island.donate.cancel";
ItemStack cancel = createNamedItem(layout.cancelMaterial,
user.getTranslation(cancelKey));
inventory.setItem(layout.cancelSlot, cancel);

// Preview pane (starts at 0)
updatePreview();

// Confirm button
ItemStack confirm = createNamedItem(Material.LIME_STAINED_GLASS_PANE,
user.getTranslation("island.donate.confirm"));
inventory.setItem(CONFIRM_SLOT, confirm);
String confirmKey = layout.confirmTitleOverride != null
? layout.confirmTitleOverride : "island.donate.confirm";
ItemStack confirm = createNamedItem(layout.confirmMaterial,
user.getTranslation(confirmKey));
inventory.setItem(layout.confirmSlot, confirm);

// Register listener
Bukkit.getPluginManager().registerEvents(this, addon.getPlugin());
}

private static DonationPanelLayout loadLayout(Level addon) {
try {
File panelFolder = new File(addon.getDataFolder(), "panels");
PanelTemplateRecord template = TemplateReader.readTemplatePanel("donation_panel", panelFolder);
return DonationPanelLayout.fromTemplate(template);
} catch (Exception e) {
addon.logError("Could not load donation_panel template, using default layout.");
return DonationPanelLayout.defaults();
}
}

private void build() {
user.getPlayer().openInventory(inventory);
}
Expand All@@ -118,7 +134,7 @@ private void build() {
*/
private long calculateDonationValue() {
long total = 0;
for (int slot : DONATION_SLOTS) {
for (int slot : layout.donationSlots) {
ItemStack item = inventory.getItem(slot);
if (item != null && !item.getType().isAir()) {
Integer value = addon.getBlockConfig().getValue(world, item.getType());
Expand All@@ -135,20 +151,17 @@ private long calculateDonationValue() {
*/
private void updatePreview() {
long points = calculateDonationValue();
ItemStack preview = createNamedItem(Material.EXPERIENCE_BOTTLE,
ItemStack preview = createNamedItem(layout.previewMaterial,
user.getTranslation("island.donate.preview",
POINTS_PLACEHOLDER, Utils.formatNumber(user, points)));
inventory.setItem(PREVIEW_SLOT, preview);
inventory.setItem(layout.previewSlot, preview);
}

/**
* Check if a slot is a donation slot.
*/
private boolean isDonationSlot(int slot) {
for (int s : DONATION_SLOTS) {
if (s == slot) return true;
}
return false;
return donationSlotSet.contains(slot);
}

/**
Expand All@@ -160,7 +173,7 @@ private void processDonation() {
long totalPoints = 0;
Player player = user.getPlayer();

for (int slot : DONATION_SLOTS) {
for (int slot : layout.donationSlots) {
ItemStack item = inventory.getItem(slot);
if (item != null && !item.getType().isAir()) {
Material mat = item.getType();
Expand DownExpand Up@@ -199,7 +212,7 @@ private void processDonation() {
*/
private void returnItems() {
Player player = user.getPlayer();
for (int slot : DONATION_SLOTS) {
for (int slot : layout.donationSlots) {
ItemStack item = inventory.getItem(slot);
if (item != null && !item.getType().isAir()) {
Map<Integer, ItemStack> overflow = player.getInventory().addItem(item);
Expand All@@ -224,15 +237,15 @@ public void onInventoryClick(InventoryClickEvent event) {

int slot = event.getRawSlot();

if (slot >= SIZE) {
if (slot >= layout.size) {
handlePlayerInventoryClick(event);
return;
}
if (slot == CANCEL_SLOT) {
if (slot == layout.cancelSlot) {
handleCancel(event, player);
return;
}
if (slot == CONFIRM_SLOT) {
if (slot == layout.confirmSlot) {
handleConfirm(event, player);
return;
}
Expand DownExpand Up@@ -268,8 +281,8 @@ private void handlePlayerInventoryClick(InventoryClickEvent event) {
*/
private ItemStack distributeIntoDonationSlots(ItemStack remaining) {
int idx = 0;
while (idx < DONATION_SLOTS.length && remaining.getAmount() > 0) {
int ds = DONATION_SLOTS[idx];
while (idx < layout.donationSlots.length && remaining.getAmount() > 0) {
int ds = layout.donationSlots[idx];
ItemStack existing = inventory.getItem(ds);
if (existing == null || existing.getType().isAir()) {
inventory.setItem(ds, remaining.clone());
Expand DownExpand Up@@ -336,7 +349,7 @@ public void onInventoryDrag(InventoryDragEvent event) {
if (!event.getInventory().equals(inventory)) return;
// Only allow drags into donation slots
for (int slot : event.getRawSlots()) {
if (slot < SIZE && !isDonationSlot(slot)) {
if (slot < layout.size && !isDonationSlot(slot)) {
event.setCancelled(true);
return;
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,7 @@
<!-- Do not change unless you want different name for local builds. -->
<build.number>-LOCAL</build.number>
<!-- This allows to change between versions. -->
<build.version>2.25.0</build.version>
<build.version>2.26.0</build.version>
<sonar.projectKey>BentoBoxWorld_Level</sonar.projectKey>
<sonar.organization>bentobox-world</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/world/bentobox/level/Level.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,6 +102,7 @@ public void onLoad() {
this.saveResource("panels/top_panel.yml", false);
this.saveResource("panels/detail_panel.yml", false);
this.saveResource("panels/value_panel.yml", false);
this.saveResource("panels/donation_panel.yml", false);
}

private boolean loadSettings() {
Expand Down
117 changes: 65 additions & 52 deletions src/main/java/world/bentobox/level/panels/DonationPanel.java
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
package world.bentobox.level.panels;

import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

import org.bukkit.Bukkit;
import org.bukkit.Material;
Expand All@@ -23,6 +26,8 @@
import net.kyori.adventure.text.format.TextDecoration;

import world.bentobox.bentobox.api.localization.TextVariables;
import world.bentobox.bentobox.api.panels.reader.PanelTemplateRecord;
import world.bentobox.bentobox.api.panels.reader.TemplateReader;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.database.objects.Island;
import world.bentobox.bentobox.util.Util;
Expand All@@ -37,78 +42,89 @@
*/
public class DonationPanel implements Listener {

private static final int SIZE = 36; // 4 rows
private static final String TITLE_REF = "island.donate.gui-title";
private static final String POINTS_PLACEHOLDER = "[points]";

// Slot layout
private static final int INFO_SLOT = 4;
private static final int CANCEL_SLOT = 28;
private static final int PREVIEW_SLOT = 31;
private static final int CONFIRM_SLOT = 34;

// Donation slots: rows 2 and 3, columns 2-8 (slots 10-16, 19-25)
private static final int[] DONATION_SLOTS = {
10, 11, 12, 13, 14, 15, 16,
19, 20, 21, 22, 23, 24, 25
};

// Border slots: everything else
private static final Material BORDER_MATERIAL = Material.BLACK_STAINED_GLASS_PANE;

private final Level addon;
private final World world;
private final User user;
private final Island island;
private final Inventory inventory;
private final DonationPanelLayout layout;
private final Set<Integer> donationSlotSet;
private boolean confirmed = false;

private DonationPanel(Level addon, World world, User user, Island island) {
this.addon = addon;
this.world = world;
this.user = user;
this.island = island;
this.layout = loadLayout(addon);
this.donationSlotSet = HashSet.newHashSet(layout.donationSlots.length);
for (int s : layout.donationSlots) {
donationSlotSet.add(s);
}

// Create the inventory
// Create the inventory — use the title from the template (falls back to the
// default translation key when no template title is set).
Component title = removeDefaultItalic(
Util.parseMiniMessageOrLegacy(user.getTranslation(TITLE_REF)));
this.inventory = Bukkit.createInventory(null, SIZE, title);

// Fill borders
ItemStack border = createNamedItem(BORDER_MATERIAL, " ");
for (int i = 0; i < SIZE; i++) {
inventory.setItem(i, border);
Util.parseMiniMessageOrLegacy(user.getTranslation(layout.panelTitle)));
this.inventory = Bukkit.createInventory(null, layout.size, title);

// Fill borders if a border material is configured
if (layout.borderMaterial != null && layout.borderMaterial != Material.AIR) {
ItemStack border = createNamedItem(layout.borderMaterial, " ");
for (int i = 0; i < layout.size; i++) {
if (!donationSlotSet.contains(i)
&& i != layout.infoSlot && i != layout.cancelSlot
&& i != layout.previewSlot && i != layout.confirmSlot
&& !layout.decorativeItems.containsKey(i)) {
inventory.setItem(i, border);
}
}
}

// Clear donation slots
for (int slot : DONATION_SLOTS) {
inventory.setItem(slot, null);
}
// Place decorative items from the template (non-button, non-border entries)
layout.decorativeItems.forEach(inventory::setItem);

// Info pane
long currentDonated = addon.getManager().getDonatedPoints(island);
ItemStack info = createNamedItem(Material.BOOK,
ItemStack info = createNamedItem(layout.infoMaterial,
user.getTranslation("island.donate.gui-info",
POINTS_PLACEHOLDER, Utils.formatNumber(user, currentDonated)));
inventory.setItem(INFO_SLOT, info);
inventory.setItem(layout.infoSlot, info);

// Cancel button
ItemStack cancel = createNamedItem(Material.RED_STAINED_GLASS_PANE,
user.getTranslation("island.donate.cancel"));
inventory.setItem(CANCEL_SLOT, cancel);
String cancelKey = layout.cancelTitleOverride != null
? layout.cancelTitleOverride : "island.donate.cancel";
ItemStack cancel = createNamedItem(layout.cancelMaterial,
user.getTranslation(cancelKey));
inventory.setItem(layout.cancelSlot, cancel);

// Preview pane (starts at 0)
updatePreview();

// Confirm button
ItemStack confirm = createNamedItem(Material.LIME_STAINED_GLASS_PANE,
user.getTranslation("island.donate.confirm"));
inventory.setItem(CONFIRM_SLOT, confirm);
String confirmKey = layout.confirmTitleOverride != null
? layout.confirmTitleOverride : "island.donate.confirm";
ItemStack confirm = createNamedItem(layout.confirmMaterial,
user.getTranslation(confirmKey));
inventory.setItem(layout.confirmSlot, confirm);

// Register listener
Bukkit.getPluginManager().registerEvents(this, addon.getPlugin());
}

private static DonationPanelLayout loadLayout(Level addon) {
try {
File panelFolder = new File(addon.getDataFolder(), "panels");
PanelTemplateRecord template = TemplateReader.readTemplatePanel("donation_panel", panelFolder);
return DonationPanelLayout.fromTemplate(template);
} catch (Exception e) {
addon.logError("Could not load donation_panel template, using default layout.");
return DonationPanelLayout.defaults();
}
}

private void build() {
user.getPlayer().openInventory(inventory);
}
Expand All@@ -118,7 +134,7 @@ private void build() {
*/
private long calculateDonationValue() {
long total = 0;
for (int slot : DONATION_SLOTS) {
for (int slot : layout.donationSlots) {
ItemStack item = inventory.getItem(slot);
if (item != null && !item.getType().isAir()) {
Integer value = addon.getBlockConfig().getValue(world, item.getType());
Expand All@@ -135,20 +151,17 @@ private long calculateDonationValue() {
*/
private void updatePreview() {
long points = calculateDonationValue();
ItemStack preview = createNamedItem(Material.EXPERIENCE_BOTTLE,
ItemStack preview = createNamedItem(layout.previewMaterial,
user.getTranslation("island.donate.preview",
POINTS_PLACEHOLDER, Utils.formatNumber(user, points)));
inventory.setItem(PREVIEW_SLOT, preview);
inventory.setItem(layout.previewSlot, preview);
}

/**
* Check if a slot is a donation slot.
*/
private boolean isDonationSlot(int slot) {
for (int s : DONATION_SLOTS) {
if (s == slot) return true;
}
return false;
return donationSlotSet.contains(slot);
}

/**
Expand All@@ -160,7 +173,7 @@ private void processDonation() {
long totalPoints = 0;
Player player = user.getPlayer();

for (int slot : DONATION_SLOTS) {
for (int slot : layout.donationSlots) {
ItemStack item = inventory.getItem(slot);
if (item != null && !item.getType().isAir()) {
Material mat = item.getType();
Expand DownExpand Up@@ -199,7 +212,7 @@ private void processDonation() {
*/
private void returnItems() {
Player player = user.getPlayer();
for (int slot : DONATION_SLOTS) {
for (int slot : layout.donationSlots) {
ItemStack item = inventory.getItem(slot);
if (item != null && !item.getType().isAir()) {
Map<Integer, ItemStack> overflow = player.getInventory().addItem(item);
Expand All@@ -224,15 +237,15 @@ public void onInventoryClick(InventoryClickEvent event) {

int slot = event.getRawSlot();

if (slot >= SIZE) {
if (slot >= layout.size) {
handlePlayerInventoryClick(event);
return;
}
if (slot == CANCEL_SLOT) {
if (slot == layout.cancelSlot) {
handleCancel(event, player);
return;
}
if (slot == CONFIRM_SLOT) {
if (slot == layout.confirmSlot) {
handleConfirm(event, player);
return;
}
Expand DownExpand Up@@ -268,8 +281,8 @@ private void handlePlayerInventoryClick(InventoryClickEvent event) {
*/
private ItemStack distributeIntoDonationSlots(ItemStack remaining) {
int idx = 0;
while (idx < DONATION_SLOTS.length && remaining.getAmount() > 0) {
int ds = DONATION_SLOTS[idx];
while (idx < layout.donationSlots.length && remaining.getAmount() > 0) {
int ds = layout.donationSlots[idx];
ItemStack existing = inventory.getItem(ds);
if (existing == null || existing.getType().isAir()) {
inventory.setItem(ds, remaining.clone());
Expand DownExpand Up@@ -336,7 +349,7 @@ public void onInventoryDrag(InventoryDragEvent event) {
if (!event.getInventory().equals(inventory)) return;
// Only allow drags into donation slots
for (int slot : event.getRawSlots()) {
if (slot < SIZE && !isDonationSlot(slot)) {
if (slot < layout.size && !isDonationSlot(slot)) {
event.setCancelled(true);
return;
}
Expand Down
Loading
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,7 @@
<!-- Do not change unless you want different name for local builds. -->
<build.number>-LOCAL</build.number>
<!-- This allows to change between versions. -->
<build.version>2.25.0</build.version>
<build.version>2.26.0</build.version>
<sonar.projectKey>BentoBoxWorld_Level</sonar.projectKey>
<sonar.organization>bentobox-world</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/world/bentobox/level/Level.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,6 +102,7 @@ public void onLoad() {
this.saveResource("panels/top_panel.yml", false);
this.saveResource("panels/detail_panel.yml", false);
this.saveResource("panels/value_panel.yml", false);
this.saveResource("panels/donation_panel.yml", false);
}

private boolean loadSettings() {
Expand Down
117 changes: 65 additions & 52 deletions src/main/java/world/bentobox/level/panels/DonationPanel.java
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
package world.bentobox.level.panels;

import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

import org.bukkit.Bukkit;
import org.bukkit.Material;
Expand All@@ -23,6 +26,8 @@
import net.kyori.adventure.text.format.TextDecoration;

import world.bentobox.bentobox.api.localization.TextVariables;
import world.bentobox.bentobox.api.panels.reader.PanelTemplateRecord;
import world.bentobox.bentobox.api.panels.reader.TemplateReader;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.database.objects.Island;
import world.bentobox.bentobox.util.Util;
Expand All@@ -37,78 +42,89 @@
*/
public class DonationPanel implements Listener {

private static final int SIZE = 36; // 4 rows
private static final String TITLE_REF = "island.donate.gui-title";
private static final String POINTS_PLACEHOLDER = "[points]";

// Slot layout
private static final int INFO_SLOT = 4;
private static final int CANCEL_SLOT = 28;
private static final int PREVIEW_SLOT = 31;
private static final int CONFIRM_SLOT = 34;

// Donation slots: rows 2 and 3, columns 2-8 (slots 10-16, 19-25)
private static final int[] DONATION_SLOTS = {
10, 11, 12, 13, 14, 15, 16,
19, 20, 21, 22, 23, 24, 25
};

// Border slots: everything else
private static final Material BORDER_MATERIAL = Material.BLACK_STAINED_GLASS_PANE;

private final Level addon;
private final World world;
private final User user;
private final Island island;
private final Inventory inventory;
private final DonationPanelLayout layout;
private final Set<Integer> donationSlotSet;
private boolean confirmed = false;

private DonationPanel(Level addon, World world, User user, Island island) {
this.addon = addon;
this.world = world;
this.user = user;
this.island = island;
this.layout = loadLayout(addon);
this.donationSlotSet = HashSet.newHashSet(layout.donationSlots.length);
for (int s : layout.donationSlots) {
donationSlotSet.add(s);
}

// Create the inventory
// Create the inventory — use the title from the template (falls back to the
// default translation key when no template title is set).
Component title = removeDefaultItalic(
Util.parseMiniMessageOrLegacy(user.getTranslation(TITLE_REF)));
this.inventory = Bukkit.createInventory(null, SIZE, title);

// Fill borders
ItemStack border = createNamedItem(BORDER_MATERIAL, " ");
for (int i = 0; i < SIZE; i++) {
inventory.setItem(i, border);
Util.parseMiniMessageOrLegacy(user.getTranslation(layout.panelTitle)));
this.inventory = Bukkit.createInventory(null, layout.size, title);

// Fill borders if a border material is configured
if (layout.borderMaterial != null && layout.borderMaterial != Material.AIR) {
ItemStack border = createNamedItem(layout.borderMaterial, " ");
for (int i = 0; i < layout.size; i++) {
if (!donationSlotSet.contains(i)
&& i != layout.infoSlot && i != layout.cancelSlot
&& i != layout.previewSlot && i != layout.confirmSlot
&& !layout.decorativeItems.containsKey(i)) {
inventory.setItem(i, border);
}
}
}

// Clear donation slots
for (int slot : DONATION_SLOTS) {
inventory.setItem(slot, null);
}
// Place decorative items from the template (non-button, non-border entries)
layout.decorativeItems.forEach(inventory::setItem);

// Info pane
long currentDonated = addon.getManager().getDonatedPoints(island);
ItemStack info = createNamedItem(Material.BOOK,
ItemStack info = createNamedItem(layout.infoMaterial,
user.getTranslation("island.donate.gui-info",
POINTS_PLACEHOLDER, Utils.formatNumber(user, currentDonated)));
inventory.setItem(INFO_SLOT, info);
inventory.setItem(layout.infoSlot, info);

// Cancel button
ItemStack cancel = createNamedItem(Material.RED_STAINED_GLASS_PANE,
user.getTranslation("island.donate.cancel"));
inventory.setItem(CANCEL_SLOT, cancel);
String cancelKey = layout.cancelTitleOverride != null
? layout.cancelTitleOverride : "island.donate.cancel";
ItemStack cancel = createNamedItem(layout.cancelMaterial,
user.getTranslation(cancelKey));
inventory.setItem(layout.cancelSlot, cancel);

// Preview pane (starts at 0)
updatePreview();

// Confirm button
ItemStack confirm = createNamedItem(Material.LIME_STAINED_GLASS_PANE,
user.getTranslation("island.donate.confirm"));
inventory.setItem(CONFIRM_SLOT, confirm);
String confirmKey = layout.confirmTitleOverride != null
? layout.confirmTitleOverride : "island.donate.confirm";
ItemStack confirm = createNamedItem(layout.confirmMaterial,
user.getTranslation(confirmKey));
inventory.setItem(layout.confirmSlot, confirm);

// Register listener
Bukkit.getPluginManager().registerEvents(this, addon.getPlugin());
}

private static DonationPanelLayout loadLayout(Level addon) {
try {
File panelFolder = new File(addon.getDataFolder(), "panels");
PanelTemplateRecord template = TemplateReader.readTemplatePanel("donation_panel", panelFolder);
return DonationPanelLayout.fromTemplate(template);
} catch (Exception e) {
addon.logError("Could not load donation_panel template, using default layout.");
return DonationPanelLayout.defaults();
}
}

private void build() {
user.getPlayer().openInventory(inventory);
}
Expand All@@ -118,7 +134,7 @@ private void build() {
*/
private long calculateDonationValue() {
long total = 0;
for (int slot : DONATION_SLOTS) {
for (int slot : layout.donationSlots) {
ItemStack item = inventory.getItem(slot);
if (item != null && !item.getType().isAir()) {
Integer value = addon.getBlockConfig().getValue(world, item.getType());
Expand All@@ -135,20 +151,17 @@ private long calculateDonationValue() {
*/
private void updatePreview() {
long points = calculateDonationValue();
ItemStack preview = createNamedItem(Material.EXPERIENCE_BOTTLE,
ItemStack preview = createNamedItem(layout.previewMaterial,
user.getTranslation("island.donate.preview",
POINTS_PLACEHOLDER, Utils.formatNumber(user, points)));
inventory.setItem(PREVIEW_SLOT, preview);
inventory.setItem(layout.previewSlot, preview);
}

/**
* Check if a slot is a donation slot.
*/
private boolean isDonationSlot(int slot) {
for (int s : DONATION_SLOTS) {
if (s == slot) return true;
}
return false;
return donationSlotSet.contains(slot);
}

/**
Expand All@@ -160,7 +173,7 @@ private void processDonation() {
long totalPoints = 0;
Player player = user.getPlayer();

for (int slot : DONATION_SLOTS) {
for (int slot : layout.donationSlots) {
ItemStack item = inventory.getItem(slot);
if (item != null && !item.getType().isAir()) {
Material mat = item.getType();
Expand DownExpand Up@@ -199,7 +212,7 @@ private void processDonation() {
*/
private void returnItems() {
Player player = user.getPlayer();
for (int slot : DONATION_SLOTS) {
for (int slot : layout.donationSlots) {
ItemStack item = inventory.getItem(slot);
if (item != null && !item.getType().isAir()) {
Map<Integer, ItemStack> overflow = player.getInventory().addItem(item);
Expand All@@ -224,15 +237,15 @@ public void onInventoryClick(InventoryClickEvent event) {

int slot = event.getRawSlot();

if (slot >= SIZE) {
if (slot >= layout.size) {
handlePlayerInventoryClick(event);
return;
}
if (slot == CANCEL_SLOT) {
if (slot == layout.cancelSlot) {
handleCancel(event, player);
return;
}
if (slot == CONFIRM_SLOT) {
if (slot == layout.confirmSlot) {
handleConfirm(event, player);
return;
}
Expand DownExpand Up@@ -268,8 +281,8 @@ private void handlePlayerInventoryClick(InventoryClickEvent event) {
*/
private ItemStack distributeIntoDonationSlots(ItemStack remaining) {
int idx = 0;
while (idx < DONATION_SLOTS.length && remaining.getAmount() > 0) {
int ds = DONATION_SLOTS[idx];
while (idx < layout.donationSlots.length && remaining.getAmount() > 0) {
int ds = layout.donationSlots[idx];
ItemStack existing = inventory.getItem(ds);
if (existing == null || existing.getType().isAir()) {
inventory.setItem(ds, remaining.clone());
Expand DownExpand Up@@ -336,7 +349,7 @@ public void onInventoryDrag(InventoryDragEvent event) {
if (!event.getInventory().equals(inventory)) return;
// Only allow drags into donation slots
for (int slot : event.getRawSlots()) {
if (slot < SIZE && !isDonationSlot(slot)) {
if (slot < layout.size && !isDonationSlot(slot)) {
event.setCancelled(true);
return;
}
Expand Down
Loading
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 > 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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,7 @@
<!-- Do not change unless you want different name for local builds. -->
<build.number>-LOCAL</build.number>
<!-- This allows to change between versions. -->
<build.version>2.25.0</build.version>
<build.version>2.26.0</build.version>
<sonar.projectKey>BentoBoxWorld_Level</sonar.projectKey>
<sonar.organization>bentobox-world</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/world/bentobox/level/Level.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,6 +102,7 @@ public void onLoad() {
this.saveResource("panels/top_panel.yml", false);
this.saveResource("panels/detail_panel.yml", false);
this.saveResource("panels/value_panel.yml", false);
this.saveResource("panels/donation_panel.yml", false);
}

private boolean loadSettings() {
Expand Down
117 changes: 65 additions & 52 deletions src/main/java/world/bentobox/level/panels/DonationPanel.java
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
package world.bentobox.level.panels;

import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

import org.bukkit.Bukkit;
import org.bukkit.Material;
Expand All@@ -23,6 +26,8 @@
import net.kyori.adventure.text.format.TextDecoration;

import world.bentobox.bentobox.api.localization.TextVariables;
import world.bentobox.bentobox.api.panels.reader.PanelTemplateRecord;
import world.bentobox.bentobox.api.panels.reader.TemplateReader;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.database.objects.Island;
import world.bentobox.bentobox.util.Util;
Expand All@@ -37,78 +42,89 @@
*/
public class DonationPanel implements Listener {

private static final int SIZE = 36; // 4 rows
private static final String TITLE_REF = "island.donate.gui-title";
private static final String POINTS_PLACEHOLDER = "[points]";

// Slot layout
private static final int INFO_SLOT = 4;
private static final int CANCEL_SLOT = 28;
private static final int PREVIEW_SLOT = 31;
private static final int CONFIRM_SLOT = 34;

// Donation slots: rows 2 and 3, columns 2-8 (slots 10-16, 19-25)
private static final int[] DONATION_SLOTS = {
10, 11, 12, 13, 14, 15, 16,
19, 20, 21, 22, 23, 24, 25
};

// Border slots: everything else
private static final Material BORDER_MATERIAL = Material.BLACK_STAINED_GLASS_PANE;

private final Level addon;
private final World world;
private final User user;
private final Island island;
private final Inventory inventory;
private final DonationPanelLayout layout;
private final Set<Integer> donationSlotSet;
private boolean confirmed = false;

private DonationPanel(Level addon, World world, User user, Island island) {
this.addon = addon;
this.world = world;
this.user = user;
this.island = island;
this.layout = loadLayout(addon);
this.donationSlotSet = HashSet.newHashSet(layout.donationSlots.length);
for (int s : layout.donationSlots) {
donationSlotSet.add(s);
}

// Create the inventory
// Create the inventory — use the title from the template (falls back to the
// default translation key when no template title is set).
Component title = removeDefaultItalic(
Util.parseMiniMessageOrLegacy(user.getTranslation(TITLE_REF)));
this.inventory = Bukkit.createInventory(null, SIZE, title);

// Fill borders
ItemStack border = createNamedItem(BORDER_MATERIAL, " ");
for (int i = 0; i < SIZE; i++) {
inventory.setItem(i, border);
Util.parseMiniMessageOrLegacy(user.getTranslation(layout.panelTitle)));
this.inventory = Bukkit.createInventory(null, layout.size, title);

// Fill borders if a border material is configured
if (layout.borderMaterial != null && layout.borderMaterial != Material.AIR) {
ItemStack border = createNamedItem(layout.borderMaterial, " ");
for (int i = 0; i < layout.size; i++) {
if (!donationSlotSet.contains(i)
&& i != layout.infoSlot && i != layout.cancelSlot
&& i != layout.previewSlot && i != layout.confirmSlot
&& !layout.decorativeItems.containsKey(i)) {
inventory.setItem(i, border);
}
}
}

// Clear donation slots
for (int slot : DONATION_SLOTS) {
inventory.setItem(slot, null);
}
// Place decorative items from the template (non-button, non-border entries)
layout.decorativeItems.forEach(inventory::setItem);

// Info pane
long currentDonated = addon.getManager().getDonatedPoints(island);
ItemStack info = createNamedItem(Material.BOOK,
ItemStack info = createNamedItem(layout.infoMaterial,
user.getTranslation("island.donate.gui-info",
POINTS_PLACEHOLDER, Utils.formatNumber(user, currentDonated)));
inventory.setItem(INFO_SLOT, info);
inventory.setItem(layout.infoSlot, info);

// Cancel button
ItemStack cancel = createNamedItem(Material.RED_STAINED_GLASS_PANE,
user.getTranslation("island.donate.cancel"));
inventory.setItem(CANCEL_SLOT, cancel);
String cancelKey = layout.cancelTitleOverride != null
? layout.cancelTitleOverride : "island.donate.cancel";
ItemStack cancel = createNamedItem(layout.cancelMaterial,
user.getTranslation(cancelKey));
inventory.setItem(layout.cancelSlot, cancel);

// Preview pane (starts at 0)
updatePreview();

// Confirm button
ItemStack confirm = createNamedItem(Material.LIME_STAINED_GLASS_PANE,
user.getTranslation("island.donate.confirm"));
inventory.setItem(CONFIRM_SLOT, confirm);
String confirmKey = layout.confirmTitleOverride != null
? layout.confirmTitleOverride : "island.donate.confirm";
ItemStack confirm = createNamedItem(layout.confirmMaterial,
user.getTranslation(confirmKey));
inventory.setItem(layout.confirmSlot, confirm);

// Register listener
Bukkit.getPluginManager().registerEvents(this, addon.getPlugin());
}

private static DonationPanelLayout loadLayout(Level addon) {
try {
File panelFolder = new File(addon.getDataFolder(), "panels");
PanelTemplateRecord template = TemplateReader.readTemplatePanel("donation_panel", panelFolder);
return DonationPanelLayout.fromTemplate(template);
} catch (Exception e) {
addon.logError("Could not load donation_panel template, using default layout.");
return DonationPanelLayout.defaults();
}
}

private void build() {
user.getPlayer().openInventory(inventory);
}
Expand All@@ -118,7 +134,7 @@ private void build() {
*/
private long calculateDonationValue() {
long total = 0;
for (int slot : DONATION_SLOTS) {
for (int slot : layout.donationSlots) {
ItemStack item = inventory.getItem(slot);
if (item != null && !item.getType().isAir()) {
Integer value = addon.getBlockConfig().getValue(world, item.getType());
Expand All@@ -135,20 +151,17 @@ private long calculateDonationValue() {
*/
private void updatePreview() {
long points = calculateDonationValue();
ItemStack preview = createNamedItem(Material.EXPERIENCE_BOTTLE,
ItemStack preview = createNamedItem(layout.previewMaterial,
user.getTranslation("island.donate.preview",
POINTS_PLACEHOLDER, Utils.formatNumber(user, points)));
inventory.setItem(PREVIEW_SLOT, preview);
inventory.setItem(layout.previewSlot, preview);
}

/**
* Check if a slot is a donation slot.
*/
private boolean isDonationSlot(int slot) {
for (int s : DONATION_SLOTS) {
if (s == slot) return true;
}
return false;
return donationSlotSet.contains(slot);
}

/**
Expand All@@ -160,7 +173,7 @@ private void processDonation() {
long totalPoints = 0;
Player player = user.getPlayer();

for (int slot : DONATION_SLOTS) {
for (int slot : layout.donationSlots) {
ItemStack item = inventory.getItem(slot);
if (item != null && !item.getType().isAir()) {
Material mat = item.getType();
Expand DownExpand Up@@ -199,7 +212,7 @@ private void processDonation() {
*/
private void returnItems() {
Player player = user.getPlayer();
for (int slot : DONATION_SLOTS) {
for (int slot : layout.donationSlots) {
ItemStack item = inventory.getItem(slot);
if (item != null && !item.getType().isAir()) {
Map<Integer, ItemStack> overflow = player.getInventory().addItem(item);
Expand All@@ -224,15 +237,15 @@ public void onInventoryClick(InventoryClickEvent event) {

int slot = event.getRawSlot();

if (slot >= SIZE) {
if (slot >= layout.size) {
handlePlayerInventoryClick(event);
return;
}
if (slot == CANCEL_SLOT) {
if (slot == layout.cancelSlot) {
handleCancel(event, player);
return;
}
if (slot == CONFIRM_SLOT) {
if (slot == layout.confirmSlot) {
handleConfirm(event, player);
return;
}
Expand DownExpand Up@@ -268,8 +281,8 @@ private void handlePlayerInventoryClick(InventoryClickEvent event) {
*/
private ItemStack distributeIntoDonationSlots(ItemStack remaining) {
int idx = 0;
while (idx < DONATION_SLOTS.length && remaining.getAmount() > 0) {
int ds = DONATION_SLOTS[idx];
while (idx < layout.donationSlots.length && remaining.getAmount() > 0) {
int ds = layout.donationSlots[idx];
ItemStack existing = inventory.getItem(ds);
if (existing == null || existing.getType().isAir()) {
inventory.setItem(ds, remaining.clone());
Expand DownExpand Up@@ -336,7 +349,7 @@ public void onInventoryDrag(InventoryDragEvent event) {
if (!event.getInventory().equals(inventory)) return;
// Only allow drags into donation slots
for (int slot : event.getRawSlots()) {
if (slot < SIZE && !isDonationSlot(slot)) {
if (slot < layout.size && !isDonationSlot(slot)) {
event.setCancelled(true);
return;
}
Expand Down
Loading
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,7 @@
<!-- Do not change unless you want different name for local builds. -->
<build.number>-LOCAL</build.number>
<!-- This allows to change between versions. -->
<build.version>2.25.0</build.version>
<build.version>2.26.0</build.version>
<sonar.projectKey>BentoBoxWorld_Level</sonar.projectKey>
<sonar.organization>bentobox-world</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/world/bentobox/level/Level.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,6 +102,7 @@ public void onLoad() {
this.saveResource("panels/top_panel.yml", false);
this.saveResource("panels/detail_panel.yml", false);
this.saveResource("panels/value_panel.yml", false);
this.saveResource("panels/donation_panel.yml", false);
}

private boolean loadSettings() {
Expand Down
117 changes: 65 additions & 52 deletions src/main/java/world/bentobox/level/panels/DonationPanel.java
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
package world.bentobox.level.panels;

import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

import org.bukkit.Bukkit;
import org.bukkit.Material;
Expand All@@ -23,6 +26,8 @@
import net.kyori.adventure.text.format.TextDecoration;

import world.bentobox.bentobox.api.localization.TextVariables;
import world.bentobox.bentobox.api.panels.reader.PanelTemplateRecord;
import world.bentobox.bentobox.api.panels.reader.TemplateReader;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.database.objects.Island;
import world.bentobox.bentobox.util.Util;
Expand All@@ -37,78 +42,89 @@
*/
public class DonationPanel implements Listener {

private static final int SIZE = 36; // 4 rows
private static final String TITLE_REF = "island.donate.gui-title";
private static final String POINTS_PLACEHOLDER = "[points]";

// Slot layout
private static final int INFO_SLOT = 4;
private static final int CANCEL_SLOT = 28;
private static final int PREVIEW_SLOT = 31;
private static final int CONFIRM_SLOT = 34;

// Donation slots: rows 2 and 3, columns 2-8 (slots 10-16, 19-25)
private static final int[] DONATION_SLOTS = {
10, 11, 12, 13, 14, 15, 16,
19, 20, 21, 22, 23, 24, 25
};

// Border slots: everything else
private static final Material BORDER_MATERIAL = Material.BLACK_STAINED_GLASS_PANE;

private final Level addon;
private final World world;
private final User user;
private final Island island;
private final Inventory inventory;
private final DonationPanelLayout layout;
private final Set<Integer> donationSlotSet;
private boolean confirmed = false;

private DonationPanel(Level addon, World world, User user, Island island) {
this.addon = addon;
this.world = world;
this.user = user;
this.island = island;
this.layout = loadLayout(addon);
this.donationSlotSet = HashSet.newHashSet(layout.donationSlots.length);
for (int s : layout.donationSlots) {
donationSlotSet.add(s);
}

// Create the inventory
// Create the inventory — use the title from the template (falls back to the
// default translation key when no template title is set).
Component title = removeDefaultItalic(
Util.parseMiniMessageOrLegacy(user.getTranslation(TITLE_REF)));
this.inventory = Bukkit.createInventory(null, SIZE, title);

// Fill borders
ItemStack border = createNamedItem(BORDER_MATERIAL, " ");
for (int i = 0; i < SIZE; i++) {
inventory.setItem(i, border);
Util.parseMiniMessageOrLegacy(user.getTranslation(layout.panelTitle)));
this.inventory = Bukkit.createInventory(null, layout.size, title);

// Fill borders if a border material is configured
if (layout.borderMaterial != null && layout.borderMaterial != Material.AIR) {
ItemStack border = createNamedItem(layout.borderMaterial, " ");
for (int i = 0; i < layout.size; i++) {
if (!donationSlotSet.contains(i)
&& i != layout.infoSlot && i != layout.cancelSlot
&& i != layout.previewSlot && i != layout.confirmSlot
&& !layout.decorativeItems.containsKey(i)) {
inventory.setItem(i, border);
}
}
}

// Clear donation slots
for (int slot : DONATION_SLOTS) {
inventory.setItem(slot, null);
}
// Place decorative items from the template (non-button, non-border entries)
layout.decorativeItems.forEach(inventory::setItem);

// Info pane
long currentDonated = addon.getManager().getDonatedPoints(island);
ItemStack info = createNamedItem(Material.BOOK,
ItemStack info = createNamedItem(layout.infoMaterial,
user.getTranslation("island.donate.gui-info",
POINTS_PLACEHOLDER, Utils.formatNumber(user, currentDonated)));
inventory.setItem(INFO_SLOT, info);
inventory.setItem(layout.infoSlot, info);

// Cancel button
ItemStack cancel = createNamedItem(Material.RED_STAINED_GLASS_PANE,
user.getTranslation("island.donate.cancel"));
inventory.setItem(CANCEL_SLOT, cancel);
String cancelKey = layout.cancelTitleOverride != null
? layout.cancelTitleOverride : "island.donate.cancel";
ItemStack cancel = createNamedItem(layout.cancelMaterial,
user.getTranslation(cancelKey));
inventory.setItem(layout.cancelSlot, cancel);

// Preview pane (starts at 0)
updatePreview();

// Confirm button
ItemStack confirm = createNamedItem(Material.LIME_STAINED_GLASS_PANE,
user.getTranslation("island.donate.confirm"));
inventory.setItem(CONFIRM_SLOT, confirm);
String confirmKey = layout.confirmTitleOverride != null
? layout.confirmTitleOverride : "island.donate.confirm";
ItemStack confirm = createNamedItem(layout.confirmMaterial,
user.getTranslation(confirmKey));
inventory.setItem(layout.confirmSlot, confirm);

// Register listener
Bukkit.getPluginManager().registerEvents(this, addon.getPlugin());
}

private static DonationPanelLayout loadLayout(Level addon) {
try {
File panelFolder = new File(addon.getDataFolder(), "panels");
PanelTemplateRecord template = TemplateReader.readTemplatePanel("donation_panel", panelFolder);
return DonationPanelLayout.fromTemplate(template);
} catch (Exception e) {
addon.logError("Could not load donation_panel template, using default layout.");
return DonationPanelLayout.defaults();
}
}

private void build() {
user.getPlayer().openInventory(inventory);
}
Expand All@@ -118,7 +134,7 @@ private void build() {
*/
private long calculateDonationValue() {
long total = 0;
for (int slot : DONATION_SLOTS) {
for (int slot : layout.donationSlots) {
ItemStack item = inventory.getItem(slot);
if (item != null && !item.getType().isAir()) {
Integer value = addon.getBlockConfig().getValue(world, item.getType());
Expand All@@ -135,20 +151,17 @@ private long calculateDonationValue() {
*/
private void updatePreview() {
long points = calculateDonationValue();
ItemStack preview = createNamedItem(Material.EXPERIENCE_BOTTLE,
ItemStack preview = createNamedItem(layout.previewMaterial,
user.getTranslation("island.donate.preview",
POINTS_PLACEHOLDER, Utils.formatNumber(user, points)));
inventory.setItem(PREVIEW_SLOT, preview);
inventory.setItem(layout.previewSlot, preview);
}

/**
* Check if a slot is a donation slot.
*/
private boolean isDonationSlot(int slot) {
for (int s : DONATION_SLOTS) {
if (s == slot) return true;
}
return false;
return donationSlotSet.contains(slot);
}

/**
Expand All@@ -160,7 +173,7 @@ private void processDonation() {
long totalPoints = 0;
Player player = user.getPlayer();

for (int slot : DONATION_SLOTS) {
for (int slot : layout.donationSlots) {
ItemStack item = inventory.getItem(slot);
if (item != null && !item.getType().isAir()) {
Material mat = item.getType();
Expand DownExpand Up@@ -199,7 +212,7 @@ private void processDonation() {
*/
private void returnItems() {
Player player = user.getPlayer();
for (int slot : DONATION_SLOTS) {
for (int slot : layout.donationSlots) {
ItemStack item = inventory.getItem(slot);
if (item != null && !item.getType().isAir()) {
Map<Integer, ItemStack> overflow = player.getInventory().addItem(item);
Expand All@@ -224,15 +237,15 @@ public void onInventoryClick(InventoryClickEvent event) {

int slot = event.getRawSlot();

if (slot >= SIZE) {
if (slot >= layout.size) {
handlePlayerInventoryClick(event);
return;
}
if (slot == CANCEL_SLOT) {
if (slot == layout.cancelSlot) {
handleCancel(event, player);
return;
}
if (slot == CONFIRM_SLOT) {
if (slot == layout.confirmSlot) {
handleConfirm(event, player);
return;
}
Expand DownExpand Up@@ -268,8 +281,8 @@ private void handlePlayerInventoryClick(InventoryClickEvent event) {
*/
private ItemStack distributeIntoDonationSlots(ItemStack remaining) {
int idx = 0;
while (idx < DONATION_SLOTS.length && remaining.getAmount() > 0) {
int ds = DONATION_SLOTS[idx];
while (idx < layout.donationSlots.length && remaining.getAmount() > 0) {
int ds = layout.donationSlots[idx];
ItemStack existing = inventory.getItem(ds);
if (existing == null || existing.getType().isAir()) {
inventory.setItem(ds, remaining.clone());
Expand DownExpand Up@@ -336,7 +349,7 @@ public void onInventoryDrag(InventoryDragEvent event) {
if (!event.getInventory().equals(inventory)) return;
// Only allow drags into donation slots
for (int slot : event.getRawSlots()) {
if (slot < SIZE && !isDonationSlot(slot)) {
if (slot < layout.size && !isDonationSlot(slot)) {
event.setCancelled(true);
return;
}
Expand Down
Loading
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,7 @@
<!-- Do not change unless you want different name for local builds. -->
<build.number>-LOCAL</build.number>
<!-- This allows to change between versions. -->
<build.version>2.25.0</build.version>
<build.version>2.26.0</build.version>
<sonar.projectKey>BentoBoxWorld_Level</sonar.projectKey>
<sonar.organization>bentobox-world</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/world/bentobox/level/Level.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,6 +102,7 @@ public void onLoad() {
this.saveResource("panels/top_panel.yml", false);
this.saveResource("panels/detail_panel.yml", false);
this.saveResource("panels/value_panel.yml", false);
this.saveResource("panels/donation_panel.yml", false);
}

private boolean loadSettings() {
Expand Down
117 changes: 65 additions & 52 deletions src/main/java/world/bentobox/level/panels/DonationPanel.java
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
package world.bentobox.level.panels;

import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

import org.bukkit.Bukkit;
import org.bukkit.Material;
Expand All@@ -23,6 +26,8 @@
import net.kyori.adventure.text.format.TextDecoration;

import world.bentobox.bentobox.api.localization.TextVariables;
import world.bentobox.bentobox.api.panels.reader.PanelTemplateRecord;
import world.bentobox.bentobox.api.panels.reader.TemplateReader;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.database.objects.Island;
import world.bentobox.bentobox.util.Util;
Expand All@@ -37,78 +42,89 @@
*/
public class DonationPanel implements Listener {

private static final int SIZE = 36; // 4 rows
private static final String TITLE_REF = "island.donate.gui-title";
private static final String POINTS_PLACEHOLDER = "[points]";

// Slot layout
private static final int INFO_SLOT = 4;
private static final int CANCEL_SLOT = 28;
private static final int PREVIEW_SLOT = 31;
private static final int CONFIRM_SLOT = 34;

// Donation slots: rows 2 and 3, columns 2-8 (slots 10-16, 19-25)
private static final int[] DONATION_SLOTS = {
10, 11, 12, 13, 14, 15, 16,
19, 20, 21, 22, 23, 24, 25
};

// Border slots: everything else
private static final Material BORDER_MATERIAL = Material.BLACK_STAINED_GLASS_PANE;

private final Level addon;
private final World world;
private final User user;
private final Island island;
private final Inventory inventory;
private final DonationPanelLayout layout;
private final Set<Integer> donationSlotSet;
private boolean confirmed = false;

private DonationPanel(Level addon, World world, User user, Island island) {
this.addon = addon;
this.world = world;
this.user = user;
this.island = island;
this.layout = loadLayout(addon);
this.donationSlotSet = HashSet.newHashSet(layout.donationSlots.length);
for (int s : layout.donationSlots) {
donationSlotSet.add(s);
}

// Create the inventory
// Create the inventory — use the title from the template (falls back to the
// default translation key when no template title is set).
Component title = removeDefaultItalic(
Util.parseMiniMessageOrLegacy(user.getTranslation(TITLE_REF)));
this.inventory = Bukkit.createInventory(null, SIZE, title);

// Fill borders
ItemStack border = createNamedItem(BORDER_MATERIAL, " ");
for (int i = 0; i < SIZE; i++) {
inventory.setItem(i, border);
Util.parseMiniMessageOrLegacy(user.getTranslation(layout.panelTitle)));
this.inventory = Bukkit.createInventory(null, layout.size, title);

// Fill borders if a border material is configured
if (layout.borderMaterial != null && layout.borderMaterial != Material.AIR) {
ItemStack border = createNamedItem(layout.borderMaterial, " ");
for (int i = 0; i < layout.size; i++) {
if (!donationSlotSet.contains(i)
&& i != layout.infoSlot && i != layout.cancelSlot
&& i != layout.previewSlot && i != layout.confirmSlot
&& !layout.decorativeItems.containsKey(i)) {
inventory.setItem(i, border);
}
}
}

// Clear donation slots
for (int slot : DONATION_SLOTS) {
inventory.setItem(slot, null);
}
// Place decorative items from the template (non-button, non-border entries)
layout.decorativeItems.forEach(inventory::setItem);

// Info pane
long currentDonated = addon.getManager().getDonatedPoints(island);
ItemStack info = createNamedItem(Material.BOOK,
ItemStack info = createNamedItem(layout.infoMaterial,
user.getTranslation("island.donate.gui-info",
POINTS_PLACEHOLDER, Utils.formatNumber(user, currentDonated)));
inventory.setItem(INFO_SLOT, info);
inventory.setItem(layout.infoSlot, info);

// Cancel button
ItemStack cancel = createNamedItem(Material.RED_STAINED_GLASS_PANE,
user.getTranslation("island.donate.cancel"));
inventory.setItem(CANCEL_SLOT, cancel);
String cancelKey = layout.cancelTitleOverride != null
? layout.cancelTitleOverride : "island.donate.cancel";
ItemStack cancel = createNamedItem(layout.cancelMaterial,
user.getTranslation(cancelKey));
inventory.setItem(layout.cancelSlot, cancel);

// Preview pane (starts at 0)
updatePreview();

// Confirm button
ItemStack confirm = createNamedItem(Material.LIME_STAINED_GLASS_PANE,
user.getTranslation("island.donate.confirm"));
inventory.setItem(CONFIRM_SLOT, confirm);
String confirmKey = layout.confirmTitleOverride != null
? layout.confirmTitleOverride : "island.donate.confirm";
ItemStack confirm = createNamedItem(layout.confirmMaterial,
user.getTranslation(confirmKey));
inventory.setItem(layout.confirmSlot, confirm);

// Register listener
Bukkit.getPluginManager().registerEvents(this, addon.getPlugin());
}

private static DonationPanelLayout loadLayout(Level addon) {
try {
File panelFolder = new File(addon.getDataFolder(), "panels");
PanelTemplateRecord template = TemplateReader.readTemplatePanel("donation_panel", panelFolder);
return DonationPanelLayout.fromTemplate(template);
} catch (Exception e) {
addon.logError("Could not load donation_panel template, using default layout.");
return DonationPanelLayout.defaults();
}
}

private void build() {
user.getPlayer().openInventory(inventory);
}
Expand All@@ -118,7 +134,7 @@ private void build() {
*/
private long calculateDonationValue() {
long total = 0;
for (int slot : DONATION_SLOTS) {
for (int slot : layout.donationSlots) {
ItemStack item = inventory.getItem(slot);
if (item != null && !item.getType().isAir()) {
Integer value = addon.getBlockConfig().getValue(world, item.getType());
Expand All@@ -135,20 +151,17 @@ private long calculateDonationValue() {
*/
private void updatePreview() {
long points = calculateDonationValue();
ItemStack preview = createNamedItem(Material.EXPERIENCE_BOTTLE,
ItemStack preview = createNamedItem(layout.previewMaterial,
user.getTranslation("island.donate.preview",
POINTS_PLACEHOLDER, Utils.formatNumber(user, points)));
inventory.setItem(PREVIEW_SLOT, preview);
inventory.setItem(layout.previewSlot, preview);
}

/**
* Check if a slot is a donation slot.
*/
private boolean isDonationSlot(int slot) {
for (int s : DONATION_SLOTS) {
if (s == slot) return true;
}
return false;
return donationSlotSet.contains(slot);
}

/**
Expand All@@ -160,7 +173,7 @@ private void processDonation() {
long totalPoints = 0;
Player player = user.getPlayer();

for (int slot : DONATION_SLOTS) {
for (int slot : layout.donationSlots) {
ItemStack item = inventory.getItem(slot);
if (item != null && !item.getType().isAir()) {
Material mat = item.getType();
Expand DownExpand Up@@ -199,7 +212,7 @@ private void processDonation() {
*/
private void returnItems() {
Player player = user.getPlayer();
for (int slot : DONATION_SLOTS) {
for (int slot : layout.donationSlots) {
ItemStack item = inventory.getItem(slot);
if (item != null && !item.getType().isAir()) {
Map<Integer, ItemStack> overflow = player.getInventory().addItem(item);
Expand All@@ -224,15 +237,15 @@ public void onInventoryClick(InventoryClickEvent event) {

int slot = event.getRawSlot();

if (slot >= SIZE) {
if (slot >= layout.size) {
handlePlayerInventoryClick(event);
return;
}
if (slot == CANCEL_SLOT) {
if (slot == layout.cancelSlot) {
handleCancel(event, player);
return;
}
if (slot == CONFIRM_SLOT) {
if (slot == layout.confirmSlot) {
handleConfirm(event, player);
return;
}
Expand DownExpand Up@@ -268,8 +281,8 @@ private void handlePlayerInventoryClick(InventoryClickEvent event) {
*/
private ItemStack distributeIntoDonationSlots(ItemStack remaining) {
int idx = 0;
while (idx < DONATION_SLOTS.length && remaining.getAmount() > 0) {
int ds = DONATION_SLOTS[idx];
while (idx < layout.donationSlots.length && remaining.getAmount() > 0) {
int ds = layout.donationSlots[idx];
ItemStack existing = inventory.getItem(ds);
if (existing == null || existing.getType().isAir()) {
inventory.setItem(ds, remaining.clone());
Expand DownExpand Up@@ -336,7 +349,7 @@ public void onInventoryDrag(InventoryDragEvent event) {
if (!event.getInventory().equals(inventory)) return;
// Only allow drags into donation slots
for (int slot : event.getRawSlots()) {
if (slot < SIZE && !isDonationSlot(slot)) {
if (slot < layout.size && !isDonationSlot(slot)) {
event.setCancelled(true);
return;
}
Expand Down
Loading
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,7 @@
<!-- Do not change unless you want different name for local builds. -->
<build.number>-LOCAL</build.number>
<!-- This allows to change between versions. -->
<build.version>2.25.0</build.version>
<build.version>2.26.0</build.version>
<sonar.projectKey>BentoBoxWorld_Level</sonar.projectKey>
<sonar.organization>bentobox-world</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/world/bentobox/level/Level.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,6 +102,7 @@ public void onLoad() {
this.saveResource("panels/top_panel.yml", false);
this.saveResource("panels/detail_panel.yml", false);
this.saveResource("panels/value_panel.yml", false);
this.saveResource("panels/donation_panel.yml", false);
}

private boolean loadSettings() {
Expand Down
117 changes: 65 additions & 52 deletions src/main/java/world/bentobox/level/panels/DonationPanel.java
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
package world.bentobox.level.panels;

import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

import org.bukkit.Bukkit;
import org.bukkit.Material;
Expand All@@ -23,6 +26,8 @@
import net.kyori.adventure.text.format.TextDecoration;

import world.bentobox.bentobox.api.localization.TextVariables;
import world.bentobox.bentobox.api.panels.reader.PanelTemplateRecord;
import world.bentobox.bentobox.api.panels.reader.TemplateReader;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.database.objects.Island;
import world.bentobox.bentobox.util.Util;
Expand All@@ -37,78 +42,89 @@
*/
public class DonationPanel implements Listener {

private static final int SIZE = 36; // 4 rows
private static final String TITLE_REF = "island.donate.gui-title";
private static final String POINTS_PLACEHOLDER = "[points]";

// Slot layout
private static final int INFO_SLOT = 4;
private static final int CANCEL_SLOT = 28;
private static final int PREVIEW_SLOT = 31;
private static final int CONFIRM_SLOT = 34;

// Donation slots: rows 2 and 3, columns 2-8 (slots 10-16, 19-25)
private static final int[] DONATION_SLOTS = {
10, 11, 12, 13, 14, 15, 16,
19, 20, 21, 22, 23, 24, 25
};

// Border slots: everything else
private static final Material BORDER_MATERIAL = Material.BLACK_STAINED_GLASS_PANE;

private final Level addon;
private final World world;
private final User user;
private final Island island;
private final Inventory inventory;
private final DonationPanelLayout layout;
private final Set<Integer> donationSlotSet;
private boolean confirmed = false;

private DonationPanel(Level addon, World world, User user, Island island) {
this.addon = addon;
this.world = world;
this.user = user;
this.island = island;
this.layout = loadLayout(addon);
this.donationSlotSet = HashSet.newHashSet(layout.donationSlots.length);
for (int s : layout.donationSlots) {
donationSlotSet.add(s);
}

// Create the inventory
// Create the inventory — use the title from the template (falls back to the
// default translation key when no template title is set).
Component title = removeDefaultItalic(
Util.parseMiniMessageOrLegacy(user.getTranslation(TITLE_REF)));
this.inventory = Bukkit.createInventory(null, SIZE, title);

// Fill borders
ItemStack border = createNamedItem(BORDER_MATERIAL, " ");
for (int i = 0; i < SIZE; i++) {
inventory.setItem(i, border);
Util.parseMiniMessageOrLegacy(user.getTranslation(layout.panelTitle)));
this.inventory = Bukkit.createInventory(null, layout.size, title);

// Fill borders if a border material is configured
if (layout.borderMaterial != null && layout.borderMaterial != Material.AIR) {
ItemStack border = createNamedItem(layout.borderMaterial, " ");
for (int i = 0; i < layout.size; i++) {
if (!donationSlotSet.contains(i)
&& i != layout.infoSlot && i != layout.cancelSlot
&& i != layout.previewSlot && i != layout.confirmSlot
&& !layout.decorativeItems.containsKey(i)) {
inventory.setItem(i, border);
}
}
}

// Clear donation slots
for (int slot : DONATION_SLOTS) {
inventory.setItem(slot, null);
}
// Place decorative items from the template (non-button, non-border entries)
layout.decorativeItems.forEach(inventory::setItem);

// Info pane
long currentDonated = addon.getManager().getDonatedPoints(island);
ItemStack info = createNamedItem(Material.BOOK,
ItemStack info = createNamedItem(layout.infoMaterial,
user.getTranslation("island.donate.gui-info",
POINTS_PLACEHOLDER, Utils.formatNumber(user, currentDonated)));
inventory.setItem(INFO_SLOT, info);
inventory.setItem(layout.infoSlot, info);

// Cancel button
ItemStack cancel = createNamedItem(Material.RED_STAINED_GLASS_PANE,
user.getTranslation("island.donate.cancel"));
inventory.setItem(CANCEL_SLOT, cancel);
String cancelKey = layout.cancelTitleOverride != null
? layout.cancelTitleOverride : "island.donate.cancel";
ItemStack cancel = createNamedItem(layout.cancelMaterial,
user.getTranslation(cancelKey));
inventory.setItem(layout.cancelSlot, cancel);

// Preview pane (starts at 0)
updatePreview();

// Confirm button
ItemStack confirm = createNamedItem(Material.LIME_STAINED_GLASS_PANE,
user.getTranslation("island.donate.confirm"));
inventory.setItem(CONFIRM_SLOT, confirm);
String confirmKey = layout.confirmTitleOverride != null
? layout.confirmTitleOverride : "island.donate.confirm";
ItemStack confirm = createNamedItem(layout.confirmMaterial,
user.getTranslation(confirmKey));
inventory.setItem(layout.confirmSlot, confirm);

// Register listener
Bukkit.getPluginManager().registerEvents(this, addon.getPlugin());
}

private static DonationPanelLayout loadLayout(Level addon) {
try {
File panelFolder = new File(addon.getDataFolder(), "panels");
PanelTemplateRecord template = TemplateReader.readTemplatePanel("donation_panel", panelFolder);
return DonationPanelLayout.fromTemplate(template);
} catch (Exception e) {
addon.logError("Could not load donation_panel template, using default layout.");
return DonationPanelLayout.defaults();
}
}

private void build() {
user.getPlayer().openInventory(inventory);
}
Expand All@@ -118,7 +134,7 @@ private void build() {
*/
private long calculateDonationValue() {
long total = 0;
for (int slot : DONATION_SLOTS) {
for (int slot : layout.donationSlots) {
ItemStack item = inventory.getItem(slot);
if (item != null && !item.getType().isAir()) {
Integer value = addon.getBlockConfig().getValue(world, item.getType());
Expand All@@ -135,20 +151,17 @@ private long calculateDonationValue() {
*/
private void updatePreview() {
long points = calculateDonationValue();
ItemStack preview = createNamedItem(Material.EXPERIENCE_BOTTLE,
ItemStack preview = createNamedItem(layout.previewMaterial,
user.getTranslation("island.donate.preview",
POINTS_PLACEHOLDER, Utils.formatNumber(user, points)));
inventory.setItem(PREVIEW_SLOT, preview);
inventory.setItem(layout.previewSlot, preview);
}

/**
* Check if a slot is a donation slot.
*/
private boolean isDonationSlot(int slot) {
for (int s : DONATION_SLOTS) {
if (s == slot) return true;
}
return false;
return donationSlotSet.contains(slot);
}

/**
Expand All@@ -160,7 +173,7 @@ private void processDonation() {
long totalPoints = 0;
Player player = user.getPlayer();

for (int slot : DONATION_SLOTS) {
for (int slot : layout.donationSlots) {
ItemStack item = inventory.getItem(slot);
if (item != null && !item.getType().isAir()) {
Material mat = item.getType();
Expand DownExpand Up@@ -199,7 +212,7 @@ private void processDonation() {
*/
private void returnItems() {
Player player = user.getPlayer();
for (int slot : DONATION_SLOTS) {
for (int slot : layout.donationSlots) {
ItemStack item = inventory.getItem(slot);
if (item != null && !item.getType().isAir()) {
Map<Integer, ItemStack> overflow = player.getInventory().addItem(item);
Expand All@@ -224,15 +237,15 @@ public void onInventoryClick(InventoryClickEvent event) {

int slot = event.getRawSlot();

if (slot >= SIZE) {
if (slot >= layout.size) {
handlePlayerInventoryClick(event);
return;
}
if (slot == CANCEL_SLOT) {
if (slot == layout.cancelSlot) {
handleCancel(event, player);
return;
}
if (slot == CONFIRM_SLOT) {
if (slot == layout.confirmSlot) {
handleConfirm(event, player);
return;
}
Expand DownExpand Up@@ -268,8 +281,8 @@ private void handlePlayerInventoryClick(InventoryClickEvent event) {
*/
private ItemStack distributeIntoDonationSlots(ItemStack remaining) {
int idx = 0;
while (idx < DONATION_SLOTS.length && remaining.getAmount() > 0) {
int ds = DONATION_SLOTS[idx];
while (idx < layout.donationSlots.length && remaining.getAmount() > 0) {
int ds = layout.donationSlots[idx];
ItemStack existing = inventory.getItem(ds);
if (existing == null || existing.getType().isAir()) {
inventory.setItem(ds, remaining.clone());
Expand DownExpand Up@@ -336,7 +349,7 @@ public void onInventoryDrag(InventoryDragEvent event) {
if (!event.getInventory().equals(inventory)) return;
// Only allow drags into donation slots
for (int slot : event.getRawSlots()) {
if (slot < SIZE && !isDonationSlot(slot)) {
if (slot < layout.size && !isDonationSlot(slot)) {
event.setCancelled(true);
return;
}
Expand Down
Loading
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,7 @@
<!-- Do not change unless you want different name for local builds. -->
<build.number>-LOCAL</build.number>
<!-- This allows to change between versions. -->
<build.version>2.25.0</build.version>
<build.version>2.26.0</build.version>
<sonar.projectKey>BentoBoxWorld_Level</sonar.projectKey>
<sonar.organization>bentobox-world</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/world/bentobox/level/Level.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,6 +102,7 @@ public void onLoad() {
this.saveResource("panels/top_panel.yml", false);
this.saveResource("panels/detail_panel.yml", false);
this.saveResource("panels/value_panel.yml", false);
this.saveResource("panels/donation_panel.yml", false);
}

private boolean loadSettings() {
Expand Down
117 changes: 65 additions & 52 deletions src/main/java/world/bentobox/level/panels/DonationPanel.java
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
package world.bentobox.level.panels;

import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

import org.bukkit.Bukkit;
import org.bukkit.Material;
Expand All@@ -23,6 +26,8 @@
import net.kyori.adventure.text.format.TextDecoration;

import world.bentobox.bentobox.api.localization.TextVariables;
import world.bentobox.bentobox.api.panels.reader.PanelTemplateRecord;
import world.bentobox.bentobox.api.panels.reader.TemplateReader;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.database.objects.Island;
import world.bentobox.bentobox.util.Util;
Expand All@@ -37,78 +42,89 @@
*/
public class DonationPanel implements Listener {

private static final int SIZE = 36; // 4 rows
private static final String TITLE_REF = "island.donate.gui-title";
private static final String POINTS_PLACEHOLDER = "[points]";

// Slot layout
private static final int INFO_SLOT = 4;
private static final int CANCEL_SLOT = 28;
private static final int PREVIEW_SLOT = 31;
private static final int CONFIRM_SLOT = 34;

// Donation slots: rows 2 and 3, columns 2-8 (slots 10-16, 19-25)
private static final int[] DONATION_SLOTS = {
10, 11, 12, 13, 14, 15, 16,
19, 20, 21, 22, 23, 24, 25
};

// Border slots: everything else
private static final Material BORDER_MATERIAL = Material.BLACK_STAINED_GLASS_PANE;

private final Level addon;
private final World world;
private final User user;
private final Island island;
private final Inventory inventory;
private final DonationPanelLayout layout;
private final Set<Integer> donationSlotSet;
private boolean confirmed = false;

private DonationPanel(Level addon, World world, User user, Island island) {
this.addon = addon;
this.world = world;
this.user = user;
this.island = island;
this.layout = loadLayout(addon);
this.donationSlotSet = HashSet.newHashSet(layout.donationSlots.length);
for (int s : layout.donationSlots) {
donationSlotSet.add(s);
}

// Create the inventory
// Create the inventory — use the title from the template (falls back to the
// default translation key when no template title is set).
Component title = removeDefaultItalic(
Util.parseMiniMessageOrLegacy(user.getTranslation(TITLE_REF)));
this.inventory = Bukkit.createInventory(null, SIZE, title);

// Fill borders
ItemStack border = createNamedItem(BORDER_MATERIAL, " ");
for (int i = 0; i < SIZE; i++) {
inventory.setItem(i, border);
Util.parseMiniMessageOrLegacy(user.getTranslation(layout.panelTitle)));
this.inventory = Bukkit.createInventory(null, layout.size, title);

// Fill borders if a border material is configured
if (layout.borderMaterial != null && layout.borderMaterial != Material.AIR) {
ItemStack border = createNamedItem(layout.borderMaterial, " ");
for (int i = 0; i < layout.size; i++) {
if (!donationSlotSet.contains(i)
&& i != layout.infoSlot && i != layout.cancelSlot
&& i != layout.previewSlot && i != layout.confirmSlot
&& !layout.decorativeItems.containsKey(i)) {
inventory.setItem(i, border);
}
}
}

// Clear donation slots
for (int slot : DONATION_SLOTS) {
inventory.setItem(slot, null);
}
// Place decorative items from the template (non-button, non-border entries)
layout.decorativeItems.forEach(inventory::setItem);

// Info pane
long currentDonated = addon.getManager().getDonatedPoints(island);
ItemStack info = createNamedItem(Material.BOOK,
ItemStack info = createNamedItem(layout.infoMaterial,
user.getTranslation("island.donate.gui-info",
POINTS_PLACEHOLDER, Utils.formatNumber(user, currentDonated)));
inventory.setItem(INFO_SLOT, info);
inventory.setItem(layout.infoSlot, info);

// Cancel button
ItemStack cancel = createNamedItem(Material.RED_STAINED_GLASS_PANE,
user.getTranslation("island.donate.cancel"));
inventory.setItem(CANCEL_SLOT, cancel);
String cancelKey = layout.cancelTitleOverride != null
? layout.cancelTitleOverride : "island.donate.cancel";
ItemStack cancel = createNamedItem(layout.cancelMaterial,
user.getTranslation(cancelKey));
inventory.setItem(layout.cancelSlot, cancel);

// Preview pane (starts at 0)
updatePreview();

// Confirm button
ItemStack confirm = createNamedItem(Material.LIME_STAINED_GLASS_PANE,
user.getTranslation("island.donate.confirm"));
inventory.setItem(CONFIRM_SLOT, confirm);
String confirmKey = layout.confirmTitleOverride != null
? layout.confirmTitleOverride : "island.donate.confirm";
ItemStack confirm = createNamedItem(layout.confirmMaterial,
user.getTranslation(confirmKey));
inventory.setItem(layout.confirmSlot, confirm);

// Register listener
Bukkit.getPluginManager().registerEvents(this, addon.getPlugin());
}

private static DonationPanelLayout loadLayout(Level addon) {
try {
File panelFolder = new File(addon.getDataFolder(), "panels");
PanelTemplateRecord template = TemplateReader.readTemplatePanel("donation_panel", panelFolder);
return DonationPanelLayout.fromTemplate(template);
} catch (Exception e) {
addon.logError("Could not load donation_panel template, using default layout.");
return DonationPanelLayout.defaults();
}
}

private void build() {
user.getPlayer().openInventory(inventory);
}
Expand All@@ -118,7 +134,7 @@ private void build() {
*/
private long calculateDonationValue() {
long total = 0;
for (int slot : DONATION_SLOTS) {
for (int slot : layout.donationSlots) {
ItemStack item = inventory.getItem(slot);
if (item != null && !item.getType().isAir()) {
Integer value = addon.getBlockConfig().getValue(world, item.getType());
Expand All@@ -135,20 +151,17 @@ private long calculateDonationValue() {
*/
private void updatePreview() {
long points = calculateDonationValue();
ItemStack preview = createNamedItem(Material.EXPERIENCE_BOTTLE,
ItemStack preview = createNamedItem(layout.previewMaterial,
user.getTranslation("island.donate.preview",
POINTS_PLACEHOLDER, Utils.formatNumber(user, points)));
inventory.setItem(PREVIEW_SLOT, preview);
inventory.setItem(layout.previewSlot, preview);
}

/**
* Check if a slot is a donation slot.
*/
private boolean isDonationSlot(int slot) {
for (int s : DONATION_SLOTS) {
if (s == slot) return true;
}
return false;
return donationSlotSet.contains(slot);
}

/**
Expand All@@ -160,7 +173,7 @@ private void processDonation() {
long totalPoints = 0;
Player player = user.getPlayer();

for (int slot : DONATION_SLOTS) {
for (int slot : layout.donationSlots) {
ItemStack item = inventory.getItem(slot);
if (item != null && !item.getType().isAir()) {
Material mat = item.getType();
Expand DownExpand Up@@ -199,7 +212,7 @@ private void processDonation() {
*/
private void returnItems() {
Player player = user.getPlayer();
for (int slot : DONATION_SLOTS) {
for (int slot : layout.donationSlots) {
ItemStack item = inventory.getItem(slot);
if (item != null && !item.getType().isAir()) {
Map<Integer, ItemStack> overflow = player.getInventory().addItem(item);
Expand All@@ -224,15 +237,15 @@ public void onInventoryClick(InventoryClickEvent event) {

int slot = event.getRawSlot();

if (slot >= SIZE) {
if (slot >= layout.size) {
handlePlayerInventoryClick(event);
return;
}
if (slot == CANCEL_SLOT) {
if (slot == layout.cancelSlot) {
handleCancel(event, player);
return;
}
if (slot == CONFIRM_SLOT) {
if (slot == layout.confirmSlot) {
handleConfirm(event, player);
return;
}
Expand DownExpand Up@@ -268,8 +281,8 @@ private void handlePlayerInventoryClick(InventoryClickEvent event) {
*/
private ItemStack distributeIntoDonationSlots(ItemStack remaining) {
int idx = 0;
while (idx < DONATION_SLOTS.length && remaining.getAmount() > 0) {
int ds = DONATION_SLOTS[idx];
while (idx < layout.donationSlots.length && remaining.getAmount() > 0) {
int ds = layout.donationSlots[idx];
ItemStack existing = inventory.getItem(ds);
if (existing == null || existing.getType().isAir()) {
inventory.setItem(ds, remaining.clone());
Expand DownExpand Up@@ -336,7 +349,7 @@ public void onInventoryDrag(InventoryDragEvent event) {
if (!event.getInventory().equals(inventory)) return;
// Only allow drags into donation slots
for (int slot : event.getRawSlots()) {
if (slot < SIZE && !isDonationSlot(slot)) {
if (slot < layout.size && !isDonationSlot(slot)) {
event.setCancelled(true);
return;
}
Expand Down
Loading
Loading