merge: from dev

sakurawald · Jul 7, 2024 · 9f48548 · 9f48548
1 parent ba52f4c
commit 9f48548
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx4G
 org.gradle.parallel=true
 
 # mod properties
-mod_version=1.2.0
+mod_version=1.2.4-partial-backport
 maven_group=io.github.sakurawald
 archives_base_name=fuji
 

diff --git a/...ain/java/io/github/sakurawald/module/mixin/enchantment/EnchantmentScreenHandlerMixin.java b/...ain/java/io/github/sakurawald/module/mixin/enchantment/EnchantmentScreenHandlerMixin.java
@@ -15,6 +15,7 @@ public class EnchantmentScreenHandlerMixin {
     @ModifyArg(method = "method_17411(Lnet/minecraft/item/ItemStack;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/enchantment/EnchantmentHelper;calculateRequiredExperienceLevel(Lnet/minecraft/util/math/random/Random;IILnet/minecraft/item/ItemStack;)I"), index = 2)
     int injected(int i) {
         var enchantment = Configs.configHandler.model().modules.enchantment;
+
         if (enchantment.enable) {
             EnchantmentScreenHandler instance = ((EnchantmentScreenHandler) (Object) this);
             if (instance instanceof MyEnchantmentScreenHandler) {

diff --git a/src/main/resources/fuji.mixins.json b/src/main/resources/fuji.mixins.json
@@ -16,6 +16,7 @@
     "chat.ServerGamePacketListenerImplMixin",
     "command_interactive.SignBlockMixin",
     "command_rewrite.ServerPlayNetworkHandlerMixin",
+    "enchantment.EnchantmentScreenHandlerMixin",
     "language.ServerPlayerMixin",
     "main_stats.BlockMixin",
     "motd.ServerStatusPacketListenerImplMixin",