Update for 1.21.11 (1.3.1)

Author: oxydien

TODO

@@ -18,6 +18,7 @@ COMMON
  - [x] Modifications
  - [x] Auto sync
  - [ ] Minecraft version and loader check
+ - [ ] Auto SMS update
  - UI
    - [x] Update list of contents when schema parsed
    - [x] Content type icon

build.gradle

@@ -1,4 +1,4 @@
 plugins {
-    id 'fabric-loom' version '1.10-SNAPSHOT' apply false
-    id 'net.neoforged.moddev' version '2.0.62-beta' apply false
+    id 'fabric-loom' version "${fabric_loom}" apply false
+    id 'net.neoforged.moddev' version "${neogradle_version}" apply false
 }

common/src/main/java/dev/oxydien/simpleModSync/ui/ProgressHelper.java

@@ -7,26 +7,27 @@
 import dev.oxydien.simpleModSync.content.handler.ContentHandler;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.renderer.RenderPipelines;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
+import net.minecraft.resources.Identifier;
 
 import java.util.Iterator;
 
 public class ProgressHelper {
-    private static final ResourceLocation LOADING_ICON = ResourceLocation.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/loading.png");
-    private static final ResourceLocation FINISHED_ICON = ResourceLocation.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/finished.png");
-    private static final ResourceLocation PARSING_ICON = ResourceLocation.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/parsing.png");
-    private static final ResourceLocation UNSYNCED_ICON = ResourceLocation.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/unsynced.png");
-    private static final ResourceLocation ERROR_ICON = ResourceLocation.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/error.png");
-    private static final ResourceLocation MODIFIED_ICON = ResourceLocation.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/modified.png");
-    private static final ResourceLocation PREPARING_ICON = ResourceLocation.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/preparing.png");
-    private static final ResourceLocation DOWNLOADING_ICON = ResourceLocation.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/downloading.png");
-
-    private static final ResourceLocation MOD_ICON = ResourceLocation.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/mod.png");
-    private static final ResourceLocation RESOURCEPACK_ICON = ResourceLocation.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/resourcepack.png");
-    private static final ResourceLocation SHADER_ICON = ResourceLocation.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/shader.png");
-    private static final ResourceLocation DATAPACK_ICON = ResourceLocation.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/datapack.png");
-    private static final ResourceLocation PACKED_ICON = ResourceLocation.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/packed.png");
-    private static final ResourceLocation UNKNOWN_ICON = ResourceLocation.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/unknown.png");
+    private static final Identifier LOADING_ICON = Identifier.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/loading.png");
+    private static final Identifier FINISHED_ICON = Identifier.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/finished.png");
+    private static final Identifier PARSING_ICON = Identifier.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/parsing.png");
+    private static final Identifier UNSYNCED_ICON = Identifier.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/unsynced.png");
+    private static final Identifier ERROR_ICON = Identifier.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/error.png");
+    private static final Identifier MODIFIED_ICON = Identifier.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/modified.png");
+    private static final Identifier PREPARING_ICON = Identifier.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/preparing.png");
+    private static final Identifier DOWNLOADING_ICON = Identifier.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/downloading.png");
+
+    private static final Identifier MOD_ICON = Identifier.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/mod.png");
+    private static final Identifier RESOURCEPACK_ICON = Identifier.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/resourcepack.png");
+    private static final Identifier SHADER_ICON = Identifier.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/shader.png");
+    private static final Identifier DATAPACK_ICON = Identifier.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/datapack.png");
+    private static final Identifier PACKED_ICON = Identifier.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/packed.png");
+    private static final Identifier UNKNOWN_ICON = Identifier.tryBuild(SimpleModSync.MOD_ID, "ui/textures/icons/unknown.png");
 
     private final SimpleModSync plugin;
     private int frameCall = 0;
@@ -91,7 +92,7 @@ public void drawLoadingIcon(GuiGraphics guiGraphics, int x, int y) {
         guiGraphics.blit(RenderPipelines.GUI_TEXTURED, LOADING_ICON, x, y, 0, 16 * frameOffset, 16, 16, 16, 128);
     }
 
-    private ResourceLocation getStateIcon(SyncStatus syncStatus) {
+    private Identifier getStateIcon(SyncStatus syncStatus) {
         return switch (syncStatus.getState()) {
             case UNSYNCED -> UNSYNCED_ICON;
             case FINISHED -> FINISHED_ICON;
@@ -103,7 +104,7 @@ private ResourceLocation getStateIcon(SyncStatus syncStatus) {
         };
     }
 
-    private ResourceLocation getContentTypeIcon(ContentType type) {
+    private Identifier getContentTypeIcon(ContentType type) {
         return switch (type) {
             case ContentType.Mod -> MOD_ICON;
             case ResourcePack -> RESOURCEPACK_ICON;

common/src/main/java/dev/oxydien/simpleModSync/ui/screens/ContentSyncScreen.java

@@ -19,8 +19,10 @@
 import net.minecraft.client.gui.narration.NarratableEntry;
 import net.minecraft.client.gui.narration.NarrationElementOutput;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.Mth;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -61,10 +63,9 @@ protected void init() {
                 (buttonWidget) -> Minecraft.getInstance().setScreen(this.parent)).pos(3, 5).size(60, 20).build());
 
         // Title
-        Component titleText = Component.translatable("simple_mod_sync.ui.content_screen.title");
+        Component titleText = Component.translatable("simple_mod_sync.ui.content_screen.title").withColor(0xFF3DF6B4);
         this.addRenderableOnly(
-                new MultiLineTextWidget(this.width / 2 - titleText.getString().length() - 30, 10, titleText, this.font)
-                        .setColor(0xFF3DF6B4));
+                new MultiLineTextWidget(this.width / 2 - titleText.getString().length() - 30, 10, titleText, this.font));
 
         // Url field
         EditBox urlField = new EditBox(this.font, this.width / 2 - 150, 24,
@@ -275,26 +276,26 @@ public boolean mouseScrolled(double mouseX, double mouseY, double scrollX, doubl
         }
 
         @Override
-        public boolean mouseDragged(double mouseX, double mouseY, int button, double dragX, double dragY) {
+        public boolean mouseDragged(@NotNull MouseButtonEvent event, double mouseX, double mouseY) {
             if (this.scrolling) {
-                this.scrollAmount = Mth.clamp(this.scrollAmount - dragY, 0, this.getMaxScroll());
+                this.scrollAmount = Mth.clamp(this.scrollAmount - event.x(), 0, this.getMaxScroll());
                 return true;
             }
-            return super.mouseDragged(mouseX, mouseY, button, dragX, dragY);
+            return super.mouseDragged(event, mouseX, mouseY);
         }
 
         @Override
-        public boolean mouseClicked(double mouseX, double mouseY, int button) {
-            this.scrolling = button == 0 && this.isMouseOverScrollbar(mouseX, mouseY);
-            return super.mouseClicked(mouseX, mouseY, button);
+        public boolean mouseClicked(@NotNull MouseButtonEvent event, boolean isDoubleClick) {
+            this.scrolling = event.button() == 0 && this.isMouseOverScrollbar(event.x(), event.y());
+            return super.mouseClicked(event, isDoubleClick);
         }
 
         @Override
-        public boolean mouseReleased(double mouseX, double mouseY, int button) {
-            if (button == 0) {
+        public boolean mouseReleased(@NotNull MouseButtonEvent event) {
+            if (event.button() == 0) {
                 this.scrolling = false;
             }
-            return super.mouseReleased(mouseX, mouseY, button);
+            return super.mouseReleased(event);
         }
 
         @Override

common/src/main/java/dev/oxydien/simpleModSync/ui/screens/InitScreen.java

@@ -36,40 +36,35 @@ protected void init() {
         int currentY = contentStartY;
 
         // Title widget
-        this.addRenderableWidget(new StringWidget(centerX - CONTENT_WIDTH / 2, currentY,
-                CONTENT_WIDTH, 20, this.title, this.font).alignCenter());
+        this.addRenderableWidget(new StringWidget(this.getCenteredXFor(this.title), currentY,
+                CONTENT_WIDTH, 20, this.title, this.font));
         currentY += 20 + SPACING;
 
         // Sub-header widget
-        Component subHeader = Component.translatable("simple_mod_sync.ui.init_screen.sub_header");
-        StringWidget subHeaderWidget = new StringWidget(centerX - CONTENT_WIDTH / 2, currentY,
+        Component subHeader = Component.translatable("simple_mod_sync.ui.init_screen.sub_header").withColor(0xAAAAAA);
+        StringWidget subHeaderWidget = new StringWidget(this.getCenteredXFor(subHeader), currentY,
                 CONTENT_WIDTH, 10, subHeader, this.font);
-        subHeaderWidget.alignCenter();
-        subHeaderWidget.setColor(0xAAAAAA);
         this.addRenderableWidget(subHeaderWidget);
         currentY += 10 + SPACING;
 
         // Disclaimer line 1
-        StringWidget disclaimer1 = new StringWidget(centerX - CONTENT_WIDTH / 2, currentY,
-                CONTENT_WIDTH, 10, Component.literal("By entering a URL below, you acknowledge that you are"), this.font);
-        disclaimer1.alignCenter();
-        disclaimer1.setColor(0xAAAAAA);
+        Component dis1 = Component.literal("By entering a URL below, you acknowledge that you are").withColor(0xAAAAAA);
+        StringWidget disclaimer1 = new StringWidget(this.getCenteredXFor(dis1), currentY,
+                CONTENT_WIDTH, 10, dis1, this.font);
         this.addRenderableWidget(disclaimer1);
         currentY += 10;
 
         // Disclaimer line 2
-        StringWidget disclaimer2 = new StringWidget(centerX - CONTENT_WIDTH / 2, currentY,
-                CONTENT_WIDTH, 10, Component.literal("responsible for any content synced from that source."), this.font);
-        disclaimer2.alignCenter();
-        disclaimer2.setColor(0xAAAAAA);
+        Component dis2 = Component.literal("responsible for any content synced from that source.").withColor(0xAAAAAA);
+        StringWidget disclaimer2 = new StringWidget(this.getCenteredXFor(dis2), currentY,
+                CONTENT_WIDTH, 10, dis2, this.font);
         this.addRenderableWidget(disclaimer2);
         currentY += 10;
 
         // Disclaimer line 3
-        StringWidget disclaimer3 = new StringWidget(centerX - CONTENT_WIDTH / 2, currentY,
-                CONTENT_WIDTH, 10, Component.literal("Use trusted sources only."), this.font);
-        disclaimer3.alignCenter();
-        disclaimer3.setColor(0xAAAAAA);
+        Component dis3 = Component.literal("Use trusted sources only.").withColor(0xAAAAAA);
+        StringWidget disclaimer3 = new StringWidget(this.getCenteredXFor(dis3), currentY,
+                CONTENT_WIDTH, 10, dis3, this.font);
         this.addRenderableWidget(disclaimer3);
         currentY += 10 + SPACING * 2;
 
@@ -153,6 +148,12 @@ private void onSave() {
         this.minecraft.setScreen(new TitleScreen());
     }
 
+    private int getCenteredXFor(Component component) {
+        int centerX = this.width / 2;
+        int textWidth = this.font.width(component.getString());
+        return centerX - CONTENT_WIDTH / 2 + (CONTENT_WIDTH - textWidth) / 2;
+    }
+
     @Override
     public void onClose() {
         this.minecraft.setScreen(new TitleScreen());

common/src/main/java/dev/oxydien/simpleModSync/ui/widgets/ContentProgressWidget.java

@@ -65,6 +65,7 @@ private void updateTooltip() {
         builder.append(this.getModName());
         builder.append(": ");
         if (this.status != null) {
+            builder.append("\n");
             builder.append(SyncStatus.TranslatedState(this.status.getState()));
         }
         this.setTooltip(Tooltip.create(builder));

common/src/main/java/dev/oxydien/simpleModSync/ui/widgets/TotalSyncProgress.java

@@ -1,6 +1,5 @@
 package dev.oxydien.simpleModSync.ui.widgets;
 
-import dev.oxydien.simpleModSync.log.Log;
 import dev.oxydien.simpleModSync.ui.ProgressHelper;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.AbstractWidget;

common/src/main/java/dev/oxydien/simpleModSync/ui/widgets/TotalSyncStatus.java

@@ -11,9 +11,10 @@
 import net.minecraft.client.gui.components.Tooltip;
 import net.minecraft.client.gui.narration.NarratedElementType;
 import net.minecraft.client.gui.narration.NarrationElementOutput;
+import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.NotNull;
 
 import java.time.Duration;
@@ -28,7 +29,7 @@ public final class TotalSyncStatus extends AbstractWidget {
     private SyncWorker syncWorker;
     private boolean isFocused;
 
-    private static final ResourceLocation BACKGROUND = ResourceLocation.withDefaultNamespace("widget/button_disabled");
+    private static final Identifier BACKGROUND = Identifier.withDefaultNamespace("widget/button_disabled");
 
     public TotalSyncStatus(int x, int y, SyncWorker syncWorker,
                            ProgressHelper progressHelper) {
@@ -67,8 +68,8 @@ public void renderWidget(@NotNull GuiGraphics guiGraphics, int mouseX, int mouse
     }
 
     @Override
-    public void onClick(double mouseX, double mouseY) {
-        super.onClick(mouseX, mouseY);
+    public void onClick(@NotNull MouseButtonEvent event, boolean isDoubleClick) {
+        super.onClick(event, isDoubleClick);
         Minecraft.getInstance().setScreen(new ContentSyncScreen(Component.translatable("simple_mod_sync.ui.sync_full_view.title"), null));
     }
 

gradle.properties

@@ -3,25 +3,27 @@ group=dev.oxydien.simpleModSync
 java_version=21
 
 # Common
-minecraft_version=1.21.6
+minecraft_version=1.21.11
 mod_name=SimpleModSync
 mod_author=oxydien
 mod_id=simplemodsync
 license=MIT
 credits=oxydien
 description=A simple way to share and sync mods, resource packs, shaders, and other Minecraft content with your friends or community.
-minecraft_version_range=[1.21.6, 1.22)
-neo_form_version=1.21.6-20250617.151856
-parchment_minecraft=1.21.6
-parchment_version=2025.06.29
+minecraft_version_range=[1.21.11, 1.22)
+neo_form_version=1.21.11-20251209.172050
+parchment_minecraft=1.21.11
+parchment_version=2025.12.20
 
 # Fabric
-fabric_version=0.128.2+1.21.6
-fabric_loader_version=0.16.10
+fabric_version=0.141.3+1.21.11
+fabric_loader_version=0.18.4
+fabric_loom=1.15-SNAPSHOT
 
 # NeoForge
-neoforge_version=21.6.20-beta
+neoforge_version=21.11.38-beta
 neoforge_loader_version_range=[4,)
+neogradle_version=2.0.140
 
 # Gradle
 org.gradle.jvmargs=-Xmx3G

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME