Skip to content

1.18/main/ Quark Item Share Ported over to 1.18 code. (#28) #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 23, 2022
Merged

1.18/main/ Quark Item Share Ported over to 1.18 code. (#28) #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 37 additions & 36 deletions common/src/main/java/dev/ftb/mods/ftbranks/impl/FTBRanksAPIImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
package dev.ftb.mods.ftbranks.impl;

import com.mojang.brigadier.Message;
import dev.architectury.event.EventResult;
import dev.architectury.event.events.common.ChatEvent;
import dev.architectury.event.events.common.LifecycleEvent;
import dev.architectury.event.events.common.TickEvent;
import dev.ftb.mods.ftblibrary.util.TextComponentUtils;
import dev.ftb.mods.ftbranks.FTBRanks;
import dev.ftb.mods.ftbranks.api.FTBRanksAPI;
Expand All @@ -20,13 +23,17 @@
import dev.ftb.mods.ftbranks.impl.condition.StatCondition;
import dev.ftb.mods.ftbranks.impl.condition.XorCondition;
import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.HoverEvent;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.network.chat.*;
import net.minecraft.network.protocol.game.ServerboundChatPacket;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.TextFilter;
import net.minecraft.world.InteractionResultHolder;

import java.text.CompactNumberFormat;
import java.util.ArrayList;
import java.util.List;

/**
* @author LatvianModder
Expand Down Expand Up @@ -82,7 +89,7 @@ public static void serverStarting(MinecraftServer server) {
manager.registerCondition("creative_mode", (rank, tag) -> new CreativeModeCondition());
}

// TODO: rework(?)

public static EventResult serverChat(ServerPlayer player, TextFilter.FilteredText eventMessage, ChatEvent.ChatComponent component) {
String format = FTBRanksAPI.getPermissionValue(player, "ftbranks.name_format").asString().orElse("");

Expand Down Expand Up @@ -111,43 +118,37 @@ public static EventResult serverChat(ServerPlayer player, TextFilter.FilteredTex

main.append(cachedNameForChat);
main.append(" ");
//main.appendText("<").appendSibling(event.getPlayer().getDisplayName()).appendText(">").appendText(" ");

String message = eventMessage.getFiltered().trim();

Component textWithLinks = TextComponentUtils.withLinks(message);
TextComponent text = textWithLinks instanceof TextComponent ? (TextComponent) textWithLinks : new TextComponent(message);

ChatFormatting color = ChatFormatting.getByName(FTBRanksAPI.getPermissionValue(player, "ftbranks.chat_text.color").asString().orElse(null));

if (color != null) {
text.setStyle(text.getStyle().applyFormat(color));
}

if (FTBRanksAPI.getPermissionValue(player, "ftbranks.chat_text.bold").asBooleanOrFalse()) {
text.setStyle(text.getStyle().applyFormat(ChatFormatting.BOLD));
}

if (FTBRanksAPI.getPermissionValue(player, "ftbranks.chat_text.italic").asBooleanOrFalse()) {
text.setStyle(text.getStyle().applyFormat(ChatFormatting.ITALIC));
TranslatableComponent fullComp = (TranslatableComponent) component.getFiltered();

for(int i=1; i < fullComp.getArgs().length; i++){

TextComponent part = fullComp.getArgs()[i] instanceof Component ? (TextComponent) fullComp.getArgs()[i] : new TextComponent((String) fullComp.getArgs()[i]);

if (color != null) {
part.setStyle(part.getStyle().applyFormat(color));
}
if (FTBRanksAPI.getPermissionValue(player, "ftbranks.chat_text.bold").asBooleanOrFalse()) {
part.setStyle(part.getStyle().applyFormat(ChatFormatting.BOLD));
}
if (FTBRanksAPI.getPermissionValue(player, "ftbranks.chat_text.italic").asBooleanOrFalse()) {
part.setStyle(part.getStyle().applyFormat(ChatFormatting.ITALIC));
}
if (FTBRanksAPI.getPermissionValue(player, "ftbranks.chat_text.underlined").asBooleanOrFalse()) {
part.setStyle(part.getStyle().applyFormat(ChatFormatting.UNDERLINE));
}
if (FTBRanksAPI.getPermissionValue(player, "ftbranks.chat_text.strikethrough").asBooleanOrFalse()) {
part.setStyle(part.getStyle().applyFormat(ChatFormatting.STRIKETHROUGH));
}
if (FTBRanksAPI.getPermissionValue(player, "ftbranks.chat_text.obfuscated").asBooleanOrFalse()) {
part.setStyle(part.getStyle().applyFormat(ChatFormatting.OBFUSCATED));
}

main.append(part);
}

if (FTBRanksAPI.getPermissionValue(player, "ftbranks.chat_text.underlined").asBooleanOrFalse()) {
text.setStyle(text.getStyle().applyFormat(ChatFormatting.UNDERLINE));
}

if (FTBRanksAPI.getPermissionValue(player, "ftbranks.chat_text.strikethrough").asBooleanOrFalse()) {
text.setStyle(text.getStyle().applyFormat(ChatFormatting.STRIKETHROUGH));
}

if (FTBRanksAPI.getPermissionValue(player, "ftbranks.chat_text.obfuscated").asBooleanOrFalse()) {
text.setStyle(text.getStyle().applyFormat(ChatFormatting.OBFUSCATED));
}

main.append(text);

component.setFiltered(main);

return EventResult.interruptTrue();
}
}
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ org.gradle.daemon=false
mod_id=ftbranks
archives_base_name=ftb-ranks
maven_group=dev.ftb.mods
mod_version=1802.1.7
mod_version=1802.1.8
mod_author=FTB Team

minecraft_version=1.18.2
Expand Down