Skip to content

Fix Item Scroller trade list compatibility #86

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

Open
SpaceSyt wants to merge 1 commit into
base: fabric
Choose a base branch
from
Open

Fix Item Scroller trade list compatibility #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions src/main/java/net/ramixin/visibletraders/ducks/ClientMerchantMenuDuck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ public interface ClientMerchantMenuDuck {

void visibleTraders$enableCombinedOffers();

void visibleTraders$beginCombinedOffersScope();

void visibleTraders$endCombinedOffersScope();

static ClientMerchantMenuDuck of(MerchantMenu screen) {
return (ClientMerchantMenuDuck) screen;
}
Expand Down
26 changes: 21 additions & 5 deletions src/main/java/net/ramixin/visibletraders/mixins/client/MerchantMenuMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package net.ramixin.visibletraders.mixins.client;

import com.llamalad7.mixinextras.injector.ModifyReturnValue;
import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import net.minecraft.world.inventory.MerchantMenu;
import net.minecraft.world.item.trading.Merchant;
import net.minecraft.world.item.trading.MerchantOffers;
Expand All @@ -11,7 +12,6 @@
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;

import java.util.Optional;

Expand All @@ -28,6 +28,9 @@ public abstract class MerchantMenuMixin implements ClientMerchantMenuDuck {
@Unique
private boolean useCombinedOffers = false;

@Unique
private int combinedOffersScopeDepth = 0;

@Override
public void visibleTraders$setLockedTradeOffers(Optional<MerchantOffers> maybeOffers) {
MerchantOffers combined = new MerchantOffers();
Expand All @@ -41,12 +44,25 @@ public abstract class MerchantMenuMixin implements ClientMerchantMenuDuck {
useCombinedOffers = true;
}

@ModifyReturnValue(method = "getOffers", at = @At("RETURN"))
private MerchantOffers useCombinedOffersIfEnabled(MerchantOffers original) {
@Override
public void visibleTraders$beginCombinedOffersScope() {
combinedOffersScopeDepth++;
}

@Override
public void visibleTraders$endCombinedOffersScope() {
combinedOffersScopeDepth = Math.max(0, combinedOffersScopeDepth - 1);
}

@WrapMethod(method = "getOffers")
private MerchantOffers useCombinedOffersIfEnabled(Operation<MerchantOffers> original) {
if(combinedOffersScopeDepth > 0 && combinedOffers.get() != null) {
return combinedOffers.get();
}
if(useCombinedOffers && combinedOffers.get() != null) {
useCombinedOffers = false;
return combinedOffers.get();
}
return original;
return original.call();
}
}
26 changes: 17 additions & 9 deletions src/main/java/net/ramixin/visibletraders/mixins/client/TradeOfferButtonMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,30 @@
package net.ramixin.visibletraders.mixins.client;

import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import net.minecraft.client.gui.GuiGraphicsExtractor;
import net.minecraft.client.gui.screens.inventory.MerchantScreen;
import net.minecraft.world.inventory.MerchantMenu;
import net.minecraft.world.item.trading.MerchantOffers;
import net.ramixin.visibletraders.ducks.ClientMerchantMenuDuck;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.Shadow;

@Mixin(MerchantScreen.TradeOfferButton.class)
public class TradeOfferButtonMixin {

@WrapOperation(method = "extractToolTip", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/inventory/MerchantMenu;getOffers()Lnet/minecraft/world/item/trading/MerchantOffers;"))
private MerchantOffers enabledCombinedOffersForMouseDragged(MerchantMenu instance, Operation<MerchantOffers> original) {
ClientMerchantMenuDuck duck = (ClientMerchantMenuDuck) instance;
duck.visibleTraders$enableCombinedOffers();
return original.call(instance);
@Shadow
@Final
private MerchantScreen this$0;

@WrapMethod(method = "extractToolTip")
private void useCombinedOffersWhileExtractingTooltip(GuiGraphicsExtractor graphics, int mouseX, int mouseY, Operation<Void> original) {
ClientMerchantMenuDuck duck = (ClientMerchantMenuDuck) this.this$0.getMenu();
duck.visibleTraders$beginCombinedOffersScope();
try {
original.call(graphics, mouseX, mouseY);
} finally {
duck.visibleTraders$endCombinedOffersScope();
}
}


Expand Down