code cleanup

2 files changed, 16 insertions, 13 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index ba23b2624..ad2df542c 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -78,7 +78,7 @@ object NEUItems {
     fun readAllNeuItems(): Map<String, NEUInternalName> {
         allInternalNames.clear()
         val map = mutableMapOf<String, NEUInternalName>()
-        for (rawInternalName in manager.itemInformation.keys) {
+        for (rawInternalName in allNeuRepoItems().keys) {
             val name = manager.createItem(rawInternalName).displayName.removeColor().lowercase()
             val internalName = rawInternalName.asInternalName()
             map[name] = internalName
@@ -133,12 +133,12 @@ object NEUItems {
         return text
     }
 
-    fun getInternalName(itemStack: ItemStack) = ItemResolutionQuery(manager)
+    fun getInternalName(itemStack: ItemStack): String? = ItemResolutionQuery(manager)
         .withCurrentGuiContext()
         .withItemStack(itemStack)
         .resolveInternalName()
 
-    fun getInternalNameOrNull(nbt: NBTTagCompound) =
+    fun getInternalNameOrNull(nbt: NBTTagCompound): NEUInternalName? =
         ItemResolutionQuery(manager).withItemNBT(nbt).resolveInternalName()?.asInternalName()
 
     fun NEUInternalName.getPrice(useSellingPrice: Boolean = false) = getPriceOrNull(useSellingPrice) ?: -1.0
@@ -152,7 +152,7 @@ object NEUItems {
         return BazaarDataHolder.getNpcPrice(this)
     }
 
-    fun transHypixelNameToInternalName(hypixelId: String) =
+    fun transHypixelNameToInternalName(hypixelId: String): NEUInternalName =
         manager.auctionManager.transformHypixelBazaarToNEUItemId(hypixelId).asInternalName()
 
     fun NEUInternalName.getPriceOrNull(useSellingPrice: Boolean = false): Double? {
@@ -172,10 +172,10 @@ object NEUItems {
         return getNpcPriceOrNull()
     }
 
-    fun getPrice(internalName: String, useSellingPrice: Boolean = false) =
+    fun getPrice(internalName: String, useSellingPrice: Boolean = false): Double =
         internalName.asInternalName().getPrice(useSellingPrice)
 
-    fun NEUInternalName.getItemStackOrNull() = ItemResolutionQuery(manager)
+    fun NEUInternalName.getItemStackOrNull(): ItemStack? = ItemResolutionQuery(manager)
         .withKnownInternalName(asString())
         .resolveToItemStack()?.copy()
 
@@ -192,13 +192,14 @@ object NEUItems {
             ErrorManager.logError(
                 IllegalStateException("Something went wrong!"),
                 "Encountered an error getting the item for §7$this§c. " +
-                    "This may be because your NEU repo is outdated. Please ask in the SkyHanni " +
-                    "Discord if this is the case"
+                        "This may be because your NEU repo is outdated. Please ask in the SkyHanni " +
+                        "Discord if this is the case"
             )
             fallbackItem
         }
 
-    fun isVanillaItem(item: ItemStack) = manager.auctionManager.isVanillaItem(item.getInternalName().asString())
+    fun isVanillaItem(item: ItemStack): Boolean =
+        manager.auctionManager.isVanillaItem(item.getInternalName().asString())
 
     fun ItemStack.renderOnScreen(x: Float, y: Float, scaleMultiplier: Double = 1.0) {
         val item = checkBlinkItem()
@@ -230,6 +231,8 @@ object NEUItems {
         GlStateManager.popMatrix()
     }
 
+    fun allNeuRepoItems(): Map<String, JsonObject> = NotEnoughUpdates.INSTANCE.manager.itemInformation
+
     fun getMultiplier(internalName: NEUInternalName, tryCount: Int = 0): Pair<NEUInternalName, Int> {
         if (multiplierCache.contains(internalName)) {
             return multiplierCache[internalName]!!
@@ -323,8 +326,8 @@ object NEUItems {
             val name = group("name").trim { it <= ' ' }
             val ultimate = group("format").lowercase().contains("§l")
             ((if (ultimate && name != "Ultimate Wise") "ULTIMATE_" else "")
-                + turboCheck(name).replace(" ", "_").replace("-", "_").uppercase()
-                + ";" + group("level").romanToDecimal())
+                    + turboCheck(name).replace(" ", "_").replace("-", "_").uppercase()
+                    + ";" + group("level").romanToDecimal())
         }
 
     //Uses NEU
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderLineTooltips.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderLineTooltips.kt
index 68aebd04e..9cb7457ff 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderLineTooltips.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderLineTooltips.kt
@@ -55,7 +55,7 @@ object RenderLineTooltips {
             }
             if (needsWrap) {
                 var wrappedTooltipWidth = 0
-                val wrappedTextLines: MutableList<String?> = ArrayList()
+                val wrappedTextLines = mutableListOf<String>()
                 for (i in textLines.indices) {
                     val textLine = textLines[i]
                     val wrappedLine = font.listFormattedStringToWidth(textLine, tooltipTextWidth)
@@ -230,4 +230,4 @@ object RenderLineTooltips {
         GlStateManager.enableAlpha()
         GlStateManager.enableTexture2D()
     }
-}
\ No newline at end of file
+}