10000 Rework plugin config system #2 by DerEchtePilz · Pull Request #605 · CommandAPI/CommandAPI · GitHub
[go: up one dir, main page]
Skip to content

Rework plugin config system #2 #605

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

Merged
merged 10 commits into from
Oct 16, 2024
Merged

Rework plugin config system #2 #605

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
af9c53d
A few fixes
DerEchtePilz Oct 8, 2024
456c5a4
Add some tests
DerEchtePilz Oct 8, 2024
36c6b4b
Pass a YamlConfigurationLoader into VelocityConfigurationAdapter#crea…
DerEchtePilz Oct 8, 2024
54437c3
Generate default config correctly again
DerEchtePilz Oct 8, 2024
95a831d
Another test
DerEchtePilz Oct 8, 2024
f50a549
Extract saveDefaultConfig to ConfigurationAdapter
DerEchtePilz Oct 9, 2024
51eddbd
Update config test validation methods. Add config modules to code cov…
DerEchtePilz Oct 9, 2024
c07b4b1
Code review
DerEchtePilz Oct 16, 2024
f21647e
Pass config file to the ConfigurationAdapter impls
DerEchtePilz Oct 16, 2024
ed82a36
createDummyInstance -> createMinimalInstance
DerEchtePilz Oct 16, 2024
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
Prev Previous commit
createDummyInstance -> createMinimalInstance
  • Loading branch information
@DerEchtePilz
DerEchtePilz committed Oct 16, 2024
commit ed82a36d6d3eac7ce4bf0a316a5eacedbdf327a7
2 changes: 1 addition & 1 deletion ...it/commandapi-bukkit-plugin-common/src/main/java/dev/jorel/commandapi/CommandAPIMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public void onEnable() {
@Override
public void saveDefaultConfig() {
File configFile = new File(getDataFolder(), "config.yml");
BukkitConfigurationAdapter.createDummyInstance(configFile).saveDefaultConfig(getDataFolder(), getLogger());
BukkitConfigurationAdapter.createMinimalInstance(configFile).saveDefaultConfig(getDataFolder(), getLogger());
}

}
3 changes: 1 addition & 2 deletions ...t-plugin-common/src/main/java/dev/jorel/commandapi/config/BukkitConfigurationAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.logging.Logger;

public record BukkitConfigurationAdapter(YamlConfiguration config, File configFile) implements ConfigurationAdapter<YamlConfiguration> {

public static BukkitConfigurationAdapter createDummyInstance(File configFile) {
public static BukkitConfigurationAdapter createMinimalInstance(File configFile) {
return new BukkitConfigurationAdapter(null, configFile);
}

Expand Down
2 changes: 1 addition & 1 deletion ...elocity/commandapi-velocity-plugin/src/main/java/dev/jorel/commandapi/CommandAPIMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public CommandAPIMain(ProxyServer server, Logger logger, @DataDirectory Path dat
.build();

// Create or update config
VelocityConfigurationAdapter.createDummyInstance(loader).saveDefaultConfig(configFile.getParent().toFile(), logger);
VelocityConfigurationAdapter.createMinimalInstance(loader).saveDefaultConfig(configFile.getParent().toFile(), logger);

// Load the file as a yaml node
ConfigurationNode configYAML;
Expand Down
4 changes: 1 addition & 3 deletions ...locity-plugin/src/main/java/dev/jorel/commandapi/config/VelocityConfigurationAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@
import org.spongepowered.configurate.serialize.SerializationException;
import org.spongepowered.configurate.yaml.YamlConfigurationLoader;

import java.io.File;
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
import java.util.logging.Logger;

public record VelocityConfigurationAdapter(YamlConfigurationLoader loader, CommentedConfigurationNode config, DefaultVelocityConfig defaultVelocityConfig) implements ConfigurationAdapter<ConfigurationNode> {

public static VelocityConfigurationAdapter createDummyInstance(YamlConfigurationLoader loader) {
public static VelocityConfigurationAdapter createMinimalInstance(YamlConfigurationLoader loader) {
return new VelocityConfigurationAdapter(loader, null, null);
}

Expand Down
Loading
0