lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleaned up a lot of different inspections

Browse source
This commit is contained in:
Nicholas Ignoffo 2018-03-01 19:27:38 -08:00
parent 0dd0854bd9
commit 70d98455b7
207 changed files with 603 additions and 731 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java
View file

@ -23,8 +23,8 @@ import java.util.Map.Entry;
public class LivingArmour implements ILivingArmour {
public static String chatBase = "chat.bloodmagic.livingArmour.";
public HashMap<String, StatTracker> trackerMap = new HashMap<String, StatTracker>();
public HashMap<String, LivingArmourUpgrade> upgradeMap = new HashMap<String, LivingArmourUpgrade>();
public HashMap<String, StatTracker> trackerMap = new HashMap<>();
public HashMap<String, LivingArmourUpgrade> upgradeMap = new HashMap<>();
public int maxUpgradePoints = 100;
public int totalUpgradePoints = 0;
@ -60,7 +60,7 @@ public class LivingArmour implements ILivingArmour {
@Override
public Multimap<String, AttributeModifier> getAttributeModifiers() {
HashMultimap<String, AttributeModifier> modifierMap = HashMultimap.<String, AttributeModifier>create();
HashMultimap<String, AttributeModifier> modifierMap = HashMultimap.create();
for (Entry<String, LivingArmourUpgrade> entry : upgradeMap.entrySet()) {
LivingArmourUpgrade upgrade = entry.getValue();
@ -165,7 +165,7 @@ public class LivingArmour implements ILivingArmour {
return;
}
List<String> allowedUpgradesList = new ArrayList<String>();
List<String> allowedUpgradesList = new ArrayList<>();
for (ItemStack stack : player.inventory.mainInventory) {
if (stack != null && stack.getItem() instanceof IUpgradeTrainer) {
List<String> keyList = ((IUpgradeTrainer) stack.getItem()).getTrainedUpgrades(stack);

9
src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourHandler.java
View file

@ -1,6 +1,5 @@
package WayofTime.bloodmagic.livingArmour;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.util.BMLog;
import net.minecraft.nbt.NBTTagCompound;
@ -10,10 +9,10 @@ import java.util.HashMap;
import java.util.List;
public class LivingArmourHandler {
public static List<Class<? extends StatTracker>> trackers = new ArrayList<Class<? extends StatTracker>>();
public static HashMap<String, Class<? extends LivingArmourUpgrade>> upgradeMap = new HashMap<String, Class<? extends LivingArmourUpgrade>>();
public static HashMap<String, Constructor<? extends LivingArmourUpgrade>> upgradeConstructorMap = new HashMap<String, Constructor<? extends LivingArmourUpgrade>>();
public static HashMap<String, Integer> upgradeMaxLevelMap = new HashMap<String, Integer>();
public static List<Class<? extends StatTracker>> trackers = new ArrayList<>();
public static HashMap<String, Class<? extends LivingArmourUpgrade>> upgradeMap = new HashMap<>();
public static HashMap<String, Constructor<? extends LivingArmourUpgrade>> upgradeConstructorMap = new HashMap<>();
public static HashMap<String, Integer> upgradeMaxLevelMap = new HashMap<>();
public static void registerStatTracker(Class<? extends StatTracker> tracker) {
trackers.add(tracker);

2
src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java
View file

@ -12,7 +12,7 @@ import java.util.HashMap;
public class LivingArmourUpgradeDigSlowdown extends LivingArmourUpgrade {
public static final int[] costs = new int[]{-10, -17, -28, -42, -60, -80, -100, -125, -160, -200};
public static final double[] digSpeedModifier = new double[]{0.9, 0.8, 0.7, 0.6, 0.55, 0.5, 0.4, 0.35, 0.3, 0.2};
public static HashMap<ILivingArmour, Boolean> changeMap = new HashMap<ILivingArmour, Boolean>();
public static HashMap<ILivingArmour, Boolean> changeMap = new HashMap<>();
public LivingArmourUpgradeDigSlowdown(int level) {
super(level);

2
src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java
View file

@ -29,7 +29,7 @@ public class LivingArmourUpgradeMeleeDecrease extends LivingArmourUpgrade {
@Override
public Multimap<String, AttributeModifier> getAttributeModifiers() {
Multimap<String, AttributeModifier> modifierMap = HashMultimap.<String, AttributeModifier>create();
Multimap<String, AttributeModifier> modifierMap = HashMultimap.create();
String name = getUniqueIdentifier() + "-DamageModifier1";
modifierMap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(UUID.nameUUIDFromBytes(StringUtils.getBytesUtf8(name)), "DamageModifier1", meleeDamage[this.level], 1));

2
src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java
View file

@ -24,7 +24,7 @@ public class LivingArmourUpgradeSlowness extends LivingArmourUpgrade {
@Override
public Multimap<String, AttributeModifier> getAttributeModifiers() {
Multimap<String, AttributeModifier> modifierMap = HashMultimap.<String, AttributeModifier>create();
Multimap<String, AttributeModifier> modifierMap = HashMultimap.create();
String name = getUniqueIdentifier() + "-SpeedModifier1";
modifierMap.put(SharedMonsterAttributes.MOVEMENT_SPEED.getName(), new AttributeModifier(UUID.nameUUIDFromBytes(StringUtils.getBytesUtf8(name)), "SpeedModifier1", speedModifier[this.level], 1));

4
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java
View file

@ -15,7 +15,7 @@ import java.util.HashMap;
import java.util.List;
public class StatTrackerArrowProtect extends StatTracker {
public static HashMap<LivingArmour, Double> changeMap = new HashMap<LivingArmour, Double>();
public static HashMap<LivingArmour, Double> changeMap = new HashMap<>();
public static int[] damageRequired = new int[]{30, 200, 400, 800, 1500, 2500, 3500, 5000, 7000, 15000};
public int totalDamage = 0;
@ -66,7 +66,7 @@ public class StatTrackerArrowProtect extends StatTracker {
@Override
public List<LivingArmourUpgrade> getUpgrades() {
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
List<LivingArmourUpgrade> upgradeList = new ArrayList<>();
for (int i = 0; i < 10; i++) {
if (totalDamage >= damageRequired[i]) {

4
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java
View file

@ -15,7 +15,7 @@ import java.util.HashMap;
import java.util.List;
public class StatTrackerArrowShot extends StatTracker {
public static HashMap<LivingArmour, Integer> changeMap = new HashMap<LivingArmour, Integer>();
public static HashMap<LivingArmour, Integer> changeMap = new HashMap<>();
public static int[] shotsRequired = new int[]{50, 200, 700, 1500, 3000};
public int totalShots = 0;
@ -66,7 +66,7 @@ public class StatTrackerArrowShot extends StatTracker {
@Override
public List<LivingArmourUpgrade> getUpgrades() {
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
List<LivingArmourUpgrade> upgradeList = new ArrayList<>();
for (int i = 0; i < 5; i++) {
if (totalShots >= shotsRequired[i]) {

4
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java
View file

@ -15,7 +15,7 @@ import java.util.HashMap;
import java.util.List;
public class StatTrackerCriticalStrike extends StatTracker {
public static HashMap<LivingArmour, Double> changeMap = new HashMap<LivingArmour, Double>();
public static HashMap<LivingArmour, Double> changeMap = new HashMap<>();
public static int[] damageRequired = new int[]{200, 800, 1300, 2500, 3800};
public double totalDamageDealt = 0;
@ -66,7 +66,7 @@ public class StatTrackerCriticalStrike extends StatTracker {
@Override
public List<LivingArmourUpgrade> getUpgrades() {
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
List<LivingArmourUpgrade> upgradeList = new ArrayList<>();
for (int i = 0; i < 5; i++) {
if (totalDamageDealt >= damageRequired[i]) {

4
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java
View file

@ -15,7 +15,7 @@ import java.util.HashMap;
import java.util.List;
public class StatTrackerDigging extends StatTracker {
public static HashMap<LivingArmour, Integer> changeMap = new HashMap<LivingArmour, Integer>();
public static HashMap<LivingArmour, Integer> changeMap = new HashMap<>();
public static int[] blocksRequired = new int[]{128, 512, 1024, 2048, 8192, 16000, 32000, 50000, 80000, 150000};
public int totalBlocksDug = 0;
@ -66,7 +66,7 @@ public class StatTrackerDigging extends StatTracker {
@Override
public List<LivingArmourUpgrade> getUpgrades() {
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
List<LivingArmourUpgrade> upgradeList = new ArrayList<>();
for (int i = 0; i < 10; i++) {
if (totalBlocksDug >= blocksRequired[i]) {

4
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java
View file

@ -15,7 +15,7 @@ import java.util.HashMap;
import java.util.List;
public class StatTrackerExperience extends StatTracker {
public static HashMap<LivingArmour, Integer> changeMap = new HashMap<LivingArmour, Integer>();
public static HashMap<LivingArmour, Integer> changeMap = new HashMap<>();
public static int[] experienceRequired = new int[]{100, 400, 1000, 1600, 3200, 5000, 7000, 9200, 11500, 140000};
public double totalExperienceGained = 0;
@ -66,7 +66,7 @@ public class StatTrackerExperience extends StatTracker {
@Override
public List<LivingArmourUpgrade> getUpgrades() {
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
List<LivingArmourUpgrade> upgradeList = new ArrayList<>();
for (int i = 0; i < 10; i++) {
if (totalExperienceGained >= experienceRequired[i]) {

4
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java
View file

@ -15,7 +15,7 @@ import java.util.HashMap;
import java.util.List;
public class StatTrackerFallProtect extends StatTracker {
public static HashMap<LivingArmour, Double> changeMap = new HashMap<LivingArmour, Double>();
public static HashMap<LivingArmour, Double> changeMap = new HashMap<>();
public static int[] damageRequired = new int[]{30, 200, 400, 800, 1500};
public int totalDamage = 0;
@ -66,7 +66,7 @@ public class StatTrackerFallProtect extends StatTracker {
@Override
public List<LivingArmourUpgrade> getUpgrades() {
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
List<LivingArmourUpgrade> upgradeList = new ArrayList<>();
for (int i = 0; i < 5; i++) {
if (totalDamage >= damageRequired[i]) {

2
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java
View file

@ -55,7 +55,7 @@ public class StatTrackerFireResist extends StatTracker {
@Override
public List<LivingArmourUpgrade> getUpgrades() {
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
List<LivingArmourUpgrade> upgradeList = new ArrayList<>();
for (int i = 0; i < 5; i++) {
if (totalFireTicks >= fireTicksRequired[i]) {

4
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java
View file

@ -16,7 +16,7 @@ import java.util.List;
import java.util.Map;
public class StatTrackerFood extends StatTracker {
public static Map<EntityPlayer, Integer> lastFoodEatenMap = new HashMap<EntityPlayer, Integer>();
public static Map<EntityPlayer, Integer> lastFoodEatenMap = new HashMap<>();
public static int[] foodRequired = new int[]{100, 200, 300, 500, 1000};
@ -74,7 +74,7 @@ public class StatTrackerFood extends StatTracker {
@Override
public List<LivingArmourUpgrade> getUpgrades() {
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
List<LivingArmourUpgrade> upgradeList = new ArrayList<>();
for (int i = 0; i < foodRequired.length; i++) {
if (foodEaten >= foodRequired[i]) {

4
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java
View file

@ -15,7 +15,7 @@ import java.util.HashMap;
import java.util.List;
public class StatTrackerGraveDigger extends StatTracker {
public static HashMap<LivingArmour, Double> changeMap = new HashMap<LivingArmour, Double>();
public static HashMap<LivingArmour, Double> changeMap = new HashMap<>();
public static int[] damageRequired = new int[]{200, 800, 1300, 2500, 3800, 5000, 7000, 9200, 11500, 140000};
public double totalDamageDealt = 0;
@ -66,7 +66,7 @@ public class StatTrackerGraveDigger extends StatTracker {
@Override
public List<LivingArmourUpgrade> getUpgrades() {
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
List<LivingArmourUpgrade> upgradeList = new ArrayList<>();
for (int i = 0; i < 10; i++) {
if (totalDamageDealt >= damageRequired[i]) {

4
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java
View file

@ -16,7 +16,7 @@ import java.util.HashMap;
import java.util.List;
public class StatTrackerGrimReaperSprint extends StatTracker {
public static HashMap<LivingArmour, Integer> changeMap = new HashMap<LivingArmour, Integer>();
public static HashMap<LivingArmour, Integer> changeMap = new HashMap<>();
public static int[] deathsRequired = new int[]{6, 10, 15, 25, 50, 70, 90, 120, 150, 200}; //TODO: Modify
public int totalDeaths = 0;
@ -67,7 +67,7 @@ public class StatTrackerGrimReaperSprint extends StatTracker {
@Override
public List<LivingArmourUpgrade> getUpgrades() {
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
List<LivingArmourUpgrade> upgradeList = new ArrayList<>();
for (int i = 0; i < 10; i++) {
if (totalDeaths >= deathsRequired[i]) {

4
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java
View file

@ -15,7 +15,7 @@ import java.util.HashMap;
import java.util.List;
public class StatTrackerHealthboost extends StatTracker {
public static HashMap<LivingArmour, Double> changeMap = new HashMap<LivingArmour, Double>();
public static HashMap<LivingArmour, Double> changeMap = new HashMap<>();
public static int[] healthedRequired = new int[]{80, 200, 340, 540, 800, 1600, 2800, 5000, 7600, 10000};
public double totalHealthGenned = 0;
@ -66,7 +66,7 @@ public class StatTrackerHealthboost extends StatTracker {
@Override
public List<LivingArmourUpgrade> getUpgrades() {
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
List<LivingArmourUpgrade> upgradeList = new ArrayList<>();
for (int i = 0; i < 10; i++) {
if (totalHealthGenned >= healthedRequired[i]) {

4
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java
View file

@ -15,7 +15,7 @@ import java.util.HashMap;
import java.util.List;
public class StatTrackerJump extends StatTracker {
public static HashMap<LivingArmour, Integer> changeMap = new HashMap<LivingArmour, Integer>();
public static HashMap<LivingArmour, Integer> changeMap = new HashMap<>();
public static int[] jumpsRequired = new int[]{30, 200, 400, 700, 1100, 1500, 2000, 2800, 3600, 5000}; //testing
public int totalJumps = 0;
@ -68,7 +68,7 @@ public class StatTrackerJump extends StatTracker {
@Override
public List<LivingArmourUpgrade> getUpgrades() {
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
List<LivingArmourUpgrade> upgradeList = new ArrayList<>();
for (int i = 0; i < 10; i++) {
if (totalJumps >= jumpsRequired[i]) {

4
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java
View file

@ -15,7 +15,7 @@ import java.util.HashMap;
import java.util.List;
public class StatTrackerMeleeDamage extends StatTracker {
public static HashMap<LivingArmour, Double> changeMap = new HashMap<LivingArmour, Double>();
public static HashMap<LivingArmour, Double> changeMap = new HashMap<>();
public static int[] damageRequired = new int[]{200, 800, 1300, 2500, 3800, 5000, 7000, 9200, 11500, 140000};
public double totalDamageDealt = 0;
@ -66,7 +66,7 @@ public class StatTrackerMeleeDamage extends StatTracker {
@Override
public List<LivingArmourUpgrade> getUpgrades() {
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
List<LivingArmourUpgrade> upgradeList = new ArrayList<>();
for (int i = 0; i < 10; i++) {
if (totalDamageDealt >= damageRequired[i]) {

6
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java
View file

@ -16,8 +16,8 @@ import java.util.List;
import java.util.Map;
public class StatTrackerMovement extends StatTracker {
public static Map<EntityPlayer, Double> lastPosX = new HashMap<EntityPlayer, Double>();
public static Map<EntityPlayer, Double> lastPosZ = new HashMap<EntityPlayer, Double>();
public static Map<EntityPlayer, Double> lastPosX = new HashMap<>();
public static Map<EntityPlayer, Double> lastPosZ = new HashMap<>();
public static int[] blocksRequired = new int[]{200, 1000, 2000, 4000, 7000, 15000, 25000, 35000, 50000, 70000};
@ -82,7 +82,7 @@ public class StatTrackerMovement extends StatTracker {
@Override
public List<LivingArmourUpgrade> getUpgrades() {
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
List<LivingArmourUpgrade> upgradeList = new ArrayList<>();
for (int i = 0; i < 10; i++) {
if (totalMovement >= blocksRequired[i]) {

4
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java
View file

@ -16,7 +16,7 @@ import java.util.HashMap;
import java.util.List;
public class StatTrackerNightSight extends StatTracker {
public static HashMap<LivingArmour, Double> changeMap = new HashMap<LivingArmour, Double>();
public static HashMap<LivingArmour, Double> changeMap = new HashMap<>();
public static int[] damageRequired = new int[]{0, 200, 800, 1300, 2500, 3800, 5000, 7000, 9200, 11500};
public static int neededNightVision = 3 * 60 * 20;
public double totalDamageDealt = 0;
@ -81,7 +81,7 @@ public class StatTrackerNightSight extends StatTracker {
@Override
public List<LivingArmourUpgrade> getUpgrades() {
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
List<LivingArmourUpgrade> upgradeList = new ArrayList<>();
if (totalNightVision < neededNightVision) {
return upgradeList;

4
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java
View file

@ -15,7 +15,7 @@ import java.util.HashMap;
import java.util.List;
public class StatTrackerPhysicalProtect extends StatTracker {
public static HashMap<LivingArmour, Double> changeMap = new HashMap<LivingArmour, Double>();
public static HashMap<LivingArmour, Double> changeMap = new HashMap<>();
public static int[] damageRequired = new int[]{30, 50, 80, 140, 200, 300, 400, 500, 650, 800};
public int totalDamage = 0;
@ -66,7 +66,7 @@ public class StatTrackerPhysicalProtect extends StatTracker {
@Override
public List<LivingArmourUpgrade> getUpgrades() {
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
List<LivingArmourUpgrade> upgradeList = new ArrayList<>();
for (int i = 0; i < 10; i++) {
if (totalDamage >= damageRequired[i]) {

2
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java
View file

@ -56,7 +56,7 @@ public class StatTrackerPoison extends StatTracker {
@Override
public List<LivingArmourUpgrade> getUpgrades() {
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
List<LivingArmourUpgrade> upgradeList = new ArrayList<>();
for (int i = 0; i < 5; i++) {
if (totalPoisonTicks >= poisonTicksRequired[i]) {

4
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java
View file

@ -15,7 +15,7 @@ import java.util.HashMap;
import java.util.List;
public class StatTrackerRepairing extends StatTracker {
public static HashMap<LivingArmour, Integer> changeMap = new HashMap<LivingArmour, Integer>();
public static HashMap<LivingArmour, Integer> changeMap = new HashMap<>();
public static int[] damageRequired = new int[]{500};
public double totalDamage = 0;
@ -66,7 +66,7 @@ public class StatTrackerRepairing extends StatTracker {
@Override
public List<LivingArmourUpgrade> getUpgrades() {
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
List<LivingArmourUpgrade> upgradeList = new ArrayList<>();
for (int i = 0; i < 1; i++) {
if (totalDamage >= damageRequired[i]) {

4
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java
View file

@ -15,7 +15,7 @@ import java.util.HashMap;
import java.util.List;
public class StatTrackerSelfSacrifice extends StatTracker {
public static HashMap<LivingArmour, Integer> changeMap = new HashMap<LivingArmour, Integer>();
public static HashMap<LivingArmour, Integer> changeMap = new HashMap<>();
public static int[] sacrificesRequired = new int[]{30, 200, 400, 700, 1100, 1500, 2000, 2800, 3600, 5000}; //testing
public int totalSacrifices = 0;
@ -68,7 +68,7 @@ public class StatTrackerSelfSacrifice extends StatTracker {
@Override
public List<LivingArmourUpgrade> getUpgrades() {
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
List<LivingArmourUpgrade> upgradeList = new ArrayList<>();
for (int i = 0; i < 10; i++) {
if (totalSacrifices >= sacrificesRequired[i]) {

4
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java
View file

@ -15,7 +15,7 @@ import java.util.HashMap;
import java.util.List;
public class StatTrackerSolarPowered extends StatTracker {
public static HashMap<LivingArmour, Double> changeMap = new HashMap<LivingArmour, Double>();
public static HashMap<LivingArmour, Double> changeMap = new HashMap<>();
public static int[] healthedRequired = new int[]{70, 150, 300, 500, 700, 1400, 2400, 4000, 7000, 9000};
public double totalHealthGenned = 0;
@ -66,7 +66,7 @@ public class StatTrackerSolarPowered extends StatTracker {
@Override
public List<LivingArmourUpgrade> getUpgrades() {
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
List<LivingArmourUpgrade> upgradeList = new ArrayList<>();
for (int i = 0; i < 10; i++) {
if (totalHealthGenned >= healthedRequired[i]) {

4
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java
View file

@ -15,7 +15,7 @@ import java.util.HashMap;
import java.util.List;
public class StatTrackerSprintAttack extends StatTracker {
public static HashMap<LivingArmour, Double> changeMap = new HashMap<LivingArmour, Double>();
public static HashMap<LivingArmour, Double> changeMap = new HashMap<>();
public static int[] damageRequired = new int[]{200, 800, 1300, 2500, 3800};
public double totalDamageDealt = 0;
@ -66,7 +66,7 @@ public class StatTrackerSprintAttack extends StatTracker {
@Override
public List<LivingArmourUpgrade> getUpgrades() {
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
List<LivingArmourUpgrade> upgradeList = new ArrayList<>();
for (int i = 0; i < 5; i++) {
if (totalDamageDealt >= damageRequired[i]) {

6
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java
View file

@ -15,8 +15,8 @@ import java.util.List;
import java.util.Map;
public class StatTrackerStepAssist extends StatTracker {
public static Map<EntityPlayer, Double> lastPosX = new HashMap<EntityPlayer, Double>();
public static Map<EntityPlayer, Double> lastPosZ = new HashMap<EntityPlayer, Double>();
public static Map<EntityPlayer, Double> lastPosX = new HashMap<>();
public static Map<EntityPlayer, Double> lastPosZ = new HashMap<>();
public static int blocksRequired = 1000;
@ -82,7 +82,7 @@ public class StatTrackerStepAssist extends StatTracker {
@Override
public List<LivingArmourUpgrade> getUpgrades() {
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
List<LivingArmourUpgrade> upgradeList = new ArrayList<>();
if (totalMovement >= blocksRequired) {
upgradeList.add(new LivingArmourUpgradeStepAssist(0));

2
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java
View file

@ -17,7 +17,7 @@ public class LivingArmourUpgradeDigging extends LivingArmourUpgrade {
public static final int[] digSpeedTime = new int[]{0, 50, 60, 100, 100, 100, 100, 150, 150, 150};
public static final int[] digSpeedLevel = new int[]{0, 0, 0, 1, 1, 1, 1, 1, 2, 2};
public static final double[] digSpeedModifier = new double[]{1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.8, 2, 2.2, 2.5};
public static HashMap<ILivingArmour, Boolean> changeMap = new HashMap<ILivingArmour, Boolean>();
public static HashMap<ILivingArmour, Boolean> changeMap = new HashMap<>();
public LivingArmourUpgradeDigging(int level) {
super(level);

2
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java
View file

@ -29,7 +29,7 @@ public class LivingArmourUpgradeHealthboost extends LivingArmourUpgrade {
@Override
public Multimap<String, AttributeModifier> getAttributeModifiers() {
Multimap<String, AttributeModifier> modifierMap = HashMultimap.<String, AttributeModifier>create();
Multimap<String, AttributeModifier> modifierMap = HashMultimap.create();
String name = getUniqueIdentifier() + "-HealthModifier1";
modifierMap.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier(UUID.nameUUIDFromBytes(StringUtils.getBytesUtf8(name)), "HealthModifier1", healthModifier[this.level], 0));

2
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java
View file

@ -22,7 +22,7 @@ public class LivingArmourUpgradeKnockbackResist extends LivingArmourUpgrade {
@Override
public Multimap<String, AttributeModifier> getAttributeModifiers() {
Multimap<String, AttributeModifier> modifierMap = HashMultimap.<String, AttributeModifier>create();
Multimap<String, AttributeModifier> modifierMap = HashMultimap.create();
String name = getUniqueIdentifier() + "-KnockbackModifier1";
modifierMap.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getName(), new AttributeModifier(UUID.nameUUIDFromBytes(StringUtils.getBytesUtf8(name)), "KnockbackModifier1", kbModifier[this.level], 0));

2
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java
View file

@ -29,7 +29,7 @@ public class LivingArmourUpgradeMeleeDamage extends LivingArmourUpgrade {
@Override
public Multimap<String, AttributeModifier> getAttributeModifiers() {
Multimap<String, AttributeModifier> modifierMap = HashMultimap.<String, AttributeModifier>create();
Multimap<String, AttributeModifier> modifierMap = HashMultimap.create();
String name = getUniqueIdentifier() + "-DamageModifier1";
modifierMap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(UUID.nameUUIDFromBytes(StringUtils.getBytesUtf8(name)), "DamageModifier1", meleeDamage[this.level], 0));

2
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java
View file

@ -47,7 +47,7 @@ public class LivingArmourUpgradeSpeed extends LivingArmourUpgrade {
@Override
public Multimap<String, AttributeModifier> getAttributeModifiers() {
Multimap<String, AttributeModifier> modifierMap = HashMultimap.<String, AttributeModifier>create();
Multimap<String, AttributeModifier> modifierMap = HashMultimap.create();
// modifierMap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(new UUID(895132, 1), "Speed modifier" + 1, speedModifier[this.level], 1));