Merge remote-tracking branch 'origin/1.8'

gradle.properties

@@ -3,6 +3,6 @@ forgeversion=11.15.0.1595-1.8.8
 
 version_major=2
 version_minor=1
-version_patch=1
+version_patch=2
 
 org.gradle.parallel=true

src/main/java/mezz/jei/ItemFilter.java

@@ -16,6 +16,7 @@
 import net.minecraft.client.resources.model.ModelManager;
 import net.minecraft.item.ItemStack;
 
+import mezz.jei.api.JEIManager;
 import mezz.jei.util.ItemStackElement;
 import mezz.jei.util.Log;
 
@@ -27,8 +28,7 @@ public class ItemFilter {
 	/** A cache for fast searches while typing or using backspace. Maps filterText to filteredItemMaps */
 	private final LoadingCache<String, ImmutableList<ItemStackElement>> filteredItemMapsCache;
 
-	public ItemFilter(@Nonnull List<ItemStack> itemStacks) {
-
+	public ItemFilter() {
 		filteredItemMapsCache = CacheBuilder.newBuilder()
 				.maximumWeight(16)
 				.weigher(new Weigher<String, ImmutableList<ItemStackElement>>() {
@@ -40,6 +40,10 @@ public int weigh(@Nonnull String key, @Nonnull ImmutableList<ItemStackElement> v
 				.build(new CacheLoader<String, ImmutableList<ItemStackElement>>() {
 					@Override
 					public ImmutableList<ItemStackElement> load(@Nonnull final String filterText) throws Exception {
+						if (filterText.length() == 0) {
+							return createBaseList();
+						}
+
 						// Recursive.
 						// Find a cached filter that is before the one we want, so we don't have to filter the full item list.
 						// For example, the "", "i", "ir", and "iro" filters contain everything in the "iron" filter and more.
@@ -72,39 +76,41 @@ public ImmutableList<ItemStackElement> load(@Nonnull final String filterText) th
 
 						return ImmutableList.copyOf(filteredItemList);
 					}
-				});
 
-		// create the recursive base case value, the list with no filter set
-		ImmutableList.Builder<ItemStackElement> baseList = ImmutableList.builder();
-
-		ItemModelMesher itemModelMesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher();
-		ModelManager modelManager = itemModelMesher.getModelManager();
-		for (ItemStack itemStack : itemStacks) {
-			if (itemStack == null) {
-				continue;
-			}
-
-			// skip over itemStacks that can't be rendered
-			try {
-				if (itemModelMesher.getItemModel(itemStack) == modelManager.getMissingModel()) {
-					continue;
-				}
-			} catch (RuntimeException e) {
-				try {
-					Log.error("Couldn't find ItemModelMesher for itemStack {}. Exception: {}", itemStack, e);
-				} catch (RuntimeException ignored) {
-
-				}
-				continue;
-			}
-
-			ItemStackElement itemStackElement = ItemStackElement.create(itemStack);
-			if (itemStackElement != null) {
-				baseList.add(itemStackElement);
-			}
-		}
+					private ImmutableList<ItemStackElement> createBaseList() {
+						ImmutableList.Builder<ItemStackElement> baseList = ImmutableList.builder();
 
-		filteredItemMapsCache.put("", baseList.build());
+						ItemModelMesher itemModelMesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher();
+						ModelManager modelManager = itemModelMesher.getModelManager();
+
+						for (ItemStack itemStack : JEIManager.itemRegistry.getItemList()) {
+							if (itemStack == null) {
+								continue;
+							}
+
+							// skip over itemStacks that can't be rendered
+							try {
+								if (itemModelMesher.getItemModel(itemStack) == modelManager.getMissingModel()) {
+									continue;
+								}
+							} catch (RuntimeException e) {
+								try {
+									Log.error("Couldn't find ItemModelMesher for itemStack {}. Exception: {}", itemStack, e);
+								} catch (RuntimeException ignored) {
+
+								}
+								continue;
+							}
+
+							ItemStackElement itemStackElement = ItemStackElement.create(itemStack);
+							if (itemStackElement != null) {
+								baseList.add(itemStackElement);
+							}
+						}
+
+						return baseList.build();
+					}
+				});
 	}
 
 	public boolean setFilterText(@Nonnull String filterText) {

src/main/java/mezz/jei/ProxyCommonClient.java

@@ -38,7 +38,7 @@ public void loadComplete(@Nonnull FMLLoadCompleteEvent event) {
 		JEIManager.itemRegistry = new ItemRegistry();
 		JEIManager.recipeRegistry = JustEnoughItems.pluginRegistry.createRecipeRegistry();
 
-		ItemFilter itemFilter = new ItemFilter(JEIManager.itemRegistry.getItemList());
+		ItemFilter itemFilter = new ItemFilter();
 		ItemListOverlay itemListOverlay = new ItemListOverlay(itemFilter);
 		GuiEventHandler guiEventHandler = new GuiEventHandler(itemListOverlay);
 		MinecraftForge.EVENT_BUS.register(guiEventHandler);

src/main/java/mezz/jei/api/gui/IRecipeLayout.java

@@ -3,15 +3,24 @@
 import javax.annotation.Nonnull;
 
 public interface IRecipeLayout {
+	/**
+	 * Contains all the itemStacks displayed on this recipe layout.
+	 * Init and set them in your recipe category.
+	 */
 	@Nonnull
 	IGuiItemStackGroup getItemStacks();
 
+	/**
+	 * Contains all the fluidStacks displayed on this recipe layout.
+	 * Init and set them in your recipe category.
+	 */
 	@Nonnull
 	IGuiFluidStackGroup getFluidStacks();
 
 	/**
-	 * Enables the recipe transfer button and sets its position relative to the recipe layout.
-	 * The button transfers items in the user's inventory into the crafting area to set a recipe.
+	 * Moves the recipe transfer button's position relative to the recipe layout.
+	 * By default the recipe transfer button is at the bottom, to the right of the recipe.
+	 * If it doesn't fit there, you can use this to move it when you init the recipe layout.
 	 */
 	void setRecipeTransferButton(int posX, int posY);
 }

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

@@ -16,6 +16,7 @@
 import mezz.jei.gui.ingredients.GuiItemStackGroup;
 
 public class RecipeLayout implements IRecipeLayout {
+	private static final int RECIPE_BUTTON_SIZE = 12;
 	public static final int recipeTransferButtonIndex = 100;
 
 	@Nonnull
@@ -36,8 +37,9 @@ public RecipeLayout(int index, int posX, int posY, @Nonnull IRecipeCategory reci
 		this.recipeCategory = recipeCategory;
 		this.guiItemStackGroup = new GuiItemStackGroup();
 		this.guiFluidStackGroup = new GuiFluidStackGroup();
-		this.recipeTransferButton = new GuiButtonExt(recipeTransferButtonIndex + index, 0, 0, 12, 12, "+");
-		this.recipeTransferButton.visible = false;
+		int width = recipeCategory.getBackground().getWidth();
+		int height = recipeCategory.getBackground().getHeight();
+		this.recipeTransferButton = new GuiButtonExt(recipeTransferButtonIndex + index, posX + width + 2, posY + height - RECIPE_BUTTON_SIZE, RECIPE_BUTTON_SIZE, RECIPE_BUTTON_SIZE, "+");
 		this.posX = posX;
 		this.posY = posY;
 
@@ -86,7 +88,6 @@ public IGuiFluidStackGroup getFluidStacks() {
 	public void setRecipeTransferButton(int posX, int posY) {
 		recipeTransferButton.xPosition = posX + this.posX;
 		recipeTransferButton.yPosition = posY + this.posY;
-		recipeTransferButton.visible = true;
 	}
 
 	@Nonnull

src/main/java/mezz/jei/plugins/vanilla/crafting/CraftingRecipeCategory.java

@@ -56,8 +56,6 @@ public IDrawable getBackground() {
 
 	@Override
 	public void init(@Nonnull IRecipeLayout recipeLayout) {
-		recipeLayout.setRecipeTransferButton(56, 0);
-
 		IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks();
 
 		guiItemStacks.init(craftOutputSlot, false, 94, 18);

src/main/java/mezz/jei/plugins/vanilla/furnace/FurnaceFuelCategory.java

@@ -16,8 +16,6 @@ public String getUid() {
 
 	@Override
 	public void init(@Nonnull IRecipeLayout recipeLayout) {
-		recipeLayout.setRecipeTransferButton(-14, 36);
-
 		IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks();
 		guiItemStacks.init(inputSlot, false, 0, 0);
 		guiItemStacks.init(fuelSlot, true, 0, 36);

src/main/java/mezz/jei/plugins/vanilla/furnace/FurnaceSmeltingCategory.java

@@ -15,8 +15,6 @@ public String getUid() {
 
 	@Override
 	public void init(@Nonnull IRecipeLayout recipeLayout) {
-		recipeLayout.setRecipeTransferButton(-14, 0);
-
 		IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks();
 		guiItemStacks.init(inputSlot, true, 0, 0);
 		guiItemStacks.init(fuelSlot, false, 0, 36);

src/main/java/mezz/jei/util/RecipeTransferUtil.java

@@ -70,6 +70,9 @@ private static boolean transferRecipe(@Nonnull RecipeLayout recipeLayout, @Nonnu
 
 		for (Slot slot : craftingSlots.values()) {
 			if (slot.getHasStack()) {
+				if (!slot.canTakeStack(player)) {
+					return false;
+				}
 				filledCraftSlotCount++;
 				availableItemStacks.add(slot.getStack());
 			}
@@ -98,6 +101,19 @@ private static boolean transferRecipe(@Nonnull RecipeLayout recipeLayout, @Nonnu
 			return false;
 		}
 
+		// check that the slots exist and can be altered
+		for (Map.Entry<Integer, ItemStack> entry : slotMap.entrySet()) {
+			int slotIndex = entry.getKey();
+			if (slotIndex >= container.inventorySlots.size()) {
+				return false;
+			}
+			Slot slot = container.getSlot(slotIndex);
+			ItemStack stack = entry.getValue();
+			if (slot == null || !slot.isItemValid(stack)) {
+				return false;
+			}
+		}
+
 		if (doTransfer) {
 			PacketRecipeTransfer packet = new PacketRecipeTransfer(slotMap, craftingSlots.keySet(), inventorySlots.keySet());
 			JustEnoughItems.common.sendPacketToServer(packet);