EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-28 03:34:43 +02:00
Code Issues Projects Releases Wiki Activity

Refactoring, removing useless variables, changing ints to doubles, etc.

Browse Source
This commit is contained in:
GJ
2013-01-14 12:41:39 -05:00
parent 8915a535c6
commit 348887f799
14 changed files with 54 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/gmail/nossr50/skills/acrobatics/Acrobatics.java
View File

@ -3,14 +3,14 @@ package com.gmail.nossr50.skills.acrobatics;
import com.gmail.nossr50.config.AdvancedConfig;
public class Acrobatics {
public static int maxDodgeChance = AdvancedConfig.getInstance().getDodgeChanceMax();
public static int maxDodgeBonusLevel = AdvancedConfig.getInstance().getDodgeMaxBonusLevel();
public static double dodgeMaxChance = AdvancedConfig.getInstance().getDodgeChanceMax();
public static int dodgeMaxBonusLevel = AdvancedConfig.getInstance().getDodgeMaxBonusLevel();
public static int dodgeXpModifier = AdvancedConfig.getInstance().getDodgeXPModifier();
public static int maxRollChance = AdvancedConfig.getInstance().getRollChanceMax();
public static int maxRollBonusLevel = AdvancedConfig.getInstance().getRollMaxBonusLevel();
public static int maxGracefulRollChance = AdvancedConfig.getInstance().getGracefulRollChanceMax();
public static int maxGracefulRollBonusLevel = AdvancedConfig.getInstance().getGracefulRollMaxBonusLevel();
public static double rollMaxChance = AdvancedConfig.getInstance().getRollChanceMax();
public static int rollMaxBonusLevel = AdvancedConfig.getInstance().getRollMaxBonusLevel();
public static double gracefulRollMaxChance = AdvancedConfig.getInstance().getGracefulRollChanceMax();
public static int gracefulRollMaxBonusLevel = AdvancedConfig.getInstance().getGracefulRollMaxBonusLevel();
public static int rollXpModifier = AdvancedConfig.getInstance().getRollXPModifier();
public static int fallXpModifier = AdvancedConfig.getInstance().getFallXPModifier();

8
src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java
View File

@ -35,13 +35,13 @@ public class AcrobaticsManager extends SkillManager {
randomChance = (int) (randomChance * 0.75);
}
float chance;
double chance;
if (eventHandler.isGraceful) {
chance = ((float) Acrobatics.maxGracefulRollChance / Acrobatics.maxGracefulRollBonusLevel) * eventHandler.skillModifier;
chance = (Acrobatics.gracefulRollMaxChance / Acrobatics.gracefulRollMaxBonusLevel) * eventHandler.skillModifier;
}
else {
chance = ((float) Acrobatics.maxRollChance / Acrobatics.maxRollBonusLevel) * eventHandler.skillModifier;
chance = (Acrobatics.rollMaxChance / Acrobatics.rollMaxBonusLevel) * eventHandler.skillModifier;
}
if (chance > Misc.getRandom().nextInt(randomChance) && !eventHandler.isFatal(eventHandler.modifiedDamage)) {
@ -71,7 +71,7 @@ public class AcrobaticsManager extends SkillManager {
randomChance = (int) (randomChance * 0.75);
}
float chance = ((float) Acrobatics.maxDodgeChance / Acrobatics.maxDodgeBonusLevel) * eventHandler.skillModifier;
double chance = (Acrobatics.dodgeMaxChance / Acrobatics.dodgeMaxBonusLevel) * eventHandler.skillModifier;
if (chance > Misc.getRandom().nextInt(randomChance) && !eventHandler.isFatal(eventHandler.modifiedDamage)) {
eventHandler.modifyEventDamage();

2
src/main/java/com/gmail/nossr50/skills/acrobatics/DodgeEventHandler.java
View File

@ -18,7 +18,7 @@ public class DodgeEventHandler extends AcrobaticsEventHandler {
@Override
protected void calculateSkillModifier() {
this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Acrobatics.maxDodgeBonusLevel);
this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Acrobatics.dodgeMaxBonusLevel);
}
@Override

2
src/main/java/com/gmail/nossr50/skills/acrobatics/RollEventHandler.java
View File

@ -29,7 +29,7 @@ public class RollEventHandler extends AcrobaticsEventHandler {
skillModifer = skillModifer * 2;
}
skillModifer = Misc.skillCheck(skillModifer, Acrobatics.maxRollBonusLevel);
skillModifer = Misc.skillCheck(skillModifer, Acrobatics.rollMaxBonusLevel);
this.skillModifier = skillModifer;
}

6
src/main/java/com/gmail/nossr50/skills/archery/Archery.java
View File

@ -14,15 +14,15 @@ import com.gmail.nossr50.util.Misc;
public class Archery {
private static List<TrackedEntity> trackedEntities = new ArrayList<TrackedEntity>();
public static int arrowTrackingMaxBonusLevel = AdvancedConfig.getInstance().getRetrieveMaxBonusLevel();
public static int arrowTrackingMaxBonus = AdvancedConfig.getInstance().getRetrieveBonusMax();
public static int retrieveMaxBonusLevel = AdvancedConfig.getInstance().getRetrieveMaxBonusLevel();
public static double retrieveMaxChance = AdvancedConfig.getInstance().getRetrieveChanceMax();
public static int skillShotIncreaseLevel = AdvancedConfig.getInstance().getSkillShotIncreaseLevel();
public static double skillShotIncreasePercentage = AdvancedConfig.getInstance().getSkillShotIncreasePercentage();
public static double skillShotMaxBonusPercentage = AdvancedConfig.getInstance().getSkillShotBonusMax();
public static int dazeMaxBonusLevel = AdvancedConfig.getInstance().getDazeMaxBonusLevel();
public static int dazeMaxBonus = AdvancedConfig.getInstance().getDazeBonusMax();
public static double dazeMaxBonus = AdvancedConfig.getInstance().getDazeBonusMax();
public static int dazeModifier = AdvancedConfig.getInstance().getDazeModifier();
protected static void incrementTrackerValue(LivingEntity livingEntity) {

8
src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java
View File

@ -31,7 +31,7 @@ public class ArcheryManager extends SkillManager {
randomChance = (int) (randomChance * 0.75);
}
float chance = ((float) Archery.arrowTrackingMaxBonus / Archery.arrowTrackingMaxBonusLevel) * eventHandler.skillModifier;
double chance = (Archery.retrieveMaxChance / Archery.retrieveMaxBonusLevel) * eventHandler.skillModifier;
if (chance > Misc.getRandom().nextInt(randomChance)) {
eventHandler.addToTracker();
@ -56,7 +56,7 @@ public class ArcheryManager extends SkillManager {
randomChance = (int) (randomChance * 0.75);
}
float chance = ((float) Archery.dazeMaxBonus / Archery.dazeMaxBonusLevel) * eventHandler.skillModifier;
double chance = (Archery.dazeMaxBonus / Archery.dazeMaxBonusLevel) * eventHandler.skillModifier;
if (chance > Misc.getRandom().nextInt(randomChance)) {
eventHandler.handleDazeEffect();
@ -69,13 +69,13 @@ public class ArcheryManager extends SkillManager {
*
* @param event The event to modify.
*/
public void bonusDamage(EntityDamageEvent event) {
public void skillShot(EntityDamageEvent event) {
if (Misc.isNPC(player) || !Permissions.archeryBonus(player)) {
return;
}
if (skillLevel >= Archery.skillShotIncreaseLevel) {
ArcheryBonusDamageEventHandler eventHandler = new ArcheryBonusDamageEventHandler(this, event);
SkillShotEventHandler eventHandler = new SkillShotEventHandler(this, event);
eventHandler.calculateDamageBonus();
eventHandler.modifyEventDamage();

2
src/main/java/com/gmail/nossr50/skills/archery/ArrowTrackingEventHandler.java
View File

@ -18,7 +18,7 @@ public class ArrowTrackingEventHandler {
}
protected void calculateSkillModifier() {
this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Archery.arrowTrackingMaxBonusLevel);
this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Archery.retrieveMaxBonusLevel);
}
protected void addToTracker() {

4
src/main/java/com/gmail/nossr50/skills/archery/ArcheryBonusDamageEventHandler.java → src/main/java/com/gmail/nossr50/skills/archery/SkillShotEventHandler.java
View File

@ -2,13 +2,13 @@ package com.gmail.nossr50.skills.archery;
import org.bukkit.event.entity.EntityDamageEvent;
public class ArcheryBonusDamageEventHandler {
public class SkillShotEventHandler {
private ArcheryManager manager;
private EntityDamageEvent event;
protected double damageBonusPercent;
protected ArcheryBonusDamageEventHandler(ArcheryManager manager, EntityDamageEvent event) {
protected SkillShotEventHandler(ArcheryManager manager, EntityDamageEvent event) {
this.manager = manager;
this.event = event;
}

4
src/main/java/com/gmail/nossr50/skills/axes/Axes.java
View File

@ -46,7 +46,7 @@ public class Axes {
/* Every 50 Skill Levels you gain 1 durability damage (default values) */
int impactIncreaseLevel = advancedConfig.getArmorImpactIncreaseLevel();
float impactMaxDamage = advancedConfig.getArmorImpactMaxDurabilityDamage() / 100F;
double impactMaxDamage = advancedConfig.getArmorImpactMaxDurabilityDamage() / 100F;
short maxDurability;
durabilityDamage += (int) ((double) Users.getProfile(attacker).getSkillLevel(SkillType.AXES) / (double) impactIncreaseLevel);
@ -90,7 +90,7 @@ public class Axes {
if (attacker == null)
return;
final int GREATER_IMPACT_CHANCE = advancedConfig.getGreaterImpactChance();
final double GREATER_IMPACT_CHANCE = advancedConfig.getGreaterImpactChance();
final double GREATER_IMPACT_MULTIPLIER = advancedConfig.getGreaterImpactModifier();
final int GREATER_IMPACT_DAMAGE = advancedConfig.getGreaterImpactBonusDamage();