Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-01 14:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,754 Commits 1 Branch 0 Tags 48 MiB
fd336feb46
Commit Graph

322 Commits

Author SHA1 Message Date
Jesse Boyd
eff203c3b8
Merge branch 'breaking' into breaking-114 2019-07-17 21:31:06 +10:00
MattBDev
8108d0a936 Major command changes that don't work yet. 2019-07-16 23:44:34 -04:00
Jesse Boyd
48356275af
fix loading legacy biomes 2019-07-17 06:36:48 +10:00
Jesse Boyd
cf09ca7f37
delete FaweQueue 2019-07-12 01:32:14 +10:00
Jesse Boyd
f4947885b2
fix import 2019-07-11 08:46:02 +10:00
Jesse Boyd
cf0c735cf3
Merge branch 'breaking' into breaking-114 2019-07-11 08:08:55 +10:00
Jesse Boyd
cafd4bfece
use Locale.ROOT for uppercase as well 2019-07-10 22:26:31 +10:00
Jesse Boyd
a98a91e066
Use Locale.ROOT 2019-07-10 21:03:00 +10:00
Jesse Boyd
b32d46b08a
Use Locale.ROOT 2019-07-10 21:01:56 +10:00
Jesse Boyd
50e649acb8
update items 2019-07-10 20:58:27 +10:00
Jesse Boyd
20b7b121b1
1.14 blocks 2019-07-10 06:49:51 +10:00
MattBDev
4a40c7d99c Renaming and cleanup and a new method. 2019-07-09 15:50:13 -04:00
Jesse Boyd
f99d6e7478
wip on 1.14 2019-07-09 17:18:51 +10:00
wizjany
a2b3aabbbf Typo fixes and command clarifications/cleanup. 
Also re-disable the gradle daemon. It doesn't always play nice with
ForgeGradle and hogs ram.
 2019-07-04 19:28:42 -04:00
