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/META-INF/ggfab_at.cfg | 2 -- src/main/resources/META-INF/gregtech_at.cfg | 25 +++++++++++++++++++++ src/main/resources/META-INF/tectech_at.cfg | 17 -------------- src/main/resources/assets/gregtech/lang/en_US.lang | 6 +++++ .../blocks/iconsets/OVERLAY_SIDE_JUKEBOX.png | Bin 0 -> 149 bytes .../blocks/iconsets/OVERLAY_TOP_JUKEBOX.png | Bin 0 -> 208 bytes .../textures/gui/overlay_button/shuffle.png | Bin 0 -> 354 bytes .../textures/items/gt.WirelessHeadphones.png | Bin 0 -> 232 bytes .../resources/assets/miscutils/lang/en_US.lang | 1 + src/main/resources/soundmeta/durations.json | 16 +++++++++++++ 10 files changed, 48 insertions(+), 19 deletions(-) delete mode 100644 src/main/resources/META-INF/ggfab_at.cfg create mode 100644 src/main/resources/META-INF/gregtech_at.cfg delete mode 100644 src/main/resources/META-INF/tectech_at.cfg 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 create mode 100644 src/main/resources/soundmeta/durations.json (limited to 'src/main/resources') diff --git a/src/main/resources/META-INF/ggfab_at.cfg b/src/main/resources/META-INF/ggfab_at.cfg deleted file mode 100644 index a6dc456eb5..0000000000 --- a/src/main/resources/META-INF/ggfab_at.cfg +++ /dev/null @@ -1,2 +0,0 @@ -public net.minecraft.nbt.NBTTagList field_74747_a # tagList -public net.minecraft.nbt.NBTTagCompound field_74784_a # tagMap \ No newline at end of file diff --git a/src/main/resources/META-INF/gregtech_at.cfg b/src/main/resources/META-INF/gregtech_at.cfg new file mode 100644 index 0000000000..065f0c4a26 --- /dev/null +++ b/src/main/resources/META-INF/gregtech_at.cfg @@ -0,0 +1,25 @@ +# GT +public net.minecraft.client.audio.SoundHandler field_147697_e # sndRegistry +public net.minecraft.client.audio.SoundHandler field_147694_f # sndManager +public net.minecraft.item.ItemRecord field_150928_b # field_150928_b / all registered records +# GGFab +public net.minecraft.nbt.NBTTagList field_74747_a # tagList +public net.minecraft.nbt.NBTTagCompound field_74784_a # tagMap +# TecTech +public net.minecraft.block.Block field_149781_w #blockResistance +public net.minecraft.block.Block field_149782_v #blockHardness +protected net.minecraft.client.gui.FontRenderer field_111274_c #unicodePageLocations +protected net.minecraft.client.gui.FontRenderer field_78285_g #colorCode +protected net.minecraft.client.gui.FontRenderer field_78298_i #renderEngine +protected net.minecraft.client.gui.FontRenderer field_78293_l #unicodeFlag +protected net.minecraft.client.gui.FontRenderer field_78294_m #bidiFlag +protected net.minecraft.client.gui.FontRenderer field_78291_n #red +protected net.minecraft.client.gui.FontRenderer field_78292_o #blue +protected net.minecraft.client.gui.FontRenderer field_78306_p #green +protected net.minecraft.client.gui.FontRenderer field_78305_q #alpha +protected net.minecraft.client.gui.FontRenderer field_78304_r #textColor +protected net.minecraft.client.gui.FontRenderer field_78303_s #randomStyle +protected net.minecraft.client.gui.FontRenderer field_78302_t #boldStyle +protected net.minecraft.client.gui.FontRenderer field_78301_u #italicStyle +protected net.minecraft.client.gui.FontRenderer field_78300_v #underlineStyle +protected net.minecraft.client.gui.FontRenderer field_78299_w #strikethroughStyle diff --git a/src/main/resources/META-INF/tectech_at.cfg b/src/main/resources/META-INF/tectech_at.cfg deleted file mode 100644 index fa76d13c1f..0000000000 --- a/src/main/resources/META-INF/tectech_at.cfg +++ /dev/null @@ -1,17 +0,0 @@ -public net.minecraft.block.Block field_149781_w #blockResistance -public net.minecraft.block.Block field_149782_v #blockHardness -protected net.minecraft.client.gui.FontRenderer field_111274_c #unicodePageLocations -protected net.minecraft.client.gui.FontRenderer field_78285_g #colorCode -protected net.minecraft.client.gui.FontRenderer field_78298_i #renderEngine -protected net.minecraft.client.gui.FontRenderer field_78293_l #unicodeFlag -protected net.minecraft.client.gui.FontRenderer field_78294_m #bidiFlag -protected net.minecraft.client.gui.FontRenderer field_78291_n #red -protected net.minecraft.client.gui.FontRenderer field_78292_o #blue -protected net.minecraft.client.gui.FontRenderer field_78306_p #green -protected net.minecraft.client.gui.FontRenderer field_78305_q #alpha -protected net.minecraft.client.gui.FontRenderer field_78304_r #textColor -protected net.minecraft.client.gui.FontRenderer field_78303_s #randomStyle -protected net.minecraft.client.gui.FontRenderer field_78302_t #boldStyle -protected net.minecraft.client.gui.FontRenderer field_78301_u #italicStyle -protected net.minecraft.client.gui.FontRenderer field_78300_v #underlineStyle -protected net.minecraft.client.gui.FontRenderer field_78299_w #strikethroughStyle 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 diff --git a/src/main/resources/soundmeta/durations.json b/src/main/resources/soundmeta/durations.json new file mode 100644 index 0000000000..845e6d0833 --- /dev/null +++ b/src/main/resources/soundmeta/durations.json @@ -0,0 +1,16 @@ +{ + "soundDurationsMs": { + "minecraft:11": 71112, + "minecraft:13": 178086, + "minecraft:blocks": 345914, + "minecraft:cat": 185343, + "minecraft:chirp": 185584, + "minecraft:far": 174462, + "minecraft:mall": 197219, + "minecraft:mellohi": 96199, + "minecraft:stal": 150858, + "minecraft:strad": 188168, + "minecraft:wait": 237886, + "minecraft:ward": 251393 + } +} -- cgit