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

Author: eclipseisoffline

README.md

@@ -15,7 +15,7 @@ The ultimate goal of this project is to allow Minecraft: Bedrock Edition users t
 Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have joined us here!
 
 ## Supported Versions
-Geyser is currently supporting Minecraft Bedrock 1.20.80 - 1.21.44 and Minecraft Java 1.21.2/1.21.3. For more information, please see [here](https://geysermc.org/wiki/geyser/supported-versions/).
+Geyser is currently supporting Minecraft Bedrock 1.21.40 - 1.21.50 and Minecraft Java 1.21.2/1.21.3. For more information, please see [here](https://geysermc.org/wiki/geyser/supported-versions/).
 
 ## Setting Up
 Take a look [here](https://geysermc.org/wiki/geyser/setup/) for how to set up Geyser.

api/src/main/java/org/geysermc/geyser/api/entity/type/player/GeyserPlayerEntity.java

@@ -31,9 +31,9 @@
 public interface GeyserPlayerEntity extends GeyserEntity {
 
     /**
-     * Gets the position of the player.
+     * Gets the position of the player, as it is known to the Java server.
      *
-     * @return the position of the player.
+     * @return the player's position
      */
     Vector3f position();
 }

api/src/main/java/org/geysermc/geyser/api/item/custom/NonVanillaCustomItemData.java

@@ -80,10 +80,9 @@ public interface NonVanillaCustomItemData extends CustomItemData {
     @Nullable String toolType();
 
     /**
-     * Gets the tool tier of the item.
-     *
-     * @return the tool tier of the item
+     * @deprecated no longer used
      */
+    @Deprecated(forRemoval = true)
     @Nullable String toolTier();
 
     /**
@@ -108,10 +107,9 @@ public interface NonVanillaCustomItemData extends CustomItemData {
     @Nullable String translationString();
 
     /**
-     * Gets the repair materials of the item.
-     *
-     * @return the repair materials of the item
+     * @deprecated No longer used.
      */
+    @Deprecated(forRemoval = true)
     @Nullable Set<String> repairMaterials();
 
     /**

bootstrap/mod/fabric/build.gradle.kts

@@ -38,6 +38,7 @@ dependencies {
 
     modImplementation(libs.cloud.fabric)
     include(libs.cloud.fabric)
+    include(libs.fabric.permissions.api)
 }
 
 tasks.withType<Jar> {

bootstrap/mod/src/main/java/org/geysermc/geyser/platform/mod/world/GeyserModWorldManager.java

@@ -28,37 +28,24 @@
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import net.minecraft.SharedConstants;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.core.component.DataComponents;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.network.chat.Component;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerChunkCache;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.entity.BannerBlockEntity;
-import net.minecraft.world.level.block.entity.BannerPatternLayers;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.DecoratedPotBlockEntity;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.LevelChunkSection;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.cloudburstmc.math.vector.Vector3i;
 import org.geysermc.geyser.level.GeyserWorldManager;
 import org.geysermc.geyser.network.GameProtocol;
 import org.geysermc.geyser.session.GeyserSession;
-import org.geysermc.geyser.util.MinecraftKey;
-import org.geysermc.mcprotocollib.protocol.data.game.Holder;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.player.GameMode;
-import org.geysermc.mcprotocollib.protocol.data.game.item.component.BannerPatternLayer;
-import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponentType;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 
 public class GeyserModWorldManager extends GeyserWorldManager {
@@ -117,49 +104,6 @@ public GameMode getDefaultGameMode(GeyserSession session) {
         return GameMode.byId(server.getDefaultGameType().getId());
     }
 
-    @NonNull
-    @Override
-    public CompletableFuture<org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponents> getPickItemComponents(GeyserSession session, int x, int y, int z, boolean addNbtData) {
-        CompletableFuture<org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponents> future = new CompletableFuture<>();
-        server.execute(() -> {
-            ServerPlayer player = getPlayer(session);
-            if (player == null) {
-                future.complete(null);
-                return;
-            }
-
-            BlockPos pos = new BlockPos(x, y, z);
-            // Don't create a new block entity if invalid
-            //noinspection resource - level() is just a getter
-            BlockEntity blockEntity = player.level().getChunkAt(pos).getBlockEntity(pos);
-            if (blockEntity instanceof BannerBlockEntity banner) {
-                // Potentially exposes other NBT data? But we need to get the NBT data for the banner patterns *and*
-                // the banner might have a custom name, both of which a Java client knows and caches
-                ItemStack itemStack = banner.getItem();
-
-                org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponents components =
-                        new org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponents(new HashMap<>());
-
-                components.put(DataComponentType.DAMAGE, itemStack.getDamageValue());
-
-                Component customName = itemStack.getComponents().get(DataComponents.CUSTOM_NAME);
-                if (customName != null) {
-                    components.put(DataComponentType.CUSTOM_NAME, toKyoriComponent(customName));
-                }
-
-                BannerPatternLayers pattern = itemStack.get(DataComponents.BANNER_PATTERNS);
-                if (pattern != null) {
-                    components.put(DataComponentType.BANNER_PATTERNS, toPatternList(pattern));
-                }
-
-                future.complete(components);
-                return;
-            }
-            future.complete(null);
-        });
-        return future;
-    }
-
     @Override
     public void getDecoratedPotData(GeyserSession session, Vector3i pos, Consumer<List<String>> apply) {
         server.execute(() -> {
@@ -184,20 +128,4 @@ public void getDecoratedPotData(GeyserSession session, Vector3i pos, Consumer<Li
     private ServerPlayer getPlayer(GeyserSession session) {
         return server.getPlayerList().getPlayer(session.getPlayerEntity().getUuid());
     }
-
-    private static net.kyori.adventure.text.Component toKyoriComponent(Component component) {
-        String json = Component.Serializer.toJson(component, RegistryAccess.EMPTY);
-        return GSON_SERIALIZER.deserializeOr(json, net.kyori.adventure.text.Component.empty());
-    }
-
-    private static List<BannerPatternLayer> toPatternList(BannerPatternLayers patternLayers) {
-        return patternLayers.layers().stream()
-                .map(layer -> {
-                    BannerPatternLayer.BannerPattern pattern = new BannerPatternLayer.BannerPattern(
-                            MinecraftKey.key(layer.pattern().value().assetId().toString()), layer.pattern().value().translationKey()
-                    );
-                    return new BannerPatternLayer(Holder.ofCustom(pattern), layer.color().getId());
-                })
-                .toList();
-    }
 }

bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotInjector.java

@@ -178,9 +178,8 @@ private void workAroundWeirdBug(GeyserBootstrap bootstrap) {
         MinecraftProtocol protocol = new MinecraftProtocol();
         LocalSession session = new LocalSession(bootstrap.getGeyserConfig().getRemote().address(),
                 bootstrap.getGeyserConfig().getRemote().port(), this.serverSocketAddress,
-                InetAddress.getLoopbackAddress().getHostAddress(), protocol, protocol.createHelper());
+                InetAddress.getLoopbackAddress().getHostAddress(), protocol, Runnable::run);
         session.connect();
-        session.disconnect("");
     }
 
     @Override

bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotNativeWorldManager.java

@@ -33,7 +33,6 @@
 import org.geysermc.geyser.adapters.WorldAdapter;
 import org.geysermc.geyser.adapters.paper.PaperAdapters;
 import org.geysermc.geyser.adapters.spigot.SpigotAdapters;
-import org.geysermc.geyser.level.block.BlockStateValues;
 import org.geysermc.geyser.level.block.type.Block;
 import org.geysermc.geyser.session.GeyserSession;
 

bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotWorldManager.java

@@ -25,26 +25,21 @@
 
 package org.geysermc.geyser.platform.spigot.world.manager;
 
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.block.DecoratedPot;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.cloudburstmc.math.vector.Vector3i;
 import org.geysermc.erosion.bukkit.BukkitUtils;
-import org.geysermc.erosion.bukkit.PickBlockUtils;
 import org.geysermc.erosion.bukkit.SchedulerUtils;
 import org.geysermc.geyser.GeyserImpl;
 import org.geysermc.geyser.level.GameRule;
 import org.geysermc.geyser.level.WorldManager;
 import org.geysermc.geyser.registry.BlockRegistries;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.player.GameMode;
-import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponents;
 
 import java.util.List;
 import java.util.Objects;
@@ -128,20 +123,6 @@ public GameMode getDefaultGameMode(GeyserSession session) {
         return GameMode.byId(Bukkit.getDefaultGameMode().ordinal());
     }
 
-    @Override
-    public @NonNull CompletableFuture<@Nullable DataComponents> getPickItemComponents(GeyserSession session, int x, int y, int z, boolean addNbtData) {
-        Player bukkitPlayer;
-        if ((bukkitPlayer = Bukkit.getPlayer(session.getPlayerEntity().getUuid())) == null) {
-            return CompletableFuture.completedFuture(null);
-        }
-        CompletableFuture<Int2ObjectMap<byte[]>> future = new CompletableFuture<>();
-        Block block = bukkitPlayer.getWorld().getBlockAt(x, y, z);
-        // Paper 1.19.3 complains about async access otherwise.
-        // java.lang.IllegalStateException: Tile is null, asynchronous access?
-        SchedulerUtils.runTask(this.plugin, () -> future.complete(PickBlockUtils.pickBlock(block)), block);
-        return future.thenApply(RAW_TRANSFORMER);
-    }
-
     public void getDecoratedPotData(GeyserSession session, Vector3i pos, Consumer<List<String>> apply) {
         Player bukkitPlayer;
         if ((bukkitPlayer = Bukkit.getPlayer(session.getPlayerEntity().getUuid())) == null) {

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

@@ -414,9 +414,6 @@ private void startInstance() {
             }
         }
 
-        // Ensure that PacketLib does not create an event loop for handling packets; we'll do that ourselves
-        TcpSession.USE_EVENT_LOOP_FOR_PACKETS = false;
-
         pendingMicrosoftAuthentication = new PendingMicrosoftAuthentication(config.getPendingAuthenticationTimeout());
 
         this.newsHandler = new NewsHandler(BRANCH, this.buildNumber());

core/src/main/java/org/geysermc/geyser/entity/EntityDefinitions.java

@@ -116,6 +116,7 @@
 import org.geysermc.geyser.entity.type.living.monster.BlazeEntity;
 import org.geysermc.geyser.entity.type.living.monster.BoggedEntity;
 import org.geysermc.geyser.entity.type.living.monster.BreezeEntity;
+import org.geysermc.geyser.entity.type.living.monster.CreakingEntity;
 import org.geysermc.geyser.entity.type.living.monster.CreeperEntity;
 import org.geysermc.geyser.entity.type.living.monster.ElderGuardianEntity;
 import org.geysermc.geyser.entity.type.living.monster.EnderDragonEntity;
@@ -179,6 +180,7 @@ public final class EntityDefinitions {
     public static final EntityDefinition<AbstractFishEntity> COD;
     public static final EntityDefinition<CommandBlockMinecartEntity> COMMAND_BLOCK_MINECART;
     public static final EntityDefinition<CowEntity> COW;
+    public static final EntityDefinition<CreakingEntity> CREAKING;
     public static final EntityDefinition<CreeperEntity> CREEPER;
     public static final EntityDefinition<BoatEntity> DARK_OAK_BOAT;
     public static final EntityDefinition<ChestBoatEntity> DARK_OAK_CHEST_BOAT;
@@ -236,6 +238,8 @@ public final class EntityDefinitions {
     public static final EntityDefinition<ChestBoatEntity> OAK_CHEST_BOAT;
     public static final EntityDefinition<OcelotEntity> OCELOT;
     public static final EntityDefinition<PaintingEntity> PAINTING;
+    public static final EntityDefinition<BoatEntity> PALE_OAK_BOAT;
+    public static final EntityDefinition<ChestBoatEntity> PALE_OAK_CHEST_BOAT;
     public static final EntityDefinition<PandaEntity> PANDA;
     public static final EntityDefinition<ParrotEntity> PARROT;
     public static final EntityDefinition<PhantomEntity> PHANTOM;
@@ -591,6 +595,7 @@ public final class EntityDefinitions {
             MANGROVE_BOAT = buildBoat(boatBase, EntityType.MANGROVE_BOAT, BoatEntity.BoatVariant.MANGROVE);
             OAK_BOAT = buildBoat(boatBase, EntityType.OAK_BOAT, BoatEntity.BoatVariant.OAK);
             SPRUCE_BOAT = buildBoat(boatBase, EntityType.SPRUCE_BOAT, BoatEntity.BoatVariant.SPRUCE);
+            PALE_OAK_BOAT = buildBoat(boatBase, EntityType.PALE_OAK_BOAT, BoatEntity.BoatVariant.PALE_OAK);
 
             EntityDefinition<ChestBoatEntity> chestBoatBase = EntityDefinition.<ChestBoatEntity>inherited(null, boatBase)
                 .build();
@@ -604,6 +609,7 @@ public final class EntityDefinitions {
             MANGROVE_CHEST_BOAT = buildChestBoat(chestBoatBase, EntityType.MANGROVE_CHEST_BOAT, BoatEntity.BoatVariant.MANGROVE);
             OAK_CHEST_BOAT = buildChestBoat(chestBoatBase, EntityType.OAK_CHEST_BOAT, BoatEntity.BoatVariant.OAK);
             SPRUCE_CHEST_BOAT = buildChestBoat(chestBoatBase, EntityType.SPRUCE_CHEST_BOAT, BoatEntity.BoatVariant.SPRUCE);
+            PALE_OAK_CHEST_BOAT = buildChestBoat(chestBoatBase, EntityType.PALE_OAK_CHEST_BOAT, BoatEntity.BoatVariant.PALE_OAK);
         }
 
         EntityDefinition<LivingEntity> livingEntityBase = EntityDefinition.inherited(LivingEntity::new, entityBase)
@@ -671,6 +677,14 @@ public final class EntityDefinitions {
                     .type(EntityType.BREEZE)
                     .height(1.77f).width(0.6f)
                     .build();
+            CREAKING = EntityDefinition.inherited(CreakingEntity::new, mobEntityBase)
+                    .type(EntityType.CREAKING)
+                    .height(2.7f).width(0.9f)
+                    .addTranslator(MetadataType.BOOLEAN, CreakingEntity::setCanMove)
+                    .addTranslator(MetadataType.BOOLEAN, CreakingEntity::setActive)
+                    .addTranslator(MetadataType.BOOLEAN, CreakingEntity::setIsTearingDown)
+                    .addTranslator(MetadataType.OPTIONAL_POSITION, CreakingEntity::setHomePos)
+                    .build();
             CREEPER = EntityDefinition.inherited(CreeperEntity::new, mobEntityBase)
                     .type(EntityType.CREEPER)
                     .height(1.7f).width(0.6f)