feat: Update to Minecraft 1.21.11

BlayTheNinth · BlayTheNinth · commit 602c35cd2d72 · 2025-11-27T15:41:50.000+01:00
diff --git a/common/src/main/java/net/blay09/mods/cookingforblockheads/CookingForBlockheads.java b/common/src/main/java/net/blay09/mods/cookingforblockheads/CookingForBlockheads.java
@@ -12,7 +12,9 @@
 import net.blay09.mods.cookingforblockheads.client.gui.HungerSortButton;
 import net.blay09.mods.cookingforblockheads.client.gui.NameSortButton;
 import net.blay09.mods.cookingforblockheads.client.gui.SaturationSortButton;
+import net.blay09.mods.cookingforblockheads.client.gui.screen.KitchenScreen;
 import net.blay09.mods.cookingforblockheads.compat.Compat;
+import net.blay09.mods.cookingforblockheads.compat.recipeviewers.CowJarRecipe;
 import net.blay09.mods.cookingforblockheads.component.ModDataComponents;
 import net.blay09.mods.cookingforblockheads.crafting.KitchenShapedRecipeHandler;
 import net.blay09.mods.cookingforblockheads.crafting.KitchenShapelessRecipeHandler;
@@ -24,12 +26,15 @@
 import net.blay09.mods.cookingforblockheads.recipe.ModRecipes;
 import net.blay09.mods.cookingforblockheads.registry.CookingForBlockheadsRegistry;
 import net.blay09.mods.cookingforblockheads.sound.ModSounds;
+import net.minecraft.client.renderer.Rect2i;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.core.registries.Registries;
+import net.minecraft.network.chat.Component;
 import net.minecraft.resources.Identifier;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.food.FoodProperties;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
 import net.minecraft.world.item.crafting.ShapedRecipe;
 import net.minecraft.world.item.crafting.ShapelessRecipe;
 import net.minecraft.world.item.crafting.SmeltingRecipe;
