Merge remote-tracking branch 'upstream/master' into custom-item-api-v2

# Conflicts:
#	core/src/main/java/org/geysermc/geyser/item/GeyserCustomMappingData.java
#	core/src/main/java/org/geysermc/geyser/registry/populator/CustomItemRegistryPopulator.java
#	core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java
#	core/src/main/resources/mappings

Author: eclipseisoffline

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,11 +1,12 @@
 name: Bug report
 description: Create a report to help us improve
+type: Bug
 body:
 - type: markdown
   attributes:
     value: |
       Thanks for taking the time to fill out this bug report for Geyser! Fill out the following form to your best ability to help us fix the problem.
-      Only use this if you're absolutely sure that you found a bug and can reproduce it. For anything else, use: [our Discord server](https://discord.gg/geysermc), [the FAQ](https://github.com/GeyserMC/Geyser/wiki/FAQ) or the [Common Issues](https://github.com/GeyserMC/Geyser/wiki/Common-Issues).
+      Only use this if you're absolutely sure that you found a bug and can reproduce it. For anything else, use: [our Discord server](https://discord.gg/geysermc), [the FAQ](https://geysermc.org/wiki/geyser/faq) or the [Common Issues](https://geysermc.org/wiki/geyser/common-issues).
 - type: textarea
   attributes:
     label: Describe the bug

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,12 +1,13 @@
 name: Feature request
 description: Suggest an idea for this project
 labels: "Feature Request"
+type: Feature
 body:
 - type: markdown
   attributes:
     value: |
       Thanks for taking the time to fill out this feature request for Geyser! Please fill out the following form to your best ability to help us understand your feature request and significantly improve the chance of getting added.
