diff --git a/build.gradle.kts b/build.gradle.kts index 23e0ac4..6b4c473 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,13 +5,13 @@ plugins { allprojects { group = "io.gitlab.jfronny" } base.archivesName = "better-whitelist" -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" jfMod { - minecraftVersion = "1.20.1" - yarn("build.10") + minecraftVersion = "1.20.2" + yarn("build.1") loaderVersion = "0.14.22" - libJfVersion = "3.12.1" + libJfVersion = "3.13.1" modrinth { projectId = "better-whitelist" @@ -27,5 +27,5 @@ dependencies { // Dev env modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${jfMod.libJfVersion.get()}") - modLocalRuntime("com.terraformersmc:modmenu:7.2.1") + modLocalRuntime("com.terraformersmc:modmenu:8.0.0-beta.2") } diff --git a/src/client/java/io/gitlab/jfronny/betterwhitelist/client/BetterWhitelistClient.java b/src/client/java/io/gitlab/jfronny/betterwhitelist/client/BetterWhitelistClient.java index 334b769..7c418cd 100644 --- a/src/client/java/io/gitlab/jfronny/betterwhitelist/client/BetterWhitelistClient.java +++ b/src/client/java/io/gitlab/jfronny/betterwhitelist/client/BetterWhitelistClient.java @@ -1,6 +1,7 @@ package io.gitlab.jfronny.betterwhitelist.client; import io.gitlab.jfronny.betterwhitelist.BetterWhitelist; +import io.gitlab.jfronny.muscript.compiler.MuScriptVersion; import io.gitlab.jfronny.muscript.compiler.Parser; import io.gitlab.jfronny.muscript.data.Scope; import io.gitlab.jfronny.muscript.data.dynamic.DCallable; @@ -41,11 +42,11 @@ public class BetterWhitelistClient implements ClientModInitializer { .toList()); String scriptSource = buf.readString(); BetterWhitelist.LOG.info("Received challenge: " + scriptSource); - DCallable script = Parser.parse(scriptSource).asDynamicExpr().get(fork).asCallable(); + DCallable script = Parser.parse(MuScriptVersion.DEFAULT, scriptSource).asDynamicExpr().get(fork).asCallable(); int paramSize = buf.readInt(); List params = new LinkedList<>(); for (int i = 0; i < paramSize; i++) { - params.add(Parser.parse(buf.readString()).asDynamicExpr().get(fork)); + params.add(Parser.parse(MuScriptVersion.DEFAULT, buf.readString()).asDynamicExpr().get(fork)); } String resultString = Dynamic.serialize(script.call(DFinal.of(params))); BetterWhitelist.LOG.info("Sending result: " + resultString); diff --git a/src/main/java/io/gitlab/jfronny/betterwhitelist/BetterWhitelist.java b/src/main/java/io/gitlab/jfronny/betterwhitelist/BetterWhitelist.java index de53606..f810d72 100644 --- a/src/main/java/io/gitlab/jfronny/betterwhitelist/BetterWhitelist.java +++ b/src/main/java/io/gitlab/jfronny/betterwhitelist/BetterWhitelist.java @@ -1,7 +1,8 @@ package io.gitlab.jfronny.betterwhitelist; -import io.gitlab.jfronny.commons.log.Logger; -import io.gitlab.jfronny.muscript.StandardLib; +import io.gitlab.jfronny.commons.logging.Logger; +import io.gitlab.jfronny.muscript.compiler.MuScriptVersion; +import io.gitlab.jfronny.muscript.libs.StandardLib; import io.gitlab.jfronny.muscript.data.Scope; import io.gitlab.jfronny.muscript.data.dynamic.*; import io.gitlab.jfronny.muscript.data.dynamic.additional.DFinal; @@ -23,7 +24,7 @@ public class BetterWhitelist { public static final Identifier CHALLENGE_CHANNEL = new Identifier(MOD_ID, "challenge"); public static final int PROTOCOL_VERSION = 1; public static final ModMetadata MOD_METADATA = FabricLoader.getInstance().getModContainer(MOD_ID).orElseThrow().getMetadata(); - public static final Scope SCOPE = StandardLib.createScope(); + public static final Scope SCOPE = StandardLib.createScope(MuScriptVersion.DEFAULT); static { SCOPE.set("mods", FabricLoader.getInstance() diff --git a/src/main/java/io/gitlab/jfronny/betterwhitelist/server/BetterWhitelistServer.java b/src/main/java/io/gitlab/jfronny/betterwhitelist/server/BetterWhitelistServer.java index 3c55142..ad5d3bd 100644 --- a/src/main/java/io/gitlab/jfronny/betterwhitelist/server/BetterWhitelistServer.java +++ b/src/main/java/io/gitlab/jfronny/betterwhitelist/server/BetterWhitelistServer.java @@ -5,6 +5,7 @@ import com.mojang.brigadier.context.CommandContext; import io.gitlab.jfronny.betterwhitelist.BetterWhitelist; import io.gitlab.jfronny.betterwhitelist.server.mixin.ServerLoginNetworkHandlerAccessor; import io.gitlab.jfronny.commons.StringFormatter; +import io.gitlab.jfronny.muscript.compiler.MuScriptVersion; import io.gitlab.jfronny.muscript.compiler.Parser; import io.gitlab.jfronny.muscript.data.Script; import io.gitlab.jfronny.muscript.data.dynamic.Dynamic; @@ -162,7 +163,7 @@ public class BetterWhitelistServer implements DedicatedServerModInitializer { }, mods::values()::filter({ v -> v.environment != 'server' })::map({ v -> { id = v.id, version = v.version } }))) """); String s = Files.readString(scriptPath); - this.script = Parser.parseScript(s); + this.script = Parser.parseScript(MuScriptVersion.DEFAULT, s); this.scriptSource = s; } }