Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-09-27 06:12:38 +02:00
Code Issues Projects Releases Wiki Activity
3,135 Commits 25 Branches 93 Tags 58 MiB
2bc35c8936
Commit Graph

1783 Commits

Author SHA1 Message Date
tastybento
e959a04091 Merge branch 'develop' of https://github.com/BentoBoxWorld/bentobox.git into develop 2018-08-16 15:53:02 -07:00
tastybento
b80928184e Fixed code smells. 2018-08-16 15:52:23 -07:00
Florian CUNY
7b3b1303b4 Removed the current Placeholders API (it is unused) 2018-08-16 21:35:10 +02:00
tastybento
471cb30a87 Removed unused imports. 2018-08-16 11:06:18 -07:00
tastybento
5740ad7e0c
Merge pull request #238 from BentoBoxWorld/enter-exit-listener 
Updated EnterExitListener to fire IslandEnterEvent and IslandExitEvent
 2018-08-16 11:03:55 -07:00
tastybento
ec005569a1 Fixed tests for EnterExitListenerTest 2018-08-16 10:38:35 -07:00
Florian CUNY
4c319dd0e0 Shaded bStats' Metrics 
Also removed custom metrics for the moment.
This will later be used to allow addons to register their own metrics :)
 2018-08-16 13:49:44 +02:00
Florian CUNY
bd2cc1b63e Updated EnterExitListener to fire IslandEnterEvent and IslandExitEvent 2018-08-16 11:15:36 +02:00
Florian CUNY
d04b286055 Removed obsolete from locales 2018-08-16 10:49:57 +02:00
tastybento
5a38c0b5e0 Fixes bugs with copy file method. 2018-08-16 00:15:14 -07:00
tastybento
382b47abbf Adjusted event priorities to stop console spam for island lock or ban 
Changed enter-exit messages to notify
 2018-08-15 21:01:00 -07:00
tastybento
22121ad4f9 Fixed bug with sub command getAddon() inheritance. 2018-08-15 20:50:02 -07:00
tastybento
5981ffa0d5 Removed unused InventorySave/Store classes. 2018-08-15 20:30:50 -07:00
tastybento
68624d2879 Removed unused imports. Removed unused classes InventorySave/Store 2018-08-15 20:30:34 -07:00
tastybento
8a687a52c6 Fix for saving config files in Windows. 2018-08-15 13:53:07 -07:00
Florian CUNY
6358f72986 Fixed some code smells 2018-08-15 11:01:07 +02:00
Florian CUNY
7815c837dd Deleted FlyingMobEvents (duplicate of GeoLimitMobs) 
And also fixed a code smell with metrics method names in IslandsManager
 2018-08-15 10:52:10 +02:00
Florian CUNY
0a0d66eebf Fix for the two last revert commits. 2018-08-15 09:58:01 +02:00
Florian CUNY
bce73a551d Revert "Rewrote IslandGrid to use Table<> from Guava" 
This reverts commit b54c7ad662.
 2018-08-15 09:53:25 +02:00
Florian CUNY
82ebc8b018 Revert "Fixed IslandCacheTest" 
This reverts commit 8fb4e58994.
 2018-08-15 09:51:41 +02:00
Florian CUNY
d926873992 Revert "Rewrote IslandGrid.Cell" 
This reverts commit bfff61e6a1.
 2018-08-15 09:51:12 +02:00
Florian CUNY
f12773475b Made DatabaseSetup an interface 2018-08-15 09:44:04 +02:00
Florian CUNY
539d2a0516 Fixed some code smells 2018-08-15 09:43:28 +02:00
tastybento
fc066a04a3 Added SuppressWarnings to classes using deprecated regenerateChunk 2018-08-14 19:09:14 -07:00
tastybento
baf6571614 Added comments and TODO's to FlatFileDatabaseHandler 2018-08-14 18:43:51 -07:00
Florian CUNY
e11f173ca3 Made /is reset use the command cooldown API + switched "wait" settings to int 
Aaaand had to update some tests. Lots of tests.
 2018-08-14 21:11:46 +02:00
Florian CUNY
bfff61e6a1 Rewrote IslandGrid.Cell 
Removed CellState.RESERVED for now
Made the Object an Island for now
Validate#notNull() in constructor
Made state and island variables final

