Merge branch 'experimental' into GT_dev

# Conflicts:
#	src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java

7 files changed, 52 insertions, 15 deletions

diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java
index 2170b6543c..953e3e5dc4 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java
@@ -95,7 +95,7 @@ public interface IGregTechTileEntity extends ITexturedTileEntity, IGearEnergyTil
     /**
      * Sets initial Values from NBT
      *
-     * @param tNBT is the NBTTag of readFromNBT
+     * @param aNBT is the NBTTag of readFromNBT
      * @param aID  is the MetaTileEntityID
      */
     public void setInitialValuesAsNBT(NBTTagCompound aNBT, short aID);
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
index d99ce1bc41..75b34fa73f 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
@@ -444,16 +444,29 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
                                             || (getCoverIDAtSide((byte) 5) == 0 && worldObj.getPrecipitationHeight(xCoord + 1, zCoord) - 1 < yCoord)) {
                                         if (GregTech_API.sMachineRainExplosions && worldObj.isRaining() && getBiome().rainfall > 0) {
                                             if (getRandomNumber(10) == 0) {
-                                                try{GT_Mod.instance.achievements.issueAchievement(this.getWorldObj().getPlayerEntityByName(mOwnerName), "badweather");}catch(Exception e){}
+                                                try{
+                                                    GT_Mod.instance.achievements.issueAchievement(this.getWorldObj().getPlayerEntityByName(mOwnerName), "badweather");
+                                                }catch(Exception e){
+
+                                                }
+                                                GT_Log.exp.println("Machine at: "+ this.getXCoord()+" | "+ this.getYCoord()+" | "+ this.getZCoord()+" DIMID: " +this.worldObj.provider.dimensionId +" explosion due to rain!");
                                                 doEnergyExplosion();
-                                            } else setOnFire();
+                                            } else {
+                                                GT_Log.exp.println("Machine at: "+ this.getXCoord()+" | "+ this.getYCoord()+" | "+ this.getZCoord()+" DIMID: " +this.worldObj.provider.dimensionId +"  set to Fire due to rain!");
+                                                setOnFire();
+                                            }
                                         }
                                         if (!hasValidMetaTileEntity()) {
                                             mRunningThroughTick = false;
                                             return;
                                         }
                                         if (GregTech_API.sMachineThunderExplosions && worldObj.isThundering() && getBiome().rainfall > 0 && getRandomNumber(3) == 0) {
-                                        	try{GT_Mod.instance.achievements.issueAchievement(this.getWorldObj().getPlayerEntityByName(mOwnerName), "badweather");}catch(Exception e){}
+                                        	try{
+                                        	    GT_Mod.instance.achievements.issueAchievement(this.getWorldObj().getPlayerEntityByName(mOwnerName), "badweather");
+                                        	}catch(Exception e){
+
+                                            }
+                                            GT_Log.exp.println("Machine at: "+ this.getXCoord()+" | "+ this.getYCoord()+" | "+ this.getZCoord()+" DIMID: " +this.worldObj.provider.dimensionId + " explosion due to Thunderstorm!");
                                             doEnergyExplosion();
                                         }
                                     }
