Anvilcraft/aether-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Extended reach fixes.

Browse source
This commit is contained in:
bconlon 2020-07-26 21:23:48 -07:00
parent a64b897cab
commit 198c5dc2fe
5 changed files with 121 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
src/main/java/com/legacy/aether/AetherEventHandler.java
View file

@ -5,6 +5,7 @@ import com.legacy.aether.api.player.IPlayerAether;
import com.legacy.aether.entities.passive.mountable.EntityAerbunny;
import com.legacy.aether.entities.projectile.darts.EntityDartBase;
import com.legacy.aether.network.AetherNetwork;
import com.legacy.aether.network.packets.PacketExtendedAttack;
import com.legacy.aether.network.packets.PacketSendEternalDay;
import com.legacy.aether.network.packets.PacketSendShouldCycle;
import com.legacy.aether.network.packets.PacketSendTime;
@ -13,6 +14,7 @@ import com.legacy.aether.world.AetherData;
import com.legacy.aether.world.AetherWorldProvider;
import com.legacy.aether.world.TeleporterAether;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.gameevent.InputEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import net.minecraft.client.Minecraft;
@ -32,9 +34,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.ChunkCoordinates;
import net.minecraft.util.EntityDamageSource;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.*;
import net.minecraft.util.MovingObjectPosition.MovingObjectType;
import net.minecraft.world.World;
import net.minecraft.world.WorldProvider;
@ -61,7 +61,9 @@ import cpw.mods.fml.common.eventhandler.Event;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent;
import net.minecraftforge.event.world.WorldEvent;
import org.lwjgl.input.Mouse;
import java.util.List;
import java.util.Random;
public class
@ -382,6 +384,70 @@ AetherEventHandler {
}
}
@SubscribeEvent
public void onLeftClick(InputEvent.MouseInputEvent event)
{
if (Mouse.getEventButton() == 0)
{
if (Mouse.getEventButtonState())
{
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
ItemStack stack = player.getHeldItem();
if (stack != null)
{
if (isValkyrieItem(stack.getItem()))
{
Vec3 playerVision = player.getLookVec();
AxisAlignedBB reachDistance = player.boundingBox.expand(10.0D, 10.0D, 10.0D);
List<Entity> locatedEntities = player.worldObj.getEntitiesWithinAABB(Entity.class, reachDistance);
Entity found = null;
double foundLen = 0.0D;
for (Object o : locatedEntities) {
if (o == player) {
continue;
}
Entity ent = (Entity) o;
if (!ent.canBeCollidedWith()) {
continue;
}
Vec3 vec = Vec3.createVectorHelper(ent.posX - player.posX, ent.boundingBox.minY + ent.height / 2f - player.posY - player.getEyeHeight(), ent.posZ - player.posZ);
double len = vec.lengthVector();
if (len > 8.0F) {
continue;
}
vec = vec.normalize();
double dot = playerVision.dotProduct(vec);
if (dot < 1.0 - 0.125 / len || !player.canEntityBeSeen(ent)) {
continue;
}
if (foundLen == 0.0 || len < foundLen) {
found = ent;
foundLen = len;
}
}
if (found != null && player.ridingEntity != found) {
stack.damageItem(1, player);
AetherNetwork.sendToServer(new PacketExtendedAttack(found.getEntityId()));
}
}
}
}
}
}
private void performTimeSet(PlayerWakeUpEvent event, World world, WorldServer worldServer)
{
if (world.getGameRules().getGameRuleBooleanValue("doDaylightCycle") && event.entityPlayer.isPlayerFullyAsleep())
@ -393,4 +459,9 @@ AetherEventHandler {
PlayerAether.get(event.entityPlayer).setBedLocation(event.entityPlayer.getBedLocation(AetherConfig.getAetherDimensionID()));
}
}
public boolean isValkyrieItem(Item stackID)
{
return stackID == ItemsAether.valkyrie_shovel || stackID == ItemsAether.valkyrie_axe || stackID == ItemsAether.valkyrie_pickaxe || stackID == ItemsAether.valkyrie_lance;
}
}

57
src/main/java/com/legacy/aether/items/tools/ItemValkyrieTool.java
View file

