Lot of Recent Works

gradle/libs.versions.toml

@@ -1,11 +1,11 @@
 [versions]
 # The latest versions are available at https://lambdaurora.dev/tools/import_quilt.html
 minecraft = "1.19.2"
-quilt_mappings = "1.19.2+build.21"
-quilt_loader = "0.17.6"
+quilt_mappings = "1.19.2+build.22"
+quilt_loader = "0.19.2"
 
 quilted_fabric_api = "4.0.0-beta.18+0.64.0-1.19.2"
-mmodding_lib = "8706449be8"
+mmodding_lib = "b8aa5ccd05"
 
 [libraries]
 minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
@@ -17,4 +17,4 @@ quilted_fabric_api = { module = "org.quiltmc.quilted-fabric-api:quilted-fabric-a
 mmodding_lib = { module = "com.github.MModding:MModding-Library", version.ref = "mmodding_lib" }
 
 [plugins]
-quilt_loom = { id = "org.quiltmc.loom", version = "1.0+" }
+quilt_loom = { id = "org.quiltmc.loom", version = "1.6+" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/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/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# 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"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+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
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 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=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=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# 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.
+
+# 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, 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" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

src/main/java/com/mmodding/echoes_of_gravity/EchoesOfGravity.java

@@ -1,20 +1,23 @@
 package com.mmodding.echoes_of_gravity;
 
 import com.mmodding.echoes_of_gravity.init.*;
-import com.mmodding.mmodding_lib.library.base.MModdingModContainer;
+import com.mmodding.mmodding_lib.library.base.AdvancedModContainer;
 import com.mmodding.mmodding_lib.library.base.MModdingModInitializer;
 import com.mmodding.mmodding_lib.library.config.Config;
 import com.mmodding.mmodding_lib.library.initializers.ElementsInitializer;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
-import org.quiltmc.loader.api.ModContainer;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class EchoesOfGravity implements MModdingModInitializer {
 
-	public static MModdingModContainer mod;
+	@Nullable
+	@Override
+	public Config getConfig() {
+		return new EchoesOfGravityConfig();
+	}
 
 	@Override
 	public List<ElementsInitializer> getElementsInitializers() {
@@ -27,23 +30,14 @@ public List<ElementsInitializer> getElementsInitializers() {
 		return initializers;
 	}
 
-	@Nullable
-	@Override
-	public Config getConfig() {
-		return new EchoesOfGravityConfig();
-	}
-
 	@Override
-	public void onInitialize(ModContainer mod) {
-		MModdingModInitializer.super.onInitialize(mod);
-		EchoesOfGravity.mod = MModdingModContainer.from(mod);
-	}
+	public void onInitialize(AdvancedModContainer mod) {}
 
 	public static String id() {
 		return "echoes_of_gravity";
 	}
 
-	public static Identifier createId(String identifier) {
-		return new Identifier(EchoesOfGravity.id(), identifier);
+	public static Identifier createId(String path) {
+		return new Identifier(EchoesOfGravity.id(), path);
 	}
 }

src/main/java/com/mmodding/echoes_of_gravity/EchoesOfGravityConfig.java

@@ -2,32 +2,32 @@
 
 import com.mmodding.mmodding_lib.library.config.Config;
 import com.mmodding.mmodding_lib.library.config.ConfigObject;
-import com.mmodding.mmodding_lib.library.config.screen.ConfigScreen;
-import com.mmodding.mmodding_lib.library.config.screen.ConfigScreenOptions;
+import com.mmodding.mmodding_lib.library.config.ConfigOptions;
+import com.mmodding.mmodding_lib.library.utils.TextureLocation;
 import net.minecraft.text.Text;
 
 public class EchoesOfGravityConfig implements Config {
 
 	@Override
-	public String getConfigName() {
-		return "echoes_of_gravity";
+	public String getQualifier() {
+		return "echoes_of_gravity_chapter_one";
 	}
 
 	@Override
-	public String getFileName() {
+	public String getFilePath() {
 		return "echoes_of_gravity/chapter_one/common";
 	}
 
 	@Override
 	public ConfigObject defaultConfig() {
 		return new ConfigObject.Builder()
-				.addIntegerParameter("dragonMonumentXSpawnCoordinate", 100000)
-				.addIntegerParameter("dragonMonumentZSpawnCoordinate", 100000)
-				.build();
+			.addIntegerParameter("dragonMonumentXSpawnCoordinate", 100000)
+			.addIntegerParameter("dragonMonumentZSpawnCoordinate", 100000)
+			.build();
 	}
 
 	@Override
-	public ConfigScreenOptions getConfigOptions() {
-		return new ConfigScreenOptions(Text.of("Echoes of Gravity Common Config"), new ConfigScreen.BlockTextureLocation("emerald_block.png"));
+	public ConfigOptions getConfigOptions() {
+		return new ConfigOptions(Text.of("Echoes of Gravity Common Config"), new TextureLocation.Block("echoes_of_gravity", "magenite"));
 	}
 }

src/main/java/com/mmodding/echoes_of_gravity/client/EchoesOfGravityClient.java

@@ -1,44 +1,41 @@
 package com.mmodding.echoes_of_gravity.client;
 
-import com.mmodding.echoes_of_gravity.client.entities.renderers.OldDragonLightningRenderer;
-import com.mmodding.echoes_of_gravity.client.init.ClientPacketReceivers;
-import com.mmodding.echoes_of_gravity.client.init.SkyRenderers;
+import com.mmodding.echoes_of_gravity.client.init.EOGClientPacketReceivers;
+import com.mmodding.echoes_of_gravity.client.init.EOGEntityRenderers;
+import com.mmodding.echoes_of_gravity.client.init.EOGModelEntityLayers;
+import com.mmodding.echoes_of_gravity.client.init.EOGSkyRenderers;
 import com.mmodding.echoes_of_gravity.init.EOGBlocks;
-import com.mmodding.echoes_of_gravity.init.EOGEntities;
+import com.mmodding.mmodding_lib.library.base.AdvancedModContainer;
 import com.mmodding.mmodding_lib.library.base.MModdingClientModInitializer;
 import com.mmodding.mmodding_lib.library.config.Config;
 import com.mmodding.mmodding_lib.library.initializers.ClientElementsInitializer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry;
 import org.jetbrains.annotations.Nullable;
-import org.quiltmc.loader.api.ModContainer;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @Environment(EnvType.CLIENT)
 public class EchoesOfGravityClient implements MModdingClientModInitializer {
 
-	@Override
-	public List<ClientElementsInitializer> getClientElementsInitializers() {
-		List<ClientElementsInitializer> clientInitializers = new ArrayList<>();
-		clientInitializers.add(new EOGBlocks());
-		clientInitializers.add(new ClientPacketReceivers());
-		clientInitializers.add(new SkyRenderers());
-		return clientInitializers;
-	}
-
 	@Nullable
 	@Override
 	public Config getClientConfig() {
 		return null;
 	}
 
 	@Override
-	public void onInitializeClient(ModContainer modContainer) {
-		MModdingClientModInitializer.super.onInitializeClient(modContainer);
-
-		EntityRendererRegistry.register(EOGEntities.OLD_DRAGON_LIGHTNING, OldDragonLightningRenderer::new);
+	public List<ClientElementsInitializer> getClientElementsInitializers() {
+		List<ClientElementsInitializer> clientInitializers = new ArrayList<>();
+		clientInitializers.add(new EOGBlocks());
+		clientInitializers.add(new EOGClientPacketReceivers());
+		clientInitializers.add(new EOGModelEntityLayers());
+		clientInitializers.add(new EOGEntityRenderers());
+		clientInitializers.add(new EOGSkyRenderers());
+		return clientInitializers;
 	}
+
+	@Override
+	public void onInitializeClient(AdvancedModContainer mod) {}
 }

src/main/java/com/mmodding/echoes_of_gravity/client/EchoesOfGravityClientConfig.java

@@ -2,28 +2,27 @@
 
 import com.mmodding.mmodding_lib.library.config.Config;
 import com.mmodding.mmodding_lib.library.config.ConfigObject;
-import com.mmodding.mmodding_lib.library.config.screen.ConfigScreenOptions;
+import com.mmodding.mmodding_lib.library.config.ConfigOptions;
 
 public class EchoesOfGravityClientConfig implements Config {
 
 	@Override
-	public String getConfigName() {
-		return "echoes_of_gravity_client";
+	public String getQualifier() {
+		return "echoes_of_gravity_chapter_one_client";
 	}
 
 	@Override
-	public String getFileName() {
+	public String getFilePath() {
 		return "echoes_of_gravity/chapter_one/client";
 	}
 
 	@Override
 	public ConfigObject defaultConfig() {
-		return new ConfigObject.Builder()
-				.build();
+		return new ConfigObject.Builder().build();
 	}
 
 	@Override
-	public ConfigScreenOptions getConfigOptions() {
+	public ConfigOptions getConfigOptions() {
 		return null;
 	}
 }