feat: Update NeoForge to 1.21

TwelveIterationMods · Jun 14, 2024 · bd6151a · bd6151a
1 parent 6e4bee1
commit bd6151a
Show file tree

Hide file tree

Showing 8 changed files with 205 additions and 203 deletions.
diff --git a/common/src/main/java/net/blay09/mods/cookingforblockheads/CookingForBlockheads.java b/common/src/main/java/net/blay09/mods/cookingforblockheads/CookingForBlockheads.java
@@ -63,10 +63,10 @@ public int getNutrition(ItemStack itemStack, Player entityPlayer) {
         CookingForBlockheadsConfig.initialize();
         ModNetworking.initialize(Balm.getNetworking());
         ModBlocks.initialize(Balm.getBlocks());
-        ModBlockEntities.initialize(Balm.getBlockEntities());
+        ModBlockEntities.initialize();
         ModItems.initialize(Balm.getItems());
         ModRecipes.initialize(Balm.getRecipes());
-        ModMenus.initialize(Balm.getMenus());
+        ModMenus.initialize();
         ModSounds.initialize(Balm.getSounds());
         ModComponents.initialize(Balm.getComponents());
 

diff --git a/common/src/main/java/net/blay09/mods/cookingforblockheads/block/entity/ModBlockEntities.java b/common/src/main/java/net/blay09/mods/cookingforblockheads/block/entity/ModBlockEntities.java
@@ -1,5 +1,6 @@
 package net.blay09.mods.cookingforblockheads.block.entity;
 
+import net.blay09.mods.balm.api.Balm;
 import net.blay09.mods.balm.api.DeferredObject;
 import net.blay09.mods.balm.api.block.BalmBlockEntities;
 import net.blay09.mods.cookingforblockheads.CookingForBlockheads;
@@ -12,50 +13,62 @@
 
 public class ModBlockEntities {
 
-    public static DeferredObject<BlockEntityType<CookingTableBlockEntity>> cookingTable;
-    public static DeferredObject<BlockEntityType<OvenBlockEntity>> oven;
-    public static DeferredObject<BlockEntityType<FridgeBlockEntity>> fridge;
-    public static DeferredObject<BlockEntityType<SinkBlockEntity>> sink;
-    public static DeferredObject<BlockEntityType<ToolRackBlockEntity>> toolRack;
-    public static DeferredObject<BlockEntityType<ToasterBlockEntity>> toaster;
-    public static DeferredObject<BlockEntityType<MilkJarBlockEntity>> milkJar;
-    public static DeferredObject<BlockEntityType<CowJarBlockEntity>> cowJar;
-    public static DeferredObject<BlockEntityType<SpiceRackBlockEntity>> spiceRack;
-    public static DeferredObject<BlockEntityType<CounterBlockEntity>> counter;
-    public static DeferredObject<BlockEntityType<CabinetBlockEntity>> cabinet;
-    public static DeferredObject<BlockEntityType<FruitBasketBlockEntity>> fruitBasket;
-    public static DeferredObject<BlockEntityType<CuttingBoardBlockEntity>> cuttingBoard;
+    public static BalmBlockEntities blockEntities = Balm.getBlockEntities();
+    public static DeferredObject<BlockEntityType<CookingTableBlockEntity>> cookingTable = blockEntities.registerBlockEntity(id("cooking_table"),
+            CookingTableBlockEntity::new,
+            () -> {
+                final var allCookingTables = Arrays.copyOf(ModBlocks.dyedCookingTables, ModBlocks.dyedCookingTables.length + 1);
+                allCookingTables[allCookingTables.length - 1] = ModBlocks.cookingTable;
+                return allCookingTables;
+            });
+    public static DeferredObject<BlockEntityType<OvenBlockEntity>> oven = blockEntities.registerBlockEntity(id("oven"),
+            OvenBlockEntity::new,
+            () -> ModBlocks.ovens);
+    public static DeferredObject<BlockEntityType<FridgeBlockEntity>> fridge = blockEntities.registerBlockEntity(id("fridge"),
+            FridgeBlockEntity::new,
+            () -> ModBlocks.fridges);
+    public static DeferredObject<BlockEntityType<SinkBlockEntity>> sink = blockEntities.registerBlockEntity(id("sink"), SinkBlockEntity::new, () -> {
+        final var allSinks = Arrays.copyOf(ModBlocks.dyedSinks, ModBlocks.dyedSinks.length + 1);
+        allSinks[allSinks.length - 1] = ModBlocks.sink;
+        return allSinks;
+    });
+    public static DeferredObject<BlockEntityType<ToolRackBlockEntity>> toolRack = blockEntities.registerBlockEntity(id("tool_rack"),
+            ToolRackBlockEntity::new,
+            () -> new Block[]{ModBlocks.toolRack});
+    public static DeferredObject<BlockEntityType<ToasterBlockEntity>> toaster = blockEntities.registerBlockEntity(id("toaster"),
+            ToasterBlockEntity::new,
+            () -> new Block[]{ModBlocks.toaster});
+    public static DeferredObject<BlockEntityType<MilkJarBlockEntity>> milkJar = blockEntities.registerBlockEntity(id("milk_jar"),
+            MilkJarBlockEntity::new,
+            () -> new Block[]{ModBlocks.milkJar});
+    public static DeferredObject<BlockEntityType<CowJarBlockEntity>> cowJar = blockEntities.registerBlockEntity(id("cow_jar"),
+            CowJarBlockEntity::new,
+            () -> new Block[]{ModBlocks.cowJar});
+    public static DeferredObject<BlockEntityType<SpiceRackBlockEntity>> spiceRack = blockEntities.registerBlockEntity(id("spice_rack"),
+            SpiceRackBlockEntity::new,
+            () -> new Block[]{ModBlocks.spiceRack});
+    public static DeferredObject<BlockEntityType<CounterBlockEntity>> counter = blockEntities.registerBlockEntity(id("counter"),
+            CounterBlockEntity::new,
+            () -> {
+                final var allCounters = Arrays.copyOf(ModBlocks.dyedCounters, ModBlocks.dyedCounters.length + 1);
+                allCounters[allCounters.length - 1] = ModBlocks.counter;
+                return allCounters;
+            });
+    public static DeferredObject<BlockEntityType<CabinetBlockEntity>> cabinet = blockEntities.registerBlockEntity(id("cabinet"),
+            CabinetBlockEntity::new,
+            () -> {
+                final var allCabinets = Arrays.copyOf(ModBlocks.dyedCabinets, ModBlocks.dyedCabinets.length + 1);
+                allCabinets[allCabinets.length - 1] = ModBlocks.cabinet;
+                return allCabinets;
+            });
+    public static DeferredObject<BlockEntityType<FruitBasketBlockEntity>> fruitBasket = blockEntities.registerBlockEntity(id("fruit_basket"),
+            FruitBasketBlockEntity::new,
+            () -> new Block[]{ModBlocks.fruitBasket});
+    public static DeferredObject<BlockEntityType<CuttingBoardBlockEntity>> cuttingBoard = blockEntities.registerBlockEntity(id("cutting_board"),
+            CuttingBoardBlockEntity::new,
+            () -> new Block[]{ModBlocks.cuttingBoard});
 
-    public static void initialize(BalmBlockEntities blockEntities) {
-        cookingTable = blockEntities.registerBlockEntity(id("cooking_table"), CookingTableBlockEntity::new, () -> {
-            final var allCookingTables = Arrays.copyOf(ModBlocks.dyedCookingTables, ModBlocks.dyedCookingTables.length + 1);
-            allCookingTables[allCookingTables.length - 1] = ModBlocks.cookingTable;
-            return allCookingTables;
-        });
-        oven = blockEntities.registerBlockEntity(id("oven"), OvenBlockEntity::new, () -> ModBlocks.ovens);
-        fridge = blockEntities.registerBlockEntity(id("fridge"), FridgeBlockEntity::new, () -> ModBlocks.fridges);
-        sink = blockEntities.registerBlockEntity(id("sink"), SinkBlockEntity::new, () -> {
-            final var allSinks = Arrays.copyOf(ModBlocks.dyedSinks, ModBlocks.dyedSinks.length + 1);
-            allSinks[allSinks.length - 1] = ModBlocks.sink;
-            return allSinks;
-        });
-        toolRack = blockEntities.registerBlockEntity(id("tool_rack"), ToolRackBlockEntity::new, () -> new Block[]{ModBlocks.toolRack});
-        toaster = blockEntities.registerBlockEntity(id("toaster"), ToasterBlockEntity::new, () -> new Block[]{ModBlocks.toaster});
-        milkJar = blockEntities.registerBlockEntity(id("milk_jar"), MilkJarBlockEntity::new, () -> new Block[]{ModBlocks.milkJar});
-        cowJar = blockEntities.registerBlockEntity(id("cow_jar"), CowJarBlockEntity::new, () -> new Block[]{ModBlocks.cowJar});
-        spiceRack = blockEntities.registerBlockEntity(id("spice_rack"), SpiceRackBlockEntity::new, () -> new Block[]{ModBlocks.spiceRack});
-        counter = blockEntities.registerBlockEntity(id("counter"), CounterBlockEntity::new, () -> {
-            final var allCounters = Arrays.copyOf(ModBlocks.dyedCounters, ModBlocks.dyedCounters.length + 1);
-            allCounters[allCounters.length - 1] = ModBlocks.counter;
-            return allCounters;
-        });
-        cabinet = blockEntities.registerBlockEntity(id("cabinet"), CabinetBlockEntity::new, () -> {
-            final var allCabinets = Arrays.copyOf(ModBlocks.dyedCabinets, ModBlocks.dyedCabinets.length + 1);
-            allCabinets[allCabinets.length - 1] = ModBlocks.cabinet;
-            return allCabinets;
-        });
-        fruitBasket = blockEntities.registerBlockEntity(id("fruit_basket"), FruitBasketBlockEntity::new, () -> new Block[]{ModBlocks.fruitBasket});
-        cuttingBoard = blockEntities.registerBlockEntity(id("cutting_board"), CuttingBoardBlockEntity::new, () -> new Block[]{ModBlocks.cuttingBoard});
+    public static void initialize() {
     }
 
     private static ResourceLocation id(String name) {