From 1178838eb40306377abc187df328cfca559098f4 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sun, 15 Oct 2023 03:02:34 +0900 Subject: [PATCH] Map everything else --- mappings/net/minecraft/block/AbstractBlock.mapping | 6 ++++++ .../client/gui/screen/world/WorldListWidget.mapping | 2 ++ .../gui/tooltip/FocusedTooltipPositioner.mapping | 3 +++ .../minecraft/client/gui/tooltip/Tooltip.mapping | 13 +++++++++++++ .../gui/tooltip/WidgetTooltipPositioner.mapping | 3 +++ mappings/net/minecraft/test/GameTestState.mapping | 4 ++++ mappings/net/minecraft/util/Colors.mapping | 2 ++ mappings/net/minecraft/util/ItemScatterer.mapping | 7 +++++++ .../net/minecraft/util/dynamic/RuntimeOps.mapping | 2 +- .../minecraft/world/CommandBlockExecutor.mapping | 1 + .../world/level/storage/LevelSummary.mapping | 6 +++--- 11 files changed, 45 insertions(+), 4 deletions(-) diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 3d461a2bbe..d1da2c1e52 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -497,8 +497,14 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT is removed, or to drop the contents of an inventory. The check {@code COMMENT state.isOf(newState.getBlock())} can be used to see if the block was removed or not. COMMENT + COMMENT

