Skip to content

Commit da6473e

Browse files
committed
feat: Add 1.21.7 support. Fixes #69
1 parent 39edda0 commit da6473e

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.github/workflows/build_publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ jobs:
3434
- name: build
3535
run: ./gradlew build
3636
- name: upload to modrinth
37-
if: "github.ref == 'refs/heads/multi/1.21.5' && !contains(github.event.head_commit.message, 'upload skip')"
37+
if: "contains(github.ref, '1.21.7') && !contains(github.event.head_commit.message, 'upload skip')"
3838
run: ./gradlew modrinth
3939
env:
4040
MODRINTH_TOKEN: ${{ secrets.MODRINTH_UPLOAD_TOKEN }}
4141
GITHUB_RUN_NUMBER: ${{ github.run_number }}
4242
GITHUB_EVENT_RAW_PATH: ${{ github.event_path }}
4343
- name: upload to curseforge
44-
if: "github.ref == 'refs/heads/multi/1.21.5' && !contains(github.event.head_commit.message, 'upload skip')"
44+
if: "contains(github.ref, '1.21.7') && !contains(github.event.head_commit.message, 'upload skip')"
4545
run: ./gradlew publishCurseForge
4646
env:
4747
CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_UPLOAD_TOKEN }}

common/src/main/java/de/rafael/modflared/mixin/client/ServerEntryMixin.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import de.rafael.modflared.Modflared;
44
import de.rafael.modflared.interfaces.mixin.IServerInfo;
55
import de.rafael.modflared.tunnel.TunnelStatus;
6+
import net.minecraft.client.gl.RenderPipelines;
67
import net.minecraft.client.gui.DrawContext;
78
import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
89
import net.minecraft.client.gui.screen.multiplayer.MultiplayerServerListWidget;
@@ -26,7 +27,6 @@
2627
public abstract class ServerEntryMixin {
2728

2829
@Shadow @Final private ServerInfo server;
29-
@Shadow @Final private MultiplayerScreen screen;
3030

3131
@Unique
3232
private static final Identifier MODFLARED_INDICATOR_TEXTURE = Identifier.of(Modflared.MOD_ID, "icon/indicator");
@@ -37,13 +37,13 @@ public void render(@NotNull DrawContext context, int index, int y, int x, int en
3737
if(tunnelStatus != null && tunnelStatus.state() == TunnelStatus.State.USE) {
3838
int xOffset = entryWidth - 15;
3939
int yOffset = 10 + 1;
40-
context.drawGuiTexture(RenderLayer::getGuiTextured, MODFLARED_INDICATOR_TEXTURE, x + xOffset, y + yOffset, 10, 10);
40+
context.drawGuiTexture(RenderPipelines.GUI_TEXTURED, MODFLARED_INDICATOR_TEXTURE, x + xOffset, y + yOffset, 10, 10);
4141

4242
// Tooltip
4343
int l = mouseX - x;
4444
int m = mouseY - y;
4545
if (l >= entryWidth - 15 && l <= entryWidth - 5 && m >= 9 && m <= 9 + 10) {
46-
this.screen.setTooltip(Collections.singletonList(Text.translatable("gui.multiplayer.tunnel.status.0").formatted(Formatting.AQUA).asOrderedText()));
46+
context.drawTooltip(Text.translatable("gui.multiplayer.tunnel.status.0").formatted(Formatting.AQUA), mouseX, mouseY);
4747
}
4848
}
4949
}

gradle.properties

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ org.gradle.jvmargs=-Xmx4G
33
org.gradle.parallel=true
44

55
# Game Properties
6-
minecraft_version=1.21.5
7-
yarn_version=1.21.5+build.1
6+
minecraft_version=1.21.7
7+
yarn_version=1.21.7+build.2
88
yarn_mappings_patch=1.21+build.4
99
enabled_platforms=fabric,neoforge
1010

1111
# Mod Properties
1212
archives_base_name=modflared
13-
mod_version=1.3.0
13+
mod_version=1.4.0
1414
maven_group=de.rafael
15-
mod_minecraft_version=1.21.5
15+
mod_minecraft_version=1.21.7
1616

1717
# Loader Properties
1818
fabric_loader_version=0.16.14
19-
fabric_api_version=0.128.1+1.21.5
20-
neoforge_version=21.5.81
19+
fabric_api_version=0.128.1+1.21.7
20+
neoforge_version=21.7.1-beta
2121

2222
# Modrinth Properties
2323
modrinth_project_id=modflared

0 commit comments

Comments
 (0)