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
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,10 +66,11 @@ public boolean canExecute(User user, String label, List<String> args)
Utils.sendMessage(user, this.getWorld(), "general.errors.no-island");
return false;
} else if (ChallengesAddon.CHALLENGES_WORLD_PROTECTION.isSetForWorld(this.getWorld()) &&
!((ChallengesAddon) this.getAddon()).getChallengesSettings().isOpenAnywhere() &&
!this.getIslands().locationIsOnIsland(user.getPlayer(), user.getLocation()))
{
// Do not open gui if player is not on the island, but challenges requires island for
// completion.
// completion, unless open-anywhere is enabled.
Utils.sendMessage(user, this.getWorld(), Constants.ERRORS + "not-on-island");
return false;
}
Expand Down
28 changes: 28 additions & 0 deletions src/main/java/world/bentobox/challenges/config/Settings.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,12 @@ public class Settings implements ConfigObject
@ConfigEntry(path = "gui-settings.undeployed-view-mode")
private VisibilityMode visibilityMode = VisibilityMode.VISIBLE;

@ConfigComment("")
@ConfigComment("Allow players to open the challenges GUI without being on their island.")
@ConfigComment("Note: Challenges completion still requires being on the island when world protection is enabled.")
@ConfigEntry(path = "gui-settings.open-anywhere")
private boolean openAnywhere = false;


@ConfigComment("")
@ConfigComment("This allows to change default locked level icon. This option may be")
Expand DownExpand Up@@ -712,4 +718,26 @@ public void setIncludeUndeployed(boolean includeUndeployed)
{
this.includeUndeployed = includeUndeployed;
}


/**
* Is open anywhere boolean.
*
* @return the boolean
*/
public boolean isOpenAnywhere()
{
return openAnywhere;
}


/**
* Sets open anywhere.
*
* @param openAnywhere whether to allow opening GUI from anywhere
*/
public void setOpenAnywhere(boolean openAnywhere)
{
this.openAnywhere = openAnywhere;
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,7 @@ protected void build()
panelBuilder.item(20, this.getSettingsButton(Button.REMOVE_COMPLETED));
panelBuilder.item(29, this.getSettingsButton(Button.VISIBILITY_MODE));
panelBuilder.item(30, this.getSettingsButton(Button.INCLUDE_UNDEPLOYED));
panelBuilder.item(32, this.getSettingsButton(Button.OPEN_ANYWHERE));

panelBuilder.item(21, this.getSettingsButton(Button.LOCKED_LEVEL_ICON));

Expand DownExpand Up@@ -485,6 +486,22 @@ else if (this.settings.getVisibilityMode().equals(VisibilityMode.HIDDEN))
description.add("");
description.add(this.user.getTranslation(Constants.CLICK_TO_TOGGLE));
}
case OPEN_ANYWHERE -> {
description.add(this.user.getTranslation(reference +
(this.settings.isOpenAnywhere() ? Constants.ENABLED_KEY : Constants.DISABLED_KEY)));

icon = new ItemStack(Material.ELYTRA);
clickHandler = (panel, user1, clickType, i) -> {
this.settings.setOpenAnywhere(!this.settings.isOpenAnywhere());
panel.getInventory().setItem(i, this.getSettingsButton(button).getItem());
this.addon.saveSettings();
return true;
};
glow = this.settings.isOpenAnywhere();

description.add("");
description.add(this.user.getTranslation(Constants.CLICK_TO_TOGGLE));
}
default -> {
icon = new ItemStack(Material.PAPER);
clickHandler = null;
Expand DownExpand Up@@ -596,7 +613,11 @@ private enum Button
/**
* This allows to switch between different challenges visibility modes.
*/
VISIBILITY_MODE
VISIBILITY_MODE,
/**
* This allows players to open the GUI without being on their island.
*/
OPEN_ANYWHERE
}


Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/config.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,10 @@ gui-settings:
# TOGGLEABLE - Currently not implemented.
undeployed-view-mode: VISIBLE
#
# Allow players to open the challenges GUI without being on their island.
# Note: Challenges completion still requires being on the island when world protection is enabled.
open-anywhere: false
#
# This allows to change default locked level icon. This option may be
# overwritten by each challenge level. If challenge level has specified
# their locked level icon, then it will be used, instead of this one.
Expand Down
8 changes: 8 additions & 0 deletions src/main/resources/locales/en-US.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -770,6 +770,14 @@ challenges:
<gray>should be counted towards level completion.
enabled: "<dark_green>Enabled"
disabled: "<red>Disabled"
open_anywhere:
name: "<white><bold>Open GUI Anywhere"
description: |-
<gray>Allows players to open the challenges GUI
<gray>from anywhere. Completion still requires
<gray>being on the island when protected.
enabled: "<dark_green>Enabled"
disabled: "<red>Disabled"
download:
name: "<white><bold>Download Libraries"
description: |-
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -247,4 +247,25 @@ void testSetup() {
assertEquals(1, cc.getSubCommands(true).size());
}

@Test
void testCanExecuteOffIslandWithProtectionAndNoOpenAnywhere() {
// Player is off island and world protection is on, but openAnywhere is false
when(im.locationIsOnIsland(any(Player.class), any())).thenReturn(false);
// Note: Since CHALLENGES_WORLD_PROTECTION flag has default setting true,
// and TestWorldSetting.getWorldFlags() returns an empty map by default,
// the flag will check as enabled. We test behavior when it's restricted.
assertFalse(cc.canExecute(user, "challenges", Collections.emptyList()));
verify(user).getTranslation(world, "challenges.errors.not-on-island");
}

