diff --git a/src/main/java/net/mcreator/superbwarfare/compat/clothconfig/ClothConfigHelper.java b/src/main/java/net/mcreator/superbwarfare/compat/clothconfig/ClothConfigHelper.java index 6919678ac..482e55c67 100644 --- a/src/main/java/net/mcreator/superbwarfare/compat/clothconfig/ClothConfigHelper.java +++ b/src/main/java/net/mcreator/superbwarfare/compat/clothconfig/ClothConfigHelper.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.compat.clothconfig; import me.shedaniel.clothconfig2.api.ConfigBuilder; import me.shedaniel.clothconfig2.api.ConfigEntryBuilder; +import net.mcreator.superbwarfare.compat.clothconfig.client.KillMessageClientClothConfig; import net.mcreator.superbwarfare.compat.clothconfig.client.ReloadClothConfig; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; @@ -18,6 +19,7 @@ public class ClothConfigHelper { ConfigEntryBuilder entryBuilder = root.entryBuilder(); ReloadClothConfig.init(root, entryBuilder); + KillMessageClientClothConfig.init(root, entryBuilder); return root; } diff --git a/src/main/java/net/mcreator/superbwarfare/compat/clothconfig/client/KillMessageClientClothConfig.java b/src/main/java/net/mcreator/superbwarfare/compat/clothconfig/client/KillMessageClientClothConfig.java new file mode 100644 index 000000000..93013e62d --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/compat/clothconfig/client/KillMessageClientClothConfig.java @@ -0,0 +1,32 @@ +package net.mcreator.superbwarfare.compat.clothconfig.client; + +import me.shedaniel.clothconfig2.api.ConfigBuilder; +import me.shedaniel.clothconfig2.api.ConfigCategory; +import me.shedaniel.clothconfig2.api.ConfigEntryBuilder; +import net.mcreator.superbwarfare.config.client.KillMessageClientConfig; +import net.minecraft.network.chat.Component; + +public class KillMessageClientClothConfig { + + public static void init(ConfigBuilder root, ConfigEntryBuilder entryBuilder) { + ConfigCategory category = root.getOrCreateCategory(Component.translatable("config.superbwarfare.client.kill_message")); + + category.addEntry(entryBuilder + .startBooleanToggle(Component.translatable("config.superbwarfare.client.kill_message.show_kill_message"), KillMessageClientConfig.SHOW_KILL_MESSAGE.get()) + .setDefaultValue(false) + .setSaveConsumer(KillMessageClientConfig.SHOW_KILL_MESSAGE::set) + .setTooltip(Component.translatable("config.superbwarfare.client.kill_message.show_kill_message.des")) + .build() + ); + + category.addEntry(entryBuilder + .startIntField(Component.translatable("config.superbwarfare.client.kill_message.kill_message_count"), KillMessageClientConfig.KILL_MESSAGE_COUNT.get()) + .setDefaultValue(5) + .setMin(1) + .setMax(20) + .setSaveConsumer(KillMessageClientConfig.KILL_MESSAGE_COUNT::set) + .setTooltip(Component.translatable("config.superbwarfare.client.kill_message.kill_message_count.des")) + .build() + ); + } +} diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModKeyMappings.java b/src/main/java/net/mcreator/superbwarfare/init/ModKeyMappings.java index e804c3ff0..59b0a8c56 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModKeyMappings.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModKeyMappings.java @@ -1,11 +1,14 @@ package net.mcreator.superbwarfare.init; +import com.mojang.blaze3d.platform.InputConstants; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.network.message.*; import net.minecraft.client.KeyMapping; import net.minecraft.client.Minecraft; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.RegisterKeyMappingsEvent; +import net.minecraftforge.client.settings.KeyConflictContext; +import net.minecraftforge.client.settings.KeyModifier; import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @@ -97,7 +100,8 @@ public class ModKeyMappings { } }; - public static final KeyMapping CONFIG = new KeyMapping("key.superbwarfare.config", GLFW.GLFW_KEY_P, "key.categories.superbwarfare"); + public static final KeyMapping CONFIG = new KeyMapping("key.superbwarfare.config", KeyConflictContext.IN_GAME, + KeyModifier.ALT, InputConstants.Type.KEYSYM, GLFW.GLFW_KEY_O, "key.categories.superbwarfare"); @SubscribeEvent public static void registerKeyMappings(RegisterKeyMappingsEvent event) { diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index 7d4c49229..e9364a312 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -347,5 +347,10 @@ "config.superbwarfare.title": "卓越前线:配置", "config.superbwarfare.client.reload": "换弹配置", "config.superbwarfare.client.reload.empty_auto_reload": "自动换弹", - "config.superbwarfare.client.reload.empty_auto_reload.des": "在当前弹匣为空时,点击开火键以进行换弹" + "config.superbwarfare.client.reload.empty_auto_reload.des": "在当前弹匣为空时,点击开火键以进行换弹", + "config.superbwarfare.client.kill_message": "击杀信息配置", + "config.superbwarfare.client.kill_message.show_kill_message": "显示击杀信息", + "config.superbwarfare.client.kill_message.show_kill_message.des": "开启时,在屏幕右上角显示击杀信息", + "config.superbwarfare.client.kill_message.kill_message_count": "击杀信息数量", + "config.superbwarfare.client.kill_message.kill_message_count.des": "同时显示的最大击杀信息数量" } \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index 09276c26b..323e5741e 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -343,8 +343,13 @@ "container.superbwarfare.reforging_table": "枪械重铸台", - "config.superbwarfare.title": "卓越前线:配置", + "config.superbwarfare.title": "卓越前线", "config.superbwarfare.client.reload": "换弹配置", "config.superbwarfare.client.reload.empty_auto_reload": "自动换弹", - "config.superbwarfare.client.reload.empty_auto_reload.des": "在当前弹匣为空时,点击开火键以进行换弹" + "config.superbwarfare.client.reload.empty_auto_reload.des": "在当前弹匣为空时,点击开火键以进行换弹", + "config.superbwarfare.client.kill_message": "击杀信息配置", + "config.superbwarfare.client.kill_message.show_kill_message": "显示击杀信息", + "config.superbwarfare.client.kill_message.show_kill_message.des": "开启时,在屏幕右上角显示击杀信息", + "config.superbwarfare.client.kill_message.kill_message_count": "击杀信息数量", + "config.superbwarfare.client.kill_message.kill_message_count.des": "同时显示的最大击杀信息数量" } \ No newline at end of file