diff --git a/common/src/main/java/org/figuramc/figura/lua/FiguraLuaPrinter.java b/common/src/main/java/org/figuramc/figura/lua/FiguraLuaPrinter.java index 90768556d..ec6ee5311 100644 --- a/common/src/main/java/org/figuramc/figura/lua/FiguraLuaPrinter.java +++ b/common/src/main/java/org/figuramc/figura/lua/FiguraLuaPrinter.java @@ -158,8 +158,9 @@ public static void sendPingMessage(Avatar owner, String ping, int size, LuaValue private static final Function PRINT_FUNCTION = runtime -> new VarArgFunction() { @Override public Varargs invoke(Varargs args) { - if (!Configs.LOG_OTHERS.value && !FiguraMod.isLocal(runtime.owner.owner)) - return NIL; + boolean local = FiguraMod.isLocal(runtime.owner.owner); + if (!local && (!Configs.LOG_OTHERS.value || runtime.owner.permissions.get(Permissions.PRINTING) < 1)) + return NIL; MutableComponent text = Component.empty(); for (int i = 0; i < args.narg(); i++) @@ -181,8 +182,8 @@ public String tojstring() { @Override public Varargs invoke(Varargs args) { boolean local = FiguraMod.isLocal(runtime.owner.owner); - if (!Configs.LOG_OTHERS.value && !local) - return NIL; + if (!local && (!Configs.LOG_OTHERS.value || runtime.owner.permissions.get(Permissions.PRINTING) < 1)) + return NIL; TextUtils.allowScriptEvents = true; diff --git a/common/src/main/resources/assets/figura/emojis/extura.json b/common/src/main/resources/assets/figura/emojis/extura.json new file mode 100644 index 000000000..c722e632b --- /dev/null +++ b/common/src/main/resources/assets/figura/emojis/extura.json @@ -0,0 +1,9 @@ + +{ + "blacklist": "", + "emojis": { + "\uE001":["@super04", "@superpowers04", "@stephani"], + "\uE002":["c_", "hampter"], + "\uE003":["mario"] + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/figura/font/emoji_extura.json b/common/src/main/resources/assets/figura/font/emoji_extura.json new file mode 100644 index 000000000..2d35426f7 --- /dev/null +++ b/common/src/main/resources/assets/figura/font/emoji_extura.json @@ -0,0 +1,16 @@ +{ + "providers": [ + { + "type": "bitmap", + "file": "figura:font/emojis/extura.png", + "ascent": 8, + "chars": [ + "\uE001\uE002\uE003\uE004\uE005\u0000\u0000\u0000", + "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000", + "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000", + "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000", + "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/figura/textures/font/emojis/extura.png b/common/src/main/resources/assets/figura/textures/font/emojis/extura.png new file mode 100644 index 000000000..2b035980e Binary files /dev/null and b/common/src/main/resources/assets/figura/textures/font/emojis/extura.png differ