Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-11-14 22:56:12 +01:00
Code Issues Projects Releases Wiki Activity

Simplify config provider usage.

Browse Source
This commit is contained in:
Jeremy Wood 2023-03-08 23:02:17 -05:00
parent ea07a490a6
commit 686c4a4b16
No known key found for this signature in database
GPG Key ID: C5BAD04C77B91B4B
10 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
View File

@ -88,14 +88,14 @@ public class MultiverseCore extends JavaPlugin implements MVCore {
// Load our configs first as we need them for everything else.
this.loadConfigs();
if (configProvider.getConfig().isEmpty()) {
if (!configProvider.isConfigLoaded()) {
Logging.severe("Your configs were not loaded.");
Logging.severe("Please check your configs and restart the server.");
this.getServer().getPluginManager().disablePlugin(this);
return;
}
configProvider.getConfig().peek(config -> Logging.setShowingConfig(!config.getSilentStart()));
Logging.setShowingConfig(shouldShowConfig());
var worldManager = worldManagerProvider.get();
@ -104,13 +104,11 @@ public class MultiverseCore extends JavaPlugin implements MVCore {
worldManager.loadWorlds(true);
// Now set the firstspawnworld (after the worlds are loaded):
configProvider.getConfig().peek(config -> {
worldManager.setFirstSpawnWorld(config.getFirstSpawnWorld());
MVWorld firstSpawnWorld = worldManager.getFirstSpawnWorld();
if (firstSpawnWorld != null) {
config.setFirstSpawnWorld(firstSpawnWorld.getName());
}
});
worldManager.setFirstSpawnWorld(configProvider.getConfig().getFirstSpawnWorld());
MVWorld firstSpawnWorld = worldManager.getFirstSpawnWorld();
if (firstSpawnWorld != null) {
configProvider.getConfig().setFirstSpawnWorld(firstSpawnWorld.getName());
}
//Setup economy here so vault is loaded
// TODO we may need to change MVEconomist to have an enable method or something
@ -157,6 +155,10 @@ public class MultiverseCore extends JavaPlugin implements MVCore {
}
}
private boolean shouldShowConfig() {
return !configProvider.getConfig().getSilentStart();
}
/**
* Function to Register all the Events needed.
*/
@ -211,12 +213,10 @@ public class MultiverseCore extends JavaPlugin implements MVCore {
private void logEnableMessage() {
Logging.config("Version %s (API v%s) Enabled - By %s", this.getDescription().getVersion(), PROTOCOL, getAuthors());
configProvider.getConfig().peek(config -> {
if (config.isShowingDonateMessage()) {
getLogger().config("Help dumptruckman keep this project alive. Become a patron! https://www.patreon.com/dumptruckman");
getLogger().config("One time donations are also appreciated: https://www.paypal.me/dumptruckman");
}
});
if (configProvider.getConfig().isShowingDonateMessage()) {
getLogger().config("Help dumptruckman keep this project alive. Become a patron! https://www.patreon.com/dumptruckman");
getLogger().config("One time donations are also appreciated: https://www.paypal.me/dumptruckman");
}
}
/**

4
src/main/java/com/onarandombox/MultiverseCore/anchor/AnchorManager.java
View File

@ -160,8 +160,8 @@ public class AnchorManager {
// Add to the list if we're not enforcing access
// OR
// We are enforcing access and the user has the permission.
if (!this.configProvider.getConfigUnsafe().getEnforceAccess() ||
(this.configProvider.getConfigUnsafe().getEnforceAccess() && p.hasPermission(worldPerm))) {
if (!this.configProvider.getConfig().getEnforceAccess() ||
(this.configProvider.getConfig().getEnforceAccess() && p.hasPermission(worldPerm))) {
myAnchors.add(anchor);
} else {
Logging.finer(String.format("Not adding anchor %s to the list, user %s doesn't have the %s " +

4
src/main/java/com/onarandombox/MultiverseCore/commands/DebugCommand.java
View File

@ -53,13 +53,13 @@ public class DebugCommand extends MultiverseCommand {
@Description("{@@mv-core.debug.change.level.description}")
int level) {
this.configProvider.getConfigUnsafe().setGlobalDebug(level);
this.configProvider.getConfig().setGlobalDebug(level);
this.plugin.saveAllConfigs();
this.displayDebugMode(issuer);
}
private void displayDebugMode(BukkitCommandIssuer issuer) {
final int debugLevel = this.configProvider.getConfigUnsafe().getGlobalDebug();
final int debugLevel = this.configProvider.getConfig().getGlobalDebug();
if (debugLevel == 0) {
issuer.sendInfo(MVCorei18n.DEBUG_INFO_OFF);
return;

26
src/main/java/com/onarandombox/MultiverseCore/config/MVCoreConfigProvider.java
View File

@ -15,7 +15,6 @@ import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jvnet.hk2.annotations.Service;
import java.io.BufferedReader;
@ -41,7 +40,7 @@ public final class MVCoreConfigProvider {
private final Provider<MVWorldManager> worldManagerProvider; // TODO remove this dependency
@Inject
public MVCoreConfigProvider(
MVCoreConfigProvider(
MultiverseCore plugin,
PluginManager pluginManager,
Provider<MVWorldManager> worldManagerProvider
@ -51,19 +50,26 @@ public final class MVCoreConfigProvider {
this.worldManagerProvider = worldManagerProvider;
}
@NotNull
public Option<MVConfig> getConfig() {
return Option.of(config);
/**
* Checks if the config is loaded.
*
* @return True if the config is loaded, false otherwise
*/
public boolean isConfigLoaded() {
return config != null;
}
/**
* Provided to make porting code to use DI easier for now.
* Gets the Core configuration instance.
*
* @deprecated Use the {@link #getConfig()} method instead when possible.
* @return The config
* @throws IllegalStateException If the config is not loaded
*/
@Nullable
@Deprecated
public MVConfig getConfigUnsafe() {
@NotNull
public MVConfig getConfig() throws IllegalStateException {
if (config == null) {
throw new IllegalStateException("Config is not loaded");
}
return config;
}

4
src/main/java/com/onarandombox/MultiverseCore/listeners/MVChatListener.java
View File

@ -42,7 +42,7 @@ public class MVChatListener implements Listener {
}
// Check whether the Server is set to prefix the chat with the World name.
// If not we do nothing, if so we need to check if the World has an Alias.
if (configProvider.getConfigUnsafe().getPrefixChat()) {
if (configProvider.getConfig().getPrefixChat()) {
String world = playerListener.getPlayerWorld().get(event.getPlayer().getName());
if (world == null) {
world = event.getPlayer().getWorld().getName();
@ -60,7 +60,7 @@ public class MVChatListener implements Listener {
prefix = mvworld.getColoredWorldString();
String chat = event.getFormat();
String prefixChatFormat = configProvider.getConfigUnsafe().getPrefixChatFormat();
String prefixChatFormat = configProvider.getConfig().getPrefixChatFormat();
prefixChatFormat = prefixChatFormat.replace("%world%", prefix).replace("%chat%", chat);
prefixChatFormat = ChatColor.translateAlternateColorCodes('&', prefixChatFormat);

5
src/main/java/com/onarandombox/MultiverseCore/listeners/MVEntityListener.java
View File

@ -8,7 +8,6 @@
package com.onarandombox.MultiverseCore.listeners;
import com.dumptruckman.minecraft.util.Logging;
import com.onarandombox.MultiverseCore.MultiverseCore;
import com.onarandombox.MultiverseCore.api.MVWorldManager;
import com.onarandombox.MultiverseCore.api.MVWorld;
import com.onarandombox.MultiverseCore.api.WorldPurger;
@ -128,8 +127,8 @@ public class MVEntityListener implements Listener {
if (event.isCancelled() || event.getTo() == null) {
return;
}
if (!this.configProvider.getConfigUnsafe().isUsingDefaultPortalSearch()) {
event.setSearchRadius(this.configProvider.getConfigUnsafe().getPortalSearchRadius());
if (!this.configProvider.getConfig().isUsingDefaultPortalSearch()) {
event.setSearchRadius(this.configProvider.getConfig().getPortalSearchRadius());
}
}
}

13
src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java
View File

@ -37,7 +37,6 @@ import org.bukkit.event.player.PlayerPortalEvent;
import org.bukkit.event.player.PlayerRespawnEvent;
import org.bukkit.event.player.PlayerTeleportEvent;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager;
import org.jvnet.hk2.annotations.Service;
/**
@ -143,7 +142,7 @@ public class MVPlayerListener implements Listener {
Player p = event.getPlayer();
if (!p.hasPlayedBefore()) {
Logging.finer("Player joined for the FIRST time!");
if (configProvider.getConfigUnsafe().getFirstSpawnOverride()) {
if (configProvider.getConfig().getFirstSpawnOverride()) {
Logging.fine("Moving NEW player to(firstspawnoverride): "
+ getWorldManager().getFirstSpawnWorld().getSpawnLocation());
this.sendPlayerToDefaultWorld(p);
@ -151,7 +150,7 @@ public class MVPlayerListener implements Listener {
return;
} else {
Logging.finer("Player joined AGAIN!");
if (this.configProvider.getConfigUnsafe().getEnforceAccess() // check this only if we're enforcing access!
if (this.configProvider.getConfig().getEnforceAccess() // check this only if we're enforcing access!
&& !this.getMVPerms().hasPermission(p, "multiverse.access." + p.getWorld().getName(), false)) {
p.sendMessage("[MV] - Sorry you can't be in this world anymore!");
this.sendPlayerToDefaultWorld(p);
@ -223,7 +222,7 @@ public class MVPlayerListener implements Listener {
}
// Check if player is allowed to enter the world if we're enforcing permissions
if (configProvider.getConfigUnsafe().getEnforceAccess()) {
if (configProvider.getConfig().getEnforceAccess()) {
event.setCancelled(!pt.playerCanGoFromTo(fromWorld, toWorld, teleporter, teleportee));
if (event.isCancelled() && teleporter != null) {
Logging.fine("Player '" + teleportee.getName()
@ -315,7 +314,7 @@ public class MVPlayerListener implements Listener {
+ "' because they don't have the FUNDS required to enter.");
return;
}
if (configProvider.getConfigUnsafe().getEnforceAccess()) {
if (configProvider.getConfig().getEnforceAccess()) {
event.setCancelled(!pt.playerCanGoFromTo(fromWorld, toWorld, event.getPlayer(), event.getPlayer()));
if (event.isCancelled()) {
Logging.fine("Player '" + event.getPlayer().getName()
@ -327,8 +326,8 @@ public class MVPlayerListener implements Listener {
+ "' was allowed to go to '" + event.getTo().getWorld().getName()
+ "' because enforceaccess is off.");
}
if (!this.configProvider.getConfigUnsafe().isUsingDefaultPortalSearch()) {
event.setSearchRadius(this.configProvider.getConfigUnsafe().getPortalSearchRadius());
if (!this.configProvider.getConfig().isUsingDefaultPortalSearch()) {
event.setSearchRadius(this.configProvider.getConfig().getPortalSearchRadius());
}
}

2
src/main/java/com/onarandombox/MultiverseCore/utils/MVPermissions.java
View File

@ -108,7 +108,7 @@ public class MVPermissions {
*/
public boolean canEnterWorld(Player p, MVWorld w) {
// If we're not enforcing access, anyone can enter.
if (!configProvider.getConfigUnsafe().getEnforceAccess()) {
if (!configProvider.getConfig().getEnforceAccess()) {
Logging.finest("EnforceAccess is OFF. Player was allowed in " + w.getAlias());
return true;
}

4
src/main/java/com/onarandombox/MultiverseCore/utils/PermissionTools.java
View File

@ -123,7 +123,7 @@ public class PermissionTools {
*/
public boolean playerHasMoneyToEnter(MVWorld fromWorld, MVWorld toWorld, CommandSender teleporter, Player teleportee, boolean pay) {
Player teleporterPlayer;
if (configProvider.getConfigUnsafe().getTeleportIntercept()) {
if (configProvider.getConfig().getTeleportIntercept()) {
if (teleporter instanceof ConsoleCommandSender) {
return true;
}
@ -219,7 +219,7 @@ public class PermissionTools {
Logging.finest("Checking '" + teleporter + "' can send '" + teleportee + "' somewhere");
Player teleporterPlayer;
if (configProvider.getConfigUnsafe().getTeleportIntercept()) {
if (configProvider.getConfig().getTeleportIntercept()) {
// The console can send anyone anywhere
if (teleporter instanceof ConsoleCommandSender) {
return true;

2
src/main/java/com/onarandombox/MultiverseCore/utils/UnsafeCallWrapper.java
View File

@ -40,7 +40,7 @@ public class UnsafeCallWrapper {
actualFormatArgs[formatArgs.length] = t;
Logging.warning(action, actualFormatArgs);
Logging.warning("This is a bug in %s, NOT a bug in Multiverse!", plugin);
if (configProvider.getConfigUnsafe().getGlobalDebug() >= 1)
if (configProvider.getConfig().getGlobalDebug() >= 1)
t.printStackTrace();
return null;
}