add valuesAsArray shortcut to registration helpers

MinecraftschurliMods · Aug 7, 2024 · 4a98cef · 4a98cef
1 parent fa05979
commit 4a98cef
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/...ta/java/com/github/minecraftschurlimods/bibliocraft/datagen/data/BCBlockTagsProvider.java b/...ta/java/com/github/minecraftschurlimods/bibliocraft/datagen/data/BCBlockTagsProvider.java
@@ -23,12 +23,12 @@ protected void addTags(HolderLookup.Provider lookupProvider) {
         BibliocraftApi.getDatagenHelper().generateBlockTags(this::tag);
         tag(BCTags.Blocks.FANCY_ARMOR_STANDS).addTag(BCTags.Blocks.FANCY_ARMOR_STANDS_WOOD).add(BCBlocks.IRON_FANCY_ARMOR_STAND.get());
         tag(BCTags.Blocks.FANCY_LAMPS).addTags(BCTags.Blocks.FANCY_LAMPS_GOLD, BCTags.Blocks.FANCY_LAMPS_IRON);
-        tag(BCTags.Blocks.FANCY_LAMPS_GOLD).add(BCBlocks.CLEAR_FANCY_GOLD_LAMP.get()).add(BCBlocks.FANCY_GOLD_LAMP.values().stream().toList().toArray(new Block[0]));
-        tag(BCTags.Blocks.FANCY_LAMPS_IRON).add(BCBlocks.CLEAR_FANCY_IRON_LAMP.get()).add(BCBlocks.FANCY_IRON_LAMP.values().stream().toList().toArray(new Block[0]));
+        tag(BCTags.Blocks.FANCY_LAMPS_GOLD).add(BCBlocks.CLEAR_FANCY_GOLD_LAMP.get()).add(BCBlocks.FANCY_GOLD_LAMP.valuesAsArray());
+        tag(BCTags.Blocks.FANCY_LAMPS_IRON).add(BCBlocks.CLEAR_FANCY_IRON_LAMP.get()).add(BCBlocks.FANCY_IRON_LAMP.valuesAsArray());
         tag(BCTags.Blocks.FANCY_LANTERNS).addTags(BCTags.Blocks.FANCY_LANTERNS_GOLD, BCTags.Blocks.FANCY_LANTERNS_IRON);
-        tag(BCTags.Blocks.FANCY_LANTERNS_GOLD).add(BCBlocks.CLEAR_FANCY_GOLD_LANTERN.get()).add(BCBlocks.FANCY_GOLD_LANTERN.values().stream().toList().toArray(new Block[0]));
-        tag(BCTags.Blocks.FANCY_LANTERNS_IRON).add(BCBlocks.CLEAR_FANCY_IRON_LANTERN.get()).add(BCBlocks.FANCY_IRON_LANTERN.values().stream().toList().toArray(new Block[0]));
-        tag(BlockTags.MINEABLE_WITH_AXE).addTags(BCTags.Blocks.BOOKCASES, BCTags.Blocks.DISPLAY_CASES, BCTags.Blocks.FANCY_ARMOR_STANDS_WOOD, BCTags.Blocks.LABELS, BCTags.Blocks.POTION_SHELVES, BCTags.Blocks.SEATS, BCTags.Blocks.SHELVES, BCTags.Blocks.TOOL_RACKS).add(BCBlocks.DISC_RACK.get(), BCBlocks.WALL_DISC_RACK.get());
+        tag(BCTags.Blocks.FANCY_LANTERNS_GOLD).add(BCBlocks.CLEAR_FANCY_GOLD_LANTERN.get()).add(BCBlocks.FANCY_GOLD_LANTERN.valuesAsArray());
+        tag(BCTags.Blocks.FANCY_LANTERNS_IRON).add(BCBlocks.CLEAR_FANCY_IRON_LANTERN.get()).add(BCBlocks.FANCY_IRON_LANTERN.valuesAsArray());
+        tag(BlockTags.MINEABLE_WITH_AXE).addTags(BCTags.Blocks.BOOKCASES, BCTags.Blocks.DISPLAY_CASES, BCTags.Blocks.FANCY_ARMOR_STANDS_WOOD, BCTags.Blocks.FANCY_WORKBENCHES, BCTags.Blocks.LABELS, BCTags.Blocks.POTION_SHELVES, BCTags.Blocks.SEATS, BCTags.Blocks.SHELVES, BCTags.Blocks.TOOL_RACKS).add(BCBlocks.DISC_RACK.get(), BCBlocks.WALL_DISC_RACK.get());
         tag(BlockTags.MINEABLE_WITH_PICKAXE).addTags(BCTags.Blocks.FANCY_LANTERNS).add(BCBlocks.COOKIE_JAR.get(), BCBlocks.DESK_BELL.get(), BCBlocks.DINNER_PLATE.get(), BCBlocks.IRON_FANCY_ARMOR_STAND.get(), BCBlocks.SWORD_PEDESTAL.get());
     }
 }
diff --git a/...ain/java/com/github/minecraftschurlimods/bibliocraft/util/init/ColoredDeferredHolder.java b/...ain/java/com/github/minecraftschurlimods/bibliocraft/util/init/ColoredDeferredHolder.java
@@ -72,6 +72,14 @@ public Collection<T> values() {
         return map.values().stream().map(DeferredHolder::get).toList();
     }
 
+    /**
+     * @return An array of values of all {@link DeferredHolder}s in this object.
+     */
+    @SuppressWarnings("unchecked")
+    public T[] valuesAsArray() {
+        return map.values().stream().map(DeferredHolder::get).toList().toArray((T[]) new Object[0]);
+    }
+
     /**
      * @return An immutable collection of ids of all {@link DeferredHolder}s in this object.
      */

diff --git a/...in/java/com/github/minecraftschurlimods/bibliocraft/util/init/WoodTypeDeferredHolder.java b/...in/java/com/github/minecraftschurlimods/bibliocraft/util/init/WoodTypeDeferredHolder.java
@@ -77,6 +77,14 @@ public Collection<T> values() {
         return map.values().stream().map(DeferredHolder::get).toList();
     }
 
+    /**
+     * @return An array of values of all {@link DeferredHolder}s in this object.
+     */
+    @SuppressWarnings("unchecked")
+    public T[] valuesAsArray() {
+        return map.values().stream().map(DeferredHolder::get).toList().toArray((T[]) new Object[0]);
+    }
+
     /**
      * @return An immutable collection of ids of all {@link DeferredHolder}s in this object.
      */