From b5930df58a769275fcfe2e737ba1414a1b868f19 Mon Sep 17 00:00:00 2001
From: Zelophed <zefren1@googlemail.com>
Date: Fri, 16 Oct 2020 19:19:55 +0200
Subject: [PATCH] merge changes from 1.15

---
 .../com/simibubi/create/compat/jei/CreateJEI.java | 15 +++------------
 .../jei/category/MechanicalCraftingCategory.java  |  7 +------
 .../compat/jei/category/MixingCategory.java       |  2 +-
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java
index 097790b58..c4d71a9fe 100644
--- a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java
+++ b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java
@@ -144,18 +144,9 @@ public class CreateJEI implements IModPlugin {
 	public void registerRecipeCatalysts(IRecipeCatalystRegistration registration) {
 		ItemStack fan = new ItemStack(AllBlocks.ENCASED_FAN.get());
 
-		ItemStack splashingFan = fan.copy().setDisplayName(new StringTextComponent(TextFormatting.RESET + Lang.translate("recipe.splashing.fan")));
-		ItemStack smokingFan = fan.copy().setDisplayName(new StringTextComponent(TextFormatting.RESET + Lang.translate("recipe.smokingViaFan.fan")));
-		ItemStack blastingFan = fan.copy().setDisplayName(new StringTextComponent(TextFormatting.RESET + Lang.translate("recipe.blastingViaFan.fan")));
-		ItemStack splashingFan = fan
-				.copy()
-				.setDisplayName(Lang.translate("recipe.splashing.fan").formatted(TextFormatting.RESET));
-		ItemStack smokingFan = fan
-				.copy()
-				.setDisplayName(Lang.translate("recipe.smokingViaFan.fan").formatted(TextFormatting.RESET));
-		ItemStack blastingFan = fan
-				.copy()
-				.setDisplayName(Lang.translate("recipe.blastingViaFan.fan").formatted(TextFormatting.RESET));
+		ItemStack splashingFan = fan.copy().setDisplayName(Lang.translate("recipe.splashing.fan").formatted(TextFormatting.RESET));
+		ItemStack smokingFan = fan.copy().setDisplayName(Lang.translate("recipe.smokingViaFan.fan").formatted(TextFormatting.RESET));
+		ItemStack blastingFan = fan.copy().setDisplayName(Lang.translate("recipe.blastingViaFan.fan").formatted(TextFormatting.RESET));
 
 		registration.addRecipeCatalyst(new ItemStack(AllBlocks.MILLSTONE.get()), millingCategory.getUid());
 
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java
index 7e40425ce..9f660c133 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java
@@ -1,9 +1,5 @@
 package com.simibubi.create.compat.jei.category;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.simibubi.create.AllBlocks;
@@ -31,7 +27,6 @@ import net.minecraft.util.text.TranslationTextComponent;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class MechanicalCraftingCategory extends CreateRecipeCategory<ShapedRecipe> {
 
@@ -163,7 +158,7 @@ public class MechanicalCraftingCategory extends CreateRecipeCategory<ShapedRecip
 
 		matrixStack.push();
 		matrixStack.translate(0, 0, 300);
-		
+
 		RenderHelper.disableStandardItemLighting();
 		int amount = 0;
 		for (Ingredient ingredient : recipe.getIngredients()) {
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/MixingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/MixingCategory.java
index d7b961d97..cf0e4888d 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/MixingCategory.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/MixingCategory.java
@@ -25,7 +25,7 @@ public class MixingCategory extends BasinCategory {
 		HeatCondition requiredHeat = recipe.getRequiredHeat();
 		if (requiredHeat != HeatCondition.NONE)
 			heater.withHeat(requiredHeat.visualizeAsBlazeBurner())
-				.draw(matrixStack, getBackground().getWidth() / 2 + 3, 55);
+					.draw(matrixStack, getBackground().getWidth() / 2 + 3, 55);
 		mixer.draw(matrixStack, getBackground().getWidth() / 2 + 3, 34);
 	}