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/java/gregtech/api/enums | |
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/java/gregtech/api/enums')
-rw-r--r-- | src/main/java/gregtech/api/enums/GT_Values.java | 1 | ||||
-rw-r--r-- | src/main/java/gregtech/api/enums/ItemList.java | 20 | ||||
-rw-r--r-- | src/main/java/gregtech/api/enums/MetaTileEntityIDs.java | 7 | ||||
-rw-r--r-- | src/main/java/gregtech/api/enums/Textures.java | 21 |
4 files changed, 47 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java index ec4a6ce5c7..88972e45fc 100644 --- a/src/main/java/gregtech/api/enums/GT_Values.java +++ b/src/main/java/gregtech/api/enums/GT_Values.java @@ -651,6 +651,7 @@ public class GT_Values { + EnumChatFormatting.WHITE + EnumChatFormatting.ITALIC + "Number"; + public static final String Ollie = "" + EnumChatFormatting.GREEN + EnumChatFormatting.BOLD + "Ollie"; public static final String authorBaps = "Author: " + EnumChatFormatting.GOLD + "Ba" + EnumChatFormatting.LIGHT_PURPLE diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index bf9fa4ec90..766525c958 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -1091,6 +1091,8 @@ public enum ItemList implements IItemContainer { Hatch_DataAccess_LuV, Hatch_DataAccess_UV, + Hatch_HeatSensor, + Battery_Buffer_1by1_ULV, Battery_Buffer_1by1_LV, Battery_Buffer_1by1_MV, @@ -1474,6 +1476,24 @@ public enum ItemList implements IItemContainer { Electromagnet_Tengam, Machine_Multi_Canner, + + Machine_Multi_IndustrialCompressor, + Machine_Multi_HIPCompressor, + Machine_Multi_NeutroniumCompressor, + Machine_Multi_BlackHoleCompressor, + Compressor_Casing, + Compressor_Pipe_Casing, + Heating_Duct_Casing, + Coolant_Duct_Casing, + Neutronium_Casing, + Neutronium_Active_Casing, + Neutronium_Stable_Casing, + Background_Radiation_Casing, + Extreme_Density_Casing, + Hawking_Glass, + Black_Hole_Opener, + Black_Hole_Closer, + Machine_Multi_IndustrialLaserEngraver, Laser_Plate, Casing_Laser, diff --git a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java index d55d1bbcf9..7793a2f6b2 100644 --- a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java +++ b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java @@ -626,7 +626,12 @@ public enum MetaTileEntityIDs { INPUT_HATCH_ME(2717), INPUT_BUS_ME(2718), INDUSTRIAL_LASER_ENGRAVER_CONTROLLER(3004), - INDUSTRIAL_EXTRACTOR_CONTROLLER(3005), + INDUSTRIAL_COMPRESSOR_CONTROLLER(3005), + HIP_COMPRESSOR_CONTROLLER(3006), + NEUTRONIUM_COMPRESSOR_CONTROLLER(3007), + BLACKHOLE_COMPRESSOR_CONTROLLER(3008), + HEAT_DETECTOR_HATCH(3009), + INDUSTRIAL_EXTRACTOR_CONTROLLER(3010), DraconicEvolutionFusionCrafterController(5001), CHEST_BUFFER_ULV(9230), CHEST_BUFFER_LV(9231), diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index d00c5dccb9..4a5142138a 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -336,6 +336,13 @@ public class Textures { OVERLAY_FRONT_MULTI_CANNER_ACTIVE_GLOW, OVERLAY_FRONT_MULTI_CANNER_GLOW, + OVERLAY_FRONT_MULTI_COMPRESSOR, + OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE, + OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE_GLOW, + OVERLAY_FRONT_MULTI_COMPRESSOR_GLOW, + OVERLAY_FRONT_MULTI_COMPRESSOR_COOLING, + OVERLAY_FRONT_MULTI_COMPRESSOR_COOLING_GLOW, + OVERLAY_FRONT_INDUSTRIAL_EXTRACTOR, OVERLAY_FRONT_INDUSTRIAL_EXTRACTOR_ACTIVE, OVERLAY_FRONT_INDUSTRIAL_EXTRACTOR_ACTIVE_GLOW, @@ -347,6 +354,7 @@ public class Textures { OVERLAY_FRONT_ENGRAVER_ACTIVE, OVERLAY_FRONT_ENGRAVER_ACTIVE_GLOW, OVERLAY_FRONT_ENGRAVER_GLOW, + OVERLAY_FRONT_MULTI_LATHE, OVERLAY_FRONT_MULTI_LATHE_ACTIVE, OVERLAY_FRONT_MULTI_LATHE_ACTIVE_GLOW, @@ -1330,6 +1338,9 @@ public class Textures { OVERLAY_HATCH_PH_SENSOR, OVERLAY_HATCH_PH_SENSOR_GLOW, + OVERLAY_HATCH_BLACKHOLE, + OVERLAY_HATCH_BLACKHOLE_GLOW, + STRUCTURE_MARK, MV_TOP_CYCLOTRON_SOLENOID, @@ -1409,7 +1420,15 @@ public class Textures { GLASS_QUARK_CONTAINMENT, BLOCK_QUARK_PIPE, BLOCK_QUARK_RELEASE_CHAMBER, - BLOCK_QUARK_CONTAINMENT_CASING,; + BLOCK_QUARK_CONTAINMENT_CASING, + COMPRESSOR_CASING, + COMPRESSOR_PIPE_CASING, + NEUTRONIUM_CASING, + NEUTRONIUM_ACTIVE_CASING, + NEUTRONIUM_STABLE_CASING, + EXTREME_DENSITY_CASING, + RADIATION_ABSORBENT_CASING, + HAWKING_GLASS; /** * Icon for Fresh CFoam |