diff --git a/build.gradle b/build.gradle index ec9c47482d..0e88804482 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "1.20.5-pre1" +def minecraft_version = "1.20.5-pre2" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 690d311494..5de9c73c41 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -185,14 +185,13 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_46552 startTime J FIELD field_46553 uptimeInTicks J FIELD field_47680 userPropertiesFuture Ljava/util/concurrent/CompletableFuture; - FIELD field_49473 NBT_TOOLTIP_TEXT Lnet/minecraft/class_2561; FIELD field_50035 mapDecorationsAtlasManager Lnet/minecraft/class_9443; METHOD (Lnet/minecraft/class_542;)V ARG 1 args METHOD method_1478 getResourceManager ()Lnet/minecraft/class_3300; METHOD method_1479 getResourcePackDir ()Ljava/nio/file/Path; METHOD method_1480 getItemRenderer ()Lnet/minecraft/class_918; - METHOD method_1481 joinWorld (Lnet/minecraft/class_638;)V + METHOD method_1481 joinWorld (Lnet/minecraft/class_638;Lnet/minecraft/class_434$class_9678;)V ARG 1 world METHOD method_1483 getSoundManager ()Lnet/minecraft/class_1144; METHOD method_1484 getSearchProvider (Lnet/minecraft/class_1124$class_1125;)Lnet/minecraft/class_1129; diff --git a/mappings/net/minecraft/client/font/FreeTypeUtil.mapping b/mappings/net/minecraft/client/font/FreeTypeUtil.mapping index 75f7c9c9ad..8c5e1843ff 100644 --- a/mappings/net/minecraft/client/font/FreeTypeUtil.mapping +++ b/mappings/net/minecraft/client/font/FreeTypeUtil.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_9111 net/minecraft/client/font/FreeTypeUtil METHOD method_56143 initialize ()J METHOD method_56144 getErrorMessage (I)Ljava/lang/String; ARG 0 code - METHOD method_56145 checkError (ILjava/lang/String;)V + METHOD method_56145 checkError (ILjava/lang/String;)Z ARG 0 code ARG 1 description METHOD method_56146 getX (Lorg/lwjgl/util/freetype/FT_Vector;)F diff --git a/mappings/net/minecraft/client/gui/screen/DownloadingTerrainScreen.mapping b/mappings/net/minecraft/client/gui/screen/DownloadingTerrainScreen.mapping index ed37e876ae..75167f2ffe 100644 --- a/mappings/net/minecraft/client/gui/screen/DownloadingTerrainScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/DownloadingTerrainScreen.mapping @@ -3,5 +3,5 @@ CLASS net/minecraft/class_434 net/minecraft/client/gui/screen/DownloadingTerrain FIELD field_36365 MIN_LOAD_TIME_MS J FIELD field_36368 loadStartTime J FIELD field_46575 shouldClose Ljava/util/function/BooleanSupplier; - METHOD (Ljava/util/function/BooleanSupplier;)V + METHOD (Ljava/util/function/BooleanSupplier;Lnet/minecraft/class_434$class_9678;)V ARG 1 shouldClose diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 4b0d498759..2b8faa9208 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -136,7 +136,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand ARG 1 payload METHOD method_53876 createEntity (Lnet/minecraft/class_2604;)Lnet/minecraft/class_1297; ARG 1 packet - METHOD method_54133 startWorldLoading (Lnet/minecraft/class_746;Lnet/minecraft/class_638;)V + METHOD method_54133 startWorldLoading (Lnet/minecraft/class_746;Lnet/minecraft/class_638;Lnet/minecraft/class_434$class_9678;)V ARG 1 player ARG 2 world METHOD method_54134 clearWorld ()V diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index 1f46de7366..c8449d50fc 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -524,15 +524,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions ARG 0 value METHOD method_42568 (Ljava/lang/Double;)V ARG 0 value - METHOD method_42726 (Lnet/minecraft/class_2561;Ljava/lang/Double;)Lnet/minecraft/class_2561; - ARG 0 optionText - ARG 1 value - METHOD method_42727 (Lnet/minecraft/class_2561;Ljava/lang/Double;)Lnet/minecraft/class_2561; - ARG 0 optionText - ARG 1 value - METHOD method_42728 (Lnet/minecraft/class_2561;Ljava/lang/Double;)Lnet/minecraft/class_2561; - ARG 0 optionText - ARG 1 value METHOD method_44026 getOnlyShowSecureChat ()Lnet/minecraft/class_7172; METHOD method_45575 (Lnet/minecraft/class_3419;Ljava/lang/Double;)V ARG 1 value @@ -543,9 +534,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions ARG 1 soundVolumeLevels METHOD method_45578 getSoundVolumeOption (Lnet/minecraft/class_3419;)Lnet/minecraft/class_7172; ARG 1 category - METHOD method_45579 (Lnet/minecraft/class_2561;Ljava/lang/Double;)Lnet/minecraft/class_2561; - ARG 0 prefix - ARG 1 value METHOD method_45580 (Ljava/lang/Double;)V ARG 0 value METHOD method_45581 getPanoramaSpeed ()Lnet/minecraft/class_7172; @@ -578,18 +566,9 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions METHOD method_48581 getGlintStrength ()Lnet/minecraft/class_7172; METHOD method_48582 (Ljava/lang/Double;)V ARG 0 value - METHOD method_48583 (Lnet/minecraft/class_2561;Ljava/lang/Double;)Lnet/minecraft/class_2561; - ARG 0 optionText - ARG 1 value - METHOD method_48584 (Lnet/minecraft/class_2561;Ljava/lang/Double;)Lnet/minecraft/class_2561; - ARG 0 optionText - ARG 1 value METHOD method_48974 getDamageTiltStrength ()Lnet/minecraft/class_7172; METHOD method_48975 (Ljava/lang/Double;)V ARG 0 value - METHOD method_48976 (Lnet/minecraft/class_2561;Ljava/lang/Double;)Lnet/minecraft/class_2561; - ARG 0 optionText - ARG 1 value METHOD method_49598 refreshResourcePacks (Lnet/minecraft/class_3283;)V ARG 1 resourcePackManager METHOD method_49599 (Ljava/lang/Boolean;)V diff --git a/mappings/net/minecraft/client/particle/AbstractDustParticle.mapping b/mappings/net/minecraft/client/particle/AbstractDustParticle.mapping index e582ce0391..25e29326e9 100644 --- a/mappings/net/minecraft/client/particle/AbstractDustParticle.mapping +++ b/mappings/net/minecraft/client/particle/AbstractDustParticle.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_5736 net/minecraft/client/particle/AbstractDustParticle FIELD field_28247 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_5744;Lnet/minecraft/class_4002;)V + METHOD (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_9679;Lnet/minecraft/class_4002;)V ARG 1 world ARG 2 x ARG 4 y diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index 6af5c7bc1a..8abc377966 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -399,7 +399,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer METHOD method_56846 getRenderTypeCloudsProgram ()Lnet/minecraft/class_5944; METHOD method_57796 renderBlur (F)V ARG 1 delta - METHOD method_57797 loadBlurPostProcessor ()V + METHOD method_57797 loadBlurPostProcessor (Lnet/minecraft/class_5912;)V CLASS 1 METHOD method_45775 (Lnet/minecraft/class_2960;)Z ARG 0 id diff --git a/mappings/net/minecraft/client/texture/NativeImage.mapping b/mappings/net/minecraft/client/texture/NativeImage.mapping index a9d87f4b92..769dd09b3a 100644 --- a/mappings/net/minecraft/client/texture/NativeImage.mapping +++ b/mappings/net/minecraft/client/texture/NativeImage.mapping @@ -131,7 +131,7 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage COMMENT @return the color, with red at smallest and alpha at biggest bits ARG 1 x ARG 2 y - METHOD method_4316 makeGlyphBitmapSubpixel (Lorg/lwjgl/util/freetype/FT_Face;I)V + METHOD method_4316 makeGlyphBitmapSubpixel (Lorg/lwjgl/util/freetype/FT_Face;I)Z ARG 1 face ARG 2 glyphIndex METHOD method_4317 copyFrom (Lnet/minecraft/class_1011;)V diff --git a/mappings/net/minecraft/command/argument/MessageArgumentType.mapping b/mappings/net/minecraft/command/argument/MessageArgumentType.mapping index c242a61b9a..23f926eb86 100644 --- a/mappings/net/minecraft/command/argument/MessageArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/MessageArgumentType.mapping @@ -24,13 +24,13 @@ CLASS net/minecraft/class_2196 net/minecraft/command/argument/MessageArgumentTyp METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; ARG 1 reader CLASS class_2197 MessageFormat - FIELD field_9877 contents Ljava/lang/String; - FIELD field_9878 selectors [Lnet/minecraft/class_2196$class_2198; + FIELD comp_2653 contents Ljava/lang/String; + FIELD comp_2654 selectors [Lnet/minecraft/class_2196$class_2198; METHOD (Ljava/lang/String;[Lnet/minecraft/class_2196$class_2198;)V ARG 1 contents ARG 2 selectors - METHOD method_35691 getContents ()Ljava/lang/String; - METHOD method_35692 getSelectors ()[Lnet/minecraft/class_2196$class_2198; + METHOD comp_2653 contents ()Ljava/lang/String; + METHOD comp_2654 selectors ()[Lnet/minecraft/class_2196$class_2198; METHOD method_44268 format (Lnet/minecraft/class_2168;)Lnet/minecraft/class_2561; ARG 1 source METHOD method_9341 format (Lnet/minecraft/class_2168;Z)Lnet/minecraft/class_2561; @@ -40,15 +40,15 @@ CLASS net/minecraft/class_2196 net/minecraft/command/argument/MessageArgumentTyp ARG 0 reader ARG 1 canUseSelectors CLASS class_2198 MessageSelector - FIELD field_9879 end I - FIELD field_9880 start I - FIELD field_9881 selector Lnet/minecraft/class_2300; + FIELD comp_2655 start I + FIELD comp_2656 end I + FIELD comp_2657 selector Lnet/minecraft/class_2300; METHOD (IILnet/minecraft/class_2300;)V ARG 1 start ARG 2 end ARG 3 selector - METHOD method_35693 getSelector ()Lnet/minecraft/class_2300; - METHOD method_9343 getStart ()I - METHOD method_9344 getEnd ()I + METHOD comp_2655 start ()I + METHOD comp_2656 end ()I + METHOD comp_2657 selector ()Lnet/minecraft/class_2300; METHOD method_9345 format (Lnet/minecraft/class_2168;)Lnet/minecraft/class_2561; ARG 1 source diff --git a/mappings/net/minecraft/component/type/WritableBookContentComponent.mapping b/mappings/net/minecraft/component/type/WritableBookContentComponent.mapping index 61fbad777a..36fc9c512b 100644 --- a/mappings/net/minecraft/component/type/WritableBookContentComponent.mapping +++ b/mappings/net/minecraft/component/type/WritableBookContentComponent.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_9301 net/minecraft/component/type/WritableBookContentComponent + FIELD comp_2418 pages Ljava/util/List; FIELD field_49369 DEFAULT Lnet/minecraft/class_9301; FIELD field_49370 MAX_PAGE_LENGTH I FIELD field_49371 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping b/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping index 8b464d90e9..75bb1d09e8 100644 --- a/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping +++ b/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_9302 net/minecraft/component/type/WrittenBookContentComponent + FIELD comp_2422 pages Ljava/util/List; FIELD field_49375 MAX_SERIALIZED_PAGE_LENGTH I FIELD field_49378 MAX_TITLE_LENGTH I FIELD field_49379 MAX_GENERATION I diff --git a/mappings/net/minecraft/datafixer/fix/ItemStackComponentizationFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemStackComponentizationFix.mapping index 0f1a7aeeaa..2323d0d6f7 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemStackComponentizationFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemStackComponentizationFix.mapping @@ -105,8 +105,6 @@ CLASS net/minecraft/class_9267 net/minecraft/datafixer/fix/ItemStackComponentiza ARG 1 explosionDynamic METHOD method_57245 (Lnet/minecraft/class_9267$class_9268;Lcom/mojang/serialization/Dynamic;)V ARG 1 skullOwnerDynamic - METHOD method_57246 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; - ARG 0 typeDynamic METHOD method_57247 (Lnet/minecraft/class_9267$class_9268;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 1 blockEntityTagDynamic METHOD method_57248 (Lcom/mojang/serialization/Dynamic;)Ljava/lang/String; diff --git a/mappings/net/minecraft/datafixer/schema/Schema702.mapping b/mappings/net/minecraft/datafixer/schema/Schema702.mapping index f076762b89..710f66793a 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema702.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema702.mapping @@ -2,9 +2,5 @@ CLASS net/minecraft/class_1248 net/minecraft/datafixer/schema/Schema702 METHOD (ILcom/mojang/datafixers/schemas/Schema;)V ARG 1 versionKey ARG 2 parent - METHOD method_5292 targetEntityItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V - ARG 0 schema - ARG 1 map - ARG 2 entityId METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; ARG 1 schema diff --git a/mappings/net/minecraft/loot/function/SetFireworksLootFunction.mapping b/mappings/net/minecraft/loot/function/SetFireworksLootFunction.mapping index 9ce05ae954..2067edc098 100644 --- a/mappings/net/minecraft/loot/function/SetFireworksLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetFireworksLootFunction.mapping @@ -1,21 +1,14 @@ CLASS net/minecraft/class_9376 net/minecraft/loot/function/SetFireworksLootFunction FIELD field_49881 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_49882 DEFAULT_FIREWORKS Lnet/minecraft/class_9284; - FIELD field_49883 explosions Ljava/util/List; - FIELD field_49884 operation Lnet/minecraft/class_9368; + FIELD field_49883 explosions Ljava/util/Optional; FIELD field_49885 flightDuration Ljava/util/Optional; - METHOD (Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_9368;Ljava/util/Optional;)V + METHOD (Ljava/util/List;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 conditions - ARG 2 explosions - ARG 3 operation - ARG 4 flightDuration METHOD method_58212 apply (Lnet/minecraft/class_9284;)Lnet/minecraft/class_9284; - ARG 1 current - METHOD method_58213 (Lnet/minecraft/class_9376;)Ljava/util/Optional; - ARG 0 function METHOD method_58214 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_58215 (Lnet/minecraft/class_9376;)Lnet/minecraft/class_9368; + METHOD method_58215 (Lnet/minecraft/class_9376;)Ljava/util/Optional; ARG 0 function - METHOD method_58216 (Lnet/minecraft/class_9376;)Ljava/util/List; + METHOD method_58216 (Lnet/minecraft/class_9376;)Ljava/util/Optional; ARG 0 function diff --git a/mappings/net/minecraft/nbt/visitor/NbtTextFormatter.mapping b/mappings/net/minecraft/nbt/visitor/NbtTextFormatter.mapping index 76c1f8d110..98c586bb30 100644 --- a/mappings/net/minecraft/nbt/visitor/NbtTextFormatter.mapping +++ b/mappings/net/minecraft/nbt/visitor/NbtTextFormatter.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_5628 net/minecraft/nbt/visitor/NbtTextFormatter FIELD field_33276 CURLY_OPEN_BRACKET Ljava/lang/String; FIELD field_33277 CURLY_CLOSE_BRACKET Ljava/lang/String; FIELD field_33278 NEW_LINE Ljava/lang/String; - METHOD (Ljava/lang/String;I)V + METHOD (Ljava/lang/String;II)V ARG 1 prefix ARG 2 indentationLevel METHOD method_32304 escapeName (Ljava/lang/String;)Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping index 1529dc25cc..36da1c63b7 100644 --- a/mappings/net/minecraft/network/ClientConnection.mapping +++ b/mappings/net/minecraft/network/ClientConnection.mapping @@ -116,10 +116,9 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection ARG 0 marker METHOD method_45082 (Lnet/minecraft/class_7648;Lio/netty/util/concurrent/Future;)V ARG 2 future - METHOD method_48311 addHandlers (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/class_2598;Lnet/minecraft/class_8762;)V + METHOD method_48311 addHandlers (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/class_2598;ZLnet/minecraft/class_8762;)V ARG 0 pipeline ARG 1 side - ARG 2 packetSizeLogger METHOD method_52271 connect (Ljava/net/InetSocketAddress;ZLnet/minecraft/class_2535;)Lio/netty/channel/ChannelFuture; ARG 0 address ARG 1 useEpoll diff --git a/mappings/net/minecraft/network/listener/PacketListener.mapping b/mappings/net/minecraft/network/listener/PacketListener.mapping index fcc34bf816..df5ebe3f00 100644 --- a/mappings/net/minecraft/network/listener/PacketListener.mapping +++ b/mappings/net/minecraft/network/listener/PacketListener.mapping @@ -9,18 +9,6 @@ CLASS net/minecraft/class_2547 net/minecraft/network/listener/PacketListener COMMENT Can be used to display the disconnection reason. ARG 1 reason COMMENT the reason of disconnection; may be a generic message - METHOD method_40065 shouldCrashOnException ()Z - COMMENT {@return whether uncaught exceptions in main thread should crash the game - COMMENT instead of logging and ignoring them} - COMMENT - COMMENT @implNote This is {@code true} by default. - COMMENT - COMMENT @apiNote This only affects the processing on the main thread done by calling - COMMENT methods in {@link net.minecraft.network.NetworkThreadUtils}. Uncaught exceptions - COMMENT in other threads or processing in the main thread using the {@code client.execute(() -> {})} - COMMENT code will be unaffected, and always gets logged without crashing. - COMMENT - COMMENT @see ServerPacketListener METHOD method_48106 isConnectionOpen ()Z METHOD method_52280 getPhase ()Lnet/minecraft/class_2539; METHOD method_52413 accepts (Lnet/minecraft/class_2596;)Z diff --git a/mappings/net/minecraft/network/packet/c2s/play/ButtonClickC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ButtonClickC2SPacket.mapping index 975980dff7..c86c38ab0a 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ButtonClickC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ButtonClickC2SPacket.mapping @@ -1,13 +1,6 @@ CLASS net/minecraft/class_2811 net/minecraft/network/packet/c2s/play/ButtonClickC2SPacket - FIELD field_12812 buttonId I - FIELD field_12813 syncId I + FIELD comp_2649 syncId I + FIELD comp_2650 buttonId I FIELD field_48188 CODEC Lnet/minecraft/class_9139; - METHOD (II)V - ARG 1 syncId - ARG 2 buttonId - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_12186 getButtonId ()I - METHOD method_12187 getSyncId ()I - METHOD method_55970 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD comp_2649 syncId ()I + METHOD comp_2650 buttonId ()I diff --git a/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping index 67f96b6ec5..2561224bf1 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2873 net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket - FIELD comp_2609 slot I + FIELD comp_2609 slot S FIELD comp_2610 stack Lnet/minecraft/class_1799; FIELD field_48219 CODEC Lnet/minecraft/class_9139; - METHOD comp_2609 slot ()I + METHOD comp_2609 slot ()S METHOD comp_2610 stack ()Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping b/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping deleted file mode 100644 index 9d452f8472..0000000000 --- a/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS net/minecraft/class_5744 net/minecraft/particle/AbstractDustParticleEffect - FIELD field_28273 color Lorg/joml/Vector3f; - FIELD field_28274 scale F - FIELD field_33114 MIN_SCALE F - FIELD field_33115 MAX_SCALE F - METHOD (Lorg/joml/Vector3f;F)V - ARG 1 color - ARG 2 scale - METHOD method_33118 readColor (Lcom/mojang/brigadier/StringReader;)Lorg/joml/Vector3f; - ARG 0 reader - METHOD method_33119 getColor ()Lorg/joml/Vector3f; - METHOD method_33120 getScale ()F diff --git a/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping b/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping index bcfb147716..22eaf95dc0 100644 --- a/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping +++ b/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping @@ -5,21 +5,16 @@ CLASS net/minecraft/class_5743 net/minecraft/particle/DustColorTransitionParticl FIELD field_28271 toColor Lorg/joml/Vector3f; FIELD field_48454 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Lorg/joml/Vector3f;Lorg/joml/Vector3f;F)V - ARG 1 fromColor ARG 2 toColor ARG 3 scale METHOD method_33107 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_33108 (Lnet/minecraft/class_5743;)Ljava/lang/Float; - ARG 0 effect METHOD method_33109 (Lnet/minecraft/class_5743;)Lorg/joml/Vector3f; ARG 0 effect METHOD method_33110 getFromColor ()Lorg/joml/Vector3f; METHOD method_33111 (Lnet/minecraft/class_5743;)Lorg/joml/Vector3f; ARG 0 effect METHOD method_33112 getToColor ()Lorg/joml/Vector3f; - METHOD method_56171 (Lnet/minecraft/class_5743;)Ljava/lang/Float; - ARG 0 effect METHOD method_56172 (Lnet/minecraft/class_5743;)Lorg/joml/Vector3f; ARG 0 effect METHOD method_56173 (Lnet/minecraft/class_5743;)Lorg/joml/Vector3f; diff --git a/mappings/net/minecraft/particle/DustParticleEffect.mapping b/mappings/net/minecraft/particle/DustParticleEffect.mapping index b3607e291f..ef118bc05b 100644 --- a/mappings/net/minecraft/particle/DustParticleEffect.mapping +++ b/mappings/net/minecraft/particle/DustParticleEffect.mapping @@ -5,11 +5,7 @@ CLASS net/minecraft/class_2390 net/minecraft/particle/DustParticleEffect FIELD field_48455 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_33115 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_33116 (Lnet/minecraft/class_2390;)Ljava/lang/Float; - ARG 0 effect METHOD method_33117 (Lnet/minecraft/class_2390;)Lorg/joml/Vector3f; ARG 0 effect - METHOD method_56174 (Lnet/minecraft/class_2390;)Ljava/lang/Float; - ARG 0 effect METHOD method_56175 (Lnet/minecraft/class_2390;)Lorg/joml/Vector3f; ARG 0 effect diff --git a/mappings/net/minecraft/recipe/RecipeManager.mapping b/mappings/net/minecraft/recipe/RecipeManager.mapping index 8d10a6ed1a..f1b4a222bc 100644 --- a/mappings/net/minecraft/recipe/RecipeManager.mapping +++ b/mappings/net/minecraft/recipe/RecipeManager.mapping @@ -5,14 +5,13 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager FIELD field_19359 GSON Lcom/google/gson/Gson; FIELD field_36308 recipesById Ljava/util/Map; FIELD field_48848 registryLookup Lnet/minecraft/class_7225$class_7874; - FIELD field_9023 recipes Ljava/util/Map; FIELD field_9024 errored Z COMMENT This isn't quite indicating an errored state; its value is only set to COMMENT {@code false} and is never {@code true}, and isn't used anywhere. FIELD field_9027 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_7225$class_7874;)V ARG 1 registryLookup - METHOD method_17717 getAllOfType (Lnet/minecraft/class_3956;)Ljava/util/Map; + METHOD method_17717 getAllOfType (Lnet/minecraft/class_3956;)Ljava/util/Collection; ARG 1 type METHOD method_17720 deserialize (Lnet/minecraft/class_2960;Lcom/google/gson/JsonObject;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_8786; COMMENT Reads a recipe from a JSON object. @@ -28,10 +27,6 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager COMMENT the recipe's ID ARG 1 json ARG 2 registryLookup - METHOD method_17722 (Ljava/util/Map;)Ljava/util/stream/Stream; - ARG 0 map - METHOD method_17723 (Ljava/util/Map;)Ljava/util/stream/Stream; - ARG 0 map METHOD method_17877 getAllMatches (Lnet/minecraft/class_3956;Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;)Ljava/util/List; COMMENT Creates a list of all recipes of the given {@code type} that match the COMMENT given {@code inventory} and {@code world}. The list is ordered by the @@ -52,14 +47,6 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager COMMENT side recipes. ARG 1 recipes COMMENT the recipes to set - METHOD method_20703 (Ljava/util/Map$Entry;)Ljava/util/Map; - ARG 0 entry - METHOD method_20704 (Ljava/util/Map;Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_8786;)V - ARG 2 recipe - METHOD method_20706 (Lnet/minecraft/class_3956;)Ljava/util/Map; - ARG 0 t - METHOD method_20707 (Lnet/minecraft/class_3956;)Lcom/google/common/collect/ImmutableMap$Builder; - ARG 0 recipeType METHOD method_30027 listAllOfType (Lnet/minecraft/class_3956;)Ljava/util/List; COMMENT Creates a list of all recipes of the given {@code type}. The list has an COMMENT arbitrary order. @@ -75,15 +62,11 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager COMMENT return {@code false} without mods. METHOD method_42297 (Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;Lnet/minecraft/class_8786;)Z ARG 2 recipe - METHOD method_42298 (Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;Ljava/util/Map$Entry;)Z - ARG 2 entry METHOD method_42299 getFirstMatch (Lnet/minecraft/class_3956;Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;Lnet/minecraft/class_2960;)Ljava/util/Optional; ARG 1 type ARG 2 inventory ARG 3 world ARG 4 id - METHOD method_42300 (Ljava/util/Map$Entry;)Lcom/mojang/datafixers/util/Pair; - ARG 0 entry METHOD method_42301 (Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;Lnet/minecraft/class_8786;)Z ARG 2 recipe METHOD method_42302 createCachedMatchGetter (Lnet/minecraft/class_3956;)Lnet/minecraft/class_1863$class_7266; diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index b944739e6b..fa66b152c9 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -156,13 +156,10 @@ CLASS net/minecraft/server/MinecraftServer ARG 1 dataPacks METHOD method_29440 (Ljava/util/Collection;Lnet/minecraft/server/MinecraftServer$class_6897;)V ARG 2 resourceManagerHolder - METHOD method_29735 createDataPackSettings (Lnet/minecraft/class_3283;)Lnet/minecraft/class_5359; + METHOD method_29735 createDataPackSettings (Lnet/minecraft/class_3283;Z)Lnet/minecraft/class_5359; ARG 0 dataPackManager - METHOD method_29736 loadDataPacks (Lnet/minecraft/class_3283;Lnet/minecraft/class_5359;ZLnet/minecraft/class_7699;)Lnet/minecraft/class_7712; - ARG 0 resourcePackManager - ARG 1 dataPackSettings + METHOD method_29736 loadDataPacks (Lnet/minecraft/class_3283;Lnet/minecraft/class_7712;ZZ)Lnet/minecraft/class_7712; ARG 2 safeMode - ARG 3 enabledFeatures METHOD method_29738 (Ljava/util/Collection;Ljava/lang/String;)Z ARG 1 name METHOD method_29740 startServer (Ljava/util/function/Function;)Lnet/minecraft/server/MinecraftServer; @@ -421,8 +418,6 @@ CLASS net/minecraft/server/MinecraftServer COMMENT COMMENT @see MessageDecorator METHOD method_44301 getServicesSignatureVerifier ()Lnet/minecraft/class_7500; - METHOD method_46220 (Lnet/minecraft/class_3288;)Ljava/lang/String; - ARG 0 profile METHOD method_46221 getCombinedDynamicRegistries ()Lnet/minecraft/class_7780; METHOD method_46841 (Lnet/minecraft/class_3218;Lnet/minecraft/class_3215;Lnet/minecraft/class_5268;Lnet/minecraft/class_6880$class_6883;)V ARG 3 feature