Fix race condition for AE2WTLib integration

62832 · May 9, 2024 · 86a4ab2 · 86a4ab2
1 parent 1148dc8
commit 86a4ab2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/main/java/gripe/_90/appliede/AppliedE.java b/src/main/java/gripe/_90/appliede/AppliedE.java
@@ -127,7 +127,7 @@ public final class AppliedE {
     public static final RegistryObject<Item> LEARNING_CARD = ITEMS.register("learning_card", () -> Upgrades.createUpgradeCardItem(new Item.Properties()));
 
     public static final RegistryObject<Item> WIRELESS_TRANSMUTATION_TERMINAL = ITEMS.register("wireless_transmutation_terminal", () -> Addons.AE2WTLIB.isLoaded()
-            ? AE2WTIntegration.createWirelessTerminalItem()
+            ? AE2WTIntegration.getWirelessTerminalItem()
             : new DummyIntegrationItem(new Item.Properties().stacksTo(1), Addons.AE2WTLIB));
 
     static {

diff --git a/src/main/java/gripe/_90/appliede/integration/ae2wtlib/AE2WTIntegration.java b/src/main/java/gripe/_90/appliede/integration/ae2wtlib/AE2WTIntegration.java
@@ -14,10 +14,14 @@
 import gripe._90.appliede.integration.Addons;
 
 public class AE2WTIntegration {
-    public static Item createWirelessTerminalItem() {
-        var terminal = new WTTItem();
-        GridLinkables.register(terminal, WirelessTerminalItem.LINKABLE_HANDLER);
-        return terminal;
+    private static final Item TERMINAL = new WTTItem();
+
+    static {
+        GridLinkables.register(TERMINAL, WirelessTerminalItem.LINKABLE_HANDLER);
+    }
+
+    public static Item getWirelessTerminalItem() {
+        return TERMINAL;
     }
 
     public static MenuType<?> getWirelessTerminalMenu() {

diff --git a/src/main/java/gripe/_90/appliede/mixin/ae2wtlib/AE2wtlibMixin.java b/src/main/java/gripe/_90/appliede/mixin/ae2wtlib/AE2wtlibMixin.java
@@ -8,7 +8,7 @@
 import de.mari_023.ae2wtlib.AE2wtlib;
 import de.mari_023.ae2wtlib.wut.WUTHandler;
 
-import gripe._90.appliede.AppliedE;
+import gripe._90.appliede.integration.ae2wtlib.AE2WTIntegration;
 import gripe._90.appliede.integration.ae2wtlib.WTTItem;
 import gripe._90.appliede.integration.ae2wtlib.WTTMenu;
 import gripe._90.appliede.integration.ae2wtlib.WTTMenuHost;
@@ -17,7 +17,7 @@
 public abstract class AE2wtlibMixin {
     @Inject(method = "onAe2Initialized", at = @At("HEAD"), remap = false)
     private static void addWirelessTransmutationTerminal(CallbackInfo ci) {
-        var terminal = (WTTItem) AppliedE.WIRELESS_TRANSMUTATION_TERMINAL.get();
+        var terminal = (WTTItem) AE2WTIntegration.getWirelessTerminalItem();
         WUTHandler.addTerminal(
                 "transmutation",
                 terminal::tryOpen,