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
Jesse Boyd
5559e2dec5
Merge remote-tracking branch 'refs/remotes/sk89q/master'
2018-09-08 01:53:04 +10:00
Jesse Boyd
b24d322d29
Update from sk89q/master
2018-09-03 00:10:38 +10:00
Brokkonaut
480f2de3af
Add 1.13 chunk format for snapshots
...
Fixes WORLDEDIT-3714
2018-09-02 04:33:08 +02:00
Jesse Boyd
418cfa6d03
Update towny hook / fix pattern traverser
2018-08-29 01:04:25 +10:00
Jesse Boyd
abd886acd7
some hasty refactoring
2018-08-28 02:56:28 +10:00
Matthew Miller
c931095736
Little bit of formatting
2018-08-27 17:24:18 +10:00
Jesse Boyd
f43faae917
Update favs
2018-08-23 06:02:04 +10:00
Jesse Boyd
6d3aabecda
Don't default to air for legacy mapper
2018-08-22 04:13:42 +10:00
Jesse Boyd
c55353e5b1
Various command (use es6 if java9 + nashorn)
2018-08-22 03:22:37 +10:00
Matthew Miller
69ab1781c6
Replace FuzzyBlockMask with BlockMask, and added BlockTypeMask as a more performant mask for just block types.
2018-08-20 15:57:42 +10:00
Jesse Boyd
44c5447edb
Parse instead of get block for masks
2018-08-17 23:05:34 +10:00
Jesse Boyd
36ede1b27d
Fixes boy0001/FastAsyncWorldedit#1078
2018-08-17 18:27:48 +10:00
Jesse Boyd
4ffb9bce6c
Various minor
...
Fix image brush
Fix some java 9 issues
Fix metrics being disabled
Fix compile: duplicate method in SimpleBlockMaterial
Load as both FastAsyncWorldEdit and WorldEdit
2018-08-16 23:21:39 +10:00
Jesse Boyd
6ebdc00fba
Merge remote-tracking branch 'refs/remotes/sk89q/master'
...
# Conflicts:
# worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java
# worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
# worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BlockMaterial.java
# worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java
# worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java
# worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java
# worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/GravityBrush.java
# worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java
# worldedit-core/src/main/java/com/sk89q/worldedit/extent/inventory/BlockBagExtent.java
# worldedit-core/src/main/java/com/sk89q/worldedit/util/TargetBlock.java
# worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/OldChunk.java
# worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/PassthroughBlockMaterial.java
2018-08-16 20:06:27 +10:00
Jesse Boyd
2172ebba83
Fix some issues with java 9 / reflection
2018-08-16 19:56:31 +10:00
Matthew Miller
bc5609114b
Add a material to check if air is air, because there are now 3 types of air.
2018-08-16 15:42:11 +10:00
Jesse Boyd
1d3cf75d06
*Fix merge
2018-08-15 14:13:41 +10:00
Jesse Boyd
a67441bbff
Merge remote-tracking branch 'refs/remotes/sk89q/master'
...
# Conflicts:
# worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
# worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java
# worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java
2018-08-15 14:02:51 +10:00
Matthew Miller
c31161d068
Moved report framework to WorldEdit and fixed a few bugs.
2018-08-15 12:45:18 +10:00
Jesse Boyd
db65e96700
Ignore invalid properties
2018-08-14 20:57:32 +10:00
Jesse Boyd
131fd39f63
Various minor
...
Add entity registry
Re-add AbstractLoggingExtent
Fill in missing nbt on entity load
2018-08-14 19:24:10 +10:00
Jesse Boyd
55d34343dd
Fix some api compatibility issues
2018-08-14 17:18:49 +10:00
Jesse Boyd
76a55b7712
Merge remote-tracking branch 'refs/remotes/sk89q/master'
...
# Conflicts:
# worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java
# worldedit-core/src/main/java/com/sk89q/util/yaml/YAMLProcessor.java
# worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BlockType.java
# worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java
# worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java
# worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java
# worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/MultiStageReorder.java
# worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java
# worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemType.java
2018-08-14 01:36:00 +10:00
Jesse Boyd
0632a9ce96
Fix some merge issues
2018-08-14 00:38:33 +10:00
Matthew Miller
e0e7778536
Fixed some bugs and cleanup some code.
2018-08-13 22:18:12 +10:00
Jesse Boyd
7fb3899bb7
Use BlockState for player inventory getBlock
2018-08-13 03:31:26 +10:00
Jesse Boyd
e7c27b08bf
Remove stub injector methods
2018-08-13 02:36:39 +10:00
Jesse Boyd
a629d15c74
Copy paste/merge FAWE classes to this WorldEdit fork
...
- so certain people can look at the diff and complain about my sloppy code :(
Signed-off-by: Jesse Boyd <jessepaleg@gmail.com>
2018-08-13 00:03:07 +10:00
Matthew Miller
f54d6afb65
Make BaseBlock more memory efficient, and make it clear in the API that it's not intended to be used for every single block.
2018-08-10 20:29:06 +10:00
Matthew Miller
b2769befdb
Added a few utility methods.
2018-08-04 11:43:42 +10:00
Matthew Miller
a75d9e896b
Start work on the Sponge schematic format. This should work but it may not, it's untested.
2018-08-04 11:43:42 +10:00
Matthew Miller
c05c33cab0
Make a lot of progress on legacy conversions.
2018-08-04 11:43:42 +10:00
Matthew Miller
1480606b52
Fixed a few more issues found looking over the changeset.
2018-08-04 11:43:42 +10:00
Matthew Miller
965e977411
Fixed a few more errors, and added legacy support to the item parser.
2018-08-04 11:43:41 +10:00
Matthew Miller
9f9fda72b7
Re-add legacy support to block parser, and fix query tool.
2018-08-04 11:43:41 +10:00
Matthew Miller
5f551d1ed4
Include default blockstate information.
2018-08-04 11:43:41 +10:00
Matthew Miller
2239d14a01
Fixed //replace and masks with states.
2018-08-04 11:43:41 +10:00
Matthew Miller
663dd1f4d8
Added an entity, weathertype, and gamemode registry.
2018-08-04 11:43:41 +10:00
Matthew Miller
572bf04482
Cleanup the bukkit implementation, and update to the 1.13 release items/blocks.
2018-08-04 11:43:41 +10:00
Matthew Miller
c3d832c3fd
State system is done. It works. Finally. Still a few rough edges that need fixing however.
2018-08-04 11:43:41 +10:00
Matthew Miller
6b5f218809
Basically finish the state system. Just 1 more bug that I'm encountering.
2018-08-04 11:43:41 +10:00
Matthew Miller
4938f419ad
Almost finished the state system. Just got to have it actually load in the values.
2018-08-04 11:43:41 +10:00
Matthew Miller
3e1d438565
Get it to a point where it works minimally on 1.13 Spigot.
2018-08-04 11:43:41 +10:00
kashike
ee6af8ee76
state stuff
2018-08-04 11:43:40 +10:00
kashike
40a665a509
package move
2018-08-04 11:43:40 +10:00
kashike
70208c38fd
category changes
2018-08-04 11:43:40 +10:00
kashike
d33e2e98aa
registry changes
2018-08-04 11:43:40 +10:00
kashike
a48c319e7e
package move
2018-08-04 11:43:40 +10:00
Matthew Miller
57c13ef8f4
Continue moving out of legacy BlockType
2018-08-04 11:43:40 +10:00
Matthew Miller
e291cccb94
Move simulateBlockMine up to the platforms.
2018-08-04 11:43:40 +10:00
Matthew Miller
93b225ca3c
Expose a way of switching between ItemType and BlockType for ItemBlocks.
2018-08-04 11:43:39 +10:00
Matthew Miller
b06937d1c8
Setup a legacy mapper system. The file does not exist yet.
2018-08-04 11:43:39 +10:00
Matthew Miller
416480c16d
Separated out fluids and blocks - they're different now
2018-08-04 11:43:39 +10:00
Matthew Miller
70aceb3837
Use default state a bit more.
2018-08-04 11:43:39 +10:00
Matthew Miller
282eca7663
Added a category system and refactored registries
2018-08-04 11:43:39 +10:00
Matthew Miller
484687a49d
Further work on BlockState transition
2018-08-04 11:43:39 +10:00
Matthew Miller
e99190225e
Further BaseBlock modernisation
2018-08-04 11:43:39 +10:00
Matthew Miller
811f1d4433
Rewrote block parsing, and further switch to BlockState
2018-08-04 11:43:39 +10:00
Matthew Miller
e2608bc0c9
Further modernise and remove legacy item classes
2018-08-04 11:43:39 +10:00
Matthew Miller
c43109bde5
Start work on the new BaseBlock/BlockState split
2018-08-04 11:43:39 +10:00
Matthew Miller
aaaf2d5678
More deprecation removal
2018-08-04 11:43:38 +10:00
Matthew Miller
b292a39765
Fixed the fuzzy matcher
2018-08-04 11:43:38 +10:00
Matthew Miller
a71e39d777
Convert the data system to a state system. This doesn't work, needs new data
2018-08-04 11:43:38 +10:00
Matthew Miller
1cc735e359
Further work on items
2018-08-04 11:43:38 +10:00
Matthew Miller
07ade0b083
Phase 1 of Item conversion
2018-08-04 11:43:38 +10:00
Matthew Miller
d5012bb072
Rename legacy things to bundled things.
2018-08-04 11:43:14 +10:00
Matthew Miller
f5f1d357d9
Get rid of the string equality and convert a few more ID uses over.
2018-08-04 11:43:14 +10:00
Matthew Miller
41a80064f5
I guarantee this is broken. Start some form of string ID for blocks
2018-08-04 11:43:14 +10:00
wizjany
e511758d99
Add rotations to various blocks that were missing them.
...
Up/down levers still broken.
Fixes WORLDEDIT-3490.
2017-02-26 18:56:38 -05:00
sk89q
935de4c93d
Add some experimental brush commands.
...
/br set <shape> <radius> <pattern>
/br deform <shape> <expression>
/br scatter <shape> <density> <generator>
/br apply <shape> <generator>
<shape> can be: cuboid, cyl[inder], sphere
<density> is 0-100
<generator> can be:
forest|tree <type>
item <item>[:<data>] (ONLY WORKS ON FORGE)
Examples:
/br deform cuboid 5 y-=0.2
/br scatter sphere 5 100 minecraft:dye:15
2015-10-26 23:14:30 -07:00
sk89q
fe5cfced4f
Remove redundant name from Tag instances.
2014-11-14 11:38:54 -08:00
sk89q
7192780251
Switch to Gradle. Use git log --follow for history.
...
This converts the project into a multi-module Gradle build.
By default, Git does not show history past a rename, so use git log
--follow to see further history.
2014-11-14 11:27:39 -08:00