Merge pull request #72 from sakura-ryoko/multiversion

1.20.5 support

.gitignore

@@ -27,3 +27,4 @@ bin/
 # fabric
 
 run/
+/libs/

build.gradle

@@ -1,6 +1,6 @@
 plugins {
 	id 'com.replaymod.preprocess' version '6989e16efc'
-	id 'fabric-loom' version '1.0-SNAPSHOT' apply false
+	id 'fabric-loom' version '1.6-SNAPSHOT' apply false
 }
 
 preprocess {
@@ -14,12 +14,14 @@ preprocess {
     def mc1201 = createNode('1.20.1', 1_20_01, 'yarn')
     def mc1202 = createNode('1.20.2', 1_20_02, 'yarn')
     def mc1204 = createNode('1.20.4', 1_20_04, 'yarn')
+	def mc1205 = createNode('1.20.5', 1_20_05, 'yarn')
 
 	// mapping difference map
 	// base 1194 -> 1193 -> 1192 ->1190-> 118 -> 117 -> 116
     mc1202.link(mc1201, file('versions/mapping-1.20.2-1.20.1.txt'))
     mc1201.link(mc1194, file('versions/mapping-1.20.1-1.19.4.txt'))
     mc1204.link(mc1202, file('versions/mapping-1.20.4-1.20.2.txt'))
+	mc1205.link(mc1204, file('versions/mapping-1.20.5-1.20.4.txt'))
 	//mc1194.link(mc1193, file('versions/mapping-1.19.4-1.19.3.txt'))
 	//mc1193.link(mc1192, file('versions/mapping-1.19.3-1.19.2.txt'))
 	//mc1192.link(mc1190, file('versions/mapping-1.19.2-1.19.0.txt'))

common.gradle

@@ -1,6 +1,6 @@
 // common.gradle is a file that called separately by each module.
 plugins {
-    id 'fabric-loom' version '1.0-SNAPSHOT'
+    id 'fabric-loom' version '1.6-SNAPSHOT'
     id 'com.replaymod.preprocess' version '6989e16efc'
 }
 
@@ -11,7 +11,11 @@ preprocess {
     tabIndentation = true
 }
 
-if (mcVersion >= 11800) {
+if (mcVersion > 12004) {
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
+}
+else if (mcVersion >= 11800) {
 	sourceCompatibility = JavaVersion.VERSION_17
 	targetCompatibility = JavaVersion.VERSION_17
 }
@@ -36,9 +40,7 @@ repositories {
     maven { url "https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1" }
     maven { url 'https://masa.dy.fi/maven' }
     maven { url = "https://www.cursemaven.com" }
-	maven {
-		url "https://maven.terraformersmc.com/releases/"
-	}
+	maven { url "https://maven.terraformersmc.com/releases/" }
 	maven {
 		url "https://jitpack.io"
 	}
@@ -63,6 +65,7 @@ dependencies {
     }
     else {
         modImplementation "curse.maven:malilib-${project.malilib_projectid}:${project.malilib_fileid}"
+        //modImplementation "fi.dy.masa.malilib:malilib-fabric-${project.minecraft_version_out}:${project.malilib_version}"
     }
     // check project.litematica_projectid and project.litematica_fileid in gradle.properties.
 	// modImplementation "curse.maven:litematica-${project.litematica_projectid}:${project.litematica_fileid}"
@@ -72,6 +75,7 @@ dependencies {
     }
     else {
         modImplementation "curse.maven:litematica-${project.litematica_projectid}:${project.litematica_fileid}"
+        //modImplementation "fi.dy.masa.litematica:litematica-fabric-${project.minecraft_version_out}:${project.litematica_version}"
     }
 	annotationProcessor "com.github.LlamaLad7:MixinExtras:0.1.1"
 }
@@ -95,8 +99,10 @@ tasks.withType(JavaCompile).configureEach {
 	// If Javadoc is generated, this must be specified in that task too.
 	it.options.encoding = "UTF-8"
 
-	// Minecraft 1.17 (21w19a) upwards uses Java 16.
-    if (mcVersion >= 11800) {
+    if (mcVersion > 12004) {
+        it.options.release = 21
+    }
+    else if (mcVersion >= 11800) {
         it.options.release = 17
     }
     else if (mcVersion >= 11700) {

gradle.properties

@@ -2,9 +2,9 @@ org.gradle.jvmargs=-Xmx6G
 # This is base gradle.properties file for all projects in the workspace. 
 # This must not contain specific configuration for any project, such as minecraft version, etc.
 # Fabric Properties
-    loader_version=0.14.7
+    loader_version=0.15.9
 
 # Mod Properties
-    mod_version = 7.1.0
+    mod_version = 7.2.0-beta.1
     maven_group = aria1th.extensions
     archives_base_name = litematica-printer

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
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-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,13 +41,13 @@ 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.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
 
 goto fail
 
@@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-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.
+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
 
 goto fail
 
@@ -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

settings.gradle

@@ -34,7 +34,8 @@ def versions = Arrays.asList(
         "1.19.4",
         "1.20.1",
         "1.20.2",
-        "1.20.4"
+        "1.20.4",
+		"1.20.5"
 )
 
 for (String version : versions) {

src/main/resources/fabric.mod.json

@@ -26,15 +26,14 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.15.1",
+    "fabricloader": ">=0.15.9",
     "fabric": "*",
     "minecraft": "${minecraft_dependency}",
     "litematica": "*"
   },
   "custom": {
     "modmenu": {
-      "parent": "litematica"
+      "parent": "malilib"
     }
   }
 }
-

versions/1.20.4/gradle.properties

@@ -1,8 +1,8 @@
 # Fabric Properties
     # check these on https://fabricmc.net/use
     minecraft_version=1.20.4
-    yarn_mappings=1.20.4+build.1
-    fabricapi_version=0.91.2+1.20.4
+    yarn_mappings=1.20.4+build.3
+    fabricapi_version=0.96.11+1.20.4
     minecraft_version_out =1.20.4
 
 # Mod Properties

versions/1.20.5/gradle.properties

@@ -0,0 +1,16 @@
+# Fabric Properties
+    # check these on https://fabricmc.net/use
+    minecraft_version=1.20.5-pre1
+    yarn_mappings=1.20.5-pre1+build.5
+    fabricapi_version=0.96.15+1.20.5
+    minecraft_version_out = 1.20.5-beta.1
+
+# Mod Properties
+    #malilib_projectid=303119
+    #malilib_fileid=4946328
+    #litematica_fileid=4946471
+    #litematica_projectid=308892
+    essentialclient_filename=essential-client-1.20.1-1.3.6.jar
+    malilib_filename=malilib-fabric-1.20.5-pre1-0.19.0-beta.1.jar
+    litematica_filename=litematica-fabric-1.20.5-pre1-0.18.0-beta.1.jar
+    mod_menu_filename=modmenu-v10.0.0-alpha.3+1.20.5.c36bdf3.jar

versions/1.20.5/src/main/java/io/github/eatmyvenom/litematicin/mixin/Litematica/ChunkRendererSchematicVboMixin.java

@@ -0,0 +1,42 @@
+package io.github.eatmyvenom.litematicin.mixin.Litematica;
+
+import fi.dy.masa.litematica.render.schematic.BufferBuilderCache;
+import fi.dy.masa.litematica.render.schematic.ChunkCacheSchematic;
+import fi.dy.masa.litematica.render.schematic.ChunkRenderDataSchematic;
+import fi.dy.masa.litematica.render.schematic.ChunkRendererSchematicVbo;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.item.Item;
+import net.minecraft.util.math.BlockPos;
+import org.joml.Matrix4f;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.Set;
+
+import static io.github.eatmyvenom.litematicin.LitematicaMixinMod.RENDER_ONLY_HOLDING_ITEMS;
+import static io.github.eatmyvenom.litematicin.utils.InventoryUtils.ITEMS;
+
+@Mixin(value = ChunkRendererSchematicVbo.class, priority = 1200)
+public class ChunkRendererSchematicVboMixin
+{
+
+	@Shadow
+	protected ChunkCacheSchematic schematicWorldView;
+
+	@Inject(method = "renderBlocksAndOverlay", at = @At("HEAD"), cancellable = true, remap = false)
+	private void onRenderBlocksAndOverlay(BlockPos pos, ChunkRenderDataSchematic data, Set<BlockEntity> tileEntities, Set<RenderLayer> usedLayers, Matrix4f matrix4f, BufferBuilderCache buffers, CallbackInfo ci) {
+		if (!RENDER_ONLY_HOLDING_ITEMS.getBooleanValue()) return;
+		BlockState stateSchematic = this.schematicWorldView.getBlockState(pos);
+		Item item = stateSchematic.getBlock().asItem();
+		if (!ITEMS.contains(item)) {
+			ci.cancel();
+		}
+	}
+
+}