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 --- src/main/java/gregtech/api/enums/GT_Values.java | 33 +++++++++++++++++++++++++ src/main/java/gregtech/api/enums/ItemList.java | 1 + 2 files changed, 34 insertions(+) (limited to 'src/main/java/gregtech/api') diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java index 64e1907507..bb5bf1f3e7 100644 --- a/src/main/java/gregtech/api/enums/GT_Values.java +++ b/src/main/java/gregtech/api/enums/GT_Values.java @@ -1,5 +1,13 @@ package gregtech.api.enums; +import static com.gtnewhorizon.gtnhlib.util.AnimatedTooltipHandler.AQUA; +import static com.gtnewhorizon.gtnhlib.util.AnimatedTooltipHandler.BOLD; +import static com.gtnewhorizon.gtnhlib.util.AnimatedTooltipHandler.DARK_AQUA; +import static com.gtnewhorizon.gtnhlib.util.AnimatedTooltipHandler.OBFUSCATED; +import static com.gtnewhorizon.gtnhlib.util.AnimatedTooltipHandler.RESET; +import static com.gtnewhorizon.gtnhlib.util.AnimatedTooltipHandler.animatedText; +import static com.gtnewhorizon.gtnhlib.util.AnimatedTooltipHandler.chain; +import static com.gtnewhorizon.gtnhlib.util.AnimatedTooltipHandler.text; import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.IndustrialCraft2; @@ -9,6 +17,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.Set; +import java.util.function.Supplier; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; @@ -614,6 +623,30 @@ public class GT_Values { + EnumChatFormatting.LIGHT_PURPLE + "minecraft7771"; + public static final Supplier AuthorCloud = chain( + text("Author: " + EnumChatFormatting.AQUA + EnumChatFormatting.BOLD), + animatedText( + "C", + 1, + 500, + DARK_AQUA + OBFUSCATED + BOLD + "X" + RESET + AQUA + BOLD, + DARK_AQUA + "\u238B" + RESET + AQUA + BOLD, + DARK_AQUA + OBFUSCATED + BOLD + "X" + RESET + AQUA + BOLD, + DARK_AQUA + "\u0B83" + RESET + AQUA + BOLD, + DARK_AQUA + OBFUSCATED + BOLD + "X" + RESET + AQUA + BOLD, + DARK_AQUA + BOLD + "\u29BC" + RESET + AQUA + BOLD), + text(EnumChatFormatting.AQUA + EnumChatFormatting.BOLD.toString() + "loud" + EnumChatFormatting.RESET), + animatedText( + " ", + 1, + 500, + DARK_AQUA + OBFUSCATED + BOLD + "X", + DARK_AQUA + "\u238B", + DARK_AQUA + OBFUSCATED + BOLD + "X", + DARK_AQUA + "\u0B83", + DARK_AQUA + OBFUSCATED + BOLD + "X", + DARK_AQUA + BOLD + "\u29BC")); + public static final String AuthorQuerns = "Author: " + EnumChatFormatting.RED + "Querns"; public static final String AuthorSilverMoon = "Author: " + EnumChatFormatting.AQUA + "SilverMoon"; public static final String AuthorTheEpicGamer274 = "Author: " + "TheEpicGamer274"; diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index fa20a45c95..ac810f8eaf 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -450,6 +450,7 @@ public enum ItemList implements IItemContainer { Tesseract, EnergisedTesseract, Timepiece, + Transdimensional_Alignment_Matrix, Steam_Valve_LV, Steam_Valve_MV, -- cgit