Skip to content

Commit 3bfb1ae

Browse files
iroot-workiroot-work
committed
Fix #10; Updated configs and altered/temporarily commented code to work with new version
1 parent 23180bf commit 3bfb1ae

File tree

9 files changed

+175
-129
lines changed

9 files changed

+175
-129
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'fabric-loom' version '1.7-SNAPSHOT'
2+
id 'fabric-loom' version '1.10-SNAPSHOT'
33
id 'maven-publish'
44
}
55

‎gradle.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ org.gradle.parallel=true
44

55
# Fabric Properties
66
# check these on https://fabricmc.net/develop
7-
minecraft_version=1.21.1
8-
yarn_mappings=1.21.1+build.3
9-
loader_version=0.16.2
7+
minecraft_version=1.21.5
8+
yarn_mappings=1.21.5+build.1
9+
loader_version=0.16.14
1010

1111
# Mod Properties
1212
mod_version=1.0.0
1313
maven_group=com.coflnet
1414
archives_base_name=coflmod
1515

1616
# Dependencies
17-
fabric_version=0.102.1+1.21.1
17+
fabric_version=0.126.0+1.21.5

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

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

Lines changed: 40 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
import net.minecraft.network.packet.s2c.play.ScoreboardScoreUpdateS2CPacket;
7676
import net.minecraft.registry.Registries;
7777
import net.minecraft.registry.entry.RegistryEntry;
78-
import net.minecraft.scoreboard.Scoreboard;
78+
import net.minecraft.scoreboard.*;
7979
import net.minecraft.screen.ScreenHandler;
8080
import net.minecraft.screen.ScreenHandlerListener;
8181
import net.minecraft.sound.SoundEvent;
@@ -126,6 +126,10 @@ public void onInitializeClient() {
126126
if(bestflipsKeyBinding.isPressed()) {
127127
if(counter == 0){
128128
EventRegistry.onOpenBestFlip(username, true);
129+
Scoreboard s = client.player.getScoreboard();
130+
System.out.println("---------------------------------------------------");
131+
CoflModClient.getScoreboard();
132+
System.out.println("---------------------------------------------------");
129133
}
130134
if(counter < 2) counter++;
131135
} else {
@@ -326,16 +330,42 @@ public static String getIdFromStack(ItemStack stack){
326330
}
327331

328332
public static void loadDescriptionsForInv(HandledScreen screen){
329-
DefaultedList<ItemStack> itemStacks = screen.getScreenHandler().getStacks();
330-
if (!MinecraftClient.getInstance().player.getInventory().getStack(8).getComponents().toString().contains("minecraft:custom_data=>{id:\"SKYBLOCK_MENU\"}")) return;
331-
DescriptionHandler.emptyTooltipData();
332-
DescriptionHandler.loadDescriptionForInventory(
333-
getItemIdsFromInventory(itemStacks),
334-
MinecraftClient.getInstance().currentScreen.getTitle().getLiteralString(),
335-
inventoryToNBT(itemStacks),
336-
MinecraftClient.getInstance().getSession().getUsername()
337-
);
333+
// DefaultedList<ItemStack> itemStacks = screen.getScreenHandler().getStacks();
334+
// if (!MinecraftClient.getInstance().player.getInventory().getStack(8).getComponents().toString().contains("minecraft:custom_data=>{id:\"SKYBLOCK_MENU\"}")) return;
335+
// DescriptionHandler.emptyTooltipData();
336+
// DescriptionHandler.loadDescriptionForInventory(
337+
// getItemIdsFromInventory(itemStacks),
338+
// MinecraftClient.getInstance().currentScreen.getTitle().getLiteralString(),
339+
// inventoryToNBT(itemStacks),
340+
// MinecraftClient.getInstance().getSession().getUsername()
341+
// );
338342
}
339343

344+
private static List<String> getScoreboard() {
345+
ArrayList<String> scoreboardAsText = new ArrayList<>();
346+
if (MinecraftClient.getInstance() == null || MinecraftClient.getInstance().world == null) {
347+
return scoreboardAsText;
348+
}
349+
Scoreboard scoreboard = MinecraftClient.getInstance().world.getScoreboard();
350+
ScoreboardObjective sideBarObjective = scoreboard.getObjectiveForSlot(ScoreboardDisplaySlot.SIDEBAR);
351+
if (sideBarObjective == null) {
352+
return scoreboardAsText;
353+
}
354+
String scoreboardTitle = sideBarObjective.getDisplayName().getString();
355+
//scoreboardTitle = EnumChatFormatting.getTextWithoutFormattingCodes(scoreboardTitle);
356+
scoreboardAsText.add(scoreboardTitle);
357+
Collection<ScoreHolder> scoreboardLines = scoreboard.getKnownScoreHolders();
358+
for (ScoreHolder line : scoreboardLines) {
359+
String playerName = line.getDisplayName().getString();
360+
if (playerName == null || playerName.startsWith("#")) {
361+
continue;
362+
}
363+
Team scorePlayerTeam = scoreboard.getTeam(playerName);
364+
String lineText = Team.decorateName(scorePlayerTeam, Text.of(playerName)).getString();
365+
scoreboardAsText.add(lineText);
366+
System.out.println(lineText);
367+
}
368+
return scoreboardAsText;
369+
}
340370
}
341371

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,30 @@
66
import net.minecraft.text.MutableText;
77
import net.minecraft.text.Text;
88

9+
import java.net.URI;
10+
import java.net.URISyntaxException;
11+
import java.net.URL;
12+
913
public class Utils {
1014
public static MutableText ChatComponent(ChatMessage cmd) {
1115
MutableText message = Text.literal(cmd.getText());
1216
if (cmd.getOnClick() != null) {
1317
if (cmd.getOnClick().startsWith("http")) {
14-
message.styled((style) -> style.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, cmd.getOnClick())));
18+
message.styled((style) -> {
19+
try {
20+
return style.withClickEvent(new ClickEvent.OpenUrl(URI.create(cmd.getOnClick())));
21+
} catch (Exception e) {
22+
System.out.println("Error occurred while parsing URI");
23+
return style;
24+
}
25+
});
1526
} else {
16-
message.styled((style) -> style.withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, cmd.getOnClick().replace("viewauction", "cofl openauctiongui"))));
27+
message.styled((style) -> style.withClickEvent(new ClickEvent.RunCommand(cmd.getOnClick())));
1728
}
1829
}
1930

