Merge branch '1.21' of https://github.com/MeAlam1/BlueLib into 1.21

common/src/main/java/software/bluelib/BlueLibConstants.java

@@ -75,14 +75,14 @@ private BlueLibConstants() {
      *
      * @since 1.0.0
      */
-    public static final Boolean isExampleEnabled = false;
+    public static final Boolean isExampleEnabled = true;
 
     /** TODO: Always have on False when pushing to production
      * A {@link Boolean} to enable or disable BlueLib specific logging.
      *
      * @since 1.0.0
      */
-    public static boolean isBlueLibLoggingEnabled = false;
+    public static boolean isBlueLibLoggingEnabled = true;
 
     /**
      * A {@link Boolean} to enable or disable general logging.

common/src/main/java/software/bluelib/entity/variant/VariantParameter.java

@@ -134,8 +134,25 @@ public String getJsonKey() {
      * @author MeAlam
      * @since 1.0.0
      */
-    public String getVariantParameter() {
-        String variantName = getParameter(variantParameterName);
+    public static String getVariantParameter() {
+        String variantName = variantParameterName;
+        BaseLogger.log(BaseLogLevel.INFO, "Retrieved parameter name: " + variantName, true);
+        return variantName;
+    }
+
+    /**
+     * A {@link String} method that retrieves the name of the variant parameter.
+     * <p>
+     * The variant name is, by default, stored under the key {@code "variantName"} in the parameters/JSON files.
+     * Otherwise, the key is stored in the {@link #variantParameterName} field.
+     * </p>
+     *
+     * @return The name of the variant, or {@code null} if the variant name is not found.
+     * @author MeAlam
+     * @since 1.0.0
+     */
+    public String filterVariantParameter() {
+        String variantName = getParameter(variantParameterName); ;
         BaseLogger.log(BaseLogLevel.INFO, "Retrieved parameter name: " + variantName, true);
         return variantName;
     }
@@ -150,7 +167,7 @@ public String getVariantParameter() {
      * @author MeAlam
      * @since 1.0.0
      */
-    public void setVariantParameter(String pCustomVariantName) {
+    public static void setVariantParameter(String pCustomVariantName) {
         variantParameterName = pCustomVariantName;
         BaseLogger.log(BaseLogLevel.INFO, "Setting parameter name: " + variantParameterName, true);
     }

common/src/main/java/software/bluelib/interfaces/variant/base/IVariantEntityBase.java

@@ -58,7 +58,7 @@ default ResourceLocation getTextureLocation(String pModId, String pPath) {
     default List<String> getEntityVariants(String pEntityName) {
         List<VariantParameter> variants = VariantLoader.getVariantsFromEntity(pEntityName);
         List<String> variantNames = variants.stream()
-                .map(VariantParameter::getVariantParameter)
+                .map(VariantParameter::filterVariantParameter)
                 .collect(Collectors.toList());
         BaseLogger.log(BaseLogLevel.SUCCESS, "Retrieved " + variantNames.size() + " variants for entity: " + pEntityName, true);
         return variantNames;

gradle.properties

@@ -23,10 +23,10 @@ minecraft_version_range=[1.21,)
 neo_form_version=1.21.3-20241023.131943
 # The version of ParchmentMC that is used, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions
 parchment_minecraft=1.21
-parchment_version=2024.07.28
+parchment_version=2024.11.10
 
 # Fabric
-fabric_version=0.107.0+1.21.3
+fabric_version=0.108.0+1.21.3
 fabric_loader_version=0.16.9
 
 # Forge
@@ -35,7 +35,7 @@ forge_version_range=[51,)
 forge_loader_version_range=[0,)
 
 # NeoForge
-neoforge_version=21.3.11-beta
+neoforge_version=21.3.28-beta
 neoforge_loader_version_range=[4,)
 neoforge_version_range=[21.0.0-beta,)
 

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
 #
@@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -86,8 +84,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,8 +13,6 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -45,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 
@@ -59,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail