From 2053bc9fb6fe3d6e334bdf570c0d4916dbad20bb Mon Sep 17 00:00:00 2001 From: Volence <32358820+Volence@users.noreply.github.com> Date: Sun, 25 Aug 2024 07:50:43 -0400 Subject: New Multi Autoclave (#2863) * Create basics of new multi * Fix forming and recipe processing. Fix tiering and display tiers in waila * Add textures, clean up some code, rework bonus calculations * Apply spotless * add amp limit * update deps * Revision: Add 128 mininum casings needed and tooltip * Revision: Change extended class to ExtendedPowerMultiBlockBase * Revisions: remove unecessary call to getBaseMetaTileEntity().sendBlockEvent * Revisions: revised code to break out calculations and show in waila, update calculations to be more inline with other multis * Finished some other changes and formatting, moved things to lang file * Update GT_Loader_MetaTileEntities to use star import * Update src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiAutoclave.java * spotless --------- Co-authored-by: Martin Robertz Co-authored-by: Mary <33456283+FourIsTheNumber@users.noreply.github.com> --- src/main/resources/assets/gregtech/lang/en_US.lang | 9 +++++++-- .../textures/blocks/iconsets/MACHINE_CASING_AUTOCLAVE.png | Bin 0 -> 805 bytes .../blocks/iconsets/OVERLAY_FRONT_MULTI_AUTOCLAVE.png | Bin 0 -> 254 bytes .../iconsets/OVERLAY_FRONT_MULTI_AUTOCLAVE_ACTIVE.png | Bin 0 -> 255 bytes .../OVERLAY_FRONT_MULTI_AUTOCLAVE_ACTIVE_GLOW.png | Bin 0 -> 255 bytes .../iconsets/OVERLAY_FRONT_MULTI_AUTOCLAVE_GLOW.png | Bin 0 -> 256 bytes 6 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_AUTOCLAVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_AUTOCLAVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_AUTOCLAVE_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_AUTOCLAVE_ACTIVE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_AUTOCLAVE_GLOW.png (limited to 'src/main/resources/assets') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index a113b94e6b..03e5c43de2 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -607,8 +607,13 @@ GT5U.multiblock.problems=Problems GT5U.multiblock.mei=Max Energy Income GT5U.multiblock.maxtier=Max Tier GT5U.multiblock.usage=Probably uses -GT5U.multiblock.parallelism=Max parallelism -GT5U.multiblock.curparallelism=Current parallelism +GT5U.multiblock.parallelism=Max Parallels +GT5U.multiblock.curparallelism=Current Parallels +GT5U.multiblock.euModifier=EU Modifier +GT5U.multiblock.speed=Speed +GT5U.multiblock.fluidPipeTier=Fluid Pipe Tier +GT5U.multiblock.itemPipeTier=Item Pipe Tier +GT5U.multiblock.coilLevel=Heating Coil Level # NEI recipe handlers GT5U.nei.heat_capacity=Heat Capacity: %s K (%s) diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_AUTOCLAVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_AUTOCLAVE.png new file mode 100644 index 0000000000..18b3ba4dce Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_AUTOCLAVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_AUTOCLAVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_AUTOCLAVE.png new file mode 100644 index 0000000000..6092ec4c18 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_AUTOCLAVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_AUTOCLAVE_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_AUTOCLAVE_ACTIVE.png new file mode 100644 index 0000000000..ffd43d8dc2 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_AUTOCLAVE_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_AUTOCLAVE_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_AUTOCLAVE_ACTIVE_GLOW.png new file mode 100644 index 0000000000..3bb29bbda6 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_AUTOCLAVE_ACTIVE_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_AUTOCLAVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_AUTOCLAVE_GLOW.png new file mode 100644 index 0000000000..b7955d63ab Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_AUTOCLAVE_GLOW.png differ -- cgit