Bring in experimental branch

8 files changed, 556 insertions, 15 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
index 23b9d74fb7..fad3acec3f 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
@@ -14,7 +14,6 @@ import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;

 import gregtech.api.util.GT_Utility;

 import net.minecraft.item.ItemStack;

-import net.minecraft.item.crafting.CraftingManager;

 

 public class GT_MetaTileEntity_Boxinator

   extends GT_MetaTileEntity_BasicMachine

@@ -98,11 +97,11 @@ public class GT_MetaTileEntity_Boxinator
     if (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack))

     {

       if ((ItemList.Schematic_1by1.isStackEqual(getInputAt(1))) || (ItemList.Schematic_2by2.isStackEqual(getInputAt(1))) || (ItemList.Schematic_3by3.isStackEqual(getInputAt(1)))) {

-      if(GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.findRecipe(getBaseMetaTileEntity(), true, gregtech.api.enums.GT_Values.V[this.mTier], null, new ItemStack[] { GT_Utility.copyAmount(64L, new Object[] { aStack }), getInputAt(1) }) != null){return true;}

-      if(ItemList.Schematic_1by1.isStackEqual(getInputAt(1))&&GT_ModHandler.getRecipeOutput(new ItemStack[] { aStack })!=null)return true;

-      if(ItemList.Schematic_2by2.isStackEqual(getInputAt(1))&&GT_ModHandler.getRecipeOutput(new ItemStack[] { aStack, aStack, null, aStack, aStack })!=null){return true;}

-      if(ItemList.Schematic_3by3.isStackEqual(getInputAt(1))&&(GT_ModHandler.getRecipeOutput(new ItemStack[] { aStack,aStack,aStack,aStack,aStack,aStack,aStack,aStack,aStack })!=null)){return true;}

-      }else{return GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.containsInput(aStack);}

+    	  if(GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.findRecipe(getBaseMetaTileEntity(), true, gregtech.api.enums.GT_Values.V[this.mTier], null, new ItemStack[] { GT_Utility.copyAmount(64L, new Object[] { aStack }), getInputAt(1) }) != null){return true;}

+    	  if(ItemList.Schematic_1by1.isStackEqual(getInputAt(1))&&GT_ModHandler.getRecipeOutput(new ItemStack[] { aStack })!=null)return true;

+    	  if(ItemList.Schematic_2by2.isStackEqual(getInputAt(1))&&GT_ModHandler.getRecipeOutput(new ItemStack[] { aStack, aStack, null, aStack, aStack })!=null){return true;}

+    	  if(ItemList.Schematic_3by3.isStackEqual(getInputAt(1))&&(GT_ModHandler.getRecipeOutput(new ItemStack[] { aStack,aStack,aStack,aStack,aStack,aStack,aStack,aStack,aStack })!=null)){return true;}

+    	  }else{return GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.containsInput(aStack);}

     }

     return false;

   }

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java
new file mode 100644
index 0000000000..8504cf3197
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java
@@ -0,0 +1,79 @@
+package gregtech.common.tileentities.machines.basic;
+
+import static gregtech.api.enums.GT_Values.V;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.BaseMetaTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicBatteryBuffer;
+import gregtech.api.util.GT_ModHandler;
+
+public class GT_MetaTileEntity_Charger extends GT_MetaTileEntity_BasicBatteryBuffer {
+
+	public GT_MetaTileEntity_Charger(int aID, String aName, String aNameRegional, int aTier, String aDescription, int aSlotCount) {
+		super(aID, aName, aNameRegional, aTier, aDescription, aSlotCount);
+	}
+
+	public GT_MetaTileEntity_Charger(String aName, int aTier, String aDescription, ITexture[][][] aTextures, int aSlotCount) {
+		super(aName, aTier, aDescription, aTextures, aSlotCount);
+	}
+
+	@Override
+	public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+		return new GT_MetaTileEntity_Charger(mName, mTier, mDescription, mTextures, mInventory.length);
+	}
+	
+	@Override
+	public long getMinimumStoredEU() {
+		return V[mTier] * 64 * mInventory.length;
+	}
+
+	@Override
+	public long maxEUStore() {
+		return V[mTier] * 256 * mInventory.length;
+	}
+
+	@Override
+	public long maxAmperesIn() {
+		return mChargeableCount * 8;
+	}
+
+	@Override
+	public long maxAmperesOut() {
+		return mBatteryCount * 4;
+	}
+
+	@Override
+	public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+		if (aBaseMetaTileEntity.isServerSide()) {
+			super.onPostTick(aBaseMetaTileEntity, aTick);
+			if (this.getBaseMetaTileEntity() instanceof BaseMetaTileEntity) {
+				BaseMetaTileEntity mBaseMetaTileEntity = (BaseMetaTileEntity) getBaseMetaTileEntity();
+				if (mBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity) {
+					MetaTileEntity mMetaTileEntity = (MetaTileEntity) mBaseMetaTileEntity.getMetaTileEntity();
+					//for (int t = 0; t < 6; t++) {
+						if (mMetaTileEntity.dechargerSlotCount() > 0 && mBaseMetaTileEntity.getStoredEU() < mBaseMetaTileEntity.getEUCapacity()) {
+							for (int i = mMetaTileEntity.dechargerSlotStartIndex(), k = mMetaTileEntity.dechargerSlotCount() + i; i < k; i++) {
+								if (mMetaTileEntity.mInventory[i] != null && mBaseMetaTileEntity.getStoredEU() < mBaseMetaTileEntity.getEUCapacity()) {
+									mBaseMetaTileEntity.increaseStoredEnergyUnits(GT_ModHandler.dischargeElectricItem(mMetaTileEntity.mInventory[i], (int)Math.min(V[mTier]*15, mBaseMetaTileEntity.getEUCapacity() - mBaseMetaTileEntity.getStoredEU()), (int)Math.min(Integer.MAX_VALUE, mMetaTileEntity.getInputTier()), true, false, false), true);
+									if (mMetaTileEntity.mInventory[i].stackSize <= 0)
+										mMetaTileEntity.mInventory[i] = null;
+								}
+							}
+						}
+						if (mMetaTileEntity.rechargerSlotCount() > 0 && mBaseMetaTileEntity.getStoredEU() > 0) {
+							for (int i = mMetaTileEntity.rechargerSlotStartIndex(), k = mMetaTileEntity.rechargerSlotCount() + i; i < k; i++) {
+								if (mBaseMetaTileEntity.getStoredEU() > 0 && mMetaTileEntity.mInventory[i] != null) {
+									mBaseMetaTileEntity.decreaseStoredEU(GT_ModHandler.chargeElectricItem(mMetaTileEntity.mInventory[i], (int)Math.min(V[this.mTier]*15, mBaseMetaTileEntity.getStoredEU()), (int)Math.min(Integer.MAX_VALUE, mMetaTileEntity.getOutputTier()), true, false), true);
+									if (mMetaTileEntity.mInventory[i].stackSize <= 0)
+										mMetaTileEntity.mInventory[i] = null;
+								}
+							}
+						//}
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
index 07337cd305..f82517bedc 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
@@ -1,5 +1,6 @@
 package gregtech.common.tileentities.machines.basic;

 

+import static gregtech.api.enums.GT_Values.V;

 import gregtech.api.enums.ConfigCategories;

 import gregtech.api.enums.ItemList;

 import gregtech.api.enums.Materials;

@@ -46,14 +47,17 @@ public class GT_MetaTileEntity_Massfabricator
     Materials.UUAmplifier.mChemicalFormula = ("Mass Fabricator Eff/Speed Bonus: x" + sUUASpeedBonus);

   }

   

+@Override public long maxAmperesIn(){return 10;}

+@Override public long maxEUStore()  {return V[mTier]*512;}

+  

   public int checkRecipe()

   {

     FluidStack tFluid = getDrainableStack();

     if ((tFluid == null) || (tFluid.amount < getCapacity()))

     {

       this.mOutputFluid = Materials.UUMatter.getFluid(1L);

-      this.mEUt = ((int)gregtech.api.enums.GT_Values.V[this.mTier]);

-      this.mMaxProgresstime = (sDurationMultiplier / (1 << this.mTier - 1));

+      this.mEUt = ((int)gregtech.api.enums.GT_Values.V[this.mTier])*8;

+      this.mMaxProgresstime = (sDurationMultiplier / (1 << (this.mTier*2) - 2));

       if (((tFluid = getFillableStack()) != null) && (tFluid.amount >= sUUAperUUM) && (tFluid.isFluidEqual(Materials.UUAmplifier.getFluid(1L))))

       {

         tFluid.amount -= sUUAperUUM;

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java
new file mode 100644
index 0000000000..11489dfa56
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java
@@ -0,0 +1,296 @@
+
+package gregtech.common.tileentities.machines.basic;
+
+import static gregtech.api.enums.GT_Values.V;
+import net.minecraft.client.particle.EntityFX;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityHanging;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.boss.EntityDragonPart;
+import net.minecraft.entity.effect.EntityWeatherEffect;
+import net.minecraft.entity.item.EntityBoat;
+import net.minecraft.entity.item.EntityEnderCrystal;
+import net.minecraft.entity.item.EntityEnderEye;
+import net.minecraft.entity.item.EntityFireworkRocket;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.item.EntityMinecart;
+import net.minecraft.entity.item.EntityTNTPrimed;
+import net.minecraft.entity.item.EntityXPOrb;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.entity.projectile.EntityFireball;
+import net.minecraft.entity.projectile.EntityFishHook;
+import net.minecraft.entity.projectile.EntityThrowable;
+import net.minecraft.init.Blocks;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.world.World;
+import net.minecraftforge.common.DimensionManager;
+import net.minecraftforge.fluids.FluidStack;
+import gregtech.api.enums.ConfigCategories;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.Textures;
+import gregtech.api.gui.GT_Container_MultiMachine;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IEnergyConnected;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_Config;
+import gregtech.api.util.GT_Utility;
+import gregtech.common.gui.GT_Container_MicrowaveEnergyTransmitter;
+import gregtech.common.gui.GT_Container_Teleporter;
+import gregtech.common.gui.GT_GUIContainer_FusionReactor;
+import gregtech.common.gui.GT_GUIContainer_MicrowaveEnergyTransmitter;
+import gregtech.common.gui.GT_GUIContainer_Teleporter;
+
+public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEntity_BasicTank{
+
+	  public int mTargetX = 0;
+	  public int mTargetY = 0;
+	  public int mTargetZ = 0;
+	  public int mTargetD = 0;
+	  public boolean mDebug = false;
+	  public boolean hasEgg = false;
+	  public static boolean sInterDimensionalTeleportAllowed = true;
+	  public int mMaxLoss = 50;
+	  public int mMaxLossDistance = 10000;
+	  public boolean mPassiveEnergyUse = true;
+	
+	public GT_MetaTileEntity_MicrowaveEnergyTransmitter(int aID, String aName, String aNameRegional, int aTier) {
+		super(aID, aName, aNameRegional, aTier, 3, "Transmits Energy wireless");
+	}
+
+	public GT_MetaTileEntity_MicrowaveEnergyTransmitter(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+		super(aName, aTier, 3, aDescription, aTextures);
+	}
+	
+	@Override
+	public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
+		if (aBaseMetaTileEntity.isClientSide()) return true;
+		this.hasEgg = checkForEgg();
+		aBaseMetaTileEntity.openGUI(aPlayer);
+		return true;
+	}
+	
+	@Override
+	public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+		return new GT_Container_MicrowaveEnergyTransmitter(aPlayerInventory, aBaseMetaTileEntity);
+	}
+	
+
+	@Override
+	public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+		return new GT_GUIContainer_MicrowaveEnergyTransmitter(aPlayerInventory, aBaseMetaTileEntity);
+	}
+	
+	@Override
+	public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+		return new GT_MetaTileEntity_MicrowaveEnergyTransmitter(this.mName, this.mTier, this.mDescription, this.mTextures);
+	}
+	
+	  public String[] getInfoData()
+	  {
+	    return new String[] { "Coordinates:", "X: " + this.mTargetX, "Y: " + this.mTargetY, "Z: " + this.mTargetZ, "Dimension: " + this.mTargetD };
+	  }
+
+	@Override
+	public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
+		return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1], (aSide == 0) ? null : aActive ? new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TELEPORTER_ACTIVE) : new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TELEPORTER) };
+	}
+
+
+	  public void saveNBTData(NBTTagCompound aNBT)
+	  {
+		if (mFluid != null) aNBT.setTag("mFluid", mFluid.writeToNBT(new NBTTagCompound()));
+	    aNBT.setInteger("mTargetX", this.mTargetX);
+	    aNBT.setInteger("mTargetY", this.mTargetY);
+	    aNBT.setInteger("mTargetZ", this.mTargetZ);
+	    aNBT.setInteger("mTargetD", this.mTargetD);
+	    aNBT.setBoolean("mDebug", this.mDebug);
+	  }
+	  
+	  public void loadNBTData(NBTTagCompound aNBT)
+	  {
+	    mFluid = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mFluid"));
+	    this.mTargetX = aNBT.getInteger("mTargetX");
+	    this.mTargetY = aNBT.getInteger("mTargetY");
+	    this.mTargetZ = aNBT.getInteger("mTargetZ");
+	    this.mTargetD = aNBT.getInteger("mTargetD");
+	    this.mDebug = aNBT.getBoolean("mDebug");
+	  }
+	  
+	  public void onConfigLoad(GT_Config aConfig)
+	  {
+	    sInterDimensionalTeleportAllowed = aConfig.get(ConfigCategories.machineconfig, "Teleporter.Interdimensional", true);
+		mMaxLoss = Math.max(aConfig.get(ConfigCategories.machineconfig, "MicrowaveTransmitter.MaxLoss",50),11);
+		mMaxLossDistance = aConfig.get(ConfigCategories.machineconfig, "MicrowaveTransmitter.MaxLossDistance",10000);
+		mPassiveEnergyUse = aConfig.get(ConfigCategories.machineconfig, "MicrowaveTransmitter.PassiveEnergy",true);
+	  }
+	  
+	  public void onFirstTick()
+	  {
+	    if (getBaseMetaTileEntity().isServerSide())
+	    {
+	      if ((this.mTargetX == 0) && (this.mTargetY == 0) && (this.mTargetZ == 0) && (this.mTargetD == 0))
+	      {
+	        this.mTargetX = getBaseMetaTileEntity().getXCoord();
+	        this.mTargetY = getBaseMetaTileEntity().getYCoord();
+	        this.mTargetZ = getBaseMetaTileEntity().getZCoord();
+	        this.mTargetD = getBaseMetaTileEntity().getWorld().provider.dimensionId;
+	      }
+	      this.hasEgg = checkForEgg();
+	    }
+	  }
+	  
+	  public boolean checkForEgg()
+	  {
+	    for (byte i = -5; i <= 5; i = (byte)(i + 1)) {
+	      for (byte j = -5; j <= 5; j = (byte)(j + 1)) {
+	        for (byte k = -5; k <= 5; k = (byte)(k + 1)) {
+	          if (getBaseMetaTileEntity().getBlockOffset(i, j, k) == Blocks.dragon_egg) {
+	            return true;
+	          }
+	        }
+	      }
+	    }
+	    return false;
+	  }
+	  
+	  public boolean hasDimensionalTeleportCapability()
+	  {
+	    return (this.mDebug) || (this.hasEgg) || (mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1))&&mFluid.amount>=1000);
+	  }
+	  
+	  public boolean isDimensionalTeleportAvailable()
+	  {
+	    return (this.mDebug) || ((hasDimensionalTeleportCapability()) && (GT_Utility.isRealDimension(this.mTargetD)) && (GT_Utility.isRealDimension(getBaseMetaTileEntity().getWorld().provider.dimensionId)));
+	  }
+	  
+	  public int tTargetX = 0;
+	  public int tTargetY = 0;
+	  public int tTargetZ = 0;
+	  public int tTargetD = 0;
+	  public TileEntity tTile = null;
+	  
+	  @Override
+	  public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+		if(mFluid==null){
+			mFluid=Materials.Nitrogen.getPlasma(0);
+		}
+		super.onPostTick(aBaseMetaTileEntity, aTick);
+	    if (getBaseMetaTileEntity().isServerSide())
+	    {
+	      if (getBaseMetaTileEntity().getTimer() % 100L == 50L) {
+	        this.hasEgg = checkForEgg();
+	      }
+	      if ((getBaseMetaTileEntity().isAllowedToWork()) && (getBaseMetaTileEntity().getRedstone()))
+	      {
+	    	if(getBaseMetaTileEntity().getStoredEU()>(V[mTier]*16)){
+	    		if(mPassiveEnergyUse){getBaseMetaTileEntity().decreaseStoredEnergyUnits((long) Math.pow(2, mTier), false);}
+	    		if(hasDimensionalTeleportCapability()&&this.mTargetD != getBaseMetaTileEntity().getWorld().provider.dimensionId&&mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1))){
+	    			mFluid.amount--;
+	    			if(mFluid.amount<1){mFluid=null;}
+	    		}
+	    	if(tTargetD!=mTargetD||tTargetX!=mTargetX||tTargetY!=mTargetY||tTargetZ!=mTargetZ){
+	    		tTargetD=mTargetD;
+	    		tTargetX=mTargetX;
+	    		tTargetY=mTargetY;
+	    		tTargetZ=mTargetZ;
+	    		if(this.mTargetD == getBaseMetaTileEntity().getWorld().provider.dimensionId){
+    	        	tTile = getBaseMetaTileEntity().getTileEntity(this.mTargetX, this.mTargetY, this.mTargetZ);}else{
+    	        		World tWorld = DimensionManager.getWorld(this.mTargetD);
+    	        		if(tWorld!=null){
+    	        		tTile = tWorld.getTileEntity(this.mTargetX, this.mTargetY, this.mTargetZ);
+    	        		}
+    	        	}
+	    	}
+	        int tDistance = distanceCalculation();
+	        long tEnergyTrans = Math.min(V[mTier], getBaseMetaTileEntity().getStoredEU());
+	        if(tTile!=null&&tTile instanceof IEnergyConnected){
+	        	if(((IEnergyConnected)tTile).injectEnergyUnits((byte) 6, V[mTier], 1)>0){
+	        		int tLoss=1;
+	        		if(mMaxLossDistance!=0){
+	        		tLoss = 10 + tDistance*(mMaxLoss-10)/mMaxLossDistance;}
+	        		getBaseMetaTileEntity().decreaseStoredEnergyUnits(V[mTier]+((V[mTier]*tLoss)/100), false);
+	        	}
+	        }
+	        }
+	        getBaseMetaTileEntity().setActive(true);
+	      }
+	      else
+	      {
+	        getBaseMetaTileEntity().setActive(false);
+	      }
+	    }
+	  }
+	  
+	  private int distanceCalculation()
+	  {
+	    return Math.abs(((this.mTargetD != getBaseMetaTileEntity().getWorld().provider.dimensionId) && (isDimensionalTeleportAvailable()) ? 100 : 1) * (int)Math.sqrt(Math.pow(getBaseMetaTileEntity().getXCoord() - this.mTargetX, 2.0D) + Math.pow(getBaseMetaTileEntity().getYCoord() - this.mTargetY, 2.0D) + Math.pow(getBaseMetaTileEntity().getZCoord() - this.mTargetZ, 2.0D)));
+	  }
+	  
+		@Override public boolean isSimpleMachine()						{return false;}
+		@Override public boolean isOverclockerUpgradable()				{return false;}
+		@Override public boolean isTransformerUpgradable()				{return false;}
+		@Override public boolean isElectric()							{return true;}
+		@Override public boolean isFacingValid(byte aFacing)			{return true;}
+		@Override public boolean isEnetInput() 							{return true;}
+		@Override public boolean isInputFacing(byte aSide)				{return true;}
+		@Override public boolean isOutputFacing(byte aSide)				{return false;}
+		@Override public boolean isTeleporterCompatible()				{return false;}
+		@Override public long getMinimumStoredEU()						{return V[mTier]*16;}
+		@Override public long maxEUStore()								{return V[mTier]*256;}
+	    @Override public long maxEUInput()								{return V[mTier];}
+	    @Override public long maxSteamStore()							{return maxEUStore();}
+	    @Override public long maxAmperesIn()							{return 3;}
+		@Override public int getStackDisplaySlot()						{return 2;}
+		@Override public boolean isAccessAllowed(EntityPlayer aPlayer)	{return true;}
+		@Override public int getInputSlot() {return 0;}
+		@Override public int getOutputSlot() {return 0;}
+		
+		@Override
+		public int getCapacity() {return 64000;}
+
+		@Override
+		public boolean doesFillContainers() {
+			return false;
+		}
+
+		@Override
+		public boolean doesEmptyContainers() {
+			return false;
+		}
+
+		@Override
+		public boolean canTankBeFilled() {
+			return true;
+		}
+
+		@Override
+		public boolean canTankBeEmptied() {
+			return true;
+		}
+
+		@Override
+		public boolean displaysItemStack() {
+			return false;
+		}
+
+		@Override
+		public boolean displaysStackSize() {
+			return false;
+		}
+
+		@Override
+		public ITexture[][][] getTextureSet(ITexture[] aTextures) {
+			return null;
+		}
+	
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
index 40020ef435..92248da910 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
@@ -196,10 +196,9 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch {
 			}
 		} else if (getBaseMetaTileEntity().getBlock(getBaseMetaTileEntity().getXCoord(), y, getBaseMetaTileEntity().getZCoord()) != GT_Utility
 				.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))&&this.mInventory[0] != null&&this.mInventory[0].stackSize>0&&GT_Utility.areStacksEqual(this.mInventory[0], GT_ModHandler.getIC2Item("miningPipe", 1L))) {
-			getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getXCoord(), y, getBaseMetaTileEntity().getZCoord(),
-					GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L)));
+ 			getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getXCoord(), y, getBaseMetaTileEntity().getZCoord(),
+ 					GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L)));
 			getBaseMetaTileEntity().decrStackSize(0, 1);
