Merge branch '1.21.8' into 1.21.10

rfresh2 · rfresh2 · commit 4c75cf770af6 · 2026-07-07T22:07:29.000-07:00
# Conflicts:
#	fabric/build.gradle.kts
#	settings.gradle.kts
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 
 architectury {
     common(providers.gradleProperty("enabled_platforms").get().split(","))
+    injectInjectables = false
 }
 
 loom {
@@ -23,7 +24,7 @@ dependencies {
     modCompileOnly(libs.baritone.fabric)
     modCompileOnly(libs.waystones.fabric)
     modCompileOnly(libs.balm.fabric)
-    modCompileOnly(libs.fabric.waystones)
+    modCompileOnly(libs.wraith.waystones)
     modCompileOnly(libs.worldtools)
     implementation(libs.oldbiomes)
     implementation(libs.sqlite)
diff --git a/common/src/main/java/xaeroplus/module/impl/WaystoneSync.java b/common/src/main/java/xaeroplus/module/impl/WaystoneSync.java
@@ -22,16 +22,31 @@
 import xaeroplus.settings.Settings;
 import xaeroplus.util.BlayWaystonesHelper;
 import xaeroplus.util.ColorHelper.WaystoneColor;
-import xaeroplus.util.FabricWaystonesHelper;
+import xaeroplus.util.DefaultWraithWaystonesHelper;
+import xaeroplus.util.IWraithWaystonesHelper;
 import xaeroplus.util.WaystonesHelper;
 
 import java.util.List;
 import java.util.Locale;
+import java.util.ServiceLoader;
 
 import static xaeroplus.event.XaeroWorldChangeEvent.WorldChangeType.EXIT_WORLD;
 
 public class WaystoneSync extends Module {
     private final BlayWaystonesHelper blayWaystonesHelper = new BlayWaystonesHelper();
+    private final IWraithWaystonesHelper wraithWaystonesHelper = initWraithWaystonesHelper();
+    private static IWraithWaystonesHelper initWraithWaystonesHelper() {
+        try {
+            if (WaystonesHelper.isWraithWaystonesPresent()) {
+                return ServiceLoader.load(IWraithWaystonesHelper.class).findFirst().get();
+            }
+        } catch (Exception e) {
+            // fall through
+            XaeroPlus.LOGGER.error("Error loading Wraith Waystones Helper, falling back to default", e);
+        }
+        return new DefaultWraithWaystonesHelper();
+    }
+
     private WaystoneColor color = WaystoneColor.RANDOM;
     private boolean separateWaypointSet = false;
     private WaypointVisibilityType visibilityType = WaypointVisibilityType.LOCAL;
@@ -41,9 +56,6 @@ public void onEnable() {
         if (WaystonesHelper.isWaystonesPresent()) {
             blayWaystonesHelper.subscribeWaystonesEvent();
         }
-        if (WaystonesHelper.isFabricWaystonesPresent()) {
-            FabricWaystonesHelper.subcribeWaystonesEventsRunnable.run();
-        }
         reloadWaystones();
     }
 
@@ -69,16 +81,17 @@ public void onClientTickEvent(final ClientTickEvent.Post event) {
                     }
                 }
             }
-        } else if (WaystonesHelper.isFabricWaystonesPresent()) {
-            if (FabricWaystonesHelper.shouldSync) {
+        }
+        if (WaystonesHelper.isWraithWaystonesPresent()) {
+            if (wraithWaystonesHelper.shouldSync()) {
                 syncFabricWaystones();
-                FabricWaystonesHelper.shouldSync = false;
+                wraithWaystonesHelper.setShouldSync(false);
             }
         }
     }
 
     public void syncFabricWaystones() {
-        commonWaystoneSync(FabricWaystonesHelper.getWaystones());
+        commonWaystoneSync(wraithWaystonesHelper.getWaystones());
     }
 
     public boolean syncBlayWaystones() {
@@ -185,7 +198,7 @@ public void setVisibilityType(final Settings.WaystoneWpVisibilityType visibility
 
     public void reloadWaystones() {
         blayWaystonesHelper.shouldSync = true;
-        FabricWaystonesHelper.shouldSync = true;
+        wraithWaystonesHelper.setShouldSync(true);
     }
 
     public record Waystone(String name, ResourceKey<Level> dimension, int x, int y, int z, @Nullable WaypointColor color) {
diff --git a/common/src/main/java/xaeroplus/util/DefaultWraithWaystonesHelper.java b/common/src/main/java/xaeroplus/util/DefaultWraithWaystonesHelper.java
@@ -0,0 +1,21 @@
+package xaeroplus.util;
+
+import xaeroplus.module.impl.WaystoneSync;
+
+import java.util.List;
+
+public class DefaultWraithWaystonesHelper implements IWraithWaystonesHelper {
+
+    @Override
+    public boolean shouldSync() {
+        return false;
+    }
+
+    @Override
+    public void setShouldSync(boolean shouldSync) {}
+
+    @Override
+    public List<WaystoneSync.Waystone> getWaystones() {
+        return List.of();
+    }
+}
diff --git a/common/src/main/java/xaeroplus/util/FabricWaystonesHelper.java b/common/src/main/java/xaeroplus/util/FabricWaystonesHelper.java
diff --git a/common/src/main/java/xaeroplus/util/IWraithWaystonesHelper.java b/common/src/main/java/xaeroplus/util/IWraithWaystonesHelper.java
@@ -0,0 +1,11 @@
+package xaeroplus.util;
+
+import xaeroplus.module.impl.WaystoneSync;
+
+import java.util.List;
+
+public interface IWraithWaystonesHelper {
+    boolean shouldSync();
+    void setShouldSync(boolean shouldSync);
+    List<WaystoneSync.Waystone> getWaystones();
+}
diff --git a/common/src/main/java/xaeroplus/util/WaystonesHelper.java b/common/src/main/java/xaeroplus/util/WaystonesHelper.java
@@ -7,9 +7,9 @@
 
 public class WaystonesHelper {
     private static boolean isWaystonesPresent = false;
-    private static boolean isFabricWaystonesPresent = false;
+    private static boolean isWraithWaystonesPresent = false;
     private static boolean checked = false;
-    private static boolean fabricChecked = false;
+    private static boolean wraithChecked = false;
 
     public static boolean isWaystonesPresent() {
         if (!checked) {
@@ -28,23 +28,23 @@ public static boolean isWaystonesPresent() {
         return isWaystonesPresent;
     }
 
-    public static boolean isFabricWaystonesPresent() {
-        if (!fabricChecked) {
+    public static boolean isWraithWaystonesPresent() {
+        if (!wraithChecked) {
             try {
                 Class.forName(FabricWaystones.class.getName());
-                XaeroPlus.LOGGER.info("Found Fabric Waystones. Enabling Fabric Waystones support.");
-                isFabricWaystonesPresent = true;
+                XaeroPlus.LOGGER.info("Found Wraith Waystones. Enabling Wraith Waystones support.");
+                isWraithWaystonesPresent = true;
             } catch (final Throwable e) {
-                XaeroPlus.LOGGER.info("Fabric Waystones not found. Disabling Fabric Waystones support.");
-                isFabricWaystonesPresent = false;
+                XaeroPlus.LOGGER.info("Wraith Waystones not found. Disabling Wraith Waystones support.");
+                isWraithWaystonesPresent = false;
             }
-            fabricChecked = true;
+            wraithChecked = true;
         }
-        return isFabricWaystonesPresent;
+        return isWraithWaystonesPresent;
     }
 
     public static boolean isAnyWaystonesPresent() {
-        return isWaystonesPresent() || isFabricWaystonesPresent();
+        return isWaystonesPresent() || isWraithWaystonesPresent();
     }
 
 }
diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -10,6 +10,7 @@ plugins {
 architectury {
 	platformSetupLoomIde()
 	fabric()
+	injectInjectables = false
 }
 
 fabricApi {
@@ -67,7 +68,7 @@ dependencies {
     modCompileOnly(libs.baritone.fabric)
     modImplementation(libs.waystones.fabric)
     modImplementation(libs.balm.fabric)
-	modCompileOnly(libs.fabric.waystones)
+	modCompileOnly(libs.wraith.waystones)
 	modRuntimeOnly(libs.immediatelyfast)
     runtimeOnly("net.lenni0451:Reflect:1.6.1") // immediatelyfast jij
     modImplementation(libs.modmenu)
diff --git a/fabric/src/main/java/xaeroplus/fabric/XaeroPlusFabric.java b/fabric/src/main/java/xaeroplus/fabric/XaeroPlusFabric.java
@@ -12,7 +12,6 @@
 import net.minecraft.client.Minecraft;
 import xaeroplus.XaeroPlus;
 import xaeroplus.commands.XPClientCommandSource;
-import xaeroplus.fabric.util.FabricWaystonesHelperInit;
 import xaeroplus.fabric.util.compat.IncompatibleMinimapWarningScreen;
 import xaeroplus.fabric.util.compat.XaeroPlusMinimapCompatibilityChecker;
 import xaeroplus.settings.Settings;
@@ -35,7 +34,6 @@ public static void initialize() {
 				.map(ModMetadata::getVersion)
 				.map(Version::getFriendlyString)
 				.orElse("2.x");
-			FabricWaystonesHelperInit.doInit();
 			XaeroPlus.initializeSettings();
 			Settings.REGISTRY.getKeybindings().forEach(KeyBindingHelper::registerKeyBinding);
         }
diff --git a/fabric/src/main/java/xaeroplus/fabric/util/WraithWaystonesHelperImpl.java b/fabric/src/main/java/xaeroplus/fabric/util/WraithWaystonesHelperImpl.java
@@ -7,29 +7,34 @@
 import wraith.fwaystones.access.WaystoneValue;
 import wraith.fwaystones.integration.event.WaystoneEvents;
 import xaeroplus.module.impl.WaystoneSync;
-import xaeroplus.util.FabricWaystonesHelper;
+import xaeroplus.util.IWraithWaystonesHelper;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 
-public class FabricWaystonesHelperInit {
+public class WraithWaystonesHelperImpl implements IWraithWaystonesHelper {
+    private volatile boolean shouldSync = false;
 
-    public static void doInit() {
-        FabricWaystonesHelper.waystoneProvider = FabricWaystonesHelperInit::getWaystones;
-        FabricWaystonesHelper.subcribeWaystonesEventsRunnable = FabricWaystonesHelperInit::subscribeWaystonesEvents;
+    public WraithWaystonesHelperImpl() {
+        WaystoneEvents.FORGET_ALL_WAYSTONES_EVENT.register((p) -> onWaystoneUpdate(null));
+        WaystoneEvents.DISCOVER_WAYSTONE_EVENT.register(this::onWaystoneUpdate);
+        WaystoneEvents.REMOVE_WAYSTONE_EVENT.register(this::onWaystoneUpdate);
+        WaystoneEvents.RENAME_WAYSTONE_EVENT.register(this::onWaystoneUpdate);
     }
 
-    public static void subscribeWaystonesEvents() {
-        if (FabricWaystonesHelper.subscribed) return;
-        WaystoneEvents.FORGET_ALL_WAYSTONES_EVENT.register((p) -> FabricWaystonesHelper.onWaystoneUpdate(null));
-        WaystoneEvents.DISCOVER_WAYSTONE_EVENT.register(FabricWaystonesHelper::onWaystoneUpdate);
-        WaystoneEvents.REMOVE_WAYSTONE_EVENT.register(FabricWaystonesHelper::onWaystoneUpdate);
-        WaystoneEvents.RENAME_WAYSTONE_EVENT.register(FabricWaystonesHelper::onWaystoneUpdate);
-        FabricWaystonesHelper.subscribed = true;
+    @Override
+    public boolean shouldSync() {
+        return shouldSync;
     }
 
-    public static List<WaystoneSync.Waystone> getWaystones() {
+    @Override
+    public void setShouldSync(final boolean shouldSync) {
+        this.shouldSync = shouldSync;
+    }
+
+    @Override
+    public List<WaystoneSync.Waystone> getWaystones() {
         var waystoneStorage = FabricWaystones.WAYSTONE_STORAGE;
         if (waystoneStorage == null) return Collections.emptyList();
         ConcurrentHashMap<String, WaystoneValue> waystones = waystoneStorage.WAYSTONES;
@@ -46,4 +51,8 @@ public static List<WaystoneSync.Waystone> getWaystones() {
             ))
             .toList();
     }
+
+    void onWaystoneUpdate(final String hash) {
+        shouldSync = true;
+    }
 }
diff --git a/fabric/src/main/java/xaeroplus/fabric/util/compat/XaeroPlusCompatibleMinimapMixinPlugin.java b/fabric/src/main/java/xaeroplus/fabric/util/compat/XaeroPlusCompatibleMinimapMixinPlugin.java
@@ -20,7 +20,6 @@ public class XaeroPlusCompatibleMinimapMixinPlugin implements IMixinConfigPlugin
 
     @Override
     public void onLoad(final String mixinPackage) {
-        if (FabricLoader.getInstance().getEnvironmentType() != EnvType.CLIENT) return;
     }
 
     @Override
diff --git a/fabric/src/main/resources/META-INF/services/xaeroplus.util.IWraithWaystonesHelper b/fabric/src/main/resources/META-INF/services/xaeroplus.util.IWraithWaystonesHelper
@@ -0,0 +1 @@
+xaeroplus.fabric.util.WraithWaystonesHelperImpl
diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
@@ -12,6 +12,7 @@ plugins {
 architectury {
     platformSetupLoomIde()
     forge()
+    injectInjectables = false
 }
 
 val common = project(":common")
@@ -47,7 +48,7 @@ dependencies {
     modCompileOnly(libs.waystones.forge)
     modCompileOnly(libs.balm.forge)
     modCompileOnly(libs.worldtools)
-    modCompileOnly(libs.fabric.waystones)
+    modCompileOnly(libs.wraith.waystones)
     shadow(libs.sqlite)
     forgeRuntimeLibrary(implementation(shadow(libs.oldbiomes.get())!!)!!)
     forgeRuntimeLibrary(implementation(shadow(libs.caffeine.get())!!)!!)
diff --git a/neo/build.gradle.kts b/neo/build.gradle.kts
@@ -11,6 +11,7 @@ plugins {
 architectury {
     platformSetupLoomIde()
     neoForge()
+    injectInjectables = false
 }
 
 val common = project(":common")
@@ -39,7 +40,7 @@ dependencies {
     modCompileOnly(libs.waystones.neoforge)
     modCompileOnly(libs.balm.neoforge)
     modCompileOnly(libs.worldtools)
-    modCompileOnly(libs.fabric.waystones)
+    modCompileOnly(libs.wraith.waystones)
     modCompileOnly(libs.sodium.neoforge)
     modRuntimeOnly(libs.immediatelyfast.neo)
     shadow(libs.sqlite)
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -48,7 +48,7 @@ dependencyResolutionManagement {
 			library("balm-fabric", "maven.modrinth:balm:21.10.8+fabric-$minecraft_version")
 			library("balm-forge", "maven.modrinth:balm:21.10.8+forge-$minecraft_version")
 			library("balm-neoforge", "maven.modrinth:balm:21.10.8+neoforge-$minecraft_version")
-			library("fabric-waystones", "maven.modrinth:fwaystones:3.3.5+mc1.21.4")
+			library("wraith-waystones", "maven.modrinth:fwaystones:3.3.5+mc1.21.4")
 			library("worldtools", "maven.modrinth:worldtools:1.2.8+1.21.4")
             library("sqlite", "org.rfresh.xerial:sqlite-jdbc:3.53.2.0") // relocated xerial sqlite to avoid conflicts with other mods
 			library("immediatelyfast", "maven.modrinth:immediatelyfast:1.13.2+$minecraft_version-fabric")

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ public class XaeroPlusCompatibleMinimapMixinPlugin implements IMixinConfigPlugin`
`20`	`20`
`21`	`21`	`@Override`
`22`	`22`	`public void onLoad(final String mixinPackage) {`
`23`		`- if (FabricLoader.getInstance().getEnvironmentType() != EnvType.CLIENT) return;`
`24`	`23`	`}`
`25`	`24`
`26`	`25`	`@Override`