Skip to content

Commit 5acd6f6

Browse files
JuuxelJuuxel
committed
Add RegisteredMap.forEach
1 parent ea911ca commit 5acd6f6

File tree

5 files changed

+38
-28
lines changed

5 files changed

+38
-28
lines changed

‎common/src/main/java/juuxel/adorn/lib/registry/RegisteredMap.java

+10
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
import java.util.EnumMap;
77
import java.util.LinkedHashMap;
88
import java.util.Map;
9+
import java.util.function.BiConsumer;
910
import java.util.function.Supplier;
11+
import java.util.stream.Stream;
1012

1113
public final class RegisteredMap<K, V> implements Registered<Map<K, V>> {
1214
private final Map<K, Registered<? extends V>> map;
@@ -34,6 +36,14 @@ public Map<K, V> get() {
3436
return builtMap.get();
3537
}
3638

39+
public Stream<V> values() {
40+
return map.values().stream().map(Registered::get);
41+
}
42+
43+
public void forEach(BiConsumer<? super K, ? super V> action) {
44+
map.forEach((key, value) -> action.accept(key, value.get()));
45+
}
46+
3747
public static <K, V> Builder<K, V> builder(MapFactory<K> mapFactory) {
3848
return new Builder<>(mapFactory, mapFactory.create());
3949
}

‎fabric/src/commonData/java/juuxel/adorn/data/AdornBlockLootTableGenerator.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ public AdornBlockLootTableGenerator(FabricDataOutput dataOutput, CompletableFutu
1414

1515
@Override
1616
public void generate() {
17-
AdornBlocks.PAINTED_PLANKS.get().values().forEach(this::addDrop);
18-
AdornBlocks.PAINTED_WOOD_SLABS.get().values().forEach(this::slabDrops);
19-
AdornBlocks.PAINTED_WOOD_STAIRS.get().values().forEach(this::addDrop);
20-
AdornBlocks.PAINTED_WOOD_FENCES.get().values().forEach(this::addDrop);
21-
AdornBlocks.PAINTED_WOOD_FENCE_GATES.get().values().forEach(this::addDrop);
22-
AdornBlocks.PAINTED_WOOD_PRESSURE_PLATES.get().values().forEach(this::addDrop);
23-
AdornBlocks.PAINTED_WOOD_BUTTONS.get().values().forEach(this::addDrop);
17+
AdornBlocks.PAINTED_PLANKS.values().forEach(this::addDrop);
18+
AdornBlocks.PAINTED_WOOD_SLABS.values().forEach(this::slabDrops);
19+
AdornBlocks.PAINTED_WOOD_STAIRS.values().forEach(this::addDrop);
20+
AdornBlocks.PAINTED_WOOD_FENCES.values().forEach(this::addDrop);
21+
AdornBlocks.PAINTED_WOOD_FENCE_GATES.values().forEach(this::addDrop);
22+
AdornBlocks.PAINTED_WOOD_PRESSURE_PLATES.values().forEach(this::addDrop);
23+
AdornBlocks.PAINTED_WOOD_BUTTONS.values().forEach(this::addDrop);
2424
}
2525
}

‎fabric/src/commonData/java/juuxel/adorn/data/AdornBlockTagGenerator.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ public AdornBlockTagGenerator(FabricDataOutput output, CompletableFuture<Registr
1818
@Override
1919
protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) {
2020
getOrCreateTagBuilder(AdornTags.PAINTED_PLANKS.block())
21-
.add(AdornBlocks.PAINTED_PLANKS.get().values().toArray(Block[]::new));
21+
.add(AdornBlocks.PAINTED_PLANKS.values().toArray(Block[]::new));
2222
getOrCreateTagBuilder(AdornTags.PAINTED_WOOD_SLABS.block())
23-
.add(AdornBlocks.PAINTED_WOOD_SLABS.get().values().toArray(Block[]::new));
23+
.add(AdornBlocks.PAINTED_WOOD_SLABS.values().toArray(Block[]::new));
2424
getOrCreateTagBuilder(AdornTags.PAINTED_WOOD_STAIRS.block())
25-
.add(AdornBlocks.PAINTED_WOOD_STAIRS.get().values().toArray(Block[]::new));
25+
.add(AdornBlocks.PAINTED_WOOD_STAIRS.values().toArray(Block[]::new));
2626
getOrCreateTagBuilder(AdornTags.PAINTED_WOOD_FENCES.block())
27-
.add(AdornBlocks.PAINTED_WOOD_FENCES.get().values().toArray(Block[]::new));
27+
.add(AdornBlocks.PAINTED_WOOD_FENCES.values().toArray(Block[]::new));
2828
getOrCreateTagBuilder(AdornTags.PAINTED_WOOD_FENCE_GATES.block())
29-
.add(AdornBlocks.PAINTED_WOOD_FENCE_GATES.get().values().toArray(Block[]::new));
29+
.add(AdornBlocks.PAINTED_WOOD_FENCE_GATES.values().toArray(Block[]::new));
3030
getOrCreateTagBuilder(AdornTags.PAINTED_WOOD_PRESSURE_PLATES.block())
31-
.add(AdornBlocks.PAINTED_WOOD_PRESSURE_PLATES.get().values().toArray(Block[]::new));
31+
.add(AdornBlocks.PAINTED_WOOD_PRESSURE_PLATES.values().toArray(Block[]::new));
3232
getOrCreateTagBuilder(AdornTags.PAINTED_WOOD_BUTTONS.block())
33-
.add(AdornBlocks.PAINTED_WOOD_BUTTONS.get().values().toArray(Block[]::new));
33+
.add(AdornBlocks.PAINTED_WOOD_BUTTONS.values().toArray(Block[]::new));
3434
getOrCreateTagBuilder(BlockTags.PLANKS).addTag(AdornTags.PAINTED_PLANKS.block());
3535
getOrCreateTagBuilder(BlockTags.WOODEN_SLABS).addTag(AdornTags.PAINTED_WOOD_SLABS.block());
3636
getOrCreateTagBuilder(BlockTags.WOODEN_STAIRS).addTag(AdornTags.PAINTED_WOOD_STAIRS.block());

‎fabric/src/commonData/java/juuxel/adorn/data/AdornModelGenerator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public AdornModelGenerator(FabricDataOutput output) {
1313

1414
@Override
1515
public void generateBlockStateModels(BlockStateModelGenerator generator) {
16-
AdornBlocks.PAINTED_PLANKS.get().forEach((color, planks) -> {
16+
AdornBlocks.PAINTED_PLANKS.forEach((color, planks) -> {
1717
generator.registerCubeAllModelTexturePool(planks)
1818
.slab(AdornBlocks.PAINTED_WOOD_SLABS.getEager(color))
1919
.stairs(AdornBlocks.PAINTED_WOOD_STAIRS.getEager(color))

‎fabric/src/commonData/java/juuxel/adorn/data/AdornRecipeGenerator.java

+13-13
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ public AdornRecipeGenerator(FabricDataOutput output, CompletableFuture<RegistryW
2525

2626
@Override
2727
public void generate(RecipeExporter exporter) {
28-
AdornBlocks.PAINTED_PLANKS.get().forEach((color, block) -> offerPlankDyeingRecipe(exporter, block, color));
29-
AdornBlocks.PAINTED_WOOD_SLABS.get().forEach((color, block) -> offerPaintedSlabRecipe(exporter, block, color));
30-
AdornBlocks.PAINTED_WOOD_SLABS.get().forEach((color, block) -> offerSlabDyeingRecipe(exporter, block, color));
31-
AdornBlocks.PAINTED_WOOD_STAIRS.get().forEach((color, block) -> offerPaintedStairsRecipe(exporter, block, color));
32-
AdornBlocks.PAINTED_WOOD_STAIRS.get().forEach((color, block) -> offerStairDyeingRecipe(exporter, block, color));
33-
AdornBlocks.PAINTED_WOOD_FENCES.get().forEach((color, block) -> offerPaintedFenceRecipe(exporter, block, color));
34-
AdornBlocks.PAINTED_WOOD_FENCES.get().forEach((color, block) -> offerFenceDyeingRecipe(exporter, block, color));
35-
AdornBlocks.PAINTED_WOOD_FENCE_GATES.get().forEach((color, block) -> offerPaintedFenceGateRecipe(exporter, block, color));
36-
AdornBlocks.PAINTED_WOOD_FENCE_GATES.get().forEach((color, block) -> offerFenceGateDyeingRecipe(exporter, block, color));
37-
AdornBlocks.PAINTED_WOOD_PRESSURE_PLATES.get().forEach((color, block) -> offerPaintedPressurePlateRecipe(exporter, block, color));
38-
AdornBlocks.PAINTED_WOOD_PRESSURE_PLATES.get().forEach((color, block) -> offerPressurePlateDyeingRecipe(exporter, block, color));
39-
AdornBlocks.PAINTED_WOOD_BUTTONS.get().forEach((color, block) -> offerPaintedButtonRecipe(exporter, block, color));
40-
AdornBlocks.PAINTED_WOOD_BUTTONS.get().forEach((color, block) -> offerButtonDyeingRecipe(exporter, block, color));
28+
AdornBlocks.PAINTED_PLANKS.forEach((color, block) -> offerPlankDyeingRecipe(exporter, block, color));
29+
AdornBlocks.PAINTED_WOOD_SLABS.forEach((color, block) -> offerPaintedSlabRecipe(exporter, block, color));
30+
AdornBlocks.PAINTED_WOOD_SLABS.forEach((color, block) -> offerSlabDyeingRecipe(exporter, block, color));
31+
AdornBlocks.PAINTED_WOOD_STAIRS.forEach((color, block) -> offerPaintedStairsRecipe(exporter, block, color));
32+
AdornBlocks.PAINTED_WOOD_STAIRS.forEach((color, block) -> offerStairDyeingRecipe(exporter, block, color));
33+
AdornBlocks.PAINTED_WOOD_FENCES.forEach((color, block) -> offerPaintedFenceRecipe(exporter, block, color));
34+
AdornBlocks.PAINTED_WOOD_FENCES.forEach((color, block) -> offerFenceDyeingRecipe(exporter, block, color));
35+
AdornBlocks.PAINTED_WOOD_FENCE_GATES.forEach((color, block) -> offerPaintedFenceGateRecipe(exporter, block, color));
36+
AdornBlocks.PAINTED_WOOD_FENCE_GATES.forEach((color, block) -> offerFenceGateDyeingRecipe(exporter, block, color));
37+
AdornBlocks.PAINTED_WOOD_PRESSURE_PLATES.forEach((color, block) -> offerPaintedPressurePlateRecipe(exporter, block, color));
38+
AdornBlocks.PAINTED_WOOD_PRESSURE_PLATES.forEach((color, block) -> offerPressurePlateDyeingRecipe(exporter, block, color));
39+
AdornBlocks.PAINTED_WOOD_BUTTONS.forEach((color, block) -> offerPaintedButtonRecipe(exporter, block, color));
40+
AdornBlocks.PAINTED_WOOD_BUTTONS.forEach((color, block) -> offerButtonDyeingRecipe(exporter, block, color));
4141
}
4242

4343
private static void offerPlankDyeingRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) {

0 commit comments

Comments
 (0)