Reshape pause navigation and frame for beta.163

README.md

@@ -1,5 +1,11 @@
 # Sanctuary
 
+## beta.163 — menu pause encadré
+
+Calendrier, intendance et horloge en en-tête ; deux groupes de navigation,
+séparateurs natifs et reprise centrée dans le footer.
+[Résultat et vérifications](docs/pause-frame-beta163.md).
+
 ## beta.162 — tableau en scène et conversation
 
 Portrait de l’auteur tourné vers la souris, bulle aux couleurs de l’annonce,

docs/pause-frame-beta163.md

@@ -0,0 +1,27 @@
+# beta.163 — cadre du menu pause
+
+Retour de séance : Découverte/Progression séparés de Habitant/Factions/Combat,
+bouton Monde retiré, séparateurs natifs de Progression, reprise centrée dans le
+footer, calendrier à gauche, message serveur au centre et horloge à droite.
+
+Interface cliente uniquement, sans migration ni modification de règles ou de
+mondes. « Options du monde » reste dans les réglages en bas à gauche ; seul le
+raccourci de navigation Monde disparaît. La carte centrale reste disponible.
+
+Vérifications :
+- Test client natif Vulkan réussi : FR/EN aux échelles GUI 2, 3 et 4,
+  calendrier, séparation des groupes, limites des widgets et reprise centrée.
+  Captures dans `build/qa-beta163/` ; journal `build/beta163-client-retry.log`.
+- Le scénario communautaire vérifie aussi la scène du tableau et les échanges.
+  Une première exécution a expiré pendant une publication ; le test respecte
+  désormais le délai serveur entre deux écritures.
+- `check build assemblePack --continue` : 23 échecs GameTest, ensemble identique
+  à beta.162, aucun nouvel échec. Les autres tâches ont terminé ; la suite
+  complète reste donc en échec. Comparaison dans `build/session163-server-failures.json`.
+- Assemblage réussi avec `build assemblePack :sanctuary-test:exportDuoLaunch
+  -x :sanctuary:check`, après la vérification complète.
+
+JAR local : `mods/sanctuary/build/libs/sanctuary-beta.163.jar`.
+SHA-256 : `72df10885d1bcb3b623c46bddf361839c23f06dfd543119f91ac5e006a8f961e`.
+Aucune publication distante ; anciens JAR conservés.
+

gradle.properties

@@ -9,8 +9,8 @@ loom_version=1.17.20
 fabric_api_version=0.160.5+26.3
 
 # Release counter: beta.001, .002, .003, ... (see docs/versioning.md).
-mod_version=beta.162
-pack_version=beta.162
+mod_version=beta.163
+pack_version=beta.163
 resource_pack_version=beta.121
 maven_group=fr.koka.sanctuary
 jei_version=30.32.0-sanctuary.3

mods/sanctuary/src/clientGametest/java/fr/koka/sanctuary/client/Community158ClientChecks.java