@Test
void testCanExecuteOffIslandWithProtectionAndOpenAnywhere() {
// Player is off island but openAnywhere is enabled
when(im.locationIsOnIsland(any(Player.class), any())).thenReturn(false);
Settings settings = (Settings) addon.getChallengesSettings();
settings.setOpenAnywhere(true);
assertTrue(cc.canExecute(user, "challenges", Collections.emptyList()));
verify(user, never()).getTranslation(world, "challenges.errors.not-on-island");
}

}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add setting to open the challenges GUI while off-island by tastybento · Pull Request #407 · BentoBoxWorld/Challenges · GitHub
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,10 +66,11 @@ public boolean canExecute(User user, String label, List<String> args)
Utils.sendMessage(user, this.getWorld(), "general.errors.no-island");
return false;
} else if (ChallengesAddon.CHALLENGES_WORLD_PROTECTION.isSetForWorld(this.getWorld()) &&
!((ChallengesAddon) this.getAddon()).getChallengesSettings().isOpenAnywhere() &&
!this.getIslands().locationIsOnIsland(user.getPlayer(), user.getLocation()))
{
// Do not open gui if player is not on the island, but challenges requires island for
// completion.
// completion, unless open-anywhere is enabled.
Utils.sendMessage(user, this.getWorld(), Constants.ERRORS + "not-on-island");
return false;
}
Expand Down
28 changes: 28 additions & 0 deletions src/main/java/world/bentobox/challenges/config/Settings.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,12 @@ public class Settings implements ConfigObject
@ConfigEntry(path = "gui-settings.undeployed-view-mode")
private VisibilityMode visibilityMode = VisibilityMode.VISIBLE;

@ConfigComment("")
@ConfigComment("Allow players to open the challenges GUI without being on their island.")
@ConfigComment("Note: Challenges completion still requires being on the island when world protection is enabled.")
@ConfigEntry(path = "gui-settings.open-anywhere")
private boolean openAnywhere = false;


@ConfigComment("")
@ConfigComment("This allows to change default locked level icon. This option may be")
Expand DownExpand Up@@ -712,4 +718,26 @@ public void setIncludeUndeployed(boolean includeUndeployed)
{
this.includeUndeployed = includeUndeployed;
}


/**
* Is open anywhere boolean.
*
* @return the boolean
*/
public boolean isOpenAnywhere()
{
return openAnywhere;
}


/**
* Sets open anywhere.
*
* @param openAnywhere whether to allow opening GUI from anywhere
*/
public void setOpenAnywhere(boolean openAnywhere)
{
this.openAnywhere = openAnywhere;
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,7 @@ protected void build()
panelBuilder.item(20, this.getSettingsButton(Button.REMOVE_COMPLETED));
panelBuilder.item(29, this.getSettingsButton(Button.VISIBILITY_MODE));
panelBuilder.item(30, this.getSettingsButton(Button.INCLUDE_UNDEPLOYED));
panelBuilder.item(32, this.getSettingsButton(Button.OPEN_ANYWHERE));

panelBuilder.item(21, this.getSettingsButton(Button.LOCKED_LEVEL_ICON));

Expand DownExpand Up@@ -485,6 +486,22 @@ else if (this.settings.getVisibilityMode().equals(VisibilityMode.HIDDEN))
description.add("");
description.add(this.user.getTranslation(Constants.CLICK_TO_TOGGLE));
}
case OPEN_ANYWHERE -> {
description.add(this.user.getTranslation(reference +
(this.settings.isOpenAnywhere() ? Constants.ENABLED_KEY : Constants.DISABLED_KEY)));

icon = new ItemStack(Material.ELYTRA);
clickHandler = (panel, user1, clickType, i) -> {
this.settings.setOpenAnywhere(!this.settings.isOpenAnywhere());
panel.getInventory().setItem(i, this.getSettingsButton(button).getItem());
this.addon.saveSettings();
return true;
};
glow = this.settings.isOpenAnywhere();

description.add("");
description.add(this.user.getTranslation(Constants.CLICK_TO_TOGGLE));
}
default -> {
icon = new ItemStack(Material.PAPER);
clickHandler = null;
Expand DownExpand Up@@ -596,7 +613,11 @@ private enum Button
/**
* This allows to switch between different challenges visibility modes.
*/
VISIBILITY_MODE
VISIBILITY_MODE,
/**
* This allows players to open the GUI without being on their island.
*/
OPEN_ANYWHERE
}


Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/config.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,10 @@ gui-settings:
# TOGGLEABLE - Currently not implemented.
undeployed-view-mode: VISIBLE
#
# Allow players to open the challenges GUI without being on their island.
# Note: Challenges completion still requires being on the island when world protection is enabled.
open-anywhere: false
#
# This allows to change default locked level icon. This option may be
# overwritten by each challenge level. If challenge level has specified
# their locked level icon, then it will be used, instead of this one.
Expand Down
8 changes: 8 additions & 0 deletions src/main/resources/locales/en-US.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -770,6 +770,14 @@ challenges:
<gray>should be counted towards level completion.
enabled: "<dark_green>Enabled"
disabled: "<red>Disabled"
open_anywhere:
name: "<white><bold>Open GUI Anywhere"
description: |-
<gray>Allows players to open the challenges GUI
<gray>from anywhere. Completion still requires
<gray>being on the island when protected.
enabled: "<dark_green>Enabled"
disabled: "<red>Disabled"
download:
name: "<white><bold>Download Libraries"
description: |-
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -247,4 +247,25 @@ void testSetup() {
assertEquals(1, cc.getSubCommands(true).size());
}

@Test
void testCanExecuteOffIslandWithProtectionAndNoOpenAnywhere() {
// Player is off island and world protection is on, but openAnywhere is false
when(im.locationIsOnIsland(any(Player.class), any())).thenReturn(false);
// Note: Since CHALLENGES_WORLD_PROTECTION flag has default setting true,
// and TestWorldSetting.getWorldFlags() returns an empty map by default,
// the flag will check as enabled. We test behavior when it's restricted.
assertFalse(cc.canExecute(user, "challenges", Collections.emptyList()));
verify(user).getTranslation(world, "challenges.errors.not-on-island");
}

