Align pause calendar and server bulletin for beta.164

README.md

@@ -1,5 +1,10 @@
 # Sanctuary
 
+## beta.164 — calendrier et intendance
+
+Date et heure réunies à gauche ; titre serveur aligné sur la carte et les panneaux.
+[Résultat et vérifications](docs/pause-calendar-beta164.md).
+
 ## beta.163 — menu pause encadré
 
 Calendrier, intendance et horloge en en-tête ; deux groupes de navigation,

docs/pause-calendar-beta164.md

@@ -0,0 +1,25 @@
+# beta.164 — calendrier compact et intendance alignée
+
+Calendrier à la largeur de la navigation : jour agrandi et heure sur la première
+ligne, mois et année ensemble dessous. Le titre serveur est aligné à gauche
+et couvre la carte ainsi que les panneaux Gazette/Tableau.
+
+Interface cliente uniquement. Aucun changement de stockage ou de monde.
+
+Vérification client Vulkan réussie : FR/EN aux échelles GUI 2, 3 et 4.
+Le test contrôle la largeur du calendrier, l’heure dans son libellé accessible,
+les limites de l’intendance et les interactions communautaires existantes.
+Captures conservées dans `build/qa-beta164/` et journal dans
+`build/beta164-client-retry.log`. Inspection visuelle FR GUI 4 et EN GUI 2 effectuée.
+Le premier test a détecté que StringWidget redimensionnait le calendrier lors
+du changement de texte ; la largeur de navigation est maintenant réappliquée.
+
+`check build assemblePack --continue` exécuté : les mêmes 23 GameTests qu’en
+beta.163 échouent, aucun nouvel échec (comparaison enregistrée dans
+`build/session164-server-failures.json`). La suite complète reste en échec.
+L’assemblage séparé `build assemblePack :sanctuary-test:exportDuoLaunch
+-x :sanctuary:check` réussit après ce contrôle.
+
+Anciennes archives conservées ; aucune publication distante.
+JAR : `mods/sanctuary/build/libs/sanctuary-beta.164.jar`.
+SHA-256 : `5bdfb097004a7932a075fbce9013556266f76ddd491ca21a24e12609c8600e53`.

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.163
-pack_version=beta.163
+mod_version=beta.164
+pack_version=beta.164
 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

