From b638bc34c3249a5cf2d869178bf004537d71b3b3 Mon Sep 17 00:00:00 2001 From: Technus Date: Tue, 22 Nov 2016 12:51:04 +0100 Subject: [PATCH] initial --- src/main/java/gregtech/api/util/GT_Recipe.java | 2 +- .../java/gregtech/common/GT_RecipeAdder.java | 2 +- .../gregtech/textures/gui/FakeAssemblyline.png | Bin 0 -> 262931 bytes 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/gui/FakeAssemblyline.png diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java index 3d238bf1..9c0d940b 100644 --- a/src/main/java/gregtech/api/util/GT_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Recipe.java @@ -466,7 +466,7 @@ public class GT_Recipe { public static final GT_Recipe_Map sRockBreakerFakeRecipes = new GT_Recipe_Map(new HashSet(3), "gt.recipe.rockbreaker", "Rock Breaker", null, RES_PATH_GUI + "basicmachines/RockBreaker", 1, 1, 0, 0, 1, E, 1, E, true, true); public static final GT_Recipe_Map sByProductList = new GT_Recipe_Map(new HashSet(1000), "gt.recipe.byproductlist", "Ore Byproduct List", null, RES_PATH_GUI + "basicmachines/Default", 1, 6, 1, 0, 1, E, 1, E, true, true); public static final GT_Recipe_Map sRepicatorFakeRecipes = new GT_Recipe_Map(new HashSet(100), "gt.recipe.replicator", "Replicator", null, RES_PATH_GUI + "basicmachines/Replicator", 0, 1, 0, 1, 1, E, 1, E, true, true); - public static final GT_Recipe_Map sAssemblylineFakeRecipes = new GT_Recipe_Map(new HashSet(30), "gt.recipe.scanner", "Scanner", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 1, 0, 1, E, 1, E, true, true); + public static final GT_Recipe_Map sAssemblylineFakeRecipes = new GT_Recipe_Map(new HashSet(30), "gt.recipe.fakeAssemblyline", "fakeAssemblyline", "Assemblyline", RES_PATH_GUI + "FakeAssemblyline", 1, 1, 1, 0, 1, E, 1, E, true, true); public static final GT_Recipe_Map sPlasmaArcFurnaceRecipes = new GT_Recipe_Map(new HashSet(10000), "gt.recipe.plasmaarcfurnace", "Plasma Arc Furnace", null, RES_PATH_GUI + "basicmachines/PlasmaArcFurnace", 1, 4, 1, 1, 1, E, 1, E, true, true); public static final GT_Recipe_Map sArcFurnaceRecipes = new GT_Recipe_Map(new HashSet(10000), "gt.recipe.arcfurnace", "Arc Furnace", null, RES_PATH_GUI + "basicmachines/ArcFurnace", 1, 4, 1, 1, 3, E, 1, E, true, true); diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java index d87f6bcc..d9558bce 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -836,7 +836,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if(tItem==null)System.out.println("addAssemblylineRecipe"+aResearchItem.getDisplayName()); } GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{aResearchItem}, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Research result", new Object[0])}, null, null, aResearchTime, 30, 0); - + GT_Recipe.GT_Recipe_Map.sAssemblylineFakeRecipes.addFakeRecipe(false, aInputs, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Research result", new Object[0])}, aFluidInputs, null, aDuration, aEUt, 0); GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(new GT_Recipe_AssemblyLine( aResearchItem, aResearchTime, aInputs, aFluidInputs, aOutput, aDuration, aEUt)); return true; } diff --git a/src/main/resources/assets/gregtech/textures/gui/FakeAssemblyline.png b/src/main/resources/assets/gregtech/textures/gui/FakeAssemblyline.png new file mode 100644 index 0000000000000000000000000000000000000000..0c1b04f2ee80c42eb2d31044e26366ab97be4ec1 GIT binary patch literal 262931 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