Skip to content

Namespaced identifier improvements #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SpaceWalkerRS wants to merge 3 commits into
base: gen2
Choose a base branch
from
+129 −2
Open

Namespaced identifier improvements #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2ff5ec
[core] expand identifier with namespaced() and subidentifier() methods
SpaceWalkerRS Oct 1, 2026
7625b8d
[core] compare string-separators for identifiers
SpaceWalkerRS Sep 22, 2026
130adb1
[core] add validation check methods to NamespacedIdentifiers
SpaceWalkerRS Oct 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions ...w27a-mc1.14.4/src/main/java/net/ornithemc/osl/core/impl/mixin/common/IdentifierMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ public String identifier() {
return path;
}

@Override
public Identifier namespaced(String namespace) {
return new Identifier(namespace, path);
}

@Override
public Identifier prefixed(String prefix) {
return new Identifier(namespace, prefix + path);
Expand All @@ -52,4 +57,14 @@ public Identifier prefixed(String prefix) {
public Identifier suffixed(String suffix) {
return new Identifier(namespace, path + suffix);
}

@Override
public Identifier subidentifier(int beginIndex) {
return new Identifier(namespace, path.substring(beginIndex));
}

@Override
public Identifier subidentifier(int beginIndex, int endIndex) {
return new Identifier(namespace, path.substring(beginIndex, endIndex));
}
}
15 changes: 15 additions & 0 deletions ...w27a-mc1.14.4/src/main/java/net/ornithemc/osl/core/impl/util/IdentifierExtensionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ default String identifier() {
throw new AbstractMethodError();
}

@Override
default Identifier namespaced(String namespace) {
throw new AbstractMethodError();
}

@Override
default Identifier prefixed(String prefix) {
throw new AbstractMethodError();
Expand All @@ -25,4 +30,14 @@ default Identifier prefixed(String prefix) {
default Identifier suffixed(String suffix) {
throw new AbstractMethodError();
}

@Override
default Identifier subidentifier(int beginIndex) {
throw new AbstractMethodError();
}

@Override
default Identifier subidentifier(int beginIndex, int endIndex) {
throw new AbstractMethodError();
}
}
15 changes: 15 additions & 0 deletions ...1_01-mc14w26c/src/main/java/net/ornithemc/osl/core/impl/mixin/client/IdentifierMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ public String identifier() {
return path;
}

@Override
public Identifier namespaced(String namespace) {
return new Identifier(namespace, path);
}

@Override
public Identifier prefixed(String prefix) {
return new Identifier(namespace, prefix + path);
Expand All @@ -56,4 +61,14 @@ public Identifier prefixed(String prefix) {
public Identifier suffixed(String suffix) {
return new Identifier(namespace, path + suffix);
}

@Override
public Identifier subidentifier(int beginIndex) {
return new Identifier(namespace, path.substring(beginIndex));
}

@Override
public Identifier subidentifier(int beginIndex, int endIndex) {
return new Identifier(namespace, path.substring(beginIndex, endIndex));
}
}
15 changes: 15 additions & 0 deletions ...1_01-mc14w26c/src/main/java/net/ornithemc/osl/core/impl/util/IdentifierExtensionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ default String identifier() {
throw new AbstractMethodError();
}

@Override
default Identifier namespaced(String namespace) {
throw new AbstractMethodError();
}

@Override
default Identifier prefixed(String prefix) {
throw new AbstractMethodError();
Expand All @@ -25,4 +30,14 @@ default Identifier prefixed(String prefix) {
default Identifier suffixed(String suffix) {
throw new AbstractMethodError();
}

@Override
default Identifier subidentifier(int beginIndex) {
throw new AbstractMethodError();
}

@Override
default Identifier subidentifier(int beginIndex, int endIndex) {
throw new AbstractMethodError();
}
}
24 changes: 23 additions & 1 deletion libraries/core/src/main/java/net/ornithemc/osl/core/api/util/NamespacedIdentifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,14 @@ public interface NamespacedIdentifier {
* The separator between the namespace and identifier in the {@code String}
* representation of a {@code NamespacedIdentifier}.
*/
static char SEPARATOR = ':';
char SEPARATOR = ':';

/**
* @return the separator for the {@linkplain String}-representation of this {@code NamespacedIdentifier}.
*/
default char separator() {
return SEPARATOR;
}

/**
* @return the namespace of this {@code NamespacedIdentifier}.
Expand All @@ -35,6 +42,11 @@ public interface NamespacedIdentifier {
*/
String identifier();

/**
* @return a copy of this {@code NamespacedIdentifier} with the given namespace.
*/
NamespacedIdentifier namespaced(String namespace);

/**
* @return a copy of this {@code NamespacedIdentifier} with the given prefix.
*/
Expand All @@ -45,4 +57,14 @@ public interface NamespacedIdentifier {
*/
NamespacedIdentifier suffixed(String suffix);

/**
* @return a copy of this {@code NamespacedIdentifier} that is a subidentifier of this identifier.
*/
NamespacedIdentifier subidentifier(int beginIndex);

/**
* @return a copy of this {@code NamespacedIdentifier} that is a subidentifier of this identifier.
*/
NamespacedIdentifier subidentifier(int beginIndex, int endIndex);

}
32 changes: 31 additions & 1 deletion libraries/core/src/main/java/net/ornithemc/osl/core/api/util/NamespacedIdentifiers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,37 @@ public static String validateIdentifier(String identifier) {
return identifier;
}

/**
* @return whether the given {@linkplain NamespacedIdentifier} is valid.
*/
public static boolean isValid(NamespacedIdentifier identifier) {
return isValidNamespace(identifier.namespace()) && isValidIdentifier(identifier.identifier());
}

/**
* @return whether the given {@linkplain String} is a valid namespace.
*/
public static boolean isValidNamespace(String namespace) {
return namespace != null && !namespace.isEmpty()
&& namespace.chars().allMatch(chr -> chr == '-' || chr == '.' || chr == '_' || (chr >= 'a' && chr <= 'z') || (chr >= '0' && chr <= '9'));
}

/**
* @return whether the given {@linkplain String} is a valid identifier.
*/
public static boolean isValidIdentifier(String identifier) {
return identifier != null && !identifier.isEmpty()
&& identifier.chars().allMatch(chr -> chr == '-' || chr == '.' || chr == '_' || chr == '/' || (chr >= 'a' && chr <= 'z') || (chr >= '0' && chr <= '9'));
}

/**
* @return whether the given character is allowed in a {@linkplain NamespacedIdentifier}
*/
public static boolean isCharAllowed(int chr) {
return (chr == ':' || chr == '-' || chr == '.' || chr == '_' || chr == '/' || (chr >= 'a' && chr <= 'z') || (chr >= '0' && chr <= '9'));
}

public static boolean equals(NamespacedIdentifier a, NamespacedIdentifier b) {
return a.namespace().equals(b.namespace()) && a.identifier().equals(b.identifier());
return a.separator() == b.separator() && a.namespace().equals(b.namespace()) && a.identifier().equals(b.identifier());
}
}
15 changes: 15 additions & 0 deletions libraries/core/src/main/java/net/ornithemc/osl/core/impl/util/NamespacedIdentifierImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ public String identifier() {
return identifier;
}

@Override
public NamespacedIdentifier namespaced(String namespace) {
return new NamespacedIdentifierImpl(namespace, identifier);
}

@Override
public NamespacedIdentifier prefixed(String prefix) {
return new NamespacedIdentifierImpl(namespace, prefix + identifier);
Expand All @@ -64,4 +69,14 @@ public NamespacedIdentifier prefixed(String prefix) {
public NamespacedIdentifier suffixed(String suffix) {
return new NamespacedIdentifierImpl(namespace, identifier + suffix);
}

@Override
public NamespacedIdentifier subidentifier(int beginIndex) {
return new NamespacedIdentifierImpl(namespace, identifier.substring(beginIndex));
}

@Override
public NamespacedIdentifier subidentifier(int beginIndex, int endIndex) {
return new NamespacedIdentifierImpl(namespace, identifier.substring(beginIndex, endIndex));
}
}
Loading