diff --git a/oregen-manager.lua b/oregen-manager.lua index 7493801..7006526 100644 --- a/oregen-manager.lua +++ b/oregen-manager.lua @@ -28,8 +28,6 @@ local KEEP_STOCKED = { ["tfmg:nickel_nugget"] = 4 * 64, ["tfmg:lithium_nugget"] = 64, ["tfmg:bauxite_powder"] = 4 * 64, - ["minecraft:flint"] = 0, - ["minecraft:andesite"] = 4 * 64, } local GLOBAL_LIMS = { @@ -54,15 +52,9 @@ local LIMIT_EXCEPTIONS = { lower = -1, upper = 0, }, - ["minecraft:flint"] = { - lower = 64, - upper = 2 * 64, - }, } -- if these exist, they will be used up --- "limit" is the limit on the amt sent at a time --- "keep" is the amount not to use up local PRODUCTS = { {"create:crimsite", CRUSHER_ADDR}, {"create:crushed_raw_iron", MELTER_ADDR}, @@ -75,12 +67,12 @@ local PRODUCTS = { {"minecraft:sand", WASHER_ADDR}, {"minecraft:clay_ball", SMELTER_ADDR}, {"minecraft:brick", HAUNTER_ADDR}, - {"minecraft:flint", CRUSHER_ADDR, keep = 4 * 64}, + {"minecraft:flint", CRUSHER_ADDR}, {"minecraft:nether_bricks", CRUSHER_ADDR}, {"minecraft:basalt", CRUSHER_ADDR}, - {"create:crushed_raw_silver", WASHER_ADDR, limit = 16}, + {"create:crushed_raw_silver", WASHER_ADDR, 16}, {"minecraft:calcite", CRUSHER_ADDR}, - {"create:crushed_raw_nickel", WASHER_ADDR, limit = 32}, + {"create:crushed_raw_nickel", WASHER_ADDR, 32}, {"tfmg:bauxite", CRUSHER_ADDR}, } @@ -169,21 +161,6 @@ local RECIPES = { addr = PRESS_ADDR, limit = 6, }, - ["minecraft:flint"] = { - ingredients = { - {"minecraft:gravel", 64}, - }, - addr = WASHER_ADDR, - limit = 8, - }, - ["minecraft:andesite"] = { - ingredients = { - {"minecraft:flint", 64}, - {"minecraft:gravel", 32}, - }, - addr = PRESS_ADDR, - limit = 6, - }, } local SLEEP_T = 20 @@ -242,11 +219,9 @@ function cycleItems (ticker, items) return makeRequest(item, amt - limit, addr, limit_override) end for _, pair in pairs(PRODUCTS) do - local name, addr, limit, keep = pair[1], pair[2], pair.limit, pair.keep + local name, addr, limit = pair[1], pair[2], pair[3] if items[name] ~= nil then local amt = items[name] - if keep ~= nil then amt = amt - keep end - if amt < 0 then amt = 0 end makeRequest(name, amt, addr, limit) end end