For most block entities, {@link net.minecraft.util.ItemScatterer#onStateReplaced} + COMMENT provides a good implementation of this method. Make sure to call {@code + COMMENT super.onStateReplaced(state, world, pos, newState, moved);} after + COMMENT invoking {@code ItemScatterer} methods. + COMMENT COMMENT @deprecated Consider calling {@link AbstractBlockState#onStateReplaced} instead. See why these methods are deprecated. COMMENT + COMMENT @see net.minecraft.util.ItemScatterer#onStateReplaced COMMENT @see net.minecraft.util.ItemScatterer#spawn(World, BlockPos, net.minecraft.inventory.Inventory) COMMENT @see #onBlockAdded ARG 1 state diff --git a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping index 548e68d1db..bd9567a375 100644 --- a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping @@ -84,6 +84,8 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWid METHOD method_35740 getLevelDisplayName ()Ljava/lang/String; METHOD method_52205 loadIcon ()V METHOD method_52265 validateIconPath ()V + METHOD method_54386 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 0 style CLASS class_7414 Entry METHOD method_43465 isAvailable ()Z CLASS class_7415 LoadingEntry diff --git a/mappings/net/minecraft/client/gui/tooltip/FocusedTooltipPositioner.mapping b/mappings/net/minecraft/client/gui/tooltip/FocusedTooltipPositioner.mapping index f1c27f0937..a76a333083 100644 --- a/mappings/net/minecraft/client/gui/tooltip/FocusedTooltipPositioner.mapping +++ b/mappings/net/minecraft/client/gui/tooltip/FocusedTooltipPositioner.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_7999 net/minecraft/client/gui/tooltip/FocusedTooltipPositioner + FIELD field_46722 focus Lnet/minecraft/class_8030; + METHOD (Lnet/minecraft/class_8030;)V + ARG 1 focus diff --git a/mappings/net/minecraft/client/gui/tooltip/Tooltip.mapping b/mappings/net/minecraft/client/gui/tooltip/Tooltip.mapping index c88af69894..c200a970a8 100644 --- a/mappings/net/minecraft/client/gui/tooltip/Tooltip.mapping +++ b/mappings/net/minecraft/client/gui/tooltip/Tooltip.mapping @@ -3,6 +3,9 @@ CLASS net/minecraft/class_7919 net/minecraft/client/gui/tooltip/Tooltip FIELD field_41102 content Lnet/minecraft/class_2561; FIELD field_41103 lines Ljava/util/List; FIELD field_41104 narration Lnet/minecraft/class_2561; + FIELD field_46719 delay I + FIELD field_46720 renderCheckTime J + FIELD field_46721 prevShouldRender Z METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 1 content ARG 2 narration @@ -16,3 +19,13 @@ CLASS net/minecraft/class_7919 net/minecraft/client/gui/tooltip/Tooltip METHOD method_47408 of (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7919; ARG 0 content ARG 1 narration + METHOD method_54383 setDelay (I)V + ARG 1 delay + METHOD method_54384 render (ZZLnet/minecraft/class_8030;)V + ARG 1 hovered + ARG 2 focused + ARG 3 focus + METHOD method_54385 createPositioner (ZZLnet/minecraft/class_8030;)Lnet/minecraft/class_8000; + ARG 1 hovered + ARG 2 focused + ARG 3 focus diff --git a/mappings/net/minecraft/client/gui/tooltip/WidgetTooltipPositioner.mapping b/mappings/net/minecraft/client/gui/tooltip/WidgetTooltipPositioner.mapping index eddbbc2e3a..1ccf2fbe94 100644 --- a/mappings/net/minecraft/client/gui/tooltip/WidgetTooltipPositioner.mapping +++ b/mappings/net/minecraft/client/gui/tooltip/WidgetTooltipPositioner.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_8092 net/minecraft/client/gui/tooltip/WidgetTooltipPositioner + FIELD field_46723 focus Lnet/minecraft/class_8030; + METHOD (Lnet/minecraft/class_8030;)V + ARG 1 focus METHOD method_48642 getOffsetY (III)I ARG 0 tooltipY ARG 1 widgetY diff --git a/mappings/net/minecraft/test/GameTestState.mapping b/mappings/net/minecraft/test/GameTestState.mapping index 7ae96a1af9..729a6f6e42 100644 --- a/mappings/net/minecraft/test/GameTestState.mapping +++ b/mappings/net/minecraft/test/GameTestState.mapping @@ -73,3 +73,7 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState METHOD method_54145 shouldRerunUntilFailed ()Z METHOD method_54146 setRerunUntilFailed (Z)V ARG 1 rerunUntilFailed + METHOD method_54434 (Lnet/minecraft/class_1297;)V + ARG 0 entity + METHOD method_54435 (Lnet/minecraft/class_1297;)Z + ARG 0 entity diff --git a/mappings/net/minecraft/util/Colors.mapping b/mappings/net/minecraft/util/Colors.mapping index 0bd2870428..6497431500 100644 --- a/mappings/net/minecraft/util/Colors.mapping +++ b/mappings/net/minecraft/util/Colors.mapping @@ -10,3 +10,5 @@ CLASS net/minecraft/class_8012 net/minecraft/util/Colors COMMENT Represents the color gray, {@code 0xFF808080}. FIELD field_45073 LIGHT_GRAY I COMMENT Represents the color light gray, {@code 0xFFA0A0A0}. + FIELD field_46652 LIGHT_RED I + COMMENT Represents the color light red, {@code 0xFFDF5050}. diff --git a/mappings/net/minecraft/util/ItemScatterer.mapping b/mappings/net/minecraft/util/ItemScatterer.mapping index bae661b625..49f15a0274 100644 --- a/mappings/net/minecraft/util/ItemScatterer.mapping +++ b/mappings/net/minecraft/util/ItemScatterer.mapping @@ -12,6 +12,13 @@ CLASS net/minecraft/class_1264 net/minecraft/util/ItemScatterer ARG 1 pos ARG 2 stacks METHOD method_54291 onStateReplaced (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + COMMENT Implementation {@link net.minecraft.block.AbstractBlock#onStateReplaced}. + COMMENT This assumes that the block has a corresponding block entity. + COMMENT + COMMENT

If the block changes, this {@linkplain #spawn(World, BlockPos, Inventory) spawns} + COMMENT item entities around the block and updates redstone comparators. + COMMENT + COMMENT @see net.minecraft.block.AbstractBlock#onStateReplaced ARG 0 state ARG 1 newState ARG 2 world diff --git a/mappings/net/minecraft/util/dynamic/RuntimeOps.mapping b/mappings/net/minecraft/util/dynamic/RuntimeOps.mapping index c48b204ec3..d923310830 100644 --- a/mappings/net/minecraft/util/dynamic/RuntimeOps.mapping +++ b/mappings/net/minecraft/util/dynamic/RuntimeOps.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_8806 net/minecraft/util/dynamic/RuntimeOps COMMENT COMMENT

The objects must be one of: numbers, booleans, string, {@link Map}, {@link List}, COMMENT {@link it.unimi.dsi.fastutil.bytes.ByteList}, {@link - COMMENT it.unimi.dsi.fastutil.bytes.IntList}, or {@link it.unimi.dsi.fastutil.bytes.LongList}. + COMMENT it.unimi.dsi.fastutil.ints.IntList}, or {@link it.unimi.dsi.fastutil.longs.LongList}. COMMENT Arrays are not supported. COMMENT COMMENT @see Codecs#BASIC_OBJECT diff --git a/mappings/net/minecraft/world/CommandBlockExecutor.mapping b/mappings/net/minecraft/world/CommandBlockExecutor.mapping index 8877159b49..9443c1503c 100644 --- a/mappings/net/minecraft/world/CommandBlockExecutor.mapping +++ b/mappings/net/minecraft/world/CommandBlockExecutor.mapping @@ -29,6 +29,7 @@ CLASS net/minecraft/class_1918 net/minecraft/world/CommandBlockExecutor METHOD method_8292 getLastOutput ()Lnet/minecraft/class_2561; METHOD method_8293 getWorld ()Lnet/minecraft/class_3218; METHOD method_8294 (Lnet/minecraft/class_2168;ZI)V + ARG 1 context ARG 2 success ARG 3 result METHOD method_8295 markDirty ()V diff --git a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping index 47d8c70fee..f4851db57c 100644 --- a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping @@ -41,14 +41,14 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary ARG 0 style CLASS class_5781 ConversionWarning FIELD field_28440 backup Z - FIELD field_28441 boldRedFormatting Z + FIELD field_28441 dangerous Z FIELD field_28442 translationKeySuffix Ljava/lang/String; METHOD (Ljava/lang/String;IZZLjava/lang/String;)V ARG 3 backup - ARG 4 boldRedFormatting + ARG 4 dangerous ARG 5 translationKeySuffix METHOD method_33406 promptsBackup ()Z - METHOD method_33407 needsBoldRedFormatting ()Z + METHOD method_33407 isDangerous ()Z METHOD method_33408 getTranslationKeySuffix ()Ljava/lang/String; CLASS class_8578 SymlinkLevelSummary METHOD (Ljava/lang/String;Ljava/nio/file/Path;)V