From e2e0cc12a6411dda6b171f47cfdf200cb9429320 Mon Sep 17 00:00:00 2001 From: ayunami2000 Date: Thu, 21 Apr 2022 11:41:14 -0400 Subject: [PATCH] almost there... --- .../me/ayunami2000/ayunEagVidMap/Main.java | 37 ++++++++++++------ target/ayunEagVidMap-1.0-SNAPSHOT.jar | Bin 11164 -> 11468 bytes 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/src/main/java/me/ayunami2000/ayunEagVidMap/Main.java b/src/main/java/me/ayunami2000/ayunEagVidMap/Main.java index cfd80f9..559047c 100644 --- a/src/main/java/me/ayunami2000/ayunEagVidMap/Main.java +++ b/src/main/java/me/ayunami2000/ayunEagVidMap/Main.java @@ -16,6 +16,7 @@ public class Main extends JavaPlugin implements CommandExecutor, Listener { private VideoMapPacketCodecBukkit videoMapCodec = null; private Vector audioLoc = new Vector(0, 100, 0); private String url = ""; + private boolean urlChanged = true; @Override public void onEnable(){ @@ -31,23 +32,19 @@ public class Main extends JavaPlugin implements CommandExecutor, Listener { @Override public void onDisable(){ - videoMapCodec.disableVideoBukkit(); + sendToAllPlayers(videoMapCodec.disableVideoBukkit()); } private void syncToPlayer(Player player) { - VideoMapPacketCodecBukkit.nativeSendPacketToPlayer(player, videoMapCodec.syncPlaybackWithPlayersBukkit()); + videoMapCodec.syncPlaybackWithPlayersBukkit().send(player); } private void syncToAllPlayers() { - for (Player player : this.getServer().getOnlinePlayers()) { - syncToPlayer(player); - } + videoMapCodec.syncPlaybackWithPlayersBukkit().send(this.getServer().getOnlinePlayers()); } private void sendToAllPlayers(VideoMapPacketCodecBukkit.VideoMapPacket p) { - for (Player player : this.getServer().getOnlinePlayers()) { - VideoMapPacketCodecBukkit.nativeSendPacketToPlayer(player, p); - } + p.send(this.getServer().getOnlinePlayers()); } private void setSize(int width, int height) { @@ -82,9 +79,15 @@ public class Main extends JavaPlugin implements CommandExecutor, Listener { this.getConfig().set("url", args[1]); this.saveConfig(); url = args[1]; - sendToAllPlayers(videoMapCodec.beginPlaybackBukkit(url, true, Integer.MAX_VALUE / 1000.0f)); + urlChanged = true; sender.sendMessage("seturl"); break; + case "a": + case "aud": + case "audio": + case "audloc": + case "audioloc": + case "audiolocation": case "l": case "loc": case "location": @@ -109,15 +112,25 @@ public class Main extends JavaPlugin implements CommandExecutor, Listener { audioLoc.setY(y); audioLoc.setZ(z); } - syncToAllPlayers(); + this.getConfig().set("audio.x", audioLoc.getX()); + this.getConfig().set("audio.y", audioLoc.getY()); + this.getConfig().set("audio.z", audioLoc.getZ()); + this.saveConfig(); + float ct = videoMapCodec.getPlaybackTime(); + sendToAllPlayers(videoMapCodec.moveAudioSourceBukkit(audioLoc.getX(), audioLoc.getY(), audioLoc.getZ(), 0.5f)); + sendToAllPlayers(videoMapCodec.setPlaybackTimeBukkit(ct)); sender.sendMessage("set location of audio"); break; case "p": case "play": case "pause": sender.sendMessage("resuming & loading if needed, or pausing"); - if (videoMapCodec.isPaused()) { - sendToAllPlayers(videoMapCodec.beginPlaybackBukkit(url, true, Integer.MAX_VALUE / 1000.0f)); + if (urlChanged || videoMapCodec.isPaused()) { + if (urlChanged) { + urlChanged = false; + sendToAllPlayers(videoMapCodec.beginPlaybackBukkit(url, true, Integer.MAX_VALUE / 1000.0f)); + } + sendToAllPlayers(videoMapCodec.setPausedBukkit(false)); } else { sendToAllPlayers(videoMapCodec.setPausedBukkit(true)); } diff --git a/target/ayunEagVidMap-1.0-SNAPSHOT.jar b/target/ayunEagVidMap-1.0-SNAPSHOT.jar index 4478530fb0da906e87681d4d23573498af6f0c2b..b187d2a9288984e99a30261bb5056174ef1ef3ba 100644 GIT binary patch delta 4256 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

c8M)>_uRJNyZLzO_MA>5R! zCw2ylC_C1S^&5`Oo(KiXC(scvh;`6>Ocl(-zTy*wD9G57om!Vaj3s@8JNZUZ%`^7T ztrpM+(eopwoK^Ir=aQqE2PNnaVEcy>97B5c_qpu#Ni@oUs%(p41>mM*p?5?4a(*n? z+{i~M4EMQ8tiyipm&Sg#030@t!LvVRxBuh-0{W%(4Xbx*GlIpL-n%j>>aI?!?YIy@ zyhx9tm_;lv{m8)VgD;y7eL=Iku-U09s<29(GShbGG!s4W&ccNZ$JDsPv*CSfXOzYx zJxfPj%&$k~Rauq3)*91dy43Rb6q6E25?3KwsJKS8aI0{&aKMf8WF56JxL%1iMPrtk zHtpxj09_J!h+{Kkjqp}~@V+Zh4sztvl+o|z3Q@>J&6d>m+m%zaiQe$Zd&gGsj;dh9 zOB>1?idt}lo;skPUuW2xtyGFie$H*V0cam_pQsPx{Ee#bH|vS+K6JjGX}|jN5X?|* zBll^J!?+&f7{Iw$|8}qd?g>*V@*c9?^8QknODx)2;XU^LQo}nGzBLeR98Smh#%QJL zA6Z@#^Z<66eV@bn)c1Is81oMe?}OeH=dGGxn+r&4jVf07ll=Z0lKp%9FNMh{3u&g8 z?>Vrjh)+pi1-E(E68A-9Tl<#(7STBdwpY^E-SqlzQ>HSsx`w91jqa+TUxN6o-{rHe z3KusTGFxi+&*-CWm1P7RmB&2l`ZQ#DZP+p$qnCg#Hd+Cgz&S!$j1u1UP3-wZSqS-) z8nJI1(Yk3xq^xnN7~DFPH2tS0lr|3|v`SFsia6!rs2)+tIRWn07FgISd$$>p6K;5f zB5U#zmyoVMKyBKPWv8hg2*ul$JM6q5N=fu5DAHarn#E9j^TYtFULSvZ%Jdl zYoyo7{{2^gGXJk-B)tC-OeBB)pg_n-!JBmd9Y^|#a+4CSe12rT=xx#)LjTt?AlaeP Sr03xO$Y3ZhB~JKi-@gE;pZ@g# delta 3958 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 eq}crD%81qxm7*9C`2Ptbx>6KGU3l+u-~Rw!