Remove nullable annotation from hex holder and casting env pigment methods

Author: Robotgiggle

Common/src/main/java/at/petrak/hexcasting/api/addldata/ADHexHolder.java

@@ -16,7 +16,7 @@ public interface ADHexHolder {
     @Nullable
     List<Iota> getHex(ServerLevel level);
 
-    void writeHex(List<Iota> patterns, @Nullable FrozenPigment pigment, long media);
+    void writeHex(List<Iota> patterns, FrozenPigment pigment, long media);
 
     void clearHex();
 

Common/src/main/java/at/petrak/hexcasting/api/casting/eval/CastingEnvironment.java

@@ -622,7 +622,7 @@ public enum StackDiscoveryMode {
 
     public abstract FrozenPigment getPigment();
 
-    public abstract @Nullable FrozenPigment setPigment(@Nullable FrozenPigment pigment);
+    public abstract FrozenPigment setPigment(FrozenPigment pigment);
 
     public abstract void produceParticles(ParticleSpray particles, FrozenPigment colorizer);
 

Common/src/main/java/at/petrak/hexcasting/api/casting/eval/env/CircleCastEnv.java

@@ -200,7 +200,7 @@ public FrozenPigment getPigment() {
     }
 
     @Override
-    public @Nullable FrozenPigment setPigment(@Nullable FrozenPigment pigment) {
+    public FrozenPigment setPigment(FrozenPigment pigment) {
         var impetus = this.getImpetus();
         if (impetus == null)
             return null;

Common/src/main/java/at/petrak/hexcasting/api/casting/eval/env/PlayerBasedCastEnv.java

@@ -201,7 +201,7 @@ protected boolean canOvercast() {
     }
 
     @Override
-    public @Nullable FrozenPigment setPigment(@Nullable FrozenPigment pigment) {
+    public FrozenPigment setPigment(FrozenPigment pigment) {
         return IXplatAbstractions.INSTANCE.setPigment(caster, pigment);
     }
 

Common/src/main/java/at/petrak/hexcasting/api/item/HexHolderItem.java

@@ -25,7 +25,7 @@ public interface HexHolderItem extends MediaHolderItem {
     @Nullable
     List<Iota> getHex(ItemStack stack, ServerLevel level);
 
-    void writeHex(ItemStack stack, List<Iota> program, @Nullable FrozenPigment pigment, long media);
+    void writeHex(ItemStack stack, List<Iota> program, FrozenPigment pigment, long media);
 
     void clearHex(ItemStack stack);
 

Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemPackagedHex.java

@@ -27,6 +27,7 @@
 import net.minecraft.world.item.UseAnim;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
@@ -69,7 +70,7 @@ public boolean hasHex(ItemStack stack) {
     }
 
     @Override
-    public void writeHex(ItemStack stack, List<Iota> program, @Nullable FrozenPigment pigment, long media) {
+    public void writeHex(ItemStack stack, List<Iota> program, FrozenPigment pigment, long media) {
         stack.set(HexDataComponents.HEX_HOLDER.get(), new HexHolder(program, pigment));
         withMedia(stack, media, media);
     }
@@ -147,7 +148,7 @@ public UseAnim getUseAnimation(ItemStack pStack) {
         return UseAnim.BLOCK;
     }
 
-    public record HexHolder(List<Iota> hex, FrozenPigment pigment) {
+    public record HexHolder(@NotNull List<Iota> hex, @NotNull FrozenPigment pigment) {
         public static final Codec<HexHolder> CODEC = RecordCodecBuilder.create(inst ->
                 inst.group(
                         IotaType.TYPED_CODEC.listOf().fieldOf("hex").forGetter(HexHolder::hex),

Common/src/main/java/at/petrak/hexcasting/xplat/IXplatAbstractions.java

@@ -90,7 +90,7 @@ public interface IXplatAbstractions {
 
     boolean isBrainswept(Mob mob);
 
-    @Nullable FrozenPigment setPigment(Player target, @Nullable FrozenPigment colorizer);
+    FrozenPigment setPigment(Player target, FrozenPigment colorizer);
 
     void setSentinel(Player target, @Nullable Sentinel sentinel);
 

Fabric/src/main/java/at/petrak/hexcasting/fabric/cc/adimpl/CCHexHolder.java

@@ -48,7 +48,7 @@ public boolean hasHex() {
         }
 
         @Override
-        public void writeHex(List<Iota> patterns, @Nullable FrozenPigment pigment, long media) {
+        public void writeHex(List<Iota> patterns, FrozenPigment pigment, long media) {
             this.hexHolder.writeHex(this.stack, patterns, pigment, media);
         }
 
@@ -58,7 +58,7 @@ public void clearHex() {
         }
 
         @Override
-        public @Nullable FrozenPigment getPigment() {
+        public FrozenPigment getPigment() {
             return this.hexHolder.getPigment(this.stack);
         }
 

Fabric/src/main/java/at/petrak/hexcasting/fabric/xplat/FabricXplatImpl.java

@@ -154,7 +154,7 @@ public void setBrainsweepAddlData(Mob mob) {
     }
 
     @Override
-    public @Nullable FrozenPigment setPigment(Player target, @Nullable FrozenPigment pigment) {
+    public FrozenPigment setPigment(Player target, FrozenPigment pigment) {
         var cc = HexCardinalComponents.FAVORED_PIGMENT.get(target);
         var old = cc.getPigment();
         cc.setPigment(pigment);

Neoforge/src/main/java/at/petrak/hexcasting/forge/cap/adimpl/CapItemHexHolder.java

@@ -29,7 +29,7 @@ public boolean hasHex() {
     }
 
     @Override
-    public void writeHex(List<Iota> patterns, @Nullable FrozenPigment pigment, long media) {
+    public void writeHex(List<Iota> patterns, FrozenPigment pigment, long media) {
         holder.writeHex(stack, patterns, pigment, media);
     }