aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbuild.gradle2
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/utils/cursor/CursorReader.java5
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/utils/cursor/GLCursors.java5
3 files changed, 4 insertions, 8 deletions
diff --git a/build.gradle b/build.gradle
index 37267a02..aee2e942 100755
--- a/build.gradle
+++ b/build.gradle
@@ -81,7 +81,7 @@ shadowJar {
include(dependency("org.java-websocket:Java-WebSocket:1.5.1"))
include(dependency("org.slf4j:slf4j-api:1.7.25"))
include(dependency("org.json:json:20171018"))
- include(dependency("com.twelvemonkeys.imageio:imageio-bmp:3.7.0"))
+ include(dependency("com.twelvemonkeys..*:.*"))
}
}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/utils/cursor/CursorReader.java b/src/main/java/kr/syeyoung/dungeonsguide/utils/cursor/CursorReader.java
index 8a1a7950..11a9da51 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/utils/cursor/CursorReader.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/utils/cursor/CursorReader.java
@@ -21,6 +21,7 @@ package kr.syeyoung.dungeonsguide.utils.cursor;
import com.google.common.io.LittleEndianDataInputStream;
import com.google.common.io.LittleEndianDataOutputStream;
import com.twelvemonkeys.imageio.plugins.bmp.CURImageReader;
+import com.twelvemonkeys.imageio.plugins.bmp.CURImageReaderSpi;
import com.twelvemonkeys.imageio.plugins.bmp.ICOImageReader;
import lombok.Data;
@@ -35,6 +36,7 @@ import java.util.List;
public class CursorReader {
public static List<CursorData> readFromInputStream(InputStream inputStream) throws IOException {
+ System.out.println(inputStream);
LittleEndianDataInputStream dataInputStream = new LittleEndianDataInputStream(new BufferedInputStream(inputStream));
dataInputStream.mark(Integer.MAX_VALUE);
@@ -63,8 +65,7 @@ public class CursorReader {
dataInputStream.reset();
try (ImageInputStream imageInputStream = ImageIO.createImageInputStream(dataInputStream)) {
- Iterator<ImageReader> imageReaderIterator = ImageIO.getImageReaders(imageInputStream);
- CURImageReader imageReader = (CURImageReader) imageReaderIterator.next();
+ CURImageReader imageReader = new CURImageReader();
imageReader.setInput(imageInputStream);
for (int i = 0; i < directoryList.size(); i++) {
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/utils/cursor/GLCursors.java b/src/main/java/kr/syeyoung/dungeonsguide/utils/cursor/GLCursors.java
index 832e3b0a..a3932955 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/utils/cursor/GLCursors.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/utils/cursor/GLCursors.java
@@ -73,11 +73,6 @@ public class GLCursors {
}
}
-
- static {
- setupCursors();
- }
-
public static void setupCursors() {
if (enumCursorCursorMap.size() != 0) return;
int platform = LWJGLUtil.getPlatform();