diff options
Diffstat (limited to 'YWD/src/main/java/fyresmodjam/misc/EntityStatHelper.java')
| -rwxr-xr-x | YWD/src/main/java/fyresmodjam/misc/EntityStatHelper.java | 521 |
1 files changed, 161 insertions, 360 deletions
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<Class, EntityStatTracker> statTrackersByClass = new HashMap<Class, EntityStatTracker>();
public static ArrayList<EntityStatTracker> genericTrackers = new ArrayList<EntityStatTracker>();
- public static ArrayList<EntityStatTracker> temp = new ArrayList<EntityStatTracker>();
- public static boolean b = false;
+ public static ArrayList<EntityStatTracker> temp = new ArrayList<EntityStatTracker>();
+ 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;
}
}
|