refactor: Fix nullability problems

Author: BlayTheNinth

common/src/main/java/net/blay09/mods/netherportalfix/ReturnPortal.java

@@ -4,20 +4,5 @@
 
 import java.util.UUID;
 
-public class ReturnPortal {
-    private final UUID uid;
-    private final BlockPos pos;
-
-    public ReturnPortal(UUID uid, BlockPos pos) {
-        this.uid = uid;
-        this.pos = pos;
-    }
-
-    public UUID getUid() {
-        return uid;
-    }
-
-    public BlockPos getPos() {
-        return pos;
-    }
+public record ReturnPortal(UUID uid, BlockPos pos) {
 }

common/src/main/java/net/blay09/mods/netherportalfix/ReturnPortalManager.java

@@ -29,7 +29,7 @@ public class ReturnPortalManager {
     private static final String FROM_POS = "FromPos";
     private static final String TO_POS = "ToPos";
 
-    public static BlockPos findPortalAt(Player player, ResourceKey<Level> dim, BlockPos pos) {
+    public static @Nullable BlockPos findPortalAt(Player player, ResourceKey<Level> dim, BlockPos pos) {
         MinecraftServer server = player.level().getServer();
         if (server != null) {
             ServerLevel fromWorld = server.getLevel(dim);
@@ -94,7 +94,7 @@ public static void removeReturnPortal(ServerPlayer player, ReturnPortal portal)
         for (int i = 0; i < portalList.size(); i++) {
             CompoundTag entry = (CompoundTag) portalList.get(i);
 
-            if (entry.read(RETURN_PORTAL_UID, UUIDUtil.CODEC).map(it -> it.equals(portal.getUid())).orElse(false)) {
+            if (entry.read(RETURN_PORTAL_UID, UUIDUtil.CODEC).map(it -> it.equals(portal.uid())).orElse(false)) {
                 portalList.remove(i);
                 break;
             }

common/src/main/java/net/blay09/mods/netherportalfix/mixin/LivingEntityAccessor.java

@@ -1,14 +1,14 @@
 package net.blay09.mods.netherportalfix.mixin;
 
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
+import org.jspecify.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(LivingEntity.class)
 public interface LivingEntityAccessor {
 
     @Accessor
-    BlockPos getLastPos();
+    @Nullable BlockPos getLastPos();
 }

common/src/main/java/net/blay09/mods/netherportalfix/mixin/NetherPortalBlockMixin.java

@@ -19,6 +19,7 @@
 @Mixin(NetherPortalBlock.class)
 public class NetherPortalBlockMixin {
 
+    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
     @ModifyExpressionValue(method = "getExitPortal(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;ZLnet/minecraft/world/level/border/WorldBorder;)Lnet/minecraft/world/level/portal/TeleportTransition;", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/portal/PortalForcer;findClosestPortalPosition(Lnet/minecraft/core/BlockPos;ZLnet/minecraft/world/level/border/WorldBorder;)Ljava/util/Optional;"))
     public Optional<BlockPos> getExitPortal(Optional<BlockPos> original, ServerLevel level, Entity entity) {
         final var fromPos = entity.blockPosition();
@@ -31,15 +32,15 @@ public Optional<BlockPos> getExitPortal(Optional<BlockPos> original, ServerLevel
             return original;
         }
 
-        if (!level.getBlockState(returnPortal.getPos()).is(Blocks.NETHER_PORTAL)) {
+        if (!level.getBlockState(returnPortal.pos()).is(Blocks.NETHER_PORTAL)) {
             if (entity instanceof ServerPlayer) {
                 NetherPortalFix.logger.info("Return portal is no longer valid");
             }
             return original;
         }
 
         NetherPortalFix.logger.debug("Return portal found, redirecting! :)");
-        return Optional.of(returnPortal.getPos());
+        return Optional.of(returnPortal.pos());
     }
 
 }

fabric/src/main/java/net/blay09/mods/netherportalfix/fabric/mixin/package-info.java

@@ -0,0 +1,4 @@
+@NullMarked
+package net.blay09.mods.netherportalfix.fabric.mixin;
+
+import org.jspecify.annotations.NullMarked;

fabric/src/main/resources/fabric.mod.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "id": "${mod_id}",
+  "id": "netherportalfix",
   "version": "${version}",
 
   "name": "${mod_name}",
@@ -15,7 +15,7 @@
   },
 
   "license": "${license}",
-  "icon": "${mod_id}.png",
+  "icon": "netherportalfix.png",
 
   "environment": "*",
   "entrypoints": {

forge/src/main/resources/META-INF/mods.toml

@@ -3,27 +3,27 @@ loaderVersion="*"
 license="${license}"
 issueTrackerURL="${issues}"
 [[mods]]
-modId="${mod_id}"
+modId="netherportalfix"
 version="${version}"
 displayName="${mod_name}"
 displayURL="${homepage}"
-logoFile="${mod_id}.png"
+logoFile="netherportalfix.png"
 credits="BlayTheNinth"
 authors="BlayTheNinth"
 description='''${description}'''
-[[dependencies.${mod_id}]]
+[[dependencies.netherportalfix]]
     modId="forge"
     mandatory=true
     versionRange="[${forge_version},)"
     ordering="NONE"
     side="BOTH"
-[[dependencies.${mod_id}]]
+[[dependencies.netherportalfix]]
     modId="minecraft"
     mandatory=true
     versionRange="[${minecraft_version},)"
     ordering="NONE"
     side="BOTH"
-[[dependencies.${mod_id}]]
+[[dependencies.netherportalfix]]
     modId="balm"
     mandatory=true
     versionRange="[${balm_version},)"

…erportalfix/NeoForgeNetherPortalFix.java …ix/neoforge/NeoForgeNetherPortalFix.javaneoforge/src/main/java/net/blay09/mods/netherportalfix/NeoForgeNetherPortalFix.java renamed to neoforge/src/main/java/net/blay09/mods/netherportalfix/neoforge/NeoForgeNetherPortalFix.java neoforge/src/main/java/net/blay09/mods/netherportalfix/NeoForgeNetherPortalFix.java renamed to neoforge/src/main/java/net/blay09/mods/netherportalfix/neoforge/NeoForgeNetherPortalFix.java

@@ -1,7 +1,8 @@
-package net.blay09.mods.netherportalfix;
+package net.blay09.mods.netherportalfix.neoforge;
 
 import net.blay09.mods.balm.Balm;
 import net.blay09.mods.balm.neoforge.platform.runtime.NeoForgeLoadContext;
+import net.blay09.mods.netherportalfix.NetherPortalFix;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.ModContainer;
 import net.neoforged.fml.common.Mod;

neoforge/src/main/java/net/blay09/mods/netherportalfix/neoforge/mixin/package-info.java

@@ -0,0 +1,4 @@
+@NullMarked
+package net.blay09.mods.netherportalfix.neoforge.mixin;
+
+import org.jspecify.annotations.NullMarked;

…9/mods/netherportalfix/package-info.java …therportalfix/neoforge/package-info.javaneoforge/src/main/java/net/blay09/mods/netherportalfix/package-info.java renamed to neoforge/src/main/java/net/blay09/mods/netherportalfix/neoforge/package-info.java neoforge/src/main/java/net/blay09/mods/netherportalfix/package-info.java renamed to neoforge/src/main/java/net/blay09/mods/netherportalfix/neoforge/package-info.java

@@ -1,4 +1,4 @@
 @NullMarked
-package net.blay09.mods.netherportalfix;
+package net.blay09.mods.netherportalfix.neoforge;
 
 import org.jspecify.annotations.NullMarked;