Merge branch 'master' into future

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

@@ -1,87 +1,46 @@
 package carpet.mixins;
 
 import carpet.CarpetSettings;
-import carpet.fakes.ExperienceOrbInterface;
-import carpet.helpers.XPcombine;
-import net.minecraft.entity.EquipmentSlot;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityType;
 import net.minecraft.entity.ExperienceOrbEntity;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
 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.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
-
-import java.util.Map;
 
 @Mixin(ExperienceOrbEntity.class)
-public abstract class ExperienceOrbEntityMixin implements ExperienceOrbInterface
+public abstract class ExperienceOrbEntityMixin extends Entity
 {
-    @Shadow private int amount;
+    @Shadow
+    private int pickingCount;
 
-    @Shadow private int pickingCount;
+    @Shadow
+    private int amount;
 
-    @Shadow protected abstract int getMendingRepairCost(int repairAmount);
-
-    @Shadow protected abstract int getMendingRepairAmount(int experienceAmount);
-
-    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)
+    public ExperienceOrbEntityMixin(EntityType<?> type, World world)
     {
-        if (CarpetSettings.combineXPOrbs)
-        {
-            if (getCombineDelay() > 0)
-            {
-                setCombineDelay(getCombineDelay()-1);
-            }
-
-            if (getCombineDelay() == 0)
-            {
-                XPcombine.searchForOtherXPNearby((ExperienceOrbEntity) (Object) this);
-            }
-        }
+        super(type, world);
     }
 
-    @Override
-    public int getCount() {
-        return pickingCount;
-    }
-
-    @Override
-    public void setCount(int i) {
-        pickingCount = i;
-    }
+    @Shadow
+    protected abstract int repairPlayerGears(PlayerEntity player, int amount);
 
     @Inject(method = "onPlayerCollision", at = @At("HEAD"))
-    void removeDelay(PlayerEntity playerEntity_1, CallbackInfo ci)
-    {
-        if (CarpetSettings.xpNoCooldown)
-            playerEntity_1.experiencePickUpDelay = 0;
-    }
-
-    @Redirect(method = "onPlayerCollision", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;addExperience(I)V"))
-    void addXP(PlayerEntity playerEntity, int experience)
-    {
-        playerEntity.addExperience(experience);
-        if (CarpetSettings.xpNoCooldown) while(pickingCount > 1)
-        {
-            pickingCount --;
-            playerEntity.addExperience(experience);
+    private void addXP(PlayerEntity player, CallbackInfo ci) {
+        if (CarpetSettings.xpNoCooldown && !world.isClient) {
+            player.experiencePickUpDelay = 0;
+            // reducing the count to 1 and leaving vanilla to deal with it
+            while (this.pickingCount > 1) {
+                int remainder = this.repairPlayerGears(player, this.amount);
+                if (remainder > 0) {
+                    player.addExperience(remainder);
+                }
+                this.pickingCount--;
+            }
         }
     }
 }

src/main/java/carpet/mixins/PlayerEntity_xpNoCooldownMixin.java

@@ -0,0 +1,28 @@
+package carpet.mixins;
+
+import carpet.CarpetSettings;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.PlayerEntity;
+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.Redirect;
+
+import java.util.List;
+
+@Mixin(PlayerEntity.class)
+public abstract class PlayerEntity_xpNoCooldownMixin {
+
+    @Shadow
+    protected abstract void collideWithEntity(Entity entity);
+
+    @Redirect(method = "tickMovement",at = @At(value = "INVOKE", target = "java/util/List.add(Ljava/lang/Object;)Z"))
+    public boolean processXpOrbCollisions(List<Entity> instance, Object e) {
+        Entity entity = (Entity) e;
+        if (CarpetSettings.xpNoCooldown) {
+            this.collideWithEntity(entity);
+            return true;
+        }
+        return instance.add(entity);
+    }
+}