Updated Argonauts API integration to fix crashing (#1120)

Author: Siriuo

gradle.properties

@@ -33,8 +33,8 @@ guideme_version_range=[21.1.5, 21.2)
 # Optional dependency versions
 ae2_version=19.0.12-alpha
 ae2_version_range=[19.0.12-alpha, 20)
-argonauts_minecraft_version=1.20.4
-argonauts_version=1.2.0
+argonauts_minecraft_version=1.21
+argonauts_version=2.0.0-alpha.4
 athena_minecraft_version=1.21
 athena_version=4.0.0
 emi_minecraft_version=1.21

src/main/java/aztech/modern_industrialization/compat/argonauts/ArgonautsFacade.java

@@ -26,7 +26,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.UUID;
-import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.level.Level;
 import net.neoforged.fml.ModList;
 
 public interface ArgonautsFacade {
@@ -45,5 +45,5 @@ private static ArgonautsFacade getInstance() {
         return (ms, uuid) -> List.of();
     }
 
-    Collection<UUID> getOtherPlayersInGuild(MinecraftServer server, UUID playerUuid);
+    Collection<UUID> getOtherPlayersInGuild(Level level, UUID playerUuid);
 }

src/main/java/aztech/modern_industrialization/compat/argonauts/ArgonautsFacadeImpl.java

@@ -23,24 +23,24 @@
  */
 package aztech.modern_industrialization.compat.argonauts;
 
-import earth.terrarium.argonauts.api.guild.GuildApi;
+import earth.terrarium.argonauts.api.teams.guild.GuildApi;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.UUID;
-import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.level.Level;
 
 public class ArgonautsFacadeImpl implements ArgonautsFacade {
     @Override
-    public Collection<UUID> getOtherPlayersInGuild(MinecraftServer server, UUID playerUuid) {
-        var guild = GuildApi.API.getPlayerGuild(server, playerUuid);
-        if (guild == null) {
+    public Collection<UUID> getOtherPlayersInGuild(Level level, UUID playerUuid) {
+        var guild = GuildApi.API.getPlayerGuild(level, playerUuid);
+        if (guild.isEmpty()) {
             return List.of();
         }
         List<UUID> out = new ArrayList<>();
-        for (var member : guild.members()) {
-            if (!member.profile().getId().equals(playerUuid)) {
-                out.add(member.profile().getId());
+        for (var memberUuid : guild.get().members().keySet()) {
+            if (!memberUuid.equals(playerUuid)) {
+                out.add(memberUuid);
             }
         }
         return out;

src/main/java/aztech/modern_industrialization/stats/PlayerStatistics.java

@@ -92,7 +92,6 @@ public void addUsedItems(ItemLike what, long amount) {
     }
 
     public void addProducedItems(Level level, ItemLike what, long amount) {
-        var server = Objects.requireNonNull(level.getServer());
         var item = what.asItem();
         producedItems.computeIfAbsent(item, i -> new StatisticValue()).add(amount);
 
@@ -104,7 +103,7 @@ public void addProducedItems(Level level, ItemLike what, long amount) {
             // Make sure we only award the stats to other players once even if they have both FTB Teams and Argonauts.
             uuidCache.clear();
             uuidCache.addAll(FTBTeamsFacade.INSTANCE.getOtherPlayersInTeam(uuid));
-            uuidCache.addAll(ArgonautsFacade.INSTANCE.getOtherPlayersInGuild(server, uuid));
+            uuidCache.addAll(ArgonautsFacade.INSTANCE.getOtherPlayersInGuild(level, uuid));
 
             for (var uuid : uuidCache) {
                 data.get(uuid).awardStat(level, what, amount);