Also updated the filters
 2018-08-14 20:49:05 +02:00
tastybento
3118da2216 Added comments to FlatFileDatabaseHandler 
WIP
 2018-08-14 08:53:44 -07:00
tastybento
67d40462bc Code clean up. 
Removed commodore for now.
Simplified some return statements.
 2018-08-14 08:24:28 -07:00
tastybento
653e94e0b7 Made sub-class of CompositeCommand called ConfirmableCommand 
This class inherits CompositeCommand and adds the confirming system.

It could be renamed Confirmable, like Bukkit has Cancellable for Events.
 2018-08-14 11:43:21 +02:00
Florian CUNY
8fb4e58994 Fixed IslandCacheTest 
Also commented out CellState.RESERVED.

That was a tough one. I had to rewrite IslandGrid#getIslandAt(int, int) quite a few times before using the stream() thing. I tested it a bit - it seems it is working like a charm.
I just hope that it won't be something useless - another plumbing change that adds nothing. It shouldn't - because of the "RESERVED" thing - but, well... it's been quite a hard thing!
 2018-08-14 11:38:44 +02:00
tastybento
9367f41e72 Removed permission from BentoBox version command. 2018-08-13 20:05:16 -07:00
Florian CUNY
b54c7ad662 Rewrote IslandGrid to use Table<> from Guava 
It also prepares further implementation for reserved "locations"
 2018-08-13 21:45:43 +02:00
Florian CUNY
3ff387121a Minor javadoc edit in Island 2018-08-13 21:05:58 +02:00
Florian CUNY
9d04aa376b Cleanup in CompositeCommand 
Removed onlyConsole
Removed "showHelp" implementation
Removed deprecated setParameters
 2018-08-13 21:03:24 +02:00
Florian CUNY
353c87cf6d Fixed EnterExitListener to support non-set Island's name 
When an Island's name was reset (set to `null`) it was breaking EnterExitListener.
 2018-08-13 16:08:05 +02:00
tastybento
ec3e956d76 Enforced onlyConsole setting. 
Removed extraneous test code method
 2018-08-12 20:09:04 -07:00
tastybento
4681a0bd7d Added BentoBox reload command 
Only reloads locales for now.
 2018-08-12 19:52:13 -07:00
tastybento
94c5ac8e79 Fixed bug with loading add-on with no locales. 
Fixed bug with no permission error in click listeners.
 2018-08-12 18:53:56 -07:00
tastybento
6eeff3f383 Added test classes for coop, uncoop, trust and untrust commands. 2018-08-12 17:15:11 -07:00
tastybento
c1a6a233a9 Added team coop, uncoop, trust and untrust commands. 2018-08-12 16:43:47 -07:00
tastybento
82c35f9aa9 Fixed test breaks. 2018-08-12 14:28:25 -07:00
tastybento
67dc4eedb3 Merge remote-tracking branch 'origin/develop' into command_ranks 2018-08-12 13:46:01 -07:00
Florian CUNY
7ec497a93b Fixed general.errors.no-permission being sent twice 2018-08-12 18:50:12 +02:00
Florian CUNY
3212b7180d Changed a few locale references for consistency 
Removed `general.errors.you-need` to put the [permission] variable in the `general.errors.no-permission`.
Renamed all confirmation-related references to `commands.confirmation.xxx`.
Renamed `protection.panel.flag-item.xxx_rank` to use a dash instead of an underscore.
 2018-08-12 18:47:31 +02:00
tastybento
ca4db42e8d Fixed bug with locale files being saved from BentoBox into addon locales 2018-08-12 08:02:54 -07:00
tastybento
686b4398bc Merge remote-tracking branch 'origin/develop' into command_ranks 2018-08-12 07:59:13 -07:00
Florian CUNY
2fee163818 Fixed default description and parametersHelp (again) 
Commit efb8cb27a9 broke it
 2018-08-12 11:38:09 +02:00
Florian CUNY
5b7502d83f Fixed minor code smells 2018-08-12 11:28:36 +02:00
Florian CUNY
20116ff287 Changed the main package declaration restriction to be 'world.bentobox.bentobox' 
It will allow us to create our addons using a "conventional" package naming, such as "world.bentobox.bskyblock", etc...
 2018-08-12 11:01:40 +02:00
