C18H24O2

src/main/java/com/hbm/inventory/fluid/Fluids.java

@@ -7,6 +7,7 @@ import java.util.List;
 import com.hbm.inventory.fluid.trait.*;
 import com.hbm.inventory.fluid.trait.FluidTraitSimple.*;
 import com.hbm.lib.ModDamageSource;
+import com.hbm.potion.HbmPotion;
 import com.hbm.inventory.fluid.trait.FT_Combustible.FuelGrade;
 import com.hbm.inventory.fluid.trait.FT_Coolable.CoolingType;
 import com.hbm.inventory.fluid.trait.FT_Heatable.HeatingType;
@@ -126,6 +127,9 @@ public class Fluids {
 	public static FluidType OIL_COKER;			//heavy fractions from coking, mostly bitumen
 	public static FluidType NAPHTHA_COKER;		//medium fractions from coking, aromatics and fuel oil
 	public static FluidType GAS_COKER;			//light fractions from coking, natgas and co2
+	public static FluidType EGG;
+	public static FluidType CHOLESTEROL;
+	public static FluidType ESTRADIOL;
 
 	private static final HashMap<Integer, FluidType> idMapping = new HashMap();
 	private static final HashMap<String, FluidType> nameMapping = new HashMap();
@@ -263,7 +267,10 @@ public class Fluids {
 		IONGEL =				new FluidType("IONGEL",				0xB8FFFF, 1, 0, 4, EnumSymbol.NONE).addTraits(LIQUID, VISCOUS);
 		OIL_COKER =				new FluidType("OIL_COKER",			0x001802, 2, 1, 0, EnumSymbol.NONE).addTraits(LIQUID, VISCOUS);
 		NAPHTHA_COKER =			new FluidType("NAPHTHA_COKER",		0x495944, 2, 1, 0, EnumSymbol.NONE).addTraits(LIQUID, VISCOUS);
-		GAS_COKER =				new FluidType(106, "GAS_COKER",		0xDEF4CA, 1, 4, 0, EnumSymbol.NONE).addTraits(GASEOUS);
+		GAS_COKER =				new FluidType("GAS_COKER",			0xDEF4CA, 1, 4, 0, EnumSymbol.NONE).addTraits(GASEOUS);
+		EGG =					new FluidType("EGG",				0xD2C273, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID);
+		CHOLESTEROL =			new FluidType("CHOLESTEROL",		0xD6D2BD, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID);
+		ESTRADIOL =				new FluidType(109, "ESTRADIOL",		0xCDD5D8, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID);
 		
 		// ^ ^ ^ ^ ^ ^ ^ ^
 		//ADD NEW FLUIDS HERE
@@ -369,11 +376,14 @@ public class Fluids {
 		metaOrder.add(PAIN);
 		metaOrder.add(DEATH);
 		metaOrder.add(WATZ);
+		metaOrder.add(EGG);
+		metaOrder.add(CHOLESTEROL);
 		//solutions and working fluids
 		metaOrder.add(FRACKSOL);
 		//the fun guys
 		metaOrder.add(PHOSGENE);
 		metaOrder.add(MUSTARDGAS);
+		metaOrder.add(ESTRADIOL);
 		//antimatter
 		metaOrder.add(AMAT);
 		metaOrder.add(ASCHRAB);
@@ -395,6 +405,7 @@ public class Fluids {
 		PHOSGENE.addTraits(new FT_Toxin().addEntry(new ToxinDirectDamage(ModDamageSource.cloud, 4F, 20, HazardClass.GAS_CHLORINE, false)));
 		MUSTARDGAS.addTraits(new FT_Toxin().addEntry(new ToxinDirectDamage(ModDamageSource.cloud, 4F, 10, HazardClass.GAS_CORROSIVE, false))
 				.addEntry(new ToxinEffects(HazardClass.GAS_CORROSIVE, true).add(new PotionEffect(Potion.wither.id, 100, 1), new PotionEffect(Potion.confusion.id, 100, 0))));
+		ESTRADIOL.addTraits(new FT_Toxin().addEntry(new ToxinEffects(HazardClass.PARTICLE_FINE, false).add(new PotionEffect(HbmPotion.mutation.id, 60 * 60 * 20, 0))));
 
 		double eff_steam_boil = 1.0D;
 		double eff_steam_heatex = 0.25D;

src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java

@@ -134,9 +134,10 @@ public class CrystallizerRecipes extends SerializableRecipe {
 		registerRecipe(CU.dust(),		new CrystallizerRecipe(DictFrame.fromOne(ModItems.chemical_dye, EnumChemDye.GREEN, 4), 20), woodOil);
 		registerRecipe(CO.dust(),		new CrystallizerRecipe(DictFrame.fromOne(ModItems.chemical_dye, EnumChemDye.BLUE, 4), 20), woodOil);
 
-		registerRecipe(new ComparableStack(DictFrame.fromOne(ModItems.oil_tar, EnumTarType.CRUDE)),	new CrystallizerRecipe(DictFrame.fromOne(ModItems.oil_tar, EnumTarType.WAX), 20),	new FluidStack(Fluids.CHLORINE, 250));
-		registerRecipe(new ComparableStack(DictFrame.fromOne(ModItems.oil_tar, EnumTarType.CRACK)),	new CrystallizerRecipe(DictFrame.fromOne(ModItems.oil_tar, EnumTarType.WAX), 20),	new FluidStack(Fluids.CHLORINE, 100));
-		registerRecipe(new ComparableStack(DictFrame.fromOne(ModItems.oil_tar, EnumTarType.WAX)), 	new CrystallizerRecipe(new ItemStack(ModItems.pellet_charged), 200), 				new FluidStack(Fluids.IONGEL, 500));
+		registerRecipe(new ComparableStack(DictFrame.fromOne(ModItems.oil_tar, EnumTarType.CRUDE)),	new CrystallizerRecipe(DictFrame.fromOne(ModItems.oil_tar, EnumTarType.WAX), 20),			new FluidStack(Fluids.CHLORINE, 250));
+		registerRecipe(new ComparableStack(DictFrame.fromOne(ModItems.oil_tar, EnumTarType.CRACK)),	new CrystallizerRecipe(DictFrame.fromOne(ModItems.oil_tar, EnumTarType.WAX), 20),			new FluidStack(Fluids.CHLORINE, 100));
+		registerRecipe(new ComparableStack(DictFrame.fromOne(ModItems.oil_tar, EnumTarType.WAX)), 	new CrystallizerRecipe(new ItemStack(ModItems.pellet_charged), 200), 						new FluidStack(Fluids.IONGEL, 500));
+		registerRecipe(new ComparableStack(ModItems.pill_red), 										new CrystallizerRecipe(DictFrame.fromOne(ModItems.oil_tar, EnumTarType.PARAFFIN), 200), 	new FluidStack(Fluids.ESTRADIOL, 250));
 
 		registerRecipe(KEY_SAND, new CrystallizerRecipe(Blocks.clay, 20), new FluidStack(Fluids.COLLOID, 1_000));
 		

src/main/java/com/hbm/inventory/recipes/FractionRecipes.java

@@ -59,6 +59,7 @@ public class FractionRecipes extends SerializableRecipe {
 		fractions.put(Fluids.REFORMATE,			new Pair(new FluidStack(Fluids.AROMATICS,	reform_frac_arom),	new FluidStack(Fluids.XYLENE,				reform_frac_xyle)));
 		fractions.put(Fluids.LIGHTOIL_VACUUM,	new Pair(new FluidStack(Fluids.KEROSENE,	lvac_frac_kero),	new FluidStack(Fluids.REFORMGAS,			lvac_frac_gas)));
 		fractions.put(Fluids.SOURGAS,			new Pair(new FluidStack(Fluids.GAS,			30),				new FluidStack(Fluids.PETROLEUM,			20)));
+		fractions.put(Fluids.EGG,				new Pair(new FluidStack(Fluids.CHOLESTEROL,	50),				new FluidStack(Fluids.RADIOSOLVENT,			50)));
 	}
 	
 	public static Pair<FluidStack, FluidStack> getFractions(FluidType oil) {

src/main/java/com/hbm/inventory/recipes/MixerRecipes.java

@@ -21,6 +21,8 @@ import com.hbm.inventory.recipes.loader.SerializableRecipe;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemFluidIcon;
 
+import net.minecraft.init.Items;
+
 public class MixerRecipes extends SerializableRecipe {
 
 	public static HashMap<FluidType, MixerRecipe> recipes = new HashMap();
@@ -37,6 +39,7 @@ public class MixerRecipes extends SerializableRecipe {
 		recipes.put(Fluids.PHOSGENE, new MixerRecipe(1000, 20).setStack1(new FluidStack(Fluids.UNSATURATEDS, 500)).setStack2(new FluidStack(Fluids.CHLORINE, 500)));
 		recipes.put(Fluids.MUSTARDGAS, new MixerRecipe(1000, 20).setStack1(new FluidStack(Fluids.REFORMGAS, 750)).setStack2(new FluidStack(Fluids.CHLORINE, 250)).setSolid(new OreDictStack(S.dust())));
 		recipes.put(Fluids.IONGEL, new MixerRecipe(1_000, 50).setStack1(new FluidStack(Fluids.WATER, 1000)).setStack2(new FluidStack(Fluids.HYDROGEN, 200)).setSolid(new ComparableStack(ModItems.pellet_charged)));
+		recipes.put(Fluids.EGG, new MixerRecipe(1_000, 50).setStack1(new FluidStack(Fluids.RADIOSOLVENT, 500)).setSolid(new ComparableStack(Items.egg)));
 
 		recipes.put(Fluids.SOLVENT, new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.NAPHTHA, 500)).setStack2(new FluidStack(Fluids.AROMATICS, 500)));
 		recipes.put(Fluids.SULFURIC_ACID, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.ACID, 800)).setSolid(new OreDictStack(S.dust())));

src/main/java/com/hbm/inventory/recipes/ReformingRecipes.java

@@ -42,6 +42,11 @@ public class ReformingRecipes extends SerializableRecipe {
 				new FluidStack(Fluids.PETROLEUM, 10),
 				new FluidStack(Fluids.HYDROGEN, 15)
 				));
+		recipes.put(Fluids.CHOLESTEROL, new Triplet(
+				new FluidStack(Fluids.ESTRADIOL, 50),
+				new FluidStack(Fluids.REFORMGAS, 35),
+				new FluidStack(Fluids.HYDROGEN, 15)
+				));
 	}
 	
 	public static Triplet<FluidStack, FluidStack, FluidStack> getOutput(FluidType type) {

src/main/java/com/hbm/inventory/recipes/SolidificationRecipes.java

@@ -35,7 +35,7 @@ public class SolidificationRecipes extends SerializableRecipe {
 	public static final int SF_HEATING =	50;
 	public static final int SF_RECLAIMED =	100;
 	public static final int SF_PETROIL =	125;
-	public static final int SF_LUBE =		125;
+	public static final int SF_LUBE =		100;
 	public static final int SF_NAPH =		150;
 	public static final int SF_DIESEL =		200;
 	public static final int SF_LIGHT =		225;
@@ -76,6 +76,7 @@ public class SolidificationRecipes extends SerializableRecipe {
 		registerRecipe(BITUMEN,			SF_BITUMEN,		DictFrame.fromOne(ModItems.oil_tar, EnumTarType.CRUDE));
 		registerRecipe(COALCREOSOTE,	SF_CREOSOTE,	DictFrame.fromOne(ModItems.oil_tar, EnumTarType.COAL));
 		registerRecipe(WOODOIL,			SF_WOOD,		DictFrame.fromOne(ModItems.oil_tar, EnumTarType.WOOD));
+		registerRecipe(LUBRICANT,		SF_LUBE,		DictFrame.fromOne(ModItems.oil_tar, EnumTarType.PARAFFIN));
 
 		registerRecipe(BALEFIRE,		250,			ModItems.solid_fuel_bf);
 		

src/main/java/com/hbm/items/ItemEnums.java

@@ -19,7 +19,8 @@ public class ItemEnums {
 		CRACK,
 		COAL,
 		WOOD,
-		WAX
+		WAX,
+		PARAFFIN
 	}
 
 	public static enum EnumBriquetteType {

src/main/java/com/hbm/items/ModItems.java

@@ -949,6 +949,7 @@ public class ModItems {
 	public static Item med_bag;
 	public static Item pill_iodine;
 	public static Item plan_c;
+	public static Item pill_red;
 	public static Item stealth_boy;
 	public static Item gas_mask_filter;
 	public static Item gas_mask_filter_mono;
@@ -3312,6 +3313,7 @@ public class ModItems {
 		five_htp = new ItemPill(0).setUnlocalizedName("five_htp").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":5htp");
 		pill_iodine = new ItemPill(0).setUnlocalizedName("pill_iodine").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pill_iodine");
 		plan_c = new ItemPill(0).setUnlocalizedName("plan_c").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":plan_c");
+		pill_red = new ItemPill(0).setUnlocalizedName("pill_red").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pill_red");
 		stealth_boy = new ItemStarterKit().setUnlocalizedName("stealth_boy").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":stealth_boy");
 		gas_mask_filter = new ItemFilter().setUnlocalizedName("gas_mask_filter").setTextureName(RefStrings.MODID + ":gas_mask_filter");
 		gas_mask_filter_mono = new ItemFilter().setUnlocalizedName("gas_mask_filter_mono").setTextureName(RefStrings.MODID + ":gas_mask_filter_mono");
@@ -7448,6 +7450,7 @@ public class ModItems {
 		GameRegistry.registerItem(fmn, fmn.getUnlocalizedName());
 		GameRegistry.registerItem(five_htp, five_htp.getUnlocalizedName());
 		GameRegistry.registerItem(plan_c, plan_c.getUnlocalizedName());
+		GameRegistry.registerItem(pill_red, pill_red.getUnlocalizedName());
 		GameRegistry.registerItem(stealth_boy, stealth_boy.getUnlocalizedName());
 		GameRegistry.registerItem(gas_mask_filter, gas_mask_filter.getUnlocalizedName());
 		GameRegistry.registerItem(gas_mask_filter_mono, gas_mask_filter_mono.getUnlocalizedName());

src/main/java/com/hbm/items/food/ItemPill.java

@@ -50,6 +50,10 @@ public class ItemPill extends ItemFood {
 					player.attackEntityFrom(rand.nextBoolean() ? ModDamageSource.euthanizedSelf : ModDamageSource.euthanizedSelf2, 1000);
 			}
 
+			if(this == ModItems.pill_red) {
+				player.addPotionEffect(new PotionEffect(HbmPotion.mutation.id, 60 * 60 * 20, 0));
+			}
+
 			if(this == ModItems.radx) {
 				player.addPotionEffect(new PotionEffect(HbmPotion.radx.id, 3 * 60 * 20, 0));
 			}

src/main/resources/assets/hbm/lang/de_DE.lang

@@ -601,6 +601,7 @@ hbmfluid.blood=Blut
 hbmfluid.blood_hot=Heißes Blut
 hbmfluid.carbondioxide=Kohlenstoffdioxid
 hbmfluid.chlorine=Chlorgas
+hbmfluid.cholesterol=Cholesterinlösung
 hbmfluid.coalcreosote=Kohleteer-Kreosot
 hbmfluid.coalgas=Kohlebenzin
 hbmfluid.coalgas_leaded=Bleikohlebenzin
@@ -616,6 +617,8 @@ hbmfluid.diesel=Diesel
 hbmfluid.diesel_crack=Crackdiesel
 hbmfluid.diesel_crack_reform=Hochoktan-Diesel
 hbmfluid.diesel_reform=Hochoktan-Crackdiesel
+hbmfluid.egg=Gelöstes Ei
+hbmfluid.estradiol=Estradiollösung
 hbmfluid.ethanol=Ethanol
 hbmfluid.enderjuice=Endersaft
 hbmfluid.fracksol=Frackinglösung
@@ -2451,6 +2454,7 @@ item.oil_tar.coal.name=Kohleteer
 item.oil_tar.name=Ölteer
 item.oil_tar.crude.name=Erdölteer
 item.oil_tar.crack.name=Crackölteer
+item.oil_tar.paraffin.name=Paraffinwachs
 item.oil_tar.wax.name=Chloriertes Petroleumwachs
 item.oil_tar.wood.name=Holzteer
 item.ore.asbestos=Asbest
@@ -2558,6 +2562,7 @@ item.pile_rod_source.name=Chicago Pile Ra226Be-Neutronenquelle
 item.pile_rod_uranium.name=Chicago Pile Uranstab
 item.pill_iodine.name=Iodpille
 item.pill_herbal.name=Kräuterpaste
+item.pill_red.name=Rote Pille
 item.pin.name=Haarklammer
 item.pipes_steel.name=Stahlrohre
 item.pirfenidone.name=Pirfenidon

src/main/resources/assets/hbm/lang/en_US.lang

@@ -1170,6 +1170,7 @@ hbmfluid.blood=Blood
 hbmfluid.blood_hot=Hot Blood
 hbmfluid.carbondioxide=Carbon Dioxide
 hbmfluid.chlorine=Chlorine Gas
+hbmfluid.cholesterol=Cholesterol Solution
 hbmfluid.coalcreosote=Coal Tar Creosote
 hbmfluid.coalgas=Coal Gasoline
 hbmfluid.coalgas_leaded=Leaded Coal Gasoline
@@ -1185,6 +1186,8 @@ hbmfluid.diesel=Diesel
 hbmfluid.diesel_crack=Cracked Diesel
 hbmfluid.diesel_crack_reform=High-Octane Cracked Diesel
 hbmfluid.diesel_reform=High-Octane Diesel
+hbmfluid.egg=Dissolved Egg
+hbmfluid.estradiol=Estradiol Solution
 hbmfluid.ethanol=Ethanol
 hbmfluid.enderjuice=Ender Juice
 hbmfluid.fracksol=Fracking Solution
@@ -3127,6 +3130,7 @@ item.oil_detector.noOil=No oil detected.
 item.oil_tar.coal.name=Coal Tar
 item.oil_tar.crude.name=Oil Tar
 item.oil_tar.crack.name=Crack Oil Tar
+item.oil_tar.paraffin.name=Paraffin Wax
 item.oil_tar.wax.name=Chlorinated Petroleum Wax
 item.oil_tar.wood.name=Wood Tar
 item.ore.asbestos=Asbestos
@@ -3269,6 +3273,7 @@ item.pill_iodine.name=Iodine Pill
 item.pill_iodine.desc=Removes negative effects
 item.pill_herbal.name=Herbal Paste
 item.pill_herbal.desc=Effective treatment against lung disease and mild radiation poisoning$Comes with side effects
+item.pill_red.name=Red Pill
 item.pin.name=Bobby Pin
 item.pin.desc=Standard success rate of picking a regular lock is ~10%%.
 item.pipes_steel.name=Steel Pipes