Commit Graph

114 Commits

Author SHA1 Message Date
fd336feb46 Upstream merge of TranslationManager and ResourceLoader 2020-08-24 12:38:30 -04:00
6cb8352686 1.16.2
- My IJ is broke but this should work. Dunno if I got all nms changes, but we will see.
2020-08-23 17:18:29 +02:00
3bc692ff11 Part 1 of upstream merge and format 2020-07-13 22:50:59 -04:00
e7df3177cc Upstream merge 2020-03-23 20:47:30 -04:00
df60e50c96 Revert more changes 2020-01-29 15:32:51 -05:00
8078cf077a consistency changes 2020-01-26 13:01:16 -05:00
0d2fff2cd2 Upstream Merge 2020-01-10 22:32:12 -05:00
3ee920f9e6 Update upstream 2020-01-08 19:36:12 +01:00
b292416496 Upstream and some refactoring
Note: Maybe this doesn't compile, ij is broken af smh, let's give it a try...
2020-01-04 18:34:30 +01:00
2bd65f6423 Update LegacyMapper.java 2019-12-19 16:58:00 +00:00
053b1a20d6 More 1.15 wip 2019-12-11 14:45:27 +01:00
39b60aa742 Fix legacy id conversion 2019-12-09 22:36:52 +01:00
b0208e06cd More updates 2019-12-09 21:59:51 +01:00
1f19b92b0b 1.13? 2019-11-24 00:57:29 +00:00
60759934a3 Fix some merge issues 2019-11-20 00:11:54 +00:00
2c9f192baf Merge remote-tracking branch 'upstream/master' into merge 2019-11-19 21:23:47 +00:00
1b07846746 some adapter refactoring 2019-11-19 04:40:40 +00:00
240b2de90c Update to PlotSquared-we branch 2019-11-06 09:29:20 +00:00
2f3c6769c8 Legacy clipboards 2019-11-02 07:15:56 +01:00
c20f4c6b7f Fixed a null pointer. Merged in a bunch of CLI stuff. 2019-09-02 15:22:43 -04:00
4e49d16505 fix dependencies 2019-08-26 05:45:03 +01:00
0620478763 feature(cli): Added a CLI version of WorldEdit, and allowed most commands to be run from console (#508)
* Re-do commits to avoid awful rebase

* You can load and save a schematic file now. Still gotta setup ability to use commands as a console actor.

* Add a world override concept to LocalSession, and allow a lot more commands to be performed by actors.

* Fixed commands, and set the loaded schematic as the world override in CLI

* Properly load tags

* Added 1.14.4 data values

* Allow a majority of commands to be performed by the console.

* Fixed a lot of PR requested changes

* Added a Locatable interface and use that for getting the location of the player in commands.

* Added script support. Currently requires a newline at the end of the script.

* Shade everything to allow this to run locally - should probably minimize this to an extent later.

* Actually hook up the version

* Added a //world command to set the override

* Fixed a missed checkstyle issue

* Added CommandBlock support to Bukkit

* Make command block support configurable

* Minor cleanup and implementing a few of the final functions

* Fixed most issues from PR

* Improve UX, saving is now automatic and unknown command messages show

* Better save docs and support any clipboard format

* Include the entire formats list

* Arrays.copyOf

* Clear the world override if the selector is called on another world.

* Update logging extent to allow basic logging with non-player actors
2019-08-25 19:58:28 +10:00
cbbe8b5dfa upstream changes 2019-08-15 15:24:18 -04:00
46f5b12b36 Convert tabs to whitespace. 2019-07-22 16:42:40 -04:00
8108d0a936 Major command changes that don't work yet. 2019-07-16 23:44:34 -04:00
a69b239848 Upstream 2019-06-25 13:07:47 -04:00
a1c15e1c39 Many upstream changes. Should be non-breaking 2019-06-25 09:00:44 -04:00
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
27c7d488a2 Add perf. improvments for Forge 2019-06-15 17:33:17 +10:00
8c17aab9c5 Clean-up some misc. parts of the code 2019-06-15 17:33:17 +10:00
dc21b4df58 This does something idk. 2019-06-15 17:33:17 +10:00
2571efb5c3 Few fixes for worldedit changes 2019-06-15 17:33:17 +10:00
a3a175ab8c Initial attempt at binding state IDs 2019-06-15 17:33:17 +10:00
ec001b8d3b Revert "Upstream, generics, formatting"
This reverts commit cd88e513a8.
2019-06-12 15:45:41 +02:00
cd88e513a8 Upstream, generics, formatting 2019-06-11 20:31:56 -04:00
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
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
5e81dd1c4c Make registries Keyed. 2019-05-01 20:12:35 -04:00
f7670f7812 Temporary fix for forge having terrible classpath issues. 2019-04-28 18:47:28 +10:00
144215c813 Don't construct new BaseBlock 2019-04-06 01:12:57 +11:00
94d5d8df8e Merge branch 'master' into breaking 2019-04-05 15:47:04 +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
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
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
24fbc86cdd INDEV -- Pushed for in-house testing and development 2019-02-17 03:47:32 -05:00