💐 Flowers and foilage

Author: james090500

src/main/java/com/james090500/blocks/Blocks.java

@@ -1,55 +1,72 @@
 package com.james090500.blocks;
 
+import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap;
+
+import java.util.function.Function;
+
 public class Blocks {
 
-    public static Block[] ids;
-
-    public static final GrassBlock grassBlock = new GrassBlock((byte) 1);
-    public static final DirtBlock dirtBlock = new DirtBlock((byte) 2);
-    public static final StoneBlock stoneBlock = new StoneBlock((byte) 3);
-    public static final SandBlock sandBlock = new SandBlock((byte) 4);
-    public static final WaterBlock waterBlock = new WaterBlock((byte) 5);
-    public static final OakLeafBlock leafBlock = new OakLeafBlock((byte) 6);
-    public static final SpruceLeafBlock spruceLeafBlock = new SpruceLeafBlock((byte) 7);
-    public static final OakLogBlock logBlock = new OakLogBlock((byte) 8);
-    public static final SpruceLogBlock spruceLogBlock = new SpruceLogBlock((byte) 9);
-    public static final BirchLogBlock birchLogBlock = new BirchLogBlock((byte) 10);
-    public static final OakPlanksBlock oakPlanksBlock = new OakPlanksBlock((byte) 11);
-    public static final SprucePlanksBlock sprucePlanksBlock = new SprucePlanksBlock((byte) 12);
-    public static final BirchPlanksBlock birchPlanksBlock = new BirchPlanksBlock((byte) 13);
-    public static final GlassBlock glassBlock = new GlassBlock((byte) 14);
-    public static final SnowyGrassBlock snowyGrassBlock = new SnowyGrassBlock((byte) 15);
-    public static final CactusBlock cactusBlock = new CactusBlock((byte) 16);
-    public static final ShortGrassBlock shortGrassBlock = new ShortGrassBlock((byte) 17);
+    // 0 reserved for "air"/null
+    private static final int MAX_BLOCKS = 256;
+    private static final Int2ObjectArrayMap<Block> REGISTRY = new Int2ObjectArrayMap<>();
+    private static int nextId = 1;
 
-    static {
-        ids = new Block[] {
-                null,
-                grassBlock,
-                dirtBlock,
-                stoneBlock,
-                sandBlock,
-                waterBlock,
-                leafBlock,
-                spruceLeafBlock,
-                logBlock,
-                spruceLogBlock,
-                birchLogBlock,
-                oakPlanksBlock,
-                sprucePlanksBlock,
-                birchPlanksBlock,
-                glassBlock,
-                snowyGrassBlock,
-                cactusBlock,
-                shortGrassBlock,
-        };
-
-        // Build models
-        for(Block block : Blocks.ids) {
-            if(block instanceof IBlockRender) {
-                block.getModel().create();
-            }
-        }
+    /**
+     * Stores block in registry by instance
+     * @param ctor The block instance
+     * @return The block instance
+     * @param <T> A block ::new
+     */
+    private static <T extends Block> T register(Function<Byte, T> ctor) {
+        if (nextId >= MAX_BLOCKS) throw new IllegalStateException("Block registry full");
+        byte id = (byte) nextId;
+        T block = ctor.apply(id);
+        REGISTRY.put(id & 0xFF, block);
+        nextId++;
+        return block;
+    }
+
+    /**
+     * Get the block by ID (0 is null)
+     * @param id Block ID
+     * @return The block instance
+     */
+    public static Block get(int id) {
+        return REGISTRY.get(id & 0xFF);
     }
 
-}
+    /**
+     * Get the total blocks added
+     * @return
+     */
+    public static int getTotalBlocks() {
+        return REGISTRY.size();
+    }
+
+    // ---- Declarations (order == IDs). Append new ones at the end. ----
+    public static final GrassBlock grassBlock = register(GrassBlock::new);
+    public static final DirtBlock dirtBlock = register(DirtBlock::new);
+    public static final StoneBlock stoneBlock = register(StoneBlock::new);
+    public static final SandBlock sandBlock = register(SandBlock::new);
+    public static final WaterBlock waterBlock = register(WaterBlock::new);
+    public static final OakLeafBlock leafBlock = register(OakLeafBlock::new);
+    public static final SpruceLeafBlock spruceLeafBlock = register(SpruceLeafBlock::new);
+    public static final OakLogBlock logBlock = register(OakLogBlock::new);
+    public static final SpruceLogBlock spruceLogBlock = register(SpruceLogBlock::new);
+    public static final BirchLogBlock birchLogBlock = register(BirchLogBlock::new);
+    public static final OakPlanksBlock oakPlanksBlock = register(OakPlanksBlock::new);
+    public static final SprucePlanksBlock sprucePlanksBlock = register(SprucePlanksBlock::new);
+    public static final BirchPlanksBlock birchPlanksBlock = register(BirchPlanksBlock::new);
+    public static final GlassBlock glassBlock = register(GlassBlock::new);
+    public static final SnowyGrassBlock snowyGrassBlock  = register(SnowyGrassBlock::new);
+    public static final CactusBlock cactusBlock = register(CactusBlock::new);
+    public static final ShortGrassBlock shortGrassBlock = register(ShortGrassBlock::new);
+    public static final RedFlowerBlock redFlowerBlock = register(RedFlowerBlock::new);
+    public static final YellowFlowerBlock yellowFlowerBlock = register(YellowFlowerBlock::new);
+
+    static {
+        Blocks.REGISTRY.forEach((id, block) -> {
+            if(block instanceof IBlockRender) block.getModel().create();
+        });
+    }
+}

src/main/java/com/james090500/blocks/CactusBlock.java

@@ -1,6 +1,7 @@
 package com.james090500.blocks;
 
 import com.james090500.blocks.model.CactusModel;
