refactor: Fix nullability problems

Author: BlayTheNinth

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

@@ -6,6 +6,7 @@
 import net.blay09.mods.balm.platform.config.reflection.NestedType;
 import net.minecraft.resources.Identifier;
 
+import java.util.Objects;
 import java.util.Set;
 
 @Config(CookingForBlockheads.MOD_ID)
@@ -49,7 +50,7 @@ public class CookingForBlockheadsConfig {
     public Set<Identifier> excludedRecipes = Set.of();
 
     public static CookingForBlockheadsConfig getActive() {
-        return Balm.config().getActiveConfig(CookingForBlockheadsConfig.class);
+        return Objects.requireNonNull(Balm.config().getActiveConfig(CookingForBlockheadsConfig.class));
     }
 
     public static void initialize() {

common/src/main/java/net/blay09/mods/cookingforblockheads/api/KitchenItemProvider.java

@@ -2,6 +2,7 @@
 
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Collection;
 
@@ -21,15 +22,15 @@ public interface KitchenItemProvider {
      * @param cacheHint        a hint on where to start looking, based on {@link #getCacheHint(IngredientToken)} for the last returned token for this type of ingredient
      * @return an ingredient token that matches the given ingredient, or null if none was found
      */
-    IngredientToken findIngredient(Ingredient ingredient, Collection<IngredientToken> ingredientTokens, CacheHint cacheHint);
+    @Nullable IngredientToken findIngredient(Ingredient ingredient, Collection<IngredientToken> ingredientTokens, CacheHint cacheHint);
 
     /**
      * @param itemStack        the item to find
      * @param ingredientTokens the ingredient tokens that have already been provided for this type of ingredient by this provider
      * @param cacheHint        a hint on where to start looking, based on {@link #getCacheHint(IngredientToken)} for the last returned token for this type of ingredient
      * @return an ingredient token that matches the given ingredient, or null if none was found
      */
-    IngredientToken findIngredient(ItemStack itemStack, Collection<IngredientToken> ingredientTokens, CacheHint cacheHint);
+    @Nullable IngredientToken findIngredient(ItemStack itemStack, Collection<IngredientToken> ingredientTokens, CacheHint cacheHint);
 
     CacheHint getCacheHint(IngredientToken ingredientToken);
 }

common/src/main/java/net/blay09/mods/cookingforblockheads/block/CabinetBlock.java

@@ -38,7 +38,6 @@ public CabinetBlock(@Nullable DyeColor color, Properties properties) {
         super(color, properties);
     }
 
-    @Nullable
     @Override
     public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
         return new CabinetBlockEntity(pos, state);

common/src/main/java/net/blay09/mods/cookingforblockheads/block/CounterBlock.java

@@ -34,7 +34,7 @@ public class CounterBlock extends BaseKitchenBlock {
                     .forGetter(CounterBlock::getColor),
             propertiesCodec()).apply(it, CounterBlock::new));
 
-    private final DyeColor color;
+    private final @Nullable DyeColor color;
 
     public CounterBlock(Properties properties) {
         this(null, properties);
@@ -45,8 +45,7 @@ public CounterBlock(@Nullable DyeColor color, Properties properties) {
         this.color = color;
     }
 
-    @Nullable
-    public DyeColor getColor() {
+    public @Nullable DyeColor getColor() {
         return color;
     }
 

common/src/main/java/net/blay09/mods/cookingforblockheads/block/CuttingBoardBlock.java

@@ -17,12 +17,10 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.ContainerLevelAccess;
-import net.minecraft.world.inventory.CraftingMenu;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.BaseEntityBlock;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;

common/src/main/java/net/blay09/mods/cookingforblockheads/block/FruitBasketBlock.java

@@ -15,7 +15,6 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.BaseEntityBlock;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityTicker;
 import net.minecraft.world.level.block.entity.BlockEntityType;
@@ -24,6 +23,7 @@
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import org.jspecify.annotations.Nullable;
 
 public class FruitBasketBlock extends BaseKitchenBlock {
 
@@ -69,7 +69,7 @@ protected InteractionResult useWithoutItem(BlockState state, Level level, BlockP
     }
 
     @Override
-    public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, BlockState state, BlockEntityType<T> type) {
+    public <T extends BlockEntity> @Nullable BlockEntityTicker<T> getTicker(Level level, BlockState state, BlockEntityType<T> type) {
         return !level.isClientSide() ? createTickerHelper(type, ModBlockEntities.fruitBasket.value(), FruitBasketBlockEntity::serverTick) : null;
     }
 

common/src/main/java/net/blay09/mods/cookingforblockheads/block/KitchenFloorBlock.java

@@ -4,7 +4,6 @@
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.SoundType;
 
 public class KitchenFloorBlock extends Block {
 

common/src/main/java/net/blay09/mods/cookingforblockheads/block/MilkJarBlock.java

@@ -18,7 +18,6 @@
 import net.minecraft.world.level.block.BaseEntityBlock;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.BucketPickup;
-import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
@@ -100,7 +99,7 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
     @Override
     public ItemStack pickupBlock(@Nullable LivingEntity entity, LevelAccessor level, BlockPos pos, BlockState state) {
         BlockEntity blockEntity = level.getBlockEntity(pos);
-        if (blockEntity instanceof MilkJarBlockEntity milkJar && ((MilkJarBlockEntity) blockEntity).getFluidTank().getAmount() >= 1000) {
+        if (blockEntity instanceof MilkJarBlockEntity milkJar && milkJar.getFluidTank().getAmount() >= 1000) {
             int drained = milkJar.getFluidTank().drain(Compat.getMilkFluid(), 1000, false);
             return drained >= 1000 ? new ItemStack(Items.MILK_BUCKET) : ItemStack.EMPTY;
         }

common/src/main/java/net/blay09/mods/cookingforblockheads/block/OvenBlock.java

@@ -36,7 +36,7 @@ public class OvenBlock extends BaseKitchenBlock {
     public static final MapCodec<OvenBlock> CODEC = RecordCodecBuilder.mapCodec((it) -> it.group(DyeColor.CODEC.fieldOf("color").forGetter(OvenBlock::getColor),
             propertiesCodec()).apply(it, OvenBlock::new));
 
-    public static BooleanProperty ACTIVE = BooleanProperty.create("active");
+    public static final BooleanProperty ACTIVE = BooleanProperty.create("active");
 
     private static final Random random = new Random();
     private final DyeColor color;
@@ -78,33 +78,7 @@ protected InteractionResult useItemOn(ItemStack itemStack, BlockState state, Lev
         if (blockHitResult.getDirection() == Direction.UP) {
             if (itemStack.is(ModItemTags.UTENSILS)) {
                 Direction stateFacing = state.getValue(FACING);
-                double hx = blockHitResult.getLocation().x;
-                double hz = blockHitResult.getLocation().z;
-                switch (stateFacing) {
-                    case NORTH -> {
-                        hx = 1f - blockHitResult.getLocation().x;
-                        hz = 1f - blockHitResult.getLocation().z;
-                    }
-//                    case SOUTH: hx = hitX; hz = hitZ; break;
-                    case WEST -> {
-                        hz = 1f - blockHitResult.getLocation().x;
-                        hx = blockHitResult.getLocation().z;
-                    }
-                    case EAST -> {
-                        hz = blockHitResult.getLocation().x;
-                        hx = 1f - blockHitResult.getLocation().z;
-                    }
-                }
-                int index = -1;
-                if (hx < 0.5f && hz < 0.5f) {
-                    index = 1;
-                } else if (hx >= 0.5f && hz < 0.5f) {
-                    index = 0;
-                } else if (hx < 0.5f && hz >= 0.5f) {
-                    index = 3;
-                } else if (hx >= 0.5f && hz >= 0.5f) {
-                    index = 2;
-                }
+                int index = resolveToolHitIndex(blockHitResult, stateFacing);
                 if (index != -1) {
                     OvenBlockEntity tileOven = (OvenBlockEntity) level.getBlockEntity(pos);
                     if (tileOven != null && tileOven.getToolItem(index).isEmpty()) {
@@ -130,6 +104,37 @@ protected InteractionResult useItemOn(ItemStack itemStack, BlockState state, Lev
         return super.useItemOn(itemStack, state, level, pos, player, hand, blockHitResult);
     }
 
+    private static int resolveToolHitIndex(BlockHitResult blockHitResult, Direction stateFacing) {
+        double hx = blockHitResult.getLocation().x;
+        double hz = blockHitResult.getLocation().z;
+        switch (stateFacing) {
+            case NORTH -> {
+                hx = 1f - blockHitResult.getLocation().x;
+                hz = 1f - blockHitResult.getLocation().z;
+            }
+//                    case SOUTH: hx = hitX; hz = hitZ; break;
+            case WEST -> {
+                hz = 1f - blockHitResult.getLocation().x;
+                hx = blockHitResult.getLocation().z;
+            }
+            case EAST -> {
+                hz = blockHitResult.getLocation().x;
+                hx = 1f - blockHitResult.getLocation().z;
+            }
+        }
+        int index = -1;
+        if (hx < 0.5f && hz < 0.5f) {
+            index = 1;
+        } else if (hx >= 0.5f && hz < 0.5f) {
+            index = 0;
+        } else if (hx < 0.5f && hz >= 0.5f) {
+            index = 3;
+        } else if (hx >= 0.5f && hz >= 0.5f) {
+            index = 2;
+        }
+        return index;
+    }
+
     @Override
     public InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult rayTraceResult) {
         final var blockEntity = level.getBlockEntity(pos);

common/src/main/java/net/blay09/mods/cookingforblockheads/block/SinkBlock.java

@@ -157,9 +157,8 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
         return new SinkBlockEntity(pos, state);
     }
 
-    @Nullable
     @Override
-    public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, BlockState state, BlockEntityType<T> type) {
+    public <T extends BlockEntity> @Nullable BlockEntityTicker<T> getTicker(Level level, BlockState state, BlockEntityType<T> type) {
         return level.isClientSide() ? null : createTickerHelper(type, ModBlockEntities.sink.value(), SinkBlockEntity::serverTick);
     }