Merge branch 'development' into InstallerFrame

# Conflicts:
#	build.gradle

1 files changed, 137 insertions, 136 deletions

diff --git a/src/main/java/me/Danker/commands/ResetLootCommand.java b/src/main/java/me/Danker/commands/ResetLootCommand.java
index 9b4ecfa..00df1b9 100644
--- a/src/main/java/me/Danker/commands/ResetLootCommand.java
+++ b/src/main/java/me/Danker/commands/ResetLootCommand.java
@@ -1,6 +1,7 @@
 package me.Danker.commands;
 
 import me.Danker.DankersSkyblockMod;
+import me.Danker.features.loot.LootTracker;
 import me.Danker.handlers.ConfigHandler;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
@@ -113,167 +114,167 @@ public class ResetLootCommand extends CommandBase {
 	}
 	
 	static void resetZombie() {		
-		LootCommand.zombieRevsSession = 0;
-		LootCommand.zombieRevFleshSession = 0;
-		LootCommand.zombieFoulFleshSession = 0;
-		LootCommand.zombieFoulFleshDropsSession = 0;
-		LootCommand.zombiePestilencesSession = 0;
-		LootCommand.zombieUndeadCatasSession = 0;
-		LootCommand.zombieBooksSession = 0;
-		LootCommand.zombieBeheadedsSession = 0;
-		LootCommand.zombieRevCatasSession = 0;
-		LootCommand.zombieSnakesSession = 0;
-		LootCommand.zombieScythesSession = 0;
-		LootCommand.zombieTimeSession = -1;
-		LootCommand.zombieBossesSession = -1;
+		LootTracker.zombieRevsSession = 0;
+		LootTracker.zombieRevFleshSession = 0;
+		LootTracker.zombieFoulFleshSession = 0;
+		LootTracker.zombieFoulFleshDropsSession = 0;
+		LootTracker.zombiePestilencesSession = 0;
+		LootTracker.zombieUndeadCatasSession = 0;
+		LootTracker.zombieBooksSession = 0;
+		LootTracker.zombieBeheadedsSession = 0;
+		LootTracker.zombieRevCatasSession = 0;
+		LootTracker.zombieSnakesSession = 0;
+		LootTracker.zombieScythesSession = 0;
+		LootTracker.zombieTimeSession = -1;
+		LootTracker.zombieBossesSession = -1;
 		ConfigHandler.deleteCategory("zombie");
 		ConfigHandler.reloadConfig();
 	}
 	
 	static void resetSpider() {
-		LootCommand.spiderTarantulasSession = 0;
-		LootCommand.spiderWebsSession = 0;
-		LootCommand.spiderTAPSession = 0;
-		LootCommand.spiderTAPDropsSession = 0;
-		LootCommand.spiderBitesSession = 0;
-		LootCommand.spiderCatalystsSession = 0;
-		LootCommand.spiderBooksSession = 0;
-		LootCommand.spiderSwattersSession = 0;
-		LootCommand.spiderTalismansSession = 0;
-		LootCommand.spiderMosquitosSession = 0;
-		LootCommand.spiderTimeSession = -1;
-		LootCommand.spiderBossesSession = -1;
+		LootTracker.spiderTarantulasSession = 0;
+		LootTracker.spiderWebsSession = 0;
+		LootTracker.spiderTAPSession = 0;
+		LootTracker.spiderTAPDropsSession = 0;
+		LootTracker.spiderBitesSession = 0;
+		LootTracker.spiderCatalystsSession = 0;
+		LootTracker.spiderBooksSession = 0;
+		LootTracker.spiderSwattersSession = 0;
+		LootTracker.spiderTalismansSession = 0;
+		LootTracker.spiderMosquitosSession = 0;
+		LootTracker.spiderTimeSession = -1;
+		LootTracker.spiderBossesSession = -1;
 		ConfigHandler.deleteCategory("spider");
 		ConfigHandler.reloadConfig();
 	}
 	
 	static void resetWolf() {
-		LootCommand.wolfSvensSession = 0;
-		LootCommand.wolfTeethSession = 0;
-		LootCommand.wolfWheelsSession = 0;
-		LootCommand.wolfWheelsDropsSession = 0;
-		LootCommand.wolfSpiritsSession = 0;
-		LootCommand.wolfBooksSession = 0;
-		LootCommand.wolfEggsSession = 0;
-		LootCommand.wolfCouturesSession = 0;
-		LootCommand.wolfBaitsSession = 0;
-		LootCommand.wolfFluxesSession = 0;
-		LootCommand.wolfTimeSession = -1;
-		LootCommand.wolfBossesSession = -1;
+		LootTracker.wolfSvensSession = 0;
+		LootTracker.wolfTeethSession = 0;
+		LootTracker.wolfWheelsSession = 0;
+		LootTracker.wolfWheelsDropsSession = 0;
+		LootTracker.wolfSpiritsSession = 0;
+		LootTracker.wolfBooksSession = 0;
+		LootTracker.wolfEggsSession = 0;
+		LootTracker.wolfCouturesSession = 0;
+		LootTracker.wolfBaitsSession = 0;
+		LootTracker.wolfFluxesSession = 0;
+		LootTracker.wolfTimeSession = -1;
+		LootTracker.wolfBossesSession = -1;
 		ConfigHandler.deleteCategory("wolf");
 		ConfigHandler.reloadConfig();
 	}
 	
 	static void resetFishing() {
-		LootCommand.seaCreaturesSession = 0;
-		LootCommand.goodCatchesSession = 0;
-		LootCommand.greatCatchesSession = 0;
-		LootCommand.squidsSession = 0;
-		LootCommand.seaWalkersSession = 0;
-		LootCommand.nightSquidsSession = 0;
-		LootCommand.seaGuardiansSession = 0;
-		LootCommand.seaWitchesSession = 0;
-		LootCommand.seaArchersSession = 0;
-		LootCommand.monsterOfTheDeepsSession = 0;
-		LootCommand.catfishesSession = 0;
-		LootCommand.carrotKingsSession = 0;
-		LootCommand.seaLeechesSession = 0;
-		LootCommand.guardianDefendersSession = 0;
-		LootCommand.deepSeaProtectorsSession = 0;
-		LootCommand.hydrasSession = 0;
-		LootCommand.seaEmperorsSession = 0;
-		LootCommand.empTimeSession = -1;
-		LootCommand.empSCsSession = -1;
-		LootCommand.fishingMilestoneSession = 0;
-		LootCommand.frozenStevesSession = 0;
-		LootCommand.frostyTheSnowmansSession = 0;
-		LootCommand.grinchesSession = 0;
-		LootCommand.yetisSession = 0;
-		LootCommand.yetiTimeSession = -1;
-		LootCommand.yetiSCsSession = -1;
-		LootCommand.nurseSharksSession = 0;
-		LootCommand.blueSharksSession = 0;
-		LootCommand.tigerSharksSession = 0;
-		LootCommand.greatWhiteSharksSession = 0;
-		LootCommand.scarecrowsSession = 0;
-		LootCommand.nightmaresSession = 0;
-		LootCommand.werewolfsSession = 0;
-		LootCommand.phantomFishersSession = 0;
-		LootCommand.grimReapersSession = 0;
+		LootTracker.seaCreaturesSession = 0;
+		LootTracker.goodCatchesSession = 0;
+		LootTracker.greatCatchesSession = 0;
+		LootTracker.squidsSession = 0;
+		LootTracker.seaWalkersSession = 0;
+		LootTracker.nightSquidsSession = 0;
+		LootTracker.seaGuardiansSession = 0;
+		LootTracker.seaWitchesSession = 0;
+		LootTracker.seaArchersSession = 0;
+		LootTracker.monsterOfTheDeepsSession = 0;
+		LootTracker.catfishesSession = 0;
+		LootTracker.carrotKingsSession = 0;
+		LootTracker.seaLeechesSession = 0;
+		LootTracker.guardianDefendersSession = 0;
+		LootTracker.deepSeaProtectorsSession = 0;
+		LootTracker.hydrasSession = 0;
+		LootTracker.seaEmperorsSession = 0;
+		LootTracker.empTimeSession = -1;
+		LootTracker.empSCsSession = -1;
+		LootTracker.fishingMilestoneSession = 0;
+		LootTracker.frozenStevesSession = 0;
+		LootTracker.frostyTheSnowmansSession = 0;
+		LootTracker.grinchesSession = 0;
+		LootTracker.yetisSession = 0;
+		LootTracker.yetiTimeSession = -1;
+		LootTracker.yetiSCsSession = -1;
+		LootTracker.nurseSharksSession = 0;
+		LootTracker.blueSharksSession = 0;
+		LootTracker.tigerSharksSession = 0;
+		LootTracker.greatWhiteSharksSession = 0;
+		LootTracker.scarecrowsSession = 0;
+		LootTracker.nightmaresSession = 0;
+		LootTracker.werewolfsSession = 0;
+		LootTracker.phantomFishersSession = 0;
+		LootTracker.grimReapersSession = 0;
 		ConfigHandler.deleteCategory("fishing");
 		ConfigHandler.reloadConfig();
 	}
 	
 	static void resetMythological() {
-		LootCommand.mythCoinsSession = 0;
-		LootCommand.griffinFeathersSession = 0;
-		LootCommand.crownOfGreedsSession = 0;
-		LootCommand.washedUpSouvenirsSession = 0;
-		LootCommand.minosHuntersSession = 0;
-		LootCommand.siameseLynxesSession = 0;
-		LootCommand.minotaursSession = 0;
-		LootCommand.gaiaConstructsSession = 0;
-		LootCommand.minosChampionsSession = 0;
-		LootCommand.minosInquisitorsSession = 0;
+		LootTracker.mythCoinsSession = 0;
+		LootTracker.griffinFeathersSession = 0;
+		LootTracker.crownOfGreedsSession = 0;
+		LootTracker.washedUpSouvenirsSession = 0;
+		LootTracker.minosHuntersSession = 0;
+		LootTracker.siameseLynxesSession = 0;
+		LootTracker.minotaursSession = 0;
+		LootTracker.gaiaConstructsSession = 0;
+		LootTracker.minosChampionsSession = 0;
+		LootTracker.minosInquisitorsSession = 0;
 		ConfigHandler.deleteCategory("mythological");
 		ConfigHandler.reloadConfig();
 	}
 	
 	static void resetCatacombs() {
-		LootCommand.recombobulatorsSession = 0;
-		LootCommand.fumingPotatoBooksSession = 0;
-		LootCommand.bonzoStaffsSession = 0;
-		LootCommand.f1CoinsSpentSession = 0;
-		LootCommand.f1TimeSpentSession = 0;
-		LootCommand.scarfStudiesSession = 0;
-		LootCommand.f2CoinsSpentSession = 0;
-		LootCommand.f2TimeSpentSession = 0;
-		LootCommand.adaptiveHelmsSession = 0;
-		LootCommand.adaptiveChestsSession = 0;
-		LootCommand.adaptiveLegsSession = 0;
-		LootCommand.adaptiveBootsSession = 0;
-		LootCommand.adaptiveSwordsSession = 0;
-		LootCommand.f3CoinsSpentSession = 0;
-		LootCommand.f3TimeSpentSession = 0;
-		LootCommand.spiritWingsSession = 0;
-		LootCommand.spiritBonesSession = 0;
-		LootCommand.spiritBootsSession = 0;
-		LootCommand.spiritSwordsSession = 0;
-		LootCommand.epicSpiritPetsSession = 0;
-		LootCommand.f4CoinsSpentSession = 0;
-		LootCommand.f4TimeSpentSession = 0;
-		LootCommand.warpedStonesSession = 0;
-		LootCommand.shadowAssHelmsSession = 0;
-		LootCommand.shadowAssChestsSession = 0;
-		LootCommand.shadowAssLegsSession = 0;
-		LootCommand.shadowAssBootsSession = 0;
-		LootCommand.lividDaggersSession = 0;
-		LootCommand.shadowFurysSession = 0;
-		LootCommand.f5CoinsSpentSession = 0;
-		LootCommand.f5TimeSpentSession = 0;
-		LootCommand.ancientRosesSession = 0;
-		LootCommand.precursorEyesSession = 0;
-		LootCommand.giantsSwordsSession = 0;
-		LootCommand.necroLordHelmsSession = 0;
-		LootCommand.necroLordChestsSession = 0;
-		LootCommand.necroLordLegsSession = 0;
-		LootCommand.necroLordBootsSession = 0;
-		LootCommand.necroSwordsSession = 0;
-		LootCommand.f6CoinsSpentSession = 0;
-		LootCommand.f6TimeSpentSession = 0;
-		LootCommand.witherBloodsSession = 0;
-		LootCommand.witherCloaksSession = 0;
-		LootCommand.implosionsSession = 0;
-		LootCommand.witherShieldsSession = 0;
-		LootCommand.shadowWarpsSession = 0;
-		LootCommand.necronsHandlesSession = 0;
-		LootCommand.autoRecombsSession = 0;
-		LootCommand.witherHelmsSession = 0;
-		LootCommand.witherChestsSession = 0;
-		LootCommand.witherLegsSession = 0;
-		LootCommand.witherBootsSession = 0;
-		LootCommand.f7CoinsSpentSession = 0;
-		LootCommand.f7TimeSpentSession = 0;
+		LootTracker.recombobulatorsSession = 0;
+		LootTracker.fumingPotatoBooksSession = 0;
+		LootTracker.bonzoStaffsSession = 0;
+		LootTracker.f1CoinsSpentSession = 0;
+		LootTracker.f1TimeSpentSession = 0;
+		LootTracker.scarfStudiesSession = 0;
+		LootTracker.f2CoinsSpentSession = 0;
+		LootTracker.f2TimeSpentSession = 0;
+		LootTracker.adaptiveHelmsSession = 0;
+		LootTracker.adaptiveChestsSession = 0;
+		LootTracker.adaptiveLegsSession = 0;
+		LootTracker.adaptiveBootsSession = 0;
+		LootTracker.adaptiveSwordsSession = 0;
+		LootTracker.f3CoinsSpentSession = 0;
+		LootTracker.f3TimeSpentSession = 0;
+		LootTracker.spiritWingsSession = 0;
+		LootTracker.spiritBonesSession = 0;
+		LootTracker.spiritBootsSession = 0;
+		LootTracker.spiritSwordsSession = 0;
+		LootTracker.epicSpiritPetsSession = 0;
+		LootTracker.f4CoinsSpentSession = 0;
+		LootTracker.f4TimeSpentSession = 0;
+		LootTracker.warpedStonesSession = 0;
+		LootTracker.shadowAssHelmsSession = 0;
+		LootTracker.shadowAssChestsSession = 0;
+		LootTracker.shadowAssLegsSession = 0;
+		LootTracker.shadowAssBootsSession = 0;
+		LootTracker.lividDaggersSession = 0;
+		LootTracker.shadowFurysSession = 0;
+		LootTracker.f5CoinsSpentSession = 0;
+		LootTracker.f5TimeSpentSession = 0;
+		LootTracker.ancientRosesSession = 0;
+		LootTracker.precursorEyesSession = 0;
+		LootTracker.giantsSwordsSession = 0;
+		LootTracker.necroLordHelmsSession = 0;
+		LootTracker.necroLordChestsSession = 0;
+		LootTracker.necroLordLegsSession = 0;
+		LootTracker.necroLordBootsSession = 0;
+		LootTracker.necroSwordsSession = 0;
+		LootTracker.f6CoinsSpentSession = 0;
+		LootTracker.f6TimeSpentSession = 0;
+		LootTracker.witherBloodsSession = 0;
+		LootTracker.witherCloaksSession = 0;
+		LootTracker.implosionsSession = 0;
+		LootTracker.witherShieldsSession = 0;
+		LootTracker.shadowWarpsSession = 0;
+		LootTracker.necronsHandlesSession = 0;
+		LootTracker.autoRecombsSession = 0;
+		LootTracker.witherHelmsSession = 0;
+		LootTracker.witherChestsSession = 0;
+		LootTracker.witherLegsSession = 0;
+		LootTracker.witherBootsSession = 0;
+		LootTracker.f7CoinsSpentSession = 0;
+		LootTracker.f7TimeSpentSession = 0;
 		ConfigHandler.deleteCategory("catacombs");
 		ConfigHandler.reloadConfig();
 	}