Merge pull request #3294 from Multiverse/fix/removed-property

Add warning on removed animals and monsters world properties

Author: benwoo1110

src/main/java/org/mvplugins/multiverse/core/commands/ModifyCommand.java

@@ -23,12 +23,19 @@
 import org.mvplugins.multiverse.core.world.MultiverseWorld;
 import org.mvplugins.multiverse.core.world.WorldManager;
 
+import java.util.Map;
+
 import static org.mvplugins.multiverse.core.locale.message.MessageReplacement.*;
 import static org.mvplugins.multiverse.core.locale.message.MessageReplacement.replace;
 
 @Service
 class ModifyCommand extends CoreCommand {
 
+    private static final Map<String, String> REMOVED_PROPERTIES = Map.of(
+            "animals", "/mv entity-spawn-config modify [world] animal set spawn <true|false>",
+            "monsters", "/mv entity-spawn-config modify [world] monster set spawn <true|false>"
+        );
+
     private final WorldManager worldManager;
 
     @Inject
@@ -65,6 +72,13 @@ void onModifyCommand(// SUPPRESS CHECKSTYLE: ParameterNumber
             @Syntax("[value]")
             @Description("{@@mv-core.modify.value.description}")
             @Nullable String propertyValue) {
+        if (REMOVED_PROPERTIES.containsKey(propertyName)) {
+            issuer.sendMessage(MVCorei18n.MODIFY_PROPERTYREMOVED,
+                    replace("{property}").with(propertyName),
+                    replace("{replacement}").with(REMOVED_PROPERTIES.get(propertyName)));
+            return;
+        }
+
         MultiverseWorld world = worldValue.value();
 
         if (action.isRequireValue() && propertyValue == null) {

src/main/java/org/mvplugins/multiverse/core/locale/MVCorei18n.java

@@ -151,6 +151,7 @@ public enum MVCorei18n implements MessageKeyProvider {
     MODIFY_WORLD_DESCRIPTION,
     MODIFY_PROPERTY_DESCRIPTION,
     MODIFY_VALUE_DESCRIPTION,
+    MODIFY_PROPERTYREMOVED,
     MODIFY_CANNOTHAVEVALUE,
     MODIFY_SPECIFYVALUE,
     MODIFY_SUCCESS,

src/main/resources/multiverse-core_en.properties

@@ -132,6 +132,7 @@ mv-core.modify.description=Modifies a world property of a given world.
 mv-core.modify.world.description=Name of world you want to modify.
 mv-core.modify.property.description=Property you want to modify.
 mv-core.modify.value.description=Value of property.
+mv-core.modify.propertyremoved=&cYou cannot modify '&3{property}&c' because it has been changed or removed. Please use '&a{replacement}&c' instead.
 mv-core.modify.cannothavevalue=You cannot specify a value to {action} '{property}'.
 mv-core.modify.specifyvalue=You must specify a value to {action} '{property}'.
 mv-core.modify.success=&aSuccessfully {action} '&9{property}&a' to '&9{value}&a' in world &9{world}&a.