+More classes stolen from GT to implement my own items on a metaitem.

+Added LuV -> Max Voltage Machine components.
+Added Rocket Engines, High tier diesel generators.
+Added new textures for everything.
+Added BedLocator_Base.java - Debug item for testing and NBT data storage.
+Added Machine_Charger.java - Another Debug machine for testing NBT value manipulation.

1 files changed, 8 insertions, 38 deletions

diff --git a/src/Java/miscutil/core/block/ModBlocks.java b/src/Java/miscutil/core/block/ModBlocks.java
index 9893430b69..7ab4a4c5c0 100644
--- a/src/Java/miscutil/core/block/ModBlocks.java
+++ b/src/Java/miscutil/core/block/ModBlocks.java
@@ -1,16 +1,12 @@
 package miscutil.core.block;
 
 import miscutil.core.block.base.BasicBlock;
-import miscutil.core.block.fluids.BlocktestFluid;
-import miscutil.core.block.heliumgen.block.HeliumGenerator;
-import miscutil.core.block.machine.Machine_NHG;
-import miscutil.core.lib.CORE;
+import miscutil.core.block.general.fluids.FluidRegistryHandler;
 import miscutil.core.util.Utils;
 import miscutil.gregtech.common.blocks.GregtechMetaCasingBlocks;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
 
 public final class ModBlocks {
@@ -23,28 +19,10 @@ public final class ModBlocks {
 	public static Block blockCasingsMisc;
     public static Block blockHeliumGenerator;
     public static Block blockNHG;
+    public static Block blockCharger;
 
-	
-	
-	
-	//Fluids
-	/**
-	 * 
-	 * Luminosity .setLuminosity(luminosity)
- 		How much light does the fluid emit. Default: 0, Lava uses 15
-		Density .setDensity(density)
-		How dense is the fluid, the only effect is whether or not a fluid replaces another fluid when they flow into each other. Default: 1000, the density of water at 4 degrees Celsius in kg/m³
-		Temperature .setTemperature(temp)
-		How hot, or cold is the fluid. Has currently no effect. Default: 295, the "normal" room temperature in degrees Kelvin, this is approximately 72°F or 22°C.
-		Viscosity .setViscosity(viscosity)
-		How thick the fluid is. Determines how fast it flows. Default: 1000 for water, lava uses 6000
-		Is Gaseous .setGaseous(boolean)
-		Indicates if the fluid is gaseous. Used for rendering. Default: false
-	 * 
-	 */
-
-	public static Fluid testFluid = new Fluid("testFluid");
-	public static Block testFluidBlock; 
+	public static Fluid fluidJackDaniels = new Fluid("fluidJackDaniels");
+	public static Block blockFluidJackDaniels; 
 
 
 
@@ -69,19 +47,11 @@ public final class ModBlocks {
 		blockCasingsMisc = new GregtechMetaCasingBlocks();
 
 		//Fluids
-		//testFluid
-		testFluid.setLuminosity(12);
-		testFluid.setDensity(1200);
-		testFluid.setTemperature(420);
-		testFluid.setViscosity(750);
-		testFluid.setGaseous(true);
-		FluidRegistry.registerFluid(testFluid);
-		testFluidBlock = new BlocktestFluid(testFluid, Material.water).setBlockName("yourFluid");
-		GameRegistry.registerBlock(testFluidBlock, CORE.MODID + "_" + testFluidBlock.getUnlocalizedName().substring(5));
-		testFluid.setUnlocalizedName(testFluidBlock.getUnlocalizedName());
+		FluidRegistryHandler.registerFluids();
 		
-		blockHeliumGenerator = GameRegistry.registerBlock(new HeliumGenerator(), "Helium_Collector");
-        blockNHG = GameRegistry.registerBlock(new Machine_NHG("blockNuclearFueledHeliumGenerator"), "blockNuclearFueledHeliumGenerator");
+	   // blockHeliumGenerator = GameRegistry.registerBlock(new HeliumGenerator(), "Helium_Collector");
+       // blockNHG = GameRegistry.registerBlock(new Machine_NHG("blockNuclearFueledHeliumGenerator"), "blockNuclearFueledHeliumGenerator");
+       // blockCharger = GameRegistry.registerBlock(new Machine_Charger("blockMachineCharger"), "blockMachineCharger");
         
 
 		//WIP TODO