Commit Graph

165 Commits

Author SHA1 Message Date
aea5b68ced Upstream merges and a few code cleanups 2019-05-30 16:07:30 -04:00
113aeb1689 Use fuzzy blocks in default block parser 2019-05-07 16:40:37 +10:00
55b02e1b1f Implement FuzzyBlockState 2019-05-06 15:58:55 +10:00
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
208929c378 Fix ItemType.getBlockType 2019-04-23 16:16:26 +10:00
290f047f6a Fix tab complete error for single property states 2019-04-23 15:08:05 +10:00
a8b0fd21bb Minor tweaks to work with build.js 2019-04-14 22:46:01 +10:00
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
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
808d32bc85 make bit mask protected
TODO same for BIT_OFFSET
2019-04-10 22:03:51 +10:00
31ac2b69d1 Fix block rotation 2019-04-07 17:41:26 +10:00
0afae082c2 Remove string switches for BlockType 2019-04-06 03:34:11 +11:00
144215c813 Don't construct new BaseBlock 2019-04-06 01:12:57 +11:00
9e2832c273 Use BlockVectorSet 2019-04-06 01:01:05 +11:00
2143b9b5b7 finish block registry 2019-04-05 17:51:42 +11:00
94d5d8df8e Merge branch 'master' into breaking 2019-04-05 15:47:04 +11:00
140809c903 Working now 2019-04-05 15:15:10 +11:00
33f5322fda WIP merge (i'll finish this later) 2019-04-05 01:24:47 +11:00
1beea3cd22 Some more upstream merge 2019-04-04 21:28:41 +11:00
8897109dc4 wip upstream merge 2019-04-04 00:25:16 +11:00
7086eb8b3e continue with merge 2019-04-03 22:28:57 +11:00
8aef06b29e *
haven't done one of these in a while
*continuing with merge in previous commit
2019-04-03 17:00:59 +11:00
f361619037 Merge remote-tracking branch 'upstream/master' into breaking 2019-04-03 16:53:34 +11:00
29692f3fbe Migrate to SLF4J 2019-04-02 18:21:02 -04:00
47e66913e3 Selective upstream merge 2019-04-02 16:26:51 -04:00
4af43eb84c WeatherTypes now matches upstream 2019-04-02 15:43:40 -04:00
6ccd0eb58e Fixed deleted code due to IDE glitch 2019-04-02 15:22:54 -04:00
1a19bc457f Added Nullable to BlockTypes 2019-04-02 15:03:59 -04:00
699783ba72 Another selective merge 2019-03-28 15:02:37 -04:00
712479adbb Reverted incompatible EntityType upstream change 2019-03-27 00:16:54 -04:00
0d88a6bce2 Merging upstream changes 2019-03-26 13:27:09 -04:00
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
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
d6804737cf Switch to SLF4J logging. 2019-03-13 19:51:48 -07:00
4878f38250 Fix platform registration, config setup 2019-03-04 19:36:06 -08:00
aafb854e4f More useful names for block ItemTypes. 2019-03-02 12:26:26 -05:00
5de8e0852c Treat categories as empty when missing 2019-02-18 21:17:36 +10:00
24fbc86cdd INDEV -- Pushed for in-house testing and development 2019-02-17 03:47:32 -05:00
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
db1315e043 Refactor registries to entirely use the platform 2019-02-16 19:35:13 +10:00
1b101740fe Use a proper registry for biomes 2019-02-16 17:27:00 +10:00
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
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
511c279153 Fixed issues regarding block transformations and using the BaseBlock to apply a function. 2019-02-07 09:04:14 -05:00
0e5847e1ce Various fixes 2019-02-03 09:22:10 -05:00
2d586ff53e Registry changes & additions 2019-02-03 08:53:04 -05:00
8f11d0469b Clarify state when asking for caps with no platforms (+ fuzzy system changes) 2019-02-03 07:30:18 -05:00
7d7da78dbc Fuzzier fuzzies 2019-02-03 07:13:21 -05:00
4b5b7b8003 Clean up other compiler warnings 2019-02-03 06:06:07 -05:00
590b7e23a9 Remove all raw usages of BSH, improve API generics 2019-02-03 05:01:39 -05:00