From f47eb80677327aadc89565922fd70b9e221b7680 Mon Sep 17 00:00:00 2001 From: zontreck Date: Sun, 22 Dec 2024 17:58:55 -0700 Subject: [PATCH] Get cobalt to generate! --- CakeBuild/CakeBuild.csproj | 4 ++-- VintageStorage/Properties/launchSettings.json | 8 ++++---- VintageStorage/VintageStorage.cs | 6 ++++-- VintageStorage/VintageStorage.csproj | 10 +++++----- VintageStorage/assets/mymodid/lang/en.json | 3 --- .../assets/vintagestorage/lang/en.json | 4 ++++ .../textures/block/stone/ore/cobalt1.png | Bin 0 -> 1591 bytes .../textures/item/resource/nugget/cobalt.png | Bin 0 -> 2454 bytes runTest | 7 +++++++ 9 files changed, 26 insertions(+), 16 deletions(-) delete mode 100644 VintageStorage/assets/mymodid/lang/en.json create mode 100644 VintageStorage/assets/vintagestorage/lang/en.json create mode 100644 VintageStorage/assets/vintagestorage/textures/block/stone/ore/cobalt1.png create mode 100644 VintageStorage/assets/vintagestorage/textures/item/resource/nugget/cobalt.png create mode 100755 runTest diff --git a/CakeBuild/CakeBuild.csproj b/CakeBuild/CakeBuild.csproj index d321c42..f65b99f 100644 --- a/CakeBuild/CakeBuild.csproj +++ b/CakeBuild/CakeBuild.csproj @@ -13,7 +13,7 @@ - game/VintagestoryAPI.dll + ../game/VintagestoryAPI.dll - \ No newline at end of file + diff --git a/VintageStorage/Properties/launchSettings.json b/VintageStorage/Properties/launchSettings.json index 88d64d4..8ba4701 100644 --- a/VintageStorage/Properties/launchSettings.json +++ b/VintageStorage/Properties/launchSettings.json @@ -2,15 +2,15 @@ "profiles": { "Client": { "commandName": "Executable", - "executablePath": "game/Vintagestory.exe", + "executablePath": "~/.local/share/vintagestory/Vintagestory", "commandLineArgs": "--tracelog --addModPath \"$(ProjectDir)/bin/$(Configuration)/Mods\"", - "workingDirectory": "$(VINTAGE_STORY)" + "workingDirectory": "~/.local/share/vintagestory" }, "Server": { "commandName": "Executable", - "executablePath": "game/VintagestoryServer.exe", + "executablePath": "~/.local/share/vintagestory/VintagestoryServer", "commandLineArgs": "--tracelog --addModPath \"$(ProjectDir)/bin/$(Configuration)/Mods\"", - "workingDirectory": "$(VINTAGE_STORY)" + "workingDirectory": "~/.local/share/vintagestory" } } } diff --git a/VintageStorage/VintageStorage.cs b/VintageStorage/VintageStorage.cs index 5333e35..5d3a8b7 100644 --- a/VintageStorage/VintageStorage.cs +++ b/VintageStorage/VintageStorage.cs @@ -1,4 +1,5 @@ -using Vintagestory.API.Client; +using System; +using Vintagestory.API.Client; using Vintagestory.API.Common; using Vintagestory.API.Config; using Vintagestory.API.Server; @@ -7,10 +8,11 @@ namespace VintageStorage { public class VintageStorage : ModSystem { + public static String MOD_ID = "vintagestorage"; // Called on server and client public override void Start(ICoreAPI api) { - api.Logger.Notification("Hello from template mod: " + Lang.Get("mymodid:hello")); + api.Logger.Notification(Lang.Get($"{MOD_ID}:start")); } public override void StartServerSide(ICoreServerAPI api) diff --git a/VintageStorage/VintageStorage.csproj b/VintageStorage/VintageStorage.csproj index 57ed2de..42f59f8 100644 --- a/VintageStorage/VintageStorage.csproj +++ b/VintageStorage/VintageStorage.csproj @@ -8,23 +8,23 @@ - game/VintagestoryAPI.dll + ../game/VintagestoryAPI.dll false - game/Mods/VSSurvivalMod.dll + ../game/Mods/VSSurvivalMod.dll False - game/Mods/VSEssentials.dll + ../game/Mods/VSEssentials.dll False - game/Mods/VSCreativeMod.dll + ../game/Mods/VSCreativeMod.dll False - game/Lib/Newtonsoft.Json.dll + ../game/Lib/Newtonsoft.Json.dll False diff --git a/VintageStorage/assets/mymodid/lang/en.json b/VintageStorage/assets/mymodid/lang/en.json deleted file mode 100644 index ed900d8..0000000 --- a/VintageStorage/assets/mymodid/lang/en.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "hello": "hello world!" -} \ No newline at end of file diff --git a/VintageStorage/assets/vintagestorage/lang/en.json b/VintageStorage/assets/vintagestorage/lang/en.json new file mode 100644 index 0000000..87d76ef --- /dev/null +++ b/VintageStorage/assets/vintagestorage/lang/en.json @@ -0,0 +1,4 @@ +{ + "start": "Vintage Storage is now starting up...", + "cobalt-electric": "Commonly used in electronics" +} \ No newline at end of file diff --git a/VintageStorage/assets/vintagestorage/textures/block/stone/ore/cobalt1.png b/VintageStorage/assets/vintagestorage/textures/block/stone/ore/cobalt1.png new file mode 100644 index 0000000000000000000000000000000000000000..0aa2026598be9a7fb90e04fbe77d6a4fe539198f GIT binary patch literal 1591 zcmV-72FUq|P)Px)@kvBMR9JY=4~dy6@fz z=$U!u-uJ!FdCrgTIp1?`herQgjNP8bGOjZ zro10Z(&L}thWu?LJv(>|`N=pB5971=S{nZj)Nm@Eui;fFum(fMuNE%E&h)ekr=)RT z#3Y<_6!~79onc=gAefNeAHfBfSVJGyVo#g$0*%}!WQgn7ioLiTpT=u&Q$>DSdjC#* z7wa%p;65YI3G2;#avp3yU&B|hStQG)I619+ zL16dN+-uN-=_%ZUiTS-Zy**u&+o4oGFW)~~QQDiIFT;^Sy}3{%;hRL_t;a7?`D(l& zFB%m&aXB7MFGmE{>jh*h@B@4=Be>NVWYaJg*NM`+5%UZ6<_5eSbMQ-%WFw+>pTj>y z(w&>0{V)x9AicXDXA0bZCg2*vaLSd+H{i{Aeh2QxV4>a|5+ySUug}Z&i-g>S1%mY+ z$?!Mvd%*?kaBDiymuJrre6b_ti3IzqAd>sj%O}%_19|a0 zT#@^PG_K@}ZqWnwq|z7gkmxN3QLBkgcSquSa$Z!fk@S3NK3|N5qP_NslG=%7Y0z77 zZ5l=-?OuE|;repwSd$J<>d@$)lbC%RccuXs7-PAUMCO;Y+#!-_YkrWwn}u- z(KLQ$LbWRmdR@MIaUNKJcjv{!g4ah=d9Ns;<$_E$3ao#e;an-Yo@m4_wljUyk4-8S-25P$Ly@#y2t|=i%y9-j`u*p9e~=UzrhGpHA+^KaHOU zTID>@iSG;gTrOB}R3yr9Mxr~FbcwoOEo%8_^T4QRVzUG%OcYc-WNaR&*F@=T%CMGP zUx=hymk?2g)@d*mPpl|D&IaT5p%%pLcZQ>te1v?mVzfWc4-1`uX96Wr--a pFKFxMN0C>NAIOLt7W6w#{=ZHq-oOrKuCf3C002ovPDHLkV1ju416lw8 literal 0 HcmV?d00001 diff --git a/VintageStorage/assets/vintagestorage/textures/item/resource/nugget/cobalt.png b/VintageStorage/assets/vintagestorage/textures/item/resource/nugget/cobalt.png new file mode 100644 index 0000000000000000000000000000000000000000..edb5bd3d84cfc27109dc3f70acd24333f44bbc28 GIT binary patch literal 2454 zcmV;H32F9;P)Px;P)S5VR9J;QmP@Q9*HwnUwfC;qdER%wyOp+ax06^(NMc*D1V~^AvJymQnIOS{ z0V5U`t?%*R+dszChR?q8GVR?xzWMdPBt3eUf)P#rX9~CtL(g8_tk+_L9d)Nyl5rHKdeg!fE7SO)Ox;^DTzt>VkWzi1!|Z)vx^(|Md5N2T8CJvE;x14H$!r$On7)cuvb2l{Hucb`R_BP>${~ z+IyP8V4pl25mO+<8E}EkTAT&w2u;T9R5>{<*_vPgsBrF!h#uL++C~J&S z=r+{zhO77PQS1*`o%{lSo)`_Mlx6^vlHdEvm-**^cpKmR99MJ|qWf5maB)mc0x3Z& zhyj@3!-UIqMD3Egg|=PeJ0Z`m(Rqk|2%I5BLnbp~6KI;2om+QEn~%6SR-CoOwqbeM z^3osvG4K57Tm0g`eu`6hNYWWf21cmYS0Jqc1Fl5XK$_ESF6n}W&3lk)aE2nAkaZO? z3POSN5sEQwv*P68&tPxJ?xaGeJ6t{3XFMu+^vhEwcW?93@4mv+&k$3*qN!VfU4p%Y z?u$SG2e<)7DoCCbFF+R{Z-KTT1i!j8`{5frb@zxnIgIBsoGYKg+ZJP%7`LVnAxcG{ATh=;#L}QzYo&LHkO z+2A&XEoc$EE|^re*f}_4eB&l=P~cWA&)oeackkThCm;P1e|gNw=@V|;xWyNqe;(m0 zKUOz5BrG!M2ACwI&10l}h*`Z)-dtc;9qCfoA7AIuz1uL}h3NrOukp;&S9tEZBQ(x&_xCN41;JKSMM)Pj zn)L*Kd5x|Tw7aCZsZ2%{hlhu}@ZyU^gyY$Ui}{kmWbE7?a(#S{Ph8zcZWJW1{NTas zyz_(qfU_CxdPSQF_h0yJKKB=2W;95=`Oe#%9e;@XpMUvBNG;eQ)17N9+_RMVm_fBm zHF}n8&oMeIxpsG#@xJ4!LpVKN^Z3zQ%-(-U*EGCaFBne-+`IP_FS!?Z^Jfou@cmb5 zA3bEGN*5Ny#u65D&Q}Yr-8|&|AD!~*zrBXz;{SkvkP}vOs64@qxS+sRQ)E6|N7nUaQ^s&*`pIo0BbUu&=QaKIKO(8w_ksUU%mGM?W}{4VV$Ew*x>o-(Gy<% z;ZN9^eu)qM_mY4A{+oz(f3B5<)Fu>1!xNkpLh`5sRH3Yp{R6ZMkoMtx0YRwD2$hV+ z3hro+o$FVTrLwB$G#AIPJjD^oOd{scIdGGL-}&N;Jo)eg-hShC#1((7nIvcpq6LL} z4Ag`;BkCoQ1TuhZO4}*O70`?-n_^?mCIuwRF{27^0?czLfg-?qhV^TVcEr+ji6XaH@)zgh~QH)RF`m zO^B@sv}lN6CZsOXnGEVgM$M3fnvziN(z#vM7R>G*HmykY3THh?OGpXdfwNPBT&IbO zVTCs>PNGGL2!bXB9H>E5Py|E}wWxX^L7F4RA}JD4P({R1Ra2xI;4??;94RXyP7qTO z>Kg3=$p|oo=&=ZS22P^DR_vmJ%BtrLKq5jyNtmsCR6Ur0SdYe*q!m_jsyw3_Oj#a4 z>k(*cpui_?E$&y89W>KP=U%|SDe33Yi%a$`ari9TSnoN7{$HcMh?$X$*L z;!!-9geCzU0tutPK|;6actHEUPXuXuc#I+%Q4ReZ(R~QE0#;D3@G|KK8I#kvATo zAlDYljKCZp=h(0z?`n3R`x1V3$m;ki?P7*Q^yA zTEz5EQi*DB<3s`?i8V1eVjYl=-ej+sFrHQ%w*y?Cq3gd5M9j7d*xrtS$krtqu>`h; zLKE0)G*s1Y*L;W@#H2r8lXu>=gJZ!l^w zYClFm&|XxjLe(M^fFQ!Q1|&oxD$TZxW~k<%7QtdQBTEiXMx_yB=B%1uid4 z=oW=u!KfgTFrtVEAq^3FZSQ0})g>m*7;wS=0|a_D U#hEubg8%>k07*qoM6N<$g8G$r*8l(j literal 0 HcmV?d00001 diff --git a/runTest b/runTest new file mode 100755 index 0000000..206d354 --- /dev/null +++ b/runTest @@ -0,0 +1,7 @@ +#!/bin/bash + +rm -rf Releases +./build.sh +vsleep 2 +rm -rf Releases/vintagestorage +game/Vintagestory --tracelog --addModPath "$(pwd)/Releases" -o modtest