$ .08 compliance fixes.

% LFTR Changes. It now outputs U233 on average every 10 seconds.
% Updated LFTR tool-tip.

3 files changed, 53 insertions, 37 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
index e57be69c1a..90cecb6f0e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
@@ -104,15 +104,15 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
 			if (tThickNess < 0.749F)
 				return new ITexture[] {
 						new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
-						new GT_RenderedTexture(Textures.BlockIcons.INSULATION_MEDIUM_PLUS,
+						new GT_RenderedTexture(Textures.BlockIcons.INSULATION_LARGE,
 								Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
 			if (tThickNess < 0.874F)
 				return new ITexture[] {
 						new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
-						new GT_RenderedTexture(Textures.BlockIcons.INSULATION_LARGE,
+						new GT_RenderedTexture(Textures.BlockIcons.INSULATION_HUGE,
 								Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
 			return new ITexture[] { new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
-					new GT_RenderedTexture(Textures.BlockIcons.INSULATION_HUGE,
+					new GT_RenderedTexture(Textures.BlockIcons.INSULATION_FULL,
 							Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
 		}
 		return new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.INSULATION_FULL,
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java
index 044904f75b..274d76e6f3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java
@@ -66,6 +66,9 @@ public class GregtechMTE_NuclearReactor extends GT_MetaTileEntity_MultiBlockBase
 				"--Mufflers go in the top 3x3--",
 				"4x IV+ Mufflers",
 				"Causes " + (20 * getPollutionPerTick(null)) + " Pollution per second",
+				"Outputs U233 every 10 seconds, on average",
+				"Input Fluorine and Helium for bonus byproducts",
+				"Input Li2BeF4 and a molten salt as fuel.",
 				CORE.GT_Tooltip};
 	}
 
@@ -488,7 +491,6 @@ public class GregtechMTE_NuclearReactor extends GT_MetaTileEntity_MultiBlockBase
 									//this.mLastRecipe = aFuel;
 								}
 
-
 								this.fuelValue = aFuel.mSpecialValue;
 								this.fuelRemaining = hatchFluid1.amount; //Record available fuel
 
@@ -630,6 +632,10 @@ public class GregtechMTE_NuclearReactor extends GT_MetaTileEntity_MultiBlockBase
 				this.turnCasingActive(false);
 			}
 			
+			if (MathUtils.randInt(1, 200) == 1){
+				Utils.LOG_INFO("Adding U233");
+				this.addOutput(NUCLIDE.getInstance().URANIUM233.getFluid(MathUtils.randInt(1, 10)));
+			}
 			
 			if (this.mDynamoHatches != null) {
 				for (GT_MetaTileEntity_Hatch_Dynamo tHatch : this.mDynamoHatches) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java
index e169a3c0e0..a8c0e45f0b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java
@@ -7,18 +7,19 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachin
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.api.util.Recipe_GT;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 
 public class GregtechAdvancedMixer {
 
 	private static int mID = 851;
-	
+
 	public static void run(){
 		generateMixerRecipeMap();
 		run1();
 	}
-	
+
 	private static boolean generateMixerRecipeMap(){
 		if (Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes.mRecipeList.size() == 0){
 			GT_Recipe_Map oldMap = GT_Recipe.GT_Recipe_Map.sMixerRecipes;
@@ -28,7 +29,7 @@ public class GregtechAdvancedMixer {
 			for (final GT_Recipe g : x) {
 				Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes.add(g);
 			}
-			
+
 			if (Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes.mRecipeList.size() > 0){
 				return true;
 			}
@@ -36,11 +37,11 @@ public class GregtechAdvancedMixer {
 				Utils.LOG_INFO("Failed to generate "+ map.mUnlocalizedName +" recipes.");
 				return false;
 			}
-			
+
 		}		
 		return true;
 	}
-	
+
 	private static void run1(){
 		GregtechItemList.Machine_Advanced_LV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.01",
 				"Basic Combiner", 1, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1,
@@ -87,33 +88,42 @@ public class GregtechAdvancedMixer {
 						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'),
 						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
 						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L));
-		GregtechItemList.Machine_Advanced_LuV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.06",
-				"Mega Combiner I", 6, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1,
-				"MixerAdvanced.png", "", false, false, 0, "MIXER",
-				new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
-						ItemList.Machine_LuV_Mixer, Character.valueOf('E'),
-						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'),
-						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'),
-						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
-						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L));
-		GregtechItemList.Machine_Advanced_ZPM_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.07",
-				"Mega Combiner II", 7, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1,
-				"MixerAdvanced.png", "", false, false, 0, "MIXER",
-				new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
-						ItemList.Machine_ZPM_Mixer, Character.valueOf('E'),
-						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'),
-						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'),
-						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
-						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L));
-		GregtechItemList.Machine_Advanced_UV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.08",
-				"Ultra Combiner I", 8, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1,
-				"MixerAdvanced.png", "", false, false, 0, "MIXER",
-				new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
-						ItemList.Machine_UV_Mixer, Character.valueOf('E'),
-						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'),
-						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'),
-						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
-						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L));
+
+		if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
+			try {
+				GregtechItemList.Machine_Advanced_LuV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.06",
+						"Mega Combiner I", 6, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1,
+						"MixerAdvanced.png", "", false, false, 0, "MIXER",
+						new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
+								//ItemList.Machine_LuV_Mixer, Character.valueOf('E'),
+								ItemList.valueOf("Machine_LuV_Mixer"), Character.valueOf('E'),
+								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'),
+								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'),
+								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
+								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L));
+				GregtechItemList.Machine_Advanced_ZPM_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.07",
+						"Mega Combiner II", 7, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1,
+						"MixerAdvanced.png", "", false, false, 0, "MIXER",
+						new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
+								//ItemList.Machine_ZPM_Mixer, Character.valueOf('E'),
+								ItemList.valueOf("Machine_ZPM_Mixer"), Character.valueOf('E'),
+								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'),
+								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'),
+								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
+								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L));
+				GregtechItemList.Machine_Advanced_UV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.08",
+						"Ultra Combiner I", 8, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1,
+						"MixerAdvanced.png", "", false, false, 0, "MIXER",
+						new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
+								//ItemList.Machine_UV_Mixer, Character.valueOf('E'),
+								ItemList.valueOf("Machine_UV_Mixer"), Character.valueOf('E'),
+								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'),
+								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'),
+								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
+								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L));
+			}
+			catch (Throwable t){}
+		}
+
 	}
-	
 }