@@ -184,6 +184,7 @@ public final class Community158ClientChecks implements FabricClientGameTest {
             c.runOnClient(m->{widgets(m.gui.screen()).filter(AbstractButton.class::isInstance).map(AbstractButton.class::cast).filter(b->b.getMessage().getString().startsWith("Allow Commands")).findFirst().orElseThrow().onPress(enter());widgets(m.gui.screen()).filter(AbstractButton.class::isInstance).map(AbstractButton.class::cast).filter(b->b.getMessage().getString().equals("Apply Changes")).findFirst().orElseThrow().onPress(enter());});
             c.waitFor(m->ProgressionClient.operator,150);c.runOnClient(m->{m.gui.setScreen(null);m.getConnection().sendCommand("sanctuary community admin");});
             c.waitFor(m->m.gui.screen() instanceof CommunityScreen&&has(m.gui.screen(),"sanctuary.community.publish")&&!CommunityClient.pending(),200);
+            c.waitTicks(25); // Respect the server write cooldown after the preceding unfollow.
             c.runOnClient(m->{press(m.gui.screen(),"sanctuary.community.publish");edit(m.gui.screen()).setValue("Message officiel");body(m.gui.screen()).setValue("Bienvenue !");press(m.gui.screen(),"sanctuary.community.publish");});
             c.waitFor(m->has(m.gui.screen(),"sanctuary.community.back")&&!CommunityClient.pending(),250);
             c.runOnClient(m->{check(!has(m.gui.screen(),"sanctuary.community.follow")&&!has(m.gui.screen(),"sanctuary.community.reply"),"Administrative bulletin has no quest or replies");CommunityClient.open(null,"bulletin","",false);});
@@ -199,10 +200,24 @@ public final class Community158ClientChecks implements FabricClientGameTest {
                     var date=widgets(m.gui.screen()).filter(StringWidget.class::isInstance).map(StringWidget.class::cast).filter(w->w.getMessage().getString().endsWith(java.time.Year.now().toString())).findFirst().orElseThrow();
                     var official=widgets(m.gui.screen()).filter(PauseTextButton.class::isInstance).map(PauseTextButton.class::cast).filter(w->w.getMessage().getString().contains("Message officiel")).findFirst().orElseThrow();
                     check(date.getRight()<official.getX(),"Full date and server message do not overlap");
+                    var screen=m.gui.screen();
+                    check(date.getX()==8&&date.getHeight()==38&&date.getY()==3,"Calendar framed at top left");
+                    check(!has(screen,"sanctuary.progression.history"),"World navigation removed");
+                    var discovery=pauseButton(screen,"sanctuary.progression.blocks");var progression=pauseButton(screen,"sanctuary.progression.progress");var inhabitant=pauseButton(screen,"sanctuary.progression.identity");
+                    check(inhabitant.getY()-progression.getBottom()>progression.getY()-discovery.getBottom(),"Personal and social navigation groups separated");
+                    var navigation=screen.children().stream().filter(Button.class::isInstance).map(Button.class::cast).filter(b->b.getX()==8&&b.getY()>=50&&b.getY()<pauseButton(screen,"menu.options").getY()).toList();
+                    check(navigation.size()==5,"Five navigation destinations");
+                    check(navigation.stream().allMatch(b->b.getBottom()<pauseButton(screen,"menu.options").getY()),"Navigation clears settings");
+                    var resume=pauseButton(screen,"menu.returnToGame");
+                    check(Math.abs(resume.getX()+resume.getWidth()/2-screen.width/2)<=1&&resume.getY()>screen.height-33,"Resume centered in footer");
+                    check(pauseButton(screen,"options.worldOptions.button").getBottom()<screen.height-39,"World settings remain in body");
+                    for(var child:screen.children())if(child instanceof AbstractWidget w)check(w.getX()>=0&&w.getRight()<=screen.width&&w.getY()>=0&&w.getBottom()<=screen.height,"Pause widget within viewport");
+
                 });
-                c.takeScreenshot("search159-pause-year-"+locale+"-"+scale);
+                c.takeScreenshot("pause163-calendar-"+locale+"-"+scale);
             }
             c.runOnClient(m->m.gui.setScreen(null));
+            System.out.println("PAUSE163_LAYOUT_PASS");
             System.out.println("SEARCH159_CLIENT_PASS mode="+(database?"database":"file"));
         } finally {intro.set(false);}
     }
@@ -235,5 +250,6 @@ public final class Community158ClientChecks implements FabricClientGameTest {
         var w=m.getWindow();double sx=(double)w.getScreenWidth()/w.getGuiScaledWidth(),sy=(double)w.getScreenHeight()/w.getGuiScaledHeight();
         m.mouseHandler.onMove(w.handle(),x*sx,y*sy,(x-m.mouseHandler.getScaledXPos(w))*sx,(y-m.mouseHandler.getScaledYPos(w))*sy);m.mouseHandler.handleAccumulatedMovement();
     }
