Commit Graph

6743 Commits

Author SHA1 Message Date
NotMyFault
596356a936
refactor: Shift FileAlreadyExistsException catch to a higher level 2021-12-27 00:00:49 +01:00
SirYwell
07695786ca return air instead of reserved on get blocks 2021-12-26 19:52:02 +01:00
NotMyFault
040a011ff1
Merge branch 'main' into major/2.0.0/1.18 2021-12-26 16:24:36 +01:00
SirYwell
a717df3c5f implement 1.18 regen 2021-12-26 16:20:39 +01:00
SirYwell
4ab140f6a1 use spigot-compatible packet constructor 2021-12-26 10:37:32 +01:00
SirYwell
018042769d use spigot-compatible palette constructor 2021-12-26 09:31:03 +01:00
NotMyFault
0c8db1e1fe
feat: Add a bunch of new types to the flora generator 2021-12-25 19:03:30 +01:00
NotMyFault
42035bdb87
chore: Lazily prepare update checker for future job
Future versions of Fawe use a version agnostic job. This commit will remain unmerged to any other branch but warrant a working update checker.
2021-12-25 17:24:26 +01:00
NotMyFault
3b24a8ae8a
Merge branch 'main' into major/2.0.0/1.18 2021-12-25 17:20:52 +01:00
Hannes Greule
96ca83704a
fix: Backport fixing delay closing of clipboards on quit (#1493) 2021-12-25 17:18:39 +01:00
NotMyFault
28079e8129
refactor: Also deprecated IMP for DBHandler 2021-12-23 15:59:05 +01:00
Aurélien
ca5ad58f01
Fix WEManager (#1487)
* Fix WeManager?

* Fix WeManager?

* Also register WEManager if not available, like TaskManager.
2021-12-23 12:39:11 +01:00
NotMyFault
7da921e075
refactor: Deprecate IMP initializors in favor of builders 2021-12-22 20:58:23 +01:00
dordsor21
34f971c729
Add classes with the correct minor version to the start of the adapter candidates list 2021-12-22 12:19:20 +00:00
NotMyFault
1715f35341
refactor: Do prepared statements properly
- Update TextureUtil client jar to 1.18.1
- Limit the update checker to our domain
2021-12-22 13:10:04 +01:00
dordsor21
77802758a9
Fix parsing of build in FaweVersion 2021-12-22 11:44:37 +00:00
dordsor21
d98f626ba6
Reverse a "debug" change to BukkitImplLoader 2021-12-22 11:37:01 +00:00
Jordan
6b6c94556a
refactor! Remove deprecations marked for removal that are not present in upstream (#1483) 2021-12-22 01:53:45 +01:00
NotMyFault
a4cec49e89
fix: Fix /fawe debugpaste 2021-12-22 00:53:27 +01:00
NotMyFault
94b392dd39
refactor: Address a few TODO 1.18's
(cherry picked from commit 0b77932b6e46c825d78b8c7ccae2a68ad890564e)
2021-12-21 18:02:20 +00:00
dordsor21
28f3bc61ea
More verbosely get block data and ensure biome layer isn't null 2021-12-21 18:00:09 +00:00
dordsor21
9ec829eddf
Update adapters jar 2021-12-21 17:59:55 +00:00
NotMyFault
aff3d8ba49
build: Deploy API snapshots for 2.0.0 2021-12-21 17:48:56 +01:00
NotMyFault
c9dc1ed655
Merge branch 'main' into major/2.0.0/1.18 2021-12-21 17:31:46 +01:00
Alex
8ab1d50f01
docs: Issue templates are provided by the default branch 2021-12-21 17:22:00 +01:00
NotMyFault
7453f12e66
chore: Lazily change build delimiter 2021-12-21 16:27:46 +01:00
NotMyFault
78aff4c81f
build: Update paperweight and add 1.17 again 2021-12-21 11:11:08 +01:00
NotMyFault
d6110013b8
tests: Add resource pack methods 2021-12-21 00:42:46 +01:00
NotMyFault
01ce0f94af
Trigger GHPRB 2021-12-21 00:30:36 +01:00
NotMyFault
6350fe5411
build: Fix release drafter base branch 2021-12-20 22:20:41 +01:00
dordsor21
e9d97fc7b1
Update version (checking) for semver 2021-12-20 21:18:26 +00:00
Jordan
d6e3c331d4
Make 1.18 to be effectively in a usable state (#1452)
* Update swathes of easy-to-update-sort-of-code.
 - Untested
 - Should compile but NMF broken something
 - Several todos:
  - biome history//better support (move to biome sections in core)
  - regen (haha lol no thanks, someone else can do that)
  - probably actually do the palette stuff that probably won't work in PaperweightPlatformAdapter

* ci: Provide basic Jenkinsfile for ghprb pipeline

* build: Update paperweight

* upstream: Update Upstream

de6fa17 Add getBrush helper for use with instanceof pattern matching (1926)

* FAWE will now load on startup

* it....works?

* Begin to allow biome edits (and fix biomes reverting to plains upon editing blocks)

* Add new blocks/block properties

* Only create biome palette if supplies is null

* Fix biome operations

* Finally get removing BlockID done (major version change allows it)

* refactor!: Drop PlotSquared v4

Fawe 2.0.0 and newer requires Java 17, PlotSquared v4 supports 1.13 and 1.14, Fawe wont work on these versions nevertheless and refuses to load due Java version incompatiblities with older versions. Newer versions can use PlotSquared v6.

* docs: Update readme

* Added and removed some comments

* Added and removed some comments

* refactor: Rename worldedit configuration

* build: Re-add 1.17 module

This the a very nasty commit

* chore: Implement missing methods

* build: Update paperweight

* upstream: Update upstream

6df194e Remove finalize, use a Cleaner instead (1943)
9843a4f Fix snapshots in 1.18 (1959)

* ci: Escape workflows

* build: Update paperweight to 1.18.1

* build: Update Paster

* Fix compilation

* Bump to 1.18.1

* Do both 1.18 and 1.18.1

Co-authored-by: Alex <mc.cache@web.de>

* Fix single-block lookups

* Reserve ordinals 0 through 3 for air/"reserved"

* Create block palette data with values

* Fix classpath for testing for starlight

* Correctly use block rather than sky light layer [not used in paper]

Co-authored-by: NotMyFault <mc.cache@web.de>
Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com>
2021-12-20 21:12:04 +00:00
dordsor21
c697eb8d41
Merge branch 'main' into major/2.0.0/1.18 2021-12-20 20:28:15 +00:00
renovate[bot]
37cc817cbe
build: Update dependency org.checkerframework:checker-qual to v3.21.0 (#1478)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-12-20 17:10:06 +01:00
renovate[bot]
c04cc7bec5
build: Update org.apache.logging.log4j to v2.17.0 (#1480)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-12-20 17:09:57 +01:00
renovate[bot]
0e0883cfb8
build: Update dependency org.mockito:mockito-core to v4.2.0 (#1479)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-12-20 17:06:53 +01:00
renovate[bot]
fc56304af2
build: Update com.google.auto.value to v1.9 (#1475)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-12-20 12:23:15 +01:00
renovate[bot]
99da51270a
build: Update dependency gradle.plugin.com.github.johnrengelman:shadow to v7.1.1 (#1474)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-12-20 12:23:07 +01:00
renovate[bot]
511036be23
build: Update dependency gradle to v7.3.2 (#1473)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-12-20 11:59:39 +01:00
whitesource-bolt-for-github[bot]
4a6e2a87aa
Configure WhiteSource Bolt for GitHub (#1468)
* Add .whitesource configuration file

* chore: Update bolt

Co-authored-by: whitesource-bolt-for-github[bot] <42819689+whitesource-bolt-for-github[bot]@users.noreply.github.com>
Co-authored-by: NotMyFault <mc.cache@web.de>
2021-12-18 13:30:02 +01:00
NotMyFault
a87323616d
Merge remote-tracking branch 'origin/renovate/org.checkerframework' 2021-12-13 20:18:34 +01:00
Renovate Bot
a7b45e7f54
build: Update org.apache.logging.log4j to v2.15.0 2021-12-13 19:01:34 +00:00
Renovate Bot
a360026490
build: Update dependency org.checkerframework:checker-qual to v3.20.0 2021-12-13 17:25:07 +00:00
renovate[bot]
1f0f079193
build: Update com.plotsquared to v6.2.0 (#1462)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-12-13 14:22:29 +01:00
Alex
9fdff97e29
build: Update paperweight (#1454) 2021-12-10 16:20:15 +01:00
Hannes Greule
5367921496
fix: Use WE PaperweightAdapter for seed replacement (#1440)
* Use WE PaperweightAdapter for seed replacement
also, only replace when necessary

* fix comments

* ci: Provide basic Jenkinsfile for ghprb pipeline (#1451)

Co-authored-by: Alex <mc.cache@web.de>
2021-12-07 12:59:58 +01:00
Owen1212055
781bfc542f
fix: Properly delete ChangeSets on history clear (#1413)
Fixes #1347

Co-authored-by: Jordan <dordsor21@gmail.com>
Co-authored-by: Alex <mc.cache@web.de>
2021-12-06 14:31:46 +01:00
renovate[bot]
e0e3688361
build: Update dependency org.ajoberstar.grgit:grgit-gradle to v4.1.1 (#1447)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-12-06 10:22:44 +01:00
renovate[bot]
ec690f888b
build: Update plugin pluginyml to v0.5.1 (#1448)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-12-06 10:22:37 +01:00
renovate[bot]
0fe847c69a
build: Update dependency com.github.TownyAdvanced:Towny to v0.97.5.0 (#1445)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-12-06 10:11:08 +01:00