Skip to content

Commit 4786fab

Browse files
Hack together default pattern
1 parent 23cca06 commit 4786fab

File tree

6 files changed

+12
-6
lines changed

6 files changed

+12
-6
lines changed

src/main/java/org/skriptlang/reflect/syntax/CustomSyntaxStructure.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
public abstract class CustomSyntaxStructure<T extends CustomSyntaxStructure.SyntaxData> extends Structure {
3535

36+
public static final String DEFAULT_PATTERN = "this is here because at least one pattern is required";
3637
public static final Priority PRIORITY = new Priority(350);
3738

3839
public static class CustomSyntaxEvent extends Event {
@@ -194,9 +195,14 @@ private void update() {
194195
SyntaxInfo<?> oldSyntaxInfo = getDataTracker().getInfo();
195196
// an angel weeps
196197
syntaxRegistry.unregister((SyntaxRegistry.Key) getDataTracker().getSyntaxKey(), (SyntaxInfo<?>) oldSyntaxInfo);
198+
199+
List<String> patterns = new ArrayList<>(getDataTracker().getPatterns());
200+
if (!patterns.isEmpty()) {
201+
patterns.add(DEFAULT_PATTERN);
202+
}
197203
SyntaxInfo<?> newSyntaxInfo = oldSyntaxInfo.builder()
198204
.clearPatterns()
199-
.addPatterns(getDataTracker().getPatterns())
205+
.addPatterns(patterns)
200206
.build();
201207
syntaxRegistry.register((SyntaxRegistry.Key) getDataTracker().getSyntaxKey(), newSyntaxInfo);
202208
getDataTracker().setInfo(newSyntaxInfo);

src/main/java/org/skriptlang/reflect/syntax/condition/elements/StructCustomCondition.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class StructCustomCondition extends CustomSyntaxStructure<ConditionSyntax
5757
static final Map<ConditionSyntaxInfo, Boolean> parseSectionLoaded = new HashMap<>();
5858

5959
static {
60-
Skript.registerCondition(CustomCondition.class, "this is here because at least one pattern is required");
60+
Skript.registerCondition(CustomCondition.class, DEFAULT_PATTERN);
6161
Optional<SyntaxInfo<? extends Condition>> info = SkriptMirror.getAddonInstance().syntaxRegistry().syntaxes(SyntaxRegistry.CONDITION).stream()
6262
.filter(i -> i.type() == CustomCondition.class)
6363
.findFirst();

src/main/java/org/skriptlang/reflect/syntax/effect/elements/StructCustomEffect.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class StructCustomEffect extends CustomSyntaxStructure<EffectSyntaxInfo>
5151
static final Map<EffectSyntaxInfo, Boolean> parseSectionLoaded = new HashMap<>();
5252

5353
static {
54-
Skript.registerEffect(CustomEffect.class, "this is here because at least one pattern is required");
54+
Skript.registerEffect(CustomEffect.class, DEFAULT_PATTERN);
5555
Optional<SyntaxInfo<? extends Effect>> info = SkriptMirror.getAddonInstance().syntaxRegistry().syntaxes(SyntaxRegistry.EFFECT).stream()
5656
.filter(i -> i.type() == CustomEffect.class)
5757
.findFirst();

src/main/java/org/skriptlang/reflect/syntax/event/elements/StructCustomEvent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public boolean canCreateWith(String node) {
6262
static final Map<EventSyntaxInfo, Boolean> parseSectionLoaded = new HashMap<>();
6363

6464
static {
65-
Skript.registerEvent("custom event", CustomEvent.class, BukkitCustomEvent.class, "this is here because at least one pattern is required");
65+
Skript.registerEvent("custom event", CustomEvent.class, BukkitCustomEvent.class, DEFAULT_PATTERN);
6666
Optional<BukkitSyntaxInfos.Event<?>> info = SkriptMirror.getAddonInstance().syntaxRegistry().syntaxes(BukkitRegistryKeys.EVENT).stream()
6767
.filter(i -> i.type() == CustomEvent.class)
6868
.findFirst();

src/main/java/org/skriptlang/reflect/syntax/expression/elements/StructCustomConstant.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class StructCustomConstant extends CustomSyntaxStructure<ConstantSyntaxIn
3939

4040
static {
4141
// noinspection unchecked
42-
Skript.registerExpression(CustomExpression.class, Object.class, ExpressionType.SIMPLE, "this is here because at least one pattern is required");
42+
Skript.registerExpression(CustomExpression.class, Object.class, ExpressionType.SIMPLE, DEFAULT_PATTERN);
4343
Optional<SyntaxInfo<?>> info = SkriptMirror.getAddonInstance().syntaxRegistry().elements().stream()
4444
.filter(i -> Expression.class.isAssignableFrom(i.type()))
4545
.filter(i -> i.type() == CustomExpression.class)

src/main/java/org/skriptlang/reflect/syntax/expression/elements/StructCustomExpression.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ protected Class<?> getValue(String value) {
8888

8989
static {
9090
// noinspection unchecked
91-
Skript.registerExpression(CustomExpression.class, Object.class, ExpressionType.PATTERN_MATCHES_EVERYTHING, "this is here because at least one pattern is required");
91+
Skript.registerExpression(CustomExpression.class, Object.class, ExpressionType.PATTERN_MATCHES_EVERYTHING, DEFAULT_PATTERN);
9292
Optional<SyntaxInfo<?>> info = SkriptMirror.getAddonInstance().syntaxRegistry().elements().stream()
9393
.filter(i -> Expression.class.isAssignableFrom(i.type()))
9494
.filter(i -> i.type() == CustomExpression.class)

0 commit comments

Comments
 (0)