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

feat: update to 1.20.2
ci/woodpecker/push/docs Pipeline was successful Details
ci/woodpecker/push/jfmod Pipeline was successful Details

This commit is contained in:
Johannes Frohnmeyer 2023-09-22 19:21:11 +02:00
parent 0611e42731 99db11f7a4
commit 7b5157f474
Signed by: Johannes
GPG Key ID: E76429612C2929F4
38 changed files with 290 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
build.gradle.kts
View File

@ -5,6 +5,10 @@ plugins {
allprojects { group = "io.gitlab.jfronny" }
base.archivesName = "respackopts"
loom {
accessWidenerPath.set(file("src/main/resources/respackopts.accesswidener"))
}
repositories {
maven("https://maven.vram.io/") {
name = "FREX/Canvas"
@ -21,13 +25,14 @@ repositories {
}
}
val fabricVersion = "0.87.0+1.20.1"
val muscriptVersion = "1.4-SNAPSHOT"
val fabricVersion = "0.89.1+1.20.2"
val muscriptVersion = "1.5-SNAPSHOT"
val modmenuVersion = "8.0.0-beta.2"
jfMod {
minecraftVersion = "1.20.1"
yarn("build.10")
minecraftVersion = "1.20.2"
yarn("build.1")
loaderVersion = "0.14.22"
libJfVersion = "3.12.4"
libJfVersion = "3.13.0"
modrinth {
projectId = "respackopts"
@ -44,16 +49,17 @@ jfMod {
dependencies {
modImplementation("net.fabricmc.fabric-api:fabric-api:$fabricVersion")
include(modImplementation("io.gitlab.jfronny:muscript:$muscriptVersion")!!)
include(modImplementation("io.gitlab.jfronny:muscript-gson:$muscriptVersion")!!)
modImplementation("io.gitlab.jfronny.libjf:libjf-data-manipulation-v0:${jfMod.libJfVersion.get()}")
modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${jfMod.libJfVersion.get()}")
modImplementation("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${jfMod.libJfVersion.get()}")
modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2:${jfMod.libJfVersion.get()}")
modImplementation("io.gitlab.jfronny.libjf:libjf-config-ui-tiny:${jfMod.libJfVersion.get()}")
val nofabric: Action<ExternalModuleDependency> = Action {
exclude("net.fabricmc") // required to work around duplicate fabric loaders
}
modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${jfMod.libJfVersion.get()}", nofabric)
modLocalRuntime("com.terraformersmc:modmenu:7.2.1", nofabric)
modClientCompileOnly("com.terraformersmc:modmenu:7.2.1", nofabric)
modLocalRuntime("com.terraformersmc:modmenu:$modmenuVersion", nofabric) // Temporarily disabled since modmenu doesn't support snapshots
modClientCompileOnly("com.terraformersmc:modmenu:$modmenuVersion", nofabric)
modClientCompileOnly("io.vram:frex-fabric:20.0.+")
modClientCompileOnly("dev.notalpha:dashloader:5.0.0-beta.1+1.20.0")

7
docs/additional/Migrations.md
View File

@ -88,4 +88,9 @@ Corresponds to version 4.5.0-4.5.1
## v12
Corresponds to version 4.6.0
- Support for whole numbers (not integers!)
- Support for whole numbers (not integers!)
## v13
Unreleased
- Supports readString and runScript methods in muScript expressions

2
docs/setup/Debugging.md
View File

@ -1,6 +1,6 @@
# Debugging
If you run into issues with respackopts and cannot find a solution here,
you may contact me through my discord server (look at the mod page)
you may contact me directly (details are at the bottom of this page)
## Look at the config file
Respackopts stores configurations next to their corresponding resource packs (`some pack.zip.rpo` usually)

16
src/client/java/io/gitlab/jfronny/respackopts/RpoClientCommand.java
View File

@ -1,11 +1,13 @@
package io.gitlab.jfronny.respackopts;
import com.mojang.brigadier.Command;
import com.mojang.brigadier.arguments.IntegerArgumentType;
import com.mojang.brigadier.arguments.StringArgumentType;
import io.gitlab.jfronny.commons.throwable.ThrowingConsumer;
import io.gitlab.jfronny.commons.throwable.ThrowingSupplier;
import io.gitlab.jfronny.muscript.compiler.Parser;
import io.gitlab.jfronny.muscript.error.LocationalException;
import io.gitlab.jfronny.respackopts.muscript.ScopeVersion;
import io.gitlab.jfronny.respackopts.util.MetaCache;
import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
@ -40,7 +42,12 @@ public class RpoClientCommand {
return 1;
};
Command<FabricClientCommandSource> dumpScope = ctx -> {
ctx.getSource().sendFeedback(dump(MetaCache.getScope(null).toExpr().toString(), "_root.mu"));
ctx.getSource().sendFeedback(dump(MetaCache.getScope(Respackopts.META_VERSION).toExpr().toString(), "_root.mu"));
MetaCache.forEach((id, branch) -> ctx.getSource().sendFeedback(dump(branch.executionScope().getOverrides().toExpr().toString(), branch.packId() + ".mu")));
return 1;
};
Command<FabricClientCommandSource> dumpScopeVersioned = ctx -> {
ctx.getSource().sendFeedback(dump(MetaCache.getScope(IntegerArgumentType.getInteger(ctx, "version")).toExpr().toString(), "_root.mu"));
MetaCache.forEach((id, branch) -> ctx.getSource().sendFeedback(dump(branch.executionScope().getOverrides().toExpr().toString(), branch.packId() + ".mu")));
return 1;
};
@ -52,7 +59,8 @@ public class RpoClientCommand {
Command<FabricClientCommandSource> execute = ctx -> {
String snippet = StringArgumentType.getString(ctx, "snippet");
try {
String result = Parser.parse(snippet, "snippet").asStringExpr().get(MetaCache.getScope(null));
int ver = IntegerArgumentType.getInteger(ctx, "version");
String result = Parser.parse(ScopeVersion.by(ver).muScriptVersion, snippet, "snippet").asStringExpr().get(MetaCache.getScope(ver));
ctx.getSource().sendFeedback(Text.translatable("respackopts.snippet.success", result));
} catch (LocationalException | Parser.ParseException e) {
Respackopts.LOGGER.error("Could not execute snippet", e);
@ -75,10 +83,10 @@ public class RpoClientCommand {
dispatcher.register(literal("rpoc").executes(getVersion)
.then(literal("dump").executes(dumpConfig)
.then(literal("config").executes(dumpConfig))
.then(literal("scope").executes(dumpScope))
.then(literal("scope").executes(dumpScope).then(argument("version", IntegerArgumentType.integer(1, Respackopts.META_VERSION)).executes(dumpScopeVersioned)))
.then(literal("glsl").executes(dumpGlsl))
.then(literal("asset").then(argument("asset", IdentifierArgumentType.identifier()).executes(dumpAsset))))
.then(literal("execute").then(argument("snippet", StringArgumentType.greedyString()).executes(execute)))
.then(literal("execute").then(argument("version", IntegerArgumentType.integer(1, Respackopts.META_VERSION)).then(argument("snippet", StringArgumentType.greedyString()).executes(execute))))
.then(literal("version").executes(getVersion))
.then(literal("reload").executes(reload)));
});

4
src/client/java/io/gitlab/jfronny/respackopts/mixin/ResourcePackEntryMixin.java
View File

@ -1,8 +1,8 @@
package io.gitlab.jfronny.respackopts.mixin;
import com.mojang.blaze3d.systems.RenderSystem;
import io.gitlab.jfronny.libjf.config.api.v1.ConfigInstance;
import io.gitlab.jfronny.libjf.config.api.v1.dsl.DSL;
import io.gitlab.jfronny.libjf.config.api.v2.ConfigInstance;
import io.gitlab.jfronny.libjf.config.api.v2.dsl.DSL;
import io.gitlab.jfronny.libjf.config.api.v2.ui.ConfigScreenFactory;
import io.gitlab.jfronny.respackopts.model.cache.CacheKey;
import io.gitlab.jfronny.respackopts.util.MetaCache;

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

@ -1,12 +1,10 @@
package io.gitlab.jfronny.respackopts;
import io.gitlab.jfronny.commons.log.Logger;
import io.gitlab.jfronny.commons.logging.Logger;
import io.gitlab.jfronny.gson.Gson;
import io.gitlab.jfronny.gson.GsonBuilder;
import io.gitlab.jfronny.muscript.StandardLib;
import io.gitlab.jfronny.libjf.config.api.v2.ConfigInstance;
import io.gitlab.jfronny.muscript.ast.*;
import io.gitlab.jfronny.muscript.data.Scope;
import io.gitlab.jfronny.muscript.data.dynamic.additional.DFinal;
import io.gitlab.jfronny.respackopts.filters.*;
import io.gitlab.jfronny.respackopts.gson.*;
import io.gitlab.jfronny.respackopts.gson.entry.*;
@ -17,8 +15,6 @@ import io.gitlab.jfronny.respackopts.server.ServerInstanceHolder;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.ModInitializer;
import net.fabricmc.loader.api.FabricLoader;
import net.fabricmc.loader.api.VersionParsingException;
import net.fabricmc.loader.api.metadata.version.VersionPredicate;
import java.io.IOException;
import java.nio.file.Files;
@ -42,23 +38,6 @@ public class Respackopts implements ModInitializer, SaveHook {
.setPrettyPrinting()
.create();
public static final Scope ROOT_SCOPE = StandardLib.createScope();
static {
ROOT_SCOPE.set("version", args -> {
if (args.size() != 2) throw new IllegalArgumentException("Expected 2 arguments on version but got " + args.size());
VersionPredicate predicate;
try {
predicate = VersionPredicate.parse(args.get(1).asString().getValue());
} catch (VersionParsingException e) {
throw new IllegalArgumentException("Could not parse version predicate", e);
}
return DFinal.of(FabricLoader.getInstance().getModContainer(args.get(0).asString().getValue())
.map(c -> predicate.test(c.getMetadata().getVersion()))
.orElse(false));
});
}
public static final String ID = "respackopts";
public static final Logger LOGGER = Logger.forName(ID);

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

@ -1,8 +1,8 @@
package io.gitlab.jfronny.respackopts;
import io.gitlab.jfronny.libjf.config.api.v1.ConfigInstance;
import io.gitlab.jfronny.libjf.config.api.v1.JfCustomConfig;
import io.gitlab.jfronny.libjf.config.api.v1.dsl.DSL;
import io.gitlab.jfronny.libjf.config.api.v2.ConfigInstance;
import io.gitlab.jfronny.libjf.config.api.v2.JfCustomConfig;
import io.gitlab.jfronny.libjf.config.api.v2.dsl.DSL;
import io.gitlab.jfronny.respackopts.util.MetaCache;
import net.fabricmc.loader.api.FabricLoader;

31
src/main/java/io/gitlab/jfronny/respackopts/filters/DirFilterEvents.java
View File

@ -6,8 +6,10 @@ import io.gitlab.jfronny.respackopts.Respackopts;
import io.gitlab.jfronny.respackopts.filters.util.DirRpoResult;
import io.gitlab.jfronny.respackopts.gson.AttachmentHolder;
import io.gitlab.jfronny.respackopts.model.DirRpo;
import io.gitlab.jfronny.respackopts.model.cache.CacheKey;
import io.gitlab.jfronny.respackopts.model.cache.CachedPackState;
import io.gitlab.jfronny.respackopts.model.enums.PackCapability;
import io.gitlab.jfronny.respackopts.muscript.RespackoptsFS;
import io.gitlab.jfronny.respackopts.util.MetaCache;
import net.minecraft.resource.*;
import net.minecraft.util.Identifier;
@ -28,14 +30,15 @@ public enum DirFilterEvents implements UserResourceEvents.Open, UserResourceEven
if (!MetaCache.hasCapability(pack, PackCapability.DirFilter)) return previous;
String path = new ResourcePath(type, id).getName();
List<DirRpo> rpo = findDirRpos(pack, parent(path));
CacheKey key = MetaCache.getKeyByPack(pack);
RespackoptsFS fs = new RespackoptsFS(pack);
//TODO use pattern matching for switch
DirRpoResult result = DirRpoResult.compute(path, rpo, MetaCache.getKeyByPack(pack));
DirRpoResult result = DirRpoResult.compute(path, rpo, key, fs);
if (result == DirRpoResult.ORIGINAL) return previous; // Using original file
if (result == DirRpoResult.IGNORE) return null; // No fallback
// Use fallback
DirRpoResult.Replacement replacement = (DirRpoResult.Replacement) result;
ResourcePath rp = new ResourcePath(replacement.toFallback(path));
return pack.open(rp.getType(), rp.getId());
return fs.open(replacement.toFallback(path));
}
@Override
@ -46,11 +49,13 @@ public enum DirFilterEvents implements UserResourceEvents.Open, UserResourceEven
boolean dirFilterAdditive = MetaCache.hasCapability(pack, PackCapability.DirFilterAdditive);
String searchPrefix = type.getDirectory() + "/" + namespace + "/" + prefix;
Set<String> additionalSearched = new HashSet<>();
CacheKey key = MetaCache.getKeyByPack(pack);
RespackoptsFS fs = new RespackoptsFS(pack);
return (identifier, value) -> {
String path = path(type, identifier);
//TODO use pattern matching for switch
List<DirRpo> relevantRpos = findDirRpos(pack, parent(path));
DirRpoResult result = DirRpoResult.compute(path, relevantRpos, MetaCache.getKeyByPack(pack));
DirRpoResult result = DirRpoResult.compute(path, relevantRpos, key, fs);
if (result == DirRpoResult.ORIGINAL) { // Using original file
previous.accept(identifier, value);
return;
@ -65,8 +70,7 @@ public enum DirFilterEvents implements UserResourceEvents.Open, UserResourceEven
}
if (!dirFilterAdditive) {
// Only return this single result, don't search for others
ResourcePath rp = new ResourcePath(newPath);
previous.accept(identifier, pack.open(rp.getType(), rp.getId()));
previous.accept(identifier, fs.open(newPath));
return;
}
// Find other files in the fallback directory
@ -110,7 +114,9 @@ public enum DirFilterEvents implements UserResourceEvents.Open, UserResourceEven
private List<DirRpo> findDirRpos(ResourcePack pack, String path) {
if (path == null) return List.of();
CachedPackState state = MetaCache.getState(MetaCache.getKeyByPack(pack));
CacheKey key = MetaCache.getKeyByPack(pack);
RespackoptsFS fs = new RespackoptsFS(pack);
CachedPackState state = MetaCache.getState(key);
var cache = state.cachedDirRPOs();
{
@ -122,13 +128,8 @@ public enum DirFilterEvents implements UserResourceEvents.Open, UserResourceEven
List<DirRpo> parentRPOs = findDirRpos(pack, parent(path));
synchronized (cache) { // This is synchronized as multiple resources might be accessed at the same time, potentially causing a CME here
return cache.computeIfAbsent(path, $ -> {
ResourcePath rp;
try {
rp = new ResourcePath(path + "/" + Respackopts.FILE_EXTENSION);
} catch (Exception e) {
return parentRPOs;
}
InputSupplier<InputStream> is = UserResourceEvents.disable(() -> pack.open(rp.getType(), rp.getId()));
String rp = path + "/" + Respackopts.FILE_EXTENSION;
InputSupplier<InputStream> is = UserResourceEvents.disable(() -> fs.open(rp));
if (is == null) return parentRPOs;
try (Reader w = new InputStreamReader(is.get())) {
List<DirRpo> currentRPOs = new LinkedList<>(parentRPOs);
@ -139,7 +140,7 @@ public enum DirFilterEvents implements UserResourceEvents.Open, UserResourceEven
currentRPOs.add(newRPO);
return currentRPOs;
} catch (IOException e) {
Respackopts.LOGGER.error("Couldn't open dir rpo " + rp.getName(), e);
Respackopts.LOGGER.error("Couldn't open dir rpo " + rp, e);
}
return parentRPOs;
});

42
src/main/java/io/gitlab/jfronny/respackopts/filters/FileFilterEvents.java
View File

@ -4,7 +4,9 @@ import io.gitlab.jfronny.libjf.ResourcePath;
import io.gitlab.jfronny.libjf.data.manipulation.api.UserResourceEvents;
import io.gitlab.jfronny.respackopts.Respackopts;
import io.gitlab.jfronny.respackopts.filters.util.*;
import io.gitlab.jfronny.respackopts.model.cache.CacheKey;
import io.gitlab.jfronny.respackopts.model.enums.PackCapability;
import io.gitlab.jfronny.respackopts.muscript.RespackoptsFS;
import io.gitlab.jfronny.respackopts.util.MetaCache;
import net.minecraft.resource.*;
import net.minecraft.util.Identifier;
@ -25,22 +27,22 @@ public enum FileFilterEvents implements UserResourceEvents.OpenRoot, UserResourc
@Override
public InputSupplier<InputStream> openRoot(String[] fileName, InputSupplier<InputStream> previous, ResourcePack pack) {
if (skip(pack)) return previous;
String path = String.join("/", fileName);
return switch (probe(previous != null, pack, path)) {
case MISSING -> null;
case FALLBACK -> FileFallbackProvider.getReplacement(pack, path);
case CONTAINS -> FileExpansionProvider.replace(previous, pack, path);
};
return open(previous, pack, String.join("/", fileName));
}
@Override
public InputSupplier<InputStream> open(ResourceType type, Identifier id, InputSupplier<InputStream> previous, ResourcePack pack) {
if (skip(pack)) return previous;
String name = new ResourcePath(type, id).getName();
return switch (probe(previous != null, pack, name)) {
return open(previous, pack, new ResourcePath(type, id).getName());
}
private InputSupplier<InputStream> open(InputSupplier<InputStream> previous, ResourcePack pack, String name) {
CacheKey key = MetaCache.getKeyByPack(pack);
RespackoptsFS fs = new RespackoptsFS(pack);
return switch (probe(previous != null, key, fs, name)) {
case MISSING -> null;
case FALLBACK -> FileFallbackProvider.getReplacement(pack, name);
case CONTAINS -> FileExpansionProvider.replace(previous, pack, name);
case FALLBACK -> FileFallbackProvider.getReplacement(key, fs, name);
case CONTAINS -> FileExpansionProvider.replace(previous, key, fs, name);
};
}
@ -50,30 +52,28 @@ public enum FileFilterEvents implements UserResourceEvents.OpenRoot, UserResourc
// Therefore, it needs to be added when calling a method that generates a ResourcePath!
if (skip(pack)) return previous;
Set<Identifier> ids = new HashSet<>();
CacheKey key = MetaCache.getKeyByPack(pack);
RespackoptsFS fs = new RespackoptsFS(pack);
return (identifier, value) -> {
// Completion of the path is handled separately here
String fileName = type.getDirectory() + "/" + identifier.getNamespace() + "/" + identifier.getPath();
if (!FileExclusionProvider.fileHidden(pack, fileName) || FileFallbackProvider.fileHasFallback(pack, fileName)) {
if (!FileExclusionProvider.fileHidden(key, fs, fileName) || FileFallbackProvider.fileHasFallback(key, fs, fileName)) {
ids.add(identifier);
previous.accept(identifier, open(type, identifier, value, pack));
}
FileFallbackProvider.addFallbackResources(namespace, type, identifier, pack, ids, previous);
FileFallbackProvider.addFallbackResources(namespace, type, identifier, key, fs, ids, previous);
};
}
private ContainsResult probe(boolean previous, ResourcePack pack, String name) {
private ContainsResult probe(boolean previous, CacheKey key, RespackoptsFS fs, String name) {
if (previous) {
if (!FileExclusionProvider.fileHidden(pack, name)) return ContainsResult.CONTAINS;
else if (FileFallbackProvider.fileHasFallback(pack, name)) return ContainsResult.FALLBACK;
if (!FileExclusionProvider.fileHidden(key, fs, name)) return ContainsResult.CONTAINS;
else if (FileFallbackProvider.fileHasFallback(key, fs, name)) return ContainsResult.FALLBACK;
else return ContainsResult.MISSING;
}
else {
boolean missing;
if (name.contains("/")) {
ResourcePath rp = new ResourcePath(name + Respackopts.FILE_EXTENSION);
missing = UserResourceEvents.disable(() -> pack.open(rp.getType(), rp.getId())) == null;
} else missing = UserResourceEvents.disable(() -> pack.openRoot(name + Respackopts.FILE_EXTENSION)) == null;
if (missing && FileFallbackProvider.fileHasFallback(pack, name)) return ContainsResult.FALLBACK;
boolean missing = UserResourceEvents.disable(() -> fs.open(name + Respackopts.FILE_EXTENSION)) == null;
if (missing && FileFallbackProvider.fileHasFallback(key, fs, name)) return ContainsResult.FALLBACK;
else return ContainsResult.MISSING;
}
}

7
src/main/java/io/gitlab/jfronny/respackopts/filters/util/DirRpoResult.java
View File

@ -7,6 +7,7 @@ import io.gitlab.jfronny.respackopts.Respackopts;
import io.gitlab.jfronny.respackopts.model.Condition;
import io.gitlab.jfronny.respackopts.model.DirRpo;
import io.gitlab.jfronny.respackopts.model.cache.CacheKey;
import io.gitlab.jfronny.respackopts.muscript.RespackoptsFS;
import io.gitlab.jfronny.respackopts.util.MetaCache;
import java.util.List;
@ -20,10 +21,10 @@ public sealed interface DirRpoResult {
return new Replacement(originalPrefix, fallbackPrefix, version);
}
static DirRpoResult compute(String file, List<DirRpo> rpos, CacheKey key) {
int version = MetaCache.getState(key).metadata().version;
static DirRpoResult compute(String file, List<DirRpo> rpos, CacheKey key, RespackoptsFS fs) {
int version = MetaCache.getMeta(key).version;
if (version < 11) rpos = rpos.isEmpty() ? rpos : List.of(rpos.get(rpos.size() - 1));
LazySupplier<Scope> scope = new LazySupplier<>(() -> MetaCache.getScope(key));
LazySupplier<Scope> scope = new LazySupplier<>(() -> MetaCache.getScope(key, fs));
for (DirRpo rpo : rpos) {
if (rpo.condition == null) continue;
try {

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

@ -4,17 +4,17 @@ import io.gitlab.jfronny.muscript.debug.ObjectGraphPrinter;
import io.gitlab.jfronny.respackopts.Respackopts;
import io.gitlab.jfronny.respackopts.model.Condition;
import io.gitlab.jfronny.respackopts.model.cache.CacheKey;
import io.gitlab.jfronny.respackopts.muscript.RespackoptsFS;
import io.gitlab.jfronny.respackopts.util.MetaCache;
import net.minecraft.resource.ResourcePack;
public class FileExclusionProvider {
public static boolean fileHidden(ResourcePack pack, String file) {
return FileRpoSearchProvider.modifyWithRpo(file, pack, rpo -> {
public static boolean fileHidden(CacheKey key, RespackoptsFS fs, String file) {
return FileRpoSearchProvider.modifyWithRpo(file, key, fs, rpo -> {
if (rpo.condition == null)
return false;
CacheKey key = MetaCache.getKeyByPack(pack);
try {
return !rpo.condition.get(MetaCache.getScope(key));
return !rpo.condition.get(MetaCache.getScope(key, fs));
} catch (Condition.ConditionException e) {
String res = "Could not evaluate condition for " + file + " (pack: " + key.packName() + ")";
try {

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

@ -1,16 +1,18 @@
package io.gitlab.jfronny.respackopts.filters.util;
import io.gitlab.jfronny.muscript.ast.StringExpr;
import io.gitlab.jfronny.muscript.data.dynamic.DObject;
import io.gitlab.jfronny.muscript.data.dynamic.Dynamic;
import io.gitlab.jfronny.respackopts.model.cache.CacheKey;
import io.gitlab.jfronny.respackopts.muscript.RespackoptsFS;
import io.gitlab.jfronny.respackopts.util.MetaCache;
import net.minecraft.resource.InputSupplier;
import net.minecraft.resource.ResourcePack;
import java.io.*;
import java.util.Map;
public class FileExpansionProvider {
public static synchronized InputStream replace(Dynamic parameter, InputStream is, Map<String, StringExpr> expansions) throws IOException {
public static synchronized InputStream replace(DObject parameter, InputStream is, Map<String, StringExpr> expansions) throws IOException {
String s = new String(is.readAllBytes());
for (Map.Entry<String, StringExpr> entry : expansions.entrySet()) {
s = s.replace("${" + entry.getKey() + "}", entry.getValue().get(parameter));
@ -18,10 +20,10 @@ public class FileExpansionProvider {
return new ByteArrayInputStream(s.getBytes());
}
public static InputSupplier<InputStream> replace(InputSupplier<InputStream> inputStream, ResourcePack pack, String file) {
return FileRpoSearchProvider.modifyWithRpo(file, pack, rpo -> rpo.expansions == null || rpo.expansions.isEmpty() ? inputStream : () -> {
public static InputSupplier<InputStream> replace(InputSupplier<InputStream> inputStream, CacheKey key, RespackoptsFS fs, String file) {
return FileRpoSearchProvider.modifyWithRpo(file, key, fs, rpo -> rpo.expansions == null || rpo.expansions.isEmpty() ? inputStream : () -> {
try (InputStream is = inputStream.get()) {
return replace(MetaCache.getScope(MetaCache.getKeyByPack(pack)), is, rpo.expansions);
return replace(MetaCache.getScope(key, fs), is, rpo.expansions);
}
}, inputStream);
}

23
src/main/java/io/gitlab/jfronny/respackopts/filters/util/FileFallbackProvider.java
View File

@ -1,7 +1,8 @@
package io.gitlab.jfronny.respackopts.filters.util;
import io.gitlab.jfronny.libjf.ResourcePath;
import io.gitlab.jfronny.respackopts.Respackopts;
import io.gitlab.jfronny.respackopts.model.cache.CacheKey;
import io.gitlab.jfronny.respackopts.muscript.RespackoptsFS;
import net.minecraft.resource.*;
import net.minecraft.util.Identifier;
@ -9,25 +10,23 @@ import java.io.InputStream;
import java.util.Set;
public class FileFallbackProvider {
public static boolean fileHasFallback(ResourcePack pack, String file) {
return FileRpoSearchProvider.modifyWithRpo(file, pack, rpo -> {
public static boolean fileHasFallback(CacheKey key, RespackoptsFS fs, String file) {
return FileRpoSearchProvider.modifyWithRpo(file, key, fs, rpo -> {
if (rpo.fallbacks != null) {
for (String s : rpo.fallbacks) {
ResourcePath tmp = new ResourcePath(s);
if (pack.open(tmp.getType(), tmp.getId()) != null) return true;
if (fs.open(s) != null) return true;
}
}
return false;
}, false);
}
public static InputSupplier<InputStream> getReplacement(ResourcePack pack, String file) {
return FileRpoSearchProvider.modifyWithRpo(file, pack, rpo -> {
public static InputSupplier<InputStream> getReplacement(CacheKey key, RespackoptsFS fs, String file) {
return FileRpoSearchProvider.modifyWithRpo(file, key, fs, rpo -> {
try {
if (rpo.fallbacks != null) {
for (String s : rpo.fallbacks) {
ResourcePath tmp = new ResourcePath(s);
InputSupplier<InputStream> is = pack.open(tmp.getType(), tmp.getId());
InputSupplier<InputStream> is = fs.open(s);
if (is != null) return is;
}
}
@ -40,15 +39,15 @@ public class FileFallbackProvider {
}, null);
}
public static void addFallbackResources(String namespace, ResourceType type, Identifier identifier, ResourcePack pack, Set<Identifier> ids, ResourcePack.ResultConsumer out) {
public static void addFallbackResources(String namespace, ResourceType type, Identifier identifier, CacheKey key, RespackoptsFS fs, Set<Identifier> ids, ResourcePack.ResultConsumer out) {
// Warning: the Identifiers here DON'T CONTAIN THE TYPE! Therefore, it needs to be added when calling a method that generates a ResourcePath!
String path = identifier.getPath();
if (FileRpoSearchProvider.isRpo(path)) {
String expectedTarget = path.substring(0, path.length() - Respackopts.FILE_EXTENSION.length());
if (ids.stream().noneMatch(s -> s.getPath().equals(expectedTarget)) && fileHasFallback(pack, type.getDirectory() + "/" + expectedTarget)) {
if (ids.stream().noneMatch(s -> s.getPath().equals(expectedTarget)) && fileHasFallback(key, fs, type.getDirectory() + "/" + expectedTarget)) {
Identifier id = new Identifier(namespace, expectedTarget);
ids.add(id);
out.accept(id, pack.open(type, id));
out.accept(id, fs.open(type, id));
}
}
}

22
src/main/java/io/gitlab/jfronny/respackopts/filters/util/FileRpoSearchProvider.java
View File

@ -1,13 +1,13 @@
package io.gitlab.jfronny.respackopts.filters.util;
import io.gitlab.jfronny.libjf.ResourcePath;
import io.gitlab.jfronny.respackopts.Respackopts;
import io.gitlab.jfronny.respackopts.gson.AttachmentHolder;
import io.gitlab.jfronny.respackopts.model.FileRpo;
import io.gitlab.jfronny.respackopts.model.cache.CacheKey;
import io.gitlab.jfronny.respackopts.model.cache.CachedPackState;
import io.gitlab.jfronny.respackopts.muscript.RespackoptsFS;
import io.gitlab.jfronny.respackopts.util.MetaCache;
import net.minecraft.resource.InputSupplier;
import net.minecraft.resource.ResourcePack;
import java.io.*;
import java.util.Map;
@ -17,23 +17,13 @@ public class FileRpoSearchProvider {
return fileName.endsWith(Respackopts.FILE_EXTENSION);
}
public static <T> T modifyWithRpo(String fileName, ResourcePack pack, Action<T> action, T defaultValue) {
public static <T> T modifyWithRpo(String fileName, CacheKey key, RespackoptsFS fs, Action<T> action, T defaultValue) {
if (isRpo(fileName)) return defaultValue;
CachedPackState state = MetaCache.getState(MetaCache.getKeyByPack(pack));
CachedPackState state = MetaCache.getState(key);
Map<String, FileRpo> rpoCache = state.cachedFileRPOs();
String rpoPathS = fileName + Respackopts.FILE_EXTENSION;
if (rpoCache.containsKey(rpoPathS)) return action.run(rpoCache.get(rpoPathS));
ResourcePath rpoPath = null;
InputSupplier<InputStream> is;
if (fileName.contains("/")) {
try {
rpoPath = new ResourcePath(rpoPathS);
is = pack.open(rpoPath.getType(), rpoPath.getId());
} catch (Throwable e) {
Respackopts.LOGGER.error("Could not check file filter status", e);
return defaultValue;
}
} else is = pack.openRoot(rpoPathS);
InputSupplier<InputStream> is = fs.open(rpoPathS);
if (is == null) return defaultValue;
try (Reader w = new InputStreamReader(is.get())) {
FileRpo frp = AttachmentHolder.deserialize(state.metadata().version, w, FileRpo.class);
@ -42,7 +32,7 @@ public class FileRpoSearchProvider {
return action.run(frp);
}
catch (Exception e) {
Respackopts.LOGGER.error("Could not get replacement for " + (rpoPath == null ? fileName : rpoPath.getName()) + " in " + pack.getName(), e);
Respackopts.LOGGER.error("Could not get replacement for " + fileName + " in " + state.displayName(), e);
return defaultValue;
}
}

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

@ -45,13 +45,13 @@ public class BoolExprDeserializer implements JsonDeserializer<BoolExpr> {
if (pr.isString()) {
String name = pr.getAsString();
if (name.toLowerCase(Locale.ROOT).equals("true"))
return Expr.literal(-1, -1, true);
return Expr.literal(CodeLocation.NONE, true);
if (name.toLowerCase(Locale.ROOT).equals("false"))
return Expr.literal(-1, -1, false);
return Expr.literal(CodeLocation.NONE, false);
return rpoBooleanCondition(name);
}
else if (pr.isBoolean()) {
return Expr.literal(-1, -1, pr.getAsBoolean());
return Expr.literal(CodeLocation.NONE, pr.getAsBoolean());
}
}
throw new JsonParseException("Invalid data type for condition");

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

@ -4,6 +4,7 @@ import io.gitlab.jfronny.gson.*;
import io.gitlab.jfronny.muscript.StarScriptIngester;
import io.gitlab.jfronny.muscript.ast.Expr;
import io.gitlab.jfronny.muscript.compiler.Parser;
import io.gitlab.jfronny.respackopts.muscript.ScopeVersion;
import java.lang.reflect.Type;
import java.util.HashMap;
@ -19,7 +20,8 @@ public class ExprDeserializer implements JsonDeserializer<Expr<?>> {
if (compiledScripts.containsKey(s))
return compiledScripts.get(s);
try {
Expr<?> expr = Parser.parse(AttachmentHolder.getAttachedVersion() <= 7
int v = AttachmentHolder.getAttachedVersion();
Expr<?> expr = Parser.parse(ScopeVersion.by(v).muScriptVersion, v <= 7
? StarScriptIngester.starScriptToMu(s)
: s);
compiledScripts.put(s, expr);

15
src/main/java/io/gitlab/jfronny/respackopts/mixin/FileResourcePackProviderMixin.java
View File

@ -2,19 +2,18 @@ package io.gitlab.jfronny.respackopts.mixin;
import io.gitlab.jfronny.respackopts.Respackopts;
import net.minecraft.resource.FileResourcePackProvider;
import net.minecraft.resource.ResourcePackProfile;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import org.spongepowered.asm.mixin.injection.Redirect;
import java.nio.file.Files;
import java.nio.file.Path;
import java.io.IOException;
import java.nio.file.*;
@Mixin(FileResourcePackProvider.class)
public class FileResourcePackProviderMixin {
@Inject(method = "getFactory(Ljava/nio/file/Path;Z)Lnet/minecraft/resource/ResourcePackProfile$PackFactory;", at = @At("HEAD"), cancellable = true)
private static void getFactory(Path path, boolean alwaysStable, CallbackInfoReturnable<ResourcePackProfile.PackFactory> cir) {
if (Files.isRegularFile(path) && path.getFileName().toString().endsWith(Respackopts.FILE_EXTENSION)) cir.setReturnValue(null);
//TODO use MixinExtras Wrap instead of redirecting
@Redirect(method = "forEachProfile(Ljava/nio/file/Path;Lnet/minecraft/util/path/SymlinkFinder;ZLjava/util/function/BiConsumer;)V", at = @At(value = "INVOKE", target = "Ljava/nio/file/Files;newDirectoryStream(Ljava/nio/file/Path;)Ljava/nio/file/DirectoryStream;"))
private static DirectoryStream<Path> createFilteredStream(Path dir) throws IOException {
return Files.newDirectoryStream(dir, path -> !(Files.isRegularFile(path) && path.getFileName().toString().endsWith(Respackopts.FILE_EXTENSION)));
}
}

2
src/main/java/io/gitlab/jfronny/respackopts/mixin/ResourcePackManagerMixin.java
View File

@ -51,7 +51,7 @@ public class ResourcePackManagerMixin {
if (pack != null) dataLocation = pack.getParent().resolve(pack.getFileName() + Respackopts.FILE_EXTENSION);
else Respackopts.LOGGER.warn("Base path of directory resource pack " + rpi.getName() + " is null. This shouldn't happen!");
} else if (rpi instanceof ZipResourcePack zrp) {
File pack = ((ZipResourcePackAccessor) zrp).getBackingZipFile();
File pack = ((ZipFileWrapperAccessor) ((ZipResourcePackAccessor) zrp).getZipFile()).getFile();
if (pack != null) dataLocation = pack.toPath().getParent().resolve(pack.getName() + Respackopts.FILE_EXTENSION);
else Respackopts.LOGGER.warn("Base path of zip resource pack " + rpi.getName() + " is null. This shouldn't happen!");
}

13
src/main/java/io/gitlab/jfronny/respackopts/mixin/ZipFileWrapperAccessor.java Normal file
View File

@ -0,0 +1,13 @@
package io.gitlab.jfronny.respackopts.mixin;
import net.minecraft.resource.ZipResourcePack;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import java.io.File;
@Mixin(ZipResourcePack.ZipFileWrapper.class)
public interface ZipFileWrapperAccessor {
@Accessor("file")
File getFile();
}

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

@ -4,10 +4,8 @@ import net.minecraft.resource.ZipResourcePack;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import java.io.File;
@Mixin(ZipResourcePack.class)
public interface ZipResourcePackAccessor {
@Accessor("backingZipFile")
File getBackingZipFile();
@Accessor("zipFile")
ZipResourcePack.ZipFileWrapper getZipFile();
}

22
src/main/java/io/gitlab/jfronny/respackopts/mixin/muscript/DFinalMixin.java
View File

@ -1,22 +0,0 @@
package io.gitlab.jfronny.respackopts.mixin.muscript;
import io.gitlab.jfronny.commons.data.ImmCollection;
import io.gitlab.jfronny.muscript.data.dynamic.additional.DFinal;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
import java.util.*;
@Mixin(DFinal.class)
public class DFinalMixin {
@Redirect(method = "of(Ljava/util/Map;)Lio/gitlab/jfronny/muscript/data/dynamic/DObject;", at = @At(value = "INVOKE", target = "Lio/gitlab/jfronny/commons/data/ImmCollection;copyOf(Ljava/util/Map;)Ljava/util/Map;"), remap = false)
private static <K, V> Map<K, V> copyOf(Map<K, V> map) {
return ImmCollection.of(new LinkedHashMap<>(map));
}
@Redirect(method = "of(Ljava/util/List;)Lio/gitlab/jfronny/muscript/data/dynamic/DList;", at = @At(value = "INVOKE", target = "Lio/gitlab/jfronny/commons/data/ImmCollection;copyOf(Ljava/util/List;)Ljava/util/List;"), remap = false)
private static <E> List<E> copyOf(List<E> list) {
return ImmCollection.of(new LinkedList<>(list));
}
}

15
src/main/java/io/gitlab/jfronny/respackopts/mixin/muscript/StringCoerceMixin.java
View File

@ -1,15 +0,0 @@
package io.gitlab.jfronny.respackopts.mixin.muscript;
import io.gitlab.jfronny.commons.StringFormatter;
import io.gitlab.jfronny.muscript.ast.string.StringCoerce;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(StringCoerce.class)
public class StringCoerceMixin {
@Redirect(method = "optimize()Lio/gitlab/jfronny/muscript/ast/StringExpr;", at = @At(value = "INVOKE", target = "Lio/gitlab/jfronny/commons/StringFormatter;toStringPrecise(D)Ljava/lang/String;"), remap = false)
private String toStringPrecise(double number) {
return StringFormatter.toString(number);
}
}

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

@ -1,6 +1,6 @@
package io.gitlab.jfronny.respackopts.model;
import io.gitlab.jfronny.commons.serialize.gson.api.v1.Ignore;
import io.gitlab.jfronny.commons.serialize.gson.api.v2.Ignore;
import io.gitlab.jfronny.gson.annotations.SerializedName;
public class DirRpo {

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

@ -1,6 +1,6 @@
package io.gitlab.jfronny.respackopts.model;
import io.gitlab.jfronny.commons.serialize.gson.api.v1.Ignore;
import io.gitlab.jfronny.commons.serialize.gson.api.v2.Ignore;
import io.gitlab.jfronny.gson.annotations.SerializedName;
import io.gitlab.jfronny.muscript.ast.StringExpr;

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

@ -1,9 +1,10 @@
package io.gitlab.jfronny.respackopts.model.cache;
import io.gitlab.jfronny.muscript.data.Scope;
import io.gitlab.jfronny.respackopts.Respackopts;
import io.gitlab.jfronny.muscript.data.Script;
import io.gitlab.jfronny.respackopts.model.*;
import io.gitlab.jfronny.respackopts.model.tree.ConfigBranch;
import io.gitlab.jfronny.respackopts.muscript.MuScriptScope;
import java.util.*;
@ -15,6 +16,8 @@ public record CachedPackState(
PackMeta metadata,
Map<String, FileRpo> cachedFileRPOs,
Map<String, List<DirRpo>> cachedDirRPOs, // Directory RPOs, from outermost to innermost
Map<String, Script> cachedScripts, // Scripts, available via runScript
Map<String, String> cachedFiles, // Files, read by readString
Scope executionScope
) {
public CachedPackState(CacheKey key, PackMeta meta, ConfigBranch branch) {
@ -26,7 +29,9 @@ public record CachedPackState(
meta,
new HashMap<>(),
new HashMap<>(),
branch.addTo(Respackopts.ROOT_SCOPE.fork())
new HashMap<>(),
new HashMap<>(),
branch.addTo(MuScriptScope.fork(meta.version))
);
}
}

2
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.libjf.config.api.v1.dsl.CategoryBuilder;
import io.gitlab.jfronny.libjf.config.api.v2.dsl.CategoryBuilder;
import io.gitlab.jfronny.muscript.data.dynamic.DBool;
import io.gitlab.jfronny.respackopts.Respackopts;
import io.gitlab.jfronny.respackopts.RespackoptsConfig;

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

@ -2,8 +2,8 @@ package io.gitlab.jfronny.respackopts.model.tree;
import com.google.common.collect.ImmutableMap;
import io.gitlab.jfronny.gson.reflect.TypeToken;
import io.gitlab.jfronny.libjf.config.api.v1.dsl.CategoryBuilder;
import io.gitlab.jfronny.libjf.config.api.v1.dsl.ConfigBuilder;
import io.gitlab.jfronny.libjf.config.api.v2.dsl.CategoryBuilder;
import io.gitlab.jfronny.libjf.config.api.v2.dsl.ConfigBuilder;
import io.gitlab.jfronny.muscript.data.Scope;
import io.gitlab.jfronny.muscript.data.dynamic.Dynamic;
import io.gitlab.jfronny.muscript.data.dynamic.additional.DFinal;

2
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.libjf.config.api.v1.dsl.CategoryBuilder;
import io.gitlab.jfronny.libjf.config.api.v2.dsl.CategoryBuilder;
import io.gitlab.jfronny.muscript.data.dynamic.DynamicBase;
import io.gitlab.jfronny.respackopts.Respackopts;
import io.gitlab.jfronny.respackopts.model.enums.ConfigSyncMode;

2
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.libjf.config.api.v1.dsl.CategoryBuilder;
import io.gitlab.jfronny.libjf.config.api.v2.dsl.CategoryBuilder;
import io.gitlab.jfronny.muscript.data.dynamic.Dynamic;
import io.gitlab.jfronny.muscript.data.dynamic.additional.DEnum;
import io.gitlab.jfronny.muscript.data.dynamic.additional.DelegateDynamic;

2
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.libjf.config.api.v1.dsl.CategoryBuilder;
import io.gitlab.jfronny.libjf.config.api.v2.dsl.CategoryBuilder;
import io.gitlab.jfronny.muscript.data.dynamic.DNumber;
import io.gitlab.jfronny.respackopts.Respackopts;
import io.gitlab.jfronny.respackopts.RespackoptsConfig;

2
src/main/java/io/gitlab/jfronny/respackopts/model/tree/GuiEntryBuilderParam.java
View File

@ -1,6 +1,6 @@
package io.gitlab.jfronny.respackopts.model.tree;
import io.gitlab.jfronny.libjf.config.api.v1.dsl.CategoryBuilder;
import io.gitlab.jfronny.libjf.config.api.v2.dsl.CategoryBuilder;
public record GuiEntryBuilderParam(CategoryBuilder<?> builder, String name, Runnable onSave) {
public void saveCallback() {

48
src/main/java/io/gitlab/jfronny/respackopts/muscript/MuScriptScope.java Normal file
View File

@ -0,0 +1,48 @@
package io.gitlab.jfronny.respackopts.muscript;
import io.gitlab.jfronny.muscript.compiler.MuScriptVersion;
import io.gitlab.jfronny.muscript.compiler.SourceFS;
import io.gitlab.jfronny.muscript.data.Scope;
import io.gitlab.jfronny.muscript.data.dynamic.additional.DFinal;
import io.gitlab.jfronny.muscript.gson.GsonLib;
import io.gitlab.jfronny.muscript.libs.*;
import io.gitlab.jfronny.respackopts.model.cache.CachedPackState;
import net.fabricmc.loader.api.FabricLoader;
import net.fabricmc.loader.api.VersionParsingException;
import net.fabricmc.loader.api.metadata.version.VersionPredicate;
import java.util.EnumMap;
import java.util.Map;
public class MuScriptScope {
private static final Map<ScopeVersion, Scope> map = new EnumMap<>(ScopeVersion.class);
static {
for (ScopeVersion version : ScopeVersion.values()) {
Scope scope = StandardLib.createScope(version.muScriptVersion);
scope = scope.set("version", args -> {
if (args.size() != 2) throw new IllegalArgumentException("Expected 2 arguments on version but got " + args.size());
VersionPredicate predicate;
try {
predicate = VersionPredicate.parse(args.get(1).asString().getValue());
} catch (VersionParsingException e) {
throw new IllegalArgumentException("Could not parse version predicate", e);
}
return DFinal.of(FabricLoader.getInstance().getModContainer(args.get(0).asString().getValue())
.map(c -> predicate.test(c.getMetadata().getVersion()))
.orElse(false));
});
if (version.contains(ScopeVersion.V13)) scope = GsonLib.addTo(scope);
map.put(version, scope);
}
}
public static Scope fork(int version) {
return map.get(ScopeVersion.by(version)).fork();
}
public static Scope configureFS(Scope scope, CachedPackState state, SourceFS fs) {
MuScriptVersion version = ScopeVersion.by(state.metadata().version).muScriptVersion;
return IOLib.addTo(version, scope, new IOWrapper.Caching(new IOWrapper.SourceFSWrapper(version, fs)));
}
}

42
src/main/java/io/gitlab/jfronny/respackopts/muscript/RespackoptsFS.java Normal file
View File

@ -0,0 +1,42 @@
package io.gitlab.jfronny.respackopts.muscript;
import io.gitlab.jfronny.libjf.ResourcePath;
import io.gitlab.jfronny.muscript.compiler.SourceFS;
import io.gitlab.jfronny.respackopts.Respackopts;
import net.minecraft.resource.*;
import net.minecraft.util.Identifier;
import org.jetbrains.annotations.Nullable;
import java.io.IOException;
import java.io.InputStream;
public class RespackoptsFS implements SourceFS {
private final ResourcePack pack;
public RespackoptsFS(ResourcePack pack) {
this.pack = pack;
}
@Override
public @Nullable String read(String file) {
InputSupplier<InputStream> op = open(file);
if (op == null) return null;
try (InputStream is = op.get()) {
return new String(is.readAllBytes());
} catch (IOException e) {
Respackopts.LOGGER.error("Could not open file", e);
return null;
}
}
public @Nullable InputSupplier<InputStream> open(String file) {
String[] segments = file.split("/");
if (segments.length < 3) return pack.openRoot(segments);
ResourcePath path = new ResourcePath(file);
return open(path.getType(), path.getId());
}
public @Nullable InputSupplier<InputStream> open(ResourceType type, Identifier id) {
return pack.open(type, id);
}
}

23
src/main/java/io/gitlab/jfronny/respackopts/muscript/ScopeVersion.java Normal file
View File

@ -0,0 +1,23 @@
package io.gitlab.jfronny.respackopts.muscript;
import io.gitlab.jfronny.muscript.compiler.MuScriptVersion;
public enum ScopeVersion {
V10(MuScriptVersion.V1),
V12(MuScriptVersion.V2),
V13(MuScriptVersion.V3);
public final MuScriptVersion muScriptVersion;
ScopeVersion(MuScriptVersion muScriptVersion) {
this.muScriptVersion = muScriptVersion;
}
public static ScopeVersion by(int version) {
return version < 10 ? V10 : version <= 12 ? V12 : V13;
}
public boolean contains(ScopeVersion version) {
return compareTo(version) >= 0;
}
}

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

@ -11,9 +11,12 @@ import io.gitlab.jfronny.respackopts.model.cache.CachedPackState;
import io.gitlab.jfronny.respackopts.model.enums.ConfigSyncMode;
import io.gitlab.jfronny.respackopts.model.enums.PackCapability;
import io.gitlab.jfronny.respackopts.model.tree.ConfigBranch;
import io.gitlab.jfronny.respackopts.muscript.MuScriptScope;
import io.gitlab.jfronny.respackopts.muscript.RespackoptsFS;
import net.fabricmc.api.EnvType;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.resource.ResourcePack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.*;
@ -158,9 +161,19 @@ public class MetaCache {
return PACK_STATES.get(key);
}
public static Scope getScope(@Nullable CacheKey key) {
Scope scope = (key == null ? Respackopts.ROOT_SCOPE : MetaCache.getState(key).executionScope()).fork();
MetaCache.forEach((id, state) -> {
public static Scope getScope(int version) {
Scope scope = MuScriptScope.fork(version);
return populate(scope);
}
public static Scope getScope(@NotNull CacheKey key, RespackoptsFS fs) {
CachedPackState state = MetaCache.getState(key);
Scope scope = state.executionScope().fork();
return populate(MuScriptScope.configureFS(scope, state, fs));
}
private static Scope populate(Scope scope) {
forEach((id, state) -> {
if (!scope.has(state.packId())) {
scope.set(state.packId(), state.configBranch());
}

1
src/main/resources/fabric.mod.json
View File

@ -30,6 +30,7 @@
"environment": "client"
}
],
"accessWidener": "respackopts.accesswidener",
"depends": {
"fabricloader": ">=0.12.0",
"fabric-api": "*",

3
src/main/resources/respackopts.accesswidener Normal file
View File

@ -0,0 +1,3 @@
accessWidener v2 named
accessible class net/minecraft/resource/ZipResourcePack$ZipFileWrapper

5
src/main/resources/respackopts.mixins.json
View File

@ -7,9 +7,8 @@
"DirectoryResourcePackAccessor",
"FileResourcePackProviderMixin",
"ResourcePackManagerMixin",
"ZipResourcePackAccessor",
"muscript.DFinalMixin",
"muscript.StringCoerceMixin"
"ZipFileWrapperAccessor",
"ZipResourcePackAccessor"
],
"injectors": {
"defaultRequire": 1