Merge remote-tracking branch 'origin/master' into CelestialThingy

# Conflicts:
#	dependencies.gradle

2 files changed, 27 insertions, 54 deletions

diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
index 23fb49153b..a42fddbfd6 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
@@ -4956,7 +4956,7 @@ public class DreamCraftRecipeLoader {
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.ElectrumFlux, 64L),
                     GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 7L)
                 },
-                new FluidStack[] {fluid_0, fluid_1, fluid_2},
+                new FluidStack[] {fluid_0, fluid_1},
                 ItemList.Sensor_UHV.get(1L),
                 crafting_time_in_ticks,
                 crafting_eu_per_tick);
@@ -4987,7 +4987,7 @@ public class DreamCraftRecipeLoader {
                     GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L),
                     GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 8L)
                 },
-                new FluidStack[] {fluid_0, fluid_1, fluid_2},
+                new FluidStack[] {fluid_0, fluid_1},
                 ItemList.Field_Generator_UHV.get(1L),
                 crafting_time_in_ticks,
                 crafting_eu_per_tick);
@@ -5448,7 +5448,7 @@ public class DreamCraftRecipeLoader {
                 new Object[] {
                     GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 1L),
                     GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 6L),
-                    ItemList.Gravistar.get(32),
+                    ItemList.Gravistar.get(16L),
                     ItemList.Emitter_UIV.get(4L),
                     new Object[] {OrePrefixes.circuit.get(Materials.Piko), 4},
                     GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L),
@@ -5691,7 +5691,7 @@ public class DreamCraftRecipeLoader {
                 new Object[] {
                     GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 1L),
                     GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 6L),
-                    ItemList.Gravistar.get(8L),
+                    ItemList.Gravistar.get(32L),
                     ItemList.Emitter_UMV.get(4L),
                     new Object[] {OrePrefixes.circuit.get(Materials.Quantum), 4},
                     GT_ModHandler.getModItem("miscutils", "itemFineWireHypogen", 64, 0),
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
index 09c0c19735..ae1f7fbf56 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
@@ -20,6 +20,7 @@ import com.github.technus.tectech.thing.gui.TecTechUITextures;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.*;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
 import com.github.technus.tectech.util.TT_Utility;
+import com.google.common.collect.Iterables;
 import com.gtnewhorizon.structurelib.StructureLibAPI;
 import com.gtnewhorizon.structurelib.alignment.IAlignment;
 import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits;
@@ -2188,56 +2189,28 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
         extraExplosions_EM();
         GT_Pollution.addPollution(getBaseMetaTileEntity(), 600000);
         mInventory[1] = null;
-        for (MetaTileEntity tTileEntity : mInputBusses) {
-            tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]);
-        }
-        for (MetaTileEntity tTileEntity : mOutputBusses) {
-            tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]);
-        }
-        for (MetaTileEntity tTileEntity : mInputHatches) {
-            tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]);
-        }
-        for (MetaTileEntity tTileEntity : mOutputHatches) {
-            tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]);
-        }
-        for (MetaTileEntity tTileEntity : mDynamoHatches) {
-            tTileEntity.getBaseMetaTileEntity().doExplosion(V[14]);
-        }
-        for (MetaTileEntity tTileEntity : mMufflerHatches) {
-            tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]);
-        }
-        for (MetaTileEntity tTileEntity : mEnergyHatches) {
-            tTileEntity.getBaseMetaTileEntity().doExplosion(V[14]);
-        }
-        for (MetaTileEntity tTileEntity : mMaintenanceHatches) {
-            tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]);
-        }
-        for (MetaTileEntity tTileEntity : eParamHatches) {
-            tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]);
-        }
-        for (MetaTileEntity tTileEntity : eInputHatches) {
-            tTileEntity.getBaseMetaTileEntity().doExplosion(V[14]);
-        }
-        for (MetaTileEntity tTileEntity : eOutputHatches) {
-            tTileEntity.getBaseMetaTileEntity().doExplosion(V[14]);
-        }
-        for (MetaTileEntity tTileEntity : eMufflerHatches) {
-            tTileEntity.getBaseMetaTileEntity().doExplosion(V[14]);
-        }
-        for (MetaTileEntity tTileEntity : eEnergyMulti) {
-            tTileEntity.getBaseMetaTileEntity().doExplosion(V[14]);
-        }
-        for (MetaTileEntity tTileEntity : eUncertainHatches) {
-            tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]);
-        }
-        for (MetaTileEntity tTileEntity : eDynamoMulti) {
-            tTileEntity.getBaseMetaTileEntity().doExplosion(V[14]);
-        }
-        for (MetaTileEntity tTileEntity : eInputData) {
-            tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]);
-        }
-        for (MetaTileEntity tTileEntity : eOutputData) {
-            tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]);
+        Iterable<MetaTileEntity> allHatches = Iterables.concat(
+                mInputBusses,
+                mOutputBusses,
+                mInputHatches,
+                mOutputHatches,
+                mDynamoHatches,
+                mMufflerHatches,
+                mEnergyHatches,
+                mMaintenanceHatches,
+                eParamHatches,
+                eInputHatches,
+                eOutputHatches,
+                eMufflerHatches,
+                eEnergyMulti,
+                eUncertainHatches,
+                eDynamoMulti,
+                eInputData,
+                eOutputData);
+        for (MetaTileEntity tTileEntity : allHatches) {
+            if (tTileEntity != null && tTileEntity.getBaseMetaTileEntity() != null) {
+                tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]);
+            }
         }
         getBaseMetaTileEntity().doExplosion(V[15]);
     }