Commit Graph

138 Commits

Author SHA1 Message Date
79e8755d93 Update Upstream
eb7b79c Use require instead of strictly to reduce problems with mojang/bukkit updates (1787)
2021-06-17 10:44:19 +02:00
aa0ad16a1b Update to Gradle 7 (#1078) 2021-05-14 23:42:37 +02:00
9aa25ce109 Update Upstream
876108f Prepare for Gradle 7, but due to FG only get to 6.9
Touches #1020
2021-05-14 10:31:32 +02:00
036e8473b4 Fix unit tests + Version Determination (#1055)
* Fixed unit tests and determine chunksStretched based on package version

* Fixed requested changes
2021-05-07 23:47:35 +02:00
7e3525a6a2 Closes #1018
And update serverlib
2021-04-27 11:16:12 +02:00
cc75654b05 Do not append commit when building locally
Because the commit is the version when building locally.
2021-04-19 12:56:34 +02:00
64a0a1d8e3 Change external jar classpath to FastAsyncWorldEdit (#1016)
Co-authored-by: NotMyFault <mc.cache@web.de>
2021-04-10 23:28:20 +02:00
dc51379e8f Update upstream
acf9c3b Change oak stair shape to straight in legacy.json.
c7da4c0 Swap out logback for log4j2
2021-04-05 23:14:20 +02:00
b96cea75b8 Update Upstream
609c7b8 Scrapped Logging Framework 4 Java

Closes #997
Closes #998
Closes #999
Closes #1000
Closes #1001
Closes #1002
2021-03-29 15:29:16 +02:00
784db1e9c8 Include project name in jar 2021-03-26 21:21:45 +01:00
6bd866bdf7 Making renovate happy
Closes #940
Closes #933
Closes #931
2021-02-27 15:52:50 +01:00
0b65533294 Show a message with install instructions when running the jar file
Co-Authored-By: Matthew Miller <mnmiller1@me.com>
2021-02-25 22:58:17 +01:00
20304bf7ad Cherry-pick build-script changes from upstream 2021-02-11 12:00:28 -05:00
8b1f043dc5 Update so many dependencies, merge Forge/Fabric for final jar (#1651)
* Update so many dependencies, merge Forge/Fabric for final

* Clean up contrib docs for Gradle change

* Fix setting compat flags while using toolchain

* Fix deprecation in doc printer

* Restore proper forge JAR name

* Add dist classifier for mod jar

* Properly relocate new bStats

* Fix jar used from fabric

* Fix fabric bom

* Dup the shaded classes for consistency

* Sync Forge/Fabric log4j versions, de-dup

* Downgrade both log4j. This will work

* Update some plugins as well

* Drop the fabric force stuff

* Use duplicate strategy to directly merge jar
2021-02-04 17:45:49 -05:00
f3d4621589 Minor build script changes 2021-02-04 17:06:49 -05:00
ef596664bc Properly name repositories 2021-01-21 13:34:33 +01:00
a300abae41 Properly define WorldGuard version 2021-01-21 13:21:54 +01:00
c35ebd7b53 Only scan used repositories 2021-01-21 13:07:17 +01:00
acc8a79e8e Leave a note about unsupported versions 2021-01-19 20:23:37 +01:00
2ce493ae68 Miscellaneous improvements to build scripts. 2021-01-18 15:58:50 -05:00
9058ecdf34 Slight performance improvement during dependency resolution 2021-01-07 21:31:24 -05:00
428f8e201d Upstream changes (#717)
* Perform part of the move of //fast to //perf (#1377)

This re-adds a deprecated `//fast` and moves the current logic to
`//perf`. Later `//perf` will have its syntax reworked, when Piston
finally supports sub-commands properly!

* Names via Translation (#1268)

* Deprecate BiomeRegistry, etc.

* Update some libraries, e.g. text

* Move to new translation renderer

* Revert "Deprecate BiomeRegistry, etc."

This reverts commit 59a5d6c92aec52739a8dc68ac3d23898af7593dd.

This was not a good idea for potential mod shenanigans.

* Move BiomeData#getName to BiomeRegistry, use i18n

* Use getRichName instead of getName

* Implement getRichName for NullBiomeRegistry

* Add getRichName for blocks

* Relocate net.kyori.minecraft

* Update adapters for getRichBlockName

* Add getRichName for items

* Update adapters for getRichItemName

* Update adapters JAR for merge

(cherry picked from commit cfd26253b6fb59ff6c65a0157a6780be7db4ea5a)

* Follow-up fixes for 92f877679622a27b16b9e5cd61cfec1a6545be33

* Don't send deprecation warning and improve info message

* Fix click command for perf box

(cherry picked from commit 7ee60060c31df2f8b41212b430a0875312189339)

* update R3 adapter§

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
Co-authored-by: NotMyFault <mc.cache@web.de>
Co-authored-by: Aurora <21148213+aurorasmiles@users.noreply.github.com>
Co-authored-by: Aurora <aurora@relanet.eu>
2020-11-09 10:38:10 +01:00
96dcb95b7c Javadoc and Formatting fixes. (#619)
Javadoc and Formatting fixes.

Also, extremely minor code changes which have been tested.
This commit is only part one of two commits that aim to fix problems with formatting in our project. In part two I will modify the Google Java Style Guide (since it closely matches our code style) for our project so there is guidance on how to format and document. 

* Updated PlotSquared URL
* Removed plugin acronyms
* Fixed a typo
* Fixed grammar
* Use modern block id's
* Update YouTube video URL
2020-10-05 13:41:41 -04:00
2e73746abe Remove Kotlin (#625)
Shrinks the jar size since we no longer must bundle the Kotlin library. The downside is that some classes grew in size compared to their Kotlin versions.
Many contributors didn't care for Kotlin either.
2020-09-17 16:31:55 -04:00
28767d6e0f Officially propagate GPL downwards to all files
(cherry picked from commit f2ce020da059718e34342c149172944dfd02b775)
2020-09-01 16:30:43 -04:00
eeb02d3937 Update gradle and kotlin 2020-08-24 22:53:29 -04:00
0a07599abf Update build files and NOTICE.txt 2020-08-14 15:29:15 -04:00
3bc692ff11 Part 1 of upstream merge and format 2020-07-13 22:50:59 -04:00
852abce989 Build script cleanup/updates.
(cherry picked from commit 57b73b9e1f35fa7abb4738ccba7a45d9e1fdc786)
2020-07-06 23:43:16 -04:00
da577a3752 Fix buildscript issue on certain locales.
(cherry picked from commit e64cfe5d3776cb74288591f3e0d19ed4bfe45518)
2020-07-06 23:42:18 -04:00
238c56a3c6 Revert "Revert matt's changes"
This reverts commit bfcc6184ad.
2020-06-13 14:41:36 -04:00
bfcc6184ad Revert matt's changes
Let's not break Fawe, thanks
2020-06-13 18:48:57 +02:00
c72f3eeb58 Bump text versions for 1.16 and action bar fixes
(cherry picked from commit 5132c5e8a83812e2341df87e0ac239cc948a0b5f)
2020-06-12 21:45:48 -04:00
bdc129cf7b Update to latest p2 v5
(implement FAWE biome setting)
2020-05-14 16:20:17 +01:00
864d160102 Update Piston to fix bugs
Closes #1292 via Piston fixes.

(cherry picked from commit dc56b602c0367fbd24f954de2b8be4e864add59f)
2020-04-24 16:05:15 -04:00
77a2f1bc41 Remove unneeded repository
PlotSquared 4 and PlotSquared 5 are both on the same maven repo
2020-04-24 15:54:40 -04:00
8bde932354 Add p2 v4 compat.
Anyone that hasn't built FAWE before won't be able to build it again as the v4 repo doesn't exist - it relies on local gradle cache.
2020-04-22 08:10:17 +01:00
952aaf8b43 Fix p2 compatibility and replace empcraft.com/maven2 2020-04-21 11:39:42 +01:00
ff47e6f717 Cherry-pick to fix EntryMaker issue 2020-04-16 20:26:55 -04:00
735a37ffd0 Use custom radix sort for ordering blocks (#1277)
* Use custom radix sort for ordering blocks

* Licenses :P

* Fix ordering, add test for it

* Grant Gradle more memory (thx Fabric)

* Increase (?) / Specify memory for core tests

* Many attempts at fixing OOM

(cherry picked from commit bb013aa89b8457c4649e2546eef0aa94b9fc4020)
2020-04-10 13:42:27 -04:00
692caeea8a Read WE version from manifest ourselves
(cherry picked from commit 947775b5e54aa9dd89d68ee0b382939796301902)
2020-03-23 19:31:56 -04:00
5de7c31a8c Update gradle 2020-03-03 15:36:21 -05:00
b7b11cc478 Gradle Upgrades and Clipboard Refactoring 2020-03-02 17:43:27 -05:00
728b36cd8c Remove dead code and minor changes to existing code 2020-02-18 13:18:43 -05:00
75653087b9 Remove FAWE-Piston
Disables a lot of previous functionality in FAWE until replacements can be made. This commit was untested and may cause major issues.
2020-02-05 00:37:42 -05:00
0d2fff2cd2 Upstream Merge 2020-01-10 22:32:12 -05:00
1414859773 Expand javadocs
Expanding javadocs task a bit makint it easier to visualize using jenkins
2020-01-07 22:11:47 +01:00
f3e0109be2 A lot of small changes 2020-01-03 15:38:30 -05:00
59b8465493 Merge remote-tracking branch 'upstream/feature/translatable-text' int… 2019-11-21 13:50:28 +00:00
66744bfaa4 Merge remote-tracking branch 'upstream/feature/translatable-text' into i18n-merge 2019-11-21 13:50:05 +00:00