From 9e8dc23783c4e598b563603dc184e0d1aaf9df34 Mon Sep 17 00:00:00 2001 From: Runemoro Date: Wed, 9 Jan 2019 17:05:18 +0100 Subject: [PATCH] Lots of mappings (#381) --- mappings/aeq.mapping | 6 -- mappings/aer.mapping | 6 -- mappings/aes.mapping | 6 -- mappings/aey.mapping | 2 + mappings/ajq.mapping | 3 + mappings/alr.mapping | 2 + .../minecraft/client/MinecraftClient.mapping | 4 ++ .../net/minecraft/client/gui/Drawable.mapping | 8 +-- .../minecraft/client/gui/hud/DebugHud.mapping | 4 ++ .../client/render/GameRenderer.mapping | 1 + .../client/render/WorldRenderer.mapping | 1 + .../client/world/ClientWorld.mapping | 3 +- .../entity/player/ChunkTicket.mapping | 6 -- .../entity/player/ChunkTicketType.mapping | 1 + mappings/net/minecraft/fluid/Fluids.mapping | 1 + .../network/OffThreadException.mapping | 2 + .../minecraft/server/MinecraftServer.mapping | 1 + .../server/command/RconCommandOutput.mapping | 10 ---- .../server/dedicated/DedicatedServer.mapping | 2 +- .../MinecraftDedicatedServer.mapping | 3 +- ...d.mapping => PendingServerCommand.mapping} | 5 +- .../dedicated/ServerCommandOutput.mapping | 11 ++++ .../dedicated/gui/DedicatedServerGui.mapping | 7 +++ .../dedicated/gui/PlayerStatsGui.mapping | 2 + .../server/world/ChunkTicket.mapping | 13 +++++ .../server/world/ChunkTicketManager.mapping | 43 ++++++++++++++ .../server/world/ServerChunkManager.mapping | 12 ++-- .../world/ServerChunkManagerEntry.mapping | 11 ++-- .../server/world/ServerWorld.mapping | 5 ++ .../net/minecraft/server/world/uk.mapping | 18 ------ .../sortme/PalettedContainer.mapping | 18 ------ .../net/minecraft/util/MetricsData.mapping | 2 + .../minecraft/util/PackedIntegerArray.mapping | 23 ++++++++ mappings/net/minecraft/util/Profiler.mapping | 6 -- .../net/minecraft/util/ProfilerSystem.mapping | 10 ---- .../net/minecraft/util/SystemUtil.mapping | 1 + .../minecraft/util/crash/CrashReport.mapping | 13 +++-- ...ent.mapping => CrashReportSection.mapping} | 6 +- .../NorthWestCoordinateTransformer.mapping} | 2 +- .../util/palette/ArrayPalette.mapping | 21 +++++++ .../util/palette/BiMapPalette.mapping | 25 +++++++++ .../util/palette/IdListPalette.mapping | 15 +++++ .../minecraft/util/palette/Palette.mapping | 12 ++++ .../util/palette/PaletteResizeHandler.mapping | 4 ++ .../util/palette/PalettedContainer.mapping | 56 +++++++++++++++++++ .../util/profiler/DisableableProfiler.mapping | 13 +++++ .../util/profiler/DummyProfiler.mapping | 10 ++++ .../util/profiler/EmptyProfileResult.mapping | 9 +++ .../util/profiler/ProfileResult.mapping | 10 ++++ .../util/profiler/ProfileResultImpl.mapping | 28 ++++++++++ .../minecraft/util/profiler/Profiler.mapping | 8 +++ .../util/profiler/ProfilerSystem.mapping | 14 +++++ .../util/profiler/ProfilerTiming.mapping | 7 +++ .../util/profiler/ReadableProfiler.mapping | 7 +++ .../world/ChunkSaveHandlerImpl.mapping | 4 +- .../ClientPersistentStateManager.mapping} | 2 +- .../minecraft/world/LocalDifficulty.mapping | 3 + .../world/ModifiableTestableWorld.mapping | 1 + .../world/PersistentStateContainer.mapping | 2 +- .../world/PersistentStateManager.mapping | 2 +- .../net/minecraft/world/PortalForcer.mapping | 8 +++ .../minecraft/world/TestableWorld.mapping} | 2 +- .../net/minecraft/world/ViewableWorld.mapping | 15 +++-- mappings/net/minecraft/world/World.mapping | 32 +++++++++-- .../net/minecraft/world/chunk/Chunk.mapping | 2 +- .../world/chunk/ChunkManager.mapping | 8 +-- .../world/chunk/ChunkNibbleArray.mapping | 6 ++ .../world/chunk/ChunkProvider.mapping | 2 +- .../world/chunk/ChunkSection.mapping | 3 +- .../minecraft/world/chunk/ChunkStatus.mapping | 4 +- .../minecraft/world/chunk/EmptyChunk.mapping | 1 + .../minecraft/world/chunk/ProtoChunk.mapping | 10 +++- .../minecraft/world/chunk/WorldChunk.mapping | 6 ++ .../world/dimension/Dimension.mapping | 2 + .../DimensionalPersistentStateManager.mapping | 2 +- .../gen/feature/AbstractTreeFeature.mapping | 41 ++++++++++++++ .../gen/feature/BirchTreeFeature.mapping | 10 ++++ .../gen/feature/DarkOakTreeFeature.mapping | 5 ++ .../feature/JungleGroundBushFeature.mapping | 11 ++++ .../gen/feature/LargeOakTreeFeature.mapping | 5 ++ .../gen/feature/MegaJungleTreeFeature.mapping | 5 ++ .../gen/feature/MegaPineTreeFeature.mapping | 1 + .../world/gen/feature/OakTreeFeature.mapping | 5 ++ .../world/gen/feature/PineTreeFeature.mapping | 5 ++ .../gen/feature/SavannaTreeFeature.mapping | 5 ++ .../gen/feature/SpruceTreeFeature.mapping | 5 ++ .../gen/feature/SwampTreeFeature.mapping | 5 ++ .../level/storage/AlphaChunkDataArray.mapping | 11 ++++ .../world/level/storage/AlphaChunkIo.mapping | 8 +++ mappings/ud.mapping | 1 + mappings/ug.mapping | 1 + mappings/yi.mapping | 4 -- 92 files changed, 620 insertions(+), 144 deletions(-) delete mode 100644 mappings/aeq.mapping delete mode 100644 mappings/aer.mapping delete mode 100644 mappings/aes.mapping create mode 100644 mappings/aey.mapping create mode 100644 mappings/alr.mapping delete mode 100644 mappings/net/minecraft/entity/player/ChunkTicket.mapping create mode 100644 mappings/net/minecraft/network/OffThreadException.mapping delete mode 100644 mappings/net/minecraft/server/command/RconCommandOutput.mapping rename mappings/net/minecraft/server/dedicated/{UnparsedCommand.mapping => PendingServerCommand.mapping} (57%) create mode 100644 mappings/net/minecraft/server/dedicated/ServerCommandOutput.mapping create mode 100644 mappings/net/minecraft/server/world/ChunkTicket.mapping create mode 100644 mappings/net/minecraft/server/world/ChunkTicketManager.mapping delete mode 100644 mappings/net/minecraft/server/world/uk.mapping delete mode 100644 mappings/net/minecraft/sortme/PalettedContainer.mapping create mode 100644 mappings/net/minecraft/util/PackedIntegerArray.mapping delete mode 100644 mappings/net/minecraft/util/Profiler.mapping delete mode 100644 mappings/net/minecraft/util/ProfilerSystem.mapping rename mappings/net/minecraft/util/crash/{CrashReportElement.mapping => CrashReportSection.mapping} (86%) rename mappings/{cha.mapping => net/minecraft/util/math/NorthWestCoordinateTransformer.mapping} (52%) create mode 100644 mappings/net/minecraft/util/palette/ArrayPalette.mapping create mode 100644 mappings/net/minecraft/util/palette/BiMapPalette.mapping create mode 100644 mappings/net/minecraft/util/palette/IdListPalette.mapping create mode 100644 mappings/net/minecraft/util/palette/Palette.mapping create mode 100644 mappings/net/minecraft/util/palette/PaletteResizeHandler.mapping create mode 100644 mappings/net/minecraft/util/palette/PalettedContainer.mapping create mode 100644 mappings/net/minecraft/util/profiler/DisableableProfiler.mapping create mode 100644 mappings/net/minecraft/util/profiler/DummyProfiler.mapping create mode 100644 mappings/net/minecraft/util/profiler/EmptyProfileResult.mapping create mode 100644 mappings/net/minecraft/util/profiler/ProfileResult.mapping create mode 100644 mappings/net/minecraft/util/profiler/ProfileResultImpl.mapping create mode 100644 mappings/net/minecraft/util/profiler/Profiler.mapping create mode 100644 mappings/net/minecraft/util/profiler/ProfilerSystem.mapping create mode 100644 mappings/net/minecraft/util/profiler/ProfilerTiming.mapping create mode 100644 mappings/net/minecraft/util/profiler/ReadableProfiler.mapping rename mappings/{cip.mapping => net/minecraft/world/ClientPersistentStateManager.mapping} (53%) create mode 100644 mappings/net/minecraft/world/ModifiableTestableWorld.mapping create mode 100644 mappings/net/minecraft/world/PortalForcer.mapping rename mappings/{bbw.mapping => net/minecraft/world/TestableWorld.mapping} (71%) create mode 100644 mappings/net/minecraft/world/level/storage/AlphaChunkDataArray.mapping create mode 100644 mappings/net/minecraft/world/level/storage/AlphaChunkIo.mapping delete mode 100644 mappings/yi.mapping diff --git a/mappings/aeq.mapping b/mappings/aeq.mapping deleted file mode 100644 index 5c3d0c4e56..0000000000 --- a/mappings/aeq.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS aeq - METHOD a begin (Ljava/lang/String;)V - METHOD a begin (Ljava/util/function/Supplier;)V - METHOD b endBegin (Ljava/lang/String;)V - METHOD b endBegin (Ljava/util/function/Supplier;)V - METHOD c end ()V diff --git a/mappings/aer.mapping b/mappings/aer.mapping deleted file mode 100644 index 0c2bbf4bca..0000000000 --- a/mappings/aer.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS aer - METHOD a begin (Ljava/lang/String;)V - METHOD a begin (Ljava/util/function/Supplier;)V - METHOD b endBegin (Ljava/lang/String;)V - METHOD b endBegin (Ljava/util/function/Supplier;)V - METHOD c end ()V diff --git a/mappings/aes.mapping b/mappings/aes.mapping deleted file mode 100644 index b155a7fc97..0000000000 --- a/mappings/aes.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS aes - METHOD a begin (Ljava/lang/String;)V - METHOD a begin (Ljava/util/function/Supplier;)V - METHOD b endBegin (Ljava/lang/String;)V - METHOD b endBegin (Ljava/util/function/Supplier;)V - METHOD c end ()V diff --git a/mappings/aey.mapping b/mappings/aey.mapping new file mode 100644 index 0000000000..c3cfe50309 --- /dev/null +++ b/mappings/aey.mapping @@ -0,0 +1,2 @@ +CLASS aey + FIELD b LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/ajq.mapping b/mappings/ajq.mapping index 9432f1b11d..1724701660 100644 --- a/mappings/ajq.mapping +++ b/mappings/ajq.mapping @@ -1,4 +1,7 @@ CLASS ajq + FIELD b x D + FIELD c y D + FIELD d z D METHOD a canStart ()Z METHOD b shouldContinue ()Z METHOD c start ()V diff --git a/mappings/alr.mapping b/mappings/alr.mapping new file mode 100644 index 0000000000..6be662f54a --- /dev/null +++ b/mappings/alr.mapping @@ -0,0 +1,2 @@ +CLASS alr + METHOD a tick ()V diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 39c88e916f..9c86cadfbf 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -35,6 +35,7 @@ CLASS cpk net/minecraft/client/MinecraftClient FIELD aN fpsCounter I FIELD aO tutorialManager Ldrd; FIELD aP isWindowFocused Z + FIELD aQ openProfilerSection Ljava/lang/String; FIELD a isSystemMac Z FIELD ab server Ldqk; FIELD ac creativeHotbarStorage Lcph; @@ -105,6 +106,8 @@ CLASS cpk net/minecraft/client/MinecraftClient METHOD Y getCurrentFps ()I METHOD Z getMetricsData ()Lyo; METHOD a onResolutionChanged ()V + METHOD a handleProfilerKeyPress (I)V + ARG 1 digit METHOD a addSnooperInfo (Lafy;)V METHOD a setCameraEntity (Lagv;)V ARG 1 entity @@ -149,6 +152,7 @@ CLASS cpk net/minecraft/client/MinecraftClient METHOD av getFramerateLimit ()I METHOD aw isFramerateLimited ()Z METHOD ay isMainThread ()Z + METHOD az drawProfilerResults ()V METHOD b start ()V METHOD b populateCrashReport (Lb;)Lb; ARG 1 report diff --git a/mappings/net/minecraft/client/gui/Drawable.mapping b/mappings/net/minecraft/client/gui/Drawable.mapping index 65797063cf..2f17c66bbe 100644 --- a/mappings/net/minecraft/client/gui/Drawable.mapping +++ b/mappings/net/minecraft/client/gui/Drawable.mapping @@ -18,10 +18,10 @@ CLASS cqa net/minecraft/client/gui/Drawable ARG 3 top ARG 4 color METHOD a drawRect (IIIII)V - ARG 0 top - ARG 1 left - ARG 2 bottom - ARG 3 right + ARG 0 left + ARG 1 top + ARG 2 right + ARG 3 bottom ARG 4 color METHOD a drawGradientRect (IIIIII)V ARG 1 top diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index 6b06ce69f3..bf6de444e5 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -15,6 +15,10 @@ CLASS cql net/minecraft/client/gui/hud/DebugHud ARG 3 dt METHOD a propertyToString (Ljava/util/Map$Entry;)Ljava/lang/String; ARG 1 propEntry + METHOD a drawMetricsData (Lyo;IIZ)V + ARG 2 startY + ARG 3 firstSample + ARG 4 isClient METHOD b draw ()V METHOD c drawLeftText ()V METHOD d drawRightText ()V diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index 4471dfc0f0..d15e9cb7d6 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -16,6 +16,7 @@ CLASS dea net/minecraft/client/render/GameRenderer METHOD d (F)F ARG 1 delta METHOD e tick ()V + METHOD f getShader ()Ldej; METHOD h disableLightmap ()V METHOD i enableLightmap ()V METHOD l getGame ()Lcpk; diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 02b489ead7..a2f9d5421e 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -210,6 +210,7 @@ CLASS dee net/minecraft/client/render/WorldRenderer ARG 12 velocityY ARG 14 velocityZ METHOD c drawFramebuffer ()V + METHOD f getChunksDebugString ()Ljava/lang/String; METHOD g getChunkNumber ()I METHOD h getEntitiesDebugString ()Ljava/lang/String; METHOD k tick ()V diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index 015d0fbfde..a5b84ccea6 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -32,7 +32,7 @@ CLASS dbi net/minecraft/client/world/ClientWorld ARG 4 y ARG 6 z METHOD a playSoundFromEntity (Larb;Lagv;Lxm;Lxo;FF)V - METHOD a toCrashReportElement (Lb;)Lc; + METHOD a addDetailsToCrashReport (Lb;)Lc; METHOD a playSoundClient (Let;Lxm;Lxo;FFZ)V ARG 1 pos ARG 2 sound @@ -49,5 +49,6 @@ CLASS dbi net/minecraft/client/world/ClientWorld ARG 1 xCenter ARG 2 yCenter METHOD c onEntityRemoved (Lagv;)V + METHOD e removeEntity (Lagv;)V METHOD j getChunkProvider ()Ldbd; METHOD t updateWeather ()V diff --git a/mappings/net/minecraft/entity/player/ChunkTicket.mapping b/mappings/net/minecraft/entity/player/ChunkTicket.mapping deleted file mode 100644 index e4a478631d..0000000000 --- a/mappings/net/minecraft/entity/player/ChunkTicket.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS uv net/minecraft/entity/player/ChunkTicket - FIELD a type Luw; - FIELD c argument Ljava/lang/Object; - FIELD d location J - METHOD a compareTo (Luv;)I - METHOD c getLocation ()J diff --git a/mappings/net/minecraft/entity/player/ChunkTicketType.mapping b/mappings/net/minecraft/entity/player/ChunkTicketType.mapping index f06e8dbe86..5ffed3804f 100644 --- a/mappings/net/minecraft/entity/player/ChunkTicketType.mapping +++ b/mappings/net/minecraft/entity/player/ChunkTicketType.mapping @@ -1,5 +1,6 @@ CLASS uw net/minecraft/entity/player/ChunkTicketType FIELD a START Luw; + FIELD b DRAGON Luw; FIELD c PLAYER Luw; FIELD d FORCED Luw; FIELD e UNKNOWN Luw; diff --git a/mappings/net/minecraft/fluid/Fluids.mapping b/mappings/net/minecraft/fluid/Fluids.mapping index 93866b2027..820470479a 100644 --- a/mappings/net/minecraft/fluid/Fluids.mapping +++ b/mappings/net/minecraft/fluid/Fluids.mapping @@ -1,4 +1,5 @@ CLASS cff net/minecraft/fluid/Fluids + FIELD a EMPTY Lcfc; FIELD b FLOWING_WATER Lcfb; FIELD c WATER Lcfb; FIELD d FLOWING_LAVA Lcfb; diff --git a/mappings/net/minecraft/network/OffThreadException.mapping b/mappings/net/minecraft/network/OffThreadException.mapping new file mode 100644 index 0000000000..6abf128dd9 --- /dev/null +++ b/mappings/net/minecraft/network/OffThreadException.mapping @@ -0,0 +1,2 @@ +CLASS qn net/minecraft/network/OffThreadException + FIELD a INSTANCE Lqn; diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index fde6952296..a8d896308b 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -117,6 +117,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD aP getLootManager ()Lcja; METHOD aQ getGameRules ()Lbbl; METHOD aT getTickTime ()F + METHOD aU getMetricsData ()Lyo; METHOD aV getProfiler ()Laeq; METHOD aY shouldKeepTicking ()Z METHOD aa areCommandBlocksEnabled ()Z diff --git a/mappings/net/minecraft/server/command/RconCommandOutput.mapping b/mappings/net/minecraft/server/command/RconCommandOutput.mapping deleted file mode 100644 index 38219a46e9..0000000000 --- a/mappings/net/minecraft/server/command/RconCommandOutput.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS xf net/minecraft/server/command/RconCommandOutput - FIELD a commandFeedback Ljava/lang/StringBuffer; - FIELD b server Lnet/minecraft/server/MinecraftServer; - METHOD K_ shouldBroadcastConsoleToOps ()Z - METHOD a sendCommandFeedback ()Z - METHOD a appendCommandFeedback (Ljd;)V - METHOD b shouldTrackOutput ()Z - METHOD d clearCommandFeedback ()V - METHOD e getCommandFeedback ()Ljava/lang/String; - METHOD f getSource ()Lca; diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping index 6558670934..f2eaf5c099 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping @@ -6,7 +6,7 @@ CLASS qq net/minecraft/server/dedicated/DedicatedServer METHOD K getLevelName ()Ljava/lang/String; METHOD a_ executeRconCommand (Ljava/lang/String;)Ljava/lang/String; METHOD d info (Ljava/lang/String;)V - METHOD d_ getServerProperties ()Lts; + METHOD d_ getProperties ()Lts; METHOD e getPort ()I METHOD e warn (Ljava/lang/String;)V METHOD e_ getHostname ()Ljava/lang/String; diff --git a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping index 6c76c679cd..88c977389b 100644 --- a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping @@ -30,9 +30,10 @@ CLASS tr net/minecraft/server/dedicated/MinecraftDedicatedServer METHOD ba getConfigurationManager ()Ltq; METHOD bb createGui ()V METHOD bd getMaxTickTime ()J + METHOD bg sleepFiveSeconds ()V METHOD c setPlayerIdleTimeout (I)V METHOD d setupServer ()Z - METHOD d_ getServerProperties ()Lts; + METHOD d_ getProperties ()Lts; METHOD e getPort ()I METHOD e_ getHostname ()Ljava/lang/String; METHOD f shouldGenerateStructures ()Z diff --git a/mappings/net/minecraft/server/dedicated/UnparsedCommand.mapping b/mappings/net/minecraft/server/dedicated/PendingServerCommand.mapping similarity index 57% rename from mappings/net/minecraft/server/dedicated/UnparsedCommand.mapping rename to mappings/net/minecraft/server/dedicated/PendingServerCommand.mapping index e88008de8a..d2032f9b14 100644 --- a/mappings/net/minecraft/server/dedicated/UnparsedCommand.mapping +++ b/mappings/net/minecraft/server/dedicated/PendingServerCommand.mapping @@ -1,6 +1,7 @@ -CLASS qh net/minecraft/server/dedicated/UnparsedCommand +CLASS qh net/minecraft/server/dedicated/PendingServerCommand FIELD a command Ljava/lang/String; - FIELD b commandSource Lca; + FIELD b source Lca; METHOD (Ljava/lang/String;Lca;)V ARG 1 command ARG 2 commandSource + diff --git a/mappings/net/minecraft/server/dedicated/ServerCommandOutput.mapping b/mappings/net/minecraft/server/dedicated/ServerCommandOutput.mapping new file mode 100644 index 0000000000..314a4f27b9 --- /dev/null +++ b/mappings/net/minecraft/server/dedicated/ServerCommandOutput.mapping @@ -0,0 +1,11 @@ +CLASS xf net/minecraft/server/dedicated/ServerCommandOutput + FIELD a buffer Ljava/lang/StringBuffer; + FIELD b server Lnet/minecraft/server/MinecraftServer; + METHOD (Lnet/minecraft/server/MinecraftServer;)V + ARG 1 server + METHOD K_ shouldBroadcastConsoleToOps ()Z + METHOD a sendCommandFeedback ()Z + METHOD a appendCommandFeedback (Ljd;)V + METHOD b shouldTrackOutput ()Z + METHOD d clear ()V + METHOD e asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/server/dedicated/gui/DedicatedServerGui.mapping b/mappings/net/minecraft/server/dedicated/gui/DedicatedServerGui.mapping index 4a48f011a9..a21b63b9dc 100644 --- a/mappings/net/minecraft/server/dedicated/gui/DedicatedServerGui.mapping +++ b/mappings/net/minecraft/server/dedicated/gui/DedicatedServerGui.mapping @@ -3,10 +3,17 @@ CLASS tx net/minecraft/server/dedicated/gui/DedicatedServerGui FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c server Ltr; FIELD d consoleUpdateThread Ljava/lang/Thread; + FIELD e stopTasks Ljava/util/Collection; + FIELD f stopped Ljava/util/concurrent/atomic/AtomicBoolean; METHOD a start ()V + METHOD a addStopTask (Ljava/lang/Runnable;)V + ARG 1 task METHOD a appendToConsole (Ljavax/swing/JTextArea;Ljavax/swing/JScrollPane;Ljava/lang/String;)V ARG 1 textArea ARG 2 scrollPane METHOD a create (Ltr;)Ltx; + METHOD b stop ()V METHOD c createStatsPanel ()Ljavax/swing/JComponent; METHOD d createPlaysPanel ()Ljavax/swing/JComponent; + METHOD e createLogPanel ()Ljavax/swing/JComponent; + METHOD f runStopTasks ()V diff --git a/mappings/net/minecraft/server/dedicated/gui/PlayerStatsGui.mapping b/mappings/net/minecraft/server/dedicated/gui/PlayerStatsGui.mapping index 1ec91f0827..e8c9c0f13c 100644 --- a/mappings/net/minecraft/server/dedicated/gui/PlayerStatsGui.mapping +++ b/mappings/net/minecraft/server/dedicated/gui/PlayerStatsGui.mapping @@ -4,5 +4,7 @@ CLASS tz net/minecraft/server/dedicated/gui/PlayerStatsGui FIELD c memoryusePctPos I FIELD d lines [Ljava/lang/String; FIELD e server Lnet/minecraft/server/MinecraftServer; + FIELD f timer Ljavax/swing/Timer; + METHOD a stop ()V METHOD a average ([J)D METHOD b update ()V diff --git a/mappings/net/minecraft/server/world/ChunkTicket.mapping b/mappings/net/minecraft/server/world/ChunkTicket.mapping new file mode 100644 index 0000000000..cba28a2ea7 --- /dev/null +++ b/mappings/net/minecraft/server/world/ChunkTicket.mapping @@ -0,0 +1,13 @@ +CLASS uv net/minecraft/server/world/ChunkTicket + FIELD a type Luw; + FIELD b level I + FIELD c argument Ljava/lang/Object; + FIELD d location J + METHOD (Luw;ILjava/lang/Object;J)V + ARG 1 type + ARG 2 level + ARG 3 argument + ARG 4 location + METHOD a compareTo (Luv;)I + METHOD b getLevel ()I + METHOD c getLocation ()J diff --git a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping new file mode 100644 index 0000000000..69818d8221 --- /dev/null +++ b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping @@ -0,0 +1,43 @@ +CLASS uk net/minecraft/server/world/ChunkTicketManager + CLASS uk$a + FIELD a currentLevels Lit/unimi/dsi/fastutil/longs/Long2ByteMap; + METHOD a updateLevels ()V + METHOD a setLevelFor (JI)V + ARG 1 index + ARG 3 level + METHOD e getCurrentLevelFor (J)I + ARG 1 index + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD c positionToTicketSet Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap; + FIELD f location J + METHOD a setLevelFor (JI)V + ARG 1 index + ARG 3 level + METHOD a (JILuc;I)Luc; + ARG 1 index + ARG 3 level + METHOD a addTicket (JLuv;)V + ARG 1 position + ARG 3 ticket + METHOD a setChunkForced (Lbbd;Z)V + ARG 2 forced + METHOD a getLevel (Lit/unimi/dsi/fastutil/objects/ObjectSortedSet;)I + ARG 1 ticketSet + METHOD a update (Lud;)Z + METHOD a addTicketAtLevel (Luw;Lbbd;ILjava/lang/Object;)V + ARG 1 type + ARG 2 pos + ARG 3 level + ARG 4 argument + METHOD b addTicket (Luw;Lbbd;ILjava/lang/Object;)V + ARG 1 type + ARG 2 pos + ARG 4 argument + METHOD c removeTicket (Luw;Lbbd;ILjava/lang/Object;)V + ARG 1 type + ARG 2 pos + ARG 4 argument + METHOD e getCurrentLevelFor (J)I + ARG 1 index + METHOD i getTicketSet (J)Lit/unimi/dsi/fastutil/objects/ObjectSortedSet; + ARG 1 position diff --git a/mappings/net/minecraft/server/world/ServerChunkManager.mapping b/mappings/net/minecraft/server/world/ServerChunkManager.mapping index 65da20a460..bd42ba0351 100644 --- a/mappings/net/minecraft/server/world/ServerChunkManager.mapping +++ b/mappings/net/minecraft/server/world/ServerChunkManager.mapping @@ -1,5 +1,8 @@ CLASS up net/minecraft/server/world/ServerChunkManager - FIELD c chunkStatuses Ljava/util/List; + FIELD a FULL_CHUNK_LEVEL I + FIELD b CHUNKS_ELIGIBLE_FOR_SPAWNING I + FIELD c CHUNK_STATUSES Ljava/util/List; + FIELD d ticketManager Luk; FIELD e chunkGenerator Lbrb; FIELD f world Lbbp; FIELD g serverThread Ljava/lang/Thread; @@ -39,21 +42,21 @@ CLASS up net/minecraft/server/world/ServerChunkManager METHOD b getProgressString ()Ljava/lang/String; METHOD b applyViewDistance (I)V ARG 1 viewDistance - METHOD b get (II)Lbbb; + METHOD b getChunk (II)Lbbb; ARG 1 chunkX ARG 2 chunkZ METHOD b getChunkSyncIfServerThread (IILbrf;Z)Ljava/util/concurrent/CompletableFuture; ARG 1 chunkX ARG 2 chunkZ ARG 3 status - ARG 4 require + ARG 4 create METHOD b getSqDistance (Lbbd;Lagv;)D METHOD b removePlayer (Lus;)V METHOD c getChunkAsync (IILbrf;Z)Ljava/util/concurrent/CompletableFuture; ARG 1 chunkX ARG 2 chunkZ ARG 3 status - ARG 4 require + ARG 4 create METHOD c updateChunkWatchingForPlayer (Lus;)V ARG 1 playerEntity METHOD d getWorld ()Lbbp; @@ -64,4 +67,5 @@ CLASS up net/minecraft/server/world/ServerChunkManager METHOD i getLightingProvider ()Lceu; METHOD j getWorldAsView ()Lbbb; METHOD k getRemainingWatchDistance ()I + METHOD l update ()Z METHOD m doMobSpawning ()V diff --git a/mappings/net/minecraft/server/world/ServerChunkManagerEntry.mapping b/mappings/net/minecraft/server/world/ServerChunkManagerEntry.mapping index dff52bcaf5..98fdff515d 100644 --- a/mappings/net/minecraft/server/world/ServerChunkManagerEntry.mapping +++ b/mappings/net/minecraft/server/world/ServerChunkManagerEntry.mapping @@ -13,19 +13,22 @@ CLASS uc net/minecraft/server/world/ServerChunkManagerEntry FIELD o blockUpdatePositions [S FIELD p blockUpdateCount I FIELD u lightingProvider Lceu; + METHOD (Lbbd;ILceu;Luc$c;Luc$d;)V + ARG 2 level METHOD a setLevel (I)V ARG 1 level METHOD a markForUpdate (III)V METHOD a sendBlockEntityUpdatePacket (Lbbp;Let;)V - METHOD a (Lbrf;)Ljava/util/concurrent/CompletableFuture; + METHOD a getChunkForStatus (Lbrf;)Ljava/util/concurrent/CompletableFuture; ARG 1 status METHOD a flushUpdates (Lbrm;)V METHOD a updateChunk (Ljava/util/concurrent/CompletableFuture;)V METHOD a sendPacket (Ljr;Z)V - METHOD b getStatusByIndex (I)Lbrf; - ARG 0 index + METHOD b getStatusByLevel (I)Lbrf; + ARG 0 level METHOD b getChunkMinimumStatus (Lbrf;)Ljava/util/concurrent/CompletableFuture; - ARG 1 minimumStatus + ARG 1 status METHOD c getChunk ()Lbrm; METHOD f getChunkFuture ()Ljava/util/concurrent/CompletableFuture; METHOD h getPos ()Lbbd; + METHOD i getLevel ()I diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index a42f9d67ae..61ad2bb60a 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -2,10 +2,13 @@ CLASS uq net/minecraft/server/world/ServerWorld FIELD C server Lnet/minecraft/server/MinecraftServer; FIELD D entityTracker Lul; FIELD E entitiesByUuid Ljava/util/Map; + FIELD H portalForcer Lbcc; FIELD I blockTickScheduler Lbce; FIELD J fluidTickScheduler Lbce; FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b savingDisabled Z + METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lcii;Lciq;Lcih;Lbsg;Laeu;)V + ARG 1 server METHOD A getRecipeManager ()Layx; METHOD B getTagManager ()Lyg; METHOD C isSavingDisabled ()Z @@ -48,6 +51,7 @@ CLASS uq net/minecraft/server/world/ServerWorld METHOD l setDefaultSpawnClient ()V METHOD l_ getScoreboard ()Lqr; METHOD m_ updateEntities ()V + METHOD n_ tickPlayers ()V METHOD p tickScheduledTicks ()V METHOD r getForcedSpawnPoint ()Let; METHOD s getChunkManager ()Lup; @@ -56,3 +60,4 @@ CLASS uq net/minecraft/server/world/ServerWorld METHOD v getFluidTickScheduler ()Lbce; METHOD w getServer ()Lnet/minecraft/server/MinecraftServer; METHOD x getEntityTracker ()Lul; + METHOD y getPortalForcer ()Lbcc; diff --git a/mappings/net/minecraft/server/world/uk.mapping b/mappings/net/minecraft/server/world/uk.mapping deleted file mode 100644 index ed61a46497..0000000000 --- a/mappings/net/minecraft/server/world/uk.mapping +++ /dev/null @@ -1,18 +0,0 @@ -CLASS uk net/minecraft/server/world/uk - CLASS uk$a - FIELD a currentLevels Lit/unimi/dsi/fastutil/longs/Long2ByteMap; - METHOD a updateLevels ()V - METHOD a setLevelFor (JI)V - ARG 1 index - ARG 3 level - METHOD e getCurrentLevelFor (J)I - ARG 1 index - FIELD a LOGGER Lorg/apache/logging/log4j/Logger; - METHOD a setLevelFor (JI)V - ARG 1 index - ARG 3 level - METHOD a (JILuc;I)Luc; - ARG 1 index - ARG 3 level - METHOD e getCurrentLevelFor (J)I - ARG 1 index diff --git a/mappings/net/minecraft/sortme/PalettedContainer.mapping b/mappings/net/minecraft/sortme/PalettedContainer.mapping deleted file mode 100644 index db72c46e69..0000000000 --- a/mappings/net/minecraft/sortme/PalettedContainer.mapping +++ /dev/null @@ -1,18 +0,0 @@ -CLASS brt net/minecraft/sortme/PalettedContainer - FIELD j writeLock Ljava/util/concurrent/locks/ReentrantLock; - METHOD a lock ()V - METHOD a get (I)Ljava/lang/Object; - METHOD a get (III)Ljava/lang/Object; - ARG 1 x - ARG 2 y - METHOD a read (Lhy;[J)V - ARG 1 paletteTag - ARG 2 blockStates - METHOD a fromPacket (Lit;)V - METHOD b unlock ()V - METHOD b toIndex (III)I - ARG 0 x - ARG 1 y - ARG 2 z - METHOD b toPacket (Lit;)V - METHOD c getPacketSize ()I diff --git a/mappings/net/minecraft/util/MetricsData.mapping b/mappings/net/minecraft/util/MetricsData.mapping index 4bd76b0ce0..962607909b 100644 --- a/mappings/net/minecraft/util/MetricsData.mapping +++ b/mappings/net/minecraft/util/MetricsData.mapping @@ -5,4 +5,6 @@ CLASS yo net/minecraft/util/MetricsData METHOD a pushSample (J)V ARG 1 time METHOD b getCurrentIndex ()I + METHOD b wrapIndex (I)I + ARG 1 index METHOD c getSamples ()[J diff --git a/mappings/net/minecraft/util/PackedIntegerArray.mapping b/mappings/net/minecraft/util/PackedIntegerArray.mapping new file mode 100644 index 0000000000..fdfa6548ae --- /dev/null +++ b/mappings/net/minecraft/util/PackedIntegerArray.mapping @@ -0,0 +1,23 @@ +CLASS yi net/minecraft/util/PackedIntegerArray + FIELD a storage [J + FIELD b elementBits I + FIELD c maxValue J + FIELD d size I + METHOD (II)V + ARG 1 elementBits + ARG 2 size + METHOD (II[J)V + ARG 1 elementBits + ARG 2 size + ARG 3 storage + METHOD a getStorage ()[J + METHOD a get (I)I + ARG 1 index + METHOD a setAndGetOldValue (II)I + ARG 1 index + ARG 2 value + METHOD b getSize ()I + METHOD b set (II)V + ARG 1 index + ARG 2 value + METHOD c getElementBits ()I diff --git a/mappings/net/minecraft/util/Profiler.mapping b/mappings/net/minecraft/util/Profiler.mapping deleted file mode 100644 index 06a0f28e79..0000000000 --- a/mappings/net/minecraft/util/Profiler.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS aeu net/minecraft/util/Profiler - METHOD a begin (Ljava/lang/String;)V - METHOD a begin (Ljava/util/function/Supplier;)V - METHOD b endBegin (Ljava/lang/String;)V - METHOD b endBegin (Ljava/util/function/Supplier;)V - METHOD c end ()V diff --git a/mappings/net/minecraft/util/ProfilerSystem.mapping b/mappings/net/minecraft/util/ProfilerSystem.mapping deleted file mode 100644 index b9c55cf8c5..0000000000 --- a/mappings/net/minecraft/util/ProfilerSystem.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS aen net/minecraft/util/ProfilerSystem - FIELD b LOGGER Lorg/apache/logging/log4j/Logger; - FIELD c nameList Ljava/util/List; - FIELD d timeList Ljava/util/List; - FIELD i location Ljava/lang/String; - METHOD a begin (Ljava/lang/String;)V - METHOD a begin (Ljava/util/function/Supplier;)V - METHOD b endBegin (Ljava/lang/String;)V - METHOD b endBegin (Ljava/util/function/Supplier;)V - METHOD c end ()V diff --git a/mappings/net/minecraft/util/SystemUtil.mapping b/mappings/net/minecraft/util/SystemUtil.mapping index aace7bb6bf..f4017b3825 100644 --- a/mappings/net/minecraft/util/SystemUtil.mapping +++ b/mappings/net/minecraft/util/SystemUtil.mapping @@ -19,6 +19,7 @@ CLASS m net/minecraft/util/SystemUtil FIELD a NANO_TIME_SUPPLIER Ljava/util/function/LongSupplier; FIELD b LOGGER Lorg/apache/logging/log4j/Logger; METHOD a toMap ()Ljava/util/stream/Collector; + METHOD a getValueAsString (Lbqp;Ljava/lang/Object;)Ljava/lang/String; METHOD a consume (Ljava/lang/Object;Ljava/util/function/Consumer;)Ljava/lang/Object; METHOD a createTranslationKey (Ljava/lang/String;Lqc;)Ljava/lang/String; ARG 0 type diff --git a/mappings/net/minecraft/util/crash/CrashReport.mapping b/mappings/net/minecraft/util/crash/CrashReport.mapping index 65df388c28..2d8b124bff 100644 --- a/mappings/net/minecraft/util/crash/CrashReport.mapping +++ b/mappings/net/minecraft/util/crash/CrashReport.mapping @@ -2,11 +2,11 @@ CLASS b net/minecraft/util/crash/CrashReport FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b message Ljava/lang/String; FIELD c cause Ljava/lang/Throwable; - FIELD d element Lc; - FIELD e elementList Ljava/util/List; + FIELD d systemDetailsSection Lc; + FIELD e otherSections Ljava/util/List; FIELD f file Ljava/io/File; FIELD g hasStackTrace Z - FIELD h stacktrace [Ljava/lang/StackTraceElement; + FIELD h stackTrace [Ljava/lang/StackTraceElement; METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V ARG 1 message METHOD a getMessage ()Ljava/lang/String; @@ -19,8 +19,9 @@ CLASS b net/minecraft/util/crash/CrashReport ARG 0 cause ARG 1 title METHOD b getCause ()Ljava/lang/Throwable; - METHOD d printThrowable ()Ljava/lang/String; - METHOD e create ()Ljava/lang/String; + METHOD d getCauseAsString ()Ljava/lang/String; + METHOD e asString ()Ljava/lang/String; METHOD f getFile ()Ljava/io/File; - METHOD g getElement ()Lc; + METHOD g getSystemDetailsSection ()Lc; + METHOD h fillSystemDetails ()V METHOD i generateWittyComment ()Ljava/lang/String; diff --git a/mappings/net/minecraft/util/crash/CrashReportElement.mapping b/mappings/net/minecraft/util/crash/CrashReportSection.mapping similarity index 86% rename from mappings/net/minecraft/util/crash/CrashReportElement.mapping rename to mappings/net/minecraft/util/crash/CrashReportSection.mapping index cd27b7115c..764d6dc7dd 100644 --- a/mappings/net/minecraft/util/crash/CrashReportElement.mapping +++ b/mappings/net/minecraft/util/crash/CrashReportSection.mapping @@ -1,4 +1,4 @@ -CLASS c net/minecraft/util/crash/CrashReportElement +CLASS c net/minecraft/util/crash/CrashReportSection CLASS c$a Element FIELD a name Ljava/lang/String; FIELD b detail Ljava/lang/String; @@ -11,6 +11,10 @@ CLASS c net/minecraft/util/crash/CrashReportElement METHOD (Lb;Ljava/lang/String;)V ARG 1 report METHOD a getStackTrace ()[Ljava/lang/StackTraceElement; + METHOD a createPositionString (DDD)Ljava/lang/String; + ARG 0 x + ARG 2 y + ARG 4 z METHOD a createPositionString (III)Ljava/lang/String; ARG 0 x ARG 1 y diff --git a/mappings/cha.mapping b/mappings/net/minecraft/util/math/NorthWestCoordinateTransformer.mapping similarity index 52% rename from mappings/cha.mapping rename to mappings/net/minecraft/util/math/NorthWestCoordinateTransformer.mapping index 0f5c1b707c..0b1eba14ce 100644 --- a/mappings/cha.mapping +++ b/mappings/net/minecraft/util/math/NorthWestCoordinateTransformer.mapping @@ -1,4 +1,4 @@ -CLASS cha +CLASS cha net/minecraft/util/math/NorthWestCoordinateTransformer METHOD a transformX (I)I ARG 1 x METHOD b transformY (I)I diff --git a/mappings/net/minecraft/util/palette/ArrayPalette.mapping b/mappings/net/minecraft/util/palette/ArrayPalette.mapping new file mode 100644 index 0000000000..0730e88778 --- /dev/null +++ b/mappings/net/minecraft/util/palette/ArrayPalette.mapping @@ -0,0 +1,21 @@ +CLASS brp net/minecraft/util/palette/ArrayPalette + FIELD a idList Lfc; + FIELD c resizeListener Lbrs; + FIELD d valueDeserializer Ljava/util/function/Function; + FIELD e indexBits I + FIELD f size I + METHOD (Lfc;ILbrs;Ljava/util/function/Function;)V + ARG 2 integer + ARG 3 resizeListener + ARG 4 valueDeserializer + METHOD a getPacketSize ()I + METHOD a getByIndex (I)Ljava/lang/Object; + ARG 1 index + METHOD a fromTag (Lhy;)V + ARG 1 tag + METHOD a fromPacket (Lit;)V + ARG 1 buf + METHOD a getIndex (Ljava/lang/Object;)I + ARG 1 object + METHOD b toPacket (Lit;)V + ARG 1 buf diff --git a/mappings/net/minecraft/util/palette/BiMapPalette.mapping b/mappings/net/minecraft/util/palette/BiMapPalette.mapping new file mode 100644 index 0000000000..b6dd632a20 --- /dev/null +++ b/mappings/net/minecraft/util/palette/BiMapPalette.mapping @@ -0,0 +1,25 @@ +CLASS brk net/minecraft/util/palette/BiMapPalette + FIELD a idList Lfc; + FIELD b map Lyl; + FIELD c resizeHandler Lbrs; + FIELD d elementDeserializer Ljava/util/function/Function; + FIELD e elementSerializer Ljava/util/function/Function; + FIELD f indexBits I + METHOD (Lfc;ILbrs;Ljava/util/function/Function;Ljava/util/function/Function;)V + ARG 2 indexBits + ARG 3 resizeHandler + ARG 4 elementDeserializer + ARG 5 elementSerializer + METHOD a getPacketSize ()I + METHOD a getByIndex (I)Ljava/lang/Object; + ARG 1 index + METHOD a fromTag (Lhy;)V + ARG 1 tag + METHOD a fromPacket (Lit;)V + ARG 1 buf + METHOD a getIndex (Ljava/lang/Object;)I + METHOD b getIndexBits ()I + METHOD b toTag (Lhy;)V + ARG 1 tag + METHOD b toPacket (Lit;)V + ARG 1 buf diff --git a/mappings/net/minecraft/util/palette/IdListPalette.mapping b/mappings/net/minecraft/util/palette/IdListPalette.mapping new file mode 100644 index 0000000000..28744b84cd --- /dev/null +++ b/mappings/net/minecraft/util/palette/IdListPalette.mapping @@ -0,0 +1,15 @@ +CLASS brj net/minecraft/util/palette/IdListPalette + FIELD a idList Lfc; + METHOD (Lfc;Ljava/lang/Object;)V + ARG 1 idList + ARG 2 defaultValue + METHOD a getPacketSize ()I + METHOD a getByIndex (I)Ljava/lang/Object; + ARG 1 index + METHOD a fromTag (Lhy;)V + ARG 1 tag + METHOD a fromPacket (Lit;)V + ARG 1 buf + METHOD a getIndex (Ljava/lang/Object;)I + METHOD b toPacket (Lit;)V + ARG 1 buf diff --git a/mappings/net/minecraft/util/palette/Palette.mapping b/mappings/net/minecraft/util/palette/Palette.mapping new file mode 100644 index 0000000000..06a4487458 --- /dev/null +++ b/mappings/net/minecraft/util/palette/Palette.mapping @@ -0,0 +1,12 @@ +CLASS brr net/minecraft/util/palette/Palette + METHOD a getPacketSize ()I + METHOD a getByIndex (I)Ljava/lang/Object; + ARG 1 index + METHOD a fromTag (Lhy;)V + ARG 1 tag + METHOD a fromPacket (Lit;)V + ARG 1 buf + METHOD a getIndex (Ljava/lang/Object;)I + ARG 1 object + METHOD b toPacket (Lit;)V + ARG 1 buf diff --git a/mappings/net/minecraft/util/palette/PaletteResizeHandler.mapping b/mappings/net/minecraft/util/palette/PaletteResizeHandler.mapping new file mode 100644 index 0000000000..9706ba5683 --- /dev/null +++ b/mappings/net/minecraft/util/palette/PaletteResizeHandler.mapping @@ -0,0 +1,4 @@ +CLASS brs net/minecraft/util/palette/PaletteResizeHandler + METHOD onResize resizePaletteAndGetIndex (ILjava/lang/Object;)I + ARG 1 newSize + ARG 2 objectAdded diff --git a/mappings/net/minecraft/util/palette/PalettedContainer.mapping b/mappings/net/minecraft/util/palette/PalettedContainer.mapping new file mode 100644 index 0000000000..d999aec295 --- /dev/null +++ b/mappings/net/minecraft/util/palette/PalettedContainer.mapping @@ -0,0 +1,56 @@ +CLASS brt net/minecraft/util/palette/PalettedContainer + FIELD a data Lyi; + FIELD b fallbackPalette Lbrr; + FIELD c noOpPaletteResizeHandler Lbrs; + FIELD d idList Lfc; + FIELD e elementDeserializer Ljava/util/function/Function; + FIELD f elementSerializer Ljava/util/function/Function; + FIELD h palette Lbrr; + FIELD i paletteSize I + FIELD j writeLock Ljava/util/concurrent/locks/ReentrantLock; + METHOD (Lbrr;Lfc;Ljava/util/function/Function;Ljava/util/function/Function;Ljava/lang/Object;)V + ARG 1 fallbackPalette + ARG 2 idList + ARG 3 elementDeserializer + ARG 4 elementSerializer + ARG 5 defaultElement + METHOD a lock ()V + METHOD a get (I)Ljava/lang/Object; + ARG 1 index + METHOD a get (III)Ljava/lang/Object; + ARG 1 x + ARG 2 y + ARG 3 z + METHOD a setSync (IIILjava/lang/Object;)Ljava/lang/Object; + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 value + METHOD a setAndGetOldValue (ILjava/lang/Object;)Ljava/lang/Object; + ARG 1 index + ARG 2 value + METHOD a write (Lhs;Ljava/lang/String;Ljava/lang/String;)V + METHOD a read (Lhy;[J)V + ARG 1 paletteTag + ARG 2 data + METHOD a fromPacket (Lit;)V + ARG 1 buf + METHOD b unlock ()V + METHOD b setPaletteSize (I)V + ARG 1 size + METHOD b toIndex (III)I + ARG 0 x + ARG 1 y + ARG 2 z + METHOD b set (IIILjava/lang/Object;)Ljava/lang/Object; + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 value + METHOD b set (ILjava/lang/Object;)V + METHOD b toPacket (Lit;)V + ARG 1 buf + METHOD c getPacketSize ()I + METHOD onResize resizePaletteAndGetIndex (ILjava/lang/Object;)I + ARG 1 size + ARG 2 value diff --git a/mappings/net/minecraft/util/profiler/DisableableProfiler.mapping b/mappings/net/minecraft/util/profiler/DisableableProfiler.mapping new file mode 100644 index 0000000000..8dc8715072 --- /dev/null +++ b/mappings/net/minecraft/util/profiler/DisableableProfiler.mapping @@ -0,0 +1,13 @@ +CLASS aeq net/minecraft/util/profiler/DisableableProfiler + FIELD b tickSupplier Ljava/util/function/IntSupplier; + FIELD c controller Laeq$b; + METHOD (Ljava/util/function/IntSupplier;)V + ARG 1 tickSupplier + METHOD a startTick ()V + METHOD a push (Ljava/lang/String;)V + METHOD a push (Ljava/util/function/Supplier;)V + METHOD b endTick ()V + METHOD b swap (Ljava/lang/String;)V + METHOD b swap (Ljava/util/function/Supplier;)V + METHOD c pop ()V + METHOD d getController ()Laeq$a; diff --git a/mappings/net/minecraft/util/profiler/DummyProfiler.mapping b/mappings/net/minecraft/util/profiler/DummyProfiler.mapping new file mode 100644 index 0000000000..d4c2b091ee --- /dev/null +++ b/mappings/net/minecraft/util/profiler/DummyProfiler.mapping @@ -0,0 +1,10 @@ +CLASS aer net/minecraft/util/profiler/DummyProfiler + FIELD a INSTANCE Laer; + METHOD a startTick ()V + METHOD a push (Ljava/lang/String;)V + METHOD a push (Ljava/util/function/Supplier;)V + METHOD b endTick ()V + METHOD b swap (Ljava/lang/String;)V + METHOD b swap (Ljava/util/function/Supplier;)V + METHOD c pop ()V + METHOD d getResults ()Laet; diff --git a/mappings/net/minecraft/util/profiler/EmptyProfileResult.mapping b/mappings/net/minecraft/util/profiler/EmptyProfileResult.mapping new file mode 100644 index 0000000000..d35797e045 --- /dev/null +++ b/mappings/net/minecraft/util/profiler/EmptyProfileResult.mapping @@ -0,0 +1,9 @@ +CLASS aeo net/minecraft/util/profiler/EmptyProfileResult + FIELD a INSTANCE Laeo; + METHOD a getStartTime ()J + METHOD a saveToFile (Ljava/io/File;)Z + METHOD a getTimings (Ljava/lang/String;)Ljava/util/List; + ARG 1 section + METHOD b getStartTick ()I + METHOD c getEndTime ()J + METHOD d getEndTick ()I diff --git a/mappings/net/minecraft/util/profiler/ProfileResult.mapping b/mappings/net/minecraft/util/profiler/ProfileResult.mapping new file mode 100644 index 0000000000..9d86bd57e0 --- /dev/null +++ b/mappings/net/minecraft/util/profiler/ProfileResult.mapping @@ -0,0 +1,10 @@ +CLASS aet net/minecraft/util/profiler/ProfileResult + METHOD a getStartTime ()J + METHOD a saveToFile (Ljava/io/File;)Z + METHOD a getTimings (Ljava/lang/String;)Ljava/util/List; + ARG 1 parentTiming + METHOD b getStartTick ()I + METHOD c getEndTime ()J + METHOD d getEndTick ()I + METHOD e getTimeSpan ()J + METHOD f getTickSpan ()I diff --git a/mappings/net/minecraft/util/profiler/ProfileResultImpl.mapping b/mappings/net/minecraft/util/profiler/ProfileResultImpl.mapping new file mode 100644 index 0000000000..c1fda0b984 --- /dev/null +++ b/mappings/net/minecraft/util/profiler/ProfileResultImpl.mapping @@ -0,0 +1,28 @@ +CLASS aep net/minecraft/util/profiler/ProfileResultImpl + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b timings Ljava/util/Map; + FIELD c startTime J + FIELD d startTick I + FIELD e endTime J + FIELD f endTick I + METHOD (Ljava/util/Map;JIJI)V + ARG 1 timings + ARG 2 startTime + ARG 4 startTick + ARG 5 endTime + ARG 7 endTick + METHOD a getStartTime ()J + METHOD a appendTiming (ILjava/lang/String;Ljava/lang/StringBuilder;)V + ARG 1 level + ARG 2 name + ARG 3 sb + METHOD a asString (JI)Ljava/lang/String; + ARG 1 timeSpan + ARG 3 tickSpan + METHOD a saveToFile (Ljava/io/File;)Z + METHOD a getTimings (Ljava/lang/String;)Ljava/util/List; + ARG 1 parentTiming + METHOD b getStartTick ()I + METHOD c getEndTime ()J + METHOD d getEndTick ()I + METHOD g generateWittyComment ()Ljava/lang/String; diff --git a/mappings/net/minecraft/util/profiler/Profiler.mapping b/mappings/net/minecraft/util/profiler/Profiler.mapping new file mode 100644 index 0000000000..c77952d85a --- /dev/null +++ b/mappings/net/minecraft/util/profiler/Profiler.mapping @@ -0,0 +1,8 @@ +CLASS aeu net/minecraft/util/profiler/Profiler + METHOD a startTick ()V + METHOD a push (Ljava/lang/String;)V + METHOD a push (Ljava/util/function/Supplier;)V + METHOD b endTick ()V + METHOD b swap (Ljava/lang/String;)V + METHOD b swap (Ljava/util/function/Supplier;)V + METHOD c pop ()V diff --git a/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping b/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping new file mode 100644 index 0000000000..65ba3fe2d0 --- /dev/null +++ b/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping @@ -0,0 +1,14 @@ +CLASS aen net/minecraft/util/profiler/ProfilerSystem + FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + FIELD c nameList Ljava/util/List; + FIELD d timeList Ljava/util/List; + FIELD i location Ljava/lang/String; + FIELD j tickStarted Z + METHOD a startTick ()V + METHOD a push (Ljava/lang/String;)V + METHOD a push (Ljava/util/function/Supplier;)V + METHOD b endTick ()V + METHOD b swap (Ljava/lang/String;)V + METHOD b swap (Ljava/util/function/Supplier;)V + METHOD c pop ()V + METHOD d getResults ()Laet; diff --git a/mappings/net/minecraft/util/profiler/ProfilerTiming.mapping b/mappings/net/minecraft/util/profiler/ProfilerTiming.mapping new file mode 100644 index 0000000000..7d2f63a2c6 --- /dev/null +++ b/mappings/net/minecraft/util/profiler/ProfilerTiming.mapping @@ -0,0 +1,7 @@ +CLASS aev net/minecraft/util/profiler/ProfilerTiming + FIELD a parentSectionUsagePercentage D + FIELD b totalUsagePercentage D + FIELD c name Ljava/lang/String; + METHOD (Ljava/lang/String;DD)V + ARG 1 name + METHOD a getColor ()I diff --git a/mappings/net/minecraft/util/profiler/ReadableProfiler.mapping b/mappings/net/minecraft/util/profiler/ReadableProfiler.mapping new file mode 100644 index 0000000000..d36142f930 --- /dev/null +++ b/mappings/net/minecraft/util/profiler/ReadableProfiler.mapping @@ -0,0 +1,7 @@ +CLASS aes net/minecraft/util/profiler/ReadableProfiler + METHOD a push (Ljava/lang/String;)V + METHOD a push (Ljava/util/function/Supplier;)V + METHOD b swap (Ljava/lang/String;)V + METHOD b swap (Ljava/util/function/Supplier;)V + METHOD c pop ()V + METHOD d getResults ()Laet; diff --git a/mappings/net/minecraft/world/ChunkSaveHandlerImpl.mapping b/mappings/net/minecraft/world/ChunkSaveHandlerImpl.mapping index 8c1449598a..83b5f9467a 100644 --- a/mappings/net/minecraft/world/ChunkSaveHandlerImpl.mapping +++ b/mappings/net/minecraft/world/ChunkSaveHandlerImpl.mapping @@ -8,9 +8,11 @@ CLASS bry net/minecraft/world/ChunkSaveHandlerImpl METHOD (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)V ARG 1 file METHOD a saveOneChunk ()Z - METHOD a (IILjava/util/Map;Ljava/util/Map;)Lhs; + METHOD a writeStructuresTag (IILjava/util/Map;Ljava/util/Map;)Lhs; ARG 1 chunkX ARG 2 chunkZ + ARG 3 structureStarts + ARG 4 structureReferences METHOD a spawnEntityAndPassengers (Lagv;Lbbq;)V ARG 0 entity ARG 1 world diff --git a/mappings/cip.mapping b/mappings/net/minecraft/world/ClientPersistentStateManager.mapping similarity index 53% rename from mappings/cip.mapping rename to mappings/net/minecraft/world/ClientPersistentStateManager.mapping index 03766812a1..49549776b0 100644 --- a/mappings/cip.mapping +++ b/mappings/net/minecraft/world/ClientPersistentStateManager.mapping @@ -1,3 +1,3 @@ -CLASS cip +CLASS cip net/minecraft/world/ClientPersistentStateManager METHOD a getNextAvailableId (Lbsg;Ljava/lang/String;)I ARG 2 key diff --git a/mappings/net/minecraft/world/LocalDifficulty.mapping b/mappings/net/minecraft/world/LocalDifficulty.mapping index 867f0142c8..2af322db84 100644 --- a/mappings/net/minecraft/world/LocalDifficulty.mapping +++ b/mappings/net/minecraft/world/LocalDifficulty.mapping @@ -1,4 +1,7 @@ CLASS afn net/minecraft/world/LocalDifficulty + FIELD b localDifficulty F METHOD (Lafm;JJF)V ARG 1 difficulty ARG 2 timeOfDay + METHOD b getLocalDifficulty ()F + METHOD d getClampedLocalDifficulty ()F diff --git a/mappings/net/minecraft/world/ModifiableTestableWorld.mapping b/mappings/net/minecraft/world/ModifiableTestableWorld.mapping new file mode 100644 index 0000000000..12f291c906 --- /dev/null +++ b/mappings/net/minecraft/world/ModifiableTestableWorld.mapping @@ -0,0 +1 @@ +CLASS bbv net/minecraft/world/ModifiableTestableWorld diff --git a/mappings/net/minecraft/world/PersistentStateContainer.mapping b/mappings/net/minecraft/world/PersistentStateContainer.mapping index 9dc57d0798..3a3e4040f8 100644 --- a/mappings/net/minecraft/world/PersistentStateContainer.mapping +++ b/mappings/net/minecraft/world/PersistentStateContainer.mapping @@ -3,6 +3,6 @@ CLASS bbx net/minecraft/world/PersistentStateContainer ARG 2 persistentStateKey METHOD a setPersistentState (Lbsg;Ljava/lang/String;Lchu;)V ARG 2 key - METHOD a createPersistentState (Lbsg;Ljava/util/function/Function;Ljava/lang/String;)Lchu; + METHOD a getPersistentState (Lbsg;Ljava/util/function/Function;Ljava/lang/String;)Lchu; ARG 3 key METHOD h getPersistentStateManager ()Lciq; diff --git a/mappings/net/minecraft/world/PersistentStateManager.mapping b/mappings/net/minecraft/world/PersistentStateManager.mapping index 43fc867ca7..91f4afeacb 100644 --- a/mappings/net/minecraft/world/PersistentStateManager.mapping +++ b/mappings/net/minecraft/world/PersistentStateManager.mapping @@ -6,7 +6,7 @@ CLASS ciq net/minecraft/world/PersistentStateManager ARG 2 key METHOD a set (Lbsg;Ljava/lang/String;Lchu;)V ARG 2 key - METHOD a create (Lbsg;Ljava/util/function/Function;Ljava/lang/String;)Lchu; + METHOD a get (Lbsg;Ljava/util/function/Function;Ljava/lang/String;)Lchu; ARG 3 key METHOD a update (Ljava/lang/String;I)Lhs; ARG 1 key diff --git a/mappings/net/minecraft/world/PortalForcer.mapping b/mappings/net/minecraft/world/PortalForcer.mapping new file mode 100644 index 0000000000..a2f4aeef6d --- /dev/null +++ b/mappings/net/minecraft/world/PortalForcer.mapping @@ -0,0 +1,8 @@ +CLASS bcc net/minecraft/world/PortalForcer + FIELD a PORTAL_BLOCK Lbke; + FIELD b world Luq; + FIELD c random Ljava/util/Random; + METHOD (Luq;)V + ARG 1 world + METHOD a tick (J)V + ARG 1 time diff --git a/mappings/bbw.mapping b/mappings/net/minecraft/world/TestableWorld.mapping similarity index 71% rename from mappings/bbw.mapping rename to mappings/net/minecraft/world/TestableWorld.mapping index 3961acbfa6..e380e111e1 100644 --- a/mappings/bbw.mapping +++ b/mappings/net/minecraft/world/TestableWorld.mapping @@ -1,4 +1,4 @@ -CLASS bbw +CLASS bbw net/minecraft/world/TestableWorld METHOD a getTopPosition (Lbst$a;Let;)Let; ARG 1 type METHOD a test (Let;Ljava/util/function/Predicate;)Z diff --git a/mappings/net/minecraft/world/ViewableWorld.mapping b/mappings/net/minecraft/world/ViewableWorld.mapping index 88c95be9b0..4780273a8d 100644 --- a/mappings/net/minecraft/world/ViewableWorld.mapping +++ b/mappings/net/minecraft/world/ViewableWorld.mapping @@ -7,20 +7,22 @@ CLASS bbt net/minecraft/world/ViewableWorld ARG 3 y METHOD a getClosestPlayer (DDDDZ)Larb; METHOD a getChunk (II)Lbra; - ARG 1 x - ARG 2 z + ARG 1 chunkX + ARG 2 chunkZ METHOD a isAreaLoaded (IIIIII)Z ARG 1 minX ARG 2 minY ARG 3 minZ ARG 4 maxX - ARG 5 maxY - ARG 6 maxZ METHOD a getChunk (IILbrf;)Lbra; - ARG 1 x - ARG 2 z + ARG 1 chunkX + ARG 2 chunkZ ARG 3 requiredState METHOD a getChunk (IILbrf;Z)Lbra; + ARG 1 chunkX + ARG 2 chunkZ + ARG 3 status + ARG 4 create METHOD a getClosestPlayer (Lagv;D)Larb; METHOD a getCollisionVoxelShapes (Lagv;Lclz;DDD)Ljava/util/stream/Stream; ARG 3 x @@ -35,6 +37,7 @@ CLASS bbt net/minecraft/world/ViewableWorld ARG 2 x METHOD a getTopPosition (Lbst$a;Let;)Let; ARG 1 type + METHOD a getLightLevel (Let;I)I METHOD a isAreaLoaded (Let;Let;)Z ARG 1 min ARG 2 max diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 53fea93eda..8364d18c04 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -38,6 +38,7 @@ CLASS bbp net/minecraft/world/World ARG 1 serializer ARG 3 properties ARG 4 dimension + ARG 5 chunkManagerProvider ARG 6 profiler ARG 7 isClient METHOD A getRecipeManager ()Layx; @@ -60,6 +61,7 @@ CLASS bbp net/minecraft/world/World METHOD V getGameRules ()Lbbl; METHOD W isThundering ()Z METHOD X isRaining ()Z + METHOD Y getEffectiveHeight ()I METHOD a findClosestVisiblePlayer (DDD)Larb; ARG 1 x METHOD a containsVisiblePlayer (DDDD)Z @@ -91,6 +93,7 @@ CLASS bbp net/minecraft/world/World ARG 1 chunkX ARG 2 chunkZ ARG 3 requiredState + ARG 4 create METHOD a fireGlobalWorldEvent (ILet;I)V ARG 1 eventId ARG 2 pos @@ -127,7 +130,8 @@ CLASS bbp net/minecraft/world/World METHOD a canPlayerModifyAt (Larb;Let;)Z ARG 1 player METHOD a playSound (Larb;Let;Lxm;Lxo;FF)V - METHOD a toCrashReportElement (Lb;)Lc; + METHOD a addDetailsToCrashReport (Lb;)Lc; + ARG 1 report METHOD a registerListener (Lbbs;)V METHOD a init (Lbbu;)V ARG 1 levelInfo @@ -151,6 +155,7 @@ CLASS bbp net/minecraft/world/World METHOD a clearBlockState (Let;)Z METHOD a (Let;DD)Larb; ARG 1 pos + METHOD a getLightLevel (Let;I)I METHOD a updateNeighbors (Let;Lbgs;)V METHOD a addBlockAction (Let;Lbgs;II)V ARG 1 pos @@ -218,6 +223,8 @@ CLASS bbp net/minecraft/world/World METHOD aa getTicksSinceLightningClient ()I METHOD ab getVillageManager ()Lals; METHOD ac getRaidManager ()Lash; + METHOD ad getForcedChunks ()Lit/unimi/dsi/fastutil/longs/LongSet; + METHOD ae hasForcedChunks ()Z METHOD af getProfiler ()Laeu; METHOD b tickTime ()V METHOD b findVisiblePlayer (DDDD)Z @@ -227,6 +234,10 @@ CLASS bbp net/minecraft/world/World ARG 1 delta METHOD b getEntityById (I)Lagv; METHOD b scheduleNeighborChunksRender (III)V + METHOD b setChunkForced (IIZ)Z + ARG 1 chunkX + ARG 2 chunkZ + ARG 3 forced METHOD b fireWorldEvent (ILet;I)V ARG 1 eventId ARG 2 pos @@ -243,7 +254,7 @@ CLASS bbp net/minecraft/world/World ARG 1 pos METHOD b isEmittingRedstonePower (Let;Ley;)Z ARG 1 pos - METHOD b (Lft;DDDDDD)V + METHOD b addImportantParticle (Lft;DDDDDD)V ARG 1 parameters ARG 2 x ARG 4 y @@ -257,8 +268,9 @@ CLASS bbp net/minecraft/world/World METHOD b getPlayerByUuid (Ljava/util/UUID;)Larb; METHOD c getAmbientDarkness ()I METHOD c setAmbientDarkness (I)V - METHOD c getChunk (II)Lbrm; + METHOD c getWorldChunk (II)Lbrm; ARG 1 chunkX + ARG 2 chunkZ METHOD c setBlockBreakingProgress (ILet;I)V ARG 1 entityId ARG 2 pos @@ -277,8 +289,13 @@ CLASS bbp net/minecraft/world/World ARG 1 pos METHOD e isClient ()Z METHOD e getFogColor (F)Lcmd; + METHOD e isChunkForced (II)Z + ARG 1 chunkX + ARG 2 chunkZ + METHOD e removeEntity (Lagv;)V METHOD e getBiome (Let;)Lbco; METHOD f getWorld ()Lbbp; + METHOD f getStarsBrightness (F)F METHOD f getBlockEntity (Let;)Lbnq; ARG 1 pos METHOD g getLevelProperties ()Lcih; @@ -296,17 +313,22 @@ CLASS bbp net/minecraft/world/World METHOD l isValid (Let;)Z ARG 0 pos METHOD m getRandom ()Ljava/util/Random; - METHOD m isHeightInvaid (Let;)Z + METHOD m isHeightInvalid (Let;)Z ARG 0 pos METHOD m_ updateEntities ()V + METHOD n getWorldChunk (Let;)Lbrm; + METHOD n_ tickPlayers ()V METHOD n getSpawnPos ()Let; - METHOD n getChunk (Let;)Lbrm; METHOD o getDimension ()Lbsf; METHOD o scheduleBlockRender (Let;)V METHOD q removeBlockEntity (Let;)V METHOD q_ getSeaLevel ()I + METHOD r isBlockFullCube (Let;)Z + ARG 1 pos METHOD r_ getSeed ()J + METHOD s isHeightValidAndBlockLoaded (Let;)Z METHOD t updateWeather ()V + METHOD t doesBlockHaveSolidTopSurface (Let;)Z METHOD v getReceivedStrongRedstonePower (Let;)I METHOD w getServer ()Lnet/minecraft/server/MinecraftServer; METHOD w isReceivingRedstonePower (Let;)Z diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index ad141e608d..d1b2d141b5 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -23,7 +23,7 @@ CLASS bra net/minecraft/world/chunk/Chunk ARG 2 state METHOD a addPendingBlockEntityTag (Lhs;)V METHOD a setStructureStarts (Ljava/util/Map;)V - METHOD a addPostProcessing (SI)V + METHOD a markBlockForPostProcessing (SI)V METHOD a setShouldSave (Z)V ARG 1 shouldSave METHOD a setBiomeArray ([Lbco;)V diff --git a/mappings/net/minecraft/world/chunk/ChunkManager.mapping b/mappings/net/minecraft/world/chunk/ChunkManager.mapping index b0c268f37c..82564e55e2 100644 --- a/mappings/net/minecraft/world/chunk/ChunkManager.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkManager.mapping @@ -6,15 +6,15 @@ CLASS bre net/minecraft/world/chunk/ChunkManager ARG 1 x ARG 2 z ARG 3 status - ARG 4 require + ARG 4 create METHOD a getWorldChunk (IIZ)Lbrm; METHOD a tick (Ljava/util/function/BooleanSupplier;)V METHOD a setMobSpawnOptions (ZZ)V ARG 1 spawnMonsters ARG 2 spawnAnimals - METHOD b get (II)Lbbb; - ARG 1 x - ARG 2 z + METHOD b getChunk (II)Lbbb; + ARG 1 chunkX + ARG 2 chunkZ METHOD f getStatus ()Ljava/lang/String; METHOD g getChunkGenerator ()Lbrb; METHOD i getLightingProvider ()Lceu; diff --git a/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping b/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping index 9f1899a351..5a335adea0 100644 --- a/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping @@ -1,4 +1,10 @@ CLASS brg net/minecraft/world/chunk/ChunkNibbleArray FIELD a byteArray [B METHOD a asByteArray ()[B + METHOD a set (IIII)V + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 value + METHOD b getIndex (III)I METHOD c isUninitialized ()Z diff --git a/mappings/net/minecraft/world/chunk/ChunkProvider.mapping b/mappings/net/minecraft/world/chunk/ChunkProvider.mapping index 9ae35dbc13..4e13d43285 100644 --- a/mappings/net/minecraft/world/chunk/ChunkProvider.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkProvider.mapping @@ -1,6 +1,6 @@ CLASS bro net/minecraft/world/chunk/ChunkProvider METHOD a onLightUpdate (Lbca;III)V - METHOD b get (II)Lbbb; + METHOD b getChunk (II)Lbbb; ARG 1 chunkX ARG 2 chunkZ METHOD j getWorldAsView ()Lbbb; diff --git a/mappings/net/minecraft/world/chunk/ChunkSection.mapping b/mappings/net/minecraft/world/chunk/ChunkSection.mapping index 58681cce6e..402a593409 100644 --- a/mappings/net/minecraft/world/chunk/ChunkSection.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkSection.mapping @@ -1,4 +1,5 @@ CLASS brn net/minecraft/world/chunk/ChunkSection + FIELD a palette Lbrr; FIELD b yOffset I FIELD c nonEmptyBlockCount S FIELD d randomTickableBlockCount S @@ -39,6 +40,6 @@ CLASS brn net/minecraft/world/chunk/ChunkSection METHOD e hasRandomBlockTicks ()Z METHOD f hasRandomFluidTicks ()Z METHOD g getYOffset ()I - METHOD h computeBlockCounts ()V + METHOD h calculateCounts ()V METHOD i getContainer ()Lbrt; METHOD j getPacketSize ()I diff --git a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping index b3f230f67c..31de3e38bc 100644 --- a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping @@ -33,7 +33,7 @@ CLASS brf net/minecraft/world/chunk/ChunkStatus METHOD a createOrderedList ()Ljava/util/List; METHOD a getByIndex (I)Lbrf; ARG 0 pos - METHOD a (Lbrf;)I + METHOD a getIndex (Lbrf;)I ARG 0 status METHOD a get (Ljava/lang/String;)Lbrf; ARG 0 id @@ -41,7 +41,7 @@ CLASS brf net/minecraft/world/chunk/ChunkStatus METHOD a register (Ljava/lang/String;Lbrf;IZLbrf$b;Lbrf$c;)Lbrf; ARG 0 name ARG 1 previousStatus - METHOD b getOrderedSize ()I + METHOD b getStatusCount ()I METHOD b isAfter (Lbrf;)Z METHOD c getIndex ()I METHOD d getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/chunk/EmptyChunk.mapping b/mappings/net/minecraft/world/chunk/EmptyChunk.mapping index 234ad37799..c8a1d91118 100644 --- a/mappings/net/minecraft/world/chunk/EmptyChunk.mapping +++ b/mappings/net/minecraft/world/chunk/EmptyChunk.mapping @@ -31,3 +31,4 @@ CLASS brh net/minecraft/world/chunk/EmptyChunk METHOD s loadToWorld ()V METHOD t unloadFromWorld ()V METHOD u markDirty ()V + METHOD v isEmpty ()Z diff --git a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping index e861e6bc1f..3df3e0ba63 100644 --- a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping +++ b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping @@ -11,6 +11,9 @@ CLASS bru net/minecraft/world/chunk/ProtoChunk FIELD j sections [Lbrn; FIELD k entities Ljava/util/List; FIELD l lightSources Ljava/util/List; + FIELD m postProcessingLists [Lit/unimi/dsi/fastutil/shorts/ShortList; + FIELD n structureStarts Ljava/util/Map; + FIELD o structureReferences Ljava/util/Map; FIELD p upgradeData Lbrw; FIELD q blockTickScheduler Lbrv; FIELD r fluidTickScheduler Lbrv; @@ -50,9 +53,9 @@ CLASS bru net/minecraft/world/chunk/ProtoChunk ARG 1 structureId ARG 2 structureStart METHOD a setStructureStarts (Ljava/util/Map;)V - METHOD a addPostProcessing (SI)V + METHOD a markBlockForPostProcessing (SI)V METHOD a joinBlockPos (SILbbd;)Let; - ARG 0 chunkSliceRel + ARG 0 sectionRel ARG 1 sectionY ARG 2 chunkPos METHOD a setShouldSave (Z)V @@ -92,7 +95,7 @@ CLASS bru net/minecraft/world/chunk/ProtoChunk METHOD j getLuminance (Let;)I ARG 1 pos METHOD k getStatus ()Lbrf; - METHOD k getPackedChunkSliceRelative (Let;)S + METHOD k getPackedSectionRelative (Let;)S ARG 0 pos METHOD l getPostProcessingLists ()[Lit/unimi/dsi/fastutil/shorts/ShortList; METHOD p getUpgradeData ()Lbrw; @@ -103,3 +106,4 @@ CLASS bru net/minecraft/world/chunk/ProtoChunk METHOD w getBlockEntities ()Ljava/util/Map; METHOD x getStructureReferences ()Ljava/util/Map; METHOD y getEntities ()Ljava/util/List; + METHOD z getBlockEntityTags ()Ljava/util/Map; diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index 3b89630be3..3601fa6c06 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -49,8 +49,11 @@ CLASS brm net/minecraft/world/chunk/WorldChunk METHOD (Lbbp;Lbru;II)V ARG 1 world ARG 2 protoChunk + ARG 3 chunkX + ARG 4 chunkZ METHOD A getBlockEntityMap ()Ljava/util/Map; METHOD B getEntitySectionArray ()[Lyj; + METHOD C runPostProcessing ()V METHOD a getFluidState (III)Lcfd; ARG 1 x ARG 2 y @@ -71,6 +74,7 @@ CLASS brm net/minecraft/world/chunk/WorldChunk ARG 3 z METHOD a setHeightmap (Lbst$a;[J)V METHOD a setLightingProvider (Lceu;)V + METHOD a getLightLevel (Let;I)I METHOD a setBlockEntity (Let;Lbnq;)V ARG 1 pos ARG 2 blockEntity @@ -106,6 +110,7 @@ CLASS brm net/minecraft/world/chunk/WorldChunk ARG 1 structureId METHOD b setStructureReferences (Ljava/util/Map;)V METHOD b setLightOn (Z)V + ARG 1 lightOn METHOD c getBlockEntityPositions ()Ljava/util/Set; METHOD c getFluidState (Let;)Lcfd; ARG 1 pos @@ -134,6 +139,7 @@ CLASS brm net/minecraft/world/chunk/WorldChunk METHOD s loadToWorld ()V METHOD t unloadFromWorld ()V METHOD u markDirty ()V + METHOD v isEmpty ()Z METHOD x getStructureReferences ()Ljava/util/Map; METHOD y isLoadedToWorld ()Z METHOD z getWorld ()Lbbp; diff --git a/mappings/net/minecraft/world/dimension/Dimension.mapping b/mappings/net/minecraft/world/dimension/Dimension.mapping index 99d3932267..85067d9ce3 100644 --- a/mappings/net/minecraft/world/dimension/Dimension.mapping +++ b/mappings/net/minecraft/world/dimension/Dimension.mapping @@ -1,5 +1,6 @@ CLASS bsf net/minecraft/world/dimension/Dimension FIELD b world Lbbp; + FIELD d isNether Z FIELD f type Lbsg; METHOD (Lbbp;Lbsg;)V ARG 1 world @@ -9,6 +10,7 @@ CLASS bsf net/minecraft/world/dimension/Dimension ARG 3 delta METHOD d getForcedSpawnPoint ()Let; METHOD g hasSkyLight ()Z + METHOD h isNether ()Z METHOD j createWorldBorder ()Lbqy; METHOD k saveWorldData ()V METHOD m createChunkGenerator ()Lbrb; diff --git a/mappings/net/minecraft/world/dimension/DimensionalPersistentStateManager.mapping b/mappings/net/minecraft/world/dimension/DimensionalPersistentStateManager.mapping index 473c699e74..a6a11486d4 100644 --- a/mappings/net/minecraft/world/dimension/DimensionalPersistentStateManager.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionalPersistentStateManager.mapping @@ -13,6 +13,6 @@ CLASS cie net/minecraft/world/dimension/DimensionalPersistentStateManager ARG 1 key METHOD a set (Ljava/lang/String;Lchu;)V ARG 1 key - METHOD a create (Ljava/util/function/Function;Ljava/lang/String;)Lchu; + METHOD a get (Ljava/util/function/Function;Ljava/lang/String;)Lchu; ARG 2 key METHOD b save ()V diff --git a/mappings/net/minecraft/world/gen/feature/AbstractTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/AbstractTreeFeature.mapping index cc7d1e3132..3b8f3d458a 100644 --- a/mappings/net/minecraft/world/gen/feature/AbstractTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/AbstractTreeFeature.mapping @@ -8,7 +8,48 @@ CLASS bto net/minecraft/world/gen/feature/AbstractTreeFeature ARG 3 random ARG 4 pos ARG 5 config + METHOD a setToDirt (Lbbv;Let;)V + ARG 1 world + ARG 2 pos + METHOD a canTreeReplace (Lbbw;Let;)Z + ARG 0 world + ARG 1 pos METHOD a setBlockState (Lbbz;Let;Lbpm;)V ARG 1 world ARG 2 pos ARG 3 state + METHOD a generate (Ljava/util/Set;Lbbv;Ljava/util/Random;Let;)Z + ARG 1 logPositions + ARG 2 world + ARG 3 random + ARG 4 pos + METHOD a setBlockState (Ljava/util/Set;Lbbz;Let;Lbpm;)V + ARG 1 logPositions + ARG 2 world + ARG 3 pos + ARG 4 state + METHOD b isAir (Lbbw;Let;)Z + ARG 0 world + ARG 1 pos + METHOD b setBlockStateWithoutUpdatingNeighbors (Lbbz;Let;Lbpm;)V + METHOD c isNaturalDirt (Lbbw;Let;)Z + ARG 0 world + ARG 1 pos + METHOD e isWater (Lbbw;Let;)Z + ARG 0 world + ARG 1 pos + METHOD f isLeaves (Lbbw;Let;)Z + ARG 0 world + ARG 1 pos + METHOD g isAirOrLeaves (Lbbw;Let;)Z + ARG 0 world + ARG 1 pos + METHOD h isNaturalDirtOrGrass (Lbbw;Let;)Z + ARG 0 world + ARG 1 pos + METHOD i isDirtOrGrass (Lbbw;Let;)Z + ARG 0 world + ARG 1 pos + METHOD j isReplaceablePlant (Lbbw;Let;)Z + ARG 0 world + ARG 1 pos diff --git a/mappings/net/minecraft/world/gen/feature/BirchTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/BirchTreeFeature.mapping index eaf3bb5bd5..1ee5f8e195 100644 --- a/mappings/net/minecraft/world/gen/feature/BirchTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/BirchTreeFeature.mapping @@ -1,3 +1,13 @@ CLASS btr net/minecraft/world/gen/feature/BirchTreeFeature FIELD a LOG Lbpm; FIELD aS LEAVES Lbpm; + FIELD aT alwaysTall Z + METHOD (Ljava/util/function/Function;ZZ)V + ARG 1 configFactory + ARG 2 emitNeighborBlockUpdates + ARG 3 alwaysTall + METHOD a generate (Ljava/util/Set;Lbbv;Ljava/util/Random;Let;)Z + ARG 1 logPositions + ARG 2 world + ARG 3 random + ARG 4 pos diff --git a/mappings/net/minecraft/world/gen/feature/DarkOakTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/DarkOakTreeFeature.mapping index c39628fdc0..6a05334ec5 100644 --- a/mappings/net/minecraft/world/gen/feature/DarkOakTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/DarkOakTreeFeature.mapping @@ -4,3 +4,8 @@ CLASS buk net/minecraft/world/gen/feature/DarkOakTreeFeature METHOD (Ljava/util/function/Function;Z)V ARG 1 configFactory ARG 2 emitNeighborBlockUpdates + METHOD a generate (Ljava/util/Set;Lbbv;Ljava/util/Random;Let;)Z + ARG 1 logPositions + ARG 2 world + ARG 3 random + ARG 4 pos diff --git a/mappings/net/minecraft/world/gen/feature/JungleGroundBushFeature.mapping b/mappings/net/minecraft/world/gen/feature/JungleGroundBushFeature.mapping index e73cb8368e..c42636f31a 100644 --- a/mappings/net/minecraft/world/gen/feature/JungleGroundBushFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/JungleGroundBushFeature.mapping @@ -1 +1,12 @@ CLASS bvq net/minecraft/world/gen/feature/JungleGroundBushFeature + FIELD a leaves Lbpm; + FIELD aS log Lbpm; + METHOD (Ljava/util/function/Function;Lbpm;Lbpm;)V + ARG 1 configFactory + ARG 2 log + ARG 3 leaves + METHOD a generate (Ljava/util/Set;Lbbv;Ljava/util/Random;Let;)Z + ARG 1 logPositions + ARG 2 world + ARG 3 random + ARG 4 pos diff --git a/mappings/net/minecraft/world/gen/feature/LargeOakTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/LargeOakTreeFeature.mapping index ce4a957de4..a73b5fec1a 100644 --- a/mappings/net/minecraft/world/gen/feature/LargeOakTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/LargeOakTreeFeature.mapping @@ -4,3 +4,8 @@ CLASS btq net/minecraft/world/gen/feature/LargeOakTreeFeature METHOD (Ljava/util/function/Function;Z)V ARG 1 configFactory ARG 2 emitNeighborBlockUpdates + METHOD a generate (Ljava/util/Set;Lbbv;Ljava/util/Random;Let;)Z + ARG 1 logPositions + ARG 2 world + ARG 3 random + ARG 4 pos diff --git a/mappings/net/minecraft/world/gen/feature/MegaJungleTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/MegaJungleTreeFeature.mapping index bd946be5d8..297e29e088 100644 --- a/mappings/net/minecraft/world/gen/feature/MegaJungleTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/MegaJungleTreeFeature.mapping @@ -1 +1,6 @@ CLASS bwi net/minecraft/world/gen/feature/MegaJungleTreeFeature + METHOD a generate (Ljava/util/Set;Lbbv;Ljava/util/Random;Let;)Z + ARG 1 logPositions + ARG 2 world + ARG 3 random + ARG 4 pos diff --git a/mappings/net/minecraft/world/gen/feature/MegaPineTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/MegaPineTreeFeature.mapping index 72a6ad442f..2d3193a53b 100644 --- a/mappings/net/minecraft/world/gen/feature/MegaPineTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/MegaPineTreeFeature.mapping @@ -2,3 +2,4 @@ CLASS bwj net/minecraft/world/gen/feature/MegaPineTreeFeature FIELD aV LOG Lbpm; FIELD aW LEAVES Lbpm; FIELD aX PODZOL Lbpm; + METHOD a generate (Ljava/util/Set;Lbbv;Ljava/util/Random;Let;)Z diff --git a/mappings/net/minecraft/world/gen/feature/OakTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/OakTreeFeature.mapping index 6eebe27e2b..a2259a8baf 100644 --- a/mappings/net/minecraft/world/gen/feature/OakTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/OakTreeFeature.mapping @@ -12,3 +12,8 @@ CLASS byu net/minecraft/world/gen/feature/OakTreeFeature ARG 4 log ARG 5 leaves METHOD a getRandomTreeHeight (Ljava/util/Random;)I + METHOD a generate (Ljava/util/Set;Lbbv;Ljava/util/Random;Let;)Z + ARG 1 logPositions + ARG 2 world + ARG 3 random + ARG 4 pos diff --git a/mappings/net/minecraft/world/gen/feature/PineTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/PineTreeFeature.mapping index 349ed38490..76d6bc24c2 100644 --- a/mappings/net/minecraft/world/gen/feature/PineTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/PineTreeFeature.mapping @@ -3,3 +3,8 @@ CLASS bxd net/minecraft/world/gen/feature/PineTreeFeature FIELD aS LEAVES Lbpm; METHOD (Ljava/util/function/Function;)V ARG 1 configFactory + METHOD a generate (Ljava/util/Set;Lbbv;Ljava/util/Random;Let;)Z + ARG 1 logPositions + ARG 2 world + ARG 3 random + ARG 4 pos diff --git a/mappings/net/minecraft/world/gen/feature/SavannaTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/SavannaTreeFeature.mapping index 291efcfb16..5e2f86fcb6 100644 --- a/mappings/net/minecraft/world/gen/feature/SavannaTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/SavannaTreeFeature.mapping @@ -4,3 +4,8 @@ CLASS bxs net/minecraft/world/gen/feature/SavannaTreeFeature METHOD (Ljava/util/function/Function;Z)V ARG 1 configFactory ARG 2 emitNeighborBlockUpdates + METHOD a generate (Ljava/util/Set;Lbbv;Ljava/util/Random;Let;)Z + ARG 1 logPositions + ARG 2 world + ARG 3 random + ARG 4 pos diff --git a/mappings/net/minecraft/world/gen/feature/SpruceTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/SpruceTreeFeature.mapping index 881a9cb3f4..f27eab35d4 100644 --- a/mappings/net/minecraft/world/gen/feature/SpruceTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/SpruceTreeFeature.mapping @@ -4,3 +4,8 @@ CLASS byl net/minecraft/world/gen/feature/SpruceTreeFeature METHOD (Ljava/util/function/Function;Z)V ARG 1 configFactory ARG 2 emitNeighborBlockUpdates + METHOD a generate (Ljava/util/Set;Lbbv;Ljava/util/Random;Let;)Z + ARG 1 logPositions + ARG 2 world + ARG 3 random + ARG 4 pos diff --git a/mappings/net/minecraft/world/gen/feature/SwampTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/SwampTreeFeature.mapping index dd649ba94e..8f01101c6a 100644 --- a/mappings/net/minecraft/world/gen/feature/SwampTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/SwampTreeFeature.mapping @@ -3,3 +3,8 @@ CLASS byq net/minecraft/world/gen/feature/SwampTreeFeature FIELD aS LEAVES Lbpm; METHOD (Ljava/util/function/Function;)V ARG 1 configFactory + METHOD a generate (Ljava/util/Set;Lbbv;Ljava/util/Random;Let;)Z + ARG 1 logPositions + ARG 2 world + ARG 3 random + ARG 4 pos diff --git a/mappings/net/minecraft/world/level/storage/AlphaChunkDataArray.mapping b/mappings/net/minecraft/world/level/storage/AlphaChunkDataArray.mapping new file mode 100644 index 0000000000..be174e644e --- /dev/null +++ b/mappings/net/minecraft/world/level/storage/AlphaChunkDataArray.mapping @@ -0,0 +1,11 @@ +CLASS brq net/minecraft/world/level/storage/AlphaChunkDataArray + FIELD a data [B + FIELD b zOffset I + FIELD c xOffset I + METHOD ([BI)V + ARG 1 data + ARG 2 yCoordinateBits + METHOD a get (III)I + ARG 1 x + ARG 2 y + ARG 3 z diff --git a/mappings/net/minecraft/world/level/storage/AlphaChunkIo.mapping b/mappings/net/minecraft/world/level/storage/AlphaChunkIo.mapping new file mode 100644 index 0000000000..87056fcfae --- /dev/null +++ b/mappings/net/minecraft/world/level/storage/AlphaChunkIo.mapping @@ -0,0 +1,8 @@ +CLASS bsb net/minecraft/world/level/storage/AlphaChunkIo + CLASS bsb$a AlphaChunk + METHOD a convertAlphaChunk (Lbsb$a;Lhs;Lbcq;)V + ARG 0 alphaChunk + ARG 1 tag + ARG 2 biomeSource + METHOD a readAlphaChunk (Lhs;)Lbsb$a; + ARG 0 tag diff --git a/mappings/ud.mapping b/mappings/ud.mapping index 8b5fb1786e..6f12064468 100644 --- a/mappings/ud.mapping +++ b/mappings/ud.mapping @@ -26,3 +26,4 @@ CLASS ud ud METHOD a save (Z)V ARG 1 flush METHOD b syncPosToEntryMap ()V + METHOD e getTicketManager ()Lud$a; diff --git a/mappings/ug.mapping b/mappings/ug.mapping index dbd50f4ffc..9c4f4c9259 100644 --- a/mappings/ug.mapping +++ b/mappings/ug.mapping @@ -11,6 +11,7 @@ CLASS ug ARG 1 position ARG 3 source ARG 5 newLevel + METHOD b scheduleNewLevelUpdate (JIZ)V METHOD b getBaseLevelFor (JJI)I ARG 1 source ARG 3 position diff --git a/mappings/yi.mapping b/mappings/yi.mapping deleted file mode 100644 index 82922005ce..0000000000 --- a/mappings/yi.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS yi - METHOD a asLongArray ()[J - METHOD a get (I)I - METHOD b set (II)V