Merge pull request #9 from GTNewHorizons/No-Explosion

removed IC2BasicSource due to buggyness with new cables

src/main/java/emt/client/gui/container/ContainerSolars.java

@@ -38,7 +38,7 @@ public class ContainerSolars
       ICrafting icrafting = (ICrafting)this.crafters.get(i);
       
       icrafting.sendProgressBarUpdate(this, 0, help);
-      icrafting.sendProgressBarUpdate(this, 1, (short) (this.tileentity.energySource.getEnergyStored()/1000));
+      icrafting.sendProgressBarUpdate(this, 1, (short) (this.tileentity.getSourceStored()/1000));
     }
   }
   

src/main/java/emt/tile/DefinitelyNotAIC2Source.java

@@ -0,0 +1,103 @@
+package emt.tile;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import gregtech.api.enums.GT_Values;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+
+public class DefinitelyNotAIC2Source extends TileEntity {
+    public final TileEntity parent;
+    protected double capacity;
+    protected byte tier;
+    protected double power;
+    protected double energyStored;
+    protected boolean addedToEnet;
+
+    public DefinitelyNotAIC2Source(TileEntity parent1, double capacity1, int tier1) {
+        double power = (double) GT_Values.V[tier1];
+        this.parent = parent1;
+        this.capacity = capacity1 < power ? power : capacity1;
+        this.tier = (byte) tier1;
+        this.power = power;
+    }
+
+    public void updateEntity() {
+        if (!this.addedToEnet && !FMLCommonHandler.instance().getEffectiveSide().isClient()) {
+                this.worldObj = this.parent.getWorldObj();
+                this.xCoord = this.parent.xCoord;
+                this.yCoord = this.parent.yCoord;
+                this.zCoord = this.parent.zCoord;
+                this.addedToEnet = true;
+            }
+    }
+
+    public void invalidate() {
+        super.invalidate();
+        this.onChunkUnload();
+    }
+
+    public void onChunkUnload() {
+        if (this.addedToEnet) {
+            this.addedToEnet = false;
+        }
+
+    }
+
+    public void readFromNBT(NBTTagCompound tag) {
+        super.readFromNBT(tag);
+        NBTTagCompound data = tag.getCompoundTag("EMTGTSource");
+        this.energyStored = data.getDouble("energy");
+    }
+
+    public void writeToNBT(NBTTagCompound tag) {
+        try {
+            super.writeToNBT(tag);
+        } catch (RuntimeException var3) {
+        }
+
+        NBTTagCompound data = new NBTTagCompound();
+        data.setDouble("energy", this.energyStored);
+        tag.setTag("EMTGTSource", data);
+    }
+
+    public double getCapacity() {
+        return this.capacity;
+    }
+
+    public void setCapacity(double capacity1) {
+        if (capacity1 < this.power) {
+            capacity1 = this.power;
+        }
+
+        this.capacity = capacity1;
+    }
+
+    public double getEnergyStored() {
+        return this.energyStored;
+    }
+
+    public void setEnergyStored(double amount) {
+        this.energyStored = amount;
+    }
+
+    public double addEnergy(double amount) {
+        if (FMLCommonHandler.instance().getEffectiveSide().isClient()) {
+            return 0.0D;
+        } else {
+            if (amount > this.capacity - this.energyStored) {
+                amount = this.capacity - this.energyStored;
+            }
+
+            this.energyStored += amount;
+            return amount;
+        }
+    }
+
+    public void drawEnergy(double amount) {
+        this.energyStored -= amount;
+    }
+
+    public byte getSourceTier() {
+        return this.tier;
+    }
+}

src/main/java/emt/tile/generator/TileEntityCompressedGenerator.java

@@ -1,5 +1,6 @@
 package emt.tile.generator;
 
+import emt.tile.DefinitelyNotAIC2Source;
 import emt.util.EMTConfigHandler;
 import ic2.api.energy.prefab.BasicSource;
 import thaumcraft.api.aspects.Aspect;
@@ -10,7 +11,7 @@ public abstract class TileEntityCompressedGenerator
   public TileEntityCompressedGenerator(Aspect aspect)
   {
     super(aspect);
-    this.energySource = new BasicSource(this, 1000000.0D, 3);
+    this.energySource = new DefinitelyNotAIC2Source(this, 1000000.0D, 3);
     this.energySource.setCapacity(EMTConfigHandler.EssentiaGeneratorStorage * 10.0D);
     this.maxfuel *= 10;
   }

