Move custom skulls handling to core project, switch to generating mappings instead of YAML file

Author: eclipseisoffline

client/src/main/java/org/geysermc/rainbow/client/PackManager.java

@@ -11,7 +11,6 @@
 import org.geysermc.rainbow.RainbowIO;
 import org.geysermc.rainbow.client.mixin.SplashRendererAccessor;
 import org.geysermc.rainbow.client.render.MinecraftGeometryRenderer;
-import org.geysermc.rainbow.client.skull.CustomSkulls;
 import org.geysermc.rainbow.mapping.AssetCacheStats;
 import org.geysermc.rainbow.mapping.PackStats;
 import org.geysermc.rainbow.pack.BedrockPack;
@@ -29,9 +28,8 @@ public final class PackManager {
 #### READ THIS FIRST ####
 What do I do now?
 
-In this folder, you'll find 4 important files/folders along with this one:
+In this folder, you'll find 3 important files/folders along with this one:
 
-- custom-skulls.yml: put this in Geyser's config folder. These are the exported player skulls. The file may already exist in Geyser's config folder, be careful with overwriting it!
 - custom_mappings: you need to put the files in here in the `custom_mappings` folder in Geyser's config folder. These are the generated Geyser mappings.
 - pack.zip: put this in the "packs" folder in Geyser's config folder. This is the generated bedrock resourcepack.
 - lang: put all files in this folder in the "locales/overrides" folder in Geyser's config folder. These are the exported custom translation strings.
@@ -56,23 +54,23 @@ You can also open an issue report over at our issue tracker (https://github.com/
             "you are now blinking manually", "you're eligible for a free hug token! <3", "don't mind me!", "hissss", "Gayser and Floodgayte, my favourite plugins.",
             "meow", "we'll be done here soon™", "got anything else to say?", "we're done now!", "this will be fixed by v6053", "expect it to be done within 180 business days!",
             "any colour you like", "someone tell Mojang about this", "you can't unbake baked models, so we'll store the unbaked models", "soon fully datagen ready",
-            "packconverter when", "codecs ftw");
+            "packconverter when", "codecs ftw", "skull mappings >>> custom-skulls.yml",
+            "now with the ultimate, greatest custom content ever, which everybody asked for: custom waypoints", "unable to handle the merge");
     private static final RandomSource RANDOM = RandomSource.create();
 
     private static final Path EXPORT_DIRECTORY = FabricLoader.getInstance().getGameDir().resolve(Rainbow.MOD_ID);
     private static final Path PACK_DIRECTORY = Path.of("pack");
     private static final Path MAPPINGS_DIRECTORY = Path.of("custom_mappings");
     private static final Path PACK_ZIP_FILE = Path.of("pack.zip");
     private static final Path PACK_LANG_FOLDER = Path.of("lang");
-    private static final Path SKULLS_FILE = Path.of("custom-skulls.yml");
     private static final Path REPORT_FILE = Path.of("report.txt");
 
     private final ClientPackSerializer packSerializer = new ClientPackSerializer();
