forked from TAIGA/TAIGA
Rolled back some stuff, reimplemented other. Commit Just for actual status.
This commit is contained in:
19
src/main/java/fluids/BasicFluidMolten.java
Normal file
19
src/main/java/fluids/BasicFluidMolten.java
Normal file
@@ -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;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@@ -4,14 +4,15 @@ import net.minecraft.util.ResourceLocation;
|
|||||||
import net.minecraftforge.fluids.Fluid;
|
import net.minecraftforge.fluids.Fluid;
|
||||||
|
|
||||||
|
|
||||||
public class MoltenAardium extends Fluid {
|
public class MoltenAardium extends Fluid {
|
||||||
|
|
||||||
public MoltenAardium() {
|
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
|
@Override
|
||||||
public int getColor() {
|
public int getColor() {
|
||||||
return 0x00FF15;
|
return 0xFFcdf263;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -8,8 +8,10 @@ import main.util.recipes.Crafting;
|
|||||||
import main.util.recipes.Smelting;
|
import main.util.recipes.Smelting;
|
||||||
import main.world.ZWorldGen;
|
import main.world.ZWorldGen;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
|
import net.minecraft.item.EnumRarity;
|
||||||
import net.minecraft.item.ItemBlock;
|
import net.minecraft.item.ItemBlock;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraftforge.fluids.Fluid;
|
import net.minecraftforge.fluids.Fluid;
|
||||||
import net.minecraftforge.fluids.FluidRegistry;
|
import net.minecraftforge.fluids.FluidRegistry;
|
||||||
import net.minecraftforge.fml.common.Mod;
|
import net.minecraftforge.fml.common.Mod;
|
||||||
@@ -78,7 +80,6 @@ public class ZCompression {
|
|||||||
// Fluids
|
// Fluids
|
||||||
public static MoltenAardium moltenAardium = new MoltenAardium();
|
public static MoltenAardium moltenAardium = new MoltenAardium();
|
||||||
|
|
||||||
|
|
||||||
@SidedProxy(clientSide = "proxy.ClientProxy", serverSide = "proxy.ServerProxy")
|
@SidedProxy(clientSide = "proxy.ClientProxy", serverSide = "proxy.ServerProxy")
|
||||||
private static ServerProxy proxy;
|
private static ServerProxy proxy;
|
||||||
|
|
||||||
@@ -140,8 +141,17 @@ public class ZCompression {
|
|||||||
|
|
||||||
// TConstruct registrations
|
// TConstruct registrations
|
||||||
registerOreDict();
|
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);
|
registerFluid(moltenAardium);
|
||||||
registerTinkerFluid("Aardium", moltenAardium, true);
|
registerTinkerFluid("Aardium", moltenAardium, true);
|
||||||
|
moltenAardium.setTemperature(200).setRarity(EnumRarity.RARE);
|
||||||
|
|
||||||
|
registerTinkerFluid("Arcanite", arcaniteFluid, true);
|
||||||
|
arcaniteFluid.setTemperature(2000);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
@@ -163,6 +173,8 @@ public class ZCompression {
|
|||||||
OreDictionary.registerOre("oreAardium", aardiumOre);
|
OreDictionary.registerOre("oreAardium", aardiumOre);
|
||||||
OreDictionary.registerOre("ingotAardium", aardiumIngot);
|
OreDictionary.registerOre("ingotAardium", aardiumIngot);
|
||||||
OreDictionary.registerOre("oreArcanite", arcaniteOre);
|
OreDictionary.registerOre("oreArcanite", arcaniteOre);
|
||||||
|
OreDictionary.registerOre("ingotArcanite", arcaniteIngot);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -8,7 +8,7 @@
|
|||||||
"moltenAardium": [
|
"moltenAardium": [
|
||||||
{
|
{
|
||||||
"custom": {
|
"custom": {
|
||||||
"fluid": "molten_aardium"
|
"fluid": "fluid_aardium"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
Reference in New Issue
Block a user