Merge branch '1.20.x/dev' into 1.20.x/stable

FlashyReese · Jun 7, 2023 · fbaaa84 · fbaaa84
2 parents 8b42d8e + 198cfe4
commit fbaaa84
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ org.gradle.jvmargs=-Xmx1G
     loader_version=0.14.21
 
 # Mod Properties
-    mod_version=0.4.18
+    mod_version=0.4.20
     maven_group=me.flashyreese.mods
     archives_base_name=sodium-extra
 

diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/toasts/MixinAdvancementToast.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/toasts/MixinAdvancementToast.java
@@ -1,10 +1,10 @@
 package me.flashyreese.mods.sodiumextra.mixin.toasts;
 
 import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.toast.AdvancementToast;
 import net.minecraft.client.toast.Toast;
 import net.minecraft.client.toast.ToastManager;
-import net.minecraft.client.util.math.MatrixStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -13,7 +13,7 @@
 @Mixin(AdvancementToast.class)
 public class MixinAdvancementToast {
     @Inject(method = "draw", at = @At("HEAD"), cancellable = true)
-    public void draw(MatrixStack matrices, ToastManager manager, long startTime, CallbackInfoReturnable<Toast.Visibility> cir) {
+    public void draw(DrawContext context, ToastManager manager, long startTime, CallbackInfoReturnable<Toast.Visibility> cir) {
         if (!SodiumExtraClientMod.options().extraSettings.advancementToast) {
             cir.setReturnValue(Toast.Visibility.HIDE);
         }

diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/toasts/MixinRecipeToast.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/toasts/MixinRecipeToast.java
@@ -1,10 +1,10 @@
 package me.flashyreese.mods.sodiumextra.mixin.toasts;
 
 import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.toast.RecipeToast;
 import net.minecraft.client.toast.Toast;
 import net.minecraft.client.toast.ToastManager;
-import net.minecraft.client.util.math.MatrixStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -13,7 +13,7 @@
 @Mixin(RecipeToast.class)
 public class MixinRecipeToast {
     @Inject(method = "draw", at = @At("HEAD"), cancellable = true)
-    public void draw(MatrixStack matrices, ToastManager manager, long startTime, CallbackInfoReturnable<Toast.Visibility> cir) {
+    public void draw(DrawContext context, ToastManager manager, long startTime, CallbackInfoReturnable<Toast.Visibility> cir) {
         if (!SodiumExtraClientMod.options().extraSettings.recipeToast) {
             cir.setReturnValue(Toast.Visibility.HIDE);
         }

diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/toasts/MixinSystemToast.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/toasts/MixinSystemToast.java
@@ -1,10 +1,10 @@
 package me.flashyreese.mods.sodiumextra.mixin.toasts;
 
 import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.toast.SystemToast;
 import net.minecraft.client.toast.Toast;
 import net.minecraft.client.toast.ToastManager;
-import net.minecraft.client.util.math.MatrixStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -13,7 +13,7 @@
 @Mixin(SystemToast.class)
 public class MixinSystemToast {
     @Inject(method = "draw", at = @At("HEAD"), cancellable = true)
-    public void draw(MatrixStack matrices, ToastManager manager, long startTime, CallbackInfoReturnable<Toast.Visibility> cir) {
+    public void draw(DrawContext context, ToastManager manager, long startTime, CallbackInfoReturnable<Toast.Visibility> cir) {
         if (!SodiumExtraClientMod.options().extraSettings.systemToast) {
             cir.setReturnValue(Toast.Visibility.HIDE);
         }

diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/toasts/MixinTutorialToast.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/toasts/MixinTutorialToast.java
@@ -1,10 +1,10 @@
 package me.flashyreese.mods.sodiumextra.mixin.toasts;
 
 import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.toast.Toast;
 import net.minecraft.client.toast.ToastManager;
 import net.minecraft.client.toast.TutorialToast;
-import net.minecraft.client.util.math.MatrixStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -13,7 +13,7 @@
 @Mixin(TutorialToast.class)
 public class MixinTutorialToast {
     @Inject(method = "draw", at = @At("HEAD"), cancellable = true)
-    public void draw(MatrixStack matrices, ToastManager manager, long startTime, CallbackInfoReturnable<Toast.Visibility> cir) {
+    public void draw(DrawContext context, ToastManager manager, long startTime, CallbackInfoReturnable<Toast.Visibility> cir) {
         if (!SodiumExtraClientMod.options().extraSettings.tutorialToast) {
             cir.setReturnValue(Toast.Visibility.HIDE);
         }