Add RegisteredMap.forEach

Juuxel · Aug 19, 2024 · 5acd6f6 · 5acd6f6
1 parent ea911ca
commit 5acd6f6
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 28 deletions.
diff --git a/common/src/main/java/juuxel/adorn/lib/registry/RegisteredMap.java b/common/src/main/java/juuxel/adorn/lib/registry/RegisteredMap.java
@@ -6,7 +6,9 @@
 import java.util.EnumMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.function.BiConsumer;
 import java.util.function.Supplier;
+import java.util.stream.Stream;
 
 public final class RegisteredMap<K, V> implements Registered<Map<K, V>> {
     private final Map<K, Registered<? extends V>> map;
@@ -34,6 +36,14 @@ public Map<K, V> get() {
         return builtMap.get();
     }
 
+    public Stream<V> values() {
+        return map.values().stream().map(Registered::get);
+    }
+
+    public void forEach(BiConsumer<? super K, ? super V> action) {
+        map.forEach((key, value) -> action.accept(key, value.get()));
+    }
+
     public static <K, V> Builder<K, V> builder(MapFactory<K> mapFactory) {
         return new Builder<>(mapFactory, mapFactory.create());
     }

diff --git a/fabric/src/commonData/java/juuxel/adorn/data/AdornBlockLootTableGenerator.java b/fabric/src/commonData/java/juuxel/adorn/data/AdornBlockLootTableGenerator.java
@@ -14,12 +14,12 @@ public AdornBlockLootTableGenerator(FabricDataOutput dataOutput, CompletableFutu
 
     @Override
     public void generate() {
-        AdornBlocks.PAINTED_PLANKS.get().values().forEach(this::addDrop);
-        AdornBlocks.PAINTED_WOOD_SLABS.get().values().forEach(this::slabDrops);
-        AdornBlocks.PAINTED_WOOD_STAIRS.get().values().forEach(this::addDrop);
-        AdornBlocks.PAINTED_WOOD_FENCES.get().values().forEach(this::addDrop);
-        AdornBlocks.PAINTED_WOOD_FENCE_GATES.get().values().forEach(this::addDrop);
-        AdornBlocks.PAINTED_WOOD_PRESSURE_PLATES.get().values().forEach(this::addDrop);
-        AdornBlocks.PAINTED_WOOD_BUTTONS.get().values().forEach(this::addDrop);
+        AdornBlocks.PAINTED_PLANKS.values().forEach(this::addDrop);
+        AdornBlocks.PAINTED_WOOD_SLABS.values().forEach(this::slabDrops);
+        AdornBlocks.PAINTED_WOOD_STAIRS.values().forEach(this::addDrop);
+        AdornBlocks.PAINTED_WOOD_FENCES.values().forEach(this::addDrop);
+        AdornBlocks.PAINTED_WOOD_FENCE_GATES.values().forEach(this::addDrop);
+        AdornBlocks.PAINTED_WOOD_PRESSURE_PLATES.values().forEach(this::addDrop);
+        AdornBlocks.PAINTED_WOOD_BUTTONS.values().forEach(this::addDrop);
     }
 }
diff --git a/fabric/src/commonData/java/juuxel/adorn/data/AdornBlockTagGenerator.java b/fabric/src/commonData/java/juuxel/adorn/data/AdornBlockTagGenerator.java
@@ -18,19 +18,19 @@ public AdornBlockTagGenerator(FabricDataOutput output, CompletableFuture<Registr
     @Override
     protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) {
         getOrCreateTagBuilder(AdornTags.PAINTED_PLANKS.block())
-            .add(AdornBlocks.PAINTED_PLANKS.get().values().toArray(Block[]::new));
+            .add(AdornBlocks.PAINTED_PLANKS.values().toArray(Block[]::new));
         getOrCreateTagBuilder(AdornTags.PAINTED_WOOD_SLABS.block())
-            .add(AdornBlocks.PAINTED_WOOD_SLABS.get().values().toArray(Block[]::new));
+            .add(AdornBlocks.PAINTED_WOOD_SLABS.values().toArray(Block[]::new));
         getOrCreateTagBuilder(AdornTags.PAINTED_WOOD_STAIRS.block())
-            .add(AdornBlocks.PAINTED_WOOD_STAIRS.get().values().toArray(Block[]::new));
+            .add(AdornBlocks.PAINTED_WOOD_STAIRS.values().toArray(Block[]::new));
         getOrCreateTagBuilder(AdornTags.PAINTED_WOOD_FENCES.block())
-            .add(AdornBlocks.PAINTED_WOOD_FENCES.get().values().toArray(Block[]::new));
+            .add(AdornBlocks.PAINTED_WOOD_FENCES.values().toArray(Block[]::new));
         getOrCreateTagBuilder(AdornTags.PAINTED_WOOD_FENCE_GATES.block())
-            .add(AdornBlocks.PAINTED_WOOD_FENCE_GATES.get().values().toArray(Block[]::new));
+            .add(AdornBlocks.PAINTED_WOOD_FENCE_GATES.values().toArray(Block[]::new));
         getOrCreateTagBuilder(AdornTags.PAINTED_WOOD_PRESSURE_PLATES.block())
-            .add(AdornBlocks.PAINTED_WOOD_PRESSURE_PLATES.get().values().toArray(Block[]::new));
+            .add(AdornBlocks.PAINTED_WOOD_PRESSURE_PLATES.values().toArray(Block[]::new));
         getOrCreateTagBuilder(AdornTags.PAINTED_WOOD_BUTTONS.block())
-            .add(AdornBlocks.PAINTED_WOOD_BUTTONS.get().values().toArray(Block[]::new));
+            .add(AdornBlocks.PAINTED_WOOD_BUTTONS.values().toArray(Block[]::new));
         getOrCreateTagBuilder(BlockTags.PLANKS).addTag(AdornTags.PAINTED_PLANKS.block());
         getOrCreateTagBuilder(BlockTags.WOODEN_SLABS).addTag(AdornTags.PAINTED_WOOD_SLABS.block());
         getOrCreateTagBuilder(BlockTags.WOODEN_STAIRS).addTag(AdornTags.PAINTED_WOOD_STAIRS.block());

diff --git a/fabric/src/commonData/java/juuxel/adorn/data/AdornModelGenerator.java b/fabric/src/commonData/java/juuxel/adorn/data/AdornModelGenerator.java
@@ -13,7 +13,7 @@ public AdornModelGenerator(FabricDataOutput output) {
 
     @Override
     public void generateBlockStateModels(BlockStateModelGenerator generator) {
-        AdornBlocks.PAINTED_PLANKS.get().forEach((color, planks) -> {
+        AdornBlocks.PAINTED_PLANKS.forEach((color, planks) -> {
             generator.registerCubeAllModelTexturePool(planks)
                 .slab(AdornBlocks.PAINTED_WOOD_SLABS.getEager(color))
                 .stairs(AdornBlocks.PAINTED_WOOD_STAIRS.getEager(color))

diff --git a/fabric/src/commonData/java/juuxel/adorn/data/AdornRecipeGenerator.java b/fabric/src/commonData/java/juuxel/adorn/data/AdornRecipeGenerator.java
@@ -25,19 +25,19 @@ public AdornRecipeGenerator(FabricDataOutput output, CompletableFuture<RegistryW
 
     @Override
     public void generate(RecipeExporter exporter) {
-        AdornBlocks.PAINTED_PLANKS.get().forEach((color, block) -> offerPlankDyeingRecipe(exporter, block, color));
-        AdornBlocks.PAINTED_WOOD_SLABS.get().forEach((color, block) -> offerPaintedSlabRecipe(exporter, block, color));
-        AdornBlocks.PAINTED_WOOD_SLABS.get().forEach((color, block) -> offerSlabDyeingRecipe(exporter, block, color));
-        AdornBlocks.PAINTED_WOOD_STAIRS.get().forEach((color, block) -> offerPaintedStairsRecipe(exporter, block, color));
-        AdornBlocks.PAINTED_WOOD_STAIRS.get().forEach((color, block) -> offerStairDyeingRecipe(exporter, block, color));
-        AdornBlocks.PAINTED_WOOD_FENCES.get().forEach((color, block) -> offerPaintedFenceRecipe(exporter, block, color));
-        AdornBlocks.PAINTED_WOOD_FENCES.get().forEach((color, block) -> offerFenceDyeingRecipe(exporter, block, color));
-        AdornBlocks.PAINTED_WOOD_FENCE_GATES.get().forEach((color, block) -> offerPaintedFenceGateRecipe(exporter, block, color));
-        AdornBlocks.PAINTED_WOOD_FENCE_GATES.get().forEach((color, block) -> offerFenceGateDyeingRecipe(exporter, block, color));
-        AdornBlocks.PAINTED_WOOD_PRESSURE_PLATES.get().forEach((color, block) -> offerPaintedPressurePlateRecipe(exporter, block, color));
-        AdornBlocks.PAINTED_WOOD_PRESSURE_PLATES.get().forEach((color, block) -> offerPressurePlateDyeingRecipe(exporter, block, color));
-        AdornBlocks.PAINTED_WOOD_BUTTONS.get().forEach((color, block) -> offerPaintedButtonRecipe(exporter, block, color));
-        AdornBlocks.PAINTED_WOOD_BUTTONS.get().forEach((color, block) -> offerButtonDyeingRecipe(exporter, block, color));
+        AdornBlocks.PAINTED_PLANKS.forEach((color, block) -> offerPlankDyeingRecipe(exporter, block, color));
+        AdornBlocks.PAINTED_WOOD_SLABS.forEach((color, block) -> offerPaintedSlabRecipe(exporter, block, color));
+        AdornBlocks.PAINTED_WOOD_SLABS.forEach((color, block) -> offerSlabDyeingRecipe(exporter, block, color));
+        AdornBlocks.PAINTED_WOOD_STAIRS.forEach((color, block) -> offerPaintedStairsRecipe(exporter, block, color));
+        AdornBlocks.PAINTED_WOOD_STAIRS.forEach((color, block) -> offerStairDyeingRecipe(exporter, block, color));
+        AdornBlocks.PAINTED_WOOD_FENCES.forEach((color, block) -> offerPaintedFenceRecipe(exporter, block, color));
+        AdornBlocks.PAINTED_WOOD_FENCES.forEach((color, block) -> offerFenceDyeingRecipe(exporter, block, color));
+        AdornBlocks.PAINTED_WOOD_FENCE_GATES.forEach((color, block) -> offerPaintedFenceGateRecipe(exporter, block, color));
+        AdornBlocks.PAINTED_WOOD_FENCE_GATES.forEach((color, block) -> offerFenceGateDyeingRecipe(exporter, block, color));
+        AdornBlocks.PAINTED_WOOD_PRESSURE_PLATES.forEach((color, block) -> offerPaintedPressurePlateRecipe(exporter, block, color));
+        AdornBlocks.PAINTED_WOOD_PRESSURE_PLATES.forEach((color, block) -> offerPressurePlateDyeingRecipe(exporter, block, color));
+        AdornBlocks.PAINTED_WOOD_BUTTONS.forEach((color, block) -> offerPaintedButtonRecipe(exporter, block, color));
+        AdornBlocks.PAINTED_WOOD_BUTTONS.forEach((color, block) -> offerButtonDyeingRecipe(exporter, block, color));
     }
 
     private static void offerPlankDyeingRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) {