Release machine acceleration, dropped books and baseline defaults for both tracks
Build and smoke / changes (push) Waiting to run

This commit is contained in:
dnorberg committed 2026-11-18 16:43:39 -05:00
1 parent d199ac253e
commit 6630ed7ab1
72 files changed
+2390 -108

No files matched your search

@@ -0,0 +1,120 @@
package net.dnorberg.rivencraft.regression;
import java.util.UUID;
import net.dnorberg.rivencraft.entity.DroppedBookEntity;
import net.dnorberg.rivencraft.network.*;
import net.minecraft.core.BlockPos;
import net.minecraft.core.component.DataComponents;
import net.minecraft.network.chat.Component;
import net.minecraft.network.RegistryFriendlyByteBuf;
import io.netty.buffer.Unpooled;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.item.*;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.phys.Vec3;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.EventBusSubscriber;
import net.neoforged.neoforge.event.server.ServerStartedEvent;
import net.neoforged.neoforge.event.tick.ServerTickEvent;
import net.dnorberg.rivencraft.registry.*;
import net.dnorberg.rivencraft.book.*;
@EventBusSubscriber(modid="rivencraft")
public class DroppedInteractionProbe {
static int checks,wait;
static ServerLevel level;
static void check(boolean value,String name) { if(!value)throw new AssertionError(name);checks++; }
@SubscribeEvent public static void start(ServerStartedEvent event) {
level=event.getServer().overworld();level.setChunkForced(0,0,true);wait=5;
}
@SubscribeEvent public static void tick(ServerTickEvent.Post event) {
if(wait<=0 || --wait!=0)return;
try { run();System.out.println("DROPINTERACT_PASS checks="+checks); }
catch(Throwable e) { System.out.println("DROPINTERACT_FAIL "+e);e.printStackTrace(); }
finally { event.getServer().halt(false); }
}
static class ProbePlayer extends net.neoforged.neoforge.common.util.FakePlayer {
Vec3 requested;
ProbePlayer(ServerLevel level,com.mojang.authlib.GameProfile profile) { super(level,profile); }
@Override public void teleportTo(ServerLevel destination,double x,double y,double z,float yaw,float pitch) {
requested=new Vec3(x,y,z);setPos(x,y,z);
}
}
static void click(DroppedBookEntity book,net.minecraft.server.level.ServerPlayer player) {
book.interact(player,InteractionHand.MAIN_HAND);
}
static DroppedBookEntity spawn() {
var stack=new ItemStack(ModItems.LINKING_BOOK.get());
stack.set(DataComponents.CUSTOM_NAME,Component.literal("World book"));
var book=new DroppedBookEntity(level,new Vec3(8.5,64,8.5),stack);
book.setNoGravity(true);book.setDeltaMovement(Vec3.ZERO);book.setNoPickUpDelay();
check(level.addFreshEntity(book),"Spawn clickable book");
return book;
}
static DroppedBookActionPayload source(DroppedBookEntity book) {
return new DroppedBookActionPayload(book.getId(),book.getUUID(),book.getItem().copy(),
DroppedBookActionPayload.Action.USE,"",false);
}
static void run() throws Exception {
for(int x=0;x<16;x++)for(int z=0;z<16;z++)level.setBlock(new BlockPos(x,63,z),Blocks.STONE.defaultBlockState(),2);
var player=new ProbePlayer(level,
new com.mojang.authlib.GameProfile(UUID.randomUUID(),"RivenInteraction"));
player.setPos(8.5,64,8.5);player.getInventory().clearContent();
var book=spawn();var expected=source(book);
check(book.isPickable(),"Raycast can hit book");
book.playerTouch(player);
check(!book.isRemoved() && player.getInventory().isEmpty(),"Walking does not pick up");
player.setShiftKeyDown(false);click(book,player);
check(!book.isRemoved() && player.getInventory().isEmpty(),"Right click opens without pickup");
check(DroppedBookEntity.validated(player,book.getId(),book.getUUID(),book.getItem().copy())==book,"Valid source");
check(DroppedBookEntity.validated(player,book.getId(),UUID.randomUUID(),book.getItem())==null,"Wrong UUID rejected");
var forged=book.getItem().copy();forged.set(DataComponents.CUSTOM_NAME,Component.literal("Forged"));
check(DroppedBookEntity.validated(player,book.getId(),book.getUUID(),forged)==null,"Changed stack rejected");
player.setPos(100,64,100);
check(DroppedBookEntity.validated(player,book.getId(),book.getUUID(),book.getItem())==null,"Remote action rejected");
ModNetworking.droppedBookAction(player,expected.action(DroppedBookActionPayload.Action.BIND,"Remote",false));
check(!book.getItem().has(ModDataComponents.LINK_TARGET.get()),"Remote bind cannot mutate book");
player.setPos(8.5,64,8.5);
ModNetworking.droppedBookAction(player,source(book).action(DroppedBookActionPayload.Action.BIND,"Ground binding",false));
check(book.getItem().has(ModDataComponents.LINK_TARGET.get()) && book.getItem().getHoverName().getString().equals("Ground binding"),"Ground book binding shares normal handler");
check(DroppedBookEntity.validated(player,expected.entityId(),expected.entityUuid(),expected.book())==null,"Stale pre-bind request rejected");
book.getItem().set(ModDataComponents.LINK_TARGET.get(),new LinkTarget(net.minecraft.core.GlobalPos.of(level.dimension(),new BlockPos(14,64,14)),0,0));
book.getItem().set(ModDataComponents.LINK_PROPERTIES.get(),new LinkProperties(LinkProperties.INTRA_LINKING));
var use=source(book);
ModNetworking.droppedBookAction(player,use);
check(player.requested!=null && player.requested.x>13 && player.requested.z>13,"Ground handler requests normal link teleport");
check(!book.isRemoved() && book.getItem().getCount()==1,"Travel leaves the same world book");
player.setPos(8.5,64,8.5);
// Ownership and the original pickup delay are still enforced for explicit pickup.
player.setShiftKeyDown(true);book.setTarget(UUID.randomUUID());click(book,player);
check(!book.isRemoved() && player.getInventory().isEmpty(),"Owner restriction retained");
book.setTarget(player.getUUID());book.setPickUpDelay(80);click(book,player);
check(!book.isRemoved(),"Pickup delay retained");
book.setNoPickUpDelay();
for(int i=0;i<36;i++)player.getInventory().setItem(i,new ItemStack(Items.STONE,64));
click(book,player);
check(!book.isRemoved() && book.getItem().getCount()==1,"Full inventory keeps world book");
player.getInventory().clearContent();click(book,player);
check(book.isRemoved(),"Shift right click picks up");
check(player.getInventory().countItem(ModItems.LINKING_BOOK.get())==1,"Exactly one book recovered");
check(DroppedBookEntity.validated(player,use.entityId(),use.entityUuid(),use.book())==null,"Picked-up source invalidated");
var buffer=new RegistryFriendlyByteBuf(Unpooled.buffer(),level.registryAccess());
try {
DroppedBookActionPayload.STREAM_CODEC.encode(buffer,use);
var decoded=DroppedBookActionPayload.STREAM_CODEC.decode(buffer);
check(decoded.entityUuid().equals(use.entityUuid()) && decoded.entityId()==use.entityId()
&& decoded.action()==use.action() && ItemStack.matches(decoded.book(),use.book()) && buffer.readableBytes()==0,"Action wire round trip");
} finally { buffer.release(); }
var b=new RegistryFriendlyByteBuf(Unpooled.buffer(),level.registryAccess());
try {
var contents=new OpenDescriptiveBookScreenPayload(false,false,net.minecraft.core.GlobalPos.of(level.dimension(),BlockPos.ZERO),
use.book(),null,java.util.List.of());
OpenDroppedBookScreenPayload.STREAM_CODEC.encode(b,new OpenDroppedBookScreenPayload(use,contents));
var reply=OpenDroppedBookScreenPayload.STREAM_CODEC.decode(b);
check(reply.source().entityUuid().equals(use.entityUuid()) && ItemStack.matches(reply.contents().book(),use.book())
&& b.readableBytes()==0,"Open screen metadata round trip");
} finally { b.release(); }
}
}
@@ -0,0 +1,127 @@
package net.dnorberg.rivencraft.regression;
import java.util.UUID;
import net.dnorberg.rivencraft.entity.DroppedBookEntity;
import net.dnorberg.rivencraft.network.*;
import net.minecraft.core.BlockPos;
import net.minecraft.core.component.DataComponents;
import net.minecraft.network.chat.Component;
import net.minecraft.network.RegistryFriendlyByteBuf;
import io.netty.buffer.Unpooled;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.item.*;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.phys.Vec3;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.EventBusSubscriber;
import net.neoforged.neoforge.event.server.ServerStartedEvent;
import net.neoforged.neoforge.event.tick.ServerTickEvent;
import net.dnorberg.rivencraft.Rivencraft;
@EventBusSubscriber(modid="rivencraft")
public class DroppedInteractionProbe {
static int checks,wait;
static ServerLevel level;
static void check(boolean value,String name) { if(!value)throw new AssertionError(name);checks++; }
@SubscribeEvent public static void start(ServerStartedEvent event) {
level=event.getServer().overworld();level.setChunkForced(0,0,true);wait=5;
}
@SubscribeEvent public static void tick(ServerTickEvent.Post event) {
if(wait<=0 || --wait!=0)return;
try { run();System.out.println("DROPINTERACT_PASS checks="+checks); }
catch(Throwable e) { System.out.println("DROPINTERACT_FAIL "+e);e.printStackTrace(); }
finally { event.getServer().halt(false); }
}
static class ProbePlayer extends net.neoforged.neoforge.common.util.FakePlayer {
Vec3 requested;
ProbePlayer(ServerLevel level,com.mojang.authlib.GameProfile profile) { super(level,profile); }
@Override public boolean teleportTo(ServerLevel destination,double x,double y,double z,
java.util.Set<net.minecraft.world.entity.Relative> relative,float yaw,float pitch,boolean resetCamera) {
requested=new Vec3(x,y,z);setPos(x,y,z);return true;
}
}
static void click(DroppedBookEntity book,net.minecraft.server.level.ServerPlayer player) {
book.interact(player,InteractionHand.MAIN_HAND,Vec3.ZERO);
}
static DroppedBookEntity spawn() {
var stack=new ItemStack(Rivencraft.LINKING_BOOK.get());
stack.set(DataComponents.CUSTOM_NAME,Component.literal("World book"));
var book=new DroppedBookEntity(level,new Vec3(8.5,64,8.5),stack);
book.setNoGravity(true);book.setDeltaMovement(Vec3.ZERO);book.setNoPickUpDelay();
check(level.addFreshEntity(book),"Spawn clickable book");
return book;
}
static DroppedBookActionPayload source(DroppedBookEntity book) {
return new DroppedBookActionPayload(book.getId(),book.getUUID(),book.getItem().copy(),
DroppedBookActionPayload.Action.USE,"",false);
}
static void run() throws Exception {
for(int x=0;x<16;x++)for(int z=0;z<16;z++)level.setBlock(new BlockPos(x,63,z),Blocks.STONE.defaultBlockState(),2);
var player=new ProbePlayer(level,
new com.mojang.authlib.GameProfile(UUID.randomUUID(),"RivenInteraction"));
player.setPos(8.5,64,8.5);player.getInventory().clearContent();
var book=spawn();var expected=source(book);
check(book.isPickable(),"Raycast can hit book");
book.playerTouch(player);
check(!book.isRemoved() && player.getInventory().isEmpty(),"Walking does not pick up");
player.setShiftKeyDown(false);click(book,player);
check(!book.isRemoved() && player.getInventory().isEmpty(),"Right click opens without pickup");
check(DroppedBookEntity.validated(player,book.getId(),book.getUUID(),book.getItem().copy())==book,"Valid source");
check(DroppedBookEntity.validated(player,book.getId(),UUID.randomUUID(),book.getItem())==null,"Wrong UUID rejected");
var forged=book.getItem().copy();forged.set(DataComponents.CUSTOM_NAME,Component.literal("Forged"));
check(DroppedBookEntity.validated(player,book.getId(),book.getUUID(),forged)==null,"Changed stack rejected");
player.setPos(100,64,100);
check(DroppedBookEntity.validated(player,book.getId(),book.getUUID(),book.getItem())==null,"Remote action rejected");
PortBookNetworking.droppedBookAction(player,expected.action(DroppedBookActionPayload.Action.BIND,"Remote",false));
check(!book.getItem().has(Rivencraft.LINK_BOOK_TARGET.get()),"Remote bind cannot mutate book");
player.setPos(8.5,64,8.5);
PortBookNetworking.droppedBookAction(player,source(book).action(DroppedBookActionPayload.Action.BIND,"Ground binding",false));
check(book.getItem().has(Rivencraft.LINK_BOOK_TARGET.get()) && book.getItem().getHoverName().getString().equals("Ground binding"),"Ground book binding shares normal handler");
check(DroppedBookEntity.validated(player,expected.entityId(),expected.entityUuid(),expected.book())==null,"Stale pre-bind request rejected");
book.getItem().set(Rivencraft.LINK_BOOK_TARGET.get(),new net.dnorberg.rivencraft.item.LinkBookTarget(level.dimension().identifier(),14.5,64,14.5,0,0));
book.getItem().set(Rivencraft.LINK_PROPERTIES.get(),new net.dnorberg.rivencraft.item.LinkProperties(net.dnorberg.rivencraft.item.LinkProperties.INTRA_LINKING));
var use=source(book);
PortBookNetworking.droppedBookAction(player,use);
check(player.requested==null,"Ground travel still requires catalog acknowledgement");
var stateMethod=net.dnorberg.rivencraft.age.AgeCatalogSync.class.getDeclaredMethod("state",net.minecraft.server.MinecraftServer.class);
stateMethod.setAccessible(true);var state=stateMethod.invoke(null,level.getServer());
var version=state.getClass().getDeclaredField("version");version.setAccessible(true);
var ack=net.dnorberg.rivencraft.age.AgeCatalogSync.class.getDeclaredMethod("acknowledge",net.minecraft.server.level.ServerPlayer.class,int.class);
ack.setAccessible(true);ack.invoke(null,player,version.getInt(state));
PortBookNetworking.droppedBookAction(player,use);
check(player.requested!=null && player.requested.x>13 && player.requested.z>13,"Ground handler requests normal link teleport");
check(!book.isRemoved() && book.getItem().getCount()==1,"Travel leaves the same world book");
player.setPos(8.5,64,8.5);
// Ownership and the original pickup delay are still enforced for explicit pickup.
player.setShiftKeyDown(true);book.setTarget(UUID.randomUUID());click(book,player);
check(!book.isRemoved() && player.getInventory().isEmpty(),"Owner restriction retained");
book.setTarget(player.getUUID());book.setPickUpDelay(80);click(book,player);
check(!book.isRemoved(),"Pickup delay retained");
book.setNoPickUpDelay();
for(int i=0;i<36;i++)player.getInventory().setItem(i,new ItemStack(Items.STONE,64));
click(book,player);
check(!book.isRemoved() && book.getItem().getCount()==1,"Full inventory keeps world book");
player.getInventory().clearContent();click(book,player);
check(book.isRemoved(),"Shift right click picks up");
check(player.getInventory().countItem(Rivencraft.LINKING_BOOK.get())==1,"Exactly one book recovered");
check(DroppedBookEntity.validated(player,use.entityId(),use.entityUuid(),use.book())==null,"Picked-up source invalidated");
var buffer=new RegistryFriendlyByteBuf(Unpooled.buffer(),level.registryAccess());
try {
DroppedBookActionPayload.STREAM_CODEC.encode(buffer,use);
var decoded=DroppedBookActionPayload.STREAM_CODEC.decode(buffer);
check(decoded.entityUuid().equals(use.entityUuid()) && decoded.entityId()==use.entityId()
&& decoded.action()==use.action() && ItemStack.matches(decoded.book(),use.book()) && buffer.readableBytes()==0,"Action wire round trip");
} finally { buffer.release(); }
var b=new RegistryFriendlyByteBuf(Unpooled.buffer(),level.registryAccess());
try {
for(UUID id:java.util.Arrays.asList(null,UUID.randomUUID())) {
var preview=new RequestBookPreviewPayload(UUID.randomUUID(),false,false,level.dimension().identifier(),BlockPos.ZERO,use.book(),id);
RequestBookPreviewPayload.STREAM_CODEC.encode(b,preview);
var decoded=RequestBookPreviewPayload.STREAM_CODEC.decode(b);
check(java.util.Objects.equals(decoded.droppedBook(),id) && b.readableBytes()==0,"Preview source wire round trip");
}
} finally { b.release(); }
}
}