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

Merge branch '1.19' into 1.19.3

Browse source 
# Conflicts:
#	gradle.properties
#	src/main/java/org/betterx/bclib/BCLib.java
#	src/main/java/org/betterx/bclib/api/v2/generator/BCLChunkGenerator.java
#	src/main/java/org/betterx/worlds/together/mixin/common/WorldPresetsBootstrapMixin.java
#	src/main/java/org/betterx/worlds/together/worldPreset/WorldPresets.java
#	src/main/resources/bclib.accesswidener
This commit is contained in:
Frank 2022-11-29 09:41:10 +01:00
commit 0dcb7809b8
41 changed files with 1586 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/org/betterx/bclib/config/ClientConfig.java
View file

@ -11,7 +11,6 @@ public class ClientConfig extends NamedPathConfig {
"didShowWelcome",
"version"
);
@ConfigUI(topPadding = 12)
public static final ConfigToken<Boolean> CHECK_VERSIONS = ConfigToken.Boolean(
true,
"check",
@ -24,12 +23,20 @@ public class ClientConfig extends NamedPathConfig {
"ui"
);
@ConfigUI(leftPadding = 8)
public static final ConfigToken<Boolean> PREFER_MODRINTH_FOR_UPDATES = ConfigToken.Boolean(
true,
"preferModrinthForUpdates",
"ui"
);
@ConfigUI(hide = true)
public static final ConfigToken<Boolean> FORCE_BETTERX_PRESET = ConfigToken.Boolean(
true,
"forceBetterXPreset",
"ui"
);
@ConfigUI(topPadding = 12)
public static final ConfigToken<Boolean> SUPPRESS_EXPERIMENTAL_DIALOG = ConfigToken.Boolean(
false,
"suppressExperimentalDialogOnLoad",
@ -107,6 +114,8 @@ public class ClientConfig extends NamedPathConfig {
"rendering",
(config) -> config.get(CUSTOM_FOG_RENDERING)
);
@ConfigUI(topPadding = 12)
public static final ConfigToken<Boolean> SURVIES_ON_HINT = ConfigToken.Boolean(
true,
"survives_on_hint",
@ -194,8 +203,12 @@ public class ClientConfig extends NamedPathConfig {
public void setForceBetterXPreset(boolean v) {
set(FORCE_BETTERX_PRESET, v);
}
public boolean survivesOnHint() {
return get(ClientConfig.SURVIES_ON_HINT);
}
public boolean preferModrinthForUpdates() {
return get(ClientConfig.PREFER_MODRINTH_FOR_UPDATES);
}
}

15
src/main/java/org/betterx/bclib/config/MainConfig.java
View file

@ -3,11 +3,7 @@ package org.betterx.bclib.config;
import org.betterx.bclib.BCLib;
public class MainConfig extends NamedPathConfig {
public static final ConfigToken<Boolean> VERBOSE_LOGGING = ConfigToken.Boolean(
true,
"verbose",
Configs.MAIN_INFO_CATEGORY
);
public static final ConfigToken<Boolean> APPLY_PATCHES = ConfigToken.Boolean(
true,
@ -15,7 +11,7 @@ public class MainConfig extends NamedPathConfig {
Configs.MAIN_PATCH_CATEGORY
);
@ConfigUI(leftPadding = 8, topPadding = 8)
@ConfigUI(leftPadding = 8)
public static final ConfigToken<Boolean> REPAIR_BIOMES = DependendConfigToken.Boolean(
false,
"repairBiomesOnLoad",
@ -24,6 +20,13 @@ public class MainConfig extends NamedPathConfig {
APPLY_PATCHES)
);
@ConfigUI(topPadding = 8)
public static final ConfigToken<Boolean> VERBOSE_LOGGING = ConfigToken.Boolean(
true,
"verbose",
Configs.MAIN_INFO_CATEGORY
);
public MainConfig() {
super(BCLib.MOD_ID, "main", true, true);