From 5e276c61150ef1e820937b85d01301d9db430639 Mon Sep 17 00:00:00 2001 From: gnembon Date: Thu, 14 Nov 2019 23:18:07 -0400 Subject: [PATCH 1/2] tighten up profiler client support --- src/main/java/carpet/utils/CarpetProfiler.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/carpet/utils/CarpetProfiler.java b/src/main/java/carpet/utils/CarpetProfiler.java index f9facb78..1548fa06 100644 --- a/src/main/java/carpet/utils/CarpetProfiler.java +++ b/src/main/java/carpet/utils/CarpetProfiler.java @@ -53,11 +53,6 @@ public class CarpetProfiler } } - private static String getWorldString(World world) - { - return world.getDimension().getType().toString().replaceFirst("minecraft:", "") + (world.isClient ? "(Client)" : ""); - } - private static String getSectionString(World world, String section) { return String.format("%s.%s%s", @@ -136,7 +131,7 @@ public class CarpetProfiler public static void end_current_section(ProfilerToken tok) { - if (tick_health_requested == 0L || test_type != TYPE.GENERAL || current_tick_start == 0) + if (tick_health_requested == 0L || test_type != TYPE.GENERAL || current_tick_start == 0 || tok == null) return; long end_time = System.nanoTime(); if (tok.type == TYPE.GENERAL) @@ -154,7 +149,7 @@ public class CarpetProfiler public static void end_current_entity_section(ProfilerToken tok) { - if (tick_health_requested == 0L || test_type != TYPE.ENTITY || current_tick_start == 0) + if (tick_health_requested == 0L || test_type != TYPE.ENTITY || current_tick_start == 0 || tok == null) return; long end_time = System.nanoTime(); String section; From 3feb7bffbbcc3bc39dd3f159d97167ebccea879c Mon Sep 17 00:00:00 2001 From: gnembon Date: Thu, 14 Nov 2019 23:19:21 -0400 Subject: [PATCH 2/2] midversion to support fixed profiler --- gradle.properties | 2 +- src/main/java/carpet/settings/CarpetSettings.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 34268a64..d187f3f3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.6.4+build.169 # Mod Properties - mod_version = 1.2.3+v191113 + mod_version = 1.2.3+v191114 maven_group = carpet archives_base_name = fabric-carpet diff --git a/src/main/java/carpet/settings/CarpetSettings.java b/src/main/java/carpet/settings/CarpetSettings.java index b10d363c..f5fca89e 100644 --- a/src/main/java/carpet/settings/CarpetSettings.java +++ b/src/main/java/carpet/settings/CarpetSettings.java @@ -28,7 +28,7 @@ import static carpet.settings.RuleCategory.TNT; public class CarpetSettings { - public static final String carpetVersion = "1.2.3+v191113"; + public static final String carpetVersion = "1.2.3+v191114"; public static final Logger LOG = LogManager.getLogger(); public static boolean skipGenerationChecks = false; public static boolean impendingFillSkipUpdates = false;