tastybento
d44889e7b0 Added command rank settings and extra ranks. 2018-08-11 21:08:04 -07:00
tastybento
203998d000 Made toLowerCase / toUpperCase use an explicit Locale 
This avoids issues on some OS's.

Put in Commodore (but commented out). Just checking it out.
 2018-08-12 05:12:14 +09:00
tastybento
bcb44c4cce Fixed PlayerManager tests. 2018-08-12 04:14:07 +09:00
tastybento
7e7001e99b Fixes UUID lookup 
https://github.com/BentoBoxWorld/bentobox/issues/232
 2018-08-12 02:47:38 +09:00
tastybento
efb8cb27a9 Merge branch 'develop' of https://github.com/BentoBoxWorld/bentobox.git 
into develop

Conflicts:
	src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java

	Fixed.
 2018-08-12 02:44:39 +09:00
tastybento
0a65d7a8cc Added constructor to enable addon object passing. 2018-08-12 02:42:11 +09:00
Florian CUNY
8895cbf1a8 Updated locale references in BentoBoxVersionCommand 2018-08-11 16:05:02 +02:00
Florian CUNY
d58570330a Fixed default parameters and description in CompositeCommand 
Also accordingly updated the related javadoc.
 2018-08-11 14:29:42 +02:00
Florian CUNY
8749566279 Minor variable-renaming in User 2018-08-11 14:07:46 +02:00
Florian CUNY
d73539f755 Fixed default help not sending description reference if no translation was found 2018-08-11 14:07:26 +02:00
Florian CUNY
1c2e553e9f Updated BentoBoxCommand 2018-08-11 14:06:49 +02:00
Florian CUNY
3d441928d0 Renamed AboutCommand to BentoBoxAboutCommand 2018-08-11 14:05:33 +02:00
Florian CUNY
699b439096 Renamed VersionCommand to BentoBoxVersionCommand 2018-08-11 14:05:12 +02:00
Florian CUNY
2f01671f72 Actually removed Constants class 2018-08-11 14:04:53 +02:00
Florian CUNY
f89bda6b5d Replaced #setParameters(String) by #setParametersHelp(String) in commands 2018-08-11 13:33:42 +02:00
tastybento
6ee5538930 Fixed help. 
Usage is not translatable - it's a chained list of commands.
 2018-08-10 14:59:13 +09:00
tastybento
46ae5883a1 Revert "Commented out the default description and parameter help for now." 
This reverts commit f3442a32ab.
 2018-08-10 14:57:18 +09:00
tastybento
f3442a32ab Commented out the default description and parameter help for now. 
Let's discuss how to approach this better.
 2018-08-10 13:59:38 +09:00
tastybento
67ab937b97 Revert "Removed useless #setDescription() and #setParameters() in commands" 
This reverts commit 0e8e9dde67.
 2018-08-10 13:47:58 +09:00
Florian CUNY
48b169537a Prepared automated showHelp if #execute() was returning false 
I added the code, however I commented it out: there are a few problems with this for now, because some commands are using "return false;" to fail silently.

Also did javadoc'd #onlyPlayer(boolean)
 2018-08-09 17:09:38 +02:00
Florian CUNY
ceb88d9c7b Improved Javadoc in BentoBoxCommand interface 2018-08-09 17:07:53 +02:00
Florian CUNY
1155549e4c Typo in comments in IslandEvent 2018-08-09 16:40:35 +02:00
Florian CUNY
5ae88349b4 Removed purge-related events (unused) 2018-08-09 16:40:21 +02:00
Florian CUNY
716495258c Replaced #setParameters(String) to #setParametersHelp(String) in CustomIslandMultiHomeHelp 2018-08-09 11:56:38 +02:00
Florian CUNY
0e8e9dde67 Removed useless #setDescription() and #setParameters() in commands 2018-08-09 11:56:05 +02:00
Florian CUNY
a9a932fdc3 Deprecated #setParameters(String) in favor of #setParametersHelp(String) 
Also did Javadoc for #setParameters(String), #setParametersHelp(String),
#setDescription(String) (I had to override this one).
 2018-08-09 11:54:48 +02:00
