-
-
Notifications
You must be signed in to change notification settings - Fork 368
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev/feature' into tooltips
- Loading branch information
Showing
16 changed files
with
415 additions
and
103 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
src/main/java/ch/njol/skript/classes/registry/RegistryClassInfo.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /** | ||
| * This file is part of Skript. | ||
| * | ||
| * Skript is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * Skript is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with Skript. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| * Copyright Peter Güttinger, SkriptLang team and contributors | ||
| */ | ||
| package ch.njol.skript.classes.registry; | ||
|
|
||
| import ch.njol.skript.classes.ClassInfo; | ||
| import ch.njol.skript.expressions.base.EventValueExpression; | ||
| import ch.njol.skript.lang.DefaultExpression; | ||
| import org.bukkit.Keyed; | ||
| import org.bukkit.Registry; | ||
|
|
||
| /** | ||
| * This class can be used for easily creating ClassInfos for {@link Registry}s. | ||
| * It registers a language node with usage, a serializer, default expression, and a parser. | ||
| * | ||
| * @param <R> The Registry class. | ||
| */ | ||
| public class RegistryClassInfo<R extends Keyed> extends ClassInfo<R> { | ||
|
|
||
| public RegistryClassInfo(Class<R> registryClass, Registry<R> registry, String codeName, String languageNode) { | ||
| this(registryClass, registry, codeName, languageNode, new EventValueExpression<>(registryClass)); | ||
| } | ||
|
|
||
| /** | ||
| * @param registry The registry | ||
| * @param codeName The name used in patterns | ||
| */ | ||
| public RegistryClassInfo(Class<R> registryClass, Registry<R> registry, String codeName, String languageNode, DefaultExpression<R> defaultExpression) { | ||
| super(registryClass, codeName); | ||
| RegistryParser<R> registryParser = new RegistryParser<>(registry, languageNode); | ||
| usage(registryParser.getAllNames()) | ||
| .supplier(registry::iterator) | ||
| .serializer(new RegistrySerializer<R>(registry)) | ||
| .defaultExpression(defaultExpression) | ||
| .parser(registryParser); | ||
| } | ||
|
|
||
| } |
155 changes: 155 additions & 0 deletions
155
src/main/java/ch/njol/skript/classes/registry/RegistryParser.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,155 @@ | ||
| /** | ||
| * This file is part of Skript. | ||
| * | ||
| * Skript is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * Skript is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with Skript. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| * Copyright Peter Güttinger, SkriptLang team and contributors | ||
| */ | ||
| package ch.njol.skript.classes.registry; | ||
|
|
||
| import ch.njol.skript.classes.Parser; | ||
| import ch.njol.skript.lang.ParseContext; | ||
| import ch.njol.skript.localization.Language; | ||
| import ch.njol.skript.localization.Noun; | ||
| import ch.njol.util.NonNullPair; | ||
| import ch.njol.util.StringUtils; | ||
| import org.bukkit.Keyed; | ||
| import org.bukkit.NamespacedKey; | ||
| import org.bukkit.Registry; | ||
| import org.jetbrains.annotations.NotNull; | ||
| import org.jetbrains.annotations.Nullable; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Locale; | ||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * A parser based on a {@link Registry} used to parse data from a string or turn data into a string. | ||
| * | ||
| * @param <R> Registry class | ||
| */ | ||
| public class RegistryParser<R extends Keyed> extends Parser<R> { | ||
|
|
||
| private final Registry<R> registry; | ||
| private final String languageNode; | ||
|
|
||
| private final Map<R, String> names = new HashMap<>(); | ||
| private final Map<String, R> parseMap = new HashMap<>(); | ||
|
|
||
| public RegistryParser(Registry<R> registry, String languageNode) { | ||
| assert !languageNode.isEmpty() && !languageNode.endsWith(".") : languageNode; | ||
| this.registry = registry; | ||
| this.languageNode = languageNode; | ||
| refresh(); | ||
| Language.addListener(this::refresh); | ||
| } | ||
|
|
||
| private void refresh() { | ||
| names.clear(); | ||
| parseMap.clear(); | ||
| for (R registryObject : registry) { | ||
| NamespacedKey namespacedKey = registryObject.getKey(); | ||
| String namespace = namespacedKey.getNamespace(); | ||
| String key = namespacedKey.getKey(); | ||
| String keyWithSpaces = key.replace("_", " "); | ||
| String languageKey = languageNode + "." + key; | ||
|
|
||
| // Put the full namespaced key as a pattern | ||
| parseMap.put(namespacedKey.toString(), registryObject); | ||
|
|
||
| // If the object is a vanilla Minecraft object, we'll add the key with spaces as a pattern | ||
| if (namespace.equalsIgnoreCase(NamespacedKey.MINECRAFT)) { | ||
| parseMap.put(keyWithSpaces, registryObject); | ||
| } | ||
|
|
||
| String[] options = Language.getList(languageKey); | ||
| // Missing/Custom registry objects | ||
| if (options.length == 1 && options[0].equals(languageKey.toLowerCase(Locale.ENGLISH))) { | ||
| if (namespace.equalsIgnoreCase(NamespacedKey.MINECRAFT)) { | ||
| // If the object is a vanilla Minecraft object, we'll use the key with spaces as a name | ||
| names.put(registryObject, keyWithSpaces); | ||
| } else { | ||
| // If the object is a custom object, we'll use the full namespaced key as a name | ||
| names.put(registryObject, namespacedKey.toString()); | ||
| } | ||
| } else { | ||
| for (String option : options) { | ||
| option = option.toLowerCase(Locale.ENGLISH); | ||
|
|
||
| // Isolate the gender if one is present | ||
| NonNullPair<String, Integer> strippedOption = Noun.stripGender(option, languageKey); | ||
| String first = strippedOption.getFirst(); | ||
| Integer second = strippedOption.getSecond(); | ||
|
|
||
| // Add to name map if needed | ||
| names.putIfAbsent(registryObject, first); | ||
|
|
||
| parseMap.put(first, registryObject); | ||
| if (second != -1) { // There is a gender present | ||
| parseMap.put(Noun.getArticleWithSpace(second, Language.F_INDEFINITE_ARTICLE) + first, registryObject); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * This method attempts to match the string input against one of the string representations of the registry. | ||
| * | ||
| * @param input a string to attempt to match against one in the registry. | ||
| * @param context of parsing, may not be null | ||
| * @return The registry object matching the input, or null if no match could be made. | ||
| */ | ||
| @Override | ||
| public @Nullable R parse(String input, @NotNull ParseContext context) { | ||
| return parseMap.get(input.toLowerCase(Locale.ENGLISH)); | ||
| } | ||
|
|
||
| /** | ||
| * This method returns the string representation of a registry. | ||
| * | ||
| * @param object The object to represent as a string. | ||
| * @param flags not currently used | ||
| * @return A string representation of the registry object. | ||
| */ | ||
| @Override | ||
| public @NotNull String toString(R object, int flags) { | ||
| return names.get(object); | ||
| } | ||
|
|
||
| /** | ||
| * Returns a registry object's string representation in a variable name. | ||
| * | ||
| * @param object Object to represent in a variable name. | ||
| * @return The given object's representation in a variable name. | ||
| */ | ||
| @Override | ||
| public @NotNull String toVariableNameString(R object) { | ||
| return toString(object, 0); | ||
| } | ||
|
|
||
| /** | ||
| * @return A comma-separated string containing a list of all names representing the registry. | ||
| * Note that some entries may represent the same registry object. | ||
| */ | ||
| public String getAllNames() { | ||
| List<String> strings = new ArrayList<>(parseMap.keySet()); | ||
| Collections.sort(strings); | ||
| return StringUtils.join(strings, ", "); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.