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
@@ -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");
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user