refactor(next): mixin

auioc · Sep 27, 2022 · d6d2c45 · d6d2c45
1 parent 7700987
commit d6d2c45
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 17 deletions.
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/common/command/argument/CreativeModeTabArgument.java b/src/main/java/org/auioc/mcmod/arnicalib/common/command/argument/CreativeModeTabArgument.java
@@ -4,7 +4,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
 import org.auioc.mcmod.arnicalib.ArnicaLib;
-import org.auioc.mcmod.arnicalib.api.mixin.common.IMixinCreativeModeTab;
+import org.auioc.mcmod.arnicalib.mixin.common.api.IMixinCreativeModeTab;
 import org.auioc.mcmod.arnicalib.utils.game.TextUtils;
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.arguments.ArgumentType;

diff --git a/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinArrow.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinArrow.java
@@ -1,7 +1,7 @@
 package org.auioc.mcmod.arnicalib.mixin.common;
 
 import java.util.Set;
-import org.auioc.mcmod.arnicalib.api.mixin.common.IMixinArrow;
+import org.auioc.mcmod.arnicalib.mixin.common.api.IMixinArrow;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

diff --git a/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinCommandSourceStack.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinCommandSourceStack.java
@@ -1,6 +1,6 @@
 package org.auioc.mcmod.arnicalib.mixin.common;
 
-import org.auioc.mcmod.arnicalib.api.mixin.common.IMixinCommandSourceStack;
+import org.auioc.mcmod.arnicalib.mixin.common.api.IMixinCommandSourceStack;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

diff --git a/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinCreativeModeTab.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinCreativeModeTab.java
@@ -1,6 +1,6 @@
 package org.auioc.mcmod.arnicalib.mixin.common;
 
-import org.auioc.mcmod.arnicalib.api.mixin.common.IMixinCreativeModeTab;
+import org.auioc.mcmod.arnicalib.mixin.common.api.IMixinCreativeModeTab;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

diff --git a/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinEnchantment.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinEnchantment.java
@@ -1,6 +1,6 @@
 package org.auioc.mcmod.arnicalib.mixin.common;
 
-import org.auioc.mcmod.arnicalib.api.mixin.common.IMixinEnchantment;
+import org.auioc.mcmod.arnicalib.mixin.common.api.IMixinEnchantment;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

diff --git a/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinMobEffectInstance.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinMobEffectInstance.java
@@ -1,7 +1,7 @@
 package org.auioc.mcmod.arnicalib.mixin.common;
 
 import javax.annotation.Nullable;
-import org.auioc.mcmod.arnicalib.api.mixin.common.IMixinMobEffectInstance;
+import org.auioc.mcmod.arnicalib.mixin.common.api.IMixinMobEffectInstance;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import net.minecraft.world.effect.MobEffectInstance;

diff --git a/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinProjectile.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinProjectile.java
@@ -1,7 +1,7 @@
 package org.auioc.mcmod.arnicalib.mixin.common;
 
 import javax.annotation.Nullable;
-import org.auioc.mcmod.arnicalib.api.mixin.common.IMixinProjectile;
+import org.auioc.mcmod.arnicalib.mixin.common.api.IMixinProjectile;
 import org.auioc.mcmod.arnicalib.utils.game.NbtUtils;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

diff --git a/...nicalib/api/mixin/common/IMixinArrow.java → ...nicalib/mixin/common/api/IMixinArrow.java b/...nicalib/api/mixin/common/IMixinArrow.java → ...nicalib/mixin/common/api/IMixinArrow.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.mixin.common;
+package org.auioc.mcmod.arnicalib.mixin.common.api;
 
 import org.auioc.mcmod.arnicalib.api.game.entity.ITippedArrow;
 

diff --git a/...ixin/common/IMixinCommandSourceStack.java → .../common/api/IMixinCommandSourceStack.java b/...ixin/common/IMixinCommandSourceStack.java → .../common/api/IMixinCommandSourceStack.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.mixin.common;
+package org.auioc.mcmod.arnicalib.mixin.common.api;
 
 import net.minecraft.commands.CommandSource;
 

diff --git a/...i/mixin/common/IMixinCreativeModeTab.java → ...xin/common/api/IMixinCreativeModeTab.java b/...i/mixin/common/IMixinCreativeModeTab.java → ...xin/common/api/IMixinCreativeModeTab.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.mixin.common;
+package org.auioc.mcmod.arnicalib.mixin.common.api;
 
 public interface IMixinCreativeModeTab {
 

diff --git a/...b/api/mixin/common/IMixinEnchantment.java → ...b/mixin/common/api/IMixinEnchantment.java b/...b/api/mixin/common/IMixinEnchantment.java → ...b/mixin/common/api/IMixinEnchantment.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.mixin.common;
+package org.auioc.mcmod.arnicalib.mixin.common.api;
 
 import org.auioc.mcmod.arnicalib.api.game.enchantment.IValidSlotsVisibleEnchantment;
 

diff --git a/...mixin/common/IMixinMobEffectInstance.java → ...n/common/api/IMixinMobEffectInstance.java b/...mixin/common/IMixinMobEffectInstance.java → ...n/common/api/IMixinMobEffectInstance.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.mixin.common;
+package org.auioc.mcmod.arnicalib.mixin.common.api;
 
 import org.auioc.mcmod.arnicalib.api.game.effect.IHMobEffectInstance;
 

diff --git a/...ib/api/mixin/common/IMixinProjectile.java → ...ib/mixin/common/api/IMixinProjectile.java b/...ib/api/mixin/common/IMixinProjectile.java → ...ib/mixin/common/api/IMixinProjectile.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.mixin.common;
+package org.auioc.mcmod.arnicalib.mixin.common.api;
 
 import org.auioc.mcmod.arnicalib.api.game.entity.IHProjectile;
 

diff --git a/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinEnderEyeItem.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinEnderEyeItem.java
@@ -1,6 +1,6 @@
 package org.auioc.mcmod.arnicalib.mixin.server;
 
-import org.auioc.mcmod.arnicalib.api.mixin.server.IMixinEyeOfEnder;
+import org.auioc.mcmod.arnicalib.mixin.server.api.IMixinEyeOfEnder;
 import org.auioc.mcmod.arnicalib.server.event.AHServerEventFactory;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

diff --git a/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinEyeOfEnder.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinEyeOfEnder.java
@@ -2,7 +2,7 @@
 
 import java.util.Random;
 import java.util.function.Function;
-import org.auioc.mcmod.arnicalib.api.mixin.server.IMixinEyeOfEnder;
+import org.auioc.mcmod.arnicalib.mixin.server.api.IMixinEyeOfEnder;
 import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

diff --git a/...ib/api/mixin/server/IMixinEyeOfEnder.java → ...ib/mixin/server/api/IMixinEyeOfEnder.java b/...ib/api/mixin/server/IMixinEyeOfEnder.java → ...ib/mixin/server/api/IMixinEyeOfEnder.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.mixin.server;
+package org.auioc.mcmod.arnicalib.mixin.server.api;
 
 import java.util.Random;
 import java.util.function.Function;

diff --git a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/command/CommandSourceUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/command/CommandSourceUtils.java
@@ -1,7 +1,7 @@
 package org.auioc.mcmod.arnicalib.utils.game.command;
 
 import java.util.function.Predicate;
-import org.auioc.mcmod.arnicalib.api.mixin.common.IMixinCommandSourceStack;
+import org.auioc.mcmod.arnicalib.mixin.common.api.IMixinCommandSourceStack;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.commands.CommandSource;