+ Added a dimension ID config option which it now will try use if available.

% More work on the Dimension again.
$ Fixed NPE caused by disabled material handler.
$ Fixed bad fluid used in world generation.
# Fixed spawn rate of mobs in custom dimension.

1 files changed, 102 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseFluid.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseFluid.java
new file mode 100644
index 0000000000..6f837e8709
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseFluid.java
@@ -0,0 +1,102 @@
+package gtPlusPlus.core.block.base;
+
+import java.util.Random;
+
+import cofh.lib.render.particle.EntityDropParticleFX;
+import cpw.mods.fml.client.FMLClientHandler;
+import cpw.mods.fml.common.Optional;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.BlockFluidClassic;
+import net.minecraftforge.fluids.Fluid;
+
+public class BlockBaseFluid extends BlockFluidClassic {
+
+	private final String name;
+	private final IIcon textureArray[] = new IIcon[6];
+	
+	protected float particleRed = 1.0F;
+	protected float particleGreen = 1.0F;
+	protected float particleBlue = 1.0F;
+	
+	public BlockBaseFluid(String materialName, Fluid fluid, Material material) {
+		super(fluid, material);
+		this.setLightOpacity(2);
+		this.name = Utils.sanitizeString(materialName);
+		this.setBlockName("fluid"+this.name);
+		this.setCreativeTab(AddToCreativeTab.tabBlock);
+		GameRegistry.registerBlock(this, ItemBlockMeta.class, "fluid"+this.name);
+	}
+
+	public BlockFluidClassic setParticleColor(int arg0) {
+		return this.setParticleColor((arg0 >> 16 & 255) / 255.0F, (arg0 >> 8 & 255) / 255.0F,
+				(arg0 >> 0 & 255) / 255.0F);
+	}
+
+	public BlockFluidClassic setParticleColor(float arg0, float arg1, float arg2) {
+		this.particleRed = arg0;
+		this.particleGreen = arg1;
+		this.particleBlue = arg2;
+		return this;
+	}
+
+	@Override
+	public boolean canCreatureSpawn(EnumCreatureType arg0, IBlockAccess arg1, int arg2, int arg3, int arg4) {
+		return false;
+	}
+
+	public boolean preInit() {
+		return true;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(int side, int meta) {
+		return side <= 1 ? this.textureArray[0] : this.textureArray[1];
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(IIconRegister iicon) {
+		this.textureArray[0] = iicon.registerIcon(CORE.MODID + ":" + "fluid/" + "Fluid_" + this.name + "_Still");
+		this.textureArray[1] = iicon.registerIcon(CORE.MODID + ":" + "fluid/" + "Fluid_" + this.name + "_Flow");
+		//IconRegistry.addIcon("Fluid" + this.name, this.modName + ":fluid/Fluid_" + this.name + "_Still", arg0);
+		//IconRegistry.addIcon("Fluid" + this.name + "1", this.modName + ":fluid/Fluid_" + this.name + "_Flow", arg0);
+	}
+
+	@Override
+	@Optional.Method(modid = "CoFHCore")
+	@SideOnly(Side.CLIENT)
+	public void randomDisplayTick(World arg0, int arg1, int arg2, int arg3, Random arg4) {
+		super.randomDisplayTick(arg0, arg1, arg2, arg3, arg4);
+		double arg5 = arg1 + arg4.nextFloat();
+		double arg7 = arg2 - 1.05D;
+		double arg9 = arg3 + arg4.nextFloat();
+		if (super.density < 0) {
+			arg7 = arg2 + 2.1D;
+		}
+
+		if (arg4.nextInt(20) == 0
+				&& arg0.isSideSolid(arg1, arg2 + super.densityDir, arg3,
+						super.densityDir == -1 ? ForgeDirection.UP : ForgeDirection.DOWN)
+				&& !arg0.getBlock(arg1, arg2 + 2 * super.densityDir, arg3).getMaterial().blocksMovement()) {
+			EntityDropParticleFX arg11 = new EntityDropParticleFX(arg0, arg5, arg7, arg9, this.particleRed,
+					this.particleGreen, this.particleBlue, super.densityDir);
+			FMLClientHandler.instance().getClient().effectRenderer.addEffect(arg11);
+		}
+
+	}
+
+}