Skip to content

Commit 995fb25

Browse files
iroot-workiroot-work
committed
removed redundant code
1 parent b093276 commit 995fb25

File tree

3 files changed

+42
-56
lines changed

3 files changed

+42
-56
lines changed

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

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,45 +18,28 @@
1818
import com.google.gson.Gson;
1919
import com.google.gson.GsonBuilder;
2020
import com.google.gson.JsonObject;
21-
import com.google.gson.reflect.TypeToken;
22-
import com.mojang.brigadier.CommandDispatcher;
2321
import com.mojang.brigadier.arguments.StringArgumentType;
24-
import com.mojang.brigadier.context.CommandContext;
25-
import com.mojang.brigadier.exceptions.CommandSyntaxException;
2622
import net.fabricmc.api.ClientModInitializer;
2723
import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
2824
import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
29-
import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
3025
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
3126
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
3227
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
3328
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
3429
import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
3530
import net.fabricmc.loader.api.FabricLoader;
3631
import net.minecraft.client.MinecraftClient;
37-
import net.minecraft.client.gui.screen.ingame.BookScreen;
3832
import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;
3933
import net.minecraft.client.option.KeyBinding;
4034
import net.minecraft.client.util.InputUtil;
41-
import net.minecraft.command.CommandSource;
42-
import net.minecraft.entity.player.PlayerEntity;
43-
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;
4935
import net.minecraft.text.Text;
5036
import org.greenrobot.eventbus.EventBus;
5137
import org.greenrobot.eventbus.Subscribe;
5238
import org.lwjgl.glfw.GLFW;
5339

