Prepare 1.0 Release (#287)
* Version 0.8.5
* Retranslated zh-CN.yml (#273)
* 50% completed.
* 60% completed.
* 63% completed.
* Completed.
* Change the indentation, some improvements.
Co-authored-by: zhangYi <apachezy@hotmail.com>
* Updated german language file (#278)
fixed double & and double whitespace
* Fixes a mistaken permission for completing multiple challenges at once.
* Fixes translated placeholders in PL translation.
Note: translation looks bad.
* Update CompleteChallengeCommandTest.java
* Upgrade to BentoBox 1.17 API changes.
Implement Pladdon functionality.
Compile against java 16 and Spigot 1.17
* Fix Java 16 compilation.
* Use BentoBox 1.17.0
* Update pom.xml
* Create Statistic Requirement for Challenges addon.
Statistic requirement is a new type of challenge that is based on Statistic page for clients.
* Switch to annotations instead of plugin.yml file.
* Move managers to a separate directory.
* Add mojang authLib instead of NMS.
* Rename classes to Selectors.
Split single and multiple item selectors for easier implementation.
Update proper locales.
* Implement customizable user panels.
Server owners can customize 3 panels:
- main panel
- gamemode selector
- multiple completions
Panel functions will be explained in docs later.
* Update all admin panels.
Admin panels will not contain better locales codding and easier-to-improve design.
Remove old and unused GUIs.
* Remove unused adapters.
Updates Challenges and ChallengesLevel objects.
Add TypeMigrationAdapter that will fix issue with renamed challenge type.
* Update commands.
Commands will now call correct GUI.
* Update Settings file.
Remove unused parts.
* Fixes ChallengesManager and Completer.
* Adds panel saving to the `/challenges/panels` directory.
* Updates locales file.
Complete rework of the locales file.
Very sorry translators :( no migration.
* Updates pom.xml
* Updates tests.
ChallengesGUITest is removed because GUI is removed.
* Update default.json
Split text into multiple lines.
* Create template YAML file.
This file format is for people who has an alergy with ingame GUI.
* Implements Template reading.
Add template loading via Admin Panel.
Improve LibraryPanel so it could find json and yml files.
* Improve coloring scheme a bit.
* Change settings file.
Add ability to change commands for addon.
Change default mode from player challenges to island challenges.
* Update Main addon class.
Move vault and level detection after everything is loaded.
Update command names.
* Update all commands.
Commands now will have an option to change their call values.
* Update default config value.
* Fixes #264
Challenges Menu will be opened only if player is in correct world.
* Changes User#sendMessage to Utils#sendMessage
This allows add "prefix" to all messages send from Challenges addon.
* Separate singe and multiple listings.
* Clean up Constants a bit.
* Add meta for items translations.
* Fix permission link.
* Translates color codes for database texts.
* Fixes a bug when global commands does not displays in tab-complete.
Remove DefaultsCommand.java as it is not used anymore.
* Fixes small bugs in translation.
* Remove unnecessary "admin" tag.
* Update default locale.
* Update latvian locale to the latest version.
* Implement multi-linguistic server support.
Now server owners can specify different name, description and reward text for each challenge and level via locales file.
Add showcase example.
* Comment out showcase translation.
* Update BentoBox version
* Update missing icons for blocks.
Some blocks cannot be displayed in GUI's, and were leaving empty spaces.
This replaces their icon with a close representative.
Fixes #286
* Add missing mob heads.
* Fixes illegal stack issues in default challenges.
#249
* Change from click-to-select to a proper next/previous page tooltip
* Add search field to the PagedSelectors.
Add missing tooltips.
* Change download icon from hopper to cobweb.
* Add missing tooltips to the CommonPagedPanel
* Add search button to the CommonPagedPanel.
Search button will allow to search elements if there are more than displayed elements.
* Add missing strings into locale.
* Reorder dependencies
The Mojang dependency was blocking out the needed Google common
packages.
* Prevent errors in TryToCompleteTest
Note - tests still fail.
* Fixed errors and tests for CompleteChallengeCommandTest
* Fixed ChallengesCommandTest tests
* Fixes tests
* Fix JavaDoc, Shade plugin settings
* Updated .gitignore
* Try different spigot API version
* Remove Vault repo because it is not needed.
* Excluded unnecessary files from shading.
* Fixes #253
Adds TeamKick and TeamLeave events to the reset check.
Do not reset challenges if data is stored per island. As in that case, they will already lose their data.
* Fixes #187
Add a new method that updates unlocked level list without changing active level. This method returns if last unlocked level was changed, and in that case it triggers whole gui rebuilding.
* Fixes #269
Disable waiver amount message for last challenge level.
* Add timeout for repeatable challenges.
Relates #71
* Implement timeout respecting in challenges completion.
Implement timeout in GUI's.
Relates #71
* Implement changing Timeout in the Challenge Edit GUI.
Relates #71
* Implement an option to set which item type will ignore metadata per challenge.
Fixes #261
Fixes #252
* Fixes failing unit-test
* Removed shade plugin from POM
* Replace GuiUtils and HeadLib to the PanelUtils library.
* Link templates to the docs.
* Remove unnecessary NMS dependency.
NMS code was used for Player Heads, but instead of NMS now it uses public mojang lib.
* Address some code quality reports from SonarCloud.
Most of the errors are just sanity checks, as the most of null-pointers were already checked in other ways.
* Fixes incorrect NEXT and PREVIOUS button descriptions.
Fixes #289
* Implement MetaData ignoring for rewards.
While required items had a metadata grouping, reward items did not have it. This will fix that.
Fixes #289
* Fix an issue when edit menu did not display item amount.
* Update lv translation.
* Fixes some small bugs with translation potion base effect.
There was an issue that it tried to translate extra effects and ignored main one.
Relates to #290
* Fix a bug with completion broadcasting
Reported via Discord.
* Update pom.xml
* Fixes a bug with `-1` repeat-times
There was a bug that prevented the challenge to be completed if negative numbers were set in the "max-repeats" value.
* Improve equal item listing.
Change when items should be grouped.
Instead of relaying strictly from ignoreMetaData set, now try to group equal elements without durability check, and use set only if that fails.
* Update German translation (#295)
* Translate de.yml via GitLocalize
* Translate de.yml via GitLocalize
* Translate de.yml via GitLocalize
Co-authored-by: Patrick <patrick.wassmuth@gmx.de>
Co-authored-by: Michael F <unhappyangel83@googlemail.com>
Co-authored-by: DAge030 <dage030@web.de>
* Fix NPEs when running tests.
Note that there are still test failures, but these are assertions and
not errors.
* Fix error in test class.
Note this does not fix the failing assertion.
* Fix failing test. Make player default to being on island.
* Fixed test failures.
* Avoid potential call with a null parameter to User.getInstance
* Check for null world
* Null check
* Added null check
* Require non-nulls.
getInventory never returns null.
* Remove various code smells.
Co-authored-by: tastybento <tastybento@wasteofplastic.com>
Co-authored-by: apachezy <50116371+apachezy@users.noreply.github.com>
Co-authored-by: zhangYi <apachezy@hotmail.com>
Co-authored-by: Qumoo <76853697+Qumoo@users.noreply.github.com>
Co-authored-by: tastybento <tastybento@users.noreply.github.com>
Co-authored-by: gitlocalize-app[bot] <55277160+gitlocalize-app[bot]@users.noreply.github.com>
Co-authored-by: Patrick <patrick.wassmuth@gmx.de>
Co-authored-by: Michael F <unhappyangel83@googlemail.com>
Co-authored-by: DAge030 <dage030@web.de>
2022-05-06 18:51:54 +02:00
|
|
|
package world.bentobox.challenges.panel.admin;
|
|
|
|
|
|
|
|
|
|
|
|
import java.io.File;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.Arrays;
|
|
|
|
import java.util.Collections;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.function.Consumer;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
import org.bukkit.ChatColor;
|
|
|
|
import org.bukkit.Material;
|
|
|
|
import org.bukkit.event.inventory.InventoryClickEvent;
|
|
|
|
import org.bukkit.event.inventory.InventoryCloseEvent;
|
|
|
|
import org.bukkit.scheduler.BukkitTask;
|
|
|
|
|
|
|
|
import lv.id.bonne.panelutils.PanelUtils;
|
|
|
|
import world.bentobox.bentobox.api.panels.PanelItem;
|
|
|
|
import world.bentobox.bentobox.api.panels.PanelListener;
|
|
|
|
import world.bentobox.bentobox.api.panels.builders.PanelBuilder;
|
|
|
|
import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
|
|
|
|
import world.bentobox.bentobox.api.user.User;
|
|
|
|
import world.bentobox.challenges.panel.CommonPagedPanel;
|
|
|
|
import world.bentobox.challenges.panel.CommonPanel;
|
|
|
|
import world.bentobox.challenges.panel.ConversationUtils;
|
|
|
|
import world.bentobox.challenges.utils.Constants;
|
|
|
|
import world.bentobox.challenges.utils.Utils;
|
|
|
|
import world.bentobox.challenges.web.object.LibraryEntry;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* This class contains all necessary elements to create GUI that lists all challenges.
|
|
|
|
* It allows to edit them or remove, depending on given input mode.
|
|
|
|
*/
|
|
|
|
public class LibraryPanel extends CommonPagedPanel<LibraryEntry>
|
|
|
|
{
|
|
|
|
// ---------------------------------------------------------------------
|
|
|
|
// Section: Constructor
|
|
|
|
// ---------------------------------------------------------------------
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @param parentGUI ParentGUI object.
|
|
|
|
*/
|
|
|
|
private LibraryPanel(CommonPanel parentGUI, Library mode)
|
|
|
|
{
|
|
|
|
super(parentGUI);
|
|
|
|
|
|
|
|
this.mode = mode;
|
|
|
|
|
|
|
|
this.libraryEntries = switch (mode)
|
|
|
|
{
|
|
|
|
case WEB -> this.addon.getWebManager().getLibraryEntries();
|
|
|
|
case DATABASE -> this.generateDatabaseEntries();
|
|
|
|
case TEMPLATE -> this.generateTemplateEntries();
|
|
|
|
};
|
|
|
|
|
|
|
|
this.filterElements = this.libraryEntries;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* This static method allows to easier open Library GUI.
|
|
|
|
* @param parentGui ParentGUI object.
|
|
|
|
* @param mode Library view mode.
|
|
|
|
*/
|
|
|
|
public static void open(CommonPanel parentGui, Library mode)
|
|
|
|
{
|
|
|
|
new LibraryPanel(parentGui, mode).build();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// ---------------------------------------------------------------------
|
|
|
|
// Section: Data Collectors
|
|
|
|
// ---------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* This method generates list of database file entries.
|
|
|
|
*
|
|
|
|
* @return List of entries for database files.
|
|
|
|
*/
|
|
|
|
private List<LibraryEntry> generateDatabaseEntries()
|
|
|
|
{
|
|
|
|
File localeDir = this.addon.getDataFolder();
|
|
|
|
File[] files = localeDir.listFiles(pathname ->
|
|
|
|
pathname.getName().endsWith(".json") && pathname.isFile());
|
|
|
|
|
|
|
|
if (files == null || files.length == 0)
|
|
|
|
{
|
|
|
|
// No
|
|
|
|
return Collections.emptyList();
|
|
|
|
}
|
|
|
|
|
|
|
|
return Arrays.stream(files).
|
|
|
|
map(file -> LibraryEntry.fromTemplate(
|
|
|
|
file.getName().substring(0, file.getName().length() - 5),
|
|
|
|
Material.PAPER)).
|
|
|
|
collect(Collectors.toList());
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* This method generates list of template file entries.
|
|
|
|
*
|
|
|
|
* @return List of entries for template files.
|
|
|
|
*/
|
|
|
|
private List<LibraryEntry> generateTemplateEntries()
|
|
|
|
{
|
|
|
|
File localeDir = this.addon.getDataFolder();
|
|
|
|
File[] files = localeDir.listFiles(pathname ->
|
|
|
|
pathname.getName().endsWith(".yml") &&
|
|
|
|
pathname.isFile() &&
|
|
|
|
!pathname.getName().equals("config.yml"));
|
|
|
|
|
|
|
|
if (files == null || files.length == 0)
|
|
|
|
{
|
|
|
|
// No
|
|
|
|
return Collections.emptyList();
|
|
|
|
}
|
|
|
|
|
|
|
|
return Arrays.stream(files).
|
|
|
|
map(file -> LibraryEntry.fromTemplate(
|
|
|
|
file.getName().substring(0, file.getName().length() - 4),
|
|
|
|
Material.PAPER)).
|
|
|
|
collect(Collectors.toList());
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// ---------------------------------------------------------------------
|
|
|
|
// Section: Methods
|
|
|
|
// ---------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* This method is called when filter value is updated.
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
protected void updateFilters()
|
|
|
|
{
|
|
|
|
if (this.searchString == null || this.searchString.isBlank())
|
|
|
|
{
|
|
|
|
this.filterElements = this.libraryEntries;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
this.filterElements = this.libraryEntries.stream().
|
|
|
|
filter(element -> {
|
|
|
|
// If element name is set and name contains search field, then do not filter out.
|
|
|
|
return element.name().toLowerCase().contains(this.searchString.toLowerCase()) ||
|
|
|
|
element.author().toLowerCase().contains(this.searchString.toLowerCase()) ||
|
|
|
|
element.gameMode().toLowerCase().contains(this.searchString.toLowerCase()) ||
|
|
|
|
element.language().toLowerCase().contains(this.searchString.toLowerCase());
|
|
|
|
}).
|
|
|
|
distinct().
|
|
|
|
collect(Collectors.toList());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* {@inheritDoc}
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
protected void build()
|
|
|
|
{
|
|
|
|
if (this.libraryEntries.isEmpty())
|
|
|
|
{
|
2023-04-15 21:55:34 +02:00
|
|
|
Utils.sendMessage(this.user,
|
|
|
|
this.world,
|
|
|
|
Constants.ERRORS + "no-library-entries");
|
Prepare 1.0 Release (#287)
* Version 0.8.5
* Retranslated zh-CN.yml (#273)
* 50% completed.
* 60% completed.
* 63% completed.
* Completed.
* Change the indentation, some improvements.
Co-authored-by: zhangYi <apachezy@hotmail.com>
* Updated german language file (#278)
fixed double & and double whitespace
* Fixes a mistaken permission for completing multiple challenges at once.
* Fixes translated placeholders in PL translation.
Note: translation looks bad.
* Update CompleteChallengeCommandTest.java
* Upgrade to BentoBox 1.17 API changes.
Implement Pladdon functionality.
Compile against java 16 and Spigot 1.17
* Fix Java 16 compilation.
* Use BentoBox 1.17.0
* Update pom.xml
* Create Statistic Requirement for Challenges addon.
Statistic requirement is a new type of challenge that is based on Statistic page for clients.
* Switch to annotations instead of plugin.yml file.
* Move managers to a separate directory.
* Add mojang authLib instead of NMS.
* Rename classes to Selectors.
Split single and multiple item selectors for easier implementation.
Update proper locales.
* Implement customizable user panels.
Server owners can customize 3 panels:
- main panel
- gamemode selector
- multiple completions
Panel functions will be explained in docs later.
* Update all admin panels.
Admin panels will not contain better locales codding and easier-to-improve design.
Remove old and unused GUIs.
* Remove unused adapters.
Updates Challenges and ChallengesLevel objects.
Add TypeMigrationAdapter that will fix issue with renamed challenge type.
* Update commands.
Commands will now call correct GUI.
* Update Settings file.
Remove unused parts.
* Fixes ChallengesManager and Completer.
* Adds panel saving to the `/challenges/panels` directory.
* Updates locales file.
Complete rework of the locales file.
Very sorry translators :( no migration.
* Updates pom.xml
* Updates tests.
ChallengesGUITest is removed because GUI is removed.
* Update default.json
Split text into multiple lines.
* Create template YAML file.
This file format is for people who has an alergy with ingame GUI.
* Implements Template reading.
Add template loading via Admin Panel.
Improve LibraryPanel so it could find json and yml files.
* Improve coloring scheme a bit.
* Change settings file.
Add ability to change commands for addon.
Change default mode from player challenges to island challenges.
* Update Main addon class.
Move vault and level detection after everything is loaded.
Update command names.
* Update all commands.
Commands now will have an option to change their call values.
* Update default config value.
* Fixes #264
Challenges Menu will be opened only if player is in correct world.
* Changes User#sendMessage to Utils#sendMessage
This allows add "prefix" to all messages send from Challenges addon.
* Separate singe and multiple listings.
* Clean up Constants a bit.
* Add meta for items translations.
* Fix permission link.
* Translates color codes for database texts.
* Fixes a bug when global commands does not displays in tab-complete.
Remove DefaultsCommand.java as it is not used anymore.
* Fixes small bugs in translation.
* Remove unnecessary "admin" tag.
* Update default locale.
* Update latvian locale to the latest version.
* Implement multi-linguistic server support.
Now server owners can specify different name, description and reward text for each challenge and level via locales file.
Add showcase example.
* Comment out showcase translation.
* Update BentoBox version
* Update missing icons for blocks.
Some blocks cannot be displayed in GUI's, and were leaving empty spaces.
This replaces their icon with a close representative.
Fixes #286
* Add missing mob heads.
* Fixes illegal stack issues in default challenges.
#249
* Change from click-to-select to a proper next/previous page tooltip
* Add search field to the PagedSelectors.
Add missing tooltips.
* Change download icon from hopper to cobweb.
* Add missing tooltips to the CommonPagedPanel
* Add search button to the CommonPagedPanel.
Search button will allow to search elements if there are more than displayed elements.
* Add missing strings into locale.
* Reorder dependencies
The Mojang dependency was blocking out the needed Google common
packages.
* Prevent errors in TryToCompleteTest
Note - tests still fail.
* Fixed errors and tests for CompleteChallengeCommandTest
* Fixed ChallengesCommandTest tests
* Fixes tests
* Fix JavaDoc, Shade plugin settings
* Updated .gitignore
* Try different spigot API version
* Remove Vault repo because it is not needed.
* Excluded unnecessary files from shading.
* Fixes #253
Adds TeamKick and TeamLeave events to the reset check.
Do not reset challenges if data is stored per island. As in that case, they will already lose their data.
* Fixes #187
Add a new method that updates unlocked level list without changing active level. This method returns if last unlocked level was changed, and in that case it triggers whole gui rebuilding.
* Fixes #269
Disable waiver amount message for last challenge level.
* Add timeout for repeatable challenges.
Relates #71
* Implement timeout respecting in challenges completion.
Implement timeout in GUI's.
Relates #71
* Implement changing Timeout in the Challenge Edit GUI.
Relates #71
* Implement an option to set which item type will ignore metadata per challenge.
Fixes #261
Fixes #252
* Fixes failing unit-test
* Removed shade plugin from POM
* Replace GuiUtils and HeadLib to the PanelUtils library.
* Link templates to the docs.
* Remove unnecessary NMS dependency.
NMS code was used for Player Heads, but instead of NMS now it uses public mojang lib.
* Address some code quality reports from SonarCloud.
Most of the errors are just sanity checks, as the most of null-pointers were already checked in other ways.
* Fixes incorrect NEXT and PREVIOUS button descriptions.
Fixes #289
* Implement MetaData ignoring for rewards.
While required items had a metadata grouping, reward items did not have it. This will fix that.
Fixes #289
* Fix an issue when edit menu did not display item amount.
* Update lv translation.
* Fixes some small bugs with translation potion base effect.
There was an issue that it tried to translate extra effects and ignored main one.
Relates to #290
* Fix a bug with completion broadcasting
Reported via Discord.
* Update pom.xml
* Fixes a bug with `-1` repeat-times
There was a bug that prevented the challenge to be completed if negative numbers were set in the "max-repeats" value.
* Improve equal item listing.
Change when items should be grouped.
Instead of relaying strictly from ignoreMetaData set, now try to group equal elements without durability check, and use set only if that fails.
* Update German translation (#295)
* Translate de.yml via GitLocalize
* Translate de.yml via GitLocalize
* Translate de.yml via GitLocalize
Co-authored-by: Patrick <patrick.wassmuth@gmx.de>
Co-authored-by: Michael F <unhappyangel83@googlemail.com>
Co-authored-by: DAge030 <dage030@web.de>
* Fix NPEs when running tests.
Note that there are still test failures, but these are assertions and
not errors.
* Fix error in test class.
Note this does not fix the failing assertion.
* Fix failing test. Make player default to being on island.
* Fixed test failures.
* Avoid potential call with a null parameter to User.getInstance
* Check for null world
* Null check
* Added null check
* Require non-nulls.
getInventory never returns null.
* Remove various code smells.
Co-authored-by: tastybento <tastybento@wasteofplastic.com>
Co-authored-by: apachezy <50116371+apachezy@users.noreply.github.com>
Co-authored-by: zhangYi <apachezy@hotmail.com>
Co-authored-by: Qumoo <76853697+Qumoo@users.noreply.github.com>
Co-authored-by: tastybento <tastybento@users.noreply.github.com>
Co-authored-by: gitlocalize-app[bot] <55277160+gitlocalize-app[bot]@users.noreply.github.com>
Co-authored-by: Patrick <patrick.wassmuth@gmx.de>
Co-authored-by: Michael F <unhappyangel83@googlemail.com>
Co-authored-by: DAge030 <dage030@web.de>
2022-05-06 18:51:54 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// No point to display. Single element.
|
|
|
|
if (this.libraryEntries.size() == 1 && !this.mode.equals(Library.WEB))
|
|
|
|
{
|
|
|
|
this.generateConfirmationInput(this.libraryEntries.get(0));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
PanelBuilder panelBuilder = new PanelBuilder().user(this.user).name(
|
|
|
|
this.user.getTranslation(Constants.TITLE + "library"));
|
|
|
|
|
|
|
|
PanelUtils.fillBorder(panelBuilder);
|
|
|
|
|
|
|
|
this.populateElements(panelBuilder, this.filterElements);
|
|
|
|
|
|
|
|
if (this.mode == Library.WEB)
|
|
|
|
{
|
|
|
|
panelBuilder.item(4, this.createDownloadNow());
|
|
|
|
}
|
|
|
|
|
|
|
|
panelBuilder.item(44, this.returnButton);
|
|
|
|
|
|
|
|
panelBuilder.listener(new DownloadCanceller());
|
|
|
|
|
|
|
|
panelBuilder.build();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* This creates download now button, that can skip waiting for automatic request.
|
|
|
|
* @return PanelItem button that allows to manually download libraries.
|
|
|
|
*/
|
|
|
|
private PanelItem createDownloadNow()
|
|
|
|
{
|
|
|
|
final String reference = Constants.BUTTON + "download.";
|
|
|
|
|
|
|
|
final List<String> description = new ArrayList<>(3);
|
|
|
|
description.add(this.user.getTranslation(reference + "description"));
|
|
|
|
description.add(this.user.getTranslation(reference +
|
|
|
|
(this.clearCache ? "enabled" : "disabled")));
|
|
|
|
|
|
|
|
description.add("");
|
|
|
|
description.add(this.user.getTranslation(Constants.TIPS + "left-click-to-download"));
|
|
|
|
description.add(this.user.getTranslation(Constants.TIPS + "right-click-to-toggle"));
|
|
|
|
|
|
|
|
PanelItemBuilder itemBuilder = new PanelItemBuilder().
|
|
|
|
name(this.user.getTranslation(reference + "name")).
|
|
|
|
description(description).
|
|
|
|
icon(Material.COBWEB).
|
|
|
|
glow(this.clearCache);
|
|
|
|
|
|
|
|
itemBuilder.clickHandler((panel, user1, clickType, slot) ->
|
|
|
|
{
|
|
|
|
if (clickType.isRightClick())
|
|
|
|
{
|
|
|
|
this.clearCache = !this.clearCache;
|
|
|
|
panel.getInventory().setItem(slot, this.createDownloadNow().getItem());
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
this.addon.getWebManager().requestCatalogGitHubData(this.clearCache);
|
|
|
|
|
|
|
|
// Fix multiclick issue.
|
|
|
|
if (this.updateTask != null)
|
|
|
|
{
|
|
|
|
this.updateTask.cancel();
|
|
|
|
}
|
|
|
|
|
|
|
|
// add some delay to rebuilding gui.
|
|
|
|
this.updateTask = this.addon.getPlugin().getServer().getScheduler().runTaskLater(
|
|
|
|
this.addon.getPlugin(),
|
|
|
|
this::build,
|
|
|
|
100L);
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
});
|
|
|
|
|
|
|
|
return itemBuilder.build();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* This method creates button for given library entry.
|
|
|
|
* @param libraryEntry LibraryEntry which button must be created.
|
|
|
|
* @return Entry button.
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
protected PanelItem createElementButton(LibraryEntry libraryEntry)
|
|
|
|
{
|
|
|
|
PanelItemBuilder itemBuilder = new PanelItemBuilder().
|
|
|
|
name(ChatColor.translateAlternateColorCodes('&', libraryEntry.name())).
|
|
|
|
description(this.generateEntryDescription(libraryEntry)).
|
|
|
|
description("").
|
|
|
|
description(this.user.getTranslation(Constants.TIPS + "click-to-install")).
|
|
|
|
icon(libraryEntry.icon()).
|
|
|
|
glow(false);
|
|
|
|
|
|
|
|
itemBuilder.clickHandler((panel, user1, clickType, i) -> {
|
|
|
|
this.generateConfirmationInput(libraryEntry);
|
|
|
|
return true;
|
|
|
|
});
|
|
|
|
|
|
|
|
return itemBuilder.build();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* This method generates consumer and calls ConversationAPI for confirmation that processes file downloading,
|
|
|
|
* importing and gui opening or closing.
|
|
|
|
*
|
|
|
|
* @param libraryEntry Entry that must be processed.
|
|
|
|
*/
|
|
|
|
private void generateConfirmationInput(LibraryEntry libraryEntry)
|
|
|
|
{
|
|
|
|
Consumer<Boolean> consumer = value ->
|
|
|
|
{
|
|
|
|
if (value)
|
|
|
|
{
|
|
|
|
switch (this.mode)
|
|
|
|
{
|
|
|
|
case TEMPLATE -> {
|
|
|
|
this.addon.getImportManager().importFile(this.user,
|
|
|
|
this.world,
|
|
|
|
libraryEntry.name());
|
|
|
|
|
|
|
|
CommonPanel.reopen(this.parentPanel != null ? this.parentPanel : this);
|
|
|
|
}
|
|
|
|
case DATABASE -> {
|
|
|
|
this.addon.getImportManager().importDatabaseFile(this.user,
|
|
|
|
this.world,
|
|
|
|
libraryEntry.name());
|
|
|
|
|
|
|
|
CommonPanel.reopen(this.parentPanel != null ? this.parentPanel : this);
|
|
|
|
}
|
|
|
|
case WEB -> {
|
|
|
|
if (!this.blockedForDownland)
|
|
|
|
{
|
|
|
|
this.blockedForDownland = true;
|
|
|
|
|
2023-04-15 21:55:34 +02:00
|
|
|
Utils.sendMessage(this.user,
|
|
|
|
this.world,
|
|
|
|
Constants.MESSAGES + "start-downloading");
|
Prepare 1.0 Release (#287)
* Version 0.8.5
* Retranslated zh-CN.yml (#273)
* 50% completed.
* 60% completed.
* 63% completed.
* Completed.
* Change the indentation, some improvements.
Co-authored-by: zhangYi <apachezy@hotmail.com>
* Updated german language file (#278)
fixed double & and double whitespace
* Fixes a mistaken permission for completing multiple challenges at once.
* Fixes translated placeholders in PL translation.
Note: translation looks bad.
* Update CompleteChallengeCommandTest.java
* Upgrade to BentoBox 1.17 API changes.
Implement Pladdon functionality.
Compile against java 16 and Spigot 1.17
* Fix Java 16 compilation.
* Use BentoBox 1.17.0
* Update pom.xml
* Create Statistic Requirement for Challenges addon.
Statistic requirement is a new type of challenge that is based on Statistic page for clients.
* Switch to annotations instead of plugin.yml file.
* Move managers to a separate directory.
* Add mojang authLib instead of NMS.
* Rename classes to Selectors.
Split single and multiple item selectors for easier implementation.
Update proper locales.
* Implement customizable user panels.
Server owners can customize 3 panels:
- main panel
- gamemode selector
- multiple completions
Panel functions will be explained in docs later.
* Update all admin panels.
Admin panels will not contain better locales codding and easier-to-improve design.
Remove old and unused GUIs.
* Remove unused adapters.
Updates Challenges and ChallengesLevel objects.
Add TypeMigrationAdapter that will fix issue with renamed challenge type.
* Update commands.
Commands will now call correct GUI.
* Update Settings file.
Remove unused parts.
* Fixes ChallengesManager and Completer.
* Adds panel saving to the `/challenges/panels` directory.
* Updates locales file.
Complete rework of the locales file.
Very sorry translators :( no migration.
* Updates pom.xml
* Updates tests.
ChallengesGUITest is removed because GUI is removed.
* Update default.json
Split text into multiple lines.
* Create template YAML file.
This file format is for people who has an alergy with ingame GUI.
* Implements Template reading.
Add template loading via Admin Panel.
Improve LibraryPanel so it could find json and yml files.
* Improve coloring scheme a bit.
* Change settings file.
Add ability to change commands for addon.
Change default mode from player challenges to island challenges.
* Update Main addon class.
Move vault and level detection after everything is loaded.
Update command names.
* Update all commands.
Commands now will have an option to change their call values.
* Update default config value.
* Fixes #264
Challenges Menu will be opened only if player is in correct world.
* Changes User#sendMessage to Utils#sendMessage
This allows add "prefix" to all messages send from Challenges addon.
* Separate singe and multiple listings.
* Clean up Constants a bit.
* Add meta for items translations.
* Fix permission link.
* Translates color codes for database texts.
* Fixes a bug when global commands does not displays in tab-complete.
Remove DefaultsCommand.java as it is not used anymore.
* Fixes small bugs in translation.
* Remove unnecessary "admin" tag.
* Update default locale.
* Update latvian locale to the latest version.
* Implement multi-linguistic server support.
Now server owners can specify different name, description and reward text for each challenge and level via locales file.
Add showcase example.
* Comment out showcase translation.
* Update BentoBox version
* Update missing icons for blocks.
Some blocks cannot be displayed in GUI's, and were leaving empty spaces.
This replaces their icon with a close representative.
Fixes #286
* Add missing mob heads.
* Fixes illegal stack issues in default challenges.
#249
* Change from click-to-select to a proper next/previous page tooltip
* Add search field to the PagedSelectors.
Add missing tooltips.
* Change download icon from hopper to cobweb.
* Add missing tooltips to the CommonPagedPanel
* Add search button to the CommonPagedPanel.
Search button will allow to search elements if there are more than displayed elements.
* Add missing strings into locale.
* Reorder dependencies
The Mojang dependency was blocking out the needed Google common
packages.
* Prevent errors in TryToCompleteTest
Note - tests still fail.
* Fixed errors and tests for CompleteChallengeCommandTest
* Fixed ChallengesCommandTest tests
* Fixes tests
* Fix JavaDoc, Shade plugin settings
* Updated .gitignore
* Try different spigot API version
* Remove Vault repo because it is not needed.
* Excluded unnecessary files from shading.
* Fixes #253
Adds TeamKick and TeamLeave events to the reset check.
Do not reset challenges if data is stored per island. As in that case, they will already lose their data.
* Fixes #187
Add a new method that updates unlocked level list without changing active level. This method returns if last unlocked level was changed, and in that case it triggers whole gui rebuilding.
* Fixes #269
Disable waiver amount message for last challenge level.
* Add timeout for repeatable challenges.
Relates #71
* Implement timeout respecting in challenges completion.
Implement timeout in GUI's.
Relates #71
* Implement changing Timeout in the Challenge Edit GUI.
Relates #71
* Implement an option to set which item type will ignore metadata per challenge.
Fixes #261
Fixes #252
* Fixes failing unit-test
* Removed shade plugin from POM
* Replace GuiUtils and HeadLib to the PanelUtils library.
* Link templates to the docs.
* Remove unnecessary NMS dependency.
NMS code was used for Player Heads, but instead of NMS now it uses public mojang lib.
* Address some code quality reports from SonarCloud.
Most of the errors are just sanity checks, as the most of null-pointers were already checked in other ways.
* Fixes incorrect NEXT and PREVIOUS button descriptions.
Fixes #289
* Implement MetaData ignoring for rewards.
While required items had a metadata grouping, reward items did not have it. This will fix that.
Fixes #289
* Fix an issue when edit menu did not display item amount.
* Update lv translation.
* Fixes some small bugs with translation potion base effect.
There was an issue that it tried to translate extra effects and ignored main one.
Relates to #290
* Fix a bug with completion broadcasting
Reported via Discord.
* Update pom.xml
* Fixes a bug with `-1` repeat-times
There was a bug that prevented the challenge to be completed if negative numbers were set in the "max-repeats" value.
* Improve equal item listing.
Change when items should be grouped.
Instead of relaying strictly from ignoreMetaData set, now try to group equal elements without durability check, and use set only if that fails.
* Update German translation (#295)
* Translate de.yml via GitLocalize
* Translate de.yml via GitLocalize
* Translate de.yml via GitLocalize
Co-authored-by: Patrick <patrick.wassmuth@gmx.de>
Co-authored-by: Michael F <unhappyangel83@googlemail.com>
Co-authored-by: DAge030 <dage030@web.de>
* Fix NPEs when running tests.
Note that there are still test failures, but these are assertions and
not errors.
* Fix error in test class.
Note this does not fix the failing assertion.
* Fix failing test. Make player default to being on island.
* Fixed test failures.
* Avoid potential call with a null parameter to User.getInstance
* Check for null world
* Null check
* Added null check
* Require non-nulls.
getInventory never returns null.
* Remove various code smells.
Co-authored-by: tastybento <tastybento@wasteofplastic.com>
Co-authored-by: apachezy <50116371+apachezy@users.noreply.github.com>
Co-authored-by: zhangYi <apachezy@hotmail.com>
Co-authored-by: Qumoo <76853697+Qumoo@users.noreply.github.com>
Co-authored-by: tastybento <tastybento@users.noreply.github.com>
Co-authored-by: gitlocalize-app[bot] <55277160+gitlocalize-app[bot]@users.noreply.github.com>
Co-authored-by: Patrick <patrick.wassmuth@gmx.de>
Co-authored-by: Michael F <unhappyangel83@googlemail.com>
Co-authored-by: DAge030 <dage030@web.de>
2022-05-06 18:51:54 +02:00
|
|
|
|
|
|
|
// Run download task after 5 ticks.
|
|
|
|
this.updateTask = this.addon.getPlugin().getServer().getScheduler().
|
|
|
|
runTaskLaterAsynchronously(
|
|
|
|
this.addon.getPlugin(),
|
|
|
|
() -> this.addon.getWebManager().requestEntryGitHubData(this.user,
|
|
|
|
this.world,
|
|
|
|
libraryEntry),
|
|
|
|
5L);
|
|
|
|
}
|
|
|
|
|
|
|
|
CommonPanel.reopen(this.parentPanel != null ? this.parentPanel : this);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (this.mode.equals(Library.WEB) || this.libraryEntries.size() > 1)
|
|
|
|
{
|
|
|
|
this.build();
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
ConversationUtils.createConfirmation(
|
|
|
|
consumer,
|
|
|
|
this.user,
|
|
|
|
this.user.getTranslation(Constants.CONVERSATIONS + "confirm-data-replacement",
|
|
|
|
Constants.PARAMETER_GAMEMODE, Utils.getGameMode(this.world)),
|
|
|
|
this.user.getTranslation(Constants.CONVERSATIONS + "new-challenges-imported",
|
|
|
|
Constants.PARAMETER_GAMEMODE, Utils.getGameMode(this.world)));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* This method generated description for LibraryEntry object.
|
|
|
|
* @param entry LibraryEntry object which description must be generated.
|
|
|
|
* @return List of strings that will be placed in ItemStack lore message.
|
|
|
|
*/
|
|
|
|
private List<String> generateEntryDescription(LibraryEntry entry)
|
|
|
|
{
|
|
|
|
final String reference = Constants.DESCRIPTIONS + "library.";
|
|
|
|
|
|
|
|
List<String> description = new ArrayList<>();
|
|
|
|
|
|
|
|
description.add(this.user.getTranslation(reference + "author",
|
|
|
|
"[author]", entry.author()));
|
|
|
|
description.add(entry.description());
|
|
|
|
|
|
|
|
description.add(this.user.getTranslation(reference + "gamemode",
|
|
|
|
"[gamemode]", entry.gameMode()));
|
|
|
|
description.add(this.user.getTranslation(reference + "lang",
|
|
|
|
"[lang]", entry.language()));
|
|
|
|
description.add(this.user.getTranslation(reference + "version",
|
|
|
|
"[version]", entry.version()));
|
|
|
|
|
|
|
|
return description;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* This class allows changing icon for Generator Tier
|
|
|
|
*/
|
|
|
|
private class DownloadCanceller implements PanelListener
|
|
|
|
{
|
|
|
|
/**
|
|
|
|
* On inventory click.
|
|
|
|
*
|
|
|
|
* @param user the user
|
|
|
|
* @param event the event
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
public void onInventoryClick(User user, InventoryClickEvent event)
|
|
|
|
{
|
|
|
|
// do nothing
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* On inventory close.
|
|
|
|
*
|
|
|
|
* @param event the event
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
public void onInventoryClose(InventoryCloseEvent event)
|
|
|
|
{
|
|
|
|
if (LibraryPanel.this.updateTask != null)
|
|
|
|
{
|
|
|
|
LibraryPanel.this.updateTask.cancel();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Setup current listener.
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
public void setup()
|
|
|
|
{
|
|
|
|
// Do nothing
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Enum that holds different view modes for current panel.
|
|
|
|
*/
|
|
|
|
public enum Library
|
|
|
|
{
|
|
|
|
/**
|
|
|
|
* Mode for templates available in main folder.
|
|
|
|
*/
|
|
|
|
TEMPLATE,
|
|
|
|
/**
|
|
|
|
* Mode for database files available in main folder.
|
|
|
|
*/
|
|
|
|
DATABASE,
|
|
|
|
/**
|
|
|
|
* Mode for web library.
|
|
|
|
*/
|
|
|
|
WEB
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// ---------------------------------------------------------------------
|
|
|
|
// Section: Instance Variables
|
|
|
|
// ---------------------------------------------------------------------
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Indicates if download now button should trigger cache clearing.
|
|
|
|
*/
|
|
|
|
private boolean clearCache;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Stores update task that is triggered.
|
|
|
|
*/
|
|
|
|
private BukkitTask updateTask = null;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* This variable will protect against spam-click.
|
|
|
|
*/
|
|
|
|
private boolean blockedForDownland;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Stores active library that must be searched.
|
|
|
|
*/
|
|
|
|
private final Library mode;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* List of library elements.
|
|
|
|
*/
|
|
|
|
private final List<LibraryEntry> libraryEntries;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Stores filtered items.
|
|
|
|
*/
|
|
|
|
private List<LibraryEntry> filterElements;
|
|
|
|
}
|