From c23285eae4c97987efa23c76f8ee1b76f84433f2 Mon Sep 17 00:00:00 2001 From: NeunEinser Date: Thu, 18 Apr 2019 21:38:23 +0200 Subject: [PATCH] Improvements for own previously provided mappings (#635) * Improved own mappings * minor * typo --- .../gui/menu/CustomizeFlatLevelScreen.mapping | 4 ++-- .../client/gui/menu/MultiplayerScreen.mapping | 6 ++--- .../client/gui/widget/CheckboxWidget.mapping | 2 +- .../server/command/DataCommand.mapping | 2 ++ .../server/command/ExecuteCommand.mapping | 8 +++---- .../server/command/LootCommand.mapping | 2 +- .../command/ServerCommandSource.mapping | 6 ++--- .../world/loot/BinomialLootTableRange.mapping | 2 +- .../world/loot/ConstantLootTableRange.mapping | 2 +- .../net/minecraft/world/loot/LootPool.mapping | 2 +- .../minecraft/world/loot/LootSupplier.mapping | 2 +- .../world/loot/LootTableRanges.mapping | 2 +- .../world/loot/LootTableReporter.mapping | 2 +- .../world/loot/UniformLootTableRange.mapping | 2 +- .../condition/InvertedLootCondition.mapping | 2 +- .../loot/condition/LootCondition.mapping | 8 +++---- .../loot/condition/LootConditions.mapping | 4 ++-- .../condition/MatchToolLootCondition.mapping | 2 +- .../WeatherCheckLootCondition.mapping | 4 ++-- .../world/loot/context/LootContext.mapping | 2 +- .../loot/context/LootContextTypes.mapping | 22 +++++++++---------- .../world/loot/entry/CombinedEntry.mapping | 4 ++-- .../world/loot/entry/LeafEntry.mapping | 4 ++-- .../world/loot/entry/LootEntries.mapping | 4 ++-- .../world/loot/entry/LootEntry.mapping | 4 ++-- .../function/ApplyBonusLootFunction.mapping | 8 +++---- .../function/ConditionalLootFunction.mapping | 2 +- .../loot/function/CopyNbtLootFunction.mapping | 4 ++-- .../world/loot/function/LootFunction.mapping | 6 ++--- .../world/loot/function/LootFunctions.mapping | 4 ++-- .../SetAttributesLootFunction.mapping | 2 +- .../loot/function/SetLoreLootFunction.mapping | 4 ++-- 32 files changed, 68 insertions(+), 66 deletions(-) diff --git a/mappings/net/minecraft/client/gui/menu/CustomizeFlatLevelScreen.mapping b/mappings/net/minecraft/client/gui/menu/CustomizeFlatLevelScreen.mapping index a939787cf6..ba0e4389b0 100644 --- a/mappings/net/minecraft/client/gui/menu/CustomizeFlatLevelScreen.mapping +++ b/mappings/net/minecraft/client/gui/menu/CustomizeFlatLevelScreen.mapping @@ -9,11 +9,11 @@ CLASS cyu net/minecraft/client/gui/menu/CustomizeFlatLevelScreen FIELD b config Lcfk; FIELD c tileText Ljava/lang/String; FIELD d heightText Ljava/lang/String; - FIELD e layerList Lcyu$a; + FIELD e layers Lcyu$a; FIELD f widgetButtonRemoveLayer Lcwm; METHOD (Ldcu;Lib;)V ARG 1 parent - ARG 2 generatorOptionsTag + ARG 2 generatorOptions METHOD a getConfigString ()Ljava/lang/String; METHOD render (IIF)V ARG 1 mouseX diff --git a/mappings/net/minecraft/client/gui/menu/MultiplayerScreen.mapping b/mappings/net/minecraft/client/gui/menu/MultiplayerScreen.mapping index 9eb2547fa8..5748c7702b 100644 --- a/mappings/net/minecraft/client/gui/menu/MultiplayerScreen.mapping +++ b/mappings/net/minecraft/client/gui/menu/MultiplayerScreen.mapping @@ -18,17 +18,17 @@ CLASS dbu net/minecraft/client/gui/menu/MultiplayerScreen ARG 1 arg1 METHOD a connect (Ldhm;)V ARG 1 entry - METHOD a setTooltipText (Ljava/lang/String;)V + METHOD a setTooltip (Ljava/lang/String;)V ARG 1 text METHOD a removeEntry (Z)V ARG 1 confirmedAction - METHOD b updateButtonActivationState ()V + METHOD b updateButtonActivationStates ()V METHOD b editEntry (Z)V ARG 1 confirmedAction METHOD c addEntry (Z)V ARG 1 confirmedAction METHOD d getServerList ()Ldhn; - METHOD d directConnectFromSubMenu (Z)V + METHOD d directConnect (Z)V ARG 1 confirmedAction METHOD e refresh ()V METHOD keyPressed (III)Z diff --git a/mappings/net/minecraft/client/gui/widget/CheckboxWidget.mapping b/mappings/net/minecraft/client/gui/widget/CheckboxWidget.mapping index 85103e29a2..41efc7771b 100644 --- a/mappings/net/minecraft/client/gui/widget/CheckboxWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/CheckboxWidget.mapping @@ -7,7 +7,7 @@ CLASS cwo net/minecraft/client/gui/widget/CheckboxWidget ARG 3 width ARG 4 height ARG 5 message - ARG 6 isChecked + ARG 6 checked METHOD a isChecked ()Z METHOD renderButton (IIF)V ARG 1 mouseX diff --git a/mappings/net/minecraft/server/command/DataCommand.mapping b/mappings/net/minecraft/server/command/DataCommand.mapping index 8e427153e0..4aa952d5a2 100644 --- a/mappings/net/minecraft/server/command/DataCommand.mapping +++ b/mappings/net/minecraft/server/command/DataCommand.mapping @@ -27,6 +27,7 @@ CLASS ub net/minecraft/server/command/DataCommand METHOD a executeInsert (ILib;Lcr$h;Ljava/util/List;)I ARG 0 integer ARG 1 sourceTag + ARG 2 path ARG 3 tags METHOD a executeGet (Lcd;Lua;)I ARG 0 source @@ -55,6 +56,7 @@ CLASS ub net/minecraft/server/command/DataCommand ARG 0 path ARG 1 object METHOD a addModifyArgument (Ljava/util/function/BiConsumer;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 0 subArgumentAdder METHOD b executeGet (Lcd;Lua;Lcr$h;)I ARG 0 source ARG 1 object diff --git a/mappings/net/minecraft/server/command/ExecuteCommand.mapping b/mappings/net/minecraft/server/command/ExecuteCommand.mapping index 9b8d890d2f..cbea1a4118 100644 --- a/mappings/net/minecraft/server/command/ExecuteCommand.mapping +++ b/mappings/net/minecraft/server/command/ExecuteCommand.mapping @@ -13,18 +13,18 @@ CLASS sa net/minecraft/server/command/ExecuteCommand ARG 0 source ARG 1 targets ARG 2 objective - ARG 3 requestResultValue + ARG 3 requestResult METHOD a executeStoreBossbar (Lcd;Lri;ZZ)Lcd; ARG 0 source ARG 1 bossBar ARG 2 storeInValue - ARG 3 requestResultValue + ARG 3 requestResult METHOD a executeStoreData (Lcd;Lua;Lcr$h;Ljava/util/function/IntFunction;Z)Lcd; ARG 0 source ARG 1 object ARG 2 path ARG 3 tagSetter - ARG 4 requestResultValue + ARG 4 requestResult METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher METHOD a testScoreMatch (Lcom/mojang/brigadier/context/CommandContext;Lbi$d;)Z @@ -57,7 +57,7 @@ CLASS sa net/minecraft/server/command/ExecuteCommand METHOD a addStoreArguments (Lcom/mojang/brigadier/tree/LiteralCommandNode;Lcom/mojang/brigadier/builder/LiteralArgumentBuilder;Z)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 0 node ARG 1 builder - ARG 2 requestResultValue + ARG 2 requestResult METHOD a countPathMatches (Lua;Lcr$h;)I ARG 0 object ARG 1 path diff --git a/mappings/net/minecraft/server/command/LootCommand.mapping b/mappings/net/minecraft/server/command/LootCommand.mapping index 8b75fd3b68..0b41809932 100644 --- a/mappings/net/minecraft/server/command/LootCommand.mapping +++ b/mappings/net/minecraft/server/command/LootCommand.mapping @@ -22,7 +22,7 @@ CLASS sn net/minecraft/server/command/LootCommand ARG 1 stacks ARG 2 slot ARG 3 stackCount - ARG 4 globallyAddedStacks + ARG 4 addedStacks METHOD a itemsMatch (Lbbz;Lbbz;)Z ARG 0 first ARG 1 second diff --git a/mappings/net/minecraft/server/command/ServerCommandSource.mapping b/mappings/net/minecraft/server/command/ServerCommandSource.mapping index fa764c0edd..2daf6dbc7f 100644 --- a/mappings/net/minecraft/server/command/ServerCommandSource.mapping +++ b/mappings/net/minecraft/server/command/ServerCommandSource.mapping @@ -6,7 +6,7 @@ CLASS cd net/minecraft/server/command/ServerCommandSource FIELD e world Lvf; FIELD f level I FIELD g simpleName Ljava/lang/String; - FIELD h nameTextComponent Ljm; + FIELD h name Ljm; FIELD i minecraftServer Lnet/minecraft/server/MinecraftServer; FIELD j silent Z FIELD k entity Laie; @@ -20,7 +20,7 @@ CLASS cd net/minecraft/server/command/ServerCommandSource ARG 4 world ARG 5 level ARG 6 simpleName - ARG 7 nameTextComponent + ARG 7 name ARG 8 server ARG 9 entity METHOD (Lcc;Lcrt;Lcrs;Lvf;ILjava/lang/String;Ljm;Lnet/minecraft/server/MinecraftServer;Laie;ZLcom/mojang/brigadier/ResultConsumer;Lck$a;)V @@ -30,7 +30,7 @@ CLASS cd net/minecraft/server/command/ServerCommandSource ARG 4 world ARG 5 level ARG 6 simpleName - ARG 7 nameTextComponent + ARG 7 name ARG 8 server ARG 9 entity ARG 10 silent diff --git a/mappings/net/minecraft/world/loot/BinomialLootTableRange.mapping b/mappings/net/minecraft/world/loot/BinomialLootTableRange.mapping index 22160be514..16ecfec9fe 100644 --- a/mappings/net/minecraft/world/loot/BinomialLootTableRange.mapping +++ b/mappings/net/minecraft/world/loot/BinomialLootTableRange.mapping @@ -1,7 +1,7 @@ CLASS cof net/minecraft/world/loot/BinomialLootTableRange CLASS cof$a Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 functionJson + ARG 1 json ARG 2 unused ARG 3 context METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/world/loot/ConstantLootTableRange.mapping b/mappings/net/minecraft/world/loot/ConstantLootTableRange.mapping index 392d7b45ff..994cd357c7 100644 --- a/mappings/net/minecraft/world/loot/ConstantLootTableRange.mapping +++ b/mappings/net/minecraft/world/loot/ConstantLootTableRange.mapping @@ -1,7 +1,7 @@ CLASS coh net/minecraft/world/loot/ConstantLootTableRange CLASS coh$a Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 functionJson + ARG 1 json ARG 2 unused ARG 3 context METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/world/loot/LootPool.mapping b/mappings/net/minecraft/world/loot/LootPool.mapping index 5f167b7a1d..fd91675963 100644 --- a/mappings/net/minecraft/world/loot/LootPool.mapping +++ b/mappings/net/minecraft/world/loot/LootPool.mapping @@ -12,7 +12,7 @@ CLASS col net/minecraft/world/loot/LootPool METHOD b build ()Lcol; CLASS col$b Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 poolJson + ARG 1 json ARG 2 unused ARG 3 context METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/world/loot/LootSupplier.mapping b/mappings/net/minecraft/world/loot/LootSupplier.mapping index 4d0d6dfcd5..7ea55aae67 100644 --- a/mappings/net/minecraft/world/loot/LootSupplier.mapping +++ b/mappings/net/minecraft/world/loot/LootSupplier.mapping @@ -10,7 +10,7 @@ CLASS com net/minecraft/world/loot/LootSupplier METHOD b create ()Lcom; CLASS com$b Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 lootTableRootJson + ARG 1 json ARG 2 unused ARG 3 context METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/world/loot/LootTableRanges.mapping b/mappings/net/minecraft/world/loot/LootTableRanges.mapping index 925e92a967..29c0734eb9 100644 --- a/mappings/net/minecraft/world/loot/LootTableRanges.mapping +++ b/mappings/net/minecraft/world/loot/LootTableRanges.mapping @@ -1,7 +1,7 @@ CLASS cor net/minecraft/world/loot/LootTableRanges FIELD a types Ljava/util/Map; METHOD a deserialize (Lcom/google/gson/JsonElement;Lcom/google/gson/JsonDeserializationContext;)Lcoq; - ARG 0 rangeJson + ARG 0 json ARG 1 context METHOD a serialize (Lcoq;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; ARG 0 range diff --git a/mappings/net/minecraft/world/loot/LootTableReporter.mapping b/mappings/net/minecraft/world/loot/LootTableReporter.mapping index 0dd54ffc39..84befe40df 100644 --- a/mappings/net/minecraft/world/loot/LootTableReporter.mapping +++ b/mappings/net/minecraft/world/loot/LootTableReporter.mapping @@ -10,4 +10,4 @@ CLASS coo net/minecraft/world/loot/LootTableReporter ARG 1 message METHOD b getContext ()Ljava/lang/String; METHOD b makeChild (Ljava/lang/String;)Lcoo; - ARG 1 childTag + ARG 1 name diff --git a/mappings/net/minecraft/world/loot/UniformLootTableRange.mapping b/mappings/net/minecraft/world/loot/UniformLootTableRange.mapping index 06ec498006..19ce088b8f 100644 --- a/mappings/net/minecraft/world/loot/UniformLootTableRange.mapping +++ b/mappings/net/minecraft/world/loot/UniformLootTableRange.mapping @@ -1,7 +1,7 @@ CLASS cos net/minecraft/world/loot/UniformLootTableRange CLASS cos$a Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 valueJson + ARG 1 json ARG 2 unused ARG 3 context METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/world/loot/condition/InvertedLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/InvertedLootCondition.mapping index 4d75d1c98d..7305c092bf 100644 --- a/mappings/net/minecraft/world/loot/condition/InvertedLootCondition.mapping +++ b/mappings/net/minecraft/world/loot/condition/InvertedLootCondition.mapping @@ -4,6 +4,6 @@ CLASS cqt net/minecraft/world/loot/condition/InvertedLootCondition METHOD (Lcqw;)V ARG 1 term METHOD a builder (Lcqw$a;)Lcqw$a; - ARG 0 conditionBuilder + ARG 0 term METHOD test (Ljava/lang/Object;)Z ARG 1 context diff --git a/mappings/net/minecraft/world/loot/condition/LootCondition.mapping b/mappings/net/minecraft/world/loot/condition/LootCondition.mapping index 774e80f116..52e5862120 100644 --- a/mappings/net/minecraft/world/loot/condition/LootCondition.mapping +++ b/mappings/net/minecraft/world/loot/condition/LootCondition.mapping @@ -2,19 +2,19 @@ CLASS cqw net/minecraft/world/loot/condition/LootCondition CLASS cqw$a Builder METHOD a invert ()Lcqw$a; METHOD a withCondition (Lcqw$a;)Lcqn$a; - ARG 1 conditionBuilder + ARG 1 condition CLASS cqw$b Factory FIELD a id Lqs; FIELD b conditionClass Ljava/lang/Class; METHOD (Lqs;Ljava/lang/Class;)V ARG 1 id - ARG 2 conditionClass + ARG 2 clazz METHOD a getId ()Lqs; METHOD a toJson (Lcom/google/gson/JsonObject;Lcqw;Lcom/google/gson/JsonSerializationContext;)V - ARG 1 conditionJson + ARG 1 json ARG 2 condition ARG 3 context METHOD b getConditionClass ()Ljava/lang/Class; METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcqw; - ARG 1 conditionJson + ARG 1 json ARG 2 context diff --git a/mappings/net/minecraft/world/loot/condition/LootConditions.mapping b/mappings/net/minecraft/world/loot/condition/LootConditions.mapping index bb65fd67d2..ecc59c62fc 100644 --- a/mappings/net/minecraft/world/loot/condition/LootConditions.mapping +++ b/mappings/net/minecraft/world/loot/condition/LootConditions.mapping @@ -1,7 +1,7 @@ CLASS cqx net/minecraft/world/loot/condition/LootConditions CLASS cqx$a Factory METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 conditionsJson + ARG 1 json ARG 2 unused ARG 3 context METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; @@ -11,7 +11,7 @@ CLASS cqx net/minecraft/world/loot/condition/LootConditions FIELD a byId Ljava/util/Map; FIELD b byClass Ljava/util/Map; METHOD a register (Lcqw$b;)V - ARG 0 conditionFactory + ARG 0 condition METHOD a getFactory (Lcqw;)Lcqw$b; ARG 0 condition METHOD a (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/world/loot/condition/MatchToolLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/MatchToolLootCondition.mapping index 16d40dc146..c04d9b2002 100644 --- a/mappings/net/minecraft/world/loot/condition/MatchToolLootCondition.mapping +++ b/mappings/net/minecraft/world/loot/condition/MatchToolLootCondition.mapping @@ -4,6 +4,6 @@ CLASS crc net/minecraft/world/loot/condition/MatchToolLootCondition METHOD (Lbc;)V ARG 1 predicate METHOD a builder (Lbc$a;)Lcqw$a; - ARG 0 predicateBuilder + ARG 0 predicate METHOD test (Ljava/lang/Object;)Z ARG 1 context diff --git a/mappings/net/minecraft/world/loot/condition/WeatherCheckLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/WeatherCheckLootCondition.mapping index c24e0a81e6..e5c613a73a 100644 --- a/mappings/net/minecraft/world/loot/condition/WeatherCheckLootCondition.mapping +++ b/mappings/net/minecraft/world/loot/condition/WeatherCheckLootCondition.mapping @@ -3,7 +3,7 @@ CLASS crd net/minecraft/world/loot/condition/WeatherCheckLootCondition FIELD a raining Ljava/lang/Boolean; FIELD b thundering Ljava/lang/Boolean; METHOD (Ljava/lang/Boolean;Ljava/lang/Boolean;)V - ARG 1 isRainig - ARG 2 isThundering + ARG 1 raining + ARG 2 thundering METHOD test (Ljava/lang/Object;)Z ARG 1 context diff --git a/mappings/net/minecraft/world/loot/context/LootContext.mapping b/mappings/net/minecraft/world/loot/context/LootContext.mapping index a1ed00edb3..a7f2d03b21 100644 --- a/mappings/net/minecraft/world/loot/context/LootContext.mapping +++ b/mappings/net/minecraft/world/loot/context/LootContext.mapping @@ -21,7 +21,7 @@ CLASS coj net/minecraft/world/loot/context/LootContext ARG 1 key ARG 2 value METHOD a build (Lcqj;)Lcoj; - ARG 1 contextType + ARG 1 type METHOD a setRandom (Ljava/util/Random;)Lcoj$a; ARG 1 random METHOD a putDrop (Lqs;Lcoj$b;)Lcoj$a; diff --git a/mappings/net/minecraft/world/loot/context/LootContextTypes.mapping b/mappings/net/minecraft/world/loot/context/LootContextTypes.mapping index b39e968d77..f4551fadcb 100644 --- a/mappings/net/minecraft/world/loot/context/LootContextTypes.mapping +++ b/mappings/net/minecraft/world/loot/context/LootContextTypes.mapping @@ -9,25 +9,25 @@ CLASS cqk net/minecraft/world/loot/context/LootContextTypes FIELD h BLOCK Lcqj; FIELD i MAP Lcom/google/common/collect/BiMap; METHOD a (Lcqj$a;)V - ARG 0 contextTypeBuilder + ARG 0 builder METHOD a getId (Lcqj;)Lqs; - ARG 0 contextType - METHOD a register (Ljava/lang/String;Ljava/util/function/Consumer;)Lcqj; ARG 0 type - ARG 1 contextTypeBuilder + METHOD a register (Ljava/lang/String;Ljava/util/function/Consumer;)Lcqj; + ARG 0 name + ARG 1 type METHOD a get (Lqs;)Lcqj; ARG 0 id METHOD b (Lcqj$a;)V - ARG 0 contextTypeBuilder + ARG 0 builder METHOD c (Lcqj$a;)V - ARG 0 contextTypeBuilder + ARG 0 builder METHOD d (Lcqj$a;)V - ARG 0 contextTypeBuilder + ARG 0 builder METHOD e (Lcqj$a;)V - ARG 0 contextTypeBuilder + ARG 0 builder METHOD f (Lcqj$a;)V - ARG 0 contextTypeBuilder + ARG 0 builder METHOD g (Lcqj$a;)V - ARG 0 contextTypeBuilder + ARG 0 builder METHOD h (Lcqj$a;)V - ARG 0 contextTypeBuilder + ARG 0 builder diff --git a/mappings/net/minecraft/world/loot/entry/CombinedEntry.mapping b/mappings/net/minecraft/world/loot/entry/CombinedEntry.mapping index 9c9a33c910..64ba0ab983 100644 --- a/mappings/net/minecraft/world/loot/entry/CombinedEntry.mapping +++ b/mappings/net/minecraft/world/loot/entry/CombinedEntry.mapping @@ -5,7 +5,7 @@ CLASS cov net/minecraft/world/loot/entry/CombinedEntry ARG 2 conditions CLASS cov$b Serializer METHOD a fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lcpc;[Lcqw;)Lcov; - ARG 1 entryJsonObject + ARG 1 json ARG 2 context ARG 3 children ARG 4 conditions @@ -17,6 +17,6 @@ CLASS cov net/minecraft/world/loot/entry/CombinedEntry METHOD a createSerializer (Lqs;Ljava/lang/Class;Lcov$a;)Lcov$b; ARG 0 id ARG 1 type - ARG 2 combinedEntryFactory + ARG 2 entry METHOD a combine ([Lcou;)Lcou; ARG 1 children diff --git a/mappings/net/minecraft/world/loot/entry/LeafEntry.mapping b/mappings/net/minecraft/world/loot/entry/LeafEntry.mapping index e56399611d..c64698eec4 100644 --- a/mappings/net/minecraft/world/loot/entry/LeafEntry.mapping +++ b/mappings/net/minecraft/world/loot/entry/LeafEntry.mapping @@ -11,7 +11,7 @@ CLASS cpd net/minecraft/world/loot/entry/LeafEntry CLASS cpd$b BasicBuilder FIELD c factory Lcpd$d; METHOD (Lcpd$d;)V - ARG 1 leafEntryFactory + ARG 1 factory CLASS cpd$c Choice CLASS cpd$d Factory METHOD build (II[Lcqw;[Lcpt;)Lcpd; @@ -38,7 +38,7 @@ CLASS cpd net/minecraft/world/loot/entry/LeafEntry ARG 3 conditions ARG 4 functions METHOD a builder (Lcpd$d;)Lcpd$a; - ARG 0 leafEntryFactory + ARG 0 factory METHOD a drop (Ljava/util/function/Consumer;Lcoj;)V ARG 1 itemDropper ARG 2 context diff --git a/mappings/net/minecraft/world/loot/entry/LootEntries.mapping b/mappings/net/minecraft/world/loot/entry/LootEntries.mapping index 4d9006d5a3..3ecd10e3be 100644 --- a/mappings/net/minecraft/world/loot/entry/LootEntries.mapping +++ b/mappings/net/minecraft/world/loot/entry/LootEntries.mapping @@ -3,7 +3,7 @@ CLASS cpa net/minecraft/world/loot/entry/LootEntries METHOD a getSerializer (Ljava/lang/Class;)Lcpc$b; ARG 0 clazz METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 entryJson + ARG 1 json ARG 2 unused ARG 3 context METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; @@ -13,4 +13,4 @@ CLASS cpa net/minecraft/world/loot/entry/LootEntries FIELD a idSerializers Ljava/util/Map; FIELD b classSerializers Ljava/util/Map; METHOD a register (Lcpc$b;)V - ARG 0 entrySerializer + ARG 0 serializer diff --git a/mappings/net/minecraft/world/loot/entry/LootEntry.mapping b/mappings/net/minecraft/world/loot/entry/LootEntry.mapping index 62b8f11692..b91e7ad2bd 100644 --- a/mappings/net/minecraft/world/loot/entry/LootEntry.mapping +++ b/mappings/net/minecraft/world/loot/entry/LootEntry.mapping @@ -14,12 +14,12 @@ CLASS cpc net/minecraft/world/loot/entry/LootEntry ARG 2 type METHOD a getIdentifier ()Lqs; METHOD a toJson (Lcom/google/gson/JsonObject;Lcpc;Lcom/google/gson/JsonSerializationContext;)V - ARG 1 entryJson + ARG 1 json ARG 2 entry ARG 3 context METHOD b getType ()Ljava/lang/Class; METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lcqw;)Lcpc; - ARG 1 entryJson + ARG 1 json ARG 2 context ARG 3 conditions FIELD c conditionPredicate Ljava/util/function/Predicate; diff --git a/mappings/net/minecraft/world/loot/function/ApplyBonusLootFunction.mapping b/mappings/net/minecraft/world/loot/function/ApplyBonusLootFunction.mapping index e4bc5a9236..7442731da2 100644 --- a/mappings/net/minecraft/world/loot/function/ApplyBonusLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/ApplyBonusLootFunction.mapping @@ -7,12 +7,12 @@ CLASS cpi net/minecraft/world/loot/function/ApplyBonusLootFunction ARG 1 extra ARG 2 probability METHOD a fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcpi$b; - ARG 0 parametersJson + ARG 0 json ARG 1 context CLASS cpi$b Formula METHOD a getId ()Lqs; METHOD a toJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonSerializationContext;)V - ARG 1 parametersJson + ARG 1 json ARG 2 context METHOD a getValue (Ljava/util/Random;II)I ARG 1 random @@ -25,7 +25,7 @@ CLASS cpi net/minecraft/world/loot/function/ApplyBonusLootFunction CLASS cpi$d OreDrops FIELD a ID Lqs; METHOD a fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcpi$b; - ARG 0 parametersJson + ARG 0 json ARG 1 context CLASS cpi$e Factory CLASS cpi$f UniformBonusCount @@ -34,7 +34,7 @@ CLASS cpi net/minecraft/world/loot/function/ApplyBonusLootFunction METHOD (I)V ARG 1 bonusMultiplier METHOD a fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcpi$b; - ARG 0 parametersJson + ARG 0 json ARG 1 context FIELD a FACTORIES Ljava/util/Map; FIELD c enchantment Lbfh; diff --git a/mappings/net/minecraft/world/loot/function/ConditionalLootFunction.mapping b/mappings/net/minecraft/world/loot/function/ConditionalLootFunction.mapping index 609cde22a1..b7c48180d5 100644 --- a/mappings/net/minecraft/world/loot/function/ConditionalLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/ConditionalLootFunction.mapping @@ -9,7 +9,7 @@ CLASS cps net/minecraft/world/loot/function/ConditionalLootFunction ARG 1 joiner CLASS cps$c Factory METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lcqw;)Lcps; - ARG 1 functionJson + ARG 1 json ARG 2 context ARG 3 conditions FIELD a predicate Ljava/util/function/Predicate; diff --git a/mappings/net/minecraft/world/loot/function/CopyNbtLootFunction.mapping b/mappings/net/minecraft/world/loot/function/CopyNbtLootFunction.mapping index a784ff1299..e92597cb0e 100644 --- a/mappings/net/minecraft/world/loot/function/CopyNbtLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/CopyNbtLootFunction.mapping @@ -23,7 +23,7 @@ CLASS cpl net/minecraft/world/loot/function/CopyNbtLootFunction ARG 3 operator METHOD a toJson ()Lcom/google/gson/JsonObject; METHOD a fromJson (Lcom/google/gson/JsonObject;)Lcpl$b; - ARG 0 operationJson + ARG 0 json METHOD a execute (Ljava/util/function/Supplier;Lis;)V ARG 1 itemTagTagGetter ARG 2 sourceEntityTag @@ -59,7 +59,7 @@ CLASS cpl net/minecraft/world/loot/function/CopyNbtLootFunction METHOD a merge (Lis;Lcr$h;Ljava/util/List;)V ARG 1 itemTag ARG 2 tragetPath - ARG 3 tagsFromSource + ARG 3 sourceTags METHOD a get (Ljava/lang/String;)Lcpl$d; ARG 0 name CLASS cpl$e Factory diff --git a/mappings/net/minecraft/world/loot/function/LootFunction.mapping b/mappings/net/minecraft/world/loot/function/LootFunction.mapping index 960e376393..4137d82f07 100644 --- a/mappings/net/minecraft/world/loot/function/LootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/LootFunction.mapping @@ -6,15 +6,15 @@ CLASS cpt net/minecraft/world/loot/function/LootFunction FIELD b functionClass Ljava/lang/Class; METHOD (Lqs;Ljava/lang/Class;)V ARG 1 id - ARG 2 functionClass + ARG 2 clazz METHOD a getId ()Lqs; METHOD a toJson (Lcom/google/gson/JsonObject;Lcpt;Lcom/google/gson/JsonSerializationContext;)V - ARG 1 functionJson + ARG 1 json ARG 2 function ARG 3 context METHOD b getFunctionClass ()Ljava/lang/Class; METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcpt; - ARG 1 functionJson + ARG 1 json ARG 2 context METHOD a apply (Ljava/util/function/BiFunction;Ljava/util/function/Consumer;Lcoj;)Ljava/util/function/Consumer; ARG 0 itemApplier diff --git a/mappings/net/minecraft/world/loot/function/LootFunctions.mapping b/mappings/net/minecraft/world/loot/function/LootFunctions.mapping index 7fb80773f3..9554d8f5b9 100644 --- a/mappings/net/minecraft/world/loot/function/LootFunctions.mapping +++ b/mappings/net/minecraft/world/loot/function/LootFunctions.mapping @@ -1,7 +1,7 @@ CLASS cpu net/minecraft/world/loot/function/LootFunctions CLASS cpu$a Factory METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 functionJson + ARG 1 json ARG 2 unused ARG 3 context METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; @@ -15,7 +15,7 @@ CLASS cpu net/minecraft/world/loot/function/LootFunctions ARG 0 stack ARG 1 context METHOD a register (Lcpt$b;)V - ARG 0 lootFunctionFactory + ARG 0 function METHOD a getFactory (Lcpt;)Lcpt$b; ARG 0 function METHOD a (Ljava/util/function/BiFunction;Ljava/util/function/BiFunction;Lbbz;Lcoj;)Lbbz; diff --git a/mappings/net/minecraft/world/loot/function/SetAttributesLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetAttributesLootFunction.mapping index 1b8bf6bf02..571f339bd3 100644 --- a/mappings/net/minecraft/world/loot/function/SetAttributesLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/SetAttributesLootFunction.mapping @@ -16,7 +16,7 @@ CLASS cpw net/minecraft/world/loot/function/SetAttributesLootFunction METHOD a getName (Lajf$a;)Ljava/lang/String; ARG 0 operation METHOD a deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcpw$b; - ARG 0 attributeJson + ARG 0 json ARG 1 context METHOD a serialize (Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonObject; ARG 1 context diff --git a/mappings/net/minecraft/world/loot/function/SetLoreLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetLoreLootFunction.mapping index f38e7b75cb..fff41b961f 100644 --- a/mappings/net/minecraft/world/loot/function/SetLoreLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/SetLoreLootFunction.mapping @@ -8,6 +8,6 @@ CLASS cqb net/minecraft/world/loot/function/SetLoreLootFunction ARG 2 replace ARG 3 lore ARG 4 entity - METHOD a getLoreTag (Lbbz;Z)Lii; + METHOD a getLoreForMerge (Lbbz;Z)Lii; ARG 1 stack - ARG 2 loreToBeAddedIsNotEmpty + ARG 2 otherLoreExists