+import it.unimi.dsi.fastutil.objects.ObjectList;
 import org.joml.Vector3i;
 
 public class CactusBlock extends Block implements IBlockRender {
@@ -25,7 +26,7 @@ public float[] getTexture(String face) {
     }
 
     @Override
-    public void render(Vector3i position) {
+    public void render(ObjectList<Vector3i> position) {
         this.model.render(position);
     }
 }

src/main/java/com/james090500/blocks/IBlockRender.java

@@ -1,10 +1,11 @@
 package com.james090500.blocks;
 
+import it.unimi.dsi.fastutil.objects.ObjectList;
 import org.joml.Vector3i;
 
 public interface IBlockRender {
 
 
-    void render(Vector3i position);
+    void render(ObjectList<Vector3i> position);
 
 }

src/main/java/com/james090500/blocks/RedFlowerBlock.java

@@ -0,0 +1,23 @@
+package com.james090500.blocks;
+
+import com.james090500.blocks.model.VegetationModel;
+import it.unimi.dsi.fastutil.objects.ObjectList;
+import org.joml.Vector3i;
+
+public class RedFlowerBlock extends VegetationBlock implements IBlockRender {
+
+    public RedFlowerBlock(byte id) {
+        super(id);
+        this.name = "Red Flower";
+        this.sound = "grass";
+        this.texture = 22;
+        this.transparent = true;
+        this.solid = false;
+        this.model = new VegetationModel(this.getTexture());
+    }
+
+    @Override
+    public void render(ObjectList<Vector3i> position) {
+        this.model.render(position);
+    }
+}

src/main/java/com/james090500/blocks/ShortGrassBlock.java

@@ -1,6 +1,7 @@
 package com.james090500.blocks;
 
 import com.james090500.blocks.model.VegetationModel;
+import it.unimi.dsi.fastutil.objects.ObjectList;
 import org.joml.Vector3i;
 
 public class ShortGrassBlock extends VegetationBlock implements IBlockRender {
@@ -9,14 +10,14 @@ public ShortGrassBlock(byte id) {
         super(id);
         this.name = "Short Grass";
         this.sound = "grass";
-        this.texture = 2;
+        this.texture = 21;
         this.transparent = true;
         this.solid = false;
         this.model = new VegetationModel(this.getTexture());
     }
 
     @Override
-    public void render(Vector3i position) {
+    public void render(ObjectList<Vector3i> position) {
         this.model.render(position);
     }
 }

src/main/java/com/james090500/blocks/YellowFlowerBlock.java

@@ -0,0 +1,23 @@
+package com.james090500.blocks;
+
+import com.james090500.blocks.model.VegetationModel;
+import it.unimi.dsi.fastutil.objects.ObjectList;
+import org.joml.Vector3i;
+
+public class YellowFlowerBlock extends VegetationBlock implements IBlockRender {
+
+    public YellowFlowerBlock(byte id) {
+        super(id);
+        this.name = "Yellow Flower";
+        this.sound = "grass";
+        this.texture = 23;
+        this.transparent = true;
+        this.solid = false;
+        this.model = new VegetationModel(this.getTexture());
+    }
+
+    @Override
+    public void render(ObjectList<Vector3i> position) {
+        this.model.render(position);
+    }
+}

src/main/java/com/james090500/blocks/model/CactusModel.java

@@ -4,6 +4,7 @@
 import com.james090500.renderer.ModelBuilder;
 import com.james090500.renderer.ShaderManager;
 import com.james090500.utils.TextureManager;
+import it.unimi.dsi.fastutil.objects.ObjectList;
 import org.joml.Matrix4f;
 import org.joml.Vector3f;
 import org.joml.Vector3i;
@@ -13,7 +14,7 @@
 
 public class CactusModel implements IBlockModel {
 
-    ModelBuilder.Model cactusModel;
+    ModelBuilder cactusModel;
 
     public void create() {
         // inputs
@@ -22,26 +23,14 @@ public void create() {
         float[] bottomUV = Blocks.cactusBlock.getTexture("bottom");
         float[][] uvBases = new float[][] { sideUV, sideUV, sideUV, sideUV, topUV, bottomUV };
 
-        cactusModel = ModelBuilder.create().addCube(0f, 0f, 0f, 1f, 1f, 0.9375f).setTexture(uvBases).build();
+        cactusModel = new ModelBuilder().addCube(0f, 0f, 0f, 1f, 1f, 0.9375f).setTexture(uvBases).build();
     }
 
     /**
      * Render
-     * @param position
+     * @param positions
      */
-    public void render(Vector3i position) {
-        Matrix4f model = new Matrix4f().translate(new Vector3f(position));
-
-        ShaderManager.basicBlockShader.use();
-        ShaderManager.basicBlockShader.setMat4("model", model);
-        ShaderManager.basicBlockShader.useFog();
-
-        glBindVertexArray(cactusModel.vao());
-        glDrawElements(GL_TRIANGLES, cactusModel.indicies(), GL_UNSIGNED_INT, 0);
-
-        glBindTexture(GL_TEXTURE_2D, TextureManager.terrainTexture);
-
-        glBindVertexArray(0);
-        ShaderManager.basicBlockShader.stop();
+    public void render(ObjectList<Vector3i> positions) {
+        this.cactusModel.render(positions);
     }
 }

src/main/java/com/james090500/blocks/model/IBlockModel.java

@@ -1,10 +1,11 @@
 package com.james090500.blocks.model;
 
+import it.unimi.dsi.fastutil.objects.ObjectList;
 import org.joml.Vector3i;
 
 public interface IBlockModel {
 
     void create();
 
-    void render(Vector3i position);
+    void render(ObjectList<Vector3i> positions);
 }