Merge pull request #1186 from SuicidalSteve/comparator-tanks

Fluid Container Comparator Compat and Goggle Overlays

src/generated/resources/.cache/cache

@@ -140,7 +140,7 @@ de8a40b7daf1497d5aecee47a43b3e0b1d030b00 assets/create/blockstates/fancy_scoria_
 fc9ac0a7e7191b93516719455a17177fa6524ecc assets/create/blockstates/fancy_weathered_limestone_bricks_slab.json
 b2a7c321b1795f20e7433f81a55ce4683de081b8 assets/create/blockstates/fancy_weathered_limestone_bricks_stairs.json
 6372fe02ba0065acb0758121c45a15a1a8fdc5de assets/create/blockstates/fancy_weathered_limestone_bricks_wall.json
-48086bf71a824faf14841b698050cc8544b09a9b assets/create/blockstates/fluid_pipe.json
+cedc68a9c3ab47a94bd8200889316a708c25950a assets/create/blockstates/fluid_pipe.json
 f0eaab18e16c4f3f65ebf3b55b08f0dc445720fe assets/create/blockstates/fluid_tank.json
 5408d92ab02af86539ac42971d4033545970bb3a assets/create/blockstates/fluid_valve.json
 e9da1794b6ece7f9aa8bcb43d42c23a55446133b assets/create/blockstates/flywheel.json
@@ -337,7 +337,7 @@ e8b0a401c10d1ba67ed71ba31bd5f9bc28571b65 assets/create/blockstates/powered_toggl
 d06cd9a1101b18d306a786320aab12018b1325d6 assets/create/blockstates/purple_sail.json
 92957119abd5fbcca36a113b2a80255fd70fc303 assets/create/blockstates/purple_seat.json
 61035f8afe75ff7bbd291da5d8690bcbebe679eb assets/create/blockstates/purple_valve_handle.json
-4439fc83a8c7370ab44b211a3fd48abde20a4728 assets/create/blockstates/radial_chassis.json
+ab2a1bf8f37f1c64d00538867f4c3a97195bd3c4 assets/create/blockstates/radial_chassis.json
 45877c4d90a7185c2f304edbd67379d800920439 assets/create/blockstates/red_sail.json
 da1b08387af7afa0855ee8d040f620c01f20660a assets/create/blockstates/red_seat.json
 722fc77bbf387af8a4016e42cbf9501d2b968881 assets/create/blockstates/red_valve_handle.json
@@ -401,20 +401,6 @@ a3a11524cd3515fc01d905767b4b7ea782adaf03 assets/create/blockstates/yellow_seat.j
 6801fa1f466f172700e573e5b8ee8ee5f9ca4583 assets/create/blockstates/yellow_valve_handle.json
 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json
 b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json
-369f9c6fce0aa11d70efa2e73a4ba2ff12e57e37 assets/create/lang/en_ud.json
-10f9c238cdc8b68246c5663bc9745942d1014927 assets/create/lang/en_us.json
-c46eabdb4476c18f539c95c24259a3fe1ee9cbff assets/create/lang/unfinished/de_de.json
-551cd06b553080815a129d6b113473efde3fb5ac assets/create/lang/unfinished/es_es.json
-1bac8afa8f92030077db8d921fd9dda30c0e8a5a assets/create/lang/unfinished/es_mx.json
-d62993dd6f73224cbc17f04ea96022c4ac385dc4 assets/create/lang/unfinished/fr_fr.json
-749274555f9b3edc9d7799a7147d724fd7993c66 assets/create/lang/unfinished/it_it.json
-7e9723798c1459780b2814145eb6a0dc681a2281 assets/create/lang/unfinished/ja_jp.json
-2d1da43b76d2184df5b183641241478e1c101218 assets/create/lang/unfinished/ko_kr.json
-9cea3a5a2fe4e2c6d966f3c91b24e9d6595a9cc6 assets/create/lang/unfinished/nl_nl.json
-e7299620ca48f296d678c87470358816f23d7578 assets/create/lang/unfinished/pt_br.json
-6fd3ef5962b10f83e5df7dd0fbdb50cadee1a06b assets/create/lang/unfinished/ru_ru.json
-b0688d7e4c593c0ed4fc87ea0b4e52205dcdeec8 assets/create/lang/unfinished/zh_cn.json
-ff1c97c854da7b7bfe6be829c9bf6a787f6dfacd assets/create/lang/unfinished/zh_tw.json
 846200eb548d3bfa2e77b41039de159b4b6cfb45 assets/create/models/block/acacia_window.json
 1930fa3a3c98d53dd19e4ee7f55bc27fd47aa281 assets/create/models/block/acacia_window_pane_noside.json
 1763ea2c9b981d187f5031ba608f3d5d3be3986a assets/create/models/block/acacia_window_pane_noside_alt.json

src/generated/resources/assets/create/blockstates/fluid_pipe.json

