Upstream/addon-challenges
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/Challenges.git synced 2024-12-01 06:53:37 +01:00
Code Issues Projects Releases Wiki Activity
361 Commits 6 Branches 22 Tags 2.6 MiB
dd56842dca
Commit Graph

297 Commits

Author SHA1 Message Date
BONNe
21cf82fe8e Fix slot-index issue. 
NextSlotIndex value were not updated.
 2019-02-02 22:22:04 +02:00
BONNe
f14f23c766
Add 2 new messages 
Add message for missing-addon and incorrect challenge.
 2019-01-30 19:12:41 +02:00
BONNe
93a9490cad
Fix some logic issue. 
Add proper logic check for invalid Other Type challenges.
- If VaultHook is enabled required money should be more then 0, otherwise challenge is not valid.
- If LevelAddon is exists required level should be more then 0, otherwise challenge is not valid.
- If required experience is less then 0, challenge is not valid.
- If Level addon is missing, nut it requires some level, then challenge is not valid.
- If VaultHook is missing, nut it requires some money, then challenge is not valid.
 2019-01-30 19:11:27 +02:00
tastybento
8becd9c08b Fixed reference for levels too 2019-01-30 08:03:23 -08:00
tastybento
7e0487113d Fixes import challenge name presentation 
Previously was showing [challenge] instead of the challenge name. I
could change the locale text, but this works too.
 2019-01-30 07:52:00 -08:00
tastybento
c9909f4b76 Refreshes challenge icon after completion 
https://github.com/BentoBoxWorld/Challenges/issues/60
 2019-01-29 15:03:41 -08:00
tastybento
78f924b7c3 Added defaults to getString for challenge import 
This will avoid nulls if challenge lines like itemReward are missing.

Should help https://github.com/BentoBoxWorld/Challenges/issues/53
 2019-01-29 14:38:26 -08:00
