Skip to content

Commit fd624ca

Browse files
author
Circulate233
committed
允许在配置文件中关闭Java检查
1 parent 18c568a commit fd624ca

File tree

3 files changed

+22
-11
lines changed

3 files changed

+22
-11
lines changed

src/main/java/github/kasuminova/novaeng/client/ClientProxy.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import net.minecraftforge.client.ClientCommandHandler;
3131
import net.minecraftforge.client.event.ModelRegistryEvent;
3232
import net.minecraftforge.common.MinecraftForge;
33+
import net.minecraftforge.common.config.Configuration;
3334
import net.minecraftforge.fml.client.registry.ClientRegistry;
3435
import net.minecraftforge.fml.common.Loader;
3536
import net.minecraftforge.fml.common.Mod;
@@ -38,6 +39,9 @@
3839
import slimeknights.tconstruct.library.book.TinkerBook;
3940

4041
import javax.annotation.Nullable;
42+
import java.io.File;
43+
44+
import static github.kasuminova.novaeng.mixin.NovaEngCoreEarlyMixinLoader.*;
4145

4246
@SuppressWarnings("MethodMayBeStatic")
4347
@Mod.EventBusSubscriber(Side.CLIENT)
@@ -51,6 +55,15 @@ public ClientProxy() {
5155
public void construction() {
5256
super.construction();
5357

58+
var config = new Configuration(new File(Loader.instance().getConfigDir(), "novaeng_core.cfg"));
59+
config.load();
60+
if (config.getBoolean("javaCheck", Configuration.CATEGORY_GENERAL,true,"java1.8.0_51 is bad")) {
61+
if (!isCleanroomLoader()){
62+
checkJavaVersion();
63+
}
64+
}
65+
config.save();
66+
5467
TitleUtils.setRandomTitle("*Construction*");
5568
}
5669

src/main/java/github/kasuminova/novaeng/common/config/NovaEngCoreConfig.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
@Config(modid = NovaEngineeringCore.MOD_ID, name = NovaEngineeringCore.MOD_ID)
1313
public class NovaEngCoreConfig {
1414

15+
@Config.RequiresMcRestart
16+
@Config.Name("javaCheck")
17+
public static boolean javaCheck = true;
18+
1519
@Config.Name("Client")
1620
public static final Client CLIENT = new Client();
1721

src/main/java/github/kasuminova/novaeng/mixin/NovaEngCoreEarlyMixinLoader.java

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package github.kasuminova.novaeng.mixin;
22

3-
import net.minecraftforge.fml.relauncher.FMLLaunchHandler;
43
import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
54
import org.apache.commons.lang3.SystemUtils;
65
import org.apache.logging.log4j.LogManager;
@@ -17,22 +16,17 @@
1716
import java.util.*;
1817
import java.util.List;
1918

19+
import static github.kasuminova.novaeng.common.crafttweaker.util.NovaEngUtils.isClient;
20+
2021

2122
@SuppressWarnings("unused")
2223
public class NovaEngCoreEarlyMixinLoader implements IFMLLoadingPlugin, IEarlyMixinLoader {
2324
public static final Logger LOG = LogManager.getLogger("NOVAENG_CORE_PRE");
2425
public static final String LOG_PREFIX = "[NOVAENG_CORE_PRE]" + ' ';
2526

2627
static {
27-
if (isCleanroomLoader()) {
28-
LOG.info(LOG_PREFIX + "CleanroomLoader detected.");
29-
if (FMLLaunchHandler.side().isClient()) {
30-
checkLauncher();
31-
}
32-
} else {
33-
if (FMLLaunchHandler.side().isClient()) {
34-
checkJavaVersion();
35-
}
28+
if (isCleanroomLoader() && isClient) {
29+
checkLauncher();
3630
}
3731
}
3832

@@ -42,7 +36,7 @@ public class NovaEngCoreEarlyMixinLoader implements IFMLLoadingPlugin, IEarlyMix
4236
* 你说得对,但是不得不写。<br/>
4337
* <a href="https://github.com/Hex-Dragon/PCL2/discussions/3004#discussioncomment-8741822">PCL2 Discussion Link</a><br/>
4438
*/
45-
private static void checkLauncher() {
39+
public static void checkLauncher() {
4640
if (!System.getProperty("os.name").toLowerCase().contains("win")) {
4741
return;
4842
}

0 commit comments

Comments
 (0)