Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,299 Commits 1 Branch 0 Tags 50 MiB
5f037df326
Commit Graph

331 Commits

Author SHA1 Message Date
Jesse Boyd
808d32bc85
make bit mask protected 
TODO same for BIT_OFFSET
 2019-04-10 22:03:51 +10:00
Jesse Boyd
31797d4231
WIP on 1.13 CFI 2019-04-10 18:32:21 +10:00
Jesse Boyd
093542c337
fix compile + use mutable vector for affine transform + fix bstats package 2019-04-07 20:43:59 +10:00
NotMyFault
ee630b9236
Fixes #106 2019-04-07 01:38:25 +02:00
Jesse Boyd
501992dd20
Fix setPosition 2019-04-06 05:51:18 +11:00
Jesse Boyd
0afae082c2
Remove string switches for BlockType 2019-04-06 03:34:11 +11:00
Jesse Boyd
16b01b9de2
Fix pasting nbt 2019-04-06 02:33:17 +11:00
Jesse Boyd
2143b9b5b7
finish block registry 2019-04-05 17:51:42 +11:00
Jesse Boyd
be5541b61b
revert some changes 2019-04-05 15:48:41 +11:00
Jesse Boyd
94d5d8df8e
Merge branch 'master' into breaking 2019-04-05 15:47:04 +11:00
Jesse Boyd
140809c903
Working now 2019-04-05 15:15:10 +11:00
Jesse Boyd
95c819684c
Use BiomeType here 2019-04-05 03:17:21 +11:00
Jesse Boyd
33f5322fda
WIP merge (i'll finish this later) 2019-04-05 01:24:47 +11:00
matt
6f3888a963 Fixes #91 2019-04-03 12:17:24 -04:00
Jesse Boyd
8897109dc4
wip upstream merge 2019-04-04 00:25:16 +11:00
Jesse Boyd
7086eb8b3e
continue with merge 2019-04-03 22:28:57 +11:00
Jesse Boyd
4cd8d08134
merge with upstream (broken) 2019-04-03 16:53:58 +11:00
Jesse Boyd
f361619037
Merge remote-tracking branch 'upstream/master' into breaking 2019-04-03 16:53:34 +11:00
matt
29692f3fbe Migrate to SLF4J 2019-04-02 18:21:02 -04:00
matt
47e66913e3 Selective upstream merge 2019-04-02 16:26:51 -04:00
wizjany
7ad364917f Ignore synthetic classes when loading BukkitImplAdapter. 
(cherry picked from commit 319f2efe43)
 2019-04-02 15:45:04 -04:00
matt
c997a2583c I like change 2019-04-01 21:28:49 -04:00
matt
86ce762982 Minor performance tweaks and cleaning of metrics 
Why were metrics so messed up in the first place?
 2019-04-01 20:42:10 -04:00
Jesse Boyd
bf53194650
Again #47 2019-04-01 21:41:44 +11:00
Jesse Boyd
a636a30e9f
Dont try removing player entity 2019-04-01 20:39:49 +11:00
Jesse Boyd
321ba326ed
Fixes #47 2019-04-01 20:10:23 +11:00
Jesse Boyd
d1e51884de
Merge pull request #86 from IntellectualSites/tile-entity-fix-extracted 
Fix the tile entity deal-io only
 2019-04-01 13:42:13 +11:00
Jesse Boyd
92a7bd5e44
minor tweak for mutable vectors 2019-04-01 03:09:20 +11:00
Sauilitired
4137d0a91a
Fix the tile entity deal-io only 2019-03-31 10:45:42 +02:00
Sauilitired
6dd7190fc5
Fix the tile entity deal-io only, and also took the liberty to make 
sure that the splash file doesn't prevent building. xoxo.
 2019-03-31 10:39:52 +02:00
wizjany
961da1b93f Add BukkitPlayer constructor without plugin. 
tbh I don't know why we even need to keep the plugin object around.
 2019-03-30 17:32:10 -04:00
matt
acc8eb0a99 Lambda's and References and Cleanups! Oh My! 2019-03-27 12:17:05 -04:00
matt
8124d3b3c5 Reverted an upstream change due to a sketchy class issue 2019-03-26 15:29:46 -04:00
matt
3420b8329b Remove most of PseudoRandom, a few minor cleaning changes, and an upstream change 2019-03-26 13:41:09 -04:00
matt
0d88a6bce2 Merging upstream changes 2019-03-26 13:27:09 -04:00
matt
85bfd16d7c Code cleaning 
Most notable change: Remove redundant type parameters and replaced with <>. This is a small step to bring us closer to upstream parity.
 2019-03-25 19:55:32 -04:00
IronApollo
3236bdd78e Changes to NBT-handling in operations and extents, changes to match the widely supported setBlock functionality, minor code cleanup 2019-03-25 13:42:11 -04:00
Josh Knight
16c22b75da
Merge pull request #79 from IntellectualSites/remove-plotme-support 
Remove PlotMe support
 2019-03-25 06:09:50 -04:00
Josh Knight
4c3b09895d
Merge pull request #76 from IntellectualSites/new-vector-system2 
Revert "Make end tag singleton"
 2019-03-25 06:09:13 -04:00
NotMyFault
14ab61d154 Remove PlotMe support 2019-03-25 00:02:20 +01:00
NotMyFault
68c8950cdc Add IncendoPaster 
Co-Authored-By: Alexander Söderberg <citymonstret@hotmail.com>
 2019-03-24 23:02:32 +01:00
matt
456f821ce0 Revert "Make end tag singleton" 
This reverts commit 13d2ae20
Why was this changed. I doubt it did much in terms of performance. It's better to stay as close as we can to the worldedit repo.
 2019-03-22 12:51:44 -04:00
aurorasmiles
c4e7acd15b
(dirty) Fix for VaultAPI build issue 
As discuseed in Discord, placing the Vault-API Dependency over the dummypermscompat fixes the compiling issue
 2019-03-19 19:37:17 +01:00
Matthew Miller
d186cce393 Merge remote-tracking branch 'origin/feature/slf4j-logging' 2019-03-19 20:32:21 +10:00
wizjany
d1c2a029bf Move some platform stuff to load, put enable back to postworld. 2019-03-15 23:43:57 -04:00
wizjany
678a78a982 Update adapters. 
Don't update unchanged blocks, do change NBT, no need to light.

Also clean up the forge side a bit.
 2019-03-15 20:56:49 -04:00
wizjany
c885f70c7b Load Bukkit plugin at startup. 
This should allow plugins that use WorldEdit to do things on world load.
 2019-03-15 18:38:06 -04:00
Kenzie Togami
fba12b1282
More shading fixes 2019-03-13 20:15:01 -07:00
Kenzie Togami
4be72fb983
Shade logger bridges as well 2019-03-13 19:56:58 -07:00
Kenzie Togami
d6804737cf
Switch to SLF4J logging. 2019-03-13 19:51:48 -07:00
wizjany
6937cfc9a9 Need internal ID for EntityType here too. 2019-03-09 10:46:40 -05:00
wizjany
7c89ece96e Few tweaks to schematic loading and error fixes. 
* Not all EntityTypes in Bukkit have the correct enum name.
* Don't read entire schematic files to list. Go off file extension only.
   (Reading in files is more accurate, but slow.)
* Enforce extensions. (Due to the above, while you can technically make a
   schematic called 'test.txt', it's better that we save it as
   'test.txt.schem'.)
* Fix a few minor warnings.
 2019-03-08 16:00:49 -05:00
wizjany
eebba8e324 Move vault to permscompat. 2019-03-07 23:55:58 -05:00
IronApollo
c98a311146 Update to working PlotSquared repo; Update to PlotSquared C>Captions class rename; Cleaning and minor modifications to SpongeSchematicReader 2019-03-06 03:06:47 -05:00
IronApollo
3ffb5ff00d Changes to fix some PlotSquared compatibility issues, plus fix block Mask parsing 2019-02-27 08:09:04 -05:00
wizjany
90797d12f4 Skip legacy materials when setting up registries. 
Doesn't make a difference normally, but avoids errors in special envs.
 2019-02-25 18:41:20 -05:00
Matthew Miller
8984289695 Bump Spigot version so it compiles. 2019-02-18 20:56:21 +10:00
IronApollo
24fbc86cdd INDEV -- Pushed for in-house testing and development 2019-02-17 03:47:32 -05:00
Matthew Miller
50a286b070 Update the block/item category registries - this won't build until a Spigot PR is merged though. 2019-02-17 13:30:40 +10:00
Matthew Miller
a09489a9af Updated the adapters 2019-02-16 20:51:39 +10:00
Matthew Miller
db1315e043 Refactor registries to entirely use the platform 2019-02-16 19:35:13 +10:00
Matthew Miller
1b101740fe Use a proper registry for biomes 2019-02-16 17:27:00 +10:00
wizjany
319f2efe43 Ignore synthetic classes when loading BukkitImplAdapter. 2019-02-14 18:07:07 -05:00
wizjany
39131eb1e5 Revert "Remove synthetic classes from adapters." 
This reverts commit 1ae0e88b
 2019-02-14 17:56:48 -05:00
Matthew Miller
1ae0e88b63 Remove synthetic classes from adapters. 2019-02-13 21:06:25 +10:00
Matthew Miller
c53a40b577 Bypass the Spigot API for block setting for speed boosts on non-Paper platforms. 2019-02-11 20:17:36 +10:00
IronApollo
2d586ff53e Registry changes & additions 2019-02-03 08:53:04 -05:00
Kenzie Togami
4b5b7b8003 Clean up other compiler warnings 2019-02-03 06:06:07 -05:00
Kenzie Togami
94ebb81e92 Add generics to other rawtypes 2019-02-03 05:54:05 -05:00
Kenzie Togami
590b7e23a9 Remove all raw usages of BSH, improve API generics 2019-02-03 05:01:39 -05:00
Matthew Miller
d80ac24c63 Pass the exception converter through more. 2019-02-02 11:36:55 -05:00
Matthew Miller
9c3964d330 Added a way to get the spawn position of a world 2019-02-02 11:29:51 -05:00
Matthew Miller
c935e381b7 Added a method to teleport entities across worlds. 2019-02-02 11:23:02 -05:00
Matthew Miller
45f1de6009 Move the pasting system over to WorldEdit, and add a /we report command. Currently only reports system status and the config. Need to add a platform reporter system. 2019-02-02 11:20:36 -05:00
Matthew Miller
54142c8669 Added a display name to Actors 2019-02-02 09:37:14 -05:00
Matthew Miller
bc3562eb57 Few fixes for FastModeExtent. 2019-02-02 09:26:18 -05:00
Matthew Miller
e88b8c961d Added "fast mode corrections" 2019-02-02 09:21:16 -05:00
Matthew Miller
b276907dcd Filter out commands that the player doesn't have permissions for. Workaround for a Spigot issue. 2019-02-02 08:54:36 -05:00
Kenzie Togami
e9fbde3ac8 Remove recursion in VaultResolver 
Correctly call into `perms` instead of creating an infinite recursion.
 2019-02-02 08:53:31 -05:00
Matthew Miller
10484eb58b Added a Vault resolver to WEPIF. Means any Vault-enabled perm plugin will theoretically work with it 2019-02-02 08:49:53 -05:00
IronApollo
e53535319d Plenty of changes to core block behavior to become more compatible with upstream WorldEdit (still more to be done!) 2019-01-31 10:08:58 -05:00
IronApollo
271b45f3ba Final changes for the Vector update (probable fix for the "copying player entity" bug) 2019-01-17 05:23:47 -05:00
IronApollo
cd1d45b856 Updated Paper-API to 1.13.2, minor edits to FastAsyncVoxelSniper 2019-01-16 07:12:02 -05:00
IronApollo
f74381b93f Merge remote-tracking branch 'refs/remotes/isfawe/new-vector-system' into new-vector-system 2019-01-13 02:00:14 -05:00
Matthew Miller
628c9cc0b7 Make BaseBlock more memory efficient, and make it clear in the API that it's not intended to be used for every single block. 2019-01-10 09:54:21 -05:00
Kenzie Togami
4d6045813c Move vectors to static creators, for caching 2019-01-10 07:17:04 -05:00
Byron Marohn
ab6aed703d Merge current FAWE master (227d6d91) into new-vector-system 
Signed-off-by: Byron Marohn <combustible@live.com>
 2019-01-09 22:35:26 -08:00
SirYwell
d4971a4e2f Temporary removal of tab complete listener 2019-01-03 10:18:54 +01:00
Kenzie Togami
386668d221
Clean up other compiler warnings 2018-12-26 16:50:24 -08:00
Kenzie Togami
de7d9421b1
Add generics to other rawtypes 2018-12-26 16:45:46 -08:00
Kenzie Togami
3fefcbf971
Remove all raw usages of BSH, improve API generics 2018-12-26 16:39:10 -08:00
IronApollo
d4157b7e0e Current progress with update 2018-12-23 11:19:33 -05:00
Byron Marohn
801793cc12 Merge upstream changes through 7961fa58 
Signed-off-by: Byron Marohn <combustible@live.com>
 2018-12-21 12:13:43 -08:00
Byron Marohn
447b4e8868 Update gradle settings to new repository URL 
Signed-off-by: Byron Marohn <combustible@live.com>
 2018-12-21 08:04:08 -08:00
Matthew Miller
ea30578781 Added a way to get the spawn position of a world 2018-12-21 17:05:30 +10:00
Matthew Miller
c949b07df1 Added a method to teleport entities across worlds. 2018-12-21 16:56:10 +10:00
Byron Marohn
c0fa1602ad Restore the formatting of many things to upstream WorldEdit - no code changes 
This patch touches many files but changes absolutely no functionality.
The goal here is to make future merges with worldedit produce fewer
conflicts that have to be resolved.

This patch was made by painstakingly diff'ing files and copying changes
over from the last upstream merge commit (02c6f11b) into this codebase.

Signed-off-by: Byron Marohn <combustible@live.com>
 2018-12-20 11:33:56 -08:00
NotMyFault
7eac605474 Fixing NBT 2018-12-19 16:33:15 +01:00
Matthew Miller
5eb9b779d7 Move the pasting system over to WorldEdit, and add a /we report command. Currently only reports system status and the config. Need to add a platform reporter system. 2018-12-18 19:28:55 +10:00
Matthew Miller
8f236afae9 Added a display name to Actors 2018-12-18 17:36:53 +10:00