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

Update Minecraft & Fabric Loader; stop including Mixin Extras

Browse Source
This commit is contained in:
embeddedt 2023-12-11 10:10:06 -05:00
parent 45b734dead
commit 06bb9f9545
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fabric/build.gradle
View File

@ -41,7 +41,6 @@ repositories {
dependencies { dependencies {
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
testImplementation "net.fabricmc:fabric-loader-junit:${rootProject.fabric_loader_version}" testImplementation "net.fabricmc:fabric-loader-junit:${rootProject.fabric_loader_version}"
include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${rootProject.mixinextras_version}")))
modCompileOnly(fabricApi.module("fabric-api-base", 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-screen-api-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }

7
fabric/src/main/java/org/embeddedt/modernfix/fabric/mappings/MappingsClearer.java
View File

@ -4,7 +4,6 @@ import net.fabricmc.loader.api.FabricLoader;
import net.fabricmc.loader.api.MappingResolver; import net.fabricmc.loader.api.MappingResolver;
import net.fabricmc.loader.impl.launch.FabricLauncherBase; import net.fabricmc.loader.impl.launch.FabricLauncherBase;
import net.fabricmc.loader.impl.launch.MappingConfiguration; import net.fabricmc.loader.impl.launch.MappingConfiguration;
import net.fabricmc.mapping.tree.TinyMappingFactory;
import org.embeddedt.modernfix.util.CommonModUtil; import org.embeddedt.modernfix.util.CommonModUtil;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
@ -18,7 +17,9 @@ import java.util.Map;
public class MappingsClearer { public class MappingsClearer {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static void clear() { public static void clear() {
if(FabricLoader.getInstance().isDevelopmentEnvironment()) // TODO: Port this to Fabric Loader 0.15
if(true) //FabricLoader.getInstance().isDevelopmentEnvironment())
return; // never do this in dev return; // never do this in dev
CommonModUtil.runWithoutCrash(() -> { CommonModUtil.runWithoutCrash(() -> {
// For now, force the mapping resolver to be initialized. Fabric Loader 0.14.23 stops initializing it early, // For now, force the mapping resolver to be initialized. Fabric Loader 0.14.23 stops initializing it early,
@ -33,7 +34,7 @@ public class MappingsClearer {
MappingConfiguration config = FabricLauncherBase.getLauncher().getMappingConfiguration(); MappingConfiguration config = FabricLauncherBase.getLauncher().getMappingConfiguration();
Field mappingsField = MappingConfiguration.class.getDeclaredField("mappings"); Field mappingsField = MappingConfiguration.class.getDeclaredField("mappings");
mappingsField.setAccessible(true); mappingsField.setAccessible(true);
mappingsField.set(config, TinyMappingFactory.EMPTY_TREE); //mappingsField.set(config, TinyMappingFactory.EMPTY_TREE);
// clear useless intermediary->intermediary mappings // clear useless intermediary->intermediary mappings
MappingResolver resolver = FabricLoader.getInstance().getMappingResolver(); MappingResolver resolver = FabricLoader.getInstance().getMappingResolver();

3
fabric/src/main/resources/fabric.mod.json
View File

@ -42,7 +42,8 @@
"modernfix-common.mixins.json" "modernfix-common.mixins.json"
], ],
"depends": { "depends": {
"minecraft": ">=1.16.2" "minecraft": ">=1.16.2",
"fabricloader": ">=0.15.0"
}, },
"breaks": { "breaks": {
"dashloader": "<5.0.0-beta.1" "dashloader": "<5.0.0-beta.1"

10
gradle.properties
View File

@ -5,9 +5,9 @@ junit_version=5.10.0-M1
mixinextras_version=0.3.1 mixinextras_version=0.3.1
mod_id=modernfix mod_id=modernfix
minecraft_version=1.20.3 minecraft_version=1.20.4
enabled_platforms=fabric,neoforge enabled_platforms=fabric,neoforge
forge_version=20.3.1-beta forge_version=20.4.12-beta
# parchment_version=2023.07.09 # parchment_version=2023.07.09
refined_storage_version=4392788 refined_storage_version=4392788
jei_version=16.0.0.28 jei_version=16.0.0.28
@ -15,10 +15,10 @@ rei_version=13.0.678
ctm_version=1.20.1-1.1.8+4 ctm_version=1.20.1-1.1.8+4
kubejs_version=1902.6.0-build.142 kubejs_version=1902.6.0-build.142
rhino_version=1902.2.2-build.268 rhino_version=1902.2.2-build.268
supported_minecraft_versions=1.20.3 supported_minecraft_versions=1.20.4
fabric_loader_version=0.14.25 fabric_loader_version=0.15.1
fabric_api_version=0.90.11+1.20.3 fabric_api_version=0.91.1+1.20.4
continuity_version=3.0.0-beta.4+1.20.2 continuity_version=3.0.0-beta.4+1.20.2