Merge remote-tracking branch 'origin/1.16' into 1.18

embeddedt · embeddedt · commit 2844c971705b · 2023-08-09T17:07:47.000-04:00
diff --git a/build.gradle b/build.gradle
@@ -146,7 +146,7 @@ configure(subprojects.findAll {it.name == "common" || it.name == "forge" || it.n
     }
 }
 
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
     // ensure that the encoding is set to UTF-8, no matter what the system default is
     // this fixes some edge cases with special characters not displaying correctly
     // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
@@ -164,10 +164,10 @@ tasks.withType(JavaCompile) {
      */
 }
 
-task generateChangelog(type: se.bjurr.gitchangelog.plugin.gradle.GitChangelogTask) {
+tasks.register('generateChangelog', se.bjurr.gitchangelog.plugin.gradle.GitChangelogTask) {
     def details = versionDetails();
     def theVersionRef
-    if(details.commitDistance > 0) {
+    if (details.commitDistance > 0) {
         theVersionRef = details.lastTag;
     } else {
         def secondLastTagCmd = "git describe --abbrev=0 " + details.lastTag + "^"
@@ -204,8 +204,8 @@ configure(subprojects.findAll {it.name == "forge" || it.name == "fabric"}) {
         }
         runs {
             client {
-                vmArgs "-Xmx512m"
-                vmArgs "-Xms512m"
+                vmArgs "-Xmx1G"
+                vmArgs "-Xms1G"
             }
         }
     }
diff --git a/common/build.gradle b/common/build.gradle
@@ -33,6 +33,9 @@ dependencies {
     // modApi "me.shedaniel:architectury:${rootProject.architectury_version}"
 }
 
+// don't need remapped common jar
+tasks.named('remapJar') { enabled = false }
+
 publishing {
     publications {
         mavenCommon(MavenPublication) {
diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/mojang_registry_size/StateHolderMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/mojang_registry_size/StateHolderMixin.java
@@ -0,0 +1,29 @@
+package org.embeddedt.modernfix.common.mixin.perf.mojang_registry_size;
+
+import com.google.common.collect.ImmutableTable;
+import com.google.common.collect.Table;
+import net.minecraft.world.level.block.state.StateHolder;
+import net.minecraft.world.level.block.state.properties.Property;
+import org.embeddedt.modernfix.annotation.RequiresMod;
+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;
+
+/**
+ * Minor mixin to avoid duplicate empty neighbor tables, used when FerriteCore is not present. Won't be enabled in 99% of
+ * modded environments but is useful for testing in dev without dragging in Fabric API.
+ */
+@Mixin(StateHolder.class)
+@RequiresMod("!ferritecore")
+public class StateHolderMixin {
+    @Shadow private Table<Property<?>, Comparable<?>, ?> neighbours;
+
+    /* optimize the case where block has no properties */
+    @Inject(method = "populateNeighbours", at = @At("RETURN"), require = 0)
+    private void replaceEmptyTable(CallbackInfo ci) {
+        if(this.neighbours.isEmpty())
+            this.neighbours = ImmutableTable.of();
+    }
+}
diff --git a/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java b/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
@@ -112,7 +112,7 @@ private void scanForAndBuildMixinOptions() {
                             if(annotation.values.get(i).equals("value")) {
                                 String modId = (String)annotation.values.get(i + 1);
                                 if(modId != null) {
-                                    requiredModPresent = modPresent(modId);
+                                    requiredModPresent = modId.startsWith("!") ? !modPresent(modId.substring(1)) : modPresent(modId);
                                     requiredModId = modId;
                                 }
                                 break;
diff --git a/common/src/main/resources/assets/modernfix/lang/ja_jp.json b/common/src/main/resources/assets/modernfix/lang/ja_jp.json
diff --git a/common/src/main/resources/assets/modernfix/lang/zh_cn.json b/common/src/main/resources/assets/modernfix/lang/zh_cn.json
@@ -7,6 +7,7 @@
   "modernfix.perf_mod_warning": "推荐安装这些模组，但你也可以在现代化修复的配置中禁用此警告。",
   "modernfix.config": "现代化修复Mixin配置",
   "modernfix.config.done_restart": "完成（生效需重启）",
+  "modernfix.message.reload_config": "在游戏外编辑完配置文件后，使用§b/mfrc§r命令使其生效。",
   "modernfix.option.on": "开启",
   "modernfix.option.off": "关闭",
   "modernfix.option.disabled": "已禁用",
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -32,15 +32,21 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     testImplementation "net.fabricmc:fabric-loader-junit:${rootProject.fabric_loader_version}"
 
-    modImplementation(fabricApi.module("fabric-api-base", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
-    modImplementation(fabricApi.module("fabric-screen-api-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
-    modImplementation(fabricApi.module("fabric-command-api-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
-    modImplementation(fabricApi.module("fabric-models-v0", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
+    modCompileOnly(fabricApi.module("fabric-api-base", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
+    modCompileOnly(fabricApi.module("fabric-screen-api-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
+    modCompileOnly(fabricApi.module("fabric-command-api-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
+    modCompileOnly(fabricApi.module("fabric-models-v0", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
     modIncludeImplementation(fabricApi.module("fabric-resource-loader-v0", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
-    modImplementation(fabricApi.module("fabric-data-generation-api-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
-    modImplementation("com.terraformersmc:modmenu:${rootProject.modmenu_version}") { transitive false }
-    modImplementation "curse.maven:spark-361579:${rootProject.spark_version}"
-    modRuntimeOnly("net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}") { exclude group: 'net.fabricmc', module: 'fabric-loader' }
+    modCompileOnly(fabricApi.module("fabric-data-generation-api-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
+    if(project.use_fabric_api_at_runtime.toBoolean()) {
+        modImplementation("com.terraformersmc:modmenu:${rootProject.modmenu_version}") { transitive false }
+        modImplementation "curse.maven:spark-361579:${rootProject.spark_version}"
+        modRuntimeOnly("net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}") { exclude group: 'net.fabricmc', module: 'fabric-loader' }
+    } else {
+        modCompileOnly("com.terraformersmc:modmenu:${rootProject.modmenu_version}") { transitive false }
+        modCompileOnly "curse.maven:spark-361579:${rootProject.spark_version}"
+    }
+
     // Remove the next line if you don't want to depend on the API
     // modApi "me.shedaniel:architectury-fabric:${rootProject.architectury_version}"
 
diff --git a/gradle.properties b/gradle.properties
@@ -23,4 +23,6 @@ fabric_api_version=0.76.0+1.18.2
 modmenu_version=3.2.5
 appeng_version=11.7.2
 
-spark_version=4505375
+spark_version=4505375
+
+use_fabric_api_at_runtime=true

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ configure(subprojects.findAll {it.name == "common" \|\| it.name == "forge" \|\| it.n`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`
`149`		`-tasks.withType(JavaCompile) {`
	`149`	`+tasks.withType(JavaCompile).configureEach {`
`150`	`150`	`// ensure that the encoding is set to UTF-8, no matter what the system default is`
`151`	`151`	`// this fixes some edge cases with special characters not displaying correctly`
`152`	`152`	`// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html`
`@@ -164,10 +164,10 @@ tasks.withType(JavaCompile) {`
`164`	`164`	`*/`
`165`	`165`	`}`
`166`	`166`
`167`		`-task generateChangelog(type: se.bjurr.gitchangelog.plugin.gradle.GitChangelogTask) {`
	`167`	`+tasks.register('generateChangelog', se.bjurr.gitchangelog.plugin.gradle.GitChangelogTask) {`
`168`	`168`	`def details = versionDetails();`
`169`	`169`	`def theVersionRef`
`170`		`- if(details.commitDistance > 0) {`
	`170`	`+ if (details.commitDistance > 0) {`
`171`	`171`	`theVersionRef = details.lastTag;`
`172`	`172`	`} else {`
`173`	`173`	`def secondLastTagCmd = "git describe --abbrev=0 " + details.lastTag + "^"`
`@@ -204,8 +204,8 @@ configure(subprojects.findAll {it.name == "forge" \|\| it.name == "fabric"}) {`
`204`	`204`	`}`
`205`	`205`	`runs {`
`206`	`206`	`client {`
`207`		`- vmArgs "-Xmx512m"`
`208`		`- vmArgs "-Xms512m"`
	`207`	`+ vmArgs "-Xmx1G"`
	`208`	`+ vmArgs "-Xms1G"`
`209`	`209`	`}`
`210`	`210`	`}`
`211`	`211`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,9 @@ dependencies {`
`33`	`33`	`// modApi "me.shedaniel:architectury:${rootProject.architectury_version}"`
`34`	`34`	`}`
`35`	`35`
	`36`	`+// don't need remapped common jar`
	`37`	`+tasks.named('remapJar') { enabled = false }`
	`38`	`+`
`36`	`39`	`publishing {`
`37`	`40`	`publications {`
`38`	`41`	`mavenCommon(MavenPublication) {`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ private void scanForAndBuildMixinOptions() {`
`112`	`112`	`if(annotation.values.get(i).equals("value")) {`
`113`	`113`	`String modId = (String)annotation.values.get(i + 1);`
`114`	`114`	`if(modId != null) {`
`115`		`- requiredModPresent = modPresent(modId);`
	`115`	`+ requiredModPresent = modId.startsWith("!") ? !modPresent(modId.substring(1)) : modPresent(modId);`
`116`	`116`	`requiredModId = modId;`
`117`	`117`	`}`
`118`	`118`	`break;`