Skip to content

Commit 0f3fbc7

Browse files
committed
temporary fix
1 parent c08b669 commit 0f3fbc7

File tree

2 files changed

+30
-20
lines changed

2 files changed

+30
-20
lines changed

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

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
package com.coflnet;
22

33
import CoflCore.CoflCore;
4+
import CoflCore.classes.AuctionItem;
45
import CoflCore.classes.ChatMessage;
56
import CoflCore.CoflSkyCommand;
7+
import CoflCore.classes.Flip;
8+
import CoflCore.classes.Sound;
69
import CoflCore.commands.CommandType;
710
import CoflCore.commands.JsonStringCommand;
811
import CoflCore.commands.models.FlipData;
@@ -12,6 +15,8 @@
1215
import com.coflnet.gui.tfm.TfmBinGUI;
1316
import com.google.gson.Gson;
1417
import com.google.gson.GsonBuilder;
18+
import com.google.gson.JsonObject;
19+
import com.google.gson.reflect.TypeToken;
1520
import com.mojang.brigadier.arguments.StringArgumentType;
1621
import net.fabricmc.api.ClientModInitializer;
1722
import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
@@ -29,11 +34,15 @@
2934
import net.minecraft.client.util.InputUtil;
3035
import net.minecraft.item.Items;
3136
import net.minecraft.text.Text;
37+
import org.greenrobot.eventbus.EventBus;
3238
import org.greenrobot.eventbus.Subscribe;
3339
import org.lwjgl.glfw.GLFW;
3440

3541
import java.nio.file.Path;
3642
import java.time.LocalDateTime;
43+
import java.util.ArrayList;
44+
import java.util.Arrays;
45+
import java.util.List;
3746
import java.util.concurrent.ExecutorService;
3847
import java.util.concurrent.Executors;
3948
import java.util.concurrent.LinkedBlockingQueue;
@@ -174,25 +183,26 @@ public void onFlipMessage(OnFlipReceive event){
174183

175184
@Subscribe
176185
public void onReceiveCommand(ReceiveCommand event){
177-
if (event.command.getType() == CommandType.ChatMessage){
178-
System.out.println("onReceiveCommand: "+event.command.getData());
179-
180-
// EventBus.getDefault().post(new OnFlipReceive((Flip)event.command.GetAs(new TypeToken<Flip>() {
181-
// }).getData()));
182-
// JsonObject jsonObject = JsonParser.parseString(event.command.getData()).getAsJsonObject();
183-
// EventBus.getDefault().post(new OnFlipReceive(new Flip(
184-
// new ChatMessage[]{},//jsonObject.get("messages"),
185-
// jsonObject.get("id").getAsString(),
186-
// jsonObject.get("worth").getAsInt(),
187-
// new Sound(),//jsonObject.get("sound"),
188-
// new AuctionItem(),//jsonObject.get("auction"),
189-
// jsonObject.get("render").getAsString(),
190-
// jsonObject.get("target").getAsString()
191-
// )));
192-
193-
// Flip f = new ObjectMapper(gson).readValue(event.command.getData(), Flip.class);
194-
// System.out.println("res: "+f.getId());
195-
// //EventBus.getDefault().post(new OnFlipReceive(f));
186+
if (event.command.getType() == CommandType.Flip){
187+
JsonObject jo = gson.fromJson(event.command.getData(), JsonObject.class);
188+
EventBus.getDefault().post(new OnFlipReceive(jsonObjToFlip(jo)));
196189
}
197190
}
191+
192+
public static Flip jsonObjToFlip(JsonObject jsonObj){
193+
JsonObject[] chatMessagesObj = gson.fromJson(jsonObj.get("messages"), JsonObject[].class);
194+
ChatMessage[] chatMessages = Arrays.stream(chatMessagesObj).map(jsonObject -> new ChatMessage(
195+
jsonObject.get("text").getAsString(),
196+
jsonObject.get("onClick").getAsString(),
197+
""//jsonObject.get("hover").getAsString()
198+
)).toArray(ChatMessage[]::new);
199+
200+
String id = gson.fromJson(jsonObj.get("id"), String.class);
201+
int worth = gson.fromJson(jsonObj.get("worth"), Integer.class);
202+
Sound sound = gson.fromJson(jsonObj.get("sound"), Sound.class);
203+
AuctionItem auction = gson.fromJson(jsonObj.get("auction"), AuctionItem.class);
204+
String render = gson.fromJson(jsonObj.get("render"), String.class);
205+
String target = gson.fromJson(jsonObj.get("target"), String.class);
206+
return new Flip(chatMessages, id, worth, sound, auction, render, target);
207+
}
198208
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ protected void clearAndInitWidgets(int screenWidth, int screenHeight) {
4242
Text.of("Cofl - Auction View"),
4343
MinecraftClient.getInstance().textRenderer
4444
).alignLeft();
45-
45+
4646
loreMultilineTextWidget = new MultilineTextWidget(
4747
screenWidth / 2 - width / 2 + 12,
4848
screenHeight / 2 - height / 2 + 8 + 8 + 6,

0 commit comments

Comments
 (0)