GeyserMC-Mirror/Thunder
1
0
Fork 0
mirror of https://github.com/GeyserMC/PackConverter.git synced 2026-01-04 15:31:36 +00:00
Code Issues Releases Activity

Use UnsafeKey where possible

Browse Source
This commit is contained in:
Aurora
2025-10-31 09:29:09 +00:00
parent 65a2722cdd
commit 5b43466bc2
5 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
converter/src/main/java/org/geysermc/pack/converter/type/texture/transformer/type/ColorizeTransformer.java
View File

@@ -292,7 +292,7 @@ public class ColorizeTransformer implements TextureTransformer {
}
if (finalImage != null) {
context.offer(UnsafeKey.key(Key.MINECRAFT_NAMESPACE, data.outputPath()), finalImage, "png");
context.offer(KeyUtil.key(Key.MINECRAFT_NAMESPACE, data.outputPath()), finalImage, "png");
}
}
}

7
converter/src/main/java/org/geysermc/pack/converter/type/texture/transformer/type/block/ChainTransformer.java
View File

@@ -30,6 +30,7 @@ import net.kyori.adventure.key.Key;
import org.geysermc.pack.converter.type.texture.transformer.TextureTransformer;
import org.geysermc.pack.converter.type.texture.transformer.TransformContext;
import org.geysermc.pack.converter.util.ImageUtil;
import org.geysermc.pack.converter.util.KeyUtil;
import org.jetbrains.annotations.NotNull;
import team.unnamed.creative.texture.Texture;
@@ -53,7 +54,7 @@ public class ChainTransformer implements TextureTransformer {
@Override
public void transform(@NotNull TransformContext context) throws IOException {
for (ChainData chainData : CHAIN_DATA) {
Key javaKey = Key.key(Key.MINECRAFT_NAMESPACE, JAVA_NAME.formatted(chainData.name()));
Key javaKey = KeyUtil.key(Key.MINECRAFT_NAMESPACE, JAVA_NAME.formatted(chainData.name()));
Texture javaTexture = context.poll(javaKey);
if (javaTexture == null) continue;
@@ -62,8 +63,8 @@ public class ChainTransformer implements TextureTransformer {
float scale = javaImage.getHeight() / 16f;
Key bedrock1Key = Key.key(Key.MINECRAFT_NAMESPACE, BEDROCK_1.formatted(chainData.name()));
Key bedrock2Key = Key.key(Key.MINECRAFT_NAMESPACE, BEDROCK_2.formatted(chainData.name()));
Key bedrock1Key = KeyUtil.key(Key.MINECRAFT_NAMESPACE, BEDROCK_1.formatted(chainData.name()));
Key bedrock2Key = KeyUtil.key(Key.MINECRAFT_NAMESPACE, BEDROCK_2.formatted(chainData.name()));
BufferedImage bedrock1Image = new BufferedImage(javaImage.getWidth(), javaImage.getHeight(), BufferedImage.TYPE_INT_ARGB);
BufferedImage bedrock2Image = new BufferedImage(javaImage.getWidth(), javaImage.getHeight(), BufferedImage.TYPE_INT_ARGB);

5
converter/src/main/java/org/geysermc/pack/converter/type/texture/transformer/type/entity/CopperGolemTransformer.java
View File

@@ -29,6 +29,7 @@ package org.geysermc.pack.converter.type.texture.transformer.type.entity;
import net.kyori.adventure.key.Key;
import org.geysermc.pack.converter.type.texture.transformer.TextureTransformer;
import org.geysermc.pack.converter.type.texture.transformer.TransformContext;
import org.geysermc.pack.converter.util.KeyUtil;
import org.jetbrains.annotations.NotNull;
import team.unnamed.creative.texture.Texture;
@@ -37,8 +38,8 @@ import java.awt.image.BufferedImage;
import java.io.IOException;
public class CopperGolemTransformer implements TextureTransformer {
private static final Key POPPY = Key.key(Key.MINECRAFT_NAMESPACE, "block/poppy.png");
private static final Key COPPER_POPPY = Key.key(Key.MINECRAFT_NAMESPACE, "entity/copper_golem/copper_golem_flower.png");
private static final Key POPPY = KeyUtil.key(Key.MINECRAFT_NAMESPACE, "block/poppy.png");
private static final Key COPPER_POPPY = KeyUtil.key(Key.MINECRAFT_NAMESPACE, "entity/copper_golem/copper_golem_flower.png");
@Override
public void transform(@NotNull TransformContext context) throws IOException {

4
converter/src/main/java/org/geysermc/pack/converter/util/KeyUtil.java
View File

@@ -36,10 +36,10 @@ public final class KeyUtil {
}
public static @NotNull Key key(final @NotNull String string) {
return Key.key(string);
return UnsafeKey.key(string);
}
public static @NotNull Key key(final @NotNull String namespace, final @NotNull String value) {
return Key.key(namespace, value);
return UnsafeKey.key(namespace, value);
}
}

7
converter/src/main/java/org/geysermc/pack/converter/util/UnsafeKey.java
View File

@@ -116,6 +116,13 @@ public class UnsafeKey implements Key {
return Key.super.compareTo(that);
}
public static @NotNull Key key(final @NotNull String string) {
final int index = string.indexOf(':');
final String namespace = index >= 1 ? string.substring(0, index) : MINECRAFT_NAMESPACE;
final String value = index >= 0 ? string.substring(index + 1) : string;
return key(namespace, value);
}
public static @NotNull Key key(final @NotNull String namespace, final @NotNull String value) {
return new UnsafeKey(namespace, value);
}