diff --git a/API/MarriageMaster-API-Bukkit/src/at/pcgamingfreaks/MarriageMaster/Bukkit/API/AcceptPendingRequest.java b/API/MarriageMaster-API-Bukkit/src/at/pcgamingfreaks/MarriageMaster/Bukkit/API/AcceptPendingRequest.java index cbe18ee7..2f82dbdb 100644 --- a/API/MarriageMaster-API-Bukkit/src/at/pcgamingfreaks/MarriageMaster/Bukkit/API/AcceptPendingRequest.java +++ b/API/MarriageMaster-API-Bukkit/src/at/pcgamingfreaks/MarriageMaster/Bukkit/API/AcceptPendingRequest.java @@ -12,7 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ package at.pcgamingfreaks.MarriageMaster.Bukkit.API; @@ -28,7 +28,7 @@ public abstract class AcceptPendingRequest extends at.pcgamingfreaks.MarriageMas * @param hasToAccept The player that has to accept the request. * @param canCancel The players that can cancel the request. */ - public AcceptPendingRequest(@NotNull MarriagePlayer hasToAccept, @NotNull MarriagePlayer... canCancel) + protected AcceptPendingRequest(@NotNull MarriagePlayer hasToAccept, @NotNull MarriagePlayer... canCancel) { super(hasToAccept, canCancel); } diff --git a/API/MarriageMaster-API-Bukkit/src/at/pcgamingfreaks/MarriageMaster/Bukkit/API/Home.java b/API/MarriageMaster-API-Bukkit/src/at/pcgamingfreaks/MarriageMaster/Bukkit/API/Home.java index 8922b765..73979ae1 100644 --- a/API/MarriageMaster-API-Bukkit/src/at/pcgamingfreaks/MarriageMaster/Bukkit/API/Home.java +++ b/API/MarriageMaster-API-Bukkit/src/at/pcgamingfreaks/MarriageMaster/Bukkit/API/Home.java @@ -12,7 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ package at.pcgamingfreaks.MarriageMaster.Bukkit.API; @@ -31,30 +31,23 @@ public abstract class Home extends at.pcgamingfreaks.MarriageMaster.API.Home { private final Location location; - public Home(Location location) + protected Home(Location location) { this(location, null); } - public Home(@NotNull Location location, @Nullable String homeServer) + protected Home(@NotNull Location location, @Nullable String homeServer) { super(location.getWorld().getName(), homeServer, location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch()); this.location = location; } - public Home(final @NotNull String world, final @Nullable String server, final double x, final double y, final double z, final float yaw, final float pitch) + protected Home(final @NotNull String world, final @Nullable String server, final double x, final double y, final double z, final float yaw, final float pitch) { super(world, server, x, y, z, yaw, pitch); this.location = new Location(Bukkit.getServer().getWorld(world), x, y, z, yaw, pitch); } - @Deprecated - public Home(final @NotNull String world, final @Nullable String server, final double x, final double y, final double z) - { - super(world, server, x, y, z); - this.location = new Location(Bukkit.getServer().getWorld(world), x, y, z, 0, 0); - } - /** * Gets the location of the represented home. * diff --git a/API/MarriageMaster-API-Bukkit/src/at/pcgamingfreaks/MarriageMaster/Bukkit/API/MarryCommand.java b/API/MarriageMaster-API-Bukkit/src/at/pcgamingfreaks/MarriageMaster/Bukkit/API/MarryCommand.java index 86364f22..c84a1b3b 100644 --- a/API/MarriageMaster-API-Bukkit/src/at/pcgamingfreaks/MarriageMaster/Bukkit/API/MarryCommand.java +++ b/API/MarriageMaster-API-Bukkit/src/at/pcgamingfreaks/MarriageMaster/Bukkit/API/MarryCommand.java @@ -12,7 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ package at.pcgamingfreaks.MarriageMaster.Bukkit.API; @@ -54,7 +54,7 @@ public abstract class MarryCommand extends SubCommand implements at.pcgamingfrea * @param description The description of the command. * @param aliases List of aliases for that command. */ - public MarryCommand(@NotNull JavaPlugin plugin, @NotNull String name, @NotNull String description, @Nullable String... aliases) + protected MarryCommand(@NotNull JavaPlugin plugin, @NotNull String name, @NotNull String description, @Nullable String... aliases) { this(plugin, name, description, null, aliases); } @@ -68,7 +68,7 @@ public MarryCommand(@NotNull JavaPlugin plugin, @NotNull String name, @NotNull S * @param permission The permission to be checked for this command. Players without the permission neither can use the command nor will they see it in help. * @param aliases List of aliases for that command. */ - public MarryCommand(@NotNull JavaPlugin plugin, @NotNull String name, @NotNull String description, @Nullable String permission, @Nullable String... aliases) + protected MarryCommand(@NotNull JavaPlugin plugin, @NotNull String name, @NotNull String description, @Nullable String permission, @Nullable String... aliases) { super(name, description, permission, aliases); this.plugin = plugin; @@ -84,7 +84,7 @@ public MarryCommand(@NotNull JavaPlugin plugin, @NotNull String name, @NotNull S * @param playerOnly Limits the command to players, console can't use and can't see the command. * @param aliases List of aliases for that command. */ - public MarryCommand(@NotNull JavaPlugin plugin, @NotNull String name, @NotNull String description, @Nullable String permission, boolean playerOnly, @Nullable String... aliases) + protected MarryCommand(@NotNull JavaPlugin plugin, @NotNull String name, @NotNull String description, @Nullable String permission, boolean playerOnly, @Nullable String... aliases) { this(plugin, name, description, permission, aliases); this.playerOnly = playerOnly; @@ -101,7 +101,7 @@ public MarryCommand(@NotNull JavaPlugin plugin, @NotNull String name, @NotNull S * @param partnerSelectorInHelpForMoreThanOnePartner If the help should contain a partner name parameter (for polygamy). * @param aliases List of aliases for that command. */ - public MarryCommand(@NotNull JavaPlugin plugin, @NotNull String name, @NotNull String description, @Nullable String permission, boolean mustBeMarried, boolean partnerSelectorInHelpForMoreThanOnePartner, @Nullable String... aliases) + protected MarryCommand(@NotNull JavaPlugin plugin, @NotNull String name, @NotNull String description, @Nullable String permission, boolean mustBeMarried, boolean partnerSelectorInHelpForMoreThanOnePartner, @Nullable String... aliases) { this(plugin, name, description, permission, true, aliases); this.mustBeMarried = mustBeMarried; diff --git a/API/MarriageMaster-API-Bungee/src/at/pcgamingfreaks/MarriageMaster/Bungee/API/MarryCommand.java b/API/MarriageMaster-API-Bungee/src/at/pcgamingfreaks/MarriageMaster/Bungee/API/MarryCommand.java index c882a0e9..6257d670 100644 --- a/API/MarriageMaster-API-Bungee/src/at/pcgamingfreaks/MarriageMaster/Bungee/API/MarryCommand.java +++ b/API/MarriageMaster-API-Bungee/src/at/pcgamingfreaks/MarriageMaster/Bungee/API/MarryCommand.java @@ -12,7 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ package at.pcgamingfreaks.MarriageMaster.Bungee.API; @@ -55,7 +55,7 @@ public abstract class MarryCommand extends SubCommand implements at.pcgamingfrea * @param description The description of the command. * @param aliases List of aliases for that command. */ - public MarryCommand(@NotNull Plugin plugin, @NotNull String name, @NotNull String description, @Nullable String... aliases) + protected MarryCommand(@NotNull Plugin plugin, @NotNull String name, @NotNull String description, @Nullable String... aliases) { this(plugin, name, description, null, aliases); } @@ -69,7 +69,7 @@ public MarryCommand(@NotNull Plugin plugin, @NotNull String name, @NotNull Strin * @param permission The permission to be checked for this command. Players without the permission neither can use the command nor will they see it in help. * @param aliases List of aliases for that command. */ - public MarryCommand(@NotNull Plugin plugin, @NotNull String name, @NotNull String description, @Nullable String permission, @Nullable String... aliases) + protected MarryCommand(@NotNull Plugin plugin, @NotNull String name, @NotNull String description, @Nullable String permission, @Nullable String... aliases) { super(name, description, permission, aliases); this.plugin = plugin; @@ -85,7 +85,7 @@ public MarryCommand(@NotNull Plugin plugin, @NotNull String name, @NotNull Strin * @param playerOnly Limits the command to players, console can't use and can't see the command. * @param aliases List of aliases for that command. */ - public MarryCommand(@NotNull Plugin plugin, @NotNull String name, @NotNull String description, @Nullable String permission, boolean playerOnly, @Nullable String... aliases) + protected MarryCommand(@NotNull Plugin plugin, @NotNull String name, @NotNull String description, @Nullable String permission, boolean playerOnly, @Nullable String... aliases) { this(plugin, name, description, permission, aliases); this.playerOnly = playerOnly; @@ -102,7 +102,7 @@ public MarryCommand(@NotNull Plugin plugin, @NotNull String name, @NotNull Strin * @param partnerSelectorInHelpForMoreThanOnePartner If the help should contain a partner name parameter (for polygamy). * @param aliases List of aliases for that command. */ - public MarryCommand(@NotNull Plugin plugin, @NotNull String name, @NotNull String description, @Nullable String permission, boolean mustBeMarried, boolean partnerSelectorInHelpForMoreThanOnePartner, @Nullable String... aliases) + protected MarryCommand(@NotNull Plugin plugin, @NotNull String name, @NotNull String description, @Nullable String permission, boolean mustBeMarried, boolean partnerSelectorInHelpForMoreThanOnePartner, @Nullable String... aliases) { this(plugin, name, description, permission, true, aliases); this.mustBeMarried = mustBeMarried; diff --git a/API/MarriageMaster-API-Common/src/at/pcgamingfreaks/MarriageMaster/API/AcceptPendingRequest.java b/API/MarriageMaster-API-Common/src/at/pcgamingfreaks/MarriageMaster/API/AcceptPendingRequest.java index 3342c2e6..72923ca2 100644 --- a/API/MarriageMaster-API-Common/src/at/pcgamingfreaks/MarriageMaster/API/AcceptPendingRequest.java +++ b/API/MarriageMaster-API-Common/src/at/pcgamingfreaks/MarriageMaster/API/AcceptPendingRequest.java @@ -12,7 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ package at.pcgamingfreaks.MarriageMaster.API; @@ -41,7 +41,7 @@ public abstract class AcceptPendingRequest * @param canCancel The players that can cancel the request. */ @SafeVarargs - public AcceptPendingRequest(@NotNull T hasToAccept, @NotNull T... canCancel) + protected AcceptPendingRequest(@NotNull T hasToAccept, @NotNull T... canCancel) { playerThatHasToAccept = hasToAccept; playersThatCanCancel = canCancel; diff --git a/MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Database/Database.java b/MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Database/Database.java index a47dcbe9..37619df5 100644 --- a/MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Database/Database.java +++ b/MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Database/Database.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 GeorgH93 + * Copyright (C) 2021 GeorgH93 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ package at.pcgamingfreaks.MarriageMaster.Bukkit.Database; @@ -34,7 +34,7 @@ import java.util.UUID; -public class Database extends BaseDatabase implements Listener +public final class Database extends BaseDatabase implements Listener { private final BaseUnCacheStrategy unCacheStrategy;