temp fix replaced with actual fix

Author: iroot-work

build.gradle

@@ -35,7 +35,7 @@ dependencies {
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-	implementation 'com.github.Coflnet:CoflSkyCore:main'
+	implementation 'com.github.Coflnet:CoflSkyCore:main-SNAPSHOT'
 	implementation "org.greenrobot:eventbus-java:3.3.1"
 	implementation "org.java-websocket:Java-WebSocket:1.5.2"
 }

src/client/java/com/coflnet/CoflModClient.java

@@ -12,6 +12,7 @@
 import CoflCore.commands.models.FlipData;
 import CoflCore.commands.models.SoundData;
 import CoflCore.events.*;
+import CoflCore.handlers.EventRegistry;
 import com.coflnet.gui.RenderUtils;
 import com.coflnet.gui.cofl.CoflBinGUI;
 import com.coflnet.gui.tfm.TfmBinGUI;
@@ -50,15 +51,6 @@
 public class CoflModClient implements ClientModInitializer {
     private  KeyBinding bestflipsKeyBinding;
 
-    public static long LastClick = System.currentTimeMillis();
-    public static final ExecutorService chatThreadPool = Executors.newFixedThreadPool(2);
-    public static final ExecutorService tickThreadPool = Executors.newFixedThreadPool(2);
-    public static long LastViewAuctionInvocation = Long.MIN_VALUE;
-    public static String LastViewAuctionUUID = null;
-    public static Pattern chatpattern = Pattern.compile("a^", 2);
-    private static LinkedBlockingQueue<String> chatBatch = new LinkedBlockingQueue();
-    private static LocalDateTime lastBatchStart = LocalDateTime.now();
-
     private String username = "";
     private static FlipData flipData = null;
     private static Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
@@ -83,7 +75,7 @@ public void onInitializeClient() {
 
         ClientTickEvents.END_CLIENT_TICK.register(client -> {
             if(bestflipsKeyBinding.wasPressed()) {
-                onOpenBestFlip(username, true);
+                EventRegistry.onOpenBestFlip(username, true);
             }
         });
 
@@ -106,10 +98,6 @@ public void onInitializeClient() {
                     })));
         });
 
