From 89bd53b40d98518b91516a81587ee2916cc33eb8 Mon Sep 17 00:00:00 2001 From: DrBot7 <46543473+DrBot7@users.noreply.github.com> Date: Fri, 8 Jan 2021 16:47:45 -0600 Subject: [PATCH 01/11] Revamp timings.py with try/catch --- cogs/timings.py | 1019 ++++++++++++++++++++++++++++++----------------- 1 file changed, 655 insertions(+), 364 deletions(-) diff --git a/cogs/timings.py b/cogs/timings.py index 9ee79fb..db3c083 100644 --- a/cogs/timings.py +++ b/cogs/timings.py @@ -44,153 +44,19 @@ class Timings(commands.Cog): await message.channel.send(embed=embed_var) return - embed_var = discord.Embed(title="Timings Analysis", color=0x55ffff) + embed_var = discord.Embed(title="Timings Analysis for ", color=0x55ffff) embed_var.set_footer(text="Requested by " + message.author.name, icon_url=message.author.avatar_url) + embed_var.description = timings_url + unchecked = 0 try: version = r["timingsMaster"]["version"] - online_mode = r["timingsMaster"]["onlinemode"] - timing_cost = int(r["timingsMaster"]["system"]["timingcost"]) - jvm_version = r["timingsMaster"]["system"]["jvmversion"] - cpu = int(r["timingsMaster"]["system"]["cpu"]) - flags = r["timingsMaster"]["system"]["flags"] - plugins = r["timingsMaster"]["plugins"] - - # server.properties - view_distance = None - network_compression_threshold = None - if "Purpur" in version or "Yatopia" in version: - view_distance = int(r["timingsMaster"]["config"]["server.properties"]["view-distance"]) - network_compression_threshold = int( - r["timingsMaster"]["config"]["server.properties"]["network-compression-threshold"]) - - # bukkit.yml - ticks_per_monster_spawns = int(r["timingsMaster"]["config"]["bukkit"]["ticks-per"]["monster-spawns"]) - monsters_spawn_limit = int(r["timingsMaster"]["config"]["bukkit"]["spawn-limits"]["monsters"]) - water_ambient_spawn_limit = int(r["timingsMaster"]["config"]["bukkit"]["spawn-limits"]["water-ambient"]) - ambient_spawn_limit = int(r["timingsMaster"]["config"]["bukkit"]["spawn-limits"]["ambient"]) - animals_spawn_limit = int(r["timingsMaster"]["config"]["bukkit"]["spawn-limits"]["animals"]) - water_animals_spawn_limit = int(r["timingsMaster"]["config"]["bukkit"]["spawn-limits"]["water-animals"]) - try: - chunk_gc_period = int(r["timingsMaster"]["config"]["bukkit"]["chunk-gc"]["period-in-ticks"]) - except TypeError: - chunk_gc_period = 0 - # spigot.yml - bungeecord = r["timingsMaster"]["config"]["spigot"]["settings"]["bungeecord"] - save_user_cache_on_stop_only = r["timingsMaster"]["config"]["spigot"]["settings"][ - "save-user-cache-on-stop-only"] - mob_spawn_range = int( - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["mob-spawn-range"]) - spigot_view_distance = r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["view-distance"] - animals_entity_activation_range = int( - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ - "animals"]) - monsters_entity_activation_range = int( - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ - "monsters"]) - raiders_entity_activation_range = int( - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ - "raiders"]) - misc_entity_activation_range = int( - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"]["misc"]) - water_entity_activation_range = int( - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"]["water"]) - villagers_entity_activation_range = int( - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ - "villagers"]) - flying_monsters_entity_activation_range = int( - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ - "flying-monsters"]) - tick_inactive_villagers = \ - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ - "tick-inactive-villagers"] - nerf_spawner_mobs = r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["nerf-spawner-mobs"] - wake_up_inactive_villagers_every = int( - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ - "wake-up-inactive"]["villagers-every"]) - wake_up_inactive_villagers_for = int( - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ - "wake-up-inactive"]["villagers-every"]) - wake_up_inactive_flying_monsters_for = int( - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ - "wake-up-inactive"]["villagers-every"]) - wake_up_inactive_animals_every = int( - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ - "wake-up-inactive"]["villagers-every"]) - wake_up_inactive_villagers_max_per_tick = int( - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ - "wake-up-inactive"]["villagers-every"]) - wake_up_inactive_animals_for = int( - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ - "wake-up-inactive"]["villagers-every"]) - wake_up_inactive_monsters_max_per_tick = int( - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ - "wake-up-inactive"]["villagers-every"]) - wake_up_inactive_flying_monsters_max_per_tick = int( - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ - "wake-up-inactive"]["villagers-every"]) - wake_up_inactive_flying_monsters_every = int( - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ - "wake-up-inactive"]["villagers-every"]) - wake_up_inactive_monsters_every = int( - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ - "wake-up-inactive"]["villagers-every"]) - wake_up_inactive_animals_max_per_tick = int( - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ - "wake-up-inactive"]["villagers-every"]) - wake_up_inactive_monsters_for = int( - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ - "wake-up-inactive"]["villagers-every"]) - arrow_despawn_rate = int( - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["arrow-despawn-rate"]) - item_merge_radius = float( - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["merge-radius"]["item"]) - exp_merge_radius = float( - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["merge-radius"]["exp"]) - max_entity_collisions = int( - r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["max-entity-collisions"]) - - # paper.yml - max_auto_save_chunks_per_tick = int( - r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["max-auto-save-chunks-per-tick"]) - optimize_explosions = r["timingsMaster"]["config"]["paper"]["world-settings"]["default"][ - "optimize-explosions"] - mob_spawner_tick_rate = int( - r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["mob-spawner-tick-rate"]) - disable_chest_cat_detection = \ - r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["game-mechanics"][ - "disable-chest-cat-detection"] - container_update_tick_rate = int( - r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["container-update-tick-rate"]) - grass_spread_tick_rate = int( - r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["grass-spread-tick-rate"]) - soft_despawn_range = int( - r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["despawn-ranges"]["soft"]) - hard_despawn_range = int( - r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["despawn-ranges"]["soft"]) - hopper_disable_move_event = r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["hopper"][ - "disable-move-event"] - non_player_arrow_despawn_rate = int( - r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["non-player-arrow-despawn-rate"]) - creative_arrow_despawn_rate = int( - r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["creative-arrow-despawn-rate"]) - prevent_moving_into_unloaded_chunks = r["timingsMaster"]["config"]["paper"]["world-settings"]["default"][ - "prevent-moving-into-unloaded-chunks"] - eigencraft_redstone = r["timingsMaster"]["config"]["paper"]["world-settings"]["default"][ - "use-faster-eigencraft-redstone"] - armor_stands_tick = r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["armor-stands-tick"] - per_player_mob_spawns = r["timingsMaster"]["config"]["paper"]["world-settings"]["default"][ - "per-player-mob-spawns"] - alt_item_despawn_rate_enabled = \ - r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["alt-item-despawn-rate"]["enabled"] - no_tick_view_distance = int( - r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["viewdistances"][ - "no-tick-view-distance"]) - phantoms_only_insomniacs = r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["phantoms-only-attack-insomniacs"] - enable_treasure_maps = r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["enable-treasure-maps"] - - - if "Yatopia" in version: + using_yatopia = "yatopia" in r["timingsMaster"]["config"] + if "1.16.4" not in version: + embed_var.add_field(name="⚠ Legacy Build", + value="Update to 1.16.4.", + inline=True) + if using_yatopia: embed_var.add_field(name="⚠ Yatopia", value="Yatopia may be more optimized but it is prone to bugs. " "Consider using [Purpur](https://ci.pl3x.net/job/Purpur/).", @@ -200,15 +66,49 @@ class Timings(commands.Cog): value="||Purpur has more optimizations but is generally less supported. " "Consider using [Purpur](https://ci.pl3x.net/job/Purpur/).||", inline=True) - if "1.16.4" not in version: - embed_var.add_field(name="⚠ Legacy Build", - value="Update to 1.16.4.", + except KeyError: + unchecked = unchecked + 1 + + try: + online_mode = r["timingsMaster"]["onlinemode"] + bungeecord = r["timingsMaster"]["config"]["spigot"]["settings"]["bungeecord"] + if not online_mode and bungeecord == "false": + if not online_mode and bungeecord == "false": + embed_var.add_field(name="⚠ online-mode", + value="Enable this in server.properties for security.", + inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + timing_cost = int(r["timingsMaster"]["system"]["timingcost"]) + if timing_cost > 400: + embed_var.add_field(name="⚠ Timingcost", + value="Your cpu is overloaded. Find a better host.", inline=True) - if "-Daikars.new.flags=true" not in flags and "-XX:+UseZGC" not in flags: - embed_var.add_field(name="⚠ Aikar's Flags", - value="Use [Aikar's flags](https://aikar.co/2018/07/02/tuning-the-jvm-g1gc-garbage-collector-flags-for-minecraft/).", + except KeyError: + unchecked = unchecked + 1 + + try: + jvm_version = r["timingsMaster"]["system"]["jvmversion"] + if "1.8.0_" in jvm_version or jvm_version.startswith("9.") or jvm_version.startswith("10."): + embed_var.add_field(name="⚠ Java Version", + value="Use Java 11.", inline=True) - else: + + except KeyError: + unchecked = unchecked + 1 + + try: + flags = r["timingsMaster"]["system"]["flags"] + if "-XX:+UseZGC" in flags: + jvm_version = r["timingsMaster"]["system"]["jvmversion"] + java_version = jvm_version.split(".")[0] + if int(java_version) < 14: + embed_var.add_field(name="⚠ Java " + java_version, + value="If you are going to use ZGC, you should also use Java 14 or 15.", + inline=True) + elif "-Daikars.new.flags=true" in flags: if "-XX:+PerfDisableSharedMem" not in flags: embed_var.add_field(name="⚠ Outdated Flags", value="Add `-XX:+PerfDisableSharedMem` to flags", @@ -217,12 +117,15 @@ class Timings(commands.Cog): embed_var.add_field(name="⚠ Outdated Flags", value="Add `-XX:G1MixedGCCountTarget=4` to flags", inline=True) - if "-XX:+UseZGC" in flags: - j_version = int(jvm_version.split(".")[0]) - if j_version < 14: - embed_var.add_field(name="⚠ Java " + str(j_version), - value="If you are going to use ZGC, you should also use Java 14+.", - inline=True) + else: + embed_var.add_field(name="⚠ Aikar's Flags", + value="Use [Aikar's flags](https://aikar.co/2018/07/02/tuning-the-jvm-g1gc-garbage-collector-flags-for-minecraft/).", + inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + flags = r["timingsMaster"]["system"]["flags"] if "-Xmx" in flags: max_mem = 0 flaglist = flags.split(" ") @@ -237,20 +140,20 @@ class Timings(commands.Cog): embed_var.add_field(name="⚠ Low Memory", value="Allocate at least 6-10GB of ram to your server if you can afford it.", inline=True) - if "1.8.0_" in jvm_version or jvm_version.startswith("9.") or jvm_version.startswith("10."): - embed_var.add_field(name="⚠ Java Version", - value="Use Java 11.", - inline=True) - if timing_cost > 400: - embed_var.add_field(name="⚠ Timingcost", - value="Your cpu is overloaded. Find a better host.", - inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + cpu = int(r["timingsMaster"]["system"]["cpu"]) if cpu < 4: embed_var.add_field(name="⚠ Cores", value="You have only " + str(cpu) + " core(s). Find a better host.", inline=True) + except KeyError: + unchecked = unchecked + 1 - # Plugins + try: + plugins = r["timingsMaster"]["plugins"] if "ClearLag" in plugins: embed_var.add_field(name="⚠ ClearLag", value="Plugins that claim to remove lag actually cause more lag. " @@ -276,16 +179,16 @@ class Timings(commands.Cog): value="You probably don't need VillagerOptimiser as Paper already adds its features. " "See entity-activation-range in spigot.yml.", inline=True) - if "VillagerLobotomizatornator" in plugins and "Purpur" in version: - embed_var.add_field(name="⚠ LimitPillagers", - value="You probably don't need VillagerLobotomizatornator as Purpur already adds its features. " - "Enable villager.lobotomize.enabled in purpur.yml.", - inline=True) if "StackMob" in plugins: embed_var.add_field(name="⚠ StackMob", value="Stacking plugins actually cause more lag. " "Remove StackMob.", inline=True) + if "Stacker" in plugins: + embed_var.add_field(name="⚠ Stacker", + value="Stacking plugins actually cause more lag. " + "Remove Stacker.", + inline=True) if "MobStacker" in plugins: embed_var.add_field(name="⚠ MobStacker", value="Stacking plugins actually cause more lag. " @@ -331,27 +234,6 @@ class Timings(commands.Cog): value="You probably don't need EntityTrackerFixer as Paper already has its features. " "Remove EntityTrackerFixer.", inline=True) - if "PhantomSMP" in plugins: - if phantoms_only_insomniacs == "false": - embed_var.add_field(name="⚠ PhantomSMP", - value="You probably don't need PhantomSMP as Paper already has its features. " - "Remove PhantomSMP.", - inline=True) - else: - embed_var.add_field(name="⚠ PhantomSMP", - value="You probably don't need PhantomSMP as Paper already has its features. " - "Enable phantoms-only-attack-insomniacs in paper.yml", - inline=True) - if "SilkSpawners" in plugins and "Purpur" in version: - embed_var.add_field(name="⚠ SilkSpawners", - value="You probably don't need SilkSpawners as Purpur already has its features. " - "Remove SilkSpawners.", - inline=True) - if "MineableSpawners" in plugins and "Purpur" in version: - embed_var.add_field(name="⚠ MineableSpawners", - value="You probably don't need MineableSpawners as Purpur already has its features. " - "Remove MineableSpawners.", - inline=True) if "Orebfuscator" in plugins: embed_var.add_field(name="⚠ Orebfuscator", value="You probably don't need Orebfuscator as Paper already has its features. " @@ -364,7 +246,7 @@ class Timings(commands.Cog): inline=True) if "CrazyActions" in plugins: embed_var.add_field(name="⚠ CrazyAuctions", - value="CrazyAuctions is a laggy plugin. " + value="CrazyAuctions is a laggy plugin, even according to the developer. " "Consider replacing it with [AuctionHouse](https://www.spigotmc.org/resources/auctionhouse.61836/).", inline=True) if "GroupManager" in plugins: @@ -385,342 +267,751 @@ class Timings(commands.Cog): for plugin in plugins: if "Songoda" in r["timingsMaster"]["plugins"][plugin]["authors"]: embed_var.add_field(name="⚠ " + plugin, - value="This plugin was made by Songoda. You should remove it.", + value="This plugin was made by Songoda. You should find an alternative.", inline=True) + except KeyError: + unchecked = unchecked + 1 - if not online_mode and bungeecord == "false": - embed_var.add_field(name="⚠ online-mode", - value="Enable this in server.properties for security.", - inline=True) + try: + using_purpur = "purpur" in r["timingsMaster"]["config"] + if using_purpur: + plugins = r["timingsMaster"]["plugins"] + if "SilkSpawners" in plugins: + embed_var.add_field(name="⚠ SilkSpawners", + value="You probably don't need SilkSpawners as Purpur already has its features. " + "Remove SilkSpawners.", + inline=True) + if "MineableSpawners" in plugins: + embed_var.add_field(name="⚠ MineableSpawners", + value="You probably don't need MineableSpawners as Purpur already has its features. " + "Remove MineableSpawners.", + inline=True) + if "VillagerLobotomizatornator" in plugins: + embed_var.add_field(name="⚠ LimitPillagers", + value="You probably don't need VillagerLobotomizatornator as Purpur already adds its features. " + "Enable villager.lobotomize.enabled in purpur.yml.", + inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + plugins = r["timingsMaster"]["plugins"] + if "PhantomSMP" in plugins: + phantoms_only_insomniacs = r["timingsMaster"]["config"]["paper"]["world-settings"]["default"][ + "phantoms-only-attack-insomniacs"] + if phantoms_only_insomniacs == "false": + embed_var.add_field(name="⚠ PhantomSMP", + value="You probably don't need PhantomSMP as Paper already has its features. " + "Remove PhantomSMP.", + inline=True) + else: + embed_var.add_field(name="⚠ PhantomSMP", + value="You probably don't need PhantomSMP as Paper already has its features. " + "Enable phantoms-only-attack-insomniacs in paper.yml.", + inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + network_compression_threshold = int( + r["timingsMaster"]["config"]["server.properties"]["network-compression-threshold"]) + bungeecord = r["timingsMaster"]["config"]["spigot"]["settings"]["bungeecord"] if network_compression_threshold == 256 and bungeecord == "false": embed_var.add_field(name="⚠ network-compression-threshold", value="Increase this in server.properties. Recommended: 512.", inline=True) - if network_compression_threshold != None and network_compression_threshold != -1 and bungeecord == "true": + if network_compression_threshold != -1 and bungeecord == "true": embed_var.add_field(name="⚠ network-compression-threshold", value="Set this to -1 in server.properties for a bungee server like yours.", inline=True) - if monsters_spawn_limit == 70: - embed_var.add_field(name="⚠ spawn-limits.monsters", - value="Decrease this in bukkit.yml.\nRecommended: 15.", - inline=True) - if animals_spawn_limit == 10: - embed_var.add_field(name="⚠ spawn-limits.animals", - value="Decrease this in bukkit.yml.\nRecommended: 3.", - inline=True) - if water_animals_spawn_limit == 15: - embed_var.add_field(name="⚠ spawn-limits.water-animals", - value="Decrease this in bukkit.yml.\nRecommended: 2.", - inline=True) - if water_ambient_spawn_limit == 20: - embed_var.add_field(name="⚠ spawn-limits.water-ambient", - value="Decrease this in bukkit.yml.\nRecommended: 2.", - inline=True) - if ambient_spawn_limit == 15: - embed_var.add_field(name="⚠ spawn-limits.ambient", - value="Decrease this in bukkit.yml.\nRecommended: 1.", + except KeyError: + unchecked = unchecked + 1 + + try: + spigot_view_distance = r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["view-distance"] + view_distance = int(r["timingsMaster"]["config"]["server.properties"]["view-distance"]) + if view_distance == 10 and spigot_view_distance == "default": + embed_var.add_field(name="⚠ view-distance", + value="Decrease this from default (10) in spigot.yml. " + "Recommended: 3.", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + chunk_gc_period = int(r["timingsMaster"]["config"]["bukkit"]["chunk-gc"]["period-in-ticks"]) if chunk_gc_period == 600: embed_var.add_field(name="⚠ chunk-gc.period-in-ticks", value="Decrease this in bukkit.yml.\nRecommended: 400.", inline=True) - if ticks_per_monster_spawns == 1: + except KeyError: + unchecked = unchecked + 1 + + try: + ticks_per_monster_spawns = int(r["timingsMaster"]["config"]["bukkit"]["ticks-per"]["monster-spawns"]) + if ticks_per_monster_spawns == 1: embed_var.add_field(name="⚠ ticks-per.monster-spawns", value="Increase this in bukkit.yml.\nRecommended: 4.", inline=True) - if view_distance == 10 and spigot_view_distance == "default": - embed_var.add_field(name="⚠ view-distance", - value="Decrease this from default (10) in spigot.yml. " - "Recommended: 3.", + except KeyError: + unchecked = unchecked + 1 + + try: + monsters_spawn_limit = int(r["timingsMaster"]["config"]["bukkit"]["spawn-limits"]["monsters"]) + if monsters_spawn_limit == 70: + embed_var.add_field(name="⚠ spawn-limits.monsters", + value="Decrease this in bukkit.yml.\nRecommended: 15.", + inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + water_ambient_spawn_limit = int(r["timingsMaster"]["config"]["bukkit"]["spawn-limits"]["water-ambient"]) + if water_ambient_spawn_limit == 20: + embed_var.add_field(name="⚠ spawn-limits.water-ambient", + value="Decrease this in bukkit.yml.\nRecommended: 2.", + inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + ambient_spawn_limit = int(r["timingsMaster"]["config"]["bukkit"]["spawn-limits"]["ambient"]) + if ambient_spawn_limit == 15: + embed_var.add_field(name="⚠ spawn-limits.ambient", + value="Decrease this in bukkit.yml.\nRecommended: 1.", + inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + animals_spawn_limit = int(r["timingsMaster"]["config"]["bukkit"]["spawn-limits"]["animals"]) + if animals_spawn_limit == 10: + embed_var.add_field(name="⚠ spawn-limits.animals", + value="Decrease this in bukkit.yml.\nRecommended: 3.", inline=True) - if mob_spawn_range is not None and view_distance is not None and mob_spawn_range >= 8 and view_distance < 7 and spigot_view_distance != "default" and spigot_view_distance is not None and int(spigot_view_distance) < 7: - if spigot_view_distance == -1: + except KeyError: + unchecked = unchecked + 1 + + try: + water_animals_spawn_limit = int(r["timingsMaster"]["config"]["bukkit"]["spawn-limits"]["water-animals"]) + if water_animals_spawn_limit == 15: + embed_var.add_field(name="⚠ spawn-limits.water-animals", + value="Decrease this in bukkit.yml.\nRecommended: 2.", + inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + mob_spawn_range = int(r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["mob-spawn-range"]) + spigot_view_distance = r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["view-distance"] + if spigot_view_distance == "default": + view_distance = int(r["timingsMaster"]["config"]["server.properties"]["view-distance"]) + if mob_spawn_range == 8 and view_distance <= 6: embed_var.add_field(name="⚠ mob-spawn-range", value="Decrease this in spigot.yml. " "Recommended: " + str(view_distance - 1) + ".", inline=True) - else: - embed_var.add_field(name="⚠ mob-spawn-range", - value="Decrease this in spigot.yml. " - "Recommended: " + str(spigot_view_distance - 1) + ".", - inline=True) + elif mob_spawn_range == 8 and int(spigot_view_distance) <= 6: + embed_var.add_field(name="⚠ mob-spawn-range", + value="Decrease this in spigot.yml. " + "Recommended: " + str(spigot_view_distance - 1) + ".", + inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + animals_entity_activation_range = int( + r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ + "animals"]) if animals_entity_activation_range == 32: embed_var.add_field(name="⚠ entity-activation-range.animals", value="Decrease this in spigot.yml. " "Recommended: 6.", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + monsters_entity_activation_range = int( + r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ + "monsters"]) if monsters_entity_activation_range == 32: embed_var.add_field(name="⚠ entity-activation-range.monsters", value="Decrease this in spigot.yml. " "Recommended: 16.", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + raiders_entity_activation_range = int( + r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ + "raiders"]) + except KeyError: + unchecked = unchecked + 1 + + try: + misc_entity_activation_range = int( + r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"]["misc"]) if misc_entity_activation_range == 16: embed_var.add_field(name="⚠ entity-activation-range.misc", value="Decrease this in spigot.yml. " "Recommended: 4.", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + water_entity_activation_range = int( + r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"]["water"]) if water_entity_activation_range == 16: embed_var.add_field(name="⚠ entity-activation-range.water", value="Decrease this in spigot.yml. " "Recommended: 12.", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + villagers_entity_activation_range = int( + r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ + "villagers"]) if villagers_entity_activation_range == 32: embed_var.add_field(name="⚠ entity-activation-range.villagers", value="Decrease this in spigot.yml. " "Recommended: 16.", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + flying_monsters_entity_activation_range = int( + r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ + "flying-monsters"]) + except KeyError: + unchecked = unchecked + 1 + + try: + tick_inactive_villagers = \ + r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ + "tick-inactive-villagers"] if tick_inactive_villagers == "true": embed_var.add_field(name="⚠ tick-inactive-villagers", value="Disable this in spigot.yml.", inline=True) - if wake_up_inactive_animals_max_per_tick == 4: - embed_var.add_field(name="⚠ wake-up-inactive.animals-max-per-tick", - value="Decrease this in spigot.yml. " - "Recommended: 2.", - inline=True) - if wake_up_inactive_animals_for == 100: - embed_var.add_field(name="⚠ wake-up-inactive.animals-for", - value="Decrease this in spigot.yml. " - "Recommended: 40.", + except KeyError: + unchecked = unchecked + 1 + + try: + nerf_spawner_mobs = r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["nerf-spawner-mobs"] + if nerf_spawner_mobs == "false": + embed_var.add_field(name="⚠ nerf-spawner-mobs", + value="Enable this in spigot.yml.", inline=True) - if wake_up_inactive_monsters_max_per_tick == 8: - embed_var.add_field(name="⚠ wake-up-inactive.monsters-max-per-tick", + except KeyError: + unchecked = unchecked + 1 + + try: + wake_up_inactive_villagers_every = int( + r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ + "wake-up-inactive"]["villagers-every"]) + except KeyError: + unchecked = unchecked + 1 + try: + wake_up_inactive_villagers_for = int( + r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ + "wake-up-inactive"]["villagers-every"]) + if wake_up_inactive_villagers_for == 100: + embed_var.add_field(name="⚠ wake-up-inactive.villagers-for", value="Decrease this in spigot.yml. " - "Recommended: 4.", + "Recommended: 20.", inline=True) - if wake_up_inactive_monsters_for == 100: - embed_var.add_field(name="⚠ wake-up-inactive.monsters-for", + except KeyError: + unchecked = unchecked + 1 + + try: + wake_up_inactive_flying_monsters_for = int( + r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ + "wake-up-inactive"]["villagers-every"]) + if wake_up_inactive_flying_monsters_for == 100: + embed_var.add_field(name="⚠ wake-up-inactive.flying-monsters-for", value="Decrease this in spigot.yml. " "Recommended: 60.", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + wake_up_inactive_animals_every = int( + r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ + "wake-up-inactive"]["villagers-every"]) + + except KeyError: + unchecked = unchecked + 1 + + try: + wake_up_inactive_villagers_max_per_tick = int( + r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ + "wake-up-inactive"]["villagers-every"]) if wake_up_inactive_villagers_max_per_tick == 4: embed_var.add_field(name="⚠ wake-up-inactive.villagers-max-per-tick", value="Decrease this in spigot.yml. " "Recommended: 1.", inline=True) - if wake_up_inactive_villagers_for == 100: - embed_var.add_field(name="⚠ wake-up-inactive.villagers-for", + except KeyError: + unchecked = unchecked + 1 + + try: + wake_up_inactive_animals_for = int( + r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ + "wake-up-inactive"]["villagers-every"]) + if wake_up_inactive_animals_for == 100: + embed_var.add_field(name="⚠ wake-up-inactive.animals-for", value="Decrease this in spigot.yml. " - "Recommended: 20.", + "Recommended: 40.", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + wake_up_inactive_monsters_max_per_tick = int( + r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ + "wake-up-inactive"]["villagers-every"]) + if wake_up_inactive_monsters_max_per_tick == 8: + embed_var.add_field(name="⚠ wake-up-inactive.monsters-max-per-tick", + value="Decrease this in spigot.yml. " + "Recommended: 4.", + inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + wake_up_inactive_flying_monsters_max_per_tick = int( + r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ + "wake-up-inactive"]["villagers-every"]) if wake_up_inactive_flying_monsters_max_per_tick == 8: embed_var.add_field(name="⚠ wake-up-inactive.flying-monsters-max-per-tick", value="Decrease this in spigot.yml. " "Recommended: 1.", inline=True) - if wake_up_inactive_flying_monsters_for == 100: - embed_var.add_field(name="⚠ wake-up-inactive.flying-monsters-for", + except KeyError: + unchecked = unchecked + 1 + + try: + wake_up_inactive_flying_monsters_every = int( + r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ + "wake-up-inactive"]["villagers-every"]) + except KeyError: + unchecked = unchecked + 1 + + try: + wake_up_inactive_monsters_every = int( + r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ + "wake-up-inactive"]["villagers-every"]) + except KeyError: + unchecked = unchecked + 1 + + try: + wake_up_inactive_animals_max_per_tick = int( + r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ + "wake-up-inactive"]["villagers-every"]) + if wake_up_inactive_animals_max_per_tick == 4: + embed_var.add_field(name="⚠ wake-up-inactive.animals-max-per-tick", + value="Decrease this in spigot.yml. " + "Recommended: 2.", + inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + wake_up_inactive_monsters_for = int( + r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["entity-activation-range"][ + "wake-up-inactive"]["villagers-every"]) + if wake_up_inactive_monsters_for == 100: + embed_var.add_field(name="⚠ wake-up-inactive.monsters-for", value="Decrease this in spigot.yml. " "Recommended: 60.", inline=True) - if item_merge_radius == 1.5: + except KeyError: + unchecked = unchecked + 1 + + try: + arrow_despawn_rate = int( + r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["arrow-despawn-rate"]) + if arrow_despawn_rate == 1200: + embed_var.add_field(name="⚠ arrow-despawn-rate", + value="Decrease this in spigot.yml. " + "Recommended: 300.", + inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + item_merge_radius = float( + r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["merge-radius"]["item"]) + if item_merge_radius == 2.5: embed_var.add_field(name="⚠ merge-radius.item", value="Increase this in spigot.yml. " "Recommended: 4.0.", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + exp_merge_radius = float( + r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["merge-radius"]["exp"]) if exp_merge_radius == 3.0: embed_var.add_field(name="⚠ merge-radius.exp", value="Increase this in spigot.yml. " "Recommended: 6.0.", inline=True) - if nerf_spawner_mobs == "false": - embed_var.add_field(name="⚠ nerf-spawner-mobs", - value="Enable this in spigot.yml.", - inline=True) - if arrow_despawn_rate == 1200: - embed_var.add_field(name="⚠ arrow-despawn-rate", - value="Decrease this in spigot.yml. " - "Recommended: 300.", - inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + max_entity_collisions = int( + r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"]["max-entity-collisions"]) if max_entity_collisions == 8: embed_var.add_field(name="⚠ max-entity-collisions", value="Decrease this in spigot.yml. " "Recommended: 2.", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + max_auto_save_chunks_per_tick = int( + r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["max-auto-save-chunks-per-tick"]) if max_auto_save_chunks_per_tick == 24: embed_var.add_field(name="⚠ max-auto-save-chunks-per-tick", value="Decrease this in paper.yml. " "Recommended: 6.", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + optimize_explosions = r["timingsMaster"]["config"]["paper"]["world-settings"]["default"][ + "optimize-explosions"] if optimize_explosions == "false": embed_var.add_field(name="⚠ optimize-explosions", value="Enable this in paper.yml.", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + mob_spawner_tick_rate = int( + r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["mob-spawner-tick-rate"]) if mob_spawner_tick_rate == 1: embed_var.add_field(name="⚠ mob-spawner-tick-rate", value="Increase this in paper.yml. " "Recommended: 2.", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + disable_chest_cat_detection = \ + r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["game-mechanics"][ + "disable-chest-cat-detection"] if disable_chest_cat_detection == "false": embed_var.add_field(name="⚠ disable-chest-cat-detection", value="Enable this in paper.yml.", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + container_update_tick_rate = int( + r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["container-update-tick-rate"]) if container_update_tick_rate == "false": embed_var.add_field(name="⚠ container-update-tick-rate", value="Increase this in paper.yml. " "Recommended: 3.", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + grass_spread_tick_rate = int( + r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["grass-spread-tick-rate"]) if grass_spread_tick_rate == 1: embed_var.add_field(name="⚠ grass-spread-tick-rate", value="Increase this in paper.yml. " "Recommended: 4", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + soft_despawn_range = int( + r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["despawn-ranges"]["soft"]) if soft_despawn_range == 32: embed_var.add_field(name="⚠ despawn-ranges.soft", value="Decrease this in paper.yml. " "Recommended: 28", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + hard_despawn_range = int(r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["despawn-ranges"]["soft"]) if hard_despawn_range == 128: embed_var.add_field(name="⚠ despawn-ranges.hard", value="Decrease this in paper.yml. " "Recommended: 48", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + hopper_disable_move_event = r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["hopper"][ + "disable-move-event"] if hopper_disable_move_event == "false": embed_var.add_field(name="⚠ hopper.disable-move-event", value="Enable this in paper.yml.", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + non_player_arrow_despawn_rate = int( + r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["non-player-arrow-despawn-rate"]) if non_player_arrow_despawn_rate == -1: embed_var.add_field(name="⚠ non-player-arrow-despawn-rate", value="Set a value in paper.yml. " "Recommended: 60", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + creative_arrow_despawn_rate = int( + r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["creative-arrow-despawn-rate"]) if creative_arrow_despawn_rate == -1: embed_var.add_field(name="⚠ creative-arrow-despawn-rate", value="Set a value in paper.yml. " "Recommended: 60", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + prevent_moving_into_unloaded_chunks = r["timingsMaster"]["config"]["paper"]["world-settings"]["default"][ + "prevent-moving-into-unloaded-chunks"] if prevent_moving_into_unloaded_chunks == "false": embed_var.add_field(name="⚠ prevent-moving-into-unloaded-chunks", value="Enable this in paper.yml.", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + eigencraft_redstone = r["timingsMaster"]["config"]["paper"]["world-settings"]["default"][ + "use-faster-eigencraft-redstone"] if eigencraft_redstone == "false": embed_var.add_field(name="⚠ use-faster-eigencraft-redstone", value="Enable this in paper.yml.", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + plugins = r["timingsMaster"]["plugins"] + armor_stands_tick = r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["armor-stands-tick"] if armor_stands_tick == "true" and "PetBlocks" not in plugins and "BlockBalls" not in plugins and "ArmorStandTools" not in plugins: embed_var.add_field(name="⚠ armor-stands-tick", value="Disable this in paper.yml.", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + per_player_mob_spawns = r["timingsMaster"]["config"]["paper"]["world-settings"]["default"][ + "per-player-mob-spawns"] if per_player_mob_spawns == "false": embed_var.add_field(name="⚠ per-player-mob-spawns", value="Enable this in paper.yml.", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + alt_item_despawn_rate_enabled = \ + r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["alt-item-despawn-rate"]["enabled"] if alt_item_despawn_rate_enabled == "false": embed_var.add_field(name="⚠ alt-item-despawn-rate.enabled", value="Enable this in paper.yml.", inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + no_tick_view_distance = int( + r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["viewdistances"][ + "no-tick-view-distance"]) + if no_tick_view_distance == -1: + spigot_view_distance = r["timingsMaster"]["config"]["spigot"]["world-settings"]["default"][ + "view-distance"] + if spigot_view_distance == "default": + view_distance = int(r["timingsMaster"]["config"]["server.properties"]["view-distance"]) + if view_distance >= 4: + embed_var.add_field(name="⚠ no-tick-view-distance", + value="Set a value in paper.yml. " + "Recommended: " + str( + view_distance) + ". And reduce view-distance in server.properties. Recommended: 3.", + inline=True) + elif int(spigot_view_distance) >= 4: + embed_var.add_field(name="⚠ no-tick-view-distance", + value="Set a value in paper.yml. " + "Recommended: " + spigot_view_distance + ". And reduce view-distance in spigot.yml. Recommended: 3.", + inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + enable_treasure_maps = r["timingsMaster"]["config"]["paper"]["world-settings"]["default"][ + "enable-treasure-maps"] if enable_treasure_maps == "true": embed_var.add_field(name="⚠ enable-treasure-maps", value="Disable this in paper.yml. Why? Generating treasure maps is extremely expensive and can hang a server if the structure it's trying to locate is really far away.", inline=True) + except KeyError: + unchecked = unchecked + 1 - if "Purpur" in version: - use_alternate_keepalive = r["timingsMaster"]["config"]["purpur"]["settings"]["use-alternate-keepalive"] - dont_send_useless_entity_packets = r["timingsMaster"]["config"]["purpur"]["settings"][ - "dont-send-useless-entity-packets"] - disable_treasure_searching = \ - r["timingsMaster"]["config"]["purpur"]["world-settings"]["default"]["mobs"]["dolphin"][ - "disable-treasure-searching"] - brain_ticks = int( - r["timingsMaster"]["config"]["purpur"]["world-settings"]["default"]["mobs"]["villager"][ - "brain-ticks"]) - iron_golem_radius = int( - r["timingsMaster"]["config"]["purpur"]["world-settings"]["default"]["mobs"]["villager"][ - "spawn-iron-golem"]["radius"]) - iron_golem_limit = int( - r["timingsMaster"]["config"]["purpur"]["world-settings"]["default"]["mobs"]["villager"][ - "spawn-iron-golem"]["limit"]) - aggressive_towards_villager_when_lagging = \ - r["timingsMaster"]["config"]["purpur"]["world-settings"]["default"]["mobs"]["zombie"][ - "aggressive-towards-villager-when-lagging"] - entities_can_use_portals = \ - r["timingsMaster"]["config"]["purpur"]["world-settings"]["default"]["gameplay-mechanics"][ - "entities-can-use-portals"] - lobotomize_enabled = \ - r["timingsMaster"]["config"]["purpur"]["world-settings"]["default"]["mobs"]["villager"][ - "lobotomize"]["enabled"] - teleport_if_outside_border = r["timingsMaster"]["config"]["purpur"]["world-settings"]["default"]["gameplay-mechanics"]["player"]["teleport-if-outside-border"] - projectile_load_save = int(r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["projectile-load-save-per-chunk-limit"]) - - if no_tick_view_distance == -1: - if spigot_view_distance == "default": - if type(view_distance) == "int" and view_distance >= 4: - embed_var.add_field(name="⚠ no-tick-view-distance", - value="Set a value in paper.yml. " - "Recommended: " + str( - view_distance) + ". And reduce view-distance in server.properties. Recommended: 3.", - inline=True) - else: - if int(spigot_view_distance) >= 4: - embed_var.add_field(name="⚠ no-tick-view-distance", - value="Set a value in paper.yml. " - "Recommended: " + spigot_view_distance + ". And reduce view-distance in spigot.yml. Recommended: 3.", - inline=True) - if use_alternate_keepalive == "false" and "TCPShield" not in plugins: - embed_var.add_field(name="⚠ use-alternate-keepalive", - value="Enable this in purpur.yml.", - inline=True) - if use_alternate_keepalive == "true" and "TCPShield" in plugins: - embed_var.add_field(name="⚠ use-alternate-keepalive", - value="Disable this in purpur.yml. It causes issues with TCPShield.", - inline=True) - if dont_send_useless_entity_packets == "false": - embed_var.add_field(name="⚠ dont-send-useless-entity-packets", - value="Enable this in purpur.yml.", - inline=True) - if disable_treasure_searching == "false": - embed_var.add_field(name="⚠ dolphin.disable-treasure-searching", - value="Enable this in purpur.yml.", - inline=True) - if brain_ticks == 1: - embed_var.add_field(name="⚠ villager.brain-ticks", - value="Increase this in purpur.yml. " - "Recommended: 4.", - inline=True) - if iron_golem_radius == 0: - embed_var.add_field(name="⚠ spawn-iron-golem.radius", - value="Set a value in purpur.yml. " - "Recommended: 32.", - inline=True) - if iron_golem_limit == 0: - embed_var.add_field(name="⚠ spawn-iron-golem.limit", - value="Set a value in purpur.yml. " - "Recommended: 5.", - inline=True) - if aggressive_towards_villager_when_lagging == "true": - embed_var.add_field(name="⚠ zombie.aggresive-towards-villager-when-lagging", - value="Disable this in purpur.yml.", - inline=True) - if entities_can_use_portals == "true": - embed_var.add_field(name="⚠ entities-can-use-portals", - value="Disable this in purpur.yml to prevent players from creating chunk anchors.", - inline=True) - if lobotomize_enabled == "false": - embed_var.add_field(name="⚠ villager.lobotomize.enabled", - value="Enable this in purpur.yml.", - inline=True) - if teleport_if_outside_border == "false": - embed_var.add_field(name="⚠ player.teleport-if-outside-border", - value="Disable this in purpur.yml.", - inline=True) - if projectile_load_save == -1: - embed_var.add_field(name="⚠ projectile-load-save-per-chunk-limit", - value="Set a value in paper.yml. Recommended: 8.", - inline=True) - if len(embed_var.fields) == 0: - embed_var.add_field(name="✅ All good", - value="Analyzed with no issues") - await message.channel.send(embed=embed_var) - return - issue_count = len(embed_var.fields) - if issue_count > 25: - embed_var.description = "Showing 25 of " + str(issue_count) + " recommendations." - else: - embed_var.description = "Showing " + str(issue_count) + " of " + str(issue_count) + " recommendations." + try: + projectile_load_save = int(r["timingsMaster"]["config"]["paper"]["world-settings"]["default"][ + "projectile-load-save-per-chunk-limit"]) + if projectile_load_save == -1: + embed_var.add_field(name="⚠ projectile-load-save-per-chunk-limit", + value="Set a value in paper.yml. Recommended: 8.", + inline=True) except KeyError: - embed_var.add_field(name="⚠ Outdated Server", - value="Please update your server jar.", - inline=True) + unchecked = unchecked + 1 + + try: + use_alternate_keepalive = r["timingsMaster"]["config"]["purpur"]["settings"]["use-alternate-keepalive"] + if use_alternate_keepalive == "false" and "TCPShield" not in plugins: + embed_var.add_field(name="⚠ use-alternate-keepalive", + value="Enable this in purpur.yml.", + inline=True) + if use_alternate_keepalive == "true" and "TCPShield" in plugins: + embed_var.add_field(name="⚠ use-alternate-keepalive", + value="Disable this in purpur.yml. It causes issues with TCPShield.", + inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + dont_send_useless_entity_packets = r["timingsMaster"]["config"]["purpur"]["settings"][ + "dont-send-useless-entity-packets"] + if dont_send_useless_entity_packets == "false": + embed_var.add_field(name="⚠ dont-send-useless-entity-packets", + value="Enable this in purpur.yml.", + inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + disable_treasure_searching = \ + r["timingsMaster"]["config"]["purpur"]["world-settings"]["default"]["mobs"]["dolphin"][ + "disable-treasure-searching"] + if disable_treasure_searching == "false": + embed_var.add_field(name="⚠ dolphin.disable-treasure-searching", + value="Enable this in purpur.yml.", + inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + brain_ticks = int( + r["timingsMaster"]["config"]["purpur"]["world-settings"]["default"]["mobs"]["villager"][ + "brain-ticks"]) + if brain_ticks == 1: + embed_var.add_field(name="⚠ villager.brain-ticks", + value="Increase this in purpur.yml. " + "Recommended: 4.", + inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + iron_golem_radius = int( + r["timingsMaster"]["config"]["purpur"]["world-settings"]["default"]["mobs"]["villager"][ + "spawn-iron-golem"]["radius"]) + if iron_golem_radius == 0: + embed_var.add_field(name="⚠ spawn-iron-golem.radius", + value="Set a value in purpur.yml. " + "Recommended: 32.", + inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + iron_golem_limit = int( + r["timingsMaster"]["config"]["purpur"]["world-settings"]["default"]["mobs"]["villager"][ + "spawn-iron-golem"]["limit"]) + if iron_golem_limit == 0: + embed_var.add_field(name="⚠ spawn-iron-golem.limit", + value="Set a value in purpur.yml. " + "Recommended: 5.", + inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + aggressive_towards_villager_when_lagging = \ + r["timingsMaster"]["config"]["purpur"]["world-settings"]["default"]["mobs"]["zombie"][ + "aggressive-towards-villager-when-lagging"] + if aggressive_towards_villager_when_lagging == "true": + embed_var.add_field(name="⚠ zombie.aggresive-towards-villager-when-lagging", + value="Disable this in purpur.yml.", + inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + entities_can_use_portals = \ + r["timingsMaster"]["config"]["purpur"]["world-settings"]["default"]["gameplay-mechanics"][ + "entities-can-use-portals"] + if entities_can_use_portals == "true": + embed_var.add_field(name="⚠ entities-can-use-portals", + value="Disable this in purpur.yml to prevent players from creating chunk anchors.", + inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + lobotomize_enabled = r["timingsMaster"]["config"]["purpur"]["world-settings"]["default"]["mobs"]["villager"][ + "lobotomize"]["enabled"] + if lobotomize_enabled == "false": + embed_var.add_field(name="⚠ villager.lobotomize.enabled", + value="Enable this in purpur.yml.", + inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + teleport_if_outside_border = r["timingsMaster"]["config"]["purpur"]["world-settings"]["default"]["gameplay-mechanics"]["player"]["teleport-if-outside-border"] + if teleport_if_outside_border == "false": + embed_var.add_field(name="⚠ player.teleport-if-outside-border", + value="Disable this in purpur.yml.", + inline=True) + except KeyError: + unchecked = unchecked + 1 + + if len(embed_var.fields) == 0: + embed_var.add_field(name="✅ All good", + value="Analyzed with no issues") + await message.channel.send(embed=embed_var) + return + + issue_count = len(embed_var.fields) + if issue_count > 25: + embed_var.description = embed_var.description + "\nShowing 25 of " + str(issue_count) + " recommendations.\n||" + str(unchecked) + " missing optimizations due to server version.||" + else: + embed_var.description = embed_var.description + "\nShowing " + str(issue_count) + " of " + str(issue_count) + " recommendations.\n||" + str(unchecked) + " missing optimizations due to server version.||" await message.channel.send(embed=embed_var) From 4786d5ddd800e755b8a183694eb5099dde9cff17 Mon Sep 17 00:00:00 2001 From: DrBot7 <46543473+DrBot7@users.noreply.github.com> Date: Fri, 8 Jan 2021 16:48:23 -0600 Subject: [PATCH 02/11] Update timings.py --- cogs/timings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cogs/timings.py b/cogs/timings.py index db3c083..6e5656b 100644 --- a/cogs/timings.py +++ b/cogs/timings.py @@ -44,7 +44,7 @@ class Timings(commands.Cog): await message.channel.send(embed=embed_var) return - embed_var = discord.Embed(title="Timings Analysis for ", color=0x55ffff) + embed_var = discord.Embed(title="Timings Analysis", color=0x55ffff) embed_var.set_footer(text="Requested by " + message.author.name, icon_url=message.author.avatar_url) embed_var.description = timings_url unchecked = 0 From 9e836b782257bad468bcc32769cbb104a6d05221 Mon Sep 17 00:00:00 2001 From: DrBot7 <46543473+DrBot7@users.noreply.github.com> Date: Fri, 8 Jan 2021 17:03:43 -0600 Subject: [PATCH 03/11] Update timings.py --- cogs/timings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cogs/timings.py b/cogs/timings.py index 6e5656b..fd02805 100644 --- a/cogs/timings.py +++ b/cogs/timings.py @@ -996,7 +996,7 @@ class Timings(commands.Cog): teleport_if_outside_border = r["timingsMaster"]["config"]["purpur"]["world-settings"]["default"]["gameplay-mechanics"]["player"]["teleport-if-outside-border"] if teleport_if_outside_border == "false": embed_var.add_field(name="⚠ player.teleport-if-outside-border", - value="Disable this in purpur.yml.", + value="Enable this in purpur.yml.", inline=True) except KeyError: unchecked = unchecked + 1 From dd14fe54b6cb0d26ff8945eb2649722bcc9cd328 Mon Sep 17 00:00:00 2001 From: Purpur <43528123+Pemigrade@users.noreply.github.com> Date: Fri, 8 Jan 2021 23:52:49 -0600 Subject: [PATCH 04/11] Minor changes --- bot.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bot.py b/bot.py index 302492c..c28bc73 100644 --- a/bot.py +++ b/bot.py @@ -265,7 +265,7 @@ async def on_raw_reaction_add(payload): @bot.command() async def ping(ctx): - await ctx.send(f'Your ping is {round(bot.latency * 1000)}ms') + await ctx.send(f'Bot ping is {round(bot.latency * 1000)}ms') @bot.command(name="react", pass_context=True) @@ -289,7 +289,6 @@ async def updater(): for client in data['users']: i += 1 member = guild.get_member(client['discord_id']) - print(client['discord_id']) if member: api_key = client['client_api_key'] url = "https://panel.birdflop.com/api/client" From 2451b403842277d5c972af8fae77546bb3e3e242 Mon Sep 17 00:00:00 2001 From: Oli-idk <67001116+Oli-idk@users.noreply.github.com> Date: Fri, 8 Jan 2021 23:51:33 -0800 Subject: [PATCH 05/11] updated how url is shown --- cogs/timings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cogs/timings.py b/cogs/timings.py index fd02805..5723707 100644 --- a/cogs/timings.py +++ b/cogs/timings.py @@ -46,7 +46,7 @@ class Timings(commands.Cog): embed_var = discord.Embed(title="Timings Analysis", color=0x55ffff) embed_var.set_footer(text="Requested by " + message.author.name, icon_url=message.author.avatar_url) - embed_var.description = timings_url + embed_var.url = timings_url unchecked = 0 try: From c2090eddb60323a9eaf27cf4681c174850338834 Mon Sep 17 00:00:00 2001 From: DrBot7 <46543473+DrBot7@users.noreply.github.com> Date: Sat, 9 Jan 2021 01:59:56 -0600 Subject: [PATCH 06/11] Update timings.py --- cogs/timings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cogs/timings.py b/cogs/timings.py index 5723707..d53c41c 100644 --- a/cogs/timings.py +++ b/cogs/timings.py @@ -1009,9 +1009,9 @@ class Timings(commands.Cog): issue_count = len(embed_var.fields) if issue_count > 25: - embed_var.description = embed_var.description + "\nShowing 25 of " + str(issue_count) + " recommendations.\n||" + str(unchecked) + " missing optimizations due to server version.||" + embed_var.description = "Showing 25 of " + str(issue_count) + " recommendations.\n||" + str(unchecked) + " missing optimizations due to server version.||" else: - embed_var.description = embed_var.description + "\nShowing " + str(issue_count) + " of " + str(issue_count) + " recommendations.\n||" + str(unchecked) + " missing optimizations due to server version.||" + embed_var.description = "Showing " + str(issue_count) + " of " + str(issue_count) + " recommendations.\n||" + str(unchecked) + " missing optimizations due to server version.||" await message.channel.send(embed=embed_var) From 1215e992f9e44a6cae13e53f6682fe669ffb6778 Mon Sep 17 00:00:00 2001 From: DrBot7 <46543473+DrBot7@users.noreply.github.com> Date: Sat, 9 Jan 2021 02:25:54 -0600 Subject: [PATCH 07/11] Timings - imprive cpu analysis --- cogs/timings.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cogs/timings.py b/cogs/timings.py index d53c41c..2022235 100644 --- a/cogs/timings.py +++ b/cogs/timings.py @@ -145,9 +145,9 @@ class Timings(commands.Cog): try: cpu = int(r["timingsMaster"]["system"]["cpu"]) - if cpu < 4: - embed_var.add_field(name="⚠ Cores", - value="You have only " + str(cpu) + " core(s). Find a better host.", + if cpu <= 2: + embed_var.add_field(name="⚠ Threads", + value="You have only " + str(cpu) + " thread(s). Find a [better host](https://www.birdflop.com).", inline=True) except KeyError: unchecked = unchecked + 1 From a75a6a77117e6bb46a55f12b12b87ae17b2a1d0b Mon Sep 17 00:00:00 2001 From: DrBot7 <46543473+DrBot7@users.noreply.github.com> Date: Sat, 9 Jan 2021 02:49:18 -0600 Subject: [PATCH 08/11] Timings - more checks --- cogs/timings.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/cogs/timings.py b/cogs/timings.py index 2022235..320d2e0 100644 --- a/cogs/timings.py +++ b/cogs/timings.py @@ -817,6 +817,24 @@ class Timings(commands.Cog): except KeyError: unchecked = unchecked + 1 + try: + fix_climbing_bypass_gamerule = r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["fix-climbing-bypassing-cramming-rule"] + if fix_climbing_bypass_gamerule == "false": + embed_var.add_field(name="⚠ fix-climbing-bypassing-cramming-rule", + value="Enable this in paper.yml.", + inline=True) + except KeyError: + unchecked = unchecked + 1 + + try: + armor_stands_do_collision_entity_lookups = r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["armor-stands-do-collision-entity-lookups"] + if armor_stands_do_collision_entity_lookups == "true": + embed_var.add_field(name="⚠ armor-stands-do-collision-entity-lookups", + value="Disable this in paper.yml.", + inline=True) + except KeyError: + unchecked = unchecked + 1 + try: plugins = r["timingsMaster"]["plugins"] armor_stands_tick = r["timingsMaster"]["config"]["paper"]["world-settings"]["default"]["armor-stands-tick"] From a2b98d83f5c03a4b932d23bd265a2051f28f4c79 Mon Sep 17 00:00:00 2001 From: DrBot7 <46543473+DrBot7@users.noreply.github.com> Date: Sat, 9 Jan 2021 04:23:20 -0600 Subject: [PATCH 09/11] Update timings.py --- cogs/timings.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cogs/timings.py b/cogs/timings.py index 320d2e0..f7b6615 100644 --- a/cogs/timings.py +++ b/cogs/timings.py @@ -58,7 +58,7 @@ class Timings(commands.Cog): inline=True) if using_yatopia: embed_var.add_field(name="⚠ Yatopia", - value="Yatopia may be more optimized but it is prone to bugs. " + value="Yatopia may be is prone to bugs. " "Consider using [Purpur](https://ci.pl3x.net/job/Purpur/).", inline=True) elif "Paper" in version: @@ -1027,10 +1027,11 @@ class Timings(commands.Cog): issue_count = len(embed_var.fields) if issue_count > 25: - embed_var.description = "Showing 25 of " + str(issue_count) + " recommendations.\n||" + str(unchecked) + " missing optimizations due to server version.||" + embed_var.description = "Showing 25 of " + str(issue_count) + " recommendations." else: - embed_var.description = "Showing " + str(issue_count) + " of " + str(issue_count) + " recommendations.\n||" + str(unchecked) + " missing optimizations due to server version.||" - + embed_var.description = "Showing " + str(issue_count) + " of " + str(issue_count) + " recommendations." + if issue_count > 0: + embed_var.description = embed_var.description + "\n||" + str(unchecked) + " missing optimizations due to server version.||" await message.channel.send(embed=embed_var) From 1500ca01e67a48c7c22e1526d44ca8c16aa1b44d Mon Sep 17 00:00:00 2001 From: DrBot7 <46543473+DrBot7@users.noreply.github.com> Date: Sat, 9 Jan 2021 13:18:02 -0600 Subject: [PATCH 10/11] Timings - typo --- cogs/timings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cogs/timings.py b/cogs/timings.py index f7b6615..ef122bd 100644 --- a/cogs/timings.py +++ b/cogs/timings.py @@ -51,14 +51,14 @@ class Timings(commands.Cog): try: version = r["timingsMaster"]["version"] - using_yatopia = "yatopia" in r["timingsMaster"]["config"] if "1.16.4" not in version: embed_var.add_field(name="⚠ Legacy Build", value="Update to 1.16.4.", inline=True) + using_yatopia = "yatopia" in r["timingsMaster"]["config"] if using_yatopia: embed_var.add_field(name="⚠ Yatopia", - value="Yatopia may be is prone to bugs. " + value="Yatopia is prone to bugs. " "Consider using [Purpur](https://ci.pl3x.net/job/Purpur/).", inline=True) elif "Paper" in version: From 883e16d3f99844c646f23d99c40466da734d8344 Mon Sep 17 00:00:00 2001 From: DrBot7 <46543473+DrBot7@users.noreply.github.com> Date: Sat, 9 Jan 2021 13:41:44 -0600 Subject: [PATCH 11/11] Timings - Add ServerBooster --- cogs/timings.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cogs/timings.py b/cogs/timings.py index ef122bd..bb4370a 100644 --- a/cogs/timings.py +++ b/cogs/timings.py @@ -169,6 +169,11 @@ class Timings(commands.Cog): value="Plugins that claim to remove lag actually cause more lag. " "Remove NoChunkLag.", inline=True) + if "ServerBooster" in plugins: + embed_var.add_field(name="⚠ ServerBooster", + value="Plugins that claim to remove lag actually cause more lag. " + "Remove ServerBooster.", + inline=True) if "LimitPillagers" in plugins: embed_var.add_field(name="⚠ LimitPillagers", value="You probably don't need LimitPillagers as Paper already adds its features. "