Skip to content

Commit

Permalink
Merge branch 'master' into pr/107
Browse files Browse the repository at this point in the history
  • Loading branch information
OgelGames committed Mar 3, 2024
2 parents 6b06dbf + 8724c28 commit 32f3c2a
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 81 deletions.
3 changes: 2 additions & 1 deletion .luacheckrc
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ read_globals = {
-- mods
"default", "mesecon", "digiline",
"screwdriver", "unified_inventory",
"i3", "mcl_experience", "awards"
"i3", "mcl_experience", "awards",
"xcompat",

}
4 changes: 2 additions & 2 deletions crafts.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-- Crafting recipes for pipes
local materials = ...
local materials = xcompat.materials

minetest.register_craft( {
output = "pipeworks:pipe_1_empty 12",
Expand Down Expand Up @@ -151,7 +151,7 @@ minetest.register_craft( {
output = "pipeworks:teleport_tube_1 2",
recipe = {
{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
{ materials.desert_stone, materials.teleporter, materials.desert_stone },
{ materials.desert_stone, materials.mese, materials.desert_stone },
{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
},
})
Expand Down
7 changes: 2 additions & 5 deletions init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,11 @@ dofile(pipeworks.modpath.."/flowing_logic.lua")
dofile(pipeworks.modpath.."/filter-injector.lua")
dofile(pipeworks.modpath.."/trashcan.lua")
dofile(pipeworks.modpath.."/wielder.lua")

local materials = loadfile(pipeworks.modpath.."/materials.lua")()

dofile(pipeworks.modpath.."/tubes/registration.lua")
dofile(pipeworks.modpath.."/tubes/routing.lua")
dofile(pipeworks.modpath.."/tubes/sorting.lua")
dofile(pipeworks.modpath.."/tubes/signal.lua")
loadfile(pipeworks.modpath.."/tubes/embedded_tube.lua")(materials)
dofile(pipeworks.modpath.."/tubes/embedded_tube.lua")
dofile(pipeworks.modpath.."/tubes/pane_embedded_tube.lua")
dofile(pipeworks.modpath.."/tubes/tags.lua")

Expand Down Expand Up @@ -112,7 +109,7 @@ if pipeworks.enable_autocrafter then
dofile(pipeworks.modpath.."/autocrafter.lua")
end

loadfile(pipeworks.modpath.."/crafts.lua")(materials)
dofile(pipeworks.modpath.."/crafts.lua")

minetest.register_alias("pipeworks:pipe", "pipeworks:pipe_110000_empty")

Expand Down
70 changes: 0 additions & 70 deletions materials.lua

This file was deleted.

2 changes: 1 addition & 1 deletion mod.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name = pipeworks
description = This mod uses mesh nodes and nodeboxes to supply a complete set of 3D pipes and tubes, along with devices that work with them.
depends = basic_materials
depends = basic_materials, xcompat
optional_depends = mesecons, mesecons_mvps, digilines, signs_lib, unified_inventory, default, screwdriver, fl_mapgen, sound_api, i3, hades_core, hades_furnaces, hades_chests, mcl_mapgen_core, mcl_barrels, mcl_furnaces, mcl_experience
min_minetest_version = 5.5.0
2 changes: 1 addition & 1 deletion tubes/embedded_tube.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
local materials = ...
local materials = xcompat.materials
local S = minetest.get_translator("pipeworks")

local straight = function(pos, node, velocity, stack) return {velocity} end
Expand Down
2 changes: 1 addition & 1 deletion wielder.lua
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ local function register_wielder(data)
return stack:get_count()
end,
},
is_ground_content = true,
is_ground_content = false,
paramtype2 = "facedir",
tubelike = 1,
groups = groups,
Expand Down

0 comments on commit 32f3c2a

Please sign in to comment.