Merge pull request #55 from dima-dencep/1.20.x/dev

3.2.3

.github/workflows/publish.yml

@@ -26,7 +26,10 @@ jobs:
         run: chmod +x gradlew
 
       - name: Upload assets to releases
-        run: ./gradlew build
+        run: ./gradlew build publish
+        env:
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
 
       - name: Get previous tag
         run: echo "previous_tag=$(git rev-parse $(git describe --tags --abbrev=0 --exclude *-dev) 2>/dev/null || echo '')" >> $GITHUB_ENV
@@ -59,7 +62,6 @@ jobs:
 
           files: |
             forge/build/libs/!(*-@(dev|sources|javadoc|shadow)).jar
-            forge/build/libs/*-@(dev|sources|javadoc).jar
 
           name: "[NeoForge ${{ steps.read_property.outputs.minecraft_version }}] v${{ steps.read_property.outputs.mod_version }}"
 
@@ -90,7 +92,6 @@ jobs:
 
           files: |
             fabric/build/libs/!(*-@(dev|sources|javadoc|shadow)).jar
-            fabric/build/libs/*-@(dev|sources|javadoc).jar
 
           name: "[Fabric ${{ steps.read_property.outputs.minecraft_version }}] v${{ steps.read_property.outputs.mod_version }}"
 
@@ -119,9 +120,7 @@ jobs:
 
           files: |
             forge/build/libs/!(*-@(dev|sources|javadoc|shadow)).jar
-            forge/build/libs/*-@(dev|sources|javadoc).jar
             fabric/build/libs/!(*-@(dev|sources|javadoc|shadow)).jar
-            fabric/build/libs/*-@(dev|sources|javadoc).jar
 
           name: "[${{ steps.read_property.outputs.minecraft_version }}] v${{ steps.read_property.outputs.mod_version }}"
 

build.gradle

@@ -49,7 +49,7 @@ allprojects {
     apply plugin: "maven-publish"
 
     archivesBaseName = rootProject.archives_base_name
-    version = "${rootProject.mod_version}+mc${rootProject.minecraft_version}"
+    version = "${rootProject.mod_version}+mc${rootProject.minecraft_version}-${project.name}"
     group = rootProject.maven_group
 
     repositories {
@@ -69,7 +69,14 @@ allprojects {
 
     publishing {
         repositories {
-            // Add repositories to publish to here.
+            maven {
+                name = "ConstructLegacy"
+                url = "https://repo.constructlegacy.ru/public"
+                credentials {
+                    username = System.getenv("MAVEN_USERNAME")
+                    password = System.getenv("MAVEN_PASSWORD")
+                }
+            }
         }
     }
 }

common/src/main/java/com/github/dimadencep/mods/rrls/mixins/SplashOverlayMixin.java

@@ -191,7 +191,8 @@ public abstract class SplashOverlayMixin extends Overlay {
             constant = @Constant(
                     floatValue = 1000.0F,
                     ordinal = 0
-            )
+            ),
+            require = 0
     )
     public float rrls$changeAnimationSpeed(float instance) {
         return Rrls.MOD_CONFIG.animationSpeed;

common/src/main/java/com/github/dimadencep/mods/rrls/mixins/TitleScreenMixin.java

@@ -23,7 +23,8 @@ public class TitleScreenMixin {
             constant = @Constant(
                     floatValue = 1000.0F,
                     ordinal = 0
-            )
+            ),
+            require = 0
     )
     public float rrls$changeAnimationSpeed(float instance) {
         return Rrls.MOD_CONFIG.animationSpeed;

common/src/main/resources/assets/rrls/lang/zh_tw.json

@@ -1,14 +1,16 @@
 {
-  "text.autoconfig.rrls.title": "移除重新載入畫面（Remove Reloading Screen）",
-  "text.autoconfig.rrls.option.hideType": "隱藏重新載入畫面",
+  "text.autoconfig.rrls.title": "移除重新載入畫面｜Remove Reloading Screen",
+  "text.autoconfig.rrls.option.hideType": "將被隱藏的覆蓋層",
   "text.autoconfig.rrls.option.rgbProgress": "彩色進度條",
   "text.autoconfig.rrls.option.rgbProgress.@Tooltip": "§c可能會引起癲癇",
   "text.autoconfig.rrls.option.ignoreScreen": "隱藏載入畫面",
   "text.autoconfig.rrls.option.ignoreScreen.@Tooltip": "可能會引起問題",
   "text.autoconfig.rrls.option.showIn": "資源包重新載入進度顯示",
   "text.autoconfig.rrls.option.type": "在重新載入時會顯示什麼",
-  "text.autoconfig.rrls.option.reloadText": "如果上面選擇了TEXT，將顯示以下文字。",
-  "text.autoconfig.rrls.option.resetResources": "當失敗載入時重設資源",
+  "text.autoconfig.rrls.option.reloadText": "如果上方選擇為 TEXT，將顯示下列文字。",
+  "text.autoconfig.rrls.option.resetResources": "當載入失敗時重設資源",
   "text.autoconfig.rrls.option.reInitScreen": "在重新載入後重新初始化目前畫面。",
-  "text.autoconfig.rrls.option.reInitScreen.@Tooltip": "停用此功能可能會在重新載入完成後解決卡住的問題。"
+  "text.autoconfig.rrls.option.reInitScreen.@Tooltip": "停用此功能可能會在重新載入完成後解決卡住的問題。",
+  "text.autoconfig.rrls.option.animationSpeed": "載入動畫速度",
+  "text.autoconfig.rrls.option.animationSpeed.@Tooltip": "以毫秒為單位"
 }

fabric/build.gradle

@@ -53,7 +53,7 @@ remapJar {
 
     inputFile.set shadowJar.archiveFile
     dependsOn shadowJar
-    archiveClassifier.set project.name
+    archiveClassifier.set null
 }
 
 jar {
@@ -75,7 +75,7 @@ components.java {
 publishing {
     publications {
         mavenFabric(MavenPublication) {
-            artifactId = rootProject.archives_base_name + "-" + project.name
+            artifactId = rootProject.archives_base_name
             from components.java
         }
     }

fabric/src/main/resources/fabric.mod.json

@@ -28,7 +28,6 @@
     "rrls-common.mixins.json"
   ],
   "depends": {
-    "fabric": "*",
     "fabric-api": "*",
     "minecraft": "~1.20",
     "cloth-config": "*"
@@ -44,7 +43,6 @@
       "links": {
         "modmenu.curseforge": "https://curseforge.com/minecraft/mc-mods/rrls",
         "modmenu.discord": "https://discord.gg/jdB5JYX7W7",
-        "modmenu.donate": "https://www.donationalerts.com/c/dima_dencep",
         "modmenu.github_releases": "https://github.com/dima-dencep/rrls/releases",
         "modmenu.modrinth": "https://modrinth.com/mod/rrls"
       }

forge/build.gradle

@@ -48,7 +48,7 @@ remapJar {
 
     inputFile.set shadowJar.archiveFile
     dependsOn shadowJar
-    archiveClassifier.set project.name
+    archiveClassifier.set null
 }
 
 jar {
@@ -70,7 +70,7 @@ components.java {
 publishing {
     publications {
         mavenNeoForge(MavenPublication) {
-            artifactId = rootProject.archives_base_name + "-" + project.name
+            artifactId = rootProject.archives_base_name
             from components.java
         }
     }

forge/src/main/java/com/github/dimadencep/mods/rrls/forge/RrlsForge.java

@@ -14,31 +14,21 @@
 import com.github.dimadencep.mods.rrls.accessor.SplashAccessor;
 import com.github.dimadencep.mods.rrls.config.ModConfig;
 import me.shedaniel.autoconfig.AutoConfig;
+import net.neoforged.fml.ModContainer;
 import net.neoforged.neoforge.client.ConfigScreenHandler;
 import net.neoforged.neoforge.client.event.RenderGuiEvent;
 import net.neoforged.neoforge.client.event.ScreenEvent;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.event.TickEvent;
 import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.fml.IExtensionPoint;
-import net.neoforged.fml.ModLoadingContext;
 import net.neoforged.fml.common.Mod;
-import net.neoforged.neoforge.network.NetworkConstants;
 
 @Mod("rrls")
 public class RrlsForge extends Rrls {
-    public RrlsForge() {
-        ModLoadingContext.get().registerExtensionPoint(
-                IExtensionPoint.DisplayTest.class,
-                () -> new IExtensionPoint.DisplayTest(
-                        () -> NetworkConstants.IGNORESERVERONLY,
-                        (a, b) -> true
-                )
-        );
-
+    public RrlsForge(ModContainer modContainer) {
         NeoForge.EVENT_BUS.register(this);
 
-        ModLoadingContext.get().registerExtensionPoint(
+        modContainer.registerExtensionPoint(
                 ConfigScreenHandler.ConfigScreenFactory.class,
                 () -> new ConfigScreenHandler.ConfigScreenFactory(
                         (mc, screen) -> AutoConfig.getConfigScreen(ModConfig.class, screen).get()

forge/src/main/java/com/github/dimadencep/mods/rrls/forge/mixins/ForgeLoadingOverlayMixin.java

@@ -67,7 +67,8 @@ public ForgeLoadingOverlayMixin(MinecraftClient client, ResourceReload monitor,
             constant = @Constant(
                     floatValue = 1000.0F,
                     ordinal = 0
-            )
+            ),
+            require = 0
     )
     public float rrls$changeAnimationSpeed(float instance) {
         return Rrls.MOD_CONFIG.animationSpeed;

forge/src/main/resources/META-INF/mods.toml

@@ -4,6 +4,7 @@ issueTrackerURL = "https://github.com/dima-dencep/rrls/issues"
 license = "OSL-3.0"
 
 [[mods]]
+displayTest = "IGNORE_SERVER_VERSION"
 modId = "rrls"
 version = "${version}"
 displayURL = "https://curseforge.com/minecraft/mc-mods/rrls"

forge/src/main/resources/rrls.mixins.json

@@ -4,8 +4,7 @@
   "package": "com.github.dimadencep.mods.rrls.forge.mixins",
   "compatibilityLevel": "JAVA_17",
   "client": [
-    "ForgeLoadingOverlayMixin",
-    "compat.UtilsMixin"
+    "ForgeLoadingOverlayMixin"
   ],
   "injectors": {
     "defaultRequire": 1

gradle.properties

@@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx4G
 # Properties
     minecraft_version = 1.20.2
     yarn_mappings = 1.20.2+build.4
-    loader_version = 0.14.24
-    forge_version = 20.2.56-beta
+    loader_version = 0.15.0
+    forge_version = 20.2.83-beta
 
 # Mod Properties
-    mod_version = 3.2.2
+    mod_version = 3.2.3
     maven_group = com.github.dima_dencep.mods
     archives_base_name = rrls
 
 # Dependencies
     modmenu_version = 8.0.0
-    fabric_api_version = 0.90.7+1.20.2
-    cloth_config_version = 12.0.110
+    fabric_api_version = 0.91.1+1.20.2
+    cloth_config_version = 12.0.111

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \