diff --git a/src/main/java/com/cjburkey/claimchunk/ClaimChunk.java b/src/main/java/com/cjburkey/claimchunk/ClaimChunk.java index 7b038c8..3854980 100644 --- a/src/main/java/com/cjburkey/claimchunk/ClaimChunk.java +++ b/src/main/java/com/cjburkey/claimchunk/ClaimChunk.java @@ -1,7 +1,5 @@ package com.cjburkey.claimchunk; -import com.cjburkey.claimchunk.access.CCInteractClasses; -import com.cjburkey.claimchunk.access.CCPermFlags; import com.cjburkey.claimchunk.api.IClaimChunkPlugin; import com.cjburkey.claimchunk.api.layer.ClaimChunkLayerHandler; import com.cjburkey.claimchunk.chunk.*; @@ -11,6 +9,8 @@ import com.cjburkey.claimchunk.data.newdata.*; import com.cjburkey.claimchunk.data.sqlite.SqLiteDataHandler; import com.cjburkey.claimchunk.event.*; +import com.cjburkey.claimchunk.flag.CCInteractClasses; +import com.cjburkey.claimchunk.flag.CCPermFlags; import com.cjburkey.claimchunk.gui.CCGuiHandler; import com.cjburkey.claimchunk.i18n.V2JsonMessages; import com.cjburkey.claimchunk.layer.PlaceholderInitLayer; diff --git a/src/main/java/com/cjburkey/claimchunk/access/CCFlags.java b/src/main/java/com/cjburkey/claimchunk/flag/CCFlags.java similarity index 97% rename from src/main/java/com/cjburkey/claimchunk/access/CCFlags.java rename to src/main/java/com/cjburkey/claimchunk/flag/CCFlags.java index bb5e95b..0958ea5 100644 --- a/src/main/java/com/cjburkey/claimchunk/access/CCFlags.java +++ b/src/main/java/com/cjburkey/claimchunk/flag/CCFlags.java @@ -1,4 +1,4 @@ -package com.cjburkey.claimchunk.access; +package com.cjburkey.claimchunk.flag; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/cjburkey/claimchunk/access/CCInteractClasses.java b/src/main/java/com/cjburkey/claimchunk/flag/CCInteractClasses.java similarity index 99% rename from src/main/java/com/cjburkey/claimchunk/access/CCInteractClasses.java rename to src/main/java/com/cjburkey/claimchunk/flag/CCInteractClasses.java index 0ae6012..138eced 100644 --- a/src/main/java/com/cjburkey/claimchunk/access/CCInteractClasses.java +++ b/src/main/java/com/cjburkey/claimchunk/flag/CCInteractClasses.java @@ -1,4 +1,4 @@ -package com.cjburkey.claimchunk.access; +package com.cjburkey.claimchunk.flag; import com.cjburkey.claimchunk.config.ClaimChunkWorldProfileHandler; diff --git a/src/main/java/com/cjburkey/claimchunk/access/CCPermFlags.java b/src/main/java/com/cjburkey/claimchunk/flag/CCPermFlags.java similarity index 99% rename from src/main/java/com/cjburkey/claimchunk/access/CCPermFlags.java rename to src/main/java/com/cjburkey/claimchunk/flag/CCPermFlags.java index 3eecc33..d585b60 100644 --- a/src/main/java/com/cjburkey/claimchunk/access/CCPermFlags.java +++ b/src/main/java/com/cjburkey/claimchunk/flag/CCPermFlags.java @@ -1,4 +1,4 @@ -package com.cjburkey.claimchunk.access; +package com.cjburkey.claimchunk.flag; import com.cjburkey.claimchunk.ClaimChunk; import com.cjburkey.claimchunk.Utils; diff --git a/src/main/java/com/cjburkey/claimchunk/smartcommand/CCSubCommand.java b/src/main/java/com/cjburkey/claimchunk/smartcommand/CCSubCommand.java index 7f93cfe..880d76d 100644 --- a/src/main/java/com/cjburkey/claimchunk/smartcommand/CCSubCommand.java +++ b/src/main/java/com/cjburkey/claimchunk/smartcommand/CCSubCommand.java @@ -28,11 +28,11 @@ public abstract class CCSubCommand extends SmartSubCommand implements TabComplet // allow multiple permissions here too public CCSubCommand( @NotNull ClaimChunk claimChunk, - @NotNull Executor executorLevel, + @NotNull Executor executor, boolean isDefault, String... permissionChildren) { super( - executorLevel, + executor, (claimChunk.getConfigHandler().getDisablePermissions() && isDefault) ? new String[0] : Arrays.stream(permissionChildren) diff --git a/src/main/java/com/cjburkey/claimchunk/smartcommand/ClaimChunkBaseCommand.java b/src/main/java/com/cjburkey/claimchunk/smartcommand/ClaimChunkBaseCommand.java index 8fdc478..ba87350 100644 --- a/src/main/java/com/cjburkey/claimchunk/smartcommand/ClaimChunkBaseCommand.java +++ b/src/main/java/com/cjburkey/claimchunk/smartcommand/ClaimChunkBaseCommand.java @@ -43,12 +43,14 @@ public ClaimChunkBaseCommand(ClaimChunk claimChunk) { // Player commands registerCmds( + // TODO: // `/chunk access` new CommandStr(new AccessCmd(claimChunk), "access"), // `/chunk checkaccess` new CommandStr(new CheckAccessCmd(claimChunk), "checkaccess"), // `/chunk revokeaccess` new CommandStr(new RevokeAccessCmd(claimChunk), "revokeaccess"), + // `/chunk alert` new CommandStr(new AlertCmd(claimChunk), "alert"), // `/chunk auto` diff --git a/src/main/java/com/cjburkey/claimchunk/smartcommand/sub/ply/flags/CmdAddPermFlag.java b/src/main/java/com/cjburkey/claimchunk/smartcommand/sub/ply/flags/CmdAddPermFlag.java new file mode 100644 index 0000000..c48233c --- /dev/null +++ b/src/main/java/com/cjburkey/claimchunk/smartcommand/sub/ply/flags/CmdAddPermFlag.java @@ -0,0 +1,18 @@ +package com.cjburkey.claimchunk.smartcommand.sub.ply.flags; + +import claimchunk.dependency.de.goldmensch.commanddispatcher.Executor; + +import com.cjburkey.claimchunk.ClaimChunk; +import com.cjburkey.claimchunk.smartcommand.CCSubCommand; + +import org.jetbrains.annotations.NotNull; + +public abstract class CmdAddPermFlag extends CCSubCommand { + + public CmdAddPermFlag(@NotNull ClaimChunk claimChunk) { + super(claimChunk, Executor.PLAYER, true, "player", "access"); + } + + // TODO: MAKE GENERAL FORM AND 4 IMPLEMENTORS + +} diff --git a/src/test/java/com/cjburkey/claimchunk/InteractClassTests.java b/src/test/java/com/cjburkey/claimchunk/InteractClassTests.java index ff498ce..3f6b048 100644 --- a/src/test/java/com/cjburkey/claimchunk/InteractClassTests.java +++ b/src/test/java/com/cjburkey/claimchunk/InteractClassTests.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import com.cjburkey.claimchunk.access.CCInteractClasses; +import com.cjburkey.claimchunk.flag.CCInteractClasses; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.EntityType; diff --git a/src/test/java/com/cjburkey/claimchunk/PermFlagTests.java b/src/test/java/com/cjburkey/claimchunk/PermFlagTests.java index d23445e..c35184b 100644 --- a/src/test/java/com/cjburkey/claimchunk/PermFlagTests.java +++ b/src/test/java/com/cjburkey/claimchunk/PermFlagTests.java @@ -2,9 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import com.cjburkey.claimchunk.access.CCFlags; -import com.cjburkey.claimchunk.access.CCInteractClasses; -import com.cjburkey.claimchunk.access.CCPermFlags; +import com.cjburkey.claimchunk.flag.CCFlags; +import com.cjburkey.claimchunk.flag.CCInteractClasses; +import com.cjburkey.claimchunk.flag.CCPermFlags; import org.bukkit.configuration.file.YamlConfiguration; import org.junit.jupiter.api.Test;