diff --git a/build.gradle b/build.gradle
index 819c5a90e9..bd7ce57516 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ plugins {
id 'java' // for jd gen
}
-def minecraft_version = "20w29a"
+def minecraft_version = "20w30a"
def ENV = System.getenv()
// Fetch build number from Jenkins
diff --git a/mappings/net/minecraft/CharacterVisitor.mapping b/mappings/net/minecraft/CharacterVisitor.mapping
new file mode 100644
index 0000000000..df92f46eb1
--- /dev/null
+++ b/mappings/net/minecraft/CharacterVisitor.mapping
@@ -0,0 +1,15 @@
+CLASS net/minecraft/class_5224 net/minecraft/CharacterVisitor
+ COMMENT A visitor for single characters in a string.
+ METHOD accept (ILnet/minecraft/class_2583;I)Z
+ COMMENT Visits a single character.
+ COMMENT
+ COMMENT
Multiple surrogate characters are converted into one single {@code
+ COMMENT codePoint} when passed into this method.
+ COMMENT
+ COMMENT @return {@code true} to continue visiting other characters, or {@code false} to terminate the visit
+ ARG 1 index
+ COMMENT the current index of the character
+ ARG 2 style
+ COMMENT the style of the character, containing formatting and font information
+ ARG 3 codePoint
+ COMMENT the code point of the character
diff --git a/mappings/net/minecraft/block/AnvilBlock.mapping b/mappings/net/minecraft/block/AnvilBlock.mapping
index 3b0fb6412d..58b04c1991 100644
--- a/mappings/net/minecraft/block/AnvilBlock.mapping
+++ b/mappings/net/minecraft/block/AnvilBlock.mapping
@@ -1,5 +1,5 @@
CLASS net/minecraft/class_2199 net/minecraft/block/AnvilBlock
- FIELD field_17349 TITLE Lnet/minecraft/class_2588;
+ FIELD field_17349 TITLE Lnet/minecraft/class_2561;
FIELD field_9882 BASE_SHAPE Lnet/minecraft/class_265;
FIELD field_9883 FACING Lnet/minecraft/class_2753;
FIELD field_9884 X_FACE_SHAPE Lnet/minecraft/class_265;
diff --git a/mappings/net/minecraft/block/BedBlock.mapping b/mappings/net/minecraft/block/BedBlock.mapping
index fbf4eb7dbd..fc58b37ba7 100644
--- a/mappings/net/minecraft/block/BedBlock.mapping
+++ b/mappings/net/minecraft/block/BedBlock.mapping
@@ -28,14 +28,8 @@ CLASS net/minecraft/class_2244 net/minecraft/block/BedBlock
ARG 0 state
METHOD method_27352 isOverworld (Lnet/minecraft/class_1937;)Z
ARG 0 world
- METHOD method_9484 findWakeUpPosition (Lnet/minecraft/class_1299;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;I)Ljava/util/Optional;
+ METHOD method_9484 findWakeUpPosition (Lnet/minecraft/class_1299;Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;F)Ljava/util/Optional;
ARG 0 type
- ARG 1 world
- ARG 2 pos
- ARG 3 index
- METHOD method_9486 canWakeUpAt (Lnet/minecraft/class_1299;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Ljava/util/Optional;
- ARG 0 type
- ARG 1 world
ARG 2 pos
METHOD method_9487 getColor ()Lnet/minecraft/class_1767;
METHOD method_9488 getDirectionTowardsOtherPart (Lnet/minecraft/class_2742;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2350;
diff --git a/mappings/net/minecraft/block/CartographyTableBlock.mapping b/mappings/net/minecraft/block/CartographyTableBlock.mapping
index 8a167cdc97..ee0ef73ab3 100644
--- a/mappings/net/minecraft/block/CartographyTableBlock.mapping
+++ b/mappings/net/minecraft/block/CartographyTableBlock.mapping
@@ -1,2 +1,2 @@
CLASS net/minecraft/class_3711 net/minecraft/block/CartographyTableBlock
- FIELD field_17355 TITLE Lnet/minecraft/class_2588;
+ FIELD field_17355 TITLE Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/block/DoorBlock.mapping b/mappings/net/minecraft/block/DoorBlock.mapping
index 40e2f1bc95..c83a45b85b 100644
--- a/mappings/net/minecraft/block/DoorBlock.mapping
+++ b/mappings/net/minecraft/block/DoorBlock.mapping
@@ -9,10 +9,7 @@ CLASS net/minecraft/class_2323 net/minecraft/block/DoorBlock
FIELD field_10945 OPEN Lnet/minecraft/class_2746;
FIELD field_10946 HALF Lnet/minecraft/class_2754;
METHOD method_10032 getCloseSoundEventId ()I
- METHOD method_10033 setOpen (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Z)V
- ARG 1 world
- ARG 2 pos
- ARG 3 open
+ METHOD method_10033 setOpen (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Z)V
METHOD method_10034 getOpenSoundEventId ()I
METHOD method_10035 getHinge (Lnet/minecraft/class_1750;)Lnet/minecraft/class_2750;
ARG 1 ctx
diff --git a/mappings/net/minecraft/block/EnderChestBlock.mapping b/mappings/net/minecraft/block/EnderChestBlock.mapping
index 92f96ec592..b12acfb1d0 100644
--- a/mappings/net/minecraft/block/EnderChestBlock.mapping
+++ b/mappings/net/minecraft/block/EnderChestBlock.mapping
@@ -2,4 +2,4 @@ CLASS net/minecraft/class_2336 net/minecraft/block/EnderChestBlock
FIELD field_10966 FACING Lnet/minecraft/class_2753;
FIELD field_10967 SHAPE Lnet/minecraft/class_265;
FIELD field_10968 WATERLOGGED Lnet/minecraft/class_2746;
- FIELD field_17363 CONTAINER_NAME Lnet/minecraft/class_2588;
+ FIELD field_17363 CONTAINER_NAME Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/block/GrindstoneBlock.mapping b/mappings/net/minecraft/block/GrindstoneBlock.mapping
index b991b33081..0ab39a21f6 100644
--- a/mappings/net/minecraft/block/GrindstoneBlock.mapping
+++ b/mappings/net/minecraft/block/GrindstoneBlock.mapping
@@ -63,6 +63,6 @@ CLASS net/minecraft/class_3713 net/minecraft/block/GrindstoneBlock
FIELD field_16399 SOUTH_WALL_SHAPE Lnet/minecraft/class_265;
FIELD field_16400 EAST_CEILING_HINGE Lnet/minecraft/class_265;
FIELD field_16401 NORTH_WALL_WEST_HINGE Lnet/minecraft/class_265;
- FIELD field_17364 TITLE Lnet/minecraft/class_2588;
+ FIELD field_17364 TITLE Lnet/minecraft/class_2561;
METHOD method_16119 getShape (Lnet/minecraft/class_2680;)Lnet/minecraft/class_265;
ARG 1 state
diff --git a/mappings/net/minecraft/block/LoomBlock.mapping b/mappings/net/minecraft/block/LoomBlock.mapping
index 9cf26f2af4..e70b43e826 100644
--- a/mappings/net/minecraft/block/LoomBlock.mapping
+++ b/mappings/net/minecraft/block/LoomBlock.mapping
@@ -1,2 +1,2 @@
CLASS net/minecraft/class_2406 net/minecraft/block/LoomBlock
- FIELD field_17373 TITLE Lnet/minecraft/class_2588;
+ FIELD field_17373 TITLE Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/block/RespawnAnchorBlock.mapping b/mappings/net/minecraft/block/RespawnAnchorBlock.mapping
index f777e5fd6d..3fdc61ade3 100644
--- a/mappings/net/minecraft/block/RespawnAnchorBlock.mapping
+++ b/mappings/net/minecraft/block/RespawnAnchorBlock.mapping
@@ -1,8 +1,7 @@
CLASS net/minecraft/class_4969 net/minecraft/block/RespawnAnchorBlock
FIELD field_23153 CHARGES Lnet/minecraft/class_2758;
- METHOD method_26156 findRespawnPosition (Lnet/minecraft/class_1299;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Ljava/util/Optional;
+ METHOD method_26156 findRespawnPosition (Lnet/minecraft/class_1299;Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;)Ljava/util/Optional;
ARG 0 entity
- ARG 1 world
ARG 2 pos
METHOD method_26157 getLightLevel (Lnet/minecraft/class_2680;I)I
ARG 0 state
diff --git a/mappings/net/minecraft/block/SmithingTableBlock.mapping b/mappings/net/minecraft/block/SmithingTableBlock.mapping
index bd1f919f40..41880f66c6 100644
--- a/mappings/net/minecraft/block/SmithingTableBlock.mapping
+++ b/mappings/net/minecraft/block/SmithingTableBlock.mapping
@@ -1,2 +1,2 @@
CLASS net/minecraft/class_3717 net/minecraft/block/SmithingTableBlock
- FIELD field_22511 SCREEN_TITLE Lnet/minecraft/class_2588;
+ FIELD field_22511 SCREEN_TITLE Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/block/StonecutterBlock.mapping b/mappings/net/minecraft/block/StonecutterBlock.mapping
index 9fa532a9b3..b7ff793e4d 100644
--- a/mappings/net/minecraft/block/StonecutterBlock.mapping
+++ b/mappings/net/minecraft/block/StonecutterBlock.mapping
@@ -1,4 +1,4 @@
CLASS net/minecraft/class_3718 net/minecraft/block/StonecutterBlock
FIELD field_16407 SHAPE Lnet/minecraft/class_265;
FIELD field_17649 FACING Lnet/minecraft/class_2753;
- FIELD field_17650 TITLE Lnet/minecraft/class_2588;
+ FIELD field_17650 TITLE Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping
index 761be53ba3..df804c324a 100644
--- a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping
+++ b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping
@@ -1,13 +1,13 @@
CLASS net/minecraft/class_2625 net/minecraft/block/entity/SignBlockEntity
FIELD field_12046 editor Lnet/minecraft/class_1657;
FIELD field_12048 editable Z
- FIELD field_12049 textBeingEdited [Lnet/minecraft/class_5348;
+ FIELD field_12049 textBeingEdited [Lnet/minecraft/class_5481;
FIELD field_12050 text [Lnet/minecraft/class_2561;
FIELD field_16419 textColor Lnet/minecraft/class_1767;
METHOD method_11299 setTextOnRow (ILnet/minecraft/class_2561;)V
ARG 1 row
ARG 2 text
- METHOD method_11300 getTextBeingEditedOnRow (ILjava/util/function/UnaryOperator;)Lnet/minecraft/class_5348;
+ METHOD method_11300 getTextBeingEditedOnRow (ILjava/util/function/Function;)Lnet/minecraft/class_5481;
ARG 1 row
METHOD method_11301 onActivate (Lnet/minecraft/class_1657;)Z
ARG 1 player
diff --git a/mappings/net/minecraft/class_5425.mapping b/mappings/net/minecraft/class_5425.mapping
index aed99b2aa9..5d9bbcb9a8 100644
--- a/mappings/net/minecraft/class_5425.mapping
+++ b/mappings/net/minecraft/class_5425.mapping
@@ -1,2 +1,2 @@
CLASS net/minecraft/class_5425
- METHOD method_8410 getWorld ()Lnet/minecraft/class_1937;
+ METHOD method_8410 getWorld ()Lnet/minecraft/class_3218;
diff --git a/mappings/net/minecraft/client/font/TextRenderer.mapping b/mappings/net/minecraft/client/font/TextRenderer.mapping
index c2cf135744..5d2c2680d4 100644
--- a/mappings/net/minecraft/client/font/TextRenderer.mapping
+++ b/mappings/net/minecraft/client/font/TextRenderer.mapping
@@ -40,8 +40,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
ARG 5 color
METHOD method_1721 mirror (Ljava/lang/String;)Ljava/lang/String;
ARG 1 text
- METHOD method_1723 drawInternal (Lnet/minecraft/class_5348;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I
- ARG 1 text
+ METHOD method_1723 drawInternal (Lnet/minecraft/class_5481;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I
ARG 2 x
ARG 3 y
ARG 4 color
@@ -74,15 +73,13 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
ARG 3 x
ARG 4 y
ARG 5 color
- METHOD method_22941 draw (Lnet/minecraft/class_5348;FFILnet/minecraft/class_1159;Z)I
- ARG 1 text
+ METHOD method_22941 draw (Lnet/minecraft/class_5481;FFILnet/minecraft/class_1159;Z)I
ARG 2 x
ARG 3 y
ARG 4 color
ARG 5 matrix
ARG 6 shadow
- METHOD method_22942 draw (Lnet/minecraft/class_5348;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I
- ARG 1 text
+ METHOD method_22942 draw (Lnet/minecraft/class_5481;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I
ARG 2 x
ARG 3 y
ARG 4 color
@@ -94,9 +91,8 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
ARG 10 light
METHOD method_27515 tweakTransparency (I)I
ARG 0 argb
- METHOD method_27517 drawWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_5348;FFI)I
+ METHOD method_27517 drawWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_5481;FFI)I
ARG 1 matrices
- ARG 2 text
ARG 3 x
ARG 4 y
ARG 5 color
@@ -142,9 +138,8 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
METHOD method_27526 getFontStorage (Lnet/minecraft/class_2960;)Lnet/minecraft/class_377;
ARG 1 id
METHOD method_27527 getTextHandler ()Lnet/minecraft/class_5225;
- METHOD method_27528 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_5348;FFI)I
+ METHOD method_27528 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_5481;FFI)I
ARG 1 matrices
- ARG 2 text
ARG 3 x
ARG 4 y
ARG 5 color
@@ -160,8 +155,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
ARG 9 backgroundColor
ARG 10 light
ARG 11 mirror
- METHOD method_27530 drawLayer (Lnet/minecraft/class_5348;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)F
- ARG 1 text
+ METHOD method_27530 drawLayer (Lnet/minecraft/class_5481;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)F
ARG 2 x
ARG 3 y
ARG 4 color
diff --git a/mappings/net/minecraft/client/font/TextVisitFactory.mapping b/mappings/net/minecraft/client/font/TextVisitFactory.mapping
index 98cec0cb70..ae18481845 100644
--- a/mappings/net/minecraft/client/font/TextVisitFactory.mapping
+++ b/mappings/net/minecraft/client/font/TextVisitFactory.mapping
@@ -7,7 +7,7 @@ CLASS net/minecraft/class_5223 net/minecraft/client/font/TextVisitFactory
COMMENT from an original string.
ARG 0 text
COMMENT the original string
- METHOD method_27472 visitFormatted (Ljava/lang/String;ILnet/minecraft/class_2583;Lnet/minecraft/class_5223$class_5224;)Z
+ METHOD method_27472 visitFormatted (Ljava/lang/String;ILnet/minecraft/class_2583;Lnet/minecraft/class_5224;)Z
COMMENT Visits the code points of a string, applying the formatting codes within.
COMMENT
COMMENT The visit is in forward direction.
@@ -21,7 +21,7 @@ CLASS net/minecraft/class_5223 net/minecraft/client/font/TextVisitFactory
ARG 2 style
COMMENT the style of the string
ARG 3 visitor
- METHOD method_27473 visitFormatted (Ljava/lang/String;ILnet/minecraft/class_2583;Lnet/minecraft/class_2583;Lnet/minecraft/class_5223$class_5224;)Z
+ METHOD method_27473 visitFormatted (Ljava/lang/String;ILnet/minecraft/class_2583;Lnet/minecraft/class_2583;Lnet/minecraft/class_5224;)Z
COMMENT Visits the code points of a string, applying the formatting codes within.
COMMENT
COMMENT The visit is in forward direction.
@@ -38,7 +38,7 @@ CLASS net/minecraft/class_5223 net/minecraft/client/font/TextVisitFactory
COMMENT the style to reset to when a {@code §r} formatting code is encountered
ARG 4 visitor
COMMENT the visitor
- METHOD method_27474 visitForwards (Ljava/lang/String;Lnet/minecraft/class_2583;Lnet/minecraft/class_5223$class_5224;)Z
+ METHOD method_27474 visitForwards (Ljava/lang/String;Lnet/minecraft/class_2583;Lnet/minecraft/class_5224;)Z
COMMENT Visits the code points of a string in forward (left to right) direction.
COMMENT
COMMENT @return {@code true} if the full string was visited, or {@code false} indicating
@@ -49,7 +49,7 @@ CLASS net/minecraft/class_5223 net/minecraft/client/font/TextVisitFactory
COMMENT the style of the string
ARG 2 visitor
COMMENT the visitor of characters
- METHOD method_27476 visitFormatted (Lnet/minecraft/class_5348;Lnet/minecraft/class_2583;Lnet/minecraft/class_5223$class_5224;)Z
+ METHOD method_27476 visitFormatted (Lnet/minecraft/class_5348;Lnet/minecraft/class_2583;Lnet/minecraft/class_5224;)Z
COMMENT Visits the code points for every literal string and the formatting codes
COMMENT supplied by the renderable.
COMMENT
@@ -61,12 +61,12 @@ CLASS net/minecraft/class_5223 net/minecraft/client/font/TextVisitFactory
ARG 0 text
ARG 1 style
ARG 2 visitor
- METHOD method_27477 visitRegularCharacter (Lnet/minecraft/class_2583;Lnet/minecraft/class_5223$class_5224;IC)Z
+ METHOD method_27477 visitRegularCharacter (Lnet/minecraft/class_2583;Lnet/minecraft/class_5224;IC)Z
ARG 0 style
ARG 1 visitor
ARG 2 index
ARG 3 c
- METHOD method_27478 visitBackwards (Ljava/lang/String;Lnet/minecraft/class_2583;Lnet/minecraft/class_5223$class_5224;)Z
+ METHOD method_27478 visitBackwards (Ljava/lang/String;Lnet/minecraft/class_2583;Lnet/minecraft/class_5224;)Z
COMMENT Visits the code points of a string in backward (right to left) direction.
COMMENT
COMMENT @return {@code true} if the full string was visited, or {@code false} indicating
@@ -77,7 +77,7 @@ CLASS net/minecraft/class_5223 net/minecraft/client/font/TextVisitFactory
COMMENT the style of the string
ARG 2 visitor
COMMENT the visitor
- METHOD method_27479 visitFormatted (Ljava/lang/String;Lnet/minecraft/class_2583;Lnet/minecraft/class_5223$class_5224;)Z
+ METHOD method_27479 visitFormatted (Ljava/lang/String;Lnet/minecraft/class_2583;Lnet/minecraft/class_5224;)Z
COMMENT Visits the code points of a string, applying the formatting codes within.
COMMENT
COMMENT The visit is in forward direction.
@@ -90,18 +90,3 @@ CLASS net/minecraft/class_5223 net/minecraft/client/font/TextVisitFactory
COMMENT the style of the string
ARG 2 visitor
COMMENT the visitor
- CLASS class_5224 CharacterVisitor
- COMMENT A visitor for single characters in a string.
- METHOD onChar (ILnet/minecraft/class_2583;I)Z
- COMMENT Visits a single character.
- COMMENT
- COMMENT Multiple surrogate characters are converted into one single {@code
- COMMENT codePoint} when passed into this method.
- COMMENT
- COMMENT @return {@code true} to continue visiting other characters, or {@code false} to terminate the visit
- ARG 1 index
- COMMENT the current index of the character
- ARG 2 style
- COMMENT the style of the character, containing formatting and font information
- ARG 3 codePoint
- COMMENT the code point of the character
diff --git a/mappings/net/minecraft/client/gl/GlShader.mapping b/mappings/net/minecraft/client/gl/GlShader.mapping
index 31c8170541..8838c9409b 100644
--- a/mappings/net/minecraft/client/gl/GlShader.mapping
+++ b/mappings/net/minecraft/client/gl/GlShader.mapping
@@ -10,7 +10,7 @@ CLASS net/minecraft/class_281 net/minecraft/client/gl/GlShader
METHOD method_1280 getName ()Ljava/lang/String;
METHOD method_1281 attachTo (Lnet/minecraft/class_3679;)V
METHOD method_1282 release ()V
- METHOD method_1283 createFromResource (Lnet/minecraft/class_281$class_282;Ljava/lang/String;Ljava/io/InputStream;)Lnet/minecraft/class_281;
+ METHOD method_1283 createFromResource (Lnet/minecraft/class_281$class_282;Ljava/lang/String;Ljava/io/InputStream;Ljava/lang/String;)Lnet/minecraft/class_281;
ARG 0 type
ARG 1 name
ARG 2 sourceCode
diff --git a/mappings/net/minecraft/client/gui/DrawableHelper.mapping b/mappings/net/minecraft/client/gui/DrawableHelper.mapping
index 2df28470f8..db528bd2a6 100644
--- a/mappings/net/minecraft/client/gui/DrawableHelper.mapping
+++ b/mappings/net/minecraft/client/gui/DrawableHelper.mapping
@@ -140,12 +140,6 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper
ARG 4 y2
ARG 5 color
METHOD method_25300 drawCenteredString (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Ljava/lang/String;III)V
- ARG 1 matrices
- ARG 2 textRenderer
- ARG 3 text
- ARG 4 x
- ARG 5 y
- ARG 6 color
METHOD method_25301 drawVerticalLine (Lnet/minecraft/class_4587;IIII)V
ARG 1 matrices
ARG 2 x
@@ -174,12 +168,6 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper
ARG 7 height
COMMENT the height
METHOD method_25303 drawStringWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Ljava/lang/String;III)V
- ARG 1 matrices
- ARG 2 textRenderer
- ARG 3 text
- ARG 4 x
- ARG 5 y
- ARG 6 color
METHOD method_25304 setZOffset (I)V
ARG 1 zOffset
METHOD method_25305 getZOffset ()I
@@ -188,15 +176,5 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper
ARG 3 yStart
ARG 4 xEnd
ARG 5 yEnd
- METHOD method_27534 drawCenteredText (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Lnet/minecraft/class_5348;III)V
- ARG 1 matrices
- ARG 2 textRenderer
- ARG 4 x
- ARG 5 y
- ARG 6 color
- METHOD method_27535 drawTextWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Lnet/minecraft/class_5348;III)V
- ARG 1 matrices
- ARG 2 textRenderer
- ARG 4 x
- ARG 5 y
- ARG 6 color
+ METHOD method_27534 drawCenteredText (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Lnet/minecraft/class_2561;III)V
+ METHOD method_27535 drawTextWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Lnet/minecraft/class_2561;III)V
diff --git a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping
index 1a75bec31a..86d6760053 100644
--- a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping
+++ b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping
@@ -27,7 +27,7 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud
ARG 1 message
METHOD method_1813 getVisibleLineCount ()I
METHOD method_1814 getChatScale ()D
- METHOD method_1815 addMessage (Lnet/minecraft/class_5348;IIZ)V
+ METHOD method_1815 addMessage (Lnet/minecraft/class_2561;IIZ)V
ARG 2 messageId
ARG 3 timestamp
METHOD method_1816 getText (DD)Lnet/minecraft/class_2583;
diff --git a/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping b/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping
index db683a2ae2..46df6bcf1c 100644
--- a/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping
+++ b/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping
@@ -1,10 +1,10 @@
CLASS net/minecraft/class_303 net/minecraft/client/gui/hud/ChatHudLine
FIELD field_1649 id I
FIELD field_1650 creationTick I
- FIELD field_1651 text Lnet/minecraft/class_5348;
- METHOD (ILnet/minecraft/class_5348;I)V
+ FIELD field_1651 text Ljava/lang/Object;
+ METHOD (ILjava/lang/Object;I)V
ARG 1 creationTick
ARG 3 id
- METHOD method_1412 getText ()Lnet/minecraft/class_5348;
+ METHOD method_1412 getText ()Ljava/lang/Object;
METHOD method_1413 getId ()I
METHOD method_1414 getCreationTick ()I
diff --git a/mappings/net/minecraft/client/gui/screen/BackupPromptScreen.mapping b/mappings/net/minecraft/client/gui/screen/BackupPromptScreen.mapping
index 9e44ea4bc2..5d15ea061f 100644
--- a/mappings/net/minecraft/client/gui/screen/BackupPromptScreen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/BackupPromptScreen.mapping
@@ -4,7 +4,7 @@ CLASS net/minecraft/class_405 net/minecraft/client/gui/screen/BackupPromptScreen
FIELD field_19234 eraseCacheCheckbox Lnet/minecraft/class_4286;
FIELD field_2360 parent Lnet/minecraft/class_437;
FIELD field_2364 subtitle Lnet/minecraft/class_2561;
- FIELD field_2365 wrappedText Ljava/util/List;
+ FIELD field_2365 wrappedText Lnet/minecraft/class_5489;
METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_405$class_406;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Z)V
ARG 1 parent
ARG 2 callback
diff --git a/mappings/net/minecraft/client/gui/screen/CommandSuggestor.mapping b/mappings/net/minecraft/client/gui/screen/CommandSuggestor.mapping
index 85bf74fce4..e4a34ee9ea 100644
--- a/mappings/net/minecraft/client/gui/screen/CommandSuggestor.mapping
+++ b/mappings/net/minecraft/client/gui/screen/CommandSuggestor.mapping
@@ -42,7 +42,7 @@ CLASS net/minecraft/class_4717 net/minecraft/client/gui/screen/CommandSuggestor
ARG 1 keyCode
ARG 2 scanCode
ARG 3 modifiers
- METHOD method_23925 highlight (Lcom/mojang/brigadier/ParseResults;Ljava/lang/String;I)Lnet/minecraft/class_5348;
+ METHOD method_23925 highlight (Lcom/mojang/brigadier/ParseResults;Ljava/lang/String;I)Lnet/minecraft/class_5481;
ARG 0 parse
ARG 1 original
ARG 2 firstCharacterIndex
@@ -50,7 +50,7 @@ CLASS net/minecraft/class_4717 net/minecraft/client/gui/screen/CommandSuggestor
ARG 1 formatting
METHOD method_23930 getLastPlayerNameStart (Ljava/lang/String;)I
ARG 0 input
- METHOD method_23931 provideRenderText (Ljava/lang/String;I)Lnet/minecraft/class_5348;
+ METHOD method_23931 provideRenderText (Ljava/lang/String;I)Lnet/minecraft/class_5481;
ARG 1 original
ARG 2 firstCharacterIndex
METHOD method_23933 setWindowActive (Z)V
diff --git a/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping b/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping
index 904434e054..0e59f61f26 100644
--- a/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping
@@ -4,7 +4,7 @@ CLASS net/minecraft/class_410 net/minecraft/client/gui/screen/ConfirmScreen
FIELD field_2401 message Lnet/minecraft/class_2561;
FIELD field_2402 yesTranslated Lnet/minecraft/class_2561;
FIELD field_2403 callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;
- FIELD field_2404 messageSplit Ljava/util/List;
+ FIELD field_2404 messageSplit Lnet/minecraft/class_5489;
METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V
ARG 1 callback
ARG 2 title
diff --git a/mappings/net/minecraft/client/gui/screen/DatapackFailureScreen.mapping b/mappings/net/minecraft/client/gui/screen/DatapackFailureScreen.mapping
index 3d2856a29f..0c18d92d41 100644
--- a/mappings/net/minecraft/client/gui/screen/DatapackFailureScreen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/DatapackFailureScreen.mapping
@@ -1,2 +1,2 @@
CLASS net/minecraft/class_5346 net/minecraft/client/gui/screen/DatapackFailureScreen
- FIELD field_25265 wrappedText Ljava/util/List;
+ FIELD field_25265 wrappedText Lnet/minecraft/class_5489;
diff --git a/mappings/net/minecraft/client/gui/screen/DialogScreen.mapping b/mappings/net/minecraft/client/gui/screen/DialogScreen.mapping
index 756e6e1d8f..e6c99813c6 100644
--- a/mappings/net/minecraft/client/gui/screen/DialogScreen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/DialogScreen.mapping
@@ -1,12 +1,11 @@
CLASS net/minecraft/class_5405 net/minecraft/client/gui/screen/DialogScreen
FIELD field_25675 message Lnet/minecraft/class_5348;
FIELD field_25676 choiceButtons Lcom/google/common/collect/ImmutableList;
- FIELD field_25677 lines Ljava/util/List;
+ FIELD field_25677 lines Lnet/minecraft/class_5489;
FIELD field_25678 linesY I
FIELD field_25679 buttonWidth I
METHOD (Lnet/minecraft/class_2561;Ljava/util/List;Lcom/google/common/collect/ImmutableList;)V
ARG 1 title
- ARG 2 messageParts
ARG 3 choiceButtons
CLASS class_5406 ChoiceButton
FIELD field_25680 message Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/client/gui/screen/DisconnectedScreen.mapping b/mappings/net/minecraft/client/gui/screen/DisconnectedScreen.mapping
index 5419d02ec7..6e04b8028f 100644
--- a/mappings/net/minecraft/client/gui/screen/DisconnectedScreen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/DisconnectedScreen.mapping
@@ -2,8 +2,7 @@ CLASS net/minecraft/class_419 net/minecraft/client/gui/screen/DisconnectedScreen
FIELD field_2454 reasonHeight I
FIELD field_2456 parent Lnet/minecraft/class_437;
FIELD field_2457 reason Lnet/minecraft/class_2561;
- FIELD field_2458 reasonFormatted Ljava/util/List;
- METHOD (Lnet/minecraft/class_437;Ljava/lang/String;Lnet/minecraft/class_2561;)V
+ FIELD field_2458 reasonFormatted Lnet/minecraft/class_5489;
+ METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V
ARG 1 parent
- ARG 2 title
ARG 3 reason
diff --git a/mappings/net/minecraft/client/gui/screen/NoticeScreen.mapping b/mappings/net/minecraft/client/gui/screen/NoticeScreen.mapping
index e6339142e9..5279ebcc42 100644
--- a/mappings/net/minecraft/client/gui/screen/NoticeScreen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/NoticeScreen.mapping
@@ -1,7 +1,7 @@
CLASS net/minecraft/class_403 net/minecraft/client/gui/screen/NoticeScreen
FIELD field_2345 actionHandler Ljava/lang/Runnable;
FIELD field_2346 notice Lnet/minecraft/class_2561;
- FIELD field_2348 noticeLines Ljava/util/List;
+ FIELD field_2348 noticeLines Lnet/minecraft/class_5489;
FIELD field_2349 buttonString Lnet/minecraft/class_2561;
METHOD (Ljava/lang/Runnable;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V
ARG 1 actionHandler
diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping
index 81cd8adfe1..a7484c2e40 100644
--- a/mappings/net/minecraft/client/gui/screen/Screen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping
@@ -59,9 +59,8 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
ARG 1 client
ARG 2 width
ARG 3 height
- METHOD method_25424 renderTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_5348;II)V
+ METHOD method_25424 renderTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V
ARG 1 matrices
- ARG 2 text
ARG 3 x
ARG 4 y
METHOD method_25425 sendMessage (Ljava/lang/String;Z)V
diff --git a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping
index 4455df1ae2..64fb2cddd0 100644
--- a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping
@@ -48,9 +48,3 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen
CLASS class_4202 EntityStatsListWidget
CLASS class_4201 Entry
FIELD field_18762 entityType Lnet/minecraft/class_1299;
- METHOD method_19411 getKilledString (Ljava/lang/String;I)Ljava/lang/String;
- ARG 1 entityName
- ARG 2 killCount
- METHOD method_19412 getKilledByString (Ljava/lang/String;I)Ljava/lang/String;
- ARG 1 entityName
- ARG 2 killCount
diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping
index 4f11242854..02cfd0bc84 100644
--- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping
+++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping
@@ -9,7 +9,7 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/Advanc
FIELD field_2710 yPos I
FIELD field_2711 xPos I
FIELD field_2712 display Lnet/minecraft/class_185;
- FIELD field_2713 title Lnet/minecraft/class_5348;
+ FIELD field_2713 title Lnet/minecraft/class_5481;
FIELD field_2714 progress Lnet/minecraft/class_167;
FIELD field_2715 width I
METHOD (Lnet/minecraft/class_454;Lnet/minecraft/class_310;Lnet/minecraft/class_161;Lnet/minecraft/class_185;)V
diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping
index ae4c7e58fb..14ef40cbd5 100644
--- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping
@@ -5,6 +5,6 @@ CLASS net/minecraft/class_4749 net/minecraft/client/gui/screen/multiplayer/Multi
FIELD field_21845 checkMessage Lnet/minecraft/class_2561;
FIELD field_21846 proceedText Lnet/minecraft/class_2561;
FIELD field_21848 checkbox Lnet/minecraft/class_4286;
- FIELD field_21849 lines Ljava/util/List;
+ FIELD field_21849 lines Lnet/minecraft/class_5489;
METHOD (Lnet/minecraft/class_437;)V
ARG 1 parent
diff --git a/mappings/net/minecraft/client/gui/screen/pack/ResourcePackOrganizer.mapping b/mappings/net/minecraft/client/gui/screen/pack/ResourcePackOrganizer.mapping
index b83db1c38d..7064208bc9 100644
--- a/mappings/net/minecraft/client/gui/screen/pack/ResourcePackOrganizer.mapping
+++ b/mappings/net/minecraft/client/gui/screen/pack/ResourcePackOrganizer.mapping
@@ -15,7 +15,7 @@ CLASS net/minecraft/class_5369 net/minecraft/client/gui/screen/pack/ResourcePack
METHOD method_29650 getDisplayName ()Lnet/minecraft/class_2561;
METHOD method_29651 getDescription ()Lnet/minecraft/class_2561;
METHOD method_29652 getSource ()Lnet/minecraft/class_5352;
- METHOD method_29653 getDecoratedDescription ()Lnet/minecraft/class_5348;
+ METHOD method_29653 getDecoratedDescription ()Lnet/minecraft/class_2561;
METHOD method_29654 isPinned ()Z
METHOD method_29655 isAlwaysEnabled ()Z
METHOD method_29656 enable ()V
diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/AbstractFurnaceRecipeBookScreen.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/AbstractFurnaceRecipeBookScreen.mapping
index 4fa04cdac4..a5a7d5ab81 100644
--- a/mappings/net/minecraft/client/gui/screen/recipebook/AbstractFurnaceRecipeBookScreen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/recipebook/AbstractFurnaceRecipeBookScreen.mapping
@@ -4,6 +4,5 @@ CLASS net/minecraft/class_517 net/minecraft/client/gui/screen/recipebook/Abstrac
FIELD field_3151 frameTime F
FIELD field_3152 currentItem Lnet/minecraft/class_1792;
FIELD field_3153 fuelIterator Ljava/util/Iterator;
- METHOD method_17064 getToggleCraftableButtonText ()Lnet/minecraft/class_2561;
METHOD method_17065 getAllowedFuels ()Ljava/util/Set;
METHOD method_2658 getItem ()Lnet/minecraft/class_1792;
diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping
index 478d4fad8f..05b5bf49b1 100644
--- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping
+++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping
@@ -16,6 +16,7 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB
FIELD field_3100 parentHeight I
FIELD field_3101 parentWidth I
FIELD field_3102 leftOffset I
+ METHOD method_17064 getToggleCraftableButtonText ()Lnet/minecraft/class_2561;
METHOD method_2576 triggerPirateSpeakEasterEgg (Ljava/lang/String;)V
METHOD method_2579 reset (Z)V
ARG 1 narrow
diff --git a/mappings/net/minecraft/client/realms/DisconnectedRealmsScreen.mapping b/mappings/net/minecraft/client/realms/DisconnectedRealmsScreen.mapping
index 07c736932a..f28bdf1488 100644
--- a/mappings/net/minecraft/client/realms/DisconnectedRealmsScreen.mapping
+++ b/mappings/net/minecraft/client/realms/DisconnectedRealmsScreen.mapping
@@ -1,10 +1,9 @@
CLASS net/minecraft/class_4899 net/minecraft/client/realms/DisconnectedRealmsScreen
- FIELD field_22807 title Ljava/lang/String;
+ FIELD field_22807 title Lnet/minecraft/class_2561;
FIELD field_22808 reason Lnet/minecraft/class_2561;
- FIELD field_22809 lines Ljava/util/List;
+ FIELD field_22809 lines Lnet/minecraft/class_5489;
FIELD field_22810 parent Lnet/minecraft/class_437;
FIELD field_22811 textHeight I
- METHOD (Lnet/minecraft/class_437;Ljava/lang/String;Lnet/minecraft/class_2561;)V
+ METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V
ARG 1 parent
- ARG 2 titleTranslationKey
ARG 3 reason
diff --git a/mappings/net/minecraft/client/realms/RealmsClient.mapping b/mappings/net/minecraft/client/realms/RealmsClient.mapping
index 8355076601..db57754a31 100644
--- a/mappings/net/minecraft/client/realms/RealmsClient.mapping
+++ b/mappings/net/minecraft/client/realms/RealmsClient.mapping
@@ -94,7 +94,6 @@ CLASS net/minecraft/class_4341 net/minecraft/client/realms/RealmsClient
ARG 1 worldId
METHOD method_21026 upload (JLjava/lang/String;)Lnet/minecraft/class_4888;
ARG 1 worldId
- ARG 3 uploadToken
METHOD method_21027 clientCompatible ()Lnet/minecraft/class_4341$class_4342;
METHOD method_21028 deleteWorld (J)V
ARG 1 worldId
diff --git a/mappings/net/minecraft/client/realms/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/RealmsMainScreen.mapping
index 0ab4d6cba7..ba790bce0a 100644
--- a/mappings/net/minecraft/client/realms/RealmsMainScreen.mapping
+++ b/mappings/net/minecraft/client/realms/RealmsMainScreen.mapping
@@ -139,7 +139,6 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/RealmsMainScreen
ARG 1 serverData
CLASS class_4331 RealmSelectionListTrialEntry
METHOD method_20947 renderTrialItem (Lnet/minecraft/class_4587;IIIII)V
- ARG 1 matrices
ARG 2 index
ARG 3 x
ARG 4 y
diff --git a/mappings/net/minecraft/client/realms/ResettingWorldTask.mapping b/mappings/net/minecraft/client/realms/ResettingWorldTask.mapping
index 33898cd2c0..aab504ec19 100644
--- a/mappings/net/minecraft/client/realms/ResettingWorldTask.mapping
+++ b/mappings/net/minecraft/client/realms/ResettingWorldTask.mapping
@@ -4,13 +4,12 @@ CLASS net/minecraft/class_4440 net/minecraft/client/realms/ResettingWorldTask
FIELD field_20230 levelType I
FIELD field_20231 generateStructures Z
FIELD field_20232 serverId J
- FIELD field_20235 title Ljava/lang/String;
+ FIELD field_20235 title Lnet/minecraft/class_2561;
FIELD field_22732 callback Ljava/lang/Runnable;
- METHOD (Ljava/lang/String;Lnet/minecraft/class_4890;IZJLjava/lang/String;Ljava/lang/Runnable;)V
+ METHOD (Ljava/lang/String;Lnet/minecraft/class_4890;IZJLnet/minecraft/class_2561;Ljava/lang/Runnable;)V
ARG 1 seed
ARG 2 worldTemplate
ARG 3 levelType
ARG 4 generateStructures
ARG 5 serverId
- ARG 7 title
ARG 8 callback
diff --git a/mappings/net/minecraft/client/realms/UploadStatus.mapping b/mappings/net/minecraft/client/realms/UploadStatus.mapping
index 2d52f41d8c..55a9e409c8 100644
--- a/mappings/net/minecraft/client/realms/UploadStatus.mapping
+++ b/mappings/net/minecraft/client/realms/UploadStatus.mapping
@@ -1,3 +1,3 @@
CLASS net/minecraft/class_4351 net/minecraft/client/realms/UploadStatus
- FIELD field_19601 bytesWritten Ljava/lang/Long;
- FIELD field_19602 totalBytes Ljava/lang/Long;
+ FIELD field_19601 bytesWritten J
+ FIELD field_19602 totalBytes J
diff --git a/mappings/net/minecraft/client/realms/dto/UploadInfo.mapping b/mappings/net/minecraft/client/realms/dto/UploadInfo.mapping
index 01e6421673..889f2e3cc7 100644
--- a/mappings/net/minecraft/client/realms/dto/UploadInfo.mapping
+++ b/mappings/net/minecraft/client/realms/dto/UploadInfo.mapping
@@ -2,13 +2,9 @@ CLASS net/minecraft/class_4888 net/minecraft/client/realms/dto/UploadInfo
FIELD field_22657 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_22658 worldClosed Z
FIELD field_22659 token Ljava/lang/String;
- FIELD field_22660 uploadEndpoint Ljava/lang/String;
- FIELD field_22661 port I
+ FIELD field_22660 uploadEndpoint Ljava/net/URI;
METHOD method_25087 getToken ()Ljava/lang/String;
METHOD method_25088 parse (Ljava/lang/String;)Lnet/minecraft/class_4888;
ARG 0 json
- METHOD method_25089 getUploadEndpoint ()Ljava/lang/String;
- METHOD method_25090 setToken (Ljava/lang/String;)V
- ARG 1 token
+ METHOD method_25089 getUploadEndpoint ()Ljava/net/URI;
METHOD method_25091 isWorldClosed ()Z
- METHOD method_25092 getPort ()I
diff --git a/mappings/net/minecraft/client/realms/gui/LongRunningTask.mapping b/mappings/net/minecraft/client/realms/gui/LongRunningTask.mapping
index 05c5c67f64..24965b1e67 100644
--- a/mappings/net/minecraft/client/realms/gui/LongRunningTask.mapping
+++ b/mappings/net/minecraft/client/realms/gui/LongRunningTask.mapping
@@ -5,8 +5,7 @@ CLASS net/minecraft/class_4358 net/minecraft/client/realms/gui/LongRunningTask
METHOD method_21066 setScreen (Lnet/minecraft/class_4398;)V
ARG 1 longRunningMcoTaskScreen
METHOD method_21068 tick ()V
- METHOD method_21069 setTitle (Ljava/lang/String;)V
- ARG 1 title
+ METHOD method_21069 setTitle (Lnet/minecraft/class_2561;)V
METHOD method_21070 init ()V
METHOD method_21071 abortTask ()V
METHOD method_25287 pause (I)V
diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping
index d71c8d4724..bff26c5ac2 100644
--- a/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping
+++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping
@@ -3,7 +3,7 @@ CLASS net/minecraft/class_4381 net/minecraft/client/realms/gui/screen/RealmsBack
FIELD field_19742 lastScrollPosition I
FIELD field_19743 parent Lnet/minecraft/class_4388;
FIELD field_19744 backups Ljava/util/List;
- FIELD field_19745 toolTip Ljava/lang/String;
+ FIELD field_19745 toolTip Lnet/minecraft/class_2561;
FIELD field_19746 backupObjectSelectionList Lnet/minecraft/class_4381$class_4382;
FIELD field_19747 selectedBackup I
FIELD field_19748 slotId I
@@ -20,7 +20,7 @@ CLASS net/minecraft/class_4381 net/minecraft/client/realms/gui/screen/RealmsBack
METHOD method_21147 addToChangeList (Lnet/minecraft/class_4867;Ljava/lang/String;)V
ARG 1 backup
ARG 2 key
- METHOD method_21153 renderMousehoverTooltip (Lnet/minecraft/class_4587;Ljava/lang/String;II)V
+ METHOD method_21153 renderMousehoverTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V
METHOD method_21154 generateChangeList ()V
METHOD method_21155 restoreClicked (I)V
ARG 1 selectedBackup
diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsDownloadLatestWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsDownloadLatestWorldScreen.mapping
index 5fc64232b1..a95f660117 100644
--- a/mappings/net/minecraft/client/realms/gui/screen/RealmsDownloadLatestWorldScreen.mapping
+++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsDownloadLatestWorldScreen.mapping
@@ -35,5 +35,5 @@ CLASS net/minecraft/class_4392 net/minecraft/client/realms/gui/screen/RealmsDown
METHOD method_21278 downloadSave ()V
METHOD method_21279 downloadCancelled ()V
CLASS class_4393 DownloadStatus
- FIELD field_19871 bytesWritten Ljava/lang/Long;
- FIELD field_19872 totalBytes Ljava/lang/Long;
+ FIELD field_19871 bytesWritten J
+ FIELD field_19872 totalBytes J
diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsInviteScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsInviteScreen.mapping
index db37ecb769..be321b2cae 100644
--- a/mappings/net/minecraft/client/realms/gui/screen/RealmsInviteScreen.mapping
+++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsInviteScreen.mapping
@@ -3,12 +3,10 @@ CLASS net/minecraft/class_4395 net/minecraft/client/realms/gui/screen/RealmsInvi
FIELD field_19880 serverData Lnet/minecraft/class_4877;
FIELD field_19881 configureScreen Lnet/minecraft/class_4388;
FIELD field_19882 parent Lnet/minecraft/class_437;
- FIELD field_19887 errorMsg Ljava/lang/String;
- FIELD field_19888 showError Z
+ FIELD field_19887 errorMsg Lnet/minecraft/class_2561;
METHOD (Lnet/minecraft/class_4388;Lnet/minecraft/class_437;Lnet/minecraft/class_4877;)V
ARG 1 configureScreen
ARG 2 parent
ARG 3 serverData
METHOD method_21284 onInvite ()V
- METHOD method_21286 showError (Ljava/lang/String;)V
- ARG 1 errorMsg
+ METHOD method_21286 showError (Lnet/minecraft/class_2561;)V
diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsLongRunningMcoTaskScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsLongRunningMcoTaskScreen.mapping
index 26269dfd5d..8aa782e070 100644
--- a/mappings/net/minecraft/client/realms/gui/screen/RealmsLongRunningMcoTaskScreen.mapping
+++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsLongRunningMcoTaskScreen.mapping
@@ -2,8 +2,7 @@ CLASS net/minecraft/class_4398 net/minecraft/client/realms/gui/screen/RealmsLong
FIELD field_19908 symbols [Ljava/lang/String;
FIELD field_19909 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_19912 parent Lnet/minecraft/class_437;
- FIELD field_19914 title Ljava/lang/String;
- FIELD field_19915 error Z
+ FIELD field_19914 title Lnet/minecraft/class_2561;
FIELD field_19916 errorMessage Lnet/minecraft/class_2561;
FIELD field_19917 aborted Z
FIELD field_19918 animTicks I
@@ -13,7 +12,6 @@ CLASS net/minecraft/class_4398 net/minecraft/client/realms/gui/screen/RealmsLong
ARG 1 parent
ARG 2 task
METHOD method_21291 aborted ()Z
- METHOD method_21292 setTitle (Ljava/lang/String;)V
- ARG 1 title
+ METHOD method_21292 setTitle (Lnet/minecraft/class_2561;)V
METHOD method_21293 cancelOrBackButtonClicked ()V
METHOD method_25166 onError ()V
diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsParentalConsentScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsParentalConsentScreen.mapping
index 4ba788dc00..4ecb97da14 100644
--- a/mappings/net/minecraft/client/realms/gui/screen/RealmsParentalConsentScreen.mapping
+++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsParentalConsentScreen.mapping
@@ -1,4 +1,2 @@
CLASS net/minecraft/class_4400 net/minecraft/client/realms/gui/screen/RealmsParentalConsentScreen
FIELD field_22701 parent Lnet/minecraft/class_437;
- METHOD (Lnet/minecraft/class_437;)V
- ARG 1 parent
diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping
index 36f1e7c94c..ac6686a1e2 100644
--- a/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping
+++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping
@@ -1,7 +1,7 @@
CLASS net/minecraft/class_4401 net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen
FIELD field_19935 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_19936 parent Lnet/minecraft/class_437;
- FIELD field_19937 toolTip Ljava/lang/String;
+ FIELD field_19937 toolTip Lnet/minecraft/class_2561;
FIELD field_19938 loaded Z
FIELD field_19939 pendingInvitationSelectionList Lnet/minecraft/class_4401$class_4402;
FIELD field_19940 titleLabel Lnet/minecraft/class_4903;
@@ -14,7 +14,7 @@ CLASS net/minecraft/class_4401 net/minecraft/client/realms/gui/screen/RealmsPend
ARG 1 parent
METHOD method_21300 updateList (I)V
ARG 1 slot
- METHOD method_21306 renderMousehoverTooltip (Lnet/minecraft/class_4587;Ljava/lang/String;II)V
+ METHOD method_21306 renderMousehoverTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V
METHOD method_21307 updateButtonStates ()V
METHOD method_21308 reject (I)V
ARG 1 slot
diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping
index a8c7842d80..3ed08b521e 100644
--- a/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping
+++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping
@@ -1,6 +1,6 @@
CLASS net/minecraft/class_4406 net/minecraft/client/realms/gui/screen/RealmsPlayerScreen
FIELD field_19958 LOGGER Lorg/apache/logging/log4j/Logger;
- FIELD field_19959 tooltipText Ljava/lang/String;
+ FIELD field_19959 tooltipText Lnet/minecraft/class_2561;
FIELD field_19960 parent Lnet/minecraft/class_4388;
FIELD field_19961 serverData Lnet/minecraft/class_4877;
FIELD field_19962 invitedObjectSelectionList Lnet/minecraft/class_4406$class_4407;
@@ -19,7 +19,6 @@ CLASS net/minecraft/class_4406 net/minecraft/client/realms/gui/screen/RealmsPlay
FIELD field_22706 CROSS_PLAYER_ICON Lnet/minecraft/class_2960;
FIELD field_22707 OPTIONS_BACKGROUND Lnet/minecraft/class_2960;
METHOD (Lnet/minecraft/class_4388;Lnet/minecraft/class_4877;)V
- ARG 1 parent
ARG 2 serverData
METHOD method_21325 updateButtonStates ()V
METHOD method_21326 shouldRemoveAndOpdeopButtonBeVisible (I)Z
@@ -27,9 +26,8 @@ CLASS net/minecraft/class_4406 net/minecraft/client/realms/gui/screen/RealmsPlay
METHOD method_21327 drawRemoveIcon (Lnet/minecraft/class_4587;IIII)V
METHOD method_21328 updateOps (Lnet/minecraft/class_4870;)V
ARG 1 ops
- METHOD method_21332 renderMousehoverTooltip (Lnet/minecraft/class_4587;Ljava/lang/String;II)V
+ METHOD method_21332 renderMousehoverTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V
ARG 1 matrices
- ARG 2 text
ARG 3 mouseX
ARG 4 mouseY
METHOD method_21333 backButtonClicked ()V
diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsResetWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsResetWorldScreen.mapping
index 1679200813..bf9e3588bb 100644
--- a/mappings/net/minecraft/client/realms/gui/screen/RealmsResetWorldScreen.mapping
+++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsResetWorldScreen.mapping
@@ -22,14 +22,12 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsRese
METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;ILnet/minecraft/class_2561;Ljava/lang/Runnable;Ljava/lang/Runnable;)V
ARG 1 parent
METHOD method_21370 drawFrame (Lnet/minecraft/class_4587;IILnet/minecraft/class_2561;Lnet/minecraft/class_2960;ZZ)V
- ARG 1 matrices
ARG 2 x
ARG 3 y
ARG 4 text
METHOD method_21372 resetWorld (Lnet/minecraft/class_4410$class_4413;)V
ARG 1 resetWorldInfo
- METHOD method_21376 setResetTitle (Ljava/lang/String;)V
- ARG 1 title
+ METHOD method_21376 setResetTitle (Lnet/minecraft/class_2561;)V
METHOD method_21377 switchSlot (Ljava/lang/Runnable;)V
ARG 1 callback
METHOD method_21378 switchSlot ()V
diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping
index 686197a269..bc2c030aad 100644
--- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping
+++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping
@@ -8,8 +8,8 @@ CLASS net/minecraft/class_4416 net/minecraft/client/realms/gui/screen/RealmsSele
FIELD field_20055 levelList Ljava/util/List;
FIELD field_20056 selectedWorld I
FIELD field_20057 worldSelectionList Lnet/minecraft/class_4416$class_4418;
- FIELD field_20058 worldLang Ljava/lang/String;
- FIELD field_20059 conversionLang Ljava/lang/String;
+ FIELD field_20058 worldLang Lnet/minecraft/class_2561;
+ FIELD field_20059 conversionLang Lnet/minecraft/class_2561;
FIELD field_20061 titleLabel Lnet/minecraft/class_4903;
FIELD field_20062 subtitleLabel Lnet/minecraft/class_4903;
METHOD (JILnet/minecraft/class_4410;Ljava/lang/Runnable;)V
diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping
index 861e79c3c5..383fdaf392 100644
--- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping
+++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping
@@ -7,7 +7,7 @@ CLASS net/minecraft/class_4419 net/minecraft/client/realms/gui/screen/RealmsSele
FIELD field_20074 selectButton Lnet/minecraft/class_4185;
FIELD field_20075 trailerButton Lnet/minecraft/class_4185;
FIELD field_20076 publisherButton Lnet/minecraft/class_4185;
- FIELD field_20077 toolTip Ljava/lang/String;
+ FIELD field_20077 toolTip Lnet/minecraft/class_2561;
FIELD field_20078 currentLink Ljava/lang/String;
FIELD field_20079 worldType Lnet/minecraft/class_4877$class_4321;
FIELD field_20080 clicks I
@@ -29,7 +29,7 @@ CLASS net/minecraft/class_4419 net/minecraft/client/realms/gui/screen/RealmsSele
METHOD method_21415 setPagination (Lnet/minecraft/class_4891;)V
METHOD method_21423 setTitle (Lnet/minecraft/class_2561;)V
ARG 1 title
- METHOD method_21424 renderMousehoverTooltip (Lnet/minecraft/class_4587;Ljava/lang/String;II)V
+ METHOD method_21424 renderMousehoverTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V
METHOD method_21425 updateButtonStates ()V
METHOD method_21429 setWarning ([Lnet/minecraft/class_2561;)V
METHOD method_21430 shouldSelectButtonBeActive ()Z
diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping
index 9fb05ddf7d..f17fbe3635 100644
--- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping
+++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping
@@ -3,20 +3,19 @@ CLASS net/minecraft/class_4425 net/minecraft/client/realms/gui/screen/RealmsSubs
FIELD field_20147 parent Lnet/minecraft/class_437;
FIELD field_20148 serverData Lnet/minecraft/class_4877;
FIELD field_20149 mainScreen Lnet/minecraft/class_437;
- FIELD field_20153 subscriptionTitle Ljava/lang/String;
- FIELD field_20154 subscriptionStartLabelText Ljava/lang/String;
- FIELD field_20155 timeLeftLabelText Ljava/lang/String;
- FIELD field_20156 daysLeftLabelText Ljava/lang/String;
- FIELD field_20157 daysLeft I
+ FIELD field_20153 subscriptionTitle Lnet/minecraft/class_2561;
+ FIELD field_20154 subscriptionStartLabelText Lnet/minecraft/class_2561;
+ FIELD field_20155 timeLeftLabelText Lnet/minecraft/class_2561;
+ FIELD field_20156 daysLeftLabelText Lnet/minecraft/class_2561;
+ FIELD field_20157 daysLeft Lnet/minecraft/class_2561;
FIELD field_20158 startDate Ljava/lang/String;
FIELD field_20159 type Lnet/minecraft/class_4887$class_4322;
METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;Lnet/minecraft/class_437;)V
ARG 1 parent
ARG 2 serverData
ARG 3 mainScreen
- METHOD method_21499 daysLeftPresentation (I)Ljava/lang/String;
+ METHOD method_21499 daysLeftPresentation (I)Lnet/minecraft/class_2561;
ARG 1 daysLeft
METHOD method_21500 getSubscription (J)V
ARG 1 worldId
METHOD method_21502 localPresentation (J)Ljava/lang/String;
- ARG 1 cetTime
diff --git a/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping b/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping
index 7b931ae610..6e853f27f8 100644
--- a/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping
+++ b/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping
@@ -5,7 +5,6 @@ CLASS net/minecraft/class_1078 net/minecraft/client/resource/language/Translatio
METHOD (Ljava/util/Map;Z)V
ARG 1 translations
ARG 2 rightToLeft
- METHOD method_29390 reorder (Ljava/lang/String;)Ljava/lang/String;
METHOD method_4675 load (Lnet/minecraft/class_3300;Ljava/util/List;)Lnet/minecraft/class_1078;
ARG 0 resourceManager
ARG 1 definitions
diff --git a/mappings/net/minecraft/client/toast/SystemToast.mapping b/mappings/net/minecraft/client/toast/SystemToast.mapping
index 21408c7c20..7ba6e7c2e4 100644
--- a/mappings/net/minecraft/client/toast/SystemToast.mapping
+++ b/mappings/net/minecraft/client/toast/SystemToast.mapping
@@ -1,7 +1,7 @@
CLASS net/minecraft/class_370 net/minecraft/client/toast/SystemToast
FIELD field_2213 type Lnet/minecraft/class_370$class_371;
FIELD field_2214 justUpdated Z
- FIELD field_2215 title Lnet/minecraft/class_5348;
+ FIELD field_2215 title Lnet/minecraft/class_2561;
FIELD field_2216 startTime J
FIELD field_25037 lines Ljava/util/List;
FIELD field_25038 width I
diff --git a/mappings/net/minecraft/command/argument/NumberRangeArgumentType.mapping b/mappings/net/minecraft/command/argument/NumberRangeArgumentType.mapping
index 1f640a0730..b51a2eb076 100644
--- a/mappings/net/minecraft/command/argument/NumberRangeArgumentType.mapping
+++ b/mappings/net/minecraft/command/argument/NumberRangeArgumentType.mapping
@@ -2,9 +2,6 @@ CLASS net/minecraft/class_2224 net/minecraft/command/argument/NumberRangeArgumen
METHOD method_9422 numberRange ()Lnet/minecraft/class_2224$class_2227;
CLASS class_2225 FloatRangeArgumentType
FIELD field_9937 EXAMPLES Ljava/util/Collection;
- CLASS class_2226 Serializer
CLASS class_2227 IntRangeArgumentType
FIELD field_9938 EXAMPLES Ljava/util/Collection;
METHOD method_9425 getRangeArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2096$class_2100;
- CLASS class_2228 Serializer
- CLASS class_2229 NumberSerializer
diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/InteractableDoorsSensor.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/InteractableDoorsSensor.mapping
deleted file mode 100644
index 8352d7a65a..0000000000
--- a/mappings/net/minecraft/entity/ai/brain/sensor/InteractableDoorsSensor.mapping
+++ /dev/null
@@ -1 +0,0 @@
-CLASS net/minecraft/class_4145 net/minecraft/entity/ai/brain/sensor/InteractableDoorsSensor
diff --git a/mappings/net/minecraft/entity/ai/brain/task/OpenDoorsTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/OpenDoorsTask.mapping
index 77934bf4dc..59f2171356 100644
--- a/mappings/net/minecraft/entity/ai/brain/task/OpenDoorsTask.mapping
+++ b/mappings/net/minecraft/entity/ai/brain/task/OpenDoorsTask.mapping
@@ -1,18 +1 @@
CLASS net/minecraft/class_4107 net/minecraft/entity/ai/brain/task/OpenDoorsTask
- METHOD method_19567 getDoorsOnPath (Lnet/minecraft/class_3218;Ljava/util/List;Ljava/util/List;)Ljava/util/Set;
- ARG 1 world
- ARG 2 doors
- ARG 3 path
- METHOD method_21697 closeOpenedDoors (Lnet/minecraft/class_3218;Ljava/util/List;ILnet/minecraft/class_1309;Lnet/minecraft/class_4095;)V
- ARG 0 world
- ARG 1 path
- ARG 2 currentPathIndex
- ARG 3 entity
- ARG 4 brain
- METHOD method_21698 findAndCloseOpenedDoors (Lnet/minecraft/class_3218;Ljava/util/List;Ljava/util/Set;ILnet/minecraft/class_1309;Lnet/minecraft/class_4095;)V
- ARG 1 world
- ARG 2 path
- ARG 3 doors
- ARG 4 lastNodeIndex
- ARG 5 entity
- ARG 6 brain
diff --git a/mappings/net/minecraft/entity/ai/brain/task/WanderAroundTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WanderAroundTask.mapping
index fdcdda4795..7198dc277c 100644
--- a/mappings/net/minecraft/entity/ai/brain/task/WanderAroundTask.mapping
+++ b/mappings/net/minecraft/entity/ai/brain/task/WanderAroundTask.mapping
@@ -3,8 +3,6 @@ CLASS net/minecraft/class_4112 net/minecraft/entity/ai/brain/task/WanderAroundTa
FIELD field_18370 lookTargetPos Lnet/minecraft/class_2338;
FIELD field_18371 speed F
FIELD field_18964 pathUpdateCountdownTicks I
- METHOD (I)V
- ARG 1 runTime
METHOD method_18977 hasFinishedPath (Lnet/minecraft/class_1308;Lnet/minecraft/class_4142;J)Z
ARG 3 time
METHOD method_18980 hasReached (Lnet/minecraft/class_1308;Lnet/minecraft/class_4142;)Z
diff --git a/mappings/net/minecraft/entity/ai/pathing/Path.mapping b/mappings/net/minecraft/entity/ai/pathing/Path.mapping
index 30cf31a1da..36fd37056f 100644
--- a/mappings/net/minecraft/entity/ai/pathing/Path.mapping
+++ b/mappings/net/minecraft/entity/ai/pathing/Path.mapping
@@ -8,7 +8,6 @@ CLASS net/minecraft/class_11 net/minecraft/entity/ai/pathing/Path
ARG 1 nodes
ARG 2 target
ARG 3 reachesTarget
- METHOD method_19314 getNodes ()Ljava/util/List;
METHOD method_21655 reachesTarget ()Z
METHOD method_21656 getManhattanDistanceFromTarget ()F
METHOD method_33 setNode (ILnet/minecraft/class_9;)V
diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping
index 5309a9530a..f81bb1fda9 100644
--- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping
+++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping
@@ -64,7 +64,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity
METHOD method_23668 checkFallFlying ()Z
METHOD method_23669 startFallFlying ()V
METHOD method_23670 stopFallFlying ()V
- METHOD method_26091 findRespawnPosition (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;ZZ)Ljava/util/Optional;
+ METHOD method_26091 findRespawnPosition (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;FZZ)Ljava/util/Optional;
ARG 0 world
ARG 1 pos
METHOD method_26956 createPlayerAttributes ()Lnet/minecraft/class_5132$class_5133;
diff --git a/mappings/net/minecraft/item/ItemGroup.mapping b/mappings/net/minecraft/item/ItemGroup.mapping
index 43df71cafd..a612f4e43e 100644
--- a/mappings/net/minecraft/item/ItemGroup.mapping
+++ b/mappings/net/minecraft/item/ItemGroup.mapping
@@ -24,7 +24,7 @@ CLASS net/minecraft/class_1761 net/minecraft/item/ItemGroup
METHOD (ILjava/lang/String;)V
ARG 1 index
ARG 2 id
- METHOD method_7737 getTranslationKey ()Ljava/lang/String;
+ METHOD method_7737 getTranslationKey ()Lnet/minecraft/class_2561;
METHOD method_7738 appendStacks (Lnet/minecraft/class_2371;)V
ARG 1 stacks
METHOD method_7739 setName (Ljava/lang/String;)Lnet/minecraft/class_1761;
@@ -37,7 +37,6 @@ CLASS net/minecraft/class_1761 net/minecraft/item/ItemGroup
METHOD method_7744 getEnchantments ()[Lnet/minecraft/class_1886;
METHOD method_7745 setEnchantments ([Lnet/minecraft/class_1886;)Lnet/minecraft/class_1761;
ARG 1 targets
- METHOD method_7746 getId ()Ljava/lang/String;
METHOD method_7747 getIcon ()Lnet/minecraft/class_1799;
METHOD method_7748 setNoTooltip ()Lnet/minecraft/class_1761;
METHOD method_7749 setNoScrollbar ()Lnet/minecraft/class_1761;
diff --git a/mappings/net/minecraft/network/packet/s2c/play/CommandTreeS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CommandTreeS2CPacket.mapping
index f89fc90f2d..6aabc3dc9b 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/CommandTreeS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/CommandTreeS2CPacket.mapping
@@ -3,13 +3,9 @@ CLASS net/minecraft/class_2641 net/minecraft/network/packet/s2c/play/CommandTree
METHOD (Lcom/mojang/brigadier/tree/RootCommandNode;)V
ARG 1 commandTree
METHOD method_11401 writeNode (Lnet/minecraft/class_2540;Lcom/mojang/brigadier/tree/CommandNode;Ljava/util/Map;)V
- ARG 1 buf
- ARG 2 node
METHOD method_11402 readArgumentBuilder (Lnet/minecraft/class_2540;B)Lcom/mojang/brigadier/builder/ArgumentBuilder;
- ARG 1 buf
METHOD method_11403 getCommandTree ()Lcom/mojang/brigadier/tree/RootCommandNode;
METHOD method_11405 readCommandNode (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2641$class_2642;
- ARG 1 buf
CLASS class_2642 CommandNodeData
FIELD field_12124 flags B
FIELD field_12125 childNodeIndices [I
diff --git a/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping b/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping
index 7afff9c2e3..85704c17e4 100644
--- a/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping
+++ b/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping
@@ -12,7 +12,7 @@ CLASS net/minecraft/class_3364 net/minecraft/server/rcon/QueryResponseHandler
FIELD field_14454 hostname Ljava/lang/String;
FIELD field_14456 maxPlayerCount I
FIELD field_14457 port I
- METHOD (Lnet/minecraft/class_2994;)V
+ METHOD (Lnet/minecraft/class_2994;I)V
ARG 1 server
METHOD method_14746 cleanUp ()V
METHOD method_14747 createRulesReply (Ljava/net/DatagramPacket;)[B
diff --git a/mappings/net/minecraft/server/rcon/RconBase.mapping b/mappings/net/minecraft/server/rcon/RconBase.mapping
index bf5133ed48..b724c2d694 100644
--- a/mappings/net/minecraft/server/rcon/RconBase.mapping
+++ b/mappings/net/minecraft/server/rcon/RconBase.mapping
@@ -6,6 +6,6 @@ CLASS net/minecraft/class_3359 net/minecraft/server/rcon/RconBase
FIELD field_14431 running Z
METHOD (Ljava/lang/String;)V
ARG 1 description
- METHOD method_14728 start ()V
+ METHOD method_14728 start ()Z
METHOD method_14731 isRunning ()Z
METHOD method_18050 stop ()V
diff --git a/mappings/net/minecraft/server/rcon/RconListener.mapping b/mappings/net/minecraft/server/rcon/RconListener.mapping
index 819aaf9f48..d7e577f628 100644
--- a/mappings/net/minecraft/server/rcon/RconListener.mapping
+++ b/mappings/net/minecraft/server/rcon/RconListener.mapping
@@ -1,13 +1,9 @@
CLASS net/minecraft/class_3408 net/minecraft/server/rcon/RconListener
- FIELD field_14510 port I
FIELD field_14511 listener Ljava/net/ServerSocket;
FIELD field_14512 password Ljava/lang/String;
- FIELD field_14513 hostname Ljava/lang/String;
FIELD field_14514 clients Ljava/util/List;
FIELD field_23966 SERVER_LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_23967 server Lnet/minecraft/class_2994;
- METHOD (Lnet/minecraft/class_2994;)V
- ARG 1 server
METHOD method_14820 removeStoppedClients ()V
METHOD method_27176 closeSocket (Ljava/net/ServerSocket;)V
ARG 1 socket
diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping
index 9adcfe6abf..6bd8228ff8 100644
--- a/mappings/net/minecraft/server/world/ServerWorld.mapping
+++ b/mappings/net/minecraft/server/world/ServerWorld.mapping
@@ -144,7 +144,6 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
ARG 0 player
METHOD method_18776 getAliveEnderDragons ()Ljava/util/List;
METHOD method_18777 checkUuid (Lnet/minecraft/class_1297;)Z
- ARG 1 entity
METHOD method_18778 loadEntityUnchecked (Lnet/minecraft/class_1297;)V
ARG 1 entity
METHOD method_18779 getRandomAlivePlayer ()Lnet/minecraft/class_3222;
diff --git a/mappings/net/minecraft/text/TranslatableText.mapping b/mappings/net/minecraft/text/TranslatableText.mapping
index 74b543a283..1d26b01834 100644
--- a/mappings/net/minecraft/text/TranslatableText.mapping
+++ b/mappings/net/minecraft/text/TranslatableText.mapping
@@ -14,7 +14,6 @@ CLASS net/minecraft/class_2588 net/minecraft/text/TranslatableText
ARG 2 args
METHOD method_11022 getKey ()Ljava/lang/String;
METHOD method_11023 getArgs ()[Ljava/lang/Object;
- METHOD method_11024 setTranslation (Ljava/lang/String;Lnet/minecraft/class_2477;)V
+ METHOD method_11024 setTranslation (Ljava/lang/String;)V
ARG 1 translation
- ARG 2 language
METHOD method_11025 updateTranslations ()V
diff --git a/mappings/net/minecraft/util/Language.mapping b/mappings/net/minecraft/util/Language.mapping
index 41f6b5d05a..7c0cbcb5ca 100644
--- a/mappings/net/minecraft/util/Language.mapping
+++ b/mappings/net/minecraft/util/Language.mapping
@@ -7,9 +7,6 @@ CLASS net/minecraft/class_2477 net/minecraft/util/Language
METHOD method_29425 load (Ljava/io/InputStream;Ljava/util/function/BiConsumer;)V
ARG 0 inputStream
ARG 1 entryConsumer
- METHOD method_29426 reorder (Ljava/lang/String;Z)Ljava/lang/String;
- ARG 1 string
- ARG 2 allowTokens
METHOD method_29427 setInstance (Lnet/minecraft/class_2477;)V
ARG 0 language
METHOD method_29428 isRightToLeft ()Z
diff --git a/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping
index 652306bc94..fa79a9c9d4 100644
--- a/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping
+++ b/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping
@@ -2,8 +2,6 @@ CLASS net/minecraft/class_5216 net/minecraft/util/math/noise/DoublePerlinNoiseSa
FIELD field_24175 amplitude D
FIELD field_24176 firstSampler Lnet/minecraft/class_3537;
FIELD field_24177 secondSampler Lnet/minecraft/class_3537;
- METHOD (Lnet/minecraft/class_2919;Ljava/util/List;)V
- ARG 2 octaves
METHOD method_27406 sample (DDD)D
ARG 1 x
ARG 3 y
diff --git a/mappings/net/minecraft/village/raid/Raid.mapping b/mappings/net/minecraft/village/raid/Raid.mapping
index e54db2f380..78daa194d9 100644
--- a/mappings/net/minecraft/village/raid/Raid.mapping
+++ b/mappings/net/minecraft/village/raid/Raid.mapping
@@ -14,9 +14,9 @@ CLASS net/minecraft/class_3765 net/minecraft/village/raid/Raid
FIELD field_16621 wavesSpawned I
FIELD field_16623 badOmenLevel I
FIELD field_16625 id I
- FIELD field_19016 EVENT_TEXT Lnet/minecraft/class_2588;
- FIELD field_19017 VICTORY_SUFFIX_TEXT Lnet/minecraft/class_2588;
- FIELD field_19018 DEFEAT_SUFFIX_TEXT Lnet/minecraft/class_2588;
+ FIELD field_19016 EVENT_TEXT Lnet/minecraft/class_2561;
+ FIELD field_19017 VICTORY_SUFFIX_TEXT Lnet/minecraft/class_2561;
+ FIELD field_19018 DEFEAT_SUFFIX_TEXT Lnet/minecraft/class_2561;
FIELD field_19019 VICTORY_TITLE Lnet/minecraft/class_2561;
FIELD field_19020 DEFEAT_TITLE Lnet/minecraft/class_2561;
FIELD field_19021 heroesOfTheVillage Ljava/util/Set;
diff --git a/mappings/net/minecraft/world/MobSpawnerLogic.mapping b/mappings/net/minecraft/world/MobSpawnerLogic.mapping
index b6204c0da1..144c087cda 100644
--- a/mappings/net/minecraft/world/MobSpawnerLogic.mapping
+++ b/mappings/net/minecraft/world/MobSpawnerLogic.mapping
@@ -10,7 +10,6 @@ CLASS net/minecraft/class_1917 net/minecraft/world/MobSpawnerLogic
FIELD field_9157 spawnRange I
FIELD field_9158 requiredPlayerRange I
FIELD field_9160 maxNearbyEntities I
- METHOD method_18086 spawnEntity (Lnet/minecraft/class_1297;)V
METHOD method_8271 getWorld ()Lnet/minecraft/class_1937;
METHOD method_8272 toTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
ARG 1 tag
diff --git a/mappings/net/minecraft/world/biome/BadlandsBiome.mapping b/mappings/net/minecraft/world/biome/BadlandsBiome.mapping
deleted file mode 100644
index c373c90257..0000000000
--- a/mappings/net/minecraft/world/biome/BadlandsBiome.mapping
+++ /dev/null
@@ -1 +0,0 @@
-CLASS net/minecraft/class_1956 net/minecraft/world/biome/BadlandsBiome
diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping
index fa06fd994f..f5e867d8ca 100644
--- a/mappings/net/minecraft/world/biome/Biome.mapping
+++ b/mappings/net/minecraft/world/biome/Biome.mapping
@@ -1,30 +1,19 @@
CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome
FIELD field_20335 temperatureCache Ljava/lang/ThreadLocal;
- FIELD field_21806 skyColor I
FIELD field_22039 effects Lnet/minecraft/class_4763;
- FIELD field_22040 structureFeatures Ljava/util/List;
- FIELD field_24406 spawnDensities Ljava/util/Map;
FIELD field_9323 BIOMES Ljava/util/Set;
FIELD field_9324 FOLIAGE_NOISE Lnet/minecraft/class_3543;
- FIELD field_9325 spawns Ljava/util/Map;
- FIELD field_9326 features Ljava/util/List;
- FIELD field_9327 precipitation Lnet/minecraft/class_1959$class_1963;
FIELD field_9329 category Lnet/minecraft/class_1959$class_1961;
FIELD field_9330 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_9332 parent Ljava/lang/String;
- FIELD field_9333 carvers Ljava/util/Map;
FIELD field_9334 flowerFeatures Ljava/util/List;
FIELD field_9335 TEMPERATURE_NOISE Lnet/minecraft/class_3543;
- FIELD field_9336 surfaceBuilder Ljava/util/function/Supplier;
- FIELD field_9338 downfall F
- FIELD field_9339 temperature F
FIELD field_9341 scale F
FIELD field_9343 depth F
METHOD (Lnet/minecraft/class_1959$class_1960;)V
ARG 1 settings
METHOD method_21740 getTemperature (Lnet/minecraft/class_2338;)F
ARG 1 blockPos
- METHOD method_24218 calculateSkyColor ()I
METHOD method_24376 getFogColor ()I
METHOD method_24377 getEffects ()Lnet/minecraft/class_4763;
METHOD method_24378 getParticleConfig ()Ljava/util/Optional;
@@ -84,7 +73,6 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome
ARG 1 world
ARG 2 blockPos
METHOD method_8707 computeTemperature (Lnet/minecraft/class_2338;)F
- ARG 1 blockPos
METHOD method_8708 addSpawn (Lnet/minecraft/class_1311;Lnet/minecraft/class_1959$class_1964;)V
ARG 1 group
ARG 2 spawnEntry
diff --git a/mappings/net/minecraft/world/biome/BiomeEffects.mapping b/mappings/net/minecraft/world/biome/BiomeEffects.mapping
index cf2dd8ffe0..2ef7ce51b9 100644
--- a/mappings/net/minecraft/world/biome/BiomeEffects.mapping
+++ b/mappings/net/minecraft/world/biome/BiomeEffects.mapping
@@ -8,15 +8,10 @@ CLASS net/minecraft/class_4763 net/minecraft/world/biome/BiomeEffects
FIELD field_22493 additionsSound Ljava/util/Optional;
FIELD field_24113 music Ljava/util/Optional;
FIELD field_24714 CODEC Lcom/mojang/serialization/Codec;
- METHOD (IIILjava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V
+ METHOD (IIIILjava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_4763$class_5486;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V
ARG 1 fogColor
ARG 2 waterColor
ARG 3 waterFogColor
- ARG 4 particleConfig
- ARG 5 loopSound
- ARG 6 moodSound
- ARG 7 additionsSound
- ARG 8 music
METHOD method_24387 getFogColor ()I
METHOD method_24388 getWaterColor ()I
METHOD method_24389 getWaterFogColor ()I
diff --git a/mappings/net/minecraft/world/biome/DarkForestBiome.mapping b/mappings/net/minecraft/world/biome/DarkForestBiome.mapping
deleted file mode 100644
index fb0eae9673..0000000000
--- a/mappings/net/minecraft/world/biome/DarkForestBiome.mapping
+++ /dev/null
@@ -1 +0,0 @@
-CLASS net/minecraft/class_1978 net/minecraft/world/biome/DarkForestBiome
diff --git a/mappings/net/minecraft/world/biome/FrozenOceanBiome.mapping b/mappings/net/minecraft/world/biome/FrozenOceanBiome.mapping
deleted file mode 100644
index 257f09dc21..0000000000
--- a/mappings/net/minecraft/world/biome/FrozenOceanBiome.mapping
+++ /dev/null
@@ -1 +0,0 @@
-CLASS net/minecraft/class_5476 net/minecraft/world/biome/FrozenOceanBiome
diff --git a/mappings/net/minecraft/world/biome/SnowyTundraBiome.mapping b/mappings/net/minecraft/world/biome/SnowyTundraBiome.mapping
deleted file mode 100644
index 2615dc4c96..0000000000
--- a/mappings/net/minecraft/world/biome/SnowyTundraBiome.mapping
+++ /dev/null
@@ -1 +0,0 @@
-CLASS net/minecraft/class_5477 net/minecraft/world/biome/SnowyTundraBiome
diff --git a/mappings/net/minecraft/world/biome/SwampBiome.mapping b/mappings/net/minecraft/world/biome/SwampBiome.mapping
deleted file mode 100644
index 293c52c170..0000000000
--- a/mappings/net/minecraft/world/biome/SwampBiome.mapping
+++ /dev/null
@@ -1 +0,0 @@
-CLASS net/minecraft/class_2151 net/minecraft/world/biome/SwampBiome
diff --git a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping
index d0cffb0f4d..5bee5f4692 100644
--- a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping
+++ b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping
@@ -7,9 +7,6 @@ CLASS net/minecraft/class_4766 net/minecraft/world/biome/source/MultiNoiseBiomeS
FIELD field_24116 threeDimensionalSampling Z
FIELD field_24719 CODEC Lcom/mojang/serialization/Codec;
FIELD field_24720 seed J
- METHOD (JLjava/util/List;)V
- ARG 1 seed
- ARG 3 biomePoints
METHOD (JLjava/util/List;Ljava/util/Optional;)V
ARG 1 seed
CLASS class_5305 Preset