@Test
void testCanExecuteOffIslandWithProtectionAndOpenAnywhere() {
// Player is off island but openAnywhere is enabled
when(im.locationIsOnIsland(any(Player.class), any())).thenReturn(false);
Settings settings = (Settings) addon.getChallengesSettings();
settings.setOpenAnywhere(true);
assertTrue(cc.canExecute(user, "challenges", Collections.emptyList()));
verify(user, never()).getTranslation(world, "challenges.errors.not-on-island");
}

}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add setting to open the challenges GUI while off-island by tastybento · Pull Request #407 · BentoBoxWorld/Challenges · GitHub
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,10 +66,11 @@ public boolean canExecute(User user, String label, List<String> args)
Utils.sendMessage(user, this.getWorld(), "general.errors.no-island");
return false;
} else if (ChallengesAddon.CHALLENGES_WORLD_PROTECTION.isSetForWorld(this.getWorld()) &&
!((ChallengesAddon) this.getAddon()).getChallengesSettings().isOpenAnywhere() &&
!this.getIslands().locationIsOnIsland(user.getPlayer(), user.getLocation()))
{
// Do not open gui if player is not on the island, but challenges requires island for
// completion.
// completion, unless open-anywhere is enabled.
Utils.sendMessage(user, this.getWorld(), Constants.ERRORS + "not-on-island");
return false;
}
Expand Down
28 changes: 28 additions & 0 deletions src/main/java/world/bentobox/challenges/config/Settings.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,12 @@ public class Settings implements ConfigObject
@ConfigEntry(path = "gui-settings.undeployed-view-mode")
private VisibilityMode visibilityMode = VisibilityMode.VISIBLE;

@ConfigComment("")
@ConfigComment("Allow players to open the challenges GUI without being on their island.")
@ConfigComment("Note: Challenges completion still requires being on the island when world protection is enabled.")
@ConfigEntry(path = "gui-settings.open-anywhere")
private boolean openAnywhere = false;


@ConfigComment("")
@ConfigComment("This allows to change default locked level icon. This option may be")
Expand DownExpand Up@@ -712,4 +718,26 @@ public void setIncludeUndeployed(boolean includeUndeployed)
{
this.includeUndeployed = includeUndeployed;
}


/**
* Is open anywhere boolean.
*
* @return the boolean
*/
public boolean isOpenAnywhere()
{
return openAnywhere;
}


/**
* Sets open anywhere.
*
* @param openAnywhere whether to allow opening GUI from anywhere
*/
public void setOpenAnywhere(boolean openAnywhere)
{
this.openAnywhere = openAnywhere;
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,7 @@ protected void build()
panelBuilder.item(20, this.getSettingsButton(Button.REMOVE_COMPLETED));
panelBuilder.item(29, this.getSettingsButton(Button.VISIBILITY_MODE));
panelBuilder.item(30, this.getSettingsButton(Button.INCLUDE_UNDEPLOYED));
panelBuilder.item(32, this.getSettingsButton(Button.OPEN_ANYWHERE));

panelBuilder.item(21, this.getSettingsButton(Button.LOCKED_LEVEL_ICON));

Expand DownExpand Up@@ -485,6 +486,22 @@ else if (this.settings.getVisibilityMode().equals(VisibilityMode.HIDDEN))
description.add("");
description.add(this.user.getTranslation(Constants.CLICK_TO_TOGGLE));
}
case OPEN_ANYWHERE -> {
description.add(this.user.getTranslation(reference +
(this.settings.isOpenAnywhere() ? Constants.ENABLED_KEY : Constants.DISABLED_KEY)));

icon = new ItemStack(Material.ELYTRA);
clickHandler = (panel, user1, clickType, i) -> {
this.settings.setOpenAnywhere(!this.settings.isOpenAnywhere());
panel.getInventory().setItem(i, this.getSettingsButton(button).getItem());
this.addon.saveSettings();
return true;
};
glow = this.settings.isOpenAnywhere();

description.add("");
description.add(this.user.getTranslation(Constants.CLICK_TO_TOGGLE));
}
default -> {
icon = new ItemStack(Material.PAPER);
clickHandler = null;
Expand DownExpand Up@@ -596,7 +613,11 @@ private enum Button
/**
* This allows to switch between different challenges visibility modes.
*/
VISIBILITY_MODE
VISIBILITY_MODE,
/**
* This allows players to open the GUI without being on their island.
*/
OPEN_ANYWHERE
}


Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/config.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,10 @@ gui-settings:
# TOGGLEABLE - Currently not implemented.
undeployed-view-mode: VISIBLE
#
# Allow players to open the challenges GUI without being on their island.
# Note: Challenges completion still requires being on the island when world protection is enabled.
open-anywhere: false
#
# This allows to change default locked level icon. This option may be
# overwritten by each challenge level. If challenge level has specified
# their locked level icon, then it will be used, instead of this one.
Expand Down
8 changes: 8 additions & 0 deletions src/main/resources/locales/en-US.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -770,6 +770,14 @@ challenges:
<gray>should be counted towards level completion.
enabled: "<dark_green>Enabled"
disabled: "<red>Disabled"
open_anywhere:
name: "<white><bold>Open GUI Anywhere"
description: |-
<gray>Allows players to open the challenges GUI
<gray>from anywhere. Completion still requires
<gray>being on the island when protected.
enabled: "<dark_green>Enabled"
disabled: "<red>Disabled"
download:
name: "<white><bold>Download Libraries"
description: |-
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -247,4 +247,25 @@ void testSetup() {
assertEquals(1, cc.getSubCommands(true).size());
}

@Test
void testCanExecuteOffIslandWithProtectionAndNoOpenAnywhere() {
// Player is off island and world protection is on, but openAnywhere is false
when(im.locationIsOnIsland(any(Player.class), any())).thenReturn(false);
// Note: Since CHALLENGES_WORLD_PROTECTION flag has default setting true,
// and TestWorldSetting.getWorldFlags() returns an empty map by default,
// the flag will check as enabled. We test behavior when it's restricted.
assertFalse(cc.canExecute(user, "challenges", Collections.emptyList()));
verify(user).getTranslation(world, "challenges.errors.not-on-island");
}

