R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 1.19.4 into 1.20

Browse Source
This commit is contained in:
embeddedt 2023-06-26 19:46:09 -04:00
commit 7a2d38f2f1
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
4 changed files with 74 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
View File

@ -17,6 +17,7 @@ import org.objectweb.asm.tree.ClassNode;
import java.io.*;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.function.BooleanSupplier;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@ -136,7 +137,21 @@ public class ModernFixEarlyConfig {
private static final boolean isDevEnv = ModernFixPlatformHooks.isDevEnv();
private static final ImmutableMap<String, Boolean> DEFAULT_SETTING_OVERRIDES = ImmutableMap.<String, Boolean>builder()
private static class DefaultSettingMapBuilder extends ImmutableMap.Builder<String, Boolean> {
public DefaultSettingMapBuilder putConditionally(BooleanSupplier condition, String k, Boolean v) {
if(condition.getAsBoolean())
put(k, v);
return this;
}
@Override
public DefaultSettingMapBuilder put(String key, Boolean value) {
super.put(key, value);
return this;
}
}
private static final ImmutableMap<String, Boolean> DEFAULT_SETTING_OVERRIDES = new DefaultSettingMapBuilder()
.put("mixin.perf.dynamic_resources", false)
.put("mixin.feature.direct_stack_trace", false)
.put("mixin.perf.rewrite_registry", false)
@ -152,6 +167,8 @@ public class ModernFixEarlyConfig {
.put("mixin.feature.spark_profile_launch", false)
.put("mixin.devenv", isDevEnv)
.put("mixin.perf.remove_spawn_chunks", isDevEnv)
.putConditionally(() -> !isFabric, "mixin.bugfix.fix_config_crashes", true)
.putConditionally(() -> isFabric, "mixin.perf.clear_fabric_mapping_tables", false)
.build();
private ModernFixEarlyConfig(File file) {
@ -159,9 +176,6 @@ public class ModernFixEarlyConfig {
this.scanForAndBuildMixinOptions();
mixinOptions.addAll(DEFAULT_SETTING_OVERRIDES.keySet());
if(!isFabric) {
mixinOptions.add("mixin.bugfix.fix_config_crashes");
}
for(String optionName : mixinOptions) {
boolean defaultEnabled = DEFAULT_SETTING_OVERRIDES.getOrDefault(optionName, true);
this.options.putIfAbsent(optionName, new Option(optionName, defaultEnabled, false));

7
common/src/main/java/org/embeddedt/modernfix/util/CommonModUtil.java
View File

@ -3,11 +3,16 @@ package org.embeddedt.modernfix.util;
import org.embeddedt.modernfix.core.ModernFixMixinPlugin;
public class CommonModUtil {
@FunctionalInterface
public interface SafeRunnable {
void run() throws Throwable;
}
/**
* Avoid using this, it's bad practice but cleanest way of suppressing errors for nonessential mod-dependent
* functionality.
*/
public static void runWithoutCrash(Runnable r, String errorMsg) {
public static void runWithoutCrash(SafeRunnable r, String errorMsg) {
try {
r.run();
} catch(Throwable e) {

4
fabric/src/main/java/org/embeddedt/modernfix/ModernFixPreLaunchFabric.java
View File

@ -2,6 +2,7 @@ package org.embeddedt.modernfix;
import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
import org.embeddedt.modernfix.core.ModernFixMixinPlugin;
import org.embeddedt.modernfix.fabric.mappings.MappingsClearer;
import org.embeddedt.modernfix.spark.SparkLaunchProfiler;
import org.embeddedt.modernfix.util.CommonModUtil;
@ -11,5 +12,8 @@ public class ModernFixPreLaunchFabric implements PreLaunchEntrypoint {
if(ModernFixMixinPlugin.instance.isOptionEnabled("feature.spark_profile_launch.OnFabric")) {
CommonModUtil.runWithoutCrash(() -> SparkLaunchProfiler.start("launch"), "Failed to start profiler");
}
if(ModernFixMixinPlugin.instance.isOptionEnabled("perf.clear_fabric_mapping_tables.MappingsClearer")) {
MappingsClearer.clear();
}
}
}

46
fabric/src/main/java/org/embeddedt/modernfix/fabric/mappings/MappingsClearer.java Normal file
View File

@ -0,0 +1,46 @@
package org.embeddedt.modernfix.fabric.mappings;
import net.fabricmc.loader.api.FabricLoader;
import net.fabricmc.loader.api.MappingResolver;
import net.fabricmc.loader.impl.launch.FabricLauncherBase;
import net.fabricmc.loader.impl.launch.MappingConfiguration;
import net.fabricmc.mapping.tree.TinyMappingFactory;
import org.embeddedt.modernfix.util.CommonModUtil;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.util.Map;
/**
* Designed for Fabric Loader 0.14.x, probably has issues on other versions. The entire thing is wrapped in a try-catch
* so it should never cause crashes, just fail to work.
*/
public class MappingsClearer {
@SuppressWarnings("unchecked")
public static void clear() {
if(FabricLoader.getInstance().isDevelopmentEnvironment())
return; // never do this in dev
CommonModUtil.runWithoutCrash(() -> {
// clear notch->intermediary mappings
MappingConfiguration config = FabricLauncherBase.getLauncher().getMappingConfiguration();
Field mappingsField = MappingConfiguration.class.getDeclaredField("mappings");
mappingsField.setAccessible(true);
mappingsField.set(config, TinyMappingFactory.EMPTY_TREE);
// clear useless intermediary->intermediary mappings
MappingResolver resolver = FabricLoader.getInstance().getMappingResolver();
Class<?> targetResolverClz = Class.forName("net.fabricmc.loader.impl.MappingResolverImpl");
if(targetResolverClz.isAssignableFrom(resolver.getClass())) {
// hopefully still Loader 0.14.x, proceed
Class<?> namespaceDataClz = Class.forName("net.fabricmc.loader.impl.MappingResolverImpl$NamespaceData");
Constructor<?> constructor = namespaceDataClz.getDeclaredConstructor();
constructor.setAccessible(true);
Object theData = constructor.newInstance();
Field mapField = resolver.getClass().getDeclaredField("namespaceDataMap");
mapField.setAccessible(true);
Map<String, Object> theMap = (Map<String, Object>)mapField.get(resolver);
theMap.replace("intermediary", theData);
}
}, "Failed to clear mappings");
}
}