Switch mainProject to 1.20.4

The-Cat-Town-Craft · Dec 17, 2023 · 46263e3 · 46263e3
1 parent a65231b
commit 46263e3
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -285,7 +285,7 @@ Send XaeroMap world information packets to client.
 
 ### Support
 
-Current main development for Minecraft version: 1.20.1
+Current main development for Minecraft version: 1.20.4
 
 And use `preprocess` to be compatible with all versions.
 

diff --git a/README_ZH_CN.md b/README_ZH_CN.md
@@ -285,7 +285,7 @@ vanilla - 原版行为。
 
 ### 支持
 
-当前主开发版本：1.20.1
+当前主开发版本：1.20.4
 
 并且使用 `预处理` 来兼容各版本。
 

diff --git a/...in/java/top/catowncraft/carpettctcaddition/mixin/rule/commandFreecam/MixinPlayerList.java b/...in/java/top/catowncraft/carpettctcaddition/mixin/rule/commandFreecam/MixinPlayerList.java
@@ -23,7 +23,7 @@
 import java.util.Optional;
 
 //#if MC > 12001
-//$$ import net.minecraft.server.network.CommonListenerCookie;
+import net.minecraft.server.network.CommonListenerCookie;
 //#endif
 
 @Mixin(PlayerList.class)
@@ -35,9 +35,9 @@ public abstract class MixinPlayerList {
             at = @At(
                     value = "INVOKE",
                     //#if MC > 12001
-                    //$$ target = "Lnet/minecraft/server/network/ServerGamePacketListenerImpl;<init>(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/network/Connection;Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/server/network/CommonListenerCookie;)V",
+                    target = "Lnet/minecraft/server/network/ServerGamePacketListenerImpl;<init>(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/network/Connection;Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/server/network/CommonListenerCookie;)V",
                     //#else
-                    target = "Lnet/minecraft/server/network/ServerGamePacketListenerImpl;<init>(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/network/Connection;Lnet/minecraft/server/level/ServerPlayer;)V",
+                    //$$ target = "Lnet/minecraft/server/network/ServerGamePacketListenerImpl;<init>(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/network/Connection;Lnet/minecraft/server/level/ServerPlayer;)V",
                     //#endif
                     shift = At.Shift.AFTER
             )
@@ -46,7 +46,7 @@ private void onPlaceNewPlayer(
             Connection connection,
             ServerPlayer serverPlayer,
             //#if MC > 12001
-            //$$ CommonListenerCookie commonListenerCookie,
+            CommonListenerCookie commonListenerCookie,
             //#endif
             CallbackInfo ci
     ) {

diff --git a/...arpettctcaddition/mixin/rule/dispenserCollectExperienceOrb/MixinDispenseItemBehavior.java b/...arpettctcaddition/mixin/rule/dispenserCollectExperienceOrb/MixinDispenseItemBehavior.java
@@ -7,7 +7,7 @@
 package top.catowncraft.carpettctcaddition.mixin.rule.dispenserCollectExperienceOrb;
 
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.BlockSource;
+import net.minecraft.core.dispenser.BlockSource;
 import net.minecraft.core.dispenser.DefaultDispenseItemBehavior;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.EntitySelector;
@@ -49,11 +49,11 @@ public class MixinDispenseItemBehavior {
     private void onExecute(BlockSource blockSource, ItemStack itemStack, CallbackInfoReturnable<ItemStack> cir) {
         if (CarpetTCTCAdditionSettings.dispenserCollectExperience) {
             //#if MC > 12001
-            //$$ BlockPos blockPos = blockSource.pos().relative(blockSource.state().getValue(DispenserBlock.FACING));
-            //$$ List<ServerPlayer> list = blockSource.level().getEntitiesOfClass(ServerPlayer.class, new AABB(blockPos), EntitySelector.NO_SPECTATORS);
+            BlockPos blockPos = blockSource.pos().relative(blockSource.state().getValue(DispenserBlock.FACING));
+            List<ServerPlayer> list = blockSource.level().getEntitiesOfClass(ServerPlayer.class, new AABB(blockPos), EntitySelector.NO_SPECTATORS);
             //#else
-            BlockPos blockPos = blockSource.getPos().relative(blockSource.getBlockState().getValue(DispenserBlock.FACING));
-            List<ServerPlayer> list = blockSource.getLevel().getEntitiesOfClass(ServerPlayer.class, new AABB(blockPos), EntitySelector.NO_SPECTATORS);
+            //$$ BlockPos blockPos = blockSource.getPos().relative(blockSource.getBlockState().getValue(DispenserBlock.FACING));
+            //$$ List<ServerPlayer> list = blockSource.getLevel().getEntitiesOfClass(ServerPlayer.class, new AABB(blockPos), EntitySelector.NO_SPECTATORS);
             //#endif
 
             if (list.isEmpty()) {

diff --git a/...op/catowncraft/carpettctcaddition/mixin/rule/wetSpongeAbsorbLava/MixinWetSpongeBlock.java b/...op/catowncraft/carpettctcaddition/mixin/rule/wetSpongeAbsorbLava/MixinWetSpongeBlock.java
@@ -97,7 +97,7 @@ public void neighborChanged(@NotNull BlockState blockState, @NotNull Level level
                             //#if MC > 11605
                             !((BucketPickup) blockState.getBlock()).pickupBlock(
                                     //#if MC > 12001
-                                    //$$ null,
+                                    null,
                                     //#endif
                                     level,
                                     relative,

diff --git a/versions/mainProject b/versions/mainProject
@@ -1 +1 @@
-1.20.1
+1.20.4