From afdc3f890b2de6bb22d84e2e3f5aa27bb2a56e37 Mon Sep 17 00:00:00 2001 From: Malasaur Date: Tue, 2 Dec 2025 23:09:18 +0100 Subject: [PATCH] I hate this --- .env | 7 +++---- __main__.py | 3 +++ __pycache__/classes.cpython-311.pyc | Bin 1050 -> 1371 bytes __pycache__/config.cpython-311.pyc | Bin 1597 -> 1481 bytes __pycache__/controllers.cpython-311.pyc | Bin 9401 -> 8344 bytes __pycache__/main.cpython-311.pyc | Bin 6072 -> 6395 bytes __pycache__/util.cpython-311.pyc | Bin 2937 -> 3194 bytes controllers.py | 4 ++-- main.py | 16 +++++++++++----- util.py | 6 +++--- 10 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 __main__.py diff --git a/.env b/.env index 12a77a4..3451f36 100644 --- a/.env +++ b/.env @@ -1,9 +1,8 @@ -MINECRAFTD_PASSWORD="J526lGJOUZlppuMYQNJXQIvimiBZ1gViXD/lLQ=="" -PID_FILE="/srv/retards-server/minecraftd/server.pid" -START_COMMAND="bash /srv/retards-server/data/start.sh" +MINECRAFTD_PASSWORD="poteredellafiga12345678" +START_COMMAND="bash /srv/retards-server/server/start.sh" SERVER_HOST="localhost" SERVER_PORT="25565" SERVER_RCON_PASSWORD="abcdc37ab1ae48056130338c" SERVER_RCON_PORT="25575" MAINTAINANCE_FILE="/srv/retards-server/minecraftd/maintainance.txt" -LOG_FILE="/srv/retards-server/data/logs/latest.log" +LOG_FILE="/srv/retards-server/server/logs/latest.log" diff --git a/__main__.py b/__main__.py new file mode 100644 index 0000000..f1adf01 --- /dev/null +++ b/__main__.py @@ -0,0 +1,3 @@ +import main + +main.run() diff --git a/__pycache__/classes.cpython-311.pyc b/__pycache__/classes.cpython-311.pyc index 52e548eee35a8afc71d54581581da7d90def1abf..e72dbc23524439d6091e50fd6227721e6ee1b350 100644 GIT binary patch delta 706 zcmZWmzi$&U6t>U4A4z*ne?UcwvVai1g$1c%KuCy0N0%dN%5nmoLhPcGlDo*hNX9{Yuco&fM+`C2rvp2-F|tsI7=4YH&GAQq&}Tj8BX$huXwKzifpZP#X|D1g=do%B z1xsfj6JSMK*=V5G%KmuBSu^cT%SH=dB>AzWH*XO~F=i;X7>)_EV#-KtGptpp^4lWs zaVa}Rw;0JtSUTVg!ULzgfp2ZOdrzZiHwu;8*?-b*x0=d*wD+*{xYaBV@ZB9(dkO$Y zPub8g`SZ6iKr})sm!}Wx1{=%`=%K zV$)Ev5TXX2Mq&+i8<((Le!%w}Lu_d6h#0QF1N#dOz!09Y?it!GCj9UP;eqA1s05YSw;R*Z*f_A=pz1cE=BLSaOR%J}ATuvL zKDDAGHLo}`Kd-n518HPlpPO4pz^yJ5^s-~QbMjse3iH{($FIXhN GMgahUe?aB{ delta 409 zcmX@fy_bh~IWI340}wPt>SWHE$Xm{2z%;S#%*02Mlk*vc1){i9*;6@E*lmC+m>5!d zCNE&L<>dj2a3YCFPX5oxFIB*p!n2H#fnhZeLqHT?Do82!#Cx)`yl7JVsq86CRqPB5 zKn1)&1(Va6M1h7&`U{{c1ez)sC78k#%%CZBi_JMdFD*0umawmT-GK&b_mDX3l-g{Bh#`nEYFh$Hl=j^rNBTzvO#zgm>IKFuYU}b0W_bxPnb} zl$<#yMi+lKE^v$f2l3kRtn?-tnX6WOTk=_=PcX> zuHb%yD@gBIIPQJ;n@=vpG#=2%OjF)gg_+6=D&L-uB2424P1_z#lxYH>Y2TyiDDab9 zCipqdo6Ycst)RTRpwK*@3|b851*NQzyj~%Oc&VrZtJ0tGG0#;}nN~DyQqSuP8vQHZ zOGkrF`l%;)P%H><2sxo(QEW4of(>|kK`hvz6$@6F$YJ<5Kc;>;On(=29=r=Pzr*Rg zxpSm9Tf8ppkXq@gCEDAP6u7(Glx<6|OIsX#FVYP;5_!O9Gfu;%&8f;FH1ldvCo+tp z=Y#|O1jifV?!WzY|Wmq&fTXh(o7a~u7GAGrT; zzJB!LTK`17e_}_(Qy+0rQ$>^J>s;7Q^xgHx?caPNEBMqr-<@{&iSVQvFrS6SD7~ZBR zL|jieAWxAXb}R5B-BgZ7`~C^m-T~*{gw}jC5qhnlm}ELS6&ZM8kze-koZi|w_`ZeQ zBv-I(BHXoWL@QPp5l+{`12x}3 z!{7Fnf7QQ{I$Td3Ulr=U#7@;fsdb@4%$HT|~Y{ryPfApUaorowP8LJ%Hbq zYv`;iF=%6`7*41vrD8b`4Q3<*gdkMAz@Wc(C3A;Cs=WY&g*pov*9&l_liJ<^10V7^uv>71FtzXk(v$>jFi^xvw?j|A0HhACDIH z2CMr RYTKYh<1eE6v+#e3SImvIs|G(@IW?{)vq^h9YFEqS~76SV4m(T-at@rVEL zzRHh(19-z)$}bv%TGaH6K$t`*PFKo?P^#z!L!4Lhw-usgBytSDL_7@Vxy5N^UN2V4 zwV)lO71B+t;l`-66dVTyj~kMZL)-1Ze6bvrE| zbM!ynuhYqZDx^5wLEm)lBp|{+$VBQhSEG-1VTx^oBlBL zy#W?&7IF=~FmzJ!J5AXa%4)HE>p45N zg|epTcVcub6oxUtYxHl?GcTc+vKiODuDy&4d>L0E+^AGkbHT5ma05S~-y3adf{B3HFCHU@#2V!3SgaVcfp)#*Pc58}q%Wxn_us4O^ zy<;OA6n_^;qN|ttLvxyFd89v+z`yJt?aI#0R2T&AR2}gBp${36fifhE^mgJqCJZ+qf}`|{#6oV5Jyx69ErsO> zt6B)5A(iql0sQmjX@!}CZB}Nry|XRgY)Go~<7D=`Ea$MB=_CQP#Zl(e_$S3SM-XzFCB zx5n-B(&bco=`lB4+wW~~(c12}Y479Vbb6jVLD|!7#Wg;|LqU9=JVDvhZN;~FKRuRS I77*tD0sI^PE&u=k literal 9401 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 IRLZ3P2j~ubu>b%7 diff --git a/__pycache__/main.cpython-311.pyc b/__pycache__/main.cpython-311.pyc index b8913dc9a25ea918a04c1036e53ccc46d9668d95..9e0106540521dd59e362095e292a7a5cbb8ff154 100644 GIT binary patch delta 2082 zcmZ{l-%BG$9KdIiO*ZD2tGgQ$NKQ)l*U1o+nyS0!Ny<>s>T4b~fID zCrHY)Lk!xG1N~P05y2YqT}RM|r(%O$t%L0A$k%!GA;7&{I^D#beib>+)N& zoj@{@6ae;VCD~4c*(i75UFf^R*FZZjLC+`XZ%L@b>^dKEi7D1FyBjiHb(lSMm~AyoUqhz5 z4%1)7{K?QgZI?UN%#x>u9B4>xuOgS@NLWjD*|Nq+-WpbKLsmx>i|$Zgt(7|2EOpk9 z`{ip=*M@=4Kq5J{!umjEcDK|c`M&j^7|H1*rJTqaw=U{sFo1tC&bACf%`uPCtFodj zX5yJ`1xJ`EIENoH{qSr288hL|n9nBzu+E&z8wUI{(+5rXN5+r)OcQ=HY9f6ayH$oE zjZp;n?%=1KJ{c@Dr|7GU93w!O&u3al^B22?ii#h!X?w7`z$ z*irnO>5kz~h@UdIM)$xjXkd%(9$K#IH<4BJq}%GXRs1++iPZu8pP7SZyuuFQQPvBa z@b}D6*B;!3lDYE50fmvE#3mq#nRyrD_gNQy#`3T%y{Jfb%ijU39stCXB`=&u0%>aO z#KQRE%+w_AYHHsfG-%GVAjK3tA<wzuIedM6=jJc`hY9+Gm5L@He;)n$J*7Re+i zD1$~w&kXI2;$vG!cEa%#cGqLk3r#aBat2+;u-OBbv)<-q=&c5$8)Teb-Oql)4M2a0 zvgxf|4zy-Vrtc|a2ap_3p)sQWFk5Uf!Pc8Z)R;^>k<^$E;;S2EnU}3z(NPiOBp94U4oVlM?G8(g$Mw!7uyu?pi+0|rRQDg;K z@F728VYeS7R?}z`Yy6}@!>8F7%8|I8mgFQF!4ct=dEJRI+Ut0inEM{Fs@zS@p@wY6 zQ*tb(8PWD8qQ5Ide?JhgBQOXm=LF qPQmEO89gPY`C$6dJCCi$p6|pQGm>XURAz(-<$P)cOgkB-yZb*_RjZN! delta 1642 zcmZuxO>7%Q6rQnn*K6;tz4qE(|0TAecI_r@Nkl8s6c;t62q++EkiZ= zT!|_UoFM5O5{XMr<$yT(KqWYoYmty0EsC`#B!pCiRLlV(fk4cxYutD}9)Er_?|t9A zd49Wp&)q#6{#;Q)fR0;l&u;!I?}k&pyZ+tE!ppoNn88M<9)iH&jesdNkhO5{5m}i)PCiBsd&v4DatRobF|vx}t<;cgM3En*$qp>)F^@=QB%)0a$xaZ7dqi?0 zk;DX%sR<%UkI3{$M4up%9~1e}m!FbQdR;J59;w13DIFN;F{wc<24r!aGcq1>ag;}P zjLgdVgg1}8ghZN0&Lj1tF?AhOr^y-aMgAAo7vy8^dGbA1_I(1#H^ODI%ooX?njn24 zO!oPuEQf-h8ekQ*O z5ppk(CHKR5nqQ2_V%iS|u0=6EG||ZXRQ&V9pnCzVQ7Oz?-@U;aUbWss24>CV2<%Fz z<@h%!2o}O0AdFS&sY3V1Vs$ED*1hi9g*07R^w}KUTh?u9`berCO4Y73V@orAAo3;s zXDR8~hrudY3|)IiN!d#NNGTsG<*rh(mCE+jz5wLdPQ{k8tZe0;n%Y0riIh5GsV@R8 z+f$Q!q1&PT^9S=?wQQ?2V7T#gSFPA;rKhF$F5JG*eh^xOIrf>{sOrbzeMiGm*T7jj{F94JNlKT zflPdk6ceWeH-Q>?J)u%=Z6gtOe51j5ynxvk5vs{3}&ZeC_(+AWV!S81w80I2^;6+8e6msgpKS9_m3n>9b5JWHDD%g{=(H;U8`uN_wZ@%~O=FRWaVOo6~ zj}yS-%EQ^4r^K$Bh7Yt^-TD)SAr3N zEy*cnz^P2^4Fupl&%Xh|y$BVXD7-m$*esf2dxD!B+>(xXQwW)}!nPw9;rSDp zcUO*V>EmXy-AD$?>>8Y8AB6*Op~6rS$qUL9k&c%Xo2GC-*T%K9k#e7leG0m^$QzfUHfU3yY_TzXjwwDLf! z_*$i}Ed<)ahjMVC=4&-itFcGYeC5BL0|`iz0oDdM=i^)->jBnZ-w$T0KCXJW%05Zo zrnBK5;nwGzGyEK?jSZ{OT-&U>?(Mciog5d-?7KWKXE-ZBqmX1eDH7bUxy5oFku8&Q zG5pfV`wlpvaWw2us^~Kx Bq?7;v delta 499 zcmZ8dJ4*vW5T4E5W$*Sb7ct`F6yG5xr-c?GB0)lzL{@^`DlM{bx#rr22!>chl@8x)omx0Y9=?U zbE6b5(|{7-I**skvK3eaEZ|Mt3>mjVn=|Qc>77vHbb|t{FrL^k0*AXHTZ!@Hjvgec z$D_szkqfHNfm_f3=77K zaUMgFn@-z*%%;pZQMx5Oc9st^H~dvbkuod#b_z2EQ?CW@sutz zPlD StreamingResponse: check_password(authorization) return StreamingResponse(Controllers.logs.tail(data.back)) + + +if __name__ == "__main__": + uvicorn.run("main:app", host="0.0.0.0", port=42101) diff --git a/util.py b/util.py index 7a1588f..af23be6 100644 --- a/util.py +++ b/util.py @@ -3,10 +3,10 @@ from typing import Callable from fastapi import HTTPException -from minecraftd.classes import ProcessStatus +from classes import ProcessStatus -from .config import Config -from .controllers import Controllers +from config import Config +from controllers import Controllers async def stop_server(