Added a new footer

ZiYueCommentary · Aug 5, 2024 · dc54395 · dc54395
1 parent eff1565
commit dc54395
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id "java"
+    id "de.undercouch.download" version "4.1.2"
     id "io.github.pacifistmc.forgix" version "1.+"
 }
 
@@ -77,3 +78,21 @@ subprojects {
     build.finalizedBy(mergeJars)
     assemble.finalizedBy(mergeJars)
 }
+
+afterEvaluate {
+    download {
+        src "https://weblate.ziyuesinicization.site/api/components/tianjin-metro/en_us-json/file/"
+        dest "lang.zip"
+        overwrite true
+        retries - 1
+    }
+    copy {
+        from(zipTree("lang.zip"))
+        into "temp_lang"
+    }
+    copy {
+        from "temp_lang/tianjin-metro/en_us-json/fabric/src/main/resources/assets/tjmetro/lang"
+        into "fabric/src/main/resources/assets/tjmetro/lang"
+    }
+    delete("lang.zip", "temp_lang")
+}
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -44,4 +44,4 @@ java {
         languageVersion.set(JavaLanguageVersion.of(buildTools.javaLanguageVersion))
     }
     withSourcesJar()
-}
+}
diff --git a/fabric/src/main/java/ziyue/tjmetro/fabric/mixin/FallingBlockMixin.java b/fabric/src/main/java/ziyue/tjmetro/fabric/mixin/FallingBlockMixin.java
@@ -20,7 +20,7 @@ public FallingBlockMixin(Settings settings) {
     }
 
     @Inject(at = @At("HEAD"), method = "scheduledTick", cancellable = true)
-#if MC_VERSION < "11904"
+#if MC_VERSION <= "11802"
     private void beforeScheduledTick(BlockState state, ServerWorld world, BlockPos pos, java.util.Random random, CallbackInfo ci)
 #else
     private void beforeScheduledTick(BlockState state, ServerWorld world, BlockPos pos, net.minecraft.util.math.random.Random random, CallbackInfo ci)

diff --git a/fabric/src/main/java/ziyue/tjmetro/mod/Reference.java b/fabric/src/main/java/ziyue/tjmetro/mod/Reference.java
@@ -17,4 +17,5 @@ public interface Reference
     String FORUM = "https://forum.ziyuesinicization.site/t/tianjin-metro";
     String WEBLATE = "https://weblate.ziyuesinicization.site/engage/tianjin-metro/";
     String DISCORD = "https://discord.gg/mEvEjPnVXe";
+    String PREVENT_BLOCK_FALLING = "https://github.com/ZiYueCommentary/Tianjin-Metro/wiki/Prevent-block-falling";
 }
diff --git a/fabric/src/main/java/ziyue/tjmetro/mod/config/ConfigClient.java b/fabric/src/main/java/ziyue/tjmetro/mod/config/ConfigClient.java
@@ -34,7 +34,8 @@ public class ConfigClient
             new Footer(() -> TextHelper.translatable("footer.tjmetro.forum"), Reference.FORUM),
             new Footer(() -> TextHelper.translatable("footer.tjmetro.contributors"), Reference.CONTRIBUTORS),
             new Footer(() -> TextHelper.translatable("footer.tjmetro.weblate"), Reference.WEBLATE),
-            new Footer(() -> TextHelper.translatable("footer.tjmetro.discord"), Reference.DISCORD)
+            new Footer(() -> TextHelper.translatable("footer.tjmetro.discord"), Reference.DISCORD),
+            new Footer(() -> TextHelper.translatable("footer.tjmetro.prevent_block_falling"), Reference.PREVENT_BLOCK_FALLING)
     );
 
     /**

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -46,6 +46,8 @@ java {
 }
 
 tasks.register("setupFiles") {
+    println("Copying resources from Fabric to Forge")
+
     delete fileTree("src/main/java/ziyue/tjmetro/mod")
     delete fileTree("src/main/resources/assets")
     delete fileTree("src/main/resources/data")
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,4 +44,4 @@ java { @@
             languageVersion.set(JavaLanguageVersion.of(buildTools.javaLanguageVersion))
         }
         withSourcesJar()
-    }
+    }