Fix several bugs, bump deps for 1.19

build.gradle

@@ -23,7 +23,7 @@ dependencies {
     modApi("me.shedaniel.cloth:cloth-config-fabric:7.0.65") {
         exclude(group: "net.fabricmc.fabric-api")
     }
-    modCompileOnly "io.vram:frex-fabric-mc118:+"
+    modCompileOnly "io.vram:frex-fabric-mc119:+"
     modImplementation("io.gitlab.jfronny.libjf:libjf-data-manipulation-v0:${project.jfapi_version}")
     modRuntimeOnly("io.gitlab.jfronny.libjf:libjf-devutil-v0:${project.jfapi_version}")
 

gradle.properties

@@ -1,12 +1,12 @@
 # https://fabricmc.net/develop/
-minecraft_version=1.19-rc2
+minecraft_version=1.19
 yarn_mappings=build.1
 loader_version=0.14.6
 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.7+11-38-13
+fabric_version=0.55.1+1.19
+jfapi_version=2.9.1
+muscript_version=2022.6.7+17-43-1
 
 modrinth_id=TiF5QWZY
 modrinth_required_dependencies=P7dR8mSH, 9s6osm5g, WKwQAwke

src/main/java/io/gitlab/jfronny/respackopts/filters/DirFilterEventImpl.java

@@ -125,7 +125,8 @@ public class DirFilterEventImpl {
             return null;
         }
         if (UserResourceEvents.disable(() -> pack.contains(rp.getType(), rp.getId()))) {
-            try (InputStream stream = UserResourceEvents.disable(() -> pack.open(rp.getType(), rp.getId())); Reader w = new InputStreamReader(stream)) {
+            try (InputStream stream = UserResourceEvents.disable(() -> pack.open(rp.getType(), rp.getId()));
+                 Reader w = new InputStreamReader(stream)) {
                 drp = AttachmentHolder.deserialize(state.metadata().version, w, DirRpo.class);
                 drp.path = name;
                 if (drp.fallback != null && !drp.fallback.endsWith("/"))

src/main/java/io/gitlab/jfronny/respackopts/gson/BoolExprDeserializer.java

@@ -17,7 +17,7 @@ public class BoolExprDeserializer implements JsonDeserializer<BoolExpr> {
     @Override
     public BoolExpr deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
         if (AttachmentHolder.getAttachedVersion() > 7) {
-            return ((Expr<?>)context.deserialize(json, Expr.class)).asBoolExpr();
+            return context.<Expr<?>>deserialize(json, Expr.class).asBoolExpr();
         }
 
         // Legacy JSON syntax

src/main/java/io/gitlab/jfronny/respackopts/model/DirRpo.java

@@ -1,7 +1,7 @@
 package io.gitlab.jfronny.respackopts.model;
 
-import com.google.gson.annotations.*;
 import io.gitlab.jfronny.commons.serialize.gson.api.*;
+import io.gitlab.jfronny.gson.annotations.*;
 import io.gitlab.jfronny.muscript.compiler.expr.*;
 
 public class DirRpo {

src/main/java/io/gitlab/jfronny/respackopts/model/FileRpo.java

@@ -1,7 +1,7 @@
 package io.gitlab.jfronny.respackopts.model;
 
-import com.google.gson.annotations.*;
 import io.gitlab.jfronny.commons.serialize.gson.api.*;
+import io.gitlab.jfronny.gson.annotations.*;
 import io.gitlab.jfronny.muscript.compiler.expr.*;
 
 import java.util.*;

src/main/java/io/gitlab/jfronny/respackopts/util/MetaCache.java

@@ -138,7 +138,7 @@ public class MetaCache {
             if (!parameter.has(packId))
                 parameter.set(packId, state.configBranch().getDynamic());
         });
-        return parameter;
+        return MuUtils.addDefault(parameter);
     }
 
     public static boolean hasCapability(ResourcePack pack, PackCapability capability) {