diff --git a/mappings/net/minecraft/client/MinecraftGame.mapping b/mappings/net/minecraft/client/MinecraftGame.mapping index 6fc1b3dee9..949c313748 100644 --- a/mappings/net/minecraft/client/MinecraftGame.mapping +++ b/mappings/net/minecraft/client/MinecraftGame.mapping @@ -56,9 +56,12 @@ CLASS none/bdr net/minecraft/client/MinecraftGame FIELD aP thread Ljava/lang/Thread; FIELD aQ bakedModelManager Lnone/bzq; FIELD aR blockRenderManager Lnone/bpp; + FIELD aS lastFpsUpdate J + FIELD aT fpsCounter I FIELD a isSystemMac Z FIELD aa entityRenderManager Lnone/btd; FIELD ab itemRenderer Lnone/btr; + FIELD ac firstPersonRenderer Lnone/box; FIELD ad cameraEntity Lnone/sg; FIELD ae session Lnone/bdy; FIELD aj server Lnone/cam; @@ -76,6 +79,7 @@ CLASS none/bdr net/minecraft/client/MinecraftGame FIELD d width I FIELD e height I FIELD f world Lnone/bmh; + FIELD g renderer Lnone/bpb; FIELD h player Lnone/boh; FIELD k fontRenderer Lnone/bef; FIELD l fontRendererSGA Lnone/bef; @@ -118,6 +122,9 @@ CLASS none/bdr net/minecraft/client/MinecraftGame ARG 0 runnable METHOD a checkGlError (Ljava/lang/String;)V ARG 0 title + METHOD a (Ljava/lang/String;Ljava/lang/String;Lnone/aiz;)V + ARG 0 levelId + ARG 1 levelName METHOD a serializeBlockEntityTag (Lnone/aes;Lnone/are;)Lnone/aes; ARG 0 stack ARG 1 blockEntity @@ -169,6 +176,8 @@ CLASS none/bdr net/minecraft/client/MinecraftGame METHOD f reloadResources ()V METHOD g getLevelStorage ()Lnone/bax; METHOD h stop ()V + METHOD i updateDisplay ()V + METHOD j checkResize ()V METHOD k getMaxFps ()I METHOD l limitFramerate ()Z METHOD n stopThread ()V diff --git a/mappings/net/minecraft/client/render/chunk/ChunkRenderer.mapping b/mappings/net/minecraft/client/render/chunk/ChunkRenderer.mapping index 2bc542c551..0946194184 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkRenderer.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkRenderer.mapping @@ -1,4 +1,5 @@ CLASS none/brs net/minecraft/client/render/chunk/ChunkRenderer + FIELD a chunkUpdateCount I FIELD b chunkRenderData Lnone/brp; FIELD c boundingBox Lnone/bcs; FIELD d world Lnone/aiw; diff --git a/mappings/net/minecraft/client/util/MinecraftProgressBarException.mapping b/mappings/net/minecraft/client/util/MinecraftProgressBarException.mapping new file mode 100644 index 0000000000..fe1a8206b3 --- /dev/null +++ b/mappings/net/minecraft/client/util/MinecraftProgressBarException.mapping @@ -0,0 +1 @@ +CLASS none/bdw net/minecraft/client/util/MinecraftProgressBarException diff --git a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping index bc0f223062..53447c65dd 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping @@ -29,6 +29,9 @@ CLASS none/lw net/minecraft/entity/player/EntityPlayerServer METHOD a hasPermission (ILjava/lang/String;)Z ARG 0 permissionLevel ARG 1 commandName + METHOD a sendResourcePackInfo (Ljava/lang/String;Ljava/lang/String;)V + ARG 0 url + ARG 1 hash METHOD a shouldDamagePlayer (Lnone/aam;)Z ARG 0 target METHOD a onContainerPropertyUpdate (Lnone/abx;II)V diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 8c8306281a..ec63d707b9 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -5,7 +5,7 @@ CLASS none/aes net/minecraft/item/ItemStack FIELD d updateCooldown I FIELD e item Lnone/aeq; FIELD f tag Lnone/dt; - FIELD g isInvalid Z + FIELD g invalid Z FIELD h metadata I FIELD i holdingItemFrame Lnone/yp; FIELD j lastCheckedCanHarvestBlock Lnone/aky; @@ -37,7 +37,7 @@ CLASS none/aes net/minecraft/item/ItemStack METHOD C toTextComponent ()Lnone/fa; METHOD D getUpdateCooldown ()I METHOD E getAmount ()I - METHOD F updateIsInvalid ()V + METHOD F updateInvalidFlag ()V METHOD a getTranslationKey ()Ljava/lang/String; METHOD a split (I)Lnone/aes; ARG 0 amount diff --git a/mappings/net/minecraft/server/IntegratedServer.mapping b/mappings/net/minecraft/server/IntegratedServer.mapping index a3f66c19fb..4ec77afe19 100644 --- a/mappings/net/minecraft/server/IntegratedServer.mapping +++ b/mappings/net/minecraft/server/IntegratedServer.mapping @@ -8,7 +8,8 @@ CLASS none/cam net/minecraft/server/IntegratedServer FIELD m levelInfo Lnone/aiz; METHOD (Lnone/bdr;Ljava/lang/String;Ljava/lang/String;Lnone/aiz;Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnone/mn;)V ARG 0 game - ARG 1 levelName + ARG 1 levelId + ARG 2 levelName ARG 3 levelInfo METHOD A getRunDirectory ()Ljava/io/File; METHOD C doServerTick ()V diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 52890bc5fd..deb478566f 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -23,9 +23,12 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer FIELD G worldHeight I FIELD H playerIdleTimeout I FIELD I keyPair Ljava/security/KeyPair; - FIELD K levelName Ljava/lang/String; + FIELD K levelId Ljava/lang/String; + FIELD L levelName Ljava/lang/String; FIELD M demo Z FIELD N bonusChest Z + FIELD O resourcePackUrl Ljava/lang/String; + FIELD P resourcePackHash Ljava/lang/String; FIELD S currentTaskName Ljava/lang/String; FIELD U forceGameMode Z FIELD V authService Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService; @@ -42,6 +45,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer FIELD e proxy Ljava/net/Proxy; FIELD f currentOperation Ljava/lang/String; FIELD g currentOperationPercent I + FIELD h lastTickLengths [J FIELD j jobs Ljava/util/Queue; FIELD k LOGGER Lorg/apache/logging/log4j/Logger; FIELD l levelStorage Lnone/bax; @@ -84,10 +88,13 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD P getServerPort ()I METHOD Q getUserName ()Ljava/lang/String; METHOD R isSinglePlayer ()Z - METHOD S getLevelName ()Ljava/lang/String; + METHOD S getLevelId ()Ljava/lang/String; + METHOD T getLevelName ()Ljava/lang/String; METHOD U isMonsterSpawningEnabled ()Z METHOD V isDemo ()Z METHOD W getLevelStorage ()Lnone/bax; + METHOD X getResourcePackUrl ()Ljava/lang/String; + METHOD Y getResourcePackHash ()Ljava/lang/String; METHOD Z isSnooperEnabled ()Z METHOD a getWorld (I)Lnone/lu; ARG 0 worldId @@ -155,6 +162,8 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer ARG 0 message ARG 1 percentage METHOD a_ setResourcePack (Ljava/lang/String;Ljava/lang/String;)V + ARG 0 url + ARG 1 hash METHOD aa isDedicated ()Z METHOD ab isOnlineMode ()Z METHOD ac shouldPreventProxyConnections ()Z @@ -228,16 +237,18 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer ARG 0 value METHOD i_ getNameComponent ()Lnone/fa; METHOD j ()Z - METHOD j setLevelName (Ljava/lang/String;)V + METHOD j setLevelId (Ljava/lang/String;)V ARG 0 value METHOD j setForceGameMode (Z)V ARG 0 value METHOD k getCurrentTaskName ()Ljava/lang/String; + METHOD k setLevelName (Ljava/lang/String;)V + ARG 0 value METHOD l generateTerrain ()V METHOD l setMotd (Ljava/lang/String;)V ARG 0 value METHOD m shouldGenerateStructures ()Z - METHOD main ([Ljava/lang/String;)V + METHOD main main ([Ljava/lang/String;)V ARG 0 args METHOD n getGameMode ()Lnone/aiu; METHOD o getDifficulty ()Lnone/qz; diff --git a/mappings/net/minecraft/server/dedicated/IDedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/IDedicatedServer.mapping index 4e39af7138..ebb50e2454 100644 --- a/mappings/net/minecraft/server/dedicated/IDedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/IDedicatedServer.mapping @@ -4,7 +4,7 @@ CLASS none/la net/minecraft/server/dedicated/IDedicatedServer METHOD I getMaxPlayerCount ()I METHOD J getPlayerNames ()[Ljava/lang/String; METHOD L isDebuggingEnabled ()Z - METHOD S getLevelName ()Ljava/lang/String; + METHOD S getLevelId ()Ljava/lang/String; METHOD a saveProperties ()V METHOD a getInt (Ljava/lang/String;I)I ARG 0 key diff --git a/mappings/net/minecraft/server/gui/StatComponent.mapping b/mappings/net/minecraft/server/gui/StatComponent.mapping index cd235dd6b0..0461f12ada 100644 --- a/mappings/net/minecraft/server/gui/StatComponent.mapping +++ b/mappings/net/minecraft/server/gui/StatComponent.mapping @@ -1,5 +1,11 @@ CLASS none/lk net/minecraft/server/gui/StatComponent + CLASS none/lk$1 + METHOD actionPerformed actionPerformed (Ljava/awt/event/ActionEvent;)V + ARG 0 event FIELD d text [Ljava/lang/String; FIELD e server Lnet/minecraft/server/MinecraftServer; METHOD (Lnet/minecraft/server/MinecraftServer;)V ARG 0 server + METHOD a updateStats ()V + METHOD paint paint (Ljava/awt/Graphics;)V + ARG 0 graphics diff --git a/mappings/net/minecraft/text/event/ClickEvent.mapping b/mappings/net/minecraft/text/event/ClickEvent.mapping index f04cc4be74..d918dcbd01 100644 --- a/mappings/net/minecraft/text/event/ClickEvent.mapping +++ b/mappings/net/minecraft/text/event/ClickEvent.mapping @@ -8,6 +8,7 @@ CLASS none/ez net/minecraft/text/event/ClickEvent FIELD f ACTIONS Ljava/util/Map; FIELD h name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;Z)V + ARG 0 name METHOD a get (Ljava/lang/String;)Lnone/ez$a; ARG 0 name METHOD b getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/entity/WorldEntityTrackingManager.mapping b/mappings/net/minecraft/world/entity/WorldEntityTrackingManager.mapping index ab07ddd077..1b7e12fa59 100644 --- a/mappings/net/minecraft/world/entity/WorldEntityTrackingManager.mapping +++ b/mappings/net/minecraft/world/entity/WorldEntityTrackingManager.mapping @@ -7,6 +7,7 @@ CLASS none/lr net/minecraft/world/entity/WorldEntityTrackingManager FIELD d trackersById Lnone/om; METHOD (Lnone/lu;)V ARG 0 world + METHOD a ()V METHOD a setChunkDistance (I)V ARG 0 value METHOD a sendChunkEntityData (Lnone/lw;Lnone/atp;)V