diff --git a/src/main/java/com/seibel/lod/core/config/ConfigAnnotations.java b/src/main/java/com/seibel/lod/core/config/ConfigAnnotations.java deleted file mode 100644 index b05ed6dc1..000000000 --- a/src/main/java/com/seibel/lod/core/config/ConfigAnnotations.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), - * licensed under the GNU LGPL v3 License. - * - * Copyright (C) 2020-2022 James Seibel - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.seibel.lod.core.config; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Will be removed soon so please keep this out - * - * @author coolGi - * @version 02-07-2022 - */ -@Deprecated -public class ConfigAnnotations { - /** For making categories */ - @Deprecated - @Retention(RetentionPolicy.RUNTIME) - @Target(ElementType.FIELD) - /** Use com.seibel.lod.core.config.types.ConfigCategory instead of this */ - public @interface Category {} - - - /** - * Makes text (looks like normal entry but doesn't save and has no button) - * - * Accepts string and the text is the value - */ - @Deprecated - @Retention(RetentionPolicy.RUNTIME) - @Target(ElementType.FIELD) - public @interface Comment {} - - /** - * Adds a comment to the file, - * This should only be used in special cases where comments from an entry cant reach - * - * Accepts string and the text is the value - */ - @Deprecated - @Retention(RetentionPolicy.RUNTIME) - @Target(ElementType.FIELD) - public @interface FileComment {} -} diff --git a/src/main/java/com/seibel/lod/core/config/types/AbstractConfigType.java b/src/main/java/com/seibel/lod/core/config/types/AbstractConfigType.java index ad87c83c1..669ad0aa7 100644 --- a/src/main/java/com/seibel/lod/core/config/types/AbstractConfigType.java +++ b/src/main/java/com/seibel/lod/core/config/types/AbstractConfigType.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.config.types; -import com.seibel.lod.core.config.ConfigEntryAppearance; +import com.seibel.lod.core.config.types.ConfigEntryAppearance; /** * The class where all config options should extend diff --git a/src/main/java/com/seibel/lod/core/config/types/ConfigCategory.java b/src/main/java/com/seibel/lod/core/config/types/ConfigCategory.java index 7d29bf497..0ab4bda3f 100644 --- a/src/main/java/com/seibel/lod/core/config/types/ConfigCategory.java +++ b/src/main/java/com/seibel/lod/core/config/types/ConfigCategory.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.config.types; -import com.seibel.lod.core.config.ConfigEntryAppearance; +import com.seibel.lod.core.config.types.ConfigEntryAppearance; public class ConfigCategory extends AbstractConfigType { public String destination; // Where the category goes to diff --git a/src/main/java/com/seibel/lod/core/config/types/ConfigEntry.java b/src/main/java/com/seibel/lod/core/config/types/ConfigEntry.java index 5a8f09f6d..e798b4155 100644 --- a/src/main/java/com/seibel/lod/core/config/types/ConfigEntry.java +++ b/src/main/java/com/seibel/lod/core/config/types/ConfigEntry.java @@ -1,7 +1,7 @@ package com.seibel.lod.core.config.types; import com.seibel.lod.core.config.ConfigBase; -import com.seibel.lod.core.config.ConfigEntryAppearance; +import com.seibel.lod.core.config.types.ConfigEntryAppearance; import com.seibel.lod.core.config.file.ConfigFileHandling; /** diff --git a/src/main/java/com/seibel/lod/core/config/ConfigEntryAppearance.java b/src/main/java/com/seibel/lod/core/config/types/ConfigEntryAppearance.java similarity index 91% rename from src/main/java/com/seibel/lod/core/config/ConfigEntryAppearance.java rename to src/main/java/com/seibel/lod/core/config/types/ConfigEntryAppearance.java index dfd24db99..dc76d6f7c 100644 --- a/src/main/java/com/seibel/lod/core/config/ConfigEntryAppearance.java +++ b/src/main/java/com/seibel/lod/core/config/types/ConfigEntryAppearance.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.config; +package com.seibel.lod.core.config.types; public enum ConfigEntryAppearance { ALL(true, true),