Skip to content

Commit

Permalink
start refactoring profiling
Browse files Browse the repository at this point in the history
  • Loading branch information
@ix0rai
ix0rai committed Oct 17, 2024
1 parent 0e9f003 commit c6e0bf6
Show file tree
Hide file tree
Showing 21 changed files with 22 additions and 20 deletions.
2 changes: 1 addition & 1 deletion ...craft/util/profiler/DebugRecorder.mapping → ...raft/util/profiling/DebugRecorder.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_flupnwyk net/minecraft/util/profiler/DebugRecorder
CLASS net/minecraft/unmapped/C_flupnwyk net/minecraft/util/profiling/DebugRecorder
FIELD f_ehauhfkt samplers Ljava/util/Set;
FIELD f_fcahfgct ticks I
FIELD f_fnllcktc stopping Z
Expand Down
2 changes: 1 addition & 1 deletion ...minecraft/util/profiler/Deviation.mapping → ...inecraft/util/profiling/Deviation.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_xghvuxqt net/minecraft/util/profiler/Deviation
CLASS net/minecraft/unmapped/C_xghvuxqt net/minecraft/util/profiling/Deviation
FIELD f_dgezfeor result Lnet/minecraft/unmapped/C_dzczqjri;
FIELD f_jfjmsafz ticks I
FIELD f_snwzuwnp instant Ljava/time/Instant;
Expand Down
2 changes: 1 addition & 1 deletion ...craft/util/profiler/DummyProfiler.mapping → ...raft/util/profiling/DummyProfiler.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
CLASS net/minecraft/unmapped/C_ediwljws net/minecraft/util/profiler/DummyProfiler
CLASS net/minecraft/unmapped/C_ediwljws net/minecraft/util/profiling/DummyProfiler
FIELD f_okurmzgb INSTANCE Lnet/minecraft/unmapped/C_ediwljws;
2 changes: 1 addition & 1 deletion ...craft/util/profiler/DummyRecorder.mapping → ...raft/util/profiling/DummyRecorder.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
CLASS net/minecraft/unmapped/C_bvbflxdd net/minecraft/util/profiler/DummyRecorder
CLASS net/minecraft/unmapped/C_bvbflxdd net/minecraft/util/profiling/DummyRecorder
FIELD f_hczrmgox INSTANCE Lnet/minecraft/unmapped/C_owhdirgj;
2 changes: 1 addition & 1 deletion .../util/profiler/EmptyProfileResult.mapping → ...util/profiling/EmptyProfileResult.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
CLASS net/minecraft/unmapped/C_vnjcagdz net/minecraft/util/profiler/EmptyProfileResult
CLASS net/minecraft/unmapped/C_vnjcagdz net/minecraft/util/profiling/EmptyProfileResult
FIELD f_znbfvrln INSTANCE Lnet/minecraft/unmapped/C_vnjcagdz;
2 changes: 1 addition & 1 deletion ...util/profiler/ProfileLocationInfo.mapping → ...til/profiling/ProfileLocationInfo.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_jfixsjks net/minecraft/util/profiler/ProfileLocationInfo
CLASS net/minecraft/unmapped/C_jfixsjks net/minecraft/util/profiling/ProfileLocationInfo
COMMENT Profiling information on a specific profiler location.
METHOD m_ijgiuled getCounts ()Lit/unimi/dsi/fastutil/objects/Object2LongMap;
COMMENT Returns a marker to count map indicating the times each marker has been
Expand Down
2 changes: 1 addition & 1 deletion ...craft/util/profiler/ProfileResult.mapping → ...raft/util/profiling/ProfileResult.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_dzczqjri net/minecraft/util/profiler/ProfileResult
CLASS net/minecraft/unmapped/C_dzczqjri net/minecraft/util/profiling/ProfileResult
FIELD f_ezlvgzsa SPLITTER_CHAR C
METHOD m_dxeesszq getStartTick ()I
METHOD m_entfmbng getRootTimings ()Ljava/lang/String;
Expand Down
2 changes: 1 addition & 1 deletion ...t/util/profiler/ProfileResultImpl.mapping → .../util/profiling/ProfileResultImpl.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_jrmnitnf net/minecraft/util/profiler/ProfileResultImpl
CLASS net/minecraft/unmapped/C_jrmnitnf net/minecraft/util/profiling/ProfileResultImpl
FIELD f_aodcpdpg COMPARATOR Ljava/util/Comparator;
FIELD f_ascvybgc startTime J
FIELD f_gfxbnyom locationInfos Ljava/util/Map;
Expand Down
2 changes: 1 addition & 1 deletion .../minecraft/util/profiler/Profiler.mapping → ...minecraft/util/profiling/Profiler.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_eslcbfsq net/minecraft/util/profiler/Profiler
CLASS net/minecraft/unmapped/C_eslcbfsq net/minecraft/util/profiling/Profiler
FIELD f_hxbkuvru ROOT_NAME Ljava/lang/String;
METHOD m_habnlnco push (Ljava/util/function/Supplier;)V
ARG 1 locationGetter
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/util/profiling/ProfilerManager.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CLASS net/minecraft/unmapped/C_xuophqnt net/minecraft/util/profiling/ProfilerManager
CLASS C_gknixwqr Scope
2 changes: 1 addition & 1 deletion ...raft/util/profiler/ProfilerSystem.mapping → ...aft/util/profiling/ProfilerSystem.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_dmgffhnu net/minecraft/util/profiler/ProfilerSystem
CLASS net/minecraft/unmapped/C_dmgffhnu net/minecraft/util/profiling/ProfilerSystem
FIELD f_ayobskvm TIMEOUT_NANOSECONDS J
FIELD f_eoyabfsa tickStarted Z
FIELD f_gqtqaqyw startTick I
Expand Down
2 changes: 1 addition & 1 deletion ...raft/util/profiler/ProfilerTiming.mapping → ...aft/util/profiling/ProfilerTiming.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_uxxefqku net/minecraft/util/profiler/ProfilerTiming
CLASS net/minecraft/unmapped/C_uxxefqku net/minecraft/util/profiling/ProfilerTiming
FIELD f_dzjmlpxt totalUsagePercentage D
FIELD f_sjdcisnw visitCount J
FIELD f_tbizdich name Ljava/lang/String;
Expand Down
2 changes: 1 addition & 1 deletion ...ft/util/profiler/ReadableProfiler.mapping → ...t/util/profiling/ReadableProfiler.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_nvqxjbet net/minecraft/util/profiler/ReadableProfiler
CLASS net/minecraft/unmapped/C_nvqxjbet net/minecraft/util/profiling/ReadableProfiler
METHOD m_cjbnpkld getResult ()Lnet/minecraft/unmapped/C_dzczqjri;
METHOD m_dplpmkbo getInfo (Ljava/lang/String;)Lnet/minecraft/unmapped/C_dmgffhnu$C_mlnwkhwt;
ARG 1 name
Expand Down
2 changes: 1 addition & 1 deletion ...ecraft/util/profiler/RecordDumper.mapping → ...craft/util/profiling/RecordDumper.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_mxkrezql net/minecraft/util/profiler/RecordDumper
CLASS net/minecraft/unmapped/C_mxkrezql net/minecraft/util/profiling/RecordDumper
FIELD f_iqjhjixn METRICS_DIRECTORY Ljava/lang/String;
FIELD f_mbjlaqhe DEVIATIONS_DIRECTORY Ljava/lang/String;
FIELD f_ozdivxnb DEBUG_PROFILING_DIRECTORY Ljava/nio/file/Path;
Expand Down
2 changes: 1 addition & 1 deletion .../minecraft/util/profiler/Recorder.mapping → ...minecraft/util/profiling/Recorder.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_owhdirgj net/minecraft/util/profiler/Recorder
CLASS net/minecraft/unmapped/C_owhdirgj net/minecraft/util/profiling/Recorder
METHOD m_nmdwiiiv endTick ()V
METHOD m_ohtvfnza isActive ()Z
METHOD m_omqwrdxq stop ()V
Expand Down
2 changes: 1 addition & 1 deletion ...inecraft/util/profiler/SampleType.mapping → ...necraft/util/profiling/SampleType.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_oqsgkejx net/minecraft/util/profiler/SampleType
CLASS net/minecraft/unmapped/C_oqsgkejx net/minecraft/util/profiling/SampleType
FIELD f_iwrcwijq name Ljava/lang/String;
METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
ARG 3 name
Expand Down
2 changes: 1 addition & 1 deletion ...t/minecraft/util/profiler/Sampler.mapping → .../minecraft/util/profiling/Sampler.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_owhhojqn net/minecraft/util/profiler/Sampler
CLASS net/minecraft/unmapped/C_owhhojqn net/minecraft/util/profiling/Sampler
FIELD f_advtdgqc startAction Ljava/lang/Runnable;
FIELD f_bcrsdxez currentSample D
FIELD f_fgbmhebx deviationChecker Lnet/minecraft/unmapped/C_owhhojqn$C_nuurjoca;
Expand Down
2 changes: 1 addition & 1 deletion ...raft/util/profiler/SamplerFactory.mapping → ...aft/util/profiling/SamplerFactory.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_baucttzt net/minecraft/util/profiler/SamplerFactory
CLASS net/minecraft/unmapped/C_baucttzt net/minecraft/util/profiling/SamplerFactory
FIELD f_pfdchvqw sampledFullPaths Ljava/util/Set;
METHOD m_blfbxywj createSamplers (Ljava/util/function/Supplier;)Ljava/util/Set;
ARG 1 profilerSupplier
Expand Down
2 changes: 1 addition & 1 deletion ...craft/util/profiler/SamplerSource.mapping → ...raft/util/profiling/SamplerSource.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CLASS net/minecraft/unmapped/C_ttvdruyn net/minecraft/util/profiler/SamplerSource
CLASS net/minecraft/unmapped/C_ttvdruyn net/minecraft/util/profiling/SamplerSource
METHOD m_uhaewpbq getSamplers (Ljava/util/function/Supplier;)Ljava/util/Set;
ARG 1 profilerSupplier
2 changes: 1 addition & 1 deletion ...util/profiler/ServerSamplerSource.mapping → ...til/profiling/ServerSamplerSource.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_rghumcvt net/minecraft/util/profiler/ServerSamplerSource
CLASS net/minecraft/unmapped/C_rghumcvt net/minecraft/util/profiling/ServerSamplerSource
FIELD f_mkejpnli LOGGER Lorg/slf4j/Logger;
FIELD f_xtpondcq samplers Ljava/util/Set;
FIELD f_xznymisv factory Lnet/minecraft/unmapped/C_baucttzt;
Expand Down
2 changes: 1 addition & 1 deletion ...aft/util/profiler/TickTimeTracker.mapping → ...ft/util/profiling/TickTimeTracker.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_trqmdcbh net/minecraft/util/profiler/TickTimeTracker
CLASS net/minecraft/unmapped/C_trqmdcbh net/minecraft/util/profiling/TickTimeTracker
FIELD f_eadvbmaw profiler Lnet/minecraft/unmapped/C_nvqxjbet;
FIELD f_tjynfgrc tickGetter Ljava/util/function/IntSupplier;
FIELD f_xfjqouwb timeGetter Ljava/util/function/LongSupplier;
Expand Down

3 comments on commit c6e0bf6

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With commit c6e0bf6, 91 file(s) were updated with 370 line(s) added and 368 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
diff -bur namedTargetSrc/net/minecraft/client/font/FontManager.java namedSrc/net/minecraft/client/font/FontManager.java
--- namedTargetSrc/net/minecraft/client/font/FontManager.java	2024-10-17 02:53:20.345619318 +0000
+++ namedSrc/net/minecraft/client/font/FontManager.java	2024-10-17 02:52:09.813022974 +0000
@@ -40,11 +40,11 @@
 import net.minecraft.resource.Resource;
 import net.minecraft.resource.ResourceManager;
 import net.minecraft.resource.ResourceReloader;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.DependencySorter;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 
@@ -132,7 +132,7 @@
    ) {
       return this.prepare(resourceManager, prepareExecutor)
          .thenCompose(synchronizer::whenPrepared)
-         .thenAcceptAsync(preparation -> this.reload(preparation, C_xuophqnt.m_yaecfwdp()), applyExecutor);
+         .thenAcceptAsync(preparation -> this.reload(preparation, ProfilerManager.m_yaecfwdp()), applyExecutor);
    }
 
    /**
@@ -256,7 +256,7 @@
 
    /**
     * @mapping {@literal hashed m_ryfntqre Lnet/minecraft/unmapped/C_hoztwset;m_ryfntqre(Lnet/minecraft/unmapped/C_hoztwset$C_mlohqlpb;Lnet/minecraft/unmapped/C_eslcbfsq;)V}
-    * @mapping {@literal named reload Lnet/minecraft/client/font/FontManager;reload(Lnet/minecraft/client/font/FontManager$Preparation;Lnet/minecraft/util/profiler/Profiler;)V}
+    * @mapping {@literal named reload Lnet/minecraft/client/font/FontManager;reload(Lnet/minecraft/client/font/FontManager$Preparation;Lnet/minecraft/util/profiling/Profiler;)V}
     */
    private void reload(FontManager.Preparation preparation, Profiler profiler) {
       profiler.push("closing");
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/boss_bar/BossBarHud.java namedSrc/net/minecraft/client/gui/hud/boss_bar/BossBarHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/boss_bar/BossBarHud.java	2024-10-17 02:53:20.329619185 +0000
+++ namedSrc/net/minecraft/client/gui/hud/boss_bar/BossBarHud.java	2024-10-17 02:52:09.785022783 +0000
@@ -11,10 +11,10 @@
 import net.minecraft.entity.boss.BossBar;
 import net.minecraft.network.packet.s2c.play.BossBarUpdateS2CPacket;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_vpkfuxkl}
@@ -103,7 +103,7 @@
     */
    public void render(GuiGraphics graphics) {
       if (!this.bossBars.isEmpty()) {
-         Profiler lv = C_xuophqnt.m_yaecfwdp();
+         Profiler lv = ProfilerManager.m_yaecfwdp();
          lv.push("bossHealth");
          int i = graphics.getScaledWindowWidth();
          int j = 12;
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/chat/ChatHud.java namedSrc/net/minecraft/client/gui/hud/chat/ChatHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/chat/ChatHud.java	2024-10-17 02:53:20.169617841 +0000
+++ namedSrc/net/minecraft/client/gui/hud/chat/ChatHud.java	2024-10-17 02:52:09.521020975 +0000
@@ -17,12 +17,12 @@
 import net.minecraft.text.OrderedText;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.ArrayListDeque;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Nullables;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 
@@ -136,7 +136,7 @@
          int l = this.getVisibleLineCount();
          int m = this.visibleMessages.size();
          if (m > 0) {
-            Profiler lv = C_xuophqnt.m_yaecfwdp();
+            Profiler lv = ProfilerManager.m_yaecfwdp();
             lv.push("chat");
             float f = (float)this.getChatScale();
             int n = MathHelper.ceil((float)this.getWidth() / f);
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/debug/DebugHud.java namedSrc/net/minecraft/client/gui/hud/debug/DebugHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/debug/DebugHud.java	2024-10-17 02:53:20.397619754 +0000
+++ namedSrc/net/minecraft/client/gui/hud/debug/DebugHud.java	2024-10-17 02:52:09.885023467 +0000
@@ -44,7 +44,6 @@
 import net.minecraft.unmapped.C_pwpucsml;
 import net.minecraft.unmapped.C_vfghmpoz;
 import net.minecraft.unmapped.C_vjopooww;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.DebugSampleType;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
@@ -56,7 +55,8 @@
 import net.minecraft.util.math.ChunkSectionPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.world.Heightmap;
 import net.minecraft.world.LightType;
 import net.minecraft.world.LocalDifficulty;
@@ -254,7 +254,7 @@
     * @mapping {@literal named render Lnet/minecraft/client/gui/hud/debug/DebugHud;render(Lnet/minecraft/client/gui/GuiGraphics;)V}
     */
    public void render(GuiGraphics graphics) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("debug");
       Entity lv2 = this.client.getCameraEntity();
       this.blockHit = lv2.raycast(20.0, 0.0F, false);
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java namedSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java	2024-10-17 02:53:20.257618580 +0000
+++ namedSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java	2024-10-17 02:52:09.669021989 +0000
@@ -56,7 +56,6 @@
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_duiqsjgf;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.ArgbHelper;
 import net.minecraft.util.Arm;
 import net.minecraft.util.ChatUtil;
@@ -68,6 +67,7 @@
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.world.GameMode;
 import net.minecraft.world.World;
@@ -637,7 +637,7 @@
     */
    private void renderSleep(GuiGraphics graphics, DeltaTracker tracker) {
       if (this.client.player.getSleepTimer() > 0) {
-         C_xuophqnt.m_yaecfwdp().push("sleep");
+         ProfilerManager.m_yaecfwdp().push("sleep");
          float f = (float)this.client.player.getSleepTimer();
          float g = f / 100.0F;
          if (g > 1.0F) {
@@ -646,7 +646,7 @@
 
          int i = (int)(220.0F * g) << 24 | 1052704;
          graphics.fill(RenderLayer.getGuiOverlay(), 0, 0, graphics.getScaledWindowWidth(), graphics.getScaledWindowHeight(), i);
-         C_xuophqnt.m_yaecfwdp().pop();
+         ProfilerManager.m_yaecfwdp().pop();
       }
    }
 
@@ -657,7 +657,7 @@
    private void renderOverlayMessage(GuiGraphics graphics, DeltaTracker tracker) {
       TextRenderer lv = this.getTextRenderer();
       if (this.overlayMessage != null && this.overlayRemaining > 0) {
-         C_xuophqnt.m_yaecfwdp().push("overlayMessage");
+         ProfilerManager.m_yaecfwdp().push("overlayMessage");
          float f = (float)this.overlayRemaining - tracker.getTickDelta(false);
          int i = (int)(f * 255.0F / 20.0F);
          if (i > 255) {
@@ -679,7 +679,7 @@
             graphics.getMatrices().pop();
          }
 
-         C_xuophqnt.m_yaecfwdp().pop();
+         ProfilerManager.m_yaecfwdp().pop();
       }
    }
 
@@ -690,7 +690,7 @@
    private void renderTitles(GuiGraphics graphics, DeltaTracker tracker) {
       if (this.title != null && this.titleTotalTicks > 0) {
          TextRenderer lv = this.getTextRenderer();
-         C_xuophqnt.m_yaecfwdp().push("titleAndSubtitle");
+         ProfilerManager.m_yaecfwdp().push("titleAndSubtitle");
          float f = (float)this.titleTotalTicks - tracker.getTickDelta(false);
          int i = 255;
          if (this.titleTotalTicks > this.titleFadeOutTicks + this.titleRemainTicks) {
@@ -723,7 +723,7 @@
             graphics.getMatrices().pop();
          }
 
-         C_xuophqnt.m_yaecfwdp().pop();
+         ProfilerManager.m_yaecfwdp().pop();
       }
    }
 
@@ -998,7 +998,7 @@
     * @mapping {@literal named renderMountJumpBar Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderMountJumpBar(Lnet/minecraft/entity/JumpingMount;Lnet/minecraft/client/gui/GuiGraphics;I)V}
     */
    private void renderMountJumpBar(JumpingMount mount, GuiGraphics graphics, int x) {
-      C_xuophqnt.m_yaecfwdp().push("jumpBar");
+      ProfilerManager.m_yaecfwdp().push("jumpBar");
       float f = this.client.player.getMountJumpStrength();
       int j = 182;
       int k = (int)(f * 183.0F);
@@ -1010,7 +1010,7 @@
          graphics.m_zrsopato(RenderLayer::getGuiTextured, JUMP_BAR_PROGRESS, 182, 5, 0, 0, x, l, k, 5);
       }
 
-      C_xuophqnt.m_yaecfwdp().pop();
+      ProfilerManager.m_yaecfwdp().pop();
    }
 
    /**
@@ -1018,7 +1018,7 @@
     * @mapping {@literal named renderExperienceBar Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderExperienceBar(Lnet/minecraft/client/gui/GuiGraphics;I)V}
     */
    private void renderExperienceBar(GuiGraphics graphics, int x) {
-      C_xuophqnt.m_yaecfwdp().push("expBar");
+      ProfilerManager.m_yaecfwdp().push("expBar");
       int j = this.client.player.getNextLevelExperience();
       if (j > 0) {
          int k = 182;
@@ -1030,7 +1030,7 @@
          }
       }
 
-      C_xuophqnt.m_yaecfwdp().pop();
+      ProfilerManager.m_yaecfwdp().pop();
    }
 
    /**
@@ -1040,7 +1040,7 @@
    private void renderExperienceLevel(GuiGraphics graphics, DeltaTracker tracker) {
       int i = this.client.player.experienceLevel;
       if (this.shouldRenderExperience() && i > 0) {
-         C_xuophqnt.m_yaecfwdp().push("expLevel");
+         ProfilerManager.m_yaecfwdp().push("expLevel");
          String string = i + "";
          int j = (graphics.getScaledWindowWidth() - this.getTextRenderer().getWidth(string)) / 2;
          int k = graphics.getScaledWindowHeight() - 31 - 4;
@@ -1049,7 +1049,7 @@
          graphics.drawText(this.getTextRenderer(), string, j, k + 1, 0, false);
          graphics.drawText(this.getTextRenderer(), string, j, k - 1, 0, false);
          graphics.drawText(this.getTextRenderer(), string, j, k, 8453920, false);
-         C_xuophqnt.m_yaecfwdp().pop();
+         ProfilerManager.m_yaecfwdp().pop();
       }
    }
 
@@ -1066,7 +1066,7 @@
     * @mapping {@literal named renderHeldItemTooltip Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderHeldItemTooltip(Lnet/minecraft/client/gui/GuiGraphics;)V}
     */
    private void renderHeldItemTooltip(GuiGraphics graphics) {
-      C_xuophqnt.m_yaecfwdp().push("selectedItemName");
+      ProfilerManager.m_yaecfwdp().push("selectedItemName");
       if (this.heldItemTooltipFade > 0 && !this.currentStack.isEmpty()) {
          MutableText lv = Text.empty().append(this.currentStack.getName()).formatted(this.currentStack.getRarity().getFormatting());
          if (this.currentStack.contains(DataComponentTypes.CUSTOM_NAME)) {
@@ -1090,7 +1090,7 @@
          }
       }
 
-      C_xuophqnt.m_yaecfwdp().pop();
+      ProfilerManager.m_yaecfwdp().pop();
    }
 
    /**
@@ -1099,7 +1099,7 @@
     */
    private void renderDemoTimer(GuiGraphics graphics, DeltaTracker tracker) {
       if (this.client.isDemo()) {
-         C_xuophqnt.m_yaecfwdp().push("demo");
+         ProfilerManager.m_yaecfwdp().push("demo");
          Text lv;
          if (this.client.world.getTime() >= 120500L) {
             lv = DEMO_EXPIRED_MESSAGE;
@@ -1113,7 +1113,7 @@
          int j = graphics.getScaledWindowWidth() - i - 10;
          int k = 5;
          graphics.drawTextWithBackground(this.getTextRenderer(), lv, j, 5, i, -1);
-         C_xuophqnt.m_yaecfwdp().pop();
+         ProfilerManager.m_yaecfwdp().pop();
       }
    }
 
@@ -1274,21 +1274,21 @@
             s = this.ticks % MathHelper.ceil(f + 5.0F);
          }
 
-         C_xuophqnt.m_yaecfwdp().push("armor");
+         ProfilerManager.m_yaecfwdp().push("armor");
          renderArmorBar(graphics, lv, n, p, q, k);
-         C_xuophqnt.m_yaecfwdp().swap("health");
+         ProfilerManager.m_yaecfwdp().swap("health");
          this.renderHealthBar(graphics, lv, k, n, q, s, f, i, j, o, bl);
          LivingEntity lv2 = this.getRiddenEntity();
          int t = this.getHeartCount(lv2);
          if (t == 0) {
-            C_xuophqnt.m_yaecfwdp().swap("food");
+            ProfilerManager.m_yaecfwdp().swap("food");
             this.renderHungerBar(graphics, lv, n, m);
             r -= 10;
          }
 
-         C_xuophqnt.m_yaecfwdp().swap("air");
+         ProfilerManager.m_yaecfwdp().swap("air");
          this.m_vygraerl(graphics, lv, t, r, m);
-         C_xuophqnt.m_yaecfwdp().pop();
+         ProfilerManager.m_yaecfwdp().pop();
       }
    }
 
