From c918a1b6d8008773e9beebb48ba1a770405aee20 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 22 Aug 2019 19:54:41 -0400 Subject: Bulk update back to sanity --- .../java/fyresmodjam/misc/ArmorStatTracker.java | 46 +- .../fyresmodjam/misc/BehaviorDispenseTrap.java | 21 +- YWD/src/main/java/fyresmodjam/misc/ConfigData.java | 164 +++---- .../fyresmodjam/misc/CreativeTabModjamMod.java | 16 +- .../fyresmodjam/misc/DamageSourceRetaliation.java | 11 - .../main/java/fyresmodjam/misc/DamageSources.java | 13 +- YWD/src/main/java/fyresmodjam/misc/EntityStat.java | 4 +- .../java/fyresmodjam/misc/EntityStatHelper.java | 521 +++++++-------------- .../java/fyresmodjam/misc/EntityStatTracker.java | 7 +- YWD/src/main/java/fyresmodjam/misc/ItemStat.java | 4 +- .../main/java/fyresmodjam/misc/ItemStatHelper.java | 346 +++++--------- .../java/fyresmodjam/misc/ItemStatTracker.java | 7 +- .../main/java/fyresmodjam/misc/WeaponRankStat.java | 52 +- 13 files changed, 407 insertions(+), 805 deletions(-) delete mode 100644 YWD/src/main/java/fyresmodjam/misc/DamageSourceRetaliation.java (limited to 'YWD/src/main/java/fyresmodjam/misc') diff --git a/YWD/src/main/java/fyresmodjam/misc/ArmorStatTracker.java b/YWD/src/main/java/fyresmodjam/misc/ArmorStatTracker.java index 80a8c2a..89abffa 100755 --- a/YWD/src/main/java/fyresmodjam/misc/ArmorStatTracker.java +++ b/YWD/src/main/java/fyresmodjam/misc/ArmorStatTracker.java @@ -7,23 +7,9 @@ import net.minecraft.item.ItemBow; import net.minecraft.item.ItemStack; public final class ArmorStatTracker extends ItemStat { - public String[][] prefixesByRank = { - { - "Old", "Broken", "Worn", "Weak" - }, { - "Average", "Decent", "Modest", - "Ordinary" - }, { - "Polished", "Tough", "Hardened", - "Durable" - }, { - "Elite", "Astonishing", - "Reinforced", "Resilient" - }, { - "Godly", "Divine", "Fabled", - "Legendary" - } - }; + public String[][] prefixesByRank = { { "Old", "Broken", "Worn", "Weak" }, + { "Average", "Decent", "Modest", "Ordinary" }, { "Polished", "Tough", "Hardened", "Durable" }, + { "Elite", "Astonishing", "Reinforced", "Resilient" }, { "Godly", "Divine", "Fabled", "Legendary" } }; public ArmorStatTracker(String name, Object value) { super(name, value); @@ -42,35 +28,23 @@ public final class ArmorStatTracker extends ItemStat { @Override public void modifyStack(ItemStack stack, Random r) { - int rank = Integer.parseInt( - stack.getTagCompound().getString(name)); + int rank = Integer.parseInt(stack.getTagCompound().getString(name)); float damageReduction = (rank - 1) + r.nextFloat() * 0.5F; - ItemStatHelper.giveStat(stack, "DamageReduction", - String.format("%.2f", damageReduction)); - ItemStatHelper.addLore(stack, !String - .format("%.2f", damageReduction) - .equals("0.00") ? "\u00A77\u00A7o " - + (damageReduction > 0 - ? "+" - : "") - + String.format("%.2f", - damageReduction) - + "% damage reduction" - : null); + ItemStatHelper.giveStat(stack, "DamageReduction", String.format("%.2f", damageReduction)); + ItemStatHelper.addLore(stack, !String.format("%.2f", damageReduction).equals("0.00") ? "\u00A77\u00A7o " + + (damageReduction > 0 ? "+" : "") + String.format("%.2f", damageReduction) + "% damage reduction" + : null); ItemStatHelper.addLore(stack, "\u00A7eRank: " + rank); } @Override public String getAlteredStackName(ItemStack stack, Random r) { - String[] list = prefixesByRank[Integer.parseInt( - stack.getTagCompound().getString(name)) - - 1]; + String[] list = prefixesByRank[Integer.parseInt(stack.getTagCompound().getString(name)) - 1]; String prefix = list[r.nextInt(list.length)]; - if (prefix.equals("Sharp") - && stack.getItem() instanceof ItemBow) { + if (prefix.equals("Sharp") && stack.getItem() instanceof ItemBow) { prefix = "Long"; } diff --git a/YWD/src/main/java/fyresmodjam/misc/BehaviorDispenseTrap.java b/YWD/src/main/java/fyresmodjam/misc/BehaviorDispenseTrap.java index ee06715..f655fd6 100755 --- a/YWD/src/main/java/fyresmodjam/misc/BehaviorDispenseTrap.java +++ b/YWD/src/main/java/fyresmodjam/misc/BehaviorDispenseTrap.java @@ -13,28 +13,21 @@ public class BehaviorDispenseTrap extends BehaviorDefaultDispenseItem { private final BehaviorDefaultDispenseItem field_96465_b = new BehaviorDefaultDispenseItem(); @Override - public ItemStack dispenseStack(IBlockSource par1IBlockSource, - ItemStack par2ItemStack) { + public ItemStack dispenseStack(IBlockSource par1IBlockSource, ItemStack par2ItemStack) { - EnumFacing enumfacing = BlockDispenser.func_149937_b( - par1IBlockSource.getBlockMetadata()); + EnumFacing enumfacing = BlockDispenser.func_149937_b(par1IBlockSource.getBlockMetadata()); World world = par1IBlockSource.getWorld(); - int i = par1IBlockSource.getXInt() - + enumfacing.getFrontOffsetX(); - int j = par1IBlockSource.getYInt() - + enumfacing.getFrontOffsetY(); - int k = par1IBlockSource.getZInt() - + enumfacing.getFrontOffsetZ(); + int i = par1IBlockSource.getXInt() + enumfacing.getFrontOffsetX(); + int j = par1IBlockSource.getYInt() + enumfacing.getFrontOffsetY(); + int k = par1IBlockSource.getZInt() + enumfacing.getFrontOffsetZ(); if (!ModjamMod.blockTrap.canPlaceBlockAt(world, i, j, k)) { - return field_96465_b.dispense(par1IBlockSource, - par2ItemStack); + return field_96465_b.dispense(par1IBlockSource, par2ItemStack); } - world.setBlock(i, j, k, ModjamMod.blockTrap, - par2ItemStack.getItemDamage(), 0); + world.setBlock(i, j, k, ModjamMod.blockTrap, par2ItemStack.getItemDamage(), 0); world.markBlockForUpdate(i, j, k); par2ItemStack.splitStack(1); diff --git a/YWD/src/main/java/fyresmodjam/misc/ConfigData.java b/YWD/src/main/java/fyresmodjam/misc/ConfigData.java index 0d7a328..c43930c 100644 --- a/YWD/src/main/java/fyresmodjam/misc/ConfigData.java +++ b/YWD/src/main/java/fyresmodjam/misc/ConfigData.java @@ -5,6 +5,12 @@ import org.lwjgl.input.Keyboard; import net.minecraftforge.common.config.Configuration; public class ConfigData { + /* + * Categories for config options. + */ + private static final String CTG_WORLDGEN = "worldgen"; + private static final String CTG_MOBS = "mobs"; + /* * Starting ID for achievements */ @@ -13,32 +19,36 @@ public class ConfigData { /* * Keybindings */ - public static int examineKey = Keyboard.KEY_X; - public static int blessingKey = Keyboard.KEY_K; + public static int examineKey = Keyboard.KEY_X; + public static int blessingKey = Keyboard.KEY_K; /* * World generation settings */ + // Pillars - public static int pillarGenChance = 75; - public static int maxPillarsPerChunk = 3; - public static boolean spawnRandomPillars = true; + public static int pillarGenChance = 75; + public static int maxPillarsPerChunk = 3; + public static boolean spawnRandomPillars = true; + // Towers - public static int towerGenChance = 225; - public static boolean spawnTowers = true; + public static int towerGenChance = 225; + public static boolean spawnTowers = true; + // Traps - public static int trapGenChance = 300; - public static boolean spawnTraps = true; - public static boolean trapsBelowGroundOnly = false; + public static int trapGenChance = 300; + public static boolean spawnTraps = true; + public static boolean trapsBelowGroundOnly = false; + // Mushrooms public static int mushroomReplaceChance = 15; /* * Statistic tracking */ - public static boolean enableWeaponKillStats = true; - public static boolean enableMobKillStats = true; - public static boolean enableCraftingStats = true; + public static boolean enableWeaponKillStats = true; + public static boolean enableMobKillStats = true; + public static boolean enableCraftingStats = true; /* * Blessing/Mark parameters @@ -48,93 +58,63 @@ public class ConfigData { /* * Misc. Toggles */ - public static boolean pillarGlow = true; - public static boolean disableDisadvantages = false; - public static boolean versionChecking = true; - public static boolean showAllPillarsInCreative = false; + public static boolean pillarGlow = true; + public static boolean disableDisadvantages = false; + public static boolean versionChecking = true; + public static boolean showAllPillarsInCreative = false; + + /* + * Mob config data + */ + // One in X normal mobs will receive a blessing + public static int diabolicChance = 20; + // A mob of at least this level will receive a blessing + public static int blessingLevel = 5; + // Determines how likely a mob is to be leveled up. Higher is lower + public static int levelupChance = 3; + // A mob gets this percentage of their health additional per level + public static double healthLevelMult = 0.25; + // A mob gets this flat amount on top of their adjusted health, per level + public static int healthLevelFlat = 1; + public static void loadFromConfig(Configuration config) { - pillarGlow = config - .get(Configuration.CATEGORY_GENERAL, - "pillar_glow", - pillarGlow) - .getBoolean(pillarGlow); - - pillarGenChance = config - .get(Configuration.CATEGORY_GENERAL, - "pillar_gen_difficulty", - pillarGenChance) - .getInt(); - maxPillarsPerChunk = config.get( - Configuration.CATEGORY_GENERAL, - "max_pillars_per_chunk", - maxPillarsPerChunk).getInt(); - towerGenChance = config - .get(Configuration.CATEGORY_GENERAL, - "tower_gen_difficulty", - towerGenChance) - .getInt(); - trapGenChance = config - .get(Configuration.CATEGORY_GENERAL, - "trap_gen_difficulty", - trapGenChance) - .getInt(); - mushroomReplaceChance = config.get( - Configuration.CATEGORY_GENERAL, - "mushroom_replace_difficulty", - mushroomReplaceChance).getInt(); - - spawnTraps = !(config - .get(Configuration.CATEGORY_GENERAL, - "disable_traps", - !spawnTraps) - .getBoolean(!spawnTraps)); - spawnTowers = config - .get(Configuration.CATEGORY_GENERAL, - "spawn_towers", - spawnTowers) - .getBoolean(spawnTowers); - spawnRandomPillars = config.get( - Configuration.CATEGORY_GENERAL, - "spawn_random_pillars", - spawnRandomPillars) + diabolicChance = config.get(CTG_MOBS, "diabolic_chance", diabolicChance).getInt(); + blessingLevel = config.get(CTG_MOBS, "blessing_level", diabolicChance).getInt(); + levelupChance = config.get(CTG_MOBS, "levelup_chance", diabolicChance).getInt(); + healthLevelMult = config.get(CTG_MOBS, "health_level_mult", 0).getDouble(); + healthLevelFlat = config.get(CTG_MOBS, "health_level_flat", 0).getInt(); + + pillarGlow = config.get(Configuration.CATEGORY_GENERAL, "pillar_glow", pillarGlow).getBoolean(pillarGlow); + + pillarGenChance = config.get(CTG_WORLDGEN, "pillar_gen_difficulty", pillarGenChance).getInt(); + maxPillarsPerChunk = config.get(CTG_WORLDGEN, "max_pillars_per_chunk", maxPillarsPerChunk).getInt(); + towerGenChance = config.get(CTG_WORLDGEN, "tower_gen_difficulty", towerGenChance).getInt(); + trapGenChance = config.get(CTG_WORLDGEN, "trap_gen_difficulty", trapGenChance).getInt(); + mushroomReplaceChance = config.get(CTG_WORLDGEN, "mushroom_replace_difficulty", mushroomReplaceChance).getInt(); + spawnTraps = !(config.get(CTG_WORLDGEN, "disable_traps", !spawnTraps).getBoolean(!spawnTraps)); + spawnTowers = config.get(CTG_WORLDGEN, "spawn_towers", spawnTowers).getBoolean(spawnTowers); + spawnRandomPillars = config.get(CTG_WORLDGEN, "spawn_random_pillars", spawnRandomPillars) .getBoolean(spawnRandomPillars); - disableDisadvantages = config.get( - Configuration.CATEGORY_GENERAL, - "disable_disadvantages", - disableDisadvantages) + + disableDisadvantages = config.get(Configuration.CATEGORY_GENERAL, "disable_disadvantages", disableDisadvantages) .getBoolean(disableDisadvantages); - versionChecking = config - .get(Configuration.CATEGORY_GENERAL, - "version_checking", - versionChecking) + versionChecking = config.get(Configuration.CATEGORY_GENERAL, "version_checking", versionChecking) .getBoolean(versionChecking); - - showAllPillarsInCreative = config.get( - Configuration.CATEGORY_GENERAL, - "show_all_pillars_in_creative", - showAllPillarsInCreative) + + showAllPillarsInCreative = config + .get(Configuration.CATEGORY_GENERAL, "show_all_pillars_in_creative", showAllPillarsInCreative) .getBoolean(showAllPillarsInCreative); - - enableMobKillStats = config.get( - Configuration.CATEGORY_GENERAL, - "enable_mob_kill_stats", - enableMobKillStats) + + enableMobKillStats = config.get(Configuration.CATEGORY_GENERAL, "enable_mob_kill_stats", enableMobKillStats) .getBoolean(enableMobKillStats); - enableWeaponKillStats = config.get( - Configuration.CATEGORY_GENERAL, - "enable_weapon_kill_stats", - enableWeaponKillStats) + enableWeaponKillStats = config + .get(Configuration.CATEGORY_GENERAL, "enable_weapon_kill_stats", enableWeaponKillStats) .getBoolean(enableWeaponKillStats); - enableCraftingStats = config.get( - Configuration.CATEGORY_GENERAL, - "enable_crafting_stats", - enableCraftingStats) + enableCraftingStats = config.get(Configuration.CATEGORY_GENERAL, "enable_crafting_stats", enableCraftingStats) .getBoolean(enableCraftingStats); - - trapsBelowGroundOnly = config.get( - Configuration.CATEGORY_GENERAL, - "traps_below_ground_only", - trapsBelowGroundOnly) + + trapsBelowGroundOnly = config + .get(Configuration.CATEGORY_GENERAL, "traps_below_ground_only", trapsBelowGroundOnly) .getBoolean(trapsBelowGroundOnly); } } \ No newline at end of file diff --git a/YWD/src/main/java/fyresmodjam/misc/CreativeTabModjamMod.java b/YWD/src/main/java/fyresmodjam/misc/CreativeTabModjamMod.java index 718e9e5..6177ec4 100755 --- a/YWD/src/main/java/fyresmodjam/misc/CreativeTabModjamMod.java +++ b/YWD/src/main/java/fyresmodjam/misc/CreativeTabModjamMod.java @@ -36,23 +36,17 @@ public class CreativeTabModjamMod extends CreativeTabs { for (Field f : ModjamMod.class.getFields()) { if (f.getType() == Item.class) { - Item item = (Item) f.get( - ModjamMod.instance); - if (item == null || item - .getCreativeTab() == null) { + Item item = (Item) f.get(ModjamMod.instance); + if (item == null || item.getCreativeTab() == null) { continue; } item.getSubItems(item, this, list); } else if (f.getType() == Block.class) { - Block block = (Block) f.get( - ModjamMod.instance); - if (block == null || block - .getCreativeTabToDisplayOn() == null) { + Block block = (Block) f.get(ModjamMod.instance); + if (block == null || block.getCreativeTabToDisplayOn() == null) { continue; } - block.getSubBlocks(block.getItem( - null, 0, 0, 0), - this, list); + block.getSubBlocks(block.getItem(null, 0, 0, 0), this, list); } } diff --git a/YWD/src/main/java/fyresmodjam/misc/DamageSourceRetaliation.java b/YWD/src/main/java/fyresmodjam/misc/DamageSourceRetaliation.java deleted file mode 100644 index 2dc89fd..0000000 --- a/YWD/src/main/java/fyresmodjam/misc/DamageSourceRetaliation.java +++ /dev/null @@ -1,11 +0,0 @@ -package fyresmodjam.misc; - -import net.minecraft.util.DamageSource; - -public class DamageSourceRetaliation extends DamageSource { - - public DamageSourceRetaliation(String name) { - super(name); - } - -} diff --git a/YWD/src/main/java/fyresmodjam/misc/DamageSources.java b/YWD/src/main/java/fyresmodjam/misc/DamageSources.java index b1fdc01..754f75b 100644 --- a/YWD/src/main/java/fyresmodjam/misc/DamageSources.java +++ b/YWD/src/main/java/fyresmodjam/misc/DamageSources.java @@ -5,17 +5,18 @@ import net.minecraft.util.DamageSource; public class DamageSources { private static boolean isInitted = false; - public static DamageSource inferno, retaliation; + public static DamageSource inferno; + public static DamageSource retaliation; + public static DamageSource trap; public static void doInit() { if (isInitted) { - inferno = new DamageSource("inferno") - .setDamageBypassesArmor() - .setDamageIsAbsolute(); + inferno = new DamageSource("inferno").setDamageBypassesArmor().setDamageIsAbsolute(); - retaliation = new DamageSource("retaliation") - .setDamageBypassesArmor(); + retaliation = new DamageSource("retaliation").setDamageBypassesArmor(); + trap = new DamageSource("ywdtrap"); + isInitted = true; } } diff --git a/YWD/src/main/java/fyresmodjam/misc/EntityStat.java b/YWD/src/main/java/fyresmodjam/misc/EntityStat.java index 84afd71..d9ff9cf 100755 --- a/YWD/src/main/java/fyresmodjam/misc/EntityStat.java +++ b/YWD/src/main/java/fyresmodjam/misc/EntityStat.java @@ -6,8 +6,8 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; public class EntityStat { - public String name; - public String value; + public String name; + public String value; public EntityStat(String name, String value) { this.name = name; diff --git a/YWD/src/main/java/fyresmodjam/misc/EntityStatHelper.java b/YWD/src/main/java/fyresmodjam/misc/EntityStatHelper.java index 92635b9..ab40a98 100755 --- a/YWD/src/main/java/fyresmodjam/misc/EntityStatHelper.java +++ b/YWD/src/main/java/fyresmodjam/misc/EntityStatHelper.java @@ -31,28 +31,20 @@ import net.minecraftforge.event.entity.living.LivingDeathEvent; @SuppressWarnings("rawtypes") public class EntityStatHelper { - public static String[] knowledge = { - "Clueless", "Novice", "Competent", "Talented", - "Expert", "Professional", "Master", "Legendary" - }; - - public static int[] killCount = { - 0, 10, 25, 50, 100, 250, 500, 1000 - }; - - public static float[] damageBonus = { - 0, 0.01F, 0.025F, 0.05F, 0.075F, 0.1F, 0.15F, 0.2F - }; - public static String[] damageBonusString = { - "0", "1", "2.5", "5", "7.5", "10", "15", "20" - }; + public static String[] knowledge = { "Clueless", "Novice", "Competent", "Talented", "Expert", "Professional", + "Master", "Legendary" }; + + public static int[] killCount = { 0, 10, 25, 50, 100, 250, 500, 1000 }; + + public static float[] damageBonus = { 0, 0.01F, 0.025F, 0.05F, 0.075F, 0.1F, 0.15F, 0.2F }; + public static String[] damageBonusString = { "0", "1", "2.5", "5", "7.5", "10", "15", "20" }; public static HashMap statTrackersByClass = new HashMap(); public static ArrayList genericTrackers = new ArrayList(); - public static ArrayList temp = new ArrayList(); - public static boolean b = false; + public static ArrayList temp = new ArrayList(); + public static boolean b = false; public static void addStatTracker(EntityStatTracker statTracker) { if (statTracker.classes != null) { @@ -69,8 +61,7 @@ public class EntityStatHelper { public static String getStat(Entity entity, String name) { String s = null; - if (entity.getEntityData() != null - && entity.getEntityData().hasKey(name)) { + if (entity.getEntityData() != null && entity.getEntityData().hasKey(name)) { s = entity.getEntityData().getString(name); } @@ -78,8 +69,7 @@ public class EntityStatHelper { } public static String getUnalteredItemName(Item item) { - return StatCollector.translateToLocal( - item.getUnlocalizedName() + ".name"); + return StatCollector.translateToLocal(item.getUnlocalizedName() + ".name"); } public static String getUnalteredName(Entity entity) { @@ -89,23 +79,19 @@ public class EntityStatHelper { s = "generic"; } - return StatCollector - .translateToLocal("entity." + s + ".name"); + return StatCollector.translateToLocal("entity." + s + ".name"); } - public static Entity giveStat(Entity entity, String name, - Object value) { + public static Entity giveStat(Entity entity, String name, Object value) { if (entity != null && name != null && value != null) { - entity.getEntityData().setString(name, - value.toString()); + entity.getEntityData().setString(name, value.toString()); } return entity; } public static boolean hasStat(Entity entity, String name) { - if (entity.getEntityData() != null - && entity.getEntityData().hasKey(name)) { + if (entity.getEntityData() != null && entity.getEntityData().hasKey(name)) { return true; } @@ -121,15 +107,13 @@ public class EntityStatHelper { temp.clear(); if (statTrackersByClass.containsKey(entity.getClass())) { - temp.add(statTrackersByClass - .get(entity.getClass())); + temp.add(statTrackersByClass.get(entity.getClass())); } for (EntityStatTracker e : genericTrackers) { if (!temp.contains(e)) { for (Class c : e.classes) { - if (c.isAssignableFrom(entity - .getClass())) { + if (c.isAssignableFrom(entity.getClass())) { temp.add(e); break; } @@ -138,24 +122,17 @@ public class EntityStatHelper { } if (!temp.isEmpty()) { - String processed = EntityStatHelper.getStat(entity, - "processed"); + String processed = EntityStatHelper.getStat(entity, "processed"); - if (processed == null - || processed.equals("false")) { - EntityStatHelper.giveStat(entity, - "processed", "true"); + if (processed == null || processed.equals("false")) { + EntityStatHelper.giveStat(entity, "processed", "true"); for (EntityStatTracker statTracker : temp) { for (EntityStat s : statTracker.stats) { - giveStat(entity, s.name, s - .getNewValue(r) - .toString()); + giveStat(entity, s.name, s.getNewValue(r).toString()); if (entity instanceof EntityLiving) { - setName((EntityLiving) entity, - s.getAlteredEntityName( - (EntityLiving) entity)); + setName((EntityLiving) entity, s.getAlteredEntityName((EntityLiving) entity)); } s.modifyEntity(entity); @@ -165,20 +142,16 @@ public class EntityStatHelper { } } - public static void setEntitySize(Entity entity, float par1, - float par2) { + public static void setEntitySize(Entity entity, float par1, float par2) { float f2; if (par1 != entity.width || par2 != entity.height) { f2 = entity.width; entity.width = par1; entity.height = par2; - entity.boundingBox.maxX = entity.boundingBox.minX - + entity.width; - entity.boundingBox.maxZ = entity.boundingBox.minZ - + entity.width; - entity.boundingBox.maxY = entity.boundingBox.minY - + entity.height; + entity.boundingBox.maxX = entity.boundingBox.minX + entity.width; + entity.boundingBox.maxZ = entity.boundingBox.minZ + entity.width; + entity.boundingBox.maxY = entity.boundingBox.minY + entity.height; } f2 = par1 % 2.0F; @@ -206,12 +179,10 @@ public class EntityStatHelper { private void addOnKillStats(EntityPlayer player, String mob) { if (!player.getEntityData().hasKey("KillStats")) { - player.getEntityData().setTag("KillStats", - new NBTTagCompound()); + player.getEntityData().setTag("KillStats", new NBTTagCompound()); } - NBTTagCompound killStats = player.getEntityData() - .getCompoundTag("KillStats"); + NBTTagCompound killStats = player.getEntityData().getCompoundTag("KillStats"); if (!killStats.hasKey(mob)) { killStats.setInteger(mob, 0); @@ -219,11 +190,7 @@ public class EntityStatHelper { if (!killStats.hasKey("TrackedMobList")) { killStats.setString("TrackedMobList", mob); } else { - killStats.setString("TrackedMobList", - killStats.getString( - "TrackedMobList") - + ";" - + mob); + killStats.setString("TrackedMobList", killStats.getString("TrackedMobList") + ";" + mob); } } @@ -231,46 +198,29 @@ public class EntityStatHelper { if (ConfigData.enableMobKillStats) { for (int i = 0; i < knowledge.length; i++) { - if (killCount[i] == killStats - .getInteger(mob)) { - NewPacketHandler.SEND_MESSAGE - .sendToPlayer(player, - "\u00A7o\u00A73You've become a " - + knowledge[i].toLowerCase() - + " " - + mob.toLowerCase() - + " slayer! (+" - + damageBonusString[i] - + "% damage against " - + mob.toLowerCase() - + "s.)" - + (i < knowledge.length - - 1 ? " " + (killCount[i + 1] - killCount[i]) + " " + mob.toLowerCase() + " kills to next rank." : "")); + if (killCount[i] == killStats.getInteger(mob)) { + NewPacketHandler.SEND_MESSAGE.sendToPlayer(player, + "\u00A7o\u00A73You've become a " + knowledge[i].toLowerCase() + " " + mob.toLowerCase() + + " slayer! (+" + damageBonusString[i] + "% damage against " + mob.toLowerCase() + + "s.)" + (i < knowledge.length - 1 ? " " + (killCount[i + 1] - killCount[i]) + " " + + mob.toLowerCase() + " kills to next rank." : "")); break; } } int count = 0; - if (killStats.hasKey("TrackedMobList") && killStats - .getString("TrackedMobList") != null - && killStats.getString( - "TrackedMobList") - .length() > 0) { - for (String object : killStats.getString( - "TrackedMobList") - .split(";")) { - if (killStats.hasKey(object) - && killStats.getInteger( - object) >= killCount[2]) { + if (killStats.hasKey("TrackedMobList") && killStats.getString("TrackedMobList") != null + && killStats.getString("TrackedMobList").length() > 0) { + for (String object : killStats.getString("TrackedMobList").split(";")) { + if (killStats.hasKey(object) && killStats.getInteger(object) >= killCount[2]) { count++; } } } if (count >= 5) { - player.triggerAchievement( - ModjamMod.theHunt); + player.triggerAchievement(ModjamMod.theHunt); } } @@ -279,168 +229,106 @@ public class EntityStatHelper { if (player.getHeldItem() == null) { weapon = "fist"; } else if (player.getHeldItem().getItem() != null) { - weapon = getUnalteredItemName( - player.getHeldItem().getItem()); + weapon = getUnalteredItemName(player.getHeldItem().getItem()); } if (!player.getEntityData().hasKey("WeaponStats")) { - player.getEntityData().setTag("WeaponStats", - new NBTTagCompound()); + player.getEntityData().setTag("WeaponStats", new NBTTagCompound()); } - NBTTagCompound weaponStats = player.getEntityData() - .getCompoundTag("WeaponStats"); + NBTTagCompound weaponStats = player.getEntityData().getCompoundTag("WeaponStats"); if (!weaponStats.hasKey(weapon)) { weaponStats.setInteger(weapon, 0); if (!weaponStats.hasKey("TrackedItemList")) { - weaponStats.setString("TrackedItemList", - weapon); + weaponStats.setString("TrackedItemList", weapon); } else { - weaponStats.setString("TrackedItemList", - weaponStats.getString( - "TrackedItemList") - + ";" - + weapon); + weaponStats.setString("TrackedItemList", weaponStats.getString("TrackedItemList") + ";" + weapon); } } - weaponStats.setInteger(weapon, - weaponStats.getInteger(weapon) + 1); + weaponStats.setInteger(weapon, weaponStats.getInteger(weapon) + 1); if (ConfigData.enableWeaponKillStats) { for (int i = 0; i < knowledge.length; i++) { - if (killCount[i] * 2 == weaponStats - .getInteger(weapon)) { - NewPacketHandler.SEND_MESSAGE - .sendToPlayer(player, - "\u00A7o\u00A73You've become a " - + knowledge[i].toLowerCase() - + " " - + weapon.toLowerCase() - + " user! (+" - + damageBonusString[i] - + "% damage with " - + weapon.toLowerCase() - + "s.)" - + (i < knowledge.length - - 1 ? " " + (killCount[i + 1] * 2 - killCount[i] * 2) + " " + weapon.toLowerCase() + " kills to next rank." : "")); + if (killCount[i] * 2 == weaponStats.getInteger(weapon)) { + NewPacketHandler.SEND_MESSAGE.sendToPlayer(player, + "\u00A7o\u00A73You've become a " + knowledge[i].toLowerCase() + " " + weapon.toLowerCase() + + " user! (+" + damageBonusString[i] + "% damage with " + weapon.toLowerCase() + + "s.)" + + (i < knowledge.length - 1 ? " " + (killCount[i + 1] * 2 - killCount[i] * 2) + " " + + weapon.toLowerCase() + " kills to next rank." : "")); break; } } int count = 0; - if (weaponStats.hasKey("TrackedItemList") - && weaponStats.getString( - "TrackedItemList") != null - && weaponStats.getString( - "TrackedItemList") - .length() > 0) { - for (String object : weaponStats.getString( - "TrackedItemList") - .split(";")) { - if (weaponStats.hasKey(object) - && weaponStats.getInteger( - object) >= killCount[1] - * 2) { + if (weaponStats.hasKey("TrackedItemList") && weaponStats.getString("TrackedItemList") != null + && weaponStats.getString("TrackedItemList").length() > 0) { + for (String object : weaponStats.getString("TrackedItemList").split(";")) { + if (weaponStats.hasKey(object) && weaponStats.getInteger(object) >= killCount[1] * 2) { count++; } } } if (count >= 10) { - player.triggerAchievement( - ModjamMod.jackOfAllTrades); + player.triggerAchievement(ModjamMod.jackOfAllTrades); } } } private void addPlayerStats(EntityJoinWorldEvent event) { if (!event.entity.getEntityData().hasKey("Blessing") - && CommonTickHandler.worldData.blessingByPlayer - .containsKey(event.entity - .getCommandSenderName())) { + && CommonTickHandler.worldData.blessingByPlayer.containsKey(event.entity.getCommandSenderName())) { event.entity.getEntityData().setString("Blessing", - CommonTickHandler.worldData.blessingByPlayer - .get(event.entity - .getCommandSenderName())); - - NewPacketHandler.UPDATE_BLESSING.sendToPlayer( - (EntityPlayer) event.entity, - event.entity.getEntityData() - .getString("Blessing")); - - CommonTickHandler.worldData.blessingByPlayer - .remove(event.entity - .getCommandSenderName()); + CommonTickHandler.worldData.blessingByPlayer.get(event.entity.getCommandSenderName())); + + NewPacketHandler.UPDATE_BLESSING.sendToPlayer((EntityPlayer) event.entity, + event.entity.getEntityData().getString("Blessing")); + + CommonTickHandler.worldData.blessingByPlayer.remove(event.entity.getCommandSenderName()); CommonTickHandler.worldData.markDirty(); } if (!event.entity.getEntityData().hasKey("PotionKnowledge") && CommonTickHandler.worldData.potionKnowledgeByPlayer - .containsKey(event.entity - .getCommandSenderName())) { - event.entity.getEntityData().setIntArray( - "PotionKnowledge", - CommonTickHandler.worldData.potionKnowledgeByPlayer - .get(event.entity - .getCommandSenderName())); - - NewPacketHandler.UPDATE_POTION_KNOWLEDGE - .sendToPlayer((EntityPlayer) event.entity, - event.entity.getEntityData() - .getIntArray("PotionKnowledge")); - - CommonTickHandler.worldData.potionKnowledgeByPlayer - .remove(event.entity - .getCommandSenderName()); + .containsKey(event.entity.getCommandSenderName())) { + event.entity.getEntityData().setIntArray("PotionKnowledge", + CommonTickHandler.worldData.potionKnowledgeByPlayer.get(event.entity.getCommandSenderName())); + + NewPacketHandler.UPDATE_POTION_KNOWLEDGE.sendToPlayer((EntityPlayer) event.entity, + event.entity.getEntityData().getIntArray("PotionKnowledge")); + + CommonTickHandler.worldData.potionKnowledgeByPlayer.remove(event.entity.getCommandSenderName()); CommonTickHandler.worldData.markDirty(); } if (!event.entity.getEntityData().hasKey("KillStats") - && CommonTickHandler.worldData.killStatsByPlayer - .containsKey(event.entity - .getCommandSenderName())) { + && CommonTickHandler.worldData.killStatsByPlayer.containsKey(event.entity.getCommandSenderName())) { event.entity.getEntityData().setTag("KillStats", - CommonTickHandler.worldData.killStatsByPlayer - .get(event.entity - .getCommandSenderName())); + CommonTickHandler.worldData.killStatsByPlayer.get(event.entity.getCommandSenderName())); - CommonTickHandler.worldData.killStatsByPlayer - .remove(event.entity - .getCommandSenderName()); + CommonTickHandler.worldData.killStatsByPlayer.remove(event.entity.getCommandSenderName()); CommonTickHandler.worldData.markDirty(); } if (!event.entity.getEntityData().hasKey("WeaponStats") - && CommonTickHandler.worldData.weaponStatsByPlayer - .containsKey(event.entity - .getCommandSenderName())) { + && CommonTickHandler.worldData.weaponStatsByPlayer.containsKey(event.entity.getCommandSenderName())) { event.entity.getEntityData().setTag("WeaponStats", - CommonTickHandler.worldData.weaponStatsByPlayer - .get(event.entity - .getCommandSenderName())); + CommonTickHandler.worldData.weaponStatsByPlayer.get(event.entity.getCommandSenderName())); - CommonTickHandler.worldData.killStatsByPlayer - .remove(event.entity - .getCommandSenderName()); + CommonTickHandler.worldData.killStatsByPlayer.remove(event.entity.getCommandSenderName()); CommonTickHandler.worldData.markDirty(); } if (!event.entity.getEntityData().hasKey("CraftingStats") - && CommonTickHandler.worldData.craftingStatsByPlayer - .containsKey(event.entity - .getCommandSenderName())) { - event.entity.getEntityData().setTag( - "CraftingStats", - CommonTickHandler.worldData.craftingStatsByPlayer - .get(event.entity - .getCommandSenderName())); - - CommonTickHandler.worldData.craftingStatsByPlayer - .remove(event.entity - .getCommandSenderName()); + && CommonTickHandler.worldData.craftingStatsByPlayer.containsKey(event.entity.getCommandSenderName())) { + event.entity.getEntityData().setTag("CraftingStats", + CommonTickHandler.worldData.craftingStatsByPlayer.get(event.entity.getCommandSenderName())); + + CommonTickHandler.worldData.craftingStatsByPlayer.remove(event.entity.getCommandSenderName()); CommonTickHandler.worldData.markDirty(); } } @@ -448,83 +336,58 @@ public class EntityStatHelper { private void advanceKillTaskProgress(LivingDeathEvent event) { CommonTickHandler.worldData.progress++; - String name1 = CommonTickHandler.worldData.currentTask - .equals("Kill") ? FyresWorldData.validMobNames[CommonTickHandler.worldData.currentTaskID] - : FyresWorldData.validItems[CommonTickHandler.worldData.currentTaskID] - .getDisplayName(); + String name1 = CommonTickHandler.worldData.currentTask.equals("Kill") + ? FyresWorldData.validMobNames[CommonTickHandler.worldData.currentTaskID] + : FyresWorldData.validItems[CommonTickHandler.worldData.currentTaskID].getDisplayName(); if (name1.contains("Block")) { if (name1.contains("Block")) { - name1 = name1.replace("Block", "Blocks") - .replace("block", - "blocks"); + name1 = name1.replace("Block", "Blocks").replace("block", "blocks"); } } else { name1 += "s"; } - NewPacketHandler.SEND_MESSAGE.sendToAllPlayers( - "\u00A7fCurrent Goal Progress: " - + CommonTickHandler.worldData.progress - + "/" - + CommonTickHandler.worldData.currentTaskAmount - + " " + name1 + " " - + CommonTickHandler.worldData.currentTask - + "ed."); + NewPacketHandler.SEND_MESSAGE.sendToAllPlayers("\u00A7fCurrent Goal Progress: " + + CommonTickHandler.worldData.progress + "/" + CommonTickHandler.worldData.currentTaskAmount + " " + + name1 + " " + CommonTickHandler.worldData.currentTask + "ed."); if (CommonTickHandler.worldData.progress >= CommonTickHandler.worldData.currentTaskAmount) { CommonTickHandler.worldData.progress = 0; CommonTickHandler.worldData.tasksCompleted++; - NewPacketHandler.LEVEL_UP.sendToAllPlayers( - CommonTickHandler.worldData.rewardLevels); + NewPacketHandler.LEVEL_UP.sendToAllPlayers(CommonTickHandler.worldData.rewardLevels); - if (!CommonTickHandler.worldData.enderDragonKilled - && event.entity instanceof EntityDragon) { + if (!CommonTickHandler.worldData.enderDragonKilled && event.entity instanceof EntityDragon) { CommonTickHandler.worldData.enderDragonKilled = true; } CommonTickHandler.worldData.giveNewTask(); - NewPacketHandler.SEND_MESSAGE.sendToAllPlayers( - "\u00A7eA world goal has been completed!" - + (!CommonTickHandler.worldData - .getDisadvantage() - .equals("None") ? " World disadvantage has been lifted!" - : "")); + NewPacketHandler.SEND_MESSAGE.sendToAllPlayers("\u00A7eA world goal has been completed!" + + (!CommonTickHandler.worldData.getDisadvantage().equals("None") + ? " World disadvantage has been lifted!" + : "")); NewPacketHandler.SEND_MESSAGE.sendToAllPlayers( - "\u00A7eA new world goal has been set: " - + (CommonTickHandler.worldData.currentTask - + " " - + CommonTickHandler.worldData.currentTaskAmount - + " " - + (CommonTickHandler.worldData.currentTask - .equals("Kill") ? FyresWorldData.validMobNames[CommonTickHandler.worldData.currentTaskID] - : FyresWorldData.validItems[CommonTickHandler.worldData.currentTaskID] - .getDisplayName()) - + "s. (" - + CommonTickHandler.worldData.progress - + " " - + CommonTickHandler.worldData.currentTask - + "ed)")); + "\u00A7eA new world goal has been set: " + (CommonTickHandler.worldData.currentTask + " " + + CommonTickHandler.worldData.currentTaskAmount + " " + + (CommonTickHandler.worldData.currentTask.equals("Kill") + ? FyresWorldData.validMobNames[CommonTickHandler.worldData.currentTaskID] + : FyresWorldData.validItems[CommonTickHandler.worldData.currentTaskID] + .getDisplayName()) + + "s. (" + CommonTickHandler.worldData.progress + " " + + CommonTickHandler.worldData.currentTask + "ed)")); CommonTickHandler.worldData.currentDisadvantage = "None"; } - NewPacketHandler.UPDATE_WORLD_DATA.sendToAllPlayers( - CommonTickHandler.worldData.potionValues, - CommonTickHandler.worldData.potionDurations, - CommonTickHandler.worldData - .getDisadvantage(), - CommonTickHandler.worldData.currentTask, - CommonTickHandler.worldData.currentTaskID, - CommonTickHandler.worldData.currentTaskAmount, - CommonTickHandler.worldData.progress, - CommonTickHandler.worldData.tasksCompleted, - CommonTickHandler.worldData.enderDragonKilled, - ConfigData.spawnTraps, - CommonTickHandler.worldData.rewardLevels, + NewPacketHandler.UPDATE_WORLD_DATA.sendToAllPlayers(CommonTickHandler.worldData.potionValues, + CommonTickHandler.worldData.potionDurations, CommonTickHandler.worldData.getDisadvantage(), + CommonTickHandler.worldData.currentTask, CommonTickHandler.worldData.currentTaskID, + CommonTickHandler.worldData.currentTaskAmount, CommonTickHandler.worldData.progress, + CommonTickHandler.worldData.tasksCompleted, CommonTickHandler.worldData.enderDragonKilled, + ConfigData.spawnTraps, CommonTickHandler.worldData.rewardLevels, CommonTickHandler.worldData.mushroomColors); CommonTickHandler.worldData.markDirty(); @@ -536,19 +399,13 @@ public class EntityStatHelper { Entity entityNew = null; try { - Constructor[] constructors = event.entity - .getClass().getConstructors(); + Constructor[] constructors = event.entity.getClass().getConstructors(); for (int i = 0; i < constructors.length; i++) { - Class[] parameters = constructors[i] - .getParameterTypes(); - - if (parameters.length == 1 && parameters[0] - .equals(World.class)) { - entityNew = (Entity) event.entity - .getClass() - .getConstructors()[i] - .newInstance(event.world); + Class[] parameters = constructors[i].getParameterTypes(); + + if (parameters.length == 1 && parameters[0].equals(World.class)) { + entityNew = (Entity) event.entity.getClass().getConstructors()[i].newInstance(event.world); } } @@ -557,14 +414,10 @@ public class EntityStatHelper { } if (entityNew != null) { - entityNew.setLocationAndAngles(event.entity.posX, - event.entity.posY, - event.entity.posZ, - event.entity.rotationYaw, - event.entity.rotationPitch); + entityNew.setLocationAndAngles(event.entity.posX, event.entity.posY, event.entity.posZ, + event.entity.rotationYaw, event.entity.rotationPitch); - entityNew.getEntityData().setBoolean("isClone", - true); + entityNew.getEntityData().setBoolean("isClone", true); entityNew.dimension = event.entity.dimension; @@ -590,16 +443,14 @@ public class EntityStatHelper { } private void handleBlessings(LivingDeathEvent event) { - String blessing = event.source.getEntity().getEntityData() - .getString("Blessing"); + String blessing = event.source.getEntity().getEntityData().getString("Blessing"); BlessingUtils.getBlessingInstance(blessing).onMobKill(event); } private boolean isEntityClone(EntityJoinWorldEvent event) { if (event.entity.getEntityData().hasKey("isClone")) { - return event.entity.getEntityData() - .getBoolean("isClone"); + return event.entity.getEntityData().getBoolean("isClone"); } else { return false; } @@ -609,12 +460,9 @@ public class EntityStatHelper { @SubscribeEvent public void livingDeath(LivingDeathEvent event) { if (!event.entity.worldObj.isRemote) { - if (event.entity.worldObj.getGameRules() - .getGameRuleBooleanValue( - "doMobLoot")) { + if (event.entity.worldObj.getGameRules().getGameRuleBooleanValue("doMobLoot")) { - if (event.entity instanceof EntityLivingBase - && event.source != null + if (event.entity instanceof EntityLivingBase && event.source != null && event.source.getEntity() != null) { if (BlessingUtils.hasBlessing(event.source.getEntity())) { handleBlessings(event); @@ -623,51 +471,31 @@ public class EntityStatHelper { int level = 0; - if (event.entity.getEntityData() - .hasKey("Level")) { - level = Integer.parseInt( - event.entity.getEntityData() - .getString("Level")); + if (event.entity.getEntityData().hasKey("Level")) { + level = Integer.parseInt(event.entity.getEntityData().getString("Level")); } - if (ModjamMod.r.nextInt(30) == 0 - || level == 5) { - event.entity.entityDropItem( - new ItemStack(ModjamMod.mysteryPotion, - 1, - ModjamMod.r.nextInt( - 13)), - event.entity.height - / 2); + if (ModjamMod.r.nextInt(30) == 0 || level == 5) { + event.entity.entityDropItem(new ItemStack(ModjamMod.mysteryPotion, 1, ModjamMod.r.nextInt(13)), + event.entity.height / 2); } } - if (CommonTickHandler.worldData.currentTask - .equals("Kill") + if (CommonTickHandler.worldData.currentTask.equals("Kill") && FyresWorldData.validMobs[CommonTickHandler.worldData.currentTaskID] - .isAssignableFrom( - event.entity.getClass())) { + .isAssignableFrom(event.entity.getClass())) { advanceKillTaskProgress(event); } - if (!CommonTickHandler.worldData.enderDragonKilled - && event.entity instanceof EntityDragon) { + if (!CommonTickHandler.worldData.enderDragonKilled && event.entity instanceof EntityDragon) { CommonTickHandler.worldData.enderDragonKilled = true; - NewPacketHandler.UPDATE_WORLD_DATA - .sendToAllPlayers( - CommonTickHandler.worldData.potionValues, - CommonTickHandler.worldData.potionDurations, - CommonTickHandler.worldData - .getDisadvantage(), - CommonTickHandler.worldData.currentTask, - CommonTickHandler.worldData.currentTaskID, - CommonTickHandler.worldData.currentTaskAmount, - CommonTickHandler.worldData.progress, - CommonTickHandler.worldData.tasksCompleted, - CommonTickHandler.worldData.enderDragonKilled, - ConfigData.spawnTraps, - CommonTickHandler.worldData.rewardLevels, - CommonTickHandler.worldData.mushroomColors); + NewPacketHandler.UPDATE_WORLD_DATA.sendToAllPlayers(CommonTickHandler.worldData.potionValues, + CommonTickHandler.worldData.potionDurations, CommonTickHandler.worldData.getDisadvantage(), + CommonTickHandler.worldData.currentTask, CommonTickHandler.worldData.currentTaskID, + CommonTickHandler.worldData.currentTaskAmount, CommonTickHandler.worldData.progress, + CommonTickHandler.worldData.tasksCompleted, CommonTickHandler.worldData.enderDragonKilled, + ConfigData.spawnTraps, CommonTickHandler.worldData.rewardLevels, + CommonTickHandler.worldData.mushroomColors); CommonTickHandler.worldData.markDirty(); } } @@ -677,56 +505,33 @@ public class EntityStatHelper { player.triggerAchievement(ModjamMod.losingIsFun); - CommonTickHandler.worldData.blessingByPlayer.put( - player.getCommandSenderName(), - player.getEntityData().getString( - "Blessing")); - - CommonTickHandler.worldData.potionKnowledgeByPlayer - .put(player.getCommandSenderName(), - player.getEntityData() - .getIntArray("PotionKnowledge")); - - if (player.getEntityData() != null - && player.getEntityData().hasKey( - "KillStats")) { - CommonTickHandler.worldData.killStatsByPlayer - .put(player.getCommandSenderName(), - player.getEntityData() - .getCompoundTag("KillStats")); + CommonTickHandler.worldData.blessingByPlayer.put(player.getCommandSenderName(), + player.getEntityData().getString("Blessing")); + + CommonTickHandler.worldData.potionKnowledgeByPlayer.put(player.getCommandSenderName(), + player.getEntityData().getIntArray("PotionKnowledge")); + + if (player.getEntityData() != null && player.getEntityData().hasKey("KillStats")) { + CommonTickHandler.worldData.killStatsByPlayer.put(player.getCommandSenderName(), + player.getEntityData().getCompoundTag("KillStats")); } - if (player.getEntityData() != null - && player.getEntityData().hasKey( - "WeaponStats")) { - CommonTickHandler.worldData.weaponStatsByPlayer - .put(player.getCommandSenderName(), - player.getEntityData() - .getCompoundTag("WeaponStats")); + if (player.getEntityData() != null && player.getEntityData().hasKey("WeaponStats")) { + CommonTickHandler.worldData.weaponStatsByPlayer.put(player.getCommandSenderName(), + player.getEntityData().getCompoundTag("WeaponStats")); } - if (player.getEntityData() != null - && player.getEntityData().hasKey( - "CraftingStats")) { - CommonTickHandler.worldData.craftingStatsByPlayer - .put(player.getCommandSenderName(), - player.getEntityData() - .getCompoundTag("CraftingStats")); + if (player.getEntityData() != null && player.getEntityData().hasKey("CraftingStats")) { + CommonTickHandler.worldData.craftingStatsByPlayer.put(player.getCommandSenderName(), + player.getEntityData().getCompoundTag("CraftingStats")); } - } else if (event.source != null - && event.source.getEntity() != null + } else if (event.source != null && event.source.getEntity() != null && event.source.getEntity() instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.source - .getEntity(); + EntityPlayer player = (EntityPlayer) event.source.getEntity(); String mob = getUnalteredName(event.entity); - if (CommonTickHandler.worldData.getDisadvantage() - .equals("Trigger-happy") - && ModjamMod.r.nextInt(10) == 0) { - player.worldObj.createExplosion(player, - event.entity.posX, - event.entity.posY, - event.entity.posZ, 1, + if (CommonTickHandler.worldData.getDisadvantage().equals("Trigger-happy") && ModjamMod.r.nextInt(10) == 0) { + player.worldObj.createExplosion(player, event.entity.posX, event.entity.posY, event.entity.posZ, 1, true); } @@ -738,14 +543,10 @@ public class EntityStatHelper { MinecraftForge.EVENT_BUS.register(this); } - private boolean shouldCloneMob(EntityJoinWorldEvent event, - boolean isClone) { + private boolean shouldCloneMob(EntityJoinWorldEvent event, boolean isClone) { return CommonTickHandler.worldData != null - && CommonTickHandler.worldData - .getDisadvantage() - .equals("Increased Mob Spawn") - && (event.entity instanceof EntityMob) - && !(event.entity instanceof EntityDragon) - && !isClone && ModjamMod.r.nextInt(3) == 0; + && CommonTickHandler.worldData.getDisadvantage().equals("Increased Mob Spawn") + && (event.entity instanceof EntityMob) && !(event.entity instanceof EntityDragon) && !isClone + && ModjamMod.r.nextInt(3) == 0; } } diff --git a/YWD/src/main/java/fyresmodjam/misc/EntityStatTracker.java b/YWD/src/main/java/fyresmodjam/misc/EntityStatTracker.java index f059141..1509d59 100755 --- a/YWD/src/main/java/fyresmodjam/misc/EntityStatTracker.java +++ b/YWD/src/main/java/fyresmodjam/misc/EntityStatTracker.java @@ -7,16 +7,13 @@ public class EntityStatTracker { public boolean instanceAllowed = false; - public EntityStatTracker(Class[] classes, - boolean instancesAllowed) { + public EntityStatTracker(Class[] classes, boolean instancesAllowed) { this.classes = classes; instanceAllowed = instancesAllowed; } public EntityStatTracker(Class c, boolean instancesAllowed) { - this(new Class[] { - c - }, instancesAllowed); + this(new Class[] { c }, instancesAllowed); } public ArrayList stats = new ArrayList(); diff --git a/YWD/src/main/java/fyresmodjam/misc/ItemStat.java b/YWD/src/main/java/fyresmodjam/misc/ItemStat.java index 888a34c..dccb01d 100755 --- a/YWD/src/main/java/fyresmodjam/misc/ItemStat.java +++ b/YWD/src/main/java/fyresmodjam/misc/ItemStat.java @@ -5,8 +5,8 @@ import java.util.Random; import net.minecraft.item.ItemStack; public class ItemStat { - public String name; - public String value; + public String name; + public String value; public ItemStat(String name, Object value) { this.name = name; diff --git a/YWD/src/main/java/fyresmodjam/misc/ItemStatHelper.java b/YWD/src/main/java/fyresmodjam/misc/ItemStatHelper.java index 352fc76..701aeb3 100755 --- a/YWD/src/main/java/fyresmodjam/misc/ItemStatHelper.java +++ b/YWD/src/main/java/fyresmodjam/misc/ItemStatHelper.java @@ -2,16 +2,19 @@ package fyresmodjam.misc; import java.util.ArrayList; import java.util.HashMap; +import java.util.Map.Entry; import java.util.Random; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; +import fyresmodjam.blessings.Blessing; import fyresmodjam.blessings.BlessingUtils; import fyresmodjam.handlers.NewPacketHandler; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemBow; import net.minecraft.item.ItemStack; @@ -22,6 +25,7 @@ import net.minecraft.nbt.NBTTagString; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.event.entity.player.PlayerDropsEvent; +import tconstruct.library.tools.ToolCore; @SuppressWarnings("rawtypes") public class ItemStatHelper { @@ -35,12 +39,10 @@ public class ItemStatHelper { if (statTracker.classes != null) { for (Class c : statTracker.classes) { if (!statTrackersByClass.containsKey(c)) { - statTrackersByClass.put(c, - new ArrayList()); + statTrackersByClass.put(c, new ArrayList()); } - statTrackersByClass.get(c) - .add(statTracker); + statTrackersByClass.get(c).add(statTracker); } } @@ -49,8 +51,7 @@ public class ItemStatHelper { } } - public static ItemStack giveStat(ItemStack stack, String name, - Object value) { + public static ItemStack giveStat(ItemStack stack, String name, Object value) { if (!stack.hasTagCompound()) { stack.setTagCompound(new NBTTagCompound()); } @@ -66,12 +67,10 @@ public class ItemStatHelper { } if (!stack.getTagCompound().hasKey("display")) { - stack.getTagCompound().setTag("display", - new NBTTagCompound()); + stack.getTagCompound().setTag("display", new NBTTagCompound()); } - stack.getTagCompound().getCompoundTag("display") - .setString("Name", name); + stack.getTagCompound().getCompoundTag("display").setString("Name", name); return stack; } @@ -82,36 +81,25 @@ public class ItemStatHelper { } if (!stack.getTagCompound().hasKey("display")) { - stack.getTagCompound().setTag("display", - new NBTTagCompound()); + stack.getTagCompound().setTag("display", new NBTTagCompound()); } - if (!stack.getTagCompound().getCompoundTag("display") - .hasKey("Lore")) { - stack.getTagCompound().getCompoundTag("display") - .setTag("Lore", new NBTTagList()); + if (!stack.getTagCompound().getCompoundTag("display").hasKey("Lore")) { + stack.getTagCompound().getCompoundTag("display").setTag("Lore", new NBTTagList()); } if (lore != null) { - ((NBTTagList) stack.getTagCompound() - .getCompoundTag("display") - .getTag("Lore")).appendTag( - new NBTTagString( - lore)); + ((NBTTagList) stack.getTagCompound().getCompoundTag("display").getTag("Lore")) + .appendTag(new NBTTagString(lore)); } return stack; } public static String getName(ItemStack stack) { - if (stack.getTagCompound() != null - && stack.getTagCompound().hasKey("display") - && stack.getTagCompound() - .getCompoundTag("display") - .hasKey("Name")) { - return stack.getTagCompound() - .getCompoundTag("display") - .getString("Name"); + if (stack.getTagCompound() != null && stack.getTagCompound().hasKey("display") + && stack.getTagCompound().getCompoundTag("display").hasKey("Name")) { + return stack.getTagCompound().getCompoundTag("display").getString("Name"); } return null; @@ -119,8 +107,7 @@ public class ItemStatHelper { public static String getStat(ItemStack stack, String name) { String s = null; - if (stack.getTagCompound() != null - && stack.getTagCompound().hasKey(name)) { + if (stack.getTagCompound() != null && stack.getTagCompound().hasKey(name)) { s = stack.getTagCompound().getString(name); } @@ -128,8 +115,7 @@ public class ItemStatHelper { } public static boolean hasStat(ItemStack stack, String name) { - if (stack.getTagCompound() != null - && stack.getTagCompound().hasKey(name)) { + if (stack.getTagCompound() != null && stack.getTagCompound().hasKey(name)) { return true; } @@ -139,6 +125,12 @@ public class ItemStatHelper { @SubscribeEvent public void playerDrops(PlayerDropsEvent event) { if (!event.entity.worldObj.isRemote) { + if (BlessingUtils.hasBlessing(event.entity)) { + Blessing blesz = BlessingUtils.getBlessingInstance(event.entity); + + blesz.onPlayerDrops(event); + } + if (BlessingUtils.hasDisadvantage("Permadeath")) { event.setCanceled(true); } @@ -151,19 +143,14 @@ public class ItemStatHelper { float damageMultiplier = 1.0F; try { - damageMultiplier = handlePlayerWeakening( - event, damageMultiplier); + damageMultiplier = handlePlayerWeakening(event, damageMultiplier); } catch (NullPointerException npex) { damageMultiplier = 1.0F; } if (BlessingUtils.hasBlessing(event.entity)) { - damageMultiplier = BlessingUtils - .getBlessingInstance( - BlessingUtils.getBlessing( - event.entity)) - .onIncomingDamage(event, - damageMultiplier); + damageMultiplier = BlessingUtils.getBlessingInstance(BlessingUtils.getBlessing(event.entity)) + .onIncomingDamage(event, damageMultiplier); } if (event.isCanceled()) { @@ -173,60 +160,33 @@ public class ItemStatHelper { if (event.entity instanceof EntityLivingBase) { EntityLivingBase entity = (EntityLivingBase) event.entity; - damageMultiplier = getArmorReduction( - damageMultiplier, entity); + damageMultiplier = getArmorReduction(damageMultiplier, entity); } - if (event.source != null && event.source - .getEntity() != null) { + if (event.source != null && event.source.getEntity() != null) { if (event.source.getEntity() instanceof EntityLivingBase) { handleWeaponDamage(event); } - String mob = EntityStatHelper - .getUnalteredName( - event.entity); - - if (ConfigData.enableMobKillStats - && event.source.getEntity() instanceof EntityPlayer - && event.source.getEntity() - .getEntityData() - .hasKey("KillStats") - && event.source.getEntity() - .getEntityData() - .getCompoundTag("KillStats") - .hasKey(mob)) { - damageMultiplier = handleMobKnowledgeBonus( - event, - damageMultiplier, - mob); + String mob = EntityStatHelper.getUnalteredName(event.entity); + + if (ConfigData.enableMobKillStats && event.source.getEntity() instanceof EntityPlayer + && event.source.getEntity().getEntityData().hasKey("KillStats") + && event.source.getEntity().getEntityData().getCompoundTag("KillStats").hasKey(mob)) { + damageMultiplier = handleMobKnowledgeBonus(event, damageMultiplier, mob); } String weapon = "misc"; - if (ConfigData.enableWeaponKillStats - && event.source.getEntity() instanceof EntityPlayer - && event.source.getEntity() - .getEntityData() - .hasKey("WeaponStats") - && event.source.getEntity() - .getEntityData() - .getCompoundTag("WeaponStats") - .hasKey(weapon)) { - damageMultiplier = handleWeaponKnowledgeBonus( - event, - damageMultiplier, - weapon); + if (ConfigData.enableWeaponKillStats && event.source.getEntity() instanceof EntityPlayer + && event.source.getEntity().getEntityData().hasKey("WeaponStats") + && event.source.getEntity().getEntityData().getCompoundTag("WeaponStats").hasKey(weapon)) { + damageMultiplier = handleWeaponKnowledgeBonus(event, damageMultiplier, weapon); } - if (BlessingUtils.hasBlessing(event.source - .getEntity())) { + if (BlessingUtils.hasBlessing(event.source.getEntity())) { damageMultiplier = BlessingUtils - .getBlessingInstance( - BlessingUtils.getBlessing( - event.source.getEntity())) - .onOutgoingDamage( - event, - damageMultiplier); + .getBlessingInstance(BlessingUtils.getBlessing(event.source.getEntity())) + .onOutgoingDamage(event, damageMultiplier); } } @@ -234,35 +194,24 @@ public class ItemStatHelper { return; } - if (event.ammount < event.entityLiving - .getHealth()) { - event.ammount = (float) Math.max(0.5, - event.ammount * damageMultiplier); + if (event.ammount < event.entityLiving.getHealth()) { + event.ammount = (float) Math.max(0.5, event.ammount * damageMultiplier); } } } - private float handleWeaponKnowledgeBonus(LivingHurtEvent event, - float damageMultiplier, String weapon) { - EntityPlayer player = (EntityPlayer) event.source - .getEntity(); + private float handleWeaponKnowledgeBonus(LivingHurtEvent event, float damageMultiplier, String weapon) { + EntityPlayer player = (EntityPlayer) event.source.getEntity(); if (player.getHeldItem() == null) { weapon = "fist"; - } else if (player.getHeldItem().getItem() != null && player - .getHeldItem() - .getItem() instanceof ItemSword - || player.getHeldItem() - .getItem() instanceof ItemBow - || player.getHeldItem() - .getItem() instanceof ItemAxe) { - weapon = EntityStatHelper.getUnalteredItemName( - player.getHeldItem().getItem()); + } else if (player.getHeldItem().getItem() != null && player.getHeldItem().getItem() instanceof ItemSword + || player.getHeldItem().getItem() instanceof ItemBow + || player.getHeldItem().getItem() instanceof ItemAxe) { + weapon = EntityStatHelper.getUnalteredItemName(player.getHeldItem().getItem()); } - int kills = event.source.getEntity().getEntityData() - .getCompoundTag("WeaponStats") - .getInteger(weapon); + int kills = event.source.getEntity().getEntityData().getCompoundTag("WeaponStats").getInteger(weapon); int last = 0; for (int i = 0; i < EntityStatHelper.killCount.length; i++) { @@ -277,14 +226,9 @@ public class ItemStatHelper { float pickedDamageBonus = EntityStatHelper.damageBonus[last]; if (BlessingUtils.hasBlessing(event.source.getEntity())) { - if (BlessingUtils.hasBlessing( - event.source.getEntity())) { - pickedDamageBonus = BlessingUtils - .getBlessingInstance( - event.source.getEntity()) - .adjustMobKnowledgeBonus( - event, - pickedDamageBonus); + if (BlessingUtils.hasBlessing(event.source.getEntity())) { + pickedDamageBonus = BlessingUtils.getBlessingInstance(event.source.getEntity()) + .adjustMobKnowledgeBonus(event, pickedDamageBonus); } } @@ -292,11 +236,8 @@ public class ItemStatHelper { return damageMultiplier; } - private float handleMobKnowledgeBonus(LivingHurtEvent event, - float damageMultiplier, String mob) { - int kills = event.source.getEntity().getEntityData() - .getCompoundTag("KillStats") - .getInteger(mob); + private float handleMobKnowledgeBonus(LivingHurtEvent event, float damageMultiplier, String mob) { + int kills = event.source.getEntity().getEntityData().getCompoundTag("KillStats").getInteger(mob); int last = 0; for (int i = 0; i < EntityStatHelper.killCount.length; i++) { @@ -311,14 +252,9 @@ public class ItemStatHelper { float pickedDamageBonus = EntityStatHelper.damageBonus[last]; if (BlessingUtils.hasBlessing(event.source.getEntity())) { - if (BlessingUtils.hasBlessing( - event.source.getEntity())) { - pickedDamageBonus = BlessingUtils - .getBlessingInstance( - event.source.getEntity()) - .adjustMobKnowledgeBonus( - event, - pickedDamageBonus); + if (BlessingUtils.hasBlessing(event.source.getEntity())) { + pickedDamageBonus = BlessingUtils.getBlessingInstance(event.source.getEntity()) + .adjustMobKnowledgeBonus(event, pickedDamageBonus); } } @@ -327,48 +263,36 @@ public class ItemStatHelper { } private void handleWeaponDamage(LivingHurtEvent event) { - EntityLivingBase entity = (EntityLivingBase) event.source - .getEntity(); + EntityLivingBase entity = (EntityLivingBase) event.source.getEntity(); ItemStack held = entity.getEquipmentInSlot(0); - if (held != null && ((event.source.getDamageType() - .equals("player") - || event.source.getDamageType() - .equals("mob") - || (held.getItem() == Items.bow - && event.source.isProjectile())))) { + if (held != null + && ((event.source.getDamageType().equals("player") || event.source.getDamageType().equals("mob") + || (held.getItem() == Items.bow && event.source.isProjectile())))) { String s = getStat(held, "BonusDamage"); if (s != null) { - event.ammount += Float.parseFloat(s.trim() - .replace(",", ".")); + event.ammount += Float.parseFloat(s.trim().replace(",", ".")); } } } - private float getArmorReduction(float damageMultiplier, - EntityLivingBase entity) { + private float getArmorReduction(float damageMultiplier, EntityLivingBase entity) { for (int i = 0; i < 4; i++) { ItemStack stack = entity.getEquipmentInSlot(i + 1); - if (stack == null || stack.getTagCompound() == null - || !stack.getTagCompound().hasKey( - "DamageReduction")) { + if (stack == null || stack.getTagCompound() == null || !stack.getTagCompound().hasKey("DamageReduction")) { continue; } - damageMultiplier -= Float.parseFloat(stack - .getTagCompound() - .getString("DamageReduction") - .trim().replace(",", ".")) * 0.01F; + damageMultiplier -= Float + .parseFloat(stack.getTagCompound().getString("DamageReduction").trim().replace(",", ".")) * 0.01F; } return damageMultiplier; } - private float handlePlayerWeakening(LivingHurtEvent event, - float damageMultiplier) { + private float handlePlayerWeakening(LivingHurtEvent event, float damageMultiplier) { if (BlessingUtils.hasDisadvantage("Weak")) { - if (event.source.getDamageType() - .equals("player")) { + if (event.source.getDamageType().equals("player")) { damageMultiplier -= 0.25F; } } else if (BlessingUtils.hasDisadvantage("Tougher Mobs")) { @@ -387,35 +311,40 @@ public class ItemStatHelper { return; } + for (String clasz : stack.getItem().getToolClasses(stack)) { + System.err.printf("Class: %s\n", clasz); + } + temp.clear(); Class itemClass = stack.getItem().getClass(); - if (statTrackersByClass.containsKey(itemClass)) { - temp.addAll(statTrackersByClass.get(itemClass)); + for (Entry> entry : statTrackersByClass.entrySet()) { + if (entry.getKey().isAssignableFrom(itemClass)) { + temp.addAll(entry.getValue()); + } } + /* + * if (statTrackersByClass.containsKey(itemClass)) { + * temp.addAll(statTrackersByClass.get(itemClass)); } + */ + for (ItemStatTracker e : genericTrackers) { if (!temp.contains(e)) { for (Class c : e.classes) { - if (c.isAssignableFrom( - itemClass)) { + if (c.isAssignableFrom(itemClass)) { ArrayList list = null; - if (statTrackersByClass - .containsKey(itemClass)) { + if (statTrackersByClass.containsKey(itemClass)) { list = new ArrayList(); - statTrackersByClass - .put(itemClass, list); + statTrackersByClass.put(itemClass, list); } else { - list = statTrackersByClass - .get(itemClass); + list = statTrackersByClass.get(itemClass); } try { - if (!statTrackersByClass - .get(itemClass) - .contains(e)) { + if (!statTrackersByClass.get(itemClass).contains(e)) { list.add(e); } @@ -435,32 +364,23 @@ public class ItemStatHelper { stack.setTagCompound(new NBTTagCompound()); } - String processed = ItemStatHelper.getStat(stack, - "processed"); + String processed = ItemStatHelper.getStat(stack, "processed"); - if (processed == null - || processed.equals("false")) { - stack.getTagCompound().setTag("Lore", - new NBTTagList()); + if (processed == null || processed.equals("false")) { + stack.getTagCompound().setTag("Lore", new NBTTagList()); - ItemStatHelper.giveStat(stack, "processed", - "true"); + ItemStatHelper.giveStat(stack, "processed", "true"); for (ItemStatTracker statTracker : temp) { for (ItemStat s : statTracker.stats) { - giveStat(stack, s.name, s - .getNewValue(stack, - r) - .toString()); + giveStat(stack, s.name, s.getNewValue(stack, r).toString()); - String lore = s.getLore( - stack); + String lore = s.getLore(stack); if (lore != null) { addLore(stack, lore); } - setName(stack, s.getAlteredStackName( - stack, r)); + setName(stack, s.getAlteredStackName(stack, r)); s.modifyStack(stack, r); } @@ -475,69 +395,47 @@ public class ItemStatHelper { public void onCrafting(ItemCraftedEvent event) { EntityPlayer player = event.player; - ItemStack item = event.crafting; + ItemStack itemStk = event.crafting; if (!player.worldObj.isRemote) { String itemName = null; - if (item.getItem() != null && item - .getItem() instanceof ItemSword - || item.getItem() instanceof ItemBow - || item.getItem() instanceof ItemAxe) { - itemName = EntityStatHelper - .getUnalteredItemName(item - .getItem()); + Item item = itemStk.getItem(); + if (item == null) + return; + + if (item instanceof ItemSword || item instanceof ItemBow || item instanceof ItemAxe) { + itemName = EntityStatHelper.getUnalteredItemName(item); } - if (ConfigData.enableCraftingStats - && itemName != null) { - if (!player.getEntityData() - .hasKey("CraftingStats")) { - player.getEntityData().setTag( - "CraftingStats", - new NBTTagCompound()); + if (ConfigData.enableCraftingStats && itemName != null) { + if (!player.getEntityData().hasKey("CraftingStats")) { + player.getEntityData().setTag("CraftingStats", new NBTTagCompound()); } - NBTTagCompound craftingStats = player - .getEntityData() - .getCompoundTag("CraftingStats"); + NBTTagCompound craftingStats = player.getEntityData().getCompoundTag("CraftingStats"); if (!craftingStats.hasKey(itemName)) { - craftingStats.setInteger(itemName, - 0); - - if (!craftingStats.hasKey( - "TrackedItemList")) { - craftingStats.setString( - "TrackedItemList", - itemName); + craftingStats.setInteger(itemName, 0); + + if (!craftingStats.hasKey("TrackedItemList")) { + craftingStats.setString("TrackedItemList", itemName); } else { - craftingStats.setString( - "TrackedItemList", - craftingStats.getString( - "TrackedItemList") - + ";" - + itemName); + craftingStats.setString("TrackedItemList", + craftingStats.getString("TrackedItemList") + ";" + itemName); } } - craftingStats.setInteger(itemName, - craftingStats.getInteger( - itemName) - + 1); + craftingStats.setInteger(itemName, craftingStats.getInteger(itemName) + 1); for (int i = 0; i < EntityStatHelper.knowledge.length; i++) { - if (EntityStatHelper.killCount[i] == craftingStats - .getInteger(itemName)) { - NewPacketHandler.SEND_MESSAGE - .sendToPlayer(player, - "\u00A7o\u00A73You've become a " - + EntityStatHelper.knowledge[i] - .toLowerCase() - + " " - + itemName.toLowerCase() - + " smith! (" - + (i < EntityStatHelper.knowledge.length - - 1 ? (EntityStatHelper.killCount[i + 1] * 2 - EntityStatHelper.killCount[i] * 2) + " " + itemName.toLowerCase() + " crafts to next rank." : "")); + if (EntityStatHelper.killCount[i] == craftingStats.getInteger(itemName)) { + NewPacketHandler.SEND_MESSAGE.sendToPlayer(player, "\u00A7o\u00A73You've become a " + + EntityStatHelper.knowledge[i].toLowerCase() + " " + itemName.toLowerCase() + + " smith! (" + + (i < EntityStatHelper.knowledge.length - 1 + ? (EntityStatHelper.killCount[i + 1] * 2 - EntityStatHelper.killCount[i] * 2) + + " " + itemName.toLowerCase() + " crafts to next rank." + : "")); break; } } diff --git a/YWD/src/main/java/fyresmodjam/misc/ItemStatTracker.java b/YWD/src/main/java/fyresmodjam/misc/ItemStatTracker.java index 743f853..9237353 100755 --- a/YWD/src/main/java/fyresmodjam/misc/ItemStatTracker.java +++ b/YWD/src/main/java/fyresmodjam/misc/ItemStatTracker.java @@ -7,16 +7,13 @@ public class ItemStatTracker { public boolean instanceAllowed = false; - public ItemStatTracker(Class[] classes, - boolean instanceAllowed) { + public ItemStatTracker(Class[] classes, boolean instanceAllowed) { this.classes = classes; this.instanceAllowed = instanceAllowed; } public ItemStatTracker(Class c, boolean instanceAllowed) { - this(new Class[] { - c - }, instanceAllowed); + this(new Class[] { c }, instanceAllowed); } public ArrayList stats = new ArrayList(); diff --git a/YWD/src/main/java/fyresmodjam/misc/WeaponRankStat.java b/YWD/src/main/java/fyresmodjam/misc/WeaponRankStat.java index e844dc2..00e9566 100755 --- a/YWD/src/main/java/fyresmodjam/misc/WeaponRankStat.java +++ b/YWD/src/main/java/fyresmodjam/misc/WeaponRankStat.java @@ -10,23 +10,10 @@ public final class WeaponRankStat extends ItemStat { /* * @formatter:off */ - public String[][] prefixesByRank = { - { - "Old", "Dull", "Broken", "Worn" - }, - { - "Average", "Decent", "Modest", "Ordinary" - }, - { - "Strong", "Sharp", "Polished", "Refined" - }, - { - "Powerful", "Ruthless", "Elite", "Astonishing" - }, - { - "Godly", "Divine", "Fabled", "Legendary" - } - }; + public String[][] prefixesByRank = { { "Old", "Dull", "Broken", "Worn" }, + { "Average", "Decent", "Modest", "Ordinary" }, { "Strong", "Sharp", "Polished", "Refined" }, + { "Powerful", "Ruthless", "Elite", "Astonishing" }, { "Godly", "Divine", "Fabled", "Legendary" } }; + /* * @formatter:on */ @@ -38,7 +25,7 @@ public final class WeaponRankStat extends ItemStat { public Object getNewValue(ItemStack stack, Random r) { int i = 1; for (; i < 5; i++) { - if (ModjamMod.r.nextInt(10) < 7) { + if (ModjamMod.r.nextInt(10) < 6) { break; } } @@ -47,34 +34,25 @@ public final class WeaponRankStat extends ItemStat { @Override public void modifyStack(ItemStack stack, Random r) { - int rank = Integer.parseInt( - stack.getTagCompound().getString(name)); - float bonusDamage = ((float) rank - 1) / 2 - + (r.nextInt(rank + 1) * r.nextFloat()); + int rank = Integer.parseInt(stack.getTagCompound().getString(name)); + float bonusDamage = ((float) rank - 1) / 2 + (r.nextInt(rank + 1) * r.nextFloat()); - ItemStatHelper.giveStat(stack, "BonusDamage", - String.format("%.2f", bonusDamage)); - ItemStatHelper.addLore(stack, !String.format("%.2f", - bonusDamage) - .equals("0.00") ? "\u00A77\u00A7o " - + (bonusDamage > 0 ? "+" - : "") - + String.format("%.2f", - bonusDamage) - + " bonus damage" : null); + ItemStatHelper.giveStat(stack, "BonusDamage", String.format("%.2f", bonusDamage)); + ItemStatHelper + .addLore(stack, + !String.format("%.2f", bonusDamage).equals("0.00") ? "\u00A77\u00A7o " + + (bonusDamage > 0 ? "+" : "") + String.format("%.2f", bonusDamage) + " bonus damage" + : null); ItemStatHelper.addLore(stack, "\u00A7eRank: " + rank); } @Override public String getAlteredStackName(ItemStack stack, Random r) { - String[] list = prefixesByRank[Integer.parseInt( - stack.getTagCompound().getString(name)) - - 1]; + String[] list = prefixesByRank[Integer.parseInt(stack.getTagCompound().getString(name)) - 1]; String prefix = list[r.nextInt(list.length)]; - if (prefix.equals("Sharp") - && stack.getItem() instanceof ItemBow) { + if (prefix.equals("Sharp") && stack.getItem() instanceof ItemBow) { prefix = "Long"; } -- cgit v1.2.3