From 8b077c28bea7bcc046be1e4b8485d69b4c245a43 Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sat, 20 Jul 2024 15:35:26 +0100 Subject: Beamline (#2619) * Beamline * Remove hardcoded dreamcraft items and spotless * Remove logs and fix auto structure check * Remove logs and fix auto structure check * Fix typo and synchrotron high MF scaling * sa (cherry picked from commit b2796d95538a1b683b4a98bf6cb0f8fe21404fbd) * Add multi textures, add structuredesc info, remove test TC input, add synchrotron/input/output recipes * Spotless * Prevent mob spawning on casings * Fix LINAC glass requirement, make synchrotron structure less ugly, add last recipe * Spotless * Add placeholder particle textures * Add some mask recipes I missed * Spotless apply for branch lanth-beamline for #2619 (#2630) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Add further error messages to LINAC and Synchrotron, fix MM & LaB6 recipes * Spotless apply for branch lanth-beamline for #2619 (#2648) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Minor changes, add more multi error messages & 9x U-238 SC recipe * Spotless apply for branch lanth-beamline for #2619 (#2651) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Missed a change * Spotless apply for branch lanth-beamline for #2619 (#2652) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Update beamline desc * Remove comments, move coolant fluid check to Util class * Spotless * Spotless apply for branch lanth-beamline for #2619 (#2666) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Fix Mu-Metal recipe output amount, tool stats for MM & LaB6 * Spotless * Fix multi hatch textures * Spotless apply for branch lanth-beamline for #2619 (#2676) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Increase Synchrotron output rate eut & antenna tier scaling, in general improve output rates, buff all TC recipes' processing time * Fix misleading BL tooltip * update * remove import * Buff higher-tier wafer recipes for each IC, from a 4x to 3x increase of recipe amount per two wafer tier increases * Remove RA1 calls in beamline (#2716) * Spotless apply for branch lanth-beamline for #2619 (#2717) spotlessApply Co-authored-by: GitHub GTNH Actions <> * fix * Spotless apply for branch lanth-beamline for #2619 (#2733) spotlessApply Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: unknown Co-authored-by: Elisis Co-authored-by: Martin Robertz Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- src/main/java/gregtech/api/enums/ItemList.java | 3 ++- src/main/java/gregtech/api/enums/Textures.java | 2 ++ .../gregtech/api/util/GT_Multiblock_Tooltip_Builder.java | 14 ++++++++++++++ .../java/gregtech/common/blocks/GT_Block_Casings5.java | 2 ++ .../machines/multiblock/LayeredCokeBattery.java | 9 +++++++-- 5 files changed, 27 insertions(+), 3 deletions(-) (limited to 'src/main/java/gregtech') diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 2d2b066825..ca1cf5e2a9 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -2016,7 +2016,8 @@ public enum ItemList implements IItemContainer { TierdDrone0, TierdDrone1, TierdDrone2, - Hatch_DroneDownLink; + Hatch_DroneDownLink, + Casing_Shielded_Accelerator; public static final ItemList[] DYE_ONLY_ITEMS = { Color_00, Color_01, Color_02, Color_03, Color_04, Color_05, Color_06, Color_07, Color_08, Color_09, Color_10, Color_11, Color_12, Color_13, Color_14, Color_15 }, diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index f4ce94c4f2..5d3f65cfaf 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -1354,6 +1354,8 @@ public class Textures { MACHINE_CASING_PCB_TIER_3, INFINITY_COOLED_CASING, + MACHINE_CASING_SHIELDED_ACCELERATOR, + LARGETURBINE_NEW1, LARGETURBINE_NEW2, LARGETURBINE_NEW3, diff --git a/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java b/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java index 43eeccdc9f..d9d493bc09 100644 --- a/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java +++ b/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java @@ -110,6 +110,20 @@ public class GT_Multiblock_Tooltip_Builder { return this; } + /** + * Add a number of basic lines of information about this structure + * + * @param infoStrings The lines to be added. + * @return Instance this method was called on. + */ + + public GT_Multiblock_Tooltip_Builder addInfoAll(String... infoStrings) { + for (String str : infoStrings) { + iLines.add(str); + } + return this; + } + /** * Add a separator line like this:
* ----------------------------------------- diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java index 3a9efdbe71..0cb1934dec 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java @@ -66,6 +66,7 @@ public class GT_Block_Casings5 extends GT_Block_Casings_Abstract implements IHea ItemList.Casing_Coil_Infinity.set(new ItemStack(this, 1, 11)); ItemList.Casing_Coil_Hypogen.set(new ItemStack(this, 1, 12)); ItemList.Casing_Coil_Eternal.set(new ItemStack(this, 1, 13)); + ItemList.Casing_Shielded_Accelerator.set(new ItemStack(this, 1, 14)); } @Override @@ -91,6 +92,7 @@ public class GT_Block_Casings5 extends GT_Block_Casings_Abstract implements IHea case 11 -> Textures.BlockIcons.MACHINE_COIL_INFINITY.getIcon(); case 12 -> Textures.BlockIcons.MACHINE_COIL_HYPOGEN.getIcon(); case 13 -> Textures.BlockIcons.MACHINE_COIL_ETERNAL.getIcon(); + case 14 -> Textures.BlockIcons.MACHINE_CASING_SHIELDED_ACCELERATOR.getIcon(); default -> Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon(); }; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/LayeredCokeBattery.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/LayeredCokeBattery.java index 3b00708e40..e2f8dc9b6e 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multiblock/LayeredCokeBattery.java +++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/LayeredCokeBattery.java @@ -1,7 +1,12 @@ package gregtech.common.tileentities.machines.multiblock; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static gregtech.api.enums.Mods.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockUnlocalizedName; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.multitileentity.multiblock.base.MultiBlockPart.ENERGY_IN; import static gregtech.api.multitileentity.multiblock.base.MultiBlockPart.FLUID_IN; import static gregtech.api.multitileentity.multiblock.base.MultiBlockPart.FLUID_OUT; -- cgit