Closed #52

CraftedMods · Aug 11, 2019 · 67933c0 · 67933c0
1 parent 61d9755
commit 67933c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/craftedMods/lotr/recipes/internal/recipeHandlers/CauldronRecipeHandler.java b/src/main/java/craftedMods/lotr/recipes/internal/recipeHandlers/CauldronRecipeHandler.java
@@ -50,7 +50,7 @@ public Collection<ShapelessRecipe> getDynamicCraftingRecipes(ItemStack result) {
 
 		this.handleUndyedResultItem(LOTRItemPouch.class, result, LOTRItemPouch::isPouchDyed,
 				this.getDefaultColorPermutations(result, LOTRItemPouch::setPouchColor), recipes);
-		this.handleUndyedResultItem(LOTRItemHobbitPipe.class, result, LOTRItemHobbitPipe::isPipeDyed, this.getHobbitPipeDyePermutations(result), recipes);
+		this.handleUndyedResultItem(LOTRItemHobbitPipe.class, result, stack -> LOTRItemHobbitPipe.getSmokeColor(stack) != 0, this.getHobbitPipeDyePermutations(result), recipes);
 		this.handleUndyedResultItem(LOTRItemLeatherHat.class, result,
 				((Predicate<ItemStack>) LOTRItemLeatherHat::isHatDyed).or(LOTRItemLeatherHat::isFeatherDyed), this.getLeatherHatDyePermutations(result),
 				recipes);
@@ -86,7 +86,7 @@ private <T extends Item> void handleUndyedResultItem(Class<T> itemType, ItemStac
 
 	private Function<ItemStack, Collection<ItemStack>> getHobbitPipeDyePermutations(ItemStack result) {
 		Collection<ItemStack> data = new ArrayList<>();
-		for (int i = 0; i < 15; i++) {
+		for (int i = 0; i < 16; i++) {
 			ItemStack dyedStack = result.copy();
 			LOTRItemHobbitPipe.setSmokeColor(dyedStack, i + 1);
 			data.add(dyedStack);
@@ -129,7 +129,8 @@ public Collection<ShapelessRecipe> getDynamicUsageRecipes(ItemStack ingredient)
 		Collection<ShapelessRecipe> recipes = new ArrayList<>();
 
 		this.handleDyeableIngredientItem(LOTRItemPouch.class, ingredient, LOTRItemPouch::isPouchDyed, LOTRItemPouch::removePouchDye, recipes);
-		this.handleDyeableIngredientItem(LOTRItemHobbitPipe.class, ingredient, LOTRItemHobbitPipe::isPipeDyed, LOTRItemHobbitPipe::removePipeDye, recipes);
+		this.handleDyeableIngredientItem(LOTRItemHobbitPipe.class, ingredient, stack -> LOTRItemHobbitPipe.getSmokeColor(stack) != 0,
+				LOTRItemHobbitPipe::removePipeDye, recipes);
 		this.handleDyeableIngredientItem(LOTRItemLeatherHat.class, ingredient,
 				((Predicate<ItemStack>) LOTRItemLeatherHat::isHatDyed).or(LOTRItemLeatherHat::isFeatherDyed), LOTRItemLeatherHat::removeHatAndFeatherDye,
 				recipes);

diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt
@@ -7,6 +7,8 @@ Made by 'Crafted_Mods' or 'The_Ranger_Malvegil'
   + Added a trader recipe handler for the Wicked  Dwarf
   + Added the new technical blocks to the item hiding list
  + Added a button which shows all recipes of a handler to the handler and device GUIs ("transfer rect")
+
+ * Fixed wrong recipes with the cauldron recipe handler and Hobbit Pipes with magic smoke
 
  #1.0.0-ALPHA:
   + Defined a public API