Update version 5.08.30

3 files changed, 26 insertions, 3 deletions

diff --git a/main/java/gregtech/api/enums/Materials.java b/main/java/gregtech/api/enums/Materials.java
index c38728b8c7..9b6caca1f7 100644
--- a/main/java/gregtech/api/enums/Materials.java
+++ b/main/java/gregtech/api/enums/Materials.java
@@ -166,7 +166,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
 	PhasedIron			(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1|2                                   , 255, 255, 255,   0,	"Phased Iron"					,    0,       0,         -1,    0, F, F,   3,   1,   1, Dyes._NULL			),
 	PhasedGold			(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1|2                                   , 255, 255, 255,   0,	"Phased Gold"					,    0,       0,         -1,    0, F, F,   3,   1,   1, Dyes._NULL			),
 	Soularium			(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1                                     , 255, 255, 255,   0,	"Soularium"						,    0,       0,         -1,    0, F, F,   3,   1,   1, Dyes._NULL			),
-	Endium				(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1                                     , 255, 255, 255,   0,	"Endium"						,    0,       0,         -1,    0, F, F,   3,   1,   1, Dyes._NULL			),
+	Endium				( 770, TextureSet.SET_DULL				,   1.0F,      0,  2, 1|2  |8                               , 165, 220, 250,   0,	"Endium"						,    0,       0,         -1,    0, F, F,   3,   1,   1, Dyes.dyeYellow		),
 	Prismarine			(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1  |4                                 , 255, 255, 255,   0,	"Prismarine"					,    0,       0,         -1,    0, F, F,   3,   1,   1, Dyes._NULL			),
 	GraveyardDirt		(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1                                     , 255, 255, 255,   0,	"Graveyard Dirt"				,    0,       0,         -1,    0, F, F,   3,   1,   1, Dyes._NULL			),
 	DarkSteel			( 364, TextureSet.SET_DULL				,   8.0F,    512,  3, 1|2  |8      |64                      ,  80,  70,  80,   0,	"Dark Steel"					,    0,       0,       1811,    0, F, F,   5,   1,   1, Dyes.dyePurple		),
diff --git a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
index 3bf171f434..77fc590ce1 100644
--- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
+++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
@@ -30,7 +30,7 @@ import net.minecraftforge.fluids.FluidStack;
 
 public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
 	
-	public boolean mMachine = false, mWrench = false, mScrewdriver = false, mSoftHammer = false, mHardHammer = false, mSolderingTool = false, mCrowbar = false;
+	public boolean mMachine = false, mWrench = false, mScrewdriver = false, mSoftHammer = false, mHardHammer = false, mSolderingTool = false, mCrowbar = false, mRunningOnLoad = false;
 	public int mPollution = 0, mProgresstime = 0, mMaxProgresstime = 0, mEUt = 0, mEfficiencyIncrease = 0, mUpdate = 0, mStartUpCheck = 100, mRuntime = 0, mEfficiency = 0;
 	public ItemStack[] mOutputItems = null;
 	public FluidStack[] mOutputFluids = null;
@@ -83,6 +83,11 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
         	mOutputItems[i].writeToNBT(tNBT);
             aNBT.setTag("mOutputItem"+i, tNBT);
     	}
+    	if (mOutputFluids != null) for (int i = 0; i < mOutputFluids.length; i++) if (mOutputFluids[i] != null) {
+            NBTTagCompound tNBT = new NBTTagCompound();
+            mOutputFluids[i].writeToNBT(tNBT);
+            aNBT.setTag("mOutputFluids"+i, tNBT);
+    	}
     	
 		aNBT.setBoolean("mWrench", mWrench);
 		aNBT.setBoolean("mScrewdriver", mScrewdriver);
@@ -97,13 +102,16 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
     	mEUt = aNBT.getInteger("mEUt");
     	mProgresstime = aNBT.getInteger("mProgresstime");
     	mMaxProgresstime = aNBT.getInteger("mMaxProgresstime");
+    	if(mMaxProgresstime>0)mRunningOnLoad=true;
     	mEfficiencyIncrease = aNBT.getInteger("mEfficiencyIncrease");
     	mEfficiency = aNBT.getInteger("mEfficiency");
     	mPollution = aNBT.getInteger("mPollution");
     	mRuntime = aNBT.getInteger("mRuntime");
     	mOutputItems = new ItemStack[getAmountOfOutputs()];
     	for (int i = 0; i < mOutputItems.length; i++) mOutputItems[i] = GT_Utility.loadItem(aNBT, "mOutputItem" + i);
-		mWrench = aNBT.getBoolean("mWrench");
+    	mOutputFluids = new FluidStack[getAmountOfOutputs()];
+    	for (int i = 0; i < mOutputFluids.length; i++) mOutputFluids[i] = GT_Utility.loadFluid(aNBT, "mOutputFluids" + i);
+    	mWrench = aNBT.getBoolean("mWrench");
 		mScrewdriver = aNBT.getBoolean("mScrewdriver");
 		mSoftHammer = aNBT.getBoolean("mSoftHammer");
 		mHardHammer = aNBT.getBoolean("mHardHammer");
diff --git a/main/java/gregtech/api/util/GT_Utility.java b/main/java/gregtech/api/util/GT_Utility.java
index fea00321ab..0ae3da3909 100644
--- a/main/java/gregtech/api/util/GT_Utility.java
+++ b/main/java/gregtech/api/util/GT_Utility.java
@@ -1411,6 +1411,13 @@ public class GT_Utility {
 	/**
 	 * Loads an ItemStack properly.
 	 */
+	public static FluidStack loadFluid(NBTTagCompound aNBT, String aTagName) {
+		return loadFluid(aNBT.getCompoundTag(aTagName));
+	}
+	
+	/**
+	 * Loads an ItemStack properly.
+	 */
 	public static ItemStack loadItem(NBTTagCompound aNBT) {
 		if (aNBT == null) return null;
 		ItemStack rStack = ItemStack.loadItemStackFromNBT(aNBT);
@@ -1424,6 +1431,14 @@ public class GT_Utility {
 		return GT_OreDictUnificator.get(T, rStack);
 	}
 	
+	/**
+	 * Loads an ItemStack properly.
+	 */
+	public static FluidStack loadFluid(NBTTagCompound aNBT) {
+		if (aNBT == null) return null;
+		return FluidStack.loadFluidStackFromNBT(aNBT);
+	}
+	
 	public static <E> E selectItemInList(int aIndex, E aReplacement, List<E> aList) {
 		if (aList == null || aList.isEmpty()) return aReplacement;
 		if (aList.size() <= aIndex) return aList.get(aList.size() - 1);