Skip to content

Commit

Permalink
Load tooltips early again, since vanilla does it in 1.12
Browse files Browse the repository at this point in the history
  • Loading branch information
@mezz
mezz committed Jul 10, 2017
1 parent c713f58 commit c321ae4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 132 deletions.
3 changes: 2 additions & 1 deletion src/main/java/mezz/jei/ingredients/IngredientFilter.java
View file
Expand Up @@ -61,11 +61,12 @@ public IngredientFilter(JeiHelpers helpers) {
PrefixedSearchTree colorSearchTree = createPrefixedSearchTree('^', Config::getColorSearchMode, IIngredientListElement::getColorStrings);
PrefixedSearchTree resourceIdSearchTree = createPrefixedSearchTree('&', Config::getResourceIdSearchMode, element -> Collections.singleton(element.getResourceId()));

this.earlyLoadSearchTrees.add(tooltipSearchTree);
this.earlyLoadSearchTrees.add(modNameSearchTree);
this.earlyLoadSearchTrees.add(oreDictSearchTree);
this.earlyLoadSearchTrees.add(creativeTabSearchTree);
this.earlyLoadSearchTrees.add(resourceIdSearchTree);
// tooltip and color search trees get loaded in onTick
// color search tree gets loaded in onTick

this.combinedSearchTrees = buildCombinedSearchTrees(this.searchTree, this.prefixedSearchTrees.valueCollection());
}
Expand Down
130 changes: 1 addition & 129 deletions src/main/java/mezz/jei/ingredients/IngredientInformation.java
View file
@@ -1,47 +1,23 @@
package mezz.jei.ingredients;

import javax.annotation.Nullable;
import java.awt.Color;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;

import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
import mezz.jei.Internal;
import mezz.jei.api.ingredients.IIngredientHelper;
import mezz.jei.api.ingredients.IIngredientRenderer;
import mezz.jei.color.ColorNamer;
import mezz.jei.config.Config;
import mezz.jei.util.FileUtil;
import mezz.jei.util.Log;
import mezz.jei.util.Translator;
import net.minecraft.client.Minecraft;
import net.minecraft.client.resources.Language;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.util.StringUtils;
import net.minecraft.util.text.TextFormatting;

