From 4780514cb2e1deb30aec78d9422e04171fb351aa Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 5 Feb 2020 20:41:15 -0400 Subject: [PATCH] 20w06a -3 mapping --- gradle.properties | 4 ++-- .../carpet/mixins/MinecraftServer_tickspeedMixin.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 38689864..c840b8d1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,8 +5,8 @@ org.gradle.jvmargs=-Xmx1G # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html minecraft_version=20w06a - yarn_mappings=20w06a+build.1 - loader_version=0.7.6+build.181 + yarn_mappings=20w06a+build.3 + loader_version=0.7.8+build.184 # Mod Properties mod_version = 1.3.9+v200206 diff --git a/src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java b/src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java index 75a7d43e..0be8b8ea 100644 --- a/src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java +++ b/src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java @@ -2,8 +2,8 @@ package carpet.mixins; import carpet.helpers.TickSpeed; import carpet.utils.CarpetProfiler; -import net.minecraft.class_4758; import net.minecraft.server.MinecraftServer; +import net.minecraft.util.TickDurationMonitor; import net.minecraft.util.Util; import net.minecraft.util.profiler.Profiler; import org.apache.logging.log4j.Logger; @@ -44,7 +44,7 @@ public abstract class MinecraftServer_tickspeedMixin @Shadow private volatile boolean loading; - @Shadow protected abstract void method_24487(class_4758 arg); + @Shadow protected abstract void startMonitor(TickDurationMonitor monitor); CarpetProfiler.ProfilerToken currentSection; @@ -108,8 +108,8 @@ public abstract class MinecraftServer_tickspeedMixin } this.timeReference += msThisTick;//50L; - class_4758 lv = class_4758.method_24341("Server"); - this.method_24487(lv); + TickDurationMonitor tickDurationMonitor = TickDurationMonitor.create("Server"); + this.startMonitor(tickDurationMonitor); this.profiler.startTick(); this.profiler.push("tick"); this.tick(TickSpeed.time_warp_start_time != 0 ? ()->true : this::shouldKeepTicking);