More Cleanup.

2 files changed, 14 insertions, 24 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java
index 9b8ddae136..8bfc866c74 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java
@@ -20,7 +20,6 @@ import gregtech.api.gui.GT_GUIContainer_MultiMachine;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMultiBlockBase;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GTPP_Recipe;
@@ -31,7 +30,6 @@ import gregtech.api.util.GT_Utility;
 import gregtech.api.util.GasSpargingRecipe;
 import gregtech.api.util.GasSpargingRecipeMap;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -147,7 +145,6 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB
 
 	@Override
 	public GT_Recipe.GT_Recipe_Map getRecipeMap() {
-		GTPP_Recipe_Map.sSpargeTowerRecipes.mRecipeList.clear();
 		if (GTPP_Recipe_Map.sSpargeTowerRecipes.mRecipeList.isEmpty()) {
 			generateRecipes();
 		}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
index 5037eff9f3..4b9325d079 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
@@ -416,14 +416,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
 			Logger.WARNING("Recipe time: "+this.mMaxProgresstime);	
 			mFuelRemaining = getStoredFuel(aFuelProcessing); //Record available fuel	
 
-			FluidStack[] tOutputFluids = new FluidStack[aFuelProcessing.mFluidOutputs.length];
-			for (int h = 0; h < aFuelProcessing.mFluidOutputs.length; h++) {
-				if (aFuelProcessing.getFluidOutput(h) != null) {
-					tOutputFluids[h] = aFuelProcessing.getFluidOutput(h).copy();
-				}
-			}
-
-			this.mOutputFluids = tOutputFluids;
+			this.mOutputFluids = aFuelProcessing.mFluidOutputs.clone();
 			updateSlots();					
 			Logger.WARNING("Recipe Good!");	
 			return true;
@@ -499,22 +492,22 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
 			else {
 				this.turnCasingActive(false);
 			}
-		}
-		else {
+		}	
+		super.onPostTick(aBaseMetaTileEntity, aTick);
+	}
 
-			if (aBaseMetaTileEntity.isActive()){
-				// Set casings active if we're warmed up.
-				if (this.mEfficiency == this.getMaxEfficiency(null)){
-					// Try output some Uranium-233
-					if (MathUtils.randInt(1, 300) == 1){
-						this.addOutput(ELEMENT.getInstance().URANIUM233.getFluidStack(MathUtils.randInt(1, 10)));
-					}
-				}
+	@Override
+	public boolean onRunningTick(ItemStack aStack) {
+		// See if we're warmed up.
+		if (this.mEfficiency == this.getMaxEfficiency(null)){
+			// Try output some Uranium-233
+			if (MathUtils.randInt(1, 300) == 1){
+				this.addOutput(ELEMENT.getInstance().URANIUM233.getFluidStack(MathUtils.randInt(1, 10)));
 			}
-		}		
-		super.onPostTick(aBaseMetaTileEntity, aTick);
+		}
+		return super.onRunningTick(aStack);
 	}
-	
+
 	@Override
 	public void saveNBTData(NBTTagCompound aNBT) {
 		aNBT.setInteger("mFuelRemaining", this.mFuelRemaining);