From 6a070fda9f4975bed56e435b3569e6582ba872f6 Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Thu, 30 Mar 2023 01:10:49 +0200 Subject: [PATCH] Fixed 1.7 interactions --- .../fixes/minecraft/MixinMinecraftClient.java | 2 +- .../MixinMetadataRewriter1_15To1_14_4.java | 7 ++-- .../MixinProtocol1_15To1_14_4.java | 35 ------------------- src/main/resources/viafabricplus.mixins.json | 9 ++--- 4 files changed, 7 insertions(+), 46 deletions(-) delete mode 100644 src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_15to1_14_4/MixinProtocol1_15To1_14_4.java diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinMinecraftClient.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinMinecraftClient.java index 849efd92..cca25b51 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinMinecraftClient.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinMinecraftClient.java @@ -68,7 +68,7 @@ public abstract class MixinMinecraftClient { at = @At(value = "INVOKE", target = "Lnet/minecraft/util/ActionResult;isAccepted()Z", ordinal = 0)) private boolean preventGenericInteract(ActionResult instance) { if (ProtocolHack.getTargetVersion().isOlderThanOrEqualTo(ProtocolVersion.v1_7_6)) { - return true; + return false; } return instance.isAccepted(); diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_15to1_14_4/MixinMetadataRewriter1_15To1_14_4.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_15to1_14_4/MixinMetadataRewriter1_15To1_14_4.java index 855c85e7..7c5eff86 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_15to1_14_4/MixinMetadataRewriter1_15To1_14_4.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_15to1_14_4/MixinMetadataRewriter1_15To1_14_4.java @@ -43,11 +43,10 @@ public abstract class MixinMetadataRewriter1_15To1_14_4 extends EntityRewriter metadatas, UserConnection connection, CallbackInfo ci) { - final Meta18Storage meta18Storage = protocol.get(Meta18Storage.class); - if (meta18Storage == null) { + if (protocol.get(Meta18Storage.class) == null) { + protocol.put(new Meta18Storage(connection)); Via.getPlatform().getLogger().severe("Metadata 18 storage is missing!"); - return; } - meta18Storage.getHealthDataMap().put(entityId, (Float) metadata.getValue()); + protocol.get(Meta18Storage.class).getHealthDataMap().put(entityId, (Float) metadata.getValue()); } } diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_15to1_14_4/MixinProtocol1_15To1_14_4.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_15to1_14_4/MixinProtocol1_15To1_14_4.java deleted file mode 100644 index d5db2c1f..00000000 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_15to1_14_4/MixinProtocol1_15To1_14_4.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus - * Copyright (C) 2021-2023 FlorianMichael/EnZaXD and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion.protocol1_15to1_14_4; - -import com.viaversion.viaversion.api.connection.UserConnection; -import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.Protocol1_15To1_14_4; -import de.florianmichael.viafabricplus.definition.v1_14_4.Meta18Storage; -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.CallbackInfo; - -@Mixin(value = Protocol1_15To1_14_4.class, remap = false) -public class MixinProtocol1_15To1_14_4 { - - @Inject(method = "init", at = @At("HEAD")) - public void addMeta18Storage(UserConnection connection, CallbackInfo ci) { - connection.put(new Meta18Storage(connection)); - } -} diff --git a/src/main/resources/viafabricplus.mixins.json b/src/main/resources/viafabricplus.mixins.json index 6ba13576..58af0472 100644 --- a/src/main/resources/viafabricplus.mixins.json +++ b/src/main/resources/viafabricplus.mixins.json @@ -132,7 +132,6 @@ "fixes.viaversion.protocol1_13to1_12_2.MixinWorldPackets1_13", "fixes.viaversion.protocol1_14to1_13_2.MixinInventoryPackets_2", "fixes.viaversion.protocol1_15to1_14_4.MixinMetadataRewriter1_15To1_14_4", - "fixes.viaversion.protocol1_15to1_14_4.MixinProtocol1_15To1_14_4", "fixes.viaversion.protocol1_16_2to1_16_1.MixinWorldPackets_2", "fixes.viaversion.protocol1_16to1_15_2.MixinProtocol1_16To1_15_2", "fixes.viaversion.protocol1_17to1_16_4.MixinEntityPackets1_17", @@ -150,12 +149,10 @@ "fixes.viaversion.protocol1_9to1_8.MixinViaIdleThread", "jsonwebtoken.MixinClasses", "jsonwebtoken.MixinDefaultCompressionCodecResolver", - "jsonwebtoken.MixinDefaultJwtParserBuilder" + "jsonwebtoken.MixinDefaultJwtParserBuilder", + "base.MixinSharedConstants" ], "injectors": { "defaultRequire": 1 - }, - "mixins": [ - "base.MixinSharedConstants" - ] + } }