Skip to content

Commit bd8468e

Browse files
jumpcutfindojumpcutfindo
authored
Merge pull request #6 from jumpcutfindo/1.21.9
feat: 1.21.9
2 parents 62c07eb + 573abbb commit bd8468e

21 files changed

Lines changed: 103 additions & 91 deletions

‎gradle.properties‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ https.protocols=TLSv1.2,TLSv1.3
44
org.gradle.parallel=true
55
# Fabric Properties
66
# check these on https://fabricmc.net/develop
7-
minecraft_version=1.21.6
8-
yarn_mappings=1.21.6+build.1
7+
minecraft_version=1.21.9
8+
yarn_mappings=1.21.9+build.1
99
loader_version=0.17.3
10-
loom_version=1.11-SNAPSHOT
10+
loom_version=1.12-SNAPSHOT
1111
# Mod Properties
12-
mod_version=1.0.2-1.21.6
12+
mod_version=1.0.2-1.21.9
1313
maven_group=com.jumpcutfindo
1414
archives_base_name=onmymark
1515
# Dependencies
1616
# Fabric API
17-
fabric_version=0.128.2+1.21.6
17+
fabric_version=0.134.0+1.21.9
1818
# modmenu
19-
modmenu_version=15.0.0-beta.3
19+
modmenu_version=16.0.0-rc.1
2020
# owo-lib
2121
# https://maven.wispforest.io/io/wispforest/owo-lib/
22-
owo_version=0.12.21+1.21.6
22+
owo_version=0.12.22+1.21.9

‎src/main/java/com/jumpcutfindo/onmymark/OnMyMarkConfigModel.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,7 @@ public class OnMyMarkConfigModel {
5757
@RangeConstraint(min = 1, max = 86400)
5858
@Sync(Option.SyncMode.OVERRIDE_CLIENT)
5959
public long playerMarkerLifetimeSecs = PlayerMarkerRenderer.DEFAULT_LIFETIME_SECS;
60+
61+
@Sync(Option.SyncMode.OVERRIDE_CLIENT)
62+
public boolean enableReportingMessages = true;
6063
}

