Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-12-21 16:47:39 +01:00
Code Issues Projects Releases Wiki Activity

Removed GameType in Constants (useless)

Browse Source
This commit is contained in:
Florian CUNY 2018-07-31 18:19:36 +02:00
parent 2210cdc2e8
commit 84515642bf
3 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/world/bentobox/bentobox/Constants.java
View File

@ -5,13 +5,6 @@ package world.bentobox.bentobox;
* @author tastybento * @author tastybento
*/ */
public class Constants { public class Constants {
// ----------------- Constants -----------------
// Game Type BSKYBLOCK or ACIDISLAND
public enum GameType {
BSKYBLOCK, ACIDISLAND, BOTH
}
public static final GameType GAMETYPE = GameType.BSKYBLOCK;
// The spawn command (Essentials spawn for example) // The spawn command (Essentials spawn for example)
public static final String SPAWNCOMMAND = "spawn"; public static final String SPAWNCOMMAND = "spawn";
} }

6
src/main/java/world/bentobox/bentobox/api/configuration/ConfigEntry.java
View File

@ -5,11 +5,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import world.bentobox.bentobox.Constants.GameType;
/** /**
*
*
* @author Poslovitch, tastybento * @author Poslovitch, tastybento
*/ */
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@ -21,6 +17,4 @@ public @interface ConfigEntry {
boolean overrideOnChange() default false; boolean overrideOnChange() default false;
boolean experimental() default false; boolean experimental() default false;
boolean needsReset() default false; boolean needsReset() default false;
GameType specificTo() default GameType.BOTH;
} }

8
src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabaseHandler.java
View File

@ -28,8 +28,6 @@ import org.bukkit.configuration.MemorySection;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.BentoBox;
import world.bentobox.bentobox.Constants;
import world.bentobox.bentobox.Constants.GameType;
import world.bentobox.bentobox.api.configuration.ConfigComment; import world.bentobox.bentobox.api.configuration.ConfigComment;
import world.bentobox.bentobox.api.configuration.ConfigEntry; import world.bentobox.bentobox.api.configuration.ConfigEntry;
import world.bentobox.bentobox.api.configuration.StoreAt; import world.bentobox.bentobox.api.configuration.StoreAt;
@ -127,9 +125,6 @@ public class FlatFileDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
if (!configEntry.path().isEmpty()) { if (!configEntry.path().isEmpty()) {
storageLocation = configEntry.path(); storageLocation = configEntry.path();
} }
if (!configEntry.specificTo().equals(GameType.BOTH) && !configEntry.specificTo().equals(Constants.GAMETYPE)) {
continue;
}
// TODO: Add handling of other ConfigEntry elements // TODO: Add handling of other ConfigEntry elements
} }
Adapter adapterNotation = field.getAnnotation(Adapter.class); Adapter adapterNotation = field.getAnnotation(Adapter.class);
@ -286,9 +281,6 @@ public class FlatFileDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
ConfigEntry configEntry = field.getAnnotation(ConfigEntry.class); ConfigEntry configEntry = field.getAnnotation(ConfigEntry.class);
// If there is a config path annotation then do something // If there is a config path annotation then do something
if (configEntry != null) { if (configEntry != null) {
if (!configEntry.specificTo().equals(GameType.BOTH) && !configEntry.specificTo().equals(Constants.GAMETYPE)) {
continue;
}
if (!configEntry.path().isEmpty()) { if (!configEntry.path().isEmpty()) {
storageLocation = configEntry.path(); storageLocation = configEntry.path();
} }