Rolled back some stuff, reimplemented other. Commit Just for actual status.

3 files changed, 36 insertions, 4 deletions

diff --git a/src/main/java/fluids/BasicFluidMolten.java b/src/main/java/fluids/BasicFluidMolten.java
new file mode 100644
index 0000000..0d6975a
--- /dev/null
+++ b/src/main/java/fluids/BasicFluidMolten.java
@@ -0,0 +1,19 @@
+package fluids;
+
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.fluids.Fluid;
+
+/**
+ * Created by Robert on 09.05.2016.
+ */
+public class BasicFluidMolten extends Fluid {
+    public BasicFluidMolten(String fluidName, ResourceLocation still, ResourceLocation flowing) {
+        super(fluidName, still, flowing);
+    }
+
+    @Override
+    public int getColor() {
+        return 0x000000;
+    }
+
+}
diff --git a/src/main/java/fluids/MoltenAardium.java b/src/main/java/fluids/MoltenAardium.java
index 3717872..94839e3 100644
--- a/src/main/java/fluids/MoltenAardium.java
+++ b/src/main/java/fluids/MoltenAardium.java
@@ -4,14 +4,15 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fluids.Fluid;
 
 
-public class MoltenAardium extends Fluid {
+public class MoltenAardium extends Fluid  {
+
     public MoltenAardium() {
-        super("molten_aardium", new ResourceLocation("tconstruct:blocks/fluids/molten_metal"), new ResourceLocation("tconstruct:blocks/fluids/molten_metal_flow"));
+        super("fluid_aardium", new ResourceLocation("tconstruct:blocks/fluids/molten_metal"), new ResourceLocation("tconstruct:blocks/fluids/molten_metal_flow"));
     }
 
     @Override
     public int getColor() {
-        return 0x00FF15;
+        return 0xFFcdf263;
     }
 
 }
diff --git a/src/main/java/main/ZCompression.java b/src/main/java/main/ZCompression.java
index 6640d3a..e7fb197 100644
--- a/src/main/java/main/ZCompression.java
+++ b/src/main/java/main/ZCompression.java
@@ -8,8 +8,10 @@ import main.util.recipes.Crafting;
 import main.util.recipes.Smelting;
 import main.world.ZWorldGen;
 import net.minecraft.block.Block;
+import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fml.common.Mod;
@@ -78,7 +80,6 @@ public class ZCompression {
     // Fluids
     public static MoltenAardium moltenAardium = new MoltenAardium();
 
-
     @SidedProxy(clientSide = "proxy.ClientProxy", serverSide = "proxy.ServerProxy")
     private static ServerProxy proxy;
 
@@ -140,8 +141,17 @@ public class ZCompression {
 
         // TConstruct registrations
         registerOreDict();
+        Fluid arcaniteFluid = new Fluid("arcaniteFluid", new ResourceLocation("tconstruct:blocks/fluids/molten_metal"), new ResourceLocation("tconstruct:blocks/fluids/molten_metal_flow"));
+        registerFluid(arcaniteFluid);
+
+
         registerFluid(moltenAardium);
         registerTinkerFluid("Aardium", moltenAardium, true);
+        moltenAardium.setTemperature(200).setRarity(EnumRarity.RARE);
+
+        registerTinkerFluid("Arcanite", arcaniteFluid, true);
+        arcaniteFluid.setTemperature(2000);
+
     }
 
     @EventHandler
@@ -163,6 +173,8 @@ public class ZCompression {
         OreDictionary.registerOre("oreAardium", aardiumOre);
         OreDictionary.registerOre("ingotAardium", aardiumIngot);
         OreDictionary.registerOre("oreArcanite", arcaniteOre);
+        OreDictionary.registerOre("ingotArcanite", arcaniteIngot);
+
 
     }