Add support for mapping custom waypoint styles

eclipseisoffline · eclipseisoffline · commit 7a771daae20c · 2026-06-26T10:48:05.000Z
diff --git a/client/src/main/java/org/geysermc/rainbow/client/ClientAssetResolver.java b/client/src/main/java/org/geysermc/rainbow/client/ClientAssetResolver.java
@@ -9,6 +9,8 @@
 import net.minecraft.client.renderer.texture.SpriteContents;
 import net.minecraft.client.renderer.texture.TextureAtlas;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.resources.WaypointStyle;
+import net.minecraft.client.resources.WaypointStyleManager;
 import net.minecraft.client.resources.metadata.animation.FrameSize;
 import net.minecraft.client.resources.model.EquipmentAssetManager;
 import net.minecraft.client.resources.model.EquipmentClientInfo;
@@ -23,13 +25,15 @@
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.world.item.equipment.EquipmentAsset;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.waypoints.WaypointStyleAsset;
 import org.geysermc.rainbow.Rainbow;
 import org.geysermc.rainbow.RainbowIO;
 import org.geysermc.rainbow.client.accessor.ResolvedModelAccessor;
 import org.geysermc.rainbow.client.accessor.SoundManagerAccessor;
 import org.geysermc.rainbow.client.mixin.EntityRenderDispatcherAccessor;
 import org.geysermc.rainbow.client.mixin.SpriteContentsAnimatedTextureAccessor;
 import org.geysermc.rainbow.client.mixin.SpriteContentsClientAccessor;
+import org.geysermc.rainbow.client.mixin.WaypointStyleManagerAccessor;
 import org.geysermc.rainbow.mapping.AssetResolver;
 import org.geysermc.rainbow.mapping.texture.TextureResource;
 import org.geysermc.rainbow.mixin.SpriteContentsAccessor;
@@ -44,12 +48,14 @@
 public class ClientAssetResolver implements AssetResolver {
     private final ModelManager modelManager;
     private final EquipmentAssetManager equipmentAssetManager;
+    private final WaypointStyleManager waypointStyleManager;
     private final ResourceManager resourceManager;
     private final AtlasManager atlasManager;
 
     public ClientAssetResolver(Minecraft minecraft) {
         modelManager = minecraft.getModelManager();
         equipmentAssetManager = ((EntityRenderDispatcherAccessor) minecraft.getEntityRenderDispatcher()).getEquipmentAssets();
+        waypointStyleManager = minecraft.gui.hud.getWaypointStyles();
         resourceManager = minecraft.getResourceManager();
         atlasManager = minecraft.getAtlasManager();
     }
@@ -74,6 +80,15 @@ public Optional<EquipmentClientInfo> getEquipmentInfo(ResourceKey<EquipmentAsset
         return Optional.of(equipmentAssetManager.get(key));
     }
 
+    @Override
+    public Optional<WaypointStyle> getWaypointStyle(ResourceKey<WaypointStyleAsset> key) {
+        WaypointStyle style = waypointStyleManager.get(key);
+        if (style == WaypointStyleManagerAccessor.getMissing()) {
+            return Optional.empty();
+        }
+        return Optional.of(style);
+    }
+
     @Override
     public Optional<TextureResource> getTexture(@Nullable Identifier atlasId, Identifier identifier) {
         if (atlasId == null) {
diff --git a/client/src/main/java/org/geysermc/rainbow/client/PackManager.java b/client/src/main/java/org/geysermc/rainbow/client/PackManager.java
@@ -131,6 +131,7 @@ private static String createPackSummary(BedrockPack pack, ClientPackSerializer p
         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("\nWaypoint style mappings written: ").append(stats.waypointStyleMappings());
         report.append("\n");
         report.append("\nItem texture atlas size: ").append(stats.itemAtlas());
         report.append("\nTerrain texture atlas size: ").append(stats.terrainAtlas());
diff --git a/client/src/main/java/org/geysermc/rainbow/client/command/PackGeneratorCommand.java b/client/src/main/java/org/geysermc/rainbow/client/command/PackGeneratorCommand.java
@@ -6,6 +6,7 @@
 import net.fabricmc.fabric.api.client.command.v2.ClientCommands;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.ChatFormatting;
+import net.minecraft.commands.arguments.ResourceKeyArgument;
 import net.minecraft.commands.arguments.coordinates.BlockPosArgument;
 import net.minecraft.commands.arguments.coordinates.Coordinates;
 import net.minecraft.commands.arguments.coordinates.LocalCoordinates;
@@ -14,14 +15,19 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.ClickEvent;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.ItemStackTemplate;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.waypoints.WaypointStyleAsset;
+import net.minecraft.world.waypoints.WaypointStyleAssets;
+import org.geysermc.rainbow.Rainbow;
 import org.geysermc.rainbow.client.PackManager;
 import org.geysermc.rainbow.client.mapper.InventoryMapper;
 import org.geysermc.rainbow.client.mapper.PackMapper;
 import org.geysermc.rainbow.client.mapper.RecipeMapper;
+import org.geysermc.rainbow.client.mixin.WaypointStyleManagerAccessor;
 import org.geysermc.rainbow.pack.BedrockPack;
 
 import java.nio.file.Path;
@@ -98,6 +104,21 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
                                         })
                                 )
                         )
