From 9885d459f247d3f32672624132c53c0d60dc90d8 Mon Sep 17 00:00:00 2001 From: jakub Date: Fri, 22 Dec 2023 23:07:39 +0100 Subject: [PATCH] c --- .../informator/events/PlayerChangeWorlds.java | 13 ++++++++++ .../informator/handlers/TabHandler.java | 21 ++++++++------- src/main/resources/animations.yml | 20 +++++++-------- src/main/resources/config.yml | 22 +++++++++++----- src/main/resources/modules/tab.yml | 9 +++---- target/classes/animations.yml | 24 +++++++++--------- target/classes/config.yml | 3 ++- target/classes/modules/tab.yml | 9 +++---- .../informator/handlers/TabHandler.class | Bin 4723 -> 4911 bytes 9 files changed, 72 insertions(+), 49 deletions(-) create mode 100644 src/main/java/xyz/soukup/informator/events/PlayerChangeWorlds.java diff --git a/src/main/java/xyz/soukup/informator/events/PlayerChangeWorlds.java b/src/main/java/xyz/soukup/informator/events/PlayerChangeWorlds.java new file mode 100644 index 0000000..5e886d0 --- /dev/null +++ b/src/main/java/xyz/soukup/informator/events/PlayerChangeWorlds.java @@ -0,0 +1,13 @@ +package xyz.soukup.informator.events; + +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerChangedWorldEvent; +import xyz.soukup.informator.handlers.TabHandler; + +public class PlayerChangeWorlds implements Listener { + @EventHandler + public void onPlayerChangeWorld(PlayerChangedWorldEvent event){ + TabHandler.chooseTab(event.getPlayer()); + } +} diff --git a/src/main/java/xyz/soukup/informator/handlers/TabHandler.java b/src/main/java/xyz/soukup/informator/handlers/TabHandler.java index d794c7d..e64fa2c 100644 --- a/src/main/java/xyz/soukup/informator/handlers/TabHandler.java +++ b/src/main/java/xyz/soukup/informator/handlers/TabHandler.java @@ -33,6 +33,7 @@ public class TabHandler { String footerString = String.join("\n&r", footer); tabDataList.add(headerString); tabDataList.add(footerString); + Bukkit.getLogger().info((String) tabDataList.get(1)); tabData.put(targetKey + "." + key, tabDataList); @@ -45,21 +46,23 @@ public class TabHandler { public static void chooseTab(Player player){ String choosenTab = "tabs.required.default"; int choosenPriority = tabConfig.getInt("tabs.required.default.priority"); - if (tabData.containsKey("tabs.player.players." + player.getDisplayName())){ - player.sendMessage("ss"+choosenPriority); + if (tabData.containsKey("tabs.world.worlds." + player.getWorld().getName()) && tabConfig.getBoolean("tabs.world.enabled")){ + player.sendMessage(player.getWorld().getName()); + if ((int)tabData.get("tabs.world.worlds." + player.getWorld().getName()).get(0) > choosenPriority){ + choosenTab = "tabs.world.worlds." + player.getWorld().getName(); + choosenPriority = (int)tabData.get("tabs.world.worlds." + player.getWorld().getName()).get(0); + + } + + } + if (tabData.containsKey("tabs.player.players." + player.getDisplayName()) && tabConfig.getBoolean("tabs.player.enabled")){ + if ((int)tabData.get("tabs.player.players." + player.getDisplayName()).get(0) > choosenPriority){ - player.sendMessage("SSSSSSSS"); choosenTab = "tabs.player.players." + player.getDisplayName(); choosenPriority = (int)tabData.get("tabs.player.players." + player.getDisplayName()).get(0); } } - if (tabData.containsKey("tabs.world.worlds." + player.getWorld().getName())){ - if ((int)tabData.get("tabs.world.worlds." + player.getWorld().getName()).get(0) > choosenPriority){ - choosenTab = "tab.world.worlds." + player.getWorld().getName(); - } - - } playerTab.put(player, choosenTab); } diff --git a/src/main/resources/animations.yml b/src/main/resources/animations.yml index ff6d034..c567070 100644 --- a/src/main/resources/animations.yml +++ b/src/main/resources/animations.yml @@ -11,15 +11,15 @@ exampleTitle: #You can use animation creation tool (ACT) built in web configurator! # https://informator.soukup.xyz/configurator/act frames: - - "&b&3I&b&fNFORMATOR" - - "&b&fI&b&3N&b&fFORMATOR" - - "&b&fIN&b&3F&b&fORMATOR" - - "&b&fINF&b&3O&b&fRMATOR" - - "&b&fINFO&b&3R&b&fMATOR" - - "&b&fINFOR&b&3M&b&fATOR" - - "&b&fINFORM&b&3A&b&fTOR" - - "&b&fINFORMA&b&3T&b&fOR" - - "&b&fINFORMAT&b&3O&b&fR" - - "&b&fINFORMATO&b&3R" + - "&6&lI&f&lNFORMATOR" + - "&f&lI&6&lN&f&lFORMATOR" + - "&f&lIN&6&lF&f&lORMATOR" + - "&f&lINF&6&lO&f&lRMATOR" + - "&f&lINFO&6&lR&f&lMATOR" + - "&f&lINFOR&6&lM&f&lATOR" + - "&f&lINFORM&6&lA&f&lTOR" + - "&f&lINFORMA&6&lT&f&lOR" + - "&f&lINFORMAT&6&lO&f&lR" + - "&f&lINFORMATO&6&lR" diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 204c4f6..f99a43c 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -10,10 +10,18 @@ modules-enabled: #Configuration for plugin's web interface -web-interface: - #online configurator enabled. We recommend to disable it after setting up the plugin - enabled: true - #API address of the configurator. - #DO NOT CHANGE THIS IF SOMEONE TOLD YOU TO. - #Api is a powerful tool. It can destroy all configuration if in wrong hands - api-address: https://informator.soukup.xyz/configurator/api/ \ No newline at end of file +#################################################################### +# # +# DANGER ZONE! # +# # +# Settings bellow can strongly influence plugin's functioning # +# They are here mainly for development purposes # +# You should NOT change them if someone told you to # +# You should change them ONLY if you understand them # +# Support will be provided only for default values # +# Please be carefull. # +# # +#################################################################### + +config-version: 0.0.1 +api-url: https://informator.soukup.xyz/configurator/api/ \ No newline at end of file diff --git a/src/main/resources/modules/tab.yml b/src/main/resources/modules/tab.yml index df8e228..e1592af 100644 --- a/src/main/resources/modules/tab.yml +++ b/src/main/resources/modules/tab.yml @@ -24,11 +24,10 @@ tabs: - "Change this in modules/tab.yml" - "" world: - enabled: false - priority: 1 + enabled: true worlds: - exampleWorld: - enabled: true + world_nether: + priority: 6 header: - "World specified tab" - "%%animation:exampleTitle%%" @@ -61,7 +60,7 @@ tabs: - "Change this in modules/tab.yml" - "" player: - enabled: false + enabled: true players: Kuba1428: priority: 3 diff --git a/target/classes/animations.yml b/target/classes/animations.yml index a3f54a3..c567070 100644 --- a/target/classes/animations.yml +++ b/target/classes/animations.yml @@ -6,20 +6,20 @@ exampleTitle: #Speed is in minecraft ticks #20 ticks = 1 second so speed 20 = 1 frame per second - speed: 2 + speed: 4 #Also hate making animations manually? #You can use animation creation tool (ACT) built in web configurator! # https://informator.soukup.xyz/configurator/act frames: - - "&b&3I&b&fNFORMATOR" - - "&b&fI&b&3N&b&fFORMATOR" - - "&b&fIN&b&3F&b&fORMATOR" - - "&b&fINF&b&3O&b&fRMATOR" - - "&b&fINFO&b&3R&b&fMATOR" - - "&b&fINFOR&b&3M&b&fATOR" - - "&b&fINFORM&b&3A&b&fTOR" - - "&b&fINFORMA&b&3T&b&fOR" - - "&b&fINFORMAT&b&3O&b&fR" - - "&b&fINFORMATO&b&3R" - - "&cKONEC" + - "&6&lI&f&lNFORMATOR" + - "&f&lI&6&lN&f&lFORMATOR" + - "&f&lIN&6&lF&f&lORMATOR" + - "&f&lINF&6&lO&f&lRMATOR" + - "&f&lINFO&6&lR&f&lMATOR" + - "&f&lINFOR&6&lM&f&lATOR" + - "&f&lINFORM&6&lA&f&lTOR" + - "&f&lINFORMA&6&lT&f&lOR" + - "&f&lINFORMAT&6&lO&f&lR" + - "&f&lINFORMATO&6&lR" + diff --git a/target/classes/config.yml b/target/classes/config.yml index ccadb33..1a9a5fa 100644 --- a/target/classes/config.yml +++ b/target/classes/config.yml @@ -9,10 +9,11 @@ modules-enabled: bossbar: true #Configuration for plugin's web interface + web-interface: #online configurator enabled. We recommend to disable it after setting up the plugin enabled: true #API address of the configurator. #DO NOT CHANGE THIS IF SOMEONE TOLD YOU TO. - #Api is a powerful tool. It can destroy all configuration if in wrong hands + #API is a powerful tool. It can destroy all configuration if in wrong hands api-address: https://informator.soukup.xyz/configurator/api/ \ No newline at end of file diff --git a/target/classes/modules/tab.yml b/target/classes/modules/tab.yml index df8e228..e1592af 100644 --- a/target/classes/modules/tab.yml +++ b/target/classes/modules/tab.yml @@ -24,11 +24,10 @@ tabs: - "Change this in modules/tab.yml" - "" world: - enabled: false - priority: 1 + enabled: true worlds: - exampleWorld: - enabled: true + world_nether: + priority: 6 header: - "World specified tab" - "%%animation:exampleTitle%%" @@ -61,7 +60,7 @@ tabs: - "Change this in modules/tab.yml" - "" player: - enabled: false + enabled: true players: Kuba1428: priority: 3 diff --git a/target/classes/xyz/soukup/informator/handlers/TabHandler.class b/target/classes/xyz/soukup/informator/handlers/TabHandler.class index 2d1a3b7bb9dd295441bdf53bbf764adad87c5d9a..633752c3605ab93914d942dd39a5b6f1f8b8f86f 100644 GIT binary patch delta 1951 zcmZ{kdr(wW9LGOrAKcyLVuCb+VKHW;AW*)h!66$nb>v}|qiIdeA{Sa+ca>cvG+R@# z>}7U)p*__k?O{SKtd!Er${uEAFSFFLm(4Uyf0eI(cNY-R=FXgZ&iOsR-{0?d{vNzF z$Fuw7_8q`T{@CW(@3_f>L6t_e&aLJN+|Cj+%Q+(}qBuY7tq2v=7z=8BHAZDYrBUUr z^@m;DX|8r&oU>e!7FVbX*7z$6;%lfNnFdyB+@*6jt0Wb(!<}Ic(gwTlo*Xg)m1RaKuFqNlup5a;ZP*T6h21R-t z#eBcF-l!=^{1P~x)7eCcqK^a|?+aO?a_>CD#q)}OJ&ih(v>4r@^8$5J&V-|B-U_Ss zFX_C@Rz+X&G$r8o1&nLs;X>vfZQ!Nb$kb?-L{8W3>Y(3m%ntj40gpI+Rp&LLW|*dtPD6z@q} z+ISzgm1p<)0|qdRe33cj&PkH2yX90Ue`Vd~wxYJhO+S>?5<@Z{$*Lz5_?S=RskHIdD+S+-FE&4k-2p4rM+adK7Kcv&)&WQj5?Sa1pFet;VaoCaieH{Ehh)%%Eh;CFyZcyxJ#HG6w|}zsPl3oe__)|(HIE-if6ag7DB&N%4V0Cb|HIt+8w1r zZQ9Z(rNyUNN?Ru6-Kgn z=}zuSx3_lBOhp#480-|7?pa5=>cr<@V2kVaU~ zDCv+Qr6^Xzxl)xdR@F03En|GVFS8RBx_Gckz?l@1$Cry5UVzEBz)nUgFglEWl&nM@fa%opU5kc?8-yOG7TI5-u@k&68| zZt3phWNS41BbF|H>jpC>4h1e~r(OpC?G~$xI(M6!d8dUTRthRkdmoEBVa6l$r_)Dn Kf0wh3qyGUN;QYn_ delta 1693 zcmZvcYiv_x7{`BayY-y5rz0zi%U~0nWZ62{AR>t_Tt(Q}C8C5y{bJ`1vobbZTXA@) zsCX9`N0cE7Dmn!f*|4mD3~#7-#Tye)@$$(S6Jw%L5PZ(*Hm?2fp67j^`~Uer-CFeL z7~lRAJNEz+`DL5$aE8xI38ujUnyk&4h5iUPYb-QqW|4I;vtG4Y<(?7h7Hf{@VimRe zv^;;DTQ!y#+(xyv%2O~ctI3Sbj6@eVhuiDIi%cI8mKxknw!(j7YfCH~X^B>w?K*cV zT+yhH$s`PBaJM4AxT>VaDsboKRrrZ>kHNj%CvH)*rLoqGM#D{}b-6r=&nU8E;fAs$t!>SX=`&hp^K8<1!Qe%@#I3chsk|Y+aA71?KEwG~A$`2(W%4vOTQ}$wrO-5^srqq!RqjivX1CY)p3#rJ8V3LN6pw(PNtejG*)Sb8_hNwuav>gbM>=Y zTVrOMjhNfZn}js>^sMmCau>*mQS`~|UF^kcw=i^n%lg9@KId)GmCKuwZ)Ru*YMW#H zj+`Fn(a*ag8)*aHW1rl-yzgkm*|mlY(W0uXxvef(u@ z42)EVtlfd0iQP2rV)C^+m@3+7!I^U8dE`h^nWrVWslMxEVb_V@?J_d3%eamUtnFE~ zi5V2DD+#Ge#yTY}z$e`4;{!fK;~Syxevx#JF`JJ>@~RA`@G+m@QvojJQ<3~E75mRb z@^C%B@;L`2OC5jn1z+N37AN^iv@Uctov$Sd64~CI%!vcZ4h|*jA4=9Qh@``PE8)_v z{o;1W>KztJ9L1#(&?ta^C9>CMfxs!?sr{1EE#Eo8mKwn;xHw78am zYH(cVDdy~mr^!ktD%3Qlsw$>C^ctNW42L;l z2UN59PKco})D*tw2N~occ{gzV$3BfBb&Pfy?a{%#5Zer~fmouK=Tf|+sFq3QD>`Wu z!C8{HU9}Y5z7DOlmo23NO!{Sc5*vbyfpHayc58|^T%2Q)d8SFPi>{NMr!csXgeFy7 zK|V7nLKaBYqn1h*Q%#hbq3zCRp3|#x`pU+A9ItTpIHNV<|A>Rmk3-E>IIY3RT|{J+ mclFpT8IU$~v%804y98yAVFXz=lmeAc=8+>e#ZPi~@$>)NMyfRc