public final class IngredientInformation {
private static final String CACHE_FILE = "tooltipCache.zip";
private static final Splitter NEWLINE_SPLITTER = Splitter.on("\\n");
private static final Joiner NEWLINE_JOINER = Joiner.on("\\n");
private static final Object SAVE_LOCK = new Object();
private static boolean needsSaving = false;
private static boolean saving;

private static final Map<String, List<String>> TOOLTIP_CACHE = new HashMap<>();
@Nullable
private static Language TOOLTIP_CACHE_LANG;

private IngredientInformation() {
}

Expand All @@ -51,25 +27,14 @@ public static <T> String getDisplayName(T ingredient, IIngredientHelper<T> ingre
}

public static <T> List<String> getTooltipStrings(T ingredient, IIngredientHelper<T> ingredientHelper, IIngredientRenderer<T> ingredientRenderer, Set<String> toRemove) {
String ingredientUid = ingredientHelper.getUniqueId(ingredient);
List<String> tooltipStrings = TOOLTIP_CACHE.get(ingredientUid);
if (tooltipStrings == null) {
tooltipStrings = getTooltipStringsUncached(ingredient, ingredientRenderer, toRemove);
TOOLTIP_CACHE.put(ingredientUid, tooltipStrings);
markDirty();
}
return tooltipStrings;
}

private static <T> List<String> getTooltipStringsUncached(T ingredient, IIngredientRenderer<T> ingredientRenderer, Set<String> excludeWords) {
ITooltipFlag.TooltipFlags tooltipFlag = Config.getSearchAdvancedTooltips() ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL;
Minecraft minecraft = Minecraft.getMinecraft();
List<String> tooltip = ingredientRenderer.getTooltip(minecraft, ingredient, tooltipFlag);
List<String> cleanTooltip = new ArrayList<>(tooltip.size());
for (String line : tooltip) {
line = removeChatFormatting(line);
line = Translator.toLowercaseWithLocale(line);
for (String excludeWord : excludeWords) {
for (String excludeWord : toRemove) {
line = line.replace(excludeWord, "");
}
if (!StringUtils.isNullOrEmpty(line)) {
Expand All @@ -89,97 +54,4 @@ public static <V> Collection<String> getColorStrings(V ingredient, IIngredientHe
ColorNamer colorNamer = Internal.getColorNamer();
return colorNamer.getColorNames(colors, true);
}

public static void onResourceReload() {
Minecraft minecraft = Minecraft.getMinecraft();
Language currentLanguage = minecraft.getLanguageManager().getCurrentLanguage();
if (!currentLanguage.equals(TOOLTIP_CACHE_LANG)) {
saveTooltipCacheSync(TOOLTIP_CACHE, TOOLTIP_CACHE_LANG);
TOOLTIP_CACHE.clear();
TOOLTIP_CACHE_LANG = currentLanguage;
loadTooltipCache(currentLanguage);
}
}

private static void loadTooltipCache(Language language) {
File tooltipFile = new File(Config.getJeiConfigurationDir(), CACHE_FILE);
String languageCode = language.getLanguageCode();
String zipEntryName = "tooltipCache_" + languageCode + ".txt";
FileUtil.readZipFileSafely(tooltipFile, zipEntryName, zipInputStream -> {
BufferedReader reader = new BufferedReader(new InputStreamReader(zipInputStream));

while (true) {
String ingredientUid = reader.readLine();
if (ingredientUid == null) {
break;
}
String tooltip = reader.readLine();
if (tooltip == null) {
break;
}
List<String> tooltipLines = NEWLINE_SPLITTER.splitToList(tooltip);
TOOLTIP_CACHE.put(ingredientUid, tooltipLines);
}

reader.close();
});
}

public static void markDirty() {
needsSaving = true;
}

public static void onClientTick() {
if (Minecraft.getMinecraft().world.getWorldTime() % 1200 == 0 && needsSaving) {
synchronized (SAVE_LOCK) {
if (needsSaving && !saving) {
needsSaving = false;
saving = true;
saveTooltipCacheASync();
}
}
}
}

private static void saveTooltipCacheASync() {
if (TOOLTIP_CACHE.isEmpty() || TOOLTIP_CACHE_LANG == null) {
return;
}

final Map<String, List<String>> tooltipCache = new HashMap<>(TOOLTIP_CACHE);
final Language tooltipCacheLang = TOOLTIP_CACHE_LANG;
new Thread(() -> {
saveTooltipCacheSync(tooltipCache, tooltipCacheLang);
synchronized (SAVE_LOCK) {
saving = false;
}
}).start();
}

private static void saveTooltipCacheSync(final Map<String, List<String>> tooltipCache, @Nullable Language tooltipCacheLang) {
if (tooltipCache.isEmpty() || tooltipCacheLang == null) {
return;
}

File file = new File(Config.getJeiConfigurationDir(), "tooltipCache.zip");
String languageCode = tooltipCacheLang.getLanguageCode();
String zipEntryName = "tooltipCache_" + languageCode + ".txt";
boolean write = FileUtil.writeZipFileSafely(file, zipEntryName, zipOutputStream -> {
BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(zipOutputStream));

for (Map.Entry<String, List<String>> entry : tooltipCache.entrySet()) {
String ingredientUid = entry.getKey();
List<String> tooltipLines = entry.getValue();
String tooltip = NEWLINE_JOINER.join(tooltipLines);
writer.write(ingredientUid);
writer.newLine();
writer.write(tooltip);
writer.newLine();
}
});

if (write) {
Log.get().info("Saved tooltip cache to {}.", file.getAbsoluteFile());
}
}
}
2 changes: 0 additions & 2 deletions src/main/java/mezz/jei/startup/ProxyCommonClient.java
View file
Expand Up @@ -111,7 +111,6 @@ public void loadComplete(FMLLoadCompleteEvent event) {
ProxyCommonClient.this.starter.start(ProxyCommonClient.this.plugins);
}
}
IngredientInformation.onResourceReload();
});

try {
Expand All @@ -134,7 +133,6 @@ public void onClientTick(TickEvent.ClientTickEvent event) {
if (event.side == Side.CLIENT && SessionData.hasJoinedWorld() && Minecraft.getMinecraft().player != null) {
IngredientFilter ingredientFilter = Internal.getIngredientFilter();
ingredientFilter.onClientTick(20);
IngredientInformation.onClientTick();
}
}

Expand Down

0 comments on commit c321ae4

Please sign in to comment.