Motschen/PictureSign
1
0
Fork 0
mirror of https://github.com/TeamMidnightDust/PictureSign.git synced 2025-12-13 04:45:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix video end time and log spam

Browse Source
This commit is contained in:
Martin Prokoph
2024-06-28 15:46:23 +02:00
parent ea8e6663ab
commit dd33f55735
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
common/src/main/java/eu/midnightdust/picturesign/render/PictureSignRenderer.java
View File

@@ -177,10 +177,13 @@ public class PictureSignRenderer {
PictureSignClient.LOGGER.error(e); PictureSignClient.LOGGER.error(e);
return; return;
} }
if (info != null && info.volume() != -1) mediaHandler.setMaxVolume(info.volume()); if (info != null && info.volume() >= 0) mediaHandler.setMaxVolume(info.volume());
mediaHandler.setVolumeBasedOnDistance(); mediaHandler.setVolumeBasedOnDistance();
if (info != null && info.start() > 0 && mediaHandler.getTime() < info.start()) mediaHandler.setTime(info.start()); if (info != null && info.start() > 0 && mediaHandler.getTime() < info.start()) mediaHandler.setTime(info.start());
if (info != null && info.end() > 0 && mediaHandler.getTime() >= info.end() && !mediaHandler.playbackStarted) mediaHandler.stop(); if (info != null && info.end() > 0 && mediaHandler.getTime() > info.end()) {
if (type.isLooped) mediaHandler.setTime(info.start() > 0 ? info.start() : 0);
else mediaHandler.stop();
}
} }
else if (type == GIF && gifHandler != null) { else if (type == GIF && gifHandler != null) {
try { try {
@@ -239,8 +242,15 @@ public class PictureSignRenderer {
texture = data.identifier; texture = data.identifier;
} }
else if (type.isVideo && mediaHandler != null) { else if (type.isVideo && mediaHandler != null) {
if (mediaHandler.isWorking()) RenderSystem.setShaderTexture(0, mediaHandler.getTexture()); boolean hasVideoTexture = false;
else { if (mediaHandler.isWorking()) {
int rawTexture = mediaHandler.getTexture();
if (rawTexture != -1) {
RenderSystem.setShaderTexture(0, rawTexture);
hasVideoTexture = true;
}
}
if (!hasVideoTexture) {
var id = MediaHandler.getMissingTexture(); var id = MediaHandler.getMissingTexture();
if (id == null) return; if (id == null) return;
texture = id; texture = id;

6
common/src/main/java/eu/midnightdust/picturesign/util/WaterMediaHandler.java
View File

@@ -7,6 +7,7 @@ import net.minecraft.client.MinecraftClient;
import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundCategory;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import org.lwjgl.opengl.GL11;
public class WaterMediaHandler extends MediaHandler { public class WaterMediaHandler extends MediaHandler {
private SyncBasePlayer player; private SyncBasePlayer player;
@@ -77,7 +78,10 @@ public class WaterMediaHandler extends MediaHandler {
} }
@Override @Override
public int getTexture() { public int getTexture() {
if (player instanceof SyncVideoPlayer videoPlayer) return videoPlayer.getGlTexture(); if (player instanceof SyncVideoPlayer videoPlayer) {
int tex = videoPlayer.getGlTexture();
if (GL11.glIsTexture(tex)) return tex;
}
return -1; return -1;
} }
@Override @Override