From 750d4bc9fde953e3f49a824dbce33bda7cb29c95 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Wed, 31 Oct 2018 17:11:32 +0100 Subject: [PATCH] Don't display advanced tooltip in Crafting Monitor. Fixes #2067 --- CHANGELOG.md | 5 ++++- .../craftingmonitor/CraftingMonitorElementItemRender.java | 3 +-- .../com/raoulvdberge/refinedstorage/util/RenderUtils.java | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 031864a77..ede966abc 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Refined Storage Changelog +### 1.6.10 +- Fixed client FPS stalling when using "@" mod search in the Grid (raoulvdberge) + ### 1.6.9 - Fixed OpenComputers "unknown error" when using extract item API (raoulvdberge) - Fixed client FPS stuttering when opening a Crafting Grid (raoulvdberge) @@ -18,7 +21,7 @@ - Added new Crafter modes: ignore redstone signal, redstone signal unlocks autocrafting, redstone signal locks autocrafting and redstone pulse inserts next set (replacement for blocking mode) (raoulvdberge) - Added a config option to configure the autocrafting calculation timeout in milliseconds (raoulvdberge) - Added throttling for network devices that can request autocrafting (raoulvdberge) -- Renamed Cut Processors to Raw Processors and those are now made with Processor Binding instead of a Cutting Tool (raoulvdberge) +- Renamed Cut Processors to Raw PrDon't display advanced tooltip in Crafting Monitorocessors and those are now made with Processor Binding instead of a Cutting Tool (raoulvdberge) - Fixed an autocrafting bug where it crashed when external inventories couldn't be filled (raoulvdberge) - Fixed a duplication bug with a disconnected Crafting Grid (raoulvdberge) - Fixed oredict autocrafting sometimes reporting that a craftable item is missing (raoulvdberge) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementItemRender.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementItemRender.java index 3b2d5e0d7..07acd2c16 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementItemRender.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementItemRender.java @@ -13,7 +13,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; -import java.util.stream.Collectors; public class CraftingMonitorElementItemRender implements ICraftingMonitorElement { private static final int COLOR_PROCESSING = 0xFFD9EDF7; @@ -100,7 +99,7 @@ public class CraftingMonitorElementItemRender implements ICraftingMonitorElement @Nullable @Override public String getTooltip() { - return RenderUtils.getItemTooltip(this.stack).stream().collect(Collectors.joining("\n")); + return RenderUtils.getBriefItemTooltip(this.stack); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java index 084993297..ee72c333b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java @@ -429,6 +429,10 @@ public final class RenderUtils { return lines; } + public static String getBriefItemTooltip(ItemStack stack) { + return stack.getRarity().color + stack.getDisplayName(); + } + public static boolean isLightMapDisabled() { return FMLClientHandler.instance().hasOptifine() || !ForgeModContainer.forgeLightPipelineEnabled; }