Skip to content

Commit 17e9bd8

Browse files
committed
feat!: Support MC 1.21|1.20.6 & Drop support for MC 1.20.(2|4)
Signed-off-by: MSDNicrosoft <wang3311835119@hotmail.com>
1 parent 760bf69 commit 17e9bd8

7 files changed

Lines changed: 52 additions & 45 deletions

File tree

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ preprocess {
1212
def mc1192 = createNode("1.19.2", 1_19_02, "mojang")
1313
def mc1193 = createNode("1.19.3", 1_19_03, "mojang")
1414
def mc1194 = createNode("1.19.4", 1_19_04, "mojang")
15-
def mc1202 = createNode("1.20.2", 1_20_02, "mojang")
16-
def mc1204 = createNode("1.20.4", 1_20_04, "mojang")
15+
def mc1206 = createNode("1.20.6", 1_20_06, "mojang")
16+
def mc1210 = createNode("1.21", 1_21_00, "mojang")
1717

1818
mc1165.link(mc1171, null)
1919
mc1171.link(mc1182, null)
2020
mc1182.link(mc1192, null)
2121
mc1192.link(mc1193, null)
2222
mc1193.link(mc1194, null)
23-
mc1194.link(mc1202, null)
24-
mc1202.link(mc1204, null)
23+
mc1194.link(mc1206, null)
24+
mc1206.link(mc1210, null)
2525
}
2626

2727
def ENV = System.getenv()

settings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"1.19.2",
77
"1.19.3",
88
"1.19.4",
9-
"1.20.2",
10-
"1.20.4"
9+
"1.20.6",
10+
"1.21"
1111
]
1212
}

src/main/java/work/msdnicrosoft/commandbuttons/gui/WrapperCommandGUIScreen.java

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,23 @@ public void renderBackground(
4545
//#endif
4646
//#endif
4747
) {
48-
if (this.minecraft != null && this.minecraft.level == null) {
49-
this.renderDirtBackground(
50-
//#if MC > 11904
51-
guiGraphics
52-
//#elseif MC > 11903
53-
//$$ poseStack
54-
//#else
55-
//$$ vOffset
56-
//#endif
57-
);
48+
if (this.minecraft != null) {
49+
//#if MC >= 11906
50+
if (this.minecraft.level != null) {
51+
this.renderBlurredBackground(0.32F);
52+
}
53+
this.renderMenuBackground(guiGraphics);
54+
//#else
55+
//$$ this.renderDirtBackground(
56+
//#if MC > 11904
57+
//$$ guiGraphics
58+
//#elseif MC > 11903
59+
//$$ poseStack
60+
//#else
61+
//$$ vOffset
62+
//#endif
63+
//$$ );
64+
//#endif
5865
}
5966
}
6067

versions/1.20.2/gradle.properties

Lines changed: 0 additions & 19 deletions
This file was deleted.

versions/1.20.6/gradle.properties

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Independent branch configuration for MC 1.20.4
2+
# Development Environment
3+
minecraft_dependency=1.20.6
4+
minecraft_version=1.20.6
5+
minecraft_out=1.20.6
6+
7+
# Required Libraries
8+
# FabricAPI 0.100.4+1.20.6
9+
fabric_version=0.100.4+1.20.6
10+
11+
# LibGui 10.0.0+1.20.6
12+
libgui_version=10.0.0+1.20.6
13+
14+
# Runtime Libraries - Only for development environment
15+
# Mod Menu - 10.0.0
16+
modmenu_version=10.0.0
17+
18+
# Smooth Boot - No longer needed since MC 1.20
19+
smoothboot_version=0
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
# Independent branch configuration for MC 1.20.4
22
# Development Environment
3-
minecraft_dependency=1.20.4
4-
minecraft_version=1.20.4
5-
minecraft_out=1.20.4
3+
minecraft_dependency=1.21
4+
minecraft_version=1.21
5+
minecraft_out=1.21
66

77
# Required Libraries
8-
# FabricAPI 0.95.4+1.20.4
9-
fabric_version=0.95.4+1.20.4
8+
# FabricAPI 0.100.4+1.21
9+
fabric_version=0.100.4+1.21
1010

11-
# LibGui 9.2.2+1.20.2
12-
libgui_version=9.2.2+1.20.2
11+
# LibGui 11.0.0+1.21
12+
libgui_version=11.0.0+1.21
1313

1414
# Runtime Libraries - Only for development environment
15-
# Mod Menu - 9.0.0
16-
modmenu_version=9.0.0
15+
# Mod Menu - 11.0.1
16+
modmenu_version=11.0.1
1717

1818
# Smooth Boot - No longer needed since MC 1.20
1919
smoothboot_version=0

versions/mainProject

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.20.2
1+
1.21

0 commit comments

Comments
 (0)