5440
import java.nio.file.Path;
5541
import java.time.LocalDateTime;
56-
import java.util.ArrayList;
5742
import java.util.Arrays;
58-
import java.util.List;
59-
import java.util.Objects;
6043
import java.util.concurrent.ExecutorService;
6144
import java.util.concurrent.Executors;
6245
import java.util.concurrent.LinkedBlockingQueue;
@@ -77,7 +60,7 @@ public class CoflModClient implements ClientModInitializer {
7760
private static LocalDateTime lastBatchStart = LocalDateTime.now();
7861

7962
private String username = "";
80-
public static FlipData flip = null;
63+
private static FlipData flipData = null;
8164
private static Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
8265
@Override
8366
public void onInitializeClient() {
@@ -116,8 +99,8 @@ public void onInitializeClient() {
11699
.then(ClientCommandManager.argument("args", StringArgumentType.greedyString()).executes(context -> {
117100
String[] args = context.getArgument("args", String.class).split(" ");
118101
// if (args[0].compareToIgnoreCase("openauctiongui") == 0){
119-
// flipId = args[1];
120-
// } else flipId = "";
102+
// flip = CoflCore.flipHandler.fds.getFlipById(args[1]);
103+
// } else flip = null;
121104
CoflSkyCommand.processCommand(args,username);
122105
return 1;
123106
})));
@@ -134,7 +117,7 @@ public void onInitializeClient() {
134117
) {
135118
if (!(client.currentScreen instanceof CoflBinGUI || client.currentScreen instanceof TfmBinGUI)) {
136119
switch (CoflCore.config.purchaseOverlay) {
137-
case COFL: client.setScreen(new CoflBinGUI(gcs, flip));break;
120+
case COFL: client.setScreen(new CoflBinGUI(gcs));break;
138121
case TFM: client.setScreen(new TfmBinGUI(gcs));break;
139122
case null: default: break;
140123
}
@@ -144,6 +127,12 @@ public void onInitializeClient() {
144127
});
145128
}
146129

130+
public static FlipData popFlipData(){
131+
FlipData fd = flipData;
132+
flipData = null;
133+
return fd;
134+
}
135+
147136
public static void onOpenBestFlip(String username, boolean isInitialKeypress) {
148137
if (System.currentTimeMillis() - LastClick >= 300L) {
149138
FlipData f = CoflCore.flipHandler.fds.GetHighestFlip();
@@ -186,7 +175,7 @@ public void onCountdownReceive(OnCountdownReceive event){
186175

187176
@Subscribe
188177
public void onOpenAuctionGUI(OnOpenAuctionGUI event){
189-
flip = event.flip;
178+
flipData = event.flip;
190179
MinecraftClient.getInstance().getNetworkHandler().sendChatMessage(event.openAuctionCommand);
191180
}
192181

@@ -196,7 +185,7 @@ public void onFlipReceive(OnFlipReceive event){
196185
EventBus.getDefault().post(new OnChatMessageReceive(f.getMessages()));
197186
CoflCore.flipHandler.fds.Insert(new FlipData(
198187
Arrays.stream(f.getMessages())
199-
.map(cm -> new ChatMessageData(cm.getText(), cm.getOnClick(), cm.getHover()))
188+
.map(cm -> new ChatMessageData(cm.getText(), cm.getOnClick(), cm.getHover()))
200189
.toArray(ChatMessageData[]::new),
201190
f.getId(),
202191
f.getWorth(),

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

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,20 @@ public class CoflBinGUI extends BinGUI {
3232
public Text lore = Text.of("");
3333
public Pair<Integer, Integer> rightButtonCol = new Pair<>(CoflColConfig.BACKGROUND_SECONDARY, CoflColConfig.BACKGROUND_SECONDARY);
3434

35-
public CoflBinGUI(GenericContainerScreen gcs, FlipData flipData){
36-
super(Text.literal("Cofl Bin Gui"), gcs);
37-
35+
public CoflBinGUI(GenericContainerScreen gcs){
36+
super(Text.literal("Cofl Bin Gui"), gcs, 5, 4);
3837
title = flipData == null ? "" : flipData.getMessageAsString();
39-
CoflModClient.flip = null;
40-
41-
this.p = 5;
42-
this.r = 4;
43-
44-
if (gcsh.getType() == ScreenHandlerType.GENERIC_9X3){
45-
this.auctionStatus = AuctionStatus.CONFIRMING;
46-
} else this.auctionStatus = AuctionStatus.INIT;
47-
48-
clearAndInitWidgets(screenWidth, screenHeight);
4938
}
5039

5140
@Override
5241
protected void clearAndInitWidgets(int screenWidth, int screenHeight) {
5342
this.clearChildren();
43+
itemWidget = new ItemWidget(
44+
screenWidth / 2 - width / 2 + p + 2,
45+
screenHeight / 2 - height / 2 + p + 12 + p + 2,
46+
Items.AIR.getDefaultStack()
47+
);
48+
5449
leftClickableWidget = new ClickableWidget(
5550
screenWidth / 2 - width / 2 + p,
5651
screenHeight / 2 + height / 2 - p - (225 - 150 - 12 - p * 5) - screenHeight / 15,
@@ -144,19 +139,13 @@ public void onClick(double mouseX, double mouseY) {
144139
}
145140
};
146141

147-
itemWidget = new ItemWidget(
148-
screenWidth / 2 - width / 2 + p + 2,
149-
screenHeight / 2 - height / 2 + p + 12 + p + 2,
150-
Items.AIR.getDefaultStack()
151-
);
152-
153142
if (auctionStatus == AuctionStatus.CONFIRMING) setRightButtonConfig(AuctionStatus.CONFIRMING);
154143

155144
this.addDrawableChild(titleTextWidget);
156145
this.addDrawableChild(loreScrollableTextWidget);
157-
this.addDrawableChild(itemWidget);
158146
this.addDrawableChild(rightClickableWidget);
159147
this.addDrawableChild(leftClickableWidget);
148+
this.addDrawableChild(itemWidget);
160149
}
161150

162151
private AuctionStatus setAuctionStatus(Item item){

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

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.coflnet.gui.tfm;
22

33
import CoflCore.commands.models.ChatMessageData;
4+
import CoflCore.commands.models.FlipData;
5+
import com.coflnet.CoflModClient;
46
import com.coflnet.gui.AuctionStatus;
57
import com.coflnet.gui.BinGUI;
68
import com.coflnet.gui.RenderUtils;
@@ -15,6 +17,9 @@
1517
import net.minecraft.item.Items;
1618
import net.minecraft.text.Text;
1719

20+
import java.util.Arrays;
21+
import java.util.stream.Collectors;
22+
1823
public class TfmBinGUI extends BinGUI {
1924
public String lore = "";
2025

@@ -24,17 +29,26 @@ public class TfmBinGUI extends BinGUI {
2429
public ClickableWidget cancelClickableWidget;
2530

2631
public TfmBinGUI(GenericContainerScreen gcs){
27-
super(Text.of("Tfm Bin Gui"), gcs);
28-
29-
this.p = 1;
30-
this.r = 4;
31-
32-
clearAndInitWidgets(screenWidth, screenHeight);
32+
super(Text.of("Tfm Bin Gui"), gcs, 1, 4);
33+
34+
lore = "";
35+
if (flipData != null) {
36+
for (ChatMessageData message : flipData.Messages) {
37+
if (message.Text.contains("sellers ah")) break;
38+
lore += message.Text+"\n";
39+
};
40+
}
3341
}
3442

3543
@Override
3644
protected void clearAndInitWidgets(int screenWidth, int screenHeight) {
3745
clearChildren();
46+
itemWidget = new ItemWidget(
47+
screenWidth / 2 - 8,
48+
screenHeight / 2 - 8,
49+
Items.AIR.getDefaultStack()
50+
);
51+
3852
titleTextWidget = new TextWidget(
3953
screenWidth / 2 - width / 2 + 12,
4054
screenHeight / 2 - height / 2 + 8,
@@ -50,12 +64,6 @@ protected void clearAndInitWidgets(int screenWidth, int screenHeight) {
5064
MinecraftClient.getInstance().textRenderer
5165
).setCentered(false);
5266

53-
itemWidget = new ItemWidget(
54-
screenWidth / 2 - 8,
55-
screenHeight / 2 - 8,
56-
Items.AIR.getDefaultStack()
57-
);
58-
5967
confirmClickableWidget = new ClickableWidget(
6068
0, 0, screenWidth, screenHeight, Text.empty()
6169
) {
@@ -110,9 +118,9 @@ public void onClick(double mouseX, double mouseY) {
110118

111119
this.addDrawableChild(titleTextWidget);
112120
this.addDrawableChild(loreMultilineTextWidget);
113-
this.addDrawableChild(itemWidget);
114121
this.addDrawableChild(confirmClickableWidget);
115122
this.addDrawableChild(cancelClickableWidget);
123+
this.addDrawableChild(itemWidget);
116124
}
117125

118126
@Override

0 commit comments

Comments
 (0)