+ Added Resonant Ender.

$ Fixed COFH Fluids having incorrect textures.
$ Fixed the recipe for Clay plates not auto-generating.

4 files changed, 83 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java
new file mode 100644
index 0000000000..e22451b56a
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java
@@ -0,0 +1,64 @@
+package gtPlusPlus.xmod.thermalfoundation.block;
+
+import cofh.core.fluid.BlockFluidCoFHBase;
+import cofh.core.util.CoreUtils;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids;
+import net.minecraft.block.material.*;
+import net.minecraft.entity.Entity;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class TF_Block_Fluid_Ender
+  extends BlockFluidCoFHBase
+{
+  public static final int LEVELS = 4;
+  public static final Material materialFluidEnder = new MaterialLiquid(MapColor.greenColor);
+  private static boolean effect = true;
+  
+  public TF_Block_Fluid_Ender()
+  {
+    super(CORE.MODID, TF_Fluids.fluidEnder, materialFluidEnder, "ender");
+    setQuantaPerBlock(4);
+    setTickRate(20);
+    
+    setHardness(2000.0F);
+    setLightOpacity(7);
+    setParticleColor(0.05F, 0.2F, 0.2F);
+  }
+  
+  @Override
+public boolean preInit()
+  {
+    GameRegistry.registerBlock(this, "FluidEnder");
+    
+    String str1 = "Fluid.Ender";
+    String str2 = "Enable this for Fluid Ender to randomly teleport entities on contact.";
+    
+    return true;
+  }
+  
+  @Override
+public void onEntityCollidedWithBlock(World paramWorld, int paramInt1, int paramInt2, int paramInt3, Entity paramEntity)
+  {
+    if ((!effect) || (paramWorld.isRemote)) {
+      return;
+    }
+    if (paramWorld.getTotalWorldTime() % 8L == 0L)
+    {
+      int i = paramInt1 - 8 + paramWorld.rand.nextInt(17);
+      int j = paramInt2 + paramWorld.rand.nextInt(8);
+      int k = paramInt3 - 8 + paramWorld.rand.nextInt(17);
+      if (!paramWorld.getBlock(i, j, k).getMaterial().isSolid()) {
+        CoreUtils.teleportEntityTo(paramEntity, i, j, k);
+      }
+    }
+  }
+  
+  @Override
+public int getLightValue(IBlockAccess paramIBlockAccess, int paramInt1, int paramInt2, int paramInt3)
+  {
+    return TF_Fluids.fluidEnder.getLuminosity();
+  }
+}
diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Blocks.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Blocks.java
index 522bafd053..6b56262b1a 100644
--- a/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Blocks.java
+++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Blocks.java
@@ -7,14 +7,17 @@ public class TF_Blocks
 
 	public static BlockFluidCoFHBase blockFluidPyrotheum;
 	public static BlockFluidCoFHBase blockFluidCryotheum;
+	public static BlockFluidCoFHBase blockFluidEnder;
 
 
 	public static void preInit()
 	{
 		blockFluidPyrotheum = new TF_Block_Fluid_Pyrotheum();
 		blockFluidCryotheum = new TF_Block_Fluid_Cryotheum();
+		blockFluidEnder = new TF_Block_Fluid_Ender();
 		blockFluidPyrotheum.preInit();
 		blockFluidCryotheum.preInit();
+		blockFluidEnder.preInit();
 	}
 
 	public static void init() {}
diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java
index caf33ff381..40c5de8de4 100644
--- a/src/Java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java
+++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java
@@ -15,6 +15,7 @@ public class TF_Fluids
 {
 	public static Fluid fluidPyrotheum;
 	public static Fluid fluidCryotheum;
+	public static Fluid fluidEnder;
 
 	public static void preInit()
 	{
@@ -22,6 +23,7 @@ public class TF_Fluids
 			Utils.LOG_INFO("Adding in our own versions of Thermal Foundation Fluids - Non-GT");
 			final Fluid pyrotheum = FluidRegistry.getFluid("pyrotheum");
 			final Fluid cryotheum = FluidRegistry.getFluid("cryotheum");
+			final Fluid ender = FluidRegistry.getFluid("ender");
 
 			if (pyrotheum == null){
 				Utils.LOG_INFO("Registering Blazing Pyrotheum as it does not exist.");
@@ -41,6 +43,16 @@ public class TF_Fluids
 				Utils.LOG_INFO("Registering Gelid Cryotheum as it is an already existing Fluid.");
 				fluidCryotheum = cryotheum;
 			}
+			
+			if (ender == null){
+				Utils.LOG_INFO("Registering Resonant Ender as it does not exist.");
+				fluidEnder = new Fluid("ender").setLuminosity(3).setDensity(4000).setViscosity(3000).setTemperature(300).setRarity(EnumRarity.uncommon);
+			    registerFluid(fluidEnder, "ender");
+			}
+			else {
+				Utils.LOG_INFO("Registering Resonant Ender as it is an already existing Fluid.");
+				fluidEnder = ender;
+			}
 		}
 		else {
 			Utils.LOG_INFO("Thermal Foundation is already loaded, no need to add our own Cryotheum/Pyrotheum.");
diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
index 5ca30f28d2..0839e11765 100644
--- a/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
+++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
@@ -24,6 +24,7 @@ public class TF_Items {
 	public static ItemBucket itemBucket;
 	public static ItemStack bucketPyrotheum;
 	public static ItemStack bucketCryotheum;
+	 public static ItemStack bucketEnder;
 
 	public static ItemStack itemDustBlizz;
 	public static ItemStack itemDustPyrotheum;
@@ -39,6 +40,7 @@ public class TF_Items {
 
 		bucketPyrotheum = itemBucket.addOreDictItem(1, "bucketPyrotheum");
 		bucketCryotheum = itemBucket.addOreDictItem(2, "bucketCryotheum");
+	    bucketEnder = itemBucket.addOreDictItem(3, "bucketEnder", 1);
 		rodBlizz = itemMaterial.addOreDictItem(1, "rodBlizz");
 		dustBlizz = itemMaterial.addOreDictItem(2, "dustBlizz");
 		dustPyrotheum = itemMaterial.addOreDictItem(3, "dustPyrotheum");
@@ -62,8 +64,10 @@ public class TF_Items {
 
 		BucketHandler.registerBucket(TF_Blocks.blockFluidPyrotheum, 0, bucketPyrotheum);
 		BucketHandler.registerBucket(TF_Blocks.blockFluidCryotheum, 0, bucketCryotheum);
+	    BucketHandler.registerBucket(TF_Blocks.blockFluidEnder, 0, bucketEnder);
 		FluidContainerRegistry.registerFluidContainer(TF_Fluids.fluidPyrotheum, bucketPyrotheum, FluidContainerRegistry.EMPTY_BUCKET);
 		FluidContainerRegistry.registerFluidContainer(TF_Fluids.fluidCryotheum, bucketCryotheum, FluidContainerRegistry.EMPTY_BUCKET);
+	    FluidContainerRegistry.registerFluidContainer(TF_Fluids.fluidEnder, bucketEnder, FluidContainerRegistry.EMPTY_BUCKET);
 
 
 	}