Merge tag 'v1.6.0' into 1.8.8

# Conflicts:
#	gradle.properties
#	src/main/java/mezz/jei/config/Config.java
#	src/main/java/mezz/jei/config/JEIModConfigGui.java
#	src/main/java/mezz/jei/gui/ItemListOverlay.java
#	src/main/java/mezz/jei/gui/RecipesGui.java
#	src/main/java/mezz/jei/gui/TooltipRenderer.java
#	src/main/java/mezz/jei/gui/ingredients/ItemStackRenderer.java
#	src/main/resources/assets/jei/lang/en_US.lang
#	src/main/resources/assets/jei/lang/zh_CN.lang

README.md

@@ -32,6 +32,6 @@ dependencies {
 ```
 
 `<MINECRAFT-VERSION>` can be `1.8` or `1.8.8`.
-See the list of github tags for available JEI versions.
+Join IRC for available JEI versions. Soon, they will be auto-uploaded to curse and you can get the version there.
 
 Join [#JEI on esper.net IRC](http://webchat.esper.net/?nick=JEIGithub...&channels=JEI&prompt=1) for questions or anything else.

gradle.properties

@@ -2,5 +2,5 @@ mcversion=1.8.8
 forgeversion=11.15.0.1611-1.8.8
 
 version_major=2
-version_minor=5
+version_minor=6
 version_patch=0

src/main/java/mezz/jei/config/Config.java

@@ -18,6 +18,7 @@ public class Config {
 	public static final String categoryMode = "mode";
 	public static final String categoryInterface = "interface";
 	public static final String categoryAdvanced = "advanced";
+	public static final String categoryAddons = "addons";
 
 	public static boolean cheatItemsEnabled = false;
 	public static boolean editModeEnabled = false;
@@ -38,6 +39,7 @@ public static void syncConfig() {
 		configFile.addCategory(categoryMode);
 		configFile.addCategory(categoryInterface);
 		configFile.addCategory(categoryAdvanced);
+		configFile.addCategory(categoryAddons);
 
 		cheatItemsEnabled = configFile.getBoolean(categoryMode, "cheatItemsEnabled", cheatItemsEnabled);
 		editModeEnabled = configFile.getBoolean(categoryMode, "editEnabled", editModeEnabled);

src/main/java/mezz/jei/config/Constants.java

@@ -13,4 +13,5 @@ public class Constants {
 	public static final String RESOURCE_DOMAIN = MOD_ID.toLowerCase(Locale.ENGLISH);
 	public static final String TEXTURE_GUI_PATH = "textures/gui/";
 
+	public static final int MAX_TOOLTIP_WIDTH = 125;
 }

src/main/java/mezz/jei/config/JEIModConfigGui.java

@@ -23,12 +23,17 @@ private static List<IConfigElement> getConfigElements() {
 		ConfigCategory categoryAdvanced = Config.configFile.getCategory(Config.categoryAdvanced);
 		ConfigCategory categoryInterface = Config.configFile.getCategory(Config.categoryInterface);
 		ConfigCategory categoryMode = Config.configFile.getCategory(Config.categoryMode);
+		ConfigCategory categoryAddons = Config.configFile.getCategory(Config.categoryAddons);
 
 		List<IConfigElement> configElements = new ArrayList<>();
 		configElements.addAll(new ConfigElement(categoryMode).getChildElements());
 		configElements.addAll(new ConfigElement(categoryInterface).getChildElements());
 		configElements.add(new ConfigElement(categoryAdvanced));
 
+		if (!categoryAddons.isEmpty() || categoryAddons.getChildren().size() > 0) {
+			configElements.add(new ConfigElement(categoryAddons));
+		}
+
 		return configElements;
 	}
 

src/main/java/mezz/jei/gui/ItemListOverlay.java

@@ -6,7 +6,6 @@
 import javax.annotation.Nullable;
 import java.awt.Color;
 import java.util.ArrayList;
-import java.util.List;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
@@ -218,8 +217,8 @@ public void drawScreen(@Nonnull Minecraft minecraft, int mouseX, int mouseY) {
 		}
 
 		if (configButtonHoverChecker.checkHover(mouseX, mouseY)) {
-			List<String> tooltipText = minecraft.fontRendererObj.listFormattedStringToWidth("Config", 300);
-			TooltipRenderer.drawHoveringText(minecraft, tooltipText, mouseX, mouseY);
+			String configString = Translator.translateToLocal("jei.tooltip.config");
+			TooltipRenderer.drawHoveringText(minecraft, configString, mouseX, mouseY);
 		}
 	}
 

src/main/java/mezz/jei/gui/RecipesGui.java

@@ -28,6 +28,7 @@
 import mezz.jei.util.Log;
 import mezz.jei.util.RecipeTransferUtil;
 import mezz.jei.util.StringUtil;
+import mezz.jei.util.Translator;
 
 public class RecipesGui extends GuiScreen implements IShowsRecipeFocuses, IMouseHandler {
 	private static final int borderPadding = 8;
@@ -347,8 +348,8 @@ public void draw(int mouseX, int mouseY) {
 		if (titleHoverChecker.checkHover(mouseX, mouseY)) {
 			Focus focus = logic.getFocus();
 			if (focus != null && !focus.isBlank()) {
-				List<String> tooltipText = minecraft.fontRendererObj.listFormattedStringToWidth("Show All Recipes", 300);
-				TooltipRenderer.drawHoveringText(minecraft, tooltipText, mouseX, mouseY);
+				String showAllRecipesString = Translator.translateToLocal("jei.tooltip.show.all.recipes");
+				TooltipRenderer.drawHoveringText(minecraft, showAllRecipesString, mouseX, mouseY);
 			}
 		}
 	}

src/main/java/mezz/jei/gui/TooltipRenderer.java

@@ -8,14 +8,18 @@
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
 
+import mezz.jei.config.Constants;
+
 /**
  * Workaround for GuiScreen.drawHoveringText being protected instead of public.
  * (the method with FontRenderer is added by Forge and can't be AT'd).
  */
 public class TooltipRenderer {
 	private static final TooltipGuiScreen tooltipScreen = new TooltipGuiScreen();
 
-	public static void drawHoveringText(Minecraft minecraft, List<String> textLines, int x, int y) {
+	public static void drawHoveringText(Minecraft minecraft, String textLine, int x, int y) {
+		@SuppressWarnings("unchecked")
+		List<String> textLines = minecraft.fontRendererObj.listFormattedStringToWidth(textLine, Constants.MAX_TOOLTIP_WIDTH);
 		drawHoveringText(minecraft, textLines, x, y, minecraft.fontRendererObj);
 	}
 
@@ -38,7 +42,7 @@ public void set(Minecraft minecraft) {
 		}
 
 		@Override
-		public void drawHoveringText(List textLines, int x, int y, FontRenderer font) {
+		public void drawHoveringText(List<String> textLines, int x, int y, FontRenderer font) {
 			super.drawHoveringText(textLines, x, y, font);
 		}
 	}

src/main/java/mezz/jei/gui/ingredients/ItemStackRenderer.java

@@ -7,10 +7,12 @@
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
 import mezz.jei.config.Config;
+import mezz.jei.config.Constants;
 import mezz.jei.util.Translator;
 
 public class ItemStackRenderer implements IIngredientRenderer<ItemStack> {
@@ -51,15 +53,22 @@ public List<String> getTooltip(@Nonnull Minecraft minecraft, @Nonnull ItemStack
 			list.add("");
 			list.add(EnumChatFormatting.ITALIC + Translator.translateToLocal("gui.jei.editMode.description"));
 			if (Config.isItemOnConfigBlacklist(itemStack, false)) {
-				list.add(EnumChatFormatting.YELLOW + Translator.translateToLocal("gui.jei.editMode.description.show"));
+				String description = EnumChatFormatting.YELLOW + Translator.translateToLocal("gui.jei.editMode.description.show");
+				list.addAll(minecraft.fontRendererObj.listFormattedStringToWidth(description, Constants.MAX_TOOLTIP_WIDTH));
 			} else {
-				list.add(EnumChatFormatting.YELLOW + Translator.translateToLocal("gui.jei.editMode.description.hide"));
+				String description = EnumChatFormatting.YELLOW + Translator.translateToLocal("gui.jei.editMode.description.hide");
+				list.addAll(minecraft.fontRendererObj.listFormattedStringToWidth(description, Constants.MAX_TOOLTIP_WIDTH));
 			}
 
-			if (Config.isItemOnConfigBlacklist(itemStack, true)) {
-				list.add(EnumChatFormatting.RED + Translator.translateToLocal("gui.jei.editMode.description.show.wild"));
-			} else {
-				list.add(EnumChatFormatting.RED + Translator.translateToLocal("gui.jei.editMode.description.hide.wild"));
+			Item item = itemStack.getItem();
+			if (item.getHasSubtypes()) {
+				if (Config.isItemOnConfigBlacklist(itemStack, true)) {
+					String description = EnumChatFormatting.RED + Translator.translateToLocal("gui.jei.editMode.description.show.wild");
+					list.addAll(minecraft.fontRendererObj.listFormattedStringToWidth(description, Constants.MAX_TOOLTIP_WIDTH));
+				} else {
+					String description = EnumChatFormatting.RED + Translator.translateToLocal("gui.jei.editMode.description.hide.wild");
+					list.addAll(minecraft.fontRendererObj.listFormattedStringToWidth(description, Constants.MAX_TOOLTIP_WIDTH));
+				}
 			}
 		}
 

src/main/java/mezz/jei/input/InputHandler.java

@@ -8,6 +8,8 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
@@ -127,19 +129,7 @@ private Focus getFocusUnderMouseForKey(int mouseX, int mouseY) {
 
 	private boolean handleMouseClickedFocus(int mouseButton, @Nonnull Focus focus) {
 		if (Config.editModeEnabled && GuiScreen.isCtrlKeyDown()) {
-			Boolean wildcard = null;
-			if (mouseButton == 0) {
-				wildcard = false;
-			} else if (mouseButton == 1) {
-				wildcard = true;
-			}
-
-			if (wildcard != null) {
-				if (Config.isItemOnConfigBlacklist(focus.getStack(), wildcard)) {
-					Config.removeItemFromConfigBlacklist(focus.getStack(), wildcard);
-				} else {
-					Config.addItemToConfigBlacklist(focus.getStack(), wildcard);
-				}
+			if (handleClickEditStack(mouseButton, focus)) {
 				return true;
 			}
 		}
@@ -169,6 +159,33 @@ private boolean handleMouseClickedFocus(int mouseButton, @Nonnull Focus focus) {
 		return false;
 	}
 
+	private boolean handleClickEditStack(int mouseButton, @Nonnull Focus focus) {
+		ItemStack itemStack = focus.getStack();
+		if (itemStack == null) {
+			return false;
+		}
+
+		boolean wildcard;
+		if (mouseButton == 0) {
+			wildcard = false;
+		} else if (mouseButton == 1) {
+			wildcard = true;
+		} else {
+			return false;
+		}
+
+		if (Config.isItemOnConfigBlacklist(focus.getStack(), wildcard)) {
+			Config.removeItemFromConfigBlacklist(focus.getStack(), wildcard);
+		} else {
+			Item item = itemStack.getItem();
+			if (wildcard && !item.getHasSubtypes()) {
+				return false;
+			}
+			Config.addItemToConfigBlacklist(focus.getStack(), wildcard);
+		}
+		return true;
+	}
+
 	public boolean handleKeyEvent() {
 		boolean cancelEvent = false;
 		if (Keyboard.getEventKeyState()) {

src/main/resources/assets/jei/lang/en_US.lang

@@ -2,6 +2,10 @@
 jei.button.next=Next
 jei.button.back=Back
 
+# Tooltips
+jei.tooltip.config=Config
+jei.tooltip.show.all.recipes=Show All Recipes
+
 # Key Bindings
 key.jei.toggleOverlay=Toggle Item List Overlay (Ctrl + )
 key.jei.showRecipe=Show Item Recipe
@@ -32,6 +36,9 @@ config.jei.advanced.nbtKeyIgnoreList.comment=List of NBT Keys that should be ign
 config.jei.advanced.itemBlacklist=Item Blacklist
 config.jei.advanced.itemBlacklist.comment=List of items that should not be displayed in the item list. Format: modId:name[:meta]. Edit Mode will automatically add or remove entries here.
 
+config.jei.addons=Addons
+config.jei.addons.comment=Category for JEI addon config options.
+
 # Edit Mode
 gui.jei.editMode.description=JEI Item List Edit Mode:
 gui.jei.editMode.description.hide=Ctrl-click to hide.

src/main/resources/assets/jei/lang/zh_CN.lang

@@ -5,8 +5,36 @@ jei.button.back=返回
 # Key Bindings
 key.jei.toggleOverlay=切换物品列表叠层
 key.jei.showRecipe=显示物品合成表
-key.jei.showUses=显示物品可参与合成表
+key.jei.showUses=显示物品用途
 
 # Config
 config.jei.mode.cheatItemsEnabled=开启物品作弊模式
 config.jei.mode.cheatItemsEnabled.comment=/给予物品而非显示其合成表
+config.jei.mode.editEnabled=开启物品编辑模式
+config.jei.mode.editEnabled.comment=在列表中点击物品以隐藏或取消隐藏
+
+config.jei.interface.tooltipModName=工具提示(Tooltip)中显示所属模组
+config.jei.interface.tooltipModName.comment=在物品的工具提示中显示其所属的模组名
+
+config.jei.advanced.nbtKeyIgnoreList=NBT关键字忽略列表
+config.jei.advanced.nbtKeyIgnoreList.comment=过滤可用合成时，该表所含的NBT关键字将忽略不计。
+config.jei.advanced.itemBlacklist=物品黑名单
+config.jei.advanced.itemBlacklist.comment=该表中物品将不会显示于JEI物品列表。添加格式： modId:name[:meta]。使用编辑模式可自动添加�或删除这里的条目。
+
+# Edit Mode
+gui.jei.editMode.description=JEI物品列表编辑模式：
+gui.jei.editMode.description.hide=按住Ctrl点击以隐藏
+gui.jei.editMode.description.show=已隐藏。按住Ctrl点击以显示。
+gui.jei.editMode.description.hide.wild=按住Ctrl右击以隐藏相同id的物品
+gui.jei.editMode.description.show.wild=相同id物品以隐藏。按住Ctrl右击以显示。
+
+# Recipes
+gui.jei.craftingTableRecipes=工作台合成
+gui.jei.smeltingRecipes=烧炼
+gui.jei.fuelRecipes=燃料
+gui.jei.furnaceExperience=%s点经验
+gui.jei.furnaceBurnTime=燃烧时间：%s
+gui.jei.brewingRecipes=酿造配方
+gui.jei.brewingRecipes.steps=步数：%s
+gui.jei.forestry.centrifugeRecipes=林业离心机
+gui.jei.forestry.fabricatorRecipes=林业热电子加工台