* WIP - add GUI for teams.
* WIP teams GUI
* Moe WIP on team GUI
* Modified file to avoid an NPE.
* Minor refactor to prevent int to Integer warning.
* Use latest dependencies for tests to pass.
* Move to singleton pattern for RanksManager,
* Team GUI WIP
* Added support for kick, setowner, and leave.
* Added support for accepting and rejecting an invite.
* Fixed bugs with text and operations.
* WIP for team invites.
* Adds inviting to the GUI.
* Fix tests
* Fixed minor bugs reported by SonarCloud
* Up Minecraft version and paper to 1.20.4 in POM
* Added features based on Discord feedback.
1. added some lore to the invite button to explain the players shown are
from the game world
2. removed the team state in chat
3. added a search to the invite panel
* Added back button.
Refactored some code and templates.
* Fixed bugs with teams and uncoop untrust etc of Ops.
* Return to name search GUI if name not found.
* Added return to GUI for player search
* Use Path.of
* Fixes bug with island team joining and deletion. Include debug.
* Remove ambiguous API with mutli-island.
* Add back deprecated methods so developers can be wartned not to use them
* Added back in deprecated methods.
* Fix bugs and NPEs.
* Fix some code smells
* Remove debug logging.
* Fixes a bug that removed old owner from island
These changes fix a bug that was introduced by clearing the island cache from the old owner for 2.0 verison.
This will set the previous owner as sub-owner on the island.
* Fixes rank on event fired.
Changes from Visitor to Sub owner rank
* Update IslandsManager.java
Removes line that removes player from cache.
They should remain in the cache.
---------
Co-authored-by: tastybento <tastybento@users.noreply.github.com>
* Multi world WIP - stashing
* Initial work on supporting multiple islands per player
The default allowed number is 5 for now, but will be set to 1 by
default.
Lots more work to do on this!
* More work on multi island. Fixed tests so clean compile.
* Remove unused imports
* Updated island go and homes command to multi island
Updated tests.
* Do not reload addons anymore.
* Add island name when entering or leaving own island
* Remove unused import
* Adds island names to /island go command.
* Enables more homes to be set if player has more than one island
* Switch to using a set for islands and explicit primary boolean in Island
* WIP
* Fix bugs with the go command.
* Be able to delete multiple islands, e.g. when joining a team
This is not fully tested.
* Do not remove all islands when a player does reset.
Players can reset just the island they are on.
* More fixes for go command
* Fix tests
* Fix @NonNull annotation
* Fix home syntax listing reference for IslandDeleteHome
* Fixed deletehome for multiple islands.
* Fix /island command teleport to current island default home.
* Remove deprecated code.
* Fix tag for concurrent island setting in config.yml
* Improve error when trying to make additional islands over limit
* Update config.yml
* Correctly assign invites for islands.
* Switch to canExecute API in prep for multi-island handling
* Prevent players from obtaining more concurrent islands by owner transfer
* Handle leaving and disbanding of teams
* Fix tests
* Fix minor bugs or code smells.
* Restore the quarantine code from deprecation.
This code can stay. It checks if islands can load, and if not puts them
in a trash. It does no harm.
* Remove unneeded eq()'s
* Fix tests
Mostly replacing instanceof check and cast with e.g. 'instanceof Player
player'
Replaced some "switch" statements by "if" statements to increase
readability.
Used the primitive boolean check to avoid potential NPEs.
Reordered field modifiers to comply with the Java Language
Specification. Mainly @NonNull position.
* Code clean up from Sonar Cloud analysis
* Fix tests
* Remove code smell
* Rename "island" which hides the field declared at line 25.
* Removed code smells.
* Rename variable record to rec
Renamed "record" variable to not match a restricted identifier.
Restricted Identifiers should not be used as identifiers. "record" is
using in Java 16.
* Added private constructor to prevent instantiation of static class
Changed variable name to rec instead of restricted "record".
* Remove Blueprint code smells.
* Use a record for database settings constructor
Code smell: Methods should not have too many parameters. I'm not sure
what methods are using this class though.
* Update MyWorlds version
The POM for MyWorlds is invalid and causes a warning, but this still
persists with this version.
* Extracted nested try block into a separate method.
Makes it clear when reading the code what might be caught
* Extracted nested try block into a separate method.
* Fixed JavaDoc /** instead of just /*
* Extracted nested try block into a separate method.
* Refactored to not assign loop counter from within the loop body.
* Better delete option. With results.
That said, this is legacy code to handle an issue that occurred a long
time ago and this whole set of code can probably be removed.
* Catch Exceptions not Throwable
* Log error with BentoBox logError
* Use computeIfAbsent
Using these instead leads to cleaner and more readable code.
* User can no longer be null
* Added the missing @Deprecated annotation and @since ref
* Added @since reference
* Merge if statements
* Use BentoBox error logging.
* Added JavaDoc @since
* Remove deprecated class and move used class
* Remove deprecated WoodType and use Type.
* Remove unused import
* Extracted nested try block into a separate method.
* Comment empty default statement
* Clean up logic; avoid switch
* Use Java instead of Guava
* private constructor to hide the implicit public one.
* Private constructor to hide the implicit public one.
Merged if statement.
* Add comment
* if merge
* Make variable constant
* Remove unused imports
* Remove deprecated and unused method
* Remove unused import
* Typo
* Remove instanceof and cast
* Remove superfluous null check
* Put constant at bottom of file because @BONNe likes it there.
* Simplify particle validation code
The end portals and gateways teleports players to a different dimension upon player touches it. So teleportation should consider these positions as unsafe, otherwise player will be teleported to the different dimension instantly.
Fixes#2040
* Implements option to define non-existing flags in WorldSettings.
This change adds 2 new methods in WorldSettings:
* WorldSettings#getDefaultIslandFlagNames
* WorldSettings#getDefaultIslandSettingNames
These methods replace getDefaultIslandFlags and getDefaultIslandSettings methods.
Default implementation just reads values from replaced methods.
Fixes#1830
* Implement conversion from flag id to actual flag object.
Replaces flag assignment to new island based on flag id's.
Fixes#1830
* Switch from Flag object to String object in Island class.
This switch allows to keep flags that are not present in current BentoBox installation. Otherwise, unknown flags may cause an issues.
Fixes#1830
* Implement FlagBooleanSerializer.
This serializer converts input map of String, Boolean to map of String, Integer.
This map is used to read island setting flags, and integer value is not classic boolean values. (0 for true and -1 for false).
Fixes#1830
* delete island one by one
* register before IslandDeletionManager
* optimize imports
* setting
* just some indents
* config
* run synchronously
* a bit reformat before recoding
* proper delete chunks
* comment
* combine the task call
* expose the NMS Handler
* don't have to try-catch this
* we know that this is final
* expose copy chunk data so that it can be overridden
* Don't have to use Vector
* set block from minimum height
* remove NMS and use fallback if not set
* only get the height once
* fix test
## Change Log
* Island range perms could be 2x island distance
This could allow protection ranges to be much greater than the island
range and therefore overflow into adjacent islands.
https://github.com/BentoBoxWorld/BentoBox/issues/1851
* Ensure maxEverProtectionRange is less than range.
https://github.com/BentoBoxWorld/BentoBox/issues/1851
* Added test class for Island.
* Added access to private fields for JUnit tests
* Added Sonar Properties to POM
* Changes to analyze using sonar.
* Remove zip reference
* Avoid zipSlip vulnerability.
* Removed the unused WorldEdit hook. (#1853)
If someone wants to add it back later they can, but this code does
nothing right now.
* Requires nonNull parameters for User.instanceOf (#1852)
* Requires nonNull parameters for User.instanceOf
The only reason why User.instanceOf was returning a potential null was
if the parameter was null. Further absolutely no null checking was being
done, so the assumption was that User.instanceOf should never return a
null. This corrects the annotations and requires non-Null parameters.
* Remove null player test
* Fix JavaDoc for GameModeAddon inWorld method
* Fix max-range bug
* Remove illegal tag as it's not needed
* Code smell reduction
* Add missing packages so tests can pass.
* Non null user methods (#1856)
* This makes some User methods non-null.
Instead of returning null, some methods will throw an error if they are
called on non-Players. This means code does not have to do null checks.
* Perform null check in method.
* Null check
* Fix test
* Fix test.
* Npe squashing (#1857)
* Fix hanging [uuid] in info.
* NPE checking
* Make getProtectionCenter nonNull
* More NPE fixes.
* Fix test
* Make getPlayer() and getOfflinePlayer() nonNull returns
This requires addons to not use null checks and instead us the isPlayer
or isOfflinePlayer methods.
* NPE blockers
* Deprecate CompositeCommand isPlayer method.
* Fix test
* Use isPlayer instead of null check.
Refactor code to be easier to understand.
* Fix
* Fix some code smells.
* Prevent NPE possibility.
* Fix "ugly" enchant name. (#1858)
Enchant names did not have a touch of Util#prettifyText code.
* Remove deprecated events.
* Fix IslandSethomeCommand test
* Fix tests - just counts of events.
* Added API to get a translation without color conversion
It may be necessary to read the translation without converting colors to
Bukkit colors.
* Fix tests.
* Fix test.
* Version NPE protections.
* 1.18.0 (#1860)
* Mark all home-related methods in PlayersManager as deprecated.
* Fix bug where maxHomes was shown as null
* Version 1.18.0
API changes may break compatibility with Addons.
* Remove usage of deprecated methods except for migration code.
* Prevent NPE. Check isPlayer instead of getWorld() == null
* Fix nullability issue and added to @Deprecated annotations
* Added deprecation notices to home methods in Players
* Fix missing color conversion for translations.
* Fix mis-statement of island protection coordinates in info command.
* Fix tests
* Fix missing edge deletion of island.
The bounding box was erroneously being made smaller when it was not
required because the inBounds check does that already.
https://github.com/BentoBoxWorld/BentoBox/issues/1863
* Prevent rare NPE
* Ensure oldIsland is never null.
* Refactored setowner command and added test class
* API: Require getWorldSettings to be a game mode world
* Fix tests and refactor code
* Fix test
IWM inWworld needs to return true
* Fix test
IWM inWorld must return true
* Put default getHandlers back in for backwards compatibility
Without them, too many older addons break. They need updating to have
their own handlers. Once that is done, the default ones can be removed
maybe.
* Refactor code for clarity.
* NPE protections
* Prevent NPE
@Poslovich - you were right!
* Throw an error if player is null
* Prevent NPE
* Prevent NPE
* Do a null check
* World should never be null.
* Require non-null world
* Require owner to be non-null. It should never be null
* Prevent NPEs
* Clear the going home flag for edge cases
There were a few potential times when the flag may not have been
cleared. These were mostly teleport failure scenarios. Hopefully, this
is all of them.
https://github.com/BentoBoxWorld/BentoBox/issues/1864
* Shift priority of EntityPortalEnterEvent to HIGH
https://github.com/BentoBoxWorld/BentoBox/issues/1866
This will allow other plugins running at NORMAL to cancel the event
before BentoBox does something.
* Increase priority of EntityPortalEvent listener
https://github.com/BentoBoxWorld/BentoBox/issues/1866
* Fixes https://github.com/BentoBoxWorld/BentoBox/issues/1868
* Code refactoring around User.getInstance(player)
Co-authored-by: BONNe <bonne@bonne.id.lv>
Co-authored-by: Fredthedoggy <45927799+Fredthedoggy@users.noreply.github.com>
Co-authored-by: Justin <jstnf@users.noreply.github.com>
Co-authored-by: gecko10000 <60494179+levtey@users.noreply.github.com>
* Version 1.17.1
* Add homes command to default player options.
* Implements better online player counter. (#1791)
Current one is based on online player count when bStats sends data to the server.
This one will send data about amount of players who logged in the server.
* Add Boxed Gamemode to the list. (#1793)
* Add Bank addon (#1792)
* Add Holographic Displays as SoftDepend for AOneBlock (#1794)
* Custom date time format support for /<admin> info <player> (#1783)
Fixes#1720
* Parent/sub-flag support, split up and designate CONTAINER flag as parent flag (#1784)
* Split CONTAINER flag into multiple flags
CONTAINER split into
- CONTAINER (Chest/Minecart Chest)
- BARREL (Barrel)
- COMPOSTER (Composter)
- FLOWER_POT (Flower Pot)
- SHULKER_BOX (Shulker Box)
- TRAPPED_CHEST (Trapped Chest)
Fixes#1777
* Add subflag support
* Create container parent flag, chest subflag
* Remove extra string from when CHEST was CONTAINER
* Fix incorrect flag specified on fired event in IslandToggleClick
* Add missing world subflag event firing
* Remove extra import
* Add world setting flag for island visitors keep inventory (#1785)
* Implement 3 bar charts: addons, gamemodes, hooks (#1790)
BStats supports sending Bar chart data, however, it does not display it via their site directly.
It can be called manually, to view.
PieChart does not work very well for addons and hooks. BarChart however allows viewing each addon separately.
This change allows sending data to the server about bar charts.
* Update action versions
* Declare distribution - adopt
* Cache Java Maven files differently.
* Try dependency for shade snapshot
* Add support for Minecraft 1.17.1
* Fix test by incrementing listener value check
There is a new listener now.
* Spigot 1.17.1
* Fix test for InventoryListener
* Re-order repos.
* Downgrading to 1.17 Spigot for now to enable building.
* Try pluginRespositories tag in POM to enable Github actions
* Version 1.17.2
* Add alternative Addon#getIslandManager method (#1797)
We have already done this to the main BentoBox class. But add-ons missed it, and it still has this weird structure: Addon#getIslands().getIslands().
This will just add the same method as it is already in BentoBox class.
* Fix bucket dupe (#1806)
Fix https://discord.com/channels/272499714048524288/310623455462686720/867790395442462760
* Removes unneeded exploit protection code for skulls (#1810)
This no longer seems to be required with 1.17.1
https://github.com/BentoBoxWorld/BSkyBlock/issues/430
* Quote filename of addon that cannot be loaded.
Provides a better understanding of which addon failed.
* Remove update when pasting chest.
* Version 1.17.3
* Java upgrade (#1814)
* Version 1.17.3
* Use Map.of and List.of instead of Immutable collections
* Replace explicit type argument.
* Replace lamba with method reference
* Replace condition with Objects.requireNonNullElseGet
* Use String.repeat
* Use new switch expressions
* Use instanceof patten variables which are more compact
* Fuse toUnmodifiableList into stream and return it.
* Remove unnecessary toString() calls.
* Remove unnecessary public
* Extracted common part from if
* Simplify conditional expressions
* Remove unused IOExceptions
* Cast to long
* Use Map.putAll
* Use primitives
* Clarify what is null or not
* Addedd @Serial annotation introduced with Java 14.
* Use Optional.isEmpty instead of !isPresent
* Use flatMap then ifPresent
* Just use Arrays.stream
* Swap map and filter for null with Objects::nonNull
* Use expression lambda
* Update JavaDoc version to 16
* Make spawn protection area square instead of circle.
https://github.com/BentoBoxWorld/BentoBox/issues/1819
* Improve ItemParser code. (#1821)
* Improve ItemParser code.
Add ability to parse text if Material is just a single string.
Add ability to parse player heads.
Add comments to the code.
* Fixes failing test.
* Added deprecation suppression.
* Added Pladdon to loadbefore.
* Prevent bucket duping when scooping obsidian Part 35
https://github.com/BentoBoxWorld/BentoBox/issues/1825
* Warns visitors that PVP is active if they teleport to an island
https://github.com/BentoBoxWorld/BentoBox/issues/1780
* Prevents repeated portaling when nether is disabled. (#1826)
* Prevents repeated portaling when nether is disabled.
https://github.com/BentoBoxWorld/BentoBox/issues/1782
* Fix test
* Hex pr 1820 (#1822)
* Fix @since for subflags. (#1831)
* Add Citizens to Softdepend list for NPC support (#1834)
* Fix color test.
* Set the default game mode when player makes island.
* Corrects JavaDocs link
Fixes https://github.com/BentoBoxWorld/BentoBox/issues/1838
* Update to 3.3.1-SNAPSHOT for shade plugin.
* Package info files for better JavaDocs (#1839)
* Added package info files for better JavaDocs
* Implement Flag icon changing via Locales file. (#1829)
This commit contains 2 changes:
- An option for Flag to use icon that is defined in locales after "icon" string.
- An option for ItemParser to parse icon or return given value, if parsing was not successful.
The flag option is not ideal, but it is simpler and easier to maintain then adding new config section where icons can be changed, as the locales file already contains a lot of info about each flag.
* Support glowing ink in blueprints (#1842)
Fixes https://github.com/BentoBoxWorld/BentoBox/issues/1837
* Panel template (#1841)
* Implement basic functionality to read data from template panels.
Create TemplateReader class that has static method which generates a PanelTemplateRecord. This record contains every necessary information from user created template file so everyone could use it to generate a functional panel.
These classes are just for reading templates and do not create actual panel.
* Add template clearing via bentobox reload command.
* Fix version command to show addon state.
* Fix German flag banner description.
Added more debug around error reporting.
* Make variables final if they can be. (#1843)
* Make variables final if they can be.
* Do not use final so that test can pass.
For testing, we use a trick to set this variable, but it won't work if
it is final. Right now, I'd like to keep the test.
* Static code analysis (#1844)
* StringBuffer (Java 5) may be declared as StringBuilder
* Replace map with flatMap
* Use instanceof naming
* No need to specify paramter types.
* Remove verbose code
* Fix JavaDoc issues
* Make internal class a record.
* Remove unused import.
* Make internal class a record.
* Made internal class a record.
* Removed unused import
* Fix typos
* Fix typo in test.
* Prevent home teleport when already home teleporting
Home teleporting is async so it's possible to issue the command multiple
times. This puts a flag in so that if a playeer is mid-teleport, then
issuing the go command will just repeat the text that the player is
teleporting home.
https://github.com/BentoBoxWorld/BentoBox/issues/1637
* Extracted island info from the Island object.
This is in preparation to have a different info for players than admins.
https://github.com/BentoBoxWorld/BentoBox/issues/1501
* Slimmer trimmer island info for players.
https://github.com/BentoBoxWorld/BentoBox/issues/1501
* Fixes coop and trust invites when team invites are not allowed
If a member or sub-owner has coop or trust invite capability and not
team invite rank, and confirm invites is on, then the invites were not
working.
Fixes https://github.com/BentoBoxWorld/BentoBox/issues/1452
* Remove invulnerable visitor protection if island is in PVP mode
We now have alerts if a player teleports to a PVP island.
https://github.com/BentoBoxWorld/BentoBox/issues/668
* Fixes NPE in admin tp if nether or end worlds don't exist.
* Adds arrow sound when teleporting into a PVP island.
* Fix PVPListenerTest
Visitors are no longer invincible when on a PVP island.
* Fix test failure in InvincibleVisitorsListenerTest
* Minor JavaDoc correction.
* Go command was not working second time.
* Prevents console errors for missing icons in locale files.
* Fixes PlAddon disabling issue. (#1847)
There was a bug that did not unload PlAddon classes from JVM.
This change should fix it, as it will unload PlAddons via pluginLoader.
* Clear code - set worlds once on construction.
* Fixes a bug when Potion metadata was not applied (#1849)
There was missing potion meta data applying after creating an item.
This affects both: Potions and Tipped arrows.
* Adds force-shown lines to the template. (#1850)
* Adds force-shown lines to the template.
Fixes a bug when template type was not selected correctly.
Changes "name" to "title" for border and background icons.
* Create TemplatedPanel and TemplatedPanelBuilder.
TemplatedPanel uses PanelTemplateRecord to create a functional panel.
Builder contains button builder callbacks that are used to create buttons with custom data.
* Use final vars for lambdas to avoid them changing async
The processes could run async, especially when chunk loading took a
while, so using fields that could change would result in blocks being
missed, especially in the nether or end. Switching to final vars avoids
this.
Fixes https://github.com/BentoBoxWorld/BentoBox/issues/1840
* Remove travis.
Co-authored-by: BONNe <bonne@bonne.id.lv>
Co-authored-by: Fredthedoggy <45927799+Fredthedoggy@users.noreply.github.com>
Co-authored-by: Justin <jstnf@users.noreply.github.com>
Co-authored-by: gecko10000 <60494179+levtey@users.noreply.github.com>
IslandsManager.getIslandLocation(world, uuid) is used to find the
starting point for the island home if a safe home for players cannot be
found. It returns the island center location but should return the
center of the island protection because that can now be in a different
location.
* Switch to island homes from player homes.
Stores home locations and max homes in the Island object. Adds commands
required to manage home names, specifically rename and delete. I did not
add list as there is tab complete on island go, but it may be required.
* Adds maxMembers to the Island object for persistent storage
https://github.com/BentoBoxWorld/BentoBox/issues/1690
* Expanded approach to include coop and trusted ranks.
* Checks for max members/coops/trusts on accept based on island setting.
* Write island max member/coop/trusted if owner joins server
This updates the island's settings based on the owner's permissions.
* Decouple island location from island center.
This enables the protection area to move anywhere within the island
boundaries
* Paste island at island location.
* Move visitors to the island location
* Added island location placeholders
* Use island location instead of island center
* Fix tests
* Allow radius 1 islands.
* Correct admin range set limit
* Debug in progress
* Fix island deletion.
The speed option was doing nothing except causing repeated actions on
the same chunks.
* Soft depend for WorldGeneratorApi for Boxed game mode
* Changed to "protectionCenter".
Added logic to expand the deletion area based on moving the island
protection location and range instead of just deleting everything. This
will keep deletion time to a minimum for BSkyBlock, etc.
* Fix tests.
Put some fields as "final"
Made all abstract classes' constructors "protected" (them being public serves no purpose since they cannot be instantiated outside of child classes)
Did some minor code prettifying
The island will only be saved if isChanged() is true. It is set to true
if any setter is used or a field is changed.
This should help servers shutdown a lot faster and background database
saves go quicker. Only applies to Islands!
https://github.com/BentoBoxWorld/BentoBox/issues/1629
tastybento
tastybento
BONNe
Huynh Tien
Thomas Cordua-von Specht
Florian CUNY