Update 5.08.18

RF Support and finished Processing array

4 files changed, 50 insertions, 2 deletions

diff --git a/main/java/gregtech/api/GregTech_API.java b/main/java/gregtech/api/GregTech_API.java
index 1a72d0dd96..efae1af6a9 100644
--- a/main/java/gregtech/api/GregTech_API.java
+++ b/main/java/gregtech/api/GregTech_API.java
@@ -116,6 +116,11 @@ public class GregTech_API {
 	
 	/** Getting assigned by the Config */
 	public static boolean sTimber = F, sDrinksAlwaysDrinkable = F, sMultiThreadedSounds = F, sDoShowAllItemsInCreative = F, sColoredGUI = T, sConstantEnergy = T, sMachineExplosions = T, sMachineFlammable = T, sMachineNonWrenchExplosions = T, sMachineRainExplosions = T, sMachineThunderExplosions = T, sMachineFireExplosions = T, sMachineWireFire = true;
+	public static boolean mOutputRF =false;
+	public static boolean mInputRF =false;
+	public static int mEUtoRF = 360;
+	public static int mRFtoEU = 20;
+	public static boolean mRFExplosions = true;
 	
 	/** Getting assigned by the Mod loading */
 	public static boolean sUnificationEntriesRegistered = F, sPreloadStarted = F, sPreloadFinished = F, sLoadStarted = F, sLoadFinished = F, sPostloadStarted = F, sPostloadFinished = F;
diff --git a/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java b/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
index 3c08fec594..097493807d 100644
--- a/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
+++ b/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
@@ -1,8 +1,13 @@
 package gregtech.api.interfaces.tileentity;
 
+import static gregtech.api.enums.GT_Values.V;
+import cofh.api.energy.IEnergyReceiver;
+import gregtech.api.GregTech_API;
 import gregtech.api.util.GT_Utility;
 import ic2.api.energy.tile.IEnergySink;
+import net.minecraft.init.Blocks;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 /**
@@ -60,7 +65,23 @@ public interface IEnergyConnected extends IColoredTileEntity, IHasWorldObjectAnd
 	        		if (((IEnergySink)tTileEntity).acceptsEnergyFrom((TileEntity)aEmitter, ForgeDirection.getOrientation(j))) {
 	        			while (aAmperage > rUsedAmperes && ((IEnergySink)tTileEntity).getDemandedEnergy() > 0 && ((IEnergySink)tTileEntity).injectEnergy(ForgeDirection.getOrientation(j), aVoltage, aVoltage) < aVoltage) rUsedAmperes++;
 	        		}
-	    		}
+	    		}  else if(GregTech_API.mOutputRF && tTileEntity instanceof IEnergyReceiver){
+        			ForgeDirection tDirection = ForgeDirection.getOrientation(i).getOpposite();
+        			int rfOut = (int) (aVoltage * GregTech_API.mEUtoRF / 100);
+        			if(((IEnergyReceiver)tTileEntity).receiveEnergy(tDirection, rfOut, true)==rfOut){
+        				((IEnergyReceiver)tTileEntity).receiveEnergy(tDirection, rfOut, false); rUsedAmperes++;
+        			}
+        			if(GregTech_API.mRFExplosions && GregTech_API.sMachineExplosions && ((IEnergyReceiver)tTileEntity).getMaxEnergyStored(tDirection) < rfOut * 600){
+        				if(rfOut > 32 * GregTech_API.mEUtoRF / 100) {
+        				int aExplosionPower = rfOut;
+        				float tStrength = aExplosionPower<V[0]?1.0F:aExplosionPower<V[1]?2.0F:aExplosionPower<V[2]?3.0F:aExplosionPower<V[3]?4.0F:aExplosionPower<V[4]?5.0F:aExplosionPower<V[4]*2?6.0F:aExplosionPower<V[5]?7.0F:aExplosionPower<V[6]?8.0F:aExplosionPower<V[7]?9.0F:10.0F;
+        		    	int tX=tTileEntity.xCoord, tY=tTileEntity.yCoord, tZ=tTileEntity.zCoord;
+        		    	World tWorld = tTileEntity.getWorldObj();
+        		    	GT_Utility.sendSoundToPlayers(tWorld, GregTech_API.sSoundList.get(209), 1.0F, -1, tX, tY, tZ);
+        		    	tWorld.setBlock(tX, tY, tZ, Blocks.air);
+        		    	if (GregTech_API.sMachineExplosions) tWorld.createExplosion(null, tX+0.5, tY+0.5, tZ+0.5, tStrength, true);}
+        			}
+        		}
 			}
 			return rUsedAmperes;
 		}
diff --git a/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java b/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
index bb50192fa0..aada4db823 100644
--- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
+++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
@@ -1,6 +1,7 @@
 package gregtech.api.metatileentity.implementations;
 
 import static gregtech.api.enums.GT_Values.VN;
+import gregtech.api.GregTech_API;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.TextureSet;
@@ -20,6 +21,7 @@ import ic2.api.energy.tile.IEnergySink;
 import java.util.ArrayList;
 import java.util.Arrays;
 
+import cofh.api.energy.IEnergyReceiver;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
@@ -136,6 +138,15 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
             		if (((IEnergySink)tTileEntity).acceptsEnergyFrom((TileEntity)getBaseMetaTileEntity(), tDirection)) {
             			if (((IEnergySink)tTileEntity).getDemandedEnergy() > 0 && ((IEnergySink)tTileEntity).injectEnergy(tDirection, aVoltage, aVoltage) < aVoltage) rUsedAmperes++;
             		}
+        		} else if(GregTech_API.mOutputRF && tTileEntity instanceof IEnergyReceiver){
+        			ForgeDirection tDirection = ForgeDirection.getOrientation(i).getOpposite();
+        			int rfOut = (int) (aVoltage * GregTech_API.mEUtoRF / 100);
+        			if(((IEnergyReceiver)tTileEntity).receiveEnergy(tDirection, rfOut, true)==rfOut){
+        				((IEnergyReceiver)tTileEntity).receiveEnergy(tDirection, rfOut, false); rUsedAmperes++;
+        			}
+        			if(GregTech_API.mRFExplosions && ((IEnergyReceiver)tTileEntity).getMaxEnergyStored(tDirection) < rfOut * 600){
+        				if(rfOut > 32 * GregTech_API.mEUtoRF / 100) this.doExplosion(rfOut);
+        			}
         		}
     		}
     	}
@@ -181,7 +192,12 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
 					    if (tTileEntity instanceof IEnergySink && ((IEnergySink)tTileEntity).acceptsEnergyFrom((TileEntity)aBaseMetaTileEntity, ForgeDirection.getOrientation(j))) {
 				    		mConnections |= (1<<i);
 				    		continue;
-					    }/*
+					    }
+					    if(GregTech_API.mOutputRF && tTileEntity instanceof IEnergyReceiver){
+					    	mConnections |= (1<<i);
+				    		continue;					    	
+					    }					    
+					    /*
 					    if (tTileEntity instanceof IEnergyEmitter && ((IEnergyEmitter)tTileEntity).emitsEnergyTo((TileEntity)aBaseMetaTileEntity, ForgeDirection.getOrientation(j))) {
 				    		mConnections |= (1<<i);
 				    		continue;
diff --git a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java
index 41015d7c99..7a6b32d7e6 100644
--- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java
+++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java
@@ -1,6 +1,8 @@
 package gregtech.api.metatileentity.implementations;
 
 import static gregtech.api.enums.GT_Values.V;
+import cofh.api.energy.IEnergyProvider;
+import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -84,6 +86,10 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi
 					long tEU = Math.min(maxEUInput(), (long)((IEnergySource)tTileEntity).getOfferedEnergy());
 					((IEnergySource)tTileEntity).drawEnergy(tEU);
 					aBaseMetaTileEntity.injectEnergyUnits((byte)6, tEU, 1);
+				}else if (GregTech_API.mInputRF && tTileEntity instanceof IEnergyProvider&& ((IEnergyProvider)tTileEntity).extractEnergy(ForgeDirection.getOrientation(GT_Utility.getOppositeSide(i)),1,true)==1) {
+					long tEU = Math.min(maxEUInput(), (long)((IEnergyProvider)tTileEntity).extractEnergy(ForgeDirection.getOrientation(GT_Utility.getOppositeSide(i)),(int) maxEUInput()* 100 / GregTech_API.mRFtoEU ,false));
+					tEU = tEU * GregTech_API.mRFtoEU / 100;
+					aBaseMetaTileEntity.injectEnergyUnits((byte)6, tEU, 1);
 				}
 			}
 		}