- Disabled the new IC2 generators from loading, in prep. for the next public release.

3 files changed, 8 insertions, 9 deletions

diff --git a/src/Java/miscutil/xmod/ic2/HANDLER_IC2.java b/src/Java/miscutil/xmod/ic2/HANDLER_IC2.java
index cf2e0e3d17..1afd436de4 100644
--- a/src/Java/miscutil/xmod/ic2/HANDLER_IC2.java
+++ b/src/Java/miscutil/xmod/ic2/HANDLER_IC2.java
@@ -1,8 +1,6 @@
 package miscutil.xmod.ic2;
 
-import ic2.core.init.InternalName;
 import miscutil.core.lib.LoadedMods;
-import miscutil.xmod.ic2.block.RTGGenerator.BlockRTG;
 import miscutil.xmod.ic2.item.IC2_Items;
 import miscutil.xmod.ic2.recipe.RECIPE_IC2;
 
@@ -11,7 +9,7 @@ public class HANDLER_IC2{
 	public static void preInit() {
 		if (LoadedMods.IndustrialCraft2){
 			IC2_Items.register();
-		    new BlockRTG(InternalName.beer);
+		    //new BlockRTG(InternalName.beer);
 		}		
 	}
 
diff --git a/src/Java/miscutil/xmod/ic2/block/RTGGenerator/BlockRTG.java b/src/Java/miscutil/xmod/ic2/block/RTGGenerator/BlockRTG.java
index aefdeb5222..1068df2d5d 100644
--- a/src/Java/miscutil/xmod/ic2/block/RTGGenerator/BlockRTG.java
+++ b/src/Java/miscutil/xmod/ic2/block/RTGGenerator/BlockRTG.java
@@ -4,8 +4,6 @@ import ic2.core.IC2;
 import ic2.core.Ic2Items;
 import ic2.core.block.BlockMultiID;
 import ic2.core.block.TileEntityBlock;
-import ic2.core.block.generator.tileentity.TileEntityKineticGenerator;
-import ic2.core.block.generator.tileentity.TileEntityRTGenerator;
 import ic2.core.block.reactor.tileentity.TileEntityNuclearReactorElectric;
 import ic2.core.init.InternalName;
 
@@ -43,8 +41,8 @@ extends BlockMultiID
 		IC2_Items.blockRTG = new ItemStack(this, 1, 0);
 		IC2_Items.blockKineticGenerator = new ItemStack(this, 1, 1);
 
-		GameRegistry.registerTileEntity(TileEntityRTG.class, "Radioisotope Thermoelectric Generator Mach II");
-		GameRegistry.registerTileEntity(TileEntityKineticWindGenerator.class, "Kinetic Wind Generator Mach II");
+		GameRegistry.registerTileEntity(TileEntityRTG.class, "RTG Mach II");
+		GameRegistry.registerTileEntity(TileEntityKineticWindGenerator.class, "Wind Ripper Mach II");
 	}
 
 	@Override
@@ -90,9 +88,9 @@ extends BlockMultiID
 			switch (meta)
 			{      
 			case 0: 
-				return TileEntityRTGenerator.class;    
+				return TileEntityRTG.class;    
 			case 1: 
-				return TileEntityKineticGenerator.class;
+				return TileEntityKineticWindGenerator.class;
 			}
 		}
 		catch (Exception e)
diff --git a/src/Java/miscutil/xmod/ic2/block/RTGGenerator/TileEntityRTG.java b/src/Java/miscutil/xmod/ic2/block/RTGGenerator/TileEntityRTG.java
index f3b7949db2..4bbc9caf7a 100644
--- a/src/Java/miscutil/xmod/ic2/block/RTGGenerator/TileEntityRTG.java
+++ b/src/Java/miscutil/xmod/ic2/block/RTGGenerator/TileEntityRTG.java
@@ -3,6 +3,7 @@ package miscutil.xmod.ic2.block.RTGGenerator;
 import ic2.core.ContainerBase;
 import ic2.core.block.generator.tileentity.TileEntityBaseGenerator;
 import ic2.core.block.invslot.InvSlot;
+import miscutil.core.util.Utils;
 import miscutil.xmod.ic2.block.RTGGenerator.gui.CONTAINER_RadioThermalGenerator;
 import miscutil.xmod.ic2.block.RTGGenerator.gui.GUI_RadioThermalGenerator;
 import net.minecraft.client.gui.GuiScreen;
@@ -38,6 +39,8 @@ extends TileEntityBaseGenerator
 		if (counter == 0) {
 			return false;
 		}
+		double tempInt = (this.storage += (int)(Math.pow(2.0D, counter - 1) * efficiency));
+		Utils.LOG_INFO("int of some sort: "+tempInt);
 		this.storage += (int)(Math.pow(2.0D, counter - 1) * efficiency);
 		return true;
 	}