Skip to content

Commit 783e309

Browse files
BlayTheNinthBlayTheNinth
committed
refactor: Update to new Balm changes
1 parent b2da00c commit 783e309

5 files changed

Lines changed: 95 additions & 94 deletions

File tree

‎fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModBlockLootTableProvider.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.blay09.mods.cookingforblockheads.fabric.datagen;
22

3+
import net.blay09.mods.balm.world.level.block.DeferredBlock;
34
import net.blay09.mods.cookingforblockheads.block.ModBlocks;
45
import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
56
import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider;
@@ -18,16 +19,16 @@ public void generate() {
1819
dropSelf(ModBlocks.milkJar.value());
1920
dropSelf(ModBlocks.cowJar.value());
2021
dropSelf(ModBlocks.cuttingBoard.value());
21-
ModBlocks.ovens.getAll().forEach(it -> add(it, this::createNameableBlockEntityTable));
22-
ModBlocks.fridges.getAll().forEach(it -> add(it, this::createNameableBlockEntityTable));
22+
ModBlocks.ovens.forEach((discriminator, it) -> add(it.asBlock(), this::createNameableBlockEntityTable));
23+
ModBlocks.fridges.forEach((discriminator, it) -> add(it.asBlock(), this::createNameableBlockEntityTable));
2324
add(ModBlocks.toolRack.value(), this::createNameableBlockEntityTable);
2425
add(ModBlocks.spiceRack.value(), this::createNameableBlockEntityTable);
2526
add(ModBlocks.fruitBasket.value(), this::createNameableBlockEntityTable);
26-
ModBlocks.counters.getAll().forEach(it -> add(it, this::createNameableBlockEntityTable));
27-
ModBlocks.cabinets.getAll().forEach(it -> add(it, this::createNameableBlockEntityTable));
28-
ModBlocks.kitchenFloors.getAll().forEach(this::dropSelf);
29-
ModBlocks.connectors.getAll().forEach(this::dropSelf);
30-
ModBlocks.sinks.getAll().forEach(this::dropSelf);
31-
ModBlocks.cookingTables.getAll().forEach(this::dropSelf);
27+
ModBlocks.counters.forEach((discriminator, it) -> add(it.asBlock(), this::createNameableBlockEntityTable));
28+
ModBlocks.cabinets.forEach((discriminator, it) -> add(it.asBlock(), this::createNameableBlockEntityTable));
29+
ModBlocks.kitchenFloors.values().stream().map(DeferredBlock::asBlock).forEach(this::dropSelf);
30+
ModBlocks.connectors.values().stream().map(DeferredBlock::asBlock).forEach(this::dropSelf);
31+
ModBlocks.sinks.values().stream().map(DeferredBlock::asBlock).forEach(this::dropSelf);
32+
ModBlocks.cookingTables.values().stream().map(DeferredBlock::asBlock).forEach(this::dropSelf);
3233
}
3334
}

