Skip to content

fix: if you type /bp now, the latest applied filters are still there (menu doesn't reset anymore) #73

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
Jasupa wants to merge 2 commits into
base: build
Choose a base branch
from
Open

fix: if you type /bp now, the latest applied filters are still there (menu doesn't reset anymore) #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fe6133
fix: if you type /bp now, the latest applied filters are still there …
Jasupa Jan 20, 2026
1f07b25
Merge upstream/build into master
Jasupa Feb 3, 2026
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
55 changes: 26 additions & 29 deletions src/main/java/net/buildtheearth/buildteamtools/modules/ModuleHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
package net.buildtheearth.buildteamtools.modules;
package net.buildtheearth.modules;
Copy link
Collaborator

@Zoriot Zoriot Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, structure change to include the btt namespace so revert this lines
Also fix the imports under that


import com.alpsbte.alpslib.utils.ChatHelper;
import lombok.Getter;
import net.buildtheearth.buildteamtools.BuildTeamTools;
import net.buildtheearth.buildteamtools.utils.io.ConfigPaths;
import net.buildtheearth.BuildTeamTools;
import net.buildtheearth.utils.ChatHelper;
import net.buildtheearth.utils.io.ConfigPaths;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

/**
* @author Noah Husby
Expand Down Expand Up @@ -44,8 +45,11 @@ public void registerModule(Module module) {
* @param modules {@link Module}
*/
public void registerModules(Module @NotNull ... modules) {
for (Module m : modules)
registerModule(m);
for (Module m : modules) {
if (!Objects.requireNonNull(BuildTeamTools.getInstance().getConfig().getList(ConfigPaths.DISABLED_MODULES)).contains(m.getModuleName())) {
Copy link
Collaborator

@Zoriot Zoriot Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert this change, it's unrelated

registerModule(m);
}
}
}

/**
Expand All @@ -60,31 +64,24 @@ public boolean enable(@NotNull Module module, @Nullable CommandSender executor)
if (m.getModuleName().equals(module.getModuleName()) && m.isEnabled())
return false;

if (!module.getModuleName().equals("Common") && BuildTeamTools.getInstance().getConfig()
.getStringList(ConfigPaths.DISABLED_MODULES).stream().anyMatch(module.getModuleName()::equalsIgnoreCase)) {
module.shutdown("This module is disabled in the config.");
} else {
boolean containsDisabledDependencyModule = false;
for (Module m : module.getDependsOnModules())
if (!m.isEnabled()) {
module.checkForModuleDependencies();
containsDisabledDependencyModule = true;
}

try {
if (!containsDisabledDependencyModule)
module.enable();
} catch (Exception ex) {
if (BuildTeamTools.getInstance().isDebug()) {
ChatHelper.logError("An error occurred while enabling the %s Module: %s", ex, module.getModuleName(),
ex.getMessage());
}

module.shutdown(ex.getMessage());
boolean containsDisabledDependencyModule = false;
for (Module m : module.getDependsOnModules())
if (!m.isEnabled()) {
module.checkForModuleDependencies();
containsDisabledDependencyModule = true;
}
}

try {
if (!containsDisabledDependencyModule)
module.enable();
} catch (Exception ex) {
if (BuildTeamTools.getInstance().isDebug()) {
ChatHelper.logError("An error occurred while enabling the %s Module: %s", ex, module.getModuleName(),
ex.getMessage());
}

module.shutdown(ex.getMessage());
}

if (executor != null) {
if (module.isEnabled() && BuildTeamTools.getInstance().isDebug())
Expand Down
15 changes: 11 additions & 4 deletions ...ildtheearth/buildteamtools/modules/miscellaneous/blockpalettegui/BlockPaletteCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,17 @@ public boolean onCommand(CommandSender sender,
sender.sendMessage("This command can only be used by players.");
return true;
}

Player player = (Player) sender;

// /bp or /bp menu ⇒ default filters + open block menu
if (args.length == 0
|| (args.length == 1 && args[0].equalsIgnoreCase("menu"))) {
// /bp ⇒ open block menu with remembered filters (do NOT reset to "color")
if (args.length == 0) {
blockPalletManager.openBlockMenu(player);
return true;
}

// /bp menu ⇒ reset to default filters + open block menu
if (args.length == 1 && args[0].equalsIgnoreCase("menu")) {
blockPalletManager.setPlayerFiltersAndOpen(player);
return true;
}
Expand All @@ -61,7 +67,8 @@ public boolean onCommand(CommandSender sender,
}

// invalid usage ⇒ show help
sender.sendMessage("§cUsage: §7/bp menu\n"
sender.sendMessage("§cUsage: §7/bp\n"
+ "§c or §7/bp menu\n"
+ "§c or §7/bp filter\n"
+ "§c or §7/bp filter <filter1> <filter2> …");
return true;
Expand Down
22 changes: 16 additions & 6 deletions src/main/resources/plugin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
name: BuildTeamTools
main: net.buildtheearth.buildteamtools.BuildTeamTools
Copy link
Collaborator

@Zoriot Zoriot Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert this change. Else it will not work at all

main: net.buildtheearth.BuildTeamTools
api-version: 1.13
version: ${version}
description: ${description}
Comment on lines -4 to -5
Copy link
Collaborator

@Zoriot Zoriot Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert your changes here too, we want to use the version from the build script

version: 0.1.3-alpha
author: MineFact, frikandelworst, George112n, ELgamer, SirJodelstein, Zoriot
softdepend: [WorldEdit, HeadDatabase, PlotSystem-Terra]

Expand All @@ -22,15 +21,26 @@ commands:
warp:
description: Command for managing warps.
usage: /warp <subcommand>
aliases: [ warps, wp ]
warpbt:
aliases: [warps]
warpsbt:
description: Opens the warp menu for the specified BuildTeam
usage: /warpsbt <team>
aliases: [ wbt, wpt, warpsbuildteam, warpsbt ]
aliases: [ wbt ]
kml:
Copy link
Collaborator

@Zoriot Zoriot Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why have this changes been made? Revert them pls

description: kml pasting and parsing
usage: /kml
aliases: [geopoints, geopath, georing, geosurface]
createplot:
description: Creates a new plot for the PlotSystem.
usage: /createplot
permission: plotsystem.createplot
pasteplot:
description: Pastes a plot manually with specific ID
usage: /pasteplot <ID>
permission: plotsystem.pasteplot
plotsystemterra:
description: Sends info about the plugin
usage: /plotsystemterra
Comment on lines +33 to +43
Copy link
Collaborator

@Zoriot Zoriot Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't read this commands, plot system module is currently disabled/no there and we should not register any cmds

blockpalette:
description: Opens the block palette menu.
usage: /blockpalette [filter|menu|filter <filter1> <filter2> ...]
Expand Down
Loading