misc tweaks?

jpenilla · Aug 14, 2024 · ee26968 · ee26968
1 parent ae84936
commit ee26968
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts b/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
@@ -13,6 +13,7 @@ indraCrossdoc {
 
 tasks {
   javadoc {
+    val options = this.options as StandardJavadocDocletOptions
     exclude("net/kyori/adventure/platform/**/impl/**")
     val client = sourceSets.findByName("client")
     client?.let {
@@ -21,12 +22,12 @@ tasks {
     }
     val advVersion = libs.versions.adventure.get()
     if (!advVersion.contains("SNAPSHOT")) {
-      (options as? StandardJavadocDocletOptions)?.links(
+      options.links(
         "https://jd.advntr.dev/api/${advVersion}",
         "https://jd.advntr.dev/key/${advVersion}",
       )
     }
-    (options as? StandardJavadocDocletOptions)?.links(
+    options.links(
       "https://jd.advntr.dev/platform/api/${libs.versions.adventurePlatform.get()}",
     )
   }

diff --git a/...rge/src/main/java/net/kyori/adventure/platform/neoforge/impl/AdventureNeoforgeCommon.java b/...rge/src/main/java/net/kyori/adventure/platform/neoforge/impl/AdventureNeoforgeCommon.java
@@ -28,6 +28,7 @@
 import com.google.common.cache.CacheBuilder;
 import java.util.Objects;
 import java.util.concurrent.ExecutionException;
+import net.kyori.adventure.Adventure;
 import net.kyori.adventure.permission.PermissionChecker;
 import net.kyori.adventure.platform.modcommon.ComponentArgumentType;
 import net.kyori.adventure.platform.modcommon.KeyArgumentType;
@@ -70,7 +71,7 @@
 @SuppressWarnings("checkstyle:HideUtilityClassConstructor") // Not a utility class, this is our main mod class.
 public final class AdventureNeoforgeCommon {
   public static SidedProxy SIDE_PROXY;
-  private static final DeferredRegister<ArgumentTypeInfo<?, ?>> COMMAND_ARGUMENT_TYPES = DeferredRegister.create(Registries.COMMAND_ARGUMENT_TYPE, "adventure");
+  private static final DeferredRegister<ArgumentTypeInfo<?, ?>> COMMAND_ARGUMENT_TYPES = DeferredRegister.create(Registries.COMMAND_ARGUMENT_TYPE, Adventure.NAMESPACE);
 
   static {
     if (FMLLoader.getDist() == Dist.DEDICATED_SERVER) {
@@ -122,7 +123,7 @@ public AdventureNeoforgeCommon(final IEventBus bus) {
   @AutoService(PlatformHooks.class)
   public static final class ForgeHooks implements PlatformHooks {
     private static final Cache<String, PermissionNode<Boolean>> PERMISSION_NODE_CACHE = CacheBuilder.newBuilder().maximumSize(100).build();
-    private static final PermissionNode<Boolean> NULL = new PermissionNode<>("adventure", "null", PermissionTypes.BOOLEAN, (player, playerUUID, context) -> true);
+    private static final PermissionNode<Boolean> NULL = new PermissionNode<>(Adventure.NAMESPACE, "null", PermissionTypes.BOOLEAN, (player, playerUUID, context) -> true);
 
     @Override
     public SidedProxy sidedProxy() {