fullerite

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

@@ -162,6 +162,7 @@ public class Fluids {
 	public static FluidType THORIUM_SALT;
 	public static FluidType THORIUM_SALT_HOT;
 	public static FluidType THORIUM_SALT_DEPLETED;
+	public static FluidType FULLERENE;
 
 	private static final HashMap<Integer, FluidType> idMapping = new HashMap();
 	private static final HashMap<String, FluidType> nameMapping = new HashMap();
@@ -323,7 +324,8 @@ public class Fluids {
 		SODIUM_HOT =			new FluidType("SODIUM_HOT",			0xE2ADC1, 1, 2, 3, EnumSymbol.NONE).setTemp(1200).addTraits(LIQUID);
 		THORIUM_SALT =			new FluidType("THORIUM_SALT",		0x7A5542, 2, 0, 3, EnumSymbol.NONE).setTemp(800).addTraits(LIQUID, new FT_Corrosive(65));
 		THORIUM_SALT_HOT =		new FluidType("THORIUM_SALT_HOT",	0x3E3627, 2, 0, 3, EnumSymbol.NONE).setTemp(1600).addTraits(LIQUID, new FT_Corrosive(65));
-		THORIUM_SALT_DEPLETED =	new FluidType(129, "THORIUM_SALT_DEPLETED",	0x302D1C, 2, 0, 3, EnumSymbol.NONE).setTemp(800).addTraits(LIQUID, new FT_Corrosive(65));
+		THORIUM_SALT_DEPLETED =	new FluidType("THORIUM_SALT_DEPLETED",	0x302D1C, 2, 0, 3, EnumSymbol.NONE).setTemp(800).addTraits(LIQUID, new FT_Corrosive(65));
+		FULLERENE =				new FluidType(130, "FULLERENE",		0xFF7FED, 3, 3, 3, EnumSymbol.NONE).addTraits(LIQUID, new FT_Corrosive(65));
 		
 		// ^ ^ ^ ^ ^ ^ ^ ^
 		//ADD NEW FLUIDS HERE
@@ -439,6 +441,7 @@ public class Fluids {
 		metaOrder.add(DEATH);
 		metaOrder.add(WATZ);
 		metaOrder.add(REDMUD);
+		metaOrder.add(FULLERENE);
 		metaOrder.add(EGG);
 		metaOrder.add(CHOLESTEROL);
 		metaOrder.add(CHLOROCALCITE_SOLUTION);

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

@@ -19,6 +19,7 @@ import com.hbm.inventory.RecipesCommon.OreDictStack;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
 import com.hbm.inventory.recipes.loader.SerializableRecipe;
+import com.hbm.items.ItemEnums.EnumAshType;
 import com.hbm.items.ItemEnums.EnumPlantType;
 import com.hbm.items.ItemEnums.EnumTarType;
 import com.hbm.items.ModItems;
@@ -95,6 +96,7 @@ public class CrystallizerRecipes extends SerializableRecipe {
 		registerRecipe(new ComparableStack(Items.dye, 1, 15),			new CrystallizerRecipe(new ItemStack(Items.slime_ball, 4), 20), new FluidStack(Fluids.SULFURIC_ACID, 250));
 		registerRecipe(new ComparableStack(Items.bone),					new CrystallizerRecipe(new ItemStack(Items.slime_ball, 16), 20), new FluidStack(Fluids.SULFURIC_ACID, 1_000));
 		registerRecipe(new ComparableStack(DictFrame.fromOne(ModItems.plant_item, EnumPlantType.MUSTARDWILLOW)), new CrystallizerRecipe(new ItemStack(ModItems.powder_cadmium), 100).setReq(10), new FluidStack(Fluids.RADIOSOLVENT, 250));
+		registerRecipe(new ComparableStack(DictFrame.fromOne(ModItems.powder_ash, EnumAshType.FULLERENE)), new CrystallizerRecipe(new ItemStack(ModItems.ingot_cft), baseTime).setReq(4), new FluidStack(Fluids.XYLENE, 1_000));
 		
 		registerRecipe(DIAMOND.dust(), 									new CrystallizerRecipe(Items.diamond, utilityTime));
 		registerRecipe(EMERALD.dust(), 									new CrystallizerRecipe(Items.emerald, utilityTime));

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

@@ -20,6 +20,7 @@ import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
 import com.hbm.inventory.recipes.loader.SerializableRecipe;
 import com.hbm.items.ModItems;
+import com.hbm.items.ItemEnums.EnumAshType;
 import com.hbm.items.machine.ItemFluidIcon;
 
 import net.minecraft.init.Blocks;
@@ -47,6 +48,7 @@ public class MixerRecipes extends SerializableRecipe {
 		register(Fluids.EGG, new MixerRecipe(1_000, 50).setStack1(new FluidStack(Fluids.RADIOSOLVENT, 500)).setSolid(new ComparableStack(Items.egg)));
 		register(Fluids.FISHOIL, new MixerRecipe(100, 50).setSolid(new ComparableStack(Items.fish, 1, OreDictionary.WILDCARD_VALUE)));
 		register(Fluids.SUNFLOWEROIL, new MixerRecipe(100, 50).setSolid(new ComparableStack(Blocks.double_plant, 1, 0)));
+		register(Fluids.FULLERENE, new MixerRecipe(250, 50).setStack1(new FluidStack(Fluids.RADIOSOLVENT, 500)).setSolid(new ComparableStack(DictFrame.fromOne(ModItems.powder_ash, EnumAshType.SOOT))));
 
 		register(Fluids.SOLVENT, new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.NAPHTHA, 500)).setStack2(new FluidStack(Fluids.AROMATICS, 500)));
 		register(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/SILEXRecipes.java

@@ -11,6 +11,7 @@ import com.hbm.blocks.ModBlocks;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.inventory.fluid.Fluids;
 import com.hbm.items.ModItems;
+import com.hbm.items.ItemEnums.EnumAshType;
 import com.hbm.items.machine.ItemFELCrystal.EnumWavelengths;
 import com.hbm.items.special.ItemWasteLong;
 import com.hbm.items.special.ItemWasteShort;
@@ -31,7 +32,7 @@ public class SILEXRecipes {
 
 		itemTranslation.put(new ComparableStack(ModItems.fluid_icon, 1, Fluids.UF6.getID()), new ComparableStack(ModItems.ingot_uranium));
 		dictTranslation.put(U.dust(), U.ingot());
-		recipes.put(U.ingot(), new SILEXRecipe(900, 100, EnumWavelengths.UV)
+		recipes.put(U.ingot(), new SILEXRecipe(900, 100, EnumWavelengths.VISIBLE)
 				.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u235), 1))
 				.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u238), 11))
 				);
