diff options
author | Mary <33456283+FourIsTheNumber@users.noreply.github.com> | 2024-08-29 11:15:21 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-08-29 17:15:21 +0200 |
commit | 03f8ac57b99f8fa26975151ad39cb1a78667db73 (patch) | |
tree | 1f61751081785526d26875383cc344be5ada9e32 /src/main/resources/assets | |
parent | 7d3ddfa1a325d7b2f0248bc771a5c0dcbc6eb839 (diff) | |
download | GT5-Unofficial-03f8ac57b99f8fa26975151ad39cb1a78667db73.tar.gz GT5-Unofficial-03f8ac57b99f8fa26975151ad39cb1a78667db73.tar.bz2 GT5-Unofficial-03f8ac57b99f8fa26975151ad39cb1a78667db73.zip |
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 <dream-master@gmx.net>
Diffstat (limited to 'src/main/resources/assets')
22 files changed, 12 insertions, 1 deletions
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 Binary files differnew file mode 100644 index 0000000000..926564bfe4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/COMPRESSOR_CASING.png 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 Binary files differnew file mode 100644 index 0000000000..2f3efc4c51 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/COMPRESSOR_PIPE_CASING.png 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 Binary files differnew file mode 100644 index 0000000000..4fe8b16baa --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EXTREME_DENSITY_CASING.png 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 Binary files differnew file mode 100644 index 0000000000..6d3c61b033 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/HAWKING_GLASS.png 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 Binary files differnew file mode 100644 index 0000000000..399ef990f1 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_ACTIVE_CASING.png 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 Binary files differnew file mode 100644 index 0000000000..3cbad4eedc --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_CASING.png 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 Binary files differnew file mode 100644 index 0000000000..3175f1bd26 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_STABLE_CASING.png 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 Binary files differnew file mode 100644 index 0000000000..6092ec4c18 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR.png 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 Binary files differnew file mode 100644 index 0000000000..ffd43d8dc2 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE.png 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 Binary files differnew file mode 100644 index 0000000000..3bb29bbda6 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE_GLOW.png 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 Binary files differnew file mode 100644 index 0000000000..ee68608fd4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_COOLING.png 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 Binary files differnew file mode 100644 index 0000000000..153f4f8ac7 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_COOLING_GLOW.png 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 Binary files differnew file mode 100644 index 0000000000..b7955d63ab --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_COMPRESSOR_GLOW.png 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 Binary files differnew file mode 100644 index 0000000000..e849b26703 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_BLACKHOLE.png 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 Binary files differnew file mode 100644 index 0000000000..36dd0187dd --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_BLACKHOLE_GLOW.png 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 Binary files differnew file mode 100644 index 0000000000..2d44bf752e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/RADIATION_ABSORBENT_CASING.png 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 Binary files differnew file mode 100644 index 0000000000..81914191a8 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/gui/overlay_button/machine_mode_compressing.png 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 Binary files differnew file mode 100644 index 0000000000..e2114a0cda --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/gui/overlay_button/machine_mode_singularity.png 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 Binary files differnew file mode 100644 index 0000000000..79b2881931 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/418.png 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 Binary files differnew file mode 100644 index 0000000000..95eae6ea59 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/419.png |