1.0.1

Author: wode490390

pom.xml

@@ -7,7 +7,7 @@
     <groupId>cn.wode490390.nukkit</groupId>
     <artifactId>vipop</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <name>Classic Village Populator</name>
     <description>This is a plugin that implements the old village feature for Nukkit servers</description>
     <url>http://wode490390.cn/</url>

src/main/java/cn/wode490390/nukkit/vipop/ClassicVillagePlugin.java

@@ -7,6 +7,7 @@
 import cn.nukkit.event.level.LevelUnloadEvent;
 import cn.nukkit.level.Level;
 import cn.nukkit.level.generator.Generator;
+import cn.nukkit.level.generator.Normal;
 import cn.nukkit.level.generator.populator.type.Populator;
 import cn.nukkit.plugin.PluginBase;
 import cn.wode490390.nukkit.vipop.populator.PopulatorVillage;
@@ -52,7 +53,7 @@ public void onLevelLoad(LevelLoadEvent event) {
         Level level = event.getLevel();
         Generator generator = level.getGenerator();
         if (generator.getId() != Generator.TYPE_FLAT && generator.getDimension() == Level.DIMENSION_OVERWORLD) {
-            populators.add(new PopulatorVillage());
+            populators.add(new PopulatorVillage(generator.getClass() == Normal.class));
         }
         this.populators.put(level, populators);
     }

src/main/java/cn/wode490390/nukkit/vipop/populator/PopulatorVillage.java