‎fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModBlockTagProvider.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ public ModBlockTagProvider(PackOutput output, CompletableFuture<HolderLookup.Pro
2121
protected void addTags(HolderLookup.Provider arg) {
2222
final var mineablePickaxeTag = TagKey.create(Registries.BLOCK, ResourceLocation.withDefaultNamespace("mineable/pickaxe"));
2323
final var mineablePickaxeBuilder = tag(mineablePickaxeTag);
24-
ModBlocks.cookingTables.forEach(block -> mineablePickaxeBuilder.add(block));
25-
ModBlocks.sinks.forEach(block -> mineablePickaxeBuilder.add(block));
26-
ModBlocks.counters.forEach(block -> mineablePickaxeBuilder.add(block));
27-
ModBlocks.cabinets.forEach(block -> mineablePickaxeBuilder.add(block));
28-
ModBlocks.connectors.forEach(block -> mineablePickaxeBuilder.add(block));
29-
ModBlocks.fridges.forEach(block -> mineablePickaxeBuilder.add(block));
30-
ModBlocks.ovens.forEach(block -> mineablePickaxeBuilder.add(block));
31-
ModBlocks.kitchenFloors.forEach(block -> mineablePickaxeBuilder.add(block));
24+
ModBlocks.cookingTables.forEach((discriminator, block) -> mineablePickaxeBuilder.add(block.asBlock()));
25+
ModBlocks.sinks.forEach((discriminator, block) -> mineablePickaxeBuilder.add(block.asBlock()));
26+
ModBlocks.counters.forEach((discriminator, block) -> mineablePickaxeBuilder.add(block.asBlock()));
27+
ModBlocks.cabinets.forEach((discriminator, block) -> mineablePickaxeBuilder.add(block.asBlock()));
28+
ModBlocks.connectors.forEach((discriminator, block) -> mineablePickaxeBuilder.add(block.asBlock()));
29+
ModBlocks.fridges.forEach((discriminator, block) -> mineablePickaxeBuilder.add(block.asBlock()));
30+
ModBlocks.ovens.forEach((discriminator, block) -> mineablePickaxeBuilder.add(block.asBlock()));
31+
ModBlocks.kitchenFloors.forEach((discriminator, block) -> mineablePickaxeBuilder.add(block.asBlock()));
3232
mineablePickaxeBuilder.add(ModBlocks.toaster.asBlock(), ModBlocks.milkJar.asBlock(), ModBlocks.cowJar.asBlock());
3333

3434
final var mineableAxeTag = TagKey.create(Registries.BLOCK, ResourceLocation.withDefaultNamespace("mineable/axe"));
@@ -37,8 +37,8 @@ protected void addTags(HolderLookup.Provider arg) {
3737

3838
final var kitchenItemProviders = tag(ModBlockTags.KITCHEN_ITEM_PROVIDERS);
3939
kitchenItemProviders.add(ModBlocks.toolRack.asBlock());
40-
ModBlocks.cabinets.forEach(block -> kitchenItemProviders.add(block));
41-
ModBlocks.counters.forEach(block -> kitchenItemProviders.add(block));
40+
ModBlocks.cabinets.forEach((discriminator, block) -> kitchenItemProviders.add(block.asBlock()));
41+
ModBlocks.counters.forEach((discriminator, block) -> kitchenItemProviders.add(block.asBlock()));
4242

4343
final var rawKitchenItemProviders = getOrCreateRawBuilder(ModBlockTags.KITCHEN_ITEM_PROVIDERS);
4444
rawKitchenItemProviders.addOptionalElement(ResourceLocation.fromNamespaceAndPath("farmersdelight", "basket"));
@@ -179,11 +179,11 @@ protected void addTags(HolderLookup.Provider arg) {
179179
rawKitchenItemProviders.addOptionalElement(ResourceLocation.fromNamespaceAndPath("storagedrawers", "fractional_drawers_3"));
180180

181181
final var cookingTables = tag(ModBlockTags.COOKING_TABLES);
182-
ModBlocks.cookingTables.forEach(block -> cookingTables.add(block));
182+
ModBlocks.cookingTables.forEach((discriminator, block) -> cookingTables.add(block.asBlock()));
183183

184184
final var kitchenConnectors = tag(ModBlockTags.KITCHEN_CONNECTORS);
185-
ModBlocks.connectors.forEach(block -> kitchenConnectors.add(block));
186-
ModBlocks.kitchenFloors.forEach(block -> kitchenConnectors.add(block));
185+
ModBlocks.connectors.forEach((discriminator, block) -> kitchenConnectors.add(block.asBlock()));
186+
ModBlocks.kitchenFloors.forEach((discriminator, block) -> kitchenConnectors.add(block.asBlock()));
187187

188188
final var rawKitchenConnectors = getOrCreateRawBuilder(ModBlockTags.KITCHEN_CONNECTORS);
189189
rawKitchenConnectors.addOptionalElement(ResourceLocation.fromNamespaceAndPath("buildersaddition", "counter_oak_andesite"));

‎fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModItemTagProvider.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public ModItemTagProvider(PackOutput output, CompletableFuture<HolderLookup.Prov
1919
@Override
2020
protected void addTags(HolderLookup.Provider lookup) {
2121
final var ovens = tag(ModItemTags.OVENS);
22-
ModBlocks.ovens.forEach(it -> ovens.add(it.asItem()));
22+
ModBlocks.ovens.forEach((discriminator, it) -> ovens.add(it.asItem()));
2323

2424
final var dyedOvens = tag(ModItemTags.DYED_OVENS);
2525
ModBlocks.ovens.forEach((color, block) -> {
@@ -29,7 +29,7 @@ protected void addTags(HolderLookup.Provider lookup) {
2929
});
3030

3131
final var fridges = tag(ModItemTags.FRIDGES);
32-
ModBlocks.fridges.forEach(it -> fridges.add(it.asItem()));
32+
ModBlocks.fridges.forEach((discriminator, it) -> fridges.add(it.asItem()));
3333

3434
final var dyedFridges = tag(ModItemTags.DYED_FRIDGES);
3535
ModBlocks.fridges.forEach((color, block) -> {
@@ -38,34 +38,34 @@ protected void addTags(HolderLookup.Provider lookup) {
3838
}
3939
});
4040

41-
final var sinks = tag(ModItemTags.SINKS).add(ModBlocks.sinks.getUndiscriminated().asItem());
42-
ModBlocks.sinks.forEach(it -> sinks.add(it.asItem()));
41+
final var sinks = tag(ModItemTags.SINKS).add(ModBlocks.sinks.get(null).asItem());
42+
ModBlocks.sinks.forEach((discriminator, it) -> sinks.add(it.asItem()));
4343

4444
final var dyedSinks = tag(ModItemTags.DYED_SINKS);
45-
ModBlocks.sinks.forEachDiscriminated((color, block) -> dyedSinks.add(block.asItem()));
45+
ModBlocks.sinks.forEach((color, block) -> dyedSinks.add(block.asItem()));
4646

4747
final var cookingTables = tag(ModItemTags.COOKING_TABLES);
48-
ModBlocks.cookingTables.forEach(it -> cookingTables.add(it.asItem()));
48+
ModBlocks.cookingTables.forEach((discriminator, it) -> cookingTables.add(it.asItem()));
4949

5050
final var dyedCookingTables = tag(ModItemTags.DYED_COOKING_TABLES);
51-
ModBlocks.cookingTables.forEachDiscriminated((color, block) -> dyedCookingTables.add(block.asItem()));
51+
ModBlocks.cookingTables.filterNonNullDiscriminators().forEach(block -> dyedCookingTables.add(block.asItem()));
5252

5353
final var counters = tag(ModItemTags.COUNTERS);
54-
ModBlocks.counters.forEach(it -> counters.add(it.asItem()));
54+
ModBlocks.counters.forEach((discriminator, it) -> counters.add(it.asItem()));
5555

5656
final var dyedCounters = tag(ModItemTags.DYED_COUNTERS);
57-
ModBlocks.counters.forEachDiscriminated((color, block) -> dyedCounters.add(block.asItem()));
57+
ModBlocks.counters.filterNonNullDiscriminators().forEach(block -> dyedCounters.add(block.asItem()));
5858

5959
final var cabinets = tag(ModItemTags.CABINETS);
60-
ModBlocks.cabinets.forEach(it -> cabinets.add(it.asItem()));
60+
ModBlocks.cabinets.forEach((discriminator, it) -> cabinets.add(it.asItem()));
6161

6262
final var dyedCabinets = tag(ModItemTags.DYED_CABINETS);
63-
ModBlocks.cabinets.forEachDiscriminated((color, block) -> dyedCabinets.add(block.asItem()));
63+
ModBlocks.cabinets.filterNonNullDiscriminators().forEach(block -> dyedCabinets.add(block.asItem()));
6464

6565
final var connectors = tag(ModItemTags.CONNECTORS);
66-
ModBlocks.connectors.forEach(it -> connectors.add(it.asItem()));
66+
ModBlocks.connectors.forEach((discriminator, it) -> connectors.add(it.asItem()));
6767

6868
final var dyedConnectors = tag(ModItemTags.DYED_CONNECTORS);
69-
ModBlocks.connectors.forEachDiscriminated((color, block) -> dyedConnectors.add(block.asItem()));
69+
ModBlocks.connectors.filterNonNullDiscriminators().forEach(block -> dyedConnectors.add(block.asItem()));
7070
}
7171
}

0 commit comments

Comments
 (0)