From db2d00a1af2e4d5abf10349b05e5d40bf53b6c93 Mon Sep 17 00:00:00 2001 From: Bud Gidiere Date: Sat, 21 Nov 2020 08:34:35 -0600 Subject: [PATCH 1/5] Use Better Suggest Paper Method From Paperlib --- src/main/java/com/dfsek/terra/util/PaperUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/dfsek/terra/util/PaperUtil.java b/src/main/java/com/dfsek/terra/util/PaperUtil.java index 55fafc07f..aa8ed3197 100644 --- a/src/main/java/com/dfsek/terra/util/PaperUtil.java +++ b/src/main/java/com/dfsek/terra/util/PaperUtil.java @@ -7,11 +7,13 @@ import org.bukkit.plugin.java.JavaPlugin; import java.util.logging.Level; +import static io.papermc.lib.PaperLib.suggestPaper; + public final class PaperUtil { public static void checkPaper(JavaPlugin main) { Bukkit.getScheduler().scheduleSyncDelayedTask(main, () -> { if(!PaperLib.isPaper()) { - LangUtil.log("use-paper", Level.WARNING); + suggestPaper(main); } }, 100L); } From d96486919611a560d71f3e5e8b0e673ee5087fb8 Mon Sep 17 00:00:00 2001 From: Bud Gidiere Date: Sat, 21 Nov 2020 09:59:19 -0600 Subject: [PATCH 2/5] Add Base Timings --- build.gradle.kts | 3 +++ src/main/java/com/dfsek/terra/Terra.java | 9 +++++++++ .../com/dfsek/terra/generation/TerraChunkGenerator.java | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 2b1599f4c..1de3fa7c4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,6 +22,7 @@ repositories { maven { url = uri("http://maven.enginehub.org/repo/") } maven { url = uri("https://repo.codemc.org/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") } } @@ -53,6 +54,7 @@ dependencies { compileOnly("org.spigotmc:spigot-api:1.16.2-R0.1-SNAPSHOT") implementation("io.papermc:paperlib:1.0.5") + implementation("co.aikar:minecraft-timings:1.0.4") implementation("net.jafama:jafama:2.3.2") @@ -107,6 +109,7 @@ tasks.named("shadowJar") { relocate("parsii", "com.dfsek.terra.lib.parsii") relocate("io.papermc.lib", "com.dfsek.terra.lib.paperlib") relocate("net.jafama", "com.dfsek.terra.lib.jafama") + relocate("co.aikar", "com.dfsek.terra.lib.aikar") minimize() } diff --git a/src/main/java/com/dfsek/terra/Terra.java b/src/main/java/com/dfsek/terra/Terra.java index 7999adc6a..0e264dedb 100644 --- a/src/main/java/com/dfsek/terra/Terra.java +++ b/src/main/java/com/dfsek/terra/Terra.java @@ -1,5 +1,7 @@ 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.structure.LocateCommand; import com.dfsek.terra.config.base.ConfigUtil; @@ -26,6 +28,8 @@ public class Terra extends GaeaPlugin { private static Terra instance; private final Map generatorMap = new HashMap<>(); + private static TimingManager timingManager; + public static Terra getInstance() { return instance; } @@ -58,6 +62,7 @@ public class Terra extends GaeaPlugin { Bukkit.getScheduler().scheduleAsyncRepeatingTask(this, TerraChunkGenerator::saveAll, ConfigUtil.dataSave, ConfigUtil.dataSave); Bukkit.getPluginManager().registerEvents(new EventListener(this), this); PaperUtil.checkPaper(this); + timingManager = TimingManager.of(this); } @Override @@ -83,4 +88,8 @@ public class Terra extends GaeaPlugin { public Language getLanguage() { return LangUtil.getLanguage(); } + + public static MCTiming timing(String name) { + return timingManager.of(name); + } } diff --git a/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java b/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java index 3cf6e68d3..131011865 100644 --- a/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java +++ b/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java @@ -1,5 +1,6 @@ package com.dfsek.terra.generation; +import co.aikar.timings.lib.MCTiming; import com.dfsek.terra.Debug; import com.dfsek.terra.Terra; import com.dfsek.terra.TerraProfiler; @@ -142,6 +143,8 @@ public class TerraChunkGenerator extends GaeaChunkGenerator { @Override @SuppressWarnings("try") 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. ChunkData chunk = createChunkData(world); TerraWorld tw = TerraWorld.getWorld(world); @@ -186,6 +189,7 @@ public class TerraChunkGenerator extends GaeaChunkGenerator { } } } + timing.stopTiming(); return chunk; } From 0a8f36ad937f952a89cc8d484cdbaa531c2ee0bb Mon Sep 17 00:00:00 2001 From: Bud Gidiere Date: Sat, 21 Nov 2020 10:51:55 -0600 Subject: [PATCH 3/5] Better Suggest Paper --- src/main/java/com/dfsek/terra/Terra.java | 4 +++- src/main/java/com/dfsek/terra/util/PaperUtil.java | 10 +--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/dfsek/terra/Terra.java b/src/main/java/com/dfsek/terra/Terra.java index 0e264dedb..180967adc 100644 --- a/src/main/java/com/dfsek/terra/Terra.java +++ b/src/main/java/com/dfsek/terra/Terra.java @@ -23,6 +23,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; +import static io.papermc.lib.PaperLib.suggestPaper; + public class Terra extends GaeaPlugin { private static Terra instance; @@ -61,7 +63,7 @@ public class Terra extends GaeaPlugin { saveDefaultConfig(); Bukkit.getScheduler().scheduleAsyncRepeatingTask(this, TerraChunkGenerator::saveAll, ConfigUtil.dataSave, ConfigUtil.dataSave); Bukkit.getPluginManager().registerEvents(new EventListener(this), this); - PaperUtil.checkPaper(this); + suggestPaper(this); timingManager = TimingManager.of(this); } diff --git a/src/main/java/com/dfsek/terra/util/PaperUtil.java b/src/main/java/com/dfsek/terra/util/PaperUtil.java index aa8ed3197..9a5bdb38c 100644 --- a/src/main/java/com/dfsek/terra/util/PaperUtil.java +++ b/src/main/java/com/dfsek/terra/util/PaperUtil.java @@ -9,12 +9,4 @@ import java.util.logging.Level; import static io.papermc.lib.PaperLib.suggestPaper; -public final class PaperUtil { - public static void checkPaper(JavaPlugin main) { - Bukkit.getScheduler().scheduleSyncDelayedTask(main, () -> { - if(!PaperLib.isPaper()) { - suggestPaper(main); - } - }, 100L); - } -} +public final class PaperUtil { } From d594cd8c028a10b486f0a7bc8bc3b3a2e916a9bc Mon Sep 17 00:00:00 2001 From: Bud Gidiere Date: Sat, 21 Nov 2020 10:55:59 -0600 Subject: [PATCH 4/5] Revert "Add Base Timings" This reverts commit d96486919611a560d71f3e5e8b0e673ee5087fb8. --- build.gradle.kts | 3 --- src/main/java/com/dfsek/terra/Terra.java | 9 --------- .../com/dfsek/terra/generation/TerraChunkGenerator.java | 4 ---- 3 files changed, 16 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1de3fa7c4..2b1599f4c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,7 +22,6 @@ repositories { maven { url = uri("http://maven.enginehub.org/repo/") } maven { url = uri("https://repo.codemc.org/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") } } @@ -54,7 +53,6 @@ dependencies { compileOnly("org.spigotmc:spigot-api:1.16.2-R0.1-SNAPSHOT") implementation("io.papermc:paperlib:1.0.5") - implementation("co.aikar:minecraft-timings:1.0.4") implementation("net.jafama:jafama:2.3.2") @@ -109,7 +107,6 @@ tasks.named("shadowJar") { relocate("parsii", "com.dfsek.terra.lib.parsii") relocate("io.papermc.lib", "com.dfsek.terra.lib.paperlib") relocate("net.jafama", "com.dfsek.terra.lib.jafama") - relocate("co.aikar", "com.dfsek.terra.lib.aikar") minimize() } diff --git a/src/main/java/com/dfsek/terra/Terra.java b/src/main/java/com/dfsek/terra/Terra.java index 180967adc..3e8d03c91 100644 --- a/src/main/java/com/dfsek/terra/Terra.java +++ b/src/main/java/com/dfsek/terra/Terra.java @@ -1,7 +1,5 @@ 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.structure.LocateCommand; import com.dfsek.terra.config.base.ConfigUtil; @@ -30,8 +28,6 @@ public class Terra extends GaeaPlugin { private static Terra instance; private final Map generatorMap = new HashMap<>(); - private static TimingManager timingManager; - public static Terra getInstance() { return instance; } @@ -64,7 +60,6 @@ public class Terra extends GaeaPlugin { Bukkit.getScheduler().scheduleAsyncRepeatingTask(this, TerraChunkGenerator::saveAll, ConfigUtil.dataSave, ConfigUtil.dataSave); Bukkit.getPluginManager().registerEvents(new EventListener(this), this); suggestPaper(this); - timingManager = TimingManager.of(this); } @Override @@ -90,8 +85,4 @@ public class Terra extends GaeaPlugin { public Language getLanguage() { return LangUtil.getLanguage(); } - - public static MCTiming timing(String name) { - return timingManager.of(name); - } } diff --git a/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java b/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java index 131011865..3cf6e68d3 100644 --- a/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java +++ b/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java @@ -1,6 +1,5 @@ package com.dfsek.terra.generation; -import co.aikar.timings.lib.MCTiming; import com.dfsek.terra.Debug; import com.dfsek.terra.Terra; import com.dfsek.terra.TerraProfiler; @@ -143,8 +142,6 @@ public class TerraChunkGenerator extends GaeaChunkGenerator { @Override @SuppressWarnings("try") 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. ChunkData chunk = createChunkData(world); TerraWorld tw = TerraWorld.getWorld(world); @@ -189,7 +186,6 @@ public class TerraChunkGenerator extends GaeaChunkGenerator { } } } - timing.stopTiming(); return chunk; } From f40f33aa6a9f9409ecda6cbfbce4b534142a4530 Mon Sep 17 00:00:00 2001 From: Bud Gidiere Date: Sat, 21 Nov 2020 14:57:54 -0600 Subject: [PATCH 5/5] Revert "Better Suggest Paper" This reverts commit 0a8f36ad937f952a89cc8d484cdbaa531c2ee0bb. --- src/main/java/com/dfsek/terra/Terra.java | 4 +--- src/main/java/com/dfsek/terra/util/PaperUtil.java | 10 +++++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/dfsek/terra/Terra.java b/src/main/java/com/dfsek/terra/Terra.java index 3e8d03c91..7999adc6a 100644 --- a/src/main/java/com/dfsek/terra/Terra.java +++ b/src/main/java/com/dfsek/terra/Terra.java @@ -21,8 +21,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; -import static io.papermc.lib.PaperLib.suggestPaper; - public class Terra extends GaeaPlugin { private static Terra instance; @@ -59,7 +57,7 @@ public class Terra extends GaeaPlugin { saveDefaultConfig(); Bukkit.getScheduler().scheduleAsyncRepeatingTask(this, TerraChunkGenerator::saveAll, ConfigUtil.dataSave, ConfigUtil.dataSave); Bukkit.getPluginManager().registerEvents(new EventListener(this), this); - suggestPaper(this); + PaperUtil.checkPaper(this); } @Override diff --git a/src/main/java/com/dfsek/terra/util/PaperUtil.java b/src/main/java/com/dfsek/terra/util/PaperUtil.java index 9a5bdb38c..aa8ed3197 100644 --- a/src/main/java/com/dfsek/terra/util/PaperUtil.java +++ b/src/main/java/com/dfsek/terra/util/PaperUtil.java @@ -9,4 +9,12 @@ import java.util.logging.Level; import static io.papermc.lib.PaperLib.suggestPaper; -public final class PaperUtil { } +public final class PaperUtil { + public static void checkPaper(JavaPlugin main) { + Bukkit.getScheduler().scheduleSyncDelayedTask(main, () -> { + if(!PaperLib.isPaper()) { + suggestPaper(main); + } + }, 100L); + } +}