night0721/Lilase
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed auto relister pricing and auto claimer crashing issue

Browse source
This commit is contained in:
NK 2023-05-26 22:51:12 +01:00
parent edd9d18313
commit 14640e3439
3 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/me/night0721/lilase/features/claimer/Claimer.java
View file

@ -74,13 +74,10 @@ public class Claimer extends Sniper {
Lilase.mc.playerController.interactWithEntitySendPacket(Lilase.mc.thePlayer, auctionMaster); Lilase.mc.playerController.interactWithEntitySendPacket(Lilase.mc.thePlayer, auctionMaster);
cooldown.schedule(1500); cooldown.schedule(1500);
} }
} else if (Utils.cookie == EffectState.ON) {
if (Lilase.mc.currentScreen != null) Lilase.mc.thePlayer.closeScreen();
else Utils.sendServerMessage("/ah");
} else if (InventoryUtils.inventoryNameContains("Auction House") && cooldown.passed()) { } else if (InventoryUtils.inventoryNameContains("Auction House") && cooldown.passed()) {
InventoryUtils.clickOpenContainerSlot(15); InventoryUtils.clickOpenContainerSlot(15);
state = ClaimerState.START; state = ClaimerState.START;
cooldown.schedule(500); cooldown.schedule(500);
} }
case START: case START:
if (InventoryUtils.inventoryNameContains("Manage Auctions") && cooldown.passed()) { if (InventoryUtils.inventoryNameContains("Manage Auctions") && cooldown.passed()) {
@ -146,6 +143,7 @@ public class Claimer extends Sniper {
} }
} }
} }
if (Utils.cookie == EffectState.ON) Utils.sendServerMessage("/ah");
Utils.debugLog("Claimed " + toClaim.size() + " sold items"); Utils.debugLog("Claimed " + toClaim.size() + " sold items");
state = ClaimerState.OPENING; state = ClaimerState.OPENING;
} else if (InventoryUtils.inventoryNameContains("Create BIN Auction") && cooldown.passed()) { } else if (InventoryUtils.inventoryNameContains("Create BIN Auction") && cooldown.passed()) {

3
src/main/java/me/night0721/lilase/features/pageflipper/PageFlipper.java
View file

@ -71,9 +71,6 @@ public class PageFlipper {
Lilase.mc.playerController.interactWithEntitySendPacket(Lilase.mc.thePlayer, auctionMaster); Lilase.mc.playerController.interactWithEntitySendPacket(Lilase.mc.thePlayer, auctionMaster);
cooldown.schedule(1500); cooldown.schedule(1500);
} }
} else if (Utils.cookie == EffectState.ON) {
if (Lilase.mc.currentScreen != null) Lilase.mc.thePlayer.closeScreen();
else Utils.sendServerMessage("/ah");
} else if (InventoryUtils.inventoryNameContains("Auction House") && cooldown.passed()) { } else if (InventoryUtils.inventoryNameContains("Auction House") && cooldown.passed()) {
InventoryUtils.clickOpenContainerSlot(11); InventoryUtils.clickOpenContainerSlot(11);
state = PageFlipperState.START; state = PageFlipperState.START;

9
src/main/java/me/night0721/lilase/features/relister/Relister.java
View file

@ -31,7 +31,7 @@ public class Relister extends Sniper {
public RelisterState state = RelisterState.NONE; public RelisterState state = RelisterState.NONE;
public boolean shouldBeRelisting = false; public boolean shouldBeRelisting = false;
public List<Integer> toRelist = new ArrayList<>(); public List<Integer> toRelist = new ArrayList<>();
private final Pattern BUYITNOW = Pattern.compile("Buy it now: (\\d+)"); private final Pattern BUYITNOW = Pattern.compile("Buy it now: ([\\d,]+) coins");
@Override @Override
public void onTick() { public void onTick() {
@ -78,10 +78,6 @@ public class Relister extends Sniper {
cooldown.schedule(1500); cooldown.schedule(1500);
} }
} }
if (Utils.cookie == EffectState.ON) {
if (Lilase.mc.currentScreen != null) Lilase.mc.thePlayer.closeScreen();
else Utils.sendServerMessage("/ah");
}
if (InventoryUtils.inventoryNameContains("Auction House") && cooldown.passed()) { if (InventoryUtils.inventoryNameContains("Auction House") && cooldown.passed()) {
InventoryUtils.clickOpenContainerSlot(15); InventoryUtils.clickOpenContainerSlot(15);
state = RelisterState.START; state = RelisterState.START;
@ -115,8 +111,8 @@ public class Relister extends Sniper {
if (list != null) { if (list != null) {
toRelist.add(i); toRelist.add(i);
try { try {
System.out.println("Item NBT: " + ScoreboardUtils.cleanSB(list.toString()));
String nbtString = ScoreboardUtils.cleanSB(list.toString()); String nbtString = ScoreboardUtils.cleanSB(list.toString());
System.out.println("Item NBT: " + nbtString);
Matcher matcher = BUYITNOW.matcher(nbtString); Matcher matcher = BUYITNOW.matcher(nbtString);
if (nbtString.contains("Status: Expired") && matcher.find()) { if (nbtString.contains("Status: Expired") && matcher.find()) {
String name = ScoreboardUtils.cleanSB(is.getDisplayName()); String name = ScoreboardUtils.cleanSB(is.getDisplayName());
@ -148,6 +144,7 @@ public class Relister extends Sniper {
System.out.println("Item Price: " + flipper.price); System.out.println("Item Price: " + flipper.price);
System.out.println("Target Price: " + flipper.target); System.out.println("Target Price: " + flipper.target);
selling_queue.add(flipper); selling_queue.add(flipper);
this.toggle();
flipper.sellItem(); flipper.sellItem();
break; break;
} }