Skip to content

Commit 790001b

Browse files
brachy84brachy84
committed
fix backwards compat
1 parent 8b14b61 commit 790001b

File tree

3 files changed

+161
-16
lines changed

3 files changed

+161
-16
lines changed

‎src/main/java/com/cleanroommc/groovyscript/api/IGameObjectParser.java‎

Lines changed: 41 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
package com.cleanroommc.groovyscript.api;
22

3+
import com.cleanroommc.groovyscript.mapper.ObjectMappers;
4+
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
5+
import net.minecraft.util.ResourceLocation;
36
import net.minecraftforge.registries.IForgeRegistry;
47
import net.minecraftforge.registries.IForgeRegistryEntry;
58
import org.jetbrains.annotations.ApiStatus;
69
import org.jetbrains.annotations.NotNull;
710

11+
import java.util.Locale;
12+
import java.util.Map;
813
import java.util.function.Function;
914

1015
/**
@@ -15,27 +20,51 @@
1520
@FunctionalInterface
1621
public interface IGameObjectParser<T> extends IObjectParser<T> {
1722

18-
static <T extends IForgeRegistryEntry<T>> IObjectParser<T> wrapForgeRegistry(IForgeRegistry<T> forgeRegistry) {
19-
return IObjectParser.wrapForgeRegistry(forgeRegistry);
23+
static <T extends IForgeRegistryEntry<T>> IGameObjectParser<T> wrapForgeRegistry(IForgeRegistry<T> forgeRegistry) {
24+
return (s, args) -> {
25+
Result<ResourceLocation> rl = ObjectMappers.parseResourceLocation(s, args);
26+
if (rl.hasError()) return Result.error(rl.getError());
27+
T value = forgeRegistry.getValue(rl.getValue());
28+
return value == null ? Result.error() : Result.some(value);
29+
};
2030
}
2131

22-
static <T extends Enum<T>> IObjectParser<T> wrapEnum(Class<T> enumClass, boolean caseSensitive) {
23-
return IObjectParser.wrapEnum(enumClass, caseSensitive);
32+
static <T extends Enum<T>> IGameObjectParser<T> wrapEnum(Class<T> enumClass, boolean caseSensitive) {
33+
Map<String, T> map = new Object2ObjectOpenHashMap<>();
34+
for (T t : enumClass.getEnumConstants()) {
35+
map.put(caseSensitive ? t.name() : t.name().toUpperCase(Locale.ROOT), t);
36+
}
37+
return (s, args) -> {
38+
T t = map.get(caseSensitive ? s : s.toUpperCase(Locale.ROOT));
39+
return t == null ? Result.error() : Result.some(t);
40+
};
2441
}
2542

26-
static <T> IObjectParser<T> wrapStringGetter(Function<String, T> getter) {
27-
return IObjectParser.wrapStringGetter(getter);
43+
static <T> IGameObjectParser<T> wrapStringGetter(Function<String, T> getter) {
44+
return wrapStringGetter(getter, false);
2845
}
2946

30-
static <T> IObjectParser<T> wrapStringGetter(Function<String, T> getter, boolean isUpperCase) {
31-
return IObjectParser.wrapStringGetter(getter, isUpperCase);
47+
static <T> IGameObjectParser<T> wrapStringGetter(Function<String, T> getter, boolean isUpperCase) {
48+
return (s, args) -> {
49+
if (args.length > 0) {
50+
return Result.error("extra arguments are not allowed");
51+
}
52+
T t = getter.apply(isUpperCase ? s.toUpperCase(Locale.ROOT) : s);
53+
return t == null ? Result.error() : Result.some(t);
54+
};
3255
}
3356

34-
static <T, V> IObjectParser<T> wrapStringGetter(Function<String, V> getter, Function<V, @NotNull T> trueTypeFunction) {
35-
return IObjectParser.wrapStringGetter(getter, trueTypeFunction);
57+
static <T, V> IGameObjectParser<T> wrapStringGetter(Function<String, V> getter, Function<V, @NotNull T> trueTypeFunction) {
58+
return wrapStringGetter(getter, trueTypeFunction, false);
3659
}
3760

38-
static <T, V> IObjectParser<T> wrapStringGetter(Function<String, V> getter, Function<V, @NotNull T> trueTypeFunction, boolean isUpperCase) {
39-
return IObjectParser.wrapStringGetter(getter, trueTypeFunction, isUpperCase);
61+
static <T, V> IGameObjectParser<T> wrapStringGetter(Function<String, V> getter, Function<V, @NotNull T> trueTypeFunction, boolean isUpperCase) {
62+
return (s, args) -> {
63+
if (args.length > 0) {
64+
return Result.error("extra arguments are not allowed");
65+
}
66+
V v = getter.apply(isUpperCase ? s.toUpperCase(Locale.ROOT) : s);
67+
return v == null ? Result.error() : Result.some(trueTypeFunction.apply(v));
68+
};
4069
}
4170
}

‎src/main/java/com/cleanroommc/groovyscript/gameobjects/Completer.java‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.cleanroommc.groovyscript.gameobjects;
22

33
import org.eclipse.lsp4j.CompletionItem;
4+
import org.eclipse.lsp4j.CompletionItemKind;
45
import org.jetbrains.annotations.ApiStatus;
56

67
import java.util.function.Function;
@@ -12,10 +13,29 @@
1213
public interface Completer extends com.cleanroommc.groovyscript.mapper.Completer {
1314

1415
static <V> Completer ofNamed(Supplier<Iterable<V>> values, Function<V, String> toString, int preferredParamIndex) {
15-
return (Completer) com.cleanroommc.groovyscript.mapper.Completer.ofNamed(values, toString, preferredParamIndex);
16+
return ofValues(values, v -> {
17+
String s = toString.apply(v);
18+
if (s != null) {
19+
var item = new CompletionItem(toString.apply(v));
20+
item.setKind(CompletionItemKind.Constant);
21+
return item;
22+
}
23+
return null;
24+
}, preferredParamIndex);
1625
}
1726

1827
static <V> Completer ofValues(Supplier<Iterable<V>> values, Function<V, CompletionItem> toCompletionItem, int preferredParamIndex) {
19-
return (Completer) com.cleanroommc.groovyscript.mapper.Completer.ofValues(values, toCompletionItem, preferredParamIndex);
28+
return (paramIndex, items) -> {
29+
if (preferredParamIndex < 0 || preferredParamIndex == paramIndex) {
30+
items.addAll(values.get(), toCompletionItem);
31+
}
32+
};
33+
}
34+
35+
default Completer and(com.cleanroommc.groovyscript.mapper.Completer other) {
36+
return (paramIndex, items) -> {
37+
complete(paramIndex, items);
38+
other.complete(paramIndex, items);
39+
};
2040
}
2141
}

‎src/main/java/com/cleanroommc/groovyscript/gameobjects/GameObjectHandler.java‎

Lines changed: 98 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,110 @@
11
package com.cleanroommc.groovyscript.gameobjects;
22

3+
import com.cleanroommc.groovyscript.api.IGameObjectParser;
4+
import com.cleanroommc.groovyscript.api.IObjectParser;
5+
import com.cleanroommc.groovyscript.api.Result;
6+
import com.cleanroommc.groovyscript.compat.mods.GroovyContainer;
7+
import com.cleanroommc.groovyscript.mapper.Completer;
38
import com.cleanroommc.groovyscript.mapper.ObjectMapper;
9+
import net.minecraft.util.ResourceLocation;
10+
import net.minecraftforge.registries.IForgeRegistry;
11+
import net.minecraftforge.registries.IForgeRegistryEntry;
412
import org.jetbrains.annotations.ApiStatus;
513

14+
import java.util.function.Function;
15+
import java.util.function.Supplier;
16+
617
@Deprecated
718
@ApiStatus.ScheduledForRemoval(inVersion = "1.2.0")
819
public class GameObjectHandler<T> {
920

1021
@ApiStatus.Internal
11-
public static <T> ObjectMapper.Builder<T> builder(String name, Class<T> returnTpe) {
12-
return ObjectMapper.builder(name, returnTpe);
22+
public static <T> Builder<T> builder(String name, Class<T> returnTpe) {
23+
return new Builder<>(name, returnTpe);
24+
}
25+
26+
public static class Builder<T> extends ObjectMapper.Builder<T> {
27+
28+
public Builder(String name, Class<T> returnType) {
29+
super(name, returnType);
30+
}
31+
32+
@Override
33+
public Builder<T> mod(String mod) {
34+
return (Builder<T>) super.mod(mod);
35+
}
36+
37+
@Override
38+
public Builder<T> mod(GroovyContainer<?> mod) {
39+
return (Builder<T>) super.mod(mod);
40+
}
41+
42+
@Override
43+
public Builder<T> parser(IObjectParser<T> handler) {
44+
return (Builder<T>) super.parser(handler);
45+
}
46+
47+
public Builder<T> parser(IGameObjectParser<T> handler) {
48+
return (Builder<T>) super.parser(handler);
49+
}
50+
51+
@Override
52+
public Builder<T> completer(Completer completer) {
53+
return (Builder<T>) super.completer(completer);
54+
}
55+
56+
public Builder<T> completer(com.cleanroommc.groovyscript.gameobjects.Completer completer) {
57+
return (Builder<T>) super.completer(completer);
58+
}
59+
60+
@Override
61+
public Builder<T> completerOfNames(Supplier<Iterable<String>> values) {
62+
return (Builder<T>) super.completerOfNames(values);
63+
}
64+
65+
@Override
66+
public <V> Builder<T> completerOfNamed(Supplier<Iterable<V>> values, Function<V, String> toString) {
67+
return (Builder<T>) super.completerOfNamed(values, toString);
68+
}
69+
70+
@Override
71+
public <V extends Enum<V>> Builder<T> completerOfEnum(Class<V> values, boolean caseSensitive) {
72+
return (Builder<T>) super.completerOfEnum(values, caseSensitive);
73+
}
74+
75+
@Override
76+
public Builder<T> completer(Supplier<Iterable<ResourceLocation>> values) {
77+
return (Builder<T>) super.completer(values);
78+
}
79+
80+
@Override
81+
public <V extends IForgeRegistryEntry<V>> Builder<T> completer(IForgeRegistry<V> values) {
82+
return (Builder<T>) super.completer(values);
83+
}
84+
85+
@Override
86+
public Builder<T> defaultValue(Supplier<T> defaultValue) {
87+
return (Builder<T>) super.defaultValue(defaultValue);
88+
}
89+
90+
@Override
91+
public Builder<T> defaultValueSup(Supplier<Result<T>> defaultValue) {
92+
return (Builder<T>) super.defaultValueSup(defaultValue);
93+
}
94+
95+
@Override
96+
public Builder<T> addSignature(Class<?>... paramTypes) {
97+
return (Builder<T>) super.addSignature(paramTypes);
98+
}
99+
100+
@Override
101+
public Builder<T> documentation(String doc) {
102+
return (Builder<T>) super.documentation(doc);
103+
}
104+
105+
@Override
106+
public Builder<T> docOfType(String type) {
107+
return (Builder<T>) super.docOfType(type);
108+
}
13109
}
14110
}

0 commit comments

Comments
 (0)