Fix mappings conflicts

FabricCompatibilityLayers · Jan 2, 2025 · c9de604 · c9de604
1 parent b1fed98
commit c9de604
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -24,4 +24,7 @@ indent_size = 2
 
 [.editorconfig]
 indent_style = space
-indent_size = 4
+indent_size = 4
+
+[*.tiny]
+indent_style = tab
diff --git a/apron-compat/build.gradle b/apron-compat/build.gradle
@@ -8,8 +8,8 @@ dependencies {
 	modCompileOnly(files("mods/overrideapi-old.jar"))
 	modCompileOnly(files("mods/overrideapi-sarcasm.jar"))
 	modCompileOnly(files("mods/betterthanwolves.jar"))
-//	modCompileOnly(files("mods/hmi.jar"))
-//	modCompileOnly(files("mods/betatweaks.jar"))
+	modCompileOnly(files("mods/hmi.jar"))
+	modCompileOnly(files("mods/betatweaks.jar"))
 	modCompileOnly(files("mods/somnia.jar"))
 	modCompileOnly(files("mods/betterblocks.jar"))
 	modCompileOnly(files("mods/incrediblefungus.jar"))

diff --git a/build.gradle b/build.gradle
@@ -87,7 +87,7 @@ allprojects {
 		minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
 		mappings loom.layered {
 			it.mappings "net.glasslauncher:biny:${rootProject.mappings}:v2"
-//			it.mappings file("${rootProject.projectDir}/mappings/mod-mappings.tiny")
+			it.mappings file("${rootProject.projectDir}/mappings/mod-mappings.tiny")
 		}
 		modApi "net.fabricmc:fabric-loader:${rootProject.loader_version}"
 

diff --git a/mappings/mod-mappings.tiny b/mappings/mod-mappings.tiny
@@ -1,5 +1,5 @@
 tiny	2	0	intermediary	named
-c   hmi/GuiRecipeViewer hmi/GuiRecipeViewer
-    m   ()V	init    initModded
-c   betatweaks/gui/GuiImprovedChat betatweaks/gui/GuiImprovedChat
-    m   ()V	init    initModded
+c	hmi/GuiRecipeViewer	hmi/GuiRecipeViewer
+	m	()V	init	initModded
+c	betatweaks/gui/GuiImprovedChat	betatweaks/gui/GuiImprovedChat
+	m	()V	init	initModded