diff --git a/osuMapCombiner/.classpath b/osuMapCombiner/.classpath index b42e556..6cf6a66 100644 --- a/osuMapCombiner/.classpath +++ b/osuMapCombiner/.classpath @@ -1,8 +1,12 @@ - + + + + + - - + + diff --git a/osuMapCombiner/data.txt b/osuMapCombiner/data.txt deleted file mode 100644 index 51e0ab7..0000000 Binary files a/osuMapCombiner/data.txt and /dev/null differ diff --git a/osuMapCombiner/filecombine.txt b/osuMapCombiner/filecombine.txt deleted file mode 100644 index 1b9b950..0000000 --- a/osuMapCombiner/filecombine.txt +++ /dev/null @@ -1,3 +0,0 @@ -file 'E:/〇su/Songs/33911 Yousei Teikoku - Hades_ The Rise (1)/02.mp3' -file 'E:/〇su/Songs/13223 Demetori - Emotional Skyscraper ~ World'\''s End (1)/Demetori - Nada Upasana Pundarika - 06 - .mp3' -file 'E:/〇su/Songs/713989 FELT - Time and again (1)/audio.mp3' \ No newline at end of file diff --git a/osuMapCombiner/hs_err_pid24308.log b/osuMapCombiner/hs_err_pid24308.log deleted file mode 100644 index c784407..0000000 --- a/osuMapCombiner/hs_err_pid24308.log +++ /dev/null @@ -1,164 +0,0 @@ -# -# There is insufficient memory for the Java Runtime Environment to continue. -# Native memory allocation (malloc) failed to allocate 1048576 bytes for AllocateHeap -# Possible reasons: -# The system is out of physical RAM or swap space -# The process is running with CompressedOops enabled, and the Java Heap may be blocking the growth of the native heap -# Possible solutions: -# Reduce memory load on the system -# Increase physical memory or swap space -# Check if swap backing store is full -# Decrease Java heap size (-Xmx/-Xms) -# Decrease number of Java threads -# Decrease Java thread stack sizes (-Xss) -# Set larger code cache with -XX:ReservedCodeCacheSize= -# JVM is running with Zero Based Compressed Oops mode in which the Java heap is -# placed in the first 32GB address space. The Java Heap base address is the -# maximum limit for the native heap growth. Please use -XX:HeapBaseMinAddress -# to set the Java Heap base and to place the Java Heap above 32GB virtual address. -# This output file may be truncated or incomplete. -# -# Out of Memory Error (memory/allocation.inline.hpp:61), pid=24308, tid=0x00000000000021e0 -# -# JRE version: (8.0_221-b11) (build ) -# Java VM: Java HotSpot(TM) 64-Bit Server VM (25.221-b11 mixed mode windows-amd64 compressed oops) -# Failed to write core dump. Minidumps are not enabled by default on client versions of Windows -# - ---------------- T H R E A D --------------- - -Current thread (0x000000000316d800): JavaThread "Unknown thread" [_thread_in_vm, id=8672, stack(0x0000000002f10000,0x0000000003010000)] - -Stack: [0x0000000002f10000,0x0000000003010000] -[error occurred during error reporting (printing stack bounds), id 0xc0000005] - -Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) - - ---------------- P R O C E S S --------------- - -Java Threads: ( => current thread ) - -Other Threads: - -=>0x000000000316d800 (exited) JavaThread "Unknown thread" [_thread_in_vm, id=8672, stack(0x0000000002f10000,0x0000000003010000)] - -VM state:not at safepoint (normal execution) - -VM Mutex/Monitor currently owned by a thread: None - -heap address: 0x00000006c0a00000, size: 4086 MB, Compressed Oops mode: Zero based, Oop shift amount: 3 -Narrow klass base: 0x0000000000000000, Narrow klass shift: 3 -Compressed class space size: 1073741824 Address: 0x00000007c0000000 - -Heap: - PSYoungGen total 76288K, used 1310K [0x000000076ae00000, 0x0000000770300000, 0x00000007c0000000) - eden space 65536K, 2% used [0x000000076ae00000,0x000000076af47af0,0x000000076ee00000) - from space 10752K, 0% used [0x000000076f880000,0x000000076f880000,0x0000000770300000) - to space 10752K, 0% used [0x000000076ee00000,0x000000076ee00000,0x000000076f880000) - ParOldGen total 175104K, used 0K [0x00000006c0a00000, 0x00000006cb500000, 0x000000076ae00000) - object space 175104K, 0% used [0x00000006c0a00000,0x00000006c0a00000,0x00000006cb500000) - Metaspace used 776K, capacity 4480K, committed 4480K, reserved 1056768K - class space used 76K, capacity 384K, committed 384K, reserved 1048576K - -Card table byte_map: [0x0000000012530000,0x0000000012d30000] byte_map_base: 0x000000000ef2b000 - -Marking Bits: (ParMarkBitMap*) 0x000000005dbb5ce0 - Begin Bits: [0x0000000013a90000, 0x0000000017a68000) - End Bits: [0x0000000017a68000, 0x000000001ba40000) - -Polling page: 0x00000000011b0000 - -CodeCache: size=245760Kb used=328Kb max_used=328Kb free=245431Kb - bounds [0x0000000003170000, 0x00000000033e0000, 0x0000000012170000] - total_blobs=58 nmethods=0 adapters=38 - compilation: enabled - -Compilation events (0 events): -No events - -GC Heap History (0 events): -No events - -Deoptimization events (0 events): -No events - -Classes redefined (0 events): -No events - -Internal exceptions (0 events): -No events - -Events (10 events): -Event: 0.020 loading class java/lang/Short -Event: 0.020 loading class java/lang/Short done -Event: 0.020 loading class java/lang/Integer -Event: 0.020 loading class java/lang/Integer done -Event: 0.020 loading class java/lang/Long -Event: 0.020 loading class java/lang/Long done -Event: 0.021 loading class java/lang/NullPointerException -Event: 0.021 loading class java/lang/NullPointerException done -Event: 0.021 loading class java/lang/ArithmeticException -Event: 0.021 loading class java/lang/ArithmeticException done - - -Dynamic libraries: -0x00007ff7eda60000 - 0x00007ff7eda97000 C:\Program Files\Java\jdk1.8.0_221\jre\bin\javaw.exe -0x00007fff50f60000 - 0x00007fff51150000 C:\Windows\SYSTEM32\ntdll.dll -0x00007fff50160000 - 0x00007fff50212000 C:\Windows\System32\KERNEL32.DLL -0x00007fff4e240000 - 0x00007fff4e4e3000 C:\Windows\System32\KERNELBASE.dll -0x00007fff4fab0000 - 0x00007fff4fb53000 C:\Windows\System32\ADVAPI32.dll -0x00007fff4f940000 - 0x00007fff4f9de000 C:\Windows\System32\msvcrt.dll -0x00007fff506b0000 - 0x00007fff50747000 C:\Windows\System32\sechost.dll -0x00007fff50040000 - 0x00007fff50160000 C:\Windows\System32\RPCRT4.dll -0x00007fff504d0000 - 0x00007fff50664000 C:\Windows\System32\USER32.dll -0x00007fff4ee30000 - 0x00007fff4ee51000 C:\Windows\System32\win32u.dll -0x00007fff50670000 - 0x00007fff50696000 C:\Windows\System32\GDI32.dll -0x00007fff4e4f0000 - 0x00007fff4e684000 C:\Windows\System32\gdi32full.dll -0x00007fff4dfc0000 - 0x00007fff4e05e000 C:\Windows\System32\msvcp_win.dll -0x00007fff4ef10000 - 0x00007fff4f00a000 C:\Windows\System32\ucrtbase.dll -0x00007fff45d70000 - 0x00007fff45ff5000 C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.18362.476_none_e6c4b11b130f2595\COMCTL32.dll -0x00007fff4fc30000 - 0x00007fff4ff66000 C:\Windows\System32\combase.dll -0x00007fff4def0000 - 0x00007fff4df70000 C:\Windows\System32\bcryptPrimitives.dll -0x00007fff504a0000 - 0x00007fff504ce000 C:\Windows\System32\IMM32.DLL -0x000000005e7b0000 - 0x000000005e882000 C:\Program Files\Java\jdk1.8.0_221\jre\bin\msvcr100.dll -0x000000005d390000 - 0x000000005dc35000 C:\Program Files\Java\jdk1.8.0_221\jre\bin\server\jvm.dll -0x00007fff506a0000 - 0x00007fff506a8000 C:\Windows\System32\PSAPI.DLL -0x00007fff41b60000 - 0x00007fff41b69000 C:\Windows\SYSTEM32\WSOCK32.dll -0x00007fff41b90000 - 0x00007fff41bb4000 C:\Windows\SYSTEM32\WINMM.dll -0x00007fff49250000 - 0x00007fff4925a000 C:\Windows\SYSTEM32\VERSION.dll -0x00007fff503a0000 - 0x00007fff5040f000 C:\Windows\System32\WS2_32.dll -0x00007fff405e0000 - 0x00007fff4060d000 C:\Windows\SYSTEM32\WINMMBASE.dll -0x00007fff4df70000 - 0x00007fff4dfba000 C:\Windows\System32\cfgmgr32.dll -0x00007fff400a0000 - 0x00007fff400af000 C:\Program Files\Java\jdk1.8.0_221\jre\bin\verify.dll -0x00007fff26db0000 - 0x00007fff26dd9000 C:\Program Files\Java\jdk1.8.0_221\jre\bin\java.dll -0x00007fff38cd0000 - 0x00007fff38ce6000 C:\Program Files\Java\jdk1.8.0_221\jre\bin\zip.dll - -VM Arguments: -jvm_args: -Dfile.encoding=Cp1252 -java_command: osuMapCombiner.osuMapCombiner -java_class_path (initial): C:\Users\sigon\eclipse-workspace\osuMapCombiner\bin;C:\Users\sigon\git\repository\Tagger\lib\commons-exec-1.3.jar -Launcher Type: SUN_STANDARD - -Environment Variables: -PATH=C:/Program Files/Java/jdk-12.0.2/bin/server;C:/Program Files/Java/jdk-12.0.2/bin;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Program Files (x86)\Razer Chroma SDK\bin;C:\Program Files\Razer Chroma SDK\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Users\sigon\AppData\Local\Microsoft\WindowsApps;C:\Program Files\PuTTY\;C:\Users\sigon\AppData\Local\Microsoft\WindowsApps;;C:\Windows\system32; -USERNAME=sigon -OS=Windows_NT -PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 158 Stepping 9, GenuineIntel - - - ---------------- S Y S T E M --------------- - -OS: Windows 10.0 , 64 bit Build 18362 (10.0.18362.329) - -CPU:total 8 (initial active 8) (4 cores per cpu, 2 threads per core) family 6 model 158 stepping 9, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, avx2, aes, clmul, erms, rtm, 3dnowpref, lzcnt, ht, tsc, tscinvbit, bmi1, bmi2, adx - -Memory: 4k page, physical 16729332k(3845212k free), swap 23440508k(5132k free) - -vm_info: Java HotSpot(TM) 64-Bit Server VM (25.221-b11) for windows-amd64 JRE (1.8.0_221-b11), built on Jul 4 2019 04:39:29 by "java_re" with MS VC++ 10.0 (VS2010) - -time: Sat Dec 14 15:44:18 2019 -timezone: Korea Standard Time -elapsed time: 0 seconds (0d 0h 0m 0s) - diff --git a/osuMapCombiner/osuMapCombiner.jar b/osuMapCombiner/osuMapCombiner.jar index a8d8d44..5a31b89 100644 Binary files a/osuMapCombiner/osuMapCombiner.jar and b/osuMapCombiner/osuMapCombiner.jar differ diff --git a/osuMapCombiner/osuMapCombiner.zip b/osuMapCombiner/osuMapCombiner.zip index 4416e49..2a9f0ce 100644 Binary files a/osuMapCombiner/osuMapCombiner.zip and b/osuMapCombiner/osuMapCombiner.zip differ diff --git a/osuMapCombiner/src/osuMapCombiner/Convert.java b/osuMapCombiner/src/osuMapCombiner/Convert.java index 0b07bd3..fdb9d4b 100644 --- a/osuMapCombiner/src/osuMapCombiner/Convert.java +++ b/osuMapCombiner/src/osuMapCombiner/Convert.java @@ -223,7 +223,7 @@ BeatmapSetID:-1 //marathonMap.add(timingDatabase.get(i)); if (Double.parseDouble(timingPoint[1])>=0) { marathonMap.add(timingDatabase.get(i).timingPointData); - marathonMap.add(timingPoint[0]+","+((-((maxSliderMultiplier/timingDatabase.get(i).initialSliderVelocity)*100)))+","+timingPoint[2]+","+timingPoint[3]+","+timingPoint[4]+","+timingPoint[5]+","+timingPoint[6]+","+timingPoint[7]); + marathonMap.add(timingPoint[0]+","+((-((maxSliderMultiplier/timingDatabase.get(i).initialSliderVelocity)*100)))+","+timingPoint[2]+","+timingPoint[3]+","+timingPoint[4]+","+timingPoint[5]+",0,"+timingPoint[7]); } else { marathonMap.add(timingPoint[0]+","+((-(1d/(100/(-Double.parseDouble(timingPoint[1])))*(maxSliderMultiplier/timingDatabase.get(i).initialSliderVelocity)))*100)+","+timingPoint[2]+","+timingPoint[3]+","+timingPoint[4]+","+timingPoint[5]+","+timingPoint[6]+","+timingPoint[7]); }