Nullability

shartte · shartte · commit 70005cf45214 · 2025-12-28T14:38:01.000+01:00
diff --git a/src/main/java/dev/technici4n/moderndynamics/MdBlock.java b/src/main/java/dev/technici4n/moderndynamics/MdBlock.java
@@ -26,7 +26,7 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class MdBlock extends Block implements EntityBlock {
 
diff --git a/src/main/java/dev/technici4n/moderndynamics/attachment/attached/AttachedAttachment.java b/src/main/java/dev/technici4n/moderndynamics/attachment/attached/AttachedAttachment.java
@@ -32,7 +32,7 @@
 import net.minecraft.world.level.storage.ValueInput;
 import net.minecraft.world.level.storage.ValueOutput;
 import org.jetbrains.annotations.MustBeInvokedByOverriders;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Base interface for an active attachment on a pipe.
diff --git a/src/main/java/dev/technici4n/moderndynamics/attachment/attached/FluidAttachedIo.java b/src/main/java/dev/technici4n/moderndynamics/attachment/attached/FluidAttachedIo.java
@@ -36,7 +36,7 @@
 import net.minecraft.world.level.storage.ValueInput;
 import net.minecraft.world.level.storage.ValueOutput;
 import net.neoforged.neoforge.transfer.fluid.FluidResource;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 // TODO: also allow nbt filtering
 public class FluidAttachedIo extends AttachedIo {
diff --git a/src/main/java/dev/technici4n/moderndynamics/attachment/attached/ItemAttachedIo.java b/src/main/java/dev/technici4n/moderndynamics/attachment/attached/ItemAttachedIo.java
@@ -54,7 +54,7 @@
 import net.neoforged.neoforge.transfer.ResourceHandlerUtil;
 import net.neoforged.neoforge.transfer.item.ItemResource;
 import net.neoforged.neoforge.transfer.transaction.Transaction;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class ItemAttachedIo extends AttachedIo {
 
diff --git a/src/main/java/dev/technici4n/moderndynamics/attachment/attached/ItemCachedFilter.java b/src/main/java/dev/technici4n/moderndynamics/attachment/attached/ItemCachedFilter.java
@@ -32,7 +32,7 @@
 import net.minecraft.world.item.Item;
 import net.neoforged.neoforge.transfer.fluid.FluidResource;
 import net.neoforged.neoforge.transfer.item.ItemResource;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public final class ItemCachedFilter {
     private final Set<ItemResource> listedResources;
diff --git a/src/main/java/dev/technici4n/moderndynamics/attachment/upgrade/LoadedUpgrades.java b/src/main/java/dev/technici4n/moderndynamics/attachment/upgrade/LoadedUpgrades.java
@@ -30,7 +30,7 @@
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.players.PlayerList;
 import net.minecraft.world.item.Item;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class LoadedUpgrades {
     private static LoadedUpgrades holder = new LoadedUpgrades(Map.of(), List.of());
diff --git a/src/main/java/dev/technici4n/moderndynamics/client/screen/ItemAttachedIoScreen.java b/src/main/java/dev/technici4n/moderndynamics/client/screen/ItemAttachedIoScreen.java
@@ -28,7 +28,7 @@
 import net.minecraft.client.renderer.Rect2i;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class ItemAttachedIoScreen extends AttachedIoScreen<ItemAttachedIoMenu> {
     @Nullable
diff --git a/src/main/java/dev/technici4n/moderndynamics/compat/jade/ItemPipeServerProvider.java b/src/main/java/dev/technici4n/moderndynamics/compat/jade/ItemPipeServerProvider.java
@@ -36,7 +36,7 @@
 import net.minecraft.resources.Identifier;
 import net.minecraft.world.item.ItemStack;
 import net.neoforged.neoforge.transfer.item.ItemResource;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 import snownee.jade.api.Accessor;
 import snownee.jade.api.view.ClientViewGroup;
 import snownee.jade.api.view.IClientExtensionProvider;
diff --git a/src/main/java/dev/technici4n/moderndynamics/extender/MachineExtenderBlock.java b/src/main/java/dev/technici4n/moderndynamics/extender/MachineExtenderBlock.java
@@ -34,7 +34,7 @@
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.material.MapColor;
 import net.minecraft.world.level.redstone.Orientation;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class MachineExtenderBlock extends MdBlock {
     private static final ScopedValue<?> SIGNAL_FORWARDING = ScopedValue.newInstance();
diff --git a/src/main/java/dev/technici4n/moderndynamics/extender/MachineExtenderBlockEntity.java b/src/main/java/dev/technici4n/moderndynamics/extender/MachineExtenderBlockEntity.java
@@ -30,7 +30,7 @@
 import net.neoforged.neoforge.capabilities.BlockCapabilityCache;
 import net.neoforged.neoforge.capabilities.ICapabilityInvalidationListener;
 import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class MachineExtenderBlockEntity extends MdBlockEntity {
     private static int registeredApis = 0;
diff --git a/src/main/java/dev/technici4n/moderndynamics/model/PipeModelData.java b/src/main/java/dev/technici4n/moderndynamics/model/PipeModelData.java
@@ -20,7 +20,7 @@
 
 import dev.technici4n.moderndynamics.attachment.attached.AttachedAttachment;
 import net.neoforged.neoforge.model.data.ModelProperty;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public record PipeModelData(byte pipeConnections, byte inventoryConnections,
         @Nullable AttachmentModelData[] attachments) {
diff --git a/src/main/java/dev/technici4n/moderndynamics/network/HostAdjacentCaps.java b/src/main/java/dev/technici4n/moderndynamics/network/HostAdjacentCaps.java
@@ -23,7 +23,7 @@
 import net.minecraft.server.level.ServerLevel;
 import net.neoforged.neoforge.capabilities.BlockCapability;
 import net.neoforged.neoforge.capabilities.BlockCapabilityCache;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Helper class to track capability caches for all 6 adjacent sides of a host,
diff --git a/src/main/java/dev/technici4n/moderndynamics/network/NetworkManager.java b/src/main/java/dev/technici4n/moderndynamics/network/NetworkManager.java
@@ -23,7 +23,7 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.server.level.ServerLevel;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * The manager of all networks for a given cache class.
diff --git a/src/main/java/dev/technici4n/moderndynamics/network/NodeHost.java b/src/main/java/dev/technici4n/moderndynamics/network/NodeHost.java
@@ -39,7 +39,7 @@
 import net.minecraft.world.level.storage.ValueOutput;
 import net.neoforged.neoforge.capabilities.BlockCapability;
 import org.jetbrains.annotations.MustBeInvokedByOverriders;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A node host is what gives its behavior to a {@link NetworkNode}.
diff --git a/src/main/java/dev/technici4n/moderndynamics/network/energy/EnergyHost.java b/src/main/java/dev/technici4n/moderndynamics/network/energy/EnergyHost.java
@@ -35,7 +35,7 @@
 import net.neoforged.neoforge.transfer.energy.DelegatingEnergyHandler;
 import net.neoforged.neoforge.transfer.energy.EnergyHandler;
 import net.neoforged.neoforge.transfer.transaction.TransactionContext;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class EnergyHost extends NodeHost {
     private static final NetworkManager<EnergyHost, EnergyCache> MANAGER = NetworkManager.get(EnergyCache.class, EnergyCache::new);
diff --git a/src/main/java/dev/technici4n/moderndynamics/network/fluid/ConnectedFluidStorage.java b/src/main/java/dev/technici4n/moderndynamics/network/fluid/ConnectedFluidStorage.java
@@ -23,7 +23,7 @@
 import java.util.function.Function;
 import net.neoforged.neoforge.transfer.ResourceHandler;
 import net.neoforged.neoforge.transfer.fluid.FluidResource;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public record ConnectedFluidStorage(
         ResourceHandler<FluidResource> storage,
diff --git a/src/main/java/dev/technici4n/moderndynamics/network/fluid/FluidCache.java b/src/main/java/dev/technici4n/moderndynamics/network/fluid/FluidCache.java
@@ -40,7 +40,6 @@
 import net.neoforged.neoforge.transfer.transaction.SnapshotJournal;
 import net.neoforged.neoforge.transfer.transaction.Transaction;
 import net.neoforged.neoforge.transfer.transaction.TransactionContext;
-import org.jetbrains.annotations.NotNull;
 
 public class FluidCache extends NetworkCache<FluidHost, FluidCache> {
     private FluidCacheStorage fluidStorage = null;
@@ -325,7 +324,7 @@ public int size() {
         }
 
         @Override
-        public @NotNull FluidResource getResource(int index) {
+        public FluidResource getResource(int index) {
             Objects.checkIndex(index, 1);
             return resource;
         }
@@ -343,7 +342,7 @@ public long getCapacityAsLong(int index, FluidResource resource) {
         }
 
         @Override
-        public boolean isValid(int index, @NotNull FluidResource resource) {
+        public boolean isValid(int index, FluidResource resource) {
             Objects.checkIndex(index, 1);
             return this.resource.equals(resource) || (this.resource.isEmpty() && canChangeResource());
         }
diff --git a/src/main/java/dev/technici4n/moderndynamics/network/fluid/FluidHost.java b/src/main/java/dev/technici4n/moderndynamics/network/fluid/FluidHost.java
@@ -43,7 +43,7 @@
 import net.neoforged.neoforge.transfer.ResourceHandler;
 import net.neoforged.neoforge.transfer.fluid.FluidResource;
 import net.neoforged.neoforge.transfer.transaction.TransactionContext;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class FluidHost extends NodeHost {
     private static final NetworkManager<FluidHost, FluidCache> MANAGER = NetworkManager.get(FluidCache.class, FluidCache::new);
diff --git a/src/main/java/dev/technici4n/moderndynamics/network/item/ItemCache.java b/src/main/java/dev/technici4n/moderndynamics/network/item/ItemCache.java
@@ -27,7 +27,7 @@
 import net.neoforged.neoforge.transfer.TransferPreconditions;
 import net.neoforged.neoforge.transfer.item.ItemResource;
 import net.neoforged.neoforge.transfer.transaction.TransactionContext;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class ItemCache extends NetworkCache<ItemHost, ItemCache> {
     private boolean inserting = false;
diff --git a/src/main/java/dev/technici4n/moderndynamics/network/item/ItemHost.java b/src/main/java/dev/technici4n/moderndynamics/network/item/ItemHost.java
@@ -54,7 +54,7 @@
 import net.neoforged.neoforge.transfer.ResourceHandlerUtil;
 import net.neoforged.neoforge.transfer.item.ItemResource;
 import net.neoforged.neoforge.transfer.transaction.Transaction;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class ItemHost extends NodeHost {
     public static final NetworkManager<ItemHost, ItemCache> MANAGER = NetworkManager.get(ItemCache.class, ItemCache::new);
diff --git a/src/main/java/dev/technici4n/moderndynamics/network/item/ItemPath.java b/src/main/java/dev/technici4n/moderndynamics/network/item/ItemPath.java
@@ -28,7 +28,7 @@
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.Level;
 import net.neoforged.neoforge.transfer.item.ItemResource;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class ItemPath {
     /**
diff --git a/src/main/java/dev/technici4n/moderndynamics/network/item/SimulatedInsertionTarget.java b/src/main/java/dev/technici4n/moderndynamics/network/item/SimulatedInsertionTarget.java
@@ -34,7 +34,7 @@
 import net.neoforged.neoforge.transfer.transaction.SnapshotJournal;
 import net.neoforged.neoforge.transfer.transaction.Transaction;
 import net.neoforged.neoforge.transfer.transaction.TransactionContext;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 // TODO: needs to support recursive queries if filters are being used.
 public class SimulatedInsertionTarget {
diff --git a/src/main/java/dev/technici4n/moderndynamics/network/mienergy/MIEnergyHost.java b/src/main/java/dev/technici4n/moderndynamics/network/mienergy/MIEnergyHost.java
@@ -31,7 +31,7 @@
 import net.minecraft.world.level.storage.ValueOutput;
 import net.neoforged.neoforge.capabilities.BlockCapability;
 import net.neoforged.neoforge.transfer.energy.EnergyHandler;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class MIEnergyHost extends NodeHost {
     private static final NetworkManager<MIEnergyHost, MIEnergyCache> MANAGER = NetworkManager.get(MIEnergyCache.class, MIEnergyCache::new);
diff --git a/src/main/java/dev/technici4n/moderndynamics/pipe/PipeBlock.java b/src/main/java/dev/technici4n/moderndynamics/pipe/PipeBlock.java
@@ -52,7 +52,7 @@
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class PipeBlock extends MdBlock implements EntityBlock, SimpleWaterloggedBlock {
     private static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
diff --git a/src/main/java/dev/technici4n/moderndynamics/pipe/PipeBlockEntity.java b/src/main/java/dev/technici4n/moderndynamics/pipe/PipeBlockEntity.java
@@ -50,9 +50,8 @@
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.neoforged.neoforge.capabilities.BlockCapability;
 import net.neoforged.neoforge.model.data.ModelData;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.UnknownNullability;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Abstract base BE class for all pipes.
@@ -190,7 +189,7 @@ public void fromClientTag(@UnknownNullability ValueInput input) {
     }
 
     @Override
-    public @NotNull ModelData getModelData() {
+    public ModelData getModelData() {
         return clientModelData;
     }
 
diff --git a/src/main/java/dev/technici4n/moderndynamics/test/MachineExtenderTest.java b/src/main/java/dev/technici4n/moderndynamics/test/MachineExtenderTest.java
@@ -1,7 +1,26 @@
+/*
+ * Modern Dynamics
+ * Copyright (C) 2021 shartte & Technici4n
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
 package dev.technici4n.moderndynamics.test;
 
 import dev.technici4n.moderndynamics.init.MdBlocks;
 import dev.technici4n.moderndynamics.test.framework.MdGameTestHelper;
+import java.util.List;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.item.Items;
@@ -11,8 +30,6 @@
 import net.neoforged.neoforge.transfer.item.ItemResource;
 import net.neoforged.neoforge.transfer.transaction.Transaction;
 
-import java.util.List;
-
 public class MachineExtenderTest {
     @MdGameTest
     public void testForwardWeakSignal(MdGameTestHelper helper) {
diff --git a/src/main/java/dev/technici4n/moderndynamics/thirdparty/fabric/GeometryHelper.java b/src/main/java/dev/technici4n/moderndynamics/thirdparty/fabric/GeometryHelper.java
@@ -39,7 +39,6 @@
 import net.minecraft.core.Direction;
 import net.minecraft.core.Direction.Axis;
 import net.minecraft.core.Direction.AxisDirection;
-import org.jetbrains.annotations.NotNull;
 import org.joml.Vector3f;
 
 /**
@@ -133,7 +132,7 @@ public static boolean isParallelQuadOnFace(Direction lightFace, QuadView quad) {
      *
      * @param lightFace MUST be non-null.
      */
-    public static boolean isQuadCubic(@NotNull Direction lightFace, QuadView quad) {
+    public static boolean isQuadCubic(Direction lightFace, QuadView quad) {
         if (lightFace == null) {
             return false;
         }
diff --git a/src/main/java/dev/technici4n/moderndynamics/thirdparty/fabric/MutableQuadView.java b/src/main/java/dev/technici4n/moderndynamics/thirdparty/fabric/MutableQuadView.java
@@ -37,9 +37,9 @@
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.core.Direction;
-import org.jetbrains.annotations.Nullable;
 import org.joml.Vector2f;
 import org.joml.Vector3f;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A mutable {@link QuadView} instance. The base interface for {@link QuadEmitter} and for dynamic renders/mesh
diff --git a/src/main/java/dev/technici4n/moderndynamics/thirdparty/fabric/MutableQuadViewImpl.java b/src/main/java/dev/technici4n/moderndynamics/thirdparty/fabric/MutableQuadViewImpl.java
@@ -46,7 +46,7 @@
 
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.core.Direction;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Almost-concrete implementation of a mutable quad. The only missing part is {@link #emit()}, because that depends on
diff --git a/src/main/java/dev/technici4n/moderndynamics/thirdparty/fabric/NormalHelper.java b/src/main/java/dev/technici4n/moderndynamics/thirdparty/fabric/NormalHelper.java
@@ -36,7 +36,6 @@
 import net.minecraft.core.Direction;
 import net.minecraft.core.Vec3i;
 import net.minecraft.util.Mth;
-import org.jetbrains.annotations.NotNull;
 import org.joml.Vector3f;
 
 /**
@@ -87,7 +86,7 @@ public static float getPackedNormalComponent(int packedNormal, int component) {
      * Will work with triangles also. Assumes counter-clockwise winding order, which is the norm. Expects convex quads
      * with all points co-planar.
      */
-    public static void computeFaceNormal(@NotNull Vector3f saveTo, QuadView q) {
+    public static void computeFaceNormal(Vector3f saveTo, QuadView q) {
         final Direction nominalFace = q.nominalFace();
 
         if (GeometryHelper.isQuadParallelToFace(nominalFace, q)) {
diff --git a/src/main/java/dev/technici4n/moderndynamics/thirdparty/fabric/QuadView.java b/src/main/java/dev/technici4n/moderndynamics/thirdparty/fabric/QuadView.java
@@ -40,10 +40,9 @@
 import net.minecraft.core.Direction;
 import net.neoforged.neoforge.client.model.quad.BakedColors;
 import net.neoforged.neoforge.client.model.quad.BakedNormals;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.joml.Vector2f;
 import org.joml.Vector3f;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Interface for reading quad data encoded by {@link MeshBuilder}. Enables models to do analysis, re-texturing or
@@ -161,7 +160,6 @@ default Vector2f copyUv(int vertexIndex, @Nullable Vector2f target) {
      * be the block face to which the quad is most closely aligned. Always the same as cull face for quads that are on a
      * block face, but never null.
      */
-    @NotNull
     Direction lightFace();
 
     /**
