moved a bunch of stuff

src/main/java/carpet/mixins/CommandManagerMixin.java

@@ -1,4 +1,4 @@
-package carpet.mixins.carpetServer;
+package carpet.mixins;
 
 import carpet.CarpetServer;
 import com.mojang.brigadier.CommandDispatcher;

src/main/java/carpet/mixins/ExperienceOrbEntityMixin.java

@@ -0,0 +1,47 @@
+package carpet.mixins;
+
+import carpet.CarpetSettings;
+import carpet.fakes.ExperienceOrbInterface;
+import carpet.helpers.XPcombine;
+import net.minecraft.entity.ExperienceOrbEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(ExperienceOrbEntity.class)
+public abstract class ExperienceOrbEntityMixin implements ExperienceOrbInterface
+{
+    @Shadow private int amount;
+
+    public void setAmount(int amount) { this.amount = amount; }
+
+    public int combineDelay = 50;
+
+    public int getCombineDelay() { return combineDelay; }
+    public void setCombineDelay(int what) { combineDelay = what; }
+
+    @Inject(method = "tick",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/entity/ExperienceOrbEntity;move(Lnet/minecraft/entity/MovementType;Lnet/minecraft/util/math/Vec3d;)V",
+                    shift = At.Shift.AFTER
+            ))
+    void checkCombineAtTick(CallbackInfo ci)
+    {
+        if (CarpetSettings.getBool("combineXPOrbs"))
+        {
+            if (getCombineDelay() > 0)
+            {
+                setCombineDelay(getCombineDelay()-1);
+            }
+
+            if (getCombineDelay() == 0)
+            {
+                XPcombine.searchForOtherXPNearbyCarpet((ExperienceOrbEntity) (Object) this);
+            }
+        }
+    }
+
+}

src/main/java/carpet/mixins/IntegratedServerMixin.java

@@ -1,4 +1,4 @@
-package carpet.mixins.carpetServer;
+package carpet.mixins;
 
 import carpet.CarpetServer;
 import net.minecraft.server.integrated.IntegratedServer;

src/main/java/carpet/mixins/MinecraftClientMixin.java

@@ -1,4 +1,4 @@
-package carpet.mixins.carpetServer;
+package carpet.mixins;
 
 import carpet.CarpetServer;
 import net.minecraft.client.MinecraftClient;

src/main/java/carpet/mixins/MinecraftDedicatedServerMixin.java

@@ -1,4 +1,4 @@
-package carpet.mixins.carpetServer;
+package carpet.mixins;
 
 import carpet.CarpetServer;
 import net.minecraft.server.dedicated.MinecraftDedicatedServer;

src/main/java/carpet/mixins/MinecraftServerMixin.java

@@ -1,4 +1,4 @@
-package carpet.mixins.carpetServer;
+package carpet.mixins;
 
 import carpet.CarpetServer;
 import com.mojang.authlib.GameProfileRepository;

src/main/java/carpet/mixins/PlayerListHeaderS2CPacketMixin.java

@@ -1,4 +1,4 @@
-package carpet.mixins.logging;
+package carpet.mixins;
 
 import net.minecraft.client.network.packet.PlayerListHeaderS2CPacket;
 import net.minecraft.network.chat.Component;