Switch mainProject to 1.20

The-Cat-Town-Craft · Jun 13, 2023 · 127ab0a · 127ab0a
1 parent ff422c6
commit 127ab0a
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 9 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -126,6 +126,7 @@ jobs:
             1.19.2
             1.19.3
             1.19.4
+            1.20
           version-resolver: latest
           java: |
             8
@@ -245,6 +246,7 @@ jobs:
             1.19.2
             1.19.3
             1.19.4
+            1.20
           version-resolver: latest
           java: |
             8

diff --git a/README.md b/README.md
@@ -17,6 +17,8 @@
 
 **Warning: we use our own SettingManager to manage the rules and you need to manually migrate the default configuration saved in carpet.conf.**
 
+❗Before reporting a problem, be sure to try the latest [beta version](https://github.com/The-Cat-Town-Craft/Carpet-TCTC-Addition/releases) to check if the problem still exists.
+
 A [fabric-carpet](https://github.com/gnembon/fabric-carpet) extension mod. It offers some interesting features.
 
 Operation command: `/carpet-tctc-addition`
@@ -283,7 +285,7 @@ Send XaeroMap world information packets to client.
 
 ### Support
 
-Current main development for Minecraft version: 1.19.4
+Current main development for Minecraft version: 1.20
 
 And use `preprocess` to be compatible with all versions.
 
@@ -297,6 +299,7 @@ And use `preprocess` to be compatible with all versions.
 - Minecraft 1.19.2
 - Minecraft 1.19.3
 - Minecraft 1.19.4
+- Minecraft 1.20
 
 ### Mappings
 

diff --git a/README_ZH_CN.md b/README_ZH_CN.md
@@ -17,6 +17,8 @@
 
 **警告: 自从 2.0 版本开始，我们使用自己的SettingManager来管理规则，您需要手动迁移carpet.conf中保存的默认配置**
 
+❗在报告问题前，请务必尝试最新[测试版](https://github.com/The-Cat-Town-Craft/Carpet-TCTC-Addition/releases)，检查问题是否依然存在。
+
 一个 [fabric-carpet](https://github.com/gnembon/fabric-carpet) 扩展模组。 它提供了一些有趣的特性。
 
 管理命令: `/carpet-tctc-addition`
@@ -283,7 +285,7 @@ vanilla - 原版行为。
 
 ### 支持
 
-当前主开发版本：1.19.4
+当前主开发版本：1.20
 
 并且使用 `预处理` 来兼容各版本。
 
@@ -297,6 +299,7 @@ vanilla - 原版行为。
 - Minecraft 1.19.2
 - Minecraft 1.19.3
 - Minecraft 1.19.4
+- Minecraft 1.20
 
 ### 混淆映射表
 

diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id("maven-publish")
     id("fabric-loom").version("1.2-SNAPSHOT").apply(false)
     // https://github.com/Juuxel/LoomQuiltflower
-    id("io.github.juuxel.loom-quiltflower").version("1.8.0").apply(false)
+    id("io.github.juuxel.loom-quiltflower").version("1.10.0").apply(false)
     id("net.kyori.blossom").version("1.3.1").apply(false)
     id("org.ajoberstar.grgit").version("5.2.0")
     id("com.replaymod.preprocess").version("SNAPSHOT")
@@ -16,8 +16,8 @@ preprocess {
     def mc1182 = createNode("1.18.2", 1_18_02, "mojang")
     def mc1192 = createNode("1.19.2", 1_19_02, "mojang")
     def mc1193 = createNode("1.19.3", 1_19_03, "mojang")
-    def mc1194 = createNode("1.19.4", 1_19_04, "mojang") // root
-    def mc1200 = createNode("1.20"  , 1_20_00, "mojang")
+    def mc1194 = createNode("1.19.4", 1_19_04, "mojang")
+    def mc1200 = createNode("1.20"  , 1_20_00, "mojang") // root
 
     mc1144.link(mc1152, null)
     mc1152.link(mc1165, null)

diff --git a/src/main/java/top/catowncraft/carpettctcaddition/helper/FreeCameraData.java b/src/main/java/top/catowncraft/carpettctcaddition/helper/FreeCameraData.java
@@ -13,7 +13,7 @@
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.GameType;
 //#if MC < 16000
-//$$ import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.dimension.DimensionType;
 //#endif
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;

diff --git a/...op/catowncraft/carpettctcaddition/mixin/rule/voidDevouringBehavior/MixinLivingEntity.java b/...op/catowncraft/carpettctcaddition/mixin/rule/voidDevouringBehavior/MixinLivingEntity.java
@@ -57,7 +57,7 @@ public MixinLivingEntity(EntityType<?> entityType, Level level) {
 
     @SuppressWarnings("ConstantConditions")
     @Inject(
-            method = "outOfWorld",
+            method = "onBelowWorld",
             at = @At(
                     value = "HEAD"
             ),

diff --git a/...ain/java/top/catowncraft/carpettctcaddition/mixin/rule/voidTradeFix/MixinServerLevel.java b/...ain/java/top/catowncraft/carpettctcaddition/mixin/rule/voidTradeFix/MixinServerLevel.java
@@ -20,7 +20,7 @@
 //#endif
 
 //#if MC > 11605
-@Mixin(targets = "net/minecraft/server/level/ServerLevel$EntityCallbacks")
+@Mixin(targets = "net.minecraft.server.level.ServerLevel$EntityCallbacks")
 //#else
 //$$ @Mixin(ServerLevel.class)
 //#endif

diff --git a/versions/mainProject b/versions/mainProject
@@ -1 +1 @@
-1.19.4
+1.20
-Original file line number
+Diff line change
@@ Expand Up / @@ -126,6 +126,7 @@ jobs: @@
 .19.2
 .19.3
 .19.4
+.20
               version-resolver: latest
               java: |
@@ Expand Down Expand Up / @@ -245,6 +246,7 @@ jobs: @@
 .19.2
 .19.3
 .19.4
+.20
               version-resolver: latest
               java: |
@@ Expand Down @@