Skip to content

Commit

Permalink
add luacheckrc, gh-workflow and fix some issues
Browse files Browse the repository at this point in the history
  • Loading branch information
BuckarooBanzay authored and SmallJoker committed Feb 2, 2022
1 parent 86d4583 commit d44b88f
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 17 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/luacheck.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: luacheck
on: [push, pull_request]
jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: Roang-zero1/factorio-mod-luacheck@master
with:
luacheckrc_url: ""
17 changes: 17 additions & 0 deletions .luacheckrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
max_line_length = 180
unused_args = false

globals = {
"letters"
}

read_globals = {
"minetest",
"vector",
"default",
table = {
fields = {
"copy"
}
}
}
3 changes: 0 additions & 3 deletions depends.txt

This file was deleted.

16 changes: 4 additions & 12 deletions init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ letters = {
{"zl", "zu", "z", "Z"},
}

letters_reversed = {}
local letters_reversed = {}

for i, t in ipairs(letters) do
letters_reversed[t[3]] = i
end

letter_cutter = {}
local letter_cutter = {}
letter_cutter.known_nodes = {}

letter_cutter.show_item_list = dofile(
Expand Down Expand Up @@ -95,7 +95,7 @@ function letters.register_letters(modname, subname, from_node, description, tile
letter_cutter.known_nodes[from_node] = {modname, subname}
end

cost = 0.110
local cost = 0.110

letter_cutter.names_lower = {
{"letter_al"},
Expand Down Expand Up @@ -322,9 +322,6 @@ end

function letter_cutter.on_metadata_inventory_put_lower(
pos, listname, index, stack, player)
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory()
local stackname = stack:get_name()
local count = stack:get_count()

if listname == "input" then
Expand All @@ -334,9 +331,6 @@ end

function letter_cutter.on_metadata_inventory_put_upper(
pos, listname, index, stack, player)
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory()
local stackname = stack:get_name()
local count = stack:get_count()

if listname == "input" then
Expand Down Expand Up @@ -382,7 +376,7 @@ function letter_cutter.remove_from_input(pos, origname, count)
end
end

gui_slots = "listcolors[#606060AA;#808080;#101010;#202020;#FFF]"
local gui_slots = "listcolors[#606060AA;#808080;#101010;#202020;#FFF]"

local function update_cutter_formspec(pos)
local meta = minetest.get_meta(pos)
Expand All @@ -400,7 +394,6 @@ end
local function cut_from_text(pos, input_text, player)
local playername = player:get_player_name()

local node = minetest.get_node(pos)
local meta = minetest.get_meta(pos)

local cutterinv = meta:get_inventory()
Expand All @@ -416,7 +409,6 @@ local function cut_from_text(pos, input_text, player)
local origname = cutterinput[1]:get_name()

local playerinv = player:get_inventory()
local playermain = playerinv:get_list("main")

meta:set_string("text", input_text)

Expand Down
2 changes: 2 additions & 0 deletions mod.conf
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
name = letters
depends = default
optional_depends = darkage, colouredstonebricks
4 changes: 2 additions & 2 deletions registrations.lua
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ for _, row in pairs(default_nodes) do
local nodename = "default:" ..row[1]
local ndef = minetest.registered_nodes[nodename]
local texture = "default_" ..row[2].. ".png"
letters.register_letters("default", row[1], nodename, ndef.description, texture)
letters.register_letters("default", row[1], nodename, ndef.description, texture)
end


Expand All @@ -41,7 +41,7 @@ if minetest.get_modpath("darkage") then
letters.register_letters("darkage", "slate", "darkage:slate", "Slate", "darkage_slate.png")
letters.register_letters("darkage", "gneiss", "darkage:gneiss", "Gneiss", "darkage_gneiss.png")
letters.register_letters("darkage", "chalk", "darkage:chalk", "Chalk", "darkage_chalk.png")
letters.register_letters("darkage", "ors_cobble", "darkage:ors_cobble", "Old Red Sandstone Cobble", "darkage_ors_brick.png")
letters.register_letters("darkage", "ors_cobble", "darkage:ors_cobble", "Old Red Sandstone Cobble", "darkage_ors_brick.png")
letters.register_letters("darkage", "slate_cobble", "darkage:slate_cobble", "Slate Cobble", "darkage_slate_brick.png")
letters.register_letters("darkage", "gneiss_cobble", "darkage:gneiss_cobble", "Gneiss Cobble", "darkage_gneiss_brick.png")
letters.register_letters("darkage", "basalt_cobble", "darkage:basalt_cobble", "Basalt Cobble", "darkage_basalt_brick.png")
Expand Down

0 comments on commit d44b88f

Please sign in to comment.