JfMods/Respackopts
JfMods/Respackopts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update for changes in μScript

Browse Source
This commit is contained in:
Johannes Frohnmeyer 2022-06-07 13:52:19 +02:00
parent 23e81eccf3
commit 6d8c06f26d
Signed by: Johannes
GPG Key ID: E76429612C2929F4
16 changed files with 67 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -6,7 +6,7 @@ maven_group=io.gitlab.jfronny
archives_base_name=respackopts
fabric_version=0.55.0+1.19
jfapi_version=2.8.1-1654289121
muscript_version=2022.6.4+17-30-50
muscript_version=2022.6.7+11-38-13
modrinth_id=TiF5QWZY
modrinth_required_dependencies=P7dR8mSH, 9s6osm5g, WKwQAwke

6
src/main/java/io/gitlab/jfronny/respackopts/Respackopts.java
View File

@ -1,7 +1,7 @@
package io.gitlab.jfronny.respackopts;
import io.gitlab.jfronny.gson.*;
import io.gitlab.jfronny.muscript.compiler.*;
import io.gitlab.jfronny.muscript.compiler.expr.*;
import io.gitlab.jfronny.respackopts.filters.*;
import io.gitlab.jfronny.respackopts.gson.*;
import io.gitlab.jfronny.respackopts.gson.entry.*;
@ -46,8 +46,8 @@ public class Respackopts implements ClientModInitializer {
.registerTypeAdapter(ConfigBooleanEntry.class, new BooleanEntrySerializer())
.registerTypeAdapter(ConfigBranch.class, new ConfigBranchSerializer())
.registerTypeAdapter(Expr.class, new ExprDeserializer())
.registerTypeAdapter(Expr.StringExpr.class, new ExprDeserializer.StringX())
.registerTypeAdapter(Expr.BoolExpr.class, new BoolExprDeserializer())
.registerTypeAdapter(StringExpr.class, new StringExprDeserializer())
.registerTypeAdapter(BoolExpr.class, new BoolExprDeserializer())
.setLenient()
.setPrettyPrinting()
.create();

9
src/main/java/io/gitlab/jfronny/respackopts/filters/util/FileExpansionProvider.java
View File

@ -1,8 +1,7 @@
package io.gitlab.jfronny.respackopts.filters.util;
import io.gitlab.jfronny.muscript.*;
import io.gitlab.jfronny.muscript.compiler.*;
import io.gitlab.jfronny.muscript.optic.*;
import io.gitlab.jfronny.muscript.compiler.expr.*;
import io.gitlab.jfronny.muscript.dynamic.*;
import io.gitlab.jfronny.respackopts.*;
import io.gitlab.jfronny.respackopts.util.*;
import net.minecraft.resource.*;
@ -11,9 +10,9 @@ import java.io.*;
import java.util.*;
public class FileExpansionProvider {
public static synchronized InputStream replace(OAny<?> parameter, InputStream is, Map<String, Expr.StringExpr> expansions) throws IOException {
public static synchronized InputStream replace(Dynamic<?> parameter, InputStream is, Map<String, StringExpr> expansions) throws IOException {
String s = new String(is.readAllBytes());
for (Map.Entry<String, Expr.StringExpr> entry : expansions.entrySet()) {
for (Map.Entry<String, StringExpr> entry : expansions.entrySet()) {
s = s.replace("${" + entry.getKey() + "}", entry.getValue().get(parameter));
}
return new ByteArrayInputStream(s.getBytes());

27
src/main/java/io/gitlab/jfronny/respackopts/gson/BoolExprDeserializer.java
View File

@ -4,15 +4,18 @@ import io.gitlab.jfronny.gson.*;
import io.gitlab.jfronny.gson.reflect.*;
import io.gitlab.jfronny.muscript.compiler.*;
import io.gitlab.jfronny.muscript.compiler.expr.*;
import io.gitlab.jfronny.muscript.compiler.expr.bool.*;
import io.gitlab.jfronny.muscript.compiler.expr.common.*;
import io.gitlab.jfronny.muscript.compiler.expr.dynamic.*;
import java.lang.reflect.Type;
import java.util.*;
public class BoolExprDeserializer implements JsonDeserializer<Expr.BoolExpr> {
private static final Type conditionListType = new TypeToken<List<Expr.BoolExpr>>(){}.getType();
public class BoolExprDeserializer implements JsonDeserializer<BoolExpr> {
private static final Type conditionListType = new TypeToken<List<BoolExpr>>(){}.getType();
@Override
public Expr.BoolExpr deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
public BoolExpr deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
if (AttachmentHolder.getAttachedVersion() > 7) {
return ((Expr<?>)context.deserialize(json, Expr.class)).asBoolExpr();
}
@ -53,29 +56,31 @@ public class BoolExprDeserializer implements JsonDeserializer<Expr.BoolExpr> {
throw new JsonParseException("Invalid data type for condition");
}
private Expr.BoolExpr merge(List<Expr.BoolExpr> expressions, Token token) {
Expr.BoolExpr current = expressions.get(0);
for (Expr.BoolExpr expr : expressions.subList(1, expressions.size())) {
private BoolExpr merge(List<BoolExpr> expressions, Token token) {
BoolExpr current = expressions.get(0);
for (BoolExpr expr : expressions.subList(1, expressions.size())) {
current = switch (token) {
case EqualEqual -> new Equal(current, expr);
case BangEqual -> new Not(new Equal(current, expr));
default -> new LogicBiExpr(current, expr, token);
case And -> new And(current, expr);
case Or -> new Or(current, expr);
default -> throw new IllegalArgumentException();
};
}
return current;
}
private Expr.BoolExpr rpoBooleanCondition(String name) {
private BoolExpr rpoBooleanCondition(String name) {
if (name.startsWith("modversion:")) {
String code = name.substring("modversion:".length());
String mod = code.substring(0, code.indexOf(':'));
String predicate = code.substring(code.indexOf(':') + 1);
return new Call(new Variable("version"), List.of(
Expr.literal(mod).asObjectExpr(),
Expr.literal(predicate).asObjectExpr()
Expr.literal(mod).asDynamicExpr(),
Expr.literal(predicate).asDynamicExpr()
)).asBoolExpr();
}
Expr.ObjectExpr e = null;
DynamicExpr e = null;
String[] arr = name.split("[:.]");
for (int i = 0; i < arr.length; i++) {
if (i == 0) e = new Variable(arr[i]);

9
src/main/java/io/gitlab/jfronny/respackopts/gson/ExprDeserializer.java
View File

@ -3,6 +3,7 @@ package io.gitlab.jfronny.respackopts.gson;
import io.gitlab.jfronny.gson.*;
import io.gitlab.jfronny.muscript.*;
import io.gitlab.jfronny.muscript.compiler.*;
import io.gitlab.jfronny.muscript.compiler.expr.*;
import java.lang.reflect.Type;
import java.util.*;
@ -30,12 +31,4 @@ public class ExprDeserializer implements JsonDeserializer<Expr<?>> {
throw new JsonParseException("Could not parse script: Expected string");
}
}
public static class StringX implements JsonDeserializer<Expr.StringExpr> {
@Override
public Expr.StringExpr deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
Expr<?> expr = jsonDeserializationContext.deserialize(jsonElement, Expr.class);
return expr.asStringExpr();
}
}
}

14
src/main/java/io/gitlab/jfronny/respackopts/gson/StringExprDeserializer.java Normal file
View File

@ -0,0 +1,14 @@
package io.gitlab.jfronny.respackopts.gson;
import io.gitlab.jfronny.gson.*;
import io.gitlab.jfronny.muscript.compiler.expr.*;
import java.lang.reflect.*;
public class StringExprDeserializer implements JsonDeserializer<StringExpr> {
@Override
public StringExpr deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
Expr<?> expr = jsonDeserializationContext.deserialize(jsonElement, Expr.class);
return expr.asStringExpr();
}
}

4
src/main/java/io/gitlab/jfronny/respackopts/model/DirRpo.java
View File

@ -2,11 +2,11 @@ package io.gitlab.jfronny.respackopts.model;
import com.google.gson.annotations.*;
import io.gitlab.jfronny.commons.serialize.gson.api.*;
import io.gitlab.jfronny.muscript.compiler.*;
import io.gitlab.jfronny.muscript.compiler.expr.*;
public class DirRpo {
@SerializedName(value = "condition", alternate = {"conditions"})
public Expr.BoolExpr condition;
public BoolExpr condition;
@SerializedName(value = "fallback", alternate = {"fallbacks"})
public String fallback;

6
src/main/java/io/gitlab/jfronny/respackopts/model/FileRpo.java
View File

@ -2,17 +2,17 @@ package io.gitlab.jfronny.respackopts.model;
import com.google.gson.annotations.*;
import io.gitlab.jfronny.commons.serialize.gson.api.*;
import io.gitlab.jfronny.muscript.compiler.*;
import io.gitlab.jfronny.muscript.compiler.expr.*;
import java.util.*;
public class FileRpo {
@SerializedName(value = "condition", alternate = {"conditions"})
public Expr.BoolExpr condition;
public BoolExpr condition;
@SerializedName(value = "fallback", alternate = {"fallbacks"})
public Set<String> fallbacks;
@SerializedName(value = "expansion", alternate = {"expansions"})
public Map<String, Expr.StringExpr> expansions;
public Map<String, StringExpr> expansions;
@Ignore
public String path;

4
src/main/java/io/gitlab/jfronny/respackopts/model/cache/CachedPackState.java vendored
View File

@ -1,7 +1,7 @@
package io.gitlab.jfronny.respackopts.model.cache;
import io.gitlab.jfronny.muscript.*;
import io.gitlab.jfronny.muscript.optic.*;
import io.gitlab.jfronny.muscript.dynamic.*;
import io.gitlab.jfronny.respackopts.model.DirRpo;
import io.gitlab.jfronny.respackopts.model.FileRpo;
import io.gitlab.jfronny.respackopts.model.PackMeta;
@ -28,6 +28,6 @@ public record CachedPackState(
meta,
new HashMap<>(),
new HashMap<>(),
new ExpressionParameter(new HashMap<>(branch.getOptic().getValue())));
new ExpressionParameter(new HashMap<>(branch.getDynamic().getValue())));
}
}

6
src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigBooleanEntry.java
View File

@ -1,6 +1,6 @@
package io.gitlab.jfronny.respackopts.model.tree;
import io.gitlab.jfronny.muscript.optic.*;
import io.gitlab.jfronny.muscript.dynamic.*;
import io.gitlab.jfronny.respackopts.Respackopts;
import me.shedaniel.clothconfig2.api.AbstractConfigListEntry;
@ -29,8 +29,8 @@ public class ConfigBooleanEntry extends ConfigEntry<Boolean> {
}
@Override
public OAny<?> getOptic() {
return (OBool) this::getValue;
public DBool getDynamic() {
return this::getValue;
}
@Override

10
src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigBranch.java
View File

@ -2,7 +2,7 @@ package io.gitlab.jfronny.respackopts.model.tree;
import com.google.common.collect.ImmutableMap;
import io.gitlab.jfronny.gson.reflect.TypeToken;
import io.gitlab.jfronny.muscript.optic.*;
import io.gitlab.jfronny.muscript.dynamic.*;
import io.gitlab.jfronny.respackopts.Respackopts;
import io.gitlab.jfronny.respackopts.model.enums.ConfigSyncMode;
import io.gitlab.jfronny.respackopts.util.IndentingStringBuilder;
@ -112,12 +112,12 @@ public class ConfigBranch extends ConfigEntry<Map<String, ConfigEntry<?>>> {
}
@Override
public OObject getOptic() {
Map<String, OAny<?>> map = new HashMap<>();
public DObject getDynamic() {
Map<String, Dynamic<?>> map = new HashMap<>();
for (Map.Entry<String, ConfigEntry<?>> e : super.getValue().entrySet()) {
map.put(Respackopts.sanitizeString(e.getKey()), e.getValue().getOptic());
map.put(Respackopts.sanitizeString(e.getKey()), e.getValue().getDynamic());
}
return OFinal.of(map);
return DFinal.of(map);
}
@Override

4
src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigEntry.java
View File

@ -1,6 +1,6 @@
package io.gitlab.jfronny.respackopts.model.tree;
import io.gitlab.jfronny.muscript.optic.*;
import io.gitlab.jfronny.muscript.dynamic.*;
import io.gitlab.jfronny.respackopts.Respackopts;
import io.gitlab.jfronny.respackopts.model.enums.ConfigSyncMode;
import io.gitlab.jfronny.respackopts.model.enums.PackReloadType;
@ -102,7 +102,7 @@ public abstract class ConfigEntry<T> {
public abstract void buildShader(StringBuilder sb, String valueName);
public abstract OAny<?> getOptic();
public abstract Dynamic<?> getDynamic();
public abstract AbstractConfigListEntry<?> buildEntry(GuiEntryBuilderParam guiEntryBuilderParam);

6
src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigEnumEntry.java
View File

@ -1,6 +1,6 @@
package io.gitlab.jfronny.respackopts.model.tree;
import io.gitlab.jfronny.muscript.optic.*;
import io.gitlab.jfronny.muscript.dynamic.*;
import io.gitlab.jfronny.respackopts.*;
import io.gitlab.jfronny.respackopts.model.enums.*;
import io.gitlab.jfronny.respackopts.util.*;
@ -113,8 +113,8 @@ public class ConfigEnumEntry extends ConfigEntry<String> {
}
@Override
public OAny<?> getOptic() {
return new OEnum(values, getValue());
public DEnum getDynamic() {
return new DEnum(values, getValue());
}
@Override

6
src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigNumericEntry.java
View File

@ -1,6 +1,6 @@
package io.gitlab.jfronny.respackopts.model.tree;
import io.gitlab.jfronny.muscript.optic.*;
import io.gitlab.jfronny.muscript.dynamic.*;
import io.gitlab.jfronny.respackopts.Respackopts;
import io.gitlab.jfronny.respackopts.model.enums.ConfigSyncMode;
import io.gitlab.jfronny.respackopts.model.enums.NumericEntryType;
@ -67,8 +67,8 @@ public class ConfigNumericEntry extends ConfigEntry<Double> {
}
@Override
public OAny<?> getOptic() {
return (ONumber) this::getValue;
public DNumber getDynamic() {
return this::getValue;
}
@Override

8
src/main/java/io/gitlab/jfronny/respackopts/util/MetaCache.java
View File

@ -2,7 +2,7 @@ package io.gitlab.jfronny.respackopts.util;
import io.gitlab.jfronny.commons.throwable.*;
import io.gitlab.jfronny.muscript.*;
import io.gitlab.jfronny.muscript.optic.*;
import io.gitlab.jfronny.muscript.dynamic.*;
import io.gitlab.jfronny.respackopts.*;
import io.gitlab.jfronny.respackopts.model.*;
import io.gitlab.jfronny.respackopts.model.cache.*;
@ -139,10 +139,10 @@ public class MetaCache {
MetaCache.forEach((id, state) -> {
String key = Respackopts.sanitizeString(state.packId());
if (!parameter.has(key))
parameter.set(key, state.configBranch().getOptic());
parameter.set(key, state.configBranch().getDynamic());
});
StandardLib.addTo(parameter);
parameter.set("version", OFinal.of(args -> {
parameter.set("version", DFinal.of(args -> {
if (args.size() != 2) throw new IllegalArgumentException("Expected 2 arguments on version but got " + args.size());
VersionPredicate predicate;
try {
@ -150,7 +150,7 @@ public class MetaCache {
} catch (VersionParsingException e) {
throw new RuntimeException("Could not parse version predicate", e);
}
return OFinal.of(FabricLoader.getInstance().getModContainer(args.get(0).asString().getValue())
return DFinal.of(FabricLoader.getInstance().getModContainer(args.get(0).asString().getValue())
.map(c -> predicate.test(c.getMetadata().getVersion()))
.orElse(false));
}));

4
src/test/java/io/gitlab/jfronny/respackopts/TemplateTree.java
View File

@ -1,10 +1,8 @@
package io.gitlab.jfronny.respackopts;
import io.gitlab.jfronny.gson.*;
import io.gitlab.jfronny.muscript.compiler.*;
import io.gitlab.jfronny.respackopts.gson.*;
import io.gitlab.jfronny.respackopts.gson.entry.*;
import io.gitlab.jfronny.respackopts.model.*;
import io.gitlab.jfronny.respackopts.model.tree.*;
public class TemplateTree {
@ -14,7 +12,7 @@ public class TemplateTree {
.registerTypeAdapter(ConfigBooleanEntry.class, new BooleanEntrySerializer())
.registerTypeAdapter(ConfigBranch.class, new ConfigBranchSerializer())
.registerTypeAdapter(Expr.class, new ExprDeserializer())
.registerTypeAdapter(Expr.StringExpr.class, new ExprDeserializer.StringX())
.registerTypeAdapter(Expr.StringExpr.class, new StringExprDeserializer())
.registerTypeAdapter(Expr.BoolExpr.class, new BoolExprDeserializer())
.setLenient()
.setPrettyPrinting()