diff --git a/mappings/net/minecraft/block/entity/impl/BlockEntityHopper.mapping b/mappings/net/minecraft/block/entity/impl/BlockEntityHopper.mapping index ae4d46089f..fb8044d2a7 100644 --- a/mappings/net/minecraft/block/entity/impl/BlockEntityHopper.mapping +++ b/mappings/net/minecraft/block/entity/impl/BlockEntityHopper.mapping @@ -42,6 +42,7 @@ CLASS none/arq net/minecraft/block/entity/impl/BlockEntityHopper METHOD a isInventoryFull (Lnone/qu;Lnone/cu;)Z ARG 0 inv ARG 1 facing + METHOD a (Lnone/qu;Lnone/qu;Lnone/yz;)Z METHOD b removeInvStack (I)Lnone/aer; ARG 0 slot METHOD b setInvProperty (II)V diff --git a/mappings/net/minecraft/block/entity/impl/BlockEntitySkull.mapping b/mappings/net/minecraft/block/entity/impl/BlockEntitySkull.mapping index 4e7e6e0e1d..c12ea86839 100644 --- a/mappings/net/minecraft/block/entity/impl/BlockEntitySkull.mapping +++ b/mappings/net/minecraft/block/entity/impl/BlockEntitySkull.mapping @@ -5,7 +5,13 @@ CLASS none/arw net/minecraft/block/entity/impl/BlockEntitySkull FIELD j userCache Lnone/mn; FIELD k sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; METHOD D_ update ()V + METHOD a getOwner ()Lcom/mojang/authlib/GameProfile; + METHOD a setType (I)V + ARG 0 type + METHOD a setOwnerAndType (Lcom/mojang/authlib/GameProfile;)V + ARG 0 owner METHOD a setSessionService (Lcom/mojang/authlib/minecraft/MinecraftSessionService;)V + ARG 0 value METHOD a applyMirror (Lnone/anx;)V ARG 0 mirror METHOD a applyRotation (Lnone/apk;)V @@ -13,11 +19,15 @@ CLASS none/arw net/minecraft/block/entity/impl/BlockEntitySkull METHOD a deserialize (Lnone/dt;)V ARG 0 tag METHOD a setUserCache (Lnone/mn;)V + ARG 0 value METHOD b setRotation (I)V - ARG 0 otation + ARG 0 value + METHOD b loadProperties (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; + ARG 0 profile METHOD b serialize (Lnone/dt;)Lnone/dt; ARG 0 tag METHOD c getUpdatePacket ()Lnone/fy; METHOD d serializeInitialChunkData ()Lnone/dt; METHOD e getType ()I METHOD f getRotation ()I + METHOD h loadOwnerProperties ()V diff --git a/mappings/net/minecraft/client/MinecraftGame.mapping b/mappings/net/minecraft/client/MinecraftGame.mapping index 2281dcf0ea..2c44454850 100644 --- a/mappings/net/minecraft/client/MinecraftGame.mapping +++ b/mappings/net/minecraft/client/MinecraftGame.mapping @@ -19,10 +19,13 @@ CLASS none/bdq net/minecraft/client/MinecraftGame FIELD aE languageManager Lnone/byn; FIELD aF blockColorMap Lnone/bdz; FIELD aG itemColorMap Lnone/bec; + FIELD aH framebuffer Lnone/bpf; FIELD aI spriteAtlas Lnone/bxc; FIELD aJ soundLoader Lnone/caw; FIELD aK musicTracker Lnone/cat; + FIELD aL logoTexture Lnone/kp; FIELD aM sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; + FIELD aO taskQueue Ljava/util/Queue; FIELD aP thread Ljava/lang/Thread; FIELD aQ bakedModelManager Lnone/bzp; FIELD aR blockRenderManager Lnone/bpo; @@ -110,15 +113,17 @@ CLASS none/bdq net/minecraft/client/MinecraftGame METHOD ak getBlockColorMap ()Lnone/bdz; METHOD am hasReducedDebugInfo ()Z METHOD an init ()V + METHOD ao registerMetadataDeserializers ()V METHOD ap createDisplay ()V METHOD aq setDisplayMode ()V METHOD ar setIcons ()V METHOD as checkIs64Bit ()Z METHOD at startTimerHackThread ()V - METHOD au ()V + METHOD au enableFullscreen ()V METHOD aw doAttack ()V METHOD ax doItemUse ()V METHOD az handleKeyboardEvents ()V + METHOD b getFramebuffer ()Lnone/bpf; METHOD b addSnooperInitialInfo (Lnone/rk;)V ARG 0 snooper METHOD c getGameVersion ()Ljava/lang/String; @@ -127,11 +132,13 @@ CLASS none/bdq net/minecraft/client/MinecraftGame METHOD h stop ()V METHOD k getMaxFps ()I METHOD l limitFramerate ()Z + METHOD n stopThread ()V METHOD o closeGui ()V METHOD p afterOpenGui ()V METHOD q openInGameMenu ()V METHOD r toggleFullscreen ()V METHOD s getMusicTracker ()Lnone/cat; + METHOD t tick ()V METHOD u isDemo ()Z METHOD v getNetworkHandler ()Lnone/bme; METHOD x isFancyGraphicsEnabled ()Z diff --git a/mappings/net/minecraft/client/RunArgs.mapping b/mappings/net/minecraft/client/RunArgs.mapping index aabd41281e..6ce44df0f3 100644 --- a/mappings/net/minecraft/client/RunArgs.mapping +++ b/mappings/net/minecraft/client/RunArgs.mapping @@ -17,7 +17,9 @@ CLASS none/bjm net/minecraft/client/RunArgs METHOD (Ljava/lang/String;I)V ARG 0 serverIp ARG 1 serverPort - CLASS none/bjm$e + CLASS none/bjm$e Network + FIELD a session Lnone/bdx; FIELD d netProxy Ljava/net/Proxy; + FIELD a network Lnone/bjm$e; FIELD c dirs Lnone/bjm$b; FIELD e autoConnect Lnone/bjm$d; diff --git a/mappings/net/minecraft/sortme/LanServerEntry.mapping b/mappings/net/minecraft/client/network/LanServerEntry.mapping similarity index 83% rename from mappings/net/minecraft/sortme/LanServerEntry.mapping rename to mappings/net/minecraft/client/network/LanServerEntry.mapping index 832f56f3e0..bd01eec8e7 100644 --- a/mappings/net/minecraft/sortme/LanServerEntry.mapping +++ b/mappings/net/minecraft/client/network/LanServerEntry.mapping @@ -1,4 +1,4 @@ -CLASS none/can net/minecraft/sortme/LanServerEntry +CLASS none/can net/minecraft/client/network/LanServerEntry FIELD a motd Ljava/lang/String; FIELD b addressPort Ljava/lang/String; FIELD c lastTimeMillis J diff --git a/mappings/net/minecraft/sortme/LanServerQueryManager.mapping b/mappings/net/minecraft/client/network/LanServerQueryManager.mapping similarity index 90% rename from mappings/net/minecraft/sortme/LanServerQueryManager.mapping rename to mappings/net/minecraft/client/network/LanServerQueryManager.mapping index 9bf70ca6df..7a38d20090 100644 --- a/mappings/net/minecraft/sortme/LanServerQueryManager.mapping +++ b/mappings/net/minecraft/client/network/LanServerQueryManager.mapping @@ -1,4 +1,4 @@ -CLASS none/cao net/minecraft/sortme/LanServerQueryManager +CLASS none/cao net/minecraft/client/network/LanServerQueryManager CLASS none/cao$a LanServerDetector FIELD a entryList Lnone/cao$b; FIELD b multicastAddress Ljava/net/InetAddress; diff --git a/mappings/net/minecraft/client/render/FontRenderer.mapping b/mappings/net/minecraft/client/render/FontRenderer.mapping index d36cca846c..3002678bb4 100644 --- a/mappings/net/minecraft/client/render/FontRenderer.mapping +++ b/mappings/net/minecraft/client/render/FontRenderer.mapping @@ -4,6 +4,7 @@ CLASS none/bee net/minecraft/client/render/FontRenderer FIELD f chatColors [I FIELD g fontTextureLoc Lnone/kp; FIELD h textureManager Lnone/bxe; + FIELD l rightToLeft Z FIELD m colorRed F FIELD n colorGreen F FIELD o colorBlue F @@ -33,5 +34,7 @@ CLASS none/bee net/minecraft/client/render/FontRenderer ARG 0 container METHOD b getChatColor (C)I ARG 0 chr + METHOD b setRightToLeft (Z)V + ARG 0 value METHOD c reloadFontTexture ()V METHOD c wrapStringToList (Ljava/lang/String;I)Ljava/util/List; diff --git a/mappings/net/minecraft/client/GameSettings.mapping b/mappings/net/minecraft/client/settings/GameSettings.mapping similarity index 93% rename from mappings/net/minecraft/client/GameSettings.mapping rename to mappings/net/minecraft/client/settings/GameSettings.mapping index 9cfbb884eb..ba70c73d9f 100644 --- a/mappings/net/minecraft/client/GameSettings.mapping +++ b/mappings/net/minecraft/client/settings/GameSettings.mapping @@ -1,4 +1,4 @@ -CLASS none/bds net/minecraft/client/GameSettings +CLASS none/bds net/minecraft/client/settings/GameSettings CLASS none/bds$a Option FIELD A CHAT_WIDTH Lnone/bds$a; FIELD B CHAT_HEIGHT_FOCUSED Lnone/bds$a; @@ -75,6 +75,7 @@ CLASS none/bds net/minecraft/client/GameSettings FIELD aF forceUnicodeFont Z FIELD aG LOGGER Lorg/apache/logging/log4j/Logger; FIELD aH GSON Lcom/google/gson/Gson; + FIELD aI STRING_LIST_TYPE Ljava/lang/reflect/Type; FIELD aJ GUI_SCALES [Ljava/lang/String; FIELD aK PARTICLE_SETTINGS [Ljava/lang/String; FIELD aL AO_SETTINGS [Ljava/lang/String; @@ -134,6 +135,11 @@ CLASS none/bds net/minecraft/client/GameSettings METHOD a load ()V METHOD a parseFloat (Ljava/lang/String;)F ARG 0 s + METHOD a togglePlayerModelPart (Lnone/aam;)V + ARG 0 part + METHOD a setPlayerModelPart (Lnone/aam;Z)V + ARG 0 part + ARG 1 enabled METHOD a get (Lnone/bds$a;)F ARG 0 option METHOD a (Lnone/bds$a;I)V @@ -146,7 +152,9 @@ CLASS none/bds net/minecraft/client/GameSettings METHOD b write ()V METHOD b isEnabled (Lnone/bds$a;)Z ARG 0 option + METHOD c onPlayerModelPartChange ()V METHOD c getTranslatedName (Lnone/bds$a;)Ljava/lang/String; ARG 0 option + METHOD d getEnabledPlayerModelParts ()Ljava/util/Set; METHOD e getCloudRenderMode ()I METHOD f shouldUseNativeTransport ()Z diff --git a/mappings/net/minecraft/util/ServerEntry.mapping b/mappings/net/minecraft/client/settings/ServerEntry.mapping similarity index 94% rename from mappings/net/minecraft/util/ServerEntry.mapping rename to mappings/net/minecraft/client/settings/ServerEntry.mapping index 23dfd77e0b..227a375b0a 100644 --- a/mappings/net/minecraft/util/ServerEntry.mapping +++ b/mappings/net/minecraft/client/settings/ServerEntry.mapping @@ -1,4 +1,4 @@ -CLASS none/bmj net/minecraft/util/ServerEntry +CLASS none/bmj net/minecraft/client/settings/ServerEntry CLASS none/bmj$a ResourcePackState FIELD a ENABLED Lnone/bmj$a; FIELD b DISABLED Lnone/bmj$a; diff --git a/mappings/net/minecraft/sortme/ServerList.mapping b/mappings/net/minecraft/client/settings/ServerList.mapping similarity index 89% rename from mappings/net/minecraft/sortme/ServerList.mapping rename to mappings/net/minecraft/client/settings/ServerList.mapping index f899e1b1e6..67b4432958 100644 --- a/mappings/net/minecraft/sortme/ServerList.mapping +++ b/mappings/net/minecraft/client/settings/ServerList.mapping @@ -1,4 +1,4 @@ -CLASS none/bmk net/minecraft/sortme/ServerList +CLASS none/bmk net/minecraft/client/settings/ServerList FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b mc Lnone/bdq; FIELD c serverEntries Ljava/util/List; diff --git a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping new file mode 100644 index 0000000000..0bf65ef7e4 --- /dev/null +++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping @@ -0,0 +1,10 @@ +CLASS none/ahp net/minecraft/enchantment/EnchantmentHelper + FIELD a rand Ljava/util/Random; + METHOD a setEnchantments (Ljava/util/Map;Lnone/aer;)V + ARG 0 enchantmentMap + ARG 1 stack + METHOD a getEnchantments (Lnone/aer;)Ljava/util/Map; + ARG 0 stack + METHOD a getLevel (Lnone/ahn;Lnone/aer;)I + ARG 0 enchantment + ARG 1 stack diff --git a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping index b52d751e6d..3a4bd0c30b 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping @@ -8,6 +8,7 @@ CLASS none/lw net/minecraft/entity/player/EntityPlayerServer METHOD (Lnet/minecraft/server/MinecraftServer;Lnone/lu;Lcom/mojang/authlib/GameProfile;Lnone/lx;)V ARG 0 server ARG 1 world + METHOD A getIpAddress ()Ljava/lang/String; METHOD C getChatVisibility ()Lnone/aal$b; METHOD F updatePotionVisibility ()V METHOD G getCameraEntity ()Lnone/sf; diff --git a/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping b/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping index cffdf0a22c..442f3c53c8 100644 --- a/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping +++ b/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping @@ -28,6 +28,11 @@ CLASS none/abj net/minecraft/entity/vehicle/EntityMinecartBase ARG 3 z METHOD A hasCustomBlock ()Z METHOD T invalidate ()V + METHOD a onActivatorRail (IIIZ)V + ARG 0 x + ARG 1 y + ARG 2 z + ARG 3 powered METHOD a create (Lnone/aiv;DDDLnone/abj$a;)Lnone/abj; ARG 0 world ARG 1 x diff --git a/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping b/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping index d8a2ee71c5..5f6afbc204 100644 --- a/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping @@ -1,4 +1,6 @@ CLASS none/abm net/minecraft/entity/vehicle/EntityStorageMinecart + FIELD a inventory Lnone/dc; + FIELD c lootTableId Lnone/kp; METHOD T invalidate ()V METHOD a getInvStack (I)Lnone/aer; ARG 0 slot @@ -12,6 +14,9 @@ CLASS none/abm net/minecraft/entity/vehicle/EntityStorageMinecart ARG 0 player METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag + METHOD a setLootTable (Lnone/kp;J)V + ARG 0 id + ARG 1 seed METHOD a setContainerLock (Lnone/rf;)V ARG 0 lock METHOD a (Lnone/rq;)V @@ -32,6 +37,7 @@ CLASS none/abm net/minecraft/entity/vehicle/EntityStorageMinecart ARG 1 hand METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag + METHOD b registerTagUpgradersFor (Lnone/pf;Ljava/lang/Class;)V METHOD c changeDimension (I)Lnone/sf; ARG 0 dimensionId METHOD c onInvClose (Lnone/aal;)V diff --git a/mappings/net/minecraft/entity/vehicle/impl/EntityCommandBlockMinecart.mapping b/mappings/net/minecraft/entity/vehicle/impl/EntityCommandBlockMinecart.mapping index 0d076e8649..f8635f1932 100644 --- a/mappings/net/minecraft/entity/vehicle/impl/EntityCommandBlockMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/impl/EntityCommandBlockMinecart.mapping @@ -13,6 +13,11 @@ CLASS none/abl net/minecraft/entity/vehicle/impl/EntityCommandBlockMinecart FIELD a COMMAND Lnone/kj; FIELD b LAST_OUTPUT Lnone/kj; FIELD c commandExecutor Lnone/aik; + METHOD a onActivatorRail (IIIZ)V + ARG 0 x + ARG 1 y + ARG 2 z + ARG 3 powered METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag METHOD a onTrackedDataSet (Lnone/kj;)V @@ -24,5 +29,6 @@ CLASS none/abl net/minecraft/entity/vehicle/impl/EntityCommandBlockMinecart ARG 0 tag METHOD b registerTagUpgraders (Lnone/pf;)V METHOD i initDataTracker ()V + METHOD j getCommandExecutor ()Lnone/aik; METHOD v getMinecartType ()Lnone/abj$a; METHOD x getDefaultContainedBlock ()Lnone/asl; diff --git a/mappings/net/minecraft/entity/vehicle/impl/EntityFurnaceMinecart.mapping b/mappings/net/minecraft/entity/vehicle/impl/EntityFurnaceMinecart.mapping index 0b5caa5299..dfc11c87be 100644 --- a/mappings/net/minecraft/entity/vehicle/impl/EntityFurnaceMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/impl/EntityFurnaceMinecart.mapping @@ -1,5 +1,8 @@ CLASS none/abn net/minecraft/entity/vehicle/impl/EntityFurnaceMinecart + FIELD a pushX D + FIELD b pushZ D FIELD c LIT Lnone/kj; + FIELD d fuel I METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag METHOD a (Lnone/rq;)V diff --git a/mappings/net/minecraft/entity/vehicle/impl/EntityHopperMinecart.mapping b/mappings/net/minecraft/entity/vehicle/impl/EntityHopperMinecart.mapping index e63fd6436d..d1e3ae880a 100644 --- a/mappings/net/minecraft/entity/vehicle/impl/EntityHopperMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/impl/EntityHopperMinecart.mapping @@ -1,8 +1,19 @@ CLASS none/abo net/minecraft/entity/vehicle/impl/EntityHopperMinecart + FIELD a enabled Z + FIELD b transferCooldown I + FIELD c currentBlockPos Lnone/cn; + METHOD C isEnabled ()Z METHOD D getHopperWorld ()Lnone/aiv; METHOD E getHopperX ()D METHOD F getHopperY ()D METHOD G getHopperZ ()D + METHOD I updateLogic ()Z + METHOD J isCoolingDown ()Z + METHOD a onActivatorRail (IIIZ)V + ARG 0 x + ARG 1 y + ARG 2 z + ARG 3 powered METHOD a createContainer (Lnone/aak;Lnone/aal;)Lnone/abw; ARG 0 playerInv ARG 1 player @@ -16,7 +27,11 @@ CLASS none/abo net/minecraft/entity/vehicle/impl/EntityHopperMinecart METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag METHOD b registerTagUpgraders (Lnone/pf;)V + METHOD g setTransferCooldown (I)V + ARG 0 value METHOD l getContainerId ()Ljava/lang/String; + METHOD l setEnabled (Z)V + ARG 0 value METHOD t_ getInvSize ()I METHOD v getMinecartType ()Lnone/abj$a; METHOD x getDefaultContainedBlock ()Lnone/asl; diff --git a/mappings/net/minecraft/entity/vehicle/impl/EntityMinecart.mapping b/mappings/net/minecraft/entity/vehicle/impl/EntityMinecart.mapping index 8f475bfdae..6e132f1200 100644 --- a/mappings/net/minecraft/entity/vehicle/impl/EntityMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/impl/EntityMinecart.mapping @@ -1,4 +1,9 @@ CLASS none/abp net/minecraft/entity/vehicle/impl/EntityMinecart + METHOD a onActivatorRail (IIIZ)V + ARG 0 x + ARG 1 y + ARG 2 z + ARG 3 powered METHOD b interact (Lnone/aal;Lnone/ra;)Z ARG 0 player ARG 1 hand diff --git a/mappings/net/minecraft/entity/vehicle/impl/EntityTNTMinecart.mapping b/mappings/net/minecraft/entity/vehicle/impl/EntityTNTMinecart.mapping index dc12a33fd7..444805029e 100644 --- a/mappings/net/minecraft/entity/vehicle/impl/EntityTNTMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/impl/EntityTNTMinecart.mapping @@ -1,5 +1,10 @@ CLASS none/abr net/minecraft/entity/vehicle/impl/EntityTNTMinecart FIELD a fuseTicks I + METHOD a onActivatorRail (IIIZ)V + ARG 0 x + ARG 1 y + ARG 2 z + ARG 3 powered METHOD a getEffectiveExplosionResistance (Lnone/aiq;Lnone/aiv;Lnone/cn;Lnone/asl;)F ARG 0 explosion ARG 1 world diff --git a/mappings/net/minecraft/gui/CreativeTab.mapping b/mappings/net/minecraft/gui/CreativeTab.mapping index 1819abf1d4..e1c12e72d3 100644 --- a/mappings/net/minecraft/gui/CreativeTab.mapping +++ b/mappings/net/minecraft/gui/CreativeTab.mapping @@ -11,6 +11,7 @@ CLASS none/adr net/minecraft/gui/CreativeTab METHOD e getIconItem ()Lnone/aep; CLASS none/adr$6 METHOD e getIconItem ()Lnone/aep; + METHOD f getIconMeta ()I CLASS none/adr$7 METHOD e getIconItem ()Lnone/aep; CLASS none/adr$8 @@ -39,6 +40,8 @@ CLASS none/adr net/minecraft/gui/CreativeTab FIELD n id I FIELD o unlocalizedName Ljava/lang/String; FIELD p texture Ljava/lang/String; + FIELD r tooltip Z + FIELD s enchantmentTypes [Lnone/aho; FIELD t stack Lnone/aer; METHOD (ILjava/lang/String;)V ARG 0 id @@ -46,10 +49,23 @@ CLASS none/adr net/minecraft/gui/CreativeTab METHOD a getId ()I METHOD a setTexture (Ljava/lang/String;)Lnone/adr; ARG 0 texture + METHOD a addEnchantedBooks (Ljava/util/List;[Lnone/aho;)V + ARG 0 stackList + ARG 1 enchantmentTypes + METHOD a containsEnchantmentType (Lnone/aho;)Z + ARG 0 value METHOD a getStacksForDisplay (Lnone/dc;)V ARG 0 stackList + METHOD a setEnchantmentTypes ([Lnone/aho;)Lnone/adr; + ARG 0 value METHOD b getUntranslatedName ()Ljava/lang/String; METHOD c getTranslationKey ()Ljava/lang/String; METHOD d getIconItemStack ()Lnone/aer; METHOD e getIconItem ()Lnone/aep; + METHOD f getIconMeta ()I METHOD g getTexture ()Ljava/lang/String; + METHOD h hasTooltip ()Z + METHOD i disableTooltip ()Lnone/adr; + METHOD l getColumn ()I + METHOD m isTopRow ()Z + METHOD n getEnchantmentTypes ()[Lnone/aho; diff --git a/mappings/net/minecraft/item/impl/ItemBookEnchanted.mapping b/mappings/net/minecraft/item/impl/ItemBookEnchanted.mapping index 06c8becf8f..93b170eeaa 100644 --- a/mappings/net/minecraft/item/impl/ItemBookEnchanted.mapping +++ b/mappings/net/minecraft/item/impl/ItemBookEnchanted.mapping @@ -8,5 +8,7 @@ CLASS none/aea net/minecraft/item/impl/ItemBookEnchanted ARG 0 stack METHOD g_ isTool (Lnone/aer;)Z ARG 0 stack + METHOD h getEnchantmentTag (Lnone/aer;)Lnone/dz; + ARG 0 stack METHOD i_ hasEnchantmentGlow (Lnone/aer;)Z ARG 0 stack diff --git a/mappings/net/minecraft/item/impl/ItemMinecart.mapping b/mappings/net/minecraft/item/impl/ItemMinecart.mapping index b19c3fc05f..bd06fd989b 100644 --- a/mappings/net/minecraft/item/impl/ItemMinecart.mapping +++ b/mappings/net/minecraft/item/impl/ItemMinecart.mapping @@ -1,5 +1,9 @@ CLASS none/aez net/minecraft/item/impl/ItemMinecart + CLASS none/aez$1 FIELD a DISPENSER_BEHAVIOR Lnone/cv; + FIELD b type Lnone/abj$a; + METHOD (Lnone/abj$a;)V + ARG 0 type METHOD a activate (Lnone/aal;Lnone/aiv;Lnone/cn;Lnone/ra;Lnone/cu;FFF)Lnone/rc; ARG 0 player ARG 1 world diff --git a/mappings/net/minecraft/network/encryption/PacketDecryptor.mapping b/mappings/net/minecraft/network/encryption/PacketDecryptor.mapping new file mode 100644 index 0000000000..a7b6e6da49 --- /dev/null +++ b/mappings/net/minecraft/network/encryption/PacketDecryptor.mapping @@ -0,0 +1,4 @@ +CLASS none/em net/minecraft/network/encryption/PacketDecryptor + FIELD a manager Lnone/el; + METHOD (Ljavax/crypto/Cipher;)V + ARG 0 cipher diff --git a/mappings/net/minecraft/network/encryption/PacketEncrypter.mapping b/mappings/net/minecraft/network/encryption/PacketEncrypter.mapping new file mode 100644 index 0000000000..453faee9e6 --- /dev/null +++ b/mappings/net/minecraft/network/encryption/PacketEncrypter.mapping @@ -0,0 +1,4 @@ +CLASS none/en net/minecraft/network/encryption/PacketEncrypter + FIELD a manager Lnone/el; + METHOD (Ljavax/crypto/Cipher;)V + ARG 0 cipher diff --git a/mappings/net/minecraft/network/encryption/PacketEncryptionManager.mapping b/mappings/net/minecraft/network/encryption/PacketEncryptionManager.mapping new file mode 100644 index 0000000000..ebe196d917 --- /dev/null +++ b/mappings/net/minecraft/network/encryption/PacketEncryptionManager.mapping @@ -0,0 +1,14 @@ +CLASS none/el net/minecraft/network/encryption/PacketEncryptionManager + FIELD a cipher Ljavax/crypto/Cipher; + FIELD b conversionBuffer [B + FIELD c encryptionBuffer [B + METHOD (Ljavax/crypto/Cipher;)V + ARG 0 cipher + METHOD a toByteArray (Lio/netty/buffer/ByteBuf;)[B + ARG 0 buffer + METHOD a encrypt (Lio/netty/buffer/ByteBuf;Lio/netty/buffer/ByteBuf;)V + ARG 0 buffer + ARG 1 encBuffer + METHOD a decrypt (Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;)Lio/netty/buffer/ByteBuf; + ARG 0 context + ARG 1 encBuffer diff --git a/mappings/net/minecraft/network/handler/INetworkQueryHandlerClient.mapping b/mappings/net/minecraft/network/handler/INetworkQueryHandlerClient.mapping new file mode 100644 index 0000000000..95960a001c --- /dev/null +++ b/mappings/net/minecraft/network/handler/INetworkQueryHandlerClient.mapping @@ -0,0 +1,5 @@ +CLASS none/kb net/minecraft/network/handler/INetworkQueryHandlerClient + METHOD a onQueryPong (Lnone/kc;)V + ARG 0 packet + METHOD a onQueryResponse (Lnone/kd;)V + ARG 0 packet diff --git a/mappings/net/minecraft/sortme/IScoreboardObjective.mapping b/mappings/net/minecraft/scoreboard/IScoreboardObjective.mapping similarity index 92% rename from mappings/net/minecraft/sortme/IScoreboardObjective.mapping rename to mappings/net/minecraft/scoreboard/IScoreboardObjective.mapping index 139bddf37d..37a78be715 100644 --- a/mappings/net/minecraft/sortme/IScoreboardObjective.mapping +++ b/mappings/net/minecraft/scoreboard/IScoreboardObjective.mapping @@ -1,4 +1,4 @@ -CLASS none/bdg net/minecraft/sortme/IScoreboardObjective +CLASS none/bdg net/minecraft/scoreboard/IScoreboardObjective CLASS none/bdg$a Type FIELD a INTEGER Lnone/bdg$a; FIELD b HEARTS Lnone/bdg$a; diff --git a/mappings/net/minecraft/sortme/ScoreboardObjective.mapping b/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping similarity index 55% rename from mappings/net/minecraft/sortme/ScoreboardObjective.mapping rename to mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping index cba4b9a112..acf945cfa6 100644 --- a/mappings/net/minecraft/sortme/ScoreboardObjective.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping @@ -1,5 +1,7 @@ -CLASS none/bde net/minecraft/sortme/ScoreboardObjective +CLASS none/bde net/minecraft/scoreboard/ScoreboardObjective + FIELD o name Ljava/lang/String; METHOD (Ljava/lang/String;)V + ARG 0 name METHOD a getName ()Ljava/lang/String; METHOD b isReadOnly ()Z METHOD c getType ()Lnone/bdg$a; diff --git a/mappings/net/minecraft/scoreboard/ScoreboardObjectiveHearts.mapping b/mappings/net/minecraft/scoreboard/ScoreboardObjectiveHearts.mapping new file mode 100644 index 0000000000..3c42d4ae43 --- /dev/null +++ b/mappings/net/minecraft/scoreboard/ScoreboardObjectiveHearts.mapping @@ -0,0 +1,3 @@ +CLASS none/bdf net/minecraft/scoreboard/ScoreboardObjectiveHearts + METHOD b isReadOnly ()Z + METHOD c getType ()Lnone/bdg$a; diff --git a/mappings/net/minecraft/scoreboard/ScoreboardObjectiveReadOnly.mapping b/mappings/net/minecraft/scoreboard/ScoreboardObjectiveReadOnly.mapping new file mode 100644 index 0000000000..462c54ba20 --- /dev/null +++ b/mappings/net/minecraft/scoreboard/ScoreboardObjectiveReadOnly.mapping @@ -0,0 +1,2 @@ +CLASS none/bdh net/minecraft/scoreboard/ScoreboardObjectiveReadOnly + METHOD b isReadOnly ()Z diff --git a/mappings/net/minecraft/sortme/ScoreboardObjectiveStat.mapping b/mappings/net/minecraft/scoreboard/ScoreboardObjectiveStat.mapping similarity index 50% rename from mappings/net/minecraft/sortme/ScoreboardObjectiveStat.mapping rename to mappings/net/minecraft/scoreboard/ScoreboardObjectiveStat.mapping index b9bb3040fe..c62527079c 100644 --- a/mappings/net/minecraft/sortme/ScoreboardObjectiveStat.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardObjectiveStat.mapping @@ -1,4 +1,4 @@ -CLASS none/bdi net/minecraft/sortme/ScoreboardObjectiveStat +CLASS none/bdi net/minecraft/scoreboard/ScoreboardObjectiveStat FIELD o stat Lnone/nu; METHOD (Lnone/nu;)V ARG 0 stat diff --git a/mappings/net/minecraft/server/ServerConfigurationManager.mapping b/mappings/net/minecraft/server/ServerConfigurationManager.mapping index 2d0c33a873..082f3f660f 100644 --- a/mappings/net/minecraft/server/ServerConfigurationManager.mapping +++ b/mappings/net/minecraft/server/ServerConfigurationManager.mapping @@ -71,6 +71,8 @@ CLASS none/mr net/minecraft/server/ServerConfigurationManager ARG 0 value METHOD b removeFromOperators (Lcom/mojang/authlib/GameProfile;)V ARG 0 profile + METHOD b getPlayersByIp (Ljava/lang/String;)Ljava/util/List; + ARG 0 ipAddress METHOD b savePlayerData (Lnone/lw;)V ARG 0 entityPlayerServer METHOD b sendPermissionLevel (Lnone/lw;I)V @@ -85,7 +87,8 @@ CLASS none/mr net/minecraft/server/ServerConfigurationManager METHOD e isWhitelisted (Lcom/mojang/authlib/GameProfile;)Z ARG 0 profile METHOD f getPlayerNames ()[Ljava/lang/String; - METHOD f profile (Lcom/mojang/authlib/GameProfile;)Z + METHOD f canBypassPlayerLimit (Lcom/mojang/authlib/GameProfile;)Z + ARG 0 profile METHOD g getPlayerProfiles ()[Lcom/mojang/authlib/GameProfile; METHOD h getBannedProfiles ()Lnone/mw; METHOD h isOperator (Lcom/mojang/authlib/GameProfile;)Z diff --git a/mappings/net/minecraft/server/UserCache.mapping b/mappings/net/minecraft/server/UserCache.mapping deleted file mode 100644 index 2584036e7b..0000000000 --- a/mappings/net/minecraft/server/UserCache.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/mn net/minecraft/server/UserCache diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServerConfigurationManager.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServerConfigurationManager.mapping index 8139eae572..1f7bb2366b 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedServerConfigurationManager.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedServerConfigurationManager.mapping @@ -21,7 +21,8 @@ CLASS none/le net/minecraft/server/dedicated/DedicatedServerConfigurationManager ARG 0 profile METHOD e isWhitelisted (Lcom/mojang/authlib/GameProfile;)Z ARG 0 profile - METHOD f profile (Lcom/mojang/authlib/GameProfile;)Z + METHOD f canBypassPlayerLimit (Lcom/mojang/authlib/GameProfile;)Z + ARG 0 profile METHOD w saveBannedIps ()V METHOD x saveBannedProfiles ()V METHOD y loadBannedIps ()V diff --git a/mappings/net/minecraft/sortme/CommandBlockExecutor.mapping b/mappings/net/minecraft/sortme/CommandBlockExecutor.mapping index a7a240ebe5..c16b872e36 100644 --- a/mappings/net/minecraft/sortme/CommandBlockExecutor.mapping +++ b/mappings/net/minecraft/sortme/CommandBlockExecutor.mapping @@ -13,7 +13,7 @@ CLASS none/aik net/minecraft/sortme/CommandBlockExecutor ARG 1 commandName METHOD a setCommand (Ljava/lang/String;)V ARG 0 command - METHOD a (Lnone/aal;)Z + METHOD a interact (Lnone/aal;)Z ARG 0 player METHOD a execute (Lnone/aiv;)V ARG 0 world diff --git a/mappings/net/minecraft/sortme/EnchantmentHelper.mapping b/mappings/net/minecraft/sortme/EnchantmentHelper.mapping deleted file mode 100644 index 44cca92df3..0000000000 --- a/mappings/net/minecraft/sortme/EnchantmentHelper.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/ahp net/minecraft/sortme/EnchantmentHelper diff --git a/mappings/net/minecraft/sortme/ILootTableProvider.mapping b/mappings/net/minecraft/sortme/ILootTableProvider.mapping deleted file mode 100644 index 7cb91d7535..0000000000 --- a/mappings/net/minecraft/sortme/ILootTableProvider.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/ri net/minecraft/sortme/ILootTableProvider - METHOD b getLootTable ()Lnone/kp; diff --git a/mappings/net/minecraft/sortme/ScoreboardObjectiveHearts.mapping b/mappings/net/minecraft/sortme/ScoreboardObjectiveHearts.mapping deleted file mode 100644 index b7b2b61244..0000000000 --- a/mappings/net/minecraft/sortme/ScoreboardObjectiveHearts.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/bdf net/minecraft/sortme/ScoreboardObjectiveHearts - METHOD b isReadOnly ()Z - METHOD c getType ()Lnone/bdg$a; diff --git a/mappings/net/minecraft/sortme/ScoreboardObjectiveReadOnly.mapping b/mappings/net/minecraft/sortme/ScoreboardObjectiveReadOnly.mapping deleted file mode 100644 index 53482048dc..0000000000 --- a/mappings/net/minecraft/sortme/ScoreboardObjectiveReadOnly.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/bdh net/minecraft/sortme/ScoreboardObjectiveReadOnly - METHOD b isReadOnly ()Z diff --git a/mappings/net/minecraft/sortme/ServerEntryNetworkPart.mapping b/mappings/net/minecraft/sortme/ServerEntryNetworkPart.mapping index 14b111e028..f88cdcbca6 100644 --- a/mappings/net/minecraft/sortme/ServerEntryNetworkPart.mapping +++ b/mappings/net/minecraft/sortme/ServerEntryNetworkPart.mapping @@ -2,8 +2,10 @@ CLASS none/bml net/minecraft/sortme/ServerEntryNetworkPart CLASS none/bml$1 METHOD a onConnectionLost (Lnone/fa;)V ARG 0 reason - METHOD a (Lnone/kd;)V - ARG 0 metadataPacket + METHOD a onQueryPong (Lnone/kc;)V + ARG 0 packet + METHOD a onQueryResponse (Lnone/kd;)V + ARG 0 packet CLASS none/bml$2 CLASS none/bml$2$1 METHOD channelActive channelActive (Lio/netty/channel/ChannelHandlerContext;)V diff --git a/mappings/net/minecraft/util/PacketByteBuf.mapping b/mappings/net/minecraft/util/PacketByteBuf.mapping index 839f58bfa9..297e088d04 100644 --- a/mappings/net/minecraft/util/PacketByteBuf.mapping +++ b/mappings/net/minecraft/util/PacketByteBuf.mapping @@ -1,5 +1,5 @@ CLASS none/es net/minecraft/util/PacketByteBuf - FIELD a underlying Lio/netty/buffer/ByteBuf; + FIELD a parent Lio/netty/buffer/ByteBuf; METHOD (Lio/netty/buffer/ByteBuf;)V ARG 0 underlying METHOD a readByteArray ()[B diff --git a/mappings/net/minecraft/util/UserCache.mapping b/mappings/net/minecraft/util/UserCache.mapping new file mode 100644 index 0000000000..4a21f48753 --- /dev/null +++ b/mappings/net/minecraft/util/UserCache.mapping @@ -0,0 +1,44 @@ +CLASS none/mn net/minecraft/util/UserCache + CLASS none/mn$a Entry + FIELD b profile Lcom/mojang/authlib/GameProfile; + FIELD c expirationDate Ljava/util/Date; + METHOD (Lnone/mn;Lcom/mojang/authlib/GameProfile;Ljava/util/Date;)V + ARG 0 profile + ARG 1 expirationDate + METHOD a getProfile ()Lcom/mojang/authlib/GameProfile; + METHOD b getExpirationDate ()Ljava/util/Date; + CLASS none/mn$b JsonConverter + FIELD a EXPIRATION_DATE_FORMAT Ljava/text/SimpleDateFormat; + FIELD b gson Lcom/google/gson/Gson; + FIELD c useRemote Z + FIELD d byName Ljava/util/Map; + FIELD e byUuid Ljava/util/Map; + FIELD f byAccessTime Ljava/util/Deque; + FIELD g profileRepository Lcom/mojang/authlib/GameProfileRepository; + FIELD h cacheFile Ljava/io/File; + FIELD i ENTRY_LIST_TYPE Ljava/lang/reflect/ParameterizedType; + METHOD (Lcom/mojang/authlib/GameProfileRepository;Ljava/io/File;)V + ARG 0 profileRepository + ARG 1 cacheFile + METHOD a getAllNames ()[Ljava/lang/String; + METHOD a getLastAccessedEntries (I)Ljava/util/List; + ARG 0 maximumSize + METHOD a add (Lcom/mojang/authlib/GameProfile;)V + ARG 0 profile + METHOD a add (Lcom/mojang/authlib/GameProfile;Ljava/util/Date;)V + ARG 0 profile + ARG 1 expirationDate + METHOD a findProfileByName (Lcom/mojang/authlib/GameProfileRepository;Ljava/lang/String;)Lcom/mojang/authlib/GameProfile; + ARG 0 repository + ARG 1 name + METHOD a findByName (Ljava/lang/String;)Lcom/mojang/authlib/GameProfile; + ARG 0 name + METHOD a getByUuid (Ljava/util/UUID;)Lcom/mojang/authlib/GameProfile; + ARG 0 uuid + METHOD a setUseReomte (Z)V + ARG 0 value + METHOD b load ()V + METHOD b getEntry (Ljava/util/UUID;)Lnone/mn$a; + ARG 0 uuid + METHOD c save ()V + METHOD d shouldUseRemote ()Z diff --git a/mappings/net/minecraft/sortme/WeightedSomething.mapping b/mappings/net/minecraft/util/WeightedListHelper.mapping similarity index 88% rename from mappings/net/minecraft/sortme/WeightedSomething.mapping rename to mappings/net/minecraft/util/WeightedListHelper.mapping index dffefc6a27..78bdf7f900 100644 --- a/mappings/net/minecraft/sortme/WeightedSomething.mapping +++ b/mappings/net/minecraft/util/WeightedListHelper.mapping @@ -1,4 +1,4 @@ -CLASS none/oz net/minecraft/sortme/WeightedSomething +CLASS none/oz net/minecraft/util/WeightedListHelper CLASS none/oz$a Entry FIELD a weight I METHOD (I)V diff --git a/mappings/net/minecraft/world/loot/ILootTableProvider.mapping b/mappings/net/minecraft/world/loot/ILootTableProvider.mapping new file mode 100644 index 0000000000..f4c7e127e0 --- /dev/null +++ b/mappings/net/minecraft/world/loot/ILootTableProvider.mapping @@ -0,0 +1,2 @@ +CLASS none/ri net/minecraft/world/loot/ILootTableProvider + METHOD b getLootTable ()Lnone/kp; diff --git a/mappings/none/ahq.mapping b/mappings/none/ahq.mapping index 9dfa71d8a6..39a01c13e5 100644 --- a/mappings/none/ahq.mapping +++ b/mappings/none/ahq.mapping @@ -1 +1,6 @@ CLASS none/ahq + FIELD b enchantment Lnone/ahn; + FIELD c level I + METHOD (Lnone/ahn;I)V + ARG 0 enchantment + ARG 1 level