Public Access
Release machine acceleration, dropped books and baseline defaults for both tracks
Build and smoke / changes (push) Waiting to run
Build and smoke / changes (push) Waiting to run
This commit is contained in:
1 parent
d199ac253e
commit
6630ed7ab1
72 files changed
+2390
-108
No files matched your search
+162
@@ -0,0 +1,162 @@
|
||||
package net.dnorberg.rivencraft.regression;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
import net.dnorberg.rivencraft.entity.DroppedBookEntity;
|
||||
import net.dnorberg.rivencraft.registry.*;
|
||||
import net.dnorberg.rivencraft.book.*;
|
||||
import net.dnorberg.rivencraft.writing.*;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.GlobalPos;
|
||||
import net.minecraft.core.component.DataComponents;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.world.entity.EntityType;
|
||||
import net.minecraft.world.entity.item.ItemEntity;
|
||||
import net.minecraft.world.item.*;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.phys.*;
|
||||
import net.neoforged.bus.api.*;
|
||||
import net.neoforged.fml.common.EventBusSubscriber;
|
||||
import net.neoforged.neoforge.event.entity.EntityJoinLevelEvent;
|
||||
import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
||||
import net.neoforged.neoforge.event.tick.ServerTickEvent;
|
||||
|
||||
@EventBusSubscriber(modid="rivencraft")
|
||||
public class BookDropProbe {
|
||||
static int checks, wait, stage;
|
||||
static boolean cancelReplacement;
|
||||
static ServerLevel level;
|
||||
static final UUID OWNER=UUID.fromString("cc5909e5-aafa-43d6-b841-a917ec9c0115");
|
||||
static final AABB AREA=new AABB(-16,0,-16,32,100,32);
|
||||
static void check(boolean value,String label) { if(!value)throw new AssertionError(label);checks++; }
|
||||
static ItemStack book(boolean descriptive,String name) {
|
||||
var stack=new ItemStack(descriptive?ModItems.DESCRIPTIVE_BOOK.get():ModItems.LINKING_BOOK.get());
|
||||
stack.set(DataComponents.CUSTOM_NAME,Component.literal(name));return stack;
|
||||
}
|
||||
@SubscribeEvent(priority=EventPriority.HIGHEST)
|
||||
public static void cancel(EntityJoinLevelEvent event) {
|
||||
if(event.getLevel()!=level || !(event.getEntity() instanceof ItemEntity item))return;
|
||||
String name=item.getItem().getHoverName().getString();
|
||||
if(name.equals("cancel_original") || cancelReplacement && item instanceof DroppedBookEntity
|
||||
&& name.equals("cancel_preserve"))event.setCanceled(true);
|
||||
}
|
||||
@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 {
|
||||
if(stage==0) { create();stage=1;wait=3; }
|
||||
else if(stage==1) { verify();stage=2;wait=3; }
|
||||
else { check(find("retry_after_reload") instanceof DroppedBookEntity,"Canceled replacement converts after reload");
|
||||
System.out.println("DROP114_PASS checks="+checks);event.getServer().halt(false); }
|
||||
} catch(Throwable error) { System.out.println("DROP114_FAIL "+error);error.printStackTrace();event.getServer().halt(false); }
|
||||
}
|
||||
static void create() {
|
||||
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=net.neoforged.neoforge.common.util.FakePlayerFactory.get(level,
|
||||
new com.mojang.authlib.GameProfile(UUID.randomUUID(),"RivenDropProbe"));
|
||||
player.setPos(8.5,64,8.5);
|
||||
var stack=book(false,"state_copy");stack.setCount(3);
|
||||
stack.set(ModDataComponents.LINK_TARGET.get(),new LinkTarget(GlobalPos.of(level.dimension(),new BlockPos(-1,64,-2)),135,-20));
|
||||
stack.set(ModDataComponents.LINK_DESTINATION_NAME.get(),"Named destination");
|
||||
stack.set(ModDataComponents.LINK_PROPERTIES.get(),new LinkProperties(LinkProperties.DISARM|LinkProperties.MAINTAIN_MOMENTUM));
|
||||
stack.set(ModDataComponents.AGE_REFERENCE.get(),new AgeReference(UUID.randomUUID(),"Authored Age"));
|
||||
stack.set(ModDataComponents.BOOK_AUTHOR.get(),"Test author");
|
||||
stack.set(ModDataComponents.BOOK_WRITING.get(),new OrderedWriting(List.of(WritingEntry.linkPanel(),
|
||||
WritingEntry.symbol(new SymbolReference(ResourceLocation.parse("rivencraft:terrain/flat"))))));
|
||||
var source=new ItemEntity(level,8.5,66,8.5,stack);
|
||||
source.setTarget(OWNER);source.setThrower(player);source.setPickUpDelay(80);
|
||||
source.setDeltaMovement(12.5,.1,-13.25);source.setYRot(37);source.setXRot(12);
|
||||
source.setNoGravity(true);source.setInvulnerable(true);source.addTag("drop_probe");
|
||||
source.getPersistentData().putString("test_attachment","kept");
|
||||
var copy=DroppedBookEntity.fromDrop(source);
|
||||
check(copy.position().equals(source.position()) && copy.getDeltaMovement().equals(source.getDeltaMovement()),"No departure offset or motion reset");
|
||||
check(copy.getYRot()==37 && copy.getXRot()==12 && copy.isNoGravity() && copy.isInvulnerable(),"Rotation and entity flags");
|
||||
check(ItemStack.matches(source.getItem(),copy.getItem()) && copy.getItem().getCount()==3,"All components and count");
|
||||
check(!copy.getUUID().equals(source.getUUID()) && copy.getAge()==-32768,"Fresh identity and open-book lifetime");
|
||||
check(copy.copy() instanceof DroppedBookEntity && copy.copy().getType()==ModEntities.DROPPED_BOOK.get(),"Pickup-particle copy retains custom renderer type");
|
||||
CompoundTag original=source.saveWithoutId(new CompoundTag()),saved=copy.saveWithoutId(new CompoundTag());
|
||||
for(String key:original.getAllKeys()) {
|
||||
if(key.equals("UUID") || key.equals("Age"))continue;
|
||||
check(java.util.Objects.equals(original.get(key),saved.get(key)),"Native metadata retained: "+key);
|
||||
}
|
||||
var restored=new DroppedBookEntity(ModEntities.DROPPED_BOOK.get(),level);
|
||||
restored.load(saved);
|
||||
check(ItemStack.matches(restored.getItem(),copy.getItem()) && OWNER.equals(restored.getTarget()),"Custom entity NBT reload");
|
||||
for(String name:List.of("bound_link","bound_description","unwritten_link","unwritten_description")) {
|
||||
var item=book(name.endsWith("description"),name);
|
||||
if(name.equals("bound_link")) {
|
||||
item.set(ModDataComponents.LINK_TARGET.get(),stack.get(ModDataComponents.LINK_TARGET.get()));
|
||||
item.set(ModDataComponents.LINK_DESTINATION_NAME.get(),"Named destination");
|
||||
}
|
||||
if(name.equals("bound_description"))item.set(ModDataComponents.AGE_REFERENCE.get(),stack.get(ModDataComponents.AGE_REFERENCE.get()));
|
||||
spawn(item);
|
||||
}
|
||||
player.drop(book(false,"player_toss"),false);
|
||||
net.minecraft.world.Containers.dropItemStack(level,8.5,65,8.5,book(true,"container"));
|
||||
var stand=new BlockPos(10,64,8);
|
||||
level.setBlock(stand,ModBlocks.BOOK_STAND.get().defaultBlockState(),3);
|
||||
((net.dnorberg.rivencraft.block.entity.BookStandBlockEntity)level.getBlockEntity(stand)).setBook(book(false,"stand_break"));
|
||||
level.destroyBlock(stand,true);
|
||||
for(int slot=0;slot<36;slot++)player.getInventory().setItem(slot,new ItemStack(Items.STONE,64));
|
||||
stand=new BlockPos(11,64,8);
|
||||
level.setBlock(stand,ModBlocks.BOOK_STAND.get().defaultBlockState(),3);
|
||||
((net.dnorberg.rivencraft.block.entity.BookStandBlockEntity)level.getBlockEntity(stand)).setBook(book(false,"full_inventory"));
|
||||
player.setShiftKeyDown(true);
|
||||
level.getBlockState(stand).useWithoutItem(level,player,new BlockHitResult(Vec3.atCenterOf(stand),net.minecraft.core.Direction.UP,stand,false));
|
||||
player.setShiftKeyDown(false);player.getInventory().clearContent();
|
||||
player.getInventory().setItem(0,book(false,"disarm"));
|
||||
LinkDisarmService.disarm(player);
|
||||
check(player.getInventory().getItem(0).isEmpty(),"Disarm emptied book slot");
|
||||
player.getInventory().setItem(0,book(true,"inventory_death_path"));
|
||||
player.getInventory().dropAll();
|
||||
var modifier=new BlockPos(12,64,8);
|
||||
level.setBlock(modifier,ModBlocks.LINK_MODIFIER.get().defaultBlockState(),3);
|
||||
((net.dnorberg.rivencraft.block.entity.LinkModifierBlockEntity)level.getBlockEntity(modifier)).setItem(0,book(false,"station"));
|
||||
level.destroyBlock(modifier,true);
|
||||
var custom=new DroppedBookEntity(level,new Vec3(8.5,66,8.5),book(false,"already_custom"));
|
||||
custom.setNoGravity(true);level.addFreshEntity(custom);
|
||||
for(var item:List.of(ModItems.PAGE.get(),ModItems.NOTEBOOK.get(),ModItems.COLLATION_FOLDER.get(),ModItems.SYMBOL_PORTFOLIO.get())) {
|
||||
var ordinary=new ItemStack(item);ordinary.set(DataComponents.CUSTOM_NAME,Component.literal("ordinary_"+item.toString()));spawn(ordinary);
|
||||
}
|
||||
cancelReplacement=true;spawn(book(false,"cancel_preserve"));
|
||||
var canceled=new ItemEntity(level,8.5,66,8.5,book(false,"cancel_original"));
|
||||
check(!level.addFreshEntity(canceled),"Original spawn cancellation honored");
|
||||
var loaded=new ItemEntity(level,8.5,66,8.5,book(false,"loaded_ordinary"));
|
||||
var tag=loaded.saveWithoutId(new CompoundTag());
|
||||
var fromDisk=new ItemEntity(EntityType.ITEM,level);fromDisk.load(tag);fromDisk.setUUID(UUID.randomUUID());
|
||||
level.addFreshEntity(fromDisk);
|
||||
}
|
||||
static void spawn(ItemStack stack) {
|
||||
var item=new ItemEntity(level,8.5,66,8.5,stack);item.setNoGravity(true);
|
||||
item.setDeltaMovement(Vec3.ZERO);item.setTarget(OWNER);level.addFreshEntity(item);
|
||||
}
|
||||
static ItemEntity find(String name) {
|
||||
var found=level.getEntitiesOfClass(ItemEntity.class,AREA).stream()
|
||||
.filter(e->e.getItem().getHoverName().getString().equals(name)).toList();
|
||||
check(found.size()==1,"Exactly one entity: "+name);
|
||||
return found.getFirst();
|
||||
}
|
||||
static void verify() {
|
||||
for(String name:List.of("bound_link","bound_description","unwritten_link","unwritten_description",
|
||||
"player_toss","container","stand_break","full_inventory","disarm","inventory_death_path","station","already_custom","loaded_ordinary"))
|
||||
check(find(name) instanceof DroppedBookEntity,"Open model: "+name);
|
||||
check("Named destination".equals(find("bound_link").getItem().get(ModDataComponents.LINK_DESTINATION_NAME.get())),"Bound destination retained");
|
||||
var drops=level.getEntitiesOfClass(ItemEntity.class,AREA);
|
||||
check(drops.stream().filter(e->e.getItem().is(Items.LECTERN)).mapToInt(e->e.getItem().getCount()).sum()==1,"One lectern on break");
|
||||
check(drops.stream().filter(e->e.getItem().getHoverName().getString().startsWith("ordinary_")).count()==4,"All non-book drops present");
|
||||
check(drops.stream().noneMatch(e->e instanceof DroppedBookEntity && e.getItem().getHoverName().getString().startsWith("ordinary_")),"Pages and collections stay ordinary");
|
||||
check(drops.stream().noneMatch(e->e.getItem().getHoverName().getString().equals("cancel_original")),"Canceled source produced no ghost");
|
||||
var canceled=find("cancel_preserve");
|
||||
check(!(canceled instanceof DroppedBookEntity),"Canceled replacement keeps source");
|
||||
cancelReplacement=false;
|
||||
var tag=canceled.saveWithoutId(new CompoundTag());canceled.discard();
|
||||
var reloaded=new ItemEntity(EntityType.ITEM,level);reloaded.load(tag);reloaded.setUUID(UUID.randomUUID());
|
||||
reloaded.getItem().set(DataComponents.CUSTOM_NAME,Component.literal("retry_after_reload"));
|
||||
level.addFreshEntity(reloaded);
|
||||
}
|
||||
}
|
||||
+120
@@ -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(); }
|
||||
}
|
||||
}
|
||||
+127
@@ -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(); }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,132 @@
|
||||
package net.dnorberg.rivencraft.book;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import net.dnorberg.rivencraft.mixin.LevelBlockEntityTickersAccessor;
|
||||
import net.dnorberg.rivencraft.shared.AcceleratedMachineWork;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.Items;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
|
||||
import net.minecraft.world.level.block.entity.TickingBlockEntity;
|
||||
import net.minecraft.world.inventory.ContainerData;
|
||||
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;
|
||||
|
||||
@EventBusSubscriber(modid="rivencraft")
|
||||
public class MachineProbe {
|
||||
static int checks, warmup;
|
||||
static void check(boolean value,String label) {
|
||||
if(!value) throw new AssertionError(label);
|
||||
checks++;
|
||||
}
|
||||
@SubscribeEvent public static void start(ServerStartedEvent event) {
|
||||
event.getServer().overworld().setChunkForced(0,0,true);
|
||||
warmup=5;
|
||||
}
|
||||
@SubscribeEvent public static void tick(ServerTickEvent.Post event) {
|
||||
if(warmup<=0 || --warmup!=0) return;
|
||||
event.getServer().execute(()->{
|
||||
try { run(event.getServer());System.out.println("MACHINE112_PASS checks="+checks); }
|
||||
catch(Throwable error) { System.out.println("MACHINE112_FAIL "+error);error.printStackTrace(); }
|
||||
finally { event.getServer().halt(false); }
|
||||
});
|
||||
}
|
||||
static class Counter implements TickingBlockEntity {
|
||||
final BlockPos pos; int calls; boolean removed;
|
||||
Counter(BlockPos pos) { this.pos=pos; }
|
||||
public void tick() { calls++; }
|
||||
public boolean isRemoved() { return removed; }
|
||||
public BlockPos getPos() { return pos; }
|
||||
public String getType() { return "rivencraft:test_machine"; }
|
||||
}
|
||||
static void run(MinecraftServer server) throws Exception {
|
||||
scheduler();
|
||||
ServerLevel level=server.overworld();
|
||||
var registered=((LevelBlockEntityTickersAccessor)level).rivencraft$blockEntityTickers();
|
||||
var near=new BlockPos(1,4,1);
|
||||
check(level.hasChunkAt(near) && level.shouldTickBlocksAt(near),"Forced chunk normally ticks");
|
||||
level.setBlockAndUpdate(near,Blocks.FURNACE.defaultBlockState());
|
||||
var furnace=(AbstractFurnaceBlockEntity)level.getBlockEntity(near);
|
||||
furnace.setItem(0,new ItemStack(Items.IRON_ORE,4));
|
||||
furnace.setItem(1,new ItemStack(Items.COAL,4));
|
||||
var dataField=AbstractFurnaceBlockEntity.class.getDeclaredField("dataAccess");
|
||||
dataField.setAccessible(true);
|
||||
var data=(ContainerData)dataField.get(furnace);
|
||||
// Its ordinary registered ticker is also the one used for acceleration.
|
||||
var ticker=registered.stream().filter(t->t.getPos().equals(near)).findFirst().orElseThrow();
|
||||
ticker.tick();
|
||||
int progress=data.get(2);
|
||||
check(progress>0,"Ordinary registered furnace ticker smelts");
|
||||
AgeMachineTicks.tick(level,0);
|
||||
check(data.get(2)==progress,"Zero pages add no work");
|
||||
AgeMachineTicks.tick(level,1);
|
||||
check(data.get(2)==progress+1,"One page one extra registered furnace tick");
|
||||
AgeMachineTicks.tick(level,4);
|
||||
check(data.get(2)==progress+5,"Repeated pages stack");
|
||||
server.tickRateManager().setFrozen(true);
|
||||
AgeMachineTicks.tick(level,8);
|
||||
check(data.get(2)==progress+5,"Tick freeze respected");
|
||||
server.tickRateManager().setFrozen(false);
|
||||
for(int i=0;i<50;i++) AgeMachineTicks.tick(level,4);
|
||||
check(furnace.getItem(2).is(Items.IRON_INGOT),"Extra ticks complete real smelting recipe");
|
||||
// Overworld's normal event must not enable the Age-only effect.
|
||||
progress=data.get(2);
|
||||
AgeInstabilityRuntime.onLevelTickPost(new net.neoforged.neoforge.event.tick.LevelTickEvent.Post(()->true,level));
|
||||
check(data.get(2)==progress,"Normal Overworld not accelerated by runtime event");
|
||||
level.removeBlock(near,false);
|
||||
AgeMachineTicks.tick(level,8);
|
||||
check(furnace.isRemoved(),"Removed furnace no longer valid");
|
||||
level.setBlockAndUpdate(near,Blocks.FURNACE.defaultBlockState());
|
||||
var replacement=(AbstractFurnaceBlockEntity)level.getBlockEntity(near);
|
||||
replacement.setItem(0,new ItemStack(Items.IRON_ORE));
|
||||
replacement.setItem(1,new ItemStack(Items.COAL));
|
||||
AgeMachineTicks.tick(level,3);
|
||||
var replacementData=(ContainerData)dataField.get(replacement);
|
||||
check(replacement!=furnace && replacementData.get(2)==3,"Replacement uses new bound ticker");
|
||||
|
||||
var valid=new Counter(near);
|
||||
var removed=new Counter(near);removed.removed=true;
|
||||
var unloaded=new Counter(new BlockPos(50000,4,50000));
|
||||
var outsideBorder=new Counter(new BlockPos(30000000,4,0));
|
||||
var original=new ArrayList<>(registered);
|
||||
try {
|
||||
registered.clear();registered.addAll(List.of(valid,removed,unloaded,outsideBorder));
|
||||
AgeMachineTicks.tick(level,3);
|
||||
check(valid.calls==3,"Custom registered ticker supported");
|
||||
check(removed.calls==0 && unloaded.calls==0 && outsideBorder.calls==0,"Removal unloaded and border guards");
|
||||
check(!level.hasChunkAt(unloaded.getPos()),"Does not force-load machinery");
|
||||
} finally { registered.clear();registered.addAll(original); }
|
||||
var ids=java.util.List.of("terrain/flat","biome/plains","biome/single",
|
||||
"environment/accelerated","environment/accelerated","environment/accelerated");
|
||||
var entries=new ArrayList<net.dnorberg.rivencraft.writing.WritingEntry>();
|
||||
entries.add(net.dnorberg.rivencraft.writing.WritingEntry.linkPanel());
|
||||
for(String id:ids) entries.add(net.dnorberg.rivencraft.writing.WritingEntry.symbol(new net.dnorberg.rivencraft.writing.SymbolReference(net.minecraft.resources.ResourceLocation.parse("rivencraft:"+id))));
|
||||
var plan=AgeGenerationPlan.compile(new net.dnorberg.rivencraft.writing.OrderedWriting(entries),112L,
|
||||
AgeGenerationProfiles.STANDARD,AgeTraits.select(112L),server.registryAccess());
|
||||
check(AgeAcceleratedTicks.acceleratedPages(plan)==3,"Repeated authored Accelerated page count");
|
||||
check(AgeAcceleratedTicks.acceleratedPages(AgeGenerationPlan.load(plan.save()))==3,"Saved plan retains page count");
|
||||
}
|
||||
static void scheduler() {
|
||||
var work=new AcceleratedMachineWork();
|
||||
var list=new ArrayList<Counter>();
|
||||
for(int i=0;i<5;i++)list.add(new Counter(BlockPos.ZERO));
|
||||
for(int i=0;i<5;i++)check(work.run(list,20,5,2,c->!c.removed,Counter::tick)==2,"Budget cap");
|
||||
check(list.stream().allMatch(c->c.calls==2),"Fair budget across repeated ticks");
|
||||
work=new AcceleratedMachineWork();
|
||||
list.forEach(c->c.calls=0);
|
||||
for(int i=0;i<5;i++)work.run(list,1,2,20,c->true,Counter::tick);
|
||||
check(list.stream().allMatch(c->c.calls==2),"Candidate window rotates fairly");
|
||||
var mutating=new ArrayList<Counter>();var first=new Counter(BlockPos.ZERO);
|
||||
mutating.add(first);
|
||||
work.run(mutating,4,10,20,c->!c.removed,c->{c.tick();c.removed=true;mutating.clear();});
|
||||
check(first.calls==1,"Removal and live list mutation safe");
|
||||
check(work.run(list,10,5,0,c->true,Counter::tick)==0,"Zero machine budget");
|
||||
check(work.run(list,Integer.MAX_VALUE,5,7,c->true,Counter::tick)==7,"Overflow-safe page budget");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,133 @@
|
||||
package net.dnorberg.rivencraft.age;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import net.dnorberg.rivencraft.mixin.LevelBlockEntityTickersAccessor;
|
||||
import net.dnorberg.rivencraft.shared.AcceleratedMachineWork;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.Items;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
|
||||
import net.minecraft.world.level.block.entity.TickingBlockEntity;
|
||||
import net.minecraft.world.inventory.ContainerData;
|
||||
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;
|
||||
|
||||
@EventBusSubscriber(modid="rivencraft")
|
||||
public class MachineProbe {
|
||||
static int checks, warmup;
|
||||
static void check(boolean value,String label) {
|
||||
if(!value) throw new AssertionError(label);
|
||||
checks++;
|
||||
}
|
||||
@SubscribeEvent public static void start(ServerStartedEvent event) {
|
||||
event.getServer().overworld().setChunkForced(0,0,true);
|
||||
warmup=5;
|
||||
}
|
||||
@SubscribeEvent public static void tick(ServerTickEvent.Post event) {
|
||||
if(warmup<=0 || --warmup!=0) return;
|
||||
event.getServer().execute(()->{
|
||||
try { run(event.getServer());System.out.println("MACHINE112_PASS checks="+checks); }
|
||||
catch(Throwable error) { System.out.println("MACHINE112_FAIL "+error);error.printStackTrace(); }
|
||||
finally { event.getServer().halt(false); }
|
||||
});
|
||||
}
|
||||
static class Counter implements TickingBlockEntity {
|
||||
final BlockPos pos; int calls; boolean removed;
|
||||
Counter(BlockPos pos) { this.pos=pos; }
|
||||
public void tick() { calls++; }
|
||||
public boolean isRemoved() { return removed; }
|
||||
public BlockPos getPos() { return pos; }
|
||||
public String getType() { return "rivencraft:test_machine"; }
|
||||
}
|
||||
static void run(MinecraftServer server) throws Exception {
|
||||
scheduler();
|
||||
ServerLevel level=server.overworld();
|
||||
var registered=((LevelBlockEntityTickersAccessor)level).rivencraft$blockEntityTickers();
|
||||
var near=new BlockPos(1,4,1);
|
||||
check(level.hasChunkAt(near) && level.shouldTickBlocksAt(near),"Forced chunk normally ticks");
|
||||
level.setBlockAndUpdate(near,Blocks.FURNACE.defaultBlockState());
|
||||
var furnace=(AbstractFurnaceBlockEntity)level.getBlockEntity(near);
|
||||
furnace.setItem(0,new ItemStack(Items.IRON_ORE,4));
|
||||
furnace.setItem(1,new ItemStack(Items.COAL,4));
|
||||
var dataField=AbstractFurnaceBlockEntity.class.getDeclaredField("dataAccess");
|
||||
dataField.setAccessible(true);
|
||||
var data=(ContainerData)dataField.get(furnace);
|
||||
// Its ordinary registered ticker is also the one used for acceleration.
|
||||
var ticker=registered.stream().filter(t->t.getPos().equals(near)).findFirst().orElseThrow();
|
||||
ticker.tick();
|
||||
int progress=data.get(2);
|
||||
check(progress>0,"Ordinary registered furnace ticker smelts");
|
||||
PortMachineTicks.tick(level,0);
|
||||
check(data.get(2)==progress,"Zero pages add no work");
|
||||
PortMachineTicks.tick(level,1);
|
||||
check(data.get(2)==progress+1,"One page one extra registered furnace tick");
|
||||
PortMachineTicks.tick(level,4);
|
||||
check(data.get(2)==progress+5,"Repeated pages stack");
|
||||
server.tickRateManager().setFrozen(true);
|
||||
PortMachineTicks.tick(level,8);
|
||||
check(data.get(2)==progress+5,"Tick freeze respected");
|
||||
server.tickRateManager().setFrozen(false);
|
||||
for(int i=0;i<50;i++) PortMachineTicks.tick(level,4);
|
||||
check(furnace.getItem(2).is(Items.IRON_INGOT),"Extra ticks complete real smelting recipe");
|
||||
// Overworld's normal event must not enable the Age-only effect.
|
||||
progress=data.get(2);
|
||||
PortAcceleratedTicks.onLevelTickPost(new net.neoforged.neoforge.event.tick.LevelTickEvent.Post(()->true,level));
|
||||
check(data.get(2)==progress,"Normal Overworld not accelerated by runtime event");
|
||||
level.removeBlock(near,false);
|
||||
PortMachineTicks.tick(level,8);
|
||||
check(furnace.isRemoved(),"Removed furnace no longer valid");
|
||||
level.setBlockAndUpdate(near,Blocks.FURNACE.defaultBlockState());
|
||||
var replacement=(AbstractFurnaceBlockEntity)level.getBlockEntity(near);
|
||||
replacement.setItem(0,new ItemStack(Items.IRON_ORE));
|
||||
replacement.setItem(1,new ItemStack(Items.COAL));
|
||||
PortMachineTicks.tick(level,3);
|
||||
var replacementData=(ContainerData)dataField.get(replacement);
|
||||
check(replacement!=furnace && replacementData.get(2)==3,"Replacement uses new bound ticker");
|
||||
|
||||
var valid=new Counter(near);
|
||||
var removed=new Counter(near);removed.removed=true;
|
||||
var unloaded=new Counter(new BlockPos(50000,4,50000));
|
||||
var outsideBorder=new Counter(new BlockPos(30000000,4,0));
|
||||
var original=new ArrayList<>(registered);
|
||||
try {
|
||||
registered.clear();registered.addAll(List.of(valid,removed,unloaded,outsideBorder));
|
||||
PortMachineTicks.tick(level,3);
|
||||
check(valid.calls==3,"Custom registered ticker supported");
|
||||
check(removed.calls==0 && unloaded.calls==0 && outsideBorder.calls==0,"Removal unloaded and border guards");
|
||||
check(!level.hasChunkAt(unloaded.getPos()),"Does not force-load machinery");
|
||||
} finally { registered.clear();registered.addAll(original); }
|
||||
var age=RuntimeAgeBackend.create(server,net.minecraft.resources.Identifier.parse("rivencraft:age/machines112"),112L,null,PortAgeTerrain.FLAT);
|
||||
PortAcceleratedTicks.configure(age,4);
|
||||
check(PortAcceleratedTicks.pages(age)==4,"Age-local configured page count");
|
||||
age.getDataStorage().saveAndJoin();
|
||||
var typeField=PortAccelerationSettings.class.getDeclaredField("CODEC");typeField.setAccessible(true);
|
||||
@SuppressWarnings("unchecked") var codec=(com.mojang.serialization.Codec<PortAccelerationSettings>)typeField.get(null);
|
||||
var saved=codec.encodeStart(com.mojang.serialization.JsonOps.INSTANCE,
|
||||
age.getDataStorage().computeIfAbsent(PortAccelerationSettings.TYPE)).getOrThrow();
|
||||
check(codec.parse(com.mojang.serialization.JsonOps.INSTANCE,saved).getOrThrow().pages()==4,"Saved page count reload");
|
||||
check(PortAcceleratedTicks.pages(level)==0,"Other dimension page count unchanged");
|
||||
}
|
||||
static void scheduler() {
|
||||
var work=new AcceleratedMachineWork();
|
||||
var list=new ArrayList<Counter>();
|
||||
for(int i=0;i<5;i++)list.add(new Counter(BlockPos.ZERO));
|
||||
for(int i=0;i<5;i++)check(work.run(list,20,5,2,c->!c.removed,Counter::tick)==2,"Budget cap");
|
||||
check(list.stream().allMatch(c->c.calls==2),"Fair budget across repeated ticks");
|
||||
work=new AcceleratedMachineWork();
|
||||
list.forEach(c->c.calls=0);
|
||||
for(int i=0;i<5;i++)work.run(list,1,2,20,c->true,Counter::tick);
|
||||
check(list.stream().allMatch(c->c.calls==2),"Candidate window rotates fairly");
|
||||
var mutating=new ArrayList<Counter>();var first=new Counter(BlockPos.ZERO);
|
||||
mutating.add(first);
|
||||
work.run(mutating,4,10,20,c->!c.removed,c->{c.tick();c.removed=true;mutating.clear();});
|
||||
check(first.calls==1,"Removal and live list mutation safe");
|
||||
check(work.run(list,10,5,0,c->true,Counter::tick)==0,"Zero machine budget");
|
||||
check(work.run(list,Integer.MAX_VALUE,5,7,c->true,Counter::tick)==7,"Overflow-safe page budget");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Average a JSON-exported SavedData block profile, including zero-count chunks."""
|
||||
import argparse
|
||||
import collections
|
||||
import hashlib
|
||||
import json
|
||||
from pathlib import Path
|
||||
|
||||
def generate(source, version):
|
||||
raw = source.read_bytes()
|
||||
data = json.loads(raw)["nbt"]["data"]
|
||||
samples = data.get("Samples", data.get("samples"))
|
||||
if not samples:
|
||||
raise ValueError("The source profile has no sampled chunks")
|
||||
totals = collections.Counter()
|
||||
for sample in samples:
|
||||
counts = sample.get("Blocks", sample.get("blocks"))
|
||||
if not isinstance(counts, dict) or any(not isinstance(n, int) or n < 0 for n in counts.values()):
|
||||
raise ValueError("Invalid sampled block counts")
|
||||
totals.update(counts)
|
||||
return {
|
||||
"minecraft_version": version,
|
||||
"source_sample_count": len(samples),
|
||||
"source_sha256": hashlib.sha256(raw).hexdigest(),
|
||||
"blocks_per_chunk": {key: total / len(samples) for key, total in sorted(totals.items())},
|
||||
}
|
||||
|
||||
if __name__ == "__main__":
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument("source", type=Path)
|
||||
parser.add_argument("version", choices=("1.21.1", "26.3"))
|
||||
parser.add_argument("output", type=Path)
|
||||
args = parser.parse_args()
|
||||
args.output.parent.mkdir(parents=True, exist_ok=True)
|
||||
args.output.write_text(json.dumps(generate(args.source, args.version), indent=2) + "\n")
|
||||
@@ -0,0 +1,82 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Exercise the bundled-baseline Java policy without a server or test world."""
|
||||
import argparse
|
||||
import json
|
||||
from pathlib import Path
|
||||
import subprocess
|
||||
import tempfile
|
||||
from generate_block_baseline import generate
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
JAVA = r"""
|
||||
import java.util.Map;
|
||||
import net.dnorberg.rivencraft.shared.MaterialBaselinePolicy;
|
||||
|
||||
public class BaselineDefaultsChecks {
|
||||
private static int checks;
|
||||
private static void equal(double actual, double expected, String label) {
|
||||
checks++;
|
||||
if (Math.abs(actual - expected) > 1e-9) throw new AssertionError(label + ": " + actual + " != " + expected);
|
||||
}
|
||||
public static void main(String[] args) {
|
||||
var policy = MaterialBaselinePolicy.load("/assets/rivencraft/instability/default_block_baseline.json");
|
||||
double iron = Double.parseDouble(args[0]), coal = Double.parseDouble(args[1]);
|
||||
equal(policy.average("minecraft:coal_ore", 0, 500, false, 0), coal, "Void coal default");
|
||||
equal(policy.average("minecraft:coal_ore", 25, 500, false, 0), .05, "Measured vanilla wins");
|
||||
equal(policy.average("test:tin_ore", 0, 500, true, 1000), 2, "Measured iron for missing modded ore");
|
||||
equal(policy.average("test:tin_ore", 0, 500, true, 0), iron, "Void uses bundled iron");
|
||||
equal(policy.average("create:zinc_ore", 0, 500, true, 0), iron, "Bundled modded entry cannot replace iron rule");
|
||||
equal(policy.average("test:tin_ore", 5, 500, true, 0), .01, "Measured modded ore wins");
|
||||
equal(policy.average("test:tin_ore", 0, 1000, true, 2000), 2, "Chunk-count normalization");
|
||||
equal(policy.average("test:tin_block", 0, 500, false, 1000), 0, "No iron fallback for storage");
|
||||
equal(policy.average("test:fluid", 0, 500, false, 1000), 0, "No iron fallback for fluid");
|
||||
equal(policy.average("minecraft:diamond_block", 0, 500, false, 0), 0, "Absent default remains zero");
|
||||
equal(policy.average("minecraft:coal_ore", 1, 3, false, 0), 1.0 / 3, "No integer rounding");
|
||||
try {
|
||||
policy.average("minecraft:coal_ore", 0, 0, false, 0);
|
||||
throw new AssertionError("Empty profile accepted");
|
||||
} catch (IllegalArgumentException expected) { checks++; }
|
||||
try {
|
||||
new MaterialBaselinePolicy(Map.of("minecraft:iron_ore", Double.NaN));
|
||||
throw new AssertionError("NaN accepted");
|
||||
} catch (IllegalArgumentException expected) { checks++; }
|
||||
try {
|
||||
new MaterialBaselinePolicy(Map.of("minecraft:coal_ore", 1.0));
|
||||
throw new AssertionError("Missing iron accepted");
|
||||
} catch (IllegalArgumentException expected) { checks++; }
|
||||
System.out.println("BASELINE_DEFAULTS_PASS version=" + args[2] + " checks=" + checks);
|
||||
}
|
||||
}
|
||||
"""
|
||||
|
||||
def main(source_dir):
|
||||
gson = next((Path.home() / ".gradle/caches/modules-2/files-2.1/com.google.code.gson/gson").rglob("gson-*.jar"))
|
||||
output = ROOT / "build/verification/baseline115/defaults.txt"
|
||||
output.parent.mkdir(parents=True, exist_ok=True)
|
||||
lines = []
|
||||
with tempfile.TemporaryDirectory(prefix="rivencraft-baseline-policy-") as temp:
|
||||
work = Path(temp)
|
||||
fixture = work / "BaselineDefaultsChecks.java"
|
||||
fixture.write_text(JAVA)
|
||||
subprocess.run(["javac", "-cp", str(gson), "-d", temp,
|
||||
str(ROOT / "shared/src/main/java/net/dnorberg/rivencraft/shared/MaterialBaselinePolicy.java"),
|
||||
str(fixture)], check=True)
|
||||
for version, resources, iron, coal in [
|
||||
("1.21.1", ROOT / "src/main/resources", 89.96656534954407, 170.09625126646404),
|
||||
("26.3", ROOT / "ports/mc263/src/main/resources", 76.5361328125, 95.7587890625),
|
||||
]:
|
||||
bundled = json.loads((resources / "assets/rivencraft/instability/default_block_baseline.json").read_text())
|
||||
if source_dir:
|
||||
expected = generate(source_dir / ("baseline-" + version + ".json"), version)
|
||||
assert bundled == expected, "Bundled averages differ from source chunk means: " + version
|
||||
lines.append("SOURCE_AVERAGES_PASS version=" + version + " chunks=" + str(bundled["source_sample_count"]))
|
||||
result = subprocess.run(["java", "-cp", ":".join(map(str, [work, gson, resources])),
|
||||
"BaselineDefaultsChecks", str(iron), str(coal), version], check=True, capture_output=True, text=True)
|
||||
lines.append(result.stdout.strip())
|
||||
output.write_text("\n".join(lines) + "\n")
|
||||
print("\n".join(lines))
|
||||
|
||||
if __name__ == "__main__":
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument("--source-dir", type=Path, help="Optionally verify each bundled mean against the original JSON exports")
|
||||
main(parser.parse_args().source_dir)
|
||||
@@ -0,0 +1,59 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Check Dropped-book join conversion and metadata; client rendering remains player validation."""
|
||||
import argparse
|
||||
import subprocess
|
||||
import tempfile
|
||||
from pathlib import Path
|
||||
from server_test_lock import server_test_lock
|
||||
from smoke_server import stop
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
|
||||
def run(target):
|
||||
log = ROOT / f"build/verification/drop114/{target}.log"
|
||||
log.parent.mkdir(parents=True, exist_ok=True)
|
||||
with server_test_lock(), tempfile.TemporaryDirectory(prefix=f"rivencraft-drop114-{target}-") as directory:
|
||||
work = Path(directory)
|
||||
init = work / "fixture.gradle"
|
||||
init.write_text("""
|
||||
gradle.beforeProject { p ->
|
||||
p.layout.buildDirectory.set(p.file('""" + str(work / "build") + """'))
|
||||
p.afterEvaluate {
|
||||
p.sourceSets.main.java.srcDir(p.file('""" + str(ROOT / "scripts/fixtures/drop114" / target) + """'))
|
||||
}
|
||||
}
|
||||
""")
|
||||
server = work / "server"
|
||||
server.mkdir()
|
||||
(server / "eula.txt").write_text("eula=true\n")
|
||||
(server / "server.properties").write_text(
|
||||
"server-ip=127.0.0.1\nserver-port=0\nonline-mode=false\nwhite-list=false\n"
|
||||
"level-type=minecraft:flat\nlevel-seed=114\nview-distance=2\nsimulation-distance=2\n"
|
||||
'generator-settings={"layers":[{"height":1,"block":"minecraft:bedrock"}],"biome":"minecraft:plains"}\n')
|
||||
process = None
|
||||
try:
|
||||
args = [str(ROOT / "gradlew")]
|
||||
if target == "mc263": args += ["-p", str(ROOT / "ports/mc263")]
|
||||
args += ["--no-daemon", "-I", str(init), "runServer", f"-PserverRunDir={server}", "--console=plain"]
|
||||
with log.open("w") as output:
|
||||
process = subprocess.Popen(args, cwd=ROOT, stdin=subprocess.PIPE, stdout=output,
|
||||
stderr=subprocess.STDOUT, text=True, start_new_session=True)
|
||||
try:
|
||||
process.wait(timeout=60)
|
||||
except subprocess.TimeoutExpired:
|
||||
print("HANDOFF: Dropped-book probe stalled; stopping without retry. Use docs/DROPPED_BOOKS.md.")
|
||||
return 2
|
||||
text = log.read_text()
|
||||
if process.returncode or "DROP114_PASS" not in text or "DROP114_FAIL" in text:
|
||||
print(text[-8000:])
|
||||
return 1
|
||||
print(next(line for line in text.splitlines() if "DROP114_PASS" in line))
|
||||
return 0
|
||||
finally:
|
||||
stop(process)
|
||||
print("Removed temporary test world and isolated fixture outputs. Log:", log)
|
||||
|
||||
if __name__ == "__main__":
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("target", choices=("mc1211",))
|
||||
raise SystemExit(run(parser.parse_args().target))
|
||||
@@ -0,0 +1,59 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Check Dropped-book interactions and source-validation checks; GPU UI remains player validation."""
|
||||
import argparse
|
||||
import subprocess
|
||||
import tempfile
|
||||
from pathlib import Path
|
||||
from server_test_lock import server_test_lock
|
||||
from smoke_server import stop
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
|
||||
def run(target):
|
||||
log = ROOT / f"build/verification/drop_interactions/{target}.log"
|
||||
log.parent.mkdir(parents=True, exist_ok=True)
|
||||
with server_test_lock(), tempfile.TemporaryDirectory(prefix=f"rivencraft-drop_interactions-{target}-") as directory:
|
||||
work = Path(directory)
|
||||
init = work / "fixture.gradle"
|
||||
init.write_text("""
|
||||
gradle.beforeProject { p ->
|
||||
p.layout.buildDirectory.set(p.file('""" + str(work / "build") + """'))
|
||||
p.afterEvaluate {
|
||||
p.sourceSets.main.java.srcDir(p.file('""" + str(ROOT / "scripts/fixtures/drop_interactions" / target) + """'))
|
||||
}
|
||||
}
|
||||
""")
|
||||
server = work / "server"
|
||||
server.mkdir()
|
||||
(server / "eula.txt").write_text("eula=true\n")
|
||||
(server / "server.properties").write_text(
|
||||
"server-ip=127.0.0.1\nserver-port=0\nonline-mode=false\nwhite-list=false\n"
|
||||
"level-type=minecraft:flat\nlevel-seed=112\nview-distance=2\nsimulation-distance=2\n"
|
||||
'generator-settings={"layers":[{"height":1,"block":"minecraft:bedrock"}],"biome":"minecraft:plains"}\n')
|
||||
process = None
|
||||
try:
|
||||
args = [str(ROOT / "gradlew")]
|
||||
if target == "mc263": args += ["-p", str(ROOT / "ports/mc263")]
|
||||
args += ["--no-daemon", "-I", str(init), "runServer", f"-PserverRunDir={server}", "--console=plain"]
|
||||
with log.open("w") as output:
|
||||
process = subprocess.Popen(args, cwd=ROOT, stdin=subprocess.PIPE, stdout=output,
|
||||
stderr=subprocess.STDOUT, text=True, start_new_session=True)
|
||||
try:
|
||||
process.wait(timeout=60)
|
||||
except subprocess.TimeoutExpired:
|
||||
print("HANDOFF: Dropped-book interaction probe stalled; stopping without retry. Use docs/DROPPED_BOOKS.md.")
|
||||
return 2
|
||||
text = log.read_text()
|
||||
if process.returncode or "DROPINTERACT_PASS" not in text or "DROPINTERACT_FAIL" in text:
|
||||
print(text[-8000:])
|
||||
return 1
|
||||
print(next(line for line in text.splitlines() if "DROPINTERACT_PASS" in line))
|
||||
return 0
|
||||
finally:
|
||||
stop(process)
|
||||
print("Removed temporary test world and isolated fixture outputs. Log:", log)
|
||||
|
||||
if __name__ == "__main__":
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("target", choices=("mc1211", "mc263"))
|
||||
raise SystemExit(run(parser.parse_args().target))
|
||||
@@ -0,0 +1,59 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Check Machine acceleration writing/save/network contracts; real rendering remains player validation."""
|
||||
import argparse
|
||||
import subprocess
|
||||
import tempfile
|
||||
from pathlib import Path
|
||||
from server_test_lock import server_test_lock
|
||||
from smoke_server import stop
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
|
||||
def run(target):
|
||||
log = ROOT / f"build/verification/machine112/{target}.log"
|
||||
log.parent.mkdir(parents=True, exist_ok=True)
|
||||
with server_test_lock(), tempfile.TemporaryDirectory(prefix=f"rivencraft-machine112-{target}-") as directory:
|
||||
work = Path(directory)
|
||||
init = work / "fixture.gradle"
|
||||
init.write_text("""
|
||||
gradle.beforeProject { p ->
|
||||
p.layout.buildDirectory.set(p.file('""" + str(work / "build") + """'))
|
||||
p.afterEvaluate {
|
||||
p.sourceSets.main.java.srcDir(p.file('""" + str(ROOT / "scripts/fixtures/machine112" / target) + """'))
|
||||
}
|
||||
}
|
||||
""")
|
||||
server = work / "server"
|
||||
server.mkdir()
|
||||
(server / "eula.txt").write_text("eula=true\n")
|
||||
(server / "server.properties").write_text(
|
||||
"server-ip=127.0.0.1\nserver-port=0\nonline-mode=false\nwhite-list=false\n"
|
||||
"level-type=minecraft:flat\nlevel-seed=112\nview-distance=2\nsimulation-distance=2\n"
|
||||
'generator-settings={"layers":[{"height":1,"block":"minecraft:bedrock"}],"biome":"minecraft:plains"}\n')
|
||||
process = None
|
||||
try:
|
||||
args = [str(ROOT / "gradlew")]
|
||||
if target == "mc263": args += ["-p", str(ROOT / "ports/mc263")]
|
||||
args += ["--no-daemon", "-I", str(init), "runServer", f"-PserverRunDir={server}", "--console=plain"]
|
||||
with log.open("w") as output:
|
||||
process = subprocess.Popen(args, cwd=ROOT, stdin=subprocess.PIPE, stdout=output,
|
||||
stderr=subprocess.STDOUT, text=True, start_new_session=True)
|
||||
try:
|
||||
process.wait(timeout=60)
|
||||
except subprocess.TimeoutExpired:
|
||||
print("HANDOFF: Machine acceleration probe stalled; stopping without retry. Use docs/ACCELERATED_MACHINES.md.")
|
||||
return 2
|
||||
text = log.read_text()
|
||||
if process.returncode or "MACHINE112_PASS" not in text or "MACHINE112_FAIL" in text:
|
||||
print(text[-8000:])
|
||||
return 1
|
||||
print(next(line for line in text.splitlines() if "MACHINE112_PASS" in line))
|
||||
return 0
|
||||
finally:
|
||||
stop(process)
|
||||
print("Removed temporary test world and isolated fixture outputs. Log:", log)
|
||||
|
||||
if __name__ == "__main__":
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("target", choices=("mc1211", "mc263"))
|
||||
raise SystemExit(run(parser.parse_args().target))
|
||||
Reference in new issue
Block a user