‎src/main/java/com/jumpcutfindo/onmymark/client/graphics/markers/MarkerRenderer.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
import net.minecraft.client.MinecraftClient;
99
import net.minecraft.client.gui.DrawContext;
1010
import net.minecraft.client.gui.PlayerSkinDrawer;
11-
import net.minecraft.client.util.SkinTextures;
11+
import net.minecraft.client.util.DefaultSkinHelper;
12+
import net.minecraft.entity.player.SkinTextures;
1213
import net.minecraft.util.Colors;
1314
import net.minecraft.util.math.ColorHelper;
1415
import net.minecraft.util.math.MathHelper;
@@ -47,9 +48,7 @@ protected MarkerRenderer(MinecraftClient client, Marker marker, PointerShape poi
4748

4849
this.creationTime = Instant.now();
4950

50-
this.playerSkinTextures = MinecraftClient.getInstance()
51-
.getSkinProvider()
52-
.getSkinTextures(
51+
this.playerSkinTextures = DefaultSkinHelper.getSkinTextures(
5352
((ClientPartyMember)marker.owner()).gameProfile()
5453
);
5554
}
@@ -101,7 +100,7 @@ public void renderTick(DrawContext drawContext, float tickDelta, float fovDegree
101100
screenPosNormal = RenderMath.getNormalToEllipse(centerX, centerY, clampWidth / 2f, clampHeight / 2f, screenPos.x(), screenPos.y());
102101

103102
// Calculate and store distance from player
104-
this.distanceFromPlayer = this.client.player.getPos().distanceTo(this.getWorldPos());
103+
this.distanceFromPlayer = this.client.player.getEntityPos().distanceTo(this.getWorldPos());
105104
}
106105

107106
private void clampScreenPosToCircle(DrawContext drawContext) {
@@ -255,7 +254,7 @@ private void drawPlayerHead(DrawContext drawContext, float screenX, float screen
255254
int headScreenY = (int) (screenY - headSize / 2);
256255

257256
if (this.playerSkinTextures != null) {
258-
PlayerSkinDrawer.draw(drawContext, this.playerSkinTextures.texture(), headScreenX, headScreenY, (int) headSize, false, false, -1);
257+
PlayerSkinDrawer.draw(drawContext, this.playerSkinTextures.body().texturePath(), headScreenX, headScreenY, (int) headSize, false, false, -1);
259258
}
260259
}
261260

‎src/main/java/com/jumpcutfindo/onmymark/client/graphics/render/SolidQuadGuiElementRenderState.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ private static ScreenRect createBounds(int x0, int y0, int x1, int y1, int x2, i
3333
}
3434

3535
@Override
36-
public void setupVertices(VertexConsumer vertices, float depth) {
37-
vertices.vertex(this.pose(), (float) this.x0(), (float) this.y0(), depth).color(this.argb());
38-
vertices.vertex(this.pose(), (float) this.x3(), (float) this.y3(), depth).color(this.argb());
39-
vertices.vertex(this.pose(), (float) this.x2(), (float) this.y2(), depth).color(this.argb());
40-
vertices.vertex(this.pose(), (float) this.x1(), (float) this.y1(), depth).color(this.argb());
36+
public void setupVertices(VertexConsumer vertices) {
37+
vertices.vertex(this.pose(), (float) this.x0(), (float) this.y0()).color(this.argb());
38+
vertices.vertex(this.pose(), (float) this.x3(), (float) this.y3()).color(this.argb());
39+
vertices.vertex(this.pose(), (float) this.x2(), (float) this.y2()).color(this.argb());
40+
vertices.vertex(this.pose(), (float) this.x1(), (float) this.y1()).color(this.argb());
4141
}
4242

4343
@Override

‎src/main/java/com/jumpcutfindo/onmymark/client/graphics/render/SolidTriangleGuiElementRenderState.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ private static ScreenRect createBounds(int x0, int y0, int x1, int y1, int x2, i
3333
}
3434

3535
@Override
36-
public void setupVertices(VertexConsumer vertices, float depth) {
37-
vertices.vertex(this.pose(), (float) this.x0(), (float) this.y0(), depth).color(this.argb());
38-
vertices.vertex(this.pose(), (float) this.x2(), (float) this.y2(), depth).color(this.argb());
39-
vertices.vertex(this.pose(), (float) this.x1(), (float) this.y1(), depth).color(this.argb());
40-
vertices.vertex(this.pose(), (float) this.x1(), (float) this.y1(), depth).color(this.argb());
36+
public void setupVertices(VertexConsumer vertices) {
37+
vertices.vertex(this.pose(), (float) this.x0(), (float) this.y0()).color(this.argb());
38+
vertices.vertex(this.pose(), (float) this.x2(), (float) this.y2()).color(this.argb());
39+
vertices.vertex(this.pose(), (float) this.x1(), (float) this.y1()).color(this.argb());
40+
vertices.vertex(this.pose(), (float) this.x1(), (float) this.y1()).color(this.argb());
4141
}
4242

4343
@Override

‎src/main/java/com/jumpcutfindo/onmymark/client/graphics/screen/OnMyMarkScreen.java‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
import com.jumpcutfindo.onmymark.client.graphics.screen.utils.ScreenUtils;
44
import com.jumpcutfindo.onmymark.client.input.InputListener;
55
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
6+
import net.minecraft.client.gui.Click;
67
import net.minecraft.client.gui.DrawContext;
78
import net.minecraft.client.gui.screen.Screen;
9+
import net.minecraft.client.input.CharInput;
10+
import net.minecraft.client.input.KeyInput;
811
import net.minecraft.entity.player.PlayerEntity;
912
import net.minecraft.text.Text;
1013
import org.lwjgl.glfw.GLFW;
@@ -43,21 +46,21 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) {
4346
}
4447

4548
@Override
46-
public boolean mouseClicked(double mouseX, double mouseY, int button) {
49+
public boolean mouseClicked(Click click, boolean doubled) {
4750
if (this.activeWindow != null) {
48-
return this.activeWindow.mouseClicked((int) mouseX, (int) mouseY, button);
51+
return this.activeWindow.mouseClicked(click, doubled);
4952
}
5053

51-
return super.mouseClicked(mouseX, mouseY, button);
54+
return super.mouseClicked(click, doubled);
5255
}
5356

5457
@Override
55-
public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
58+
public boolean mouseDragged(Click click, double offsetX, double offsetY) {
5659
if (this.activeWindow != null) {
57-
return this.activeWindow.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
60+
return this.activeWindow.mouseDragged(click, offsetX, offsetY);
5861
}
5962

60-
return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
63+
return super.mouseDragged(click, offsetX, offsetY);
6164
}
6265

6366
@Override
@@ -70,32 +73,32 @@ public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmou
7073
}
7174

7275
@Override
73-
public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
74-
if (keyCode == GLFW.GLFW_KEY_ESCAPE && this.activeWindow != null) {
76+
public boolean keyPressed(KeyInput input) {
77+
if (input.getKeycode() == GLFW.GLFW_KEY_ESCAPE && this.activeWindow != null) {
7578
if (isStandalone) close();
7679
this.activeWindow = null;
7780
return true;
7881
}
7982

80-
if (keyCode == KeyBindingHelper.getBoundKeyOf(InputListener.GUI_BINDING).getCode() && this.activeWindow == null) {
83+
if (input.getKeycode() == KeyBindingHelper.getBoundKeyOf(InputListener.GUI_BINDING).getCode() && this.activeWindow == null) {
8184
close();
8285
return true;
8386
}
8487

8588
if (this.activeWindow != null) {
86-
return this.activeWindow.keyPressed(keyCode, scanCode, modifiers);
89+
return this.activeWindow.keyPressed(input);
8790
}
8891

89-
return super.keyPressed(keyCode, scanCode, modifiers);
92+
return super.keyPressed(input);
9093
}
9194

9295
@Override
93-
public boolean charTyped(char chr, int modifiers) {
96+
public boolean charTyped(CharInput charInput) {
9497
if (this.activeWindow != null) {
95-
return this.activeWindow.charTyped(chr, modifiers);
98+
return this.activeWindow.charTyped(charInput);
9699
}
97100

98-
return super.charTyped(chr, modifiers);
101+
return super.charTyped(charInput);
99102
}
100103

101104
@Override

‎src/main/java/com/jumpcutfindo/onmymark/client/graphics/screen/party/PartyInviteWindow.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
import com.jumpcutfindo.onmymark.client.network.ClientNetworkSender;
99
import com.jumpcutfindo.onmymark.client.party.ClientPartyMember;
1010
import com.jumpcutfindo.onmymark.party.PartyInvite;
11-
import net.minecraft.client.MinecraftClient;
1211
import net.minecraft.client.font.TextRenderer;
1312
import net.minecraft.client.gl.RenderPipelines;
1413
import net.minecraft.client.gui.DrawContext;
1514
import net.minecraft.client.gui.Element;
1615
import net.minecraft.client.gui.PlayerSkinDrawer;
17-
import net.minecraft.client.util.SkinTextures;
16+
import net.minecraft.client.util.DefaultSkinHelper;
17+
import net.minecraft.entity.player.SkinTextures;
1818
import net.minecraft.text.OrderedText;
1919
import net.minecraft.text.Text;
2020
import net.minecraft.text.TextColor;
@@ -50,9 +50,7 @@ public PartyInviteWindow(OnMyMarkScreen screen, PartyInvite<ClientPartyMember> p
5050
this.screen.setActiveWindow(null);
5151
});
5252

53-
this.inviterSkinTextures = MinecraftClient.getInstance()
54-
.getSkinProvider()
55-
.getSkinTextures(
53+
this.inviterSkinTextures = DefaultSkinHelper.getSkinTextures(
5654
partyInvite.from().gameProfile()
5755
);
5856
}
@@ -70,7 +68,7 @@ public void renderContent(DrawContext context, int mouseX, int mouseY) {
7068
context.getMatrices().pushMatrix();
7169
context.getMatrices().scale(2F, 2F);
7270

73-
PlayerSkinDrawer.draw(context, this.inviterSkinTextures.texture(), (x + (WINDOW_WIDTH - 24) / 2) / 2, (y + 10) / 2, 12, false, false, -1);
71+
PlayerSkinDrawer.draw(context, this.inviterSkinTextures.body().texturePath(), (x + (WINDOW_WIDTH - 24) / 2) / 2, (y + 10) / 2, 12, false, false, -1);
7472
context.getMatrices().popMatrix();
7573

7674
Text inviterName = Text.literal(this.partyInvite.from().displayName()).styled(style -> style.withBold(true));

‎src/main/java/com/jumpcutfindo/onmymark/client/graphics/screen/party/PartyMemberListItem.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import net.minecraft.client.gui.PlayerSkinDrawer;
1414
import net.minecraft.client.texture.PlayerSkinProvider;
1515
import net.minecraft.client.util.DefaultSkinHelper;
16-
import net.minecraft.client.util.SkinTextures;
16+
import net.minecraft.entity.player.SkinTextures;
1717
import net.minecraft.text.Text;
1818
import net.minecraft.util.Colors;
1919
import net.minecraft.util.Identifier;
@@ -38,9 +38,7 @@ public PartyMemberListItem(OnMyMarkScreen screen, ClientPartyMember partyMember,
3838
this.item = partyMember;
3939
this.index = index;
4040

41-
this.playerSkinTextures = MinecraftClient.getInstance()
42-
.getSkinProvider()
43-
.getSkinTextures(
41+
this.playerSkinTextures = DefaultSkinHelper.getSkinTextures(
4442
partyMember.gameProfile()
4543
);
4644
}
@@ -53,7 +51,7 @@ private static Supplier<SkinTextures> texturesSupplier(GameProfile profile) {
5351
PlayerSkinProvider playerSkinProvider = minecraftClient.getSkinProvider();
5452

5553
CompletableFuture<Optional<SkinTextures>> completableFuture = playerSkinProvider.fetchSkinTextures(profile);
56-
boolean bl = !minecraftClient.uuidEquals(profile.getId());
54+
boolean bl = !minecraftClient.uuidEquals(profile.id());
5755
SkinTextures skinTextures = DefaultSkinHelper.getSkinTextures(profile);
5856

5957
return () -> {
@@ -83,7 +81,7 @@ public void renderContent(DrawContext context, int x, int y, int mouseX, int mou
8381

8482
// Draw player icon
8583
if (this.playerSkinTextures != null) {
86-
PlayerSkinDrawer.draw(context, this.playerSkinTextures.texture(), x + 11, y + 3, 12, false, false, -1);
84+
PlayerSkinDrawer.draw(context, this.playerSkinTextures.body().texturePath(), x + 11, y + 3, 12, false, false, -1);
8785
}
8886

8987
// Draw crown if party leader

‎src/main/java/com/jumpcutfindo/onmymark/client/graphics/screen/party/PartyScreen.java‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.jumpcutfindo.onmymark.party.Party;
1010
import com.jumpcutfindo.onmymark.party.PartyInvite;
1111
import com.jumpcutfindo.onmymark.party.PartyMember;
12+
import net.minecraft.client.gui.Click;
1213
import net.minecraft.client.gui.DrawContext;
1314
import net.minecraft.text.Text;
1415

@@ -143,44 +144,44 @@ private void drawButtonTooltips(DrawContext context, int mouseX, int mouseY) {
143144
}
144145

145146
@Override
146-
public boolean mouseClicked(double mouseX, double mouseY, int button) {
147+
public boolean mouseClicked(Click click, boolean doubled) {
147148
if (isWindowOpen()) {
148-
return super.mouseClicked(mouseX, mouseY, button);
149+
return super.mouseClicked(click, doubled);
149150
}
150151

151-
if (isMouseInList(mouseX, mouseY)) {
152-
return this.partyMemberListView.mouseClicked((int) mouseX, (int) mouseY, button);
152+
if (isMouseInList(click.x(), click.y())) {
153+
return this.partyMemberListView.mouseClicked((int) click.x(), (int) click.y(), click.button());
153154
}
154155

155156
switch (this.state) {
156157
case NO_PARTY -> {
157-
return this.createPartyButton.mouseClicked((int) mouseX, (int) mouseY, button);
158+
return this.createPartyButton.mouseClicked((int) click.x(), (int) click.y(), click.button());
158159
}
159160
case IN_PARTY_AS_MEMBER -> {
160-
return this.leavePartyButton.mouseClicked((int) mouseX, (int) mouseY, button)
161-
|| this.selectMarkerColorButton.mouseClicked((int) mouseX, (int) mouseY, button);
161+
return this.leavePartyButton.mouseClicked((int) click.x(), (int) click.y(), click.button())
162+
|| this.selectMarkerColorButton.mouseClicked((int) click.x(), (int) click.y(), click.button());
162163
}
163164
case IN_PARTY_AS_LEADER -> {
164-
return this.invitePlayerButton.mouseClicked((int) mouseX, (int) mouseY, button)
165-
|| this.leavePartyButton.mouseClicked((int) mouseX, (int) mouseY, button)
166-
|| this.selectMarkerColorButton.mouseClicked((int) mouseX, (int) mouseY, button);
165+
return this.invitePlayerButton.mouseClicked((int) click.x(), (int) click.y(), click.button())
166+
|| this.leavePartyButton.mouseClicked((int) click.x(), (int) click.y(), click.button())
167+
|| this.selectMarkerColorButton.mouseClicked((int) click.x(), (int) click.y(), click.button());
167168
}
168169
case IN_PARTY_AS_LEADER_MEMBER_SELECTED -> {
169-
return this.kickPlayerButton.mouseClicked((int) mouseX, (int) mouseY, button);
170+
return this.kickPlayerButton.mouseClicked((int) click.x(), (int) click.y(), click.button());
170171
}
171172
}
172173

173174
return false;
174175
}
175176

176177
@Override
177-
public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
178+
public boolean mouseDragged(Click click, double offsetX, double offsetY) {
178179
if (isWindowOpen()) {
179-
return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
180+
return super.mouseDragged(click, offsetX, offsetY);
180181
}
181182

182-
if (isMouseInList(mouseX, mouseY)) {
183-
return this.partyMemberListView.mouseDragged((int) mouseX, (int) mouseY, button, deltaX, deltaY);
183+
if (isMouseInList(click.x(), click.y())) {
184+
return this.partyMemberListView.mouseDragged((int) click.x(), (int) click.y(), click.button(), offsetX, offsetY);
184185
}
185186

186187
return false;

‎src/main/java/com/jumpcutfindo/onmymark/client/graphics/utils/DrawUtils.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ public static void drawItemTiled(DrawContext drawContext, ItemStack stack, int x
2525
// Draw a square outline
2626
if (OnMyMarkMod.CONFIG.isIconTileVisible()) {
2727
drawContext.fill(x - 1, y - 1, x + 17, y + 17, backgroundColor);
28-
drawContext.drawBorder(x - 1, y - 1, 18, 18, borderColor);
28+
drawContext.drawStrokedRectangle(x - 1, y - 1, 18, 18, borderColor);
29+
30+
drawContext.drawDeferredElements();
2931
}
3032

3133
// Draw item normally

0 commit comments

Comments
 (0)