-    private Optional<RainbowPack> currentPack = Optional.empty();
+    private Optional<BedrockPack> currentPack = Optional.empty();
 
     public void startPack(String name) throws IOException {
         if (currentPack.isPresent()) {
-            throw new IllegalStateException("Already started a pack (" + currentPack.get().resources.name() + ")");
+            throw new IllegalStateException("Already started a pack (" + currentPack.get().name() + ")");
         }
         packSerializer.prepare(Objects.requireNonNull(Minecraft.getInstance().level).registryAccess());
 
@@ -84,27 +82,25 @@ public void startPack(String name) throws IOException {
                 .withGeometryRenderer(MinecraftGeometryRenderer.INSTANCE)
                 .reportSuccesses()
                 .build();
-        currentPack = Optional.of(new RainbowPack(pack, new CustomSkulls()));
+        currentPack = Optional.of(pack);
     }
 
-    public void run(Consumer<RainbowPack> consumer) {
+    public void run(Consumer<BedrockPack> consumer) {
         currentPack.ifPresent(consumer);
     }
 
-    public void runOrElse(Consumer<RainbowPack> consumer, Runnable runnable) {
+    public void runOrElse(Consumer<BedrockPack> consumer, Runnable runnable) {
         currentPack.ifPresentOrElse(consumer, runnable);
     }
 
     public Optional<Path> getExportPath() {
-        return currentPack.map(pack -> EXPORT_DIRECTORY.resolve(pack.resources.name()));
+        return currentPack.map(pack -> EXPORT_DIRECTORY.resolve(pack.name()));
     }
 
     public boolean finish(Runnable onFinish) {
         currentPack.ifPresent(pack -> {
-            Path skullsPath = EXPORT_DIRECTORY.resolve(pack.resources.name()).resolve(SKULLS_FILE);
-            Path reportPath = EXPORT_DIRECTORY.resolve(pack.resources.name()).resolve(REPORT_FILE);
-            pack.resources.save().thenRun(() -> {
-                RainbowIO.safeIO(() -> Files.writeString(skullsPath, pack.skulls.createConfig()));
+            Path reportPath = EXPORT_DIRECTORY.resolve(pack.name()).resolve(REPORT_FILE);
+            pack.save().thenRun(() -> {
                 RainbowIO.safeIO(() -> Files.writeString(reportPath, createPackSummary(pack, packSerializer)));
                 onFinish.run();
             });
@@ -114,17 +110,15 @@ public boolean finish(Runnable onFinish) {
         return wasPresent;
     }
 
-    public record RainbowPack(BedrockPack resources, CustomSkulls skulls) {}
-
     // TODO: clean this up
-    private static String createPackSummary(RainbowPack pack, ClientPackSerializer packSerializer) {
-        String problems = ((ProblemReporter.Collector) pack.resources.getReporter()).getTreeReport();
+    private static String createPackSummary(BedrockPack pack, ClientPackSerializer packSerializer) {
+        String problems = ((ProblemReporter.Collector) pack.getReporter()).getTreeReport();
         if (StringUtil.isBlank(problems)) {
             problems = "Well that's odd... there's nothing here!";
         }
 
-        long attachables = pack.resources.getBedrockItems().stream().filter(item -> item.attachableContext().attachable().isPresent()).count();
-        PackStats stats = pack.resources.stats();
+        long attachables = pack.getBedrockItems().stream().filter(item -> item.attachableContext().attachable().isPresent()).count();
+        PackStats stats = pack.stats();
         AssetCacheStats cacheStats = stats.cacheStats();
 
         StringBuilder report = new StringBuilder(REPORT_HEADER);
@@ -134,7 +128,7 @@ private static String createPackSummary(RainbowPack pack, ClientPackSerializer p
         report.append('\n');
         report.append("\nVersion of Rainbow: ").append(RainbowClient.getVersion());
         report.append("\n");
-        report.append("\nGenerated pack: ").append(pack.resources.name());
+        report.append("\nGenerated pack: ").append(pack.name());
         report.append("\nBlock mappings written: ").append(stats.blockMappings());
         report.append("\nItem mappings written: ").append(stats.itemMappings());
         report.append("\n");
@@ -148,9 +142,9 @@ private static String createPackSummary(RainbowPack pack, ClientPackSerializer p
         report.append("\nJSON-files written: ").append(packSerializer.jsonExported());
         report.append("\nTextures written: ").append(packSerializer.texturesExported());
         report.append("\n");
-        report.append("\nUsername skulls exported: ").append(pack.skulls.usernames());
-        report.append("\nUUID skulls exported: ").append(pack.skulls.uuids());
-        report.append("\nStatic texture skulls exported: ").append(pack.skulls.textures());
+        report.append("\nUsername skulls exported: ").append("TODO");//.append(pack.skulls.usernames());
+        report.append("\nUUID skulls exported: ").append("TODO");//.append(pack.skulls.uuids());
+        report.append("\nStatic texture skulls exported: ").append("TODO");//.append(pack.skulls.textures());
         report.append("\n");
         report.append("\n-- ASSET CACHE STATS --");
         report.append("\nGeometry cache: %d written, %d cache hits ".formatted(cacheStats.geometry().size(), cacheStats.geometry().hits()));

client/src/main/java/org/geysermc/rainbow/client/command/PackGeneratorCommand.java

@@ -60,7 +60,7 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
                                             BlockPos pos = clientCoordinatesToBlockPos(context.getSource(), context.getArgument("target", Coordinates.class));
                                             BlockState state = context.getSource().getLevel().getBlockState(pos);
                                             return runWithPack(packManager, (source, pack) -> {
-                                                switch (pack.resources().mapBlockStateExplicitly(state)) {
+                                                switch (pack.mapBlockStateExplicitly(state)) {
                                                     case NONE_MAPPED -> source.sendError(Component.translatable("commands.rainbow.no_block_mapped"));
                                                     case PROBLEMS_OCCURRED -> source.sendFeedback(Component.translatable("commands.rainbow.mapped_target_block_problems"));
                                                     case MAPPED_SUCCESSFULLY -> source.sendFeedback(Component.translatable("commands.rainbow.mapped_target_block"));
@@ -89,7 +89,7 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
                                         .executes(context -> {
                                             String namespace = StringArgumentType.getString(context, "namespace");
                                             return runWithPack(packManager, (source, pack) -> {
-                                                if (pack.resources().mapSounds(namespace)) {
+                                                if (pack.mapSounds(namespace)) {
                                                     source.sendFeedback(Component.translatable("commands.rainbow.mapped_sounds_of_namespace", namespace));
                                                 } else {
                                                     source.sendError(Component.translatable("commands.rainbow.no_sounds_mapped"));
@@ -145,7 +145,7 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
                          */
                         .then(ClientCommands.literal("blocks")
                                 .executes(runWithPack(packManager, (source, pack) -> {
-                                    BedrockPack.MappingResults results = pack.resources().tryMapAllVanillaBlocks();
+                                    BedrockPack.MappingResults results = pack.tryMapAllVanillaBlocks();
                                     switch (results.toSingleResult()) {
                                         case NONE_MAPPED -> source.sendFeedback(Component.translatable("commands.rainbow.no_blocks_mapped"));
                                         case MAPPED_SUCCESSFULLY, PROBLEMS_OCCURRED -> {
@@ -171,7 +171,7 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
                         )
                         .then(ClientCommands.literal("sounds")
                                 .executes(runWithPack(packManager, (source, pack) -> {
-                                    if (pack.resources().mapAllSounds()) {
+                                    if (pack.mapAllSounds()) {
                                         source.sendFeedback(Component.translatable("commands.rainbow.mapped_all_sounds"));
                                     } else {
                                         source.sendError(Component.translatable("commands.rainbow.no_sounds_mapped"));
@@ -200,7 +200,7 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
         );
     }
 
-    private static Command<FabricClientCommandSource> runWithPack(PackManager manager, BiConsumer<FabricClientCommandSource, PackManager.RainbowPack> executor) {
+    private static Command<FabricClientCommandSource> runWithPack(PackManager manager, BiConsumer<FabricClientCommandSource, BedrockPack> executor) {
         return context -> {
             manager.runOrElse(pack -> executor.accept(context.getSource(), pack),
                     () -> context.getSource().sendError(NO_PACK_CREATED));

client/src/main/java/org/geysermc/rainbow/client/mapper/PackMapper.java

@@ -51,18 +51,18 @@ public void tick(Minecraft minecraft) {
         }
     }
 
-    public MappingResults mapItems(PackManager.RainbowPack pack, Collection<ItemStackTemplate> items) {
+    public MappingResults mapItems(BedrockPack pack, Collection<ItemStackTemplate> items) {
         long skullsMapped = items.stream()
                 .filter(stack -> {
                     ResolvableProfile profile = stack.get(DataComponents.PROFILE);
-                    return profile != null && pack.skulls().withProfile(profile);
+                    return profile != null && pack.mapSkull(profile) == BedrockPack.MappingResult.MAPPED_SUCCESSFULLY;
                 })
                 .count();
 
         int itemsMapped = 0;
         int problems = 0;
         for (ItemStackTemplate stack : items) {
-            switch (pack.resources().mapItem(stack)) {
+            switch (pack.mapItem(stack)) {
                 case MAPPED_SUCCESSFULLY -> itemsMapped++;
                 case PROBLEMS_OCCURRED -> {
                     itemsMapped++;

client/src/main/java/org/geysermc/rainbow/client/skull/CustomSkulls.java

@@ -1,4 +1,3 @@
 accessWidener v2 official
 accessible class net/minecraft/client/renderer/texture/SpriteContents$AnimatedTexture
 accessible class net/minecraft/client/renderer/texture/SpriteContents$FrameInfo
-accessible class net/minecraft/world/item/component/ResolvableProfile$Partial

client/src/main/resources/rainbow-client.accesswidener

@@ -9,15 +9,12 @@
     "ModelManagerMixin",
     "PictureInPictureRendererAccessor",
     "PictureInPictureRendererMixin",
+    "SoundManagerMixin",
     "SplashRendererAccessor",
     "SpriteContentsAnimatedTextureAccessor",
     "SpriteContentsClientAccessor"
   ],
   "injectors": {
     "defaultRequire": 1
-  },
-  "mixins": [
-    "ResolvableProfileAccessor",
-    "SoundManagerMixin"
-  ]
+  }
 }

client/src/main/resources/rainbow-client.mixins.json

@@ -4,5 +4,7 @@ plugins {
 }
 
 loom {
+    accessWidenerPath = file("src/main/resources/rainbow.accesswidener")
+
     runs.clear()
 }

rainbow/build.gradle.kts

@@ -2,10 +2,12 @@
 
 import org.geysermc.rainbow.definition.block.GeyserBlockMappings;
 import org.geysermc.rainbow.definition.item.GeyserItemMappings;
+import org.geysermc.rainbow.definition.skull.GeyserSkullMappings;
 
-public record GeyserMappings(GeyserBlockMappings blocks, GeyserItemMappings items) {
+public record GeyserMappings(GeyserBlockMappings blocks, GeyserItemMappings items,
+                             GeyserSkullMappings skulls) {
 
     public GeyserMappings() {
-        this(new GeyserBlockMappings(), new GeyserItemMappings());
+        this(new GeyserBlockMappings(), new GeyserItemMappings(), new GeyserSkullMappings());
     }
 }