@Test
void testCanExecuteOffIslandWithProtectionAndOpenAnywhere() {
// Player is off island but openAnywhere is enabled
when(im.locationIsOnIsland(any(Player.class), any())).thenReturn(false);
Settings settings = (Settings) addon.getChallengesSettings();
settings.setOpenAnywhere(true);
assertTrue(cc.canExecute(user, "challenges", Collections.emptyList()));
verify(user, never()).getTranslation(world, "challenges.errors.not-on-island");
}

}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add setting to open the challenges GUI while off-island by tastybento · Pull Request #407 · BentoBoxWorld/Challenges · GitHub
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,10 +66,11 @@ public boolean canExecute(User user, String label, List<String> args)
Utils.sendMessage(user, this.getWorld(), "general.errors.no-island");
return false;
} else if (ChallengesAddon.CHALLENGES_WORLD_PROTECTION.isSetForWorld(this.getWorld()) &&
!((ChallengesAddon) this.getAddon()).getChallengesSettings().isOpenAnywhere() &&
!this.getIslands().locationIsOnIsland(user.getPlayer(), user.getLocation()))
{
// Do not open gui if player is not on the island, but challenges requires island for
// completion.
// completion, unless open-anywhere is enabled.
Utils.sendMessage(user, this.getWorld(), Constants.ERRORS + "not-on-island");
return false;
}
Expand Down
28 changes: 28 additions & 0 deletions src/main/java/world/bentobox/challenges/config/Settings.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,12 @@ public class Settings implements ConfigObject
@ConfigEntry(path = "gui-settings.undeployed-view-mode")
private VisibilityMode visibilityMode = VisibilityMode.VISIBLE;

@ConfigComment("")
@ConfigComment("Allow players to open the challenges GUI without being on their island.")
@ConfigComment("Note: Challenges completion still requires being on the island when world protection is enabled.")
@ConfigEntry(path = "gui-settings.open-anywhere")
private boolean openAnywhere = false;


@ConfigComment("")
@ConfigComment("This allows to change default locked level icon. This option may be")
Expand DownExpand Up@@ -712,4 +718,26 @@ public void setIncludeUndeployed(boolean includeUndeployed)
{
this.includeUndeployed = includeUndeployed;
}


/**
* Is open anywhere boolean.
*
* @return the boolean
*/
public boolean isOpenAnywhere()
{
return openAnywhere;
}


/**
* Sets open anywhere.
*
* @param openAnywhere whether to allow opening GUI from anywhere
*/
public void setOpenAnywhere(boolean openAnywhere)
{
this.openAnywhere = openAnywhere;
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,7 @@ protected void build()
panelBuilder.item(20, this.getSettingsButton(Button.REMOVE_COMPLETED));
panelBuilder.item(29, this.getSettingsButton(Button.VISIBILITY_MODE));
panelBuilder.item(30, this.getSettingsButton(Button.INCLUDE_UNDEPLOYED));
panelBuilder.item(32, this.getSettingsButton(Button.OPEN_ANYWHERE));

panelBuilder.item(21, this.getSettingsButton(Button.LOCKED_LEVEL_ICON));

Expand DownExpand Up@@ -485,6 +486,22 @@ else if (this.settings.getVisibilityMode().equals(VisibilityMode.HIDDEN))
description.add("");
description.add(this.user.getTranslation(Constants.CLICK_TO_TOGGLE));
}
case OPEN_ANYWHERE -> {
description.add(this.user.getTranslation(reference +
(this.settings.isOpenAnywhere() ? Constants.ENABLED_KEY : Constants.DISABLED_KEY)));

icon = new ItemStack(Material.ELYTRA);
clickHandler = (panel, user1, clickType, i) -> {
this.settings.setOpenAnywhere(!this.settings.isOpenAnywhere());
panel.getInventory().setItem(i, this.getSettingsButton(button).getItem());
this.addon.saveSettings();
return true;
};
glow = this.settings.isOpenAnywhere();

description.add("");
description.add(this.user.getTranslation(Constants.CLICK_TO_TOGGLE));
}
default -> {
icon = new ItemStack(Material.PAPER);
clickHandler = null;
Expand DownExpand Up@@ -596,7 +613,11 @@ private enum Button
/**
* This allows to switch between different challenges visibility modes.
*/
VISIBILITY_MODE
VISIBILITY_MODE,
/**
* This allows players to open the GUI without being on their island.
*/
OPEN_ANYWHERE
}


Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/config.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,10 @@ gui-settings:
# TOGGLEABLE - Currently not implemented.
undeployed-view-mode: VISIBLE
#
# Allow players to open the challenges GUI without being on their island.
# Note: Challenges completion still requires being on the island when world protection is enabled.
open-anywhere: false
#
# This allows to change default locked level icon. This option may be
# overwritten by each challenge level. If challenge level has specified
# their locked level icon, then it will be used, instead of this one.
Expand Down
8 changes: 8 additions & 0 deletions src/main/resources/locales/en-US.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -770,6 +770,14 @@ challenges:
<gray>should be counted towards level completion.
enabled: "<dark_green>Enabled"
disabled: "<red>Disabled"
open_anywhere:
name: "<white><bold>Open GUI Anywhere"
description: |-
<gray>Allows players to open the challenges GUI
<gray>from anywhere. Completion still requires
<gray>being on the island when protected.
enabled: "<dark_green>Enabled"
disabled: "<red>Disabled"
download:
name: "<white><bold>Download Libraries"
description: |-
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -247,4 +247,25 @@ void testSetup() {
assertEquals(1, cc.getSubCommands(true).size());
}

@Test
void testCanExecuteOffIslandWithProtectionAndNoOpenAnywhere() {
// Player is off island and world protection is on, but openAnywhere is false
when(im.locationIsOnIsland(any(Player.class), any())).thenReturn(false);
// Note: Since CHALLENGES_WORLD_PROTECTION flag has default setting true,
// and TestWorldSetting.getWorldFlags() returns an empty map by default,
// the flag will check as enabled. We test behavior when it's restricted.
assertFalse(cc.canExecute(user, "challenges", Collections.emptyList()));
verify(user).getTranslation(world, "challenges.errors.not-on-island");
}

