PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-21 12:24:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed skeletons voiding picked up stacks

Browse source
This commit is contained in:
Sollace 2023-05-05 21:13:03 +01:00
parent 62c11ec66b
commit 318ef70228
3 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/com/minelittlepony/unicopia/entity/ai/WantItTakeItGoal.java
View file

@ -8,7 +8,6 @@ import com.minelittlepony.unicopia.particle.ParticleUtils;
import com.minelittlepony.unicopia.particle.UParticles; import com.minelittlepony.unicopia.particle.UParticles;
import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.Entity.RemovalReason;
import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.EquipmentSlot;
import net.minecraft.entity.ItemEntity; import net.minecraft.entity.ItemEntity;
import net.minecraft.entity.LivingEntity; import net.minecraft.entity.LivingEntity;
@ -50,6 +49,8 @@ public class WantItTakeItGoal extends BreakHeartGoal {
speed *= 2; speed *= 2;
} }
reach = Math.max(1.5, reach);
mob.getNavigation().startMovingTo(target, speed); mob.getNavigation().startMovingTo(target, speed);
cooldown = Math.max(cooldown - 1, 0); cooldown = Math.max(cooldown - 1, 0);
@ -80,10 +81,15 @@ public class WantItTakeItGoal extends BreakHeartGoal {
ItemStack stack = item.getStack(); ItemStack stack = item.getStack();
if (!item.isRemoved()) { if (!item.isRemoved()) {
mob.tryEquip(stack); ItemStack collected = mob.tryEquip(stack.copy());
if (!collected.isEmpty()) {
mob.triggerItemPickedUpByEntityCriteria(item); mob.triggerItemPickedUpByEntityCriteria(item);
mob.sendPickup(item, stack.getCount()); mob.sendPickup(item, stack.getCount());
item.remove(RemovalReason.DISCARDED); stack.decrement(collected.getCount());
if (stack.isEmpty()) {
item.discard();
}
}
} }
}); });
} }

8
src/main/java/com/minelittlepony/unicopia/item/enchantment/WantItNeedItEnchantment.java
View file

@ -6,7 +6,9 @@ import com.minelittlepony.unicopia.particle.FollowingParticleEffect;
import com.minelittlepony.unicopia.particle.ParticleUtils; import com.minelittlepony.unicopia.particle.ParticleUtils;
import com.minelittlepony.unicopia.particle.UParticles; import com.minelittlepony.unicopia.particle.UParticles;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.EquipmentSlot;
import net.minecraft.item.ItemStack;
public class WantItNeedItEnchantment extends SimpleEnchantment { public class WantItNeedItEnchantment extends SimpleEnchantment {
@ -20,4 +22,10 @@ public class WantItNeedItEnchantment extends SimpleEnchantment {
ParticleUtils.spawnParticles(new FollowingParticleEffect(UParticles.HEALTH_DRAIN, user.asEntity(), 0.2F), user.asEntity(), 1); ParticleUtils.spawnParticles(new FollowingParticleEffect(UParticles.HEALTH_DRAIN, user.asEntity(), 0.2F), user.asEntity(), 1);
} }
} }
public static boolean prefersEquipment(ItemStack newStack, ItemStack oldStack) {
int newLevel = EnchantmentHelper.getLevel(UEnchantments.WANT_IT_NEED_IT, newStack);
int oldLevel = EnchantmentHelper.getLevel(UEnchantments.WANT_IT_NEED_IT, oldStack);
return newLevel > oldLevel;
}
} }

11
src/main/java/com/minelittlepony/unicopia/mixin/MixinMobEntity.java
View file

@ -6,14 +6,17 @@ import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import com.minelittlepony.unicopia.entity.*; import com.minelittlepony.unicopia.entity.*;
import com.minelittlepony.unicopia.entity.duck.RotatedView; import com.minelittlepony.unicopia.entity.duck.RotatedView;
import com.minelittlepony.unicopia.item.enchantment.WantItNeedItEnchantment;
import net.minecraft.entity.EntityType; import net.minecraft.entity.EntityType;
import net.minecraft.entity.LivingEntity; import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.ai.goal.GoalSelector; import net.minecraft.entity.ai.goal.GoalSelector;
import net.minecraft.entity.mob.MobEntity; import net.minecraft.entity.mob.MobEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World; import net.minecraft.world.World;
@Mixin(MobEntity.class) @Mixin(MobEntity.class)
@ -41,4 +44,12 @@ abstract class MixinMobEntity extends LivingEntity implements Equine.Container<C
public void afterTickAi(CallbackInfo into) { public void afterTickAi(CallbackInfo into) {
((RotatedView)world).popRotation(); ((RotatedView)world).popRotation();
} }
@Inject(method = "prefersNewEquipment(Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ItemStack;)Z",
at = @At("HEAD"), cancellable = true)
private void onPrefersNewEquipment(ItemStack newStack, ItemStack oldStack, CallbackInfoReturnable<Boolean> info) {
if (WantItNeedItEnchantment.prefersEquipment(newStack, oldStack)) {
info.setReturnValue(true);
}
}
} }