fix fapi conflict

isXander · Jun 14, 2023 · c4c9593 · c4c9593
1 parent 79c558a
commit c4c9593
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -19,7 +19,7 @@ plugins {
 }
 
 group = "dev.isxander"
-version = "1.20.1+1.0"
+version = "1.20.1+1.1"
 
 loom {
     splitEnvironmentSourceSets()
@@ -99,6 +99,7 @@ dependencies {
     }
 
     modImplementation(fabricApi.module("fabric-resource-loader-v0", fabricApiVersion))
+    modRuntimeOnly("net.fabricmc.fabric-api:fabric-api:$fabricApiVersion")
 
     "modClientImplementation"("dev.isxander.yacl:yet-another-config-lib-fabric:$yaclVersion") { exclude(module = "fabric-loader") }
     "modClientImplementation"("com.terraformersmc:modmenu:$modMenuVersion") { exclude(module = "fabric-loader") }

diff --git a/changelogs/1.20.1/1.20.1+1.1.md b/changelogs/1.20.1/1.20.1+1.1.md
@@ -0,0 +1,2 @@
+- Fix mixin conflict with Fabric API
+- Fix French translation not loading
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ fabricLoaderVersion=0.14.21
 qmBuild=1
 
 # Libraries
-fabricApiVersion=0.83.0+1.20
+fabricApiVersion=0.83.0+1.20.1
 yaclVersion=3.0.1+1.20
 mixinExtrasVersion=0.2.0-beta.8
 modMenuVersion=7.0.0
diff --git a/...ent/java/dev/isxander/debugify/client/mixins/basic/mc176559/MultiPlayerGameModeMixin.java b/...ent/java/dev/isxander/debugify/client/mixins/basic/mc176559/MultiPlayerGameModeMixin.java
@@ -19,7 +19,7 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.item.ItemStack;
 
-@BugFix(id = "MC-176559", category = FixCategory.BASIC, env = BugFix.Env.CLIENT)
+@BugFix(id = "MC-176559", category = FixCategory.BASIC, env = BugFix.Env.CLIENT, modConflicts = "fabric-api")
 @Mixin(MultiPlayerGameMode.class)
 public class MultiPlayerGameModeMixin {
     @Shadow private ItemStack destroyingItem;

diff --git a/src/main/resources/assets/debugify/lang/fr_fr.json b/src/main/resources/assets/debugify/lang/fr_fr.json
@@ -26,6 +26,6 @@
   "debugify.mc_237493.header": "Télémétrie désactivée par Debugify",
   "debugify.mc_237493.line": "Vous avez choisi '%s' pour l'option de télémétrie, Debugify empêche donc toute connexion avec les services de télémétrie de Mojang. Cette option est fournie par Debugify pour la correction MC-237493.",
   "debugify.mc_237493.tooltip.off": "'%s' désactive complètement toute connexion aux services de télémétrie de Mojang. (Debugify MC-237493)",
-  "debugify.mc_237493.tooltip.minimal": "Le fichier "%s" ne contient que les informations que Mojang juge nécessaires.",
+  "debugify.mc_237493.tooltip.minimal": "Le fichier \"%s\" ne contient que les informations que Mojang juge nécessaires.",
   "debugify.mc_237493.tooltip.all": "'%s' inclut toute la télémétrie minimale et optionnelle."
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Fix mixin conflict with Fabric API
		- Fix French translation not loading