+ Added a Cyclotron Recipe handler & a test recipe.

% Changed Cyclotron Tool-tip.
% Made Cyclotron IV.
% Changed Cyclotron controller texture.

4 files changed, 45 insertions, 7 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 5af18bb624..d6c651e9af 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -46,8 +46,9 @@ public class RECIPES_GREGTECH {
 		macerationRecipes();
 		centrifugeRecipes();
 		benderRecipes();
+		cyclotronRecipes();
 		addFuels();
-	}
+	}	
 
 	private static void cokeOvenRecipes(){
 		Utils.LOG_INFO("Loading Recipes for Industrial Coking Oven.");
@@ -757,5 +758,17 @@ public class RECIPES_GREGTECH {
 		}
 		return true;
 	}
+	
+	private static void cyclotronRecipes() {
+		CORE.RA.addCyclotronRecipe(
+				null,
+				FluidUtils.getFluidStack("molten.bismuth", 1),
+				new ItemStack[]{GregtechItemList.Pellet_RTG_PO210.get(1)},
+				null,
+				new int[]{100}, 
+				20*300, 
+				2040, 
+				500*20);		
+	}
 
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
index 8159519016..bc25a32945 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
@@ -103,5 +103,8 @@ public interface IGregtech_RecipeAdder {
 			FluidStack aInput7, FluidStack aInput8, FluidStack aInput9,
 			FluidStack aOutput1, FluidStack aOutput2,
 			int aDuration, int aEUt);
+	
+	public boolean addCyclotronRecipe(ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs,
+			FluidStack aFluidOutput, int[] aChances, int aDuration, int aEUt, int aSpecialValue);
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java
index 76c4abf86c..979071defc 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java
@@ -18,6 +18,7 @@ import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.Recipe_GT;
 import gregtech.common.gui.GT_GUIContainer_FusionReactor;
 import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import net.minecraft.block.Block;
@@ -40,7 +41,7 @@ public class GregtechMetaTileEntity_Cyclotron extends GT_MetaTileEntity_MultiBlo
 	}
 
 	public int tier(){
-		return 6;
+		return 5;
 	}
 
 	@Override
@@ -240,10 +241,11 @@ public class GregtechMetaTileEntity_Cyclotron extends GT_MetaTileEntity_MultiBlo
 				"------------------------------------------------------------",
 				"Consists of the same layout as a Fusion Reactor",
 				"Cyclotron Machine Casings around Cyclotron Coil Blocks", 
-				"2-16 Input Hatches", 
-				"1-16 Output Hatches", 
+				"2-16 Input Busses", 
+				"1-16 Output Busses", 
 				"1-16 Energy Hatches", 
-		"All Hatches must be LuV or better"};
+		"All Hatches must be IV or better",
+		CORE.GT_Tooltip};
 	}
 
 	@Override
@@ -263,8 +265,8 @@ public class GregtechMetaTileEntity_Cyclotron extends GT_MetaTileEntity_MultiBlo
 
 	public IIconContainer getIconOverlay() {
 		if (this.getBaseMetaTileEntity().isActive())
-			return TexturesGtBlock.Overlay_MatterFab_Active;
-		return TexturesGtBlock.Overlay_MatterFab;
+			return TexturesGtBlock.Overlay_Machine_Dimensional_Orange;
+		return TexturesGtBlock.Overlay_Machine_Dimensional_Blue;
 
 	}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index 64ee1152f6..16b38d06bc 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -3,6 +3,7 @@ package gtPlusPlus.xmod.gregtech.recipes;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.util.CustomRecipeMap;
+import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.Recipe_GT;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.item.ItemUtils;
@@ -326,5 +327,24 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 		CustomRecipeMap.sFissionFuelProcessing.addRecipe(null, inputs, outputs, aDuration, aEUt, 0);
 		return true;
 	}
+	
+	public boolean addCyclotronRecipe(ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs,
+			FluidStack aFluidOutput, int[] aChances, int aDuration, int aEUt, int aSpecialValue) {
+		if ((aInput == null) || (aOutputs == null) || (aFluidInput == null)) {
+			return false;
+		}
+		for (ItemStack tStack : aOutputs) {
+			if (tStack != null) {
+				if ((aDuration = GregTech_API.sRecipeFile.get("cyclotron", aInput, aDuration)) <= 0) {
+					return false;
+				}
+				Recipe_GT.Gregtech_Recipe_Map.sCyclotronRecipes.addRecipe(true, new ItemStack[] { aInput }, aOutputs,
+						null, aChances, new FluidStack[] { aFluidInput }, new FluidStack[] { aFluidOutput },
+						Math.max(1, aDuration), Math.max(1, aEUt), aSpecialValue);
+				return true;
+			}
+		}
+		return false;
+	}
 
 }