@@ -60,10 +60,10 @@
     },
     {
       "when": {
+        "north": "true",
         "down": "false",
-        "up": "true",
         "south": "false",
-        "north": "true"
+        "up": "true"
       },
       "apply": {
         "model": "create:block/fluid_pipe/lu_x"
@@ -71,10 +71,10 @@
     },
     {
       "when": {
+        "north": "false",
         "down": "false",
-        "up": "true",
         "south": "true",
-        "north": "false"
+        "up": "true"
       },
       "apply": {
         "model": "create:block/fluid_pipe/ru_x"
@@ -82,10 +82,10 @@
     },
     {
       "when": {
+        "north": "true",
         "down": "true",
-        "up": "false",
         "south": "false",
-        "north": "true"
+        "up": "false"
       },
       "apply": {
         "model": "create:block/fluid_pipe/ld_x"
@@ -93,10 +93,10 @@
     },
     {
       "when": {
+        "north": "false",
         "down": "true",
-        "up": "false",
         "south": "true",
-        "north": "false"
+        "up": "false"
       },
       "apply": {
         "model": "create:block/fluid_pipe/rd_x"
@@ -104,10 +104,10 @@
     },
     {
       "when": {
+        "north": "false",
         "down": "true",
-        "up": "true",
         "south": "false",
-        "north": "false"
+        "up": "true"
       },
       "apply": {
         "model": "create:block/fluid_pipe/ud_x"
@@ -115,10 +115,10 @@
     },
     {
       "when": {
+        "north": "false",
         "down": "false",
-        "up": "true",
         "south": "false",
-        "north": "false"
+        "up": "true"
       },
       "apply": {
         "model": "create:block/fluid_pipe/ud_x"
@@ -126,10 +126,10 @@
     },
     {
       "when": {
+        "north": "false",
         "down": "true",
-        "up": "false",
         "south": "false",
-        "north": "false"
+        "up": "false"
       },
       "apply": {
         "model": "create:block/fluid_pipe/ud_x"
@@ -137,10 +137,10 @@
     },
     {
       "when": {
+        "north": "true",
         "down": "false",
-        "up": "false",
         "south": "true",
-        "north": "true"
+        "up": "false"
       },
       "apply": {
         "model": "create:block/fluid_pipe/lr_x"
@@ -148,10 +148,10 @@
     },
     {
       "when": {
+        "north": "true",
         "down": "false",
-        "up": "false",
         "south": "false",
-        "north": "true"
+        "up": "false"
       },
       "apply": {
         "model": "create:block/fluid_pipe/lr_x"
@@ -159,10 +159,10 @@
     },
     {
       "when": {
+        "north": "false",
         "down": "false",
-        "up": "false",
         "south": "true",
-        "north": "false"
+        "up": "false"
       },
       "apply": {
         "model": "create:block/fluid_pipe/lr_x"
@@ -170,10 +170,10 @@
     },
     {
       "when": {
+        "north": "false",
         "down": "false",
-        "up": "false",
         "south": "false",
-        "north": "false"
+        "up": "false"
       },
       "apply": {
         "model": "create:block/fluid_pipe/none_x"
@@ -181,10 +181,10 @@
     },
     {
       "when": {
-        "south": "true",
+        "east": "false",
-        "west": "true",
         "north": "false",
-        "east": "false"
+        "south": "true",
+        "west": "true"
       },
       "apply": {
         "model": "create:block/fluid_pipe/lu_y"
@@ -192,10 +192,10 @@
     },
     {
       "when": {
-        "south": "true",
+        "east": "true",
-        "west": "false",
         "north": "false",
-        "east": "true"
+        "south": "true",
+        "west": "false"
       },
       "apply": {
         "model": "create:block/fluid_pipe/ru_y"
@@ -203,10 +203,10 @@
     },
     {
       "when": {
-        "south": "false",
+        "east": "false",
-        "west": "true",
         "north": "true",
-        "east": "false"
+        "south": "false",
+        "west": "true"
       },
       "apply": {
         "model": "create:block/fluid_pipe/ld_y"
@@ -214,10 +214,10 @@
     },
     {
       "when": {
-        "south": "false",
+        "east": "true",
-        "west": "false",
         "north": "true",
-        "east": "true"
+        "south": "false",
+        "west": "false"
       },
       "apply": {
         "model": "create:block/fluid_pipe/rd_y"
@@ -225,21 +225,10 @@
     },
     {
       "when": {
-        "south": "true",
+        "east": "false",
-        "west": "false",
         "north": "true",
-        "east": "false"
-      },
-      "apply": {
-        "model": "create:block/fluid_pipe/ud_y"
-      }
-    },
-    {
-      "when": {
         "south": "true",
-        "west": "false",
+        "west": "false"
-        "north": "false",
-        "east": "false"
       },
       "apply": {
         "model": "create:block/fluid_pipe/ud_y"
@@ -247,10 +236,21 @@
     },
     {
       "when": {
-        "south": "false",
+        "east": "false",
-        "west": "false",
+        "north": "false",
+        "south": "true",
+        "west": "false"
+      },
+      "apply": {
+        "model": "create:block/fluid_pipe/ud_y"
+      }
+    },
+    {
+      "when": {
+        "east": "false",
         "north": "true",
-        "east": "false"
+        "south": "false",
+        "west": "false"
       },
       "apply": {
         "model": "create:block/fluid_pipe/ud_y"
@@ -258,10 +258,10 @@
     },
     {
       "when": {
-        "south": "false",
+        "east": "true",
-        "west": "true",
         "north": "false",
-        "east": "true"
+        "south": "false",
+        "west": "true"
       },
       "apply": {
         "model": "create:block/fluid_pipe/lr_y"
@@ -269,10 +269,10 @@
     },
     {
       "when": {
-        "south": "false",
+        "east": "false",
-        "west": "true",
         "north": "false",
-        "east": "false"
+        "south": "false",
+        "west": "true"
       },
       "apply": {
         "model": "create:block/fluid_pipe/lr_y"
@@ -280,10 +280,10 @@
     },
     {
       "when": {
-        "south": "false",
+        "east": "true",
-        "west": "false",
         "north": "false",
-        "east": "true"
+        "south": "false",
+        "west": "false"
       },
       "apply": {
         "model": "create:block/fluid_pipe/lr_y"
@@ -291,10 +291,10 @@
     },
     {
       "when": {
-        "south": "false",
+        "east": "false",
-        "west": "false",
         "north": "false",
-        "east": "false"
+        "south": "false",
+        "west": "false"
       },
       "apply": {
         "model": "create:block/fluid_pipe/none_y"
@@ -302,10 +302,10 @@
     },
     {
       "when": {
+        "east": "true",
         "down": "false",
         "up": "true",
-        "west": "false",
+        "west": "false"
-        "east": "true"
       },
       "apply": {
         "model": "create:block/fluid_pipe/lu_z"
@@ -313,10 +313,10 @@
     },
     {
       "when": {
+        "east": "false",
         "down": "false",
         "up": "true",
-        "west": "true",
+        "west": "true"
-        "east": "false"
       },
       "apply": {
         "model": "create:block/fluid_pipe/ru_z"
@@ -324,10 +324,10 @@
     },
     {
       "when": {
+        "east": "true",
         "down": "true",
         "up": "false",
-        "west": "false",
+        "west": "false"
-        "east": "true"
       },
       "apply": {
         "model": "create:block/fluid_pipe/ld_z"
@@ -335,10 +335,10 @@
     },
     {
       "when": {
+        "east": "false",
         "down": "true",
         "up": "false",
-        "west": "true",
+        "west": "true"
-        "east": "false"
       },
       "apply": {
         "model": "create:block/fluid_pipe/rd_z"
@@ -346,10 +346,10 @@
     },
     {
       "when": {
+        "east": "false",
         "down": "true",
         "up": "true",
-        "west": "false",
+        "west": "false"
-        "east": "false"
       },
       "apply": {
         "model": "create:block/fluid_pipe/ud_z"
@@ -357,10 +357,10 @@
     },
     {
       "when": {
+        "east": "false",
         "down": "false",
         "up": "true",
-        "west": "false",
+        "west": "false"
-        "east": "false"
       },
       "apply": {
         "model": "create:block/fluid_pipe/ud_z"
@@ -368,10 +368,10 @@
     },
     {
       "when": {
+        "east": "false",
         "down": "true",
         "up": "false",
-        "west": "false",
+        "west": "false"
-        "east": "false"
       },
       "apply": {
         "model": "create:block/fluid_pipe/ud_z"
@@ -379,10 +379,10 @@
     },
     {
       "when": {
+        "east": "true",
         "down": "false",
         "up": "false",
-        "west": "true",
+        "west": "true"
-        "east": "true"
       },
       "apply": {
         "model": "create:block/fluid_pipe/lr_z"
@@ -390,10 +390,10 @@
     },
     {
       "when": {
+        "east": "true",
         "down": "false",
         "up": "false",
-        "west": "false",
+        "west": "false"
-        "east": "true"
       },
       "apply": {
         "model": "create:block/fluid_pipe/lr_z"
@@ -401,10 +401,10 @@
     },
     {
       "when": {
+        "east": "false",
         "down": "false",
         "up": "false",
-        "west": "true",
+        "west": "true"
-        "east": "false"
       },
       "apply": {
         "model": "create:block/fluid_pipe/lr_z"
@@ -412,10 +412,10 @@
     },
     {
       "when": {
+        "east": "false",
         "down": "false",
         "up": "false",
-        "west": "false",
+        "west": "false"
-        "east": "false"
       },
       "apply": {
         "model": "create:block/fluid_pipe/none_z"

src/generated/resources/assets/create/blockstates/radial_chassis.json

@@ -89,8 +89,8 @@
     },
     {
       "when": {
-        "axis": "x",
+        "sticky_west": "true",
-        "sticky_west": "true"
+        "axis": "x"
       },
       "apply": {
         "model": "create:block/radial_chassis_side_x_sticky",
@@ -99,8 +99,8 @@
     },
     {
       "when": {
-        "axis": "y",
+        "sticky_west": "true",
-        "sticky_west": "true"
+        "axis": "y"
       },
       "apply": {
         "model": "create:block/radial_chassis_side_y_sticky",
@@ -109,8 +109,8 @@
     },
     {
       "when": {
-        "axis": "z",
+        "sticky_west": "true",
-        "sticky_west": "true"
+        "axis": "z"
       },
       "apply": {
         "model": "create:block/radial_chassis_side_z_sticky",
@@ -119,8 +119,8 @@
     },
     {
       "when": {
-        "axis": "x",
+        "sticky_west": "false",
-        "sticky_west": "false"
+        "axis": "x"
       },
       "apply": {
         "model": "create:block/radial_chassis_side_x",
@@ -129,8 +129,8 @@
     },
     {
       "when": {
-        "axis": "y",
+        "sticky_west": "false",
-        "sticky_west": "false"
+        "axis": "y"
       },
       "apply": {
         "model": "create:block/radial_chassis_side_y",
@@ -139,8 +139,8 @@
     },
     {
       "when": {
-        "axis": "z",
+        "sticky_west": "false",
-        "sticky_west": "false"
+        "axis": "z"
       },
       "apply": {
         "model": "create:block/radial_chassis_side_z",

src/generated/resources/assets/create/lang/en_us.json

@@ -842,6 +842,15 @@
 	"create.gui.stressometer.no_rotation": "No Rotation",
 	"create.gui.contraptions.not_fast_enough": "It appears that this %1$s is _not_ rotating with _enough_ _speed_.",
 	"create.gui.contraptions.network_overstressed": "It appears that this contraption is _overstressed_. Add more sources or _slow_ _down_ the components with a high _stress_ _impact_.",
+	"create.gui.stores_fluid.title": "Fluid Contained",
+	"create.gui.stores_fluid.effectsTitle": "Potion Effects",
+	"create.gui.stores_fluid.empty": "Empty",
+	"create.gui.input_tanks.title": "Input Tanks",
+	"create.gui.output_tanks.title": "Output Tanks",
+	"create.gui.tank.info_header": "Tank Information:",
+	"create.gui.spout.info_header": "Spout Information:",
+	"create.gui.drain.info_header": "Drain Information:",
+	"create.gui.basin.info_header": "Basin Information:",
 	"create.gui.adjustable_crate.title": "Adjustable Crate",
 	"create.gui.adjustable_crate.storageSpace": "Storage Space",
 	"create.gui.stockpile_switch.title": "Stockpile Switch",
@@ -1068,6 +1077,10 @@
 	"create.tooltip.stressImpact.medium": "Moderate",
 	"create.tooltip.stressImpact.high": "High",
 	"create.tooltip.stressImpact.overstressed": "Overstressed",
+	"create.tooltip.fluidFullness.low": "Low",
+	"create.tooltip.fluidFullness.medium": "Moderate",
+	"create.tooltip.fluidFullness.high": "High",
+	"create.tooltip.fluidFullness.full": "Full",
 	"create.tooltip.capacityProvided": "Stress Capacity: %1$s",
 	"create.tooltip.capacityProvided.low": "Small",
 	"create.tooltip.capacityProvided.medium": "Medium",
@@ -1450,6 +1463,8 @@
 	"item.create.goggles.tooltip.behaviour1": "Shows _colored indicators_ corresponding to the _Speed Level_ of a placed kinetic component as well as _Stress Impact_ and _Capacity_ of individual components.",
 	"item.create.goggles.tooltip.condition2": "When looking at gauge",
 	"item.create.goggles.tooltip.behaviour2": "Shows detailed information about _Speed_ or _Stress_ of the network to which the gauge is connected.",
+	"item.create.goggles.tooltip.condition3": "When looking at fluid containers",
+	"item.create.goggles.tooltip.behaviour3": "Shows detailed information about the _Capacity_ of the block and any _Fluids_ stored within.",
 
 	"item.create.wrench.tooltip": "WRENCH",
 	"item.create.wrench.tooltip.summary": "A useful tool for working on kinetic contraptions. Can be used to _Rotate_, _Dismantle_ and to _Configure_ components.",

src/generated/resources/assets/create/lang/unfinished/de_de.json

@@ -1,5 +1,5 @@
 {
-	"_": "Missing Localizations: 974",
+
 
 	"_": "->------------------------]  Game Elements  [------------------------<-",
 
@@ -843,6 +843,15 @@
 	"create.gui.stressometer.no_rotation": "UNLOCALIZED: No Rotation",
 	"create.gui.contraptions.not_fast_enough": "UNLOCALIZED: It appears that this %1$s is _not_ rotating with _enough_ _speed_.",
 	"create.gui.contraptions.network_overstressed": "UNLOCALIZED: It appears that this contraption is _overstressed_. Add more sources or _slow_ _down_ the components with a high _stress_ _impact_.",
+	"create.gui.stores_fluid.title": "UNLOCALIZED: Fluid Contained",
+	"create.gui.stores_fluid.effectsTitle": "UNLOCALIZED: Potion Effects",
+	"create.gui.stores_fluid.empty": "UNLOCALIZED: Empty",
+	"create.gui.input_tanks.title": "UNLOCALIZED: Input Tanks",
+	"create.gui.output_tanks.title": "UNLOCALIZED: Output Tanks",
+	"create.gui.tank.info_header": "UNLOCALIZED: Tank Information:",
+	"create.gui.spout.info_header": "UNLOCALIZED: Spout Information:",
+	"create.gui.drain.info_header": "UNLOCALIZED: Drain Information:",
+	"create.gui.basin.info_header": "UNLOCALIZED: Basin Information:",
 	"create.gui.adjustable_crate.title": "UNLOCALIZED: Adjustable Crate",
 	"create.gui.adjustable_crate.storageSpace": "Lagerraum",
 	"create.gui.stockpile_switch.title": "Vorratssensor",
@@ -1069,6 +1078,10 @@
 	"create.tooltip.stressImpact.medium": "UNLOCALIZED: Moderate",
 	"create.tooltip.stressImpact.high": "UNLOCALIZED: High",
 	"create.tooltip.stressImpact.overstressed": "UNLOCALIZED: Overstressed",
+	"create.tooltip.fluidFullness.low": "UNLOCALIZED: Low",
+	"create.tooltip.fluidFullness.medium": "UNLOCALIZED: Moderate",
+	"create.tooltip.fluidFullness.high": "UNLOCALIZED: High",
+	"create.tooltip.fluidFullness.full": "UNLOCALIZED: Full",
 	"create.tooltip.capacityProvided": "UNLOCALIZED: Stress Capacity: %1$s",
 	"create.tooltip.capacityProvided.low": "UNLOCALIZED: Small",
 	"create.tooltip.capacityProvided.medium": "UNLOCALIZED: Medium",
@@ -1451,6 +1464,8 @@
 	"item.create.goggles.tooltip.behaviour1": "UNLOCALIZED: Shows _colored indicators_ corresponding to the _Speed Level_ of a placed kinetic component as well as _Stress Impact_ and _Capacity_ of individual components.",
 	"item.create.goggles.tooltip.condition2": "UNLOCALIZED: When looking at gauge",
 	"item.create.goggles.tooltip.behaviour2": "UNLOCALIZED: Shows detailed information about _Speed_ or _Stress_ of the network to which the gauge is connected.",
+	"item.create.goggles.tooltip.condition3": "UNLOCALIZED: When looking at fluid containers",
+	"item.create.goggles.tooltip.behaviour3": "UNLOCALIZED: Shows detailed information about the _Capacity_ of the block and any _Fluids_ stored within.",
 
 	"item.create.wrench.tooltip": "UNLOCALIZED: WRENCH",
 	"item.create.wrench.tooltip.summary": "UNLOCALIZED: A useful tool for working on kinetic contraptions. Can be used to _Rotate_, _Dismantle_ and to _Configure_ components.",

src/generated/resources/assets/create/lang/unfinished/es_es.json

@@ -1,5 +1,5 @@
 {
-	"_": "Missing Localizations: 16",
+
 
 	"_": "->------------------------]  Game Elements  [------------------------<-",
 
@@ -843,6 +843,15 @@
 	"create.gui.stressometer.no_rotation": "Sin rotación",
 	"create.gui.contraptions.not_fast_enough": "Parece que este %1$s no está girando con _suficiente_ velocidad_.",
 	"create.gui.contraptions.network_overstressed": "Parece que este artilugio está _sobrecargado_. Añade más fuentes o _desacelera_ los componentes con un _impacto_ de alto estrés.",
+	"create.gui.stores_fluid.title": "UNLOCALIZED: Fluid Contained",
+	"create.gui.stores_fluid.effectsTitle": "UNLOCALIZED: Potion Effects",
+	"create.gui.stores_fluid.empty": "UNLOCALIZED: Empty",
+	"create.gui.input_tanks.title": "UNLOCALIZED: Input Tanks",
+	"create.gui.output_tanks.title": "UNLOCALIZED: Output Tanks",
+	"create.gui.tank.info_header": "UNLOCALIZED: Tank Information:",
+	"create.gui.spout.info_header": "UNLOCALIZED: Spout Information:",
+	"create.gui.drain.info_header": "UNLOCALIZED: Drain Information:",
+	"create.gui.basin.info_header": "UNLOCALIZED: Basin Information:",
 	"create.gui.adjustable_crate.title": "Caja ajustable",
 	"create.gui.adjustable_crate.storageSpace": "Espacio de almacenamiento",
 	"create.gui.stockpile_switch.title": "Interruptor de acopio",
@@ -1069,6 +1078,10 @@
 	"create.tooltip.stressImpact.medium": "Moderado",
 	"create.tooltip.stressImpact.high": "Alto",
 	"create.tooltip.stressImpact.overstressed": "Sobrecargado",
+	"create.tooltip.fluidFullness.low": "UNLOCALIZED: Low",
+	"create.tooltip.fluidFullness.medium": "UNLOCALIZED: Moderate",
+	"create.tooltip.fluidFullness.high": "UNLOCALIZED: High",
+	"create.tooltip.fluidFullness.full": "UNLOCALIZED: Full",
 	"create.tooltip.capacityProvided": "Capacidad de estrés: %1$s",
 	"create.tooltip.capacityProvided.low": "Pequeña",
 	"create.tooltip.capacityProvided.medium": "Media",
@@ -1451,6 +1464,8 @@
 	"item.create.goggles.tooltip.behaviour1": "Muestra _indicadores de color_ correspondientes al _Nivel de velocidad_ de un componente cinético colocado, así como el _Impacto de estrés_ y la _Capacidad_ de los componentes individuales.",
 	"item.create.goggles.tooltip.condition2": "Al mirar el medidor",
 	"item.create.goggles.tooltip.behaviour2": "Muestra información detallada sobre _Velocidad_ o _Estrés_ de la red a la que está conectado el medidor",
+	"item.create.goggles.tooltip.condition3": "UNLOCALIZED: When looking at fluid containers",
+	"item.create.goggles.tooltip.behaviour3": "UNLOCALIZED: Shows detailed information about the _Capacity_ of the block and any _Fluids_ stored within.",
 
 	"item.create.wrench.tooltip": "LLAVE INGLESA",
 	"item.create.wrench.tooltip.summary": "Una herramienta útil para trabajar en artilugios cinéticos. Se puede utilizar para _Rotar_, _Desmantelar_ y para _Configurar_ componentes",

src/generated/resources/assets/create/lang/unfinished/es_mx.json

@@ -1,5 +1,5 @@
 {
-	"_": "Missing Localizations: 904",
+
 
 	"_": "->------------------------]  Game Elements  [------------------------<-",
 
@@ -843,6 +843,15 @@
 	"create.gui.stressometer.no_rotation": "UNLOCALIZED: No Rotation",
 	"create.gui.contraptions.not_fast_enough": "UNLOCALIZED: It appears that this %1$s is _not_ rotating with _enough_ _speed_.",
 	"create.gui.contraptions.network_overstressed": "UNLOCALIZED: It appears that this contraption is _overstressed_. Add more sources or _slow_ _down_ the components with a high _stress_ _impact_.",
+	"create.gui.stores_fluid.title": "UNLOCALIZED: Fluid Contained",
+	"create.gui.stores_fluid.effectsTitle": "UNLOCALIZED: Potion Effects",
+	"create.gui.stores_fluid.empty": "UNLOCALIZED: Empty",
+	"create.gui.input_tanks.title": "UNLOCALIZED: Input Tanks",
+	"create.gui.output_tanks.title": "UNLOCALIZED: Output Tanks",
+	"create.gui.tank.info_header": "UNLOCALIZED: Tank Information:",
+	"create.gui.spout.info_header": "UNLOCALIZED: Spout Information:",
+	"create.gui.drain.info_header": "UNLOCALIZED: Drain Information:",
+	"create.gui.basin.info_header": "UNLOCALIZED: Basin Information:",
 	"create.gui.adjustable_crate.title": "UNLOCALIZED: Adjustable Crate",
 	"create.gui.adjustable_crate.storageSpace": "UNLOCALIZED: Storage Space",
 	"create.gui.stockpile_switch.title": "UNLOCALIZED: Stockpile Switch",
@@ -1069,6 +1078,10 @@
 	"create.tooltip.stressImpact.medium": "UNLOCALIZED: Moderate",
 	"create.tooltip.stressImpact.high": "UNLOCALIZED: High",
 	"create.tooltip.stressImpact.overstressed": "UNLOCALIZED: Overstressed",
+	"create.tooltip.fluidFullness.low": "UNLOCALIZED: Low",
+	"create.tooltip.fluidFullness.medium": "UNLOCALIZED: Moderate",
+	"create.tooltip.fluidFullness.high": "UNLOCALIZED: High",
+	"create.tooltip.fluidFullness.full": "UNLOCALIZED: Full",
 	"create.tooltip.capacityProvided": "UNLOCALIZED: Stress Capacity: %1$s",
 	"create.tooltip.capacityProvided.low": "UNLOCALIZED: Small",
 	"create.tooltip.capacityProvided.medium": "UNLOCALIZED: Medium",
@@ -1451,6 +1464,8 @@
 	"item.create.goggles.tooltip.behaviour1": "Muestra _indicadores_ _con_ _colores_ correspondientes al _Nivel_ _de_ _Velocidad_ de un componente cinético colocado, así como _Impacto_ _de_ _Estrés_ y _Capacidad_ de los componentes individuales.",
 	"item.create.goggles.tooltip.condition2": "Al mirar el medidor",
 	"item.create.goggles.tooltip.behaviour2": "Muestra información detallada sobre la _velocidad_ o el _estrés_ de la red a la que está conectado el medidor.",
+	"item.create.goggles.tooltip.condition3": "UNLOCALIZED: When looking at fluid containers",
+	"item.create.goggles.tooltip.behaviour3": "UNLOCALIZED: Shows detailed information about the _Capacity_ of the block and any _Fluids_ stored within.",
 
 	"item.create.wrench.tooltip": "WRENCH",
 	"item.create.wrench.tooltip.summary": "Una herramienta útil para trabajar en artefactos cinéticos. Se puede utilizar para _Rotar,_ _Desmantelar_ y  _Configurar_ componentes.",

src/generated/resources/assets/create/lang/unfinished/fr_fr.json

@@ -1,5 +1,5 @@
 {
-	"_": "Missing Localizations: 686",
+
 
 	"_": "->------------------------]  Game Elements  [------------------------<-",
 
@@ -843,6 +843,15 @@
 	"create.gui.stressometer.no_rotation": "Pas de rotation",
 	"create.gui.contraptions.not_fast_enough": "Il semblerais que ce.t.te %1$s ne tourne _pas_ à la _vitesse_ _suffisante_.",
 	"create.gui.contraptions.network_overstressed": "UNLOCALIZED: It appears that this contraption is _overstressed_. Add more sources or _slow_ _down_ the components with a high _stress_ _impact_.",
+	"create.gui.stores_fluid.title": "UNLOCALIZED: Fluid Contained",
+	"create.gui.stores_fluid.effectsTitle": "UNLOCALIZED: Potion Effects",
+	"create.gui.stores_fluid.empty": "UNLOCALIZED: Empty",
+	"create.gui.input_tanks.title": "UNLOCALIZED: Input Tanks",
+	"create.gui.output_tanks.title": "UNLOCALIZED: Output Tanks",
+	"create.gui.tank.info_header": "UNLOCALIZED: Tank Information:",
+	"create.gui.spout.info_header": "UNLOCALIZED: Spout Information:",
+	"create.gui.drain.info_header": "UNLOCALIZED: Drain Information:",
+	"create.gui.basin.info_header": "UNLOCALIZED: Basin Information:",
 	"create.gui.adjustable_crate.title": "Caisse réglable",
 	"create.gui.adjustable_crate.storageSpace": "Espace de stockage",
 	"create.gui.stockpile_switch.title": "Commutateur de stockage",
@@ -1069,6 +1078,10 @@
 	"create.tooltip.stressImpact.medium": "Modéré",
 	"create.tooltip.stressImpact.high": "Elevé",
 	"create.tooltip.stressImpact.overstressed": "Surmené",
+	"create.tooltip.fluidFullness.low": "UNLOCALIZED: Low",
+	"create.tooltip.fluidFullness.medium": "UNLOCALIZED: Moderate",
+	"create.tooltip.fluidFullness.high": "UNLOCALIZED: High",
+	"create.tooltip.fluidFullness.full": "UNLOCALIZED: Full",
 	"create.tooltip.capacityProvided": "Capacité de stress: %1$s",
 	"create.tooltip.capacityProvided.low": "Petite",
 	"create.tooltip.capacityProvided.medium": "Moyenne",
@@ -1451,6 +1464,8 @@
 	"item.create.goggles.tooltip.behaviour1": "Affiche des _indicateurs_ _colorés_ correspondants au _niveau_ _de_ _vitesse_ d'un composant cinétique placé ainsi que _l'impact_ du _stress_ et la _capacité_ des composants individuels.",
 	"item.create.goggles.tooltip.condition2": "Quand vision portée sur une jauge",
 	"item.create.goggles.tooltip.behaviour2": "Affiche des informations détaillées sur la _vitesse_ ou le _stress_ du réseau auquel la jauge est connectée.",
+	"item.create.goggles.tooltip.condition3": "UNLOCALIZED: When looking at fluid containers",
+	"item.create.goggles.tooltip.behaviour3": "UNLOCALIZED: Shows detailed information about the _Capacity_ of the block and any _Fluids_ stored within.",
 
 	"item.create.wrench.tooltip": "CLÉ",
 	"item.create.wrench.tooltip.summary": "Un outil utile pour travailler sur les engins cinétiques. Peut être utilisé pour _tourner_, _démonter_ et _configurer_ les composants.",

src/generated/resources/assets/create/lang/unfinished/it_it.json

@@ -1,5 +1,5 @@
 {
-	"_": "Missing Localizations: 21",
+
 
 	"_": "->------------------------]  Game Elements  [------------------------<-",
 
@@ -843,6 +843,15 @@
 	"create.gui.stressometer.no_rotation": "Nessuna rotazione",
 	"create.gui.contraptions.not_fast_enough": "Sembra che questo %1$s _non_ stia girando con una _velocità_ _sufficiente_.",
 	"create.gui.contraptions.network_overstressed": "Sembra che questo marchingegno sia _sovraccarico_. Aggiungi più fonti o _rallenta_ i componenti con un forte _impatto_ _di_ _stress_.",
+	"create.gui.stores_fluid.title": "UNLOCALIZED: Fluid Contained",
+	"create.gui.stores_fluid.effectsTitle": "UNLOCALIZED: Potion Effects",
+	"create.gui.stores_fluid.empty": "UNLOCALIZED: Empty",
+	"create.gui.input_tanks.title": "UNLOCALIZED: Input Tanks",
+	"create.gui.output_tanks.title": "UNLOCALIZED: Output Tanks",
+	"create.gui.tank.info_header": "UNLOCALIZED: Tank Information:",
+	"create.gui.spout.info_header": "UNLOCALIZED: Spout Information:",
+	"create.gui.drain.info_header": "UNLOCALIZED: Drain Information:",
+	"create.gui.basin.info_header": "UNLOCALIZED: Basin Information:",
 	"create.gui.adjustable_crate.title": "Baule regolabile",
 	"create.gui.adjustable_crate.storageSpace": "Spazio di immagazzinamento",
 	"create.gui.stockpile_switch.title": "Interruttore accumulatore",
@@ -1069,6 +1078,10 @@
 	"create.tooltip.stressImpact.medium": "Moderato",
 	"create.tooltip.stressImpact.high": "Alto",
 	"create.tooltip.stressImpact.overstressed": "Sovrastressato",
+	"create.tooltip.fluidFullness.low": "UNLOCALIZED: Low",
+	"create.tooltip.fluidFullness.medium": "UNLOCALIZED: Moderate",
+	"create.tooltip.fluidFullness.high": "UNLOCALIZED: High",
+	"create.tooltip.fluidFullness.full": "UNLOCALIZED: Full",
 	"create.tooltip.capacityProvided": "Capacità dello stress: %1$s",
 	"create.tooltip.capacityProvided.low": "Piccola",
 	"create.tooltip.capacityProvided.medium": "Media",
@@ -1451,6 +1464,8 @@
 	"item.create.goggles.tooltip.behaviour1": "Mostra gli _indicatori_ _colorati_ corrispondenti al _livello_ _di_ _velocità_ di un componente cinetico posizionato, nonché all'_impatto_ _dello_ _stress_ e la capacità dei singoli componenti.",
 	"item.create.goggles.tooltip.condition2": "Quando si guarda il calibro",
 	"item.create.goggles.tooltip.behaviour2": "Mostra informazioni dettagliate sulla _velocità_ o lo _stress_ della rete a cui è collegato il misuratore.",
+	"item.create.goggles.tooltip.condition3": "UNLOCALIZED: When looking at fluid containers",
+	"item.create.goggles.tooltip.behaviour3": "UNLOCALIZED: Shows detailed information about the _Capacity_ of the block and any _Fluids_ stored within.",
 
 	"item.create.wrench.tooltip": "CHIAVE INGLESE",
 	"item.create.wrench.tooltip.summary": "Uno strumento utile per lavorare su congegni cinetici. Può essere usato per _ruotare_, _smontare_ e _configurare_ i componenti.",

src/generated/resources/assets/create/lang/unfinished/ja_jp.json

@@ -1,5 +1,5 @@
 {
-	"_": "Missing Localizations: 28",
+
 
 	"_": "->------------------------]  Game Elements  [------------------------<-",
 
@@ -843,6 +843,15 @@
 	"create.gui.stressometer.no_rotation": "回転なし",
 	"create.gui.contraptions.not_fast_enough": "この %1$s は_十分な_回転を_していない_ようです。",
 	"create.gui.contraptions.network_overstressed": "この仕掛けは_超過応力_のようです。さらに原動機を追加するか、_応力_の影響が大きい機械の速度を_下げて_ください。",
+	"create.gui.stores_fluid.title": "UNLOCALIZED: Fluid Contained",
+	"create.gui.stores_fluid.effectsTitle": "UNLOCALIZED: Potion Effects",
+	"create.gui.stores_fluid.empty": "UNLOCALIZED: Empty",
+	"create.gui.input_tanks.title": "UNLOCALIZED: Input Tanks",
+	"create.gui.output_tanks.title": "UNLOCALIZED: Output Tanks",
+	"create.gui.tank.info_header": "UNLOCALIZED: Tank Information:",
+	"create.gui.spout.info_header": "UNLOCALIZED: Spout Information:",
+	"create.gui.drain.info_header": "UNLOCALIZED: Drain Information:",
+	"create.gui.basin.info_header": "UNLOCALIZED: Basin Information:",
 	"create.gui.adjustable_crate.title": "可変クレート",
 	"create.gui.adjustable_crate.storageSpace": "収納スペース",
 	"create.gui.stockpile_switch.title": "在庫スイッチ",
@@ -1069,6 +1078,10 @@
 	"create.tooltip.stressImpact.medium": "中",
 	"create.tooltip.stressImpact.high": "高",
 	"create.tooltip.stressImpact.overstressed": "超過応力",
+	"create.tooltip.fluidFullness.low": "UNLOCALIZED: Low",
+	"create.tooltip.fluidFullness.medium": "UNLOCALIZED: Moderate",
+	"create.tooltip.fluidFullness.high": "UNLOCALIZED: High",
+	"create.tooltip.fluidFullness.full": "UNLOCALIZED: Full",
 	"create.tooltip.capacityProvided": "応力の容量: %1$s",
 	"create.tooltip.capacityProvided.low": "小",
 	"create.tooltip.capacityProvided.medium": "中",
@@ -1451,6 +1464,8 @@
 	"item.create.goggles.tooltip.behaviour1": "設置された機械の_速度レベル_および、_機械_の_応力の影響_と_容量_を_色付きのインジケーター_で表示します。",
 	"item.create.goggles.tooltip.condition2": "計器を見たとき",
 	"item.create.goggles.tooltip.behaviour2": "計器が接続されているネットワークの_速度_または_応力_に関する詳細情報を表示します。",
+	"item.create.goggles.tooltip.condition3": "UNLOCALIZED: When looking at fluid containers",
+	"item.create.goggles.tooltip.behaviour3": "UNLOCALIZED: Shows detailed information about the _Capacity_ of the block and any _Fluids_ stored within.",
 
 	"item.create.wrench.tooltip": "レンチ",
 	"item.create.wrench.tooltip.summary": "動的からくりに取り組むための便利なツール。コンポーネントの_回転_、_解体_、_設定_に使用できます。",

src/generated/resources/assets/create/lang/unfinished/ko_kr.json

@@ -1,5 +1,5 @@
 {
-	"_": "Missing Localizations: 75",
+
 
 	"_": "->------------------------]  Game Elements  [------------------------<-",
 
@@ -843,6 +843,15 @@
 	"create.gui.stressometer.no_rotation": "회전없음",
 	"create.gui.contraptions.not_fast_enough": "이 %1$s은(는) 작동하기에 _회전 속도_가 _부족합니다_",
 	"create.gui.contraptions.network_overstressed": "_과부하!_ _높은 피로도_ _용량_을 가진 발전기를 추가로 설치하거나 _장치 속도_를 _늦추세요_.",
+	"create.gui.stores_fluid.title": "UNLOCALIZED: Fluid Contained",
+	"create.gui.stores_fluid.effectsTitle": "UNLOCALIZED: Potion Effects",
+	"create.gui.stores_fluid.empty": "UNLOCALIZED: Empty",
+	"create.gui.input_tanks.title": "UNLOCALIZED: Input Tanks",
+	"create.gui.output_tanks.title": "UNLOCALIZED: Output Tanks",
+	"create.gui.tank.info_header": "UNLOCALIZED: Tank Information:",
+	"create.gui.spout.info_header": "UNLOCALIZED: Spout Information:",
+	"create.gui.drain.info_header": "UNLOCALIZED: Drain Information:",
+	"create.gui.basin.info_header": "UNLOCALIZED: Basin Information:",
 	"create.gui.adjustable_crate.title": "가변 창고 ",
 	"create.gui.adjustable_crate.storageSpace": "저장 공간",
 	"create.gui.stockpile_switch.title": "수량 스위치",
@@ -1069,6 +1078,10 @@
 	"create.tooltip.stressImpact.medium": "보통",
 	"create.tooltip.stressImpact.high": "높음",
 	"create.tooltip.stressImpact.overstressed": "과부하됨",
+	"create.tooltip.fluidFullness.low": "UNLOCALIZED: Low",
+	"create.tooltip.fluidFullness.medium": "UNLOCALIZED: Moderate",
+	"create.tooltip.fluidFullness.high": "UNLOCALIZED: High",
+	"create.tooltip.fluidFullness.full": "UNLOCALIZED: Full",
 	"create.tooltip.capacityProvided": "피로도 용량: %1$s",
 	"create.tooltip.capacityProvided.low": "적음",
 	"create.tooltip.capacityProvided.medium": "보통",
@@ -1451,6 +1464,8 @@
 	"item.create.goggles.tooltip.behaviour1": "해당 장치의 _속도_, _피로도_, _용량_을 레벨에 따라 에 따라 색상 UI를 보여줍니다.",
 	"item.create.goggles.tooltip.condition2": "계측기를 바라볼 때",
 	"item.create.goggles.tooltip.behaviour2": "계측기가 연결된 네트워크의 _속도_나 _스트레스_의 자세한 정보를 보여줍니다.",
+	"item.create.goggles.tooltip.condition3": "UNLOCALIZED: When looking at fluid containers",
+	"item.create.goggles.tooltip.behaviour3": "UNLOCALIZED: Shows detailed information about the _Capacity_ of the block and any _Fluids_ stored within.",
 
 	"item.create.wrench.tooltip": "WRENCH",
 	"item.create.wrench.tooltip.summary": "장치 구성에 유용한 도구입니다. 장치를 _회전_, _설정_, _해체_하는 데 쓰입니다.",

src/generated/resources/assets/create/lang/unfinished/nl_nl.json

@@ -1,5 +1,5 @@
 {
-	"_": "Missing Localizations: 1173",
+
 
 	"_": "->------------------------]  Game Elements  [------------------------<-",
 
@@ -843,6 +843,15 @@
 	"create.gui.stressometer.no_rotation": "UNLOCALIZED: No Rotation",
 	"create.gui.contraptions.not_fast_enough": "UNLOCALIZED: It appears that this %1$s is _not_ rotating with _enough_ _speed_.",
 	"create.gui.contraptions.network_overstressed": "UNLOCALIZED: It appears that this contraption is _overstressed_. Add more sources or _slow_ _down_ the components with a high _stress_ _impact_.",
+	"create.gui.stores_fluid.title": "UNLOCALIZED: Fluid Contained",
+	"create.gui.stores_fluid.effectsTitle": "UNLOCALIZED: Potion Effects",
+	"create.gui.stores_fluid.empty": "UNLOCALIZED: Empty",
+	"create.gui.input_tanks.title": "UNLOCALIZED: Input Tanks",
+	"create.gui.output_tanks.title": "UNLOCALIZED: Output Tanks",
+	"create.gui.tank.info_header": "UNLOCALIZED: Tank Information:",
+	"create.gui.spout.info_header": "UNLOCALIZED: Spout Information:",
+	"create.gui.drain.info_header": "UNLOCALIZED: Drain Information:",
+	"create.gui.basin.info_header": "UNLOCALIZED: Basin Information:",
 	"create.gui.adjustable_crate.title": "FlexKrat",
 	"create.gui.adjustable_crate.storageSpace": "Opslagruimte",
 	"create.gui.stockpile_switch.title": "Voorraad Schakelaar",
@@ -1069,6 +1078,10 @@
 	"create.tooltip.stressImpact.medium": "Gemiddeld",
 	"create.tooltip.stressImpact.high": "Hoog",
 	"create.tooltip.stressImpact.overstressed": "UNLOCALIZED: Overstressed",
+	"create.tooltip.fluidFullness.low": "UNLOCALIZED: Low",
+	"create.tooltip.fluidFullness.medium": "UNLOCALIZED: Moderate",
+	"create.tooltip.fluidFullness.high": "UNLOCALIZED: High",
+	"create.tooltip.fluidFullness.full": "UNLOCALIZED: Full",
 	"create.tooltip.capacityProvided": "Stress Capacity: %1$s",
 	"create.tooltip.capacityProvided.low": "Klein",
 	"create.tooltip.capacityProvided.medium": "Gemiddeld",
@@ -1451,6 +1464,8 @@
 	"item.create.goggles.tooltip.behaviour1": "Laat _gekleurde_ _indicaties_ zien die corresponderen met de _Snelheid_ van een geplaatst kinetisch onderdeel.",
 	"item.create.goggles.tooltip.condition2": "UNLOCALIZED: When looking at gauge",
 	"item.create.goggles.tooltip.behaviour2": "UNLOCALIZED: Shows detailed information about _Speed_ or _Stress_ of the network to which the gauge is connected.",
+	"item.create.goggles.tooltip.condition3": "UNLOCALIZED: When looking at fluid containers",
+	"item.create.goggles.tooltip.behaviour3": "UNLOCALIZED: Shows detailed information about the _Capacity_ of the block and any _Fluids_ stored within.",
 
 	"item.create.wrench.tooltip": "UNLOCALIZED: WRENCH",
 	"item.create.wrench.tooltip.summary": "UNLOCALIZED: A useful tool for working on kinetic contraptions. Can be used to _Rotate_, _Dismantle_ and to _Configure_ components.",

src/generated/resources/assets/create/lang/unfinished/pt_br.json

@@ -1,5 +1,5 @@
 {
-	"_": "Missing Localizations: 1239",
+
 
 	"_": "->------------------------]  Game Elements  [------------------------<-",
 
@@ -843,6 +843,15 @@
 	"create.gui.stressometer.no_rotation": "UNLOCALIZED: No Rotation",
 	"create.gui.contraptions.not_fast_enough": "UNLOCALIZED: It appears that this %1$s is _not_ rotating with _enough_ _speed_.",
 	"create.gui.contraptions.network_overstressed": "UNLOCALIZED: It appears that this contraption is _overstressed_. Add more sources or _slow_ _down_ the components with a high _stress_ _impact_.",
+	"create.gui.stores_fluid.title": "UNLOCALIZED: Fluid Contained",
+	"create.gui.stores_fluid.effectsTitle": "UNLOCALIZED: Potion Effects",
+	"create.gui.stores_fluid.empty": "UNLOCALIZED: Empty",
+	"create.gui.input_tanks.title": "UNLOCALIZED: Input Tanks",
+	"create.gui.output_tanks.title": "UNLOCALIZED: Output Tanks",
+	"create.gui.tank.info_header": "UNLOCALIZED: Tank Information:",
+	"create.gui.spout.info_header": "UNLOCALIZED: Spout Information:",
+	"create.gui.drain.info_header": "UNLOCALIZED: Drain Information:",
+	"create.gui.basin.info_header": "UNLOCALIZED: Basin Information:",
 	"create.gui.adjustable_crate.title": "adjustable_crate",
 	"create.gui.adjustable_crate.storageSpace": "Espaço de Armazenamento",
 	"create.gui.stockpile_switch.title": "Disjuntor de Armazenamento",
@@ -1069,6 +1078,10 @@
 	"create.tooltip.stressImpact.medium": "UNLOCALIZED: Moderate",
 	"create.tooltip.stressImpact.high": "UNLOCALIZED: High",
 	"create.tooltip.stressImpact.overstressed": "UNLOCALIZED: Overstressed",
+	"create.tooltip.fluidFullness.low": "UNLOCALIZED: Low",
+	"create.tooltip.fluidFullness.medium": "UNLOCALIZED: Moderate",
+	"create.tooltip.fluidFullness.high": "UNLOCALIZED: High",
+	"create.tooltip.fluidFullness.full": "UNLOCALIZED: Full",
 	"create.tooltip.capacityProvided": "UNLOCALIZED: Stress Capacity: %1$s",
 	"create.tooltip.capacityProvided.low": "UNLOCALIZED: Small",
 	"create.tooltip.capacityProvided.medium": "UNLOCALIZED: Medium",
@@ -1451,6 +1464,8 @@
 	"item.create.goggles.tooltip.behaviour1": "UNLOCALIZED: Shows _colored indicators_ corresponding to the _Speed Level_ of a placed kinetic component as well as _Stress Impact_ and _Capacity_ of individual components.",
 	"item.create.goggles.tooltip.condition2": "UNLOCALIZED: When looking at gauge",
 	"item.create.goggles.tooltip.behaviour2": "UNLOCALIZED: Shows detailed information about _Speed_ or _Stress_ of the network to which the gauge is connected.",
+	"item.create.goggles.tooltip.condition3": "UNLOCALIZED: When looking at fluid containers",
+	"item.create.goggles.tooltip.behaviour3": "UNLOCALIZED: Shows detailed information about the _Capacity_ of the block and any _Fluids_ stored within.",
 
 	"item.create.wrench.tooltip": "UNLOCALIZED: WRENCH",
 	"item.create.wrench.tooltip.summary": "UNLOCALIZED: A useful tool for working on kinetic contraptions. Can be used to _Rotate_, _Dismantle_ and to _Configure_ components.",

src/generated/resources/assets/create/lang/unfinished/ru_ru.json

@@ -1,5 +1,5 @@
 {
-	"_": "Missing Localizations: 25",
+
 
 	"_": "->------------------------]  Game Elements  [------------------------<-",
 
@@ -843,6 +843,15 @@
 	"create.gui.stressometer.no_rotation": "Нет вращения",
 	"create.gui.contraptions.not_fast_enough": "Похоже, что этот %1$s _не_ вращается с_достаточной_ _скоростью_.",
 	"create.gui.contraptions.network_overstressed": "Похоже, что эта штуковина _перегружена_. Добавьте больше источников или _замедлите_ _скорость_ компонентов с высоким _влиянием_ на _момент_.",
+	"create.gui.stores_fluid.title": "UNLOCALIZED: Fluid Contained",
+	"create.gui.stores_fluid.effectsTitle": "UNLOCALIZED: Potion Effects",
+	"create.gui.stores_fluid.empty": "UNLOCALIZED: Empty",
+	"create.gui.input_tanks.title": "UNLOCALIZED: Input Tanks",
+	"create.gui.output_tanks.title": "UNLOCALIZED: Output Tanks",
+	"create.gui.tank.info_header": "UNLOCALIZED: Tank Information:",
+	"create.gui.spout.info_header": "UNLOCALIZED: Spout Information:",
+	"create.gui.drain.info_header": "UNLOCALIZED: Drain Information:",
+	"create.gui.basin.info_header": "UNLOCALIZED: Basin Information:",
 	"create.gui.adjustable_crate.title": "Регулируемый ящик",
 	"create.gui.adjustable_crate.storageSpace": "Ёмкость",
 	"create.gui.stockpile_switch.title": "Настраиваемый компаратор",
@@ -1069,6 +1078,10 @@
 	"create.tooltip.stressImpact.medium": "Средний",
 	"create.tooltip.stressImpact.high": "Высокий",
 	"create.tooltip.stressImpact.overstressed": "Перегрузка",
+	"create.tooltip.fluidFullness.low": "UNLOCALIZED: Low",
+	"create.tooltip.fluidFullness.medium": "UNLOCALIZED: Moderate",
+	"create.tooltip.fluidFullness.high": "UNLOCALIZED: High",
+	"create.tooltip.fluidFullness.full": "UNLOCALIZED: Full",
 	"create.tooltip.capacityProvided": "Ёмкостный крутящий момент: %1$s",
 	"create.tooltip.capacityProvided.low": "Маленький",
 	"create.tooltip.capacityProvided.medium": "Средний",
@@ -1451,6 +1464,8 @@
 	"item.create.goggles.tooltip.behaviour1": "Показывает _цветные_ _индикаторы_, соответствующие _уровню_ _скорости_ размещённого кинетического компонента, а также воздействию момента и мощности отдельных компонентов.",
 	"item.create.goggles.tooltip.condition2": "При взгляде на датчик",
 	"item.create.goggles.tooltip.behaviour2": "Показывает подробную информацию о скорости или моменте сети, к которой подключён датчик.",
+	"item.create.goggles.tooltip.condition3": "UNLOCALIZED: When looking at fluid containers",
+	"item.create.goggles.tooltip.behaviour3": "UNLOCALIZED: Shows detailed information about the _Capacity_ of the block and any _Fluids_ stored within.",
 
 	"item.create.wrench.tooltip": "WRENCH",
 	"item.create.wrench.tooltip.summary": "Полезный _инструмент_ для работы с _кинетическими_ штуковинами. Может использоваться для _поворота_, _демонтажа_ и _настройки_ компонентов.",

src/generated/resources/assets/create/lang/unfinished/zh_cn.json

@@ -1,5 +1,5 @@
 {
-	"_": "Missing Localizations: 23",
+
 
 	"_": "->------------------------]  Game Elements  [------------------------<-",
 
@@ -843,6 +843,15 @@
 	"create.gui.stressometer.no_rotation": "无旋转",
 	"create.gui.contraptions.not_fast_enough": "显然%1$s没有达到足够的工作转速。",
 	"create.gui.contraptions.network_overstressed": "显然装置过载，减速网络中的高应力消耗装置或者添加更多的应力发生装置",
+	"create.gui.stores_fluid.title": "UNLOCALIZED: Fluid Contained",
+	"create.gui.stores_fluid.effectsTitle": "UNLOCALIZED: Potion Effects",
+	"create.gui.stores_fluid.empty": "UNLOCALIZED: Empty",
+	"create.gui.input_tanks.title": "UNLOCALIZED: Input Tanks",
+	"create.gui.output_tanks.title": "UNLOCALIZED: Output Tanks",
+	"create.gui.tank.info_header": "UNLOCALIZED: Tank Information:",
+	"create.gui.spout.info_header": "UNLOCALIZED: Spout Information:",
+	"create.gui.drain.info_header": "UNLOCALIZED: Drain Information:",
+	"create.gui.basin.info_header": "UNLOCALIZED: Basin Information:",
 	"create.gui.adjustable_crate.title": "板条箱",
 	"create.gui.adjustable_crate.storageSpace": "储存空间",
 	"create.gui.stockpile_switch.title": "储存开关",
@@ -1069,6 +1078,10 @@
 	"create.tooltip.stressImpact.medium": "中",
 	"create.tooltip.stressImpact.high": "高",
 	"create.tooltip.stressImpact.overstressed": "过载",
+	"create.tooltip.fluidFullness.low": "UNLOCALIZED: Low",
+	"create.tooltip.fluidFullness.medium": "UNLOCALIZED: Moderate",
+	"create.tooltip.fluidFullness.high": "UNLOCALIZED: High",
+	"create.tooltip.fluidFullness.full": "UNLOCALIZED: Full",
 	"create.tooltip.capacityProvided": "应力量：%1$s",
 	"create.tooltip.capacityProvided.low": "小",
 	"create.tooltip.capacityProvided.medium": "中",
@@ -1451,6 +1464,8 @@
 	"item.create.goggles.tooltip.behaviour1": "根据对应动力组件的_转速等级_，显示它的_颜色指示器_，也会显示这个组件的_应力影响_以及_应力量_。",
 	"item.create.goggles.tooltip.condition2": "当看向仪表时",
 	"item.create.goggles.tooltip.behaviour2": "将会显示与仪表相连的网络的_转速_、_应力_等详细信息。",
+	"item.create.goggles.tooltip.condition3": "UNLOCALIZED: When looking at fluid containers",
+	"item.create.goggles.tooltip.behaviour3": "UNLOCALIZED: Shows detailed information about the _Capacity_ of the block and any _Fluids_ stored within.",
 
 	"item.create.wrench.tooltip": "扳手",
 	"item.create.wrench.tooltip.summary": "操控动力组件的使用工具。可用于_旋转_，_拆除_以及_配置_组件。",

src/generated/resources/assets/create/lang/unfinished/zh_tw.json

@@ -1,5 +1,5 @@
 {
-	"_": "Missing Localizations: 28",
+
 
 	"_": "->------------------------]  Game Elements  [------------------------<-",
 
@@ -843,6 +843,15 @@
 	"create.gui.stressometer.no_rotation": "無旋轉",
 	"create.gui.contraptions.not_fast_enough": "看起來%1$s 沒有達到足夠的工作轉速。",
 	"create.gui.contraptions.network_overstressed": "裝置似乎過載，減少高動能消耗的裝置或者增加更多更多動能",
+	"create.gui.stores_fluid.title": "UNLOCALIZED: Fluid Contained",
+	"create.gui.stores_fluid.effectsTitle": "UNLOCALIZED: Potion Effects",
+	"create.gui.stores_fluid.empty": "UNLOCALIZED: Empty",
+	"create.gui.input_tanks.title": "UNLOCALIZED: Input Tanks",
+	"create.gui.output_tanks.title": "UNLOCALIZED: Output Tanks",
+	"create.gui.tank.info_header": "UNLOCALIZED: Tank Information:",
+	"create.gui.spout.info_header": "UNLOCALIZED: Spout Information:",
+	"create.gui.drain.info_header": "UNLOCALIZED: Drain Information:",
+	"create.gui.basin.info_header": "UNLOCALIZED: Basin Information:",
 	"create.gui.adjustable_crate.title": "板條箱",
 	"create.gui.adjustable_crate.storageSpace": "儲存空間",
 	"create.gui.stockpile_switch.title": "儲存開關",
@@ -1069,6 +1078,10 @@
 	"create.tooltip.stressImpact.medium": "中",
 	"create.tooltip.stressImpact.high": "高",
 	"create.tooltip.stressImpact.overstressed": "過載",
+	"create.tooltip.fluidFullness.low": "UNLOCALIZED: Low",
+	"create.tooltip.fluidFullness.medium": "UNLOCALIZED: Moderate",
+	"create.tooltip.fluidFullness.high": "UNLOCALIZED: High",
+	"create.tooltip.fluidFullness.full": "UNLOCALIZED: Full",
 	"create.tooltip.capacityProvided": "動能生產量:%1$s",
 	"create.tooltip.capacityProvided.low": "小",
 	"create.tooltip.capacityProvided.medium": "中",
@@ -1451,6 +1464,8 @@
 	"item.create.goggles.tooltip.behaviour1": "將會展示該機械元件的_速度_、_動能_等數值",
 	"item.create.goggles.tooltip.condition2": "當裝備後看向儀表時",
 	"item.create.goggles.tooltip.behaviour2": "將會展示該儀表所連接網路的_速度_、_動能_等數值。",
+	"item.create.goggles.tooltip.condition3": "UNLOCALIZED: When looking at fluid containers",
+	"item.create.goggles.tooltip.behaviour3": "UNLOCALIZED: Shows detailed information about the _Capacity_ of the block and any _Fluids_ stored within.",
 
 	"item.create.wrench.tooltip": "板手",
 	"item.create.wrench.tooltip.summary": "一種常用的工具，能夠調整_動能_的_方向_、_配置_等。",

src/main/java/com/simibubi/create/content/contraptions/fluids/FluidFullnessOverlay.java

@@ -0,0 +1,73 @@
+package com.simibubi.create.content.contraptions.fluids;
+
+import com.simibubi.create.AllFluids;
+import com.simibubi.create.content.contraptions.fluids.potion.PotionFluidHandler;
+import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation;
+import com.simibubi.create.foundation.item.ItemDescription;
+import com.simibubi.create.foundation.utility.Lang;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraftforge.fluids.FluidStack;
+
+
+//Currently only used for Tank/Drain/Spout/Basin goggle tooltips, as fullness-based replacement for the stress-based tooltips in IRotate
+public enum FluidFullnessOverlay {
+        LOW,
+        MEDIUM,
+        HIGH,
+        FULL;
+
+        public TextFormatting getAbsoluteColor() {
+            return this == LOW ? TextFormatting.YELLOW : this == MEDIUM ? TextFormatting.GOLD : TextFormatting.RED;
+        }
+
+        public TextFormatting getRelativeColor() {
+            return this == LOW ? TextFormatting.GREEN : this == MEDIUM ? TextFormatting.YELLOW : this == HIGH ? TextFormatting.GOLD : TextFormatting.RED;
+        }
+
+        public static FluidFullnessOverlay of(double fullnessPercent){
+            if (fullnessPercent >= 1) return FluidFullnessOverlay.FULL;
+            else if (fullnessPercent > .75d) return FluidFullnessOverlay.HIGH;
+            else if (fullnessPercent > .5d) return FluidFullnessOverlay.MEDIUM;
+            else return FluidFullnessOverlay.LOW;
+        }
+
+        public static String getFormattedFullnessText(double fullnessPercent){
+            FluidFullnessOverlay fullnessLevel = of(fullnessPercent);
+            TextFormatting color = fullnessLevel.getRelativeColor();
+            if (fullnessPercent == 0)
+                return TextFormatting.DARK_GRAY + ItemDescription.makeProgressBar(3, -1)
+                        + Lang.translate("gui.stores_fluid.empty");
+
+            String level = color + ItemDescription.makeProgressBar(3, Math.min(fullnessLevel.ordinal(), 2));
+            level += Lang.translate("tooltip.fluidFullness."+Lang.asId(fullnessLevel.name()));
+
+            level += String.format(" (%s%%) ", (int) (fullnessPercent * 100));
+
+            return level;
+        }
+
+        public static String getFormattedCapacityText(int amount, int capacity){
+            FluidFullnessOverlay fullnessLevel = of((double) amount / capacity);
+            TextFormatting color = fullnessLevel.getRelativeColor();
+
+            String mb = Lang.translate("generic.unit.millibuckets");
+            String capacityString = color + "%s" + mb + TextFormatting.GRAY + " / " + TextFormatting.DARK_GRAY + "%s" + mb;
+
+            if (amount == 0)
+                return TextFormatting.DARK_GRAY + IHaveGoggleInformation.format(capacity) + mb;
+
+            return String.format(capacityString, IHaveGoggleInformation.format(amount), IHaveGoggleInformation.format(capacity));
+        }
+
+        public static String getFormattedFluidTypeText(FluidStack fluid, double fullnessPercent){
+            FluidFullnessOverlay fullnessLevel = of(fullnessPercent);
+            TextFormatting color = fullnessLevel.getRelativeColor();
+
+            if (AllFluids.POTION.get().getFluid().isEquivalentTo(fluid.getFluid())) {
+                return color + PotionFluidHandler.getPotionName(fluid).getFormattedText();
+            } else {
+                return color + fluid.getDisplayName().getFormattedText();
+            }
+        }
+    }
+

src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainBlock.java

@@ -99,4 +99,19 @@ public class ItemDrainBlock extends Block implements IWrenchable, ITE<ItemDrainT
 		return ItemDrainTileEntity.class;
 	}
 
+	@Override
+	public boolean hasComparatorInputOverride(BlockState state) {
+		return true;
+	}
+
+	@Override
+	public int getComparatorInputOverride(BlockState blockState, World worldIn, BlockPos pos) {
+		TileEntity te = worldIn.getTileEntity(pos);
+		if (te == null)
+			return 0;
+		if (te instanceof ItemDrainTileEntity)
+			return ((ItemDrainTileEntity) te).getComparatorOutput();
+		return 0;
+	}
+
 }

src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainTileEntity.java

@@ -1,9 +1,15 @@
 package com.simibubi.create.content.contraptions.fluids.actors;
 
+import java.util.ArrayList;
 import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
+import com.simibubi.create.AllFluids;
+import com.simibubi.create.content.contraptions.fluids.FluidFullnessOverlay;
+import com.simibubi.create.content.contraptions.fluids.potion.PotionFluidHandler;
+import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation;
 import com.simibubi.create.content.contraptions.processing.EmptyingByBasin;
 import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
 import com.simibubi.create.foundation.advancement.AllTriggers;
@@ -12,6 +18,7 @@ import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour;
 import com.simibubi.create.foundation.tileEntity.behaviour.belt.DirectBeltInputBehaviour;
 import com.simibubi.create.foundation.tileEntity.behaviour.fluid.SmartFluidTankBehaviour;
 import com.simibubi.create.foundation.utility.Iterate;
+import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.Pair;
 import com.simibubi.create.foundation.utility.VecHelper;
 
@@ -22,20 +29,24 @@ import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction;
 import net.minecraftforge.items.ItemHandlerHelper;
 
-public class ItemDrainTileEntity extends SmartTileEntity {
+public class ItemDrainTileEntity extends SmartTileEntity implements IHaveGoggleInformation {
 
 	public static final int FILLING_TIME = 20;
 
 	SmartFluidTankBehaviour internalTank;
 	TransportedItemStack heldItem;
 	protected int processingTicks;
+	protected int lastRedstoneLevel;
 	Map<Direction, LazyOptional<ItemDrainItemHandler>> itemHandlers;
 
 	public ItemDrainTileEntity(TileEntityType<?> tileEntityTypeIn) {
@@ -90,6 +101,13 @@ public class ItemDrainTileEntity extends SmartTileEntity {
 	@Override
 	public void tick() {
 		super.tick();
+
+		if (lastRedstoneLevel != getComparatorOutput()) {
+			lastRedstoneLevel = getComparatorOutput();
+			if (world != null)
+				world.updateComparatorOutputLevel(getPos(), getBlockState().getBlock());
+		}
+
 		if (heldItem == null) {
 			processingTicks = 0;
 			return;
@@ -278,4 +296,43 @@ public class ItemDrainTileEntity extends SmartTileEntity {
 		return super.getCapability(cap, side);
 	}
 
+	public int getComparatorOutput() {
+		ItemDrainTileEntity te = this;
+		double fillFraction = (double) te.internalTank.getPrimaryHandler().getFluidAmount() / te.internalTank.getPrimaryHandler().getCapacity();
+		return MathHelper.floor(MathHelper.clamp(fillFraction * 14 + (fillFraction > 0 ? 1  : 0), 0, 15));
+	}
+
+	@Override
+	public boolean addToGoggleTooltip(List<String> tooltip, boolean isPlayerSneaking) {
+		ItemDrainTileEntity te = this;
+
+		int fluidAmount = te.internalTank.getPrimaryHandler().getFluidAmount();
+		int fluidCapacity = te.internalTank.getPrimaryHandler().getCapacity();
+		double fillFraction = (double) fluidAmount / fluidCapacity;
+		FluidStack fluidType = te.internalTank.getPrimaryHandler().getFluid();
+
+		tooltip.add(spacing + Lang.translate("gui.drain.info_header"));
+
+		if (isPlayerSneaking && AllFluids.POTION.get().getFluid().isEquivalentTo(fluidType.getFluid())) {
+			tooltip.add(spacing + TextFormatting.GRAY + Lang.translate("gui.stores_fluid.effectsTitle"));
+
+			ArrayList<ITextComponent> potionTooltip = new ArrayList<>();
+			PotionFluidHandler.addPotionTooltip(fluidType, potionTooltip, 1);
+			tooltip.addAll(2, potionTooltip.stream()
+					.map(c -> spacing + " " + c.getFormattedText())
+					.collect(Collectors.toList()));
+			return true;
+		}
+
+		tooltip.add(spacing + TextFormatting.GRAY + Lang.translate("gui.stores_fluid.title"));
+
+		if (fluidAmount != 0)
+			tooltip.add(spacing + " " + FluidFullnessOverlay.getFormattedFluidTypeText(fluidType, fillFraction));
+
+		tooltip.add(spacing + FluidFullnessOverlay.getFormattedFullnessText(fillFraction));
+		tooltip.add(spacing + " " + FluidFullnessOverlay.getFormattedCapacityText(fluidAmount, fluidCapacity));
+
+		return true;
+	}
+
 }

src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutBlock.java

@@ -11,6 +11,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.shapes.ISelectionContext;
 import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.world.IBlockReader;
+import net.minecraft.world.World;
 
 public class SpoutBlock extends Block implements IWrenchable {
 
@@ -34,4 +35,19 @@ public class SpoutBlock extends Block implements IWrenchable {
 		return AllTileEntities.SPOUT.create();
 	}
 
+	@Override
+	public boolean hasComparatorInputOverride(BlockState state) {
+		return true;
+	}
+
+	@Override
+	public int getComparatorInputOverride(BlockState blockState, World worldIn, BlockPos pos) {
+		TileEntity te = worldIn.getTileEntity(pos);
+		if (te == null)
+			return 0;
+		if (te instanceof SpoutTileEntity)
+			return ((SpoutTileEntity) te).getComparatorOutput();
+		return 0;
+	}
+
 }

src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutTileEntity.java

@@ -5,8 +5,13 @@ import static com.simibubi.create.foundation.tileEntity.behaviour.belt.BeltProce
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
+import com.simibubi.create.AllFluids;
+import com.simibubi.create.content.contraptions.fluids.FluidFullnessOverlay;
 import com.simibubi.create.content.contraptions.fluids.FluidFX;
+import com.simibubi.create.content.contraptions.fluids.potion.PotionFluidHandler;
+import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation;
 import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
 import com.simibubi.create.foundation.advancement.AllTriggers;
 import com.simibubi.create.foundation.tileEntity.SmartTileEntity;
@@ -16,6 +21,7 @@ import com.simibubi.create.foundation.tileEntity.behaviour.belt.BeltProcessingBe
 import com.simibubi.create.foundation.tileEntity.behaviour.belt.TransportedItemStackHandlerBehaviour;
 import com.simibubi.create.foundation.tileEntity.behaviour.belt.TransportedItemStackHandlerBehaviour.TransportedResult;
 import com.simibubi.create.foundation.tileEntity.behaviour.fluid.SmartFluidTankBehaviour;
+import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.VecHelper;
 
 import net.minecraft.item.ItemStack;
@@ -26,7 +32,10 @@ import net.minecraft.potion.PotionUtils;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.capabilities.Capability;
@@ -34,13 +43,14 @@ import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
 
-public class SpoutTileEntity extends SmartTileEntity {
+public class SpoutTileEntity extends SmartTileEntity implements IHaveGoggleInformation {
 
 	public static final int FILLING_TIME = 20;
 
 	protected BeltProcessingBehaviour beltProcessing;
 	protected int processingTicks;
 	protected boolean sendSplash;
+	protected int lastRedstoneLevel;
 
 	SmartFluidTankBehaviour tank;
 
@@ -168,6 +178,12 @@ public class SpoutTileEntity extends SmartTileEntity {
 		if (processingTicks >= 8 && world.isRemote)
 			spawnProcessingParticles(tank.getPrimaryTank()
 				.getRenderedFluid());
+
+		if (lastRedstoneLevel != getComparatorOutput()) {
+			lastRedstoneLevel = getComparatorOutput();
+			if (world != null)
+				world.updateComparatorOutputLevel(getPos(), getBlockState().getBlock());
+		}
 	}
 
 	protected void spawnProcessingParticles(FluidStack fluid) {
@@ -190,4 +206,43 @@ public class SpoutTileEntity extends SmartTileEntity {
 		}
 	}
 
+	public int getComparatorOutput() {
+		SpoutTileEntity te = this;
+		double fillFraction = (double) te.getCurrentFluidInTank().getAmount() / te.tank.getPrimaryHandler().getCapacity();
+		return MathHelper.floor(MathHelper.clamp(fillFraction * 14 + (fillFraction > 0 ? 1  : 0), 0, 15));
+	}
+
+	@Override
+	public boolean addToGoggleTooltip(List<String> tooltip, boolean isPlayerSneaking) {
+		SpoutTileEntity te = this;
+
+		int fluidAmount = te.tank.getPrimaryHandler().getFluidAmount();
+		int fluidCapacity = te.tank.getPrimaryHandler().getCapacity();
+		double fillFraction = (double) fluidAmount / fluidCapacity;
+		FluidStack fluidType = te.tank.getPrimaryHandler().getFluid();
+
+		tooltip.add(spacing + Lang.translate("gui.spout.info_header"));
+
+		if (isPlayerSneaking && AllFluids.POTION.get().getFluid().isEquivalentTo(fluidType.getFluid())) {
+			tooltip.add(spacing + TextFormatting.GRAY + Lang.translate("gui.stores_fluid.effectsTitle"));
+
+			ArrayList<ITextComponent> potionTooltip = new ArrayList<>();
+			PotionFluidHandler.addPotionTooltip(fluidType, potionTooltip, 1);
+			tooltip.addAll(2, potionTooltip.stream()
+					.map(c -> spacing + " " + c.getFormattedText())
+					.collect(Collectors.toList()));
+			return true;
+		}
+
+		tooltip.add(spacing + TextFormatting.GRAY + Lang.translate("gui.stores_fluid.title"));
+
+		if (fluidAmount != 0)
+			tooltip.add(spacing + " " + FluidFullnessOverlay.getFormattedFluidTypeText(fluidType, fillFraction));
+
+		tooltip.add(spacing + FluidFullnessOverlay.getFormattedFullnessText(fillFraction));
+		tooltip.add(spacing + " " + FluidFullnessOverlay.getFormattedCapacityText(fluidAmount, fluidCapacity));
+
+		return true;
+	}
+
 }

src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankBlock.java

@@ -310,4 +310,22 @@ public class FluidTankBlock extends Block implements IWrenchable, ITE<FluidTankT
 			return SILENCED_METAL;
 		return soundType;
 	}
+
+	@Override
+	public boolean hasComparatorInputOverride(BlockState state) {
+		return true;
+	}
+
+	@Override
+	public int getComparatorInputOverride(BlockState blockState, World worldIn, BlockPos pos) {
+		TileEntity te = worldIn.getTileEntity(pos);
+		if (te instanceof FluidTankTileEntity) {
+			FluidTankTileEntity fluidTankTileEntity = ((FluidTankTileEntity) te).getControllerTE();
+			if (fluidTankTileEntity == null)
+				return 0;
+			return fluidTankTileEntity.getComparatorOutput();
+		}
+		return 0;
+	}
+
 }

src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankTileEntity.java

@@ -2,17 +2,24 @@ package com.simibubi.create.content.contraptions.fluids.tank;
 
 import static java.lang.Math.abs;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import com.simibubi.create.AllFluids;
+import com.simibubi.create.content.contraptions.fluids.FluidFullnessOverlay;
+import com.simibubi.create.content.contraptions.fluids.potion.PotionFluidHandler;
 import com.simibubi.create.content.contraptions.fluids.tank.FluidTankBlock.Shape;
+import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation;
 import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.fluid.SmartFluidTank;
 import com.simibubi.create.foundation.gui.widgets.InterpolatedChasingValue;
 import com.simibubi.create.foundation.tileEntity.SmartTileEntity;
 import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour;
+import com.simibubi.create.foundation.utility.Lang;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.nbt.CompoundNBT;
@@ -22,6 +29,9 @@ import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.capabilities.Capability;
@@ -34,7 +44,7 @@ import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction;
 import net.minecraftforge.fluids.capability.templates.FluidTank;
 
-public class FluidTankTileEntity extends SmartTileEntity {
+public class FluidTankTileEntity extends SmartTileEntity implements IHaveGoggleInformation {
 
 	private static final int MAX_SIZE = 3;
 
@@ -48,6 +58,7 @@ public class FluidTankTileEntity extends SmartTileEntity {
 	protected int luminosity;
 	protected int width;
 	protected int height;
+	protected int lastRedstoneLevel;
 
 	private static final int SYNC_RATE = 8;
 	protected int syncCooldown;
@@ -101,6 +112,12 @@ public class FluidTankTileEntity extends SmartTileEntity {
 			updateConnectivity();
 		if (fluidLevel != null)
 			fluidLevel.tick();
+
+		if (lastRedstoneLevel != getComparatorOutput()) {
+			lastRedstoneLevel = getComparatorOutput();
+			if (world != null)
+				world.updateComparatorOutputLevel(getPos(), getBlockState().getBlock());
+		}
 	}
 
 	public boolean isController() {
@@ -312,6 +329,47 @@ public class FluidTankTileEntity extends SmartTileEntity {
 		return null;
 	}
 
+	public int getComparatorOutput() {
+		FluidTankTileEntity te = getControllerTE();
+		if (te == null)
+			return 0;
+		return MathHelper.floor(MathHelper.clamp(te.getFillState() * 14 + (te.getFillState() > 0 ? 1  : 0), 0, 15));
+	}
+
+	@Override
+	public boolean addToGoggleTooltip(List<String> tooltip, boolean isPlayerSneaking) {
+		FluidTankTileEntity controllerTE = getControllerTE();
+		if (controllerTE == null)
+			return false;
+		int fluidAmount = controllerTE.getTankInventory().getFluidAmount();
+		int fluidCapacity = controllerTE.getTankInventory().getCapacity();
+		double fillFraction = controllerTE.getFillState();
+		FluidStack fluidType = controllerTE.getTankInventory().getFluid();
+
+		tooltip.add(spacing + Lang.translate("gui.tank.info_header"));
+
+		if (isPlayerSneaking && AllFluids.POTION.get().getFluid().isEquivalentTo(fluidType.getFluid())) {
+			tooltip.add(spacing + TextFormatting.GRAY + Lang.translate("gui.stores_fluid.effectsTitle"));
+
+			ArrayList<ITextComponent> potionTooltip = new ArrayList<>();
+			PotionFluidHandler.addPotionTooltip(fluidType, potionTooltip, 1);
+			tooltip.addAll(2, potionTooltip.stream()
+					.map(c -> spacing + " " + c.getFormattedText())
+					.collect(Collectors.toList()));
+			return true;
+		}
+
+		tooltip.add(spacing + TextFormatting.GRAY + Lang.translate("gui.stores_fluid.title"));
+
+		if (fluidAmount != 0)
+			tooltip.add(spacing + " " + FluidFullnessOverlay.getFormattedFluidTypeText(fluidType, fillFraction));
+
+		tooltip.add(spacing + FluidFullnessOverlay.getFormattedFullnessText(fillFraction));
+		tooltip.add(spacing + " " + FluidFullnessOverlay.getFormattedCapacityText(fluidAmount, fluidCapacity));
+
+		return true;
+	}
+
 	@Override
 	protected void read(CompoundNBT compound, boolean clientPacket) {
 		super.read(compound, clientPacket);

src/main/java/com/simibubi/create/content/contraptions/processing/BasinTileEntity.java

@@ -9,11 +9,15 @@ import java.util.Random;
 
 import javax.annotation.Nonnull;
 
+import com.simibubi.create.AllFluids;
 import com.simibubi.create.AllParticleTypes;
 import com.simibubi.create.AllTags;
+import com.simibubi.create.content.contraptions.fluids.FluidFullnessOverlay;
 import com.simibubi.create.content.contraptions.components.mixer.MechanicalMixerTileEntity;
 import com.simibubi.create.content.contraptions.fluids.FluidFX;
 import com.simibubi.create.content.contraptions.fluids.particle.FluidParticleData;
+import com.simibubi.create.content.contraptions.fluids.potion.PotionFluidHandler;
+import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation;
 import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock;
 import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock.HeatLevel;
 import com.simibubi.create.foundation.fluid.CombinedTankWrapper;
@@ -25,14 +29,8 @@ import com.simibubi.create.foundation.tileEntity.behaviour.belt.DirectBeltInputB
 import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour;
 import com.simibubi.create.foundation.tileEntity.behaviour.fluid.SmartFluidTankBehaviour;
 import com.simibubi.create.foundation.tileEntity.behaviour.fluid.SmartFluidTankBehaviour.TankSegment;
-import com.simibubi.create.foundation.utility.AnimationTickHolder;
+import com.simibubi.create.foundation.utility.*;
-import com.simibubi.create.foundation.utility.Couple;
-import com.simibubi.create.foundation.utility.IntAttached;
-import com.simibubi.create.foundation.utility.Iterate;
-import com.simibubi.create.foundation.utility.LerpedFloat;
 import com.simibubi.create.foundation.utility.LerpedFloat.Chaser;
-import com.simibubi.create.foundation.utility.NBTHelper;
-import com.simibubi.create.foundation.utility.VecHelper;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
@@ -48,6 +46,7 @@ import net.minecraft.util.Direction.Axis;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.capabilities.Capability;
@@ -63,7 +62,7 @@ import net.minecraftforge.items.IItemHandlerModifiable;
 import net.minecraftforge.items.ItemHandlerHelper;
 import net.minecraftforge.items.wrapper.CombinedInvWrapper;
 
-public class BasinTileEntity extends SmartTileEntity {
+public class BasinTileEntity extends SmartTileEntity implements IHaveGoggleInformation {
 
 	private boolean areFluidsMoving;
 	LerpedFloat ingredientRotationSpeed;
@@ -600,6 +599,66 @@ public class BasinTileEntity extends SmartTileEntity {
 		return areFluidsMoving;
 	}
 
+	@Override
+	public boolean addToGoggleTooltip(List<String> tooltip, boolean isPlayerSneaking) {
+
+		tooltip.add(spacing + Lang.translate("gui.basin.info_header"));
+
+		tooltip.add(spacing + TextFormatting.GRAY + Lang.translate("gui.input_tanks.title"));
+
+		String mb = Lang.translate("generic.unit.millibuckets");
+
+		LazyOptional<IFluidHandler> capability = this.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY);
+		IFluidHandler tank = capability.orElse(null);
+
+		if (tank == null)
+			return false;
+
+		for (int i = 0; i < tank.getTanks(); i += 2) {
+			Couple<FluidStack> fluids = Couple.create(tank.getFluidInTank(i), tank.getFluidInTank(i + 1));
+
+			if (i > 1)
+				tooltip.add(spacing + TextFormatting.GRAY + Lang.translate("gui.output_tanks.title"));
+
+			if (fluids.getFirst().getAmount() == 0 && fluids.getSecond().getAmount() == 0) {
+				tooltip.add(spacing + " " + TextFormatting.DARK_GRAY + "2x0" + mb);
+				continue;
+			}
+
+			for (FluidStack fluid : fluids) {
+				String fluidName;
+
+				if (fluid.getAmount() == 0) {
+					tooltip.add(spacing + " " + TextFormatting.DARK_GRAY + IHaveGoggleInformation.format(0) + mb);
+				} else {
+					if (AllFluids.POTION.get().getFluid().isEquivalentTo(fluid.getFluid())) {
+						fluidName = PotionFluidHandler.getPotionName(fluid).getFormattedText();
+					} else {
+						fluidName = fluid.getDisplayName().getFormattedText();
+					}
+					double fillFraction = (double) fluid.getAmount() / (double) this.inputTank.getPrimaryHandler().getCapacity();
+					if (fluidName.length() > 15) {
+						tooltip.add(spacing + " " + FluidFullnessOverlay.of(fillFraction).getRelativeColor()
+								+ fluidName);
+						tooltip.add(spacing + " " + FluidFullnessOverlay.of(fillFraction).getRelativeColor()
+								+ IHaveGoggleInformation.format(fluid.getAmount()) + mb);
+						continue;
+					}
+
+					tooltip.add(spacing + " " + FluidFullnessOverlay.of(fillFraction).getRelativeColor()
+							+ fluidName + " "
+							+ IHaveGoggleInformation.format(fluid.getAmount()) + mb);
+
+				}
+			}
+
+
+
+
+		}
+		return true;
+	}
+
 	class BasinValueBox extends ValueBoxTransform.Sided {
 
 		@Override

src/main/resources/assets/create/lang/default/messages.json

@@ -191,6 +191,16 @@
 	"create.gui.contraptions.not_fast_enough": "It appears that this %1$s is _not_ rotating with _enough_ _speed_.",
 	"create.gui.contraptions.network_overstressed": "It appears that this contraption is _overstressed_. Add more sources or _slow_ _down_ the components with a high _stress_ _impact_.",
 
+	"create.gui.stores_fluid.title": "Fluid Contained",
+	"create.gui.stores_fluid.effectsTitle": "Potion Effects",
+	"create.gui.stores_fluid.empty": "Empty",
+	"create.gui.input_tanks.title": "Input Tanks",
+	"create.gui.output_tanks.title": "Output Tanks",
+	"create.gui.tank.info_header": "Tank Information:",
+	"create.gui.spout.info_header": "Spout Information:",
+	"create.gui.drain.info_header": "Drain Information:",
+	"create.gui.basin.info_header": "Basin Information:",
+
 	"create.gui.adjustable_crate.title": "Adjustable Crate",
 	"create.gui.adjustable_crate.storageSpace": "Storage Space",
 
@@ -428,6 +438,11 @@
 	"create.tooltip.stressImpact.high": "High",
 	"create.tooltip.stressImpact.overstressed": "Overstressed",
 
+	"create.tooltip.fluidFullness.low": "Low",
+	"create.tooltip.fluidFullness.medium": "Moderate",
+	"create.tooltip.fluidFullness.high": "High",
+	"create.tooltip.fluidFullness.full": "Full",
+
 	"create.tooltip.capacityProvided": "Stress Capacity: %1$s",
 	"create.tooltip.capacityProvided.low": "Small",
 	"create.tooltip.capacityProvided.medium": "Medium",

src/main/resources/assets/create/lang/default/tooltips.json

@@ -301,6 +301,8 @@
 	"item.create.goggles.tooltip.behaviour1": "Shows _colored indicators_ corresponding to the _Speed Level_ of a placed kinetic component as well as _Stress Impact_ and _Capacity_ of individual components.",
 	"item.create.goggles.tooltip.condition2": "When looking at gauge",
 	"item.create.goggles.tooltip.behaviour2": "Shows detailed information about _Speed_ or _Stress_ of the network to which the gauge is connected.",
+	"item.create.goggles.tooltip.condition3": "When looking at fluid containers",
+	"item.create.goggles.tooltip.behaviour3": "Shows detailed information about the _Capacity_ of the block and any _Fluids_ stored within.",
 	
 	"item.create.wrench.tooltip": "WRENCH",
 	"item.create.wrench.tooltip.summary": "A useful tool for working on kinetic contraptions. Can be used to _Rotate_, _Dismantle_ and to _Configure_ components.",