From 42aaaa96a5d2d3f33afd13e51b41cc8117b1e7ec Mon Sep 17 00:00:00 2001 From: IThundxr Date: Sat, 28 Sep 2024 21:42:24 -0400 Subject: [PATCH] refactor: switch to @WrapWithCondition v2 --- .../porting_lib/mixin/client/MinecraftMixin.java | 3 +-- .../porting_lib/mixin/client/RenderTargetMixin.java | 2 +- .../porting_lib/mixin/common/GrindstoneMenuMixin.java | 3 +-- .../mixin/client/EffectRenderingInventoryScreenMixin.java | 4 +--- .../porting_lib/entity/mixin/client/GuiMixin.java | 6 ------ .../porting_lib/entity/mixin/common/EntityMixin.java | 3 ++- 6 files changed, 6 insertions(+), 15 deletions(-) diff --git a/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/MinecraftMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/MinecraftMixin.java index 9b441c7a0..287e9c042 100644 --- a/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/MinecraftMixin.java +++ b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/MinecraftMixin.java @@ -1,7 +1,6 @@ package io.github.fabricators_of_create.porting_lib.mixin.client; -import com.llamalad7.mixinextras.injector.WrapWithCondition; - +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import com.llamalad7.mixinextras.sugar.Local; import io.github.fabricators_of_create.porting_lib.block.CustomHitEffectsBlock; diff --git a/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/RenderTargetMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/RenderTargetMixin.java index 1daee4b81..c1088d7d9 100644 --- a/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/RenderTargetMixin.java +++ b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/RenderTargetMixin.java @@ -1,6 +1,6 @@ package io.github.fabricators_of_create.porting_lib.mixin.client; -import com.llamalad7.mixinextras.injector.WrapWithCondition; +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import org.lwjgl.opengl.GL30; import org.spongepowered.asm.mixin.Mixin; diff --git a/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/GrindstoneMenuMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/GrindstoneMenuMixin.java index b78756df1..0ed0957fc 100644 --- a/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/GrindstoneMenuMixin.java +++ b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/GrindstoneMenuMixin.java @@ -1,7 +1,6 @@ package io.github.fabricators_of_create.porting_lib.mixin.common; -import com.llamalad7.mixinextras.injector.WrapWithCondition; - +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; diff --git a/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/EffectRenderingInventoryScreenMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/EffectRenderingInventoryScreenMixin.java index c75831d08..8d79ca43f 100644 --- a/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/EffectRenderingInventoryScreenMixin.java +++ b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/EffectRenderingInventoryScreenMixin.java @@ -3,8 +3,7 @@ import java.util.Collection; import java.util.stream.Collectors; -import com.llamalad7.mixinextras.injector.WrapWithCondition; - +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import com.llamalad7.mixinextras.sugar.Local; @@ -24,7 +23,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.ModifyArg; -import io.github.fabricators_of_create.porting_lib.entity.client.MobEffectRenderer; import net.minecraft.client.gui.screens.inventory.EffectRenderingInventoryScreen; import net.minecraft.world.effect.MobEffectInstance; diff --git a/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/GuiMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/GuiMixin.java index be43f092e..eaecc2fde 100644 --- a/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/GuiMixin.java +++ b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/GuiMixin.java @@ -1,19 +1,13 @@ package io.github.fabricators_of_create.porting_lib.entity.mixin.client; import java.util.Collection; -import java.util.List; import java.util.stream.Collectors; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.ModifyArg; -import com.llamalad7.mixinextras.injector.WrapWithCondition; -import com.llamalad7.mixinextras.sugar.Local; - -import io.github.fabricators_of_create.porting_lib.entity.client.MobEffectRenderer; import net.minecraft.client.gui.Gui; -import net.minecraft.client.gui.GuiGraphics; import net.minecraft.world.effect.MobEffectInstance; @Mixin(Gui.class) diff --git a/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/EntityMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/EntityMixin.java index a02195abc..a6291c9ce 100644 --- a/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/EntityMixin.java +++ b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/EntityMixin.java @@ -2,6 +2,8 @@ import java.util.Collection; +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; + import io.github.fabricators_of_create.porting_lib.entity.EntityHooks; import org.jetbrains.annotations.Nullable; @@ -13,7 +15,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.llamalad7.mixinextras.injector.WrapWithCondition; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import com.llamalad7.mixinextras.sugar.Local;