tilera/CreateMod
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

misc config improvements

Browse source
This commit is contained in:
rhysdh540 2023-07-13 09:41:38 -04:00
parent 0bfd98fccd
commit 65c30ccb13
2 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/simibubi/create/foundation/config/ConfigBase.java
View file

@ -22,6 +22,8 @@ public abstract class ConfigBase {
protected List<ConfigBase> children;
public void registerAll(final ForgeConfigSpec.Builder builder) {
if(allValues == null) // avoid null pointer exception if config class is empty
allValues = new ArrayList<>();
for (CValue<?, ?> cValue : allValues)
cValue.register(builder);
}

26
src/main/java/com/simibubi/create/foundation/config/ui/BaseConfigScreen.java
View file

@ -34,7 +34,7 @@ public class BaseConfigScreen extends ConfigScreen {
private static final Map<String, UnaryOperator<BaseConfigScreen>> DEFAULTS = new HashMap<>();
static {
DEFAULTS.put(Create.ID, (base) -> base
setDefaultActionFor(Create.ID, (base) -> base
.withTitles("Client Settings", "World Generation Settings", "Gameplay Settings")
.withSpecs(AllConfigs.client().specification, AllConfigs.common().specification, AllConfigs.server().specification)
);
@ -50,14 +50,15 @@ public class BaseConfigScreen extends ConfigScreen {
* @param modID the modID of your addon/mod
*/
public static void setDefaultActionFor(String modID, UnaryOperator<BaseConfigScreen> transform) {
if (modID.equals(Create.ID))
if (!DEFAULTS.containsKey(modID)) {
Create.LOGGER.error("Somebody tried to set default action for mod {}, but it was already set!", modID);
return;
}
DEFAULTS.put(modID, transform);
}
public static BaseConfigScreen forCreate(Screen parent) {
return new BaseConfigScreen(parent);
return new BaseConfigScreen(parent, Create.ID);
}
BoxWidget clientConfigWidget;
@ -74,21 +75,18 @@ public class BaseConfigScreen extends ConfigScreen {
String commonTitle = "Common Config";
String serverTitle = "Server Config";
String modID;
String titleString;
protected boolean returnOnClose;
public BaseConfigScreen(Screen parent, @Nonnull String modID) {
super(parent);
this.modID = modID;
this.titleString = modID;
if (DEFAULTS.containsKey(modID))
DEFAULTS.get(modID).apply(this);
else {
this.searchForSpecsInModContainer();
}
}
private BaseConfigScreen(Screen parent) {
this(parent, Create.ID);
else this.searchForSpecsInModContainer();
}
/**
@ -128,6 +126,12 @@ public class BaseConfigScreen extends ConfigScreen {
return this;
}
public BaseConfigScreen withTitle(String title) {
if(title != null && !title.isEmpty())
titleString = title;
return this;
}
public BaseConfigScreen withTitles(@Nullable String client, @Nullable String common, @Nullable String server) {
if (client != null)
clientTitle = client;
@ -191,7 +195,7 @@ public class BaseConfigScreen extends ConfigScreen {
serverText.withElementRenderer(BoxWidget.gradientFactory.apply(serverConfigWidget));
}
TextStencilElement titleText = new TextStencilElement(font, modID.toUpperCase(Locale.ROOT))
TextStencilElement titleText = new TextStencilElement(font, titleString.toUpperCase(Locale.ROOT))
.centered(true, true)
.withElementRenderer((ms, w, h, alpha) -> {
UIRenderHelper.angledGradient(ms, 0, 0, h / 2, h, w / 2, Theme.p(Theme.Key.CONFIG_TITLE_A));