diff --git a/mappings/net/minecraft/client/MinecraftGame.mapping b/mappings/net/minecraft/client/MinecraftGame.mapping index b5ad1f80b4..478d64473c 100644 --- a/mappings/net/minecraft/client/MinecraftGame.mapping +++ b/mappings/net/minecraft/client/MinecraftGame.mapping @@ -77,6 +77,7 @@ CLASS none/bdr net/minecraft/client/MinecraftGame FIELD k fontRenderer Lnone/bef; FIELD l fontRendererSGA Lnone/bef; FIELD m currentGui Lnone/bgn; + FIELD n progressBar Lnone/bdu; FIELD o worldRenderer Lnone/bot; FIELD q hudAchievements Lnone/bgx; FIELD r hudInGame Lnone/beg; diff --git a/mappings/none/bdu.mapping b/mappings/net/minecraft/client/MinecraftProgressBar.mapping similarity index 57% rename from mappings/none/bdu.mapping rename to mappings/net/minecraft/client/MinecraftProgressBar.mapping index 7a8ed851df..5ba34a2aa0 100644 --- a/mappings/none/bdu.mapping +++ b/mappings/net/minecraft/client/MinecraftProgressBar.mapping @@ -1,4 +1,9 @@ -CLASS none/bdu +CLASS none/bdu net/minecraft/client/MinecraftProgressBar + FIELD b mc Lnone/bdr; + FIELD f scale Lnone/bej; + FIELD g framebuffer Lnone/bpg; + METHOD (Lnone/bdr;)V + ARG 0 mc METHOD a finish ()V METHOD a setProgress (I)V ARG 0 percentage diff --git a/mappings/net/minecraft/client/gui/hud/ScoreboardEntry.mapping b/mappings/net/minecraft/client/network/handler/ScoreboardEntry.mapping similarity index 86% rename from mappings/net/minecraft/client/gui/hud/ScoreboardEntry.mapping rename to mappings/net/minecraft/client/network/handler/ScoreboardEntry.mapping index 57d8086bfb..b4a1a51d33 100644 --- a/mappings/net/minecraft/client/gui/hud/ScoreboardEntry.mapping +++ b/mappings/net/minecraft/client/network/handler/ScoreboardEntry.mapping @@ -1,4 +1,4 @@ -CLASS none/bmi net/minecraft/client/gui/hud/ScoreboardEntry +CLASS none/bmi net/minecraft/client/network/handler/ScoreboardEntry FIELD b profile Lcom/mojang/authlib/GameProfile; FIELD c gameMode Lnone/aiu; FIELD d latency I @@ -20,4 +20,5 @@ CLASS none/bmi net/minecraft/client/gui/hud/ScoreboardEntry METHOD g getSkinTexture ()Lnone/kp; METHOD h getCapeTexture ()Lnone/kp; METHOD i getElytraTexture ()Lnone/kp; + METHOD j getScoreboardTeam ()Lnone/bcy; METHOD l getDisplayName ()Lnone/fa; diff --git a/mappings/none/bpb.mapping b/mappings/net/minecraft/client/render/bpb.mapping similarity index 92% rename from mappings/none/bpb.mapping rename to mappings/net/minecraft/client/render/bpb.mapping index 12b3a3d460..8db02a3b04 100644 --- a/mappings/none/bpb.mapping +++ b/mappings/net/minecraft/client/render/bpb.mapping @@ -1,6 +1,4 @@ -CLASS none/bpb - CLASS none/bpb$1 - METHOD a call ()Ljava/lang/String; +CLASS none/bpb net/minecraft/client/render/bpb FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c MOON_PHASES_TEX Lnone/kp; FIELD d SUN_TEX Lnone/kp; diff --git a/mappings/net/minecraft/client/render/bpk.mapping b/mappings/net/minecraft/client/render/bpk.mapping new file mode 100644 index 0000000000..f697998252 --- /dev/null +++ b/mappings/net/minecraft/client/render/bpk.mapping @@ -0,0 +1,4 @@ +CLASS none/bpk net/minecraft/client/render/bpk + FIELD b world Lnone/aiw; + METHOD (Lnone/aiw;ILnone/bpb;Lnone/brt;)V + ARG 0 world diff --git a/mappings/net/minecraft/client/render/model/json/bqb.mapping b/mappings/net/minecraft/client/render/model/json/bqb.mapping new file mode 100644 index 0000000000..0a35612c25 --- /dev/null +++ b/mappings/net/minecraft/client/render/model/json/bqb.mapping @@ -0,0 +1 @@ +CLASS none/bqb net/minecraft/client/render/model/json/bqb diff --git a/mappings/net/minecraft/client/util/TextureUtils.mapping b/mappings/net/minecraft/client/texture/TextureUtils.mapping similarity index 97% rename from mappings/net/minecraft/client/util/TextureUtils.mapping rename to mappings/net/minecraft/client/texture/TextureUtils.mapping index 137e664596..cd6187ac57 100644 --- a/mappings/net/minecraft/client/util/TextureUtils.mapping +++ b/mappings/net/minecraft/client/texture/TextureUtils.mapping @@ -1,4 +1,4 @@ -CLASS none/bxh net/minecraft/client/util/TextureUtils +CLASS none/bxh net/minecraft/client/texture/TextureUtils FIELD a TEXTURE_MISSING Lnone/bwu; FIELD b TEXTURE_MISSING_DATA [I FIELD c LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/item/tool/ItemAxe.mapping b/mappings/net/minecraft/item/ItemAxe.mapping similarity index 82% rename from mappings/net/minecraft/item/tool/ItemAxe.mapping rename to mappings/net/minecraft/item/ItemAxe.mapping index b18249319d..91fad0325d 100644 --- a/mappings/net/minecraft/item/tool/ItemAxe.mapping +++ b/mappings/net/minecraft/item/ItemAxe.mapping @@ -1,4 +1,4 @@ -CLASS none/adb net/minecraft/item/tool/ItemAxe +CLASS none/adb net/minecraft/item/ItemAxe FIELD e EFFECTIVE_BLOCKS Ljava/util/Set; FIELD f WEAPON_DAMAGES [F FIELD n SWING_SPEEDS [F diff --git a/mappings/net/minecraft/item/tool/ItemHoe.mapping b/mappings/net/minecraft/item/ItemHoe.mapping similarity index 93% rename from mappings/net/minecraft/item/tool/ItemHoe.mapping rename to mappings/net/minecraft/item/ItemHoe.mapping index 9a1abb8a8d..66fbd08252 100644 --- a/mappings/net/minecraft/item/tool/ItemHoe.mapping +++ b/mappings/net/minecraft/item/ItemHoe.mapping @@ -1,4 +1,4 @@ -CLASS none/aep net/minecraft/item/tool/ItemHoe +CLASS none/aep net/minecraft/item/ItemHoe FIELD a material Lnone/aeq$a; FIELD b swingSpeed F METHOD (Lnone/aeq$a;)V diff --git a/mappings/net/minecraft/item/tool/ItemPickaxe.mapping b/mappings/net/minecraft/item/ItemPickaxe.mapping similarity index 81% rename from mappings/net/minecraft/item/tool/ItemPickaxe.mapping rename to mappings/net/minecraft/item/ItemPickaxe.mapping index d882827f81..7433f0548b 100644 --- a/mappings/net/minecraft/item/tool/ItemPickaxe.mapping +++ b/mappings/net/minecraft/item/ItemPickaxe.mapping @@ -1,4 +1,4 @@ -CLASS none/afd net/minecraft/item/tool/ItemPickaxe +CLASS none/afd net/minecraft/item/ItemPickaxe FIELD e EFFECTIVE_BLOCKS Ljava/util/Set; METHOD (Lnone/aeq$a;)V ARG 0 material diff --git a/mappings/net/minecraft/item/tool/ItemShovel.mapping b/mappings/net/minecraft/item/ItemShovel.mapping similarity index 86% rename from mappings/net/minecraft/item/tool/ItemShovel.mapping rename to mappings/net/minecraft/item/ItemShovel.mapping index 43b8461ddc..c1c3c4a457 100644 --- a/mappings/net/minecraft/item/tool/ItemShovel.mapping +++ b/mappings/net/minecraft/item/ItemShovel.mapping @@ -1,4 +1,4 @@ -CLASS none/afp net/minecraft/item/tool/ItemShovel +CLASS none/afp net/minecraft/item/ItemShovel FIELD e EFFECTIVE_BLOCKS Ljava/util/Set; METHOD (Lnone/aeq$a;)V ARG 0 material diff --git a/mappings/net/minecraft/item/tool/ItemSword.mapping b/mappings/net/minecraft/item/ItemSword.mapping similarity index 94% rename from mappings/net/minecraft/item/tool/ItemSword.mapping rename to mappings/net/minecraft/item/ItemSword.mapping index 5ecbef034c..8585635156 100644 --- a/mappings/net/minecraft/item/tool/ItemSword.mapping +++ b/mappings/net/minecraft/item/ItemSword.mapping @@ -1,4 +1,4 @@ -CLASS none/afz net/minecraft/item/tool/ItemSword +CLASS none/afz net/minecraft/item/ItemSword FIELD a weaponDamage F FIELD b material Lnone/aeq$a; METHOD (Lnone/aeq$a;)V diff --git a/mappings/net/minecraft/item/tool/ItemTool.mapping b/mappings/net/minecraft/item/ItemTool.mapping similarity index 95% rename from mappings/net/minecraft/item/tool/ItemTool.mapping rename to mappings/net/minecraft/item/ItemTool.mapping index 14f86a2c12..7e7a01b5e0 100644 --- a/mappings/net/minecraft/item/tool/ItemTool.mapping +++ b/mappings/net/minecraft/item/ItemTool.mapping @@ -1,4 +1,4 @@ -CLASS none/adt net/minecraft/item/tool/ItemTool +CLASS none/adt net/minecraft/item/ItemTool FIELD a efficiency F FIELD b weaponDamage F FIELD c swingSpeed F diff --git a/mappings/net/minecraft/util/TagStorageHelper.mapping b/mappings/net/minecraft/nbt/TagStorageHelper.mapping similarity index 94% rename from mappings/net/minecraft/util/TagStorageHelper.mapping rename to mappings/net/minecraft/nbt/TagStorageHelper.mapping index 4d2060a3f0..6927ff3670 100644 --- a/mappings/net/minecraft/util/TagStorageHelper.mapping +++ b/mappings/net/minecraft/nbt/TagStorageHelper.mapping @@ -1,4 +1,4 @@ -CLASS none/ec net/minecraft/util/TagStorageHelper +CLASS none/ec net/minecraft/nbt/TagStorageHelper METHOD a readTag (Ljava/io/DataInput;ILnone/eb;)Lnone/eh; ARG 0 input METHOD a readCompoundTag (Ljava/io/DataInput;Lnone/eb;)Lnone/dt; diff --git a/mappings/net/minecraft/server/ServerConfigurationManager.mapping b/mappings/net/minecraft/server/config/ServerConfigurationManager.mapping similarity index 98% rename from mappings/net/minecraft/server/ServerConfigurationManager.mapping rename to mappings/net/minecraft/server/config/ServerConfigurationManager.mapping index f8de52ea0c..3ec37a21e0 100644 --- a/mappings/net/minecraft/server/ServerConfigurationManager.mapping +++ b/mappings/net/minecraft/server/config/ServerConfigurationManager.mapping @@ -1,4 +1,4 @@ -CLASS none/mr net/minecraft/server/ServerConfigurationManager +CLASS none/mr net/minecraft/server/config/ServerConfigurationManager CLASS none/mr$1 METHOD a onSetSize (Lnone/atg;D)V ARG 0 border diff --git a/mappings/net/minecraft/sortme/DungeonGenerator.mapping b/mappings/net/minecraft/sortme/DungeonGenerator.mapping deleted file mode 100644 index bf1256a55b..0000000000 --- a/mappings/net/minecraft/sortme/DungeonGenerator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/axn net/minecraft/sortme/DungeonGenerator diff --git a/mappings/net/minecraft/reference/Stats.mapping b/mappings/net/minecraft/stat/Stats.mapping similarity index 98% rename from mappings/net/minecraft/reference/Stats.mapping rename to mappings/net/minecraft/stat/Stats.mapping index 731d5d3038..754dc1fb97 100644 --- a/mappings/net/minecraft/reference/Stats.mapping +++ b/mappings/net/minecraft/stat/Stats.mapping @@ -1,4 +1,4 @@ -CLASS none/ny net/minecraft/reference/Stats +CLASS none/ny net/minecraft/stat/Stats FIELD A DEATHS Lnone/nu; FIELD B MOB_KILLS Lnone/nu; FIELD C ANIMALS_BRED Lnone/nu; diff --git a/mappings/net/minecraft/world/gen/biome/BiomeGenerator.mapping b/mappings/net/minecraft/world/biome/BiomeGenerator.mapping similarity index 96% rename from mappings/net/minecraft/world/gen/biome/BiomeGenerator.mapping rename to mappings/net/minecraft/world/biome/BiomeGenerator.mapping index 8e528d6788..0309ad6658 100644 --- a/mappings/net/minecraft/world/gen/biome/BiomeGenerator.mapping +++ b/mappings/net/minecraft/world/biome/BiomeGenerator.mapping @@ -1,4 +1,4 @@ -CLASS none/ajm net/minecraft/world/gen/biome/BiomeGenerator +CLASS none/ajm net/minecraft/world/biome/BiomeGenerator FIELD A surfaceDecorationCountFraction F FIELD B flowerCount I FIELD C tallGrassCount I diff --git a/mappings/net/minecraft/world/gen/biome/BiomeGeneratorSettings.mapping b/mappings/net/minecraft/world/biome/BiomeGeneratorSettings.mapping similarity index 98% rename from mappings/net/minecraft/world/gen/biome/BiomeGeneratorSettings.mapping rename to mappings/net/minecraft/world/biome/BiomeGeneratorSettings.mapping index 2a2823c65a..5c0cf0c320 100644 --- a/mappings/net/minecraft/world/gen/biome/BiomeGeneratorSettings.mapping +++ b/mappings/net/minecraft/world/biome/BiomeGeneratorSettings.mapping @@ -1,4 +1,4 @@ -CLASS none/auq net/minecraft/world/gen/biome/BiomeGeneratorSettings +CLASS none/auq net/minecraft/world/biome/BiomeGeneratorSettings CLASS none/auq$a JsonStructure FIELD A useRavines Z FIELD B useWaterLakes Z diff --git a/mappings/net/minecraft/world/gen/biome/BiomeProvider.mapping b/mappings/net/minecraft/world/biome/BiomeProvider.mapping similarity index 79% rename from mappings/net/minecraft/world/gen/biome/BiomeProvider.mapping rename to mappings/net/minecraft/world/biome/BiomeProvider.mapping index c82e8a2eb9..c9235bfbbe 100644 --- a/mappings/net/minecraft/world/gen/biome/BiomeProvider.mapping +++ b/mappings/net/minecraft/world/biome/BiomeProvider.mapping @@ -1,4 +1,4 @@ -CLASS none/ajn net/minecraft/world/gen/biome/BiomeProvider +CLASS none/ajn net/minecraft/world/biome/BiomeProvider FIELD d biomes Ljava/util/List; METHOD (JLnone/ajb;Ljava/lang/String;)V ARG 0 seed diff --git a/mappings/net/minecraft/world/gen/structure/axc.mapping b/mappings/net/minecraft/world/gen/structure/axc.mapping new file mode 100644 index 0000000000..404556cba6 --- /dev/null +++ b/mappings/net/minecraft/world/gen/structure/axc.mapping @@ -0,0 +1 @@ +CLASS none/axc net/minecraft/world/gen/structure/axc diff --git a/mappings/net/minecraft/world/gen/structure/axh.mapping b/mappings/net/minecraft/world/gen/structure/axh.mapping new file mode 100644 index 0000000000..97efc7b9ca --- /dev/null +++ b/mappings/net/minecraft/world/gen/structure/axh.mapping @@ -0,0 +1 @@ +CLASS none/axh net/minecraft/world/gen/structure/axh diff --git a/mappings/net/minecraft/world/gen/structure/axj.mapping b/mappings/net/minecraft/world/gen/structure/axj.mapping new file mode 100644 index 0000000000..720c10345b --- /dev/null +++ b/mappings/net/minecraft/world/gen/structure/axj.mapping @@ -0,0 +1 @@ +CLASS none/axj net/minecraft/world/gen/structure/axj diff --git a/mappings/net/minecraft/world/gen/structure/axl.mapping b/mappings/net/minecraft/world/gen/structure/axl.mapping new file mode 100644 index 0000000000..f575dada78 --- /dev/null +++ b/mappings/net/minecraft/world/gen/structure/axl.mapping @@ -0,0 +1 @@ +CLASS none/axl net/minecraft/world/gen/structure/axl diff --git a/mappings/net/minecraft/world/gen/structure/axn.mapping b/mappings/net/minecraft/world/gen/structure/axn.mapping new file mode 100644 index 0000000000..38a649ec79 --- /dev/null +++ b/mappings/net/minecraft/world/gen/structure/axn.mapping @@ -0,0 +1 @@ +CLASS none/axn net/minecraft/world/gen/structure/axn diff --git a/mappings/net/minecraft/world/gen/structure/axp.mapping b/mappings/net/minecraft/world/gen/structure/axp.mapping new file mode 100644 index 0000000000..16399505a1 --- /dev/null +++ b/mappings/net/minecraft/world/gen/structure/axp.mapping @@ -0,0 +1,2 @@ +CLASS none/axp net/minecraft/world/gen/structure/axp + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/world/gen/structure/axr.mapping b/mappings/net/minecraft/world/gen/structure/axr.mapping new file mode 100644 index 0000000000..d4a5219d69 --- /dev/null +++ b/mappings/net/minecraft/world/gen/structure/axr.mapping @@ -0,0 +1 @@ +CLASS none/axr net/minecraft/world/gen/structure/axr diff --git a/mappings/net/minecraft/world/gen/structure/axs.mapping b/mappings/net/minecraft/world/gen/structure/axs.mapping new file mode 100644 index 0000000000..a74c316194 --- /dev/null +++ b/mappings/net/minecraft/world/gen/structure/axs.mapping @@ -0,0 +1 @@ +CLASS none/axs net/minecraft/world/gen/structure/axs diff --git a/mappings/net/minecraft/world/gen/structure/axt.mapping b/mappings/net/minecraft/world/gen/structure/axt.mapping new file mode 100644 index 0000000000..9d11ec5ea7 --- /dev/null +++ b/mappings/net/minecraft/world/gen/structure/axt.mapping @@ -0,0 +1 @@ +CLASS none/axt net/minecraft/world/gen/structure/axt diff --git a/mappings/net/minecraft/world/gen/structure/axv.mapping b/mappings/net/minecraft/world/gen/structure/axv.mapping new file mode 100644 index 0000000000..8a4febc2b9 --- /dev/null +++ b/mappings/net/minecraft/world/gen/structure/axv.mapping @@ -0,0 +1 @@ +CLASS none/axv net/minecraft/world/gen/structure/axv diff --git a/mappings/net/minecraft/world/loot/entry/LootTableEntry.mapping b/mappings/net/minecraft/world/loot/LootTableEntry.mapping similarity index 86% rename from mappings/net/minecraft/world/loot/entry/LootTableEntry.mapping rename to mappings/net/minecraft/world/loot/LootTableEntry.mapping index ada645f59c..6b6ebbca6b 100644 --- a/mappings/net/minecraft/world/loot/entry/LootTableEntry.mapping +++ b/mappings/net/minecraft/world/loot/LootTableEntry.mapping @@ -1,4 +1,4 @@ -CLASS none/bbi net/minecraft/world/loot/entry/LootTableEntry +CLASS none/bbi net/minecraft/world/loot/LootTableEntry FIELD c weight I FIELD d quality I FIELD e conditions [Lnone/bcc; diff --git a/mappings/net/minecraft/world/loot/function/LootTableFunctionRegistry.mapping b/mappings/net/minecraft/world/loot/function/LootTableFunctionRegistry.mapping new file mode 100644 index 0000000000..db85d1c3c2 --- /dev/null +++ b/mappings/net/minecraft/world/loot/function/LootTableFunctionRegistry.mapping @@ -0,0 +1 @@ +CLASS none/bbr net/minecraft/world/loot/function/LootTableFunctionRegistry diff --git a/mappings/net/minecraft/world/loot/property/LootTableEntityPropertyRegistry.mapping b/mappings/net/minecraft/world/loot/property/LootTableEntityPropertyRegistry.mapping new file mode 100644 index 0000000000..29c341700c --- /dev/null +++ b/mappings/net/minecraft/world/loot/property/LootTableEntityPropertyRegistry.mapping @@ -0,0 +1 @@ +CLASS none/bcj net/minecraft/world/loot/property/LootTableEntityPropertyRegistry