Update indra to v4

Author: jpenilla

api/src/main/java/net/draycia/carbon/api/CarbonChat.java

@@ -30,8 +30,10 @@
  * The {@link CarbonChat} interface is the gateway to interacting with the majority of the CarbonChat API.
  *
  * <p>Instances may be obtained through {@link CarbonChatProvider#carbonChat()} once Carbon is loaded.</p>
+ *
  * <p>On most platforms, you should use the provided load order mechanism to ensure your addon loads after
  * Carbon.</p>
+ *
  * <p>On Fabric, use the {@code carbonchat} entrypoint (type: {@code Consumer<CarbonChat>}) to have a callback
  * when Carbon is loaded.</p>
  *

api/src/main/java/net/draycia/carbon/api/users/CarbonPlayer.java

@@ -110,6 +110,7 @@ public interface CarbonPlayer extends Audience, Identified {
      * Sets the player's nickname.
      *
      * <p>Setting {@code null} will remove any current nickname.</p>
+     *
      * <p>Won't have any visible effect when Carbon's nickname management is disabled.</p>
      *
      * @param nickname the new nickname

api/src/main/java/net/draycia/carbon/api/users/UserManager.java

@@ -51,6 +51,7 @@ public interface UserManager<C extends CarbonPlayer> {
      * Create a new {@link Party} with the specified name.
      *
      * <p>Parties with no users will not be saved. Use {@link Party#disband()} to discard.</p>
+     *
      * <p>The returned reference will expire after one minute, store {@link Party#id()} rather than the instance and use {@link #party(UUID)} to retrieve.</p>
      *
      * @param name party name
@@ -63,6 +64,7 @@ public interface UserManager<C extends CarbonPlayer> {
      * Look up an existing party by its id.
      *
      * <p>As parties that have never had a user are not saved, they are not retrievable here.</p>
+     *
      * <p>The returned reference will expire after one minute, do not cache it. The implementation handles caching as is appropriate.</p>
      *
      * @param id party id

build-logic/src/main/kotlin/extensions.kt

@@ -1,7 +1,6 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import net.kyori.indra.git.IndraGitExtension
 import org.apache.tools.ant.filters.ReplaceTokens
-import org.eclipse.jgit.lib.Repository
 import org.gradle.accessors.dm.LibrariesForLibs
 import org.gradle.api.Project
 import org.gradle.api.Task
@@ -100,7 +99,7 @@ fun ShadowJar.configureShadowJar() {
 }
 
 fun Project.lastCommitHash(): String =
-  the<IndraGitExtension>().commit()?.name?.substring(0, 7)
+  the<IndraGitExtension>().commit().orNull?.name?.substring(0, 7)
     ?: error("Could not determine commit hash")
 
 fun Project.decorateVersion() {
@@ -120,10 +119,7 @@ fun Project.currentBranch(): String {
 
   val indraGit = the<IndraGitExtension>().takeIf { it.isPresent }
 
-  val ref = indraGit?.git()?.repository?.exactRef("HEAD")?.target
-    ?: return "detached-head"
-
-  return Repository.shortenRefName(ref.name)
+  return indraGit?.branchName()?.orNull ?: "detached-head"
 }
 
 val Project.libs: LibrariesForLibs

common/src/main/java/net/draycia/carbon/common/util/FileUtil.java

@@ -54,6 +54,7 @@ public static String hashString(final Path file) throws IOException {
      * Lists directory entries in {@code path}.
      *
      * <p>If {@code path} does not exist, returns an empty list.</p>
+     *
      * <p>If {@code path} exists, but is not a directory, throws {@link IllegalArgumentException}</p>
      *
      * @param path directory
@@ -69,6 +70,7 @@ public static List<Path> listDirectoryEntries(final Path path) {
      * Lists directory entries in {@code path} matching {@code glob}.
      *
      * <p>If {@code path} does not exist, returns an empty list.</p>
+     *
      * <p>If {@code path} exists, but is not a directory, throws {@link IllegalArgumentException}</p>
      *
      * @param path directory

gradle/libs.versions.toml

@@ -10,7 +10,7 @@ resource-factory-velocity-convention = { id = "xyz.jpenilla.resource-factory-vel
 resource-factory-fabric-convention = { id = "xyz.jpenilla.resource-factory-fabric-convention", version.ref = "resource-factory" }
 
 [versions]
-indra = "3.2.0"
+indra = "4.0.0"
 cloud-build-logic = "0.0.17"
 shadow = "9.2.2"
 mod-publish-plugin = "1.0.0"