From 7ba0fc903e5d14928d2b894b00a7b7dfc65eee18 Mon Sep 17 00:00:00 2001 From: querns <33518699+querns@users.noreply.github.com> Date: Thu, 19 Sep 2024 08:53:17 -0500 Subject: Infinite Spraycan Additions (#3226) Co-authored-by: Caedis --- src/main/resources/assets/gregtech/lang/en_US.lang | 11 ++++++ src/main/resources/assets/gregtech/sounds.json | 40 +++++++++++++++++++-- .../resources/assets/gregtech/sounds/spraycan.ogg | Bin 20679 -> 0 bytes .../assets/gregtech/sounds/spraycan_lock.ogg | Bin 0 -> 10151 bytes .../assets/gregtech/sounds/spraycan_shake.ogg | Bin 0 -> 20679 bytes .../assets/gregtech/sounds/spraycan_unlock.ogg | Bin 0 -> 10358 bytes .../textures/items/gt.metaitem.01/468/1.png | Bin 0 -> 4583 bytes .../textures/items/gt.metaitem.01/468/2.png | Bin 0 -> 4450 bytes .../textures/items/gt.metaitem.01/468/3.png | Bin 0 -> 4456 bytes 9 files changed, 48 insertions(+), 3 deletions(-) delete mode 100644 src/main/resources/assets/gregtech/sounds/spraycan.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/spraycan_lock.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/spraycan_shake.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/spraycan_unlock.ogg create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/468/1.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/468/2.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/468/3.png (limited to 'src/main/resources') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index c0d9a98e88..049bb66bc4 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -621,6 +621,17 @@ GT5U.item.cable.loss=Loss/Meter/Ampere GT5U.item.cable.eu_volt=EU-Volt GT5U.item.tank.locked_to=Content locked to %s +gt.behaviour.paintspray.infinite.gui.header=Select a Color +gt.behaviour.paintspray.infinite.gui.lock_error=§eSpray can is §clocked§e! §bSneak middle-click to unlock. +gt.behaviour.paintspray.infinite.gui.solvent=Solvent + +gt.behaviour.paintspray.infinite.tooltip.infinite=Infinite uses +gt.behaviour.paintspray.infinite.tooltip.more_info=Hold SHIFT for more information +gt.behaviour.paintspray.infinite.tooltip.switch=Left Click: Change color (sneak to reverse direction) +gt.behaviour.paintspray.infinite.tooltip.pick=Middle Click block: Copy color to spray can +gt.behaviour.paintspray.infinite.tooltip.lock=Sneak Middle Click: Lock or unlock spray can +gt.behaviour.paintspray.infinite.tooltip.gui=Middle Click: Open color choice GUI + GT5U.hatch.disableFilter.true=Input Filter §cOff§r GT5U.hatch.disableFilter.false=Input Filter §aOn§r GT5U.hatch.disableMultiStack.true=Multi Stack Input §cOff§r diff --git a/src/main/resources/assets/gregtech/sounds.json b/src/main/resources/assets/gregtech/sounds.json index ae25d2bb23..612ce93fc4 100644 --- a/src/main/resources/assets/gregtech/sounds.json +++ b/src/main/resources/assets/gregtech/sounds.json @@ -142,11 +142,45 @@ } ] }, - "items.spraycan": { + "items.spraycan_shake": { "category": "player", "sounds": [ { - "name": "spraycan", + "name": "spraycan_shake", + "stream": false, + "licensing": { + "sound_url": "https://freesound.org/people/J-La/sounds/38025/", + "sound_name": "spraycan.wav", + "author_url": "https://freesound.org/people/J-La/", + "author_name": "J-La", + "license_url": "https://creativecommons.org/licenses/by/3.0/", + "license_name": "Attribution 3.0" + } + } + ] + }, + "items.spraycan_lock": { + "category": "player", + "sounds": [ + { + "name": "spraycan_lock", + "stream": false, + "licensing": { + "sound_url": "https://freesound.org/people/J-La/sounds/38025/", + "sound_name": "spraycan.wav", + "author_url": "https://freesound.org/people/J-La/", + "author_name": "J-La", + "license_url": "https://creativecommons.org/licenses/by/3.0/", + "license_name": "Attribution 3.0" + } + } + ] + }, + "items.spraycan_unlock": { + "category": "player", + "sounds": [ + { + "name": "spraycan_unlock", "stream": false, "licensing": { "sound_url": "https://freesound.org/people/J-La/sounds/38025/", @@ -159,4 +193,4 @@ } ] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/gregtech/sounds/spraycan.ogg b/src/main/resources/assets/gregtech/sounds/spraycan.ogg deleted file mode 100644 index 1d858c6268..0000000000 Binary files a/src/main/resources/assets/gregtech/sounds/spraycan.ogg and /dev/null differ diff --git a/src/main/resources/assets/gregtech/sounds/spraycan_lock.ogg b/src/main/resources/assets/gregtech/sounds/spraycan_lock.ogg new file mode 100644 index 0000000000..d81e2991dc Binary files /dev/null and b/src/main/resources/assets/gregtech/sounds/spraycan_lock.ogg differ diff --git a/src/main/resources/assets/gregtech/sounds/spraycan_shake.ogg b/src/main/resources/assets/gregtech/sounds/spraycan_shake.ogg new file mode 100644 index 0000000000..1d858c6268 Binary files /dev/null and b/src/main/resources/assets/gregtech/sounds/spraycan_shake.ogg differ diff --git a/src/main/resources/assets/gregtech/sounds/spraycan_unlock.ogg b/src/main/resources/assets/gregtech/sounds/spraycan_unlock.ogg new file mode 100644 index 0000000000..555051c57e Binary files /dev/null and b/src/main/resources/assets/gregtech/sounds/spraycan_unlock.ogg differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/468/1.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/468/1.png new file mode 100644 index 0000000000..31101e7fa3 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/468/1.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/468/2.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/468/2.png new file mode 100644 index 0000000000..3cf38a228f Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/468/2.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/468/3.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/468/3.png new file mode 100644 index 0000000000..ab642f8605 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/468/3.png differ -- cgit