DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of thumb magic (closes #237)

Browse Source
This commit is contained in:
Jonas Herzig
2020-11-05 16:31:10 +01:00
parent 4402650971
commit 3ce10d4855
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/replaymod/replay/gui/screen/GuiReplayViewer.java
View File

@@ -390,13 +390,8 @@ public class GuiReplayViewer extends GuiScreen {
for (final File file : files) { for (final File file : files) {
if (Thread.interrupted()) break; if (Thread.interrupted()) break;
try (ReplayFile replayFile = new ZipReplayFile(new ReplayStudio(), file)) { try (ReplayFile replayFile = new ZipReplayFile(new ReplayStudio(), file)) {
// TODO add a getThumbBytes method to ReplayStudio final Image thumb = Optional.ofNullable(replayFile.getThumbBytes().orNull()).flatMap(stream -> {
final Image thumb = Optional.ofNullable(replayFile.get("thumb").orNull()).flatMap(stream -> {
try (InputStream in = stream) { try (InputStream in = stream) {
int i = 7;
while (i > 0) {
i -= in.skip(i);
}
return Optional.of(Image.read(in)); return Optional.of(Image.read(in));
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();

2
versions/common.gradle
View File

@@ -305,7 +305,7 @@ dependencies {
shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8' shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8'
shadow "com.github.ReplayMod:ReplayStudio:b29955e", shadeExclusions shadow "com.github.ReplayMod:ReplayStudio:bcffd46", shadeExclusions
implementation(jGui){ implementation(jGui){
transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those