This commit is contained in:
sebseb7
2024-01-08 19:12:11 +01:00
parent 0d1f5301d1
commit 7724dde567
4 changed files with 15 additions and 14 deletions

View File

@@ -17,7 +17,6 @@ import java.util.HashMap;
import java.util.Vector;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;
import net.minecraft.client.gui.screen.ingame.HandledScreen;
import net.minecraft.client.gui.screen.ingame.MerchantScreen;
import net.minecraft.client.gui.screen.ingame.ShulkerBoxScreen;
import net.minecraft.entity.Entity;
@@ -212,11 +211,11 @@ public class KeybindCallbacks implements IHotkeyCallback, IClientTickHandler {
}
if (GuiUtils.getCurrentScreen() instanceof MerchantScreen) {
MerchantScreen screen = (MerchantScreen) GuiUtils.getCurrentScreen();
if (state == false) {
String sellItemStr = Configs.Generic.SELL_ITEM.getStringValue();
String buyItemStr = Configs.Generic.BUY_ITEM.getStringValue();
state = true;
MerchantScreen screen = (MerchantScreen) GuiUtils.getCurrentScreen();
MerchantScreenHandler handler = screen.getScreenHandler();
TradeOfferList offers = handler.getRecipes();
for (int i = 0; i < offers.size(); i++) {
@@ -255,8 +254,8 @@ public class KeybindCallbacks implements IHotkeyCallback, IClientTickHandler {
}
}
}
screen.close();
}
screen.close();
return;
}
@@ -285,10 +284,6 @@ public class KeybindCallbacks implements IHotkeyCallback, IClientTickHandler {
}
}
if (GuiUtils.getCurrentScreen() instanceof HandledScreen) {
return;
}
boolean found = false;
Vector<Entity> newVillagersInRange = new Vector<Entity>(villagersInRange);

View File

@@ -30,7 +30,7 @@
],
"depends": {
"minecraft": ">=1.20.3",
"malilib": ">=0.18.0"
"minecraft": ">=${minecraft_version_min}",
"malilib": ">=${malilib_version}"
}
}