From 42c7732864cd28873dceaab27a7a65a71ed109f0 Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Mon, 11 Sep 2023 02:24:37 -0400
Subject: Dungeon Chest Profit Calculator!

---
 .../skyblocker/mixin/HandledScreenMixin.java         | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/mixin')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java
index af6f6aa7..916fab03 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java
@@ -3,6 +3,7 @@ package me.xmrvizzy.skyblocker.mixin;
 import me.xmrvizzy.skyblocker.SkyblockerMod;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 import me.xmrvizzy.skyblocker.skyblock.BackpackPreview;
+import me.xmrvizzy.skyblocker.skyblock.dungeon.DungeonChestProfit;
 import me.xmrvizzy.skyblocker.skyblock.experiment.ChronomatronSolver;
 import me.xmrvizzy.skyblocker.skyblock.experiment.ExperimentSolver;
 import me.xmrvizzy.skyblocker.skyblock.experiment.SuperpairsSolver;
@@ -16,10 +17,13 @@ import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.inventory.SimpleInventory;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.screen.GenericContainerScreenHandler;
+import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.screen.slot.SlotActionType;
 import net.minecraft.text.Text;
 import org.jetbrains.annotations.Nullable;
+import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -30,6 +34,9 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+
 import java.util.Map;
 
 @Mixin(HandledScreen.class)
@@ -103,4 +110,17 @@ public abstract class HandledScreenMixin extends Screen {
             }
         }
     }
+    
+    @WrapOperation(method = "drawForeground", at = @At(value = "FIELD", target = "Lnet/minecraft/client/gui/screen/ingame/HandledScreen;title:Lnet/minecraft/text/Text;", opcode = Opcodes.GETFIELD))
+    private Text skyblocker$modifyScreenTitle(HandledScreen<?> handledScreen, Operation<Text> operation) {
+    	Text title = handledScreen.getTitle();
+    	
+    	if (Utils.isOnSkyblock() && handledScreen.getScreenHandler().getType().equals(ScreenHandlerType.GENERIC_9X6)) {
+    		GenericContainerScreenHandler gcsHandler = (GenericContainerScreenHandler) handledScreen.getScreenHandler();
+    		
+    		return DungeonChestProfit.getChestProfit(gcsHandler, title, this.client);
+    	}
+    	
+    	return title;
+    }
 }
-- 
cgit 


From e4757b16aca9f67621a5beaad3a55aeb15401d9c Mon Sep 17 00:00:00 2001
From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>
Date: Tue, 12 Sep 2023 20:16:10 -0400
Subject: Refactor DungeonChestProfit

---
 .../me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java   | 13 -------------
 .../xmrvizzy/skyblocker/mixin/accessor/ScreenAccessor.java | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/me/xmrvizzy/skyblocker/mixin/accessor/ScreenAccessor.java

(limited to 'src/main/java/me/xmrvizzy/skyblocker/mixin')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java
index 916fab03..eccd63e6 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java
@@ -110,17 +110,4 @@ public abstract class HandledScreenMixin extends Screen {
             }
         }
     }
-    
-    @WrapOperation(method = "drawForeground", at = @At(value = "FIELD", target = "Lnet/minecraft/client/gui/screen/ingame/HandledScreen;title:Lnet/minecraft/text/Text;", opcode = Opcodes.GETFIELD))
-    private Text skyblocker$modifyScreenTitle(HandledScreen<?> handledScreen, Operation<Text> operation) {
-    	Text title = handledScreen.getTitle();
-    	
-    	if (Utils.isOnSkyblock() && handledScreen.getScreenHandler().getType().equals(ScreenHandlerType.GENERIC_9X6)) {
-    		GenericContainerScreenHandler gcsHandler = (GenericContainerScreenHandler) handledScreen.getScreenHandler();
-    		
-    		return DungeonChestProfit.getChestProfit(gcsHandler, title, this.client);
-    	}
-    	
-    	return title;
-    }
 }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/accessor/ScreenAccessor.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/accessor/ScreenAccessor.java
new file mode 100644
index 00000000..6a671601
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/accessor/ScreenAccessor.java
@@ -0,0 +1,14 @@
+package me.xmrvizzy.skyblocker.mixin.accessor;
+
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.text.Text;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Mutable;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(Screen.class)
+public interface ScreenAccessor {
+    @Accessor
+    @Mutable
+    void setTitle(Text title);
+}
-- 
cgit