MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added a Range Component

Browse source
This commit is contained in:
Frank 2022-07-15 10:26:10 +02:00
parent d420045de8
commit ef38a9888b
4 changed files with 210 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/org/betterx/bclib/client/gui/modmenu/TestScreen.java
View file

@ -1,9 +1,6 @@
package org.betterx.bclib.client.gui.modmenu;
import org.betterx.ui.layout.components.Button;
import org.betterx.ui.layout.components.HorizontalStack;
import org.betterx.ui.layout.components.Panel;
import org.betterx.ui.layout.components.VerticalStack;
import org.betterx.ui.layout.components.*;
import org.betterx.ui.layout.values.DynamicSize;
import com.mojang.blaze3d.vertex.PoseStack;
@ -27,15 +24,22 @@ public class TestScreen extends Screen {
main = new Panel(this.width, this.height);
HorizontalStack<?> columns = new HorizontalStack<>(DynamicSize.relative(1), DynamicSize.relative(1));
VerticalStack<?> rows = new VerticalStack<>(DynamicSize.fit(), DynamicSize.relative(1));
// columns.add(new Empty(DynamicSize.fill(), DynamicSize.fill()));
// columns.add(rows);
// columns.add(new Empty(DynamicSize.fill(), DynamicSize.fill()));
rows.addFiller();
rows.add(new Range<Integer>(
DynamicSize.fill(), DynamicSize.fit(),
Component.literal("Integer"),
10, 90, 20,
(slider, value) -> {
System.out.println(value);
}
));
rows.addSpacer(8);
rows.add(new Button(
DynamicSize.fit(), DynamicSize.fit(),
Component.literal("test"),
(bt) -> {
System.out.println("clicked test");
},
(bt, pose, x, y) -> {
}
@ -46,6 +50,7 @@ public class TestScreen extends Screen {
DynamicSize.fit(), DynamicSize.fit(),
Component.literal("Hello World"),
(bt) -> {
System.out.println("clicked hello");
},
(bt, pose, x, y) -> {
}

82
src/main/java/org/betterx/ui/layout/components/Range.java Normal file
View file

@ -0,0 +1,82 @@
package org.betterx.ui.layout.components;
import org.betterx.ui.layout.components.render.RangeRenderer;
import org.betterx.ui.layout.values.DynamicSize;
import org.betterx.ui.vanilla.Slider;
import net.minecraft.network.chat.Component;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
@Environment(EnvType.CLIENT)
public class Range<N extends Number> extends AbstractVanillaComponent<Slider<N>, Range<N>> {
private final Slider.SliderValueChanged<N> onChange;
private final N minValue;
private final N maxValue;
private final N initialValue;
public Range(
DynamicSize width,
DynamicSize height,
Component component,
N minValue,
N maxValue,
N initialValue,
Slider.SliderValueChanged<N> onChange
) {
super(width, height, new RangeRenderer<>(), component);
this.onChange = onChange;
this.minValue = minValue;
this.maxValue = maxValue;
this.initialValue = initialValue;
}
public Range(
DynamicSize width,
DynamicSize height,
N minValue,
N maxValue,
N initialValue,
Slider.SliderValueChanged<N> onChange
) {
super(width, height, new RangeRenderer<>(), null);
this.onChange = onChange;
this.minValue = minValue;
this.maxValue = maxValue;
this.initialValue = initialValue;
}
@Override
protected Slider<N> createVanillaComponent() {
return new Slider<>(
0,
0,
relativeBounds.width,
relativeBounds.height,
component,
minValue,
maxValue,
initialValue,
onChange
);
}
@Override
protected Component contentComponent() {
Slider<N> dummy = new Slider<>(
0,
0,
100,
20,
component,
minValue,
maxValue,
initialValue,
(a, b) -> {
}
);
return dummy.getValueComponent(maxValue);
}
}

13
src/main/java/org/betterx/ui/layout/components/render/RangeRenderer.java Normal file
View file

@ -0,0 +1,13 @@
package org.betterx.ui.layout.components.render;
import org.betterx.ui.layout.components.AbstractVanillaComponentRenderer;
import org.betterx.ui.layout.components.Range;
import org.betterx.ui.vanilla.Slider;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
@Environment(EnvType.CLIENT)
public class RangeRenderer<N extends Number> extends AbstractVanillaComponentRenderer<Slider<N>, Range<N>> {
}

103
src/main/java/org/betterx/ui/vanilla/Slider.java Normal file
View file

@ -0,0 +1,103 @@
package org.betterx.ui.vanilla;
import net.minecraft.client.gui.components.AbstractSliderButton;
import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
public class Slider<N extends Number> extends AbstractSliderButton {
@FunctionalInterface
public interface SliderValueChanged<N extends Number> {
void now(Slider<N> slider, N newValue);
}
protected final Component title;
protected final N minValue;
protected final N maxValue;
protected final SliderValueChanged<N> onChange;
public Slider(
int x,
int y,
int width,
int height,
N minValue,
N maxValue,
N initialValue,
SliderValueChanged<N> onChange
) {
this(x, y, width, height, null, minValue, maxValue, initialValue, onChange);
}
public Slider(
int x,
int y,
int width,
int height,
Component title,
N minValue,
N maxValue,
N initialValue,
SliderValueChanged<N> onChange
) {
super(
x,
y,
width,
height,
CommonComponents.EMPTY,
(initialValue.doubleValue() - minValue.doubleValue()) / (maxValue.doubleValue() - minValue.doubleValue())
);
this.title = title;
this.minValue = minValue;
this.maxValue = maxValue;
this.onChange = onChange;
this.updateMessage();
}
protected N currentValue() {
Double res = value * (maxValue.doubleValue() - minValue.doubleValue()) + minValue.doubleValue();
if (minValue instanceof Integer) {
return (N) (Integer) res.intValue();
}
if (minValue instanceof Byte) {
return (N) (Byte) res.byteValue();
}
if (minValue instanceof Short) {
return (N) (Short) res.shortValue();
}
if (minValue instanceof Long) {
return (N) (Long) res.longValue();
}
if (minValue instanceof Float) {
return (N) (Float) res.floatValue();
}
if (minValue instanceof Double) {
return (N) res;
}
throw new IllegalStateException("The Type " + minValue.getClass()
.getSimpleName() + " is not nativley supported. Please override currentValue with an implementation ofr that type");
}
protected String valueToString(N value) {
return "" + value;
}
public Component getValueComponent(N value) {
return Component.literal("" + this.valueToString(value));
}
@Override
protected void updateMessage() {
final Component valueComponent = getValueComponent(this.currentValue());
this.setMessage(title == null ? valueComponent : title.copy()
.append(": ")
.append(valueComponent));
}
@Override
protected void applyValue() {
onChange.now(this, currentValue());
}
}