-			
 		}
 		return y;
 	}
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
index 3360369114..a08ec27c23 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
@@ -171,6 +171,20 @@ public class GT_MetaTileEntity_Scanner
           return 2;

         }

       }

+      if(getSpecialSlot()==null&&ItemList.Tool_DataStick.isStackEqual(aStack, false, true)){

+    	  if(GT_Utility.ItemNBT.getBookTitle(aStack).equals("Raw Prospection Data")){

+    		  GT_Utility.ItemNBT.setBookTitle(aStack,"Analyzed Prospection Data");

+    		  GT_Utility.ItemNBT.convertProspectionData(aStack);

+              aStack.stackSize -= 1;

+              

+              this.mOutputItems[0] = GT_Utility.copyAmount(1L, new Object[] { aStack });

+              this.mMaxProgresstime = (1000 / (1 << this.mTier - 1));

+              this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

+              return 2;

+    		  

+    	  }

+      }

+      

     }

     return 0;

   }

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java
new file mode 100644
index 0000000000..09b06b033e
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java
@@ -0,0 +1,109 @@
+package gregtech.common.tileentities.machines.basic;
+
+import ic2.core.Ic2Items;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.fluids.FluidStack;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.objects.ItemData;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
+import gregtech.common.blocks.GT_Block_Ores;
+import gregtech.common.blocks.GT_TileEntity_Ores;
+
+public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_BasicMachine{
+	
+	boolean ready = false;
+
+	  public GT_MetaTileEntity_SeismicProspector(int aID, String aName, String aNameRegional, int aTier)
+	  {
+	    super(aID, aName, aNameRegional, aTier, 1, "Place, activate with explosives, use Data Stick", 1, 1, "Default.png", "", new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER) });
+	  }
+	  
+	  public GT_MetaTileEntity_SeismicProspector(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName)
+	  {
+	    super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);
+	  }
+	  
+	  public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)
+	  {
+	    return new GT_MetaTileEntity_SeismicProspector(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
+	  }
+
+		@Override
+		public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
+			if (aBaseMetaTileEntity.isServerSide()) {
+				ItemStack aStack = aPlayer.getCurrentEquippedItem();
+				if ((aStack != null) && (aStack.getItem() == Item.getItemFromBlock(Blocks.tnt)||aStack.getItem() == Ic2Items.industrialTnt.getItem()) && aStack.stackSize > 7&&!ready) {
+					if ((!aPlayer.capabilities.isCreativeMode) && (aStack.stackSize != 111)) {
+							aStack.stackSize -= 8;
+					}
+					this.ready = true;
+					this.mMaxProgresstime = 200;
+				} else if (ready&&mMaxProgresstime==0&&aStack!=null&&aStack.stackSize==1&&aStack.getItem()==ItemList.Tool_DataStick.getItem()) {
+					this.ready=false;
+					GT_Utility.ItemNBT.setBookTitle(aPlayer.getCurrentEquippedItem(),"Raw Prospection Data");
+					List<String> tStringList = new ArrayList<String>();
+					for(int i = this.getBaseMetaTileEntity().getYCoord();i>0;i--){
+						for(int f = -1; f<2;f++){
+							for(int g = -1; g<2;g++){
+								Block tBlock = this.getBaseMetaTileEntity().getBlockOffset(f, -i, g);
+								if ((tBlock instanceof GT_Block_Ores))
+						          {
+						            TileEntity tTileEntity = getBaseMetaTileEntity().getWorld().getTileEntity(getBaseMetaTileEntity().getXCoord()+f, getBaseMetaTileEntity().getYCoord()+(-i), getBaseMetaTileEntity().getZCoord()+g);
+						            if ((tTileEntity instanceof GT_TileEntity_Ores))
+						            {
+						              Materials tMaterial = GregTech_API.sGeneratedMaterials[(((GT_TileEntity_Ores)tTileEntity).mMetaData % 1000)];
+						              if ((tMaterial != null) && (tMaterial != Materials._NULL))
+						              {
+						            	if(!tStringList.contains(tMaterial.mDefaultLocalName)){
+						            		tStringList.add(tMaterial.mDefaultLocalName);
+						            	}
+						              }
+						            }
+						          }
+						          else
+						          {
+						            int tMetaID = getBaseMetaTileEntity().getWorld().getBlockMetadata(getBaseMetaTileEntity().getXCoord()+f, getBaseMetaTileEntity().getYCoord()+(-i), getBaseMetaTileEntity().getZCoord()+g);
+						            ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
+						            if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore")))
+						            {
+						            	if(!tStringList.contains( tAssotiation.mMaterial.mMaterial.mDefaultLocalName)){
+						            		tStringList.add( tAssotiation.mMaterial.mMaterial.mDefaultLocalName);
+						            	}
+						            }
+						          }
+							}
+						}
+					}
+					FluidStack tFluid = GT_Utility.getUndergroundOil(getBaseMetaTileEntity().getWorld(), getBaseMetaTileEntity().getXCoord(), getBaseMetaTileEntity().getZCoord());
+					String[] tStringArray = new String[tStringList.size()];{
+						for(int i = 0;i<tStringArray.length;i++){
+							tStringArray[i] = tStringList.get(i);
+						}
+					}
+					GT_Utility.ItemNBT.setProspectionData(aPlayer.getCurrentEquippedItem(), this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord(), this.getBaseMetaTileEntity().getWorld().provider.dimensionId,tFluid, tStringArray);
+				}
+			}
+			
+			return true;
+		}
+	  
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
index e0c6225a61..4f6259e7e8 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
@@ -23,9 +23,15 @@ import net.minecraft.entity.projectile.EntityFireball;
 import net.minecraft.entity.projectile.EntityFishHook;
 import net.minecraft.entity.projectile.EntityThrowable;
 import net.minecraft.init.Blocks;
