Compare commits

..

164 Commits

Author SHA1 Message Date
minjaesong
9df7f28301 ambient mixer 2024-01-25 03:04:34 +09:00
minjaesong
cdae0cfb24 copyright update 2024-01-24 19:43:17 +09:00
minjaesong
b67c0837d8 fix: track fader was applied at PRE instead of POST 2024-01-24 19:10:04 +09:00
minjaesong
2016be562b static effect looops 2024-01-24 17:51:00 +09:00
minjaesong
89b372e4d8 convolutions and some audio samples are on CommonResourcePool now 2024-01-24 15:34:52 +09:00
minjaesong
76f7b2a145 more special purpose filters (audio samples will be added later) 2024-01-24 15:05:19 +09:00
minjaesong
e5b1eeb9d2 huge load of ambient sounds 2024-01-23 23:20:25 +09:00
minjaesong
d78f886c74 noticelet to show items just picked up 2024-01-22 21:26:54 +09:00
minjaesong
f5715c69ee musicplayer: actively disables playback if jukebox is on 2024-01-22 03:57:25 +09:00
minjaesong
49ff7e8cf0 minor locale string fixes 2024-01-21 21:51:15 +09:00
minjaesong
eebfa5c9de audio routing optimisations 2024-01-21 20:48:32 +09:00
minjaesong
612f4b830f track stop condition via muting 2024-01-21 19:40:11 +09:00
minjaesong
6334cac3ba multiple amb tracks 2024-01-21 17:01:45 +09:00
minjaesong
c00dd4e0bf date marks for DSPs 2024-01-21 15:14:17 +09:00
minjaesong
d927d1d240 fix: door spawn required wall be exist on the cells that don't matter 2024-01-21 03:51:08 +09:00
minjaesong
3da37408a2 doppler effect 2024-01-21 03:25:03 +09:00
minjaesong
f34a6b7c9f a comment to save future futile attemps 2024-01-21 00:49:03 +09:00
minjaesong
ff3f8fe7e3 fix: biomegen may fail due to uninitialised whatever 2024-01-21 00:32:48 +09:00
minjaesong
aada6e891c reviving 'tiny' size for initial worldgen 2024-01-20 21:58:48 +09:00
minjaesong
6b33850a8b foley for wooden doors 2024-01-20 21:05:46 +09:00
minjaesong
c66e4077bf better foley addressing 2024-01-20 20:55:52 +09:00
minjaesong
949ff841de ambient audio stuffs 2024-01-20 19:18:53 +09:00
minjaesong
3f8e2c37ef binopan speaker vol compensation; dynamic source lamp fix 2024-01-20 03:05:32 +09:00
minjaesong
d821516144 adding newly generated chunks to modified chunks list 2024-01-19 17:22:40 +09:00
minjaesong
db383b25c6 font update 2024-01-19 16:04:00 +09:00
minjaesong
965c58d2d4 fix: new softclip was not clamping the input 2024-01-19 03:51:27 +09:00
minjaesong
9f46fade1d deterministically random treegen 2024-01-19 03:14:32 +09:00
minjaesong
79bf88f0e8 world generator progress graphics fix 2024-01-19 00:33:10 +09:00
minjaesong
5dae539402 better worldgen time estimation 2024-01-18 23:53:48 +09:00
minjaesong
dce4b4b7ee terragen dither is still disabled (not working) 2024-01-18 23:06:03 +09:00
minjaesong
c8329b36c5 dynamic chunk generation 2024-01-18 22:41:30 +09:00
minjaesong
b2ea61aa4d param adjustment 2024-01-18 18:43:31 +09:00
minjaesong
a9da9a02cb partial chunk generation 2024-01-18 18:32:32 +09:00
minjaesong
2dbf7215a9 spawn points are auto selected to be good starting point 2024-01-18 16:11:38 +09:00
minjaesong
51287173ea F3: chunk flag view 2024-01-18 01:35:36 +09:00
minjaesong
c270b6e7dd catbar: enlarged button hitbox 2024-01-18 00:05:05 +09:00
minjaesong
07c70a42f3 reloading the engine will copy track states from the old instance, obsoleting audioMixerRenewHooks 2024-01-16 14:00:58 +09:00
minjaesong
f05cfe3cbb jukebox ui: names over the inventory slots 2024-01-16 03:54:37 +09:00
minjaesong
2bd1b61a35 audio engine: resize buffer without restarting the game 2024-01-16 03:31:22 +09:00
minjaesong
755ced9ea4 sound engine is no longer a singleton 2024-01-16 03:00:30 +09:00
minjaesong
350e205028 same for the tooltip 2024-01-15 21:01:00 +09:00
minjaesong
cb56f8f379 better item names for discs 2024-01-15 20:28:34 +09:00
minjaesong
ce39b6c27b catbar: larger hitbox 2024-01-15 05:42:49 +09:00
minjaesong
f1554c836c jukebox ui wont pause the game AND not allow inventory to open 2024-01-15 04:57:24 +09:00
minjaesong
02a6468980 disc sprite update 2024-01-15 00:15:53 +09:00
minjaesong
dae934e295 better disc colouring 2024-01-14 22:43:15 +09:00
minjaesong
a973d33e02 randomised music disc sprite 2024-01-14 22:16:19 +09:00
minjaesong
7aa376dc69 fix: condition for do resampling 2024-01-14 19:45:25 +09:00
minjaesong
e89e32eeea option for speaker/headphone selection for appropriate panning 2024-01-14 19:37:41 +09:00
minjaesong
871396cd92 jukebox: ui item number fix, not accepting disc already there 2024-01-14 11:33:56 +09:00
minjaesong
5d03575ea1 copyright update 2024-01-14 01:12:18 +09:00
minjaesong
1261b6d68d the key to making 'q' to work was just pausing the game?!?!?! 2024-01-13 23:29:36 +09:00
minjaesong
5a7b345e7f almost working jukebox ui except for the 'q' key 2024-01-13 23:08:10 +09:00
minjaesong
3c3e650a97 mostly working jukebox ui 2024-01-13 22:03:35 +09:00
minjaesong
ab171fe9b3 inventory cell only call touchDown when mouse is up 2024-01-13 20:09:46 +09:00
minjaesong
1b74ee8efc jukebox ui wip 2024-01-13 17:20:10 +09:00
minjaesong
fb9640e615 jukebox ui wip 2024-01-13 05:08:40 +09:00
minjaesong
5c6cc36437 jukebox: lamp for play mech chamber 2024-01-12 23:03:29 +09:00
minjaesong
aff3b3655b better softclp 2024-01-12 21:36:12 +09:00
minjaesong
988c9dbff7 jukebox: speaker sim using convolver 2024-01-12 19:55:36 +09:00
minjaesong
40365fd828 even more panning 2024-01-12 17:28:03 +09:00
minjaesong
236d4e4e53 more binopanning 2024-01-12 16:58:48 +09:00
minjaesong
3d71b5c619 binopan adjustments, get actor head size from the sprite 2024-01-12 16:32:03 +09:00
minjaesong
a2f61a2be7 audio mixer reset() with audio artefact masking 2024-01-12 01:05:52 +09:00
minjaesong
b415f30ae5 dynamic source tracking vol and lowpass and shits 2024-01-11 20:09:36 +09:00
minjaesong
28edba9bb3 hopefully 'correct' binopan 2024-01-11 17:46:30 +09:00
minjaesong
5973327ed6 optimising dynamic source processing by NOT multithreading it 2024-01-11 15:19:14 +09:00
minjaesong
62e45d3281 improved audio source threading 2024-01-11 15:07:23 +09:00
minjaesong
122d4bcf27 control panel cleanup 2024-01-11 14:55:17 +09:00
minjaesong
df813712ff fix: panning dynamic source sending nan values 2024-01-11 14:42:16 +09:00
minjaesong
ecd8f08419 wtf is going on 2024-01-11 13:31:17 +09:00
minjaesong
d92fae4bb1 sprite updates 2024-01-11 03:12:21 +09:00
minjaesong
fd30223df8 jukebox wip 2024-01-11 02:23:20 +09:00
minjaesong
52ae1768cb fix: setHitboxDimension had no instruction whatsoever for the fixtures 2024-01-11 01:51:06 +09:00
minjaesong
6e32647e6d binopan: stereo src 2024-01-10 23:22:05 +09:00
minjaesong
0881d1dca3 catbar: better parameter comments 2024-01-10 17:03:34 +09:00
minjaesong
783c5c4fd0 GameBlockLoader registering TileItem and Tile-to-Wall recipe by itself 2024-01-10 16:52:29 +09:00
minjaesong
ed70b16384 generalised catbar 2024-01-10 16:38:51 +09:00
minjaesong
724a92bc18 removing unused libs 2024-01-10 03:59:10 +09:00
minjaesong
537968bb80 lib: kotlin removed from the repo 2024-01-10 03:13:08 +09:00
minjaesong
1b9060e358 updating musicplayer meta 2024-01-10 02:29:36 +09:00
minjaesong
bf1933fcb7 updating musicplayer meta 2024-01-10 02:00:51 +09:00
minjaesong
acaedc4d80 utilising new mouselatch 2024-01-10 01:46:39 +09:00
minjaesong
a149107b48 mouse latch class 2024-01-10 00:54:38 +09:00
minjaesong
9c3aeab74f musicplayer: click on the music title to close the list 2024-01-10 00:17:59 +09:00
minjaesong
c4c76a41fb adding kotlin-test to dependencies 2024-01-09 22:28:49 +09:00
minjaesong
0104d80152 debug print colour code by the object name 2024-01-08 03:19:00 +09:00
minjaesong
fb07713fa4 musicplayer: playlist autoscroll when the album has changed 2024-01-08 02:22:33 +09:00
minjaesong
a94a4f9824 musicplayer: album list scroll 2024-01-08 01:42:13 +09:00
minjaesong
fe598c4e4d musicplayer: album change 2024-01-07 17:56:42 +09:00
minjaesong
0d74fefa3d controlpanel: disregarding NPE 2024-01-07 17:56:32 +09:00
minjaesong
9462d1e041 musicplayer: icon change; drawFreqMeter change 2024-01-06 03:57:57 +09:00
minjaesong
96776ef1bb musicplayer: albumlist wip 2024-01-06 03:13:59 +09:00
minjaesong
23df3ac02b musicplayer: album-playlist transition 2024-01-05 13:58:13 +09:00
minjaesong
1e135e43f9 album list wip 2024-01-05 04:02:32 +09:00
minjaesong
644691efc2 icon for the musicplayer 2024-01-05 03:20:02 +09:00
minjaesong
2be6cb8b4a fix: music stopped on intermittent mode makes graphic artefacts 2024-01-04 20:00:47 +09:00
minjaesong
52aec0fd93 queueing prev/specific song will keep the internal playlist shuffled 2024-01-04 19:21:04 +09:00
minjaesong
d2be8d1e5e musicplayer: anim changes 2024-01-04 18:01:43 +09:00
minjaesong
244d935367 musicplayer: click on the song title to change the music 2024-01-04 17:28:30 +09:00
minjaesong
73e383a678 musicplayer: playlist scrolling and mouseup anims 2024-01-04 16:57:53 +09:00
minjaesong
f54a2133f9 new param 'frameDelta' on every render() function 2024-01-04 16:38:58 +09:00
minjaesong
f2ecb109e6 musicplayer: adjusting positions for even gaps 2024-01-04 01:22:45 +09:00
minjaesong
ccd36ffdbd fix: non-pausing UIs AND the ingame control are both getting input processed 2024-01-03 15:46:52 +09:00
minjaesong
38ecf8d19c musicplayer: load from dir 2024-01-03 15:01:11 +09:00
minjaesong
5790c6ea1f copyright update 2024-01-03 15:00:43 +09:00
minjaesong
2c0ce029a8 musicplayer: playlist printing 2024-01-03 00:11:58 +09:00
minjaesong
6c6e7de060 musicplayer: playlist printing 2024-01-02 14:02:13 +09:00
minjaesong
0395b30f44 musicplayer: playlist view wip 2024-01-02 05:11:27 +09:00
minjaesong
7a487dc158 musicplayer: playlist view wip 2024-01-02 01:29:54 +09:00
minjaesong
ea2cb1e68c musicplayer: list view transition 2024-01-01 04:31:14 +09:00
minjaesong
ce8158c0a8 fix: snapshot single-digit week is not shown with 0 padded 2024-01-01 00:17:36 +09:00
minjaesong
c3ee3d4aba more points for the curve 2023-12-31 03:11:26 +09:00
minjaesong
824cb6097d musicplayer: working prev and stop button 2023-12-29 23:49:11 +09:00
minjaesong
feba499043 fix: closing the game when no module is loaded would try to dispose uninitialised class 2023-12-29 15:30:03 +09:00
minjaesong
f2e30d544f fix: indexoutofboundsexception when there are files but no valid music files 2023-12-29 15:20:51 +09:00
minjaesong
4f87b8bf9d musicplayer: working stop and next button, button pos on transition 2023-12-29 04:47:32 +09:00
minjaesong
fe762e9396 transition anim for gapless play 2023-12-28 21:37:17 +09:00
minjaesong
a4cb3f4d29 working gapless playback but musicplayer anim is not 2023-12-28 19:06:29 +09:00
minjaesong
3e7434a9c6 more musicplayer things 2023-12-28 15:59:33 +09:00
minjaesong
fa915d63d2 ctrl btn for musicplayer 2023-12-27 23:48:56 +09:00
minjaesong
44ff8efd63 hann window for spectroscope 2023-12-27 02:57:56 +09:00
minjaesong
9d2d6a9bb3 musicplayer: song name and freq meter stay in place when hovered 2023-12-26 02:56:52 +09:00
minjaesong
405eafe65a musicplayer: mouseup wip 2023-12-26 01:20:17 +09:00
minjaesong
8cbd9dbfff musicplayer: actually repositioning the ui 2023-12-25 22:52:49 +09:00
minjaesong
60bc9d54fd musicplayer: organic overshoot transition anim 2023-12-25 13:53:39 +09:00
minjaesong
1addc46f18 musicplayer: reading playlist.json 2023-12-25 01:46:56 +09:00
minjaesong
e05d00fe4c musicplayer: song name scroll 2023-12-25 00:44:55 +09:00
minjaesong
8d1d2a1e10 fix: ui width will not take the length truncation 2023-12-25 00:07:59 +09:00
minjaesong
74e7e980b7 musicplayer: march thru playlist/working track-to-track transition 2023-12-24 23:13:50 +09:00
minjaesong
a19c0608f1 removing constantly modified .jar from the repo 2023-12-24 14:37:49 +09:00
minjaesong
4bc74f2e85 musicplayer: simple transitional anims 2023-12-24 14:36:36 +09:00
minjaesong
7371253398 more musicplayer things 2023-12-24 03:54:48 +09:00
minjaesong
c4836a3fe2 music player widget as a separate module 2023-12-24 03:13:35 +09:00
minjaesong
b5312da2f0 flat-top fft window for spectrogram 2023-12-23 00:16:27 +09:00
minjaesong
397b4f7717 snapshot numbering now use ISO week-numbering year to remove possible conflicts 2023-12-22 02:03:46 +09:00
minjaesong
3a814955d0 spectrogram on the scope 2023-12-21 20:51:00 +09:00
minjaesong
fefdf44e3e convolver crossfeed; filter debug code moved to the classes 2023-12-21 17:00:23 +09:00
minjaesong
64ef0343b9 changing savegame comp on game options 2023-12-21 13:52:42 +09:00
minjaesong
b496e3de3a writing correct comp id for chosen compressor 2023-12-21 03:53:56 +09:00
minjaesong
6f4e60284b user-selectable compression methods: zstd and snappy 2023-12-21 03:48:18 +09:00
minjaesong
44ff974b86 MUCH faster bytearray64 dump to physical drive 2023-12-21 03:46:29 +09:00
minjaesong
b0ae92c64b optimised convolve op 2023-12-20 23:07:52 +09:00
minjaesong
2cab9723c9 the correct way to convolve a stereo audio 2023-12-20 20:51:32 +09:00
minjaesong
c0c41adcee testing google snappy 2023-12-20 16:11:56 +09:00
minjaesong
d6e024974b seamless zstd integration 2023-12-20 14:45:11 +09:00
minjaesong
d4fe903273 zstd test 2023-12-20 02:12:03 +09:00
minjaesong
f467e6b6b1 smelter sprite update 2023-12-17 21:15:52 +09:00
minjaesong
6025d8b13c fix: autosave is not loading 2023-12-14 14:54:32 +09:00
minjaesong
d0eb5428e8 turns out it still clicks but at least it's quieter now 2023-12-14 12:06:14 +09:00
minjaesong
3233e57680 lanczos lut 2023-12-14 02:43:29 +09:00
minjaesong
be35d1b4e0 fix: periodic ticking on the resampler 2023-12-14 01:10:27 +09:00
minjaesong
b79232cd9b resampler periodic clicking is now quieter at least :/ 2023-12-12 22:51:37 +09:00
minjaesong
95225b56b4 using fractions for numerical precision 2023-12-12 15:21:47 +09:00
minjaesong
4be7e728c9 geode wip 2023-12-12 03:49:29 +09:00
minjaesong
ceb2b0693b hopefully more optimised resampling 2023-12-12 03:49:04 +09:00
minjaesong
f15ad227b1 mixer view colour changes 2023-12-11 23:37:23 +09:00
minjaesong
39737616e8 using lut for resample buffer size 2023-12-11 18:13:35 +09:00
minjaesong
b0149bcba3 get length of mp3 files 2023-12-11 17:08:02 +09:00
minjaesong
82e89452d6 fix: MP3 would not play if buffer size < 1152 2023-12-11 16:50:58 +09:00
minjaesong
96c9aed25a BUFFER_SIZE is now strictly samples count 2023-12-11 14:03:34 +09:00
minjaesong
949376b26a music track resampling 2023-12-11 03:35:03 +09:00
minjaesong
cc7f7b11d8 minor fix 2023-12-10 22:57:11 +09:00
minjaesong
55789a3671 input audio resampling 2023-12-10 22:12:42 +09:00
407 changed files with 7320 additions and 2767 deletions

