NukkitX standard generator

.gitignore

@@ -230,3 +230,4 @@ resource_packs
 resource_packs/*
 creativeitems.json
 recipes.json
+/run/

pom.xml

@@ -254,6 +254,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>net.daporkchop.lib</groupId>
+            <artifactId>noise</artifactId>
+            <version>0.5.4-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>net.sf.jopt-simple</groupId>
             <artifactId>jopt-simple</artifactId>

src/main/java/cn/nukkit/Server.java

@@ -13,7 +13,6 @@
 import cn.nukkit.item.Item;
 import cn.nukkit.item.enchantment.Enchantment;
 import cn.nukkit.level.*;
-import cn.nukkit.level.biome.EnumBiome;
 import cn.nukkit.level.storage.StorageIds;
 import cn.nukkit.locale.LocaleManager;
 import cn.nukkit.locale.TextContainer;
@@ -81,6 +80,7 @@
 import java.nio.file.Paths;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -197,6 +197,7 @@ public class Server {
     private final BlockEntityRegistry blockEntityRegistry = BlockEntityRegistry.get();
     private final ItemRegistry itemRegistry = ItemRegistry.get();
     private final EntityRegistry entityRegistry = EntityRegistry.get();
+    private final BiomeRegistry biomeRegistry = BiomeRegistry.get();
 
     private final Map<InetSocketAddress, Player> players = new HashMap<>();
 
@@ -520,6 +521,7 @@ public void boot() throws IOException {
             this.blockRegistry.close();
             this.itemRegistry.close();
             this.entityRegistry.close();
+            this.biomeRegistry.close();
             this.gameRuleRegistry.close();
             this.generatorRegistry.close();
             this.storageRegistry.close();
@@ -1893,7 +1895,6 @@ private void loadPacks() {
 
     private void registerVanillaComponents() {
         Enchantment.init();
-        EnumBiome.values(); //load class, this also registers biomes
         Item.initCreativeItems();
         Effect.init();
         Potion.init();
@@ -1929,7 +1930,8 @@ private void loadLevels() {
             Identifier generator = Identifier.fromString(this.getConfig("worlds." + name + ".generator"));
             String options = this.getConfig("worlds." + name + ".options", "");
 
-            levelFutures.add(this.loadLevel().id(name).seed(seed)
+            levelFutures.add(this.loadLevel().id(name)
+                    .seed(seed)
                     .generator(generator == null ? this.generatorRegistry.getFallback() : generator)
                     .generatorOptions(options)
                     .load());
@@ -1994,6 +1996,10 @@ public ItemRegistry getItemRegistry() {
         return itemRegistry;
     }
 
+    public GeneratorRegistry getGeneratorRegistry() {
+        return this.generatorRegistry;
+    }
+
     public int getBaseTickRate() {
         return baseTickRate;
     }

src/main/java/cn/nukkit/block/BlockCocoa.java

@@ -18,19 +18,49 @@
 
 import java.util.concurrent.ThreadLocalRandom;
 
-import static cn.nukkit.block.BlockIds.LOG;
-import static cn.nukkit.item.ItemIds.DYE;
+import static cn.nukkit.block.BlockIds.*;
+import static cn.nukkit.item.ItemIds.*;
 
 /**
  * Created by CreeperFace on 27. 10. 2016.
  */
 public class BlockCocoa extends BlockTransparent implements Faceable {
-
-    protected static final AxisAlignedBB[] EAST = new SimpleAxisAlignedBB[]{new SimpleAxisAlignedBB(0.6875f, 0.4375f, 0.375f, 0.9375f, 0.75f, 0.625f), new SimpleAxisAlignedBB(0.5625f, 0.3125f, 0.3125f, 0.9375f, 0.75f, 0.6875f), new SimpleAxisAlignedBB(0.5625f, 0.3125f, 0.3125f, 0.9375f, 0.75f, 0.6875f)};
-    protected static final AxisAlignedBB[] WEST = new SimpleAxisAlignedBB[]{new SimpleAxisAlignedBB(0.0625f, 0.4375f, 0.375f, 0.3125f, 0.75f, 0.625f), new SimpleAxisAlignedBB(0.0625f, 0.3125f, 0.3125f, 0.4375f, 0.75f, 0.6875f), new SimpleAxisAlignedBB(0.0625f, 0.3125f, 0.3125f, 0.4375f, 0.75f, 0.6875f)};
-    protected static final AxisAlignedBB[] NORTH = new SimpleAxisAlignedBB[]{new SimpleAxisAlignedBB(0.375f, 0.4375f, 0.0625f, 0.625f, 0.75f, 0.3125f), new SimpleAxisAlignedBB(0.3125f, 0.3125f, 0.0625f, 0.6875f, 0.75f, 0.4375f), new SimpleAxisAlignedBB(0.3125f, 0.3125f, 0.0625f, 0.6875f, 0.75f, 0.4375f)};
-    protected static final AxisAlignedBB[] SOUTH = new SimpleAxisAlignedBB[]{new SimpleAxisAlignedBB(0.375f, 0.4375f, 0.6875f, 0.625f, 0.75f, 0.9375f), new SimpleAxisAlignedBB(0.3125f, 0.3125f, 0.5625f, 0.6875f, 0.75f, 0.9375f), new SimpleAxisAlignedBB(0.3125f, 0.3125f, 0.5625f, 0.6875f, 0.75f, 0.9375f)};
-    protected static final AxisAlignedBB[] ALL = new AxisAlignedBB[12];
+    protected static final AxisAlignedBB[] BB_NORTH = {
+            new SimpleAxisAlignedBB(0.375f, 0.4375f, 0.0625f, 0.625f, 0.75f, 0.3125f),
+            new SimpleAxisAlignedBB(0.3125f, 0.3125f, 0.0625f, 0.6875f, 0.75f, 0.4375f),
+            new SimpleAxisAlignedBB(0.3125f, 0.3125f, 0.0625f, 0.6875f, 0.75f, 0.4375f)
+    };
+    protected static final AxisAlignedBB[] BB_EAST  = {
+            new SimpleAxisAlignedBB(0.6875f, 0.4375f, 0.375f, 0.9375f, 0.75f, 0.625f),
+            new SimpleAxisAlignedBB(0.5625f, 0.3125f, 0.3125f, 0.9375f, 0.75f, 0.6875f),
+            new SimpleAxisAlignedBB(0.5625f, 0.3125f, 0.3125f, 0.9375f, 0.75f, 0.6875f)
+    };
+    protected static final AxisAlignedBB[] BB_SOUTH = {
+            new SimpleAxisAlignedBB(0.375f, 0.4375f, 0.6875f, 0.625f, 0.75f, 0.9375f),
+            new SimpleAxisAlignedBB(0.3125f, 0.3125f, 0.5625f, 0.6875f, 0.75f, 0.9375f),
+            new SimpleAxisAlignedBB(0.3125f, 0.3125f, 0.5625f, 0.6875f, 0.75f, 0.9375f)
+    };
+    protected static final AxisAlignedBB[] BB_WEST  = {
+            new SimpleAxisAlignedBB(0.0625f, 0.4375f, 0.375f, 0.3125f, 0.75f, 0.625f),
+            new SimpleAxisAlignedBB(0.0625f, 0.3125f, 0.3125f, 0.4375f, 0.75f, 0.6875f),
+            new SimpleAxisAlignedBB(0.0625f, 0.3125f, 0.3125f, 0.4375f, 0.75f, 0.6875f)
+    };
+    protected static final AxisAlignedBB[] BB_ALL   = {
+            BB_NORTH[0], BB_EAST[0], BB_SOUTH[0], BB_WEST[0],
+            BB_NORTH[1], BB_EAST[1], BB_SOUTH[1], BB_WEST[1],
+            BB_NORTH[2], BB_EAST[2], BB_SOUTH[2], BB_WEST[2],
+    };
+
+    public static final int NORTH    = 0;
+    public static final int EAST     = 1;
+    public static final int SOUTH    = 2;
+    public static final int WEST     = 3;
+    public static final int DIR_MASK = 3;
+
+    public static final int STAGE_1    = 0;
+    public static final int STAGE_2    = 1;
+    public static final int STAGE_3    = 2;
+    public static final int STAGE_MASK = 12;
 
     public BlockCocoa(Identifier id) {
         super(id);
@@ -77,38 +107,8 @@ private AxisAlignedBB getRelativeBoundingBox() {
         if (meta > 11) {
             this.setMeta(meta = 11);
         }
-        AxisAlignedBB boundingBox = ALL[meta];
-        if (boundingBox != null) return boundingBox;
-
-        AxisAlignedBB[] bbs;
-
-        switch (getMeta()) {
-            case 0:
-            case 4:
-            case 8:
-                bbs = NORTH;
-                break;
-            case 1:
-            case 5:
-            case 9:
-                bbs = EAST;
-                break;
-            case 2:
-            case 6:
-            case 10:
-                bbs = SOUTH;
-                break;
-            case 3:
-            case 7:
-            case 11:
-                bbs = WEST;
-                break;
-            default:
-                bbs = NORTH;
-                break;
-        }
 
-        return ALL[meta] = bbs[this.getMeta() >> 2];
+        return BB_ALL[meta];
     }
 
     @Override

src/main/java/cn/nukkit/block/BlockGrass.java

@@ -4,14 +4,15 @@
 import cn.nukkit.event.block.BlockSpreadEvent;
 import cn.nukkit.item.Item;
 import cn.nukkit.level.Level;
-import cn.nukkit.level.generator.object.ObjectTallGrass;
 import cn.nukkit.level.particle.BoneMealParticle;
-import cn.nukkit.math.BedrockRandom;
-import cn.nukkit.math.NukkitRandom;
 import cn.nukkit.player.Player;
 import cn.nukkit.utils.BlockColor;
 import cn.nukkit.utils.Identifier;
 import com.nukkitx.math.vector.Vector3i;
+import net.daporkchop.lib.random.PRandom;
+import net.daporkchop.lib.random.impl.FastPRandom;
+
+import java.util.concurrent.ThreadLocalRandom;
 
 import static cn.nukkit.block.BlockIds.*;
 import static cn.nukkit.item.ItemIds.DYE;
@@ -43,7 +44,23 @@ public boolean onActivate(Item item, Player player) {
                 item.decrementCount();
             }
             this.level.addParticle(new BoneMealParticle(this.getPosition()));
-            ObjectTallGrass.growGrass(this.getLevel(), this.getPosition(), new BedrockRandom());
+
+            PRandom random = new FastPRandom();
+
+            for (int i = 0; i < 64; i++) {
+                int blockY = this.getY() + random.nextInt(4) - random.nextInt(4);
+                if (blockY < 0 || blockY >= 255) {
+                    continue;
+                }
+                int blockX = this.getX() + random.nextInt(8) - random.nextInt(8);
+                int blockZ = this.getZ() + random.nextInt(8) - random.nextInt(8);
+
+                Block tallGrass = Block.get(BlockIds.TALL_GRASS, 0, blockX, blockY + 1, blockZ, this.level);
+                Block toReplace = this.level.getBlock(blockX, blockY + 1, blockZ);
+                if (toReplace.getId() == BlockIds.AIR)  {
+                    tallGrass.place(null, toReplace, null, null, null, null);
+                }
+            }
             return true;
         } else if (item.isHoe()) {
             item.useOn(this);
@@ -61,11 +78,10 @@ public boolean onActivate(Item item, Player player) {
     @Override
     public int onUpdate(int type) {
         if (type == Level.BLOCK_UPDATE_RANDOM) {
-            NukkitRandom random = new NukkitRandom();
             Vector3i pos = this.getPosition();
-            int x = random.nextRange(pos.getX() - 1, pos.getX() + 1);
-            int y = random.nextRange(pos.getY() - 2, pos.getY() + 2);
-            int z = random.nextRange(pos.getZ() - 1, pos.getZ() + 1);
+            int x = ThreadLocalRandom.current().nextInt(pos.getX() - 1, pos.getX() + 1);
+            int y = ThreadLocalRandom.current().nextInt(pos.getY() - 2, pos.getY() + 2);
+            int z = ThreadLocalRandom.current().nextInt(pos.getZ() - 1, pos.getZ() + 1);
             Block block = this.getLevel().getBlock(x, y, z);
             if (block.getId() == DIRT && block.getMeta() == 0) {
                 if (block.up() instanceof BlockAir) {

src/main/java/cn/nukkit/block/BlockHugeMushroomBrown.java

@@ -2,16 +2,30 @@
 
 import cn.nukkit.item.Item;
 import cn.nukkit.item.ItemTool;
-import cn.nukkit.math.NukkitRandom;
 import cn.nukkit.utils.BlockColor;
 import cn.nukkit.utils.Identifier;
 
+import java.util.concurrent.ThreadLocalRandom;
+
 import static cn.nukkit.block.BlockIds.BROWN_MUSHROOM;
 
 /**
  * Created by Pub4Game on 28.01.2016.
  */
 public class BlockHugeMushroomBrown extends BlockSolid {
+    public static final int NONE = 0;
+    public static final int TOP_NW = 1;
+    public static final int TOP_N = 2;
+    public static final int TOP_NE = 3;
+    public static final int TOP_W = 4;
+    public static final int TOP = 5;
+    public static final int TOP_E = 6;
+    public static final int TOP_SW = 7;
+    public static final int TOP_S = 8;
+    public static final int TOP_SE = 9;
+    public static final int STEM = 10;
+    public static final int ALL = 14;
+    public static final int STEM_ALL = 15;
 
     public BlockHugeMushroomBrown(Identifier id) {
         super(id);
@@ -34,7 +48,7 @@ public float getResistance() {
 
     @Override
     public Item[] getDrops(Item item) {
-        if (new NukkitRandom().nextRange(1, 20) == 0) {
+        if (ThreadLocalRandom.current().nextInt(0, 20) == 0) {
             return new Item[]{
                     Item.get(BROWN_MUSHROOM)
             };

src/main/java/cn/nukkit/block/BlockHugeMushroomRed.java

@@ -2,16 +2,30 @@
 
 import cn.nukkit.item.Item;
 import cn.nukkit.item.ItemTool;
-import cn.nukkit.math.NukkitRandom;
 import cn.nukkit.utils.BlockColor;
 import cn.nukkit.utils.Identifier;
 
+import java.util.concurrent.ThreadLocalRandom;
+
 import static cn.nukkit.block.BlockIds.RED_MUSHROOM;
 
 /**
  * Created by Pub4Game on 28.01.2016.
  */
 public class BlockHugeMushroomRed extends BlockSolid {
+    public static final int NONE = 0;
+    public static final int TOP_NW = 1;
+    public static final int TOP_N = 2;
+    public static final int TOP_NE = 3;
+    public static final int TOP_W = 4;
+    public static final int TOP = 5;
+    public static final int TOP_E = 6;
+    public static final int TOP_SW = 7;
+    public static final int TOP_S = 8;
+    public static final int TOP_SE = 9;
+    public static final int STEM = 10;
+    public static final int ALL = 14;
+    public static final int STEM_ALL = 15;
 
     public BlockHugeMushroomRed(Identifier id) {
         super(id);
@@ -34,7 +48,7 @@ public float getResistance() {
 
     @Override
     public Item[] getDrops(Item item) {
-        if (new NukkitRandom().nextRange(1, 20) == 0) {
+        if (ThreadLocalRandom.current().nextInt(0, 20) == 0) {
             return new Item[]{
                     Item.get(RED_MUSHROOM)
             };

src/main/java/cn/nukkit/block/BlockIds.java

@@ -4,8 +4,7 @@
 import lombok.experimental.UtilityClass;
 
 @UtilityClass
-public final class BlockIds {
-
+public class BlockIds {
     public static final Identifier AIR = Identifier.fromString("air");
     public static final Identifier STONE = Identifier.fromString("stone");
     public static final Identifier GRASS = Identifier.fromString("grass");
@@ -42,7 +41,6 @@ public final class BlockIds {
     public static final Identifier PISTON = Identifier.fromString("piston");
     public static final Identifier PISTON_ARM_COLLISION = Identifier.fromString("pistonArmCollision");
     public static final Identifier WOOL = Identifier.fromString("wool");
-    //            public static final Identifier ELEMENT_0 = Identifier.fromString("element_0");
     public static final Identifier YELLOW_FLOWER = Identifier.fromString("yellow_flower");
     public static final Identifier RED_FLOWER = Identifier.fromString("red_flower");
     public static final Identifier BROWN_MUSHROOM = Identifier.fromString("brown_mushroom");
@@ -267,7 +265,8 @@ public final class BlockIds {
     public static final Identifier STRIPPED_DARK_OAK_LOG = Identifier.fromString("stripped_dark_oak_log");
     public static final Identifier STRIPPED_OAK_LOG = Identifier.fromString("stripped_oak_log");
     public static final Identifier BLUE_ICE = Identifier.fromString("blue_ice");
-    //            public static final Identifier ELEMENT_1 = Identifier.fromString("element_1");
+//            public static final Identifier ELEMENT_0 = Identifier.fromString("element_0");
+//            public static final Identifier ELEMENT_1 = Identifier.fromString("element_1");
 //            public static final Identifier ELEMENT_2 = Identifier.fromString("element_2");
 //            public static final Identifier ELEMENT_3 = Identifier.fromString("element_3");
 //            public static final Identifier ELEMENT_4 = Identifier.fromString("element_4");

src/main/java/cn/nukkit/block/BlockLog.java

@@ -14,11 +14,16 @@
  * Nukkit Project
  */
 public class BlockLog extends BlockSolid {
-    public static final int OAK = 0;
+    public static final int OAK    = 0;
     public static final int SPRUCE = 1;
-    public static final int BIRCH = 2;
+    public static final int BIRCH  = 2;
     public static final int JUNGLE = 3;
 
+    public static final int UP_DOWN     = 0 << 2;
+    public static final int EAST_WEST   = 1 << 2;
+    public static final int NORTH_SOUTH = 2 << 2;
+    public static final int ALL         = 3 << 2;
+
     protected static final Identifier[] STRIPPED_IDS = new Identifier[]{
             BlockIds.STRIPPED_OAK_LOG,
             BlockIds.STRIPPED_SPRUCE_LOG,
@@ -107,7 +112,7 @@ public int getToolType() {
 
     @Override
     public BlockColor getColor() {
-        switch (getMeta() & 0x07) {
+        switch (getMeta() & 0x03) {
             default:
             case OAK:
                 return BlockColor.WOOD_BLOCK_COLOR;