Skip to content

Add Legacy Explosion support for legacy compatibility #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zeng-github01 wants to merge 1 commit into from
Closed

Add Legacy Explosion support for legacy compatibility #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/main/java/noppes/npcs/config/ConfigExperimental.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ public class ConfigExperimental {
public final static String SERVER = "Server";
public static Property ModernGuiSystemProperty;
public static boolean ModernGuiSystem = false;
public static Property useLegacyExplosionProperty;
public static boolean useLegacyExplosion = false;


public static void init(File configFile) {
Expand All @@ -24,6 +26,8 @@ public static void init(File configFile) {

ModernGuiSystemProperty = config.get(CLIENT, "Experimental Dialog GUI", false, "Enables the new CNPC+ Modern GUI for Dialog and Quest information");
ModernGuiSystem = ModernGuiSystemProperty.getBoolean(false);
useLegacyExplosionProperty = config.get(SERVER, "Use Legacy Explosion", false);
useLegacyExplosion = useLegacyExplosionProperty.getBoolean(false);
} catch (Exception e) {
FMLLog.log(Level.ERROR, e, "CNPC+ has had a problem loading its experimental configuration");
} finally {
Expand Down
100 changes: 52 additions & 48 deletions src/main/java/noppes/npcs/entity/EntityProjectile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import noppes.npcs.api.IWorld;
import noppes.npcs.api.entity.IEntity;
import noppes.npcs.api.entity.IProjectile;
import noppes.npcs.config.ConfigExperimental;
import noppes.npcs.constants.EnumParticleType;
import noppes.npcs.constants.EnumPotionType;
import noppes.npcs.controllers.ScriptContainer;
Expand Down Expand Up @@ -570,70 +571,77 @@ protected void onImpact(MovingObjectPosition movingobjectposition) {
}


if (explosive) {
if (this.explosive) {
if (this.explosiveRadius != 0 || this.effect == EnumPotionType.None) {
boolean terraindamage = this.worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing") && explosiveDamage && destroyTerrain;
Explosion explosion = new Explosion(worldObj, this, posX, posY, posZ, explosiveRadius);
explosion.isFlaming = this.effect == EnumPotionType.Fire;
explosion.isSmoking = terraindamage;
if (terraindamage)
explosion.doExplosionA();
explosion.doExplosionB(worldObj.isRemote);
//this.worldObj.newExplosion(null, this.posX, this.posY, this.posZ, this.explosiveRadius, this.effect == EnumPotionType.Fire, this.worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing") && explosiveDamage);
if (!worldObj.isRemote) {
Iterator iterator = worldObj.playerEntities.iterator();

while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
if (entityplayer.getDistanceSq(posX, posY, posZ) < 4096.0D) {
((EntityPlayerMP) entityplayer).playerNetServerHandler.sendPacket(new S27PacketExplosion(posX, posY, posZ, explosiveRadius, explosion.affectedBlockPositions, (Vec3) explosion.func_77277_b().get(entityplayer)));

boolean canGrief = this.worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing") && explosiveDamage;

if (ConfigExperimental.useLegacyExplosion) {
this.worldObj.newExplosion(null, this.posX, this.posY, this.posZ, (float)this.explosiveRadius, this.effect == EnumPotionType.Fire, canGrief);

} else {
boolean terraindamage = canGrief && destroyTerrain;

Explosion explosion = new Explosion(this.worldObj, this, this.posX, this.posY, this.posZ, (float)this.explosiveRadius);
explosion.isFlaming = this.effect == EnumPotionType.Fire;
explosion.isSmoking = terraindamage;

if (terraindamage) {
explosion.doExplosionA();
}
explosion.doExplosionB(this.worldObj.isRemote);

if (!this.worldObj.isRemote) {
for (Object playerObj : this.worldObj.playerEntities) {
if (playerObj instanceof EntityPlayerMP) {
EntityPlayerMP entityplayer = (EntityPlayerMP) playerObj;
if (entityplayer.getDistanceSq(this.posX, this.posY, this.posZ) < 4096.0D) {
Vec3 knockback = (Vec3) explosion.func_77277_b().get(entityplayer);

entityplayer.playerNetServerHandler.sendPacket(new S27PacketExplosion(
this.posX, this.posY, this.posZ, this.explosiveRadius,
explosion.affectedBlockPositions,
knockback
));
}
}
}
}
}
if (this.explosiveRadius != 0 && (this.isArrow() || this.sticksToWalls()))

if (this.explosiveRadius != 0 && (this.isArrow() || this.sticksToWalls())) {
this.setDead();
}

} else if (this.effect == EnumPotionType.Fire) {
int i = movingobjectposition.blockX;
int j = movingobjectposition.blockY;
int k = movingobjectposition.blockZ;

switch (movingobjectposition.sideHit) {
case 0:
--j;
break;
case 1:
++j;
break;
case 2:
--k;
break;
case 3:
++k;
break;
case 4:
--i;
break;
case 5:
++i;
case 0: --j; break;
case 1: ++j; break;
case 2: --k; break;
case 3: ++k; break;
case 4: --i; break;
case 5: ++i;
}

if (this.worldObj.isAirBlock(i, j, k)) {
this.worldObj.setBlock(i, j, k, Blocks.fire);
}

} else {
AxisAlignedBB axisalignedbb = this.boundingBox.expand(4.0D, 2.0D, 4.0D);
List list1 = this.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb);

if (list1 != null && !list1.isEmpty()) {
Iterator iterator = list1.iterator();
List<EntityLivingBase> list1 = this.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb);

while (iterator.hasNext()) {
EntityLivingBase entitylivingbase = (EntityLivingBase) iterator.next();
if (list1 != null && !list1.isEmpty()) {
for (EntityLivingBase entitylivingbase : list1) {
double d0 = this.getDistanceSqToEntity(entitylivingbase);

if (d0 < 16.0D) {
double d1 = 1.0D - Math.sqrt(d0) / 4.0D;

if (entitylivingbase == movingobjectposition.entityHit) {
d1 = 1.0D;
}
Expand All @@ -644,23 +652,19 @@ protected void onImpact(MovingObjectPosition movingobjectposition) {
if (Potion.potionTypes[potionId].isInstant()) {
Potion.potionTypes[potionId].affectEntity(this.getThrower(), entitylivingbase, this.amplify, d1);
} else {
int j = (int) (d1 * (double) this.duration + 0.5D);

if (j > 20) {
entitylivingbase.addPotionEffect(new PotionEffect(potionId, j, this.amplify));
int durationCalc = (int) (d1 * (double) this.duration + 0.5D);
if (durationCalc > 20) {
entitylivingbase.addPotionEffect(new PotionEffect(potionId, durationCalc, this.amplify));
}
}
}
}
}
}

this.worldObj.playAuxSFX(2002, (int) Math.round(this.posX), (int) Math.round(this.posY), (int) Math.round(this.posZ), this.getPotionColor());
}
}

if (!this.worldObj.isRemote && !this.isArrow() && !this.sticksToWalls()) {
this.setDead();
}
}

public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) {
Expand Down
Loading