diff --git a/mappings/net/minecraft/client/MinecraftGame.mapping b/mappings/net/minecraft/client/MinecraftGame.mapping index 3a0bd22c7b..71bc920361 100644 --- a/mappings/net/minecraft/client/MinecraftGame.mapping +++ b/mappings/net/minecraft/client/MinecraftGame.mapping @@ -129,6 +129,7 @@ CLASS none/bdq net/minecraft/client/MinecraftGame METHOD b addSnooperInitialInfo (Lnone/rk;)V ARG 0 snooper METHOD c getGameVersion ()Ljava/lang/String; + METHOD e shouldUseUnicodeFont ()Z METHOD f reloadResources ()V METHOD g getLevelStorage ()Lnone/baw; METHOD h stop ()V diff --git a/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping index 209a646851..9cbb51d299 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping @@ -16,6 +16,7 @@ CLASS none/bge net/minecraft/client/gui/menu/GuiSettingsLanguage METHOD k getContentHeight ()I FIELD a parent Lnone/bgm; FIELD g settings Lnone/bds; + FIELD h languageManager Lnone/byn; METHOD (Lnone/bgm;Lnone/bds;Lnone/byn;)V ARG 0 parent ARG 1 settings diff --git a/mappings/net/minecraft/client/render/FontRenderer.mapping b/mappings/net/minecraft/client/render/FontRenderer.mapping index 3002678bb4..405e0386de 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 k useUnicodeFont Z FIELD l rightToLeft Z FIELD m colorRed F FIELD n colorGreen F @@ -13,6 +14,7 @@ CLASS none/bee net/minecraft/client/render/FontRenderer ARG 0 settings ARG 1 fontTextureLoc ARG 2 textureManager + METHOD a usesUnicodeFont ()Z METHOD a getStringWidth (Ljava/lang/String;)I METHOD a drawString (Ljava/lang/String;FFI)I ARG 0 str @@ -32,6 +34,8 @@ CLASS none/bee net/minecraft/client/render/FontRenderer ARG 3 color METHOD a onResourceReload (Lnone/byc;)V ARG 0 container + METHOD a setUnicodeFont (Z)V + ARG 0 value METHOD b getChatColor (C)I ARG 0 chr METHOD b setRightToLeft (Z)V diff --git a/mappings/net/minecraft/client/resource/language/I18n.mapping b/mappings/net/minecraft/client/resource/language/I18n.mapping index 1cb5f9f139..79a6040c0c 100644 --- a/mappings/net/minecraft/client/resource/language/I18n.mapping +++ b/mappings/net/minecraft/client/resource/language/I18n.mapping @@ -1,9 +1,9 @@ CLASS none/byl net/minecraft/client/resource/language/I18n - FIELD a language Lnone/byo; + FIELD a storage Lnone/byo; METHOD a hasTranslation (Ljava/lang/String;)Z ARG 0 key METHOD a translate (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String; ARG 0 key ARG 1 args METHOD a setLanguage (Lnone/byo;)V - ARG 0 language + ARG 0 storage diff --git a/mappings/net/minecraft/client/resource/language/LanguageManager.mapping b/mappings/net/minecraft/client/resource/language/LanguageManager.mapping index 8f2e49c2d4..75f505555c 100644 --- a/mappings/net/minecraft/client/resource/language/LanguageManager.mapping +++ b/mappings/net/minecraft/client/resource/language/LanguageManager.mapping @@ -7,6 +7,7 @@ CLASS none/byn net/minecraft/client/resource/language/LanguageManager METHOD (Lnone/byt;Ljava/lang/String;)V ARG 0 metadataDeserializer ARG 1 languageId + METHOD a prefersUnicodeFont ()Z METHOD a reloadResources (Ljava/util/List;)V ARG 0 packs METHOD a onResourceReload (Lnone/byc;)V diff --git a/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping b/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping index 0179e06ede..66af0da07e 100644 --- a/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping +++ b/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping @@ -1,6 +1,8 @@ CLASS none/byo net/minecraft/client/resource/language/TranslationStorage FIELD a translations Ljava/util/Map; FIELD b EQUALS_SPLITTER Lcom/google/common/base/Splitter; + FIELD d preferUnicodeFont Z + METHOD a prefersUnicodeFont ()Z METHOD a loadTranslations (Ljava/io/InputStream;)V ARG 0 input METHOD a hasTranslation (Ljava/lang/String;)Z @@ -13,5 +15,6 @@ CLASS none/byo net/minecraft/client/resource/language/TranslationStorage METHOD a load (Lnone/byc;Ljava/util/List;)V ARG 0 container ARG 1 languages + METHOD b updateUnicodeFontPreference ()V METHOD b getTranslation (Ljava/lang/String;)Ljava/lang/String; ARG 0 key diff --git a/mappings/net/miencraft/client/server/CommandManagerIntegratedServer.mapping b/mappings/net/minecraft/client/server/CommandManagerIntegratedServer.mapping similarity index 50% rename from mappings/net/miencraft/client/server/CommandManagerIntegratedServer.mapping rename to mappings/net/minecraft/client/server/CommandManagerIntegratedServer.mapping index f9ceab3c49..9d1bc20581 100644 --- a/mappings/net/miencraft/client/server/CommandManagerIntegratedServer.mapping +++ b/mappings/net/minecraft/client/server/CommandManagerIntegratedServer.mapping @@ -1,3 +1,3 @@ -CLASS none/cam net/miencraft/client/server/CommandManagerIntegratedServer +CLASS none/cam net/minecraft/client/server/CommandManagerIntegratedServer METHOD (Lnone/cal;)V ARG 0 integratedServer diff --git a/mappings/net/minecraft/client/world/WorldClient.mapping b/mappings/net/minecraft/client/world/WorldClient.mapping index 10e14b940f..1f80382728 100644 --- a/mappings/net/minecraft/client/world/WorldClient.mapping +++ b/mappings/net/minecraft/client/world/WorldClient.mapping @@ -31,6 +31,8 @@ CLASS none/bmg net/minecraft/client/world/WorldClient METHOD b onSpawnEntity (Lnone/sf;)V ARG 0 entity METHOD c getGameInstance (Lnone/bmg;)Lnone/bdq; + METHOD c onDespawnEntity (Lnone/sf;)V + ARG 0 entity METHOD d update ()V METHOD n createChunkProvider ()Lnone/atj; METHOD t updateWeather ()V diff --git a/mappings/net/minecraft/entity/sortme/IMob.mapping b/mappings/net/minecraft/entity/sortme/IMob.mapping index 11bedab31d..b17dcffcd0 100644 --- a/mappings/net/minecraft/entity/sortme/IMob.mapping +++ b/mappings/net/minecraft/entity/sortme/IMob.mapping @@ -1 +1,3 @@ CLASS none/zj net/minecraft/entity/sortme/IMob + FIELD d MOBS Lcom/google/common/base/Predicate; + FIELD e VISIBLE_MOBS Lcom/google/common/base/Predicate; diff --git a/mappings/net/minecraft/entity/sortme/IProjectile.mapping b/mappings/net/minecraft/entity/sortme/IProjectile.mapping new file mode 100644 index 0000000000..dfed2be3bc --- /dev/null +++ b/mappings/net/minecraft/entity/sortme/IProjectile.mapping @@ -0,0 +1 @@ +CLASS none/aau net/minecraft/entity/sortme/IProjectile diff --git a/mappings/net/minecraft/util/UserCache.mapping b/mappings/net/minecraft/util/UserCache.mapping index 4a21f48753..9b4d5ef058 100644 --- a/mappings/net/minecraft/util/UserCache.mapping +++ b/mappings/net/minecraft/util/UserCache.mapping @@ -35,7 +35,7 @@ CLASS none/mn net/minecraft/util/UserCache ARG 0 name METHOD a getByUuid (Ljava/util/UUID;)Lcom/mojang/authlib/GameProfile; ARG 0 uuid - METHOD a setUseReomte (Z)V + METHOD a setUseRemote (Z)V ARG 0 value METHOD b load ()V METHOD b getEntry (Ljava/util/UUID;)Lnone/mn$a; diff --git a/mappings/net/minecraft/world/GameMode.mapping b/mappings/net/minecraft/world/GameMode.mapping index cfceb387b0..62a9e73dc5 100644 --- a/mappings/net/minecraft/world/GameMode.mapping +++ b/mappings/net/minecraft/world/GameMode.mapping @@ -7,6 +7,10 @@ CLASS none/ait net/minecraft/world/GameMode FIELD f id I FIELD g name Ljava/lang/String; FIELD h prefix Ljava/lang/String; + METHOD (Ljava/lang/String;IILjava/lang/String;Ljava/lang/String;)V + ARG 0 id + ARG 1 name + ARG 2 prefix METHOD a getId ()I METHOD a byId (I)Lnone/ait; ARG 0 id @@ -21,6 +25,6 @@ CLASS none/ait net/minecraft/world/GameMode METHOD a setAbilitites (Lnone/aaj;)V ARG 0 abilities METHOD b getName ()Ljava/lang/String; - METHOD c isAdventureOrSpectator ()Z + METHOD c shouldLimitWorldModification ()Z METHOD d isCreative ()Z - METHOD e isSurvivalOrAdventure ()Z + METHOD e isSurvivalLike ()Z diff --git a/mappings/net/minecraft/world/IWorldListener.mapping b/mappings/net/minecraft/world/IWorldListener.mapping index 9e30597d76..27dbb4eb5f 100644 --- a/mappings/net/minecraft/world/IWorldListener.mapping +++ b/mappings/net/minecraft/world/IWorldListener.mapping @@ -17,3 +17,5 @@ CLASS none/aix net/minecraft/world/IWorldListener ARG 0 entityId ARG 1 pos ARG 2 progress + METHOD b onDespawnEntity (Lnone/sf;)V + ARG 0 entity diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index d8a543f64b..5ed4acdb23 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -3,8 +3,10 @@ CLASS none/aiv net/minecraft/world/World FIELD C profiler Lnone/os; FIELD E isRemote Z FIELD L calendar Ljava/util/Calendar; + FIELD M tickingBlockEntities Z FIELD N border Lnone/atf; FIELD a seaLevel I + FIELD b pendingBlockEntities Ljava/util/List; FIELD c droppedBlockEntities Ljava/util/List; FIELD e entities Ljava/util/List; FIELD f droppedEntities Ljava/util/List; @@ -23,7 +25,7 @@ CLASS none/aiv net/minecraft/world/World ARG 2 provider ARG 3 profiler ARG 4 remote - METHOD A ()Lnone/ajm; + METHOD A getBiomeProvider ()Lnone/ajm; METHOD A setSpawnPos (Lnone/cn;)V ARG 0 pos METHOD D getLocalDifficulty (Lnone/cn;)Lnone/qz; @@ -31,6 +33,7 @@ CLASS none/aiv net/minecraft/world/World METHOD E isInvalidHeight (Lnone/cn;)Z ARG 0 pos METHOD G getChunkProviderStatus ()Ljava/lang/String; + METHOD J getEntitiesToRender ()Ljava/util/List; METHOD K getSeaLevel ()I METHOD L getWorldGenerator ()Lnone/aja; METHOD N checkSessionLock ()V @@ -83,7 +86,7 @@ CLASS none/aiv net/minecraft/world/World ARG 3 category ARG 4 volume ARG 5 pitch - METHOD a registerWorldListener (Lnone/aix;)V + METHOD a registerListener (Lnone/aix;)V ARG 0 listener METHOD a init (Lnone/aiy;)V ARG 0 info @@ -150,7 +153,7 @@ CLASS none/aiv net/minecraft/world/World ARG 0 blockEntities METHOD b getPlayerByUuid (Ljava/util/UUID;)Lnone/aal; ARG 0 uuid - METHOD b unregisterWorldListener (Lnone/aix;)V + METHOD b unregisterListener (Lnone/aix;)V ARG 0 listener METHOD b dropBlockEntity (Lnone/ard;)V ARG 0 blockEntity @@ -158,6 +161,9 @@ CLASS none/aiv net/minecraft/world/World ARG 0 area METHOD b getBiome (Lnone/cn;)Lnone/aji; ARG 0 pos + METHOD b markDirty (Lnone/cn;Lnone/ard;)V + ARG 0 pos + ARG 1 entity METHOD b isEmittingRedstonePower (Lnone/cn;Lnone/cu;)Z ARG 0 pos ARG 1 facingFrom @@ -174,6 +180,8 @@ CLASS none/aiv net/minecraft/world/World METHOD c getEmittedRedstonePower (Lnone/cn;Lnone/cu;)I ARG 0 pos ARG 1 facingFrom + METHOD c onDespawnEntity (Lnone/sf;)V + ARG 0 entity METHOD d update ()V METHOD d isSpawnChunk (II)Z ARG 0 chunkX @@ -188,6 +196,7 @@ CLASS none/aiv net/minecraft/world/World METHOD f (Lnone/sf;)V METHOD g setBlockToAir (Lnone/cn;)Z ARG 0 pos + METHOD h setDefaultSpawnClient ()V METHOD k updateEntities ()V METHOD n createChunkProvider ()Lnone/atj; METHOD o getBlockState (Lnone/cn;)Lnone/asl; diff --git a/mappings/net/minecraft/world/WorldListenerServer.mapping b/mappings/net/minecraft/world/WorldListenerServer.mapping index bf6ed8f461..6a2ea766f8 100644 --- a/mappings/net/minecraft/world/WorldListenerServer.mapping +++ b/mappings/net/minecraft/world/WorldListenerServer.mapping @@ -19,3 +19,5 @@ CLASS none/lv net/minecraft/world/WorldListenerServer ARG 0 entityId ARG 1 pos ARG 2 progress + METHOD b onDespawnEntity (Lnone/sf;)V + ARG 0 entity diff --git a/mappings/net/minecraft/world/WorldServer.mapping b/mappings/net/minecraft/world/WorldServer.mapping index 1a40382c1d..9e0749ce48 100644 --- a/mappings/net/minecraft/world/WorldServer.mapping +++ b/mappings/net/minecraft/world/WorldServer.mapping @@ -37,8 +37,11 @@ CLASS none/lu net/minecraft/world/WorldServer METHOD b ()Lnone/aiv; METHOD b onSpawnEntity (Lnone/sf;)V ARG 0 entity + METHOD c onDespawnEntity (Lnone/sf;)V + ARG 0 entity METHOD d update ()V METHOD e updateSleepingStatus ()V + METHOD h setDefaultSpawnClient ()V METHOD k updateEntities ()V METHOD n createChunkProvider ()Lnone/atj; METHOD q flushChunks ()V diff --git a/mappings/net/minecraft/world/WorldServerDemo.mapping b/mappings/net/minecraft/world/WorldServerDemo.mapping index 0f7a0ef1e8..2822c42d11 100644 --- a/mappings/net/minecraft/world/WorldServerDemo.mapping +++ b/mappings/net/minecraft/world/WorldServerDemo.mapping @@ -1,2 +1,3 @@ CLASS none/lo net/minecraft/world/WorldServerDemo FIELD I SEED J + FIELD a LEVEL_INFO Lnone/aiy; diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index fa39f10b86..b71631ce62 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -13,6 +13,7 @@ CLASS none/ato net/minecraft/world/chunk/Chunk FIELD o entities [Lnone/od; FIELD p terrainPopulated Z FIELD q lightPopulated Z + FIELD s dirty Z FIELD w inhabitedTime J METHOD (Lnone/aiv;II)V ARG 0 world @@ -56,6 +57,9 @@ CLASS none/ato net/minecraft/world/chunk/Chunk ARG 0 buffer METHOD a addEntity (Lnone/sf;)V ARG 0 entity + METHOD a removeEntity (Lnone/sf;I)V + ARG 0 entity + ARG 1 chunkY METHOD a setBiomeMap ([B)V ARG 0 biomeMap METHOD a setHeightMap ([I)V @@ -67,6 +71,8 @@ CLASS none/ato net/minecraft/world/chunk/Chunk ARG 1 z METHOD b (Lnone/cn;)I ARG 0 pos + METHOD b removeEntity (Lnone/sf;)V + ARG 0 entity METHOD b update (Z)V METHOD c addEntities ()V METHOD c setInhabitedTime (J)V @@ -78,11 +84,14 @@ CLASS none/ato net/minecraft/world/chunk/Chunk ARG 0 pos METHOD d setTerrainPopulated (Z)V ARG 0 terrainPopulated + METHOD e markDirty ()V METHOD e getHeightFromBlockPos (Lnone/cn;)I ARG 0 pos METHOD e setLightPopulated (Z)V ARG 0 lightPopulated METHOD f isEmpty ()Z + METHOD f setDirty (Z)V + ARG 0 dirty METHOD g getLevelOfTopSection ()I METHOD h getSections ()[Lnone/atp; METHOD k getPos ()Lnone/aio; @@ -94,4 +103,5 @@ CLASS none/ato net/minecraft/world/chunk/Chunk METHOD t getEntitySets ()[Lnone/od; METHOD u isTerrainPopulated ()Z METHOD v isLightPopulated ()Z + METHOD x getInhabitedTime ()J METHOD y getTopSection ()Lnone/atp; diff --git a/mappings/net/minecraft/world/chunk/ChunkEntitySet.mapping b/mappings/net/minecraft/world/chunk/ChunkEntitySet.mapping index b0661f4916..0b54f4a767 100644 --- a/mappings/net/minecraft/world/chunk/ChunkEntitySet.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkEntitySet.mapping @@ -1,2 +1,19 @@ CLASS none/od net/minecraft/world/chunk/ChunkEntitySet + FIELD a foundEntityClasses Ljava/util/Set; FIELD b entityByClassMap Ljava/util/Map; + FIELD c entityClassTypes Ljava/util/Set; + FIELD d baseClass Ljava/lang/Class; + FIELD e baseList Ljava/util/List; + METHOD (Ljava/lang/Class;)V + ARG 0 baseClass + METHOD a addType (Ljava/lang/Class;)V + ARG 0 objectClass + METHOD a add (Ljava/lang/Object;Ljava/lang/Class;)V + ARG 0 object + ARG 1 entityClass + METHOD add (Ljava/lang/Object;)Z + ARG 0 object + METHOD b getNearestType (Ljava/lang/Class;)Ljava/lang/Class; + ARG 0 objectClass + METHOD c ofType (Ljava/lang/Class;)Ljava/lang/Iterable; + ARG 0 entityClass diff --git a/mappings/net/minecraft/world/chunk/EmptyChunk.mapping b/mappings/net/minecraft/world/chunk/EmptyChunk.mapping index 72115a7588..b7dbff6f21 100644 --- a/mappings/net/minecraft/world/chunk/EmptyChunk.mapping +++ b/mappings/net/minecraft/world/chunk/EmptyChunk.mapping @@ -19,13 +19,19 @@ CLASS none/atl net/minecraft/world/chunk/EmptyChunk ARG 0 pos METHOD a addEntity (Lnone/sf;)V ARG 0 entity + METHOD a removeEntity (Lnone/sf;I)V + ARG 0 entity + ARG 1 chunkY METHOD b getHeightAt (II)I ARG 0 x ARG 1 z METHOD b (Lnone/cn;)I ARG 0 pos + METHOD b removeEntity (Lnone/sf;)V + ARG 0 entity METHOD c addEntities ()V METHOD d dropEntities ()V METHOD d invalidateBlockEntityAt (Lnone/cn;)V ARG 0 pos + METHOD e markDirty ()V METHOD f isEmpty ()Z diff --git a/mappings/net/minecraft/world/chunk/generator/impl/ChunkGeneratorDebug.mapping b/mappings/net/minecraft/world/chunk/generator/impl/ChunkGeneratorDebug.mapping index d62563baea..3f42c4b123 100644 --- a/mappings/net/minecraft/world/chunk/generator/impl/ChunkGeneratorDebug.mapping +++ b/mappings/net/minecraft/world/chunk/generator/impl/ChunkGeneratorDebug.mapping @@ -1,7 +1,10 @@ CLASS none/auq net/minecraft/world/chunk/generator/impl/ChunkGeneratorDebug FIELD a AIR Lnone/asl; FIELD b BARRIER Lnone/asl; + FIELD c BLOCK_STATES Ljava/util/List; FIELD f world Lnone/aiv; + METHOD (Lnone/aiv;)V + ARG 0 world METHOD a generateChunk (II)Lnone/ato; ARG 0 x ARG 1 y @@ -11,3 +14,6 @@ CLASS none/auq net/minecraft/world/chunk/generator/impl/ChunkGeneratorDebug METHOD a getSpawnableEntites (Lnone/sq;Lnone/cn;)Ljava/util/List; METHOD b (Lnone/ato;II)V ARG 0 chunk + METHOD c getBlockState (II)Lnone/asl; + ARG 0 x + ARG 1 z diff --git a/mappings/net/minecraft/world/provider/WorldProvider.mapping b/mappings/net/minecraft/world/provider/WorldProvider.mapping index e93b4f742f..d8f7c6443e 100644 --- a/mappings/net/minecraft/world/provider/WorldProvider.mapping +++ b/mappings/net/minecraft/world/provider/WorldProvider.mapping @@ -12,6 +12,7 @@ CLASS none/aue net/minecraft/world/provider/WorldProvider METHOD b getFogColor (FF)Lnone/bcu; METHOD c getChunkGenerator ()Lnone/ati; METHOD d hasClouds ()Z + METHOD k getBiomeProvider ()Lnone/ajm; METHOD m ()Z METHOD n getLightValues ()[F METHOD o createWorldBorderHandler ()Lnone/atf; diff --git a/mappings/none/bpa.mapping b/mappings/none/bpa.mapping index 7f0ad0dc9b..1f498c7dda 100644 --- a/mappings/none/bpa.mapping +++ b/mappings/none/bpa.mapping @@ -30,5 +30,7 @@ CLASS none/bpa ARG 0 entityId ARG 1 pos ARG 2 progress + METHOD b onDespawnEntity (Lnone/sf;)V + ARG 0 entity METHOD c renderCloudsFancy (FI)V METHOD p loadDestroyStageTextures ()V diff --git a/mappings/none/vw.mapping b/mappings/none/vw.mapping index e453238c48..cd873e21a2 100644 --- a/mappings/none/vw.mapping +++ b/mappings/none/vw.mapping @@ -17,3 +17,5 @@ CLASS none/vw ARG 0 entityId ARG 1 pos ARG 2 progress + METHOD b onDespawnEntity (Lnone/sf;)V + ARG 0 entity