Florian CUNY
6d5518e97c Javadoc in PremadeEvent 2018-08-09 11:53:05 +02:00
tastybento
ea0f64a770 WIP added AdminDeleteCommand 2018-08-09 05:13:54 +09:00
tastybento
d630c0d739 WIP - needs test class and testing 2018-08-08 13:05:12 +09:00
tastybento
8b2ed9c7af Added convenience methods to TeamMakeLeaderEvent 
Gives old owner and new owner UUIDs.

https://github.com/BentoBoxWorld/bentobox/issues/227
 2018-08-07 18:51:23 -07:00
Florian CUNY
aab7d4a649 Made mod bypass permissions flags-specific & differenciated between everywhere and only on island 
This is a 2 in 1 : #70 and #139.
Those were long-awaited features. Now it's time for testing !
 2018-08-07 16:42:47 +02:00
Florian CUNY
1455d6e7f5 Locales : added meta.banner, meta.auhors and meta.version 2018-08-07 16:26:37 +02:00
Florian CUNY
90a868bc40 Updated ItemParser to use the new banner materials 2018-08-07 16:02:29 +02:00
Florian CUNY
7d04d8acc2 Renamed /bbox info to /bbox version 2018-08-07 10:43:38 +02:00
Florian CUNY
2e75c8b4b4 Removed IslandSpawnCommand (unused) 2018-08-06 18:01:00 +02:00
Florian CUNY
16e864f495 Fixed some code smells 2018-08-06 18:00:47 +02:00
Florian CUNY
28cf3ca278 Removed unused settings from Settings 
recoverSuperFlat (is a flag) and muteDeathMessages (an external plugin can do it)
 2018-08-06 16:08:45 +02:00
Florian CUNY
e22cdf0b36 Made Config use ConfigHandler instead of FlatFileDatabaseHandler 2018-08-06 15:59:38 +02:00
Florian CUNY
7f0dc2f6d3 Prepared handling of the other ConfigEntry fields for Config loading 2018-08-06 15:59:06 +02:00
Florian CUNY
cfbf3df1c3 BREAKING: Renamed [...]DatabaseConnecter to [...]DatabaseConnector 
It was a typo shown by IntelliJ
 2018-08-06 15:32:15 +02:00
Florian CUNY
5fa8f3997f BREAKING: Renamed a few API classes to a more generic name 
`BBConfig` to `Config`.
`BBDatabase` to `Database`.
`BBDbSetup` to `DatabaseSetup`.

Sorry @tastybento, hope it won't bother you too much :/
 2018-08-06 15:19:06 +02:00
tastybento
ba557a1068 API Breaker: renamed BSB classes to be just BB 
Hopefully, this is the last API breaker. I renamed the classes that
started with BSB to be just BB (bentobox). I now have to fix all the
add-ons I just broke...
 2018-08-05 20:08:03 -07:00
tastybento
cfdabbb176 Removed AboutCommand test to get a clean build. 
Please see my comment on the commit. Final classes can't be mocked (as
far as I know) so it's kinda impossible to make a test for this one.
 2018-08-05 20:00:23 -07:00
Florian CUNY
f8366cafec Started a test unit for AboutCommand 2018-08-05 10:56:15 +02:00
tastybento
765268aa25 Code cleanup using Intellij 2018-08-04 21:50:10 -07:00
tastybento
492a0b9105 Added ban/unban cooldown 2018-08-04 21:10:51 -07:00
tastybento
1256b0ee22 Added a bentobox command 
Added reference about and info commands. These command run across worlds
and currently have no perms associated with them.

The main point was to enable BentoBox to have is own commands.
 2018-08-04 20:43:38 -07:00
tastybento
783caf985f Added generic cooldown methods to CompositeCommand 
This API enables any command to have a cool down and to have that cool
down called by another command. For example, the Kick command sets the
cool down on the Invite command. It is possible for commands to set cool
downs on themselves too.
Currently, cool downs are not stored persistently in the database so
they disappear if the server is reloaded. This should be okay for now.
 2018-08-04 18:45:13 -07:00
tastybento
2cc6d36997 Reworked test classes for managers 
There are some weird NPE's that I couldn't work out in the test classes.
They do not occur when the class is run by itself, only when it is run
with all the others so I don't know why it is happening.
 2018-08-04 10:13:08 -07:00
