From 140aae7f4add2d1763551fa60cb03246ce544545 Mon Sep 17 00:00:00 2001 From: sebseb7 Date: Tue, 26 Dec 2023 04:44:31 +0100 Subject: [PATCH] detect wandering trader --- .github/workflows/build.yml | 7 ++++++- .../github/sebseb7/autotrade/event/KeybindCallbacks.java | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index da0abbc..126bcfe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,12 @@ jobs: if: startsWith(github.ref, 'refs/tags/') with: files: build/libs/*.jar - - name: Test + - name: Modrinth Readme Sync env: MODRINTH_TOKEN: ${{ vars.MODRINTH_TOKEN }} run: ./gradlew modrinthSyncBody + - name: Modrinth Release + if: startsWith(github.ref, 'refs/tags/') + env: + MODRINTH_TOKEN: ${{ vars.MODRINTH_TOKEN }} + run: ./gradlew modrinth diff --git a/src/main/java/com/github/sebseb7/autotrade/event/KeybindCallbacks.java b/src/main/java/com/github/sebseb7/autotrade/event/KeybindCallbacks.java index 6e2977c..a254e8e 100644 --- a/src/main/java/com/github/sebseb7/autotrade/event/KeybindCallbacks.java +++ b/src/main/java/com/github/sebseb7/autotrade/event/KeybindCallbacks.java @@ -22,6 +22,7 @@ import net.minecraft.client.gui.screen.ingame.MerchantScreen; import net.minecraft.client.gui.screen.ingame.ShulkerBoxScreen; import net.minecraft.entity.Entity; import net.minecraft.entity.passive.VillagerEntity; +import net.minecraft.entity.passive.WanderingTraderEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; import net.minecraft.network.packet.c2s.play.SelectMerchantTradeC2SPacket; @@ -293,7 +294,7 @@ public class KeybindCallbacks implements IHotkeyCallback, IClientTickHandler { Vector newVillagersInRange = new Vector(villagersInRange); for (Entity entity : mc.player.clientWorld.getEntities()) { - if (entity instanceof VillagerEntity) { + if (entity instanceof VillagerEntity || entity instanceof WanderingTraderEntity) { if (entity.getPos().distanceTo(mc.player.getPos()) < 2.5f) { if (found == false) { if (newVillagersInRange.contains(entity) == false) {