2031
if (cmd.getHover() != null && !cmd.getHover().isEmpty()) {
21-
message.styled((style) -> style.withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Text.of(cmd.getHover()))));
32+
message.styled((style) -> style.withHoverEvent(new HoverEvent.ShowText(Text.of(cmd.getHover()))));
2233
}
2334
return message;
2435
}

‎src/client/java/com/coflnet/gui/RenderUtils.java‎

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

33
import com.mojang.blaze3d.systems.RenderSystem;
4+
import com.mojang.blaze3d.vertex.VertexFormat;
5+
import net.fabricmc.fabric.impl.renderer.RendererManager;
46
import net.minecraft.client.MinecraftClient;
57
import net.minecraft.client.font.TextRenderer;
68
import net.minecraft.client.gui.DrawContext;
@@ -37,8 +39,7 @@ public static void drawRect(DrawContext context, float x, float y, float width,
3739
buffer.vertex(context.getMatrices().peek().getPositionMatrix(), x + width, y + height, z).color(color);
3840
buffer.vertex(context.getMatrices().peek().getPositionMatrix(), x + width, y, z).color(color);
3941

40-
RenderSystem.setShader(GameRenderer::getPositionColorProgram);
41-
BufferRenderer.drawWithGlobalProgram(buffer.end());
42+
RenderLayer.getGui().draw(buffer.end()); // drawWithGlobalProgram(buffer.end());
4243
}
4344

4445

