From 1c8c22d955da48bfc6eca96be6c7bacf04fc4a94 Mon Sep 17 00:00:00 2001 From: asie Date: Thu, 25 Oct 2018 22:01:57 +0200 Subject: [PATCH] recipe, etc. work --- mappings/aov.mapping | 1 + mappings/avy.mapping | 4 --- mappings/avz.mapping | 5 ---- mappings/awa.mapping | 5 ---- mappings/awb.mapping | 1 + mappings/awc.mapping | 5 ---- mappings/awd.mapping | 4 --- mappings/awe.mapping | 5 ---- mappings/awg.mapping | 4 --- mappings/awj.mapping | 3 -- mappings/awm.mapping | 4 --- mappings/awp.mapping | 4 --- mappings/awq.mapping | 4 --- mappings/awr.mapping | 6 ---- mappings/aws.mapping | 4 --- mappings/awt.mapping | 4 --- mappings/awz.mapping | 2 +- mappings/axp.mapping | 2 +- mappings/axv.mapping | 2 +- mappings/axx.mapping | 2 +- mappings/axy.mapping | 2 +- mappings/baa.mapping | 1 + mappings/blf.mapping | 1 + mappings/cpx.mapping | 2 +- mappings/cqc.mapping | 2 ++ mappings/cqe.mapping | 1 + .../minecraft/block/BlockBannerBase.mapping | 2 ++ .../minecraft/block/BlockShulkerBox.mapping | 4 +++ .../block/entity/BlockEntityFurnace.mapping | 6 ++++ .../minecraft/client/MinecraftGame.mapping | 1 + .../language/TranslationStorage.mapping | 11 +++++-- .../minecraft/enchantment/Enchantment.mapping | 11 ++++++- .../EnchantmentBindingCurse.mapping | 1 + .../enchantment/EnchantmentDamage.mapping | 2 +- .../EnchantmentDepthStrider.mapping | 2 +- .../EnchantmentFrostWalker.mapping | 2 +- .../enchantment/EnchantmentInfinity.mapping | 2 +- .../enchantment/EnchantmentLuck.mapping | 2 +- .../enchantment/EnchantmentProtection.mapping | 2 +- .../enchantment/EnchantmentSilkTouch.mapping | 2 +- .../EnchantmentVanishingCurse.mapping | 1 + .../entity/EntityExperienceOrb.mapping | 2 ++ .../net/minecraft/entity/EntityType.mapping | 12 ++++---- .../entity/EntityWaterCreature.mapping} | 2 +- mappings/net/minecraft/entity/INpc.mapping | 1 - ...yCaveMob.mapping => EntityAmbient.mapping} | 2 +- .../net/minecraft/entity/mob/IMonster.mapping | 1 + .../minecraft/item/ItemArmorDyeable.mapping | 4 +++ mappings/net/minecraft/item/ItemStack.mapping | 7 +++-- .../minecraft/item/block/ItemBanner.mapping | 1 + .../migration/IMigrationType.mapping | 1 - .../net/minecraft/realms/RealmsBridge.mapping | 1 + .../RealmsSimpleScrolledSelectionList.mapping | 1 + .../{Recipe.mapping => IRecipe.mapping} | 8 ++++- .../recipe/IRecipeSerializer.mapping | 11 +++++++ .../net/minecraft/recipe/Ingredient.mapping | 10 +++++++ .../minecraft/recipe/RecipeManager.mapping | 17 +++++++++++ .../minecraft/recipe/RecipeShapeless.mapping | 6 ---- .../recipe/crafting/RecipeArmorDye.mapping | 8 +++++ .../crafting/RecipeBannerDuplicate.mapping | 9 ++++++ .../recipe/crafting/RecipeBookCloning.mapping | 9 ++++++ .../crafting/RecipeFireworkRocket.mapping | 9 ++++++ .../crafting/RecipeFireworkStar.mapping | 9 ++++++ .../crafting/RecipeFireworkStarFade.mapping | 8 +++++ .../recipe/crafting/RecipeMapCloning.mapping | 8 +++++ .../{ => crafting}/RecipeMapExtend.mapping | 3 +- .../recipe/crafting/RecipeRepairItem.mapping | 8 +++++ .../{ => crafting}/RecipeShaped.mapping | 21 ++++++++++++- .../recipe/crafting/RecipeShapeless.mapping | 27 +++++++++++++++++ .../crafting/RecipeShieldDecoration.mapping | 8 +++++ .../crafting/RecipeShulkerBoxColoring.mapping | 8 +++++ .../crafting/RecipeSuspiciousStew.mapping | 8 +++++ .../recipe/crafting/RecipeTippedArrow.mapping | 8 +++++ .../recipe/smelting/RecipeSmelting.mapping | 30 +++++++++++++++++++ .../reference/RecipeSerializers.mapping | 17 +++++++++++ .../net/minecraft/reference/Sounds.mapping | 1 + .../IReloadableResourceManager.mapping | 3 ++ .../net/minecraft/resource/IResource.mapping | 2 ++ .../resource/IResourceManager.mapping | 6 ++++ .../net/minecraft/resource/Resource.mapping | 5 ++++ .../resource/ResourceManager.mapping | 17 +++++++++++ .../resource/ResourceManagerType.mapping | 3 ++ .../minecraft/server/IntegratedServer.mapping | 2 ++ .../minecraft/server/MinecraftServer.mapping | 1 + .../server/dedicated/DedicatedServer.mapping | 1 + mappings/net/minecraft/sound/Sound.mapping | 5 ++++ .../net/minecraft/stat/IStatFormatter.mapping | 2 -- mappings/vp.mapping | 6 ++++ mappings/vs.mapping | 1 - mappings/ww.mapping | 1 - 90 files changed, 367 insertions(+), 105 deletions(-) create mode 100644 mappings/aov.mapping delete mode 100644 mappings/avy.mapping delete mode 100644 mappings/avz.mapping delete mode 100644 mappings/awa.mapping delete mode 100644 mappings/awc.mapping delete mode 100644 mappings/awd.mapping delete mode 100644 mappings/awe.mapping delete mode 100644 mappings/awg.mapping delete mode 100644 mappings/awj.mapping delete mode 100644 mappings/awm.mapping delete mode 100644 mappings/awp.mapping delete mode 100644 mappings/awq.mapping delete mode 100644 mappings/awr.mapping delete mode 100644 mappings/aws.mapping delete mode 100644 mappings/awt.mapping create mode 100644 mappings/baa.mapping create mode 100644 mappings/blf.mapping create mode 100644 mappings/cqc.mapping create mode 100644 mappings/cqe.mapping rename mappings/{ald.mapping => net/minecraft/entity/EntityWaterCreature.mapping} (68%) delete mode 100644 mappings/net/minecraft/entity/INpc.mapping rename mappings/net/minecraft/entity/mob/{EntityCaveMob.mapping => EntityAmbient.mapping} (50%) create mode 100644 mappings/net/minecraft/entity/mob/IMonster.mapping delete mode 100644 mappings/net/minecraft/migration/IMigrationType.mapping create mode 100644 mappings/net/minecraft/realms/RealmsBridge.mapping create mode 100644 mappings/net/minecraft/realms/RealmsSimpleScrolledSelectionList.mapping rename mappings/net/minecraft/recipe/{Recipe.mapping => IRecipe.mapping} (53%) create mode 100644 mappings/net/minecraft/recipe/IRecipeSerializer.mapping create mode 100644 mappings/net/minecraft/recipe/Ingredient.mapping create mode 100644 mappings/net/minecraft/recipe/RecipeManager.mapping delete mode 100644 mappings/net/minecraft/recipe/RecipeShapeless.mapping create mode 100644 mappings/net/minecraft/recipe/crafting/RecipeArmorDye.mapping create mode 100644 mappings/net/minecraft/recipe/crafting/RecipeBannerDuplicate.mapping create mode 100644 mappings/net/minecraft/recipe/crafting/RecipeBookCloning.mapping create mode 100644 mappings/net/minecraft/recipe/crafting/RecipeFireworkRocket.mapping create mode 100644 mappings/net/minecraft/recipe/crafting/RecipeFireworkStar.mapping create mode 100644 mappings/net/minecraft/recipe/crafting/RecipeFireworkStarFade.mapping create mode 100644 mappings/net/minecraft/recipe/crafting/RecipeMapCloning.mapping rename mappings/net/minecraft/recipe/{ => crafting}/RecipeMapExtend.mapping (55%) create mode 100644 mappings/net/minecraft/recipe/crafting/RecipeRepairItem.mapping rename mappings/net/minecraft/recipe/{ => crafting}/RecipeShaped.mapping (50%) create mode 100644 mappings/net/minecraft/recipe/crafting/RecipeShapeless.mapping create mode 100644 mappings/net/minecraft/recipe/crafting/RecipeShieldDecoration.mapping create mode 100644 mappings/net/minecraft/recipe/crafting/RecipeShulkerBoxColoring.mapping create mode 100644 mappings/net/minecraft/recipe/crafting/RecipeSuspiciousStew.mapping create mode 100644 mappings/net/minecraft/recipe/crafting/RecipeTippedArrow.mapping create mode 100644 mappings/net/minecraft/recipe/smelting/RecipeSmelting.mapping create mode 100644 mappings/net/minecraft/reference/RecipeSerializers.mapping create mode 100644 mappings/net/minecraft/reference/Sounds.mapping create mode 100644 mappings/net/minecraft/resource/IReloadableResourceManager.mapping create mode 100644 mappings/net/minecraft/resource/IResource.mapping create mode 100644 mappings/net/minecraft/resource/IResourceManager.mapping create mode 100644 mappings/net/minecraft/resource/Resource.mapping create mode 100644 mappings/net/minecraft/resource/ResourceManager.mapping create mode 100644 mappings/net/minecraft/resource/ResourceManagerType.mapping create mode 100644 mappings/net/minecraft/sound/Sound.mapping delete mode 100644 mappings/net/minecraft/stat/IStatFormatter.mapping create mode 100644 mappings/vp.mapping delete mode 100644 mappings/vs.mapping delete mode 100644 mappings/ww.mapping diff --git a/mappings/aov.mapping b/mappings/aov.mapping new file mode 100644 index 0000000000..95597a4e8d --- /dev/null +++ b/mappings/aov.mapping @@ -0,0 +1 @@ +CLASS aov diff --git a/mappings/avy.mapping b/mappings/avy.mapping deleted file mode 100644 index 52533e45ab..0000000000 --- a/mappings/avy.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS avy - METHOD a craft (Ladu;)Lauc; - METHOD a matches (Ladu;Laza;)Z - ARG 1 world diff --git a/mappings/avz.mapping b/mappings/avz.mapping deleted file mode 100644 index 4f93b6e931..0000000000 --- a/mappings/avz.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS avz - METHOD a craft (Ladu;)Lauc; - METHOD a matches (Ladu;Laza;)Z - ARG 1 world - METHOD b getRemainingStacks (Ladu;)Lfe; diff --git a/mappings/awa.mapping b/mappings/awa.mapping deleted file mode 100644 index 23fb84571f..0000000000 --- a/mappings/awa.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS awa - METHOD a craft (Ladu;)Lauc; - METHOD a matches (Ladu;Laza;)Z - ARG 1 world - METHOD b getRemainingStacks (Ladu;)Lfe; diff --git a/mappings/awb.mapping b/mappings/awb.mapping index d0dd97de79..9816a464ac 100644 --- a/mappings/awb.mapping +++ b/mappings/awb.mapping @@ -1,3 +1,4 @@ CLASS awb + METHOD b getId ()Lpt; METHOD c isIgnoredInRecipeBook ()Z METHOD d getOutput ()Lauc; diff --git a/mappings/awc.mapping b/mappings/awc.mapping deleted file mode 100644 index bd856bbb03..0000000000 --- a/mappings/awc.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS awc - METHOD a craft (Ladu;)Lauc; - METHOD a matches (Ladu;Laza;)Z - ARG 1 world - METHOD d getOutput ()Lauc; diff --git a/mappings/awd.mapping b/mappings/awd.mapping deleted file mode 100644 index 061bd2d5a8..0000000000 --- a/mappings/awd.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS awd - METHOD a craft (Ladu;)Lauc; - METHOD a matches (Ladu;Laza;)Z - ARG 1 world diff --git a/mappings/awe.mapping b/mappings/awe.mapping deleted file mode 100644 index ccf7aea561..0000000000 --- a/mappings/awe.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS awe - METHOD a craft (Ladu;)Lauc; - METHOD a matches (Ladu;Laza;)Z - ARG 1 world - METHOD d getOutput ()Lauc; diff --git a/mappings/awg.mapping b/mappings/awg.mapping deleted file mode 100644 index a87fc5b447..0000000000 --- a/mappings/awg.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS awg - METHOD a craft (Ladu;)Lauc; - METHOD a matches (Ladu;Laza;)Z - ARG 1 world diff --git a/mappings/awj.mapping b/mappings/awj.mapping deleted file mode 100644 index 089f0a148f..0000000000 --- a/mappings/awj.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS awj - METHOD a onResourceReload (Lvs;)V - ARG 0 container diff --git a/mappings/awm.mapping b/mappings/awm.mapping deleted file mode 100644 index f2609fd215..0000000000 --- a/mappings/awm.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS awm - METHOD a craft (Ladu;)Lauc; - METHOD a matches (Ladu;Laza;)Z - ARG 1 world diff --git a/mappings/awp.mapping b/mappings/awp.mapping deleted file mode 100644 index 6b55972828..0000000000 --- a/mappings/awp.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS awp - METHOD a craft (Ladu;)Lauc; - METHOD a matches (Ladu;Laza;)Z - ARG 1 world diff --git a/mappings/awq.mapping b/mappings/awq.mapping deleted file mode 100644 index 3c6531a94a..0000000000 --- a/mappings/awq.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS awq - METHOD a craft (Ladu;)Lauc; - METHOD a matches (Ladu;Laza;)Z - ARG 1 world diff --git a/mappings/awr.mapping b/mappings/awr.mapping deleted file mode 100644 index c3fbab3135..0000000000 --- a/mappings/awr.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS awr - METHOD a craft (Ladu;)Lauc; - METHOD a matches (Ladu;Laza;)Z - ARG 1 world - METHOD d getOutput ()Lauc; - METHOD e getPreviewInputs ()Lfe; diff --git a/mappings/aws.mapping b/mappings/aws.mapping deleted file mode 100644 index bdfce5e98d..0000000000 --- a/mappings/aws.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS aws - METHOD a craft (Ladu;)Lauc; - METHOD a matches (Ladu;Laza;)Z - ARG 1 world diff --git a/mappings/awt.mapping b/mappings/awt.mapping deleted file mode 100644 index f6c193687b..0000000000 --- a/mappings/awt.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS awt - METHOD a craft (Ladu;)Lauc; - METHOD a matches (Ladu;Laza;)Z - ARG 1 world diff --git a/mappings/awz.mapping b/mappings/awz.mapping index 7c16f212d1..5a01d79d20 100644 --- a/mappings/awz.mapping +++ b/mappings/awz.mapping @@ -1,4 +1,4 @@ CLASS awz METHOD a getHighestLevel ()I - METHOD a isEqual (Laxe;)Z + METHOD a differs (Laxe;)Z ARG 0 other diff --git a/mappings/axp.mapping b/mappings/axp.mapping index 5bd6e1f8ae..e1455301e2 100644 --- a/mappings/axp.mapping +++ b/mappings/axp.mapping @@ -1,4 +1,4 @@ CLASS axp METHOD a getHighestLevel ()I - METHOD a isEqual (Laxe;)Z + METHOD a differs (Laxe;)Z ARG 0 other diff --git a/mappings/axv.mapping b/mappings/axv.mapping index 548ab32659..e4e6164c41 100644 --- a/mappings/axv.mapping +++ b/mappings/axv.mapping @@ -1,4 +1,4 @@ CLASS axv METHOD a getHighestLevel ()I - METHOD a isEqual (Laxe;)Z + METHOD a differs (Laxe;)Z ARG 0 other diff --git a/mappings/axx.mapping b/mappings/axx.mapping index 9838fca9e2..4cc3e092e5 100644 --- a/mappings/axx.mapping +++ b/mappings/axx.mapping @@ -1,4 +1,4 @@ CLASS axx METHOD a getHighestLevel ()I - METHOD a isEqual (Laxe;)Z + METHOD a differs (Laxe;)Z ARG 0 other diff --git a/mappings/axy.mapping b/mappings/axy.mapping index 329888badd..97ea8247b8 100644 --- a/mappings/axy.mapping +++ b/mappings/axy.mapping @@ -1,4 +1,4 @@ CLASS axy METHOD a getHighestLevel ()I - METHOD a isEqual (Laxe;)Z + METHOD a differs (Laxe;)Z ARG 0 other diff --git a/mappings/baa.mapping b/mappings/baa.mapping new file mode 100644 index 0000000000..33d9b0cd50 --- /dev/null +++ b/mappings/baa.mapping @@ -0,0 +1 @@ +CLASS baa diff --git a/mappings/blf.mapping b/mappings/blf.mapping new file mode 100644 index 0000000000..b5f49af7a7 --- /dev/null +++ b/mappings/blf.mapping @@ -0,0 +1 @@ +CLASS blf diff --git a/mappings/cpx.mapping b/mappings/cpx.mapping index b24b3555ce..6b46d0ae11 100644 --- a/mappings/cpx.mapping +++ b/mappings/cpx.mapping @@ -1,2 +1,2 @@ CLASS cpx - METHOD a format (Ljava/util/List;)V + METHOD a (Ljava/util/List;)V diff --git a/mappings/cqc.mapping b/mappings/cqc.mapping new file mode 100644 index 0000000000..477c4bcbe0 --- /dev/null +++ b/mappings/cqc.mapping @@ -0,0 +1,2 @@ +CLASS cqc + METHOD a (Ljava/util/List;)V diff --git a/mappings/cqe.mapping b/mappings/cqe.mapping new file mode 100644 index 0000000000..eb0547e8ef --- /dev/null +++ b/mappings/cqe.mapping @@ -0,0 +1 @@ +CLASS cqe diff --git a/mappings/net/minecraft/block/BlockBannerBase.mapping b/mappings/net/minecraft/block/BlockBannerBase.mapping index ba675f59b5..f899f99b5c 100644 --- a/mappings/net/minecraft/block/BlockBannerBase.mapping +++ b/mappings/net/minecraft/block/BlockBannerBase.mapping @@ -1,4 +1,5 @@ CLASS bde net/minecraft/block/BlockBannerBase + FIELD b color Lasz; METHOD a canMobSpawnInside ()Z METHOD a createBlockEntity (Layn;)Lbkf; METHOD a getPickStack (Layn;Leq;Lblz;)Lauc; @@ -13,3 +14,4 @@ CLASS bde net/minecraft/block/BlockBannerBase ARG 4 stack METHOD a isFullBoundsCubeForConnection (Lblz;)Z ARG 0 state + METHOD b getColor ()Lasz; diff --git a/mappings/net/minecraft/block/BlockShulkerBox.mapping b/mappings/net/minecraft/block/BlockShulkerBox.mapping index 1a916e7089..4f036df884 100644 --- a/mappings/net/minecraft/block/BlockShulkerBox.mapping +++ b/mappings/net/minecraft/block/BlockShulkerBox.mapping @@ -1,5 +1,7 @@ CLASS big net/minecraft/block/BlockShulkerBox FIELD c color Lasz; + METHOD a get (Lasz;)Lbdx; + ARG 0 dyeColor METHOD a addInformation (Lauc;Layn;Ljava/util/List;Lavm;)V ARG 0 stack ARG 2 tooltip @@ -46,6 +48,8 @@ CLASS big net/minecraft/block/BlockShulkerBox METHOD a applyRotation (Lblz;Lbia;)Lblz; ARG 0 state ARG 1 rotation + METHOD b getItemStack (Lasz;)Lauc; + ARG 0 color METHOD b getColor (Latx;)Lasz; ARG 0 item METHOD b hasBlockEntityBreakingRender (Lblz;)Z diff --git a/mappings/net/minecraft/block/entity/BlockEntityFurnace.mapping b/mappings/net/minecraft/block/entity/BlockEntityFurnace.mapping index 8440a96280..5855f66a91 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityFurnace.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityFurnace.mapping @@ -1,6 +1,11 @@ CLASS bkr net/minecraft/block/entity/BlockEntityFurnace FIELD g inventory Lfe; + FIELD h burnTime I FIELD i fuelTime I + FIELD j cookTime I + FIELD k cookTimeTotal I + FIELD l customName Liw; + FIELD m recipesUsed Ljava/util/Map; METHOD O_ getNameAsComponent ()Liw; METHOD P_ hasCustomName ()Z METHOD Q_ isInvEmpty ()Z @@ -54,3 +59,4 @@ CLASS bkr net/minecraft/block/entity/BlockEntityFurnace METHOD l getContainerId ()Ljava/lang/String; METHOD m clearInv ()V METHOD r isBurning ()Z + METHOD s getRecipeCookTime ()I diff --git a/mappings/net/minecraft/client/MinecraftGame.mapping b/mappings/net/minecraft/client/MinecraftGame.mapping index 9aa7a71bf9..d96df52c73 100644 --- a/mappings/net/minecraft/client/MinecraftGame.mapping +++ b/mappings/net/minecraft/client/MinecraftGame.mapping @@ -69,6 +69,7 @@ CLASS cjj net/minecraft/client/MinecraftGame METHOD L is64Bit ()Z METHOD N getSoundLoader ()Ldkd; METHOD O getMusicType ()Ldka$a; + METHOD P isSnooperEnabled ()Z METHOD Q getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; METHOD R getSkinProvider ()Ldho; METHOD S getCameraEntity ()Lafh; diff --git a/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping b/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping index bd81c8060e..e88fc3364a 100644 --- a/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping +++ b/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping @@ -1,14 +1,19 @@ CLASS dht net/minecraft/client/resource/language/TranslationStorage FIELD a translations Ljava/util/Map; - METHOD a hasTranslation (Ljava/lang/String;)Z + FIELD b GSON Lcom/google/gson/Gson; + FIELD c LOGGER Lorg/apache/logging/log4j/Logger; + METHOD a load (Ljava/io/InputStream;)V + ARG 0 stream + METHOD a containsKey (Ljava/lang/String;)Z ARG 0 key METHOD a translate (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String; ARG 0 key ARG 1 args - METHOD a loadTranslations (Ljava/util/List;)V + METHOD a load (Ljava/util/List;)V ARG 0 resources + ARG 3 stream METHOD a load (Lvs;Ljava/util/List;)V ARG 0 container ARG 1 languages - METHOD b getTranslation (Ljava/lang/String;)Ljava/lang/String; + METHOD b get (Ljava/lang/String;)Ljava/lang/String; ARG 0 key diff --git a/mappings/net/minecraft/enchantment/Enchantment.mapping b/mappings/net/minecraft/enchantment/Enchantment.mapping index 1c7b0fa0b3..822cf257be 100644 --- a/mappings/net/minecraft/enchantment/Enchantment.mapping +++ b/mappings/net/minecraft/enchantment/Enchantment.mapping @@ -5,6 +5,7 @@ CLASS axe net/minecraft/enchantment/Enchantment FIELD c RARE Laxe$a; FIELD d LEGENDARY Laxe$a; FIELD e weight I + METHOD (Ljava/lang/String;II)V METHOD a getWeight ()I FIELD a slotTypes [Lafm; FIELD b type Laxf; @@ -29,12 +30,20 @@ CLASS axe net/minecraft/enchantment/Enchantment ARG 2 level METHOD a isAcceptableItem (Lauc;)Z ARG 0 item - METHOD a isEqual (Laxe;)Z + METHOD a differs (Laxe;)Z ARG 0 other METHOD b isLootOnly ()Z METHOD b onUserDamaged (Lafq;Lafh;I)V ARG 0 user ARG 1 attacker ARG 2 level + METHOD b isDifferent (Laxe;)Z + ARG 0 other + METHOD c isCursed ()Z METHOD d getWeight ()Laxe$a; + METHOD d getTextComponent (I)Liw; + ARG 0 level + ARG 1 component METHOD e getLowestLevel ()I + METHOD f getOrCreateTranslationKey ()Ljava/lang/String; + METHOD g getTranslationKey ()Ljava/lang/String; diff --git a/mappings/net/minecraft/enchantment/EnchantmentBindingCurse.mapping b/mappings/net/minecraft/enchantment/EnchantmentBindingCurse.mapping index 05958aa218..d0519b3619 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentBindingCurse.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentBindingCurse.mapping @@ -1,3 +1,4 @@ CLASS axa net/minecraft/enchantment/EnchantmentBindingCurse METHOD a getHighestLevel ()I METHOD b isLootOnly ()Z + METHOD c isCursed ()Z diff --git a/mappings/net/minecraft/enchantment/EnchantmentDamage.mapping b/mappings/net/minecraft/enchantment/EnchantmentDamage.mapping index d42601287a..bfcd68f54b 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentDamage.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentDamage.mapping @@ -9,5 +9,5 @@ CLASS axb net/minecraft/enchantment/EnchantmentDamage ARG 2 level METHOD a isAcceptableItem (Lauc;)Z ARG 0 item - METHOD a isEqual (Laxe;)Z + METHOD a differs (Laxe;)Z ARG 0 other diff --git a/mappings/net/minecraft/enchantment/EnchantmentDepthStrider.mapping b/mappings/net/minecraft/enchantment/EnchantmentDepthStrider.mapping index 395525b7b6..ead2292dac 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentDepthStrider.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentDepthStrider.mapping @@ -1,4 +1,4 @@ CLASS ayb net/minecraft/enchantment/EnchantmentDepthStrider METHOD a getHighestLevel ()I - METHOD a isEqual (Laxe;)Z + METHOD a differs (Laxe;)Z ARG 0 other diff --git a/mappings/net/minecraft/enchantment/EnchantmentFrostWalker.mapping b/mappings/net/minecraft/enchantment/EnchantmentFrostWalker.mapping index ce9db4f06b..3aaa1ad8dc 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentFrostWalker.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentFrostWalker.mapping @@ -1,5 +1,5 @@ CLASS axl net/minecraft/enchantment/EnchantmentFrostWalker METHOD a getHighestLevel ()I - METHOD a isEqual (Laxe;)Z + METHOD a differs (Laxe;)Z ARG 0 other METHOD b isLootOnly ()Z diff --git a/mappings/net/minecraft/enchantment/EnchantmentInfinity.mapping b/mappings/net/minecraft/enchantment/EnchantmentInfinity.mapping index 3e71db7caa..e1cf54fffd 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentInfinity.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentInfinity.mapping @@ -1,4 +1,4 @@ CLASS awx net/minecraft/enchantment/EnchantmentInfinity METHOD a getHighestLevel ()I - METHOD a isEqual (Laxe;)Z + METHOD a differs (Laxe;)Z ARG 0 other diff --git a/mappings/net/minecraft/enchantment/EnchantmentLuck.mapping b/mappings/net/minecraft/enchantment/EnchantmentLuck.mapping index 8938c96377..45b88ef682 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentLuck.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentLuck.mapping @@ -4,5 +4,5 @@ CLASS axn net/minecraft/enchantment/EnchantmentLuck ARG 1 type ARG 2 slotTypes METHOD a getHighestLevel ()I - METHOD a isEqual (Laxe;)Z + METHOD a differs (Laxe;)Z ARG 0 other diff --git a/mappings/net/minecraft/enchantment/EnchantmentProtection.mapping b/mappings/net/minecraft/enchantment/EnchantmentProtection.mapping index 35a79a48fb..dd7354b689 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentProtection.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentProtection.mapping @@ -14,5 +14,5 @@ CLASS axr net/minecraft/enchantment/EnchantmentProtection METHOD a getProtectionAmount (ILaeq;)I ARG 0 level ARG 1 source - METHOD a isEqual (Laxe;)Z + METHOD a differs (Laxe;)Z ARG 0 other diff --git a/mappings/net/minecraft/enchantment/EnchantmentSilkTouch.mapping b/mappings/net/minecraft/enchantment/EnchantmentSilkTouch.mapping index c6f6d57545..19eaeed491 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentSilkTouch.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentSilkTouch.mapping @@ -1,4 +1,4 @@ CLASS axz net/minecraft/enchantment/EnchantmentSilkTouch METHOD a getHighestLevel ()I - METHOD a isEqual (Laxe;)Z + METHOD a differs (Laxe;)Z ARG 0 other diff --git a/mappings/net/minecraft/enchantment/EnchantmentVanishingCurse.mapping b/mappings/net/minecraft/enchantment/EnchantmentVanishingCurse.mapping index feb27992f5..ba644cdad5 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentVanishingCurse.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentVanishingCurse.mapping @@ -1,3 +1,4 @@ CLASS aya net/minecraft/enchantment/EnchantmentVanishingCurse METHOD a getHighestLevel ()I METHOD b isLootOnly ()Z + METHOD c isCursed ()Z diff --git a/mappings/net/minecraft/entity/EntityExperienceOrb.mapping b/mappings/net/minecraft/entity/EntityExperienceOrb.mapping index 0c68db1412..7628d384e1 100644 --- a/mappings/net/minecraft/entity/EntityExperienceOrb.mapping +++ b/mappings/net/minecraft/entity/EntityExperienceOrb.mapping @@ -9,6 +9,8 @@ CLASS afn net/minecraft/entity/EntityExperienceOrb ARG 3 z ARG 4 amount METHOD S_ update ()V + METHOD a roundToOrbSize (I)I + ARG 0 value METHOD a damage (Laeq;F)Z ARG 0 source ARG 1 damage diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 251363bc38..4ef78ad600 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -1,17 +1,15 @@ CLASS afs net/minecraft/entity/EntityType FIELD a MONSTER Lafs; - FIELD b ANIMAL Lafs; - FIELD c CAVE Lafs; - FIELD d AQUATIC Lafs; + FIELD b CREATURE Lafs; + FIELD c AMBIENT Lafs; + FIELD d WATER_CREATURE Lafs; FIELD f entityClass Ljava/lang/Class; FIELD g spawnCap I FIELD h peaceful Z FIELD i animal Z + FIELD j name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;Ljava/lang/Class;IZZ)V - ARG 0 entityClass - ARG 1 spawnCap - ARG 3 preferredMaterial - ARG 4 peaceful + METHOD a getName ()Ljava/lang/String; METHOD b getEntityClass ()Ljava/lang/Class; METHOD c getSpawnCap ()I METHOD d isPeaceful ()Z diff --git a/mappings/ald.mapping b/mappings/net/minecraft/entity/EntityWaterCreature.mapping similarity index 68% rename from mappings/ald.mapping rename to mappings/net/minecraft/entity/EntityWaterCreature.mapping index 01e3b47bd6..7df63071b6 100644 --- a/mappings/ald.mapping +++ b/mappings/net/minecraft/entity/EntityWaterCreature.mapping @@ -1,4 +1,4 @@ -CLASS ald +CLASS ald net/minecraft/entity/EntityWaterCreature METHOD Y updateLogic ()V METHOD a canBeLeashedBy (Lapb;)Z ARG 0 player diff --git a/mappings/net/minecraft/entity/INpc.mapping b/mappings/net/minecraft/entity/INpc.mapping deleted file mode 100644 index 15b9786aa2..0000000000 --- a/mappings/net/minecraft/entity/INpc.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS aov net/minecraft/entity/INpc diff --git a/mappings/net/minecraft/entity/mob/EntityCaveMob.mapping b/mappings/net/minecraft/entity/mob/EntityAmbient.mapping similarity index 50% rename from mappings/net/minecraft/entity/mob/EntityCaveMob.mapping rename to mappings/net/minecraft/entity/mob/EntityAmbient.mapping index ed4c2825a1..5429984584 100644 --- a/mappings/net/minecraft/entity/mob/EntityCaveMob.mapping +++ b/mappings/net/minecraft/entity/mob/EntityAmbient.mapping @@ -1,3 +1,3 @@ -CLASS akb net/minecraft/entity/mob/EntityCaveMob +CLASS akb net/minecraft/entity/mob/EntityAmbient METHOD a canBeLeashedBy (Lapb;)Z ARG 0 player diff --git a/mappings/net/minecraft/entity/mob/IMonster.mapping b/mappings/net/minecraft/entity/mob/IMonster.mapping new file mode 100644 index 0000000000..45be66cf90 --- /dev/null +++ b/mappings/net/minecraft/entity/mob/IMonster.mapping @@ -0,0 +1 @@ +CLASS anq net/minecraft/entity/mob/IMonster diff --git a/mappings/net/minecraft/item/ItemArmorDyeable.mapping b/mappings/net/minecraft/item/ItemArmorDyeable.mapping index 0bd6330d9f..e12e4cd756 100644 --- a/mappings/net/minecraft/item/ItemArmorDyeable.mapping +++ b/mappings/net/minecraft/item/ItemArmorDyeable.mapping @@ -1 +1,5 @@ CLASS atb net/minecraft/item/ItemArmorDyeable + METHOD a setColor (Lauc;I)V + METHOD e hasColor (Lauc;)Z + METHOD f getColor (Lauc;)I + METHOD g removeColor (Lauc;)V diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index b2e6c6d244..063d803673 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -72,7 +72,7 @@ CLASS auc net/minecraft/item/ItemStack METHOD a getBlockBreakingSpeed (Lblz;)F ARG 0 state METHOD a setDisplayName (Liw;)Lauc; - METHOD a getOrCreateTagCompound (Ljava/lang/String;)Lhl; + METHOD a getOrCreateSubTagCompound (Ljava/lang/String;)Lhl; ARG 0 tagName METHOD a addAttributeModifier (Ljava/lang/String;Lage;Lafm;)V ARG 0 attributeName @@ -94,7 +94,7 @@ CLASS auc net/minecraft/item/ItemStack ARG 0 state METHOD b serialize (Lhl;)Lhl; ARG 0 tag - METHOD b getTagCompound (Ljava/lang/String;)Lhl; + METHOD b getSubTagCompound (Ljava/lang/String;)Lhl; ARG 0 tagName METHOD b getCustomCanPlace (Lxp;Lbmd;)Z METHOD c getMaxAmount ()I @@ -107,7 +107,7 @@ CLASS auc net/minecraft/item/ItemStack ARG 1 b METHOD c setTag (Lhl;)V ARG 0 tag - METHOD c removeTagCompound (Ljava/lang/String;)V + METHOD c removeSubTag (Ljava/lang/String;)V ARG 0 tagName METHOD d canBeStacked ()Z METHOD d setUpdateCooldown (I)V @@ -131,6 +131,7 @@ CLASS auc net/minecraft/item/ItemStack METHOD l getUseAction ()Lavo; METHOD n hasTag ()Z METHOD o getTag ()Lhl; + METHOD p getOrCreateTag ()Lhl; METHOD q getEnchantmentList ()Lhr; METHOD r getDisplayName ()Liw; METHOD s removeDisplayName ()V diff --git a/mappings/net/minecraft/item/block/ItemBanner.mapping b/mappings/net/minecraft/item/block/ItemBanner.mapping index 62335675d1..399ad2da69 100644 --- a/mappings/net/minecraft/item/block/ItemBanner.mapping +++ b/mappings/net/minecraft/item/block/ItemBanner.mapping @@ -2,3 +2,4 @@ CLASS asd net/minecraft/item/block/ItemBanner METHOD a addInformation (Lauc;Laza;Ljava/util/List;Lavm;)V ARG 0 stack ARG 2 tooltip + METHOD b getColor ()Lasz; diff --git a/mappings/net/minecraft/migration/IMigrationType.mapping b/mappings/net/minecraft/migration/IMigrationType.mapping deleted file mode 100644 index 2ae979fc40..0000000000 --- a/mappings/net/minecraft/migration/IMigrationType.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS baa net/minecraft/migration/IMigrationType diff --git a/mappings/net/minecraft/realms/RealmsBridge.mapping b/mappings/net/minecraft/realms/RealmsBridge.mapping new file mode 100644 index 0000000000..766d0131b7 --- /dev/null +++ b/mappings/net/minecraft/realms/RealmsBridge.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/realms/RealmsBridge diff --git a/mappings/net/minecraft/realms/RealmsSimpleScrolledSelectionList.mapping b/mappings/net/minecraft/realms/RealmsSimpleScrolledSelectionList.mapping new file mode 100644 index 0000000000..63d1eb40fe --- /dev/null +++ b/mappings/net/minecraft/realms/RealmsSimpleScrolledSelectionList.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/realms/RealmsSimpleScrolledSelectionList diff --git a/mappings/net/minecraft/recipe/Recipe.mapping b/mappings/net/minecraft/recipe/IRecipe.mapping similarity index 53% rename from mappings/net/minecraft/recipe/Recipe.mapping rename to mappings/net/minecraft/recipe/IRecipe.mapping index 3d09523814..d3d87aebb4 100644 --- a/mappings/net/minecraft/recipe/Recipe.mapping +++ b/mappings/net/minecraft/recipe/IRecipe.mapping @@ -1,8 +1,14 @@ -CLASS awi net/minecraft/recipe/Recipe +CLASS awi net/minecraft/recipe/IRecipe + METHOD a getSerializer ()Lawk; + METHOD a fits (II)Z + ARG 0 width + ARG 1 height METHOD a craft (Ladu;)Lauc; METHOD a matches (Ladu;Laza;)Z ARG 1 world + METHOD b getId ()Lpt; METHOD b getRemainingStacks (Ladu;)Lfe; METHOD c isIgnoredInRecipeBook ()Z METHOD d getOutput ()Lauc; METHOD e getPreviewInputs ()Lfe; + METHOD f getGroup ()Ljava/lang/String; diff --git a/mappings/net/minecraft/recipe/IRecipeSerializer.mapping b/mappings/net/minecraft/recipe/IRecipeSerializer.mapping new file mode 100644 index 0000000000..beb6fb2745 --- /dev/null +++ b/mappings/net/minecraft/recipe/IRecipeSerializer.mapping @@ -0,0 +1,11 @@ +CLASS awk net/minecraft/recipe/IRecipeSerializer + METHOD a getId ()Ljava/lang/String; + METHOD a write (Lim;Lawi;)V + ARG 0 buf + ARG 1 recipe + METHOD a read (Lpt;Lcom/google/gson/JsonObject;)Lawi; + ARG 0 id + ARG 1 json + METHOD a read (Lpt;Lim;)Lawi; + ARG 0 id + ARG 1 buf diff --git a/mappings/net/minecraft/recipe/Ingredient.mapping b/mappings/net/minecraft/recipe/Ingredient.mapping new file mode 100644 index 0000000000..66a92cf27c --- /dev/null +++ b/mappings/net/minecraft/recipe/Ingredient.mapping @@ -0,0 +1,10 @@ +CLASS awf net/minecraft/recipe/Ingredient + FIELD a EMPTY Lawf; + METHOD a fromJson (Lcom/google/gson/JsonElement;)Lawf; + ARG 0 element + METHOD a write (Lim;)V + ARG 0 buf + METHOD a fromItems ([Lauc;)Lawf; + METHOD b fromPacketBuf (Lim;)Lawf; + ARG 0 buf + METHOD c asJson ()Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/recipe/RecipeManager.mapping b/mappings/net/minecraft/recipe/RecipeManager.mapping new file mode 100644 index 0000000000..251b8cdd90 --- /dev/null +++ b/mappings/net/minecraft/recipe/RecipeManager.mapping @@ -0,0 +1,17 @@ +CLASS awj net/minecraft/recipe/RecipeManager + FIELD a PREFIX_LENGTH I + FIELD b SUFFIX_LENGTH I + FIELD c LOGGER Lorg/apache/logging/log4j/Logger; + FIELD d recipeMap Ljava/util/Map; + FIELD e hadErrors Z + METHOD a craft (Ladu;Laza;)Lauc; + METHOD a add (Lawi;)V + ARG 0 recipe + METHOD a get (Lpt;)Lawi; + ARG 0 id + METHOD a onResourceReload (Lvs;)V + ARG 0 container + METHOD b values ()Ljava/util/Collection; + METHOD b get (Ladu;Laza;)Lawi; + METHOD c keys ()Ljava/util/Collection; + METHOD d clear ()V diff --git a/mappings/net/minecraft/recipe/RecipeShapeless.mapping b/mappings/net/minecraft/recipe/RecipeShapeless.mapping deleted file mode 100644 index 90fa319705..0000000000 --- a/mappings/net/minecraft/recipe/RecipeShapeless.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS awo net/minecraft/recipe/RecipeShapeless - METHOD a craft (Ladu;)Lauc; - METHOD a matches (Ladu;Laza;)Z - ARG 1 world - METHOD d getOutput ()Lauc; - METHOD e getPreviewInputs ()Lfe; diff --git a/mappings/net/minecraft/recipe/crafting/RecipeArmorDye.mapping b/mappings/net/minecraft/recipe/crafting/RecipeArmorDye.mapping new file mode 100644 index 0000000000..ca64179356 --- /dev/null +++ b/mappings/net/minecraft/recipe/crafting/RecipeArmorDye.mapping @@ -0,0 +1,8 @@ +CLASS avy net/minecraft/recipe/crafting/RecipeArmorDye + METHOD a getSerializer ()Lawk; + METHOD a fits (II)Z + ARG 0 width + ARG 1 height + METHOD a craft (Ladu;)Lauc; + METHOD a matches (Ladu;Laza;)Z + ARG 1 world diff --git a/mappings/net/minecraft/recipe/crafting/RecipeBannerDuplicate.mapping b/mappings/net/minecraft/recipe/crafting/RecipeBannerDuplicate.mapping new file mode 100644 index 0000000000..f2976c4abc --- /dev/null +++ b/mappings/net/minecraft/recipe/crafting/RecipeBannerDuplicate.mapping @@ -0,0 +1,9 @@ +CLASS avz net/minecraft/recipe/crafting/RecipeBannerDuplicate + METHOD a getSerializer ()Lawk; + METHOD a fits (II)Z + ARG 0 width + ARG 1 height + METHOD a craft (Ladu;)Lauc; + METHOD a matches (Ladu;Laza;)Z + ARG 1 world + METHOD b getRemainingStacks (Ladu;)Lfe; diff --git a/mappings/net/minecraft/recipe/crafting/RecipeBookCloning.mapping b/mappings/net/minecraft/recipe/crafting/RecipeBookCloning.mapping new file mode 100644 index 0000000000..cc1855aa97 --- /dev/null +++ b/mappings/net/minecraft/recipe/crafting/RecipeBookCloning.mapping @@ -0,0 +1,9 @@ +CLASS awa net/minecraft/recipe/crafting/RecipeBookCloning + METHOD a getSerializer ()Lawk; + METHOD a fits (II)Z + ARG 0 width + ARG 1 height + METHOD a craft (Ladu;)Lauc; + METHOD a matches (Ladu;Laza;)Z + ARG 1 world + METHOD b getRemainingStacks (Ladu;)Lfe; diff --git a/mappings/net/minecraft/recipe/crafting/RecipeFireworkRocket.mapping b/mappings/net/minecraft/recipe/crafting/RecipeFireworkRocket.mapping new file mode 100644 index 0000000000..e5393bab01 --- /dev/null +++ b/mappings/net/minecraft/recipe/crafting/RecipeFireworkRocket.mapping @@ -0,0 +1,9 @@ +CLASS awc net/minecraft/recipe/crafting/RecipeFireworkRocket + METHOD a getSerializer ()Lawk; + METHOD a fits (II)Z + ARG 0 width + ARG 1 height + METHOD a craft (Ladu;)Lauc; + METHOD a matches (Ladu;Laza;)Z + ARG 1 world + METHOD d getOutput ()Lauc; diff --git a/mappings/net/minecraft/recipe/crafting/RecipeFireworkStar.mapping b/mappings/net/minecraft/recipe/crafting/RecipeFireworkStar.mapping new file mode 100644 index 0000000000..eac22a967f --- /dev/null +++ b/mappings/net/minecraft/recipe/crafting/RecipeFireworkStar.mapping @@ -0,0 +1,9 @@ +CLASS awe net/minecraft/recipe/crafting/RecipeFireworkStar + METHOD a getSerializer ()Lawk; + METHOD a fits (II)Z + ARG 0 width + ARG 1 height + METHOD a craft (Ladu;)Lauc; + METHOD a matches (Ladu;Laza;)Z + ARG 1 world + METHOD d getOutput ()Lauc; diff --git a/mappings/net/minecraft/recipe/crafting/RecipeFireworkStarFade.mapping b/mappings/net/minecraft/recipe/crafting/RecipeFireworkStarFade.mapping new file mode 100644 index 0000000000..da0f204bd1 --- /dev/null +++ b/mappings/net/minecraft/recipe/crafting/RecipeFireworkStarFade.mapping @@ -0,0 +1,8 @@ +CLASS awd net/minecraft/recipe/crafting/RecipeFireworkStarFade + METHOD a getSerializer ()Lawk; + METHOD a fits (II)Z + ARG 0 width + ARG 1 height + METHOD a craft (Ladu;)Lauc; + METHOD a matches (Ladu;Laza;)Z + ARG 1 world diff --git a/mappings/net/minecraft/recipe/crafting/RecipeMapCloning.mapping b/mappings/net/minecraft/recipe/crafting/RecipeMapCloning.mapping new file mode 100644 index 0000000000..f689028ca5 --- /dev/null +++ b/mappings/net/minecraft/recipe/crafting/RecipeMapCloning.mapping @@ -0,0 +1,8 @@ +CLASS awg net/minecraft/recipe/crafting/RecipeMapCloning + METHOD a getSerializer ()Lawk; + METHOD a fits (II)Z + ARG 0 width + ARG 1 height + METHOD a craft (Ladu;)Lauc; + METHOD a matches (Ladu;Laza;)Z + ARG 1 world diff --git a/mappings/net/minecraft/recipe/RecipeMapExtend.mapping b/mappings/net/minecraft/recipe/crafting/RecipeMapExtend.mapping similarity index 55% rename from mappings/net/minecraft/recipe/RecipeMapExtend.mapping rename to mappings/net/minecraft/recipe/crafting/RecipeMapExtend.mapping index c31e9ee04c..6dabfd2501 100644 --- a/mappings/net/minecraft/recipe/RecipeMapExtend.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeMapExtend.mapping @@ -1,4 +1,5 @@ -CLASS awh net/minecraft/recipe/RecipeMapExtend +CLASS awh net/minecraft/recipe/crafting/RecipeMapExtend + METHOD a getSerializer ()Lawk; METHOD a craft (Ladu;)Lauc; METHOD a matches (Ladu;Laza;)Z ARG 1 world diff --git a/mappings/net/minecraft/recipe/crafting/RecipeRepairItem.mapping b/mappings/net/minecraft/recipe/crafting/RecipeRepairItem.mapping new file mode 100644 index 0000000000..f07ccf01de --- /dev/null +++ b/mappings/net/minecraft/recipe/crafting/RecipeRepairItem.mapping @@ -0,0 +1,8 @@ +CLASS awm net/minecraft/recipe/crafting/RecipeRepairItem + METHOD a getSerializer ()Lawk; + METHOD a fits (II)Z + ARG 0 width + ARG 1 height + METHOD a craft (Ladu;)Lauc; + METHOD a matches (Ladu;Laza;)Z + ARG 1 world diff --git a/mappings/net/minecraft/recipe/RecipeShaped.mapping b/mappings/net/minecraft/recipe/crafting/RecipeShaped.mapping similarity index 50% rename from mappings/net/minecraft/recipe/RecipeShaped.mapping rename to mappings/net/minecraft/recipe/crafting/RecipeShaped.mapping index c5f54e9629..51d5b6f62d 100644 --- a/mappings/net/minecraft/recipe/RecipeShaped.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeShaped.mapping @@ -1,8 +1,25 @@ -CLASS awn net/minecraft/recipe/RecipeShaped +CLASS awn net/minecraft/recipe/crafting/RecipeShaped + CLASS awn$a Serializer + METHOD a getId ()Ljava/lang/String; + METHOD a write (Lim;Lawi;)V + ARG 0 buf + ARG 1 recipe + METHOD a read (Lpt;Lcom/google/gson/JsonObject;)Lawi; + ARG 0 id + ARG 1 json + METHOD a read (Lpt;Lim;)Lawi; + ARG 0 id + ARG 1 buf FIELD a width I FIELD b height I FIELD c inputs Lfe; FIELD d output Lauc; + FIELD e id Lpt; + FIELD f group Ljava/lang/String; + METHOD a getSerializer ()Lawk; + METHOD a fits (II)Z + ARG 0 width + ARG 1 height METHOD a craft (Ladu;)Lauc; METHOD a matchesSmall (Ladu;IIZ)Z ARG 1 offsetX @@ -10,11 +27,13 @@ CLASS awn net/minecraft/recipe/RecipeShaped ARG 3 mirrored METHOD a matches (Ladu;Laza;)Z ARG 1 world + METHOD b getId ()Lpt; METHOD b deserializePattern (Lcom/google/gson/JsonArray;)[Ljava/lang/String; ARG 0 arr METHOD c deserializeComponents (Lcom/google/gson/JsonObject;)Ljava/util/Map; ARG 0 obj METHOD d getOutput ()Lauc; METHOD e getPreviewInputs ()Lfe; + METHOD f getGroup ()Ljava/lang/String; METHOD g getWidth ()I METHOD h getHeight ()I diff --git a/mappings/net/minecraft/recipe/crafting/RecipeShapeless.mapping b/mappings/net/minecraft/recipe/crafting/RecipeShapeless.mapping new file mode 100644 index 0000000000..be422f0ad9 --- /dev/null +++ b/mappings/net/minecraft/recipe/crafting/RecipeShapeless.mapping @@ -0,0 +1,27 @@ +CLASS awo net/minecraft/recipe/crafting/RecipeShapeless + CLASS awo$a Serializer + METHOD a getId ()Ljava/lang/String; + METHOD a write (Lim;Lawi;)V + ARG 0 buf + ARG 1 recipe + METHOD a read (Lpt;Lcom/google/gson/JsonObject;)Lawi; + ARG 0 id + ARG 1 json + METHOD a read (Lpt;Lim;)Lawi; + ARG 0 id + ARG 1 buf + FIELD a id Lpt; + FIELD b group Ljava/lang/String; + FIELD c output Lauc; + FIELD d input Lfe; + METHOD a getSerializer ()Lawk; + METHOD a fits (II)Z + ARG 0 width + ARG 1 height + METHOD a craft (Ladu;)Lauc; + METHOD a matches (Ladu;Laza;)Z + ARG 1 world + METHOD b getId ()Lpt; + METHOD d getOutput ()Lauc; + METHOD e getPreviewInputs ()Lfe; + METHOD f getGroup ()Ljava/lang/String; diff --git a/mappings/net/minecraft/recipe/crafting/RecipeShieldDecoration.mapping b/mappings/net/minecraft/recipe/crafting/RecipeShieldDecoration.mapping new file mode 100644 index 0000000000..cb8d36677e --- /dev/null +++ b/mappings/net/minecraft/recipe/crafting/RecipeShieldDecoration.mapping @@ -0,0 +1,8 @@ +CLASS awp net/minecraft/recipe/crafting/RecipeShieldDecoration + METHOD a getSerializer ()Lawk; + METHOD a fits (II)Z + ARG 0 width + ARG 1 height + METHOD a craft (Ladu;)Lauc; + METHOD a matches (Ladu;Laza;)Z + ARG 1 world diff --git a/mappings/net/minecraft/recipe/crafting/RecipeShulkerBoxColoring.mapping b/mappings/net/minecraft/recipe/crafting/RecipeShulkerBoxColoring.mapping new file mode 100644 index 0000000000..e2f96498da --- /dev/null +++ b/mappings/net/minecraft/recipe/crafting/RecipeShulkerBoxColoring.mapping @@ -0,0 +1,8 @@ +CLASS awq net/minecraft/recipe/crafting/RecipeShulkerBoxColoring + METHOD a getSerializer ()Lawk; + METHOD a fits (II)Z + ARG 0 width + ARG 1 height + METHOD a craft (Ladu;)Lauc; + METHOD a matches (Ladu;Laza;)Z + ARG 1 world diff --git a/mappings/net/minecraft/recipe/crafting/RecipeSuspiciousStew.mapping b/mappings/net/minecraft/recipe/crafting/RecipeSuspiciousStew.mapping new file mode 100644 index 0000000000..63fc3e0132 --- /dev/null +++ b/mappings/net/minecraft/recipe/crafting/RecipeSuspiciousStew.mapping @@ -0,0 +1,8 @@ +CLASS aws net/minecraft/recipe/crafting/RecipeSuspiciousStew + METHOD a getSerializer ()Lawk; + METHOD a fits (II)Z + ARG 0 width + ARG 1 height + METHOD a craft (Ladu;)Lauc; + METHOD a matches (Ladu;Laza;)Z + ARG 1 world diff --git a/mappings/net/minecraft/recipe/crafting/RecipeTippedArrow.mapping b/mappings/net/minecraft/recipe/crafting/RecipeTippedArrow.mapping new file mode 100644 index 0000000000..c558adb0a1 --- /dev/null +++ b/mappings/net/minecraft/recipe/crafting/RecipeTippedArrow.mapping @@ -0,0 +1,8 @@ +CLASS awt net/minecraft/recipe/crafting/RecipeTippedArrow + METHOD a getSerializer ()Lawk; + METHOD a fits (II)Z + ARG 0 width + ARG 1 height + METHOD a craft (Ladu;)Lauc; + METHOD a matches (Ladu;Laza;)Z + ARG 1 world diff --git a/mappings/net/minecraft/recipe/smelting/RecipeSmelting.mapping b/mappings/net/minecraft/recipe/smelting/RecipeSmelting.mapping new file mode 100644 index 0000000000..81223157f4 --- /dev/null +++ b/mappings/net/minecraft/recipe/smelting/RecipeSmelting.mapping @@ -0,0 +1,30 @@ +CLASS awr net/minecraft/recipe/smelting/RecipeSmelting + CLASS awr$a Serializer + METHOD a getId ()Ljava/lang/String; + METHOD a write (Lim;Lawi;)V + ARG 0 buf + ARG 1 recipe + METHOD a read (Lpt;Lcom/google/gson/JsonObject;)Lawi; + ARG 0 id + ARG 1 json + METHOD a read (Lpt;Lim;)Lawi; + ARG 0 id + ARG 1 buf + FIELD a id Lpt; + FIELD b group Ljava/lang/String; + FIELD c input Lawf; + FIELD d output Lauc; + FIELD e experience F + METHOD a getSerializer ()Lawk; + METHOD a fits (II)Z + ARG 0 width + ARG 1 height + METHOD a craft (Ladu;)Lauc; + METHOD a matches (Ladu;Laza;)Z + ARG 1 world + METHOD b getId ()Lpt; + METHOD d getOutput ()Lauc; + METHOD e getPreviewInputs ()Lfe; + METHOD f getGroup ()Ljava/lang/String; + METHOD g getExperience ()F + METHOD h getCookTime ()I diff --git a/mappings/net/minecraft/reference/RecipeSerializers.mapping b/mappings/net/minecraft/reference/RecipeSerializers.mapping new file mode 100644 index 0000000000..20ad48448f --- /dev/null +++ b/mappings/net/minecraft/reference/RecipeSerializers.mapping @@ -0,0 +1,17 @@ +CLASS awl net/minecraft/reference/RecipeSerializers + CLASS awl$a Dummy + FIELD a id Ljava/lang/String; + FIELD b supplier Ljava/util/function/Function; + METHOD (Ljava/lang/String;Ljava/util/function/Function;)V + ARG 0 id + ARG 1 supplier + METHOD a getId ()Ljava/lang/String; + METHOD a write (Lim;Lawi;)V + ARG 0 buf + ARG 1 recipe + METHOD a read (Lpt;Lcom/google/gson/JsonObject;)Lawi; + ARG 0 id + ARG 1 json + METHOD a read (Lpt;Lim;)Lawi; + ARG 0 id + ARG 1 buf diff --git a/mappings/net/minecraft/reference/Sounds.mapping b/mappings/net/minecraft/reference/Sounds.mapping new file mode 100644 index 0000000000..910e2c2cb0 --- /dev/null +++ b/mappings/net/minecraft/reference/Sounds.mapping @@ -0,0 +1 @@ +CLASS ww net/minecraft/reference/Sounds diff --git a/mappings/net/minecraft/resource/IReloadableResourceManager.mapping b/mappings/net/minecraft/resource/IReloadableResourceManager.mapping new file mode 100644 index 0000000000..67b95855ba --- /dev/null +++ b/mappings/net/minecraft/resource/IReloadableResourceManager.mapping @@ -0,0 +1,3 @@ +CLASS vq net/minecraft/resource/IReloadableResourceManager + METHOD a addListener (Lvt;)V + ARG 0 listener diff --git a/mappings/net/minecraft/resource/IResource.mapping b/mappings/net/minecraft/resource/IResource.mapping new file mode 100644 index 0000000000..abce068d11 --- /dev/null +++ b/mappings/net/minecraft/resource/IResource.mapping @@ -0,0 +1,2 @@ +CLASS vr net/minecraft/resource/IResource + METHOD b open ()Ljava/io/InputStream; diff --git a/mappings/net/minecraft/resource/IResourceManager.mapping b/mappings/net/minecraft/resource/IResourceManager.mapping new file mode 100644 index 0000000000..8b42a3eb36 --- /dev/null +++ b/mappings/net/minecraft/resource/IResourceManager.mapping @@ -0,0 +1,6 @@ +CLASS vs net/minecraft/resource/IResourceManager + METHOD a getAllNamespaces ()Ljava/util/Set; + METHOD a getResource (Lpt;)Lvr; + ARG 0 id + METHOD b getAllResources (Lpt;)Ljava/util/List; + ARG 0 id diff --git a/mappings/net/minecraft/resource/Resource.mapping b/mappings/net/minecraft/resource/Resource.mapping new file mode 100644 index 0000000000..18b638c581 --- /dev/null +++ b/mappings/net/minecraft/resource/Resource.mapping @@ -0,0 +1,5 @@ +CLASS vv net/minecraft/resource/Resource + FIELD a RESOURCE_IO_EXECUTOR Ljava/util/concurrent/Executor; + FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + FIELD e inputStream Ljava/io/InputStream; + METHOD b open ()Ljava/io/InputStream; diff --git a/mappings/net/minecraft/resource/ResourceManager.mapping b/mappings/net/minecraft/resource/ResourceManager.mapping new file mode 100644 index 0000000000..680ebb6d3f --- /dev/null +++ b/mappings/net/minecraft/resource/ResourceManager.mapping @@ -0,0 +1,17 @@ +CLASS vu net/minecraft/resource/ResourceManager + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD c listeners Ljava/util/List; + FIELD e type Luz; + METHOD (Luz;)V + ARG 0 type + METHOD a getAllNamespaces ()Ljava/util/Set; + METHOD a getResource (Lpt;)Lvr; + ARG 0 id + METHOD a addListener (Lvt;)V + ARG 0 listener + METHOD b getAllResources (Lpt;)Ljava/util/List; + ARG 0 id + METHOD b emitReloadTimed (Lvt;)Ljava/lang/String; + ARG 0 listeners + METHOD c emitReloadAll ()V + METHOD d reloadAll ()V diff --git a/mappings/net/minecraft/resource/ResourceManagerType.mapping b/mappings/net/minecraft/resource/ResourceManagerType.mapping new file mode 100644 index 0000000000..aa54b76d3c --- /dev/null +++ b/mappings/net/minecraft/resource/ResourceManagerType.mapping @@ -0,0 +1,3 @@ +CLASS uz net/minecraft/resource/ResourceManagerType + FIELD a ASSETS Luz; + FIELD b DATA Luz; diff --git a/mappings/net/minecraft/server/IntegratedServer.mapping b/mappings/net/minecraft/server/IntegratedServer.mapping index 9b8a13156a..36104a705e 100644 --- a/mappings/net/minecraft/server/IntegratedServer.mapping +++ b/mappings/net/minecraft/server/IntegratedServer.mapping @@ -2,6 +2,7 @@ CLASS djr net/minecraft/server/IntegratedServer FIELD h LOGGER Lorg/apache/logging/log4j/Logger; FIELD i game Lcjj; FIELD j levelInfo Lazf; + FIELD l lanPort I FIELD m lanPinger Ldju; METHOD (Lcjj;Ljava/lang/String;Ljava/lang/String;Lazf;Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lvy;)V ARG 0 game @@ -24,6 +25,7 @@ CLASS djr net/minecraft/server/IntegratedServer ARG 0 atlas METHOD a setDefaultGameMode (Layx;)V ARG 0 gameMode + METHOD ad isRemote ()Z METHOD b addServerInfoToCrashReport (Lb;)Lb; ARG 0 report METHOD d setupServer ()Z diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 2f0414baa7..87c11ca90c 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -88,6 +88,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD aa getWorldHeight ()I METHOD ab isStopped ()Z METHOD ac getConfigurationManager ()Lwc; + METHOD ad isRemote ()Z METHOD ae getServerNetworkManager ()Luo; METHOD ag ()Z METHOD ah getTicks ()I diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping index 94edeac5f5..9c5187526e 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping @@ -23,6 +23,7 @@ CLASS th net/minecraft/server/dedicated/DedicatedServer METHOD aV getConfigurationManager ()Ltg; METHOD aY getMaxTickTime ()J METHOD ac getConfigurationManager ()Lwc; + METHOD ad isRemote ()Z METHOD ag ()Z METHOD al getSpawnProtectionRadius ()I METHOD au getMaxWorldBorderRadius ()I diff --git a/mappings/net/minecraft/sound/Sound.mapping b/mappings/net/minecraft/sound/Sound.mapping new file mode 100644 index 0000000000..ff122ae973 --- /dev/null +++ b/mappings/net/minecraft/sound/Sound.mapping @@ -0,0 +1,5 @@ +CLASS wv net/minecraft/sound/Sound + FIELD a id Lpt; + METHOD (Lpt;)V + ARG 0 id + METHOD a getId ()Lpt; diff --git a/mappings/net/minecraft/stat/IStatFormatter.mapping b/mappings/net/minecraft/stat/IStatFormatter.mapping deleted file mode 100644 index 9fceb54e9b..0000000000 --- a/mappings/net/minecraft/stat/IStatFormatter.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cqc net/minecraft/stat/IStatFormatter - METHOD a format (Ljava/util/List;)V diff --git a/mappings/vp.mapping b/mappings/vp.mapping new file mode 100644 index 0000000000..817617441f --- /dev/null +++ b/mappings/vp.mapping @@ -0,0 +1,6 @@ +CLASS vp + METHOD a getAllNamespaces ()Ljava/util/Set; + METHOD a getResource (Lpt;)Lvr; + ARG 0 id + METHOD b getAllResources (Lpt;)Ljava/util/List; + ARG 0 id diff --git a/mappings/vs.mapping b/mappings/vs.mapping deleted file mode 100644 index 9e4a9b7bc4..0000000000 --- a/mappings/vs.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS vs diff --git a/mappings/ww.mapping b/mappings/ww.mapping deleted file mode 100644 index 8d3ff06d70..0000000000 --- a/mappings/ww.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS ww