Remove dependency for "wood-logistics"

README.md

@@ -20,7 +20,6 @@ The following mods can be a great addition for this mod:
 
 Sorted by priority
 
-- Make mod "Wooden logistics" optional
 - Improve start on Nauvis
 - Balance pollution (noise)
 - Tweak enemies + warfare (add damage research)
@@ -78,3 +77,7 @@ Unsorted
 [Zithorian's Extra Storage Tanks](https://mods.factorio.com/mod/zithorian-extra-storage-tanks)
 
 - Gold storage tank
+
+[Wooden Basegame Assets](https://mods.factorio.com/mod/wood-base-assets)
+
+- Lumber

lignumis/info.json

@@ -12,8 +12,8 @@
         "cf-lib >= 0.0.1",
         "wood-military >= 2.0.0",
         "Wood-Walls >= 1.2.0",
-      "wood-logistics >= 2.1.1",
         "mf-buildings >= 0.1.0",
-      "mf-logistics >= 0.1.0"
+        "mf-logistics >= 0.1.0",
+        "!wood-logistics"
     ]
 }

lignumis/locale/en/strings.cfg

@@ -28,6 +28,9 @@ provisional-rocket-silo=Provisional rocket silo
 basic-gun-turret=Basic gun turret
 basic-construction-robot-gold=Basic construction robot (gold)
 basic-construction-robot-copper=Basic construction robot (copper)
+wood-transport-belt=Wood transport belt
+wood-underground-belt=Wood underground belt
+wood-splitter=Wood splitter
 
 [equipment-name]
 basic-portable-generator-equipment-gold=Basic portable generator equipment (gold)
@@ -47,6 +50,7 @@ gold-cable=Gold cable
 moist-stromatolite-remnant=Moist stromatolite remnant
 steam-science-pack=Steam science pack
 destination-nauvis=Travel to Nauvis
+lumber=Lumber
 
 [item-description]
 wooden-wall=Use wooden walls to protect your base from the locals and to reduce noise levels.
@@ -82,6 +86,7 @@ provisional-rocketry=Provisional rocketry
 basic-gun-turret=Basic gun turret
 basic-construction-robotics-gold=Basic construction robotics (gold)
 basic-construction-robotics-copper=Basic construction robotics (copper)
+wood-logistics=Wood logistics
 
 [tile-name]
 wood-floor=Wood floor

lignumis/prototypes/content/burner-assembling-machine.lua

@@ -13,8 +13,7 @@ assembling_machine.crafting_categories = {
     "crafting",
     "basic-crafting",
     "organic-or-assembling",
-    "wood-processing-or-assembling",
-    "crafting-or-carpentry"
+    "wood-processing-or-assembling"
 }
 assembling_machine.crafting_speed = 0.25
 assembling_machine.energy_source = {

lignumis/prototypes/content/data.lua

@@ -19,5 +19,7 @@ require("wooden-rocket-silo")
 require("basic-gun-turret")
 require("fuel-category")
 require("basic-construction-robots")
+require("lumber")
+require("wood-logistics")
 
 require("noise")

lignumis/prototypes/content/lumber-mill.lua

@@ -36,14 +36,9 @@ LumberMill.RecipeBuilder:new()
         category = "wood-processing-or-assembling"
     })
 
-local tech = LumberMill.TechnologyBuilder:new()
+LumberMill.TechnologyBuilder:new()
     :prerequisites({ "steam-science-pack" })
-    :build()
-
-tech.unit = {
-    count = 250,
-    ingredients = { { "wood-science-pack", 1 }, { "steam-science-pack", 1 } },
-    time = 15
-}
-
-data:extend({ tech })
+    :count(250)
+    :time(15)
+    :ingredients({ { "wood-science-pack", 1 }, { "steam-science-pack", 1 } })
+    :apply()

lignumis/prototypes/content/lumber.lua

@@ -0,0 +1,33 @@
+local item_sounds = require("__base__.prototypes.item_sounds")
+
+data:extend({
+    {
+        type = "item",
+        name = "lumber",
+        icon = "__lignumis__/graphics/icons/lumber.png",
+        pictures = {
+            { filename = "__lignumis__/graphics/icons/lumber.png",   size = 64, scale = 0.5, mipmap_count = 4 },
+            { filename = "__lignumis__/graphics/icons/lumber-1.png", size = 64, scale = 0.5, mipmap_count = 4 },
+            { filename = "__lignumis__/graphics/icons/lumber-2.png", size = 64, scale = 0.5, mipmap_count = 4 },
+        },
+        subgroup = "intermediate-product",
+        order = "A[basic-intermediates]-c[lumber]",
+        inventory_move_sound = item_sounds.wood_inventory_move,
+        pick_sound = item_sounds.wood_inventory_pickup,
+        drop_sound = item_sounds.wood_inventory_move,
+        stack_size = 100,
+        random_tint_color = { 1.0, 0.95, 0.9, 1.0 },
+        fuel_category = "wood",
+        fuel_value = "4MJ"
+    },
+    {
+        type = "recipe",
+        name = "lumber",
+        category = "wood-processing-or-assembling",
+        allow_productivity = true,
+        allow_as_intermediate = true,
+        ingredients = { { type = "item", name = "wood", amount = 2 } },
+        results = { { type = "item", name = "lumber", amount = 1 } },
+        energy_required = 2
+    }
+})

lignumis/prototypes/content/steam-assembling-machine.lua

@@ -16,8 +16,7 @@ assembling_machine.crafting_categories = {
     "basic-crafting",
     "organic-or-assembling",
     "wood-processing-or-assembling",
-    "crafting-with-fluid",
-    "crafting-or-carpentry"
+    "crafting-with-fluid"
 }
 assembling_machine.crafting_speed = 0.5
 assembling_machine.energy_usage = "25kW"

lignumis/prototypes/content/wood-logistics.lua

@@ -0,0 +1,44 @@
+local BeltFactory = require(MF.logistics .. "Belts")
+local Belt = BeltFactory("wood", "brown", "slow")
+
+Belt.EntityBuilder:new()
+    :itemsPerSecond(7.5)
+    :nextTier("")
+    :undergroundDistance(4)
+    :apply({
+        transportBelt = {
+            emissions_per_second = { noise = 0.01 }
+        },
+        undergroundBelt = {
+            emissions_per_second = { noise = 0.1 }
+        },
+        splitter = {
+            emissions_per_second = { noise = 1 }
+        }
+    })
+
+Belt.ItemBuilder:new():apply()
+
+Belt.RecipeBuilder:new()
+    :beltAmount(2)
+    :ingredients("transportBelt", {
+        { type = "item", name = "lumber", amount = 1 },
+        { type = "item", name = "wooden-gear-wheel", amount = 1 }
+    })
+    :ingredients("undergroundBelt", {
+        { type = "item", name = "lumber", amount = 1 },
+        { type = "item", name = "wood-transport-belt", amount = 4 },
+    })
+    :ingredients("splitter", {
+        { type = "item", name = "lumber", amount = 2 },
+        { type = "item", name = "wooden-gear-wheel", amount = 5 },
+        { type = "item", name = "wood-transport-belt", amount = 2 },
+    })
+    :apply()
+
+Belt.TechnologyBuilder:new()
+    :prerequisites({ "wood-science-pack" })
+    :ingredients({ { "wood-science-pack", 1 } })
+    :count(10)
+    :time(10)
+    :apply()

lignumis/prototypes/integrations/data.lua

@@ -1,4 +1,4 @@
 require("vanilla")
 require("Wood-Walls")
-require("wood-logistics")
+--require("wood-logistics")
 require("wood-military")