diff --git a/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java b/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java index bd85e375..d8f64e97 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java +++ b/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java @@ -605,29 +605,6 @@ public class MVWorld implements MultiverseWorld { return null; } - /** - * {@inheritDoc} - * - * @deprecated This is deprecated. - */ - @Override - @Deprecated - public com.onarandombox.MultiverseCore.configuration.MVConfigProperty getProperty(String property, - Class expected) throws PropertyDoesNotExistException { - throw new UnsupportedOperationException("'MVConfigProperty getProperty(String,Class)' is no longer supported!"); - } - - /** - * {@inheritDoc} - * - * @deprecated This is deprecated. - */ - @Override - @Deprecated - public boolean setProperty(String name, String value, CommandSender sender) throws PropertyDoesNotExistException { - return this.setPropertyValue(name, value); - } - /** * {@inheritDoc} */ diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/MultiverseWorld.java b/src/main/java/com/onarandombox/MultiverseCore/api/MultiverseWorld.java index 3561f49e..1788cde8 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/api/MultiverseWorld.java +++ b/src/main/java/com/onarandombox/MultiverseCore/api/MultiverseWorld.java @@ -155,37 +155,6 @@ public interface MultiverseWorld { */ boolean setPropertyValue(String property, String value) throws PropertyDoesNotExistException; - /** - * Gets the actual MVConfigProperty from this world. - * It will throw a PropertyDoesNotExistException if the property is not found. - * - * @param property The name of a world property to get. - * @param expected The type of the expected property. Use Object.class if this doesn't matter for you. - * @param The type of the expected property. - * - * @return A valid MVWorldProperty. - * - * @throws PropertyDoesNotExistException Thrown if the property was not found in the world. - * @deprecated We don't use {@link com.onarandombox.MultiverseCore.configuration.MVConfigProperty} any longer! - */ - @Deprecated - com.onarandombox.MultiverseCore.configuration.MVConfigProperty getProperty(String property, Class expected) throws PropertyDoesNotExistException; - - // old config - /** - * Adds the property to the given value. - * It will throw a PropertyDoesNotExistException if the property is not found. - * - * @param property The name of a world property to set. - * @param value A value in string representation, it will be parsed to the correct type. - * @param sender The sender who wants this value to be set. - * @return True if the value was set, false if not. - * @throws PropertyDoesNotExistException Thrown if the property was not found in the world. - * @deprecated Use {@link #setPropertyValue(String, String)} instead. - */ - @Deprecated - boolean setProperty(String property, String value, CommandSender sender) throws PropertyDoesNotExistException; - /** * Adds a value to the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}. * diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/MVActiveConfigProperty.java b/src/main/java/com/onarandombox/MultiverseCore/configuration/MVActiveConfigProperty.java deleted file mode 100644 index 403d0026..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/MVActiveConfigProperty.java +++ /dev/null @@ -1,37 +0,0 @@ -/****************************************************************************** - * Multiverse 2 Copyright (c) the Multiverse Team 2012. * - * Multiverse 2 is licensed under the BSD License. * - * For more information please check the README.md file included * - * with this project. * - ******************************************************************************/ - -package com.onarandombox.MultiverseCore.configuration; - -/** - * An "active" {@link MVConfigProperty} that uses the specified method to be "actually" set. - * @param The type of the config-property. - * @deprecated This is deprecated. - * @see MVConfigProperty - */ -@Deprecated -public interface MVActiveConfigProperty extends MVConfigProperty { - /** - * Gets the method that will be executed. - * - * @return The name of the method in MVWorld to be called. - */ - String getMethod(); - - /** - * Sets the method that will be executed. - * - * @param methodName The name of the method in MVWorld to be called. - */ - void setMethod(String methodName); - - /** - * Returns the class of the object we're looking at. - * @return the class of the object we're looking at. - */ - Class getPropertyClass(); -} diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/MVConfigProperty.java b/src/main/java/com/onarandombox/MultiverseCore/configuration/MVConfigProperty.java deleted file mode 100644 index 537a46b5..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/MVConfigProperty.java +++ /dev/null @@ -1,69 +0,0 @@ -/****************************************************************************** - * Multiverse 2 Copyright (c) the Multiverse Team 2011. * - * Multiverse 2 is licensed under the BSD License. * - * For more information please check the README.md file included * - * with this project. * - ******************************************************************************/ - -package com.onarandombox.MultiverseCore.configuration; - -/** - * A generic config-property. - * - * @param The type of the config-property. - * @deprecated This is deprecated. - */ -@Deprecated -public interface MVConfigProperty { - /** - * Gets the name of this property. - * - * @return The name of this property. - */ - String getName(); - - /** - * Gets the value of this property. - * - * @return The value of this property. - */ - T getValue(); - - /** - * Gets the string representation of this value. - * - * @return The value of this property as a string. - */ - String toString(); - - /** - * Gets the help string for this. - * - * @return The value of this property as a string. - */ - String getHelp(); - - /** - * Sets the value of this property. - * - * @param value The T representation of this value. - * @return True the value was successfully set. - */ - boolean setValue(T value); - - /** - * This parseValue should be used with strings. - * - * @param value The string representation of the value to set. - * - * @return True if the value was set, false if not. - */ - boolean parseValue(String value); - - /** - * Gets the name of the config-node that this {@link MVConfigProperty} is saved as. - * - * @return The name of the config-node that this {@link MVConfigProperty} is saved as. - */ - String getConfigNode(); -}