Add @nonnull annotations across project files for improved null-safety.

Author: Ale32bit

common/src/main/java/me/alexdevs/classicPeripherals/ClassicPeripherals.java

@@ -11,12 +11,9 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.item.CreativeModeTab;
 import org.jetbrains.annotations.Nullable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class ClassicPeripherals {
     public static final String MOD_ID = "classicperipherals";
-    public static final Logger LOG = LoggerFactory.getLogger("Classic Peripherals");
 
     public static final ClassicPeripheralsConfig CONFIG = ClassicPeripheralsConfig.createToml(
             Services.PLATFORM.getConfigDir(),

common/src/main/java/me/alexdevs/classicPeripherals/client/screen/ScannerScreen.java

@@ -7,6 +7,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Inventory;
+import org.jspecify.annotations.NonNull;
 
 public class ScannerScreen extends AbstractContainerScreen<ScannerMenu> {
     private static final ResourceLocation TEXTURE = ResourceLocation.fromNamespaceAndPath(ClassicPeripherals.MOD_ID, "textures/gui/scanner.png");
@@ -25,7 +26,7 @@ protected void renderBg(GuiGraphics graphics, float delta, int mouseX, int mouse
     }
 
     @Override
-    public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
+    public void render(@NonNull GuiGraphics graphics, int mouseX, int mouseY, float delta) {
         this.renderBackground(graphics, mouseX, mouseY, delta);
         super.render(graphics, mouseX, mouseY, delta);
         this.renderTooltip(graphics, mouseX, mouseY);

common/src/main/java/me/alexdevs/classicPeripherals/core/ItemDataHandler.java

@@ -32,19 +32,18 @@ private static void setData(UUID id, ItemData data) {
     }
 
     public static Optional<UUID> getId(ItemStack stack) {
-        var uuid = stack.getOrDefault(ModRegistry.DataComponents.DATAHOLDER_UUID.get(), null);
+        var uuid = stack.get(ModRegistry.DataComponents.DATAHOLDER_UUID.get());
         return Optional.ofNullable(uuid);
 
     }
 
     public static UUID getOrCreateId(ItemStack stack) {
-        var uuid = getId(stack).orElseGet(() -> {
+
+        return getId(stack).orElseGet(() -> {
             var id = UUID.randomUUID();
             stack.set(ModRegistry.DataComponents.DATAHOLDER_UUID.get(), id);
             return id;
         });
-
-        return uuid;
     }
 
     public static Optional<String> getData(ItemStack stack) {
@@ -130,14 +129,14 @@ public static void setPrivateKey(ItemStack stack, String privateKey) {
         }
     }
 
-    static boolean tryMigrate(ItemStack stack) {
+    static void tryMigrate(ItemStack stack) {
         if (stack.has(ModRegistry.DataComponents.DATAHOLDER_UUID.get())) {
-            return false;
+            return;
         }
 
         var legacyData = DataItemData.migrate(stack);
         if (legacyData.isEmpty()) {
-            return false;
+            return;
         }
 
         var data = getData(legacyData.get().uuid());
@@ -151,7 +150,6 @@ static boolean tryMigrate(ItemStack stack) {
         ItemDataHandler.setReadOnly(stack, legacyData.get().readonly());
         ItemDataHandler.setColor(stack, legacyData.get().color());
 
-        return true;
     }
 
     record DataItemData(UUID uuid, String data, boolean readonly, int color, @Nullable String privateKey) {

common/src/main/java/me/alexdevs/classicPeripherals/datagen/generators/LanguageGenerator.java

@@ -9,6 +9,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
+import org.jspecify.annotations.NonNull;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -55,15 +56,15 @@ private void add(Item item, String value) {
     }
 
     @Override
-    public CompletableFuture<?> run(CachedOutput cache) {
+    public @NonNull CompletableFuture<?> run(@NonNull CachedOutput cache) {
         var json = new JsonObject();
         translations.forEach(json::addProperty);
         return DataProvider.saveStable(cache, json,
                 pathProvider.json(ResourceLocation.fromNamespaceAndPath(ClassicPeripherals.MOD_ID, "en_us")));
     }
 
     @Override
-    public String getName() {
+    public @NonNull String getName() {
         return "Languages";
     }
 }

common/src/main/java/me/alexdevs/classicPeripherals/datagen/generators/LootTableGenerator.java

@@ -12,19 +12,17 @@
 import net.minecraft.world.level.storage.loot.functions.ApplyExplosionDecay;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
 import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
+import org.jspecify.annotations.NonNull;
 
 import java.util.function.BiConsumer;
 
 public class LootTableGenerator implements LootTableSubProvider {
-    @SuppressWarnings("unused")
-    private final HolderLookup.Provider registries;
 
-    public LootTableGenerator(HolderLookup.Provider registries) {
-        this.registries = registries;
+    public LootTableGenerator(HolderLookup.Provider ignoredRegistries) {
     }
 
     @Override
-    public void generate(BiConsumer<ResourceKey<net.minecraft.world.level.storage.loot.LootTable>, LootTable.Builder> output) {
+    public void generate(@NonNull BiConsumer<ResourceKey<net.minecraft.world.level.storage.loot.LootTable>, LootTable.Builder> output) {
         dropSelf(output, ModRegistry.Blocks.TOWER_BASE);
         dropSelf(output, ModRegistry.Blocks.TOWER_SEGMENT);
         dropSelf(output, ModRegistry.Blocks.TOWER_HEAD);

common/src/main/java/me/alexdevs/classicPeripherals/datagen/generators/PocketUpgradeGenerator.java

@@ -30,9 +30,7 @@ public static void addUpgrades(BootstrapContext<IPocketUpgrade> upgrades) {
     }
 
     public static CompletableFuture<RegistrySetBuilder.PatchedRegistries> makeUpgradeRegistry(CompletableFuture<HolderLookup.Provider> registries) {
-        return RegistryPatchGenerator.createLookup(registries, Util.make(new RegistrySetBuilder(), builder -> {
-            builder.add(IPocketUpgrade.REGISTRY, PocketUpgradeGenerator::addUpgrades);
-        }));
+        return RegistryPatchGenerator.createLookup(registries, Util.make(new RegistrySetBuilder(), builder -> builder.add(IPocketUpgrade.REGISTRY, PocketUpgradeGenerator::addUpgrades)));
     }
 
     public static ResourceKey<IPocketUpgrade> id(ResourceLocation id) {

common/src/main/java/me/alexdevs/classicPeripherals/datagen/generators/RecipeGenerator.java

@@ -9,6 +9,7 @@
 import net.minecraft.data.recipes.*;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.world.item.Items;
+import org.jspecify.annotations.NonNull;
 
 import java.util.concurrent.CompletableFuture;
 
@@ -19,7 +20,7 @@ public RecipeGenerator(PackOutput output, CompletableFuture<HolderLookup.Provide
     }
 
     @Override
-    public void buildRecipes(RecipeOutput output) {
+    public void buildRecipes(@NonNull RecipeOutput output) {
 
         ShapedRecipeBuilder.shaped(RecipeCategory.REDSTONE, me.alexdevs.classicPeripherals.registry.ModRegistry.Blocks.TOWER_BASE.get())
                 .pattern("ici")

common/src/main/java/me/alexdevs/classicPeripherals/datagen/generators/TagGenerator.java

@@ -9,6 +9,7 @@
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.Block;
+import org.jspecify.annotations.NonNull;
 
 import java.util.concurrent.CompletableFuture;
 
@@ -18,7 +19,7 @@ public TagGenerator(PackOutput output, CompletableFuture<HolderLookup.Provider>
     }
 
     @Override
-    protected void addTags(HolderLookup.Provider provider) {
+    protected void addTags(HolderLookup.@NonNull Provider provider) {
         tag(BlockTags.MINEABLE_WITH_PICKAXE)
                 .add(key(ModRegistry.Blocks.TOWER_BASE), key(ModRegistry.Blocks.TOWER_SEGMENT), key(ModRegistry.Blocks.TOWER_HEAD), key(ModRegistry.Blocks.ANTENNA))
                 .add(key(ModRegistry.Blocks.NFC_READER), key(ModRegistry.Blocks.RFID_SCANNER), key(ModRegistry.Blocks.CRYPTOGRAPHIC_ACCELERATOR), key(ModRegistry.Blocks.SCANNER));

common/src/main/java/me/alexdevs/classicPeripherals/datagen/generators/TurtleUpgradeGenerator.java

@@ -31,9 +31,7 @@ public static void addUpgrades(BootstrapContext<ITurtleUpgrade> upgrades) {
 
     // Set up the dynamic registries to contain our turtle upgrades.
     public static CompletableFuture<RegistrySetBuilder.PatchedRegistries> makeUpgradeRegistry(CompletableFuture<HolderLookup.Provider> registries) {
-        return RegistryPatchGenerator.createLookup(registries, Util.make(new RegistrySetBuilder(), builder -> {
-            builder.add(ITurtleUpgrade.REGISTRY, TurtleUpgradeGenerator::addUpgrades);
-        }));
+        return RegistryPatchGenerator.createLookup(registries, Util.make(new RegistrySetBuilder(), builder -> builder.add(ITurtleUpgrade.REGISTRY, TurtleUpgradeGenerator::addUpgrades)));
     }
 
     private static ResourceLocation id(String path) {

common/src/main/java/me/alexdevs/classicPeripherals/registry/block/AbstractRadioBlock.java

@@ -7,19 +7,20 @@
 import net.minecraft.world.level.block.RenderShape;
 import net.minecraft.world.level.block.state.BlockState;
 import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NonNull;
 
 public abstract class AbstractRadioBlock extends BaseEntityBlock {
     protected AbstractRadioBlock(Properties properties) {
         super(properties);
     }
 
     @Override
-    public @NotNull RenderShape getRenderShape(BlockState state) {
+    public @NotNull RenderShape getRenderShape(@NonNull BlockState state) {
         return RenderShape.MODEL;
     }
 
     @Override
-    public void onPlace(BlockState blockState, Level level, BlockPos blockPos, BlockState blockState2, boolean bl) {
+    public void onPlace(@NonNull BlockState blockState, @NonNull Level level, @NonNull BlockPos blockPos, @NonNull BlockState blockState2, boolean bl) {
         super.onPlace(blockState, level, blockPos, blockState2, bl);
 
         var be = level.getBlockEntity(blockPos);
@@ -29,7 +30,7 @@ public void onPlace(BlockState blockState, Level level, BlockPos blockPos, Block
     }
 
     @Override
-    public void onRemove(BlockState blockState, Level level, BlockPos blockPos, BlockState blockState2, boolean bl) {
+    public void onRemove(@NonNull BlockState blockState, Level level, @NonNull BlockPos blockPos, @NonNull BlockState blockState2, boolean bl) {
         var be = level.getBlockEntity(blockPos);
         if (be instanceof AbstractRadioBlockEntity base) {
             base.invalidate();