Mirrors/Geyser
3
0
Fork 0
Mirror von https://github.com/GeyserMC/Geyser.git synchronisiert 2024-12-26 16:12:46 +01:00
Code Issues Projekte Releases Wiki Aktivität

Use identifier from CustomBlockData in SkullResourcePackManager

Quellcode durchsuchen
Dieser Commit ist enthalten in:
davchoo 2022-07-28 19:43:03 -04:00
Ursprung 9f4f2aca94
Commit 2ca368019c
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: A0168C8E45799B7D
2 geänderte Dateien mit 18 neuen und 9 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

19
core/src/main/java/org/geysermc/geyser/pack/SkullResourcePackManager.java
Datei anzeigen

@ -29,6 +29,7 @@ import it.unimi.dsi.fastutil.Pair;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.GeyserImpl;
import org.geysermc.geyser.registry.BlockRegistries; import org.geysermc.geyser.registry.BlockRegistries;
import org.geysermc.geyser.registry.type.CustomSkull;
import org.geysermc.geyser.skin.SkinProvider; import org.geysermc.geyser.skin.SkinProvider;
import org.geysermc.geyser.util.FileUtils; import org.geysermc.geyser.util.FileUtils;
@ -180,7 +181,7 @@ public class SkullResourcePackManager {
} }
private static void addFloorGeometries(ZipOutputStream zipOS) throws IOException { private static void addFloorGeometries(ZipOutputStream zipOS) throws IOException {
String template = new String(FileUtils.readAllBytes("bedrock/skull_resource_pack/models/blocks/player_skull_floor.geo.json"), StandardCharsets.UTF_8); String template = FileUtils.readToString("bedrock/skull_resource_pack/models/blocks/player_skull_floor.geo.json");
String[] quadrants = {"a", "b", "c", "d"}; String[] quadrants = {"a", "b", "c", "d"};
for (int i = 0; i < quadrants.length; i++) { for (int i = 0; i < quadrants.length; i++) {
String quadrant = quadrants[i]; String quadrant = quadrants[i];
@ -197,11 +198,11 @@ public class SkullResourcePackManager {
} }
private static void addAttachables(ZipOutputStream zipOS) throws IOException { private static void addAttachables(ZipOutputStream zipOS) throws IOException {
String template = new String(FileUtils.readAllBytes("bedrock/skull_resource_pack/attachables/template_attachable.json"), StandardCharsets.UTF_8); String template = FileUtils.readToString("bedrock/skull_resource_pack/attachables/template_attachable.json");
for (String skinHash : SKULL_SKINS.keySet()) { for (CustomSkull skull : BlockRegistries.CUSTOM_SKULLS.get().values()) {
ZipEntry entry = new ZipEntry("skull_resource_pack/attachables/" + skinHash + ".json"); ZipEntry entry = new ZipEntry("skull_resource_pack/attachables/" + skull.getSkinHash() + ".json");
zipOS.putNextEntry(entry); zipOS.putNextEntry(entry);
zipOS.write(fillAttachableJson(template, skinHash).getBytes(StandardCharsets.UTF_8)); zipOS.write(fillAttachableJson(template, skull).getBytes(StandardCharsets.UTF_8));
zipOS.closeEntry(); zipOS.closeEntry();
} }
} }
@ -218,14 +219,14 @@ public class SkullResourcePackManager {
} }
private static void fillTemplate(ZipOutputStream zipOS, String path, UnaryOperator<String> filler) throws IOException { private static void fillTemplate(ZipOutputStream zipOS, String path, UnaryOperator<String> filler) throws IOException {
String template = new String(FileUtils.readAllBytes(path), StandardCharsets.UTF_8); String template = FileUtils.readToString(path);
String result = filler.apply(template); String result = filler.apply(template);
zipOS.write(result.getBytes(StandardCharsets.UTF_8)); zipOS.write(result.getBytes(StandardCharsets.UTF_8));
} }
private static String fillAttachableJson(String template, String skinHash) { private static String fillAttachableJson(String template, CustomSkull skull) {
return template.replace("${identifier}", "geyser:player_skull_" + skinHash) // TOOD use CustomSkull for this return template.replace("${identifier}", skull.getCustomBlockData().identifier())
.replace("${texture}", skinHash); .replace("${texture}", skull.getSkinHash());
} }
private static String fillManifestJson(String template) { private static String fillManifestJson(String template) {

8
core/src/main/java/org/geysermc/geyser/util/FileUtils.java
Datei anzeigen

@ -188,6 +188,14 @@ public class FileUtils {
} }
} }
/**
* @param resource the internal resource to read off from
* @return the contents decoded as a UTF-8 String
*/
public static String readToString(String resource) {
return new String(readAllBytes(resource), StandardCharsets.UTF_8);
}
/** /**
* Read the lines of a file and return it as a stream * Read the lines of a file and return it as a stream
* *