Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-07 17:08:30 +01:00
Code Issues Projects Releases Wiki Activity

Make NamespaceID implement Key directly

Browse Source
This commit is contained in:
Kieran Wallbanks 2021-04-09 13:47:53 +01:00
parent 164873c313
commit 05192de8e1
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/net/minestom/server/utils/NamespaceID.java
View File

@ -2,7 +2,6 @@ package net.minestom.server.utils;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import net.kyori.adventure.key.Key; import net.kyori.adventure.key.Key;
import net.kyori.adventure.key.Keyed;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.Objects; import java.util.Objects;
@ -11,7 +10,7 @@ import java.util.Objects;
* Represents a namespaced ID * Represents a namespaced ID
* https://minecraft.gamepedia.com/Namespaced_ID * https://minecraft.gamepedia.com/Namespaced_ID
*/ */
public class NamespaceID implements CharSequence, Keyed { public class NamespaceID implements CharSequence, Key {
private static final Int2ObjectOpenHashMap<NamespaceID> cache = new Int2ObjectOpenHashMap<>(); private static final Int2ObjectOpenHashMap<NamespaceID> cache = new Int2ObjectOpenHashMap<>();
private static final String legalLetters = "[0123456789abcdefghijklmnopqrstuvwxyz_-]+"; private static final String legalLetters = "[0123456789abcdefghijklmnopqrstuvwxyz_-]+";
private static final String legalPathLetters = "[0123456789abcdefghijklmnopqrstuvwxyz./_-]+"; private static final String legalPathLetters = "[0123456789abcdefghijklmnopqrstuvwxyz./_-]+";
@ -19,7 +18,6 @@ public class NamespaceID implements CharSequence, Keyed {
private final String domain; private final String domain;
private final String path; private final String path;
private final String full; private final String full;
private final Key key;
/** /**
* Extracts the domain from the namespace ID. "minecraft:stone" would return "minecraft". * Extracts the domain from the namespace ID. "minecraft:stone" would return "minecraft".
@ -80,7 +78,6 @@ public class NamespaceID implements CharSequence, Keyed {
} }
this.full = toString(); this.full = toString();
validate(); validate();
this.key = Key.key(this.domain, this.path);
} }
private NamespaceID(String domain, String path) { private NamespaceID(String domain, String path) {
@ -88,7 +85,6 @@ public class NamespaceID implements CharSequence, Keyed {
this.path = path; this.path = path;
this.full = toString(); this.full = toString();
validate(); validate();
this.key = Key.key(this.domain, this.path);
} }
private void validate() { private void validate() {
@ -141,7 +137,17 @@ public class NamespaceID implements CharSequence, Keyed {
} }
@Override @Override
public @NotNull Key key() { public @NotNull String namespace() {
return this.key; return this.domain;
}
@Override
public @NotNull String value() {
return this.path;
}
@Override
public @NotNull String asString() {
return this.full;
} }
} }