BlockRegistry, MaskRegistry, PatternRegistry -> *Factory

'Registry' will need to be used for the block, entity, item,
and so on registries.

src/main/java/com/sk89q/worldedit/extension/factory/BlockFactory.java

@@ -17,13 +17,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.extension.registry;
+package com.sk89q.worldedit.extension.factory;
 
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.extension.input.InputParseException;
-import com.sk89q.worldedit.internal.registry.AbstractRegistry;
+import com.sk89q.worldedit.internal.registry.AbstractFactory;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -33,16 +33,16 @@ import java.util.Set;
  * new blocks from input.
  * </p>
  * Instances of this class can be taken from
- * {@link WorldEdit#getBlockRegistry()}.
+ * {@link WorldEdit#getBlockFactory()}.
  */
-public class BlockRegistry extends AbstractRegistry<BaseBlock> {
+public class BlockFactory extends AbstractFactory<BaseBlock> {
 
     /**
      * Create a new instance.
      *
      * @param worldEdit the WorldEdit instance.
      */
-    public BlockRegistry(WorldEdit worldEdit) {
+    public BlockFactory(WorldEdit worldEdit) {
         super(worldEdit);
 
         parsers.add(new DefaultBlockParser(worldEdit));

src/main/java/com/sk89q/worldedit/extension/factory/DefaultBlockParser.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.extension.registry;
+package com.sk89q.worldedit.extension.factory;
 
 import com.sk89q.worldedit.*;
 import com.sk89q.worldedit.blocks.*;

src/main/java/com/sk89q/worldedit/extension/factory/DefaultMaskParser.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.extension.registry;
+package com.sk89q.worldedit.extension.factory;
 
 import com.sk89q.worldedit.*;
 import com.sk89q.worldedit.extension.input.InputParseException;
@@ -135,7 +135,7 @@ class DefaultMaskParser extends InputParser<Mask> {
                 ParserContext tempContext = new ParserContext(context);
                 tempContext.setRestricted(false);
                 tempContext.setPreferringWildcard(true);
-                return new BlockMask(extent, worldEdit.getBlockRegistry().parseFromListInput(component, tempContext));
+                return new BlockMask(extent, worldEdit.getBlockFactory().parseFromListInput(component, tempContext));
         }
     }
 

src/main/java/com/sk89q/worldedit/extension/factory/HashTagPatternParser.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.extension.registry;
+package com.sk89q.worldedit.extension.factory;
 
 import com.sk89q.worldedit.EmptyClipboardException;
 import com.sk89q.worldedit.LocalSession;

src/main/java/com/sk89q/worldedit/extension/factory/MaskFactory.java

@@ -17,27 +17,27 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.extension.registry;
+package com.sk89q.worldedit.extension.factory;
 
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.function.mask.Mask;
-import com.sk89q.worldedit.internal.registry.AbstractRegistry;
+import com.sk89q.worldedit.internal.registry.AbstractFactory;
 
 /**
  * A registry of known {@link Mask}s. Provides methods to instantiate
  * new masks from input.
  * </p>
  * Instances of this class can be taken from
- * {@link WorldEdit#getMaskRegistry()}.
+ * {@link WorldEdit#getMaskFactory()}.
  */
-public final class MaskRegistry extends AbstractRegistry<Mask> {
+public final class MaskFactory extends AbstractFactory<Mask> {
 
     /**
      * Create a new mask registry.
      *
      * @param worldEdit the WorldEdit instance
      */
-    public MaskRegistry(WorldEdit worldEdit) {
+    public MaskFactory(WorldEdit worldEdit) {
         super(worldEdit);
 
         parsers.add(new DefaultMaskParser(worldEdit));

src/main/java/com/sk89q/worldedit/extension/factory/PatternFactory.java

@@ -17,27 +17,27 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.extension.registry;
+package com.sk89q.worldedit.extension.factory;
 
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.function.pattern.Pattern;
-import com.sk89q.worldedit.internal.registry.AbstractRegistry;
+import com.sk89q.worldedit.internal.registry.AbstractFactory;
 
 /**
  * A registry of known {@link Pattern}s. Provides methods to instantiate
  * new patterns from input.
  * </p>
  * Instances of this class can be taken from
- * {@link WorldEdit#getPatternRegistry()}.
+ * {@link WorldEdit#getPatternFactory()}.
  */
-public final class PatternRegistry extends AbstractRegistry<Pattern> {
+public final class PatternFactory extends AbstractFactory<Pattern> {
 
     /**
      * Create a new instance.
      *
      * @param worldEdit the WorldEdit instance
      */
-    public PatternRegistry(WorldEdit worldEdit) {
+    public PatternFactory(WorldEdit worldEdit) {
         super(worldEdit);
 
         parsers.add(new HashTagPatternParser(worldEdit));

src/main/java/com/sk89q/worldedit/extension/factory/RandomPatternParser.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.extension.registry;
+package com.sk89q.worldedit.extension.factory;
 
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.blocks.BaseBlock;
@@ -36,7 +36,7 @@ class RandomPatternParser extends InputParser<Pattern> {
 
     @Override
     public Pattern parseFromInput(String input, ParserContext context) throws InputParseException {
-        BlockRegistry blockRegistry = worldEdit.getBlockRegistry();
+        BlockFactory blockRegistry = worldEdit.getBlockFactory();
         RandomPattern randomPattern = new RandomPattern();
 
         for (String token : input.split(",")) {

src/main/java/com/sk89q/worldedit/extension/factory/SingleBlockPatternParser.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.extension.registry;
+package com.sk89q.worldedit.extension.factory;
 
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.extension.input.ParserContext;
@@ -37,7 +37,7 @@ class SingleBlockPatternParser extends InputParser<Pattern> {
         String[] items = input.split(",");
 
         if (items.length == 1) {
-            return new BlockPattern(worldEdit.getBlockRegistry().parseFromInput(items[0], context));
+            return new BlockPattern(worldEdit.getBlockFactory().parseFromInput(items[0], context));
         } else {
             return null;
         }

src/main/java/com/sk89q/worldedit/extension/input/ParserContext.java

@@ -20,8 +20,8 @@
 package com.sk89q.worldedit.extension.input;
 
 import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.extension.factory.MaskFactory;
 import com.sk89q.worldedit.extension.platform.Actor;
-import com.sk89q.worldedit.extension.registry.MaskRegistry;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.world.World;
 
@@ -29,7 +29,7 @@ import javax.annotation.Nullable;
 
 /**
  * Contains contextual information that may be useful when constructing
- * objects from a registry (such as {@link MaskRegistry}).
+ * objects from a registry (such as {@link MaskFactory}).
  * </p>
  * By default, {@link #isRestricted()} will return true.
  */