@@ -1185,6 +1198,8 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
 
     public void doEnergyExplosion() {
         if (getUniversalEnergyCapacity() > 0 && getUniversalEnergyStored() >= getUniversalEnergyCapacity() / 5) {
+            GT_Log.exp.println("Energy Explosion, injected "+getUniversalEnergyStored()+"EU >= "+Double.toString((getUniversalEnergyCapacity() / 5D))+"Capacity of the Machine!");
+
             doExplosion(oOutput * (getUniversalEnergyStored() >= getUniversalEnergyCapacity() ? 4 : getUniversalEnergyStored() >= getUniversalEnergyCapacity() / 2 ? 2 : 1));
             GT_Mod.instance.achievements.issueAchievement(this.getWorldObj().getPlayerEntityByName(mOwnerName), "electricproblems");
         }
@@ -1733,6 +1748,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
         if (!canAccessData() || !mMetaTileEntity.isElectric() || !inputEnergyFrom(aSide) || aAmperage <= 0 || aVoltage <= 0 || getStoredEU() >= getEUCapacity() || mMetaTileEntity.maxAmperesIn() <= mAcceptedAmperes)
             return 0;
         if (aVoltage > getInputVoltage()) {
+            GT_Log.exp.println("Energy Explosion, injected "+aVoltage+"EU/t in a "+getInputVoltage()+"EU/t Machine!");
             doExplosion(aVoltage);
             return 0;
         }
diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
index 4f627458a4..5aced1f177 100644
--- a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
@@ -7,10 +7,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable;
 import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.util.GT_Config;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.*;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -190,7 +187,9 @@ public abstract class MetaTileEntity implements IMetaTileEntity {
     }
 
     @Override
-    public void onExplosion() {/*Do nothing*/}
+    public void onExplosion() {
+        GT_Log.exp.println("Machine at "+this.getBaseMetaTileEntity().getXCoord()+" | "+this.getBaseMetaTileEntity().getYCoord()+" | "+this.getBaseMetaTileEntity().getZCoord()+" DIMID: "+ this.getBaseMetaTileEntity().getWorld().provider.dimensionId+ " exploded.");
+    }
 
     @Override
     public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) {/*Do nothing*/}
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
index 2036b6951f..e128c8c842 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
@@ -257,11 +257,14 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
             if (tTemperature > mHeatResistance) {

                 if (aBaseMetaTileEntity.getRandomNumber(100) == 0) {

                     // Poof

+                    GT_Log.exp.println("Set Pipe to Fire due to to low heat resistance at "+aBaseMetaTileEntity.getXCoord()+ " | "+aBaseMetaTileEntity.getYCoord()+ " | "+aBaseMetaTileEntity.getZCoord()+ " DIMID: "+aBaseMetaTileEntity.getWorld().provider.dimensionId);

                     aBaseMetaTileEntity.setToFire();

                     return true;

                 }

                 // Mmhmm, Fire

                 aBaseMetaTileEntity.setOnFire();

+                GT_Log.exp.println("Set Blocks around Pipe to Fire due to to low heat resistance at "+aBaseMetaTileEntity.getXCoord()+ " | "+aBaseMetaTileEntity.getYCoord()+ " | "+aBaseMetaTileEntity.getZCoord()+ " DIMID: "+aBaseMetaTileEntity.getWorld().provider.dimensionId);

+

             }

             if (!mGasProof && tFluid.getFluid().isGaseous(tFluid)) {

                 tFluid.amount -= 5;

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
index 3981aafb51..ad5b94266c 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
@@ -17,6 +17,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.items.GT_MetaGenerated_Tool;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.GT_ItemStack;
+import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
@@ -497,6 +498,9 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
     }
 
     public void explodeMultiblock() {
+
+        GT_Log.exp.println("MultiBlockExplosion at: " +this.getBaseMetaTileEntity().getXCoord()+" | "+this.getBaseMetaTileEntity().getYCoord()+" | "+this.getBaseMetaTileEntity().getZCoord()+" DIMID: "+ this.getBaseMetaTileEntity().getWorld().provider.dimensionId+".");
+
         GT_Pollution.addPollution(getBaseMetaTileEntity(), 300000);
         mInventory[1] = null;
         for (MetaTileEntity tTileEntity : mInputBusses) tTileEntity.getBaseMetaTileEntity().doExplosion(V[8]);
diff --git a/src/main/java/gregtech/api/util/GT_Log.java b/src/main/java/gregtech/api/util/GT_Log.java
index 2b840c1b1e..c336eed094 100644
--- a/src/main/java/gregtech/api/util/GT_Log.java
+++ b/src/main/java/gregtech/api/util/GT_Log.java
@@ -16,9 +16,11 @@ public class GT_Log {
     public static PrintStream err = System.err;
     public static PrintStream ore = new LogBuffer();
     public static PrintStream pal = null;
+    public static PrintStream exp = new LogBuffer();
     public static File mLogFile;
     public static File mOreDictLogFile;
     public static File mPlayerActivityLogFile;
+    public static File mExplosionLog;
 
     public static class LogBuffer extends PrintStream {
         public final List<String> mBufferedOreDictLog = new ArrayList<String>();
diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java
index 234dc994d8..705d2a342f 100644
--- a/src/main/java/gregtech/api/util/GT_Recipe.java
+++ b/src/main/java/gregtech/api/util/GT_Recipe.java
@@ -1006,8 +1006,10 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
                             || GT_Utility.areStacksEqual(tStack, new ItemStack(Items.fireworks, 1, W), true)

                             || GT_Utility.areStacksEqual(tStack, new ItemStack(Items.fire_charge, 1, W), true)

                             ) {

-                        if (aTileEntity instanceof IGregTechTileEntity)

+                        if (aTileEntity instanceof IGregTechTileEntity) {

+                            GT_Log.exp.println("Microwave Explosion due to TNT || EGG || FIREWORKCHARGE || FIREWORK || FIRE CHARGE");

                             ((IGregTechTileEntity) aTileEntity).doExplosion(aVoltage * 4);

+                        }

                         return null;

                     }

                     ItemData tData = GT_OreDictUnificator.getItemData(tStack);

@@ -1016,32 +1018,43 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
                     if (tData != null) {

                         if (tData.mMaterial != null && tData.mMaterial.mMaterial != null) {

                             if (tData.mMaterial.mMaterial.contains(SubTag.METAL) || tData.mMaterial.mMaterial.contains(SubTag.EXPLOSIVE)) {

-                                if (aTileEntity instanceof IGregTechTileEntity)

+                                if (aTileEntity instanceof IGregTechTileEntity) {

+                                    GT_Log.exp.println("Microwave Explosion due to METAL insertion");

                                     ((IGregTechTileEntity) aTileEntity).doExplosion(aVoltage * 4);

+                                }

                                 return null;

                             }

                             if (tData.mMaterial.mMaterial.contains(SubTag.FLAMMABLE)) {

-                                if (aTileEntity instanceof IGregTechTileEntity)

+                                if (aTileEntity instanceof IGregTechTileEntity) {

+                                    GT_Log.exp.println("Microwave INFLAMMATION due to FLAMMABLE insertion");

                                     ((IGregTechTileEntity) aTileEntity).setOnFire();

+                                }

                                 return null;

                             }

                         }

                         for (MaterialStack tMaterial : tData.mByProducts)

                             if (tMaterial != null) {

                                 if (tMaterial.mMaterial.contains(SubTag.METAL) || tMaterial.mMaterial.contains(SubTag.EXPLOSIVE)) {

-                                    if (aTileEntity instanceof IGregTechTileEntity)

+                                    if (aTileEntity instanceof IGregTechTileEntity) {

+                                        GT_Log.exp.println("Microwave Explosion due to METAL insertion");

                                         ((IGregTechTileEntity) aTileEntity).doExplosion(aVoltage * 4);

+                                    }

                                     return null;

                                 }

                                 if (tMaterial.mMaterial.contains(SubTag.FLAMMABLE)) {

-                                    if (aTileEntity instanceof IGregTechTileEntity)

+                                    if (aTileEntity instanceof IGregTechTileEntity) {

                                         ((IGregTechTileEntity) aTileEntity).setOnFire();

+                                        GT_Log.exp.println("Microwave INFLAMMATION due to FLAMMABLE insertion");

+                                    }

                                     return null;

                                 }

                             }

                     }

                     if (TileEntityFurnace.getItemBurnTime(tStack) > 0) {

-                        if (aTileEntity instanceof IGregTechTileEntity) ((IGregTechTileEntity) aTileEntity).setOnFire();

+                        if (aTileEntity instanceof IGregTechTileEntity) {

+                            ((IGregTechTileEntity) aTileEntity).setOnFire();

+                            GT_Log.exp.println("Microwave INFLAMMATION due to BURNABLE insertion");

+                        }

                         return null;

                     }