@ -29,61 +29,4 @@ public class ItemValkyrieTool extends ItemAetherTool {
return ItemsAether.aether_loot;
}
@Override
@SuppressWarnings("unchecked")
public boolean onEntitySwing(EntityLivingBase entityLiving, ItemStack stack) {
if (!(entityLiving instanceof EntityPlayer)) {
return false;
}
EntityPlayer player = (EntityPlayer) entityLiving;
Vec3 playerVision = player.getLookVec();
AxisAlignedBB reachDistance = player.boundingBox.expand(10.0D, 10.0D, 10.0D);
List<Entity> locatedEntities = player.worldObj.getEntitiesWithinAABB(Entity.class, reachDistance);
Entity found = null;
double foundLen = 0.0D;
for (Object o : locatedEntities) {
if (o == player) {
continue;
}
Entity ent = (Entity) o;
if (!ent.canBeCollidedWith()) {
continue;
}
Vec3 vec = Vec3.createVectorHelper(ent.posX - player.posX, ent.boundingBox.minY + ent.height / 2f - player.posY - player.getEyeHeight(), ent.posZ - player.posZ);
double len = vec.lengthVector();
if (len > 10.0F) {
continue;
}
vec = vec.normalize();
double dot = playerVision.dotProduct(vec);
if (dot < 1.0 - 0.125 / len || !player.canEntityBeSeen(ent)) {
continue;
}
if (foundLen == 0.0 || len < foundLen) {
found = ent;
foundLen = len;
}
}
if (found != null && player.ridingEntity != found) {
stack.damageItem(1, player);
player.attackTargetEntityWithCurrentItem(found);
}
return false;
}
}

57
src/main/java/com/legacy/aether/items/weapons/ItemValkyrieLance.java
View file

@ -33,63 +33,6 @@ public class ItemValkyrieLance extends ItemSword {
return ItemsAether.aether_loot;
}
@Override
@SuppressWarnings("unchecked")
public boolean onEntitySwing(EntityLivingBase entityLiving, ItemStack stack) {
if (!(entityLiving instanceof EntityPlayer)) {
return false;
}
EntityPlayer player = (EntityPlayer) entityLiving;
Vec3 playerVision = player.getLookVec();
AxisAlignedBB reachDistance = player.boundingBox.expand(10.0D, 10.0D, 10.0D);
List<Entity> locatedEntities = player.worldObj.getEntitiesWithinAABB(Entity.class, reachDistance);
Entity found = null;
double foundLen = 0.0D;
for (Object o : locatedEntities) {
if (o == player) {
continue;
}
Entity ent = (Entity) o;
if (!ent.canBeCollidedWith()) {
continue;
}
Vec3 vec = Vec3.createVectorHelper(ent.posX - player.posX, ent.boundingBox.minY + ent.height / 2f - player.posY - player.getEyeHeight(), ent.posZ - player.posZ);
double len = vec.lengthVector();
if (len > 8.0F) {
continue;
}
vec = vec.normalize();
double dot = playerVision.dotProduct(vec);
if (dot < 1.0 - 0.125 / len || !player.canEntityBeSeen(ent)) {
continue;
}
if (foundLen == 0.0 || len < foundLen) {
found = ent;
foundLen = len;
}
}
if (found != null && player.ridingEntity != found) {
stack.damageItem(1, player);
player.attackTargetEntityWithCurrentItem(found);
}
return false;
}
@Override
public boolean getIsRepairable(ItemStack repairingItem, ItemStack material) {
return false;

2
src/main/java/com/legacy/aether/network/AetherNetwork.java
View file

@ -47,6 +47,8 @@ public class AetherNetwork {
INSTANCE.registerMessage(PacketCapeChanged.class, PacketCapeChanged.class, discriminant++, Side.SERVER);
INSTANCE.registerMessage(PacketCapeChanged.class, PacketCapeChanged.class, discriminant++, Side.CLIENT);
INSTANCE.registerMessage(PacketExtendedAttack.class, PacketExtendedAttack.class, discriminant++, Side.SERVER);
}
public static void sendToAll(IMessage message) {

45
src/main/java/com/legacy/aether/network/packets/PacketExtendedAttack.java Normal file
View file

@ -0,0 +1,45 @@
package com.legacy.aether.network.packets;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayer;
import java.util.Objects;
public class PacketExtendedAttack extends AetherPacket<PacketExtendedAttack>
{
int entityID;
public PacketExtendedAttack()
{
}
public PacketExtendedAttack(int entityID)
{
this.entityID = entityID;
}
@Override
public void fromBytes(ByteBuf buf)
{
this.entityID = buf.readInt();
}
@Override
public void toBytes(ByteBuf buf)
{
buf.writeInt(this.entityID);
}
@Override
public void handleClient(PacketExtendedAttack message, EntityPlayer player)
{
}
@Override
public void handleServer(PacketExtendedAttack message, EntityPlayer player)
{
player.attackTargetEntityWithCurrentItem(Objects.requireNonNull(player.worldObj.getEntityByID(message.entityID)));
}
}