[FEAT] Add APIs from PR #24

Author: hypherionmc

commit.sha

@@ -1 +1 @@
-357eb30e497febaa9fef3bf963c555864b75269b
+ee0dcbaa9492ab06cb09b08fc402e684fb5e4cb5

versions/1.18.2/build.gradle.kts

@@ -237,10 +237,10 @@ if (multimined.platformEnabled("paper")) {
         artifact.set(tasks.named("remapPaperJar").get())
         loaders.set(listOf("paper"))
     }
-}
 
-tasks.named("publishCurseforgePaper") { enabled = false }
-tasks.named("publishModrinthPaper") { enabled = false }
+    tasks.named("publishCurseforgePaper") { enabled = false }
+    tasks.named("publishModrinthPaper") { enabled = false }
+}
 // endregion
 
 // region Maven Publishing

versions/1.18.2/src/main/java/com/hypherionmc/craterlib/nojang/advancements/BridgedAdvancement.java

@@ -18,4 +18,8 @@ public Optional<BridgedDisplayInfo> displayInfo() {
         return Optional.empty();
     }
 
+    public Advancement toMojang() {
+        return internal;
+    }
+
 }

versions/1.18.2/src/main/java/com/hypherionmc/craterlib/nojang/advancements/BridgedAdvancementHolder.java

@@ -0,0 +1,18 @@
+package com.hypherionmc.craterlib.nojang.advancements;
+
+import lombok.RequiredArgsConstructor;
+import net.minecraft.advancements.Advancement;
+
+@RequiredArgsConstructor(staticName = "of")
+public class BridgedAdvancementHolder {
+
+    private final Advancement internal;
+
+    public BridgedAdvancement value() {
+        return BridgedAdvancement.of(internal);
+    }
+
+    public Advancement toMojang() {
+        return internal;
+    }
+}

versions/1.18.2/src/main/java/com/hypherionmc/craterlib/nojang/advancements/BridgedAdvancementProgress.java

@@ -0,0 +1,53 @@
+package com.hypherionmc.craterlib.nojang.advancements;
+
+import com.hypherionmc.craterlib.utils.ChatUtils;
+import lombok.RequiredArgsConstructor;
+import net.kyori.adventure.text.Component;
+import net.minecraft.advancements.AdvancementProgress;
+import org.jetbrains.annotations.Nullable;
+
+import java.time.Instant;
+
+@RequiredArgsConstructor(staticName = "of")
+public class BridgedAdvancementProgress {
+
+    private final AdvancementProgress internal;
+
+    public boolean isDone() {
+        return internal.isDone();
+    }
+
+    public boolean hasProgress() {
+        return internal.hasProgress();
+    }
+
+    public float getPercent() {
+        return internal.getPercent();
+    }
+
+    public Component getProgressText() {
+        if (internal.getProgressText() == null) return Component.empty();
+        return Component.translatable(internal.getProgressText());
+    }
+
+    public Iterable<String> getRemainingCriteria() {
+        return internal.getRemainingCriteria();
+    }
+
+    public Iterable<String> getCompletedCriteria() {
+        return internal.getCompletedCriteria();
+    }
+
+    @Nullable
+    public Instant getFirstProgressDate() {
+        return internal.getFirstProgressDate().toInstant();
+    }
+
+    public int compareTo(BridgedAdvancementProgress other) {
+        return internal.compareTo(other.internal);
+    }
+
+    public AdvancementProgress toMojang() {
+        return internal;
+    }
+}

versions/1.18.2/src/main/java/com/hypherionmc/craterlib/nojang/advancements/BridgedPlayerAdvancements.java

@@ -0,0 +1,19 @@
+package com.hypherionmc.craterlib.nojang.advancements;
+
+import lombok.RequiredArgsConstructor;
+import net.minecraft.server.PlayerAdvancements;
+
+@RequiredArgsConstructor(staticName = "of")
+public class BridgedPlayerAdvancements {
+
+    private final PlayerAdvancements internal;
+
+    public BridgedAdvancementProgress getOrStartProgress(BridgedAdvancementHolder advancement) {
+        return BridgedAdvancementProgress.of(internal.getOrStartProgress(advancement.toMojang()));
+    }
+
+    public PlayerAdvancements toMojang() {
+        return internal;
+    }
+
+}

versions/1.18.2/src/main/java/com/hypherionmc/craterlib/nojang/client/server/BridgedIntegratedServer.java

@@ -1,8 +1,15 @@
 package com.hypherionmc.craterlib.nojang.client.server;
 
