Merge commit 'cb3b99fc3d86baa1bdd4ed2dd64348cf81e57191' into 1.21.11-experimental

Author: mms0316

README.md

@@ -3,7 +3,7 @@
 Litematica
 ==============
 Litematica is a client-side Minecraft mod using Fabric.
-It is more or less a re-creation of or a substitute for [Schematica](https://minecraft.curseforge.com/projects/schematica),
+It is more or less a re-creation of or a substitute for [Schematica](https://www.curseforge.com/minecraft/mc-mods/schematica),
 for players who don't want to have Forge installed.
 For compiled builds (= downloads), see https://github.com/mms0316/litematica/releases/
 

build.gradle

@@ -1,18 +1,26 @@
 plugins {
-	id 'fabric-loom' version '1.11-SNAPSHOT'
+	id 'fabric-loom' version '1.14-SNAPSHOT'
 	id 'maven-publish'
 }
 
 repositories {
-	maven { url = 'https://masa.dy.fi/maven' }
-	maven { url = 'https://maven.fallenbreath.me/releases' }
-	maven { url = 'https://maven.terraformersmc.com/releases/' }
+	maven {url = "https://masa.dy.fi/maven/sakura-ryoko"
+		content {includeGroupAndSubgroups("fi.dy.masa")}
+	}
+	maven {url = 'https://maven.fallenbreath.me/releases'
+		content {includeGroupAndSubgroups("me.fallenbreath")}
+	}
+	maven {url = 'https://maven.terraformersmc.com/releases/'
+		content { includeGroupAndSubgroups("com.terraformersmc")}
+	}
 	maven { url = 'https://jitpack.io' }
+//	maven { url = 'https://api.modrinth.com/maven' }
 }
 
 dependencies {
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.mappings_version}:v2"
+//	mappings "net.fabricmc:yarn:${project.mappings_version}:v2"
+    mappings loom.officialMojangMappings()
 	modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
 	implementation "com.google.code.findbugs:jsr305:3.0.2"
 
@@ -23,6 +31,8 @@ dependencies {
 	//modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
 
 	modCompileOnly "com.terraformersmc:modmenu:${project.mod_menu_version}"
+//	modCompileOnly "maven.modrinth:iris:${project.iris_version}+${project.iris_mc_version}-fabric"
+//	modCompileOnly "net.irisshaders:iris-fabric-1.8.12-snapshot+mc1.21.5-local"
 //	modRuntimeOnly 'me.fallenbreath:mixin-auditor:0.1.0'
 }
 
@@ -37,6 +47,8 @@ base {
 }
 
 loom {
+    accessWidenerPath = file("src/main/resources/litematica.accesswidener")
+
 //	def commonVmArgs = ['-Dmixin.debug.export=true', '-Dmixin.debug.countInjections=true']
 //	// [FEATURE] MIXIN_AUDITOR
 //	runs {

gradle.properties

@@ -9,16 +9,16 @@ author = masa
 mod_file_name = litematica-fabric
 
 # Current mod version
-mod_version = 0.23.4+mms.55
+mod_version = 0.25.4+mms.55
 
 # Required malilib version
-malilib_version = 1.21.8-0.25.5
+malilib_version = 1.21.11-0.27.3
 
 # Minecraft, Fabric Loader and API and mappings versions
-minecraft_version_out = 1.21.8
-minecraft_version = 1.21.8
-mappings_version = 1.21.8+build.1
+minecraft_version_out = 1.21.11
+minecraft_version = 1.21.11
+mappings_version = 1.21.11+build.3
 
-fabric_loader_version = 0.17.2
-mod_menu_version = 15.0.0-beta.3
-# fabric_api_version = 0.133.0+1.21.8
+fabric_loader_version = 0.18.4
+mod_menu_version = 17.0.0-beta.1
+# fabric_api_version = 0.140.2+1.21.11

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,3 +1,3 @@
 before_install:
-  - sdk install java 21.0.7-tem
-  - sdk use java 21.0.7-tem
+  - sdk install java 21.0.9-tem
+  - sdk use java 21.0.9-tem

gradlew

@@ -1,13 +1,12 @@
 package fi.dy.masa.litematica;
 
-import net.minecraft.client.MinecraftClient;
-
 import fi.dy.masa.malilib.config.ConfigManager;
 import fi.dy.masa.malilib.event.*;
 import fi.dy.masa.malilib.interfaces.IInitializationHandler;
 import fi.dy.masa.malilib.interfaces.IRenderer;
 import fi.dy.masa.malilib.registry.Registry;
 import fi.dy.masa.malilib.util.data.ModInfo;
+import net.minecraft.client.Minecraft;
 import fi.dy.masa.litematica.config.Configs;
 import fi.dy.masa.litematica.data.DataManager;
 import fi.dy.masa.litematica.data.EntitiesDataStorage;
@@ -46,7 +45,7 @@ public void registerModHandlers()
         WorldLoadHandler.getInstance().registerWorldLoadPreHandler(listener);
         WorldLoadHandler.getInstance().registerWorldLoadPostHandler(listener);
 
-        KeyCallbacks.init(MinecraftClient.getInstance());
+        KeyCallbacks.init(Minecraft.getInstance());
         StatusInfoRenderer.init();
 
         DataManager.getAreaSelectionsBaseDirectory();

gradlew.bat

@@ -6,7 +6,6 @@
 import net.fabricmc.api.ModInitializer;
 
 import fi.dy.masa.malilib.event.InitializationHandler;
-import fi.dy.masa.malilib.event.RenderEventHandler;
 import fi.dy.masa.litematica.config.Configs;
 
 public class Litematica implements ModInitializer