fix 1ms fail copy

Author: dudehacker

build.gradle

@@ -8,7 +8,13 @@ repositories {
     mavenCentral()
 }
 
+apply plugin: 'idea'
+apply plugin: 'java'
+
 dependencies {
+    implementation 'ch.qos.logback:logback-classic:1.2.3'
+    implementation 'ch.qos.logback:logback-core:1.2.3'
+    implementation 'org.slf4j:slf4j-api:1.7.25'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.9.3'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.13.0'
     implementation group: 'org.projectlombok', name: 'lombok', version: '1.18.30'

src/main/MagicCopyMania.java

@@ -1,5 +1,6 @@
 package main;
 
+import lombok.extern.slf4j.Slf4j;
 import osu.HitObject;
 import osu.Sample;
 import osu.Timing;
@@ -8,9 +9,10 @@
 import javax.swing.*;
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
+@Slf4j
 public class MagicCopyMania implements Runnable {
 
     // Variables
@@ -85,14 +87,17 @@ public void run() {
     }
 
     private String copyHS() {
-        Collections.sort(List_Samples, Sample.StartTimeComparator);
+        List_Samples.sort(Sample.StartTimeComparator);
         StringBuilder output = new StringBuilder();
-        ArrayList<HitObject> outputHOs = new ArrayList<HitObject>();
-        ArrayList<Long> list_time = OsuUtils.getDistinctStartTime(List_SourceHS, List_TargetHS);
+        ArrayList<HitObject> outputHOs = new ArrayList<>();
+        Set<Long> list_time = OsuUtils.getDistinctStartTime(List_SourceHS, List_TargetHS);
+        log.debug("full target HitObjects {}", List_TargetHS);
         for (Long t : list_time) {
 
             ArrayList<HitObject> sourceChord = OsuUtils.getChordByTime(List_SourceHS, t);
+            log.debug("source chord: {}", sourceChord);
             ArrayList<HitObject> targetChord = OsuUtils.getChordByTime(List_TargetHS, t);
+            log.debug("target chord: {}", targetChord);
             int sourceSize = sourceChord.size();
             int targetSize = targetChord.size();
             if (sourceSize == targetSize) {
@@ -106,7 +111,7 @@ private String copyHS() {
                 }
             } else if (sourceSize > targetSize) {
                 // CASE 2
-                System.out.println("sourceSize> targetSize at " + t);
+                log.debug("sourceSize > targetSize at {}", t);
                 if (targetSize == 0) {
                     if (isKeysound) {
                         // keysound = true then copy to SB, else do nothing
@@ -119,10 +124,11 @@ private String copyHS() {
 
                 } else {
                     int defaultHitSoundSize = OsuUtils.getDefaultHSChordSizeForTime(sourceChord, t);
+                    log.debug("default HS size at {} is {}", t, defaultHitSoundSize);
                     switch (defaultHitSoundSize) {
                         case 0:
                         case 1:
-                            System.out.println("source WFC size 0|1 at " + t);
+                            log.debug("source WFC size 0|1 at {}", t);
                             for (int i = 0; i < targetSize; i++) {
                                 HitObject source_ho = sourceChord.get(i);
                                 HitObject target_ho = targetChord.get(i);
@@ -136,13 +142,12 @@ private String copyHS() {
                             break;
 
                         case 2: // Combine both default hitsounds into 1 HitObject
-                            System.out.println("source WFC size 2 at " + t);
+                            log.debug("source WFC size 2 at {}", t);
                             outputHOs.addAll(combineDefaultHS(sourceChord, targetChord, 2));
                             break;
 
                         case 3:
-                            System.out.println("source WFC size 3 at " + t);
-                            // System.out.println("target size " + targetSize);
+                            log.debug("source WFC size 3 at {}", t);
                             if (targetSize >= 2) {
                                 if (sourceSize > defaultHitSoundSize) {
                                     outputHOs.addAll(combineDefaultHS(sourceChord, targetChord, 3));

src/osu/HitObject.java

@@ -12,6 +12,8 @@ public class HitObject {
     public final static int HITFINISH = 4;
     public final static int HITCLAP = 8;
     public final static int AdditionDefault = 0;
+    public final static int TIMING_UNCERTAINTY_MS = 1;
+
     public static Comparator<HitObject> StartTimeComparator = (ho1, ho2) -> {
         long t1 = ho1.startTime;
         long t2 = ho2.startTime;
@@ -146,6 +148,10 @@ public void addWhistleFinishClap(int value1, int value2) {
         setWhislteFinishClap(whistle_finish_clap + value1 + value2);
     }
 
+    public boolean isStartTimeAboutEquals(long time) {
+        return startTime - TIMING_UNCERTAINTY_MS <= time && startTime + TIMING_UNCERTAINTY_MS >= time;
+    }
+
     public Sample toSample() {
         Sample s;
         String newHitsound = "";