diff --git a/build.gradle b/build.gradle index f3850e8350..ab7052cc3d 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "23w14a" +def minecraft_version = "23w16a" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 42629c0685..36ceade7d2 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -922,10 +922,6 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 2 pos METHOD method_26245 blockVision (Lnet/minecraft/class_4970$class_4973;)Lnet/minecraft/class_4970$class_2251; ARG 1 predicate - METHOD method_26246 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z - ARG 1 state - ARG 2 world - ARG 3 pos METHOD method_26247 postProcess (Lnet/minecraft/class_4970$class_4973;)Lnet/minecraft/class_4970$class_2251; ARG 1 predicate METHOD method_26248 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z diff --git a/mappings/net/minecraft/block/CalibratedSculkSensorBlock.mapping b/mappings/net/minecraft/block/CalibratedSculkSensorBlock.mapping index 229a0ba6d4..d55d229ba0 100644 --- a/mappings/net/minecraft/block/CalibratedSculkSensorBlock.mapping +++ b/mappings/net/minecraft/block/CalibratedSculkSensorBlock.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_8236 net/minecraft/block/CalibratedSculkSensorBlock FIELD field_43235 FACING Lnet/minecraft/class_2753; METHOD method_49813 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_8239;)V - ARG 0 world ARG 1 pos ARG 2 state - ARG 3 blockEntity diff --git a/mappings/net/minecraft/block/Crop.mapping b/mappings/net/minecraft/block/Crop.mapping deleted file mode 100644 index d1c900d310..0000000000 --- a/mappings/net/minecraft/block/Crop.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_8486 net/minecraft/block/Crop diff --git a/mappings/net/minecraft/block/Material.mapping b/mappings/net/minecraft/block/Material.mapping index 336607778f..b262b0ba6a 100644 --- a/mappings/net/minecraft/block/Material.mapping +++ b/mappings/net/minecraft/block/Material.mapping @@ -1,47 +1,12 @@ CLASS net/minecraft/class_3614 net/minecraft/block/Material - FIELD field_15911 solid Z - FIELD field_15914 STONE Lnet/minecraft/class_3614; - COMMENT Material for blocks that are stone or made from it, and generally prefer to be broken by a pickaxe. - FIELD field_15916 AGGREGATE Lnet/minecraft/class_3614; - COMMENT A material or structure formed from a loosely compacted mass of fragments or particles. - FIELD field_15932 WOOD Lnet/minecraft/class_3614; - COMMENT Material for wood logs, and things crafted from them. FIELD field_15935 PLANT Lnet/minecraft/class_3614; COMMENT Material for plants such as flowers and crops FIELD field_15939 blocksLight Z - FIELD field_15940 blocksMovement Z - FIELD field_15942 GLASS Lnet/minecraft/class_3614; - COMMENT Material for glass and glass-like blocks (includes sea lanterns and conduits). FIELD field_15944 color Lnet/minecraft/class_3620; - FIELD field_15950 replaceable Z - FIELD field_44483 ALLOWS_MOVEMENT_LIGHT_PASSES_THROUGH_NOT_SOLID_REPLACEABLE Lnet/minecraft/class_3614; FIELD field_44484 ALLOWS_MOVEMENT_LIGHT_PASSES_THROUGH_NOT_SOLID Lnet/minecraft/class_3614; - FIELD field_44485 ALLOWS_MOVEMENT Lnet/minecraft/class_3614; - FIELD field_44486 LIGHT_PASSES_THROUGH Lnet/minecraft/class_3614; - FIELD field_44487 COBWEB Lnet/minecraft/class_3614; - FIELD field_44488 NOT_SOLID_ALLOWS_MOVEMENT Lnet/minecraft/class_3614; FIELD field_44489 GENERIC Lnet/minecraft/class_3614; - METHOD (Lnet/minecraft/class_3620;ZZZZ)V + METHOD (Lnet/minecraft/class_3620;Z)V ARG 1 color ARG 2 solid - ARG 3 blocksMovement - ARG 4 blocksLight - ARG 5 replaceable - METHOD method_15799 isSolid ()Z - METHOD method_15800 isReplaceable ()Z - METHOD method_15801 blocksMovement ()Z METHOD method_15803 getColor ()Lnet/minecraft/class_3620; METHOD method_15804 blocksLight ()Z - CLASS class_3615 Builder - FIELD field_15961 color Lnet/minecraft/class_3620; - FIELD field_15962 blocksLight Z - FIELD field_15963 solid Z - FIELD field_15964 replaceable Z - FIELD field_15969 blocksMovement Z - METHOD (Lnet/minecraft/class_3620;)V - ARG 1 color - METHOD method_15806 notSolid ()Lnet/minecraft/class_3614$class_3615; - METHOD method_15811 allowsMovement ()Lnet/minecraft/class_3614$class_3615; - METHOD method_15812 lightPassesThrough ()Lnet/minecraft/class_3614$class_3615; - METHOD method_15813 build ()Lnet/minecraft/class_3614; - METHOD method_15815 replaceable ()Lnet/minecraft/class_3614$class_3615; diff --git a/mappings/net/minecraft/block/SculkCatalystBlock.mapping b/mappings/net/minecraft/block/SculkCatalystBlock.mapping index d550ebc6c5..8b2351ef0a 100644 --- a/mappings/net/minecraft/block/SculkCatalystBlock.mapping +++ b/mappings/net/minecraft/block/SculkCatalystBlock.mapping @@ -1,9 +1,3 @@ CLASS net/minecraft/class_7126 net/minecraft/block/SculkCatalystBlock - FIELD field_37603 BLOOM_DURATION I FIELD field_37604 BLOOM Lnet/minecraft/class_2746; FIELD field_37605 experience Lnet/minecraft/class_6017; - METHOD method_41477 bloom (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5819;)V - ARG 0 world - ARG 1 pos - ARG 2 state - ARG 3 random diff --git a/mappings/net/minecraft/block/SculkSensorBlock.mapping b/mappings/net/minecraft/block/SculkSensorBlock.mapping index da188b7b55..95a9766db0 100644 --- a/mappings/net/minecraft/block/SculkSensorBlock.mapping +++ b/mappings/net/minecraft/block/SculkSensorBlock.mapping @@ -22,10 +22,8 @@ CLASS net/minecraft/class_5703 net/minecraft/block/SculkSensorBlock ARG 5 power ARG 6 frequency METHOD method_32905 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5704;)V - ARG 0 world ARG 1 pos ARG 2 state - ARG 3 blockEntity METHOD method_32908 getPhase (Lnet/minecraft/class_2680;)Lnet/minecraft/class_5705; ARG 0 state METHOD method_32909 isInactive (Lnet/minecraft/class_2680;)Z diff --git a/mappings/net/minecraft/block/SculkShriekerBlock.mapping b/mappings/net/minecraft/block/SculkShriekerBlock.mapping index 86f32e8876..5305d98f8d 100644 --- a/mappings/net/minecraft/block/SculkShriekerBlock.mapping +++ b/mappings/net/minecraft/block/SculkShriekerBlock.mapping @@ -5,10 +5,8 @@ CLASS net/minecraft/class_7268 net/minecraft/block/SculkShriekerBlock FIELD field_38232 TOP D FIELD field_38422 CAN_SUMMON Lnet/minecraft/class_2746; METHOD method_42317 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_7133;)V - ARG 0 world ARG 1 pos ARG 2 state - ARG 3 blockEntity METHOD method_43132 (Lnet/minecraft/class_3218;Lnet/minecraft/class_7133;)V ARG 1 blockEntity METHOD method_43133 (Lnet/minecraft/class_3218;Lnet/minecraft/class_7133;)V diff --git a/mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping b/mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping index 51ba0965c8..9e2f099ff2 100644 --- a/mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping @@ -12,6 +12,5 @@ CLASS net/minecraft/class_8172 net/minecraft/block/entity/DecoratedPotBlockEntit METHOD method_49199 writeShardsToNbt (Ljava/util/List;Lnet/minecraft/class_2487;)V ARG 0 shards ARG 1 nbt - METHOD method_49201 asStack ()Lnet/minecraft/class_1799; METHOD method_49202 getShards ()Ljava/util/List; METHOD method_49204 getHorizontalFacing ()Lnet/minecraft/class_2350; diff --git a/mappings/net/minecraft/block/entity/SculkCatalystBlockEntity.mapping b/mappings/net/minecraft/block/entity/SculkCatalystBlockEntity.mapping index 91f72b8551..b1ca59e807 100644 --- a/mappings/net/minecraft/block/entity/SculkCatalystBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SculkCatalystBlockEntity.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_7132 net/minecraft/block/entity/SculkCatalystBlockEntity - FIELD field_37649 positionSource Lnet/minecraft/class_5707; - FIELD field_37650 spreadManager Lnet/minecraft/class_7128; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state @@ -9,6 +7,3 @@ CLASS net/minecraft/class_7132 net/minecraft/block/entity/SculkCatalystBlockEnti ARG 1 pos ARG 2 state ARG 3 blockEntity - METHOD method_41519 getSpreadManager ()Lnet/minecraft/class_7128; - METHOD method_45471 triggerCriteria (Lnet/minecraft/class_1309;)V - ARG 1 deadEntity diff --git a/mappings/net/minecraft/block/entity/SculkSensorBlockEntity.mapping b/mappings/net/minecraft/block/entity/SculkSensorBlockEntity.mapping index 3680ba19b6..2d4f51d8b3 100644 --- a/mappings/net/minecraft/block/entity/SculkSensorBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SculkSensorBlockEntity.mapping @@ -1,24 +1,18 @@ CLASS net/minecraft/class_5704 net/minecraft/block/entity/SculkSensorBlockEntity - FIELD field_28118 listener Lnet/minecraft/class_5718; + FIELD field_28118 listener Lnet/minecraft/class_8514$class_8516; FIELD field_28119 lastVibrationFrequency I FIELD field_38236 LOGGER Lorg/slf4j/Logger; - FIELD field_43291 callback Lnet/minecraft/class_5718$class_5719; + FIELD field_43291 callback Lnet/minecraft/class_8514$class_5719; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state - METHOD method_32911 getEventListener ()Lnet/minecraft/class_5718; + METHOD method_32911 getEventListener ()Lnet/minecraft/class_8514$class_8516; METHOD method_32912 getLastVibrationFrequency ()I - METHOD method_42320 (Lnet/minecraft/class_5718;)V + METHOD method_42320 (Lnet/minecraft/class_8514$class_8515;)V ARG 1 listener METHOD method_42321 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V ARG 1 listenerNbt METHOD method_44213 setLastVibrationFrequency (I)V ARG 1 lastVibrationFrequency - METHOD method_49831 createCallback ()Lnet/minecraft/class_5718$class_5719; + METHOD method_49831 createCallback ()Lnet/minecraft/class_8514$class_5719; CLASS class_8241 Callback - FIELD field_43293 blockEntity Lnet/minecraft/class_5704; - METHOD (Lnet/minecraft/class_5704;)V - ARG 1 blockEntity - METHOD method_49833 getPower (FI)I - ARG 0 distance - ARG 1 range diff --git a/mappings/net/minecraft/block/entity/SculkShriekerBlockEntity.mapping b/mappings/net/minecraft/block/entity/SculkShriekerBlockEntity.mapping index 41477b3781..477774fa3f 100644 --- a/mappings/net/minecraft/block/entity/SculkShriekerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SculkShriekerBlockEntity.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_7133 net/minecraft/block/entity/SculkShriekerBlockEntity FIELD field_38237 LOGGER Lorg/slf4j/Logger; - FIELD field_38238 RANGE I - FIELD field_38239 vibrationListener Lnet/minecraft/class_5718; + FIELD field_38239 vibrationListener Lnet/minecraft/class_8514$class_8516; FIELD field_38751 WARDEN_SPAWN_TRIES I FIELD field_38752 WARDEN_SPAWN_HORIZONTAL_RANGE I FIELD field_38753 WARDEN_SPAWN_VERTICAL_RANGE I @@ -12,9 +11,9 @@ CLASS net/minecraft/class_7133 net/minecraft/block/entity/SculkShriekerBlockEnti METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state - METHOD method_42322 (Lnet/minecraft/class_5718;)V + METHOD method_42322 (Lnet/minecraft/class_8514$class_8515;)V ARG 1 vibrationListener - METHOD method_42325 getVibrationListener ()Lnet/minecraft/class_5718; + METHOD method_42325 getVibrationListener ()Lnet/minecraft/class_8514$class_8516; METHOD method_43141 shriek (Lnet/minecraft/class_3218;Lnet/minecraft/class_3222;)V ARG 1 world ARG 2 player @@ -29,7 +28,7 @@ CLASS net/minecraft/class_7133 net/minecraft/block/entity/SculkShriekerBlockEnti ARG 1 world METHOD method_43150 canWarn (Lnet/minecraft/class_3218;)Z ARG 1 world - METHOD method_43151 playWarningSound ()V + METHOD method_43151 playWarningSound (Lnet/minecraft/class_1937;)V METHOD method_44016 (I)V ARG 1 warningLevel METHOD method_44017 shriek (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;)V diff --git a/mappings/net/minecraft/block/enums/Instrument.mapping b/mappings/net/minecraft/block/enums/Instrument.mapping index 13adc94113..466079d284 100644 --- a/mappings/net/minecraft/block/enums/Instrument.mapping +++ b/mappings/net/minecraft/block/enums/Instrument.mapping @@ -7,14 +7,8 @@ CLASS net/minecraft/class_2766 net/minecraft/block/enums/Instrument ARG 4 sound ARG 5 type METHOD method_11886 getSound ()Lnet/minecraft/class_6880; - METHOD method_47590 fromAboveState (Lnet/minecraft/class_2680;)Ljava/util/Optional; - ARG 0 state - METHOD method_47592 fromBelowState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2766; - ARG 0 state METHOD method_47889 shouldSpawnNoteParticles ()Z COMMENT {@return whether note blocks playing this instrument should produce note particles} METHOD method_47890 hasCustomSound ()Z COMMENT {@return whether note blocks playing this instrument should determine the sound from skulls above them} - METHOD method_47891 shouldRequireAirAbove ()Z - COMMENT {@return whether this instrument should prevent note blocks from playing when they do not have air above them} CLASS class_7994 Type diff --git a/mappings/net/minecraft/class_8514.mapping b/mappings/net/minecraft/class_8514.mapping new file mode 100644 index 0000000000..0f9ff6b822 --- /dev/null +++ b/mappings/net/minecraft/class_8514.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_8514 + CLASS class_5719 Callback + METHOD method_32969 accept (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;F)V + COMMENT Accepts a game event after delay. + ARG 1 world + ARG 5 entity + METHOD method_32970 accepts (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;)Z + COMMENT Returns whether the callback wants to accept this event. + ARG 1 world + METHOD method_42210 getTag ()Lnet/minecraft/class_6862; + METHOD method_42324 canAccept (Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;)Z + ARG 1 gameEvent + ARG 2 emitter + METHOD method_42672 onListen ()V + METHOD method_43695 triggersAvoidCriterion ()Z + METHOD method_49797 getRange ()I diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 955e4c96f2..41e55ad42c 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -198,8 +198,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1487 getNetworkProxy ()Ljava/net/Proxy; METHOD method_1488 getTickDelta ()F METHOD method_1490 stop ()V - METHOD method_1492 drawProfilerResults (Lnet/minecraft/class_4587;Lnet/minecraft/class_3696;)V - ARG 1 matrices + METHOD method_1492 drawProfilerResults (Lnet/minecraft/class_332;Lnet/minecraft/class_3696;)V ARG 2 profileResult METHOD method_1493 isPaused ()Z METHOD method_1494 setCrashReportSupplierAndAddDetails (Lnet/minecraft/class_128;)V @@ -495,8 +494,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_44713 getNarratorManager ()Lnet/minecraft/class_333; METHOD method_44714 getMessageHandler ()Lnet/minecraft/class_7594; METHOD method_45573 getDefaultResourcePack ()Lnet/minecraft/class_3268; - METHOD method_45574 getDefaultResourceSupplier ([Ljava/lang/String;)Lnet/minecraft/class_7367; - ARG 1 segments METHOD method_46740 (Ljava/util/List;)V ARG 1 stacks METHOD method_47392 isConnectedToLocalServer ()Z diff --git a/mappings/net/minecraft/client/font/MultilineText.mapping b/mappings/net/minecraft/client/font/MultilineText.mapping index 7fe6179d7c..9fcaccaead 100644 --- a/mappings/net/minecraft/client/font/MultilineText.mapping +++ b/mappings/net/minecraft/client/font/MultilineText.mapping @@ -1,12 +1,10 @@ CLASS net/minecraft/class_5489 net/minecraft/client/font/MultilineText FIELD field_26528 EMPTY Lnet/minecraft/class_5489; METHOD method_30887 count ()I - METHOD method_30888 drawCenterWithShadow (Lnet/minecraft/class_4587;II)I - ARG 1 matrices + METHOD method_30888 drawCenterWithShadow (Lnet/minecraft/class_332;II)I ARG 2 x ARG 3 y - METHOD method_30889 drawCenterWithShadow (Lnet/minecraft/class_4587;IIII)I - ARG 1 matrices + METHOD method_30889 drawCenterWithShadow (Lnet/minecraft/class_332;IIII)I ARG 2 x ARG 3 y ARG 4 lineHeight @@ -23,8 +21,7 @@ CLASS net/minecraft/class_5489 net/minecraft/client/font/MultilineText METHOD method_30892 create (Lnet/minecraft/class_327;[Lnet/minecraft/class_2561;)Lnet/minecraft/class_5489; ARG 0 renderer ARG 1 texts - METHOD method_30893 drawWithShadow (Lnet/minecraft/class_4587;IIII)I - ARG 1 matrices + METHOD method_30893 drawWithShadow (Lnet/minecraft/class_332;IIII)I ARG 2 x ARG 3 y ARG 4 lineHeight @@ -34,8 +31,7 @@ CLASS net/minecraft/class_5489 net/minecraft/client/font/MultilineText METHOD method_30895 create (Lnet/minecraft/class_327;Ljava/util/List;)Lnet/minecraft/class_5489; ARG 0 textRenderer ARG 1 lines - METHOD method_30896 draw (Lnet/minecraft/class_4587;IIII)I - ARG 1 matrices + METHOD method_30896 draw (Lnet/minecraft/class_332;IIII)I ARG 2 x ARG 3 y ARG 4 lineHeight @@ -49,8 +45,7 @@ CLASS net/minecraft/class_5489 net/minecraft/client/font/MultilineText METHOD method_35726 createFromTexts (Lnet/minecraft/class_327;Ljava/util/List;)Lnet/minecraft/class_5489; ARG 0 renderer ARG 1 texts - METHOD method_41154 fillBackground (Lnet/minecraft/class_4587;IIIII)V - ARG 1 matrices + METHOD method_41154 fillBackground (Lnet/minecraft/class_332;IIIII)V ARG 2 centerX ARG 3 centerY ARG 4 lineHeight diff --git a/mappings/net/minecraft/client/font/TextRenderer.mapping b/mappings/net/minecraft/client/font/TextRenderer.mapping index 345fc91443..cdab5a8402 100644 --- a/mappings/net/minecraft/client/font/TextRenderer.mapping +++ b/mappings/net/minecraft/client/font/TextRenderer.mapping @@ -31,14 +31,6 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 11 blue ARG 12 alpha ARG 13 light - METHOD method_1712 drawTrimmed (Lnet/minecraft/class_4587;Lnet/minecraft/class_5348;IIII)V - ARG 1 matrices - ARG 2 text - ARG 3 x - ARG 4 y - ARG 5 maxWidth - ARG 6 color - COMMENT the text color in the 0xAARRGGBB format METHOD method_1713 getWrappedLinesHeight (Ljava/lang/String;I)I COMMENT Gets the height of the text when it has been wrapped. COMMENT @@ -54,13 +46,6 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer COMMENT @see TextHandler#trimToWidth(StringVisitable, int, Style) ARG 1 text ARG 2 width - METHOD method_1720 drawWithShadow (Lnet/minecraft/class_4587;Ljava/lang/String;FFI)I - ARG 1 matrices - ARG 2 text - ARG 3 x - ARG 4 y - ARG 5 color - COMMENT the text color in the 0xAARRGGBB format METHOD method_1721 mirror (Ljava/lang/String;)Ljava/lang/String; ARG 1 text METHOD method_1723 drawInternal (Lnet/minecraft/class_5481;FFIZLorg/joml/Matrix4f;Lnet/minecraft/class_4597;Lnet/minecraft/class_327$class_6415;II)I @@ -97,20 +82,6 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer COMMENT @return a list of ordered text which has been wrapped ARG 1 text ARG 2 width - METHOD method_1729 draw (Lnet/minecraft/class_4587;Ljava/lang/String;FFI)I - ARG 1 matrices - ARG 2 text - ARG 3 x - ARG 4 y - ARG 5 color - COMMENT the text color in the 0xAARRGGBB format - METHOD method_22941 draw (Lnet/minecraft/class_5481;FFILorg/joml/Matrix4f;Z)I - ARG 1 text - ARG 2 x - ARG 3 y - ARG 4 color - ARG 5 matrix - ARG 6 shadow METHOD method_22942 draw (Lnet/minecraft/class_5481;FFIZLorg/joml/Matrix4f;Lnet/minecraft/class_4597;Lnet/minecraft/class_327$class_6415;II)I ARG 1 text ARG 2 x @@ -128,21 +99,6 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer METHOD method_27516 (ILnet/minecraft/class_2583;)F ARG 1 codePoint ARG 2 style - 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 - COMMENT the text color in the 0xAARRGGBB format - METHOD method_27520 draw (Ljava/lang/String;FFILorg/joml/Matrix4f;ZZ)I - ARG 1 text - ARG 2 x - ARG 3 y - ARG 4 color - ARG 5 matrix - ARG 6 shadow - ARG 7 mirror METHOD method_27521 draw (Ljava/lang/String;FFIZLorg/joml/Matrix4f;Lnet/minecraft/class_4597;Lnet/minecraft/class_327$class_6415;II)I ARG 1 text ARG 2 x @@ -189,13 +145,6 @@ 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_5481;FFI)I - ARG 1 matrices - ARG 2 text - ARG 3 x - ARG 4 y - ARG 5 color - COMMENT the text color in the 0xAARRGGBB format METHOD method_27529 drawInternal (Ljava/lang/String;FFIZLorg/joml/Matrix4f;Lnet/minecraft/class_4597;Lnet/minecraft/class_327$class_6415;IIZ)I ARG 1 text ARG 2 x @@ -219,24 +168,9 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 8 layerType ARG 9 underlineColor ARG 10 light - METHOD method_29342 drawWithShadow (Lnet/minecraft/class_4587;Ljava/lang/String;FFIZ)I - ARG 1 matrices - ARG 2 text - ARG 3 x - ARG 4 y - ARG 5 color - COMMENT the text color in the 0xAARRGGBB format - ARG 6 rightToLeft METHOD method_30880 getWidth (Lnet/minecraft/class_5481;)I COMMENT Gets the width of some text when rendered. ARG 1 text - METHOD method_30881 drawWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;FFI)I - ARG 1 matrices - ARG 2 text - ARG 3 x - ARG 4 y - ARG 5 color - COMMENT the text color in the 0xAARRGGBB format METHOD method_30882 draw (Lnet/minecraft/class_2561;FFIZLorg/joml/Matrix4f;Lnet/minecraft/class_4597;Lnet/minecraft/class_327$class_6415;II)I ARG 1 text ARG 2 x @@ -249,13 +183,6 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 8 layerType ARG 9 backgroundColor ARG 10 light - METHOD method_30883 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;FFI)I - ARG 1 matrices - ARG 2 text - ARG 3 x - ARG 4 y - ARG 5 color - COMMENT the text color in the 0xAARRGGBB format METHOD method_37296 drawWithOutline (Lnet/minecraft/class_5481;FFIILorg/joml/Matrix4f;Lnet/minecraft/class_4597;I)V ARG 1 text ARG 2 x diff --git a/mappings/net/minecraft/client/gui/Drawable.mapping b/mappings/net/minecraft/client/gui/Drawable.mapping index fa3c5273a2..77a0885611 100644 --- a/mappings/net/minecraft/client/gui/Drawable.mapping +++ b/mappings/net/minecraft/client/gui/Drawable.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_4068 net/minecraft/client/gui/Drawable - METHOD method_25394 render (Lnet/minecraft/class_4587;IIF)V - ARG 1 matrices + METHOD method_25394 render (Lnet/minecraft/class_332;IIF)V ARG 2 mouseX ARG 3 mouseY ARG 4 delta diff --git a/mappings/net/minecraft/client/gui/DrawableHelper.mapping b/mappings/net/minecraft/client/gui/DrawableHelper.mapping index ad086e03c6..a8ed8e6d43 100644 --- a/mappings/net/minecraft/client/gui/DrawableHelper.mapping +++ b/mappings/net/minecraft/client/gui/DrawableHelper.mapping @@ -1,174 +1,66 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper - FIELD field_22735 OPTIONS_BACKGROUND_TEXTURE Lnet/minecraft/class_2960; - COMMENT The texture used by options for background. - FIELD field_22736 STATS_ICON_TEXTURE Lnet/minecraft/class_2960; - COMMENT The texture of icons used in the stats screen. - FIELD field_22737 GUI_ICONS_TEXTURE Lnet/minecraft/class_2960; - COMMENT The texture of various icons and widgets used for rendering ingame indicators. - FIELD field_43045 LIGHT_DIRT_BACKGROUND_TEXTURE Lnet/minecraft/class_2960; - FIELD field_43098 SCISSOR_STACK Lnet/minecraft/class_332$class_8214; - METHOD method_25290 drawTexture (Lnet/minecraft/class_4587;IIFFIIII)V + METHOD method_25290 drawTexture (Lnet/minecraft/class_2960;IIFFIIII)V COMMENT Draws a textured rectangle from a region in a texture. COMMENT COMMENT

The width and height of the region are the same as COMMENT the dimensions of the rectangle. - ARG 0 matrices - COMMENT the matrix stack used for rendering - ARG 1 x - COMMENT the X coordinate of the rectangle - ARG 2 y - COMMENT the Y coordinate of the rectangle - ARG 3 u - COMMENT the left-most coordinate of the texture region - ARG 4 v - COMMENT the top-most coordinate of the texture region - ARG 5 width - COMMENT the width of the rectangle - ARG 6 height - COMMENT the height of the rectangle - ARG 7 textureWidth - COMMENT the width of the entire texture - ARG 8 textureHeight - COMMENT the height of the entire texture - METHOD method_25291 drawTexture (Lnet/minecraft/class_4587;IIIFFIIII)V + METHOD method_25291 drawTexture (Lnet/minecraft/class_2960;IIIFFIIII)V COMMENT Draws a textured rectangle from a region in a texture. COMMENT COMMENT

The width and height of the region are the same as COMMENT the dimensions of the rectangle. - ARG 0 matrices - COMMENT the matrix stack used for rendering - ARG 1 x - COMMENT the X coordinate of the rectangle - ARG 2 y - COMMENT the Y coordinate of the rectangle - ARG 3 z - COMMENT the Z coordinate of the rectangle - ARG 4 u - COMMENT the left-most coordinate of the texture region - ARG 5 v - COMMENT the top-most coordinate of the texture region - ARG 6 width - COMMENT the width of the rectangle - ARG 7 height - COMMENT the height of the rectangle - ARG 8 textureWidth - COMMENT the width of the entire texture - ARG 9 textureHeight - COMMENT the height of the entire texture - METHOD method_25292 drawHorizontalLine (Lnet/minecraft/class_4587;IIII)V - ARG 0 matrices + METHOD method_25292 drawHorizontalLine (IIII)V ARG 1 x1 ARG 2 x2 ARG 3 y ARG 4 color - METHOD method_25293 drawTexture (Lnet/minecraft/class_4587;IIIIFFIIII)V + METHOD method_25293 drawTexture (Lnet/minecraft/class_2960;IIIIFFIIII)V COMMENT Draws a textured rectangle from a region in a texture. - ARG 0 matrices - COMMENT the matrix stack used for rendering - ARG 1 x - COMMENT the X coordinate of the rectangle - ARG 2 y - COMMENT the Y coordinate of the rectangle - ARG 3 width - COMMENT the width of the rectangle - ARG 4 height - COMMENT the height of the rectangle - ARG 5 u - COMMENT the left-most coordinate of the texture region - ARG 6 v - COMMENT the top-most coordinate of the texture region - ARG 7 regionWidth - COMMENT the width of the texture region - ARG 8 regionHeight - COMMENT the height of the texture region - ARG 9 textureWidth - COMMENT the width of the entire texture - ARG 10 textureHeight - COMMENT the height of the entire texture - METHOD method_25294 fill (Lnet/minecraft/class_4587;IIIII)V - ARG 0 matrices + METHOD method_25294 fill (IIIII)V ARG 1 x1 ARG 2 y1 ARG 3 x2 ARG 4 y2 ARG 5 color - METHOD method_25295 drawTexturedQuad (Lorg/joml/Matrix4f;IIIIIFFFF)V - ARG 0 matrix - ARG 1 x0 - ARG 2 x1 - ARG 3 y0 - ARG 4 y1 - ARG 5 z - ARG 6 u0 - ARG 7 u1 - ARG 8 v0 - ARG 9 v1 - METHOD method_25296 fillGradient (Lnet/minecraft/class_4587;IIIIII)V - ARG 0 matrices + METHOD method_25295 drawTexturedQuad (Lnet/minecraft/class_2960;IIIIIFFFF)V + METHOD method_25296 fillGradient (IIIIII)V ARG 1 startX ARG 2 startY ARG 3 endX ARG 4 endY ARG 5 colorStart ARG 6 colorEnd - METHOD method_25297 drawTexture (Lnet/minecraft/class_4587;IIIIIIIFFII)V - ARG 0 matrices - ARG 1 x0 - ARG 2 x1 - ARG 3 y0 - ARG 4 y1 - ARG 5 z - ARG 6 regionWidth - ARG 7 regionHeight - ARG 8 u - ARG 9 v - ARG 10 textureWidth - ARG 11 textureHeight - METHOD method_25298 drawSprite (Lnet/minecraft/class_4587;IIIIILnet/minecraft/class_1058;)V - ARG 0 matrices + METHOD method_25297 drawTexture (Lnet/minecraft/class_2960;IIIIIIIFFII)V + METHOD method_25298 drawSprite (IIIIILnet/minecraft/class_1058;)V ARG 1 x ARG 2 y ARG 3 z ARG 4 width ARG 5 height ARG 6 sprite - METHOD method_25300 drawCenteredTextWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Ljava/lang/String;III)V - ARG 0 matrices - ARG 1 textRenderer + METHOD method_25300 drawCenteredTextWithShadow (Lnet/minecraft/class_327;Ljava/lang/String;III)V ARG 2 text ARG 3 centerX ARG 4 y ARG 5 color - METHOD method_25301 drawVerticalLine (Lnet/minecraft/class_4587;IIII)V - ARG 0 matrices + METHOD method_25301 drawVerticalLine (IIII)V ARG 1 x ARG 2 y1 ARG 3 y2 ARG 4 color - METHOD method_25302 drawTexture (Lnet/minecraft/class_4587;IIIIII)V + METHOD method_25302 drawTexture (Lnet/minecraft/class_2960;IIIIII)V COMMENT Draws a textured rectangle from a region in a 256x256 texture. COMMENT COMMENT

The Z coordinate of the rectangle is {@code 0}. COMMENT COMMENT

The width and height of the region are the same as COMMENT the dimensions of the rectangle. - ARG 0 matrices - ARG 1 x - ARG 2 y - ARG 3 u - ARG 4 v - ARG 5 width - ARG 6 height - METHOD method_25303 drawTextWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Ljava/lang/String;III)V - ARG 0 matrices - ARG 1 textRenderer + METHOD method_25303 drawTextWithShadow (Lnet/minecraft/class_327;Ljava/lang/String;III)I ARG 2 text ARG 3 x ARG 4 y ARG 5 color - METHOD method_27533 fillGradient (Lorg/joml/Matrix4f;Lnet/minecraft/class_287;IIIIIII)V - ARG 0 matrix - ARG 1 builder + METHOD method_27533 fillGradient (Lnet/minecraft/class_287;IIIIIII)V ARG 2 startX ARG 3 startY ARG 4 endX @@ -176,64 +68,42 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper ARG 6 z ARG 7 colorStart ARG 8 colorEnd - METHOD method_27534 drawCenteredTextWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Lnet/minecraft/class_2561;III)V - ARG 0 matrices - ARG 1 textRenderer + METHOD method_27534 drawCenteredTextWithShadow (Lnet/minecraft/class_327;Lnet/minecraft/class_2561;III)V ARG 2 text ARG 3 centerX ARG 4 y ARG 5 color - METHOD method_27535 drawTextWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Lnet/minecraft/class_2561;III)V - ARG 0 matrices - ARG 1 textRenderer + METHOD method_27535 drawTextWithShadow (Lnet/minecraft/class_327;Lnet/minecraft/class_2561;III)I ARG 2 text ARG 3 x ARG 4 y ARG 5 color METHOD method_29343 drawWithOutline (IILjava/util/function/BiConsumer;)V - ARG 0 x - ARG 1 y - ARG 2 renderAction - COMMENT the action to render both the content and the outline, taking x and y positions as input - METHOD method_33284 fillGradient (Lnet/minecraft/class_4587;IIIIIII)V - ARG 0 matrices + METHOD method_33284 fillGradient (IIIIIII)V ARG 1 startX ARG 2 startY ARG 3 endX ARG 4 endY - ARG 5 colorStart - ARG 6 colorEnd - ARG 7 z - METHOD method_35719 drawCenteredTextWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Lnet/minecraft/class_5481;III)V - ARG 0 matrices - ARG 1 textRenderer + METHOD method_35719 drawCenteredTextWithShadow (Lnet/minecraft/class_327;Lnet/minecraft/class_5481;III)V ARG 2 text ARG 3 centerX ARG 4 y ARG 5 color - METHOD method_35720 drawTextWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Lnet/minecraft/class_5481;III)V - ARG 0 matrices - ARG 1 textRenderer + METHOD method_35720 drawTextWithShadow (Lnet/minecraft/class_327;Lnet/minecraft/class_5481;III)I ARG 2 text ARG 3 x ARG 4 y ARG 5 color METHOD method_44379 enableScissor (IIII)V - ARG 0 x1 - ARG 1 y1 - ARG 2 x2 - ARG 3 y2 METHOD method_44380 disableScissor ()V - METHOD method_48196 fill (Lnet/minecraft/class_4587;IIIIII)V - ARG 0 matrices + METHOD method_48196 fill (IIIIII)V ARG 1 x1 ARG 2 y1 ARG 3 x2 ARG 4 y2 ARG 5 z ARG 6 color - METHOD method_48465 drawSprite (Lnet/minecraft/class_4587;IIIIILnet/minecraft/class_1058;FFFF)V - ARG 0 matrices + METHOD method_48465 drawSprite (IIIIILnet/minecraft/class_1058;FFFF)V ARG 1 x ARG 2 y ARG 3 z @@ -244,58 +114,11 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper ARG 8 green ARG 9 blue ARG 10 alpha - METHOD method_48466 drawTexturedQuad (Lorg/joml/Matrix4f;IIIIIFFFFFFFF)V - ARG 0 matrix - ARG 1 x0 - ARG 2 x1 - ARG 3 y0 - ARG 4 y1 - ARG 5 z - ARG 6 u0 - ARG 7 u1 - ARG 8 v0 - ARG 9 v1 - ARG 10 red - ARG 11 green - ARG 12 blue - ARG 13 alpha - METHOD method_48585 drawRepeatingTexture (Lnet/minecraft/class_4587;IIIIIIII)V - ARG 0 matrices - ARG 1 x - ARG 2 y - ARG 3 width - ARG 4 height - ARG 5 u - ARG 6 v - ARG 7 textureWidth - ARG 8 textureHeight - METHOD method_48586 drawNineSlicedTexture (Lnet/minecraft/class_4587;IIIIIIIII)V - ARG 0 matrices - ARG 1 x - ARG 2 y - ARG 3 width - ARG 4 height - ARG 5 outerSliceSize - ARG 6 centerSliceWidth - ARG 7 centerSliceHeight - ARG 8 u - ARG 9 v - METHOD method_48587 drawNineSlicedTexture (Lnet/minecraft/class_4587;IIIIIIIIIIII)V - ARG 0 matrices - ARG 1 x - ARG 2 y - ARG 3 width - ARG 4 height - ARG 5 leftSliceWidth - ARG 6 topSliceHeight - ARG 7 rightSliceWidth - ARG 8 bottomSliceHeight - ARG 9 centerSliceWidth - ARG 10 centerSliceHeight - ARG 11 u - ARG 12 v - METHOD method_49601 drawBorder (Lnet/minecraft/class_4587;IIIII)V - ARG 0 matrices + METHOD method_48466 drawTexturedQuad (Lnet/minecraft/class_2960;IIIIIFFFFFFFF)V + METHOD method_48585 drawRepeatingTexture (Lnet/minecraft/class_2960;IIIIIIII)V + METHOD method_48586 drawNineSlicedTexture (Lnet/minecraft/class_2960;IIIIIIIII)V + METHOD method_48587 drawNineSlicedTexture (Lnet/minecraft/class_2960;IIIIIIIIIIII)V + METHOD method_49601 drawBorder (IIIII)V ARG 1 x ARG 2 y ARG 3 width @@ -304,18 +127,7 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper METHOD method_49696 createDivider (II)Lit/unimi/dsi/fastutil/ints/IntIterator; ARG 0 sideLength ARG 1 textureSideLength - METHOD method_49697 drawNineSlicedTexture (Lnet/minecraft/class_4587;IIIIIIIIII)V - ARG 0 matrices - ARG 1 x - ARG 2 y - ARG 3 width - ARG 4 height - ARG 5 sideSliceWidth - ARG 6 sideSliceHeight - ARG 7 centerSliceWidth - ARG 8 centerSliceHeight - ARG 9 u - ARG 10 v + METHOD method_49697 drawNineSlicedTexture (Lnet/minecraft/class_2960;IIIIIIIIII)V METHOD method_49698 setScissor (Lnet/minecraft/class_8030;)V ARG 0 rect CLASS class_8214 ScissorStack diff --git a/mappings/net/minecraft/client/gui/LogoDrawer.mapping b/mappings/net/minecraft/client/gui/LogoDrawer.mapping index 71af39a7a1..bb1468caca 100644 --- a/mappings/net/minecraft/client/gui/LogoDrawer.mapping +++ b/mappings/net/minecraft/client/gui/LogoDrawer.mapping @@ -6,12 +6,10 @@ CLASS net/minecraft/class_8020 net/minecraft/client/gui/LogoDrawer FIELD field_44540 MINCERAFT_TEXTURE Lnet/minecraft/class_2960; METHOD (Z)V ARG 1 ignoreAlpha - METHOD method_48209 draw (Lnet/minecraft/class_4587;IF)V - ARG 1 matrices + METHOD method_48209 draw (Lnet/minecraft/class_332;IF)V ARG 2 screenWidth ARG 3 alpha - METHOD method_48210 draw (Lnet/minecraft/class_4587;IFI)V - ARG 1 matrices + METHOD method_48210 draw (Lnet/minecraft/class_332;IFI)V ARG 2 screenWidth ARG 3 alpha ARG 4 y diff --git a/mappings/net/minecraft/client/gui/PlayerSkinDrawer.mapping b/mappings/net/minecraft/client/gui/PlayerSkinDrawer.mapping index 8c5e444b33..f5b35c7266 100644 --- a/mappings/net/minecraft/client/gui/PlayerSkinDrawer.mapping +++ b/mappings/net/minecraft/client/gui/PlayerSkinDrawer.mapping @@ -1,28 +1,11 @@ CLASS net/minecraft/class_7532 net/minecraft/client/gui/PlayerSkinDrawer COMMENT Helper class for drawing a player's head on GUI. - METHOD method_44443 draw (Lnet/minecraft/class_4587;III)V + METHOD method_44443 draw (Lnet/minecraft/class_332;Lnet/minecraft/class_2960;III)V COMMENT Draws the player's head (including the hat) on GUI. The skin texture must be COMMENT specified prior to calling by using {@link COMMENT com.mojang.blaze3d.systems.RenderSystem#setShaderTexture(int, net.minecraft.util.Identifier)}. - ARG 0 matrices - ARG 1 x - ARG 2 y - ARG 3 size - METHOD method_44444 drawHat (Lnet/minecraft/class_4587;IIIZ)V - ARG 0 matrices - ARG 1 x - ARG 2 y - ARG 3 size - ARG 4 upsideDown - METHOD method_44445 draw (Lnet/minecraft/class_4587;IIIZZ)V + METHOD method_44444 drawHat (Lnet/minecraft/class_332;Lnet/minecraft/class_2960;IIIZ)V + METHOD method_44445 draw (Lnet/minecraft/class_332;Lnet/minecraft/class_2960;IIIZZ)V COMMENT Draws the player's head on GUI. The skin texture must be specified prior to COMMENT calling by using {@link COMMENT com.mojang.blaze3d.systems.RenderSystem#setShaderTexture(int, net.minecraft.util.Identifier)}. - ARG 0 matrices - ARG 1 x - ARG 2 y - ARG 3 size - ARG 4 hatVisible - COMMENT whether the hat should be drawn - ARG 5 upsideDown - COMMENT whether the head should be upside down, also known as "Dinnerbone" diff --git a/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping b/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping index 5f8cf95578..99c1037db3 100644 --- a/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping @@ -9,19 +9,16 @@ CLASS net/minecraft/class_337 net/minecraft/client/gui/hud/BossBarHud ARG 1 client METHOD method_1795 handlePacket (Lnet/minecraft/class_2629;)V ARG 1 packet - METHOD method_1796 render (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_1796 render (Lnet/minecraft/class_332;)V METHOD method_1797 shouldDarkenSky ()Z METHOD method_1798 shouldPlayDragonMusic ()Z - METHOD method_1799 renderBossBar (Lnet/minecraft/class_4587;IILnet/minecraft/class_1259;)V - ARG 1 matrices + METHOD method_1799 renderBossBar (Lnet/minecraft/class_332;IILnet/minecraft/class_1259;)V ARG 2 x ARG 3 y ARG 4 bossBar METHOD method_1800 shouldThickenFog ()Z METHOD method_1801 clear ()V - METHOD method_41830 renderBossBar (Lnet/minecraft/class_4587;IILnet/minecraft/class_1259;II)V - ARG 1 matrices + METHOD method_41830 renderBossBar (Lnet/minecraft/class_332;IILnet/minecraft/class_1259;II)V ARG 2 x ARG 3 y ARG 4 bossBar diff --git a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping index 9678a290e8..6721bd31ee 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping @@ -20,8 +20,7 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud ARG 1 scroll METHOD method_1803 addToMessageHistory (Ljava/lang/String;)V ARG 1 message - METHOD method_1805 render (Lnet/minecraft/class_4587;III)V - ARG 1 matrices + METHOD method_1805 render (Lnet/minecraft/class_332;III)V ARG 2 currentTick ARG 3 mouseX ARG 4 mouseY @@ -61,8 +60,7 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud ARG 1 x ARG 3 line ARG 4 indicator - METHOD method_44719 drawIndicatorIcon (Lnet/minecraft/class_4587;IILnet/minecraft/class_7591$class_7592;)V - ARG 1 matrices + METHOD method_44719 drawIndicatorIcon (Lnet/minecraft/class_332;IILnet/minecraft/class_7591$class_7592;)V ARG 2 x ARG 3 y ARG 4 icon diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index 0030f8f033..7f50574a90 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -11,8 +11,7 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud FIELD field_38985 allocationRateCalculator Lnet/minecraft/class_340$class_7412; METHOD (Lnet/minecraft/class_310;)V ARG 1 client - METHOD method_15870 drawMetricsData (Lnet/minecraft/class_4587;Lnet/minecraft/class_3517;IIZ)V - ARG 1 matrices + METHOD method_15870 drawMetricsData (Lnet/minecraft/class_332;Lnet/minecraft/class_3517;IIZ)V ARG 2 metricsData ARG 3 x ARG 4 width @@ -38,12 +37,9 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud ARG 3 dt METHOD method_1845 propertyToString (Ljava/util/Map$Entry;)Ljava/lang/String; ARG 1 propEntry - METHOD method_1846 render (Lnet/minecraft/class_4587;)V - ARG 1 matrices - METHOD method_1847 renderLeftText (Lnet/minecraft/class_4587;)V - ARG 1 matrices - METHOD method_1848 renderRightText (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_1846 render (Lnet/minecraft/class_332;)V + METHOD method_1847 renderLeftText (Lnet/minecraft/class_332;)V + METHOD method_1848 renderRightText (Lnet/minecraft/class_332;)V METHOD method_20455 (Ljava/util/EnumMap;)V ARG 0 types METHOD method_20540 (Lnet/minecraft/class_2791;)Lnet/minecraft/class_2818; diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 08f6f48490..be26c1d868 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -54,74 +54,58 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_1733 getHeartRows (I)I ARG 1 heartCount METHOD method_1734 getRiddenEntity ()Lnet/minecraft/class_1309; - METHOD method_1735 renderVignetteOverlay (Lnet/minecraft/class_4587;Lnet/minecraft/class_1297;)V - ARG 1 matrices + METHOD method_1735 renderVignetteOverlay (Lnet/minecraft/class_332;Lnet/minecraft/class_1297;)V ARG 2 entity - METHOD method_1736 renderCrosshair (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_1736 renderCrosshair (Lnet/minecraft/class_332;)V METHOD method_1737 getCameraPlayer ()Lnet/minecraft/class_1657; METHOD method_1738 getTicks ()I METHOD method_1739 getSpectatorHud ()Lnet/minecraft/class_365; METHOD method_1740 getBossBarHud ()Lnet/minecraft/class_337; - METHOD method_1741 renderMountHealth (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_1741 renderMountHealth (Lnet/minecraft/class_332;)V METHOD method_1742 setDefaultTitleFade ()V METHOD method_1743 getChatHud ()Lnet/minecraft/class_338; METHOD method_1744 getHeartCount (Lnet/minecraft/class_1309;)I ARG 1 entity METHOD method_1745 resetDebugHudChunk ()V - METHOD method_1746 renderPortalOverlay (Lnet/minecraft/class_4587;F)V - ARG 1 matrices + METHOD method_1746 renderPortalOverlay (Lnet/minecraft/class_332;F)V ARG 2 nauseaStrength METHOD method_1747 clear ()V METHOD method_1748 tick ()V - METHOD method_1749 renderHeldItemTooltip (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_1749 renderHeldItemTooltip (Lnet/minecraft/class_332;)V METHOD method_1750 getPlayerListHud ()Lnet/minecraft/class_355; METHOD method_1751 (Lnet/minecraft/class_267;)Z ARG 0 score - METHOD method_1752 renderMountJumpBar (Lnet/minecraft/class_1316;Lnet/minecraft/class_4587;I)V + METHOD method_1752 renderMountJumpBar (Lnet/minecraft/class_1316;Lnet/minecraft/class_332;I)V ARG 1 mount - ARG 2 matrices ARG 3 x - METHOD method_1753 render (Lnet/minecraft/class_4587;F)V - ARG 1 matrices + METHOD method_1753 render (Lnet/minecraft/class_332;F)V ARG 2 tickDelta METHOD method_17534 shouldRenderSpectatorCrosshair (Lnet/minecraft/class_239;)Z ARG 1 hitResult - METHOD method_1754 renderExperienceBar (Lnet/minecraft/class_4587;I)V - ARG 1 matrices + METHOD method_1754 renderExperienceBar (Lnet/minecraft/class_332;I)V ARG 2 x METHOD method_1756 getTextRenderer ()Lnet/minecraft/class_327; - METHOD method_1757 renderScoreboardSidebar (Lnet/minecraft/class_4587;Lnet/minecraft/class_266;)V - ARG 1 matrices + METHOD method_1757 renderScoreboardSidebar (Lnet/minecraft/class_332;Lnet/minecraft/class_266;)V ARG 2 objective METHOD method_1758 setOverlayMessage (Lnet/minecraft/class_2561;Z)V ARG 1 message ARG 2 tinted - METHOD method_1759 renderHotbar (FLnet/minecraft/class_4587;)V + METHOD method_1759 renderHotbar (FLnet/minecraft/class_332;)V ARG 1 tickDelta - ARG 2 matrices - METHOD method_1760 renderStatusBars (Lnet/minecraft/class_4587;)V + METHOD method_1760 renderStatusBars (Lnet/minecraft/class_332;)V COMMENT Renders the armor, health, air, and hunger bars. - ARG 1 matrices - METHOD method_1762 renderHotbarItem (Lnet/minecraft/class_4587;IIFLnet/minecraft/class_1657;Lnet/minecraft/class_1799;I)V - METHOD method_1765 renderStatusEffectOverlay (Lnet/minecraft/class_4587;)V - ARG 1 matrices - METHOD method_1766 renderDemoTimer (Lnet/minecraft/class_4587;)V - ARG 1 matrices - METHOD method_19346 drawTextBackground (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;III)V - ARG 1 matrices + METHOD method_1762 renderHotbarItem (Lnet/minecraft/class_332;IIFLnet/minecraft/class_1657;Lnet/minecraft/class_1799;I)V + METHOD method_1765 renderStatusEffectOverlay (Lnet/minecraft/class_332;)V + METHOD method_1766 renderDemoTimer (Lnet/minecraft/class_332;)V + METHOD method_19346 drawTextBackground (Lnet/minecraft/class_332;Lnet/minecraft/class_327;III)V ARG 2 textRenderer ARG 3 yOffset ARG 4 width ARG 5 color - METHOD method_31977 renderOverlay (Lnet/minecraft/class_4587;Lnet/minecraft/class_2960;F)V - ARG 1 matrices + METHOD method_31977 renderOverlay (Lnet/minecraft/class_332;Lnet/minecraft/class_2960;F)V ARG 2 texture ARG 3 opacity - METHOD method_32598 renderSpyglassOverlay (Lnet/minecraft/class_4587;F)V - ARG 1 matrices + METHOD method_32598 renderSpyglassOverlay (Lnet/minecraft/class_332;F)V ARG 2 scale METHOD method_34001 setTitleTicks (III)V ARG 1 fadeInTicks @@ -132,8 +116,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_34003 clearTitle ()V METHOD method_34004 setTitle (Lnet/minecraft/class_2561;)V ARG 1 title - METHOD method_37298 renderHealthBar (Lnet/minecraft/class_4587;Lnet/minecraft/class_1657;IIIIFIIIZ)V - ARG 1 matrices + METHOD method_37298 renderHealthBar (Lnet/minecraft/class_332;Lnet/minecraft/class_1657;IIIIFIIIZ)V ARG 2 player ARG 3 x ARG 4 y @@ -144,8 +127,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 9 health ARG 10 absorption ARG 11 blinking - METHOD method_37299 drawHeart (Lnet/minecraft/class_4587;Lnet/minecraft/class_329$class_6411;IIIZZ)V - ARG 1 matrices + METHOD method_37299 drawHeart (Lnet/minecraft/class_332;Lnet/minecraft/class_329$class_6411;IIIZZ)V ARG 2 type ARG 3 x ARG 4 y @@ -154,8 +136,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 7 halfHeart METHOD method_39191 tick (Z)V ARG 1 paused - METHOD method_39192 renderAutosaveIndicator (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_39192 renderAutosaveIndicator (Lnet/minecraft/class_332;)V METHOD method_39193 tickAutosaveIndicator ()V METHOD method_44353 shouldShowChatDisabledScreen ()Z METHOD method_44354 setCanShowChatDisabledScreen (Z)V diff --git a/mappings/net/minecraft/client/gui/hud/MessageIndicator.mapping b/mappings/net/minecraft/client/gui/hud/MessageIndicator.mapping index 23ee2dd852..648bb21418 100644 --- a/mappings/net/minecraft/client/gui/hud/MessageIndicator.mapping +++ b/mappings/net/minecraft/client/gui/hud/MessageIndicator.mapping @@ -24,7 +24,6 @@ CLASS net/minecraft/class_7591 net/minecraft/client/gui/hud/MessageIndicator ARG 4 v ARG 5 width ARG 6 height - METHOD method_44712 draw (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_44712 draw (Lnet/minecraft/class_332;II)V ARG 2 x ARG 3 y diff --git a/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping b/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping index ff18645f8b..2596cd482f 100644 --- a/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping @@ -27,24 +27,21 @@ CLASS net/minecraft/class_355 net/minecraft/client/gui/hud/PlayerListHud METHOD method_1918 getPlayerName (Lnet/minecraft/class_640;)Lnet/minecraft/class_2561; COMMENT {@return the player name rendered by this HUD} ARG 1 entry - METHOD method_1919 render (Lnet/minecraft/class_4587;ILnet/minecraft/class_269;Lnet/minecraft/class_266;)V - ARG 1 matrices + METHOD method_1919 render (Lnet/minecraft/class_332;ILnet/minecraft/class_269;Lnet/minecraft/class_266;)V ARG 2 scaledWindowWidth ARG 3 scoreboard ARG 4 objective METHOD method_1920 clear ()V METHOD method_1921 setVisible (Z)V ARG 1 visible - METHOD method_1922 renderScoreboardObjective (Lnet/minecraft/class_266;ILjava/lang/String;IILjava/util/UUID;Lnet/minecraft/class_4587;)V + METHOD method_1922 renderScoreboardObjective (Lnet/minecraft/class_266;ILjava/lang/String;IILjava/util/UUID;Lnet/minecraft/class_332;)V ARG 1 objective ARG 2 y ARG 3 player ARG 4 left ARG 5 right ARG 6 uuid - ARG 7 matrices - METHOD method_1923 renderLatencyIcon (Lnet/minecraft/class_4587;IIILnet/minecraft/class_640;)V - ARG 1 matrices + METHOD method_1923 renderLatencyIcon (Lnet/minecraft/class_332;IIILnet/minecraft/class_640;)V ARG 2 width ARG 3 x ARG 4 y @@ -58,12 +55,11 @@ CLASS net/minecraft/class_355 net/minecraft/client/gui/hud/PlayerListHud COMMENT the given player is in {@linkplain net.minecraft.world.GameMode#SPECTATOR spectator mode}. ARG 1 entry ARG 2 name - METHOD method_45590 renderHearts (IIILjava/util/UUID;Lnet/minecraft/class_4587;I)V + METHOD method_45590 renderHearts (IIILjava/util/UUID;Lnet/minecraft/class_332;I)V ARG 1 y ARG 2 left ARG 3 right ARG 4 uuid - ARG 5 matrices ARG 6 score METHOD method_45591 (ILjava/util/UUID;)Lnet/minecraft/class_355$class_7732; ARG 1 uuid2 diff --git a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping index 92b8e1505e..ebcae0002e 100644 --- a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping @@ -8,8 +8,7 @@ CLASS net/minecraft/class_365 net/minecraft/client/gui/hud/SpectatorHud FIELD field_32216 FADE_OUT_DURATION J METHOD (Lnet/minecraft/class_310;)V ARG 1 client - METHOD method_1975 renderSpectatorMenu (Lnet/minecraft/class_4587;FIILnet/minecraft/class_539;)V - ARG 1 matrices + METHOD method_1975 renderSpectatorMenu (Lnet/minecraft/class_332;FIILnet/minecraft/class_539;)V ARG 2 height ARG 3 x ARG 4 y @@ -17,14 +16,11 @@ CLASS net/minecraft/class_365 net/minecraft/client/gui/hud/SpectatorHud METHOD method_1976 cycleSlot (I)V METHOD method_1977 selectSlot (I)V ARG 1 slot - METHOD method_1978 renderSpectatorMenu (Lnet/minecraft/class_4587;)V - ARG 1 matrices - METHOD method_1979 render (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_1978 renderSpectatorMenu (Lnet/minecraft/class_332;)V + METHOD method_1979 render (Lnet/minecraft/class_332;)V METHOD method_1980 isOpen ()Z METHOD method_1981 getSpectatorMenuHeight ()F - METHOD method_1982 renderSpectatorCommand (Lnet/minecraft/class_4587;IIFFLnet/minecraft/class_537;)V - ARG 1 matrices + METHOD method_1982 renderSpectatorCommand (Lnet/minecraft/class_332;IIFFLnet/minecraft/class_537;)V ARG 2 slot ARG 3 x ARG 4 y diff --git a/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping b/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping index da96162005..bb33d86b6f 100644 --- a/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping @@ -5,8 +5,7 @@ CLASS net/minecraft/class_359 net/minecraft/client/gui/hud/SubtitlesHud FIELD field_32214 REMOVE_DELAY J METHOD (Lnet/minecraft/class_310;)V ARG 1 client - METHOD method_1957 render (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_1957 render (Lnet/minecraft/class_332;)V CLASS class_360 SubtitleEntry FIELD field_2185 time J FIELD field_2186 pos Lnet/minecraft/class_243; diff --git a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping index 2496672b1d..ca1afafbc7 100644 --- a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping +++ b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_537 net/minecraft/client/gui/hud/spectator/SpectatorMe METHOD method_16893 isEnabled ()Z METHOD method_2783 use (Lnet/minecraft/class_531;)V ARG 1 menu - METHOD method_2784 renderIcon (Lnet/minecraft/class_4587;FI)V - ARG 1 matrices + METHOD method_2784 renderIcon (Lnet/minecraft/class_332;FI)V ARG 2 brightness ARG 3 alpha diff --git a/mappings/net/minecraft/client/gui/screen/ChatInputSuggestor.mapping b/mappings/net/minecraft/client/gui/screen/ChatInputSuggestor.mapping index 6e3bcc1733..5ecf4ad0de 100644 --- a/mappings/net/minecraft/client/gui/screen/ChatInputSuggestor.mapping +++ b/mappings/net/minecraft/client/gui/screen/ChatInputSuggestor.mapping @@ -40,8 +40,7 @@ CLASS net/minecraft/class_4717 net/minecraft/client/gui/screen/ChatInputSuggesto ARG 1 mouseX ARG 3 mouseY ARG 5 button - METHOD method_23923 render (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_23923 render (Lnet/minecraft/class_332;II)V ARG 2 mouseX ARG 3 mouseY METHOD method_23924 keyPressed (III)Z @@ -72,10 +71,8 @@ CLASS net/minecraft/class_4717 net/minecraft/client/gui/screen/ChatInputSuggesto METHOD method_30505 formatException (Lcom/mojang/brigadier/exceptions/CommandSyntaxException;)Lnet/minecraft/class_5481; ARG 0 exception METHOD method_44931 clearWindow ()V - METHOD method_44932 renderMessages (Lnet/minecraft/class_4587;)V - ARG 1 matrices - METHOD method_44933 tryRenderWindow (Lnet/minecraft/class_4587;II)Z - ARG 1 matrices + METHOD method_44932 renderMessages (Lnet/minecraft/class_332;)V + METHOD method_44933 tryRenderWindow (Lnet/minecraft/class_332;II)Z ARG 2 mouseX ARG 3 mouseY CLASS class_464 SuggestionWindow @@ -101,8 +98,7 @@ CLASS net/minecraft/class_4717 net/minecraft/client/gui/screen/ChatInputSuggesto ARG 1 x ARG 2 y ARG 3 button - METHOD method_2373 render (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_2373 render (Lnet/minecraft/class_332;II)V ARG 2 mouseX ARG 3 mouseY METHOD method_2374 select (I)V diff --git a/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping b/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping index c22423c1e4..ecb709f1ea 100644 --- a/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping @@ -21,8 +21,7 @@ CLASS net/minecraft/class_445 net/minecraft/client/gui/screen/CreditsScreen ARG 1 endCredits ARG 2 finishAction METHOD method_2257 closeScreen ()V - METHOD method_2258 renderBackground (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_2258 renderBackground (Lnet/minecraft/class_332;)V METHOD method_37304 addText (Lnet/minecraft/class_2561;Z)V ARG 1 text ARG 2 centered diff --git a/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping b/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping index f3a5be36ce..2645bf73cb 100644 --- a/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping @@ -33,12 +33,10 @@ CLASS net/minecraft/class_413 net/minecraft/client/gui/screen/CustomizeFlatLevel CLASS class_4192 SuperflatLayersListWidget METHOD method_19372 updateLayers ()V CLASS class_4193 SuperflatLayerEntry - METHOD method_19373 renderIconBackgroundTexture (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_19373 renderIconBackgroundTexture (Lnet/minecraft/class_332;II)V ARG 2 x ARG 3 y - METHOD method_19375 renderIcon (Lnet/minecraft/class_4587;IILnet/minecraft/class_1799;)V - ARG 1 matrices + METHOD method_19375 renderIcon (Lnet/minecraft/class_332;IILnet/minecraft/class_1799;)V ARG 2 x ARG 3 y ARG 4 iconItem diff --git a/mappings/net/minecraft/client/gui/screen/GameModeSelectionScreen.mapping b/mappings/net/minecraft/client/gui/screen/GameModeSelectionScreen.mapping index 3a0c92b47c..866750e1ef 100644 --- a/mappings/net/minecraft/client/gui/screen/GameModeSelectionScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/GameModeSelectionScreen.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_5289 net/minecraft/client/gui/screen/GameModeSelectionScreen FIELD field_24566 TEXTURE Lnet/minecraft/class_2960; FIELD field_24567 UI_WIDTH I - FIELD field_24568 currentGameMode Ljava/util/Optional; - FIELD field_24569 gameMode Ljava/util/Optional; + FIELD field_24568 currentGameMode Lnet/minecraft/class_5289$class_5290; + FIELD field_24569 gameMode Lnet/minecraft/class_5289$class_5290; FIELD field_24570 lastMouseX I FIELD field_24571 lastMouseY I FIELD field_24572 mouseUsedForSelection Z @@ -12,13 +12,8 @@ CLASS net/minecraft/class_5289 net/minecraft/client/gui/screen/GameModeSelection FIELD field_32311 TEXTURE_HEIGHT I FIELD field_32312 BUTTON_SIZE I FIELD field_32313 ICON_OFFSET I - METHOD method_28062 (Lnet/minecraft/class_4587;Lnet/minecraft/class_5289$class_5290;)V - ARG 2 gameMode - METHOD method_28064 apply (Lnet/minecraft/class_310;Ljava/util/Optional;)V + METHOD method_28064 apply (Lnet/minecraft/class_310;Lnet/minecraft/class_5289$class_5290;)V ARG 0 client - ARG 1 gameMode - METHOD method_28065 (Lnet/minecraft/class_5289$class_5291;Lnet/minecraft/class_5289$class_5290;)V - ARG 1 gameMode METHOD method_28068 apply ()V METHOD method_28069 checkForClose ()Z METHOD method_30106 getPreviousGameMode ()Lnet/minecraft/class_1934; @@ -32,15 +27,11 @@ CLASS net/minecraft/class_5289 net/minecraft/client/gui/screen/GameModeSelection ARG 4 command ARG 5 icon METHOD method_28070 getText ()Lnet/minecraft/class_2561; - METHOD method_28074 renderIcon (Lnet/minecraft/class_4587;Lnet/minecraft/class_918;II)V - ARG 1 matrices - ARG 2 itemRenderer - ARG 3 x - ARG 4 y + METHOD method_28074 renderIcon (Lnet/minecraft/class_332;II)V METHOD method_28075 getCommand ()Ljava/lang/String; - METHOD method_28076 of (Lnet/minecraft/class_1934;)Ljava/util/Optional; + METHOD method_28076 of (Lnet/minecraft/class_1934;)Lnet/minecraft/class_5289$class_5290; ARG 0 gameMode - METHOD method_28078 next ()Ljava/util/Optional; + METHOD method_28078 next ()Lnet/minecraft/class_5289$class_5290; CLASS class_5291 ButtonWidget FIELD field_24586 gameMode Lnet/minecraft/class_5289$class_5290; FIELD field_24587 selected Z @@ -48,11 +39,7 @@ CLASS net/minecraft/class_5289 net/minecraft/client/gui/screen/GameModeSelection ARG 2 gameMode ARG 3 x ARG 4 y - METHOD method_28080 drawBackground (Lnet/minecraft/class_4587;Lnet/minecraft/class_1060;)V - ARG 1 matrices - ARG 2 textureManager - METHOD method_28082 drawSelectionBox (Lnet/minecraft/class_4587;Lnet/minecraft/class_1060;)V - ARG 1 matrices - ARG 2 textureManager + METHOD method_28080 drawBackground (Lnet/minecraft/class_332;)V + METHOD method_28082 drawSelectionBox (Lnet/minecraft/class_332;)V METHOD method_28083 setSelected (Z)V ARG 1 selected diff --git a/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping b/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping index e2f3f694e4..eab7bfcdf6 100644 --- a/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping @@ -8,8 +8,7 @@ CLASS net/minecraft/class_3928 net/minecraft/client/gui/screen/LevelLoadingScree ARG 1 progressProvider METHOD method_17537 (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V ARG 0 map - METHOD method_17538 drawChunkMap (Lnet/minecraft/class_4587;Lnet/minecraft/class_3953;IIII)V - ARG 0 matrices + METHOD method_17538 drawChunkMap (Lnet/minecraft/class_332;Lnet/minecraft/class_3953;IIII)V ARG 1 progressProvider ARG 2 centerX ARG 3 centerY diff --git a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping index 222826ea42..15aac15bfb 100644 --- a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping @@ -59,12 +59,10 @@ CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen METHOD (Lnet/minecraft/class_430$class_4196;Lnet/minecraft/class_6880;)V ARG 2 preset METHOD method_19389 setPreset ()V - METHOD method_2198 drawIconBackground (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_2198 drawIconBackground (Lnet/minecraft/class_332;II)V ARG 2 x ARG 3 y - METHOD method_2200 renderIcon (Lnet/minecraft/class_4587;IILnet/minecraft/class_1792;)V - ARG 1 matrices + METHOD method_2200 renderIcon (Lnet/minecraft/class_332;IILnet/minecraft/class_1792;)V ARG 2 x ARG 3 y ARG 4 iconItem diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping index 0814eebac1..3be4f505d7 100644 --- a/mappings/net/minecraft/client/gui/screen/Screen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping @@ -5,10 +5,8 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen FIELD field_22785 title Lnet/minecraft/class_2561; FIELD field_22786 children Ljava/util/List; FIELD field_22787 client Lnet/minecraft/class_310; - FIELD field_22788 itemRenderer Lnet/minecraft/class_918; FIELD field_22789 width I FIELD field_22790 height I - FIELD field_22792 passEvents Z FIELD field_22793 textRenderer Lnet/minecraft/class_327; FIELD field_33813 selected Lnet/minecraft/class_6379; FIELD field_33814 SCREEN_USAGE_TEXT Lnet/minecraft/class_2561; @@ -27,13 +25,8 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen METHOD (Lnet/minecraft/class_2561;)V ARG 1 title METHOD method_25393 tick ()V - METHOD method_25408 getTooltipFromItem (Lnet/minecraft/class_1799;)Ljava/util/List; + METHOD method_25408 getTooltipFromItem (Lnet/minecraft/class_310;Lnet/minecraft/class_1799;)Ljava/util/List; ARG 1 stack - METHOD method_25409 renderTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_1799;II)V - ARG 1 matrices - ARG 2 stack - ARG 3 x - ARG 4 y METHOD method_25410 resize (Lnet/minecraft/class_310;II)V ARG 1 client ARG 2 width @@ -51,23 +44,12 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 2 override METHOD method_25416 openLink (Ljava/net/URI;)V ARG 1 link - METHOD method_25417 renderOrderedTooltip (Lnet/minecraft/class_4587;Ljava/util/List;II)V - ARG 1 matrices - ARG 2 lines - ARG 3 x - ARG 4 y - METHOD method_25418 renderTextHoverEffect (Lnet/minecraft/class_4587;Lnet/minecraft/class_2583;II)V - ARG 1 matrices - ARG 2 style - ARG 3 x - ARG 4 y METHOD method_25419 close ()V - METHOD method_25420 renderBackground (Lnet/minecraft/class_4587;)V + METHOD method_25420 renderBackground (Lnet/minecraft/class_332;)V COMMENT Renders the background of this screen. COMMENT COMMENT

If the client is in a world, renders the translucent background gradient. COMMENT Otherwise {@linkplain #renderBackgroundTexture renders the background texture}. - ARG 1 matrices METHOD method_25421 shouldPause ()Z METHOD method_25422 shouldCloseOnEsc ()Z COMMENT Checks whether this screen should be closed when the escape key is pressed. @@ -75,11 +57,6 @@ 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_2561;II)V - ARG 1 matrices - ARG 2 text - ARG 3 x - ARG 4 y METHOD method_25426 init ()V COMMENT Called when a screen should be initialized. COMMENT @@ -93,9 +70,8 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen METHOD method_25430 handleTextClick (Lnet/minecraft/class_2583;)Z ARG 1 style METHOD method_25432 removed ()V - METHOD method_25434 renderBackgroundTexture (Lnet/minecraft/class_4587;)V + METHOD method_25434 renderBackgroundTexture (Lnet/minecraft/class_332;)V COMMENT Renders the fullscreen {@linkplain net.minecraft.client.gui.DrawableHelper#OPTIONS_BACKGROUND_TEXTURE background texture} of this screen. - ARG 1 matrices METHOD method_25435 getNarratedTitle ()Lnet/minecraft/class_2561; METHOD method_25436 isCut (I)Z ARG 0 code @@ -111,25 +87,6 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen METHOD method_25443 hasAltDown ()Z METHOD method_29638 filesDragged (Ljava/util/List;)V ARG 1 paths - METHOD method_30901 renderTooltip (Lnet/minecraft/class_4587;Ljava/util/List;II)V - ARG 1 matrices - ARG 2 lines - ARG 3 x - ARG 4 y - METHOD method_32633 renderTooltipFromComponents (Lnet/minecraft/class_4587;Ljava/util/List;IILnet/minecraft/class_8000;)V - ARG 1 matrices - ARG 2 components - ARG 3 x - ARG 4 y - ARG 5 positioner - METHOD method_32634 renderTooltip (Lnet/minecraft/class_4587;Ljava/util/List;Ljava/util/Optional;II)V - ARG 1 matrices - ARG 2 lines - ARG 3 data - ARG 4 x - ARG 5 y - METHOD method_32635 (Ljava/util/List;Lnet/minecraft/class_5632;)V - ARG 1 data METHOD method_37056 addElementNarrations (Lnet/minecraft/class_6382;)V ARG 1 builder METHOD method_37058 setElementNarrationDelay (J)V @@ -169,8 +126,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 1 tooltip ARG 2 positioner ARG 3 focused - METHOD method_47413 renderWithTooltip (Lnet/minecraft/class_4587;IIF)V - ARG 1 matrices + METHOD method_47413 renderWithTooltip (Lnet/minecraft/class_332;IIF)V ARG 2 mouseX ARG 3 mouseY ARG 4 delta @@ -178,25 +134,10 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 1 tooltip METHOD method_47415 setTooltip (Lnet/minecraft/class_2561;)V ARG 1 tooltip - METHOD method_47941 renderPositionedTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_437$class_7998;II)V - ARG 1 matrices - ARG 2 tooltip - ARG 3 x - ARG 4 y METHOD method_47942 setTooltip (Ljava/util/List;Lnet/minecraft/class_8000;Z)V ARG 1 tooltip ARG 2 positioner ARG 3 focused - METHOD method_47943 (Lorg/joml/Matrix4f;Lnet/minecraft/class_287;IIIIIII)V - ARG 0 matrix - ARG 1 builder - ARG 2 startX - ARG 3 startY - ARG 4 endX - ARG 5 endY - ARG 6 z - ARG 7 colorStart - ARG 8 colorEnd METHOD method_48262 hasUsageText ()Z METHOD method_48263 switchFocus (Lnet/minecraft/class_8016;)V COMMENT Switches focus from the currently focused element, if any, to {@code path}. diff --git a/mappings/net/minecraft/client/gui/screen/SplashOverlay.mapping b/mappings/net/minecraft/client/gui/screen/SplashOverlay.mapping index a80a7c0333..570f521a91 100644 --- a/mappings/net/minecraft/client/gui/screen/SplashOverlay.mapping +++ b/mappings/net/minecraft/client/gui/screen/SplashOverlay.mapping @@ -20,8 +20,7 @@ CLASS net/minecraft/class_425 net/minecraft/client/gui/screen/SplashOverlay ARG 2 monitor ARG 3 exceptionHandler ARG 4 reloading - METHOD method_18103 renderProgressBar (Lnet/minecraft/class_4587;IIIIF)V - ARG 1 matrices + METHOD method_18103 renderProgressBar (Lnet/minecraft/class_332;IIIIF)V ARG 2 minX ARG 3 minY ARG 4 maxX diff --git a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping index d84185f733..4650da8cc0 100644 --- a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping @@ -23,16 +23,14 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen ARG 1 button METHOD method_2267 createButtons ()V METHOD method_2270 createLists ()V - METHOD method_2282 renderIcon (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices + METHOD method_2282 renderIcon (Lnet/minecraft/class_332;IIII)V ARG 2 x ARG 3 y ARG 4 u ARG 5 v METHOD method_2285 getColumnX (I)I ARG 1 index - METHOD method_2289 renderStatItem (Lnet/minecraft/class_4587;IILnet/minecraft/class_1792;)V - ARG 1 matrices + METHOD method_2289 renderStatItem (Lnet/minecraft/class_332;IILnet/minecraft/class_1792;)V ARG 2 x ARG 3 y ARG 4 item @@ -61,8 +59,7 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen ARG 2 client METHOD method_19406 getText (Lnet/minecraft/class_1792;)Lnet/minecraft/class_2561; ARG 1 item - METHOD method_19407 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V - ARG 1 matrices + METHOD method_19407 render (Lnet/minecraft/class_332;Lnet/minecraft/class_2561;II)V ARG 2 text ARG 3 mouseX ARG 4 mouseY @@ -80,8 +77,7 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen FIELD field_33830 item Lnet/minecraft/class_1792; METHOD (Lnet/minecraft/class_447$class_4200;Lnet/minecraft/class_1792;)V ARG 2 item - METHOD method_19405 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_3445;IIZ)V - ARG 1 matrices + METHOD method_19405 render (Lnet/minecraft/class_332;Lnet/minecraft/class_3445;IIZ)V ARG 2 stat ARG 3 x ARG 4 y diff --git a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping index a1835f0d49..b66c6279f8 100644 --- a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen FIELD field_18222 doBackgroundFade Z FIELD field_23775 LOGGER Lorg/slf4j/Logger; FIELD field_2585 backgroundRenderer Lnet/minecraft/class_766; - FIELD field_2586 splashText Ljava/lang/String; + FIELD field_2586 splashText Lnet/minecraft/class_8519; FIELD field_2590 buttonResetDemo Lnet/minecraft/class_4185; FIELD field_2592 realmsNotificationGui Lnet/minecraft/class_4399; FIELD field_32271 COPYRIGHT Lnet/minecraft/class_2561; @@ -55,6 +55,5 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen CLASS class_7063 DeprecationNotice FIELD comp_829 textRenderer Lnet/minecraft/class_327; METHOD comp_829 textRenderer ()Lnet/minecraft/class_327; - METHOD method_44065 render (Lnet/minecraft/class_4587;I)V - ARG 1 matrices + METHOD method_44065 render (Lnet/minecraft/class_332;I)V ARG 2 color diff --git a/mappings/net/minecraft/client/gui/screen/WarningScreen.mapping b/mappings/net/minecraft/client/gui/screen/WarningScreen.mapping index 71de58875e..7b696face1 100644 --- a/mappings/net/minecraft/client/gui/screen/WarningScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/WarningScreen.mapping @@ -16,5 +16,4 @@ CLASS net/minecraft/class_7065 net/minecraft/client/gui/screen/WarningScreen METHOD method_41160 initButtons (I)V ARG 1 yOffset METHOD method_44068 getLineHeight ()I - METHOD method_44663 drawTitle (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_44663 drawTitle (Lnet/minecraft/class_332;)V diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping index de868fb8c4..f15be1aab2 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping @@ -28,12 +28,10 @@ CLASS net/minecraft/class_454 net/minecraft/client/gui/screen/advancement/Advanc METHOD method_2308 getWidget (Lnet/minecraft/class_161;)Lnet/minecraft/class_456; ARG 1 advancement METHOD method_2309 getTitle ()Lnet/minecraft/class_2561; - METHOD method_2310 render (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_2310 render (Lnet/minecraft/class_332;II)V ARG 2 x ARG 3 y - METHOD method_2311 drawBackground (Lnet/minecraft/class_4587;IIZ)V - ARG 1 matrices + METHOD method_2311 drawBackground (Lnet/minecraft/class_332;IIZ)V ARG 2 x ARG 3 y ARG 4 selected @@ -41,17 +39,14 @@ CLASS net/minecraft/class_454 net/minecraft/client/gui/screen/advancement/Advanc METHOD method_2313 move (DD)V ARG 1 offsetX ARG 3 offsetY - METHOD method_2314 drawWidgetTooltip (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices + METHOD method_2314 drawWidgetTooltip (Lnet/minecraft/class_332;IIII)V ARG 2 mouseX ARG 3 mouseY ARG 4 x ARG 5 y - METHOD method_2315 drawIcon (Lnet/minecraft/class_4587;IILnet/minecraft/class_918;)V - ARG 1 matrices + METHOD method_2315 drawIcon (Lnet/minecraft/class_332;II)V ARG 2 x ARG 3 y - ARG 4 itemRenderer METHOD method_2316 isClickOnTab (IIDD)Z ARG 1 screenX ARG 2 screenY diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping index 7f10e6fc2f..2a26f620cd 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping @@ -10,8 +10,7 @@ CLASS net/minecraft/class_453 net/minecraft/client/gui/screen/advancement/Advanc ARG 5 width ARG 6 height ARG 7 tabCount - METHOD method_2301 drawBackground (Lnet/minecraft/class_4587;IIZI)V - ARG 1 matrices + METHOD method_2301 drawBackground (Lnet/minecraft/class_332;IIZI)V ARG 2 x ARG 3 y ARG 4 selected @@ -27,10 +26,7 @@ CLASS net/minecraft/class_453 net/minecraft/client/gui/screen/advancement/Advanc METHOD method_2304 getTabCount ()I METHOD method_2305 getTabY (I)I ARG 1 index - METHOD method_2306 drawIcon (Lnet/minecraft/class_4587;IIILnet/minecraft/class_918;Lnet/minecraft/class_1799;)V - ARG 1 matrices + METHOD method_2306 drawIcon (Lnet/minecraft/class_332;IIILnet/minecraft/class_1799;)V ARG 2 x ARG 3 y ARG 4 index - ARG 5 itemRenderer - ARG 6 icon diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping index 27a4ebb805..6bede5a35c 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping @@ -26,13 +26,11 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/Advanc ARG 4 display METHOD method_2322 addChild (Lnet/minecraft/class_456;)V ARG 1 widget - METHOD method_2323 renderLines (Lnet/minecraft/class_4587;IIZ)V - ARG 1 matrices + METHOD method_2323 renderLines (Lnet/minecraft/class_332;IIZ)V ARG 2 x ARG 3 y ARG 4 border - METHOD method_2325 renderWidgets (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_2325 renderWidgets (Lnet/minecraft/class_332;II)V ARG 2 x ARG 3 y METHOD method_2326 getY ()I @@ -47,8 +45,7 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/Advanc METHOD method_2330 wrapDescription (Lnet/minecraft/class_2561;I)Ljava/util/List; ARG 1 text ARG 2 width - METHOD method_2331 drawTooltip (Lnet/minecraft/class_4587;IIFII)V - ARG 1 matrices + METHOD method_2331 drawTooltip (Lnet/minecraft/class_332;IIFII)V ARG 2 originX ARG 3 originY ARG 4 alpha diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping index f40260425b..a2c41063ff 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping @@ -18,22 +18,19 @@ CLASS net/minecraft/class_457 net/minecraft/client/gui/screen/advancement/Advanc FIELD field_32309 TITLE_OFFSET_Y I METHOD (Lnet/minecraft/class_632;)V ARG 1 advancementHandler - METHOD method_2334 drawWindow (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_2334 drawWindow (Lnet/minecraft/class_332;II)V ARG 2 x ARG 3 y METHOD method_2335 getAdvancementWidget (Lnet/minecraft/class_161;)Lnet/minecraft/class_456; ARG 1 advancement METHOD method_2336 getTab (Lnet/minecraft/class_161;)Lnet/minecraft/class_454; ARG 1 advancement - METHOD method_2337 drawAdvancementTree (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices + METHOD method_2337 drawAdvancementTree (Lnet/minecraft/class_332;IIII)V ARG 2 mouseX ARG 3 mouseY ARG 4 x ARG 5 y - METHOD method_2338 drawWidgetTooltip (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices + METHOD method_2338 drawWidgetTooltip (Lnet/minecraft/class_332;IIII)V ARG 2 mouseX ARG 3 mouseY ARG 4 x diff --git a/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping index c363aad250..f832dbc541 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping @@ -1,23 +1,19 @@ CLASS net/minecraft/class_485 net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen - METHOD method_18642 drawStatusEffectBackgrounds (Lnet/minecraft/class_4587;IILjava/lang/Iterable;Z)V - ARG 1 matrices + METHOD method_18642 drawStatusEffectBackgrounds (Lnet/minecraft/class_332;IILjava/lang/Iterable;Z)V ARG 2 x ARG 3 height ARG 4 statusEffects ARG 5 wide - METHOD method_18643 drawStatusEffectSprites (Lnet/minecraft/class_4587;IILjava/lang/Iterable;Z)V - ARG 1 matrices + METHOD method_18643 drawStatusEffectSprites (Lnet/minecraft/class_332;IILjava/lang/Iterable;Z)V ARG 2 x ARG 3 height ARG 4 statusEffects ARG 5 wide - METHOD method_18644 drawStatusEffectDescriptions (Lnet/minecraft/class_4587;IILjava/lang/Iterable;)V - ARG 1 matrices + METHOD method_18644 drawStatusEffectDescriptions (Lnet/minecraft/class_332;IILjava/lang/Iterable;)V ARG 2 x ARG 3 height ARG 4 statusEffects - METHOD method_2477 drawStatusEffects (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_2477 drawStatusEffects (Lnet/minecraft/class_332;II)V ARG 2 mouseX ARG 3 mouseY METHOD method_38933 getStatusEffectDescription (Lnet/minecraft/class_1293;)Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen.mapping index 870e5fa2e5..b6008660fc 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen.mapping @@ -16,20 +16,13 @@ CLASS net/minecraft/class_7743 net/minecraft/client/gui/screen/ingame/AbstractSi ARG 2 front ARG 3 filtered ARG 4 title - METHOD method_45654 translateForRender (Lnet/minecraft/class_4587;Lnet/minecraft/class_2680;)V - ARG 1 matrices + METHOD method_45654 translateForRender (Lnet/minecraft/class_332;Lnet/minecraft/class_2680;)V ARG 2 state - METHOD method_45655 renderSignText (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597$class_4598;)V - ARG 1 matrices - ARG 2 vertexConsumers - METHOD method_45656 renderSignBackground (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597$class_4598;Lnet/minecraft/class_2680;)V - ARG 1 matrices - ARG 2 vertexConsumers - ARG 3 state + METHOD method_45655 renderSignText (Lnet/minecraft/class_332;)V + METHOD method_45656 renderSignBackground (Lnet/minecraft/class_332;Lnet/minecraft/class_2680;)V METHOD method_45657 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_45659 renderSign (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_45659 renderSign (Lnet/minecraft/class_332;)V METHOD method_45661 getTextScale ()Lorg/joml/Vector3f; METHOD method_45662 finishEditing ()V METHOD method_49912 canEdit ()Z diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping index 23f5b1ad6e..0fe941f74e 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping @@ -46,8 +46,7 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree ARG 1 x ARG 2 y ARG 3 message - METHOD method_18641 renderExtra (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_18641 renderExtra (Lnet/minecraft/class_332;)V METHOD method_2401 setDisabled (Z)V ARG 1 disabled METHOD method_2402 isDisabled ()Z diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping index bb9b4c281c..4da87b4b90 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping @@ -67,8 +67,7 @@ CLASS net/minecraft/class_473 net/minecraft/client/gui/screen/ingame/BookEditScr METHOD method_27578 createPageContent ()Lnet/minecraft/class_473$class_5233; METHOD method_27580 moveVertically (I)V ARG 1 lines - METHOD method_27581 drawCursor (Lnet/minecraft/class_4587;Lnet/minecraft/class_473$class_5234;Z)V - ARG 1 matrices + METHOD method_27581 drawCursor (Lnet/minecraft/class_332;Lnet/minecraft/class_473$class_5234;Z)V ARG 2 position ARG 3 atEnd METHOD method_27582 screenPositionToAbsolutePosition (Lnet/minecraft/class_473$class_5234;)Lnet/minecraft/class_473$class_5234; @@ -94,8 +93,7 @@ CLASS net/minecraft/class_473 net/minecraft/client/gui/screen/ingame/BookEditScr ARG 6 style ARG 7 start ARG 8 end - METHOD method_27588 drawSelection (Lnet/minecraft/class_4587;[Lnet/minecraft/class_768;)V - ARG 1 matrices + METHOD method_27588 drawSelection (Lnet/minecraft/class_332;[Lnet/minecraft/class_768;)V ARG 2 selectionRectangles METHOD method_27589 selectCurrentWord (I)V ARG 1 cursor diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping index f3fe14887d..32bb2c5c6e 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping @@ -4,15 +4,12 @@ CLASS net/minecraft/class_3934 net/minecraft/client/gui/screen/ingame/Cartograph ARG 1 handler ARG 2 inventory ARG 3 title - METHOD method_17566 drawMap (Lnet/minecraft/class_4587;Ljava/lang/Integer;Lnet/minecraft/class_22;IIF)V - ARG 1 matrices - ARG 2 mapId + METHOD method_17566 drawMap (Lnet/minecraft/class_332;Ljava/lang/Integer;Lnet/minecraft/class_22;IIF)V ARG 3 mapState ARG 4 x ARG 5 y ARG 6 scale - METHOD method_17567 drawMap (Lnet/minecraft/class_4587;Ljava/lang/Integer;Lnet/minecraft/class_22;ZZZZ)V - ARG 1 matrices + METHOD method_17567 drawMap (Lnet/minecraft/class_332;Ljava/lang/Integer;Lnet/minecraft/class_22;ZZZZ)V ARG 2 mapId ARG 3 mapState ARG 4 cloneMode diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping index d2d57ce846..88985e83c5 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping @@ -28,8 +28,6 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv ARG 3 operatorTabEnabled METHOD method_15871 searchForTags (Ljava/lang/String;)V ARG 1 id - METHOD method_15872 (Lnet/minecraft/class_1799;Ljava/util/List;Lnet/minecraft/class_6862;)V - ARG 2 tag METHOD method_15873 (Ljava/util/function/Predicate;Lnet/minecraft/class_6862;)Z ARG 1 tag METHOD method_15874 (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_2960;)Z @@ -52,13 +50,11 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv METHOD method_2467 isClickInScrollbar (DD)Z ARG 1 mouseX ARG 3 mouseY - METHOD method_2468 renderTabIcon (Lnet/minecraft/class_4587;Lnet/minecraft/class_1761;)V - ARG 1 matrices + METHOD method_2468 renderTabIcon (Lnet/minecraft/class_332;Lnet/minecraft/class_1761;)V ARG 2 group METHOD method_2470 isCreativeInventorySlot (Lnet/minecraft/class_1735;)Z ARG 1 slot - METHOD method_2471 renderTabTooltipIfHovered (Lnet/minecraft/class_4587;Lnet/minecraft/class_1761;II)Z - ARG 1 matrices + METHOD method_2471 renderTabTooltipIfHovered (Lnet/minecraft/class_332;Lnet/minecraft/class_1761;II)Z ARG 2 group ARG 3 mouseX ARG 4 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CyclingSlotIcon.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CyclingSlotIcon.mapping index 16334f2c87..25b929c833 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CyclingSlotIcon.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CyclingSlotIcon.mapping @@ -7,17 +7,15 @@ CLASS net/minecraft/class_8064 net/minecraft/client/gui/screen/ingame/CyclingSlo ARG 1 slotId METHOD method_48468 computeAlpha (F)F ARG 1 delta - METHOD method_48469 render (Lnet/minecraft/class_1703;Lnet/minecraft/class_4587;FII)V + METHOD method_48469 render (Lnet/minecraft/class_1703;Lnet/minecraft/class_332;FII)V ARG 1 screenHandler - ARG 2 matrices ARG 3 delta ARG 4 x ARG 5 y - METHOD method_48470 drawIcon (Lnet/minecraft/class_1735;Lnet/minecraft/class_2960;FLnet/minecraft/class_4587;II)V + METHOD method_48470 drawIcon (Lnet/minecraft/class_1735;Lnet/minecraft/class_2960;FLnet/minecraft/class_332;II)V ARG 1 slot ARG 2 texture ARG 3 alpha - ARG 4 matrices ARG 5 x ARG 6 y METHOD method_48471 updateTexture (Ljava/util/List;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping index 9e48ea9f5e..79ba9e2672 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping @@ -5,13 +5,11 @@ CLASS net/minecraft/class_4894 net/minecraft/client/gui/screen/ingame/ForgingScr ARG 2 playerInventory ARG 3 title ARG 4 texture - METHOD method_25444 renderForeground (Lnet/minecraft/class_4587;IIF)V - ARG 1 matrices + METHOD method_25444 renderForeground (Lnet/minecraft/class_332;IIF)V ARG 2 mouseX ARG 3 mouseY ARG 4 delta METHOD method_25445 setup ()V - METHOD method_48467 drawInvalidRecipeArrow (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_48467 drawInvalidRecipeArrow (Lnet/minecraft/class_332;II)V ARG 2 x ARG 3 y diff --git a/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping index b59eb9ef69..d40b7c3786 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping @@ -44,8 +44,7 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre ARG 5 pointX ARG 7 pointY METHOD method_2379 calculateOffset ()V - METHOD method_2380 drawMouseoverTooltip (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_2380 drawMouseoverTooltip (Lnet/minecraft/class_332;II)V ARG 2 x ARG 3 y METHOD method_2381 isClickOutsideBounds (DDIII)Z @@ -54,8 +53,7 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre ARG 5 left ARG 6 top ARG 7 button - METHOD method_2382 drawItem (Lnet/minecraft/class_4587;Lnet/minecraft/class_1799;IILjava/lang/String;)V - ARG 1 matrices + METHOD method_2382 drawItem (Lnet/minecraft/class_332;Lnet/minecraft/class_1799;IILjava/lang/String;)V ARG 2 stack ARG 3 x ARG 4 y @@ -69,8 +67,7 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre METHOD method_2384 handleHotbarKeyPressed (II)Z ARG 1 keyCode ARG 2 scanCode - METHOD method_2385 drawSlot (Lnet/minecraft/class_4587;Lnet/minecraft/class_1735;)V - ARG 1 matrices + METHOD method_2385 drawSlot (Lnet/minecraft/class_332;Lnet/minecraft/class_1735;)V ARG 2 slot METHOD method_2386 getSlotAt (DD)Lnet/minecraft/class_1735; ARG 1 x @@ -79,19 +76,16 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre ARG 1 slot ARG 2 pointX ARG 4 pointY - METHOD method_2388 drawForeground (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_2388 drawForeground (Lnet/minecraft/class_332;II)V ARG 2 mouseX ARG 3 mouseY - METHOD method_2389 drawBackground (Lnet/minecraft/class_4587;FII)V - ARG 1 matrices + METHOD method_2389 drawBackground (Lnet/minecraft/class_332;FII)V ARG 2 delta ARG 3 mouseX ARG 4 mouseY METHOD method_30107 onMouseClick (I)V ARG 1 button - METHOD method_33285 drawSlotHighlight (Lnet/minecraft/class_4587;III)V - ARG 0 matrices + METHOD method_33285 drawSlotHighlight (Lnet/minecraft/class_332;III)V ARG 1 x ARG 2 y ARG 3 z diff --git a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping index 9f278b0fd5..34055ec307 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_490 net/minecraft/client/gui/screen/ingame/InventorySc FIELD field_2929 recipeBook Lnet/minecraft/class_507; FIELD field_2930 mouseDown Z FIELD field_2931 narrow Z - FIELD field_2932 open Z FIELD field_2933 RECIPE_BUTTON_TEXTURE Lnet/minecraft/class_2960; FIELD field_2934 mouseY F FIELD field_2935 mouseX F @@ -10,16 +9,14 @@ CLASS net/minecraft/class_490 net/minecraft/client/gui/screen/ingame/InventorySc ARG 1 player METHOD method_19891 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_2486 drawEntity (Lnet/minecraft/class_4587;IIIFFLnet/minecraft/class_1309;)V - ARG 0 matrices + METHOD method_2486 drawEntity (Lnet/minecraft/class_332;IIIFFLnet/minecraft/class_1309;)V ARG 1 x ARG 2 y ARG 3 size ARG 4 mouseX ARG 5 mouseY ARG 6 entity - METHOD method_48472 drawEntity (Lnet/minecraft/class_4587;IIILorg/joml/Quaternionf;Lorg/joml/Quaternionf;Lnet/minecraft/class_1309;)V - ARG 0 matrices + METHOD method_48472 drawEntity (Lnet/minecraft/class_332;IIILorg/joml/Quaternionf;Lorg/joml/Quaternionf;Lnet/minecraft/class_1309;)V ARG 1 x ARG 2 y ARG 3 size diff --git a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping index c5e134d533..0867324f4e 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping @@ -23,8 +23,5 @@ CLASS net/minecraft/class_494 net/minecraft/client/gui/screen/ingame/LoomScreen ARG 2 inventory ARG 3 title METHOD method_17576 onInventoryChanged ()V - METHOD method_22692 drawBanner (Lnet/minecraft/class_6880;II)V - ARG 1 bannerPattern - ARG 2 x - ARG 3 y + METHOD method_22692 drawBanner (Lnet/minecraft/class_332;Lnet/minecraft/class_6880;II)V METHOD method_43774 getRows ()I diff --git a/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping index 694df9c3e5..c7790015a7 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping @@ -26,8 +26,7 @@ CLASS net/minecraft/class_492 net/minecraft/client/gui/screen/ingame/MerchantScr ARG 1 handler ARG 2 inventory ARG 3 title - METHOD method_19413 drawLevelInfo (Lnet/minecraft/class_4587;IILnet/minecraft/class_1914;)V - ARG 1 matrices + METHOD method_19413 drawLevelInfo (Lnet/minecraft/class_332;IILnet/minecraft/class_1914;)V ARG 2 x ARG 3 y ARG 4 tradeOffer @@ -35,19 +34,16 @@ CLASS net/minecraft/class_492 net/minecraft/client/gui/screen/ingame/MerchantScr ARG 1 button METHOD method_20220 canScroll (I)Z ARG 1 listSize - METHOD method_20221 renderScrollbar (Lnet/minecraft/class_4587;IILnet/minecraft/class_1916;)V - ARG 1 matrices + METHOD method_20221 renderScrollbar (Lnet/minecraft/class_332;IILnet/minecraft/class_1916;)V ARG 2 x ARG 3 y ARG 4 tradeOffers - METHOD method_20222 renderFirstBuyItem (Lnet/minecraft/class_4587;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;II)V - ARG 1 matrices + METHOD method_20222 renderFirstBuyItem (Lnet/minecraft/class_332;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;II)V ARG 2 adjustedFirstBuyItem ARG 3 originalFirstBuyItem ARG 4 x ARG 5 y - METHOD method_20223 renderArrow (Lnet/minecraft/class_4587;Lnet/minecraft/class_1914;II)V - ARG 1 matrices + METHOD method_20223 renderArrow (Lnet/minecraft/class_332;Lnet/minecraft/class_1914;II)V ARG 2 tradeOffer ARG 3 x ARG 4 y @@ -60,4 +56,4 @@ CLASS net/minecraft/class_492 net/minecraft/client/gui/screen/ingame/MerchantScr ARG 4 index ARG 5 onPress METHOD method_20228 getIndex ()I - METHOD method_25352 renderTooltip (Lnet/minecraft/class_4587;II)V + METHOD method_25352 renderTooltip (Lnet/minecraft/class_332;II)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping index a50a5486db..c55020e753 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping @@ -16,10 +16,9 @@ CLASS net/minecraft/class_4895 net/minecraft/client/gui/screen/ingame/SmithingSc ARG 3 title METHOD method_48473 getSmithingTemplate ()Ljava/util/Optional; METHOD method_48474 hasInvalidRecipe ()Z - METHOD method_48475 (Lnet/minecraft/class_4587;IILnet/minecraft/class_2561;)V + METHOD method_48475 (Lnet/minecraft/class_332;IILnet/minecraft/class_2561;)V ARG 4 text - METHOD method_48476 renderSlotTooltip (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_48476 renderSlotTooltip (Lnet/minecraft/class_332;II)V ARG 2 mouseX ARG 3 mouseY METHOD method_48641 equipArmorStand (Lnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping index e1bc40a126..ab4f257dac 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping @@ -17,13 +17,11 @@ CLASS net/minecraft/class_3979 net/minecraft/client/gui/screen/ingame/Stonecutte ARG 1 handler ARG 2 inventory ARG 3 title - METHOD method_17951 renderRecipeIcons (Lnet/minecraft/class_4587;III)V - ARG 1 matrices + METHOD method_17951 renderRecipeIcons (Lnet/minecraft/class_332;III)V ARG 2 x ARG 3 y ARG 4 scrollOffset - METHOD method_17952 renderRecipeBackground (Lnet/minecraft/class_4587;IIIII)V - ARG 1 matrices + METHOD method_17952 renderRecipeBackground (Lnet/minecraft/class_332;IIIII)V ARG 2 mouseX ARG 3 mouseY ARG 4 x diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping index 8d56297603..883ab873c7 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping @@ -62,8 +62,7 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi ARG 2 screen ARG 3 server METHOD method_20133 getServer ()Lnet/minecraft/class_642; - METHOD method_20134 draw (Lnet/minecraft/class_4587;IILnet/minecraft/class_2960;)V - ARG 1 matrices + METHOD method_20134 draw (Lnet/minecraft/class_332;IILnet/minecraft/class_2960;)V ARG 2 x ARG 3 y ARG 4 textureId diff --git a/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping index 3b129372f2..6874035799 100644 --- a/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping @@ -5,8 +5,7 @@ CLASS net/minecraft/class_4667 net/minecraft/client/gui/screen/option/GameOption ARG 1 parent ARG 2 gameOptions ARG 3 title - METHOD method_45626 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_353;IIF)V - ARG 1 matrices + METHOD method_45626 render (Lnet/minecraft/class_332;Lnet/minecraft/class_353;IIF)V ARG 2 optionButtons ARG 3 mouseX ARG 4 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/option/TelemetryEventWidget.mapping b/mappings/net/minecraft/client/gui/screen/option/TelemetryEventWidget.mapping index 3af406cb2f..7fb5eafaa9 100644 --- a/mappings/net/minecraft/client/gui/screen/option/TelemetryEventWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/TelemetryEventWidget.mapping @@ -25,7 +25,7 @@ CLASS net/minecraft/class_7941 net/minecraft/client/gui/screen/option/TelemetryE METHOD method_47639 collectContents (Z)Lnet/minecraft/class_7941$class_7942; ARG 1 optionalTelemetryEnabled METHOD method_47640 getGridWidth ()I - METHOD method_48285 (Lnet/minecraft/class_4587;IIFLnet/minecraft/class_339;)V + METHOD method_48285 (Lnet/minecraft/class_332;IIFLnet/minecraft/class_339;)V ARG 4 widget CLASS class_7942 Contents FIELD comp_1160 grid Lnet/minecraft/class_7845; diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping index fa652de975..6c90cd470a 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping @@ -13,6 +13,5 @@ CLASS net/minecraft/class_514 net/minecraft/client/gui/screen/recipebook/Animate ARG 2 results METHOD method_2642 hasResults ()Z METHOD method_2643 currentRecipe ()Lnet/minecraft/class_1860; - METHOD method_2644 getTooltip (Lnet/minecraft/class_437;)Ljava/util/List; - ARG 1 screen + METHOD method_2644 getTooltip ()Ljava/util/List; METHOD method_2645 getResultCollection ()Lnet/minecraft/class_516; diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping index 127e06b822..32d60acf54 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping @@ -5,9 +5,7 @@ CLASS net/minecraft/class_505 net/minecraft/client/gui/screen/recipebook/RecipeB METHOD method_2565 setRecipe (Lnet/minecraft/class_1860;)V ARG 1 recipe METHOD method_2566 getRecipe ()Lnet/minecraft/class_1860; - METHOD method_2567 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_310;IIZF)V - ARG 1 matrices - ARG 2 client + METHOD method_2567 draw (Lnet/minecraft/class_332;Lnet/minecraft/class_310;IIZF)V ARG 3 x ARG 4 y ARG 5 notInventory diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookResults.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookResults.mapping index fe840e8573..8cda4c2367 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookResults.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookResults.mapping @@ -17,8 +17,7 @@ CLASS net/minecraft/class_513 net/minecraft/client/gui/screen/recipebook/RecipeB METHOD method_2627 setResults (Ljava/util/List;Z)V ARG 1 resultCollections ARG 2 resetCurrentPage - METHOD method_2628 drawTooltip (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_2628 drawTooltip (Lnet/minecraft/class_332;II)V ARG 2 x ARG 3 y METHOD method_2629 onRecipesDisplayed (Ljava/util/List;)V @@ -35,8 +34,7 @@ CLASS net/minecraft/class_513 net/minecraft/client/gui/screen/recipebook/RecipeB ARG 8 areaWidth ARG 9 areaHeight METHOD method_2633 getRecipeBook ()Lnet/minecraft/class_3439; - METHOD method_2634 draw (Lnet/minecraft/class_4587;IIIIF)V - ARG 1 matrices + METHOD method_2634 draw (Lnet/minecraft/class_332;IIIIF)V ARG 2 x ARG 3 y ARG 4 mouseX diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping index 14624bf5a9..33b8e70341 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping @@ -29,8 +29,7 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB METHOD method_2579 reset ()V METHOD method_2580 (Lnet/minecraft/class_516;)Z ARG 0 resultCollection - METHOD method_2581 drawGhostSlots (Lnet/minecraft/class_4587;IIZF)V - ARG 1 matrices + METHOD method_2581 drawGhostSlots (Lnet/minecraft/class_332;IIZF)V ARG 2 x ARG 3 y ARG 4 notInventory @@ -75,10 +74,8 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB ARG 9 button METHOD method_2600 slotClicked (Lnet/minecraft/class_1735;)V ARG 1 slot - METHOD method_2601 drawTooltip (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices - METHOD method_2602 drawGhostSlotTooltip (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices + METHOD method_2601 drawTooltip (Lnet/minecraft/class_332;IIII)V + METHOD method_2602 drawGhostSlotTooltip (Lnet/minecraft/class_332;IIII)V ARG 2 x ARG 3 y ARG 4 mouseX diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeGroupButtonWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeGroupButtonWidget.mapping index 33a8874cd2..8be8dc9ab8 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeGroupButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeGroupButtonWidget.mapping @@ -3,9 +3,7 @@ CLASS net/minecraft/class_512 net/minecraft/client/gui/screen/recipebook/RecipeG FIELD field_3123 category Lnet/minecraft/class_314; METHOD (Lnet/minecraft/class_314;)V ARG 1 category - METHOD method_2621 renderIcons (Lnet/minecraft/class_4587;Lnet/minecraft/class_918;)V - ARG 1 matrices - ARG 2 itemRenderer + METHOD method_2621 renderIcons (Lnet/minecraft/class_332;Lnet/minecraft/class_918;)V METHOD method_2622 checkForNewRecipes (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_2623 getCategory ()Lnet/minecraft/class_314; diff --git a/mappings/net/minecraft/client/gui/screen/report/ChatSelectionScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/ChatSelectionScreen.mapping index 3b28ac75f9..8529e6f200 100644 --- a/mappings/net/minecraft/client/gui/screen/report/ChatSelectionScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/report/ChatSelectionScreen.mapping @@ -71,13 +71,11 @@ CLASS net/minecraft/class_7543 net/minecraft/client/gui/screen/report/ChatSelect METHOD method_44517 toggle ()Z METHOD method_44666 getTextWidth ()I METHOD method_44667 getIndent ()I - METHOD method_44695 drawCheckmark (Lnet/minecraft/class_4587;III)V - ARG 1 matrices + METHOD method_44695 drawCheckmark (Lnet/minecraft/class_332;III)V ARG 2 y ARG 3 x ARG 4 entryHeight - METHOD method_44729 renderIndicator (Lnet/minecraft/class_4587;IIIII)V - ARG 1 matrices + METHOD method_44729 renderIndicator (Lnet/minecraft/class_332;IIIII)V ARG 2 x ARG 3 y ARG 4 entryHeight @@ -92,9 +90,4 @@ CLASS net/minecraft/class_7543 net/minecraft/client/gui/screen/report/ChatSelect ARG 2 gameProfile ARG 3 headingText ARG 4 fromReportedPlayer - METHOD method_44519 drawSkin (Lnet/minecraft/class_4587;IILnet/minecraft/class_2960;)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 skinTextureId CLASS class_7550 SeparatorEntry diff --git a/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping index 15684d1439..e418aa6baf 100644 --- a/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping @@ -82,7 +82,6 @@ CLASS net/minecraft/class_5235 net/minecraft/client/gui/screen/world/EditGameRul METHOD (Lnet/minecraft/class_5235;Ljava/util/List;Lnet/minecraft/class_2561;)V ARG 2 description ARG 3 name - METHOD method_29989 drawName (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_29989 drawName (Lnet/minecraft/class_332;II)V ARG 2 x ARG 3 y diff --git a/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping b/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping index f909095d03..b882aa5796 100644 --- a/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping +++ b/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping @@ -7,22 +7,17 @@ CLASS net/minecraft/class_5682 net/minecraft/client/gui/tooltip/BundleTooltipCom FIELD field_32385 HEIGHT_PER_ROW I METHOD (Lnet/minecraft/class_5631;)V ARG 1 data - METHOD method_33286 drawOutline (IIIILnet/minecraft/class_4587;)V + METHOD method_33286 drawOutline (IIIILnet/minecraft/class_332;)V ARG 1 x ARG 2 y ARG 3 columns ARG 4 rows - ARG 5 matrices - METHOD method_33287 drawSlot (IIIZLnet/minecraft/class_327;Lnet/minecraft/class_4587;Lnet/minecraft/class_918;)V + METHOD method_33287 drawSlot (IIIZLnet/minecraft/class_332;Lnet/minecraft/class_327;)V ARG 1 x ARG 2 y ARG 3 index ARG 4 shouldBlock - ARG 5 textRenderer - ARG 6 matrices - ARG 7 itemRenderer - METHOD method_33288 draw (Lnet/minecraft/class_4587;IILnet/minecraft/class_5682$class_5771;)V - ARG 1 matrices + METHOD method_33288 draw (Lnet/minecraft/class_332;IILnet/minecraft/class_5682$class_5771;)V ARG 2 x ARG 3 y ARG 4 sprite diff --git a/mappings/net/minecraft/client/gui/tooltip/HoveredTooltipPositioner.mapping b/mappings/net/minecraft/client/gui/tooltip/HoveredTooltipPositioner.mapping index 72a21f153b..1c3486c88a 100644 --- a/mappings/net/minecraft/client/gui/tooltip/HoveredTooltipPositioner.mapping +++ b/mappings/net/minecraft/client/gui/tooltip/HoveredTooltipPositioner.mapping @@ -1,7 +1,3 @@ CLASS net/minecraft/class_8001 net/minecraft/client/gui/tooltip/HoveredTooltipPositioner FIELD field_41687 INSTANCE Lnet/minecraft/class_8000; - METHOD method_47945 preventOverflow (Lnet/minecraft/class_437;Lorg/joml/Vector2i;II)V - ARG 1 screen - ARG 2 pos - ARG 3 width - ARG 4 height + METHOD method_47945 preventOverflow (IILorg/joml/Vector2i;II)V diff --git a/mappings/net/minecraft/client/gui/tooltip/TooltipBackgroundRenderer.mapping b/mappings/net/minecraft/client/gui/tooltip/TooltipBackgroundRenderer.mapping index 2244d83d5a..972e6102ba 100644 --- a/mappings/net/minecraft/client/gui/tooltip/TooltipBackgroundRenderer.mapping +++ b/mappings/net/minecraft/client/gui/tooltip/TooltipBackgroundRenderer.mapping @@ -3,73 +3,14 @@ CLASS net/minecraft/class_8002 net/minecraft/client/gui/tooltip/TooltipBackgroun FIELD field_41694 BACKGROUND_COLOR I FIELD field_41695 START_Y_BORDER_COLOR I FIELD field_41696 END_Y_BORDER_COLOR I - METHOD method_47946 render (Lnet/minecraft/class_8002$class_8003;Lorg/joml/Matrix4f;Lnet/minecraft/class_287;IIIII)V + METHOD method_47946 render (Lnet/minecraft/class_332;IIIII)V + METHOD method_47947 renderVerticalLine (Lnet/minecraft/class_332;IIIIII)V ARG 0 renderer - ARG 1 matrix - ARG 2 buffer - ARG 3 x - ARG 4 y - ARG 5 width - ARG 6 height - ARG 7 z - METHOD method_47947 renderVerticalLine (Lnet/minecraft/class_8002$class_8003;Lorg/joml/Matrix4f;Lnet/minecraft/class_287;IIIIII)V + METHOD method_47948 renderBorder (Lnet/minecraft/class_332;IIIIIII)V ARG 0 renderer - ARG 1 matrix - ARG 2 buffer - ARG 3 x - ARG 4 y - ARG 5 height - ARG 6 z - ARG 7 startColor - ARG 8 endColor - METHOD method_47948 renderBorder (Lnet/minecraft/class_8002$class_8003;Lorg/joml/Matrix4f;Lnet/minecraft/class_287;IIIIIII)V + METHOD method_47949 renderVerticalLine (Lnet/minecraft/class_332;IIIII)V ARG 0 renderer - ARG 1 matrix - ARG 2 buffer - ARG 3 x - ARG 4 y - ARG 5 width - ARG 6 height - ARG 7 z - ARG 8 startYColor - ARG 9 endYColor - METHOD method_47949 renderVerticalLine (Lnet/minecraft/class_8002$class_8003;Lorg/joml/Matrix4f;Lnet/minecraft/class_287;IIIII)V + METHOD method_47950 renderRectangle (Lnet/minecraft/class_332;IIIIII)V ARG 0 renderer - ARG 1 matrix - ARG 2 buffer - ARG 3 x - ARG 4 y - ARG 5 height - ARG 6 z - ARG 7 color - METHOD method_47950 renderRectangle (Lnet/minecraft/class_8002$class_8003;Lorg/joml/Matrix4f;Lnet/minecraft/class_287;IIIIII)V + METHOD method_47951 renderHorizontalLine (Lnet/minecraft/class_332;IIIII)V ARG 0 renderer - ARG 1 matrix - ARG 2 buffer - ARG 3 x - ARG 4 y - ARG 5 width - ARG 6 height - ARG 7 z - ARG 8 color - METHOD method_47951 renderHorizontalLine (Lnet/minecraft/class_8002$class_8003;Lorg/joml/Matrix4f;Lnet/minecraft/class_287;IIIII)V - ARG 0 renderer - ARG 1 matrix - ARG 2 buffer - ARG 3 x - ARG 4 y - ARG 5 width - ARG 6 z - ARG 7 color - CLASS class_8003 RectangleRenderer - COMMENT A functional interface that builds a geometry for rectangles. - METHOD blit (Lorg/joml/Matrix4f;Lnet/minecraft/class_287;IIIIIII)V - ARG 1 matrix - ARG 2 buffer - ARG 3 startX - ARG 4 startY - ARG 5 endX - ARG 6 endY - ARG 7 z - ARG 8 startColor - ARG 9 endColor diff --git a/mappings/net/minecraft/client/gui/tooltip/TooltipComponent.mapping b/mappings/net/minecraft/client/gui/tooltip/TooltipComponent.mapping index 248ec1b0d4..84f352ef57 100644 --- a/mappings/net/minecraft/client/gui/tooltip/TooltipComponent.mapping +++ b/mappings/net/minecraft/client/gui/tooltip/TooltipComponent.mapping @@ -12,9 +12,7 @@ CLASS net/minecraft/class_5684 net/minecraft/client/gui/tooltip/TooltipComponent ARG 3 y ARG 4 matrix ARG 5 vertexConsumers - METHOD method_32666 drawItems (Lnet/minecraft/class_327;IILnet/minecraft/class_4587;Lnet/minecraft/class_918;)V + METHOD method_32666 drawItems (Lnet/minecraft/class_327;IILnet/minecraft/class_332;)V ARG 1 textRenderer ARG 2 x ARG 3 y - ARG 4 matrices - ARG 5 itemRenderer diff --git a/mappings/net/minecraft/client/gui/tooltip/TooltipPositioner.mapping b/mappings/net/minecraft/client/gui/tooltip/TooltipPositioner.mapping index 0c2aaf16aa..2756fd0f95 100644 --- a/mappings/net/minecraft/client/gui/tooltip/TooltipPositioner.mapping +++ b/mappings/net/minecraft/client/gui/tooltip/TooltipPositioner.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_8000 net/minecraft/client/gui/tooltip/TooltipPositioner - METHOD method_47944 getPosition (Lnet/minecraft/class_437;IIII)Lorg/joml/Vector2ic; - ARG 1 screen + METHOD method_47944 getPosition (IIIIII)Lorg/joml/Vector2ic; ARG 2 x ARG 3 y ARG 4 width diff --git a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping index b5ef9f6ec3..27adc4e150 100644 --- a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping @@ -70,13 +70,11 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget METHOD method_47402 setTooltipDelay (I)V ARG 1 delay METHOD method_47937 getTooltipPositioner ()Lnet/minecraft/class_8000; - METHOD method_48579 renderButton (Lnet/minecraft/class_4587;IIF)V - ARG 1 matrices + METHOD method_48579 renderButton (Lnet/minecraft/class_332;IIF)V ARG 2 mouseX ARG 3 mouseY ARG 4 delta - METHOD method_48588 drawTexture (Lnet/minecraft/class_4587;Lnet/minecraft/class_2960;IIIIIIIII)V - ARG 1 matrices + METHOD method_48588 drawTexture (Lnet/minecraft/class_332;Lnet/minecraft/class_2960;IIIIIIIII)V ARG 2 texture ARG 3 x ARG 4 y @@ -89,13 +87,11 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget ARG 11 textureHeight METHOD method_48591 setNavigationOrder (I)V ARG 1 navigationOrder - METHOD method_49604 drawScrollableText (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;II)V - ARG 1 matrices + METHOD method_49604 drawScrollableText (Lnet/minecraft/class_332;Lnet/minecraft/class_327;II)V ARG 2 textRenderer ARG 3 xMargin ARG 4 color - METHOD method_49605 drawScrollableText (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Lnet/minecraft/class_2561;IIIII)V - ARG 0 matrices + METHOD method_49605 drawScrollableText (Lnet/minecraft/class_332;Lnet/minecraft/class_327;Lnet/minecraft/class_2561;IIIII)V ARG 1 textRenderer ARG 2 text ARG 3 left diff --git a/mappings/net/minecraft/client/gui/widget/EditBoxWidget.mapping b/mappings/net/minecraft/client/gui/widget/EditBoxWidget.mapping index b274694ab1..56a1a04652 100644 --- a/mappings/net/minecraft/client/gui/widget/EditBoxWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EditBoxWidget.mapping @@ -37,8 +37,7 @@ CLASS net/minecraft/class_7529 net/minecraft/client/gui/widget/EditBoxWidget COMMENT @throws IllegalArgumentException if {@code maxLength} is negative COMMENT @see EditBox#setMaxLength ARG 1 maxLength - METHOD method_44403 drawSelection (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices + METHOD method_44403 drawSelection (Lnet/minecraft/class_332;IIII)V ARG 2 left ARG 3 top ARG 4 right diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping index 0af133520d..8b1bbb27c1 100644 --- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping @@ -35,13 +35,11 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget METHOD method_25310 clickedHeader (II)V ARG 1 x ARG 2 y - METHOD method_25311 renderList (Lnet/minecraft/class_4587;IIF)V - ARG 1 matrices + METHOD method_25311 renderList (Lnet/minecraft/class_332;IIF)V ARG 2 mouseX ARG 3 mouseY ARG 4 delta - METHOD method_25312 renderHeader (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_25312 renderHeader (Lnet/minecraft/class_332;II)V ARG 2 x ARG 3 y METHOD method_25313 setSelected (Lnet/minecraft/class_350$class_351;)V @@ -58,8 +56,7 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 5 button METHOD method_25319 getRowBottom (I)I ARG 1 index - METHOD method_25320 renderDecorations (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_25320 renderDecorations (Lnet/minecraft/class_332;II)V ARG 2 mouseX ARG 3 mouseY METHOD method_25321 addEntry (Lnet/minecraft/class_350$class_351;)I @@ -72,8 +69,7 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 4 bottom METHOD method_25324 centerScrollOn (Lnet/minecraft/class_350$class_351;)V ARG 1 entry - METHOD method_25325 renderBackground (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_25325 renderBackground (Lnet/minecraft/class_332;)V METHOD method_25326 getEntry (I)Lnet/minecraft/class_350$class_351; ARG 1 index METHOD method_25328 ensureVisible (Lnet/minecraft/class_350$class_351;)V @@ -109,8 +105,7 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 1 builder ARG 2 entry METHOD method_37019 getHoveredEntry ()Lnet/minecraft/class_350$class_351; - METHOD method_44397 renderEntry (Lnet/minecraft/class_4587;IIFIIIII)V - ARG 1 matrices + METHOD method_44397 renderEntry (Lnet/minecraft/class_332;IIFIIIII)V ARG 2 mouseX ARG 3 mouseY ARG 4 delta @@ -119,8 +114,7 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 7 y ARG 8 entryWidth ARG 9 entryHeight - METHOD method_44398 drawSelectionHighlight (Lnet/minecraft/class_4587;IIIII)V - ARG 1 matrices + METHOD method_44398 drawSelectionHighlight (Lnet/minecraft/class_332;IIIII)V ARG 2 y ARG 3 entryWidth ARG 4 entryHeight @@ -142,13 +136,11 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget METHOD method_48200 getFirst ()Lnet/minecraft/class_350$class_351; METHOD method_48201 (Lnet/minecraft/class_350$class_351;)Z ARG 0 entry - METHOD method_49603 enableScissor ()V + METHOD method_49603 enableScissor (Lnet/minecraft/class_332;)V CLASS class_351 Entry FIELD field_22752 parentList Lnet/minecraft/class_350; - METHOD method_25343 render (Lnet/minecraft/class_4587;IIIIIIIZF)V + METHOD method_25343 render (Lnet/minecraft/class_332;IIIIIIIZF)V COMMENT Renders an entry in a list. - ARG 1 matrices - COMMENT the matrix stack used for rendering ARG 2 index COMMENT the index of the entry ARG 3 y @@ -166,8 +158,7 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 9 hovered COMMENT whether the mouse is hovering over the entry ARG 10 tickDelta - METHOD method_49568 drawBorder (Lnet/minecraft/class_4587;IIIIIIIZF)V - ARG 1 matrices + METHOD method_49568 drawBorder (Lnet/minecraft/class_332;IIIIIIIZF)V ARG 2 index ARG 3 y ARG 4 x diff --git a/mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping b/mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping index 5a6ef97e15..ab69ee0557 100644 --- a/mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/class_353 net/minecraft/client/gui/widget/OptionListWidget FIELD field_27983 optionsToWidgets Ljava/util/Map; METHOD (Ljava/util/Map;)V ARG 1 optionsToWidgets - METHOD method_18622 (ILnet/minecraft/class_4587;IIFLnet/minecraft/class_339;)V + METHOD method_18622 (ILnet/minecraft/class_332;IIFLnet/minecraft/class_339;)V ARG 5 widget METHOD method_20409 create (Lnet/minecraft/class_315;ILnet/minecraft/class_7172;)Lnet/minecraft/class_353$class_354; ARG 0 options diff --git a/mappings/net/minecraft/client/gui/widget/PressableWidget.mapping b/mappings/net/minecraft/client/gui/widget/PressableWidget.mapping index 98c18dfc7b..223d889ce0 100644 --- a/mappings/net/minecraft/client/gui/widget/PressableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/PressableWidget.mapping @@ -2,8 +2,7 @@ CLASS net/minecraft/class_4264 net/minecraft/client/gui/widget/PressableWidget COMMENT A pressable widget has a press action. It is pressed when it is clicked. It is COMMENT also pressed when enter or space keys are pressed when it is selected. METHOD method_25306 onPress ()V - METHOD method_48589 drawMessage (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;I)V - ARG 1 matrices + METHOD method_48589 drawMessage (Lnet/minecraft/class_332;Lnet/minecraft/class_327;I)V ARG 2 textRenderer ARG 3 color METHOD method_49602 getTextureY ()I diff --git a/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping index e985113de0..f20dfc37bb 100644 --- a/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping @@ -12,26 +12,23 @@ CLASS net/minecraft/class_7528 net/minecraft/client/gui/widget/ScrollableWidget METHOD method_44383 isVisible (II)Z ARG 1 top ARG 2 bottom - METHOD method_44384 renderOverlay (Lnet/minecraft/class_4587;)V + METHOD method_44384 renderOverlay (Lnet/minecraft/class_332;)V COMMENT Renders overlays that are not scrolled but part of the widget. COMMENT COMMENT

This renders the scrollbar by default. Subclasses can override this to COMMENT render other overlays, but {@code super} call is necessary to make sure the scrollbar COMMENT renders when it should. - ARG 1 matrices METHOD method_44385 getPaddingDoubled ()I - METHOD method_44386 drawBox (Lnet/minecraft/class_4587;)V + METHOD method_44386 drawBox (Lnet/minecraft/class_332;)V COMMENT Draws the box that the contents are rendered over, including its borders. - ARG 1 matrices METHOD method_44387 getScrollY ()D METHOD method_44388 isWithinBounds (DD)Z ARG 1 mouseX ARG 3 mouseY - METHOD method_44389 renderContents (Lnet/minecraft/class_4587;IIF)V + METHOD method_44389 renderContents (Lnet/minecraft/class_332;IIF)V COMMENT Renders the scrolled contents. Subclasses must override this. The rendered contents COMMENT may overflow; the caller should trim those using {@link COMMENT net.minecraft.client.gui.DrawableHelper#enableScissor}. - ARG 1 matrices ARG 2 mouseX ARG 3 mouseY ARG 4 delta @@ -43,5 +40,4 @@ CLASS net/minecraft/class_7528 net/minecraft/client/gui/widget/ScrollableWidget METHOD method_44393 getDeltaYPerScroll ()D METHOD method_44394 getScrollbarThumbHeight ()I METHOD method_44395 getContentsHeightWithPadding ()I - METHOD method_44396 drawScrollbar (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_44396 drawScrollbar (Lnet/minecraft/class_332;)V diff --git a/mappings/net/minecraft/client/gui/widget/TabButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/TabButtonWidget.mapping index 3a3d24084f..28b166825b 100644 --- a/mappings/net/minecraft/client/gui/widget/TabButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TabButtonWidget.mapping @@ -8,13 +8,11 @@ CLASS net/minecraft/class_8209 net/minecraft/client/gui/widget/TabButtonWidget ARG 3 width ARG 4 height METHOD method_49607 getTextureV ()I - METHOD method_49608 drawMessage (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;I)V - ARG 1 matrices + METHOD method_49608 drawMessage (Lnet/minecraft/class_332;Lnet/minecraft/class_327;I)V ARG 2 textRenderer ARG 3 color METHOD method_49609 getTab ()Lnet/minecraft/class_8087; - METHOD method_49610 drawCurrentTabLine (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;I)V - ARG 1 matrices + METHOD method_49610 drawCurrentTabLine (Lnet/minecraft/class_332;Lnet/minecraft/class_327;I)V ARG 2 textRenderer ARG 3 color METHOD method_49611 isCurrentTab ()Z diff --git a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping index 94d85f5cc5..0223ed1f26 100644 --- a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping @@ -96,8 +96,7 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget METHOD method_1884 setSelectionEnd (I)V ARG 1 index METHOD method_1885 isVisible ()Z - METHOD method_1886 drawSelectionHighlight (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices + METHOD method_1886 drawSelectionHighlight (Lnet/minecraft/class_332;IIII)V ARG 2 x1 ARG 3 y1 ARG 4 x2 diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index 853d388c19..b5c311fbf3 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -208,7 +208,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions FIELD field_39321 onlyShowSecureChat Lnet/minecraft/class_7172; FIELD field_40382 panoramaSpeed Lnet/minecraft/class_7172; FIELD field_41094 operatorItemsTab Lnet/minecraft/class_7172; - FIELD field_41335 TELEMETRY_TOOLTIP Lnet/minecraft/class_5250; + FIELD field_41335 TELEMETRY_TOOLTIP Lnet/minecraft/class_2561; FIELD field_41336 telemetryOptInExtra Lnet/minecraft/class_7172; FIELD field_41783 NOTIFICATION_DISPLAY_TIME_TOOLTIP Lnet/minecraft/class_2561; FIELD field_41784 notificationDisplayTime Lnet/minecraft/class_7172; diff --git a/mappings/net/minecraft/client/realms/gui/RealmsWorldSlotButton.mapping b/mappings/net/minecraft/client/realms/gui/RealmsWorldSlotButton.mapping index 3a86d6c708..83d9d794b1 100644 --- a/mappings/net/minecraft/client/realms/gui/RealmsWorldSlotButton.mapping +++ b/mappings/net/minecraft/client/realms/gui/RealmsWorldSlotButton.mapping @@ -21,8 +21,7 @@ CLASS net/minecraft/class_4367 net/minecraft/client/realms/gui/RealmsWorldSlotBu ARG 6 tooltipSetter ARG 7 id ARG 8 action - METHOD method_21107 drawSlotFrame (Lnet/minecraft/class_4587;IIIIZLjava/lang/String;IJLjava/lang/String;ZZLnet/minecraft/class_4367$class_4368;Lnet/minecraft/class_2561;)V - ARG 1 matrices + METHOD method_21107 drawSlotFrame (Lnet/minecraft/class_332;IIIIZLjava/lang/String;IJLjava/lang/String;ZZLnet/minecraft/class_4367$class_4368;Lnet/minecraft/class_2561;)V ARG 2 x ARG 3 y ARG 4 mouseX @@ -48,8 +47,7 @@ CLASS net/minecraft/class_4367 net/minecraft/client/realms/gui/RealmsWorldSlotBu ARG 1 active ARG 2 minigame METHOD method_37007 tick ()V - METHOD method_43586 drawCheckmark (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_43586 drawCheckmark (Lnet/minecraft/class_332;II)V ARG 2 x ARG 3 y CLASS class_4368 Action diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsAcceptRejectButton.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsAcceptRejectButton.mapping index cdf0347f8b..7498c3e36d 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsAcceptRejectButton.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsAcceptRejectButton.mapping @@ -11,19 +11,16 @@ CLASS net/minecraft/class_4371 net/minecraft/client/realms/gui/screen/RealmsAcce METHOD method_21109 getRight ()I METHOD method_21110 handleClick (I)V ARG 1 index - METHOD method_21111 render (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices + METHOD method_21111 render (Lnet/minecraft/class_332;IIII)V ARG 2 x ARG 3 y ARG 4 mouseX ARG 5 mouseY - METHOD method_21112 render (Lnet/minecraft/class_4587;IIZ)V - ARG 1 matrices + METHOD method_21112 render (Lnet/minecraft/class_332;IIZ)V ARG 2 x ARG 3 y ARG 4 showTooltip - METHOD method_21113 render (Lnet/minecraft/class_4587;Ljava/util/List;Lnet/minecraft/class_4904;IIII)V - ARG 0 matrices + METHOD method_21113 render (Lnet/minecraft/class_332;Ljava/util/List;Lnet/minecraft/class_4904;IIII)V ARG 1 buttons ARG 2 selectionList ARG 3 x diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping index b48126ddae..3ca3b42842 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping @@ -55,7 +55,7 @@ CLASS net/minecraft/class_4381 net/minecraft/client/realms/gui/screen/RealmsBack ARG 2 backup METHOD method_21176 getMediumDatePresentation (Ljava/util/Date;)Ljava/lang/String; ARG 1 lastModifiedDate - METHOD method_51238 (ILnet/minecraft/class_4587;IIFLnet/minecraft/class_339;)V + METHOD method_51238 (ILnet/minecraft/class_332;IIFLnet/minecraft/class_339;)V ARG 5 button METHOD method_51239 updateChangeList (Lnet/minecraft/class_4867;)V ARG 1 backup diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsBrokenWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsBrokenWorldScreen.mapping index 418d8f09f7..66cf520205 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsBrokenWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsBrokenWorldScreen.mapping @@ -17,8 +17,7 @@ CLASS net/minecraft/class_4384 net/minecraft/client/realms/gui/screen/RealmsBrok METHOD method_21178 addButtons ()V METHOD method_21179 getFramePositionX (I)I ARG 1 i - METHOD method_21180 drawSlotFrame (Lnet/minecraft/class_4587;IIIIZLjava/lang/String;IJLjava/lang/String;Z)V - ARG 1 matrices + METHOD method_21180 drawSlotFrame (Lnet/minecraft/class_332;IIIIZLjava/lang/String;IJLjava/lang/String;Z)V ARG 2 x ARG 3 y ARG 4 mouseX diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping index f7a4ad7721..4beef64508 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping @@ -38,14 +38,12 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf METHOD method_21200 buttonCenter (II)I ARG 1 i ARG 2 total - METHOD method_21201 drawServerStatus (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices + METHOD method_21201 drawServerStatus (Lnet/minecraft/class_332;IIII)V ARG 2 x ARG 3 y ARG 4 mouseX ARG 5 mouseY - METHOD method_21202 drawExpiring (Lnet/minecraft/class_4587;IIIII)V - ARG 1 matrices + METHOD method_21202 drawExpiring (Lnet/minecraft/class_332;IIIII)V ARG 2 x ARG 3 y ARG 4 mouseX @@ -60,8 +58,7 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf ARG 1 serverData METHOD method_21208 saveSlotSettings (Lnet/minecraft/class_4883;)V ARG 1 options - METHOD method_21214 renderMousehoverTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V - ARG 1 matrices + METHOD method_21214 renderMousehoverTooltip (Lnet/minecraft/class_332;Lnet/minecraft/class_2561;II)V ARG 2 text ARG 3 mouseX ARG 4 mouseY @@ -76,8 +73,7 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf METHOD method_21219 getNewScreen ()Lnet/minecraft/class_4388; METHOD method_21220 buttonLeft (I)I ARG 1 i - METHOD method_21221 drawExpired (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices + METHOD method_21221 drawExpired (Lnet/minecraft/class_332;IIII)V ARG 2 x ARG 3 y ARG 4 mouseX @@ -89,8 +85,7 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf ARG 1 button METHOD method_21228 frame (I)I ARG 1 ordinal - METHOD method_21229 drawOpen (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices + METHOD method_21229 drawOpen (Lnet/minecraft/class_332;IIII)V ARG 2 x ARG 3 y ARG 4 mouseX @@ -115,8 +110,7 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf ARG 1 button METHOD method_25142 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_25143 drawClosed (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices + METHOD method_25143 drawClosed (Lnet/minecraft/class_332;IIII)V ARG 2 x ARG 3 y ARG 4 mouseX diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsDownloadLatestWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsDownloadLatestWorldScreen.mapping index d0745ccd46..26e843bdf7 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsDownloadLatestWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsDownloadLatestWorldScreen.mapping @@ -31,16 +31,12 @@ CLASS net/minecraft/class_4392 net/minecraft/client/realms/gui/screen/RealmsDown METHOD method_21259 getContentLength (Ljava/lang/String;)J ARG 1 downloadLink METHOD method_21265 checkDownloadSize ()V - METHOD method_21266 drawDownloadSpeed0 (Lnet/minecraft/class_4587;J)V - ARG 1 matrices + METHOD method_21266 drawDownloadSpeed0 (Lnet/minecraft/class_332;J)V ARG 2 bytesPerSecond METHOD method_21269 backButtonClicked ()V - METHOD method_21272 drawDots (Lnet/minecraft/class_4587;)V - ARG 1 matrices - METHOD method_21274 drawProgressBar (Lnet/minecraft/class_4587;)V - ARG 1 matrices - METHOD method_21276 drawDownloadSpeed (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_21272 drawDots (Lnet/minecraft/class_332;)V + METHOD method_21274 drawProgressBar (Lnet/minecraft/class_332;)V + METHOD method_21276 drawDownloadSpeed (Lnet/minecraft/class_332;)V METHOD method_21278 downloadSave ()V METHOD method_21279 downloadCancelled ()V METHOD method_25158 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index cb83b9194f..304b2ec3e8 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -83,24 +83,20 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain METHOD method_20834 onClosePopup ()V METHOD method_20835 popupX0 ()I METHOD method_20836 popupY0 ()I - METHOD method_20837 renderLocal (Lnet/minecraft/class_4587;)V - ARG 1 matrices - METHOD method_20838 renderStage (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_20837 renderLocal (Lnet/minecraft/class_332;)V + METHOD method_20838 renderStage (Lnet/minecraft/class_332;)V METHOD method_20842 shouldShowMessageInList ()Z METHOD method_20843 (CLnet/minecraft/class_4324;)V ARG 1 keyCombo METHOD method_20844 isOutsidePopup (DD)Z ARG 1 xm ARG 3 ym - METHOD method_20846 drawExpired (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices + METHOD method_20846 drawExpired (Lnet/minecraft/class_332;IIII)V ARG 2 x ARG 3 y ARG 4 mouseX ARG 5 mouseY - METHOD method_20850 renderNews (Lnet/minecraft/class_4587;IIZIIZZ)V - ARG 1 matrices + METHOD method_20850 renderNews (Lnet/minecraft/class_332;IIZIIZZ)V ARG 2 mouseX ARG 3 mouseY ARG 4 hasUnread @@ -114,18 +110,15 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain ARG 1 serverData ARG 2 parent METHOD method_20870 shouldShowPopup ()Z - METHOD method_20872 drawPopup (Lnet/minecraft/class_4587;)V - ARG 1 matrices - METHOD method_20873 drawOpen (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices + METHOD method_20872 drawPopup (Lnet/minecraft/class_332;)V + METHOD method_20873 drawOpen (Lnet/minecraft/class_332;IIII)V ARG 2 x ARG 3 y ARG 4 mouseX ARG 5 mouseY METHOD method_20874 shouldPlayButtonBeActive (Lnet/minecraft/class_4877;)Z ARG 1 server - METHOD method_20883 drawClose (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices + METHOD method_20883 drawClose (Lnet/minecraft/class_332;IIII)V ARG 2 x ARG 3 y ARG 4 mouseX @@ -157,8 +150,7 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain ARG 0 manager METHOD method_23766 (Lnet/minecraft/class_2960;)Z ARG 0 filename - METHOD method_24987 drawExpiring (Lnet/minecraft/class_4587;IIIII)V - ARG 1 matrices + METHOD method_24987 drawExpiring (Lnet/minecraft/class_332;IIIII)V ARG 2 x ARG 3 y ARG 4 mouseX @@ -251,8 +243,7 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain FIELD field_44517 NO_PENDING_TEXT Lnet/minecraft/class_7919; FIELD field_44518 PENDING_TEXT Lnet/minecraft/class_7919; METHOD method_37005 updatePendingText ()V - METHOD method_51235 render (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_51235 render (Lnet/minecraft/class_332;)V METHOD method_51236 (Lnet/minecraft/class_4325;Lnet/minecraft/class_4185;)V ARG 1 button CLASS class_4329 RealmSelectionList @@ -260,23 +251,20 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain FIELD field_19518 server Lnet/minecraft/class_4877; METHOD (Lnet/minecraft/class_4325;Lnet/minecraft/class_4877;)V ARG 2 server - METHOD method_20945 render (Lnet/minecraft/class_4877;Lnet/minecraft/class_4587;IIII)V + METHOD method_20945 render (Lnet/minecraft/class_4877;Lnet/minecraft/class_332;IIII)V ARG 1 server - ARG 2 matrices ARG 3 x ARG 4 y ARG 5 mouseX ARG 6 mouseY - METHOD method_20946 renderRealmsServerItem (Lnet/minecraft/class_4877;Lnet/minecraft/class_4587;IIII)V + METHOD method_20946 renderRealmsServerItem (Lnet/minecraft/class_4877;Lnet/minecraft/class_332;IIII)V ARG 1 server - ARG 2 matrices ARG 3 x ARG 4 y ARG 5 mouseX ARG 6 mouseY - METHOD method_49291 drawServerState (Lnet/minecraft/class_4877;Lnet/minecraft/class_4587;IIIIII)V + METHOD method_49291 drawServerState (Lnet/minecraft/class_4877;Lnet/minecraft/class_332;IIIIII)V ARG 1 server - ARG 2 matrices ARG 3 x ARG 4 y ARG 5 mouseX @@ -284,8 +272,7 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain ARG 7 xOffset ARG 8 yOffset CLASS class_4331 RealmSelectionListTrialEntry - METHOD method_20947 renderTrialItem (Lnet/minecraft/class_4587;IIIII)V - ARG 1 matrices + METHOD method_20947 renderTrialItem (Lnet/minecraft/class_332;IIIII)V ARG 2 index ARG 3 x ARG 4 y @@ -320,7 +307,7 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain ARG 3 notification METHOD method_49564 setWidth (I)V ARG 1 width - METHOD method_49565 (Lnet/minecraft/class_4587;IIFLnet/minecraft/class_339;)V + METHOD method_49565 (Lnet/minecraft/class_332;IIFLnet/minecraft/class_339;)V ARG 4 child METHOD method_49566 (Lnet/minecraft/class_8204;Lnet/minecraft/class_4185;)V ARG 2 button diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsNotificationsScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsNotificationsScreen.mapping index 474464382d..f1581900dd 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsNotificationsScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsNotificationsScreen.mapping @@ -14,8 +14,7 @@ CLASS net/minecraft/class_4399 net/minecraft/client/realms/gui/screen/RealmsNoti FIELD field_43039 newsAndNotifications Lnet/minecraft/class_4399$class_8207; FIELD field_43040 notificationsOnly Lnet/minecraft/class_4399$class_8207; METHOD method_21294 checkIfMcoEnabled ()V - METHOD method_21295 drawIcons (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_21295 drawIcons (Lnet/minecraft/class_332;II)V ARG 2 mouseX ARG 3 mouseY METHOD method_25169 shouldShowRealmsNews ()Z diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping index 26f729eb6b..5674267cf9 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping @@ -17,8 +17,7 @@ CLASS net/minecraft/class_4401 net/minecraft/client/realms/gui/screen/RealmsPend ARG 2 title METHOD method_21300 updateList (I)V ARG 1 slot - METHOD method_21306 renderMousehoverTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V - ARG 1 matrices + METHOD method_21306 renderMousehoverTooltip (Lnet/minecraft/class_332;Lnet/minecraft/class_2561;II)V ARG 2 tooltip ARG 3 mouseX ARG 4 mouseY @@ -48,8 +47,7 @@ CLASS net/minecraft/class_4401 net/minecraft/client/realms/gui/screen/RealmsPend FIELD field_19955 buttons Ljava/util/List; METHOD (Lnet/minecraft/class_4401;Lnet/minecraft/class_4871;)V ARG 2 pendingInvite - METHOD method_21324 renderPendingInvitationItem (Lnet/minecraft/class_4587;Lnet/minecraft/class_4871;IIII)V - ARG 1 matrices + METHOD method_21324 renderPendingInvitationItem (Lnet/minecraft/class_332;Lnet/minecraft/class_4871;IIII)V ARG 2 invite ARG 3 x ARG 4 y diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping index 41725961e6..675fdaf253 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping @@ -56,7 +56,7 @@ CLASS net/minecraft/class_4406 net/minecraft/client/realms/gui/screen/RealmsPlay FIELD field_44538 deopButton Lnet/minecraft/class_344; METHOD (Lnet/minecraft/class_4406;Lnet/minecraft/class_4874;)V ARG 2 playerInfo - METHOD method_51245 (ILnet/minecraft/class_4587;IIFLnet/minecraft/class_339;)V + METHOD method_51245 (ILnet/minecraft/class_332;IIFLnet/minecraft/class_339;)V ARG 5 button METHOD method_51246 (ILnet/minecraft/class_4185;)V ARG 2 button diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsResetWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsResetWorldScreen.mapping index 58a1f499a2..29808ae473 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsResetWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsResetWorldScreen.mapping @@ -40,8 +40,7 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsRese ARG 6 buttonTitle ARG 7 resetCallback ARG 8 selectFileUploadCallback - METHOD method_21370 drawFrame (Lnet/minecraft/class_4587;IILnet/minecraft/class_2561;Lnet/minecraft/class_2960;ZZ)V - ARG 1 matrices + METHOD method_21370 drawFrame (Lnet/minecraft/class_332;IILnet/minecraft/class_2561;Lnet/minecraft/class_2960;ZZ)V ARG 2 x ARG 3 y ARG 4 text diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping index b340afe723..0cbb4c7b50 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping @@ -38,8 +38,7 @@ CLASS net/minecraft/class_4416 net/minecraft/client/realms/gui/screen/RealmsSele FIELD field_26511 details Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_4416;Lnet/minecraft/class_34;)V ARG 2 summary - METHOD method_21411 renderItem (Lnet/minecraft/class_4587;III)V - ARG 1 matrices + METHOD method_21411 renderItem (Lnet/minecraft/class_332;III)V ARG 2 index ARG 3 x ARG 4 y diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping index 8a5757d175..f2ef6d94c7 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping @@ -29,8 +29,7 @@ CLASS net/minecraft/class_4419 net/minecraft/client/realms/gui/screen/RealmsSele ARG 2 callback ARG 3 worldType ARG 4 templateList - METHOD method_21414 renderMessages (Lnet/minecraft/class_4587;IILjava/util/List;)V - ARG 1 matrices + METHOD method_21414 renderMessages (Lnet/minecraft/class_332;IILjava/util/List;)V ARG 2 x ARG 3 y ARG 4 messages @@ -39,8 +38,7 @@ CLASS net/minecraft/class_4419 net/minecraft/client/realms/gui/screen/RealmsSele METHOD method_21416 fetchWorldTemplates (Lnet/minecraft/class_4891;Lnet/minecraft/class_4341;)Lcom/mojang/datafixers/util/Either; ARG 1 templateList ARG 2 realms - METHOD method_21424 renderMousehoverTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V - ARG 1 matrices + METHOD method_21424 renderMousehoverTooltip (Lnet/minecraft/class_332;Lnet/minecraft/class_2561;II)V ARG 2 tooltip ARG 3 mouseX ARG 4 mouseY @@ -82,15 +80,13 @@ CLASS net/minecraft/class_4419 net/minecraft/client/realms/gui/screen/RealmsSele FIELD field_20094 mTemplate Lnet/minecraft/class_4890; METHOD (Lnet/minecraft/class_4419;Lnet/minecraft/class_4890;)V ARG 2 template - METHOD method_21451 drawImage (Lnet/minecraft/class_4587;IIIILnet/minecraft/class_4890;)V - ARG 1 matrices + METHOD method_21451 drawImage (Lnet/minecraft/class_332;IIIILnet/minecraft/class_4890;)V ARG 2 x ARG 3 y ARG 4 mouseX ARG 5 mouseY ARG 6 template - METHOD method_21452 drawIcons (Lnet/minecraft/class_4587;IIIILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V - ARG 1 matrices + METHOD method_21452 drawIcons (Lnet/minecraft/class_332;IIIILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V ARG 2 x ARG 3 y ARG 4 mouseX @@ -98,8 +94,7 @@ CLASS net/minecraft/class_4419 net/minecraft/client/realms/gui/screen/RealmsSele ARG 6 link ARG 7 trailer ARG 8 recommendedPlayers - METHOD method_21453 renderWorldTemplateItem (Lnet/minecraft/class_4587;Lnet/minecraft/class_4890;IIII)V - ARG 1 matrices + METHOD method_21453 renderWorldTemplateItem (Lnet/minecraft/class_332;Lnet/minecraft/class_4890;IIII)V ARG 2 template ARG 3 x ARG 4 y diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsUploadScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsUploadScreen.mapping index 2c3de33686..4a60c56211 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsUploadScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsUploadScreen.mapping @@ -39,16 +39,12 @@ CLASS net/minecraft/class_4427 net/minecraft/client/realms/gui/screen/RealmsUplo METHOD method_21524 tarGzipArchive (Ljava/io/File;)Ljava/io/File; ARG 1 pathToDirectoryFile METHOD method_21525 onBack ()V - METHOD method_21526 drawUploadSpeed0 (Lnet/minecraft/class_4587;J)V - ARG 1 matrices + METHOD method_21526 drawUploadSpeed0 (Lnet/minecraft/class_332;J)V ARG 2 bytesPerSecond METHOD method_21528 onCancel ()V - METHOD method_21530 drawDots (Lnet/minecraft/class_4587;)V - ARG 1 matrices - METHOD method_21532 drawProgressBar (Lnet/minecraft/class_4587;)V - ARG 1 matrices - METHOD method_21534 drawUploadSpeed (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_21530 drawDots (Lnet/minecraft/class_332;)V + METHOD method_21532 drawProgressBar (Lnet/minecraft/class_332;)V + METHOD method_21534 drawUploadSpeed (Lnet/minecraft/class_332;)V METHOD method_21536 upload ()V METHOD method_21538 uploadCancelled ()V METHOD method_22105 (JLnet/minecraft/class_4429;)V diff --git a/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping b/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping index f881b0a18f..332f1797f7 100644 --- a/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping +++ b/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping @@ -10,8 +10,7 @@ CLASS net/minecraft/class_4448 net/minecraft/client/realms/util/RealmsUtil ARG 0 uuid METHOD method_25282 convertToAgePresentation (Ljava/util/Date;)Ljava/lang/String; ARG 0 date - METHOD method_48972 drawPlayerHead (Lnet/minecraft/class_4587;IIILjava/lang/String;)V - ARG 0 matrices + METHOD method_48972 drawPlayerHead (Lnet/minecraft/class_332;IIILjava/lang/String;)V ARG 1 x ARG 2 y ARG 3 size diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index 612988c17b..d02aadf2e9 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -112,8 +112,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 1 fov METHOD method_22974 getLightmapTextureManager ()Lnet/minecraft/class_765; METHOD method_22975 getOverlayTexture ()Lnet/minecraft/class_4608; - METHOD method_31136 renderNausea (F)V - ARG 1 distortionStrength + METHOD method_31136 renderNausea (Lnet/minecraft/class_332;F)V METHOD method_3167 onCameraEntitySet (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_3168 loadPostProcessor (Lnet/minecraft/class_2960;)V diff --git a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping index a3d6f15630..9291b2b1fe 100644 --- a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping @@ -67,27 +67,11 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer ARG 4 overlay ARG 5 matrices ARG 6 vertices - METHOD method_27951 renderInGuiWithOverrides (Lnet/minecraft/class_4587;Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;III)V - COMMENT Renders an item in a GUI with an attached entity. - COMMENT - COMMENT

The entity is used to calculate model overrides for the item. - ARG 1 matrices - ARG 2 entity - ARG 3 stack - ARG 4 x - ARG 5 y - ARG 6 seed METHOD method_27952 getArmorGlintConsumer (Lnet/minecraft/class_4597;Lnet/minecraft/class_1921;ZZ)Lnet/minecraft/class_4588; ARG 0 provider ARG 1 layer ARG 2 solid ARG 3 glint - METHOD method_27953 renderInGui (Lnet/minecraft/class_4587;Lnet/minecraft/class_1799;II)V - COMMENT Renders an item in a GUI without an attached entity. - ARG 1 matrices - ARG 2 stack - ARG 3 x - ARG 4 y METHOD method_29711 getDirectItemGlintConsumer (Lnet/minecraft/class_4597;Lnet/minecraft/class_1921;ZZ)Lnet/minecraft/class_4588; ARG 0 provider ARG 1 layer @@ -101,72 +85,9 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer ARG 0 provider ARG 1 layer ARG 2 entry - METHOD method_32797 renderInGuiWithOverrides (Lnet/minecraft/class_4587;Lnet/minecraft/class_1799;III)V - ARG 1 matrices - ARG 2 stack - ARG 3 x - ARG 4 y - ARG 5 seed - METHOD method_36542 renderInGuiWithOverrides (Lnet/minecraft/class_4587;Lnet/minecraft/class_1799;IIII)V - ARG 1 matrices - ARG 2 stack - ARG 3 x - ARG 4 y - ARG 5 seed - ARG 6 depth - METHOD method_36543 innerRenderInGui (Lnet/minecraft/class_4587;Lnet/minecraft/class_1309;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;III)V - ARG 1 matrices - ARG 2 entity - ARG 3 world - ARG 4 stack - ARG 5 x - ARG 6 y - ARG 7 seed - METHOD method_4010 renderGuiItemIcon (Lnet/minecraft/class_4587;Lnet/minecraft/class_1799;II)V - ARG 1 matrices - ARG 2 stack - ARG 3 x - ARG 4 y METHOD method_4012 getModels ()Lnet/minecraft/class_763; METHOD method_4019 getModel (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;I)Lnet/minecraft/class_1087; ARG 1 stack ARG 2 world ARG 3 entity ARG 4 seed - METHOD method_4021 renderGuiItemModel (Lnet/minecraft/class_4587;Lnet/minecraft/class_1799;IILnet/minecraft/class_1087;)V - ARG 1 matrices - ARG 2 stack - ARG 3 x - ARG 4 y - ARG 5 model - METHOD method_4022 renderGuiItemOverlay (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Lnet/minecraft/class_1799;IILjava/lang/String;)V - COMMENT Renders the overlay for items in GUIs, including the damage bar and the item count. - ARG 1 matrices - ARG 2 textRenderer - ARG 3 stack - ARG 4 x - ARG 5 y - ARG 6 countLabel - METHOD method_4023 renderInGuiWithOverrides (Lnet/minecraft/class_4587;Lnet/minecraft/class_1799;II)V - COMMENT Renders an item in a GUI with the player as the attached entity - COMMENT for calculating model overrides. - ARG 1 matrices - ARG 2 stack - ARG 3 x - ARG 4 y - METHOD method_4025 renderGuiItemOverlay (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Lnet/minecraft/class_1799;II)V - COMMENT Renders the overlay for items in GUIs, including the damage bar and the item count. - ARG 1 matrices - ARG 2 textRenderer - ARG 3 stack - ARG 4 x - ARG 5 y - METHOD method_4026 innerRenderInGui (Lnet/minecraft/class_4587;Lnet/minecraft/class_1309;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;IIII)V - ARG 1 matrices - ARG 2 entity - ARG 3 world - ARG 4 stack - ARG 5 x - ARG 6 y - ARG 7 seed - ARG 8 depth diff --git a/mappings/net/minecraft/client/resource/SplashTextResourceSupplier.mapping b/mappings/net/minecraft/client/resource/SplashTextResourceSupplier.mapping index a3a28f4383..fc400c9557 100644 --- a/mappings/net/minecraft/client/resource/SplashTextResourceSupplier.mapping +++ b/mappings/net/minecraft/client/resource/SplashTextResourceSupplier.mapping @@ -5,6 +5,6 @@ CLASS net/minecraft/class_4008 net/minecraft/client/resource/SplashTextResourceS FIELD field_18934 session Lnet/minecraft/class_320; METHOD (Lnet/minecraft/class_320;)V ARG 1 session - METHOD method_18174 get ()Ljava/lang/String; + METHOD method_18174 get ()Lnet/minecraft/class_8519; METHOD method_18664 (Ljava/lang/String;)Z ARG 0 splashText diff --git a/mappings/net/minecraft/client/toast/SystemToast.mapping b/mappings/net/minecraft/client/toast/SystemToast.mapping index 443b20f795..7b7e0de069 100644 --- a/mappings/net/minecraft/client/toast/SystemToast.mapping +++ b/mappings/net/minecraft/client/toast/SystemToast.mapping @@ -36,8 +36,7 @@ CLASS net/minecraft/class_370 net/minecraft/client/toast/SystemToast METHOD method_27025 addWorldDeleteFailureToast (Lnet/minecraft/class_310;Ljava/lang/String;)V ARG 0 client ARG 1 worldName - METHOD method_29046 drawPart (Lnet/minecraft/class_4587;Lnet/minecraft/class_374;IIII)V - ARG 1 matrices + METHOD method_29046 drawPart (Lnet/minecraft/class_332;Lnet/minecraft/class_374;IIII)V ARG 2 manager ARG 3 width ARG 4 textureV diff --git a/mappings/net/minecraft/client/toast/Toast.mapping b/mappings/net/minecraft/client/toast/Toast.mapping index 5c25fc9de4..9645b0d097 100644 --- a/mappings/net/minecraft/client/toast/Toast.mapping +++ b/mappings/net/minecraft/client/toast/Toast.mapping @@ -2,8 +2,7 @@ CLASS net/minecraft/class_368 net/minecraft/client/toast/Toast FIELD field_2207 TEXTURE Lnet/minecraft/class_2960; FIELD field_2208 TYPE Ljava/lang/Object; FIELD field_39928 BASE_HEIGHT I - METHOD method_1986 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_374;J)Lnet/minecraft/class_368$class_369; - ARG 1 matrices + METHOD method_1986 draw (Lnet/minecraft/class_332;Lnet/minecraft/class_374;J)Lnet/minecraft/class_368$class_369; ARG 2 manager ARG 3 startTime METHOD method_1987 getType ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/client/toast/ToastManager.mapping b/mappings/net/minecraft/client/toast/ToastManager.mapping index 941d7768f6..6f667691d7 100644 --- a/mappings/net/minecraft/client/toast/ToastManager.mapping +++ b/mappings/net/minecraft/client/toast/ToastManager.mapping @@ -8,8 +8,7 @@ CLASS net/minecraft/class_374 net/minecraft/client/toast/ToastManager METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_1995 getClient ()Lnet/minecraft/class_310; - METHOD method_1996 draw (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_1996 draw (Lnet/minecraft/class_332;)V METHOD method_1997 getToast (Ljava/lang/Class;Ljava/lang/Object;)Lnet/minecraft/class_368; ARG 1 toastClass ARG 2 type @@ -18,7 +17,7 @@ CLASS net/minecraft/class_374 net/minecraft/client/toast/ToastManager METHOD method_2000 clear ()V METHOD method_45073 getTopIndex (I)I ARG 1 requiredSpaces - METHOD method_45074 (ILnet/minecraft/class_4587;Lnet/minecraft/class_374$class_375;)Z + METHOD method_45074 (ILnet/minecraft/class_332;Lnet/minecraft/class_374$class_375;)Z ARG 3 visibleEntry METHOD method_45075 (Lnet/minecraft/class_368;)Z ARG 1 toast @@ -37,8 +36,7 @@ CLASS net/minecraft/class_374 net/minecraft/client/toast/ToastManager ARG 3 topIndex ARG 4 requiredSpaceCount METHOD method_2001 getInstance ()Lnet/minecraft/class_368; - METHOD method_2002 draw (ILnet/minecraft/class_4587;)Z + METHOD method_2002 draw (ILnet/minecraft/class_332;)Z ARG 1 x - ARG 2 matrices METHOD method_2003 getDisappearProgress (J)F ARG 1 time diff --git a/mappings/net/minecraft/client/toast/TutorialToast.mapping b/mappings/net/minecraft/client/toast/TutorialToast.mapping index 94b6d6c4b2..a8e4efedd8 100644 --- a/mappings/net/minecraft/client/toast/TutorialToast.mapping +++ b/mappings/net/minecraft/client/toast/TutorialToast.mapping @@ -21,7 +21,6 @@ CLASS net/minecraft/class_372 net/minecraft/client/toast/TutorialToast METHOD (Ljava/lang/String;III)V ARG 3 textureSlotX ARG 4 textureSlotY - METHOD method_1994 drawIcon (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_1994 drawIcon (Lnet/minecraft/class_332;II)V ARG 2 x ARG 3 y diff --git a/mappings/net/minecraft/client/util/Window.mapping b/mappings/net/minecraft/client/util/Window.mapping index 42536ce7c3..07471c818d 100644 --- a/mappings/net/minecraft/client/util/Window.mapping +++ b/mappings/net/minecraft/client/util/Window.mapping @@ -80,9 +80,7 @@ CLASS net/minecraft/class_1041 net/minecraft/client/util/Window ARG 4 height METHOD method_4489 getFramebufferWidth ()I METHOD method_4490 getHandle ()J - METHOD method_4491 setIcon (Lnet/minecraft/class_7367;Lnet/minecraft/class_7367;)V - ARG 1 smallIconSupplier - ARG 2 bigIconSupplier + METHOD method_4491 setIcon (Lnet/minecraft/class_3262;Lnet/minecraft/class_8518;)V METHOD method_4492 acceptError (Ljava/util/function/BiConsumer;)V ARG 0 consumer METHOD method_4494 onWindowFocusChanged (JZ)V @@ -106,11 +104,6 @@ CLASS net/minecraft/class_1041 net/minecraft/client/util/Window ARG 1 videoMode METHOD method_4506 getFramebufferHeight ()I METHOD method_4507 getHeight ()I - METHOD method_4510 readImage (Lnet/minecraft/class_7367;Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;)Ljava/nio/ByteBuffer; - ARG 1 imageSupplier - ARG 2 x - ARG 3 y - ARG 4 channels METHOD method_4511 getVideoMode ()Ljava/util/Optional; METHOD method_4513 logOnGlError ()V CLASS class_4716 GlErroredException diff --git a/mappings/net/minecraft/datafixer/fix/SculkSensorRemoveCooldownPhaseFix.mapping b/mappings/net/minecraft/datafixer/fix/SculkSensorRemoveCooldownPhaseFix.mapping deleted file mode 100644 index 72bc2cd2ce..0000000000 --- a/mappings/net/minecraft/datafixer/fix/SculkSensorRemoveCooldownPhaseFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_8485 net/minecraft/datafixer/fix/SculkSensorRemoveCooldownPhaseFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - METHOD method_51150 removeCooldownPhase (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index b89fe9b03a..98abe644f0 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -956,16 +956,12 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT @see #getVehicle METHOD method_49787 playCombinationStepSounds (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V ARG 1 primaryState - ARG 2 secondaryState METHOD method_49788 getStepSoundPos (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; ARG 1 pos METHOD method_49789 (Lnet/minecraft/class_1297;)V ARG 0 entity METHOD method_49790 shouldPlayAmethystChimeSound (Lnet/minecraft/class_2680;)Z ARG 1 state - METHOD method_49791 playStepSounds (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V - ARG 1 pos - ARG 2 state METHOD method_49792 teleportPassengers ()V METHOD method_51152 getNameLabelHeight ()F METHOD method_5621 getMountedHeightOffset ()D diff --git a/mappings/net/minecraft/entity/passive/AllayEntity.mapping b/mappings/net/minecraft/entity/passive/AllayEntity.mapping index 5f8c18b602..528e957fac 100644 --- a/mappings/net/minecraft/entity/passive/AllayEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AllayEntity.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_7298 net/minecraft/entity/passive/AllayEntity FIELD field_39465 DUPLICATION_COOLDOWN I FIELD field_39466 DANCING Lnet/minecraft/class_2940; FIELD field_39467 CAN_DUPLICATE Lnet/minecraft/class_2940; - FIELD field_39468 listenerCallback Lnet/minecraft/class_5718$class_5719; + FIELD field_39468 listenerCallback Lnet/minecraft/class_8514$class_5719; FIELD field_39469 jukeboxEventHandler Lnet/minecraft/class_5715; FIELD field_39470 jukeboxPos Lnet/minecraft/class_2338; FIELD field_39471 duplicationCooldown J diff --git a/mappings/net/minecraft/entity/passive/SnifferEntity.mapping b/mappings/net/minecraft/entity/passive/SnifferEntity.mapping index 070736d214..cef6e5354b 100644 --- a/mappings/net/minecraft/entity/passive/SnifferEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SnifferEntity.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_8153 net/minecraft/entity/passive/SnifferEntity FIELD field_42650 feelingHappyAnimationState Lnet/minecraft/class_7094; FIELD field_42651 scentingAnimationState Lnet/minecraft/class_7094; FIELD field_42652 sniffingAnimationState Lnet/minecraft/class_7094; - FIELD field_42653 searchingAnimationState Lnet/minecraft/class_7094; FIELD field_42654 diggingAnimationState Lnet/minecraft/class_7094; FIELD field_42655 risingAnimationState Lnet/minecraft/class_7094; FIELD field_42662 STATE Lnet/minecraft/class_2940; diff --git a/mappings/net/minecraft/item/ItemGroups.mapping b/mappings/net/minecraft/item/ItemGroups.mapping index f754f5f968..681cb61601 100644 --- a/mappings/net/minecraft/item/ItemGroups.mapping +++ b/mappings/net/minecraft/item/ItemGroups.mapping @@ -1,19 +1,18 @@ CLASS net/minecraft/class_7706 net/minecraft/item/ItemGroups - FIELD field_40195 BUILDING_BLOCKS Lnet/minecraft/class_1761; - FIELD field_40197 FUNCTIONAL Lnet/minecraft/class_1761; - FIELD field_40198 REDSTONE Lnet/minecraft/class_1761; - FIELD field_40199 HOTBAR Lnet/minecraft/class_1761; - FIELD field_40200 SEARCH Lnet/minecraft/class_1761; - FIELD field_40202 COMBAT Lnet/minecraft/class_1761; - FIELD field_40205 SPAWN_EGGS Lnet/minecraft/class_1761; - FIELD field_40206 INVENTORY Lnet/minecraft/class_1761; - FIELD field_40207 GROUPS Ljava/util/List; - FIELD field_40743 NATURAL Lnet/minecraft/class_1761; - FIELD field_41059 COLORED_BLOCKS Lnet/minecraft/class_1761; - FIELD field_41060 TOOLS Lnet/minecraft/class_1761; - FIELD field_41061 FOOD_AND_DRINK Lnet/minecraft/class_1761; - FIELD field_41062 INGREDIENTS Lnet/minecraft/class_1761; - FIELD field_41063 OPERATOR Lnet/minecraft/class_1761; + FIELD field_40195 BUILDING_BLOCKS Lnet/minecraft/class_5321; + FIELD field_40197 FUNCTIONAL Lnet/minecraft/class_5321; + FIELD field_40198 REDSTONE Lnet/minecraft/class_5321; + FIELD field_40199 HOTBAR Lnet/minecraft/class_5321; + FIELD field_40200 SEARCH Lnet/minecraft/class_5321; + FIELD field_40202 COMBAT Lnet/minecraft/class_5321; + FIELD field_40205 SPAWN_EGGS Lnet/minecraft/class_5321; + FIELD field_40206 INVENTORY Lnet/minecraft/class_5321; + FIELD field_40743 NATURAL Lnet/minecraft/class_5321; + FIELD field_41059 COLORED_BLOCKS Lnet/minecraft/class_5321; + FIELD field_41060 TOOLS Lnet/minecraft/class_5321; + FIELD field_41061 FOOD_AND_DRINK Lnet/minecraft/class_5321; + FIELD field_41062 INGREDIENTS Lnet/minecraft/class_5321; + FIELD field_41063 OPERATOR Lnet/minecraft/class_5321; FIELD field_42465 PAINTING_VARIANT_COMPARATOR Ljava/util/Comparator; FIELD field_42466 displayContext Lnet/minecraft/class_1761$class_8128; METHOD method_45426 addInstruments (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_7225;Lnet/minecraft/class_1792;Lnet/minecraft/class_6862;Lnet/minecraft/class_1761$class_7705;)V @@ -38,9 +37,6 @@ CLASS net/minecraft/class_7706 net/minecraft/item/ItemGroups ARG 2 enchantmentTargets ARG 3 visibility METHOD method_47328 getDefaultTab ()Lnet/minecraft/class_1761; - METHOD method_47329 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V - ARG 0 displayContext - ARG 1 entries METHOD method_47330 updateDisplayContext (Lnet/minecraft/class_7699;ZLnet/minecraft/class_7225$class_7874;)Z ARG 0 enabledFeatures ARG 1 operatorEnabled @@ -52,12 +48,8 @@ CLASS net/minecraft/class_7706 net/minecraft/item/ItemGroups ARG 1 visibility METHOD method_47333 (Lnet/minecraft/class_1761;)Z ARG 0 group - METHOD method_47334 collect ([Lnet/minecraft/class_1761;)Ljava/util/List; - ARG 0 groups + METHOD method_47334 collect ()V METHOD method_47335 getGroupsToDisplay ()Ljava/util/List; - METHOD method_47336 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V - ARG 0 displayContext - ARG 1 entries METHOD method_47337 updateEntries (Lnet/minecraft/class_1761$class_8128;)V ARG 0 displayContext METHOD method_47338 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761;)V @@ -68,52 +60,18 @@ CLASS net/minecraft/class_7706 net/minecraft/item/ItemGroups METHOD method_47340 (Lnet/minecraft/class_1761;)Z ARG 0 group METHOD method_47341 getGroups ()Ljava/util/List; - METHOD method_47342 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V - ARG 0 displayContext - ARG 1 entries METHOD method_47344 getSearchGroup ()Lnet/minecraft/class_1761; - METHOD method_47345 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V - ARG 0 displayContext - ARG 1 entries - METHOD method_47347 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V - ARG 0 displayContext - ARG 1 entries - METHOD method_47349 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V - ARG 0 displayContext - ARG 1 entries - METHOD method_47351 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V - ARG 0 displayContext - ARG 1 entries - METHOD method_47353 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V - ARG 0 displayContext - ARG 1 entries - METHOD method_47355 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V - ARG 0 displayContext - ARG 1 entries - METHOD method_47357 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V - ARG 0 displayContext - ARG 1 entries - METHOD method_47359 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V - ARG 0 displayContext - ARG 1 entries - METHOD method_47361 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V - ARG 0 displayContext - ARG 1 entries METHOD method_48933 (Lnet/minecraft/class_1535;)I ARG 0 paintingVariant METHOD method_48934 (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1761$class_7705;Lnet/minecraft/class_1799;)V ARG 2 stack METHOD method_48935 (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1761$class_7705;Lnet/minecraft/class_6880$class_6883;)V ARG 2 variant - METHOD method_48936 (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_7225$class_7226;)V - ARG 1 registryWrapper METHOD method_48937 addPaintings (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_7225$class_7226;Ljava/util/function/Predicate;Lnet/minecraft/class_1761$class_7705;)V ARG 0 entries ARG 1 registryWrapper ARG 2 predicate ARG 3 visibility - METHOD method_48938 (Lnet/minecraft/class_1761$class_7704;Ljava/util/Set;Lnet/minecraft/class_7225$class_7226;)V - ARG 2 registryWrapper METHOD method_48939 (Lnet/minecraft/class_1792;Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1761$class_7705;Lnet/minecraft/class_6885$class_6888;)V ARG 3 entryList METHOD method_48940 (Lnet/minecraft/class_1792;Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_1799; @@ -126,27 +84,15 @@ CLASS net/minecraft/class_7706 net/minecraft/item/ItemGroups ARG 1 level METHOD method_48944 (Lnet/minecraft/class_6880$class_6883;)Z ARG 0 entry - METHOD method_48945 (Lnet/minecraft/class_6880;)Z - ARG 0 entry METHOD method_48946 (Ljava/util/Set;Lnet/minecraft/class_1887;)Z ARG 1 enchantment METHOD method_48947 (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1761$class_7705;Lnet/minecraft/class_1799;)V ARG 2 stack - METHOD method_48948 (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_7225$class_7226;)V - ARG 1 registryWrapper METHOD method_48949 (Lnet/minecraft/class_1887;)Lnet/minecraft/class_1799; ARG 0 enchantment - METHOD method_48950 (Lnet/minecraft/class_6880;)Z - ARG 0 entry METHOD method_48951 (Ljava/util/Set;Lnet/minecraft/class_1887;)Z ARG 1 enchantment METHOD method_48952 (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1761$class_7705;Lnet/minecraft/class_1799;)V ARG 2 stack - METHOD method_48953 (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_7225$class_7226;)V - ARG 1 registryWrapper METHOD method_48954 (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1761$class_7705;Lnet/minecraft/class_1799;)V ARG 2 stack - METHOD method_48955 (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_7225$class_7226;)V - ARG 1 registryWrapper - METHOD method_48956 (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_7225$class_7226;)V - ARG 1 registryWrapper diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 8b6c1ab147..854f1e1f42 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -168,10 +168,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 0 instance METHOD method_28377 (Lnet/minecraft/class_1799;)Ljava/util/Optional; ARG 0 stack - METHOD method_28378 (Lnet/minecraft/class_1799;)Ljava/lang/Integer; - ARG 0 stack - METHOD method_28379 (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1792; - ARG 0 stack METHOD method_30266 getHideFlags ()I METHOD method_30267 isSectionVisible (ILnet/minecraft/class_1799$class_5422;)Z COMMENT Determines whether the given tooltip section will be visible according to the given flags. diff --git a/mappings/net/minecraft/recipe/RecipeUnlocker.mapping b/mappings/net/minecraft/recipe/RecipeUnlocker.mapping index e03041706e..bd81dfd31d 100644 --- a/mappings/net/minecraft/recipe/RecipeUnlocker.mapping +++ b/mappings/net/minecraft/recipe/RecipeUnlocker.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_1732 net/minecraft/recipe/RecipeUnlocker METHOD method_7662 setLastRecipe (Lnet/minecraft/class_1860;)V ARG 1 recipe METHOD method_7663 getLastRecipe ()Lnet/minecraft/class_1860; - METHOD method_7664 unlockLastRecipe (Lnet/minecraft/class_1657;)V + METHOD method_7664 unlockLastRecipe (Lnet/minecraft/class_1657;Ljava/util/List;)V ARG 1 player METHOD method_7665 shouldCraftRecipe (Lnet/minecraft/class_1937;Lnet/minecraft/class_3222;Lnet/minecraft/class_1860;)Z ARG 1 world diff --git a/mappings/net/minecraft/server/command/ServerCommandSource.mapping b/mappings/net/minecraft/server/command/ServerCommandSource.mapping index effc6a2822..d15ecdf31d 100644 --- a/mappings/net/minecraft/server/command/ServerCommandSource.mapping +++ b/mappings/net/minecraft/server/command/ServerCommandSource.mapping @@ -29,7 +29,7 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource ARG 7 displayName ARG 8 server ARG 9 entity - METHOD (Lnet/minecraft/class_2165;Lnet/minecraft/class_243;Lnet/minecraft/class_241;Lnet/minecraft/class_3218;ILjava/lang/String;Lnet/minecraft/class_2561;Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_1297;ZLcom/mojang/brigadier/ResultConsumer;Lnet/minecraft/class_2183$class_2184;Lnet/minecraft/class_7448;Lnet/minecraft/class_7620;)V + METHOD (Lnet/minecraft/class_2165;Lnet/minecraft/class_243;Lnet/minecraft/class_241;Lnet/minecraft/class_3218;ILjava/lang/String;Lnet/minecraft/class_2561;Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_1297;ZLcom/mojang/brigadier/ResultConsumer;Lnet/minecraft/class_2183$class_2184;Lnet/minecraft/class_7448;Lnet/minecraft/class_7620;Ljava/util/function/IntConsumer;)V ARG 1 output ARG 2 pos ARG 3 rot diff --git a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping index 9ddc8ac168..0406f0a10b 100644 --- a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping +++ b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping @@ -103,8 +103,6 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana FIELD field_33546 tracer Lnet/minecraft/class_2991$class_6346; FIELD field_33547 queue Ljava/util/Deque; FIELD field_33548 waitlist Ljava/util/List; - METHOD (Lnet/minecraft/class_2991;Lnet/minecraft/class_2991$class_6346;)V - ARG 2 tracer METHOD method_36343 recursiveRun (Lnet/minecraft/class_2158;Lnet/minecraft/class_2168;)V COMMENT Handles a recursive case in {@link CommandFunctionManager#execute(CommandFunction, COMMENT ServerCommandSource, CommandFunctionManager.Tracer)}. diff --git a/mappings/net/minecraft/server/world/ServerLightingProvider.mapping b/mappings/net/minecraft/server/world/ServerLightingProvider.mapping index 78b9fc3323..89c5630d67 100644 --- a/mappings/net/minecraft/server/world/ServerLightingProvider.mapping +++ b/mappings/net/minecraft/server/world/ServerLightingProvider.mapping @@ -34,8 +34,4 @@ CLASS net/minecraft/class_3227 net/minecraft/server/world/ServerLightingProvider ARG 2 excludeBlocks METHOD method_20386 updateChunkStatus (Lnet/minecraft/class_1923;)V ARG 1 pos - METHOD method_41252 retainData (Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; - ARG 1 chunk - METHOD method_41254 (Lnet/minecraft/class_1923;Ljava/lang/Runnable;)V - ARG 2 task CLASS class_3901 Stage diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 50004b2ec5..651b8d00fd 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -61,8 +61,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 4 holder METHOD method_17219 (Lnet/minecraft/class_1923;ILorg/apache/commons/lang3/mutable/MutableObject;Lnet/minecraft/class_3222;)V ARG 4 player - METHOD method_17220 getRegion (Lnet/minecraft/class_1923;ILjava/util/function/IntFunction;)Ljava/util/concurrent/CompletableFuture; - ARG 1 centerChunk + METHOD method_17220 getRegion (Lnet/minecraft/class_3193;ILjava/util/function/IntFunction;)Ljava/util/concurrent/CompletableFuture; ARG 2 margin ARG 3 distanceToStatus METHOD method_17222 (Lcom/mojang/datafixers/util/Either;)Lcom/mojang/datafixers/util/Either; @@ -87,7 +86,6 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_17233 tick (Ljava/util/function/BooleanSupplier;)V ARG 1 shouldKeepTicking METHOD method_17235 makeChunkTickable (Lnet/minecraft/class_3193;)Ljava/util/concurrent/CompletableFuture; - ARG 1 holder METHOD method_17236 getChunk (Lnet/minecraft/class_3193;Lnet/minecraft/class_2806;)Ljava/util/concurrent/CompletableFuture; ARG 1 holder ARG 2 requiredStatus @@ -102,8 +100,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_17243 (Lorg/apache/commons/lang3/mutable/MutableObject;Lnet/minecraft/class_2818;Lnet/minecraft/class_3222;)V ARG 3 player METHOD method_17244 updateHolderMap ()Z - METHOD method_17247 makeChunkEntitiesTickable (Lnet/minecraft/class_1923;)Ljava/util/concurrent/CompletableFuture; - ARG 1 pos + METHOD method_17247 makeChunkEntitiesTickable (Lnet/minecraft/class_3193;)Ljava/util/concurrent/CompletableFuture; METHOD method_17248 (Lnet/minecraft/class_2806;I)Lnet/minecraft/class_2806; ARG 2 distance METHOD method_17252 (Lnet/minecraft/class_3193;Ljava/lang/Runnable;)V @@ -120,9 +117,9 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_17264 entryIterator ()Ljava/lang/Iterable; METHOD method_17604 getCompletedLevelSupplier (J)Ljava/util/function/IntSupplier; ARG 1 pos - METHOD method_18193 (Lnet/minecraft/class_1923;Lnet/minecraft/class_2818;)V + METHOD method_18193 (Lnet/minecraft/class_3193;Lnet/minecraft/class_2818;)V ARG 2 chunk - METHOD method_18194 (Lnet/minecraft/class_1923;Lcom/mojang/datafixers/util/Either;)V + METHOD method_18194 (Lnet/minecraft/class_3193;Lcom/mojang/datafixers/util/Either;)V ARG 2 either METHOD method_18701 loadEntity (Lnet/minecraft/class_1297;)V ARG 1 entity diff --git a/mappings/net/minecraft/world/Heightmap.mapping b/mappings/net/minecraft/world/Heightmap.mapping index 687c67e46f..75d5f3471d 100644 --- a/mappings/net/minecraft/world/Heightmap.mapping +++ b/mappings/net/minecraft/world/Heightmap.mapping @@ -30,8 +30,6 @@ CLASS net/minecraft/class_2902 net/minecraft/world/Heightmap METHOD method_12603 get (II)I ARG 1 x ARG 2 z - METHOD method_16680 (Lnet/minecraft/class_2680;)Z - ARG 0 state METHOD method_16682 (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_16684 populateHeightmaps (Lnet/minecraft/class_2791;Ljava/util/Set;)V diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 0e8248d4a1..3353acb58e 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -21,8 +21,6 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;J[Lnet/minecraft/class_2826;Lnet/minecraft/class_6749;)V ARG 1 pos ARG 2 upgradeData - ARG 3 heightLimitView - ARG 4 biome ARG 5 inhabitedTime ARG 7 sectionArrayInitializer ARG 8 blendingData @@ -75,7 +73,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_12038 isLightOn ()Z METHOD method_12039 markBlockForPostProcessing (Lnet/minecraft/class_2338;)V ARG 1 pos - METHOD method_12040 getHighestNonEmptySection ()Lnet/minecraft/class_2826; + METHOD method_12040 getHighestNonEmptySection ()I METHOD method_12041 removeBlockEntity (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_12042 addPendingBlockEntityNbt (Lnet/minecraft/class_2487;)V @@ -90,10 +88,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk ARG 1 ySectionCoord METHOD method_38255 getOrCreateChunkNoiseSampler (Ljava/util/function/Function;)Lnet/minecraft/class_6568; ARG 1 chunkNoiseSamplerCreator - METHOD method_38256 fillSectionArray (Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;[Lnet/minecraft/class_2826;)V - ARG 0 world - ARG 1 biome - ARG 2 sectionArray + METHOD method_38256 fillSectionArray (Lnet/minecraft/class_2378;[Lnet/minecraft/class_2826;)V METHOD method_38257 populateBiomes (Lnet/minecraft/class_6780;Lnet/minecraft/class_6544$class_6552;)V ARG 1 biomeSupplier ARG 2 sampler diff --git a/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping b/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping index 2988a8a4b8..4f8972f647 100644 --- a/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping @@ -14,8 +14,6 @@ CLASS net/minecraft/class_2804 net/minecraft/world/chunk/ChunkNibbleArray FIELD field_34052 COPY_TIMES I METHOD (I)V ARG 1 size - METHOD ([B)V - ARG 1 bytes METHOD method_12137 asByteArray ()[B METHOD method_12138 getArrayIndex (I)I ARG 0 i diff --git a/mappings/net/minecraft/world/chunk/ChunkSection.mapping b/mappings/net/minecraft/world/chunk/ChunkSection.mapping index c75404bd17..a9dcbf2f23 100644 --- a/mappings/net/minecraft/world/chunk/ChunkSection.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkSection.mapping @@ -1,17 +1,9 @@ CLASS net/minecraft/class_2826 net/minecraft/world/chunk/ChunkSection FIELD field_12877 nonEmptyBlockCount S FIELD field_12878 blockStateContainer Lnet/minecraft/class_2841; - FIELD field_12880 yOffset I FIELD field_12881 nonEmptyFluidCount S FIELD field_12882 randomTickableBlockCount S FIELD field_34556 biomeContainer Lnet/minecraft/class_7522; - METHOD (ILnet/minecraft/class_2378;)V - ARG 1 chunkPos - ARG 2 biomeRegistry - METHOD (ILnet/minecraft/class_2841;Lnet/minecraft/class_7522;)V - ARG 1 chunkPos - ARG 2 blockStateContainer - ARG 3 biomeContainer METHOD method_12253 calculateCounts ()V METHOD method_12254 getBlockState (III)Lnet/minecraft/class_2680; ARG 1 x @@ -31,7 +23,6 @@ CLASS net/minecraft/class_2826 net/minecraft/world/chunk/ChunkSection ARG 1 buf METHOD method_12258 readDataPacket (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_12259 getYOffset ()I METHOD method_12260 getPacketSize ()I METHOD method_12262 hasRandomTicks ()Z METHOD method_12263 hasRandomBlockTicks ()Z @@ -46,13 +37,10 @@ CLASS net/minecraft/class_2826 net/minecraft/world/chunk/ChunkSection METHOD method_16677 unlock ()V METHOD method_19523 hasAny (Ljava/util/function/Predicate;)Z ARG 1 predicate - METHOD method_31729 blockCoordFromChunkCoord (I)I - ARG 0 chunkPos - METHOD method_38291 populateBiomes (Lnet/minecraft/class_6780;Lnet/minecraft/class_6544$class_6552;II)V + METHOD method_38291 populateBiomes (Lnet/minecraft/class_6780;Lnet/minecraft/class_6544$class_6552;III)V ARG 1 biomeSupplier ARG 2 sampler ARG 3 x - ARG 4 z METHOD method_38292 isEmpty ()Z METHOD method_38293 getBiome (III)Lnet/minecraft/class_6880; ARG 1 x diff --git a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping index 187780c0a6..75f9856ebf 100644 --- a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping @@ -13,16 +13,12 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus FIELD field_19345 STATUS_BUMP_LOAD_TASK Lnet/minecraft/class_2806$class_4305; COMMENT A load task which only bumps the chunk status of the chunk. FIELD field_19346 loadTask Lnet/minecraft/class_2806$class_4305; - METHOD (Ljava/lang/String;Lnet/minecraft/class_2806;ILjava/util/EnumSet;Lnet/minecraft/class_2806$class_2808;Lnet/minecraft/class_2806$class_2807;Lnet/minecraft/class_2806$class_4305;)V + METHOD (Ljava/lang/String;Lnet/minecraft/class_2806;IZLjava/util/EnumSet;Lnet/minecraft/class_2806$class_2808;Lnet/minecraft/class_2806$class_2807;Lnet/minecraft/class_2806$class_4305;)V ARG 1 id ARG 2 previous ARG 3 taskMargin - ARG 4 heightMapTypes - ARG 5 chunkType - ARG 6 generationTask - ARG 7 loadTask METHOD method_12152 getTaskMargin ()I - METHOD method_12154 runGenerationTask (Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Z)Ljava/util/concurrent/CompletableFuture; + METHOD method_12154 runGenerationTask (Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; ARG 1 executor ARG 2 world ARG 3 generator @@ -30,7 +26,6 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 5 lightingProvider ARG 6 fullChunkConverter ARG 7 chunks - ARG 8 regenerate METHOD method_12155 getMaxDistanceFromFull ()I METHOD method_12160 getHeightmapTypes ()Ljava/util/EnumSet; METHOD method_12161 byDistanceFromFull (I)Lnet/minecraft/class_2806; @@ -87,16 +82,10 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 2 generator ARG 3 chunks ARG 4 chunk - METHOD method_17036 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V - ARG 0 targetStatus - ARG 1 world - ARG 2 generator - ARG 3 chunks - ARG 4 chunk METHOD method_20608 shouldExcludeBlockLight (Lnet/minecraft/class_2806;Lnet/minecraft/class_2791;)Z ARG 0 status ARG 1 chunk - METHOD method_20609 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;Z)Ljava/util/concurrent/CompletableFuture; + METHOD method_20609 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 targetStatus ARG 1 executor ARG 2 world @@ -106,26 +95,21 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 6 fullChunkConverter ARG 7 chunks ARG 8 chunk - ARG 9 regenerate METHOD method_20610 getLightingFuture (Lnet/minecraft/class_2806;Lnet/minecraft/class_3227;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 status ARG 1 lightingProvider ARG 2 chunk - METHOD method_20611 register (Ljava/lang/String;Lnet/minecraft/class_2806;ILjava/util/EnumSet;Lnet/minecraft/class_2806$class_2808;Lnet/minecraft/class_2806$class_2807;Lnet/minecraft/class_2806$class_4305;)Lnet/minecraft/class_2806; + METHOD method_20611 register (Ljava/lang/String;Lnet/minecraft/class_2806;IZLjava/util/EnumSet;Lnet/minecraft/class_2806$class_2808;Lnet/minecraft/class_2806$class_2807;Lnet/minecraft/class_2806$class_4305;)Lnet/minecraft/class_2806; ARG 0 id ARG 1 previous ARG 2 taskMargin - ARG 3 heightMapTypes - ARG 4 chunkType - ARG 5 task - ARG 6 loadTask METHOD method_20612 runLoadTask (Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 1 world ARG 2 structureTemplateManager ARG 3 lightingProvider ARG 4 fullChunkConverter ARG 5 chunk - METHOD method_20613 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;Z)Ljava/util/concurrent/CompletableFuture; + METHOD method_20614 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 targetStatus ARG 1 executor ARG 2 world @@ -135,18 +119,6 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 6 fullChunkConverter ARG 7 chunks ARG 8 chunk - ARG 9 regenerate - METHOD method_20614 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;Z)Ljava/util/concurrent/CompletableFuture; - ARG 0 targetStatus - ARG 1 executor - ARG 2 world - ARG 3 generator - ARG 4 structureTemplateManager - ARG 5 lightingProvider - ARG 6 fullChunkConverter - ARG 7 chunks - ARG 8 chunk - ARG 9 regenerate METHOD method_20615 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 targetStatus ARG 1 world @@ -154,12 +126,6 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 3 lightingProvider ARG 4 fullChunkConverter ARG 5 chunk - METHOD method_38277 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V - ARG 0 targetStatus - ARG 1 world - ARG 2 generator - ARG 3 chunks - ARG 4 chunk METHOD method_38278 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 targetStatus ARG 1 world @@ -167,17 +133,13 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 3 lightingProvider ARG 4 fullChunkConverter ARG 5 chunk - METHOD method_38280 (Lnet/minecraft/class_6613;Lcom/mojang/datafixers/util/Either;)Lcom/mojang/datafixers/util/Either; - ARG 1 either METHOD method_38282 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V ARG 0 targetStatus ARG 1 world ARG 2 generator ARG 3 chunks ARG 4 chunk - METHOD method_38283 (Lnet/minecraft/class_2806;Lnet/minecraft/class_2791;)Lcom/mojang/datafixers/util/Either; - ARG 1 chunk - METHOD method_38284 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;Z)Ljava/util/concurrent/CompletableFuture; + METHOD method_38284 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 targetStatus ARG 1 executor ARG 2 world @@ -187,8 +149,7 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 6 fullChunkConverter ARG 7 chunks ARG 8 chunk - ARG 9 regenerate - METHOD method_38285 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;Z)Ljava/util/concurrent/CompletableFuture; + METHOD method_38285 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 targetStatus ARG 1 executor ARG 2 world @@ -198,10 +159,7 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 6 fullChunkConverter ARG 7 chunks ARG 8 chunk - ARG 9 regenerate - METHOD method_39463 (Lnet/minecraft/class_2806;Lnet/minecraft/class_2791;)Lcom/mojang/datafixers/util/Either; - ARG 1 chunk - METHOD method_39464 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;Z)Ljava/util/concurrent/CompletableFuture; + METHOD method_39464 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 targetStatus ARG 1 executor ARG 2 world @@ -211,13 +169,6 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 6 fullChunkConverter ARG 7 chunks ARG 8 chunk - ARG 9 regenerate - METHOD method_39789 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V - ARG 0 targetStatus - ARG 1 world - ARG 2 generator - ARG 3 chunks - ARG 4 chunk METHOD method_39790 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 targetStatus ARG 1 world @@ -234,7 +185,7 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 5 chunk CLASS class_2807 GenerationTask COMMENT A task called when a chunk needs to be generated. - METHOD doWork (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;Z)Ljava/util/concurrent/CompletableFuture; + METHOD doWork (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 1 targetStatus COMMENT the status the chunk will be set to after the task is completed ARG 2 executor @@ -246,7 +197,6 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus COMMENT a function that can convert a raw chunk to a full chunk ARG 8 chunks ARG 9 chunk - ARG 10 regenerate CLASS class_2808 ChunkType COMMENT Specifies the type of a chunk FIELD field_12807 LEVELCHUNK Lnet/minecraft/class_2806$class_2808; diff --git a/mappings/net/minecraft/world/chunk/ChunkToNibbleArrayMap.mapping b/mappings/net/minecraft/world/chunk/ChunkToNibbleArrayMap.mapping index fff8aea535..94221d056b 100644 --- a/mappings/net/minecraft/world/chunk/ChunkToNibbleArrayMap.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkToNibbleArrayMap.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_3556 net/minecraft/world/chunk/ChunkToNibbleArrayMap ARG 1 chunkPos METHOD method_15501 get (J)Lnet/minecraft/class_2804; ARG 1 chunkPos - METHOD method_15502 replaceWithCopy (J)V + METHOD method_15502 replaceWithCopy (J)Lnet/minecraft/class_2804; ARG 1 pos METHOD method_15503 containsKey (J)Z ARG 1 chunkPos diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index af9fffa604..ad04d5f1e8 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -74,8 +74,6 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk ARG 1 pos METHOD method_31725 removeBlockEntityTicker (Lnet/minecraft/class_2338;)V ARG 1 pos - METHOD method_32917 (Lnet/minecraft/class_3218;I)Lnet/minecraft/class_5713; - ARG 1 sectionCoord METHOD method_32918 removeGameEventListener (Lnet/minecraft/class_2586;Lnet/minecraft/class_3218;)V ARG 1 blockEntity ARG 2 world diff --git a/mappings/net/minecraft/world/chunk/light/LightStorage.mapping b/mappings/net/minecraft/world/chunk/light/LightStorage.mapping index cb3552eea7..0ffd746a1d 100644 --- a/mappings/net/minecraft/world/chunk/light/LightStorage.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightStorage.mapping @@ -15,7 +15,6 @@ CLASS net/minecraft/class_3560 net/minecraft/world/chunk/light/LightStorage FIELD field_15798 sectionsToRemove Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_15799 DIRECTIONS [Lnet/minecraft/class_2350; FIELD field_15800 hasLightUpdates Z - FIELD field_15801 EMPTY Lnet/minecraft/class_2804; FIELD field_15802 dirtySections Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_15803 chunkProvider Lnet/minecraft/class_2823; FIELD field_15804 markedReadySections Lit/unimi/dsi/fastutil/longs/LongSet; diff --git a/mappings/net/minecraft/world/event/listener/EntityGameEventHandler.mapping b/mappings/net/minecraft/world/event/listener/EntityGameEventHandler.mapping index 7bfe56ad4b..42de294c41 100644 --- a/mappings/net/minecraft/world/event/listener/EntityGameEventHandler.mapping +++ b/mappings/net/minecraft/world/event/listener/EntityGameEventHandler.mapping @@ -25,10 +25,3 @@ CLASS net/minecraft/class_5715 net/minecraft/world/event/listener/EntityGameEven METHOD method_42336 (Lnet/minecraft/class_3218;Lnet/minecraft/class_4076;)V ARG 2 sectionPos METHOD method_43152 getListener ()Lnet/minecraft/class_5714; - METHOD method_43153 setListener (Lnet/minecraft/class_5714;Lnet/minecraft/class_1937;)V - ARG 1 listener - ARG 2 world - METHOD method_43154 (Lnet/minecraft/class_5714;Lnet/minecraft/class_5713;)V - ARG 1 dispatcher - METHOD method_43155 (Lnet/minecraft/class_5714;Lnet/minecraft/class_5713;)V - ARG 1 dispatcher diff --git a/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping b/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping index aba72e3183..b390d5c6d6 100644 --- a/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping +++ b/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_5711 net/minecraft/world/event/listener/SimpleGameEven FIELD field_37673 toRemove Ljava/util/Set; FIELD field_37674 toAdd Ljava/util/List; FIELD field_37675 dispatching Z - METHOD (Lnet/minecraft/class_3218;)V + METHOD (Lnet/minecraft/class_3218;ILnet/minecraft/class_5711$class_8512;)V ARG 1 world METHOD method_32936 dispatchTo (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_5714;)Ljava/util/Optional; ARG 0 world diff --git a/mappings/net/minecraft/world/event/listener/VibrationListener.mapping b/mappings/net/minecraft/world/event/listener/VibrationListener.mapping deleted file mode 100644 index f687c7ca34..0000000000 --- a/mappings/net/minecraft/world/event/listener/VibrationListener.mapping +++ /dev/null @@ -1,88 +0,0 @@ -CLASS net/minecraft/class_5718 net/minecraft/world/event/listener/VibrationListener - FIELD field_28187 positionSource Lnet/minecraft/class_5716; - FIELD field_28189 callback Lnet/minecraft/class_5718$class_5719; - FIELD field_28192 delay I - FIELD field_40356 FREQUENCIES Lit/unimi/dsi/fastutil/objects/Object2IntMap; - FIELD field_40357 vibration Lnet/minecraft/class_7269; - FIELD field_40358 selector Lnet/minecraft/class_7722; - FIELD field_43323 RESONATIONS [Lnet/minecraft/class_5712; - METHOD (Lnet/minecraft/class_5716;Lnet/minecraft/class_5718$class_5719;)V - ARG 1 positionSource - ARG 2 callback - METHOD (Lnet/minecraft/class_5716;Lnet/minecraft/class_5718$class_5719;Lnet/minecraft/class_7269;Lnet/minecraft/class_7722;I)V - ARG 1 positionSource - ARG 2 callback - ARG 3 vibration - ARG 4 selector - ARG 5 delay - METHOD method_32964 tick (Lnet/minecraft/class_1937;)V - ARG 1 world - METHOD method_32966 isOccluded (Lnet/minecraft/class_1937;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z - ARG 0 world - ARG 1 start - ARG 2 end - METHOD method_32967 (Lnet/minecraft/class_2680;)Z - ARG 0 state - METHOD method_42340 createCodec (Lnet/minecraft/class_5718$class_5719;)Lcom/mojang/serialization/Codec; - ARG 0 callback - METHOD method_42341 (Lnet/minecraft/class_5718$class_5719;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 1 instance - METHOD method_42342 (Lnet/minecraft/class_5718$class_5719;Lnet/minecraft/class_5716;Ljava/util/Optional;Lnet/minecraft/class_7722;Ljava/lang/Integer;)Lnet/minecraft/class_5718; - ARG 1 positionSource - METHOD method_42343 (Lnet/minecraft/class_5718;)Ljava/lang/Integer; - ARG 0 listener - METHOD method_42345 (Lnet/minecraft/class_5718;)Ljava/util/Optional; - ARG 0 listener - METHOD method_42347 (Lnet/minecraft/class_5718;)Lnet/minecraft/class_5716; - ARG 0 listener - METHOD method_45494 trySelect (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V - ARG 1 world - ARG 2 event - ARG 3 emitter - ARG 4 emitterPos - ARG 5 listenerPos - METHOD method_45495 (Lnet/minecraft/class_3218;Lnet/minecraft/class_7269;)V - ARG 2 vibration - METHOD method_45496 getFrequency (Lnet/minecraft/class_5712;)I - ARG 0 event - METHOD method_45497 (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V - ARG 0 frequencies - METHOD method_45498 forceListen (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;)V - ARG 1 world - ARG 2 event - ARG 3 emitter - ARG 4 emitterPos - METHOD method_45499 (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V - ARG 5 listenerPos - METHOD method_45500 (Lnet/minecraft/class_5718;)Lnet/minecraft/class_7722; - ARG 0 listener - METHOD method_49881 getResonation (I)Lnet/minecraft/class_5712; - ARG 0 frequency - METHOD method_49882 getCallback ()Lnet/minecraft/class_5718$class_5719; - METHOD method_51178 getDistanceBetween (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)F - ARG 0 a - ARG 1 b - CLASS class_5719 Callback - METHOD method_32969 accept (Lnet/minecraft/class_3218;Lnet/minecraft/class_5714;Lnet/minecraft/class_2338;Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;F)V - COMMENT Accepts a game event after delay. - ARG 1 world - ARG 2 listener - ARG 3 pos - ARG 4 event - ARG 5 entity - ARG 6 sourceEntity - ARG 7 distance - METHOD method_32970 accepts (Lnet/minecraft/class_3218;Lnet/minecraft/class_5714;Lnet/minecraft/class_2338;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;)Z - COMMENT Returns whether the callback wants to accept this event. - ARG 1 world - ARG 2 listener - ARG 3 pos - ARG 4 event - ARG 5 emitter - METHOD method_42210 getTag ()Lnet/minecraft/class_6862; - METHOD method_42324 canAccept (Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;)Z - ARG 1 gameEvent - ARG 2 emitter - METHOD method_42672 onListen ()V - METHOD method_43695 triggersAvoidCriterion ()Z - METHOD method_49797 getRange ()I diff --git a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping index f8f4db6e95..d0ab475a46 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping @@ -52,9 +52,7 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage ARG 1 pos METHOD method_19133 isOccupied (J)Z ARG 1 pos - METHOD method_19510 initForPalette (Lnet/minecraft/class_1923;Lnet/minecraft/class_2826;)V - ARG 1 chunkPos - ARG 2 chunkSection + METHOD method_19510 initForPalette (Lnet/minecraft/class_4076;Lnet/minecraft/class_2826;)V METHOD method_19511 (Lnet/minecraft/class_2826;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;)V ARG 2 pos METHOD method_19512 (Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)V