From 459a54cb9b95a6a6da420db4c587c95e19a0a38a Mon Sep 17 00:00:00 2001 From: MoNTE48 Date: Tue, 28 May 2019 02:54:16 +0200 Subject: [PATCH] 3D hand! Fix wool sounds, HUD fix for Mobile, remove unused textures --- games/default/files/3d_armor/LICENSE.md | 8 +++--- games/default/files/3d_armor/armor.lua | 6 ++--- .../3d_armor/textures/3d_armor_trans.png | Bin 71 -> 0 bytes games/default/files/bonusbox/init.lua | 14 +++++------ .../files/bonusbox/textures/chest_bottom.png | Bin 434 -> 0 bytes .../files/bonusbox/textures/chest_left.png | Bin 434 -> 0 bytes .../bonusbox/textures/chest_open_left.png | Bin 444 -> 0 bytes .../bonusbox/textures/chest_open_left_two.png | Bin 184 -> 0 bytes ...est_open_riqht.png => chest_open_side.png} | Bin ..._right_two.png => chest_open_side_two.png} | Bin .../{chest_right.png => chest_side.png} | Bin games/default/files/creative/init.lua | 3 +-- games/default/files/default/functions.lua | 12 +++++++++ .../sounds/wool_coat_movement.ogg | Bin .../files/default/textures/crosshair.png | Bin 0 -> 101 bytes .../files/default/textures/wieldhand.png | Bin 24584 -> 0 bytes games/default/files/default/tools.lua | 3 +-- .../default/files/hud/textures/crosshair.png | Bin 116 -> 0 bytes games/default/files/player_api/init.lua | 21 ++++++++++------ .../files/player_api/models/character.png | Bin 989 -> 999 bytes .../default/files/player_api/models/hand.b3d | Bin 0 -> 1023 bytes games/default/files/stairs/init.lua | 23 ++---------------- games/default/files/wool/init.lua | 15 +----------- .../files/wool/sounds/wool_coat_movement.ogg | Bin 9760 -> 0 bytes src/network/clientpackethandler.cpp | 18 ++++++++++++-- textures/base/gui_hotbar_selected.png | Bin 0 -> 236 bytes .../base}/gui_hotbar_touch.png | Bin textures/base/server_flags_password.png | Bin 524 -> 0 bytes 28 files changed, 61 insertions(+), 62 deletions(-) delete mode 100644 games/default/files/3d_armor/textures/3d_armor_trans.png delete mode 100644 games/default/files/bonusbox/textures/chest_bottom.png delete mode 100644 games/default/files/bonusbox/textures/chest_left.png delete mode 100644 games/default/files/bonusbox/textures/chest_open_left.png delete mode 100644 games/default/files/bonusbox/textures/chest_open_left_two.png rename games/default/files/bonusbox/textures/{chest_open_riqht.png => chest_open_side.png} (100%) rename games/default/files/bonusbox/textures/{chest_open_right_two.png => chest_open_side_two.png} (100%) rename games/default/files/bonusbox/textures/{chest_right.png => chest_side.png} (100%) rename games/default/files/{stairs => default}/sounds/wool_coat_movement.ogg (100%) create mode 100644 games/default/files/default/textures/crosshair.png delete mode 100644 games/default/files/default/textures/wieldhand.png delete mode 100644 games/default/files/hud/textures/crosshair.png create mode 100644 games/default/files/player_api/models/hand.b3d delete mode 100644 games/default/files/wool/sounds/wool_coat_movement.ogg create mode 100644 textures/base/gui_hotbar_selected.png rename {games/default/files/player_api/textures => textures/base}/gui_hotbar_touch.png (100%) delete mode 100644 textures/base/server_flags_password.png diff --git a/games/default/files/3d_armor/LICENSE.md b/games/default/files/3d_armor/LICENSE.md index 1877a25a5..07b9c3925 100644 --- a/games/default/files/3d_armor/LICENSE.md +++ b/games/default/files/3d_armor/LICENSE.md @@ -1,10 +1,10 @@ 3D Armor - Visible Player Armor =============================== -Default Item Textures (C) Cisoun - WTFPL +License Source Code: Copyright (C) 2013-2018 Stuart Jones - LGPL v3.0+ -Armor Textures: Copyright (C) 2013 Ryan Jones - CC-BY-SA - -Source Code: Copyright (C) 2013 Stuart Jones - LGPL +Textures: +Copyright (C) 2013 Vattic +Copyright (C) 2017-2019 Maksim Gamarnik [MoNTE48] MoNTE48@mail.ua & MultiCraft Developement Team Special credit to Jordach and MirceaKitsune for providing the default 3d character model. diff --git a/games/default/files/3d_armor/armor.lua b/games/default/files/3d_armor/armor.lua index 3bc3432b3..278b1bfe5 100644 --- a/games/default/files/3d_armor/armor.lua +++ b/games/default/files/3d_armor/armor.lua @@ -90,7 +90,7 @@ armor.set_player_armor = function(self, player) minetest.log("error", "Failed to read player inventory") return end - local armor_texture = "3d_armor_trans.png" + local armor_texture = "blank.png" local armor_level = 0 local armor_heal = 0 local state = 0 @@ -390,8 +390,8 @@ minetest.register_on_joinplayer(function(player) } armor.textures[name] = { skin = armor.default_skin..".png", - armor = "3d_armor_trans.png", - wielditem = "3d_armor_trans.png", + armor = "blank.png", + wielditem = "blank.png", preview = armor.default_skin.."_preview.png", } if minetest.get_modpath("skins") then diff --git a/games/default/files/3d_armor/textures/3d_armor_trans.png b/games/default/files/3d_armor/textures/3d_armor_trans.png deleted file mode 100644 index 83d9d1a6350b08a5d06a3df5fc6aae4c53b14f6b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 71 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6_&i-4Ln;`PC0G|Ta56A32{16O TKiEDAD8u0C>gTe~DWM4fxX}(h diff --git a/games/default/files/bonusbox/init.lua b/games/default/files/bonusbox/init.lua index 4dab48672..b6afdcff9 100644 --- a/games/default/files/bonusbox/init.lua +++ b/games/default/files/bonusbox/init.lua @@ -40,9 +40,9 @@ end minetest.register_node("bonusbox:chest", { tiles = { "chest_top.png", - "chest_bottom.png", - "chest_right.png", - "chest_left.png", + "chest_top.png^[transformFY", + "chest_side.png", + "chest_side.png^[transformFX", "chest_back.png", "chest_front.png" }, @@ -66,8 +66,8 @@ minetest.register_node("bonusbox:chest_open", { tiles = { "chest_open_top.png", "chest_open_bottom.png", - "chest_open_riqht.png", - "chest_open_left.png", + "chest_open_side.png", + "chest_open_side.png^[transformFX", "chest_open_back.png", "chest_open_front.png" }, @@ -92,8 +92,8 @@ minetest.register_node("bonusbox:chest_cap", { tiles = { "chest_open_top.png", "chest_open_bottom.png", - "chest_open_right_two.png", - "chest_open_left_two.png", + "chest_open_side_two.png", + "chest_open_side_two.png^[transformFX", "chest_open_back_two.png", "chest_open_front_two.png" }, diff --git a/games/default/files/bonusbox/textures/chest_bottom.png b/games/default/files/bonusbox/textures/chest_bottom.png deleted file mode 100644 index 824d6b8bf5d843a28415e236bbe9fb97cf756b10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 434 zcmV;j0ZsmiP)ZNfwY)ADmq#fF)M~00001bW%=J06^y0W&i*INJ&INRCwC$mP?Yu zFbD;cv8>$x#^X>U8j8U7&xXJ5y-{KM&FJypiu;_d`@7SB|ut021E8pHLjpUg)F)RehNgO zi)slFeD0&ZjmB*&a26oY{G_uuWKaocLPkitfCn={1>#xs0xOmaXm&Q_O|;e}B?t`5 z0)eK}eUuV_S}6hRgnk-qaq#pP*tOv2l zrHKfwE`;_xehz}m_4@$aFcn}T;AiRqV~YoB%f!dbL{`ReX3`{>2&}a77Yf=I=fRBd zN-J=)03QRh!11EOr|t!h($07*qoM6N<$f)D(-DgXcg diff --git a/games/default/files/bonusbox/textures/chest_left.png b/games/default/files/bonusbox/textures/chest_left.png deleted file mode 100644 index 407ada7ee977086ed01fe01cf90604a3a7d28efa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 434 zcmV;j0ZsmiP)kNCU{fF-&Iw0004WQchC`$NwuBPy_s_9L)9uNBzG^g#5-x>!x2sNY}WvZ z1<+{eUzH+^YU)g^dmi%{RREHS%%23Ppsb)Y)&lxx3|64j!ODYF9dHTcSU~PxsE5Rh zqYl#Z!B~lMDO*n^M&xc}%}w)~K45q&?}0hHl;VNSWCsj53~l7<`M}UoJU9urusoJQ z5;KyKabQXgS^Hy-KCPdiNBj!BOP1)(w1%=**TFp9JEnS2CXD2MIP4^A;!r*lnn1|^ co|O|k0p(sHk~8lT{r~^~07*qoM6N<$g5H&^4*&oF diff --git a/games/default/files/bonusbox/textures/chest_open_left.png b/games/default/files/bonusbox/textures/chest_open_left.png deleted file mode 100644 index a75a9bdd5d76b47ae5f331690160d2cc44c11e15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 444 zcmV;t0Ym4T3Xdn>A3&^00(qZPE-H?|NsC002)gJMgRZ- zMoC0LRCwCmmSJy$FbqWDJdgDM|KXW&auXIQN06qC*Gjk_@@g&)?Xs-v0{Z|w-f@l3 z>+-2X!FC9+O$x9J;x#L<2MKI8M0<$9F)zSPf&G6$&4i%k_XTAB7J9~cK}vM`f>q`( z3hrmX78W02%f8`50e;|t1tS3xJBR{}av-pz`ey1RLDO|1Ac|m1V&O`n+!8UwT%8Uh zV}S*+{8cDnRhWbpV%gVmJ*&M1DMYS6320C{K+qTH+jyq~9P~1{GzV;f91Uo508$Rc zH^&@+$fMj&qCCo8Q-~A!Gy>o?$buH3gFMQ6;mNL2GVn8~Q0BlAmfkX&gCU~~tO8lQ z8Qwzov1}FML)A&ufiB2dK(mXG1f9-_xC{I(>7pN|KGfcx17#9>8MvAOPB;P4GVnK7 mLu|*VMH396;GzE$FYpCwmp|$Nw)F)70000k4UI-V|$Ar-fh6C|EI_}}?o-Hlhm xv>}PvjqgW2lkB7wT|nl+j650B1PhT&2Hq?6KVSQassQydc)I$ztaD0e0ss`S9V`F< literal 0 HcmV?d00001 diff --git a/games/default/files/default/textures/wieldhand.png b/games/default/files/default/textures/wieldhand.png deleted file mode 100644 index eb110d2c1876ade068cdb4174559fc33bae041fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24584 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 Sf^sY8xC&H)3Q%q39Df5lv^ReM literal 0 HcmV?d00001 diff --git a/games/default/files/stairs/init.lua b/games/default/files/stairs/init.lua index 5bb42d0f4..888a311d5 100644 --- a/games/default/files/stairs/init.lua +++ b/games/default/files/stairs/init.lua @@ -1,27 +1,12 @@ stairs = {} stairs.mod = "redo" - -function default.node_sound_wool_defaults(table) - table = table or {} - table.footstep = table.footstep or - {name = "wool_coat_movement", gain = 1.0} - table.dug = table.dug or - {name = "wool_coat_movement", gain = 0.25} - table.place = table.place or - {name = "default_place_node", gain = 1.0} - return table -end - - stairs.wood = default.node_sound_wood_defaults() stairs.dirt = default.node_sound_dirt_defaults() stairs.stone = default.node_sound_stone_defaults() stairs.glass = default.node_sound_glass_defaults() stairs.leaves = default.node_sound_leaves_defaults() stairs.metal = default.node_sound_metal_defaults() -stairs.wool = stairs.leaves - -- cache creative local creative = minetest.settings:get_bool("creative_mode") @@ -534,11 +519,7 @@ stairs.register_all("snowblock", "default:snowblock", {crumbly = 3, puts_out_fire = 1, cools_lava = 1, snowy = 1}, {"default_snow.png"}, "Snow Block", - default.node_sound_dirt_defaults({ - footstep = {name = "default_snow_footstep", gain = 0.15}, - dug = {name = "default_snow_footstep", gain = 0.2}, - dig = {name = "default_snow_footstep", gain = 0.2} - })) + default.node_sound_snow_defaults()) stairs.register_all("ice", "default:ice", {cracky = 3, puts_out_fire = 1, cools_lava = 1}, @@ -611,7 +592,7 @@ stairs.register_all("wool_" .. colours[i][1], "wool:" .. colours[i][1], {snappy = 2, choppy = 2, oddly_breakable_by_hand = 3, flammable = 3}, {"wool_" .. colours[i][1] .. ".png"}, colours[i][2] .. " Wool", - stairs.wool) + default.node_wool_defaults()) end diff --git a/games/default/files/wool/init.lua b/games/default/files/wool/init.lua index 749555953..4153a6332 100644 --- a/games/default/files/wool/init.lua +++ b/games/default/files/wool/init.lua @@ -16,19 +16,6 @@ local dyes = { {"dark_green", "Dark Green"}, } -function default.node_wool_defaults(table) - table = table or {} - table.footstep = table.footstep or - {name = "wool_coat_movement", gain = 1.0} - table.dug = table.dug or - {name = "wool_coat_movement", gain = 0.25} - table.place = table.place or - {name = "default_place_node", gain = 1.0} - return table -end - -local wool_sound = default.node_wool_defaults() - for i = 1, #dyes do local name, desc = unpack(dyes[i]) @@ -38,7 +25,7 @@ for i = 1, #dyes do is_ground_content = false, groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 3, flammable = 3, wool = 1}, - sounds = wool_sound, + sounds = default.node_wool_defaults(), }) minetest.register_craft{ diff --git a/games/default/files/wool/sounds/wool_coat_movement.ogg b/games/default/files/wool/sounds/wool_coat_movement.ogg deleted file mode 100644 index 89df47f44beba789507a63a4713b4ee4fd6f7642..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9760 zcmai32Urx#vYsU;$skB@LDCY0RkEP4eC2LqsF$r2WXCFhJ}1SA;9NR9#m zN)%881Vw~53+LQ>-hJP9Uw^$lJzd>ZT~&Ye)XZwz+Ufy#z+dIawm=2fWv1TYhpNDluysf&cgeijf=Oft&JB9w=Yugrzo$lBr5`z%ixWTivf7mq+lXCnXIDWU4J)FQELVOAOHgRNMrL>)f@(;Y?*jtJ+h_jwIqw6 z#F4s-QlxKw@L0JN))hLs48picE*KL6pe5y0IYQ}CxW+P^Ba8`bp0axMa1^C`kntC1 z2a#Rtfd*?_+sIGUlHMrJi6tErPk8_YDmxYfP#BL z5HVX*BS>)U!(oLf9w4i8wV*%%s3xEiPp?)@-(Su8euPVVS5TKuY~;FQhMG=?njeN*Fope9fBG*R;_8{|PzaEHMJo9-ESK|A?kA~S z{E)D6Jir=f5-4c`CoCaPt?-^hrF~k1U0H*3e~n;&4aM0M00K_Im27)#;s2@kjFWBt z|0-wK!w<-Tw(NFi?RMuM+)GP>ljxaNc`Jn?_twG763{uccFVF_@T0B{N3gTH|5tYH<@i*o(lV@zyu# zpY!_*7A3dS2VYAqfh!_Dq&YT`nuEPx*6Cm0lj6qy6FzdF-z=t?x-x>G{;@=s^c;m8 ziR@m_C=;{cJ+OTCm{?_GNw5xznYX|z=uC4c0EAGVq4@9S49e#y&QFNs@8hc-xYjR- zYs%jaN^e%ZrB9`%PAsV)kf7GGxth%(^U>&(8q<38wt&cYJaW;PLJ=+*+KJC3Q<-af$ zbLV2%e*)`YkpqB16LJ=l7|UpQcY3fEg7nB$a~?JeQ{MlG99)QSO2vLw zO(6Jp3ev*v6qL#pAoWS!i*){@OlA5_ul1ug%SsL#e)m1VB{!yaQ!24I^e7dU^LYTYVMuuC_4fg)Jy5&KOF!79dQ)u zXXl76N@xNlHh~gC>&yQ4hyke+qMBo(pkb512M7RM0i7H|9qAE=aFI14fv<8A=139c zykiO}qP|Wcb%E0>PM%lxWrEaOioHb?AA_Psa16IZEcC*gLNm1$NfPkbBLH*(AOPM2 zf5+r8sMedUI0z@r!1PG*79@_U!Gw~TuEV$sX{|n|=Z&iM=3|)DBQx@8ts*MGMF27Q zBhML*V}Quf1Arw3iVPNtK@GxI<4}F@6;>2dswiD=P>O^tqz_J%5ljs$VAUIhb+d*H z$giXa56klb0JH-F{t$ek)=B_1FRP&@MWgoupFP&zA-A{`%U4=jQrh5L zT3KP5yIz`G+E-&+T3Oy#^P;TMX%nPY7MIotmX->Z)s+7(72IqnE^V&ptEoz>EZc1O zM*dcCv)Qe*va+mZ3rB6P*z9uOY!>k=g!LDeeQ7RfZg$yhb{}YPX3Z=8(#GHarmC;z z+h((Hoi~Rr+It>j{@D=J!}-qrOw+^A8s{7B6~FsH2BSZvhFn>jz-6^AEZ|tzp1>^& z$=Cv0EV$FsinP+Q%^DYhx8<7%U9`V>lFfpIx$#Ap1&LVGshHf-FU|b@ZJ;3dT$d|r ziwLXvtT;%>sHq_Lx9T}09dexQa{n#;`M^8x1qEsMGY}gP95(3sr;p4o3i4t!3v^B9I07^y)|l8 zd86{GCHb^^Y9;j`tAcz+btJrj-qZy?$qKH>r!`fBbIJcwyTPI14oC7E>Jjk0h2nix}MR|1-^O-X8M>ZAlv`059fXerF7CCDlP6%DR1b!sY1 zb^r-jR8;-y2Tv!lgK?8`oD6mF3E}yy>4yP$>IC2easi|^*|;MF7q;@@s6jP*YL5Xa zep1AM6mN-#1_A~{56F{n*AGg;V4agvB-{mz>ij~T297Wos0El}W}k&Ek!D0EgzSPb zDWC{OaTgRkcZiq^n1Y9y^69OpISZITzZB40fwpDxq(tyDTMf$d!9sM9{IF1Jq#Abt zn0k`2g87`&Fvf@#+|cLZ5d(5ed7xY=TWZSzsdZLS@ML5Sq2%vM52i$r zFo4?tpH%}=U_*@n31GgL6AU&5m{A-7h1`IGW3U1*907wO0|0(EFe9qcwe}2(&j!y- zJm4Yj%tT5N=U|j!T~JH{3KR#bRN_Ga+OE?8N5GhDK|yFZiTO~2u<9~VKvr}bIaYEM zOj?$UO@Sb;U&T5iL4xD^CIFZtBnGPRS(LhKJExM#9(96-Z#6 zDPWFM$b?Hhz=td@|A+<&;B6O3kXmEKHR+zQ|4vN)-2*fH|D!|+m}k)#fKTf#CKi(O ztX!G)?AFTZuOvO?{PrI?`@ggI|JE~gtN; z2T+PMNkQE>PSmu#Dy(4ABuWSjIV5;%87&ru0;hCNTb9G~M^RvWGFg>_0c7F`ZrxD` zRzGPOT@TtHJRv46qr@gn$bm%{Hy}W@$~`P8zxK_@;+d~Gz+@Y7W^LSy0Sfd*HV!Qu zibxPuIE-+FfNnS+3yJ&J7`61;IkZ4Pt)0)q=pfFZMUn%K!Pr2M@tyU!!5-;(0(S<+ z5Lz&m!+@O6$1t>@jI;C(gTf&aG!2e$2Gz43DF@D6XOlV3*Wz+P5Tf|FQ~1g{S6&~d zljzbLd>y+UBoIIW0PfQco3P0qXlHszvU*6I2esu@8dRi|O0|tDb0^aT23|m~hjLs` zw~W@+&agtl-H!6X5Ws-!s*Yi}83DmE z?KLtAvhEPiQG0xVI;4jpKHP|cmaa4~*HRiVGP~PD96%8hQx`?PeyxMhe9jvh0wv%G z?}X6D1q9Q%Jot1$`{ip=X{7?n^H*jFzzzTj7oeP+SgBabXH;?2@iYmviF6ncz5uWY z37`T3xCq0;!|%oBz5R^OrDz?J|8ALp`;3fhNJ!3KRS3@d=daXq>gQzKD>Y8c=#A}A zHomufFdlw>{;OB73J(nqj8Bb^jtmV9P7RHX^uOPy&!df=tCXB8H4c;~O0&MXClh(f zyYbz(H2ksI=2Zuu`}IG(Gw=ZqF#^8Gj#WMAxvE_||88e*eaWG^MM-hbyz zP)Vh;1OX_1Rl)(N1Cqn@bz0R8xV*e@tOHzHlj3O1t@OxQ7a5u zle@@fSrSp8Hts_IFz4hCE)s2VWO&u~dT-gm%)P~?R|znrVgSH!ZESNb` zg+&A+uC7OO&A8C@hC^PiP@O(eG@&;WeQ&kobbSmtaCtGHb}TTSKe_4+p3btEr0sZd z{@N?T5w1vw7Z5MPwNakf6N1beYSt2C;2SeURQO_kF5nl)z?US;(>S{$u9^HTe!>Ic zbU|H2=K)Vb&wwah3IKW46jrmU9+V*jgwE7nJb~(3G+!S?HmrN80M>u@rJtEI$zE}9 z@{xGb5VxM~M zKrOYbC5wYsmWP_kt|^X0W?EkOuBg}OsseCI%U$>D*ocnIqLF^)7U|32hZdPEwmirS zlw^7)dzZ_$N0(roudyQZ1Ox>>q}`BKu1xDpdV!q@n1e0kdHgUosSO*}G>U->`#@HSZs`*`d5WrPFi zlumW(H|mXsi|^Sv_v4YBbw+MFX_uAbkx#@w7Ew2UK*+r@OnEfB8y<8hPi|KAY!Slr z#`7vYf4o51F6_r#n!(zML-Li^*7!I1=b?70EPT?X4}4ENQ3!|n7~Mou*|}RKfT^`R{_o+?4@W+->2!wt_HTqp>rp9@qo@Qsr=ZLIXW_0f(#m5{4&R|Nu^?csM`QcWjs8<P1Br^`{l^X%wVr&{)rI*|jCH0(j>9VlE@zAZ*fjR7a zAlU=!0JbV-+6B7%T*#KmT3Z*H#ZU$DVD56{HidV%L#eIj!H0a=lHWE7?m4! zEdAP7*px0ez=qNB#B+CAb#$46tIP4=Qas6M*T%zf^>;JH$*B2U(HJWKR;6c*#pxCm z-`B>XXK1*ES9Kj)fH5O?Ge<$9C)+#<+xfCy=6w&4MEu{B84>f-$>u+vSJ8*>6N-$v za<571=V;i8T$1&&HumnV5wueddTmn&`X?kvnQ&C~QP0wlQH88IzB4+Bw>B{a0vJ8` z(SESCy|um95qztrWUYO7!Mydt(bQa1y2s}(GMYf{82`aHKkY2uQC4|Bah}?jStrAc zJa0`}$Y5-Y+O{6s_{MwVQm=p^?LI>op{kqr{!H`s%gv`g-1S$M<5uoB`kXehTG>Wc z4KlWaJGQIX|Y1(QXIXabtZ4Iu+B1W?QPXHrYzk#zfw!6ctA46j}$* zZD&;KQwtA>Ayxj1&6*bOvL8V_O}$RWELlFGiY@}WroJz1=3;=4;&lNeL4fS|n^@;+ zdtp2ggV}~IPsCS1(4@@y&Z(#5Xa6q4cGvb-O%ERKO^>ZEF!_ymeCUs=_8)p?tSa<$ zPK@TguhGL=I)~W$n!KJzD7GuTw93)%E%s&HR_Mu#o?At^w)$swL5YJOw8M#03+)c? znk8UzftFKI!n^JcLFDqX)6(vBnY6aGI-ScN9&Byzd0dBl58sciC)cajIdTmyX!XAS zHIi8Jr=U@zV93XoevkAfjNwDkNN85WGX&XhC+b}{{TH=@);v`&9{`|6`j87E*}*2u zrZd;GWbS@I*J}v~!66-!KMZdT`hCQ@FIEkjde)BeWN9V8epqBa%R08`{2f_Sks~=v zspZO$i*y{V+%^eG)8-%1o_Ke==u#Hi*`YXT=d)TWCq=^Gy7rZi$rLxTa@}3Ij_5cl z4`1T%PH&DErB(iZv4zEIykKC`P+?7fJVyE6pz;b0y~3ptG%6XB>pl7BW{C290kYi0 zui(!9%)(P)J^P=u2YsAEnBMPKY{_ESi}Ou->1futct(~aH4DFAY{&ia@R5f?O`4d% zOGo{qm+n1#09{euH+FlNpyOxXkFVRWecQdq7Qbz0Ex@d>NmgsWqjU~4Xsg@FC_Ws>5zC8Qyj_RXS71IZS#Ha&P2wL_54$f- z&7aanM=PYFQCq?{w|HUTw{r3QTKRXTDjkw|?~bkc?C`a{q*AO_42eN?GWkO2d7yGs z^>v#bRY3&N)yRW-0}s3o+pqq!fByXXemYk6!u5ji-puq@RFFB7_rb$A(T_F~P)hN5 z5N3C)h@;8Fl4gPA&X0T15u1wNehHK$IKiWxNzGfyO`sK!r^j09N5LwqO`_sfQ{4m? zZ|9nlG~O)p?fy8$G4*}D(6mmMU&U?bV~}{=PxsGb_^HjdGl+24qWb5d5yB?}#3N+$ z^Y*c8R7t*x<_fcV*9Bzo(i3>oULG+xtZmn+wgolz8P|7Rx~_Fi9DEQ-VE|(84!ruF z!xJNdVe~__gt*CX_#!fyr&0agwZc!zC44S7QfNKY;Axrf^!+GdDj8QKP}J7OS!uD) z`G&>p>boSNwP2li(n*;Jo*tU~oKyY^Qltx(0rT*K)h6d;My~6@H>s`6A>VjM>z|XY zsaPkqr`#?*+N~LRgnE7-b8ZqnhJHui)r<=<{l2 zZtRsm+)o zo4lHzWqr$aiK*YUAFc0kIiR(1!|()K*8gwa`ST)Z zL%$1w`dA`3Z#p>rc!5X@ftiDQJbVTDmuNX0n%xy5&;$ z?pGAFuX9JRxz8d>Fu)da$w_h7tYTaO;S-WMnc7#=<2aP(*7T}Uk({)jm|DYsM5|eo zGq9_$cCn=?Af`F;Q*;~=aFqq%`V{Z1-t~j>A{F0v^`YZCC zq625=*NmC7R$bGj;n!3tyPHhr^^f08WolqUCfHl7`VpFcZh9_T2X^^=w@;=NvA^6a zMagD(_a^$b<96~hG2{1HFf?h!hq4=C%k03f872cL>GJE+T)C(aZl|33oaz1UNe|~X6UAEmMUSRfCliQ#- z>mBn+ip7?3Y18YY8xN|F2AtbF4|ZB#J}e!*^x3Xxj%ANrojc^`Qi1-rz0~y&1)~HAETcz$)MBfhhjgekUD8XHnJ`L^bJ$l_|_W;9iJqA%}IT3MrjNUKAP^J^=*VE zl(m{^6ov{{6ImOI=<|1`SC@ILr<<*t`{;@GHPpOcx>HfylhdN0D@po*CGtmYXY>Kv z6sQr3F{4))W<2*X5G5Rn~#I z`UeO~7i)_acom86_gMda!BC?5YCC&T_g{iH2mE$cO3Mmg!L4Jj_6E8|mDkIpPB@8p z_7G972vm~P9_#4~$SUb0*pSDnCS)%RblN0{U>x3M*Q}{*SA1hEsZIT_d({SRuY7NK z>36q~klS^z)!!>d>J;!0t7k9*sWe-V+#Wo}BUI(*nEJa~I zf9kh)1%R89@344&0hC8Rr)6R~yOLh!XxcpYcSHg0x8~blt$bJ!DoM-yb9&&rv(M%r zx#m~>D!ipIJ>5ebj{)x&`2wR;#Qc+v%CR!@%h^Q$q1%n9CITbZGFy`bVrF&<=lz7l zWKy9enRkLwN8P11vj_vlcm92h42`O)ifir|ck)3!7Nl&Zt-C#j*iQaemnnla&8zV1 z<_4ngvZsj$z6>h25t7YUn67(PNC$W91&}}f^b>g^vc=8H9%>;aUz#=~y6QkJn`CGj zgMqY3aETDUBaQ@hQSSOp1mT%5uzyzkhX7c+zgNEZ%lY7@|9)obwd%&N&YB}8H?6;R zGp?@XJae@d`a00-mFgJWxgE_mY#o`Gu&eVD?ZuTSkJ&HS0f!fAlbGFZ{z<&VtWq0g>mt}J|0=FostQk)GF#+s{&kuzlLm#*n&y?6CjmJj z`Y&}>pZ42@SNC%0G^6A68$>gl+MYfWE7(#D9X|zHoh68}=;K|CD&zOa9^P0CES~2y`490w@NPyv zY$3kK)!=s9*Kc@sM#V5#)pGA(X8YA+^S*CJtm*BJ`guC(yG&xvd^-jeM>BEEe$jPI zmyMhQlTqek$^uU$kSGbudH!ksoan8&xBa)Cy3;>#06&BSw97{I$*7l$Gbr%%n7D^w4B%TV~eW zG)X?0@3>DTzS3*wkqO(9FvmBtSZtbBg5aTV^5Nkj_t2rZ%Vsu0@M-T`ows~Fni&zl zE&8uA58fG-eqju}SmPes7+Meynhb8V6+OD+R+X>MCF~}V@YGE2N_>r*`1fG>TDS1n z+n$GyT;aW9<0TNgjP91_NV;hx&leLDWxH0ZhWp|~TkqE%tMoR5-!g9-5rh%uWELKKQmG z0sv-(x_H6xr)k{c^3@VtAGj0VWy&39M&5W!5T0DIt10o~QpFuQb3w7EM~N|221oH? zv;|bpx#7`H*AbgLk=`Sv_PrNi_LqovSKo%+#)^J!pLphI_+-MS(6kE!9m=ZA-f?-2 zoSHj2@h(CNS6K4z(%2$y(8&o>u&a-VZv}l$cKe|K4BR7j%N4`wUv6H~3^T)PaBAARoRgd8t_ z&CWpIP>YJO>j_cbxK)Jqll~z;>b2A2?kP~FuD~uEe-8#(maQ27$)DG3Zx%yNDCK|uE*(lMuTvJQk1eP<@_WK~@&-@v+2H7MG9*PrW}e`X z9i8!{@9IV4T^N-?$MY1Xp66eC$H_Zd9|gRso>%&vaIjK3O}_TT!e(c@^+c}M8d#n$ zGVA~XY;M+1)Zoe7ay%p{40yBi`Jt@U%BwnSQX;vQ7QF7!g3ZU8jt)`0nAPXtcj=Ed P$A^M 0 && hotbar_itemcount <= HUD_HOTBAR_ITEMCOUNT_MAX) - player->hud_hotbar_itemcount = hotbar_itemcount; + if (hotbar_itemcount > 0 && hotbar_itemcount <= HUD_HOTBAR_ITEMCOUNT_MAX) { + // Hotbar over 8 is not supported by touch controls. This is not a hack, but a quick fix + #if defined(__ANDROID__) || defined(__IOS__) + player->hud_hotbar_itemcount = 8; + #else + player->hud_hotbar_itemcount = hotbar_itemcount; + #endif + } } else if (param == HUD_PARAM_HOTBAR_IMAGE) { + // Set the touch interface to fit the size + #if defined(__ANDROID__) || defined(__IOS__) + std::string value = "gui_hotbar_touch.png"; + #endif // If value not empty verify image exists in texture source if (value != "" && !getTextureSource()->isKnownSourceImage(value)) { errorstream << "Server sent wrong Hud hotbar image (sent value: '" @@ -1177,6 +1187,10 @@ void Client::handleCommand_HudSetParam(NetworkPacket* pkt) player->hotbar_image = value; } else if (param == HUD_PARAM_HOTBAR_SELECTED_IMAGE) { + // Selection texture too... + #if defined(__ANDROID__) || defined(__IOS__) + std::string value = "gui_hotbar_selected.png"; + #endif // If value not empty verify image exists in texture source if (value != "" && !getTextureSource()->isKnownSourceImage(value)) { errorstream << "Server sent wrong Hud hotbar selected image (sent value: '" diff --git a/textures/base/gui_hotbar_selected.png b/textures/base/gui_hotbar_selected.png new file mode 100644 index 0000000000000000000000000000000000000000..8240f5e39dd221438517202e92f4df926f993e3a GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^At21c3?$#V@_qtRq5(c3uK)l4Z|GkJBrjdRyZ^-1 z`KxvTWwx~_$N(wEk|4ie28U-i(tw;+PZ!6KinzDe3`GwZaI`#(IKU*fp`kTmMLp-z zHxuOEr|zylYo7WrOs!q0F~sHStPs}(sSEt9Y%5i4k{Vy$+nxNe=i-!kn||o~zD`V( z3Yf3N+YtO&y?aCAmGcnr~9@Wz0+G%H_12CTK@SK{^d*l c8Mo})rFA|)Y~vgepo17ZUHx3vIVCg!0Pd7yhX4Qo literal 0 HcmV?d00001 diff --git a/games/default/files/player_api/textures/gui_hotbar_touch.png b/textures/base/gui_hotbar_touch.png similarity index 100% rename from games/default/files/player_api/textures/gui_hotbar_touch.png rename to textures/base/gui_hotbar_touch.png diff --git a/textures/base/server_flags_password.png b/textures/base/server_flags_password.png deleted file mode 100644 index 60d515bb2f2d27bc0ef06dcbaab026aad04ad1c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 524 zcmV+n0`vWeP)loa4Gj$=Y;A4Nh>MF)28tUn z-~uO4o@8FXeti|t1^>IdyX}$Xo;-Qt4wU;^Utd25rwf>vm{^#Znbp31`*!#F^XCtd z6#>OBadUIO0D40kp8*VvjEu~G|Ni|01SpFB{rmR^i2sA+aT@UbK@%4X!$($jmY+=e zim!P7-}B=8e>V(>4SBeJY~*G9_nC=>@f-91|6o0s2K;`zZHg*$g7OPd+~ z{6EXU@b@gkU$OK2->2*`;;WPK(VVAsXb$sEWCK_LebdE(RZ$QG&{NNF-Qy5F;gAKg zo%wnTcbJw{yA*(q$Ey!F?q0iYo*q8c9i1_xM>pmVZeQQ6@0wTtJL9P)?Po2{6j_)y zwP8U||49&pOp=vcCo3&Ie@i$J|4C5v4~Ib}%wh)ge+i)Uqz3w}1E_`yCRdK|!>NPr z=p{YUA<30sx<(|E2ni;#d{v