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

Switch core to 1.14 (generated via ./gradlew :1.14:setCoreVersion)

Browse Source
This commit is contained in:
Jonas Herzig
2019-05-10 14:09:22 +02:00
parent 7f7d33def8
commit 7cbf7f7c94
183 changed files with 3250 additions and 3250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/replaymod/render/gui/GuiVideoRenderer.java
View File

@@ -17,18 +17,18 @@ import de.johni0702.minecraft.gui.layout.HorizontalLayout;
import de.johni0702.minecraft.gui.utils.lwjgl.Dimension;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint;
import net.minecraft.client.renderer.texture.DynamicTexture;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.ResourceLocation;
import net.minecraft.client.texture.NativeImageBackedTexture;
import net.minecraft.client.resource.language.I18n;
import net.minecraft.util.Identifier;
//#if MC>=11300
import net.minecraft.client.renderer.texture.NativeImage;
import net.minecraft.client.texture.NativeImage;
//#endif
import java.nio.ByteBuffer;
public class GuiVideoRenderer extends GuiScreen implements Tickable {
private static final ResourceLocation NO_PREVIEW_TEXTURE = new ResourceLocation("replaymod", "logo.jpg");
private static final Identifier NO_PREVIEW_TEXTURE = new Identifier("replaymod", "logo.jpg");
private final VideoRenderer renderer;
@@ -86,7 +86,7 @@ public class GuiVideoRenderer extends GuiScreen implements Tickable {
}
}.setI18nLabel("replaymod.gui.rendering.cancel").setSize(150, 20);
private DynamicTexture previewTexture;
private NativeImageBackedTexture previewTexture;
private boolean previewTextureDirty;
{
@@ -205,8 +205,8 @@ public class GuiVideoRenderer extends GuiScreen implements Tickable {
prevRenderedFrames = renderer.getFramesDone();
}
renderTime.setText(I18n.format("replaymod.gui.rendering.timetaken") + ": " + secToString(renderTimeTaken/1000));
remainingTime.setText(I18n.format("replaymod.gui.rendering.timeleft") + ": " + secToString(renderTimeLeft));
renderTime.setText(I18n.translate("replaymod.gui.rendering.timetaken") + ": " + secToString(renderTimeTaken/1000));
remainingTime.setText(I18n.translate("replaymod.gui.rendering.timeleft") + ": " + secToString(renderTimeLeft));
int framesDone = renderer.getFramesDone(), framesTotal = renderer.getTotalFrames();
progressBar.setI18nLabel("replaymod.gui.rendering.progress", framesDone, framesTotal);
@@ -219,9 +219,9 @@ public class GuiVideoRenderer extends GuiScreen implements Tickable {
int sec = seconds - ((min*60) + (hours*60*60));
StringBuilder builder = new StringBuilder();
if(hours > 0) builder.append(hours).append(I18n.format("replaymod.gui.hours"));
if(min > 0 || hours > 0) builder.append(min).append(I18n.format("replaymod.gui.minutes"));
builder.append(sec).append(I18n.format("replaymod.gui.seconds"));
if(hours > 0) builder.append(hours).append(I18n.translate("replaymod.gui.hours"));
if(min > 0 || hours > 0) builder.append(min).append(I18n.translate("replaymod.gui.minutes"));
builder.append(sec).append(I18n.translate("replaymod.gui.seconds"));
return builder.toString();
}
@@ -233,14 +233,14 @@ public class GuiVideoRenderer extends GuiScreen implements Tickable {
if (previewTexture == null) {
//#if MC>=11300
previewTexture = new DynamicTexture(videoWidth, videoHeight, true);
previewTexture = new NativeImageBackedTexture(videoWidth, videoHeight, true);
//#else
//$$ previewTexture = new DynamicTexture(videoWidth, videoHeight);
//#endif
}
if (previewTextureDirty) {
previewTexture.updateDynamicTexture();
previewTexture.upload();
previewTextureDirty = false;
}
@@ -271,7 +271,7 @@ public class GuiVideoRenderer extends GuiScreen implements Tickable {
buffer.mark();
synchronized (this) {
//#if MC>=11300
NativeImage data = previewTexture.getTextureData();
NativeImage data = previewTexture.getImage();
assert data != null;
for (int y = 0; y < data.getHeight(); y++) {
for (int x = 0; x < data.getWidth(); x++) {