Commit Graph

6773 Commits

Author SHA1 Message Date
sk89q
07d99f32d9 Merge remote-tracking branch 'origin/master' into mapping 2014-05-01 18:03:53 -07:00
sk89q
c8246ec962 Merge pull request #239 2014-05-01 18:01:12 -07:00
sk89q
b3f5136a59 Merge pull request #287 2014-05-01 17:52:33 -07:00
sk89q
996438ff91 Merge pull request #282
Add support for listing schematics inside subdirectories

Conflicts:
	src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
2014-05-01 17:45:13 -07:00
sk89q
a3c542b74f The /butcher command no longer kills mobs with a name tag.
PR: https://github.com/sk89q/worldedit/pull/292

Conflicts:
	src/bukkit/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
	src/main/java/com/sk89q/worldedit/command/BrushCommands.java
	src/main/java/com/sk89q/worldedit/command/UtilityCommands.java
2014-05-01 17:36:11 -07:00
sk89q
8d6f5bf335 Improves CUI support.
1. Allows CUI handshake package to overwrite protocol version.
2. Sends the current selection on handshake.
3. Removed redundant SelectionShapeEvents.

Conflicts:
	src/main/java/com/sk89q/worldedit/regions/selector/ConvexPolyhedralRegionSelector.java
	src/main/java/com/sk89q/worldedit/regions/selector/CylinderRegionSelector.java
2014-05-01 17:29:51 -07:00
Albert Pham
28a29c56b2 Merge pull request #249 from Gimlao/patch-1
[maze.js] Added Height, Size, Thickness and Flags
2014-05-01 14:22:53 -07:00
Albert Pham
8518f371b2 Merge pull request #242 from vu1p3n0x/master
Access to CommandManager registration with parent
2014-05-01 14:18:23 -07:00
sk89q
65ee8bfd2a Allow use of InputStream to load schematics
Conflicts:
	src/main/java/com/sk89q/worldedit/schematic/MCEditSchematicFormat.java
2014-05-01 13:57:30 -07:00
sk89q
c4c19017bb Added incomplete entity support to all Extents.
The Bukkit implementation supports the new entity API, but it has
not yet been tested. The Forge implementation does not support the
entity API yet.

At the moment, an UnsupportedOperationException is thrown for
Entity.getState() in some implementations, but use of an exception
should probably not be allowed.

BaseEntity is now an interface. It should not be possible to create
instances of BaseEntity because it may be implementation-specific.
2014-04-27 23:34:39 -07:00
sk89q
a5c3238876 Added Creature metadata interface. 2014-04-27 23:31:42 -07:00
sk89q
354d819872 Added a new preliminary mapping + metadata framework.
The eventual goal is to add:

