diff options
102 files changed, 1294 insertions, 623 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt index f41664ed3..56c25cf49 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt @@ -457,13 +457,13 @@ class SkyHanniMod { loadModule(GardenAPI) loadModule(GardenPlotAPI) loadModule(DataWatcherAPI()) - loadModule(CollectionAPI()) + loadModule(CollectionAPI) loadModule(FarmingContestAPI) loadModule(FriendAPI) loadModule(PartyAPI) loadModule(GuildAPI) loadModule(SlayerAPI) - loadModule(PurseAPI()) + loadModule(PurseAPI) loadModule(RiftAPI) loadModule(SackAPI) loadModule(BingoAPI) @@ -617,7 +617,7 @@ class SkyHanniMod { loadModule(EstimatedItemValue) loadModule(EstimatedWardrobePrice()) loadModule(ComposterInventoryNumbers()) - loadModule(FarmingFortuneDisplay()) + loadModule(FarmingFortuneDisplay) loadModule(ToolTooltipTweaks()) loadModule(CropSpeedMeter()) loadModule(AshfangMinisNametagHider()) @@ -639,7 +639,7 @@ class SkyHanniMod { loadModule(TrevorTracker) loadModule(BingoCardTips()) loadModule(GardenVisitorDropStatistics) - loadModule(CaptureFarmingGear()) + loadModule(CaptureFarmingGear) loadModule(SackDisplay) loadModule(GardenStartLocation) loadModule(PetCandyUsedDisplay()) diff --git a/src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt index ff744cecd..1e991605e 100644 --- a/src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt @@ -14,13 +14,25 @@ import at.hannibal2.skyhanni.utils.NEUItems.getItemStackOrNull import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher import at.hannibal2.skyhanni.utils.StringUtils.matches import at.hannibal2.skyhanni.utils.StringUtils.removeColor +import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -class CollectionAPI { - - // TODO USE SH-REPO - private val counterPattern = ".* §e(?<amount>.*)§6/.*".toPattern() - private val singleCounterPattern = "§7Total Collected: §e(?<amount>.*)".toPattern() +object CollectionAPI { + private val patternGroup = RepoPattern.group("data.collection.api") + private val counterPattern by patternGroup.pattern( + "counter", + ".* §e(?<amount>.*)§6/.*" + ) + private val singleCoun |