diff options
author | nmccullagh <narhanael64@gmail.com> | 2024-07-06 11:34:36 +0100 |
---|---|---|
committer | nmccullagh <narhanael64@gmail.com> | 2024-07-06 11:34:36 +0100 |
commit | fb16a9bebc82698c5149a11426cace87edd5a627 (patch) | |
tree | 75e8614f3913fb265d19b09267e22f1910aef2d9 /src/main/java/de/hysky/skyblocker | |
parent | b22cf286d971af6e2c27f4dfcbe6e1829935a5b7 (diff) | |
download | Skyblocker-fb16a9bebc82698c5149a11426cace87edd5a627.tar.gz Skyblocker-fb16a9bebc82698c5149a11426cace87edd5a627.tar.bz2 Skyblocker-fb16a9bebc82698c5149a11426cace87edd5a627.zip |
feedback2
Diffstat (limited to 'src/main/java/de/hysky/skyblocker')
-rw-r--r-- | src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java | 2 | ||||
-rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/CraftPriceTooltip.java | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java index 514b4d43..279b7f6a 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -161,7 +161,7 @@ public class GeneralCategory { .binding(defaults.general.itemTooltip.enableCraftingCost, () -> config.general.itemTooltip.enableCraftingCost, newValue -> config.general.itemTooltip.enableCraftingCost = newValue) - .listener((Option<GeneralConfig.Craft> craft, GeneralConfig.Craft newCraft) -> CraftPriceTooltip.clearCache()) + .listener((Option<GeneralConfig.Craft> ignored, GeneralConfig.Craft ignored2) -> CraftPriceTooltip.clearCache()) .controller(ConfigUtils::createEnumCyclingListController) .build()) .option(Option.<Boolean>createBuilder() diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/CraftPriceTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/CraftPriceTooltip.java index f36254f3..32c36c9a 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/CraftPriceTooltip.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/CraftPriceTooltip.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; public class CraftPriceTooltip extends TooltipAdder { protected static final Logger LOGGER = LoggerFactory.getLogger(CraftPriceTooltip.class.getName()); - private final static Map<String, Double> cachedCraftCosts = new ConcurrentHashMap<>(); + private static final Map<String, Double> cachedCraftCosts = new ConcurrentHashMap<>(); private static final int MAX_RECURSION_DEPTH = 15; public CraftPriceTooltip(int priority) { @@ -47,16 +47,16 @@ public class CraftPriceTooltip extends TooltipAdder { if (neuItem == null) return; List<NEURecipe> neuRecipes = neuItem.getRecipes(); - if (neuRecipes.isEmpty() || neuRecipes.getFirst().getClass().equals(io.github.moulberry.repo.data.NEUKatUpgradeRecipe.class)) return; + if (neuRecipes.isEmpty() || neuRecipes.getFirst() instanceof io.github.moulberry.repo.data.NEUKatUpgradeRecipe) return; try { double totalCraftCost = getItemCost(neuRecipes.getFirst(), 0); if (totalCraftCost == 0) return; - neuRecipes.getFirst().getAllOutputs().stream().findFirst().ifPresent(neuIngredient -> + neuRecipes.getFirst().getAllOutputs().stream().findFirst().ifPresent(outputIngredient -> lines.add(Text.literal(String.format("%-20s", "Crafting Price:")).formatted(Formatting.GOLD) - .append(ItemTooltip.getCoinsMessage(totalCraftCost / neuIngredient.getAmount(), stack.getCount())))); + .append(ItemTooltip.getCoinsMessage(totalCraftCost / outputIngredient.getAmount(), stack.getCount())))); } catch (Exception e) { LOGGER.error("[Skyblocker Craft Price] Error calculating craftprice tooltip for: " + internalID, e); |