chylex/Minecraft-Window-Title
1
0
Fork 0
mirror of https://github.com/chylex/Minecraft-Window-Title.git synced 2024-10-17 10:42:46 +02:00
Code

Compare commits

base: chylex:6854f05c0568cb084c4d43c4929660deae48ecf0
Branches Tags
chylex:master
chylex:1.20
chylex:1.19
chylex:1.15
chylex:1.17
chylex:1.12/older
chylex:1.14
..
compare: chylex:15b922a6f2c4b0c5eb9f6664ade0ba3275c7692d
Branches Tags
chylex:master
chylex:1.20
chylex:1.19
chylex:1.15
chylex:1.17
chylex:1.12/older
chylex:1.14

1 Commits
6854f05c05 ... 15b922a6f2

Author SHA1 Message Date
Kolotheegg
15b922a6f2
Merge c62d8658c4 into ba22745940 2024-07-28 21:26:24 +02:00
8 changed files with 56 additions and 73 deletions
Show Stats Expand all files Collapse all files

1
.idea/gradle.xml
View File

@ -5,7 +5,6 @@
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="openjdk-21" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />

3
Fabric/src/main/java/chylex/customwindowtitle/fabric/CustomWindowTitle.java
View File

@ -11,8 +11,9 @@ import net.minecraft.client.Minecraft;
public class CustomWindowTitle implements ClientModInitializer {
private final TitleConfig config;
public CustomWindowTitle() {
config = TitleConfig.load(FabricLoader.getInstance().getConfigDir().toAbsolutePath().toString());
config = TitleConfig.read(FabricLoader.getInstance().getConfigDir().toAbsolutePath().toString());
}
@Override

4
NeoForge/src/main/java/chylex/customwindowtitle/neoforge/CustomWindowTitle.java
View File

@ -15,8 +15,8 @@ public class CustomWindowTitle {
private final TitleConfig config;
public CustomWindowTitle(final IEventBus eventBus) {
config = TitleConfig.load(FMLPaths.CONFIGDIR.get().toString());
public CustomWindowTitle(IEventBus eventBus) {
config = TitleConfig.read(FMLPaths.CONFIGDIR.get().toString());
eventBus.addListener(this::onClientSetup);
CommonTokenData.register(new TokenProvider());
}

2
src/main/java/chylex/customwindowtitle/IconChanger.java
View File

@ -12,7 +12,7 @@ import java.nio.IntBuffer;
import java.nio.file.Files;
import java.nio.file.Path;
public final class IconChanger {
public class IconChanger {
public static void setIcon(final Path iconPath) {
final long windowHandle = Minecraft.getInstance().getWindow().getWindow();

88
src/main/java/chylex/customwindowtitle/TitleConfig.java
View File

@ -13,7 +13,7 @@ import java.util.stream.Collectors;
public final class TitleConfig {
private static final Map<String, String> DEFAULTS;
private static volatile TitleConfig instance = null;
private static TitleConfig instance;
static {
final Map<String, String> defaults = new LinkedHashMap<>();
@ -22,56 +22,50 @@ public final class TitleConfig {
DEFAULTS = Collections.unmodifiableMap(defaults);
}
public static TitleConfig getInstance() {
return instance;
}
public static TitleConfig load(final String folder) {
if (instance != null)
throw new IllegalStateException("TitleConfig has already been loaded and cannot be loaded again.");
public static TitleConfig read(final String folder) {
if (instance == null) {
synchronized (TitleConfig.class) {
if (instance == null) {
final Path configFile = Paths.get(folder, "customwindowtitle-client.toml");
final Map<String, String> config = new LinkedHashMap<>(DEFAULTS);
final Path configFile = Paths.get(folder, "customwindowtitle-client.toml");
final Map<String, String> config = new LinkedHashMap<>(DEFAULTS);
try {
if (!Files.exists(configFile)) {
Files.write(configFile, config.entrySet().stream()
.map(entry -> String.format("%s = '%s'", entry.getKey(), entry.getValue()))
.collect(Collectors.toList()), StandardCharsets.UTF_8);
} else {
Files.readAllLines(configFile, StandardCharsets.UTF_8).stream()
.map(String::trim)
.filter(line -> !line.isEmpty())
.forEach(line -> {
final String[] split = line.split("=", 2);
if (split.length != 2) {
throw new RuntimeException("CustomWindowTitle configuration has an invalid line: " + line);
}
final String key = split[0].trim();
final String value = parseTrimmedValue(split[1].trim());
if (config.containsKey(key)) {
config.put(key, value);
} else {
throw new RuntimeException("CustomWindowTitle configuration has an invalid key: " + key);
}
});
}
} catch (final IOException e) {
throw new RuntimeException("CustomWindowTitle configuration error", e);
}
try {
if (!Files.exists(configFile)) {
Files.write(configFile, config.entrySet().stream()
.map(entry -> String.format("%s = '%s'", entry.getKey(), entry.getValue()))
.collect(Collectors.toList()), StandardCharsets.UTF_8);
} else {
Files.readAllLines(configFile, StandardCharsets.UTF_8).stream()
.map(String::trim)
.filter(line -> !line.isEmpty())
.forEach(line -> {
final String[] split = line.split("=", 2);
final String iconPath = config.get("squareIcon");
final Path pathIcon = iconPath.isEmpty() ? null : Paths.get(folder, iconPath);
if (pathIcon != null && Files.notExists(pathIcon)) {
throw new RuntimeException("CustomWindowTitle icon not found: " + pathIcon);
}
if (split.length != 2) {
throw new RuntimeException("CustomWindowTitle configuration has an invalid line: " + line);
}
instance = new TitleConfig(config.get("title"), pathIcon);
final String key = split[0].trim();
final String value = parseTrimmedValue(split[1].trim());
if (config.containsKey(key)) {
config.put(key, value);
} else {
throw new RuntimeException("CustomWindowTitle configuration has an invalid key: " + key);
}
});
}
} catch (final IOException e) {
throw new RuntimeException("CustomWindowTitle configuration error", e);
}
final String iconPath = config.get("squareIcon");
final Path pathIcon = iconPath.isEmpty() ? null : Paths.get(folder, iconPath);
if (pathIcon != null && Files.notExists(pathIcon)) {
throw new RuntimeException("CustomWindowTitle icon not found: " + pathIcon);
}
instance = new TitleConfig(config.get("title"), pathIcon);
}
return instance;
}
@ -103,7 +97,9 @@ public final class TitleConfig {
this.icon = icon;
}
public static TitleConfig getInstance() {
return instance;
}
public String getTitle() {
return title;

8
src/main/java/chylex/customwindowtitle/mixin/DisableVanillaTitle.java
View File

@ -15,4 +15,12 @@ public final class DisableVanillaTitle {
private void updateTitle(final CallbackInfo info) {
info.cancel();
}
@Inject(method = "onResourceLoadFinished", at = @At("HEAD"))
private void onFinishedLoading(final CallbackInfo callbackInfo) {
final TitleConfig config = TitleConfig.getInstance();
if (config != null && config.hasIcon()) {
IconChanger.setIcon(config.getIconPath());
}
}
}

20
src/main/java/chylex/customwindowtitle/mixin/InitializeCustomIcon.java
View File

@ -1,20 +0,0 @@
package chylex.customwindowtitle.mixin;
import chylex.customwindowtitle.IconChanger;
import chylex.customwindowtitle.TitleConfig;
import net.minecraft.client.Minecraft;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(Minecraft.class)
public final class InitializeCustomIcon {
@Inject(method = "onResourceLoadFinished", at = @At("HEAD"))
private void onFinishedLoading(final CallbackInfo callbackInfo) {
final TitleConfig config = TitleConfig.getInstance();
if (config != null && config.hasIcon()) {
IconChanger.setIcon(config.getIconPath());
}
}
}

3
src/main/resources/customwindowtitle.mixins.json
View File

@ -5,8 +5,7 @@
"refmap": "customwindowtitle.refmap.json",
"compatibilityLevel": "JAVA_17",
"client": [
"DisableVanillaTitle",
"InitializeCustomIcon"
"DisableVanillaTitle"
],
"injectors": {
"defaultRequire": 1