From b65ace37de4f585b8089ad413ee877b792da11ca Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Sat, 3 Aug 2024 23:21:44 +0200 Subject: 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 Co-authored-by: OlliedeLeeuw Co-authored-by: Ollie_de_Leeuw <154506304+OlliedeLeeuw@users.noreply.github.com> Co-authored-by: Martin Robertz --- src/main/resources/assets/gregtech/lang/en_US.lang | 25 ++++++---- src/main/resources/assets/gregtech/sounds.json | 53 +++++++++++++++++++++ .../sounds/PurificationCoagulationLoop.ogg | Bin 0 -> 1109211 bytes .../gregtech/sounds/PurificationOzonationLoop.ogg | Bin 0 -> 311674 bytes .../assets/gregtech/sounds/PurificationPhLoop.ogg | Bin 0 -> 624417 bytes .../gregtech/sounds/PurificationPlantLoop.ogg | Bin 0 -> 421914 bytes .../gregtech/sounds/PurificationPlasmaLoop.ogg | Bin 0 -> 474179 bytes .../iconsets/BLOCK_QUARK_CONTAINMENT_CASING.png | Bin 0 -> 1147 bytes .../textures/blocks/iconsets/BLOCK_QUARK_PIPE.png | Bin 0 -> 4286 bytes .../blocks/iconsets/BLOCK_QUARK_PIPE.png.mcmeta | 5 ++ .../iconsets/BLOCK_QUARK_RELEASE_CHAMBER.png | Bin 0 -> 1166 bytes .../iconsets/CLARIFIER_CONTROLLER_CASING.png | Bin 0 -> 684 bytes .../blocks/iconsets/GLASS_PH_RESISTANT.png | Bin 0 -> 545 bytes .../blocks/iconsets/GLASS_QUARK_CONTAINMENT.png | Bin 0 -> 1227 bytes .../iconsets/GLASS_TINTED_INDUSTRIAL_BLACK.png | Bin 0 -> 144 bytes .../iconsets/GLASS_TINTED_INDUSTRIAL_GRAY.png | Bin 0 -> 144 bytes .../GLASS_TINTED_INDUSTRIAL_LIGHT_GRAY.png | Bin 0 -> 144 bytes .../iconsets/GLASS_TINTED_INDUSTRIAL_WHITE.png | Bin 0 -> 145 bytes .../iconsets/INDUSTRIAL_STRENGTH_CONCRETE.png | Bin 0 -> 1058 bytes .../MACHINE_CASING_EXTREME_CORROSION_RESISTANT.png | Bin 0 -> 593 bytes .../iconsets/MACHINE_CASING_FLOCCULATION.png | Bin 0 -> 640 bytes .../MACHINE_CASING_HIGH_PRESSURE_RESISTANT.png | Bin 0 -> 705 bytes .../MACHINE_CASING_INDUSTRIAL_WATER_PLANT.png | Bin 0 -> 631 bytes ...HINE_CASING_NAQUADAH_REINFORCED_WATER_PLANT.png | Bin 0 -> 678 bytes .../blocks/iconsets/MACHINE_CASING_OZONE.png | Bin 0 -> 666 bytes .../iconsets/MACHINE_CASING_PLASMA_HEATER.png | Bin 0 -> 680 bytes .../NAQUADRIA_REINFORCED_WATER_PLANT_CASING.png | Bin 0 -> 683 bytes .../NEUTRONIUM_COATED_UV_RESISTANT_GLASS.png | Bin 0 -> 655 bytes .../iconsets/OMNI_PURPOSE_INFINITY_FUSED_GLASS.png | Bin 0 -> 661 bytes .../blocks/iconsets/OVERLAY_HATCH_PH_SENSOR.png | Bin 0 -> 1711 bytes .../iconsets/OVERLAY_HATCH_PH_SENSOR_GLOW.png | Bin 0 -> 1702 bytes .../iconsets/UV_BACKLIGHT_STERILIZER_CASING.png | Bin 0 -> 747 bytes .../iconsets/WATER_PLANT_CONCRETE_CASING.png | Bin 0 -> 572 bytes .../gui/background/flocculation_recipe.png | Bin 0 -> 788 bytes .../textures/gui/progressbar/clarifier.png | Bin 0 -> 8801 bytes .../textures/gui/progressbar/flocculation.png | Bin 0 -> 11157 bytes .../textures/gui/progressbar/ozonation.png | Bin 0 -> 7609 bytes .../textures/gui/progressbar/phneutralization.png | Bin 0 -> 910 bytes .../gui/progressbar/water_plasma_heater.png | Bin 0 -> 2363 bytes .../gregtech/textures/items/gt.metaitem.03/233.png | Bin 0 -> 608 bytes .../gregtech/textures/items/gt.metaitem.03/234.png | Bin 0 -> 471 bytes .../gregtech/textures/items/gt.metaitem.03/235.png | Bin 0 -> 512 bytes .../gregtech/textures/items/gt.metaitem.03/236.png | Bin 0 -> 512 bytes .../gregtech/textures/items/gt.metaitem.03/237.png | Bin 0 -> 450 bytes 44 files changed, 75 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/assets/gregtech/sounds/PurificationCoagulationLoop.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/PurificationOzonationLoop.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/PurificationPhLoop.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/PurificationPlantLoop.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/PurificationPlasmaLoop.ogg create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_CONTAINMENT_CASING.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_RELEASE_CHAMBER.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/CLARIFIER_CONTROLLER_CASING.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_PH_RESISTANT.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_QUARK_CONTAINMENT.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_BLACK.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_GRAY.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_LIGHT_GRAY.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_WHITE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/INDUSTRIAL_STRENGTH_CONCRETE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXTREME_CORROSION_RESISTANT.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FLOCCULATION.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_HIGH_PRESSURE_RESISTANT.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_INDUSTRIAL_WATER_PLANT.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_NAQUADAH_REINFORCED_WATER_PLANT.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_OZONE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_PLASMA_HEATER.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/NAQUADRIA_REINFORCED_WATER_PLANT_CASING.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_COATED_UV_RESISTANT_GLASS.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OMNI_PURPOSE_INFINITY_FUSED_GLASS.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_PH_SENSOR.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_PH_SENSOR_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/UV_BACKLIGHT_STERILIZER_CASING.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/WATER_PLANT_CONCRETE_CASING.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/background/flocculation_recipe.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/progressbar/clarifier.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/progressbar/flocculation.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/progressbar/ozonation.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/progressbar/phneutralization.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/progressbar/water_plasma_heater.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/233.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/234.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/235.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/236.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/237.png (limited to 'src/main/resources') 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/sounds/PurificationCoagulationLoop.ogg 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/sounds/PurificationOzonationLoop.ogg 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/sounds/PurificationPhLoop.ogg 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/sounds/PurificationPlantLoop.ogg 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/sounds/PurificationPlasmaLoop.ogg 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_CONTAINMENT_CASING.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_RELEASE_CHAMBER.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CLARIFIER_CONTROLLER_CASING.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_PH_RESISTANT.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_QUARK_CONTAINMENT.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_BLACK.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_GRAY.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_LIGHT_GRAY.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_WHITE.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INDUSTRIAL_STRENGTH_CONCRETE.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXTREME_CORROSION_RESISTANT.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FLOCCULATION.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_HIGH_PRESSURE_RESISTANT.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_INDUSTRIAL_WATER_PLANT.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_NAQUADAH_REINFORCED_WATER_PLANT.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_OZONE.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_PLASMA_HEATER.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/NAQUADRIA_REINFORCED_WATER_PLANT_CASING.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_COATED_UV_RESISTANT_GLASS.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OMNI_PURPOSE_INFINITY_FUSED_GLASS.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_PH_SENSOR.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_PH_SENSOR_GLOW.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UV_BACKLIGHT_STERILIZER_CASING.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/WATER_PLANT_CONCRETE_CASING.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/background/flocculation_recipe.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/progressbar/clarifier.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/progressbar/flocculation.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/progressbar/ozonation.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/progressbar/phneutralization.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/progressbar/water_plasma_heater.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/233.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/234.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/235.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/236.png 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 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/237.png differ -- cgit