Add support for the recipeBook tag, bump version

Author: eclipseisoffline

CHANGELOG.md

@@ -1,4 +1,5 @@
 - Update to Minecraft 26.1-snapshot-10.
 - Add support for the `active_effects` tag. This allows you to show an effect's icon without showing its particles, or vice versa, or to add a hidden effect to an effect instance.
+- Add support for the `recipeBook` tag.
 
 This version was not released for NeoForge, as NeoForge does not yet support this version of Minecraft.

README.md

@@ -101,6 +101,7 @@ NBT tags currently supported:
 - `warden_spawn_tracker`
 - `entered_nether_pos`
 - `seenCredits`
+- `recipeBook`
 - `respawn`
 - `spawn_extra_particles_on_fall`
 - `raid_omen_position`
@@ -126,7 +127,6 @@ NBT tags I won't add support for:
 - `playerGameType`
 - `previousPlayerGameType`[^6]
 - `RootVehicle`[^2]
-- `recipeBook`[^7]
 - `Dimension`
 - `ender_pearls`
 
@@ -136,4 +136,3 @@ NBT tags I won't add support for:
 [^4]: Use the `/xp` command.
 [^5]: I can't think of any use cases for this tag, but will add support on request.
 [^6]: Unable to implement due to limitations within the vanilla client.
-[^7]: Use the `/recipe` command.

common/src/main/java/xyz/eclipseisoffline/modifyplayerdata/PlayerData.java

@@ -4,12 +4,17 @@
 import com.mojang.serialization.Codec;
 import net.minecraft.network.protocol.game.ClientboundRemoveMobEffectPacket;
 import net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.stats.ServerRecipeBook;
 import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.item.crafting.Recipe;
+import net.minecraft.world.item.crafting.RecipeHolder;
 import xyz.eclipseisoffline.modifyplayerdata.mixin.FoodDataAccessor;
 import xyz.eclipseisoffline.modifyplayerdata.mixin.LivingEntityAccessor;
 import xyz.eclipseisoffline.modifyplayerdata.mixin.PlayerAccessor;
 import xyz.eclipseisoffline.modifyplayerdata.mixin.ServerPlayerAccessor;
 
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
@@ -37,6 +42,7 @@
 import net.minecraft.world.level.storage.ValueOutput;
 import net.minecraft.world.phys.Vec2;
 import net.minecraft.world.phys.Vec3;
+import xyz.eclipseisoffline.modifyplayerdata.mixin.ServerRecipeBookAccessor;
 
 public class PlayerData {
 
@@ -172,6 +178,17 @@ public static void apply(ServerPlayer player, ValueInput input) {
         input.read("warden_spawn_tracker", WardenSpawnTracker.CODEC).ifPresent(manager -> ((ServerPlayerAccessor) player).setWardenSpawnTracker(manager));
         input.read("entered_nether_pos", Vec3.CODEC).ifPresent(pos -> ((ServerPlayerAccessor) player).setEnteredNetherPosition(pos));
         getOptionalBoolean(input, "seenCredits").ifPresent(seenCredits -> ((ServerPlayerAccessor) player).setSeenCredits(seenCredits));
+
+        input.read("recipeBook", ServerRecipeBook.Packed.CODEC).ifPresent(packed -> {
+            Set<ResourceKey<Recipe<?>>> known = ((ServerRecipeBookAccessor) player.getRecipeBook()).getKnown();
+
+            // Not the most efficient, but it gets the job done, annoying to do otherwise
+            player.getRecipeBook().removeRecipes((Collection) known.stream().map(recipe -> new RecipeHolder<>(recipe, null)).toList(), player);
+
+            player.getRecipeBook().loadUntrusted(packed, id -> player.level().getServer().getRecipeManager().byKey(id).isPresent());
+            player.getRecipeBook().sendInitialRecipeBook(player);
+        });
+
         input.read("respawn", ServerPlayer.RespawnConfig.CODEC).ifPresent(respawn -> player.setRespawnPosition(respawn, false));
         getOptionalBoolean(input, "spawn_extra_particles_on_fall").ifPresent(player::setSpawnExtraParticlesOnFall);
         input.read("raid_omen_position", BlockPos.CODEC).ifPresent(player::setRaidOmenPosition);

common/src/main/java/xyz/eclipseisoffline/modifyplayerdata/mixin/ServerRecipeBookAccessor.java

@@ -0,0 +1,16 @@
+package xyz.eclipseisoffline.modifyplayerdata.mixin;
+
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.stats.ServerRecipeBook;
+import net.minecraft.world.item.crafting.Recipe;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.Set;
+
+@Mixin(ServerRecipeBook.class)
+public interface ServerRecipeBookAccessor {
+
+    @Accessor
+    Set<ResourceKey<Recipe<?>>> getKnown();
+}

common/src/main/resources/modifyplayerdata.mixins.json

@@ -11,7 +11,8 @@
     "LivingEntityAccessor",
     "PlayerAccessor",
     "ServerPlayerAccessor",
-    "ServerPlayerMixin"
+    "ServerPlayerMixin",
+    "ServerRecipeBookAccessor"
   ],
   "client": [
   ],

gradle.properties

@@ -5,7 +5,7 @@ mod_id=modifyplayerdata
 mod_name=Modify Player Data
 mod_description=Modify Player Data allows Minecraft's data commands (/data, /execute store, etc.) to modify player data
 
-version=0.4.0-26.1-snapshot-1
+version=0.4.1-26.1-snapshot-10
 
 # Publishing
 maven_group=xyz.eclipseisoffline