more drill bits, acids, bedrock processing, yeeted unused GUIs

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

@@ -96,6 +96,8 @@ public class Fluids {
 	public static FluidType WOODOIL;
 	public static FluidType COALCREOSOTE;
 	public static FluidType SEEDSLURRY;
+	public static FluidType NITRIC_ACID;
+	public static FluidType SOLVENT; //oranic solvent in fact
 
 	private static final HashMap<Integer, FluidType> idMapping = new HashMap();
 	private static final HashMap<String, FluidType> nameMapping = new HashMap();
@@ -207,7 +209,9 @@ public class Fluids {
 		MUG_HOT =			new FluidType("MUG_HOT",			0x6B2A20, 0, 0, 0, EnumSymbol.NONE).setTemp(500).addTraits(DELICIOUS, LIQUID);
 		WOODOIL =			new FluidType("WOODOIL",			0x847D54, 2, 2, 0, EnumSymbol.NONE).addContainers(0xBF7E4F, ExtContainer.CANISTER).addTraits(LIQUID);
 		COALCREOSOTE =		new FluidType("COALCREOSOTE",		0x51694F, 3, 2, 0, EnumSymbol.NONE).addContainers(0x285A3F, ExtContainer.CANISTER).addTraits(LIQUID);
-		SEEDSLURRY =		new FluidType(81, "SEEDSLURRY",		0x7CC35E, 0, 0, 0, EnumSymbol.NONE).addContainers(0x7CC35E, ExtContainer.CANISTER).addTraits(LIQUID);
+		SEEDSLURRY =		new FluidType("SEEDSLURRY",			0x7CC35E, 0, 0, 0, EnumSymbol.NONE).addContainers(0x7CC35E, ExtContainer.CANISTER).addTraits(LIQUID);
+		NITRIC_ACID =		new FluidType("NITRIC_ACID",		0xBB7A1E, 3, 0, 2, EnumSymbol.OXIDIZER).addTraits(LIQUID, new FT_Corrosive(60));
+		SOLVENT =			new FluidType(83, "SOLVENT",		0xE4E3EF, 2, 3, 0, EnumSymbol.NONE).addContainers(0xE4E3EF, ExtContainer.CANISTER).addTraits(LIQUID);
 		
 		
 		// ^ ^ ^ ^ ^ ^ ^ ^
@@ -284,7 +288,8 @@ public class Fluids {
 		metaOrder.add(SEEDSLURRY);
 		metaOrder.add(ACID);
 		metaOrder.add(SULFURIC_ACID);
-		//NITRIC_ACID
+		metaOrder.add(NITRIC_ACID);
+		metaOrder.add(SOLVENT);
 		metaOrder.add(SCHRABIDIC);
 		metaOrder.add(UF6);
 		metaOrder.add(PUF6);
@@ -404,6 +409,8 @@ public class Fluids {
 
 		registerCalculatedFuel(WOODOIL, 110_000 /* 20_000 TU per 250mB + a bonus */, 0, null);
 		registerCalculatedFuel(COALCREOSOTE, 250_000 /* 20_000 TU per 100mB + a bonus */, 0, null);
+		
+		registerCalculatedFuel(SOLVENT, 100_000, 0, null);
 	}
 	
 	private static void registerCalculatedFuel(FluidType type, double base, double combustMult, FuelGrade grade) {

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

@@ -93,12 +93,18 @@ public class CrystallizerRecipes {
 		for(int i = 0; i < ScrapType.values().length; i++) {
 			registerRecipe(new ComparableStack(ModItems.scrap_plastic, 1, i), new CrystallizerRecipe(new ItemStack(ModItems.circuit_star_piece, 1, i), baseTime));
 		}
+
+		FluidStack nitric = new FluidStack(Fluids.NITRIC_ACID, 500);
+		FluidStack organic = new FluidStack(Fluids.SOLVENT, 500);
+		int oreTime = 200;
 		
 		for(EnumBedrockOre ore : EnumBedrockOre.values()) {
 			int i = ore.ordinal();
 
-			registerRecipe(new ComparableStack(ModItems.ore_centrifuged, 1, i),	new CrystallizerRecipe(new ItemStack(ModItems.ore_cleaned, 1, i), baseTime, sulfur));
-			registerRecipe(new ComparableStack(ModItems.ore_separated, 1, i),	new CrystallizerRecipe(new ItemStack(ModItems.ore_purified, 1, i), baseTime));
+			registerRecipe(new ComparableStack(ModItems.ore_centrifuged, 1, i),			new CrystallizerRecipe(new ItemStack(ModItems.ore_cleaned, 1, i), oreTime));
+			registerRecipe(new ComparableStack(ModItems.ore_separated, 1, i),			new CrystallizerRecipe(new ItemStack(ModItems.ore_purified, 1, i), oreTime, sulfur));
+			registerRecipe(new ComparableStack(ModItems.ore_separated, 1, i),			new CrystallizerRecipe(new ItemStack(ModItems.ore_nitrated, 1, i), oreTime, nitric));
+			registerRecipe(new ComparableStack(ModItems.ore_nitrocrystalline, 1, i),	new CrystallizerRecipe(new ItemStack(ModItems.ore_deepcleaned, 1, i), oreTime, organic));
 		}
 		
 		List<ItemStack> quartz = OreDictionary.getOres("crystalCertusQuartz");

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

@@ -193,6 +193,9 @@ public class ModItems {
 	public static Item ore_separated;
 	public static Item ore_purified;
 	public static Item ore_enriched;
+	public static Item ore_nitrated;
+	public static Item ore_nitrocrystalline;
+	public static Item ore_deepcleaned;
 
 	public static Item billet_uranium;
 	public static Item billet_u233;

src/main/java/com/hbm/items/machine/ItemDrillbit.java

@@ -51,10 +51,14 @@ public class ItemDrillbit extends ItemEnumMulti {
 	public static enum EnumDrillType {
 		STEEL			(1.0D, 1, 0, false, false),
 		STEEL_DIAMOND	(1.0D, 1, 2, false, true),
-		HSS				(1.5D, 2, 0, true, false),
-		HSS_DIAMOND		(1.5D, 2, 3, true, true),
-		DESH			(2.5D, 3, 1, true, true),
-		DESH_DIAMOND	(2.5D, 3, 4, true, true);
+		HSS				(1.2D, 2, 0, true, false),
+		HSS_DIAMOND		(1.2D, 2, 3, true, true),
+		DESH			(1.5D, 3, 1, true, true),
+		DESH_DIAMOND	(1.5D, 3, 4, true, true),
+		TCALLOY			(2.0D, 4, 1, true, true),
+		TCALLOY_DIAMOND	(2.0D, 4, 4, true, true),
+		FERRO			(2.5D, 5, 1, true, true),
+		FERRO_DIAMOND	(2.5D, 5, 4, true, true);
 		
 		public double speed;
 		public int tier;

src/main/java/com/hbm/items/special/ItemBedrockOre.java

@@ -58,16 +58,31 @@ public class ItemBedrockOre extends ItemEnumMulti {
 		String oreName = StatCollector.translateToLocal("item.ore." + ore.oreName.toLowerCase());
 		return StatCollector.translateToLocalFormatted(this.getUnlocalizedNameInefficiently(stack) + ".name", oreName);
 	}
+	
+	/*
+	 * BYPRODUCT TIER 1: NITRIC ACID - CHEMPLANT GATE / NO GATE
+	 * BYPRODUCT TIER 2: ORGANIC SOLVENT - CRACKING OIL GATE
+	 * BYPRODUCT TIER 3: ??? - RBMK GATE?
+	 * BYPRODUCT TIER 4: SCHRABIDIC ACID - FUSION GATE?
+	 */
+	
+	/*
+	 * [BEDROCK x1] -C-> [CENTRIFUGED x4] -(PER)-> [CLEANED x4] -C-> [SEPARATED x16] -(SUL)-> [PURIFIED x16] -C-> [ENRICHED x64]
+	 *                                                                       \
+	 *                                                                        \-------(NIT)-> [NITRATED x16] -C-> [NITROCRYSTALLINE x32] -(ORG)-> [DEEP-CLEANED x32] -C-> [ENRICHED x64]
+	 *                                                                                                        v                                                       v
+	 *                                                                                                [BYPRODUCT TIER 1]                                      [BYPRODUCT TIER 2]
+	 */
 
 	public static enum EnumBedrockOre {
-		IRON("Iron", 0xE2C0AA),
-		COPPER("Copper", 0xEC9A63),
-		BORAX("Borax", 0xE4BE74),
-		ASBESTOS("Asbestos", 0xBFBFB9),
-		NIOBIUM("Niobium", 0xAF58D8),
-		TITANIUM("Titanium", 0xF2EFE2),
-		TUNGSTEN("Tungsten", 0x2C293C),
-		GOLD("Gold", 0xF9D738);
+		IRON("Iron", 0xE2C0AA), //titanium, sulfur from pyrite
+		COPPER("Copper", 0xEC9A63), //sulfur sulfur sulfur sulfur
+		BORAX("Borax", 0xE4BE74), //calcium from ulexite, uhhh lithium?
+		ASBESTOS("Asbestos", 0xBFBFB9), //quartz i guess?
+		NIOBIUM("Niobium", 0xAF58D8), //iron in columbite, often found along tantalite
+		TITANIUM("Titanium", 0xF2EFE2), //titanite is titanium + calcium + silicon with traces of iron and aluminium
+		TUNGSTEN("Tungsten", 0x2C293C), //ferberite has iron, raspite has lead, russelite is bismuth tungsten
+		GOLD("Gold", 0xF9D738); //occours with copper, lead and rare bismuthide
 		
 		public String oreName;
 		public int color;