@Test
void testCanExecuteOffIslandWithProtectionAndOpenAnywhere() {
// Player is off island but openAnywhere is enabled
when(im.locationIsOnIsland(any(Player.class), any())).thenReturn(false);
Settings settings = (Settings) addon.getChallengesSettings();
settings.setOpenAnywhere(true);
assertTrue(cc.canExecute(user, "challenges", Collections.emptyList()));
verify(user, never()).getTranslation(world, "challenges.errors.not-on-island");
}

}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Add setting to open the challenges GUI while off-island by tastybento · Pull Request #407 · BentoBoxWorld/Challenges · GitHub
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,10 +66,11 @@ public boolean canExecute(User user, String label, List<String> args)
Utils.sendMessage(user, this.getWorld(), "general.errors.no-island");
return false;
} else if (ChallengesAddon.CHALLENGES_WORLD_PROTECTION.isSetForWorld(this.getWorld()) &&
!((ChallengesAddon) this.getAddon()).getChallengesSettings().isOpenAnywhere() &&
!this.getIslands().locationIsOnIsland(user.getPlayer(), user.getLocation()))
{
// Do not open gui if player is not on the island, but challenges requires island for
// completion.
// completion, unless open-anywhere is enabled.
Utils.sendMessage(user, this.getWorld(), Constants.ERRORS + "not-on-island");
return false;
}
Expand Down
28 changes: 28 additions & 0 deletions src/main/java/world/bentobox/challenges/config/Settings.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,12 @@ public class Settings implements ConfigObject
@ConfigEntry(path = "gui-settings.undeployed-view-mode")
private VisibilityMode visibilityMode = VisibilityMode.VISIBLE;

@ConfigComment("")
@ConfigComment("Allow players to open the challenges GUI without being on their island.")
@ConfigComment("Note: Challenges completion still requires being on the island when world protection is enabled.")
@ConfigEntry(path = "gui-settings.open-anywhere")
private boolean openAnywhere = false;


@ConfigComment("")
@ConfigComment("This allows to change default locked level icon. This option may be")
Expand DownExpand Up@@ -712,4 +718,26 @@ public void setIncludeUndeployed(boolean includeUndeployed)
{
this.includeUndeployed = includeUndeployed;
}


/**
* Is open anywhere boolean.
*
* @return the boolean
*/
public boolean isOpenAnywhere()
{
return openAnywhere;
}


/**
* Sets open anywhere.
*
* @param openAnywhere whether to allow opening GUI from anywhere
*/
public void setOpenAnywhere(boolean openAnywhere)
{
this.openAnywhere = openAnywhere;
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,7 @@ protected void build()
panelBuilder.item(20, this.getSettingsButton(Button.REMOVE_COMPLETED));
panelBuilder.item(29, this.getSettingsButton(Button.VISIBILITY_MODE));
panelBuilder.item(30, this.getSettingsButton(Button.INCLUDE_UNDEPLOYED));
panelBuilder.item(32, this.getSettingsButton(Button.OPEN_ANYWHERE));

panelBuilder.item(21, this.getSettingsButton(Button.LOCKED_LEVEL_ICON));

Expand DownExpand Up@@ -485,6 +486,22 @@ else if (this.settings.getVisibilityMode().equals(VisibilityMode.HIDDEN))
description.add("");
description.add(this.user.getTranslation(Constants.CLICK_TO_TOGGLE));
}
case OPEN_ANYWHERE -> {
description.add(this.user.getTranslation(reference +
(this.settings.isOpenAnywhere() ? Constants.ENABLED_KEY : Constants.DISABLED_KEY)));

icon = new ItemStack(Material.ELYTRA);
clickHandler = (panel, user1, clickType, i) -> {
this.settings.setOpenAnywhere(!this.settings.isOpenAnywhere());
panel.getInventory().setItem(i, this.getSettingsButton(button).getItem());
this.addon.saveSettings();
return true;
};
glow = this.settings.isOpenAnywhere();

description.add("");
description.add(this.user.getTranslation(Constants.CLICK_TO_TOGGLE));
}
default -> {
icon = new ItemStack(Material.PAPER);
clickHandler = null;
Expand DownExpand Up@@ -596,7 +613,11 @@ private enum Button
/**
* This allows to switch between different challenges visibility modes.
*/
VISIBILITY_MODE
VISIBILITY_MODE,
/**
* This allows players to open the GUI without being on their island.
*/
OPEN_ANYWHERE
}


Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/config.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,10 @@ gui-settings:
# TOGGLEABLE - Currently not implemented.
undeployed-view-mode: VISIBLE
#
# Allow players to open the challenges GUI without being on their island.
# Note: Challenges completion still requires being on the island when world protection is enabled.
open-anywhere: false
#
# This allows to change default locked level icon. This option may be
# overwritten by each challenge level. If challenge level has specified
# their locked level icon, then it will be used, instead of this one.
Expand Down
8 changes: 8 additions & 0 deletions src/main/resources/locales/en-US.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -770,6 +770,14 @@ challenges:
<gray>should be counted towards level completion.
enabled: "<dark_green>Enabled"
disabled: "<red>Disabled"
open_anywhere:
name: "<white><bold>Open GUI Anywhere"
description: |-
<gray>Allows players to open the challenges GUI
<gray>from anywhere. Completion still requires
<gray>being on the island when protected.
enabled: "<dark_green>Enabled"
disabled: "<red>Disabled"
download:
name: "<white><bold>Download Libraries"
description: |-
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -247,4 +247,25 @@ void testSetup() {
assertEquals(1, cc.getSubCommands(true).size());
}

@Test
void testCanExecuteOffIslandWithProtectionAndNoOpenAnywhere() {
// Player is off island and world protection is on, but openAnywhere is false
when(im.locationIsOnIsland(any(Player.class), any())).thenReturn(false);
// Note: Since CHALLENGES_WORLD_PROTECTION flag has default setting true,
// and TestWorldSetting.getWorldFlags() returns an empty map by default,
// the flag will check as enabled. We test behavior when it's restricted.
assertFalse(cc.canExecute(user, "challenges", Collections.emptyList()));
verify(user).getTranslation(world, "challenges.errors.not-on-island");
}

