Feature: 26.2

README.md

@@ -16,10 +16,10 @@ Special thanks to the DragonProxy project for being a trailblazer in protocol tr
 
 ## Supported Versions
 
-| Edition | Supported Versions                                                                                         |
-|---------|------------------------------------------------------------------------------------------------------------|
-| Bedrock | 26.0, 26.1, 26.2, 26.3, 26.10, 26.20, 26.21, 26.22, 26.23, 26.30                                           |
-| Java    | 26.1 - 26.1.2 (For older versions, [see this guide](https://geysermc.org/wiki/geyser/supported-versions/)) |
+| Edition | Supported Versions                                                                                |
+|---------|---------------------------------------------------------------------------------------------------|
+| Bedrock | 26.0, 26.1, 26.2, 26.3, 26.10, 26.20, 26.21, 26.22, 26.23, 26.30                                  |
+| Java    | 26.2 (For older versions, [see this guide](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.

bootstrap/mod/fabric/src/main/resources/fabric.mod.json

@@ -23,8 +23,8 @@
     "geyser.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.18.2",
+    "fabricloader": ">=0.19.3",
     "fabric-api": "*",
-    "minecraft": "~26.1"
+    "minecraft": "~${minecraft}"
   }
 }

bootstrap/mod/gametest/build.gradle.kts

@@ -49,18 +49,4 @@ tasks {
     withType(PublishToMavenRepository::class).configureEach {
         enabled = false
     }
-
-    // it'd be processGametestResources if we had a separate source set for tests
-    getByName("processResources", ProcessResources::class) {
-        filesMatching("fabric.mod.json") {
-            expand(
-                "id" to "geyser",
-                "name" to "Geyser",
-                "version" to project.version,
-                "description" to project.description!!,
-                "url" to "https://geysermc.org",
-                "author" to "GeyserMC"
-            )
-        }
-    }
 }

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/entity_metadata/sulfur_cube.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:entity_metadata",
+  "entity_type": "minecraft:sulfur_cube"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/minecraft_version.json

@@ -1,4 +1,4 @@
 {
   "type": "geyser:minecraft_version",
-  "version": "26.1.2"
+  "version": "26.2"
 }

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/amethyst_shard.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:amethyst_shard"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/blue_egg.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:blue_egg"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/brown_egg.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:brown_egg"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/copper_ingot.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:copper_ingot"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/copper_spear.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:copper_spear"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/diamond.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:diamond"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/diamond_spear.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:diamond_spear"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/egg.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:egg"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/emerald.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:emerald"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/goat_horn.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:goat_horn"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/gold_ingot.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:gold_ingot"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/golden_spear.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:golden_spear"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/iron_ingot.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:iron_ingot"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/iron_spear.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:iron_spear"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/lapis_lazuli.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:lapis_lazuli"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/music_disc_11.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:music_disc_11"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/music_disc_13.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:music_disc_13"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/music_disc_5.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:music_disc_5"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/music_disc_blocks.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:music_disc_blocks"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/music_disc_bounce.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:music_disc_bounce"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/music_disc_cat.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:music_disc_cat"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/music_disc_chirp.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:music_disc_chirp"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/music_disc_creator.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:music_disc_creator"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/music_disc_creator_music_box.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:music_disc_creator_music_box"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/music_disc_far.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:music_disc_far"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/music_disc_lava_chicken.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:music_disc_lava_chicken"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/music_disc_mall.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:music_disc_mall"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/music_disc_mellohi.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:music_disc_mellohi"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/music_disc_otherside.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:music_disc_otherside"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/music_disc_pigstep.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:music_disc_pigstep"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/music_disc_precipice.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:music_disc_precipice"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/music_disc_relic.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:music_disc_relic"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/music_disc_stal.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:music_disc_stal"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/music_disc_strad.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:music_disc_strad"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/music_disc_tears.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:music_disc_tears"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/music_disc_wait.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:music_disc_wait"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/music_disc_ward.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:music_disc_ward"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/netherite_ingot.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:netherite_ingot"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/netherite_spear.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:netherite_spear"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/quartz.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:quartz"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/redstone.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:redstone"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/resin_brick.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:resin_brick"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/stone_spear.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:stone_spear"
+}

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/resolvable_components/wooden_spear.json

@@ -0,0 +1,4 @@
+{
+  "type": "geyser:resolvable_components",
+  "item": "minecraft:wooden_spear"
+}

bootstrap/mod/gametest/src/main/java/org/geysermc/geyser/gametest/GeyserGameTestBootstrap.java

@@ -78,8 +78,8 @@ public void onInitialize() {
                 ModCommandSource::new
         );
         CommandManager<GeyserCommandSource> cloud = new FabricServerCommandManager<>(
-                ExecutionCoordinator.simpleCoordinator(),
-                sourceConverter
+            ExecutionCoordinator.simpleCoordinator(),
+            sourceConverter
         );
         this.setCommandRegistry(new CommandRegistry(GeyserImpl.getInstance(), cloud, false)); // applying root permission would be a breaking change because we can't register permission defaults
 

bootstrap/mod/gametest/src/main/java/org/geysermc/geyser/gametest/GeyserGameTestTypes.java

@@ -26,21 +26,24 @@
 package org.geysermc.geyser.gametest;
 
 import com.mojang.serialization.MapCodec;
-import net.minecraft.core.HolderLookup;
+import net.minecraft.core.HolderGetter;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.gametest.framework.GameTestInstance;
+import net.minecraft.gametest.framework.TestEnvironmentDefinition;
 import net.minecraft.resources.Identifier;
 import org.geysermc.geyser.gametest.tests.ComponentHashTestInstance;
 import org.geysermc.geyser.gametest.tests.EntityMetadataTest;
 import org.geysermc.geyser.gametest.tests.MinecraftVersionTestInstance;
 import org.geysermc.geyser.gametest.tests.RequiredComponentsForHashingTestInstance;
+import org.geysermc.geyser.gametest.tests.ResolvableComponentLoadingTestInstance;
 
 public interface GeyserGameTestTypes {
     Identifier COMPONENT_HASH = createKey("component_hash");
     SingletonTestType REQUIRED_COMPONENTS_FOR_HASHING = createSingleton("required_components_for_hashing", RequiredComponentsForHashingTestInstance::new);
     Identifier ENTITY_METADATA = createKey("entity_metadata");
     SingletonTestType MINECRAFT_VERSION = createSingleton("minecraft_version", MinecraftVersionTestInstance::new);
+    Identifier RESOLVABLE_COMPONENTS = createKey("resolvable_components");
 
     private static Identifier createKey(String name) {
         return Identifier.fromNamespaceAndPath("geyser", name);
@@ -63,14 +66,15 @@ static void bootstrap() {
         register(REQUIRED_COMPONENTS_FOR_HASHING, RequiredComponentsForHashingTestInstance.MAP_CODEC);
         register(ENTITY_METADATA, EntityMetadataTest.MAP_CODEC);
         register(MINECRAFT_VERSION, MinecraftVersionTestInstance.MAP_CODEC);
+        register(RESOLVABLE_COMPONENTS, ResolvableComponentLoadingTestInstance.MAP_CODEC);
     }
 
     record SingletonTestType(Identifier type, Constructor constructor) {
 
         @FunctionalInterface
         interface Constructor {
 
-            GameTestInstance create(HolderLookup.Provider registries, boolean required);
+            GameTestInstance create(HolderGetter<TestEnvironmentDefinition<?>> testEnvironments, boolean required);
         }
     }
 }