xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

arty actually using the proper ammo types

Browse Source
This commit is contained in:
Bob 2022-06-22 23:24:55 +02:00
parent aebcf90026
commit 90de2eabdc
3 changed files with 92 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/hbm/entity/projectile/EntityArtilleryShell.java
View File

@ -9,7 +9,6 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.ChunkCoordIntPair;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeChunkManager;
@ -135,9 +134,11 @@ public class EntityArtilleryShell extends EntityThrowableNT implements IChunkLoa
protected void onImpact(MovingObjectPosition mop) {
if(!worldObj.isRemote) {
Vec3 vec = Vec3.createVectorHelper(motionX, motionY, motionZ).normalize();
/*Vec3 vec = Vec3.createVectorHelper(motionX, motionY, motionZ).normalize();
this.worldObj.newExplosion(this, mop.hitVec.xCoord - vec.xCoord, mop.hitVec.yCoord - vec.yCoord, mop.hitVec.zCoord - vec.zCoord, 15F, false, false);
this.setDead();
this.setDead();*/
this.getType().onImpact(this, mop);
}
}

18
src/main/java/com/hbm/items/weapon/ItemAmmoArty.java
View File

@ -3,6 +3,7 @@ package com.hbm.items.weapon;
import java.util.List;
import com.hbm.entity.projectile.EntityArtilleryShell;
import com.hbm.explosion.ExplosionNukeSmall;
import com.hbm.lib.RefStrings;
import com.hbm.main.MainRegistry;
@ -14,6 +15,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
public class ItemAmmoArty extends Item {
@ -75,25 +77,33 @@ public class ItemAmmoArty extends Item {
private void init() {
this.types[NORMAL] = new ArtilleryShell("ammo_arty") {
@Override public void onImpact(EntityArtilleryShell shell, MovingObjectPosition mop) {
Vec3 vec = Vec3.createVectorHelper(shell.motionX, shell.motionY, shell.motionZ).normalize();
shell.worldObj.newExplosion(shell, mop.hitVec.xCoord - vec.xCoord, mop.hitVec.yCoord - vec.yCoord, mop.hitVec.zCoord - vec.zCoord, 15F, false, false);
shell.setDead();
}
};
this.types[CLASSIC] = new ArtilleryShell("ammo_arty") {
this.types[CLASSIC] = new ArtilleryShell("ammo_arty_classic") {
@Override public void onImpact(EntityArtilleryShell shell, MovingObjectPosition mop) {
Vec3 vec = Vec3.createVectorHelper(shell.motionX, shell.motionY, shell.motionZ).normalize();
shell.worldObj.newExplosion(shell, mop.hitVec.xCoord - vec.xCoord, mop.hitVec.yCoord - vec.yCoord, mop.hitVec.zCoord - vec.zCoord, 25F, false, false);
shell.setDead();
}
};
this.types[EXPLOSIVE] = new ArtilleryShell("ammo_arty") {
this.types[EXPLOSIVE] = new ArtilleryShell("ammo_arty_he") {
@Override public void onImpact(EntityArtilleryShell shell, MovingObjectPosition mop) {
Vec3 vec = Vec3.createVectorHelper(shell.motionX, shell.motionY, shell.motionZ).normalize();
shell.worldObj.newExplosion(shell, mop.hitVec.xCoord - vec.xCoord, mop.hitVec.yCoord - vec.yCoord, mop.hitVec.zCoord - vec.zCoord, 15F, false, true);
shell.setDead();
}
};
this.types[MINI_NUKE] = new ArtilleryShell("ammo_arty") {
this.types[MINI_NUKE] = new ArtilleryShell("ammo_arty_mini_nuke") {
@Override public void onImpact(EntityArtilleryShell shell, MovingObjectPosition mop) {
//Vec3 vec = Vec3.createVectorHelper(shell.motionX, shell.motionY, shell.motionZ).normalize();
ExplosionNukeSmall.explode(shell.worldObj, mop.hitVec.xCoord, mop.hitVec.yCoord, mop.hitVec.zCoord, ExplosionNukeSmall.medium);
shell.setDead();
}
};
this.types[NUKE] = new ArtilleryShell("ammo_arty") {
this.types[NUKE] = new ArtilleryShell("ammo_arty_nuke") {
@Override public void onImpact(EntityArtilleryShell shell, MovingObjectPosition mop) {
shell.setDead();
}

98
src/main/java/com/hbm/tileentity/turret/TileEntityTurretArty.java
View File

@ -5,9 +5,9 @@ import java.util.List;
import com.hbm.entity.projectile.EntityArtilleryShell;
import com.hbm.handler.BulletConfigSyncingUtil;
import com.hbm.handler.BulletConfiguration;
import com.hbm.inventory.container.ContainerTurretBase;
import com.hbm.inventory.gui.GUITurretArty;
import com.hbm.items.ModItems;
import com.hbm.lib.Library;
import com.hbm.packet.AuxParticlePacketNT;
import com.hbm.packet.PacketDispatcher;
@ -20,6 +20,7 @@ import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.item.Item;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
@ -83,12 +84,12 @@ public class TileEntityTurretArty extends TileEntityTurretBaseNT implements IGUI
@Override
public double getDecetorRange() {
return 128D;
return this.mode == this.MODE_CANNON ? 128D : 3000D;
}
@Override
public double getDecetorGrace() {
return 32D;
return this.mode == this.MODE_CANNON ? 32D : 250D;
}
@Override
@ -122,6 +123,15 @@ public class TileEntityTurretArty extends TileEntityTurretBaseNT implements IGUI
if(this.mode == this.MODE_CANNON) {
return super.entityInLOS(e);
} else {
Vec3 pos = this.getTurretPos();
Vec3 ent = this.getEntityPos(e);
Vec3 delta = Vec3.createVectorHelper(ent.xCoord - pos.xCoord, ent.yCoord - pos.yCoord, ent.zCoord - pos.zCoord);
double length = delta.lengthVector();
if(length < this.getDecetorGrace() || length > this.getDecetorRange() * 1.1) //the latter statement is only relevant for entities that have already been detected
return false;
int height = worldObj.getHeightValue((int) Math.floor(e.posX), (int) Math.floor(e.posZ));
return height < (e.posY + e.height);
}
@ -153,14 +163,38 @@ public class TileEntityTurretArty extends TileEntityTurretBaseNT implements IGUI
double v0 = 20;
double v02 = v0 * v0;
double g = 9.81 * 0.05;
double upperLower = mode == MODE_CANNON ? 1 : 1;
double upperLower = mode == MODE_CANNON ? -1 : 1;
double targetPitch = Math.atan((v02 + Math.sqrt(v02*v02 - g*(g*x*x + 2*y*v02)) * upperLower) / (g*x));
this.turnTowardsAngle(targetPitch, targetYaw);
}
public int getShellLoaded() {
for(int i = 1; i < 10; i++) {
if(slots[i] != null) {
if(slots[i].getItem() == ModItems.ammo_arty) {
return slots[i].getItemDamage();
}
}
}
return -1;
}
public void conusmeAmmo(Item ammo) {
for(int i = 1; i < 10; i++) {
if(slots[i] != null && slots[i].getItem() == ammo) {
this.decrStackSize(i, 1);
return;
}
}
this.markDirty();
}
@Override
public void spawnBullet(BulletConfiguration bullet) {
public void spawnShell(int type) {
Vec3 pos = this.getTurretPos();
Vec3 vec = Vec3.createVectorHelper(this.getBarrelLength(), 0, 0);
@ -171,6 +205,10 @@ public class TileEntityTurretArty extends TileEntityTurretBaseNT implements IGUI
proj.setPositionAndRotation(pos.xCoord + vec.xCoord, pos.yCoord + vec.yCoord, pos.zCoord + vec.zCoord, 0.0F, 0.0F);
proj.setThrowableHeading(vec.xCoord, vec.yCoord, vec.zCoord, 20F, 0.0F);
proj.setTarget((int) tPos.xCoord, (int) tPos.yCoord, (int) tPos.zCoord);
proj.setType(type);
if(this.mode != this.MODE_CANNON)
proj.setWhistle(true);
worldObj.spawnEntityInWorld(proj);
}
@ -181,10 +219,6 @@ public class TileEntityTurretArty extends TileEntityTurretBaseNT implements IGUI
if(worldObj.isRemote) {
this.lastBarrelPos = this.barrelPos;
if(this.didJustShoot) {
this.retracting = true;
}
if(this.retracting) {
this.barrelPos += 0.5;
@ -266,7 +300,7 @@ public class TileEntityTurretArty extends TileEntityTurretBaseNT implements IGUI
if(searchTimer <= 0) {
searchTimer = this.getDecetorInterval();
if(this.target == null)
if(this.target == null && this.mode != this.MODE_MANUAL)
this.seekNewTarget();
}
} else {
@ -282,6 +316,8 @@ public class TileEntityTurretArty extends TileEntityTurretBaseNT implements IGUI
NBTTagCompound data = this.writePacket();
this.networkPack(data, 250);
this.didJustShoot = false;
} else {
Vec3 vec = Vec3.createVectorHelper(this.getBarrelLength(), 0, 0);
@ -297,8 +333,6 @@ public class TileEntityTurretArty extends TileEntityTurretBaseNT implements IGUI
this.lastRotationYaw -= Math.PI * 2;
}
}
this.didJustShoot = false;
}
int timer;
@ -310,11 +344,11 @@ public class TileEntityTurretArty extends TileEntityTurretBaseNT implements IGUI
if(timer % 40 == 0) {
BulletConfiguration conf = this.getFirstConfigLoaded();
int conf = this.getShellLoaded();
if(conf != null) {
this.spawnBullet(conf);
//this.conusmeAmmo(conf.ammo);
if(conf != -1) {
this.spawnShell(conf);
this.conusmeAmmo(ModItems.ammo_arty);
this.worldObj.playSoundEffect(xCoord, yCoord, zCoord, "hbm:turret.jeremy_fire", 25.0F, 1.0F);
Vec3 pos = this.getTurretPos();
Vec3 vec = Vec3.createVectorHelper(this.getBarrelLength(), 0, 0);
@ -322,11 +356,6 @@ public class TileEntityTurretArty extends TileEntityTurretBaseNT implements IGUI
vec.rotateAroundY((float) -(this.rotationYaw + Math.PI * 0.5));
this.didJustShoot = true;
if(this.mode == this.MODE_MANUAL && !this.targetQueue.isEmpty()) {
this.targetQueue.remove(0);
this.tPos = null;
}
NBTTagCompound data = new NBTTagCompound();
data.setString("type", "vanillaExt");
data.setString("mode", "largeexplode");
@ -334,6 +363,11 @@ public class TileEntityTurretArty extends TileEntityTurretBaseNT implements IGUI
data.setByte("count", (byte)5);
PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, pos.xCoord + vec.xCoord, pos.yCoord + vec.yCoord, pos.zCoord + vec.zCoord), new TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 150));
}
if(this.mode == this.MODE_MANUAL && !this.targetQueue.isEmpty()) {
this.targetQueue.remove(0);
this.tPos = null;
}
}
}
@ -352,7 +386,8 @@ public class TileEntityTurretArty extends TileEntityTurretBaseNT implements IGUI
protected NBTTagCompound writePacket() {
NBTTagCompound data = super.writePacket();
data.setShort("mode", mode);
data.setBoolean("didJustShoot", didJustShoot);
if(didJustShoot)
data.setBoolean("didJustShoot", didJustShoot);
return data;
}
@ -360,7 +395,22 @@ public class TileEntityTurretArty extends TileEntityTurretBaseNT implements IGUI
public void networkUnpack(NBTTagCompound nbt) {
super.networkUnpack(nbt);
this.mode = nbt.getShort("mode");
this.didJustShoot = nbt.getBoolean("didJustShoot");
if(nbt.getBoolean("didJustShoot"))
this.retracting = true;
}
@Override
public void readFromNBT(NBTTagCompound nbt) {
super.readFromNBT(nbt);
this.mode = nbt.getShort("mode");
}
@Override
public void writeToNBT(NBTTagCompound nbt) {
super.writeToNBT(nbt);
nbt.setShort("mode", this.mode);
}
@Override