aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorquerns <33518699+querns@users.noreply.github.com>2024-09-19 08:53:17 -0500
committerGitHub <noreply@github.com>2024-09-19 15:53:17 +0200
commit7ba0fc903e5d14928d2b894b00a7b7dfc65eee18 (patch)
treeebb230105b63eee5cf116cf48d5827f7542a5c8b /src/main/resources
parentc24b78060631ea1868c06aeb3b45fd81218d379e (diff)
downloadGT5-Unofficial-7ba0fc903e5d14928d2b894b00a7b7dfc65eee18.tar.gz
GT5-Unofficial-7ba0fc903e5d14928d2b894b00a7b7dfc65eee18.tar.bz2
GT5-Unofficial-7ba0fc903e5d14928d2b894b00a7b7dfc65eee18.zip
Infinite Spraycan Additions (#3226)
Co-authored-by: Caedis <Caedis@users.noreply.github.com>
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/assets/gregtech/lang/en_US.lang11
-rw-r--r--src/main/resources/assets/gregtech/sounds.json40
-rw-r--r--src/main/resources/assets/gregtech/sounds/spraycan_lock.oggbin0 -> 10151 bytes
-rw-r--r--src/main/resources/assets/gregtech/sounds/spraycan_shake.ogg (renamed from src/main/resources/assets/gregtech/sounds/spraycan.ogg)bin20679 -> 20679 bytes
-rw-r--r--src/main/resources/assets/gregtech/sounds/spraycan_unlock.oggbin0 -> 10358 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/468/1.pngbin0 -> 4583 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/468/2.pngbin0 -> 4450 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/468/3.pngbin0 -> 4456 bytes
8 files changed, 48 insertions, 3 deletions
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_lock.ogg b/src/main/resources/assets/gregtech/sounds/spraycan_lock.ogg
new file mode 100644
index 0000000000..d81e2991dc
--- /dev/null
+++ b/src/main/resources/assets/gregtech/sounds/spraycan_lock.ogg
Binary files differ
diff --git a/src/main/resources/assets/gregtech/sounds/spraycan.ogg b/src/main/resources/assets/gregtech/sounds/spraycan_shake.ogg
index 1d858c6268..1d858c6268 100644
--- a/src/main/resources/assets/gregtech/sounds/spraycan.ogg
+++ b/src/main/resources/assets/gregtech/sounds/spraycan_shake.ogg
Binary files 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
--- /dev/null
+++ b/src/main/resources/assets/gregtech/sounds/spraycan_unlock.ogg
Binary files 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
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/468/1.png
Binary files 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
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/468/2.png
Binary files 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
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/468/3.png
Binary files differ