mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-18 10:32:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add Base Timings"

Browse Source 
This reverts commit d96486919611a560d71f3e5e8b0e673ee5087fb8.
This commit is contained in:
Bud Gidiere 2020-11-21 10:55:59 -06:00
parent 0a8f36ad93
commit d594cd8c02
No known key found for this signature in database
GPG Key ID: CD18F99E348902F7
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.gradle.kts
View File

@ -22,7 +22,6 @@ repositories {
maven { url = uri("http://maven.enginehub.org/repo/") } maven { url = uri("http://maven.enginehub.org/repo/") }
maven { url = uri("https://repo.codemc.org/repository/maven-public") } maven { url = uri("https://repo.codemc.org/repository/maven-public") }
maven { url = uri("https://papermc.io/repo/repository/maven-public/") } maven { url = uri("https://papermc.io/repo/repository/maven-public/") }
maven { url = uri("http://repo.aikar.co/nexus/content/groups/aikar/") }
// maven { url = uri("https://maven.pkg.github.com/solonovamax/Gaea") } // maven { url = uri("https://maven.pkg.github.com/solonovamax/Gaea") }
} }
@ -54,7 +53,6 @@ dependencies {
compileOnly("org.spigotmc:spigot-api:1.16.2-R0.1-SNAPSHOT") compileOnly("org.spigotmc:spigot-api:1.16.2-R0.1-SNAPSHOT")
implementation("io.papermc:paperlib:1.0.5") implementation("io.papermc:paperlib:1.0.5")
implementation("co.aikar:minecraft-timings:1.0.4")
implementation("net.jafama:jafama:2.3.2") implementation("net.jafama:jafama:2.3.2")
@ -109,7 +107,6 @@ tasks.named<ShadowJar>("shadowJar") {
relocate("parsii", "com.dfsek.terra.lib.parsii") relocate("parsii", "com.dfsek.terra.lib.parsii")
relocate("io.papermc.lib", "com.dfsek.terra.lib.paperlib") relocate("io.papermc.lib", "com.dfsek.terra.lib.paperlib")
relocate("net.jafama", "com.dfsek.terra.lib.jafama") relocate("net.jafama", "com.dfsek.terra.lib.jafama")
relocate("co.aikar", "com.dfsek.terra.lib.aikar")
minimize() minimize()
} }

9
src/main/java/com/dfsek/terra/Terra.java
View File

@ -1,7 +1,5 @@
package com.dfsek.terra; package com.dfsek.terra;
import co.aikar.timings.lib.MCTiming;
import co.aikar.timings.lib.TimingManager;
import com.dfsek.terra.command.TerraCommand; import com.dfsek.terra.command.TerraCommand;
import com.dfsek.terra.command.structure.LocateCommand; import com.dfsek.terra.command.structure.LocateCommand;
import com.dfsek.terra.config.base.ConfigUtil; import com.dfsek.terra.config.base.ConfigUtil;
@ -30,8 +28,6 @@ public class Terra extends GaeaPlugin {
private static Terra instance; private static Terra instance;
private final Map<String, TerraChunkGenerator> generatorMap = new HashMap<>(); private final Map<String, TerraChunkGenerator> generatorMap = new HashMap<>();
private static TimingManager timingManager;
public static Terra getInstance() { public static Terra getInstance() {
return instance; return instance;
} }
@ -64,7 +60,6 @@ public class Terra extends GaeaPlugin {
Bukkit.getScheduler().scheduleAsyncRepeatingTask(this, TerraChunkGenerator::saveAll, ConfigUtil.dataSave, ConfigUtil.dataSave); Bukkit.getScheduler().scheduleAsyncRepeatingTask(this, TerraChunkGenerator::saveAll, ConfigUtil.dataSave, ConfigUtil.dataSave);
Bukkit.getPluginManager().registerEvents(new EventListener(this), this); Bukkit.getPluginManager().registerEvents(new EventListener(this), this);
suggestPaper(this); suggestPaper(this);
timingManager = TimingManager.of(this);
} }
@Override @Override
@ -90,8 +85,4 @@ public class Terra extends GaeaPlugin {
public Language getLanguage() { public Language getLanguage() {
return LangUtil.getLanguage(); return LangUtil.getLanguage();
} }
public static MCTiming timing(String name) {
return timingManager.of(name);
}
} }

4
src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java
View File

@ -1,6 +1,5 @@
package com.dfsek.terra.generation; package com.dfsek.terra.generation;
import co.aikar.timings.lib.MCTiming;
import com.dfsek.terra.Debug; import com.dfsek.terra.Debug;
import com.dfsek.terra.Terra; import com.dfsek.terra.Terra;
import com.dfsek.terra.TerraProfiler; import com.dfsek.terra.TerraProfiler;
@ -143,8 +142,6 @@ public class TerraChunkGenerator extends GaeaChunkGenerator {
@Override @Override
@SuppressWarnings("try") @SuppressWarnings("try")
public ChunkData generateBase(@NotNull World world, @NotNull Random random, int chunkX, int chunkZ, ChunkInterpolator interpolator) { public ChunkData generateBase(@NotNull World world, @NotNull Random random, int chunkX, int chunkZ, ChunkInterpolator interpolator) {
MCTiming timing = Terra.timing("Generate Base");
timing.startTiming();
if(needsLoad) load(world); // Load population data for world. if(needsLoad) load(world); // Load population data for world.
ChunkData chunk = createChunkData(world); ChunkData chunk = createChunkData(world);
TerraWorld tw = TerraWorld.getWorld(world); TerraWorld tw = TerraWorld.getWorld(world);
@ -189,7 +186,6 @@ public class TerraChunkGenerator extends GaeaChunkGenerator {
} }
} }
} }
timing.stopTiming();
return chunk; return chunk;
} }