renamed rule threadstoneLogger to loggerThreadstone

for consistency
TISUnion · May 28, 2023 · 0edb010 · 0edb010
1 parent ab9896a
commit 0edb010
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/patches/net/minecraft/block/BlockBeacon.java.patch b/patches/net/minecraft/block/BlockBeacon.java.patch
@@ -15,7 +15,7 @@
          HttpUtil.DOWNLOADER_EXECUTOR.submit(() ->
          {
 +            // TISCM threadstone logger logs beacons
-+            boolean logBeacons = CarpetSettings.threadstoneLogger && LoggerRegistry.__threadstone;
++            boolean logBeacons = CarpetSettings.loggerThreadstone && LoggerRegistry.__threadstone;
 +            long startNano = logBeacons ? System.nanoTime() : 0;
 +
 +            // TISCM threadstone logger add try

diff --git a/patches/net/minecraft/block/BlockNote.java.patch b/patches/net/minecraft/block/BlockNote.java.patch
@@ -73,7 +73,7 @@
 +        {
 +            HttpUtil.DOWNLOADER_EXECUTOR.submit(() -> {
 +                // IBlockState#updateNeighbors = PP update
-+                if (CarpetSettings.threadstoneLogger && LoggerRegistry.__threadstone)
++                if (CarpetSettings.loggerThreadstone && LoggerRegistry.__threadstone)
 +                {
 +                    ThreadstoneLogger.getInstance().onNoteBlockDebugThreadStarted();
 +                }
@@ -83,7 +83,7 @@
 +                }
 +                catch (Throwable throwable)
 +                {
-+                    if (CarpetSettings.threadstoneLogger && LoggerRegistry.__threadstone)
++                    if (CarpetSettings.loggerThreadstone && LoggerRegistry.__threadstone)
 +                    {
 +                        ThreadstoneLogger.getInstance().onExceptionallyEndedAsyncThread(throwable);
 +                    }

diff --git a/patches/net/minecraft/world/chunk/BlockStateContainer.java.patch b/patches/net/minecraft/world/chunk/BlockStateContainer.java.patch
@@ -21,7 +21,7 @@
 +
 +            // threadstone logger
 +            ReportedException exception = new ReportedException(crashreport);
-+            if (CarpetSettings.threadstoneLogger && LoggerRegistry.__threadstone) {
++            if (CarpetSettings.loggerThreadstone && LoggerRegistry.__threadstone) {
 +                ThreadstoneLogger.getInstance().onConcurrentWriteCrash(exception);
 +            }
 +            throw exception;

diff --git a/patches/net/minecraft/world/gen/ChunkProviderServer.java.patch b/patches/net/minecraft/world/gen/ChunkProviderServer.java.patch
@@ -80,7 +80,7 @@
              if (this.lastAccessed != null && this.lastAccessed.getPos().x == x && this.lastAccessed.getPos().z == z)
              {
 +                // TISCM threadstone logger
-+                if (CarpetSettings.threadstoneLogger)
++                if (CarpetSettings.loggerThreadstone)
 +                {
 +                    this.chunkLoadingCacheStatistic.onLRUHit();
 +                }
@@ -89,7 +89,7 @@
              }
 
 +            // TISCM threadstone logger
-+            if (CarpetSettings.threadstoneLogger)
++            if (CarpetSettings.loggerThreadstone)
 +            {
 +                this.chunkLoadingCacheStatistic.onLRUMissed();
 +            }
@@ -102,7 +102,7 @@
              if (load)
              {
 +                // TISCM threadstone logger
-+                if (CarpetSettings.threadstoneLogger && LoggerRegistry.__threadstone && ThreadstoneLogger.isOnGlassThread())
++                if (CarpetSettings.loggerThreadstone && LoggerRegistry.__threadstone && ThreadstoneLogger.isOnGlassThread())
 +                {
 +                    ThreadstoneLogger.getInstance().onAsyncLoadChunk(x, z);
 +                }
@@ -115,7 +115,7 @@
          else if (generate)
          {
 +            // TISCM threadstone logger
-+            if (CarpetSettings.threadstoneLogger && LoggerRegistry.__threadstone && ThreadstoneLogger.isOnGlassThread())
++            if (CarpetSettings.loggerThreadstone && LoggerRegistry.__threadstone && ThreadstoneLogger.isOnGlassThread())
 +            {
 +                ThreadstoneLogger.getInstance().onAsyncGenerateChunk(x, z);
 +            }

diff --git a/src/main/java/carpet/logging/threadstone/ThreadstoneLogger.java b/src/main/java/carpet/logging/threadstone/ThreadstoneLogger.java
@@ -36,7 +36,7 @@ public static ThreadstoneLogger getInstance() {
     public HUDLogger createCarpetLogger()
     {
         HUDLogger logger = super.createCarpetLogger();
-        logger.addSubscriptionValidator((p, o) -> CarpetSettings.threadstoneLogger);
+        logger.addSubscriptionValidator((p, o) -> CarpetSettings.loggerThreadstone);
         return logger;
     }
 
@@ -73,7 +73,7 @@ private void logFormat(String formatter, Object... args) {
     }
 
     // ============================= hooks =============================
-    // all hooks should be checked using CarpetSettings.threadstoneLogger && LoggerRegistry.__threadstone
+    // all hooks should be checked using CarpetSettings.loggerThreadstone && LoggerRegistry.__threadstone
     // to ensure that they only get triggered when necessary
 
     public void onExceptionallyEndedAsyncThread(Throwable throwable) {

diff --git a/src/main/java/carpet/settings/CarpetSettings.java b/src/main/java/carpet/settings/CarpetSettings.java
@@ -98,7 +98,7 @@ public Boolean validate(CommandSource source, ParsedRule<Boolean> currentRule, B
     @Rule(
             desc = "Enables /threadstone or /ts command for some threadstone tools",
             extra = {
-                    "See also: rule threadstoneLogger"
+                    "See also: rule loggerThreadstone"
             },
             category = COMMAND
     )
@@ -852,7 +852,7 @@ public String description()
             },
             category = EXPERIMENTAL
     )
-    public static boolean threadstoneLogger = false;
+    public static boolean loggerThreadstone = false;
 
     @Rule(
             desc = "Switch for ghostPlayer logger",