Skip to content

Commit b093276

Browse files
committed
hotkey for opening best flip semi functional
1 parent 0f3fbc7 commit b093276

File tree

3 files changed

+43
-16
lines changed

3 files changed

+43
-16
lines changed

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

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
import CoflCore.classes.Sound;
99
import CoflCore.commands.CommandType;
1010
import CoflCore.commands.JsonStringCommand;
11+
import CoflCore.commands.models.ChatMessageData;
1112
import CoflCore.commands.models.FlipData;
13+
import CoflCore.commands.models.SoundData;
1214
import CoflCore.events.*;
1315
import com.coflnet.gui.RenderUtils;
1416
import com.coflnet.gui.cofl.CoflBinGUI;
@@ -17,10 +19,14 @@
1719
import com.google.gson.GsonBuilder;
1820
import com.google.gson.JsonObject;
1921
import com.google.gson.reflect.TypeToken;
22+
import com.mojang.brigadier.CommandDispatcher;
2023
import com.mojang.brigadier.arguments.StringArgumentType;
24+
import com.mojang.brigadier.context.CommandContext;
25+
import com.mojang.brigadier.exceptions.CommandSyntaxException;
2126
import net.fabricmc.api.ClientModInitializer;
2227
import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
2328
import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
29+
import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
2430
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
2531
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
2632
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
@@ -32,7 +38,14 @@
3238
import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;
3339
import net.minecraft.client.option.KeyBinding;
3440
import net.minecraft.client.util.InputUtil;
41+
import net.minecraft.command.CommandSource;
42+
import net.minecraft.entity.player.PlayerEntity;
3543
import net.minecraft.item.Items;
44+
import net.minecraft.server.MinecraftServer;
45+
import net.minecraft.server.command.CommandManager;
46+
import net.minecraft.server.command.ServerCommandSource;
47+
import net.minecraft.server.world.ServerWorld;
48+
import net.minecraft.text.ClickEvent;
3649
import net.minecraft.text.Text;
3750
import org.greenrobot.eventbus.EventBus;
3851
import org.greenrobot.eventbus.Subscribe;
@@ -43,6 +56,7 @@
4356
import java.util.ArrayList;
4457
import java.util.Arrays;
4558
import java.util.List;
59+
import java.util.Objects;
4660
import java.util.concurrent.ExecutorService;
4761
import java.util.concurrent.Executors;
4862
import java.util.concurrent.LinkedBlockingQueue;
@@ -63,7 +77,7 @@ public class CoflModClient implements ClientModInitializer {
6377
private static LocalDateTime lastBatchStart = LocalDateTime.now();
6478

6579
private String username = "";
66-
private static String flipId = "";
80+
public static FlipData flip = null;
6781
private static Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
6882
@Override
6983
public void onInitializeClient() {
@@ -86,7 +100,6 @@ public void onInitializeClient() {
86100

87101
ClientTickEvents.END_CLIENT_TICK.register(client -> {
88102
if(bestflipsKeyBinding.wasPressed()) {
89-
System.out.println("Anz Flips: "+CoflCore.flipHandler.fds.CurrentFlips());
90103
onOpenBestFlip(username, true);
91104
}
92105
});
@@ -102,9 +115,9 @@ public void onInitializeClient() {
102115
dispatcher.register(ClientCommandManager.literal("cofl")
103116
.then(ClientCommandManager.argument("args", StringArgumentType.greedyString()).executes(context -> {
104117
String[] args = context.getArgument("args", String.class).split(" ");
105-
if (args[0].compareToIgnoreCase("openauctiongui") == 0){
106-
flipId = args[1];
107-
} else flipId = "";
118+
// if (args[0].compareToIgnoreCase("openauctiongui") == 0){
119+
// flipId = args[1];
120+
// } else flipId = "";
108121
CoflSkyCommand.processCommand(args,username);
109122
return 1;
110123
})));
@@ -121,7 +134,7 @@ public void onInitializeClient() {
121134
) {
122135
if (!(client.currentScreen instanceof CoflBinGUI || client.currentScreen instanceof TfmBinGUI)) {
123136
switch (CoflCore.config.purchaseOverlay) {
124-
case COFL: client.setScreen(new CoflBinGUI(gcs, flipId));break;
137+
case COFL: client.setScreen(new CoflBinGUI(gcs, flip));break;
125138
case TFM: client.setScreen(new TfmBinGUI(gcs));break;
126139
case null: default: break;
127140
}
@@ -173,12 +186,26 @@ public void onCountdownReceive(OnCountdownReceive event){
173186

174187
@Subscribe
175188
public void onOpenAuctionGUI(OnOpenAuctionGUI event){
176-
MinecraftClient.getInstance().setScreen(new BookScreen());
189+
flip = event.flip;
190+
MinecraftClient.getInstance().getNetworkHandler().sendChatMessage(event.openAuctionCommand);
177191
}
178192

179193
@Subscribe
180-
public void onFlipMessage(OnFlipReceive event){
181-
System.out.println("FLIP RECEIVED");
194+
public void onFlipReceive(OnFlipReceive event){
195+
Flip f = event.FlipData;
196+
EventBus.getDefault().post(new OnChatMessageReceive(f.getMessages()));
197+
CoflCore.flipHandler.fds.Insert(new FlipData(
198+
Arrays.stream(f.getMessages())
199+
.map(cm -> new ChatMessageData(cm.getText(), cm.getOnClick(), cm.getHover()))
200+
.toArray(ChatMessageData[]::new),
201+
f.getId(),
202+
f.getWorth(),
203+
new SoundData(
204+
f.getSound().getSoundName(),
205+
f.getSound().getSoundPitch() == null ? 0 : f.getSound().getSoundPitch()
206+
),
207+
f.getRender()
208+
));
182209
}
183210

184211
@Subscribe
@@ -194,7 +221,7 @@ public static Flip jsonObjToFlip(JsonObject jsonObj){
194221
ChatMessage[] chatMessages = Arrays.stream(chatMessagesObj).map(jsonObject -> new ChatMessage(
195222
jsonObject.get("text").getAsString(),
196223
jsonObject.get("onClick").getAsString(),
197-
""//jsonObject.get("hover").getAsString()
224+
jsonObject.get("hover").isJsonNull() ? null : jsonObject.get("hover").getAsString()
198225
)).toArray(ChatMessage[]::new);
199226

200227
String id = gson.fromJson(jsonObj.get("id"), String.class);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.coflnet.gui;
22

3+
import com.coflnet.CoflModClient;
34
import com.coflnet.gui.widget.ItemWidget;
45
import net.minecraft.client.MinecraftClient;
56
import net.minecraft.client.gui.DrawContext;

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import CoflCore.CoflCore;
44
import CoflCore.commands.models.FlipData;
5+
import com.coflnet.CoflModClient;
56
import com.coflnet.gui.AuctionStatus;
67
import com.coflnet.gui.BinGUI;
78
import com.coflnet.gui.RenderUtils;
@@ -28,16 +29,14 @@ public class CoflBinGUI extends BinGUI {
2829
private ClickableWidget leftClickableWidget;
2930

3031
public String title = "";
31-
public Text lore = Text.of(RenderUtils.lorem());
32+
public Text lore = Text.of("");
3233
public Pair<Integer, Integer> rightButtonCol = new Pair<>(CoflColConfig.BACKGROUND_SECONDARY, CoflColConfig.BACKGROUND_SECONDARY);
3334

34-
public CoflBinGUI(GenericContainerScreen gcs, String flipId){
35+
public CoflBinGUI(GenericContainerScreen gcs, FlipData flipData){
3536
super(Text.literal("Cofl Bin Gui"), gcs);
3637

37-
FlipData f = CoflCore.flipHandler.fds.getFlipById(flipId);
38-
if(f == null){
39-
System.out.println("NO FLIP FOUND");
40-
} else System.out.println("FLIP FOUND WTF");
38+
title = flipData == null ? "" : flipData.getMessageAsString();
39+
CoflModClient.flip = null;
4140

4241
this.p = 5;
4342
this.r = 4;

0 commit comments

Comments
 (0)