Release 1.5.0 #370

tastybento · 2025-02-07T15:47:28Z

This PR introduces improvements related to challenge tracking and completion logic, adding the ability to set up Island Range challenges that will complete based on block groups, e.g., 20 of any coral, entity groups, e.g., all undead, or challenges that have multiple statistics, e.g., kill 10 skeletons and kill 10 creepers.

Key Updates

Other Updates

The English text was reviewed and adjusted and formatted.
Icons for entities and statistics were added.

Statistic Challenges

More than one statistic can be required to complete a challenge. If more than one is set, all statistics have to be met in order for the challenge to be completed.

Block Groups and Entity Groups

For Island Challenges, these can be used. This allows challenges to be less specific and more general.

Update en-US.yml

Add tags

Reduce code duplication by abstracting classes

This enables things like a challenge to kill 10 creepers, 10 zombies, and 10 skeletons.

Enable challenges to have multiple statistic requirements

Better icons for entities

tastybento · 2025-02-10T22:02:59Z

src/main/java/world/bentobox/challenges/database/object/requirements/StatisticRequirements.java

-    public StatisticRequirements()
-    {
-        // Empty constructor
+    public record StatisticRec(@Expose Statistic statistic, @Expose EntityType entity, @Expose Material material,


Added a new record that contains all the data for a Statistic challenge.

tastybento · 2025-02-10T22:04:00Z

src/main/java/world/bentobox/challenges/database/object/requirements/StatisticRequirements.java

-// Section: Getters and setters
-// ---------------------------------------------------------------------
-
+    @Expose


This entry is not removed to keep backward compatibility, however, it is never read directly by the code and instead is used when requesting the List of statistics.

tastybento · 2025-02-10T22:04:37Z

src/main/java/world/bentobox/challenges/database/object/requirements/StatisticRequirements.java

-    {
-        return material;
-    }
+    private List<StatisticRec> statisticList;


This is the new Statistics list.

tastybento · 2025-02-10T22:09:14Z

src/main/java/world/bentobox/challenges/panel/CommonPanel.java

+        return tags;
+    }
+
+    private String getEntityTypeTagsDescription(IslandRequirements requirement, String reference) {


Entity Tags description

tastybento · 2025-02-10T22:12:33Z

src/main/java/world/bentobox/challenges/panel/util/MultiEntitySelector.java

-	 * Stores filtered items.
-	 */
-	private List<EntityType> filterElements;
+public class MultiEntitySelector extends UnifiedMultiSelector<EntityType> {


Added more abstraction to reduce code duplication

tastybento · 2025-02-10T22:13:50Z

src/main/java/world/bentobox/challenges/panel/util/StatisticSelector.java

-				return true;
-			}).
-			build();
+                icon(ManageStatisticsPanel.getStatisticIcon(statistic)).description(description)


Use the new Statistic icons instead of just paper.

tastybento · 2025-02-10T22:16:09Z

src/main/java/world/bentobox/challenges/tasks/TryToComplete.java

-            case STATISTIC_TYPE -> {
-                StatisticRequirements requirements = this.challenge.getRequirements();
+        }
+        case STATISTIC_TYPE -> {


The main change in this class is here where multiple stats are checked instead of just the one.

tastybento · 2025-02-10T22:17:00Z

src/main/java/world/bentobox/challenges/database/object/requirements/IslandRequirements.java

+    private Map<Material, Integer> requiredBlocks = new EnumMap<>(Material.class);
+
+    @Expose
+    private Map<Tag<Material>, Integer> requiredMaterialTags = new HashMap<>();


New block tags added

tastybento · 2025-02-10T22:17:42Z

src/main/java/world/bentobox/challenges/database/object/requirements/IslandRequirements.java

+    @Expose
+    private Map<Tag<Material>, Integer> requiredMaterialTags = new HashMap<>();
+    @Expose
+    private Map<Tag<Fluid>, Integer> requiredFluidTags = new HashMap<>();


New fluid tag map added, but this is not used right now. Could be used in the future maybe.

tastybento · 2025-02-10T22:18:05Z

src/main/java/world/bentobox/challenges/database/object/requirements/IslandRequirements.java

+    private Map<Tag<Material>, Integer> requiredMaterialTags = new HashMap<>();
+    @Expose
+    private Map<Tag<Fluid>, Integer> requiredFluidTags = new HashMap<>();
+    @Expose


Entity group map added

tastybento · 2025-02-10T22:18:52Z

src/main/java/world/bentobox/challenges/panel/util/MultiBlockSelector.java

-	 * Stores filtered items.
-	 */
-	private List<Material> filterElements;
+public class MultiBlockSelector extends UnifiedMultiSelector<Material> {


Shrunk down by using Abstract class to reduce code duplication.

tastybento · 2025-02-10T22:42:43Z

src/main/java/world/bentobox/challenges/panel/util/SingleEntitySelector.java

+     * @param et entity type
+     * @return ItemStack
+     */
+    public static ItemStack getIcon(EntityType et) {


Small method for entity icons. A big better than just eggs.

tastybento · 2025-02-11T07:46:03Z

Hi @BONNe - this is just FYI - I am sure you are busy. Please feel free to try the SNAPSHOT. I am working on a couple of other additions, but I'd like to get this one out soon. I made the changes to support some of the challenges I want for Poseidon. I plan to put the Poseidon challenges on the web so they can be downloaded too.

Enables per-player permission waivers.

Add permission [gamemode].challenges.waiver-add.x to addon

The admin may want to hide the rewards and just use the reward description. If the number of rewards is very long, it can be a problem to list them all.

Add switch to hide reward items from the GUI list.

Added a PAPI formula option to Other challenge types.

Enables giving rewards for advancements or combining them into a challenge.

Adds Advancements as an option to the Other challenges

Add string comparison for PAPI placeholders #366

sonarqubecloud · 2025-02-15T04:10:45Z

Quality Gate failed

Failed conditions
12.9% Duplication on New Code (required ≤ 3%)

See analysis details on SonarQube Cloud

tastybento added 27 commits February 2, 2025 08:45

Version 1.5.0

a65b1ec

Added support for Block Groups, AKA Material Tags

a969008

Added entity groups. Still a lot of bugs but it basically works.

88a5cee

Fixed/improved the challenge requirements list

a06dfd7

Fix list of entity groups in remove icon

63b7af8

Update en-US.yml

1230869

Merge pull request #369 from BentoBoxWorld/tastybento-patch-1

5136334

Update en-US.yml

Remove items already selected in the tags chooser. Remove debug.

3859260

Reorg imports

a6f2dc0

Refactor to remove duplicate code

25dca4c

Bug fixes

8cddb62

Add NPE protection

435764a

Tighten up minimum dependencies

c3397a1

Merge pull request #368 from BentoBoxWorld/add_tags

7935c62

Add tags

Version 1.5.0

93f7fd1

Reduce code duplication by abstracting classes

b5a9296

Fix error with Mode - now the enum is correctly shared

f88d5a8

Fix placeholders

fb69058

Merge pull request #371 from BentoBoxWorld/dupe_reduction

cf4dcaf

Reduce code duplication by abstracting classes

Enable challenges to have multiple statistic requirements

c5334ac

This enables things like a challenge to kill 10 creepers, 10 zombies, and 10 skeletons.

Reduce duplication in the constructor

b63838f

Remove unused enums and todo comment

183368b

Merge pull request #372 from BentoBoxWorld/multi_statistics

0bd1c79

Enable challenges to have multiple statistic requirements

Improve the icons for picking entities

9be2614

Unify entity icons across all GUIs

80b0fb4

Unified icons and made non-alive entities available for selection

23ed293

Merge pull request #373 from BentoBoxWorld/better_icons_for_entities

5f8aeba

Better icons for entities

tastybento commented Feb 10, 2025

View reviewed changes

tastybento requested a review from BONNe February 11, 2025 07:44

tastybento added 17 commits February 12, 2025 08:18

Fix naming of individual materials

f6ae07a

Reduce size of success notice to fit on screen

dc7309b

Add permission [gamemode].challenges.waiver-add.x to addon

005fc33

Enables per-player permission waivers.

Merge pull request #374 from BentoBoxWorld/permission_waiver

0fcdb06

Add permission [gamemode].challenges.waiver-add.x to addon

Add switch to hide reward items from the GUI list.

9849c95

The admin may want to hide the rewards and just use the reward description. If the number of rewards is very long, it can be a problem to list them all.

Fix bug with cloning and Boolean vs booleans

2edf1a7

Merge pull request #375 from BentoBoxWorld/hide_reward_items

90bb3d6

Add switch to hide reward items from the GUI list.

Added a PAPI formula option to Other challenge types.

fb782c2

Merge pull request #376 from BentoBoxWorld/papi

39addca

Added a PAPI formula option to Other challenge types.

Adds Advancements as an option to the Other challenges

7fad1b0

Enables giving rewards for advancements or combining them into a challenge.

Merge pull request #377 from BentoBoxWorld/advancements

d5ddc03

Adds Advancements as an option to the Other challenges

Add string comparison for PAPI placeholders #366

f166df2

Added test class and fixed issue.

73e3df6

Log errors to console.

d64b1a6

Merge pull request #378 from BentoBoxWorld/PAPI_strings

362d846

Add string comparison for PAPI placeholders #366

Correct text now that PAPI strings supported

d405390

Fix import and export of challenges. Added Tag TypeAdapter from BBox

23dae37

tastybento merged commit 7231113 into master Feb 23, 2025
3 of 4 checks passed

Uh oh!

Release 1.5.0 #370

Release 1.5.0 #370

Uh oh!

Conversation

tastybento commented Feb 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Key Updates

Other Updates

Statistic Challenges

Block Groups and Entity Groups

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tastybento commented Feb 11, 2025

Uh oh!

sonarqubecloud bot commented Feb 15, 2025

Quality Gate failed

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

tastybento commented Feb 7, 2025 •

edited

Loading