diff --git a/atlas/root/distribution.json b/atlas/root/distribution.json index 85a057d..cdf4df3 100644 --- a/atlas/root/distribution.json +++ b/atlas/root/distribution.json @@ -402,13 +402,13 @@ } }, { - "id": "fr.surviepote:nosingleplayer:1.1.1@jar", + "id": "fr.surviepote:nosingleplayer:1.1.2@jar", "name": "NoSingleplayer (SurviePote)", "type": "FabricMod", "artifact": { - "size": 2292688, - "url": "https://git.kisakay.com/k/mc/raw/branch/main/atlas/root/servers/SurviePote-26.3/fabricmods/required/nosingleplayer-1.1.1.jar", - "MD5": "8778f7015b2c2dd2655c0b4d5c8e8b00" + "size": 2292471, + "url": "https://git.kisakay.com/k/mc/raw/branch/main/atlas/root/servers/SurviePote-26.3/fabricmods/required/nosingleplayer-1.1.2.jar", + "MD5": "2ba50ec99adb670cdb34fe41b0e3d7dd" } }, { diff --git a/atlas/root/servers/SurviePote-26.3/fabricmods/required/nosingleplayer-1.1.1.jar b/atlas/root/servers/SurviePote-26.3/fabricmods/required/nosingleplayer-1.1.2.jar similarity index 99% rename from atlas/root/servers/SurviePote-26.3/fabricmods/required/nosingleplayer-1.1.1.jar rename to atlas/root/servers/SurviePote-26.3/fabricmods/required/nosingleplayer-1.1.2.jar index b7f0c43..f3a2068 100644 Binary files a/atlas/root/servers/SurviePote-26.3/fabricmods/required/nosingleplayer-1.1.1.jar and b/atlas/root/servers/SurviePote-26.3/fabricmods/required/nosingleplayer-1.1.2.jar differ diff --git a/mods/nosingleplayer/gradle.properties b/mods/nosingleplayer/gradle.properties index bba488e..e7c3c26 100644 --- a/mods/nosingleplayer/gradle.properties +++ b/mods/nosingleplayer/gradle.properties @@ -5,7 +5,7 @@ loader_version=0.20.0 loom_version=1.19.1 # Mod Properties -mod_version=1.1.1 +mod_version=1.1.2 maven_group=fr.surviepote archives_base_name=nosingleplayer diff --git a/mods/nosingleplayer/src/main/java/fr/surviepote/nosingleplayer/mixin/TitleScreenRenderMixin.java b/mods/nosingleplayer/src/main/java/fr/surviepote/nosingleplayer/mixin/TitleScreenRenderMixin.java index 04f4e74..edaf3a0 100644 --- a/mods/nosingleplayer/src/main/java/fr/surviepote/nosingleplayer/mixin/TitleScreenRenderMixin.java +++ b/mods/nosingleplayer/src/main/java/fr/surviepote/nosingleplayer/mixin/TitleScreenRenderMixin.java @@ -10,9 +10,7 @@ import net.minecraft.resources.Identifier; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(TitleScreen.class) public abstract class TitleScreenRenderMixin { @@ -27,19 +25,13 @@ public abstract class TitleScreenRenderMixin { @Unique private static final int BACKGROUND_TEX_H = 2400; - // Pas de panorama dynamique : fond statique. - @Inject(method = "extractPanorama", at = @At("HEAD"), cancellable = true) - private void surviepote$skipPanorama(GuiGraphicsExtractor extractor, float partialTick, CallbackInfo ci) { - ci.cancel(); - } - - // Fond plein écran dessiné à la place du panorama (avant widgets/logo/textes). - @Inject(method = "extractRenderState", + // Pas de panorama dynamique : fond statique custom à la place. + // Note : extractPanorama est déclarée dans Screen (héritée), on redirige donc + // l'APPEL dans TitleScreen plutôt que la méthode elle-même. + @Redirect(method = "extractRenderState", at = @At(value = "INVOKE", - target = "Lnet/minecraft/client/gui/screens/TitleScreen;extractPanorama(Lnet/minecraft/client/gui/GuiGraphicsExtractor;F)V", - shift = At.Shift.AFTER)) - private void surviepote$drawBackground(GuiGraphicsExtractor extractor, int mouseX, int mouseY, float partialTick, - CallbackInfo ci) { + target = "Lnet/minecraft/client/gui/screens/TitleScreen;extractPanorama(Lnet/minecraft/client/gui/GuiGraphicsExtractor;F)V")) + private void surviepote$customBackground(TitleScreen self, GuiGraphicsExtractor extractor, float partialTick) { int w = Minecraft.getInstance().getWindow().getGuiScaledWidth(); int h = Minecraft.getInstance().getWindow().getGuiScaledHeight(); extractor.blit(RenderPipelines.GUI_TEXTURED, SURVIEPOTE_BACKGROUND, 0, 0, 0.0F, 0.0F, diff --git a/sync-mods.sh b/sync-mods.sh index 76ed845..7aa6595 100755 --- a/sync-mods.sh +++ b/sync-mods.sh @@ -54,10 +54,10 @@ cp -u "$HOME/.local/share/PrismLauncher/instances/26.3/minecraft/resourcepacks/F cp -u "$HOME/.local/share/PrismLauncher/instances/26.3/minecraft/shaderpacks/Revelation-dev.zip" "atlas/root/servers/SurviePote-26.3/files/shaderpacks/" 2>/dev/null || true echo "== mod maison nosingleplayer (build si besoin) ==" -if [ ! -f mods/nosingleplayer/build/libs/nosingleplayer-1.1.1.jar ]; then +if [ ! -f mods/nosingleplayer/build/libs/nosingleplayer-1.1.2.jar ]; then (cd mods/nosingleplayer && ./gradlew build 2>&1 | tail -n 2) || echo "BUILD nosingleplayer échoué (réseau/gradle requis)" fi -cp -u mods/nosingleplayer/build/libs/nosingleplayer-1.1.1.jar "$ATLAS_MODS/" 2>/dev/null || true +cp -u mods/nosingleplayer/build/libs/nosingleplayer-1.1.2.jar "$ATLAS_MODS/" 2>/dev/null || true # Note : environment=client (menu titre), inutile côté serveur. echo "== regen distribution.json =="