@Test
void testCanExecuteOffIslandWithProtectionAndOpenAnywhere() {
// Player is off island but openAnywhere is enabled
when(im.locationIsOnIsland(any(Player.class), any())).thenReturn(false);
Settings settings = (Settings) addon.getChallengesSettings();
settings.setOpenAnywhere(true);
assertTrue(cc.canExecute(user, "challenges", Collections.emptyList()));
verify(user, never()).getTranslation(world, "challenges.errors.not-on-island");
}

}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add setting to open the challenges GUI while off-island by tastybento · Pull Request #407 · BentoBoxWorld/Challenges · GitHub
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,10 +66,11 @@ public boolean canExecute(User user, String label, List<String> args)
Utils.sendMessage(user, this.getWorld(), "general.errors.no-island");
return false;
} else if (ChallengesAddon.CHALLENGES_WORLD_PROTECTION.isSetForWorld(this.getWorld()) &&
!((ChallengesAddon) this.getAddon()).getChallengesSettings().isOpenAnywhere() &&
!this.getIslands().locationIsOnIsland(user.getPlayer(), user.getLocation()))
{
// Do not open gui if player is not on the island, but challenges requires island for
// completion.
// completion, unless open-anywhere is enabled.
Utils.sendMessage(user, this.getWorld(), Constants.ERRORS + "not-on-island");
return false;
}
Expand Down
28 changes: 28 additions & 0 deletions src/main/java/world/bentobox/challenges/config/Settings.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,12 @@ public class Settings implements ConfigObject
@ConfigEntry(path = "gui-settings.undeployed-view-mode")
private VisibilityMode visibilityMode = VisibilityMode.VISIBLE;

@ConfigComment("")
@ConfigComment("Allow players to open the challenges GUI without being on their island.")
@ConfigComment("Note: Challenges completion still requires being on the island when world protection is enabled.")
@ConfigEntry(path = "gui-settings.open-anywhere")
private boolean openAnywhere = false;


@ConfigComment("")
@ConfigComment("This allows to change default locked level icon. This option may be")
Expand DownExpand Up@@ -712,4 +718,26 @@ public void setIncludeUndeployed(boolean includeUndeployed)
{
this.includeUndeployed = includeUndeployed;
}


/**
* Is open anywhere boolean.
*
* @return the boolean
*/
public boolean isOpenAnywhere()
{
return openAnywhere;
}


/**
* Sets open anywhere.
*
* @param openAnywhere whether to allow opening GUI from anywhere
*/
public void setOpenAnywhere(boolean openAnywhere)
{
this.openAnywhere = openAnywhere;
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,7 @@ protected void build()
panelBuilder.item(20, this.getSettingsButton(Button.REMOVE_COMPLETED));
panelBuilder.item(29, this.getSettingsButton(Button.VISIBILITY_MODE));
panelBuilder.item(30, this.getSettingsButton(Button.INCLUDE_UNDEPLOYED));
panelBuilder.item(32, this.getSettingsButton(Button.OPEN_ANYWHERE));

panelBuilder.item(21, this.getSettingsButton(Button.LOCKED_LEVEL_ICON));

Expand DownExpand Up@@ -485,6 +486,22 @@ else if (this.settings.getVisibilityMode().equals(VisibilityMode.HIDDEN))
description.add("");
description.add(this.user.getTranslation(Constants.CLICK_TO_TOGGLE));
}
case OPEN_ANYWHERE -> {
description.add(this.user.getTranslation(reference +
(this.settings.isOpenAnywhere() ? Constants.ENABLED_KEY : Constants.DISABLED_KEY)));

icon = new ItemStack(Material.ELYTRA);
clickHandler = (panel, user1, clickType, i) -> {
this.settings.setOpenAnywhere(!this.settings.isOpenAnywhere());
panel.getInventory().setItem(i, this.getSettingsButton(button).getItem());
this.addon.saveSettings();
return true;
};
glow = this.settings.isOpenAnywhere();

description.add("");
description.add(this.user.getTranslation(Constants.CLICK_TO_TOGGLE));
}
default -> {
icon = new ItemStack(Material.PAPER);
clickHandler = null;
Expand DownExpand Up@@ -596,7 +613,11 @@ private enum Button
/**
* This allows to switch between different challenges visibility modes.
*/
VISIBILITY_MODE
VISIBILITY_MODE,
/**
* This allows players to open the GUI without being on their island.
*/
OPEN_ANYWHERE
}


Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/config.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,10 @@ gui-settings:
# TOGGLEABLE - Currently not implemented.
undeployed-view-mode: VISIBLE
#
# Allow players to open the challenges GUI without being on their island.
# Note: Challenges completion still requires being on the island when world protection is enabled.
open-anywhere: false
#
# This allows to change default locked level icon. This option may be
# overwritten by each challenge level. If challenge level has specified
# their locked level icon, then it will be used, instead of this one.
Expand Down
8 changes: 8 additions & 0 deletions src/main/resources/locales/en-US.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -770,6 +770,14 @@ challenges:
<gray>should be counted towards level completion.
enabled: "<dark_green>Enabled"
disabled: "<red>Disabled"
open_anywhere:
name: "<white><bold>Open GUI Anywhere"
description: |-
<gray>Allows players to open the challenges GUI
<gray>from anywhere. Completion still requires
<gray>being on the island when protected.
enabled: "<dark_green>Enabled"
disabled: "<red>Disabled"
download:
name: "<white><bold>Download Libraries"
description: |-
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -247,4 +247,25 @@ void testSetup() {
assertEquals(1, cc.getSubCommands(true).size());
}

@Test
void testCanExecuteOffIslandWithProtectionAndNoOpenAnywhere() {
// Player is off island and world protection is on, but openAnywhere is false
when(im.locationIsOnIsland(any(Player.class), any())).thenReturn(false);
// Note: Since CHALLENGES_WORLD_PROTECTION flag has default setting true,
// and TestWorldSetting.getWorldFlags() returns an empty map by default,
// the flag will check as enabled. We test behavior when it's restricted.
assertFalse(cc.canExecute(user, "challenges", Collections.emptyList()));
verify(user).getTranslation(world, "challenges.errors.not-on-island");
}

