diff --git a/gradle.properties b/gradle.properties index e9372ba..b537310 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_name = Lilase mod_id = lilase -mod_version = 3.0.2 +mod_version = 3.0.3 essential.defaults.loom=0 diff --git a/src/main/java/me/night0721/lilase/Lilase.java b/src/main/java/me/night0721/lilase/Lilase.java index 67c3ecf..46eef6d 100644 --- a/src/main/java/me/night0721/lilase/Lilase.java +++ b/src/main/java/me/night0721/lilase/Lilase.java @@ -42,7 +42,7 @@ import static me.night0721.lilase.features.flipper.Flipper.webhook; public class Lilase { public static final String MOD_NAME = "Lilase"; public static final String MODID = "Lilase"; - public static final String VERSION = "3.0.2"; + public static final String VERSION = "3.0.3"; public static final Minecraft mc = Minecraft.getMinecraft(); // public static PageFlipper pageFlipper; public static Claimer claimer; @@ -53,7 +53,7 @@ public class Lilase { private int tickAmount; private final Clock clock = new Clock(); public static RemoteControl remoteControl; - public static CapeDatabase capeDatabase = new CapeDatabase(); + public static final CapeDatabase capeDatabase = new CapeDatabase(); @Mod.EventHandler public void init(FMLInitializationEvent event) { diff --git a/src/main/java/me/night0721/lilase/events/SniperFlipperEvents.java b/src/main/java/me/night0721/lilase/events/SniperFlipperEvents.java index 0d66482..643dfc9 100644 --- a/src/main/java/me/night0721/lilase/events/SniperFlipperEvents.java +++ b/src/main/java/me/night0721/lilase/events/SniperFlipperEvents.java @@ -71,20 +71,7 @@ public class SniperFlipperEvents { } private int latestWindowId = -1; - private final Thread spam = new Thread(() -> { - int tries = 0; - try { - while (tries < 50) { - if (InventoryUtils.inventoryNameStartsWith("BIN Auction View")) { - clickWindow(latestWindowId, 31); - clickWindow(latestWindowId + 1, 11); - tries++; - Thread.sleep(BED_SPAM_DELAY); - } - } - } catch (Exception ignored) { - } - }); + private Thread spam; @SubscribeEvent public void onPacketReceive(PacketReceivedEvent event) { @@ -102,11 +89,21 @@ public class SniperFlipperEvents { ItemStack itemStack = packetSetSlot.func_149174_e(); Utils.debugLog("Slot 31: " + itemStack.getItem().getRegistryName()); if (itemStack.getItem() == Items.bed) { - boolean threadStatus = !spam.isAlive(); - if (spam.isAlive()) spam.interrupt(); - if (!threadStatus) { - spam.start(); - } + spam = new Thread(() -> { + int tries = 0; + try { + while (tries < 50) { + if (InventoryUtils.inventoryNameStartsWith("BIN Auction View")) { + clickWindow(latestWindowId, 31); + clickWindow(latestWindowId + 1, 11); + tries++; + Thread.sleep(BED_SPAM_DELAY); + } + } + } catch (Exception ignored) { + } + }); + spam.start(); new Thread(() -> { try { Thread.sleep(4000); diff --git a/src/main/java/me/night0721/lilase/features/cofl/Cofl.java b/src/main/java/me/night0721/lilase/features/cofl/Cofl.java index 70d82b2..c087cf6 100644 --- a/src/main/java/me/night0721/lilase/features/cofl/Cofl.java +++ b/src/main/java/me/night0721/lilase/features/cofl/Cofl.java @@ -43,8 +43,6 @@ public class Cofl { try { if (!isOpen() || !str.startsWith("Received:")) return; if (pattern.matcher(str).find()) { -// Random random = new Random(); -// Lilase.mc.thePlayer.inventory.currentItem = random.nextInt(9); String[] split = str.split("Received: "); JsonObject received = new JsonParser().parse(split[1]).getAsJsonObject(); if (!received.get("type").getAsString().equals("flip")) return; diff --git a/src/main/java/me/night0721/lilase/features/flipper/Flipper.java b/src/main/java/me/night0721/lilase/features/flipper/Flipper.java index 654d029..74ac05a 100644 --- a/src/main/java/me/night0721/lilase/features/flipper/Flipper.java +++ b/src/main/java/me/night0721/lilase/features/flipper/Flipper.java @@ -229,6 +229,8 @@ public class Flipper { return; } String price = SHORTEN_NUMBERS ? Utils.convertToShort(this.target) : String.valueOf(this.target); + Utils.debugLog("Long Price: " + this.target); + Utils.debugLog("Shorten Price: " + Utils.convertToShort(this.target)); tileSign.signText[0] = new ChatComponentText(price); sendPacketWithoutEvent(new C12PacketUpdateSign(tileSign.getPos(), tileSign.signText)); state = FlipperState.TIME;