@@ -22,6 +22,12 @@ public class PopulatorVillage extends Populator {
     protected static final int SPACING = 32;
     protected static final int SEPARATION = 8;
 
+    protected final boolean isNukkitGenerator;
+
+    public PopulatorVillage(boolean isNukkitGenerator) {
+        this.isNukkitGenerator = isNukkitGenerator;
+    }
+
     @Override
     public void populate(ChunkManager level, int chunkX, int chunkZ, NukkitRandom random, FullChunk chunk) {
         //\\ VillageFeature::isFeatureChunk(BiomeSource const &,Random &,ChunkPos const &,uint)
@@ -35,7 +41,7 @@ public void populate(ChunkManager level, int chunkX, int chunkZ, NukkitRandom ra
 
             if (chunkX == cX * SPACING + random.nextBoundedInt(SPACING - SEPARATION) && chunkZ ==  cZ * SPACING + random.nextBoundedInt(SPACING - SEPARATION)) {
                 //\\ VillageFeature::createStructureStart(Dimension &,Random &,ChunkPos const &)
-                VillageStart start = new VillageStart(level, chunkX, chunkZ);
+                VillageStart start = new VillageStart(level, chunkX, chunkZ, this.isNukkitGenerator);
                 start.generatePieces(level, chunkX, chunkZ);
 
                 if (start.isValid()) { //TODO: serialize nbt
@@ -91,14 +97,16 @@ public static Type byId(int id) {
     public static class VillageStart extends StructureStart {
 
         private boolean valid;
+        private final boolean isNukkitGenerator;
 
-        public VillageStart(ChunkManager level, int chunkX, int chunkZ) {
+        public VillageStart(ChunkManager level, int chunkX, int chunkZ, boolean isNukkitGenerator) {
             super(level, chunkX, chunkZ);
+            this.isNukkitGenerator = isNukkitGenerator;
         }
 
         @Override
         public void generatePieces(ChunkManager level, int chunkX, int chunkZ) {
-            VillagePieces.StartPiece start = new VillagePieces.StartPiece(level, 0, this.random, (chunkX << 4) + 2, (chunkZ << 4) + 2, VillagePieces.getStructureVillageWeightedPieceList(this.random, SIZE), SIZE);
+            VillagePieces.StartPiece start = new VillagePieces.StartPiece(level, 0, this.random, (chunkX << 4) + 2, (chunkZ << 4) + 2, VillagePieces.getStructureVillageWeightedPieceList(this.random, SIZE), SIZE, isNukkitGenerator);
             this.pieces.add(start);
             start.addChildren(start, this.pieces, this.random);
 

src/main/java/cn/wode490390/nukkit/vipop/structure/VillagePieces.java

@@ -233,12 +233,15 @@ abstract static class VillagePiece extends StructurePiece {
         protected PopulatorVillage.Type type;
         protected boolean isZombieVillage;
 
+        protected int yOffset;
+
         protected VillagePiece(StartPiece start, int genDepth) {
             super(genDepth);
 
             if (start != null) {
                 this.type = start.type;
                 this.isZombieVillage = start.isZombieVillage;
+                this.yOffset = start.yOffset;
             } else {
                 this.type = PopulatorVillage.Type.PLAINS;
             }
@@ -307,21 +310,21 @@ protected int getAverageGroundHeight(ChunkManager level, BoundingBox boundingBox
 
             for (int x = this.boundingBox.x0; x <= this.boundingBox.x1; ++x) {
                 for (int z = this.boundingBox.z0; z <= this.boundingBox.z1; ++z) {
-                    vec.setComponents(x, 64, z);
+                    vec.setComponents(x, 64 + this.yOffset, z);
 
                     if (boundingBox.isInside(vec)) {
                         BaseFullChunk chunk = level.getChunk(x >> 4, z >> 4);
                         if (chunk == null) {
-                            sum += 63 + 1 - 1;
+                            sum += 63 + 1 - 1 + this.yOffset;
                         } else {
                             int cx = x & 0xf;
                             int cz = z & 0xf;
                             int y = chunk.getHighestBlockAt(cx, cz);
                             int id = chunk.getBlockId(cx, y, cz);
-                            while (Block.transparent[id] && y > 63 + 1 - 1) {
+                            while (Block.transparent[id] && y > 63 + 1 - 1 + this.yOffset) {
                                 id = chunk.getBlockId(cx, --y, cz);
                             }
-                            sum += Math.max(y, 63 + 1 - 1);
+                            sum += Math.max(y, 63 + 1 - 1 + this.yOffset);
                         }
                         ++count;
                     }
@@ -508,7 +511,7 @@ public static class StartPiece extends Well {
         public List<StructurePiece> pendingRoads = Lists.newArrayList();
 
         //\\ VillageStart::VillageStart(BiomeSource *,Random &,int,int,int)
-        public StartPiece(ChunkManager level, int genDepth, NukkitRandom random, int x, int z, List<PieceWeight> availablePieces, int size) {
+        public StartPiece(ChunkManager level, int genDepth, NukkitRandom random, int x, int z, List<PieceWeight> availablePieces, int size, boolean isNukkitGenerator) {
             super(null, 0, random, x, z);
             this.world = level;
             this.availablePieces = availablePieces;
@@ -533,6 +536,8 @@ public StartPiece(ChunkManager level, int genDepth, NukkitRandom random, int x,
             }
 
             this.isZombieVillage = random.nextBoundedInt(50) == 0;
+
+            this.yOffset = isNukkitGenerator ? 2 : 0;
         }
 
         public StartPiece(CompoundTag tag) {
@@ -1913,28 +1918,28 @@ public boolean postProcess(ChunkManager level, NukkitRandom random, BoundingBox
 
             for (int x = this.boundingBox.x0; x <= this.boundingBox.x1; ++x) {
                 for (int z = this.boundingBox.z0; z <= this.boundingBox.z1; ++z) {
-                    BlockVector3 vec = new BlockVector3(x, 64, z);
+                    BlockVector3 vec = new BlockVector3(x, 64 + this.yOffset, z);
 
                     if (boundingBox.isInside(vec)) {
                         BaseFullChunk chunk = level.getChunk(chunkX, chunkZ);
                         if (chunk == null) {
-                            vec.y = 63 - 1;
+                            vec.y = 63 - 1 + this.yOffset;
                         } else {
                             int cx = x & 0xf;
                             int cz = z & 0xf;
                             int y = chunk.getHighestBlockAt(cx, cz);
                             int id = chunk.getBlockId(cx, y, cz);
-                            while (Block.transparent[id] && y > 63 - 1) {
+                            while (Block.transparent[id] && y > 63 - 1 + this.yOffset) {
                                 id = chunk.getBlockId(cx, --y, cz);
                             }
                             vec.y = y;
                         }
 
-                        if (vec.y < 63) {
-                            vec.y = 63 - 1;
+                        if (vec.y < 63 + this.yOffset) {
+                            vec.y = 63 - 1 + this.yOffset;
                         }
 
-                        while (vec.y >= 63 - 1) {
+                        while (vec.y >= 63 - 1 + this.yOffset) {
                             int block = level.getBlockIdAt(vec.x, vec.y, vec.z);
 
                             if (block == Block.GRASS && level.getBlockIdAt(vec.x, vec.y + 1, vec.z) == Block.AIR) {