@Test
void testCanExecuteOffIslandWithProtectionAndOpenAnywhere() {
// Player is off island but openAnywhere is enabled
when(im.locationIsOnIsland(any(Player.class), any())).thenReturn(false);
Settings settings = (Settings) addon.getChallengesSettings();
settings.setOpenAnywhere(true);
assertTrue(cc.canExecute(user, "challenges", Collections.emptyList()));
verify(user, never()).getTranslation(world, "challenges.errors.not-on-island");
}

}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add setting to open the challenges GUI while off-island by tastybento · Pull Request #407 · BentoBoxWorld/Challenges · GitHub
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,10 +66,11 @@ public boolean canExecute(User user, String label, List<String> args)
Utils.sendMessage(user, this.getWorld(), "general.errors.no-island");
return false;
} else if (ChallengesAddon.CHALLENGES_WORLD_PROTECTION.isSetForWorld(this.getWorld()) &&
!((ChallengesAddon) this.getAddon()).getChallengesSettings().isOpenAnywhere() &&
!this.getIslands().locationIsOnIsland(user.getPlayer(), user.getLocation()))
{
// Do not open gui if player is not on the island, but challenges requires island for
// completion.
// completion, unless open-anywhere is enabled.
Utils.sendMessage(user, this.getWorld(), Constants.ERRORS + "not-on-island");
return false;
}
Expand Down
28 changes: 28 additions & 0 deletions src/main/java/world/bentobox/challenges/config/Settings.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,12 @@ public class Settings implements ConfigObject
@ConfigEntry(path = "gui-settings.undeployed-view-mode")
private VisibilityMode visibilityMode = VisibilityMode.VISIBLE;

@ConfigComment("")
@ConfigComment("Allow players to open the challenges GUI without being on their island.")
@ConfigComment("Note: Challenges completion still requires being on the island when world protection is enabled.")
@ConfigEntry(path = "gui-settings.open-anywhere")
private boolean openAnywhere = false;


@ConfigComment("")
@ConfigComment("This allows to change default locked level icon. This option may be")
Expand DownExpand Up@@ -712,4 +718,26 @@ public void setIncludeUndeployed(boolean includeUndeployed)
{
this.includeUndeployed = includeUndeployed;
}


/**
* Is open anywhere boolean.
*
* @return the boolean
*/
public boolean isOpenAnywhere()
{
return openAnywhere;
}


/**
* Sets open anywhere.
*
* @param openAnywhere whether to allow opening GUI from anywhere
*/
public void setOpenAnywhere(boolean openAnywhere)
{
this.openAnywhere = openAnywhere;
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,7 @@ protected void build()
panelBuilder.item(20, this.getSettingsButton(Button.REMOVE_COMPLETED));
panelBuilder.item(29, this.getSettingsButton(Button.VISIBILITY_MODE));
panelBuilder.item(30, this.getSettingsButton(Button.INCLUDE_UNDEPLOYED));
panelBuilder.item(32, this.getSettingsButton(Button.OPEN_ANYWHERE));

panelBuilder.item(21, this.getSettingsButton(Button.LOCKED_LEVEL_ICON));

Expand DownExpand Up@@ -485,6 +486,22 @@ else if (this.settings.getVisibilityMode().equals(VisibilityMode.HIDDEN))
description.add("");
description.add(this.user.getTranslation(Constants.CLICK_TO_TOGGLE));
}
case OPEN_ANYWHERE -> {
description.add(this.user.getTranslation(reference +
(this.settings.isOpenAnywhere() ? Constants.ENABLED_KEY : Constants.DISABLED_KEY)));

icon = new ItemStack(Material.ELYTRA);
clickHandler = (panel, user1, clickType, i) -> {
this.settings.setOpenAnywhere(!this.settings.isOpenAnywhere());
panel.getInventory().setItem(i, this.getSettingsButton(button).getItem());
this.addon.saveSettings();
return true;
};
glow = this.settings.isOpenAnywhere();

description.add("");
description.add(this.user.getTranslation(Constants.CLICK_TO_TOGGLE));
}
default -> {
icon = new ItemStack(Material.PAPER);
clickHandler = null;
Expand DownExpand Up@@ -596,7 +613,11 @@ private enum Button
/**
* This allows to switch between different challenges visibility modes.
*/
VISIBILITY_MODE
VISIBILITY_MODE,
/**
* This allows players to open the GUI without being on their island.
*/
OPEN_ANYWHERE
}


Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/config.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,10 @@ gui-settings:
# TOGGLEABLE - Currently not implemented.
undeployed-view-mode: VISIBLE
#
# Allow players to open the challenges GUI without being on their island.
# Note: Challenges completion still requires being on the island when world protection is enabled.
open-anywhere: false
#
# This allows to change default locked level icon. This option may be
# overwritten by each challenge level. If challenge level has specified
# their locked level icon, then it will be used, instead of this one.
Expand Down
8 changes: 8 additions & 0 deletions src/main/resources/locales/en-US.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -770,6 +770,14 @@ challenges:
<gray>should be counted towards level completion.
enabled: "<dark_green>Enabled"
disabled: "<red>Disabled"
open_anywhere:
name: "<white><bold>Open GUI Anywhere"
description: |-
<gray>Allows players to open the challenges GUI
<gray>from anywhere. Completion still requires
<gray>being on the island when protected.
enabled: "<dark_green>Enabled"
disabled: "<red>Disabled"
download:
name: "<white><bold>Download Libraries"
description: |-
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -247,4 +247,25 @@ void testSetup() {
assertEquals(1, cc.getSubCommands(true).size());
}

@Test
void testCanExecuteOffIslandWithProtectionAndNoOpenAnywhere() {
// Player is off island and world protection is on, but openAnywhere is false
when(im.locationIsOnIsland(any(Player.class), any())).thenReturn(false);
// Note: Since CHALLENGES_WORLD_PROTECTION flag has default setting true,
// and TestWorldSetting.getWorldFlags() returns an empty map by default,
// the flag will check as enabled. We test behavior when it's restricted.
assertFalse(cc.canExecute(user, "challenges", Collections.emptyList()));
verify(user).getTranslation(world, "challenges.errors.not-on-island");
}

