From 7ab8825460ad26a4697fec52a11c864a6cddde63 Mon Sep 17 00:00:00 2001 From: ForbiddenJ Date: Wed, 1 Mar 2017 16:28:40 -0600 Subject: [PATCH] Make trash configurable but preserve default functionality --- bags.lua | 7 +++++-- init.lua | 3 +++ register.lua | 7 +++++-- settingtypes.txt | 4 ++++ textures/ui_crafting_form.png | Bin 2658 -> 2962 bytes 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/bags.lua b/bags.lua index 4af4ff5..3923dab 100644 --- a/bags.lua +++ b/bags.lua @@ -51,8 +51,11 @@ for i = 1, 4 do elseif slots == 24 then formspec = formspec.."background[0.06,0.99;7.92,7.52;ui_bags_lg_form.png]" end - formspec = (formspec.."background[6.06,0;0.92,0.92;ui_bags_trash.png]" - .."list[detached:trash;main;6,0.1;1,1;]") + local player_name = player:get_player_name() -- For if statement. + if unified_inventory.trash_enabled or unified_inventory.is_creative(player_name) or minetest.get_player_privs(player_name).give then + formspec = (formspec.."background[6.06,0;0.92,0.92;ui_bags_trash.png]" + .."list[detached:trash;main;6,0.1;1,1;]") + end return {formspec=formspec} end, }) diff --git a/init.lua b/init.lua index 67bc56e..6929600 100644 --- a/init.lua +++ b/init.lua @@ -45,6 +45,9 @@ unified_inventory = { -- "Lite" mode lite_mode = minetest.setting_getbool("unified_inventory_lite"), + + -- Trash enabled + trash_enabled = (minetest.setting_getbool("unified_inventory_trash") ~= false), pagecols = 8, pagerows = 10, diff --git a/register.lua b/register.lua index 127df7e..bd6a13b 100644 --- a/register.lua +++ b/register.lua @@ -175,8 +175,11 @@ unified_inventory.register_page("craft", { formspec = formspec.."listcolors[#00000000;#00000000]" formspec = formspec.."list[current_player;craftpreview;6,"..formspecy..";1,1;]" formspec = formspec.."list[current_player;craft;2,"..formspecy..";3,3;]" - formspec = formspec.."label[7,"..(formspecy + 1.5)..";" .. F("Trash:") .. "]" - formspec = formspec.."list[detached:trash;main;7,"..(formspecy + 2)..";1,1;]" + if unified_inventory.trash_enabled or unified_inventory.is_creative(player_name) or minetest.get_player_privs(player_name).give then + formspec = formspec.."label[7,"..(formspecy + 1.5)..";" .. F("Trash:") .. "]" + formspec = formspec.."background[7,"..(formspecy + 2)..";1,1;ui_single_slot.png]" + formspec = formspec.."list[detached:trash;main;7,"..(formspecy + 2)..";1,1;]" + end formspec = formspec.."listring[current_name;craft]" formspec = formspec.."listring[current_player;main]" if unified_inventory.is_creative(player_name) then diff --git a/settingtypes.txt b/settingtypes.txt index 1054fa9..910989f 100644 --- a/settingtypes.txt +++ b/settingtypes.txt @@ -5,3 +5,7 @@ unified_inventory_lite (Lite mode) bool false #If enabled, bags will be made available which can be used to extend #inventory storage size. unified_inventory_bags (Enable bags) bool true + +#If enabled, the trash slot can be used by those without both creative +#and the give privilege. +unified_inventory_trash (Enable trash) bool true diff --git a/textures/ui_crafting_form.png b/textures/ui_crafting_form.png index 02d337d64cd5ce0e3706f21ee4cc345e199bcfaa..8c980acc2d1871954bd643e9c35241ec60e914e4 100644 GIT binary patch literal 2962 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 K1*2!q@j?OXSfK z`5&um1CHtL(AG{&7n75+N$?hnHdORBxeTwh*^tVBMMH0V`c@Vz^H5Fd#Bme^W$5`_ zt=`hdQdW^*?L(wkS6(C_urlj4BC}7dYzN1#E%fj=BJ?bkjmOrzx^CFsXD08GHWk~u zDZ{9^-k<+Uz2k7h5cTTKV}m6;tq9 z1XVc2JSw2J(4ySH_GV=_B<0wwRi*5_5_bm0=>RiL#Mm|5ie6#3PnMHtw8~ZLBG@Y3FT3!0|aIa4{EQ z0CIi@1SDhw5)v~32}?zRL|N?Qvr3F2GY6IYs{AQv{d(3R1rho%_y-3E!8@BgqgdA5H}vqr1Iibb4Z z0B2Y5xwZi-u|-Mk6{H=a5Pikd{h7~-p!s%BFVd5aKtQKQ_9bYS7S@)3Hx@HVr;8OO zaT9Pl;m@(BZM&Y^P=J83d=YE4;AoV9>qjmh+;Fhy@FvwG~^) z41cJ%^psj|)3jDuIuWwf!{&fl_wwakhwA^ZmV0^sNH8$MSq4Zfxq@r2HvTy1wse-c zlgROmEbb29U@C}WR~ydYlRe%iG^a=Kg;m5B=9D(Z`ohR05Q0UFb{ z*i+y#99-rDqsG3O7V*4#HJnqXvu5d&*M1k7Vxi$xBq-%5QI8qz-`sf8&{uOd>(tB# zj~a^^_Z7_}T)+#wPDu>^HX7^kHZ{+sVC0UUg zKLn!Q%>vxr9|vYN*C|%VACAxG>#>n{ZC2NaHFFnYpv|@I4wiFT{J@_2tYn-wI#0ZF z5W`6y*GcA!lbxgy*D*Yky}(Oy@4?|Ur%F>Oqpg>{&N4Qqu0I!FOB9fQi{xY2hB@2o z-yEa`8@pMN{t-V%jH-sLCrYzKhi*&!5Jx{|`rjXI-3~f%!fYzvLY)|&1|x{ zH93|KdDJs)Z%d4cL@db`J4{mZDjZ#ID>IZYqD|#F#b%r5w|b2w%wVsgeshHa8e$Yr zc|)?zbYMesf#4cb!RT4qIg`EHf)_4MWg>IjdMh8AXWc)`2*vLJUjAPw8|X5*sDeCaTEeXTw{8NV?9R+XVs*Sq{-u?K$gU0F3lSLah5Nj*;I+h7E^mpp zn_{Km;Q3;HOm|X4h0zbpbE^U~btZ~P3Z(8&4RKnm$C})a4^JAMOdA>nzeWBF!cyK> z_*AxE&@O^n*GzE3^RfQR1iPSwKo|G1Qj$W$W@m|?x>8UOsh}|LE(VLLvgQOa5(TFUf!rIE&7q>}8&FUIn8n z_9adAe!XqFmT13DbFE*laElAZrBs&iIOXJ`VR`4b$h!mh>|5~|@O}FFSF`PU;CF(^ zCVwc5NpIl+26XtS&&!QE5tXn)_YeNjVSnLPe?Nx*!!e^hzT$Dl7Jq6qGXa>pHpd>p ze&6>TR=MX@FZ9DXGq?d}GxRH^4i*P)pYO3RmZ>N2QD57hJf&$q3;$E2<)zULx)>Cp zcko6eQ~-EDRfjy_MT;^O|7=!_G-h`mBg-s3%7yl2XMrn463f z$QBRp9oj`qvRY+cMZRI+Vs8jn>0`?s-Hr(@jL?X_6YU6}g>NZvc7K>@O8_>G- zp{nje+6Vd!@