From 905ccab11c63dc1b8db443890fa9202382305072 Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Sat, 6 Jan 2024 20:57:03 +0800
Subject: [PATCH] Add NotNull annotation

---
 .../create_power_loader/content/trains/CPLGlobalStation.java | 3 +++
 .../create_power_loader/mixin/GlobalStationMixin.java        | 3 ++-
 .../create_power_loader/mixin/TrackEdgePointMixin.java       | 5 -----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/hlysine/create_power_loader/content/trains/CPLGlobalStation.java b/src/main/java/com/hlysine/create_power_loader/content/trains/CPLGlobalStation.java
index 895de5c..f5e59f4 100644
--- a/src/main/java/com/hlysine/create_power_loader/content/trains/CPLGlobalStation.java
+++ b/src/main/java/com/hlysine/create_power_loader/content/trains/CPLGlobalStation.java
@@ -1,6 +1,9 @@
 package com.hlysine.create_power_loader.content.trains;
 
+import org.jetbrains.annotations.NotNull;
+
 public interface CPLGlobalStation {
+    @NotNull
     StationChunkLoader getLoader();
 
     void setLoader(StationChunkLoader loader);
diff --git a/src/main/java/com/hlysine/create_power_loader/mixin/GlobalStationMixin.java b/src/main/java/com/hlysine/create_power_loader/mixin/GlobalStationMixin.java
index c51d39a..ec825b1 100644
--- a/src/main/java/com/hlysine/create_power_loader/mixin/GlobalStationMixin.java
+++ b/src/main/java/com/hlysine/create_power_loader/mixin/GlobalStationMixin.java
@@ -6,6 +6,7 @@
 import com.simibubi.create.content.trains.station.GlobalStation;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.FriendlyByteBuf;
+import org.jetbrains.annotations.NotNull;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -19,7 +20,7 @@ public class GlobalStationMixin implements CPLGlobalStation {
 
     @Override
     @Unique
-    public StationChunkLoader getLoader() {
+    public @NotNull StationChunkLoader getLoader() {
         if (cpl$chunkLoader == null)
             cpl$chunkLoader = new StationChunkLoader((GlobalStation) (Object) this);
         return cpl$chunkLoader;
diff --git a/src/main/java/com/hlysine/create_power_loader/mixin/TrackEdgePointMixin.java b/src/main/java/com/hlysine/create_power_loader/mixin/TrackEdgePointMixin.java
index ee1f0c2..b25a1f0 100644
--- a/src/main/java/com/hlysine/create_power_loader/mixin/TrackEdgePointMixin.java
+++ b/src/main/java/com/hlysine/create_power_loader/mixin/TrackEdgePointMixin.java
@@ -1,10 +1,8 @@
 package com.hlysine.create_power_loader.mixin;
 
 import com.hlysine.create_power_loader.content.trains.CPLGlobalStation;
-import com.hlysine.create_power_loader.content.trains.StationChunkLoader;
 import com.simibubi.create.content.trains.graph.TrackGraph;
 import com.simibubi.create.content.trains.signal.TrackEdgePoint;
-import com.simibubi.create.content.trains.station.GlobalStation;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -18,9 +16,6 @@ public class TrackEdgePointMixin {
     )
     public void cpl$tick(TrackGraph graph, boolean preTrains, CallbackInfo ci) {
         if (this instanceof CPLGlobalStation station) {
-            if (station.getLoader() == null)
-                //noinspection DataFlowIssue
-                station.setLoader(new StationChunkLoader((GlobalStation) station));
             station.getLoader().tick(graph, preTrains);
         }
     }