-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
8 changed files
with
190 additions
and
120 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| plugins { | ||
| id("conventions.base") | ||
| id("conventions.publishing") | ||
| id("xyz.jpenilla.quiet-architectury-loom") | ||
| } | ||
|
|
||
| dependencies { | ||
| minecraft(libs.minecraft) | ||
| mappings(loom.officialMojangMappings()) | ||
| compileOnly(libs.fabricLoader) | ||
|
|
||
| compileOnly(platform(libs.cloud.bom)) | ||
| compileOnly(libs.cloud.core) | ||
| } | ||
|
|
||
| tasks.jar { | ||
| manifest { | ||
| attributes("Fabric-Loom-Remap" to true) | ||
| } | ||
| } |
130 changes: 130 additions & 0 deletions
130
...mon/src/main/java/cloud/commandframework/minecraft/modded/ClientPredicatePermissions.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| // | ||
| // MIT License | ||
| // | ||
| // Copyright (c) 2024 Incendo | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files (the "Software"), to deal | ||
| // in the Software without restriction, including without limitation the rights | ||
| // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| // copies of the Software, and to permit persons to whom the Software is | ||
| // furnished to do so, subject to the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in all | ||
| // copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| // SOFTWARE. | ||
| // | ||
| package cloud.commandframework.minecraft.modded; | ||
|
|
||
| import cloud.commandframework.keys.CloudKey; | ||
| import cloud.commandframework.permission.PredicatePermission; | ||
| import net.minecraft.client.Minecraft; | ||
| import org.checkerframework.checker.nullness.qual.NonNull; | ||
|
|
||
| public final class ClientPredicatePermissions { | ||
| private ClientPredicatePermissions() { | ||
| } | ||
|
|
||
| /** | ||
| * Get a permission predicate which passes when the integrated server is running. | ||
| * | ||
| * @param <C> sender type | ||
| * @return a predicate permission | ||
| * @since 1.5.0 | ||
| */ | ||
| public static <C> @NonNull PredicatePermission<C> integratedServerRunning() { | ||
| return PredicatePermission.of( | ||
| CloudKey.of("integrated-server-running"), | ||
| sender -> Minecraft.getInstance().hasSingleplayerServer() | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Get a permission predicate which passes when the integrated server is not running. | ||
| * | ||
| * @param <C> sender type | ||
| * @return a predicate permission | ||
| * @since 1.5.0 | ||
| */ | ||
| public static <C> @NonNull PredicatePermission<C> integratedServerNotRunning() { | ||
| return PredicatePermission.of( | ||
| CloudKey.of("integrated-server-not-running"), | ||
| sender -> !Minecraft.getInstance().hasSingleplayerServer() | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Get a permission predicate which passes when cheats are enabled on the currently running integrated server. | ||
| * | ||
| * <p>This predicate will always pass if there is no integrated server running, i.e. when connected to a multiplayer server.</p> | ||
| * | ||
| * @param <C> sender type | ||
| * @return a predicate permission | ||
| * @since 1.5.0 | ||
| */ | ||
| public static <C> @NonNull PredicatePermission<C> cheatsAllowed() { | ||
| return cheatsAllowed(true); | ||
| } | ||
|
|
||
| /** | ||
| * Get a permission predicate which passes when cheats are enabled on the currently running integrated server. | ||
| * | ||
| * <p>When there is no integrated server running, i.e. when connected to a multiplayer server, the predicate will | ||
| * fall back to the provided boolean argument.</p> | ||
| * | ||
| * @param allowOnMultiplayer whether the predicate should pass on multiplayer servers | ||
| * @param <C> sender type | ||
| * @return a predicate permission | ||
| * @since 1.5.0 | ||
| */ | ||
| public static <C> @NonNull PredicatePermission<C> cheatsAllowed(final boolean allowOnMultiplayer) { | ||
| return PredicatePermission.of(CloudKey.of("cheats-allowed"), sender -> { | ||
| if (!Minecraft.getInstance().hasSingleplayerServer()) { | ||
| return allowOnMultiplayer; | ||
| } | ||
| return Minecraft.getInstance().getSingleplayerServer().getPlayerList().isAllowCheatsForAllPlayers() | ||
| || Minecraft.getInstance().getSingleplayerServer().getWorldData().getAllowCommands(); | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * Get a permission predicate which passes when cheats are disabled on the currently running integrated server. | ||
| * | ||
| * <p>This predicate will always pass if there is no integrated server running, i.e. when connected to a multiplayer server.</p> | ||
| * | ||
| * @param <C> sender type | ||
| * @return a predicate permission | ||
| * @since 1.5.0 | ||
| */ | ||
| public static <C> @NonNull PredicatePermission<C> cheatsDisallowed() { | ||
| return cheatsDisallowed(true); | ||
| } | ||
|
|
||
| /** | ||
| * Get a permission predicate which passes when cheats are disabled on the currently running integrated server. | ||
| * | ||
| * <p>When there is no integrated server running, i.e. when connected to a multiplayer server, the predicate will | ||
| * fall back to the provided boolean argument.</p> | ||
| * | ||
| * @param allowOnMultiplayer whether the predicate should pass on multiplayer servers | ||
| * @param <C> sender type | ||
| * @return a predicate permission | ||
| * @since 1.5.0 | ||
| */ | ||
| public static <C> @NonNull PredicatePermission<C> cheatsDisallowed(final boolean allowOnMultiplayer) { | ||
| return PredicatePermission.of(CloudKey.of("cheats-disallowed"), sender -> { | ||
| if (!Minecraft.getInstance().hasSingleplayerServer()) { | ||
| return allowOnMultiplayer; | ||
| } | ||
| return !Minecraft.getInstance().getSingleplayerServer().getPlayerList().isAllowCheatsForAllPlayers() | ||
| && !Minecraft.getInstance().getSingleplayerServer().getWorldData().getAllowCommands(); | ||
| }); | ||
| } | ||
| } |
4 changes: 4 additions & 0 deletions
4
...aft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/package-info.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| /** | ||
| * Shared classes for modded Minecraft Cloud implementations. | ||
| */ | ||
| package cloud.commandframework.minecraft.modded; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.