Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed item stack copy #484

Merged
merged 3 commits into from
Jun 13, 2024
Merged

Fixed item stack copy #484

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ce3f8b
fixed too many item copy calls
hannibal002 May 19, 2024
8b830ba
removed comment
hannibal002 May 19, 2024
4316f4d
inline item
hannibal002 May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/main/kotlin/gg/skytils/skytilsmod/features/impl/mining/MiningFeatures.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,20 +280,20 @@ object MiningFeatures {
@SubscribeEvent
fun onDrawSlot(event: GuiContainerEvent.DrawSlotEvent.Pre) {
if (!Utils.inSkyblock || event.container !is ContainerChest) return
if (event.slot.hasStack) {
if (!event.slot.hasStack) return
if (Skytils.config.highlightDisabledHOTMPerks && SBInfo.lastOpenContainerName == "Heart of the Mountain") {
val item = event.slot.stack
if (Skytils.config.highlightDisabledHOTMPerks && SBInfo.lastOpenContainerName == "Heart of the Mountain") {
if (ItemUtil.getItemLore(item).any { it == "§c§lDISABLED" }) {
event.slot highlight Color(255, 0, 0)
}
if (ItemUtil.getItemLore(item).any { it == "§c§lDISABLED" }) {
hannibal002 marked this conversation as resolved.
Show resolved Hide resolved
event.slot highlight Color(255, 0, 0)
}
if (Skytils.config.highlightCompletedCommissions && SBInfo.lastOpenContainerName.equals("Commissions")) {
if (item.displayName.startsWith("§6Commission #") && item.item == Items.writable_book) {
if (ItemUtil.getItemLore(item).any {
it == "§eClick to claim rewards!"
}) {
event.slot highlight Color(255, 0, 0)
}
}
if (Skytils.config.highlightCompletedCommissions && SBInfo.lastOpenContainerName.equals("Commissions")) {
val item = event.slot.stack
if (item.displayName.startsWith("§6Commission #") && item.item == Items.writable_book) {
if (ItemUtil.getItemLore(item).any {
it == "§eClick to claim rewards!"
}) {
event.slot highlight Color(255, 0, 0)
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/inventory/SlotHook.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable

fun markTerminalItems(slot: Slot, cir: CallbackInfoReturnable<ItemStack?>) {
if (!Utils.inSkyblock) return
val item: ItemStack = (slot.inventory.getStackInSlot(slot.slotIndex) ?: return).copy()
if (!item.isItemEnchanted && (SelectAllColorSolver.shouldClick.contains(slot.slotNumber) || StartsWithSequenceSolver.shouldClick.contains(
slot.slotNumber
))
val original = slot.inventory.getStackInSlot(slot.slotIndex) ?: return
if (!original.isItemEnchanted && (SelectAllColorSolver.shouldClick.contains(slot.slotNumber) ||
Sychic marked this conversation as resolved.
Show resolved Hide resolved
StartsWithSequenceSolver.shouldClick.contains(slot.slotNumber))
) {
val item = original.copy()
if (item.tagCompound == null) {
item.tagCompound = NBTTagCompound()
}
Expand Down
Loading