Commit Graph

55 Commits

Author SHA1 Message Date
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
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
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
5d8adbc10c Merge remote-tracking branch 'upstream/master' into merge 2019-11-19 21:25:36 +00:00
2c9f192baf Merge remote-tracking branch 'upstream/master' into merge 2019-11-19 21:23:47 +00:00
10a6619853 Update to latest P2 2019-11-10 22:20:46 +00:00
82f5c4ebed Fix compile 2019-11-07 10:28:17 +00:00
2080e9786b commanding-pipeline diff 2019-10-23 05:23:52 +01:00
91a78f725a Some shading fixes 2019-10-19 00:48:49 -07:00
da3019ae3d More compile fixes and upstream mergesa 2019-10-09 16:15:26 -04:00
11d30d2f94 Disabled FAWE commands until the plugin can actually set a block again 2019-10-07 15:09:52 -04:00
3431bd0644 Remove old plugin support and migrate to Piston (non-FAWE) 2019-10-07 12:27:18 -04:00
03c0cce53e Update to Piston 0.5.2 + Doctools/Deprecation improvements (#523)
* Update to Piston 0.5.2

* [Doctools] Fix output, be verbose about deprecations

* Improve deprecation system, doctools output
2019-10-05 19:06:18 +10:00
445b7706fc Restructure how Loom is included in build env 2019-09-22 13:42:26 -07:00
8b96cdc9a5 *
A tribute to Jesse
2019-09-20 21:52:35 -04:00
714f8583f3 Update gradle 2019-09-14 01:54:39 +02:00
8fdd15f357 [CLI,Libs] Minimize CLI, exclude slf4j from libs 2019-09-01 20:11:34 -07:00
aa4c443358 Revert "Revert 'revert ivy change'" 2019-08-26 06:03:58 +01:00
edb626a961 merge 2019-08-26 05:49:00 +01:00
4e49d16505 fix dependencies 2019-08-26 05:45:03 +01:00
c5d3c4dca7 Build "Fawe" and credit Matt ❤️
Also update PlotSquared stuff
2019-08-23 15:48:51 +02:00
135c12b650 More compile fixes 2019-08-22 13:14:27 -04:00
6998c2d230 fix compile 2019-08-20 16:03:50 -04:00
e415e73623 Another attempt to fix piston 2019-08-20 15:30:55 -04:00
0f5c49c9f5 comment out a maven url 2019-08-20 15:23:14 -04:00
64a1bfc9b3 migrate to gradle to kotlin 2019-08-20 14:52:24 -04:00
f472c20bfb Memory optimizations (#505)
* Remove LocatedBlock overhead in LBL map

* Add new space-efficient block map, with thourough testing

* Drop ordering property, add full insertion test

* Add licenses

* Fix mocked platform conflicts

* Disable full block map testing for faster builds

* Re-implement BlockMap with fastutil maps

* Re-write chunk batching to be memory efficient

* Make MultiStageReorder use BlockMap

* Increase LBL load factor, fix long-pack limit detection

* Fix infinite loop in chunk batching

* Save memory in history by cleaning up MSR

* Re-implement LocatedBlockList in BlockMap

* Fix data race with BlockType lazy fields

* Make IDs ALWAYS present, only runtime-consistent. Use for memory efficiency in BlockMap

* Remap inner structure of BlockMap for smaller maps

* Remove containedBlocks fields, not very efficient

* Fix minor de-optimizing bug in stage reorder

* Make long packed y signed

* Add extended Y limit configuration option

* Add licenses

* Store 3 ints for unoptimized BV list

* Add final to BitMath

* Correct int-cast for long-packing
2019-08-12 22:06:40 +10:00
449b0991f3 Bump to Piston 0.4.3 2019-07-22 21:20:40 +10:00
429d022752 Move Core to JUnit 5 2019-07-15 16:38:33 -07:00