chylex/Minecraft-Window-Title
1
0
Fork 0
mirror of https://github.com/chylex/Minecraft-Window-Title.git synced 2025-04-07 19:15:45 +02:00
Code

Update for Minecraft 1.20 (excluding customizable icon)

Browse Source
This commit is contained in:
chylex 2023-06-13 00:20:39 +02:00
parent e2fb18fdef
commit 335c8cf87b
Signed by: chylex
GPG Key ID: 4DE42C8F19A80548
9 changed files with 26 additions and 67 deletions
Fabric/src/main/java/chylex/customwindowtitle/fabric
CustomWindowTitle.javaTokenProvider.java
Forge/src/main/java/chylex/customwindowtitle/forge
CustomWindowTitle.javaTokenProvider.java
src/main/java/chylex/customwindowtitle
TitleConfig.javaTitleParser.javaTitleTokens.java
data
CommonTokenProvider.java
mixin
DisableVanillaTitle.java

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

@ -1,8 +1,8 @@
package chylex.customwindowtitle.fabric;
import chylex.customwindowtitle.TitleConfig;
import chylex.customwindowtitle.TitleParser;
import chylex.customwindowtitle.data.CommonTokenData;
import com.mojang.blaze3d.platform.Window;
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.Minecraft;
@ -21,11 +21,6 @@ public class CustomWindowTitle implements ClientModInitializer {
}
private void updateTitle() {
final Window window = Minecraft.getInstance().getWindow();
window.setTitle(TitleParser.parse(config.getTitle()));
if (config.hasIcon()) {
window.setIcon(config.readIcon16(), config.readIcon32());
}
Minecraft.getInstance().getWindow().setTitle(TitleParser.parse(config.getTitle()));
}
}

1
Fabric/src/main/java/chylex/customwindowtitle/fabric/TokenProvider.java
View File

@ -1,4 +1,5 @@
package chylex.customwindowtitle.fabric;
import chylex.customwindowtitle.TokenException;
import chylex.customwindowtitle.data.CommonTokenProvider;
import net.fabricmc.loader.api.FabricLoader;

9
Forge/src/main/java/chylex/customwindowtitle/forge/CustomWindowTitle.java
View File

@ -1,8 +1,8 @@
package chylex.customwindowtitle.forge;
import chylex.customwindowtitle.TitleConfig;
import chylex.customwindowtitle.TitleParser;
import chylex.customwindowtitle.data.CommonTokenData;
import com.mojang.blaze3d.platform.Window;
import net.minecraft.client.Minecraft;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.IExtensionPoint.DisplayTest;
@ -29,11 +29,6 @@ public class CustomWindowTitle {
}
private void updateTitle() {
final Window window = Minecraft.getInstance().getWindow();
window.setTitle(TitleParser.parse(config.getTitle()));
if (config.hasIcon()) {
window.setIcon(config.readIcon16(), config.readIcon32());
}
Minecraft.getInstance().getWindow().setTitle(TitleParser.parse(config.getTitle()));
}
}

1
Forge/src/main/java/chylex/customwindowtitle/forge/TokenProvider.java
View File

@ -1,4 +1,5 @@
package chylex.customwindowtitle.forge;
import chylex.customwindowtitle.TokenException;
import chylex.customwindowtitle.data.CommonTokenProvider;
import net.minecraftforge.fml.ModList;

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

@ -1,28 +1,25 @@
package chylex.customwindowtitle;
import net.minecraft.server.packs.resources.IoSupplier;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.stream.Collectors;
public final class TitleConfig {
private static final Map<String, String> DEFAULTS;
private static final ImmutableMap<String, String> DEFAULTS = ImmutableMap.<String, String>builder()
.put("title", "Minecraft {mcversion}")
.build();
static {
final Map<String, String> defaults = new LinkedHashMap<>();
defaults.put("title", "Minecraft {mcversion}");
defaults.put("icon16", "");
defaults.put("icon32", "");
DEFAULTS = Collections.unmodifiableMap(defaults);
}
private static final ImmutableSet<String> IGNORED_KEYS = ImmutableSet.of(
"icon16",
"icon32"
);
public static TitleConfig read(final String folder) {
final Path configFile = Paths.get(folder, "customwindowtitle-client.toml");
@ -46,7 +43,7 @@ public final class TitleConfig {
if (config.containsKey(key)) {
config.put(key, value);
}
else {
else if (!IGNORED_KEYS.contains(key)) {
throw new RuntimeException("CustomWindowTitle configuration has an invalid key: " + key);
}
});
@ -55,25 +52,7 @@ public final class TitleConfig {
throw new RuntimeException("CustomWindowTitle configuration error", e);
}
final String icon16 = config.get("icon16");
final String icon32 = config.get("icon32");
final Path pathIcon16 = icon16.isEmpty() ? null : Paths.get(folder, icon16);
final Path pathIcon32 = icon32.isEmpty() ? null : Paths.get(folder, icon32);
if ((pathIcon16 == null) != (pathIcon32 == null)) {
throw new RuntimeException("CustomWindowTitle configuration specifies only one icon, both 'icon16' and 'icon32' must be set.");
}
if (pathIcon16 != null && Files.notExists(pathIcon16)) {
throw new RuntimeException("CustomWindowTitle 16x16 icon not found: " + pathIcon16);
}
if (pathIcon32 != null && Files.notExists(pathIcon32)) {
throw new RuntimeException("CustomWindowTitle 32x32 icon not found: " + pathIcon32);
}
return new TitleConfig(config.get("title"), pathIcon16, pathIcon32);
return new TitleConfig(config.get("title"));
}
private static String parseTrimmedValue(String value) {
@ -96,28 +75,12 @@ public final class TitleConfig {
}
private final String title;
private final Path icon16;
private final Path icon32;
private TitleConfig(final String title, final Path icon16, final Path icon32) {
private TitleConfig(final String title) {
this.title = title;
this.icon16 = icon16;
this.icon32 = icon32;
}
public String getTitle() {
return title;
}
public boolean hasIcon() {
return icon16 != null && icon32 != null;
}
public IoSupplier<InputStream> readIcon16() {
return IoSupplier.create(icon16);
}
public IoSupplier<InputStream> readIcon32() {
return IoSupplier.create(icon32);
}
}

3
src/main/java/chylex/customwindowtitle/TitleParser.java
View File

@ -1,4 +1,5 @@
package chylex.customwindowtitle;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
@ -11,7 +12,7 @@ public final class TitleParser {
private static final Logger logger = LogManager.getLogger("CustomWindowTitle");
public static String parse(final String input) {
final StringBuffer buffer = new StringBuffer();
final StringBuilder buffer = new StringBuilder();
final Matcher matcher = tokenRegex.matcher(input);
while (matcher.find()) {

1
src/main/java/chylex/customwindowtitle/TitleTokens.java
View File

@ -1,4 +1,5 @@
package chylex.customwindowtitle;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Function;

5
src/main/java/chylex/customwindowtitle/data/CommonTokenProvider.java
View File

@ -1,9 +1,10 @@
package chylex.customwindowtitle.data;
import net.minecraft.client.Minecraft;
import net.minecraft.SharedConstants;
public interface CommonTokenProvider {
default String getMinecraftVersion() {
return Minecraft.getInstance().getGame().getVersion().getName();
return SharedConstants.getCurrentVersion().getName();
}
String getModVersion(final String modId);

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

@ -1,4 +1,5 @@
package chylex.customwindowtitle.mixin;
import net.minecraft.client.Minecraft;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;