Add VAT recipes for some missing fluids

enderio-base/src/generated/resources/assets/enderio/blockstates/liquid_darkness.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "minecraft:block/water"
+    }
+  }
+}

enderio-base/src/generated/resources/assets/enderio/lang/en_us.json

@@ -130,6 +130,7 @@
   "block.enderio.light": "Light",
   "block.enderio.light_inverted": "Light Inverted",
   "block.enderio.light_node": "Light Node",
+  "block.enderio.liquid_darkness": "Liquid Darkness",
   "block.enderio.liquid_sunshine": "Liquid Sunshine",
   "block.enderio.nutrient_distillation": "Nutrient Distillation",
   "block.enderio.painted_crafting_table": "Painted Crafting Table",
@@ -226,6 +227,7 @@
   "fluid_type.enderio.dew_of_the_void": "Fluid of the Void",
   "fluid_type.enderio.fire_water": "Fire Water",
   "fluid_type.enderio.hootch": "Hootch",
+  "fluid_type.enderio.liquid_darkness": "Liquid Darkness",
   "fluid_type.enderio.liquid_sunshine": "Liquid Sunshine",
   "fluid_type.enderio.nutrient_distillation": "Nutrient Distillation",
   "fluid_type.enderio.rocket_fuel": "Rocket Fuel",
@@ -341,6 +343,7 @@
   "item.enderio.hootch_bucket": "Hootch Bucket",
   "item.enderio.infinity_rod": "Infinity Rod",
   "item.enderio.iron_gear": "Infinity Bimetal Gear",
+  "item.enderio.liquid_darkness_bucket": "Liquid Darkness Bucket",
   "item.enderio.liquid_sunshine_bucket": "Liquid Sunshine Bucket",
   "item.enderio.location_printout": "Location Printout",
   "item.enderio.loot_capacitor": "Loot Capacitor",

enderio-base/src/generated/resources/assets/enderio/models/item/liquid_darkness_bucket.json

@@ -0,0 +1,5 @@
+{
+  "parent": "neoforge:item/bucket",
+  "fluid": "enderio:fluid_liquid_darkness_still",
+  "loader": "neoforge:fluid_container"
+}

enderio-base/src/main/java/com/enderio/base/common/init/EIOFluids.java

@@ -35,7 +35,7 @@ public class EIOFluids {
             "Nutrient Distillation", FluidType.Properties.create().density(1500).viscosity(3000));
 
     public static final RegiliteFluid<FluidType> DEW_OF_THE_VOID = fluid("dew_of_the_void", "Fluid of the Void",
-            FluidType.Properties.create().density(200).viscosity(1000).temperature(175));
+            FluidType.Properties.create().density(200).viscosity(1000).temperature(175), 3);
 
     public static final RegiliteFluid<FluidType> VAPOR_OF_LEVITY = gasFluid("vapor_of_levity", "Vapor of Levity",
             FluidType.Properties.create().density(-10).viscosity(100).temperature(5));
@@ -47,43 +47,54 @@ public class EIOFluids {
             FluidType.Properties.create().density(900).viscosity(1000));
 
     public static final RegiliteFluid<FluidType> FIRE_WATER = fluid("fire_water", "Fire Water",
-            FluidType.Properties.create().density(900).viscosity(1000).temperature(2000));
+            FluidType.Properties.create().density(900).viscosity(1000).temperature(2000), 5);
 
     public static final RegiliteFluid<FluidType> XP_JUICE = fluid("xp_juice", "XP Juice",
-            FluidType.Properties.create().lightLevel(10).density(800).viscosity(1500))
+            FluidType.Properties.create().lightLevel(10).density(800).viscosity(1500), 10)
                     .addFluidTags(EIOTags.Fluids.EXPERIENCE);
 
     public static final RegiliteFluid<FluidType> LIQUID_SUNSHINE = fluid("liquid_sunshine", "Liquid Sunshine",
-            FluidType.Properties.create().density(200).viscosity(400)).addFluidTags(EIOTags.Fluids.SOLAR_PANEL_LIGHT);
+            FluidType.Properties.create().density(200).viscosity(400).lightLevel(15).temperature(300), 15).addFluidTags(EIOTags.Fluids.SOLAR_PANEL_LIGHT);
+
+    public static final RegiliteFluid<FluidType> LIQUID_DARKNESS = fluid("liquid_darkness", "Liquid Darkness",
+        FluidType.Properties.create().density(500).viscosity(900).temperature(100));
 
     public static final RegiliteFluid<FluidType> CLOUD_SEED = fluid("cloud_seed", "Cloud Seed",
             FluidType.Properties.create().density(500).viscosity(800));
 
     public static final RegiliteFluid<FluidType> CLOUD_SEED_CONCENTRATED = fluid("cloud_seed_concentrated",
             "Cloud Seed Concentrated", FluidType.Properties.create().density(1000).viscosity(1200));
 
