Skip to content

Commit

Permalink
Removing poison temporarily for v1.0.9 release
Browse files Browse the repository at this point in the history
  • Loading branch information
@lab3
lab3 committed May 13, 2023
1 parent 715b18c commit f034adc
Show file tree
Hide file tree
Showing 16 changed files with 1,053 additions and 1,092 deletions.
12 changes: 6 additions & 6 deletions src/main/java/io/redspace/ironsspellbooks/config/ServerConfigs.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,12 @@ public class ServerConfigs {
createSpellConfig(SpellType.VOID_TENTACLES_SPELL, true, 3, SpellRarity.LEGENDARY, 30);
BUILDER.pop();
//Poison
BUILDER.comment("Poison Spells");
createSpellConfig(SpellType.POISON_ARROW_SPELL, true, 10, SpellRarity.COMMON, 25);
createSpellConfig(SpellType.POISON_SPLASH_SPELL, true, 10, SpellRarity.UNCOMMON, 20);
createSpellConfig(SpellType.POISON_BREATH_SPELL, true, 10, SpellRarity.COMMON, 25);
createSpellConfig(SpellType.ACID_ORB_SPELL, true, 10, SpellRarity.COMMON, 15);
createSpellConfig(SpellType.SPIDER_ASPECT_SPELL, true, 8, SpellRarity.COMMON, 35);
// BUILDER.comment("Poison Spells");
// createSpellConfig(SpellType.POISON_ARROW_SPELL, true, 10, SpellRarity.COMMON, 25);
// createSpellConfig(SpellType.POISON_SPLASH_SPELL, true, 10, SpellRarity.UNCOMMON, 20);
// createSpellConfig(SpellType.POISON_BREATH_SPELL, true, 10, SpellRarity.COMMON, 25);
// createSpellConfig(SpellType.ACID_ORB_SPELL, true, 10, SpellRarity.COMMON, 15);
// createSpellConfig(SpellType.SPIDER_ASPECT_SPELL, true, 8, SpellRarity.COMMON, 35);



Expand Down
380 changes: 190 additions & 190 deletions src/main/java/io/redspace/ironsspellbooks/entity/spells/poison_arrow/PoisonArrow.java
View file
Original file line number Diff line number Diff line change
@@ -1,190 +1,190 @@
package io.redspace.ironsspellbooks.entity.spells.poison_arrow;

import io.redspace.ironsspellbooks.capabilities.magic.MagicManager;
import io.redspace.ironsspellbooks.damage.DamageSources;
import io.redspace.ironsspellbooks.entity.spells.AbstractMagicProjectile;
import io.redspace.ironsspellbooks.entity.spells.poison_cloud.PoisonCloud;
import io.redspace.ironsspellbooks.registries.EntityRegistry;
import io.redspace.ironsspellbooks.spells.SchoolType;
import io.redspace.ironsspellbooks.spells.SpellType;
import io.redspace.ironsspellbooks.util.ParticleHelper;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.network.syncher.EntityDataSerializers;
import net.minecraft.network.syncher.SynchedEntityData;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.projectile.Projectile;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.EntityHitResult;
import net.minecraft.world.phys.Vec3;

import java.util.Optional;

public class PoisonArrow extends AbstractMagicProjectile {
private static final EntityDataAccessor<Boolean> IN_GROUND = SynchedEntityData.defineId(PoisonArrow.class, EntityDataSerializers.BOOLEAN);

public PoisonArrow(EntityType<? extends Projectile> pEntityType, Level pLevel) {
super(pEntityType, pLevel);
}

public PoisonArrow(Level levelIn, LivingEntity shooter) {
this(EntityRegistry.POISON_ARROW.get(), levelIn);
setOwner(shooter);
}

public int shakeTime;
protected boolean hasEmittedPoison;
protected boolean inGround;
protected float aoeDamage;

@Override
public void tick() {

if (this.shakeTime > 0) {
--this.shakeTime;
}
if (!inGround) {
super.tick();
//IronsSpellbooks.LOGGER.debug("Poison Arrow Flying!! {}", inGround);
} else {
if (++age > EXPIRE_TIME) {
discard();
return;
}
if (shouldFall()) {
inGround = false;
//IronsSpellbooks.LOGGER.debug("This side thinks we should fall {}", getDeltaMovement());
this.setDeltaMovement(getDeltaMovement().normalize().scale(0.05f));

}
}

}

@Override
protected void defineSynchedData() {
super.defineSynchedData();
this.getEntityData().define(IN_GROUND, false);

}

public void setAoeDamage(float damage) {
this.aoeDamage = damage;
}

public float getAoeDamage() {
return aoeDamage;
}

private boolean shouldFall() {
return this.inGround && this.level.noCollision((new AABB(this.position(), this.position())).inflate(0.06D));
}

@Override
protected void onHitBlock(BlockHitResult pResult) {
super.onHitBlock(pResult);
Vec3 vec3 = pResult.getLocation().subtract(this.getX(), this.getY(), this.getZ());
this.setDeltaMovement(vec3);
Vec3 vec31 = vec3.normalize().scale(0.05F);
this.setPosRaw(this.getX() - vec31.x, this.getY() - vec31.y, this.getZ() - vec31.z);
this.playSound(SoundEvents.ARROW_HIT, 1.0F, 1.2F / (this.random.nextFloat() * 0.2F + 0.9F));
this.inGround = true;
this.shakeTime = 7;
if (!level.isClientSide && !hasEmittedPoison){
createPoisonCloud(pResult.getLocation());
}

//IronsSpellbooks.LOGGER.debug("Poison Arrow onHitBlock: {}", inGround);

}

@Override
protected void onHitEntity(EntityHitResult entityHitResult) {
if (level.isClientSide)
return;
Entity entity = entityHitResult.getEntity();
boolean hit = DamageSources.applyDamage(entity, getDamage(), SpellType.POISON_ARROW_SPELL.getDamageSource(this, getOwner()), SchoolType.POISON);
//TODO: add evasion and stuff. Also do this for all other projectiles?
boolean ignore = entity.getType() == EntityType.ENDERMAN;
if (hit) {
if (!ignore) {
if (!level.isClientSide && !hasEmittedPoison)
createPoisonCloud(entity.position());
if (entity instanceof LivingEntity livingEntity)
livingEntity.setArrowCount(livingEntity.getArrowCount() + 1);
var spawn = entityHitResult.getLocation();
this.discard();
}
} else {
this.setDeltaMovement(this.getDeltaMovement().scale(-0.1D));
this.setYRot(this.getYRot() + 180.0F);
this.yRotO += 180.0F;
}


}

@Override
protected void addAdditionalSaveData(CompoundTag pCompound) {
super.addAdditionalSaveData(pCompound);
pCompound.putBoolean("inGround", this.inGround);
pCompound.putBoolean("hasEmittedPoison", hasEmittedPoison);
pCompound.putFloat("aoeDamage", aoeDamage);
}

public void createPoisonCloud(Vec3 location) {
if (!level.isClientSide) {
PoisonCloud cloud = new PoisonCloud(level);
cloud.setOwner(getOwner());
cloud.setDuration(200);
cloud.setDamage(aoeDamage);
cloud.moveTo(location);
level.addFreshEntity(cloud);
hasEmittedPoison = true;
}
}

@Override
protected void readAdditionalSaveData(CompoundTag pCompound) {
super.readAdditionalSaveData(pCompound);
this.inGround = pCompound.getBoolean("inGround");
this.hasEmittedPoison = pCompound.getBoolean("hasEmittedPoison");
this.aoeDamage = pCompound.getFloat("aoeDamage");
}

@Override
public void trailParticles() {
Vec3 vec3 = this.position().subtract(getDeltaMovement().scale(2));
level.addParticle(ParticleHelper.ACID, vec3.x, vec3.y, vec3.z, 0, 0, 0);
}

@Override
public void impactParticles(double x, double y, double z) {
MagicManager.spawnParticles(level, ParticleHelper.ACID, x, y, z, 15, .03, .03, .03, 0.2, true);
}

@Override
public float getSpeed() {
return 2.5f;
}

@Override
public Optional<SoundEvent> getImpactSound() {
return Optional.empty();
}

@Override
public boolean respectsGravity() {
return true;
}




}
//package io.redspace.ironsspellbooks.entity.spells.poison_arrow;
//
//import io.redspace.ironsspellbooks.capabilities.magic.MagicManager;
//import io.redspace.ironsspellbooks.damage.DamageSources;
//import io.redspace.ironsspellbooks.entity.spells.AbstractMagicProjectile;
//import io.redspace.ironsspellbooks.entity.spells.poison_cloud.PoisonCloud;
//import io.redspace.ironsspellbooks.registries.EntityRegistry;
//import io.redspace.ironsspellbooks.spells.SchoolType;
//import io.redspace.ironsspellbooks.spells.SpellType;
//import io.redspace.ironsspellbooks.util.ParticleHelper;
//import net.minecraft.nbt.CompoundTag;
//import net.minecraft.network.syncher.EntityDataAccessor;
//import net.minecraft.network.syncher.EntityDataSerializers;
//import net.minecraft.network.syncher.SynchedEntityData;
//import net.minecraft.sounds.SoundEvent;
//import net.minecraft.sounds.SoundEvents;
//import net.minecraft.world.entity.Entity;
//import net.minecraft.world.entity.EntityType;
//import net.minecraft.world.entity.LivingEntity;
//import net.minecraft.world.entity.projectile.Projectile;
//import net.minecraft.world.level.Level;
//import net.minecraft.world.phys.AABB;
//import net.minecraft.world.phys.BlockHitResult;
//import net.minecraft.world.phys.EntityHitResult;
//import net.minecraft.world.phys.Vec3;
//
//import java.util.Optional;
//
//public class PoisonArrow extends AbstractMagicProjectile {
// private static final EntityDataAccessor<Boolean> IN_GROUND = SynchedEntityData.defineId(PoisonArrow.class, EntityDataSerializers.BOOLEAN);
//
// public PoisonArrow(EntityType<? extends Projectile> pEntityType, Level pLevel) {
// super(pEntityType, pLevel);
// }
//
// public PoisonArrow(Level levelIn, LivingEntity shooter) {
// this(EntityRegistry.POISON_ARROW.get(), levelIn);
// setOwner(shooter);
// }
//
// public int shakeTime;
// protected boolean hasEmittedPoison;
// protected boolean inGround;
// protected float aoeDamage;
//
// @Override
// public void tick() {
//
// if (this.shakeTime > 0) {
// --this.shakeTime;
// }
// if (!inGround) {
// super.tick();
// //IronsSpellbooks.LOGGER.debug("Poison Arrow Flying!! {}", inGround);
// } else {
// if (++age > EXPIRE_TIME) {
// discard();
// return;
// }
// if (shouldFall()) {
// inGround = false;
// //IronsSpellbooks.LOGGER.debug("This side thinks we should fall {}", getDeltaMovement());
// this.setDeltaMovement(getDeltaMovement().normalize().scale(0.05f));
//
// }
// }
//
// }
//
// @Override
// protected void defineSynchedData() {
// super.defineSynchedData();
// this.getEntityData().define(IN_GROUND, false);
//
// }
//
// public void setAoeDamage(float damage) {
// this.aoeDamage = damage;
// }
//
// public float getAoeDamage() {
// return aoeDamage;
// }
//
// private boolean shouldFall() {
// return this.inGround && this.level.noCollision((new AABB(this.position(), this.position())).inflate(0.06D));
// }
//
// @Override
// protected void onHitBlock(BlockHitResult pResult) {
// super.onHitBlock(pResult);
// Vec3 vec3 = pResult.getLocation().subtract(this.getX(), this.getY(), this.getZ());
// this.setDeltaMovement(vec3);
// Vec3 vec31 = vec3.normalize().scale(0.05F);
// this.setPosRaw(this.getX() - vec31.x, this.getY() - vec31.y, this.getZ() - vec31.z);
// this.playSound(SoundEvents.ARROW_HIT, 1.0F, 1.2F / (this.random.nextFloat() * 0.2F + 0.9F));
// this.inGround = true;
// this.shakeTime = 7;
// if (!level.isClientSide && !hasEmittedPoison){
// createPoisonCloud(pResult.getLocation());
// }
//
// //IronsSpellbooks.LOGGER.debug("Poison Arrow onHitBlock: {}", inGround);
//
// }
//
// @Override
// protected void onHitEntity(EntityHitResult entityHitResult) {
// if (level.isClientSide)
// return;
// Entity entity = entityHitResult.getEntity();
// boolean hit = DamageSources.applyDamage(entity, getDamage(), SpellType.POISON_ARROW_SPELL.getDamageSource(this, getOwner()), SchoolType.POISON);
// //TODO: add evasion and stuff. Also do this for all other projectiles?
// boolean ignore = entity.getType() == EntityType.ENDERMAN;
// if (hit) {
// if (!ignore) {
// if (!level.isClientSide && !hasEmittedPoison)
// createPoisonCloud(entity.position());
// if (entity instanceof LivingEntity livingEntity)
// livingEntity.setArrowCount(livingEntity.getArrowCount() + 1);
// var spawn = entityHitResult.getLocation();
// this.discard();
// }
// } else {
// this.setDeltaMovement(this.getDeltaMovement().scale(-0.1D));
// this.setYRot(this.getYRot() + 180.0F);
// this.yRotO += 180.0F;
// }
//
//
// }
//
// @Override
// protected void addAdditionalSaveData(CompoundTag pCompound) {
// super.addAdditionalSaveData(pCompound);
// pCompound.putBoolean("inGround", this.inGround);
// pCompound.putBoolean("hasEmittedPoison", hasEmittedPoison);
// pCompound.putFloat("aoeDamage", aoeDamage);
// }
//
// public void createPoisonCloud(Vec3 location) {
// if (!level.isClientSide) {
// PoisonCloud cloud = new PoisonCloud(level);
// cloud.setOwner(getOwner());
// cloud.setDuration(200);
// cloud.setDamage(aoeDamage);
// cloud.moveTo(location);
// level.addFreshEntity(cloud);
// hasEmittedPoison = true;
// }
// }
//
// @Override
// protected void readAdditionalSaveData(CompoundTag pCompound) {
// super.readAdditionalSaveData(pCompound);
// this.inGround = pCompound.getBoolean("inGround");
// this.hasEmittedPoison = pCompound.getBoolean("hasEmittedPoison");
// this.aoeDamage = pCompound.getFloat("aoeDamage");
// }
//
// @Override
// public void trailParticles() {
// Vec3 vec3 = this.position().subtract(getDeltaMovement().scale(2));
// level.addParticle(ParticleHelper.ACID, vec3.x, vec3.y, vec3.z, 0, 0, 0);
// }
//
// @Override
// public void impactParticles(double x, double y, double z) {
// MagicManager.spawnParticles(level, ParticleHelper.ACID, x, y, z, 15, .03, .03, .03, 0.2, true);
// }
//
// @Override
// public float getSpeed() {
// return 2.5f;
// }
//
// @Override
// public Optional<SoundEvent> getImpactSound() {
// return Optional.empty();
// }
//
// @Override
// public boolean respectsGravity() {
// return true;
// }
//
//
//
//
//}
Loading

0 comments on commit f034adc

Please sign in to comment.