From 28a0de1c20652e51b14668b3c16ea425bb92d901 Mon Sep 17 00:00:00 2001
From: Alkalus <draknyte1@hotmail.com>
Date: Wed, 12 Jul 2017 15:46:08 +1000
Subject: - Stopped the Multitank storing it's contents. % Changed Jack Daniels
 into Sludge. % Dark World Generation tweaks. $ Fixed 255 height biome/world.
 $ Fixed lighting issues. + Failed to add my own world type.

---
 src/Java/gtPlusPlus/core/block/ModBlocks.java      |  4 +-
 .../general/fluids/BlockFluidJackDaniels.java      | 55 ----------------------
 .../block/general/fluids/BlockFluidSludge.java     | 55 ++++++++++++++++++++++
 3 files changed, 57 insertions(+), 57 deletions(-)
 delete mode 100644 src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidJackDaniels.java
 create mode 100644 src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java

(limited to 'src/Java/gtPlusPlus/core/block')

diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java
index e5f5de3436..efc5a3b08a 100644
--- a/src/Java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java
@@ -30,8 +30,8 @@ public final class ModBlocks {
 
 	public static Block MatterFabricatorEffectBlock;
 
-	public static Fluid fluidJackDaniels = new Fluid("fluidJackDaniels");
-	public static Block blockFluidJackDaniels;
+	public static Fluid fluidSludge = new Fluid("fluid.sludge");
+	public static Block blockFluidSludge;
 	public static Block blockCasings2Misc;
 
 	public static Block blockFirePit;
diff --git a/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidJackDaniels.java b/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidJackDaniels.java
deleted file mode 100644
index 9d80072b61..0000000000
--- a/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidJackDaniels.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package gtPlusPlus.core.block.general.fluids;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import net.minecraftforge.fluids.BlockFluidClassic;
-import net.minecraftforge.fluids.Fluid;
-
-public class BlockFluidJackDaniels extends BlockFluidClassic {
-
-	@SideOnly(Side.CLIENT)
-	protected IIcon stillIcon;
-	@SideOnly(Side.CLIENT)
-	protected IIcon flowingIcon;
-
-	public BlockFluidJackDaniels(final Fluid fluid, final Material material) {
-		super(fluid, material);
-		this.setCreativeTab(AddToCreativeTab.tabMisc);
-	}
-
-	@Override
-	public IIcon getIcon(final int side, final int meta) {
-		return ((side == 0) || (side == 1))? this.stillIcon : this.flowingIcon;
-	}
-
-	@SideOnly(Side.CLIENT)
-	@Override
-	public void registerBlockIcons(final IIconRegister register) {
-		this.stillIcon = register.registerIcon(CORE.MODID+":fluids/fluid.jackdaniels");
-		this.flowingIcon = register.registerIcon(CORE.MODID+":fluids/fluid.jackdaniels");
-	}
-
-	@Override
-	public boolean canDisplace(final IBlockAccess world, final int x, final int y, final int z) {
-		if (world.getBlock(x,  y,  z).getMaterial().isLiquid()) {
-			return false;
-		}
-		return super.canDisplace(world, x, y, z);
-	}
-
-	@Override
-	public boolean displaceIfPossible(final World world, final int x, final int y, final int z) {
-		if (world.getBlock(x,  y,  z).getMaterial().isLiquid()) {
-			return false;
-		}
-		return super.displaceIfPossible(world, x, y, z);
-	}
-
-}
diff --git a/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java b/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java
new file mode 100644
index 0000000000..f40c1dbe7d
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java
@@ -0,0 +1,55 @@
+package gtPlusPlus.core.block.general.fluids;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraftforge.fluids.BlockFluidClassic;
+import net.minecraftforge.fluids.Fluid;
+
+public class BlockFluidSludge extends BlockFluidClassic {
+
+	@SideOnly(Side.CLIENT)
+	protected IIcon stillIcon;
+	@SideOnly(Side.CLIENT)
+	protected IIcon flowingIcon;
+
+	public BlockFluidSludge(final Fluid fluid, final Material material) {
+		super(fluid, material);
+		this.setCreativeTab(AddToCreativeTab.tabMisc);
+	}
+
+	@Override
+	public IIcon getIcon(final int side, final int meta) {
+		return ((side == 0) || (side == 1))? this.stillIcon : this.flowingIcon;
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public void registerBlockIcons(final IIconRegister register) {
+		this.stillIcon = register.registerIcon(CORE.MODID+":fluids/fluid.jackdaniels");
+		this.flowingIcon = register.registerIcon(CORE.MODID+":fluids/fluid.jackdaniels");
+	}
+
+	@Override
+	public boolean canDisplace(final IBlockAccess world, final int x, final int y, final int z) {
+		if (world.getBlock(x,  y,  z).getMaterial().isLiquid()) {
+			return false;
+		}
+		return super.canDisplace(world, x, y, z);
+	}
+
+	@Override
+	public boolean displaceIfPossible(final World world, final int x, final int y, final int z) {
+		if (world.getBlock(x,  y,  z).getMaterial().isLiquid()) {
+			return false;
+		}
+		return super.displaceIfPossible(world, x, y, z);
+	}
+
+}
-- 
cgit