Added an entity, weathertype, and gamemode registry.

worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java

@@ -36,6 +36,7 @@ import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.util.TreeGenerator.TreeType;
 import com.sk89q.worldedit.world.biome.BaseBiome;
+import com.sk89q.worldedit.world.weather.WeatherType;
 
 import java.util.Collections;
 import java.util.List;
@@ -101,6 +102,24 @@ public class NullWorld extends AbstractWorld {
         return false;
     }
 
+    @Override
+    public WeatherType getWeather() {
+        return null;
+    }
+
+    @Override
+    public long getRemainingWeatherDuration() {
+        return 0;
+    }
+
+    @Override
+    public void setWeather(WeatherType weatherType) {
+    }
+
+    @Override
+    public void setWeather(WeatherType weatherType, long duration) {
+    }
+
     @Override
     public BlockState getBlock(Vector position) {
         return BlockTypes.AIR.getDefaultState();

worldedit-core/src/main/java/com/sk89q/worldedit/world/World.java

@@ -34,6 +34,7 @@ import com.sk89q.worldedit.function.mask.Mask;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.util.Direction;
 import com.sk89q.worldedit.util.TreeGenerator;
+import com.sk89q.worldedit.world.weather.WeatherType;
 
 /**
  * Represents a world (dimension).
@@ -202,6 +203,35 @@ public interface World extends Extent {
      */
     boolean queueBlockBreakEffect(Platform server, Vector position, BlockType blockType, double priority);
 
+    /**
+     * Gets the weather type of the world.
+     *
+     * @return The weather
+     */
+    WeatherType getWeather();
+
+    /**
+     * Gets the remaining weather duration.
+     *
+     * @return The weather duration
+     */
+    long getRemainingWeatherDuration();
+
+    /**
+     * Sets the weather type of the world.
+     *
+     * @param weatherType The weather type
+     */
+    void setWeather(WeatherType weatherType);
+
+    /**
+     * Sets the weather type of the world.
+     *
+     * @param weatherType The weather type
+     * @param duration The duration of the weather
+     */
+    void setWeather(WeatherType weatherType, long duration);
+
     @Override
     boolean equals(Object other);
 

worldedit-core/src/main/java/com/sk89q/worldedit/world/entity/EntityType.java

@@ -0,0 +1,61 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.world.entity;
+
+import com.sk89q.worldedit.registry.NamespacedRegistry;
+
+public class EntityType {
+
+    public static final NamespacedRegistry<EntityType> REGISTRY = new NamespacedRegistry<>("entity type");
+
+    private String id;
+
+    public EntityType(String id) {
+        // If it has no namespace, assume minecraft.
+        if (!id.contains(":")) {
+            id = "minecraft:" + id;
+        }
+        this.id = id;
+    }
+
+    public String getId() {
+        return this.id;
+    }
+
+    /**
+     * Gets the name of this item, or the ID if the name cannot be found.
+     *
+     * @return The name, or ID
+     */
+    public String getName() {
+        return getId();
+    }
+
+    @Override
+    public int hashCode() {
+        return this.id.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof EntityType && this.id.equals(((EntityType) obj).id);
+    }
+
+}

worldedit-core/src/main/java/com/sk89q/worldedit/world/entity/EntityTypes.java

@@ -0,0 +1,137 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.world.entity;
+
+import javax.annotation.Nullable;
+
+public class EntityTypes {
+
+    public static final EntityType AREA_EFFECT_CLOUD = register("minecraft:area_effect_cloud");
+    public static final EntityType ARMOR_STAND = register("minecraft:armor_stand");
+    public static final EntityType ARROW = register("minecraft:arrow");
+    public static final EntityType BAT = register("minecraft:bat");
+    public static final EntityType BLAZE = register("minecraft:blaze");
+    public static final EntityType BOAT = register("minecraft:boat");
+    public static final EntityType CAVE_SPIDER = register("minecraft:cave_spider");
+    public static final EntityType CHEST_MINECART = register("minecraft:chest_minecart");
+    public static final EntityType CHICKEN = register("minecraft:chicken");
+    public static final EntityType COD = register("minecraft:cod");
+    public static final EntityType COMMAND_BLOCK_MINECART = register("minecraft:command_block_minecart");
+    public static final EntityType COW = register("minecraft:cow");
+    public static final EntityType CREEPER = register("minecraft:creeper");
+    public static final EntityType DOLPHIN = register("minecraft:dolphin");
+    public static final EntityType DONKEY = register("minecraft:donkey");
+    public static final EntityType DRAGON_FIREBALL = register("minecraft:dragon_fireball");
+    public static final EntityType DROWNED = register("minecraft:drowned");
+    public static final EntityType EGG = register("minecraft:egg");
+    public static final EntityType ELDER_GUARDIAN = register("minecraft:elder_guardian");
+    public static final EntityType END_CRYSTAL = register("minecraft:end_crystal");
+    public static final EntityType ENDER_DRAGON = register("minecraft:ender_dragon");
+    public static final EntityType ENDER_PEARL = register("minecraft:ender_pearl");
+    public static final EntityType ENDERMAN = register("minecraft:enderman");
+    public static final EntityType ENDERMITE = register("minecraft:endermite");
+    public static final EntityType EVOKER = register("minecraft:evoker");
+    public static final EntityType EVOKER_FANGS = register("minecraft:evoker_fangs");
+    public static final EntityType EXPERIENCE_BOTTLE = register("minecraft:experience_bottle");
+    public static final EntityType EXPERIENCE_ORB = register("minecraft:experience_orb");
+    public static final EntityType EYE_OF_ENDER = register("minecraft:eye_of_ender");
+    public static final EntityType FALLING_BLOCK = register("minecraft:falling_block");
+    public static final EntityType FIREBALL = register("minecraft:fireball");
+    public static final EntityType FIREWORK_ROCKET = register("minecraft:firework_rocket");
+    public static final EntityType FISHING_BOBBER = register("minecraft:fishing_bobber");
+    public static final EntityType FURNACE_MINECART = register("minecraft:furnace_minecart");
+    public static final EntityType GHAST = register("minecraft:ghast");
+    public static final EntityType GIANT = register("minecraft:giant");
+    public static final EntityType GUARDIAN = register("minecraft:guardian");
+    public static final EntityType HOPPER_MINECART = register("minecraft:hopper_minecart");
+    public static final EntityType HORSE = register("minecraft:horse");
+    public static final EntityType HUSK = register("minecraft:husk");
+    public static final EntityType ILLUSIONER = register("minecraft:illusioner");
+    public static final EntityType IRON_GOLEM = register("minecraft:iron_golem");
+    public static final EntityType ITEM = register("minecraft:item");
+    public static final EntityType ITEM_FRAME = register("minecraft:item_frame");
+    public static final EntityType LEASH_KNOT = register("minecraft:leash_knot");
+    public static final EntityType LIGHTNING_BOLT = register("minecraft:lightning_bolt");
+    public static final EntityType LLAMA = register("minecraft:llama");
+    public static final EntityType LLAMA_SPIT = register("minecraft:llama_spit");
+    public static final EntityType MAGMA_CUBE = register("minecraft:magma_cube");
+    public static final EntityType MINECART = register("minecraft:minecart");
+    public static final EntityType MOOSHROOM = register("minecraft:mooshroom");
+    public static final EntityType MULE = register("minecraft:mule");
+    public static final EntityType OCELOT = register("minecraft:ocelot");
+    public static final EntityType PAINTING = register("minecraft:painting");
+    public static final EntityType PARROT = register("minecraft:parrot");
+    public static final EntityType PHANTOM = register("minecraft:phantom");
+    public static final EntityType PIG = register("minecraft:pig");
+    public static final EntityType PLAYER = register("minecraft:player");
+    public static final EntityType POLAR_BEAR = register("minecraft:polar_bear");
+    public static final EntityType POTION = register("minecraft:potion");
+    public static final EntityType PUFFERFISH = register("minecraft:pufferfish");
+    public static final EntityType RABBIT = register("minecraft:rabbit");
+    public static final EntityType SALMON = register("minecraft:salmon");
+    public static final EntityType SHEEP = register("minecraft:sheep");
+    public static final EntityType SHULKER = register("minecraft:shulker");
+    public static final EntityType SHULKER_BULLET = register("minecraft:shulker_bullet");
+    public static final EntityType SILVERFISH = register("minecraft:silverfish");
+    public static final EntityType SKELETON = register("minecraft:skeleton");
+    public static final EntityType SKELETON_HORSE = register("minecraft:skeleton_horse");
+    public static final EntityType SLIME = register("minecraft:slime");
+    public static final EntityType SMALL_FIREBALL = register("minecraft:small_fireball");
+    public static final EntityType SNOW_GOLEM = register("minecraft:snow_golem");
+    public static final EntityType SNOWBALL = register("minecraft:snowball");
+    public static final EntityType SPAWNER_MINECART = register("minecraft:spawner_minecart");
+    public static final EntityType SPECTRAL_ARROW = register("minecraft:spectral_arrow");
+    public static final EntityType SPIDER = register("minecraft:spider");
+    public static final EntityType SQUID = register("minecraft:squid");
+    public static final EntityType STRAY = register("minecraft:stray");
+    public static final EntityType TNT = register("minecraft:tnt");
+    public static final EntityType TNT_MINECART = register("minecraft:tnt_minecart");
+    public static final EntityType TRIDENT = register("minecraft:trident");
+    public static final EntityType TROPICAL_FISH = register("minecraft:tropical_fish");
+    public static final EntityType TURTLE = register("minecraft:turtle");
+    public static final EntityType VEX = register("minecraft:vex");
+    public static final EntityType VILLAGER = register("minecraft:villager");
+    public static final EntityType VINDICATOR = register("minecraft:vindicator");
+    public static final EntityType WITCH = register("minecraft:witch");
+    public static final EntityType WITHER = register("minecraft:wither");
+    public static final EntityType WITHER_SKELETON = register("minecraft:wither_skeleton");
+    public static final EntityType WITHER_SKULL = register("minecraft:wither_skull");
+    public static final EntityType WOLF = register("minecraft:wolf");
+    public static final EntityType ZOMBIE = register("minecraft:zombie");
+    public static final EntityType ZOMBIE_HORSE = register("minecraft:zombie_horse");
+    public static final EntityType ZOMBIE_PIGMAN = register("minecraft:zombie_pigman");
+    public static final EntityType ZOMBIE_VILLAGER = register("minecraft:zombie_villager");
+
+    private EntityTypes() {
+    }
+
+    private static EntityType register(final String id) {
+        return register(new EntityType(id));
+    }
+
+    public static EntityType register(final EntityType entityType) {
+        return EntityType.REGISTRY.register(entityType.getId(), entityType);
+    }
+
+    public static @Nullable EntityType get(final String id) {
+        return EntityType.REGISTRY.get(id);
+    }
+
+}

worldedit-core/src/main/java/com/sk89q/worldedit/world/gamemode/GameMode.java

@@ -0,0 +1,57 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.world.gamemode;
+
+import com.sk89q.worldedit.registry.Registry;
+
+public class GameMode {
+
+    public static final Registry<GameMode> REGISTRY = new Registry<>("game mode");
+
+    private String id;
+
+    public GameMode(String id) {
+        this.id = id;
+    }
+
+    public String getId() {
+        return this.id;
+    }
+
+    /**
+     * Gets the name of this game mode, or the ID if the name cannot be found.
+     *
+     * @return The name, or ID
+     */
+    public String getName() {
+        return getId();
+    }
+
+    @Override
+    public int hashCode() {
+        return this.id.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof GameMode && this.id.equals(((GameMode) obj).id);
+    }
+
+}

worldedit-core/src/main/java/com/sk89q/worldedit/world/gamemode/GameModes.java

@@ -0,0 +1,47 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.world.gamemode;
+
+import javax.annotation.Nullable;
+
+public class GameModes {
+
+    public static final GameMode NOT_SET = register("");
+    public static final GameMode SURVIVAL = register("survival");
+    public static final GameMode CREATIVE = register("creative");
+    public static final GameMode ADVENTURE = register("adventure");
+    public static final GameMode SPECTATOR = register("spectator");
+
+    private GameModes() {
+    }
+
+    private static GameMode register(final String id) {
+        return register(new GameMode(id));
+    }
+
+    public static GameMode register(final GameMode gameMode) {
+        return GameMode.REGISTRY.register(gameMode.getId(), gameMode);
+    }
+
+    public static @Nullable GameMode get(final String id) {
+        return GameMode.REGISTRY.get(id);
+    }
+
+}

worldedit-core/src/main/java/com/sk89q/worldedit/world/weather/WeatherType.java

@@ -0,0 +1,57 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.world.weather;
+
+import com.sk89q.worldedit.registry.Registry;
+
+public class WeatherType {
+
+    public static final Registry<WeatherType> REGISTRY = new Registry<>("weather type");
+
+    private String id;
+
+    public WeatherType(String id) {
+        this.id = id;
+    }
+
+    public String getId() {
+        return this.id;
+    }
+
+    /**
+     * Gets the name of this weather, or the ID if the name cannot be found.
+     *
+     * @return The name, or ID
+     */
+    public String getName() {
+        return getId();
+    }
+
+    @Override
+    public int hashCode() {
+        return this.id.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof WeatherType && this.id.equals(((WeatherType) obj).id);
+    }
+
+}

worldedit-core/src/main/java/com/sk89q/worldedit/world/weather/WeatherTypes.java

@@ -0,0 +1,44 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.world.weather;
+
+import javax.annotation.Nullable;
+
+public class WeatherTypes {
+
+    public static final WeatherType CLEAR = register("clear");
+    public static final WeatherType RAIN = register("rain");
+    public static final WeatherType THUNDER_STORM = register("thunder_storm");
+
+    private WeatherTypes() {
+    }
+
+    private static WeatherType register(final String id) {
+        return register(new WeatherType(id));
+    }
+
+    public static WeatherType register(final WeatherType weatherType) {
+        return WeatherType.REGISTRY.register(weatherType.getId(), weatherType);
+    }
+
+    public static @Nullable WeatherType get(final String id) {
+        return WeatherType.REGISTRY.get(id);
+    }
+}