@@ -50,7 +51,7 @@ public static void drawRectOutline(DrawContext context, int x, int y, int width,
5051

5152
//draws a circle with a given radius and thickness
5253
public static void drawCircle(DrawContext context, int x, int y, int radius, int color) {
53-
buffer = tessellator.begin(VertexFormat.DrawMode.TRIANGLE_FAN, VertexFormats.POSITION_COLOR);
54+
buffer = tessellator.begin(VertexFormat.DrawMode.TRIANGLE_STRIP, VertexFormats.POSITION_COLOR);
5455

5556
for (int i = 0; i <= 360; i++) {
5657
buffer.vertex(
@@ -61,11 +62,11 @@ public static void drawCircle(DrawContext context, int x, int y, int radius, int
6162
).color(color);
6263
}
6364

64-
RenderSystem.setShader(GameRenderer::getPositionColorProgram);
65-
//RenderSystem.setShaderColor(0.0F, 0.0F, 0.0F, 0.0F);
66-
67-
BufferRenderer.drawWithGlobalProgram(buffer.end());
65+
//RenderSystem.setShader(GameRenderer::getPositionColorProgram);
66+
//RenderSystem.setShaderColor(0.0F, 0.0F, 0.0F, 1.0F);
6867

68+
//BufferRenderer.drawWithGlobalProgram(buffer.end());
69+
RenderLayer.getGui().draw(buffer.end());
6970
}
7071

7172
//draws a circle outline with a given radius and thickness
@@ -131,9 +132,11 @@ public static void drawArc(DrawContext context, int x, int y, int radius, int st
131132
z
132133
).color(color);
133134
}
134-
RenderSystem.setShader(GameRenderer::getPositionColorProgram);
135+
136+
//RenderSystem.setShader(GameRenderer::getPositionColorProgram);
135137
//RenderSystem.setShaderColor(0.0F, 0.0F, 0.0F, 0.0F);
136-
BufferRenderer.drawWithGlobalProgram(buffer.end());
138+
//BufferRenderer.drawWithGlobalProgram(buffer.end());
139+
RenderLayer.getGui().draw(buffer.end());
137140
}
138141

139142

@@ -149,9 +152,10 @@ public static void drawLoadingCircle(DrawContext context, float x, float y, floa
149152
z
150153
).color(color);
151154
}
152-
RenderSystem.setShader(GameRenderer::getPositionColorProgram);
155+
//RenderSystem.setShader(GameRenderer::getPositionColorProgram);
153156
//RenderSystem.setShaderColor(0.0F, 0.0F, 0.0F, 0.0F);
154-
BufferRenderer.drawWithGlobalProgram(buffer.end());
157+
//BufferRenderer.drawWithGlobalProgram(buffer.end());
158+
RenderLayer.getGui().draw(buffer.end());
155159
}
156160

157161
//draws a rounded rectangle with a given radius and color and size

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.coflnet.gui.BinGUI;
55
import com.coflnet.gui.RenderUtils;
66
import com.coflnet.gui.widget.ItemWidget;
7-
import com.coflnet.gui.widget.ScrollableDynamicTextWidget;
7+
//import com.coflnet.gui.widget.ScrollableDynamicTextWidget;
88
import net.minecraft.client.MinecraftClient;
99
import net.minecraft.client.gui.DrawContext;
1010
import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;
@@ -20,7 +20,7 @@
2020

2121
public class CoflBinGUI extends BinGUI {
2222
private TextWidget titleTextWidget;
23-
private ScrollableDynamicTextWidget loreScrollableTextWidget;
23+
private ScrollableTextWidget loreScrollableTextWidget;
2424
private ClickableWidget rightClickableWidget;
2525
private ClickableWidget leftClickableWidget;
2626

@@ -119,7 +119,7 @@ public void onClick(double mouseX, double mouseY) {
119119
MinecraftClient.getInstance().textRenderer
120120
).alignLeft();
121121

122-
loreScrollableTextWidget = new ScrollableDynamicTextWidget(
122+
loreScrollableTextWidget = new ScrollableTextWidget(
123123
screenWidth / 2 - width / 2 + p + 20 + p + 4,
124124
screenHeight / 2 - height / 2 + p + 12 + p + 2,
125125
width - 20 - p*4 - 4, height - 75 - 2 - screenHeight / 15 - 2,
@@ -187,7 +187,7 @@ public void renderBackground(DrawContext drawContext, int mouseX, int mouseY, fl
187187
if (gcsh.getInventory().getStack(ITEM_SLOT).getItem() != Items.AIR) {
188188
setItem(gcsh.getInventory().getStack(ITEM_SLOT));
189189
lore = convertTextList(getTooltipFromItem(MinecraftClient.getInstance(), currentItem));
190-
loreScrollableTextWidget.updateText(lore == null ? Text.empty() : lore);
190+
loreScrollableTextWidget.setMessage(lore == null ? Text.empty() : lore);
191191
}
192192

193193
if (gcsh.getInventory()

0 commit comments

Comments
 (0)