Skip to content

Commit 01257b3

Browse files
BlayTheNinthBlayTheNinth
committed
refactor: Update to new Balm changes
1 parent ed1246b commit 01257b3

9 files changed

Lines changed: 36 additions & 38 deletions

File tree

‎common/src/main/java/net/blay09/mods/cookingforblockheads/CookingForBlockheads.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,29 +69,29 @@ public int getNutrition(ItemStack itemStack, Player entityPlayer) {
6969

7070
CookingForBlockheadsConfig.initialize();
7171
Balm.dataComponentTypes(MOD_ID, ModDataComponents::initialize);
72-
ModNetworking.initialize(Balm.getNetworking());
72+
ModNetworking.initialize(Balm.networking());
7373
Balm.blocks(MOD_ID, ModBlocks::initialize);
7474
Balm.blockEntityTypes(MOD_ID, ModBlockEntities::initialize);
7575
Balm.items(MOD_ID, ModItems::initialize);
7676
Balm.creativeModeTabs(MOD_ID, ModItems::initialize);
7777
Balm.recipeTypes(MOD_ID, ModRecipes::initialize);
7878
Balm.menuTypes(MOD_ID, ModMenus::initialize);
79-
ModSounds.initialize(Balm.registrar(Registries.SOUND_EVENT, MOD_ID));
80-
ModCapabilities.initialize(Balm.getCapabilities());
79+
Balm.registrar(Registries.SOUND_EVENT, MOD_ID, ModSounds::initialize);
80+
ModCapabilities.initialize(Balm.capabilities());
8181

8282
Balm.initializeIfLoaded(Compat.HARVESTCRAFT_FOOD_CORE, "net.blay09.mods.cookingforblockheads.compat.HarvestCraftAddon");
8383

84-
CookingForBlockheadsRegistry.initialize(Balm.getEvents());
84+
CookingForBlockheadsRegistry.initialize(Balm.events());
8585

86-
Balm.getEvents().onEvent(PlayerLoginEvent.class, event -> {
87-
final var data = Balm.getHooks().getPersistentData(event.getPlayer());
86+
Balm.events().onEvent(PlayerLoginEvent.class, event -> {
87+
final var data = Balm.hooks().getPersistentData(event.getPlayer());
8888
final var favoriteItemIds = data.getCompound("CookingForBlockheads")
8989
.flatMap(it -> it.getCompound("FavoriteItemIds"))
9090
.map(it -> it.keySet().stream().map(ResourceLocation::parse).collect(Collectors.toSet())).orElse(Set.of());
91-
Balm.getNetworking().sendTo(event.getPlayer(), new FavoriteListMessage(favoriteItemIds));
91+
Balm.networking().sendTo(event.getPlayer(), new FavoriteListMessage(favoriteItemIds));
9292
});
9393

94-
Balm.getEvents().onEvent(LivingDamageEvent.class, CowJarHandler::onLivingDamage);
94+
Balm.events().onEvent(LivingDamageEvent.class, CowJarHandler::onLivingDamage);
9595
}
9696

9797
public static ResourceLocation id(String path) {

‎common/src/main/java/net/blay09/mods/cookingforblockheads/CookingForBlockheadsConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ public class CookingForBlockheadsConfig {
4949
public Set<ResourceLocation> excludedRecipes = Set.of();
5050

5151
public static CookingForBlockheadsConfig getActive() {
52-
return Balm.getConfig().getActiveConfig(CookingForBlockheadsConfig.class);
52+
return Balm.config().getActiveConfig(CookingForBlockheadsConfig.class);
5353
}
5454

5555
public static void initialize() {
56-
Balm.getConfig().registerConfig(CookingForBlockheadsConfig.class);
56+
Balm.config().registerConfig(CookingForBlockheadsConfig.class);
5757
}
5858
}

‎common/src/main/java/net/blay09/mods/cookingforblockheads/block/ModBlocks.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package net.blay09.mods.cookingforblockheads.block;
22

3-
import net.blay09.mods.balm.world.level.block.BalmBlockFactory;
3+
import net.blay09.mods.balm.world.level.block.BalmBlockRegistrar;
44
import net.blay09.mods.balm.world.level.block.DeferredBlock;
55
import net.blay09.mods.balm.world.level.block.DiscriminatedBlocks;
66
import net.blay09.mods.cookingforblockheads.component.ModDataComponents;
@@ -35,7 +35,7 @@ private static Function<Item.Properties, Item.Properties> configureTooltip(Compo
3535
properties.component(ModDataComponents.multiblockKitchen.value(), new MultiblockKitchenComponent(component));
3636
}
3737

38-
public static void initialize(BalmBlockFactory blocks) {
38+
public static void initialize(BalmBlockRegistrar blocks) {
3939
toolRack = blocks.register("tool_rack", ToolRackBlock::new, it -> it.sound(SoundType.WOOD).strength(2.5f))
4040
.withDefaultItem(configureTooltip(Component.translatable("tooltip.cookingforblockheads.tool_rack.description")))
4141
.asDeferredBlock();

‎common/src/main/java/net/blay09/mods/cookingforblockheads/block/entity/ModBlockEntities.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package net.blay09.mods.cookingforblockheads.block.entity;
22

3-
import net.blay09.mods.balm.world.level.block.entity.BalmBlockEntityTypeFactory;
3+
import net.blay09.mods.balm.world.level.block.entity.BalmBlockEntityTypeRegistrar;
44
import net.blay09.mods.cookingforblockheads.block.ModBlocks;
55
import net.minecraft.core.Holder;
66
import net.minecraft.world.level.block.entity.BlockEntityType;
@@ -21,7 +21,7 @@ public class ModBlockEntities {
2121
public static Holder<BlockEntityType<FruitBasketBlockEntity>> fruitBasket;
2222
public static Holder<BlockEntityType<CuttingBoardBlockEntity>> cuttingBoard;
2323

24-
public static void initialize(BalmBlockEntityTypeFactory blockEntityTypes) {
24+
public static void initialize(BalmBlockEntityTypeRegistrar blockEntityTypes) {
2525
cookingTable = blockEntityTypes.register("cooking_table", CookingTableBlockEntity::new, ModBlocks.cookingTables).asHolder();
2626
oven = blockEntityTypes.register("oven", OvenBlockEntity::new, ModBlocks.ovens).asHolder();
2727
fridge = blockEntityTypes.register("fridge", FridgeBlockEntity::new, ModBlocks.fridges).asHolder();

‎common/src/main/java/net/blay09/mods/cookingforblockheads/client/ModScreens.java‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
package net.blay09.mods.cookingforblockheads.client;
22

3-
import net.blay09.mods.balm.api.client.screen.BalmScreens;
3+
import net.blay09.mods.balm.client.gui.screens.inventory.BalmMenuScreenRegistrar;
44
import net.blay09.mods.cookingforblockheads.client.gui.screen.*;
55
import net.blay09.mods.cookingforblockheads.menu.ModMenus;
66

7-
import static net.blay09.mods.cookingforblockheads.CookingForBlockheads.id;
8-
97
public class ModScreens {
10-
public static void initialize(BalmScreens screens) {
11-
screens.registerScreen(id("spice_rack"), ModMenus.spiceRack::value, SpiceRackScreen::new);
12-
screens.registerScreen(id("oven"), ModMenus.oven::value, OvenScreen::new);
13-
screens.registerScreen(id("counter"), ModMenus.counter::value, CounterScreen::new);
14-
screens.registerScreen(id("fridge"), ModMenus.fridge::value, FridgeScreen::new);
15-
screens.registerScreen(id("fruit_basket"), ModMenus.fruitBasket::value, FruitBasketScreen::new);
16-
screens.registerScreen(id("no_filter_book"), ModMenus.noFilterBook::value, KitchenScreen::new);
17-
screens.registerScreen(id("recipe_book"), ModMenus.recipeBook::value, KitchenScreen::new);
18-
screens.registerScreen(id("crafting_book"), ModMenus.craftingBook::value, KitchenScreen::new);
19-
screens.registerScreen(id("cooking_table"), ModMenus.cookingTable::value, KitchenScreen::new);
20-
screens.registerScreen(id("cutting_board"), ModMenus.cuttingBoard::value, CuttingBoardScreen::new);
8+
public static void initialize(BalmMenuScreenRegistrar screens) {
9+
screens.register(ModMenus.spiceRack, SpiceRackScreen::new);
10+
screens.register(ModMenus.oven, OvenScreen::new);
11+
screens.register(ModMenus.counter, CounterScreen::new);
12+
screens.register(ModMenus.fridge, FridgeScreen::new);
13+
screens.register(ModMenus.fruitBasket, FruitBasketScreen::new);
14+
screens.register(ModMenus.noFilterBook, KitchenScreen::new);
15+
screens.register(ModMenus.recipeBook, KitchenScreen::new);
16+
screens.register(ModMenus.craftingBook, KitchenScreen::new);
17+
screens.register(ModMenus.cookingTable, KitchenScreen::new);
18+
screens.register(ModMenus.cuttingBoard, CuttingBoardScreen::new);
2119
}
2220
}

‎common/src/main/java/net/blay09/mods/cookingforblockheads/component/ModDataComponents.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package net.blay09.mods.cookingforblockheads.component;
22

33
import com.mojang.serialization.Codec;
4-
import net.blay09.mods.balm.world.component.BalmDataComponentTypeFactory;
4+
import net.blay09.mods.balm.core.component.BalmDataComponentTypeRegistrar;
55
import net.minecraft.core.Holder;
66
import net.minecraft.core.component.DataComponentType;
77
import net.minecraft.util.Unit;
@@ -11,7 +11,7 @@ public class ModDataComponents {
1111
public static Holder<DataComponentType<Unit>> toasted;
1212
public static Holder<DataComponentType<MultiblockKitchenComponent>> multiblockKitchen;
1313

14-
public static void initialize(BalmDataComponentTypeFactory components) {
14+
public static void initialize(BalmDataComponentTypeRegistrar components) {
1515
toasted = components.register("toasted", Codec.unit(Unit.INSTANCE)).asHolder();
1616
multiblockKitchen = components.register("multiblock_kitchen", MultiblockKitchenComponent.CODEC).asHolder();
1717
}

‎common/src/main/java/net/blay09/mods/cookingforblockheads/item/ModItems.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package net.blay09.mods.cookingforblockheads.item;
22

3-
import net.blay09.mods.balm.world.item.BalmCreativeModeTabFactory;
4-
import net.blay09.mods.balm.world.item.BalmItemFactory;
3+
import net.blay09.mods.balm.world.item.BalmCreativeModeTabRegistrar;
4+
import net.blay09.mods.balm.world.item.BalmItemRegistrar;
55
import net.blay09.mods.balm.world.item.DeferredItem;
66
import net.blay09.mods.cookingforblockheads.CookingForBlockheads;
77
import net.blay09.mods.cookingforblockheads.block.ModBlocks;
@@ -18,7 +18,7 @@ public class ModItems {
1818
public static DeferredItem iceUnit;
1919
public static DeferredItem preservationChamber;
2020

21-
public static void initialize(BalmItemFactory items) {
21+
public static void initialize(BalmItemRegistrar items) {
2222
recipeBook = items.register("recipe_book", ItemRecipeBook::recipeBook).asDeferredItem();
2323
noFilterBook = items.register("no_filter_edition", ItemRecipeBook::noFilterBook).asDeferredItem();
2424
craftingBook = items.register("crafting_book", ItemRecipeBook::craftingBook).asDeferredItem();
@@ -27,7 +27,7 @@ public static void initialize(BalmItemFactory items) {
2727
preservationChamber = items.register("preservation_chamber", ItemPreservationChamber::new).asDeferredItem();
2828
}
2929

30-
public static void initialize(BalmCreativeModeTabFactory creativeModeTabs) {
30+
public static void initialize(BalmCreativeModeTabRegistrar creativeModeTabs) {
3131
creativeModeTabs.register(CookingForBlockheads.MOD_ID, builder ->
3232
builder.title(Component.translatable("itemGroup.cookingforblockheads.cookingforblockheads"))
3333
.icon(() -> new ItemStack(ModBlocks.cowJar))

‎common/src/main/java/net/blay09/mods/cookingforblockheads/menu/ModMenus.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package net.blay09.mods.cookingforblockheads.menu;
22

33
import net.blay09.mods.balm.api.menu.BalmMenuFactory;
4-
import net.blay09.mods.balm.api.menu.BalmMenuTypeFactory;
4+
import net.blay09.mods.balm.world.inventory.BalmMenuTypeRegistrar;
55
import net.blay09.mods.cookingforblockheads.block.entity.*;
66
import net.blay09.mods.cookingforblockheads.crafting.KitchenImpl;
77
import net.minecraft.core.BlockPos;
@@ -28,7 +28,7 @@ public class ModMenus {
2828
public static Holder<MenuType<KitchenMenu>> craftingBook;
2929
public static Holder<MenuType<CuttingBoardMenu>> cuttingBoard;
3030

31-
public static void initialize(BalmMenuTypeFactory menuTypes) {
31+
public static void initialize(BalmMenuTypeRegistrar menuTypes) {
3232
counter = menuTypes.register("counter", new BalmMenuFactory<CounterMenu, BlockPos>() {
3333
@Override
3434
public CounterMenu create(int syncId, Inventory inventory, BlockPos pos) {

‎common/src/main/java/net/blay09/mods/cookingforblockheads/recipe/ModRecipes.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package net.blay09.mods.cookingforblockheads.recipe;
22

3-
import net.blay09.mods.balm.world.item.crafting.BalmRecipeTypeFactory;
3+
import net.blay09.mods.balm.world.item.crafting.BalmRecipeTypeRegistrar;
44
import net.blay09.mods.balm.world.item.crafting.DeferredRecipeType;
55
import net.minecraft.world.item.crafting.SingleRecipeInput;
66

@@ -9,7 +9,7 @@ public class ModRecipes {
99
public static DeferredRecipeType<SingleRecipeInput, ToasterRecipe> toasterRecipes;
1010
public static DeferredRecipeType<SingleRecipeInput, OvenRecipe> ovenRecipes;
1111

12-
public static void initialize(BalmRecipeTypeFactory recipeTypes) {
12+
public static void initialize(BalmRecipeTypeRegistrar recipeTypes) {
1313
toasterRecipes = recipeTypes.register("toaster", ToasterRecipe.class)
1414
.withSerializer(ToasterRecipe.Serializer::new)
1515
.withRecipeBookCategory()

0 commit comments

Comments
 (0)