From 03f8ac57b99f8fa26975151ad39cb1a78667db73 Mon Sep 17 00:00:00 2001 From: Mary <33456283+FourIsTheNumber@users.noreply.github.com> Date: Thu, 29 Aug 2024 11:15:21 -0400 Subject: Compressor Multiblock (#2861) * Compressor boilerplate * Getting test structure working * Structure fixes * Implemented basic HIP and Black Hole structure elements complete with heat and black hole stabilization mechanics * Cooling glow, also HIP cools much slower than it heats * Got blue cooling texture working * spotless :3 * Force structure checks every 10 seconds like nano forge * Neutronium compressor recipemap created * Various strange changes attempting to get a neutronium compressor map working. Shelved for now * Absolutely going hog wild with neutronium testing * BIG RECIPE * Added Ollie author tag * Added a bunch of neutronium compressor recipes * Deeply cursed recipemap combining * Neutronium compressor structure * Black hole requirement for recipes established * Black hole implementation changed * Added black hole catalyzation * spotless * Removed neutronium compressor recipes from gt5u * Made eternal singularity work somehow * Boilerplate for new hatches * Tinkering * Split the multi in 4 * Fix refactor * Implemented the new black hole mechanic with catalysts. * Give speed bonuses/nerfs to recipes based on black hole. Shuffled some logic around * Imported real structures * Proper HIP implementation with heat sensor * Cut HIP mechanics from Neutronium * Restore Gangue for use in a black hole recipe * Made Gangue blocks load * sa+update deps * Added t1/t2 casings * Temporary casings for neutronium * SA from merge * Temporary HIP Textures * Temporary Black Hole textures * Support machinemode for black hole, support special value for compression * Don't let neutronium compressor do black hole recipes * Get all of the numbers in * Tooltip adjustments for readability * Casing fix and more tooltips * Correct structure tooltips * Improve legibility of HIP tooltip * 1 parallel per tier when overheated * Lost my privates * Fixed modern cast and imported the new textures * Removed very unnecessary logic * Nerf HIP parallels to 4 to make black hole better * Change all special value stuff to proper metadata --------- Co-authored-by: Martin Robertz --- src/main/resources/assets/gregtech/lang/en_US.lang | 8 +++++++- .../textures/blocks/iconsets/COMPRESSOR_CASING.png | Bin 0 -> 266 bytes .../textures/blocks/iconsets/COMPRESSOR_PIPE_CASING.png | Bin 0 -> 243 bytes .../textures/blocks/iconsets/EXTREME_DENSITY_CASING.png | Bin 0 -> 411 bytes .../gregtech/textures/blocks/iconsets/HAWKING_GLASS.png | Bin 0 -> 179 bytes .../blocks/iconsets/NEUTRONIUM_ACTIVE_CASING.png | Bin 0 -> 2378 bytes .../blocks/iconsets/NEUTRONIUM_ACTIVE_CASING.png.mcmeta | 5 +++++ .../textures/blocks/iconsets/NEUTRONIUM_CASING.png | Bin 0 -> 428 bytes .../blocks/iconsets/NEUTRONIUM_STABLE_CASING.png | Bin 0 -> 328 bytes .../blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR.png | Bin 0 -> 254 bytes .../iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE.png | Bin 0 -> 255 bytes .../OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE_GLOW.png | Bin 0 -> 255 bytes .../iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_COOLING.png | Bin 0 -> 371 bytes .../OVERLAY_FRONT_MULTI_COMPRESSOR_COOLING_GLOW.png | Bin 0 -> 265 bytes .../iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_GLOW.png | Bin 0 -> 256 bytes .../textures/blocks/iconsets/OVERLAY_HATCH_BLACKHOLE.png | Bin 0 -> 1711 bytes .../blocks/iconsets/OVERLAY_HATCH_BLACKHOLE_GLOW.png | Bin 0 -> 1702 bytes .../blocks/iconsets/RADIATION_ABSORBENT_CASING.png | Bin 0 -> 304 bytes .../gui/overlay_button/machine_mode_compressing.png | Bin 0 -> 599 bytes .../gui/overlay_button/machine_mode_singularity.png | Bin 0 -> 613 bytes .../gregtech/textures/items/gt.metaitem.01/418.png | Bin 0 -> 164 bytes .../gregtech/textures/items/gt.metaitem.01/419.png | Bin 0 -> 164 bytes 22 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/COMPRESSOR_CASING.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/COMPRESSOR_PIPE_CASING.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/EXTREME_DENSITY_CASING.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/HAWKING_GLASS.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_ACTIVE_CASING.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_ACTIVE_CASING.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_CASING.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_STABLE_CASING.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_COOLING.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_COOLING_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_BLACKHOLE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_BLACKHOLE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/RADIATION_ABSORBENT_CASING.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/overlay_button/machine_mode_compressing.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/overlay_button/machine_mode_singularity.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/418.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/419.png (limited to 'src/main/resources/assets') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 2fe4b15626..3b63e7056d 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -112,6 +112,7 @@ gt.recipe.brewer=Brewery gt.recipe.brewer.description=Brewing your Drinks gt.recipe.metalbender=Bending Machine gt.recipe.metalbender.description=Boo, he's bad! We want BENDER!!! +gt.recipe.neutroniumcompressor=Neutronium Compressor gt.recipe.canner=Canner gt.recipe.canner.description=Unmobile Food Canning Machine GTA4 gt.recipe.centrifuge=Centrifuge @@ -342,6 +343,8 @@ GT5U.GTPP_MULTI_INDUSTRIAL_MULTI_MACHINE.mode.1=Fluid GT5U.GTPP_MULTI_INDUSTRIAL_MULTI_MACHINE.mode.2=Misc GT5U.MULTI_CANNER.mode.0=Canner GT5U.MULTI_CANNER.mode.1=Fluid Canner +GT5U.BLACKHOLE.mode.0=Compressor +GT5U.BLACKHOLE.mode.1=Singularity Compressor GT5U.GTPP_MULTI_INDUSTRIAL_DEHYDRATOR.mode.0=Vacuum Furnace GT5U.GTPP_MULTI_INDUSTRIAL_DEHYDRATOR.mode.1=Dehydrator GT5U.GTPP_MULTI_MASS_FABRICATOR.mode.0=Mass Fabricator @@ -528,9 +531,12 @@ GT5U.gui.text.drill_exhausted=§dDrill has exhausted all resources GT5U.gui.text.drill_generic_finished=§7Mining pipes have been retracted GT5U.gui.text.drill_retract_pipes_finished=§7Operation aborted GT5U.gui.text.backfiller_no_concrete=§7No liquid concrete +GT5U.gui.text.no_black_hole=§7Black hole is not active +GT5U.gui.text.unstable_black_hole=§7Black hole is unstable GT5U.gui.text.backfiller_finished=§aWork complete GT5U.gui.text.backfiller_working=§aPouring concrete GT5U.gui.text.backfiller_current_area=§7Filling at y-level: §a%s +GT5U.gui.text.overheated=§7HIP Unit overheated! GT5U.gui.text.pump_fluid_type=Fluid: §a%s GT5U.gui.text.pump_rate.1=Pumping rate: %s§r GT5U.gui.text.pump_rate.2= L/t @@ -568,7 +574,7 @@ GT5U.gui.text.no_machine_part=No correct machine part in controller slot. GT5U.gui.text.missing_item=§7Missing required item: §b%s§f GT5U.gui.text.ph_sensor=pH threshold GT5U.gui.text.critical_ph_value=pH exceeded critical value. - +GT5U.gui.text.heat_sensor=Heat threshold GT5U.item.programmed_circuit.select.header=Reprogram Circuit # Note to translators: this translation entry is supposed to be a number indicating how many taunts you define here diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/COMPRESSOR_CASING.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/COMPRESSOR_CASING.png new file mode 100644 index 0000000000..926564bfe4 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/COMPRESSOR_CASING.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/COMPRESSOR_PIPE_CASING.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/COMPRESSOR_PIPE_CASING.png new file mode 100644 index 0000000000..2f3efc4c51 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/COMPRESSOR_PIPE_CASING.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EXTREME_DENSITY_CASING.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EXTREME_DENSITY_CASING.png new file mode 100644 index 0000000000..4fe8b16baa Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EXTREME_DENSITY_CASING.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/HAWKING_GLASS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/HAWKING_GLASS.png new file mode 100644 index 0000000000..6d3c61b033 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/HAWKING_GLASS.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_ACTIVE_CASING.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_ACTIVE_CASING.png new file mode 100644 index 0000000000..399ef990f1 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_ACTIVE_CASING.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_ACTIVE_CASING.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_ACTIVE_CASING.png.mcmeta new file mode 100644 index 0000000000..c5dad8da82 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_ACTIVE_CASING.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":1 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_CASING.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_CASING.png new file mode 100644 index 0000000000..3cbad4eedc Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_CASING.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_STABLE_CASING.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_STABLE_CASING.png new file mode 100644 index 0000000000..3175f1bd26 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_STABLE_CASING.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR.png new file mode 100644 index 0000000000..6092ec4c18 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE.png new file mode 100644 index 0000000000..ffd43d8dc2 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE_GLOW.png new file mode 100644 index 0000000000..3bb29bbda6 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_COOLING.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_COOLING.png new file mode 100644 index 0000000000..ee68608fd4 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_COOLING.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_COOLING_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_COOLING_GLOW.png new file mode 100644 index 0000000000..153f4f8ac7 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_COOLING_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_GLOW.png new file mode 100644 index 0000000000..b7955d63ab Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_BLACKHOLE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_BLACKHOLE.png new file mode 100644 index 0000000000..e849b26703 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_BLACKHOLE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_BLACKHOLE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_BLACKHOLE_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_BLACKHOLE_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/RADIATION_ABSORBENT_CASING.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/RADIATION_ABSORBENT_CASING.png new file mode 100644 index 0000000000..2d44bf752e Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/RADIATION_ABSORBENT_CASING.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/overlay_button/machine_mode_compressing.png b/src/main/resources/assets/gregtech/textures/gui/overlay_button/machine_mode_compressing.png new file mode 100644 index 0000000000..81914191a8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/overlay_button/machine_mode_compressing.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/overlay_button/machine_mode_singularity.png b/src/main/resources/assets/gregtech/textures/gui/overlay_button/machine_mode_singularity.png new file mode 100644 index 0000000000..e2114a0cda Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/overlay_button/machine_mode_singularity.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/418.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/418.png new file mode 100644 index 0000000000..79b2881931 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/418.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/419.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/419.png new file mode 100644 index 0000000000..95eae6ea59 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/419.png differ -- cgit