1.0.1

Author: wode490390

pom.xml

@@ -7,7 +7,7 @@
     <groupId>cn.wode490390.nukkit</groupId>
     <artifactId>singletspop</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <name>Single Template Structure Populator</name>
     <description>Single-template structure populator plugin for Nukkit</description>
     <url>http://wode490390.cn/</url>
@@ -54,7 +54,7 @@
     <repositories>
         <repository>
             <id>nukkitx-repo</id>
-            <url>http://repo.nukkitx.com/main/</url>
+            <url>https://repo.nukkitx.com/main/</url>
         </repository>
     </repositories>
 

src/main/java/cn/wode490390/nukkit/singletspop/populator/PopulatorFossil.java

@@ -36,7 +36,7 @@ public class PopulatorFossil extends Populator {
 
     @Override
     public void populate(ChunkManager level, int chunkX, int chunkZ, NukkitRandom random, FullChunk chunk) {
-        int biome = chunk.getBiomeId(0, 0);
+        int biome = chunk.getBiomeId(3, 3);
         if ((biome == EnumBiome.DESERT.id || biome == EnumBiome.DESERT_HILLS.id || biome == EnumBiome.DESERT_M.id
                 || biome == EnumBiome.SWAMP.id || biome == EnumBiome.SWAMPLAND_M.id)
                 && random.nextBoundedInt(64) == (0x1211dfa1 & 63)) { //salted

src/main/java/cn/wode490390/nukkit/singletspop/populator/PopulatorShipwreck.java

@@ -94,20 +94,17 @@ public class PopulatorShipwreck extends Populator implements CallbackableTemplat
 
     @Override
     public void populate(ChunkManager level, int chunkX, int chunkZ, NukkitRandom random, FullChunk chunk) {
-        int biome = chunk.getBiomeId(0, 0);
+        int biome = chunk.getBiomeId(5, 5);
         if ((biome == EnumBiome.OCEAN.id || biome == EnumBiome.DEEP_OCEAN.id || biome == EnumBiome.FROZEN_OCEAN.id
                 || biome == EnumBiome.BEACH.id || (biome >= 44 && biome <= 50))
                 && chunkX == (((chunkX < 0 ? (chunkX - SPACING + 1) : chunkX) / SPACING) * SPACING) + random.nextBoundedInt(SPACING - SEPARATION)
                 && chunkZ == (((chunkZ < 0 ? (chunkZ - SPACING + 1) : chunkZ) / SPACING) * SPACING) + random.nextBoundedInt(SPACING - SEPARATION)) {
             ReadableStructureTemplate template;
-            boolean isBeached;
 
             if (biome == EnumBiome.BEACH.id) {
                 template = STRUCTURE_LOCATION_BEACHED[random.nextBoundedInt(STRUCTURE_LOCATION_BEACHED.length)];
-                isBeached = true;
             } else {
                 template = STRUCTURE_LOCATION_OCEAN[random.nextBoundedInt(STRUCTURE_LOCATION_OCEAN.length)];
-                isBeached = false;
             }
 
             BlockVector3 size = template.getSize();
@@ -118,13 +115,9 @@ public void populate(ChunkManager level, int chunkX, int chunkZ, NukkitRandom ra
                 for (int z = 0; z < size.getZ() && z < 16; z++) {
                     int y = chunk.getHighestBlockAt(x, z);
 
-                    if (!isBeached) {
-                        y = Math.min(64, y);
-
-                        int id = chunk.getBlockId(x, y, z);
-                        while ((id == WATER || id == STILL_WATER) && y > 0) {
-                            id = level.getBlockIdAt(x, --y, z);
-                        }
+                    int id = chunk.getBlockId(x, y, z);
+                    while (FILTER[id] && y > 0) {
+                        id = chunk.getBlockId(x, --y, z);
                     }
 
                     sumY += y;
@@ -133,9 +126,6 @@ public void populate(ChunkManager level, int chunkX, int chunkZ, NukkitRandom ra
             }
 
             int y = sumY / blockCount;
-            if (!isBeached) {
-                y = Math.min(64, y);
-            }
 
             int seed = random.nextInt();
             boolean isLarge = false;
@@ -163,13 +153,11 @@ public void populate(ChunkManager level, int chunkX, int chunkZ, NukkitRandom ra
             }
 
             if (!chunks.isEmpty()) {
-                int definiteY = y;
-
                 this.waitingChunks.put(Level.chunkHash(chunkX, chunkZ), indexes);
                 for (BaseFullChunk ck : chunks) {
                     Server.getInstance().getScheduler().scheduleAsyncTask(null, new CallbackableChunkGenerationTask(
                             chunk.getProvider().getLevel(), ck, this,
-                            populator -> populator.generateChunkCallback(template, seed, level, chunkX, chunkZ, definiteY, ck.getX(), ck.getZ())));
+                            populator -> populator.generateChunkCallback(template, seed, level, chunkX, chunkZ, y, ck.getX(), ck.getZ())));
                 }
                 return;
             }
@@ -237,7 +225,36 @@ protected static Consumer<CompoundTag> getBlockActorProcessor(FullChunk chunk, N
         };
     }
 
+    public static final boolean[] FILTER = new boolean[256];
+
     public static void init() {
-        //NOOP
+        FILTER[AIR] = true;
+        FILTER[LOG] = true;
+        FILTER[WATER] = true;
+        FILTER[STILL_WATER] = true;
+        FILTER[LAVA] = true;
+        FILTER[STILL_LAVA] = true;
+        FILTER[LEAVES] = true;
+        FILTER[TALL_GRASS] = true;
+        FILTER[DEAD_BUSH] = true;
+        FILTER[DANDELION] = true;
+        FILTER[RED_FLOWER] = true;
+        FILTER[BROWN_MUSHROOM] = true;
+        FILTER[RED_MUSHROOM] = true;
+        FILTER[SNOW_LAYER] = true;
+        FILTER[ICE] = true;
+        FILTER[CACTUS] = true;
+        FILTER[REEDS] = true;
+        FILTER[PUMPKIN] = true;
+        FILTER[BROWN_MUSHROOM_BLOCK] = true;
+        FILTER[RED_MUSHROOM_BLOCK] = true;
+        FILTER[MELON_BLOCK] = true;
+        FILTER[VINE] = true;
+        FILTER[WATER_LILY] = true;
+        FILTER[COCOA] = true;
+        FILTER[LEAVES2] = true;
+        FILTER[LOG2] = true;
+        FILTER[PACKED_ICE] = true;
+        FILTER[DOUBLE_PLANT] = true;
     }
 }