-      For anything else than a feature request, use: [our Discord server](https://discord.gg/geysermc), [the FAQ](https://github.com/GeyserMC/Geyser/wiki/FAQ) or [the Common Issues](https://github.com/GeyserMC/Geyser/wiki/Common-Issues).
+      For anything else than a feature request, use: [our Discord server](https://discord.gg/geysermc), [the FAQ](https://geysermc.org/wiki/geyser/faq) or the [Common Issues](https://geysermc.org/wiki/geyser/common-issues).
 - type: textarea
   attributes:
     label: What feature do you want to see added?
@@ -18,4 +19,4 @@ body:
     label: Are there any alternatives?
     description: List any alternatives you might have tried
   validations:
-    required: true
+    required: true

api/src/main/java/org/geysermc/geyser/api/block/custom/nonvanilla/JavaBlockItem.java

@@ -70,7 +70,7 @@ public interface JavaBlockState {
     @Nullable String pistonBehavior();
 
     /**
-     * Gets whether the block state has block entity
+     * Gets whether the block state has a block entity
      * 
      * @return whether the block state has block entity
      * @deprecated Does not have an effect. If you were using this to

api/src/main/java/org/geysermc/geyser/api/block/custom/nonvanilla/JavaBlockState.java

@@ -36,9 +36,6 @@ public final class Constants {
 
     public static final String FLOODGATE_DOWNLOAD_LOCATION = "https://geysermc.org/download#floodgate";
     public static final String GEYSER_DOWNLOAD_LOCATION = "https://geysermc.org/download";
-
-    @Deprecated
-    static final String SAVED_REFRESH_TOKEN_FILE = "saved-refresh-tokens.json";
     static final String SAVED_AUTH_CHAINS_FILE = "saved-auth-chains.json";
 
     public static final String GEYSER_CUSTOM_NAMESPACE = "geyser_custom";

core/src/main/java/org/geysermc/geyser/Constants.java

@@ -29,7 +29,6 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.Gson;
 import io.netty.channel.epoll.Epoll;
 import io.netty.util.NettyRuntime;
 import io.netty.util.concurrent.DefaultThreadFactory;
@@ -39,8 +38,6 @@
 import lombok.Setter;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
-import net.raphimc.minecraftauth.step.java.session.StepFullJavaSession;
-import net.raphimc.minecraftauth.step.msa.StepMsaToken;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -99,7 +96,6 @@
 import org.geysermc.geyser.util.AssetUtils;
 import org.geysermc.geyser.util.CooldownUtils;
 import org.geysermc.geyser.util.Metrics;
-import org.geysermc.geyser.util.MinecraftAuthLogger;
 import org.geysermc.geyser.util.NewsHandler;
 import org.geysermc.geyser.util.VersionCheckUtils;
 import org.geysermc.geyser.util.WebUtils;
@@ -566,53 +562,6 @@ private void startInstance() {
             // May be written/read to on multiple threads from each GeyserSession as well as writing the config
             savedAuthChains = new ConcurrentHashMap<>();
 
-            // TODO Remove after a while - just a migration help
-            //noinspection deprecation
-            File refreshTokensFile = bootstrap.getSavedUserLoginsFolder().resolve(Constants.SAVED_REFRESH_TOKEN_FILE).toFile();
-            if (refreshTokensFile.exists()) {
-                logger.info("Migrating refresh tokens to auth chains...");
-                TypeReference<Map<String, String>> type = new TypeReference<>() { };
-                Map<String, String> refreshTokens = null;
-                try {
-                    refreshTokens = JSON_MAPPER.readValue(refreshTokensFile, type);
-                } catch (IOException e) {
-                    // ignored - we'll just delete this file :))
-                }
-
-                if (refreshTokens != null) {
-                    List<String> validUsers = config.getSavedUserLogins();
-                    final Gson gson = new Gson();
-                    for (Map.Entry<String, String> entry : refreshTokens.entrySet()) {
-                        String user = entry.getKey();
-                        if (!validUsers.contains(user)) {
-                            continue;
-                        }
-
-                        // Migrate refresh tokens to auth chains
-                        try {
-                            StepFullJavaSession javaSession = PendingMicrosoftAuthentication.AUTH_FLOW.apply(false, 10);
-                            StepFullJavaSession.FullJavaSession fullJavaSession = javaSession.getFromInput(
-                                MinecraftAuthLogger.INSTANCE,
-                                PendingMicrosoftAuthentication.AUTH_CLIENT,
-                                new StepMsaToken.RefreshToken(entry.getValue())
-                            );
-
-                            String authChain = gson.toJson(javaSession.toJson(fullJavaSession));
-                            savedAuthChains.put(user, authChain);
-                        } catch (Exception e) {
-                            GeyserImpl.getInstance().getLogger().warning("Could not migrate " + entry.getKey() + " to an auth chain! " +
-                                "They will need to sign in the next time they join Geyser.");
-                        }
-
-                        // Ensure the new additions are written to the file
-                        scheduleAuthChainsWrite();
-                    }
-                }
-
-                // Finally: Delete it. Goodbye!
-                refreshTokensFile.delete();
-            }
-
             File authChainsFile = bootstrap.getSavedUserLoginsFolder().resolve(Constants.SAVED_AUTH_CHAINS_FILE).toFile();
             if (authChainsFile.exists()) {
                 TypeReference<Map<String, String>> type = new TypeReference<>() { };

core/src/main/java/org/geysermc/geyser/GeyserImpl.java

@@ -67,7 +67,7 @@ protected void initializeMetadata() {
     }
 
     public void setText(EntityMetadata<Component, ?> entityMetadata) {
-        this.dirtyMetadata.put(EntityDataTypes.NAME, MessageTranslator.convertMessage(entityMetadata.getValue()));
+        this.dirtyMetadata.put(EntityDataTypes.NAME, MessageTranslator.convertMessage(entityMetadata.getValue(), session.locale()));
         calculateLineCount(entityMetadata.getValue());
     }
 

core/src/main/java/org/geysermc/geyser/entity/type/TextDisplayEntity.java

@@ -50,6 +50,7 @@
 import org.geysermc.mcprotocollib.protocol.data.game.recipe.display.slot.SlotDisplay;
 
 import java.util.HashMap;
+import java.util.function.Supplier;
 
 @Data
 public class GeyserItemStack {
@@ -169,9 +170,9 @@ public <T> T getComponent(@NonNull DataComponentType<T> type) {
         return value;
     }
 
-    public <T> T getComponentOrFallback(@NonNull DataComponentType<T> type, T def) {
+    public <T> T getComponentElseGet(@NonNull DataComponentType<T> type, Supplier<T> supplier) {
         T value = getComponent(type);
-        return value == null ? def : value;
+        return value == null ? supplier.get() : value;
     }
 
     public int getNetId() {

core/src/main/java/org/geysermc/geyser/inventory/GeyserItemStack.java

@@ -25,11 +25,11 @@
 
 package org.geysermc.geyser.inventory;
 
-import org.geysermc.mcprotocollib.protocol.data.game.inventory.ContainerType;
 import lombok.Getter;
 import lombok.Setter;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.mcprotocollib.protocol.data.game.inventory.ContainerType;
 
 public class StonecutterContainer extends Container {
     /**

core/src/main/java/org/geysermc/geyser/inventory/StonecutterContainer.java

@@ -47,7 +47,6 @@
 import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponentType;
 import org.geysermc.mcprotocollib.protocol.data.game.item.component.HolderSet;
 import org.geysermc.mcprotocollib.protocol.data.game.item.component.ItemEnchantments;
-import org.geysermc.mcprotocollib.protocol.data.game.item.component.Unbreakable;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory.ServerboundRenameItemPacket;
 
 import java.util.List;
@@ -420,7 +419,7 @@ private boolean isRenaming(GeyserSession session, AnvilContainer anvilContainer,
     }
 
     private int getRepairCost(GeyserItemStack itemStack) {
-        return itemStack.getComponentOrFallback(DataComponentType.REPAIR_COST, 0);
+        return itemStack.getComponentElseGet(DataComponentType.REPAIR_COST, () -> 0);
     }
 
     private boolean hasDurability(GeyserItemStack itemStack) {
@@ -431,6 +430,6 @@ private boolean hasDurability(GeyserItemStack itemStack) {
     }
 
     private int getDamage(GeyserItemStack itemStack) {
-        return itemStack.getComponentOrFallback(DataComponentType.DAMAGE, 0);
+        return itemStack.getComponentElseGet(DataComponentType.DAMAGE, () -> 0);
     }
 }

core/src/main/java/org/geysermc/geyser/inventory/updater/AnvilInventoryUpdater.java

@@ -26,8 +26,7 @@
 package org.geysermc.geyser.item;
 
 import org.cloudburstmc.protocol.bedrock.data.definitions.ItemDefinition;
-import org.cloudburstmc.protocol.bedrock.data.inventory.ComponentItemData;
 import org.geysermc.geyser.api.item.custom.v2.CustomItemDefinition;
 
-public record GeyserCustomMappingData(CustomItemDefinition definition, ComponentItemData componentItemData, ItemDefinition itemDefinition, int integerId) {
+public record GeyserCustomMappingData(CustomItemDefinition definition, ItemDefinition itemDefinition, int integerId) {
 }

core/src/main/java/org/geysermc/geyser/item/GeyserCustomMappingData.java

@@ -39,7 +39,6 @@
 import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponent;
 import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponentType;
 import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponents;
-import org.geysermc.mcprotocollib.protocol.data.game.item.component.ItemCodecHelper;
 import org.geysermc.mcprotocollib.protocol.data.game.setting.Difficulty;
 
 import java.util.HashMap;
@@ -203,9 +202,9 @@ public void getDecoratedPotData(GeyserSession session, Vector3i pos, Consumer<Li
         try {
             Map<DataComponentType<?>, DataComponent<?, ?>> components = new HashMap<>();
             Int2ObjectMaps.fastForEach(map, entry -> {
-                DataComponentType type = DataComponentType.from(entry.getIntKey());
+                DataComponentType<?> type = DataComponentType.from(entry.getIntKey());
                 ByteBuf buf = Unpooled.wrappedBuffer(entry.getValue());
-                DataComponent value = type.readDataComponent(ItemCodecHelper.INSTANCE, buf);
+                DataComponent<?, ?> value = type.readDataComponent(buf);
                 components.put(type, value);
             });
             return new DataComponents(components);

core/src/main/java/org/geysermc/geyser/level/WorldManager.java

@@ -240,7 +240,8 @@ public static final class Builder {
         private Supplier<Item> pickItem;
 
         // We'll use this field after building
-        private Property<?>[] propertyKeys;
+        private Property<?>[] propertyKeys = null;
+        private @Nullable Integer javaId = null;
 
         /**
          * For states that we're just tracking for mirroring Java states.
@@ -298,11 +299,18 @@ public Builder pickItem(Supplier<Item> pickItem) {
             return this;
         }
 
+        public Builder javaId(int javaId) {
+            this.javaId = javaId;
+            return this;
+        }
+
         private List<BlockState> build(Block block) {
             if (states.isEmpty()) {
-                BlockState state = new BlockState(block, BlockRegistries.BLOCK_STATES.get().size());
+                if (javaId == null) {
+                    javaId = BlockRegistries.BLOCK_STATES.get().size();
+                }
+                BlockState state = new BlockState(block, javaId);
                 BlockRegistries.BLOCK_STATES.get().add(state);
-                propertyKeys = null;
                 return List.of(state);
             } else if (states.size() == 1) {
                 // We can optimize because we don't need to worry about combinations

core/src/main/java/org/geysermc/geyser/level/block/type/Block.java

@@ -29,6 +29,7 @@
 import org.cloudburstmc.protocol.bedrock.codec.BedrockCodec;
 import org.cloudburstmc.protocol.bedrock.codec.v748.Bedrock_v748;
 import org.cloudburstmc.protocol.bedrock.codec.v766.Bedrock_v766;
+import org.cloudburstmc.protocol.bedrock.codec.v776.Bedrock_v776;
 import org.cloudburstmc.protocol.bedrock.netty.codec.packet.BedrockPacketCodec;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodec;
@@ -47,8 +48,8 @@ public final class GameProtocol {
      * Default Bedrock codec that should act as a fallback. Should represent the latest available
      * release of the game that Geyser supports.
      */
-    public static final BedrockCodec DEFAULT_BEDROCK_CODEC = CodecProcessor.processCodec(Bedrock_v766.CODEC.toBuilder()
-        .minecraftVersion("1.21.51")
+    public static final BedrockCodec DEFAULT_BEDROCK_CODEC = CodecProcessor.processCodec(Bedrock_v776.CODEC.toBuilder()
+        .minecraftVersion("1.21.60")
         .build());
 
     /**
@@ -66,9 +67,10 @@ public final class GameProtocol {
         SUPPORTED_BEDROCK_CODECS.add(CodecProcessor.processCodec(Bedrock_v748.CODEC.toBuilder()
             .minecraftVersion("1.21.40 - 1.21.44")
             .build()));
-        SUPPORTED_BEDROCK_CODECS.add(DEFAULT_BEDROCK_CODEC.toBuilder()
+        SUPPORTED_BEDROCK_CODECS.add(CodecProcessor.processCodec(Bedrock_v766.CODEC.toBuilder()
             .minecraftVersion("1.21.50 - 1.21.51")
-            .build());
+            .build()));
+        SUPPORTED_BEDROCK_CODECS.add(DEFAULT_BEDROCK_CODEC);
     }
 
     /**
@@ -91,6 +93,10 @@ public static boolean isPreWinterDrop(GeyserSession session) {
         return session.getUpstream().getProtocolVersion() == Bedrock_v748.CODEC.getProtocolVersion();
     }
 
+    public static boolean isPreCreativeInventoryRewrite(int protocolVersion) {
+        return protocolVersion < 776;
+    }
+
     /**
      * Gets the {@link PacketCodec} for Minecraft: Java Edition.
      *

core/src/main/java/org/geysermc/geyser/network/GameProtocol.java

@@ -896,4 +896,14 @@ public PacketSignal handle(ToggleCrafterSlotRequestPacket packet) {
     public PacketSignal handle(TrimDataPacket packet) {
         return defaultHandler(packet);
     }
-}
+
+    @Override
+    public PacketSignal handle(MovementPredictionSyncPacket packet) {
+        return defaultHandler(packet);
+    }
+
+    @Override
+    public PacketSignal handle(ServerboundDiagnosticsPacket packet) {
+        return defaultHandler(packet);
+    }
+}

core/src/main/java/org/geysermc/geyser/network/LoggingPacketHandler.java

@@ -31,8 +31,11 @@
 import io.netty.channel.ChannelFactory;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelOption;
+import io.netty.channel.DefaultEventLoopGroup;
+import io.netty.channel.EventLoopGroup;
 import io.netty.channel.ReflectiveChannelFactory;
 import io.netty.channel.unix.PreferredDirectByteBufAllocator;
+import io.netty.util.concurrent.DefaultThreadFactory;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.geysermc.mcprotocollib.network.helper.NettyHelper;
 import org.geysermc.mcprotocollib.network.netty.MinecraftChannelInitializer;
@@ -42,11 +45,13 @@
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Manages a Minecraft Java session over our LocalChannel implementations.
  */
 public final class LocalSession extends ClientNetworkSession {
+    private static DefaultEventLoopGroup DEFAULT_EVENT_LOOP_GROUP;
     private static PreferredDirectByteBufAllocator PREFERRED_DIRECT_BYTE_BUF_ALLOCATOR = null;
 
     private final SocketAddress spoofedRemoteAddress;
@@ -68,6 +73,17 @@ protected void setOptions(Bootstrap bootstrap) {
         }
     }
 
+    @Override
+    protected EventLoopGroup getEventLoopGroup() {
+        if (DEFAULT_EVENT_LOOP_GROUP == null) {
+            DEFAULT_EVENT_LOOP_GROUP = new DefaultEventLoopGroup(new DefaultThreadFactory(this.getClass(), true));
+            Runtime.getRuntime().addShutdownHook(new Thread(
+                () -> DEFAULT_EVENT_LOOP_GROUP.shutdownGracefully(100, 500, TimeUnit.MILLISECONDS)));
+        }
+
+        return DEFAULT_EVENT_LOOP_GROUP;
+    }
+
     @Override
     protected ChannelHandler getChannelHandler() {
         return new MinecraftChannelInitializer<>(channel -> {

core/src/main/java/org/geysermc/geyser/network/netty/LocalSession.java

@@ -135,9 +135,9 @@ public static void populate() {
         CustomSkullRegistryPopulator.populate();
         BlockRegistryPopulator.populate(BlockRegistryPopulator.Stage.PRE_INIT);
         CustomBlockRegistryPopulator.populate(CustomBlockRegistryPopulator.Stage.DEFINITION);
-        CustomBlockRegistryPopulator.populate(CustomBlockRegistryPopulator.Stage.NON_VANILLA_REGISTRATION);
         BlockRegistryPopulator.populate(BlockRegistryPopulator.Stage.INIT_JAVA);
         COLLISIONS.load();
+        CustomBlockRegistryPopulator.populate(CustomBlockRegistryPopulator.Stage.NON_VANILLA_REGISTRATION);
         CustomBlockRegistryPopulator.populate(CustomBlockRegistryPopulator.Stage.VANILLA_REGISTRATION);
         CustomBlockRegistryPopulator.populate(CustomBlockRegistryPopulator.Stage.CUSTOM_REGISTRATION);
         BlockRegistryPopulator.populate(BlockRegistryPopulator.Stage.INIT_BEDROCK);