icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.15

Browse Source
This commit is contained in:
gnembon committed 2019-12-08 13:14:55 -04:00
2 parents 04459094e6 1984c2cc77
commit 5005271ea3
2 files changed
+7 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/mixins/ServerWorld_tickMixin.java
+5 -1
View File
@@ -108,7 +108,11 @@ public abstract class ServerWorld_tickMixin extends World
} }
} }
@Inject(method = "tick", at = @At("TAIL")) @Inject(method = "tick", at = @At(
value = "INVOKE",
target = "Lnet/minecraft/server/world/ServerWorld;tickBlockEntities()V",
shift = At.Shift.BEFORE
))
private void endEntitySection(BooleanSupplier booleanSupplier_1, CallbackInfo ci) private void endEntitySection(BooleanSupplier booleanSupplier_1, CallbackInfo ci)
{ {
CarpetProfiler.end_current_section(currentSection); CarpetProfiler.end_current_section(currentSection);
src/main/java/carpet/utils/CarpetProfiler.java
+2 -2
View File
@@ -212,7 +212,7 @@ public class CarpetProfiler
long total_tick_time = time_repo.get("tick"); long total_tick_time = time_repo.get("tick");
double divider = 1.0D / tick_health_requested / 1000000; double divider = 1.0D / tick_health_requested / 1000000;
Messenger.m(currentRequester, "w "); Messenger.m(currentRequester, "w ");
Messenger.m(currentRequester, String.format("gi Average tick time: %.3fms", divider * total_tick_time)); Messenger.m(currentRequester, String.format("gi Avg. server tick time: %.3fms", divider * total_tick_time));
long accumulated = 0L; long accumulated = 0L;
for (String section : GENERAL_SECTIONS) for (String section : GENERAL_SECTIONS)
@@ -247,7 +247,7 @@ public class CarpetProfiler
double amount = divider * time_repo.get(dimension + "." + section); double amount = divider * time_repo.get(dimension + "." + section);
if (amount > 0.01) if (amount > 0.01)
{ {
if (!(section.endsWith("(client)"))) if (!(section.endsWith("(Client)")))
accumulated += time_repo.get(dimension + "." + section); accumulated += time_repo.get(dimension + "." + section);
Messenger.m(currentRequester, String.format("gi - %s: %.3fms", section, amount)); Messenger.m(currentRequester, String.format("gi - %s: %.3fms", section, amount));
} }