diff --git a/mappings/net/minecraft/client/render/item/ItemDynamicRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemDynamicRenderer.mapping index 1c432d080e..609f1180e2 100644 --- a/mappings/net/minecraft/client/render/item/ItemDynamicRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/ItemDynamicRenderer.mapping @@ -12,4 +12,4 @@ CLASS det net/minecraft/client/render/item/ItemDynamicRenderer FIELD k modelShield Ldaq; FIELD l modelTrident Ldbb; METHOD a render (Laxd;)V - METHOD a applyEnchantmentGlow (Ljava/lang/Runnable;)V + METHOD a renderEnchantmentGlint (Ljava/lang/Runnable;)V diff --git a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping index 33097cea5f..1f560d7993 100644 --- a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping @@ -2,52 +2,75 @@ CLASS dkm net/minecraft/client/render/item/ItemRenderer FIELD a ENCHANTMENT_GLINT_TEX Lqd; FIELD b zOffset F FIELD c WITHOUT_MODELS Ljava/util/Set; - FIELD d modelMap Ldez; + FIELD d models Ldez; FIELD e textureManager Ldon; FIELD f colorMap Lcqk; - METHOD a getModelMap ()Ldez; - METHOD a renderItemModel (IIZ)V - ARG 1 xPosition - ARG 2 yPosition - METHOD a renderItemInGui (Lahl;Laxd;II)V + METHOD a getModels ()Ldez; + METHOD a prepareGuiItemRender (IIZ)V + ARG 1 x + ARG 2 y + ARG 3 depth + METHOD a renderGuiItem (Lahl;Laxd;II)V ARG 2 itemStack ARG 3 x + ARG 4 y METHOD a hasDepthInGui (Laxd;)Z - METHOD a renderItemWithPropertyOverrides (Laxd;II)V + METHOD a renderGuiItemIcon (Laxd;II)V ARG 1 stack - ARG 2 xPosition - METHOD a renderItem (Laxd;IILdpw;)V + ARG 2 x + ARG 3 y + METHOD a renderGuiItemModel (Laxd;IILdpw;)V ARG 1 itemStack ARG 2 x ARG 3 y - METHOD a renderItemAmountAndDamageInGUI (Laxd;Lahl;Ldgg$b;Z)V + METHOD a renderHeldItem (Laxd;Lahl;Ldgg$b;Z)V ARG 1 stack ARG 2 entity ARG 3 type - METHOD a renderItemWithTransformation (Laxd;Ldgg$b;)V + METHOD a getModel (Laxd;Lbcl;Lahl;)Ldpw; + METHOD a renderItem (Laxd;Ldgg$b;)V ARG 1 stack METHOD a renderItemAndGlow (Laxd;Ldpw;)V - METHOD a renderItemModel (Laxd;Ldpw;Ldgg$b;Z)V + METHOD a renderItem (Laxd;Ldpw;Ldgg$b;Z)V ARG 1 stack ARG 2 model ARG 3 type - METHOD a renderQuad (Lcpi;IIIIIIII)V - METHOD a renderQuad (Lcpi;Ldft;)V + METHOD a renderGuiQuad (Lcpi;IIIIIIII)V + ARG 2 x + ARG 3 y + ARG 4 width + ARG 5 height + ARG 6 red + ARG 7 green + ARG 8 blue + ARG 9 alpha + METHOD a postNormalQuad (Lcpi;Ldft;)V ARG 1 buffer - METHOD a renderQuadColored (Lcpi;Ldft;I)V - METHOD a renderModelColored (Lcpi;Ljava/util/List;ILaxd;)V - METHOD a renderItemOverlaysInGUI (Lcqm;Laxd;II)V + METHOD a renderQuad (Lcpi;Ldft;I)V + ARG 3 color + METHOD a renderQuads (Lcpi;Ljava/util/List;ILaxd;)V + ARG 2 quads + ARG 3 forcedColor + ARG 4 stack + METHOD a renderGuiItemOverlay (Lcqm;Laxd;II)V ARG 1 fontRenderer ARG 2 stack ARG 3 x - METHOD a renderItemOverlaysInGUIWithText (Lcqm;Laxd;IILjava/lang/String;)V + METHOD a renderGuiItemOverlay (Lcqm;Laxd;IILjava/lang/String;)V ARG 1 fontRenderer ARG 2 stack ARG 3 x ARG 4 y - METHOD a renderModelColored (Ldpw;I)V - METHOD a renderItemModelColored (Ldpw;ILaxd;)V + METHOD a areFacesFlippedBy (Ldgf;)Z + METHOD a renderGlint (Ldon;Ljava/lang/Runnable;I)V + ARG 1 renderer + METHOD a renderModelWithTint (Ldpw;I)V + METHOD a renderModel (Ldpw;ILaxd;)V METHOD a renderItemModel (Ldpw;Laxd;)V - METHOD b renderItemAndGlowInGui (Laxd;II)V + METHOD a getOverriddenModel (Ldpw;Laxd;Lbcl;Lahl;)Ldpw; + METHOD b getModel (Laxd;)Ldpw; + METHOD b renderGuiItem (Laxd;II)V ARG 1 stack - ARG 2 xPosition + ARG 2 x + ARG 3 y + METHOD b getHeldItemModel (Laxd;Lbcl;Lahl;)Ldpw; diff --git a/mappings/net/minecraft/client/toast/Toast.mapping b/mappings/net/minecraft/client/toast/Toast.mapping index 25185b9c20..fb1f2d90e3 100644 --- a/mappings/net/minecraft/client/toast/Toast.mapping +++ b/mappings/net/minecraft/client/toast/Toast.mapping @@ -1,5 +1,5 @@ CLASS csc net/minecraft/client/toast/Toast - CLASS csc$a + CLASS csc$a Visibility FIELD c sound Lxr; METHOD a play (Ldrr;)V FIELD a TOASTS_TEX Lqd; diff --git a/mappings/net/minecraft/client/toast/TutorialToast.mapping b/mappings/net/minecraft/client/toast/TutorialToast.mapping index 2d57181a1c..fcb0ec8b01 100644 --- a/mappings/net/minecraft/client/toast/TutorialToast.mapping +++ b/mappings/net/minecraft/client/toast/TutorialToast.mapping @@ -1 +1,10 @@ CLASS cse net/minecraft/client/toast/TutorialToast + CLASS cse$a Type + FIELD f textureSlotX I + FIELD g textureSlotY I + METHOD a drawIcon (Lcqo;II)V + FIELD c type Lcse$a; + FIELD d title Ljava/lang/String; + FIELD e description Ljava/lang/String; + FIELD f visibility Lcsc$a; + METHOD a hide ()V diff --git a/mappings/net/minecraft/client/tutorial/CraftPlanksTutorialStepHandler.mapping b/mappings/net/minecraft/client/tutorial/CraftPlanksTutorialStepHandler.mapping index 60dad5a3d5..ea2e78c69c 100644 --- a/mappings/net/minecraft/client/tutorial/CraftPlanksTutorialStepHandler.mapping +++ b/mappings/net/minecraft/client/tutorial/CraftPlanksTutorialStepHandler.mapping @@ -2,4 +2,5 @@ CLASS drw net/minecraft/client/tutorial/CraftPlanksTutorialStepHandler FIELD a TITLE Ljc; FIELD b DESCRIPTION Ljc; FIELD c manager Ldsb; + FIELD d toast Lcse; FIELD e ticks I diff --git a/mappings/net/minecraft/entity/player/ItemCooldownManager.mapping b/mappings/net/minecraft/entity/player/ItemCooldownManager.mapping index fa149e8750..6064e71e49 100644 --- a/mappings/net/minecraft/entity/player/ItemCooldownManager.mapping +++ b/mappings/net/minecraft/entity/player/ItemCooldownManager.mapping @@ -1,12 +1,21 @@ CLASS awz net/minecraft/entity/player/ItemCooldownManager - CLASS awz$a Cooldown - FIELD a cooldowns Ljava/util/Map; + CLASS awz$a Entry + FIELD b startTick I + FIELD c endTick I + METHOD (Lawz;II)V + ARG 2 startTick + ARG 3 endTick + FIELD a entries Ljava/util/Map; FIELD b tick I METHOD a update ()V - METHOD a isCoolingDown (Lawy;)Z + METHOD a isCooldown (Lawy;)Z + METHOD a getCooldownProgress (Lawy;F)F + ARG 2 partialTicks METHOD a set (Lawy;I)V ARG 1 item + ARG 2 duration METHOD b remove (Lawy;)V + ARG 1 item METHOD b onCooldownUpdate (Lawy;I)V ARG 1 item METHOD c onCooldownUpdate (Lawy;)V diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 1510ab93b4..6a36c21f50 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -117,7 +117,7 @@ CLASS axd net/minecraft/item/ItemStack METHOD r getDisplayName ()Ljc; METHOD s removeDisplayName ()V METHOD t hasDisplayName ()Z - METHOD u hasEnchantmentGlow ()Z + METHOD u hasEnchantmentGlint ()Z METHOD v getRarity ()Laxq; METHOD w isEnchantable ()Z METHOD x hasEnchantments ()Z diff --git a/mappings/net/minecraft/util/math/BlockPos.mapping b/mappings/net/minecraft/util/math/BlockPos.mapping index 8f60205a30..097c438eac 100644 --- a/mappings/net/minecraft/util/math/BlockPos.mapping +++ b/mappings/net/minecraft/util/math/BlockPos.mapping @@ -18,6 +18,7 @@ CLASS et net/minecraft/util/math/BlockPos METHOD c setOffset (Ley;)Let$b; METHOD c setOffset (Ley;I)Let$b; METHOD d set (III)Let$b; + METHOD e setOffset (III)Let$b; METHOD g set (Lfn;)Let$b; METHOD i setFromLong (J)Let$b; METHOD p setY (I)V @@ -33,6 +34,7 @@ CLASS et net/minecraft/util/math/BlockPos METHOD d setOffset (Ley;I)Let$c; METHOD e set (DDD)Let$c; METHOD f get (III)Let$c; + METHOD h setOffset (III)Let$c; METHOD j set (Lfn;)Let$c; METHOD r get ()Let$c; FIELD a ORIGIN Let; diff --git a/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping b/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping index e02c756832..fda7770e09 100644 --- a/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping +++ b/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping @@ -1,6 +1,8 @@ CLASS aev net/minecraft/util/profiler/ProfilerSystem + FIELD a TIMEOUT_NANOSECONDS J FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c nameList Ljava/util/List; FIELD d timeList Ljava/util/List; + FIELD e nameDurationMap Ljava/util/Map; FIELD i location Ljava/lang/String; FIELD j tickStarted Z diff --git a/mappings/net/minecraft/world/loot/context/LootContextParameter.mapping b/mappings/net/minecraft/world/loot/context/LootContextParameter.mapping new file mode 100644 index 0000000000..65e48969bf --- /dev/null +++ b/mappings/net/minecraft/world/loot/context/LootContextParameter.mapping @@ -0,0 +1,3 @@ +CLASS clg net/minecraft/world/loot/context/LootContextParameter + FIELD a id Lqd; + METHOD a getIdentifier ()Lqd; diff --git a/mappings/net/minecraft/world/loot/context/LootContextParameters.mapping b/mappings/net/minecraft/world/loot/context/LootContextParameters.mapping new file mode 100644 index 0000000000..231f058b13 --- /dev/null +++ b/mappings/net/minecraft/world/loot/context/LootContextParameters.mapping @@ -0,0 +1,2 @@ +CLASS clj net/minecraft/world/loot/context/LootContextParameters + METHOD a register (Ljava/lang/String;)Lclg; diff --git a/mappings/net/minecraft/world/loot/context/Parameter.mapping b/mappings/net/minecraft/world/loot/context/Parameter.mapping deleted file mode 100644 index 18a003cd1c..0000000000 --- a/mappings/net/minecraft/world/loot/context/Parameter.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS clg net/minecraft/world/loot/context/Parameter - FIELD a id Lqd; - METHOD a getIdentifier ()Lqd; diff --git a/mappings/net/minecraft/world/loot/context/Parameters.mapping b/mappings/net/minecraft/world/loot/context/Parameters.mapping deleted file mode 100644 index 60eada5c8e..0000000000 --- a/mappings/net/minecraft/world/loot/context/Parameters.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS clj net/minecraft/world/loot/context/Parameters - METHOD a register (Ljava/lang/String;)Lclg; diff --git a/mappings/net/minecraft/world/loot/function/CopyNameLootFunction.mapping b/mappings/net/minecraft/world/loot/function/CopyNameLootFunction.mapping index 632eb71717..d2021f0595 100644 --- a/mappings/net/minecraft/world/loot/function/CopyNameLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/CopyNameLootFunction.mapping @@ -4,6 +4,9 @@ CLASS cki net/minecraft/world/loot/function/CopyNameLootFunction FIELD b KILLER Lcki$a; FIELD c KILLER_PLAYER Lcki$a; FIELD d BLOCK_ENTITY Lcki$a; + FIELD e name Ljava/lang/String; + FIELD f parameter Lclg; + METHOD a get (Ljava/lang/String;)Lcki$a; CLASS cki$b Factory FIELD a source Lcki$a; METHOD a create (Lcki$a;)Lckq$a; diff --git a/mappings/net/minecraft/world/loot/function/CopyNbtLootFunction.mapping b/mappings/net/minecraft/world/loot/function/CopyNbtLootFunction.mapping new file mode 100644 index 0000000000..2d00a697ee --- /dev/null +++ b/mappings/net/minecraft/world/loot/function/CopyNbtLootFunction.mapping @@ -0,0 +1,17 @@ +CLASS ckj net/minecraft/world/loot/function/CopyNbtLootFunction + CLASS ckj$c Source + FIELD e name Ljava/lang/String; + FIELD f parameter Lclg; + FIELD g getter Ljava/util/function/Function; + METHOD a get (Ljava/lang/String;)Lckj$c; + CLASS ckj$d MergeStrategy + FIELD a REPLACE Lckj$d; + FIELD b APPEND Lckj$d; + FIELD c MERGE Lckj$d; + FIELD d name Ljava/lang/String; + METHOD a merge (Lii;Lco$h;Ljava/util/List;)V + METHOD a get (Ljava/lang/String;)Lckj$d; + CLASS ckj$e Factory + FIELD a source Lckj$c; + FIELD d ENTITY_TAG_GETTER Ljava/util/function/Function; + FIELD e BLOCK_ENTITY_TAG_GETTER Ljava/util/function/Function;