diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index 6a9cc98b..f7746425 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -316,6 +316,10 @@ public class AlchemicalWizardry public static double lpPerSacrificeIncense = 100.0D; public static HashMap, Integer> lpPerSactificeCustom; + public static int energyBlastDamage = 12; + public static int energyBazookaDamage = 12; + public static int energyBazookaSecondaryDamage = 15; + public static List wellBlacklist; public static Logger logger = LogManager.getLogger("BloodMagic"); diff --git a/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java b/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java index dce168b4..2ea0a98c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java +++ b/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java @@ -289,6 +289,10 @@ public class BloodMagicConfiguration AlchemicalWizardry.lpPerSacrificeWellOfSuffering = config.get("sacrifice", "LP per sacrifice with Well of Suffering ritual", AlchemicalWizardry.lpPerSacrificeWellOfSuffering).getInt(AlchemicalWizardry.lpPerSacrificeWellOfSuffering); AlchemicalWizardry.lpPerSacrificeIncense = config.get("sacrifice", "LP per (self-)sacrifice with incense", AlchemicalWizardry.lpPerSacrificeIncense).getDouble(AlchemicalWizardry.lpPerSacrificeIncense); + AlchemicalWizardry.energyBlastDamage = config.get("energy items damage", "Energy Blast damage", AlchemicalWizardry.energyBlastDamage).getInt(AlchemicalWizardry.energyBlastDamage); + AlchemicalWizardry.energyBazookaDamage = config.get("energy items damage", "Energy Bazooka damage", AlchemicalWizardry.energyBazookaDamage).getInt(AlchemicalWizardry.energyBazookaDamage); + AlchemicalWizardry.energyBazookaSecondaryDamage = config.get("energy items damage", "Energy Bazooka secondary damage", AlchemicalWizardry.energyBazookaSecondaryDamage).getInt(AlchemicalWizardry.energyBazookaSecondaryDamage); + Side side = FMLCommonHandler.instance().getSide(); if (side == Side.CLIENT) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EntityEnergyBazookaMainProjectile.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EntityEnergyBazookaMainProjectile.java index fbc3fa57..9938c224 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EntityEnergyBazookaMainProjectile.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EntityEnergyBazookaMainProjectile.java @@ -1,5 +1,6 @@ package WayofTime.alchemicalWizardry.common.entity.projectile; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.DamageSource; @@ -84,7 +85,7 @@ public class EntityEnergyBazookaMainProjectile extends EnergyBlastProjectile { for (int i = 0; i < 20; i++) { - EntityEnergyBazookaSecondaryProjectile secProj = new EntityEnergyBazookaSecondaryProjectile(worldObj, this.posX, this.posY, this.posZ, 15); + EntityEnergyBazookaSecondaryProjectile secProj = new EntityEnergyBazookaSecondaryProjectile(worldObj, this.posX, this.posY, this.posZ, AlchemicalWizardry.energyBazookaSecondaryDamage); secProj.shootingEntity = this.shootingEntity; float xVel = rand.nextFloat() - rand.nextFloat(); float yVel = rand.nextFloat() - rand.nextFloat(); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java index c5fd3364..14993e13 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java @@ -1,5 +1,7 @@ package WayofTime.alchemicalWizardry.common.items; +import java.util.List; + import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.common.entity.projectile.EntityEnergyBazookaMainProjectile; import cpw.mods.fml.relauncher.Side; @@ -14,8 +16,6 @@ import net.minecraft.util.StatCollector; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import java.util.List; - public class EnergyBazooka extends EnergyItems { @SideOnly(Side.CLIENT) @@ -32,7 +32,7 @@ public class EnergyBazooka extends EnergyItems setFull3D(); setMaxDamage(250); this.setEnergyUsed(20000); - damage = 12; + damage = AlchemicalWizardry.energyBazookaDamage; } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java index 03023a79..a76c6593 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java @@ -1,5 +1,7 @@ package WayofTime.alchemicalWizardry.common.items; +import java.util.List; + import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.common.entity.projectile.EnergyBlastProjectile; import cpw.mods.fml.relauncher.Side; @@ -13,8 +15,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import java.util.List; - public class EnergyBlast extends EnergyItems { @SideOnly(Side.CLIENT) @@ -32,7 +32,7 @@ public class EnergyBlast extends EnergyItems setFull3D(); setMaxDamage(250); this.setEnergyUsed(150); - damage = 12; + damage = AlchemicalWizardry.energyBlastDamage; } @Override