diff --git a/jGui b/jGui index 8f296cc5..939ead86 160000 --- a/jGui +++ b/jGui @@ -1 +1 @@ -Subproject commit 8f296cc54da2793e2035719302dc6f70b69af634 +Subproject commit 939ead86b6ea194496e216334369d872fdd13f32 diff --git a/src/main/java/com/replaymod/editor/gui/GuiEditReplay.java b/src/main/java/com/replaymod/editor/gui/GuiEditReplay.java index cb66ac33..2729c6d8 100644 --- a/src/main/java/com/replaymod/editor/gui/GuiEditReplay.java +++ b/src/main/java/com/replaymod/editor/gui/GuiEditReplay.java @@ -12,7 +12,6 @@ import de.johni0702.minecraft.gui.container.GuiContainer; import de.johni0702.minecraft.gui.container.GuiPanel; import de.johni0702.minecraft.gui.element.GuiButton; import de.johni0702.minecraft.gui.element.GuiHorizontalScrollbar; -import de.johni0702.minecraft.gui.element.GuiTexturedButton; import de.johni0702.minecraft.gui.element.GuiTooltip; import de.johni0702.minecraft.gui.element.advanced.GuiProgressBar; import de.johni0702.minecraft.gui.element.advanced.GuiTimelineTime; @@ -42,14 +41,14 @@ public class GuiEditReplay extends AbstractGuiPopup { private final GuiHorizontalScrollbar scrollbar = new GuiHorizontalScrollbar().setSize(300, 9); - private final GuiTexturedButton zoomInButton = new GuiTexturedButton().setSize(9, 9) + private final GuiButton zoomInButton = new GuiButton().setSize(9, 9) .onClick(() -> zoomTimeline(2d / 3d)) - .setTexture(ReplayMod.TEXTURE, ReplayMod.TEXTURE_SIZE).setTexturePosH(40, 20) + .setTexture(ReplayMod.TEXTURE, ReplayMod.TEXTURE_SIZE).setSpriteUV(40, 20) .setTooltip(new GuiTooltip().setI18nText("replaymod.gui.ingame.menu.zoomin")); - private final GuiTexturedButton zoomOutButton = new GuiTexturedButton().setSize(9, 9) + private final GuiButton zoomOutButton = new GuiButton().setSize(9, 9) .onClick(() -> zoomTimeline(3d / 2d)) - .setTexture(ReplayMod.TEXTURE, ReplayMod.TEXTURE_SIZE).setTexturePosH(40, 30) + .setTexture(ReplayMod.TEXTURE, ReplayMod.TEXTURE_SIZE).setSpriteUV(40, 30) .setTooltip(new GuiTooltip().setI18nText("replaymod.gui.ingame.menu.zoomout")); private final GuiPanel zoomButtonPanel = new GuiPanel() diff --git a/src/main/java/com/replaymod/extras/HotkeyButtons.java b/src/main/java/com/replaymod/extras/HotkeyButtons.java index 26a56cb9..3e07a6a4 100644 --- a/src/main/java/com/replaymod/extras/HotkeyButtons.java +++ b/src/main/java/com/replaymod/extras/HotkeyButtons.java @@ -13,7 +13,6 @@ import de.johni0702.minecraft.gui.container.GuiPanel; import de.johni0702.minecraft.gui.element.GuiButton; import de.johni0702.minecraft.gui.element.GuiElement; import de.johni0702.minecraft.gui.element.GuiLabel; -import de.johni0702.minecraft.gui.element.GuiTexturedButton; import de.johni0702.minecraft.gui.layout.CustomLayout; import de.johni0702.minecraft.gui.layout.GridLayout; import de.johni0702.minecraft.gui.layout.HorizontalLayout; @@ -40,15 +39,15 @@ public class HotkeyButtons extends EventRegistrations implements Extra { { on(ReplayOpenedCallback.EVENT, replayHandler -> new Gui(mod, replayHandler.getOverlay())); } public static final class Gui { - private final GuiTexturedButton toggleButton; + private final GuiButton toggleButton; private final GridLayout panelLayout; private final GuiPanel panel; private boolean open; public Gui(ReplayMod mod, GuiReplayOverlay overlay) { - toggleButton = new GuiTexturedButton(overlay).setSize(20, 20) - .setTexture(ReplayMod.TEXTURE, ReplayMod.TEXTURE_SIZE).setTexturePosH(0, 120) + toggleButton = new GuiButton(overlay).setSize(20, 20) + .setTexture(ReplayMod.TEXTURE, ReplayMod.TEXTURE_SIZE).setSpriteUV(0, 120) .onClick(new Runnable() { @Override public void run() { diff --git a/src/main/java/com/replaymod/replay/gui/overlay/GuiReplayOverlay.java b/src/main/java/com/replaymod/replay/gui/overlay/GuiReplayOverlay.java index ac999d50..c2031f6c 100644 --- a/src/main/java/com/replaymod/replay/gui/overlay/GuiReplayOverlay.java +++ b/src/main/java/com/replaymod/replay/gui/overlay/GuiReplayOverlay.java @@ -9,9 +9,9 @@ import de.johni0702.minecraft.gui.GuiRenderer; import de.johni0702.minecraft.gui.RenderInfo; import de.johni0702.minecraft.gui.container.AbstractGuiOverlay; import de.johni0702.minecraft.gui.container.GuiPanel; +import de.johni0702.minecraft.gui.element.GuiButton; import de.johni0702.minecraft.gui.element.GuiElement; import de.johni0702.minecraft.gui.element.GuiSlider; -import de.johni0702.minecraft.gui.element.GuiTexturedButton; import de.johni0702.minecraft.gui.element.GuiTooltip; import de.johni0702.minecraft.gui.element.advanced.IGuiTimeline; import de.johni0702.minecraft.gui.layout.CustomLayout; @@ -41,13 +41,13 @@ public class GuiReplayOverlay extends AbstractGuiOverlay { public final GuiPanel topPanel = new GuiPanel(this) .setLayout(new HorizontalLayout(HorizontalLayout.Alignment.LEFT).setSpacing(5)); - public final GuiTexturedButton playPauseButton = new GuiTexturedButton() { + public final GuiButton playPauseButton = new GuiButton() { @Override public GuiElement getTooltip(RenderInfo renderInfo) { GuiTooltip tooltip = (GuiTooltip) super.getTooltip(renderInfo); if (tooltip != null) { String label; - if (getTextureNormal().getY() == 0) { // Play button + if (getSpriteUV().getY() == 0) { // Play button label = "replaymod.gui.ingame.menu.unpause"; } else { // Pause button label = "replaymod.gui.ingame.menu.pause"; @@ -91,7 +91,7 @@ public class GuiReplayOverlay extends AbstractGuiOverlay { } }); - playPauseButton.setTexturePosH(new ReadablePoint() { + playPauseButton.setSpriteUV(new ReadablePoint() { @Override public int getX() { return 0; diff --git a/src/main/java/com/replaymod/simplepathing/gui/GuiPathing.java b/src/main/java/com/replaymod/simplepathing/gui/GuiPathing.java index 52191ff5..f1ca6a45 100644 --- a/src/main/java/com/replaymod/simplepathing/gui/GuiPathing.java +++ b/src/main/java/com/replaymod/simplepathing/gui/GuiPathing.java @@ -32,10 +32,10 @@ import de.johni0702.minecraft.gui.container.AbstractGuiScreen; 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.element.GuiButton; import de.johni0702.minecraft.gui.element.GuiElement; import de.johni0702.minecraft.gui.element.GuiHorizontalScrollbar; import de.johni0702.minecraft.gui.element.GuiLabel; -import de.johni0702.minecraft.gui.element.GuiTexturedButton; import de.johni0702.minecraft.gui.element.GuiTooltip; import de.johni0702.minecraft.gui.element.advanced.GuiProgressBar; import de.johni0702.minecraft.gui.element.advanced.GuiTimelineTime; @@ -81,7 +81,7 @@ import static com.replaymod.simplepathing.ReplayModSimplePathing.LOGGER; public class GuiPathing { private static final Logger logger = LogManager.getLogger(); - public final GuiTexturedButton playPauseButton = new GuiTexturedButton() { + public final GuiButton playPauseButton = new GuiButton() { @Override public GuiElement getTooltip(RenderInfo renderInfo) { GuiTooltip tooltip = (GuiTooltip) super.getTooltip(renderInfo); @@ -98,7 +98,7 @@ public class GuiPathing { } }.setSize(20, 20).setTexture(ReplayMod.TEXTURE, ReplayMod.TEXTURE_SIZE).setTooltip(new GuiTooltip()); - public final GuiTexturedButton renderButton = new GuiTexturedButton().onClick(new Runnable() { + public final GuiButton renderButton = new GuiButton().onClick(new Runnable() { @Override public void run() { Timeline timeline = preparePathsForPlayback(false); @@ -113,23 +113,23 @@ public class GuiPathing { }.open(); screen.display(); } - }).setSize(20, 20).setTexture(ReplayMod.TEXTURE, ReplayMod.TEXTURE_SIZE).setTexturePosH(40, 0) + }).setSize(20, 20).setTexture(ReplayMod.TEXTURE, ReplayMod.TEXTURE_SIZE).setSpriteUV(40, 0) .setTooltip(new GuiTooltip().setI18nText("replaymod.gui.ingame.menu.renderpath")); - public final GuiTexturedButton positionKeyframeButton = new GuiTexturedButton() { + public final GuiButton positionKeyframeButton = new GuiButton() { @Override public GuiElement getTooltip(RenderInfo renderInfo) { GuiTooltip tooltip = (GuiTooltip) super.getTooltip(renderInfo); if (tooltip != null) { String label; - if (getTextureNormal().getY() == 40) { // Add keyframe - if (getTextureNormal().getX() == 0) { // Position + if (getSpriteUV().getY() == 40) { // Add keyframe + if (getSpriteUV().getX() == 0) { // Position label = "replaymod.gui.ingame.menu.addposkeyframe"; } else { // Spectator label = "replaymod.gui.ingame.menu.addspeckeyframe"; } } else { // Remove keyframe - if (getTextureNormal().getX() == 0) { // Position + if (getSpriteUV().getX() == 0) { // Position label = "replaymod.gui.ingame.menu.removeposkeyframe"; } else { // Spectator label = "replaymod.gui.ingame.menu.removespeckeyframe"; @@ -141,13 +141,13 @@ public class GuiPathing { } }.setSize(20, 20).setTexture(ReplayMod.TEXTURE, ReplayMod.TEXTURE_SIZE).setTooltip(new GuiTooltip()); - public final GuiTexturedButton timeKeyframeButton = new GuiTexturedButton() { + public final GuiButton timeKeyframeButton = new GuiButton() { @Override public GuiElement getTooltip(RenderInfo renderInfo) { GuiTooltip tooltip = (GuiTooltip) super.getTooltip(renderInfo); if (tooltip != null) { String label; - if (getTextureNormal().getY() == 80) { // Add time keyframe + if (getSpriteUV().getY() == 80) { // Add time keyframe label = "replaymod.gui.ingame.menu.addtimekeyframe"; } else { // Remove time keyframe label = "replaymod.gui.ingame.menu.removetimekeyframe"; @@ -180,20 +180,20 @@ public class GuiPathing { public final GuiTimelineTime timelineTime = new GuiTimelineTime() .setTimeline(timeline); - public final GuiTexturedButton zoomInButton = new GuiTexturedButton().setSize(9, 9).onClick(new Runnable() { + public final GuiButton zoomInButton = new GuiButton().setSize(9, 9).onClick(new Runnable() { @Override public void run() { zoomTimeline(2d / 3d); } - }).setTexture(ReplayMod.TEXTURE, ReplayMod.TEXTURE_SIZE).setTexturePosH(40, 20) + }).setTexture(ReplayMod.TEXTURE, ReplayMod.TEXTURE_SIZE).setSpriteUV(40, 20) .setTooltip(new GuiTooltip().setI18nText("replaymod.gui.ingame.menu.zoomin")); - public final GuiTexturedButton zoomOutButton = new GuiTexturedButton().setSize(9, 9).onClick(new Runnable() { + public final GuiButton zoomOutButton = new GuiButton().setSize(9, 9).onClick(new Runnable() { @Override public void run() { zoomTimeline(3d / 2d); } - }).setTexture(ReplayMod.TEXTURE, ReplayMod.TEXTURE_SIZE).setTexturePosH(40, 30) + }).setTexture(ReplayMod.TEXTURE, ReplayMod.TEXTURE_SIZE).setSpriteUV(40, 30) .setTooltip(new GuiTooltip().setI18nText("replaymod.gui.ingame.menu.zoomout")); public final GuiPanel zoomButtonPanel = new GuiPanel() @@ -239,7 +239,7 @@ public class GuiPathing { timeline.setLength(core.getSettingsRegistry().get(Setting.TIMELINE_LENGTH) * 1000); - playPauseButton.setTexturePosH(new ReadablePoint() { + playPauseButton.setSpriteUV(new ReadablePoint() { @Override public int getX() { return 0; @@ -295,7 +295,7 @@ public class GuiPathing { } }); - positionKeyframeButton.setTexturePosH(new ReadablePoint() { + positionKeyframeButton.setSpriteUV(new ReadablePoint() { @Override public int getX() { SPPath keyframePath = mod.getSelectedPath(); @@ -333,7 +333,7 @@ public class GuiPathing { } }); - timeKeyframeButton.setTexturePosH(new ReadablePoint() { + timeKeyframeButton.setSpriteUV(new ReadablePoint() { @Override public int getX() { return 0; diff --git a/src/main/resources/assets/replaymod/replay_gui.png b/src/main/resources/assets/replaymod/replay_gui.png index 0e47861d..552b93ce 100644 Binary files a/src/main/resources/assets/replaymod/replay_gui.png and b/src/main/resources/assets/replaymod/replay_gui.png differ