Skip to content

bugfix/auto-sell-pfand-not-working #483

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

Merged
rettichlp merged 2 commits into from
Jul 10, 2026
Merged

bugfix/auto-sell-pfand-not-working #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4057aa5
Update LivingEntityMixin to adjust injection timing and fix item cond…
rettichlp Jul 10, 2026
493d6d0
Refactor LivingEntityMixin to LocalPlayerMixin and update drop method…
rettichlp Jul 10, 2026
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
26 changes: 15 additions & 11 deletions ...chlp/ucutils/mixin/LivingEntityMixin.java → ...ichlp/ucutils/mixin/LocalPlayerMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package de.rettichlp.ucutils.mixin;

import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.item.ItemEntity;
import com.mojang.authlib.GameProfile;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.client.player.AbstractClientPlayer;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.phys.Vec3;
import org.spongepowered.asm.mixin.Mixin;
Expand All @@ -17,28 +19,30 @@
import static de.rettichlp.ucutils.UCUtils.storage;
import static net.minecraft.world.item.Items.GLASS_BOTTLE;

@Mixin(LivingEntity.class)
public abstract class LivingEntityMixin {
@Mixin(LocalPlayer.class)
public class LocalPlayerMixin extends AbstractClientPlayer {

@Unique
private final static List<Vec3> SHOP_LOCATIONS = List.of(
new Vec3(47, 69, 203),
new Vec3(1027, 69, 275)
);

@Inject(method = "drop", at = @At("RETURN"), cancellable = true)
private void ucutils$dropHead(ItemStack itemStack, boolean randomly, boolean thrownFromHand, CallbackInfoReturnable<ItemEntity> cir) {
public LocalPlayerMixin(ClientLevel level, GameProfile gameProfile) {
super(level, gameProfile);
}

@Inject(method = "drop", at = @At("HEAD"), cancellable = true)
private void ucutils$dropHead(boolean all, CallbackInfoReturnable<Boolean> cir) {
if (!storage.isUnicaCity()) {
return;
}

if (cir.getReturnValue() == null) {
return;
}
ItemStack selectedItem = getInventory().getSelectedItem();

if (player.getMainHandItem().is(GLASS_BOTTLE) && isNearShop()) {
if (selectedItem.is(GLASS_BOTTLE) && isNearShop()) {
// cancel drop
cir.setReturnValue(null);
cir.cancel();

// execute command
commandService.sendCommand("sell pfand");
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/ucutils.mixins.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"EntityHitboxDebugRendererMixin",
"EntityRendererMixin",
"GuiMixin",
"LivingEntityMixin",
"LocalPlayerMixin",
"PauseScreenMixin",
"PlayerTabOverlayMixin"
]
Expand Down