+import com.hypherionmc.craterlib.nojang.advancements.BridgedAdvancementHolder;
+import com.hypherionmc.craterlib.nojang.advancements.BridgedPlayerAdvancements;
 import lombok.RequiredArgsConstructor;
+import net.minecraft.advancements.Advancement;
 import net.minecraft.client.server.IntegratedServer;
 
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.UUID;
+
 @RequiredArgsConstructor(staticName = "of")
 public class BridgedIntegratedServer {
 
@@ -16,4 +23,21 @@ public IntegratedServer toMojang() {
         return internal;
     }
 
-}
+    public BridgedPlayerAdvancements getPlayerAdvancements(UUID uuid) {
+        return BridgedPlayerAdvancements.of(internal.getPlayerList().getPlayer(uuid).getAdvancements());
+    }
+
+    public Collection<BridgedAdvancementHolder> getAdvancements() {
+        Collection<Advancement> ah = internal.getAdvancements().getAllAdvancements();
+        LinkedList<BridgedAdvancementHolder> ret = new LinkedList<>();
+        for(Advancement a: ah) {
+            BridgedAdvancementHolder bah = BridgedAdvancementHolder.of(a);
+            ret.add(bah);
+        }
+        return ret;
+    }
+
+    public boolean isHardcore() {
+        return internal.isHardcore();
+    }
+}

versions/1.18.2/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java

@@ -1,5 +1,7 @@
 package com.hypherionmc.craterlib.nojang.server;
 
+import com.hypherionmc.craterlib.nojang.advancements.BridgedAdvancementHolder;
+import com.hypherionmc.craterlib.nojang.advancements.BridgedPlayerAdvancements;
 import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
 import com.hypherionmc.craterlib.nojang.client.multiplayer.BridgedClientLevel;
 import com.hypherionmc.craterlib.nojang.commands.BridgedFakePlayer;
@@ -10,13 +12,13 @@
 import net.kyori.adventure.text.Component;
 import net.minecraft.SharedConstants;
 import net.minecraft.Util;
+import net.minecraft.advancements.Advancement;
 import net.minecraft.network.chat.ChatType;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.players.UserBanListEntry;
 import net.minecraft.server.players.UserWhiteListEntry;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 @RequiredArgsConstructor(staticName = "of")
 public class BridgedMinecraftServer {
@@ -81,7 +83,7 @@ public List<BridgedPlayer> getPlayers() {
     }
 
     public BridgedGameRules getGameRules() {
-        return BridgedGameRules.bridge(internal.getGameRules());
+        return BridgedGameRules.bridge(internal.getWorldData().getGameRules());
     }
 
     public void banPlayer(BridgedGameProfile profile) {
@@ -96,4 +98,21 @@ public MinecraftServer toMojang() {
         return internal;
     }
 
+    public BridgedPlayerAdvancements getPlayerAdvancements(UUID uuid) {
+        return BridgedPlayerAdvancements.of(internal.getPlayerList().getPlayer(uuid).getAdvancements());
+    }
+
+    public Collection<BridgedAdvancementHolder> getAdvancements() {
+        Collection<Advancement> ah = internal.getAdvancements().getAllAdvancements();
+        LinkedList<BridgedAdvancementHolder> ret = new LinkedList<>();
+        for(Advancement a: ah) {
+            BridgedAdvancementHolder bah = BridgedAdvancementHolder.of(a);
+            ret.add(bah);
+        }
+        return ret;
+    }
+
+    public boolean isHardcore() {
+        return internal.isHardcore();
+    }
 }

versions/1.19.2/build.gradle.kts

@@ -237,10 +237,10 @@ if (multimined.platformEnabled("paper")) {
         artifact.set(tasks.named("remapPaperJar").get())
         loaders.set(listOf("paper"))
     }
-}
 
-tasks.named("publishCurseforgePaper") { enabled = false }
-tasks.named("publishModrinthPaper") { enabled = false }
+    tasks.named("publishCurseforgePaper") { enabled = false }
+    tasks.named("publishModrinthPaper") { enabled = false }
+}
 // endregion
 
 // region Maven Publishing

versions/1.19.2/src/main/java/com/hypherionmc/craterlib/nojang/advancements/BridgedAdvancement.java

@@ -18,4 +18,8 @@ public Optional<BridgedDisplayInfo> displayInfo() {
         return Optional.empty();
     }
 
+    public Advancement toMojang() {
+        return internal;
+    }
+
 }