System-End/Discord-MC-Chat
1
0
Fork 0
mirror of https://github.com/System-End/Discord-MC-Chat.git synced 2026-04-19 22:05:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add server instance to TranslationManager and update event handling

Browse source
This commit is contained in:
Xujiayao 2026-02-01 15:34:57 +08:00
parent a47b1bd8d0
commit c6a7dfe64a
4 changed files with 53 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
minecraft/src/main/java/com/xujiayao/discord_mc_chat/minecraft/events/MinecraftEventHandler.java
View file

@ -25,6 +25,8 @@ public class MinecraftEventHandler {
*/
public static void init() {
EventManager.register(MinecraftEvents.ServerStarted.class, event -> {
TranslationManager.setServer(event.minecraftServer());
Map<String, String> placeholders = Map.of();
NetworkManager.sendPacketToServer(new MinecraftEventPacket(MinecraftEventPacket.MessageType.SERVER_STARTED, placeholders));
});

5
minecraft/src/main/java/com/xujiayao/discord_mc_chat/minecraft/events/MinecraftEvents.java
View file

@ -7,6 +7,7 @@ import net.minecraft.advancements.AdvancementProgress;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.network.Connection;
import net.minecraft.network.chat.PlayerChatMessage;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.CommonListenerCookie;
@ -20,7 +21,9 @@ public class MinecraftEvents {
/**
* Posted when the server is started.
*/
public record ServerStarted() {
public record ServerStarted(
MinecraftServer minecraftServer
) {
}
/**

4
minecraft/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinMinecraftServer.java
View file

@ -17,7 +17,9 @@ public class MixinMinecraftServer {
@Inject(method = "runServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/Util;getNanos()J", ordinal = 0))
private void serverStarted(CallbackInfo ci) {
// ServerStarted Event
EventManager.post(new MinecraftEvents.ServerStarted());
EventManager.post(new MinecraftEvents.ServerStarted(
(MinecraftServer) (Object) this
));
}
@Inject(method = "runServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;stopServer()V"))

98
minecraft/src/main/java/com/xujiayao/discord_mc_chat/minecraft/translations/TranslationManager.java
View file

@ -5,6 +5,11 @@ import com.xujiayao.discord_mc_chat.utils.HttpUtils;
import com.xujiayao.discord_mc_chat.utils.JsonUtils;
import com.xujiayao.discord_mc_chat.utils.StringUtils;
import com.xujiayao.discord_mc_chat.utils.i18n.I18nManager;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.packs.PackResources;
import net.minecraft.server.packs.PackType;
import net.minecraft.server.packs.repository.Pack;
import net.minecraft.server.packs.resources.IoSupplier;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
@ -32,6 +37,16 @@ public class TranslationManager {
private static final Path CACHE_DIR = Paths.get("./config/discord_mc_chat/cache/lang");
private static String currentLoadedLanguage = "";
private static MinecraftServer server;
/**
* Sets the Minecraft server instance.
*
* @param server The Minecraft server
*/
public static void setServer(MinecraftServer server) {
TranslationManager.server = server;
}
/**
* Initializes the translation manager.
@ -41,6 +56,12 @@ public class TranslationManager {
public static void init() {
try (ExecutorService executor = Executors.newSingleThreadExecutor(r -> new Thread(r, "DMCC-Translations"))) {
executor.submit(() -> {
if (server == null) {
// Called before ServerStarted event (before MinecraftServer is available)
// Will be called again when the first get() is requested
return;
}
TRANSLATIONS.clear();
String language = I18nManager.getLanguage();
@ -87,60 +108,6 @@ public class TranslationManager {
return StringUtils.format(translation, args);
}
// /**
// * Loads translations from a PackRepository (for datapacks).
// *
// * @param packRepository The pack repository to load from
// */
// public static void loadFromPackRepository(PackRepository packRepository) {
// LOGGER.info("[MTM] loadFromPackRepository() called");
//
// if (packRepository == null) {
// LOGGER.warn("[MTM] PackRepository is null, skipping");
// return;
// }
//
// int packCount = 0;
// for (Pack pack : packRepository.getSelectedPacks()) {
// packCount++;
// LOGGER.info("[MTM] Processing pack: {}", pack.getId());
// try {
// pack.streamSelfAndChildren().forEach(packResources -> {
// LOGGER.info("[MTM] Processing pack resources: {}", packResources.getId());
//
// packResources.open().getNamespaces(PackType.CLIENT_RESOURCES).forEach(namespace -> {
// LOGGER.info("[MTM] Checking namespace: {}", namespace);
//
// IoSupplier<InputStream> supplier = packResources.open().getResource(
// PackType.CLIENT_RESOURCES,
// net.minecraft.resources.ResourceLocation.fromNamespaceAndPath(namespace, "lang/" + language + ".json")
// );
//
// if (supplier != null) {
// LOGGER.info("[MTM] Found lang resource for namespace '{}'", namespace);
// try (InputStream is = supplier.get()) {
// Map<String, String> translations = JSON_MAPPER.readValue(is,
// new TypeReference<Map<String, String>>() {
// });
// int count = translations.size();
// TRANSLATIONS.putAll(translations);
// LOGGER.info("[MTM] Loaded {} translations", count);
// } catch (IOException e) {
// LOGGER.warn("[MTM] Failed to load: {}", e.getMessage());
// }
// } else {
// LOGGER.info("[MTM] No lang resource found for namespace '{}'", namespace);
// }
// });
// });
// } catch (Exception e) {
// LOGGER.warn("[MTM] Failed to load translations from pack: {}", pack.getId());
// LOGGER.warn("[MTM] Exception: {}", e.getMessage());
// }
// }
// LOGGER.info("[MTM] Processed {} packs from PackRepository", packCount);
// }
/**
* Loads translations for a specific language.
*
@ -227,5 +194,28 @@ public class TranslationManager {
LOGGER.error("Error scanning mods directory.", e);
}
}
// Step 3: Scan datapacks directory
for (Pack pack : server.getPackRepository().getSelectedPacks()) {
pack.streamSelfAndChildren().forEach(packResources0 -> {
try (PackResources packResources1 = packResources0.open()) {
packResources1.getNamespaces(PackType.CLIENT_RESOURCES).forEach(namespace -> {
IoSupplier<InputStream> supplier = packResources1.getResource(
PackType.CLIENT_RESOURCES,
net.minecraft.resources.ResourceLocation.fromNamespaceAndPath(namespace, "lang/" + language + ".json")
);
if (supplier != null) {
try (InputStream is = supplier.get()) {
Map<String, String> translations = JsonUtils.toStringMap(is);
translations.forEach(TRANSLATIONS::putIfAbsent);
} catch (Exception e) {
LOGGER.error("Failed to load translations from datapack.", e);
}
}
});
}
});
}
}
}