refactor: switch to @WrapWithCondition v2

Fabricators-of-Create · Sep 29, 2024 · 42aaaa9 · 42aaaa9
1 parent 07c3111
commit 42aaaa9
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 15 deletions.
diff --git a/...rc/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/MinecraftMixin.java b/...rc/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/...main/java/io/github/fabricators_of_create/porting_lib/mixin/client/RenderTargetMixin.java b/...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/...in/java/io/github/fabricators_of_create/porting_lib/mixin/common/GrindstoneMenuMixin.java b/...in/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/...cators_of_create/porting_lib/entity/mixin/client/EffectRenderingInventoryScreenMixin.java b/...cators_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/...c/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/GuiMixin.java b/...c/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/...ain/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/EntityMixin.java b/...ain/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;