+    private static RegiliteFluid<FluidType> fluid(String name, String translation, FluidType.Properties properties, int lightLevel) {
+        return baseFluid(name, properties, lightLevel).setTranslation(translation)
+            .withBucket(ITEM_REGISTRY, fluid -> new BucketItem(fluid.get(), new Item.Properties().stacksTo(1)))
+            .setTab(EIOCreativeTabs.MAIN)
+            .setTranslation(translation + " Bucket")
+            .finishBucket();
+    }
+
     private static RegiliteFluid<FluidType> fluid(String name, String translation, FluidType.Properties properties) {
-        return baseFluid(name, properties).setTranslation(translation)
+        return baseFluid(name, properties, 0).setTranslation(translation)
                 .withBucket(ITEM_REGISTRY, fluid -> new BucketItem(fluid.get(), new Item.Properties().stacksTo(1)))
                 .setTab(EIOCreativeTabs.MAIN)
                 .setTranslation(translation + " Bucket")
                 .finishBucket();
     }
 
     private static RegiliteFluid<FluidType> gasFluid(String name, String translation, FluidType.Properties properties) {
-        return baseFluid(name, properties).setTranslation(translation)
+        return baseFluid(name, properties, 0).setTranslation(translation)
                 .withBucket(ITEM_REGISTRY, fluid -> new BucketItem(fluid.get(), new Item.Properties().stacksTo(1)))
                 .setTab(EIOCreativeTabs.MAIN)
                 .setTranslation(translation + " Bucket")
                 .finishBucket();
     }
 
-    private static RegiliteFluid<FluidType> baseFluid(String name, FluidType.Properties properties) {
+    private static RegiliteFluid<FluidType> baseFluid(String name, FluidType.Properties properties, int lightlevel) {
         return FLUID_TYPE_REGISTRY.registerFluid(name, properties)
                 .setRenderType(() -> RenderType::translucent)
                 .createFluid(FLUID_REGISTRY)
                 .withBlock(BLOCK_REGISTRY,
-                        fluid -> new LiquidBlock(fluid.get(), BlockBehaviour.Properties.ofFullCopy(Blocks.WATER)))
+                        fluid -> new LiquidBlock(fluid.get(), BlockBehaviour.Properties.ofFullCopy(Blocks.WATER).lightLevel((state) -> lightlevel)))
                 .finishLiquidBlock();
     }
 

enderio-base/src/main/resources/assets/enderio/textures/block/liquid_darkness_flowing.png.mcmeta

@@ -0,0 +1,3 @@
+{
+  "animation": {}
+}

enderio-base/src/main/resources/assets/enderio/textures/block/liquid_darkness_still.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}

enderio-conduits-modded/src/generated/resources/assets/enderio/lang/en_us.json

@@ -1,4 +1,7 @@
 {
+  "gui.enderio.chemical_conduit.change_fluid1": "Locked Chemical:",
+  "gui.enderio.chemical_conduit.change_fluid2": "Click to reset!",
+  "gui.enderio.chemical_conduit.change_fluid3": "Chemical: %s",
   "item.enderio.chemical_filter": "Chemical Filter",
   "item.enderio.conduit.chemical": "Chemical Conduit",
   "item.enderio.conduit.chemical.multi": "Allows multiple chemical types to be transported on the same line",

enderio-machines/src/generated/resources/data/c/tags/item/crops.json

@@ -1,5 +1,5 @@
 {
   "values": [
-    "minecraft:wheat"
+    "minecraft:sugar_cane"
   ]
 }

enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/vat.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_ingredient": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:barrel"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "enderio:vat"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_ingredient"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "enderio:vat"
+    ]
+  }
+}

enderio-machines/src/generated/resources/data/enderio/data_maps/item/vat_reagent.json

