Update/fix Fabric Permission API support

Author: Patbox

README.md

@@ -20,11 +20,11 @@ If you have any questions, you can ask them on my [Discord](https://pb4.eu/disco
 
 
 ## Commands (and permissions):
-- `/styledchat` - Main command (`styledchat.main`, available by default)
-- `/styledchat reload` - Reloads configuration and styles (requires `styledchat.reload`)
-- `/styledchat set <player> <type> <value>` - Changes personal <player>'s style of <type> to <value> (requires `styledchat.set`)
-- `/styledchat get <player> <type>` - Sends <player>'s style of <type>  (requires `styledchat.get`)
-- `/styledchat clear <player> <type>` - Clears <player>'s style of <type> (requires `styledchat.clear`)
+- `/styledchat` - Main command (`styledchat:main`, available by default)
+- `/styledchat reload` - Reloads configuration and styles (requires `styledchat:reload`)
+- `/styledchat set <player> <type> <value>` - Changes personal <player>'s style of <type> to <value> (requires `styledchat:set`)
+- `/styledchat get <player> <type>` - Sends <player>'s style of <type>  (requires `styledchat:get`)
+- `/styledchat clear <player> <type>` - Clears <player>'s style of <type> (requires `styledchat:clear`)
 
 ## Configuration:
 You can find config file in `./config/styled-chat.json`.
@@ -174,7 +174,7 @@ Additionally, every message type has few own local variables.
 ```
 
 ## In chat formatting
-If player has a required permissions (`styledchat.format.[tag_name]`, where `[tagname]` is Text Parser tag), then they can use Simplified Text tags from within their chat.
+If player has a required permissions (`styledchat:format/[tag_name]`, where `[tagname]` is Text Parser tag), then they can use Simplified Text tags from within their chat.
 Additionally, you can enable markdown and legacy (&X) formatting in the config
 
 

build.gradle

@@ -40,10 +40,10 @@ dependencies {
 	//modCompileOnly fabricApi.module("fabric-api-base", project.fabric_version)
 	//modLocalRuntime fabricApi.module("fabric-api-base", project.fabric_version)
 
-	implementation include("eu.pb4:predicate-api:0.8.1+26.1")
-	implementation include("eu.pb4:placeholder-api:3.0.0-beta.2+26.1")
-	implementation include("eu.pb4:player-data-api:0.10.0+26.1")
-	implementation include("me.lucko:fabric-permissions-api:0.7.0")
+	implementation include("eu.pb4:predicate-api:0.8.2+26.1")
+	implementation include("eu.pb4:placeholder-api:3.0.0+26.1")
+	implementation include("eu.pb4:player-data-api:0.10.1+26.1")
+	compileOnly "me.lucko:fabric-permissions-api:0.7.0"
 
 	//compileOnly("maven.modrinth:vanish:1.5.2+1.20.4")
 	//modLocalRuntime("fr.catcore:server-translations-api:1.4.17+1.19.2")
@@ -54,10 +54,6 @@ dependencies {
 }
 
 loom {
-	enableTransitiveAccessWideners = false
-	interfaceInjection {
-		enableDependencyInterfaceInjection = false
-	}
 	accessWidenerPath = file("src/main/resources/styledchat.accesswidener")
 }
 

gradle.properties

@@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-minecraft_version=26.1
+minecraft_version=26.1.2
 loader_version=0.18.4
 loom_version=1.15-SNAPSHOT
 
 # Fabric API
-fabric_api_version=0.144.0+26.1
+fabric_api_version=0.149.1+26.1.2
 
 # Mod Properties
-mod_version = 2.12.0-pre.1+26.1
+mod_version = 2.12.0+26.1.2
 maven_group = eu.pb4
 archives_base_name = styled-chat
 

src/main/java/eu/pb4/styledchat/StyledChatUtils.java

@@ -19,11 +19,10 @@
 import eu.pb4.styledchat.config.data.VersionedChatStyleData;
 import eu.pb4.styledchat.ducks.ExtPlayNetworkHandler;
 import eu.pb4.styledchat.ducks.ExtPlayerChatMessage;
+import eu.pb4.styledchat.other.FabricPermissionBridge;
 import eu.pb4.styledchat.parser.LinkParser;
 import eu.pb4.styledchat.parser.MentionParser;
 import eu.pb4.styledchat.parser.SpoilerNode;
-import me.lucko.fabric.api.permissions.v0.Permissions;
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.minecraft.ChatFormatting;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.arguments.selector.EntitySelector;
@@ -36,8 +35,10 @@
 import net.minecraft.network.chat.TextColor;
 import net.minecraft.network.chat.contents.PlainTextContents;
 import net.minecraft.network.protocol.game.ClientboundCustomChatCompletionsPacket;
+import net.minecraft.resources.Identifier;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.permissions.PermissionLevel;
 import net.minecraft.world.scores.PlayerTeam;
 import org.jetbrains.annotations.Nullable;
 
@@ -60,8 +61,8 @@ public final class StyledChatUtils {
     public static JsonDataStorage<VersionedChatStyleData> PLAYER_DATA = new JsonDataStorage<>("styled_chat_style", VersionedChatStyleData.class);
     public static final TextTag SPOILER_TEXT_TAG_NEW = TextTag.enclosing(SPOILER_TAG, List.of("hide"), "styledchat", true, ((nodes, arg, parser) -> new SpoilerNode(nodes)));
 
-    public static final String FORMAT_PERMISSION_BASE = "styledchat.format.";
-    public static final String FORMAT_PERMISSION_UNSAFE = "styledchat.unsafe_format.";
+    public static final String FORMAT_PERMISSION_BASE = "format/";
+    public static final String FORMAT_PERMISSION_UNSAFE = "unsafe_format/";
 
 
     public static final TagLikeParser.Format EMOTE_FORMAT = TagLikeParser.Format.of(':', ':');
@@ -119,6 +120,10 @@ public static NodeParser createParser(ServerPlaceholderContext context) {
                 form.add(MarkdownLiteParserV1.MarkdownFormat.URL);
             }
 
+            if (tags.getTag("quote") != null) {
+                form.add(MarkdownLiteParserV1.MarkdownFormat.QUOTE);
+            }
+
             builder.markdown(SpoilerNode::new, MarkdownLiteParserV1::defaultQuoteFormatting, MarkdownLiteParserV1::defaultUrlFormatting,
                     form.toArray(new MarkdownLiteParserV1.MarkdownFormat[0]));
         }
@@ -155,15 +160,15 @@ public static TagRegistry getTextTagRegistry(CommandSourceStack source) {
 
         for (var entry : TagRegistry.DEFAULT.getTags()) {
             if (allowedFormatting.getBoolean(entry.name())
-                    || Permissions.check(source, (entry.userSafe() ? FORMAT_PERMISSION_BASE : FORMAT_PERMISSION_UNSAFE) + entry.name(), entry.userSafe() ? 2 : 4)
-                    || Permissions.check(source, (entry.userSafe() ? FORMAT_PERMISSION_BASE : FORMAT_PERMISSION_UNSAFE) + ".type." + entry.type(), entry.userSafe() ? 2 : 4)
+                    || FabricPermissionBridge.checkPermission(source, id((entry.userSafe() ? FORMAT_PERMISSION_BASE : FORMAT_PERMISSION_UNSAFE) + entry.name()), entry.userSafe() ? PermissionLevel.GAMEMASTERS : PermissionLevel.ADMINS)
+                    || FabricPermissionBridge.checkPermission(source, id((entry.userSafe() ? FORMAT_PERMISSION_BASE : FORMAT_PERMISSION_UNSAFE) + "type/" + entry.type()), entry.userSafe() ? PermissionLevel.GAMEMASTERS : PermissionLevel.ADMINS)
             ) {
                 registry.register(entry);
             }
         }
 
         if (allowedFormatting.getBoolean(SPOILER_TAG)
-                || Permissions.check(source, FORMAT_PERMISSION_BASE + SPOILER_TAG, 2)) {
+                || FabricPermissionBridge.checkPermission(source, id(FORMAT_PERMISSION_BASE + SPOILER_TAG), PermissionLevel.GAMEMASTERS)) {
             registry.register(SPOILER_TEXT_TAG_NEW);
         }
 
@@ -471,4 +476,8 @@ public static ChatStyle createStyleOf(ServerPlayer player) {
     public static ChatType.Bound createParameters(Component override) {
         return ChatType.bind(StyledChatMod.MESSAGE_TYPE_ID, StyledChatMod.server.registryAccess(), override);
     }
+
+    public static Identifier id(String path) {
+        return Identifier.fromNamespaceAndPath("styledchat", path);
+    }
 }

src/main/java/eu/pb4/styledchat/command/Commands.java

@@ -6,16 +6,15 @@
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import eu.pb4.placeholders.api.PlaceholderContext;
 import eu.pb4.placeholders.api.Placeholders;
 import eu.pb4.placeholders.api.ServerPlaceholderContext;
 import eu.pb4.placeholders.api.node.TextNode;
 import eu.pb4.styledchat.StyledChatMod;
 import eu.pb4.styledchat.StyledChatUtils;
 import eu.pb4.styledchat.config.ConfigManager;
 import eu.pb4.styledchat.config.data.ChatStyleData;
+import eu.pb4.styledchat.other.FabricPermissionBridge;
 import eu.pb4.styledchat.other.GenericModInfo;
-import me.lucko.fabric.api.permissions.v0.Permissions;
 import net.minecraft.ChatFormatting;
 import net.minecraft.commands.CommandBuildContext;
 import net.minecraft.commands.CommandSourceStack;
@@ -24,26 +23,29 @@
 import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.permissions.PermissionLevel;
+
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 
+import static eu.pb4.styledchat.StyledChatUtils.id;
 import static net.minecraft.commands.Commands.argument;
 import static net.minecraft.commands.Commands.literal;
 
 public class Commands {
     public static void register(CommandDispatcher<CommandSourceStack> dispatcher, CommandBuildContext registryAccess, net.minecraft.commands.Commands.CommandSelection environment) {
         dispatcher.register(
                 literal("styledchat")
-                        .requires(Permissions.require("styledchat.main", true))
+                        .requires(FabricPermissionBridge.require(id("main"), true))
                         .executes(Commands::about)
 
                         .then(literal("reload")
-                                .requires(Permissions.require("styledchat.reload", 3))
+                                .requires(FabricPermissionBridge.require(id("reload"), PermissionLevel.ADMINS))
                                 .executes(Commands::reloadConfig)
                         )
 
                         .then(literal("set")
-                                .requires(Permissions.require("styledchat.set", 2))
+                                .requires(FabricPermissionBridge.require(id("set"), PermissionLevel.MODERATORS))
                                 .then(fillWithProperties(argument("players", EntityArgument.players()),
                                         (x, p) -> x.then(argument("value", StringArgumentType.greedyString())
                                                 .executes((ctx) -> Commands.setProperty(ctx, p.apply(ctx)))
@@ -52,14 +54,14 @@ public static void register(CommandDispatcher<CommandSourceStack> dispatcher, Co
                         )
 
                         .then(literal("get")
-                                .requires(Permissions.require("styledchat.get", 2))
+                                .requires(FabricPermissionBridge.require(id("get"), PermissionLevel.MODERATORS))
                                 .then(fillWithProperties(argument("player", EntityArgument.player()),
                                         (x, p) -> x.executes((ctx) -> Commands.getProperty(ctx, p.apply(ctx)))
                                 ))
                         )
 
                         .then(literal("clear")
-                                .requires(Permissions.require("styledchat.clear", 3))
+                                .requires(FabricPermissionBridge.require(id("clear"), PermissionLevel.ADMINS))
                                 .then(fillWithProperties(argument("players", EntityArgument.players()),
                                         (x, p) -> x.executes((ctx) -> Commands.clearProperty(ctx, p.apply(ctx)))
                                 ).then(literal("*").executes((ctx) -> Commands.clearProperty(ctx, null))))
@@ -68,7 +70,7 @@ public static void register(CommandDispatcher<CommandSourceStack> dispatcher, Co
 
         dispatcher.register(
                 literal("tellform")
-                        .requires(Permissions.require("styledchat.tellform", 2))
+                        .requires(FabricPermissionBridge.require(id("tellform"), PermissionLevel.GAMEMASTERS))
 
                         .then(argument("targets", EntityArgument.players())
                                 .then(argument("message", StringArgumentType.greedyString())

src/main/java/eu/pb4/styledchat/config/data/ChatStyleData.java

@@ -3,7 +3,7 @@
 
 import com.google.gson.annotations.SerializedName;
 import eu.pb4.styledchat.StyledChatUtils;
-import me.lucko.fabric.api.permissions.v0.Options;
+import eu.pb4.styledchat.other.FabricPermissionBridge;
 import net.minecraft.ChatFormatting;
 import net.minecraft.commands.CommandSourceStack;
 import org.jetbrains.annotations.Nullable;
@@ -15,6 +15,8 @@
 import java.util.Map;
 import java.util.Objects;
 
+import static eu.pb4.styledchat.StyledChatUtils.id;
+
 public class ChatStyleData implements Cloneable {
     public static ChatStyleData DEFAULT = createDefault();
     public static final Map<String, PropertyGetSet> PROPERTIES;
@@ -106,10 +108,10 @@ public ChatStyleData clone() {
     public void fillPermissionOptionProvider(CommandSourceStack source) {
         for (var prop : PROPERTIES.entrySet()) {
             if (prop.getValue().get(this) == null) {
-                var value = Options.get(source, "styled_chat." + prop.getKey());
+                var value = FabricPermissionBridge.checkPermissionString(source, id("style/" + prop.getKey()));
 
-                if (value.isPresent()) {
-                    prop.getValue().set(this, value.get());
+                if (value != null) {
+                    prop.getValue().set(this, value);
                 }
             }
         }
@@ -147,6 +149,7 @@ public static ChatStyleData createDefault() {
             data.formatting.put("italic", true);
             data.formatting.put("strikethrough", true);
             data.formatting.put("underline", true);
+            data.formatting.put("quote", true);
 
             for (var formatting : ChatFormatting.values()) {
                 if (formatting.isColor()) {