Release 1.6.0 with TPA replication

This commit is contained in:
2026-06-25 23:40:30 +08:00
parent b57c7d4843
commit 2479192ad3
27 changed files with 2344 additions and 223 deletions
+27
View File
@@ -0,0 +1,27 @@
plugins {
id 'java-library'
id 'io.papermc.paperweight.userdev'
}
repositories {
mavenCentral()
maven {
name = 'papermc'
url = uri('https://repo.papermc.io/repository/maven-public/')
}
}
dependencies {
api project(':compat-api')
paperweight.paperDevBundle('26.1.2.build.72-stable')
}
java {
toolchain.languageVersion.set(JavaLanguageVersion.of(25))
}
paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.getMOJANG_PRODUCTION()
tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8'
}
@@ -0,0 +1,240 @@
package cn.infstar.essentialsC.v26_1_2.jei;
import cn.infstar.essentialsC.compat.jei.JeiRecipeSyncAdapter;
import io.netty.buffer.Unpooled;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.network.RegistryFriendlyByteBuf;
import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
import net.minecraft.network.protocol.common.custom.DiscardedPayload;
import net.minecraft.resources.Identifier;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.item.crafting.RecipeHolder;
import net.minecraft.world.item.crafting.RecipeMap;
import net.minecraft.world.item.crafting.RecipeSerializer;
import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.entity.Player;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.logging.Logger;
public final class JeiRecipeSyncAdapterImpl implements JeiRecipeSyncAdapter {
@Override
@SuppressWarnings({"unchecked", "deprecation"})
public void sendFabricRecipeSync(Player player, Logger logger, boolean debug) {
ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle();
MinecraftServer server = serverPlayer.level().getServer();
if (server == null) {
if (debug) {
logger.warning("服务端实例为 null");
}
return;
}
RecipeMap recipeMap = server.getRecipeManager().recipes;
if (debug) {
logger.info("开始构建 Fabric 配方数据");
}
var list = new ArrayList<FabricRecipeEntry>();
var seen = new HashSet<RecipeSerializer<?>>();
for (RecipeSerializer<?> serializer : BuiltInRegistries.RECIPE_SERIALIZER) {
if (!seen.add(serializer)) {
continue;
}
List<RecipeHolder<?>> recipes = new ArrayList<>();
for (RecipeHolder<?> holder : recipeMap.values()) {
if (holder.value().getSerializer() == serializer) {
recipes.add(holder);
}
}
if (!recipes.isEmpty()) {
RecipeSerializer<?> entrySerializer = recipes.get(0).value().getSerializer();
list.add(new FabricRecipeEntry(entrySerializer, recipes));
}
}
var payload = new FabricRecipeSyncPayload(list);
if (debug) {
logger.info("Fabric 配方条目数: " + list.size());
}
RegistryFriendlyByteBuf buffer = new RegistryFriendlyByteBuf(Unpooled.buffer(), server.registryAccess());
getFabricCodec().encode(buffer, payload);
byte[] bytes = new byte[buffer.writerIndex()];
buffer.getBytes(0, bytes);
Identifier id = Identifier.fromNamespaceAndPath("fabric", "recipe_sync");
DiscardedPayload discardedPayload = new DiscardedPayload(id, bytes);
serverPlayer.connection.send(new ClientboundCustomPayloadPacket(discardedPayload));
if (debug) {
logger.info("已发送 Fabric 配方同步 [" + id + "], 大小: " + bytes.length + " bytes");
}
}
@Override
@SuppressWarnings({"unchecked", "deprecation"})
public void sendNeoForgeRecipeSync(Player player, Logger logger, boolean debug) {
ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle();
MinecraftServer server = serverPlayer.level().getServer();
if (server == null) {
if (debug) {
logger.warning("服务端实例为 null");
}
return;
}
RecipeMap recipeMap = server.getRecipeManager().recipes;
if (debug) {
logger.info("开始构建 NeoForge 配方数据");
}
java.util.List<net.minecraft.world.item.crafting.RecipeType<?>> allRecipeTypes =
BuiltInRegistries.RECIPE_TYPE.stream().toList();
if (debug) {
logger.info("NeoForge 配方类型数: " + allRecipeTypes.size());
}
var payload = createNeoForgePayload(allRecipeTypes, recipeMap);
RegistryFriendlyByteBuf buffer = new RegistryFriendlyByteBuf(Unpooled.buffer(), server.registryAccess());
getNeoForgeStreamCodec().encode(buffer, payload);
byte[] bytes = new byte[buffer.writerIndex()];
buffer.getBytes(0, bytes);
Identifier id = Identifier.fromNamespaceAndPath("neoforge", "recipe_content");
DiscardedPayload discardedPayload = new DiscardedPayload(id, bytes);
serverPlayer.connection.send(new ClientboundCustomPayloadPacket(discardedPayload));
serverPlayer.connection.send(new net.minecraft.network.protocol.common.ClientboundUpdateTagsPacket(
net.minecraft.tags.TagNetworkSerialization.serializeTagsToNetwork(server.registries())
));
if (debug) {
logger.info("已发送 NeoForge 配方同步 [" + id + "], 大小: " + bytes.length + " bytes");
}
}
@SuppressWarnings({"unchecked", "deprecation"})
private net.minecraft.network.codec.StreamCodec<RegistryFriendlyByteBuf, FabricRecipeSyncPayload> getFabricCodec() {
return FabricRecipeEntry.CODEC.apply(net.minecraft.network.codec.ByteBufCodecs.list())
.map(FabricRecipeSyncPayload::new, FabricRecipeSyncPayload::entries);
}
private NeoForgeRecipeSyncPayload createNeoForgePayload(
java.util.List<net.minecraft.world.item.crafting.RecipeType<?>> recipeTypes,
RecipeMap recipeMap
) {
var recipeTypeSet = new java.util.HashSet<>(recipeTypes);
if (recipeTypeSet.isEmpty()) {
return new NeoForgeRecipeSyncPayload(recipeTypeSet, java.util.List.of());
}
var recipeSubset = recipeMap.values().stream()
.filter(h -> recipeTypeSet.contains(h.value().getType()))
.toList();
return new NeoForgeRecipeSyncPayload(recipeTypeSet, recipeSubset);
}
@SuppressWarnings({"unchecked", "deprecation"})
private net.minecraft.network.codec.StreamCodec<RegistryFriendlyByteBuf, NeoForgeRecipeSyncPayload> getNeoForgeStreamCodec() {
return net.minecraft.network.codec.StreamCodec.composite(
net.minecraft.network.codec.ByteBufCodecs.registry(net.minecraft.core.registries.Registries.RECIPE_TYPE)
.apply(net.minecraft.network.codec.ByteBufCodecs.collection(java.util.HashSet::new)),
NeoForgeRecipeSyncPayload::recipeTypes,
RecipeHolder.STREAM_CODEC.apply(net.minecraft.network.codec.ByteBufCodecs.list()),
NeoForgeRecipeSyncPayload::recipes,
NeoForgeRecipeSyncPayload::new
);
}
@SuppressWarnings("deprecation")
private static class FabricRecipeEntry {
final Object serializer;
final List<RecipeHolder<?>> recipes;
FabricRecipeEntry(Object serializer, List<RecipeHolder<?>> recipes) {
this.serializer = serializer;
this.recipes = recipes;
}
static final net.minecraft.network.codec.StreamCodec<RegistryFriendlyByteBuf, FabricRecipeEntry> CODEC =
net.minecraft.network.codec.StreamCodec.ofMember(
FabricRecipeEntry::write,
FabricRecipeEntry::read
);
@SuppressWarnings("unchecked")
private static FabricRecipeEntry read(RegistryFriendlyByteBuf buf) {
Identifier recipeSerializerId = buf.readIdentifier();
RecipeSerializer<?> recipeSerializer = BuiltInRegistries.RECIPE_SERIALIZER.getValue(recipeSerializerId);
if (recipeSerializer == null) {
throw new RuntimeException("Tried syncing unsupported packet serializer '" + recipeSerializerId + "'!");
}
int count = buf.readVarInt();
var list = new ArrayList<RecipeHolder<?>>();
for (int i = 0; i < count; i++) {
net.minecraft.resources.ResourceKey<net.minecraft.world.item.crafting.Recipe<?>> id =
buf.readResourceKey(net.minecraft.core.registries.Registries.RECIPE);
try {
var streamCodecMethod = recipeSerializer.getClass().getMethod("streamCodec");
var streamCodec = streamCodecMethod.invoke(recipeSerializer);
net.minecraft.world.item.crafting.Recipe<?> recipe =
((net.minecraft.network.codec.StreamCodec<RegistryFriendlyByteBuf, net.minecraft.world.item.crafting.Recipe<?>>) streamCodec)
.decode(buf);
list.add(new RecipeHolder<>(id, recipe));
} catch (Exception e) {
throw new RuntimeException("Failed to decode recipe: " + e.getMessage(), e);
}
}
return new FabricRecipeEntry(recipeSerializer, list);
}
private void write(RegistryFriendlyByteBuf buf) {
try {
var getKeyMethod = BuiltInRegistries.RECIPE_SERIALIZER.getClass().getMethod("getKey", Object.class);
Identifier identifier = (Identifier) getKeyMethod.invoke(BuiltInRegistries.RECIPE_SERIALIZER, this.serializer);
buf.writeIdentifier(identifier);
} catch (Exception e) {
throw new RuntimeException("Failed to get serializer key: " + e.getMessage(), e);
}
buf.writeVarInt(this.recipes.size());
try {
var streamCodecMethod = this.serializer.getClass().getMethod("streamCodec");
@SuppressWarnings("unchecked")
var codec = (net.minecraft.network.codec.StreamCodec<RegistryFriendlyByteBuf, net.minecraft.world.item.crafting.Recipe<?>>)
streamCodecMethod.invoke(this.serializer);
for (RecipeHolder<?> recipe : this.recipes) {
buf.writeResourceKey(recipe.id());
codec.encode(buf, recipe.value());
}
} catch (Exception e) {
throw new RuntimeException("Failed to encode recipe: " + e.getMessage(), e);
}
}
}
private record FabricRecipeSyncPayload(List<FabricRecipeEntry> entries) {
}
private record NeoForgeRecipeSyncPayload(
java.util.Set<net.minecraft.world.item.crafting.RecipeType<?>> recipeTypes,
java.util.List<RecipeHolder<?>> recipes
) {
}
}