Skip to content

Brings Color configs back #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FreezePhoenix wants to merge 2 commits into
base: 26.x
Choose a base branch
from
+41 −1
Open

Brings Color configs back #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02c1ee1
Register GuiHexButton
FreezePhoenix Aug 3, 2026
c7e3900
Implement handling for the Color type
FreezePhoenix Aug 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/team/creative/creativecore/client/gui/registry/GuiClientRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import team.creative.creativecore.client.gui.control.simple.GuiClientCheckButtonIcon;
import team.creative.creativecore.client.gui.control.simple.GuiClientColorPlate;
import team.creative.creativecore.client.gui.control.simple.GuiClientColoredSteppedSlider;
import team.creative.creativecore.client.gui.control.simple.GuiClientHexButton;
import team.creative.creativecore.client.gui.control.simple.GuiClientIcon;
import team.creative.creativecore.client.gui.control.simple.GuiClientLabel;
import team.creative.creativecore.client.gui.control.simple.GuiClientLabelHover;
Expand Down Expand Up @@ -98,6 +99,7 @@
import team.creative.creativecore.common.gui.control.simple.GuiButtonIcon;
import team.creative.creativecore.common.gui.control.simple.GuiCheckBox;
import team.creative.creativecore.common.gui.control.simple.GuiCheckButtonIcon;
import team.creative.creativecore.common.gui.control.simple.GuiColorPicker;
import team.creative.creativecore.common.gui.control.simple.GuiColorPlate;
import team.creative.creativecore.common.gui.control.simple.GuiColoredSteppedSlider;
import team.creative.creativecore.common.gui.control.simple.GuiIcon;
Expand Down Expand Up @@ -202,6 +204,7 @@ public static void registerSpecial(Function<GuiControl, GuiClientControl> factor
register(GuiShowItem.class, GuiClientShowItem::new);
register(GuiStateButton.class, GuiClientStateButton::new);
register(GuiStateButtonIcon.class, GuiClientStateButtonIcon::new);
register(GuiColorPicker.GuiHexButton.class, GuiClientHexButton::new);

register(GuiPanel.class, GuiClientPanel::new);
register(GuiScrollX.class, GuiClientScrollX::new);
Expand Down
39 changes: 38 additions & 1 deletion ...main/java/team/creative/creativecore/common/config/converation/ConfigTypeConveration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import team.creative.creativecore.common.gui.GuiParent;
import team.creative.creativecore.common.gui.control.collection.GuiComboBox;
import team.creative.creativecore.common.gui.control.simple.GuiButton;
import team.creative.creativecore.common.gui.control.simple.GuiColorPicker;
import team.creative.creativecore.common.gui.control.simple.GuiLabel;
import team.creative.creativecore.common.gui.control.simple.GuiSlider;
import team.creative.creativecore.common.gui.control.simple.GuiTextfield;
Expand All @@ -61,6 +62,7 @@
import team.creative.creativecore.common.util.math.matrix.IntMatrix3;
import team.creative.creativecore.common.util.math.matrix.IntMatrix3c;
import team.creative.creativecore.common.util.text.TextMapBuilder;
import team.creative.creativecore.common.util.type.Color;
import team.creative.creativecore.common.util.type.list.PairList;

public abstract class ConfigTypeConveration<T> {
Expand Down Expand Up @@ -328,7 +330,42 @@ public Identifier set(ConfigKey key, Identifier value) {

});
registerTypeCreator(Identifier.class, () -> Identifier.withDefaultNamespace(""));

ConfigTypeConveration.registerType(Color.class, new SimpleConfigTypeConveration<Color>() {

@Override
public Color readElement(ConfigKey key, Color defaultValue, Side side, JsonElement element) {
if (element.isJsonPrimitive() && element.getAsJsonPrimitive().isNumber())
return new Color(element.getAsInt());
return defaultValue;
}

@Override
public JsonElement writeElement(Color value, ConfigKey key, Side side) {
return new JsonPrimitive(value.toInt());
}

public void createControls(GuiParent parent, ConfigKey key) {
parent.add(new GuiColorPicker(parent, "color", new Color(), true, 0));
}

public void loadValue(Color value, GuiParent parent) {
GuiColorPicker picker = parent.get("color");
picker.setColor(value);
}

protected Color saveValue(GuiParent parent, ConfigKey key) {
GuiColorPicker picker = parent.get("color");
return new Color(picker.color);
}

@Override
public Color set(ConfigKey key, Color value) {
return value;
}
});

ConfigTypeConveration.registerTypeCreator(Color.class, () -> new Color());

registerType(SoundConfig.class, new ConfigTypeConveration<SoundConfig>() {

@Override
Expand Down