Add @nonnull annotations and minor code cleanup in core and peripheral files.

Author: Ale32bit

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

@@ -7,6 +7,7 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.saveddata.SavedData;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Map;
 import java.util.Optional;
@@ -62,7 +63,7 @@ public static StateSaverAndLoader getServerState(MinecraftServer server) {
     }
 
     @Override
-    public CompoundTag save(CompoundTag nbt, HolderLookup.Provider registries) {
+    public @NonNull CompoundTag save(@NonNull CompoundTag nbt, HolderLookup.@NonNull Provider registries) {
         var cardDataMap = new CompoundTag();
         for (var entry : data.entrySet()) {
             CompoundTag cardDataItem = new CompoundTag();
@@ -88,9 +89,4 @@ public void setData(UUID id, DataHolderHandler.ItemData data) {
         this.data.put(id, data);
         this.setDirty(true);
     }
-
-    public void removeData(UUID id) {
-        this.data.remove(id);
-        this.setDirty(true);
-    }
 }

common/src/main/java/me/alexdevs/classicPeripherals/mixin/ItemMixin.java

@@ -23,7 +23,7 @@ public abstract class ItemMixin {
     @Inject(method = "interactLivingEntity", at = @At("HEAD"), cancellable = true)
     private void classicperipherals$pocketInteractPlayer(ItemStack stack, Player source, LivingEntity target, InteractionHand usedHand, CallbackInfoReturnable<InteractionResult> cir) {
         var self = (Item) (Object) this;
-        if (!(self instanceof PocketComputerItem pocketItem)) {
+        if (!(self instanceof PocketComputerItem)) {
             return;
         }
 

common/src/main/java/me/alexdevs/classicPeripherals/peripherals/rfid/RfidScannerPeripheral.java

@@ -7,6 +7,7 @@
 import dan200.computercraft.api.peripheral.IComputerAccess;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import net.minecraft.world.phys.Vec3;
+import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
 import java.util.HashMap;
@@ -22,7 +23,7 @@ public RfidScannerPeripheral(RfidScannerBlockEntity rfidScanner) {
     }
 
     @Override
-    public String getType() {
+    public @NonNull String getType() {
         return "rfid_scanner";
     }
 
@@ -32,12 +33,12 @@ public boolean equals(@Nullable IPeripheral other) {
     }
 
     @Override
-    public void attach(IComputerAccess computer) {
+    public void attach(@NonNull IComputerAccess computer) {
         computers.add(computer);
     }
 
     @Override
-    public void detach(IComputerAccess computer) {
+    public void detach(@NonNull IComputerAccess computer) {
         computers.remove(computer);
     }