diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 0dd4b3546..ae8a33732 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,5 +1,8 @@ + + diff --git a/.idea/misc.xml b/.idea/misc.xml index c3fc748c8..3e53d74a6 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -38,7 +38,7 @@ - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 45316b8c3..a114fb259 100644 --- a/build.gradle +++ b/build.gradle @@ -29,8 +29,7 @@ repositories { dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib" compile fileTree(dir: 'lib', include: ['*.jar']) - //testCompile("org.junit.jupiter:junit-jupiter-api:5.3.2") - //testRuntime("org.junit.jupiter:junit-jupiter-engine:5.3.2") + implementation 'org.junit:junit-bom:5.2.0' } compileKotlin { diff --git a/src/net/torvald/gdx/backends/lwjgl/audio/Opus.kt b/src/net/torvald/gdx/backends/lwjgl/audio/Opus.kt deleted file mode 100644 index c4befa8c3..000000000 --- a/src/net/torvald/gdx/backends/lwjgl/audio/Opus.kt +++ /dev/null @@ -1,14 +0,0 @@ -package net.torvald.gdx.backends.lwjgl.audio - -import com.badlogic.gdx.backends.lwjgl.audio.OggInputStream -import com.badlogic.gdx.backends.lwjgl.audio.OpenALAudio -import com.badlogic.gdx.backends.lwjgl.audio.OpenALMusic -import com.badlogic.gdx.backends.lwjgl.audio.OpenALSound -import com.badlogic.gdx.files.FileHandle -import com.badlogic.gdx.utils.StreamUtils -import java.io.ByteArrayOutputStream - -/** - * Created by minjaesong on 2017-06-26. - */ - diff --git a/src/net/torvald/gdx/backends/lwjgl/audio/OpusInputStream.java b/src/net/torvald/gdx/backends/lwjgl/audio/OpusInputStream.java deleted file mode 100644 index a87f20edc..000000000 --- a/src/net/torvald/gdx/backends/lwjgl/audio/OpusInputStream.java +++ /dev/null @@ -1,60 +0,0 @@ -package net.torvald.gdx.backends.lwjgl.audio; - -import org.jetbrains.annotations.NotNull; - -import java.io.IOException; -import java.io.InputStream; - -/** - * Created by minjaesong on 2017-06-26. - */ -public class OpusInputStream extends InputStream { - public OpusInputStream() { - super(); - } - - @Override - public int read(@NotNull byte[] b) throws IOException { - return super.read(b); - } - - @Override - public int read(@NotNull byte[] b, int off, int len) throws IOException { - return super.read(b, off, len); - } - - @Override - public long skip(long n) throws IOException { - return super.skip(n); - } - - @Override - public int available() throws IOException { - return super.available(); - } - - @Override - public void close() throws IOException { - super.close(); - } - - @Override - public synchronized void mark(int readlimit) { - super.mark(readlimit); - } - - @Override - public synchronized void reset() throws IOException { - super.reset(); - } - - @Override - public boolean markSupported() { - return super.markSupported(); - } - - @Override - public int read() throws IOException { - return 0; - } -} diff --git a/src/net/torvald/terrarum/tests/TestWorldTime.kt b/src/net/torvald/terrarum/tests/TestWorldTime.kt index 0eb2ec955..71b3afba9 100644 --- a/src/net/torvald/terrarum/tests/TestWorldTime.kt +++ b/src/net/torvald/terrarum/tests/TestWorldTime.kt @@ -1,6 +1,7 @@ package net.torvald.terrarum.tests import net.torvald.terrarum.modulebasegame.gameworld.WorldTime +//import org.junit.Test /** * Created by minjaesong on 2018-12-02. @@ -11,10 +12,26 @@ class TestWorldTime { //@Test fun testEndOfYear() { - repeat(3) { - println(time.getShortTime()) + repeat(5) { + println(time.getFormattedTime()) + time.addTime(1) + } + + println() + time.addTime(86400 - 5) + + repeat(5) { + println(time.getFormattedTime()) time.addTime(1) } } + + + +} + + +fun main(args: Array) { + TestWorldTime().testEndOfYear() } \ No newline at end of file diff --git a/terrarum.iml b/terrarum.iml index 47dd18719..a872860e4 100644 --- a/terrarum.iml +++ b/terrarum.iml @@ -16,7 +16,7 @@ - +