Add another check for TableBonusLootConditionMixin, bumps version

Signed-off-by: Noaaan <[email protected]>
Noaaan · Mar 17, 2024 · 4da5def · 4da5def
1 parent aa89edb
commit 4da5def
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/PATCHNOTES.md b/PATCHNOTES.md
@@ -1,3 +1,10 @@
+# 0.19.6
+
+## Fixes
+
+- Fix another Mixin issue related to Aether Redux (#229, #231)
+- Include the language fix from previous patch (1.20.4 only)
+
 # 0.19.5
 
 ## Changes

diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ yarn_mappings=1.20.1+build.9
 loader_version=0.14.21
 
 # Mod Properties
-mod_version = 0.19.5+1.20.1
+mod_version = 0.19.6+1.20.1
 maven_group = nourl.mythicmetals
 archives_base_name = mythicmetals
 

diff --git a/src/main/java/nourl/mythicmetals/mixin/ApplyBonusLootFunctionMixin.java b/src/main/java/nourl/mythicmetals/mixin/ApplyBonusLootFunctionMixin.java
@@ -20,15 +20,15 @@ public class ApplyBonusLootFunctionMixin {
             ordinal = 0)
     private int mythicmetals$increaseFortune(int level, ItemStack drop, LootContext lootCtx) {
         // Return early if there is no item
-        var toolCtx = lootCtx.get(LootContextParameters.TOOL);
-        if (toolCtx == null) {
+        var toolCtxStack = lootCtx.get(LootContextParameters.TOOL);
+        if (toolCtxStack == null) {
             return level;
         }
 
-        if (Abilities.BONUS_FORTUNE.getItems().contains(toolCtx.getItem())) {
+        if (Abilities.BONUS_FORTUNE.getItems().contains(toolCtxStack.getItem())) {
             return level + Abilities.BONUS_FORTUNE.getLevel();
         }
-        if (MythrilDrill.hasUpgradeItem(toolCtx, MythicBlocks.CARMOT.getStorageBlock().asItem())) {
+        if (MythrilDrill.hasUpgradeItem(toolCtxStack, MythicBlocks.CARMOT.getStorageBlock().asItem())) {
             return level + 1;
         }
         return level;

diff --git a/src/main/java/nourl/mythicmetals/mixin/TableBonusLootConditionMixin.java b/src/main/java/nourl/mythicmetals/mixin/TableBonusLootConditionMixin.java
@@ -11,7 +11,6 @@
 import org.spongepowered.asm.mixin.*;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
-import java.util.Objects;
 
 @Mixin(TableBonusLootCondition.class)
 public class TableBonusLootConditionMixin {
@@ -21,15 +20,19 @@ public class TableBonusLootConditionMixin {
     @ModifyVariable(method = "test(Lnet/minecraft/loot/context/LootContext;)Z",
             at = @At(value = "LOAD"))
     private int mythicmetals$increaseFortune(int level, LootContext lootCtx) {
+        var toolCtxStack = lootCtx.get(LootContextParameters.TOOL);
+        if (toolCtxStack == null) {
+            return level;
+        }
         // only modify when the loot table bonus loot checks for fortune
         if(this.enchantment != Enchantments.FORTUNE) {
             return level;
         }
 
-        if (Abilities.BONUS_FORTUNE.getItems().contains(Objects.requireNonNull(lootCtx.get(LootContextParameters.TOOL)).getItem())) {
+        if (Abilities.BONUS_FORTUNE.getItems().contains(toolCtxStack.getItem())) {
             return (level + Abilities.BONUS_FORTUNE.getLevel());
         }
-        if (MythrilDrill.hasUpgradeItem(Objects.requireNonNull(lootCtx.get(LootContextParameters.TOOL)), MythicBlocks.CARMOT.getStorageBlock().asItem())) {
+        if (MythrilDrill.hasUpgradeItem(toolCtxStack, MythicBlocks.CARMOT.getStorageBlock().asItem())) {
             return level + 1;
         }
         return level;