24w21b

KyoriPowered · May 28, 2024 · ae3dcc1 · ae3dcc1
1 parent 701b16e
commit ae3dcc1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -44,7 +44,8 @@ indraSpotlessLicenser {
 }
 
 spotless {
-  ratchetFrom("origin/mc/${libs.versions.minecraft.get().splitToSequence('.').take(2).joinToString(".")}")
+  //ratchetFrom("origin/mc/${libs.versions.minecraft.get().splitToSequence('.').take(2).joinToString(".")}")
+  ratchetFrom("origin/mc/1.20")
 
   java {
     importOrderFile(rootProject.file(".spotless/kyori.importorder"))

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -8,11 +8,11 @@ ansi = "1.0.3"
 autoService = "1.1.1"
 checkstyle = "10.16.0"
 examination = "1.3.0"
-fabricApi = "0.98.0+1.20.6"
+fabricApi = "0.99.1+1.21"
 fabricLoader = "0.15.11"
 indra = "3.1.3"
 junit = "5.10.2"
-minecraft = "1.20.6"
+minecraft = "24w21b"
 parchment = "1.20.6:2024.05.01"
 vineflower = "1.10.1"
 spotless = "6.25.0"

diff --git a/src/main/java/net/kyori/adventure/platform/fabric/impl/AdventureCommon.java b/src/main/java/net/kyori/adventure/platform/fabric/impl/AdventureCommon.java
@@ -177,7 +177,7 @@ private static ComponentFlattener createFlattener(final SidedProxy proxy) {
   }
 
   public static ResourceLocation res(final @NotNull String value) {
-    return new ResourceLocation(Adventure.NAMESPACE, value);
+    return ResourceLocation.fromNamespaceAndPath(Adventure.NAMESPACE, value);
   }
 
   @Override

diff --git a/src/mixin/java/net/kyori/adventure/platform/fabric/impl/mixin/api/KeyMixin.java b/src/mixin/java/net/kyori/adventure/platform/fabric/impl/mixin/api/KeyMixin.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of adventure-platform-fabric, licensed under the MIT License.
  *
- * Copyright (c) 2020-2022 KyoriPowered
+ * Copyright (c) 2020-2024 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -47,7 +47,7 @@ public interface KeyMixin {
   @SuppressWarnings("overwrite")
   static @NotNull Key key(final String namespace, final String value) {
     try {
-      return new ResourceLocation(namespace, value);
+      return ResourceLocation.fromNamespaceAndPath(namespace, value);
     } catch (final ResourceLocationException ex) {
       throw InvalidKeyExceptionAccess.newInvalidKeyException(namespace, value, ex.getMessage());
     }

diff --git a/src/testmod/java/net/kyori/adventure/platform/test/fabric/AdventureTester.java b/src/testmod/java/net/kyori/adventure/platform/test/fabric/AdventureTester.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of adventure-platform-fabric, licensed under the MIT License.
  *
- * Copyright (c) 2020-2023 KyoriPowered
+ * Copyright (c) 2020-2024 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -52,6 +52,7 @@
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.loader.api.FabricLoader;
+import net.kyori.adventure.Adventure;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.bossbar.BossBar;
 import net.kyori.adventure.chat.ChatType;
@@ -126,7 +127,7 @@ public class AdventureTester implements ModInitializer {
   private static final ChatType ADVENTURE_BROADCAST = net.kyori.adventure.chat.ChatType.chatType(advKey("broadcast"));
 
   private static ResourceLocation advKey(final String location) {
-    return new ResourceLocation("adventure", location);
+    return ResourceLocation.fromNamespaceAndPath(Adventure.NAMESPACE, location);
   }
 
   public @NotNull FabricServerAudiences adventure() {