diff --git a/dependencies.gradle b/dependencies.gradle index b4f7c565..cb4cac2e 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { api('com.github.GTNewHorizons:CodeChickenCore:1.4.7:dev') - implementation('com.github.GTNewHorizons:GTNHLib:0.6.39:dev') + implementation('com.github.GTNewHorizons:GTNHLib:0.7.0:dev') shadowImplementation('org.apache.commons:commons-csv:1.10.0') diff --git a/settings.gradle b/settings.gradle index 53df3b0d..0a1d9f36 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.41' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.43' } diff --git a/src/main/java/codechicken/nei/ClientHandler.java b/src/main/java/codechicken/nei/ClientHandler.java index f5ba173f..84db4012 100644 --- a/src/main/java/codechicken/nei/ClientHandler.java +++ b/src/main/java/codechicken/nei/ClientHandler.java @@ -1,10 +1,13 @@ package codechicken.nei; +import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; +import java.io.InputStreamReader; import java.net.URL; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; @@ -22,9 +25,11 @@ import net.minecraft.client.gui.GuiErrorScreen; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiSelectWorld; import net.minecraft.client.multiplayer.WorldClient; +import net.minecraft.client.resources.IResource; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.launchwrapper.Launch; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.event.GuiOpenEvent; import net.minecraftforge.client.event.RenderWorldLastEvent; @@ -165,11 +170,34 @@ public class ClientHandler { }, callback); } - public static void loadSettingsFile(String resource, BiConsumer createDefault, + public static boolean loadSettingsResource(String resource, Consumer> callback) { + final ResourceLocation location = new ResourceLocation("nei", resource); + + try { + final IResource res = Minecraft.getMinecraft().getResourceManager().getResource(location); + + try (BufferedReader reader = new BufferedReader( + new InputStreamReader(res.getInputStream(), StandardCharsets.UTF_8))) { + NEIClientConfig.logger.info("Loading '{}' from jar {}", resource, location); + callback.accept( + IOUtils.readLines(reader).stream() + .map(line -> line.contains("#") ? line.substring(0, line.indexOf('#')) : line) + .map(String::trim).filter(line -> !line.isEmpty())); + return true; + } + + } catch (Exception io) { + NEIClientConfig.logger.error("Failed to load '{}' file {}", resource, location); + } + + return false; + } + + public static boolean loadSettingsFile(String resource, BiConsumer createDefault, Consumer> callback) { File file = new File(NEIClientConfig.configDir, resource); - if (!file.exists()) { + if (!file.exists() && createDefault != null) { try (FileWriter writer = new FileWriter(file)) { NEIClientConfig.logger.info("Creating default '{}' {}", resource, file); createDefault.accept(file, writer); @@ -178,13 +206,20 @@ public class ClientHandler { } } - try (FileReader reader = new FileReader(file)) { - NEIClientConfig.logger.info("Loading '{}' file {}", resource, file); - callback.accept( - IOUtils.readLines(reader).stream().filter(line -> !line.startsWith("#") && !line.trim().isEmpty())); - } catch (IOException e) { - NEIClientConfig.logger.error("Failed to load '{}' file {}", resource, file, e); + if (file.exists()) { + try (FileReader reader = new FileReader(file)) { + NEIClientConfig.logger.info("Loading '{}' file {}", resource, file); + callback.accept( + IOUtils.readLines(reader).stream() + .map(line -> line.contains("#") ? line.substring(0, line.indexOf('#')) : line) + .map(String::trim).filter(line -> !line.isEmpty())); + return true; + } catch (IOException e) { + NEIClientConfig.logger.error("Failed to load '{}' file {}", resource, file, e); + } } + + return false; } public static void loadSerialHandlers() { diff --git a/src/main/java/codechicken/nei/ItemHistoryPanel.java b/src/main/java/codechicken/nei/ItemHistoryPanel.java index 9b442c92..ca4d872e 100644 --- a/src/main/java/codechicken/nei/ItemHistoryPanel.java +++ b/src/main/java/codechicken/nei/ItemHistoryPanel.java @@ -7,14 +7,27 @@ import net.minecraft.item.ItemStack; import codechicken.nei.ItemsGrid.ItemsGridSlot; import codechicken.nei.ItemsGrid.MouseContext; +import codechicken.nei.recipe.Recipe.RecipeId; import codechicken.nei.recipe.StackInfo; -public class ItemHistoryPanel extends AbstractSubpanel> { +public class ItemHistoryPanel extends AbstractSubpanel> { + + public static class HistoryGridSlot extends ItemsGridSlot { + + public HistoryGridSlot(int slotIndex, int itemIndex, ItemStack item) { + super(slotIndex, itemIndex, item); + } + + @Override + public RecipeId getRecipeId() { + return FavoriteRecipes.getFavorite(this.item); + } + } public ItemHistoryPanel() { this.grid = new ItemsGrid<>() { - protected List gridMask; + protected List gridMask; @Override protected void onGridChanged() { @@ -23,12 +36,12 @@ public class ItemHistoryPanel extends AbstractSubpanel getMask() { + public List getMask() { if (this.gridMask == null) { this.gridMask = new ArrayList<>(); for (int slotIndex = 0; slotIndex < Math.min(size(), this.rows * this.columns); slotIndex++) { - this.gridMask.add(new ItemsGridSlot(slotIndex, slotIndex, getItem(slotIndex))); + this.gridMask.add(new HistoryGridSlot(slotIndex, slotIndex, getItem(slotIndex))); } } @@ -37,7 +50,7 @@ public class ItemHistoryPanel extends AbstractSubpanel fluidItem.getFluid(stack), "getFluid"); + } + runChecked(stack, () -> item.isDamaged(stack), "isDamaged"); + runChecked(stack, () -> item.getDamage(stack), "getDamage"); + runChecked(stack, () -> item.showDurabilityBar(stack), "showDurabilityBar"); + runChecked(stack, () -> item.getAttributeModifiers(stack), "getAttributeModifiers"); + runChecked(stack, () -> item.getDurabilityForDisplay(stack), "getDurabilityForDisplay"); + runChecked(stack, () -> item.getItemStackLimit(stack), "getItemStackLimit"); + runChecked(stack, () -> item.getToolClasses(stack), "getToolClasses"); + runChecked(stack, () -> item.getUnlocalizedNameInefficiently(stack), "getUnlocalizedNameInefficiently"); + runChecked(stack, () -> item.hasEffect(stack), "hasEffect"); + + /* + * unused... for now runChecked(stack, () -> GameRegistry.getFuelValue(stack), "getFuelValue"); + * runChecked(stack, () -> item.getUnlocalizedName(stack), "getUnlocalizedName"); runChecked(stack, () -> + * item.doesContainerItemLeaveCraftingGrid(stack), "doesContainerItemLeaveCraftingGrid"); runChecked(stack, + * () -> item.getItemUseAction(stack), "getItemUseAction"); runChecked(stack, () -> + * item.getMaxItemUseDuration(stack), "getMaxItemUseDuration"); runChecked(stack, () -> + * item.getPotionEffect(stack), "getPotionEffect"); runChecked(stack, () -> item.isPotionIngredient(stack), + * "isPotionIngredient"); runChecked(stack, () -> item.getRarity(stack), "getRarity"); runChecked(stack, () + * -> item.hasCustomEntity(stack), "hasCustomEntity"); runChecked(stack, () -> + * item.getSmeltingExperience(stack), "getSmeltingExperience"); runChecked(stack, () -> + * item.getMaxDamage(stack), "getMaxDamage"); runChecked(stack, () -> item.getDamage(stack), "getDamage"); + * runChecked(stack, stack::isItemDamaged, "isItemDamaged"); runChecked(stack, () -> item.hasEffect(stack, + * 0), "hasEffect"); runChecked(stack, () -> item.getItemEnchantability(stack), "getItemEnchantability"); + * runChecked(stack, () -> item.isBeaconPayment(stack), "isBeaconPayment"); runChecked(stack, () -> + * item.getDamage(stack), "getDamage"); runChecked(stack, () -> item.getDamage(stack), "getDamage"); + * runChecked(stack, () -> item.getDamage(stack), "getDamage"); + */ + } + // Generate itemlist, permutations, orders, collapsibleitems, and informationhandler stacks @Override @SuppressWarnings("unchecked") @@ -329,6 +389,8 @@ public class ItemList { items.add(stack); } + forceTagCompoundInitialization(stack); + CollapsibleItems.putItem(stack); TooltipFilter.getSearchTooltip(stack); InformationHandler.populateStacks(stack); diff --git a/src/main/java/codechicken/nei/ItemZoom.java b/src/main/java/codechicken/nei/ItemZoom.java index ad44005f..c220b882 100644 --- a/src/main/java/codechicken/nei/ItemZoom.java +++ b/src/main/java/codechicken/nei/ItemZoom.java @@ -58,7 +58,7 @@ public class ItemZoom extends Widget implements IContainerInputHandler { GL11.glPopMatrix(); - GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); + GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT); GuiContainerManager.enable2DRender(); if (NEIClientConfig.getBooleanSetting("inventory.itemzoom.showName")) { diff --git a/src/main/java/codechicken/nei/ItemsGrid.java b/src/main/java/codechicken/nei/ItemsGrid.java index b0aaf58d..be08dd52 100644 --- a/src/main/java/codechicken/nei/ItemsGrid.java +++ b/src/main/java/codechicken/nei/ItemsGrid.java @@ -52,7 +52,7 @@ public abstract class ItemsGrid entry : keyStates.entrySet()) { final int keyCode = NEIKeyboardUtils.unhash(NEIClientConfig.getKeyBinding(entry.getKey())); - final boolean down = keyCode < Keyboard.KEYBOARD_SIZE ? Keyboard.isKeyDown(keyCode) : null; + final boolean down = keyCode > 0 && keyCode < Keyboard.KEYBOARD_SIZE && Keyboard.isKeyDown(keyCode); final KeyState state = entry.getValue(); if (down) { diff --git a/src/main/java/codechicken/nei/NEIClientConfig.java b/src/main/java/codechicken/nei/NEIClientConfig.java index a340564a..6f43df85 100644 --- a/src/main/java/codechicken/nei/NEIClientConfig.java +++ b/src/main/java/codechicken/nei/NEIClientConfig.java @@ -62,6 +62,7 @@ import codechicken.nei.recipe.IRecipeHandler; import codechicken.nei.recipe.InformationHandler; import codechicken.nei.recipe.RecipeCatalysts; import codechicken.nei.recipe.RecipeInfo; +import codechicken.nei.util.ItemUntranslator; import codechicken.nei.util.NEIKeyboardUtils; import codechicken.obfuscator.ObfuscationRun; @@ -147,6 +148,8 @@ public class NEIClientConfig { tag.getTag("inventory.widgetsenabled").getBooleanValue(true); API.addOption(new OptionToggleButton("inventory.widgetsenabled")); + tag.getTag("findFuelsParallel").getBooleanValue(true); + tag.getTag("inventory.autocrafting").getBooleanValue(true); tag.getTag("inventory.dynamicFontSize").getBooleanValue(true); tag.getTag("inventory.hidden").getBooleanValue(false); @@ -436,6 +439,24 @@ public class NEIClientConfig { tag.getTag("inventory.autocrafting").setComment("Autocrafting").getBooleanValue(true); API.addOption(new OptionToggleButton("inventory.autocrafting", true)); + tag.getTag("inventory.itemUntranslator").setComment("Item Untranslator").getBooleanValue(true); + API.addOption(new OptionToggleButton("inventory.itemUntranslator", true) { + + @Override + public boolean onClick(int button) { + super.onClick(button); + + if (enableItemUntranslator()) { + ItemUntranslator.getInstance().load(); + } else { + ItemUntranslator.getInstance().unload(); + } + + return true; + } + + }); + tag.getTag("tools.handler_load_from_config").setComment("ADVANCED: Load handlers from config") .getBooleanValue(false); API.addOption(new OptionToggleButton("tools.handler_load_from_config", true) { @@ -1221,6 +1242,10 @@ public class NEIClientConfig { return getBooleanSetting("inventory.collapsibleItems.enabled"); } + public static boolean enableItemUntranslator() { + return getBooleanSetting("inventory.itemUntranslator"); + } + public static boolean getMagnetMode() { return enabledActions.contains("magnet"); } diff --git a/src/main/java/codechicken/nei/NEIController.java b/src/main/java/codechicken/nei/NEIController.java index 2b52ba77..b555d851 100644 --- a/src/main/java/codechicken/nei/NEIController.java +++ b/src/main/java/codechicken/nei/NEIController.java @@ -21,6 +21,7 @@ import codechicken.nei.api.INEIGuiHandler; import codechicken.nei.api.ItemInfo; import codechicken.nei.commands.CommandBookmarkAdd; import codechicken.nei.commands.CommandRecipeId; +import codechicken.nei.commands.CommandUntranslator; import codechicken.nei.guihook.GuiContainerManager; import codechicken.nei.guihook.IContainerInputHandler; import codechicken.nei.guihook.IContainerSlotClickHandler; @@ -68,6 +69,7 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu public static void registerClientCommands() { ClientCommandHandler.instance.registerCommand(new CommandBookmarkAdd()); ClientCommandHandler.instance.registerCommand(new CommandRecipeId()); + ClientCommandHandler.instance.registerCommand(new CommandUntranslator()); } public static void updateUnlimitedItems(InventoryPlayer inventory) { @@ -136,7 +138,7 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu return true; } - if (button == 1 && slot instanceof SlotCrafting) // right click + if (button == 1 && modifier != 2 && slot instanceof SlotCrafting) // right click { for (int i1 = 0; i1 < 64; i1++) // click this slot 64 times manager.handleSlotClick(slot.slotNumber, button, 0); diff --git a/src/main/java/codechicken/nei/RecipeSearchField.java b/src/main/java/codechicken/nei/RecipeSearchField.java index 822990c4..9cb4b6dd 100644 --- a/src/main/java/codechicken/nei/RecipeSearchField.java +++ b/src/main/java/codechicken/nei/RecipeSearchField.java @@ -23,6 +23,7 @@ public abstract class RecipeSearchField extends TextField implements ItemFilterP final GuiSearchField field = new GuiSearchField(); field.setMaxStringLength(maxSearchLength); field.setCursorPositionZero(); + field.setSkipRecipeTokens(true); ((SearchTextFormatter) field.getFormatter()).setContextToken("<>"); this.field = field; } diff --git a/src/main/java/codechicken/nei/SearchField.java b/src/main/java/codechicken/nei/SearchField.java index 818d20a4..b35e0f33 100644 --- a/src/main/java/codechicken/nei/SearchField.java +++ b/src/main/java/codechicken/nei/SearchField.java @@ -93,6 +93,7 @@ public class SearchField extends TextField implements ItemFilterProvider { public static class GuiSearchField extends FormattedTextField implements ItemFilterProvider, IRecipeFilterProvider { protected final SearchTokenParser searchParser; + protected boolean skipRecipeTokens = false; public GuiSearchField() { this(SearchField.searchParser); @@ -106,6 +107,10 @@ public class SearchField extends TextField implements ItemFilterProvider { setPlaceholder(NEIClientUtils.translate("inventory.search.placeholder")); } + public void setSkipRecipeTokens(boolean skipRecipeTokens) { + this.skipRecipeTokens = skipRecipeTokens; + } + @Override public ItemFilter getFilter() { return getFilter(getText()); @@ -117,7 +122,7 @@ public class SearchField extends TextField implements ItemFilterProvider { } public ItemFilter getFilter(String filterText) { - return this.searchParser.getFilter(filterText); + return this.searchParser.getFilter(filterText, this.skipRecipeTokens); } public IRecipeFilter getRecipeFilter(String filterText) { diff --git a/src/main/java/codechicken/nei/SearchTextFormatter.java b/src/main/java/codechicken/nei/SearchTextFormatter.java index ff74a440..534a4108 100644 --- a/src/main/java/codechicken/nei/SearchTextFormatter.java +++ b/src/main/java/codechicken/nei/SearchTextFormatter.java @@ -29,7 +29,7 @@ public class SearchTextFormatter implements TextFormatter { text = SearchTokenParser.SPACE_PATTERN.matcher(text).replaceAll("\\\\ "); } final SearchExpressionFormatVisitor visitor = new SearchExpressionFormatVisitor(searchParser); - return SearchExpressionUtils.visitSearchExpression(text, visitor); + return SearchExpressionUtils.visitRecipeSearchExpression(text, visitor); } else { final StringBuilder formattedText = new StringBuilder(); @@ -42,7 +42,9 @@ public class SearchTextFormatter implements TextFormatter { if (!contextPart[0].isEmpty()) { formattedText.append( - SearchExpressionUtils.HIGHLIGHTS.RECIPE + contextPart[0] + EnumChatFormatting.RESET); + SearchExpressionUtils.HIGHLIGHTS.RECIPE + contextPart[0].substring(0, 1) + + EnumChatFormatting.RESET); + contextPart[1] = contextPart[0].substring(1) + contextPart[1]; } if (contextPart[1].isEmpty()) { diff --git a/src/main/java/codechicken/nei/SearchTokenParser.java b/src/main/java/codechicken/nei/SearchTokenParser.java index d50fe890..9d60bb8e 100644 --- a/src/main/java/codechicken/nei/SearchTokenParser.java +++ b/src/main/java/codechicken/nei/SearchTokenParser.java @@ -122,10 +122,8 @@ public class SearchTokenParser { Language currentLanguage = Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage(); if (!currentLanguage.getLanguageCode().equals(providersCache.languageCode)) { - providersCache.providers = new ArrayList<>(); - providersCache.languageCode = currentLanguage.getLanguageCode(); - - Map providers = new HashMap<>(); + final List providersList = new ArrayList<>(); + final Map providers = new HashMap<>(); for (int index = this.searchProviders.size() - 1; index >= 0; index--) { ISearchParserProvider provider = this.searchProviders.get(index); @@ -134,12 +132,14 @@ public class SearchTokenParser { if (provider.getSearchMode() == SearchMode.PREFIX && !providers.containsKey(provider.getPrefix())) { providers.put(provider.getPrefix(), provider); } else if (provider.getSearchMode() == SearchMode.ALWAYS) { - providersCache.providers.add(provider); + providersList.add(provider); } } } - providersCache.providers.addAll(providers.values()); + providersList.addAll(providers.values()); + providersCache.languageCode = currentLanguage.getLanguageCode(); + providersCache.providers = providersList; } return providersCache.providers; @@ -173,7 +173,11 @@ public class SearchTokenParser { } public synchronized ItemFilter getFilter(String filterText) { - filterText = EnumChatFormatting.getTextWithoutFormattingCodes(filterText).toLowerCase(); + return getFilter(filterText, false); + } + + public synchronized ItemFilter getFilter(String rawText, boolean skipRecipeTokens) { + final String filterText = EnumChatFormatting.getTextWithoutFormattingCodes(rawText).toLowerCase(); if (filterText == null || filterText.isEmpty()) { return new EverythingItemFilter(); @@ -182,10 +186,10 @@ public class SearchTokenParser { final int patternMode = NEIClientConfig.getIntSetting("inventory.search.patternMode"); if (patternMode != 3) { - return this.filtersCache.computeIfAbsent(filterText, text -> { + return this.filtersCache.computeIfAbsent(skipRecipeTokens + ":" + filterText, _t -> { final List searchTokens = new ArrayList<>(); - for (String[] subQuery : splitByDelimiters(text, "|", false)) { + for (String[] subQuery : splitByDelimiters(filterText, "|", false)) { if (subQuery[1].isEmpty()) { continue; @@ -193,11 +197,22 @@ public class SearchTokenParser { final List tokens = new ArrayList<>(); - for (SearchToken token : splitSearchText(subQuery[1])) { - final ItemFilter result = token.getFilter(this); + for (String[] contextQuery : splitByDelimiters(subQuery[1], skipRecipeTokens ? "<>" : "", false)) { - if (result != null) { - tokens.add(result); + if (contextQuery[1].isEmpty() || contextQuery[0].startsWith(">")) { + continue; + } + + if (!contextQuery[0].isEmpty()) { + contextQuery[0] = contextQuery[0].substring(1); + } + + for (SearchToken token : splitSearchText(contextQuery[0] + contextQuery[1])) { + final ItemFilter result = token.getFilter(this); + + if (result != null) { + tokens.add(result); + } } } @@ -223,9 +238,13 @@ public class SearchTokenParser { if (spaceMode == 1) { text = SearchTokenParser.SPACE_PATTERN.matcher(text).replaceAll("\\\\ "); } - - return new IsRegisteredItemFilter( - SearchExpressionUtils.visitSearchExpression(text, new ItemFilterVisitor(this))); + if (skipRecipeTokens) { + return new IsRegisteredItemFilter( + SearchExpressionUtils.visitRecipeSearchExpression(text, new ItemFilterVisitor(this))); + } else { + return new IsRegisteredItemFilter( + SearchExpressionUtils.visitSearchExpression(text, new ItemFilterVisitor(this))); + } }); } @@ -305,7 +324,7 @@ public class SearchTokenParser { text = SearchTokenParser.SPACE_PATTERN.matcher(text).replaceAll("\\\\ "); } - return SearchExpressionUtils.visitSearchExpression(text, new RecipeFilterVisitor(this)); + return SearchExpressionUtils.visitRecipeSearchExpression(text, new RecipeFilterVisitor(this)); }); } diff --git a/src/main/java/codechicken/nei/SubsetWidget.java b/src/main/java/codechicken/nei/SubsetWidget.java index a2ee908b..1852674a 100644 --- a/src/main/java/codechicken/nei/SubsetWidget.java +++ b/src/main/java/codechicken/nei/SubsetWidget.java @@ -786,7 +786,7 @@ public class SubsetWidget extends Button implements ItemFilterProvider { root.resize(screen, parent, dropRight); - GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); + GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT); GuiContainerManager.enable2DRender(); GuiContainerManager.drawItems.zLevel += 100; diff --git a/src/main/java/codechicken/nei/WorldOverlayRenderer.java b/src/main/java/codechicken/nei/WorldOverlayRenderer.java index a8cfcb66..d7cd2a5e 100644 --- a/src/main/java/codechicken/nei/WorldOverlayRenderer.java +++ b/src/main/java/codechicken/nei/WorldOverlayRenderer.java @@ -38,7 +38,11 @@ public class WorldOverlayRenderer implements IKeyStateTracker { public void tickKeyStates() { if (Minecraft.getMinecraft().currentScreen != null) return; - if (KeyManager.keyStates.get("world.moboverlay").down) mobOverlay = (mobOverlay + 1) % 2; + if (KeyManager.keyStates.get("world.moboverlay").down) { + mobOverlay = (mobOverlay + 1) % 2; + NEIClientUtils + .printChatMessage(new ChatComponentText(NEIClientUtils.translate("chat.moboverlay." + mobOverlay))); + } if (KeyManager.keyStates.get("world.chunkoverlay").down) { chunkOverlay = (chunkOverlay + 1) % (NEIModContainer.isGT5Loaded() ? 4 : 3); // 0-2 (or 3 with gt) @@ -73,9 +77,11 @@ public class WorldOverlayRenderer implements IKeyStateTracker { } World world = entity.worldObj; + int worldHeight = world.getHeight(); + int x1 = (int) entity.posX; int z1 = (int) entity.posZ; - int y1 = (int) MathHelper.clip(entity.posY, 16, world.getHeight() - 16); + int y1 = (int) MathHelper.clip(entity.posY, 16, worldHeight - 16); for (int i = 0; i <= 32; i++) { int x = x1 - 16 + i; @@ -94,6 +100,12 @@ public class WorldOverlayRenderer implements IKeyStateTracker { for (int k = 0; k <= 32; k++) { int y = y1 - 16 + k; + + if (y >= worldHeight) { + mobSpawnCache[bufIndex + k] = -1; + continue; + } + if (y > maxHeight) { mobSpawnCache[bufIndex + k] = -1; break; @@ -177,6 +189,10 @@ public class WorldOverlayRenderer implements IKeyStateTracker { private static final AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox(0, 0, 0, 0, 0, 0); private static byte getSpawnMode(Chunk chunk, int x, int y, int z) { + if (y >= chunk.worldObj.getHeight()) { + return 0; + } + if (chunk.getSavedLightValue(EnumSkyBlock.Block, x & 15, y, z & 15) >= 8 || !SpawnerAnimals.canCreatureTypeSpawnAtLocation(EnumCreatureType.monster, chunk.worldObj, x, y, z)) { return 0; diff --git a/src/main/java/codechicken/nei/api/DefaultOverlayRenderer.java b/src/main/java/codechicken/nei/api/DefaultOverlayRenderer.java index d317e187..ad1d48a1 100644 --- a/src/main/java/codechicken/nei/api/DefaultOverlayRenderer.java +++ b/src/main/java/codechicken/nei/api/DefaultOverlayRenderer.java @@ -24,7 +24,7 @@ public class DefaultOverlayRenderer implements IRecipeOverlayRenderer { @Override public void renderOverlay(GuiContainerManager gui, Slot slot) { - GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); + GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(770, 1); diff --git a/src/main/java/codechicken/nei/api/ItemInfo.java b/src/main/java/codechicken/nei/api/ItemInfo.java index 023493b9..56b3b616 100644 --- a/src/main/java/codechicken/nei/api/ItemInfo.java +++ b/src/main/java/codechicken/nei/api/ItemInfo.java @@ -65,6 +65,7 @@ import codechicken.nei.search.IdentifierFilter; import codechicken.nei.search.ModNameFilter; import codechicken.nei.search.OreDictionaryFilter; import codechicken.nei.search.TooltipFilter; +import codechicken.nei.util.ItemUntranslator; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.registry.GameRegistry; @@ -137,6 +138,10 @@ public class ItemInfo { addSearchProviders(); RecipeItemInputHandler.load(); PresetsList.load(); + + if (NEIClientConfig.enableItemUntranslator()) { + ItemUntranslator.getInstance().load(); + } } private static void addSearchProviders() { diff --git a/src/main/java/codechicken/nei/bookmark/BookmarkGridGenerator.java b/src/main/java/codechicken/nei/bookmark/BookmarkGridGenerator.java index 09daaace..998d826d 100644 --- a/src/main/java/codechicken/nei/bookmark/BookmarkGridGenerator.java +++ b/src/main/java/codechicken/nei/bookmark/BookmarkGridGenerator.java @@ -117,7 +117,7 @@ public class BookmarkGridGenerator { this.itemToSlot.put(collapsedItemIndex, absoluteSlotIndex); this.caclulatedItems.put(collapsedItemIndex, getItem(group, collapsedItemIndex)); - if (!(shadows = getShadows(group, item.recipeId)).isEmpty()) { + if (item.recipeId != null && !(shadows = getShadows(group, item.recipeId)).isEmpty()) { borderGrid.put(absoluteSlotIndex, "recipe:" + shadows.get(0)); } } diff --git a/src/main/java/codechicken/nei/commands/CommandUntranslator.java b/src/main/java/codechicken/nei/commands/CommandUntranslator.java new file mode 100644 index 00000000..5f0cd3b8 --- /dev/null +++ b/src/main/java/codechicken/nei/commands/CommandUntranslator.java @@ -0,0 +1,78 @@ +package codechicken.nei.commands; + +import java.io.File; + +import net.minecraft.command.CommandBase; +import net.minecraft.command.ICommandSender; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.ChatStyle; +import net.minecraft.util.EnumChatFormatting; + +import codechicken.nei.ItemList; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.util.ItemUntranslator; + +public class CommandUntranslator extends CommandBase { + + @Override + public String getCommandName() { + return "untranslator"; + } + + @Override + public String getCommandUsage(ICommandSender sender) { + return "/untranslator dump OR /untranslator clear"; + } + + @Override + public int getRequiredPermissionLevel() { + return 0; + } + + @Override + public void processCommand(ICommandSender sender, String[] args) { + final String command = args.length == 0 ? null : args[0]; + + if ("dump".equals(command)) { + if (ItemList.items.isEmpty()) { + sendChatErrorMessage(sender, "nei.chat.untranslator.dump.error"); + return; + } else { + sendChatInfoMessage(sender, "nei.chat.untranslator.dump.start"); + ItemUntranslator.getInstance().generateUntranslatedNames(); + sendChatInfoMessage(sender, "nei.chat.untranslator.dump.finish"); + + if (NEIClientConfig.enableItemUntranslator()) { + ItemUntranslator.getInstance().load(); + } + } + } else if ("clear".equals(command)) { + final File file = new File(NEIClientConfig.configDir, "untranslator.cfg"); + + if (file.exists() && file.delete()) { + sendChatInfoMessage(sender, "nei.chat.untranslator.clear"); + if (NEIClientConfig.enableItemUntranslator()) { + ItemUntranslator.getInstance().load(); + } + } else { + sendChatErrorMessage(sender, "nei.chat.untranslator.clear.error"); + } + } else { + sendChatErrorMessage(sender, getCommandUsage(sender)); + } + + } + + private static void sendChatInfoMessage(ICommandSender sender, String translationKey, Object... args) { + sender.addChatMessage( + new ChatComponentTranslation(translationKey, args) + .setChatStyle(new ChatStyle().setColor(EnumChatFormatting.AQUA))); + } + + private static void sendChatErrorMessage(ICommandSender sender, String translationKey, Object... args) { + sender.addChatMessage( + new ChatComponentTranslation(translationKey, args) + .setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); + } + +} diff --git a/src/main/java/codechicken/nei/config/OptionUtilities.java b/src/main/java/codechicken/nei/config/OptionUtilities.java index c9529487..79ff0774 100644 --- a/src/main/java/codechicken/nei/config/OptionUtilities.java +++ b/src/main/java/codechicken/nei/config/OptionUtilities.java @@ -47,7 +47,7 @@ public class OptionUtilities extends OptionStringSet { LayoutManager.drawIcon(x + 4, 4, new Image(132, 12, 12, 12)); x += 24; - GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); + GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT); RenderHelper.enableGUIStandardItemLighting(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); ItemStack sword = new ItemStack(Items.diamond_sword); diff --git a/src/main/java/codechicken/nei/guihook/GuiContainerManager.java b/src/main/java/codechicken/nei/guihook/GuiContainerManager.java index 76ee9ccf..f26a820c 100644 --- a/src/main/java/codechicken/nei/guihook/GuiContainerManager.java +++ b/src/main/java/codechicken/nei/guihook/GuiContainerManager.java @@ -49,6 +49,7 @@ import codechicken.nei.NEIClientConfig; import codechicken.nei.NEIClientUtils; import codechicken.nei.NEIModContainer; import codechicken.nei.recipe.StackInfo; +import codechicken.nei.util.ItemUntranslator; import codechicken.nei.util.ReadableNumberConverter; import codechicken.nei.util.RenderTooltipEventHelper; @@ -60,6 +61,10 @@ public class GuiContainerManager { public void onResourceManagerReload(IResourceManager p_110549_1_) { renderingErrorItems.clear(); ItemList.loadItems.restart(); + + if (NEIClientConfig.enableItemUntranslator()) { + ItemUntranslator.getInstance().load(); + } } } @@ -399,7 +404,7 @@ public class GuiContainerManager { public static void enableMatrixStackLogging() { if (!contextEnabled) { - GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); + GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT); modelviewDepth = GL11.glGetInteger(GL11.GL_MODELVIEW_STACK_DEPTH); contextEnabled = true; } @@ -590,8 +595,6 @@ public class GuiContainerManager { } } - if (!tooltip.isEmpty()) tooltip.set(0, tooltip.get(0) + GuiDraw.TOOLTIP_LINESPACE); // add space after 'title' - if (showTooltip && NEIClientConfig.getBooleanSetting("inventory.showHotkeys")) { List hotkeystips = collectHotkeyTips(mousex, mousey); @@ -605,6 +608,19 @@ public class GuiContainerManager { } } + if (showTooltip && stack != null && !tooltip.isEmpty()) { + final String secondDisplayName = ItemUntranslator.getInstance().getItemStackDisplayName(stack); + + if (!secondDisplayName.isEmpty()) { + tooltip.add(1, EnumChatFormatting.DARK_GRAY + secondDisplayName + GuiDraw.TOOLTIP_LINESPACE); + } else { + tooltip.set(0, tooltip.get(0) + GuiDraw.TOOLTIP_LINESPACE); + } + + } else if (!tooltip.isEmpty()) { + tooltip.set(0, tooltip.get(0) + GuiDraw.TOOLTIP_LINESPACE); + } + if (NEIModContainer.isGTNHLibLoaded() && !tooltip.isEmpty()) { if (RenderTooltipEventHelper.post(stack, this.window, mousex, mousey, font)) { return; diff --git a/src/main/java/codechicken/nei/recipe/GuiCraftingRecipe.java b/src/main/java/codechicken/nei/recipe/GuiCraftingRecipe.java index 4be6ea80..261bb38a 100644 --- a/src/main/java/codechicken/nei/recipe/GuiCraftingRecipe.java +++ b/src/main/java/codechicken/nei/recipe/GuiCraftingRecipe.java @@ -13,6 +13,7 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.item.ItemStack; import codechicken.lib.gui.GuiDraw; +import codechicken.nei.FavoriteRecipes; import codechicken.nei.ItemPanels; import codechicken.nei.ItemsGrid.ItemsGridSlot; import codechicken.nei.NEIClientConfig; @@ -123,10 +124,10 @@ public class GuiCraftingRecipe extends GuiRecipe { final Point mouseover = GuiDraw.getMousePosition(); final BookmarksGridSlot panelSlot = ItemPanels.bookmarkPanel.getSlotMouseOver(mouseover.x, mouseover.y); - RecipeId recipeId = null; - if (panelSlot != null && !panelSlot.isIngredient()) { - recipeId = panelSlot.getRecipeId(); + if (panelSlot != null) { + return panelSlot.isIngredient() || panelSlot.getRecipeId() == null ? FavoriteRecipes.getFavorite(stackover) + : panelSlot.getRecipeId(); } ItemsGridSlot itemSlot = ItemPanels.itemPanel.getSlotMouseOver(mouseover.x, mouseover.y); @@ -143,7 +144,7 @@ public class GuiCraftingRecipe extends GuiRecipe { return itemSlot.getRecipeId(); } - return recipeId; + return null; } private GuiCraftingRecipe(ArrayList handlers) { diff --git a/src/main/java/codechicken/nei/recipe/RecipeHandlerQuery.java b/src/main/java/codechicken/nei/recipe/RecipeHandlerQuery.java index 82718d19..1918762e 100644 --- a/src/main/java/codechicken/nei/recipe/RecipeHandlerQuery.java +++ b/src/main/java/codechicken/nei/recipe/RecipeHandlerQuery.java @@ -62,7 +62,13 @@ public class RecipeHandlerQuery { private ArrayList getRecipeHandlersParallel() throws InterruptedException, ExecutionException { // Pre-find the fuels so we're not fighting over it - FuelRecipeHandler.findFuelsOnceParallel(); + + if (NEIClientConfig.getBooleanSetting("findFuelsParallel")) { + FuelRecipeHandler.findFuelsOnceParallel(); + } else { + FuelRecipeHandler.findFuelsOnce(); + } + ArrayList handlers = getSerialHandlersWithRecipes(); handlers.addAll(getHandlersWithRecipes()); handlers.sort(NEIClientConfig.HANDLER_COMPARATOR); diff --git a/src/main/java/codechicken/nei/recipe/RecipeTooltipLineHandler.java b/src/main/java/codechicken/nei/recipe/RecipeTooltipLineHandler.java index 1f332d66..df06f7bd 100644 --- a/src/main/java/codechicken/nei/recipe/RecipeTooltipLineHandler.java +++ b/src/main/java/codechicken/nei/recipe/RecipeTooltipLineHandler.java @@ -80,7 +80,8 @@ public class RecipeTooltipLineHandler implements ITooltipLineHandler { final Dimension size = getSize(); - GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); + GL11.glPushMatrix(); + GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT); GL11.glTranslatef(x, y, 0); GL11.glScaled(1, 1, 3); @@ -102,6 +103,7 @@ public class RecipeTooltipLineHandler implements ITooltipLineHandler { () -> { this.widget.draw(0, 0); }); GL11.glPopAttrib(); + GL11.glPopMatrix(); } } diff --git a/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java b/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java index 5f82d83b..b65ad8f7 100644 --- a/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java +++ b/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java @@ -45,6 +45,7 @@ import codechicken.nei.api.IStackPositioner; import codechicken.nei.guihook.GuiContainerManager; import codechicken.nei.guihook.IContainerInputHandler; import codechicken.nei.guihook.IContainerTooltipHandler; +import cpw.mods.fml.common.FMLLog; /** * A Template Recipe Handler! How about that. Because it was sooo hard, and more seriously required lots of copied code @@ -108,10 +109,15 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH } private static FurnaceRecipeHandler.FuelPair identifyFuel(final ItemStack itemStack) { - if (efuels.contains(itemStack.getItem())) return null; - final int burnTime = TileEntityFurnace.getItemBurnTime(itemStack); - if (burnTime <= 0) return null; - return new FurnaceRecipeHandler.FuelPair(itemStack.copy(), burnTime); + try { + if (efuels.contains(itemStack.getItem())) return null; + final int burnTime = TileEntityFurnace.getItemBurnTime(itemStack); + if (burnTime <= 0) return null; + return new FurnaceRecipeHandler.FuelPair(itemStack.copy(), burnTime); + } catch (Exception e) { + FMLLog.getLogger().error("NEI: Error identifying fuel for item " + itemStack.getItem()); + throw e; + } } /** diff --git a/src/main/java/codechicken/nei/recipe/stackinfo/DefaultStackStringifyHandler.java b/src/main/java/codechicken/nei/recipe/stackinfo/DefaultStackStringifyHandler.java index 6c984ce4..c5946566 100644 --- a/src/main/java/codechicken/nei/recipe/stackinfo/DefaultStackStringifyHandler.java +++ b/src/main/java/codechicken/nei/recipe/stackinfo/DefaultStackStringifyHandler.java @@ -25,7 +25,7 @@ public class DefaultStackStringifyHandler implements IStackStringifyHandler { nbTag.setShort("Damage", (short) stack.getItemDamage()); if (stack.hasTagCompound() && !stack.getTagCompound().hasNoTags()) { - nbTag.setTag("tag", stack.getTagCompound()); + nbTag.setTag("tag", stack.getTagCompound().copy()); } return nbTag; diff --git a/src/main/java/codechicken/nei/search/AbstractSearchExpressionVisitor.java b/src/main/java/codechicken/nei/search/AbstractSearchExpressionVisitor.java index 749d07b5..09a06521 100644 --- a/src/main/java/codechicken/nei/search/AbstractSearchExpressionVisitor.java +++ b/src/main/java/codechicken/nei/search/AbstractSearchExpressionVisitor.java @@ -14,4 +14,8 @@ public abstract class AbstractSearchExpressionVisitor extends SearchExpressio return searchParser; } + public T fail() { + return defaultResult(); + } + } diff --git a/src/main/java/codechicken/nei/search/ItemFilterVisitor.java b/src/main/java/codechicken/nei/search/ItemFilterVisitor.java index 2e7b0a47..ae5e2c79 100644 --- a/src/main/java/codechicken/nei/search/ItemFilterVisitor.java +++ b/src/main/java/codechicken/nei/search/ItemFilterVisitor.java @@ -37,6 +37,20 @@ public class ItemFilterVisitor extends AbstractSearchExpressionVisitor anyFilters = new ArrayList<>(); + final List allFilters = new ArrayList<>(); + for (SearchExpressionParser.RecipeClauseExpressionContext clauseCtx : ctx.recipeClauseExpression()) { + addIngredientPermutationItemFilter(clauseCtx.searchExpression(), anyFilters, allFilters); + } + return constructFilter(anyFilters, allFilters); + } + return defaultResult(); + } + @Override public ItemFilter visitOrExpression(SearchExpressionParser.OrExpressionContext ctx) { return visitChildren(ctx, AnyMultiItemFilter::new); @@ -79,6 +93,31 @@ public class ItemFilterVisitor extends AbstractSearchExpressionVisitor anyFilters, List allFilters) { + // Only for ingredients or default + if (ctx.type == 0 || ctx.type == 3) { + if (ctx.allRecipe) { + allFilters.add(visit(ctx)); + } else { + anyFilters.add(visit(ctx)); + } + } + } + + private ItemFilter constructFilter(List anyFilters, List allFilters) { + if (anyFilters.isEmpty()) { + return constructFilter(allFilters, AllMultiItemFilter::new); + } + if (allFilters.isEmpty()) { + return constructFilter(anyFilters, AnyMultiItemFilter::new); + } + final List filters = new ArrayList<>(); + filters.add(constructFilter(allFilters, AllMultiItemFilter::new)); + filters.add(constructFilter(anyFilters, AnyMultiItemFilter::new)); + return constructFilter(filters, AllMultiItemFilter::new); + } + private String getTokenCleanText(SearchExpressionParser.TokenContext ctx) { String cleanText = null; if (ctx.PLAIN_TEXT() != null) { diff --git a/src/main/java/codechicken/nei/search/SearchExpressionUtils.java b/src/main/java/codechicken/nei/search/SearchExpressionUtils.java index 5e3e47b1..67049196 100644 --- a/src/main/java/codechicken/nei/search/SearchExpressionUtils.java +++ b/src/main/java/codechicken/nei/search/SearchExpressionUtils.java @@ -52,6 +52,17 @@ public class SearchExpressionUtils { } public static T visitSearchExpression(String text, AbstractSearchExpressionVisitor visitor) { + SearchExpressionParser parser = createSearchExpressionParser(text, visitor.getSearchParser(), visitor); + SearchExpressionParser.RecipeSearchExpressionContext recipeCtx = parser.recipeSearchExpression(); + // Manually check whether it's not a recipe expression, because parser would parse it either way + if (recipeCtx.recipeClauseExpression() != null && recipeCtx.recipeClauseExpression().size() == 1 + && recipeCtx.recipeClauseExpression(0).searchExpression().type == 3) { + return visitor.visitSearchExpression(recipeCtx.recipeClauseExpression(0).searchExpression()); + } + return visitor.fail(); + } + + public static T visitRecipeSearchExpression(String text, AbstractSearchExpressionVisitor visitor) { SearchExpressionParser parser = createSearchExpressionParser(text, visitor.getSearchParser(), visitor); return visitor.visitRecipeSearchExpression(parser.recipeSearchExpression()); } diff --git a/src/main/java/codechicken/nei/util/ItemUntranslator.java b/src/main/java/codechicken/nei/util/ItemUntranslator.java new file mode 100644 index 00000000..4ec6dd9f --- /dev/null +++ b/src/main/java/codechicken/nei/util/ItemUntranslator.java @@ -0,0 +1,396 @@ +package codechicken.nei.util; + +import java.io.BufferedWriter; +import java.io.File; +import java.lang.reflect.Field; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.stream.Stream; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; +import net.minecraft.util.StringTranslate; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +import codechicken.nei.ClientHandler; +import codechicken.nei.ItemList; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.SubsetWidget; +import codechicken.nei.api.API; +import codechicken.nei.recipe.StackInfo; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.ReflectionHelper; + +public class ItemUntranslator { + + private class LanguageRegistryPatch implements AutoCloseable { + // RAII-style helper that temporarily swaps language data in + // LanguageRegistry / StringTranslate using reflection. This allows + // reading translation entries for a different language (eg. en_US) + // even when the game is using another language at runtime. + + private String secondLanguage = "en_US"; + private String language; + + private static Map modLanguageDataSymlink; + private Properties languageDataCache; + + private static Map secondLanguageListCache; + private static Map languageListCache; + + private static Field languageListField; + private static Field fieldStringTranslateInstance; + + static { + try { + final Field modLanguageDataField = ReflectionHelper + .findField(LanguageRegistry.class, "modLanguageData"); + + languageListField = ReflectionHelper.findField(StringTranslate.class, "languageList", "field_74816_c"); + fieldStringTranslateInstance = ReflectionHelper + .findField(StringTranslate.class, "instance", "field_74817_a"); + + modLanguageDataSymlink = (Map) modLanguageDataField + .get(LanguageRegistry.instance()); + languageListCache = (Map) languageListField.get(fieldStringTranslateInstance.get(null)); + } catch (Throwable e) { + languageListField = null; + fieldStringTranslateInstance = null; + } + } + + private LanguageRegistryPatch(String secondLanguage) { + this.language = FMLCommonHandler.instance().getCurrentLanguage(); + this.secondLanguage = secondLanguage; + patchLanguageRegistry(); + patchStringTranslate(); + } + + @Override + public void close() { + restoreStringTranslate(); + restoreLanguageRegistry(); + } + + private void patchLanguageRegistry() { + this.languageDataCache = modLanguageDataSymlink.get(this.language); + modLanguageDataSymlink.put(this.language, modLanguageDataSymlink.get(this.secondLanguage)); + } + + private void patchStringTranslate() { + + if (languageListField != null) { + + if (secondLanguageListCache == null) { + secondLanguageListCache = new HashMap<>(languageListCache); + modLanguageDataSymlink.get(secondLanguage) + .forEach((k, v) -> secondLanguageListCache.put((String) k, (String) v)); + } + + try { + languageListField.set(fieldStringTranslateInstance.get(null), secondLanguageListCache); + } catch (IllegalAccessException e) { + throw new RuntimeException("Failed to access StringTranslate language list", e); + } + } + } + + private void restoreLanguageRegistry() { + final String language = FMLCommonHandler.instance().getCurrentLanguage(); + modLanguageDataSymlink.put(language, languageDataCache); + languageDataCache = null; + } + + private void restoreStringTranslate() { + if (languageListField != null && languageListCache != null) { + try { + languageListField.set(fieldStringTranslateInstance.get(null), languageListCache); + } catch (IllegalAccessException e) { + throw new RuntimeException("Failed to restore StringTranslate language list", e); + } + } + } + } + + private static final String CONFIG_FILE = "untranslator.cfg"; + private static final ItemUntranslator instance = new ItemUntranslator(); + + private final Map secondNames = new HashMap<>(); + private final Map processedNames = new HashMap<>(); + + static { + API.addSubset("Untranslated", item -> instance.getItemStackDisplayName(item).isEmpty()); + } + + private ItemUntranslator() {} + + public static ItemUntranslator getInstance() { + return instance; + } + + public void generateUntranslatedNames() { + final Map items = new HashMap<>(); + + items.put("language", FMLCommonHandler.instance().getCurrentLanguage()); + + for (Fluid fluid : FluidRegistry.getRegisteredFluids().values()) { + items.put( + fluid.getUnlocalizedName().toLowerCase(), + stripFormatting(StatCollector.translateToLocal(fluid.getUnlocalizedName()))); + } + + for (CreativeTabs tab : CreativeTabs.creativeTabArray) { + final List tabItems = new ArrayList<>(); + + tab.displayAllReleventItems(tabItems); + + for (ItemStack stack : tabItems) { + collectDisplayNameForStack(stack, items); + } + } + + for (ItemStack stack : ItemList.items) { + collectDisplayNameForStack(stack, items); + } + + for (FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()) { + if (data.filledContainer != null) { + collectDisplayNameForStack(data.filledContainer, items); + } + } + + for (Map.Entry entry : LanguageRegistryPatch.languageListCache.entrySet()) { + final String key = entry.getKey().toLowerCase(); + if (key.endsWith(".name") && !items.containsKey(key) && !entry.getValue().contains("%")) { + items.put(key, entry.getValue()); + } + } + + saveMappings(items); + } + + private void collectDisplayNameForStack(ItemStack stack, Map items) { + final String displayName = stripFormatting(stack.getDisplayName()); + final String guidKey = determineGUIDForGeneration(stack, displayName, items); + + if (!items.containsKey(guidKey)) { + items.put(guidKey, displayName); + } + } + + private String determineGUIDForGeneration(ItemStack stack, String displayName, Map items) { + final String unlocalizedName = stack.getUnlocalizedName().toLowerCase(); + + if (displayName.equals(stripFormatting(StatCollector.translateToLocal(unlocalizedName)))) { + return unlocalizedName; + } + + if (!unlocalizedName.endsWith(".name") + && displayName.equals(stripFormatting(StatCollector.translateToLocal(unlocalizedName + ".name")))) { + return unlocalizedName + ".name"; + } + + final FluidStack fluid = StackInfo.getFluid(stack); + + if (fluid != null) { + final String fluidUnlocalizedName = fluid.getUnlocalizedName().toLowerCase(); + + if (displayName.equals(items.get(fluidUnlocalizedName))) { + return fluidUnlocalizedName; + } + + if (!fluidUnlocalizedName.startsWith("fluid.") + && displayName.equals(items.get("fluid." + fluidUnlocalizedName))) { + return "fluid." + fluidUnlocalizedName; + } + + return (Item.itemRegistry.getNameForObject(stack.getItem()) + ":" + + stack.getItemDamage() + + "@" + + fluid.getUnlocalizedName()).toLowerCase(); + } + + if (stack.hasTagCompound()) { + try { + final ItemStack stackCopy = new ItemStack(stack.getItem(), 1, stack.getItemDamage()); + + if (displayName.equals(stripFormatting(stackCopy.getDisplayName()))) { + return (Item.itemRegistry.getNameForObject(stack.getItem()) + ":" + stack.getItemDamage()) + .toLowerCase(); + } + } catch (Exception e) {} + } + + return StackInfo.getItemStackGUID(stack); + } + + private String stripFormatting(String name) { + return EnumChatFormatting.getTextWithoutFormattingCodes(name).trim(); + } + + public synchronized String getItemStackDisplayName(ItemStack stack) { + + if (stack == null || this.secondNames.isEmpty()) { + return ""; + } + + final String guidKey = StackInfo.getItemStackGUID(stack); + + return this.processedNames.computeIfAbsent(guidKey, stackKey -> { + String displayName = this.secondNames.get(stackKey); + + if (displayName == null) { + final String guid = findBestGUIDForLookup(stack); + displayName = this.secondNames + .computeIfAbsent(guid == null ? stackKey : guid, g -> getFallbackDisplayName(stack)); + } + + return displayName.equals(stripFormatting(stack.getDisplayName())) ? "" : displayName; + }); + } + + public String findBestGUIDForLookup(ItemStack stack) { + String guidKey = (Item.itemRegistry.getNameForObject(stack.getItem()) + ":" + stack.getItemDamage()) + .toLowerCase(); + + if (this.secondNames.containsKey(guidKey)) { + return guidKey; + } + + final FluidStack fluid = StackInfo.getFluid(stack); + + if (fluid != null) { + guidKey = (Item.itemRegistry.getNameForObject(stack.getItem()) + ":" + + stack.getItemDamage() + + "@" + + fluid.getUnlocalizedName()).toLowerCase(); + + if (this.secondNames.containsKey(guidKey)) { + return guidKey; + } + + final String fluidUnlocalizedName = fluid.getUnlocalizedName().toLowerCase(); + + if (!fluidUnlocalizedName.startsWith("fluid.") + && this.secondNames.containsKey("fluid." + fluidUnlocalizedName)) { + return "fluid." + fluidUnlocalizedName; + } + + if (this.secondNames.containsKey(fluidUnlocalizedName)) { + return fluidUnlocalizedName; + } + } + + final String unlocalizedName = stack.getUnlocalizedName().toLowerCase(); + + if (!unlocalizedName.endsWith(".name") && this.secondNames.containsKey(unlocalizedName + ".name")) { + return unlocalizedName + ".name"; + } + + if (this.secondNames.containsKey(unlocalizedName)) { + return unlocalizedName; + } + + return null; + } + + private String getFallbackDisplayName(ItemStack stack) { + final String unlocalizedName = stack.getUnlocalizedName(); + final String secondLanguage = this.secondNames.get("language"); + String name = LanguageRegistry.instance().getStringLocalization(unlocalizedName, secondLanguage); + + if (name == null && !unlocalizedName.endsWith(".name")) { + name = LanguageRegistry.instance().getStringLocalization(unlocalizedName + ".name", secondLanguage); + } + + if (name == null || name.contains("%")) { + try (LanguageRegistryPatch lrPatch = new LanguageRegistryPatch(secondLanguage)) { + name = stack.getDisplayName(); + } + } + + final FluidStack fluid = StackInfo.getFluid(stack); + + if (fluid != null) { + final String unlocalizedFluidName = fluid.getUnlocalizedName().toLowerCase(); + String fluidName = this.secondNames.get(unlocalizedFluidName); + + if (fluidName == null && !unlocalizedFluidName.startsWith("fluid.")) { + fluidName = this.secondNames.get("fluid." + unlocalizedFluidName); + } + + if (fluidName != null && name != null && !name.isEmpty()) { + return name.replace(fluid.getLocalizedName(), fluidName); + } else { + name = fluidName; + } + } + + return name == null ? "" : name; + } + + protected void saveMappings(Map items) { + try (BufferedWriter writer = Files.newBufferedWriter( + (new File(NEIClientConfig.configDir, CONFIG_FILE)).toPath(), + StandardCharsets.UTF_8)) { + for (Map.Entry entry : items.entrySet()) { + if (entry.getValue().isEmpty()) continue; + + writer.write(entry.getKey() + "=" + entry.getValue()); + writer.newLine(); + } + } catch (Exception e) { + NEIClientConfig.logger.error("Error saving untranslator", e); + } + + NEIClientConfig.logger.info("Untranslator saved"); + } + + public void unload() { + this.secondNames.clear(); + LanguageRegistryPatch.secondLanguageListCache = null; + this.processedNames.clear(); + } + + public void load() { + unload(); + + this.secondNames.clear(); + + if (ClientHandler.loadSettingsFile(CONFIG_FILE, null, this::parseStream) + || ClientHandler.loadSettingsResource(CONFIG_FILE, this::parseStream)) { + NEIClientConfig.logger.info("Untranslator loaded"); + } + + if (!this.secondNames.containsKey("language") + || FMLCommonHandler.instance().getCurrentLanguage().equals(this.secondNames.get("language"))) { + this.secondNames.clear(); + } + + SubsetWidget.updateHiddenItems(); + } + + private void parseStream(Stream lines) { + lines.forEach(line -> { + final int sepIndex = line.indexOf('='); + + if (sepIndex != -1) { + this.secondNames.put(line.substring(0, sepIndex).trim(), line.substring(sepIndex + 1).trim()); + } + }); + } + +} diff --git a/src/main/resources/assets/nei/csv/catalysts.csv b/src/main/resources/assets/nei/csv/catalysts.csv index 3152d465..702d7fed 100644 --- a/src/main/resources/assets/nei/csv/catalysts.csv +++ b/src/main/resources/assets/nei/csv/catalysts.csv @@ -557,7 +557,6 @@ connor135246.campfirebackport.client.compat.nei.NEICampfireStateChangerHandler,c smelting,Natura:NetherFurnace,,Natura,TRUE,,,,,, crafting,gregtech:gt.metaitem.01:32744,,gregtech,TRUE,gregapi_post,,,,,"GT5 start: for readability, keep all GTNH-related catalysts below" gt.recipe.primitiveblastfurnace,gregtech:gt.blockmachines:140,,gregtech,TRUE,gregapi_post,,,,, -gt.recipe.primitiveblastfurnace,gregtech:gt.blockmachines:108,,gregtech,TRUE,gregapi_post,,,,, smelting,gregtech:gt.blockmachines:103,,gregtech,TRUE,gregapi_post,,,,, smelting,gregtech:gt.blockmachines:104,,gregtech,TRUE,gregapi_post,,,,, gt.recipe.macerator,gregtech:gt.blockmachines:106,,gregtech,TRUE,gregapi_post,,,,, @@ -823,6 +822,7 @@ gt.recipe.largeboilerfakefuels,gregtech:gt.blockmachines:1023,,gregtech,TRUE,gre gt.recipe.vacuumfreezer,gregtech:gt.blockmachines:1002,,gregtech,TRUE,gregapi_post,,,,, smelting,gregtech:gt.blockmachines:1003,,gregtech,TRUE,gregapi_post,,,,, smelting,gregtech:gt.blockmachines:15412,,gregtech,TRUE,gregapi_post,,,,, +smelting,gregtech:gt.blockmachines:31087,,gregtech,TRUE,gregapi_post,,,,, gt.recipe.dieselgeneratorfuel,gregtech:gt.blockmachines:1110,,gregtech,TRUE,gregapi_post,,,,, gt.recipe.dieselgeneratorfuel,gregtech:gt.blockmachines:1111,,gregtech,TRUE,gregapi_post,,,,, gt.recipe.dieselgeneratorfuel,gregtech:gt.blockmachines:1112,,gregtech,TRUE,gregapi_post,,,,, @@ -1172,11 +1172,8 @@ gt.recipe.circuitassembler,gregtech:gt.blockmachines:12096,,dreamcraft,TRUE,,,,, gt.recipe.alloysmelter,gregtech:gt.blockmachines:31023,,miscutils,TRUE,,,,,, gt.recipe.assembler,gregtech:gt.blockmachines:876,,miscutils,TRUE,,,,,, gt.recipe.metalbender,gregtech:gt.blockmachines:792,,miscutils,TRUE,,,,,, -gt.recipe.compressor,gregtech:gt.blockmachines:860,,miscutils,TRUE,,,,,, gt.recipe.cuttingsaw,gregtech:gt.blockmachines:992,,miscutils,TRUE,,,,,, -gt.recipe.extractor,gregtech:gt.blockmachines:860,,miscutils,TRUE,,,,,, gt.recipe.extruder,gregtech:gt.blockmachines:859,,miscutils,TRUE,,,,,, -gt.recipe.lathe,gregtech:gt.blockmachines:860,,miscutils,TRUE,,,,,, gt.recipe.macerator,gregtech:gt.blockmachines:31041,,miscutils,TRUE,,,,,, gt.recipe.macerator,gregtech:gt.blockmachines:797,,miscutils,TRUE,,,,,, ic2.recycler,gregtech:gt.blockmachines:799,,miscutils,TRUE,,,,,, @@ -1185,15 +1182,9 @@ gt.recipe.thermalcentrifuge,gregtech:gt.blockmachines:849,,miscutils,TRUE,,,,,, gt.recipe.orewasher,gregtech:gt.blockmachines:850,,miscutils,TRUE,,,,,, gt.recipe.packager,gregtech:gt.blockmachines:942,,miscutils,TRUE,,,,,, gt.recipe.rockbreaker,gregtech:gt.blockmachines:31065,,miscutils,TRUE,,,,,, -gt.recipe.fermenter,gregtech:gt.blockmachines:860,,miscutils,TRUE,,,,,, -gt.recipe.fluidextractor,gregtech:gt.blockmachines:860,,miscutils,TRUE,,,,,, -gt.recipe.fluidsolidifier,gregtech:gt.blockmachines:860,,miscutils,TRUE,,,,,, gt.recipe.distillery,gregtech:gt.blockmachines:31021,,miscutils,TRUE,,,,,, gt.recipe.distillationtower,gregtech:gt.blockmachines:31021,,miscutils,TRUE,,,,,, gt.recipe.chemicalbath,gregtech:gt.blockmachines:850,,miscutils,TRUE,,,,,, -gt.recipe.polarizer,gregtech:gt.blockmachines:860,,miscutils,TRUE,,,,,, -gt.recipe.autoclave,gregtech:gt.blockmachines:860,,miscutils,TRUE,,,,,, -gt.recipe.laserengraver,gregtech:gt.blockmachines:860,,miscutils,TRUE,,,,,, gt.recipe.press,gregtech:gt.blockmachines:792,,miscutils,TRUE,,,,,, gt.recipe.slicer,gregtech:gt.blockmachines:992,,miscutils,TRUE,,,,,, gt.recipe.sifter,gregtech:gt.blockmachines:840,,miscutils,TRUE,,,,,, @@ -1201,8 +1192,6 @@ gt.recipe.arcfurnace,gregtech:gt.blockmachines:862,,miscutils,TRUE,,,,,, gt.recipe.plasmaarcfurnace,gregtech:gt.blockmachines:862,,miscutils,TRUE,,,,,, gt.recipe.blastfurnace,gregtech:gt.blockmachines:963,,miscutils,TRUE,,,,,, gt.recipe.implosioncompressor,gregtech:gt.blockmachines:964,,miscutils,TRUE,,,,,, -gt.recipe.dieselgeneratorfuel,gregtech:gt.blockmachines:960,,miscutils,TRUE,,10,,,, -gt.recipe.gasturbinefuel,gregtech:gt.blockmachines:961,,miscutils,TRUE,,10,,,, gtpp.recipe.chemicaldehydrator,gregtech:gt.blockmachines:911,,miscutils,TRUE,,,,,, gtpp.recipe.chemicaldehydrator,gregtech:gt.blockmachines:912,,miscutils,TRUE,,,,,, gtpp.recipe.chemicaldehydrator,gregtech:gt.blockmachines:813,,miscutils,TRUE,,,,,, @@ -1266,8 +1255,6 @@ bw.recipe.biolab,gregtech:gt.blockmachines:12705,,bartworks,TRUE,,,,,, bw.recipe.biolab,gregtech:gt.blockmachines:12706,,bartworks,TRUE,,,,,, bw.recipe.biolab,gregtech:gt.blockmachines:12707,,bartworks,TRUE,,,,,, bw.recipe.biolab,gregtech:gt.blockmachines:12708,,bartworks,TRUE,,,,,, -bw.recipe.biolab,gregtech:gt.blockmachines:12709,,bartworks,TRUE,,,,,, -bw.recipe.biolab,gregtech:gt.blockmachines:12710,,bartworks,TRUE,,,,,, bw.recipe.BacteriaVat,gregtech:gt.blockmachines:12712,,bartworks,TRUE,,,,,, gt.recipe.electricimplosioncompressor,gregtech:gt.blockmachines:12734,,bartworks,TRUE,,,,,, gt.recipe.dieselgeneratorfuel,gregtech:gt.blockmachines:1113,,GoodGenerator,TRUE,,,,,, @@ -1496,4 +1483,4 @@ straywolfe.cookingwithtfc.client.nei.ClayOvenRecipeHandler,cookingwithtfc:item.c factorization.nei.RecipeGrinder,factorization:diamond_cutting_head,,factorization,TRUE,,,,,,,,,,, factorization.nei.RecipeMixer,factorization:FzBlock:18,,factorization,TRUE,,,,,,,,,,, ua.pp.shurgent.tfctech.nei.WireDrawBenchRecipeHandler,tfctech:item.Wire Draw Bench,,tfctech,TRUE,,,,,,,,,,, -mekanism.client.nei.ElectrolyticSeparatorRecipeHandler,Mekanism:MachineBlock2:4,,Mekanism,TRUE,,,,,,,,,,, \ No newline at end of file +mekanism.client.nei.ElectrolyticSeparatorRecipeHandler,Mekanism:MachineBlock2:4,,Mekanism,TRUE,,,,,,,,,,, diff --git a/src/main/resources/assets/nei/lang/en_US.lang b/src/main/resources/assets/nei/lang/en_US.lang index a592e7ab..7ef1185b 100644 --- a/src/main/resources/assets/nei/lang/en_US.lang +++ b/src/main/resources/assets/nei/lang/en_US.lang @@ -137,6 +137,8 @@ nei.chat.chunkoverlay.0=Chunk Overlay: Off nei.chat.chunkoverlay.1=Chunk Overlay: Chunk Corners nei.chat.chunkoverlay.2=Chunk Overlay: Chunks nei.chat.chunkoverlay.3=Chunk Overlay: GT Ore Veins +nei.chat.moboverlay.0=Mob Spawning Overlay: §cOff +nei.chat.moboverlay.1=Mob Spawning Overlay: §2On nei.chat.item_link.text=<%s> §6Click to add bookmark: %s nei.chat.bookmark_added.text=Bookmark added! @@ -147,6 +149,12 @@ nei.chat.recipeid.diff.finish=Finished processing recipe diff! nei.chat.recipeid.dump.start=Start processing recipe handlers! nei.chat.recipeid.dump.finish=Finished processing recipe handlers! +nei.chat.untranslator.dump.start=Start processing untranslator dump! +nei.chat.untranslator.dump.finish=Finished processing untranslator dump! +nei.chat.untranslator.dump.error=First, wait for the items to load! +nei.chat.untranslator.clear=File successfully deleted! +nei.chat.untranslator.clear.error=Could not delete file! + nei.options=NEI Options nei.options.back=Back nei.options.save=Save @@ -434,6 +442,9 @@ nei.options.inventory.itemzoom.showName=Display Name nei.options.inventory.itemzoom.showName.true=Show nei.options.inventory.itemzoom.showName.false=Hide nei.options.inventory.itemzoom.nameColor=Display Name Color +nei.options.inventory.itemUntranslator=Item Untranslator +nei.options.inventory.itemUntranslator.true=Enabled +nei.options.inventory.itemUntranslator.false=Disabled nei.options.command=Commands nei.options.command.creative=Gamemode