@@ -197,13 +197,16 @@ public final class Community158ClientChecks implements FabricClientGameTest {
                 c.runOnClient(m->{m.options.guiScale().set(scale);m.resizeGui();m.getLanguageManager().setSelected(locale);m.getLanguageManager().onResourceManagerReload(m.getResourceManager());m.gui.setScreen(new PauseScreen(true));});
                 c.waitTicks(20);
                 c.runOnClient(m->{
-                    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 date=widgets(m.gui.screen()).filter(StringWidget.class::isInstance).map(StringWidget.class::cast).filter(w->w.getMessage().getString().contains(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(date.getWidth()==discovery.getWidth(),"Calendar matches navigation width");
+                    check(official.getX()==date.getRight()+10&&official.getRight()==screen.width-8,"Bulletin spans map and community panels");
+                    check(date.getMessage().getString().matches(".*\\d{2}:\\d{2}$"),"Clock included in calendar");
                     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");
@@ -214,10 +217,10 @@ public final class Community158ClientChecks implements FabricClientGameTest {
                     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("pause163-calendar-"+locale+"-"+scale);
+                c.takeScreenshot("pause164-calendar-"+locale+"-"+scale);
             }
             c.runOnClient(m->m.gui.setScreen(null));
-            System.out.println("PAUSE163_LAYOUT_PASS");
+            System.out.println("PAUSE164_LAYOUT_PASS");
             System.out.println("SEARCH159_CLIENT_PASS mode="+(database?"database":"file"));
         } finally {intro.set(false);}
     }

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

@@ -17,14 +17,12 @@ public final class CommunityPausePanels implements AutoCloseable {
     private final Screen screen;
     private final PauseCommunityFeed articles, notices;
     private final Calendar date;
-    private final StringWidget clock;
     private final PauseTextButton bulletin;
     private final PauseAtlasWidget map;
     private int ticks;
     private boolean closed;
     public CommunityPausePanels(Screen screen,Consumer<AbstractWidget> add,List<Button> nativeButtons) {
         this.screen=screen;
-        var font=Minecraft.getInstance().font;
         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;
@@ -33,10 +31,9 @@ public final class CommunityPausePanels implements AutoCloseable {
         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);
-        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));
+        date=new Calendar(margin,3,left);
+        add.accept(date);
+        bulletin=new PauseTextButton(centerX,3,screen.width-margin-centerX,38,text("bulletin"),()->open(screen,"bulletin",items("bulletins").isEmpty()?"":str(items("bulletins").get(0).getAsJsonObject(),"id"),false));
         add.accept(bulletin);
         String[] sections={"blocks","progress","identity"};
         for(int i=0;i<sections.length;i++) {
@@ -71,14 +68,12 @@ public final class CommunityPausePanels implements AutoCloseable {
         var locale=Locale.forLanguageTag(Minecraft.getInstance().getLanguageManager().getSelected().replace('_','-'));
         var now=ZonedDateTime.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");
         Component message=list.isEmpty()?text("bulletin_empty"):Component.literal(str(list.get(0).getAsJsonObject(),"title"));
         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")))));
-        int left=date.getRight()+10,right=clock.getX()-10;
+        int left=date.getRight()+10,right=screen.width-8;
         bulletin.setRectangle(Math.max(24,right-left),38,left,3);
         bulletin.active=available();
     }
@@ -96,19 +91,24 @@ public final class CommunityPausePanels implements AutoCloseable {
         @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);}
+        private String day="",monthYear="",time="";
+        private final int calendarWidth;
+        Calendar(int x,int y,int width){super(x,y,width,38,Component.empty(),Minecraft.getInstance().font);calendarWidth=width;}
         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)));
+            day=DateTimeFormatter.ofPattern("d",locale).format(now);monthYear=DateTimeFormatter.ofPattern("MMMM yyyy",locale).format(now);time=DateTimeFormatter.ofPattern("HH:mm",locale).format(now);
+            setMessage(Component.literal(DateTimeFormatter.ofPattern("d MMMM yyyy HH:mm",locale).format(now)));
+            setWidth(calendarWidth);
         }
         @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);
+            g.pose().pushMatrix();g.pose().translate(x+6,y+4);g.pose().scale(1.8f,1.8f);
+            g.text(font,day,0,0,0xFFF0EEE6,false);g.pose().popMatrix();
+            g.text(font,time,getRight()-6-font.width(time),y+9,0xFFE0DED6,false);
+            // Keep the month and year together even at the smallest GUI width.
+            float scale=Math.min(1f,(width-12f)/Math.max(1,font.width(monthYear)));
+            g.pose().pushMatrix();g.pose().translate(x+6,y+25);g.pose().scale(scale,scale);
+            g.text(font,monthYear,0,0,0xFFE0DED6,false);g.pose().popMatrix();
         }
     }
     public void tick() {

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

@@ -17,7 +17,7 @@ final class PauseTextButton extends AbstractButton {
         var font=Minecraft.getInstance().font;
         if(height>24) {
             var lines=font.split(getMessage(),width-10);int count=Math.min(2,lines.size());
-            for(int i=0;i<count;i++)g.text(font,lines.get(i),getX()+(width-font.width(lines.get(i)))/2,getY()+(height-count*10)/2+i*10,active?0xFFF0EEE6:0xFF969696);
+            for(int i=0;i<count;i++)g.text(font,lines.get(i),getX()+5,getY()+(height-count*10)/2+i*10,active?0xFFF0EEE6:0xFF969696);
             return;
         }
         g.text(font,font.plainSubstrByWidth(getMessage().getString(),width-10),getX()+5,getY()+(height-9)/2,active?0xFFF0EEE6:0xFF969696);

packwiz/pack.toml

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