+import net.minecraft.inventory.IInventory;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.world.World;
+import net.minecraftforge.common.DimensionManager;
+import net.minecraftforge.fluids.FluidStack;
 import gregtech.api.enums.ConfigCategories;
+import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures;
 import gregtech.api.gui.GT_Container_MultiMachine;
 import gregtech.api.interfaces.ITexture;
@@ -92,9 +98,9 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank{
 		return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1], (aSide !=this.getBaseMetaTileEntity().getFrontFacing()) ? null : aActive ? new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TELEPORTER_ACTIVE) : new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TELEPORTER) };
 	}
 
-
 	  public void saveNBTData(NBTTagCompound aNBT)
 	  {
+		if (mFluid != null) aNBT.setTag("mFluid", mFluid.writeToNBT(new NBTTagCompound()));
 	    aNBT.setInteger("mTargetX", this.mTargetX);
 	    aNBT.setInteger("mTargetY", this.mTargetY);
 	    aNBT.setInteger("mTargetZ", this.mTargetZ);
@@ -104,6 +110,7 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank{
 	  
 	  public void loadNBTData(NBTTagCompound aNBT)
 	  {
+    	mFluid = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mFluid"));
 	    this.mTargetX = aNBT.getInteger("mTargetX");
 	    this.mTargetY = aNBT.getInteger("mTargetY");
 	    this.mTargetZ = aNBT.getInteger("mTargetZ");
@@ -147,7 +154,7 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank{
 	  
 	  public boolean hasDimensionalTeleportCapability()
 	  {
-	    return (this.mDebug) || (this.hasEgg);
+	    return (this.mDebug) || (this.hasEgg) || (mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1))&&mFluid.amount>=1000);
 	  }
 	  
 	  public boolean isDimensionalTeleportAvailable()
@@ -157,6 +164,9 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank{
 	  
 	  @Override
 	  public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+			if(mFluid==null){
+				mFluid=Materials.Nitrogen.getPlasma(0);
+			}
 		super.onPostTick(aBaseMetaTileEntity, aTick);
 	    if (getBaseMetaTileEntity().isServerSide())
 	    {
@@ -165,14 +175,40 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank{
 	      }
 	      if ((getBaseMetaTileEntity().isAllowedToWork()) && (getBaseMetaTileEntity().getRedstone()))
 	      {
-	    	if(getBaseMetaTileEntity().decreaseStoredEnergyUnits(8192, false)){
+	    	if(getBaseMetaTileEntity().decreaseStoredEnergyUnits(2048, false)){
+	    		if(hasDimensionalTeleportCapability()&&this.mTargetD != getBaseMetaTileEntity().getWorld().provider.dimensionId&&mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1))){
+	    			mFluid.amount--;
+	    			if(mFluid.amount<1){mFluid=null;}
+	    		}
 	        int tDistance = distanceCalculation();
+	        if(mInventory[0]!=null){
+	        	TileEntity tTile = null;
+	        	if(this.mTargetD == getBaseMetaTileEntity().getWorld().provider.dimensionId){
+	        	tTile = getBaseMetaTileEntity().getTileEntity(this.mTargetX, this.mTargetY, this.mTargetZ);}else{
+	        		World tWorld = DimensionManager.getWorld(this.mTargetD);
+	        		if(tWorld!=null){
+	        		tTile = tWorld.getTileEntity(this.mTargetX, this.mTargetY, this.mTargetZ);
+	        		}
+	        	}
+	        	if(tTile!=null&&tTile instanceof IInventory){
+	        		int tStacksize = mInventory[0].stackSize;
+	        		GT_Utility.moveOneItemStack(this, tTile, (byte)0 ,(byte)0, null, false, (byte)64, (byte)1, (byte)64, (byte)1);
+	        		if(mInventory[0]==null||mInventory[0].stackSize<tStacksize){
+	        			getBaseMetaTileEntity().decreaseStoredEnergyUnits((int)(tDistance * tDistance * (tStacksize - (mInventory[0]==null ? 0 : mInventory[0].stackSize))), false);
+	        		}
+	        		   }
+	        	
+	        }
 	        for (Object tObject : getBaseMetaTileEntity().getWorld().getEntitiesWithinAABB(Entity.class, AxisAlignedBB.getBoundingBox(getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 2) - 1, getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 2) - 1, getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 2) - 1, getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 2) + 2, getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 2) + 2, getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 2) + 2))) {
 	          if (((tObject instanceof Entity)) && (!((Entity)tObject).isDead))
 	          {
 	            Entity tEntity = (Entity)tObject;
 	            if (getBaseMetaTileEntity().decreaseStoredEnergyUnits((int)(tDistance * tDistance * weightCalculation(tEntity)), false))
 	            {
+		    		if(hasDimensionalTeleportCapability()&&this.mTargetD != getBaseMetaTileEntity().getWorld().provider.dimensionId&&mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1))){
+		    			mFluid.amount = mFluid.amount - ((int)Math.min(1000,(tDistance * tDistance * weightCalculation(tEntity)/8192)));
+		    			if(mFluid.amount<1){mFluid=null;}
+		    		}
 	              if (tEntity.ridingEntity != null) {
 	                tEntity.mountEntity(null);
 	              }
@@ -301,6 +337,11 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank{
 	    @Override public long maxAmperesIn()							{return 2;}
 		@Override public int getStackDisplaySlot()						{return 2;}
 		@Override public boolean isAccessAllowed(EntityPlayer aPlayer)	{return true;}
+		@Override public int getInputSlot() {return 0;}
+		@Override public int getOutputSlot() {return 0;}
+		
+		@Override
+		public int getCapacity() {return 64000;}
 
 		@Override
 		public boolean doesFillContainers() {
@@ -319,7 +360,7 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank{
 
 		@Override
 		public boolean canTankBeEmptied() {
-			return false;
+			return true;
 		}
 
 		@Override