seb/autotrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new item/container selection methods

Browse Source
This commit is contained in:
sebseb7
2024-01-13 05:02:22 +01:00
parent 9c41b861c7
commit 59a5c3142e
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/github/sebseb7/autotrade/config/Configs.java
View File

@@ -23,7 +23,8 @@ public class Configs implements IConfigHandler {
public static final ConfigBoolean ITEM_FRAME = new ConfigBoolean("selectUsingItemFrame", true,
"Select buy/sell items with item frames (max. distance 3) with items nametagged \"buy\" or \"sell\"");
public static final ConfigBoolean GLASS_BLOCK = new ConfigBoolean("selectUsingGlassBlock", false,
"Select input and output containers by placing red (input) and blue (output) stained glass blocks 3 blocks above them");
"Select input and output containers by placing red (input) and blue (output) stained glass blocks <selectionBlockOffset> blocks above them (or below if negative)");
public static final ConfigInteger SELECTOR_OFFSET = new ConfigInteger("selectionBlockOffset", 3, -10, 10, "");
public static final ConfigBoolean ENABLE_SELL = new ConfigBoolean("enableSell", false,
"Enable selling (if disabled emeralds are taken from the input container)");
public static final ConfigString SELL_ITEM = new ConfigString("sellItem", "minecraft:gold_ingot",
@@ -56,9 +57,9 @@ public class Configs implements IConfigHandler {
"true: Start the delay after the villager was unloaded; false: Start the delay after the trade has been completed");
public static final ImmutableList<IConfigValue> OPTIONS = ImmutableList.of(ENABLED, ITEM_FRAME, GLASS_BLOCK,
ENABLE_SELL, SELL_ITEM, SELL_LIMIT, ENABLE_BUY, BUY_ITEM, BUY_LIMIT, MAX_INPUT_ITEMS, INPUT_CONTAINER_X,
INPUT_CONTAINER_Y, INPUT_CONTAINER_Z, OUTPUT_CONTAINER_X, OUTPUT_CONTAINER_Y, OUTPUT_CONTAINER_Z,
VOID_TRADING_DELAY, VOID_TRADING_DELAY_AFTER_TELEPORT);
SELECTOR_OFFSET, ENABLE_SELL, SELL_ITEM, SELL_LIMIT, ENABLE_BUY, BUY_ITEM, BUY_LIMIT, MAX_INPUT_ITEMS,
INPUT_CONTAINER_X, INPUT_CONTAINER_Y, INPUT_CONTAINER_Z, OUTPUT_CONTAINER_X, OUTPUT_CONTAINER_Y,
OUTPUT_CONTAINER_Z, VOID_TRADING_DELAY, VOID_TRADING_DELAY_AFTER_TELEPORT);
}
public static void loadFromFile() {

20
src/main/java/com/github/sebseb7/autotrade/event/KeybindCallbacks.java
View File

@@ -237,31 +237,33 @@ public class KeybindCallbacks implements IHotkeyCallback, IClientTickHandler {
int playerZ = (int) mc.player.getPos().getZ();
int playerY = (int) mc.player.getPos().getY();
for (int x = playerX - 6; x < playerX + 6; x += 1) {
for (int z = playerZ - 6; z < playerZ + 6; z += 1) {
for (int y = playerY - 6; y < playerY + 6; y += 1) {
int selectorOffset = Configs.Generic.SELECTOR_OFFSET.getIntegerValue();
for (int x = playerX - (selectorOffset + 3); x < playerX + (selectorOffset + 3); x += 1) {
for (int z = playerZ - (selectorOffset + 3); z < playerZ + (selectorOffset + 3); z += 1) {
for (int y = playerY - (selectorOffset + 3); y < playerY + (selectorOffset + 3); y += 1) {
BlockPos pos = new BlockPos(x, y, z);
if (mc.player.clientWorld.getBlockState(pos).isOf(Blocks.RED_STAINED_GLASS)) {
if ((x != Configs.Generic.INPUT_CONTAINER_X.getIntegerValue())
|| ((y - 3) != Configs.Generic.INPUT_CONTAINER_Y.getIntegerValue())
|| ((y - selectorOffset) != Configs.Generic.INPUT_CONTAINER_Y.getIntegerValue())
|| (z != Configs.Generic.INPUT_CONTAINER_Z.getIntegerValue())) {
Configs.Generic.INPUT_CONTAINER_X.setIntegerValue(x);
Configs.Generic.INPUT_CONTAINER_Y.setIntegerValue(y - 3);
Configs.Generic.INPUT_CONTAINER_Y.setIntegerValue(y - selectorOffset);
Configs.Generic.INPUT_CONTAINER_Z.setIntegerValue(z);
InfoUtils.showGuiOrInGameMessage(Message.MessageType.INFO,
"autotrade.message.input_container_set", x, y - 3, z);
"autotrade.message.input_container_set", x, y - selectorOffset, z);
}
break;
}
if (mc.player.clientWorld.getBlockState(pos).isOf(Blocks.BLUE_STAINED_GLASS)) {
if ((x != Configs.Generic.OUTPUT_CONTAINER_X.getIntegerValue())
|| ((y - 3) != Configs.Generic.OUTPUT_CONTAINER_Y.getIntegerValue())
|| ((y - selectorOffset) != Configs.Generic.OUTPUT_CONTAINER_Y.getIntegerValue())
|| (z != Configs.Generic.OUTPUT_CONTAINER_Z.getIntegerValue())) {
Configs.Generic.OUTPUT_CONTAINER_X.setIntegerValue(x);
Configs.Generic.OUTPUT_CONTAINER_Y.setIntegerValue(y - 3);
Configs.Generic.OUTPUT_CONTAINER_Y.setIntegerValue(y - selectorOffset);
Configs.Generic.OUTPUT_CONTAINER_Z.setIntegerValue(z);
InfoUtils.showGuiOrInGameMessage(Message.MessageType.INFO,
"autotrade.message.output_container_set", x, y - 3, z);
"autotrade.message.output_container_set", x, y - selectorOffset, z);
}
break;
}