Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-31 04:46:37 +00:00
Code Issues Releases Activity

修改fontmanger()

Browse Source
This commit is contained in:
XiaoMoMi
2025-04-12 22:59:06 +08:00
parent 418a1bbd8d
commit 08eebba982
10 changed files with 50 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java
View File

@@ -261,9 +261,9 @@ public class PacketConsumers {
Tag suffix = buf.readNbt(false);
if (suffix == null) return;
Map<String, Component> tokens1 = CraftEngine.instance().imageManager().matchTags(displayName.getAsString());
Map<String, Component> tokens2 = CraftEngine.instance().imageManager().matchTags(prefix.getAsString());
Map<String, Component> tokens3 = CraftEngine.instance().imageManager().matchTags(suffix.getAsString());
Map<String, Component> tokens1 = CraftEngine.instance().fontManager().matchTags(displayName.getAsString());
Map<String, Component> tokens2 = CraftEngine.instance().fontManager().matchTags(prefix.getAsString());
Map<String, Component> tokens3 = CraftEngine.instance().fontManager().matchTags(suffix.getAsString());
if (tokens1.isEmpty() && tokens2.isEmpty() && tokens3.isEmpty()) return;
event.setChanged(true);
@@ -349,7 +349,7 @@ public class PacketConsumers {
continue;
}
String json = ComponentUtils.minecraftToJson(mcComponent);
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(json);
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(json);
if (tokens.isEmpty()) {
newEntries.add(entry);
continue;
@@ -387,9 +387,9 @@ public class PacketConsumers {
String prefix = buf.readUtf();
String suffix = buf.readUtf();
Map<String, Component> tokens1 = CraftEngine.instance().imageManager().matchTags(displayName);
Map<String, Component> tokens2 = CraftEngine.instance().imageManager().matchTags(prefix);
Map<String, Component> tokens3 = CraftEngine.instance().imageManager().matchTags(suffix);
Map<String, Component> tokens1 = CraftEngine.instance().fontManager().matchTags(displayName);
Map<String, Component> tokens2 = CraftEngine.instance().fontManager().matchTags(prefix);
Map<String, Component> tokens3 = CraftEngine.instance().fontManager().matchTags(suffix);
if (tokens1.isEmpty() && tokens2.isEmpty() && tokens3.isEmpty()) return;
event.setChanged(true);
@@ -456,7 +456,7 @@ public class PacketConsumers {
int actionType = buf.readVarInt();
if (actionType == 0) {
String json = buf.readUtf();
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(json);
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(json);
if (tokens.isEmpty()) return;
Component component = AdventureHelper.jsonToComponent(json);
for (Map.Entry<String, Component> token : tokens.entrySet()) {
@@ -478,7 +478,7 @@ public class PacketConsumers {
buf.writeByte(flag);
} else if (actionType == 3) {
String json = buf.readUtf();
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(json);
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(json);
if (tokens.isEmpty()) return;
event.setChanged(true);
Component component = AdventureHelper.jsonToComponent(json);
@@ -505,7 +505,7 @@ public class PacketConsumers {
if (actionType == 0) {
Tag nbt = buf.readNbt(false);
if (nbt == null) return;
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(nbt.getAsString());
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(nbt.getAsString());
if (tokens.isEmpty()) return;
Component component = AdventureHelper.tagToComponent(nbt);
for (Map.Entry<String, Component> token : tokens.entrySet()) {
@@ -528,7 +528,7 @@ public class PacketConsumers {
} else if (actionType == 3) {
Tag nbt = buf.readNbt(false);
if (nbt == null) return;
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(nbt.getAsString());
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(nbt.getAsString());
if (tokens.isEmpty()) return;
event.setChanged(true);
Component component = AdventureHelper.tagToComponent(nbt);
@@ -555,7 +555,7 @@ public class PacketConsumers {
if (mode != 0 && mode != 2) return;
String displayName = buf.readUtf();
int renderType = buf.readVarInt();
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(displayName);
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(displayName);
if (tokens.isEmpty()) return;
event.setChanged(true);
Component component = AdventureHelper.jsonToComponent(displayName);
@@ -587,7 +587,7 @@ public class PacketConsumers {
if (optionalNumberFormat) {
int format = buf.readVarInt();
if (format == 0) {
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(displayName.getAsString());
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(displayName.getAsString());
if (tokens.isEmpty()) return;
event.setChanged(true);
Component component = AdventureHelper.tagToComponent(displayName);
@@ -603,7 +603,7 @@ public class PacketConsumers {
buf.writeBoolean(true);
buf.writeVarInt(0);
} else if (format == 1) {
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(displayName.getAsString());
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(displayName.getAsString());
if (tokens.isEmpty()) return;
Tag style = buf.readNbt(false);
event.setChanged(true);
@@ -623,8 +623,8 @@ public class PacketConsumers {
} else if (format == 2) {
Tag fixed = buf.readNbt(false);
if (fixed == null) return;
Map<String, Component> tokens1 = CraftEngine.instance().imageManager().matchTags(displayName.getAsString());
Map<String, Component> tokens2 = CraftEngine.instance().imageManager().matchTags(fixed.getAsString());
Map<String, Component> tokens1 = CraftEngine.instance().fontManager().matchTags(displayName.getAsString());
Map<String, Component> tokens2 = CraftEngine.instance().fontManager().matchTags(fixed.getAsString());
if (tokens1.isEmpty() && tokens2.isEmpty()) return;
event.setChanged(true);
buf.clear();
@@ -654,7 +654,7 @@ public class PacketConsumers {
}
}
} else {
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(displayName.getAsString());
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(displayName.getAsString());
if (tokens.isEmpty()) return;
event.setChanged(true);
Component component = AdventureHelper.tagToComponent(displayName);
@@ -679,7 +679,7 @@ public class PacketConsumers {
try {
FriendlyByteBuf buf = event.getBuffer();
String jsonOrPlainString = buf.readUtf();
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(jsonOrPlainString);
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(jsonOrPlainString);
if (tokens.isEmpty()) return;
boolean overlay = buf.readBoolean();
event.setChanged(true);
@@ -702,7 +702,7 @@ public class PacketConsumers {
FriendlyByteBuf buf = event.getBuffer();
Tag nbt = buf.readNbt(false);
if (nbt == null) return;
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(nbt.getAsString());
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(nbt.getAsString());
if (tokens.isEmpty()) return;
boolean overlay = buf.readBoolean();
event.setChanged(true);
@@ -724,7 +724,7 @@ public class PacketConsumers {
try {
FriendlyByteBuf buf = event.getBuffer();
String json = buf.readUtf();
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(json);
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(json);
if (tokens.isEmpty()) return;
event.setChanged(true);
Component component = AdventureHelper.jsonToComponent(json);
@@ -745,7 +745,7 @@ public class PacketConsumers {
FriendlyByteBuf buf = event.getBuffer();
Tag nbt = buf.readNbt(false);
if (nbt == null) return;
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(nbt.getAsString());
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(nbt.getAsString());
if (tokens.isEmpty()) return;
event.setChanged(true);
Component component = AdventureHelper.tagToComponent(nbt);
@@ -765,7 +765,7 @@ public class PacketConsumers {
try {
FriendlyByteBuf buf = event.getBuffer();
String json = buf.readUtf();
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(json);
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(json);
if (tokens.isEmpty()) return;
event.setChanged(true);
Component component = AdventureHelper.jsonToComponent(json);
@@ -786,7 +786,7 @@ public class PacketConsumers {
FriendlyByteBuf buf = event.getBuffer();
Tag nbt = buf.readNbt(false);
if (nbt == null) return;
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(nbt.getAsString());
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(nbt.getAsString());
if (tokens.isEmpty()) return;
event.setChanged(true);
Component component = AdventureHelper.tagToComponent(nbt);
@@ -806,7 +806,7 @@ public class PacketConsumers {
try {
FriendlyByteBuf buf = event.getBuffer();
String json = buf.readUtf();
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(json);
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(json);
if (tokens.isEmpty()) return;
event.setChanged(true);
Component component = AdventureHelper.jsonToComponent(json);
@@ -827,7 +827,7 @@ public class PacketConsumers {
FriendlyByteBuf buf = event.getBuffer();
Tag nbt = buf.readNbt(false);
if (nbt == null) return;
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(nbt.getAsString());
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(nbt.getAsString());
if (tokens.isEmpty()) return;
event.setChanged(true);
Component component = AdventureHelper.tagToComponent(nbt);
@@ -848,8 +848,8 @@ public class PacketConsumers {
FriendlyByteBuf buf = event.getBuffer();
String json1 = buf.readUtf();
String json2 = buf.readUtf();
Map<String, Component> tokens1 = CraftEngine.instance().imageManager().matchTags(json1);
Map<String, Component> tokens2 = CraftEngine.instance().imageManager().matchTags(json2);
Map<String, Component> tokens1 = CraftEngine.instance().fontManager().matchTags(json1);
Map<String, Component> tokens2 = CraftEngine.instance().fontManager().matchTags(json2);
if (tokens1.isEmpty() && tokens2.isEmpty()) return;
event.setChanged(true);
buf.clear();
@@ -885,8 +885,8 @@ public class PacketConsumers {
if (nbt1 == null) return;
Tag nbt2 = buf.readNbt(false);
if (nbt2 == null) return;
Map<String, Component> tokens1 = CraftEngine.instance().imageManager().matchTags(nbt1.getAsString());
Map<String, Component> tokens2 = CraftEngine.instance().imageManager().matchTags(nbt2.getAsString());
Map<String, Component> tokens1 = CraftEngine.instance().fontManager().matchTags(nbt1.getAsString());
Map<String, Component> tokens2 = CraftEngine.instance().fontManager().matchTags(nbt2.getAsString());
if (tokens1.isEmpty() && tokens2.isEmpty()) return;
event.setChanged(true);
buf.clear();
@@ -921,7 +921,7 @@ public class PacketConsumers {
int containerId = buf.readVarInt();
int type = buf.readVarInt();
String json = buf.readUtf();
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(json);
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(json);
if (tokens.isEmpty()) return;
event.setChanged(true);
Component component = AdventureHelper.jsonToComponent(json);
@@ -946,7 +946,7 @@ public class PacketConsumers {
int type = buf.readVarInt();
Tag nbt = buf.readNbt(false);
if (nbt == null) return;
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(nbt.getAsString());
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(nbt.getAsString());
if (tokens.isEmpty()) return;
Component component = AdventureHelper.tagToComponent(nbt);
for (Map.Entry<String, Component> token : tokens.entrySet()) {
@@ -1695,7 +1695,7 @@ public class PacketConsumers {
String message = (String) Reflections.field$ServerboundRenameItemPacket$name.get(packet);
if (message != null && !message.isEmpty()) {
// check bypass
FontManager manager = CraftEngine.instance().imageManager();
FontManager manager = CraftEngine.instance().fontManager();
IllegalCharacterProcessResult result = manager.processIllegalCharacters(message);
if (result.has()) {
try {
@@ -1719,7 +1719,7 @@ public class PacketConsumers {
return;
}
String[] lines = (String[]) Reflections.field$ServerboundSignUpdatePacket$lines.get(packet);
FontManager manager = CraftEngine.instance().imageManager();
FontManager manager = CraftEngine.instance().fontManager();
if (!manager.isDefaultFontInUse()) return;
for (int i = 0; i < lines.length; i++) {
String line = lines[i];
@@ -1740,7 +1740,7 @@ public class PacketConsumers {
public static final TriConsumer<NetWorkUser, NMSPacketEvent, Object> EDIT_BOOK = (user, event, packet) -> {
try {
if (!Config.filterBook()) return;
FontManager manager = CraftEngine.instance().imageManager();
FontManager manager = CraftEngine.instance().fontManager();
if (!manager.isDefaultFontInUse()) return;
// check bypass
if (((BukkitServerPlayer) user).hasPermission(FontManager.BYPASS_BOOK)) {
@@ -1882,7 +1882,7 @@ public class PacketConsumers {
if (optionalTextComponent.isPresent()) {
Object textComponent = optionalTextComponent.get();
String json = ComponentUtils.minecraftToJson(textComponent);
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(json);
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(json);
if (!tokens.isEmpty()) {
Component component = AdventureHelper.jsonToComponent(json);
for (Map.Entry<String, Component> token : tokens.entrySet()) {
@@ -1915,7 +1915,7 @@ public class PacketConsumers {
Object textComponent = FastNMS.INSTANCE.field$SynchedEntityData$DataValue$value(packedItem);
if (textComponent == Reflections.instance$Component$empty) break;
String json = ComponentUtils.minecraftToJson(textComponent);
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(json);
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(json);
if (!tokens.isEmpty()) {
Component component = AdventureHelper.jsonToComponent(json);
for (Map.Entry<String, Component> token : tokens.entrySet()) {
@@ -1948,7 +1948,7 @@ public class PacketConsumers {
if (optionalTextComponent.isPresent()) {
Object textComponent = optionalTextComponent.get();
String json = ComponentUtils.minecraftToJson(textComponent);
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(json);
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(json);
if (!tokens.isEmpty()) {
Component component = AdventureHelper.jsonToComponent(json);
for (Map.Entry<String, Component> token : tokens.entrySet()) {
@@ -1981,7 +1981,7 @@ public class PacketConsumers {
if (optionalTextComponent.isPresent()) {
Object textComponent = optionalTextComponent.get();
String json = ComponentUtils.minecraftToJson(textComponent);
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(json);
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(json);
if (!tokens.isEmpty()) {
Component component = AdventureHelper.jsonToComponent(json);
for (Map.Entry<String, Component> token : tokens.entrySet()) {
@@ -2022,7 +2022,7 @@ public class PacketConsumers {
displayName = buf.readNbt(false);
}
outside : if (displayName != null) {
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(displayName.getAsString());
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(displayName.getAsString());
if (tokens.isEmpty()) break outside;
Component component = AdventureHelper.tagToComponent(displayName);
for (Map.Entry<String, Component> token : tokens.entrySet()) {
@@ -2045,7 +2045,7 @@ public class PacketConsumers {
} else if (format == 2) {
fixed = buf.readNbt(false);
if (fixed == null) return;
Map<String, Component> tokens = CraftEngine.instance().imageManager().matchTags(fixed.getAsString());
Map<String, Component> tokens = CraftEngine.instance().fontManager().matchTags(fixed.getAsString());
if (tokens.isEmpty() && !isChanged) return;
if (!tokens.isEmpty()) {
Component component = AdventureHelper.tagToComponent(fixed);

1
bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/id/PacketIds1_20.java
View File

@@ -2,7 +2,6 @@ package net.momirealms.craftengine.bukkit.plugin.network.id;
import net.momirealms.craftengine.bukkit.plugin.network.PacketIds;
import net.momirealms.craftengine.bukkit.util.Reflections;
import net.momirealms.craftengine.core.util.VersionHelper;
public class PacketIds1_20 implements PacketIds {

1
bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/id/PacketIds1_20_5.java
View File

@@ -1,7 +1,6 @@
package net.momirealms.craftengine.bukkit.plugin.network.id;
import net.momirealms.craftengine.bukkit.plugin.network.PacketIds;
import net.momirealms.craftengine.bukkit.util.Reflections;
public class PacketIds1_20_5 implements PacketIds {