From 0a40ad452b5f4a96b415a11032ec5c46aa01ce87 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Thu, 15 Sep 2016 12:15:02 +0200 Subject: [PATCH] sound, entity, item work --- .../property/BlockPropertyBoolean.mapping | 4 +- .../block/property/BlockPropertyEnum.mapping | 4 +- .../property/BlockPropertyInteger.mapping | 4 +- .../block/state/IBlockProperty.mapping | 2 + .../net/minecraft/client/GameSettings.mapping | 2 + .../net/minecraft/client/Minecraft.mapping | 7 +- .../client/audio/MusicTracker.mapping | 20 +++-- .../client/audio/SoundAccessor.mapping | 3 + .../minecraft/client/audio/SoundEntry.mapping | 8 +- .../client/audio/SoundLoader.mapping | 3 + .../client/audio/SoundManager.mapping | 18 +++++ .../client/audio/SoundRegistry.mapping | 3 + .../audio/sound/impl/SoundPositioned.mapping | 73 +++++++++++-------- .../sound/impl/SoundPositionedBase.mapping | 32 ++++++++ .../gui/ingame/GuiCreativeInventory.mapping | 2 + .../pack/MinecraftResourcePack.mapping | 2 + .../net/minecraft/container/slot/Slot.mapping | 2 + .../slot/impl/SlotCraftingResult.mapping | 2 + .../slot/impl/SlotFurnaceOutput.mapping | 2 + .../entity/passive/EntityHorseBase.mapping | 2 + .../entity/passive/impl/EntityHorse.mapping | 2 + .../entity/projectile/EntityArrowBase.mapping | 2 + .../projectile/impl/EntityArrow.mapping | 1 + .../entity/unsorted/EntityCave.mapping | 1 - .../entity/unsorted/EntityCaveMob.mapping | 1 + .../entity/vehicle/EntityMinecartBase.mapping | 3 + .../vehicle/EntityStorageMinecart.mapping | 2 + .../vehicle/impl/EntityChestMinecart.mapping | 2 + .../impl/EntityFurnaceMinecart.mapping | 2 + .../vehicle/impl/EntityHopperMinecart.mapping | 2 + .../vehicle/impl/EntityTNTMinecart.mapping | 8 ++ .../inventory/IInventoryListener.mapping | 3 + .../net/minecraft/inventory/Inventory.mapping | 5 ++ .../net/minecraft/item/impl/ItemArrow.mapping | 4 + .../item/impl/ItemArrowSpectral.mapping | 4 + .../item/impl/ItemArrowTipped.mapping | 4 + ...are.mapping => ItemFireworkCharge.mapping} | 2 +- .../minecraft/item/map/MapContainer.mapping | 9 +++ .../net/minecraft/item/tool/ItemAxe.mapping | 5 ++ .../net/minecraft/potion/PotionHelper.mapping | 3 + .../net/minecraft/sortme/MapSomething.mapping | 4 - mappings/net/minecraft/util/Pair.mapping | 8 ++ .../{sortme => util}/Session.mapping | 5 +- mappings/net/minecraft/util/TagHelper.mapping | 27 +++++-- .../{sortme => world}/Difficulty.mapping | 2 +- .../WorldListenerServer.mapping | 2 +- mappings/none/acq.mapping | 2 + mappings/none/axp.mapping | 5 ++ mappings/none/baj.mapping | 5 ++ mappings/none/bdb.mapping | 5 ++ .../bpa.mapping} | 2 +- mappings/none/cac.mapping | 47 ------------ mappings/none/wh.mapping | 5 ++ 53 files changed, 272 insertions(+), 107 deletions(-) create mode 100644 mappings/net/minecraft/client/audio/sound/impl/SoundPositionedBase.mapping delete mode 100644 mappings/net/minecraft/entity/unsorted/EntityCave.mapping create mode 100644 mappings/net/minecraft/entity/unsorted/EntityCaveMob.mapping create mode 100644 mappings/net/minecraft/inventory/IInventoryListener.mapping rename mappings/net/minecraft/item/impl/{ItemFireworkChare.mapping => ItemFireworkCharge.mapping} (69%) create mode 100644 mappings/net/minecraft/item/map/MapContainer.mapping delete mode 100644 mappings/net/minecraft/sortme/MapSomething.mapping create mode 100644 mappings/net/minecraft/util/Pair.mapping rename mappings/net/minecraft/{sortme => util}/Session.mapping (83%) rename mappings/net/minecraft/{sortme => world}/Difficulty.mapping (89%) rename mappings/net/minecraft/{sortme => world}/WorldListenerServer.mapping (87%) create mode 100644 mappings/none/axp.mapping create mode 100644 mappings/none/baj.mapping create mode 100644 mappings/none/bdb.mapping rename mappings/{net/minecraft/sortme/ClientWorldListener.mapping => none/bpa.mapping} (93%) delete mode 100644 mappings/none/cac.mapping create mode 100644 mappings/none/wh.mapping diff --git a/mappings/net/minecraft/block/property/BlockPropertyBoolean.mapping b/mappings/net/minecraft/block/property/BlockPropertyBoolean.mapping index 32bbc64e5d..6f0f694572 100644 --- a/mappings/net/minecraft/block/property/BlockPropertyBoolean.mapping +++ b/mappings/net/minecraft/block/property/BlockPropertyBoolean.mapping @@ -2,7 +2,9 @@ CLASS none/asx net/minecraft/block/property/BlockPropertyBoolean FIELD a values Lcom/google/common/collect/ImmutableSet; METHOD (Ljava/lang/String;)V ARG 0 name - METHOD a getName (Ljava/lang/Boolean;)Ljava/lang/String; + METHOD a getValueAsString (Ljava/lang/Boolean;)Ljava/lang/String; + ARG 0 value + METHOD a getValueAsString (Ljava/lang/Comparable;)Ljava/lang/String; ARG 0 value METHOD a create (Ljava/lang/String;)Lnone/asx; ARG 0 name diff --git a/mappings/net/minecraft/block/property/BlockPropertyEnum.mapping b/mappings/net/minecraft/block/property/BlockPropertyEnum.mapping index 6c6355a2ff..3e7f4d4206 100644 --- a/mappings/net/minecraft/block/property/BlockPropertyEnum.mapping +++ b/mappings/net/minecraft/block/property/BlockPropertyEnum.mapping @@ -4,7 +4,9 @@ CLASS none/asz net/minecraft/block/property/BlockPropertyEnum METHOD (Ljava/lang/String;Ljava/lang/Class;Ljava/util/Collection;)V ARG 1 valueClass ARG 2 validValues - METHOD a getName (Ljava/lang/Enum;)Ljava/lang/String; + METHOD a getValueAsString (Ljava/lang/Comparable;)Ljava/lang/String; + ARG 0 value + METHOD a getValueAsString (Ljava/lang/Enum;)Ljava/lang/String; ARG 0 value METHOD a create (Ljava/lang/String;Ljava/lang/Class;)Lnone/asz; ARG 0 name diff --git a/mappings/net/minecraft/block/property/BlockPropertyInteger.mapping b/mappings/net/minecraft/block/property/BlockPropertyInteger.mapping index 00f7c24e3f..a399fa509b 100644 --- a/mappings/net/minecraft/block/property/BlockPropertyInteger.mapping +++ b/mappings/net/minecraft/block/property/BlockPropertyInteger.mapping @@ -4,7 +4,9 @@ CLASS none/ata net/minecraft/block/property/BlockPropertyInteger ARG 0 name ARG 1 min ARG 2 max - METHOD a getName (Ljava/lang/Integer;)Ljava/lang/String; + METHOD a getValueAsString (Ljava/lang/Comparable;)Ljava/lang/String; + ARG 0 value + METHOD a getValueAsString (Ljava/lang/Integer;)Ljava/lang/String; ARG 0 value METHOD a create (Ljava/lang/String;II)Lnone/ata; ARG 0 name diff --git a/mappings/net/minecraft/block/state/IBlockProperty.mapping b/mappings/net/minecraft/block/state/IBlockProperty.mapping index dd5b7e3bf8..76232ace98 100644 --- a/mappings/net/minecraft/block/state/IBlockProperty.mapping +++ b/mappings/net/minecraft/block/state/IBlockProperty.mapping @@ -1,5 +1,7 @@ CLASS none/atb net/minecraft/block/state/IBlockProperty METHOD a getName ()Ljava/lang/String; + METHOD a getValueAsString (Ljava/lang/Comparable;)Ljava/lang/String; + ARG 0 value METHOD b getValueClass ()Ljava/lang/Class; METHOD b getValue (Ljava/lang/String;)Lcom/google/common/base/Optional; ARG 0 name diff --git a/mappings/net/minecraft/client/GameSettings.mapping b/mappings/net/minecraft/client/GameSettings.mapping index 20406aca3e..de33d577b7 100644 --- a/mappings/net/minecraft/client/GameSettings.mapping +++ b/mappings/net/minecraft/client/GameSettings.mapping @@ -81,6 +81,7 @@ CLASS none/bds net/minecraft/client/GameSettings FIELD a COLON_SPLITTER Lcom/google/common/base/Splitter; FIELD aM GRAPHICS_SETTINGS [Ljava/lang/String; FIELD aN ATTACK_INDICATOR_SETTINGS [Ljava/lang/String; + FIELD aO enabledPlayerModelParts Ljava/util/Set; FIELD aP soundVolumeLevels Ljava/util/Map; FIELD aQ optionsFile Ljava/io/File; FIELD aa keySwapHands Lnone/bdn; @@ -98,6 +99,7 @@ CLASS none/bds net/minecraft/client/GameSettings FIELD am keySpectatorOutlines Lnone/bdn; FIELD an keysHotbar [Lnone/bdn; FIELD ao keysAll [Lnone/bdn; + FIELD ap mc Lnone/bdq; FIELD aq difficulty Lnone/qy; FIELD at debugEnabled Z FIELD au debugPieEnabled Z diff --git a/mappings/net/minecraft/client/Minecraft.mapping b/mappings/net/minecraft/client/Minecraft.mapping index 44d28fb757..1dd3cb9720 100644 --- a/mappings/net/minecraft/client/Minecraft.mapping +++ b/mappings/net/minecraft/client/Minecraft.mapping @@ -4,6 +4,7 @@ CLASS none/bdq net/minecraft/client/Minecraft FIELD J LOGGER Lorg/apache/logging/log4j/Logger; FIELD K RESOURCE_LOGO Lnone/kp; FIELD L DISPLAY_MODES Ljava/util/List; + FIELD O sessionPropertyMap Lcom/mojang/authlib/properties/PropertyMap; FIELD P currentServerEntry Lnone/bmj; FIELD Q textureManager Lnone/bxe; FIELD R instance Lnone/bdq; @@ -12,6 +13,7 @@ CLASS none/bdq net/minecraft/client/Minecraft FIELD Z snooper Lnone/rk; FIELD aB defaultResourcePacks Ljava/util/List; FIELD aC mcResourcePack Lnone/bxt; + FIELD aD resourcePackDownloader Lnone/byh; FIELD aE languageManager Lnone/byn; FIELD aF blockColorMap Lnone/bdz; FIELD aG itemColorMap Lnone/bec; @@ -31,7 +33,7 @@ CLASS none/bdq net/minecraft/client/Minecraft FIELD al gameVersion Ljava/lang/String; FIELD an netProxy Ljava/net/Proxy; FIELD ao worldStorage Lnone/baw; - FIELD ap fps I + FIELD ap currentFps I FIELD ar autoConnectServerIp Ljava/lang/String; FIELD as autoConnectServerPort I FIELD au is64Bit Z @@ -58,9 +60,11 @@ CLASS none/bdq net/minecraft/client/Minecraft METHOD I getCurrentTimeMillis ()J METHOD J isFullscreen ()Z METHOD K getSession ()Lnone/bdx; + METHOD L getSessionProperties ()Lcom/mojang/authlib/properties/PropertyMap; METHOD M getNetworkProxy ()Ljava/net/Proxy; METHOD N getTextureManager ()Lnone/bxe; METHOD O getResourceManager ()Lnone/byc; + METHOD P getResourcePackDownloader ()Lnone/byh; METHOD Q getLanguageManager ()Lnone/byn; METHOD R getSpriteAtlas ()Lnone/bxc; METHOD S is64Bit ()Z @@ -96,6 +100,7 @@ CLASS none/bdq net/minecraft/client/Minecraft METHOD ab getBlockRenderManager ()Lnone/bpo; METHOD ac getEntityRenderManager ()Lnone/btc; METHOD ad getItemRenderer ()Lnone/btq; + METHOD af getCurrentFps ()I METHOD ai getMigrationHandler ()Lnone/pf; METHOD ak getBlockColorMap ()Lnone/bdz; METHOD am hasReducedDebugInfo ()Z diff --git a/mappings/net/minecraft/client/audio/MusicTracker.mapping b/mappings/net/minecraft/client/audio/MusicTracker.mapping index fcedd0e5aa..cd38f6cd23 100644 --- a/mappings/net/minecraft/client/audio/MusicTracker.mapping +++ b/mappings/net/minecraft/client/audio/MusicTracker.mapping @@ -7,12 +7,22 @@ CLASS none/cat net/minecraft/client/audio/MusicTracker FIELD e NETHER Lnone/cat$a; FIELD f DRAGON Lnone/cat$a; FIELD g END Lnone/cat$a; - FIELD h SOUND Lnone/nk; - FIELD i MIN_DELAY I - FIELD j MAX_DELAY I - FIELD a RAND Ljava/util/Random; - FIELD b MC Lnone/bdq; + FIELD h sound Lnone/nk; + FIELD i minDelay I + FIELD j maxDelay I + METHOD (Ljava/lang/String;ILnone/nk;II)V + ARG 0 sound + ARG 1 minDelay + ARG 2 maxDelay + METHOD a getSound ()Lnone/nk; + METHOD b getMinDelay ()I + METHOD c getMaxDelay ()I + FIELD a rand Ljava/util/Random; + FIELD b mc Lnone/bdq; + FIELD c current Lnone/cag; FIELD d timeUntilNextSong I METHOD (Lnone/bdq;)V ARG 0 minecraft METHOD D_ update ()V + METHOD a play (Lnone/cat$a;)V + ARG 0 type diff --git a/mappings/net/minecraft/client/audio/SoundAccessor.mapping b/mappings/net/minecraft/client/audio/SoundAccessor.mapping index 8971e19664..1e26324749 100644 --- a/mappings/net/minecraft/client/audio/SoundAccessor.mapping +++ b/mappings/net/minecraft/client/audio/SoundAccessor.mapping @@ -1,4 +1,7 @@ CLASS none/cay net/minecraft/client/audio/SoundAccessor + FIELD b rand Ljava/util/Random; + FIELD d subtitle Lnone/fa; METHOD a getCopy ()Lnone/cad; + METHOD c getSubtitle ()Lnone/fa; METHOD e getWeight ()I METHOD i getCopy ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/client/audio/SoundEntry.mapping b/mappings/net/minecraft/client/audio/SoundEntry.mapping index 2229af4832..a62d750ec8 100644 --- a/mappings/net/minecraft/client/audio/SoundEntry.mapping +++ b/mappings/net/minecraft/client/audio/SoundEntry.mapping @@ -1,10 +1,10 @@ CLASS none/cae net/minecraft/client/audio/SoundEntry - FIELD a SOUNDS Ljava/util/List; - FIELD b REPLACEABLE Z - FIELD c SUBTITLE Ljava/lang/String; + FIELD a sounds Ljava/util/List; + FIELD b replaceable Z + FIELD c subtitle Ljava/lang/String; METHOD (Ljava/util/List;ZLjava/lang/String;)V ARG 0 sounds - ARG 1 isReplaceable + ARG 1 replaceable ARG 2 subtitle METHOD a getSounds ()Ljava/util/List; METHOD b isReplaceable ()Z diff --git a/mappings/net/minecraft/client/audio/SoundLoader.mapping b/mappings/net/minecraft/client/audio/SoundLoader.mapping index 6c4334f74e..62b28b0227 100644 --- a/mappings/net/minecraft/client/audio/SoundLoader.mapping +++ b/mappings/net/minecraft/client/audio/SoundLoader.mapping @@ -22,3 +22,6 @@ CLASS none/caw net/minecraft/client/audio/SoundLoader ARG 0 sound METHOD a getSoundAccessor (Lnone/kp;)Lnone/cay; ARG 0 id + METHOD a updateSoundVolume (Lnone/nm;F)V + ARG 0 category + ARG 1 volume diff --git a/mappings/net/minecraft/client/audio/SoundManager.mapping b/mappings/net/minecraft/client/audio/SoundManager.mapping index d05bef5c65..86d9371f5b 100644 --- a/mappings/net/minecraft/client/audio/SoundManager.mapping +++ b/mappings/net/minecraft/client/audio/SoundManager.mapping @@ -1,5 +1,23 @@ CLASS none/cau net/minecraft/client/audio/SoundManager + CLASS none/cau$a SoundSystemMinecraft + FIELD a MARKER Lorg/apache/logging/log4j/Marker; FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + FIELD d loader Lnone/caw; + FIELD e settings Lnone/bds; + FIELD f system Lnone/cau$a; + METHOD (Lnone/caw;Lnone/bds;)V + ARG 0 loader + ARG 1 settings METHOD a reloadSounds ()V + METHOD a getSoundVolume (Lnone/nm;)F + ARG 0 category + METHOD a updateSoundVolume (Lnone/nm;F)V + ARG 0 category + ARG 1 value METHOD c play (Lnone/cag;)V ARG 0 sound + METHOD d update ()V + METHOD d getAdjustedPitch (Lnone/cag;)F + ARG 0 sound + METHOD e getAdjustedVolume (Lnone/cag;)F + ARG 0 sound diff --git a/mappings/net/minecraft/client/audio/SoundRegistry.mapping b/mappings/net/minecraft/client/audio/SoundRegistry.mapping index e7b20db265..befd02dd22 100644 --- a/mappings/net/minecraft/client/audio/SoundRegistry.mapping +++ b/mappings/net/minecraft/client/audio/SoundRegistry.mapping @@ -1,3 +1,6 @@ CLASS none/cax net/minecraft/client/audio/SoundRegistry + FIELD a accessors Ljava/util/Map; METHOD a clearRegistry ()V + METHOD a registerAccessor (Lnone/cay;)V + ARG 0 accessor METHOD b createMap ()Ljava/util/Map; diff --git a/mappings/net/minecraft/client/audio/sound/impl/SoundPositioned.mapping b/mappings/net/minecraft/client/audio/sound/impl/SoundPositioned.mapping index ac611fc1c1..edcfb0d2ab 100644 --- a/mappings/net/minecraft/client/audio/sound/impl/SoundPositioned.mapping +++ b/mappings/net/minecraft/client/audio/sound/impl/SoundPositioned.mapping @@ -1,32 +1,47 @@ -CLASS none/bzw net/minecraft/client/audio/sound/impl/SoundPositioned - FIELD a sound Lnone/cad; - FIELD b category Lnone/nm; - FIELD c id Lnone/kp; - FIELD d volume F - FIELD e pitch F - FIELD f posX F - FIELD g posY F - FIELD h posZ F - FIELD i repeat Z - FIELD j repeatDelay I - FIELD k attenuationType Lnone/cag$a; - FIELD l accessor Lnone/cay; - METHOD (Lnone/kp;Lnone/nm;)V - ARG 0 soundId +CLASS none/cac net/minecraft/client/audio/sound/impl/SoundPositioned + METHOD (Lnone/kp;Lnone/nm;FFZILnone/cag$a;FFF)V + ARG 0 id ARG 1 category - METHOD (Lnone/nk;Lnone/nm;)V + ARG 2 volume + ARG 3 pitch + ARG 4 repeat + ARG 5 repeatDelay + ARG 6 attenuationType + ARG 7 x + ARG 8 y + ARG 9 z + METHOD (Lnone/nk;Lnone/nm;FFFFF)V ARG 0 sound ARG 1 category - METHOD a id ()Lnone/kp; - METHOD a getAccess (Lnone/caw;)Lnone/cay; - ARG 0 loader - METHOD b sound ()Lnone/cad; - METHOD c getCategory ()Lnone/nm; - 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 ()Lnone/cag$a; + ARG 2 volume + ARG 3 pitch + ARG 4 x + ARG 5 y + ARG 6 z + METHOD (Lnone/nk;Lnone/nm;FFLnone/cn;)V + ARG 0 sound + ARG 1 category + ARG 2 volume + ARG 3 pitch + ARG 4 pos + METHOD (Lnone/nk;Lnone/nm;FFZILnone/cag$a;FFF)V + ARG 0 sound + ARG 1 category + ARG 2 volume + ARG 3 pitch + ARG 4 repeat + ARG 5 repeatDelay + ARG 6 attenuationType + ARG 7 x + ARG 8 y + ARG 9 z + METHOD a create (Lnone/nk;)Lnone/cac; + ARG 0 sound + METHOD a create (Lnone/nk;F)Lnone/cac; + ARG 0 sound + ARG 1 pitch + METHOD a create (Lnone/nk;FFF)Lnone/cac; + ARG 0 sound + ARG 1 x + ARG 2 y + ARG 3 z diff --git a/mappings/net/minecraft/client/audio/sound/impl/SoundPositionedBase.mapping b/mappings/net/minecraft/client/audio/sound/impl/SoundPositionedBase.mapping new file mode 100644 index 0000000000..5dd0e92156 --- /dev/null +++ b/mappings/net/minecraft/client/audio/sound/impl/SoundPositionedBase.mapping @@ -0,0 +1,32 @@ +CLASS none/bzw net/minecraft/client/audio/sound/impl/SoundPositionedBase + FIELD a sound Lnone/cad; + FIELD b category Lnone/nm; + FIELD c id Lnone/kp; + 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 Lnone/cag$a; + FIELD l accessor Lnone/cay; + METHOD (Lnone/kp;Lnone/nm;)V + ARG 0 soundId + ARG 1 category + METHOD (Lnone/nk;Lnone/nm;)V + ARG 0 sound + ARG 1 category + METHOD a id ()Lnone/kp; + METHOD a getAccess (Lnone/caw;)Lnone/cay; + ARG 0 loader + METHOD b sound ()Lnone/cad; + METHOD c getCategory ()Lnone/nm; + 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 ()Lnone/cag$a; diff --git a/mappings/net/minecraft/client/gui/ingame/GuiCreativeInventory.mapping b/mappings/net/minecraft/client/gui/ingame/GuiCreativeInventory.mapping index 0977d37f16..2d495ab4ed 100644 --- a/mappings/net/minecraft/client/gui/ingame/GuiCreativeInventory.mapping +++ b/mappings/net/minecraft/client/gui/ingame/GuiCreativeInventory.mapping @@ -11,6 +11,8 @@ CLASS none/bhn net/minecraft/client/gui/ingame/GuiCreativeInventory CLASS none/bhn$b CreativeSlot FIELD b slot Lnone/acu; METHOD a getMaxStackAmount ()I + METHOD a takeStack (I)Lnone/aer; + ARG 0 amount METHOD a (Lnone/aal;)Z ARG 0 player METHOD a canInsert (Lnone/aer;)Z diff --git a/mappings/net/minecraft/client/resource/pack/MinecraftResourcePack.mapping b/mappings/net/minecraft/client/resource/pack/MinecraftResourcePack.mapping index 2d91fdaaa7..4150a1471f 100644 --- a/mappings/net/minecraft/client/resource/pack/MinecraftResourcePack.mapping +++ b/mappings/net/minecraft/client/resource/pack/MinecraftResourcePack.mapping @@ -7,5 +7,7 @@ CLASS none/bxt net/minecraft/client/resource/pack/MinecraftResourcePack METHOD b canHandle (Lnone/kp;)Z ARG 0 id METHOD c getProvidedAssets ()Ljava/util/Set; + METHOD c getInputStream (Lnone/kp;)Ljava/io/InputStream; + ARG 0 id METHOD d getAssetInputStream (Lnone/kp;)Ljava/io/InputStream; ARG 0 id diff --git a/mappings/net/minecraft/container/slot/Slot.mapping b/mappings/net/minecraft/container/slot/Slot.mapping index bedf1c1f98..7aaab3719f 100644 --- a/mappings/net/minecraft/container/slot/Slot.mapping +++ b/mappings/net/minecraft/container/slot/Slot.mapping @@ -6,6 +6,8 @@ CLASS none/acu net/minecraft/container/slot/Slot ARG 0 inventory ARG 1 invSlot METHOD a getMaxStackAmount ()I + METHOD a takeStack (I)Lnone/aer; + ARG 0 amount METHOD a (Lnone/aal;)Z ARG 0 player METHOD a canInsert (Lnone/aer;)Z diff --git a/mappings/net/minecraft/container/slot/impl/SlotCraftingResult.mapping b/mappings/net/minecraft/container/slot/impl/SlotCraftingResult.mapping index bb2ad9181a..3904f49756 100644 --- a/mappings/net/minecraft/container/slot/impl/SlotCraftingResult.mapping +++ b/mappings/net/minecraft/container/slot/impl/SlotCraftingResult.mapping @@ -8,5 +8,7 @@ CLASS none/act net/minecraft/container/slot/impl/SlotCraftingResult ARG 3 invSlot ARG 4 x ARG 5 y + METHOD a takeStack (I)Lnone/aer; + ARG 0 amount METHOD a canInsert (Lnone/aer;)Z ARG 0 stack diff --git a/mappings/net/minecraft/container/slot/impl/SlotFurnaceOutput.mapping b/mappings/net/minecraft/container/slot/impl/SlotFurnaceOutput.mapping index 5c821d4d9b..a290989110 100644 --- a/mappings/net/minecraft/container/slot/impl/SlotFurnaceOutput.mapping +++ b/mappings/net/minecraft/container/slot/impl/SlotFurnaceOutput.mapping @@ -6,5 +6,7 @@ CLASS none/acj net/minecraft/container/slot/impl/SlotFurnaceOutput ARG 2 invSlot ARG 3 x ARG 4 y + METHOD a takeStack (I)Lnone/aer; + ARG 0 amount METHOD a canInsert (Lnone/aer;)Z ARG 0 stack diff --git a/mappings/net/minecraft/entity/passive/EntityHorseBase.mapping b/mappings/net/minecraft/entity/passive/EntityHorseBase.mapping index 6db6d616e8..c470c79a0c 100644 --- a/mappings/net/minecraft/entity/passive/EntityHorseBase.mapping +++ b/mappings/net/minecraft/entity/passive/EntityHorseBase.mapping @@ -5,6 +5,8 @@ CLASS none/xc net/minecraft/entity/passive/EntityHorseBase METHOD G getSoundAmbient ()Lnone/nk; METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag + METHOD a onInvChange (Lnone/qu;)V + ARG 0 inventory METHOD a damage (Lnone/rq;F)Z ARG 0 source ARG 1 damage diff --git a/mappings/net/minecraft/entity/passive/impl/EntityHorse.mapping b/mappings/net/minecraft/entity/passive/impl/EntityHorse.mapping index ea1fd84d02..f52a43fbf0 100644 --- a/mappings/net/minecraft/entity/passive/impl/EntityHorse.mapping +++ b/mappings/net/minecraft/entity/passive/impl/EntityHorse.mapping @@ -7,6 +7,8 @@ CLASS none/xe net/minecraft/entity/passive/impl/EntityHorse ARG 1 playerHand METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag + METHOD a onInvChange (Lnone/qu;)V + ARG 0 inventory METHOD a createChild (Lnone/sc;)Lnone/sc; ARG 0 other METHOD b serializeCustomData (Lnone/dt;)V diff --git a/mappings/net/minecraft/entity/projectile/EntityArrowBase.mapping b/mappings/net/minecraft/entity/projectile/EntityArrowBase.mapping index b6f9f9c01e..d65cfbff12 100644 --- a/mappings/net/minecraft/entity/projectile/EntityArrowBase.mapping +++ b/mappings/net/minecraft/entity/projectile/EntityArrowBase.mapping @@ -13,6 +13,7 @@ CLASS none/aao net/minecraft/entity/projectile/EntityArrowBase ARG 0 hit METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag + METHOD a registerTagUpgradersFor (Lnone/pf;Ljava/lang/String;)V METHOD a onHit (Lnone/so;)V ARG 0 entity METHOD a setCritical (Z)V @@ -20,6 +21,7 @@ CLASS none/aao net/minecraft/entity/projectile/EntityArrowBase METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag METHOD b registerTagUpgraders (Lnone/pf;)V + ARG 0 handler METHOD i initDataTracker ()V METHOD j asItemStack ()Lnone/aer; METHOD l isCritical ()Z diff --git a/mappings/net/minecraft/entity/projectile/impl/EntityArrow.mapping b/mappings/net/minecraft/entity/projectile/impl/EntityArrow.mapping index 3d22f0bb75..b72cb45ddf 100644 --- a/mappings/net/minecraft/entity/projectile/impl/EntityArrow.mapping +++ b/mappings/net/minecraft/entity/projectile/impl/EntityArrow.mapping @@ -23,4 +23,5 @@ CLASS none/abf net/minecraft/entity/projectile/impl/EntityArrow METHOD c registerTagUpgraders (Lnone/pf;)V METHOD i initDataTracker ()V METHOD j asItemStack ()Lnone/aer; + METHOD n getColor ()I METHOD y_ update ()V diff --git a/mappings/net/minecraft/entity/unsorted/EntityCave.mapping b/mappings/net/minecraft/entity/unsorted/EntityCave.mapping deleted file mode 100644 index 1a8cc3eb93..0000000000 --- a/mappings/net/minecraft/entity/unsorted/EntityCave.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/wj net/minecraft/entity/unsorted/EntityCave diff --git a/mappings/net/minecraft/entity/unsorted/EntityCaveMob.mapping b/mappings/net/minecraft/entity/unsorted/EntityCaveMob.mapping new file mode 100644 index 0000000000..5269bf088d --- /dev/null +++ b/mappings/net/minecraft/entity/unsorted/EntityCaveMob.mapping @@ -0,0 +1 @@ +CLASS none/wj net/minecraft/entity/unsorted/EntityCaveMob diff --git a/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping b/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping index 67b272a4a0..bfa7a935ea 100644 --- a/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping +++ b/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping @@ -38,6 +38,9 @@ CLASS none/abj net/minecraft/entity/vehicle/EntityMinecartBase ARG 0 value METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag + METHOD a registerTagUpgradersFor (Lnone/pf;Ljava/lang/Class;)V + METHOD a (Lnone/rq;)V + ARG 0 source METHOD a damage (Lnone/rq;F)Z ARG 0 source ARG 1 damage diff --git a/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping b/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping index 6e4337658a..cb0a50907c 100644 --- a/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping @@ -14,6 +14,8 @@ CLASS none/abm net/minecraft/entity/vehicle/EntityStorageMinecart ARG 0 tag METHOD a setContainerLock (Lnone/rf;)V ARG 0 lock + METHOD a (Lnone/rq;)V + ARG 0 source METHOD b getLootTable ()Lnone/kp; METHOD b removeInvStack (I)Lnone/aer; ARG 0 slot diff --git a/mappings/net/minecraft/entity/vehicle/impl/EntityChestMinecart.mapping b/mappings/net/minecraft/entity/vehicle/impl/EntityChestMinecart.mapping index 4072022996..14a334d804 100644 --- a/mappings/net/minecraft/entity/vehicle/impl/EntityChestMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/impl/EntityChestMinecart.mapping @@ -2,6 +2,8 @@ CLASS none/abk net/minecraft/entity/vehicle/impl/EntityChestMinecart METHOD a createContainer (Lnone/aak;Lnone/aal;)Lnone/abw; ARG 0 playerInv ARG 1 player + METHOD a (Lnone/rq;)V + ARG 0 source METHOD b registerTagUpgraders (Lnone/pf;)V METHOD l getContainerId ()Ljava/lang/String; METHOD t_ getInvSize ()I diff --git a/mappings/net/minecraft/entity/vehicle/impl/EntityFurnaceMinecart.mapping b/mappings/net/minecraft/entity/vehicle/impl/EntityFurnaceMinecart.mapping index 1d971d00c9..d4329b7d08 100644 --- a/mappings/net/minecraft/entity/vehicle/impl/EntityFurnaceMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/impl/EntityFurnaceMinecart.mapping @@ -2,6 +2,8 @@ CLASS none/abn net/minecraft/entity/vehicle/impl/EntityFurnaceMinecart FIELD c LIT Lnone/kj; METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag + METHOD a (Lnone/rq;)V + ARG 0 source METHOD b interact (Lnone/aal;Lnone/ra;)Z ARG 0 player ARG 1 playerHand diff --git a/mappings/net/minecraft/entity/vehicle/impl/EntityHopperMinecart.mapping b/mappings/net/minecraft/entity/vehicle/impl/EntityHopperMinecart.mapping index 896457ae36..57c50983b9 100644 --- a/mappings/net/minecraft/entity/vehicle/impl/EntityHopperMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/impl/EntityHopperMinecart.mapping @@ -8,6 +8,8 @@ CLASS none/abo net/minecraft/entity/vehicle/impl/EntityHopperMinecart ARG 1 player METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag + METHOD a (Lnone/rq;)V + ARG 0 source METHOD b interact (Lnone/aal;Lnone/ra;)Z ARG 0 player ARG 1 playerHand diff --git a/mappings/net/minecraft/entity/vehicle/impl/EntityTNTMinecart.mapping b/mappings/net/minecraft/entity/vehicle/impl/EntityTNTMinecart.mapping index 6c19929c60..dc12a33fd7 100644 --- a/mappings/net/minecraft/entity/vehicle/impl/EntityTNTMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/impl/EntityTNTMinecart.mapping @@ -1,4 +1,5 @@ CLASS none/abr net/minecraft/entity/vehicle/impl/EntityTNTMinecart + FIELD a fuseTicks I METHOD a getEffectiveExplosionResistance (Lnone/aiq;Lnone/aiv;Lnone/cn;Lnone/asl;)F ARG 0 explosion ARG 1 world @@ -12,14 +13,21 @@ CLASS none/abr net/minecraft/entity/vehicle/impl/EntityTNTMinecart ARG 4 power METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag + METHOD a (Lnone/rq;)V METHOD a damage (Lnone/rq;F)Z ARG 0 source ARG 1 damage METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag METHOD b registerTagUpgraders (Lnone/pf;)V + ARG 0 handler + METHOD c explode (D)V + ARG 0 strength METHOD e handleFallDamage (FF)V ARG 0 fallDistance + METHOD j prime ()V + METHOD k getFuseTicks ()I + METHOD l isPrimed ()Z METHOD v getMinecartType ()Lnone/abj$a; METHOD x getDefaultContainedBlock ()Lnone/asl; METHOD y_ update ()V diff --git a/mappings/net/minecraft/inventory/IInventoryListener.mapping b/mappings/net/minecraft/inventory/IInventoryListener.mapping new file mode 100644 index 0000000000..5c0fb2ddc0 --- /dev/null +++ b/mappings/net/minecraft/inventory/IInventoryListener.mapping @@ -0,0 +1,3 @@ +CLASS none/qw net/minecraft/inventory/IInventoryListener + METHOD a onInvChange (Lnone/qu;)V + ARG 0 inventory diff --git a/mappings/net/minecraft/inventory/Inventory.mapping b/mappings/net/minecraft/inventory/Inventory.mapping index 598d566e71..67cc9fc37c 100644 --- a/mappings/net/minecraft/inventory/Inventory.mapping +++ b/mappings/net/minecraft/inventory/Inventory.mapping @@ -2,6 +2,7 @@ CLASS none/rj net/minecraft/inventory/Inventory FIELD a name Ljava/lang/String; FIELD b size I FIELD c stackList Lnone/dc; + FIELD d listeners Ljava/util/List; FIELD e customNamed Z METHOD (Ljava/lang/String;ZI)V ARG 0 name @@ -22,6 +23,8 @@ CLASS none/rj net/minecraft/inventory/Inventory ARG 0 name METHOD a canPlayerUseInv (Lnone/aal;)Z ARG 0 player + METHOD a addListener (Lnone/qw;)V + ARG 0 listener METHOD b removeInvStack (I)Lnone/aer; ARG 0 slot METHOD b setInvField (II)V @@ -32,6 +35,8 @@ CLASS none/rj net/minecraft/inventory/Inventory ARG 1 stack METHOD b onInvOpen (Lnone/aal;)V ARG 0 player + METHOD b removeListener (Lnone/qw;)V + ARG 0 listener METHOD c onInvClose (Lnone/aal;)V ARG 0 player METHOD c_ getInvField (I)I diff --git a/mappings/net/minecraft/item/impl/ItemArrow.mapping b/mappings/net/minecraft/item/impl/ItemArrow.mapping index 6b3b342379..8b3e1bf70f 100644 --- a/mappings/net/minecraft/item/impl/ItemArrow.mapping +++ b/mappings/net/minecraft/item/impl/ItemArrow.mapping @@ -1 +1,5 @@ CLASS none/acz net/minecraft/item/impl/ItemArrow + METHOD a createEntityArrow (Lnone/aiv;Lnone/aer;Lnone/so;)Lnone/aao; + ARG 0 world + ARG 1 stack + ARG 2 owner diff --git a/mappings/net/minecraft/item/impl/ItemArrowSpectral.mapping b/mappings/net/minecraft/item/impl/ItemArrowSpectral.mapping index 4ef4958a58..ee5559ff92 100644 --- a/mappings/net/minecraft/item/impl/ItemArrowSpectral.mapping +++ b/mappings/net/minecraft/item/impl/ItemArrowSpectral.mapping @@ -1 +1,5 @@ CLASS none/afw net/minecraft/item/impl/ItemArrowSpectral + METHOD a createEntityArrow (Lnone/aiv;Lnone/aer;Lnone/so;)Lnone/aao; + ARG 0 world + ARG 1 stack + ARG 2 owner diff --git a/mappings/net/minecraft/item/impl/ItemArrowTipped.mapping b/mappings/net/minecraft/item/impl/ItemArrowTipped.mapping index 399f250442..2a930d0ef9 100644 --- a/mappings/net/minecraft/item/impl/ItemArrowTipped.mapping +++ b/mappings/net/minecraft/item/impl/ItemArrowTipped.mapping @@ -10,3 +10,7 @@ CLASS none/aga net/minecraft/item/impl/ItemArrowTipped ARG 1 player ARG 2 list ARG 3 advancedTooltips + METHOD a createEntityArrow (Lnone/aiv;Lnone/aer;Lnone/so;)Lnone/aao; + ARG 0 world + ARG 1 stack + ARG 2 owner diff --git a/mappings/net/minecraft/item/impl/ItemFireworkChare.mapping b/mappings/net/minecraft/item/impl/ItemFireworkCharge.mapping similarity index 69% rename from mappings/net/minecraft/item/impl/ItemFireworkChare.mapping rename to mappings/net/minecraft/item/impl/ItemFireworkCharge.mapping index 33a5635d7a..752ed70f47 100644 --- a/mappings/net/minecraft/item/impl/ItemFireworkChare.mapping +++ b/mappings/net/minecraft/item/impl/ItemFireworkCharge.mapping @@ -1,4 +1,4 @@ -CLASS none/aeg net/minecraft/item/impl/ItemFireworkChare +CLASS none/aeg net/minecraft/item/impl/ItemFireworkCharge METHOD a addInformation (Lnone/aer;Lnone/aal;Ljava/util/List;Z)V ARG 0 stack ARG 1 player diff --git a/mappings/net/minecraft/item/map/MapContainer.mapping b/mappings/net/minecraft/item/map/MapContainer.mapping new file mode 100644 index 0000000000..1a8e6ce43a --- /dev/null +++ b/mappings/net/minecraft/item/map/MapContainer.mapping @@ -0,0 +1,9 @@ +CLASS none/bal net/minecraft/item/map/MapContainer + FIELD e showIcons Z + FIELD f scale B + FIELD g colorArray [B + FIELD i icons Ljava/util/Map; + METHOD a deserialize (Lnone/dt;)V + ARG 0 tag + METHOD b serialize (Lnone/dt;)Lnone/dt; + ARG 0 tag diff --git a/mappings/net/minecraft/item/tool/ItemAxe.mapping b/mappings/net/minecraft/item/tool/ItemAxe.mapping index 44666a8568..4f3c8a4d4f 100644 --- a/mappings/net/minecraft/item/tool/ItemAxe.mapping +++ b/mappings/net/minecraft/item/tool/ItemAxe.mapping @@ -1,4 +1,9 @@ CLASS none/ada net/minecraft/item/tool/ItemAxe + FIELD e EFFECTIVE_BLOCKS Ljava/util/Set; + FIELD f WEAPON_DAMAGES [F + FIELD n SWING_SPEEDS [F + METHOD (Lnone/aep$a;)V + ARG 0 material METHOD a getMiningStrength (Lnone/aer;Lnone/asl;)F ARG 0 stack ARG 1 state diff --git a/mappings/net/minecraft/potion/PotionHelper.mapping b/mappings/net/minecraft/potion/PotionHelper.mapping index cdaca8fdb8..762f9a4345 100644 --- a/mappings/net/minecraft/potion/PotionHelper.mapping +++ b/mappings/net/minecraft/potion/PotionHelper.mapping @@ -6,6 +6,9 @@ CLASS none/agh net/minecraft/potion/PotionHelper METHOD a setCustomPotionEffects (Lnone/aer;Ljava/util/Collection;)Lnone/aer; ARG 0 stack ARG 1 effects + METHOD a addInformation (Lnone/aer;Ljava/util/List;F)V + ARG 0 stack + ARG 1 list METHOD a setPotion (Lnone/aer;Lnone/agf;)Lnone/aer; ARG 0 stack ARG 1 potion diff --git a/mappings/net/minecraft/sortme/MapSomething.mapping b/mappings/net/minecraft/sortme/MapSomething.mapping deleted file mode 100644 index 1b23d3ef81..0000000000 --- a/mappings/net/minecraft/sortme/MapSomething.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS none/bal net/minecraft/sortme/MapSomething - FIELD e showIcons Z - FIELD f scale B - FIELD i icons Ljava/util/Map; diff --git a/mappings/net/minecraft/util/Pair.mapping b/mappings/net/minecraft/util/Pair.mapping new file mode 100644 index 0000000000..980829c056 --- /dev/null +++ b/mappings/net/minecraft/util/Pair.mapping @@ -0,0 +1,8 @@ +CLASS none/oy net/minecraft/util/Pair + FIELD a first Ljava/lang/Object; + FIELD b second Ljava/lang/Object; + METHOD (Ljava/lang/Object;Ljava/lang/Object;)V + ARG 0 first + ARG 1 second + METHOD a getFirst ()Ljava/lang/Object; + METHOD b getSecond ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/sortme/Session.mapping b/mappings/net/minecraft/util/Session.mapping similarity index 83% rename from mappings/net/minecraft/sortme/Session.mapping rename to mappings/net/minecraft/util/Session.mapping index a6fa9603a9..31ef465739 100644 --- a/mappings/net/minecraft/sortme/Session.mapping +++ b/mappings/net/minecraft/util/Session.mapping @@ -1,4 +1,4 @@ -CLASS none/bdx net/minecraft/sortme/Session +CLASS none/bdx net/minecraft/util/Session CLASS none/bdx$a AccountType FIELD a LEGACY Lnone/bdx$a; FIELD b MOJANG Lnone/bdx$a; @@ -19,5 +19,6 @@ CLASS none/bdx net/minecraft/sortme/Session ARG 3 accountType METHOD a getSessionId ()Ljava/lang/String; METHOD b getUuid ()Ljava/lang/String; - METHOD c getUsernme ()Ljava/lang/String; + METHOD c getUsername ()Ljava/lang/String; METHOD d getAccessToken ()Ljava/lang/String; + METHOD e getProfile ()Lcom/mojang/authlib/GameProfile; diff --git a/mappings/net/minecraft/util/TagHelper.mapping b/mappings/net/minecraft/util/TagHelper.mapping index 8c128968a3..be68cf6401 100644 --- a/mappings/net/minecraft/util/TagHelper.mapping +++ b/mappings/net/minecraft/util/TagHelper.mapping @@ -1,13 +1,26 @@ CLASS none/ed net/minecraft/util/TagHelper - METHOD a setUUID (Ljava/util/UUID;)Lnone/dt; + METHOD a serializeUuid (Ljava/util/UUID;)Lnone/dt; ARG 0 uuid - METHOD a setBlockPos (Lnone/cn;)Lnone/dt; + METHOD a withProperty (Lnone/asl;Lnone/atb;Ljava/lang/String;)Lnone/asl; + ARG 0 state + ARG 1 property + ARG 2 value + METHOD a getPropertyValue (Lnone/atb;Ljava/lang/Comparable;)Ljava/lang/String; + ARG 0 property + ARG 1 value + METHOD a serializeBlockPos (Lnone/cn;)Lnone/dt; ARG 0 pos - METHOD a getGameProfile (Lnone/dt;)Lcom/mojang/authlib/GameProfile; - METHOD a setGameProfile (Lnone/dt;Lcom/mojang/authlib/GameProfile;)Lnone/dt; + METHOD a deserializeProfile (Lnone/dt;)Lcom/mojang/authlib/GameProfile; ARG 0 tag - ARG 1 gameProfile - METHOD b getUUID (Lnone/dt;)Ljava/util/UUID; + METHOD a serializeProfile (Lnone/dt;Lcom/mojang/authlib/GameProfile;)Lnone/dt; ARG 0 tag - METHOD c getBlockPos (Lnone/dt;)Lnone/cn; + ARG 1 profile + METHOD a serializeBlockState (Lnone/dt;Lnone/asl;)Lnone/dt; + ARG 0 tag + ARG 1 state + METHOD b deserializeUuid (Lnone/dt;)Ljava/util/UUID; + ARG 0 tag + METHOD c deserializeBlockPos (Lnone/dt;)Lnone/cn; + ARG 0 tag + METHOD d deserializeBlockState (Lnone/dt;)Lnone/asl; ARG 0 tag diff --git a/mappings/net/minecraft/sortme/Difficulty.mapping b/mappings/net/minecraft/world/Difficulty.mapping similarity index 89% rename from mappings/net/minecraft/sortme/Difficulty.mapping rename to mappings/net/minecraft/world/Difficulty.mapping index 2c81ab166e..dd7d968219 100644 --- a/mappings/net/minecraft/sortme/Difficulty.mapping +++ b/mappings/net/minecraft/world/Difficulty.mapping @@ -1,4 +1,4 @@ -CLASS none/qy net/minecraft/sortme/Difficulty +CLASS none/qy net/minecraft/world/Difficulty FIELD a PEACEFUL Lnone/qy; FIELD b EASY Lnone/qy; FIELD c NORMAL Lnone/qy; diff --git a/mappings/net/minecraft/sortme/WorldListenerServer.mapping b/mappings/net/minecraft/world/WorldListenerServer.mapping similarity index 87% rename from mappings/net/minecraft/sortme/WorldListenerServer.mapping rename to mappings/net/minecraft/world/WorldListenerServer.mapping index 341df81547..c4001de926 100644 --- a/mappings/net/minecraft/sortme/WorldListenerServer.mapping +++ b/mappings/net/minecraft/world/WorldListenerServer.mapping @@ -1,4 +1,4 @@ -CLASS none/lv net/minecraft/sortme/WorldListenerServer +CLASS none/lv net/minecraft/world/WorldListenerServer FIELD a server Lnet/minecraft/server/MinecraftServer; FIELD b world Lnone/lu; METHOD a onSpawnParticle (IZDDDDDD[I)V diff --git a/mappings/none/acq.mapping b/mappings/none/acq.mapping index 25f4db16ab..63dde8a12f 100644 --- a/mappings/none/acq.mapping +++ b/mappings/none/acq.mapping @@ -1,3 +1,5 @@ CLASS none/acq + METHOD a takeStack (I)Lnone/aer; + ARG 0 amount METHOD a canInsert (Lnone/aer;)Z ARG 0 stack diff --git a/mappings/none/axp.mapping b/mappings/none/axp.mapping new file mode 100644 index 0000000000..41374ecb25 --- /dev/null +++ b/mappings/none/axp.mapping @@ -0,0 +1,5 @@ +CLASS none/axp + METHOD a deserialize (Lnone/dt;)V + ARG 0 tag + METHOD b serialize (Lnone/dt;)Lnone/dt; + ARG 0 tag diff --git a/mappings/none/baj.mapping b/mappings/none/baj.mapping new file mode 100644 index 0000000000..686e07bdbf --- /dev/null +++ b/mappings/none/baj.mapping @@ -0,0 +1,5 @@ +CLASS none/baj + METHOD a deserialize (Lnone/dt;)V + ARG 0 tag + METHOD b serialize (Lnone/dt;)Lnone/dt; + ARG 0 tag diff --git a/mappings/none/bdb.mapping b/mappings/none/bdb.mapping new file mode 100644 index 0000000000..1a8b0baf77 --- /dev/null +++ b/mappings/none/bdb.mapping @@ -0,0 +1,5 @@ +CLASS none/bdb + METHOD a deserialize (Lnone/dt;)V + ARG 0 tag + METHOD b serialize (Lnone/dt;)Lnone/dt; + ARG 0 tag diff --git a/mappings/net/minecraft/sortme/ClientWorldListener.mapping b/mappings/none/bpa.mapping similarity index 93% rename from mappings/net/minecraft/sortme/ClientWorldListener.mapping rename to mappings/none/bpa.mapping index 3ccdab7f64..a311dbb8c6 100644 --- a/mappings/net/minecraft/sortme/ClientWorldListener.mapping +++ b/mappings/none/bpa.mapping @@ -1,4 +1,4 @@ -CLASS none/bpa net/minecraft/sortme/ClientWorldListener +CLASS none/bpa FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c MOON_PHASES_TEX Lnone/kp; FIELD d SUN_TEX Lnone/kp; diff --git a/mappings/none/cac.mapping b/mappings/none/cac.mapping deleted file mode 100644 index 677ce87391..0000000000 --- a/mappings/none/cac.mapping +++ /dev/null @@ -1,47 +0,0 @@ -CLASS none/cac - METHOD (Lnone/kp;Lnone/nm;FFZILnone/cag$a;FFF)V - ARG 0 id - ARG 1 category - ARG 2 volume - ARG 3 pitch - ARG 4 repeat - ARG 5 repeatDelay - ARG 6 attenuationType - ARG 7 posX - ARG 8 posY - ARG 9 posZ - METHOD (Lnone/nk;Lnone/nm;FFFFF)V - ARG 0 sound - ARG 1 category - ARG 2 volume - ARG 3 pitch - ARG 4 posX - ARG 5 posY - ARG 6 posZ - METHOD (Lnone/nk;Lnone/nm;FFLnone/cn;)V - ARG 0 sound - ARG 1 category - ARG 2 volume - ARG 3 pitch - ARG 4 pos - METHOD (Lnone/nk;Lnone/nm;FFZILnone/cag$a;FFF)V - ARG 0 sound - ARG 1 category - ARG 2 volume - ARG 3 pitch - ARG 4 repeat - ARG 5 repeatDelay - ARG 6 attenuationType - ARG 7 posX - ARG 8 posY - ARG 9 posZ - METHOD a create (Lnone/nk;)Lnone/cac; - ARG 0 sound - METHOD a create (Lnone/nk;F)Lnone/cac; - ARG 0 sound - ARG 1 pitch - METHOD a create (Lnone/nk;FFF)Lnone/cac; - ARG 0 sound - ARG 1 posX - ARG 2 posY - ARG 3 posZ diff --git a/mappings/none/wh.mapping b/mappings/none/wh.mapping new file mode 100644 index 0000000000..8c2a8c57a0 --- /dev/null +++ b/mappings/none/wh.mapping @@ -0,0 +1,5 @@ +CLASS none/wh + METHOD a deserialize (Lnone/dt;)V + ARG 0 tag + METHOD b serialize (Lnone/dt;)Lnone/dt; + ARG 0 tag