MattBDev
0feebac44b Make AbstractProperty abstract 2019-06-28 19:00:31 -04:00
Jesse Boyd
58c6b6278f
a69b239848 2019-06-29 04:20:48 +10:00
Jesse Boyd
55dad5a972
7f3c4c4828 2019-06-29 01:39:58 +10:00
Jesse Boyd
fecb380d44
aea5b68ced 2019-06-28 22:43:32 +10:00
MattBDev
1932c96d4f Fixed removed import during upstream cleanup. 2019-06-25 13:14:59 -04:00
MattBDev
a69b239848 Upstream 2019-06-25 13:07:47 -04:00
MattBDev
a1c15e1c39 Many upstream changes. Should be non-breaking 2019-06-25 09:00:44 -04:00
wizjany
79910c57d7
Add 1.14 blocks, items, entities, and tags. (#490) 
Should remain backwards compatible with 1.13. Removed blocks/items will
be forwarded to the "replacement" block/item. (e.g. BlockTypes.SIGN will
find OAK_SIGN on 1.14.)
 2019-06-24 23:15:07 -04:00
wizjany
d763ab374c
Re-add delchunks command (#481) 
The new command now writes a json file to WorldEdit's working directory with instructions on which chunks to delete, which is read by the plugin/mod at startup and calls the ChunkDeleter.
The chunk deleter parses the json and iterates the instructions, backing up .mca files as it goes and overwriting the offset headers with 0 wherever a chunk needs to be deleted.
This allows Minecraft to reclaim the space used for that chunk, as well as forcing it to be generated from scratch next time the area is loaded.
 2019-06-22 14:20:14 -04:00
MattBDev
0313320816 As Jesse would say... * 2019-06-20 20:05:18 -04:00
Kenzie Togami
27c7d488a2 Add perf. improvments for Forge 2019-06-15 17:33:17 +10:00
Kenzie Togami
8c17aab9c5 Clean-up some misc. parts of the code 2019-06-15 17:33:17 +10:00
wizjany
dc21b4df58 This does something idk. 2019-06-15 17:33:17 +10:00
Matthew Miller
2571efb5c3 Few fixes for worldedit changes 2019-06-15 17:33:17 +10:00
Kenzie Togami
a3a175ab8c Initial attempt at binding state IDs 2019-06-15 17:33:17 +10:00
wizjany
6f7927bc5a Skip poi folders for snapshot restores. 
New to 1.14, Mojang stores .mca files which don't contain chunks in the
poi folder.

Note: we explicitly filter *out* the poi folder, instead of filtering
*to* the regions folder, since old versions of minecraft had regions
directly in the world folder (instead of a regions subfolder).
 2019-06-12 21:51:22 -04:00
MattBDev
1f14d4652e Upstream changes, prefix changes, formatting changes, variable name changes 
I think that draining waterlogged items also works now?
 2019-06-12 17:13:53 -04:00
NotMyFault
ec001b8d3b Revert "Upstream, generics, formatting" 
This reverts commit cd88e513a8.
 2019-06-12 15:45:41 +02:00
MattBDev
cd88e513a8 Upstream, generics, formatting 2019-06-11 20:31:56 -04:00
wizjany
f2f9c26602 Expanded the scope of item brushes (/br apply item, /br paint item). 
They now additionally take a direction in which the simulated item usage
should be facing.
Also allow the item parser to parse "hand" and "offhand" as items, to
allow platforms with NBT item support return items with NBT (since
parsing is a slightly more complex task).
 2019-06-09 20:44:30 -04:00
MattBDev
7f3c4c4828 A lot of removals, upstream merges, and maybe more. 2019-06-07 20:58:48 -04:00
wizjany
351fd6771a Restore ability to restore old MCRegion files. 2019-06-06 10:34:12 -04:00
MattBDev
6c94cca15e Selective upstream merge 
Signed-off-by: MattBDev <4009945+MattBDev@users.noreply.github.com>
 2019-06-04 12:40:11 -04:00
wizjany
3a6b3dc75c Fix restore for 1.14 chunk format. 
Top-most chunk can now have lighting without have a palette or blocks.
 2019-06-02 21:56:29 -04:00
wizjany
9099a17fe5 Some command refactoring. Switch usages of page args to -p flag. 2019-06-01 07:04:07 -04:00
MattBDev
c73fc28847 Minor upstream changes 2019-05-31 11:20:02 -04:00
MattBDev
aea5b68ced Upstream merges and a few code cleanups 2019-05-30 16:07:30 -04:00
Jesse Boyd
6bc5b4a823
. 2019-05-29 06:31:22 +10:00
wizjany
b0777f6b06 Use DFUs for some additional data fixing. 
Legacy mapper now uses the data fixers to upgrade blocks and item types
(e.g. signs, dyes that changed names in 1.14).
The sponge schematic reader can now attempt to use the data fixers to
upgrade blocks, block entities, biomes and entities. This has been
tested with the 1.13 -> 1.14 changes. It is yet to be seen if it will
continue to work because...
The mc edit schematic reader has code for using data fixers, but it is
currently disabled as there seem to be some issues with fixing up older
block entities.
 2019-05-20 16:39:58 -04:00
wizjany
f9d0d340e7 Add DFUs. Currently used by //restore. 2019-05-13 23:07:53 -04:00
Jesse Boyd
c797dcb194
WIP filter patterns 2019-05-12 23:32:04 +10:00
Jesse Boyd
113aeb1689
Use fuzzy blocks in default block parser 2019-05-07 16:40:37 +10:00
wizjany
31d4daf474 Don't compare null BlockStates. 2019-05-06 19:59:58 -04:00
Jesse Boyd
55b02e1b1f
Implement FuzzyBlockState 2019-05-06 15:58:55 +10:00
wizjany
57c161a602 Actually initialize GameModes and WeatherTypes. 2019-05-02 00:08:19 -04:00
wizjany
5e81dd1c4c Make registries Keyed. 2019-05-01 20:12:35 -04:00
Kenzie Togami
13a8c480e3 Insert Locale.ROOT into all case change methods 2019-05-01 15:24:32 -07:00
Jesse Boyd
eec08c81ad
async chunk loading 2019-05-02 01:45:18 +10:00
Jesse Boyd
33e119ccb6
implement block get 2019-05-01 02:19:10 +10:00
Kenzie Togami
e06c8b84b4
Merge branch 'master' into feature/piston-commands 2019-04-29 22:44:15 -07:00
wizjany
3ffa54af84 Fix TrueZip region stores. 
I think. Someone tell me if this breaks their setup with truezip, but
it works for me now and didn't before. I'm assuming people using .zip
just used the normal zip store anyway.

(cherry picked from commit dcfb769d96)
 2019-04-28 17:28:15 -04:00
Matthew Miller
f7670f7812 Temporary fix for forge having terrible classpath issues. 2019-04-28 18:47:28 +10:00
Kenzie Togami
7ff537138a
Merge master again 2019-04-26 01:25:42 -07:00
wizjany
17fba54305 Update SpongeSchematic format to version 2. 
Allows saving and loading entities and biomes.
 2019-04-26 16:41:39 +10:00
Kenzie Togami
853bfab022
Merge master, update to texts 2019-04-25 22:11:46 -07:00
Kenzie Togami
2ea30dc70e
Port snapshot commands, update some time stuff to new time 2019-04-23 23:47:22 -07:00
Jesse Boyd
208929c378
Fix ItemType.getBlockType 2019-04-23 16:16:26 +10:00
Jesse Boyd
290f047f6a
Fix tab complete error for single property states 2019-04-23 15:08:05 +10:00
Jesse Boyd
a8b0fd21bb
Minor tweaks to work with build.js 2019-04-14 22:46:01 +10:00
Jesse Boyd
6996a97027
various minor 
CFI works without PlotSquared
tab completion
biome tweaks
WIP on anvil
document disallowed-blocks in legacy config
 2019-04-11 21:32:32 +10:00
Jesse Boyd
d61e5f33f1
some minor fixes 
/br sspl - says to click same spot again to apply, clicked same spot and nothing happens
/br layer - gives an error message "there was an error handling a FAWE command: [See console]
/br clipboard - doesn't let me execute because of max radius of 5, however am unable to set a lower radius as there is no option for it
/br butcher - tried to kill some mobs, but didn't work (nothing happened)
/br splatter - tried to execute the command, nothing happened
 2019-04-11 05:14:58 +10:00
Jesse Boyd
808d32bc85
make bit mask protected 
TODO same for BIT_OFFSET
 2019-04-10 22:03:51 +10:00
Jesse Boyd
31ac2b69d1
Fix block rotation 2019-04-07 17:41:26 +10:00
wizjany
dcfb769d96 Fix TrueZip region stores. 
I think. Someone tell me if this breaks their setup with truezip, but
it works for me now and didn't before. I'm assuming people using .zip
just used the normal zip store anyway.
 2019-04-06 13:22:20 -04:00
Jesse Boyd
0afae082c2
Remove string switches for BlockType 2019-04-06 03:34:11 +11:00
Jesse Boyd
144215c813
Don't construct new BaseBlock 2019-04-06 01:12:57 +11:00
Jesse Boyd
9e2832c273
Use BlockVectorSet 2019-04-06 01:01:05 +11:00
Jesse Boyd
2143b9b5b7
finish block registry 2019-04-05 17:51:42 +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
33f5322fda
WIP merge (i'll finish this later) 2019-04-05 01:24:47 +11:00
Jesse Boyd
1beea3cd22
Some more upstream merge 2019-04-04 21:28:41 +11: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
8aef06b29e
* 
haven't done one of these in a while
*continuing with merge in previous commit
 2019-04-03 17:00:59 +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
matt
4af43eb84c WeatherTypes now matches upstream 2019-04-02 15:43:40 -04:00
matt
6ccd0eb58e Fixed deleted code due to IDE glitch 2019-04-02 15:22:54 -04:00
matt
1a19bc457f Added Nullable to BlockTypes 2019-04-02 15:03:59 -04:00
matt
699783ba72 Another selective merge 2019-03-28 15:02:37 -04:00
matt
712479adbb Reverted incompatible EntityType upstream change 2019-03-27 00:16:54 -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
Kenzie Togami
d6804737cf
Switch to SLF4J logging. 2019-03-13 19:51:48 -07:00
Kenzie Togami
4878f38250
Fix platform registration, config setup 2019-03-04 19:36:06 -08:00
wizjany
aafb854e4f More useful names for block ItemTypes. 2019-03-02 12:26:26 -05:00
Matthew Miller
5de8e0852c Treat categories as empty when missing 2019-02-18 21:17:36 +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
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
Matthew Miller
d6bc85ccbe Speed up the BlockState hashCode method by caching (As it's Immutable). Allows some better optimisations in the future by using them as map keys 2019-02-16 12:46:10 +10:00
wizjany
88014b18a3 Added a few new things using block states. 
* `//set ##*tag` sets all states in the tag (not just default state per type)
* `//set ^type` is a pattern changing block type but copying all valid existing states
* `//set ^[prop=val,...]` sets the property `prop` to `val` wherever the existing block has that property
* `//set ^type[prop=val,...]` does both of the above
Those work anywhere a pattern is taken, of course.

* The mask syntax `^[prop=val]` matches blocks with the property `prop` set to `val`, or blocks that don't have the property at all.
* The mask syntax `^=[prop=val]` only matches blocks that have the property.
Those work anywhere a mask is taken, of course. (`//mask`, `//gmask`, `//replace`, etc)

The `//drain` command now takes `-w` flag that removes the waterlogged state from blocks (in addition to removing water, as before).
 2019-02-14 17:21:01 -05:00
IronApollo
511c279153 Fixed issues regarding block transformations and using the BaseBlock to apply a function. 2019-02-07 09:04:14 -05:00
IronApollo
0e5847e1ce Various fixes 2019-02-03 09:22:10 -05:00
IronApollo
2d586ff53e Registry changes & additions 2019-02-03 08:53:04 -05:00
Kenzie Togami
8f11d0469b Clarify state when asking for caps with no platforms (+ fuzzy system changes) 2019-02-03 07:30:18 -05:00
Matthew Miller
7d7da78dbc Fuzzier fuzzies 2019-02-03 07:13:21 -05:00
Kenzie Togami
4b5b7b8003 Clean up other compiler warnings 2019-02-03 06:06:07 -05:00
Kenzie Togami
590b7e23a9 Remove all raw usages of BSH, improve API generics 2019-02-03 05:01:39 -05:00
gamerforEA
ea0ca470f1 Fix Metrics injection 2019-02-03 03:51:15 -05:00
Matthew Miller
26d4ea101e Fixed the bundle being directly used outside of the registry system. 2019-02-03 03:44:10 -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
e88b8c961d Added "fast mode corrections" 2019-02-02 09:21:16 -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
62e6e9de96 Some general changes to the handling of blocks 2019-01-14 05:49:05 -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
IronApollo
90b3439dc2 Even more changes made towards a proper Vector update, as well as minor FAVS changes to accomodate for recent vector changes. 2019-01-13 01:38:08 -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
IronApollo
842b1307c7 Current Progress #3 2019-01-09 02:13:44 -05:00
Matthew Miller
862b63d43a Can't query the row directly 2018-12-28 18:06:41 +10:00
Matthew Miller
54b6e57186 Few minor improvements to the fuzzy system. 2018-12-28 15:05:05 +10:00
Matthew Miller
b544782f3b Make the base fuzzy cached per block type 2018-12-27 15:33:19 +10:00
Matthew Miller
8da984d9f9 Fuzzier fuzzies 2018-12-27 15:19:58 +10:00
Kenzie Togami
386668d221
Clean up other compiler warnings 2018-12-26 16:50:24 -08:00
Kenzie Togami
3fefcbf971
Remove all raw usages of BSH, improve API generics 2018-12-26 16:39:10 -08:00
Byron Marohn
2259f7d025 Merge upstream changes through 88f22f2e 
This was not a straightforward merge. A new method was added upstream to:
        worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java

This file has been substantially changed vs upstream worldedit. I merged
things as best I could - added the new method to this interface, and
then implemented it in:
        worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java

Unfortunately there's no easy way to test that it works - so I left a note...

Signed-off-by: Byron Marohn <combustible@live.com>
 2018-12-23 19:58:49 -08:00
IronApollo
d4157b7e0e Current progress with update 2018-12-23 11:19:33 -05:00
Matthew Miller
b75d5149eb Fixed the bundle being directly used outside of the registry system. 2018-12-23 21:43:20 +10:00
Matthew Miller
6312bcecf6 Fixed the item parser not using the ItemRegistry 2018-12-23 19:02:58 +10: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
dab9e9a799 Fix imports - build working again 
Signed-off-by: Byron Marohn <combustible@live.com>
 2018-12-21 08:09:58 -08:00
Matthew Miller
ea30578781 Added a way to get the spawn position of a world 2018-12-21 17:05:30 +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
Matthew Miller
7d468357e3 Added "fast mode corrections" 2018-12-09 16:27:02 +10:00
Kenzie Togami
2c8b2fe089
Move vectors to static creators, for caching 2018-11-03 23:00:24 -07:00
Kenzie Togami
399e0ad5fa
Refactor vector system to be cleaner 
- Move Vector, etc. into `.math` package
- Drop many methods that will be auto-promoted anyways, eg. with
`divide(int)` and `divide(double)` the first is now gone.
- Take Block vectors into their own class hierarchy
- Make it clear throughout the API what takes blockvectors
- many more improvements
 2018-11-03 23:00:23 -07:00
Matthew Miller
f8bf547c9e Added some missing bukkit registries 2018-10-14 17:55:57 +10:00
Jesse Boyd
bc25b76ac0
Fix getLegacyCombined 2018-10-13 19:16:53 +11:00
Matthew Miller
0a149a796f Make distr operation based 2018-10-12 15:28:40 +10:00
Kenzie Togami
ff877ec03b
Make BlockType#getDefaultState like other fields 2018-10-04 17:20:07 -07:00
Kenzie Togami
ef2c07ca24
Update forge for new block API 2018-10-04 17:18:43 -07:00
Kenzie Togami
d0ea5121f2
Make some BlockType fields lazy, to avoid early Platform dependencies 2018-10-04 17:18:01 -07:00
NotMyFault
5896b2eba4 Typo fix and neatify 2018-10-04 01:12:29 +02:00
BuildTools
620308b2ba Bypass warning invalid block registered for __RESERVED__ 2018-10-02 05:51:08 -04:00
Kenzie Togami
36cbc5d9d0
Cleanup javadoc warnings in worldedit-core 2018-10-01 15:30:23 -07:00
Jesse Boyd
cfbf7dbec0
Update from sk89q/master 2018-09-25 15:35:21 +10:00
Matthew Miller
fd6034fbdd Added the 1.13.1 new blocks. 2018-09-23 20:22:33 +10:00
Jesse Boyd
00ac111e46
Fix height brush 2018-09-23 17:10:56 +10:00
Matthew Miller
4969dac39c Potential minor performance improvements when checking fuzzy equality. 2018-09-20 16:56:46 +10:00
Jesse Boyd
fc949e3efc
Fixes #1112 2018-09-08 03:11:56 +10:00