1. Support for mapping block, etc. names (minecraft:stone, etc.)
2. Proper support for entities in WorldEdit
3. Support for querying for metadata about a block, entity, etc.
4. Extent support to biomes, structures, and so on
2014-04-26 21:57:45 -07:00
sk89q
19c43a2834 Added NBT field to BaseEntity. 2014-04-26 19:59:59 -07:00
sk89q
33e641d5f2 Added a new Location and added Entity.getLocation(). 2014-04-26 19:48:30 -07:00
wizjany
b0a52a4cf7 Revert a breaking change to fuzzy item/block lookup. 2014-04-26 00:22:39 -04:00
wizjany
5ed9239e14 Fixed listing schematics with directories in the folder. 2014-04-25 23:45:49 -04:00
sk89q
e69e72c410 Moved annotation package to internal package.
Closes WORLDEDIT-3055.
2014-04-25 15:23:43 -07:00
Albert Pham
36c02ae7e2 Made COMPILING.md easier to understand 2014-04-23 13:37:42 -07:00
sk89q
f94be80923 Changed Super Pickaxe to use EditSession.
This fixes WORLDEDIT-3102 and allows the logging of Super Pickaxe
usage via the EditSession Extent pipeline.
2014-04-23 00:33:00 -07:00
sk89q
bf062298f1 Moved EditSession BlockQuirkExtent upward.
Should fix WORLDEDIT-3101.
2014-04-22 01:19:49 -07:00
wizjany
30006325db Update CraftBukkit packaging for 1.7.9. 2014-04-19 13:14:14 -04:00
Wizjany
33d4285f1a Fix mask parser incorrectly parsing block lists.
i.e. not parsing the list at all
2014-04-13 17:12:10 -04:00
sk89q
6af69b6940 Checked in missing Gradle wrapper. 2014-04-07 22:47:19 -07:00
sk89q
7d58bb9bbd Fixed filename to WorldEditForge file in build file. 2014-04-06 15:07:30 -07:00
sk89q
4a6614f34f Cleaned up ForgeWorld, AbstractWorld.
Change block setting method in Forge to a more proper one.
2014-04-06 15:06:38 -07:00
sk89q
b6ee2c570a [Forge] Cleaned up the code somewhat. 2014-04-06 12:07:10 -07:00
sk89q
cb7508f481 Removed oraclejdk6. 2014-04-06 02:14:11 -07:00
sk89q
27ed503a11 Added install: true to .travis.yml. 2014-04-06 02:12:53 -07:00
sk89q
a49c40197c chmod +x gradlew before Travis start. 2014-04-06 02:09:03 -07:00
sk89q
5921264db3 Trying 'matrix' with Travis CI. 2014-04-06 02:05:28 -07:00
sk89q
87836855ea Attempt to fix Travis CI. 2014-04-06 01:59:45 -07:00
sk89q
90bffd77a7 Fixed typos in COMPILING.md. 2014-04-06 01:51:49 -07:00
sk89q
099fd9a63b [Forge] Made TileEntity NBT handling fit WE spec.
Fixed schematic loading/saving as a result.
2014-04-06 01:41:28 -07:00
sk89q
f3e107da90 Handle running multiple platforms at a time better. 2014-04-05 23:27:10 -07:00
sk89q
d1a69fd985 Raised level for platform registration log message. 2014-04-05 22:05:58 -07:00
sk89q
4320ae9d1f [Forge] Attached com.sk89q logger to FML logger. 2014-04-05 22:05:44 -07:00
sk89q
d85c0096a9 Fixed console commands not working due to null Worlds. 2014-04-05 21:49:25 -07:00
sk89q
b941e21d4d Added NullExtent that drops changes. 2014-04-05 21:49:03 -07:00
sk89q
69460094b8 Handle null World cases for EditSession when actor is console.
It actually should never be null, but old code does it.
2014-04-05 20:09:52 -07:00
sk89q
0148e8bcc6 Added getUniqueId() to TestOfflinePermissible. 2014-04-05 20:09:20 -07:00
sk89q
69797cfbea Updated Forge compilation to ForgeGradle. 2014-04-05 19:59:23 -07:00
sk89q
e0a2873c99 Removed use of Guava's Cache because Bukkit uses an ancient version of Guava. 2014-04-05 14:44:41 -07:00
sk89q
24f8fbc92a Converted API over to use new World.
This breaks backwards compatibility for all getWorld() methods, but
shim methods were added for binary compatibility with method calls that
use LocalWorld.
2014-04-05 03:04:21 -07:00
sk89q
63a2ca824d Fixed Javadocs in LocalSession. 2014-04-04 22:43:33 -07:00
sk89q
7ed1718d21 Moved LocalWorld's members upwards to AbstractWorld and World. 2014-04-04 22:40:29 -07:00
sk89q
d4c910a012 Created AbstractPlatform and deprecated ServerInterface. 2014-04-04 21:15:37 -07:00
sk89q
52b828ae17 Clean up WorldEdit main class. 2014-04-04 21:02:56 -07:00
sk89q
8fb73347e4 Implemented PlatformManager, Platform over old platform registration method. 2014-04-04 20:53:58 -07:00
sk89q
bed5fa8fdc Added Actor, Player, Entity, BaseEntity. 2014-04-04 17:54:14 -07:00
sk89q
db48f64585 Added Maven checkstyle plugin. 2014-04-04 16:09:22 -07:00