@@ -630,6 +631,10 @@ public class SILEXRecipes {
 				.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_lithium), 10))
 				.addOut(new WeightedRandomObject(new ItemStack(ModItems.fluorite), 5))
 				);
+		
+		recipes.put(new ComparableStack(ModItems.fluid_icon, 1, Fluids.FULLERENE.getID()), new SILEXRecipe(1_000, 1_000, EnumWavelengths.UV)
+				.addOut(new WeightedRandomObject(DictFrame.fromOne(ModItems.powder_ash, EnumAshType.FULLERENE), 1))
+				);
 	}
 	
 	public static SILEXRecipe getOutput(ItemStack stack) {

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

@@ -28,7 +28,8 @@ public class ItemEnums {
 		COAL,
 		MISC,
 		FLY,
-		SOOT
+		SOOT,
+		FULLERENE
 	}
 
 	public static enum EnumBriquetteType {

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

@@ -361,6 +361,7 @@ public class ModItems {
 	public static Item powder_cadmium;
 	public static Item powder_bismuth;
 	public static Item ingot_mud;
+	public static Item ingot_cft;
 
 	public static Item ingot_lanthanium;
 	public static Item ingot_actinium;
@@ -2677,6 +2678,7 @@ public class ModItems {
 		powder_cadmium = new Item().setUnlocalizedName("powder_cadmium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_cadmium");
 		powder_bismuth = new Item().setUnlocalizedName("powder_bismuth").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_bismuth");
 		ingot_mud = new Item().setUnlocalizedName("ingot_mud").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_mud");
+		ingot_cft = new Item().setUnlocalizedName("ingot_cft").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_cft");
 
 		ore_byproduct = new ItemByproduct().setUnlocalizedName("ore_byproduct").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":byproduct");
 		
@@ -5588,6 +5590,7 @@ public class ModItems {
 		GameRegistry.registerItem(ingot_pc, ingot_pc.getUnlocalizedName());
 		GameRegistry.registerItem(ingot_pvc, ingot_pvc.getUnlocalizedName());
 		GameRegistry.registerItem(ingot_mud, ingot_mud.getUnlocalizedName());
+		GameRegistry.registerItem(ingot_cft, ingot_cft.getUnlocalizedName());
 		GameRegistry.registerItem(ingot_schraranium, ingot_schraranium.getUnlocalizedName());
 		GameRegistry.registerItem(ingot_schrabidium, ingot_schrabidium.getUnlocalizedName());
 		GameRegistry.registerItem(ingot_schrabidate, ingot_schrabidate.getUnlocalizedName());

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

@@ -664,6 +664,7 @@ hbmfluid.ethanol=Ethanol
 hbmfluid.enderjuice=Endersaft
 hbmfluid.fishoil=Fischöl
 hbmfluid.fracksol=Frackinglösung
+hbmfluid.fullerene=Fullerenlösung
 hbmfluid.gas=Erdgas
 hbmfluid.gas_coker=Koker-Gas
 hbmfluid.gasoline=Benzin
@@ -2082,6 +2083,7 @@ item.ingot_c4.name=C4-Tafel
 item.ingot_cadmium.name=Cadmiumbarren
 item.ingot_calcium.name=Kalziumbarren
 item.ingot_cdalloy.name=Cadmiumstahlbarren
+item.ingot_cft.name=Kristallines Fullerit
 item.ingot_chainsteel.name=Schwerer Kettenstahl
 item.ingot_co60.name=Kobalt-60-Barren
 item.ingot_cobalt.name=Kobaltbarren
@@ -2704,6 +2706,7 @@ item.powder_aluminium.name=Aluminiumstaub
 item.powder_asbestos.name=Asbeststaub
 item.powder_ash.coal.name=Kohleasche
 item.powder_ash.fly.name=Flugasche
+item.powder_ash.fullerene.name=Fulleren
 item.powder_ash.misc.name=Asche
 item.powder_ash.soot.name=Feiner Ruß
 item.powder_ash.wood.name=Holzasche

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

@@ -1306,6 +1306,7 @@ hbmfluid.ethanol=Ethanol
 hbmfluid.enderjuice=Ender Juice
 hbmfluid.fishoil=Fish Oil
 hbmfluid.fracksol=Fracking Solution
+hbmfluid.fullerene=Fullerene Solution
 hbmfluid.gas=Natural Gas
 hbmfluid.gas_coker=Coker Gas
 hbmfluid.gasoline=Gasoline
@@ -2805,6 +2806,7 @@ item.ingot_c4.name=Bar of Composition C-4
 item.ingot_cadmium.name=Cadmium Ingot
 item.ingot_calcium.name=Calcium Ingot
 item.ingot_cdalloy.name=Cadmium Steel Ingot
+item.ingot_cft.name=Crystalline Fullerite
 item.ingot_chainsteel.name=Heavy Chainsteel
 item.ingot_co60.name=Cobalt-60 Ingot
 item.ingot_cobalt.name=Cobalt Ingot
@@ -3509,6 +3511,7 @@ item.powder_asbestos.name=Asbestos Powder
 item.powder_asbestos.desc=§o\"Sniffffffff- MHHHHHHMHHHHHHHHH\"§r
 item.powder_ash.coal.name=Coal Ash
 item.powder_ash.fly.name=Fly Ash
+item.powder_ash.fullerene.name=Fullerene
 item.powder_ash.misc.name=Ash
 item.powder_ash.soot.name=Fine Soot
 item.powder_ash.wood.name=Wood Ash