@@ -1,8 +1,49 @@
 {
   "values": {
-    "minecraft:wheat": {
-      "#c:crops": 3.0,
-      "#c:seeds": 2.0
+    "minecraft:blue_ice": {
+      "#enderio:cloud_cold": 81.0
+    },
+    "minecraft:fire_charge": {
+      "#enderio:explosives": 0.5
+    },
+    "minecraft:firework_rocket": {
+      "#enderio:explosives": 0.4
+    },
+    "minecraft:firework_star": {
+      "#enderio:explosives": 0.4
+    },
+    "minecraft:glow_berries": {
+      "#enderio:natural_lights": 0.15
+    },
+    "minecraft:glow_ink_sac": {
+      "#enderio:natural_lights": 0.5
+    },
+    "minecraft:glow_lichen": {
+      "#enderio:natural_lights": 0.2
+    },
+    "minecraft:glowstone_dust": {
+      "#enderio:natural_lights": 0.25
+    },
+    "minecraft:gunpowder": {
+      "#enderio:explosives": 0.25
+    },
+    "minecraft:packed_ice": {
+      "#enderio:cloud_cold": 9.0
+    },
+    "minecraft:sea_pickle": {
+      "#enderio:natural_lights": 0.25
+    },
+    "minecraft:snow": {
+      "#enderio:cloud_cold": 0.12
+    },
+    "minecraft:snowball": {
+      "#enderio:cloud_cold": 0.11
+    },
+    "minecraft:sugar_cane": {
+      "#c:crops": 0.5
+    },
+    "minecraft:torchflower": {
+      "#enderio:sunflower": 1.2
     }
   }
 }

enderio-machines/src/generated/resources/data/enderio/eio_soul/engine/minecraft_creeper.json

@@ -0,0 +1,6 @@
+{
+  "entity": "minecraft:creeper",
+  "fluid": "enderio:fluid_rocket_fuel_still",
+  "power/mb": 700,
+  "tick/mb": 15
+}

enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_cloud_seed_concentrated_still.json

@@ -0,0 +1,14 @@
+{
+  "type": "enderio:vat_fermenting",
+  "input": {
+    "amount": 1000,
+    "fluid": "enderio:fluid_cloud_seed_concentrated_still"
+  },
+  "left_reagent": "enderio:lightning_rod",
+  "output": {
+    "amount": 500,
+    "id": "enderio:fluid_cloud_seed_concentrated_still"
+  },
+  "right_reagent": "enderio:wind_charges",
+  "ticks": 600
+}

enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_cloud_seed_still.json

@@ -0,0 +1,14 @@
+{
+  "type": "enderio:vat_fermenting",
+  "input": {
+    "amount": 1000,
+    "tag": "minecraft:water"
+  },
+  "left_reagent": "enderio:prismarine",
+  "output": {
+    "amount": 1000,
+    "id": "enderio:fluid_cloud_seed_still"
+  },
+  "right_reagent": "enderio:cloud_cold",
+  "ticks": 400
+}

enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_fire_water_still.json

@@ -0,0 +1,14 @@
+{
+  "type": "enderio:vat_fermenting",
+  "input": {
+    "amount": 1000,
+    "fluid": "enderio:fluid_hootch_still"
+  },
+  "left_reagent": "enderio:blaze_powder",
+  "output": {
+    "amount": 1000,
+    "id": "enderio:fluid_fire_water_still"
+  },
+  "right_reagent": "c:dusts/redstone",
+  "ticks": 400
+}

enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_hootch_still.json

@@ -10,5 +10,5 @@
     "id": "enderio:fluid_hootch_still"
   },
   "right_reagent": "c:crops",
-  "ticks": 100
+  "ticks": 200
 }

enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_liquid_darkness_still.json

@@ -0,0 +1,14 @@
+{
+  "type": "enderio:vat_fermenting",
+  "input": {
+    "amount": 500,
+    "fluid": "enderio:fluid_liquid_sunshine_still"
+  },
+  "left_reagent": "enderio:amethyst",
+  "output": {
+    "amount": 1000,
+    "id": "enderio:fluid_liquid_darkness_still"
+  },
+  "right_reagent": "c:dusts/obsidian",
+  "ticks": 600
+}

enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_liquid_sunshine_still.json

@@ -0,0 +1,14 @@
+{
+  "type": "enderio:vat_fermenting",
+  "input": {
+    "amount": 1000,
+    "tag": "minecraft:water"
+  },
+  "left_reagent": "enderio:natural_lights",
+  "output": {
+    "amount": 1000,
+    "id": "enderio:fluid_liquid_sunshine_still"
+  },
+  "right_reagent": "enderio:sunflower",
+  "ticks": 200
+}

enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_nutrient_distillation_still.json

@@ -0,0 +1,14 @@
+{
+  "type": "enderio:vat_fermenting",
+  "input": {
+    "amount": 1000,
+    "tag": "minecraft:water"
+  },
+  "left_reagent": "minecraft:meat",
+  "output": {
+    "amount": 250,
+    "id": "enderio:fluid_nutrient_distillation_still"
+  },
+  "right_reagent": "c:crops",
+  "ticks": 200
+}

enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_rocket_fuel_still.json

@@ -0,0 +1,14 @@
+{
+  "type": "enderio:vat_fermenting",
+  "input": {
+    "amount": 1000,
+    "fluid": "enderio:fluid_hootch_still"
+  },
+  "left_reagent": "enderio:explosives",
+  "output": {
+    "amount": 1000,
+    "id": "enderio:fluid_rocket_fuel_still"
+  },
+  "right_reagent": "c:dusts/redstone",
+  "ticks": 400
+}

enderio-machines/src/generated/resources/data/enderio/recipe/vat.json

@@ -0,0 +1,33 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "key": {
+    "A": {
+      "tag": "c:ingots/copper_alloy"
+    },
+    "B": {
+      "item": "minecraft:barrel"
+    },
+    "C": {
+      "item": "enderio:void_chassis"
+    },
+    "M": {
+      "tag": "c:gears/iron"
+    },
+    "R": {
+      "tag": "c:ingots/redstone_alloy"
+    },
+    "S": {
+      "tag": "c:ingots/dark_steel"
+    }
+  },
+  "pattern": [
+    "SBS",
+    "ACA",
+    "MRM"
+  ],
+  "result": {
+    "count": 1,
+    "id": "enderio:vat"
+  }
+}