From f6c2c9b941452a1912b7374c591f9baea22bd052 Mon Sep 17 00:00:00 2001 From: Big-Iron-Cheems <52252627+Big-Iron-Cheems@users.noreply.github.com> Date: Sat, 17 Aug 2024 14:14:31 +0200 Subject: [PATCH] Mark other mixins abstract --- .../meteordevelopment/meteorclient/mixin/BundleItemMixin.java | 2 +- .../meteorclient/mixin/DyedColorComponentMixin.java | 2 +- .../meteorclient/mixin/ItemEnchantmentsComponentMixin.java | 2 +- .../meteordevelopment/meteorclient/mixin/ItemGroupsMixin.java | 2 +- .../meteorclient/mixin/UnbreakableComponentMixin.java | 2 +- .../mixin/lithium/LithiumEntityCollisionsMixin.java | 2 +- .../meteorclient/mixin/viafabricplus/GeneralSettingsMixin.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/meteordevelopment/meteorclient/mixin/BundleItemMixin.java b/src/main/java/meteordevelopment/meteorclient/mixin/BundleItemMixin.java index 30237e0225..68bd6873af 100644 --- a/src/main/java/meteordevelopment/meteorclient/mixin/BundleItemMixin.java +++ b/src/main/java/meteordevelopment/meteorclient/mixin/BundleItemMixin.java @@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.At; @Mixin(BundleItem.class) -public class BundleItemMixin { +public abstract class BundleItemMixin { @ModifyExpressionValue(method = "getTooltipData", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;contains(Lnet/minecraft/component/ComponentType;)Z", ordinal = 0)) private boolean modifyContains1(boolean original) { BetterTooltips bt = Modules.get().get(BetterTooltips.class); diff --git a/src/main/java/meteordevelopment/meteorclient/mixin/DyedColorComponentMixin.java b/src/main/java/meteordevelopment/meteorclient/mixin/DyedColorComponentMixin.java index 7d7a80da8d..7d1eae3275 100644 --- a/src/main/java/meteordevelopment/meteorclient/mixin/DyedColorComponentMixin.java +++ b/src/main/java/meteordevelopment/meteorclient/mixin/DyedColorComponentMixin.java @@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.At; @Mixin(DyedColorComponent.class) -public class DyedColorComponentMixin { +public abstract class DyedColorComponentMixin { @ModifyExpressionValue(method = "appendTooltip", at = @At(value = "FIELD", target = "Lnet/minecraft/component/type/DyedColorComponent;showInTooltip:Z")) private boolean modifyShowInTooltip(boolean original) { BetterTooltips bt = Modules.get().get(BetterTooltips.class); diff --git a/src/main/java/meteordevelopment/meteorclient/mixin/ItemEnchantmentsComponentMixin.java b/src/main/java/meteordevelopment/meteorclient/mixin/ItemEnchantmentsComponentMixin.java index 1744328465..a720f5f997 100644 --- a/src/main/java/meteordevelopment/meteorclient/mixin/ItemEnchantmentsComponentMixin.java +++ b/src/main/java/meteordevelopment/meteorclient/mixin/ItemEnchantmentsComponentMixin.java @@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.At; @Mixin(ItemEnchantmentsComponent.class) -public class ItemEnchantmentsComponentMixin { +public abstract class ItemEnchantmentsComponentMixin { @ModifyExpressionValue(method = "appendTooltip", at = @At(value = "FIELD", target = "Lnet/minecraft/component/type/ItemEnchantmentsComponent;showInTooltip:Z")) private boolean modifyShowInTooltip(boolean original) { BetterTooltips bt = Modules.get().get(BetterTooltips.class); diff --git a/src/main/java/meteordevelopment/meteorclient/mixin/ItemGroupsMixin.java b/src/main/java/meteordevelopment/meteorclient/mixin/ItemGroupsMixin.java index daa0577e9a..0842200b8c 100644 --- a/src/main/java/meteordevelopment/meteorclient/mixin/ItemGroupsMixin.java +++ b/src/main/java/meteordevelopment/meteorclient/mixin/ItemGroupsMixin.java @@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.At; @Mixin(ItemGroups.class) -public class ItemGroupsMixin { +public abstract class ItemGroupsMixin { @ModifyReturnValue(method = "updateDisplayContext", at = @At("RETURN")) private static boolean modifyReturn(boolean original) { return original || Modules.get().get(BetterTooltips.class).updateTooltips(); diff --git a/src/main/java/meteordevelopment/meteorclient/mixin/UnbreakableComponentMixin.java b/src/main/java/meteordevelopment/meteorclient/mixin/UnbreakableComponentMixin.java index 307f2e6216..c3fc16109b 100644 --- a/src/main/java/meteordevelopment/meteorclient/mixin/UnbreakableComponentMixin.java +++ b/src/main/java/meteordevelopment/meteorclient/mixin/UnbreakableComponentMixin.java @@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.At; @Mixin(UnbreakableComponent.class) -public class UnbreakableComponentMixin { +public abstract class UnbreakableComponentMixin { @ModifyExpressionValue(method = "appendTooltip", at = @At(value = "FIELD", target = "Lnet/minecraft/component/type/UnbreakableComponent;showInTooltip:Z")) private boolean modifyShowInTooltip(boolean original) { BetterTooltips bt = Modules.get().get(BetterTooltips.class); diff --git a/src/main/java/meteordevelopment/meteorclient/mixin/lithium/LithiumEntityCollisionsMixin.java b/src/main/java/meteordevelopment/meteorclient/mixin/lithium/LithiumEntityCollisionsMixin.java index e04058c0ab..728efe6d94 100644 --- a/src/main/java/meteordevelopment/meteorclient/mixin/lithium/LithiumEntityCollisionsMixin.java +++ b/src/main/java/meteordevelopment/meteorclient/mixin/lithium/LithiumEntityCollisionsMixin.java @@ -16,7 +16,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(value = LithiumEntityCollisions.class) -public class LithiumEntityCollisionsMixin { +public abstract class LithiumEntityCollisionsMixin { @Inject(method = "isWithinWorldBorder", at = @At("HEAD"), cancellable = true) private static void onIsWithinWorldBorder(WorldBorder border, Box box, CallbackInfoReturnable cir) { if (Modules.get().get(Collisions.class).ignoreBorder()) { diff --git a/src/main/java/meteordevelopment/meteorclient/mixin/viafabricplus/GeneralSettingsMixin.java b/src/main/java/meteordevelopment/meteorclient/mixin/viafabricplus/GeneralSettingsMixin.java index b85ee55887..ef7c8a4ca0 100644 --- a/src/main/java/meteordevelopment/meteorclient/mixin/viafabricplus/GeneralSettingsMixin.java +++ b/src/main/java/meteordevelopment/meteorclient/mixin/viafabricplus/GeneralSettingsMixin.java @@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.At; @Mixin(GeneralSettings.class) -public class GeneralSettingsMixin { +public abstract class GeneralSettingsMixin { // specifies the '2' value on this line: // public final ModeSetting multiplayerScreenButtonOrientation = new ModeSetting(this, Text.translatable("general_settings.viafabricplus.multiplayer_screen_button_orientation"), 2, ORIENTATION_OPTIONS); @ModifyExpressionValue(method = "", at = @At(value = "CONSTANT", args = "intValue=2", ordinal = 1), remap = false)