diff --git a/src/main/java/com/hbm/inventory/fluid/Fluids.java b/src/main/java/com/hbm/inventory/fluid/Fluids.java index 3655c7197..925abbfe8 100644 --- a/src/main/java/com/hbm/inventory/fluid/Fluids.java +++ b/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 idMapping = new HashMap(); private static final HashMap 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) { diff --git a/src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java b/src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java index af984ce03..08ff7960d 100644 --- a/src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java +++ b/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 quartz = OreDictionary.getOres("crystalCertusQuartz"); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 5972d2b88..35759f309 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/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; diff --git a/src/main/java/com/hbm/items/machine/ItemDrillbit.java b/src/main/java/com/hbm/items/machine/ItemDrillbit.java index d281c0b1e..b992fd052 100644 --- a/src/main/java/com/hbm/items/machine/ItemDrillbit.java +++ b/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; diff --git a/src/main/java/com/hbm/items/special/ItemBedrockOre.java b/src/main/java/com/hbm/items/special/ItemBedrockOre.java index 691933e8a..2a8ec676c 100644 --- a/src/main/java/com/hbm/items/special/ItemBedrockOre.java +++ b/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; diff --git a/src/main/resources/assets/hbm/textures/gui/AntiMatterParticleCollider.png b/src/main/resources/assets/hbm/textures/gui/AntiMatterParticleCollider.png deleted file mode 100644 index 436b7e805..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/AntiMatterParticleCollider.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/nitric_acid.png b/src/main/resources/assets/hbm/textures/gui/fluids/nitric_acid.png new file mode 100644 index 000000000..cb38e3ec4 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/fluids/nitric_acid.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/solvent.png b/src/main/resources/assets/hbm/textures/gui/fluids/solvent.png new file mode 100644 index 000000000..cde1cf21a Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/fluids/solvent.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/generators/gui_turbine_large.png b/src/main/resources/assets/hbm/textures/gui/generators/gui_turbine_large.png index 9eea8062a..4cad0e731 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/generators/gui_turbine_large.png and b/src/main/resources/assets/hbm/textures/gui/generators/gui_turbine_large.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_deuterium.png b/src/main/resources/assets/hbm/textures/gui/gui_deuterium.png deleted file mode 100644 index cc8e748fe..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_deuterium.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_fusion.png b/src/main/resources/assets/hbm/textures/gui/gui_fusion.png deleted file mode 100644 index d8058d448..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_fusion.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_fusion_multiblock.png b/src/main/resources/assets/hbm/textures/gui/gui_fusion_multiblock.png deleted file mode 100644 index 0ac0e9ab6..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_fusion_multiblock.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_gasFlare.png b/src/main/resources/assets/hbm/textures/gui/gui_gasFlare.png deleted file mode 100644 index dad01e24a..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_gasFlare.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_generator.png b/src/main/resources/assets/hbm/textures/gui/gui_generator.png deleted file mode 100644 index 134511414..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_generator.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_he_rf_converter.png b/src/main/resources/assets/hbm/textures/gui/gui_he_rf_converter.png deleted file mode 100644 index 42c670d99..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_he_rf_converter.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_igenerator.png b/src/main/resources/assets/hbm/textures/gui/gui_igenerator.png deleted file mode 100644 index 01fb17207..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_igenerator.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_planner_old.png b/src/main/resources/assets/hbm/textures/gui/gui_planner_old.png deleted file mode 100644 index a30985cfa..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_planner_old.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_reactor_experimental.png b/src/main/resources/assets/hbm/textures/gui/gui_reactor_experimental.png deleted file mode 100644 index 116330970..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_reactor_experimental.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_reactor_multiblock.png b/src/main/resources/assets/hbm/textures/gui/gui_reactor_multiblock.png deleted file mode 100644 index fbc7c9044..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_reactor_multiblock.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_reactor_overlay_experimental.png b/src/main/resources/assets/hbm/textures/gui/gui_reactor_overlay_experimental.png deleted file mode 100644 index adbebae9c..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_reactor_overlay_experimental.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_reactor_small.png b/src/main/resources/assets/hbm/textures/gui/gui_reactor_small.png deleted file mode 100644 index 7dfc3b8dd..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_reactor_small.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_reactor_small_overlay.png b/src/main/resources/assets/hbm/textures/gui/gui_reactor_small_overlay.png deleted file mode 100644 index 74b71dd4d..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_reactor_small_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_refinery_alt.png b/src/main/resources/assets/hbm/textures/gui/gui_refinery_alt.png deleted file mode 100644 index 1804a2ef3..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_refinery_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_rf_he_converter.png b/src/main/resources/assets/hbm/textures/gui/gui_rf_he_converter.png deleted file mode 100644 index db8f87795..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_rf_he_converter.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_rtg_color.png b/src/main/resources/assets/hbm/textures/gui/gui_rtg_color.png deleted file mode 100644 index b9801a72f..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_rtg_color.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_teleporter.png b/src/main/resources/assets/hbm/textures/gui/gui_teleporter.png deleted file mode 100644 index 056cda44d..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_teleporter.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_well_large.png b/src/main/resources/assets/hbm/textures/gui/gui_well_large.png deleted file mode 100644 index 2f20900af..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_well_large.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/lava_still.png b/src/main/resources/assets/hbm/textures/gui/lava_still.png deleted file mode 100644 index 78bb29d5c..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/lava_still.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/reix_cmd.png b/src/main/resources/assets/hbm/textures/gui/reix_cmd.png deleted file mode 100644 index 060751976..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/reix_cmd.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/byproduct_base.png b/src/main/resources/assets/hbm/textures/items/byproduct_base.png new file mode 100644 index 000000000..079f2e631 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/byproduct_base.png differ diff --git a/src/main/resources/assets/hbm/textures/items/byproduct_base_clean.png b/src/main/resources/assets/hbm/textures/items/byproduct_base_clean.png new file mode 100644 index 000000000..c0eb339d6 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/byproduct_base_clean.png differ diff --git a/src/main/resources/assets/hbm/textures/items/drillbit_diamond.png b/src/main/resources/assets/hbm/textures/items/drillbit_diamond.png new file mode 100644 index 000000000..345e7259b Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/drillbit_diamond.png differ diff --git a/src/main/resources/assets/hbm/textures/items/drillbit_ferro.png b/src/main/resources/assets/hbm/textures/items/drillbit_ferro.png new file mode 100644 index 000000000..c9d18f549 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/drillbit_ferro.png differ diff --git a/src/main/resources/assets/hbm/textures/items/drillbit_ferro_diamond.png b/src/main/resources/assets/hbm/textures/items/drillbit_ferro_diamond.png new file mode 100644 index 000000000..57b45d7e8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/drillbit_ferro_diamond.png differ diff --git a/src/main/resources/assets/hbm/textures/items/drillbit_tcalloy.png b/src/main/resources/assets/hbm/textures/items/drillbit_tcalloy.png new file mode 100644 index 000000000..8d77c3a4a Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/drillbit_tcalloy.png differ diff --git a/src/main/resources/assets/hbm/textures/items/drillbit_tcalloy_diamond.png b/src/main/resources/assets/hbm/textures/items/drillbit_tcalloy_diamond.png new file mode 100644 index 000000000..d9bbd165e Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/drillbit_tcalloy_diamond.png differ diff --git a/src/main/resources/assets/hbm/textures/models/tank/tank_NITRIC_ACID.png b/src/main/resources/assets/hbm/textures/models/tank/tank_NITRIC_ACID.png new file mode 100644 index 000000000..3d66c3960 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/tank/tank_NITRIC_ACID.png differ