PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-24 05:47:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed the alicorn amulet

Browse source
This commit is contained in:
Sollace 2020-05-04 00:41:36 +02:00
parent 296d6dc255
commit 4e3db62e78
2 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/com/minelittlepony/unicopia/entity/player/PlayerInventory.java
View file

@ -5,6 +5,7 @@ import java.util.Map;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.minelittlepony.unicopia.entity.Updatable; import com.minelittlepony.unicopia.entity.Updatable;
import com.minelittlepony.unicopia.item.MagicGemItem;
import com.minelittlepony.unicopia.magic.AddictiveMagicalItem; import com.minelittlepony.unicopia.magic.AddictiveMagicalItem;
import com.minelittlepony.unicopia.magic.MagicalItem; import com.minelittlepony.unicopia.magic.MagicalItem;
import com.minelittlepony.unicopia.util.NbtSerialisable; import com.minelittlepony.unicopia.util.NbtSerialisable;
@ -92,7 +93,7 @@ public class PlayerInventory implements Updatable, NbtSerialisable {
} }
} }
return item instanceof Item; return item instanceof MagicGemItem;
} }
public boolean matches(Tag<Item> tag) { public boolean matches(Tag<Item> tag) {
@ -155,7 +156,7 @@ public class PlayerInventory implements Updatable, NbtSerialisable {
if (isWearing(item)) { if (isWearing(item)) {
ticksAttached ++; ticksAttached ++;
needfulness *= 0.9F; needfulness *= 0.9F;
} else { } else if (ticksAttached > 0) {
item.onRemoved(player, needfulness); item.onRemoved(player, needfulness);
needfulness = 0; needfulness = 0;
} }

32
src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java
View file

@ -17,6 +17,8 @@ import com.minelittlepony.unicopia.util.MagicalDamageSource;
import com.minelittlepony.unicopia.util.VecHelper; import com.minelittlepony.unicopia.util.VecHelper;
import net.minecraft.util.ChatUtil; import net.minecraft.util.ChatUtil;
import net.minecraft.util.Hand;
import net.minecraft.util.TypedActionResult;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
@ -41,8 +43,6 @@ import net.minecraft.sound.SoundEvents;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import net.minecraft.text.TranslatableText; import net.minecraft.text.TranslatableText;
import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResult;
import net.minecraft.util.Hand;
import net.minecraft.util.TypedActionResult;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import net.minecraft.world.LocalDifficulty; import net.minecraft.world.LocalDifficulty;
import net.minecraft.world.World; import net.minecraft.world.World;
@ -75,8 +75,8 @@ public class AlicornAmuletItem extends ArmorItem implements AddictiveMagicalItem
World world = entity.world; World world = entity.world;
double x = entity.getX() + world.random.nextFloat() - 0.5; double x = entity.getX() + world.random.nextFloat() - 0.5;
double z = entity.getY() + world.random.nextFloat() - 0.5; double y = entity.getY() + world.random.nextFloat() - 0.5;
double y = entity.getZ() + world.random.nextFloat(); double z = entity.getZ() + world.random.nextFloat() - 0.5;
ParticleEffect particle = world.random.nextBoolean() ? ParticleTypes.LARGE_SMOKE : ParticleTypes.FLAME; ParticleEffect particle = world.random.nextBoolean() ? ParticleTypes.LARGE_SMOKE : ParticleTypes.FLAME;
@ -87,7 +87,7 @@ public class AlicornAmuletItem extends ArmorItem implements AddictiveMagicalItem
} }
Vec3d position = entity.getPos(); Vec3d position = entity.getPos();
VecHelper.findAllEntitiesInRange(entity, world, entity.getBlockPos(), 10) VecHelper.findAllEntitiesInRange(entity, world, entity.getBlockPos(), 20)
.filter(e -> e instanceof PlayerEntity) .filter(e -> e instanceof PlayerEntity)
.sorted((a, b) -> (int)(a.getPos().distanceTo(position) - b.getPos().distanceTo(position))) .sorted((a, b) -> (int)(a.getPos().distanceTo(position) - b.getPos().distanceTo(position)))
.findFirst() .findFirst()
@ -103,12 +103,16 @@ public class AlicornAmuletItem extends ArmorItem implements AddictiveMagicalItem
if (!player.world.isClient && !entity.removed) { if (!player.world.isClient && !entity.removed) {
if (player.getPos().distanceTo(entity.getPos()) < 3) { if (player.getPos().distanceTo(entity.getPos()) < 3) {
if (entity.world.random.nextInt(150) == 0) { if (entity.world.random.nextInt(150) == 0) {
entity.setPickupDelay(0);
entity.onPlayerCollision(player);
TypedActionResult<ItemStack> result = use(player.world, player, Hand.MAIN_HAND); if (player.getMainHandStack().getItem() == this) {
TypedActionResult<ItemStack> result = use(player.world, player, Hand.MAIN_HAND);
if (result.getResult() == ActionResult.SUCCESS) { if (result.getResult() == ActionResult.SUCCESS) {
entity.setPickupDelay(1000); entity.setPickupDelay(1000);
entity.remove(); entity.remove();
}
} }
} }
} }
@ -148,6 +152,7 @@ public class AlicornAmuletItem extends ArmorItem implements AddictiveMagicalItem
@Override @Override
public void inventoryTick(ItemStack stack, World world, Entity entity, int slot, boolean selected) { public void inventoryTick(ItemStack stack, World world, Entity entity, int slot, boolean selected) {
if (!(entity instanceof PlayerEntity)) { if (!(entity instanceof PlayerEntity)) {
return; return;
} }
@ -162,6 +167,15 @@ public class AlicornAmuletItem extends ArmorItem implements AddictiveMagicalItem
Pony iplayer = Pony.of(player); Pony iplayer = Pony.of(player);
if (!iplayer.getInventory().isWearing(this)) {
if (world.random.nextInt(12200) == 0 && player.getMainHandStack().getItem() == this) {
use(world, player, Hand.MAIN_HAND);
}
return;
}
float attachedTime = iplayer.getInventory().getTicksAttached(this); float attachedTime = iplayer.getInventory().getTicksAttached(this);
MagicReserves reserves = iplayer.getMagicalReserves(); MagicReserves reserves = iplayer.getMagicalReserves();