+                        .then(ClientCommands.literal("waypoint")
+                                .then(ClientCommands.argument("style", ResourceKeyArgument.key(WaypointStyleAssets.ROOT_ID))
+                                        .suggests(WaypointStyleSuggestionProvider.INSTANCE)
+                                        .executes(context -> {
+                                            //noinspection unchecked
+                                            ResourceKey<WaypointStyleAsset> key = (ResourceKey<WaypointStyleAsset>) context.getArgument("style", ResourceKey.class);
+                                            return runWithPack(packManager, (source, pack) -> {
+                                                switch (pack.mapWaypointStyle(key)) {
+                                                    case PROBLEMS_OCCURRED -> source.sendError(Component.translatable("commands.rainbow.mapped_waypoint_style_problems", key.identifier()));
+                                                    case MAPPED_SUCCESSFULLY -> source.sendFeedback(Component.translatable("commands.rainbow.mapped_waypoint_style", key.identifier()));
+                                                }
+                                            }).run(context);
+                                        })
+                                )
+                        )
                 )
                 .then(ClientCommands.literal("mapinventory")
                         .executes(runWithPack(packManager, (source, pack) -> {
@@ -178,6 +199,16 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
                                     }
                                 }))
                         )
+                        .then(ClientCommands.literal("waypoints")
+                                .executes(runWithPack(packManager, (source, pack) -> {
+                                    long mapped = ((WaypointStyleManagerAccessor) source.getClient().gui.hud.getWaypointStyles()).getWaypointStyles().keySet().stream()
+                                            .filter(key -> !Rainbow.isVanilla(key))
+                                            .map(pack::mapWaypointStyle)
+                                            .filter(result -> result == BedrockPack.MappingResult.MAPPED_SUCCESSFULLY)
+                                            .count();
+                                    source.sendFeedback(Component.translatable("commands.rainbow.mapped_waypoint_styles", mapped));
+                                }))
+                        )
                         .then(ClientCommands.literal("stop")
                                 .executes(runWithPack(packManager, (source, _) -> {
                                     packMapper.setItemProvider(null);
diff --git a/client/src/main/java/org/geysermc/rainbow/client/command/SoundNamespaceSuggestionProvider.java b/client/src/main/java/org/geysermc/rainbow/client/command/SoundNamespaceSuggestionProvider.java
@@ -6,7 +6,7 @@
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.commands.SharedSuggestionProvider;
-import net.minecraft.resources.Identifier;
+import org.geysermc.rainbow.Rainbow;
 import org.geysermc.rainbow.client.accessor.SoundManagerAccessor;
 
 import java.util.concurrent.CompletableFuture;
@@ -20,6 +20,6 @@ protected SoundNamespaceSuggestionProvider() {}
     public CompletableFuture<Suggestions> getSuggestions(CommandContext<FabricClientCommandSource> context, SuggestionsBuilder builder) {
 
         return SharedSuggestionProvider.suggest(((SoundManagerAccessor) context.getSource().getClient().getSoundManager()).rainbow$getRawRegistrations().keySet().stream()
-                .filter(namespace -> !namespace.equals(Identifier.DEFAULT_NAMESPACE)), builder);
+                .filter(namespace -> !Rainbow.isVanilla(namespace)), builder);
     }
 }
diff --git a/client/src/main/java/org/geysermc/rainbow/client/command/WaypointStyleSuggestionProvider.java b/client/src/main/java/org/geysermc/rainbow/client/command/WaypointStyleSuggestionProvider.java
@@ -0,0 +1,28 @@
+package org.geysermc.rainbow.client.command;
+
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.suggestion.SuggestionProvider;
+import com.mojang.brigadier.suggestion.Suggestions;
+import com.mojang.brigadier.suggestion.SuggestionsBuilder;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
+import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.resources.ResourceKey;
+import org.geysermc.rainbow.client.mixin.WaypointStyleManagerAccessor;
+
+import java.util.concurrent.CompletableFuture;
+
+public class WaypointStyleSuggestionProvider implements SuggestionProvider<FabricClientCommandSource> {
+    public static final WaypointStyleSuggestionProvider INSTANCE = new WaypointStyleSuggestionProvider();
+
+    protected WaypointStyleSuggestionProvider() {}
+
+    @Override
+    public CompletableFuture<Suggestions> getSuggestions(CommandContext<FabricClientCommandSource> context, SuggestionsBuilder builder) {
+        return SharedSuggestionProvider.suggestResource(
+                ((WaypointStyleManagerAccessor) context.getSource().getClient().gui.hud.getWaypointStyles()).getWaypointStyles()
+                        .keySet()
+                        .stream()
+                        .map(ResourceKey::identifier),
+                builder);
+    }
+}
diff --git a/client/src/main/java/org/geysermc/rainbow/client/mixin/WaypointStyleManagerAccessor.java b/client/src/main/java/org/geysermc/rainbow/client/mixin/WaypointStyleManagerAccessor.java
@@ -0,0 +1,22 @@
+package org.geysermc.rainbow.client.mixin;
+
+import net.minecraft.client.resources.WaypointStyle;
+import net.minecraft.client.resources.WaypointStyleManager;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.waypoints.WaypointStyleAsset;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.Map;
+
+@Mixin(WaypointStyleManager.class)
+public interface WaypointStyleManagerAccessor {
+
+    @Accessor("MISSING")
+    static WaypointStyle getMissing() {
+        throw new AssertionError();
+    }
+
+    @Accessor
+    Map<ResourceKey<WaypointStyleAsset>, WaypointStyle> getWaypointStyles();
+}
diff --git a/client/src/main/resources/assets/rainbow_lang b/client/src/main/resources/assets/rainbow_lang
@@ -1 +1 @@
-Subproject commit 36998e65f2f8181a7feea284c936e5f3452cd142
+Subproject commit ce588f9293c289b9e8a16eb8315e370210894008
diff --git a/client/src/main/resources/rainbow-client.mixins.json b/client/src/main/resources/rainbow-client.mixins.json
@@ -12,7 +12,8 @@
     "SoundManagerMixin",
     "SplashRendererAccessor",
     "SpriteContentsAnimatedTextureAccessor",
-    "SpriteContentsClientAccessor"
+    "SpriteContentsClientAccessor",
+    "WaypointStyleManagerAccessor"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/Rainbow.java b/rainbow/src/main/java/org/geysermc/rainbow/Rainbow.java
@@ -3,6 +3,7 @@
 import com.mojang.logging.LogUtils;
 import net.minecraft.client.resources.model.ResolvedModel;
 import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceKey;
 import org.slf4j.Logger;
 
 public class Rainbow {
@@ -31,4 +32,16 @@ public static Identifier getModelIdentifier(ResolvedModel model) {
         // debugName() returns the resource location of the model as a string
         return Identifier.parse(model.debugName());
     }
+
+    public static boolean isVanilla(String namespace) {
+        return namespace.equals(Identifier.DEFAULT_NAMESPACE);
+    }
+
+    public static boolean isVanilla(Identifier identifier) {
+        return isVanilla(identifier.getNamespace());
+    }
+
+    public static boolean isVanilla(ResourceKey<?> key) {
+        return isVanilla(key.identifier());
+    }
 }
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserMappings.java b/rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserMappings.java
@@ -3,11 +3,13 @@
 import org.geysermc.rainbow.definition.block.GeyserBlockMappings;
 import org.geysermc.rainbow.definition.item.GeyserItemMappings;
 import org.geysermc.rainbow.definition.skull.GeyserSkullMappings;
+import org.geysermc.rainbow.definition.waypoint.GeyserWaypointStyleMappings;
 
 public record GeyserMappings(GeyserBlockMappings blocks, GeyserItemMappings items,
-                             GeyserSkullMappings skulls) {
+                             GeyserSkullMappings skulls, GeyserWaypointStyleMappings waypointStyles) {
 
     public GeyserMappings() {
-        this(new GeyserBlockMappings(), new GeyserItemMappings(), new GeyserSkullMappings());
+        this(new GeyserBlockMappings(), new GeyserItemMappings(),
+                new GeyserSkullMappings(), new GeyserWaypointStyleMappings());
     }
 }
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/definition/waypoint/GeyserWaypointStyleMappings.java b/rainbow/src/main/java/org/geysermc/rainbow/definition/waypoint/GeyserWaypointStyleMappings.java
@@ -0,0 +1,43 @@
+package org.geysermc.rainbow.definition.waypoint;
+
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import net.minecraft.client.resources.WaypointStyle;
+import net.minecraft.resources.Identifier;
+import org.geysermc.rainbow.CodecUtil;
+
+import java.util.Collections;
+import java.util.Map;
+
+public final class GeyserWaypointStyleMappings {
+    public static final Codec<GeyserWaypointStyleMappings> CODEC = RecordCodecBuilder.create(instance ->
+            instance.group(
+                    CodecUtil.unitVerifyCodec(Codec.INT, "format_version", 1),
+                    Codec.unboundedMap(Identifier.CODEC, WaypointStyle.CODEC).fieldOf("waypoint_styles").forGetter(GeyserWaypointStyleMappings::mappings)
+            ).apply(instance, (_, mappings) -> new GeyserWaypointStyleMappings(mappings))
+    );
+
+    private final Map<Identifier, WaypointStyle> mappings = new Object2ObjectOpenHashMap<>();
+
+    public GeyserWaypointStyleMappings() {}
+
+    private GeyserWaypointStyleMappings(Map<Identifier, WaypointStyle> mappings) {
+        this.mappings.putAll(mappings);
+    }
+
+    public void map(Identifier identifier, WaypointStyle style) {
+        if (mappings.containsKey(identifier)) {
+            throw new IllegalStateException("tried to map waypoint style for " + identifier + " twice");
+        }
+        mappings.put(identifier, style);
+    }
+
+    public Map<Identifier, WaypointStyle> mappings() {
+        return Collections.unmodifiableMap(mappings);
+    }
+
+    public int size() {
+        return mappings.size();
+    }
+}
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/definition/waypoint/package-info.java b/rainbow/src/main/java/org/geysermc/rainbow/definition/waypoint/package-info.java
@@ -1,4 +1,4 @@
 @NullMarked
-package org.geysermc.rainbow.client.skull;
+package org.geysermc.rainbow.definition.waypoint;
 
 import org.jspecify.annotations.NullMarked;
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/mapping/AssetResolver.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/AssetResolver.java
@@ -3,6 +3,7 @@
 import net.minecraft.client.renderer.block.dispatch.BlockStateModel;
 import net.minecraft.client.renderer.item.ClientItem;
 import net.minecraft.client.renderer.texture.MissingTextureAtlasSprite;
+import net.minecraft.client.resources.WaypointStyle;
 import net.minecraft.client.resources.model.EquipmentClientInfo;
 import net.minecraft.client.resources.model.ResolvedModel;
 import net.minecraft.client.resources.sounds.SoundEventRegistration;
@@ -12,6 +13,7 @@
 import net.minecraft.server.packs.resources.Resource;
 import net.minecraft.world.item.equipment.EquipmentAsset;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.waypoints.WaypointStyleAsset;
 import org.geysermc.rainbow.mapping.texture.TextureResource;
 import org.jspecify.annotations.Nullable;
 
@@ -28,6 +30,8 @@ public interface AssetResolver {
 
     Optional<EquipmentClientInfo> getEquipmentInfo(ResourceKey<EquipmentAsset> key);
 
+    Optional<WaypointStyle> getWaypointStyle(ResourceKey<WaypointStyleAsset> key);
+
     Optional<TextureResource> getTexture(@Nullable Identifier atlas, Identifier identifier);
 
     Optional<Resource> getSound(Identifier sound);
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/mapping/BedrockAssetConsumer.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/BedrockAssetConsumer.java
@@ -2,10 +2,13 @@
 
 import org.geysermc.rainbow.pack.BedrockBlock;
 import org.geysermc.rainbow.pack.BedrockItem;
+import org.geysermc.rainbow.pack.BedrockWaypointStyle;
 
 public interface BedrockAssetConsumer {
 
     void acceptBlock(BedrockBlock block);
 
     void acceptItem(BedrockItem item);
+
+    void acceptWaypointStyle(BedrockWaypointStyle style);
 }
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/mapping/BedrockBlockMapper.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/BedrockBlockMapper.java
@@ -87,7 +87,7 @@ private static void tryMapBlockState(BlockState state, ProblemSuccessReporter re
                 Identifier stateModel = stateVariant.modelLocation();
 
                 // If not including vanilla, only map variants that don't use a vanilla block model
-                if (includeVanilla || !stateModel.getNamespace().equals(Identifier.DEFAULT_NAMESPACE)) {
+                if (includeVanilla || !Rainbow.isVanilla(stateModel)) {
                     context.assetResolver().getResolvedModel(stateModel)
                             .ifPresentOrElse(model -> {
                                 if (ModelTextures.hasNoMaterials(model.getTopTextureSlots())) {
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/mapping/BedrockItemMapper.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/BedrockItemMapper.java
@@ -41,6 +41,7 @@
 import net.minecraft.world.level.Level;
 import org.apache.commons.lang3.ArrayUtils;
 import org.geysermc.rainbow.ProblemSuccessReporter;
+import org.geysermc.rainbow.Rainbow;
 import org.geysermc.rainbow.mapping.attachable.BedrockAttachableContext;
 import org.geysermc.rainbow.mapping.geometry.BedrockGeometryContext;
 import org.geysermc.rainbow.definition.item.GeyserBaseItemDefinition;
@@ -257,7 +258,7 @@ public void map(CuboidItemModelWrapper.Unbaked model) {
             packContext.assetResolver().getResolvedModel(modelIdentifier)
                     .ifPresentOrElse(itemModel -> {
                         Identifier bedrockIdentifier;
-                        if (modelIdentifier.getNamespace().equals(Identifier.DEFAULT_NAMESPACE)) {
+                        if (Rainbow.isVanilla(modelIdentifier)) {
                             bedrockIdentifier = Identifier.fromNamespaceAndPath("geyser_mc", modelIdentifier.getPath());
                         } else {
                             bedrockIdentifier = modelIdentifier;
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/mapping/BedrockWaypointStyleMapper.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/BedrockWaypointStyleMapper.java
@@ -0,0 +1,29 @@
+package org.geysermc.rainbow.mapping;
+
+import net.minecraft.client.resources.WaypointStyle;
+import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.waypoints.WaypointStyleAsset;
+import org.geysermc.rainbow.ProblemSuccessReporter;
+import org.geysermc.rainbow.mapping.texture.TextureHolder;
+import org.geysermc.rainbow.pack.BedrockWaypointStyle;
+
+import java.util.Optional;
+
+public class BedrockWaypointStyleMapper {
+
+    public static void tryMapWaypointStyle(ResourceKey<WaypointStyleAsset> key, ProblemSuccessReporter reporter, PackContext context) {
+        Optional<WaypointStyle> optional = context.assetResolver().getWaypointStyle(key);
+        optional.ifPresentOrElse(style -> {
+            context.mappings().waypointStyles().map(key.identifier(), style);
+            context.assetConsumer().acceptWaypointStyle(new BedrockWaypointStyle(style.sprites().stream()
+                    .map(sprite -> TextureHolder.createBuiltIn(javaSpriteToBedrockSprite(sprite), sprite.withPrefix("gui/sprites/hud/locator_bar_dot/")))
+                    .toList()));
+            reporter.reportSuccess(() -> "mapped waypoint style " + key.identifier() + " with " + style.sprites().size() + " sprites");
+        }, () -> reporter.report(() -> "not mapping missing waypoint style " + key.identifier()));
+    }
+
+    private static Identifier javaSpriteToBedrockSprite(Identifier sprite) {
+        return Identifier.withDefaultNamespace("ui/" + sprite.getNamespace() + "/locator_bar_dot/" + sprite.getPath());
+    }
+}
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/mapping/PackStats.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/PackStats.java
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/pack/BedrockPack.java b/rainbow/src/main/java/org/geysermc/rainbow/pack/BedrockPack.java
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/pack/BedrockWaypointStyle.java b/rainbow/src/main/java/org/geysermc/rainbow/pack/BedrockWaypointStyle.java
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/pack/PackPaths.java b/rainbow/src/main/java/org/geysermc/rainbow/pack/PackPaths.java
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/pack/sound/BedrockSoundDefinitions.java b/rainbow/src/main/java/org/geysermc/rainbow/pack/sound/BedrockSoundDefinitions.java

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`import com.mojang.brigadier.suggestion.SuggestionsBuilder;`
`7`	`7`	`import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;`
`8`	`8`	`import net.minecraft.commands.SharedSuggestionProvider;`
`9`		`-import net.minecraft.resources.Identifier;`
	`9`	`+import org.geysermc.rainbow.Rainbow;`
`10`	`10`	`import org.geysermc.rainbow.client.accessor.SoundManagerAccessor;`
`11`	`11`
`12`	`12`	`import java.util.concurrent.CompletableFuture;`
`@@ -20,6 +20,6 @@ protected SoundNamespaceSuggestionProvider() {}`
`20`	`20`	`public CompletableFuture<Suggestions> getSuggestions(CommandContext<FabricClientCommandSource> context, SuggestionsBuilder builder) {`
`21`	`21`
`22`	`22`	`return SharedSuggestionProvider.suggest(((SoundManagerAccessor) context.getSource().getClient().getSoundManager()).rainbow$getRawRegistrations().keySet().stream()`
`23`		`- .filter(namespace -> !namespace.equals(Identifier.DEFAULT_NAMESPACE)), builder);`
	`23`	`+ .filter(namespace -> !Rainbow.isVanilla(namespace)), builder);`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,13 @@`
`3`	`3`	`import org.geysermc.rainbow.definition.block.GeyserBlockMappings;`
`4`	`4`	`import org.geysermc.rainbow.definition.item.GeyserItemMappings;`
`5`	`5`	`import org.geysermc.rainbow.definition.skull.GeyserSkullMappings;`
	`6`	`+import org.geysermc.rainbow.definition.waypoint.GeyserWaypointStyleMappings;`
`6`	`7`
`7`	`8`	`public record GeyserMappings(GeyserBlockMappings blocks, GeyserItemMappings items,`
`8`		`- GeyserSkullMappings skulls) {`
	`9`	`+ GeyserSkullMappings skulls, GeyserWaypointStyleMappings waypointStyles) {`
`9`	`10`
`10`	`11`	`public GeyserMappings() {`
`11`		`- this(new GeyserBlockMappings(), new GeyserItemMappings(), new GeyserSkullMappings());`
	`12`	`+ this(new GeyserBlockMappings(), new GeyserItemMappings(),`
	`13`	`+ new GeyserSkullMappings(), new GeyserWaypointStyleMappings());`
`12`	`14`	`}`
`13`	`15`	`}`