Commit Graph

5097 Commits

Author SHA1 Message Date
Antti Koponen
bcfd52d76b
Slimjar 1.3.0/1.2.6 & custom Injectables for Fabric and Velocity (#2126)
* Update slimjar to 1.3.0/1.2.6
* Add custom Injectable impl for Fabric module
* Add custom Injectable impl for Velocity
2021-10-13 17:44:34 +03:00
Aurora Lahtela
7d8b797b42
Fix CompositeResolver using its own isAuthRequired method (#2124)
Fixes CompositeResolver using its own isAuthRequired method instead of the child resolver, leading NoAuthResolver to need authentication in some cases.
2021-10-11 20:24:39 +03:00
Emilia Dreamer
bb83adfd51
Floating point tps threshold (#2123)
Affects issues:
- Close #2068
2021-10-11 19:39:21 +03:00
BratishkaErik
31b430ea95
Updated Russian translation by BratishkaErik (#2118) 2021-10-09 17:15:47 +03:00
Aurora Lahtela
b1b9525507
Update versions.txt 2021-10-09 13:39:51 +03:00
Aurora Lahtela
d06c753be1
Query page view server selector (#2117)
Affects issues:
- Close #1829
2021-10-09 13:17:12 +03:00
Risto Lahtela
fd84341a77 Fixed 1.7 bukkit command support
Affects issues:
- Fixed #2105
2021-10-09 13:04:51 +03:00
Risto Lahtela
8d4e1d592b Catch resource write task exception
Affects issues:
- Fixed #2107
2021-10-09 12:49:29 +03:00
dependabot[bot]
daa1973d01
Bump com.github.johnrengelman.shadow from 7.0.0 to 7.1.0 in /Plan (#2112)
Bumps com.github.johnrengelman.shadow from 7.0.0 to 7.1.0.

---
updated-dependencies:
- dependency-name: com.github.johnrengelman.shadow
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-07 17:16:12 +03:00
Antti Koponen
cdfdbd3d0a
Upgrade Highcharts to v9.2.2 (#2114)
* Upgrade Highcharts to v9.2.2
* Ignore color changer error when Highcharts isn't loaded

Co-authored-by: Antti Koponen <koponen942@outlook.com>

Co-authored-by: Aurora Lahtela <24460436+AuroraLS3@users.noreply.github.com>
2021-10-07 17:09:14 +03:00
dependabot[bot]
19a10c03b0
Bump dagger from 2.39 to 2.39.1 in /Plan (#2110)
Bumps [dagger](https://github.com/google/dagger) from 2.39 to 2.39.1.
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.39...dagger-2.39.1)

---
updated-dependencies:
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-04 15:50:51 +03:00
dependabot[bot]
bc7f0cfdf8
Bump dagger-compiler from 2.39 to 2.39.1 in /Plan (#2111)
Bumps [dagger-compiler](https://github.com/google/dagger) from 2.39 to 2.39.1.
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.39...dagger-2.39.1)

---
updated-dependencies:
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-04 15:50:11 +03:00
Emilia Dreamer
455e7cbb9a
Properly use a component serializer for VelocityCMDSender (#2109) 2021-10-04 15:50:00 +03:00
Antti Koponen
4c682d333f
Don't reload dependencies when reloading plugin (#2108)
Affects issues:
- Fixed #2092
2021-10-03 21:37:05 +03:00
dependabot[bot]
c0904b8a2d
Bump dagger-compiler from 2.38.1 to 2.39 in /Plan (#2103)
Bumps [dagger-compiler](https://github.com/google/dagger) from 2.38.1 to 2.39.
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.38.1...dagger-2.39)

---
updated-dependencies:
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-01 16:01:36 +03:00
dependabot[bot]
7e964531fb
Bump dagger from 2.38.1 to 2.39 in /Plan (#2102)
Bumps [dagger](https://github.com/google/dagger) from 2.38.1 to 2.39.
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.38.1...dagger-2.39)

---
updated-dependencies:
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-01 16:00:57 +03:00
Risto Lahtela
5c618099af Added web-dev related settings
- Customized_files.Path can now be used to choose where Html Customized files are placed
  (Change this to `"<absolute path to git repo>/Plan/common/src/main/resources/assets/plan/web"`
   for easy time developing)
- Customized_files.Enable_web_dev_mode can be used to enable modifications of all files
  as well as bypass resource caching for instant updates on browser refresh.

Adding new files still needs recompiling the plugin, but this should speed up
modifications to existing parts of the website considerably.

- #2098
2021-09-26 14:50:14 +03:00
Risto Lahtela
4258e27a66 Fixed corner case of determineWebAssetModifications step
git log would return empty line for files with no git history.

Added a check that uses current time instead of git log if file is not in git history.
2021-09-26 14:01:07 +03:00
dependabot[bot]
dc8b1c5a3a
Bump junit-jupiter from 5.8.0 to 5.8.1 in /Plan (#2097)
Bumps [junit-jupiter](https://github.com/junit-team/junit5) from 5.8.0 to 5.8.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.8.0...r5.8.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-23 21:34:53 +03:00
Risto Lahtela
e762b8013f Prevent Arrays#asList#remove call
Affects issues:
- Fixed #2096
2021-09-22 19:22:19 +03:00
Antti Koponen
b2b289617e
Use correct release type for CF upload (#2091) 2021-09-18 23:10:29 +03:00
Aurora Lahtela
db7b3db083
Update versions.txt 2021-09-18 23:03:56 +03:00
Antti Koponen
b47fa37cfa
Fix download URL in CF upload workflow (#2090) 2021-09-18 23:01:07 +03:00
Antti Koponen
d6aa07d93f
Fabric fixes (#2089)
* Fix SonarCloud bugs

* Remove color codes from console messages

* Replace version string in mod.json

* Advance dependency initialization to pre-enable hook

* Resolve config folder using correct method
2021-09-18 22:38:12 +03:00
Risto Lahtela
37a6ad86e9 Fix compile issues from previous commit 2021-09-18 22:30:27 +03:00
Risto Lahtela
a5c9a25444 Implemented server name support to server placeholders
Now all server placeholders (Pretty much 75% of all placeholders) can have :server name at the end

Example:
- %server_tps_day:Skyblock%
  or %server_tps_day:97cf2530-dc2f-4443-a245-90708b1deedb%
  or %server_tps_day:1%

Affects issues:
- Close #1323
2021-09-18 22:26:11 +03:00
Risto Lahtela
9d74968919 Bump Extension-GriefDefender to 2.0.0-R0.4 2021-09-18 21:53:09 +03:00
Risto Lahtela
17dae43727 Bump Extension-MarriageMaster to 2.3-R0.3 2021-09-18 21:51:32 +03:00
Risto Lahtela
02c3abaf1b Added a warning about Java 11 being needed for 5.5 2021-09-18 21:41:45 +03:00
Risto Lahtela
5dc3b39741 Catch NullPointerException thrown by some server class loaders
Affects issues:
- Fixed #2074
2021-09-18 21:30:29 +03:00
Risto Lahtela
b3674dfbda Disabled average online players graphing
Affects issues:
- Reopen #1796
2021-09-18 21:25:03 +03:00
Risto Lahtela
4b24cf1cdd Order by different date in start date query
Affects issues:
- Possibly fixed #2080
2021-09-18 21:16:23 +03:00
dependabot[bot]
49ba632477
Bump junit-jupiter from 5.7.2 to 5.8.0 in /Plan (#2083)
Bumps [junit-jupiter](https://github.com/junit-team/junit5) from 5.7.2 to 5.8.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.7.2...r5.8.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-13 08:32:43 +03:00
Antti Koponen
1072dd9ee4
Fix remaining Bootstrap data attributes (#2082)
Affects issues:
- Fixed #2063
2021-09-12 18:56:59 +03:00
Risto Lahtela
d967308afd Order by different date in start date query
Affects issues:
- Possibly fixed #2080
2021-09-11 12:52:37 +03:00
Risto Lahtela
0071190820 Fix compile issues 2021-09-10 19:16:14 +03:00
Risto Lahtela
950cee9e9f Implemented a bunch of new placeholders:
%plan_top_{category}_{timespan}_{i}%

categories: playtime, active_playtime
timespans: month, week, day, total
i: 1 to 10

Affects issues:
- Close #1884
2021-09-10 19:14:32 +03:00
Risto Lahtela
0921d1550f Remove OP->true from fabric AFK permission check
On bukkit default behavior for afk permission is false,
but it was unclear and during fabric implementation also ops were given same
behavior when permissions are not available.

Now OPs no longer have their AFK time ignored.

Affects issues:
- Fixed #2059
2021-09-10 18:42:49 +03:00
Risto Lahtela
372003591d Relocated Plan fabric configuration folder 'mods' -> 'config'
Affects issues:
- Fixed #2055
2021-09-10 18:37:56 +03:00
Risto Lahtela
f1d54bfe84 Remove non-proxy limitation from uninstalled command
After proxy was uninstalled it was not possible to remove the proxy from Plan database.

There was a check against uninstalling proxy servers which caused the issue.

Affects issues:
- Fixed #2053
2021-09-10 18:35:51 +03:00
Risto Lahtela
8ab1f075e8 Copy over uninstalled servers during db move
This is to preserve playtime of players who played on those servers

Affects issues:
- Fixed #2050
2021-09-10 18:33:41 +03:00
Risto Lahtela
bb20dff61c Disabled failing SQLite timezone test 2021-09-10 18:26:15 +03:00
Risto Lahtela
052843dcee Bump GriefDefender to R0.4 and add adhg6 as contributor 2021-09-10 18:18:35 +03:00
dependabot[bot]
ffcddb61cb
Bump sqlite-jdbc from 3.36.0.2 to 3.36.0.3 in /Plan (#2073)
Bumps [sqlite-jdbc](https://github.com/xerial/sqlite-jdbc) from 3.36.0.2 to 3.36.0.3.
- [Release notes](https://github.com/xerial/sqlite-jdbc/releases)
- [Changelog](https://github.com/xerial/sqlite-jdbc/blob/master/CHANGELOG)
- [Commits](https://github.com/xerial/sqlite-jdbc/compare/3.36.0.2...3.36.0.3)

---
updated-dependencies:
- dependency-name: org.xerial:sqlite-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-31 07:12:48 +03:00
dependabot[bot]
46b6fd62a0
Bump mockito-junit-jupiter from 3.12.3 to 3.12.4 in /Plan (#2069)
Bumps [mockito-junit-jupiter](https://github.com/mockito/mockito) from 3.12.3 to 3.12.4.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.12.3...v3.12.4)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:07:15 +03:00
dependabot[bot]
bb78d61b90
Bump mockito-core from 3.12.3 to 3.12.4 in /Plan (#2071)
Bumps [mockito-core](https://github.com/mockito/mockito) from 3.12.3 to 3.12.4.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.12.3...v3.12.4)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:04:59 +03:00
dependabot[bot]
7be0b780ef
Bump sqlite-jdbc from 3.36.0.1 to 3.36.0.2 in /Plan (#2070)
Bumps [sqlite-jdbc](https://github.com/xerial/sqlite-jdbc) from 3.36.0.1 to 3.36.0.2.
- [Release notes](https://github.com/xerial/sqlite-jdbc/releases)
- [Changelog](https://github.com/xerial/sqlite-jdbc/blob/master/CHANGELOG)
- [Commits](https://github.com/xerial/sqlite-jdbc/compare/3.36.0.1...3.36.0.2)

---
updated-dependencies:
- dependency-name: org.xerial:sqlite-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:04:26 +03:00
dependabot[bot]
ea145f8188
Bump mockito-core from 3.12.1 to 3.12.3 in /Plan (#2067)
Bumps [mockito-core](https://github.com/mockito/mockito) from 3.12.1 to 3.12.3.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.12.1...v3.12.3)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-25 15:30:06 +03:00
dependabot[bot]
0f761b4ff4
Bump mockito-junit-jupiter from 3.12.1 to 3.12.3 in /Plan (#2066)
Bumps [mockito-junit-jupiter](https://github.com/mockito/mockito) from 3.12.1 to 3.12.3.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.12.1...v3.12.3)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-25 15:29:35 +03:00
dependabot[bot]
b4f6c755f8
Bump mockito-junit-jupiter from 3.12.0 to 3.12.1 in /Plan (#2062)
Bumps [mockito-junit-jupiter](https://github.com/mockito/mockito) from 3.12.0 to 3.12.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.12.0...v3.12.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-23 07:30:11 +03:00