From 3a3b857f0d74b4578e250c4603986b5837a0bdc0 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Sat, 12 Apr 2025 01:49:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8Cnf=E7=9A=84config=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/atsuishio/superbwarfare/Mod.java | 10 ++++++++-- .../atsuishio/superbwarfare/client/ClickHandler.java | 5 ----- .../atsuishio/superbwarfare/init/ModKeyMappings.java | 4 ---- .../resources/assets/superbwarfare/lang/en_us.json | 2 -- .../resources/assets/superbwarfare/lang/zh_cn.json | 2 -- 5 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/Mod.java b/src/main/java/com/atsuishio/superbwarfare/Mod.java index 71cbb21fe..b2cba1f8c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/Mod.java +++ b/src/main/java/com/atsuishio/superbwarfare/Mod.java @@ -8,12 +8,16 @@ import com.atsuishio.superbwarfare.config.ServerConfig; import com.atsuishio.superbwarfare.init.*; import com.atsuishio.superbwarfare.network.NetworkRegistry; import net.minecraft.resources.ResourceLocation; +import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.IEventBus; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.ModContainer; import net.neoforged.fml.config.ModConfig; import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; +import net.neoforged.fml.loading.FMLEnvironment; import net.neoforged.neoforge.client.event.ClientTickEvent; +import net.neoforged.neoforge.client.gui.ConfigurationScreen; +import net.neoforged.neoforge.client.gui.IConfigScreenFactory; import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.event.tick.ServerTickEvent; import org.apache.logging.log4j.LogManager; @@ -58,12 +62,15 @@ public class Mod { ModCriteriaTriggers.REGISTRY.register(bus); ModAttachments.ATTACHMENT_TYPES.register(bus); -// bus.addListener(this::onCommonSetup); bus.addListener(this::onClientSetup); bus.addListener(ModItems::registerDispenserBehavior); bus.addListener(NetworkRegistry::register); + if (FMLEnvironment.dist == Dist.CLIENT) { + container.registerExtensionPoint(IConfigScreenFactory.class, ConfigurationScreen::new); + } + NeoForge.EVENT_BUS.register(this); } @@ -71,7 +78,6 @@ public class Mod { return ResourceLocation.fromNamespaceAndPath(MODID, path); } - private static final Collection> workQueue = new ConcurrentLinkedQueue<>(); private static final Collection> workQueueC = new ConcurrentLinkedQueue<>(); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java b/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java index d7958184a..d61fc025f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java @@ -201,11 +201,6 @@ public class ClickHandler { handleDoubleJump(player); } - // TODO do we need cloth config? -// if (key == ModKeyMappings.CONFIG.getKey().getValue() && ModKeyMappings.CONFIG.getKeyModifier().isActive(KeyConflictContext.IN_GAME)) { -// handleConfigScreen(player); -// } - if (key == ModKeyMappings.RELOAD.getKey().getValue()) { ClientEventHandler.burstFireAmount = 0; PacketDistributor.sendToServer(new ReloadMessage(0)); diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModKeyMappings.java b/src/main/java/com/atsuishio/superbwarfare/init/ModKeyMappings.java index 2442a5433..38a651cb9 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModKeyMappings.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModKeyMappings.java @@ -22,9 +22,6 @@ public class ModKeyMappings { public static final KeyMapping DISMOUNT = new KeyMapping("key.superbwarfare.dismount", GLFW.GLFW_KEY_LEFT_ALT, "key.categories.superbwarfare"); public static final KeyMapping BREATH = new KeyMapping("key.superbwarfare.breath", GLFW.GLFW_KEY_LEFT_CONTROL, "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"); - public static final KeyMapping EDIT_MODE = new KeyMapping("key.superbwarfare.edit_mode", GLFW.GLFW_KEY_H, "key.categories.superbwarfare"); public static final KeyMapping EDIT_SCOPE = new KeyMapping("key.superbwarfare.edit_scope", GLFW.GLFW_KEY_UP, "key.categories.superbwarfare"); public static final KeyMapping EDIT_BARREL = new KeyMapping("key.superbwarfare.edit_barrel", GLFW.GLFW_KEY_LEFT, "key.categories.superbwarfare"); @@ -49,7 +46,6 @@ public class ModKeyMappings { event.register(INTERACT); event.register(DISMOUNT); event.register(BREATH); - event.register(CONFIG); event.register(EDIT_MODE); event.register(EDIT_SCOPE); event.register(EDIT_BARREL); diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index baceea8eb..a04ab7ff0 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -455,7 +455,6 @@ "key.superbwarfare.interact": "Interact", "key.superbwarfare.dismount": "Dismount", "key.superbwarfare.breath": "Breathe", - "key.superbwarfare.config": "Open Config Screen", "key.superbwarfare.edit_mode": "Edit Weapon", "key.superbwarfare.edit_scope": "Switch Scope", "key.superbwarfare.edit_barrel": "Switch Barrel", @@ -493,7 +492,6 @@ "tips.superbwarfare.monitor.already_linked": "This monitor has been connected！", "tips.superbwarfare.drone.already_linked": "This device has been connected！", "tips.superbwarfare.monitor.unlinked": "Disconnect！", - "tips.superbwarfare.no_cloth_config": "You have not installed Cloth Config API, cannot open the config interface", "tips.superbwarfare.drone.distance": "DISTANCE:", "tips.superbwarfare.drone.health": "HEALTH:", "tips.superbwarfare.drone.ammo": "AMMO:", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index fb2c0f9eb..8f894d3ec 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -453,7 +453,6 @@ "key.superbwarfare.interact": "交互", "key.superbwarfare.dismount": "离开载具", "key.superbwarfare.breath": "屏息", - "key.superbwarfare.config": "打开配置界面", "key.superbwarfare.edit_mode": "改装", "key.superbwarfare.edit_scope": "切换瞄准镜", "key.superbwarfare.edit_barrel": "切换枪管配件", @@ -491,7 +490,6 @@ "tips.superbwarfare.monitor.already_linked": "这个遥控器已连接到一个设备！", "tips.superbwarfare.drone.already_linked": "这个设备已被连接！", "tips.superbwarfare.monitor.unlinked": "断开连接！", - "tips.superbwarfare.no_cloth_config": "您尚未安装 Cloth Config API，无法打开配置界面", "tips.superbwarfare.drone.distance": "飞手距离:", "tips.superbwarfare.drone.health": "耐久值:", "tips.superbwarfare.drone.ammo": "弹药:",