From c19c99c109e71f8aa99ad40607354db2122de687 Mon Sep 17 00:00:00 2001 From: ByMartrixX <47987888+ByMartrixx@users.noreply.github.com> Date: Wed, 24 Mar 2021 15:15:45 -0300 Subject: [PATCH] Backport unmapped classes to release branch (#2183) --- mappings/net/minecraft/class_5423.mapping | 2 - mappings/net/minecraft/class_5459.mapping | 7 --- .../client/font/MultilineText.mapping | 46 +++++++++++++++++++ .../entity/ai/NavigationConditions.mapping | 3 ++ .../net/minecraft/world/PortalUtil.mapping | 46 +++++++++++++++++++ .../minecraft/world/RegistryWorldView.mapping | 8 ++++ 6 files changed, 103 insertions(+), 9 deletions(-) delete mode 100644 mappings/net/minecraft/class_5423.mapping delete mode 100644 mappings/net/minecraft/class_5459.mapping create mode 100644 mappings/net/minecraft/client/font/MultilineText.mapping create mode 100644 mappings/net/minecraft/entity/ai/NavigationConditions.mapping create mode 100644 mappings/net/minecraft/world/PortalUtil.mapping create mode 100644 mappings/net/minecraft/world/RegistryWorldView.mapping diff --git a/mappings/net/minecraft/class_5423.mapping b/mappings/net/minecraft/class_5423.mapping deleted file mode 100644 index e0cf1b55b3..0000000000 --- a/mappings/net/minecraft/class_5423.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_5423 - METHOD method_30349 getRegistryManager ()Lnet/minecraft/class_5455; diff --git a/mappings/net/minecraft/class_5459.mapping b/mappings/net/minecraft/class_5459.mapping deleted file mode 100644 index 97cd2357e6..0000000000 --- a/mappings/net/minecraft/class_5459.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_5459 - CLASS class_5461 IntBounds - FIELD field_25939 min I - FIELD field_25940 max I - METHOD (II)V - ARG 1 min - ARG 2 max diff --git a/mappings/net/minecraft/client/font/MultilineText.mapping b/mappings/net/minecraft/client/font/MultilineText.mapping new file mode 100644 index 0000000000..a2439a8ad5 --- /dev/null +++ b/mappings/net/minecraft/client/font/MultilineText.mapping @@ -0,0 +1,46 @@ +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 + ARG 2 x + ARG 3 y + METHOD method_30889 drawCenterWithShadow (Lnet/minecraft/class_4587;IIII)I + ARG 1 matrices + ARG 2 x + ARG 3 y + ARG 4 lineHeight + ARG 5 color + METHOD method_30890 create (Lnet/minecraft/class_327;Lnet/minecraft/class_5348;I)Lnet/minecraft/class_5489; + ARG 0 renderer + ARG 1 text + ARG 2 width + METHOD method_30891 create (Lnet/minecraft/class_327;Lnet/minecraft/class_5348;II)Lnet/minecraft/class_5489; + ARG 0 renderer + ARG 1 text + ARG 2 width + ARG 3 maxLines + 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 + ARG 2 x + ARG 3 y + ARG 4 lineHeight + ARG 5 color + METHOD method_30895 create (Lnet/minecraft/class_327;Ljava/util/List;)Lnet/minecraft/class_5489; + ARG 0 renderer + ARG 1 lines + METHOD method_30896 draw (Lnet/minecraft/class_4587;IIII)I + ARG 1 matrices + ARG 2 x + ARG 3 y + ARG 4 lineHeight + ARG 5 color + CLASS class_5490 Line + FIELD field_26531 text Lnet/minecraft/class_5481; + FIELD field_26532 width I + METHOD (Lnet/minecraft/class_5481;I)V + ARG 1 text + ARG 2 width diff --git a/mappings/net/minecraft/entity/ai/NavigationConditions.mapping b/mappings/net/minecraft/entity/ai/NavigationConditions.mapping new file mode 100644 index 0000000000..de1b3ef14e --- /dev/null +++ b/mappings/net/minecraft/entity/ai/NavigationConditions.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_5493 net/minecraft/entity/ai/NavigationConditions + METHOD method_30955 hasMobNavigation (Lnet/minecraft/class_1308;)Z + ARG 0 entity diff --git a/mappings/net/minecraft/world/PortalUtil.mapping b/mappings/net/minecraft/world/PortalUtil.mapping new file mode 100644 index 0000000000..8317dd100f --- /dev/null +++ b/mappings/net/minecraft/world/PortalUtil.mapping @@ -0,0 +1,46 @@ +CLASS net/minecraft/class_5459 net/minecraft/world/PortalUtil + METHOD method_30574 getLargestRectangle (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350$class_2351;ILnet/minecraft/class_2350$class_2351;ILjava/util/function/Predicate;)Lnet/minecraft/class_5459$class_5460; + COMMENT Gets the largest rectangle of blocks along two axes for which all blocks meet a predicate. + COMMENT Used for getting rectangles of Nether portal blocks. + ARG 0 center + ARG 1 primaryAxis + ARG 2 primaryMaxBlocks + ARG 3 secondaryAxis + ARG 4 secondaryMaxBlocks + METHOD method_30575 moveWhile (Ljava/util/function/Predicate;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2350;I)I + ARG 3 max + METHOD method_30576 findLargestRectangle ([I)Lcom/mojang/datafixers/util/Pair; + COMMENT Finds the largest rectangle within a histogram, where the vertical bars each have + COMMENT width 1 and height specified in {@code heights}. + COMMENT + COMMENT @implNote This implementation solves the problem using a stack. The + COMMENT stack maintains a collection of height limits of rectangles that may grow as the + COMMENT array iteration continues. When a new height is encountered, each position {@code p} + COMMENT in the stack would be popped if the rectangle with height limit at position {@code + COMMENT p} can no longer extend right. The popped rectangle becomes the return value if it + COMMENT has a larger area than the current candidate. + COMMENT + COMMENT

When the rectangle area is calculated, the range is between {@code p0 + 1}, where + COMMENT {@code p0} is the current top of stack after popping rectangles that can no longer + COMMENT extend, and the current iterated position {@code i}. + COMMENT + COMMENT @return the base of the rectangle as an inclusive range and the height of the + COMMENT rectangle packed in a pair + COMMENT @see Largest + COMMENT Rectangle in Histogram - LeetCode + ARG 0 heights + COMMENT the heights of bars in the histogram + CLASS class_5460 Rectangle + FIELD field_25936 lowerLeft Lnet/minecraft/class_2338; + FIELD field_25937 width I + FIELD field_25938 height I + METHOD (Lnet/minecraft/class_2338;II)V + ARG 1 lowerLeft + ARG 2 width + ARG 3 height + CLASS class_5461 IntBounds + FIELD field_25939 min I + FIELD field_25940 max I + METHOD (II)V + ARG 1 min + ARG 2 max diff --git a/mappings/net/minecraft/world/RegistryWorldView.mapping b/mappings/net/minecraft/world/RegistryWorldView.mapping new file mode 100644 index 0000000000..8a3e069ab2 --- /dev/null +++ b/mappings/net/minecraft/world/RegistryWorldView.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_5423 net/minecraft/world/RegistryWorldView + COMMENT A world view or {@link World}'s superinterface that exposes access to + COMMENT a registry manager. + COMMENT + COMMENT @see #getRegistryManager() + METHOD method_30349 getRegistryManager ()Lnet/minecraft/class_5455; + METHOD method_31081 getBiomeKey (Lnet/minecraft/class_2338;)Ljava/util/Optional; + ARG 1 pos