From 75c8311f72989e4c74d81cad3b40d4c692c047b0 Mon Sep 17 00:00:00 2001
From: godot <lukanetik@seznam.cz>
Date: Mon, 29 Jul 2024 21:42:17 +0200
Subject: [PATCH] ReWhitelist plugin + icon

---
 README.md            |  19 +++++++++++++++----
 data/server-icon.png | Bin 0 -> 714 bytes
 script.sh            |  20 ++++++++++++++++++--
 3 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 data/server-icon.png

diff --git a/README.md b/README.md
index 9231fb1..1f52951 100644
--- a/README.md
+++ b/README.md
@@ -9,20 +9,31 @@
 ## To DO!
 - [x] Firewall shinanigns
     - [x] Proxmox admin acces in firewall
-    - [ ] Clean up Prox
+    - [x] Clean up Prox
 - [x] Auto add plugins
 - [x] SystemD service
 - [x] Config of velocity.toml
     - [x] IP 
 - [x] Tailscale
 - [x] Comments of what is doing what
-- [ ] Integrate ReWhitelist plugin
+- [x] Integrate ReWhitelist plugin
+- [x] Auto set up logo intagret to script
+- [ ] Back up script
 
 ## To learn
 - [x] What content of start.sh means
-- [ ] Requred resources
+- [x] Requred resources
 - [ ] Different types of forwarding
 - [ ] SkinRestorer???
 - [ ] DinMap
-- [*] In their docs they have pages
+- [x] In their docs they have pages
 - [ ] Plan-Player-Analytics X Plan-Player-Analytics
+
+## Used plugins
+- [Proxy Compatible Forge](https://github.com/adde0109/Proxy-Compatible-Forge) (On server for Velocity)
+
+- [Ambassador](https://github.com/adde0109/Ambassador) (on Proxy for Forge support)
+- [ReWhitelist](https://hangar.papermc.io/ReModded/ReWhitelist) (on Proxy for whitelisting)
+
+
+
diff --git a/data/server-icon.png b/data/server-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c00f0bce4032324886001b11bc2cb39e13acc6ac
GIT binary patch
literal 714
zcmV;*0yX`KP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5Ay7<IMOmK@s&XE(i5Kd$9yp&5O|lv|j1Q4&0FG@E
zXiyDVD-XMHLIMB)010qNS#tmY4#NNd4#NS*Z>VGd00J0EL_t(Y$JLX+j@vK{#&w0A
z!K0txKoy0PDZ}B0OlgsH=;Rh~=XA+4bj~ENp4u%5I`JthlKMkOL9=u@4w5YW{P80#
zn|ZVV)|9c^X&^tP^X&tLY9}(gAp+H{$bOKyjtVn^5>&nNP*~Xat)F_zqC6}t3DMg_
z{}JAA3zP5QCDr4%InzM{s-7nR_&~)TfukCF5&&2S5B@chs6P4W=jey$+Vn&Qi6aBg
z{8H!K6xR`094G}q{ml=~IhLq6*V<&05?+8MB<!GF24Lzk@Ujo>;|>ep^%G!Cm58T%
zz&d;e?Lq_AG-p0*l!W%MHVra>dsBb^QC2|!OVC(<4S7Q!C|(URAXu9lk%~AXA_Ms4
zoLiLyz#;*Sp$RW=CsuqUK%06qEDo)fD1iR>`3{gWy!H$AWi|!CzeJrJ3(#g)7XKJL
z_`3Ao960;#Zt))gMe_*2{{#Gf0CeL6z@0KMYg80)u!ORc-6UHVT8%S6Z2PNX!^7B}
z%CAYr1Xxa#W75C{)c-)M(GMF1c!^w@e;vACE;vqr5;*ZN2QH$}iI?T%SDPDvC0NEy
zJQaYiOnh{sg92!y{bT}W9zrWaAz|L!G)i?s7Ui{HrcRu)gvkO$*a(OKUh~lklZ1%^
z{#U)`b6MK}@Fvay)BqjGzYdX=&6tArr7M^lgvz9+S0!-OS1t-@0QHT+djP%_0P!#M
wzE*}3uj@Vl000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$f={9)-~a#s

literal 0
HcmV?d00001

diff --git a/script.sh b/script.sh
index f26a5a9..2bb3c8b 100755
--- a/script.sh
+++ b/script.sh
@@ -71,12 +71,11 @@ mkdir /opt/velocity
 mv data/velocity*.jar start.sh /opt/velocity/
 
 mkdir /opt/velocity/plugins
-mv data/Ambassador*.jar /opt/velocity/plugins
 
 mv data/velocity.toml /opt/velocity/
 mv data/forwarding.secret /opt/velocity/
 mv data/start.sh /opt/velocity/
-
+mv data/server-icon.png /opt/velocity/
 
 ### Permisions 
 
@@ -159,6 +158,23 @@ if [[ "$ansTail" =~ ("y"|"Y") || -z $ansTail ]]; then
 
 fi	
 
+printf "Do you want to run Velocity with Forge server? [Y/n]: \n"
+read ansForge
+
+if [[ "$ansForge" =~ ("Y"|"y") || -z $ansForge ]]; then
+	printf "+ adding reqired plugin \n"
+	mv data/Ambassador*.jar /opt/velocity/plugins
+fi
+
+printf "Do you want to run it with whitelist plugin? [Y/n]: \n"
+read ansWhite
+
+if [[ "$ansForge" =~ ("Y"|"y") || -z $ansForge ]]; then
+	printf "+ adding reqired plugin \n"
+	mv data/ReWhitelist*.jar /opt/velocity/plugins
+	mkdir /opt/velocity/whitelists
+	mv data/whitelists/* /opt/velocity/whitelists/
+fi
 
 ### Start service