Merge pull request #51 from Hendrix-Shen/feature-1.20.2

Author: MSDNicrosoft

README.md

@@ -36,7 +36,8 @@ For your convenience, download links are listed below:
 | 1.19.2            | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.19.2) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.19.2) | 6.4.0 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/6.4.0) |
 | 1.19.3            | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.19.3) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.19.3) | 6.5.3 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/6.5.3) |
 | 1.19.4            | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.19.4) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.19.4) | 7.1.1 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/7.1.1) |
-| 1.20.1            | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.20.1) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.20.1) | 8.0.1 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/8.0.1) |
+| 1.20.1            | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.20.1) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.20.1) | 8.1.0 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/8.1.0) |
+| 1.20.2            | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.20.2) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.20.2) | 9.0.0 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/9.0.0) |
 
 ## Features
 
@@ -64,7 +65,7 @@ commands into the JSON as new buttons are created, and loads the JSON at the nex
 
 ## Support
 
-Current main development for Minecraft version: `1.20.1`
+Current main development for Minecraft version: `1.20.2`
 
 And use `preprocess` to be compatible with the following versions.
 
@@ -79,6 +80,7 @@ And use `preprocess` to be compatible with the following versions.
 - Minecraft `1.19.3`
 - Minecraft `1.19.4`
 - Minecraft `1.20.1`
+- Minecraft `1.20.2`
 
 ### Mappings
 

README_ZH_CN.md

@@ -34,7 +34,8 @@ Command GUI Buttons 是 Minecraft 的 Fabric 模组，允许用户在其客户
 | 1.19.2       | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.19.2) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.19.2) | 6.4.0 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/6.4.0) |
 | 1.19.3       | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.19.3) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.19.3) | 6.5.3 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/6.5.3) |
 | 1.19.4       | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.19.4) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.19.4) | 7.1.1 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/7.1.1) |
-| 1.20.1       | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.20.1) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.20.1) | 8.0.1 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/8.0.1) |
+| 1.20.1       | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.20.1) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.20.1) | 8.1.0 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/8.1.0) |
+| 1.20.2       | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.20.2) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.20.2) | 9.0.0 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/9.0.0) |
 
 ## 功能
 
@@ -62,7 +63,7 @@ Command GUI Buttons 是 Minecraft 的 Fabric 模组，允许用户在其客户
 
 ### 支持
 
-当前主开发版本: `1.20.1`
+当前主开发版本: `1.20.2`
 
 并且使用 `预处理` 来兼容下列版本。
 
@@ -77,6 +78,7 @@ Command GUI Buttons 是 Minecraft 的 Fabric 模组，允许用户在其客户
 - Minecraft `1.19.3`
 - Minecraft `1.19.4`
 - Minecraft `1.20.1`
+- Minecraft `1.20.2`
 
 ### 混淆映射表
 

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id("fabric-loom").version("1.3-SNAPSHOT").apply(false)
+    id("fabric-loom").version("1.4-SNAPSHOT").apply(false)
     id("com.replaymod.preprocess").version("SNAPSHOT")
     id("org.ajoberstar.grgit").version("5.2.1")
     id("net.kyori.blossom").version("1.3.1").apply(false)
@@ -13,13 +13,15 @@ preprocess {
     def mc1193 = createNode("1.19.3", 1_19_03, "mojang")
     def mc1194 = createNode("1.19.4", 1_19_04, "mojang")
     def mc1201 = createNode("1.20.1", 1_20_01, "mojang")
+    def mc1202 = createNode("1.20.2", 1_20_02, "mojang")
 
     mc1165.link(mc1171, null)
     mc1171.link(mc1182, null)
     mc1182.link(mc1192, null)
     mc1192.link(mc1193, null)
     mc1193.link(mc1194, null)
-    mc1201.link(mc1194, null)
+    mc1194.link(mc1201, null)
+    mc1201.link(mc1202, null)
 }
 
 def ENV = System.getenv()

settings.gradle

