From 8a6ec5191bb18d04664acaabd03e7fffd558f466 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Thu, 20 Apr 2017 22:34:59 +0200 Subject: [PATCH] Add missing tooltips to player overview and various missing chat messages --- .../extras/playeroverview/PlayerOverviewGui.java | 12 +++++++++--- .../java/com/replaymod/replay/ReplayModReplay.java | 8 +++++++- .../com/replaymod/simplepathing/gui/GuiPathing.java | 6 ++++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/replaymod/extras/playeroverview/PlayerOverviewGui.java b/src/main/java/com/replaymod/extras/playeroverview/PlayerOverviewGui.java index a979e841..9dcce774 100644 --- a/src/main/java/com/replaymod/extras/playeroverview/PlayerOverviewGui.java +++ b/src/main/java/com/replaymod/extras/playeroverview/PlayerOverviewGui.java @@ -4,10 +4,15 @@ import com.replaymod.core.utils.Utils; import com.replaymod.replay.ReplayModReplay; import de.johni0702.minecraft.gui.GuiRenderer; import de.johni0702.minecraft.gui.RenderInfo; -import de.johni0702.minecraft.gui.container.*; +import de.johni0702.minecraft.gui.container.GuiClickable; +import de.johni0702.minecraft.gui.container.GuiContainer; +import de.johni0702.minecraft.gui.container.GuiPanel; +import de.johni0702.minecraft.gui.container.GuiScreen; +import de.johni0702.minecraft.gui.container.GuiVerticalList; import de.johni0702.minecraft.gui.element.GuiCheckbox; import de.johni0702.minecraft.gui.element.GuiImage; import de.johni0702.minecraft.gui.element.GuiLabel; +import de.johni0702.minecraft.gui.element.GuiTooltip; import de.johni0702.minecraft.gui.element.IGuiCheckbox; import de.johni0702.minecraft.gui.function.Closeable; import de.johni0702.minecraft.gui.layout.CustomLayout; @@ -36,6 +41,7 @@ public class PlayerOverviewGui extends GuiScreen implements Closeable { public final GuiVerticalList playersScrollable = new GuiVerticalList(contentPanel) .setDrawSlider(true).setDrawShadow(true); public final GuiCheckbox saveCheckbox = new GuiCheckbox(contentPanel) + .setTooltip(new GuiTooltip().setI18nText("replaymod.gui.playeroverview.remembersettings.description")) .setI18nLabel("replaymod.gui.playeroverview.remembersettings"); public final GuiCheckbox checkAll = new GuiCheckbox(contentPanel){ @Override @@ -43,14 +49,14 @@ public class PlayerOverviewGui extends GuiScreen implements Closeable { getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.create(BUTTON_SOUND, 1.0F)); playersScrollable.forEach(IGuiCheckbox.class).setChecked(true); } - }.setLabel("").setChecked(true); + }.setLabel("").setChecked(true).setTooltip(new GuiTooltip().setI18nText("replaymod.gui.playeroverview.showall")); public final GuiCheckbox uncheckAll = new GuiCheckbox(contentPanel){ @Override public void onClick() { getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.create(BUTTON_SOUND, 1.0F)); playersScrollable.forEach(IGuiCheckbox.class).setChecked(false); } - }.setLabel("").setChecked(false); + }.setLabel("").setChecked(false).setTooltip(new GuiTooltip().setI18nText("replaymod.gui.playeroverview.hideall")); { setBackground(Background.NONE); diff --git a/src/main/java/com/replaymod/replay/ReplayModReplay.java b/src/main/java/com/replaymod/replay/ReplayModReplay.java index 24465548..426d7027 100644 --- a/src/main/java/com/replaymod/replay/ReplayModReplay.java +++ b/src/main/java/com/replaymod/replay/ReplayModReplay.java @@ -6,7 +6,11 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.replaymod.core.ReplayMod; import com.replaymod.core.utils.ModCompat; -import com.replaymod.replay.camera.*; +import com.replaymod.replay.camera.CameraController; +import com.replaymod.replay.camera.CameraControllerRegistry; +import com.replaymod.replay.camera.CameraEntity; +import com.replaymod.replay.camera.ClassicCameraController; +import com.replaymod.replay.camera.VanillaCameraController; import com.replaymod.replay.gui.overlay.GuiMarkerTimeline; import com.replaymod.replay.gui.screen.GuiModCompatWarning; import com.replaymod.replay.handler.GuiHandler; @@ -99,6 +103,7 @@ public class ReplayModReplay { @Override public void onSuccess(NoGuiScreenshot result) { try { + core.printInfoToChat("replaymod.chat.savingthumb"); replayHandler.getReplayFile().writeThumb(result.getImage()); core.printInfoToChat("replaymod.chat.savedthumb"); } catch (IOException e) { @@ -109,6 +114,7 @@ public class ReplayModReplay { @Override public void onFailure(Throwable t) { t.printStackTrace(); + core.printWarningToChat("replaymod.chat.failedthumb"); } }); } diff --git a/src/main/java/com/replaymod/simplepathing/gui/GuiPathing.java b/src/main/java/com/replaymod/simplepathing/gui/GuiPathing.java index bde36719..8d61759c 100644 --- a/src/main/java/com/replaymod/simplepathing/gui/GuiPathing.java +++ b/src/main/java/com/replaymod/simplepathing/gui/GuiPathing.java @@ -300,9 +300,15 @@ public class GuiPathing { ListenableFuture future = player.start(mod.getCurrentTimeline().getTimeline(), startTime); overlay.setCloseable(false); overlay.setMouseVisible(true); + core.printInfoToChat("replaymod.chat.pathstarted"); Futures.addCallback(future, new FutureCallback() { @Override public void onSuccess(@Nullable Void result) { + if (future.isCancelled()) { + core.printInfoToChat("replaymod.chat.pathinterrupted"); + } else { + core.printInfoToChat("replaymod.chat.pathfinished"); + } overlay.setCloseable(true); timePath.setActive(true); }