EpicKnarvik97/Stargate
2
0
Fork 0
Code Issues 7 Pull Requests Projects 1 Releases 27 Wiki Activity

Moves all config related code from Stargate to StargateConfig

Browse Source
This commit is contained in:
Kristian Knarvik
2021-10-23 18:34:31 +02:00
parent b7998023f5
commit 2541391d3e
12 changed files with 545 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/knarcraft/stargate/utility/PermissionHelper.java
View File

@ -126,7 +126,7 @@ public final class PermissionHelper {
* @return <p>True if the player has the permission</p>
*/
public static boolean hasPermission(Player player, String perm) {
if (Stargate.permissionDebuggingEnabled) {
if (Stargate.getStargateConfig().isPermissionDebuggingEnabled()) {
Stargate.debug("hasPerm::SuperPerm(" + player.getName() + ")", perm + " => " + player.hasPermission(perm));
}
return player.hasPermission(perm);
@ -144,12 +144,12 @@ public final class PermissionHelper {
*/
public static boolean hasPermDeep(Player player, String permission) {
if (!player.isPermissionSet(permission)) {
if (Stargate.permissionDebuggingEnabled) {
if (Stargate.getStargateConfig().isPermissionDebuggingEnabled()) {
Stargate.debug("hasPermDeep::SuperPerm", permission + " => true");
}
return true;
}
if (Stargate.permissionDebuggingEnabled) {
if (Stargate.getStargateConfig().isPermissionDebuggingEnabled()) {
Stargate.debug("hasPermDeep::SuperPerms", permission + " => " + player.hasPermission(permission));
}
return player.hasPermission(permission);

9
src/main/java/net/knarcraft/stargate/utility/PortalFileHelper.java
View File

@ -10,6 +10,7 @@ import net.knarcraft.stargate.portal.PortalLocation;
import net.knarcraft.stargate.portal.PortalOptions;
import net.knarcraft.stargate.portal.PortalOwner;
import net.knarcraft.stargate.portal.PortalRegistry;
import org.bukkit.ChatColor;
import org.bukkit.World;
import org.bukkit.block.Sign;
@ -35,8 +36,8 @@ public final class PortalFileHelper {
* @param world <p>The world to save portals for</p>
*/
public static void saveAllPortals(World world) {
Stargate.managedWorlds.add(world.getName());
String saveFileLocation = Stargate.getSaveLocation() + "/" + world.getName() + ".db";
Stargate.getStargateConfig().addManagedWorld(world.getName());
String saveFileLocation = Stargate.getPortalFolder() + "/" + world.getName() + ".db";
try {
BufferedWriter bufferedWriter = new BufferedWriter(new FileWriter(saveFileLocation, false));
@ -125,7 +126,7 @@ public final class PortalFileHelper {
* @return <p>True if portals could be loaded</p>
*/
public static boolean loadAllPortals(World world) {
String location = Stargate.getSaveLocation();
String location = Stargate.getPortalFolder();
File database = new File(location, world.getName() + ".db");
@ -268,7 +269,7 @@ public final class PortalFileHelper {
*/
private static void markPortalWithInvalidGate(PortalLocation portalLocation, String gateName, int lineIndex) {
Sign sign = (Sign) portalLocation.getSignLocation().getBlock().getState();
Stargate.setLine(sign, 3, Stargate.getString("signInvalidGate"));
sign.setLine(3, ChatColor.DARK_RED + Stargate.getString("signInvalidGate"));
sign.update();
Stargate.getConsoleLogger().info(Stargate.getString("prefix") + "Gate layout on line " + lineIndex +