From b3b97be61e95ef272457b20e25bf5442a83a8a72 Mon Sep 17 00:00:00 2001 From: Misode Date: Thu, 28 Nov 2024 20:23:10 +0100 Subject: [PATCH] Update to 1.21.4 --- gradle.properties | 8 ++++---- .../packtest/PackTestFileToIdConverter.java | 5 +++++ .../misode/packtest/PackTestFunction.java | 2 +- .../packtest/mixin/FileToIdConverterMixin.java | 18 ++++++++++++++++++ .../packtest/mixin/GameTestBatchMixin.java | 4 ++-- .../mixin/ItemPredicateArgumentMixin.java | 2 +- .../SimpleJsonResourceReloadListenerMixin.java | 7 +++++-- src/main/resources/fabric.mod.json | 2 +- src/main/resources/packtest.mixins.json | 1 + 9 files changed, 38 insertions(+), 11 deletions(-) create mode 100644 src/main/java/io/github/misode/packtest/PackTestFileToIdConverter.java create mode 100644 src/main/java/io/github/misode/packtest/mixin/FileToIdConverterMixin.java diff --git a/gradle.properties b/gradle.properties index d32c667..80b6cf6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,13 +4,13 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.2 -loader_version=0.16.7 +minecraft_version=1.21.4-rc1 +loader_version=0.16.9 # Mod Properties -mod_version=1.9.0 +mod_version=1.10.0-beta1 maven_group=io.github.misode archives_base_name=packtest # Dependencies -fabric_version=0.106.1+1.21.2 +fabric_version=0.110.2+1.21.4 diff --git a/src/main/java/io/github/misode/packtest/PackTestFileToIdConverter.java b/src/main/java/io/github/misode/packtest/PackTestFileToIdConverter.java new file mode 100644 index 0000000..1a30277 --- /dev/null +++ b/src/main/java/io/github/misode/packtest/PackTestFileToIdConverter.java @@ -0,0 +1,5 @@ +package io.github.misode.packtest; + +public interface PackTestFileToIdConverter { + String packtest$getPrefix(); +} diff --git a/src/main/java/io/github/misode/packtest/PackTestFunction.java b/src/main/java/io/github/misode/packtest/PackTestFunction.java index bb09b33..7f62712 100644 --- a/src/main/java/io/github/misode/packtest/PackTestFunction.java +++ b/src/main/java/io/github/misode/packtest/PackTestFunction.java @@ -115,7 +115,7 @@ public void registerBatchHook(int permissionLevel, Map modifyBeforeBatch(Consumer original, @Local(ordinal = 0) String name) { + private static Consumer modifyBeforeBatch(Consumer original, @Local(ordinal = 0, argsOnly = true) String name) { String batchName = name.substring(0, name.lastIndexOf(":")); Consumer beforeBatch = PackTestLibrary.INSTANCE.getBeforeBatchFunction(batchName); return beforeBatch != null ? beforeBatch : original; } @ModifyVariable(method = "", at = @At(value = "HEAD"), ordinal = 0, argsOnly = true) - private static Consumer modifyAfterBatch(Consumer original, @Local(ordinal = 0) String name) { + private static Consumer modifyAfterBatch(Consumer original, @Local(ordinal = 0, argsOnly = true) String name) { String batchName = name.substring(0, name.lastIndexOf(":")); Consumer afterBatch = PackTestLibrary.INSTANCE.getAfterBatchFunction(batchName); return afterBatch != null ? afterBatch : original; diff --git a/src/main/java/io/github/misode/packtest/mixin/ItemPredicateArgumentMixin.java b/src/main/java/io/github/misode/packtest/mixin/ItemPredicateArgumentMixin.java index 44e13b5..29a46b2 100644 --- a/src/main/java/io/github/misode/packtest/mixin/ItemPredicateArgumentMixin.java +++ b/src/main/java/io/github/misode/packtest/mixin/ItemPredicateArgumentMixin.java @@ -21,7 +21,7 @@ private void getCursor(StringReader stringReader, CallbackInfoReturnable)args[2]).message()); } - @WrapOperation(method = "scanDirectory", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;[Ljava/lang/Object;)V", remap = false)) - private static void resourceException(Logger logger, String message, Object[] args, Operation original, @Local(ordinal = 0, argsOnly = true) String directory) { + @WrapOperation(method = "scanDirectory(Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/resources/FileToIdConverter;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Ljava/util/Map;)V", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;[Ljava/lang/Object;)V", remap = false)) + private static void resourceException(Logger logger, String message, Object[] args, Operation original, @Local(argsOnly = true) FileToIdConverter converter) { + String directory = ((PackTestFileToIdConverter)converter).packtest$getPrefix(); String type = directory.replace("_", " ").replace("/", " "); LoadDiagnostics.error(LOGGER, type, ((ResourceLocation)args[0]).toString(), (args[2]).toString()); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 2d83224..b81a2fb 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,7 +24,7 @@ "accessWidener": "packtest.accesswidener", "depends": { "fabricloader": ">=0.15.10", - "minecraft": ">=1.21.2-beta.3", + "minecraft": ">=1.21.4-beta.1", "java": ">=21", "fabric-api": "*" } diff --git a/src/main/resources/packtest.mixins.json b/src/main/resources/packtest.mixins.json index 80beba5..fd2b9f8 100644 --- a/src/main/resources/packtest.mixins.json +++ b/src/main/resources/packtest.mixins.json @@ -12,6 +12,7 @@ "CommandSourceStackMixin", "EntityArgumentMixin", "EntitySelectorMixin", + "FileToIdConverterMixin", "ForceLoadCommandMixin", "GameTestBatchMixin", "GameTestHelperMixin",