From 3f9d3756fbeb637335ed24c1c80b2505b9e1f352 Mon Sep 17 00:00:00 2001
From: Wodor <17339354+wode490390@users.noreply.github.com>
Date: Sun, 27 Sep 2020 18:28:47 +0800
Subject: [PATCH] Release 1.2.2

---
 .github/dependabot.yml                        |  8 ++
 README.md                                     |  8 +-
 pom.xml                                       |  6 +-
 .../vanillagenerator/NetherGenerator.java     | 17 ++--
 .../vanillagenerator/NormalGenerator.java     | 26 +++---
 .../vanillagenerator/biome/BiomeClimate.java  |  6 +-
 .../biomegrid/MapLayerBiomeEdge.java          | 34 ++++----
 .../biomegrid/MapLayerBiomeEdgeThin.java      | 27 ++++---
 .../biomegrid/MapLayerBiomeVariation.java     |  6 +-
 .../biomegrid/MapLayerRarePlains.java         |  6 +-
 .../biomegrid/MapLayerRiver.java              | 12 +--
 .../biomegrid/MapLayerShore.java              | 12 +--
 .../biomegrid/MapLayerWhittaker.java          |  1 +
 .../noise/PerlinOctaveGenerator.java          |  6 +-
 .../noise/SimplexOctaveGenerator.java         |  6 +-
 .../vanillagenerator/object/OreType.java      | 79 +++++++++++++++++++
 .../populator/PopulatorOre.java               | 38 +++++++++
 .../populator/nether/PopulatorGlowstone.java  |  2 +-
 .../populator/nether/PopulatorLava.java       |  2 +-
 .../populator/overworld/PopulatorCaves.java   |  1 +
 .../scheduler/CLNoiseReleaseTask.java         |  2 +-
 21 files changed, 215 insertions(+), 90 deletions(-)
 create mode 100644 .github/dependabot.yml
 create mode 100644 src/main/java/cn/wode490390/nukkit/vanillagenerator/object/OreType.java
 create mode 100644 src/main/java/cn/wode490390/nukkit/vanillagenerator/populator/PopulatorOre.java

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..d3d8361
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+updates:
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "cn.nukkit:nukkit"
diff --git a/README.md b/README.md
index c25f75a..9df8961 100644
--- a/README.md
+++ b/README.md
@@ -11,9 +11,9 @@ In addition, this plugin can offload overworld surface noise operations onto the
 
 [![](https://i.loli.net/2019/06/12/5d00613070e3947388.png)](https://www.mcbbs.net/thread-872584-1-1.html "可自定义的更好的原生地形生成器")
 
-If you found any bugs or have any suggestions, please open an issue on [GitHub Issues](https://github.com/wode490390/BetterVanillaGenerator/issues).
+If you found any bugs or have any suggestions, please open an issue on [GitHub](https://github.com/wode490390/BetterVanillaGenerator/issues).
 
-If you love this plugin, please star it on [GitHub](https://github.com/wode490390/BetterVanillaGenerator).
+If you like this plugin, please star it on [GitHub](https://github.com/wode490390/BetterVanillaGenerator).
 
 *Note: Please back up old worlds before using this plugin.*
 
@@ -132,8 +132,8 @@ gpu:
 
 ## Metrics Collection
 
-This plugin uses [bStats](https://github.com/wode490390/bStats-Nukkit) - you can opt out using the global bStats config, see the [official website](https://bstats.org/getting-started) for more details.
+This plugin uses [bStats](https://github.com/wode490390/bStats-Nukkit). You can opt out using the global bStats config; see the [official website](https://bstats.org/getting-started) for more details.
 
 [![Metrics](https://bstats.org/signatures/bukkit/BetterVanillaGenerator.svg)](https://bstats.org/plugin/bukkit/BetterVanillaGenerator/5198)
 
-###### If I have any grammar and terms error, please correct my wrong :)
+###### If I have any grammar and/or term errors, please correct them :)
diff --git a/pom.xml b/pom.xml
index 1e456e5..b7082b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>cn.wode490390.nukkit</groupId>
     <artifactId>vanillagenerator</artifactId>
     <packaging>jar</packaging>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
     <name>BetterVanillaGenerator</name>
     <description>Better vanilla generator plugin for Nukkit</description>
     <url>http://wode490390.cn/</url>
@@ -96,7 +96,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.2</version>
+                <version>3.2.4</version>
                 <configuration>
                     <!--<filters>
                         <filter>
@@ -120,7 +120,7 @@
             <plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>
-                <version>4.0.0</version>
+                <version>4.0.2</version>
                 <executions>
                     <execution>
                         <id>get-the-git-infos</id>
diff --git a/src/main/java/cn/wode490390/nukkit/vanillagenerator/NetherGenerator.java b/src/main/java/cn/wode490390/nukkit/vanillagenerator/NetherGenerator.java
index ab138de..1bf9d62 100644
--- a/src/main/java/cn/wode490390/nukkit/vanillagenerator/NetherGenerator.java
+++ b/src/main/java/cn/wode490390/nukkit/vanillagenerator/NetherGenerator.java
@@ -7,19 +7,20 @@
 import cn.nukkit.level.biome.EnumBiome;
 import cn.nukkit.level.format.generic.BaseFullChunk;
 import cn.nukkit.level.generator.Generator;
-import cn.nukkit.level.generator.object.ore.OreType;
-import cn.nukkit.level.generator.populator.impl.PopulatorOre;
 import cn.nukkit.level.generator.populator.type.Populator;
 import cn.nukkit.math.NukkitRandom;
 import cn.nukkit.math.Vector3;
 import cn.wode490390.nukkit.vanillagenerator.noise.PerlinOctaveGenerator;
 import cn.wode490390.nukkit.vanillagenerator.noise.bukkit.OctaveGenerator;
+import cn.wode490390.nukkit.vanillagenerator.object.OreType;
+import cn.wode490390.nukkit.vanillagenerator.populator.PopulatorOre;
 import cn.wode490390.nukkit.vanillagenerator.populator.nether.PopulatorFire;
 import cn.wode490390.nukkit.vanillagenerator.populator.nether.PopulatorGlowstone;
 import cn.wode490390.nukkit.vanillagenerator.populator.nether.PopulatorLava;
 import cn.wode490390.nukkit.vanillagenerator.populator.nether.PopulatorMushroom;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ThreadLocalRandom;
@@ -47,11 +48,11 @@ public class NetherGenerator extends VanillaGenerator {
     protected long localSeed2;
 
     public NetherGenerator() {
-
+        // reflect
     }
 
     public NetherGenerator(Map<String, Object> options) {
-
+        // reflect
     }
 
     @Override
@@ -282,18 +283,14 @@ public void generateChunk(int chunkX, int chunkZ) {
             }
         }
 
-        this.generationPopulators.forEach((populator) -> {
-            populator.populate(this.level, chunkX, chunkZ, this.nukkitRandom, chunk);
-        });
+        this.generationPopulators.forEach(populator -> populator.populate(this.level, chunkX, chunkZ, this.nukkitRandom, chunk));
     }
 
     @Override
     public void populateChunk(int chunkX, int chunkZ) {
         BaseFullChunk chunk = level.getChunk(chunkX, chunkZ);
         this.nukkitRandom.setSeed(0xdeadbeef ^ (chunkX << 8) ^ chunkZ ^ this.level.getSeed());
-        this.populators.forEach((populator) -> {
-            populator.populate(this.level, chunkX, chunkZ, this.nukkitRandom, chunk);
-        });
+        this.populators.forEach(populator -> populator.populate(this.level, chunkX, chunkZ, this.nukkitRandom, chunk));
         Biome.getBiome(chunk.getBiomeId(7, 7)).populateChunk(this.level, chunkX, chunkZ, this.nukkitRandom);
     }
 
diff --git a/src/main/java/cn/wode490390/nukkit/vanillagenerator/NormalGenerator.java b/src/main/java/cn/wode490390/nukkit/vanillagenerator/NormalGenerator.java
index 041f52f..42ec7fd 100644
--- a/src/main/java/cn/wode490390/nukkit/vanillagenerator/NormalGenerator.java
+++ b/src/main/java/cn/wode490390/nukkit/vanillagenerator/NormalGenerator.java
@@ -7,8 +7,6 @@
 import cn.nukkit.level.biome.Biome;
 import cn.nukkit.level.biome.EnumBiome;
 import cn.nukkit.level.format.generic.BaseFullChunk;
-import cn.nukkit.level.generator.object.ore.OreType;
-import cn.nukkit.level.generator.populator.impl.PopulatorOre;
 import cn.nukkit.level.generator.populator.type.Populator;
 import cn.nukkit.math.NukkitRandom;
 import cn.nukkit.math.Vector3;
@@ -26,6 +24,8 @@
 import cn.wode490390.nukkit.vanillagenerator.noise.PerlinOctaveGenerator;
 import cn.wode490390.nukkit.vanillagenerator.noise.SimplexOctaveGenerator;
 import cn.wode490390.nukkit.vanillagenerator.noise.bukkit.OctaveGenerator;
+import cn.wode490390.nukkit.vanillagenerator.object.OreType;
+import cn.wode490390.nukkit.vanillagenerator.populator.PopulatorOre;
 import cn.wode490390.nukkit.vanillagenerator.populator.overworld.PopulatorCaves;
 import cn.wode490390.nukkit.vanillagenerator.populator.overworld.PopulatorSnowLayers;
 import cn.wode490390.nukkit.vanillagenerator.scheduler.CLNoiseReleaseTask;
@@ -37,6 +37,8 @@
 import com.jogamp.opencl.CLKernel;
 import com.jogamp.opencl.CLMemory;
 import com.jogamp.opencl.CLProgram;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
 import java.nio.FloatBuffer;
 import java.util.List;
@@ -57,8 +59,8 @@ public static void setUseGraphicsCompute(boolean enable) {
     protected MapLayer[] biomeGrid;
 
     protected static final double[][] ELEVATION_WEIGHT = new double[5][5];
-    protected static final Map<Integer, GroundGenerator> GROUND_MAP = Maps.newHashMap();
-    protected static final Map<Integer, BiomeHeight> HEIGHT_MAP = Maps.newHashMap();
+    protected static final Int2ObjectMap<GroundGenerator> GROUND_MAP = new Int2ObjectOpenHashMap<>();
+    protected static final Int2ObjectMap<BiomeHeight> HEIGHT_MAP = new Int2ObjectOpenHashMap<>();
 
     protected static double coordinateScale = getConfig("overworld.coordinate-scale", 684.412d);
     protected static double heightScale = getConfig("overworld.height.scale", 684.412d);
@@ -147,11 +149,11 @@ protected static void setBiomeHeight(BiomeHeight height, int... biomes) {
     protected long localSeed2;
 
     public NormalGenerator() {
-
+        // reflect
     }
 
     public NormalGenerator(Map<String, Object> options) {
-
+        // reflect
     }
 
     @Override
@@ -398,11 +400,7 @@ public void generateChunk(int chunkX, int chunkZ) {
                 // Use noise
                 for (int sx = 0; sx < sizeX; sx++) {
                     for (int sz = 0; sz < sizeZ; sz++) {
-                        if (GROUND_MAP.containsKey(biomes.getBiome(sx, sz))) {
-                            GROUND_MAP.get(biomes.getBiome(sx, sz)).generateTerrainColumn(level, chunkData, this.nukkitRandom, cx + sx, cz + sz, biomes.getBiome(sx, sz), noise.getBuffer().get(sx | sz << 4));
-                        } else {
-                            groundGen.generateTerrainColumn(level, chunkData, this.nukkitRandom, cx + sx, cz + sz, biomes.getBiome(sx, sz), noise.getBuffer().get(sx | sz << 4));
-                        }
+                        GROUND_MAP.getOrDefault(biomes.getBiome(sx, sz), groundGen).generateTerrainColumn(level, chunkData, this.nukkitRandom, cx + sx, cz + sz, biomes.getBiome(sx, sz), noise.getBuffer().get(sx | sz << 4));
                         chunkData.setBiomeId(sx, sz, biomes.getBiome(sx, sz));
                     }
                 }
@@ -419,11 +417,7 @@ public void generateChunk(int chunkX, int chunkZ) {
             double[] surfaceNoise = octaveGenerator.getFractalBrownianMotion(cx, cz, 0.5d, 0.5d);
             for (int sx = 0; sx < sizeX; sx++) {
                 for (int sz = 0; sz < sizeZ; sz++) {
-                    if (GROUND_MAP.containsKey(biomes.getBiome(sx, sz))) {
-                        GROUND_MAP.get(biomes.getBiome(sx, sz)).generateTerrainColumn(level, chunkData, this.nukkitRandom, cx + sx, cz + sz, biomes.getBiome(sx, sz), surfaceNoise[sx | sz << 4]);
-                    } else {
-                        groundGen.generateTerrainColumn(level, chunkData, this.nukkitRandom, cx + sx, cz + sz, biomes.getBiome(sx, sz), surfaceNoise[sx | sz << 4]);
-                    }
+                    GROUND_MAP.getOrDefault(biomes.getBiome(sx, sz), groundGen).generateTerrainColumn(level, chunkData, this.nukkitRandom, cx + sx, cz + sz, biomes.getBiome(sx, sz), surfaceNoise[sx | sz << 4]);
                     chunkData.setBiomeId(sx, sz, biomes.getBiome(sx, sz));
                 }
             }
diff --git a/src/main/java/cn/wode490390/nukkit/vanillagenerator/biome/BiomeClimate.java b/src/main/java/cn/wode490390/nukkit/vanillagenerator/biome/BiomeClimate.java
index ecfdaf6..9ee6eb1 100644
--- a/src/main/java/cn/wode490390/nukkit/vanillagenerator/biome/BiomeClimate.java
+++ b/src/main/java/cn/wode490390/nukkit/vanillagenerator/biome/BiomeClimate.java
@@ -4,12 +4,12 @@
 import cn.nukkit.level.biome.EnumBiome;
 import cn.nukkit.math.NukkitRandom;
 import cn.wode490390.nukkit.vanillagenerator.noise.bukkit.SimplexOctaveGenerator;
-import com.google.common.collect.Maps;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
 public class BiomeClimate {
 
-    private static final Map<Integer, Climate> CLIMATE_MAP = Maps.newHashMap();
+    private static final Int2ObjectMap<Climate> CLIMATE_MAP = new Int2ObjectOpenHashMap<>();
     private static final SimplexOctaveGenerator noiseGen;
 
     static {
diff --git a/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerBiomeEdge.java b/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerBiomeEdge.java
index edc045d..0bf15c9 100644
--- a/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerBiomeEdge.java
+++ b/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerBiomeEdge.java
@@ -2,19 +2,22 @@
 
 import cn.nukkit.level.biome.EnumBiome;
 import com.google.common.collect.Maps;
-import java.util.Arrays;
-import java.util.List;
+import it.unimi.dsi.fastutil.ints.Int2IntMap;
+import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
+import it.unimi.dsi.fastutil.ints.IntList;
+
 import java.util.Map;
 import java.util.Map.Entry;
 
 public class MapLayerBiomeEdge extends MapLayer {
 
-    private static final Map<Integer, Integer> MESA_EDGES = Maps.newHashMap();
-    private static final Map<Integer, Integer> MEGA_TAIGA_EDGES = Maps.newHashMap();
-    private static final Map<Integer, Integer> DESERT_EDGES = Maps.newHashMap();
-    private static final Map<Integer, Integer> SWAMP1_EDGES = Maps.newHashMap();
-    private static final Map<Integer, Integer> SWAMP2_EDGES = Maps.newHashMap();
-    private static final Map<Map<Integer, Integer>, List<Integer>> EDGES = Maps.newHashMap();
+    private static final Int2IntMap MESA_EDGES = new Int2IntOpenHashMap();
+    private static final Int2IntMap MEGA_TAIGA_EDGES = new Int2IntOpenHashMap();
+    private static final Int2IntMap DESERT_EDGES = new Int2IntOpenHashMap();
+    private static final Int2IntMap SWAMP1_EDGES = new Int2IntOpenHashMap();
+    private static final Int2IntMap SWAMP2_EDGES = new Int2IntOpenHashMap();
+    private static final Map<Int2IntMap, IntList> EDGES = Maps.newHashMap();
 
     static {
         MESA_EDGES.put(EnumBiome.MESA_PLATEAU_F.id, EnumBiome.MESA.id);
@@ -29,9 +32,9 @@ public class MapLayerBiomeEdge extends MapLayer {
 
         EDGES.put(MESA_EDGES, null);
         EDGES.put(MEGA_TAIGA_EDGES, null);
-        EDGES.put(DESERT_EDGES, Arrays.asList(EnumBiome.ICE_PLAINS.id));
-        EDGES.put(SWAMP1_EDGES, Arrays.asList(EnumBiome.DESERT.id, EnumBiome.COLD_TAIGA.id, EnumBiome.ICE_PLAINS.id));
-        EDGES.put(SWAMP2_EDGES, Arrays.asList(EnumBiome.JUNGLE.id));
+        EDGES.put(DESERT_EDGES, IntArrayList.wrap(new int[]{EnumBiome.ICE_PLAINS.id}));
+        EDGES.put(SWAMP1_EDGES, IntArrayList.wrap(new int[]{EnumBiome.DESERT.id, EnumBiome.COLD_TAIGA.id, EnumBiome.ICE_PLAINS.id}));
+        EDGES.put(SWAMP2_EDGES, IntArrayList.wrap(new int[]{EnumBiome.JUNGLE.id}));
     }
 
     private final MapLayer belowLayer;
@@ -55,17 +58,18 @@ public int[] generateValues(int x, int z, int sizeX, int sizeZ) {
                 // This applies biome large edges using Von Neumann neighborhood
                 int centerVal = values[j + 1 + (i + 1) * gridSizeX];
                 int val = centerVal;
-                for (Entry<Map<Integer, Integer>, List<Integer>> entry : EDGES.entrySet()) {
-                    Map<Integer, Integer> map = entry.getKey();
+                for (Entry<Int2IntMap, IntList> entry : EDGES.entrySet()) {
+                    Int2IntMap map = entry.getKey();
                     if (map.containsKey(centerVal)) {
                         int upperVal = values[j + 1 + i * gridSizeX];
                         int lowerVal = values[j + 1 + (i + 2) * gridSizeX];
                         int leftVal = values[j + (i + 1) * gridSizeX];
                         int rightVal = values[j + 2 + (i + 1) * gridSizeX];
-                        if (entry.getValue() == null && (!map.containsKey(upperVal) || !map.containsKey(lowerVal) || !map.containsKey(leftVal) || !map.containsKey(rightVal))) {
+                        IntList entryValue = entry.getValue();
+                        if (entryValue == null && (!map.containsKey(upperVal) || !map.containsKey(lowerVal) || !map.containsKey(leftVal) || !map.containsKey(rightVal))) {
                             val = map.get(centerVal);
                             break;
-                        } else if (entry.getValue() != null && (entry.getValue().contains(upperVal) || entry.getValue().contains(lowerVal) || entry.getValue().contains(leftVal) || entry.getValue().contains(rightVal))) {
+                        } else if (entryValue != null && (entryValue.contains(upperVal) || entryValue.contains(lowerVal) || entryValue.contains(leftVal) || entryValue.contains(rightVal))) {
                             val = map.get(centerVal);
                             break;
                         }
diff --git a/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerBiomeEdgeThin.java b/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerBiomeEdgeThin.java
index 2225bbe..27c771e 100644
--- a/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerBiomeEdgeThin.java
+++ b/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerBiomeEdgeThin.java
@@ -2,19 +2,22 @@
 
 import cn.nukkit.level.biome.EnumBiome;
 import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import java.util.Arrays;
-import java.util.List;
+import it.unimi.dsi.fastutil.ints.Int2IntMap;
+import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
+import it.unimi.dsi.fastutil.ints.IntList;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import it.unimi.dsi.fastutil.ints.IntSet;
+
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Set;
 
 public class MapLayerBiomeEdgeThin extends MapLayer {
 
-    private static final Set<Integer> OCEANS = Sets.newHashSet();
-    private static final Map<Integer, Integer> MESA_EDGES = Maps.newHashMap();
-    private static final Map<Integer, Integer> JUNGLE_EDGES = Maps.newHashMap();
-    private static final Map<Map<Integer, Integer>, List<Integer>> EDGES = Maps.newHashMap();
+    private static final IntSet OCEANS = new IntOpenHashSet();
+    private static final Int2IntMap MESA_EDGES = new Int2IntOpenHashMap();
+    private static final Int2IntMap JUNGLE_EDGES = new Int2IntOpenHashMap();
+    private static final Map<Int2IntMap, IntList> EDGES = Maps.newHashMap();
 
     static {
         OCEANS.add(EnumBiome.OCEAN.id);
@@ -33,7 +36,7 @@ public class MapLayerBiomeEdgeThin extends MapLayer {
         JUNGLE_EDGES.put(EnumBiome.JUNGLE_EDGE_M.id, EnumBiome.JUNGLE_EDGE.id);
 
         EDGES.put(MESA_EDGES, null);
-        EDGES.put(JUNGLE_EDGES, Arrays.asList(EnumBiome.JUNGLE.id, EnumBiome.JUNGLE_HILLS.id, EnumBiome.JUNGLE_M.id, EnumBiome.JUNGLE_EDGE_M.id, EnumBiome.FOREST.id, EnumBiome.TAIGA.id));
+        EDGES.put(JUNGLE_EDGES, IntArrayList.wrap(new int[]{EnumBiome.JUNGLE.id, EnumBiome.JUNGLE_HILLS.id, EnumBiome.JUNGLE_M.id, EnumBiome.JUNGLE_EDGE_M.id, EnumBiome.FOREST.id, EnumBiome.TAIGA.id}));
     }
 
     private final MapLayer belowLayer;
@@ -57,14 +60,14 @@ public int[] generateValues(int x, int z, int sizeX, int sizeZ) {
                 // This applies biome thin edges using Von Neumann neighborhood
                 int centerVal = values[j + 1 + (i + 1) * gridSizeX];
                 int val = centerVal;
-                for (Entry<Map<Integer, Integer>, List<Integer>> entry : EDGES.entrySet()) {
-                    Map<Integer, Integer> map = entry.getKey();
+                for (Entry<Int2IntMap, IntList> entry : EDGES.entrySet()) {
+                    Int2IntMap map = entry.getKey();
                     if (map.containsKey(centerVal)) {
                         int upperVal = values[j + 1 + i * gridSizeX];
                         int lowerVal = values[j + 1 + (i + 2) * gridSizeX];
                         int leftVal = values[j + (i + 1) * gridSizeX];
                         int rightVal = values[j + 2 + (i + 1) * gridSizeX];
-                        List<Integer> entryValue = entry.getValue();
+                        IntList entryValue = entry.getValue();
                         if (entryValue == null && (!OCEANS.contains(upperVal) && !map.containsKey(upperVal) || !OCEANS.contains(lowerVal) && !map.containsKey(lowerVal) || !OCEANS.contains(leftVal) && !map.containsKey(leftVal) || !OCEANS.contains(rightVal) && !map.containsKey(rightVal))) {
                             val = map.get(centerVal);
                             break;
diff --git a/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerBiomeVariation.java b/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerBiomeVariation.java
index 8691eb2..fb8e7df 100644
--- a/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerBiomeVariation.java
+++ b/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerBiomeVariation.java
@@ -2,13 +2,13 @@
 
 import cn.nukkit.level.biome.Biome;
 import cn.nukkit.level.biome.EnumBiome;
-import com.google.common.collect.Maps;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
 public class MapLayerBiomeVariation extends MapLayer {
 
     private static final int[] ISLANDS = new int[]{EnumBiome.PLAINS.id, EnumBiome.FOREST.id};
-    private static final Map<Integer, int[]> VARIATIONS = Maps.newHashMap();
+    private static final Int2ObjectMap<int[]> VARIATIONS = new Int2ObjectOpenHashMap<>();
 
     static {
         VARIATIONS.put(EnumBiome.DESERT.id, new int[]{EnumBiome.DESERT_HILLS.id});
diff --git a/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerRarePlains.java b/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerRarePlains.java
index 9141145..7a3da0b 100644
--- a/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerRarePlains.java
+++ b/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerRarePlains.java
@@ -1,12 +1,12 @@
 package cn.wode490390.nukkit.vanillagenerator.biomegrid;
 
 import cn.nukkit.level.biome.EnumBiome;
-import com.google.common.collect.Maps;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.Int2IntMap;
+import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
 
 public class MapLayerRarePlains extends MapLayer {
 
-    private static final Map<Integer, Integer> RARE_PLAINS = Maps.newHashMap();
+    private static final Int2IntMap RARE_PLAINS = new Int2IntOpenHashMap();
 
     static {
         RARE_PLAINS.put(EnumBiome.PLAINS.id, EnumBiome.SUNFLOWER_PLAINS.id);
diff --git a/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerRiver.java b/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerRiver.java
index c0b6255..62b4a57 100644
--- a/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerRiver.java
+++ b/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerRiver.java
@@ -1,15 +1,15 @@
 package cn.wode490390.nukkit.vanillagenerator.biomegrid;
 
 import cn.nukkit.level.biome.EnumBiome;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import java.util.Map;
-import java.util.Set;
+import it.unimi.dsi.fastutil.ints.Int2IntMap;
+import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import it.unimi.dsi.fastutil.ints.IntSet;
 
 public class MapLayerRiver extends MapLayer {
 
-    private static final Set<Integer> OCEANS = Sets.newHashSet();
-    private static final Map<Integer, Integer> SPECIAL_RIVERS = Maps.newHashMap();
+    private static final IntSet OCEANS = new IntOpenHashSet();
+    private static final Int2IntMap SPECIAL_RIVERS = new Int2IntOpenHashMap();
     private static final int CLEAR_VALUE = 0;
     private static final int RIVER_VALUE = 1;
 
diff --git a/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerShore.java b/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerShore.java
index 7e472b0..89e4ec9 100644
--- a/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerShore.java
+++ b/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerShore.java
@@ -1,15 +1,15 @@
 package cn.wode490390.nukkit.vanillagenerator.biomegrid;
 
 import cn.nukkit.level.biome.EnumBiome;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import java.util.Map;
-import java.util.Set;
+import it.unimi.dsi.fastutil.ints.Int2IntMap;
+import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import it.unimi.dsi.fastutil.ints.IntSet;
 
 public class MapLayerShore extends MapLayer {
 
-    private static final Set<Integer> OCEANS = Sets.newHashSet();
-    private static final Map<Integer, Integer> SPECIAL_SHORES = Maps.newHashMap();
+    private static final IntSet OCEANS = new IntOpenHashSet();
+    private static final Int2IntMap SPECIAL_SHORES = new Int2IntOpenHashMap();
 
     static {
         OCEANS.add(EnumBiome.OCEAN.id);
diff --git a/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerWhittaker.java b/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerWhittaker.java
index f3e2434..a5b30e6 100644
--- a/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerWhittaker.java
+++ b/src/main/java/cn/wode490390/nukkit/vanillagenerator/biomegrid/MapLayerWhittaker.java
@@ -1,6 +1,7 @@
 package cn.wode490390.nukkit.vanillagenerator.biomegrid;
 
 import com.google.common.collect.Maps;
+
 import java.util.Map;
 
 public class MapLayerWhittaker extends MapLayer {
diff --git a/src/main/java/cn/wode490390/nukkit/vanillagenerator/noise/PerlinOctaveGenerator.java b/src/main/java/cn/wode490390/nukkit/vanillagenerator/noise/PerlinOctaveGenerator.java
index 01c4d7a..0233476 100644
--- a/src/main/java/cn/wode490390/nukkit/vanillagenerator/noise/PerlinOctaveGenerator.java
+++ b/src/main/java/cn/wode490390/nukkit/vanillagenerator/noise/PerlinOctaveGenerator.java
@@ -4,6 +4,8 @@
 import cn.wode490390.nukkit.vanillagenerator.noise.bukkit.NoiseGenerator;
 import cn.wode490390.nukkit.vanillagenerator.noise.bukkit.OctaveGenerator;
 
+import java.util.Arrays;
+
 public class PerlinOctaveGenerator extends OctaveGenerator {
 
     protected final int sizeX;
@@ -78,9 +80,7 @@ public double[] getFractalBrownianMotion(double x, double z, double lacunarity,
      * @return The noise array
      */
     public double[] getFractalBrownianMotion(double x, double y, double z, double lacunarity, double persistence) {
-        for (int i = 0; i < noise.length; i++) {
-            noise[i] = 0;
-        }
+        Arrays.fill(noise, 0);
 
         double freq = 1;
         double amp = 1;
diff --git a/src/main/java/cn/wode490390/nukkit/vanillagenerator/noise/SimplexOctaveGenerator.java b/src/main/java/cn/wode490390/nukkit/vanillagenerator/noise/SimplexOctaveGenerator.java
index 48a9bba..8111591 100644
--- a/src/main/java/cn/wode490390/nukkit/vanillagenerator/noise/SimplexOctaveGenerator.java
+++ b/src/main/java/cn/wode490390/nukkit/vanillagenerator/noise/SimplexOctaveGenerator.java
@@ -3,6 +3,8 @@
 import cn.nukkit.math.NukkitRandom;
 import cn.wode490390.nukkit.vanillagenerator.noise.bukkit.NoiseGenerator;
 
+import java.util.Arrays;
+
 public class SimplexOctaveGenerator extends PerlinOctaveGenerator {
 
     public SimplexOctaveGenerator(NukkitRandom rand, int octaves, int sizeX, int sizeZ) {
@@ -29,9 +31,7 @@ protected static NoiseGenerator[] createOctaves(NukkitRandom rand, int octaves)
 
     @Override
     public double[] getFractalBrownianMotion(double x, double y, double z, double lacunarity, double persistence) {
-        for (int i = 0; i < noise.length; i++) {
-            noise[i] = 0;
-        }
+        Arrays.fill(noise, 0);
 
         double freq = 1;
         double amp = 1;
diff --git a/src/main/java/cn/wode490390/nukkit/vanillagenerator/object/OreType.java b/src/main/java/cn/wode490390/nukkit/vanillagenerator/object/OreType.java
new file mode 100644
index 0000000..2baa80b
--- /dev/null
+++ b/src/main/java/cn/wode490390/nukkit/vanillagenerator/object/OreType.java
@@ -0,0 +1,79 @@
+package cn.wode490390.nukkit.vanillagenerator.object;
+
+import cn.nukkit.block.Block;
+import cn.nukkit.level.ChunkManager;
+import cn.nukkit.math.MathHelper;
+import cn.nukkit.math.NukkitRandom;
+
+public class OreType {
+
+    public final int fullId;
+    public final int clusterCount;
+    public final int clusterSize;
+    public final int maxHeight;
+    public final int minHeight;
+    public final int replaceBlockId;
+
+    public OreType(Block material, int clusterCount, int clusterSize, int minHeight, int maxHeight) {
+        this(material, clusterCount, clusterSize, minHeight, maxHeight, Block.STONE);
+    }
+
+    public OreType(Block material, int clusterCount, int clusterSize, int minHeight, int maxHeight, int replaceBlockId) {
+        this.fullId = material.getFullId();
+        this.clusterCount = clusterCount;
+        this.clusterSize = clusterSize;
+        this.maxHeight = maxHeight;
+        this.minHeight = minHeight;
+        this.replaceBlockId = replaceBlockId;
+    }
+
+    public boolean spawn(ChunkManager level, NukkitRandom rand, int replaceId, int x, int y, int z) {
+        float piScaled = rand.nextFloat() * (float) Math.PI;
+        double scaleMaxX = (float) (x + 8) + MathHelper.sin(piScaled) * (float) clusterSize / 8.0F;
+        double scaleMinX = (float) (x + 8) - MathHelper.sin(piScaled) * (float) clusterSize / 8.0F;
+        double scaleMaxZ = (float) (z + 8) + MathHelper.cos(piScaled) * (float) clusterSize / 8.0F;
+        double scaleMinZ = (float) (z + 8) - MathHelper.cos(piScaled) * (float) clusterSize / 8.0F;
+        double scaleMaxY = y + rand.nextBoundedInt(3) - 2;
+        double scaleMinY = y + rand.nextBoundedInt(3) - 2;
+
+        for (int i = 0; i < clusterSize; ++i) {
+            float sizeIncr = (float) i / (float) clusterSize;
+            double scaleX = scaleMaxX + (scaleMinX - scaleMaxX) * (double) sizeIncr;
+            double scaleY = scaleMaxY + (scaleMinY - scaleMaxY) * (double) sizeIncr;
+            double scaleZ = scaleMaxZ + (scaleMinZ - scaleMaxZ) * (double) sizeIncr;
+            double randSizeOffset = rand.nextDouble() * (double) clusterSize / 16.0D;
+            double randVec1 = (double) (MathHelper.sin((float) Math.PI * sizeIncr) + 1.0F) * randSizeOffset + 1.0D;
+            double randVec2 = (double) (MathHelper.sin((float) Math.PI * sizeIncr) + 1.0F) * randSizeOffset + 1.0D;
+            int minX = MathHelper.floor(scaleX - randVec1 / 2.0D);
+            int minY = MathHelper.floor(scaleY - randVec2 / 2.0D);
+            int minZ = MathHelper.floor(scaleZ - randVec1 / 2.0D);
+            int maxX = MathHelper.floor(scaleX + randVec1 / 2.0D);
+            int maxY = MathHelper.floor(scaleY + randVec2 / 2.0D);
+            int maxZ = MathHelper.floor(scaleZ + randVec1 / 2.0D);
+
+            for (int xSeg = minX; xSeg <= maxX; ++xSeg) {
+                double xVal = ((double) xSeg + 0.5D - scaleX) / (randVec1 / 2.0D);
+
+                if (xVal * xVal < 1.0D) {
+                    for (int ySeg = minY; ySeg <= maxY; ++ySeg) {
+                        double yVal = ((double) ySeg + 0.5D - scaleY) / (randVec2 / 2.0D);
+
+                        if (xVal * xVal + yVal * yVal < 1.0D) {
+                            for (int zSeg = minZ; zSeg <= maxZ; ++zSeg) {
+                                double zVal = ((double) zSeg + 0.5D - scaleZ) / (randVec1 / 2.0D);
+
+                                if (xVal * xVal + yVal * yVal + zVal * zVal < 1.0D) {
+                                    if (level.getBlockIdAt(xSeg, ySeg, zSeg) == replaceBlockId) {
+                                        level.setBlockFullIdAt(xSeg, ySeg, zSeg, fullId);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/src/main/java/cn/wode490390/nukkit/vanillagenerator/populator/PopulatorOre.java b/src/main/java/cn/wode490390/nukkit/vanillagenerator/populator/PopulatorOre.java
new file mode 100644
index 0000000..26cb4f4
--- /dev/null
+++ b/src/main/java/cn/wode490390/nukkit/vanillagenerator/populator/PopulatorOre.java
@@ -0,0 +1,38 @@
+package cn.wode490390.nukkit.vanillagenerator.populator;
+
+import cn.nukkit.level.ChunkManager;
+import cn.nukkit.level.format.FullChunk;
+import cn.nukkit.level.generator.populator.type.Populator;
+import cn.nukkit.math.NukkitMath;
+import cn.nukkit.math.NukkitRandom;
+import cn.wode490390.nukkit.vanillagenerator.object.OreType;
+
+public class PopulatorOre extends Populator {
+
+    private final int replaceId;
+    private final OreType[] oreTypes;
+
+    public PopulatorOre(int replaceId, OreType[] oreTypes) {
+        this.replaceId = replaceId;
+        this.oreTypes = oreTypes;
+    }
+
+    @Override
+    public void populate(ChunkManager level, int chunkX, int chunkZ, NukkitRandom random, FullChunk chunk) {
+        int sx = chunkX << 4;
+        int ex = sx + 15;
+        int sz = chunkZ << 4;
+        int ez = sz + 15;
+        for (OreType type : this.oreTypes) {
+            for (int i = 0; i < type.clusterCount; i++) {
+                int x = NukkitMath.randomRange(random, sx, ex);
+                int z = NukkitMath.randomRange(random, sz, ez);
+                int y = NukkitMath.randomRange(random, type.minHeight, type.maxHeight);
+                if (level.getBlockIdAt(x, y, z) != replaceId) {
+                    continue;
+                }
+                type.spawn(level, random, replaceId, x, y, z);
+            }
+        }
+    }
+}
diff --git a/src/main/java/cn/wode490390/nukkit/vanillagenerator/populator/nether/PopulatorGlowstone.java b/src/main/java/cn/wode490390/nukkit/vanillagenerator/populator/nether/PopulatorGlowstone.java
index 591032b..d90b080 100644
--- a/src/main/java/cn/wode490390/nukkit/vanillagenerator/populator/nether/PopulatorGlowstone.java
+++ b/src/main/java/cn/wode490390/nukkit/vanillagenerator/populator/nether/PopulatorGlowstone.java
@@ -7,7 +7,7 @@
 
 public class PopulatorGlowstone extends PopulatorBlock {
 
-    private boolean variableAmount;
+    private final boolean variableAmount;
     
     public PopulatorGlowstone() {
         this(false);
diff --git a/src/main/java/cn/wode490390/nukkit/vanillagenerator/populator/nether/PopulatorLava.java b/src/main/java/cn/wode490390/nukkit/vanillagenerator/populator/nether/PopulatorLava.java
index 2c22c17..86e5ca6 100644
--- a/src/main/java/cn/wode490390/nukkit/vanillagenerator/populator/nether/PopulatorLava.java
+++ b/src/main/java/cn/wode490390/nukkit/vanillagenerator/populator/nether/PopulatorLava.java
@@ -11,7 +11,7 @@ public class PopulatorLava extends PopulatorBlock {
     private ChunkManager level;
     private NukkitRandom random;
 
-    private boolean flowing;
+    private final boolean flowing;
     
     public PopulatorLava() {
         this(false);
diff --git a/src/main/java/cn/wode490390/nukkit/vanillagenerator/populator/overworld/PopulatorCaves.java b/src/main/java/cn/wode490390/nukkit/vanillagenerator/populator/overworld/PopulatorCaves.java
index 4aae3ba..47e381d 100644
--- a/src/main/java/cn/wode490390/nukkit/vanillagenerator/populator/overworld/PopulatorCaves.java
+++ b/src/main/java/cn/wode490390/nukkit/vanillagenerator/populator/overworld/PopulatorCaves.java
@@ -8,6 +8,7 @@
 import cn.nukkit.level.generator.populator.type.Populator;
 import cn.nukkit.math.MathHelper;
 import cn.nukkit.math.NukkitRandom;
+
 import java.util.Random;
 
 public class PopulatorCaves extends Populator {
diff --git a/src/main/java/cn/wode490390/nukkit/vanillagenerator/scheduler/CLNoiseReleaseTask.java b/src/main/java/cn/wode490390/nukkit/vanillagenerator/scheduler/CLNoiseReleaseTask.java
index 333e9c5..5bc34a1 100644
--- a/src/main/java/cn/wode490390/nukkit/vanillagenerator/scheduler/CLNoiseReleaseTask.java
+++ b/src/main/java/cn/wode490390/nukkit/vanillagenerator/scheduler/CLNoiseReleaseTask.java
@@ -7,7 +7,7 @@
 
 public class CLNoiseReleaseTask extends AsyncTask {
 
-    private CLBuffer<FloatBuffer> noise;
+    private final CLBuffer<FloatBuffer> noise;
 
     public CLNoiseReleaseTask(CLBuffer<FloatBuffer> noise) {
         this.noise = noise;