From 10808b100e2ea6ab144b362dabdfa896e32a19a6 Mon Sep 17 00:00:00 2001 From: Crisenpuer <161527232+Crisenpuer@users.noreply.github.com> Date: Mon, 21 Oct 2024 17:15:16 +0200 Subject: [PATCH] Return from the dead update! --- .vscode/launch.json | 13 +++++++++++ .vscode/settings.json | 16 +++++++++++++ README.md | 16 ++++++------- bigger-concrete-stack/data.lua | 4 ++++ info.json => bigger-concrete-stack/info.json | 6 ++--- .../locals/en/mod-setting-name.cfg | 5 +++++ bigger-concrete-stack/locals/pl/msn.cfg | 5 +++++ bigger-concrete-stack/settings.lua | 4 ++++ .../thumbnail.png | Bin .../vanilla/data.lua | 11 +++++++++ .../vanilla/settings.lua | 0 concrete.lua | 8 ------- data.lua | 2 -- mklink.ps1 | 21 ++++++++++++++++++ 14 files changed, 89 insertions(+), 22 deletions(-) create mode 100644 .vscode/launch.json create mode 100644 .vscode/settings.json create mode 100644 bigger-concrete-stack/data.lua rename info.json => bigger-concrete-stack/info.json (75%) create mode 100644 bigger-concrete-stack/locals/en/mod-setting-name.cfg create mode 100644 bigger-concrete-stack/locals/pl/msn.cfg create mode 100644 bigger-concrete-stack/settings.lua rename thumbnail.png => bigger-concrete-stack/thumbnail.png (100%) rename refined-concrete.lua => bigger-concrete-stack/vanilla/data.lua (53%) rename settings.lua => bigger-concrete-stack/vanilla/settings.lua (100%) delete mode 100644 concrete.lua delete mode 100644 data.lua create mode 100644 mklink.ps1 diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..657255e --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,13 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "factoriomod", + "request": "launch", + "name": "Factorio Mod Debug" + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..242678a --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,16 @@ +{ + "factorio.versions": [ + { + "name": "Factorio_ModDev", + "factorioPath": "c:\\BARTL\\Factorio_ModDev\\bin\\x64\\factorio.exe", + "active": true + } + ], + "Lua.workspace.library": [ + "c:\\BARTL\\Factorio_1.1.107\\data" + ], + "Lua.workspace.userThirdParty": [ + "c:\\Users\\bartl\\AppData\\Roaming\\Code\\User\\workspaceStorage\\7b372f3bc38d2196850595c27863ee9c\\justarandomgeek.factoriomod-debug\\sumneko-3rd" + ], + "Lua.workspace.checkThirdParty": "ApplyInMemory" +} \ No newline at end of file diff --git a/README.md b/README.md index ef9a9ee..bce7f55 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# Bigger concrete stack -This mod makes cocrete stacks bigger. - -You can find mod on factorio mod portal: -https://mods.factorio.com/mod/bigger-concrete-stack - -Don't have factorio? No problem! Go here: -https://re146.dev/factorio/mods/en#https://mods.factorio.com/mod/bigger-concrete-stack +# Bigger concrete stack +This mod makes cocrete stacks bigger. + +You can find mod on factorio mod portal: +https://mods.factorio.com/mod/bigger-concrete-stack + +Don't have factorio? No problem! Go here: +https://re146.dev/factorio/mods/en#https://mods.factorio.com/mod/bigger-concrete-stack diff --git a/bigger-concrete-stack/data.lua b/bigger-concrete-stack/data.lua new file mode 100644 index 0000000..d839ccb --- /dev/null +++ b/bigger-concrete-stack/data.lua @@ -0,0 +1,4 @@ +-- Vanilla +if mods['base'] then + require('vanilla.data') +end \ No newline at end of file diff --git a/info.json b/bigger-concrete-stack/info.json similarity index 75% rename from info.json rename to bigger-concrete-stack/info.json index 54e89e8..5403d4c 100644 --- a/info.json +++ b/bigger-concrete-stack/info.json @@ -5,8 +5,6 @@ "author":"GamBar1709", "contact": "gambar1709@gmail.com", "description":"This mod makes cocrete stacks bigger", -"factorio_version":"1.1", -"dependencies":[ - "base" -] +"factorio_version":"2.0", +"dependencies":[ "base" ] } diff --git a/bigger-concrete-stack/locals/en/mod-setting-name.cfg b/bigger-concrete-stack/locals/en/mod-setting-name.cfg new file mode 100644 index 0000000..ce90c85 --- /dev/null +++ b/bigger-concrete-stack/locals/en/mod-setting-name.cfg @@ -0,0 +1,5 @@ +[mod-setting-name] +bcs-concrete-stack-size=[VANILLA] Concrete stack size +bcs-hazard-concrete-stack-size=[VANILLA] Hazard concrete stack size +bcs-refined-concrete-stack-size=[VANILLA] Refined concrete stack size +bcs-refined-hazard-concrete-stack-size=[VANILLA] Refined hazard concrete stack size \ No newline at end of file diff --git a/bigger-concrete-stack/locals/pl/msn.cfg b/bigger-concrete-stack/locals/pl/msn.cfg new file mode 100644 index 0000000..acc720a --- /dev/null +++ b/bigger-concrete-stack/locals/pl/msn.cfg @@ -0,0 +1,5 @@ +[mod-setting-name] +bcs-concrete-stack-size=[VANILLA] Rozmiar stosu betonu +bcs-hazard-concrete-stack-size=[VANILLA] Rozmiar stosu betonu ostrzegawczego +bcs-refined-concrete-stack-size=[VANILLA] Rozmiar stosu żelazobetonu +bcs-refined-hazard-concrete-stack-size=[VANILLA] Rozmiar stosu żelazobetonu ostrzegawczego \ No newline at end of file diff --git a/bigger-concrete-stack/settings.lua b/bigger-concrete-stack/settings.lua new file mode 100644 index 0000000..69d1c08 --- /dev/null +++ b/bigger-concrete-stack/settings.lua @@ -0,0 +1,4 @@ +-- Vanilla +if mods['base'] then + require('vanilla.settings') +end \ No newline at end of file diff --git a/thumbnail.png b/bigger-concrete-stack/thumbnail.png similarity index 100% rename from thumbnail.png rename to bigger-concrete-stack/thumbnail.png diff --git a/refined-concrete.lua b/bigger-concrete-stack/vanilla/data.lua similarity index 53% rename from refined-concrete.lua rename to bigger-concrete-stack/vanilla/data.lua index cc73041..b242e0e 100644 --- a/refined-concrete.lua +++ b/bigger-concrete-stack/vanilla/data.lua @@ -1,3 +1,14 @@ +local concreteItem = data.raw["item"]["concrete"] +concreteItem.stack_size = settings.startup["bcs-concrete-stack-size"].value + +local hazardConcreteItem = data.raw["item"]["hazard-concrete"] +hazardConcreteItem.stack_size = settings.startup["bcs-hazard-concrete-stack-size"].value + +data:extend({hazardConcreteItem}) +data:extend({concreteItem}) + + + local refinedConcreteItem = data.raw["item"]["refined-concrete"] refinedConcreteItem.stack_size = settings.startup["bcs-refined-concrete-stack-size"].value diff --git a/settings.lua b/bigger-concrete-stack/vanilla/settings.lua similarity index 100% rename from settings.lua rename to bigger-concrete-stack/vanilla/settings.lua diff --git a/concrete.lua b/concrete.lua deleted file mode 100644 index 31edb37..0000000 --- a/concrete.lua +++ /dev/null @@ -1,8 +0,0 @@ -local concreteItem = data.raw["item"]["concrete"] -concreteItem.stack_size = settings.startup["bcs-concrete-stack-size"].value - -local hazardConcreteItem = data.raw["item"]["hazard-concrete"] -hazardConcreteItem.stack_size = settings.startup["bcs-hazard-concrete-stack-size"].value - -data:extend({hazardConcreteItem}) -data:extend({concreteItem}) \ No newline at end of file diff --git a/data.lua b/data.lua deleted file mode 100644 index 6187e95..0000000 --- a/data.lua +++ /dev/null @@ -1,2 +0,0 @@ -require("concrete") -require("refined-concrete") \ No newline at end of file diff --git a/mklink.ps1 b/mklink.ps1 new file mode 100644 index 0000000..d7e9c92 --- /dev/null +++ b/mklink.ps1 @@ -0,0 +1,21 @@ +#Paths +$factorio_path = "C:\BARTL\Factorio_ModDev\" +$mods_folder = "$factorio_path\mods" +$curr_path = Get-Location + +#Mods +$mod1 = "bigger-concrete-stack" + +# Wiązania +$link1 = "$mods_folder\$mod1" + +# Ścieżki źródłowe +$src1 = "$curr_path\$mod1" + +# Tworzenie linków (jeśli jeszcze nie istnieją) +if (-not (Test-Path $link1)) { + New-Item -ItemType SymbolicLink -Path $link1 -Target $src1 + Write-Output "Symlink dla $mod1 został utworzony." +} else { + Write-Output "Symlink dla $mod1 już istnieje." +} \ No newline at end of file