diff --git a/compatibility.lua b/compatibility.lua index fee6573..659d123 100644 --- a/compatibility.lua +++ b/compatibility.lua @@ -101,7 +101,7 @@ if industrialtest.mclAvailable then mcl_explosions.explode(pos,radius,{drop_chance=dropChance}) end - industrialtest.internal.getItemSlotBg=mcl_formspec.get_itemslot_bg + industrialtest.internal.getItemSlotBg=mcl_formspec.get_itemslot_bg_v4 elseif industrialtest.mtgAvailable then industrialtest.stackMax=99 diff --git a/machines/canning_machine.lua b/machines/canning_machine.lua index 700e93a..48141b1 100644 --- a/machines/canning_machine.lua +++ b/machines/canning_machine.lua @@ -79,20 +79,20 @@ function industrialtest.CanningMachine.getFormspec(self,pos) local powerPercent=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*100 local srcPercent=meta:get_float("srcTime")/self._canningTime*100 local formspec={ - "list[context;src;3.4,1.8;1,1]", industrialtest.internal.getItemSlotBg(3.4,1.8,1,1), + "list[context;src;3.4,1.8;1,1]", (powerPercent>0 and "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]" or "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png]"), - "list[context;powerStorage;3.4,3.9;1,1]", industrialtest.internal.getItemSlotBg(3.4,3.9,1,1), + "list[context;powerStorage;3.4,3.9;1,1]", (srcPercent>0 and "image[4.9,1.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]" or "image[4.9,1.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"), - "list[context;dst;6.4,1.8;1,1]", industrialtest.internal.getItemSlotBg(6.4,1.8,1,1), - "list[context;leftover;6.4,2.8;1,1]", + "list[context;dst;6.4,1.8;1,1]", industrialtest.internal.getItemSlotBg(6.4,2.8,1,1), - "list[context;upgrades;9,0.9;1,4]", + "list[context;leftover;6.4,2.8;1,1]", industrialtest.internal.getItemSlotBg(9,0.9,1,4), + "list[context;upgrades;9,0.9;1,4]", "listring[context;src]", "listring[context;dst]" } diff --git a/machines/chargepad.lua b/machines/chargepad.lua index ecf1e30..6611c54 100644 --- a/machines/chargepad.lua +++ b/machines/chargepad.lua @@ -52,11 +52,11 @@ function industrialtest.Chargepad.getFormspec(self,pos) local parentFormspec=industrialtest.ActivatedElectricMachine.getFormspec(self,pos) local charged=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity") local formspec={ - "list[context;charged;1,2.5;1,1]", industrialtest.internal.getItemSlotBg(1,2.5,1,1), + "list[context;charged;1,2.5;1,1]", "label[0.9,3.9;"..S("Charge").."]", - "list[context;discharged;3,2.5;1,1]", industrialtest.internal.getItemSlotBg(3,2.5,1,1), + "list[context;discharged;3,2.5;1,1]", "label[2.7,3.9;"..S("Discharge").."]", self.createPowerIndicatorWidget(charged,9,1), "listring[context;charged]", diff --git a/machines/fluid_generator.lua b/machines/fluid_generator.lua index d68032a..3b7b462 100644 --- a/machines/fluid_generator.lua +++ b/machines/fluid_generator.lua @@ -36,13 +36,13 @@ local function getFormspec(self,pos) local fuel=self.getFuel(fluid) local tile=(fuel and fuel.texture or "industrialtest_gui_fluid_bg.png") local formspec={ - "list[context;src;2,1.8;1,1]", industrialtest.internal.getItemSlotBg(2,1.8,1,1), + "list[context;src;2,1.8;1,1]", (fluidPercent>0 and "image[2,3;1,1;industrialtest_gui_fluid_bg.png^[lowpart:"..fluidPercent..":"..tile.."]" or "image[2,3;1,1;industrialtest_gui_fluid_bg.png]"), - "list[context;dst;2,4.2;1,1]", industrialtest.internal.getItemSlotBg(2,4.2,1,1), - "list[context;charged;6,3;1,1]", + "list[context;dst;2,4.2;1,1]", industrialtest.internal.getItemSlotBg(6,3,1,1), + "list[context;charged;6,3;1,1]", self.createPowerIndicatorWidget(powerPercent,9,1), "listring[context;src]", "listring[context;dst]" diff --git a/machines/generator.lua b/machines/generator.lua index 2db9ab8..16a69ea 100644 --- a/machines/generator.lua +++ b/machines/generator.lua @@ -72,12 +72,12 @@ function industrialtest.Generator.getFormspec(self,pos) local fuelPercent=meta:get_float("fuelTime")/meta:get_float("maxFuelTime")*100 local charged=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity") local formspec={ - "list[context;charged;4.7,1.8;1,1]", industrialtest.internal.getItemSlotBg(4.7,1.8,1,1), + "list[context;charged;4.7,1.8;1,1]", (fuelPercent>0 and "image[4.7,2.8;1,1;default_furnace_fire_bg.png^[lowpart:"..fuelPercent..":default_furnace_fire_fg.png]" or "image[4.7,2.8;1,1;default_furnace_fire_bg.png]"), - "list[context;src;4.7,3.9;1,1]", industrialtest.internal.getItemSlotBg(4.7,3.9,1,1), + "list[context;src;4.7,3.9;1,1]", self.createPowerIndicatorWidget(charged,9,1), "listring[context;src]" } diff --git a/machines/induction_furnace.lua b/machines/induction_furnace.lua index a59506c..c5b613a 100644 --- a/machines/induction_furnace.lua +++ b/machines/induction_furnace.lua @@ -80,18 +80,18 @@ function industrialtest.InductionFurnace.getFormspec(self,pos) local srcPercent=maxSrcTime>0 and meta:get_float("srcTime")/maxSrcTime*100 or 0 local heat=meta:get_int("heat") local formspec={ - "list[context;src;3.7,1.8;2,1]", industrialtest.internal.getItemSlotBg(3.7,1.8,2,1), + "list[context;src;3.7,1.8;2,1]", (powerPercent>0 and "image[3.7,2.8;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]" or "image[3.7,2.8;1,1;industrialtest_gui_electricity_bg.png]"), - "list[context;powerStorage;3.7,3.9;1,1]", industrialtest.internal.getItemSlotBg(3.7,3.9,1,1), + "list[context;powerStorage;3.7,3.9;1,1]", (srcPercent>0 and "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]" or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"), - "list[context;dst;6,2.8;2,1;]", industrialtest.internal.getItemSlotBg(6,2.8,2,1), - "list[context;upgrades;9,0.9;1,4]", + "list[context;dst;6,2.8;2,1;]", industrialtest.internal.getItemSlotBg(9,0.9,1,4), + "list[context;upgrades;9,0.9;1,4]", "label[0.5,2.8;"..minetest.formspec_escape(S("Heat: @1 %",heat)).."]", "listring[context;src]", "listring[context;dst]" diff --git a/machines/iron_furnace.lua b/machines/iron_furnace.lua index fac6353..8f6907a 100644 --- a/machines/iron_furnace.lua +++ b/machines/iron_furnace.lua @@ -80,16 +80,16 @@ function industrialtest.IronFurnace.getFormspec(self,pos) } elseif industrialtest.mclAvailable then formspec={ + mcl_formspec.get_itemslot_bg_v4(3.4,1.8,1,1), "list[context;src;3.4,1.8;1,1]", - mcl_formspec.get_itemslot_bg(3.4,1.8,1,1), (fuelPercent>0 and "image[3.4,2.8;1,1;default_furnace_fire_bg.png^[lowpart:"..fuelPercent..":default_furnace_fire_fg.png]" or "image[3.4,2.8;1,1;default_furnace_fire_bg.png]"), + mcl_formspec.get_itemslot_bg_v4(3.4,3.9,1,1), "list[context;fuel;3.4,3.9;1,1]", - mcl_formspec.get_itemslot_bg(3.4,3.9,1,1), (srcPercent>0 and "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]" or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"), + mcl_formspec.get_itemslot_bg_v4(6.4,2.8,1,1), "list[context;dst;6.4,2.8;1,1]", - mcl_formspec.get_itemslot_bg(6.4,2.8,1,1), "listring[context;src]", "listring[context;dst]" } diff --git a/machines/machine.lua b/machines/machine.lua index 15087ea..a1ccce8 100644 --- a/machines/machine.lua +++ b/machines/machine.lua @@ -54,12 +54,13 @@ function industrialtest.Machine.getFormspec(self,pos) } elseif industrialtest.mclAvailable then formspec={ - "size[10.04,12]", - "label[0.25,0.25;"..self.description.."]", + "formspec_version[4]", + "size[12,12.5]", + "label[0.5,0.5;"..self.description.."]", + mcl_formspec.get_itemslot_bg_v4(0.5,7,9,3), "list[current_player;main;0.5,7;9,3;9]", - mcl_formspec.get_itemslot_bg(0.5,7,9,3), - "list[current_player;main;0.5,10.24;9,1]", - mcl_formspec.get_itemslot_bg(0.5,10.24,9,1), + mcl_formspec.get_itemslot_bg_v4(0.5,11,9,1), + "list[current_player;main;0.5,11;9,1]", "listring[current_player;main]" } end diff --git a/machines/magnetizer.lua b/machines/magnetizer.lua index 200c28f..a338054 100644 --- a/machines/magnetizer.lua +++ b/machines/magnetizer.lua @@ -129,6 +129,7 @@ function industrialtest.Magnetizer.getFormspec(self,pos) local formspec={ (powerPercent>0 and "image[4.7,2.7;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]" or "image[4.7,2.7;1,1;industrialtest_gui_electricity_bg.png]"), + industrialtest.internal.getItemSlotBg(4.7,3.7,1,1), "list[context;powerStorage;4.7,3.7;1,1]", "listring[context;powerStorage]" } diff --git a/machines/miner.lua b/machines/miner.lua index 56b118d..bd1bfa7 100644 --- a/machines/miner.lua +++ b/machines/miner.lua @@ -187,22 +187,22 @@ function industrialtest.Miner.getFormspec(self,pos) local powerPercent=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*100 local formspec={ "label[0.7,1.15;"..S("Drill").."]", - "list[context;drill;0.7,1.5;1,1]", industrialtest.internal.getItemSlotBg(0.7,1.5,1,1), + "list[context;drill;0.7,1.5;1,1]", "label[0.7,2.75;"..S("Pipe").."]", - "list[context;src;0.7,3.1;1,1]", industrialtest.internal.getItemSlotBg(0.7,3.1,1,1), + "list[context;src;0.7,3.1;1,1]", "label[0.7,4.35;"..S("Scanner").."]", - "list[context;scanner;0.7,4.7;1,1]", industrialtest.internal.getItemSlotBg(0.7,4.7,1,1), - "list[context;dst;2.28,1.9;5,3]", + "list[context;scanner;0.7,4.7;1,1]", industrialtest.internal.getItemSlotBg(2.28,1.9,5,3), - "list[context;upgrades;9.1,1.2;1,1]", + "list[context;dst;2.28,1.9;5,3]", industrialtest.internal.getItemSlotBg(9.1,1.2,1,1), + "list[context;upgrades;9.1,1.2;1,1]", (powerPercent>0 and "image[9.1,2.29;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]" or "image[9.1,2.29;1,1;industrialtest_gui_electricity_bg.png]"), - "list[context;powerStorage;9.1,3.5;1,1]", industrialtest.internal.getItemSlotBg(9.1,3.5,1,1), + "list[context;powerStorage;9.1,3.5;1,1]", "listring[context;src]", "listring[context;dst]" } diff --git a/machines/nuclear_reactor.lua b/machines/nuclear_reactor.lua index 9843e88..8a55e30 100644 --- a/machines/nuclear_reactor.lua +++ b/machines/nuclear_reactor.lua @@ -86,10 +86,10 @@ function industrialtest.Reactor.getFormspec(self,pos) local size=math.floor(meta:get_int("size")/3) local switchText=(meta:get_int("enabled")==0 and S("Start") or S("Stop")) local formspec={ - "list[context;fuel;1,1;"..size..","..size.."]", industrialtest.internal.getItemSlotBg(1,1,size,size), - "list[context;charged;7,2.8;1,1]", + "list[context;fuel;1,1;"..size..","..size.."]", industrialtest.internal.getItemSlotBg(7.7,2.8,1,1), + "list[context;charged;7,2.8;1,1]", "button[7.7,1;1,0.8;toggle;"..minetest.formspec_escape(switchText).."]", self.createPowerIndicatorWidget(charged,9,1), "listring[context;fuel]" diff --git a/machines/power_storage.lua b/machines/power_storage.lua index 75ad5bb..bf48265 100644 --- a/machines/power_storage.lua +++ b/machines/power_storage.lua @@ -50,11 +50,11 @@ function industrialtest.PowerStorage.getFormspec(self,pos) local meta=minetest.get_meta(pos) local charged=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity") local formspec={ - "list[context;charged;1,2.5;1,1]", industrialtest.internal.getItemSlotBg(1,2.5,1,1), + "list[context;charged;1,2.5;1,1]", "label[0.9,3.9;"..S("Charge").."]", - "list[context;discharged;3,2.5;1,1]", industrialtest.internal.getItemSlotBg(3,2.5,1,1), + "list[context;discharged;3,2.5;1,1]", "label[2.7,3.9;"..S("Discharge").."]", self.createPowerIndicatorWidget(charged,9,1), "listring[context;charged]", diff --git a/machines/pump.lua b/machines/pump.lua index 14f1c9f..1e35020 100644 --- a/machines/pump.lua +++ b/machines/pump.lua @@ -85,12 +85,12 @@ function industrialtest.Pump.getFormspec(self,pos) local pumpFluid=industrialtest.api.getPumpFluid(fluidType) local tile=(pumpFluid and pumpFluid.texture or "industrialtest_gui_fluid_bg.png") local formspec={ - "list[context;src;3.2,1.7;1,1]", industrialtest.internal.getItemSlotBg(3.2,1.7,1,1), - "list[context;dst;4.6,1.7;1,1]", + "list[context;src;3.2,1.7;1,1]", industrialtest.internal.getItemSlotBg(4.6,1.7,1,1), - "list[context;powerStorage;3.9,3.7;1,1]", + "list[context;dst;4.6,1.7;1,1]", industrialtest.internal.getItemSlotBg(3.9,3.7,1,1), + "list[context;powerStorage;3.9,3.7;1,1]", (powerPercent>0 and "image[3.9,2.7;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]" or "image[3.9,2.7;1,1;industrialtest_gui_electricity_bg.png]"), (srcPercent>0 and "image[6.7,2.7;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png]" diff --git a/machines/rotary_macerator.lua b/machines/rotary_macerator.lua index 5df1f52..ff0ed64 100644 --- a/machines/rotary_macerator.lua +++ b/machines/rotary_macerator.lua @@ -84,20 +84,20 @@ function industrialtest.RotaryMacerator.getFormspec(self,pos) local rpm=meta:get_int("rpm") local buttonMaintainSpeedText=meta:get_int("maintainSpeed")==1 and S("Don't maintain speed") or S("Maintain speed") local formspec={ - "list[context;src;3.8,1.8;1,1]", industrialtest.internal.getItemSlotBg(3.8,1.8,1,1), - "list[context;modifier;4.9,1.8;1,1]", + "list[context;src;3.8,1.8;1,1]", industrialtest.internal.getItemSlotBg(4.9,1.8,1,1), + "list[context;modifier;4.9,1.8;1,1]", (powerPercent>0 and "image[3.8,2.8;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]" or "image[3.8,2.8;1,1;industrialtest_gui_electricity_bg.png]"), - "list[context;powerStorage;3.8,3.9;1,1]", industrialtest.internal.getItemSlotBg(3.8,3.9,1,1), + "list[context;powerStorage;3.8,3.9;1,1]", (srcPercent>0 and "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]" or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"), - "list[context;dst;6,2.8;1,1;]", industrialtest.internal.getItemSlotBg(6,2.8,1,1), - "list[context;upgrades;9,0.9;1,4]", + "list[context;dst;6,2.8;1,1;]", industrialtest.internal.getItemSlotBg(9,0.9,1,4), + "list[context;upgrades;9,0.9;1,4]", "label[0.5,2.8;"..minetest.formspec_escape(S("Speed: @1",rpm)).."]", "button[0.5,3.4;3,0.8;maintainSpeed;"..minetest.formspec_escape(buttonMaintainSpeedText).."]", "listring[context;src]", diff --git a/machines/simple_electric_item_processor.lua b/machines/simple_electric_item_processor.lua index e059410..79e6918 100644 --- a/machines/simple_electric_item_processor.lua +++ b/machines/simple_electric_item_processor.lua @@ -56,18 +56,18 @@ function industrialtest.SimpleElectricItemProcessor.getFormspec(self,pos) local recipeOverride=self.isRecipeOverride(meta) local formspec={ (recipeOverride and "label[3.4,1.5;"..S("Recipe override: @1", minetest.registered_items[recipeOverride].description).."]" or ""), - "list[context;src;3.4,1.8;1,1]", industrialtest.internal.getItemSlotBg(3.4,1.8,1,1), + "list[context;src;3.4,1.8;1,1]", (powerPercent>0 and "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]" or "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png]"), - "list[context;powerStorage;3.4,3.9;1,1]", industrialtest.internal.getItemSlotBg(3.4,3.9,1,1), + "list[context;powerStorage;3.4,3.9;1,1]", (srcPercent>0 and "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]" or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"), - "list[context;dst;6.4,2.8;1,1]", industrialtest.internal.getItemSlotBg(6.4,2.8,1,1), - "list[context;upgrades;9,0.9;1,4]", + "list[context;dst;6.4,2.8;1,1]", industrialtest.internal.getItemSlotBg(9,0.9,1,4), + "list[context;upgrades;9,0.9;1,4]", "listring[context;src]", "listring[context;dst]" } diff --git a/machines/solar_panel_generator.lua b/machines/solar_panel_generator.lua index 413f7bb..3f03302 100644 --- a/machines/solar_panel_generator.lua +++ b/machines/solar_panel_generator.lua @@ -48,8 +48,8 @@ function industrialtest.SolarPanelBase.getFormspec(self,pos) local amount=minetest.get_natural_light(vector.offset(pos,0,1,0))/15.0 local charging=amount>0.5 local formspec={ - "list[context;charged;4.7,1.8;1,1]", industrialtest.internal.getItemSlotBg(4.7,1.8,1,1), + "list[context;charged;4.7,1.8;1,1]", (charging and "image[4.7,2.8;1,1;industrialtest_gui_sun_fg.png]" or "image[4.7,2.8;1,1;industrialtest_gui_sun_bg.png]"), "listring[context;charged]" diff --git a/machines/tool_workshop.lua b/machines/tool_workshop.lua index f55c1c6..482b58f 100644 --- a/machines/tool_workshop.lua +++ b/machines/tool_workshop.lua @@ -73,14 +73,14 @@ function industrialtest.ToolWorkshop.getFormspec(self,pos) local meta=minetest.get_meta(pos) local powerPercent=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*100 local formspec={ - "list[context;powerStorage;3.7,3.7;1,1;0]", industrialtest.internal.getItemSlotBg(3.7,3.7,1,1), + "list[context;powerStorage;3.7,3.7;1,1;0]", (powerPercent>0 and "image[3.7,2.5;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]" or "image[3.7,2.5;1,1;industrialtest_gui_electricity_bg.png]"), - "list[context;src;5.9,3.2;1,1;0]", industrialtest.internal.getItemSlotBg(5.9,3.2,1,1), - "list[context;upgrades;9,0.9;1,4]", + "list[context;src;5.9,3.2;1,1;0]", industrialtest.internal.getItemSlotBg(9,0.9,1,4), + "list[context;upgrades;9,0.9;1,4]", "listring[context;src]" } return parentFormspec..table.concat(formspec,"") diff --git a/machines/wind_mill.lua b/machines/wind_mill.lua index 9c01464..0be873a 100644 --- a/machines/wind_mill.lua +++ b/machines/wind_mill.lua @@ -58,8 +58,8 @@ function industrialtest.WindMill.getFormspec(self,pos) local meta=minetest.get_meta(pos) local charging=meta:get_int("charging") local formspec={ - "list[context;charged;4.7,1.8;1,1]", industrialtest.internal.getItemSlotBg(4.7,1.8,1,1), + "list[context;charged;4.7,1.8;1,1]", (charging>0 and "image[4.7,3;1,1;industrialtest_gui_wind_bg.png^[lowpart:"..charging..":industrialtest_gui_wind_fg.png]" or "image[4.7,3;1,1;industrialtest_gui_wind_bg.png]"), "listring[context;charged]"