throw away while loop in block & biome registry

core/src/main/java/net/pl3x/map/core/registry/BiomeRegistry.java

@@ -40,6 +40,7 @@
 
 public class BiomeRegistry extends Registry<@NotNull Biome> {
     private static final Gson GSON = new GsonBuilder().create();
+    private static final int MAX_INDEX = 1023;
 
     private final Map<String, Integer> indexMap;
 
@@ -67,21 +68,23 @@ private int getNextIndex(String id) {
         if (index > -1) {
             return index;
         }
-        int i = 0;
-        while (true) {
-            if (!this.indexMap.containsValue(i)) {
-                this.indexMap.put(id, i);
-                return i;
-            }
-            i++;
-        }
+
+        int i = this.indexMap.size();
+        if (i > MAX_INDEX) return -1;
+
+        this.indexMap.put(id, i);
+        return i;
     }
 
-    public @NotNull Biome register(@NotNull String id, int color, int foliage, int grass, int water, Biome.@NotNull GrassModifier grassModifier) {
+    public Biome register(@NotNull String id, int color, int foliage, int grass, int water, Biome.@NotNull GrassModifier grassModifier) {
         if (has(id)) {
             throw new KeyAlreadyExistsException("Biome already registered: " + id);
         }
-        return register(id, new Biome(getNextIndex(id), id, color, foliage, grass, water, grassModifier));
+
+        int nextIndex = getNextIndex(id);
+        if (nextIndex == -1) return null;
+
+        return register(id, new Biome(nextIndex, id, color, foliage, grass, water, grassModifier));
     }
 
     @Override

core/src/main/java/net/pl3x/map/core/registry/BlockRegistry.java

@@ -41,6 +41,7 @@
 
 public class BlockRegistry extends Registry<@NotNull Block> {
     private static final Gson GSON = new GsonBuilder().create();
+    private static final int MAX_INDEX = 1023;
 
     private final Map<String, Integer> indexMap;
 
@@ -64,30 +65,36 @@ public void init() {
         }
     }
 
+    public Map<String, Integer> getIndexMap() {
+        return indexMap;
+    }
+
     private int getNextIndex(String id) {
         int index = this.indexMap.getOrDefault(id, -1);
         if (index > -1) {
             return index;
         }
-        int i = 0;
-        while (true) {
-            if (!this.indexMap.containsValue(i)) {
-                this.indexMap.put(id, i);
-                return i;
-            }
-            i++;
-        }
+
+        int i = this.indexMap.size();
+        if (i > MAX_INDEX) return -1;
+
+        this.indexMap.put(id, i);
+        return i;
     }
 
-    public @NotNull Block register(@NotNull String id, int color) {
+    public Block register(@NotNull String id, int color) {
         Block block = super.get(id);
         if (block != null) {
             return block; // block already registered
         }
         if (id.startsWith("minecraft:")) {
             Logger.warn("Registering unknown vanilla block " + id);
         }
-        return register(id, new Block(getNextIndex(id), id, color));
+
+        int nextIndex = getNextIndex(id);
+        if (nextIndex == -1) return null;
+
+        return register(id, new Block(nextIndex, id, color));
     }
 
     @Override

core/src/main/java/net/pl3x/map/core/world/Blocks.java

@@ -1042,6 +1042,9 @@ public class Blocks {
     }
 
     public static void registerDefaults() {
-        blocks.forEach((id, block) -> Pl3xMap.api().getBlockRegistry().register(id, block));
+        blocks.forEach((id, block) -> {
+            Pl3xMap.api().getBlockRegistry().register(id, block);
+            Pl3xMap.api().getBlockRegistry().getIndexMap().put(id, block.getIndex());
+        });
     }
 }