@@ -1,5 +1,8 @@
 pluginManagement {
     repositories {
+        mavenLocal()
+        mavenCentral()
+        gradlePluginPortal()
         maven {
             name("Fabric")
             url("https://maven.fabricmc.net/")
@@ -12,8 +15,6 @@ pluginManagement {
             name("Nyan Maven")
             url("https://maven.hendrixshen.top")
         }
-        mavenCentral()
-        gradlePluginPortal()
     }
 }
 
@@ -25,6 +26,7 @@ def versions = Arrays.asList(
         "1.19.3",
         "1.19.4",
         "1.20.1",
+        "1.20.2",
 )
 
 for (String version : versions) {

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

@@ -1,41 +1,62 @@
 package work.msdnicrosoft.commandbuttons.gui;
 
-//#if MC < 1194
+//#if MC < 12000
 //$$ import com.mojang.blaze3d.vertex.PoseStack;
 //#endif
 import io.github.cottonmc.cotton.gui.GuiDescription;
 import io.github.cottonmc.cotton.gui.client.CottonClientScreen;
 import lombok.Getter;
 import lombok.Setter;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
 
+@Getter
+@Setter
 public class WrapperCommandGUIScreen extends CottonClientScreen {
     @Nullable
-    @Getter
-    @Setter
     private Runnable closeCallback;
-    @Getter
-    @Setter
     @Nullable
     private Screen parent;
-    @Getter
-    @Setter
     @Nullable
     private Runnable returnAction;
 
     public WrapperCommandGUIScreen(GuiDescription description) {
         super(description);
     }
 
-    //#if MC <= 1193
-    //$$ @Override
-    //$$ protected void fillGradient(PoseStack poseStack, int i, int j, int k, int l, int m, int n) {
-    //$$    // Do not use background color.
-    //$$ }
-    //#endif
+
+    // Do not render background color in-game
+    @Override
+    public void renderBackground(
+            //#if MC > 11904
+            GuiGraphics guiGraphics
+            //#if MC > 12001
+            ,int mouseX,
+            int mouseY,
+            float partialTick
+            //#endif
+            //#else
+            //$$ PoseStack poseStack
+            //#if MC < 11904
+            //$$ ,int vOffset
+            //#endif
+            //#endif
+    ) {
+        if (this.minecraft != null && this.minecraft.level == null) {
+            this.renderDirtBackground(
+                    //#if MC > 11904
+                    guiGraphics
+                    //#elseif MC > 11903
+                    //$$ poseStack
+                    //#else
+                    //$$ vOffset
+                    //#endif
+            );
+        }
+    }
 
     @Override
     public void removed() {

versions/1.19.3/gradle.properties

@@ -15,8 +15,8 @@ libgui_version=6.5.3+1.19.3
 # LazyDFU 0.1.3
 lazydfu_version=0.1.3
 
-# Mod Menu - 5.0.2
-modmenu_version=5.0.2
+# Mod Menu - 5.1.0
+modmenu_version=5.1.0
 
 # Smooth Boot - 1.7.1
 smoothboot_version=1.19-1.7.1

versions/1.19.4/gradle.properties

@@ -5,18 +5,18 @@ minecraft_version=1.19.4
 minecraft_out=1.19.4
 
 # Required Libraries
-# FabricAPI 0.85.0+1.19.4
-fabric_version=0.85.0+1.19.4
+# FabricAPI 0.87.0+1.19.4
+fabric_version=0.87.0+1.19.4
 
-# LibGui 7.1.0+1.19.4
-libgui_version=7.1.0+1.19.4
+# LibGui 7.1.1+1.19.4
+libgui_version=7.1.1+1.19.4
 
 # Runtime Libraries - Only for development environment
 # LazyDFU 0.1.3
 lazydfu_version=0.1.3
 
-# Mod Menu - 6.2.3
-modmenu_version=6.2.3
+# Mod Menu - 6.3.1
+modmenu_version=6.3.1
 
 # Smooth Boot - 1.7.0
 smoothboot_version=1.19.4-1.7.0

versions/1.20.1/gradle.properties

@@ -5,18 +5,15 @@ minecraft_version=1.20.1
 minecraft_out=1.20.1
 
 # Required Libraries
-# FabricAPI 0.85.0+1.20.1
-fabric_version=0.85.0+1.20.1
+# FabricAPI 0.89.0+1.20.1
+fabric_version=0.89.0+1.20.1
 
-# LibGui 8.0.1+1.20
-libgui_version=8.0.1+1.20
+# LibGui 8.1.0+1.20.1
+libgui_version=8.1.0+1.20.1
 
 # Runtime Libraries - Only for development environment
-# LazyDFU - No longer needed since MC 1.19.4
-lazydfu_version=0
-
-# Mod Menu - 7.1.0
-modmenu_version=7.1.0
+# Mod Menu - 7.2.2
+modmenu_version=7.2.2
 
 # Smooth Boot - No longer needed since MC 1.20
 smoothboot_version=0

versions/1.20.2/gradle.properties

@@ -0,0 +1,19 @@
+# Independent branch configuration for MC 1.20.2
+# Development Environment
+minecraft_dependency=1.20.2
+minecraft_version=1.20.2
+minecraft_out=1.20.2
+
+# Required Libraries
+# FabricAPI 0.90.0+1.20.2
+fabric_version=0.90.0+1.20.2
+
+# LibGui 9.0.0+1.20.2
+libgui_version=9.0.0+1.20.2
+
+# Runtime Libraries - Only for development environment
+# Mod Menu - 8.0.0
+modmenu_version=8.0.0
+
+# Smooth Boot - No longer needed since MC 1.20
+smoothboot_version=0

versions/mainProject

@@ -1 +1 @@
-1.20.1
+1.20.2