Compare commits
33 Commits
69c8355ecb
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| cd585391ec | |||
| d50908dedb | |||
| ae26f0fe58 | |||
| a210cc78e0 | |||
| f480f16340 | |||
| 6a37a84114 | |||
| eb546fd07b | |||
| 6c93528d13 | |||
| 520f3717d6 | |||
| 75894128f0 | |||
| 7efdf28b37 | |||
| 8125d280da | |||
| 0d8807a1c3 | |||
| e7ed72b261 | |||
| 647d46b2f4 | |||
| 27ebd4fbc5 | |||
| 603ae83507 | |||
| 9633214a85 | |||
| a920bef790 | |||
| a9be76866f | |||
| 9b0792f1ff | |||
| fad7a690ae | |||
| 60717d8ec1 | |||
| 08fd6a5a40 | |||
| 0cd9db64fb | |||
| 374f9037a1 | |||
| 8760600105 | |||
| d709feee6e | |||
| b5f9955e07 | |||
| 986a0d189c | |||
| 8aa5ddc972 | |||
| a2ce0e5177 | |||
| 85b5d5808a |
@@ -94,6 +94,7 @@ local function takeFuelFromItem(self,pos)
|
|||||||
inv:set_stack("src",1,fluidSlot)
|
inv:set_stack("src",1,fluidSlot)
|
||||||
meta:set_string("fluid",fuel.name)
|
meta:set_string("fluid",fuel.name)
|
||||||
meta:set_float("fluidAmount",fluidAmount+1000)
|
meta:set_float("fluidAmount",fluidAmount+1000)
|
||||||
|
self:updateFormspec(pos)
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -76,13 +76,14 @@ function industrialtest.WindMill.action(self,pos)
|
|||||||
local dimMax=31000
|
local dimMax=31000
|
||||||
local dim=mcl_worlds.pos_to_dimension(pos)
|
local dim=mcl_worlds.pos_to_dimension(pos)
|
||||||
if dim=="overworld" then
|
if dim=="overworld" then
|
||||||
dimMax=mcl_vars.mg_overworld_max
|
dimMax=mcl_vars.mg_overworld_max_official
|
||||||
elseif dim=="nether" then
|
elseif dim=="nether" then
|
||||||
dimMax=mcl_vars.mg_nether_max
|
dimMax=mcl_vars.mg_nether_max
|
||||||
elseif dim=="end" then
|
elseif dim=="end" then
|
||||||
dimMax=mcl_vars.mg_end_max
|
dimMax=mcl_vars.mg_end_max_official
|
||||||
end
|
end
|
||||||
charging=math.max(mcl_worlds.layer_to_y(pos.y,dim),0)/dimMax
|
local layer,_=mcl_worlds.y_to_layer(pos.y)
|
||||||
|
charging=math.min(math.max((layer or 0),0)/dimMax,1.0)
|
||||||
end
|
end
|
||||||
local neighbourPositions={
|
local neighbourPositions={
|
||||||
vector.offset(pos,-1,0,0),
|
vector.offset(pos,-1,0,0),
|
||||||
|
|||||||
55
nodes.lua
@@ -591,26 +591,39 @@ if industrialtest.mtgAvailable then
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
elseif industrialtest.mclAvailable then
|
elseif industrialtest.mclAvailable then
|
||||||
mcl_fences.register_fence_def("iron_fence",{
|
-- Some MCL2 forks define this function so use it if available
|
||||||
description=S("Iron Fence"),
|
if mcl_fences.register_fence_def then
|
||||||
tiles={"default_steel_block.png"},
|
mcl_fences.register_fence_def("iron_fence",{
|
||||||
groups={
|
description=S("Iron Fence"),
|
||||||
_industrialtest_metalFence=1
|
tiles={"default_steel_block.png"},
|
||||||
},
|
groups={
|
||||||
connects_to={
|
_industrialtest_metalFence=1
|
||||||
"group:fence",
|
},
|
||||||
"group:fence_gate",
|
connects_to={
|
||||||
"group:solid",
|
"group:fence",
|
||||||
"industrialtest:magnetizer"
|
"group:fence_gate",
|
||||||
},
|
"group:solid",
|
||||||
on_construct=ironFenceOnConstruct,
|
"industrialtest:magnetizer"
|
||||||
on_destruct=ironFenceOnDestruct,
|
},
|
||||||
after_destruct=function(pos,oldnode,oldmeta)
|
on_construct=ironFenceOnConstruct,
|
||||||
ironFenceDetach(oldmeta)
|
on_destruct=ironFenceOnDestruct,
|
||||||
end,
|
after_destruct=function(pos,oldnode,oldmeta)
|
||||||
_mcl_fences_baseitem="industrialtest:iron_plate",
|
ironFenceDetach(oldmeta)
|
||||||
_mcl_fences_stickreplacer="industrialtest:iron_plate"
|
end
|
||||||
|
})
|
||||||
|
else
|
||||||
|
mcl_fences.register_fence("iron_fence",S("Iron Fence"),"default_steel_block.png",{_industrialtest_metalFence=1},4,5,{"industrialtest:magnetizer","group:fence"},mcl_sounds.node_sound_metal_defaults())
|
||||||
|
end
|
||||||
|
if minetest.registered_nodes["mcl_fences:iron_fence"] then
|
||||||
|
-- mcl_fences.register_fence_def registers fences in it's own namespace so register alias here to keep compatibility
|
||||||
|
minetest.register_alias("industrialtest:iron_fence","mcl_fences:iron_fence")
|
||||||
|
end
|
||||||
|
minetest.register_craft({
|
||||||
|
type="shaped",
|
||||||
|
output="industrialtest:iron_fence 3",
|
||||||
|
recipe={
|
||||||
|
{"industrialtest:iron_plate","industrialtest:iron_plate","industrialtest:iron_plate"},
|
||||||
|
{"industrialtest:iron_plate","industrialtest:iron_plate","industrialtest:iron_plate"}
|
||||||
|
}
|
||||||
})
|
})
|
||||||
-- mcl_fences.register_fence_def registers fences in it's own namespace so register alias here to keep compatibility
|
|
||||||
minetest.register_alias("industrialtest:iron_fence","mcl_fences:iron_fence")
|
|
||||||
end
|
end
|
||||||
|
|||||||
BIN
textures/industrialtest_guide_batbox.png
Normal file
|
After Width: | Height: | Size: 8.4 KiB |
BIN
textures/industrialtest_guide_chargepad.png
Normal file
|
After Width: | Height: | Size: 226 KiB |
BIN
textures/industrialtest_guide_extractor.png
Normal file
|
After Width: | Height: | Size: 10 KiB |
BIN
textures/industrialtest_guide_generator.png
Normal file
|
After Width: | Height: | Size: 8.4 KiB |
BIN
textures/industrialtest_guide_geothermal_generator.png
Normal file
|
After Width: | Height: | Size: 8.7 KiB |
BIN
textures/industrialtest_guide_induction_furnace.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
textures/industrialtest_guide_iron_furnace.png
Normal file
|
After Width: | Height: | Size: 9.1 KiB |
BIN
textures/industrialtest_guide_macerator.png
Normal file
|
After Width: | Height: | Size: 9.2 KiB |
BIN
textures/industrialtest_guide_magnetizer.png
Normal file
|
After Width: | Height: | Size: 183 KiB |
BIN
textures/industrialtest_guide_mass_fabricator.png
Normal file
|
After Width: | Height: | Size: 9.3 KiB |
BIN
textures/industrialtest_guide_miner_digging.png
Normal file
|
After Width: | Height: | Size: 236 KiB |
BIN
textures/industrialtest_guide_miner_formspec.png
Normal file
|
After Width: | Height: | Size: 14 KiB |
BIN
textures/industrialtest_guide_nuclear_reactor_chambers.png
Normal file
|
After Width: | Height: | Size: 216 KiB |
BIN
textures/industrialtest_guide_nuclear_reactor_formspec.png
Normal file
|
After Width: | Height: | Size: 8.8 KiB |
BIN
textures/industrialtest_guide_pump.png
Normal file
|
After Width: | Height: | Size: 215 KiB |
BIN
textures/industrialtest_guide_pump_formspec.png
Normal file
|
After Width: | Height: | Size: 8.3 KiB |
BIN
textures/industrialtest_guide_recycler.png
Normal file
|
After Width: | Height: | Size: 9.6 KiB |
BIN
textures/industrialtest_guide_rotary_macerator.png
Normal file
|
After Width: | Height: | Size: 12 KiB |
BIN
textures/industrialtest_guide_solar_panel_full.png
Normal file
|
After Width: | Height: | Size: 7.8 KiB |
BIN
textures/industrialtest_guide_solar_panel_none.png
Normal file
|
After Width: | Height: | Size: 9.4 KiB |
BIN
textures/industrialtest_guide_tool_workshop.png
Normal file
|
After Width: | Height: | Size: 8.5 KiB |
BIN
textures/industrialtest_guide_transformer.png
Normal file
|
After Width: | Height: | Size: 220 KiB |
BIN
textures/industrialtest_guide_upgrades.png
Normal file
|
After Width: | Height: | Size: 4.8 KiB |
BIN
textures/industrialtest_guide_water_mill.png
Normal file
|
After Width: | Height: | Size: 221 KiB |
BIN
textures/industrialtest_guide_water_mill_formspec.png
Normal file
|
After Width: | Height: | Size: 8.0 KiB |
BIN
textures/industrialtest_guide_wind_mill.png
Normal file
|
After Width: | Height: | Size: 4.0 KiB |
@@ -69,8 +69,8 @@ industrialtest.internal.unpackTableInto(industrialtest.LapPack,{
|
|||||||
description=S("LapPack"),
|
description=S("LapPack"),
|
||||||
inventoryImage="industrialtest_lappack_v_inv.png",
|
inventoryImage="industrialtest_lappack_v_inv.png",
|
||||||
modelImage="industrialtest_lappack_v.png",
|
modelImage="industrialtest_lappack_v.png",
|
||||||
capacity=60000,
|
capacity=300000,
|
||||||
flow=industrialtest.api.lvPowerFlow
|
flow=industrialtest.api.mvPowerFlow
|
||||||
})
|
})
|
||||||
|
|
||||||
industrialtest.LapPack:register()
|
industrialtest.LapPack:register()
|
||||||
@@ -79,7 +79,7 @@ minetest.register_craft({
|
|||||||
type="shaped",
|
type="shaped",
|
||||||
output="industrialtest:lappack_v",
|
output="industrialtest:lappack_v",
|
||||||
recipe={
|
recipe={
|
||||||
{industrialtest.elementKeys.powerCarrier,"industrialtest:electronic_circuit",industrialtest.elementKeys.powerCarrier},
|
{industrialtest.elementKeys.powerCarrier,"industrialtest:advanced_electronic_circuit",industrialtest.elementKeys.powerCarrier},
|
||||||
{industrialtest.elementKeys.powerCarrier,"industrialtest:batpack_v",industrialtest.elementKeys.powerCarrier},
|
{industrialtest.elementKeys.powerCarrier,"industrialtest:batpack_v",industrialtest.elementKeys.powerCarrier},
|
||||||
{industrialtest.elementKeys.powerCarrier,"",industrialtest.elementKeys.powerCarrier}
|
{industrialtest.elementKeys.powerCarrier,"",industrialtest.elementKeys.powerCarrier}
|
||||||
}
|
}
|
||||||
|
|||||||