9
.gitignore vendored
View File

@@ -1,5 +1,8 @@
# Build-related
out/*
### IntelliJ IDEA ###
out/
!**/src/main/**/out/
!**/src/test/**/out/
bin/*
build/*
assets_release/*
@@ -9,7 +12,7 @@ buildapp/out/Terrarum*
buildapp/TerrarumLinux.*
buildapp/TerrarumMac.*
buildapp/TerrarumWindows.*
assets/mods/dwarventech/ModuleComputers.jar
assets/mods/*/*.jar
work_files/skylight/hosek_model_source/*.bin
# Java native errors

View File

@@ -5,13 +5,6 @@
<element id="module-output" name="ModuleComputers" />
<element id="extracted-dir" path="$PROJECT_DIR$/ModuleComputers/lib/TerrarumTSVM.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/ModuleComputers/lib/TerranVirtualDisk.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.21/kotlin-stdlib-jdk8-1.8.21.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.21/kotlin-stdlib-1.8.21.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.21/kotlin-stdlib-common-1.8.21.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.21/kotlin-stdlib-jdk7-1.8.21.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.8.21/kotlin-reflect-1.8.21.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-test/1.8.21/kotlin-test-1.8.21.jar" path-in-jar="/" />
</root>
</artifact>
</component>

8
.idea/artifacts/MusicPlayer.xml generated Normal file
View File

@@ -0,0 +1,8 @@
<component name="ArtifactManager">
<artifact type="jar" name="MusicPlayer">
<output-path>$PROJECT_DIR$/assets/mods/musicplayer</output-path>
<root id="archive" name="MusicPlayer.jar">
<element id="module-output" name="MusicPlayer" />
</root>
</artifact>
</component>

View File

@@ -15,17 +15,11 @@
<element id="extracted-dir" path="$PROJECT_DIR$/lib/jxinput-1.0.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-stdlib.jar" path-in-jar="/" />
<element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar" path-in-jar="/" />
<element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk7.jar" path-in-jar="/" />
<element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk8.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-csv-1.8.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/prtree.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/Terrarum_Joise.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/TerrarumSansBitmap.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-jnigen-loader-2.3.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.8.21/kotlin-reflect-1.8.21.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.21/kotlin-stdlib-1.8.21.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.21/kotlin-stdlib-common-1.8.21.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-test/1.8.21/kotlin-test-1.8.21.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/js-scriptengine-22.3.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/truffle-api-22.3.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/icu4j-71.1.jar" path-in-jar="/" />
@@ -86,39 +80,16 @@
<element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-platform-1.12.0-natives-arm64-v8a.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-platform-1.12.0-natives-desktop.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-platform-1.12.0-natives-x86_64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/kotlinx-coroutines-core-jvm-1.7.3.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.21/kotlin-stdlib-jdk8-1.8.21.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/annotations-23.0.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.21/kotlin-stdlib-jdk7-1.8.21.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/kotlinx-coroutines-core-1.7.3.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/jdsp-2.0.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/xchart-3.8.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/VectorGraphics2D-0.13.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/graphics2d-0.32.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/pdfbox-2.0.24.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/fontbox-2.0.24.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-logging-1.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/animated-gif-lib-1.4.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/ssj-3.3.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/jfreechart-1.0.12.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/jcommon-1.0.15.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/colt-1.2.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/concurrent-1.3.4.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/optimization-1.3.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/iirj-1.5.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/wavfile-0.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/junit-jupiter-engine-5.0.3.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/apiguardian-api-1.0.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/junit-platform-engine-1.0.3.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/junit-platform-commons-1.0.3.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/opentest4j-1.0.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/junit-jupiter-api-5.0.3.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/junit-platform-surefire-provider-1.0.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/junit-platform-launcher-1.0.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/surefire-api-2.19.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/common-java5-2.19.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/JTransforms-3.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/JLargeArrays-1.5.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/aircompressor-0.25.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.8.22/kotlin-reflect-1.8.22.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-test/1.8.22/kotlin-test-1.8.22.jar" path-in-jar="/" />
</root>
</artifact>
</component>

6
.idea/kotlinc.xml generated
View File

@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Kotlin2JvmCompilerArguments">
<option name="jvmTarget" value="1.8" />
<option name="jvmTarget" value="17" />
</component>
<component name="KotlinCommonCompilerArguments">
<option name="apiVersion" value="1.8" />
<option name="languageVersion" value="1.8" />
</component>
<component name="KotlinJpsPluginSettings">
<option name="version" value="1.8.0" />

View File

@@ -1,26 +1,26 @@
<component name="libraryTable">
<library name="KotlinJavaRuntime" type="repository">
<properties maven-id="org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21" />
<properties maven-id="org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.21/kotlin-stdlib-jdk8-1.8.21.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.21/kotlin-stdlib-1.8.21.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.21/kotlin-stdlib-common-1.8.21.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.21/kotlin-stdlib-jdk7-1.8.21.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.21/kotlin-stdlib-jdk8-1.8.21-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.21/kotlin-stdlib-1.8.21-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.21/kotlin-stdlib-common-1.8.21-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.21/kotlin-stdlib-jdk7-1.8.21-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.21/kotlin-stdlib-jdk8-1.8.21-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.21/kotlin-stdlib-1.8.21-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.21/kotlin-stdlib-common-1.8.21-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.21/kotlin-stdlib-jdk7-1.8.21-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,61 +0,0 @@
<component name="libraryTable">
<library name="github.psambit9791.jdsp" type="repository">
<properties maven-id="com.github.psambit9791:jdsp:2.0.1" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/jdsp-2.0.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/xchart-3.8.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/VectorGraphics2D-0.13.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/graphics2d-0.32.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/pdfbox-2.0.24.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fontbox-2.0.24.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/commons-logging-1.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/animated-gif-lib-1.4.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/ssj-3.3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jfreechart-1.0.12.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jcommon-1.0.15.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/colt-1.2.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/concurrent-1.3.4.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/optimization-1.3.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/commons-math3-3.6.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/iirj-1.5.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/wavfile-0.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/junit-jupiter-engine-5.0.3.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/apiguardian-api-1.0.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/junit-platform-engine-1.0.3.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/junit-platform-commons-1.0.3.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/opentest4j-1.0.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/junit-jupiter-api-5.0.3.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/junit-platform-surefire-provider-1.0.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/junit-platform-launcher-1.0.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/surefire-api-2.19.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/common-java5-2.19.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/jdsp-2.0.1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/xchart-3.8.1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/VectorGraphics2D-0.13-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/graphics2d-0.32-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/pdfbox-2.0.24-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fontbox-2.0.24-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/commons-logging-1.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/animated-gif-lib-1.4-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/ssj-3.3.1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/concurrent-1.3.4-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/optimization-1.3-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/commons-math3-3.6.1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/iirj-1.5-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/wavfile-0.1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/junit-jupiter-engine-5.0.3-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/apiguardian-api-1.0.0-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/junit-platform-engine-1.0.3-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/junit-platform-commons-1.0.3-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/opentest4j-1.0.0-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/junit-jupiter-api-5.0.3-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/junit-platform-surefire-provider-1.0.0-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/junit-platform-launcher-1.0.0-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/surefire-api-2.19.1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/common-java5-2.19.1-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -0,0 +1,14 @@
<component name="libraryTable">
<library name="io.airlift.aircompressor" type="repository">
<properties maven-id="io.airlift:aircompressor:0.25" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/aircompressor-0.25.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/lib/aircompressor-0.25-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/aircompressor-0.25-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,10 +1,10 @@
<component name="libraryTable">
<library name="jetbrains.kotlin.reflect" type="repository">
<properties maven-id="org.jetbrains.kotlin:kotlin-reflect:1.8.21" />
<properties maven-id="org.jetbrains.kotlin:kotlin-reflect:1.8.22" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.8.21/kotlin-reflect-1.8.21.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.21/kotlin-stdlib-1.8.21.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.21/kotlin-stdlib-common-1.8.21.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.8.22/kotlin-reflect-1.8.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar!/" />
</CLASSES>
<JAVADOC />

View File

@@ -1,13 +1,26 @@
<component name="libraryTable">
<library name="jetbrains.kotlin.test" type="repository">
<properties maven-id="org.jetbrains.kotlin:kotlin-test:1.8.21" />
<properties maven-id="org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-test/1.8.21/kotlin-test-1.8.21.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.21/kotlin-stdlib-1.8.21.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.21/kotlin-stdlib-common-1.8.21.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="jetbrains.kotlin.test1" type="repository">
<properties maven-id="org.jetbrains.kotlin:kotlin-test:1.8.22" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-test/1.8.22/kotlin-test-1.8.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

View File

@@ -1,23 +0,0 @@
<component name="libraryTable">
<library name="jetbrains.kotlinx.coroutines.core" type="repository">
<properties maven-id="org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/kotlinx-coroutines-core-1.7.3.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/kotlinx-coroutines-core-jvm-1.7.3.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/annotations-23.0.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/kotlin-stdlib-common-1.8.20.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/kotlin-stdlib-jdk8-1.8.20.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/kotlin-stdlib-1.8.20.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/kotlin-stdlib-jdk7-1.8.20.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/lib/kotlinx-coroutines-core-jvm-1.7.3-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/annotations-23.0.0-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/kotlin-stdlib-common-1.8.20-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/kotlin-stdlib-jdk8-1.8.20-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/kotlin-stdlib-1.8.20-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/kotlin-stdlib-jdk7-1.8.20-javadoc.jar!/" />
</JAVADOC>
<SOURCES />
</library>
</component>

2
.idea/misc.xml generated
View File

@@ -38,7 +38,7 @@
<property name="caretWidth" class="java.lang.Integer" />
</properties>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="SuppressKotlinCodeStyleNotification">

1
.idea/modules.xml generated
View File

@@ -6,6 +6,7 @@
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/ModuleComputers/ModuleComputers.iml" filepath="$PROJECT_DIR$/ModuleComputers/ModuleComputers.iml" />
<module fileurl="file://$PROJECT_DIR$/MusicPlayer/MusicPlayer.iml" filepath="$PROJECT_DIR$/MusicPlayer/MusicPlayer.iml" />
<module fileurl="file://$PROJECT_DIR$/TerrarumBuild.iml" filepath="$PROJECT_DIR$/TerrarumBuild.iml" />
</modules>
</component>

View File

@@ -10,6 +10,7 @@
<option name="RunConfigurationTask" enabled="true" run_configuration_name="Build Version Number" run_configuration_type="Application" />
<option name="BuildArtifacts" enabled="true">
<artifact name="ModuleComputers" />
<artifact name="MusicPlayer" />
<artifact name="TerrarumBuild" />
</option>
<option name="RunConfigurationTask" enabled="false" run_configuration_name="QuickDirtyLint" run_configuration_type="Application" />

View File

@@ -10,6 +10,7 @@
<option name="RunConfigurationTask" enabled="true" run_configuration_name="Build Version Number" run_configuration_type="Application" />
<option name="BuildArtifacts" enabled="true">
<artifact name="ModuleComputers" />
<artifact name="MusicPlayer" />
<artifact name="TerrarumBuild" />
</option>
<option name="RunConfigurationTask" enabled="true" run_configuration_name="QuickDirtyLint" run_configuration_type="Application" />

View File

@@ -1,4 +1,4 @@
Copyright (C) 2013-2023 Minjae Song ("CuriousTorvald")
Copyright (C) 2013-2024 Minjae Song ("CuriousTorvald")
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

View File

@@ -8,15 +8,15 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="ModuleComputersLib" level="project" />
<orderEntry type="module" module-name="TerrarumBuild" />
<orderEntry type="library" name="graalvm-js 22.3.1" level="project" />
<orderEntry type="library" name="TerrarumSansBitmap" level="project" />
<orderEntry type="library" name="badlogicgames.gdx" level="project" />
<orderEntry type="library" name="badlogicgames.gdx.backend.lwjgl3" level="project" />
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
<orderEntry type="library" name="jetbrains.kotlin.reflect" level="project" />
<orderEntry type="library" name="jetbrains.kotlin.test" level="project" />
<orderEntry type="library" name="io.github.classgraph" level="project" />
<orderEntry type="library" name="jetbrains.kotlinx.coroutines.core" level="project" />
<orderEntry type="module" module-name="TerrarumBuild" scope="PROVIDED" />
<orderEntry type="library" scope="PROVIDED" name="graalvm-js 22.3.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="TerrarumSansBitmap" level="project" />
<orderEntry type="library" scope="PROVIDED" name="badlogicgames.gdx" level="project" />
<orderEntry type="library" scope="PROVIDED" name="badlogicgames.gdx.backend.lwjgl3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="KotlinJavaRuntime" level="project" />
<orderEntry type="library" scope="PROVIDED" name="jetbrains.kotlin.reflect" level="project" />
<orderEntry type="library" scope="PROVIDED" name="jetbrains.kotlin.test" level="project" />
<orderEntry type="library" scope="PROVIDED" name="io.airlift.aircompressor" level="project" />
<orderEntry type="library" scope="PROVIDED" name="jetbrains.kotlin.test1" level="project" />
</component>
</module>

Binary file not shown.

View File

@@ -18,7 +18,6 @@ import net.torvald.tsvm.peripheral.VMProgramRom
*/
class FixtureHomeComputer : FixtureBase {
@Transient override val spawnNeedsFloor = true
// TODO: write serialiser for TSVM && allow mods to have their own serialiser
private val vm = VM(ModMgr.getGdxFile("dwarventech", "bios").path(), 0x200000, TheRealWorld(), arrayOf(
@@ -37,7 +36,7 @@ class FixtureHomeComputer : FixtureBase {
nameFun = { "Computer" }
) {
density = 1400.0
setHitboxDimension(TerrarumAppConfiguration.TILE_SIZE, TerrarumAppConfiguration.TILE_SIZE, 0, -1)
setHitboxDimension(TerrarumAppConfiguration.TILE_SIZE, TerrarumAppConfiguration.TILE_SIZE, 0, 0)
makeNewSprite(FixtureBase.getSpritesheet("dwarventech", "sprites/fixtures/desktop_computer.tga", TILE_SIZE, TILE_SIZE)).let {
it.setRowsAndFrames(1,1)

View File

@@ -119,7 +119,7 @@ class WearableWorldRadarUI(val device: VM) : UICanvas() {
device.update(delta)
}
override fun renderUI(batch: SpriteBatch, camera: OrthographicCamera) {
override fun renderUI(frameDelta: Float, batch: SpriteBatch, camera: OrthographicCamera) {
batch.end()
batch.color = Color.WHITE

View File

@@ -50,7 +50,7 @@ internal class UIHomeComputer : UICanvas(
override fun updateUI(delta: Float) {
}
override fun renderUI(otherBatch: SpriteBatch, otherCamera: OrthographicCamera) {
override fun renderUI(frameDelta: Float, otherBatch: SpriteBatch, otherCamera: OrthographicCamera) {
otherBatch.end()
fbo.inAction(camera, batch) {

View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="jetbrains.kotlin.test" level="project" />
<orderEntry type="module" module-name="TerrarumBuild" scope="PROVIDED" />
<orderEntry type="library" scope="PROVIDED" name="badlogicgames.gdx" level="project" />
<orderEntry type="library" scope="PROVIDED" name="io.airlift.aircompressor" level="project" />
<orderEntry type="library" scope="PROVIDED" name="TerrarumSansBitmap" level="project" />
<orderEntry type="library" scope="PROVIDED" name="apache.commons.math3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="jetbrains.kotlin.test1" level="project" />
</component>
</module>

View File

@@ -0,0 +1,19 @@
package net.torvald.terrarum.musicplayer
import net.torvald.terrarum.IngameInstance
import net.torvald.terrarum.ModMgr
import net.torvald.terrarum.ModuleEntryPoint
import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.musicplayer.gui.MusicPlayer
/**
* Created by minjaesong on 2023-12-23.
*/
class EntryPoint : ModuleEntryPoint() {
override fun invoke() {
ModMgr.GameExtraGuiLoader.register { ingame: TerrarumIngame -> MusicPlayer(ingame) }
}
override fun dispose() {
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -35,13 +35,15 @@ Requires 64 bit processor and operation system.
- Playing the game on the Minimum Requirement is ill advised: framerate will be sub-20 and the world generation will take more than 10 minutes
## Dev Setup ##
## Development Environment ##
- Requirements:
- JDK 17 or higher
- IntelliJ IDEA Community Edition
Required libraries are included in the repository.
Kotlin runtimes must be downloaded using the IntelliJ IDEA. All other libraries are included in the repository.
The project includes modified version of the GraalVM-JS, in which the only difference is the `regex-22.3.1-edit.jar` is a modification of `regex-22.3.1.jar` where the only difference is its `MANIFEST.MD`
## Copyright ##

View File

@@ -26,8 +26,8 @@
<orderEntry type="library" name="jetbrains.kotlin.test" level="project" />
<orderEntry type="library" name="io.github.classgraph" level="project" />
<orderEntry type="library" name="apache.commons.math3" level="project" />
<orderEntry type="library" name="jetbrains.kotlinx.coroutines.core" level="project" />
<orderEntry type="library" name="github.psambit9791.jdsp" level="project" />
<orderEntry type="library" name="github.wendykierp.JTransforms" level="project" />
<orderEntry type="library" name="io.airlift.aircompressor" level="project" />
<orderEntry type="library" name="jetbrains.kotlin.test1" level="project" />
</component>
</module>

Binary file not shown.

View File

@@ -14,6 +14,7 @@
"MENU_IO_IMPORT": "Import",
"MENU_IO_MANUAL_SAVE": "Manual Save",
"MENU_LABEL_AMBIENT_SOUNDS": "Ambient Sounds",
"MENU_LABEL_AUDIO_ENGINE": "Audio Engine",
"MENU_LABEL_COPYRIGHT": "Copyright",
"MENU_LABEL_DELETE": "Delete",
"MENU_LABEL_EXTRA_JVM_ARGUMENTS": "Extra Arguments",
@@ -40,11 +41,17 @@
"MENU_OPTIONS_JVM_HEAP_MAX": "Max Heap Memory",
"MENU_OPTIONS_LIGHT_UPDATE_PASSES": "Light Calculation Depth",
"MENU_OPTIONS_MASTER_VOLUME": "Master Volume",
"MENU_OPTIONS_NONE" : "None",
"MENU_OPTIONS_NOTIFICATION_DISPLAY_DURATION": "Show notification for",
"MENU_OPTIONS_PARTICLES": "Particles",
"MENU_OPTIONS_PERFORMANCE": "Performance",
"MENU_OPTIONS_SAVEFORMAT": "Savegame Format",
"MENU_OPTIONS_SAVEFORMAT_FAST": "Faster Load",
"MENU_OPTIONS_SAVEFORMAT_SMALL": "Smaller Size",
"MENU_OPTIONS_SPEAKER_HEADPHONE": "Headphone",
"MENU_OPTIONS_SPEAKER_SETUP": "Speaker Setup",
"MENU_OPTIONS_SPEAKER_STEREO": "Stereo",
"MENU_OPTIONS_STREAMERS_LAYOUT": "Chat Overlay",
"MENU_OPTIONS_NONE" : "None",
"MENU_CREDIT_GPL_DNT" : "GPL",
"MENU_LABEL_JVM_DNT" : "JVM",

View File

@@ -2,7 +2,7 @@
"CONTEXT_CHARACTER": "Hahmo",
"MENU_LABEL_COPYRIGHT": "Tekijänoikeus",
"COPYRIGHT_ALL_RIGHTS_RESERVED": "Kaikki oikeudet pidätetään",
"COPYRIGHT_GNU_GPL_3": "Jaetaan GNU GPL 3:n mukaisesti",
"COPYRIGHT_GNU_GPL_3": "Jaettu GNU GPL 3:n mukaisesti",
"APP_WARNING_HEALTH_AND_SAFETY": "VAROITUS-TERVEYS JA TURVALLISUUS",
"MENU_LABEL_PRESS_START_SYMBOL": "Paina >",
"MENU_MODULES" : "Moduulit",

View File

@@ -14,6 +14,7 @@
"MENU_IO_IMPORT": "가져오기",
"MENU_IO_MANUAL_SAVE": "수동 저장",
"MENU_LABEL_AMBIENT_SOUNDS": "환경음",
"MENU_LABEL_AUDIO_ENGINE": "오디오 엔진",
"MENU_LABEL_COPYRIGHT": "저작권",
"MENU_LABEL_DELETE": "삭제",
"MENU_LABEL_EXTRA_JVM_ARGUMENTS": "추가 명령 인수",
@@ -40,9 +41,15 @@
"MENU_OPTIONS_JVM_HEAP_MAX": "최대 힙 메모리",
"MENU_OPTIONS_LIGHT_UPDATE_PASSES": "빛 계산 반복 횟수",
"MENU_OPTIONS_MASTER_VOLUME": "마스터 음량",
"MENU_OPTIONS_NONE" : "없음",
"MENU_OPTIONS_NOTIFICATION_DISPLAY_DURATION": "알림 표시 시간",
"MENU_OPTIONS_PARTICLES": "입자 수",
"MENU_OPTIONS_PERFORMANCE": "성능",
"MENU_OPTIONS_STREAMERS_LAYOUT": "채팅창 오버레이",
"MENU_OPTIONS_NONE" : "없음"
"MENU_OPTIONS_SAVEFORMAT": "게임 저장 형식",
"MENU_OPTIONS_SAVEFORMAT_FAST": "빠른 불러오기",
"MENU_OPTIONS_SAVEFORMAT_SMALL": "작은 용량",
"MENU_OPTIONS_SPEAKER_HEADPHONE": "헤드폰",
"MENU_OPTIONS_SPEAKER_SETUP": "스피커 구성",
"MENU_OPTIONS_SPEAKER_STEREO": "스테레오",
"MENU_OPTIONS_STREAMERS_LAYOUT": "채팅창 오버레이"
}

View File

@@ -2,7 +2,7 @@
"CONTEXT_CHARACTER": "Персонаж",
"MENU_LABEL_COPYRIGHT": "Авторские права",
"COPYRIGHT_ALL_RIGHTS_RESERVED": "Все права защищены",
"COPYRIGHT_GNU_GPL_3": "Распространяется в соответствии с GNU GPL 3",
"COPYRIGHT_GNU_GPL_3": "Распространяется под GNU GPL 3",
"APP_WARNING_HEALTH_AND_SAFETY": "ПРЕДУПРЕЖДЕНИЕ-ЗДОРОВЬЕ И БЕЗОПАСНОСТЬ",
"MENU_LABEL_PRESS_START_SYMBOL": "Нажмите >",
"MENU_MODULES" : "Модули",

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More