From 5569bd711e073d796ac851c392e245cd17c0136b Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sat, 13 Jan 2024 14:07:49 +0300
Subject: [PATCH] added bazalt_breaker + scripting fix

---
 res/content/base/content.json                 |  55 +++++++++---------
 res/content/base/items/bazalt_breaker.json    |   4 ++
 res/content/base/scripts/bazalt_breaker.lua   |   3 +
 .../base/textures/items/bazalt_breaker.png    | Bin 0 -> 672 bytes
 src/logic/PlayerController.cpp                |   2 +-
 5 files changed, 37 insertions(+), 27 deletions(-)
 create mode 100644 res/content/base/items/bazalt_breaker.json
 create mode 100644 res/content/base/scripts/bazalt_breaker.lua
 create mode 100644 res/content/base/textures/items/bazalt_breaker.png

diff --git a/res/content/base/content.json b/res/content/base/content.json
index 71b5d16d..ef2f084b 100644
--- a/res/content/base/content.json
+++ b/res/content/base/content.json
@@ -1,27 +1,30 @@
 {
-    "blocks": [
-        "dirt",
-        "grass_block",
-        "lamp",
-        "glass",
-        "planks",
-        "wood",
-        "leaves",
-        "stone",
-        "water",
-        "sand",
-        "bazalt",
-        "grass",
-        "flower",
-        "brick",
-        "metal",
-        "rust",
-        "red_lamp",
-        "green_lamp",
-        "blue_lamp",
-        "pane",
-        "pipe",
-        "lightbulb",
-		"torch"
-    ]
-}
+  "items": [
+    "bazalt_breaker"
+  ],
+  "blocks": [
+    "dirt",
+    "grass_block",
+    "lamp",
+    "glass",
+    "planks",
+    "wood",
+    "leaves",
+    "stone",
+    "water",
+    "sand",
+    "bazalt",
+    "grass",
+    "flower",
+    "brick",
+    "metal",
+    "rust",
+    "red_lamp",
+    "green_lamp",
+    "blue_lamp",
+    "pane",
+    "pipe",
+    "lightbulb",
+    "torch"
+  ]
+}
\ No newline at end of file
diff --git a/res/content/base/items/bazalt_breaker.json b/res/content/base/items/bazalt_breaker.json
new file mode 100644
index 00000000..59aeabdb
--- /dev/null
+++ b/res/content/base/items/bazalt_breaker.json
@@ -0,0 +1,4 @@
+{
+    "icon-type": "sprite",
+    "icon": "items:bazalt_breaker"
+}
diff --git a/res/content/base/scripts/bazalt_breaker.lua b/res/content/base/scripts/bazalt_breaker.lua
new file mode 100644
index 00000000..41cba031
--- /dev/null
+++ b/res/content/base/scripts/bazalt_breaker.lua
@@ -0,0 +1,3 @@
+function on_block_break_by(x, y, z, p)
+    set_block(x, y, z, 0, 0)
+end
diff --git a/res/content/base/textures/items/bazalt_breaker.png b/res/content/base/textures/items/bazalt_breaker.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e15563ffbcb86a213b8e8c8f7107dc6ea0ca984
GIT binary patch
literal 672
zcmV;R0$=@!P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmP!xqvTct%>9IPP4AwzYtAS&XhRVYG*P%E_RVDi#GXws0R
zxHt-~1qXi?s}3&Cx;nTDg5VE`vxAeOi<Ed@QfLw5g~$6i@1DbZ_W}N9m8oXWIG}2l
zkx3<mTz*vuzQTtHLWp5dVx~SPifMS(*FAMp-6eRIci*2CQ3@sld;;+-(+!JwgLrz=
z(mC%FM_E}?h|h_~47wokBiCh@-#C{X_VdiBk<H8#M~Q_}7t3AD%7#ijMI2XDjq?3D
zmle)ioYiWbweQJa7%pfl%Uq{5j1(5J1Q7yc)KNhd780~;q?pLidD6olbNnK?WO7x&
z$gzMLR7j2={11N5)+|m=xJlt8(EDQBA0t3;7icwX`}^3oTPHx^8Mx9q{#p~5`6Rv3
z(c(uy|2A-O-O=Pd;Bp5TdeS9Ba-;w)f3XO>pV2qvfq`3~Z_S-s`y8haK$d2ez5xyn
zfzc9WuY0^Z)IGO<d)o8+0U(xghJB}MG5`Po24YJ`L;(K){{a7>y{D4^000SaNLh0L
z04^f{04^f|c%?sf00007bV*G`2j~F}3Ofn0Fc4?}000?uMObu0Z*6U5Zgc=ca%Ew3
zWn>_CX>@2HM@dakSAh-}0001YNkl<ZILl*TpeE4O)%{PZ9wrz=K}GvNIfgJIYi3|z
zVBqD1n0fi~Wk!-*00W=D|0Bse7zRAJbCr=4LzvJtlWGVPE(u}{VM4c^R702u`H_$z
zjKs#bf{ONkY*EZeN}|DL2qURU7u^shQVoEG2`pR&9smI7<w=7&hQ%=e0000<MNUMn
GLSTY?BNIXZ

literal 0
HcmV?d00001

diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp
index 8c410042..4b53bef7 100644
--- a/src/logic/PlayerController.cpp
+++ b/src/logic/PlayerController.cpp
@@ -260,7 +260,7 @@ void PlayerController::updateInteraction(){
 		}
 		
         if (lclick) {
-            if (!input.shift && item->rt.funcsset.on_use_on_block) {
+            if (!input.shift && item->rt.funcsset.on_block_break_by) {
                 if (scripting::on_item_break_block(player, item, x, y, z))
                     return;
             }