Fix incorrect mapping of ResourceLocationArgument#getId in 1.20.5 & 1.20.6

Author: willkroboth

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.18.2/src/main/java/dev/jorel/commandapi/nms/NMS_1_18_R2.java

@@ -572,10 +572,6 @@ public org.bukkit.loot.LootTable getLootTable(CommandContext<CommandSourceStack>
 		ResourceLocation resourceLocation = ResourceLocationArgument.getId(cmdCtx, key);
 		return new CraftLootTable(fromResourceLocation(resourceLocation), this.<MinecraftServer>getMinecraftServer().getLootTables().get(resourceLocation));
 	}
-	
-	public NamespacedKey getMinecraftKey(CommandContext<CommandSourceStack> cmdCtx, String key) {
-		return fromResourceLocation(ResourceLocationArgument.getId(cmdCtx, key));
-	}
 
 	@Override
 	public ParticleData<?> getParticle(CommandContext<CommandSourceStack> cmdCtx, String key) {

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.18/src/main/java/dev/jorel/commandapi/nms/NMS_1_18_R1.java

@@ -520,7 +520,8 @@ public org.bukkit.loot.LootTable getLootTable(CommandContext<CommandSourceStack>
 		ResourceLocation resourceLocation = ResourceLocationArgument.getId(cmdCtx, key);
 		return new CraftLootTable(fromResourceLocation(resourceLocation), this.<MinecraftServer>getMinecraftServer().getLootTables().get(resourceLocation));
 	}
-	
+
+	@Override
 	public NamespacedKey getMinecraftKey(CommandContext<CommandSourceStack> cmdCtx, String key) {
 		return fromResourceLocation(ResourceLocationArgument.getId(cmdCtx, key));
 	}

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.20.5/src/main/java/dev/jorel/commandapi/nms/NMS_1_20_R4.java

@@ -666,6 +666,11 @@ public final org.bukkit.loot.LootTable getLootTable(CommandContext<CommandSource
 		return CraftLootTable.minecraftToBukkit(ResourceLocationArgument.getId(cmdCtx, key));
 	}
 
+	@Override
+	public NamespacedKey getMinecraftKey(CommandContext<CommandSourceStack> cmdCtx, String key) {
+		return fromResourceLocation(ResourceLocationArgument.getId(cmdCtx, key));
+	}
+
 	@Differs(from = "1.20.4", by = "New particle option ColorParticleOption")
 	@Override
 	public final ParticleData<?> getParticle(CommandContext<CommandSourceStack> cmdCtx, String key) {

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-nms-common/src/main/java/dev/jorel/commandapi/nms/NMS_Common.java

@@ -476,6 +476,7 @@ public final MathOperation getMathOperation(CommandContext<CommandSourceStack> c
 
 	@Override
 	@Overridden(in = "1.17 common; 1.18", because = "1.17 uses ArgumentMinecraftKeyRegistered.f instead of ArgumentMinecraftKeyRegistered.e")
+	@Overridden(in = "1.20.5, 1.20.6", because = "ArgumentMinecraftKeyRegistered.e -> ArgumentMinecraftKeyRegistered.c")
 	public NamespacedKey getMinecraftKey(CommandContext<CommandSourceStack> cmdCtx, String key) {
 		return fromResourceLocation(ResourceLocationArgument.getId(cmdCtx, key));
 	}

commandapi-preprocessor/src/main/java/dev/jorel/commandapi/preprocessor/Overridden.java

@@ -20,10 +20,7 @@
  *******************************************************************************/
 package dev.jorel.commandapi.preprocessor;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * Literally just a fancy comment that I can put next to stuff to know why
@@ -32,6 +29,7 @@
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.SOURCE)
+@Repeatable(OverriddenRepeatable.class)
 public @interface Overridden {
 
 	/**

commandapi-preprocessor/src/main/java/dev/jorel/commandapi/preprocessor/OverriddenRepeatable.java

@@ -0,0 +1,12 @@
+package dev.jorel.commandapi.preprocessor;
+
+import java.lang.annotation.*;
+
+/**
+ * The repeatable version of {@link Overridden}
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.SOURCE)
+public @interface OverriddenRepeatable {
+	Overridden[] value();
+}