Skip to content

Commit

Permalink
v1.2.1-rc4
Browse files Browse the repository at this point in the history
  • Loading branch information
@KingContaria
KingContaria authored Aug 13, 2022
1 parent 32d7562 commit ac4238a
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 44 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ org.gradle.jvmargs=-Xmx1G
loader_version=0.13.3

# Mod Properties
mod_version = 1.2.1+1.16.1
mod_version = 1.2.1-rc4+1.16.1
maven_group = com.kingcontaria.standardsettings
archives_base_name = standardsettings
92 changes: 50 additions & 42 deletions src/main/java/com/kingcontaria/standardsettings/StandardSettings.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,13 @@

import java.io.*;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;

@Environment(value= EnvType.CLIENT)
public class StandardSettings {

public static final int[] version = new int[]{1,2,1,0};
public static final int[] version = new int[]{1,2,1,-995};
public static final Logger LOGGER = LogManager.getLogger();
public static final MinecraftClient client = MinecraftClient.getInstance();
public static final GameOptions options = client.options;
Expand All @@ -41,9 +39,7 @@ public class StandardSettings {
public static OptionsCache optionsCache = new OptionsCache(client);
public static String lastQuitWorld;
public static String[] standardoptionsCache;
public static long fileLastModified;
private static long standardoptionsTxtLastModified;
private static File lastUsedGlobalFile;
private static Map<File, Long> filesLastModifiedMap;

public static void load() {
long start = System.nanoTime();
Expand All @@ -55,8 +51,6 @@ public static void load() {
try {
if (!standardoptionsFile.exists()) {
standardoptionsCache = null;
lastUsedGlobalFile = null;
fileLastModified = standardoptionsTxtLastModified = 0;
LOGGER.error("standardoptions.txt is missing");
return;
}
Expand All @@ -66,44 +60,76 @@ public static void load() {
lastQuitWorld = null;
}

if (standardoptionsCache == null || standardoptionsTxtLastModified != standardoptionsFile.lastModified() || (lastUsedGlobalFile != null && fileLastModified != lastUsedGlobalFile.lastModified())) {
if (standardoptionsCache == null || wereFilesModified(filesLastModifiedMap)) {
LOGGER.info("Reloading & caching StandardSettings...");
standardoptionsTxtLastModified = standardoptionsFile.lastModified();
List<String> lines = Files.readLines(standardoptionsFile, StandardCharsets.UTF_8);
if (lines == null || lines.size() == 0) {
List<String> lines = resolveGlobalFile(standardoptionsFile);
if (lines == null) {
LOGGER.error("standardoptions.txt is empty");
return;
}
File globalFile = new File(lines.get(0));
if (lines.get(0) != null && globalFile.exists()) {
if (filesLastModifiedMap.size() > 1) {
LOGGER.info("Using global standardoptions file");
fileLastModified = globalFile.lastModified();
lines = Files.readLines(lastUsedGlobalFile = globalFile, StandardCharsets.UTF_8);
} else {
lastUsedGlobalFile = null;
fileLastModified = standardoptionsTxtLastModified;
}
standardoptionsCache = lines.toArray(new String[0]);
}
load(standardoptionsCache);
LOGGER.info("Finished loading StandardSettings ({} ms)", (System.nanoTime() - start) / 1000000.0f);
} catch (Exception e) {
standardoptionsCache = null;
lastUsedGlobalFile = null;
fileLastModified = standardoptionsTxtLastModified = 0;
LOGGER.error("Failed to load StandardSettings", e);
}
}

private static boolean wereFilesModified(Map<File, Long> map) {
if (map == null) {
return false;
}
AtomicBoolean wasModified = new AtomicBoolean(false);
map.forEach((file, lastModified) -> wasModified.set(file.lastModified() != lastModified || !file.exists() || wasModified.get()));
return wasModified.get();
}

private static List<String> resolveGlobalFile(File file) {
filesLastModifiedMap = new HashMap<>();
List<String> lines = null;
do {
filesLastModifiedMap.put(file, file.lastModified());
try {
lines = Files.readLines(file, StandardCharsets.UTF_8);
} catch (IOException e) {
break;
}
} while (lines != null && lines.size() > 0 && (file = new File(lines.get(0))).exists() && !filesLastModifiedMap.containsKey(file));
return lines;
}

private static void load(String[] lines) {
for (String line : lines) {
try {
String[] strings = line.split(":", 2);
if ((strings[1] = strings[1].trim()).equals("") && !strings[0].equals("fullscreenResolution")) {
if (strings.length < 2 || (strings[1] = strings[1].trim()).equals("") && !strings[0].equals("fullscreenResolution")) {
continue;
}
String[] string0_split = strings[0].split("_", 2);
switch (string0_split[0]) {
case "key":
for (KeyBinding keyBinding : options.keysAll) {
if (string0_split[1].equals(keyBinding.getTranslationKey())) {
keyBinding.setBoundKey(InputUtil.fromTranslationKey(strings[1])); break;
}
} break;
case "soundCategory":
for (SoundCategory soundCategory : SoundCategory.values()) {
if (string0_split[1].equals(soundCategory.getName())) {
options.setSoundVolume(soundCategory, Float.parseFloat(strings[1])); break;
}
} break;
case "modelPart":
for (PlayerModelPart playerModelPart : PlayerModelPart.values()) {
if (string0_split[1].equals(playerModelPart.getName())) {
options.setPlayerModelPart(playerModelPart, Boolean.parseBoolean(strings[1])); break;
}
} break;
case "autoJump": options.autoJump = Boolean.parseBoolean(strings[1]);
case "autoSuggestions": options.autoSuggestions = Boolean.parseBoolean(strings[1]); break;
case "chatColors": options.chatColors = Boolean.parseBoolean(strings[1]); break;
Expand Down Expand Up @@ -208,24 +234,6 @@ private static void load(String[] lines) {
case "renderDistanceOnWorldJoin": renderDistanceOnWorldJoin = Integer.parseInt(strings[1]); break;
case "entityDistanceScalingOnWorldJoin": entityDistanceScalingOnWorldJoin = Float.parseFloat(strings[1]); break;
case "changeOnResize": changeOnResize = Boolean.parseBoolean(strings[1]); break;
case "key":
for (KeyBinding keyBinding : options.keysAll) {
if (string0_split[1].equals(keyBinding.getTranslationKey())) {
keyBinding.setBoundKey(InputUtil.fromTranslationKey(strings[1])); break;
}
} break;
case "soundCategory":
for (SoundCategory soundCategory : SoundCategory.values()) {
if (string0_split[1].equals(soundCategory.getName())) {
options.setSoundVolume(soundCategory, Float.parseFloat(strings[1])); break;
}
} break;
case "modelPart":
for (PlayerModelPart playerModelPart : PlayerModelPart.values()) {
if (string0_split[1].equals(playerModelPart.getName())) {
options.setPlayerModelPart(playerModelPart, Boolean.parseBoolean(strings[1])); break;
}
} break;
}
// Some options.txt settings which aren't accessible in vanilla Minecraft and some unnecessary settings (like Multiplayer stuff) are not included.
} catch (Exception e) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/kingcontaria/standardsettings/mixins/MinecraftClientMixin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ private void initializeStandardSettings(RunArgs args, CallbackInfo ci) {
globalFileView = Files.getFileAttributeView(globalFile.toPath(), UserDefinedFileAttributeView.class);
}
}
} catch (IOException e) {
} catch (Exception e) {
StandardSettings.LOGGER.error("Failed to check for global file", e);
}

Expand Down

0 comments on commit ac4238a

Please sign in to comment.