tastybento
25164d824b Rewrote IslandsManager test class 2018-08-04 09:37:21 -07:00
tastybento
08604fc27d Rewrote PlayersManagerTest class 2018-08-04 09:21:24 -07:00
tastybento
93c3d3ce47 Removed code smells. 2018-08-03 23:31:02 -07:00
tastybento
5c46265771 Fixed code smells. 2018-08-03 21:30:06 -07:00
tastybento
683aca7043 Adjusted Clipboard to remove code smell and renamed package 2018-08-03 21:19:15 -07:00
tastybento
1c29dfca6b Removed generic wildcard type code smell 2018-08-03 21:02:55 -07:00
tastybento
53f28eb68d Changed island team kick to use confirm API 
Fix for:
https://github.com/BentoBoxWorld/bentobox/issues/214
 2018-08-03 19:22:35 -07:00
tastybento
7aa2f33eab Put default settings for command desc and parameters back in 
These should work now. No infinite loop.
 2018-08-03 17:43:42 -07:00
tastybento
3e7307a56c Merge branch 'master' into develop 2018-08-03 08:25:40 -07:00
tastybento
48883bb75f Removed constants class for now. It's not needed. 2018-08-03 08:24:40 -07:00
tastybento
5d27ea8fc6 Fixed spawners in schems. 2018-08-02 20:39:57 -07:00
tastybento
3c74ef0694 Moved admin and island commands into API package 2018-08-02 19:26:46 -07:00
tastybento
4a1dede795 Removed deprecated calls from IslandsManager for trapdoor check 2018-08-02 19:01:23 -07:00
tastybento
d3b5411b1b Fix for tab complete in game. 2018-08-02 18:39:10 -07:00
tastybento
02e528cdc7 Debug 2018-08-02 08:11:46 -07:00
tastybento
2d75a92700 Fixed 1.13 schems 2018-08-01 22:02:53 -07:00
tastybento
ae3a341b89 WIP - using blockdata - doesn't work completely yet. 2018-08-01 17:24:52 -07:00
tastybento
acbcd27142 Temporary fix for island schem pasting. 
Note that blocks are not pasted properly. The Clipboard class needs
rewriting to 1.13.
 2018-08-01 16:40:21 -07:00
tastybento
a9da00478d Fixed EndermanListenerTest class to use BlockData properly. 2018-08-01 18:19:47 -04:00
tastybento
733fc3d1c9 Fixed Endermen listener for 1.13 2018-08-01 09:35:31 -07:00
tastybento
4fab167d10 Fixed build errors. 
Reverted back the generic commands for use by addons.

WIP - some tests need fixing for 1.13.
 2018-08-01 08:55:48 -07:00
tastybento
422fd7b0e8 Revert "Removed /is and /bsbadmin commands" 
This reverts commit c6e2ba6418.
 2018-08-01 08:29:09 -07:00
Florian CUNY
e6418f0957 Finished updating source code to 1.13 API 
Test units still need to be updated.
 2018-08-01 11:03:03 +02:00
Florian CUNY
1a63b2431e CompositeCommand : added defaults for setDescription and setParameters 2018-08-01 10:36:38 +02:00
Florian CUNY
b600dacbdd Continued 1.13 support 2018-08-01 10:18:37 +02:00
Florian CUNY
c6e2ba6418 Removed /is and /bsbadmin commands 2018-08-01 10:16:57 +02:00
Florian CUNY
46f22e5467 WIP - Updating to full 1.13. Will not build. 2018-07-31 21:17:10 +02:00
Florian CUNY
5fa0f590f1 Made TNT a PROTECTION flag instead of SETTING 2018-07-31 20:04:47 +02:00
Florian CUNY
84515642bf Removed GameType in Constants (useless) 2018-07-31 18:19:36 +02:00
Florian CUNY
2210cdc2e8 Javadoc and line spacing in BentoBox 2018-07-31 18:14:57 +02:00
Florian CUNY
3473fb48e6 Renamed 'world.bentobox.bbox' to 'world.bentobox.bentobox' 2018-07-31 18:03:32 +02:00
tastybento
c7ff1bbae4 Converted references of BSkyBlock to BentoBox 2018-07-29 17:09:48 -07:00
tastybento
f2831c7258 Improved addon loading error reporting 
Fixed a bug in the team invite error strings.
 2018-07-29 16:56:14 -07:00
tastybento
268a301a47 Switch to BentoBox 2018-07-29 13:21:46 -07:00