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

Fix keyframes being required to open render queue window

Browse Source 
Half the reason we swapped the render queue / settings parent relationship was
so we don't need to go through the settings screen to access the queue. But for
some reason I stopped half way through and didn't also move the "You need at
last two keyframes." popup. This commit rectifies that.
This commit is contained in:
Jonas Herzig
2021-07-24 11:54:14 +02:00
parent 3f4dae05db
commit 83cb459957
3 changed files with 171 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/replaymod/render/gui/GuiRenderQueue.java
View File

@@ -2,6 +2,7 @@ package com.replaymod.render.gui;
import com.google.common.collect.Iterables;
import com.replaymod.core.ReplayMod;
import com.replaymod.core.utils.Result;
import com.replaymod.core.utils.Utils;
import com.replaymod.core.versions.MCVer;
import com.replaymod.render.RenderSettings;
@@ -30,6 +31,7 @@ import de.johni0702.minecraft.gui.layout.CustomLayout;
import de.johni0702.minecraft.gui.layout.GridLayout;
import de.johni0702.minecraft.gui.layout.HorizontalLayout;
import de.johni0702.minecraft.gui.popup.AbstractGuiPopup;
import de.johni0702.minecraft.gui.popup.GuiInfoPopup;
import de.johni0702.minecraft.gui.utils.Colors;
import de.johni0702.minecraft.gui.utils.lwjgl.Dimension;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
@@ -88,7 +90,7 @@ public class GuiRenderQueue extends AbstractGuiPopup<GuiRenderQueue> implements
private final AbstractGuiScreen<?> container;
private final ReplayHandler replayHandler;
private final Set<Entry> selectedEntries = new HashSet<>();
private final Supplier<Timeline> timelineSupplier;
private final Supplier<Result<Timeline, String[]>> timelineSupplier;
private boolean opened;
{
@@ -113,7 +115,7 @@ public class GuiRenderQueue extends AbstractGuiPopup<GuiRenderQueue> implements
private final ReplayModRender mod = ReplayModRender.instance;
private final List<RenderJob> jobs = mod.getRenderQueue();
public GuiRenderQueue(AbstractGuiScreen<?> container, ReplayHandler replayHandler, Supplier<Timeline> timelineSupplier) {
public GuiRenderQueue(AbstractGuiScreen<?> container, ReplayHandler replayHandler, Supplier<Result<Timeline, String[]>> timelineSupplier) {
super(container);
this.container = container;
this.replayHandler = replayHandler;
@@ -127,7 +129,7 @@ public class GuiRenderQueue extends AbstractGuiPopup<GuiRenderQueue> implements
list.getListPanel().addElements(null, new Entry(renderJob));
}
addButton.onClick(this::addButtonClicked);
addButton.onClick(() -> addButtonClicked().ifErr(lines -> GuiInfoPopup.open(container, lines)));
editButton.onClick(() -> {
Entry job = selectedEntries.iterator().next();
@@ -267,15 +269,12 @@ public class GuiRenderQueue extends AbstractGuiPopup<GuiRenderQueue> implements
});
}
private GuiRenderSettings addButtonClicked() {
Timeline timeline = timelineSupplier.get();
if (timeline != null) {
private Result<GuiRenderSettings, String[]> addButtonClicked() {
return timelineSupplier.get().mapOk(timeline -> {
GuiRenderSettings popup = addJob(timeline);
popup.open();
return popup;
} else {
return null;
}
});
}
public GuiRenderSettings addJob(Timeline timeline) {
@@ -317,9 +316,8 @@ public class GuiRenderQueue extends AbstractGuiPopup<GuiRenderQueue> implements
@Override
public void open() {
if (jobs.isEmpty() && timelineSupplier != null) {
if (addButtonClicked() == null) {
close();
}
addButtonClicked().ifErr(lines ->
GuiInfoPopup.open(container, lines).onClosed(this::close));
return;
}