-        ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> {
-
-        });
-
         ScreenEvents.AFTER_INIT.register((client, screen, scaledWidth, scaledHeight) -> {
             if (screen instanceof GenericContainerScreen gcs) {
                 System.out.println(gcs.getTitle().getString());
@@ -137,24 +125,6 @@ public static FlipData popFlipData(){
         return fd;
     }
 
-    public static void onOpenBestFlip(String username, boolean isInitialKeypress) {
-        if (System.currentTimeMillis() - LastClick >= 300L) {
-            FlipData f = CoflCore.flipHandler.fds.GetHighestFlip();
-            System.out.println(f);
-            if (f != null) {
-                CoflSkyCommand.processCommand(new String[]{"openauctiongui", f.Id, "true"}, username);
-                LastViewAuctionUUID = f.Id;
-                LastViewAuctionInvocation = System.currentTimeMillis();
-                LastClick = System.currentTimeMillis();
-                String command = (new Gson()).toJson("/viewauction " + f.Id);
-                CoflCore.Wrapper.SendMessage(new JsonStringCommand(CommandType.Clicked, command));
-                CoflSkyCommand.processCommand(new String[]{"track", "besthotkey", f.Id, username}, username);
-            } else if (isInitialKeypress) {
-                CoflSkyCommand.processCommand(new String[]{"dialog", "nobestflip", username}, username);
-            }
-        }
-    }
-
     @Subscribe
     public void WriteToChat(OnWriteToChatReceive command){
          MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(ChatComponent(command.ChatMessage));
@@ -189,8 +159,11 @@ public void onFlipReceive(OnFlipReceive event){
         EventBus.getDefault().post(new OnChatMessageReceive(f.getMessages()));
         CoflCore.flipHandler.fds.Insert(new FlipData(
                 Arrays.stream(f.getMessages())
-                         .map(cm -> new ChatMessageData(cm.getText(), cm.getOnClick(), cm.getHover()))
-                        .toArray(ChatMessageData[]::new),
+                         .map(cm -> new ChatMessageData(
+                                 cm.getText(),
+                                 cm.getOnClick(),
+                                 cm.getHover())
+                         ).toArray(ChatMessageData[]::new),
                 f.getId(),
                 f.getWorth(),
                 new SoundData(

src/client/java/com/coflnet/Utils.java

@@ -13,7 +13,7 @@ public static  MutableText ChatComponent(ChatMessage cmd) {
             if (cmd.getOnClick().startsWith("http")) {
                 message.styled((style) -> style.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, cmd.getOnClick())));
             } else {
-                message.styled((style) -> style.withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, cmd.getOnClick())));
+                message.styled((style) -> style.withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, cmd.getOnClick().replace("viewauction", "cofl openauctiongui"))));
             }
         }
 

src/client/java/com/coflnet/gui/BinGUI.java

@@ -28,7 +28,7 @@ public abstract class BinGUI extends Screen {
     protected final int CONFIRMATION_CANCEL_SLOT = 15;
     protected ItemWidget itemWidget;
     protected ItemStack currentItem;
-    protected FlipData flipData = null;
+    protected FlipData flipData;
 
     protected AuctionStatus auctionStatus;
     protected GenericContainerScreenHandler gcsh;

src/client/java/com/coflnet/gui/cofl/CoflBinGUI.java

@@ -34,7 +34,6 @@ public class CoflBinGUI extends BinGUI {
 
     public CoflBinGUI(GenericContainerScreen gcs){
         super(Text.literal("Cofl Bin Gui"), gcs, 5, 4);
-        title = flipData == null ? "" : flipData.getMessageAsString();
     }
 
     @Override
@@ -120,14 +119,14 @@ public void onClick(double mouseX, double mouseY) {
                 screenWidth / 2 - width / 2 + p + 3,
                 screenHeight / 2 - height / 2 + p + 2,
                 width - p*2 - 4, 10,
-                Text.of(title),
+                Text.of(flipData == null ? "" : flipData.getMessageAsString().replace("sellers ah", "")),
                 MinecraftClient.getInstance().textRenderer
         ).alignLeft();
 
         loreScrollableTextWidget = new ScrollableDynamicTextWidget(
                 screenWidth / 2 - width / 2 + p + 20 + p + 4,
                 screenHeight / 2 - height / 2 + p + 12 + p + 2,
-                width - 20 - p*4 - 4, height - 75 - 2 - screenHeight / 15 - 2,
+                width - 20 - p*4 - 4,  height - 75 - 2 - screenHeight / 15 - 2,
                 lore, MinecraftClient.getInstance().textRenderer
         ){
             @Override

src/client/java/com/coflnet/gui/tfm/TfmBinGUI.java

@@ -30,14 +30,6 @@ public class TfmBinGUI extends BinGUI {
 
     public TfmBinGUI(GenericContainerScreen gcs){
         super(Text.of("Tfm Bin Gui"), gcs, 1, 4);
-
-        lore = "";
-        if (flipData != null) {
-            for (ChatMessageData message : flipData.Messages) {
-                if (message.Text.contains("sellers ah")) break;
-                lore += message.Text+"\n";
-            };
-        }
     }
 
     @Override
@@ -60,7 +52,7 @@ protected void clearAndInitWidgets(int screenWidth, int screenHeight) {
         loreMultilineTextWidget = new MultilineTextWidget(
                 screenWidth / 2 - width / 2 + 12,
                 screenHeight / 2 - height / 2 + 8 + 8 + 6,
-                Text.of(lore),
+                Text.of(flipData.getMessageAsString().replace("sellers ah", "")),
                 MinecraftClient.getInstance().textRenderer
         ).setCentered(false);