aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources/assets
diff options
context:
space:
mode:
authorNotAPenguin <michiel.vandeginste@gmail.com>2024-08-03 23:21:44 +0200
committerGitHub <noreply@github.com>2024-08-03 23:21:44 +0200
commitb65ace37de4f585b8089ad413ee877b792da11ca (patch)
tree2e0445785c5008df15151f729da148fb70dbc21d /src/main/resources/assets
parente180e49fc6305f71b1f1b18141b946f794a7012b (diff)
downloadGT5-Unofficial-b65ace37de4f585b8089ad413ee877b792da11ca.tar.gz
GT5-Unofficial-b65ace37de4f585b8089ad413ee877b792da11ca.tar.bz2
GT5-Unofficial-b65ace37de4f585b8089ad413ee877b792da11ca.zip
Waterline rework (#2577)
* Add barebones PurificationPlant class * Make simple 3x3 structure to form purification plant * Add base purification unit class and dummy sifter unit MTE * Make sifter unit form * Fix accidental wildcard import * Implement basic linking of units to controller using data stick * Make linking more robust, save bidirectional links, add scanner output * add linking range, error message and unregister old controller when re-linking * Add link status of purification units to waila body * Disable maintenance issues on purification plant units * spotless * Check structure of linked purification units in main controller * Remove all star imports * Small refactor to avoid updating status from main controller * spotless * Attempt to document current code * Convert some comments to javadoc * Implement basic processing cycle, sync it with linked purification units * Make water purification plant drain power * Calculate power drain from active units and remove controller power drain * spotless * Add very barebones recipemap * Fix recipemap name in lang file * spotless * Fix purification unit recipemap name * spotless * more sane amount of max fluid outputs * add some item outputs to sifter unit * Very simple recipe processing, may be buggy * spotless * Implement recipe failure * Implement void protection for purification units * spotless * buff item output odds slightly * Add WIP grade 1 structure * spotless * Store base success chance in recipe metadata and display it in NEI * Fill sifter plant with water * Add comment * Allow construction sifter unit in survival * Implement water boost * Fix water boost allowing output chance to go over 100% * Implement failed recipes outputting lower tier water * Fix typo * Fix deformed purification unit still drawing power * Slightly refactor recipe check so base class can read result * Create empty ModularUI container for purification plant * The great gui struggle part 1 * More gui struggles, we have a button now * Adjust button text and size * gui wars: the rise of the sync * gui wars: a new hope * fix the sync * is pengu old enough to know exceeder? * Fix being able to link the same unit multiple times * Sync status string to client * Sign sifter with my name * Show status somewhat properly * Adjust sifter base chance and structure * Fully implement sifter unit * More tooltip refactoring * Add structure info to sifter tooltip. * nitpicking tooltips * Adding sound to Purification Plant Main Unit. * fix star imports * Add basic coagulator unit, add recipemap for it * Write coagulator tooltip * comma nitpicking * more tooltip work * small refactor to purification plant controller * start work on custom recipemap frontend * Fully implement coagulator * Update structure requirements in tooltips * Move controller text in structure tooltips to be consistent * fix NPE on world load * Add base ph adjustment unit MTE * Add info to main controller and energy hatch check * Fixing tooltip of Main Controller & Energy/Exotic Hatch check. * Create full pH adjustment structure * disallow any voiding on purification unit * Small custom RecipeMap frontend for ph adjustment * Generate random initial pH value * Implement inserting NaOH and HCl to adjust pH * Add easter egg * Implement pH sensor hatch * Properly consume HCl and round pH value to 2 digits * Write ph adjustment unit tooltip * Tooltip nitpicking * Try to fix some structurelib hints * More trying to fix hints * Add industrial strength concrete casing block * Add water loop sound to the game * Document random initial pH in tooltip * Add glass material base * Fix spotless formatting in Textures docs because I cannot take it anymore * Add glass texture * Try adding transparent glass * Transparent glass working * Create pH resistant glass and update pH structure to use it * Create full structure for main purification plant * Create custom water purification casing block * Properly balance ferrous wastewater reprocessing and reduce input by a factor 10 * Add pH factor to NEI tooltip and fix coagulator structure * Structure tooltip for Purification Plant base * Add GT_Block_Glass2 and properly set maxMeta * Add Tinted Industrial Glass blocks * Fix BlockCasing9 not showing custom tooltip * Register tinted glass as EV glass * Add sterile water plant casing and revert tooltip change * Mention required water in sifter tooltip * Add more textures and casings * Add more textures, sounds and add structure info for pH adjustment * Rename sifter unit to clarifier * Rename coagulation unit to flocculation unit * Add activated carbon line * Fix unintended activated carbon recipe * Add activated carbon filter * Add polyaluminium chloride + solution * Add new custom textures by @BlueHero233 * Wip recipe page with new background for flocculation * Fix flocculation background image mostly * Finally aligned the slots * angery mumbles * Finish flocculation recipe page * All the recipe pages! * Add new reworked textures * Fix ph adjustment being t3 instead of t4 * Fix invisible casing * apply chembalance to polyaluminium chloride properly * Fix ferrous wastewater -> flocculation waste liquid * Move flocculation to grade 3 * create ozonation unit with placeholder blocks * add new blocks for ozonation with placeholder textures * Add water to ozonation structure * Create ozone gas material * Add ozone recipe * Add textures for ozone unit * Add sound loop for ozonation * fix * implement ozonation mechanics * Finalize ozonation tooltip * Create dummy plasma heater multi * Update textures for plasma heater * Add grade 5 recipemap * Add hatches to plasma heater multi * Add basic plasma heating unit variables * Implement plasma heating unit mechanics * Add plasma heater tooltip * Add structure info to plasma heater tooltip * fix ozonation tooltip, add frontend * Fix positioning on ozonation tooltip and fix plasma heater crash * Add UV treatment MTE and structure without textures * Revert accidental addition of debug dependencies * Add initial version of uv unit textures * update naquadria casing, add water color gradient * Some minor cleanup and added docs * Create lens housing bus * Add lens bus to UV treatment unit * Add lens indicator hatch * Merge GT_MetaGeneratedItem_03.java * Add lens indicator hatch * Add the lens cycle, uv treatment recipe map and fix eut of flocculation recipe * Implement lens swapping mechanic * Clean up first lens swap * Fix uv recipemap lang and move lens cycle to recipe * Write uv treatment tooltip * Add sounds for uv and plasma steps * Create empty degasifier class * Create temporary debug structure for degasifier * set temp casing index for degasifier * create degasifier control hatch * create slightly less temporary but still temporary structure for degasifier * Start impl of degasifier * fix fluid consumption and nbt loading of degasifier * Degasifier implementation should work now * Rename and reformat some things and start work on degasser tooltiop * give last bit much lower chance of being on to avoid cheesing * Finish degasifier tooltip * Integrate some deleno lore * hopefully fix all moved casing meta ids after merge * Create finalized degasser structure * Integrate more deleno lore * Add even more lore * Create placeholder particle catalysts and fetch particle items from gt++ * Fix wrong casing and recipemap localization * Create parallel config menu * refactor purification recipecheck slightly * implement parallel amount on water i/o and power * add tooltip info about parallel config * fix text * update block names in structure tooltips * create structure tooltip for degasser * create textureless quark catalyst items * add the purple glass * fix lore typos * fix some casing indices * remove concrete floor from water plant and reword tooltip * fix main plant structure and add placeholder structure for t8 step * fix structurecheck for main plant and add random catalyst generation for t8 * implement basic mechanics for particle extractor (wip) * Create plasma heater frontend * implement final mechanics and bugfixes for particle extractor * add recipes for re-aligning quark catalysts * add simple recipes for catalyst alignment * initial replacement of purified water in engraver recipes * add purified water to all wafer cutting recipes * fix purified water amounts * buff quark cyclotron recipe again * extract t8 unit casings into their own icons * Write initial tooltip for t8 module * add purified water to mask recipes * Add recipe comparator to show low tier purified water recipes first * add min casing check to waterline multis * buff ozone production * update t8 structure * make purified water optional again for naq wafers * Fix blockrenderer for purification plant * fix nei previews * fix nei * really fix nei this time * add t8 lore * fix hatch recipe locking blocking automation on some steps * try to solve weirdness with grade 3 recipe * fix issues with recipecheck * fix missing null check * make ph sensor use a strict inequality check * fix min casings on t5 * significantly nerf purified water usage for beamline masks * disable void protection for waterline * small adjustments to t6 unit * more small adjustments to t6 unit to prevent easy automation cheese * fix degasser redstone output and missing return statement * remove water QFT catalyst recipes --------- Co-authored-by: Tianyou Mei <meitianyou94@gmail.com> Co-authored-by: OlliedeLeeuw <ollie.riemersma@xs4all.nl> Co-authored-by: Ollie_de_Leeuw <154506304+OlliedeLeeuw@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/resources/assets')
-rw-r--r--src/main/resources/assets/gregtech/lang/en_US.lang25
-rw-r--r--src/main/resources/assets/gregtech/sounds.json53
-rw-r--r--src/main/resources/assets/gregtech/sounds/PurificationCoagulationLoop.oggbin0 -> 1109211 bytes
-rw-r--r--src/main/resources/assets/gregtech/sounds/PurificationOzonationLoop.oggbin0 -> 311674 bytes
-rw-r--r--src/main/resources/assets/gregtech/sounds/PurificationPhLoop.oggbin0 -> 624417 bytes
-rw-r--r--src/main/resources/assets/gregtech/sounds/PurificationPlantLoop.oggbin0 -> 421914 bytes
-rw-r--r--src/main/resources/assets/gregtech/sounds/PurificationPlasmaLoop.oggbin0 -> 474179 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_CONTAINMENT_CASING.pngbin0 -> 1147 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.pngbin0 -> 4286 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_RELEASE_CHAMBER.pngbin0 -> 1166 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/CLARIFIER_CONTROLLER_CASING.pngbin0 -> 684 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_PH_RESISTANT.pngbin0 -> 545 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_QUARK_CONTAINMENT.pngbin0 -> 1227 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_BLACK.pngbin0 -> 144 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_GRAY.pngbin0 -> 144 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_LIGHT_GRAY.pngbin0 -> 144 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_WHITE.pngbin0 -> 145 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/INDUSTRIAL_STRENGTH_CONCRETE.pngbin0 -> 1058 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXTREME_CORROSION_RESISTANT.pngbin0 -> 593 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FLOCCULATION.pngbin0 -> 640 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_HIGH_PRESSURE_RESISTANT.pngbin0 -> 705 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_INDUSTRIAL_WATER_PLANT.pngbin0 -> 631 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_NAQUADAH_REINFORCED_WATER_PLANT.pngbin0 -> 678 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_OZONE.pngbin0 -> 666 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_PLASMA_HEATER.pngbin0 -> 680 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/NAQUADRIA_REINFORCED_WATER_PLANT_CASING.pngbin0 -> 683 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_COATED_UV_RESISTANT_GLASS.pngbin0 -> 655 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/OMNI_PURPOSE_INFINITY_FUSED_GLASS.pngbin0 -> 661 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_PH_SENSOR.pngbin0 -> 1711 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_PH_SENSOR_GLOW.pngbin0 -> 1702 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/UV_BACKLIGHT_STERILIZER_CASING.pngbin0 -> 747 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/WATER_PLANT_CONCRETE_CASING.pngbin0 -> 572 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/background/flocculation_recipe.pngbin0 -> 788 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/progressbar/clarifier.pngbin0 -> 8801 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/progressbar/flocculation.pngbin0 -> 11157 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/progressbar/ozonation.pngbin0 -> 7609 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/progressbar/phneutralization.pngbin0 -> 910 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/progressbar/water_plasma_heater.pngbin0 -> 2363 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/233.pngbin0 -> 608 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/234.pngbin0 -> 471 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/235.pngbin0 -> 512 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/236.pngbin0 -> 512 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/237.pngbin0 -> 450 bytes
44 files changed, 75 insertions, 8 deletions
diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang
index e764d6128b..c24d8dd8a6 100644
--- a/src/main/resources/assets/gregtech/lang/en_US.lang
+++ b/src/main/resources/assets/gregtech/lang/en_US.lang
@@ -230,6 +230,14 @@ gt.recipe.largeboilerfakefuels=Large Boiler
gt.recipe.nanoforge=Nano Forge
gt.recipe.pcbfactory=PCB Factory
gt.recipe.ic2nuke=Nuclear Fission
+gt.recipe.purificationplantclarifier=Clarifier
+gt.recipe.purificationplantflocculation=Flocculation
+gt.recipe.purificationplantphadjustment=pH Neutralization
+gt.recipe.purificationplantozonation=Ozonation
+gt.recipe.purificationplantplasmaheating=Temperature Fluctuation
+gt.recipe.purificationplantuvtreatment=High Energy Laser Treatment
+gt.recipe.purificationplantdegasifier=Degassing
+gt.recipe.purificationplantquarkextractor=Baryonic Perfection
# Recipe categories
gt.recipe.category.arc_furnace_recycling=Arc Furnace Recycling
@@ -538,14 +546,15 @@ GT5U.gui.text.drone_operating=§aDrone operating normally!
GT5U.gui.text.drone_title=Drone Control Centre
GT5U.gui.text.drone_custom_name=Custom Machine Name
GT5U.gui.text.drone_search=Search machine name
-GT5U.gui.text.out_of_fluid=§cNo following fluids supplied: §b%s§f x §6%s L
-GT5U.gui.text.out_of_item=§cNo following items supplied: §b%s§f x §6%s
-GT5U.gui.text.out_of_stuff=§cNo following stuffs supplied: §b%s§f x §6%s
-GT5U.gui.text.power_loss=§cShut down due to power loss.
-GT5U.gui.text.pollution_fail=§cFailed to output the pollution.
-GT5U.gui.text.structure_incomplete=§7Shut down due to incomplete structure.
-GT5U.gui.text.no_repair=§7Shut down due to machine damage.
-GT5U.gui.text.no_machine_part=§7No correct machine part in controller slot.
+GT5U.gui.text.out_of_fluid=§4No following fluids supplied: §b%s§f x §6%s L
+GT5U.gui.text.out_of_item=§4No following items supplied: §b%s§f x §6%s
+GT5U.gui.text.out_of_stuff=§4No following stuffs supplied: §b%s§f x §6%s
+GT5U.gui.text.power_loss=§4Shut down due to power loss.
+GT5U.gui.text.pollution_fail=§4Failed to output the pollution.
+GT5U.gui.text.structure_incomplete=§4Shut down due to incomplete structure.
+GT5U.gui.text.no_repair=§4Shut down due to machine damage.
+GT5U.gui.text.no_machine_part=No correct machine part in controller slot.
+GT5U.gui.text.ph_sensor=pH threshold
GT5U.item.programmed_circuit.select.header=Reprogram Circuit
diff --git a/src/main/resources/assets/gregtech/sounds.json b/src/main/resources/assets/gregtech/sounds.json
index 06245db1a1..2d33d116da 100644
--- a/src/main/resources/assets/gregtech/sounds.json
+++ b/src/main/resources/assets/gregtech/sounds.json
@@ -70,5 +70,58 @@
"stream": false
}
]
+ },
+ "machines.PurificationPlantLoop": {
+ "category": "block",
+ "sounds": [
+ {
+ "name": "PurificationPlantLoop",
+ "stream": false
+ }
+ ]
+ },
+ "machines.PurificationPhLoop": {
+ "category": "block",
+ "sounds": [
+ {
+ "name": "PurificationPhLoop",
+ "stream": false
+ }
+ ]
+ },
+ "machines.PurificationCoagulationLoop": {
+ "category": "block",
+ "sounds": [
+ {
+ "name": "PurificationCoagulationLoop",
+ "stream": false
+ }
+ ]
+ },
+ "machines.PurificationOzonationLoop": {
+ "category": "block",
+ "sounds": [
+ {
+ "name": "PurificationOzonationLoop",
+ "stream": false,
+ "licensing": {
+ "sound_url": "https://freesound.org/people/MattJ99/sounds/66787/",
+ "sound_name": "bubbling02.wav",
+ "author_url": "https://freesound.org/people/MattJ99/",
+ "author_name": "MattJ99",
+ "license_url": "http://creativecommons.org/licenses/by/3.0/",
+ "license_name": "Attribution 3.0"
+ }
+ }
+ ]
+ },
+ "machines.PurificationPlasmaLoop": {
+ "category": "block",
+ "sounds": [
+ {
+ "name": "PurificationPlasmaLoop",
+ "stream": false
+ }
+ ]
}
}
diff --git a/src/main/resources/assets/gregtech/sounds/PurificationCoagulationLoop.ogg b/src/main/resources/assets/gregtech/sounds/PurificationCoagulationLoop.ogg
new file mode 100644
index 0000000000..923c1eb2e8
--- /dev/null
+++ b/src/main/resources/assets/gregtech/sounds/PurificationCoagulationLoop.ogg
Binary files differ
diff --git a/src/main/resources/assets/gregtech/sounds/PurificationOzonationLoop.ogg b/src/main/resources/assets/gregtech/sounds/PurificationOzonationLoop.ogg
new file mode 100644
index 0000000000..5aaee8983e
--- /dev/null
+++ b/src/main/resources/assets/gregtech/sounds/PurificationOzonationLoop.ogg
Binary files differ
diff --git a/src/main/resources/assets/gregtech/sounds/PurificationPhLoop.ogg b/src/main/resources/assets/gregtech/sounds/PurificationPhLoop.ogg
new file mode 100644
index 0000000000..4d40d014c0
--- /dev/null
+++ b/src/main/resources/assets/gregtech/sounds/PurificationPhLoop.ogg
Binary files differ
diff --git a/src/main/resources/assets/gregtech/sounds/PurificationPlantLoop.ogg b/src/main/resources/assets/gregtech/sounds/PurificationPlantLoop.ogg
new file mode 100644
index 0000000000..9bdb5e991a
--- /dev/null
+++ b/src/main/resources/assets/gregtech/sounds/PurificationPlantLoop.ogg
Binary files differ
diff --git a/src/main/resources/assets/gregtech/sounds/PurificationPlasmaLoop.ogg b/src/main/resources/assets/gregtech/sounds/PurificationPlasmaLoop.ogg
new file mode 100644
index 0000000000..9650414b24
--- /dev/null
+++ b/src/main/resources/assets/gregtech/sounds/PurificationPlasmaLoop.ogg
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_CONTAINMENT_CASING.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_CONTAINMENT_CASING.png
new file mode 100644
index 0000000000..3116b8973c
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_CONTAINMENT_CASING.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png
new file mode 100644
index 0000000000..2686522d15
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png.mcmeta
new file mode 100644
index 0000000000..60af678259
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation":{
+ "frametime":4
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_RELEASE_CHAMBER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_RELEASE_CHAMBER.png
new file mode 100644
index 0000000000..a623e9f1d5
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_RELEASE_CHAMBER.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CLARIFIER_CONTROLLER_CASING.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CLARIFIER_CONTROLLER_CASING.png
new file mode 100644
index 0000000000..95bdede284
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CLARIFIER_CONTROLLER_CASING.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_PH_RESISTANT.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_PH_RESISTANT.png
new file mode 100644
index 0000000000..4e210ec714
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_PH_RESISTANT.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_QUARK_CONTAINMENT.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_QUARK_CONTAINMENT.png
new file mode 100644
index 0000000000..daa05d5dfc
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_QUARK_CONTAINMENT.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_BLACK.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_BLACK.png
new file mode 100644
index 0000000000..72fd8bd069
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_BLACK.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_GRAY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_GRAY.png
new file mode 100644
index 0000000000..e8b21b26e3
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_GRAY.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_LIGHT_GRAY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_LIGHT_GRAY.png
new file mode 100644
index 0000000000..0767d4fffc
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_LIGHT_GRAY.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_WHITE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_WHITE.png
new file mode 100644
index 0000000000..bd3cb68e09
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_WHITE.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INDUSTRIAL_STRENGTH_CONCRETE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INDUSTRIAL_STRENGTH_CONCRETE.png
new file mode 100644
index 0000000000..89aed04ff4
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INDUSTRIAL_STRENGTH_CONCRETE.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXTREME_CORROSION_RESISTANT.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXTREME_CORROSION_RESISTANT.png
new file mode 100644
index 0000000000..c10e687897
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXTREME_CORROSION_RESISTANT.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FLOCCULATION.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FLOCCULATION.png
new file mode 100644
index 0000000000..bd1080178f
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FLOCCULATION.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_HIGH_PRESSURE_RESISTANT.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_HIGH_PRESSURE_RESISTANT.png
new file mode 100644
index 0000000000..1fe2b7ea95
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_HIGH_PRESSURE_RESISTANT.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_INDUSTRIAL_WATER_PLANT.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_INDUSTRIAL_WATER_PLANT.png
new file mode 100644
index 0000000000..d0e0a573e1
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_INDUSTRIAL_WATER_PLANT.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_NAQUADAH_REINFORCED_WATER_PLANT.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_NAQUADAH_REINFORCED_WATER_PLANT.png
new file mode 100644
index 0000000000..57e6dd1f37
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_NAQUADAH_REINFORCED_WATER_PLANT.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_OZONE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_OZONE.png
new file mode 100644
index 0000000000..fee3bf9261
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_OZONE.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_PLASMA_HEATER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_PLASMA_HEATER.png
new file mode 100644
index 0000000000..ce826bd1c7
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_PLASMA_HEATER.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/NAQUADRIA_REINFORCED_WATER_PLANT_CASING.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/NAQUADRIA_REINFORCED_WATER_PLANT_CASING.png
new file mode 100644
index 0000000000..d1936d6f5a
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/NAQUADRIA_REINFORCED_WATER_PLANT_CASING.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_COATED_UV_RESISTANT_GLASS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_COATED_UV_RESISTANT_GLASS.png
new file mode 100644
index 0000000000..df11861d63
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_COATED_UV_RESISTANT_GLASS.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OMNI_PURPOSE_INFINITY_FUSED_GLASS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OMNI_PURPOSE_INFINITY_FUSED_GLASS.png
new file mode 100644
index 0000000000..b6d429de7e
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OMNI_PURPOSE_INFINITY_FUSED_GLASS.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_PH_SENSOR.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_PH_SENSOR.png
new file mode 100644
index 0000000000..e849b26703
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_PH_SENSOR.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_PH_SENSOR_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_PH_SENSOR_GLOW.png
new file mode 100644
index 0000000000..36dd0187dd
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_PH_SENSOR_GLOW.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/UV_BACKLIGHT_STERILIZER_CASING.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UV_BACKLIGHT_STERILIZER_CASING.png
new file mode 100644
index 0000000000..d49fa6d477
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UV_BACKLIGHT_STERILIZER_CASING.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/WATER_PLANT_CONCRETE_CASING.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/WATER_PLANT_CONCRETE_CASING.png
new file mode 100644
index 0000000000..be7d0f177e
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/WATER_PLANT_CONCRETE_CASING.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/gui/background/flocculation_recipe.png b/src/main/resources/assets/gregtech/textures/gui/background/flocculation_recipe.png
new file mode 100644
index 0000000000..39d05085d5
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/gui/background/flocculation_recipe.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/gui/progressbar/clarifier.png b/src/main/resources/assets/gregtech/textures/gui/progressbar/clarifier.png
new file mode 100644
index 0000000000..6c167fffa9
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/gui/progressbar/clarifier.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/gui/progressbar/flocculation.png b/src/main/resources/assets/gregtech/textures/gui/progressbar/flocculation.png
new file mode 100644
index 0000000000..6479c42215
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/gui/progressbar/flocculation.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/gui/progressbar/ozonation.png b/src/main/resources/assets/gregtech/textures/gui/progressbar/ozonation.png
new file mode 100644
index 0000000000..54edbee6d0
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/gui/progressbar/ozonation.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/gui/progressbar/phneutralization.png b/src/main/resources/assets/gregtech/textures/gui/progressbar/phneutralization.png
new file mode 100644
index 0000000000..f28a705626
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/gui/progressbar/phneutralization.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/gui/progressbar/water_plasma_heater.png b/src/main/resources/assets/gregtech/textures/gui/progressbar/water_plasma_heater.png
new file mode 100644
index 0000000000..aa1be2b71d
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/gui/progressbar/water_plasma_heater.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/233.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/233.png
new file mode 100644
index 0000000000..e939423163
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/233.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/234.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/234.png
new file mode 100644
index 0000000000..377a385ee1
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/234.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/235.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/235.png
new file mode 100644
index 0000000000..e51fab970d
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/235.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/236.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/236.png
new file mode 100644
index 0000000000..1b46a70159
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/236.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/237.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/237.png
new file mode 100644
index 0000000000..657460fd9b
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/237.png
Binary files differ