Skip to content

Commit ed6045b

Browse files
authored
Simpler fix for #333 (#337)
* Revert "Fixed shedaniel/cloth-config/333 (#335)" This reverts commit e6aff69. * fix(sliders): delegate setting to AbstractSliderButton `AbstractSliderButton.setValue()` now has internal logic that should not be overridden. We still need an override to make it `public`, so delegate to `super.setValue()`.
1 parent e6aff69 commit ed6045b

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

common/src/main/java/me/shedaniel/clothconfig2/gui/entries/IntegerSliderEntry.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,7 @@ public void updateMessage() {
169169

170170
@Override
171171
protected void applyValue() {
172-
this.value = Mth.clamp(this.value, 0.0d, 1.0d);
173172
IntegerSliderEntry.this.value.set((int) (minimum + Math.abs(maximum - minimum) * value));
174-
updateMessage();
175173
}
176174

177175
@Override
@@ -185,8 +183,6 @@ public boolean keyPressed(KeyEvent event) {
185183
public boolean mouseDragged(MouseButtonEvent event, double double_3, double double_4) {
186184
if (!isEditable())
187185
return false;
188-
this.value = Mth.clamp(this.value, 0.0d, 1.0d);
189-
applyValue();
190186
return super.mouseDragged(event, double_3, double_4);
191187
}
192188

@@ -196,12 +192,11 @@ public double getProgress() {
196192

197193
public void setProgress(double integer) {
198194
this.value = integer;
199-
applyValue();
200195
}
201196

197+
@Override
202198
public void setValue(double integer) {
203-
this.value = Mth.clamp(integer, 0.0d, 1.0d);
204-
applyValue();
199+
super.setValue(integer);
205200
}
206201
}
207202

common/src/main/java/me/shedaniel/clothconfig2/gui/entries/LongSliderEntry.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,7 @@ public void updateMessage() {
169169

170170
@Override
171171
protected void applyValue() {
172-
this.value = Mth.clamp(this.value, 0.0d, 1.0d);
173172
LongSliderEntry.this.value.set((long) (minimum + Math.abs(maximum - minimum) * value));
174-
updateMessage();
175173
}
176174

177175
@Override
@@ -185,18 +183,16 @@ public boolean keyPressed(KeyEvent event) {
185183
public boolean mouseDragged(MouseButtonEvent event, double double_3, double double_4) {
186184
if (!isEditable())
187185
return false;
188-
this.value = Mth.clamp(this.value, 0.0d, 1.0d);
189-
applyValue();
190186
return super.mouseDragged(event, double_3, double_4);
191187
}
192188

193189
public double getValue() {
194190
return value;
195191
}
196192

193+
@Override
197194
public void setValue(double integer) {
198-
this.value = Mth.clamp(integer, 0.0d, 1.0d);
199-
applyValue();
195+
super.setValue(integer);
200196
}
201197
}
202198

0 commit comments

Comments
 (0)