From a48648447f62c638d937705b751cf1efa8e4bfbe Mon Sep 17 00:00:00 2001 From: LambdAurora Date: Mon, 11 Oct 2021 23:09:44 +0200 Subject: [PATCH] Add missing remap false. --- .../java/org/quiltmc/qsl/tag/mixin/MinecraftServerMixin.java | 3 ++- .../main/java/org/quiltmc/qsl/tag/mixin/TagBuilderMixin.java | 3 ++- .../java/org/quiltmc/qsl/tag/mixin/TagManagerLoaderMixin.java | 2 +- .../qsl/tag/mixin/client/ClientPlayNetworkHandlerMixin.java | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/library/data/tags/src/main/java/org/quiltmc/qsl/tag/mixin/MinecraftServerMixin.java b/library/data/tags/src/main/java/org/quiltmc/qsl/tag/mixin/MinecraftServerMixin.java index 805019cb6c..f691a3a4a5 100644 --- a/library/data/tags/src/main/java/org/quiltmc/qsl/tag/mixin/MinecraftServerMixin.java +++ b/library/data/tags/src/main/java/org/quiltmc/qsl/tag/mixin/MinecraftServerMixin.java @@ -45,7 +45,8 @@ public class MinecraftServerMixin { value = "INVOKE", target = "Lnet/minecraft/resource/ServerResourceManager;loadRegistryTags()V", shift = At.Shift.AFTER - ) + ), + remap = false ) private void method_29440(Collection collection, ServerResourceManager serverResourceManager, CallbackInfo ci) { // Load dynamic registry tags on data pack reload. diff --git a/library/data/tags/src/main/java/org/quiltmc/qsl/tag/mixin/TagBuilderMixin.java b/library/data/tags/src/main/java/org/quiltmc/qsl/tag/mixin/TagBuilderMixin.java index d100d55cf0..09de80a667 100644 --- a/library/data/tags/src/main/java/org/quiltmc/qsl/tag/mixin/TagBuilderMixin.java +++ b/library/data/tags/src/main/java/org/quiltmc/qsl/tag/mixin/TagBuilderMixin.java @@ -48,7 +48,8 @@ public class TagBuilderMixin implements QuiltTagBuilder { method = "build", at = @At( value = "INVOKE", - target = "Lcom/mojang/datafixers/util/Either;right(Ljava/lang/Object;)Lcom/mojang/datafixers/util/Either;" + target = "Lcom/mojang/datafixers/util/Either;right(Ljava/lang/Object;)Lcom/mojang/datafixers/util/Either;", + remap = false ) ) private Either, Object> build(Object tag) { diff --git a/library/data/tags/src/main/java/org/quiltmc/qsl/tag/mixin/TagManagerLoaderMixin.java b/library/data/tags/src/main/java/org/quiltmc/qsl/tag/mixin/TagManagerLoaderMixin.java index 332fa032bb..433db59131 100644 --- a/library/data/tags/src/main/java/org/quiltmc/qsl/tag/mixin/TagManagerLoaderMixin.java +++ b/library/data/tags/src/main/java/org/quiltmc/qsl/tag/mixin/TagManagerLoaderMixin.java @@ -47,7 +47,7 @@ private void onReload(ResourceReloader.Synchronizer synchronizer, ResourceManage @Dynamic("private static synthetic method_33179; " + "Consumer lambda in reload method, corresponds to the RequiredTagList.forEach.") - @Inject(method = "method_33179", at = @At("HEAD"), cancellable = true) + @Inject(method = "method_33179", at = @At("HEAD"), cancellable = true, remap = false) private void onRequiredGroupBuild(ResourceManager resourceManager, Executor executor, List list, RequiredTagList requiredTagList, CallbackInfo ci) { // Don't load dynamic registry tags now, we need to load them after the dynamic registry. diff --git a/library/data/tags/src/main/java/org/quiltmc/qsl/tag/mixin/client/ClientPlayNetworkHandlerMixin.java b/library/data/tags/src/main/java/org/quiltmc/qsl/tag/mixin/client/ClientPlayNetworkHandlerMixin.java index a7ad76970a..5674723bae 100644 --- a/library/data/tags/src/main/java/org/quiltmc/qsl/tag/mixin/client/ClientPlayNetworkHandlerMixin.java +++ b/library/data/tags/src/main/java/org/quiltmc/qsl/tag/mixin/client/ClientPlayNetworkHandlerMixin.java @@ -68,7 +68,8 @@ private void onGetMissingTagsStart(SynchronizeTagsS2CPacket packet, CallbackInfo method = "onSynchronizeTags", at = @At( value = "INVOKE", - target = "Lcom/google/common/collect/Multimap;isEmpty()Z" + target = "Lcom/google/common/collect/Multimap;isEmpty()Z", + remap = false ) ) private void onGetMissingTagsEnd(SynchronizeTagsS2CPacket packet, CallbackInfo ci) {