Support Minecraft 1.20-pre2 (MC 1.20 Snapshot)

No longer support Minecraft 1.20-pre1
Hendrix-Shen · May 17, 2023 · 7be771b · 7be771b
1 parent 7411ac0
commit 7be771b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/src/main/java/top/hendrixshen/magiclib/util/MessageUtil.java b/src/main/java/top/hendrixshen/magiclib/util/MessageUtil.java
@@ -23,7 +23,9 @@ public static void sendMessage(CommandSourceStack source, String message) {
     }
 
     public static void sendMessage(CommandSourceStack source, Component messages) {
-        //#if MC > 11502
+        //#if MC > 11904
+        //$$ Optional.ofNullable(source).ifPresent(sourceStack -> sourceStack.sendSuccess(() -> messages, source.getServer().getLevel(Level.OVERWORLD) != null));
+        //#elseif MC > 11502
         Optional.ofNullable(source).ifPresent(sourceStack -> sourceStack.sendSuccess(messages, source.getServer().getLevel(Level.OVERWORLD) != null));
         //#else
         //$$ Optional.ofNullable(source).ifPresent(sourceStack -> sourceStack.sendSuccess(messages, source.getServer() != null && source.getServer().getLevel(DimensionType.OVERWORLD) != null));

diff --git a/versions/1.19.4/gradle.properties b/versions/1.19.4/gradle.properties
@@ -7,8 +7,8 @@ minecraft_dependency=1.19.4
 # Carpet - 1.4.101+v230319
 # fabric-carpet-1.19.4-1.4.101+v230319.jar
 carpet_version=1.19.4-1.4.101+v230319
-# Fabric API 0.80.0+1.19.4
-fabric_version=0.80.0+1.19.4
+# Fabric API 0.81.1+1.19.4
+fabric_version=0.81.1+1.19.4
 # Malilib - 0.15.4
 # https://www.curseforge.com/minecraft/mc-mods/malilib/files/4519977
 # malilib-fabric-1.19.4-0.15.4.jar

diff --git a/versions/1.20/gradle.properties b/versions/1.20/gradle.properties
@@ -1,18 +1,18 @@
 # Independent branch configuration
 # Development Environment
-minecraft_version=1.20-pre1
-minecraft_dependency=1.20-beta.1
+minecraft_version=1.20-pre2
+minecraft_dependency=1.20-beta.2
 
 # Required Libraries
-# Carpet - 1.4.108+v230510
-# fabric-carpet-1.20-pre1-1.4.108+v230510.jar
-carpet_version=1.20-pre1-1.4.108+v230510
-# Fabric API 0.80.1+1.20
-fabric_version=0.80.2+1.20
+# Carpet - 1.4.109+v230516
+# fabric-carpet-1.20-pre2-1.4.109+v230516.jar
+carpet_version=1.20-pre2-1.4.109+v230516
+# Fabric API 0.81.2+1.20
+fabric_version=0.81.2+1.20
 # Malilib - 0.16.0
 #
 # malilib-1.20-pre1-0.16.0.jar
-malilib_version=1.20-pre1-0.16.0
+malilib_version=1.20-pre2-0.16.0
 # Mod Menu - 7.0.0-beta.2
 # modmenu-7.0.0-beta.2.jar
 modmenu_version=7.0.0-beta.2