1.2.5

Updated Crowdin Languages Updated Checkstyle Updated Indra Updated dependencies Fix #79 (DistExecutor#safeRunWhenOn) Add regions file viewer #76 Signed-off-by: TreyRuffy <TreyRuffy@users.noreply.github.com>
cominixo · May 20, 2022 · 6abdc02 · 6abdc02
1 parent 895133b
commit 6abdc02
Show file tree

Hide file tree

Showing 58 changed files with 3,217 additions and 3,017 deletions.
diff --git a/.checkstyle/checkstyle.xml b/.checkstyle/checkstyle.xml
@@ -37,7 +37,7 @@
         <!-- https://checkstyle.org/config_javadoc.html#AtclauseOrder -->
         <module name="AtclauseOrder">
             <property name="violateExecutionOnNonTightHtml" value="true"/>
-            <property name="tagOrder" value="@author, @deprecated, @exception, @param, @return, @serial, @serialData, @serialField, @throws, @see, @since, @sinceMinecraft, @version"/>
+            <property name="tagOrder" value="@author, @exception, @param, @return, @serial, @serialData, @serialField, @throws, @see, @since, @sinceMinecraft, @version, @deprecated"/>
         </module>
 
         <!-- https://checkstyle.org/config_imports.html#AvoidStarImport -->
@@ -108,12 +108,12 @@
 
         <!-- https://checkstyle.org/config_misc.html#Indentation -->
         <module name="Indentation">
-            <property name="arrayInitIndent" value="4"/>
-            <property name="basicOffset" value="4"/>
+            <property name="arrayInitIndent" value="2"/>
+            <property name="basicOffset" value="2"/>
             <property name="braceAdjustment" value="0"/>
-            <property name="caseIndent" value="4"/>
+            <property name="caseIndent" value="2"/>
             <property name="lineWrappingIndentation" value="0"/>
-            <property name="throwsIndent" value="4"/>
+            <property name="throwsIndent" value="2"/>
         </module>
 
         <!-- https://checkstyle.org/config_javadoc.html#InvalidJavadocPosition -->
@@ -122,6 +122,9 @@
         <!-- https://checkstyle.org/config_javadoc.html#JavadocContentLocation -->
         <module name="JavadocContentLocation"/>
 
+        <!-- https://checkstyle.org/config_javadoc.html#JavadocMethod -->
+        <module name="JavadocMethod" />
+
         <!-- https://checkstyle.org/config_javadoc.html#JavadocMissingWhitespaceAfterAsterisk -->
         <module name="JavadocMissingWhitespaceAfterAsterisk"/>
 
@@ -131,6 +134,11 @@
         <!-- https://checkstyle.org/config_javadoc.html#JavadocMissingWhitespaceAfterAsterisk -->
         <module name="JavadocTagContinuationIndentation"/>
 
+        <!-- https://checkstyle.org/config_javadoc.html#JavadocType -->
+        <module name="JavadocType">
+            <property name="allowUnknownTags" value="true" /> <!-- @sinceMinecraft is not supported -->
+        </module>
+
         <!-- https://checkstyle.org/config_blocks.html#LeftCurly -->
         <module name="LeftCurly"/>
 
@@ -240,9 +248,6 @@
         <!-- https://checkstyle.org/config_whitespace.html#TypecastParenPad -->
         <module name="TypecastParenPad"/>
 
-        <!-- https://checkstyle.org/config_coding.html#UnnecessaryParentheses -->
-        <module name="UnnecessaryParentheses"/>
-
         <!-- https://checkstyle.org/config_imports.html#UnusedImports -->
         <module name="UnusedImports"/>
 
@@ -273,4 +278,4 @@
           <property name="tokens" value="INTERFACE_DEF, CLASS_DEF, ENUM_DEF, ANNOTATION_DEF, RECORD_DEF, METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF, RECORD_DEF, COMPACT_CTOR_DEF"/>
         </module>-->
     </module>
-</module>
+</module>
diff --git a/build.gradle b/build.gradle
@@ -2,9 +2,9 @@ plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT" // Uses Architectury plugin https://github.com/architectury/architectury-plugin
     id "dev.architectury.loom" version "0.11.0-SNAPSHOT" apply false // Uses Architectury Loom
     // (fork of Fabric Loom) https://github.com/architectury/architectury-loom - does not apply to root project
-    id "net.kyori.indra" version "2.0.6" // Uses Indra plugin
-    id "net.kyori.indra.git" version "2.0.6" // Uses Indra Git plugin
-    id "net.kyori.indra.checkstyle" version "2.0.6" // Uses Indra Checkstyle plugin
+    id "net.kyori.indra" version "2.1.1" // Uses Indra plugin
+    id "net.kyori.indra.git" version "2.1.1" // Uses Indra Git plugin
+    id "net.kyori.indra.checkstyle" version "2.1.1" // Uses Indra Checkstyle plugin
 }
 
 architectury {
@@ -37,7 +37,8 @@ allprojects {
     version = rootProject.mod_version // sets the version from gradle.properties
     group = rootProject.maven_group // sets the maven group from gradle.properties
     indra {
-        checkstyle("8.41.1")
+        mitLicense()
+        checkstyle()
         javaVersions {
             target(17) // 1.18 now uses Java 17
             testWith(17)

diff --git a/common/build.gradle b/common/build.gradle
@@ -29,9 +29,9 @@ loom {
 
 architectury {
     if (rootProject.forge_enabled.toBoolean()) {
-        common()
+        common("fabric","forge")
     } else {
-        common(false)
+        common("fabric")
     }
 }
 

diff --git a/common/src/main/java/me/cominixo/betterf3/config/GeneralOptions.java b/common/src/main/java/me/cominixo/betterf3/config/GeneralOptions.java
@@ -5,36 +5,36 @@
  */
 public final class GeneralOptions {
 
-    private GeneralOptions() {
-        // Do nothing
-    }
+  private GeneralOptions() {
+    // Do nothing
+  }
 
-    /**
-     * Disables the mod.
-     */
-    public static boolean disableMod = false;
-    /**
-     * Places a space between every module.
-     */
-    public static boolean spaceEveryModule = false;
-    /**
-     * Places a shadow behind the text.
-     */
-    public static boolean shadowText = true;
-    /**
-     * Enables the sliding animation.
-     */
-    public static boolean enableAnimations = true;
-    /**
-     * The sliding animation speed.
-     */
-    public static double animationSpeed = 1;
-    /**
-     * Sets the font scale.
-     */
-    public static double fontScale = 1;
-    /**
-     * Sets the background color.
-     */
-    public static int backgroundColor = 0x6F505050;
+  /**
+   * Disables the mod.
+   */
+  public static boolean disableMod = false;
+  /**
+   * Places a space between every module.
+   */
+  public static boolean spaceEveryModule = false;
+  /**
+   * Places a shadow behind the text.
+   */
+  public static boolean shadowText = true;
+  /**
+   * Enables the sliding animation.
+   */
+  public static boolean enableAnimations = true;
+  /**
+   * The sliding animation speed.
+   */
+  public static double animationSpeed = 1;
+  /**
+   * Sets the font scale.
+   */
+  public static double fontScale = 1;
+  /**
+   * Sets the background color.
+   */
+  public static int backgroundColor = 0x6F505050;
 }