From 499411aa21ac4a742b6d51ef3ce9c4046d0a22c1 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Fri, 25 Jan 2019 04:34:06 +0000
Subject: + Added recipes to obtain Astral Titanium, Celestial Tungsten
 Advanced Nitinol and Chromatic Glass. + Added Particle Physics, so some basic
 extent. + Added new textures for some Meta items. + Added new textures for
 all particles and ions. + Added Custom Debug NBT to error ingots, in the
 event one is obtained by a player. + Added more information to the tooltip of
 Control Cores. + Added more uniform ways to obtain tiered item components to
 CI. - Hard disable of GC Fuel tweaks for the moment. % Hopefully greatly
 improved the cape handler. Cape list is now stored on Overmind's site,
 meaning it can be updated outside of the mod. % Cape Handler now will store
 the cape data locally in a .dat for offline use, this can be updated anytime
 by removing it, or once a week if outdated) % Tweaked Cyclotron Recipe map to
 support new changes to functionality. % Tweaked RTG fuel pellet production
 time in Cyclotron to be 100x. % Adjusted requirements for Quicklime to
 generate (It may vanish after this commit, May be worth rolling back if an
 issue.). % Adjusted code to use checkForInvalidItems instead of direct item
 comparisons in several places. % Renamed Buffer Cores to Energy Cores. %
 Adjusted recipes for Energy Cores and Energy Buffers, they now require 6 slot
 assembly. $ Fixed Multiblock handling during structure checks, they'd
 accidentally detect the controller as an invalid block.

---
 .../gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/Java/gtPlusPlus/xmod/gregtech/recipes')

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index 1d99b1c2d7..05fb2a5471 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -442,19 +442,16 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 	@Override
 	public boolean addCyclotronRecipe(ItemStack aInputs, FluidStack aFluidInput, ItemStack[] aOutputs,
 			FluidStack aFluidOutput, int[] aChances, int aDuration, int aEUt, int aSpecialValue) {
-		return addCyclotronRecipe(new ItemStack[] {aInputs}, aFluidInput, aOutputs[0], aFluidOutput, aChances, aDuration, aEUt, aSpecialValue);
+		return addCyclotronRecipe(new ItemStack[] {aInputs}, aFluidInput, aOutputs, aFluidOutput, aChances, aDuration, aEUt, aSpecialValue);
 	}
 
 	@Override
-	public boolean addCyclotronRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput,
+	public boolean addCyclotronRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack[] aOutput,
 			FluidStack aFluidOutput, int[] aChances, int aDuration, int aEUt, int aSpecialValue) {
-		if (aOutput == null) {
+		if (aOutput == null || aOutput.length < 1 || !ItemUtils.checkForInvalidItems(aOutput)) {
 			return false;
 		}
-		if ((aDuration = GregTech_API.sRecipeFile.get("cyclotron", aOutput, aDuration)) <= 0) {
-			return false;
-		}
-		if (Recipe_GT.Gregtech_Recipe_Map.sCyclotronRecipes.addRecipe(true, aInputs, new ItemStack[] { aOutput },
+		if (Recipe_GT.Gregtech_Recipe_Map.sCyclotronRecipes.addRecipe(true, aInputs, aOutput,
 				null, aChances, new FluidStack[] { aFluidInput }, new FluidStack[] { aFluidOutput },
 				Math.max(1, aDuration), Math.max(1, aEUt), aSpecialValue) != null) {
 			return true;
-- 
cgit