-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into fix_commandPlayerChunkLoadingLoginIssue
- Loading branch information
Showing
12 changed files
with
276 additions
and
27 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
29 changes: 29 additions & 0 deletions
29
src/main/java/club/mcams/carpet/commands/suggestionProviders/ListSuggestionProvider.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,29 @@ | ||
| package club.mcams.carpet.commands.suggestionProviders; | ||
|
|
||
| import com.mojang.brigadier.context.CommandContext; | ||
| import com.mojang.brigadier.suggestion.SuggestionProvider; | ||
| import com.mojang.brigadier.suggestion.Suggestions; | ||
| import com.mojang.brigadier.suggestion.SuggestionsBuilder; | ||
|
|
||
| import net.minecraft.server.command.ServerCommandSource; | ||
|
|
||
| import java.util.List; | ||
| import java.util.concurrent.CompletableFuture; | ||
|
|
||
| public class ListSuggestionProvider<E> implements SuggestionProvider<ServerCommandSource> { | ||
| private final List<E> options; | ||
|
|
||
| public ListSuggestionProvider(List<E> options) { | ||
| this.options = options; | ||
| } | ||
|
|
||
| public static ListSuggestionProvider<?> of(List<?> options) { | ||
| return new ListSuggestionProvider<>(options); | ||
| } | ||
|
|
||
| @Override | ||
| public CompletableFuture<Suggestions> getSuggestions(CommandContext<ServerCommandSource> context, SuggestionsBuilder builder) { | ||
| options.forEach(option -> builder.suggest(option.toString())); | ||
| return builder.buildFuture(); | ||
| } | ||
| } |
42 changes: 42 additions & 0 deletions
42
...java/club/mcams/carpet/commands/suggestionProviders/LiteralCommandSuggestionProvider.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,42 @@ | ||
| /* | ||
| * This file is part of the Carpet AMS Addition project, licensed under the | ||
| * GNU Lesser General Public License v3.0 | ||
| * | ||
| * Copyright (C) 2024 A Minecraft Server and contributors | ||
| * | ||
| * Carpet AMS Addition is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Lesser General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * Carpet AMS Addition is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public License | ||
| * along with Carpet AMS Addition. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package club.mcams.carpet.commands.suggestionProviders; | ||
|
|
||
| import com.mojang.brigadier.context.CommandContext; | ||
| import com.mojang.brigadier.suggestion.SuggestionProvider; | ||
| import com.mojang.brigadier.suggestion.Suggestions; | ||
| import com.mojang.brigadier.suggestion.SuggestionsBuilder; | ||
|
|
||
| import net.minecraft.server.command.ServerCommandSource; | ||
|
|
||
| import java.util.concurrent.CompletableFuture; | ||
|
|
||
| public class LiteralCommandSuggestionProvider implements SuggestionProvider<ServerCommandSource> { | ||
| @Override | ||
| public CompletableFuture<Suggestions> getSuggestions(CommandContext<ServerCommandSource> context, SuggestionsBuilder builder) { | ||
| context.getRootNode().getChildren().forEach(node -> { | ||
| if (node != null && node.getName() != null) { | ||
| builder.suggest(node.getName()); | ||
| } | ||
| }); | ||
| return builder.buildFuture(); | ||
| } | ||
| } |
29 changes: 29 additions & 0 deletions
29
src/main/java/club/mcams/carpet/commands/suggestionProviders/SetSuggestionProvider.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,29 @@ | ||
| package club.mcams.carpet.commands.suggestionProviders; | ||
|
|
||
| import com.mojang.brigadier.context.CommandContext; | ||
| import com.mojang.brigadier.suggestion.SuggestionProvider; | ||
| import com.mojang.brigadier.suggestion.Suggestions; | ||
| import com.mojang.brigadier.suggestion.SuggestionsBuilder; | ||
|
|
||
| import net.minecraft.server.command.ServerCommandSource; | ||
|
|
||
| import java.util.Set; | ||
| import java.util.concurrent.CompletableFuture; | ||
|
|
||
| public class SetSuggestionProvider<E> implements SuggestionProvider<ServerCommandSource> { | ||
| private final Set<E> options; | ||
|
|
||
| public SetSuggestionProvider(Set<E> options) { | ||
| this.options = options; | ||
| } | ||
|
|
||
| public static SetSuggestionProvider<?> of(Set<?> options) { | ||
| return new SetSuggestionProvider<>(options); | ||
| } | ||
|
|
||
| @Override | ||
| public CompletableFuture<Suggestions> getSuggestions(CommandContext<ServerCommandSource> context, SuggestionsBuilder builder) { | ||
| options.forEach(option -> builder.suggest(option.toString())); | ||
| return builder.buildFuture(); | ||
| } | ||
| } |
31 changes: 31 additions & 0 deletions
31
src/main/java/club/mcams/carpet/mixin/carpet/CarpetServerMixin.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,31 @@ | ||
| /* | ||
| * This file is part of the Carpet AMS Addition project, licensed under the | ||
| * GNU Lesser General Public License v3.0 | ||
| * | ||
| * Copyright (C) 2024 A Minecraft Server and contributors | ||
| * | ||
| * Carpet AMS Addition is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Lesser General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * Carpet AMS Addition is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public License | ||
| * along with Carpet AMS Addition. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package club.mcams.carpet.mixin.carpet; | ||
|
|
||
| import club.mcams.carpet.utils.compat.DummyClass; | ||
|
|
||
| import org.spongepowered.asm.mixin.Mixin; | ||
|
|
||
| import top.byteeeee.annotationtoolbox.annotation.GameVersion; | ||
|
|
||
| @GameVersion(version = "Minecraft >= 1.19.4", desc = "Just a fix for https://github.com/gnembon/fabric-carpet/issues/1908") | ||
| @Mixin(DummyClass.class) | ||
| public class CarpetServerMixin {} |
35 changes: 35 additions & 0 deletions
35
.../club/mcams/carpet/mixin/rule/commandCustomCommandPermissionLevel/CommandNodeInvoker.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,35 @@ | ||
| /* | ||
| * This file is part of the Carpet AMS Addition project, licensed under the | ||
| * GNU Lesser General Public License v3.0 | ||
| * | ||
| * Copyright (C) 2024 A Minecraft Server and contributors | ||
| * | ||
| * Carpet AMS Addition is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Lesser General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * Carpet AMS Addition is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public License | ||
| * along with Carpet AMS Addition. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package club.mcams.carpet.mixin.rule.commandCustomCommandPermissionLevel; | ||
|
|
||
| import com.mojang.brigadier.tree.CommandNode; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Mutable; | ||
| import org.spongepowered.asm.mixin.gen.Accessor; | ||
|
|
||
| import java.util.function.Predicate; | ||
|
|
||
| @Mixin(value = CommandNode.class, remap = false) | ||
| public interface CommandNodeInvoker<S> { | ||
| @Mutable | ||
| @Accessor("requirement") | ||
| void setRequirement(Predicate<S> requirement); | ||
| } |
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
Oops, something went wrong.