curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-10 10:34:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

adding kotlin-test to dependencies

Browse Source
This commit is contained in:
minjaesong
2024-01-09 22:28:49 +09:00
parent 0104d80152
commit c4c76a41fb
4 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/libraries/jetbrains_kotlin_test.xml generated
View File

@@ -2,10 +2,6 @@
<library name="jetbrains.kotlin.test" type="repository"> <library name="jetbrains.kotlin.test" 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.21" />
<CLASSES> <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/annotations/13.0/annotations-13.0.jar!/" />
<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-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/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-common/1.8.21/kotlin-stdlib-common-1.8.21.jar!/" />

13
.idea/libraries/jetbrains_kotlin_test1.xml generated Normal file
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.21" />
<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/annotations/13.0/annotations-13.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

8
src/net/torvald/terrarum/App.java
View File

@@ -391,14 +391,18 @@ public class App implements ApplicationListener {
processorVendor = "Unknown CPU"; processorVendor = "Unknown CPU";
} }
if (processor.startsWith("Apple M") && systemArch.equals("aarch64")) { if (processor != null && processor.startsWith("Apple M") && systemArch.equals("aarch64")) {
isAppleM = true; isAppleM = true;
System.out.println("Apple Proprietary "+processor+" detected; don't expect smooth sailing..."); System.out.println("Apple Proprietary "+processor+" detected; don't expect smooth sailing...");
} }
if (processor.startsWith("Apple M") && !systemArch.equals("aarch64")) { if (processor != null && processor.startsWith("Apple M") && !systemArch.equals("aarch64")) {
undesirableConditions = "apple_execution_through_rosetta"; undesirableConditions = "apple_execution_through_rosetta";
} }
if (processor == null) {
processor = "null";
}
if (!IS_DEVELOPMENT_BUILD) { if (!IS_DEVELOPMENT_BUILD) {
var p = UnsafeHelper.INSTANCE.allocate(64); var p = UnsafeHelper.INSTANCE.allocate(64);
p.destroy(); p.destroy();

3
src/net/torvald/terrarum/audio/TerrarumAudioMixerTrack.kt
View File

@@ -77,7 +77,8 @@ class TerrarumAudioMixerTrack(
throw IllegalArgumentException("Cannot add master track as a sidechain") throw IllegalArgumentException("Cannot add master track as a sidechain")
if (sidechainInputs.map { it.first }.any { it.hash == input.hash }) if (sidechainInputs.map { it.first }.any { it.hash == input.hash })
throw IllegalArgumentException("The track '${input.hash}' already exists") //throw IllegalArgumentException("The track '${input.hash}' already exists")
return
if (getSidechains().any { mySidechain -> if (getSidechains().any { mySidechain ->
val theirSidechains = mySidechain?.getSidechains() val theirSidechains = mySidechain?.getSidechains()