diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/garden')
5 files changed, 143 insertions, 120 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt index a3cea69a6..959ab43e4 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt @@ -41,52 +41,52 @@ object CaptureFarmingGear { private val patternGroup = RepoPattern.group("garden.fortuneguide.capture") private val farmingLevelUpPattern by patternGroup.pattern( "farminglevel", - "SKILL LEVEL UP Farming .*➜(?<level>.*)" + "SKILL LEVEL UP Farming .*➜(?<level>.*)", ) private val fortuneUpgradePattern by patternGroup.pattern( "fortuneupgrade", - "You claimed the Garden Farming Fortune (?<level>.*) upgrade!" + "You claimed the Garden Farming Fortune (?<level>.*) upgrade!", ) private val bestiaryPattern by patternGroup.pattern( "bestiary", - ".*§6+(?<fortune>.*)☘ Farming Fortune.*" + ".*§6+(?<fortune>.*)☘ Farming Fortune.*", ) private val anitaBuffPattern by patternGroup.pattern( "anitabuff", - "You tiered up the Extra Farming Drops upgrade to [+](?<level>.*)%!" + "You tiered up the Extra Farming Drops upgrade to [+](?<level>.*)%!", ) private val anitaMenuPattern by patternGroup.pattern( "anitamenu", - "§7You have: §6\\+(?<level>.*)☘ Farming Fortune" + "§7You have: §6\\+(?<level>.*)☘ Farming Fortune", ) private val lotusUpgradePattern by patternGroup.pattern( "lotusupgrade", - "Lotus (?<piece>.*) upgraded to [+].*☘!" + "Lotus (?<piece>.*) upgraded to [+].*☘!", ) private val petLevelUpPattern by patternGroup.pattern( "petlevelup", - "Your (?<pet>.*) leveled up to level .*!" + "Your (?<pet>.*) leveled up to level .*!", ) private val cakePattern by patternGroup.pattern( "cake", - "(?:Big )?Yum! You (?:gain|refresh) [+]5☘ Farming Fortune for 48 hours!" + "(?:Big )?Yum! You (?:gain|refresh) [+]5☘ Farming Fortune for 48 hours!", ) private val strengthPattern by patternGroup.pattern( "strength", - " Strength: §r§c❁(?<strength>.*)" + " Strength: §r§c❁(?<strength>.*)", ) private val tierPattern by patternGroup.pattern( "uniquevisitors.tier", - "§7Progress to Tier (?<nextTier>\\w+):.*" + "§7Progress to Tier (?<nextTier>\\w+):.*", ) private val tierProgressPattern by patternGroup.pattern( "uniquevisitors.tierprogress", - ".* §e(?<having>.*)§6/(?<total>.*)" + ".* §e(?<having>.*)§6/(?<total>.*)", ) private val farmingSets = arrayListOf( "FERMENTO", "SQUASH", "CROPIE", "MELON", "FARM", - "RANCHERS", "FARMER", "RABBIT" + "RANCHERS", "FARMER", "RABBIT", ) init { diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFInfos.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFInfos.kt index 31c02b26f..084ba28e0 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFInfos.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFInfos.kt @@ -7,16 +7,19 @@ internal enum class FFInfos( private val currentF: () -> Number, private val maxF: (FFInfos) -> Number, ) { - UNIVERSAL(null, { FFStats.totalBaseFF }, FFTypes.TOTAL, { - val backupArmor = FarmingItems.currentArmor - val backupEquip = FarmingItems.currentEquip - FarmingItems.currentArmor = null - FarmingItems.currentEquip = null - val total = maxSumToThis(it) - FarmingItems.currentArmor = backupArmor - FarmingItems.currentEquip = backupEquip - total - }), + UNIVERSAL( + null, { FFStats.totalBaseFF }, FFTypes.TOTAL, + { + val backupArmor = FarmingItems.currentArmor + val backupEquip = FarmingItems.currentEquip + FarmingItems.currentArmor = null + FarmingItems.currentEquip = null + val total = maxSumToThis(it) + FarmingItems.currentArmor = backupArmor + FarmingItems.currentEquip = backupEquip + total + }, + ), FARMING_LEVEL(UNIVERSAL, { FFStats.baseFF }, FFTypes.FARMING_LVL, 240), BESTIARY(UNIVERSAL, { FFStats.baseFF }, FFTypes.BESTIARY, 60), GARDEN_PLOTS(UNIVERSAL, { FFStats.baseFF }, FFTypes.PLOTS, 72), @@ -24,85 +27,100 @@ internal enum class FFInfos( COMMUNITY_SHOP(UNIVERSAL, { FFStats.baseFF }, FFTypes.COMMUNITY_SHOP, 40), CAKE_BUFF(UNIVERSAL, { FFStats.baseFF }, FFTypes.CAKE, 5), TOTAL_ARMOR(UNIVERSAL, { FarmingItems.currentArmor?.getFFData() ?: FFStats.armorTotalFF }, FFTypes.TOTAL), - BASE_ARMOR(TOTAL_ARMOR, { FarmingItems.currentArmor?.getFFData() ?: FFStats.armorTotalFF }, FFTypes.BASE, { - when (FarmingItems.currentArmor) { - FarmingItems.HELMET -> 30 - FarmingItems.CHESTPLATE, FarmingItems.LEGGINGS -> 35 - FarmingItems.BOOTS -> if (FFStats.usingSpeedBoots) 60 else 30 - else -> if (FFStats.usingSpeedBoots) 160 else 130 - } - }), - ABILITY_ARMOR(TOTAL_ARMOR, { FarmingItems.currentArmor?.getFFData() ?: FFStats.armorTotalFF }, FFTypes.ABILITY, { - when (FarmingItems.currentArmor) { - FarmingItems.HELMET, FarmingItems.CHESTPLATE, FarmingItems.LEGGINGS -> if (FFStats.usingSpeedBoots) 16.667 else 18.75 - FarmingItems.BOOTS -> if (FFStats.usingSpeedBoots) 0 else 18.75 - else -> if (FFStats.usingSpeedBoots) 50 else 75 - } - }), - REFORGE_ARMOR(TOTAL_ARMOR, { FarmingItems.currentArmor?.getFFData() ?: FFStats.armorTotalFF }, FFTypes.REFORGE, { - when (FarmingItems.currentArmor) { - FarmingItems.HELMET, FarmingItems.CHESTPLATE, FarmingItems.LEGGINGS -> 30 - FarmingItems.BOOTS -> if (FFStats.usingSpeedBoots) 25 else 30 - else -> if (FFStats.usingSpeedBoots) 115 else 120 - } - }), + BASE_ARMOR( + TOTAL_ARMOR, { FarmingItems.currentArmor?.getFFData() ?: FFStats.armorTotalFF }, FFTypes.BASE, + { + when (FarmingItems.currentArmor) { + FarmingItems.HELMET -> 30 + FarmingItems.CHESTPLATE, FarmingItems.LEGGINGS -> 35 + FarmingItems.BOOTS -> if (FFStats.usingSpeedBoots) 60 else 30 + else -> if (FFStats.usingSpeedBoots) 160 else 130 + } + }, + ), + ABILITY_ARMOR( + TOTAL_ARMOR, { FarmingItems.currentArmor?.getFFData() ?: FFStats.armorTotalFF }, FFTypes.ABILITY, + { + when (FarmingItems.currentArmor) { + FarmingItems.HELMET, FarmingItems.CHESTPLATE, FarmingItems.LEGGINGS -> if (FFStats.usingSpeedBoots) 16.667 else 18.75 + FarmingItems.BOOTS -> if (FFStats.usingSpeedBoots) 0 else 18.75 + else -> if (FFStats.usingSpeedBoots) 50 else 75 + } + }, + ), + REFORGE_ARMOR( + TOTAL_ARMOR, { FarmingItems.currentArmor?.getFFData() ?: FFStats.armorTotalFF }, FFTypes.REFORGE, + { + when (FarmingItems.currentArmor) { + FarmingItems.HELMET, FarmingItems.CHESTPLATE, FarmingItems.LEGGINGS -> 30 + FarmingItems.BOOTS -> if (FFStats.usingSpeedBoots) 25 else 30 + else -> if (FFStats.usingSpeedBoots) 115 else 120 + } + }, + ), ENCHANT_ARMOR( sumTo = TOTAL_ARMOR, from = { FarmingItems.currentArmor?.getFFData() ?: FFStats.armorTotalFF }, what = FFTypes.ENCHANT, x4 = { FarmingItems.currentArmor == null }, - max = 5 + max = 5, + ), + GEMSTONE_ARMOR( + TOTAL_ARMOR, { FarmingItems.currentArmor?.getFFData() ?: FFStats.armorTotalFF }, FFTypes.GEMSTONE, + { + when (FarmingItems.currentArmor) { + FarmingItems.HELMET, FarmingItems.CHESTPLATE, FarmingItems.LEGGINGS -> 20 + FarmingItems.BOOTS -> if (FFStats.usingSpeedBoots) 16 else 20 + else -> if (FFStats.usingSpeedBoots) 76 else 80 + } + }, ), - GEMSTONE_ARMOR(TOTAL_ARMOR, { FarmingItems.currentArmor?.getFFData() ?: FFStats.armorTotalFF }, FFTypes.GEMSTONE, { - when (FarmingItems.currentArmor) { - FarmingItems.HELMET, FarmingItems.CHESTPLATE, FarmingItems.LEGGINGS -> 20 - FarmingItems.BOOTS -> if (FFStats.usingSpeedBoots) 16 else 20 - else -> if (FFStats.usingSpeedBoots) 76 else 80 - } - }), TOTAL_PET(UNIVERSAL, { FarmingItems.currentPet.getFFData() }, FFTypes.TOTAL), - PET_BASE(TOTAL_PET, { FarmingItems.currentPet.getFFData() }, FFTypes.BASE, { - when (FarmingItems.currentPet) { - FarmingItems.ELEPHANT -> 150 - FarmingItems.MOOSHROOM_COW -> 158 - FarmingItems.BEE -> 30 - FarmingItems.SLUG -> 100 - else -> 0 - } - }), + PET_BASE( + TOTAL_PET, { FarmingItems.currentPet.getFFData() }, FFTypes.BASE, + { + when (FarmingItems.currentPet) { + FarmingItems.ELEPHANT -> 150 + FarmingItems.MOOSHROOM_COW -> 158 + FarmingItems.BEE -> 30 + FarmingItems.SLUG -> 100 + else -> 0 + } + }, + ), PET_ITEM(TOTAL_PET, { FarmingItems.currentPet.getFFData() }, FFTypes.PET_ITEM, 60), TOTAL_EQUIP( sumTo = UNIVERSAL, from = { FarmingItems.currentEquip?.getFFData() ?: FFStats.equipmentTotalFF }, - what = FFTypes.TOTAL + what = FFTypes.TOTAL, ), BASE_EQUIP( sumTo = TOTAL_EQUIP, from = { FarmingItems.currentEquip?.getFFData() ?: FFStats.equipmentTotalFF }, what = FFTypes.BASE, x4 = { FarmingItems.currentEquip == null }, - max = 5.0 + max = 5.0, ), ABILITY_EQUIP( sumTo = TOTAL_EQUIP, from = { FarmingItems.currentEquip?.getFFData() ?: FFStats.equipmentTotalFF }, what = FFTypes.ABILITY, x4 = { FarmingItems.currentEquip == null }, - max = 15.0 + max = 15.0, ), REFORGE_EQUIP( sumTo = TOTAL_EQUIP, from = { FarmingItems.currentEquip?.getFFData() ?: FFStats.equipmentTotalFF }, what = FFTypes.REFORGE, x4 = { FarmingItems.currentEquip == null }, - max = 15.0 + max = 15.0, ), ENCHANT_EQUIP( sumTo = TOTAL_EQUIP, from = { FarmingItems.currentEquip?.getFFData() ?: FFStats.equipmentTotalFF }, what = FFTypes.ENCHANT, x4 = { FarmingItems.currentEquip == null }, - max = { at.hannibal2.skyhanni.features.garden.GardenAPI.totalAmountVisitorsExisting.toDouble() / 4.0 } + max = { at.hannibal2.skyhanni.features.garden.GardenAPI.totalAmountVisitorsExisting.toDouble() / 4.0 }, ), ; diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt index 53aca9e99..d2740928a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt @@ -160,7 +160,7 @@ object FFStats { currentPetItem = FarmingItems.currentPet.getItem().getPetItem().toString() totalBaseFF = combineFFData( - baseFF, armorTotalFF, equipmentTotalFF, FarmingItems.currentPet.getFFData() + baseFF, armorTotalFF, equipmentTotalFF, FarmingItems.currentPet.getFFData(), ) FFGuideGUI.updateDisplay() diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingItems.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingItems.kt index 9517f366f..b46d6ebe4 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingItems.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingItems.kt @@ -96,10 +96,11 @@ enum class FarmingItems( val content = Renderable.clickable( Renderable.itemStackWithTip( - getItem(), 1.0, 0, 0, false + getItem(), 1.0, 0, 0, false, ), onClick = onClick(), - condition = { clickEnabled }) + condition = { clickEnabled }, + ) override val width = content.width override val height = content.height @@ -112,7 +113,7 @@ enum class FarmingItems( 0, width, height, - if (this@FarmingItems.selectedState) 0xFFB3FFB3.toInt() else 0xFF43464B.toInt() + if (selectedState) 0xFFB3FFB3.toInt() else 0xFF43464B.toInt(), ) content.render(posX, posY) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt index 960f5c915..13b74a59c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt @@ -13,7 +13,7 @@ import at.hannibal2.skyhanni.utils.renderables.Renderable class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7, footerSpacing: Int = 6) : GuideTablePage( - sizeX, sizeY, paddingX, paddingY, footerSpacing + sizeX, sizeY, paddingX, paddingY, footerSpacing, ) { override fun onEnter() { @@ -21,6 +21,7 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7 update(content, footer) } + //TODO split up this 240 lines function fun getPage(): Pair<List<List<Renderable>>, List<Renderable>> { val content = mutableListOf<MutableList<Renderable>>() val footer = mutableListOf<Renderable>() @@ -31,8 +32,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7 FFInfos.UNIVERSAL.bar( "§6Universal Farming Fortune", "§7§2Farming fortune in that is\n§2applied to every crop\n§eNot the same as tab FF\n" + - "§eSee on the grass block page" - ) + "§eSee on the grass block page", + ), ) content.addTable( @@ -40,8 +41,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7 FFInfos.FARMING_LEVEL.bar( "§2Farming Level", if (FFTypes.FARMING_LVL.notSaved()) "§cFarming level not saved\n§eOpen /skills to set it!" - else "§7§2Fortune for levelling your farming skill\n§2You get 4☘ per farming level" - ) + else "§7§2Fortune for levelling your farming skill\n§2You get 4☘ per farming level", + ), ) content.addTable( @@ -49,8 +50,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7 FFInfos.BESTIARY.bar( "§2Bestiary", if (FFTypes.BESTIARY.notSaved()) "§cBestiary fortune not saved\n§eOpen /bestiary to set it!" - else "§7§2Fortune for killing pests\n§2You get 0.4☘ per bestiary milestone per pest" - ) + else "§7§2Fortune for killing pests\n§2You get 0.4☘ per bestiary milestone per pest", + ), ) content.addTable( @@ -59,8 +60,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7 "§2Garden Plots", if (FFTypes.PLOTS.notSaved()) "§cUnlocked plot count not saved\n" + "§eOpen /desk and view your plots to set it!" - else "§7§2Fortune for unlocking garden plots\n§2You get 3☘ per plot unlocked" - ) + else "§7§2Fortune for unlocking garden plots\n§2You get 3☘ per plot unlocked", + ), ) content.addTable( @@ -68,8 +69,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7 FFInfos.ANITA_BUFF.bar( "§2Anita Buff", if (FFTypes.ANITA.notSaved()) "§cAnita buff not saved\n§eVisit Anita to set it!" - else "§7§2Fortune for levelling your Anita extra crops\n§2You get 4☘ per buff level" - ) + else "§7§2Fortune for levelling your Anita extra crops\n§2You get 4☘ per buff level", + ), ) content.addTable( @@ -78,23 +79,26 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7 "§2Community upgrades", if (FFTypes.COMMUNITY_SHOP.notSaved()) "§cCommunity upgrade level not saved\n" + "§eVisit Elizabeth to set it!" - else "§7§2Fortune for community shop upgrades\n§2You get 4☘ per upgrade tier" - ) + else "§7§2Fortune for community shop upgrades\n§2You get 4☘ per upgrade tier", + ), ) content.addTable( 6, FFInfos.CAKE_BUFF.bar( - "§2Cake Buff", when { + "§2Cake Buff", + when { FFStats.cakeExpireTime.isFarPast() -> "§eYou have not eaten a cake since\n§edownloading this update, assuming the\n§ebuff is active!" + FFStats.cakeExpireTime.isInPast() -> "§cYour cake buff has run out\nGo eat some cake!" + else -> "§7§2Fortune for eating cake\n§2You get 5☘ for eating cake\n" + "§2Time until cake buff runs out: $timeUntilCakes" - } - ) + }, + ), ) val moreInfo = "§2Select a piece for more info" @@ -106,8 +110,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7 FFInfos.TOTAL_ARMOR.bar( "§2Total $wordArmor Fortune", if (FarmingItems.currentArmor == null) "§7§2Total fortune from your armor\n$moreInfo" - else "§7§2Total fortune from your\n$armorName" - ) + else "§7§2Total fortune from your\n$armorName", + ), ) content.addTable( @@ -115,8 +119,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7 FFInfos.BASE_ARMOR.bar( "§2Base $wordArmor Fortune", if (FarmingItems.currentArmor == null) "§7§2The base fortune from your armor\n$moreInfo" - else "§7§2Base fortune from your\n$armorName" - ) + else "§7§2Base fortune from your\n$armorName", + ), ) content.addTable( @@ -124,8 +128,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7 FFInfos.ABILITY_ARMOR.bar( "§2$wordArmor Ability", if (FarmingItems.currentArmor == null) "§7§2The fortune from your armor's ability\n$moreInfo" - else "§7§2Ability fortune from your\n$armorName" - ) + else "§7§2Ability fortune from your\n$armorName", + ), ) content.addTable( @@ -133,8 +137,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7 FFInfos.REFORGE_ARMOR.bar( "§2$wordArmor Reforge", if (FarmingItems.currentArmor == null) "§7§2The fortune from your armor's reforge\n$moreInfo" - else "§7§2Reforge fortune from your\n$armorName}" - ) + else "§7§2Reforge fortune from your\n$armorName}", + ), ) content.addTable( @@ -142,8 +146,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7 FFInfos.ENCHANT_ARMOR.bar( "§2$wordArmor Enchantment", if (FarmingItems.currentArmor == null) "§7§2The fortune from your armor's enchantments\n$moreInfo" - else "§7§2Enchantment fortune from your\n$armorName}" - ) + else "§7§2Enchantment fortune from your\n$armorName}", + ), ) content.addTable( @@ -151,8 +155,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7 FFInfos.GEMSTONE_ARMOR.bar( "§2$wordArmor Gemstones", if (FarmingItems.currentArmor == null) "§7§2The fortune from your armor's gemstones\n$moreInfo" - else "§7§2Gemstone fortune from your\n$armorName}" - ) + else "§7§2Gemstone fortune from your\n$armorName}", + ), ) val wordEquip = if (FarmingItems.currentEquip == null) "Equipment" else "Piece" @@ -164,8 +168,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7 FFInfos.TOTAL_EQUIP.bar( "§2Total $wordEquip Fortune", if (FarmingItems.currentEquip == null) "§7§2Total fortune from your equipment\n$moreInfo" - else "§7§2Total fortune from your\n$equipmentName" - ) + else "§7§2Total fortune from your\n$equipmentName", + ), ) content.addTable( @@ -173,8 +177,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7 FFInfos.BASE_EQUIP.bar( "§2$wordEquip Base Fortune", if (FarmingItems.currentEquip == null) "§7§2The base fortune from your equipment\n$moreInfo" - else "§7§2Base fortune from your\n$equipmentName" - ) + else "§7§2Base fortune from your\n$equipmentName", + ), ) content.addTable( @@ -182,8 +186,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7 FFInfos.ABILITY_EQUIP.bar( "§2$wordEquip Ability", if (FarmingItems.currentEquip == null) "§7§2The fortune from your equipment's abilities\n$moreInfo" - else "§7§2Ability fortune from your\n$equipmentName" - ) + else "§7§2Ability fortune from your\n$equipmentName", + ), ) content.addTable( @@ -191,8 +195,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7 FFInfos.REFORGE_EQUIP.bar( "§2$wordEquip Reforge", if (FarmingItems.currentEquip == null) "§7§2The fortune from your equipment's reforges\n$moreInfo" - else "§7§2Reforge fortune from your\n$equipmentName" - ) + else "§7§2Reforge fortune from your\n$equipmentName", + ), ) content.addTable( @@ -200,8 +204,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7 FFInfos.ENCHANT_EQUIP.bar( "§2$wordEquip Enchantment", if (FarmingItems.currentEquip == null) "§7§2The fortune from your equipment's enchantments\n$moreInfo" - else "§7§2Enchantment fortune from your\n$equipmentName" - ) + else "§7§2Enchantment fortune from your\n$equipmentName", + ), ) footer.add( @@ -209,24 +213,24 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7 FarmingItems.getPetsDisplay(true), 4, horizontalAlign = RenderUtils.HorizontalAlignment.CENTER, - verticalAlign = RenderUtils.VerticalAlignment.CENTER - ) + verticalAlign = RenderUtils.VerticalAlignment.CENTER, + ), ) footer.add( FFInfos.TOTAL_PET.bar( "§2Total Pet Fortune", "§7§2The total fortune from your pet and its item", - 72 - ) + 72, + ), ) footer.add( FFInfos.PET_BASE.bar( "§2Base Pet Fortune", "§7§2The base fortune from your pet", - 72 - ) + 72, + ), ) footer.add( @@ -238,8 +242,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7 "MINOS_RELIC" -> "§cGreen Bandana is better for fortune than minos relic!" else -> "No fortune boosting pet item" }, - 72 - ) + 72, + ), ) // Displays @@ -250,8 +254,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7 FarmingItems.getArmorDisplay(true), 4, horizontalAlign = RenderUtils.HorizontalAlignment.CENTER, - verticalAlign = RenderUtils.VerticalAlignment.CENTER - ) + verticalAlign = RenderUtils.VerticalAlignment.CENTER, + ), ) content.addTable( 0, @@ -259,8 +263,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7 FarmingItems.getEquipmentDisplay(true), 4, horizontalAlign = RenderUtils.HorizontalAlignment.CENTER, - verticalAlign = RenderUtils.VerticalAlignment.CENTER - ) + verticalAlign = RenderUtils.VerticalAlignment.CENTER, + ), ) return content to footer |