@Test
void testCanExecuteOffIslandWithProtectionAndOpenAnywhere() {
// Player is off island but openAnywhere is enabled
when(im.locationIsOnIsland(any(Player.class), any())).thenReturn(false);
Settings settings = (Settings) addon.getChallengesSettings();
settings.setOpenAnywhere(true);
assertTrue(cc.canExecute(user, "challenges", Collections.emptyList()));
verify(user, never()).getTranslation(world, "challenges.errors.not-on-island");
}

}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Add setting to open the challenges GUI while off-island by tastybento · Pull Request #407 · BentoBoxWorld/Challenges · GitHub
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,10 +66,11 @@ public boolean canExecute(User user, String label, List<String> args)
Utils.sendMessage(user, this.getWorld(), "general.errors.no-island");
return false;
} else if (ChallengesAddon.CHALLENGES_WORLD_PROTECTION.isSetForWorld(this.getWorld()) &&
!((ChallengesAddon) this.getAddon()).getChallengesSettings().isOpenAnywhere() &&
!this.getIslands().locationIsOnIsland(user.getPlayer(), user.getLocation()))
{
// Do not open gui if player is not on the island, but challenges requires island for
// completion.
// completion, unless open-anywhere is enabled.
Utils.sendMessage(user, this.getWorld(), Constants.ERRORS + "not-on-island");
return false;
}
Expand Down
28 changes: 28 additions & 0 deletions src/main/java/world/bentobox/challenges/config/Settings.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,12 @@ public class Settings implements ConfigObject
@ConfigEntry(path = "gui-settings.undeployed-view-mode")
private VisibilityMode visibilityMode = VisibilityMode.VISIBLE;

@ConfigComment("")
@ConfigComment("Allow players to open the challenges GUI without being on their island.")
@ConfigComment("Note: Challenges completion still requires being on the island when world protection is enabled.")
@ConfigEntry(path = "gui-settings.open-anywhere")
private boolean openAnywhere = false;


@ConfigComment("")
@ConfigComment("This allows to change default locked level icon. This option may be")
Expand DownExpand Up@@ -712,4 +718,26 @@ public void setIncludeUndeployed(boolean includeUndeployed)
{
this.includeUndeployed = includeUndeployed;
}


/**
* Is open anywhere boolean.
*
* @return the boolean
*/
public boolean isOpenAnywhere()
{
return openAnywhere;
}


/**
* Sets open anywhere.
*
* @param openAnywhere whether to allow opening GUI from anywhere
*/
public void setOpenAnywhere(boolean openAnywhere)
{
this.openAnywhere = openAnywhere;
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,7 @@ protected void build()
panelBuilder.item(20, this.getSettingsButton(Button.REMOVE_COMPLETED));
panelBuilder.item(29, this.getSettingsButton(Button.VISIBILITY_MODE));
panelBuilder.item(30, this.getSettingsButton(Button.INCLUDE_UNDEPLOYED));
panelBuilder.item(32, this.getSettingsButton(Button.OPEN_ANYWHERE));

panelBuilder.item(21, this.getSettingsButton(Button.LOCKED_LEVEL_ICON));

Expand DownExpand Up@@ -485,6 +486,22 @@ else if (this.settings.getVisibilityMode().equals(VisibilityMode.HIDDEN))
description.add("");
description.add(this.user.getTranslation(Constants.CLICK_TO_TOGGLE));
}
case OPEN_ANYWHERE -> {
description.add(this.user.getTranslation(reference +
(this.settings.isOpenAnywhere() ? Constants.ENABLED_KEY : Constants.DISABLED_KEY)));

icon = new ItemStack(Material.ELYTRA);
clickHandler = (panel, user1, clickType, i) -> {
this.settings.setOpenAnywhere(!this.settings.isOpenAnywhere());
panel.getInventory().setItem(i, this.getSettingsButton(button).getItem());
this.addon.saveSettings();
return true;
};
glow = this.settings.isOpenAnywhere();

description.add("");
description.add(this.user.getTranslation(Constants.CLICK_TO_TOGGLE));
}
default -> {
icon = new ItemStack(Material.PAPER);
clickHandler = null;
Expand DownExpand Up@@ -596,7 +613,11 @@ private enum Button
/**
* This allows to switch between different challenges visibility modes.
*/
VISIBILITY_MODE
VISIBILITY_MODE,
/**
* This allows players to open the GUI without being on their island.
*/
OPEN_ANYWHERE
}


Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/config.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,10 @@ gui-settings:
# TOGGLEABLE - Currently not implemented.
undeployed-view-mode: VISIBLE
#
# Allow players to open the challenges GUI without being on their island.
# Note: Challenges completion still requires being on the island when world protection is enabled.
open-anywhere: false
#
# This allows to change default locked level icon. This option may be
# overwritten by each challenge level. If challenge level has specified
# their locked level icon, then it will be used, instead of this one.
Expand Down
8 changes: 8 additions & 0 deletions src/main/resources/locales/en-US.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -770,6 +770,14 @@ challenges:
<gray>should be counted towards level completion.
enabled: "<dark_green>Enabled"
disabled: "<red>Disabled"
open_anywhere:
name: "<white><bold>Open GUI Anywhere"
description: |-
<gray>Allows players to open the challenges GUI
<gray>from anywhere. Completion still requires
<gray>being on the island when protected.
enabled: "<dark_green>Enabled"
disabled: "<red>Disabled"
download:
name: "<white><bold>Download Libraries"
description: |-
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -247,4 +247,25 @@ void testSetup() {
assertEquals(1, cc.getSubCommands(true).size());
}

@Test
void testCanExecuteOffIslandWithProtectionAndNoOpenAnywhere() {
// Player is off island and world protection is on, but openAnywhere is false
when(im.locationIsOnIsland(any(Player.class), any())).thenReturn(false);
// Note: Since CHALLENGES_WORLD_PROTECTION flag has default setting true,
// and TestWorldSetting.getWorldFlags() returns an empty map by default,
// the flag will check as enabled. We test behavior when it's restricted.
assertFalse(cc.canExecute(user, "challenges", Collections.emptyList()));
verify(user).getTranslation(world, "challenges.errors.not-on-island");
}

@Test
void testCanExecuteOffIslandWithProtectionAndOpenAnywhere() {
// Player is off island but openAnywhere is enabled
when(im.locationIsOnIsland(any(Player.class), any())).thenReturn(false);
Settings settings = (Settings) addon.getChallengesSettings();
settings.setOpenAnywhere(true);
assertTrue(cc.canExecute(user, "challenges", Collections.emptyList()));
verify(user, never()).getTranslation(world, "challenges.errors.not-on-island");
}

}
Loading