From ae12b4f09fd3c3482581eec305204f2002342b1d Mon Sep 17 00:00:00 2001
From: ChomeNS <95471003+ChomeNS@users.noreply.github.com>
Date: Mon, 28 Aug 2023 21:00:46 +0700
Subject: [PATCH] midi and whoop

---
 .../chayapak/chomens_bot/plugins/AuthPlugin.java      |  2 +-
 .../chayapak/chomens_bot/song/MidiConverter.java      | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/AuthPlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/AuthPlugin.java
index 59d681e6..0cea15b7 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/AuthPlugin.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/AuthPlugin.java
@@ -43,7 +43,7 @@ public class AuthPlugin extends PlayersPlugin.Listener {
 
     @Override
     public void playerJoined(PlayerEntry target) {
-        if (!target.profile.getName().equals(bot.config.ownerName.replaceAll("§", "")) || !bot.options.useCore) return;
+        if (!target.profile.getName().equals(bot.config.ownerName.replaceAll("§[a-f0-9rlonmk]", "")) || !bot.options.useCore) return;
 
         bot.executor.schedule(() -> sendVerificationMessage(target, true), 2, TimeUnit.SECONDS);
     }
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/song/MidiConverter.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/song/MidiConverter.java
index 0316b8b9..744ee7fe 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/song/MidiConverter.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/song/MidiConverter.java
@@ -130,11 +130,18 @@ public class MidiConverter {
       return null;
     }
 
-    int pitch = midiPitch-instrument.offset;
+    int pitch = (midiPitch-instrument.offset) + /* lazy -> */ 33;
+
+    // these 2 lines are totallynotskidded from https://github.com/OpenNBS/OpenNoteBlockStudio/blob/master/scripts/selection_transpose/selection_transpose.gml
+    // so huge thanks to them uwu
+    // will this do anything if it's midi?
+    while (pitch < 33) pitch += 12;
+    while (pitch > 57) pitch -= 12;
+
     float volume = (float) velocity / 127.0f;
     long time = microTime / 1000L;
 
-    return new Note(instrument, pitch, volume, time, -1, 100);
+    return new Note(instrument, pitch - 33, volume, time, -1, 100);
   }
 
   private static Note getMidiPercussionNote (int midiPitch, int velocity, long microTime) {