@@ -60,6 +65,29 @@ public int getNutrition(ItemStack itemStack, Player entityPlayer) {
 
         Balm.modSupport().milkFluid().enable();
 
+        Balm.modSupport().recipeViewers().register(id("recipes"), registrar -> {
+            registrar.registerScreenOcclusion(KitchenScreen.class, containerScreen -> containerScreen.getSortingButtons().stream()
+                    .map(button -> new Rect2i(button.getX(), button.getY(), button.getWidth(), button.getHeight()))
+                    .toList());
+
+            if (CookingForBlockheadsConfig.getActive().cowJarEnabled) {
+                registrar.registerCustomRecipeType(id("cow_jar"), CowJarRecipe.class)
+                        .withCraftingStation(ModBlocks.cowJar)
+                        .withRecipe(new CowJarRecipe())
+                        .buildDisplay(display -> display
+                                .title(Component.translatable("container.cookingforblockheads.cow_jar"))
+                                .icon(ModBlocks.cowJar)
+                                .background(id("textures/gui/jei_cow_jar.png"))
+                                .size(150, 110)
+                                .slots((recipe, slots) -> {
+                                    slots.inputSlot(65, 1).add(Items.ANVIL);
+                                    slots.craftingStationSlot(65, 77).withSlotBackground().add(ModBlocks.milkJar);
+                                    slots.outputSlot(123, 77).withSlotBackground().add(ModBlocks.cowJar);
+                                })
+                        );
+            }
+        });
+
         CookingForBlockheadsAPI.addSortButton(new NameSortButton());
         CookingForBlockheadsAPI.addSortButton(new HungerSortButton());
         CookingForBlockheadsAPI.addSortButton(new SaturationSortButton());
@@ -72,7 +100,7 @@ public int getNutrition(ItemStack itemStack, Player entityPlayer) {
         registrars.dataComponentTypes(ModDataComponents::initialize);
         ModNetworking.initialize(Balm.networking());
         registrars.blocks(ModBlocks::initialize);
-        registrars.blockEntityTypes( ModBlockEntities::initialize);
+        registrars.blockEntityTypes(ModBlockEntities::initialize);
         registrars.items(ModItems::initialize);
         registrars.creativeModeTabs(ModItems::initialize);
         registrars.recipeTypes(ModRecipes::initialize);
diff --git a/common/src/main/java/net/blay09/mods/cookingforblockheads/client/render/CowJarRenderer.java b/common/src/main/java/net/blay09/mods/cookingforblockheads/client/render/CowJarRenderer.java
@@ -78,6 +78,8 @@ private boolean shouldCreepyStare(@Nullable Level level, BlockPos pos) {
         }
 
         final var moonPhase = level.environmentAttributes().getValue(EnvironmentAttributes.MOON_PHASE, pos);
+        final var moonAngle = level.environmentAttributes().getValue(EnvironmentAttributes.MOON_ANGLE, pos);
+        System.out.println(moonAngle);
         return moonPhase == MoonPhase.FULL_MOON && level.isDarkOutside();
     }
 
diff --git a/common/src/main/java/net/blay09/mods/cookingforblockheads/compat/HarvestCraftAddon.java b/common/src/main/java/net/blay09/mods/cookingforblockheads/compat/HarvestCraftAddon.java
@@ -11,7 +11,6 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.Identifier;
 import net.minecraft.sounds.SoundEvents;
-import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
diff --git a/common/src/main/java/net/blay09/mods/cookingforblockheads/compat/jei/CowJarRecipe.java b/common/src/main/java/net/blay09/mods/cookingforblockheads/compat/jei/CowJarRecipe.java
diff --git a/common/src/main/java/net/blay09/mods/cookingforblockheads/compat/jei/CowJarRecipeCategory.java b/common/src/main/java/net/blay09/mods/cookingforblockheads/compat/jei/CowJarRecipeCategory.java
diff --git a/common/src/main/java/net/blay09/mods/cookingforblockheads/compat/jei/JEIAddon.java b/common/src/main/java/net/blay09/mods/cookingforblockheads/compat/jei/JEIAddon.java
diff --git a/common/src/main/java/net/blay09/mods/cookingforblockheads/compat/recipeviewers/CowJarRecipe.java b/common/src/main/java/net/blay09/mods/cookingforblockheads/compat/recipeviewers/CowJarRecipe.java
@@ -0,0 +1,4 @@
+package net.blay09.mods.cookingforblockheads.compat.recipeviewers;
+
+public class CowJarRecipe {
+}
diff --git a/common/src/main/resources/assets/cookingforblockheads/lang/en_us.json b/common/src/main/resources/assets/cookingforblockheads/lang/en_us.json
@@ -219,7 +219,6 @@
   "cookingforblockheads.subtitle.oven_close": "Oven closes",
   "cookingforblockheads.subtitle.toaster_start": "Toaster starts toasting",
   "cookingforblockheads.subtitle.toaster_stop": "Toaster finished toasting",
-  "jei.cookingforblockheads.cow_jar": "Cow in a Jar",
   "config.jade.plugin_cookingforblockheads.oven": "Oven",
   "config.jade.plugin_cookingforblockheads.milk_jar": "Milk Jar",
   "config.jade.plugin_cookingforblockheads.toaster": "Toaster",
diff --git a/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/FabricCookingForBlockheads.java b/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/FabricCookingForBlockheads.java
@@ -1,8 +1,8 @@
 package net.blay09.mods.cookingforblockheads.fabric;
 
 import net.blay09.mods.balm.Balm;
-import net.blay09.mods.balm.api.EmptyLoadContext;
-import net.blay09.mods.balm.api.container.BalmContainerProvider;
+import net.blay09.mods.balm.fabric.platform.runtime.FabricLoadContext;
+import net.blay09.mods.balm.world.BalmContainerProvider;
 import net.blay09.mods.cookingforblockheads.CookingForBlockheads;
 import net.blay09.mods.cookingforblockheads.api.KitchenItemProvider;
 import net.blay09.mods.cookingforblockheads.kitchen.ContainerKitchenItemProvider;
@@ -15,7 +15,7 @@
 public class FabricCookingForBlockheads implements ModInitializer {
     @Override
     public void onInitialize() {
-        Balm.initializeMod(CookingForBlockheads.MOD_ID, EmptyLoadContext.INSTANCE, CookingForBlockheads::initialize);
+        Balm.initializeMod(CookingForBlockheads.MOD_ID, FabricLoadContext.INSTANCE, CookingForBlockheads::initialize);
 
         var itemProviderLookup = BlockApiLookup.get(Identifier.fromNamespaceAndPath(CookingForBlockheads.MOD_ID, "kitchen_item_provider"),
                 KitchenItemProvider.class,
diff --git a/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/client/FabricCookingForBlockheadsClient.java b/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/client/FabricCookingForBlockheadsClient.java
@@ -1,7 +1,7 @@
 package net.blay09.mods.cookingforblockheads.fabric.client;
 
-import net.blay09.mods.balm.api.EmptyLoadContext;
-import net.blay09.mods.balm.api.client.BalmClient;
+import net.blay09.mods.balm.client.BalmClient;
+import net.blay09.mods.balm.fabric.platform.runtime.FabricLoadContext;
 import net.blay09.mods.cookingforblockheads.CookingForBlockheads;
 import net.blay09.mods.cookingforblockheads.client.CookingForBlockheadsClient;
 import net.fabricmc.api.ClientModInitializer;
@@ -10,6 +10,6 @@ public class FabricCookingForBlockheadsClient implements ClientModInitializer {
 
     @Override
     public void onInitializeClient() {
-        BalmClient.initializeMod(CookingForBlockheads.MOD_ID, EmptyLoadContext.INSTANCE, CookingForBlockheadsClient::initialize);
+        BalmClient.initializeMod(CookingForBlockheads.MOD_ID, FabricLoadContext.INSTANCE, CookingForBlockheadsClient::initialize);
     }
 }
diff --git a/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModRecipeProvider.java b/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModRecipeProvider.java
@@ -1,6 +1,6 @@
 package net.blay09.mods.cookingforblockheads.fabric.datagen;
 
-import net.blay09.mods.balm.api.tag.BalmItemTags;
+import net.blay09.mods.balm.tags.BalmItemTags;
 import net.blay09.mods.cookingforblockheads.CookingForBlockheads;
 import net.blay09.mods.cookingforblockheads.block.ModBlocks;
 import net.blay09.mods.cookingforblockheads.item.ModItems;
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,10 +1,10 @@
 [versions]
 balm = "21.11.1-SNAPSHOT"
-minecraft = "1.21.11-pre1"
-neoForm = "1.21.11-pre1-20251119.112005"
+minecraft = "1.21.11-pre3"
+neoForm = "1.21.11-pre3-20251125.161933"
 neoForge = "21.11.0-alpha.25w45a.20251119.221026"
 forge = "60.0.20"
-fabricApi = "0.139.1+1.21.11"
+fabricApi = "0.139.2+1.21.11"
 fabricLoader = "0.17.3"
 
 [libraries]

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,8 @@ private boolean shouldCreepyStare(@Nullable Level level, BlockPos pos) {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`final var moonPhase = level.environmentAttributes().getValue(EnvironmentAttributes.MOON_PHASE, pos);`
	`81`	`+ final var moonAngle = level.environmentAttributes().getValue(EnvironmentAttributes.MOON_ANGLE, pos);`
	`82`	`+ System.out.println(moonAngle);`
`81`	`83`	`return moonPhase == MoonPhase.FULL_MOON && level.isDarkOutside();`
`82`	`84`	`}`
`83`	`85`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +package net.blay09.mods.cookingforblockheads.compat.recipeviewers;
++
 +public class CowJarRecipe {
 +}