Skip to content

Commit b8e40a5

Browse files
committed
Cleaned-up the way of registering function.
1 parent 8f3c162 commit b8e40a5

2 files changed

Lines changed: 16 additions & 7 deletions

File tree

api/src/main/java/fr/jamailun/ultimatespellsystem/api/providers/JavaFunctionProvider.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,15 @@ private JavaFunctionProvider() {}
1515
return INSTANCE;
1616
}
1717

18+
/**
19+
* A way to register a function, without having to repeat the function ID.
20+
* @param newFunction the non-null fonction to register.
21+
* @param nameVariants optional array of alternatives to the name.
22+
*/
23+
public void registerFunction(@NotNull RunnableJavaFunction newFunction, String @NotNull ... nameVariants) {
24+
super.register(newFunction, newFunction.getId(), nameVariants);
25+
}
26+
1827
@Override
1928
protected void postRegister(@NotNull String key, @NotNull RunnableJavaFunction function) {
2029
// Also register to the DSL.

plugin/src/main/java/fr/jamailun/ultimatespellsystem/extension/ExtensionLoader.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ public static synchronized void load() {
2727
UltimateSpellSystem.logInfo("Loading extension.");
2828

2929
// Functions
30-
JavaFunctionProvider.instance().register(new RayCastFunction(), "raycast", "raycast_block");
31-
JavaFunctionProvider.instance().register(new CastSpellFunction(), "cast");
32-
JavaFunctionProvider.instance().register(new DistanceFunction(), "distance", "dist");
33-
JavaFunctionProvider.instance().register(new IsValidFunction(), "is_valid");
34-
JavaFunctionProvider.instance().register(new SetFireFunction(), "set_fire");
35-
JavaFunctionProvider.instance().register(new StrikeFunction(), "strike");
36-
JavaFunctionProvider.instance().register(new DamageFunction(), "damage_entity");
30+
JavaFunctionProvider.instance().registerFunction(new RayCastFunction(), "raycast_block");
31+
JavaFunctionProvider.instance().registerFunction(new CastSpellFunction());
32+
JavaFunctionProvider.instance().registerFunction(new DistanceFunction(), "dist");
33+
JavaFunctionProvider.instance().registerFunction(new IsValidFunction());
34+
JavaFunctionProvider.instance().registerFunction(new SetFireFunction());
35+
JavaFunctionProvider.instance().registerFunction(new StrikeFunction());
36+
JavaFunctionProvider.instance().registerFunction(new DamageFunction());
3737

3838
// Others
3939
Scopes.register();

0 commit comments

Comments
 (0)