Commit Graph

2445 Commits

Author SHA1 Message Date
dependabot[bot]
ef61885c22
Merge pull request #793 from Rsl1122/dependabot/maven/Plan/development/com.maxmind.geoip2-geoip2-2.12.0 2018-11-11 11:20:20 +00:00
dependabot[bot]
b3bf6a1a8b
Merge pull request #792 from Rsl1122/dependabot/maven/Plan/development/org.mockito-mockito-core-2.23.0 2018-11-11 11:19:51 +00:00
dependabot[bot]
9662714f7a
Bump spongeapi from 7.0.0 to 7.1.0 in /PlanPluginBridge
Bumps [spongeapi](https://github.com/SpongePowered/SpongeAPI) from 7.0.0 to 7.1.0.
- [Release notes](https://github.com/SpongePowered/SpongeAPI/releases)
- [Commits](https://github.com/SpongePowered/SpongeAPI/compare/v7.0.0...v7.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-11 11:17:28 +00:00
dependabot[bot]
f0de6af355
Bump placeholderapi from 2.9.1 to 2.9.2 in /PlanPluginBridge
Bumps placeholderapi from 2.9.1 to 2.9.2.

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-11 11:17:27 +00:00
dependabot[bot]
ba52cdef38
Bump geoip2 from 2.9.0 to 2.12.0 in /Plan
Bumps [geoip2](https://github.com/maxmind/GeoIP2-java) from 2.9.0 to 2.12.0.
- [Release notes](https://github.com/maxmind/GeoIP2-java/releases)
- [Changelog](https://github.com/maxmind/GeoIP2-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/maxmind/GeoIP2-java/compare/v2.9.0...v2.12.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-11 11:15:32 +00:00
dependabot[bot]
2144553a1e
Bump mockito-core from 2.13.0 to 2.23.0 in /Plan
Bumps [mockito-core](https://github.com/mockito/mockito) from 2.13.0 to 2.23.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v2.13.0...v2.23.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-11 11:15:25 +00:00
dependabot[bot]
d63a60b384
Merge pull request #790 from Rsl1122/dependabot/maven/PlanPluginBridge/development/net.milkbowl.vault-VaultAPI-1.7 2018-11-11 11:13:00 +00:00
dependabot[bot]
27729c4bfd
Merge pull request #789 from Rsl1122/dependabot/maven/PlanPluginBridge/development/io.github.nucleuspowered-nucleus-api-1.6.3-S7.1 2018-11-11 11:11:37 +00:00
dependabot[bot]
601f74c789
Merge pull request #788 from Rsl1122/dependabot/maven/Plan/development/org.apache.commons-commons-text-1.6 2018-11-11 11:10:14 +00:00
dependabot[bot]
441992c38a
Bump VaultAPI from 1.6 to 1.7 in /PlanPluginBridge
Bumps [VaultAPI](https://github.com/MilkBowl/VaultAPI) from 1.6 to 1.7.
- [Release notes](https://github.com/MilkBowl/VaultAPI/releases)
- [Commits](https://github.com/MilkBowl/VaultAPI/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-11 11:07:43 +00:00
dependabot[bot]
5072c2e036
Bump nucleus-api from 1.6.0-PR1-S7.0 to 1.6.3-S7.1 in /PlanPluginBridge
Bumps nucleus-api from 1.6.0-PR1-S7.0 to 1.6.3-S7.1.

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-11 11:07:37 +00:00
dependabot[bot]
0c8d02dc66
Merge pull request #787 from Rsl1122/dependabot/maven/Plan/development/org.apache.maven.plugins-maven-javadoc-plugin-3.0.1 2018-11-11 11:07:29 +00:00
dependabot[bot]
45ffcb94c2
Bump commons-text from 1.3 to 1.6 in /Plan
Bumps commons-text from 1.3 to 1.6.

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-11 11:05:52 +00:00
dependabot[bot]
2f51687230
Bump maven-javadoc-plugin from 2.10.4 to 3.0.1 in /Plan
Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 2.10.4 to 3.0.1.
- [Release notes](https://github.com/apache/maven-javadoc-plugin/releases)
- [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-2.10.4...maven-javadoc-plugin-3.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-11 11:03:54 +00:00
Risto Lahtela
ebaffcab5e
[Merge] Module split (#786)
* Moved project files to 'common'-module

This is done so that refactoring into multiple smaller modules is easier
as the IDE will not attempt to move tests incorrectly when moving things
between different modules

* Created 'bukkit' module

Following classes were removed during the operation:
- BukkitServerInfo (Renamed to ServerServerInfo)
- SpongeServerInfo (could use ServerServerInfo)
- Hastebin (not viable on every platform, unused)
- HastebinTest
- MockPlayers (unused, bukkit specific)

Changes to classes:
- Renamed Importer to BukkitImporter (contained bukkit related impl.)
- Extracted Importer interface from BukkitImporter
- Turned BukkitPlanModule and BukkitClassBindingModule to interfaces by
  using @Binds annotation
- Added Status class since PlayersOnlineListener had a boolean,
  that stated if kicks were counted.

This commit completes split partially and was not pushed on commit.

* Created 'sponge' module

Changes to classes:
- Turned ServerSuperClassBindingModule, SuperClassBindingModule,
  SpongePlanModule and SpongeClassBindingModule to interfaces by
  using @Binds annotation
- Renamed SystemObjectBindingModule to SystemObjectProvidingModule
- Removed sponge related calls in ServerProperties
- Made EmptyImportSystem injectable

This commit completes split partially and was not pushed on commit.

* Changed shade configuration

Further tweaks required.

* Created 'bungeecord' module

Changes to classes:
- Removed use of BungeePingTimerTask in VelocityTaskSystem
- Removed use of RedisBungee in VelocityServerProperties
- Fixed bukkit command.commands.RegisterCommandFilter package

Changes to project structure:
- Dependency versions now in main pom via dependencyManagement
- Repositories now defined in main pom

* Created 'velocity' module

Changes to classes:
- Made RawDataResponse use Gson via reflection since it is no longer
  available in dependencies of 'common' module

* Created 'plugin' module

This module is for creating a single deployment artifact and testing of
system interactions.

Fixes to tests:
- Reflection no longer fails to initialize if Bukkit.getServer() is null
- PingCountTimerBukkit no longer fails to be created if Reflection fails
- Removed unnecessary @AfterClass from H2Test
- Jar resource path fixes to Mocker

* Shading configuration

org.slf4j classes are relocated in 'common', 'bukkit' & 'bungeecord'.
In 'sponge' & 'velocity' they are not relocated, allowing injection
as plugin logger, while using slf4j-nop for HikariCP logging.

This allows single release artifact.

* Removed 'Icon' from .gitignore

* Attempt to fix test resources

Because all jar resources are located in 'common', an attempt to fetch
them is made to common/target/Plan-common.jar, which for some reason
is a bad path.

This attempts to remedy that by creating a temporary file from an
InputStream, read with Class#getResourceAsStream

Ignored HTTPSWebServerAuthTest as the certificate path was invalid for
some reason.
2018-11-11 12:55:09 +02:00
RoboMWM
b9ae627388 Don't create dependency-reduced-pom (#781)
Since this plugin always generates one on compile, and since it's tracked in the git repo people have to revert their copy in order to pull changes.
2018-11-04 21:53:50 +02:00
Risto Lahtela
d0de0725b2
Update versions.txt 2018-11-04 20:18:49 +02:00
Risto Lahtela
b1da4ba18b
[Merge] Version 4.5.1 (#780) 2018-11-04 20:17:03 +02:00
Rsl1122
244c621abe [V] 4.5.1 version bump 2018-11-04 19:52:06 +02:00
Rsl1122
48ccd6d099 [#772] Fix ShutdownHook registration
This solves session saving on server shutdown, as previous solution has
proven to work just fine.
2018-11-04 19:42:58 +02:00
Rsl1122
a68fde3e9e [Fix] Compile issues on PluginBridge 2018-11-04 19:42:08 +02:00
Fuzzlemann
81533718cd [Fix] Test & /raw/server/ improvements (#776) by Fuzzlemann
* Optimizing the loading of the network page and raw server data page

-> Loads the nicknames in bulk instead of one by one
-> Performance gain with the raw data 45719ms vs 10054ms
-> Scales up with more even more users

* Adding UsersTable#getUUIDsAndNamesByID so when you want to get the UUID and the player name you do not have to execute UsersTable#getPlayerNames and UsersTable#getUUIDsByID
-> Performance improvements

* Fixes the test failures

* Renamed method names so they correctly show the real DB used
True fix of the tests (no fail after ~3500 passes)
  -> Implementation of TestRunnableFactory
  -> Removal of the timeout on CommonDBTest#testSaveCommandUse which is way too sensitive to the testing environment (disk speed, etc.)
2018-11-03 22:09:12 +02:00
Fuzzlemann
471a830c9f [New] H2 Db Support + improvements (#774) by Fuzzlemann
* Adding H2 Database Support

* Making HtmlCompressor a constant so it is not created new each time it is used.
Note: It is thread-safe (see: https://code.google.com/archive/p/htmlcompressor/ "HtmlCompressor and XmlCompressor classes are considered thread safe* and can be used in multi-thread environment")

* Adds the H2 Database to the used libraries in the README.md

* Changes all invalid license headers

* Refactors many methods into an enum named DBType
These methods are:
 -> getName()
 -> getConfigName()
 -> supportsMySQLQueries()

 to a check if the DBType is H2

* KeepAliveTask splitted into separate class to remove duplicate code

* Fixes compilation error

* Refactors Database Tests into one Common class with all generic Database Tests and specific Database Tests

* Fixes some JavaDocs

* Adds license headers

* Optimizing comparisons to enum comparisons
2018-11-03 16:49:55 +02:00
Rsl1122
798a0e77eb Merge remote-tracking branch 'origin/development' into development 2018-10-29 19:46:30 +02:00
Rsl1122
81fc6a20d4 [#771] Fix Bukkit based servers TPS 2018-10-29 19:46:19 +02:00
Fuzzlemann
91d8731ab5 [Merge] Median and DecimalFormatter improvements (#765) by Fuzzlemann
* Generified Median.java
* Improves performance when comparing Integers because of Collection -> Stream -> List conversion removal. Instead of Median.forInt or Median.forLong Median.forList can be used.
* Now every type of number can be compared
* Storing DecimalFormat rather than creating a new DecimalFormat object each time it's applied
* Added JavaDocs for Median.java
2018-10-29 14:42:50 +02:00
Rsl1122
ded4d01e53 [#768] Fixed issues with plugin bridge listeners 2018-10-28 11:02:09 +02:00
Sprungente
7d8bc3f2ad German Locale enhancements (#766) by Sprungente 2018-10-28 10:22:37 +02:00
Rsl1122
acfa885a0d [Fix] Fix ping method usage on Paper 2018-10-28 10:20:16 +02:00
Risto Lahtela
916a0d3aed
[License] Updated license headers (#767) 2018-10-28 10:10:56 +02:00
Risto Lahtela
ee02648d9f
[Merge] Changing license from proprietary to LGPLv3 2018-10-28 08:59:38 +02:00
Rsl1122
684ca65ba5
Update versions.txt 2018-10-27 16:52:03 +03:00
Rsl1122
d7694a0f1c
[Merge] Version 4.5.0 2018-10-27 16:38:39 +03:00
Rsl1122
a531f23bef [Fix] Fixed exception on CraftBukkit servers
Related to Ping gathering and Player.Spigot class
2018-10-27 15:57:11 +03:00
Rsl1122
a131bb7dc8 [V] 4.5.0 Version change
- Updated APF to 3.3.1 (removed SNAPSHOT)
2018-10-27 15:42:32 +03:00
Rsl1122
8aa7fd12e0 [Fix] Velocity enable sequence
- Annotation processor
- Fixed APF parts and added listeners that allow enable and disable.
2018-10-27 15:17:45 +03:00
Rsl1122
23613d7a63 [#752] Html Customization for favicon.ico file
Added a new favicon.ico file that can be customized like all other
web files, by placing a favicon.ico file to /plugins/Plan/web
2018-10-27 11:51:36 +03:00
Rsl1122
7d1f70e5a1 [#759] Fix No enum constant errors related to AAC
This fix prevents these errors in the future if the Enum changes again.
2018-10-27 11:19:18 +03:00
Sprungente
00e543021f [Merge] German Translations for 4.5 Release (#760) by Sprungente 2018-10-27 09:23:48 +03:00
Rsl1122
4e36545e0a [Fix] Network page oddities
- Fixed Analysis button being green after a 404 on analysis refresh
- Fixed Online graphs going back more than two weeks on servers tab
2018-10-26 13:52:47 +03:00
Rsl1122
05bb441b2d [Fix] Network page registered players SQL 2018-10-26 13:18:53 +03:00
Rsl1122
6aed02e43b [Fix] SQL Timings only in dev mode 2018-10-26 12:59:21 +03:00
Rsl1122
a2b6a3b1e5 [Fix] Help command permission checking 2018-10-26 12:44:53 +03:00
Rsl1122
5c9e2426d7 Merge remote-tracking branch 'origin/development' into development 2018-10-26 12:44:19 +03:00
Rsl1122
436865e8e4
[Merge] Fixed SLF4J warnings (#757) by PyvesB 2018-10-26 08:40:38 +03:00
PyvesB
2d328e1e31 Fixed SLF4J startup warnings 2018-10-25 23:09:09 +01:00
Rsl1122
d490bb64b9 [Fix] Dev release update notification icon 2018-10-25 11:34:43 +03:00
Rsl1122
5e2f61cb54
Update versions.txt 2018-10-25 11:33:03 +03:00
Rsl1122
04c831b9b3 [Fix] Tests fail when server is running 2018-10-25 11:23:06 +03:00
Rsl1122
633f5ba98a [New] Moved update notification to website
Dev releases and releases distinguished by icon
2018-10-25 11:22:37 +03:00