fix: portal command config reading

sekwah41 · Nov 18, 2024 · 22cda5d · 22cda5d
1 parent fd2483c
commit 22cda5d
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 9 deletions.
diff --git a/core/src/main/java/com/sekwah/advancedportals/core/CoreListeners.java b/core/src/main/java/com/sekwah/advancedportals/core/CoreListeners.java
@@ -66,6 +66,9 @@ public void playerMove(PlayerContainer player, PlayerLocation toLoc) {
     public boolean blockBreak(PlayerContainer player, BlockLocation blockPos,
                               String blockMaterial, String itemInHandMaterial,
                               String itemInHandName) {
+        if (!configRepository.getPortalProtection())
+            return true;
+
         if (player == null) {
             return !portalServices.inPortalRegionProtected(blockPos);
         }

diff --git a/core/src/main/java/com/sekwah/advancedportals/core/repository/ConfigRepository.java b/core/src/main/java/com/sekwah/advancedportals/core/repository/ConfigRepository.java
@@ -37,4 +37,8 @@ public interface ConfigRepository {
     boolean getDisablePhysicsEvents();
 
     CommandPortalConfig getCommandPortals();
+
+    String getWarpSound();
+
+    String getWarpParticles();
 }
diff --git a/core/src/main/java/com/sekwah/advancedportals/core/repository/impl/ConfigRepositoryImpl.java b/core/src/main/java/com/sekwah/advancedportals/core/repository/impl/ConfigRepositoryImpl.java
@@ -85,6 +85,16 @@ public double getThrowbackStrength() {
         return this.config.throwbackStrength;
     }
 
+    @Override
+    public String getWarpSound() {
+        return this.config.warpSound;
+    }
+
+    @Override
+    public String getWarpParticles() {
+        return this.config.warpParticles;
+    }
+
     @Override
     public void loadConfig(DataStorage dataStorage) {
         this.dataStorage = dataStorage;

diff --git a/core/src/main/java/com/sekwah/advancedportals/core/serializeddata/ReflectiveConstructor.java b/core/src/main/java/com/sekwah/advancedportals/core/serializeddata/ReflectiveConstructor.java
@@ -193,6 +193,7 @@ private Map<String, Object> mapMappingNode(Class<?> currentClass,
      */
     private void setField(Object instance, Field field, Object value)
         throws IllegalAccessException {
+
         // Check for numeric type compatibility and cast if necessary
         if (field.getType() == float.class &&value instanceof Double) {
             value = ((Double) value).floatValue();

diff --git a/.../main/java/com/sekwah/advancedportals/core/serializeddata/config/CommandPortalConfig.java b/.../main/java/com/sekwah/advancedportals/core/serializeddata/config/CommandPortalConfig.java
@@ -1,8 +1,8 @@
 package com.sekwah.advancedportals.core.serializeddata.config;
 
 public class CommandPortalConfig {
-    public final boolean op = true;
-    public final boolean console = true;
-
-    public final boolean permsWildcard = true;
+    public boolean op = true;
+    public boolean console = true;
+    public boolean permsWildcard = true;
+    public boolean enabled = true;
 }
diff --git a/core/src/main/java/com/sekwah/advancedportals/core/tags/activation/CommandTag.java b/core/src/main/java/com/sekwah/advancedportals/core/tags/activation/CommandTag.java
@@ -49,12 +49,7 @@ public boolean preActivated(TagTarget target, PlayerContainer player,
                                 ActivationData activeData, String[] argData) {
         return true;
     }
-    // TODO: Check if its worth autocompleting an existing command in the
-    // command tag by
-    //                           grabbing all commands in the server
 
-    // TODO: Add a warning in console if op/* command is used and tell them to
-    // use console instead
     @Override
     public void postActivated(TagTarget target, PlayerContainer player,
                               ActivationData activationData, String[] argData) {
@@ -101,24 +96,41 @@ public boolean activated(TagTarget target, PlayerContainer player,
     public boolean created(TagTarget target, PlayerContainer player,
                            String[] argData) {
         if (argData != null) {
+            var commandPortals = configRepository.getCommandPortals();
+            if(!commandPortals.enabled) {
+                player.sendMessage(Lang.translate("tag.command.disabled"));
+                return false;
+            }
             for (String command : argData) {
                 char executionCommand = command.charAt(0);
                 return switch (executionCommand) {
                     case '!' -> {
+                        if (!commandPortals.op) {
+                            player.sendMessage(Lang.translate("tag.command.op.disabled"));
+                            yield false;
+                        }
                         if (!player.hasPermission("advancedportals.createportal.commandlevel.op")) {
                             player.sendMessage(Lang.translateInsertVariables("tag.command.nopermission", "OP"));
                             yield false;
                         }
                         yield true;
                     }
                     case '#' -> {
+                        if (!commandPortals.console) {
+                            player.sendMessage(Lang.translate("tag.command.console.disabled"));
+                            yield false;
+                        }
                         if (!player.hasPermission("advancedportals.createportal.commandlevel.console")) {
                             player.sendMessage(Lang.translateInsertVariables("tag.command.nopermission","Console"));
                             yield false;
                         }
                         yield true;
                     }
                     case '^' -> {
+                        if (!commandPortals.permsWildcard) {
+                            player.sendMessage(Lang.translate("tag.command.permswildcard.disabled"));
+                            yield false;
+                        }
                         if (!player.hasPermission("advancedportals.createportal.commandlevel.permswild")) {
                             player.sendMessage(Lang.translateInsertVariables("tag.command.nopermission", "*"));
                             yield false;