amy/chomens-bot-java
1
0
Fork 0
forked from ChomeNS/chomens-bot-java
Code Pull requests Activity

new 3d stereo + complete rewrite (experimental whatever)

Browse source
This commit is contained in:
Chayapak 2023-10-15 10:16:21 +07:00
parent 8b82eab6b7
commit 37ccd0663f
1 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/MusicPlayerPlugin.java
View file

@ -14,6 +14,7 @@ import land.chipmunk.chayapak.chomens_bot.util.ColorUtilities;
import land.chipmunk.chayapak.chomens_bot.util.MathUtilities; import land.chipmunk.chayapak.chomens_bot.util.MathUtilities;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import org.cloudburstmc.math.vector.Vector3f;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
@ -385,7 +386,7 @@ public class MusicPlayerPlugin extends Bot.Listener {
float key = note.shiftedPitch; float key = note.shiftedPitch;
final float blockPosition = getBlockPosition(note); final Vector3f blockPosition = getBlockPosition(note);
final double notShiftedFloatingPitch = Math.pow(2.0, ((note.pitch + (pitch / 10)) - 12) / 12.0); final double notShiftedFloatingPitch = Math.pow(2.0, ((note.pitch + (pitch / 10)) - 12) / 12.0);
@ -404,7 +405,7 @@ public class MusicPlayerPlugin extends Bot.Listener {
CUSTOM_PITCH_SELECTOR + CUSTOM_PITCH_SELECTOR +
" at @s run playsound " + " at @s run playsound " +
(!instrument.equals("off") ? instrument : note.instrument.sound) + ".pitch." + notShiftedFloatingPitch + (!instrument.equals("off") ? instrument : note.instrument.sound) + ".pitch." + notShiftedFloatingPitch +
" record @s ^" + blockPosition + " ^1 ^ " + " record @s ^" + blockPosition.getX() + " ^" + blockPosition.getY() + " ^" + blockPosition.getZ() + " " +
note.volume + note.volume +
" " + " " +
0 0
@ -426,7 +427,7 @@ public class MusicPlayerPlugin extends Bot.Listener {
(shouldCustomPitch ? SELECTOR : BOTH_SELECTOR) + (shouldCustomPitch ? SELECTOR : BOTH_SELECTOR) +
" at @s run playsound " + " at @s run playsound " +
(!instrument.equals("off") ? instrument : note.shiftedInstrument.sound) + (!instrument.equals("off") ? instrument : note.shiftedInstrument.sound) +
" record @s ^" + blockPosition + " ^1 ^ " + " record @s ^" + blockPosition.getX() + " ^" + blockPosition.getY() + " ^" + blockPosition.getZ() + " " +
note.volume + note.volume +
" " + " " +
MathUtilities.clamp(floatingPitch, 0, 2) MathUtilities.clamp(floatingPitch, 0, 2)
@ -440,24 +441,35 @@ public class MusicPlayerPlugin extends Bot.Listener {
} }
} }
private float getBlockPosition (Note note) { private Vector3f getBlockPosition (Note note) {
float blockPosition; Vector3f blockPosition;
if (currentSong.nbs) { if (currentSong.nbs) {
// https://github.com/OpenNBS/OpenNoteBlockStudio/blob/45f35ea193268fb541c1297d0b656f4964339d97/scripts/dat_generate/dat_generate.gml#L22C18-L22C31 // https://github.com/OpenNBS/OpenNoteBlockStudio/blob/45f35ea193268fb541c1297d0b656f4964339d97/scripts/dat_generate/dat_generate.gml#L22C18-L22C31
final int average = (note.stereo + note.panning) / 2; final int average = (note.stereo + note.panning) / 2;
if (average > 100) blockPosition = (float) (average - 100) / -100; float pos;
else if (average == 100) blockPosition = 0;
else blockPosition = (float) ((average - 100) * -1) / 100; if (average > 100) pos = (float) (average - 100) / -100;
else if (average == 100) pos = 0;
else pos = (float) ((average - 100) * -1) / 100;
blockPosition = Vector3f.from(pos, 0, 0);
} else { } else {
// i wrote this part // i wrote this part
final int originalPitch = note.originalPitch; final int originalPitch = note.originalPitch;
if (originalPitch > 60) blockPosition = 0.10F; float xPos = (float) originalPitch / 768;
else if (originalPitch < 40) blockPosition = -0.10F; if (originalPitch < 75) xPos = -xPos;
else blockPosition = 0;
float yPos = (float) originalPitch / 35;
if (originalPitch < 75) yPos = -yPos;
float zPos = (float) originalPitch / 40;
if (originalPitch < 75) zPos = -zPos;
blockPosition = Vector3f.from(xPos, yPos, zPos);
} }
return blockPosition; return blockPosition;