Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-05 20:36:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use a proper registry for biomes

Browse Source
This commit is contained in:
Matthew Miller
2019-02-16 17:27:00 +10:00
parent d6bc85ccbe
commit 1b101740fe
33 changed files with 314 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,12 +31,14 @@ import com.sk89q.worldedit.math.Vector3;
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.biome.BiomeType;
import com.sk89q.worldedit.world.biome.BiomeTypes;
import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.weather.WeatherType;
import com.sk89q.worldedit.world.weather.WeatherTypes;
import java.util.Collections;
import java.util.List;
@ -80,12 +82,12 @@ public class NullWorld extends AbstractWorld {
}
@Override
public BaseBiome getBiome(BlockVector2 position) {
return null;
public BiomeType getBiome(BlockVector2 position) {
return BiomeTypes.THE_VOID;
}
@Override
public boolean setBiome(BlockVector2 position, BaseBiome biome) {
public boolean setBiome(BlockVector2 position, BiomeType biome) {
return false;
}
@ -109,7 +111,7 @@ public class NullWorld extends AbstractWorld {
@Override
public WeatherType getWeather() {
return null;
return WeatherTypes.CLEAR;
}
@Override

4
worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeName.java
View File

@ -29,7 +29,7 @@ import javax.annotation.Nullable;
/**
* Returns the name of a biome using a given {@code BiomeRegistry}.
*/
class BiomeName implements Function<BaseBiome, String> {
class BiomeName implements Function<BiomeType, String> {
private final BiomeRegistry registry;
@ -45,7 +45,7 @@ class BiomeName implements Function<BaseBiome, String> {
@Nullable
@Override
public String apply(BaseBiome input) {
public String apply(BiomeType input) {
BiomeData data = registry.getData(input);
if (data != null) {
return data.getName();

60
worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BaseBiome.java → worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeType.java
View File

@ -19,64 +19,42 @@
package com.sk89q.worldedit.world.biome;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.registry.NamespacedRegistry;
/**
* Basic storage object to represent a given biome.
* All the types of biomes in the game.
*/
public class BaseBiome {
public class BiomeType {
private int id;
public static final NamespacedRegistry<BiomeType> REGISTRY = new NamespacedRegistry<>("biome type");
/**
* Create a new biome with the given biome ID.
*
* @param id the biome ID
*/
public BaseBiome(int id) {
private String id;
public BiomeType(String id) {
this.id = id;
}
/**
* Create a clone of the given biome.
* Gets the ID of this biome.
*
* @param biome the biome to clone
* @return The id
*/
public BaseBiome(BaseBiome biome) {
checkNotNull(biome);
this.id = biome.getId();
}
/**
* Get the biome ID.
*
* @return the biome ID
*/
public int getId() {
return id;
}
/**
* Set the biome id.
*
* @param id the biome ID
*/
public void setId(int id) {
this.id = id;
public String getId() {
return this.id;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
BaseBiome baseBiome = (BaseBiome) o;
return id == baseBiome.id;
public String toString() {
return getId();
}
@Override
public int hashCode() {
return id;
return this.id.hashCode();
}
@Override
public boolean equals(Object obj) {
return obj instanceof BiomeType && this.id.equals(((BiomeType) obj).id);
}
}

117
worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeTypes.java Normal file
View File

@ -0,0 +1,117 @@
/*
* 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.biome;
import javax.annotation.Nullable;
/**
* Stores a list of common Biome String IDs.
*/
public class BiomeTypes {
public static final BiomeType BADLANDS = register("minecraft:badlands");
public static final BiomeType BADLANDS_PLATEAU = register("minecraft:badlands_plateau");
public static final BiomeType BEACH = register("minecraft:beach");
public static final BiomeType BIRCH_FOREST = register("minecraft:birch_forest");
public static final BiomeType BIRCH_FOREST_HILLS = register("minecraft:birch_forest_hills");
public static final BiomeType COLD_OCEAN = register("minecraft:cold_ocean");
public static final BiomeType DARK_FOREST = register("minecraft:dark_forest");
public static final BiomeType DARK_FOREST_HILLS = register("minecraft:dark_forest_hills");
public static final BiomeType DEEP_COLD_OCEAN = register("minecraft:deep_cold_ocean");
public static final BiomeType DEEP_FROZEN_OCEAN = register("minecraft:deep_frozen_ocean");
public static final BiomeType DEEP_LUKEWARM_OCEAN = register("minecraft:deep_lukewarm_ocean");
public static final BiomeType DEEP_OCEAN = register("minecraft:deep_ocean");
public static final BiomeType DEEP_WARM_OCEAN = register("minecraft:deep_warm_ocean");
public static final BiomeType DESERT = register("minecraft:desert");
public static final BiomeType DESERT_HILLS = register("minecraft:desert_hills");
public static final BiomeType DESERT_LAKES = register("minecraft:desert_lakes");
public static final BiomeType END_BARRENS = register("minecraft:end_barrens");
public static final BiomeType END_HIGHLANDS = register("minecraft:end_highlands");
public static final BiomeType END_MIDLANDS = register("minecraft:end_midlands");
public static final BiomeType ERODED_BADLANDS = register("minecraft:eroded_badlands");
public static final BiomeType FLOWER_FOREST = register("minecraft:flower_forest");
public static final BiomeType FOREST = register("minecraft:forest");
public static final BiomeType FROZEN_OCEAN = register("minecraft:frozen_ocean");
public static final BiomeType FROZEN_RIVER = register("minecraft:frozen_river");
public static final BiomeType GIANT_SPRUCE_TAIGA = register("minecraft:giant_spruce_taiga");
public static final BiomeType GIANT_SPRUCE_TAIGA_HILLS = register("minecraft:giant_spruce_taiga_hills");
public static final BiomeType GIANT_TREE_TAIGA = register("minecraft:giant_tree_taiga");
public static final BiomeType GIANT_TREE_TAIGA_HILLS = register("minecraft:giant_tree_taiga_hills");
public static final BiomeType GRAVELLY_MOUNTAINS = register("minecraft:gravelly_mountains");
public static final BiomeType ICE_SPIKES = register("minecraft:ice_spikes");
public static final BiomeType JUNGLE = register("minecraft:jungle");
public static final BiomeType JUNGLE_EDGE = register("minecraft:jungle_edge");
public static final BiomeType JUNGLE_HILLS = register("minecraft:jungle_hills");
public static final BiomeType LUKEWARM_OCEAN = register("minecraft:lukewarm_ocean");
public static final BiomeType MODIFIED_BADLANDS_PLATEAU = register("minecraft:modified_badlands_plateau");
public static final BiomeType MODIFIED_GRAVELLY_MOUNTAINS = register("minecraft:modified_gravelly_mountains");
public static final BiomeType MODIFIED_JUNGLE = register("minecraft:modified_jungle");
public static final BiomeType MODIFIED_JUNGLE_EDGE = register("minecraft:modified_jungle_edge");
public static final BiomeType MODIFIED_WOODED_BADLANDS_PLATEAU = register("minecraft:modified_wooded_badlands_plateau");
public static final BiomeType MOUNTAIN_EDGE = register("minecraft:mountain_edge");
public static final BiomeType MOUNTAINS = register("minecraft:mountains");
public static final BiomeType MUSHROOM_FIELD_SHORE = register("minecraft:mushroom_field_shore");
public static final BiomeType MUSHROOM_FIELDS = register("minecraft:mushroom_fields");
public static final BiomeType NETHER = register("minecraft:nether");
public static final BiomeType OCEAN = register("minecraft:ocean");
public static final BiomeType PLAINS = register("minecraft:plains");
public static final BiomeType RIVER = register("minecraft:river");
public static final BiomeType SAVANNA = register("minecraft:savanna");
public static final BiomeType SAVANNA_PLATEAU = register("minecraft:savanna_plateau");
public static final BiomeType SHATTERED_SAVANNA = register("minecraft:shattered_savanna");
public static final BiomeType SHATTERED_SAVANNA_PLATEAU = register("minecraft:shattered_savanna_plateau");
public static final BiomeType SMALL_END_ISLANDS = register("minecraft:small_end_islands");
public static final BiomeType SNOWY_BEACH = register("minecraft:snowy_beach");
public static final BiomeType SNOWY_MOUNTAINS = register("minecraft:snowy_mountains");
public static final BiomeType SNOWY_TAIGA = register("minecraft:snowy_taiga");
public static final BiomeType SNOWY_TAIGA_HILLS = register("minecraft:snowy_taiga_hills");
public static final BiomeType SNOWY_TAIGA_MOUNTAINS = register("minecraft:snowy_taiga_mountains");
public static final BiomeType SNOWY_TUNDRA = register("minecraft:snowy_tundra");
public static final BiomeType STONE_SHORE = register("minecraft:stone_shore");
public static final BiomeType SUNFLOWER_PLAINS = register("minecraft:sunflower_plains");
public static final BiomeType SWAMP = register("minecraft:swamp");
public static final BiomeType SWAMP_HILLS = register("minecraft:swamp_hills");
public static final BiomeType TAIGA = register("minecraft:taiga");
public static final BiomeType TAIGA_HILLS = register("minecraft:taiga_hills");
public static final BiomeType TAIGA_MOUNTAINS = register("minecraft:taiga_mountains");
public static final BiomeType TALL_BIRCH_FOREST = register("minecraft:tall_birch_forest");
public static final BiomeType TALL_BIRCH_HILLS = register("minecraft:tall_birch_hills");
public static final BiomeType THE_END = register("minecraft:the_end");
public static final BiomeType THE_VOID = register("minecraft:the_void");
public static final BiomeType WARM_OCEAN = register("minecraft:warm_ocean");
public static final BiomeType WOODED_BADLANDS_PLATEAU = register("minecraft:wooded_badlands_plateau");
public static final BiomeType WOODED_HILLS = register("minecraft:wooded_hills");
public static final BiomeType WOODED_MOUNTAINS = register("minecraft:wooded_mountains");
private BiomeTypes() {
}
private static BiomeType register(final String id) {
return register(new BiomeType(id));
}
public static BiomeType register(final BiomeType biome) {
return BiomeType.REGISTRY.register(biome.getId(), biome);
}
public static @Nullable BiomeType get(final String id) {
return BiomeType.REGISTRY.get(id);
}
}

8
worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/Biomes.java
View File

@ -50,17 +50,17 @@ public final class Biomes {
* @return a biome or null
*/
@Nullable
public static BaseBiome findBiomeByName(Collection<BaseBiome> biomes, String name, BiomeRegistry registry) {
public static BiomeType findBiomeByName(Collection<BiomeType> biomes, String name, BiomeRegistry registry) {
checkNotNull(biomes);
checkNotNull(name);
checkNotNull(registry);
Function<String, ? extends Number> compare = new LevenshteinDistance(name, false, LevenshteinDistance.STANDARD_CHARS);
WeightedChoice<BaseBiome> chooser = new WeightedChoice<>(Functions.compose(compare::apply, new BiomeName(registry)), 0);
for (BaseBiome biome : biomes) {
WeightedChoice<BiomeType> chooser = new WeightedChoice<>(Functions.compose(compare::apply, new BiomeName(registry)), 0);
for (BiomeType biome : biomes) {
chooser.consider(biome);
}
Optional<Choice<BaseBiome>> choice = chooser.getChoice();
Optional<Choice<BiomeType>> choice = chooser.getChoice();
if (choice.isPresent() && choice.get().getScore() <= 1) {
return choice.get().getValue();
} else {

22
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BiomeRegistry.java
View File

@ -19,10 +19,8 @@
package com.sk89q.worldedit.world.registry;
import com.sk89q.worldedit.world.biome.BaseBiome;
import com.sk89q.worldedit.world.biome.BiomeData;
import java.util.List;
import com.sk89q.worldedit.world.biome.BiomeType;
import javax.annotation.Nullable;
@ -31,22 +29,6 @@ import javax.annotation.Nullable;
*/
public interface BiomeRegistry {
/**
* Create a new biome given its biome ID.
*
* @param id its biome ID
* @return a new biome or null if it can't be created
*/
@Nullable
BaseBiome createFromId(int id);
/**
* Get a list of available biomes.
*
* @return a list of biomes
*/
List<BaseBiome> getBiomes();
/**
* Get data about a biome.
*
@ -54,6 +36,6 @@ public interface BiomeRegistry {
* @return a data object or null if information is not known
*/
@Nullable
BiomeData getData(BaseBiome biome);
BiomeData getData(BiomeType biome);
}

18
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/NullBiomeRegistry.java
View File

@ -19,11 +19,8 @@
package com.sk89q.worldedit.world.registry;
import com.sk89q.worldedit.world.biome.BaseBiome;
import com.sk89q.worldedit.world.biome.BiomeData;
import java.util.Collections;
import java.util.List;
import com.sk89q.worldedit.world.biome.BiomeType;
import javax.annotation.Nullable;
@ -40,18 +37,7 @@ public class NullBiomeRegistry implements BiomeRegistry {
@Nullable
@Override
public BaseBiome createFromId(int id) {
return null;
}
@Override
public List<BaseBiome> getBiomes() {
return Collections.emptyList();
}
@Nullable
@Override
public BiomeData getData(BaseBiome biome) {
public BiomeData getData(BiomeType biome) {
return null;
}