+    private static Button pauseButton(Screen screen,String key) {return screen.children().stream().filter(Button.class::isInstance).map(Button.class::cast).filter(b->b.getMessage().getContents() instanceof net.minecraft.network.chat.contents.TranslatableContents t&&t.getKey().equals(key)).findFirst().orElseThrow();}
     private static AbstractButton button(Screen screen,String key) {return widgets(screen).filter(AbstractButton.class::isInstance).map(AbstractButton.class::cast).filter(b->b.getMessage().getContents() instanceof net.minecraft.network.chat.contents.TranslatableContents t&&t.getKey().equals("sanctuary.community."+key)).findFirst().orElseThrow();}
 }

mods/sanctuary/src/clientGametest/java/fr/koka/sanctuary/client/Pause155ClientChecks.java

@@ -54,14 +54,14 @@ public final class Pause155ClientChecks implements FabricClientGameTest {
                 c.runOnClient(m->{
                     var s=m.gui.screen();
                     check(s instanceof PauseAtlasAccess,"Pause atlas access");
-                    for(String key:List.of("sanctuary.progression.blocks","sanctuary.progression.history","sanctuary.progression.progress","sanctuary.progression.identity","menu.options","options.worldOptions.button","menu.returnToMenu","menu.returnToGame"))check(has(s,key),"Destination "+key);
-                    var navigation=s.children().stream().filter(Button.class::isInstance).map(Button.class::cast).filter(b->b.getX()==8&&b.getY()>=40&&b.getY()<s.height-76).sorted(java.util.Comparator.comparingInt(Button::getY)).toList();
-                    check(navigation.size()==6,"Six real navigation buttons");
-                    for(int i=1;i<navigation.size();i++)check(navigation.get(i).getY()-navigation.get(i-1).getBottom()==4,"Uniform 4-pixel navigation spacing");
+                    for(String key:List.of("sanctuary.progression.blocks","sanctuary.progression.progress","sanctuary.progression.identity","menu.options","options.worldOptions.button","menu.returnToMenu","menu.returnToGame"))check(has(s,key),"Destination "+key);
+                    var navigation=s.children().stream().filter(Button.class::isInstance).map(Button.class::cast).filter(b->b.getX()==8&&b.getY()>=50&&b.getY()<nativeButton(s,"menu.options").getY()).sorted(java.util.Comparator.comparingInt(Button::getY)).toList();
+                    check(navigation.size()==5&&!has(s,"sanctuary.progression.history"),"Five real navigation buttons without World");
+                    for(int i=1;i<navigation.size();i++)check(navigation.get(i).getY()-navigation.get(i-1).getBottom()>=(i==2?8:3),"Two spaced navigation groups");
                     var options=nativeButton(s,"menu.options");var worldOptions=nativeButton(s,"options.worldOptions.button");var quit=nativeButton(s,"menu.returnToMenu");var resume=nativeButton(s,"menu.returnToGame");
-                    check(options.getX()==8 && worldOptions.getX()==8 && quit.getX()==8 && worldOptions.getY()-options.getBottom()==4 && quit.getY()-worldOptions.getBottom()==4 && quit.getBottom()==s.height-8,"Options and quit stacked at bottom left");
+                    check(options.getX()==8 && worldOptions.getX()==8 && quit.getX()==8 && worldOptions.getY()-options.getBottom()==4 && quit.getY()-worldOptions.getBottom()==4 && quit.getBottom()==s.height-39,"Options and quit stacked at bottom left");
                     var feed=areas(s).getFirst();
-                    check(resume.getX()==feed.getX() && resume.getWidth()==feed.getWidth() && resume.getBottom()==s.height-8 && areas(s).getLast().getBottom()<resume.getY(),"Resume aligned below right community column");
+                    check(Math.abs(resume.getX()+resume.getWidth()/2-s.width/2)<=1 && resume.getY()>s.height-33 && areas(s).getLast().getBottom()<resume.getY(),"Resume centered in native footer");
                     for(var e:s.children())if(e instanceof Button b && b.getX()==8 && b.getY()<options.getY())check(b.getBottom()<options.getY(),"Navigation does not overlap options");
                     check(!has(s,"gui.advancements") && !has(s,"gui.stats") && !has(s,"menu.game"),"Old grid removed");
                     for(var e:s.children())if(e instanceof AbstractWidget w)check(w.getX()>=0&&w.getRight()<=s.width&&w.getY()>=0&&w.getBottom()<=s.height,"Widget bounds "+w.getClass().getSimpleName()+" "+w.getX()+","+w.getY()+" "+w.getWidth()+"x"+w.getHeight()+" / "+s.width+"x"+s.height);

mods/sanctuary/src/main/java/fr/koka/sanctuary/client/CommunityPausePanels.java

@@ -16,7 +16,8 @@ import static fr.koka.sanctuary.client.CommunityClient.*;
 public final class CommunityPausePanels implements AutoCloseable {
     private final Screen screen;
     private final PauseCommunityFeed articles, notices;
-    private final StringWidget date, clock;
+    private final Calendar date;
+    private final StringWidget clock;
     private final PauseTextButton bulletin;
     private final PauseAtlasWidget map;
     private int ticks;
@@ -24,47 +25,52 @@ public final class CommunityPausePanels implements AutoCloseable {
     public CommunityPausePanels(Screen screen,Consumer<AbstractWidget> add,List<Button> nativeButtons) {
         this.screen=screen;
         var font=Minecraft.getInstance().font;
-        int margin=8,gap=10,top=40,bottom=screen.height-38;
+        int margin=8,gap=10,top=50,bottom=screen.height-39;
         int left=Math.min(132,Math.max(76,screen.width/5)),right=Math.min(244,Math.max(104,screen.width*31/100));
         int centerX=margin+left+gap,rightX=screen.width-margin-right,centerWidth=rightX-gap-centerX;
-        date=new StringWidget(margin,8,left,20,Component.empty(),font);
-        clock=new StringWidget(rightX,8,right,20,Component.empty(),font);
+        int optionHeight=screen.height<280?16:20,navGap=screen.height<280?3:4,groupGap=screen.height<280?8:12;
+        int optionsTop=bottom-(3*optionHeight+8);
+        int navHeight=Math.min(20,Math.max(11,(optionsTop-top-8-4*navGap-groupGap)/5));
+        int step=navHeight+navGap;
+        add.accept(new Frame(screen.width,screen.height,left,top+2*step+(groupGap-navGap)/2));
+        date=new Calendar(margin,3,Math.min(82,screen.width/4));
+        clock=new StringWidget(screen.width-52,12,44,20,Component.empty(),font);
         add.accept(date);add.accept(clock);
-        int headerSide=Math.max(84,screen.width/5);
-        bulletin=new PauseTextButton(headerSide,3,screen.width-2*headerSide,32,text("bulletin"),()->open(screen,"bulletin",items("bulletins").isEmpty()?"":str(items("bulletins").get(0).getAsJsonObject(),"id"),false));
+        bulletin=new PauseTextButton(date.getRight()+10,3,Math.max(24,screen.width-date.getRight()-76),38,text("bulletin"),()->open(screen,"bulletin",items("bulletins").isEmpty()?"":str(items("bulletins").get(0).getAsJsonObject(),"id"),false));
         add.accept(bulletin);
-        String[] sections={"blocks","history","progress","identity"};
-        int optionsTop=screen.height-76;
-        int navHeight=Math.min(20,Math.max(16,(optionsTop-top-28)/6));
-        int step=navHeight+4;
+        String[] sections={"blocks","progress","identity"};
         for(int i=0;i<sections.length;i++) {
-            String target=sections[i];
+            String target=sections[i];int y=top+i*step+(i>=2?groupGap:0);
             add.accept(Button.builder(fr.koka.sanctuary.progression.ProgressionService.label(target),b->ProgressionClient.open(screen,target))
-                    .bounds(margin,top+i*step,left,navHeight).build());
+                    .bounds(margin,y,left,navHeight).build());
         }
-        add.accept(Button.builder(fr.koka.sanctuary.cycle.CycleService.label("faction"),b->CycleClient.open(screen,"faction")).bounds(margin,top+4*step,left,navHeight).build());
-        add.accept(Button.builder(fr.koka.sanctuary.arena.Arenas.text("title"),b->ArenaClient.open(screen)).bounds(margin,top+5*step,left,navHeight).build());
+        add.accept(Button.builder(fr.koka.sanctuary.cycle.CycleService.label("faction"),b->CycleClient.open(screen,"faction")).bounds(margin,top+3*step+groupGap,left,navHeight).build());
+        add.accept(Button.builder(fr.koka.sanctuary.arena.Arenas.text("title"),b->ArenaClient.open(screen)).bounds(margin,top+4*step+groupGap,left,navHeight).build());
         map=new PauseAtlasWidget(screen,centerX,top,centerWidth,Math.max(30,bottom-top));add.accept(map);
-        place(nativeButtons,add,"menu.returnToGame",rightX,screen.height-28,right);
+        int resumeWidth=Math.min(200,screen.width-24);
+        place(nativeButtons,add,"menu.returnToGame",(screen.width-resumeWidth)/2,screen.height-26,resumeWidth);
         int feedHeight=(bottom-top-gap)/2;
         articles=new PauseCommunityFeed(screen,add,rightX,top,right,feedHeight,"article");
         notices=new PauseCommunityFeed(screen,add,rightX,top+feedHeight+gap,right,bottom-top-feedHeight-gap,"notice");
-        place(nativeButtons,add,"menu.options",margin,optionsTop,left);
-        place(nativeButtons,add,"options.worldOptions.button",margin,optionsTop+24,left);
+        place(nativeButtons,add,"menu.options",margin,optionsTop,left,optionHeight);
+        place(nativeButtons,add,"options.worldOptions.button",margin,optionsTop+optionHeight+4,left,optionHeight);
         for(var button:nativeButtons) if(key(button).equals("menu.returnToMenu") || key(button).equals("menu.disconnect")) {
-            button.setRectangle(left,20,margin,optionsTop+48);button.setTooltip(Tooltip.create(button.getMessage()));add.accept(button);
+            button.setRectangle(left,optionHeight,margin,optionsTop+2*(optionHeight+4));button.setTooltip(Tooltip.create(button.getMessage()));add.accept(button);
         }
         updateHeader();
     }
     public static String key(Button button) { return button.getMessage().getContents() instanceof TranslatableContents t?t.getKey():""; }
     private static void place(List<Button> buttons,Consumer<AbstractWidget> add,String key,int x,int y,int width) {
-        buttons.stream().filter(b->key(b).equals(key)).findFirst().ifPresent(b->{b.setRectangle(width,20,x,y);b.setTooltip(Tooltip.create(b.getMessage()));add.accept(b);});
+        place(buttons,add,key,x,y,width,20);
+    }
+    private static void place(List<Button> buttons,Consumer<AbstractWidget> add,String key,int x,int y,int width,int height) {
+        buttons.stream().filter(b->key(b).equals(key)).findFirst().ifPresent(b->{b.setRectangle(width,height,x,y);b.setTooltip(Tooltip.create(b.getMessage()));add.accept(b);});
     }
     private static JsonArray items(String key) { return overview.has(key)?overview.getAsJsonArray(key):new JsonArray(); }
     private void updateHeader() {
         var locale=Locale.forLanguageTag(Minecraft.getInstance().getLanguageManager().getSelected().replace('_','-'));
         var now=ZonedDateTime.now();
-        date.setMessage(Component.literal(DateTimeFormatter.ofPattern("d MMMM yyyy",locale).format(now)));
+        date.update(now,locale);
         clock.setMessage(Component.literal(DateTimeFormatter.ofPattern("HH:mm",locale).format(now)));
         clock.setX(screen.width-8-Minecraft.getInstance().font.width(clock.getMessage()));clock.setWidth(Minecraft.getInstance().font.width(clock.getMessage()));
         var list=items("bulletins");
@@ -72,11 +78,39 @@ public final class CommunityPausePanels implements AutoCloseable {
         if(!overviewError.isEmpty())message=text(overviewError);
         bulletin.setMessage(message);
         bulletin.setTooltip(Tooltip.create(text("bulletin").append("\n").append(list.isEmpty()?message:Component.literal(str(list.get(0).getAsJsonObject(),"body")))));
-        date.setWidth(Minecraft.getInstance().font.width(date.getMessage()));
-        int left=Math.max(date.getRight()+8,screen.width/5),right=screen.width-Math.max(56,screen.width/5);
-        bulletin.setRectangle(Math.max(24,right-left),32,left,3);
+        int left=date.getRight()+10,right=clock.getX()-10;
+        bulletin.setRectangle(Math.max(24,right-left),38,left,3);
         bulletin.active=available();
     }
+    /** Shares Progression's native header/footer separator textures. */
+    private static final class Frame extends AbstractWidget {
+        private final int left,groupY;
+        Frame(int width,int height,int left,int groupY){super(0,0,width,height,Component.empty());this.left=left;this.groupY=groupY;active=false;}
+        @Override public void extractWidgetRenderState(net.minecraft.client.gui.GuiGraphicsExtractor g,int mx,int my,float delta) {
+            var texture=Minecraft.getInstance().level==null?Screen.HEADER_SEPARATOR:Screen.INWORLD_HEADER_SEPARATOR;
+            g.blit(net.minecraft.client.renderer.RenderPipelines.GUI_TEXTURED,texture,0,44,0,0,width,2,32,2);
+            texture=Minecraft.getInstance().level==null?Screen.FOOTER_SEPARATOR:Screen.INWORLD_FOOTER_SEPARATOR;
+            g.blit(net.minecraft.client.renderer.RenderPipelines.GUI_TEXTURED,texture,0,height-33,0,0,width,2,32,2);
+            g.fill(12,groupY,left+4,groupY+1,0x665F6869);
+        }
+        @Override protected void updateWidgetNarration(net.minecraft.client.gui.narration.NarrationElementOutput out) { }
+    }
+    private static final class Calendar extends StringWidget {
+        private String day="",month="",year="";
+        Calendar(int x,int y,int width){super(x,y,width,38,Component.empty(),Minecraft.getInstance().font);}
+        void update(ZonedDateTime now,Locale locale){
+            day=DateTimeFormatter.ofPattern("d",locale).format(now);month=DateTimeFormatter.ofPattern("MMMM",locale).format(now);year=DateTimeFormatter.ofPattern("yyyy",locale).format(now);
+            setMessage(Component.literal(DateTimeFormatter.ofPattern("d MMMM yyyy",locale).format(now)));
+        }
+        @Override public void extractWidgetRenderState(net.minecraft.client.gui.GuiGraphicsExtractor g,int mx,int my,float delta) {
+            var font=Minecraft.getInstance().font;int x=getX(),y=getY();
+            g.fill(x,y,getRight(),getBottom(),0xA0202529);g.outline(x,y,width,height,0xFF66716E);
+            g.pose().pushMatrix();g.pose().translate(x+width/2f,y+3);g.pose().scale(1.4f,1.4f);
+            g.text(font,day,-font.width(day)/2,0,0xFFF0EEE6,false);g.pose().popMatrix();
+            g.centeredText(font,month,x+width/2,y+18,0xFFE0DED6);
+            g.centeredText(font,year,x+width/2,y+28,0xFF9FAAA4);
+        }
+    }
     public void tick() {
         if(closed)return;
         map.tick(); updateHeader();

packwiz/pack.toml

@@ -1,6 +1,6 @@
 name = "Sanctuary"
 author = "KOKA99CAB"
-version = "beta.162"
+version = "beta.163"
 pack-format = "packwiz:1.1.0"
 
 [index]