Commit Graph

4982 Commits

Author SHA1 Message Date
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
dependabot[bot]
7d00273bed
Bump gson from 2.8.7 to 2.8.8 in /Plan (#2061)
Bumps [gson](https://github.com/google/gson) from 2.8.7 to 2.8.8.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.8.7...gson-parent-2.8.8)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  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:29:36 +03:00
dependabot[bot]
c6efc7348d
Bump mockito-core from 3.12.0 to 3.12.1 in /Plan (#2060)
Bumps [mockito-core](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-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-23 07:28:56 +03:00
dependabot[bot]
6014444132
Bump mockito-junit-jupiter from 3.11.2 to 3.12.0 in /Plan (#2056)
Bumps [mockito-junit-jupiter](https://github.com/mockito/mockito) from 3.11.2 to 3.12.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.11.2...v3.12.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-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-08-20 15:30:53 +03:00
dependabot[bot]
ffac6c534a
Bump mockito-core from 3.11.2 to 3.12.0 in /Plan (#2057)
Bumps [mockito-core](https://github.com/mockito/mockito) from 3.11.2 to 3.12.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.11.2...v3.12.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  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-08-20 15:29:53 +03:00
Antti Koponen
5e603ccb3a
Fix Curseforge upload action (#2054) 2021-08-20 07:44:52 +03:00
Risto Lahtela
672ca9c1ef
Update versions.txt 2021-08-19 20:19:10 +03:00
Antti Koponen
48f9a430c5
Fabric platform updates (#2048)
- Increased Gradle max heap to 1 GB to avoid running out of heap space on build
- Added Slimjar for runtime dependency management
- Modified platform logger to parse JUL.Logger-format parameters to log4j format
- Added logic to properly handle InvalidArgumentExceptions with commands
- Updated loom to 0.9.+, fixes annoying console spam when building
- Moved mod JSONs to fabric's resources folder to correctly add refmap key to mixins.json
- Updated mappings & API

Affected issues:
- Fixed #2045
2021-08-09 07:36:15 +03:00
Risto Lahtela
2b257d5373 Add player kill related placeholders
- %plan_player_player_caused_deaths%
- %plan_player_deaths%
- %plan_player_mob_caused_deaths%
- %plan_player_kdr%
- %plan_player_mob_kdr%
- %plan_player_recent_kill_<1-10>%
- %plan_player_recent_death_<1-10>%

Affected issues:
- Close #1312
2021-08-08 16:24:11 +03:00
Risto Lahtela
62cf3ddc6c
Added javascript that calculates average players online for the graph (#2047)
Affects issues:
- Close #1796
2021-08-08 10:53:43 +03:00
Risto Lahtela
b94b4481ae Update FloodGate Extension to R0.2
Ignores LinkageError related to method signature change

Affected issues:
- Close #2004
2021-08-08 09:37:44 +03:00
Risto Lahtela
06bc3d00e7 Update ViaVersion Extension to 4.0.1-R0.1 2021-08-08 09:31:22 +03:00
dependabot[bot]
e066ff7215
Bump io.github.slimjar from 1.2.1 to 1.2.2 in /Plan (#2043)
* Bump io.github.slimjar from 1.2.1 to 1.2.2 in /Plan

Bumps io.github.slimjar from 1.2.1 to 1.2.2.

---
updated-dependencies:
- dependency-name: io.github.slimjar
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Added vshnv.tech repository for including the slimjar library jar

* use papermc.io/repo for downloading slimjar dependencies

Affects issues:
- Resolved https://github.com/slimjar/slimjar/issues/52
- Resolved https://github.com/slimjar/slimjar/issues/53

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Risto Lahtela <24460436+AuroraLS3@users.noreply.github.com>
2021-08-08 09:21:44 +03:00
Antti Koponen
d29a94e6a4
Implement SlimJar as a runtime dependency downloader (#1990)
MySQL & SQLite are dynamically (down)loaded to the classpath instead of being shaded.

Affects issues:
- Close #1944
2021-08-07 15:29:54 +03:00
MAXOUXAX
9873eceeb4
Added ViaVersion as an optional dependency on Velocity (#2039) 2021-07-31 19:40:05 +03:00
SkipM4
ff3367834f
locale_CN update by SkipM4 (#2038) 2021-07-30 15:18:52 +03:00