From b2cbfcf522d9dd13ce89a38d8a5767a8a64cecd8 Mon Sep 17 00:00:00 2001 From: GDCloud <93287602+GDCloudstrike@users.noreply.github.com> Date: Tue, 2 Jul 2024 00:15:24 +0200 Subject: Add Dimensional Convergence, a new DTPF mode (#2669) * store astral arrays internally * save to item nbt * initial implementation * uncap running time and add syncer for convergence status * adjust tooltips and add localisation * add comments * this should not be here * small text adjustments * Add bonus for using higher tier CoAl casings (#2668) * add bonus for higher tier casings * add tooltip info * Fix a vat recipe conflict (#2677) add circuit * update * Fix EBF & multi smelter scanner info (#2681) fix * Put some sanity in GT_MetaGenerated_Item_01 (#2649) * set coin ids in enum * extract coin shapeless recipes * Arrows * splitting more * mold shapes * big split * split behaviors * spotless * enumerated shapes * more enum work * continuing enum work * new batch of enum work * last enum work * Sort enum by IDs * move enum into its own class * public field * Put some sanity in GT_MetaGenerated_Item_02/03 and in GT_MetaGenerated_Tool_01 (#2659) * enum work * sorting the class * extracting the enum in its own class * initial enum work for GT_MetaGenerated_Item_03 * split * finished enum work * extract enum in its own class * migrate to enum * remove duplicated recipes * sorted enums * extracted enum in its own class * spotless * fix compilation errors * spotless * fix mistake * Add oredict for LV and HV circuits (try no 2) (#2682) * blacklist ic2 ciruits from unificator * fix 2 circuit oredicts * move cleanroom assembler recipe * remove unittest that needs nhcoremod to work * fix electronic circuit recipe * move recipe to better place and avoid duplicates * move fluid filter recipe * Clean crafting achievements (#2662) * clean up crafting achievements * spotless * make crop tooltip appropriate (#2684) change tooltip * Move some mixins to hodgepodge (#2633) * Move some mixins to hodgepodge * store astral arrays internally * save to item nbt * initial implementation * uncap running time and add syncer for convergence status * adjust tooltips and add localisation * add comments * this should not be here * small text adjustments * add transdimensional alignment matrix * add recipe * require alignment matrix * capital c * fix catalyst tier being off by one * swap some items around * update aligment matrix tooltip --------- Co-authored-by: chochem <40274384+chochem@users.noreply.github.com> Co-authored-by: Martin Robertz Co-authored-by: HoleFish <48403212+HoleFish@users.noreply.github.com> Co-authored-by: boubou19 Co-authored-by: Jason Mitchell --- .../gregtech/common/items/GT_MetaGenerated_Item_03.java | 16 ++++++++++++++++ src/main/java/gregtech/common/items/ID_MetaItem_03.java | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'src/main/java/gregtech/common/items') diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java index 814f542226..49419aa47f 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java @@ -1,5 +1,6 @@ package gregtech.common.items; +import static com.gtnewhorizon.gtnhlib.util.AnimatedTooltipHandler.addItemTooltip; import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_METRICS_TRANSMITTER; import static gregtech.api.enums.Textures.BlockIcons.SOLARPANEL_UEV; @@ -204,6 +205,7 @@ import static gregtech.common.items.ID_MetaItem_03.Optically_Compatible_Memory; import static gregtech.common.items.ID_MetaItem_03.Optically_Perfected_CPU; import static gregtech.common.items.ID_MetaItem_03.Spinneret; import static gregtech.common.items.ID_MetaItem_03.Timepiece; +import static gregtech.common.items.ID_MetaItem_03.Transdimensional_Alignment_Matrix; import static gregtech.common.items.ID_MetaItem_03.Tube_Wires; import static gregtech.common.items.ID_MetaItem_03.UHV_Coil; import static gregtech.common.items.ID_MetaItem_03.ULV_Coil; @@ -1109,6 +1111,15 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { .set(addItem(Optically_Compatible_Memory.ID, "Optically Compatible Memory", "Its in the name!", o)); ItemList.Timepiece.set(addItem(Timepiece.ID, "Timepiece", "Beware of the kid with the hat", o)); + ItemList.Transdimensional_Alignment_Matrix.set( + addItem( + Transdimensional_Alignment_Matrix.ID, + "Transdimensional Alignment Matrix", + String.join( + "/n ", + "Device supporting the alignment of transdimensional spaces.", + "Enables Dimensional Convergence on the DTPF."), + o)); ItemList.White_Dwarf_Shape_Extruder_Plate.set( addItem( @@ -1251,6 +1262,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "White Dwarf Extruder Shape (Drill Head)", "White Dwarf Extruder Shape for a Drill Head")); registerAllTieredTooltips(); + registerAllAnimatedTooltips(); initOrePrefixes(); initOreDictUnificatorEntries(); registerCovers(); @@ -1298,6 +1310,10 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_TranscendentMainframe.get(1), MAX); } + private void registerAllAnimatedTooltips() { + addItemTooltip(ItemList.Transdimensional_Alignment_Matrix.get(1), GT_Values.AuthorCloud); + } + private void initOreDictUnificatorEntries() { GT_OreDictUnificator .set(OrePrefixes.componentCircuit, Materials.Resistor, ItemList.Circuit_Parts_Resistor.get(1L)); diff --git a/src/main/java/gregtech/common/items/ID_MetaItem_03.java b/src/main/java/gregtech/common/items/ID_MetaItem_03.java index 25083fee3c..fac8fd3841 100644 --- a/src/main/java/gregtech/common/items/ID_MetaItem_03.java +++ b/src/main/java/gregtech/common/items/ID_MetaItem_03.java @@ -219,7 +219,8 @@ public enum ID_MetaItem_03 { White_Dwarf_Shape_Extruder_Small_Gear(754), White_Dwarf_Shape_Extruder_Turbine_Blade(755), White_Dwarf_Shape_Extruder_ToolHeadDrill(756), - Timepiece(757); + Timepiece(757), + Transdimensional_Alignment_Matrix(758); public final int ID; -- cgit