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

Fixed GuiReplaySpeedSlider and GuiVideoFramerateSlider overriding the wrong methods

Browse Source
This commit is contained in:
CrushedPixel
2015-07-19 15:29:57 +02:00
parent d6c03644b8
commit c309929276
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/eu/crushedpixel/replaymod/gui/GuiReplaySpeedSlider.java
View File

@@ -94,7 +94,7 @@ public class GuiReplaySpeedSlider extends GuiAdvancedButton {
} }
@Override @Override
protected void mouseDragged(Minecraft mc, int mouseX, int mouseY) { public void mouseDrag(Minecraft mc, int mouseX, int mouseY, int button) {
if(this.visible) { if(this.visible) {
try { try {
if(this.dragging) { if(this.dragging) {
@@ -146,6 +146,7 @@ public class GuiReplaySpeedSlider extends GuiAdvancedButton {
return Math.round(value * max - min); return Math.round(value * max - min);
} }
@Override
public boolean mousePressed(Minecraft mc, int mouseX, int mouseY) { public boolean mousePressed(Minecraft mc, int mouseX, int mouseY) {
if(super.mousePressed(mc, mouseX, mouseY)) { if(super.mousePressed(mc, mouseX, mouseY)) {
this.dragging = true; this.dragging = true;
@@ -155,6 +156,7 @@ public class GuiReplaySpeedSlider extends GuiAdvancedButton {
} }
} }
@Override
public void mouseReleased(int mouseX, int mouseY) { public void mouseReleased(int mouseX, int mouseY) {
this.dragging = false; this.dragging = false;
} }
@@ -182,11 +184,6 @@ public class GuiReplaySpeedSlider extends GuiAdvancedButton {
return mousePressed(mc, mouseX, mouseY); return mousePressed(mc, mouseX, mouseY);
} }
@Override
public void mouseDrag(Minecraft mc, int mouseX, int mouseY, int button) {
mouseDragged(mc, mouseX, mouseY);
}
@Override @Override
public void mouseRelease(Minecraft mc, int mouseX, int mouseY, int button) { public void mouseRelease(Minecraft mc, int mouseX, int mouseY, int button) {
mouseReleased(mouseX, mouseY); mouseReleased(mouseX, mouseY);
@@ -206,4 +203,9 @@ public class GuiReplaySpeedSlider extends GuiAdvancedButton {
public void setElementEnabled(boolean enabled) { public void setElementEnabled(boolean enabled) {
this.enabled = enabled; this.enabled = enabled;
} }
@Override
protected void mouseDragged(Minecraft mc, int mouseX, int mouseY) {
mouseDrag(mc, mouseX, mouseY, 0);
}
} }

12
src/main/java/eu/crushedpixel/replaymod/gui/GuiVideoFramerateSlider.java
View File

@@ -21,12 +21,13 @@ public class GuiVideoFramerateSlider extends GuiAdvancedButton {
return String.valueOf(value); return String.valueOf(value);
} }
@Override
protected int getHoverState(boolean mouseOver) { protected int getHoverState(boolean mouseOver) {
return 0; return 0;
} }
@Override @Override
protected void mouseDragged(Minecraft mc, int mouseX, int mouseY) { public void mouseDrag(Minecraft mc, int mouseX, int mouseY, int mouseButton) {
if(this.visible) { if(this.visible) {
if(this.dragging) { if(this.dragging) {
sliderValue = (float) (mouseX - (this.xPosition + 4)) / (float) (this.width - 8); sliderValue = (float) (mouseX - (this.xPosition + 4)) / (float) (this.width - 8);
@@ -57,7 +58,7 @@ public class GuiVideoFramerateSlider extends GuiAdvancedButton {
} }
@Override @Override
public boolean mousePressed(Minecraft mc, int mouseX, int mouseY) { public boolean mouseClick(Minecraft mc, int mouseX, int mouseY, int button) {
if(super.mousePressed(mc, mouseX, mouseY)) { if(super.mousePressed(mc, mouseX, mouseY)) {
this.dragging = true; this.dragging = true;
return true; return true;
@@ -67,7 +68,12 @@ public class GuiVideoFramerateSlider extends GuiAdvancedButton {
} }
@Override @Override
public void mouseReleased(int mouseX, int mouseY) { public void mouseRelease(Minecraft mc, int mouseX, int mouseY, int mouseButton) {
this.dragging = false; this.dragging = false;
} }
@Override
protected void mouseDragged(Minecraft mc, int mouseX, int mouseY) {
mouseDrag(mc, mouseX, mouseY, 0);
}
} }