diff options
Diffstat (limited to 'src/main/java/me')
| -rw-r--r-- | src/main/java/me/shedaniel/rei/client/ClientHelperImpl.java | 11 | ||||
| -rw-r--r-- | src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java | 3 |
2 files changed, 3 insertions, 11 deletions
diff --git a/src/main/java/me/shedaniel/rei/client/ClientHelperImpl.java b/src/main/java/me/shedaniel/rei/client/ClientHelperImpl.java index a41ef37e9..409d8815a 100644 --- a/src/main/java/me/shedaniel/rei/client/ClientHelperImpl.java +++ b/src/main/java/me/shedaniel/rei/client/ClientHelperImpl.java @@ -56,17 +56,10 @@ public class ClientHelperImpl implements ClientHelper, ClientModInitializer { private final Map<String, String> modNameCache = Maps.newHashMap(); public FabricKeyBinding recipe, usage, hide, previousPage, nextPage, focusSearchField; - public String getFormattedModNoItalicFromItem(Item item) { - String mod = getModFromItem(item); - if (mod.equalsIgnoreCase("")) - return ""; - return Formatting.BLUE.toString() + mod; - } - @Override public String getFormattedModFromItem(Item item) { String mod = getModFromItem(item); - if (mod.equalsIgnoreCase("")) + if (mod.isEmpty()) return ""; return Formatting.BLUE.toString() + Formatting.ITALIC.toString() + mod; } @@ -74,7 +67,7 @@ public class ClientHelperImpl implements ClientHelper, ClientModInitializer { @Override public String getFormattedModFromIdentifier(Identifier identifier) { String mod = getModFromIdentifier(identifier); - if (mod.equalsIgnoreCase("")) + if (mod.isEmpty()) return ""; return Formatting.BLUE.toString() + Formatting.ITALIC.toString() + mod; } diff --git a/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java index 9c247dff0..1264b7aad 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java @@ -10,7 +10,6 @@ import com.mojang.blaze3d.platform.GlStateManager; import me.shedaniel.cloth.api.ClientUtils; import me.shedaniel.rei.api.ClientHelper; import me.shedaniel.rei.api.Renderer; -import me.shedaniel.rei.client.ClientHelperImpl; import me.shedaniel.rei.client.ScreenHelper; import me.shedaniel.rei.gui.renderers.ItemStackRenderer; import net.minecraft.client.gui.Element; @@ -152,7 +151,7 @@ public class SlotWidget extends WidgetWithBounds { protected List<String> getTooltip(ItemStack itemStack) { final String modString = ClientHelper.getInstance().getFormattedModFromItem(itemStack.getItem()); List<String> toolTip = Lists.newArrayList(ItemListOverlay.tryGetItemStackToolTip(itemStack, true)); - String s1 = ClientHelperImpl.instance.getFormattedModNoItalicFromItem(itemStack.getItem()).toLowerCase(Locale.ROOT); + String s1 = ClientHelper.getInstance().getModFromItem(itemStack.getItem()).toLowerCase(Locale.ROOT); toolTip.addAll(getExtraToolTips(itemStack)); if (!modString.isEmpty()) { toolTip.removeIf(s -> s.toLowerCase(Locale.ROOT).contains(s1)); |