src/main/java/emt/tile/solar/air/TileEntityAirSolar.java

@@ -1,9 +1,9 @@
 package emt.tile.solar.air;
 
 import emt.init.EMTBlocks;
+import emt.tile.DefinitelyNotAIC2Source;
 import emt.tile.solar.TileEntitySolarBase;
 import emt.util.EMTConfigHandler;
-import ic2.api.energy.prefab.BasicSource;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
@@ -11,7 +11,7 @@ public class TileEntityAirSolar extends TileEntitySolarBase {
 
 	public TileEntityAirSolar() {
 		super();
-		energySource = new BasicSource(this, 10000, 3);
+		energySource = new DefinitelyNotAIC2Source(this, 10000, 3);
 		output = EMTConfigHandler.compressedSolarOutput;
 		this.maxstorage=this.getEUCapacity();
 	};

src/main/java/emt/tile/solar/air/TileEntityDoubleAirSolar.java

@@ -1,8 +1,8 @@
 package emt.tile.solar.air;
 
 import emt.init.EMTBlocks;
+import emt.tile.DefinitelyNotAIC2Source;
 import emt.util.EMTConfigHandler;
-import ic2.api.energy.prefab.BasicSource;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
@@ -10,7 +10,7 @@ public class TileEntityDoubleAirSolar extends TileEntityAirSolar {
 
 	public TileEntityDoubleAirSolar() {
 		super();
-		energySource = new BasicSource(this, 100000, 4);
+		energySource = new DefinitelyNotAIC2Source(this, 100000, 4);
 		output = EMTConfigHandler.doubleCompressedSolarOutput;
 		this.maxstorage=this.getEUCapacity();
 	}

src/main/java/emt/tile/solar/air/TileEntityTripleAirSolar.java

@@ -1,8 +1,8 @@
 package emt.tile.solar.air;
 
 import emt.init.EMTBlocks;
+import emt.tile.DefinitelyNotAIC2Source;
 import emt.util.EMTConfigHandler;
-import ic2.api.energy.prefab.BasicSource;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
@@ -11,7 +11,7 @@ public class TileEntityTripleAirSolar extends TileEntityAirSolar {
 	public TileEntityTripleAirSolar() {
 		super();
 		output = EMTConfigHandler.tripleCompressedSolarOutput;
-		energySource = new BasicSource(this, 1000000, 5);
+		energySource = new DefinitelyNotAIC2Source(this, 1000000, 5);
 		this.maxstorage=this.getEUCapacity();
 	}
 

src/main/java/emt/tile/solar/compressed/TileEntityCompressedSolar.java

@@ -1,9 +1,9 @@
 package emt.tile.solar.compressed;
 
 import emt.init.EMTBlocks;
+import emt.tile.DefinitelyNotAIC2Source;
 import emt.tile.solar.TileEntitySolarBase;
 import emt.util.EMTConfigHandler;
-import ic2.api.energy.prefab.BasicSource;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
@@ -11,7 +11,7 @@ public class TileEntityCompressedSolar extends TileEntitySolarBase {
 
 	public TileEntityCompressedSolar() {
 		super();
-		energySource = new BasicSource(this, 10000, 3);
+		energySource = new DefinitelyNotAIC2Source(this, 10000, 3);
 		output = EMTConfigHandler.compressedSolarOutput;
 		this.maxstorage=this.getEUCapacity();
 	};

src/main/java/emt/tile/solar/compressed/TileEntityDoubleCompressedSolar.java

@@ -1,9 +1,9 @@
 package emt.tile.solar.compressed;
 
 import emt.init.EMTBlocks;
+import emt.tile.DefinitelyNotAIC2Source;
 import emt.tile.solar.TileEntitySolarBase;
 import emt.util.EMTConfigHandler;
-import ic2.api.energy.prefab.BasicSource;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
@@ -11,7 +11,7 @@ public class TileEntityDoubleCompressedSolar extends TileEntitySolarBase {
 
 	public TileEntityDoubleCompressedSolar() {
 		super();
-		energySource = new BasicSource(this, 100000, 4);
+		energySource = new DefinitelyNotAIC2Source(this, 100000, 4);
 		output = EMTConfigHandler.doubleCompressedSolarOutput;
 		this.maxstorage=this.getEUCapacity();
 	}

src/main/java/emt/tile/solar/compressed/TileEntityTripleCompressedSolar.java

@@ -1,9 +1,9 @@
 package emt.tile.solar.compressed;
 
 import emt.init.EMTBlocks;
+import emt.tile.DefinitelyNotAIC2Source;
 import emt.tile.solar.TileEntitySolarBase;
 import emt.util.EMTConfigHandler;
-import ic2.api.energy.prefab.BasicSource;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
@@ -12,7 +12,7 @@ public class TileEntityTripleCompressedSolar extends TileEntitySolarBase {
 	public TileEntityTripleCompressedSolar() {
 		super();
 		output = EMTConfigHandler.tripleCompressedSolarOutput;
-		energySource = new BasicSource(this, 1000000, 5);
+		energySource = new DefinitelyNotAIC2Source(this, 1000000, 5);
 		this.maxstorage=this.getEUCapacity();
 	}
 

src/main/java/emt/tile/solar/dark/TileEntityDarkSolar.java

@@ -1,9 +1,9 @@
 package emt.tile.solar.dark;
 
 import emt.init.EMTBlocks;
+import emt.tile.DefinitelyNotAIC2Source;
 import emt.tile.solar.TileEntitySolarBase;
 import emt.util.EMTConfigHandler;
-import ic2.api.energy.prefab.BasicSource;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
@@ -11,7 +11,7 @@ public class TileEntityDarkSolar extends TileEntitySolarBase {
 
 	public TileEntityDarkSolar() {
 		super();
-		energySource = new BasicSource(this, 10000, 3);
+		energySource = new DefinitelyNotAIC2Source(this, 10000, 3);
 		output = EMTConfigHandler.compressedSolarOutput;
 		this.maxstorage=this.getEUCapacity();
 	};

src/main/java/emt/tile/solar/dark/TileEntityDoubleDarkSolar.java

@@ -1,8 +1,8 @@
 package emt.tile.solar.dark;
 
 import emt.init.EMTBlocks;
+import emt.tile.DefinitelyNotAIC2Source;
 import emt.util.EMTConfigHandler;
-import ic2.api.energy.prefab.BasicSource;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
@@ -10,7 +10,7 @@ public class TileEntityDoubleDarkSolar extends TileEntityDarkSolar {
 
 	public TileEntityDoubleDarkSolar() {
 		super();
-		energySource = new BasicSource(this, 100000, 4);
+		energySource = new DefinitelyNotAIC2Source(this, 100000, 4);
 		output = EMTConfigHandler.doubleCompressedSolarOutput;
 		this.maxstorage=this.getEUCapacity();
 	}

src/main/java/emt/tile/solar/dark/TileEntityTripleDarkSolar.java

@@ -1,8 +1,8 @@
 package emt.tile.solar.dark;
 
 import emt.init.EMTBlocks;
+import emt.tile.DefinitelyNotAIC2Source;
 import emt.util.EMTConfigHandler;
-import ic2.api.energy.prefab.BasicSource;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
@@ -11,7 +11,7 @@ public class TileEntityTripleDarkSolar extends TileEntityDarkSolar {
 	public TileEntityTripleDarkSolar() {
 		super();
 		output = EMTConfigHandler.tripleCompressedSolarOutput;
-		energySource = new BasicSource(this, 1000000, 5);
+		energySource = new DefinitelyNotAIC2Source(this, 1000000, 5);
 		this.maxstorage=this.getEUCapacity();
 	}
 

src/main/java/emt/tile/solar/earth/TileEntityDoubleEarthSolar.java

@@ -1,8 +1,8 @@
 package emt.tile.solar.earth;
 
 import emt.init.EMTBlocks;
+import emt.tile.DefinitelyNotAIC2Source;
 import emt.util.EMTConfigHandler;
-import ic2.api.energy.prefab.BasicSource;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
@@ -10,7 +10,7 @@ public class TileEntityDoubleEarthSolar extends TileEntityEarthSolar {
 
 	public TileEntityDoubleEarthSolar() {
 		super();
-		energySource = new BasicSource(this, 100000, 4);
+		energySource = new DefinitelyNotAIC2Source(this, 100000, 4);
 		output = EMTConfigHandler.doubleCompressedSolarOutput;
 		this.maxstorage=this.getEUCapacity();
 	}

src/main/java/emt/tile/solar/earth/TileEntityEarthSolar.java

@@ -1,9 +1,9 @@
 package emt.tile.solar.earth;
 
 import emt.init.EMTBlocks;
+import emt.tile.DefinitelyNotAIC2Source;
 import emt.tile.solar.TileEntitySolarBase;
 import emt.util.EMTConfigHandler;
-import ic2.api.energy.prefab.BasicSource;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
@@ -11,7 +11,7 @@ public class TileEntityEarthSolar extends TileEntitySolarBase {
 
 	public TileEntityEarthSolar() {
 		super();
-		energySource = new BasicSource(this, 10000, 3);
+		energySource = new DefinitelyNotAIC2Source(this, 10000, 3);
 		output = EMTConfigHandler.compressedSolarOutput;
 		this.maxstorage=this.getEUCapacity();
 	}

src/main/java/emt/tile/solar/earth/TileEntityTripleEarthSolar.java

@@ -1,8 +1,8 @@
 package emt.tile.solar.earth;
 
 import emt.init.EMTBlocks;
+import emt.tile.DefinitelyNotAIC2Source;
 import emt.util.EMTConfigHandler;
-import ic2.api.energy.prefab.BasicSource;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
@@ -11,7 +11,7 @@ public class TileEntityTripleEarthSolar extends TileEntityEarthSolar {
 	public TileEntityTripleEarthSolar() {
 		super();
 		output = EMTConfigHandler.tripleCompressedSolarOutput;
-		energySource = new BasicSource(this, 1000000, 5);
+		energySource = new DefinitelyNotAIC2Source(this, 1000000, 5);
 		this.maxstorage=this.getEUCapacity();
 	}
 

src/main/java/emt/tile/solar/fire/TileEntityDoubleFireSolar.java

@@ -1,8 +1,8 @@
 package emt.tile.solar.fire;
 
 import emt.init.EMTBlocks;
+import emt.tile.DefinitelyNotAIC2Source;
 import emt.util.EMTConfigHandler;
-import ic2.api.energy.prefab.BasicSource;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
@@ -10,7 +10,7 @@ public class TileEntityDoubleFireSolar extends TileEntityFireSolar {
 
 	public TileEntityDoubleFireSolar() {
 		super();
-		energySource = new BasicSource(this, 1000000, 4);
+		energySource = new DefinitelyNotAIC2Source(this, 1000000, 4);
 		output = EMTConfigHandler.doubleCompressedSolarOutput;
 		this.maxstorage=this.getEUCapacity();
 	}

src/main/java/emt/tile/solar/fire/TileEntityFireSolar.java

@@ -1,9 +1,9 @@
 package emt.tile.solar.fire;
 
 import emt.init.EMTBlocks;
+import emt.tile.DefinitelyNotAIC2Source;
 import emt.tile.solar.TileEntitySolarBase;
 import emt.util.EMTConfigHandler;
-import ic2.api.energy.prefab.BasicSource;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import thaumcraft.api.aspects.Aspect;
@@ -13,7 +13,7 @@ public class TileEntityFireSolar extends TileEntitySolarBase {
 
 	public TileEntityFireSolar() {
 		super();
-		energySource = new BasicSource(this, 10000, 3);
+		energySource = new DefinitelyNotAIC2Source(this, 10000, 3);
 		output = EMTConfigHandler.compressedSolarOutput;
 		this.maxstorage=this.getEUCapacity();
 	}

src/main/java/emt/tile/solar/fire/TileEntityTripleFireSolar.java

@@ -1,8 +1,8 @@
 package emt.tile.solar.fire;
 
 import emt.init.EMTBlocks;
+import emt.tile.DefinitelyNotAIC2Source;
 import emt.util.EMTConfigHandler;
-import ic2.api.energy.prefab.BasicSource;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
@@ -11,7 +11,7 @@ public class TileEntityTripleFireSolar extends TileEntityFireSolar {
 	public TileEntityTripleFireSolar() {
 		super();
 		output = EMTConfigHandler.tripleCompressedSolarOutput;
-		energySource = new BasicSource(this, 1000000, 5);
+		energySource = new DefinitelyNotAIC2Source(this, 1000000, 5);
 		this.maxstorage=this.getEUCapacity();
 	}
 

src/main/java/emt/tile/solar/order/TileEntityDoubleOrderSolar.java

@@ -1,8 +1,8 @@
 package emt.tile.solar.order;
 
 import emt.init.EMTBlocks;
+import emt.tile.DefinitelyNotAIC2Source;
 import emt.util.EMTConfigHandler;
-import ic2.api.energy.prefab.BasicSource;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
@@ -10,7 +10,7 @@ public class TileEntityDoubleOrderSolar extends TileEntityOrderSolar {
 
 	public TileEntityDoubleOrderSolar() {
 		super();
-		energySource = new BasicSource(this, 100000, 4);
+		energySource = new DefinitelyNotAIC2Source(this, 100000, 4);
 		output = EMTConfigHandler.doubleCompressedSolarOutput;
 		this.maxstorage=this.getEUCapacity();
 	}

src/main/java/emt/tile/solar/order/TileEntityOrderSolar.java

@@ -1,9 +1,9 @@
 package emt.tile.solar.order;
 
 import emt.init.EMTBlocks;
+import emt.tile.DefinitelyNotAIC2Source;
 import emt.tile.solar.TileEntitySolarBase;
 import emt.util.EMTConfigHandler;
-import ic2.api.energy.prefab.BasicSource;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
@@ -11,7 +11,7 @@ public class TileEntityOrderSolar extends TileEntitySolarBase {
 
 	public TileEntityOrderSolar() {
 		super();
-		energySource = new BasicSource(this, 10000, 3);
+		energySource = new DefinitelyNotAIC2Source(this, 10000, 3);
 		output = EMTConfigHandler.compressedSolarOutput;
 		this.maxstorage=this.getEUCapacity();
 	}

src/main/java/emt/tile/solar/order/TileEntityTripleOrderSolar.java

@@ -1,8 +1,8 @@
 package emt.tile.solar.order;
 
 import emt.init.EMTBlocks;
+import emt.tile.DefinitelyNotAIC2Source;
 import emt.util.EMTConfigHandler;
-import ic2.api.energy.prefab.BasicSource;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
@@ -11,7 +11,7 @@ public class TileEntityTripleOrderSolar extends TileEntityOrderSolar {
 	public TileEntityTripleOrderSolar() {
 		super();
 		output = EMTConfigHandler.tripleCompressedSolarOutput;
-		energySource = new BasicSource(this, 1000000, 5);
+		energySource = new DefinitelyNotAIC2Source(this, 1000000, 5);
 		this.maxstorage=this.getEUCapacity();
 	}
 

src/main/java/emt/tile/solar/water/TileEntityDoubleWaterSolar.java

@@ -1,8 +1,8 @@
 package emt.tile.solar.water;
 
 import emt.init.EMTBlocks;
+import emt.tile.DefinitelyNotAIC2Source;
 import emt.util.EMTConfigHandler;
-import ic2.api.energy.prefab.BasicSource;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
@@ -10,7 +10,7 @@ public class TileEntityDoubleWaterSolar extends TileEntityWaterSolar {
 
 	public TileEntityDoubleWaterSolar() {
 		super();
-		energySource = new BasicSource(this, 100000, 4);
+		energySource = new DefinitelyNotAIC2Source(this, 100000, 4);
 		output = EMTConfigHandler.doubleCompressedSolarOutput;
 		this.maxstorage=this.getEUCapacity();
 	}

src/main/java/emt/tile/solar/water/TileEntityTripleWaterSolar.java

@@ -1,8 +1,8 @@
 package emt.tile.solar.water;
 
 import emt.init.EMTBlocks;
+import emt.tile.DefinitelyNotAIC2Source;
 import emt.util.EMTConfigHandler;
-import ic2.api.energy.prefab.BasicSource;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
@@ -11,7 +11,7 @@ public class TileEntityTripleWaterSolar extends TileEntityWaterSolar {
 	public TileEntityTripleWaterSolar() {
 		super();
 		output = EMTConfigHandler.tripleCompressedSolarOutput;
-		energySource = new BasicSource(this, 1000000, 5);
+		energySource = new DefinitelyNotAIC2Source(this, 1000000, 5);
 		this.maxstorage=this.getEUCapacity();
 	}
 

src/main/java/emt/tile/solar/water/TileEntityWaterSolar.java

@@ -1,9 +1,9 @@
 package emt.tile.solar.water;
 
 import emt.init.EMTBlocks;
+import emt.tile.DefinitelyNotAIC2Source;
 import emt.tile.solar.TileEntitySolarBase;
 import emt.util.EMTConfigHandler;
-import ic2.api.energy.prefab.BasicSource;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
@@ -12,7 +12,7 @@ public class TileEntityWaterSolar extends TileEntitySolarBase {
 
 	public TileEntityWaterSolar() {
 		super();
-		energySource = new BasicSource(this, 10000, 3);
+		energySource = new DefinitelyNotAIC2Source(this, 10000, 3);
 		output = EMTConfigHandler.compressedSolarOutput;
 		this.maxstorage=this.getEUCapacity();
 	}