From 726aff207238d159aea4fb412bad0cc1cbad8268 Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Sat, 27 Oct 2018 16:04:34 +0200 Subject: [PATCH] attempt mapping VoxelShape, other updates --- mappings/ato.mapping | 1 + mappings/bpa.mapping | 2 + mappings/bpc.mapping | 1 + mappings/bpd.mapping | 2 + mappings/bpg.mapping | 2 + mappings/chl.mapping | 2 - mappings/cht.mapping | 10 +++++ mappings/chw.mapping | 6 +++ mappings/cqa.mapping | 2 + mappings/j.mapping | 7 ++++ .../ServerAdvancementManager.mapping | 1 + mappings/net/minecraft/block/Block.mapping | 1 + .../minecraft/client/MinecraftGame.mapping | 4 +- .../recipe/book/RecipeBookCategory.mapping | 3 ++ .../recipe/book/RecipeBookClient.mapping | 1 + .../client/sortme/ITooltipOptions.mapping | 2 + .../ISpriteRegistrationListener.mapping | 3 -- .../container/ContainerCrafting.mapping | 5 +++ .../container/ContainerCraftingTable.mapping | 4 ++ .../container/ContainerFurnace.mapping | 4 ++ .../minecraft/container/ContainerLoom.mapping | 4 ++ .../container/ContainerPlayer.mapping | 4 ++ .../entity/damage/DamageSource.mapping | 3 ++ mappings/net/minecraft/item/Item.mapping | 1 + .../minecraft/item/ItemArrowTipped.mapping | 1 + .../minecraft/item/ItemBannerPattern.mapping | 1 + .../minecraft/item/ItemBookEnchanted.mapping | 1 + .../minecraft/item/ItemBookWritten.mapping | 1 + .../minecraft/item/ItemFireworkCharge.mapping | 1 + .../net/minecraft/item/ItemFireworks.mapping | 1 + .../net/minecraft/item/ItemMapFilled.mapping | 1 + .../net/minecraft/item/ItemPotion.mapping | 1 + .../item/ItemPotionLingering.mapping | 1 + .../net/minecraft/item/ItemRecord.mapping | 1 + .../net/minecraft/item/ItemShield.mapping | 1 + .../minecraft/item/block/ItemBanner.mapping | 4 ++ .../minecraft/item/block/ItemBlock.mapping | 1 + .../minecraft/item/block/ItemBlockAir.mapping | 1 + .../minecraft/recipe/book/RecipeBook.mapping | 28 +++++++++++++ .../recipe/book/RecipeBookServer.mapping | 2 + .../minecraft/server/IntegratedServer.mapping | 4 +- .../minecraft/server/MinecraftServer.mapping | 6 ++- .../minecraft/server/ServerMetadata.mapping | 1 + .../server/config/ServerConfigList.mapping | 3 ++ .../config/ServerConfigurationManager.mapping | 2 + .../server/dedicated/DedicatedServer.mapping | 9 +++- ...dicatedServerConfigurationManager.mapping} | 11 ++++- mappings/net/minecraft/stat/StatType.mapping | 1 + .../state/property/PropertyEnum.mapping | 1 + mappings/net/minecraft/util/ChatUtils.mapping | 12 +++--- .../net/minecraft/util/DefaultedList.mapping | 7 +++- .../net/minecraft/util/NbtPredicate.mapping | 1 + .../util/UncaughtExceptionLogger.mapping | 2 + .../minecraft/util/math/MathHelper.mapping | 1 + .../util/shape/FractionalDoubleList.mapping | 2 + .../util/shape/SequentialDoubleList.mapping | 8 ++++ .../minecraft/util/shape/VoxelShape.mapping | 41 ++++++++++++------- .../util/shape/VoxelShapeBits.mapping | 41 +++++++++++++++++++ .../util/shape/VoxelShapeContainer.mapping | 21 ++++++++++ .../shape/VoxelShapeContainerPoints.mapping | 6 +++ .../shape/VoxelShapeContainerSimple.mapping | 5 +++ .../util/shape/VoxelShapeOffset.mapping | 30 ++++++++++++++ .../util/shape/VoxelShapeUtils.mapping | 6 +++ .../util/snooper/ISnooperListener.mapping | 3 ++ .../minecraft/util/snooper/Snooper.mapping | 4 +- .../world/chunk/ChunkProviderServer.mapping | 3 ++ .../level/storage/ILevelStorage.mapping} | 7 +++- .../level/storage/LevelStorageOld.mapping | 6 +++ .../world/level/storage/LevelSummary.mapping | 8 +++- 69 files changed, 335 insertions(+), 39 deletions(-) create mode 100644 mappings/bpa.mapping create mode 100644 mappings/bpd.mapping create mode 100644 mappings/bpg.mapping delete mode 100644 mappings/chl.mapping create mode 100644 mappings/cht.mapping create mode 100644 mappings/chw.mapping create mode 100644 mappings/j.mapping create mode 100644 mappings/net/minecraft/client/recipe/book/RecipeBookCategory.mapping create mode 100644 mappings/net/minecraft/client/sortme/ITooltipOptions.mapping delete mode 100644 mappings/net/minecraft/client/texture/ISpriteRegistrationListener.mapping create mode 100644 mappings/net/minecraft/container/ContainerCrafting.mapping rename mappings/{tg.mapping => net/minecraft/server/dedicated/DedicatedServerConfigurationManager.mapping} (57%) create mode 100644 mappings/net/minecraft/util/UncaughtExceptionLogger.mapping create mode 100644 mappings/net/minecraft/util/shape/FractionalDoubleList.mapping create mode 100644 mappings/net/minecraft/util/shape/SequentialDoubleList.mapping create mode 100644 mappings/net/minecraft/util/shape/VoxelShapeBits.mapping create mode 100644 mappings/net/minecraft/util/shape/VoxelShapeContainer.mapping create mode 100644 mappings/net/minecraft/util/shape/VoxelShapeContainerPoints.mapping create mode 100644 mappings/net/minecraft/util/shape/VoxelShapeContainerSimple.mapping create mode 100644 mappings/net/minecraft/util/shape/VoxelShapeOffset.mapping create mode 100644 mappings/net/minecraft/util/shape/VoxelShapeUtils.mapping create mode 100644 mappings/net/minecraft/util/snooper/ISnooperListener.mapping rename mappings/{cdm.mapping => net/minecraft/world/level/storage/ILevelStorage.mapping} (73%) diff --git a/mappings/ato.mapping b/mappings/ato.mapping index 75b0105d20..85f4d44361 100644 --- a/mappings/ato.mapping +++ b/mappings/ato.mapping @@ -1,4 +1,5 @@ CLASS ato METHOD a addInformation (Lauc;Laza;Ljava/util/List;Lavm;)V ARG 0 stack + ARG 1 world ARG 2 tooltip diff --git a/mappings/bpa.mapping b/mappings/bpa.mapping new file mode 100644 index 0000000000..88c658bfda --- /dev/null +++ b/mappings/bpa.mapping @@ -0,0 +1,2 @@ +CLASS bpa + METHOD p getType ()Lbpb; diff --git a/mappings/bpc.mapping b/mappings/bpc.mapping index 4e21f8a01c..708dd4d36f 100644 --- a/mappings/bpc.mapping +++ b/mappings/bpc.mapping @@ -2,3 +2,4 @@ CLASS bpc CLASS bpc$1 METHOD f getCenterX ()D METHOD g getCenterZ ()D + METHOD p getType ()Lbpb; diff --git a/mappings/bpd.mapping b/mappings/bpd.mapping new file mode 100644 index 0000000000..f77ff347ad --- /dev/null +++ b/mappings/bpd.mapping @@ -0,0 +1,2 @@ +CLASS bpd + METHOD p getType ()Lbpb; diff --git a/mappings/bpg.mapping b/mappings/bpg.mapping new file mode 100644 index 0000000000..aba9edb9c2 --- /dev/null +++ b/mappings/bpg.mapping @@ -0,0 +1,2 @@ +CLASS bpg + METHOD p getType ()Lbpb; diff --git a/mappings/chl.mapping b/mappings/chl.mapping deleted file mode 100644 index c3ee8db8f8..0000000000 --- a/mappings/chl.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS chl - FIELD d AXIS [Lev$a; diff --git a/mappings/cht.mapping b/mappings/cht.mapping new file mode 100644 index 0000000000..26cebdf03f --- /dev/null +++ b/mappings/cht.mapping @@ -0,0 +1,10 @@ +CLASS cht + FIELD b parent Lchv; + FIELD c axis Lev$a; + FIELD d axisList Lit/unimi/dsi/fastutil/doubles/DoubleList; + METHOD a (Lchl;Lev$a;I)Lchl; + ARG 0 shape + ARG 1 axis + ARG 2 amount + METHOD a (Lev$a;)Lit/unimi/dsi/fastutil/doubles/DoubleList; + ARG 0 axis diff --git a/mappings/chw.mapping b/mappings/chw.mapping new file mode 100644 index 0000000000..23fc8fe570 --- /dev/null +++ b/mappings/chw.mapping @@ -0,0 +1,6 @@ +CLASS chw + FIELD b xOffset I + FIELD c yOffset I + FIELD d zOffset I + METHOD a (Lev$a;)Lit/unimi/dsi/fastutil/doubles/DoubleList; + ARG 0 axis diff --git a/mappings/cqa.mapping b/mappings/cqa.mapping index c8366aa9f9..fbc1c82419 100644 --- a/mappings/cqa.mapping +++ b/mappings/cqa.mapping @@ -1,4 +1,6 @@ CLASS cqa + FIELD u category Lcjo; METHOD a draw (IIF)V ARG 1 mouseY ARG 2 delta + METHOD d getCategory ()Lcjo; diff --git a/mappings/j.mapping b/mappings/j.mapping new file mode 100644 index 0000000000..9460093bf4 --- /dev/null +++ b/mappings/j.mapping @@ -0,0 +1,7 @@ +CLASS j + FIELD a RESOURCE_LEAK_DETECTOR_DISABLED Lio/netty/util/ResourceLeakDetector$Level; + FIELD c INVALID_CHARS_LEVEL_NAME [C + METHOD a isValidChar (C)Z + ARG 0 chr + METHOD a stripInvalidChars (Ljava/lang/String;)Ljava/lang/String; + ARG 0 s diff --git a/mappings/net/minecraft/advancement/ServerAdvancementManager.mapping b/mappings/net/minecraft/advancement/ServerAdvancementManager.mapping index 5969ae8fc7..7ea9ced033 100644 --- a/mappings/net/minecraft/advancement/ServerAdvancementManager.mapping +++ b/mappings/net/minecraft/advancement/ServerAdvancementManager.mapping @@ -4,5 +4,6 @@ CLASS qd net/minecraft/advancement/ServerAdvancementManager FIELD c JSON_TYPE Lcom/google/gson/reflect/TypeToken; FIELD d server Lnet/minecraft/server/MinecraftServer; FIELD e advancementFile Ljava/io/File; + METHOD b reload ()V METHOD c save ()V METHOD g load ()V diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index ad524c6381..cd3caa0334 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -33,6 +33,7 @@ CLASS bdx net/minecraft/block/Block ARG 0 builder METHOD Y_ getOffsetType ()Lbdx$b; METHOD a canMobSpawnInside ()Z + METHOD a createCubeShape (DDDDDD)Lchv; METHOD a getBlockFromItem (Latx;)Lbdx; ARG 0 item METHOD a addInformation (Lauc;Layn;Ljava/util/List;Lavm;)V diff --git a/mappings/net/minecraft/client/MinecraftGame.mapping b/mappings/net/minecraft/client/MinecraftGame.mapping index 26208060cd..d3c309b2ed 100644 --- a/mappings/net/minecraft/client/MinecraftGame.mapping +++ b/mappings/net/minecraft/client/MinecraftGame.mapping @@ -79,8 +79,8 @@ CLASS cjk net/minecraft/client/MinecraftGame METHOD W getFirstPersonRenderer ()Lcxs; METHOD X getCurrentFps ()I METHOD a start ()V - METHOD a registerSprites (Laek;)V - ARG 0 atlas + METHOD a addSnooperInfo (Laek;)V + ARG 0 snooper METHOD a setCameraEntity (Lafh;)V ARG 0 entity METHOD a setCrashReport (Lb;)V diff --git a/mappings/net/minecraft/client/recipe/book/RecipeBookCategory.mapping b/mappings/net/minecraft/client/recipe/book/RecipeBookCategory.mapping new file mode 100644 index 0000000000..df419a735b --- /dev/null +++ b/mappings/net/minecraft/client/recipe/book/RecipeBookCategory.mapping @@ -0,0 +1,3 @@ +CLASS cjo net/minecraft/client/recipe/book/RecipeBookCategory + FIELD j iconList Ljava/util/List; + METHOD a getIconList ()Ljava/util/List; diff --git a/mappings/net/minecraft/client/recipe/book/RecipeBookClient.mapping b/mappings/net/minecraft/client/recipe/book/RecipeBookClient.mapping index 9a22ae8e39..f2dc2f62da 100644 --- a/mappings/net/minecraft/client/recipe/book/RecipeBookClient.mapping +++ b/mappings/net/minecraft/client/recipe/book/RecipeBookClient.mapping @@ -1 +1,2 @@ CLASS cja net/minecraft/client/recipe/book/RecipeBookClient + FIELD g manager Lawj; diff --git a/mappings/net/minecraft/client/sortme/ITooltipOptions.mapping b/mappings/net/minecraft/client/sortme/ITooltipOptions.mapping new file mode 100644 index 0000000000..d691a9fcb4 --- /dev/null +++ b/mappings/net/minecraft/client/sortme/ITooltipOptions.mapping @@ -0,0 +1,2 @@ +CLASS avm net/minecraft/client/sortme/ITooltipOptions + CLASS avm$a Instance diff --git a/mappings/net/minecraft/client/texture/ISpriteRegistrationListener.mapping b/mappings/net/minecraft/client/texture/ISpriteRegistrationListener.mapping deleted file mode 100644 index e3ea86ccdf..0000000000 --- a/mappings/net/minecraft/client/texture/ISpriteRegistrationListener.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS ael net/minecraft/client/texture/ISpriteRegistrationListener - METHOD a registerSprites (Laek;)V - ARG 0 atlas diff --git a/mappings/net/minecraft/container/ContainerCrafting.mapping b/mappings/net/minecraft/container/ContainerCrafting.mapping new file mode 100644 index 0000000000..872cbabbdb --- /dev/null +++ b/mappings/net/minecraft/container/ContainerCrafting.mapping @@ -0,0 +1,5 @@ +CLASS arn net/minecraft/container/ContainerCrafting + METHOD a matches (Lawi;)Z + ARG 0 recipe + METHOD f getCraftingWidth ()I + METHOD g getCrafitngHeight ()I diff --git a/mappings/net/minecraft/container/ContainerCraftingTable.mapping b/mappings/net/minecraft/container/ContainerCraftingTable.mapping index 4acf8d60e6..b9034b29a2 100644 --- a/mappings/net/minecraft/container/ContainerCraftingTable.mapping +++ b/mappings/net/minecraft/container/ContainerCraftingTable.mapping @@ -11,8 +11,12 @@ CLASS aqy net/minecraft/container/ContainerCraftingTable ARG 0 inventory METHOD a canUse (Lapb;)Z ARG 0 player + METHOD a matches (Lawi;)Z + ARG 0 recipe METHOD b close (Lapb;)V ARG 0 player METHOD b getStack (Lapb;I)Lauc; ARG 0 player ARG 1 slot + METHOD f getCraftingWidth ()I + METHOD g getCrafitngHeight ()I diff --git a/mappings/net/minecraft/container/ContainerFurnace.mapping b/mappings/net/minecraft/container/ContainerFurnace.mapping index 87e3647643..e3713ae178 100644 --- a/mappings/net/minecraft/container/ContainerFurnace.mapping +++ b/mappings/net/minecraft/container/ContainerFurnace.mapping @@ -11,6 +11,8 @@ CLASS arc net/minecraft/container/ContainerFurnace ARG 0 player METHOD a addListener (Laqw;)V ARG 0 listener + METHOD a matches (Lawi;)Z + ARG 0 recipe METHOD b sendContentUpdates ()V METHOD b setProperty (II)V ARG 0 pos @@ -18,3 +20,5 @@ CLASS arc net/minecraft/container/ContainerFurnace METHOD b getStack (Lapb;I)Lauc; ARG 0 player ARG 1 slot + METHOD f getCraftingWidth ()I + METHOD g getCrafitngHeight ()I diff --git a/mappings/net/minecraft/container/ContainerLoom.mapping b/mappings/net/minecraft/container/ContainerLoom.mapping index ca47707ebe..6109fe4af0 100644 --- a/mappings/net/minecraft/container/ContainerLoom.mapping +++ b/mappings/net/minecraft/container/ContainerLoom.mapping @@ -29,6 +29,8 @@ CLASS ari net/minecraft/container/ContainerLoom METHOD a onButtonClick (Lapb;I)Z ARG 0 player ARG 1 buttonId + METHOD a matches (Lawi;)Z + ARG 0 recipe METHOD b sendContentUpdates ()V METHOD b setProperty (II)V ARG 0 pos @@ -38,3 +40,5 @@ CLASS ari net/minecraft/container/ContainerLoom METHOD b getStack (Lapb;I)Lauc; ARG 0 player ARG 1 slot + METHOD f getCraftingWidth ()I + METHOD g getCrafitngHeight ()I diff --git a/mappings/net/minecraft/container/ContainerPlayer.mapping b/mappings/net/minecraft/container/ContainerPlayer.mapping index 441c558edb..e8166e5f48 100644 --- a/mappings/net/minecraft/container/ContainerPlayer.mapping +++ b/mappings/net/minecraft/container/ContainerPlayer.mapping @@ -21,8 +21,12 @@ CLASS arh net/minecraft/container/ContainerPlayer ARG 0 inventory METHOD a canUse (Lapb;)Z ARG 0 player + METHOD a matches (Lawi;)Z + ARG 0 recipe METHOD b close (Lapb;)V ARG 0 player METHOD b getStack (Lapb;I)Lauc; ARG 0 player ARG 1 slot + METHOD f getCraftingWidth ()I + METHOD g getCrafitngHeight ()I diff --git a/mappings/net/minecraft/entity/damage/DamageSource.mapping b/mappings/net/minecraft/entity/damage/DamageSource.mapping index 1e415b0ee5..0720ae6aef 100644 --- a/mappings/net/minecraft/entity/damage/DamageSource.mapping +++ b/mappings/net/minecraft/entity/damage/DamageSource.mapping @@ -10,6 +10,7 @@ CLASS aeq net/minecraft/entity/damage/DamageSource FIELD d LAVA Laeq; FIELD e HOT_FLOOR Laeq; FIELD f IN_WALL Laeq; + FIELD g CRAMMING Laeq; FIELD h DROWN Laeq; FIELD i STARVE Laeq; FIELD j CACTUS Laeq; @@ -22,6 +23,8 @@ CLASS aeq net/minecraft/entity/damage/DamageSource FIELD q ANVIL Laeq; FIELD r FALLING_BLOCK Laeq; FIELD s DRAGON_BREATH Laeq; + FIELD t FIREWORKS Laeq; + FIELD u DRYOUT Laeq; FIELD v name Ljava/lang/String; FIELD x damageToCreative Z FIELD y unblockable Z diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index 48385381c6..818725bdf3 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -80,6 +80,7 @@ CLASS atx net/minecraft/item/Item ARG 4 user METHOD a addInformation (Lauc;Laza;Ljava/util/List;Lavm;)V ARG 0 stack + ARG 1 world ARG 2 tooltip METHOD a getBlockBreakingSpeed (Lauc;Lblz;)F ARG 0 stack diff --git a/mappings/net/minecraft/item/ItemArrowTipped.mapping b/mappings/net/minecraft/item/ItemArrowTipped.mapping index ca656d7f65..943670999d 100644 --- a/mappings/net/minecraft/item/ItemArrowTipped.mapping +++ b/mappings/net/minecraft/item/ItemArrowTipped.mapping @@ -5,6 +5,7 @@ CLASS avl net/minecraft/item/ItemArrowTipped ARG 1 items METHOD a addInformation (Lauc;Laza;Ljava/util/List;Lavm;)V ARG 0 stack + ARG 1 world ARG 2 tooltip METHOD a createEntityArrow (Laza;Lauc;Lafq;)Lapf; ARG 0 world diff --git a/mappings/net/minecraft/item/ItemBannerPattern.mapping b/mappings/net/minecraft/item/ItemBannerPattern.mapping index 973b8ecdf6..536b45d2cc 100644 --- a/mappings/net/minecraft/item/ItemBannerPattern.mapping +++ b/mappings/net/minecraft/item/ItemBannerPattern.mapping @@ -1,4 +1,5 @@ CLASS ase net/minecraft/item/ItemBannerPattern METHOD a addInformation (Lauc;Laza;Ljava/util/List;Lavm;)V ARG 0 stack + ARG 1 world ARG 2 tooltip diff --git a/mappings/net/minecraft/item/ItemBookEnchanted.mapping b/mappings/net/minecraft/item/ItemBookEnchanted.mapping index 5d1623b7ea..5b5fe55196 100644 --- a/mappings/net/minecraft/item/ItemBookEnchanted.mapping +++ b/mappings/net/minecraft/item/ItemBookEnchanted.mapping @@ -10,6 +10,7 @@ CLASS atf net/minecraft/item/ItemBookEnchanted ARG 1 enchantmentInfo METHOD a addInformation (Lauc;Laza;Ljava/util/List;Lavm;)V ARG 0 stack + ARG 1 world ARG 2 tooltip METHOD e getEnchantmentTag (Lauc;)Lhr; ARG 0 stack diff --git a/mappings/net/minecraft/item/ItemBookWritten.mapping b/mappings/net/minecraft/item/ItemBookWritten.mapping index 0f9e50665a..f4182afb83 100644 --- a/mappings/net/minecraft/item/ItemBookWritten.mapping +++ b/mappings/net/minecraft/item/ItemBookWritten.mapping @@ -3,6 +3,7 @@ CLASS avs net/minecraft/item/ItemBookWritten ARG 0 builder METHOD a addInformation (Lauc;Laza;Ljava/util/List;Lavm;)V ARG 0 stack + ARG 1 world ARG 2 tooltip METHOD a onRightClick (Laza;Lapb;Laea;)Laed; ARG 0 world diff --git a/mappings/net/minecraft/item/ItemFireworkCharge.mapping b/mappings/net/minecraft/item/ItemFireworkCharge.mapping index 74215066dc..00f923987c 100644 --- a/mappings/net/minecraft/item/ItemFireworkCharge.mapping +++ b/mappings/net/minecraft/item/ItemFireworkCharge.mapping @@ -5,4 +5,5 @@ CLASS atn net/minecraft/item/ItemFireworkCharge ARG 0 colorRGB METHOD a addInformation (Lauc;Laza;Ljava/util/List;Lavm;)V ARG 0 stack + ARG 1 world ARG 2 tooltip diff --git a/mappings/net/minecraft/item/ItemFireworks.mapping b/mappings/net/minecraft/item/ItemFireworks.mapping index 2a7bc0c628..b786d010e9 100644 --- a/mappings/net/minecraft/item/ItemFireworks.mapping +++ b/mappings/net/minecraft/item/ItemFireworks.mapping @@ -3,6 +3,7 @@ CLASS atm net/minecraft/item/ItemFireworks ARG 0 builder METHOD a addInformation (Lauc;Laza;Ljava/util/List;Lavm;)V ARG 0 stack + ARG 1 world ARG 2 tooltip METHOD a activate (Lavp;)Laec; ARG 0 context diff --git a/mappings/net/minecraft/item/ItemMapFilled.mapping b/mappings/net/minecraft/item/ItemMapFilled.mapping index 7065a3ff7a..3523b92727 100644 --- a/mappings/net/minecraft/item/ItemMapFilled.mapping +++ b/mappings/net/minecraft/item/ItemMapFilled.mapping @@ -13,6 +13,7 @@ CLASS auh net/minecraft/item/ItemMapFilled ARG 2 player METHOD a addInformation (Lauc;Laza;Ljava/util/List;Lavm;)V ARG 0 stack + ARG 1 world ARG 2 tooltip METHOD a activate (Lavp;)Laec; ARG 0 context diff --git a/mappings/net/minecraft/item/ItemPotion.mapping b/mappings/net/minecraft/item/ItemPotion.mapping index 365a4daf5d..78a52626ef 100644 --- a/mappings/net/minecraft/item/ItemPotion.mapping +++ b/mappings/net/minecraft/item/ItemPotion.mapping @@ -9,6 +9,7 @@ CLASS aun net/minecraft/item/ItemPotion ARG 2 user METHOD a addInformation (Lauc;Laza;Ljava/util/List;Lavm;)V ARG 0 stack + ARG 1 world ARG 2 tooltip METHOD a onRightClick (Laza;Lapb;Laea;)Laed; ARG 0 world diff --git a/mappings/net/minecraft/item/ItemPotionLingering.mapping b/mappings/net/minecraft/item/ItemPotionLingering.mapping index e479ebdced..e108162ff0 100644 --- a/mappings/net/minecraft/item/ItemPotionLingering.mapping +++ b/mappings/net/minecraft/item/ItemPotionLingering.mapping @@ -3,6 +3,7 @@ CLASS aug net/minecraft/item/ItemPotionLingering ARG 0 builder METHOD a addInformation (Lauc;Laza;Ljava/util/List;Lavm;)V ARG 0 stack + ARG 1 world ARG 2 tooltip METHOD a onRightClick (Laza;Lapb;Laea;)Laed; ARG 0 world diff --git a/mappings/net/minecraft/item/ItemRecord.mapping b/mappings/net/minecraft/item/ItemRecord.mapping index 903b6e1a5b..5279776f2f 100644 --- a/mappings/net/minecraft/item/ItemRecord.mapping +++ b/mappings/net/minecraft/item/ItemRecord.mapping @@ -3,6 +3,7 @@ CLASS auq net/minecraft/item/ItemRecord FIELD c sound Lwv; METHOD a addInformation (Lauc;Laza;Ljava/util/List;Lavm;)V ARG 0 stack + ARG 1 world ARG 2 tooltip METHOD a activate (Lavp;)Laec; ARG 0 context diff --git a/mappings/net/minecraft/item/ItemShield.mapping b/mappings/net/minecraft/item/ItemShield.mapping index 63472becb3..7fb0aa484e 100644 --- a/mappings/net/minecraft/item/ItemShield.mapping +++ b/mappings/net/minecraft/item/ItemShield.mapping @@ -6,6 +6,7 @@ CLASS auw net/minecraft/item/ItemShield ARG 1 repairItem METHOD a addInformation (Lauc;Laza;Ljava/util/List;Lavm;)V ARG 0 stack + ARG 1 world ARG 2 tooltip METHOD a onRightClick (Laza;Lapb;Laea;)Laed; ARG 0 world diff --git a/mappings/net/minecraft/item/block/ItemBanner.mapping b/mappings/net/minecraft/item/block/ItemBanner.mapping index 399ad2da69..c7fbd75de0 100644 --- a/mappings/net/minecraft/item/block/ItemBanner.mapping +++ b/mappings/net/minecraft/item/block/ItemBanner.mapping @@ -1,5 +1,9 @@ CLASS asd net/minecraft/item/block/ItemBanner METHOD a addInformation (Lauc;Laza;Ljava/util/List;Lavm;)V ARG 0 stack + ARG 1 world ARG 2 tooltip + METHOD a addBannerInformation (Lauc;Ljava/util/List;)V + ARG 0 stack + ARG 1 list METHOD b getColor ()Lasz; diff --git a/mappings/net/minecraft/item/block/ItemBlock.mapping b/mappings/net/minecraft/item/block/ItemBlock.mapping index 2fbea8214f..0f6974b6cb 100644 --- a/mappings/net/minecraft/item/block/ItemBlock.mapping +++ b/mappings/net/minecraft/item/block/ItemBlock.mapping @@ -5,6 +5,7 @@ CLASS asg net/minecraft/item/block/ItemBlock ARG 1 items METHOD a addInformation (Lauc;Laza;Ljava/util/List;Lavm;)V ARG 0 stack + ARG 1 world ARG 2 tooltip METHOD a activate (Lavp;)Laec; ARG 0 context diff --git a/mappings/net/minecraft/item/block/ItemBlockAir.mapping b/mappings/net/minecraft/item/block/ItemBlockAir.mapping index 3278be033b..58be57454d 100644 --- a/mappings/net/minecraft/item/block/ItemBlockAir.mapping +++ b/mappings/net/minecraft/item/block/ItemBlockAir.mapping @@ -3,4 +3,5 @@ CLASS arw net/minecraft/item/block/ItemBlockAir METHOD a getTranslationKey ()Ljava/lang/String; METHOD a addInformation (Lauc;Laza;Ljava/util/List;Lavm;)V ARG 0 stack + ARG 1 world ARG 2 tooltip diff --git a/mappings/net/minecraft/recipe/book/RecipeBook.mapping b/mappings/net/minecraft/recipe/book/RecipeBook.mapping index 0051c0a2a7..0696ac44fc 100644 --- a/mappings/net/minecraft/recipe/book/RecipeBook.mapping +++ b/mappings/net/minecraft/recipe/book/RecipeBook.mapping @@ -1 +1,29 @@ CLASS wz net/minecraft/recipe/book/RecipeBook + FIELD a recipes Ljava/util/Set; + FIELD b toBeDisplayed Ljava/util/Set; + FIELD c guiOpen Z + FIELD d filteringCraftable Z + FIELD e furnaceGuiOpen Z + FIELD f furnaceFilteringCraftable Z + METHOD a isGuiOpen ()Z + METHOD a isFilteringCraftable (Larn;)Z + ARG 0 container + METHOD a copyFrom (Lwz;)V + ARG 0 book + METHOD a setGuiOpen (Z)V + ARG 0 value + METHOD b isFilteringCraftable ()Z + METHOD b (Lpt;)V + METHOD b setFilteringCraftable (Z)V + ARG 0 value + METHOD c isFurnaceGuiOpen ()Z + METHOD c (Lawi;)V + METHOD c (Lpt;)V + METHOD c setFurnaceGuiOpen (Z)V + ARG 0 value + METHOD d isFurnaceFilteringCraftable ()Z + METHOD d (Lawi;)Z + METHOD d setFurnaceFilteringCraftable (Z)V + ARG 0 value + METHOD e (Lawi;)V + METHOD f (Lawi;)V diff --git a/mappings/net/minecraft/recipe/book/RecipeBookServer.mapping b/mappings/net/minecraft/recipe/book/RecipeBookServer.mapping index 0ef5dac330..6f2ce3c9d1 100644 --- a/mappings/net/minecraft/recipe/book/RecipeBookServer.mapping +++ b/mappings/net/minecraft/recipe/book/RecipeBookServer.mapping @@ -1 +1,3 @@ CLASS xa net/minecraft/recipe/book/RecipeBookServer + FIELD g LOGGER Lorg/apache/logging/log4j/Logger; + FIELD h manager Lawj; diff --git a/mappings/net/minecraft/server/IntegratedServer.mapping b/mappings/net/minecraft/server/IntegratedServer.mapping index bbeb0adb58..8bd7b9cf14 100644 --- a/mappings/net/minecraft/server/IntegratedServer.mapping +++ b/mappings/net/minecraft/server/IntegratedServer.mapping @@ -21,8 +21,8 @@ CLASS djq net/minecraft/server/IntegratedServer METHOD Y areCommandBlocksEnabled ()Z METHOD a setDifficulty (Lady;)V ARG 0 difficulty - METHOD a registerSprites (Laek;)V - ARG 0 atlas + METHOD a addSnooperInfo (Laek;)V + ARG 0 snooper METHOD a setDefaultGameMode (Layx;)V ARG 0 gameMode METHOD ad isRemote ()Z diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index c549e95937..8ca2f6305d 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -34,6 +34,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer FIELD d lastTickLengths [J FIELD f serverThread Ljava/lang/Thread; FIELD h LOGGER Lorg/apache/logging/log4j/Logger; + FIELD i levelStorage Lcdm; FIELD j snooper Laek; FIELD k gameDir Ljava/io/File; FIELD l tickables Ljava/util/List; @@ -78,11 +79,12 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer ARG 0 value METHOD a setDifficulty (Lady;)V ARG 0 difficulty - METHOD a registerSprites (Laek;)V - ARG 0 atlas + METHOD a addSnooperInfo (Laek;)V + ARG 0 snooper METHOD a setDefaultGameMode (Layx;)V ARG 0 gameMode METHOD a getWorld (Lbpb;)Ltz; + ARG 0 type METHOD a getPermissionLevel (Lcom/mojang/authlib/GameProfile;)I ARG 0 profile METHOD a appendCommandFeedback (Liw;)V diff --git a/mappings/net/minecraft/server/ServerMetadata.mapping b/mappings/net/minecraft/server/ServerMetadata.mapping index 4772531cee..373b709dbe 100644 --- a/mappings/net/minecraft/server/ServerMetadata.mapping +++ b/mappings/net/minecraft/server/ServerMetadata.mapping @@ -1 +1,2 @@ CLASS pd net/minecraft/server/ServerMetadata + CLASS pd$c diff --git a/mappings/net/minecraft/server/config/ServerConfigList.mapping b/mappings/net/minecraft/server/config/ServerConfigList.mapping index 2c659e557d..c8105296dc 100644 --- a/mappings/net/minecraft/server/config/ServerConfigList.mapping +++ b/mappings/net/minecraft/server/config/ServerConfigList.mapping @@ -12,9 +12,12 @@ CLASS wg net/minecraft/server/config/ServerConfigList METHOD a add (Lwf;)V METHOD b get (Ljava/lang/Object;)Lwf; METHOD b removeEntry (Lwf;)V + METHOD c getFile ()Ljava/io/File; METHOD c remove (Ljava/lang/Object;)V METHOD d isEmpty ()Z METHOD d contains (Ljava/lang/Object;)Z ARG 0 key METHOD e values ()Ljava/util/Collection; METHOD f save ()V + METHOD g load ()V + METHOD h removeInvalidEntries ()V diff --git a/mappings/net/minecraft/server/config/ServerConfigurationManager.mapping b/mappings/net/minecraft/server/config/ServerConfigurationManager.mapping index 88903081c3..744cec3383 100644 --- a/mappings/net/minecraft/server/config/ServerConfigurationManager.mapping +++ b/mappings/net/minecraft/server/config/ServerConfigurationManager.mapping @@ -65,6 +65,8 @@ CLASS wc net/minecraft/server/config/ServerConfigurationManager ARG 0 profile METHOD f canBypassPlayerLimit (Lcom/mojang/authlib/GameProfile;)Z ARG 0 profile + METHOD g getUserBanList ()Lwh; + METHOD h getIpBanList ()Lvz; METHOD h isOperator (Lcom/mojang/authlib/GameProfile;)Z ARG 0 profile METHOD i saveAllPlayerData ()V diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping index e1863ce4fb..31131e0a49 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping @@ -1,6 +1,10 @@ CLASS th net/minecraft/server/dedicated/DedicatedServer FIELD h LOGGER_DEDICATED Lorg/apache/logging/log4j/Logger; + FIELD m rconServer Lwt; FIELD n properties Lqj; + FIELD o eulaReader Lqb; + FIELD p generateStructures Z + FIELD q defaultGameMode Layx; FIELD r hasGui Z METHOD C_ shouldBroadcastConsoleToOps ()Z METHOD K isMonsterSpawningEnabled ()Z @@ -8,8 +12,8 @@ CLASS th net/minecraft/server/dedicated/DedicatedServer METHOD Q isDedicated ()Z METHOD V isUsingNativeTransport ()Z METHOD Y areCommandBlocksEnabled ()Z - METHOD a registerSprites (Laek;)V - ARG 0 atlas + METHOD a addSnooperInfo (Laek;)V + ARG 0 snooper METHOD a setDefaultGameMode (Layx;)V ARG 0 gameMode METHOD a getInteger (Ljava/lang/String;I)I @@ -21,6 +25,7 @@ CLASS th net/minecraft/server/dedicated/DedicatedServer METHOD a getString (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; ARG 0 key ARG 1 defaultValue + METHOD a getBoolean (Ljava/lang/String;Z)Z METHOD aW getConfigurationManager ()Ltg; METHOD aX createGui ()V METHOD aZ getMaxTickTime ()J diff --git a/mappings/tg.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServerConfigurationManager.mapping similarity index 57% rename from mappings/tg.mapping rename to mappings/net/minecraft/server/dedicated/DedicatedServerConfigurationManager.mapping index f7bc1756e0..af3fe24d18 100644 --- a/mappings/tg.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedServerConfigurationManager.mapping @@ -1,9 +1,15 @@ -CLASS tg +CLASS tg net/minecraft/server/dedicated/DedicatedServerConfigurationManager + METHOD A loadUserBanList ()V + METHOD B loadOpList ()V + METHOD C saveOpList ()V + METHOD D loadWhitelist ()V + METHOD E saveWhitelist ()V METHOD a reloadWhitelist ()V METHOD a addToOperators (Lcom/mojang/authlib/GameProfile;)V ARG 0 profile METHOD a setWhitelistEnabled (Z)V ARG 0 value + METHOD b getDedicatedServer ()Lth; METHOD b removeFromOperators (Lcom/mojang/authlib/GameProfile;)V ARG 0 profile METHOD c getServer ()Lnet/minecraft/server/MinecraftServer; @@ -11,3 +17,6 @@ CLASS tg ARG 0 profile METHOD f canBypassPlayerLimit (Lcom/mojang/authlib/GameProfile;)Z ARG 0 profile + METHOD x saveIpBanList ()V + METHOD y saveUserBanList ()V + METHOD z loadIpBanList ()V diff --git a/mappings/net/minecraft/stat/StatType.mapping b/mappings/net/minecraft/stat/StatType.mapping index 6c42dba970..d810b3a9db 100644 --- a/mappings/net/minecraft/stat/StatType.mapping +++ b/mappings/net/minecraft/stat/StatType.mapping @@ -1 +1,2 @@ CLASS xe net/minecraft/stat/StatType + METHOD c getTranslationKey ()Ljava/lang/String; diff --git a/mappings/net/minecraft/state/property/PropertyEnum.mapping b/mappings/net/minecraft/state/property/PropertyEnum.mapping index 2b1a84990f..7ddf95983f 100644 --- a/mappings/net/minecraft/state/property/PropertyEnum.mapping +++ b/mappings/net/minecraft/state/property/PropertyEnum.mapping @@ -14,6 +14,7 @@ CLASS bne net/minecraft/state/property/PropertyEnum METHOD a create (Ljava/lang/String;Ljava/lang/Class;Ljava/util/Collection;)Lbne; ARG 1 valueClass ARG 2 validValues + METHOD a create (Ljava/lang/String;Ljava/lang/Class;Ljava/util/function/Predicate;)Lbne; METHOD a create (Ljava/lang/String;Ljava/lang/Class;[Ljava/lang/Enum;)Lbne; ARG 0 name ARG 1 valueClass diff --git a/mappings/net/minecraft/util/ChatUtils.mapping b/mappings/net/minecraft/util/ChatUtils.mapping index 9c413a492d..df1b749dd4 100644 --- a/mappings/net/minecraft/util/ChatUtils.mapping +++ b/mappings/net/minecraft/util/ChatUtils.mapping @@ -1,7 +1,5 @@ -CLASS j net/minecraft/util/ChatUtils - FIELD a RESOURCE_LEAK_DETECTOR_DISABLED Lio/netty/util/ResourceLeakDetector$Level; - FIELD c INVALID_CHARS_LEVEL_NAME [C - METHOD a isValidChar (C)Z - ARG 0 chr - METHOD a stripInvalidChars (Ljava/lang/String;)Ljava/lang/String; - ARG 0 s +CLASS yk net/minecraft/util/ChatUtils + FIELD a PATTERN Ljava/util/regex/Pattern; + METHOD a stripTextFormat (Ljava/lang/String;)Ljava/lang/String; + ARG 0 text + METHOD b isEmpty (Ljava/lang/String;)Z diff --git a/mappings/net/minecraft/util/DefaultedList.mapping b/mappings/net/minecraft/util/DefaultedList.mapping index 3751f21181..04fcde781e 100644 --- a/mappings/net/minecraft/util/DefaultedList.mapping +++ b/mappings/net/minecraft/util/DefaultedList.mapping @@ -7,10 +7,14 @@ CLASS fe net/minecraft/util/DefaultedList METHOD a create ()Lfe; METHOD a create (ILjava/lang/Object;)Lfe; ARG 0 size - ARG 1 defaultVAlue + ARG 1 defaultValue + METHOD a create (Ljava/lang/Object;[Ljava/lang/Object;)Lfe; + ARG 0 defaultValue + ARG 1 values METHOD add (ILjava/lang/Object;)V ARG 0 index ARG 1 value + METHOD clear ()V METHOD get (I)Ljava/lang/Object; ARG 0 index METHOD remove (I)Ljava/lang/Object; @@ -18,3 +22,4 @@ CLASS fe net/minecraft/util/DefaultedList METHOD set (ILjava/lang/Object;)Ljava/lang/Object; ARG 0 index ARG 1 value + METHOD size ()I diff --git a/mappings/net/minecraft/util/NbtPredicate.mapping b/mappings/net/minecraft/util/NbtPredicate.mapping index c8f179cd33..6544aa1fa8 100644 --- a/mappings/net/minecraft/util/NbtPredicate.mapping +++ b/mappings/net/minecraft/util/NbtPredicate.mapping @@ -1,5 +1,6 @@ CLASS be net/minecraft/util/NbtPredicate FIELD a ANY Lbe; + FIELD b tag Lhl; METHOD a matches (Lafh;)Z METHOD a matches (Lauc;)Z METHOD a deserialize (Lcom/google/gson/JsonElement;)Lbe; diff --git a/mappings/net/minecraft/util/UncaughtExceptionLogger.mapping b/mappings/net/minecraft/util/UncaughtExceptionLogger.mapping new file mode 100644 index 0000000000..47bac211d4 --- /dev/null +++ b/mappings/net/minecraft/util/UncaughtExceptionLogger.mapping @@ -0,0 +1,2 @@ +CLASS e net/minecraft/util/UncaughtExceptionLogger + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index 940ba207a1..9a007009f7 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -6,6 +6,7 @@ CLASS ye net/minecraft/util/math/MathHelper FIELD e SMALLEST_FRACTION_FREE_DOUBLE D FIELD f asinTable [D FIELD g cosTable [D + METHOD ()V METHOD a randomUUID ()Ljava/util/UUID; METHOD a sqrt (D)F METHOD a absMax (DD)D diff --git a/mappings/net/minecraft/util/shape/FractionalDoubleList.mapping b/mappings/net/minecraft/util/shape/FractionalDoubleList.mapping new file mode 100644 index 0000000000..f8b716a961 --- /dev/null +++ b/mappings/net/minecraft/util/shape/FractionalDoubleList.mapping @@ -0,0 +1,2 @@ +CLASS chi net/minecraft/util/shape/FractionalDoubleList + FIELD a count I diff --git a/mappings/net/minecraft/util/shape/SequentialDoubleList.mapping b/mappings/net/minecraft/util/shape/SequentialDoubleList.mapping new file mode 100644 index 0000000000..7f9ac6b6f2 --- /dev/null +++ b/mappings/net/minecraft/util/shape/SequentialDoubleList.mapping @@ -0,0 +1,8 @@ +CLASS chp net/minecraft/util/shape/SequentialDoubleList + FIELD a count I + FIELD b offset I + METHOD (II)V + ARG 0 count + ARG 1 offset + METHOD getDouble (I)D + ARG 0 i diff --git a/mappings/net/minecraft/util/shape/VoxelShape.mapping b/mappings/net/minecraft/util/shape/VoxelShape.mapping index 74671d703e..301f48c3d5 100644 --- a/mappings/net/minecraft/util/shape/VoxelShape.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShape.mapping @@ -1,16 +1,29 @@ -CLASS chv net/minecraft/util/shape/VoxelShape - METHOD a getBoundingBox ()Lcgz; - METHOD a rayTrace (Lchd;Lchd;Leq;)Lcha; - ARG 0 start - ARG 1 end - ARG 2 pos - METHOD a (Lev;)Lchv; - ARG 0 facing - ARG 1 axis - ARG 2 direction - METHOD b isEmpty ()Z - METHOD b getMinimum (Lev$a;)D +CLASS chl net/minecraft/util/shape/VoxelShape + FIELD a xSize I + FIELD b ySize I + FIELD c zSize I + FIELD d AXIS [Lev$a; + METHOD (III)V + ARG 0 xSize + ARG 1 ySize + ARG 2 zSize + METHOD a isEmpty ()Z + METHOD a set (IIIZZ)V + ARG 0 x + ARG 1 y + ARG 2 z + ARG 3 resize + ARG 4 value + METHOD a getMinimum (Lev$a;)I ARG 0 axis - METHOD c getMaximum (Lev$a;)D + METHOD b getXSize ()I + METHOD b contains (III)Z + ARG 0 x + ARG 1 y + ARG 2 z + METHOD b getMaximum (Lev$a;)I ARG 0 axis - METHOD d getBoundingBoxList ()Ljava/util/List; + METHOD c getYSize ()I + METHOD c getSize (Lev$a;)I + ARG 0 axis + METHOD d getZSize ()I diff --git a/mappings/net/minecraft/util/shape/VoxelShapeBits.mapping b/mappings/net/minecraft/util/shape/VoxelShapeBits.mapping new file mode 100644 index 0000000000..da5daad7b7 --- /dev/null +++ b/mappings/net/minecraft/util/shape/VoxelShapeBits.mapping @@ -0,0 +1,41 @@ +CLASS chg net/minecraft/util/shape/VoxelShapeBits + FIELD d storage Ljava/util/BitSet; + FIELD e xMin I + FIELD f yMin I + FIELD g zMin I + FIELD h xMax I + FIELD i yMax I + FIELD j zMax I + METHOD (III)V + ARG 0 xSize + ARG 1 ySize + ARG 2 zSize + METHOD (IIIIIIIII)V + ARG 0 xSize + ARG 1 ySize + ARG 2 zSize + ARG 3 xMin + ARG 4 yMin + ARG 5 zMin + ARG 6 xMax + ARG 7 yMax + ARG 8 zMax + METHOD a isEmpty ()Z + METHOD a getIndex (III)I + ARG 0 x + ARG 1 y + ARG 2 z + METHOD a set (IIIZZ)V + ARG 0 x + ARG 1 y + ARG 2 z + ARG 3 resize + ARG 4 value + METHOD a getMinimum (Lev$a;)I + ARG 0 axis + METHOD b contains (III)Z + ARG 0 x + ARG 1 y + ARG 2 z + METHOD b getMaximum (Lev$a;)I + ARG 0 axis diff --git a/mappings/net/minecraft/util/shape/VoxelShapeContainer.mapping b/mappings/net/minecraft/util/shape/VoxelShapeContainer.mapping new file mode 100644 index 0000000000..3410d2a5dd --- /dev/null +++ b/mappings/net/minecraft/util/shape/VoxelShapeContainer.mapping @@ -0,0 +1,21 @@ +CLASS chv net/minecraft/util/shape/VoxelShapeContainer + FIELD a shape Lchl; + METHOD (Lchl;)V + ARG 0 part + METHOD a getBoundingBox ()Lcgz; + METHOD a rayTrace (Lchd;Lchd;Leq;)Lcha; + ARG 0 start + ARG 1 end + ARG 2 pos + METHOD a (Lev$a;)Lit/unimi/dsi/fastutil/doubles/DoubleList; + ARG 0 axis + METHOD a (Lev;)Lchv; + ARG 0 facing + ARG 1 axis + ARG 2 direction + METHOD b isEmpty ()Z + METHOD b getMinimum (Lev$a;)D + ARG 0 axis + METHOD c getMaximum (Lev$a;)D + ARG 0 axis + METHOD d getBoundingBoxList ()Ljava/util/List; diff --git a/mappings/net/minecraft/util/shape/VoxelShapeContainerPoints.mapping b/mappings/net/minecraft/util/shape/VoxelShapeContainerPoints.mapping new file mode 100644 index 0000000000..71be58823c --- /dev/null +++ b/mappings/net/minecraft/util/shape/VoxelShapeContainerPoints.mapping @@ -0,0 +1,6 @@ +CLASS chf net/minecraft/util/shape/VoxelShapeContainerPoints + FIELD b pointsX Lit/unimi/dsi/fastutil/doubles/DoubleList; + FIELD c pointsY Lit/unimi/dsi/fastutil/doubles/DoubleList; + FIELD d pointsZ Lit/unimi/dsi/fastutil/doubles/DoubleList; + METHOD a (Lev$a;)Lit/unimi/dsi/fastutil/doubles/DoubleList; + ARG 0 axis diff --git a/mappings/net/minecraft/util/shape/VoxelShapeContainerSimple.mapping b/mappings/net/minecraft/util/shape/VoxelShapeContainerSimple.mapping new file mode 100644 index 0000000000..c5007a7d29 --- /dev/null +++ b/mappings/net/minecraft/util/shape/VoxelShapeContainerSimple.mapping @@ -0,0 +1,5 @@ +CLASS chj net/minecraft/util/shape/VoxelShapeContainerSimple + METHOD (Lchl;)V + ARG 0 part + METHOD a (Lev$a;)Lit/unimi/dsi/fastutil/doubles/DoubleList; + ARG 0 axis diff --git a/mappings/net/minecraft/util/shape/VoxelShapeOffset.mapping b/mappings/net/minecraft/util/shape/VoxelShapeOffset.mapping new file mode 100644 index 0000000000..0b7d0dcae1 --- /dev/null +++ b/mappings/net/minecraft/util/shape/VoxelShapeOffset.mapping @@ -0,0 +1,30 @@ +CLASS chu net/minecraft/util/shape/VoxelShapeOffset + FIELD d parent Lchl; + FIELD e xMin I + FIELD f yMin I + FIELD g zMin I + FIELD h xMax I + FIELD i yMax I + FIELD j zMax I + METHOD (Lchl;IIIIII)V + ARG 0 parent + ARG 1 xMin + ARG 2 yMin + ARG 3 zMin + ARG 4 xMax + ARG 5 yMax + ARG 6 zMax + METHOD a set (IIIZZ)V + ARG 0 x + ARG 1 y + ARG 2 z + ARG 3 resize + ARG 4 value + METHOD a getMinimum (Lev$a;)I + ARG 0 axis + METHOD b contains (III)Z + ARG 0 x + ARG 1 y + ARG 2 z + METHOD b getMaximum (Lev$a;)I + ARG 0 axis diff --git a/mappings/net/minecraft/util/shape/VoxelShapeUtils.mapping b/mappings/net/minecraft/util/shape/VoxelShapeUtils.mapping new file mode 100644 index 0000000000..5b95ae6344 --- /dev/null +++ b/mappings/net/minecraft/util/shape/VoxelShapeUtils.mapping @@ -0,0 +1,6 @@ +CLASS chs net/minecraft/util/shape/VoxelShapeUtils + FIELD a EMPTY Lchv; + METHOD a getEmpty ()Lchv; + METHOD a createCubeShape (DDDDDD)Lchv; + ARG 0 xMin + METHOD a createCubeShape (Lcgz;)Lchv; diff --git a/mappings/net/minecraft/util/snooper/ISnooperListener.mapping b/mappings/net/minecraft/util/snooper/ISnooperListener.mapping new file mode 100644 index 0000000000..1394762011 --- /dev/null +++ b/mappings/net/minecraft/util/snooper/ISnooperListener.mapping @@ -0,0 +1,3 @@ +CLASS ael net/minecraft/util/snooper/ISnooperListener + METHOD a addSnooperInfo (Laek;)V + ARG 0 snooper diff --git a/mappings/net/minecraft/util/snooper/Snooper.mapping b/mappings/net/minecraft/util/snooper/Snooper.mapping index 79004189df..bed778c762 100644 --- a/mappings/net/minecraft/util/snooper/Snooper.mapping +++ b/mappings/net/minecraft/util/snooper/Snooper.mapping @@ -3,9 +3,11 @@ CLASS aek net/minecraft/util/snooper/Snooper FIELD b info Ljava/util/Map; FIELD c token Ljava/lang/String; FIELD d snooperUrl Ljava/net/URL; + FIELD e listener Lael; FIELD f timer Ljava/util/Timer; FIELD g syncObject Ljava/lang/Object; FIELD h startTime J + FIELD i active Z METHOD (Ljava/lang/String;Lael;J)V ARG 0 urlPath ARG 2 startTime @@ -17,7 +19,7 @@ CLASS aek net/minecraft/util/snooper/Snooper ARG 0 key ARG 1 value METHOD c getEntryListClient ()Ljava/util/Map; - METHOD d isRunning ()Z + METHOD d isActive ()Z METHOD e cancel ()V METHOD f getToken ()Ljava/lang/String; METHOD g getStartTime ()J diff --git a/mappings/net/minecraft/world/chunk/ChunkProviderServer.mapping b/mappings/net/minecraft/world/chunk/ChunkProviderServer.mapping index 0d4efc8f8d..cc0ffbdc2d 100644 --- a/mappings/net/minecraft/world/chunk/ChunkProviderServer.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkProviderServer.mapping @@ -1,6 +1,9 @@ CLASS ty net/minecraft/world/chunk/ChunkProviderServer FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD i world Laza; + FIELD n loadedChunkMap Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap; + FIELD s worldGenWorkerPool Ljava/util/concurrent/ExecutorService; METHOD b get (II)Layn; ARG 0 chunkX ARG 1 chunkZ + METHOD f getLoadedChunkCount ()I diff --git a/mappings/cdm.mapping b/mappings/net/minecraft/world/level/storage/ILevelStorage.mapping similarity index 73% rename from mappings/cdm.mapping rename to mappings/net/minecraft/world/level/storage/ILevelStorage.mapping index d366dae1f5..b81c3bc27a 100644 --- a/mappings/cdm.mapping +++ b/mappings/net/minecraft/world/level/storage/ILevelStorage.mapping @@ -1,4 +1,4 @@ -CLASS cdm +CLASS cdm net/minecraft/world/level/storage/ILevelStorage METHOD a getName ()Ljava/lang/String; METHOD a isConvertible (Ljava/lang/String;)Z ARG 0 levelName @@ -11,6 +11,9 @@ CLASS cdm METHOD b getAvailableLevels ()Ljava/util/List; METHOD b requiresConversion (Ljava/lang/String;)Z ARG 0 levelName + METHOD b resolveFile (Ljava/lang/String;Ljava/lang/String;)Ljava/io/File; + ARG 0 first + ARG 1 second METHOD c getLevelProperties (Ljava/lang/String;)Lcdj; ARG 0 levelName METHOD d clearAll ()V @@ -19,3 +22,5 @@ CLASS cdm METHOD e delete (Ljava/lang/String;)Z ARG 0 levelName METHOD f exists (Ljava/lang/String;)Z + METHOD g resolvePath (Ljava/lang/String;)Ljava/nio/file/Path; + ARG 0 path diff --git a/mappings/net/minecraft/world/level/storage/LevelStorageOld.mapping b/mappings/net/minecraft/world/level/storage/LevelStorageOld.mapping index 6418b0d6fc..863f2cc5e2 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorageOld.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorageOld.mapping @@ -1,4 +1,5 @@ CLASS cdi net/minecraft/world/level/storage/LevelStorageOld + FIELD a rootPath Ljava/nio/file/Path; FIELD e LOGGER Lorg/apache/logging/log4j/Logger; METHOD a getName ()Ljava/lang/String; METHOD a isConvertible (Ljava/lang/String;)Z @@ -14,6 +15,9 @@ CLASS cdi net/minecraft/world/level/storage/LevelStorageOld METHOD b getAvailableLevels ()Ljava/util/List; METHOD b requiresConversion (Ljava/lang/String;)Z ARG 0 levelName + METHOD b resolveFile (Ljava/lang/String;Ljava/lang/String;)Ljava/io/File; + ARG 0 first + ARG 1 second METHOD c getLevelProperties (Ljava/lang/String;)Lcdj; ARG 0 levelName METHOD d clearAll ()V @@ -22,3 +26,5 @@ CLASS cdi net/minecraft/world/level/storage/LevelStorageOld METHOD e delete (Ljava/lang/String;)Z ARG 0 levelName METHOD f exists (Ljava/lang/String;)Z + METHOD g resolvePath (Ljava/lang/String;)Ljava/nio/file/Path; + ARG 0 path diff --git a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping index 9c864cda60..49462cdf21 100644 --- a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping @@ -3,10 +3,14 @@ CLASS cdn net/minecraft/world/level/storage/LevelSummary FIELD b displayName Ljava/lang/String; FIELD c lastPlayed J FIELD d getSizeOnDisk J + FIELD e requiresConversion Z FIELD f gameMode Layx; + FIELD g isHardcore Z FIELD h commandsAllowed Z FIELD i versionName Ljava/lang/String; FIELD j versionId I + FIELD k isSnapshot Z + FIELD l generatorType Lazh; METHOD (Lcdj;Ljava/lang/String;Ljava/lang/String;JZ)V ARG 0 properties ARG 1 name @@ -23,4 +27,6 @@ CLASS cdn net/minecraft/world/level/storage/LevelSummary METHOD f getGameMode ()Layx; METHOD g isHardcore ()Z METHOD h areCommandsAllowed ()Z - METHOD m isTooNew ()Z + METHOD i getVersionTextComponent ()Liw; + METHOD m ()Z + METHOD n isLegacyCustomizedWorld ()Z