BONNe
f1f9072dc0 Add GuiButton that allows to switch MobHeads vs MobEggs... 2019-01-28 23:45:05 +02:00
BONNe
21c5704864 Fix issue when inventory displays message about island challenge and via-versa. 2019-01-28 21:32:57 +02:00
BONNe
9918752589 Fix issue when completing challenge was not displayed in ChallengesGUI. (#60) 2019-01-28 21:01:26 +02:00
BONNe
7384afa262 Disable broadcast message for user. #62 2019-01-28 20:25:28 +02:00
BONNe
86b51df412 Update to BentoBox 1.2.0 
In BentoBox 1.2 hooks are enabled before addons.
 2019-01-28 20:21:48 +02:00
BONNe1704
739b1dc2be Update Lang file. 
- Improve import message.
- Add backward string.
 2019-01-28 18:17:57 +02:00
BONNe1704
78fccc996e Fix some issues in ImportManager. 2019-01-28 18:15:43 +02:00
BONNe1704
abfe81c5e6 Add GuiButton that allows to load 0.3 challenges. 
Add Necessary methods in ImportManager.
 2019-01-28 17:53:23 +02:00
BONNe1704
48eb14b377 Restore original Challenges and ChallengeLevels objects. 
(For backward compatibility)
 2019-01-28 16:28:25 +02:00
BONNe
37a8bd72c9 Fix issue when ConfirmationGUI never closes. 2019-01-28 01:21:37 +02:00
BONNe
d8812cd1ee Tweak ListUsersGUI. 
- Complete and Reset challenges will be opened until pressed back button.
- Fix issue when confirm reset never closes.
 2019-01-28 01:19:40 +02:00
BONNe
5bea79d263 Remove Light Gray Glass Panes at the end of each row in ChallengesGUI. 2019-01-27 13:10:43 +02:00
BONNe
c28e325f40 Fix issue when in MacOS system was left line breaks symbols. 2019-01-27 13:09:36 +02:00
BONNe
3f42af1c49 Update Config file. 2019-01-26 16:14:57 +02:00
BONNe
0050a83d1a Fix crash while enabling addon. 
This crash happened because BentoBox hookManager is not initialized when addons are enabled.
 2019-01-26 16:14:43 +02:00
BONNe
6d1f4999e4 Fix issue when Settings object were not saved on server shutdown. 2019-01-26 15:36:48 +02:00
BONNe
f3fe85ab2e Fix issue when SettingsGUI did not display updated values. 2019-01-26 15:36:21 +02:00
BONNe
d3ae242716 Remove "CR" at the end of strings. 2019-01-26 15:19:09 +02:00
BONNe
586b076860 Fix issues when Description were to long to fit in window. 2019-01-26 14:46:03 +02:00
BONNe
d6a39b2600 Add completion blockage for un-deployed challenges. 2019-01-26 13:58:00 +02:00
BONNe
2a6127b0f6 Remove repeating blockage for Island Challenge type. 2019-01-26 13:53:49 +02:00
BONNe
ab22651425 Fix an issue when users could do challenges in other gamemodes. 
Fix an issue when users could complete challenges outside their island.
 2019-01-26 13:47:56 +02:00
BONNe
a55a2f536e Add Import Button 2019-01-26 13:17:59 +02:00
BONNe
01482b926b Fix issue, when new challenges and levels were without world name. 2019-01-26 13:17:38 +02:00
BONNe
ca26fa0d8f Add missing Language references. 2019-01-26 00:12:58 +02:00
BONNe
4b2f974b56 Add correct language references. 2019-01-26 00:12:42 +02:00
BONNe
087ee07f45 Add glowing effect on challenge level icons that are completed. 2019-01-25 00:59:06 +02:00
BONNe
089f09dd45 Implement ChallengeLevel completion rewards. 
Add methods isLevelDone() and addCompletedLevel() to ChallengesPlayerData object.
Add isLevelCompleted(), validateLevelCompletion() and setLevelComplete() to ChallengesManager.

Add check in TryToComplete after completing challenges first time.
 2019-01-25 00:54:21 +02:00
BONNe
2a4b892ed7 Create EMPTY_RESULT variable to avoid so many new ChallengeResult object initializations. 2019-01-25 00:28:12 +02:00
BONNe
e0f38206aa Add check on permission. 2019-01-25 00:20:33 +02:00
BONNe
0943a48c3c Add Environment check when completing challenge. 2019-01-24 23:57:50 +02:00
BONNe
52b02e06bf Rework TryToComplete class. 
Remove unnecessary code.
 2019-01-24 23:29:56 +02:00
BONNe
1375d13ae4 Remove unused import. 2019-01-24 23:28:54 +02:00
BONNe
2734c70fc5 Add direct access to vaultHook and Level addon. 2019-01-24 23:28:25 +02:00
BONNe
e68c5b2773 Fix issue, when top command was not displayed in Description. 2019-01-23 21:50:10 +02:00
BONNe
96cb4488c3 Disable Money and Level buttons in admin panel, if EconomyPlugin or Level addon is missing. 2019-01-23 21:44:33 +02:00
BONNe
c3b87da88e Add 2 new variables in ChallengesAddon: 
- economyProvided that indicate if there exist any EconomyPlugin.
- levelProvided that indicate if level addon is enabled.
 2019-01-23 21:34:40 +02:00
BONNe
d3bf5a157f Fix issue when Has_Island option in UserList did not show players if they have not done any challenge. 2019-01-23 20:46:04 +02:00
BONNe
22205265f6 Fix issue when UniqueID was not accepted. Logical error. 2019-01-23 20:36:50 +02:00
BONNe
3d0f01f2dd Fix issue when icons cannot be changed via parse. 
Parser does not work with materials. Use materials directly instead.
 2019-01-23 20:31:26 +02:00
BONNe
ca32c53510 Update To BentoBox 1.1 
Use new approach to hooking addons into game-mode.
 2019-01-23 20:19:18 +02:00
BONNe
53da2d67c7 Fix logical error that opens all levels instead of locking them. 
WaiverAmount should be reducer, not from whom reduces.
 2019-01-23 19:50:15 +02:00
BONNe
38fce9a4b0 Fix issue when Challenge and ChallengeLevel icons were stored with glowing effect and lore from admin panel. 
This issue happened because PanelItem overwrites ItemStack metaData.
It is fixed by returning clone of icon element instead of returning actual icon.
 2019-01-23 19:49:13 +02:00
BONNe1704
9c4c5b7d86 Fix issue when Levels were not loaded with world name in unique ID. 
Fix crash that appears after renaming Level to Other challenge type.
 2019-01-23 18:01:19 +02:00
BONNe1704
bf22a50124 Add ToDoes about Economy. 2019-01-23 17:33:51 +02:00
BONNe1704
590b3f114c Rework ChallengesManager. 
Implement all methods that were only placeholders.
Remove all unnecessary old methods.
Implement new methods in all classes.

User and Admin command now opens new GUI.
 2019-01-23 17:30:30 +02:00
BONNe1704
1bc6bb2b76 Move LevelStatus to utils, as it is more Util then necessary class object. 2019-01-23 16:34:37 +02:00
BONNe1704
f75e4e080c Rework Challenge, ChallengeLevel and ChallengesPlayerData classes. 
Challenge now will not know their world, as it is not necessary.
Remove ICON type, as it is useless.
Rename Level to Other, as under it will be not only level things.
Rename slot to order, as it was weird that users could define slot but not order. Order is easier to understand and use.

ChallengesLevel now knows all their levels.
Each challenge level only will be for single world.
Rename some variables.

ChallengesPlayerData was just adapted with changes in challenges and level classes.
 2019-01-23 16:33:33 +02:00
BONNe1704
dba5a44461 Rename Challenges and ChallengeLevels classes. 2019-01-23 16:09:38 +02:00
BONNe1704
59c0f6bfea Deprecate all classes that are not necessary anymore. 2019-01-23 16:08:18 +02:00
BONNe
20dfc6a760 Perform LevelStatus improvements in ChallengesGUI. 2019-01-22 09:12:12 +02:00
BONNe
8711d7ad08 Rework Challenges Level Status checking. 
In previous code challenges level status holds information for next level. It is fixed now, and current implementation allows to get everything that is needed.
 2019-01-22 09:10:13 +02:00
BONNe1704
10a5dc1940 Apply single GUI style to all admin GUIs. 2019-01-21 15:23:16 +02:00
BONNe1704
c78c690818 Remove item name from Border Items 2019-01-21 14:00:13 +02:00
BONNe1704
60789276be Set all util guis to 45 element size. 
Add Glass Pane Borders to these guis.
 2019-01-21 12:21:53 +02:00
BONNe
ce794d771c Create ChallengesGUI that will be opened for users. 2019-01-21 00:01:26 +02:00
BONNe
d902e4b615 Add ability to move free challenges from start of the list to end of it. 2019-01-20 22:25:38 +02:00
BONNe
8143059e17 Add ManageEntitiesGUI and ManageBlocksGUI to EditChallengesGUI. 2019-01-20 19:35:08 +02:00
BONNe
a90f29e472 Add GUI that allows to edit required blocks. 2019-01-20 19:33:27 +02:00
BONNe
e9b20feac4 Remove unnecessary else if. 2019-01-20 19:29:55 +02:00
BONNe
7e3876f391 Fix issue when WALL_TORCH and WALL_SING was without icon. 2019-01-20 19:28:32 +02:00
BONNe
24646678bf Remove code duplication. 
Material icon and Entities icon creation now are in GuiUtils class.
 2019-01-20 17:54:51 +02:00
BONNe1704
7b0df2d5a7 Add Material to ItemStack transformation in GuiUtils class. 2019-01-20 16:12:20 +02:00
BONNe1704
0645f7cb11 Create new class GuiUtils that contains methods, that is frequently used and can be static. 2019-01-20 15:55:12 +02:00
BONNe
dadf907efb Create SelectBlocksGUI that allows to select single Material that is block from GUI. 2019-01-20 11:54:40 +02:00
BONNe
3d5dbca422 Improves panel border creating method. 
Allow to change row count in panel and border material.
 2019-01-19 23:48:38 +02:00
BONNe
43fe78e0f9 Fix issue when delete function was not working. 2019-01-19 22:20:42 +02:00
BONNe
16be7f26a1 Create class that allows to change required entities for challenge. 2019-01-19 21:26:16 +02:00
BONNe
0109431262 Create new method in CommonGUI, that allows to fill border with black stained glass around Panel. 2019-01-19 21:25:48 +02:00
BONNe
88f9d32862 Implement Reset and Complete Challenge for ListUsersGUI. 2019-01-19 18:29:08 +02:00
BONNe
be7435f73a Implement AnvilGUI into StringListGui so users could edit text via Anvil. 2019-01-19 18:21:37 +02:00
BONNe
faa237ddf0 Integrate AnvilGUI into NumberGUI so users could manually write numbers in GUI. 
Add error messages, if number is not valid.
 2019-01-19 18:13:15 +02:00
BONNe
c42652dde8 Implement add and remove challenge from challenge level panels in EditLevelGUI. 2019-01-19 18:02:19 +02:00
BONNe
6125eb5d34 Create SelectChallengeGUI that allows to choose one challenge from input challenge list and return it into GUI. 2019-01-19 17:53:50 +02:00
BONNe
9415452e33 Implement AnvilGUIs into EditLevelGUI for editing Text fields. 2019-01-19 17:41:27 +02:00
BONNe
1d0f090948 Implement existing GUIs in EditChallengeGUI. 
Change Challenges.environment from list to set.
 2019-01-19 17:27:41 +02:00
BONNe
865fa626af Create SelectEnvironmentGUI that allows to select and deselect different world environments. 2019-01-19 17:12:00 +02:00
BONNe
17d0f0b8f3 Create SelectEntityGUI that allows to select an entity from all living creatures. 
It displays mobs in two ways: as Mob eggs or as Mob Heads.
 2019-01-19 16:54:43 +02:00
BONNe
433484d9f7 Add new enum HeadLib that contains library with all mob heads from Minecraft. 2019-01-19 15:49:54 +02:00
BONNe
11c3637b2a Add error messages when unique ID is not unique. 2019-01-18 19:28:12 +02:00
BONNe
1ecbac43bf Add last missing element in AdminGUI. 
Now AdminGUI all icons are functional.
 2019-01-18 19:26:03 +02:00
BONNe
870bf6d232 Implement ResetAllChallenges confirmation GUI to ListUsersGUI. 2019-01-18 19:13:39 +02:00
BONNe1704
0f56eb7185 Add EditSettingsGUI to AdminGUI. 
Fix issue when other GUIs were not opened.
 2019-01-18 17:40:01 +02:00
BONNe1704
6cdc619cf0 Implement existing GUIs in EditLevelGUI. 2019-01-18 17:38:34 +02:00
BONNe1704
1b1b081a42 Add existing GUIs in EditChallengeGUI. 2019-01-18 17:29:24 +02:00
BONNe1704
97174930d5 Create constructor that allows to input any String Collection. 2019-01-18 17:22:44 +02:00
BONNe1704
fb06dae7ab Add constructors that allows to set minimal and maximal return value. 2019-01-18 17:03:08 +02:00
BONNe1704
25371fc6aa Replace setValue method with BiConsumer. 
This will provide ability to use setters directly in caller GUIs.
 2019-01-18 16:50:34 +02:00
BONNe1704
09f69bd46a Implement Consumer in ConfirmationGUI instead of depending on setValue method. 2019-01-18 16:49:39 +02:00
BONNe
13291b450c Implement ConfirmationGUIs in Delete operation for ListLevelsGUI and ListChallengesGUI. 2019-01-17 23:09:32 +02:00
BONNe
29dadf3841 Implement existing GUIs in AdminGUI. Update TODO comments. 2019-01-17 22:56:05 +02:00
BONNe
dab5f2b331 Remove commands from UtilGuis, instead use CommonGUI.valueObject to store new value. 
Proper ItemSwitchGUI implementation.
 2019-01-17 22:44:48 +02:00
BONNe
bd48e85fcc Create method that allows to change ValueObject value. 2019-01-17 22:38:45 +02:00
BONNe1704
2ae8a5d634 Create ItemGUI class that will be used to change all required and reward item stacks. 2019-01-17 17:49:51 +02:00
BONNe1704
1508492a69 Create StringListGUI class that allows to edit list of strings. 2019-01-17 16:55:32 +02:00
BONNe1704
c79173b411 Remove command existing check from ConfirmationGUI. 
Add CompositeCommand as class variable.
 2019-01-17 16:27:16 +02:00
BONNe1704
6903fa5d40 Create NumberGUI that allows to change integer value and run command that will apply this integer. 2019-01-17 16:23:03 +02:00
BONNe1704
e1f6cc8b47 Create ConfirmationGUI class that creates GUI with 2 buttons. 
On Cancel it should return to previous GUI.
On Accept it should process given command. If command does not exist, it should throw error message in chat. At the end it should return to previous GUI.
 2019-01-17 13:16:42 +02:00
BONNe1704
35cea3344a Add different operation modes for ListUsersGUI. 2019-01-17 12:19:33 +02:00
BONNe1704
aaaf774952 Create ListChallengesGUI that allows to view all challenges and Edit or Remove them, depending on given mode. 2019-01-17 12:10:29 +02:00
BONNe1704
7060afd33d Create ListLevelsGUI class that allows to view all Levels. 
It has 2 modes: edit mode and delete mode.
 2019-01-17 12:04:16 +02:00
BONNe1704
efab8f7e24 Improve GUIs naming. 2019-01-17 11:36:39 +02:00
BONNe1704
dbe8cc50df Rename some GUIs. 2019-01-17 11:33:13 +02:00
BONNe
818892e618 Create GUI that could edit challenges levels. 2019-01-16 22:23:12 +02:00
BONNe1704
016deec34c Create ChallengesEditGUI class that will allow to edit challenges via ingame GUI. 
This GUI currently does not have ability to change values. It only contains skeleton for each option, that user should be able to change.
Add new parameters to Challenges class.
 2019-01-16 19:25:01 +02:00
BONNe1704
d5f19310c8 Create ChallengesUserListGUI that will display user heads in rows and allows to select specific user. 2019-01-14 17:21:45 +02:00
BONNe1704
594fa0f27f Create common buttons in CommonGUI panel. 2019-01-14 17:21:00 +02:00
BONNe1704
6a5ec144d1 Create ChallengesSettingsGUI class that allows to change Challenges Addon Settings via ingame menu. 2019-01-14 15:20:37 +02:00
BONNe1704
291239e244 Create Challenges Admin Gui, so admin could choose action that needs to be processed. 2019-01-14 15:05:06 +02:00
BONNe1704
c7aafa63ef Create CommonGUI panel that will be used in all other GUIs where it is necessary. 2019-01-14 13:29:10 +02:00
BONNe1704
6c0ac96251 Use proper Addon settings getters. 2019-01-10 11:40:23 +02:00
BONNe1704
b8e0ca4331 Rework ChallengesAddon main class. 
Add dependencies to AcidIsland and BSkyBlock addons in pom.xml.
Use proper way how to get GameMode admin and user commands.
Init Settings object and implement onReload() method.

Add check on disabled game modes, to avoid loading challenges in addons, where it should be disabled by settings.
 2019-01-10 11:36:06 +02:00
BONNe1704
dd6f8caed6 Add Settings class that will process ChallengesAddon configuration. 2019-01-10 11:30:54 +02:00
BONNe1704
3971519d1d Rename FreshSqueezedChallenges to ChallengesImportManager. 
ChallengesImportManager name makes more sense then FreshSqueezedChallenges
 2019-01-10 11:16:04 +02:00
Florian CUNY
4c3026f3c1 Version 0.3.0 (BentoBox 1.0) 2019-01-05 11:17:03 +01:00
tastybento
32dbebd607 Removing async and updating to 1.13.2 API 
The async saving is not the right thing to do here anyway, so I'm
removing it.

https://github.com/BentoBoxWorld/Challenges/issues/45
 2018-12-31 18:43:32 -08:00
Florian CUNY
bf1890c392 Final harsh way to fix the ambiguity??? 2018-12-30 15:01:21 +01:00
Florian CUNY
11a86b1445 Using the hard way to fix the ambiguity 2018-12-30 14:53:58 +01:00
Florian CUNY
0041d07151 Fixed ambiguous lambda 
IDEA wouldn't let me build the addon with the method reference :/
 2018-12-30 14:42:54 +01:00
Florian CUNY
ba3f6b4b8b Renamed addon to Challenges 2018-12-30 14:32:25 +01:00
Florian CUNY
8f51ddb634 Moved everything to world.bentobox.challenges package 2018-12-30 14:31:26 +01:00
tastybento
5009729300
Merge pull request #41 from BONNe/autosaver 
Implement AutoSaving
 2018-12-21 12:48:13 -08:00
BONNe1704
b1c12e7454 Improve SaveListener. 
Save challenges un world save event only if in current world has any challenge.
 2018-12-18 11:26:29 +02:00
BONNe1704
4edc1c5c62 Create WorldSaveEvent listener that stores challenges, when event occur. 
Partial fix of issue #21.
 2018-12-18 10:58:56 +02:00
BONNe
b37fee1423 Fix issue #23 - ChallengesToDo shows wrong number. 
This issue happens, because LevelStatus keeps record about current level completion. So "novice" level knows how much it needs to unlock the next level and so on.
My proposed fix is just workaround of current behavior, but I think there is necessary better rework of LevelStatus object.
 2018-12-18 00:26:46 +02:00
BONNe1704
cd503d7f71 Add missing message variables. 2018-12-17 15:10:42 +02:00
BONNe1704
3dd23addc4 Change spacing from tab to space. 2018-12-17 15:03:12 +02:00
BONNe1704
c2051d23e5 Implement Money support for challenges. #25 
If VaultHook is found, then add money to user account.
Add check on Required XP and Required Money.
Enable Money withdraw if isTakeMoney() is true.
 2018-12-17 15:00:22 +02:00
tastybento
cb046894b5 Merge remote-tracking branch 'origin/master' into develop 2018-12-04 16:45:16 -08:00
tastybento
278bd822c3 Revert SURROUNDING to ISLAND for now as it doesn't match enum. 2018-12-01 20:35:01 -08:00
Li Keqing
ab77df3e78 Translate into Chinese 2018-11-26 18:13:14 +08:00
tastybento
5f7581f09c Challenges reset when island is reset. 
Fixed locale duplication.

https://github.com/BentoBoxWorld/addon-challenges/issues/2
https://github.com/BentoBoxWorld/addon-challenges/issues/3
 2018-11-23 17:06:42 -08:00
tastybento
97bec0f870 Challenges can only be done in the world that they belong. 
https://github.com/BentoBoxWorld/addon-challenges/issues/24
 2018-11-23 16:40:06 -08:00
tastybento
edc2c455c4 Fixes inventory item removal bug (for sure this time). 
Also saves player data after player completes a challenge or the
challenge is reset. Now reloading challenges doesn't cause challenge
completion loss.

https://github.com/BentoBoxWorld/addon-challenges/issues/27
https://github.com/BentoBoxWorld/addon-challenges/issues/30
 2018-11-23 10:42:20 -08:00
tastybento
326b8ca0cf Fixed item removal. Added unit tests. 
https://github.com/BentoBoxWorld/addon-challenges/issues/27
 2018-11-19 08:54:31 -08:00
tastybento
ac80a7e7e4 Fix for taking items even if challenge incomplete 
https://github.com/BentoBoxWorld/addon-challenges/issues/27

Also added admin challenge reset command.
 2018-11-18 19:39:14 -08:00
tastybento
e5e022754b Added challenges reload admin command. 
This reloads from the database files so admins can edit the challenges
and then reload them without restarting the server.

https://github.com/BentoBoxWorld/addon-challenges/issues/27
 2018-11-12 11:44:43 -08:00
tastybento
b55cc822a9 Made generic some required items. 
FIREWORK_ROCKET, ENCHANTED_BOOK, WRITTEN_BOOK and FILLED_MAP will be
checked generically instead of specifically because meta data can be
different when created each time.

https://github.com/BentoBoxWorld/addon-challenges/issues/27
 2018-11-12 11:35:49 -08:00
tastybento
1e07223d61 Fixes issue with Level not being referenced correctly. 
https://github.com/BentoBoxWorld/addon-challenges/issues/26
 2018-11-12 10:24:18 -08:00
tastybento
c70f5cf2f3 Fix error when no blocks required, only entities. 
Updated POM to use correct Level org.

May be related to
https://github.com/BentoBoxWorld/addon-challenges/issues/28
 2018-11-12 09:55:42 -08:00
tastybento
263390deb7 Updated to 0.12.0 API. 2018-10-30 18:26:47 -07:00
tastybento
c14b242cbd Added admin complete command 
Other items are WIP
 2018-10-06 08:49:49 -07:00
tastybento
65a2f19fff WIP: Added required items panel 2018-09-08 16:49:32 -07:00