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

ouch.

Browse Source
This commit is contained in:
70000hp 2024-01-12 19:01:08 -05:00
parent acf65b8922
commit 87cf1c80c3
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/hbm/entity/mob/EntityGlyphidDigger.java
View File

@ -64,7 +64,7 @@ public class EntityGlyphidDigger extends EntityGlyphid {
* Mainly composed of crusty old power fist code, with some touch ups * Mainly composed of crusty old power fist code, with some touch ups
**/ **/
public void groundSlam(){ public void groundSlam(){
if (!worldObj.isRemote && entityToAttack instanceof EntityLivingBase && this.getDistanceToEntity(entityToAttack) < (useExtendedTargeting() ? 128D : 16D)) { if (!worldObj.isRemote && entityToAttack instanceof EntityLivingBase && this.getDistanceToEntity(entityToAttack) < 30) {
Entity e = this.getEntityToAttack(); Entity e = this.getEntityToAttack();
boolean topAttack = false; boolean topAttack = false;
@ -91,7 +91,9 @@ public class EntityGlyphidDigger extends EntityGlyphid {
if(this.lastTarget != e) { if(this.lastTarget != e) {
velX = velY = velZ = 0; velX = velY = velZ = 0;
} else if (this.getDistanceToEntity(e) < 11) { }
if (this.getDistanceToEntity(e) > 20) {
topAttack = true; topAttack = true;
} }
@ -105,7 +107,7 @@ public class EntityGlyphidDigger extends EntityGlyphid {
double y = delta.yCoord; double y = delta.yCoord;
double v0 = 1.2; double v0 = 1.2;
double v02 = v0 * v0; double v02 = v0 * v0;
double g = 0.07D; double g = 0.03D;
double upperLower = topAttack ? 1 : -1; double upperLower = topAttack ? 1 : -1;
double targetPitch = Math.atan((v02 + Math.sqrt(v02*v02 - g*(g*x*x + 2*y*v02)) * upperLower) / (g*x)); double targetPitch = Math.atan((v02 + Math.sqrt(v02*v02 - g*(g*x*x + 2*y*v02)) * upperLower) / (g*x));
Vec3 fireVec = null; Vec3 fireVec = null;
@ -126,7 +128,7 @@ public class EntityGlyphidDigger extends EntityGlyphid {
Block b = worldObj.getBlock(x1, y1, z1); Block b = worldObj.getBlock(x1, y1, z1);
float k = b.getExplosionResistance(null); float k = b.getExplosionResistance(null);
if (k < 6000 && b.isNormalCube()) { if (k < 200 && b.isNormalCube()) {
EntityRubble rubble = new EntityRubble(worldObj); EntityRubble rubble = new EntityRubble(worldObj);
rubble.posX = x1 + 0.5F; rubble.posX = x1 + 0.5F;

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

@ -12,7 +12,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World; import net.minecraft.world.World;
public class EntityRubble extends EntityThrowableInterp { public class EntityRubble extends EntityThrowableNT {
public EntityRubble(World world) public EntityRubble(World world)
{ {
@ -50,11 +50,6 @@ public class EntityRubble extends EntityThrowableInterp {
} }
} }
@Override
public double getGravityVelocity() {
return 0.07D;
}
@Override @Override
protected float getAirDrag() { protected float getAirDrag() {
return 1F; return 1F;