From 5decfda1dd1b3bbfdb1098f409aa50162ea32dc2 Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Thu, 15 Aug 2024 22:44:13 +0100 Subject: Electric jukebox (#2827) * GT music system * Minor fix for some glitches when switching dimensions with P2Ps on both sides * Most features implemented except headphones * Implement wireless headphones * Disable debug mode * Spotless --------- Co-authored-by: Martin Robertz --- src/main/resources/assets/gregtech/lang/en_US.lang | 6 ++++++ .../textures/blocks/iconsets/OVERLAY_SIDE_JUKEBOX.png | Bin 0 -> 149 bytes .../textures/blocks/iconsets/OVERLAY_TOP_JUKEBOX.png | Bin 0 -> 208 bytes .../gregtech/textures/gui/overlay_button/shuffle.png | Bin 0 -> 354 bytes .../gregtech/textures/items/gt.WirelessHeadphones.png | Bin 0 -> 232 bytes src/main/resources/assets/miscutils/lang/en_US.lang | 1 + 6 files changed, 7 insertions(+) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_JUKEBOX.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_JUKEBOX.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/overlay_button/shuffle.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.WirelessHeadphones.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 e07e319299..43845d9b37 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -445,6 +445,12 @@ GT5U.machines.dronecentre.turnoff=Successfully turn off all machines! GT5U.machines.dronecentre.noconnection=No valid connection GT5U.machines.dronecentre.enableRender=Enable Drone Render GT5U.machines.dronecentre.disableRender=Disable Drone Render +GT5U.machines.betterjukebox.attenuationDistance.tooltip=Sound attenuation distance: %d blocks +GT5U.machines.betterjukebox.p2pAttenuationDistance.tooltip=P2P sound attenuation distance: %d blocks +GT5U.machines.betterjukebox.loop.tooltip=Loop mode (keep discs in input inventory) +GT5U.machines.betterjukebox.shuffle.tooltip=Shuffle mode (play random discs instead of in order) +GT5U.machines.betterjukebox.headphonesbound=Headphones bound to jukebox +GT5U.machines.betterjukebox.headphonesunbound=Shift-click on an electric jukebox to bind headphones GT5U.machines.laser_hatch.amperage=Amperage GT5U.recipe_filter.empty_representation_slot.tooltip=§7Click with a machine to set filter diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_JUKEBOX.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_JUKEBOX.png new file mode 100644 index 0000000000..97fde2fa1e Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_JUKEBOX.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_JUKEBOX.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_JUKEBOX.png new file mode 100644 index 0000000000..188aaa7391 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_JUKEBOX.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/overlay_button/shuffle.png b/src/main/resources/assets/gregtech/textures/gui/overlay_button/shuffle.png new file mode 100644 index 0000000000..376174b2c1 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/overlay_button/shuffle.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.WirelessHeadphones.png b/src/main/resources/assets/gregtech/textures/items/gt.WirelessHeadphones.png new file mode 100644 index 0000000000..bcf563dd87 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.WirelessHeadphones.png differ diff --git a/src/main/resources/assets/miscutils/lang/en_US.lang b/src/main/resources/assets/miscutils/lang/en_US.lang index 6fe80a2360..baece34a33 100644 --- a/src/main/resources/assets/miscutils/lang/en_US.lang +++ b/src/main/resources/assets/miscutils/lang/en_US.lang @@ -50,6 +50,7 @@ tile.blockVolumetricFlaskSetter.name=Volumetric Flask Configurator tile.blockSuperLight.name=Shining Star tile.blockPestKiller.name=Pest Killer tile.blockSuperJukebox.name=Sir Mixalot [Jukebox] +tile.blockSuperJukebox.deprecated=§cDEPRECATED, Use the Electric Jukeboxes instead //Tools item.itemBufferCore.name=Energy Core -- cgit