From 8226c45d759958aec037fd02c1f7272d0b017d65 Mon Sep 17 00:00:00 2001 From: asie Date: Thu, 1 Nov 2018 17:53:10 +0100 Subject: [PATCH] resource mapping work, refactor interface names - close #184 --- mappings/djk.mapping | 3 + .../net/minecraft/block/BlockAnvil.mapping | 2 +- .../block/BlockCraftingTable.mapping | 2 +- .../block/BlockEntityProvider.mapping | 2 + .../net/minecraft/block/BlockLoom.mapping | 2 +- .../net/minecraft/block/BlockSkull.mapping | 2 +- ...tilizable.mapping => Fertilizable.mapping} | 2 +- .../block/IBlockEntityProvider.mapping | 2 - .../block/entity/BlockEntityBanner.mapping | 2 +- .../block/entity/BlockEntityBarrel.mapping | 4 +- .../block/entity/BlockEntityBeacon.mapping | 5 +- .../entity/BlockEntityBrewingStand.mapping | 5 +- .../block/entity/BlockEntityChest.mapping | 2 +- .../block/entity/BlockEntityDispenser.mapping | 2 +- .../block/entity/BlockEntityDropper.mapping | 2 +- .../entity/BlockEntityEnchantingTable.mapping | 5 +- .../block/entity/BlockEntityFurnace.mapping | 4 +- .../block/entity/BlockEntityHopper.mapping | 2 +- .../entity/BlockEntityShulkerBox.mapping | 2 +- .../entity/BlockEntityWithLootTable.mapping | 6 +- .../client/audio/AbstractSoundEvent.mapping | 32 +++++++++++ .../client/audio/ISoundEvent.mapping | 19 ------- .../client/audio/ISoundEventTickable.mapping | 2 - ...ntainer.mapping => SoundContainer.mapping} | 2 +- .../minecraft/client/audio/SoundEvent.mapping | 25 ++------- ...ner.mapping => SoundEventListener.mapping} | 2 +- .../client/audio/TickableSoundEvent.mapping | 2 + .../gui/hud/spectator/ISpectatorMenu.mapping | 3 - .../gui/hud/spectator/SpectatorMenu.mapping | 20 +------ ...t.mapping => SpectatorMenuElement.mapping} | 2 +- .../hud/spectator/SpectatorMenuImpl.mapping | 17 ++++++ .../ContainerProviderDummyClient.mapping | 2 +- .../NetworkGameHandlerClientImpl.mapping} | 16 +++++- ... => NetworkLoginHandlerClientImpl.mapping} | 3 +- ...actory.mapping => ParticleFactory.mapping} | 2 +- .../minecraft/client/render/Renderer.mapping | 2 +- ...apper.mapping => BlockColorMapper.mapping} | 2 +- .../render/chunk/ChunkRendererFactory.mapping | 3 + .../chunk/IChunkRendererFactory.mapping | 3 - .../client/render/debug/RenderDebug.mapping | 2 +- .../entity/model/IModelMultipass.mapping | 3 - .../entity/model/MultipassModel.mapping | 3 + .../render/item/IItemColorMapper.mapping | 4 -- .../render/item/ItemColorMapper.mapping | 4 ++ ...edModel.mapping => BakedModelImpl.mapping} | 2 +- .../client/render/model/IBakedModel.mapping | 10 ---- .../resource/ResourcePackRedirected.mapping | 20 +++++++ .../ResourceMetadataReaderAnimation.mapping | 1 + .../ResourceMetadataReaderLanguage.mapping | 1 + .../ResourceMetadataReaderTexture.mapping | 1 + .../client/texture/IImageFilter.mapping | 2 - .../minecraft/client/texture/ITexture.mapping | 9 --- .../texture/ITextureUpdateMethod.mapping | 2 - .../client/texture/ITextureUpdateable.mapping | 1 - .../client/texture/ImageFilter.mapping | 2 + .../minecraft/client/texture/Texture.mapping | 14 ++--- .../client/texture/TextureImpl.mapping | 15 +++++ .../client/texture/TextureManager.mapping | 4 +- .../client/texture/TextureSpriteAtlas.mapping | 2 +- .../texture/TextureTickListener.mapping | 2 + .../client/texture/TickableTexture.mapping | 1 + .../minecraft/command/CommandManager.mapping | 1 + ...ndSource.mapping => CommandSource.mapping} | 2 +- .../minecraft/command/ICommandManager.mapping | 1 - ...ener.mapping => ContainerListener.mapping} | 2 +- ...ider.mapping => ContainerProvider.mapping} | 2 +- ...iner.mapping => LockableContainer.mapping} | 2 +- .../container/LockableContainerDouble.mapping | 2 +- mappings/net/minecraft/entity/Entity.mapping | 4 +- .../net/minecraft/entity/EntityData.mapping | 1 + .../net/minecraft/entity/EntityItem.mapping | 2 +- .../net/minecraft/entity/IEntityData.mapping | 1 - ...pingMount.mapping => JumpingMount.mapping} | 2 +- ...tacker.mapping => DistantAttacker.mapping} | 2 +- ...ttribute.mapping => AttributeImpl.mapping} | 2 +- ....mapping => AttributeInstanceImpl.mapping} | 2 +- .../entity/attribute/IAttribute.mapping | 4 -- .../attribute/IAttributeInstance.mapping | 18 ------ ...yOwnable.mapping => EntityOwnable.mapping} | 2 +- .../entity/passive/EntityVillager.mapping | 2 +- .../entity/player/EntityPlayer.mapping | 4 +- .../entity/player/InventoryPlayer.mapping | 2 +- .../minecraft/entity/sortme/ILiving.mapping | 1 - .../minecraft/entity/sortme/Living.mapping | 1 + ...IProjectile.mapping => Projectile.mapping} | 2 +- .../vehicle/EntityStorageMinecart.mapping | 2 +- ...luidBase.mapping => AbstractFluid.mapping} | 2 +- .../minecraft/inventory/IInventory.mapping | 33 ----------- .../inventory/InventoryCrafting.mapping | 2 +- ...nventory.mapping => InventoryImpl.mapping} | 8 ++- .../inventory/InventoryResult.mapping | 2 +- .../{IArmorType.mapping => ArmorType.mapping} | 2 +- .../net/minecraft/item/IItemContainer.mapping | 2 - mappings/net/minecraft/item/IToolType.mapping | 1 - .../net/minecraft/item/ItemContainer.mapping | 2 + ...ter.mapping => ItemPropertyGetter.mapping} | 2 +- mappings/net/minecraft/item/ToolType.mapping | 1 + ...tHandler.mapping => PacketHandler.mapping} | 2 +- .../network/handler/IPacketListener.mapping | 3 - .../handler/NetworkGameHandlerClient.mapping | 16 +----- .../NetworkLoginHandlerClient.mapping} | 2 +- .../network/handler/PacketListener.mapping | 3 + .../{IRecipe.mapping => Recipe.mapping} | 4 +- ...lizer.mapping => RecipeSerializer.mapping} | 2 +- .../recipe/crafting/RecipeArmorDye.mapping | 2 + .../crafting/RecipeBannerDuplicate.mapping | 2 + .../recipe/crafting/RecipeBookCloning.mapping | 2 + .../crafting/RecipeFireworkRocket.mapping | 2 + .../crafting/RecipeFireworkStar.mapping | 2 + .../crafting/RecipeFireworkStarFade.mapping | 2 + .../recipe/crafting/RecipeMapCloning.mapping | 2 + .../recipe/crafting/RecipeMapExtend.mapping | 2 + .../recipe/crafting/RecipeRepairItem.mapping | 2 + .../recipe/crafting/RecipeShaped.mapping | 2 + .../recipe/crafting/RecipeShapeless.mapping | 2 + .../crafting/RecipeShieldDecoration.mapping | 2 + .../crafting/RecipeShulkerBoxColoring.mapping | 2 + .../crafting/RecipeSuspiciousStew.mapping | 2 + .../recipe/crafting/RecipeTippedArrow.mapping | 2 + .../recipe/smelting/RecipeSmelting.mapping | 2 + .../AbstractFilenameResourcePack.mapping | 23 ++++++++ .../resource/DefaultResourcePack.mapping | 22 ++++++++ .../resource/DirectoryResourcePack.mapping | 12 ++++ .../net/minecraft/resource/IResource.mapping | 2 - .../resource/IResourceManager.mapping | 6 -- .../minecraft/resource/IResourcePack.mapping | 10 ---- ...ping => ReloadableResourceManager.mapping} | 2 +- .../ReloadableResourceManagerImpl.mapping | 24 ++++++++ ...{Resource.mapping => ResourceImpl.mapping} | 2 +- .../resource/ResourceManager.mapping | 20 +------ .../minecraft/resource/ResourcePack.mapping} | 9 ++- .../resource/ResourceReloadListener.mapping | 3 + .../resource/ZipResourcePack.mapping | 11 ++++ .../metadata/IResourceMetadataReader.mapping | 3 - .../metadata/ResourceMetadataReader.mapping | 4 ++ .../ResourceMetadataReaderPack.mapping | 1 + ...on.mapping => ScoreboardCriterion.mapping} | 2 +- .../server/dedicated/DedicatedServer.mapping | 56 +++++-------------- .../server/dedicated/IDedicatedServer.mapping | 29 ---------- .../sortme/IResourceReloadListener.mapping | 3 - ...iner.mapping => PropertyContainer.mapping} | 2 +- .../{IProperty.mapping => Property.mapping} | 2 +- .../net/minecraft/util/CustomNameable.mapping | 4 ++ mappings/net/minecraft/util/INameable.mapping | 4 -- .../util/IStringSerializable.mapping | 2 - mappings/net/minecraft/util/ITickable.mapping | 2 - .../util/StringRepresentable.mapping | 2 + mappings/net/minecraft/util/Tickable.mapping | 2 + ...inter.mapping => BlockPointerImpl.mapping} | 2 +- .../minecraft/util/math/IBlockPointer.mapping | 7 --- .../net/minecraft/util/math/IPosition.mapping | 4 -- .../util/math/IWorldPosition.mapping | 2 - ...{Position.mapping => PositionImpl.mapping} | 2 +- .../minecraft/util/math/WorldPosition.mapping | 2 + .../util/snooper/ISnooperListener.mapping | 3 - .../util/snooper/SnooperListener.mapping | 3 + .../village/VillagerInventory.mapping | 2 +- .../{IBlockView.mapping => BlockView.mapping} | 2 +- ...dler.mapping => PlayerSaveHandler.mapping} | 2 +- ...Listener.mapping => WorldListener.mapping} | 4 +- ...ndler.mapping => WorldSaveHandler.mapping} | 2 +- ...er.mapping => WorldBorderListener.mapping} | 2 +- .../{IChunkView.mapping => ChunkView.mapping} | 2 +- ...elStorage.mapping => LevelStorage.mapping} | 2 +- .../world/loot/ILootTableProvider.mapping | 2 - .../world/loot/LootTableProvider.mapping | 2 + ...leRange.mapping => LootTableRange.mapping} | 2 +- mappings/uw.mapping | 6 -- mappings/ux.mapping | 5 -- mappings/uy.mapping | 5 -- mappings/vc.mapping | 10 ---- 171 files changed, 417 insertions(+), 431 deletions(-) create mode 100644 mappings/net/minecraft/block/BlockEntityProvider.mapping rename mappings/net/minecraft/block/{IFertilizable.mapping => Fertilizable.mapping} (87%) delete mode 100644 mappings/net/minecraft/block/IBlockEntityProvider.mapping create mode 100644 mappings/net/minecraft/client/audio/AbstractSoundEvent.mapping delete mode 100644 mappings/net/minecraft/client/audio/ISoundEvent.mapping delete mode 100644 mappings/net/minecraft/client/audio/ISoundEventTickable.mapping rename mappings/net/minecraft/client/audio/{ISoundContainer.mapping => SoundContainer.mapping} (54%) rename mappings/net/minecraft/client/audio/{ISoundListener.mapping => SoundEventListener.mapping} (55%) create mode 100644 mappings/net/minecraft/client/audio/TickableSoundEvent.mapping delete mode 100644 mappings/net/minecraft/client/gui/hud/spectator/ISpectatorMenu.mapping rename mappings/net/minecraft/client/gui/hud/spectator/{ISpectatorMenuElement.mapping => SpectatorMenuElement.mapping} (57%) create mode 100644 mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuImpl.mapping rename mappings/net/minecraft/{network/handler/INetworkGameHandlerClient.mapping => client/network/handler/NetworkGameHandlerClientImpl.mapping} (87%) rename mappings/net/minecraft/client/network/handler/{NetworkLoginHandlerClient.mapping => NetworkLoginHandlerClientImpl.mapping} (88%) rename mappings/net/minecraft/client/particle/{IParticleFactory.mapping => ParticleFactory.mapping} (69%) rename mappings/net/minecraft/client/render/block/{IBlockColorMapper.mapping => BlockColorMapper.mapping} (60%) create mode 100644 mappings/net/minecraft/client/render/chunk/ChunkRendererFactory.mapping delete mode 100644 mappings/net/minecraft/client/render/chunk/IChunkRendererFactory.mapping delete mode 100644 mappings/net/minecraft/client/render/entity/model/IModelMultipass.mapping create mode 100644 mappings/net/minecraft/client/render/entity/model/MultipassModel.mapping delete mode 100644 mappings/net/minecraft/client/render/item/IItemColorMapper.mapping create mode 100644 mappings/net/minecraft/client/render/item/ItemColorMapper.mapping rename mappings/net/minecraft/client/render/model/{BakedModel.mapping => BakedModelImpl.mapping} (94%) delete mode 100644 mappings/net/minecraft/client/render/model/IBakedModel.mapping create mode 100644 mappings/net/minecraft/client/resource/ResourcePackRedirected.mapping delete mode 100644 mappings/net/minecraft/client/texture/IImageFilter.mapping delete mode 100644 mappings/net/minecraft/client/texture/ITexture.mapping delete mode 100644 mappings/net/minecraft/client/texture/ITextureUpdateMethod.mapping delete mode 100644 mappings/net/minecraft/client/texture/ITextureUpdateable.mapping create mode 100644 mappings/net/minecraft/client/texture/ImageFilter.mapping create mode 100644 mappings/net/minecraft/client/texture/TextureImpl.mapping create mode 100644 mappings/net/minecraft/client/texture/TextureTickListener.mapping create mode 100644 mappings/net/minecraft/client/texture/TickableTexture.mapping create mode 100644 mappings/net/minecraft/command/CommandManager.mapping rename mappings/net/minecraft/command/{ICommandSource.mapping => CommandSource.mapping} (78%) delete mode 100644 mappings/net/minecraft/command/ICommandManager.mapping rename mappings/net/minecraft/container/{IContainerListener.mapping => ContainerListener.mapping} (87%) rename mappings/net/minecraft/container/{IContainerProvider.mapping => ContainerProvider.mapping} (69%) rename mappings/net/minecraft/container/{ILockableContainer.mapping => LockableContainer.mapping} (68%) create mode 100644 mappings/net/minecraft/entity/EntityData.mapping delete mode 100644 mappings/net/minecraft/entity/IEntityData.mapping rename mappings/net/minecraft/entity/{IJumpingMount.mapping => JumpingMount.mapping} (77%) rename mappings/net/minecraft/entity/ai/{IDistantAttacker.mapping => DistantAttacker.mapping} (64%) rename mappings/net/minecraft/entity/attribute/{Attribute.mapping => AttributeImpl.mapping} (85%) rename mappings/net/minecraft/entity/attribute/{AttributeInstance.mapping => AttributeInstanceImpl.mapping} (89%) delete mode 100644 mappings/net/minecraft/entity/attribute/IAttribute.mapping delete mode 100644 mappings/net/minecraft/entity/attribute/IAttributeInstance.mapping rename mappings/net/minecraft/entity/passive/{IEntityOwnable.mapping => EntityOwnable.mapping} (56%) delete mode 100644 mappings/net/minecraft/entity/sortme/ILiving.mapping create mode 100644 mappings/net/minecraft/entity/sortme/Living.mapping rename mappings/net/minecraft/entity/sortme/{IProjectile.mapping => Projectile.mapping} (67%) rename mappings/net/minecraft/fluid/{FluidBase.mapping => AbstractFluid.mapping} (82%) delete mode 100644 mappings/net/minecraft/inventory/IInventory.mapping rename mappings/net/minecraft/inventory/{Inventory.mapping => InventoryImpl.mapping} (86%) rename mappings/net/minecraft/item/{IArmorType.mapping => ArmorType.mapping} (78%) delete mode 100644 mappings/net/minecraft/item/IItemContainer.mapping delete mode 100644 mappings/net/minecraft/item/IToolType.mapping create mode 100644 mappings/net/minecraft/item/ItemContainer.mapping rename mappings/net/minecraft/item/{IPropertyGetter.mapping => ItemPropertyGetter.mapping} (60%) create mode 100644 mappings/net/minecraft/item/ToolType.mapping rename mappings/net/minecraft/network/{IPacketHandler.mapping => PacketHandler.mapping} (73%) delete mode 100644 mappings/net/minecraft/network/handler/IPacketListener.mapping rename mappings/net/minecraft/{client => }/network/handler/NetworkGameHandlerClient.mapping (87%) rename mappings/{op.mapping => net/minecraft/network/handler/NetworkLoginHandlerClient.mapping} (67%) create mode 100644 mappings/net/minecraft/network/handler/PacketListener.mapping rename mappings/net/minecraft/recipe/{IRecipe.mapping => Recipe.mapping} (85%) rename mappings/net/minecraft/recipe/{IRecipeSerializer.mapping => RecipeSerializer.mapping} (82%) create mode 100644 mappings/net/minecraft/resource/AbstractFilenameResourcePack.mapping create mode 100644 mappings/net/minecraft/resource/DefaultResourcePack.mapping create mode 100644 mappings/net/minecraft/resource/DirectoryResourcePack.mapping delete mode 100644 mappings/net/minecraft/resource/IResource.mapping delete mode 100644 mappings/net/minecraft/resource/IResourceManager.mapping delete mode 100644 mappings/net/minecraft/resource/IResourcePack.mapping rename mappings/net/minecraft/resource/{IReloadableResourceManager.mapping => ReloadableResourceManager.mapping} (62%) create mode 100644 mappings/net/minecraft/resource/ReloadableResourceManagerImpl.mapping rename mappings/net/minecraft/resource/{Resource.mapping => ResourceImpl.mapping} (84%) rename mappings/{djp.mapping => net/minecraft/resource/ResourcePack.mapping} (56%) create mode 100644 mappings/net/minecraft/resource/ResourceReloadListener.mapping create mode 100644 mappings/net/minecraft/resource/ZipResourcePack.mapping delete mode 100644 mappings/net/minecraft/resource/metadata/IResourceMetadataReader.mapping create mode 100644 mappings/net/minecraft/resource/metadata/ResourceMetadataReader.mapping rename mappings/net/minecraft/scoreboard/{IScoreboardCriterion.mapping => ScoreboardCriterion.mapping} (91%) delete mode 100644 mappings/net/minecraft/server/dedicated/IDedicatedServer.mapping delete mode 100644 mappings/net/minecraft/sortme/IResourceReloadListener.mapping rename mappings/net/minecraft/state/{IPropertyContainer.mapping => PropertyContainer.mapping} (78%) rename mappings/net/minecraft/state/property/{IProperty.mapping => Property.mapping} (85%) create mode 100644 mappings/net/minecraft/util/CustomNameable.mapping delete mode 100644 mappings/net/minecraft/util/INameable.mapping delete mode 100644 mappings/net/minecraft/util/IStringSerializable.mapping delete mode 100644 mappings/net/minecraft/util/ITickable.mapping create mode 100644 mappings/net/minecraft/util/StringRepresentable.mapping create mode 100644 mappings/net/minecraft/util/Tickable.mapping rename mappings/net/minecraft/util/math/{BlockPointer.mapping => BlockPointerImpl.mapping} (84%) delete mode 100644 mappings/net/minecraft/util/math/IBlockPointer.mapping delete mode 100644 mappings/net/minecraft/util/math/IPosition.mapping delete mode 100644 mappings/net/minecraft/util/math/IWorldPosition.mapping rename mappings/net/minecraft/util/math/{Position.mapping => PositionImpl.mapping} (76%) create mode 100644 mappings/net/minecraft/util/math/WorldPosition.mapping delete mode 100644 mappings/net/minecraft/util/snooper/ISnooperListener.mapping create mode 100644 mappings/net/minecraft/util/snooper/SnooperListener.mapping rename mappings/net/minecraft/world/{IBlockView.mapping => BlockView.mapping} (89%) rename mappings/net/minecraft/world/{IPlayerSaveHandler.mapping => PlayerSaveHandler.mapping} (75%) rename mappings/net/minecraft/world/{IWorldListener.mapping => WorldListener.mapping} (90%) rename mappings/net/minecraft/world/{IWorldSaveHandler.mapping => WorldSaveHandler.mapping} (89%) rename mappings/net/minecraft/world/border/{IWorldBorderListener.mapping => WorldBorderListener.mapping} (88%) rename mappings/net/minecraft/world/chunk/{IChunkView.mapping => ChunkView.mapping} (53%) rename mappings/net/minecraft/world/level/storage/{ILevelStorage.mapping => LevelStorage.mapping} (93%) delete mode 100644 mappings/net/minecraft/world/loot/ILootTableProvider.mapping create mode 100644 mappings/net/minecraft/world/loot/LootTableProvider.mapping rename mappings/net/minecraft/world/loot/{ILootTableRange.mapping => LootTableRange.mapping} (73%) delete mode 100644 mappings/uw.mapping delete mode 100644 mappings/ux.mapping delete mode 100644 mappings/uy.mapping delete mode 100644 mappings/vc.mapping diff --git a/mappings/djk.mapping b/mappings/djk.mapping index 404282ff79..1235660b50 100644 --- a/mappings/djk.mapping +++ b/mappings/djk.mapping @@ -1,3 +1,6 @@ CLASS djk METHOD a (Lva;Ljava/lang/String;ILjava/util/function/Predicate;)Ljava/util/Collection; ARG 0 type + METHOD c findInputStream (Lva;Lpu;)Ljava/io/InputStream; + ARG 0 type + ARG 1 id diff --git a/mappings/net/minecraft/block/BlockAnvil.mapping b/mappings/net/minecraft/block/BlockAnvil.mapping index e8b23b6b28..f8b89f5145 100644 --- a/mappings/net/minecraft/block/BlockAnvil.mapping +++ b/mappings/net/minecraft/block/BlockAnvil.mapping @@ -2,7 +2,7 @@ CLASS bea net/minecraft/block/BlockAnvil CLASS bea$a ContainerProvider FIELD a world Lazt; FIELD b pos Leq; - METHOD O_ getNameAsComponent ()Lix; + METHOD O_ getName ()Lix; METHOD P_ hasCustomName ()Z METHOD a createContainer (Lapq;Lapr;)Larg; ARG 0 playerInv diff --git a/mappings/net/minecraft/block/BlockCraftingTable.mapping b/mappings/net/minecraft/block/BlockCraftingTable.mapping index b9ccac8c64..46d58d3f7b 100644 --- a/mappings/net/minecraft/block/BlockCraftingTable.mapping +++ b/mappings/net/minecraft/block/BlockCraftingTable.mapping @@ -2,7 +2,7 @@ CLASS bft net/minecraft/block/BlockCraftingTable CLASS bft$a ContainerProvider FIELD a world Lazt; FIELD b pos Leq; - METHOD O_ getNameAsComponent ()Lix; + METHOD O_ getName ()Lix; METHOD P_ hasCustomName ()Z METHOD a createContainer (Lapq;Lapr;)Larg; ARG 0 playerInv diff --git a/mappings/net/minecraft/block/BlockEntityProvider.mapping b/mappings/net/minecraft/block/BlockEntityProvider.mapping new file mode 100644 index 0000000000..d61d437612 --- /dev/null +++ b/mappings/net/minecraft/block/BlockEntityProvider.mapping @@ -0,0 +1,2 @@ +CLASS bgm net/minecraft/block/BlockEntityProvider + METHOD a createBlockEntity (Lazg;)Lbll; diff --git a/mappings/net/minecraft/block/BlockLoom.mapping b/mappings/net/minecraft/block/BlockLoom.mapping index 6d704bf7d8..aa3abf0351 100644 --- a/mappings/net/minecraft/block/BlockLoom.mapping +++ b/mappings/net/minecraft/block/BlockLoom.mapping @@ -1,7 +1,7 @@ CLASS bhx net/minecraft/block/BlockLoom CLASS bhx$a ContainerProvider FIELD a pos Leq; - METHOD O_ getNameAsComponent ()Lix; + METHOD O_ getName ()Lix; METHOD P_ hasCustomName ()Z METHOD a createContainer (Lapq;Lapr;)Larg; ARG 0 playerInv diff --git a/mappings/net/minecraft/block/BlockSkull.mapping b/mappings/net/minecraft/block/BlockSkull.mapping index ad16396356..d9d4be722c 100644 --- a/mappings/net/minecraft/block/BlockSkull.mapping +++ b/mappings/net/minecraft/block/BlockSkull.mapping @@ -1,5 +1,5 @@ CLASS bji net/minecraft/block/BlockSkull - CLASS bji$a ISkullType + CLASS bji$a SkullType CLASS bji$b Type FIELD a SKELETON Lbji$b; FIELD b WITHER_SKELETON Lbji$b; diff --git a/mappings/net/minecraft/block/IFertilizable.mapping b/mappings/net/minecraft/block/Fertilizable.mapping similarity index 87% rename from mappings/net/minecraft/block/IFertilizable.mapping rename to mappings/net/minecraft/block/Fertilizable.mapping index ad9ab0d97c..452957ec8d 100644 --- a/mappings/net/minecraft/block/IFertilizable.mapping +++ b/mappings/net/minecraft/block/Fertilizable.mapping @@ -1,4 +1,4 @@ -CLASS bev net/minecraft/block/IFertilizable +CLASS bev net/minecraft/block/Fertilizable METHOD a isFertilizable (Lazg;Leq;Lbnh;Z)Z ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/block/IBlockEntityProvider.mapping b/mappings/net/minecraft/block/IBlockEntityProvider.mapping deleted file mode 100644 index b31c58ec7a..0000000000 --- a/mappings/net/minecraft/block/IBlockEntityProvider.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS bgm net/minecraft/block/IBlockEntityProvider - METHOD a createBlockEntity (Lazg;)Lbll; diff --git a/mappings/net/minecraft/block/entity/BlockEntityBanner.mapping b/mappings/net/minecraft/block/entity/BlockEntityBanner.mapping index 3ddbd74821..b1d8b533ec 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityBanner.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityBanner.mapping @@ -4,7 +4,7 @@ CLASS ble net/minecraft/block/entity/BlockEntityBanner FIELD f patternListTag Lhs; FIELD h patternList Ljava/util/List; FIELD i patternColorList Ljava/util/List; - METHOD O_ getNameAsComponent ()Lix; + METHOD O_ getName ()Lix; METHOD P_ hasCustomName ()Z METHOD a getPatternCount (Lauv;)I ARG 0 stack diff --git a/mappings/net/minecraft/block/entity/BlockEntityBarrel.mapping b/mappings/net/minecraft/block/entity/BlockEntityBarrel.mapping index 43fd9162e6..a7c1543224 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityBarrel.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityBarrel.mapping @@ -3,7 +3,7 @@ CLASS blg net/minecraft/block/entity/BlockEntityBarrel FIELD e customName Lix; METHOD (Lblm;)V ARG 0 factory - METHOD O_ getNameAsComponent ()Lix; + METHOD O_ getName ()Lix; METHOD P_ hasCustomName ()Z METHOD Q_ isInvEmpty ()Z METHOD U_ getInvSize ()I @@ -22,6 +22,8 @@ CLASS blg net/minecraft/block/entity/BlockEntityBarrel ARG 0 player METHOD a serialize (Lhm;)Lhm; ARG 0 tag + METHOD a setCustomName (Lix;)V + ARG 0 value METHOD b removeInvStack (I)Lauv; ARG 0 slot METHOD b setInvProperty (II)V diff --git a/mappings/net/minecraft/block/entity/BlockEntityBeacon.mapping b/mappings/net/minecraft/block/entity/BlockEntityBeacon.mapping index c6d1c4a24f..099da16eda 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityBeacon.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityBeacon.mapping @@ -4,7 +4,8 @@ CLASS blh net/minecraft/block/entity/BlockEntityBeacon FIELD l primary Lafn; FIELD m secondary Lafn; FIELD n stack Lauv; - METHOD O_ getNameAsComponent ()Lix; + FIELD o customName Lix; + METHOD O_ getName ()Lix; METHOD P_ hasCustomName ()Z METHOD Q_ isInvEmpty ()Z METHOD U_ getInvSize ()I @@ -30,6 +31,8 @@ CLASS blh net/minecraft/block/entity/BlockEntityBeacon ARG 0 facing METHOD a serialize (Lhm;)Lhm; ARG 0 tag + METHOD a setCustomName (Lix;)V + ARG 0 value METHOD aa_ getUpdatePacket ()Ljy; METHOD ab_ serializeInitialChunkData ()Lhm; METHOD b removeInvStack (I)Lauv; diff --git a/mappings/net/minecraft/block/entity/BlockEntityBrewingStand.mapping b/mappings/net/minecraft/block/entity/BlockEntityBrewingStand.mapping index 7555cb1c43..92bf76ec3f 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityBrewingStand.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityBrewingStand.mapping @@ -4,8 +4,9 @@ CLASS bln net/minecraft/block/entity/BlockEntityBrewingStand FIELD f SLOTS_SIDE [I FIELD g inventory Lfe; FIELD h brewTime I + FIELD k customName Lix; FIELD l fuel I - METHOD O_ getNameAsComponent ()Lix; + METHOD O_ getName ()Lix; METHOD P_ hasCustomName ()Z METHOD Q_ isInvEmpty ()Z METHOD U_ getInvSize ()I @@ -31,6 +32,8 @@ CLASS bln net/minecraft/block/entity/BlockEntityBrewingStand ARG 0 facing METHOD a serialize (Lhm;)Lhm; ARG 0 tag + METHOD a setCustomName (Lix;)V + ARG 0 value METHOD b removeInvStack (I)Lauv; ARG 0 slot METHOD b setInvProperty (II)V diff --git a/mappings/net/minecraft/block/entity/BlockEntityChest.mapping b/mappings/net/minecraft/block/entity/BlockEntityChest.mapping index 5522fbfcc1..0db855f071 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityChest.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityChest.mapping @@ -2,7 +2,7 @@ CLASS blo net/minecraft/block/entity/BlockEntityChest FIELD j inventory Lfe; METHOD (Lblm;)V ARG 0 factory - METHOD O_ getNameAsComponent ()Lix; + METHOD O_ getName ()Lix; METHOD Q_ isInvEmpty ()Z METHOD U_ getInvSize ()I METHOD Z_ tick ()V diff --git a/mappings/net/minecraft/block/entity/BlockEntityDispenser.mapping b/mappings/net/minecraft/block/entity/BlockEntityDispenser.mapping index 3b8d82778a..c345b43ed3 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityDispenser.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityDispenser.mapping @@ -3,7 +3,7 @@ CLASS blt net/minecraft/block/entity/BlockEntityDispenser FIELD e inventory Lfe; METHOD (Lblm;)V ARG 0 factory - METHOD O_ getNameAsComponent ()Lix; + METHOD O_ getName ()Lix; METHOD Q_ isInvEmpty ()Z METHOD U_ getInvSize ()I METHOD a createContainer (Lapq;Lapr;)Larg; diff --git a/mappings/net/minecraft/block/entity/BlockEntityDropper.mapping b/mappings/net/minecraft/block/entity/BlockEntityDropper.mapping index 6819bbfd47..ed253d8eac 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityDropper.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityDropper.mapping @@ -1,3 +1,3 @@ CLASS blu net/minecraft/block/entity/BlockEntityDropper - METHOD O_ getNameAsComponent ()Lix; + METHOD O_ getName ()Lix; METHOD l getContainerId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/block/entity/BlockEntityEnchantingTable.mapping b/mappings/net/minecraft/block/entity/BlockEntityEnchantingTable.mapping index 6ffe590d50..e03b355113 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityEnchantingTable.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityEnchantingTable.mapping @@ -1,7 +1,8 @@ CLASS blv net/minecraft/block/entity/BlockEntityEnchantingTable FIELD a ticks I FIELD n RANDOM Ljava/util/Random; - METHOD O_ getNameAsComponent ()Lix; + FIELD o customName Lix; + METHOD O_ getName ()Lix; METHOD P_ hasCustomName ()Z METHOD Z_ tick ()V METHOD a createContainer (Lapq;Lapr;)Larg; @@ -9,6 +10,8 @@ CLASS blv net/minecraft/block/entity/BlockEntityEnchantingTable ARG 1 player METHOD a serialize (Lhm;)Lhm; ARG 0 tag + METHOD a setCustomName (Lix;)V + ARG 0 value METHOD b deserialize (Lhm;)V ARG 0 tag METHOD l getContainerId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/block/entity/BlockEntityFurnace.mapping b/mappings/net/minecraft/block/entity/BlockEntityFurnace.mapping index dc12d479e8..0e882ef52f 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityFurnace.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityFurnace.mapping @@ -8,7 +8,7 @@ CLASS blx net/minecraft/block/entity/BlockEntityFurnace FIELD m recipesUsed Ljava/util/Map; METHOD (Lblm;)V ARG 0 factory - METHOD O_ getNameAsComponent ()Lix; + METHOD O_ getName ()Lix; METHOD P_ hasCustomName ()Z METHOD Q_ isInvEmpty ()Z METHOD U_ getInvSize ()I @@ -36,6 +36,8 @@ CLASS blx net/minecraft/block/entity/BlockEntityFurnace ARG 0 facing METHOD a serialize (Lhm;)Lhm; ARG 0 tag + METHOD a setCustomName (Lix;)V + ARG 0 value METHOD b removeInvStack (I)Lauv; ARG 0 slot METHOD b setInvProperty (II)V diff --git a/mappings/net/minecraft/block/entity/BlockEntityHopper.mapping b/mappings/net/minecraft/block/entity/BlockEntityHopper.mapping index aff45a1615..3ef1d019b6 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityHopper.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityHopper.mapping @@ -5,7 +5,7 @@ CLASS blz net/minecraft/block/entity/BlockEntityHopper METHOD G getHopperX ()D METHOD H getHopperY ()D METHOD I getHopperZ ()D - METHOD O_ getNameAsComponent ()Lix; + METHOD O_ getName ()Lix; METHOD Q_ isInvEmpty ()Z METHOD U_ getInvSize ()I METHOD Z_ tick ()V diff --git a/mappings/net/minecraft/block/entity/BlockEntityShulkerBox.mapping b/mappings/net/minecraft/block/entity/BlockEntityShulkerBox.mapping index b0741d500f..f80bb0542d 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityShulkerBox.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityShulkerBox.mapping @@ -9,7 +9,7 @@ CLASS bmf net/minecraft/block/entity/BlockEntityShulkerBox FIELD m color Lats; METHOD (Lats;)V ARG 0 color - METHOD O_ getNameAsComponent ()Lix; + METHOD O_ getName ()Lix; METHOD Q_ isInvEmpty ()Z METHOD U_ getInvSize ()I METHOD Z_ tick ()V diff --git a/mappings/net/minecraft/block/entity/BlockEntityWithLootTable.mapping b/mappings/net/minecraft/block/entity/BlockEntityWithLootTable.mapping index b66187ae5b..ea81054b69 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityWithLootTable.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityWithLootTable.mapping @@ -1,10 +1,11 @@ CLASS bme net/minecraft/block/entity/BlockEntityWithLootTable FIELD g lootTableId Lpu; FIELD h lootTableSeed J + FIELD i customName Lix; METHOD (Lblm;)V ARG 0 factory METHOD P_ hasCustomName ()Z - METHOD R_ getLootTable ()Lpu; + METHOD R_ getLootTableId ()Lpu; METHOD a getInvStack (I)Lauv; ARG 0 slot METHOD a takeInvStack (II)Lauv; @@ -15,6 +16,8 @@ CLASS bme net/minecraft/block/entity/BlockEntityWithLootTable ARG 1 stack METHOD a canPlayerUseInv (Lapr;)Z ARG 0 player + METHOD a setCustomName (Lix;)V + ARG 0 value METHOD a setLootTable (Lpu;J)V ARG 0 id ARG 1 seed @@ -36,6 +39,7 @@ CLASS bme net/minecraft/block/entity/BlockEntityWithLootTable ARG 0 player METHOD d deserializeLootTable (Lhm;)Z ARG 0 tag + METHOD e getCustomName ()Lix; METHOD e serializeLootTable (Lhm;)Z ARG 0 tag METHOD h getInvPropertyCount ()I diff --git a/mappings/net/minecraft/client/audio/AbstractSoundEvent.mapping b/mappings/net/minecraft/client/audio/AbstractSoundEvent.mapping new file mode 100644 index 0000000000..21fa299da3 --- /dev/null +++ b/mappings/net/minecraft/client/audio/AbstractSoundEvent.mapping @@ -0,0 +1,32 @@ +CLASS dkw net/minecraft/client/audio/AbstractSoundEvent + FIELD a sound Ldlf; + FIELD b category Lwy; + FIELD c id Lpu; + FIELD d volume F + FIELD e pitch F + FIELD f x F + FIELD g y F + FIELD h z F + FIELD i repeat Z + FIELD j repeatDelay I + FIELD k attenuationType Ldli$a; + FIELD m accessor Ldmg; + METHOD (Lpu;Lwy;)V + ARG 0 soundId + ARG 1 category + METHOD (Lww;Lwy;)V + ARG 0 sound + ARG 1 category + METHOD a getId ()Lpu; + METHOD a getAccess (Ldmf;)Ldmg; + ARG 0 loader + METHOD b getSound ()Ldlf; + METHOD c getCategory ()Lwy; + METHOD d isRepeatable ()Z + METHOD e getRepeatDelay ()I + METHOD f getVolume ()F + METHOD g getPitch ()F + METHOD h getX ()F + METHOD i getY ()F + METHOD j getZ ()F + METHOD k getAttenuationType ()Ldli$a; diff --git a/mappings/net/minecraft/client/audio/ISoundEvent.mapping b/mappings/net/minecraft/client/audio/ISoundEvent.mapping deleted file mode 100644 index a005607ab0..0000000000 --- a/mappings/net/minecraft/client/audio/ISoundEvent.mapping +++ /dev/null @@ -1,19 +0,0 @@ -CLASS dli net/minecraft/client/audio/ISoundEvent - CLASS dli$a AttenuationType - FIELD a NONE Ldli$a; - FIELD b LINEAR Ldli$a; - FIELD c TYPE I - METHOD a getType ()I - METHOD a getId ()Lpu; - METHOD a getAccess (Ldmf;)Ldmg; - ARG 0 loader - METHOD b getSound ()Ldlf; - METHOD c getCategory ()Lwy; - METHOD d isRepeatable ()Z - METHOD e getRepeatDelay ()I - METHOD f getVolume ()F - METHOD g getPitch ()F - METHOD h getX ()F - METHOD i getY ()F - METHOD j getZ ()F - METHOD k getAttenuationType ()Ldli$a; diff --git a/mappings/net/minecraft/client/audio/ISoundEventTickable.mapping b/mappings/net/minecraft/client/audio/ISoundEventTickable.mapping deleted file mode 100644 index b477faa2ec..0000000000 --- a/mappings/net/minecraft/client/audio/ISoundEventTickable.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS dlj net/minecraft/client/audio/ISoundEventTickable - METHOD m isDone ()Z diff --git a/mappings/net/minecraft/client/audio/ISoundContainer.mapping b/mappings/net/minecraft/client/audio/SoundContainer.mapping similarity index 54% rename from mappings/net/minecraft/client/audio/ISoundContainer.mapping rename to mappings/net/minecraft/client/audio/SoundContainer.mapping index 72205d2e38..e081daedbe 100644 --- a/mappings/net/minecraft/client/audio/ISoundContainer.mapping +++ b/mappings/net/minecraft/client/audio/SoundContainer.mapping @@ -1,3 +1,3 @@ -CLASS dmh net/minecraft/client/audio/ISoundContainer +CLASS dmh net/minecraft/client/audio/SoundContainer METHOD e getWeight ()I METHOD k getSound ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/client/audio/SoundEvent.mapping b/mappings/net/minecraft/client/audio/SoundEvent.mapping index 41d449d737..8077dc5226 100644 --- a/mappings/net/minecraft/client/audio/SoundEvent.mapping +++ b/mappings/net/minecraft/client/audio/SoundEvent.mapping @@ -1,22 +1,9 @@ -CLASS dkw net/minecraft/client/audio/SoundEvent - FIELD a sound Ldlf; - FIELD b category Lwy; - FIELD c id Lpu; - FIELD d volume F - FIELD e pitch F - FIELD f x F - FIELD g y F - FIELD h z F - FIELD i repeat Z - FIELD j repeatDelay I - FIELD k attenuationType Ldli$a; - FIELD m accessor Ldmg; - METHOD (Lpu;Lwy;)V - ARG 0 soundId - ARG 1 category - METHOD (Lww;Lwy;)V - ARG 0 sound - ARG 1 category +CLASS dli net/minecraft/client/audio/SoundEvent + CLASS dli$a AttenuationType + FIELD a NONE Ldli$a; + FIELD b LINEAR Ldli$a; + FIELD c TYPE I + METHOD a getType ()I METHOD a getId ()Lpu; METHOD a getAccess (Ldmf;)Ldmg; ARG 0 loader diff --git a/mappings/net/minecraft/client/audio/ISoundListener.mapping b/mappings/net/minecraft/client/audio/SoundEventListener.mapping similarity index 55% rename from mappings/net/minecraft/client/audio/ISoundListener.mapping rename to mappings/net/minecraft/client/audio/SoundEventListener.mapping index 12a097a743..9a720a796d 100644 --- a/mappings/net/minecraft/client/audio/ISoundListener.mapping +++ b/mappings/net/minecraft/client/audio/SoundEventListener.mapping @@ -1,4 +1,4 @@ -CLASS dme net/minecraft/client/audio/ISoundListener +CLASS dme net/minecraft/client/audio/SoundEventListener METHOD a onSoundPlayed (Ldli;Ldmg;)V ARG 0 sound ARG 1 accessor diff --git a/mappings/net/minecraft/client/audio/TickableSoundEvent.mapping b/mappings/net/minecraft/client/audio/TickableSoundEvent.mapping new file mode 100644 index 0000000000..e53a35a14a --- /dev/null +++ b/mappings/net/minecraft/client/audio/TickableSoundEvent.mapping @@ -0,0 +1,2 @@ +CLASS dlj net/minecraft/client/audio/TickableSoundEvent + METHOD m isDone ()Z diff --git a/mappings/net/minecraft/client/gui/hud/spectator/ISpectatorMenu.mapping b/mappings/net/minecraft/client/gui/hud/spectator/ISpectatorMenu.mapping deleted file mode 100644 index 0607355618..0000000000 --- a/mappings/net/minecraft/client/gui/hud/spectator/ISpectatorMenu.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS csz net/minecraft/client/gui/hud/spectator/ISpectatorMenu - METHOD a getElements ()Ljava/util/List; - METHOD b getMessage ()Lix; diff --git a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping index 6fac1c4182..619ee9fc92 100644 --- a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping +++ b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping @@ -1,17 +1,3 @@ -CLASS csy net/minecraft/client/gui/hud/spectator/SpectatorMenu - CLASS csy$1 - METHOD a renderIcon (FI)V - METHOD a selectElement (Lcsy;)V - ARG 0 menu - METHOD ak_ enabled ()Z - CLASS csy$a - METHOD a renderIcon (FI)V - METHOD a selectElement (Lcsy;)V - ARG 0 menu - METHOD ak_ enabled ()Z - CLASS csy$b - METHOD a renderIcon (FI)V - METHOD a selectElement (Lcsy;)V - ARG 0 menu - METHOD ak_ enabled ()Z - METHOD a selectElement (Lcsz;)V +CLASS csz net/minecraft/client/gui/hud/spectator/SpectatorMenu + METHOD a getElements ()Ljava/util/List; + METHOD b getMessage ()Lix; diff --git a/mappings/net/minecraft/client/gui/hud/spectator/ISpectatorMenuElement.mapping b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuElement.mapping similarity index 57% rename from mappings/net/minecraft/client/gui/hud/spectator/ISpectatorMenuElement.mapping rename to mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuElement.mapping index 17ca1efea6..0afd36c007 100644 --- a/mappings/net/minecraft/client/gui/hud/spectator/ISpectatorMenuElement.mapping +++ b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuElement.mapping @@ -1,4 +1,4 @@ -CLASS cta net/minecraft/client/gui/hud/spectator/ISpectatorMenuElement +CLASS cta net/minecraft/client/gui/hud/spectator/SpectatorMenuElement METHOD a renderIcon (FI)V METHOD a selectElement (Lcsy;)V ARG 0 menu diff --git a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuImpl.mapping b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuImpl.mapping new file mode 100644 index 0000000000..c9d4d1128d --- /dev/null +++ b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuImpl.mapping @@ -0,0 +1,17 @@ +CLASS csy net/minecraft/client/gui/hud/spectator/SpectatorMenuImpl + CLASS csy$1 + METHOD a renderIcon (FI)V + METHOD a selectElement (Lcsy;)V + ARG 0 menu + METHOD ak_ enabled ()Z + CLASS csy$a + METHOD a renderIcon (FI)V + METHOD a selectElement (Lcsy;)V + ARG 0 menu + METHOD ak_ enabled ()Z + CLASS csy$b + METHOD a renderIcon (FI)V + METHOD a selectElement (Lcsy;)V + ARG 0 menu + METHOD ak_ enabled ()Z + METHOD a selectElement (Lcsz;)V diff --git a/mappings/net/minecraft/client/network/ContainerProviderDummyClient.mapping b/mappings/net/minecraft/client/network/ContainerProviderDummyClient.mapping index 5d1b2619b3..e89bd02aec 100644 --- a/mappings/net/minecraft/client/network/ContainerProviderDummyClient.mapping +++ b/mappings/net/minecraft/client/network/ContainerProviderDummyClient.mapping @@ -4,7 +4,7 @@ CLASS czg net/minecraft/client/network/ContainerProviderDummyClient METHOD (Ljava/lang/String;Lix;)V ARG 0 id ARG 1 name - METHOD O_ getNameAsComponent ()Lix; + METHOD O_ getName ()Lix; METHOD P_ hasCustomName ()Z METHOD a createContainer (Lapq;Lapr;)Larg; ARG 0 playerInv diff --git a/mappings/net/minecraft/network/handler/INetworkGameHandlerClient.mapping b/mappings/net/minecraft/client/network/handler/NetworkGameHandlerClientImpl.mapping similarity index 87% rename from mappings/net/minecraft/network/handler/INetworkGameHandlerClient.mapping rename to mappings/net/minecraft/client/network/handler/NetworkGameHandlerClientImpl.mapping index fb29d4a198..d2220ac7a4 100644 --- a/mappings/net/minecraft/network/handler/INetworkGameHandlerClient.mapping +++ b/mappings/net/minecraft/client/network/handler/NetworkGameHandlerClientImpl.mapping @@ -1,4 +1,15 @@ -CLASS jo net/minecraft/network/handler/INetworkGameHandlerClient +CLASS cwx net/minecraft/client/network/handler/NetworkGameHandlerClientImpl + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b connection Lil; + FIELD e game Lclp; + FIELD f world Lcxa; + FIELD i advancementHandler Lcwu; + FIELD m rand Ljava/util/Random; + METHOD a getClientConnection ()Lil; + METHOD a onConnectionLost (Lix;)V + ARG 0 reason + METHOD a sendPacket (Ljl;)V + ARG 0 packet METHOD a onEntitySpawn (Ljp;)V ARG 0 packet METHOD a onExperienceOrbSpawn (Ljq;)V @@ -142,3 +153,6 @@ CLASS jo net/minecraft/network/handler/INetworkGameHandlerClient ARG 0 packet METHOD a onEntityPotionEffect (Lmt;)V ARG 0 packet + METHOD b validateResourcePackUrl (Ljava/lang/String;)Z + ARG 0 url + METHOD g getAdvancementHandler ()Lcwu; diff --git a/mappings/net/minecraft/client/network/handler/NetworkLoginHandlerClient.mapping b/mappings/net/minecraft/client/network/handler/NetworkLoginHandlerClientImpl.mapping similarity index 88% rename from mappings/net/minecraft/client/network/handler/NetworkLoginHandlerClient.mapping rename to mappings/net/minecraft/client/network/handler/NetworkLoginHandlerClientImpl.mapping index a8ca931e81..8af0f942a5 100644 --- a/mappings/net/minecraft/client/network/handler/NetworkLoginHandlerClient.mapping +++ b/mappings/net/minecraft/client/network/handler/NetworkLoginHandlerClientImpl.mapping @@ -1,4 +1,5 @@ -CLASS cww net/minecraft/client/network/handler/NetworkLoginHandlerClient +CLASS cww net/minecraft/client/network/handler/NetworkLoginHandlerClientImpl + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b game Lclp; FIELD c parentGui Lcpt; FIELD e connection Lil; diff --git a/mappings/net/minecraft/client/particle/IParticleFactory.mapping b/mappings/net/minecraft/client/particle/ParticleFactory.mapping similarity index 69% rename from mappings/net/minecraft/client/particle/IParticleFactory.mapping rename to mappings/net/minecraft/client/particle/ParticleFactory.mapping index c3b9170582..e7a4ec3c17 100644 --- a/mappings/net/minecraft/client/particle/IParticleFactory.mapping +++ b/mappings/net/minecraft/client/particle/ParticleFactory.mapping @@ -1,4 +1,4 @@ -CLASS cyi net/minecraft/client/particle/IParticleFactory +CLASS cyi net/minecraft/client/particle/ParticleFactory METHOD a createParticle (Lfq;Lazt;DDDDDD)Lcyg; ARG 1 world ARG 2 x diff --git a/mappings/net/minecraft/client/render/Renderer.mapping b/mappings/net/minecraft/client/render/Renderer.mapping index 236639690f..191d3ab72a 100644 --- a/mappings/net/minecraft/client/render/Renderer.mapping +++ b/mappings/net/minecraft/client/render/Renderer.mapping @@ -72,7 +72,7 @@ CLASS czw net/minecraft/client/render/Renderer METHOD a addParticle (Lfq;ZZDDDDDD)V METHOD a onResourceReload (Lvt;)V ARG 0 manager - METHOD b markRegionForRenderUpdate (III)V + METHOD b (III)V METHOD b onBlockBreakingProgress (ILeq;I)V ARG 0 entityId ARG 1 pos diff --git a/mappings/net/minecraft/client/render/block/IBlockColorMapper.mapping b/mappings/net/minecraft/client/render/block/BlockColorMapper.mapping similarity index 60% rename from mappings/net/minecraft/client/render/block/IBlockColorMapper.mapping rename to mappings/net/minecraft/client/render/block/BlockColorMapper.mapping index e161d6ac9b..ab902b64a7 100644 --- a/mappings/net/minecraft/client/render/block/IBlockColorMapper.mapping +++ b/mappings/net/minecraft/client/render/block/BlockColorMapper.mapping @@ -1,4 +1,4 @@ -CLASS clw net/minecraft/client/render/block/IBlockColorMapper +CLASS clw net/minecraft/client/render/block/BlockColorMapper METHOD getColor (Lbnh;Laze;Leq;I)I ARG 0 state ARG 1 view diff --git a/mappings/net/minecraft/client/render/chunk/ChunkRendererFactory.mapping b/mappings/net/minecraft/client/render/chunk/ChunkRendererFactory.mapping new file mode 100644 index 0000000000..e3368a6f47 --- /dev/null +++ b/mappings/net/minecraft/client/render/chunk/ChunkRendererFactory.mapping @@ -0,0 +1,3 @@ +CLASS dcm net/minecraft/client/render/chunk/ChunkRendererFactory + METHOD create (Lazt;Lczw;)Ldcl; + ARG 0 world diff --git a/mappings/net/minecraft/client/render/chunk/IChunkRendererFactory.mapping b/mappings/net/minecraft/client/render/chunk/IChunkRendererFactory.mapping deleted file mode 100644 index 4bb0572088..0000000000 --- a/mappings/net/minecraft/client/render/chunk/IChunkRendererFactory.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS dcm net/minecraft/client/render/chunk/IChunkRendererFactory - METHOD create (Lazt;Lczw;)Ldcl; - ARG 0 world diff --git a/mappings/net/minecraft/client/render/debug/RenderDebug.mapping b/mappings/net/minecraft/client/render/debug/RenderDebug.mapping index f1a8abdf53..362e5007d0 100644 --- a/mappings/net/minecraft/client/render/debug/RenderDebug.mapping +++ b/mappings/net/minecraft/client/render/debug/RenderDebug.mapping @@ -1,5 +1,5 @@ CLASS dda net/minecraft/client/render/debug/RenderDebug - CLASS dda$a IRenderDebug + CLASS dda$a DebugRenderer METHOD a render (FJ)V FIELD b renderDebugWater Ldda$a; FIELD c renderDebugChunkBorder Ldda$a; diff --git a/mappings/net/minecraft/client/render/entity/model/IModelMultipass.mapping b/mappings/net/minecraft/client/render/entity/model/IModelMultipass.mapping deleted file mode 100644 index 08c7970cf4..0000000000 --- a/mappings/net/minecraft/client/render/entity/model/IModelMultipass.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS cwb net/minecraft/client/render/entity/model/IModelMultipass - METHOD b renderPass (Lafv;FFFFFF)V - ARG 0 entity diff --git a/mappings/net/minecraft/client/render/entity/model/MultipassModel.mapping b/mappings/net/minecraft/client/render/entity/model/MultipassModel.mapping new file mode 100644 index 0000000000..28a3c1c14b --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/MultipassModel.mapping @@ -0,0 +1,3 @@ +CLASS cwb net/minecraft/client/render/entity/model/MultipassModel + METHOD b renderPass (Lafv;FFFFFF)V + ARG 0 entity diff --git a/mappings/net/minecraft/client/render/item/IItemColorMapper.mapping b/mappings/net/minecraft/client/render/item/IItemColorMapper.mapping deleted file mode 100644 index 6aa2f2f1f5..0000000000 --- a/mappings/net/minecraft/client/render/item/IItemColorMapper.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS clz net/minecraft/client/render/item/IItemColorMapper - METHOD getColor (Lauv;I)I - ARG 0 stack - ARG 1 tintIndex diff --git a/mappings/net/minecraft/client/render/item/ItemColorMapper.mapping b/mappings/net/minecraft/client/render/item/ItemColorMapper.mapping new file mode 100644 index 0000000000..1183857de7 --- /dev/null +++ b/mappings/net/minecraft/client/render/item/ItemColorMapper.mapping @@ -0,0 +1,4 @@ +CLASS clz net/minecraft/client/render/item/ItemColorMapper + METHOD getColor (Lauv;I)I + ARG 0 stack + ARG 1 tintIndex diff --git a/mappings/net/minecraft/client/render/model/BakedModel.mapping b/mappings/net/minecraft/client/render/model/BakedModelImpl.mapping similarity index 94% rename from mappings/net/minecraft/client/render/model/BakedModel.mapping rename to mappings/net/minecraft/client/render/model/BakedModelImpl.mapping index 6c7bef7c4e..414eb5a435 100644 --- a/mappings/net/minecraft/client/render/model/BakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/BakedModelImpl.mapping @@ -1,4 +1,4 @@ -CLASS dkr net/minecraft/client/render/model/BakedModel +CLASS dkr net/minecraft/client/render/model/BakedModelImpl CLASS dkr$a Builder FIELD a quads Ljava/util/List; FIELD b faceQuads Ljava/util/Map; diff --git a/mappings/net/minecraft/client/render/model/IBakedModel.mapping b/mappings/net/minecraft/client/render/model/IBakedModel.mapping deleted file mode 100644 index 087c8186dc..0000000000 --- a/mappings/net/minecraft/client/render/model/IBakedModel.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS dkj net/minecraft/client/render/model/IBakedModel - METHOD a useAmbientOcclusion ()Z - METHOD a getQuads (Lbnh;Lev;Ljava/util/Random;)Ljava/util/List; - ARG 0 state - ARG 1 face - METHOD b hasDepthInGui ()Z - METHOD c isBuiltin ()Z - METHOD d getSprite ()Ldjb; - METHOD e getTransformationList ()Ldbc; - METHOD f getItemPropertyOverrides ()Ldba; diff --git a/mappings/net/minecraft/client/resource/ResourcePackRedirected.mapping b/mappings/net/minecraft/client/resource/ResourcePackRedirected.mapping new file mode 100644 index 0000000000..ed45089a9d --- /dev/null +++ b/mappings/net/minecraft/client/resource/ResourcePackRedirected.mapping @@ -0,0 +1,20 @@ +CLASS djp net/minecraft/client/resource/ResourcePackRedirected + FIELD a NEW_TO_OLD_MAP Ljava/util/Map; + FIELD b parent Luz; + FIELD c idMap Ljava/util/Map; + METHOD a getName ()Ljava/lang/String; + METHOD a getMetadataLocation (Lpu;)Lpu; + METHOD a getNamespaces (Lva;)Ljava/util/Set; + ARG 0 type + METHOD a (Lva;Ljava/lang/String;ILjava/util/function/Predicate;)Ljava/util/Collection; + ARG 0 type + METHOD a open (Lva;Lpu;)Ljava/io/InputStream; + ARG 0 type + ARG 1 id + METHOD a (Lvd;)Ljava/lang/Object; + METHOD b openRoot (Ljava/lang/String;)Ljava/io/InputStream; + ARG 0 filename + METHOD b getRedirectedId (Lpu;)Lpu; + METHOD b contains (Lva;Lpu;)Z + ARG 0 type + ARG 1 id diff --git a/mappings/net/minecraft/client/resource/metadata/ResourceMetadataReaderAnimation.mapping b/mappings/net/minecraft/client/resource/metadata/ResourceMetadataReaderAnimation.mapping index df80aae8c7..6700a36fa9 100644 --- a/mappings/net/minecraft/client/resource/metadata/ResourceMetadataReaderAnimation.mapping +++ b/mappings/net/minecraft/client/resource/metadata/ResourceMetadataReaderAnimation.mapping @@ -1,3 +1,4 @@ CLASS dka net/minecraft/client/resource/metadata/ResourceMetadataReaderAnimation + METHOD a getKey ()Ljava/lang/String; METHOD a (Lcom/google/gson/JsonObject;)Ljava/lang/Object; ARG 0 json diff --git a/mappings/net/minecraft/client/resource/metadata/ResourceMetadataReaderLanguage.mapping b/mappings/net/minecraft/client/resource/metadata/ResourceMetadataReaderLanguage.mapping index 38edd783cd..aa85e96cc4 100644 --- a/mappings/net/minecraft/client/resource/metadata/ResourceMetadataReaderLanguage.mapping +++ b/mappings/net/minecraft/client/resource/metadata/ResourceMetadataReaderLanguage.mapping @@ -1,3 +1,4 @@ CLASS dkd net/minecraft/client/resource/metadata/ResourceMetadataReaderLanguage + METHOD a getKey ()Ljava/lang/String; METHOD a (Lcom/google/gson/JsonObject;)Ljava/lang/Object; ARG 0 json diff --git a/mappings/net/minecraft/client/resource/metadata/ResourceMetadataReaderTexture.mapping b/mappings/net/minecraft/client/resource/metadata/ResourceMetadataReaderTexture.mapping index ea3edd581c..9e091d4dc3 100644 --- a/mappings/net/minecraft/client/resource/metadata/ResourceMetadataReaderTexture.mapping +++ b/mappings/net/minecraft/client/resource/metadata/ResourceMetadataReaderTexture.mapping @@ -1,3 +1,4 @@ CLASS dkh net/minecraft/client/resource/metadata/ResourceMetadataReaderTexture + METHOD a getKey ()Ljava/lang/String; METHOD a (Lcom/google/gson/JsonObject;)Ljava/lang/Object; ARG 0 json diff --git a/mappings/net/minecraft/client/texture/IImageFilter.mapping b/mappings/net/minecraft/client/texture/IImageFilter.mapping deleted file mode 100644 index 4ef7d7e85a..0000000000 --- a/mappings/net/minecraft/client/texture/IImageFilter.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS czt net/minecraft/client/texture/IImageFilter - METHOD a filterImage (Lcki;)Lcki; diff --git a/mappings/net/minecraft/client/texture/ITexture.mapping b/mappings/net/minecraft/client/texture/ITexture.mapping deleted file mode 100644 index f3eee67dc0..0000000000 --- a/mappings/net/minecraft/client/texture/ITexture.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS djd net/minecraft/client/texture/ITexture - METHOD a load (Lvt;)V - ARG 0 resourceContainer - METHOD b popFilter ()V - METHOD b pushFilter (ZZ)V - ARG 0 bilinear - ARG 1 mipmap - METHOD c getGlId ()I - METHOD h bindTexture ()V diff --git a/mappings/net/minecraft/client/texture/ITextureUpdateMethod.mapping b/mappings/net/minecraft/client/texture/ITextureUpdateMethod.mapping deleted file mode 100644 index c91b0a2412..0000000000 --- a/mappings/net/minecraft/client/texture/ITextureUpdateMethod.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS dje net/minecraft/client/texture/ITextureUpdateMethod - METHOD e updateTexture ()V diff --git a/mappings/net/minecraft/client/texture/ITextureUpdateable.mapping b/mappings/net/minecraft/client/texture/ITextureUpdateable.mapping deleted file mode 100644 index 729ac29800..0000000000 --- a/mappings/net/minecraft/client/texture/ITextureUpdateable.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS djf net/minecraft/client/texture/ITextureUpdateable diff --git a/mappings/net/minecraft/client/texture/ImageFilter.mapping b/mappings/net/minecraft/client/texture/ImageFilter.mapping new file mode 100644 index 0000000000..14d15d5d4a --- /dev/null +++ b/mappings/net/minecraft/client/texture/ImageFilter.mapping @@ -0,0 +1,2 @@ +CLASS czt net/minecraft/client/texture/ImageFilter + METHOD a filterImage (Lcki;)Lcki; diff --git a/mappings/net/minecraft/client/texture/Texture.mapping b/mappings/net/minecraft/client/texture/Texture.mapping index 5a36072d3a..4e62949258 100644 --- a/mappings/net/minecraft/client/texture/Texture.mapping +++ b/mappings/net/minecraft/client/texture/Texture.mapping @@ -1,15 +1,9 @@ -CLASS dir net/minecraft/client/texture/Texture - FIELD a glId I - FIELD b bilinear Z - FIELD c mipmap Z - FIELD d oldBilinear Z - FIELD e oldMipmap Z - METHOD a setFilter (ZZ)V - ARG 0 bilinear - ARG 1 mipmap +CLASS djd net/minecraft/client/texture/Texture + METHOD a load (Lvt;)V + ARG 0 resourceContainer METHOD b popFilter ()V METHOD b pushFilter (ZZ)V ARG 0 bilinear ARG 1 mipmap METHOD c getGlId ()I - METHOD d clearGlId ()V + METHOD h bindTexture ()V diff --git a/mappings/net/minecraft/client/texture/TextureImpl.mapping b/mappings/net/minecraft/client/texture/TextureImpl.mapping new file mode 100644 index 0000000000..44fb4460aa --- /dev/null +++ b/mappings/net/minecraft/client/texture/TextureImpl.mapping @@ -0,0 +1,15 @@ +CLASS dir net/minecraft/client/texture/TextureImpl + FIELD a glId I + FIELD b bilinear Z + FIELD c mipmap Z + FIELD d oldBilinear Z + FIELD e oldMipmap Z + METHOD a setFilter (ZZ)V + ARG 0 bilinear + ARG 1 mipmap + METHOD b popFilter ()V + METHOD b pushFilter (ZZ)V + ARG 0 bilinear + ARG 1 mipmap + METHOD c getGlId ()I + METHOD d clearGlId ()V diff --git a/mappings/net/minecraft/client/texture/TextureManager.mapping b/mappings/net/minecraft/client/texture/TextureManager.mapping index e3f67ddb23..42588c2c40 100644 --- a/mappings/net/minecraft/client/texture/TextureManager.mapping +++ b/mappings/net/minecraft/client/texture/TextureManager.mapping @@ -1,7 +1,7 @@ CLASS djc net/minecraft/client/texture/TextureManager FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c textures Ljava/util/Map; - FIELD d updateable Ljava/util/List; + FIELD d tickListeners Ljava/util/List; FIELD e dynamicIdCounters Ljava/util/Map; FIELD f resourceContainer Lvt; METHOD (Lvt;)V @@ -23,4 +23,4 @@ CLASS djc net/minecraft/client/texture/TextureManager ARG 0 id METHOD c destroyTexture (Lpu;)V ARG 0 id - METHOD e updateTexture ()V + METHOD e tick ()V diff --git a/mappings/net/minecraft/client/texture/TextureSpriteAtlas.mapping b/mappings/net/minecraft/client/texture/TextureSpriteAtlas.mapping index 1727ff2ec7..d023f15de2 100644 --- a/mappings/net/minecraft/client/texture/TextureSpriteAtlas.mapping +++ b/mappings/net/minecraft/client/texture/TextureSpriteAtlas.mapping @@ -15,4 +15,4 @@ CLASS dja net/minecraft/client/texture/TextureSpriteAtlas ARG 1 sprite METHOD b generateAtlas (Lvt;)V ARG 0 container - METHOD e updateTexture ()V + METHOD e tick ()V diff --git a/mappings/net/minecraft/client/texture/TextureTickListener.mapping b/mappings/net/minecraft/client/texture/TextureTickListener.mapping new file mode 100644 index 0000000000..fac94b62fe --- /dev/null +++ b/mappings/net/minecraft/client/texture/TextureTickListener.mapping @@ -0,0 +1,2 @@ +CLASS dje net/minecraft/client/texture/TextureTickListener + METHOD e tick ()V diff --git a/mappings/net/minecraft/client/texture/TickableTexture.mapping b/mappings/net/minecraft/client/texture/TickableTexture.mapping new file mode 100644 index 0000000000..4bfdc8aed8 --- /dev/null +++ b/mappings/net/minecraft/client/texture/TickableTexture.mapping @@ -0,0 +1 @@ +CLASS djf net/minecraft/client/texture/TickableTexture diff --git a/mappings/net/minecraft/command/CommandManager.mapping b/mappings/net/minecraft/command/CommandManager.mapping new file mode 100644 index 0000000000..58728c7689 --- /dev/null +++ b/mappings/net/minecraft/command/CommandManager.mapping @@ -0,0 +1 @@ +CLASS azz net/minecraft/command/CommandManager diff --git a/mappings/net/minecraft/command/ICommandSource.mapping b/mappings/net/minecraft/command/CommandSource.mapping similarity index 78% rename from mappings/net/minecraft/command/ICommandSource.mapping rename to mappings/net/minecraft/command/CommandSource.mapping index 3291d8d7eb..0ce61692d6 100644 --- a/mappings/net/minecraft/command/ICommandSource.mapping +++ b/mappings/net/minecraft/command/CommandSource.mapping @@ -1,4 +1,4 @@ -CLASS bw net/minecraft/command/ICommandSource +CLASS bw net/minecraft/command/CommandSource METHOD C_ shouldBroadcastConsoleToOps ()Z METHOD a sendCommandFeedback ()Z METHOD a appendCommandFeedback (Lix;)V diff --git a/mappings/net/minecraft/command/ICommandManager.mapping b/mappings/net/minecraft/command/ICommandManager.mapping deleted file mode 100644 index f8f0ff1a69..0000000000 --- a/mappings/net/minecraft/command/ICommandManager.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS azz net/minecraft/command/ICommandManager diff --git a/mappings/net/minecraft/container/IContainerListener.mapping b/mappings/net/minecraft/container/ContainerListener.mapping similarity index 87% rename from mappings/net/minecraft/container/IContainerListener.mapping rename to mappings/net/minecraft/container/ContainerListener.mapping index 9cd4df4230..e900fa029c 100644 --- a/mappings/net/minecraft/container/IContainerListener.mapping +++ b/mappings/net/minecraft/container/ContainerListener.mapping @@ -1,4 +1,4 @@ -CLASS aro net/minecraft/container/IContainerListener +CLASS aro net/minecraft/container/ContainerListener METHOD a onContainerPropertyUpdate (Larg;II)V ARG 0 container ARG 1 propertyId diff --git a/mappings/net/minecraft/container/IContainerProvider.mapping b/mappings/net/minecraft/container/ContainerProvider.mapping similarity index 69% rename from mappings/net/minecraft/container/IContainerProvider.mapping rename to mappings/net/minecraft/container/ContainerProvider.mapping index 5b6f056900..e87fc4c43b 100644 --- a/mappings/net/minecraft/container/IContainerProvider.mapping +++ b/mappings/net/minecraft/container/ContainerProvider.mapping @@ -1,4 +1,4 @@ -CLASS aep net/minecraft/container/IContainerProvider +CLASS aep net/minecraft/container/ContainerProvider METHOD a createContainer (Lapq;Lapr;)Larg; ARG 0 playerInv ARG 1 player diff --git a/mappings/net/minecraft/container/ILockableContainer.mapping b/mappings/net/minecraft/container/LockableContainer.mapping similarity index 68% rename from mappings/net/minecraft/container/ILockableContainer.mapping rename to mappings/net/minecraft/container/LockableContainer.mapping index 4a326d30ce..1642813da4 100644 --- a/mappings/net/minecraft/container/ILockableContainer.mapping +++ b/mappings/net/minecraft/container/LockableContainer.mapping @@ -1,4 +1,4 @@ -CLASS aeu net/minecraft/container/ILockableContainer +CLASS aeu net/minecraft/container/LockableContainer METHOD W_ hasContainerLock ()Z METHOD a setContainerLock (Laet;)V ARG 0 lock diff --git a/mappings/net/minecraft/container/LockableContainerDouble.mapping b/mappings/net/minecraft/container/LockableContainerDouble.mapping index 73a3d9a9c6..5977ef2ad3 100644 --- a/mappings/net/minecraft/container/LockableContainerDouble.mapping +++ b/mappings/net/minecraft/container/LockableContainerDouble.mapping @@ -5,7 +5,7 @@ CLASS aeh net/minecraft/container/LockableContainerDouble METHOD (Lix;Laeu;Laeu;)V ARG 1 first ARG 2 second - METHOD O_ getNameAsComponent ()Lix; + METHOD O_ getName ()Lix; METHOD P_ hasCustomName ()Z METHOD Q_ isInvEmpty ()Z METHOD U_ getInvSize ()I diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index fcc7129567..3afc1e0733 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -63,9 +63,9 @@ CLASS afv net/minecraft/entity/Entity METHOD B_ getPistonBehavior ()Lcbr; METHOD C_ shouldBroadcastConsoleToOps ()Z METHOD E updatePortalCooldown ()V - METHOD O_ getNameAsComponent ()Lix; + METHOD O_ getName ()Lix; METHOD P_ hasCustomName ()Z - METHOD Q getNameComponent ()Lix; + METHOD Q ()Lix; METHOD R getFactory ()Lafz; METHOD S getEntityId ()I METHOD S_ update ()V diff --git a/mappings/net/minecraft/entity/EntityData.mapping b/mappings/net/minecraft/entity/EntityData.mapping new file mode 100644 index 0000000000..b195db0234 --- /dev/null +++ b/mappings/net/minecraft/entity/EntityData.mapping @@ -0,0 +1 @@ +CLASS agn net/minecraft/entity/EntityData diff --git a/mappings/net/minecraft/entity/EntityItem.mapping b/mappings/net/minecraft/entity/EntityItem.mapping index e94a6603b0..17130842d1 100644 --- a/mappings/net/minecraft/entity/EntityItem.mapping +++ b/mappings/net/minecraft/entity/EntityItem.mapping @@ -5,7 +5,7 @@ CLASS anu net/minecraft/entity/EntityItem FIELD d pickupDelay I FIELD e health I FIELD f thrower Ljava/util/UUID; - METHOD O_ getNameAsComponent ()Lix; + METHOD O_ getName ()Lix; METHOD S_ update ()V METHOD a setPickupDelay (I)V ARG 0 delay diff --git a/mappings/net/minecraft/entity/IEntityData.mapping b/mappings/net/minecraft/entity/IEntityData.mapping deleted file mode 100644 index 03f2f7030c..0000000000 --- a/mappings/net/minecraft/entity/IEntityData.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS agn net/minecraft/entity/IEntityData diff --git a/mappings/net/minecraft/entity/IJumpingMount.mapping b/mappings/net/minecraft/entity/JumpingMount.mapping similarity index 77% rename from mappings/net/minecraft/entity/IJumpingMount.mapping rename to mappings/net/minecraft/entity/JumpingMount.mapping index 154dd5a26c..1eb2815db6 100644 --- a/mappings/net/minecraft/entity/IJumpingMount.mapping +++ b/mappings/net/minecraft/entity/JumpingMount.mapping @@ -1,4 +1,4 @@ -CLASS agm net/minecraft/entity/IJumpingMount +CLASS agm net/minecraft/entity/JumpingMount METHOD H_ canJump ()Z METHOD J_ stopJumping ()V METHOD a_ setJumpStrength (I)V diff --git a/mappings/net/minecraft/entity/ai/IDistantAttacker.mapping b/mappings/net/minecraft/entity/ai/DistantAttacker.mapping similarity index 64% rename from mappings/net/minecraft/entity/ai/IDistantAttacker.mapping rename to mappings/net/minecraft/entity/ai/DistantAttacker.mapping index 1f15abd6e6..4d24942b27 100644 --- a/mappings/net/minecraft/entity/ai/IDistantAttacker.mapping +++ b/mappings/net/minecraft/entity/ai/DistantAttacker.mapping @@ -1,4 +1,4 @@ -CLASS aou net/minecraft/entity/ai/IDistantAttacker +CLASS aou net/minecraft/entity/ai/DistantAttacker METHOD a attackDistant (Lage;F)V ARG 0 target METHOD s setArmsRaised (Z)V diff --git a/mappings/net/minecraft/entity/attribute/Attribute.mapping b/mappings/net/minecraft/entity/attribute/AttributeImpl.mapping similarity index 85% rename from mappings/net/minecraft/entity/attribute/Attribute.mapping rename to mappings/net/minecraft/entity/attribute/AttributeImpl.mapping index 0f2f4ea39f..c94e83d79a 100644 --- a/mappings/net/minecraft/entity/attribute/Attribute.mapping +++ b/mappings/net/minecraft/entity/attribute/AttributeImpl.mapping @@ -1,4 +1,4 @@ -CLASS agt net/minecraft/entity/attribute/Attribute +CLASS agt net/minecraft/entity/attribute/AttributeImpl FIELD a parent Lagq; FIELD b id Ljava/lang/String; FIELD c defaultValue D diff --git a/mappings/net/minecraft/entity/attribute/AttributeInstance.mapping b/mappings/net/minecraft/entity/attribute/AttributeInstanceImpl.mapping similarity index 89% rename from mappings/net/minecraft/entity/attribute/AttributeInstance.mapping rename to mappings/net/minecraft/entity/attribute/AttributeInstanceImpl.mapping index cc0037bd46..d2af899943 100644 --- a/mappings/net/minecraft/entity/attribute/AttributeInstance.mapping +++ b/mappings/net/minecraft/entity/attribute/AttributeInstanceImpl.mapping @@ -1,4 +1,4 @@ -CLASS agv net/minecraft/entity/attribute/AttributeInstance +CLASS agv net/minecraft/entity/attribute/AttributeInstanceImpl FIELD b attribute Lagq; FIELD f baseValue D METHOD a getAttribute ()Lagq; diff --git a/mappings/net/minecraft/entity/attribute/IAttribute.mapping b/mappings/net/minecraft/entity/attribute/IAttribute.mapping deleted file mode 100644 index a6be02a3b9..0000000000 --- a/mappings/net/minecraft/entity/attribute/IAttribute.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS agq net/minecraft/entity/attribute/IAttribute - METHOD a getId ()Ljava/lang/String; - METHOD b getDefaultValue ()D - METHOD d getParent ()Lagq; diff --git a/mappings/net/minecraft/entity/attribute/IAttributeInstance.mapping b/mappings/net/minecraft/entity/attribute/IAttributeInstance.mapping deleted file mode 100644 index bac3bcc593..0000000000 --- a/mappings/net/minecraft/entity/attribute/IAttributeInstance.mapping +++ /dev/null @@ -1,18 +0,0 @@ -CLASS agr net/minecraft/entity/attribute/IAttributeInstance - METHOD a getAttribute ()Lagq; - METHOD a setBaseValue (D)V - ARG 0 baseValue - METHOD a hasModifier (Lags;)Z - ARG 0 modifier - METHOD a getModifier (Ljava/util/UUID;)Lags; - ARG 0 uuid - METHOD b getBaseValue ()D - METHOD b addModifier (Lags;)V - ARG 0 modifier - METHOD b removeModifier (Ljava/util/UUID;)V - ARG 0 id - METHOD c getModifiers ()Ljava/util/Collection; - METHOD c removeModifier (Lags;)V - ARG 0 modifier - METHOD d clearModifiers ()V - METHOD e getValue ()D diff --git a/mappings/net/minecraft/entity/passive/IEntityOwnable.mapping b/mappings/net/minecraft/entity/passive/EntityOwnable.mapping similarity index 56% rename from mappings/net/minecraft/entity/passive/IEntityOwnable.mapping rename to mappings/net/minecraft/entity/passive/EntityOwnable.mapping index b4e6da2c50..95599dbb67 100644 --- a/mappings/net/minecraft/entity/passive/IEntityOwnable.mapping +++ b/mappings/net/minecraft/entity/passive/EntityOwnable.mapping @@ -1,3 +1,3 @@ -CLASS agj net/minecraft/entity/passive/IEntityOwnable +CLASS agj net/minecraft/entity/passive/EntityOwnable METHOD D_ getOwnerUuid ()Ljava/util/UUID; METHOD E_ getOwner ()Lafv; diff --git a/mappings/net/minecraft/entity/passive/EntityVillager.mapping b/mappings/net/minecraft/entity/passive/EntityVillager.mapping index 7d0f4c00bf..6e2d9f0d95 100644 --- a/mappings/net/minecraft/entity/passive/EntityVillager.mapping +++ b/mappings/net/minecraft/entity/passive/EntityVillager.mapping @@ -11,7 +11,7 @@ CLASS apm net/minecraft/entity/passive/EntityVillager METHOD F getLootTableId ()Lpu; METHOD I mobTick ()V METHOD N_ getCurrentCustomer ()Lapr; - METHOD Q getNameComponent ()Lix; + METHOD Q ()Lix; METHOD a onDeath (Lafe;)V ARG 0 damageSource METHOD a createChild (Lafs;)Lafs; diff --git a/mappings/net/minecraft/entity/player/EntityPlayer.mapping b/mappings/net/minecraft/entity/player/EntityPlayer.mapping index d6d2fb11b9..00e9198e8d 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayer.mapping @@ -40,8 +40,8 @@ CLASS apr net/minecraft/entity/player/EntityPlayer FIELD ce itemCooldownManager Laur; FIELD e spawnPosition Leq; FIELD f spawnForced Z - METHOD O_ getNameAsComponent ()Lix; - METHOD Q getNameComponent ()Lix; + METHOD O_ getName ()Lix; + METHOD Q ()Lix; METHOD S_ update ()V METHOD T_ stopRiding ()V METHOD X invalidate ()V diff --git a/mappings/net/minecraft/entity/player/InventoryPlayer.mapping b/mappings/net/minecraft/entity/player/InventoryPlayer.mapping index 92c1b141d3..561843f4fa 100644 --- a/mappings/net/minecraft/entity/player/InventoryPlayer.mapping +++ b/mappings/net/minecraft/entity/player/InventoryPlayer.mapping @@ -8,7 +8,7 @@ CLASS apq net/minecraft/entity/player/InventoryPlayer FIELD h changeCount I METHOD (Lapr;)V ARG 0 player - METHOD O_ getNameAsComponent ()Lix; + METHOD O_ getName ()Lix; METHOD P_ hasCustomName ()Z METHOD Q_ isInvEmpty ()Z METHOD U_ getInvSize ()I diff --git a/mappings/net/minecraft/entity/sortme/ILiving.mapping b/mappings/net/minecraft/entity/sortme/ILiving.mapping deleted file mode 100644 index 82f5067b64..0000000000 --- a/mappings/net/minecraft/entity/sortme/ILiving.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS afu net/minecraft/entity/sortme/ILiving diff --git a/mappings/net/minecraft/entity/sortme/Living.mapping b/mappings/net/minecraft/entity/sortme/Living.mapping new file mode 100644 index 0000000000..7cee8ea970 --- /dev/null +++ b/mappings/net/minecraft/entity/sortme/Living.mapping @@ -0,0 +1 @@ +CLASS afu net/minecraft/entity/sortme/Living diff --git a/mappings/net/minecraft/entity/sortme/IProjectile.mapping b/mappings/net/minecraft/entity/sortme/Projectile.mapping similarity index 67% rename from mappings/net/minecraft/entity/sortme/IProjectile.mapping rename to mappings/net/minecraft/entity/sortme/Projectile.mapping index 2d190fb203..e45a847ce3 100644 --- a/mappings/net/minecraft/entity/sortme/IProjectile.mapping +++ b/mappings/net/minecraft/entity/sortme/Projectile.mapping @@ -1,4 +1,4 @@ -CLASS aqe net/minecraft/entity/sortme/IProjectile +CLASS aqe net/minecraft/entity/sortme/Projectile METHOD c setVelocity (DDDFF)V ARG 0 dirX ARG 1 dirY diff --git a/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping b/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping index f4b2dbb523..5c6fdf1623 100644 --- a/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping @@ -3,7 +3,7 @@ CLASS aqt net/minecraft/entity/vehicle/EntityStorageMinecart FIELD c lootTableId Lpu; FIELD d lootSeed J METHOD Q_ isInvEmpty ()Z - METHOD R_ getLootTable ()Lpu; + METHOD R_ getLootTableId ()Lpu; METHOD W_ hasContainerLock ()Z METHOD X invalidate ()V METHOD a getInvStack (I)Lauv; diff --git a/mappings/net/minecraft/fluid/FluidBase.mapping b/mappings/net/minecraft/fluid/AbstractFluid.mapping similarity index 82% rename from mappings/net/minecraft/fluid/FluidBase.mapping rename to mappings/net/minecraft/fluid/AbstractFluid.mapping index f0dbfc7147..b0ac3c8c98 100644 --- a/mappings/net/minecraft/fluid/FluidBase.mapping +++ b/mappings/net/minecraft/fluid/AbstractFluid.mapping @@ -1,4 +1,4 @@ -CLASS cbk net/minecraft/fluid/FluidBase +CLASS cbk net/minecraft/fluid/AbstractFluid FIELD a defaultState Lcbl; FIELD d stateFactory Lbni; METHOD a getRenderLayer ()Lazh; diff --git a/mappings/net/minecraft/inventory/IInventory.mapping b/mappings/net/minecraft/inventory/IInventory.mapping deleted file mode 100644 index 7e2feef9e5..0000000000 --- a/mappings/net/minecraft/inventory/IInventory.mapping +++ /dev/null @@ -1,33 +0,0 @@ -CLASS aei net/minecraft/inventory/IInventory - METHOD Q_ isInvEmpty ()Z - METHOD U_ getInvSize ()I - METHOD V_ getInvWidth ()I - METHOD a getInvStack (I)Lauv; - ARG 0 slot - METHOD a takeInvStack (II)Lauv; - ARG 0 slot - ARG 1 amount - METHOD a setInvStack (ILauv;)V - ARG 0 slot - ARG 1 stack - METHOD a canPlayerUseInv (Lapr;)Z - ARG 0 player - METHOD b removeInvStack (I)Lauv; - ARG 0 slot - METHOD b setInvProperty (II)V - ARG 0 pos - ARG 1 value - METHOD b isValidInvStack (ILauv;)Z - ARG 0 slot - ARG 1 stack - METHOD b onInvOpen (Lapr;)V - ARG 0 player - METHOD c getInvProperty (I)I - ARG 0 pos - METHOD c onInvClose (Lapr;)V - ARG 0 player - METHOD f getInvMaxStackAmount ()I - METHOD g markDirty ()V - METHOD h getInvPropertyCount ()I - METHOD m clearInv ()V - METHOD n getInvHeight ()I diff --git a/mappings/net/minecraft/inventory/InventoryCrafting.mapping b/mappings/net/minecraft/inventory/InventoryCrafting.mapping index 9722a0d3b7..b8e5faf330 100644 --- a/mappings/net/minecraft/inventory/InventoryCrafting.mapping +++ b/mappings/net/minecraft/inventory/InventoryCrafting.mapping @@ -7,7 +7,7 @@ CLASS arp net/minecraft/inventory/InventoryCrafting ARG 0 container ARG 1 width ARG 2 height - METHOD O_ getNameAsComponent ()Lix; + METHOD O_ getName ()Lix; METHOD P_ hasCustomName ()Z METHOD Q_ isInvEmpty ()Z METHOD U_ getInvSize ()I diff --git a/mappings/net/minecraft/inventory/Inventory.mapping b/mappings/net/minecraft/inventory/InventoryImpl.mapping similarity index 86% rename from mappings/net/minecraft/inventory/Inventory.mapping rename to mappings/net/minecraft/inventory/InventoryImpl.mapping index 997ad1677d..070ce17deb 100644 --- a/mappings/net/minecraft/inventory/Inventory.mapping +++ b/mappings/net/minecraft/inventory/InventoryImpl.mapping @@ -1,9 +1,10 @@ -CLASS aex net/minecraft/inventory/Inventory +CLASS aex net/minecraft/inventory/InventoryImpl FIELD a name Lix; FIELD b size I FIELD c stackList Lfe; FIELD d listeners Ljava/util/List; - METHOD O_ getNameAsComponent ()Lix; + FIELD e customName Lix; + METHOD O_ getName ()Lix; METHOD P_ hasCustomName ()Z METHOD Q_ isInvEmpty ()Z METHOD U_ getInvSize ()I @@ -19,7 +20,8 @@ CLASS aex net/minecraft/inventory/Inventory ARG 0 listener METHOD a canPlayerUseInv (Lapr;)Z ARG 0 player - METHOD a setName (Lix;)V + METHOD a setCustomName (Lix;)V + ARG 0 value METHOD b removeInvStack (I)Lauv; ARG 0 slot METHOD b setInvProperty (II)V diff --git a/mappings/net/minecraft/inventory/InventoryResult.mapping b/mappings/net/minecraft/inventory/InventoryResult.mapping index 5f72d25935..992c0a1b80 100644 --- a/mappings/net/minecraft/inventory/InventoryResult.mapping +++ b/mappings/net/minecraft/inventory/InventoryResult.mapping @@ -1,6 +1,6 @@ CLASS ash net/minecraft/inventory/InventoryResult FIELD a stack Lfe; - METHOD O_ getNameAsComponent ()Lix; + METHOD O_ getName ()Lix; METHOD P_ hasCustomName ()Z METHOD Q_ isInvEmpty ()Z METHOD U_ getInvSize ()I diff --git a/mappings/net/minecraft/item/IArmorType.mapping b/mappings/net/minecraft/item/ArmorType.mapping similarity index 78% rename from mappings/net/minecraft/item/IArmorType.mapping rename to mappings/net/minecraft/item/ArmorType.mapping index 34901acb08..8c3abebdb9 100644 --- a/mappings/net/minecraft/item/IArmorType.mapping +++ b/mappings/net/minecraft/item/ArmorType.mapping @@ -1,4 +1,4 @@ -CLASS asr net/minecraft/item/IArmorType +CLASS asr net/minecraft/item/ArmorType METHOD b getEquipSound ()Lww; METHOD b getProtectionAmount (Laga;)I ARG 0 slot diff --git a/mappings/net/minecraft/item/IItemContainer.mapping b/mappings/net/minecraft/item/IItemContainer.mapping deleted file mode 100644 index aeb28ec093..0000000000 --- a/mappings/net/minecraft/item/IItemContainer.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS azs net/minecraft/item/IItemContainer - METHOD h getItem ()Lauq; diff --git a/mappings/net/minecraft/item/IToolType.mapping b/mappings/net/minecraft/item/IToolType.mapping deleted file mode 100644 index e8741f4945..0000000000 --- a/mappings/net/minecraft/item/IToolType.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS awb net/minecraft/item/IToolType diff --git a/mappings/net/minecraft/item/ItemContainer.mapping b/mappings/net/minecraft/item/ItemContainer.mapping new file mode 100644 index 0000000000..9ea4521c0b --- /dev/null +++ b/mappings/net/minecraft/item/ItemContainer.mapping @@ -0,0 +1,2 @@ +CLASS azs net/minecraft/item/ItemContainer + METHOD h getItem ()Lauq; diff --git a/mappings/net/minecraft/item/IPropertyGetter.mapping b/mappings/net/minecraft/item/ItemPropertyGetter.mapping similarity index 60% rename from mappings/net/minecraft/item/IPropertyGetter.mapping rename to mappings/net/minecraft/item/ItemPropertyGetter.mapping index fbc7253b65..f7246ec948 100644 --- a/mappings/net/minecraft/item/IPropertyGetter.mapping +++ b/mappings/net/minecraft/item/ItemPropertyGetter.mapping @@ -1,4 +1,4 @@ -CLASS auu net/minecraft/item/IPropertyGetter +CLASS auu net/minecraft/item/ItemPropertyGetter METHOD call (Lauv;Lazt;Lage;)F ARG 0 stack ARG 1 world diff --git a/mappings/net/minecraft/item/ToolType.mapping b/mappings/net/minecraft/item/ToolType.mapping new file mode 100644 index 0000000000..4fce53412d --- /dev/null +++ b/mappings/net/minecraft/item/ToolType.mapping @@ -0,0 +1 @@ +CLASS awb net/minecraft/item/ToolType diff --git a/mappings/net/minecraft/network/IPacketHandler.mapping b/mappings/net/minecraft/network/PacketHandler.mapping similarity index 73% rename from mappings/net/minecraft/network/IPacketHandler.mapping rename to mappings/net/minecraft/network/PacketHandler.mapping index b71eea70bc..aa71c58a31 100644 --- a/mappings/net/minecraft/network/IPacketHandler.mapping +++ b/mappings/net/minecraft/network/PacketHandler.mapping @@ -1,4 +1,4 @@ -CLASS jl net/minecraft/network/IPacketHandler +CLASS jl net/minecraft/network/PacketHandler METHOD a readPacket (Lin;)V ARG 0 buf METHOD a applyPacket (Liq;)V diff --git a/mappings/net/minecraft/network/handler/IPacketListener.mapping b/mappings/net/minecraft/network/handler/IPacketListener.mapping deleted file mode 100644 index 509a82db46..0000000000 --- a/mappings/net/minecraft/network/handler/IPacketListener.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS iq net/minecraft/network/handler/IPacketListener - METHOD a onConnectionLost (Lix;)V - ARG 0 reason diff --git a/mappings/net/minecraft/client/network/handler/NetworkGameHandlerClient.mapping b/mappings/net/minecraft/network/handler/NetworkGameHandlerClient.mapping similarity index 87% rename from mappings/net/minecraft/client/network/handler/NetworkGameHandlerClient.mapping rename to mappings/net/minecraft/network/handler/NetworkGameHandlerClient.mapping index 4398384136..4ce1444b7b 100644 --- a/mappings/net/minecraft/client/network/handler/NetworkGameHandlerClient.mapping +++ b/mappings/net/minecraft/network/handler/NetworkGameHandlerClient.mapping @@ -1,15 +1,4 @@ -CLASS cwx net/minecraft/client/network/handler/NetworkGameHandlerClient - FIELD a LOGGER Lorg/apache/logging/log4j/Logger; - FIELD b connection Lil; - FIELD e game Lclp; - FIELD f world Lcxa; - FIELD i advancementHandler Lcwu; - FIELD m rand Ljava/util/Random; - METHOD a getClientConnection ()Lil; - METHOD a onConnectionLost (Lix;)V - ARG 0 reason - METHOD a sendPacket (Ljl;)V - ARG 0 packet +CLASS jo net/minecraft/network/handler/NetworkGameHandlerClient METHOD a onEntitySpawn (Ljp;)V ARG 0 packet METHOD a onExperienceOrbSpawn (Ljq;)V @@ -153,6 +142,3 @@ CLASS cwx net/minecraft/client/network/handler/NetworkGameHandlerClient ARG 0 packet METHOD a onEntityPotionEffect (Lmt;)V ARG 0 packet - METHOD b validateResourcePackUrl (Ljava/lang/String;)Z - ARG 0 url - METHOD g getAdvancementHandler ()Lcwu; diff --git a/mappings/op.mapping b/mappings/net/minecraft/network/handler/NetworkLoginHandlerClient.mapping similarity index 67% rename from mappings/op.mapping rename to mappings/net/minecraft/network/handler/NetworkLoginHandlerClient.mapping index 5af8c57d23..044e3a2b67 100644 --- a/mappings/op.mapping +++ b/mappings/net/minecraft/network/handler/NetworkLoginHandlerClient.mapping @@ -1,4 +1,4 @@ -CLASS op +CLASS op net/minecraft/network/handler/NetworkLoginHandlerClient METHOD a (Lor;)V ARG 0 packet METHOD a (Los;)V diff --git a/mappings/net/minecraft/network/handler/PacketListener.mapping b/mappings/net/minecraft/network/handler/PacketListener.mapping new file mode 100644 index 0000000000..118f7f4d37 --- /dev/null +++ b/mappings/net/minecraft/network/handler/PacketListener.mapping @@ -0,0 +1,3 @@ +CLASS iq net/minecraft/network/handler/PacketListener + METHOD a onConnectionLost (Lix;)V + ARG 0 reason diff --git a/mappings/net/minecraft/recipe/IRecipe.mapping b/mappings/net/minecraft/recipe/Recipe.mapping similarity index 85% rename from mappings/net/minecraft/recipe/IRecipe.mapping rename to mappings/net/minecraft/recipe/Recipe.mapping index 0399316f75..9e18bb9153 100644 --- a/mappings/net/minecraft/recipe/IRecipe.mapping +++ b/mappings/net/minecraft/recipe/Recipe.mapping @@ -1,10 +1,12 @@ -CLASS axb net/minecraft/recipe/IRecipe +CLASS axb net/minecraft/recipe/Recipe METHOD a getSerializer ()Laxd; METHOD a fits (II)Z ARG 0 width ARG 1 height METHOD a craft (Laei;)Lauv; + ARG 0 inv METHOD a matches (Laei;Lazt;)Z + ARG 0 inv ARG 1 world METHOD b getId ()Lpu; METHOD b getRemainingStacks (Laei;)Lfe; diff --git a/mappings/net/minecraft/recipe/IRecipeSerializer.mapping b/mappings/net/minecraft/recipe/RecipeSerializer.mapping similarity index 82% rename from mappings/net/minecraft/recipe/IRecipeSerializer.mapping rename to mappings/net/minecraft/recipe/RecipeSerializer.mapping index d6fd020852..79c20faae9 100644 --- a/mappings/net/minecraft/recipe/IRecipeSerializer.mapping +++ b/mappings/net/minecraft/recipe/RecipeSerializer.mapping @@ -1,4 +1,4 @@ -CLASS axd net/minecraft/recipe/IRecipeSerializer +CLASS axd net/minecraft/recipe/RecipeSerializer METHOD a getId ()Ljava/lang/String; METHOD a write (Lin;Laxb;)V ARG 0 buf diff --git a/mappings/net/minecraft/recipe/crafting/RecipeArmorDye.mapping b/mappings/net/minecraft/recipe/crafting/RecipeArmorDye.mapping index f4f08ce5af..6b9a05a701 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeArmorDye.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeArmorDye.mapping @@ -4,5 +4,7 @@ CLASS awr net/minecraft/recipe/crafting/RecipeArmorDye ARG 0 width ARG 1 height METHOD a craft (Laei;)Lauv; + ARG 0 inv METHOD a matches (Laei;Lazt;)Z + ARG 0 inv ARG 1 world diff --git a/mappings/net/minecraft/recipe/crafting/RecipeBannerDuplicate.mapping b/mappings/net/minecraft/recipe/crafting/RecipeBannerDuplicate.mapping index b071687088..6040defda6 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeBannerDuplicate.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeBannerDuplicate.mapping @@ -4,6 +4,8 @@ CLASS aws net/minecraft/recipe/crafting/RecipeBannerDuplicate ARG 0 width ARG 1 height METHOD a craft (Laei;)Lauv; + ARG 0 inv METHOD a matches (Laei;Lazt;)Z + ARG 0 inv ARG 1 world METHOD b getRemainingStacks (Laei;)Lfe; diff --git a/mappings/net/minecraft/recipe/crafting/RecipeBookCloning.mapping b/mappings/net/minecraft/recipe/crafting/RecipeBookCloning.mapping index 8b3d375bfb..9287b5c8f3 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeBookCloning.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeBookCloning.mapping @@ -4,6 +4,8 @@ CLASS awt net/minecraft/recipe/crafting/RecipeBookCloning ARG 0 width ARG 1 height METHOD a craft (Laei;)Lauv; + ARG 0 inv METHOD a matches (Laei;Lazt;)Z + ARG 0 inv ARG 1 world METHOD b getRemainingStacks (Laei;)Lfe; diff --git a/mappings/net/minecraft/recipe/crafting/RecipeFireworkRocket.mapping b/mappings/net/minecraft/recipe/crafting/RecipeFireworkRocket.mapping index e0de7e5254..c81a82cd74 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeFireworkRocket.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeFireworkRocket.mapping @@ -4,6 +4,8 @@ CLASS awv net/minecraft/recipe/crafting/RecipeFireworkRocket ARG 0 width ARG 1 height METHOD a craft (Laei;)Lauv; + ARG 0 inv METHOD a matches (Laei;Lazt;)Z + ARG 0 inv ARG 1 world METHOD d getOutput ()Lauv; diff --git a/mappings/net/minecraft/recipe/crafting/RecipeFireworkStar.mapping b/mappings/net/minecraft/recipe/crafting/RecipeFireworkStar.mapping index 99a8724632..07282177f5 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeFireworkStar.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeFireworkStar.mapping @@ -4,6 +4,8 @@ CLASS awx net/minecraft/recipe/crafting/RecipeFireworkStar ARG 0 width ARG 1 height METHOD a craft (Laei;)Lauv; + ARG 0 inv METHOD a matches (Laei;Lazt;)Z + ARG 0 inv ARG 1 world METHOD d getOutput ()Lauv; diff --git a/mappings/net/minecraft/recipe/crafting/RecipeFireworkStarFade.mapping b/mappings/net/minecraft/recipe/crafting/RecipeFireworkStarFade.mapping index 297037f247..54ed0b5ffb 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeFireworkStarFade.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeFireworkStarFade.mapping @@ -4,5 +4,7 @@ CLASS aww net/minecraft/recipe/crafting/RecipeFireworkStarFade ARG 0 width ARG 1 height METHOD a craft (Laei;)Lauv; + ARG 0 inv METHOD a matches (Laei;Lazt;)Z + ARG 0 inv ARG 1 world diff --git a/mappings/net/minecraft/recipe/crafting/RecipeMapCloning.mapping b/mappings/net/minecraft/recipe/crafting/RecipeMapCloning.mapping index 58e53252cf..a5f82d993d 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeMapCloning.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeMapCloning.mapping @@ -4,5 +4,7 @@ CLASS awz net/minecraft/recipe/crafting/RecipeMapCloning ARG 0 width ARG 1 height METHOD a craft (Laei;)Lauv; + ARG 0 inv METHOD a matches (Laei;Lazt;)Z + ARG 0 inv ARG 1 world diff --git a/mappings/net/minecraft/recipe/crafting/RecipeMapExtend.mapping b/mappings/net/minecraft/recipe/crafting/RecipeMapExtend.mapping index 0cd137def5..4ab9915703 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeMapExtend.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeMapExtend.mapping @@ -1,6 +1,8 @@ CLASS axa net/minecraft/recipe/crafting/RecipeMapExtend METHOD a getSerializer ()Laxd; METHOD a craft (Laei;)Lauv; + ARG 0 inv METHOD a matches (Laei;Lazt;)Z + ARG 0 inv ARG 1 world METHOD c isIgnoredInRecipeBook ()Z diff --git a/mappings/net/minecraft/recipe/crafting/RecipeRepairItem.mapping b/mappings/net/minecraft/recipe/crafting/RecipeRepairItem.mapping index b64dde010a..d6896b971f 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeRepairItem.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeRepairItem.mapping @@ -4,5 +4,7 @@ CLASS axf net/minecraft/recipe/crafting/RecipeRepairItem ARG 0 width ARG 1 height METHOD a craft (Laei;)Lauv; + ARG 0 inv METHOD a matches (Laei;Lazt;)Z + ARG 0 inv ARG 1 world diff --git a/mappings/net/minecraft/recipe/crafting/RecipeShaped.mapping b/mappings/net/minecraft/recipe/crafting/RecipeShaped.mapping index 231d9fabc8..9db1ae9079 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeShaped.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeShaped.mapping @@ -21,11 +21,13 @@ CLASS axg net/minecraft/recipe/crafting/RecipeShaped ARG 0 width ARG 1 height METHOD a craft (Laei;)Lauv; + ARG 0 inv METHOD a matchesSmall (Laei;IIZ)Z ARG 1 offsetX ARG 2 offsetY ARG 3 mirrored METHOD a matches (Laei;Lazt;)Z + ARG 0 inv ARG 1 world METHOD b getId ()Lpu; METHOD b deserializePattern (Lcom/google/gson/JsonArray;)[Ljava/lang/String; diff --git a/mappings/net/minecraft/recipe/crafting/RecipeShapeless.mapping b/mappings/net/minecraft/recipe/crafting/RecipeShapeless.mapping index f8c379cd7d..701e5cc23a 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeShapeless.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeShapeless.mapping @@ -19,7 +19,9 @@ CLASS axh net/minecraft/recipe/crafting/RecipeShapeless ARG 0 width ARG 1 height METHOD a craft (Laei;)Lauv; + ARG 0 inv METHOD a matches (Laei;Lazt;)Z + ARG 0 inv ARG 1 world METHOD b getId ()Lpu; METHOD d getOutput ()Lauv; diff --git a/mappings/net/minecraft/recipe/crafting/RecipeShieldDecoration.mapping b/mappings/net/minecraft/recipe/crafting/RecipeShieldDecoration.mapping index dc056d8c7e..f985737417 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeShieldDecoration.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeShieldDecoration.mapping @@ -4,5 +4,7 @@ CLASS axi net/minecraft/recipe/crafting/RecipeShieldDecoration ARG 0 width ARG 1 height METHOD a craft (Laei;)Lauv; + ARG 0 inv METHOD a matches (Laei;Lazt;)Z + ARG 0 inv ARG 1 world diff --git a/mappings/net/minecraft/recipe/crafting/RecipeShulkerBoxColoring.mapping b/mappings/net/minecraft/recipe/crafting/RecipeShulkerBoxColoring.mapping index 6b90e86f7a..8e0989d56c 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeShulkerBoxColoring.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeShulkerBoxColoring.mapping @@ -4,5 +4,7 @@ CLASS axj net/minecraft/recipe/crafting/RecipeShulkerBoxColoring ARG 0 width ARG 1 height METHOD a craft (Laei;)Lauv; + ARG 0 inv METHOD a matches (Laei;Lazt;)Z + ARG 0 inv ARG 1 world diff --git a/mappings/net/minecraft/recipe/crafting/RecipeSuspiciousStew.mapping b/mappings/net/minecraft/recipe/crafting/RecipeSuspiciousStew.mapping index 15f286342b..410b614faa 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeSuspiciousStew.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeSuspiciousStew.mapping @@ -4,5 +4,7 @@ CLASS axl net/minecraft/recipe/crafting/RecipeSuspiciousStew ARG 0 width ARG 1 height METHOD a craft (Laei;)Lauv; + ARG 0 inv METHOD a matches (Laei;Lazt;)Z + ARG 0 inv ARG 1 world diff --git a/mappings/net/minecraft/recipe/crafting/RecipeTippedArrow.mapping b/mappings/net/minecraft/recipe/crafting/RecipeTippedArrow.mapping index b41c1b6f35..5616fdbd52 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeTippedArrow.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeTippedArrow.mapping @@ -4,5 +4,7 @@ CLASS axm net/minecraft/recipe/crafting/RecipeTippedArrow ARG 0 width ARG 1 height METHOD a craft (Laei;)Lauv; + ARG 0 inv METHOD a matches (Laei;Lazt;)Z + ARG 0 inv ARG 1 world diff --git a/mappings/net/minecraft/recipe/smelting/RecipeSmelting.mapping b/mappings/net/minecraft/recipe/smelting/RecipeSmelting.mapping index 71e9485219..71dee76b04 100644 --- a/mappings/net/minecraft/recipe/smelting/RecipeSmelting.mapping +++ b/mappings/net/minecraft/recipe/smelting/RecipeSmelting.mapping @@ -20,7 +20,9 @@ CLASS axk net/minecraft/recipe/smelting/RecipeSmelting ARG 0 width ARG 1 height METHOD a craft (Laei;)Lauv; + ARG 0 inv METHOD a matches (Laei;Lazt;)Z + ARG 0 inv ARG 1 world METHOD b getId ()Lpu; METHOD d getOutput ()Lauv; diff --git a/mappings/net/minecraft/resource/AbstractFilenameResourcePack.mapping b/mappings/net/minecraft/resource/AbstractFilenameResourcePack.mapping new file mode 100644 index 0000000000..68aa966313 --- /dev/null +++ b/mappings/net/minecraft/resource/AbstractFilenameResourcePack.mapping @@ -0,0 +1,23 @@ +CLASS uw net/minecraft/resource/AbstractFilenameResourcePack + FIELD a base Ljava/io/File; + FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + METHOD (Ljava/io/File;)V + ARG 0 base + METHOD a getName ()Ljava/lang/String; + METHOD a relativize (Ljava/io/File;Ljava/io/File;)Ljava/lang/String; + METHOD a openFilename (Ljava/lang/String;)Ljava/io/InputStream; + METHOD a open (Lva;Lpu;)Ljava/io/InputStream; + ARG 0 type + ARG 1 id + METHOD a (Lvd;)Ljava/lang/Object; + METHOD b openRoot (Ljava/lang/String;)Ljava/io/InputStream; + ARG 0 filename + METHOD b contains (Lva;Lpu;)Z + ARG 0 type + ARG 1 id + METHOD c containsFilename (Ljava/lang/String;)Z + METHOD c getFilename (Lva;Lpu;)Ljava/lang/String; + ARG 0 type + ARG 1 id + METHOD d warnNonLowercaseNamespace (Ljava/lang/String;)V + ARG 0 namespace diff --git a/mappings/net/minecraft/resource/DefaultResourcePack.mapping b/mappings/net/minecraft/resource/DefaultResourcePack.mapping new file mode 100644 index 0000000000..b258616835 --- /dev/null +++ b/mappings/net/minecraft/resource/DefaultResourcePack.mapping @@ -0,0 +1,22 @@ +CLASS vc net/minecraft/resource/DefaultResourcePack + FIELD a RESOURCE_PATH Ljava/nio/file/Path; + FIELD b RESOURCE_CLASS Ljava/lang/Class; + FIELD c namespaces Ljava/util/Set; + FIELD d LOGGER Lorg/apache/logging/log4j/Logger; + METHOD a getName ()Ljava/lang/String; + METHOD a getNamespaces (Lva;)Ljava/util/Set; + ARG 0 type + METHOD a (Lva;Ljava/lang/String;ILjava/util/function/Predicate;)Ljava/util/Collection; + ARG 0 type + METHOD a open (Lva;Lpu;)Ljava/io/InputStream; + ARG 0 type + ARG 1 id + METHOD a (Lvd;)Ljava/lang/Object; + METHOD b openRoot (Ljava/lang/String;)Ljava/io/InputStream; + ARG 0 filename + METHOD b contains (Lva;Lpu;)Z + ARG 0 type + ARG 1 id + METHOD c findInputStream (Lva;Lpu;)Ljava/io/InputStream; + ARG 0 type + ARG 1 id diff --git a/mappings/net/minecraft/resource/DirectoryResourcePack.mapping b/mappings/net/minecraft/resource/DirectoryResourcePack.mapping new file mode 100644 index 0000000000..277f7b17ef --- /dev/null +++ b/mappings/net/minecraft/resource/DirectoryResourcePack.mapping @@ -0,0 +1,12 @@ +CLASS uy net/minecraft/resource/DirectoryResourcePack + FIELD c IS_WINDOWS Z + METHOD (Ljava/io/File;)V + ARG 0 base + METHOD a openFilename (Ljava/lang/String;)Ljava/io/InputStream; + METHOD a getNamespaces (Lva;)Ljava/util/Set; + ARG 0 type + METHOD a (Lva;Ljava/lang/String;ILjava/util/function/Predicate;)Ljava/util/Collection; + ARG 0 type + METHOD c containsFilename (Ljava/lang/String;)Z + METHOD e getFile (Ljava/lang/String;)Ljava/io/File; + ARG 0 filename diff --git a/mappings/net/minecraft/resource/IResource.mapping b/mappings/net/minecraft/resource/IResource.mapping deleted file mode 100644 index 29b72897b4..0000000000 --- a/mappings/net/minecraft/resource/IResource.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS vs 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 deleted file mode 100644 index eeea057e7d..0000000000 --- a/mappings/net/minecraft/resource/IResourceManager.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS vt net/minecraft/resource/IResourceManager - METHOD a getAllNamespaces ()Ljava/util/Set; - METHOD a getResource (Lpu;)Lvs; - ARG 0 id - METHOD b getAllResources (Lpu;)Ljava/util/List; - ARG 0 id diff --git a/mappings/net/minecraft/resource/IResourcePack.mapping b/mappings/net/minecraft/resource/IResourcePack.mapping deleted file mode 100644 index 1d23859ae8..0000000000 --- a/mappings/net/minecraft/resource/IResourcePack.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS uz net/minecraft/resource/IResourcePack - METHOD a getName ()Ljava/lang/String; - METHOD a getNamespaces (Lva;)Ljava/util/Set; - ARG 0 type - METHOD a (Lva;Ljava/lang/String;ILjava/util/function/Predicate;)Ljava/util/Collection; - ARG 0 type - METHOD a open (Lva;Lpu;)Ljava/io/InputStream; - ARG 0 type - METHOD b (Lva;Lpu;)Z - ARG 0 type diff --git a/mappings/net/minecraft/resource/IReloadableResourceManager.mapping b/mappings/net/minecraft/resource/ReloadableResourceManager.mapping similarity index 62% rename from mappings/net/minecraft/resource/IReloadableResourceManager.mapping rename to mappings/net/minecraft/resource/ReloadableResourceManager.mapping index 836bd39be2..2c0da50c81 100644 --- a/mappings/net/minecraft/resource/IReloadableResourceManager.mapping +++ b/mappings/net/minecraft/resource/ReloadableResourceManager.mapping @@ -1,4 +1,4 @@ -CLASS vr net/minecraft/resource/IReloadableResourceManager +CLASS vr net/minecraft/resource/ReloadableResourceManager METHOD a reload (Ljava/util/List;)V ARG 0 list METHOD a addListener (Lvu;)V diff --git a/mappings/net/minecraft/resource/ReloadableResourceManagerImpl.mapping b/mappings/net/minecraft/resource/ReloadableResourceManagerImpl.mapping new file mode 100644 index 0000000000..58df8089ad --- /dev/null +++ b/mappings/net/minecraft/resource/ReloadableResourceManagerImpl.mapping @@ -0,0 +1,24 @@ +CLASS vv net/minecraft/resource/ReloadableResourceManagerImpl + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b namespacedMap Ljava/util/Map; + FIELD c listeners Ljava/util/List; + FIELD d namespaces Ljava/util/Set; + FIELD e type Lva; + METHOD (Lva;)V + ARG 0 type + METHOD a getAllNamespaces ()Ljava/util/Set; + METHOD a reload (Ljava/util/List;)V + ARG 0 list + METHOD a getResource (Lpu;)Lvs; + ARG 0 id + METHOD a load (Luz;)V + ARG 0 pack + METHOD a addListener (Lvu;)V + ARG 0 listener + METHOD b clear ()V + METHOD b getAllResources (Lpu;)Ljava/util/List; + ARG 0 id + METHOD b emitReloadTimed (Lvu;)Ljava/lang/String; + ARG 0 listeners + METHOD c emitReloadAll ()V + METHOD d reloadAll ()V diff --git a/mappings/net/minecraft/resource/Resource.mapping b/mappings/net/minecraft/resource/ResourceImpl.mapping similarity index 84% rename from mappings/net/minecraft/resource/Resource.mapping rename to mappings/net/minecraft/resource/ResourceImpl.mapping index e8c059ae8b..a23e896e55 100644 --- a/mappings/net/minecraft/resource/Resource.mapping +++ b/mappings/net/minecraft/resource/ResourceImpl.mapping @@ -1,4 +1,4 @@ -CLASS vw net/minecraft/resource/Resource +CLASS vw net/minecraft/resource/ResourceImpl FIELD a RESOURCE_IO_EXECUTOR Ljava/util/concurrent/Executor; FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD e inputStream Ljava/io/InputStream; diff --git a/mappings/net/minecraft/resource/ResourceManager.mapping b/mappings/net/minecraft/resource/ResourceManager.mapping index d3935a8d81..375034b4c7 100644 --- a/mappings/net/minecraft/resource/ResourceManager.mapping +++ b/mappings/net/minecraft/resource/ResourceManager.mapping @@ -1,24 +1,6 @@ -CLASS vv net/minecraft/resource/ResourceManager - FIELD a LOGGER Lorg/apache/logging/log4j/Logger; - FIELD b namespacedMap Ljava/util/Map; - FIELD c listeners Ljava/util/List; - FIELD d namespaces Ljava/util/Set; - FIELD e type Lva; - METHOD (Lva;)V - ARG 0 type +CLASS vt net/minecraft/resource/ResourceManager METHOD a getAllNamespaces ()Ljava/util/Set; - METHOD a reload (Ljava/util/List;)V - ARG 0 list METHOD a getResource (Lpu;)Lvs; ARG 0 id - METHOD a load (Luz;)V - ARG 0 pack - METHOD a addListener (Lvu;)V - ARG 0 listener - METHOD b clear ()V METHOD b getAllResources (Lpu;)Ljava/util/List; ARG 0 id - METHOD b emitReloadTimed (Lvu;)Ljava/lang/String; - ARG 0 listeners - METHOD c emitReloadAll ()V - METHOD d reloadAll ()V diff --git a/mappings/djp.mapping b/mappings/net/minecraft/resource/ResourcePack.mapping similarity index 56% rename from mappings/djp.mapping rename to mappings/net/minecraft/resource/ResourcePack.mapping index 07502fd3d4..9148394e75 100644 --- a/mappings/djp.mapping +++ b/mappings/net/minecraft/resource/ResourcePack.mapping @@ -1,4 +1,4 @@ -CLASS djp +CLASS uz net/minecraft/resource/ResourcePack METHOD a getName ()Ljava/lang/String; METHOD a getNamespaces (Lva;)Ljava/util/Set; ARG 0 type @@ -6,5 +6,10 @@ CLASS djp ARG 0 type METHOD a open (Lva;Lpu;)Ljava/io/InputStream; ARG 0 type - METHOD b (Lva;Lpu;)Z + ARG 1 id + METHOD a (Lvd;)Ljava/lang/Object; + METHOD b openRoot (Ljava/lang/String;)Ljava/io/InputStream; + ARG 0 filename + METHOD b contains (Lva;Lpu;)Z ARG 0 type + ARG 1 id diff --git a/mappings/net/minecraft/resource/ResourceReloadListener.mapping b/mappings/net/minecraft/resource/ResourceReloadListener.mapping new file mode 100644 index 0000000000..68dcad1547 --- /dev/null +++ b/mappings/net/minecraft/resource/ResourceReloadListener.mapping @@ -0,0 +1,3 @@ +CLASS vu net/minecraft/resource/ResourceReloadListener + METHOD a onResourceReload (Lvt;)V + ARG 0 manager diff --git a/mappings/net/minecraft/resource/ZipResourcePack.mapping b/mappings/net/minecraft/resource/ZipResourcePack.mapping new file mode 100644 index 0000000000..e5d2ecf006 --- /dev/null +++ b/mappings/net/minecraft/resource/ZipResourcePack.mapping @@ -0,0 +1,11 @@ +CLASS ux net/minecraft/resource/ZipResourcePack + FIELD c file Ljava/util/zip/ZipFile; + METHOD (Ljava/io/File;)V + ARG 0 base + METHOD a openFilename (Ljava/lang/String;)Ljava/io/InputStream; + METHOD a getNamespaces (Lva;)Ljava/util/Set; + ARG 0 type + METHOD a (Lva;Ljava/lang/String;ILjava/util/function/Predicate;)Ljava/util/Collection; + ARG 0 type + METHOD b getZipFile ()Ljava/util/zip/ZipFile; + METHOD c containsFilename (Ljava/lang/String;)Z diff --git a/mappings/net/minecraft/resource/metadata/IResourceMetadataReader.mapping b/mappings/net/minecraft/resource/metadata/IResourceMetadataReader.mapping deleted file mode 100644 index 74860d4e96..0000000000 --- a/mappings/net/minecraft/resource/metadata/IResourceMetadataReader.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS vd net/minecraft/resource/metadata/IResourceMetadataReader - METHOD a (Lcom/google/gson/JsonObject;)Ljava/lang/Object; - ARG 0 json diff --git a/mappings/net/minecraft/resource/metadata/ResourceMetadataReader.mapping b/mappings/net/minecraft/resource/metadata/ResourceMetadataReader.mapping new file mode 100644 index 0000000000..7a3ee2fdf1 --- /dev/null +++ b/mappings/net/minecraft/resource/metadata/ResourceMetadataReader.mapping @@ -0,0 +1,4 @@ +CLASS vd net/minecraft/resource/metadata/ResourceMetadataReader + METHOD a getKey ()Ljava/lang/String; + METHOD a (Lcom/google/gson/JsonObject;)Ljava/lang/Object; + ARG 0 json diff --git a/mappings/net/minecraft/resource/metadata/ResourceMetadataReaderPack.mapping b/mappings/net/minecraft/resource/metadata/ResourceMetadataReaderPack.mapping index 9c1e2cb32d..9e70d347f7 100644 --- a/mappings/net/minecraft/resource/metadata/ResourceMetadataReaderPack.mapping +++ b/mappings/net/minecraft/resource/metadata/ResourceMetadataReaderPack.mapping @@ -1,3 +1,4 @@ CLASS vf net/minecraft/resource/metadata/ResourceMetadataReaderPack + METHOD a getKey ()Ljava/lang/String; METHOD a (Lcom/google/gson/JsonObject;)Ljava/lang/Object; ARG 0 json diff --git a/mappings/net/minecraft/scoreboard/IScoreboardCriterion.mapping b/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping similarity index 91% rename from mappings/net/minecraft/scoreboard/IScoreboardCriterion.mapping rename to mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping index 90b8f8947e..b78383753e 100644 --- a/mappings/net/minecraft/scoreboard/IScoreboardCriterion.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping @@ -1,4 +1,4 @@ -CLASS cjn net/minecraft/scoreboard/IScoreboardCriterion +CLASS cjn net/minecraft/scoreboard/ScoreboardCriterion CLASS cjn$a Type FIELD a INTEGER Lcjn$a; FIELD b HEARTS Lcjn$a; diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping index 5ca7e99269..15275ab5a8 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping @@ -1,20 +1,10 @@ -CLASS ti net/minecraft/server/dedicated/DedicatedServer - FIELD g LOGGER_DEDICATED Lorg/apache/logging/log4j/Logger; - FIELD l rconServer Lwu; - FIELD m properties Lqk; - FIELD n eulaReader Lqc; - FIELD o generateStructures Z - FIELD p defaultGameMode Lazq; - FIELD q hasGui Z - METHOD C_ shouldBroadcastConsoleToOps ()Z - METHOD N isMonsterSpawningEnabled ()Z - METHOD S isSnooperEnabled ()Z - METHOD T isDedicated ()Z - METHOD Y isUsingNativeTransport ()Z - METHOD a addSnooperInfo (Laey;)V - ARG 0 snooper - METHOD a setDefaultGameMode (Lazq;)V - ARG 0 gameMode +CLASS qi net/minecraft/server/dedicated/DedicatedServer + METHOD A getVersion ()Ljava/lang/String; + METHOD B getCurrentPlayerCount ()I + METHOD C getMaxPlayerCount ()I + METHOD D getPlayerNames ()[Ljava/lang/String; + METHOD F isDebuggingEnabled ()Z + METHOD L getLevelName ()Ljava/lang/String; METHOD a getInteger (Ljava/lang/String;I)I ARG 0 key ARG 1 defaultValue @@ -24,32 +14,16 @@ CLASS ti 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 aA getNetworkCompressionThreshold ()I - METHOD ab areCommandBlocksEnabled ()Z - METHOD af getConfigurationManager ()Lwd; - METHOD ag isRemote ()Z - METHOD aj hasGui ()Z - METHOD ao getSpawnProtectionRadius ()I - METHOD ax getMaxWorldBorderRadius ()I - METHOD b addServerInfoToCrashReport (Lb;)Lb; - ARG 0 report - METHOD ba getConfigurationManager ()Lth; - METHOD bb createGui ()V - METHOD bd getMaxTickTime ()J - METHOD c setPlayerIdleTimeout (I)V - ARG 0 value - METHOD d setupServer ()Z + METHOD d info (Ljava/lang/String;)V + ARG 0 msg METHOD d_ saveProperties ()V METHOD e getHostname ()Ljava/lang/String; + METHOD e warn (Ljava/lang/String;)V + ARG 0 msg METHOD e_ getPropertiesFilename ()Ljava/lang/String; - METHOD f shouldGenerateStructures ()Z + METHOD f logError (Ljava/lang/String;)V + ARG 0 message METHOD f_ getPort ()I - METHOD g getDefaultGameMode ()Lazq; - METHOD h getDefaultDifficulty ()Laem; - METHOD i isHardcore ()Z - METHOD j getOpPermissionLevel ()I - METHOD k shouldBroadcastRconToOps ()Z + METHOD g log (Ljava/lang/String;)V + ARG 0 message METHOD m getMotd ()Ljava/lang/String; - METHOD v exit ()V - METHOD w isNetherAllowed ()Z diff --git a/mappings/net/minecraft/server/dedicated/IDedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/IDedicatedServer.mapping deleted file mode 100644 index 38a6222c0d..0000000000 --- a/mappings/net/minecraft/server/dedicated/IDedicatedServer.mapping +++ /dev/null @@ -1,29 +0,0 @@ -CLASS qi net/minecraft/server/dedicated/IDedicatedServer - METHOD A getVersion ()Ljava/lang/String; - METHOD B getCurrentPlayerCount ()I - METHOD C getMaxPlayerCount ()I - METHOD D getPlayerNames ()[Ljava/lang/String; - METHOD F isDebuggingEnabled ()Z - METHOD L getLevelName ()Ljava/lang/String; - METHOD a getInteger (Ljava/lang/String;I)I - ARG 0 key - ARG 1 defaultValue - METHOD a put (Ljava/lang/String;Ljava/lang/Object;)V - ARG 0 key - ARG 1 value - METHOD a getString (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; - ARG 0 key - ARG 1 defaultValue - METHOD d info (Ljava/lang/String;)V - ARG 0 msg - METHOD d_ saveProperties ()V - METHOD e getHostname ()Ljava/lang/String; - METHOD e warn (Ljava/lang/String;)V - ARG 0 msg - METHOD e_ getPropertiesFilename ()Ljava/lang/String; - METHOD f logError (Ljava/lang/String;)V - ARG 0 message - METHOD f_ getPort ()I - METHOD g log (Ljava/lang/String;)V - ARG 0 message - METHOD m getMotd ()Ljava/lang/String; diff --git a/mappings/net/minecraft/sortme/IResourceReloadListener.mapping b/mappings/net/minecraft/sortme/IResourceReloadListener.mapping deleted file mode 100644 index 3e7a73aa4c..0000000000 --- a/mappings/net/minecraft/sortme/IResourceReloadListener.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS vu net/minecraft/sortme/IResourceReloadListener - METHOD a onResourceReload (Lvt;)V - ARG 0 manager diff --git a/mappings/net/minecraft/state/IPropertyContainer.mapping b/mappings/net/minecraft/state/PropertyContainer.mapping similarity index 78% rename from mappings/net/minecraft/state/IPropertyContainer.mapping rename to mappings/net/minecraft/state/PropertyContainer.mapping index 93f15e522b..e43be6f8bd 100644 --- a/mappings/net/minecraft/state/IPropertyContainer.mapping +++ b/mappings/net/minecraft/state/PropertyContainer.mapping @@ -1,4 +1,4 @@ -CLASS bnj net/minecraft/state/IPropertyContainer +CLASS bnj net/minecraft/state/PropertyContainer FIELD b LOGGER Lorg/apache/logging/log4j/Logger; METHOD b getEntries ()Lcom/google/common/collect/ImmutableMap; METHOD c get (Lbor;)Ljava/lang/Comparable; diff --git a/mappings/net/minecraft/state/property/IProperty.mapping b/mappings/net/minecraft/state/property/Property.mapping similarity index 85% rename from mappings/net/minecraft/state/property/IProperty.mapping rename to mappings/net/minecraft/state/property/Property.mapping index 3248d830a5..15acf1c9f4 100644 --- a/mappings/net/minecraft/state/property/IProperty.mapping +++ b/mappings/net/minecraft/state/property/Property.mapping @@ -1,4 +1,4 @@ -CLASS bor net/minecraft/state/property/IProperty +CLASS bor net/minecraft/state/property/Property METHOD a getName ()Ljava/lang/String; METHOD a getValueAsString (Ljava/lang/Comparable;)Ljava/lang/String; ARG 0 value diff --git a/mappings/net/minecraft/util/CustomNameable.mapping b/mappings/net/minecraft/util/CustomNameable.mapping new file mode 100644 index 0000000000..40361ab763 --- /dev/null +++ b/mappings/net/minecraft/util/CustomNameable.mapping @@ -0,0 +1,4 @@ +CLASS aev net/minecraft/util/CustomNameable + METHOD O_ getName ()Lix; + METHOD P_ hasCustomName ()Z + METHOD Q ()Lix; diff --git a/mappings/net/minecraft/util/INameable.mapping b/mappings/net/minecraft/util/INameable.mapping deleted file mode 100644 index a25514f491..0000000000 --- a/mappings/net/minecraft/util/INameable.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS aev net/minecraft/util/INameable - METHOD O_ getNameAsComponent ()Lix; - METHOD P_ hasCustomName ()Z - METHOD Q getNameComponent ()Lix; diff --git a/mappings/net/minecraft/util/IStringSerializable.mapping b/mappings/net/minecraft/util/IStringSerializable.mapping deleted file mode 100644 index 83c2fab931..0000000000 --- a/mappings/net/minecraft/util/IStringSerializable.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS yj net/minecraft/util/IStringSerializable - METHOD m asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/util/ITickable.mapping b/mappings/net/minecraft/util/ITickable.mapping deleted file mode 100644 index 5c80b35801..0000000000 --- a/mappings/net/minecraft/util/ITickable.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS ql net/minecraft/util/ITickable - METHOD Z_ tick ()V diff --git a/mappings/net/minecraft/util/StringRepresentable.mapping b/mappings/net/minecraft/util/StringRepresentable.mapping new file mode 100644 index 0000000000..a73f40ecd2 --- /dev/null +++ b/mappings/net/minecraft/util/StringRepresentable.mapping @@ -0,0 +1,2 @@ +CLASS yj net/minecraft/util/StringRepresentable + METHOD m asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/util/Tickable.mapping b/mappings/net/minecraft/util/Tickable.mapping new file mode 100644 index 0000000000..1b41758937 --- /dev/null +++ b/mappings/net/minecraft/util/Tickable.mapping @@ -0,0 +1,2 @@ +CLASS ql net/minecraft/util/Tickable + METHOD Z_ tick ()V diff --git a/mappings/net/minecraft/util/math/BlockPointer.mapping b/mappings/net/minecraft/util/math/BlockPointerImpl.mapping similarity index 84% rename from mappings/net/minecraft/util/math/BlockPointer.mapping rename to mappings/net/minecraft/util/math/BlockPointerImpl.mapping index 4b9577d6b4..637829148c 100644 --- a/mappings/net/minecraft/util/math/BlockPointer.mapping +++ b/mappings/net/minecraft/util/math/BlockPointerImpl.mapping @@ -1,4 +1,4 @@ -CLASS es net/minecraft/util/math/BlockPointer +CLASS es net/minecraft/util/math/BlockPointerImpl FIELD a world Lazt; FIELD b pos Leq; METHOD (Lazt;Leq;)V diff --git a/mappings/net/minecraft/util/math/IBlockPointer.mapping b/mappings/net/minecraft/util/math/IBlockPointer.mapping deleted file mode 100644 index 17ae09b3ab..0000000000 --- a/mappings/net/minecraft/util/math/IBlockPointer.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS er net/minecraft/util/math/IBlockPointer - METHOD a getX ()D - METHOD b getY ()D - METHOD c getZ ()D - METHOD d getBlockPos ()Leq; - METHOD e getBlockState ()Lbnh; - METHOD g getBlockEntity ()Lbll; diff --git a/mappings/net/minecraft/util/math/IPosition.mapping b/mappings/net/minecraft/util/math/IPosition.mapping deleted file mode 100644 index 4aa4d901c1..0000000000 --- a/mappings/net/minecraft/util/math/IPosition.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS ff net/minecraft/util/math/IPosition - METHOD a getX ()D - METHOD b getY ()D - METHOD c getZ ()D diff --git a/mappings/net/minecraft/util/math/IWorldPosition.mapping b/mappings/net/minecraft/util/math/IWorldPosition.mapping deleted file mode 100644 index bacd4c523f..0000000000 --- a/mappings/net/minecraft/util/math/IWorldPosition.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS fb net/minecraft/util/math/IWorldPosition - METHOD h getWorld ()Lazt; diff --git a/mappings/net/minecraft/util/math/Position.mapping b/mappings/net/minecraft/util/math/PositionImpl.mapping similarity index 76% rename from mappings/net/minecraft/util/math/Position.mapping rename to mappings/net/minecraft/util/math/PositionImpl.mapping index 1cc763664d..df9f366386 100644 --- a/mappings/net/minecraft/util/math/Position.mapping +++ b/mappings/net/minecraft/util/math/PositionImpl.mapping @@ -1,4 +1,4 @@ -CLASS fg net/minecraft/util/math/Position +CLASS fg net/minecraft/util/math/PositionImpl FIELD a x D FIELD b y D FIELD c z D diff --git a/mappings/net/minecraft/util/math/WorldPosition.mapping b/mappings/net/minecraft/util/math/WorldPosition.mapping new file mode 100644 index 0000000000..cf28c03bd5 --- /dev/null +++ b/mappings/net/minecraft/util/math/WorldPosition.mapping @@ -0,0 +1,2 @@ +CLASS fb net/minecraft/util/math/WorldPosition + METHOD h getWorld ()Lazt; diff --git a/mappings/net/minecraft/util/snooper/ISnooperListener.mapping b/mappings/net/minecraft/util/snooper/ISnooperListener.mapping deleted file mode 100644 index 12adb9ef46..0000000000 --- a/mappings/net/minecraft/util/snooper/ISnooperListener.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS aez net/minecraft/util/snooper/ISnooperListener - METHOD a addSnooperInfo (Laey;)V - ARG 0 snooper diff --git a/mappings/net/minecraft/util/snooper/SnooperListener.mapping b/mappings/net/minecraft/util/snooper/SnooperListener.mapping new file mode 100644 index 0000000000..9b2707ab9b --- /dev/null +++ b/mappings/net/minecraft/util/snooper/SnooperListener.mapping @@ -0,0 +1,3 @@ +CLASS aez net/minecraft/util/snooper/SnooperListener + METHOD a addSnooperInfo (Laey;)V + ARG 0 snooper diff --git a/mappings/net/minecraft/village/VillagerInventory.mapping b/mappings/net/minecraft/village/VillagerInventory.mapping index 1a06f75c77..f8bb5a08d1 100644 --- a/mappings/net/minecraft/village/VillagerInventory.mapping +++ b/mappings/net/minecraft/village/VillagerInventory.mapping @@ -7,7 +7,7 @@ CLASS asb net/minecraft/village/VillagerInventory METHOD (Lapr;Layy;)V ARG 0 player ARG 1 villager - METHOD O_ getNameAsComponent ()Lix; + METHOD O_ getName ()Lix; METHOD P_ hasCustomName ()Z METHOD Q_ isInvEmpty ()Z METHOD U_ getInvSize ()I diff --git a/mappings/net/minecraft/world/IBlockView.mapping b/mappings/net/minecraft/world/BlockView.mapping similarity index 89% rename from mappings/net/minecraft/world/IBlockView.mapping rename to mappings/net/minecraft/world/BlockView.mapping index 7a00f105e1..b3a92318c9 100644 --- a/mappings/net/minecraft/world/IBlockView.mapping +++ b/mappings/net/minecraft/world/BlockView.mapping @@ -1,4 +1,4 @@ -CLASS azg net/minecraft/world/IBlockView +CLASS azg net/minecraft/world/BlockView METHOD H getMaxLightLevel ()I METHOD I getHeight ()I METHOD a getBlockState (III)Lbnh; diff --git a/mappings/net/minecraft/world/IPlayerSaveHandler.mapping b/mappings/net/minecraft/world/PlayerSaveHandler.mapping similarity index 75% rename from mappings/net/minecraft/world/IPlayerSaveHandler.mapping rename to mappings/net/minecraft/world/PlayerSaveHandler.mapping index 08e6593370..14cee0c8cf 100644 --- a/mappings/net/minecraft/world/IPlayerSaveHandler.mapping +++ b/mappings/net/minecraft/world/PlayerSaveHandler.mapping @@ -1,4 +1,4 @@ -CLASS cey net/minecraft/world/IPlayerSaveHandler +CLASS cey net/minecraft/world/PlayerSaveHandler METHOD a savePlayerData (Lapr;)V ARG 0 player METHOD b loadPlayerData (Lapr;)Lhm; diff --git a/mappings/net/minecraft/world/IWorldListener.mapping b/mappings/net/minecraft/world/WorldListener.mapping similarity index 90% rename from mappings/net/minecraft/world/IWorldListener.mapping rename to mappings/net/minecraft/world/WorldListener.mapping index 8f7e0bbfff..670e95eb36 100644 --- a/mappings/net/minecraft/world/IWorldListener.mapping +++ b/mappings/net/minecraft/world/WorldListener.mapping @@ -1,4 +1,4 @@ -CLASS azw net/minecraft/world/IWorldListener +CLASS azw net/minecraft/world/WorldListener METHOD a onGlobalWorldEvent (ILeq;I)V ARG 0 eventId ARG 1 pos @@ -33,7 +33,7 @@ CLASS azw net/minecraft/world/IWorldListener ARG 5 velocityX ARG 6 velocityY METHOD a addParticle (Lfq;ZZDDDDDD)V - METHOD b markRegionForRenderUpdate (III)V + METHOD b (III)V METHOD b onBlockBreakingProgress (ILeq;I)V ARG 0 entityId ARG 1 pos diff --git a/mappings/net/minecraft/world/IWorldSaveHandler.mapping b/mappings/net/minecraft/world/WorldSaveHandler.mapping similarity index 89% rename from mappings/net/minecraft/world/IWorldSaveHandler.mapping rename to mappings/net/minecraft/world/WorldSaveHandler.mapping index 9d382239de..1221dc3e9a 100644 --- a/mappings/net/minecraft/world/IWorldSaveHandler.mapping +++ b/mappings/net/minecraft/world/WorldSaveHandler.mapping @@ -1,4 +1,4 @@ -CLASS ces net/minecraft/world/IWorldSaveHandler +CLASS ces net/minecraft/world/WorldSaveHandler METHOD a getWorldDir ()Ljava/io/File; METHOD a createChunkSaveHandler (Lbqi;)Lbqc; ARG 0 worldProvider diff --git a/mappings/net/minecraft/world/border/IWorldBorderListener.mapping b/mappings/net/minecraft/world/border/WorldBorderListener.mapping similarity index 88% rename from mappings/net/minecraft/world/border/IWorldBorderListener.mapping rename to mappings/net/minecraft/world/border/WorldBorderListener.mapping index 55344a1c8c..fb59395ae5 100644 --- a/mappings/net/minecraft/world/border/IWorldBorderListener.mapping +++ b/mappings/net/minecraft/world/border/WorldBorderListener.mapping @@ -1,4 +1,4 @@ -CLASS boy net/minecraft/world/border/IWorldBorderListener +CLASS boy net/minecraft/world/border/WorldBorderListener METHOD a (Lbpa;D)V ARG 0 border ARG 1 size diff --git a/mappings/net/minecraft/world/chunk/IChunkView.mapping b/mappings/net/minecraft/world/chunk/ChunkView.mapping similarity index 53% rename from mappings/net/minecraft/world/chunk/IChunkView.mapping rename to mappings/net/minecraft/world/chunk/ChunkView.mapping index 5d39dc06e3..5f975cbaa0 100644 --- a/mappings/net/minecraft/world/chunk/IChunkView.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkView.mapping @@ -1,4 +1,4 @@ -CLASS bpr net/minecraft/world/chunk/IChunkView +CLASS bpr net/minecraft/world/chunk/ChunkView METHOD b get (II)Lazg; ARG 0 chunkX ARG 1 chunkZ diff --git a/mappings/net/minecraft/world/level/storage/ILevelStorage.mapping b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping similarity index 93% rename from mappings/net/minecraft/world/level/storage/ILevelStorage.mapping rename to mappings/net/minecraft/world/level/storage/LevelStorage.mapping index 18b0858741..84c3f32d32 100644 --- a/mappings/net/minecraft/world/level/storage/ILevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping @@ -1,4 +1,4 @@ -CLASS ceu net/minecraft/world/level/storage/ILevelStorage +CLASS ceu net/minecraft/world/level/storage/LevelStorage METHOD a getName ()Ljava/lang/String; METHOD a isConvertible (Ljava/lang/String;)Z ARG 0 levelName diff --git a/mappings/net/minecraft/world/loot/ILootTableProvider.mapping b/mappings/net/minecraft/world/loot/ILootTableProvider.mapping deleted file mode 100644 index d3248e908e..0000000000 --- a/mappings/net/minecraft/world/loot/ILootTableProvider.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS aew net/minecraft/world/loot/ILootTableProvider - METHOD R_ getLootTable ()Lpu; diff --git a/mappings/net/minecraft/world/loot/LootTableProvider.mapping b/mappings/net/minecraft/world/loot/LootTableProvider.mapping new file mode 100644 index 0000000000..6ec28944ee --- /dev/null +++ b/mappings/net/minecraft/world/loot/LootTableProvider.mapping @@ -0,0 +1,2 @@ +CLASS aew net/minecraft/world/loot/LootTableProvider + METHOD R_ getLootTableId ()Lpu; diff --git a/mappings/net/minecraft/world/loot/ILootTableRange.mapping b/mappings/net/minecraft/world/loot/LootTableRange.mapping similarity index 73% rename from mappings/net/minecraft/world/loot/ILootTableRange.mapping rename to mappings/net/minecraft/world/loot/LootTableRange.mapping index 55acc5a66f..67540b8c73 100644 --- a/mappings/net/minecraft/world/loot/ILootTableRange.mapping +++ b/mappings/net/minecraft/world/loot/LootTableRange.mapping @@ -1,4 +1,4 @@ -CLASS cfl net/minecraft/world/loot/ILootTableRange +CLASS cfl net/minecraft/world/loot/LootTableRange FIELD a CONSTANT Lpu; FIELD b UNIFORM Lpu; FIELD c BINOMIAL Lpu; diff --git a/mappings/uw.mapping b/mappings/uw.mapping deleted file mode 100644 index f9fd84202d..0000000000 --- a/mappings/uw.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS uw - METHOD a getName ()Ljava/lang/String; - METHOD a open (Lva;Lpu;)Ljava/io/InputStream; - ARG 0 type - METHOD b (Lva;Lpu;)Z - ARG 0 type diff --git a/mappings/ux.mapping b/mappings/ux.mapping deleted file mode 100644 index fdd62d5071..0000000000 --- a/mappings/ux.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS ux - METHOD a getNamespaces (Lva;)Ljava/util/Set; - ARG 0 type - METHOD a (Lva;Ljava/lang/String;ILjava/util/function/Predicate;)Ljava/util/Collection; - ARG 0 type diff --git a/mappings/uy.mapping b/mappings/uy.mapping deleted file mode 100644 index ab68dcb8bc..0000000000 --- a/mappings/uy.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS uy - METHOD a getNamespaces (Lva;)Ljava/util/Set; - ARG 0 type - METHOD a (Lva;Ljava/lang/String;ILjava/util/function/Predicate;)Ljava/util/Collection; - ARG 0 type diff --git a/mappings/vc.mapping b/mappings/vc.mapping deleted file mode 100644 index eb01df6671..0000000000 --- a/mappings/vc.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS vc - METHOD a getName ()Ljava/lang/String; - METHOD a getNamespaces (Lva;)Ljava/util/Set; - ARG 0 type - METHOD a (Lva;Ljava/lang/String;ILjava/util/function/Predicate;)Ljava/util/Collection; - ARG 0 type - METHOD a open (Lva;Lpu;)Ljava/io/InputStream; - ARG 0 type - METHOD b (Lva;Lpu;)Z - ARG 0 type