Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2026-07-15 02:54:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,916 Commits 1 Branch 0 Tags
f2df511263fcedec1cfa1f5539af14a79bb8d048
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
JordanandGitHub 65349392a6 Set empty block count when using fastmode on 1.17 (#1710) 
* Set empty block count when using fastmode on 1.17
Fixes #1666

* Update legacy adapters
 2022-04-21 13:11:23 +02:00
dordsor21 f5ef0cadb6 Clean up remaining byte casts from 39081e62c9 2022-04-20 23:47:09 +01:00
JordanandGitHub 465c81d193 Remove hardcoding of heightmap compressed long size (#1668) 2022-03-18 21:28:25 +00:00
JordanandGitHub 1708584e8d Don't call ticking_list on Spigot (#1655) 
* ticking_list is paper only

* Update adapters
 2022-03-14 11:08:10 +01:00
JordanandGitHub 5a97b23347 Don't error when adding processors to NullExtent, simply do nothing (#1654) 2022-03-13 18:35:27 +01:00
dordsor21 d8c0f8e3b1 Make sure thread-cached arrays are reset 2022-03-13 01:44:59 +00:00
JordanGitHubNotMyFault
 		e9db749e2f Add fluid ticking and refactor post-processing a bit (#1554) 
* Make postProcessSet a default method and change to void

* Throwable#getMessage is nullable

* Move (re-)ticking to a post-processor per "platform"
 - Add fluid ticking

* chore: Ignore (for us) irrelevant rules

* chore: Fix correct toml syntax?

* Re-add removed method for API-compliance and refactor it to have a use

* Switch to javax annotations

* Switch to recalcBlockCounts for ticking blocks.

* No need to set air count anymore either

* We can still "not tick" in fast mode in 1.17.2

* update adapters

* Let paper create the chunk section if biomes are null

* Adjust notes to settings

* 1.17.2 didn't exist

* Add 1.18.2

* Don't attempt to cache plains biome ID

* Use correct annotation

Co-authored-by: NotMyFault <[email protected]>
 2022-03-10 15:27:25 +01:00
JordanandGitHub f59353006a Update to P2 extended heights (#1581) 2022-03-09 14:21:58 +01:00
JordanandGitHub dec0373081 Fix 1.17 snapshot restoration (#1632) 2022-02-27 21:20:16 +00:00
JordanGitHubAlex
 		b8ab2a5204 Don't allow heightmap-based brushes to edit the entire world "depth" (#1617) 
Fixes #1614

Co-authored-by: Alex <[email protected]>
 2022-02-24 10:33:37 +01:00
JordanGitHubAlex
 		fc2662e51e Fix //snapshot in 1.18 and re-implement biome/entity restoration (#1620) 
* Re-add "//snap" and "//snapshot"

* Place code in correct method

* Use CompoundBinaryTags in AnvilChunk18 and implement biome/entity restoration

* Address comments

* Fix biome reading

* Fix retrieval of entities from zipped snapshot world

Co-authored-by: Alex <[email protected]>
 2022-02-24 10:33:25 +01:00
JordanGitHubAlex
 		49d5183685 Load legacy config file before firing PlatformsRegisteredEvent (#1623) 
Fixes #1622

Co-authored-by: Alex <[email protected]>
 2022-02-24 10:33:06 +01:00
JordanGitHubAlex
 		28a0239437 Fix clipboards to allow proper heights by allowing extended CuboidRegion heights (#1624) 
* Fix clipboards to allow proper heights by allowing extended CuboidRegion heights
Fixes #1534

* Add @since

* Fix javadoc comment

Co-authored-by: Alex <[email protected]>
 2022-02-24 10:32:45 +01:00
JordanandGitHub 39081e62c9 byte cannot be used to represent height anymore (#1618) 
Fixes #1593
 2022-02-17 19:34:25 +01:00
JordanandGitHub f7a0c14a1b Correctly use getNearestSurfaceTerrainBlock in SurfaceSpline and SchemGen (#1616) 
Fixes #1609
 2022-02-17 19:34:07 +01:00
dordsor21 3f28a5759d Make slope method slightly more readable in AngleMask 2022-02-16 18:18:58 +00:00
dordsor21 a40d1ccf51 Better naming for min position in HeightMap 2022-02-16 18:13:04 +00:00
dordsor21 fbe0c08c26 FAWE HeightMap constructor shouldn't be deprecated 2022-02-16 18:02:20 +00:00
dordsor21 05bd84b504 Don't crazily initialise HeightMapFilter...?? 2022-02-16 17:47:43 +00:00
dordsor21 3e85369765 Make angle pattern slope a little more readable 2022-02-16 17:42:22 +00:00
dordsor21 de4f73997e Implement missing methods in tests 2022-02-12 13:38:04 +00:00
JordanandGitHub 178604bbb7 Only call org.bukkit.World height methods if they're present (1.17+) (#1551) 
* Only call org.bukkit.World height methods if they're present (1.17+)

* Switch to WorldEdit get height methods in GPFeature
 2022-01-29 13:12:16 +01:00
dordsor21 d3696f91d4 Synchronise access to the PriorityQueue used for effect queuing in AbstractWorld 
- Makes it thread-safe
 2022-01-15 17:09:49 +00:00
JordanandGitHub 6a972e7b99 Heightmaps used for brushes etc. should be normalised to zero. (#1522) 
* Heightmaps used for brushes etc. should be normalised to zero.
Fixes #1508

* chars are unsigned

* Add scale paramer to javadoc
 2022-01-14 10:49:23 +01:00
dordsor21 c2f3c13a09 Fix #1510 2022-01-08 18:10:14 +00:00
dordsor21 4754f660c7 Fix #1524 
Also brings in line with upstream
 2022-01-08 17:46:28 +00:00
dordsor21 59d4247ddb Update legacy adapters 2022-01-05 23:53:02 +00:00
dordsor21 867d4c05cb Merge branch 'main' of github.com:IntellectualSites/FastAsyncWorldEdit into main 2022-01-05 23:43:31 +00:00
dordsor21 d6695d23f0 Replace remaining instances of worldeditregentempworld 2022-01-05 23:42:57 +00:00
dordsor21 722c411219 Add workaround for when expressions are parsed in masks/patterns where '&&' is used 
Fixes #1517
 2022-01-05 17:46:18 +00:00
dordsor21 42dacfc7ef Fix incorrect toNative method in 1.17 adapter 2022-01-04 13:28:29 +00:00
dordsor21 0994ea1e67 Fix issue with offset/origin when pasting a clipboard via API without wrapping into a BlockArrayClipboard 2021-12-30 16:05:16 +00:00
dordsor21 f30ea96268 Refactor: add javadoc to Clipboard#create and improve variables when delegating to another paste method 2021-12-30 16:04:38 +00:00
dordsor21 9faacb38ef Warn user if using small-edit history setting with extended world heights 2021-12-30 16:01:23 +00:00
dordsor21 235d0360da Don't wrap Exception thrown upon invalid schematic path inside a RuntimeException 
Fixes #1506
 2021-12-29 16:55:32 +00:00
dordsor21 52fa44516e Throw, catch, and rethrow our own exception to make sure we're finding the culprit to a possible shaded-FAWE. 2021-12-29 16:47:34 +00:00
dordsor21 9e8f0e7325 Refactor: getVersionMin/MaxY -> versionMin/MaxY 2021-12-29 16:44:41 +00:00
dordsor21 f505828af1 More enhanced switches 2021-12-29 16:44:18 +00:00
dordsor21 8d565b93f7 Compress switch statements a bit using enhanced 2021-12-29 16:39:44 +00:00
dordsor21 867b28d439 Remove remaining keywords frm CachedChanged. IJ doesn't warn? 2021-12-29 16:37:21 +00:00
dordsor21 fd3619f7b5 Merge branch 'major/2.0.0/1.18' of github.com:IntellectualSites/FastAsyncWorldEdit into major/2.0.0/1.18 2021-12-29 16:30:12 +00:00
dordsor21 3a3143065d Remove/add some more comments 2021-12-29 16:29:55 +00:00
dordsor21 ca5640e89e Replace CachedChange class with record 2021-12-29 16:16:23 +00:00
dordsor21 e5cbdec67e Remove unneeded comments 2021-12-29 16:14:13 +00:00
dordsor21 e2a1721a5c Use new language features 2021-12-29 16:12:43 +00:00
dordsor21 0d79d084a5 Rename worldedit to fawe where appropriate 2021-12-29 16:12:16 +00:00
dordsor21 3c2394afa4 Add comments to changed code 2021-12-29 16:06:49 +00:00
dordsor21 f38859237a Move to BinaryTags where appropriate in adapters 2021-12-29 16:00:49 +00:00
dordsor21 48e2953910 Update log4j version, update jd links to use "latest" 2021-12-29 15:30:25 +00:00
dordsor21 1a281badc2 Remove mentions of NMS from compilation instruction 2021-12-29 15:30:12 +00:00
JordanandGitHub 177d731957 Add back statically-set reserved IDs for air blocks only, make it clear they're "reserved" (#1502) 
* Add back statically-set reserved IDs for air blocks only, make it clear they're "reserved"
Also:
 - Ensure that reserved is never returned in GET block operations
 - "empty" thus doesn't exist in the GET update methods; remove the needless checks
 - Allow GET/SET chunks to determine their own default values for non-present blocks/sections

* Add comments
 2021-12-29 16:17:20 +01:00
dordsor21 bca3a1b04d More precise method names in MinecraftVersion 
- Also ensure correct comparisons are made in FaweBukkit and BukkitServerInterface
 - Fixes #1504
 2021-12-29 14:46:30 +00:00
dordsor21 c28a5ee66e Merge branch 'main' into major/2.0.0/1.18 2021-12-29 00:19:25 +00:00
dordsor21 d19369401f Don't force tick limiter enable/disable 2021-12-29 00:18:12 +00:00
dordsor21 3ec1912046 Fix tests 2021-12-28 23:22:59 +00:00
dordsor21 36857a5064 Fix #1490 2021-12-28 23:02:48 +00:00
dordsor21 f6319d36a1 Add methods to CLIPlatform 2021-12-28 22:58:25 +00:00
dordsor21 f236934a39 Add get default version min/max world height to platform 
- Fixes #1500
 2021-12-28 22:46:19 +00:00
dordsor21 46fdceaea6 add missing annotation to Region 2021-12-28 22:05:40 +00: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
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
JordanandGitHub 6b6c94556a refactor! Remove deprecations marked for removal that are not present in upstream (#1483) 2021-12-22 01:53:45 +01: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
dordsor21 e9d97fc7b1 Update version (checking) for semver 2021-12-20 21:18:26 +00:00
JordanGitHubNotMyFaultMatt
 		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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: Matt <[email protected]>
 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
dordsor21 ef61ecccaa Fix tab completion when *not* using %. 
- Also allow tab-completion of % pattern when it's the first/only pattern being used
 - Also don't error when attempting to tab complete an invalid percent value
 2021-11-18 18:42:19 +00:00
dordsor21 9bf9885ffb Fix tab completion of % (random) pattern removing the % part of the input 2021-11-16 14:54:43 +00:00
dordsor21 5692ec54dd Parse with square brackets after a % modifier 
- Fixes #1409
 2021-11-16 14:32:25 +00:00
dordsor21 66357b8adb Fix RichParser assuming it should be used if its prefix is short than, and contained by, the input 2021-11-16 12:49:54 +00:00
dordsor21 575b0035df Should be equals in checking if valid prefix when not shorter and with no arguments 2021-11-16 12:48:09 +00:00
dordsor21 cf6f54bd28 Fix RichParser suggestion sometimes giving a different pattern/mask when specifying arguments 2021-11-16 12:19:08 +00:00
dordsor21 527b7141a3 RandomPatternParser is an upstream class 2021-11-15 18:02:43 +00:00
JordanandGitHub 6df16cfe96 refactor: Alter handling of errors in bindings (#1395) 
* Alter handling of errors in bindings
 - Fixes #1384

* Arbitrarily use TextComponent#of for InputParseException
 2021-11-11 17:37:25 +00:00
dordsor21 806ea14ad2 Unfix #826 in favour of allowing toggling the wand 
- #826 is a pretty niche requirement, usually permissions do not change without a world change, relog, etc. very frequently
 - Allowing //toggleeditwand and /tool none on the wand feels more important
 2021-11-10 22:13:44 +00:00
dordsor21 f04e891e0c Allow schematics with empty, but present, biome data 2021-11-10 19:45:49 +00:00
dordsor21 7a9549b75a Unmerge wall/"besides / |" masks 2021-11-08 15:49:43 +00:00
dordsor21 95ecb5609d Check for worldguard bypass permissions 2021-11-05 19:04:15 +00:00
dordsor21 21b6f582e1 Switch some Caption#of to TextComponent#of 2021-11-03 18:33:19 +00:00
dordsor21 d91a971e85 Allow extent to be used down the pipeline in BlockReplace 
- It's quite likely for this to be required given BlockReplace use in replacenear
 - Fixes #1390
 2021-11-02 20:53:14 +00:00
dordsor21 0674f39600 Synchronise chunk filtering 2021-11-02 13:34:37 +00:00
dordsor21 1b1f3bbcbe Fix #1375 2021-10-25 15:04:59 +01:00
dordsor21 47f25c4f31 Slight cleanup of region parsing in EditSessionBuilder 2021-10-25 14:13:26 +01:00
dordsor21 f7e94fd450 Only add backupregions if whitelisting 2021-10-25 14:12:36 +01:00
dordsor21 4e6aee6bfb Don't consider global region for blacklisting WG regions 2021-10-25 14:12:21 +01:00
dordsor21 75be38925f Fix #1378 2021-10-25 14:11:17 +01:00
dordsor21 3d70d9e496 RegionIntersection requires List constructor 2021-10-23 14:09:01 +01:00
dordsor21 ae949d607b Move paperweight to BinaryTag 
- Upstream put paperweight into master branch, which doesn't have BinaryTags
 - Fixes #1374
 2021-10-22 16:00:51 +01:00
dordsor21 857090bdde Add meaningful default methods to getMask for region protection 2021-10-21 18:25:36 +01:00
dordsor21 8ed4736066 Add override and correct default method for fromNative 
- Fixes #1370
 2021-10-20 13:47:55 +01:00
dordsor21 13be5a22ad Fix #1370 
- Actually override toNative in adapter
 - Correctly assign generic-type
 - Better default method for BinaryTag retrieval in adapter
 2021-10-19 15:14:25 +01:00
dordsor21 4ee61a93c8 Fix incorrect method params 2021-10-19 14:34:35 +01:00
dordsor21 252abf862b Add more Refraction 2021-10-19 14:30:51 +01:00
dordsor21 37eb4a1008 Regress to upstream for (Binary)Tags in data fixers 2021-10-19 14:12:02 +01:00
dordsor21 b5479e480d Don't attempt to run null P2 tasks 2021-10-19 13:35:00 +01:00
dordsor21 8fe610311d Comments 2021-10-17 15:53:19 +01:00
dordsor21 c7c00021b2 Cleanup 2021-10-17 15:53:19 +01:00
dordsor21 7d894228d0 Implement region blacklisting 2021-10-17 15:53:04 +01:00