diff --git a/mappings/net/minecraft/block/BedBlock.mapping b/mappings/net/minecraft/block/BedBlock.mapping index 55f8ad804d..935a1bb02a 100644 --- a/mappings/net/minecraft/block/BedBlock.mapping +++ b/mappings/net/minecraft/block/BedBlock.mapping @@ -17,6 +17,9 @@ CLASS net/minecraft/class_2244 net/minecraft/block/BedBlock METHOD method_18476 getDirection (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2350; ARG 0 world ARG 1 pos + METHOD method_22357 isFree (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z + ARG 1 world + ARG 2 pos METHOD method_24163 getOppositePartDirection (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2350; METHOD method_9484 findWakeUpPosition (Lnet/minecraft/class_1299;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;I)Ljava/util/Optional; ARG 0 type diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index f10c11ae31..7a596ab0fc 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -44,7 +44,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_6249 limbAngle F FIELD field_6250 forwardSpeed F FIELD field_6251 handSwingProgress F - FIELD field_6252 isHandSwinging Z + FIELD field_6252 handSwinging Z FIELD field_6253 lastDamageTaken F FIELD field_6254 maxHurtTime I FIELD field_6255 lookDirection F diff --git a/mappings/net/minecraft/entity/ai/TargetFinder.mapping b/mappings/net/minecraft/entity/ai/TargetFinder.mapping index 5d6568b048..bbdbbde8e3 100644 --- a/mappings/net/minecraft/entity/ai/TargetFinder.mapping +++ b/mappings/net/minecraft/entity/ai/TargetFinder.mapping @@ -41,7 +41,7 @@ CLASS net/minecraft/class_1414 net/minecraft/entity/ai/TargetFinder ARG 0 pos ARG 1 minDistanceAboveIllegal ARG 2 maxOffset - ARG 3 isIllegalPredicate + ARG 3 illegalPredicate METHOD method_23735 findTargetTowards (Lnet/minecraft/class_1314;IILnet/minecraft/class_243;)Lnet/minecraft/class_243; ARG 0 mob ARG 1 maxHorizontalDistance diff --git a/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping b/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping index 374744e3ff..79a217ffc9 100644 --- a/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping +++ b/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1632 net/minecraft/entity/mob/VindicatorEntity FIELD field_19014 DIFFICULTY_ALLOWS_DOOR_BREAKING_PREDICATE Ljava/util/function/Predicate; - FIELD field_7406 isJohnny Z + FIELD field_7406 johnny Z METHOD method_26926 createVindicatorAttributes ()Lnet/minecraft/class_5132$class_5133; CLASS class_1633 FollowEntityGoal METHOD (Lnet/minecraft/class_1632;)V diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 77b9973523..7852790a69 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -220,7 +220,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_7350 resetLastAttackedTicks ()V METHOD method_7351 getBlockBreakingSpeed (Lnet/minecraft/class_2680;)F ARG 1 block - METHOD method_7353 addMessage (Lnet/minecraft/class_2561;Z)V + METHOD method_7353 sendMessage (Lnet/minecraft/class_2561;Z)V ARG 1 message ARG 2 actionBar METHOD method_7355 sendAbilitiesUpdate ()V diff --git a/mappings/net/minecraft/entity/FishingBobberEntity.mapping b/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping similarity index 95% rename from mappings/net/minecraft/entity/FishingBobberEntity.mapping rename to mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping index 4eae316e6c..73d794d628 100644 --- a/mappings/net/minecraft/entity/FishingBobberEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1536 net/minecraft/entity/FishingBobberEntity +CLASS net/minecraft/class_1536 net/minecraft/entity/projectile/FishingBobberEntity FIELD field_23134 inOpenWater Z FIELD field_23231 velocityRandom Ljava/util/Random; FIELD field_23232 caughtFish Z diff --git a/mappings/net/minecraft/entity/ShulkerBulletEntity.mapping b/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping similarity index 88% rename from mappings/net/minecraft/entity/ShulkerBulletEntity.mapping rename to mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping index 9d7e217b17..2398c0b074 100644 --- a/mappings/net/minecraft/entity/ShulkerBulletEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1678 net/minecraft/entity/ShulkerBulletEntity +CLASS net/minecraft/class_1678 net/minecraft/entity/projectile/ShulkerBulletEntity FIELD field_7625 targetZ D FIELD field_7626 target Lnet/minecraft/class_1297; FIELD field_7627 stepCount I diff --git a/mappings/net/minecraft/server/LanServerPinger.mapping b/mappings/net/minecraft/server/LanServerPinger.mapping index c46c89af5a..b2ec4b9754 100644 --- a/mappings/net/minecraft/server/LanServerPinger.mapping +++ b/mappings/net/minecraft/server/LanServerPinger.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_1133 net/minecraft/server/LanServerPinger FIELD field_5525 THREAD_ID Ljava/util/concurrent/atomic/AtomicInteger; FIELD field_5526 motd Ljava/lang/String; - FIELD field_5527 isRunning Z + FIELD field_5527 running Z FIELD field_5528 socket Ljava/net/DatagramSocket; FIELD field_5529 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_5530 addressPort Ljava/lang/String; diff --git a/mappings/net/minecraft/server/command/CommandOutput.mapping b/mappings/net/minecraft/server/command/CommandOutput.mapping index 44f48277ca..b5bbe2a585 100644 --- a/mappings/net/minecraft/server/command/CommandOutput.mapping +++ b/mappings/net/minecraft/server/command/CommandOutput.mapping @@ -4,5 +4,5 @@ CLASS net/minecraft/class_2165 net/minecraft/server/command/CommandOutput METHOD method_9200 shouldReceiveFeedback ()Z METHOD method_9201 shouldBroadcastConsoleToOps ()Z METHOD method_9202 shouldTrackOutput ()Z - METHOD method_9203 sendMessage (Lnet/minecraft/class_2561;)V + METHOD method_9203 sendSystemMessage (Lnet/minecraft/class_2561;)V ARG 1 message diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 1032f5b832..80083d42bf 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity FIELD field_13968 lastAirScore I FIELD field_13969 seenCredits Z FIELD field_13970 advancementTracker Lnet/minecraft/class_2985; + FIELD field_13971 clientChatColorsEnabled Z FIELD field_13972 syncedSaturationIsZero Z FIELD field_13973 levitationStartTick I FIELD field_13974 interactionManager Lnet/minecraft/class_3225; @@ -49,11 +50,13 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_14208 isInTeleportationState ()Z METHOD method_14209 getIp ()Ljava/lang/String; METHOD method_14211 onStartedTracking (Lnet/minecraft/class_1297;)V + ARG 1 entity METHOD method_14212 updateScores (Lnet/minecraft/class_274;I)V ARG 1 criterion ARG 2 score METHOD method_14213 setClientSettings (Lnet/minecraft/class_2803;)V METHOD method_14216 sendBlockEntityUpdate (Lnet/minecraft/class_2586;)V + ARG 1 blockEntity METHOD method_14217 markHealthDirty ()V METHOD method_14219 getLastActionTime ()J METHOD method_14220 getServerWorld ()Lnet/minecraft/class_3218; @@ -79,6 +82,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_14247 closeCurrentScreen ()V METHOD method_14248 getStatHandler ()Lnet/minecraft/class_3442; METHOD method_14249 onStoppedTracking (Lnet/minecraft/class_1297;)V + ARG 1 entity METHOD method_14251 teleport (Lnet/minecraft/class_3218;DDDFF)V ARG 1 targetWorld ARG 2 x @@ -89,7 +93,9 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_14252 setExperienceLevel (I)V ARG 1 level METHOD method_14253 getRecipeBook ()Lnet/minecraft/class_3441; - METHOD method_14254 sendChatMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556;)V + METHOD method_14254 sendMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556;)V + ARG 1 message + ARG 2 type METHOD method_14255 sendResourcePackUrl (Ljava/lang/String;Ljava/lang/String;)V ARG 1 url ARG 2 hash @@ -103,3 +109,12 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_26284 setSpawnPoint (Lnet/minecraft/class_2874;Lnet/minecraft/class_2338;ZZ)V ARG 1 dimension ARG 2 pos + ARG 3 spawnPointSet + METHOD method_26285 isBedTooFarAway (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z + ARG 1 pos + ARG 2 direction + METHOD method_26286 isBedObstructed (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z + ARG 1 pos + ARG 2 direction + METHOD method_26287 isBedTooFarAway (Lnet/minecraft/class_2338;)Z + ARG 1 pos