Commit Graph

241 Commits

Author SHA1 Message Date
wizjany 4f0506ec8b Fix versions in toml. Use internalversion (with git hash). 2019-03-12 17:30:45 -04:00
Matthew Miller 6e24472af5 Bump to latest forge and cleanup some old files. 2019-03-11 22:45:41 +10:00
wizjany a59d994d84 Hook up the biome registry. 2019-03-11 00:15:21 -04:00
wizjany 6192ba8dc1 Checkstyle fixes and warnings.
Should get 'working' builds now.
2019-03-11 00:02:51 -04:00
Kenzie Togami bb33897221
Handle all commands like pre-1.13 for now 2019-03-04 19:57:22 -08:00
Kenzie Togami 4878f38250
Fix platform registration, config setup 2019-03-04 19:36:06 -08:00
Kenzie Togami 9ee0f00030
Initial command registration setup. Pretty hacky, subcommands do not work, some arguments missing. 2019-03-04 18:31:20 -08:00
Kenzie Togami a0f127813d
Pull config dir from FMLPaths 2019-02-21 00:40:00 -08:00
Matthew Miller aa295d91e8 All but commands and config directory are ported. 2019-02-19 21:49:06 +10:00
Matthew Miller 29b6c84230 Rebase and properly setup the registries 2019-02-19 20:30:52 +10:00
Kenzie Togami 7faafa1635 Update mappings and forge, correct toml keys 2019-02-19 18:16:28 +10:00
Matthew Miller de9798bf7e Further work on 1.13.2 WorldEdit for Forge. Forge still is missing too many features to finish this, and I need to work out how to port the command wrapper system over. 2019-02-19 18:16:28 +10:00
Matthew Miller cf435fd63d Bump to 1.13.2 2019-02-19 18:16:28 +10:00
Matthew Miller d079f06c31 Make it actually load into an IDE on latest FG 2019-02-19 18:16:28 +10:00
Matthew Miller e4ce51003e Bump to latest Forge 2019-02-19 18:16:28 +10:00
Matthew Miller c849f69ef4 Convert across the network handlers 2019-02-19 18:16:28 +10:00
Matthew Miller 9fccfdfaeb Further work on 1.13 2019-02-19 18:16:28 +10:00
Matthew Miller a64d8dc6fa Fixed a lot of the errors, still more to go. Gotta switch to Forge registries once they exist. 2019-02-19 18:14:58 +10:00
Matthew Miller 7a08098b03 Further work on Forge 1.13 compat. 2019-02-19 18:11:37 +10:00
Matthew Miller 11cf5377d9 Further attempts 2019-02-19 18:11:37 +10:00
Matthew Miller e6d5ce8165 Start work on Forge 1.13 2019-02-19 18:11:37 +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
Kenzie Togami 590b7e23a9 Remove all raw usages of BSH, improve API generics 2019-02-03 05:01:39 -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 c935e381b7 Added a method to teleport entities across worlds. 2019-02-02 11:23:02 -05:00
Matthew Miller e88b8c961d Added "fast mode corrections" 2019-02-02 09:21:16 -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
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
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
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
Matthew Miller 7d468357e3 Added "fast mode corrections" 2018-12-09 16:27:02 +10:00
Matthew Miller 53bc730909
Merge pull request #435 from sk89q/feature/trace-unflushed-sessions
Add tracing for unflushed EditSessions
2018-11-04 17:21:25 +10:00
Matthew Miller 1150256df1 Update config 2018-11-04 17:21:01 +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
Kenzie Togami e1fbaaff59
Add tracing for unflushed EditSessions 2018-10-30 18:39:51 -07:00
Matthew Miller 815f14d4a1 Remove a config option that's now unused. 2018-10-13 15:12:04 +10:00
Kenzie Togami ef2c07ca24
Update forge for new block API 2018-10-04 17:18:43 -07:00
Kenzie Togami 2cad9a2c09
Switch to a license plugin for headers 2018-10-04 00:29:34 -07:00
Kenzie Togami 3e1c58c99b
Implement some optional methods in ForgeWorld 2018-10-01 15:17:05 -07:00
Matthew Miller 4d0df10f88 Fixed sessions not saving on shutdown 2018-08-19 13:01:08 +10:00
Matthew Miller 0cbfc9308e Add base of sendFakeBlock to Sponge and Forge impls 2018-08-18 19:35:53 +10:00
Jesse Boyd 13d2ae20d5
Make end tag singleton 2018-08-15 17:02:17 +10:00
Matthew Miller c31161d068 Moved report framework to WorldEdit and fixed a few bugs. 2018-08-15 12:45:18 +10:00
Matthew Miller e0e7778536 Fixed some bugs and cleanup some code. 2018-08-13 22:18:12 +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 5f4cc3e694 Cleanup a little bit more code. 2018-08-06 19:08:15 +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 521238b4eb Fixed a few clipboard related issues. 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 39c6a5e958 Fixed items not being registered 2018-08-04 11:43:40 +10:00
Matthew Miller ca06a05117 Update the Bukkit adapter to the Spigot API Preview 2018-08-04 11:43:40 +10:00
Matthew Miller e1c2ea3a3b Update configs, and remove unused BlockData methods. 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 b06937d1c8 Setup a legacy mapper system. The file does not exist yet. 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 e2608bc0c9 Further modernise and remove legacy item classes 2018-08-04 11:43:39 +10:00
Matthew Miller aaaf2d5678 More deprecation removal 2018-08-04 11:43:38 +10:00
Matthew Miller 20bf6e079b Continue the great purge 2018-08-04 11:43:38 +10:00
Matthew Miller d12ad2548a Add block registration to Forge WorldEdit. 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
Qveshn f680635ded Added customizable command log format (Date+Time are now available)
Added the option format to config files (config.yml + worldedit.properties). By default, current date and time are displayed.
The formatting function is implemented by analogy with the class java.util.logging.SimpleFormatter
2018-05-19 18:47:45 +03:00
Matthew Miller 50f60da69f Prevent players and complex parts being pasted in schematics. 2018-01-02 20:49:36 +10:00
wizjany 437ad00658 Move asm dep to buildscript section. 2017-10-19 20:06:01 -04:00
wizjany 21d89311c9 Update asm dep for ForgeGradle. 2017-10-16 18:08:41 -04:00
Kenzie Togami d6aa1ad509
Make Java 8 detection work on Java 9
Closes #393.
2017-08-16 16:39:42 -07:00
Kenzie Togami 6c6e1b4ce2
[Forge] Officially move to Java 8 2017-08-16 16:07:18 -07:00
Kenzie Togami f2c5b272ad
Add client-side left-click-air handler 2017-08-16 15:20:33 -07:00
wizjany f34bc7aca5 Updated Bukkit to 6.1.7.3 for MC 1.12.1 and Forge to 6.1.8 for MC 1.12. 2017-08-05 12:18:52 -04:00
Kenzie Togami cd4729f82f
[Forge] Update to latest 1.11.2 mappings 2017-08-01 23:01:12 -07:00
Kenzie Togami 537c6694e1
[Forge] Update to 1.11.2 2017-02-22 23:36:25 -08:00
wizjany a8d04c24be [Forge] Release 6.1.6 for Forge 1.11.
Using Forge recommended build 2189.
2016-12-13 21:16:37 -05:00
Kenzie Togami 85ef47ae0c [Forge] Update mappings to 11/30. 2016-12-01 23:14:16 -05:00
Kenzie Togami c75fd3a449 [Forge] Remove now-unused ATs 🎉 2016-12-01 23:14:16 -05:00
Kenzie Togami 1752963288 [Forge] Make //regen work better
It now creates a brand-new world, generates the appropriate section
there, and copies it over to the original world.
2016-12-01 23:14:16 -05:00
Kenzie Togami e9419f4280 [Forge] Fix clearing inventories
1.11 no longer uses null in inventories.
2016-12-01 23:14:16 -05:00
Kenzie Togami 6ad11624bb [Forge] Initial update to 1.11
Also updates Gradle to 3.2.1, because keeping updated is good.
2016-12-01 23:14:16 -05:00
wizjany ddff8ecbb2 Re-add and update ForgeItemRegistry.
And fix code that depended on it.
Reverts parts of e91859130c
2016-08-28 02:48:29 -04:00
Kenzie Togami 2267dfd29f [Forge] Update to 1.10.2. 2016-08-28 01:23:19 -04:00
Kenzie Togami 38ddeaf777 [Forge] Initial update for 1.10 2016-08-28 01:23:19 -04:00
Kenzie Togami b3d6644972 [Forge] Fix //regen + improve performance. 2016-06-25 11:37:07 -07:00
Kenzie Togami fa64fa5bed [Forge] Stop "supporting" some invalid blocks. 2016-06-23 04:12:23 -07:00
Kenzie Togami 5afd2bbbf3 Update buildscript to Gradle 2.14 & Forge to 1.9.4 (1965) 2016-06-18 09:50:08 -07:00
Kenzie Togami e42107557e [Forge] Make DefaultBlockParser behave more like vanilla. 2016-06-17 16:59:41 -07:00
Kenzie Togami e168f03ab7 Replace RightClickEmpty with RightClickItem.
RightClickEmpty is not fired on the server. RightClickItem fires once
for the same event (a right click in air). This fixes brush and other tools that rely on air
clicks.
2016-05-20 10:14:00 -07:00
Wizjany 07854f79fa Sync forge version to core. 2016-05-19 01:43:35 -04:00
wizjany c85c9f7a6c Version bump forge build for release. 2016-05-08 17:08:31 -04:00
Kenzie Togami 574ed9aa41 Fix some formatting concerns. 2016-05-05 20:09:53 -07:00
Kenzie Togami 301d02c9c5 Warn when not using Java 8 or greater.
Note: this warning is not in the shared WorldEdit class because it
doesn't get loaded as early as the individual plugin/mod
implementations for some reason.
2016-05-05 17:55:22 -07:00
Kenzie Togami ecc4948668 Switch to Forge 1.9 (12.16.0.1770) 2016-05-05 17:55:22 -07:00
Wyatt Childers 79290caaa7 Fixed a bug where virtually all mobs were determined to be Animals on the Forge 1.8 platform 2016-03-05 16:11:41 -05:00
Kenzie Togami 7f43bc4b47 Merge in from master, mostly.
The most important part of this merge is that it REVERTS FMP
compatibility, since no such thing needs to exist in 1.8. In fact,
there isn't even an FMP in 1.8 yet. It will be added back if FMP ever
ports to 1.8 and the problem still exists.
2016-02-22 17:54:50 -08:00
Kenzie Togami 74167b8b9f Update forge version.
Not really needed, but why not?
2016-02-22 17:37:45 -08:00
Kenzie Togami a9fc46cef6 Correlate modids in code and mcmod.info 2016-02-22 17:11:29 -08:00
Kenzie Togami 136c66868f Move sponge dependency to mcmod 2016-02-22 17:01:09 -08:00
Kenzie Togami 4088f26d19 Fix checkstyle errors 2016-02-07 14:21:24 -08:00
Kenzie Togami 7271cca89f Implement FMP compatibility 2016-02-07 14:07:41 -08:00
Kenzie Togami 10776f27a8 Fix dependency 2016-02-07 10:42:13 -08:00
Kenzie Togami 6757b04d24 Add FMP as a dependency at compile 2016-02-07 10:14:33 -08:00
Kenzie Togami d6db9a9790 Update 1.7.10 Forge version 2016-02-07 09:41:29 -08:00
wizjany 1fe197df98 Fix build script versioning, release a 1.8.9 build. 2016-01-16 23:42:21 -05:00
Kenzie Togami 8c5b455d0f [Forge] Don't need to depend this 2016-01-12 20:54:19 -08:00
Kenzie Togami e19820e04d Fix shadow, remove extra source jar in forge 2016-01-12 15:32:58 -08:00
Kenzie Togami e91859130c Fixes for master-rebase on forge1.8 2016-01-12 02:23:49 -08:00
Kenzie Togami 337ecb2864 Correct line endings from previous commits 2016-01-12 02:15:33 -08:00
Kenzie Togami ea4dafe9af Use ATs for accessing fields. 2016-01-12 02:11:07 -08:00
Kenzie Togami 633e734b70 Update to 1.8.9 2016-01-12 02:10:53 -08:00
zml 39e17ddbce forge: Correct Sponge mod id 2016-01-12 02:09:37 -08:00
Wyatt Childers 096729883c Updated the Sponge permissions delegate for upstream API changes 2016-01-12 02:09:37 -08:00
zml 07edf3d365 Fix swapping of pitch and yaw in setLocation
Also use rotation(Pitch|Yaw) in getLocation for consistency with
getPitch and getYaw.
2016-01-12 02:09:37 -08:00
zml 3f171a95b7 Clean up sending of formatted chat
This now fully uses MC's ChatComponentStyle for the general chat
styling, and cleans up some duplication
2016-01-12 02:09:37 -08:00
zml aa3a2d4764 Add support for delegating permissions to Sponge.
When Sponge is not installed, behaviour is as before.
Closes #331
2016-01-12 02:09:37 -08:00
Kenzie Togami 0d5c115e4d Send without a proxy packet 2016-01-12 02:08:58 -08:00
Kenzie Togami 5c99d4bf59 Fix Forge CUI handler 2016-01-12 02:08:58 -08:00
Kenzie Togami ba363bce20 [Forge] Update to 1.8 2016-01-12 02:08:58 -08:00
Albert Pham f4bb5272e1 Update new commands with suggestion and help support. 2015-10-27 13:51:45 -07: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 b19cd9bec4 [Forge] Fixed tree generation but undo is not yet supported. 2015-09-30 23:54:01 -07:00
Kenzie Togami ec5de0f22f Cleanup unused imports 2015-05-31 15:59:40 -07:00
wizjany ec9c77c31b Excluded armor stands from //butcher by default.
Someone got lazy and just made armor stands a living entity instead of extracting an ArmorEquippable interface.
2015-01-22 15:54:01 -05:00
Kenzie Togami 372a520382 Directly access entity list
This replaces the very slow chunk dance that was being used.
2015-01-20 10:43:37 -05:00
luacs1998 017126d422 Some fixes and tweaks for PR #309
Apologies for the inconvenience.
2014-12-13 14:08:45 +08:00
luacs1998 e9a97eeff6 Rough draft of WEPIF for WorldEdit-Forge. Mainly for FE compatibility, but other mods can implement this if they so want.
This commit removes ForgeUtil, with its 2 methods relocated. To set a permissions provider, get the instance of ForgeWorldEdit, and call setPermissionsProvider with an instance of a class implementing ForgePermissionsProvider.
2014-11-26 18:50:36 +08:00
sk89q e193aaba7d [Forge] Add a crude reference card GUI. 2014-11-14 19:03:54 -08:00
sk89q 052addbc05 [Forge] Add creative use mode and cheat mode and fix config overwrite. 2014-11-14 18:23:43 -08:00
sk89q 3bee2d4c02 Handle mod:name as a way to specify blocks in the Forge mod. 2014-11-14 17:45:30 -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