@@ -1503,7 +1503,7 @@
          int i = this.getHeartCount(lv);
          if (i != 0) {
             int j = (int)Math.ceil((double)lv.getHealth());
-            C_xuophqnt.m_yaecfwdp().swap("mountHealth");
+            ProfilerManager.m_yaecfwdp().swap("mountHealth");
             int k = graphics.getScaledWindowHeight() - 39;
             int l = graphics.getScaledWindowWidth() / 2 + 91;
             int m = k;
diff -bur namedTargetSrc/net/minecraft/client/gui/ParentElement.java namedSrc/net/minecraft/client/gui/ParentElement.java
--- namedTargetSrc/net/minecraft/client/gui/ParentElement.java	2024-10-17 02:53:20.261618614 +0000
+++ namedSrc/net/minecraft/client/gui/ParentElement.java	2024-10-17 02:52:09.677022043 +0000
@@ -153,7 +153,7 @@
     * Mapping not found
     */
    @Override
-   default void setFocused(boolean bl) {
+   default void setFocused(boolean focused) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsMainScreen.java namedSrc/net/minecraft/client/gui/screen/realms/RealmsMainScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsMainScreen.java	2024-10-17 02:53:20.357619419 +0000
+++ namedSrc/net/minecraft/client/gui/screen/realms/RealmsMainScreen.java	2024-10-17 02:52:09.829023084 +0000
@@ -1506,9 +1506,9 @@
        * Mapping not found
        */
       @Override
-      public void setFocused(boolean bl) {
-         super.setFocused(bl);
-         this.button.setFocused(bl);
+      public void setFocused(boolean focused) {
+         super.setFocused(focused);
+         this.button.setFocused(focused);
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2024-10-17 02:53:20.381619620 +0000
+++ namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2024-10-17 02:52:09.865023331 +0000
@@ -447,8 +447,8 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
-      this.focused = bl;
+   public void setFocused(boolean focused) {
+      this.focused = focused;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/DraggingWidget.java namedSrc/net/minecraft/client/gui/widget/DraggingWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/DraggingWidget.java	2024-10-17 02:53:20.269618681 +0000
+++ namedSrc/net/minecraft/client/gui/widget/DraggingWidget.java	2024-10-17 02:52:09.685022098 +0000
@@ -121,7 +121,7 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
-      ParentElement.super.setFocused(bl);
+   public void setFocused(boolean focused) {
+      ParentElement.super.setFocused(focused);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/EditBoxWidget.java namedSrc/net/minecraft/client/gui/widget/EditBoxWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/EditBoxWidget.java	2024-10-17 02:53:20.341619285 +0000
+++ namedSrc/net/minecraft/client/gui/widget/EditBoxWidget.java	2024-10-17 02:52:09.805022920 +0000
@@ -342,9 +342,9 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
-      super.setFocused(bl);
-      if (bl) {
+   public void setFocused(boolean focused) {
+      super.setFocused(focused);
+      if (focused) {
          this.focusTime = Util.getMeasuringTimeMs();
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/HeaderBar.java namedSrc/net/minecraft/client/gui/widget/HeaderBar.java
--- namedTargetSrc/net/minecraft/client/gui/widget/HeaderBar.java	2024-10-17 02:53:20.425619990 +0000
+++ namedSrc/net/minecraft/client/gui/widget/HeaderBar.java	2024-10-17 02:52:09.937023824 +0000
@@ -122,10 +122,10 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
-      super.setFocused(bl);
+   public void setFocused(boolean focused) {
+      super.setFocused(focused);
       if (this.getFocused() != null) {
-         this.getFocused().setFocused(bl);
+         this.getFocused().setFocused(focused);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java namedSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java	2024-10-17 02:53:20.193618043 +0000
+++ namedSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java	2024-10-17 02:52:09.557021222 +0000
@@ -908,7 +908,7 @@
        * @mapping {@literal named setFocused Lnet/minecraft/client/gui/widget/list/EntryListWidget$Entry;setFocused(Z)V}
        */
       @Override
-      public void setFocused(boolean bl) {
+      public void setFocused(boolean focused) {
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java	2024-10-17 02:53:20.269618681 +0000
+++ namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java	2024-10-17 02:52:09.685022098 +0000
@@ -249,7 +249,7 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
+   public void setFocused(boolean focused) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java	2024-10-17 02:53:20.389619688 +0000
+++ namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java	2024-10-17 02:52:09.873023385 +0000
@@ -742,7 +742,7 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
+   public void setFocused(boolean focused) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/SliderWidget.java namedSrc/net/minecraft/client/gui/widget/SliderWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/SliderWidget.java	2024-10-17 02:53:20.181617942 +0000
+++ namedSrc/net/minecraft/client/gui/widget/SliderWidget.java	2024-10-17 02:52:09.541021112 +0000
@@ -151,9 +151,9 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
-      super.setFocused(bl);
-      if (!bl) {
+   public void setFocused(boolean focused) {
+      super.setFocused(focused);
+      if (!focused) {
          this.mutable = false;
       } else {
          InputType lv = MinecraftClient.getInstance().getLastInputType();
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/TextFieldWidget.java namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2024-10-17 02:53:20.209618178 +0000
+++ namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2024-10-17 02:52:09.585021413 +0000
@@ -736,10 +736,10 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
-      if (this.focusUnlocked || bl) {
-         super.setFocused(bl);
-         if (bl) {
+   public void setFocused(boolean focused) {
+      if (this.focusUnlocked || focused) {
+         super.setFocused(focused);
+         if (focused) {
             this.lastFocusTime = Util.getMeasuringTimeMs();
          }
       }
diff -bur namedTargetSrc/net/minecraft/client/MinecraftClient.java namedSrc/net/minecraft/client/MinecraftClient.java
--- namedTargetSrc/net/minecraft/client/MinecraftClient.java	2024-10-17 02:53:20.213618211 +0000
+++ namedSrc/net/minecraft/client/MinecraftClient.java	2024-10-17 02:52:09.593021468 +0000
@@ -212,7 +212,6 @@
 import net.minecraft.unmapped.C_vjopooww;
 import net.minecraft.unmapped.C_wjalbado;
 import net.minecraft.unmapped.C_wmelrump;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.FileNameUtil;
 import net.minecraft.util.Formatting;
@@ -239,15 +238,16 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.path.SymlinkValidator;
-import net.minecraft.util.profiler.DebugRecorder;
-import net.minecraft.util.profiler.DummyProfiler;
-import net.minecraft.util.profiler.DummyRecorder;
-import net.minecraft.util.profiler.EmptyProfileResult;
-import net.minecraft.util.profiler.ProfileResult;
-import net.minecraft.util.profiler.Profiler;
-import net.minecraft.util.profiler.RecordDumper;
-import net.minecraft.util.profiler.Recorder;
-import net.minecraft.util.profiler.TickTimeTracker;
+import net.minecraft.util.profiling.DebugRecorder;
+import net.minecraft.util.profiling.DummyProfiler;
+import net.minecraft.util.profiling.DummyRecorder;
+import net.minecraft.util.profiling.EmptyProfileResult;
+import net.minecraft.util.profiling.ProfileResult;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
+import net.minecraft.util.profiling.RecordDumper;
+import net.minecraft.util.profiling.Recorder;
+import net.minecraft.util.profiling.TickTimeTracker;
 import net.minecraft.util.thread.ReentrantThreadExecutor;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
@@ -942,12 +942,12 @@
    private int trackingTick;
    /**
     * @mapping {@literal hashed f_zeykonab Lnet/minecraft/unmapped/C_ayfeobid;f_zeykonab:Lnet/minecraft/unmapped/C_trqmdcbh;}
-    * @mapping {@literal named tickTimeTracker Lnet/minecraft/client/MinecraftClient;tickTimeTracker:Lnet/minecraft/util/profiler/TickTimeTracker;}
+    * @mapping {@literal named tickTimeTracker Lnet/minecraft/client/MinecraftClient;tickTimeTracker:Lnet/minecraft/util/profiling/TickTimeTracker;}
     */
    private final TickTimeTracker tickTimeTracker = new TickTimeTracker(Util.nanoTimeSupplier, () -> this.trackingTick);
    /**
     * @mapping {@literal hashed f_ejyvfwpb Lnet/minecraft/unmapped/C_ayfeobid;f_ejyvfwpb:Lnet/minecraft/unmapped/C_owhdirgj;}
-    * @mapping {@literal named recorder Lnet/minecraft/client/MinecraftClient;recorder:Lnet/minecraft/util/profiler/Recorder;}
+    * @mapping {@literal named recorder Lnet/minecraft/client/MinecraftClient;recorder:Lnet/minecraft/util/profiling/Recorder;}
     */
    private Recorder recorder = DummyRecorder.INSTANCE;
    /**
@@ -1515,7 +1515,7 @@
                TickDurationMonitor lv = TickDurationMonitor.create("Renderer");
                boolean bl2 = this.resetDebugHudChunk().profilerChartVisible();
 
-               try (C_xuophqnt.C_gknixwqr lv2 = C_xuophqnt.m_zzebcxlx(this.startMonitor(bl2, lv))) {
+               try (ProfilerManager.Scope lv2 = ProfilerManager.m_zzebcxlx(this.startMonitor(bl2, lv))) {
                   this.recorder.startTick();
                   discontinuousFrame.start();
                   this.render(!bl);
@@ -1971,7 +1971,7 @@
       }
 
       int i = this.f_txxfjovh.getDelta(Util.getMeasuringTimeMs(), tick);
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       if (tick) {
          lv.push("scheduledExecutables");
          this.runTasks();
@@ -2092,7 +2092,7 @@
 
    /**
     * @mapping {@literal hashed m_bpwoykoi Lnet/minecraft/unmapped/C_ayfeobid;m_bpwoykoi(ZLnet/minecraft/unmapped/C_vuxtoiqa;)Lnet/minecraft/unmapped/C_eslcbfsq;}
-    * @mapping {@literal named startMonitor Lnet/minecraft/client/MinecraftClient;startMonitor(ZLnet/minecraft/util/TickDurationMonitor;)Lnet/minecraft/util/profiler/Profiler;}
+    * @mapping {@literal named startMonitor Lnet/minecraft/client/MinecraftClient;startMonitor(ZLnet/minecraft/util/TickDurationMonitor;)Lnet/minecraft/util/profiling/Profiler;}
     */
    private Profiler startMonitor(boolean active, @Nullable TickDurationMonitor monitor) {
       if (!active) {
@@ -2540,7 +2540,7 @@
          this.itemUseCooldown--;
       }
 
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("gui");
       this.chatListener.tick();
       this.inGameHud.tick(this.paused);
@@ -2867,7 +2867,7 @@
       }
 
       WorldLoadingScreen lv4 = new WorldLoadingScreen((WorldGenerationProgressTracker)this.worldGenProgressTracker.get());
-      Profiler lv5 = C_xuophqnt.m_yaecfwdp();
+      Profiler lv5 = ProfilerManager.m_yaecfwdp();
       this.setScreen(lv4);
       lv5.push("waitForServer");
 
@@ -2952,7 +2952,7 @@
          this.reset(arg);
          if (this.world != null) {
             if (lv2 != null) {
-               Profiler lv3 = C_xuophqnt.m_yaecfwdp();
+               Profiler lv3 = ProfilerManager.m_yaecfwdp();
                lv3.push("waitForServer");
 
                while (!lv2.isStopping()) {
@@ -3021,7 +3021,7 @@
     * @mapping {@literal named reset Lnet/minecraft/client/MinecraftClient;reset(Lnet/minecraft/client/gui/screen/Screen;)V}
     */
    private void reset(Screen screen) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("forcedTick");
       this.soundManager.stopAll();
       this.cameraEntity = null;
@@ -3036,7 +3036,7 @@
     * @mapping {@literal named forceSetScreen Lnet/minecraft/client/MinecraftClient;forceSetScreen(Lnet/minecraft/client/gui/screen/Screen;)V}
     */
    public void forceSetScreen(Screen screen) {
-      try (C_faujnouj lv = C_xuophqnt.m_yaecfwdp().m_zqvmpjqi("forcedTick")) {
+      try (C_faujnouj lv = ProfilerManager.m_yaecfwdp().m_zqvmpjqi("forcedTick")) {
          this.setScreen(screen);
          this.render(false);
       }
diff -bur namedTargetSrc/net/minecraft/client/network/OtherClientPlayerEntity.java namedSrc/net/minecraft/client/network/OtherClientPlayerEntity.java
--- namedTargetSrc/net/minecraft/client/network/OtherClientPlayerEntity.java	2024-10-17 02:53:20.421619956 +0000
+++ namedSrc/net/minecraft/client/network/OtherClientPlayerEntity.java	2024-10-17 02:52:09.925023741 +0000
@@ -7,8 +7,8 @@
 import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.network.packet.s2c.play.EntitySpawnS2CPacket;
 import net.minecraft.unmapped.C_faujnouj;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.profiling.ProfilerManager;
 
 /**
  * Represents a player entity that is present on the client but is not the client's own player.
@@ -106,7 +106,7 @@
 
       this.strideDistance = this.strideDistance + (g - this.strideDistance) * 0.4F;
 
-      try (C_faujnouj lv = C_xuophqnt.m_yaecfwdp().m_zqvmpjqi("push")) {
+      try (C_faujnouj lv = ProfilerManager.m_yaecfwdp().m_zqvmpjqi("push")) {
          this.tickCramming();
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/particle/ParticleManager.java namedSrc/net/minecraft/client/particle/ParticleManager.java
--- namedTargetSrc/net/minecraft/client/particle/ParticleManager.java	2024-10-17 02:53:20.241618446 +0000
+++ namedSrc/net/minecraft/client/particle/ParticleManager.java	2024-10-17 02:52:09.637021770 +0000
@@ -50,7 +50,6 @@
 import net.minecraft.resource.ResourceReloader;
 import net.minecraft.unmapped.C_axlfjhap;
 import net.minecraft.unmapped.C_lcocztnk;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.JsonHelper;
 import net.minecraft.util.Util;
@@ -61,7 +60,8 @@
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.util.shape.VoxelShape;
 import org.jetbrains.annotations.Nullable;
@@ -350,7 +350,7 @@
          .thenCompose(SpriteLoader.SpritePreparations::waitForUpload);
       return CompletableFuture.allOf(completableFuture2, completableFuture).thenCompose(synchronizer::whenPrepared).thenAcceptAsync(unused -> {
          this.clear();
-         Profiler lv = C_xuophqnt.m_yaecfwdp();
+         Profiler lv = ProfilerManager.m_yaecfwdp();
          lv.push("upload");
          SpriteLoader.SpritePreparations lv2 = (SpriteLoader.SpritePreparations)completableFuture2.join();
          this.particleAtlasTexture.upload(lv2);
@@ -497,9 +497,9 @@
     */
    public void tick() {
       this.particles.forEach((particleId, particles) -> {
-         C_xuophqnt.m_yaecfwdp().push(particleId.toString());
+         ProfilerManager.m_yaecfwdp().push(particleId.toString());
          this.tickParticles(particles);
-         C_xuophqnt.m_yaecfwdp().pop();
+         ProfilerManager.m_yaecfwdp().pop();
       });
       if (!this.newEmitterParticles.isEmpty()) {
          List<EmitterParticle> list = Lists.<EmitterParticle>newArrayList();
diff -bur namedTargetSrc/net/minecraft/client/PeriodicNotificationManager.java namedSrc/net/minecraft/client/PeriodicNotificationManager.java
--- namedTargetSrc/net/minecraft/client/PeriodicNotificationManager.java	2024-10-17 02:53:20.409619856 +0000
+++ namedSrc/net/minecraft/client/PeriodicNotificationManager.java	2024-10-17 02:52:09.909023632 +0000
@@ -26,7 +26,7 @@
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 
@@ -94,7 +94,7 @@
 
    /**
     * @mapping {@literal hashed m_ihhhkhoq Lnet/minecraft/unmapped/C_bianxjxy;m_ihhhkhoq(Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)Ljava/util/Map;}
-    * @mapping {@literal named prepare Lnet/minecraft/client/PeriodicNotificationManager;prepare(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)Ljava/util/Map;}
+    * @mapping {@literal named prepare Lnet/minecraft/client/PeriodicNotificationManager;prepare(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiling/Profiler;)Ljava/util/Map;}
     */
    protected Map<String, List<PeriodicNotificationManager.Notification>> prepare(ResourceManager resourceManager, Profiler profiler) {
       try {
@@ -128,7 +128,7 @@
 
    /**
     * @mapping {@literal hashed m_zcxqsznt Lnet/minecraft/unmapped/C_bianxjxy;m_zcxqsznt(Ljava/util/Map;Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)V}
-    * @mapping {@literal named apply Lnet/minecraft/client/PeriodicNotificationManager;apply(Ljava/util/Map;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V}
+    * @mapping {@literal named apply Lnet/minecraft/client/PeriodicNotificationManager;apply(Ljava/util/Map;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiling/Profiler;)V}
     */
    protected void apply(Map<String, List<PeriodicNotificationManager.Notification>> map, ResourceManager resourceManager, Profiler profiler) {
       List<PeriodicNotificationManager.Notification> list = (List<PeriodicNotificationManager.Notification>)map.entrySet()
diff -bur namedTargetSrc/net/minecraft/client/render/chunk/ChunkBuilder.java namedSrc/net/minecraft/client/render/chunk/ChunkBuilder.java
--- namedTargetSrc/net/minecraft/client/render/chunk/ChunkBuilder.java	2024-10-17 02:53:20.401619788 +0000
+++ namedSrc/net/minecraft/client/render/chunk/ChunkBuilder.java	2024-10-17 02:52:09.893023522 +0000
@@ -36,7 +36,6 @@
 import net.minecraft.unmapped.C_dhavtmvf;
 import net.minecraft.unmapped.C_faujnouj;
 import net.minecraft.unmapped.C_ncoptjwe;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.unmapped.C_xvtyhamt;
 import net.minecraft.util.Util;
 import net.minecraft.util.crash.CrashReport;
@@ -46,6 +45,7 @@
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.world.chunk.ChunkStatus;
 import org.jetbrains.annotations.Nullable;
 
@@ -277,7 +277,7 @@
          if (vertices.invalid()) {
             buffer.close();
          } else {
-            try (C_faujnouj lv = C_xuophqnt.m_yaecfwdp().m_zqvmpjqi("Upload Section Layer")) {
+            try (C_faujnouj lv = ProfilerManager.m_yaecfwdp().m_zqvmpjqi("Upload Section Layer")) {
                vertices.bind();
                vertices.upload(buffer);
                VertexBuffer.unbind();
@@ -295,7 +295,7 @@
          if (vertices.invalid()) {
             view.close();
          } else {
-            try (C_faujnouj lv = C_xuophqnt.m_yaecfwdp().m_zqvmpjqi("Upload Section Indices")) {
+            try (C_faujnouj lv = ProfilerManager.m_yaecfwdp().m_zqvmpjqi("Upload Section Indices")) {
                vertices.bind();
                vertices.uploadView(view);
                VertexBuffer.unbind();
@@ -895,7 +895,7 @@
                      return CompletableFuture.completedFuture(ChunkBuilder.Result.CANCELLED);
                   } else {
                      SectionBuilder.Result lv4;
-                     try (C_faujnouj lv3 = C_xuophqnt.m_yaecfwdp().m_zqvmpjqi("Compile Section")) {
+                     try (C_faujnouj lv3 = ProfilerManager.m_yaecfwdp().m_zqvmpjqi("Compile Section")) {
                         lv4 = ChunkBuilder.this.sectionBuilder.build(lv2, lv, Section.this.createVertexSorting(), storage);
                      }
 
diff -bur namedTargetSrc/net/minecraft/client/render/CloudRenderer.java namedSrc/net/minecraft/client/render/CloudRenderer.java
--- namedTargetSrc/net/minecraft/client/render/CloudRenderer.java	2024-10-17 02:53:20.165617808 +0000
+++ namedSrc/net/minecraft/client/render/CloudRenderer.java	2024-10-17 02:52:09.513020921 +0000
@@ -21,7 +21,7 @@
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Matrix4f;
 import org.slf4j.Logger;
@@ -132,7 +132,7 @@
 
    /**
     * @mapping {@literal hashed m_tnocyzgi Lnet/minecraft/unmapped/C_jjygzmqz;m_tnocyzgi(Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)Ljava/util/Optional;}
-    * @mapping {@literal named prepare Lnet/minecraft/client/render/CloudRenderer;prepare(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)Ljava/util/Optional;}
+    * @mapping {@literal named prepare Lnet/minecraft/client/render/CloudRenderer;prepare(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiling/Profiler;)Ljava/util/Optional;}
     */
    protected Optional<CloudRenderer.Data> prepare(ResourceManager resourceManager, Profiler profiler) {
       try {
@@ -185,7 +185,7 @@
 
    /**
     * @mapping {@literal hashed m_xzhmwqmp Lnet/minecraft/unmapped/C_jjygzmqz;m_xzhmwqmp(Ljava/util/Optional;Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)V}
-    * @mapping {@literal named apply Lnet/minecraft/client/render/CloudRenderer;apply(Ljava/util/Optional;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V}
+    * @mapping {@literal named apply Lnet/minecraft/client/render/CloudRenderer;apply(Ljava/util/Optional;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiling/Profiler;)V}
     */
    protected void apply(Optional<CloudRenderer.Data> optional, ResourceManager resourceManager, Profiler profiler) {
       this.data = (CloudRenderer.Data)optional.orElse(null);
diff -bur namedTargetSrc/net/minecraft/client/render/GameRenderer.java namedSrc/net/minecraft/client/render/GameRenderer.java
--- namedTargetSrc/net/minecraft/client/render/GameRenderer.java	2024-10-17 02:53:20.209618178 +0000
+++ namedSrc/net/minecraft/client/render/GameRenderer.java	2024-10-17 02:52:09.581021386 +0000
@@ -46,7 +46,6 @@
 import net.minecraft.unmapped.C_fpwiwmrb;
 import net.minecraft.unmapped.C_kwqwwnex;
 import net.minecraft.unmapped.C_qrsmnkgy;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
 import net.minecraft.util.crash.CrashCallable;
@@ -62,7 +61,8 @@
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.world.GameMode;
 import org.jetbrains.annotations.Nullable;
@@ -449,13 +449,13 @@
       Entity lv = this.client.getCameraEntity();
       if (lv != null) {
          if (this.client.world != null && this.client.player != null) {
-            C_xuophqnt.m_yaecfwdp().push("pick");
+            ProfilerManager.m_yaecfwdp().push("pick");
             double d = this.client.player.getBlockInteractionRange();
             double e = this.client.player.getEntityInteractionRange();
             HitResult lv2 = this.getPotentialHit(lv, d, e, tickDelta);
             this.client.crosshairTarget = lv2;
             this.client.targetedEntity = lv2 instanceof EntityHitResult lv3 ? lv3.getEntity() : null;
-            C_xuophqnt.m_yaecfwdp().pop();
+            ProfilerManager.m_yaecfwdp().pop();
          }
       }
    }
@@ -697,7 +697,7 @@
       }
 
       if (!this.client.skipGameRender) {
-         Profiler lv = C_xuophqnt.m_yaecfwdp();
+         Profiler lv = ProfilerManager.m_yaecfwdp();
          boolean bl2 = this.client.m_urweyuhi();
          int i = (int)(this.client.mouse.getX() * (double)this.client.getWindow().getScaledWidth() / (double)this.client.getWindow().getWidth());
          int j = (int)(this.client.mouse.getY() * (double)this.client.getWindow().getScaledHeight() / (double)this.client.getWindow().getHeight());
@@ -911,7 +911,7 @@
       }
 
       this.updateCrosshairTarget(f);
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("center");
       boolean bl = this.shouldRenderBlockOutline();
       lv.swap("camera");
diff -bur namedTargetSrc/net/minecraft/client/render/LightmapTextureManager.java namedSrc/net/minecraft/client/render/LightmapTextureManager.java
--- namedTargetSrc/net/minecraft/client/render/LightmapTextureManager.java	2024-10-17 02:53:20.265618647 +0000
+++ namedSrc/net/minecraft/client/render/LightmapTextureManager.java	2024-10-17 02:52:09.677022043 +0000
@@ -16,9 +16,9 @@
 import net.minecraft.entity.effect.StatusEffects;
 import net.minecraft.unmapped.C_kfcjpoxm;
 import net.minecraft.unmapped.C_qrsmnkgy;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.world.dimension.DimensionType;
 import org.joml.Vector3f;
 
@@ -160,7 +160,7 @@
    public void update(float delta) {
       if (this.dirty) {
          this.dirty = false;
-         Profiler lv = C_xuophqnt.m_yaecfwdp();
+         Profiler lv = ProfilerManager.m_yaecfwdp();
          lv.push("lightTex");
          ClientWorld lv2 = this.client.world;
          if (lv2 != null) {
diff -bur namedTargetSrc/net/minecraft/client/render/model/BakedModelManager.java namedSrc/net/minecraft/client/render/model/BakedModelManager.java
--- namedTargetSrc/net/minecraft/client/render/model/BakedModelManager.java	2024-10-17 02:53:20.181617942 +0000
+++ namedSrc/net/minecraft/client/render/model/BakedModelManager.java	2024-10-17 02:52:09.537021085 +0000
@@ -45,11 +45,11 @@
 import net.minecraft.unmapped.C_jqbrpztq;
 import net.minecraft.unmapped.C_wbdlrahg;
 import net.minecraft.unmapped.C_xecqvems;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.JsonHelper;
 import net.minecraft.util.Util;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import org.slf4j.Logger;
 
 /**
@@ -195,13 +195,13 @@
                   .collect(Collectors.toMap(Entry::getKey, entry -> (SpriteAtlasManager.StitchResult)((CompletableFuture)entry.getValue()).join()));
                C_wbdlrahg lvx = (C_wbdlrahg)completableFuture3.join();
                Object2IntMap<BlockState> object2IntMap = (Object2IntMap<BlockState>)completableFuture4.join();
-               return this.loadModels(C_xuophqnt.m_yaecfwdp(), map2, new ModelLoader(lvx.m_aoppofpm(), lvx.m_fajwutif(), lv), object2IntMap);
+               return this.loadModels(ProfilerManager.m_yaecfwdp(), map2, new ModelLoader(lvx.m_aoppofpm(), lvx.m_fajwutif(), lv), object2IntMap);
             },
             prepareExecutor
          )
          .thenCompose(reloadState -> reloadState.readyForUpload.thenApply(arg2 -> reloadState))
          .thenCompose(synchronizer::whenPrepared)
-         .thenAcceptAsync(arg -> this.apply(arg, C_xuophqnt.m_yaecfwdp()), applyExecutor);
+         .thenAcceptAsync(arg -> this.apply(arg, ProfilerManager.m_yaecfwdp()), applyExecutor);
    }
 
    /**
@@ -341,7 +341,7 @@
 
    /**
     * @mapping {@literal hashed m_hpgvneki Lnet/minecraft/unmapped/C_wosoicga;m_hpgvneki(Lnet/minecraft/unmapped/C_eslcbfsq;Ljava/util/Map;Lnet/minecraft/unmapped/C_gjnplkfz;Lit/unimi/dsi/fastutil/objects/Object2IntMap;)Lnet/minecraft/unmapped/C_wosoicga$C_mogtdkcx;}
-    * @mapping {@literal named loadModels Lnet/minecraft/client/render/model/BakedModelManager;loadModels(Lnet/minecraft/util/profiler/Profiler;Ljava/util/Map;Lnet/minecraft/client/render/model/ModelLoader;Lit/unimi/dsi/fastutil/objects/Object2IntMap;)Lnet/minecraft/client/render/model/BakedModelManager$ReloadState;}
+    * @mapping {@literal named loadModels Lnet/minecraft/client/render/model/BakedModelManager;loadModels(Lnet/minecraft/util/profiling/Profiler;Ljava/util/Map;Lnet/minecraft/client/render/model/ModelLoader;Lit/unimi/dsi/fastutil/objects/Object2IntMap;)Lnet/minecraft/client/render/model/BakedModelManager$ReloadState;}
     */
    private BakedModelManager.ReloadState loadModels(
       Profiler profiler, Map<Identifier, SpriteAtlasManager.StitchResult> atlases, ModelLoader modelLoader, Object2IntMap<BlockState> object2IntMap
@@ -398,7 +398,7 @@
 
    /**
     * @mapping {@literal hashed m_pfipxvmw Lnet/minecraft/unmapped/C_wosoicga;m_pfipxvmw(Lnet/minecraft/unmapped/C_wosoicga$C_mogtdkcx;Lnet/minecraft/unmapped/C_eslcbfsq;)V}
-    * @mapping {@literal named apply Lnet/minecraft/client/render/model/BakedModelManager;apply(Lnet/minecraft/client/render/model/BakedModelManager$ReloadState;Lnet/minecraft/util/profiler/Profiler;)V}
+    * @mapping {@literal named apply Lnet/minecraft/client/render/model/BakedModelManager;apply(Lnet/minecraft/client/render/model/BakedModelManager$ReloadState;Lnet/minecraft/util/profiling/Profiler;)V}
     */
    private void apply(BakedModelManager.ReloadState reloadState, Profiler profiler) {
       profiler.push("upload");
diff -bur namedTargetSrc/net/minecraft/client/render/WorldRenderer.java namedSrc/net/minecraft/client/render/WorldRenderer.java
--- namedTargetSrc/net/minecraft/client/render/WorldRenderer.java	2024-10-17 02:53:20.201618110 +0000
+++ namedSrc/net/minecraft/client/render/WorldRenderer.java	2024-10-17 02:52:09.569021304 +0000
@@ -65,7 +65,6 @@
 import net.minecraft.resource.SynchronousResourceReloader;
 import net.minecraft.unmapped.C_faujnouj;
 import net.minecraft.unmapped.C_kfcjpoxm;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.unmapped.C_yokffdse;
 import net.minecraft.util.ArgbHelper;
 import net.minecraft.util.Identifier;
@@ -82,7 +81,8 @@
 import net.minecraft.util.math.ChunkSectionPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.world.BlockRenderView;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.LightType;
@@ -585,7 +585,7 @@
          this.reload();
       }
 
-      Profiler lv2 = C_xuophqnt.m_yaecfwdp();
+      Profiler lv2 = ProfilerManager.m_yaecfwdp();
       lv2.push("camera");
       int i = ChunkSectionPos.getSectionCoord(lv.getX());
       int j = ChunkSectionPos.getSectionCoord(lv.getY());
@@ -647,10 +647,10 @@
       if (!MinecraftClient.getInstance().isOnThread()) {
          throw new IllegalStateException("applyFrustum called from wrong thread: " + Thread.currentThread().getName());
       } else {
-         C_xuophqnt.m_yaecfwdp().push("apply_frustum");
+         ProfilerManager.m_yaecfwdp().push("apply_frustum");
          this.m_jnggfnvm();
          this.occlusionGraph.addSectionsInView(frustum, this.sections, this.f_cfbmblth);
-         C_xuophqnt.m_yaecfwdp().pop();
+         ProfilerManager.m_yaecfwdp().pop();
       }
    }
 
@@ -689,7 +689,7 @@
       RenderSystem.setShaderGameTime(this.world.getTime(), f);
       this.blockEntityRenderDispatcher.configure(this.world, camera, this.client.crosshairTarget);
       this.entityRenderDispatcher.configure(this.world, camera, this.client.targetedEntity);
-      final Profiler lv = C_xuophqnt.m_yaecfwdp();
+      final Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.swap("light_update_queue");
       this.world.runQueuedLightUpdates();
       lv.swap("light_updates");
@@ -701,7 +701,7 @@
       lv.swap("culling");
       boolean bl2 = this.capturedFrustum != null;
       Frustum lv3 = bl2 ? this.capturedFrustum : this.frustum;
-      C_xuophqnt.m_yaecfwdp().swap("captureFrustum");
+      ProfilerManager.m_yaecfwdp().swap("captureFrustum");
       if (this.shouldCaptureFrustum) {
          this.capturedFrustum = bl2 ? new Frustum(modelViewMatrix, projectionMatrix) : lv3;
          this.capturedFrustum.setPosition(d, e, g);
@@ -807,7 +807,7 @@
 
    /**
     * @mapping {@literal hashed m_whptjcei Lnet/minecraft/unmapped/C_sfkkabhx;m_whptjcei(Lnet/minecraft/unmapped/C_obrvgeej;Lnet/minecraft/unmapped/C_jwzjqevg;Lnet/minecraft/unmapped/C_dcmtgrvm;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lnet/minecraft/unmapped/C_vidgpspy;ZZLnet/minecraft/unmapped/C_lrgsdfwv;Lnet/minecraft/unmapped/C_eslcbfsq;)V}
-    * @mapping {@literal named addMainPass Lnet/minecraft/client/render/WorldRenderer;addMainPass(Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder;Lnet/minecraft/client/render/Frustum;Lnet/minecraft/client/render/Camera;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lnet/minecraft/client/render/FogParameters;ZZLnet/minecraft/client/render/DeltaTracker;Lnet/minecraft/util/profiler/Profiler;)V}
+    * @mapping {@literal named addMainPass Lnet/minecraft/client/render/WorldRenderer;addMainPass(Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder;Lnet/minecraft/client/render/Frustum;Lnet/minecraft/client/render/Camera;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lnet/minecraft/client/render/FogParameters;ZZLnet/minecraft/client/render/DeltaTracker;Lnet/minecraft/util/profiling/Profiler;)V}
     */
    private void addMainPass(
       FrameGraphBuilder frameGraph,
@@ -1262,7 +1262,7 @@
       if (!this.sections.isEmpty()) {
          BlockPos lv = BlockPos.fromPosition(pos);
          boolean bl = !lv.equals(this.pos);
-         C_xuophqnt.m_yaecfwdp().push("translucent_sort");
+         ProfilerManager.m_yaecfwdp().push("translucent_sort");
          ChunkBuilder.C_mwntqdbp lv2 = new ChunkBuilder.C_mwntqdbp();
 
          for (ChunkBuilder.Section lv3 : this.f_cfbmblth) {
@@ -1278,7 +1278,7 @@
          }
 
          this.pos = lv;
-         C_xuophqnt.m_yaecfwdp().pop();
+         ProfilerManager.m_yaecfwdp().pop();
       }
    }
 
@@ -1300,7 +1300,7 @@
     */
    private void renderSectionLayer(RenderLayer layer, double x, double y, double z, Matrix4f modelViewMatrix, Matrix4f projectionMatrix) {
       RenderSystem.assertOnRenderThread();
-      C_faujnouj lv = C_xuophqnt.m_yaecfwdp().m_pozihedb(() -> "render_" + layer.name);
+      C_faujnouj lv = ProfilerManager.m_yaecfwdp().m_pozihedb(() -> "render_" + layer.name);
       lv.m_kergkarl(layer::toString);
       boolean bl = layer != RenderLayer.getTranslucent();
       ObjectListIterator<ChunkBuilder.Section> objectListIterator = this.sections.listIterator(bl ? 0 : this.sections.size());
@@ -1460,7 +1460,7 @@
     * @mapping {@literal named rebuildSections Lnet/minecraft/client/render/WorldRenderer;rebuildSections(Lnet/minecraft/client/render/Camera;)V}
     */
    private void rebuildSections(Camera camera) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("populate_sections_to_compile");
       LightingProvider lv2 = this.world.getLightingProvider();
       ChunkRenderRegionCache lv3 = new ChunkRenderRegionCache();
diff -bur namedTargetSrc/net/minecraft/client/resource/FoliageColormapResourceSupplier.java namedSrc/net/minecraft/client/resource/FoliageColormapResourceSupplier.java
--- namedTargetSrc/net/minecraft/client/resource/FoliageColormapResourceSupplier.java	2024-10-17 02:53:20.181617942 +0000
+++ namedSrc/net/minecraft/client/resource/FoliageColormapResourceSupplier.java	2024-10-17 02:52:09.541021112 +0000
@@ -8,7 +8,7 @@
 import net.minecraft.resource.ResourceManager;
 import net.minecraft.resource.SinglePreparationResourceReloader;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_ugzhaukh}
@@ -24,7 +24,7 @@
 
    /**
     * @mapping {@literal hashed m_wnkjyouy Lnet/minecraft/unmapped/C_ugzhaukh;m_wnkjyouy(Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)[I}
-    * @mapping {@literal named reload Lnet/minecraft/client/resource/FoliageColormapResourceSupplier;reload(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)[I}
+    * @mapping {@literal named reload Lnet/minecraft/client/resource/FoliageColormapResourceSupplier;reload(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiling/Profiler;)[I}
     */
    protected int[] reload(ResourceManager resourceManager, Profiler profiler) {
       try {
@@ -36,7 +36,7 @@
 
    /**
     * @mapping {@literal hashed m_gqjdomnn Lnet/minecraft/unmapped/C_ugzhaukh;m_gqjdomnn([ILnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)V}
-    * @mapping {@literal named apply Lnet/minecraft/client/resource/FoliageColormapResourceSupplier;apply([ILnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V}
+    * @mapping {@literal named apply Lnet/minecraft/client/resource/FoliageColormapResourceSupplier;apply([ILnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiling/Profiler;)V}
     */
    protected void apply(int[] is, ResourceManager resourceManager, Profiler profiler) {
       FoliageColors.setColorMap(is);
diff -bur namedTargetSrc/net/minecraft/client/resource/GrassColormapResourceSupplier.java namedSrc/net/minecraft/client/resource/GrassColormapResourceSupplier.java
--- namedTargetSrc/net/minecraft/client/resource/GrassColormapResourceSupplier.java	2024-10-17 02:53:20.305618983 +0000
+++ namedSrc/net/minecraft/client/resource/GrassColormapResourceSupplier.java	2024-10-17 02:52:09.749022536 +0000
@@ -8,7 +8,7 @@
 import net.minecraft.resource.ResourceManager;
 import net.minecraft.resource.SinglePreparationResourceReloader;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_kronvwka}
@@ -24,7 +24,7 @@
 
    /**
     * @mapping {@literal hashed m_xuxajnvu Lnet/minecraft/unmapped/C_kronvwka;m_xuxajnvu(Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)[I}
-    * @mapping {@literal named tryLoad Lnet/minecraft/client/resource/GrassColormapResourceSupplier;tryLoad(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)[I}
+    * @mapping {@literal named tryLoad Lnet/minecraft/client/resource/GrassColormapResourceSupplier;tryLoad(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiling/Profiler;)[I}
     */
    protected int[] tryLoad(ResourceManager resourceManager, Profiler profiler) {
       try {
@@ -36,7 +36,7 @@
 
    /**
     * @mapping {@literal hashed m_lyddbodk Lnet/minecraft/unmapped/C_kronvwka;m_lyddbodk([ILnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)V}
-    * @mapping {@literal named apply Lnet/minecraft/client/resource/GrassColormapResourceSupplier;apply([ILnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V}
+    * @mapping {@literal named apply Lnet/minecraft/client/resource/GrassColormapResourceSupplier;apply([ILnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiling/Profiler;)V}
     */
    protected void apply(int[] is, ResourceManager resourceManager, Profiler profiler) {
       GrassColors.setColorMap(is);
diff -bur namedTargetSrc/net/minecraft/client/resource/SplashTextResourceSupplier.java namedSrc/net/minecraft/client/resource/SplashTextResourceSupplier.java
--- namedTargetSrc/net/minecraft/client/resource/SplashTextResourceSupplier.java	2024-10-17 02:53:20.417619922 +0000
+++ namedSrc/net/minecraft/client/resource/SplashTextResourceSupplier.java	2024-10-17 02:52:09.921023714 +0000
@@ -17,7 +17,7 @@
 import net.minecraft.resource.ResourceManager;
 import net.minecraft.resource.SinglePreparationResourceReloader;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
 import net.minecraft.util.random.RandomGenerator;
 import org.jetbrains.annotations.Nullable;
 
@@ -58,7 +58,7 @@
 
    /**
     * @mapping {@literal hashed m_udremlxe Lnet/minecraft/unmapped/C_iyhcmfwn;m_udremlxe(Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)Ljava/util/List;}
-    * @mapping {@literal named prepare Lnet/minecraft/client/resource/SplashTextResourceSupplier;prepare(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)Ljava/util/List;}
+    * @mapping {@literal named prepare Lnet/minecraft/client/resource/SplashTextResourceSupplier;prepare(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiling/Profiler;)Ljava/util/List;}
     */
    protected List<String> prepare(ResourceManager resourceManager, Profiler profiler) {
       try {
@@ -91,7 +91,7 @@
 
    /**
     * @mapping {@literal hashed m_uyrxaqwj Lnet/minecraft/unmapped/C_iyhcmfwn;m_uyrxaqwj(Ljava/util/List;Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)V}
-    * @mapping {@literal named apply Lnet/minecraft/client/resource/SplashTextResourceSupplier;apply(Ljava/util/List;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V}
+    * @mapping {@literal named apply Lnet/minecraft/client/resource/SplashTextResourceSupplier;apply(Ljava/util/List;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiling/Profiler;)V}
     */
    protected void apply(List<String> list, ResourceManager resourceManager, Profiler profiler) {
       this.splashTexts.clear();
diff -bur namedTargetSrc/net/minecraft/client/resource/VideoWarningManager.java namedSrc/net/minecraft/client/resource/VideoWarningManager.java
--- namedTargetSrc/net/minecraft/client/resource/VideoWarningManager.java	2024-10-17 02:53:20.297618915 +0000
+++ namedSrc/net/minecraft/client/resource/VideoWarningManager.java	2024-10-17 02:52:09.737022454 +0000
@@ -20,7 +20,7 @@
 import net.minecraft.resource.SinglePreparationResourceReloader;
 import net.minecraft.unmapped.C_faujnouj;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 
@@ -168,7 +168,7 @@
 
    /**
     * @mapping {@literal hashed m_xfeclyhs Lnet/minecraft/unmapped/C_giiyufuh;m_xfeclyhs(Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)Lnet/minecraft/unmapped/C_giiyufuh$C_khrkocxc;}
-    * @mapping {@literal named prepare Lnet/minecraft/client/resource/VideoWarningManager;prepare(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)Lnet/minecraft/client/resource/VideoWarningManager$WarningPatternLoader;}
+    * @mapping {@literal named prepare Lnet/minecraft/client/resource/VideoWarningManager;prepare(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiling/Profiler;)Lnet/minecraft/client/resource/VideoWarningManager$WarningPatternLoader;}
     */
    protected VideoWarningManager.WarningPatternLoader prepare(ResourceManager resourceManager, Profiler profiler) {
       List<Pattern> list = Lists.<Pattern>newArrayList();
@@ -188,7 +188,7 @@
 
    /**
     * @mapping {@literal hashed m_sjbyfeys Lnet/minecraft/unmapped/C_giiyufuh;m_sjbyfeys(Lnet/minecraft/unmapped/C_giiyufuh$C_khrkocxc;Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)V}
-    * @mapping {@literal named apply Lnet/minecraft/client/resource/VideoWarningManager;apply(Lnet/minecraft/client/resource/VideoWarningManager$WarningPatternLoader;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V}
+    * @mapping {@literal named apply Lnet/minecraft/client/resource/VideoWarningManager;apply(Lnet/minecraft/client/resource/VideoWarningManager$WarningPatternLoader;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiling/Profiler;)V}
     */
    protected void apply(VideoWarningManager.WarningPatternLoader arg, ResourceManager resourceManager, Profiler profiler) {
       this.warnings = arg.buildWarnings();
@@ -204,7 +204,7 @@
 
    /**
     * @mapping {@literal hashed m_wqxipxvg Lnet/minecraft/unmapped/C_giiyufuh;m_wqxipxvg(Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)Lcom/google/gson/JsonObject;}
-    * @mapping {@literal named loadWarnlist Lnet/minecraft/client/resource/VideoWarningManager;loadWarnlist(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)Lcom/google/gson/JsonObject;}
+    * @mapping {@literal named loadWarnlist Lnet/minecraft/client/resource/VideoWarningManager;loadWarnlist(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiling/Profiler;)Lcom/google/gson/JsonObject;}
     */
    @Nullable
    private static JsonObject loadWarnlist(ResourceManager resourceManager, Profiler profiler) {
diff -bur namedTargetSrc/net/minecraft/client/sound/SoundManager.java namedSrc/net/minecraft/client/sound/SoundManager.java
--- namedTargetSrc/net/minecraft/client/sound/SoundManager.java	2024-10-17 02:53:20.185617976 +0000
+++ namedSrc/net/minecraft/client/sound/SoundManager.java	2024-10-17 02:52:09.545021139 +0000
@@ -31,7 +31,7 @@
 import net.minecraft.util.JsonHelper;
 import net.minecraft.util.math.float_provider.ConstantFloatProvider;
 import net.minecraft.util.math.float_provider.MultipliedFloatSupplier;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
 import net.minecraft.util.random.RandomGenerator;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -121,7 +121,7 @@
 
    /**
     * @mapping {@literal hashed m_mbrtaeux Lnet/minecraft/unmapped/C_hfmtwavd;m_mbrtaeux(Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)Lnet/minecraft/unmapped/C_hfmtwavd$C_cwtdyuyd;}
-    * @mapping {@literal named prepare Lnet/minecraft/client/sound/SoundManager;prepare(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)Lnet/minecraft/client/sound/SoundManager$SoundList;}
+    * @mapping {@literal named prepare Lnet/minecraft/client/sound/SoundManager;prepare(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiling/Profiler;)Lnet/minecraft/client/sound/SoundManager$SoundList;}
     */
    protected SoundManager.SoundList prepare(ResourceManager resourceManager, Profiler profiler) {
       SoundManager.SoundList lv = new SoundManager.SoundList();
@@ -178,7 +178,7 @@
 
    /**
     * @mapping {@literal hashed m_wrtaoxky Lnet/minecraft/unmapped/C_hfmtwavd;m_wrtaoxky(Lnet/minecraft/unmapped/C_hfmtwavd$C_cwtdyuyd;Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)V}
-    * @mapping {@literal named apply Lnet/minecraft/client/sound/SoundManager;apply(Lnet/minecraft/client/sound/SoundManager$SoundList;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V}
+    * @mapping {@literal named apply Lnet/minecraft/client/sound/SoundManager;apply(Lnet/minecraft/client/sound/SoundManager$SoundList;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiling/Profiler;)V}
     */
    protected void apply(SoundManager.SoundList arg, ResourceManager resourceManager, Profiler profiler) {
       arg.addTo(this.sounds, this.soundCache, this.soundSystem);

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (2/3): 
diff -bur namedTargetSrc/net/minecraft/client/texture/SpriteAtlasHolder.java namedSrc/net/minecraft/client/texture/SpriteAtlasHolder.java
--- namedTargetSrc/net/minecraft/client/texture/SpriteAtlasHolder.java	2024-10-17 02:53:20.365619486 +0000
+++ namedSrc/net/minecraft/client/texture/SpriteAtlasHolder.java	2024-10-17 02:52:09.837023139 +0000
@@ -9,8 +9,8 @@
 import net.minecraft.resource.ResourceReloader;
 import net.minecraft.resource.pack.metadata.ResourceMetadataSectionReader;
 import net.minecraft.unmapped.C_faujnouj;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.profiling.ProfilerManager;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_vscsewip}
@@ -80,7 +80,7 @@
     * @mapping {@literal named upload Lnet/minecraft/client/texture/SpriteAtlasHolder;upload(Lnet/minecraft/client/texture/SpriteLoader$SpritePreparations;)V}
     */
    private void upload(SpriteLoader.SpritePreparations preparations) {
-      try (C_faujnouj lv = C_xuophqnt.m_yaecfwdp().m_zqvmpjqi("upload")) {
+      try (C_faujnouj lv = ProfilerManager.m_yaecfwdp().m_zqvmpjqi("upload")) {
          this.atlas.upload(preparations);
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/util/ClientSamplerSource.java namedSrc/net/minecraft/client/util/ClientSamplerSource.java
--- namedTargetSrc/net/minecraft/client/util/ClientSamplerSource.java	2024-10-17 02:53:20.229618345 +0000
+++ namedSrc/net/minecraft/client/util/ClientSamplerSource.java	2024-10-17 02:52:09.617021633 +0000
@@ -10,12 +10,12 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.client.render.chunk.ChunkBuilder;
-import net.minecraft.util.profiler.ReadableProfiler;
-import net.minecraft.util.profiler.SampleType;
-import net.minecraft.util.profiler.Sampler;
-import net.minecraft.util.profiler.SamplerFactory;
-import net.minecraft.util.profiler.SamplerSource;
-import net.minecraft.util.profiler.ServerSamplerSource;
+import net.minecraft.util.profiling.ReadableProfiler;
+import net.minecraft.util.profiling.SampleType;
+import net.minecraft.util.profiling.Sampler;
+import net.minecraft.util.profiling.SamplerFactory;
+import net.minecraft.util.profiling.SamplerSource;
+import net.minecraft.util.profiling.ServerSamplerSource;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_ksmbfezp}
@@ -35,7 +35,7 @@
    private final Set<Sampler> samplers = new ObjectOpenHashSet<>();
    /**
     * @mapping {@literal hashed f_pkvuqruo Lnet/minecraft/unmapped/C_ksmbfezp;f_pkvuqruo:Lnet/minecraft/unmapped/C_baucttzt;}
-    * @mapping {@literal named factory Lnet/minecraft/client/util/ClientSamplerSource;factory:Lnet/minecraft/util/profiler/SamplerFactory;}
+    * @mapping {@literal named factory Lnet/minecraft/client/util/ClientSamplerSource;factory:Lnet/minecraft/util/profiling/SamplerFactory;}
     */
    private final SamplerFactory factory = new SamplerFactory();
 
diff -bur namedTargetSrc/net/minecraft/client/world/ClientWorld.java namedSrc/net/minecraft/client/world/ClientWorld.java
--- namedTargetSrc/net/minecraft/client/world/ClientWorld.java	2024-10-17 02:53:20.341619285 +0000
+++ namedSrc/net/minecraft/client/world/ClientWorld.java	2024-10-17 02:52:09.805022920 +0000
@@ -57,7 +57,6 @@
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_faujnouj;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.ArgbHelper;
 import net.minecraft.util.CubicSampler;
 import net.minecraft.util.CuboidBlockIterator;
@@ -71,7 +70,8 @@
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.Difficulty;
@@ -368,7 +368,7 @@
          this.setLightningTicksLeft(this.lightningTicksLeft - 1);
       }
 
-      try (C_faujnouj lv = C_xuophqnt.m_yaecfwdp().m_zqvmpjqi("blocks")) {
+      try (C_faujnouj lv = ProfilerManager.m_yaecfwdp().m_zqvmpjqi("blocks")) {
          this.chunkManager.tick(shouldKeepTicking, true);
       }
    }
@@ -407,7 +407,7 @@
     * @mapping {@literal named tickEntities Lnet/minecraft/client/world/ClientWorld;tickEntities()V}
     */
    public void tickEntities() {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("entities");
       this.entityList.forEach(entity -> {
          if (!entity.isRemoved() && !entity.hasVehicle() && !this.tickManager.shouldSkipTick(entity)) {
@@ -441,9 +441,9 @@
    public void tickEntity(Entity entity) {
       entity.m_hhwtkfxu();
       entity.age++;
-      C_xuophqnt.m_yaecfwdp().push((Supplier<String>)(() -> Registries.ENTITY_TYPE.getId(entity.getType()).toString()));
+      ProfilerManager.m_yaecfwdp().push((Supplier<String>)(() -> Registries.ENTITY_TYPE.getId(entity.getType()).toString()));
       entity.tick();
-      C_xuophqnt.m_yaecfwdp().pop();
+      ProfilerManager.m_yaecfwdp().pop();
 
       for (Entity lv : entity.getPassengerList()) {
          this.tickPassenger(entity, lv);
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/GoalSelector.java namedSrc/net/minecraft/entity/ai/goal/GoalSelector.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/GoalSelector.java	2024-10-17 02:53:20.205618144 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/GoalSelector.java	2024-10-17 02:52:09.573021332 +0000
@@ -7,8 +7,8 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Predicate;
-import net.minecraft.unmapped.C_xuophqnt;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 
 /**
  * Manages a set of goals, which are competing for certain controls on the mob.
@@ -131,7 +131,7 @@
     * @mapping {@literal named tick Lnet/minecraft/entity/ai/goal/GoalSelector;tick()V}
     */
    public void tick() {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("goalCleanup");
 
       for (PrioritizedGoal lv2 : this.goals) {
@@ -165,7 +165,7 @@
     * @mapping {@literal named tickGoals Lnet/minecraft/entity/ai/goal/GoalSelector;tickGoals(Z)V}
     */
    public void tickGoals(boolean tickAll) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("goalTick");
 
       for (PrioritizedGoal lv2 : this.goals) {
diff -bur namedTargetSrc/net/minecraft/entity/ai/pathing/EntityNavigation.java namedSrc/net/minecraft/entity/ai/pathing/EntityNavigation.java
--- namedTargetSrc/net/minecraft/entity/ai/pathing/EntityNavigation.java	2024-10-17 02:53:20.245618479 +0000
+++ namedSrc/net/minecraft/entity/ai/pathing/EntityNavigation.java	2024-10-17 02:52:09.645021825 +0000
@@ -10,13 +10,13 @@
 import net.minecraft.entity.mob.MobEntity;
 import net.minecraft.registry.tag.BlockTags;
 import net.minecraft.server.network.DebugInfoSender;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.math.Vec3i;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.world.RaycastContext;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.ChunkCache;
@@ -319,7 +319,7 @@
       } else if (this.currentPath != null && !this.currentPath.isFinished() && positions.contains(this.currentTarget)) {
          return this.currentPath;
       } else {
-         Profiler lv = C_xuophqnt.m_yaecfwdp();
+         Profiler lv = ProfilerManager.m_yaecfwdp();
          lv.push("pathfind");
          BlockPos lv2 = useHeadPos ? this.entity.getBlockPos().up() : this.entity.getBlockPos();
          int k = (int)(followRange + (float)range);
diff -bur namedTargetSrc/net/minecraft/entity/ai/pathing/PathNodeNavigator.java namedSrc/net/minecraft/entity/ai/pathing/PathNodeNavigator.java
--- namedTargetSrc/net/minecraft/entity/ai/pathing/PathNodeNavigator.java	2024-10-17 02:53:20.389619688 +0000
+++ namedSrc/net/minecraft/entity/ai/pathing/PathNodeNavigator.java	2024-10-17 02:52:09.877023413 +0000
@@ -11,10 +11,10 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import net.minecraft.entity.mob.MobEntity;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.profiler.Profiler;
-import net.minecraft.util.profiler.SampleType;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
+import net.minecraft.util.profiling.SampleType;
 import net.minecraft.world.chunk.ChunkCache;
 import org.jetbrains.annotations.Nullable;
 
@@ -95,7 +95,7 @@
     */
    @Nullable
    private Path m_mudynioh(PathNode arg, Map<TargetPathNode, BlockPos> map, float f, int i, float g) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("find_path");
       lv.markSampleType(SampleType.PATH_FINDING);
       Set<TargetPathNode> set = map.keySet();
diff -bur namedTargetSrc/net/minecraft/entity/Entity.java namedSrc/net/minecraft/entity/Entity.java
--- namedTargetSrc/net/minecraft/entity/Entity.java	2024-10-17 02:53:20.353619386 +0000
+++ namedSrc/net/minecraft/entity/Entity.java	2024-10-17 02:52:09.821023029 +0000
@@ -95,7 +95,6 @@
 import net.minecraft.unmapped.C_dxakxzow;
 import net.minecraft.unmapped.C_sfpofsgc;
 import net.minecraft.unmapped.C_sqhjwpkh;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Arm;
 import net.minecraft.util.BlockMirror;
@@ -119,7 +118,8 @@
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec2f;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.util.shape.VoxelShapes;
@@ -1023,7 +1023,7 @@
     * @mapping {@literal named baseTick Lnet/minecraft/entity/Entity;baseTick()V}
     */
    public void baseTick() {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("entityBaseTick");
       this.state = null;
       if (this.hasVehicle() && this.getVehicle().isRemoved()) {
@@ -1322,7 +1322,7 @@
             }
          }
 
-         Profiler lv = C_xuophqnt.m_yaecfwdp();
+         Profiler lv = ProfilerManager.m_yaecfwdp();
          lv.push("move");
          if (this.movementMultiplier.lengthSquared() > 1.0E-7) {
             movement = movement.multiply(this.movementMultiplier);
@@ -3713,7 +3713,7 @@
          this.tickNetherPortalCooldown();
          if (this.portalProcessor != null) {
             if (this.portalProcessor.tick(lv, this, this.canUsePortals(false))) {
-               Profiler lv3 = C_xuophqnt.m_yaecfwdp();
+               Profiler lv3 = ProfilerManager.m_yaecfwdp();
                lv3.push("portal");
                this.resetNetherPortalCooldown();
                C_sqhjwpkh lv4 = this.portalProcessor.createTransition(lv, this);
@@ -4422,7 +4422,7 @@
          lv.m_mcdfsxav(this.m_ciiyibaw(arg2, lv));
       }
 
-      Profiler lv2 = C_xuophqnt.m_yaecfwdp();
+      Profiler lv2 = ProfilerManager.m_yaecfwdp();
       lv2.push("teleportSameDimension");
       this.m_erhomtwv(C_dxakxzow.m_xwawuwvz(arg2), arg2.relatives());
       if (!arg2.asPassenger()) {
@@ -4450,7 +4450,7 @@
          }
       }
 
-      Profiler lv3 = C_xuophqnt.m_yaecfwdp();
+      Profiler lv3 = ProfilerManager.m_yaecfwdp();
       lv3.push("teleportCrossDimension");
       Entity lv4 = this.getType().m_oebfrxli(world, SpawnReason.DIMENSION_TRAVEL);
       if (lv4 == null) {
diff -bur namedTargetSrc/net/minecraft/entity/LivingEntity.java namedSrc/net/minecraft/entity/LivingEntity.java
--- namedTargetSrc/net/minecraft/entity/LivingEntity.java	2024-10-17 02:53:20.321619117 +0000
+++ namedSrc/net/minecraft/entity/LivingEntity.java	2024-10-17 02:52:09.777022728 +0000
@@ -114,7 +114,6 @@
 import net.minecraft.unmapped.C_duiqsjgf;
 import net.minecraft.unmapped.C_npqbextr;
 import net.minecraft.unmapped.C_raqyxzkb;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.Arm;
 import net.minecraft.util.Hand;
 import net.minecraft.util.Identifier;
@@ -127,7 +126,8 @@
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.util.shape.VoxelShapes;
 import net.minecraft.world.BlockLocating;
@@ -892,7 +892,7 @@
       }
 
       super.baseTick();
-      Profiler lv2 = C_xuophqnt.m_yaecfwdp();
+      Profiler lv2 = ProfilerManager.m_yaecfwdp();
       lv2.push("livingEntityBaseTick");
       if (this.isFireImmune() || this.getWorld().isClient) {
          this.extinguish();
@@ -3857,7 +3857,7 @@
       }
 
       this.stepBobbingAmount = this.stepBobbingAmount + (k - this.stepBobbingAmount) * 0.3F;
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("headTurn");
       h = this.turnHead(g, h);
       lv.pop();
@@ -4137,7 +4137,7 @@
       }
 
       this.setVelocity(d, e, f);
-      Profiler lv2 = C_xuophqnt.m_yaecfwdp();
+      Profiler lv2 = ProfilerManager.m_yaecfwdp();
       lv2.push("ai");
       if (this.isImmobile()) {
          this.jumping = false;
diff -bur namedTargetSrc/net/minecraft/entity/mob/BreezeEntity.java namedSrc/net/minecraft/entity/mob/BreezeEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/BreezeEntity.java	2024-10-17 02:53:20.181617942 +0000
+++ namedSrc/net/minecraft/entity/mob/BreezeEntity.java	2024-10-17 02:52:09.541021112 +0000
@@ -26,9 +26,9 @@
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
 
@@ -381,7 +381,7 @@
     */
    @Override
    protected void mobTick(ServerWorld world) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("breezeBrain");
       this.getBrain().tick(world, this);
       lv.swap("breezeActivityUpdate");
diff -bur namedTargetSrc/net/minecraft/entity/mob/CreakingEntity.java namedSrc/net/minecraft/entity/mob/CreakingEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/CreakingEntity.java	2024-10-17 02:53:20.249618513 +0000
+++ namedSrc/net/minecraft/entity/mob/CreakingEntity.java	2024-10-17 02:52:09.653021879 +0000
@@ -28,9 +28,9 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
 import net.minecraft.world.event.GameEvent;
@@ -206,7 +206,7 @@
     */
    @Override
    protected void mobTick(ServerWorld world) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("creakingBrain");
       this.getBrain().tick((ServerWorld)this.getWorld(), this);
       lv.pop();
diff -bur namedTargetSrc/net/minecraft/entity/mob/HoglinEntity.java namedSrc/net/minecraft/entity/mob/HoglinEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/HoglinEntity.java	2024-10-17 02:53:20.333619217 +0000
+++ namedSrc/net/minecraft/entity/mob/HoglinEntity.java	2024-10-17 02:52:09.789022810 +0000
@@ -35,11 +35,11 @@
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.unmapped.C_pkxijcfk;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.world.LocalDifficulty;
 import net.minecraft.world.ServerWorldAccess;
@@ -249,7 +249,7 @@
     */
    @Override
    protected void mobTick(ServerWorld world) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("hoglinBrain");
       this.getBrain().tick(world, this);
       lv.pop();
diff -bur namedTargetSrc/net/minecraft/entity/mob/MobEntity.java namedSrc/net/minecraft/entity/mob/MobEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/MobEntity.java	2024-10-17 02:53:20.289618849 +0000
+++ namedSrc/net/minecraft/entity/mob/MobEntity.java	2024-10-17 02:52:09.725022372 +0000
@@ -78,7 +78,6 @@
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.unmapped.C_pkxijcfk;
 import net.minecraft.unmapped.C_sfpofsgc;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Arm;
 import net.minecraft.util.Hand;
@@ -88,7 +87,8 @@
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3i;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.world.Difficulty;
 import net.minecraft.world.GameRules;
@@ -556,7 +556,7 @@
    @Override
    public void baseTick() {
       super.baseTick();
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("mobBaseTick");
       if (this.isAlive() && this.random.nextInt(1000) < this.ambientSoundChance++) {
          this.resetSoundDelay();
@@ -879,7 +879,7 @@
    @Override
    public void tickMovement() {
       super.tickMovement();
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("looting");
       if (this.getWorld() instanceof ServerWorld lv2
          && this.m_cwcitqpe()
@@ -1139,7 +1139,7 @@
    @Override
    protected final void tickNewAi() {
       this.despawnCounter++;
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("sensing");
       this.visibilityCache.clear();
       lv.pop();
diff -bur namedTargetSrc/net/minecraft/entity/mob/MobVisibilityCache.java namedSrc/net/minecraft/entity/mob/MobVisibilityCache.java
--- namedTargetSrc/net/minecraft/entity/mob/MobVisibilityCache.java	2024-10-17 02:53:20.205618144 +0000
+++ namedSrc/net/minecraft/entity/mob/MobVisibilityCache.java	2024-10-17 02:52:09.573021332 +0000
@@ -3,8 +3,8 @@
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
 import net.minecraft.entity.Entity;
-import net.minecraft.unmapped.C_xuophqnt;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_vyefybqz}
@@ -55,7 +55,7 @@
       } else if (this.invisibleEntities.contains(i)) {
          return false;
       } else {
-         Profiler lv = C_xuophqnt.m_yaecfwdp();
+         Profiler lv = ProfilerManager.m_yaecfwdp();
          lv.push("hasLineOfSight");
          boolean bl = this.owner.m_ayqytazn(entity);
          lv.pop();
diff -bur namedTargetSrc/net/minecraft/entity/mob/PiglinBruteEntity.java namedSrc/net/minecraft/entity/mob/PiglinBruteEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/PiglinBruteEntity.java	2024-10-17 02:53:20.297618915 +0000
+++ namedSrc/net/minecraft/entity/mob/PiglinBruteEntity.java	2024-10-17 02:52:09.733022427 +0000
@@ -20,9 +20,9 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.world.LocalDifficulty;
 import net.minecraft.world.ServerWorldAccess;
@@ -171,7 +171,7 @@
     */
    @Override
    protected void mobTick(ServerWorld world) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("piglinBruteBrain");
       this.getBrain().tick(world, this);
       lv.pop();
diff -bur namedTargetSrc/net/minecraft/entity/mob/PiglinEntity.java namedSrc/net/minecraft/entity/mob/PiglinEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/PiglinEntity.java	2024-10-17 02:53:20.337619251 +0000
+++ namedSrc/net/minecraft/entity/mob/PiglinEntity.java	2024-10-17 02:52:09.801022893 +0000
@@ -40,13 +40,13 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.annotation.Debug;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.world.GameRules;
 import net.minecraft.world.LocalDifficulty;
@@ -460,7 +460,7 @@
     */
    @Override
    protected void mobTick(ServerWorld world) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("piglinBrain");
       this.getBrain().tick(world, this);
       lv.pop();
diff -bur namedTargetSrc/net/minecraft/entity/mob/warden/WardenEntity.java namedSrc/net/minecraft/entity/mob/warden/WardenEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/warden/WardenEntity.java	2024-10-17 02:53:20.177617909 +0000
+++ namedSrc/net/minecraft/entity/mob/warden/WardenEntity.java	2024-10-17 02:52:09.537021085 +0000
@@ -56,12 +56,12 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.Unit;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.world.LocalDifficulty;
 import net.minecraft.world.ServerWorldAccess;
@@ -515,7 +515,7 @@
     */
    @Override
    protected void mobTick(ServerWorld world) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("wardenBrain");
       this.getBrain().tick(world, this);
       lv.pop();
diff -bur namedTargetSrc/net/minecraft/entity/mob/ZoglinEntity.java namedSrc/net/minecraft/entity/mob/ZoglinEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/ZoglinEntity.java	2024-10-17 02:53:20.349619352 +0000
+++ namedSrc/net/minecraft/entity/mob/ZoglinEntity.java	2024-10-17 02:52:09.813022974 +0000
@@ -42,10 +42,10 @@
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.unmapped.C_lygsomtd;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.int_provider.UniformIntProvider;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.world.LocalDifficulty;
 import net.minecraft.world.ServerWorldAccess;
 import net.minecraft.world.World;
@@ -376,7 +376,7 @@
     */
    @Override
    protected void mobTick(ServerWorld world) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("zoglinBrain");
       this.getBrain().tick(world, this);
       lv.pop();
diff -bur namedTargetSrc/net/minecraft/entity/passive/AllayEntity.java namedSrc/net/minecraft/entity/passive/AllayEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/AllayEntity.java	2024-10-17 02:53:20.377619587 +0000
+++ namedSrc/net/minecraft/entity/passive/AllayEntity.java	2024-10-17 02:52:09.861023303 +0000
@@ -55,7 +55,6 @@
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.dynamic.GlobalPos;
@@ -63,7 +62,8 @@
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.math.Vec3i;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.world.GameRules;
 import net.minecraft.world.World;
 import net.minecraft.world.event.EntityPositionSource;
@@ -387,7 +387,7 @@
     */
    @Override
    protected void mobTick(ServerWorld world) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("allayBrain");
       this.getBrain().tick(world, this);
       lv.pop();
diff -bur namedTargetSrc/net/minecraft/entity/passive/ArmadilloEntity.java namedSrc/net/minecraft/entity/passive/ArmadilloEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/ArmadilloEntity.java	2024-10-17 02:53:20.345619318 +0000
+++ namedSrc/net/minecraft/entity/passive/ArmadilloEntity.java	2024-10-17 02:52:09.813022974 +0000
@@ -32,14 +32,14 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.StringIdentifiable;
 import net.minecraft.util.TimeHelper;
 import net.minecraft.util.collection.IdListUtil;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldAccess;
@@ -230,7 +230,7 @@
     */
    @Override
    protected void mobTick(ServerWorld world) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("armadilloBrain");
       ((Brain<ArmadilloEntity>)this.brain).tick(world, this);
       lv.pop();
diff -bur namedTargetSrc/net/minecraft/entity/passive/AxolotlEntity.java namedSrc/net/minecraft/entity/passive/AxolotlEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/AxolotlEntity.java	2024-10-17 02:53:20.185617976 +0000
+++ namedSrc/net/minecraft/entity/passive/AxolotlEntity.java	2024-10-17 02:52:09.541021112 +0000
@@ -45,7 +45,6 @@
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.unmapped.C_gtsjuuqr;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.StringIdentifiable;
@@ -54,7 +53,8 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.world.LocalDifficulty;
 import net.minecraft.world.ServerWorldAccess;
@@ -484,7 +484,7 @@
     */
    @Override
    protected void mobTick(ServerWorld world) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("axolotlBrain");
       this.getBrain().tick(world, this);
       lv.pop();
diff -bur namedTargetSrc/net/minecraft/entity/passive/CamelEntity.java namedSrc/net/minecraft/entity/passive/CamelEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/CamelEntity.java	2024-10-17 02:53:20.241618446 +0000
+++ namedSrc/net/minecraft/entity/passive/CamelEntity.java	2024-10-17 02:52:09.641021797 +0000
@@ -33,14 +33,14 @@
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec2f;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.world.LocalDifficulty;
 import net.minecraft.world.ServerWorldAccess;
 import net.minecraft.world.World;
@@ -263,7 +263,7 @@
     */
    @Override
    protected void mobTick(ServerWorld world) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("camelBrain");
       Brain<?> lv2 = this.getBrain();
       ((Brain<CamelEntity>)lv2).tick(world, this);
diff -bur namedTargetSrc/net/minecraft/entity/passive/FrogEntity.java namedSrc/net/minecraft/entity/passive/FrogEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/FrogEntity.java	2024-10-17 02:53:20.221618278 +0000
+++ namedSrc/net/minecraft/entity/passive/FrogEntity.java	2024-10-17 02:52:09.601021523 +0000
@@ -50,13 +50,13 @@
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Unit;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.world.LocalDifficulty;
 import net.minecraft.world.ServerWorldAccess;
@@ -277,7 +277,7 @@
     */
    @Override
    protected void mobTick(ServerWorld world) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("frogBrain");
       this.getBrain().tick(world, this);
       lv.pop();
diff -bur namedTargetSrc/net/minecraft/entity/passive/GoatEntity.java namedSrc/net/minecraft/entity/passive/GoatEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/GoatEntity.java	2024-10-17 02:53:20.281618781 +0000
+++ namedSrc/net/minecraft/entity/passive/GoatEntity.java	2024-10-17 02:52:09.713022290 +0000
@@ -38,13 +38,13 @@
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.world.LocalDifficulty;
 import net.minecraft.world.ServerWorldAccess;
@@ -292,7 +292,7 @@
     */
    @Override
    protected void mobTick(ServerWorld world) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("goatBrain");
       this.getBrain().tick(world, this);
       lv.pop();
diff -bur namedTargetSrc/net/minecraft/entity/passive/SnifferEntity.java namedSrc/net/minecraft/entity/passive/SnifferEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/SnifferEntity.java	2024-10-17 02:53:20.285618815 +0000
+++ namedSrc/net/minecraft/entity/passive/SnifferEntity.java	2024-10-17 02:52:09.717022317 +0000
@@ -45,7 +45,6 @@
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.collection.IdListUtil;
@@ -53,7 +52,8 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.world.World;
 import net.minecraft.world.event.GameEvent;
 
@@ -674,7 +674,7 @@
     */
    @Override
    protected void mobTick(ServerWorld world) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("snifferBrain");
       this.getBrain().tick(world, this);
       lv.swap("snifferActivityUpdate");
diff -bur namedTargetSrc/net/minecraft/entity/passive/TadpoleEntity.java namedSrc/net/minecraft/entity/passive/TadpoleEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/TadpoleEntity.java	2024-10-17 02:53:20.261618614 +0000
+++ namedSrc/net/minecraft/entity/passive/TadpoleEntity.java	2024-10-17 02:52:09.677022043 +0000
@@ -30,10 +30,10 @@
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.unmapped.C_pkxijcfk;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
 
@@ -143,7 +143,7 @@
     */
    @Override
    protected void mobTick(ServerWorld world) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("tadpoleBrain");
       this.getBrain().tick(world, this);
       lv.pop();
diff -bur namedTargetSrc/net/minecraft/entity/passive/VillagerEntity.java namedSrc/net/minecraft/entity/passive/VillagerEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/VillagerEntity.java	2024-10-17 02:53:20.309619017 +0000
+++ namedSrc/net/minecraft/entity/passive/VillagerEntity.java	2024-10-17 02:52:09.757022591 +0000
@@ -67,7 +67,6 @@
 import net.minecraft.stat.Stats;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_pkxijcfk;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.SpawnUtil;
@@ -75,7 +74,8 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.village.TradeOffer;
 import net.minecraft.village.TradeOfferList;
 import net.minecraft.village.TradeOffers;
@@ -424,7 +424,7 @@
     */
    @Override
    protected void mobTick(ServerWorld world) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("villagerBrain");
       this.getBrain().tick(world, this);
       lv.pop();
diff -bur namedTargetSrc/net/minecraft/network/listener/AbstractServerPacketHandler.java namedSrc/net/minecraft/network/listener/AbstractServerPacketHandler.java
--- namedTargetSrc/net/minecraft/network/listener/AbstractServerPacketHandler.java	2024-10-17 02:53:20.425619990 +0000
+++ namedSrc/net/minecraft/network/listener/AbstractServerPacketHandler.java	2024-10-17 02:52:09.933023796 +0000
@@ -18,13 +18,13 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ClientInformation;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.Util;
 import net.minecraft.util.annotation.Debug;
 import net.minecraft.util.crash.CrashCallable;
 import net.minecraft.util.crash.CrashException;
 import net.minecraft.util.crash.CrashReport;
 import net.minecraft.util.crash.CrashReportSection;
+import net.minecraft.util.profiling.ProfilerManager;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 
@@ -202,7 +202,7 @@
     * @mapping {@literal named keepConnectionAlive Lnet/minecraft/network/listener/AbstractServerPacketHandler;keepConnectionAlive()V}
     */
    protected void keepConnectionAlive() {
-      C_xuophqnt.m_yaecfwdp().push("keepAlive");
+      ProfilerManager.m_yaecfwdp().push("keepAlive");
       long l = Util.getMeasuringTimeMs();
       if (!this.isHost() && l - this.keepAliveTime >= 15000L) {
          if (this.keepAlivePending) {
@@ -215,7 +215,7 @@
          }
       }
 
-      C_xuophqnt.m_yaecfwdp().pop();
+      ProfilerManager.m_yaecfwdp().pop();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/recipe/RecipeManager.java namedSrc/net/minecraft/recipe/RecipeManager.java
--- namedTargetSrc/net/minecraft/recipe/RecipeManager.java	2024-10-17 02:53:20.225618312 +0000
+++ namedSrc/net/minecraft/recipe/RecipeManager.java	2024-10-17 02:52:09.609021578 +0000
@@ -29,7 +29,7 @@
 import net.minecraft.resource.SinglePreparationResourceReloader;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -109,7 +109,7 @@
 
    /**
     * @mapping {@literal hashed m_vjbcbgny Lnet/minecraft/unmapped/C_hjseusrb;m_vjbcbgny(Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)Lnet/minecraft/unmapped/C_rrkbzyqf;}
-    * @mapping {@literal named prepare Lnet/minecraft/recipe/RecipeManager;prepare(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)Lnet/minecraft/recipe/RecipeMap;}
+    * @mapping {@literal named prepare Lnet/minecraft/recipe/RecipeManager;prepare(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiling/Profiler;)Lnet/minecraft/recipe/RecipeMap;}
     */
    protected RecipeMap prepare(ResourceManager resourceManager, Profiler profiler) {
       SortedMap<Identifier, Recipe<?>> sortedMap = new TreeMap();
@@ -127,7 +127,7 @@
 
    /**
     * @mapping {@literal hashed m_qwhkywli Lnet/minecraft/unmapped/C_hjseusrb;m_qwhkywli(Lnet/minecraft/unmapped/C_rrkbzyqf;Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)V}
-    * @mapping {@literal named apply Lnet/minecraft/recipe/RecipeManager;apply(Lnet/minecraft/recipe/RecipeMap;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V}
+    * @mapping {@literal named apply Lnet/minecraft/recipe/RecipeManager;apply(Lnet/minecraft/recipe/RecipeMap;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiling/Profiler;)V}
     */
    protected void apply(RecipeMap arg, ResourceManager resourceManager, Profiler profiler) {
       this.recipes = arg;
diff -bur namedTargetSrc/net/minecraft/resource/JsonDataLoader.java namedSrc/net/minecraft/resource/JsonDataLoader.java
--- namedTargetSrc/net/minecraft/resource/JsonDataLoader.java	2024-10-17 02:53:20.229618345 +0000
+++ namedSrc/net/minecraft/resource/JsonDataLoader.java	2024-10-17 02:52:09.613021605 +0000
@@ -15,7 +15,7 @@
 import net.minecraft.registry.HolderLookup;
 import net.minecraft.registry.ResourceFileNamespace;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
 import org.slf4j.Logger;
 
 /**
@@ -75,7 +75,7 @@
 
    /**
     * @mapping {@literal hashed m_ufuzzxij Lnet/minecraft/unmapped/C_elzszhbq;m_ufuzzxij(Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)Ljava/util/Map;}
-    * @mapping {@literal named prepare Lnet/minecraft/resource/JsonDataLoader;prepare(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)Ljava/util/Map;}
+    * @mapping {@literal named prepare Lnet/minecraft/resource/JsonDataLoader;prepare(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiling/Profiler;)Ljava/util/Map;}
     */
    protected Map<Identifier, T> prepare(ResourceManager resourceManager, Profiler profiler) {
       Map<Identifier, T> map = new HashMap();
diff -bur namedTargetSrc/net/minecraft/resource/ProfiledResourceReload.java namedSrc/net/minecraft/resource/ProfiledResourceReload.java
--- namedTargetSrc/net/minecraft/resource/ProfiledResourceReload.java	2024-10-17 02:53:20.413619889 +0000
+++ namedSrc/net/minecraft/resource/ProfiledResourceReload.java	2024-10-17 02:52:09.913023659 +0000
@@ -7,10 +7,10 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.Unit;
 import net.minecraft.util.Util;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import org.slf4j.Logger;
 
 /**
@@ -66,7 +66,7 @@
     */
    private static Executor m_gedyavpt(Executor executor, AtomicLong atomicLong, String string) {
       return runnable -> executor.execute(() -> {
-            Profiler lv = C_xuophqnt.m_yaecfwdp();
+            Profiler lv = ProfilerManager.m_yaecfwdp();
             lv.push(string);
             long l = Util.getMeasuringTimeNano();
             runnable.run();
diff -bur namedTargetSrc/net/minecraft/resource/SinglePreparationResourceReloader.java namedSrc/net/minecraft/resource/SinglePreparationResourceReloader.java
--- namedTargetSrc/net/minecraft/resource/SinglePreparationResourceReloader.java	2024-10-17 02:53:20.301618949 +0000
+++ namedSrc/net/minecraft/resource/SinglePreparationResourceReloader.java	2024-10-17 02:52:09.745022509 +0000
@@ -2,8 +2,8 @@
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
-import net.minecraft.unmapped.C_xuophqnt;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 
 /**
  * A base resource reloader implementation that prepares an object in a
@@ -23,9 +23,9 @@
    public final CompletableFuture<Void> reload(
       ResourceReloader.Synchronizer synchronizer, ResourceManager resourceManager, Executor prepareExecutor, Executor applyExecutor
    ) {
-      return CompletableFuture.supplyAsync(() -> this.prepare(resourceManager, C_xuophqnt.m_yaecfwdp()), prepareExecutor)
+      return CompletableFuture.supplyAsync(() -> this.prepare(resourceManager, ProfilerManager.m_yaecfwdp()), prepareExecutor)
          .thenCompose(synchronizer::whenPrepared)
-         .thenAcceptAsync(data -> this.apply((T)data, resourceManager, C_xuophqnt.m_yaecfwdp()), applyExecutor);
+         .thenAcceptAsync(data -> this.apply((T)data, resourceManager, ProfilerManager.m_yaecfwdp()), applyExecutor);
    }
 
    /**
@@ -39,7 +39,7 @@
     * @param profiler the prepare profiler
     * 
     * @mapping {@literal hashed m_itgdltaz Lnet/minecraft/unmapped/C_iuwfjpcq;m_itgdltaz(Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)Ljava/lang/Object;}
-    * @mapping {@literal named prepare Lnet/minecraft/resource/SinglePreparationResourceReloader;prepare(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)Ljava/lang/Object;}
+    * @mapping {@literal named prepare Lnet/minecraft/resource/SinglePreparationResourceReloader;prepare(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiling/Profiler;)Ljava/lang/Object;}
     */
    protected abstract T prepare(ResourceManager manager, Profiler profiler);
 
@@ -53,7 +53,7 @@
     * @param profiler the apply profiler
     * 
     * @mapping {@literal hashed m_faulmbtd Lnet/minecraft/unmapped/C_iuwfjpcq;m_faulmbtd(Ljava/lang/Object;Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)V}
-    * @mapping {@literal named apply Lnet/minecraft/resource/SinglePreparationResourceReloader;apply(Ljava/lang/Object;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V}
+    * @mapping {@literal named apply Lnet/minecraft/resource/SinglePreparationResourceReloader;apply(Ljava/lang/Object;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiling/Profiler;)V}
     */
    protected abstract void apply(T cache, ResourceManager manager, Profiler profiler);
 }
diff -bur namedTargetSrc/net/minecraft/resource/SynchronousResourceReloader.java namedSrc/net/minecraft/resource/SynchronousResourceReloader.java
--- namedTargetSrc/net/minecraft/resource/SynchronousResourceReloader.java	2024-10-17 02:53:20.297618915 +0000
+++ namedSrc/net/minecraft/resource/SynchronousResourceReloader.java	2024-10-17 02:52:09.737022454 +0000
@@ -2,9 +2,9 @@
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.Unit;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 
 /**
  * A base resource reloader that does all its work in the apply executor,
@@ -28,7 +28,7 @@
       ResourceReloader.Synchronizer synchronizer, ResourceManager resourceManager, Executor prepareExecutor, Executor applyExecutor
    ) {
       return synchronizer.whenPrepared(Unit.INSTANCE).thenRunAsync(() -> {
-         Profiler lv = C_xuophqnt.m_yaecfwdp();
+         Profiler lv = ProfilerManager.m_yaecfwdp();
          lv.push("listener");
          this.reload(resourceManager);
          lv.pop();
diff -bur namedTargetSrc/net/minecraft/server/command/CommandManager.java namedSrc/net/minecraft/server/command/CommandManager.java
--- namedTargetSrc/net/minecraft/server/command/CommandManager.java	2024-10-17 02:53:20.413619889 +0000
+++ namedSrc/net/minecraft/server/command/CommandManager.java	2024-10-17 02:52:09.917023687 +0000
@@ -70,9 +70,9 @@
 import net.minecraft.text.Texts;
 import net.minecraft.unmapped.C_fwdwgvbs;
 import net.minecraft.unmapped.C_uenvhyqw;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Util;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.util.profiling.jfr.JvmProfiler;
 import net.minecraft.world.GameRules;
 import org.jetbrains.annotations.Nullable;
@@ -257,7 +257,7 @@
     */
    public void execute(ParseResults<ServerCommandSource> results, String command) {
       ServerCommandSource lv = results.getContext().getSource();
-      C_xuophqnt.m_yaecfwdp().push((Supplier<String>)(() -> "/" + command));
+      ProfilerManager.m_yaecfwdp().push((Supplier<String>)(() -> "/" + command));
       ContextChain<ServerCommandSource> contextChain = m_vpjfqbjq(results, command, lv);
 
       try {
@@ -286,7 +286,7 @@
             LOGGER.error("'/{}' threw an exception", command, var12);
          }
       } finally {
-         C_xuophqnt.m_yaecfwdp().pop();
+         ProfilerManager.m_yaecfwdp().pop();
       }
    }
 
@@ -337,7 +337,7 @@
          int i = Math.max(1, minecraftServer.getGameRules().getIntValue(GameRules.MAX_COMMAND_CHAIN_LENGTH));
          int j = minecraftServer.getGameRules().getIntValue(GameRules.MAX_COMMAND_FORK_COUNT);
 
-         try (C_fwdwgvbs<ServerCommandSource> lv2 = new C_fwdwgvbs<>(i, j, C_xuophqnt.m_yaecfwdp())) {
+         try (C_fwdwgvbs<ServerCommandSource> lv2 = new C_fwdwgvbs<>(i, j, ProfilerManager.m_yaecfwdp())) {
             f_eaioeejo.set(lv2);
             consumer.accept(lv2);
             lv2.m_jbtyhyis();
diff -bur namedTargetSrc/net/minecraft/server/command/DebugCommand.java namedSrc/net/minecraft/server/command/DebugCommand.java
--- namedTargetSrc/net/minecraft/server/command/DebugCommand.java	2024-10-17 02:53:20.281618781 +0000
+++ namedSrc/net/minecraft/server/command/DebugCommand.java	2024-10-17 02:52:09.713022290 +0000
@@ -30,7 +30,7 @@
 import net.minecraft.util.Identifier;
 import net.minecraft.util.TimeHelper;
 import net.minecraft.util.Util;
-import net.minecraft.util.profiler.ProfileResult;
+import net.minecraft.util.profiling.ProfileResult;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 
diff -bur namedTargetSrc/net/minecraft/server/dedicated/command/PerfCommand.java namedSrc/net/minecraft/server/dedicated/command/PerfCommand.java
--- namedTargetSrc/net/minecraft/server/dedicated/command/PerfCommand.java	2024-10-17 02:53:20.273618714 +0000
+++ namedSrc/net/minecraft/server/dedicated/command/PerfCommand.java	2024-10-17 02:52:09.701022207 +0000
@@ -19,9 +19,9 @@
 import net.minecraft.util.TimeHelper;
 import net.minecraft.util.Util;
 import net.minecraft.util.ZipCompressor;
-import net.minecraft.util.profiler.EmptyProfileResult;
-import net.minecraft.util.profiler.ProfileResult;
-import net.minecraft.util.profiler.RecordDumper;
+import net.minecraft.util.profiling.EmptyProfileResult;
+import net.minecraft.util.profiling.ProfileResult;
+import net.minecraft.util.profiling.RecordDumper;
 import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 
@@ -136,7 +136,7 @@
 
    /**
     * @mapping {@literal hashed m_afalldfg Lnet/minecraft/unmapped/C_ubneiqzy;m_afalldfg(Lnet/minecraft/unmapped/C_pennblrk;Lnet/minecraft/unmapped/C_dzczqjri;)V}
-    * @mapping {@literal named sendProfilingStoppedMessage Lnet/minecraft/server/dedicated/command/PerfCommand;sendProfilingStoppedMessage(Lnet/minecraft/server/command/ServerCommandSource;Lnet/minecraft/util/profiler/ProfileResult;)V}
+    * @mapping {@literal named sendProfilingStoppedMessage Lnet/minecraft/server/dedicated/command/PerfCommand;sendProfilingStoppedMessage(Lnet/minecraft/server/command/ServerCommandSource;Lnet/minecraft/util/profiling/ProfileResult;)V}
     */
    private static void sendProfilingStoppedMessage(ServerCommandSource source, ProfileResult result) {
       if (result != EmptyProfileResult.INSTANCE) {
diff -bur namedTargetSrc/net/minecraft/server/function/CommandFunctionManager.java namedSrc/net/minecraft/server/function/CommandFunctionManager.java
--- namedTargetSrc/net/minecraft/server/function/CommandFunctionManager.java	2024-10-17 02:53:20.261618614 +0000
+++ namedSrc/net/minecraft/server/function/CommandFunctionManager.java	2024-10-17 02:52:09.669021989 +0000
@@ -13,10 +13,10 @@
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.unmapped.C_cawuzyqd;
 import net.minecraft.unmapped.C_fwdwgvbs;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.FormattedException;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import org.slf4j.Logger;
 
 /**
@@ -111,13 +111,13 @@
     * @mapping {@literal named executeAll Lnet/minecraft/server/function/CommandFunctionManager;executeAll(Ljava/util/Collection;Lnet/minecraft/util/Identifier;)V}
     */
    private void executeAll(Collection<CommandFunction<ServerCommandSource>> functions, Identifier label) {
-      C_xuophqnt.m_yaecfwdp().push(label::toString);
+      ProfilerManager.m_yaecfwdp().push(label::toString);
 
       for (CommandFunction<ServerCommandSource> lv : functions) {
          this.m_gozicqhp(lv, this.getScheduledCommandSource());
       }
 
-      C_xuophqnt.m_yaecfwdp().pop();
+      ProfilerManager.m_yaecfwdp().pop();
    }
 
    /**
@@ -125,7 +125,7 @@
     * @mapping {@literal named m_gozicqhp Lnet/minecraft/server/function/CommandFunctionManager;m_gozicqhp(Lnet/minecraft/server/function/CommandFunction;Lnet/minecraft/server/command/ServerCommandSource;)V}
     */
    public void m_gozicqhp(CommandFunction<ServerCommandSource> function, ServerCommandSource source) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push((Supplier<String>)(() -> "function " + function.id()));
 
       try {
diff -bur namedTargetSrc/net/minecraft/server/integrated/IntegratedServer.java namedSrc/net/minecraft/server/integrated/IntegratedServer.java
--- namedTargetSrc/net/minecraft/server/integrated/IntegratedServer.java	2024-10-17 02:53:20.297618915 +0000
+++ namedSrc/net/minecraft/server/integrated/IntegratedServer.java	2024-10-17 02:52:09.741022482 +0000
@@ -23,12 +23,12 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.stat.Stats;
 import net.minecraft.unmapped.C_pwpucsml;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.ModStatus;
 import net.minecraft.util.SystemDetails;
 import net.minecraft.util.crash.CrashReport;
 import net.minecraft.util.math.ChunkPos;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.world.GameMode;
 import net.minecraft.world.storage.RegionStorageKey;
 import net.minecraft.world.storage.WorldSaveStorage;
@@ -150,7 +150,7 @@
    public void tick(BooleanSupplier shouldKeepTicking) {
       boolean bl = this.paused;
       this.paused = MinecraftClient.getInstance().isPaused();
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       if (!bl && this.paused) {
          lv.push("autoSave");
          LOGGER.info("Saving and pausing game...");
diff -bur namedTargetSrc/net/minecraft/server/MinecraftServer.java namedSrc/net/minecraft/server/MinecraftServer.java
--- namedTargetSrc/net/minecraft/server/MinecraftServer.java	2024-10-17 02:53:20.373619554 +0000
+++ namedSrc/net/minecraft/server/MinecraftServer.java	2024-10-17 02:52:09.853023248 +0000
@@ -112,7 +112,6 @@
 import net.minecraft.unmapped.C_mlczkowr;
 import net.minecraft.unmapped.C_vfghmpoz;
 import net.minecraft.unmapped.C_vwbgaqyj;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.DebugSampleType;
 import net.minecraft.util.FileNameUtil;
 import net.minecraft.util.Identifier;
@@ -135,15 +134,16 @@
 import net.minecraft.util.math.Vec2f;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.math.random.RandomSequencesState;
-import net.minecraft.util.profiler.DebugRecorder;
-import net.minecraft.util.profiler.DummyRecorder;
-import net.minecraft.util.profiler.EmptyProfileResult;
-import net.minecraft.util.profiler.ProfileResult;
-import net.minecraft.util.profiler.Profiler;
-import net.minecraft.util.profiler.ProfilerTiming;
-import net.minecraft.util.profiler.RecordDumper;
-import net.minecraft.util.profiler.Recorder;
-import net.minecraft.util.profiler.ServerSamplerSource;
+import net.minecraft.util.profiling.DebugRecorder;
+import net.minecraft.util.profiling.DummyRecorder;
+import net.minecraft.util.profiling.EmptyProfileResult;
+import net.minecraft.util.profiling.ProfileResult;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
+import net.minecraft.util.profiling.ProfilerTiming;
+import net.minecraft.util.profiling.RecordDumper;
+import net.minecraft.util.profiling.Recorder;
+import net.minecraft.util.profiling.ServerSamplerSource;
 import net.minecraft.util.profiling.jfr.JvmProfiler;
 import net.minecraft.util.profiling.jfr.ProfiledDuration;
 import net.minecraft.util.random.RandomGenerator;
@@ -307,7 +307,7 @@
    private final List<Runnable> serverGuiTickables = Lists.<Runnable>newArrayList();
    /**
     * @mapping {@literal hashed f_fbididar Lnet/minecraft/server/MinecraftServer;f_fbididar:Lnet/minecraft/unmapped/C_owhdirgj;}
-    * @mapping {@literal named recorder Lnet/minecraft/server/MinecraftServer;recorder:Lnet/minecraft/util/profiler/Recorder;}
+    * @mapping {@literal named recorder Lnet/minecraft/server/MinecraftServer;recorder:Lnet/minecraft/util/profiling/Recorder;}
     */
    private Recorder recorder = DummyRecorder.INSTANCE;
    /**
@@ -1183,8 +1183,8 @@
 
             this.f_khxqdkeo += l;
 
-            try (C_xuophqnt.C_gknixwqr lv = C_xuophqnt.m_zzebcxlx(this.m_rgmmadtp())) {
-               Profiler lv2 = C_xuophqnt.m_yaecfwdp();
+            try (ProfilerManager.Scope lv = ProfilerManager.m_zzebcxlx(this.m_rgmmadtp())) {
+               Profiler lv2 = ProfilerManager.m_yaecfwdp();
                lv2.push("tick");
                this.f_qlyvxoeb.start();
                this.tick(bl ? () -> false : this::shouldKeepTicking);
@@ -1411,7 +1411,7 @@
     * @mapping {@literal named executeTask Lnet/minecraft/server/MinecraftServer;executeTask(Lnet/minecraft/server/ServerTask;)V}
     */
    protected void executeTask(ServerTask arg) {
-      C_xuophqnt.m_yaecfwdp().visit("runTask");
+      ProfilerManager.m_yaecfwdp().visit("runTask");
       super.executeTask(arg);
    }
 
@@ -1513,7 +1513,7 @@
          this.m_goblkjhe();
       }
 
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("tallying");
       long m = Util.getMeasuringTimeNano() - l;
       int j = this.ticks % 100;
@@ -1531,7 +1531,7 @@
    private void m_goblkjhe() {
       this.ticksUntilAutosave = this.m_unwsichu();
       LOGGER.debug("Autosave started");
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("save");
       this.save(true, false, false);
       lv.pop();
@@ -1627,7 +1627,7 @@
     * @mapping {@literal named tickWorlds Lnet/minecraft/server/MinecraftServer;tickWorlds(Ljava/util/function/BooleanSupplier;)V}
     */
    protected void tickWorlds(BooleanSupplier shouldKeepTicking) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       this.getPlayerManager().getPlayerList().forEach(player -> player.networkHandler.suspendFlushing());
       lv.push("commandFunctions");
       this.getCommandFunctionManager().tick();
@@ -1703,7 +1703,7 @@
     * @mapping {@literal named syncTime Lnet/minecraft/server/MinecraftServer;syncTime()V}
     */
    public void syncTime() {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("timeSync");
 
       for (ServerWorld lv2 : this.getWorlds()) {
@@ -3259,7 +3259,7 @@
 
    /**
     * @mapping {@literal hashed m_fwiwddfp Lnet/minecraft/server/MinecraftServer;m_fwiwddfp()Lnet/minecraft/unmapped/C_dzczqjri;}
-    * @mapping {@literal named stopDebug Lnet/minecraft/server/MinecraftServer;stopDebug()Lnet/minecraft/util/profiler/ProfileResult;}
+    * @mapping {@literal named stopDebug Lnet/minecraft/server/MinecraftServer;stopDebug()Lnet/minecraft/util/profiling/ProfileResult;}
     */
    public ProfileResult stopDebug() {
       if (this.debugStart == null) {
@@ -3436,7 +3436,7 @@
 
       /**
        * @mapping {@literal hashed m_mcjydrzb Lnet/minecraft/server/MinecraftServer$C_rfqdsgps;m_mcjydrzb(JI)Lnet/minecraft/unmapped/C_dzczqjri;}
-       * @mapping {@literal named end Lnet/minecraft/server/MinecraftServer$DebugStart;end(JI)Lnet/minecraft/util/profiler/ProfileResult;}
+       * @mapping {@literal named end Lnet/minecraft/server/MinecraftServer$DebugStart;end(JI)Lnet/minecraft/util/profiling/ProfileResult;}
        */
       ProfileResult end(long endTime, int endTick) {
          return new ProfileResult() {
diff -bur namedTargetSrc/net/minecraft/server/network/ServerPlayerEntity.java namedSrc/net/minecraft/server/network/ServerPlayerEntity.java
--- namedTargetSrc/net/minecraft/server/network/ServerPlayerEntity.java	2024-10-17 02:53:20.361619453 +0000
+++ namedSrc/net/minecraft/server/network/ServerPlayerEntity.java	2024-10-17 02:52:09.833023111 +0000
@@ -148,7 +148,6 @@
 import net.minecraft.unmapped.C_npripfjn;
 import net.minecraft.unmapped.C_sfpofsgc;
 import net.minecraft.unmapped.C_sqhjwpkh;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.unmapped.C_zqywhkdo;
 import net.minecraft.util.Arm;
 import net.minecraft.util.Formatting;
@@ -169,7 +168,8 @@
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.village.TradeOfferList;
 import net.minecraft.world.Difficulty;
@@ -1481,7 +1481,7 @@
             lv5.sendCommandTree(this);
             lv2.removePlayer(this, Entity.RemovalReason.CHANGED_DIMENSION);
             this.unsetRemoved();
-            Profiler lv6 = C_xuophqnt.m_yaecfwdp();
+            Profiler lv6 = ProfilerManager.m_yaecfwdp();
             lv6.push("moving");
             if (lv3 == World.OVERWORLD && lv.getRegistryKey() == World.NETHER) {
                this.enteredNetherPos = this.getPos();

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (3/3): 
diff -bur namedTargetSrc/net/minecraft/server/ServerAdvancementLoader.java namedSrc/net/minecraft/server/ServerAdvancementLoader.java
--- namedTargetSrc/net/minecraft/server/ServerAdvancementLoader.java	2024-10-17 02:53:20.201618110 +0000
+++ namedSrc/net/minecraft/server/ServerAdvancementLoader.java	2024-10-17 02:52:09.565021276 +0000
@@ -16,7 +16,7 @@
 import net.minecraft.resource.ResourceManager;
 import net.minecraft.util.ErrorReporter;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 
@@ -57,7 +57,7 @@
 
    /**
     * @mapping {@literal hashed m_shgkfaem Lnet/minecraft/unmapped/C_fktoyupt;m_shgkfaem(Ljava/util/Map;Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)V}
-    * @mapping {@literal named apply Lnet/minecraft/server/ServerAdvancementLoader;apply(Ljava/util/Map;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V}
+    * @mapping {@literal named apply Lnet/minecraft/server/ServerAdvancementLoader;apply(Ljava/util/Map;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiling/Profiler;)V}
     */
    protected void apply(Map<Identifier, Advancement> map, ResourceManager resourceManager, Profiler profiler) {
       Builder<Identifier, AdvancementHolder> builder = ImmutableMap.builder();
diff -bur namedTargetSrc/net/minecraft/server/world/ServerChunkManager.java namedSrc/net/minecraft/server/world/ServerChunkManager.java
--- namedTargetSrc/net/minecraft/server/world/ServerChunkManager.java	2024-10-17 02:53:20.273618714 +0000
+++ namedSrc/net/minecraft/server/world/ServerChunkManager.java	2024-10-17 02:52:09.697022180 +0000
@@ -25,14 +25,14 @@
 import net.minecraft.structure.StructureTemplateManager;
 import net.minecraft.unmapped.C_byseqigh;
 import net.minecraft.unmapped.C_noeozorr;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.FileNameUtil;
 import net.minecraft.util.Util;
 import net.minecraft.util.annotation.Debug;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.util.math.ChunkSectionPos;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.util.thread.ThreadExecutor;
 import net.minecraft.world.ChunkLightBlockView;
 import net.minecraft.world.GameRules;
@@ -251,7 +251,7 @@
       if (Thread.currentThread() != this.serverThread) {
          return (Chunk)CompletableFuture.supplyAsync(() -> this.m_hwywidsl(i, j, arg, bl), this.mainThreadExecutor).join();
       } else {
-         Profiler lv = C_xuophqnt.m_yaecfwdp();
+         Profiler lv = ProfilerManager.m_yaecfwdp();
          lv.visit("getChunk");
          long l = ChunkPos.toLong(i, j);
 
@@ -287,7 +287,7 @@
       if (Thread.currentThread() != this.serverThread) {
          return null;
       } else {
-         C_xuophqnt.m_yaecfwdp().visit("getChunkNow");
+         ProfilerManager.m_yaecfwdp().visit("getChunkNow");
          long l = ChunkPos.toLong(chunkX, chunkZ);
 
          for (int k = 0; k < 4; k++) {
@@ -354,7 +354,7 @@
       if (create) {
          this.ticketManager.addTicketWithLevel(ChunkTicketType.UNKNOWN, lv, k, lv);
          if (this.isMissingForLevel(lv2, k)) {
-            Profiler lv3 = C_xuophqnt.m_yaecfwdp();
+            Profiler lv3 = ProfilerManager.m_yaecfwdp();
             lv3.push("chunkLoad");
             this.tick();
             lv2 = this.getChunkHolder(l);
@@ -468,7 +468,7 @@
     */
    @Override
    public void tick(BooleanSupplier shouldKeepTicking, boolean tickChunks) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("purge");
       if (this.world.getTickManager().shouldTick() || !tickChunks) {
          this.ticketManager.purge();
@@ -496,7 +496,7 @@
       long m = l - this.lastMobSpawningTime;
       this.lastMobSpawningTime = l;
       if (!this.world.isDebugWorld()) {
-         Profiler lv = C_xuophqnt.m_yaecfwdp();
+         Profiler lv = ProfilerManager.m_yaecfwdp();
          lv.push("pollingChunks");
          if (this.world.getTickManager().shouldTick()) {
             List<WorldChunk> list = this.f_ecvyblnm;
@@ -520,7 +520,7 @@
 
    /**
     * @mapping {@literal hashed m_dwccdjvk Lnet/minecraft/unmapped/C_ebcmvjwj;m_dwccdjvk(Lnet/minecraft/unmapped/C_eslcbfsq;)V}
-    * @mapping {@literal named m_dwccdjvk Lnet/minecraft/server/world/ServerChunkManager;m_dwccdjvk(Lnet/minecraft/util/profiler/Profiler;)V}
+    * @mapping {@literal named m_dwccdjvk Lnet/minecraft/server/world/ServerChunkManager;m_dwccdjvk(Lnet/minecraft/util/profiling/Profiler;)V}
     */
    private void m_dwccdjvk(Profiler profiler) {
       profiler.push("broadcast");
@@ -550,7 +550,7 @@
 
    /**
     * @mapping {@literal hashed m_ywyiiuyu Lnet/minecraft/unmapped/C_ebcmvjwj;m_ywyiiuyu(Lnet/minecraft/unmapped/C_eslcbfsq;JLjava/util/List;)V}
-    * @mapping {@literal named spawnAndTickChunks Lnet/minecraft/server/world/ServerChunkManager;spawnAndTickChunks(Lnet/minecraft/util/profiler/Profiler;JLjava/util/List;)V}
+    * @mapping {@literal named spawnAndTickChunks Lnet/minecraft/server/world/ServerChunkManager;spawnAndTickChunks(Lnet/minecraft/util/profiling/Profiler;JLjava/util/List;)V}
     */
    private void spawnAndTickChunks(Profiler profiler, long l, List<WorldChunk> list) {
       profiler.swap("naturalSpawnCount");
@@ -892,7 +892,7 @@
        */
       @Override
       protected void executeTask(Runnable task) {
-         C_xuophqnt.m_yaecfwdp().visit("runTask");
+         ProfilerManager.m_yaecfwdp().visit("runTask");
          super.executeTask(task);
       }
 
diff -bur namedTargetSrc/net/minecraft/server/world/ServerWorld.java namedSrc/net/minecraft/server/world/ServerWorld.java
--- namedTargetSrc/net/minecraft/server/world/ServerWorld.java	2024-10-17 02:53:20.397619754 +0000
+++ namedSrc/net/minecraft/server/world/ServerWorld.java	2024-10-17 02:52:09.893023522 +0000
@@ -95,7 +95,6 @@
 import net.minecraft.unmapped.C_ccpekhhb;
 import net.minecraft.unmapped.C_kqpnqdlc;
 import net.minecraft.unmapped.C_lkfbemcf;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.CsvWriter;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.ProgressListener;
@@ -118,7 +117,8 @@
 import net.minecraft.util.math.int_provider.IntProvider;
 import net.minecraft.util.math.int_provider.UniformIntProvider;
 import net.minecraft.util.math.random.RandomSequencesState;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.util.shape.VoxelShapes;
@@ -488,7 +488,7 @@
     * @mapping {@literal named tick Lnet/minecraft/server/world/ServerWorld;tick(Ljava/util/function/BooleanSupplier;)V}
     */
    public void tick(BooleanSupplier shouldKeepTicking) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       this.inBlockTick = true;
       TickManager lv2 = this.getTickManager();
       boolean bl = lv2.shouldTick();
@@ -603,9 +603,9 @@
       if (this.shouldTickTime) {
          long l = this.properties.getTime() + 1L;
          this.worldProperties.setTime(l);
-         C_xuophqnt.m_yaecfwdp().push("scheduledFunctions");
+         ProfilerManager.m_yaecfwdp().push("scheduledFunctions");
          this.worldProperties.getScheduledEvents().processEvents(this.server, l);
-         C_xuophqnt.m_yaecfwdp().pop();
+         ProfilerManager.m_yaecfwdp().pop();
          if (this.worldProperties.getGameRules().getBooleanValue(GameRules.DO_DAYLIGHT_CYCLE)) {
             this.setTimeOfDay(this.properties.getTimeOfDay() + 1L);
          }
@@ -648,7 +648,7 @@
       boolean bl = this.isRaining();
       int j = lv.getStartX();
       int k = lv.getStartZ();
-      Profiler lv2 = C_xuophqnt.m_yaecfwdp();
+      Profiler lv2 = ProfilerManager.m_yaecfwdp();
       lv2.push("thunder");
       if (bl && this.isThundering() && this.random.nextInt(100000) == 0) {
          BlockPos lv3 = this.getSurface(this.getRandomPosInChunk(j, 0, k, 15));
@@ -990,7 +990,7 @@
     */
    public void tickEntity(Entity entity) {
       entity.m_hhwtkfxu();
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       entity.age++;
       lv.push((Supplier<String>)(() -> Registries.ENTITY_TYPE.getId(entity.getType()).toString()));
       lv.visit("tickNonPassenger");
@@ -1012,7 +1012,7 @@
       } else if (passenger instanceof PlayerEntity || this.entityList.has(passenger)) {
          passenger.m_hhwtkfxu();
          passenger.age++;
-         Profiler lv = C_xuophqnt.m_yaecfwdp();
+         Profiler lv = ProfilerManager.m_yaecfwdp();
          lv.push((Supplier<String>)(() -> Registries.ENTITY_TYPE.getId(passenger.getType()).toString()));
          lv.visit("tickPassenger");
          passenger.tickRiding();
diff -bur namedTargetSrc/net/minecraft/server/world/ThreadedChunkManager.java namedSrc/net/minecraft/server/world/ThreadedChunkManager.java
--- namedTargetSrc/net/minecraft/server/world/ThreadedChunkManager.java	2024-10-17 02:53:20.425619990 +0000
+++ namedSrc/net/minecraft/server/world/ThreadedChunkManager.java	2024-10-17 02:52:09.929023769 +0000
@@ -69,7 +69,6 @@
 import net.minecraft.unmapped.C_noeozorr;
 import net.minecraft.unmapped.C_rqmfyoal;
 import net.minecraft.unmapped.C_xgsefppr;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.unmapped.C_xvtyhamt;
 import net.minecraft.unmapped.C_zbeluwhm;
 import net.minecraft.util.CsvWriter;
@@ -82,7 +81,8 @@
 import net.minecraft.util.math.ChunkSectionPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.util.thread.ThreadExecutor;
 import net.minecraft.world.GameRules;
 import net.minecraft.world.PersistentStateManager;
@@ -693,7 +693,7 @@
     * @mapping {@literal named tick Lnet/minecraft/server/world/ThreadedChunkManager;tick(Ljava/util/function/BooleanSupplier;)V}
     */
    protected void tick(BooleanSupplier shouldKeepTicking) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("poi");
       this.pointOfInterestStorage.tick(shouldKeepTicking);
       lv.swap("chunk_unload");
@@ -832,7 +832,7 @@
          }), Util.getMainWorkerExecutor().m_dpkxxwqd("parseChunk"));
       CompletableFuture<?> completableFuture2 = this.pointOfInterestStorage.m_qxezhsza(pos);
       return completableFuture.thenCombine(completableFuture2, (optional, object) -> optional).thenApplyAsync(optional -> {
-         C_xuophqnt.m_yaecfwdp().visit("chunkLoad");
+         ProfilerManager.m_yaecfwdp().visit("chunkLoad");
          if (optional.isPresent()) {
             Chunk lv = ((C_dnvmojll)optional.get()).m_fubnchkd(this.world, this.pointOfInterestStorage, this.m_irwgscqq(), pos);
             this.m_licqfdlz(pos, lv.m_rbxakgwa().getChunkType());
@@ -1077,7 +1077,7 @@
                }
             }
 
-            C_xuophqnt.m_yaecfwdp().visit("chunkSave");
+            ProfilerManager.m_yaecfwdp().visit("chunkSave");
             this.f_susaekdz.incrementAndGet();
             C_dnvmojll lv3 = C_dnvmojll.m_ojbahlzt(this.world, chunk);
             CompletableFuture<NbtCompound> completableFuture = CompletableFuture.supplyAsync(lv3::m_oihexsgu, Util.getMainWorkerExecutor());
diff -bur namedTargetSrc/net/minecraft/unmapped/C_faujnouj.java namedSrc/net/minecraft/unmapped/C_faujnouj.java
--- namedTargetSrc/net/minecraft/unmapped/C_faujnouj.java	2024-10-17 02:53:20.385619654 +0000
+++ namedSrc/net/minecraft/unmapped/C_faujnouj.java	2024-10-17 02:52:09.873023385 +0000
@@ -1,7 +1,7 @@
 package net.minecraft.unmapped;
 
 import java.util.function.Supplier;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -15,14 +15,14 @@
    public static final C_faujnouj f_nbpmwnjv = new C_faujnouj(null);
    /**
     * @mapping {@literal hashed f_kmfntdjz Lnet/minecraft/unmapped/C_faujnouj;f_kmfntdjz:Lnet/minecraft/unmapped/C_eslcbfsq;}
-    * @mapping {@literal named profiler Lnet/minecraft/unmapped/C_faujnouj;profiler:Lnet/minecraft/util/profiler/Profiler;}
+    * @mapping {@literal named profiler Lnet/minecraft/unmapped/C_faujnouj;profiler:Lnet/minecraft/util/profiling/Profiler;}
     */
    @Nullable
    private final Profiler profiler;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_faujnouj;<init>(Lnet/minecraft/unmapped/C_eslcbfsq;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/unmapped/C_faujnouj;<init>(Lnet/minecraft/util/profiler/Profiler;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/unmapped/C_faujnouj;<init>(Lnet/minecraft/util/profiling/Profiler;)V}
     */
    C_faujnouj(@Nullable Profiler profiler) {
       this.profiler = profiler;
diff -bur namedTargetSrc/net/minecraft/unmapped/C_fpwiwmrb.java namedSrc/net/minecraft/unmapped/C_fpwiwmrb.java
--- namedTargetSrc/net/minecraft/unmapped/C_fpwiwmrb.java	2024-10-17 02:53:20.245618479 +0000
+++ namedSrc/net/minecraft/unmapped/C_fpwiwmrb.java	2024-10-17 02:52:09.641021797 +0000
@@ -34,7 +34,7 @@
 import net.minecraft.util.FileNameUtil;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.InvalidIdentifierException;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
 import org.apache.commons.io.IOUtils;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -94,7 +94,7 @@
 
    /**
     * @mapping {@literal hashed m_mvvntbcd Lnet/minecraft/unmapped/C_fpwiwmrb;m_mvvntbcd(Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)Lnet/minecraft/unmapped/C_fpwiwmrb$C_shwjsezb;}
-    * @mapping {@literal named prepare Lnet/minecraft/unmapped/C_fpwiwmrb;prepare(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)Lnet/minecraft/unmapped/C_fpwiwmrb$C_shwjsezb;}
+    * @mapping {@literal named prepare Lnet/minecraft/unmapped/C_fpwiwmrb;prepare(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiling/Profiler;)Lnet/minecraft/unmapped/C_fpwiwmrb$C_shwjsezb;}
     */
    protected C_fpwiwmrb.C_shwjsezb prepare(ResourceManager resourceManager, Profiler profiler) {
       Builder<Identifier, C_gcohsdze> builder = ImmutableMap.builder();
@@ -305,7 +305,7 @@
 
    /**
     * @mapping {@literal hashed m_qyjdqkiw Lnet/minecraft/unmapped/C_fpwiwmrb;m_qyjdqkiw(Lnet/minecraft/unmapped/C_fpwiwmrb$C_shwjsezb;Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)V}
-    * @mapping {@literal named apply Lnet/minecraft/unmapped/C_fpwiwmrb;apply(Lnet/minecraft/unmapped/C_fpwiwmrb$C_shwjsezb;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V}
+    * @mapping {@literal named apply Lnet/minecraft/unmapped/C_fpwiwmrb;apply(Lnet/minecraft/unmapped/C_fpwiwmrb$C_shwjsezb;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiling/Profiler;)V}
     */
    protected void apply(C_fpwiwmrb.C_shwjsezb arg, ResourceManager resourceManager, Profiler profiler) {
       C_fpwiwmrb.C_ylsjmaiq lv = new C_fpwiwmrb.C_ylsjmaiq(arg);
diff -bur namedTargetSrc/net/minecraft/unmapped/C_fwdwgvbs.java namedSrc/net/minecraft/unmapped/C_fwdwgvbs.java
--- namedTargetSrc/net/minecraft/unmapped/C_fwdwgvbs.java	2024-10-17 02:53:20.317619083 +0000
+++ namedSrc/net/minecraft/unmapped/C_fwdwgvbs.java	2024-10-17 02:52:09.765022646 +0000
@@ -9,7 +9,7 @@
 import net.minecraft.command.CommandResultCallback;
 import net.minecraft.server.ExecutionCommandSource;
 import net.minecraft.server.function.Tracer;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 
@@ -37,7 +37,7 @@
    private final int f_uhsxgxlo;
    /**
     * @mapping {@literal hashed f_fnpouwjy Lnet/minecraft/unmapped/C_fwdwgvbs;f_fnpouwjy:Lnet/minecraft/unmapped/C_eslcbfsq;}
-    * @mapping {@literal named profiler Lnet/minecraft/unmapped/C_fwdwgvbs;profiler:Lnet/minecraft/util/profiler/Profiler;}
+    * @mapping {@literal named profiler Lnet/minecraft/unmapped/C_fwdwgvbs;profiler:Lnet/minecraft/util/profiling/Profiler;}
     */
    private final Profiler profiler;
    /**
@@ -69,7 +69,7 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_fwdwgvbs;<init>(IILnet/minecraft/unmapped/C_eslcbfsq;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/unmapped/C_fwdwgvbs;<init>(IILnet/minecraft/util/profiler/Profiler;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/unmapped/C_fwdwgvbs;<init>(IILnet/minecraft/util/profiling/Profiler;)V}
     */
    public C_fwdwgvbs(int i, int j, Profiler profiler) {
       this.f_uujekclw = i;
diff -bur namedTargetSrc/net/minecraft/unmapped/C_fxkhrwgo.java namedSrc/net/minecraft/unmapped/C_fxkhrwgo.java
--- namedTargetSrc/net/minecraft/unmapped/C_fxkhrwgo.java	2024-10-17 02:53:20.193618043 +0000
+++ namedSrc/net/minecraft/unmapped/C_fxkhrwgo.java	2024-10-17 02:52:09.553021195 +0000
@@ -7,8 +7,8 @@
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.atomic.AtomicReference;
 import net.minecraft.util.Util;
-import net.minecraft.util.profiler.SampleType;
-import net.minecraft.util.profiler.Sampler;
+import net.minecraft.util.profiling.SampleType;
+import net.minecraft.util.profiling.Sampler;
 import net.minecraft.util.thread.ExecutorSampling;
 import net.minecraft.util.thread.SampleableExecutor;
 import net.minecraft.util.thread.TaskQueue;
diff -bur namedTargetSrc/net/minecraft/unmapped/C_lkfbemcf.java namedSrc/net/minecraft/unmapped/C_lkfbemcf.java
--- namedTargetSrc/net/minecraft/unmapped/C_lkfbemcf.java	2024-10-17 02:53:20.341619285 +0000
+++ namedSrc/net/minecraft/unmapped/C_lkfbemcf.java	2024-10-17 02:52:09.809022947 +0000
@@ -28,7 +28,8 @@
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.world.GameRules;
 import net.minecraft.world.RaycastContext;
 import net.minecraft.world.event.GameEvent;
@@ -328,7 +329,7 @@
       List<BlockPos> list = this.m_cjuogcar();
       this.m_folmcino();
       if (this.m_oimvqzhk()) {
-         Profiler lv = C_xuophqnt.m_yaecfwdp();
+         Profiler lv = ProfilerManager.m_yaecfwdp();
          lv.push("explosion_blocks");
          this.m_piapvpqs(list);
          lv.pop();
diff -bur namedTargetSrc/net/minecraft/unmapped/C_rqmfyoal.java namedSrc/net/minecraft/unmapped/C_rqmfyoal.java
--- namedTargetSrc/net/minecraft/unmapped/C_rqmfyoal.java	2024-10-17 02:53:20.393619722 +0000
+++ namedSrc/net/minecraft/unmapped/C_rqmfyoal.java	2024-10-17 02:52:09.881023440 +0000
@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import net.minecraft.util.math.ChunkPos;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.ChunkStatus;
 import org.jetbrains.annotations.Nullable;
@@ -162,7 +163,7 @@
     * Mapping not found
     */
    private void m_cxsghiij(ChunkStatus arg, boolean bl) {
-      try (C_faujnouj lv = C_xuophqnt.m_yaecfwdp().m_zqvmpjqi("scheduleLayer")) {
+      try (C_faujnouj lv = ProfilerManager.m_yaecfwdp().m_zqvmpjqi("scheduleLayer")) {
          lv.m_kergkarl(arg::m_brihrkwf);
          int i = this.m_gjrditxe(arg, bl);
 
diff -bur namedTargetSrc/net/minecraft/unmapped/C_rxqlqsot.java namedSrc/net/minecraft/unmapped/C_rxqlqsot.java
--- namedTargetSrc/net/minecraft/unmapped/C_rxqlqsot.java	2024-10-17 02:53:20.245618479 +0000
+++ namedSrc/net/minecraft/unmapped/C_rxqlqsot.java	2024-10-17 02:52:09.645021825 +0000
@@ -6,7 +6,7 @@
 import net.minecraft.resource.JsonDataLoader;
 import net.minecraft.resource.ResourceManager;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_rxqlqsot}
@@ -33,7 +33,7 @@
 
    /**
     * @mapping {@literal hashed m_ywdmnujl Lnet/minecraft/unmapped/C_rxqlqsot;m_ywdmnujl(Ljava/util/Map;Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)V}
-    * @mapping {@literal named apply Lnet/minecraft/unmapped/C_rxqlqsot;apply(Ljava/util/Map;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V}
+    * @mapping {@literal named apply Lnet/minecraft/unmapped/C_rxqlqsot;apply(Ljava/util/Map;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiling/Profiler;)V}
     */
    protected void apply(Map<Identifier, C_mgbzsqdv> map, ResourceManager resourceManager, Profiler profiler) {
       this.f_ifqviucp = Map.copyOf(map);
diff -bur namedTargetSrc/net/minecraft/unmapped/C_vjopooww.java namedSrc/net/minecraft/unmapped/C_vjopooww.java
--- namedTargetSrc/net/minecraft/unmapped/C_vjopooww.java	2024-10-17 02:53:20.353619386 +0000
+++ namedSrc/net/minecraft/unmapped/C_vjopooww.java	2024-10-17 02:52:09.825023057 +0000
@@ -13,8 +13,8 @@
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.ArgbHelper;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.profiler.ProfileResult;
-import net.minecraft.util.profiler.ProfilerTiming;
+import net.minecraft.util.profiling.ProfileResult;
+import net.minecraft.util.profiling.ProfilerTiming;
 import org.jetbrains.annotations.Nullable;
 
 /**
Only in namedTargetSrc/net/minecraft/unmapped: C_xuophqnt.java
diff -bur namedTargetSrc/net/minecraft/unmapped/C_yspckbog.java namedSrc/net/minecraft/unmapped/C_yspckbog.java
--- namedTargetSrc/net/minecraft/unmapped/C_yspckbog.java	2024-10-17 02:53:20.269618681 +0000
+++ namedSrc/net/minecraft/unmapped/C_yspckbog.java	2024-10-17 02:52:09.689022126 +0000
@@ -14,8 +14,8 @@
 import java.util.Set;
 import java.util.function.Supplier;
 import net.minecraft.SharedConstants;
-import net.minecraft.util.profiler.Profiler;
-import net.minecraft.util.profiler.SampleType;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.SampleType;
 import org.slf4j.Logger;
 
 /**
Only in namedTargetSrc/net/minecraft/util: profiler
Only in namedSrc/net/minecraft/util/profiling: DebugRecorder.java
Only in namedSrc/net/minecraft/util/profiling: Deviation.java
Only in namedSrc/net/minecraft/util/profiling: DummyProfiler.java
Only in namedSrc/net/minecraft/util/profiling: DummyRecorder.java
Only in namedSrc/net/minecraft/util/profiling: EmptyProfileResult.java
Only in namedSrc/net/minecraft/util/profiling: ProfileLocationInfo.java
Only in namedSrc/net/minecraft/util/profiling: ProfileResultImpl.java
Only in namedSrc/net/minecraft/util/profiling: ProfileResult.java
Only in namedSrc/net/minecraft/util/profiling: Profiler.java
Only in namedSrc/net/minecraft/util/profiling: ProfilerManager.java
Only in namedSrc/net/minecraft/util/profiling: ProfilerSystem.java
Only in namedSrc/net/minecraft/util/profiling: ProfilerTiming.java
Only in namedSrc/net/minecraft/util/profiling: ReadableProfiler.java
Only in namedSrc/net/minecraft/util/profiling: RecordDumper.java
Only in namedSrc/net/minecraft/util/profiling: Recorder.java
Only in namedSrc/net/minecraft/util/profiling: SamplerFactory.java
Only in namedSrc/net/minecraft/util/profiling: Sampler.java
Only in namedSrc/net/minecraft/util/profiling: SamplerSource.java
Only in namedSrc/net/minecraft/util/profiling: SampleType.java
Only in namedSrc/net/minecraft/util/profiling: ServerSamplerSource.java
Only in namedSrc/net/minecraft/util/profiling: TickTimeTracker.java
diff -bur namedTargetSrc/net/minecraft/util/thread/ExecutorSampling.java namedSrc/net/minecraft/util/thread/ExecutorSampling.java
--- namedTargetSrc/net/minecraft/util/thread/ExecutorSampling.java	2024-10-17 02:53:20.349619352 +0000
+++ namedSrc/net/minecraft/util/thread/ExecutorSampling.java	2024-10-17 02:52:09.817023001 +0000
@@ -5,7 +5,7 @@
 import java.util.Objects;
 import java.util.WeakHashMap;
 import java.util.stream.Collectors;
-import net.minecraft.util.profiler.Sampler;
+import net.minecraft.util.profiling.Sampler;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -86,7 +86,7 @@
 
       /**
        * @mapping {@literal hashed m_rvhyvghk Lnet/minecraft/unmapped/C_erjchuix$C_hyaruiaq;m_rvhyvghk(Ljava/util/List;)Lnet/minecraft/unmapped/C_owhhojqn$C_nuurjoca;}
-       * @mapping {@literal named combineDeviationCheckers Lnet/minecraft/util/thread/ExecutorSampling$MergedSampler;combineDeviationCheckers(Ljava/util/List;)Lnet/minecraft/util/profiler/Sampler$DeviationChecker;}
+       * @mapping {@literal named combineDeviationCheckers Lnet/minecraft/util/thread/ExecutorSampling$MergedSampler;combineDeviationCheckers(Ljava/util/List;)Lnet/minecraft/util/profiling/Sampler$DeviationChecker;}
        */
       private static Sampler.DeviationChecker combineDeviationCheckers(List<Sampler> delegates) {
          return value -> delegates.stream().anyMatch(sampler -> sampler.deviationChecker != null ? sampler.deviationChecker.check(value) : false);
diff -bur namedTargetSrc/net/minecraft/util/thread/SampleableExecutor.java namedSrc/net/minecraft/util/thread/SampleableExecutor.java
--- namedTargetSrc/net/minecraft/util/thread/SampleableExecutor.java	2024-10-17 02:53:20.305618983 +0000
+++ namedSrc/net/minecraft/util/thread/SampleableExecutor.java	2024-10-17 02:52:09.749022536 +0000
@@ -1,7 +1,7 @@
 package net.minecraft.util.thread;
 
 import java.util.List;
-import net.minecraft.util.profiler.Sampler;
+import net.minecraft.util.profiling.Sampler;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_uqpmjvdt}
diff -bur namedTargetSrc/net/minecraft/util/thread/ThreadExecutor.java namedSrc/net/minecraft/util/thread/ThreadExecutor.java
--- namedTargetSrc/net/minecraft/util/thread/ThreadExecutor.java	2024-10-17 02:53:20.245618479 +0000
+++ namedSrc/net/minecraft/util/thread/ThreadExecutor.java	2024-10-17 02:52:09.645021825 +0000
@@ -16,8 +16,8 @@
 import net.minecraft.SharedConstants;
 import net.minecraft.unmapped.C_gmziowtg;
 import net.minecraft.util.crash.CrashException;
-import net.minecraft.util.profiler.SampleType;
-import net.minecraft.util.profiler.Sampler;
+import net.minecraft.util.profiling.SampleType;
+import net.minecraft.util.profiling.Sampler;
 import org.slf4j.Logger;
 
 /**
diff -bur namedTargetSrc/net/minecraft/util/TickDurationMonitor.java namedSrc/net/minecraft/util/TickDurationMonitor.java
--- namedTargetSrc/net/minecraft/util/TickDurationMonitor.java	2024-10-17 02:53:20.421619956 +0000
+++ namedSrc/net/minecraft/util/TickDurationMonitor.java	2024-10-17 02:52:09.925023741 +0000
@@ -3,11 +3,11 @@
 import com.mojang.logging.LogUtils;
 import java.io.File;
 import java.util.function.LongSupplier;
-import net.minecraft.util.profiler.DummyProfiler;
-import net.minecraft.util.profiler.ProfileResult;
-import net.minecraft.util.profiler.Profiler;
-import net.minecraft.util.profiler.ProfilerSystem;
-import net.minecraft.util.profiler.ReadableProfiler;
+import net.minecraft.util.profiling.DummyProfiler;
+import net.minecraft.util.profiling.ProfileResult;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerSystem;
+import net.minecraft.util.profiling.ReadableProfiler;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 
@@ -43,7 +43,7 @@
    private final File tickResultsDirectory;
    /**
     * @mapping {@literal hashed f_ufqwcyvf Lnet/minecraft/unmapped/C_vuxtoiqa;f_ufqwcyvf:Lnet/minecraft/unmapped/C_nvqxjbet;}
-    * @mapping {@literal named profiler Lnet/minecraft/util/TickDurationMonitor;profiler:Lnet/minecraft/util/profiler/ReadableProfiler;}
+    * @mapping {@literal named profiler Lnet/minecraft/util/TickDurationMonitor;profiler:Lnet/minecraft/util/profiling/ReadableProfiler;}
     */
    private ReadableProfiler profiler = DummyProfiler.INSTANCE;
 
@@ -59,7 +59,7 @@
 
    /**
     * @mapping {@literal hashed m_ktetquqq Lnet/minecraft/unmapped/C_vuxtoiqa;m_ktetquqq()Lnet/minecraft/unmapped/C_eslcbfsq;}
-    * @mapping {@literal named nextProfiler Lnet/minecraft/util/TickDurationMonitor;nextProfiler()Lnet/minecraft/util/profiler/Profiler;}
+    * @mapping {@literal named nextProfiler Lnet/minecraft/util/TickDurationMonitor;nextProfiler()Lnet/minecraft/util/profiling/Profiler;}
     */
    public Profiler nextProfiler() {
       this.profiler = new ProfilerSystem(this.timeGetter, () -> this.tickCount, false);
@@ -94,7 +94,7 @@
 
    /**
     * @mapping {@literal hashed m_ylzukxsq Lnet/minecraft/unmapped/C_vuxtoiqa;m_ylzukxsq(Lnet/minecraft/unmapped/C_eslcbfsq;Lnet/minecraft/unmapped/C_vuxtoiqa;)Lnet/minecraft/unmapped/C_eslcbfsq;}
-    * @mapping {@literal named tickProfiler Lnet/minecraft/util/TickDurationMonitor;tickProfiler(Lnet/minecraft/util/profiler/Profiler;Lnet/minecraft/util/TickDurationMonitor;)Lnet/minecraft/util/profiler/Profiler;}
+    * @mapping {@literal named tickProfiler Lnet/minecraft/util/TickDurationMonitor;tickProfiler(Lnet/minecraft/util/profiling/Profiler;Lnet/minecraft/util/TickDurationMonitor;)Lnet/minecraft/util/profiling/Profiler;}
     */
    public static Profiler tickProfiler(Profiler profiler, @Nullable TickDurationMonitor monitor) {
       return monitor != null ? Profiler.m_saajtuib(monitor.nextProfiler(), profiler) : profiler;
diff -bur namedTargetSrc/net/minecraft/world/chunk/WorldChunk.java namedSrc/net/minecraft/world/chunk/WorldChunk.java
--- namedTargetSrc/net/minecraft/world/chunk/WorldChunk.java	2024-10-17 02:53:20.257618580 +0000
+++ namedSrc/net/minecraft/world/chunk/WorldChunk.java	2024-10-17 02:52:09.661021933 +0000
@@ -30,7 +30,6 @@
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.unmapped.C_drmyhwfj;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.crash.CrashCallable;
 import net.minecraft.util.crash.CrashException;
 import net.minecraft.util.crash.CrashReport;
@@ -38,7 +37,8 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.util.math.ChunkSectionPos;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.world.Heightmap;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.light.ChunkLightProvider;
@@ -382,7 +382,7 @@
             }
 
             if (ChunkLightProvider.needsLightUpdate(lv2, state)) {
-               Profiler lv4 = C_xuophqnt.m_yaecfwdp();
+               Profiler lv4 = ProfilerManager.m_yaecfwdp();
                lv4.push("updateSkyLightSources");
                this.skyLightSources.update(this, j, i, l);
                lv4.swap("queueCheckLight");
@@ -983,7 +983,7 @@
             BlockPos lv = this.blockEntity.getPos();
             if (WorldChunk.this.canTickBlockEntity(lv)) {
                try {
-                  Profiler lv2 = C_xuophqnt.m_yaecfwdp();
+                  Profiler lv2 = ProfilerManager.m_yaecfwdp();
                   lv2.push(this::getName);
                   BlockState lv3 = WorldChunk.this.getBlockState(lv);
                   if (this.blockEntity.getType().supports(lv3)) {
diff -bur namedTargetSrc/net/minecraft/world/SpawnHelper.java namedSrc/net/minecraft/world/SpawnHelper.java
--- namedTargetSrc/net/minecraft/world/SpawnHelper.java	2024-10-17 02:53:20.325619151 +0000
+++ namedSrc/net/minecraft/world/SpawnHelper.java	2024-10-17 02:52:09.781022756 +0000
@@ -28,7 +28,6 @@
 import net.minecraft.registry.tag.BlockTags;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.structure.StructureManager;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.annotation.Debug;
 import net.minecraft.util.collection.Pool;
 import net.minecraft.util.math.BlockPos;
@@ -37,7 +36,8 @@
 import net.minecraft.util.math.GravityField;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.SpawnSettings;
@@ -159,7 +159,7 @@
     * @mapping {@literal named spawn Lnet/minecraft/world/SpawnHelper;spawn(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/chunk/WorldChunk;Lnet/minecraft/world/SpawnHelper$Info;Ljava/util/List;)V}
     */
    public static void spawn(ServerWorld world, WorldChunk chunk, SpawnHelper.Info info, List<SpawnGroup> list) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("spawner");
 
       for (SpawnGroup lv2 : list) {
diff -bur namedTargetSrc/net/minecraft/world/tick/WorldTickScheduler.java namedSrc/net/minecraft/world/tick/WorldTickScheduler.java
--- namedTargetSrc/net/minecraft/world/tick/WorldTickScheduler.java	2024-10-17 02:53:20.273618714 +0000
+++ namedSrc/net/minecraft/world/tick/WorldTickScheduler.java	2024-10-17 02:52:09.701022207 +0000
@@ -19,14 +19,14 @@
 import java.util.function.BiConsumer;
 import java.util.function.LongPredicate;
 import java.util.function.Predicate;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.BlockBox;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.util.math.ChunkSectionPos;
 import net.minecraft.util.math.Vec3i;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_cropbciq}
@@ -139,7 +139,7 @@
     * @mapping {@literal named tick Lnet/minecraft/world/tick/WorldTickScheduler;tick(JILjava/util/function/BiConsumer;)V}
     */
    public void tick(long time, int maxTicks, BiConsumer<BlockPos, T> ticker) {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("collect");
       this.collectTicks(time, maxTicks, lv);
       lv.swap("run");
@@ -152,7 +152,7 @@
 
    /**
     * @mapping {@literal hashed m_artlbdzf Lnet/minecraft/unmapped/C_cropbciq;m_artlbdzf(JILnet/minecraft/unmapped/C_eslcbfsq;)V}
-    * @mapping {@literal named collectTicks Lnet/minecraft/world/tick/WorldTickScheduler;collectTicks(JILnet/minecraft/util/profiler/Profiler;)V}
+    * @mapping {@literal named collectTicks Lnet/minecraft/world/tick/WorldTickScheduler;collectTicks(JILnet/minecraft/util/profiling/Profiler;)V}
     */
    private void collectTicks(long time, int maxTicks, Profiler profiler) {
       this.collectTickableChunkTickSchedulers(time);
diff -bur namedTargetSrc/net/minecraft/world/World.java namedSrc/net/minecraft/world/World.java
--- namedTargetSrc/net/minecraft/world/World.java	2024-10-17 02:53:20.237618412 +0000
+++ namedSrc/net/minecraft/world/World.java	2024-10-17 02:52:09.625021688 +0000
@@ -40,7 +40,6 @@
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.StringIdentifiable;
 import net.minecraft.util.TypeFilter;
@@ -56,7 +55,8 @@
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiling.Profiler;
+import net.minecraft.util.profiling.ProfilerManager;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.source.BiomeAccess;
@@ -782,7 +782,7 @@
     * @mapping {@literal named tickBlockEntities Lnet/minecraft/world/World;tickBlockEntities()V}
     */
    protected void tickBlockEntities() {
-      Profiler lv = C_xuophqnt.m_yaecfwdp();
+      Profiler lv = ProfilerManager.m_yaecfwdp();
       lv.push("blockEntities");
       this.iteratingTickingBlockEntities = true;
       if (!this.pendingBlockEntityTickers.isEmpty()) {
@@ -1095,7 +1095,7 @@
     */
    @Override
    public List<Entity> getOtherEntities(@Nullable Entity entity, Box box, Predicate<? super Entity> predicate) {
-      C_xuophqnt.m_yaecfwdp().visit("getEntities");
+      ProfilerManager.m_yaecfwdp().visit("getEntities");
       List<Entity> list = Lists.<Entity>newArrayList();
       this.getEntityLookup().forEachIntersecting(box, arg2 -> {
          if (arg2 != entity && predicate.test(arg2)) {
@@ -1138,7 +1138,7 @@
    public <T extends Entity> void collectEntities(
       TypeFilter<Entity, T> filter, Box box, Predicate<? super T> predicate, List<? super T> collection, int maxEntities
    ) {
-      C_xuophqnt.m_yaecfwdp().visit("getEntities");
+      ProfilerManager.m_yaecfwdp().visit("getEntities");
       this.getEntityLookup().forEachIntersecting(filter, box, entity -> {
          if (predicate.test(entity)) {
             collection.add(entity);

Please sign in to comment.